diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
index 0c3584f915158f..e2f411df0b28b0 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -6,1620 +6,1646 @@ struct LabelStruct {
     char_string<16> value = 1;
 }
 
-server cluster AccessControl = 31 {
-  enum AuthMode : ENUM8 {
-    kPase = 1;
-    kCase = 2;
-    kGroup = 3;
-  }
-
-  enum ChangeTypeEnum : ENUM8 {
-    kChanged = 0;
-    kAdded = 1;
-    kRemoved = 2;
-  }
-
-  enum Privilege : ENUM8 {
-    kView = 1;
-    kProxyView = 2;
-    kOperate = 3;
-    kManage = 4;
-    kAdminister = 5;
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
   }
 
-  struct AccessControlEntry {
-    Privilege privilege = 1;
-    AuthMode authMode = 2;
-    nullable int64u subjects[] = 3;
-    nullable Target targets[] = 4;
-    fabric_idx fabricIndex = 254;
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
   }
 
-  struct Target {
-    nullable cluster_id cluster = 0;
-    nullable endpoint_no endpoint = 1;
-    nullable devtype_id deviceType = 2;
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
   }
 
-  struct ExtensionEntry {
-    octet_string<128> data = 1;
-    fabric_idx fabricIndex = 254;
-  }
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  info event access(read: administer) AccessControlEntryChanged = 0 {
-    nullable node_id adminNodeID = 1;
-    nullable INT16U adminPasscodeID = 2;
-    ChangeTypeEnum changeType = 3;
-    nullable AccessControlEntry latestValue = 4;
-    fabric_idx adminFabricIndex = 254;
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
   }
 
-  info event access(read: administer) AccessControlExtensionChanged = 1 {
-    nullable node_id adminNodeID = 1;
-    nullable INT16U adminPasscodeID = 2;
-    ChangeTypeEnum changeType = 3;
-    nullable ExtensionEntry latestValue = 4;
-    fabric_idx adminFabricIndex = 254;
+  request struct TriggerEffectRequest {
+    IdentifyEffectIdentifier effectIdentifier = 0;
+    IdentifyEffectVariant effectVariant = 1;
   }
 
-  attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
-  attribute access(read: administer, write: administer) ExtensionEntry extension[] = 1;
-  readonly attribute int16u subjectsPerAccessControlEntry = 2;
-  readonly attribute int16u targetsPerAccessControlEntry = 3;
-  readonly attribute int16u accessControlEntriesPerFabric = 4;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+  command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
 }
 
-server cluster AccountLogin = 1294 {
+server cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
+  request struct AddGroupRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
   }
 
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
+  request struct ViewGroupRequest {
+    group_id groupId = 0;
   }
 
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
   }
 
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
+  request struct RemoveGroupRequest {
+    group_id groupId = 0;
   }
 
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
-
-server cluster ApplicationBasic = 1293 {
-  enum ApplicationStatusEnum : ENUM8 {
-    kStopped = 0;
-    kActiveVisibleFocus = 1;
-    kActiveHidden = 2;
-    kActiveVisibleNotFocus = 3;
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
   }
 
-  readonly attribute char_string<32> vendorName = 0;
-  readonly attribute int16u vendorID = 1;
-  readonly attribute char_string<32> applicationName = 2;
-  readonly attribute int16u productID = 3;
-  readonly attribute ApplicationStatusEnum status = 5;
-  readonly attribute char_string<32> applicationVersion = 6;
-  readonly attribute vendor_id allowedVendorList[] = 7;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  response struct AddGroupResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
 
-server cluster ApplicationLauncher = 1292 {
-  enum ApplicationLauncherStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kAppNotAvailable = 1;
-    kSystemBusy = 2;
+  response struct ViewGroupResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    CHAR_STRING groupName = 2;
   }
 
-  bitmap ApplicationLauncherFeature : BITMAP32 {
-    kApplicationPlatform = 0x1;
+  response struct GetGroupMembershipResponse = 2 {
+    nullable INT8U capacity = 0;
+    group_id groupList[] = 1;
   }
 
-  struct Application {
-    int16u catalogVendorId = 0;
-    char_string applicationId = 1;
+  response struct RemoveGroupResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  readonly attribute INT16U catalogList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
 }
 
-server cluster AudioOutput = 1291 {
-  enum OutputTypeEnum : ENUM8 {
-    kHdmi = 0;
-    kBt = 1;
-    kOptical = 2;
-    kHeadphone = 3;
-    kInternal = 4;
-    kOther = 5;
+server cluster Scenes = 5 {
+  bitmap ScenesCopyMode : BITMAP8 {
+    kCopyAllScenes = 0x1;
   }
 
-  bitmap AudioOutputFeature : BITMAP32 {
-    kNameUpdates = 0x1;
+  struct ExtensionFieldSet {
+    cluster_id clusterId = 0;
+    AttributeValuePair attributeValueList[] = 1;
   }
 
-  struct OutputInfo {
-    int8u index = 0;
-    OutputTypeEnum outputType = 1;
-    char_string<32> name = 2;
+  struct AttributeValuePair {
+    optional attrib_id attributeId = 0;
+    int8u attributeValue[] = 1;
   }
 
-  readonly attribute OutputInfo outputList[] = 0;
-  readonly attribute int8u currentOutput = 1;
+  readonly attribute int8u sceneCount = 0;
+  readonly attribute int8u currentScene = 1;
+  readonly attribute group_id currentGroup = 2;
+  readonly attribute boolean sceneValid = 3;
+  readonly attribute bitmap8 nameSupport = 4;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster BarrierControl = 259 {
-  readonly attribute enum8 barrierMovingState = 1;
-  readonly attribute bitmap16 barrierSafetyStatus = 2;
-  readonly attribute bitmap8 barrierCapabilities = 3;
-  readonly attribute int8u barrierPosition = 10;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  request struct AddSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    INT16U transitionTime = 2;
+    CHAR_STRING sceneName = 3;
+    ExtensionFieldSet extensionFieldSets[] = 4;
+  }
 
-  request struct BarrierControlGoToPercentRequest {
-    INT8U percentOpen = 0;
+  request struct ViewSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  command BarrierControlGoToPercent(BarrierControlGoToPercentRequest): DefaultSuccess = 0;
-  command BarrierControlStop(): DefaultSuccess = 1;
-}
+  request struct RemoveSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+  }
 
-server cluster Basic = 40 {
-  struct CapabilityMinimaStruct {
-    int16u caseSessionsPerFabric = 0;
-    int16u subscriptionsPerFabric = 1;
+  request struct RemoveAllScenesRequest {
+    group_id groupId = 0;
   }
 
-  critical event StartUp = 0 {
-    INT32U softwareVersion = 0;
+  request struct StoreSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  critical event ShutDown = 1 {
+  request struct RecallSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    optional nullable INT16U transitionTime = 2;
   }
 
-  info event Leave = 2 {
+  request struct GetSceneMembershipRequest {
+    group_id groupId = 0;
   }
 
-  info event ReachableChanged = 3 {
-    boolean reachableNewValue = 0;
+  response struct AddSceneResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  readonly attribute int16u dataModelRevision = 0;
-  readonly attribute char_string<32> vendorName = 1;
-  readonly attribute vendor_id vendorID = 2;
-  readonly attribute char_string<32> productName = 3;
-  readonly attribute int16u productID = 4;
-  attribute access(write: manage) char_string<32> nodeLabel = 5;
-  attribute access(write: administer) char_string<2> location = 6;
-  readonly attribute int16u hardwareVersion = 7;
-  readonly attribute char_string<64> hardwareVersionString = 8;
-  readonly attribute int32u softwareVersion = 9;
-  readonly attribute char_string<64> softwareVersionString = 10;
-  readonly attribute char_string<16> manufacturingDate = 11;
-  readonly attribute char_string<32> partNumber = 12;
-  readonly attribute long_char_string<256> productURL = 13;
-  readonly attribute char_string<64> productLabel = 14;
-  readonly attribute char_string<32> serialNumber = 15;
-  attribute access(write: manage) boolean localConfigDisabled = 16;
-  readonly attribute boolean reachable = 17;
-  readonly attribute char_string<32> uniqueID = 18;
-  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  response struct ViewSceneResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+    optional INT16U transitionTime = 3;
+    optional CHAR_STRING sceneName = 4;
+    optional ExtensionFieldSet extensionFieldSets[] = 5;
+  }
 
-server cluster BinaryInputBasic = 15 {
-  attribute boolean outOfService = 81;
-  attribute boolean presentValue = 85;
-  readonly attribute bitmap8 statusFlags = 111;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  response struct RemoveSceneResponse = 2 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+  }
 
-server cluster Binding = 30 {
-  struct TargetStruct {
-    optional node_id node = 1;
-    optional group_id group = 2;
-    optional endpoint_no endpoint = 3;
-    optional cluster_id cluster = 4;
-    fabric_idx fabricIndex = 254;
+  response struct RemoveAllScenesResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  attribute TargetStruct binding[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  response struct StoreSceneResponse = 4 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+  }
 
-server cluster BooleanState = 69 {
-  info event StateChange = 0 {
-    boolean stateValue = 0;
+  response struct GetSceneMembershipResponse = 6 {
+    ENUM8 status = 0;
+    nullable INT8U capacity = 1;
+    group_id groupId = 2;
+    optional INT8U sceneList[] = 3;
   }
 
-  readonly attribute boolean stateValue = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
+  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
+  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
+  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
+  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
+  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
+  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
 }
 
-server cluster BridgedActions = 37 {
-  enum ActionErrorEnum : ENUM8 {
-    kUnknown = 0;
-    kInterrupted = 1;
+server cluster OnOff = 6 {
+  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
+    kFadeToOffIn0p8Seconds = 0;
+    kNoFade = 1;
+    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
   }
 
-  enum ActionStateEnum : ENUM8 {
-    kInactive = 0;
-    kActive = 1;
-    kPaused = 2;
-    kDisabled = 3;
+  enum OnOffDyingLightEffectVariant : ENUM8 {
+    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
   }
 
-  enum ActionTypeEnum : ENUM8 {
-    kOther = 0;
-    kScene = 1;
-    kSequence = 2;
-    kAutomation = 3;
-    kException = 4;
-    kNotification = 5;
-    kAlarm = 6;
+  enum OnOffEffectIdentifier : ENUM8 {
+    kDelayedAllOff = 0;
+    kDyingLight = 1;
   }
 
-  enum EndpointListTypeEnum : ENUM8 {
-    kOther = 0;
-    kRoom = 1;
-    kZone = 2;
+  enum OnOffStartUpOnOff : ENUM8 {
+    kOff = 0;
+    kOn = 1;
+    kTogglePreviousOnOff = 2;
   }
 
-  bitmap CommandBits : BITMAP16 {
-    kInstantAction = 0x1;
-    kInstantActionWithTransition = 0x2;
-    kStartAction = 0x4;
-    kStartActionWithDuration = 0x8;
-    kStopAction = 0x10;
-    kPauseAction = 0x20;
-    kPauseActionWithDuration = 0x40;
-    kResumeAction = 0x80;
-    kEnableAction = 0x100;
-    kEnableActionWithDuration = 0x200;
-    kDisableAction = 0x400;
-    kDisableActionWithDuration = 0x800;
+  bitmap OnOffControl : BITMAP8 {
+    kAcceptOnlyWhenOn = 0x1;
   }
 
-  struct ActionStruct {
-    int16u actionID = 0;
-    char_string<32> name = 1;
-    ActionTypeEnum type = 2;
-    int16u endpointListID = 3;
-    int16u supportedCommands = 4;
-    ActionStateEnum status = 5;
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
   }
 
-  struct EndpointListStruct {
-    int16u endpointListID = 0;
-    char_string<32> name = 1;
-    EndpointListTypeEnum type = 2;
-    endpoint_no endpoints[] = 3;
+  bitmap SceneFeatures : BITMAP32 {
+    kSceneNames = 0x1;
   }
 
-  info event StateChanged = 0 {
-    INT16U actionID = 0;
-    INT32U invokeID = 1;
-    ActionStateEnum newState = 2;
+  readonly attribute boolean onOff = 0;
+  readonly attribute boolean globalSceneControl = 16384;
+  attribute int16u onTime = 16385;
+  attribute int16u offWaitTime = 16386;
+  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct OffWithEffectRequest {
+    OnOffEffectIdentifier effectId = 0;
+    OnOffDelayedAllOffEffectVariant effectVariant = 1;
   }
 
-  info event ActionFailed = 1 {
-    INT16U actionID = 0;
-    INT32U invokeID = 1;
-    ActionStateEnum newState = 2;
-    ActionErrorEnum error = 3;
+  request struct OnWithTimedOffRequest {
+    OnOffControl onOffControl = 0;
+    int16u onTime = 1;
+    int16u offWaitTime = 2;
   }
 
-  readonly attribute ActionStruct actionList[] = 0;
-  readonly attribute EndpointListStruct endpointList[] = 1;
-  readonly attribute long_char_string<512> setupUrl = 2;
+  command Off(): DefaultSuccess = 0;
+  command On(): DefaultSuccess = 1;
+  command Toggle(): DefaultSuccess = 2;
+  command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64;
+  command OnWithRecallGlobalScene(): DefaultSuccess = 65;
+  command OnWithTimedOff(OnWithTimedOffRequest): DefaultSuccess = 66;
+}
+
+server cluster OnOffSwitchConfiguration = 7 {
+  readonly attribute enum8 switchType = 0;
+  attribute enum8 switchActions = 16;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster Channel = 1284 {
-  enum ChannelStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kMultipleMatches = 1;
-    kNoMatches = 2;
-  }
-
-  enum LineupInfoTypeEnum : ENUM8 {
-    kMso = 0;
+server cluster LevelControl = 8 {
+  enum MoveMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
   }
 
-  bitmap ChannelFeature : BITMAP32 {
-    kChannelList = 0x1;
-    kLineupInfo = 0x2;
+  enum StepMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
   }
 
-  struct ChannelInfo {
-    int16u majorNumber = 0;
-    int16u minorNumber = 1;
-    optional char_string<32> name = 2;
-    optional char_string<32> callSign = 3;
-    optional char_string<32> affiliateCallSign = 4;
+  bitmap LevelControlFeature : BITMAP32 {
+    kOnOff = 0x1;
+    kLighting = 0x2;
+    kFrequency = 0x4;
   }
 
-  readonly attribute ChannelInfo channelList[] = 0;
+  readonly attribute int8u currentLevel = 0;
+  readonly attribute int16u remainingTime = 1;
+  readonly attribute int8u minLevel = 2;
+  readonly attribute int8u maxLevel = 3;
+  readonly attribute int16u currentFrequency = 4;
+  readonly attribute int16u minFrequency = 5;
+  readonly attribute int16u maxFrequency = 6;
+  attribute bitmap8 options = 15;
+  attribute int16u onOffTransitionTime = 16;
+  attribute nullable int8u onLevel = 17;
+  attribute nullable int16u onTransitionTime = 18;
+  attribute nullable int16u offTransitionTime = 19;
+  attribute nullable int8u defaultMoveRate = 20;
+  attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster ColorControl = 768 {
-  enum ColorLoopAction : ENUM8 {
-    kDeactivate = 0;
-    kActivateFromColorLoopStartEnhancedHue = 1;
-    kActivateFromEnhancedCurrentHue = 2;
+  request struct MoveToLevelRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
   }
 
-  enum ColorLoopDirection : ENUM8 {
-    kDecrementHue = 0;
-    kIncrementHue = 1;
+  request struct MoveRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
   }
 
-  enum ColorMode : ENUM8 {
-    kCurrentHueAndCurrentSaturation = 0;
-    kCurrentXAndCurrentY = 1;
-    kColorTemperature = 2;
+  request struct StepRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionMask = 3;
+    BITMAP8 optionOverride = 4;
   }
 
-  enum HueDirection : ENUM8 {
-    kShortestDistance = 0;
-    kLongestDistance = 1;
-    kUp = 2;
-    kDown = 3;
+  request struct StopRequest {
+    BITMAP8 optionMask = 0;
+    BITMAP8 optionOverride = 1;
   }
 
-  enum HueMoveMode : ENUM8 {
-    kStop = 0;
-    kUp = 1;
-    kDown = 3;
+  request struct MoveToLevelWithOnOffRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
   }
 
-  enum HueStepMode : ENUM8 {
-    kUp = 1;
-    kDown = 3;
+  request struct MoveWithOnOffRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
   }
 
-  enum SaturationMoveMode : ENUM8 {
-    kStop = 0;
-    kUp = 1;
-    kDown = 3;
+  request struct StepWithOnOffRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
   }
 
-  enum SaturationStepMode : ENUM8 {
-    kUp = 1;
-    kDown = 3;
-  }
+  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
+  command Move(MoveRequest): DefaultSuccess = 1;
+  command Step(StepRequest): DefaultSuccess = 2;
+  command Stop(StopRequest): DefaultSuccess = 3;
+  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
+  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
+  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
+  command StopWithOnOff(): DefaultSuccess = 7;
+}
 
-  bitmap ColorCapabilities : BITMAP16 {
-    kHueSaturationSupported = 0x1;
-    kEnhancedHueSupported = 0x2;
-    kColorLoopSupported = 0x4;
-    kXYAttributesSupported = 0x8;
-    kColorTemperatureSupported = 0x10;
-  }
+server cluster BinaryInputBasic = 15 {
+  attribute boolean outOfService = 81;
+  attribute boolean presentValue = 85;
+  readonly attribute bitmap8 statusFlags = 111;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  bitmap ColorControlFeature : BITMAP32 {
-    kHueAndSaturation = 0x1;
-    kEnhancedHue = 0x2;
-    kColorLoop = 0x4;
-    kXy = 0x8;
-    kColorTemperature = 0x10;
+server cluster Descriptor = 29 {
+  struct DeviceType {
+    devtype_id type = 0;
+    int16u revision = 1;
   }
 
-  bitmap ColorLoopUpdateFlags : BITMAP8 {
-    kUpdateAction = 0x1;
-    kUpdateDirection = 0x2;
-    kUpdateTime = 0x4;
-    kUpdateStartHue = 0x8;
+  readonly attribute DeviceType deviceList[] = 0;
+  readonly attribute CLUSTER_ID serverList[] = 1;
+  readonly attribute CLUSTER_ID clientList[] = 2;
+  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Binding = 30 {
+  struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
   }
 
-  readonly attribute int8u currentHue = 0;
-  readonly attribute int8u currentSaturation = 1;
-  readonly attribute int16u remainingTime = 2;
-  readonly attribute int16u currentX = 3;
-  readonly attribute int16u currentY = 4;
-  readonly attribute enum8 driftCompensation = 5;
-  readonly attribute char_string<254> compensationText = 6;
-  readonly attribute int16u colorTemperature = 7;
-  readonly attribute enum8 colorMode = 8;
-  attribute bitmap8 options = 15;
-  readonly attribute nullable int8u numberOfPrimaries = 16;
-  readonly attribute int16u primary1X = 17;
-  readonly attribute int16u primary1Y = 18;
-  readonly attribute nullable int8u primary1Intensity = 19;
-  readonly attribute int16u primary2X = 21;
-  readonly attribute int16u primary2Y = 22;
-  readonly attribute nullable int8u primary2Intensity = 23;
-  readonly attribute int16u primary3X = 25;
-  readonly attribute int16u primary3Y = 26;
-  readonly attribute nullable int8u primary3Intensity = 27;
-  readonly attribute int16u primary4X = 32;
-  readonly attribute int16u primary4Y = 33;
-  readonly attribute nullable int8u primary4Intensity = 34;
-  readonly attribute int16u primary5X = 36;
-  readonly attribute int16u primary5Y = 37;
-  readonly attribute nullable int8u primary5Intensity = 38;
-  readonly attribute int16u primary6X = 40;
-  readonly attribute int16u primary6Y = 41;
-  readonly attribute nullable int8u primary6Intensity = 42;
-  attribute access(write: manage) int16u whitePointX = 48;
-  attribute access(write: manage) int16u whitePointY = 49;
-  attribute access(write: manage) int16u colorPointRX = 50;
-  attribute access(write: manage) int16u colorPointRY = 51;
-  attribute access(write: manage) nullable int8u colorPointRIntensity = 52;
-  attribute access(write: manage) int16u colorPointGX = 54;
-  attribute access(write: manage) int16u colorPointGY = 55;
-  attribute access(write: manage) nullable int8u colorPointGIntensity = 56;
-  attribute access(write: manage) int16u colorPointBX = 58;
-  attribute access(write: manage) int16u colorPointBY = 59;
-  attribute access(write: manage) nullable int8u colorPointBIntensity = 60;
-  readonly attribute int16u enhancedCurrentHue = 16384;
-  readonly attribute enum8 enhancedColorMode = 16385;
-  readonly attribute int8u colorLoopActive = 16386;
-  readonly attribute int8u colorLoopDirection = 16387;
-  readonly attribute int16u colorLoopTime = 16388;
-  readonly attribute int16u colorLoopStartEnhancedHue = 16389;
-  readonly attribute int16u colorLoopStoredEnhancedHue = 16390;
-  readonly attribute bitmap16 colorCapabilities = 16394;
-  readonly attribute int16u colorTempPhysicalMinMireds = 16395;
-  readonly attribute int16u colorTempPhysicalMaxMireds = 16396;
-  readonly attribute int16u coupleColorTempToLevelMinMireds = 16397;
-  attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400;
+  attribute TargetStruct binding[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct MoveToHueRequest {
-    INT8U hue = 0;
-    HueDirection direction = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+server cluster AccessControl = 31 {
+  enum AuthMode : ENUM8 {
+    kPase = 1;
+    kCase = 2;
+    kGroup = 3;
   }
 
-  request struct MoveHueRequest {
-    HueMoveMode moveMode = 0;
-    INT8U rate = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
+  enum ChangeTypeEnum : ENUM8 {
+    kChanged = 0;
+    kAdded = 1;
+    kRemoved = 2;
   }
 
-  request struct StepHueRequest {
-    HueStepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT8U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  enum Privilege : ENUM8 {
+    kView = 1;
+    kProxyView = 2;
+    kOperate = 3;
+    kManage = 4;
+    kAdminister = 5;
   }
 
-  request struct MoveToSaturationRequest {
-    INT8U saturation = 0;
-    INT16U transitionTime = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
+  struct AccessControlEntry {
+    Privilege privilege = 1;
+    AuthMode authMode = 2;
+    nullable int64u subjects[] = 3;
+    nullable Target targets[] = 4;
+    fabric_idx fabricIndex = 254;
   }
 
-  request struct MoveSaturationRequest {
-    SaturationMoveMode moveMode = 0;
-    INT8U rate = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
+  struct Target {
+    nullable cluster_id cluster = 0;
+    nullable endpoint_no endpoint = 1;
+    nullable devtype_id deviceType = 2;
   }
 
-  request struct StepSaturationRequest {
-    SaturationStepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT8U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  struct ExtensionEntry {
+    octet_string<128> data = 1;
+    fabric_idx fabricIndex = 254;
   }
 
-  request struct MoveToHueAndSaturationRequest {
-    INT8U hue = 0;
-    INT8U saturation = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  info event access(read: administer) AccessControlEntryChanged = 0 {
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable AccessControlEntry latestValue = 4;
+    fabric_idx adminFabricIndex = 254;
   }
 
-  request struct MoveToColorRequest {
-    INT16U colorX = 0;
-    INT16U colorY = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  info event access(read: administer) AccessControlExtensionChanged = 1 {
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable ExtensionEntry latestValue = 4;
+    fabric_idx adminFabricIndex = 254;
   }
 
-  request struct MoveColorRequest {
-    INT16S rateX = 0;
-    INT16S rateY = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
+  attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
+  attribute access(read: administer, write: administer) ExtensionEntry extension[] = 1;
+  readonly attribute int16u subjectsPerAccessControlEntry = 2;
+  readonly attribute int16u targetsPerAccessControlEntry = 3;
+  readonly attribute int16u accessControlEntriesPerFabric = 4;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster BridgedActions = 37 {
+  enum ActionErrorEnum : ENUM8 {
+    kUnknown = 0;
+    kInterrupted = 1;
   }
 
-  request struct StepColorRequest {
-    INT16S stepX = 0;
-    INT16S stepY = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  enum ActionStateEnum : ENUM8 {
+    kInactive = 0;
+    kActive = 1;
+    kPaused = 2;
+    kDisabled = 3;
   }
 
-  request struct MoveToColorTemperatureRequest {
-    INT16U colorTemperature = 0;
-    INT16U transitionTime = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
+  enum ActionTypeEnum : ENUM8 {
+    kOther = 0;
+    kScene = 1;
+    kSequence = 2;
+    kAutomation = 3;
+    kException = 4;
+    kNotification = 5;
+    kAlarm = 6;
   }
 
-  request struct EnhancedMoveToHueRequest {
-    INT16U enhancedHue = 0;
-    HueDirection direction = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  enum EndpointListTypeEnum : ENUM8 {
+    kOther = 0;
+    kRoom = 1;
+    kZone = 2;
   }
 
-  request struct EnhancedMoveHueRequest {
-    HueMoveMode moveMode = 0;
-    INT16U rate = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
+  bitmap CommandBits : BITMAP16 {
+    kInstantAction = 0x1;
+    kInstantActionWithTransition = 0x2;
+    kStartAction = 0x4;
+    kStartActionWithDuration = 0x8;
+    kStopAction = 0x10;
+    kPauseAction = 0x20;
+    kPauseActionWithDuration = 0x40;
+    kResumeAction = 0x80;
+    kEnableAction = 0x100;
+    kEnableActionWithDuration = 0x200;
+    kDisableAction = 0x400;
+    kDisableActionWithDuration = 0x800;
   }
 
-  request struct EnhancedStepHueRequest {
-    HueStepMode stepMode = 0;
-    INT16U stepSize = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  struct ActionStruct {
+    int16u actionID = 0;
+    char_string<32> name = 1;
+    ActionTypeEnum type = 2;
+    int16u endpointListID = 3;
+    int16u supportedCommands = 4;
+    ActionStateEnum status = 5;
   }
 
-  request struct EnhancedMoveToHueAndSaturationRequest {
-    INT16U enhancedHue = 0;
-    INT8U saturation = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  struct EndpointListStruct {
+    int16u endpointListID = 0;
+    char_string<32> name = 1;
+    EndpointListTypeEnum type = 2;
+    endpoint_no endpoints[] = 3;
   }
 
-  request struct ColorLoopSetRequest {
-    ColorLoopUpdateFlags updateFlags = 0;
-    ColorLoopAction action = 1;
-    ColorLoopDirection direction = 2;
-    INT16U time = 3;
-    INT16U startHue = 4;
-    BITMAP8 optionsMask = 5;
-    BITMAP8 optionsOverride = 6;
+  info event StateChanged = 0 {
+    INT16U actionID = 0;
+    INT32U invokeID = 1;
+    ActionStateEnum newState = 2;
   }
 
-  request struct StopMoveStepRequest {
-    BITMAP8 optionsMask = 0;
-    BITMAP8 optionsOverride = 1;
+  info event ActionFailed = 1 {
+    INT16U actionID = 0;
+    INT32U invokeID = 1;
+    ActionStateEnum newState = 2;
+    ActionErrorEnum error = 3;
   }
 
-  request struct MoveColorTemperatureRequest {
-    HueMoveMode moveMode = 0;
-    INT16U rate = 1;
-    INT16U colorTemperatureMinimumMireds = 2;
-    INT16U colorTemperatureMaximumMireds = 3;
-    BITMAP8 optionsMask = 4;
-    BITMAP8 optionsOverride = 5;
-  }
+  readonly attribute ActionStruct actionList[] = 0;
+  readonly attribute EndpointListStruct endpointList[] = 1;
+  readonly attribute long_char_string<512> setupUrl = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct StepColorTemperatureRequest {
-    HueStepMode stepMode = 0;
-    INT16U stepSize = 1;
-    INT16U transitionTime = 2;
-    INT16U colorTemperatureMinimumMireds = 3;
-    INT16U colorTemperatureMaximumMireds = 4;
-    BITMAP8 optionsMask = 5;
-    BITMAP8 optionsOverride = 6;
+server cluster Basic = 40 {
+  struct CapabilityMinimaStruct {
+    int16u caseSessionsPerFabric = 0;
+    int16u subscriptionsPerFabric = 1;
   }
 
-  command MoveToHue(MoveToHueRequest): DefaultSuccess = 0;
-  command MoveHue(MoveHueRequest): DefaultSuccess = 1;
-  command StepHue(StepHueRequest): DefaultSuccess = 2;
-  command MoveToSaturation(MoveToSaturationRequest): DefaultSuccess = 3;
-  command MoveSaturation(MoveSaturationRequest): DefaultSuccess = 4;
-  command StepSaturation(StepSaturationRequest): DefaultSuccess = 5;
-  command MoveToHueAndSaturation(MoveToHueAndSaturationRequest): DefaultSuccess = 6;
-  command MoveToColor(MoveToColorRequest): DefaultSuccess = 7;
-  command MoveColor(MoveColorRequest): DefaultSuccess = 8;
-  command StepColor(StepColorRequest): DefaultSuccess = 9;
-  command MoveToColorTemperature(MoveToColorTemperatureRequest): DefaultSuccess = 10;
-  command EnhancedMoveToHue(EnhancedMoveToHueRequest): DefaultSuccess = 64;
-  command EnhancedMoveHue(EnhancedMoveHueRequest): DefaultSuccess = 65;
-  command EnhancedStepHue(EnhancedStepHueRequest): DefaultSuccess = 66;
-  command EnhancedMoveToHueAndSaturation(EnhancedMoveToHueAndSaturationRequest): DefaultSuccess = 67;
-  command ColorLoopSet(ColorLoopSetRequest): DefaultSuccess = 68;
-  command StopMoveStep(StopMoveStepRequest): DefaultSuccess = 71;
-  command MoveColorTemperature(MoveColorTemperatureRequest): DefaultSuccess = 75;
-  command StepColorTemperature(StepColorTemperatureRequest): DefaultSuccess = 76;
-}
-
-server cluster ContentLauncher = 1290 {
-  enum ContentLaunchStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kUrlNotAvailable = 1;
-    kAuthFailed = 2;
+  critical event StartUp = 0 {
+    INT32U softwareVersion = 0;
   }
 
-  enum MetricTypeEnum : ENUM8 {
-    kPixels = 0;
-    kPercentage = 1;
+  critical event ShutDown = 1 {
   }
 
-  enum ParameterEnum : ENUM8 {
-    kActor = 0;
-    kChannel = 1;
-    kCharacter = 2;
-    kDirector = 3;
-    kEvent = 4;
-    kFranchise = 5;
-    kGenre = 6;
-    kLeague = 7;
-    kPopularity = 8;
-    kProvider = 9;
-    kSport = 10;
-    kSportsTeam = 11;
-    kType = 12;
+  info event Leave = 2 {
   }
 
-  bitmap ContentLauncherFeature : BITMAP32 {
-    kContentSearch = 0x1;
-    kURLPlayback = 0x2;
+  info event ReachableChanged = 3 {
+    boolean reachableNewValue = 0;
   }
 
-  bitmap SupportedStreamingProtocol : BITMAP32 {
-    kDash = 0x1;
-    kHls = 0x2;
+  readonly attribute int16u dataModelRevision = 0;
+  readonly attribute char_string<32> vendorName = 1;
+  readonly attribute vendor_id vendorID = 2;
+  readonly attribute char_string<32> productName = 3;
+  readonly attribute int16u productID = 4;
+  attribute access(write: manage) char_string<32> nodeLabel = 5;
+  attribute access(write: administer) char_string<2> location = 6;
+  readonly attribute int16u hardwareVersion = 7;
+  readonly attribute char_string<64> hardwareVersionString = 8;
+  readonly attribute int32u softwareVersion = 9;
+  readonly attribute char_string<64> softwareVersionString = 10;
+  readonly attribute char_string<16> manufacturingDate = 11;
+  readonly attribute char_string<32> partNumber = 12;
+  readonly attribute long_char_string<256> productURL = 13;
+  readonly attribute char_string<64> productLabel = 14;
+  readonly attribute char_string<32> serialNumber = 15;
+  attribute access(write: manage) boolean localConfigDisabled = 16;
+  readonly attribute boolean reachable = 17;
+  readonly attribute char_string<32> uniqueID = 18;
+  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+client cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
   }
 
-  struct ContentSearch {
-    Parameter parameterList[] = 0;
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
   }
 
-  struct Parameter {
-    ParameterEnum type = 0;
-    char_string value = 1;
-    optional AdditionalInfo externalIDList[] = 2;
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
   }
 
-  struct AdditionalInfo {
-    char_string name = 0;
-    char_string value = 1;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
   }
 
-  struct BrandingInformation {
-    char_string providerName = 0;
-    optional StyleInformation background = 1;
-    optional StyleInformation logo = 2;
-    optional StyleInformation progressBar = 3;
-    optional StyleInformation splash = 4;
-    optional StyleInformation waterMark = 5;
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
   }
 
-  struct StyleInformation {
-    optional char_string imageUrl = 0;
-    optional char_string color = 1;
-    optional Dimension size = 2;
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
   }
 
-  struct Dimension {
-    double width = 0;
-    double height = 1;
-    MetricTypeEnum metric = 2;
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
   }
 
-  readonly attribute CHAR_STRING acceptHeader[] = 0;
-  attribute bitmap32 supportedStreamingProtocols = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
 }
 
-server cluster Descriptor = 29 {
-  struct DeviceType {
-    devtype_id type = 0;
-    int16u revision = 1;
+server cluster OtaSoftwareUpdateRequestor = 42 {
+  enum OTAAnnouncementReason : ENUM8 {
+    kSimpleAnnouncement = 0;
+    kUpdateAvailable = 1;
+    kUrgentUpdateAvailable = 2;
   }
 
-  readonly attribute DeviceType deviceList[] = 0;
-  readonly attribute CLUSTER_ID serverList[] = 1;
-  readonly attribute CLUSTER_ID clientList[] = 2;
-  readonly attribute ENDPOINT_NO partsList[] = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  enum OTAChangeReasonEnum : ENUM8 {
+    kUnknown = 0;
+    kSuccess = 1;
+    kFailure = 2;
+    kTimeOut = 3;
+    kDelayByProvider = 4;
+  }
 
-server cluster DiagnosticLogs = 50 {
-  enum LogsIntent : ENUM8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
+  enum OTAUpdateStateEnum : ENUM8 {
+    kUnknown = 0;
+    kIdle = 1;
+    kQuerying = 2;
+    kDelayedOnQuery = 3;
+    kDownloading = 4;
+    kApplying = 5;
+    kDelayedOnApply = 6;
+    kRollingBack = 7;
+    kDelayedOnUserConsent = 8;
   }
 
-  enum LogsStatus : ENUM8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
+  struct ProviderLocation {
+    node_id providerNodeID = 1;
+    endpoint_no endpoint = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  enum LogsTransferProtocol : ENUM8 {
-    kResponsePayload = 0;
-    kBdx = 1;
+  info event StateTransition = 0 {
+    OTAUpdateStateEnum previousState = 0;
+    OTAUpdateStateEnum newState = 1;
+    OTAChangeReasonEnum reason = 2;
+    nullable INT32U targetSoftwareVersion = 3;
+  }
+
+  critical event VersionApplied = 1 {
+    INT32U softwareVersion = 0;
+    INT16U productID = 1;
+  }
+
+  info event DownloadError = 2 {
+    INT32U softwareVersion = 0;
+    INT64U bytesDownloaded = 1;
+    nullable INT8U progressPercent = 2;
+    nullable INT64S platformCode = 3;
   }
 
+  attribute ProviderLocation defaultOtaProviders[] = 0;
+  readonly attribute boolean updatePossible = 1;
+  readonly attribute OTAUpdateStateEnum updateState = 2;
+  readonly attribute nullable int8u updateStateProgress = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct RetrieveLogsRequestRequest {
-    LogsIntent intent = 0;
-    LogsTransferProtocol requestedProtocol = 1;
-    OCTET_STRING transferFileDesignator = 2;
+  request struct AnnounceOtaProviderRequest {
+    node_id providerNodeId = 0;
+    vendor_id vendorId = 1;
+    OTAAnnouncementReason announcementReason = 2;
+    optional OCTET_STRING metadataForNode = 3;
+    endpoint_no endpoint = 4;
   }
 
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
 }
 
-server cluster DoorLock = 257 {
-  enum DlAlarmCode : ENUM8 {
-    kLockJammed = 0;
-    kLockFactoryReset = 1;
-    kLockRadioPowerCycled = 3;
-    kWrongCodeEntryLimit = 4;
-    kFrontEsceutcheonRemoved = 5;
-    kDoorForcedOpen = 6;
-    kDoorAjar = 7;
-    kForcedUser = 8;
-  }
+server cluster LocalizationConfiguration = 43 {
+  attribute char_string<35> activeLocale = 0;
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  enum DlCredentialRule : ENUM8 {
-    kSingle = 0;
-    kDouble = 1;
-    kTri = 2;
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
   }
 
-  enum DlCredentialType : ENUM8 {
-    kProgrammingPIN = 0;
-    kPin = 1;
-    kRfid = 2;
-    kFingerprint = 3;
-    kFingerVein = 4;
-    kFace = 5;
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
   }
 
-  enum DlDataOperationType : ENUM8 {
-    kAdd = 0;
-    kClear = 1;
-    kModify = 2;
-  }
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  enum DlDoorState : ENUM8 {
-    kDoorOpen = 0;
-    kDoorClosed = 1;
-    kDoorJammed = 2;
-    kDoorForcedOpen = 3;
-    kDoorUnspecifiedError = 4;
-    kDoorAjar = 5;
+server cluster UnitLocalization = 45 {
+  enum TempUnit : ENUM8 {
+    kFahrenheit = 0;
+    kCelsius = 1;
+    kKelvin = 2;
   }
 
-  enum DlLockDataType : ENUM8 {
-    kUnspecified = 0;
-    kProgrammingCode = 1;
-    kUserIndex = 2;
-    kWeekDaySchedule = 3;
-    kYearDaySchedule = 4;
-    kHolidaySchedule = 5;
-    kPin = 6;
-    kRfid = 7;
-    kFingerprint = 8;
+  bitmap UnitLocalizationFeature : BITMAP32 {
+    kTemperatureUnit = 0x1;
   }
 
-  enum DlLockOperationType : ENUM8 {
-    kLock = 0;
-    kUnlock = 1;
-    kNonAccessUserEvent = 2;
-    kForcedUserEvent = 3;
+  attribute TempUnit temperatureUnit = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster PowerSourceConfiguration = 46 {
+  readonly attribute INT8U sources[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster PowerSource = 47 {
+  enum BatChargeFaultType : ENUM8 {
+    kUnspecfied = 0;
+    kAmbientTooHot = 1;
+    kAmbientTooCold = 2;
+    kBatteryTooHot = 3;
+    kBatteryTooCold = 4;
+    kBatteryAbsent = 5;
+    kBatteryOverVoltage = 6;
+    kBatteryUnderVoltage = 7;
+    kChargerOverVoltage = 8;
+    kChargerUnderVoltage = 9;
+    kSafetyTimeout = 10;
   }
 
-  enum DlLockState : ENUM8 {
-    kNotFullyLocked = 0;
-    kLocked = 1;
-    kUnlocked = 2;
+  enum BatChargeLevel : ENUM8 {
+    kOk = 0;
+    kWarning = 1;
+    kCritical = 2;
   }
 
-  enum DlLockType : ENUM8 {
-    kDeadBolt = 0;
-    kMagnetic = 1;
-    kOther = 2;
-    kMortise = 3;
-    kRim = 4;
-    kLatchBolt = 5;
-    kCylindricalLock = 6;
-    kTubularLock = 7;
-    kInterconnectedLock = 8;
-    kDeadLatch = 9;
-    kDoorFurniture = 10;
+  enum BatChargeState : ENUM8 {
+    kUnknown = 0;
+    kIsCharging = 1;
+    kIsAtFullCharge = 2;
+    kIsNotCharging = 3;
   }
 
-  enum DlOperatingMode : ENUM8 {
-    kNormal = 0;
-    kVacation = 1;
-    kPrivacy = 2;
-    kNoRemoteLockUnlock = 3;
-    kPassage = 4;
+  enum BatFaultType : ENUM8 {
+    kUnspecfied = 0;
+    kOverTemp = 1;
+    kUnderTemp = 2;
   }
 
-  enum DlOperationError : ENUM8 {
+  enum BatReplaceability : ENUM8 {
     kUnspecified = 0;
-    kInvalidCredential = 1;
-    kDisabledUserDenied = 2;
-    kRestricted = 3;
-    kInsufficientBattery = 4;
+    kNotReplaceable = 1;
+    kUserReplaceable = 2;
+    kFactoryReplaceable = 3;
   }
 
-  enum DlOperationSource : ENUM8 {
-    kUnspecified = 0;
-    kManual = 1;
-    kProprietaryRemote = 2;
-    kKeypad = 3;
-    kAuto = 4;
-    kButton = 5;
-    kSchedule = 6;
-    kRemote = 7;
-    kRfid = 8;
-    kBiometric = 9;
+  enum PowerSourceStatus : ENUM8 {
+    kUnspecfied = 0;
+    kActive = 1;
+    kStandby = 2;
+    kUnavailable = 3;
   }
 
-  enum DlStatus : ENUM8 {
-    kSuccess = 0;
-    kFailure = 1;
-    kDuplicate = 2;
-    kOccupied = 3;
-    kInvalidField = 133;
-    kResourceExhausted = 137;
-    kNotFound = 139;
+  enum WiredCurrentType : ENUM8 {
+    kAc = 0;
+    kDc = 1;
   }
 
-  enum DlUserStatus : ENUM8 {
-    kAvailable = 0;
-    kOccupiedEnabled = 1;
-    kOccupiedDisabled = 3;
+  enum WiredFaultType : ENUM8 {
+    kUnspecfied = 0;
+    kOverVoltage = 1;
+    kUnderVoltage = 2;
   }
 
-  enum DlUserType : ENUM8 {
-    kUnrestrictedUser = 0;
-    kYearDayScheduleUser = 1;
-    kWeekDayScheduleUser = 2;
-    kProgrammingUser = 3;
-    kNonAccessUser = 4;
-    kForcedUser = 5;
-    kDisposableUser = 6;
-    kExpiringUser = 7;
-    kScheduleRestrictedUser = 8;
-    kRemoteOnlyUser = 9;
+  bitmap PowerSourceFeature : BITMAP32 {
+    kWired = 0x1;
+    kBattery = 0x2;
+    kRechargeable = 0x4;
+    kReplaceable = 0x8;
   }
 
-  enum DoorLockOperationEventCode : ENUM8 {
-    kUnknownOrMfgSpecific = 0;
-    kLock = 1;
-    kUnlock = 2;
-    kLockInvalidPinOrId = 3;
-    kLockInvalidSchedule = 4;
-    kUnlockInvalidPinOrId = 5;
-    kUnlockInvalidSchedule = 6;
-    kOneTouchLock = 7;
-    kKeyLock = 8;
-    kKeyUnlock = 9;
-    kAutoLock = 10;
-    kScheduleLock = 11;
-    kScheduleUnlock = 12;
-    kManualLock = 13;
-    kManualUnlock = 14;
-  }
+  readonly attribute enum8 status = 0;
+  readonly attribute int8u order = 1;
+  readonly attribute char_string<60> description = 2;
+  readonly attribute enum8 batteryChargeLevel = 14;
+  readonly attribute boolean batteryReplacementNeeded = 15;
+  readonly attribute enum8 batteryReplaceability = 16;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  enum DoorLockProgrammingEventCode : ENUM8 {
-    kUnknownOrMfgSpecific = 0;
-    kMasterCodeChanged = 1;
-    kPinAdded = 2;
-    kPinDeleted = 3;
-    kPinChanged = 4;
-    kIdAdded = 5;
-    kIdDeleted = 6;
+server cluster GeneralCommissioning = 48 {
+  enum CommissioningError : ENUM8 {
+    kOk = 0;
+    kValueOutsideRange = 1;
+    kInvalidAuthentication = 2;
+    kNoFailSafe = 3;
+    kBusyWithOtherAdmin = 4;
   }
 
-  enum DoorLockSetPinOrIdStatus : ENUM8 {
-    kSuccess = 0;
-    kGeneralFailure = 1;
-    kMemoryFull = 2;
-    kDuplicateCodeError = 3;
+  enum RegulatoryLocationType : ENUM8 {
+    kIndoor = 0;
+    kOutdoor = 1;
+    kIndoorOutdoor = 2;
   }
 
-  enum DoorLockUserStatus : ENUM8 {
-    kAvailable = 0;
-    kOccupiedEnabled = 1;
-    kOccupiedDisabled = 3;
-    kNotSupported = 255;
+  struct BasicCommissioningInfo {
+    int16u failSafeExpiryLengthSeconds = 0;
+    int16u maxCumulativeFailsafeSeconds = 1;
   }
 
-  enum DoorLockUserType : ENUM8 {
-    kUnrestricted = 0;
-    kYearDayScheduleUser = 1;
-    kWeekDayScheduleUser = 2;
-    kMasterUser = 3;
-    kNonAccessUser = 4;
-    kNotSupported = 255;
-  }
+  attribute access(write: administer) int64u breadcrumb = 0;
+  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
+  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
+  readonly attribute RegulatoryLocationType locationCapability = 3;
+  readonly attribute boolean supportsConcurrentConnection = 4;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  bitmap DlCredentialRuleMask : BITMAP8 {
-    kSingle = 0x1;
-    kDual = 0x2;
-    kTri = 0x4;
+  request struct ArmFailSafeRequest {
+    INT16U expiryLengthSeconds = 0;
+    INT64U breadcrumb = 1;
   }
 
-  bitmap DlCredentialRulesSupport : BITMAP8 {
-    kSingle = 0x1;
-    kDual = 0x2;
-    kTri = 0x4;
+  request struct SetRegulatoryConfigRequest {
+    RegulatoryLocationType newRegulatoryConfig = 0;
+    CHAR_STRING countryCode = 1;
+    INT64U breadcrumb = 2;
   }
 
-  bitmap DlDaysMaskMap : BITMAP8 {
-    kSunday = 0x1;
-    kMonday = 0x2;
-    kTuesday = 0x4;
-    kWednesday = 0x8;
-    kThursday = 0x10;
-    kFriday = 0x20;
-    kSaturday = 0x40;
+  response struct ArmFailSafeResponse = 1 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  bitmap DlDefaultConfigurationRegister : BITMAP16 {
-    kEnableLocalProgrammingEnabled = 0x1;
-    kKeypadInterfaceDefaultAccessEnabled = 0x2;
-    kRemoteInterfaceDefaultAccessIsEnabled = 0x4;
-    kSoundEnabled = 0x20;
-    kAutoRelockTimeSet = 0x40;
-    kLEDSettingsSet = 0x80;
+  response struct SetRegulatoryConfigResponse = 3 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  bitmap DlKeypadOperationEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kLock = 0x2;
-    kUnlock = 0x4;
-    kLockInvalidPIN = 0x8;
-    kLockInvalidSchedule = 0x10;
-    kUnlockInvalidCode = 0x20;
-    kUnlockInvalidSchedule = 0x40;
-    kNonAccessUserOpEvent = 0x80;
+  response struct CommissioningCompleteResponse = 5 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  bitmap DlKeypadProgrammingEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kProgrammingPINChanged = 0x2;
-    kPINAdded = 0x4;
-    kPINCleared = 0x8;
-    kPINChanged = 0x10;
-  }
+  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
+  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
+  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
+}
 
-  bitmap DlLocalProgrammingFeatures : BITMAP8 {
-    kAddUsersCredentialsSchedulesLocally = 0x1;
-    kModifyUsersCredentialsSchedulesLocally = 0x2;
-    kClearUsersCredentialsSchedulesLocally = 0x4;
-    kAdjustLockSettingsLocally = 0x8;
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatus : ENUM8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
   }
 
-  bitmap DlManualOperationEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kThumbturnLock = 0x2;
-    kThumbturnUnlock = 0x4;
-    kOneTouchLock = 0x8;
-    kKeyLock = 0x10;
-    kKeyUnlock = 0x20;
-    kAutoLock = 0x40;
-    kScheduleLock = 0x80;
-    kScheduleUnlock = 0x100;
-    kManualLock = 0x200;
-    kManualUnlock = 0x400;
+  enum WiFiBand : ENUM8 {
+    k2g4 = 0;
+    k3g65 = 1;
+    k5g = 2;
+    k6g = 3;
+    k60g = 4;
   }
 
-  bitmap DlRFIDOperationEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kLock = 0x2;
-    kUnlock = 0x4;
-    kLockInvalidRFID = 0x8;
-    kLockInvalidSchedule = 0x10;
-    kUnlockInvalidRFID = 0x20;
-    kUnlockInvalidSchedule = 0x40;
+  bitmap NetworkCommissioningFeature : BITMAP32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap DlRFIDProgrammingEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kRFIDCodeAdded = 0x20;
-    kRFIDCodeCleared = 0x40;
+  bitmap WiFiSecurity : BITMAP8 {
+    kUnencrypted = 0x1;
+    kWepPersonal = 0x2;
+    kWpaPersonal = 0x4;
+    kWpa2Personal = 0x8;
+    kWpa3Personal = 0x10;
   }
 
-  bitmap DlRemoteOperationEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kLock = 0x2;
-    kUnlock = 0x4;
-    kLockInvalidCode = 0x8;
-    kLockInvalidSchedule = 0x10;
-    kUnlockInvalidCode = 0x20;
-    kUnlockInvalidSchedule = 0x40;
+  struct NetworkInfo {
+    octet_string<32> networkID = 0;
+    boolean connected = 1;
   }
 
-  bitmap DlRemoteProgrammingEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kProgrammingPINChanged = 0x2;
-    kPINAdded = 0x4;
-    kPINCleared = 0x8;
-    kPINChanged = 0x10;
-    kRFIDCodeAdded = 0x20;
-    kRFIDCodeCleared = 0x40;
+  struct WiFiInterfaceScanResult {
+    WiFiSecurity security = 0;
+    octet_string<32> ssid = 1;
+    octet_string<6> bssid = 2;
+    int16u channel = 3;
+    WiFiBand wiFiBand = 4;
+    int8s rssi = 5;
   }
 
-  bitmap DlSupportedOperatingModes : BITMAP16 {
-    kNormal = 0x1;
-    kVacation = 0x2;
-    kPrivacy = 0x4;
-    kNoRemoteLockUnlock = 0x8;
-    kPassage = 0x10;
-  }
-
-  bitmap DoorLockDayOfWeek : BITMAP8 {
-    kSunday = 0x1;
-    kMonday = 0x2;
-    kTuesday = 0x4;
-    kWednesday = 0x8;
-    kThursday = 0x10;
-    kFriday = 0x20;
-    kSaturday = 0x40;
+  struct ThreadInterfaceScanResult {
+    int16u panId = 0;
+    int64u extendedPanId = 1;
+    char_string<16> networkName = 2;
+    int16u channel = 3;
+    int8u version = 4;
+    octet_string<8> extendedAddress = 5;
+    int8s rssi = 6;
+    int8u lqi = 7;
   }
 
-  bitmap DoorLockFeature : BITMAP32 {
-    kPINCredentials = 0x1;
-    kRFIDCredentials = 0x2;
-    kFingerCredentials = 0x4;
-    kLogging = 0x8;
-    kAccessSchedules = 0x10;
-    kDoorPositionSensor = 0x20;
-    kFaceCredentials = 0x40;
-    kCredentialsOTA = 0x80;
-    kUsersManagement = 0x100;
-    kNotifications = 0x200;
-  }
+  readonly attribute access(read: administer) int8u maxNetworks = 0;
+  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
+  readonly attribute int8u scanMaxTimeSeconds = 2;
+  readonly attribute int8u connectMaxTimeSeconds = 3;
+  attribute access(write: administer) boolean interfaceEnabled = 4;
+  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
+  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
+  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  struct DlCredential {
-    DlCredentialType credentialType = 0;
-    int16u credentialIndex = 1;
+  request struct ScanNetworksRequest {
+    optional nullable OCTET_STRING ssid = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  critical event DoorLockAlarm = 0 {
-    DlAlarmCode alarmCode = 0;
+  request struct AddOrUpdateWiFiNetworkRequest {
+    OCTET_STRING ssid = 0;
+    OCTET_STRING credentials = 1;
+    optional INT64U breadcrumb = 2;
   }
 
-  critical event DoorStateChange = 1 {
-    DlDoorState doorState = 0;
+  request struct AddOrUpdateThreadNetworkRequest {
+    OCTET_STRING operationalDataset = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  critical event LockOperation = 2 {
-    DlLockOperationType lockOperationType = 0;
-    DlOperationSource operationSource = 1;
-    nullable INT16U userIndex = 2;
-    nullable fabric_idx fabricIndex = 3;
-    nullable NODE_ID sourceNode = 4;
-    optional nullable DlCredential credentials[] = 5;
+  request struct RemoveNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  critical event LockOperationError = 3 {
-    DlLockOperationType lockOperationType = 0;
-    DlOperationSource operationSource = 1;
-    DlOperationError operationError = 2;
-    nullable INT16U userIndex = 3;
-    nullable fabric_idx fabricIndex = 4;
-    nullable NODE_ID sourceNode = 5;
-    optional nullable DlCredential credentials[] = 6;
+  request struct ConnectNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  info event LockUserChange = 4 {
-    DlLockDataType lockDataType = 0;
-    DlDataOperationType dataOperationType = 1;
-    DlOperationSource operationSource = 2;
-    nullable INT16U userIndex = 3;
-    nullable fabric_idx fabricIndex = 4;
-    nullable NODE_ID sourceNode = 5;
-    nullable INT16U dataIndex = 6;
+  request struct ReorderNetworkRequest {
+    OCTET_STRING networkID = 0;
+    INT8U networkIndex = 1;
+    optional INT64U breadcrumb = 2;
   }
 
-  readonly attribute nullable DlLockState lockState = 0;
-  readonly attribute DlLockType lockType = 1;
-  readonly attribute boolean actuatorEnabled = 2;
-  readonly attribute nullable DlDoorState doorState = 3;
-  attribute access(write: manage) int32u doorOpenEvents = 4;
-  attribute access(write: manage) int32u doorClosedEvents = 5;
-  attribute access(write: manage) int16u openPeriod = 6;
-  readonly attribute int16u numberOfTotalUsersSupported = 17;
-  readonly attribute int16u numberOfPINUsersSupported = 18;
-  readonly attribute int16u numberOfRFIDUsersSupported = 19;
-  readonly attribute int8u numberOfWeekDaySchedulesSupportedPerUser = 20;
-  readonly attribute int8u numberOfYearDaySchedulesSupportedPerUser = 21;
-  readonly attribute int8u numberOfHolidaySchedulesSupported = 22;
-  readonly attribute int8u maxPINCodeLength = 23;
-  readonly attribute int8u minPINCodeLength = 24;
-  readonly attribute int8u maxRFIDCodeLength = 25;
-  readonly attribute int8u minRFIDCodeLength = 26;
-  readonly attribute DlCredentialRuleMask credentialRulesSupport = 27;
-  readonly attribute int8u numberOfCredentialsSupportedPerUser = 28;
-  attribute access(write: manage) char_string<3> language = 33;
-  attribute access(write: manage) int32u autoRelockTime = 35;
-  attribute access(write: manage) int8u soundVolume = 36;
-  attribute access(write: manage) DlOperatingMode operatingMode = 37;
-  readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
-  readonly attribute DlDefaultConfigurationRegister defaultConfigurationRegister = 39;
-  attribute access(write: manage) boolean enableOneTouchLocking = 41;
-  attribute access(write: manage) boolean enableInsideStatusLED = 42;
-  attribute access(write: manage) boolean enablePrivacyModeButton = 43;
-  attribute access(write: administer) int8u wrongCodeEntryLimit = 48;
-  attribute access(write: administer) int8u userCodeTemporaryDisableTime = 49;
-  attribute access(write: administer) boolean requirePINforRemoteOperation = 51;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct LockDoorRequest {
-    optional OCTET_STRING pinCode = 0;
+  response struct ScanNetworksResponse = 1 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
+    optional ThreadInterfaceScanResult threadScanResults[] = 3;
   }
 
-  request struct UnlockDoorRequest {
-    optional OCTET_STRING pinCode = 0;
+  response struct NetworkConfigResponse = 5 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional INT8U networkIndex = 2;
   }
 
-  request struct UnlockWithTimeoutRequest {
-    INT16U timeout = 0;
-    optional OCTET_STRING pinCode = 1;
+  response struct ConnectNetworkResponse = 7 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    nullable INT32S errorValue = 2;
   }
 
-  request struct SetWeekDayScheduleRequest {
-    INT8U weekDayIndex = 0;
-    INT16U userIndex = 1;
-    DlDaysMaskMap daysMask = 2;
-    INT8U startHour = 3;
-    INT8U startMinute = 4;
-    INT8U endHour = 5;
-    INT8U endMinute = 6;
-  }
+  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
+  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
+  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
+  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
+  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
+  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+}
 
-  request struct GetWeekDayScheduleRequest {
-    INT8U weekDayIndex = 0;
-    INT16U userIndex = 1;
+server cluster DiagnosticLogs = 50 {
+  enum LogsIntent : ENUM8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
   }
 
-  request struct ClearWeekDayScheduleRequest {
-    INT8U weekDayIndex = 0;
-    INT16U userIndex = 1;
+  enum LogsStatus : ENUM8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
   }
 
-  request struct SetYearDayScheduleRequest {
-    INT8U yearDayIndex = 0;
-    INT16U userIndex = 1;
-    epoch_s localStartTime = 2;
-    epoch_s localEndTime = 3;
+  enum LogsTransferProtocol : ENUM8 {
+    kResponsePayload = 0;
+    kBdx = 1;
   }
 
-  request struct GetYearDayScheduleRequest {
-    INT8U yearDayIndex = 0;
-    INT16U userIndex = 1;
-  }
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  request struct SetUserRequest {
-    DlDataOperationType operationType = 0;
-    INT16U userIndex = 1;
-    nullable CHAR_STRING userName = 2;
-    nullable INT32U userUniqueId = 3;
-    nullable DlUserStatus userStatus = 4;
-    nullable DlUserType userType = 5;
-    nullable DlCredentialRule credentialRule = 6;
+  request struct RetrieveLogsRequestRequest {
+    LogsIntent intent = 0;
+    LogsTransferProtocol requestedProtocol = 1;
+    OCTET_STRING transferFileDesignator = 2;
   }
 
-  request struct GetUserRequest {
-    INT16U userIndex = 0;
-  }
+  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+}
 
-  request struct ClearUserRequest {
-    INT16U userIndex = 0;
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
   }
 
-  request struct SetCredentialRequest {
-    DlDataOperationType operationType = 0;
-    DlCredential credential = 1;
-    LONG_OCTET_STRING credentialData = 2;
-    nullable INT16U userIndex = 3;
-    nullable DlUserStatus userStatus = 4;
-    nullable DlUserType userType = 5;
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
   }
 
-  request struct GetCredentialStatusRequest {
-    DlCredential credential = 0;
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
   }
 
-  request struct ClearCredentialRequest {
-    nullable DlCredential credential = 0;
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
   }
 
-  response struct GetUserResponse = 28 {
-    INT16U userIndex = 0;
-    nullable CHAR_STRING userName = 1;
-    nullable INT32U userUniqueId = 2;
-    nullable DlUserStatus userStatus = 3;
-    nullable DlUserType userType = 4;
-    nullable DlCredentialRule credentialRule = 5;
-    nullable DlCredential credentials[] = 6;
-    nullable fabric_idx creatorFabricIndex = 7;
-    nullable fabric_idx lastModifiedFabricIndex = 8;
-    nullable INT16U nextUserIndex = 9;
+  enum RadioFaultType : ENUM8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
   }
 
-  response struct SetCredentialResponse = 35 {
-    DlStatus status = 0;
-    nullable INT16U userIndex = 1;
-    nullable INT16U nextCredentialIndex = 2;
+  struct NetworkInterfaceType {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceType type = 7;
   }
 
-  response struct GetCredentialStatusResponse = 37 {
-    boolean credentialExists = 0;
-    nullable INT16U userIndex = 1;
-    nullable fabric_idx creatorFabricIndex = 2;
-    nullable fabric_idx lastModifiedFabricIndex = 3;
-    nullable INT16U nextCredentialIndex = 4;
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultType current[] = 0;
+    HardwareFaultType previous[] = 1;
   }
 
-  timed command LockDoor(LockDoorRequest): DefaultSuccess = 0;
-  timed command UnlockDoor(UnlockDoorRequest): DefaultSuccess = 1;
-  timed command UnlockWithTimeout(UnlockWithTimeoutRequest): DefaultSuccess = 3;
-  command access(invoke: administer) SetWeekDaySchedule(SetWeekDayScheduleRequest): DefaultSuccess = 11;
-  command access(invoke: administer) GetWeekDaySchedule(GetWeekDayScheduleRequest): GetWeekDayScheduleResponse = 12;
-  command access(invoke: administer) ClearWeekDaySchedule(ClearWeekDayScheduleRequest): DefaultSuccess = 13;
-  command access(invoke: administer) SetYearDaySchedule(SetYearDayScheduleRequest): DefaultSuccess = 14;
-  command access(invoke: administer) GetYearDaySchedule(GetYearDayScheduleRequest): GetYearDayScheduleResponse = 15;
-  timed command access(invoke: administer) SetUser(SetUserRequest): DefaultSuccess = 26;
-  command access(invoke: administer) GetUser(GetUserRequest): GetUserResponse = 27;
-  timed command access(invoke: administer) ClearUser(ClearUserRequest): DefaultSuccess = 29;
-  timed command access(invoke: administer) SetCredential(SetCredentialRequest): SetCredentialResponse = 34;
-  command access(invoke: administer) GetCredentialStatus(GetCredentialStatusRequest): GetCredentialStatusResponse = 36;
-  timed command access(invoke: administer) ClearCredential(ClearCredentialRequest): DefaultSuccess = 38;
-}
+  critical event RadioFaultChange = 1 {
+    RadioFaultType current[] = 0;
+    RadioFaultType previous[] = 1;
+  }
 
-server cluster ElectricalMeasurement = 2820 {
-  readonly attribute bitmap32 measurementType = 0;
-  readonly attribute int32s totalActivePower = 772;
-  readonly attribute int16u rmsVoltage = 1285;
-  readonly attribute int16u rmsVoltageMin = 1286;
-  readonly attribute int16u rmsVoltageMax = 1287;
-  readonly attribute int16u rmsCurrent = 1288;
-  readonly attribute int16u rmsCurrentMin = 1289;
-  readonly attribute int16u rmsCurrentMax = 1290;
-  readonly attribute int16s activePower = 1291;
-  readonly attribute int16s activePowerMin = 1292;
-  readonly attribute int16s activePowerMax = 1293;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultType current[] = 0;
+    NetworkFaultType previous[] = 1;
+  }
 
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
+  critical event BootReason = 3 {
+    BootReasonType bootReason = 0;
   }
 
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
+  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
+  readonly attribute int32u totalOperationalHours = 3;
+  readonly attribute enum8 bootReasons = 4;
+  readonly attribute ENUM8 activeHardwareFaults[] = 5;
+  readonly attribute ENUM8 activeRadioFaults[] = 6;
+  readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
-}
-
-server cluster FanControl = 514 {
-  enum FanModeSequenceType : ENUM8 {
-    kOffLowMedHigh = 0;
-    kOffLowHigh = 1;
-    kOffLowMedHighAuto = 2;
-    kOffLowHighAuto = 3;
-    kOffOnAuto = 4;
-    kOffOn = 5;
-  }
-
-  enum FanModeType : ENUM8 {
-    kOff = 0;
-    kLow = 1;
-    kMedium = 2;
-    kHigh = 3;
-    kOn = 4;
-    kAuto = 5;
-    kSmart = 6;
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
   }
 
-  bitmap FanControlFeature : BITMAP32 {
-    kMultiSpeed = 0x1;
-    kAuto = 0x2;
-    kRocking = 0x4;
-    kWind = 0x8;
-  }
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+}
 
-  bitmap RockSupportMask : BITMAP8 {
-    kRockLeftRight = 0x1;
-    kRockUpDown = 0x2;
-    kRockRound = 0x4;
+server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
   }
 
-  bitmap WindSettingMask : BITMAP8 {
-    kSleepWind = 0x1;
-    kNaturalWind = 0x2;
+  struct ThreadMetrics {
+    int64u id = 0;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
-  bitmap WindSupportMask : BITMAP8 {
-    kSleepWind = 0x1;
-    kNaturalWind = 0x2;
+  info event SoftwareFault = 0 {
+    SoftwareFaultStruct softwareFault = 0;
   }
 
-  attribute FanModeType fanMode = 0;
-  attribute FanModeSequenceType fanModeSequence = 1;
-  attribute nullable int8u percentSetting = 2;
-  readonly attribute int8u percentCurrent = 3;
-  readonly attribute int8u speedMax = 4;
-  attribute nullable int8u speedSetting = 5;
-  readonly attribute int8u speedCurrent = 6;
-  readonly attribute bitmap8 rockSupport = 7;
-  attribute bitmap8 rockSetting = 8;
-  readonly attribute bitmap8 windSupport = 9;
-  attribute bitmap8 windSetting = 10;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
+  readonly attribute ThreadMetrics threadMetrics[] = 0;
+  readonly attribute int64u currentHeapFree = 1;
+  readonly attribute int64u currentHeapUsed = 2;
+  readonly attribute int64u currentHeapHighWatermark = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster FlowMeasurement = 1028 {
-  readonly attribute nullable int16u measuredValue = 0;
-  readonly attribute nullable int16u minMeasuredValue = 1;
-  readonly attribute nullable int16u maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command ResetWatermarks(): DefaultSuccess = 0;
 }
 
-server cluster GeneralCommissioning = 48 {
-  enum CommissioningError : ENUM8 {
-    kOk = 0;
-    kValueOutsideRange = 1;
-    kInvalidAuthentication = 2;
-    kNoFailSafe = 3;
-    kBusyWithOtherAdmin = 4;
-  }
-
-  enum RegulatoryLocationType : ENUM8 {
-    kIndoor = 0;
-    kOutdoor = 1;
-    kIndoorOutdoor = 2;
-  }
-
-  struct BasicCommissioningInfo {
-    int16u failSafeExpiryLengthSeconds = 0;
-    int16u maxCumulativeFailsafeSeconds = 1;
+server cluster ThreadNetworkDiagnostics = 53 {
+  enum NetworkFault : ENUM8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
   }
 
-  attribute access(write: administer) int64u breadcrumb = 0;
-  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
-  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
-  readonly attribute RegulatoryLocationType locationCapability = 3;
-  readonly attribute boolean supportsConcurrentConnection = 4;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct ArmFailSafeRequest {
-    INT16U expiryLengthSeconds = 0;
-    INT64U breadcrumb = 1;
+  enum RoutingRole : ENUM8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kReed = 4;
+    kRouter = 5;
+    kLeader = 6;
   }
 
-  request struct SetRegulatoryConfigRequest {
-    RegulatoryLocationType newRegulatoryConfig = 0;
-    CHAR_STRING countryCode = 1;
-    INT64U breadcrumb = 2;
+  enum ThreadConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  response struct ArmFailSafeResponse = 1 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+    kMLECounts = 0x4;
+    kMACCounts = 0x8;
   }
 
-  response struct SetRegulatoryConfigResponse = 3 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  struct NeighborTable {
+    int64u extAddress = 0;
+    int32u age = 1;
+    int16u rloc16 = 2;
+    int32u linkFrameCounter = 3;
+    int32u mleFrameCounter = 4;
+    int8u lqi = 5;
+    nullable int8s averageRssi = 6;
+    nullable int8s lastRssi = 7;
+    int8u frameErrorRate = 8;
+    int8u messageErrorRate = 9;
+    boolean rxOnWhenIdle = 10;
+    boolean fullThreadDevice = 11;
+    boolean fullNetworkData = 12;
+    boolean isChild = 13;
   }
 
-  response struct CommissioningCompleteResponse = 5 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  struct RouteTable {
+    int64u extAddress = 0;
+    int16u rloc16 = 1;
+    int8u routerId = 2;
+    int8u nextHop = 3;
+    int8u pathCost = 4;
+    int8u LQIIn = 5;
+    int8u LQIOut = 6;
+    int8u age = 7;
+    boolean allocated = 8;
+    boolean linkEstablished = 9;
   }
 
-  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
-  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
-  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
-}
-
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
+  struct SecurityPolicy {
+    int16u rotationTime = 0;
+    bitmap16 flags = 1;
   }
 
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
+  struct OperationalDatasetComponents {
+    boolean activeTimestampPresent = 0;
+    boolean pendingTimestampPresent = 1;
+    boolean masterKeyPresent = 2;
+    boolean networkNamePresent = 3;
+    boolean extendedPanIdPresent = 4;
+    boolean meshLocalPrefixPresent = 5;
+    boolean delayPresent = 6;
+    boolean panIdPresent = 7;
+    boolean channelPresent = 8;
+    boolean pskcPresent = 9;
+    boolean securityPolicyPresent = 10;
+    boolean channelMaskPresent = 11;
   }
 
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
+  info event ConnectionStatus = 0 {
+    ThreadConnectionStatus connectionStatus = 0;
   }
 
-  enum NetworkFaultType : ENUM8 {
-    kUnspecified = 0;
-    kHardwareFailure = 1;
-    kNetworkJammed = 2;
-    kConnectionFailed = 3;
+  readonly attribute nullable int16u channel = 0;
+  readonly attribute nullable RoutingRole routingRole = 1;
+  readonly attribute nullable char_string<16> networkName = 2;
+  readonly attribute nullable int16u panId = 3;
+  readonly attribute nullable int64u extendedPanId = 4;
+  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute NeighborTable neighborTableList[] = 7;
+  readonly attribute RouteTable routeTableList[] = 8;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
+  readonly attribute int16u detachedRoleCount = 14;
+  readonly attribute int16u childRoleCount = 15;
+  readonly attribute int16u routerRoleCount = 16;
+  readonly attribute int16u leaderRoleCount = 17;
+  readonly attribute int16u attachAttemptCount = 18;
+  readonly attribute int16u partitionIdChangeCount = 19;
+  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
+  readonly attribute int16u parentChangeCount = 21;
+  readonly attribute int32u txTotalCount = 22;
+  readonly attribute int32u txUnicastCount = 23;
+  readonly attribute int32u txBroadcastCount = 24;
+  readonly attribute int32u txAckRequestedCount = 25;
+  readonly attribute int32u txAckedCount = 26;
+  readonly attribute int32u txNoAckRequestedCount = 27;
+  readonly attribute int32u txDataCount = 28;
+  readonly attribute int32u txDataPollCount = 29;
+  readonly attribute int32u txBeaconCount = 30;
+  readonly attribute int32u txBeaconRequestCount = 31;
+  readonly attribute int32u txOtherCount = 32;
+  readonly attribute int32u txRetryCount = 33;
+  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
+  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
+  readonly attribute int32u txErrCcaCount = 36;
+  readonly attribute int32u txErrAbortCount = 37;
+  readonly attribute int32u txErrBusyChannelCount = 38;
+  readonly attribute int32u rxTotalCount = 39;
+  readonly attribute int32u rxUnicastCount = 40;
+  readonly attribute int32u rxBroadcastCount = 41;
+  readonly attribute int32u rxDataCount = 42;
+  readonly attribute int32u rxDataPollCount = 43;
+  readonly attribute int32u rxBeaconCount = 44;
+  readonly attribute int32u rxBeaconRequestCount = 45;
+  readonly attribute int32u rxOtherCount = 46;
+  readonly attribute int32u rxAddressFilteredCount = 47;
+  readonly attribute int32u rxDestAddrFilteredCount = 48;
+  readonly attribute int32u rxDuplicatedCount = 49;
+  readonly attribute int32u rxErrNoFrameCount = 50;
+  readonly attribute int32u rxErrUnknownNeighborCount = 51;
+  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
+  readonly attribute int32u rxErrSecCount = 53;
+  readonly attribute int32u rxErrFcsCount = 54;
+  readonly attribute int32u rxErrOtherCount = 55;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
+  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command ResetCounts(): DefaultSuccess = 0;
+}
+
+server cluster WiFiNetworkDiagnostics = 54 {
+  enum AssociationFailureCause : ENUM8 {
+    kUnknown = 0;
+    kAssociationFailed = 1;
+    kAuthenticationFailed = 2;
+    kSsidNotFound = 3;
   }
 
-  enum RadioFaultType : ENUM8 {
+  enum SecurityType : ENUM8 {
     kUnspecified = 0;
-    kWiFiFault = 1;
-    kCellularFault = 2;
-    kThreadFault = 3;
-    kNFCFault = 4;
-    kBLEFault = 5;
-    kEthernetFault = 6;
+    kNone = 1;
+    kWep = 2;
+    kWpa = 3;
+    kWpa2 = 4;
+    kWpa3 = 5;
   }
 
-  struct NetworkInterfaceType {
-    char_string<32> name = 0;
-    boolean isOperational = 1;
-    nullable boolean offPremiseServicesReachableIPv4 = 2;
-    nullable boolean offPremiseServicesReachableIPv6 = 3;
-    octet_string<8> hardwareAddress = 4;
-    octet_string IPv4Addresses[] = 5;
-    octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+  enum WiFiConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  critical event HardwareFaultChange = 0 {
-    HardwareFaultType current[] = 0;
-    HardwareFaultType previous[] = 1;
+  enum WiFiVersionType : ENUM8 {
+    k80211a = 0;
+    k80211b = 1;
+    k80211g = 2;
+    k80211n = 3;
+    k80211ac = 4;
+    k80211ax = 5;
   }
 
-  critical event RadioFaultChange = 1 {
-    RadioFaultType current[] = 0;
-    RadioFaultType previous[] = 1;
+  info event Disconnection = 0 {
+    INT16U reasonCode = 0;
   }
 
-  critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+  info event AssociationFailure = 1 {
+    AssociationFailureCause associationFailure = 0;
+    INT16U status = 1;
   }
 
-  critical event BootReason = 3 {
-    BootReasonType bootReason = 0;
+  info event ConnectionStatus = 2 {
+    WiFiConnectionStatus connectionStatus = 0;
   }
 
-  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
-  readonly attribute int16u rebootCount = 1;
-  readonly attribute int64u upTime = 2;
-  readonly attribute int32u totalOperationalHours = 3;
-  readonly attribute enum8 bootReasons = 4;
-  readonly attribute ENUM8 activeHardwareFaults[] = 5;
-  readonly attribute ENUM8 activeRadioFaults[] = 6;
-  readonly attribute ENUM8 activeNetworkFaults[] = 7;
-  readonly attribute boolean testEventTriggersEnabled = 8;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute nullable octet_string<6> bssid = 0;
+  readonly attribute nullable SecurityType securityType = 1;
+  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
+  readonly attribute nullable int16u channelNumber = 3;
+  readonly attribute nullable int8s rssi = 4;
+  readonly attribute int32u beaconLostCount = 5;
+  readonly attribute int32u beaconRxCount = 6;
+  readonly attribute int32u packetMulticastRxCount = 7;
+  readonly attribute int32u packetMulticastTxCount = 8;
+  readonly attribute int32u packetUnicastRxCount = 9;
+  readonly attribute int32u packetUnicastTxCount = 10;
+  readonly attribute int64u currentMaxRate = 11;
+  readonly attribute int64u overrunCount = 12;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct TestEventTriggerRequest {
-    OCTET_STRING enableKey = 0;
-    INT64U eventTrigger = 1;
-  }
-
-  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
-  }
-
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
-    fabric_idx fabricIndex = 254;
-  }
-
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
+  }
+
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command ResetCounts(): DefaultSuccess = 0;
+}
+
+server cluster Switch = 59 {
+  info event SwitchLatched = 0 {
+    INT8U newPosition = 0;
+  }
+
+  info event InitialPress = 1 {
+    INT8U newPosition = 0;
+  }
+
+  info event LongPress = 2 {
+    INT8U newPosition = 0;
+  }
+
+  info event ShortRelease = 3 {
+    INT8U previousPosition = 0;
+  }
+
+  info event LongRelease = 4 {
+    INT8U previousPosition = 0;
+  }
+
+  info event MultiPressOngoing = 5 {
+    INT8U newPosition = 0;
+    INT8U currentNumberOfPressesCounted = 1;
+  }
+
+  info event MultiPressComplete = 6 {
+    INT8U newPosition = 0;
+    INT8U totalNumberOfPressesCounted = 1;
+  }
+
+  readonly attribute int8u numberOfPositions = 0;
+  readonly attribute int8u currentPosition = 1;
+  readonly attribute int8u multiPressMax = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
+  }
+
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
+  }
+
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
+  }
+
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+  }
+
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
+}
+
+server cluster OperationalCredentials = 62 {
+  enum OperationalCertStatus : ENUM8 {
+    kSuccess = 0;
+    kInvalidPublicKey = 1;
+    kInvalidNodeOpId = 2;
+    kInvalidNOC = 3;
+    kMissingCsr = 4;
+    kTableFull = 5;
+    kInvalidAdminSubject = 6;
+    kInsufficientPrivilege = 8;
+    kFabricConflict = 9;
+    kLabelConflict = 10;
+    kInvalidFabricIndex = 11;
+  }
+
+  struct NOCStruct {
+    octet_string noc = 1;
+    nullable octet_string icac = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct FabricDescriptor {
+    octet_string<65> rootPublicKey = 1;
+    vendor_id vendorId = 2;
+    fabric_id fabricId = 3;
+    node_id nodeId = 4;
+    char_string<32> label = 5;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
+  readonly attribute FabricDescriptor fabrics[] = 1;
+  readonly attribute int8u supportedFabrics = 2;
+  readonly attribute int8u commissionedFabrics = 3;
+  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
+  readonly attribute fabric_idx currentFabricIndex = 5;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AttestationRequestRequest {
+    OCTET_STRING attestationNonce = 0;
+  }
+
+  request struct CertificateChainRequestRequest {
+    INT8U certificateType = 0;
+  }
+
+  request struct CSRRequestRequest {
+    OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
+  }
+
+  request struct AddNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+    OCTET_STRING IPKValue = 2;
+    Int64u caseAdminSubject = 3;
+    VENDOR_ID adminVendorId = 4;
+  }
+
+  request struct UpdateNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+  }
+
+  request struct UpdateFabricLabelRequest {
+    CHAR_STRING label = 0;
+  }
+
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
+  }
+
+  request struct AddTrustedRootCertificateRequest {
+    OCTET_STRING rootCertificate = 0;
+  }
+
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
+  }
+
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
+  }
+
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
+  }
+
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
+  }
+
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
+}
+
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
+  }
+
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
     endpoint_no endpoints[] = 2;
     optional char_string<16> groupName = 3;
     fabric_idx fabricIndex = 254;
@@ -1673,1265 +1699,1398 @@ server cluster GroupKeyManagement = 63 {
   command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
 }
 
-server cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct AddGroupRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
-  }
+server cluster UserLabel = 65 {
+  attribute access(write: manage) LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct ViewGroupRequest {
-    group_id groupId = 0;
+server cluster BooleanState = 69 {
+  info event StateChange = 0 {
+    boolean stateValue = 0;
   }
 
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
-  }
+  readonly attribute boolean stateValue = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct RemoveGroupRequest {
-    group_id groupId = 0;
+server cluster ModeSelect = 80 {
+  bitmap ModeSelectFeature : BITMAP32 {
+    kDeponoff = 0x1;
   }
 
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
-  }
-
-  response struct AddGroupResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  struct ModeOptionStruct {
+    char_string<32> label = 0;
+    int8u mode = 1;
+    SemanticTag semanticTags[] = 2;
   }
 
-  response struct ViewGroupResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    CHAR_STRING groupName = 2;
+  struct SemanticTag {
+    enum16 mfgCode = 0;
+    enum16 value = 1;
   }
 
-  response struct GetGroupMembershipResponse = 2 {
-    nullable INT8U capacity = 0;
-    group_id groupList[] = 1;
-  }
+  readonly attribute char_string<32> description = 0;
+  readonly attribute nullable enum16 standardNamespace = 1;
+  readonly attribute ModeOptionStruct supportedModes[] = 2;
+  readonly attribute int8u currentMode = 3;
+  attribute nullable int8u startUpMode = 4;
+  attribute nullable int8u onMode = 5;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+  readonly attribute int8u manufacturerExtension = 4293984257;
 
-  response struct RemoveGroupResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  request struct ChangeToModeRequest {
+    INT8U newMode = 0;
   }
 
-  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
+  command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0;
 }
 
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
+server cluster DoorLock = 257 {
+  enum DlAlarmCode : ENUM8 {
+    kLockJammed = 0;
+    kLockFactoryReset = 1;
+    kLockRadioPowerCycled = 3;
+    kWrongCodeEntryLimit = 4;
+    kFrontEsceutcheonRemoved = 5;
+    kDoorForcedOpen = 6;
+    kDoorAjar = 7;
+    kForcedUser = 8;
   }
 
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
+  enum DlCredentialRule : ENUM8 {
+    kSingle = 0;
+    kDouble = 1;
+    kTri = 2;
   }
 
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
+  enum DlCredentialType : ENUM8 {
+    kProgrammingPIN = 0;
+    kPin = 1;
+    kRfid = 2;
+    kFingerprint = 3;
+    kFingerVein = 4;
+    kFace = 5;
   }
 
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
+  enum DlDataOperationType : ENUM8 {
+    kAdd = 0;
+    kClear = 1;
+    kModify = 2;
   }
 
-  request struct TriggerEffectRequest {
-    IdentifyEffectIdentifier effectIdentifier = 0;
-    IdentifyEffectVariant effectVariant = 1;
+  enum DlDoorState : ENUM8 {
+    kDoorOpen = 0;
+    kDoorClosed = 1;
+    kDoorJammed = 2;
+    kDoorForcedOpen = 3;
+    kDoorUnspecifiedError = 4;
+    kDoorAjar = 5;
   }
 
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
-  command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
-}
-
-server cluster IlluminanceMeasurement = 1024 {
-  enum LightSensorType : ENUM8 {
-    kPhotodiode = 0;
-    kCmos = 1;
+  enum DlLockDataType : ENUM8 {
+    kUnspecified = 0;
+    kProgrammingCode = 1;
+    kUserIndex = 2;
+    kWeekDaySchedule = 3;
+    kYearDaySchedule = 4;
+    kHolidaySchedule = 5;
+    kPin = 6;
+    kRfid = 7;
+    kFingerprint = 8;
   }
 
-  readonly attribute nullable int16u measuredValue = 0;
-  readonly attribute nullable int16u minMeasuredValue = 1;
-  readonly attribute nullable int16u maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
-  readonly attribute nullable enum8 lightSensorType = 4;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  enum DlLockOperationType : ENUM8 {
+    kLock = 0;
+    kUnlock = 1;
+    kNonAccessUserEvent = 2;
+    kForcedUserEvent = 3;
+  }
 
-server cluster KeypadInput = 1289 {
-  enum CecKeyCode : ENUM8 {
-    kSelect = 0;
-    kUp = 1;
-    kDown = 2;
-    kLeft = 3;
-    kRight = 4;
-    kRightUp = 5;
-    kRightDown = 6;
-    kLeftUp = 7;
-    kLeftDown = 8;
-    kRootMenu = 9;
-    kSetupMenu = 10;
-    kContentsMenu = 11;
-    kFavoriteMenu = 12;
-    kExit = 13;
-    kMediaTopMenu = 16;
-    kMediaContextSensitiveMenu = 17;
-    kNumberEntryMode = 29;
-    kNumber11 = 30;
-    kNumber12 = 31;
-    kNumber0OrNumber10 = 32;
-    kNumbers1 = 33;
-    kNumbers2 = 34;
-    kNumbers3 = 35;
-    kNumbers4 = 36;
-    kNumbers5 = 37;
-    kNumbers6 = 38;
-    kNumbers7 = 39;
-    kNumbers8 = 40;
-    kNumbers9 = 41;
-    kDot = 42;
-    kEnter = 43;
-    kClear = 44;
-    kNextFavorite = 47;
-    kChannelUp = 48;
-    kChannelDown = 49;
-    kPreviousChannel = 50;
-    kSoundSelect = 51;
-    kInputSelect = 52;
-    kDisplayInformation = 53;
-    kHelp = 54;
-    kPageUp = 55;
-    kPageDown = 56;
-    kPower = 64;
-    kVolumeUp = 65;
-    kVolumeDown = 66;
-    kMute = 67;
-    kPlay = 68;
-    kStop = 69;
-    kPause = 70;
-    kRecord = 71;
-    kRewind = 72;
-    kFastForward = 73;
-    kEject = 74;
-    kForward = 75;
-    kBackward = 76;
-    kStopRecord = 77;
-    kPauseRecord = 78;
-    kReserved = 79;
-    kAngle = 80;
-    kSubPicture = 81;
-    kVideoOnDemand = 82;
-    kElectronicProgramGuide = 83;
-    kTimerProgramming = 84;
-    kInitialConfiguration = 85;
-    kSelectBroadcastType = 86;
-    kSelectSoundPresentation = 87;
-    kPlayFunction = 96;
-    kPausePlayFunction = 97;
-    kRecordFunction = 98;
-    kPauseRecordFunction = 99;
-    kStopFunction = 100;
-    kMuteFunction = 101;
-    kRestoreVolumeFunction = 102;
-    kTuneFunction = 103;
-    kSelectMediaFunction = 104;
-    kSelectAvInputFunction = 105;
-    kSelectAudioInputFunction = 106;
-    kPowerToggleFunction = 107;
-    kPowerOffFunction = 108;
-    kPowerOnFunction = 109;
-    kF1Blue = 113;
-    kF2Red = 114;
-    kF3Green = 115;
-    kF4Yellow = 116;
-    kF5 = 117;
-    kData = 118;
+  enum DlLockState : ENUM8 {
+    kNotFullyLocked = 0;
+    kLocked = 1;
+    kUnlocked = 2;
   }
 
-  enum KeypadInputStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kUnsupportedKey = 1;
-    kInvalidKeyInCurrentState = 2;
+  enum DlLockType : ENUM8 {
+    kDeadBolt = 0;
+    kMagnetic = 1;
+    kOther = 2;
+    kMortise = 3;
+    kRim = 4;
+    kLatchBolt = 5;
+    kCylindricalLock = 6;
+    kTubularLock = 7;
+    kInterconnectedLock = 8;
+    kDeadLatch = 9;
+    kDoorFurniture = 10;
   }
 
-  bitmap KeypadInputFeature : BITMAP32 {
-    kNavigationKeyCodes = 0x1;
-    kLocationKeys = 0x2;
-    kNumberKeys = 0x4;
+  enum DlOperatingMode : ENUM8 {
+    kNormal = 0;
+    kVacation = 1;
+    kPrivacy = 2;
+    kNoRemoteLockUnlock = 3;
+    kPassage = 4;
   }
 
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct SendKeyRequest {
-    CecKeyCode keyCode = 0;
+  enum DlOperationError : ENUM8 {
+    kUnspecified = 0;
+    kInvalidCredential = 1;
+    kDisabledUserDenied = 2;
+    kRestricted = 3;
+    kInsufficientBattery = 4;
   }
 
-  response struct SendKeyResponse = 1 {
-    KeypadInputStatusEnum status = 0;
+  enum DlOperationSource : ENUM8 {
+    kUnspecified = 0;
+    kManual = 1;
+    kProprietaryRemote = 2;
+    kKeypad = 3;
+    kAuto = 4;
+    kButton = 5;
+    kSchedule = 6;
+    kRemote = 7;
+    kRfid = 8;
+    kBiometric = 9;
   }
 
-  command SendKey(SendKeyRequest): SendKeyResponse = 0;
-}
-
-server cluster LevelControl = 8 {
-  enum MoveMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
+  enum DlStatus : ENUM8 {
+    kSuccess = 0;
+    kFailure = 1;
+    kDuplicate = 2;
+    kOccupied = 3;
+    kInvalidField = 133;
+    kResourceExhausted = 137;
+    kNotFound = 139;
   }
 
-  enum StepMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
+  enum DlUserStatus : ENUM8 {
+    kAvailable = 0;
+    kOccupiedEnabled = 1;
+    kOccupiedDisabled = 3;
   }
 
-  bitmap LevelControlFeature : BITMAP32 {
-    kOnOff = 0x1;
-    kLighting = 0x2;
-    kFrequency = 0x4;
+  enum DlUserType : ENUM8 {
+    kUnrestrictedUser = 0;
+    kYearDayScheduleUser = 1;
+    kWeekDayScheduleUser = 2;
+    kProgrammingUser = 3;
+    kNonAccessUser = 4;
+    kForcedUser = 5;
+    kDisposableUser = 6;
+    kExpiringUser = 7;
+    kScheduleRestrictedUser = 8;
+    kRemoteOnlyUser = 9;
   }
 
-  readonly attribute int8u currentLevel = 0;
-  readonly attribute int16u remainingTime = 1;
-  readonly attribute int8u minLevel = 2;
-  readonly attribute int8u maxLevel = 3;
-  readonly attribute int16u currentFrequency = 4;
-  readonly attribute int16u minFrequency = 5;
-  readonly attribute int16u maxFrequency = 6;
-  attribute bitmap8 options = 15;
-  attribute int16u onOffTransitionTime = 16;
-  attribute nullable int8u onLevel = 17;
-  attribute nullable int16u onTransitionTime = 18;
-  attribute nullable int16u offTransitionTime = 19;
-  attribute nullable int8u defaultMoveRate = 20;
-  attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct MoveToLevelRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
+  enum DoorLockOperationEventCode : ENUM8 {
+    kUnknownOrMfgSpecific = 0;
+    kLock = 1;
+    kUnlock = 2;
+    kLockInvalidPinOrId = 3;
+    kLockInvalidSchedule = 4;
+    kUnlockInvalidPinOrId = 5;
+    kUnlockInvalidSchedule = 6;
+    kOneTouchLock = 7;
+    kKeyLock = 8;
+    kKeyUnlock = 9;
+    kAutoLock = 10;
+    kScheduleLock = 11;
+    kScheduleUnlock = 12;
+    kManualLock = 13;
+    kManualUnlock = 14;
   }
 
-  request struct MoveRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
+  enum DoorLockProgrammingEventCode : ENUM8 {
+    kUnknownOrMfgSpecific = 0;
+    kMasterCodeChanged = 1;
+    kPinAdded = 2;
+    kPinDeleted = 3;
+    kPinChanged = 4;
+    kIdAdded = 5;
+    kIdDeleted = 6;
   }
 
-  request struct StepRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionMask = 3;
-    BITMAP8 optionOverride = 4;
+  enum DoorLockSetPinOrIdStatus : ENUM8 {
+    kSuccess = 0;
+    kGeneralFailure = 1;
+    kMemoryFull = 2;
+    kDuplicateCodeError = 3;
   }
 
-  request struct StopRequest {
-    BITMAP8 optionMask = 0;
-    BITMAP8 optionOverride = 1;
+  enum DoorLockUserStatus : ENUM8 {
+    kAvailable = 0;
+    kOccupiedEnabled = 1;
+    kOccupiedDisabled = 3;
+    kNotSupported = 255;
   }
 
-  request struct MoveToLevelWithOnOffRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
+  enum DoorLockUserType : ENUM8 {
+    kUnrestricted = 0;
+    kYearDayScheduleUser = 1;
+    kWeekDayScheduleUser = 2;
+    kMasterUser = 3;
+    kNonAccessUser = 4;
+    kNotSupported = 255;
   }
 
-  request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
+  bitmap DlCredentialRuleMask : BITMAP8 {
+    kSingle = 0x1;
+    kDual = 0x2;
+    kTri = 0x4;
   }
 
-  request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
+  bitmap DlCredentialRulesSupport : BITMAP8 {
+    kSingle = 0x1;
+    kDual = 0x2;
+    kTri = 0x4;
   }
 
-  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
-  command Move(MoveRequest): DefaultSuccess = 1;
-  command Step(StepRequest): DefaultSuccess = 2;
-  command Stop(StopRequest): DefaultSuccess = 3;
-  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
-  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
-  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
-  command StopWithOnOff(): DefaultSuccess = 7;
-}
-
-server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster LowPower = 1288 {
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command Sleep(): DefaultSuccess = 0;
-}
-
-server cluster MediaInput = 1287 {
-  enum InputTypeEnum : ENUM8 {
-    kInternal = 0;
-    kAux = 1;
-    kCoax = 2;
-    kComposite = 3;
-    kHdmi = 4;
-    kInput = 5;
-    kLine = 6;
-    kOptical = 7;
-    kVideo = 8;
-    kScart = 9;
-    kUsb = 10;
-    kOther = 11;
+  bitmap DlDaysMaskMap : BITMAP8 {
+    kSunday = 0x1;
+    kMonday = 0x2;
+    kTuesday = 0x4;
+    kWednesday = 0x8;
+    kThursday = 0x10;
+    kFriday = 0x20;
+    kSaturday = 0x40;
   }
 
-  bitmap MediaInputFeature : BITMAP32 {
-    kNameUpdates = 0x1;
+  bitmap DlDefaultConfigurationRegister : BITMAP16 {
+    kEnableLocalProgrammingEnabled = 0x1;
+    kKeypadInterfaceDefaultAccessEnabled = 0x2;
+    kRemoteInterfaceDefaultAccessIsEnabled = 0x4;
+    kSoundEnabled = 0x20;
+    kAutoRelockTimeSet = 0x40;
+    kLEDSettingsSet = 0x80;
   }
 
-  struct InputInfo {
-    int8u index = 0;
-    InputTypeEnum inputType = 1;
-    char_string<32> name = 2;
-    char_string<32> description = 3;
+  bitmap DlKeypadOperationEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kLock = 0x2;
+    kUnlock = 0x4;
+    kLockInvalidPIN = 0x8;
+    kLockInvalidSchedule = 0x10;
+    kUnlockInvalidCode = 0x20;
+    kUnlockInvalidSchedule = 0x40;
+    kNonAccessUserOpEvent = 0x80;
   }
 
-  readonly attribute InputInfo inputList[] = 0;
-  readonly attribute int8u currentInput = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct SelectInputRequest {
-    INT8U index = 0;
+  bitmap DlKeypadProgrammingEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kProgrammingPINChanged = 0x2;
+    kPINAdded = 0x4;
+    kPINCleared = 0x8;
+    kPINChanged = 0x10;
   }
 
-  request struct RenameInputRequest {
-    INT8U index = 0;
-    CHAR_STRING name = 1;
+  bitmap DlLocalProgrammingFeatures : BITMAP8 {
+    kAddUsersCredentialsSchedulesLocally = 0x1;
+    kModifyUsersCredentialsSchedulesLocally = 0x2;
+    kClearUsersCredentialsSchedulesLocally = 0x4;
+    kAdjustLockSettingsLocally = 0x8;
   }
 
-  command SelectInput(SelectInputRequest): DefaultSuccess = 0;
-  command ShowInputStatus(): DefaultSuccess = 1;
-  command HideInputStatus(): DefaultSuccess = 2;
-  command RenameInput(RenameInputRequest): DefaultSuccess = 3;
-}
-
-server cluster MediaPlayback = 1286 {
-  enum MediaPlaybackStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kInvalidStateForCommand = 1;
-    kNotAllowed = 2;
-    kNotActive = 3;
-    kSpeedOutOfRange = 4;
-    kSeekOutOfRange = 5;
+  bitmap DlManualOperationEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kThumbturnLock = 0x2;
+    kThumbturnUnlock = 0x4;
+    kOneTouchLock = 0x8;
+    kKeyLock = 0x10;
+    kKeyUnlock = 0x20;
+    kAutoLock = 0x40;
+    kScheduleLock = 0x80;
+    kScheduleUnlock = 0x100;
+    kManualLock = 0x200;
+    kManualUnlock = 0x400;
   }
 
-  enum PlaybackStateEnum : ENUM8 {
-    kPlaying = 0;
-    kPaused = 1;
-    kNotPlaying = 2;
-    kBuffering = 3;
+  bitmap DlRFIDOperationEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kLock = 0x2;
+    kUnlock = 0x4;
+    kLockInvalidRFID = 0x8;
+    kLockInvalidSchedule = 0x10;
+    kUnlockInvalidRFID = 0x20;
+    kUnlockInvalidSchedule = 0x40;
   }
 
-  readonly attribute PlaybackStateEnum currentState = 0;
-  readonly attribute nullable epoch_us startTime = 1;
-  readonly attribute nullable int64u duration = 2;
-  readonly attribute single playbackSpeed = 4;
-  readonly attribute nullable int64u seekRangeEnd = 5;
-  readonly attribute nullable int64u seekRangeStart = 6;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster ModeSelect = 80 {
-  bitmap ModeSelectFeature : BITMAP32 {
-    kDeponoff = 0x1;
+  bitmap DlRFIDProgrammingEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kRFIDCodeAdded = 0x20;
+    kRFIDCodeCleared = 0x40;
   }
 
-  struct ModeOptionStruct {
-    char_string<32> label = 0;
-    int8u mode = 1;
-    SemanticTag semanticTags[] = 2;
+  bitmap DlRemoteOperationEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kLock = 0x2;
+    kUnlock = 0x4;
+    kLockInvalidCode = 0x8;
+    kLockInvalidSchedule = 0x10;
+    kUnlockInvalidCode = 0x20;
+    kUnlockInvalidSchedule = 0x40;
   }
 
-  struct SemanticTag {
-    enum16 mfgCode = 0;
-    enum16 value = 1;
+  bitmap DlRemoteProgrammingEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kProgrammingPINChanged = 0x2;
+    kPINAdded = 0x4;
+    kPINCleared = 0x8;
+    kPINChanged = 0x10;
+    kRFIDCodeAdded = 0x20;
+    kRFIDCodeCleared = 0x40;
   }
 
-  readonly attribute char_string<32> description = 0;
-  readonly attribute nullable enum16 standardNamespace = 1;
-  readonly attribute ModeOptionStruct supportedModes[] = 2;
-  readonly attribute int8u currentMode = 3;
-  attribute nullable int8u startUpMode = 4;
-  attribute nullable int8u onMode = 5;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-  readonly attribute int8u manufacturerExtension = 4293984257;
-
-  request struct ChangeToModeRequest {
-    INT8U newMode = 0;
+  bitmap DlSupportedOperatingModes : BITMAP16 {
+    kNormal = 0x1;
+    kVacation = 0x2;
+    kPrivacy = 0x4;
+    kNoRemoteLockUnlock = 0x8;
+    kPassage = 0x10;
   }
 
-  command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0;
-}
+  bitmap DoorLockDayOfWeek : BITMAP8 {
+    kSunday = 0x1;
+    kMonday = 0x2;
+    kTuesday = 0x4;
+    kWednesday = 0x8;
+    kThursday = 0x10;
+    kFriday = 0x20;
+    kSaturday = 0x40;
+  }
 
-server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatus : ENUM8 {
-    kSuccess = 0;
-    kOutOfRange = 1;
-    kBoundsExceeded = 2;
-    kNetworkIDNotFound = 3;
-    kDuplicateNetworkID = 4;
-    kNetworkNotFound = 5;
-    kRegulatoryError = 6;
-    kAuthFailure = 7;
-    kUnsupportedSecurity = 8;
-    kOtherConnectionFailure = 9;
-    kIPV6Failed = 10;
-    kIPBindFailed = 11;
-    kUnknownError = 12;
+  bitmap DoorLockFeature : BITMAP32 {
+    kPINCredentials = 0x1;
+    kRFIDCredentials = 0x2;
+    kFingerCredentials = 0x4;
+    kLogging = 0x8;
+    kAccessSchedules = 0x10;
+    kDoorPositionSensor = 0x20;
+    kFaceCredentials = 0x40;
+    kCredentialsOTA = 0x80;
+    kUsersManagement = 0x100;
+    kNotifications = 0x200;
   }
 
-  enum WiFiBand : ENUM8 {
-    k2g4 = 0;
-    k3g65 = 1;
-    k5g = 2;
-    k6g = 3;
-    k60g = 4;
+  struct DlCredential {
+    DlCredentialType credentialType = 0;
+    int16u credentialIndex = 1;
   }
 
-  bitmap NetworkCommissioningFeature : BITMAP32 {
-    kWiFiNetworkInterface = 0x1;
-    kThreadNetworkInterface = 0x2;
-    kEthernetNetworkInterface = 0x4;
+  critical event DoorLockAlarm = 0 {
+    DlAlarmCode alarmCode = 0;
   }
 
-  bitmap WiFiSecurity : BITMAP8 {
-    kUnencrypted = 0x1;
-    kWepPersonal = 0x2;
-    kWpaPersonal = 0x4;
-    kWpa2Personal = 0x8;
-    kWpa3Personal = 0x10;
+  critical event DoorStateChange = 1 {
+    DlDoorState doorState = 0;
   }
 
-  struct NetworkInfo {
-    octet_string<32> networkID = 0;
-    boolean connected = 1;
+  critical event LockOperation = 2 {
+    DlLockOperationType lockOperationType = 0;
+    DlOperationSource operationSource = 1;
+    nullable INT16U userIndex = 2;
+    nullable fabric_idx fabricIndex = 3;
+    nullable NODE_ID sourceNode = 4;
+    optional nullable DlCredential credentials[] = 5;
   }
 
-  struct WiFiInterfaceScanResult {
-    WiFiSecurity security = 0;
-    octet_string<32> ssid = 1;
-    octet_string<6> bssid = 2;
-    int16u channel = 3;
-    WiFiBand wiFiBand = 4;
-    int8s rssi = 5;
+  critical event LockOperationError = 3 {
+    DlLockOperationType lockOperationType = 0;
+    DlOperationSource operationSource = 1;
+    DlOperationError operationError = 2;
+    nullable INT16U userIndex = 3;
+    nullable fabric_idx fabricIndex = 4;
+    nullable NODE_ID sourceNode = 5;
+    optional nullable DlCredential credentials[] = 6;
   }
 
-  struct ThreadInterfaceScanResult {
-    int16u panId = 0;
-    int64u extendedPanId = 1;
-    char_string<16> networkName = 2;
-    int16u channel = 3;
-    int8u version = 4;
-    octet_string<8> extendedAddress = 5;
-    int8s rssi = 6;
-    int8u lqi = 7;
+  info event LockUserChange = 4 {
+    DlLockDataType lockDataType = 0;
+    DlDataOperationType dataOperationType = 1;
+    DlOperationSource operationSource = 2;
+    nullable INT16U userIndex = 3;
+    nullable fabric_idx fabricIndex = 4;
+    nullable NODE_ID sourceNode = 5;
+    nullable INT16U dataIndex = 6;
   }
 
-  readonly attribute access(read: administer) int8u maxNetworks = 0;
-  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
-  readonly attribute int8u scanMaxTimeSeconds = 2;
-  readonly attribute int8u connectMaxTimeSeconds = 3;
-  attribute access(write: administer) boolean interfaceEnabled = 4;
-  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
-  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
-  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute nullable DlLockState lockState = 0;
+  readonly attribute DlLockType lockType = 1;
+  readonly attribute boolean actuatorEnabled = 2;
+  readonly attribute nullable DlDoorState doorState = 3;
+  attribute access(write: manage) int32u doorOpenEvents = 4;
+  attribute access(write: manage) int32u doorClosedEvents = 5;
+  attribute access(write: manage) int16u openPeriod = 6;
+  readonly attribute int16u numberOfTotalUsersSupported = 17;
+  readonly attribute int16u numberOfPINUsersSupported = 18;
+  readonly attribute int16u numberOfRFIDUsersSupported = 19;
+  readonly attribute int8u numberOfWeekDaySchedulesSupportedPerUser = 20;
+  readonly attribute int8u numberOfYearDaySchedulesSupportedPerUser = 21;
+  readonly attribute int8u numberOfHolidaySchedulesSupported = 22;
+  readonly attribute int8u maxPINCodeLength = 23;
+  readonly attribute int8u minPINCodeLength = 24;
+  readonly attribute int8u maxRFIDCodeLength = 25;
+  readonly attribute int8u minRFIDCodeLength = 26;
+  readonly attribute DlCredentialRuleMask credentialRulesSupport = 27;
+  readonly attribute int8u numberOfCredentialsSupportedPerUser = 28;
+  attribute access(write: manage) char_string<3> language = 33;
+  attribute access(write: manage) int32u autoRelockTime = 35;
+  attribute access(write: manage) int8u soundVolume = 36;
+  attribute access(write: manage) DlOperatingMode operatingMode = 37;
+  readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
+  readonly attribute DlDefaultConfigurationRegister defaultConfigurationRegister = 39;
+  attribute access(write: manage) boolean enableOneTouchLocking = 41;
+  attribute access(write: manage) boolean enableInsideStatusLED = 42;
+  attribute access(write: manage) boolean enablePrivacyModeButton = 43;
+  attribute access(write: administer) int8u wrongCodeEntryLimit = 48;
+  attribute access(write: administer) int8u userCodeTemporaryDisableTime = 49;
+  attribute access(write: administer) boolean requirePINforRemoteOperation = 51;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct ScanNetworksRequest {
-    optional nullable OCTET_STRING ssid = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct AddOrUpdateWiFiNetworkRequest {
-    OCTET_STRING ssid = 0;
-    OCTET_STRING credentials = 1;
-    optional INT64U breadcrumb = 2;
+  request struct LockDoorRequest {
+    optional OCTET_STRING pinCode = 0;
   }
 
-  request struct AddOrUpdateThreadNetworkRequest {
-    OCTET_STRING operationalDataset = 0;
-    optional INT64U breadcrumb = 1;
+  request struct UnlockDoorRequest {
+    optional OCTET_STRING pinCode = 0;
   }
 
-  request struct RemoveNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
+  request struct UnlockWithTimeoutRequest {
+    INT16U timeout = 0;
+    optional OCTET_STRING pinCode = 1;
   }
 
-  request struct ConnectNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
-  }
+  request struct SetWeekDayScheduleRequest {
+    INT8U weekDayIndex = 0;
+    INT16U userIndex = 1;
+    DlDaysMaskMap daysMask = 2;
+    INT8U startHour = 3;
+    INT8U startMinute = 4;
+    INT8U endHour = 5;
+    INT8U endMinute = 6;
+  }
 
-  request struct ReorderNetworkRequest {
-    OCTET_STRING networkID = 0;
-    INT8U networkIndex = 1;
-    optional INT64U breadcrumb = 2;
+  request struct GetWeekDayScheduleRequest {
+    INT8U weekDayIndex = 0;
+    INT16U userIndex = 1;
   }
 
-  response struct ScanNetworksResponse = 1 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
-    optional ThreadInterfaceScanResult threadScanResults[] = 3;
+  request struct ClearWeekDayScheduleRequest {
+    INT8U weekDayIndex = 0;
+    INT16U userIndex = 1;
   }
 
-  response struct NetworkConfigResponse = 5 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional INT8U networkIndex = 2;
+  request struct SetYearDayScheduleRequest {
+    INT8U yearDayIndex = 0;
+    INT16U userIndex = 1;
+    epoch_s localStartTime = 2;
+    epoch_s localEndTime = 3;
   }
 
-  response struct ConnectNetworkResponse = 7 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    nullable INT32S errorValue = 2;
+  request struct GetYearDayScheduleRequest {
+    INT8U yearDayIndex = 0;
+    INT16U userIndex = 1;
   }
 
-  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
-  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
-  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
-  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
-  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
-  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
-}
+  request struct SetUserRequest {
+    DlDataOperationType operationType = 0;
+    INT16U userIndex = 1;
+    nullable CHAR_STRING userName = 2;
+    nullable INT32U userUniqueId = 3;
+    nullable DlUserStatus userStatus = 4;
+    nullable DlUserType userType = 5;
+    nullable DlCredentialRule credentialRule = 6;
+  }
 
-client cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
+  request struct GetUserRequest {
+    INT16U userIndex = 0;
   }
 
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
+  request struct ClearUserRequest {
+    INT16U userIndex = 0;
   }
 
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
+  request struct SetCredentialRequest {
+    DlDataOperationType operationType = 0;
+    DlCredential credential = 1;
+    LONG_OCTET_STRING credentialData = 2;
+    nullable INT16U userIndex = 3;
+    nullable DlUserStatus userStatus = 4;
+    nullable DlUserType userType = 5;
   }
 
-  readonly attribute int16u clusterRevision = 65533;
+  request struct GetCredentialStatusRequest {
+    DlCredential credential = 0;
+  }
 
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
+  request struct ClearCredentialRequest {
+    nullable DlCredential credential = 0;
   }
 
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
+  response struct GetUserResponse = 28 {
+    INT16U userIndex = 0;
+    nullable CHAR_STRING userName = 1;
+    nullable INT32U userUniqueId = 2;
+    nullable DlUserStatus userStatus = 3;
+    nullable DlUserType userType = 4;
+    nullable DlCredentialRule credentialRule = 5;
+    nullable DlCredential credentials[] = 6;
+    nullable fabric_idx creatorFabricIndex = 7;
+    nullable fabric_idx lastModifiedFabricIndex = 8;
+    nullable INT16U nextUserIndex = 9;
   }
 
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
+  response struct SetCredentialResponse = 35 {
+    DlStatus status = 0;
+    nullable INT16U userIndex = 1;
+    nullable INT16U nextCredentialIndex = 2;
   }
 
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
+  response struct GetCredentialStatusResponse = 37 {
+    boolean credentialExists = 0;
+    nullable INT16U userIndex = 1;
+    nullable fabric_idx creatorFabricIndex = 2;
+    nullable fabric_idx lastModifiedFabricIndex = 3;
+    nullable INT16U nextCredentialIndex = 4;
   }
 
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
+  timed command LockDoor(LockDoorRequest): DefaultSuccess = 0;
+  timed command UnlockDoor(UnlockDoorRequest): DefaultSuccess = 1;
+  timed command UnlockWithTimeout(UnlockWithTimeoutRequest): DefaultSuccess = 3;
+  command access(invoke: administer) SetWeekDaySchedule(SetWeekDayScheduleRequest): DefaultSuccess = 11;
+  command access(invoke: administer) GetWeekDaySchedule(GetWeekDayScheduleRequest): GetWeekDayScheduleResponse = 12;
+  command access(invoke: administer) ClearWeekDaySchedule(ClearWeekDayScheduleRequest): DefaultSuccess = 13;
+  command access(invoke: administer) SetYearDaySchedule(SetYearDayScheduleRequest): DefaultSuccess = 14;
+  command access(invoke: administer) GetYearDaySchedule(GetYearDayScheduleRequest): GetYearDayScheduleResponse = 15;
+  timed command access(invoke: administer) SetUser(SetUserRequest): DefaultSuccess = 26;
+  command access(invoke: administer) GetUser(GetUserRequest): GetUserResponse = 27;
+  timed command access(invoke: administer) ClearUser(ClearUserRequest): DefaultSuccess = 29;
+  timed command access(invoke: administer) SetCredential(SetCredentialRequest): SetCredentialResponse = 34;
+  command access(invoke: administer) GetCredentialStatus(GetCredentialStatusRequest): GetCredentialStatusResponse = 36;
+  timed command access(invoke: administer) ClearCredential(ClearCredentialRequest): DefaultSuccess = 38;
 }
 
-server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum OTAAnnouncementReason : ENUM8 {
-    kSimpleAnnouncement = 0;
-    kUpdateAvailable = 1;
-    kUrgentUpdateAvailable = 2;
-  }
-
-  enum OTAChangeReasonEnum : ENUM8 {
-    kUnknown = 0;
-    kSuccess = 1;
-    kFailure = 2;
-    kTimeOut = 3;
-    kDelayByProvider = 4;
+server cluster WindowCovering = 258 {
+  enum EndProductType : ENUM8 {
+    kRollerShade = 0;
+    kRomanShade = 1;
+    kBalloonShade = 2;
+    kWovenWood = 3;
+    kPleatedShade = 4;
+    kCellularShade = 5;
+    kLayeredShade = 6;
+    kLayeredShade2D = 7;
+    kSheerShade = 8;
+    kTiltOnlyInteriorBlind = 9;
+    kInteriorBlind = 10;
+    kVerticalBlindStripCurtain = 11;
+    kInteriorVenetianBlind = 12;
+    kExteriorVenetianBlind = 13;
+    kLateralLeftCurtain = 14;
+    kLateralRightCurtain = 15;
+    kCentralCurtain = 16;
+    kRollerShutter = 17;
+    kExteriorVerticalScreen = 18;
+    kAwningTerracePatio = 19;
+    kAwningVerticalScreen = 20;
+    kTiltOnlyPergola = 21;
+    kSwingingShutter = 22;
+    kSlidingShutter = 23;
+    kUnknown = 255;
   }
 
-  enum OTAUpdateStateEnum : ENUM8 {
-    kUnknown = 0;
-    kIdle = 1;
-    kQuerying = 2;
-    kDelayedOnQuery = 3;
-    kDownloading = 4;
-    kApplying = 5;
-    kDelayedOnApply = 6;
-    kRollingBack = 7;
-    kDelayedOnUserConsent = 8;
+  enum Type : ENUM8 {
+    kRollerShade = 0;
+    kRollerShade2Motor = 1;
+    kRollerShadeExterior = 2;
+    kRollerShadeExterior2Motor = 3;
+    kDrapery = 4;
+    kAwning = 5;
+    kShutter = 6;
+    kTiltBlindTiltOnly = 7;
+    kTiltBlindLiftAndTilt = 8;
+    kProjectorScreen = 9;
+    kUnknown = 255;
   }
 
-  struct ProviderLocation {
-    node_id providerNodeID = 1;
-    endpoint_no endpoint = 2;
-    fabric_idx fabricIndex = 254;
+  bitmap ConfigStatus : BITMAP8 {
+    kOperational = 0x1;
+    kOnlineReserved = 0x2;
+    kLiftMovementReversed = 0x4;
+    kLiftPositionAware = 0x8;
+    kTiltPositionAware = 0x10;
+    kLiftEncoderControlled = 0x20;
+    kTiltEncoderControlled = 0x40;
   }
 
-  info event StateTransition = 0 {
-    OTAUpdateStateEnum previousState = 0;
-    OTAUpdateStateEnum newState = 1;
-    OTAChangeReasonEnum reason = 2;
-    nullable INT32U targetSoftwareVersion = 3;
+  bitmap Feature : BITMAP32 {
+    kLift = 0x1;
+    kTilt = 0x2;
+    kPositionAwareLift = 0x4;
+    kAbsolutePosition = 0x8;
+    kPositionAwareTilt = 0x10;
   }
 
-  critical event VersionApplied = 1 {
-    INT32U softwareVersion = 0;
-    INT16U productID = 1;
+  bitmap Mode : BITMAP8 {
+    kMotorDirectionReversed = 0x1;
+    kCalibrationMode = 0x2;
+    kMaintenanceMode = 0x4;
+    kLedFeedback = 0x8;
   }
 
-  info event DownloadError = 2 {
-    INT32U softwareVersion = 0;
-    INT64U bytesDownloaded = 1;
-    nullable INT8U progressPercent = 2;
-    nullable INT64S platformCode = 3;
+  bitmap OperationalStatus : BITMAP8 {
+    kGlobal = 0x3;
+    kLift = 0xC;
+    kTilt = 0x30;
   }
 
-  attribute ProviderLocation defaultOtaProviders[] = 0;
-  readonly attribute boolean updatePossible = 1;
-  readonly attribute OTAUpdateStateEnum updateState = 2;
-  readonly attribute nullable int8u updateStateProgress = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AnnounceOtaProviderRequest {
-    node_id providerNodeId = 0;
-    vendor_id vendorId = 1;
-    OTAAnnouncementReason announcementReason = 2;
-    optional OCTET_STRING metadataForNode = 3;
-    endpoint_no endpoint = 4;
+  bitmap SafetyStatus : BITMAP16 {
+    kRemoteLockout = 0x1;
+    kTamperDetection = 0x2;
+    kFailedCommunication = 0x4;
+    kPositionFailure = 0x8;
+    kThermalProtection = 0x10;
+    kObstacleDetected = 0x20;
+    kPower = 0x40;
+    kStopInput = 0x80;
+    kMotorJammed = 0x100;
+    kHardwareFailure = 0x200;
+    kManualOperation = 0x400;
+    kProtection = 0x800;
   }
 
-  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
-}
-
-server cluster OccupancySensing = 1030 {
-  readonly attribute bitmap8 occupancy = 0;
-  readonly attribute enum8 occupancySensorType = 1;
-  readonly attribute bitmap8 occupancySensorTypeBitmap = 2;
+  readonly attribute Type type = 0;
+  readonly attribute int16u physicalClosedLimitLift = 1;
+  readonly attribute int16u physicalClosedLimitTilt = 2;
+  readonly attribute nullable int16u currentPositionLift = 3;
+  readonly attribute nullable int16u currentPositionTilt = 4;
+  readonly attribute int16u numberOfActuationsLift = 5;
+  readonly attribute int16u numberOfActuationsTilt = 6;
+  readonly attribute ConfigStatus configStatus = 7;
+  readonly attribute nullable Percent currentPositionLiftPercentage = 8;
+  readonly attribute nullable Percent currentPositionTiltPercentage = 9;
+  readonly attribute OperationalStatus operationalStatus = 10;
+  readonly attribute nullable Percent100ths targetPositionLiftPercent100ths = 11;
+  readonly attribute nullable Percent100ths targetPositionTiltPercent100ths = 12;
+  readonly attribute EndProductType endProductType = 13;
+  readonly attribute nullable Percent100ths currentPositionLiftPercent100ths = 14;
+  readonly attribute nullable Percent100ths currentPositionTiltPercent100ths = 15;
+  readonly attribute int16u installedOpenLimitLift = 16;
+  readonly attribute int16u installedClosedLimitLift = 17;
+  readonly attribute int16u installedOpenLimitTilt = 18;
+  readonly attribute int16u installedClosedLimitTilt = 19;
+  attribute access(write: manage) Mode mode = 23;
+  readonly attribute SafetyStatus safetyStatus = 26;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster OnOff = 6 {
-  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
-    kFadeToOffIn0p8Seconds = 0;
-    kNoFade = 1;
-    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
-  }
 
-  enum OnOffDyingLightEffectVariant : ENUM8 {
-    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
-  }
-
-  enum OnOffEffectIdentifier : ENUM8 {
-    kDelayedAllOff = 0;
-    kDyingLight = 1;
+  request struct GoToLiftValueRequest {
+    INT16U liftValue = 0;
   }
 
-  enum OnOffStartUpOnOff : ENUM8 {
-    kOff = 0;
-    kOn = 1;
-    kTogglePreviousOnOff = 2;
+  request struct GoToLiftPercentageRequest {
+    Percent100ths liftPercent100thsValue = 0;
   }
 
-  bitmap OnOffControl : BITMAP8 {
-    kAcceptOnlyWhenOn = 0x1;
+  request struct GoToTiltValueRequest {
+    INT16U tiltValue = 0;
   }
 
-  bitmap OnOffFeature : BITMAP32 {
-    kLighting = 0x1;
+  request struct GoToTiltPercentageRequest {
+    Percent100ths tiltPercent100thsValue = 0;
   }
 
-  bitmap SceneFeatures : BITMAP32 {
-    kSceneNames = 0x1;
-  }
+  command UpOrOpen(): DefaultSuccess = 0;
+  command DownOrClose(): DefaultSuccess = 1;
+  command StopMotion(): DefaultSuccess = 2;
+  command GoToLiftValue(GoToLiftValueRequest): DefaultSuccess = 4;
+  command GoToLiftPercentage(GoToLiftPercentageRequest): DefaultSuccess = 5;
+  command GoToTiltValue(GoToTiltValueRequest): DefaultSuccess = 7;
+  command GoToTiltPercentage(GoToTiltPercentageRequest): DefaultSuccess = 8;
+}
 
-  readonly attribute boolean onOff = 0;
-  readonly attribute boolean globalSceneControl = 16384;
-  attribute int16u onTime = 16385;
-  attribute int16u offWaitTime = 16386;
-  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
+server cluster BarrierControl = 259 {
+  readonly attribute enum8 barrierMovingState = 1;
+  readonly attribute bitmap16 barrierSafetyStatus = 2;
+  readonly attribute bitmap8 barrierCapabilities = 3;
+  readonly attribute int8u barrierPosition = 10;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct OffWithEffectRequest {
-    OnOffEffectIdentifier effectId = 0;
-    OnOffDelayedAllOffEffectVariant effectVariant = 1;
-  }
-
-  request struct OnWithTimedOffRequest {
-    OnOffControl onOffControl = 0;
-    int16u onTime = 1;
-    int16u offWaitTime = 2;
+  request struct BarrierControlGoToPercentRequest {
+    INT8U percentOpen = 0;
   }
 
-  command Off(): DefaultSuccess = 0;
-  command On(): DefaultSuccess = 1;
-  command Toggle(): DefaultSuccess = 2;
-  command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64;
-  command OnWithRecallGlobalScene(): DefaultSuccess = 65;
-  command OnWithTimedOff(OnWithTimedOffRequest): DefaultSuccess = 66;
+  command BarrierControlGoToPercent(BarrierControlGoToPercentRequest): DefaultSuccess = 0;
+  command BarrierControlStop(): DefaultSuccess = 1;
 }
 
-server cluster OnOffSwitchConfiguration = 7 {
-  readonly attribute enum8 switchType = 0;
-  attribute enum8 switchActions = 16;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+server cluster PumpConfigurationAndControl = 512 {
+  enum PumpControlMode : ENUM8 {
+    kConstantSpeed = 0;
+    kConstantPressure = 1;
+    kProportionalPressure = 2;
+    kConstantFlow = 3;
+    kConstantTemperature = 5;
+    kAutomatic = 7;
+  }
 
-server cluster OperationalCredentials = 62 {
-  enum OperationalCertStatus : ENUM8 {
-    kSuccess = 0;
-    kInvalidPublicKey = 1;
-    kInvalidNodeOpId = 2;
-    kInvalidNOC = 3;
-    kMissingCsr = 4;
-    kTableFull = 5;
-    kInvalidAdminSubject = 6;
-    kInsufficientPrivilege = 8;
-    kFabricConflict = 9;
-    kLabelConflict = 10;
-    kInvalidFabricIndex = 11;
+  enum PumpOperationMode : ENUM8 {
+    kNormal = 0;
+    kMinimum = 1;
+    kMaximum = 2;
+    kLocal = 3;
   }
 
-  struct NOCStruct {
-    octet_string noc = 1;
-    nullable octet_string icac = 2;
-    fabric_idx fabricIndex = 254;
+  bitmap PumpStatus : BITMAP16 {
+    kDeviceFault = 0x1;
+    kSupplyfault = 0x2;
+    kSpeedLow = 0x4;
+    kSpeedHigh = 0x8;
+    kLocalOverride = 0x10;
+    kRunning = 0x20;
+    kRemotePressure = 0x40;
+    kRemoteFlow = 0x80;
+    kRemoteTemperature = 0x100;
   }
 
-  struct FabricDescriptor {
-    octet_string<65> rootPublicKey = 1;
-    vendor_id vendorId = 2;
-    fabric_id fabricId = 3;
-    node_id nodeId = 4;
-    char_string<32> label = 5;
-    fabric_idx fabricIndex = 254;
+  info event SupplyVoltageLow = 0 {
   }
 
-  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
-  readonly attribute FabricDescriptor fabrics[] = 1;
-  readonly attribute int8u supportedFabrics = 2;
-  readonly attribute int8u commissionedFabrics = 3;
-  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
-  readonly attribute fabric_idx currentFabricIndex = 5;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  info event SupplyVoltageHigh = 1 {
+  }
 
-  request struct AttestationRequestRequest {
-    OCTET_STRING attestationNonce = 0;
+  info event PowerMissingPhase = 2 {
   }
 
-  request struct CertificateChainRequestRequest {
-    INT8U certificateType = 0;
+  info event SystemPressureLow = 3 {
   }
 
-  request struct CSRRequestRequest {
-    OCTET_STRING CSRNonce = 0;
-    optional boolean isForUpdateNOC = 1;
+  info event SystemPressureHigh = 4 {
   }
 
-  request struct AddNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
-    OCTET_STRING IPKValue = 2;
-    Int64u caseAdminSubject = 3;
-    VENDOR_ID adminVendorId = 4;
+  critical event DryRunning = 5 {
   }
 
-  request struct UpdateNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
+  info event MotorTemperatureHigh = 6 {
   }
 
-  request struct UpdateFabricLabelRequest {
-    CHAR_STRING label = 0;
+  critical event PumpMotorFatalFailure = 7 {
   }
 
-  request struct RemoveFabricRequest {
-    fabric_idx fabricIndex = 0;
+  info event ElectronicTemperatureHigh = 8 {
   }
 
-  request struct AddTrustedRootCertificateRequest {
-    OCTET_STRING rootCertificate = 0;
+  critical event PumpBlocked = 9 {
   }
 
-  response struct AttestationResponse = 1 {
-    OCTET_STRING attestationElements = 0;
-    OCTET_STRING signature = 1;
+  info event SensorFailure = 10 {
   }
 
-  response struct CertificateChainResponse = 3 {
-    OCTET_STRING certificate = 0;
+  info event ElectronicNonFatalFailure = 11 {
   }
 
-  response struct CSRResponse = 5 {
-    OCTET_STRING NOCSRElements = 0;
-    OCTET_STRING attestationSignature = 1;
+  critical event ElectronicFatalFailure = 12 {
   }
 
-  response struct NOCResponse = 8 {
-    OperationalCertStatus statusCode = 0;
-    optional fabric_idx fabricIndex = 1;
-    optional CHAR_STRING debugText = 2;
+  info event GeneralFault = 13 {
   }
 
-  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
-  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
-  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
-  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
-  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
-  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
-  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
-  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-}
+  info event Leakage = 14 {
+  }
 
-server cluster PowerSource = 47 {
-  enum BatChargeFaultType : ENUM8 {
-    kUnspecfied = 0;
-    kAmbientTooHot = 1;
-    kAmbientTooCold = 2;
-    kBatteryTooHot = 3;
-    kBatteryTooCold = 4;
-    kBatteryAbsent = 5;
-    kBatteryOverVoltage = 6;
-    kBatteryUnderVoltage = 7;
-    kChargerOverVoltage = 8;
-    kChargerUnderVoltage = 9;
-    kSafetyTimeout = 10;
+  info event AirDetection = 15 {
   }
 
-  enum BatChargeLevel : ENUM8 {
-    kOk = 0;
-    kWarning = 1;
-    kCritical = 2;
+  info event TurbineOperation = 16 {
   }
 
-  enum BatChargeState : ENUM8 {
-    kUnknown = 0;
-    kIsCharging = 1;
-    kIsAtFullCharge = 2;
-    kIsNotCharging = 3;
+  readonly attribute nullable int16s maxPressure = 0;
+  readonly attribute nullable int16u maxSpeed = 1;
+  readonly attribute nullable int16u maxFlow = 2;
+  readonly attribute nullable int16s minConstPressure = 3;
+  readonly attribute nullable int16s maxConstPressure = 4;
+  readonly attribute nullable int16s minCompPressure = 5;
+  readonly attribute nullable int16s maxCompPressure = 6;
+  readonly attribute nullable int16u minConstSpeed = 7;
+  readonly attribute nullable int16u maxConstSpeed = 8;
+  readonly attribute nullable int16u minConstFlow = 9;
+  readonly attribute nullable int16u maxConstFlow = 10;
+  readonly attribute nullable int16s minConstTemp = 11;
+  readonly attribute nullable int16s maxConstTemp = 12;
+  readonly attribute PumpStatus pumpStatus = 16;
+  readonly attribute PumpOperationMode effectiveOperationMode = 17;
+  readonly attribute PumpControlMode effectiveControlMode = 18;
+  readonly attribute nullable int16s capacity = 19;
+  readonly attribute nullable int16u speed = 20;
+  attribute access(write: manage) nullable int24u lifetimeRunningHours = 21;
+  readonly attribute nullable int24u power = 22;
+  attribute access(write: manage) nullable int32u lifetimeEnergyConsumed = 23;
+  attribute access(write: manage) PumpOperationMode operationMode = 32;
+  attribute access(write: manage) PumpControlMode controlMode = 33;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Thermostat = 513 {
+  enum SetpointAdjustMode : ENUM8 {
+    kHeatSetpoint = 0;
+    kCoolSetpoint = 1;
+    kHeatAndCoolSetpoints = 2;
   }
 
-  enum BatFaultType : ENUM8 {
-    kUnspecfied = 0;
-    kOverTemp = 1;
-    kUnderTemp = 2;
+  enum ThermostatControlSequence : ENUM8 {
+    kCoolingOnly = 0;
+    kCoolingWithReheat = 1;
+    kHeatingOnly = 2;
+    kHeatingWithReheat = 3;
+    kCoolingAndHeating = 4;
+    kCoolingAndHeatingWithReheat = 5;
   }
 
-  enum BatReplaceability : ENUM8 {
-    kUnspecified = 0;
-    kNotReplaceable = 1;
-    kUserReplaceable = 2;
-    kFactoryReplaceable = 3;
+  enum ThermostatRunningMode : ENUM8 {
+    kOff = 0;
+    kCool = 3;
+    kHeat = 4;
   }
 
-  enum PowerSourceStatus : ENUM8 {
-    kUnspecfied = 0;
-    kActive = 1;
-    kStandby = 2;
-    kUnavailable = 3;
+  enum ThermostatSystemMode : ENUM8 {
+    kOff = 0;
+    kAuto = 1;
+    kCool = 3;
+    kHeat = 4;
+    kEmergencyHeating = 5;
+    kPrecooling = 6;
+    kFanOnly = 7;
   }
 
-  enum WiredCurrentType : ENUM8 {
-    kAc = 0;
-    kDc = 1;
+  bitmap DayOfWeek : BITMAP8 {
+    kSunday = 0x1;
+    kMonday = 0x2;
+    kTuesday = 0x4;
+    kWednesday = 0x8;
+    kThursday = 0x10;
+    kFriday = 0x20;
+    kSaturday = 0x40;
+    kAwayOrVacation = 0x80;
   }
 
-  enum WiredFaultType : ENUM8 {
-    kUnspecfied = 0;
-    kOverVoltage = 1;
-    kUnderVoltage = 2;
+  bitmap ModeForSequence : BITMAP8 {
+    kHeatSetpointFieldPresent = 0x1;
+    kCoolSetpointFieldPresent = 0x2;
   }
 
-  bitmap PowerSourceFeature : BITMAP32 {
-    kWired = 0x1;
-    kBattery = 0x2;
-    kRechargeable = 0x4;
-    kReplaceable = 0x8;
+  bitmap ThermostatFeature : BITMAP32 {
+    kHeating = 0x1;
+    kCooling = 0x2;
+    kOccupancy = 0x4;
+    kSchedule = 0x8;
+    kSetback = 0x10;
+    kAutomode = 0x20;
   }
 
-  readonly attribute enum8 status = 0;
-  readonly attribute int8u order = 1;
-  readonly attribute char_string<60> description = 2;
-  readonly attribute enum8 batteryChargeLevel = 14;
-  readonly attribute boolean batteryReplacementNeeded = 15;
-  readonly attribute enum8 batteryReplaceability = 16;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  struct ThermostatScheduleTransition {
+    int16u transitionTime = 0;
+    nullable int16s heatSetpoint = 1;
+    nullable int16s coolSetpoint = 2;
+  }
 
-server cluster PowerSourceConfiguration = 46 {
-  readonly attribute INT8U sources[] = 0;
+  readonly attribute nullable int16s localTemperature = 0;
+  readonly attribute int16s absMinHeatSetpointLimit = 3;
+  readonly attribute int16s absMaxHeatSetpointLimit = 4;
+  readonly attribute int16s absMinCoolSetpointLimit = 5;
+  readonly attribute int16s absMaxCoolSetpointLimit = 6;
+  attribute int16s occupiedCoolingSetpoint = 17;
+  attribute int16s occupiedHeatingSetpoint = 18;
+  attribute access(write: manage) int16s minHeatSetpointLimit = 21;
+  attribute access(write: manage) int16s maxHeatSetpointLimit = 22;
+  attribute access(write: manage) int16s minCoolSetpointLimit = 23;
+  attribute access(write: manage) int16s maxCoolSetpointLimit = 24;
+  attribute access(write: manage) int8s minSetpointDeadBand = 25;
+  attribute access(write: manage) ThermostatControlSequence controlSequenceOfOperation = 27;
+  attribute access(write: manage) enum8 systemMode = 28;
+  readonly attribute enum8 thermostatRunningMode = 30;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster PressureMeasurement = 1027 {
-  bitmap PressureFeature : BITMAP32 {
-    kExt = 0x1;
+  request struct SetpointRaiseLowerRequest {
+    SetpointAdjustMode mode = 0;
+    INT8S amount = 1;
   }
 
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0;
 }
 
-server cluster PumpConfigurationAndControl = 512 {
-  enum PumpControlMode : ENUM8 {
-    kConstantSpeed = 0;
-    kConstantPressure = 1;
-    kProportionalPressure = 2;
-    kConstantFlow = 3;
-    kConstantTemperature = 5;
-    kAutomatic = 7;
+server cluster FanControl = 514 {
+  enum FanModeSequenceType : ENUM8 {
+    kOffLowMedHigh = 0;
+    kOffLowHigh = 1;
+    kOffLowMedHighAuto = 2;
+    kOffLowHighAuto = 3;
+    kOffOnAuto = 4;
+    kOffOn = 5;
   }
 
-  enum PumpOperationMode : ENUM8 {
-    kNormal = 0;
-    kMinimum = 1;
-    kMaximum = 2;
-    kLocal = 3;
+  enum FanModeType : ENUM8 {
+    kOff = 0;
+    kLow = 1;
+    kMedium = 2;
+    kHigh = 3;
+    kOn = 4;
+    kAuto = 5;
+    kSmart = 6;
   }
 
-  bitmap PumpStatus : BITMAP16 {
-    kDeviceFault = 0x1;
-    kSupplyfault = 0x2;
-    kSpeedLow = 0x4;
-    kSpeedHigh = 0x8;
-    kLocalOverride = 0x10;
-    kRunning = 0x20;
-    kRemotePressure = 0x40;
-    kRemoteFlow = 0x80;
-    kRemoteTemperature = 0x100;
+  bitmap FanControlFeature : BITMAP32 {
+    kMultiSpeed = 0x1;
+    kAuto = 0x2;
+    kRocking = 0x4;
+    kWind = 0x8;
   }
 
-  info event SupplyVoltageLow = 0 {
+  bitmap RockSupportMask : BITMAP8 {
+    kRockLeftRight = 0x1;
+    kRockUpDown = 0x2;
+    kRockRound = 0x4;
   }
 
-  info event SupplyVoltageHigh = 1 {
+  bitmap WindSettingMask : BITMAP8 {
+    kSleepWind = 0x1;
+    kNaturalWind = 0x2;
   }
 
-  info event PowerMissingPhase = 2 {
+  bitmap WindSupportMask : BITMAP8 {
+    kSleepWind = 0x1;
+    kNaturalWind = 0x2;
   }
 
-  info event SystemPressureLow = 3 {
-  }
+  attribute FanModeType fanMode = 0;
+  attribute FanModeSequenceType fanModeSequence = 1;
+  attribute nullable int8u percentSetting = 2;
+  readonly attribute int8u percentCurrent = 3;
+  readonly attribute int8u speedMax = 4;
+  attribute nullable int8u speedSetting = 5;
+  readonly attribute int8u speedCurrent = 6;
+  readonly attribute bitmap8 rockSupport = 7;
+  attribute bitmap8 rockSetting = 8;
+  readonly attribute bitmap8 windSupport = 9;
+  attribute bitmap8 windSetting = 10;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  info event SystemPressureHigh = 4 {
+server cluster ThermostatUserInterfaceConfiguration = 516 {
+  attribute enum8 temperatureDisplayMode = 0;
+  attribute access(write: manage) enum8 keypadLockout = 1;
+  attribute access(write: manage) enum8 scheduleProgrammingVisibility = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster ColorControl = 768 {
+  enum ColorLoopAction : ENUM8 {
+    kDeactivate = 0;
+    kActivateFromColorLoopStartEnhancedHue = 1;
+    kActivateFromEnhancedCurrentHue = 2;
   }
 
-  critical event DryRunning = 5 {
+  enum ColorLoopDirection : ENUM8 {
+    kDecrementHue = 0;
+    kIncrementHue = 1;
   }
 
-  info event MotorTemperatureHigh = 6 {
+  enum ColorMode : ENUM8 {
+    kCurrentHueAndCurrentSaturation = 0;
+    kCurrentXAndCurrentY = 1;
+    kColorTemperature = 2;
   }
 
-  critical event PumpMotorFatalFailure = 7 {
+  enum HueDirection : ENUM8 {
+    kShortestDistance = 0;
+    kLongestDistance = 1;
+    kUp = 2;
+    kDown = 3;
   }
 
-  info event ElectronicTemperatureHigh = 8 {
+  enum HueMoveMode : ENUM8 {
+    kStop = 0;
+    kUp = 1;
+    kDown = 3;
   }
 
-  critical event PumpBlocked = 9 {
-  }
-
-  info event SensorFailure = 10 {
-  }
-
-  info event ElectronicNonFatalFailure = 11 {
+  enum HueStepMode : ENUM8 {
+    kUp = 1;
+    kDown = 3;
   }
 
-  critical event ElectronicFatalFailure = 12 {
+  enum SaturationMoveMode : ENUM8 {
+    kStop = 0;
+    kUp = 1;
+    kDown = 3;
   }
 
-  info event GeneralFault = 13 {
+  enum SaturationStepMode : ENUM8 {
+    kUp = 1;
+    kDown = 3;
   }
 
-  info event Leakage = 14 {
+  bitmap ColorCapabilities : BITMAP16 {
+    kHueSaturationSupported = 0x1;
+    kEnhancedHueSupported = 0x2;
+    kColorLoopSupported = 0x4;
+    kXYAttributesSupported = 0x8;
+    kColorTemperatureSupported = 0x10;
   }
 
-  info event AirDetection = 15 {
+  bitmap ColorControlFeature : BITMAP32 {
+    kHueAndSaturation = 0x1;
+    kEnhancedHue = 0x2;
+    kColorLoop = 0x4;
+    kXy = 0x8;
+    kColorTemperature = 0x10;
   }
 
-  info event TurbineOperation = 16 {
+  bitmap ColorLoopUpdateFlags : BITMAP8 {
+    kUpdateAction = 0x1;
+    kUpdateDirection = 0x2;
+    kUpdateTime = 0x4;
+    kUpdateStartHue = 0x8;
   }
 
-  readonly attribute nullable int16s maxPressure = 0;
-  readonly attribute nullable int16u maxSpeed = 1;
-  readonly attribute nullable int16u maxFlow = 2;
-  readonly attribute nullable int16s minConstPressure = 3;
-  readonly attribute nullable int16s maxConstPressure = 4;
-  readonly attribute nullable int16s minCompPressure = 5;
-  readonly attribute nullable int16s maxCompPressure = 6;
-  readonly attribute nullable int16u minConstSpeed = 7;
-  readonly attribute nullable int16u maxConstSpeed = 8;
-  readonly attribute nullable int16u minConstFlow = 9;
-  readonly attribute nullable int16u maxConstFlow = 10;
-  readonly attribute nullable int16s minConstTemp = 11;
-  readonly attribute nullable int16s maxConstTemp = 12;
-  readonly attribute PumpStatus pumpStatus = 16;
-  readonly attribute PumpOperationMode effectiveOperationMode = 17;
-  readonly attribute PumpControlMode effectiveControlMode = 18;
-  readonly attribute nullable int16s capacity = 19;
-  readonly attribute nullable int16u speed = 20;
-  attribute access(write: manage) nullable int24u lifetimeRunningHours = 21;
-  readonly attribute nullable int24u power = 22;
-  attribute access(write: manage) nullable int32u lifetimeEnergyConsumed = 23;
-  attribute access(write: manage) PumpOperationMode operationMode = 32;
-  attribute access(write: manage) PumpControlMode controlMode = 33;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster RelativeHumidityMeasurement = 1029 {
-  readonly attribute nullable int16u measuredValue = 0;
-  readonly attribute nullable int16u minMeasuredValue = 1;
-  readonly attribute nullable int16u maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
+  readonly attribute int8u currentHue = 0;
+  readonly attribute int8u currentSaturation = 1;
+  readonly attribute int16u remainingTime = 2;
+  readonly attribute int16u currentX = 3;
+  readonly attribute int16u currentY = 4;
+  readonly attribute enum8 driftCompensation = 5;
+  readonly attribute char_string<254> compensationText = 6;
+  readonly attribute int16u colorTemperature = 7;
+  readonly attribute enum8 colorMode = 8;
+  attribute bitmap8 options = 15;
+  readonly attribute nullable int8u numberOfPrimaries = 16;
+  readonly attribute int16u primary1X = 17;
+  readonly attribute int16u primary1Y = 18;
+  readonly attribute nullable int8u primary1Intensity = 19;
+  readonly attribute int16u primary2X = 21;
+  readonly attribute int16u primary2Y = 22;
+  readonly attribute nullable int8u primary2Intensity = 23;
+  readonly attribute int16u primary3X = 25;
+  readonly attribute int16u primary3Y = 26;
+  readonly attribute nullable int8u primary3Intensity = 27;
+  readonly attribute int16u primary4X = 32;
+  readonly attribute int16u primary4Y = 33;
+  readonly attribute nullable int8u primary4Intensity = 34;
+  readonly attribute int16u primary5X = 36;
+  readonly attribute int16u primary5Y = 37;
+  readonly attribute nullable int8u primary5Intensity = 38;
+  readonly attribute int16u primary6X = 40;
+  readonly attribute int16u primary6Y = 41;
+  readonly attribute nullable int8u primary6Intensity = 42;
+  attribute access(write: manage) int16u whitePointX = 48;
+  attribute access(write: manage) int16u whitePointY = 49;
+  attribute access(write: manage) int16u colorPointRX = 50;
+  attribute access(write: manage) int16u colorPointRY = 51;
+  attribute access(write: manage) nullable int8u colorPointRIntensity = 52;
+  attribute access(write: manage) int16u colorPointGX = 54;
+  attribute access(write: manage) int16u colorPointGY = 55;
+  attribute access(write: manage) nullable int8u colorPointGIntensity = 56;
+  attribute access(write: manage) int16u colorPointBX = 58;
+  attribute access(write: manage) int16u colorPointBY = 59;
+  attribute access(write: manage) nullable int8u colorPointBIntensity = 60;
+  readonly attribute int16u enhancedCurrentHue = 16384;
+  readonly attribute enum8 enhancedColorMode = 16385;
+  readonly attribute int8u colorLoopActive = 16386;
+  readonly attribute int8u colorLoopDirection = 16387;
+  readonly attribute int16u colorLoopTime = 16388;
+  readonly attribute int16u colorLoopStartEnhancedHue = 16389;
+  readonly attribute int16u colorLoopStoredEnhancedHue = 16390;
+  readonly attribute bitmap16 colorCapabilities = 16394;
+  readonly attribute int16u colorTempPhysicalMinMireds = 16395;
+  readonly attribute int16u colorTempPhysicalMaxMireds = 16396;
+  readonly attribute int16u coupleColorTempToLevelMinMireds = 16397;
+  attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster Scenes = 5 {
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
-  }
 
-  struct ExtensionFieldSet {
-    cluster_id clusterId = 0;
-    AttributeValuePair attributeValueList[] = 1;
+  request struct MoveToHueRequest {
+    INT8U hue = 0;
+    HueDirection direction = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
   }
 
-  struct AttributeValuePair {
-    optional attrib_id attributeId = 0;
-    int8u attributeValue[] = 1;
+  request struct MoveHueRequest {
+    HueMoveMode moveMode = 0;
+    INT8U rate = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
   }
 
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AddSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    INT16U transitionTime = 2;
-    CHAR_STRING sceneName = 3;
-    ExtensionFieldSet extensionFieldSets[] = 4;
+  request struct StepHueRequest {
+    HueStepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT8U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
   }
 
-  request struct ViewSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
+  request struct MoveToSaturationRequest {
+    INT8U saturation = 0;
+    INT16U transitionTime = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
   }
 
-  request struct RemoveSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
+  request struct MoveSaturationRequest {
+    SaturationMoveMode moveMode = 0;
+    INT8U rate = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
   }
 
-  request struct RemoveAllScenesRequest {
-    group_id groupId = 0;
+  request struct StepSaturationRequest {
+    SaturationStepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT8U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
   }
 
-  request struct StoreSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
+  request struct MoveToHueAndSaturationRequest {
+    INT8U hue = 0;
+    INT8U saturation = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
   }
 
-  request struct RecallSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    optional nullable INT16U transitionTime = 2;
+  request struct MoveToColorRequest {
+    INT16U colorX = 0;
+    INT16U colorY = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
   }
 
-  request struct GetSceneMembershipRequest {
-    group_id groupId = 0;
+  request struct MoveColorRequest {
+    INT16S rateX = 0;
+    INT16S rateY = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
   }
 
-  response struct AddSceneResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
+  request struct StepColorRequest {
+    INT16S stepX = 0;
+    INT16S stepY = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
   }
 
-  response struct ViewSceneResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-    optional INT16U transitionTime = 3;
-    optional CHAR_STRING sceneName = 4;
-    optional ExtensionFieldSet extensionFieldSets[] = 5;
+  request struct MoveToColorTemperatureRequest {
+    INT16U colorTemperature = 0;
+    INT16U transitionTime = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
   }
 
-  response struct RemoveSceneResponse = 2 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
+  request struct EnhancedMoveToHueRequest {
+    INT16U enhancedHue = 0;
+    HueDirection direction = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
   }
 
-  response struct RemoveAllScenesResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  request struct EnhancedMoveHueRequest {
+    HueMoveMode moveMode = 0;
+    INT16U rate = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
   }
 
-  response struct StoreSceneResponse = 4 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
+  request struct EnhancedStepHueRequest {
+    HueStepMode stepMode = 0;
+    INT16U stepSize = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
   }
 
-  response struct GetSceneMembershipResponse = 6 {
-    ENUM8 status = 0;
-    nullable INT8U capacity = 1;
-    group_id groupId = 2;
-    optional INT8U sceneList[] = 3;
+  request struct EnhancedMoveToHueAndSaturationRequest {
+    INT16U enhancedHue = 0;
+    INT8U saturation = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
   }
 
-  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
-  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
-  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
-  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
-  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
-  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
-  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
-}
+  request struct ColorLoopSetRequest {
+    ColorLoopUpdateFlags updateFlags = 0;
+    ColorLoopAction action = 1;
+    ColorLoopDirection direction = 2;
+    INT16U time = 3;
+    INT16U startHue = 4;
+    BITMAP8 optionsMask = 5;
+    BITMAP8 optionsOverride = 6;
+  }
 
-server cluster SoftwareDiagnostics = 52 {
-  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
-    kWaterMarks = 0x1;
+  request struct StopMoveStepRequest {
+    BITMAP8 optionsMask = 0;
+    BITMAP8 optionsOverride = 1;
   }
 
-  struct ThreadMetrics {
-    int64u id = 0;
-    optional char_string<8> name = 1;
-    optional int32u stackFreeCurrent = 2;
-    optional int32u stackFreeMinimum = 3;
-    optional int32u stackSize = 4;
+  request struct MoveColorTemperatureRequest {
+    HueMoveMode moveMode = 0;
+    INT16U rate = 1;
+    INT16U colorTemperatureMinimumMireds = 2;
+    INT16U colorTemperatureMaximumMireds = 3;
+    BITMAP8 optionsMask = 4;
+    BITMAP8 optionsOverride = 5;
   }
 
-  info event SoftwareFault = 0 {
-    SoftwareFaultStruct softwareFault = 0;
+  request struct StepColorTemperatureRequest {
+    HueStepMode stepMode = 0;
+    INT16U stepSize = 1;
+    INT16U transitionTime = 2;
+    INT16U colorTemperatureMinimumMireds = 3;
+    INT16U colorTemperatureMaximumMireds = 4;
+    BITMAP8 optionsMask = 5;
+    BITMAP8 optionsOverride = 6;
   }
 
-  readonly attribute ThreadMetrics threadMetrics[] = 0;
-  readonly attribute int64u currentHeapFree = 1;
-  readonly attribute int64u currentHeapUsed = 2;
-  readonly attribute int64u currentHeapHighWatermark = 3;
+  command MoveToHue(MoveToHueRequest): DefaultSuccess = 0;
+  command MoveHue(MoveHueRequest): DefaultSuccess = 1;
+  command StepHue(StepHueRequest): DefaultSuccess = 2;
+  command MoveToSaturation(MoveToSaturationRequest): DefaultSuccess = 3;
+  command MoveSaturation(MoveSaturationRequest): DefaultSuccess = 4;
+  command StepSaturation(StepSaturationRequest): DefaultSuccess = 5;
+  command MoveToHueAndSaturation(MoveToHueAndSaturationRequest): DefaultSuccess = 6;
+  command MoveToColor(MoveToColorRequest): DefaultSuccess = 7;
+  command MoveColor(MoveColorRequest): DefaultSuccess = 8;
+  command StepColor(StepColorRequest): DefaultSuccess = 9;
+  command MoveToColorTemperature(MoveToColorTemperatureRequest): DefaultSuccess = 10;
+  command EnhancedMoveToHue(EnhancedMoveToHueRequest): DefaultSuccess = 64;
+  command EnhancedMoveHue(EnhancedMoveHueRequest): DefaultSuccess = 65;
+  command EnhancedStepHue(EnhancedStepHueRequest): DefaultSuccess = 66;
+  command EnhancedMoveToHueAndSaturation(EnhancedMoveToHueAndSaturationRequest): DefaultSuccess = 67;
+  command ColorLoopSet(ColorLoopSetRequest): DefaultSuccess = 68;
+  command StopMoveStep(StopMoveStepRequest): DefaultSuccess = 71;
+  command MoveColorTemperature(MoveColorTemperatureRequest): DefaultSuccess = 75;
+  command StepColorTemperature(StepColorTemperatureRequest): DefaultSuccess = 76;
+}
+
+server cluster IlluminanceMeasurement = 1024 {
+  enum LightSensorType : ENUM8 {
+    kPhotodiode = 0;
+    kCmos = 1;
+  }
+
+  readonly attribute nullable int16u measuredValue = 0;
+  readonly attribute nullable int16u minMeasuredValue = 1;
+  readonly attribute nullable int16u maxMeasuredValue = 2;
+  readonly attribute int16u tolerance = 3;
+  readonly attribute nullable enum8 lightSensorType = 4;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+server cluster TemperatureMeasurement = 1026 {
+  readonly attribute nullable int16s measuredValue = 0;
+  readonly attribute nullable int16s minMeasuredValue = 1;
+  readonly attribute nullable int16s maxMeasuredValue = 2;
+  readonly attribute int16u tolerance = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster Switch = 59 {
-  info event SwitchLatched = 0 {
-    INT8U newPosition = 0;
+server cluster PressureMeasurement = 1027 {
+  bitmap PressureFeature : BITMAP32 {
+    kExt = 0x1;
   }
 
-  info event InitialPress = 1 {
-    INT8U newPosition = 0;
-  }
+  readonly attribute nullable int16s measuredValue = 0;
+  readonly attribute nullable int16s minMeasuredValue = 1;
+  readonly attribute nullable int16s maxMeasuredValue = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  info event LongPress = 2 {
-    INT8U newPosition = 0;
-  }
+server cluster FlowMeasurement = 1028 {
+  readonly attribute nullable int16u measuredValue = 0;
+  readonly attribute nullable int16u minMeasuredValue = 1;
+  readonly attribute nullable int16u maxMeasuredValue = 2;
+  readonly attribute int16u tolerance = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  info event ShortRelease = 3 {
-    INT8U previousPosition = 0;
+server cluster RelativeHumidityMeasurement = 1029 {
+  readonly attribute nullable int16u measuredValue = 0;
+  readonly attribute nullable int16u minMeasuredValue = 1;
+  readonly attribute nullable int16u maxMeasuredValue = 2;
+  readonly attribute int16u tolerance = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster OccupancySensing = 1030 {
+  readonly attribute bitmap8 occupancy = 0;
+  readonly attribute enum8 occupancySensorType = 1;
+  readonly attribute bitmap8 occupancySensorTypeBitmap = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster WakeOnLan = 1283 {
+  readonly attribute char_string<32> MACAddress = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Channel = 1284 {
+  enum ChannelStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kMultipleMatches = 1;
+    kNoMatches = 2;
   }
 
-  info event LongRelease = 4 {
-    INT8U previousPosition = 0;
+  enum LineupInfoTypeEnum : ENUM8 {
+    kMso = 0;
   }
 
-  info event MultiPressOngoing = 5 {
-    INT8U newPosition = 0;
-    INT8U currentNumberOfPressesCounted = 1;
+  bitmap ChannelFeature : BITMAP32 {
+    kChannelList = 0x1;
+    kLineupInfo = 0x2;
   }
 
-  info event MultiPressComplete = 6 {
-    INT8U newPosition = 0;
-    INT8U totalNumberOfPressesCounted = 1;
+  struct ChannelInfo {
+    int16u majorNumber = 0;
+    int16u minorNumber = 1;
+    optional char_string<32> name = 2;
+    optional char_string<32> callSign = 3;
+    optional char_string<32> affiliateCallSign = 4;
   }
 
-  readonly attribute int8u numberOfPositions = 0;
-  readonly attribute int8u currentPosition = 1;
-  readonly attribute int8u multiPressMax = 2;
+  readonly attribute ChannelInfo channelList[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
@@ -2966,839 +3125,680 @@ server cluster TargetNavigator = 1285 {
   command NavigateTarget(NavigateTargetRequest): NavigateTargetResponse = 0;
 }
 
-server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
+server cluster MediaPlayback = 1286 {
+  enum MediaPlaybackStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kInvalidStateForCommand = 1;
+    kNotAllowed = 2;
+    kNotActive = 3;
+    kSpeedOutOfRange = 4;
+    kSeekOutOfRange = 5;
+  }
+
+  enum PlaybackStateEnum : ENUM8 {
+    kPlaying = 0;
+    kPaused = 1;
+    kNotPlaying = 2;
+    kBuffering = 3;
+  }
+
+  readonly attribute PlaybackStateEnum currentState = 0;
+  readonly attribute nullable epoch_us startTime = 1;
+  readonly attribute nullable int64u duration = 2;
+  readonly attribute single playbackSpeed = 4;
+  readonly attribute nullable int64u seekRangeEnd = 5;
+  readonly attribute nullable int64u seekRangeStart = 6;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster TestCluster = 4294048773 {
-  enum SimpleEnum : ENUM8 {
-    kUnspecified = 0;
-    kValueA = 1;
-    kValueB = 2;
-    kValueC = 3;
+server cluster MediaInput = 1287 {
+  enum InputTypeEnum : ENUM8 {
+    kInternal = 0;
+    kAux = 1;
+    kCoax = 2;
+    kComposite = 3;
+    kHdmi = 4;
+    kInput = 5;
+    kLine = 6;
+    kOptical = 7;
+    kVideo = 8;
+    kScart = 9;
+    kUsb = 10;
+    kOther = 11;
   }
 
-  bitmap Bitmap16MaskMap : BITMAP16 {
-    kMaskVal1 = 0x1;
-    kMaskVal2 = 0x2;
-    kMaskVal3 = 0x4;
-    kMaskVal4 = 0x4000;
+  bitmap MediaInputFeature : BITMAP32 {
+    kNameUpdates = 0x1;
   }
 
-  bitmap Bitmap32MaskMap : BITMAP32 {
-    kMaskVal1 = 0x1;
-    kMaskVal2 = 0x2;
-    kMaskVal3 = 0x4;
-    kMaskVal4 = 0x40000000;
+  struct InputInfo {
+    int8u index = 0;
+    InputTypeEnum inputType = 1;
+    char_string<32> name = 2;
+    char_string<32> description = 3;
   }
 
-  bitmap Bitmap64MaskMap : BITMAP64 {
-    kMaskVal1 = 0x1;
-    kMaskVal2 = 0x2;
-    kMaskVal3 = 0x4;
-    kMaskVal4 = 0x4000000000000000;
+  readonly attribute InputInfo inputList[] = 0;
+  readonly attribute int8u currentInput = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct SelectInputRequest {
+    INT8U index = 0;
   }
 
-  bitmap Bitmap8MaskMap : BITMAP8 {
-    kMaskVal1 = 0x1;
-    kMaskVal2 = 0x2;
-    kMaskVal3 = 0x4;
-    kMaskVal4 = 0x40;
+  request struct RenameInputRequest {
+    INT8U index = 0;
+    CHAR_STRING name = 1;
   }
 
-  bitmap SimpleBitmap : BITMAP8 {
-    kValueA = 0x1;
-    kValueB = 0x2;
-    kValueC = 0x4;
+  command SelectInput(SelectInputRequest): DefaultSuccess = 0;
+  command ShowInputStatus(): DefaultSuccess = 1;
+  command HideInputStatus(): DefaultSuccess = 2;
+  command RenameInput(RenameInputRequest): DefaultSuccess = 3;
+}
+
+server cluster LowPower = 1288 {
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command Sleep(): DefaultSuccess = 0;
+}
+
+server cluster KeypadInput = 1289 {
+  enum CecKeyCode : ENUM8 {
+    kSelect = 0;
+    kUp = 1;
+    kDown = 2;
+    kLeft = 3;
+    kRight = 4;
+    kRightUp = 5;
+    kRightDown = 6;
+    kLeftUp = 7;
+    kLeftDown = 8;
+    kRootMenu = 9;
+    kSetupMenu = 10;
+    kContentsMenu = 11;
+    kFavoriteMenu = 12;
+    kExit = 13;
+    kMediaTopMenu = 16;
+    kMediaContextSensitiveMenu = 17;
+    kNumberEntryMode = 29;
+    kNumber11 = 30;
+    kNumber12 = 31;
+    kNumber0OrNumber10 = 32;
+    kNumbers1 = 33;
+    kNumbers2 = 34;
+    kNumbers3 = 35;
+    kNumbers4 = 36;
+    kNumbers5 = 37;
+    kNumbers6 = 38;
+    kNumbers7 = 39;
+    kNumbers8 = 40;
+    kNumbers9 = 41;
+    kDot = 42;
+    kEnter = 43;
+    kClear = 44;
+    kNextFavorite = 47;
+    kChannelUp = 48;
+    kChannelDown = 49;
+    kPreviousChannel = 50;
+    kSoundSelect = 51;
+    kInputSelect = 52;
+    kDisplayInformation = 53;
+    kHelp = 54;
+    kPageUp = 55;
+    kPageDown = 56;
+    kPower = 64;
+    kVolumeUp = 65;
+    kVolumeDown = 66;
+    kMute = 67;
+    kPlay = 68;
+    kStop = 69;
+    kPause = 70;
+    kRecord = 71;
+    kRewind = 72;
+    kFastForward = 73;
+    kEject = 74;
+    kForward = 75;
+    kBackward = 76;
+    kStopRecord = 77;
+    kPauseRecord = 78;
+    kReserved = 79;
+    kAngle = 80;
+    kSubPicture = 81;
+    kVideoOnDemand = 82;
+    kElectronicProgramGuide = 83;
+    kTimerProgramming = 84;
+    kInitialConfiguration = 85;
+    kSelectBroadcastType = 86;
+    kSelectSoundPresentation = 87;
+    kPlayFunction = 96;
+    kPausePlayFunction = 97;
+    kRecordFunction = 98;
+    kPauseRecordFunction = 99;
+    kStopFunction = 100;
+    kMuteFunction = 101;
+    kRestoreVolumeFunction = 102;
+    kTuneFunction = 103;
+    kSelectMediaFunction = 104;
+    kSelectAvInputFunction = 105;
+    kSelectAudioInputFunction = 106;
+    kPowerToggleFunction = 107;
+    kPowerOffFunction = 108;
+    kPowerOnFunction = 109;
+    kF1Blue = 113;
+    kF2Red = 114;
+    kF3Green = 115;
+    kF4Yellow = 116;
+    kF5 = 117;
+    kData = 118;
   }
 
-  struct TestListStructOctet {
-    int64u member1 = 0;
-    octet_string<32> member2 = 1;
+  enum KeypadInputStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kUnsupportedKey = 1;
+    kInvalidKeyInCurrentState = 2;
   }
 
-  struct NullablesAndOptionalsStruct {
-    nullable int16u nullableInt = 0;
-    optional int16u optionalInt = 1;
-    optional nullable int16u nullableOptionalInt = 2;
-    nullable char_string nullableString = 3;
-    optional char_string optionalString = 4;
-    optional nullable char_string nullableOptionalString = 5;
-    nullable SimpleStruct nullableStruct = 6;
-    optional SimpleStruct optionalStruct = 7;
-    optional nullable SimpleStruct nullableOptionalStruct = 8;
-    nullable SimpleEnum nullableList[] = 9;
-    optional SimpleEnum optionalList[] = 10;
-    optional nullable SimpleEnum nullableOptionalList[] = 11;
+  bitmap KeypadInputFeature : BITMAP32 {
+    kNavigationKeyCodes = 0x1;
+    kLocationKeys = 0x2;
+    kNumberKeys = 0x4;
   }
 
-  struct SimpleStruct {
-    int8u a = 0;
-    boolean b = 1;
-    SimpleEnum c = 2;
-    octet_string d = 3;
-    char_string e = 4;
-    SimpleBitmap f = 5;
-    single g = 6;
-    double h = 7;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct SendKeyRequest {
+    CecKeyCode keyCode = 0;
   }
 
-  struct TestFabricScoped {
-    int8u fabricSensitiveInt8u = 1;
-    optional int8u optionalFabricSensitiveInt8u = 2;
-    nullable int8u nullableFabricSensitiveInt8u = 3;
-    optional nullable int8u nullableOptionalFabricSensitiveInt8u = 4;
-    char_string fabricSensitiveCharString = 5;
-    SimpleStruct fabricSensitiveStruct = 6;
-    int8u fabricSensitiveInt8uList[] = 7;
-    fabric_idx fabricIndex = 254;
+  response struct SendKeyResponse = 1 {
+    KeypadInputStatusEnum status = 0;
   }
 
-  struct NestedStructList {
-    int8u a = 0;
-    boolean b = 1;
-    SimpleStruct c = 2;
-    SimpleStruct d[] = 3;
-    int32u e[] = 4;
-    octet_string f[] = 5;
-    int8u g[] = 6;
+  command SendKey(SendKeyRequest): SendKeyResponse = 0;
+}
+
+server cluster ContentLauncher = 1290 {
+  enum ContentLaunchStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kUrlNotAvailable = 1;
+    kAuthFailed = 2;
   }
 
-  struct NestedStruct {
-    int8u a = 0;
-    boolean b = 1;
-    SimpleStruct c = 2;
+  enum MetricTypeEnum : ENUM8 {
+    kPixels = 0;
+    kPercentage = 1;
   }
 
-  info event TestEvent = 1 {
-    INT8U arg1 = 1;
-    SimpleEnum arg2 = 2;
-    BOOLEAN arg3 = 3;
-    SimpleStruct arg4 = 4;
-    SimpleStruct arg5[] = 5;
-    SimpleEnum arg6[] = 6;
+  enum ParameterEnum : ENUM8 {
+    kActor = 0;
+    kChannel = 1;
+    kCharacter = 2;
+    kDirector = 3;
+    kEvent = 4;
+    kFranchise = 5;
+    kGenre = 6;
+    kLeague = 7;
+    kPopularity = 8;
+    kProvider = 9;
+    kSport = 10;
+    kSportsTeam = 11;
+    kType = 12;
   }
 
-  info event TestFabricScopedEvent = 2 {
-    fabric_idx arg1 = 254;
+  bitmap ContentLauncherFeature : BITMAP32 {
+    kContentSearch = 0x1;
+    kURLPlayback = 0x2;
   }
 
-  attribute boolean boolean = 0;
-  attribute Bitmap8MaskMap bitmap8 = 1;
-  attribute Bitmap16MaskMap bitmap16 = 2;
-  attribute Bitmap32MaskMap bitmap32 = 3;
-  attribute Bitmap64MaskMap bitmap64 = 4;
-  attribute int8u int8u = 5;
-  attribute int16u int16u = 6;
-  attribute int24u int24u = 7;
-  attribute int32u int32u = 8;
-  attribute int40u int40u = 9;
-  attribute int48u int48u = 10;
-  attribute int56u int56u = 11;
-  attribute int64u int64u = 12;
-  attribute int8s int8s = 13;
-  attribute int16s int16s = 14;
-  attribute int24s int24s = 15;
-  attribute int32s int32s = 16;
-  attribute int40s int40s = 17;
-  attribute int48s int48s = 18;
-  attribute int56s int56s = 19;
-  attribute int64s int64s = 20;
-  attribute enum8 enum8 = 21;
-  attribute enum16 enum16 = 22;
-  attribute single floatSingle = 23;
-  attribute double floatDouble = 24;
-  attribute octet_string<10> octetString = 25;
-  attribute INT8U listInt8u[] = 26;
-  attribute OCTET_STRING listOctetString[] = 27;
-  attribute TestListStructOctet listStructOctetString[] = 28;
-  attribute long_octet_string<1000> longOctetString = 29;
-  attribute char_string<10> charString = 30;
-  attribute long_char_string<1000> longCharString = 31;
-  attribute epoch_us epochUs = 32;
-  attribute epoch_s epochS = 33;
-  attribute vendor_id vendorId = 34;
-  attribute NullablesAndOptionalsStruct listNullablesAndOptionalsStruct[] = 35;
-  attribute SimpleEnum enumAttr = 36;
-  attribute SimpleStruct structAttr = 37;
-  attribute int8u rangeRestrictedInt8u = 38;
-  attribute int8s rangeRestrictedInt8s = 39;
-  attribute int16u rangeRestrictedInt16u = 40;
-  attribute int16s rangeRestrictedInt16s = 41;
-  attribute LONG_OCTET_STRING listLongOctetString[] = 42;
-  attribute TestFabricScoped listFabricScoped[] = 43;
-  attribute boolean timedWriteBoolean = 48;
-  attribute boolean generalErrorBoolean = 49;
-  attribute boolean clusterErrorBoolean = 50;
-  attribute nullable boolean nullableBoolean = 16384;
-  attribute nullable Bitmap8MaskMap nullableBitmap8 = 16385;
-  attribute nullable Bitmap16MaskMap nullableBitmap16 = 16386;
-  attribute nullable Bitmap32MaskMap nullableBitmap32 = 16387;
-  attribute nullable Bitmap64MaskMap nullableBitmap64 = 16388;
-  attribute nullable int8u nullableInt8u = 16389;
-  attribute nullable int16u nullableInt16u = 16390;
-  attribute nullable int24u nullableInt24u = 16391;
-  attribute nullable int32u nullableInt32u = 16392;
-  attribute nullable int40u nullableInt40u = 16393;
-  attribute nullable int48u nullableInt48u = 16394;
-  attribute nullable int56u nullableInt56u = 16395;
-  attribute nullable int64u nullableInt64u = 16396;
-  attribute nullable int8s nullableInt8s = 16397;
-  attribute nullable int16s nullableInt16s = 16398;
-  attribute nullable int24s nullableInt24s = 16399;
-  attribute nullable int32s nullableInt32s = 16400;
-  attribute nullable int40s nullableInt40s = 16401;
-  attribute nullable int48s nullableInt48s = 16402;
-  attribute nullable int56s nullableInt56s = 16403;
-  attribute nullable int64s nullableInt64s = 16404;
-  attribute nullable enum8 nullableEnum8 = 16405;
-  attribute nullable enum16 nullableEnum16 = 16406;
-  attribute nullable single nullableFloatSingle = 16407;
-  attribute nullable double nullableFloatDouble = 16408;
-  attribute nullable octet_string<10> nullableOctetString = 16409;
-  attribute nullable char_string<10> nullableCharString = 16414;
-  attribute nullable SimpleEnum nullableEnumAttr = 16420;
-  attribute nullable SimpleStruct nullableStruct = 16421;
-  attribute nullable int8u nullableRangeRestrictedInt8u = 16422;
-  attribute nullable int8s nullableRangeRestrictedInt8s = 16423;
-  attribute nullable int16u nullableRangeRestrictedInt16u = 16424;
-  attribute nullable int16s nullableRangeRestrictedInt16s = 16425;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct TestAddArgumentsRequest {
-    INT8U arg1 = 0;
-    INT8U arg2 = 1;
+  bitmap SupportedStreamingProtocol : BITMAP32 {
+    kDash = 0x1;
+    kHls = 0x2;
   }
 
-  request struct TestStructArgumentRequestRequest {
-    SimpleStruct arg1 = 0;
+  struct ContentSearch {
+    Parameter parameterList[] = 0;
   }
 
-  request struct TestNestedStructArgumentRequestRequest {
-    NestedStruct arg1 = 0;
+  struct Parameter {
+    ParameterEnum type = 0;
+    char_string value = 1;
+    optional AdditionalInfo externalIDList[] = 2;
   }
 
-  request struct TestListStructArgumentRequestRequest {
-    SimpleStruct arg1[] = 0;
+  struct AdditionalInfo {
+    char_string name = 0;
+    char_string value = 1;
   }
 
-  request struct TestListInt8UArgumentRequestRequest {
-    INT8U arg1[] = 0;
+  struct BrandingInformation {
+    char_string providerName = 0;
+    optional StyleInformation background = 1;
+    optional StyleInformation logo = 2;
+    optional StyleInformation progressBar = 3;
+    optional StyleInformation splash = 4;
+    optional StyleInformation waterMark = 5;
   }
 
-  request struct TestNestedStructListArgumentRequestRequest {
-    NestedStructList arg1 = 0;
+  struct StyleInformation {
+    optional char_string imageUrl = 0;
+    optional char_string color = 1;
+    optional Dimension size = 2;
   }
 
-  request struct TestListNestedStructListArgumentRequestRequest {
-    NestedStructList arg1[] = 0;
+  struct Dimension {
+    double width = 0;
+    double height = 1;
+    MetricTypeEnum metric = 2;
   }
 
-  request struct TestListInt8UReverseRequestRequest {
-    INT8U arg1[] = 0;
+  readonly attribute CHAR_STRING acceptHeader[] = 0;
+  attribute bitmap32 supportedStreamingProtocols = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster AudioOutput = 1291 {
+  enum OutputTypeEnum : ENUM8 {
+    kHdmi = 0;
+    kBt = 1;
+    kOptical = 2;
+    kHeadphone = 3;
+    kInternal = 4;
+    kOther = 5;
   }
 
-  request struct TestEnumsRequestRequest {
-    vendor_id arg1 = 0;
-    SimpleEnum arg2 = 1;
+  bitmap AudioOutputFeature : BITMAP32 {
+    kNameUpdates = 0x1;
   }
 
-  request struct TestNullableOptionalRequestRequest {
-    optional nullable INT8U arg1 = 0;
+  struct OutputInfo {
+    int8u index = 0;
+    OutputTypeEnum outputType = 1;
+    char_string<32> name = 2;
   }
 
-  request struct SimpleStructEchoRequestRequest {
-    SimpleStruct arg1 = 0;
+  readonly attribute OutputInfo outputList[] = 0;
+  readonly attribute int8u currentOutput = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster ApplicationLauncher = 1292 {
+  enum ApplicationLauncherStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kAppNotAvailable = 1;
+    kSystemBusy = 2;
   }
 
-  request struct TestSimpleOptionalArgumentRequestRequest {
-    optional BOOLEAN arg1 = 0;
+  bitmap ApplicationLauncherFeature : BITMAP32 {
+    kApplicationPlatform = 0x1;
   }
 
-  request struct TestEmitTestEventRequestRequest {
-    INT8U arg1 = 0;
-    SimpleEnum arg2 = 1;
-    BOOLEAN arg3 = 2;
+  struct Application {
+    int16u catalogVendorId = 0;
+    char_string applicationId = 1;
   }
 
-  request struct TestEmitTestFabricScopedEventRequestRequest {
-    INT8U arg1 = 0;
+  readonly attribute INT16U catalogList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster ApplicationBasic = 1293 {
+  enum ApplicationStatusEnum : ENUM8 {
+    kStopped = 0;
+    kActiveVisibleFocus = 1;
+    kActiveHidden = 2;
+    kActiveVisibleNotFocus = 3;
   }
 
-  response struct TestSpecificResponse = 0 {
-    INT8U returnValue = 0;
+  readonly attribute char_string<32> vendorName = 0;
+  readonly attribute int16u vendorID = 1;
+  readonly attribute char_string<32> applicationName = 2;
+  readonly attribute int16u productID = 3;
+  readonly attribute ApplicationStatusEnum status = 5;
+  readonly attribute char_string<32> applicationVersion = 6;
+  readonly attribute vendor_id allowedVendorList[] = 7;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster AccountLogin = 1294 {
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster ElectricalMeasurement = 2820 {
+  readonly attribute bitmap32 measurementType = 0;
+  readonly attribute int32s totalActivePower = 772;
+  readonly attribute int16u rmsVoltage = 1285;
+  readonly attribute int16u rmsVoltageMin = 1286;
+  readonly attribute int16u rmsVoltageMax = 1287;
+  readonly attribute int16u rmsCurrent = 1288;
+  readonly attribute int16u rmsCurrentMin = 1289;
+  readonly attribute int16u rmsCurrentMax = 1290;
+  readonly attribute int16s activePower = 1291;
+  readonly attribute int16s activePowerMin = 1292;
+  readonly attribute int16s activePowerMax = 1293;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster TestCluster = 4294048773 {
+  enum SimpleEnum : ENUM8 {
+    kUnspecified = 0;
+    kValueA = 1;
+    kValueB = 2;
+    kValueC = 3;
   }
 
-  response struct TestAddArgumentsResponse = 1 {
-    INT8U returnValue = 0;
+  bitmap Bitmap16MaskMap : BITMAP16 {
+    kMaskVal1 = 0x1;
+    kMaskVal2 = 0x2;
+    kMaskVal3 = 0x4;
+    kMaskVal4 = 0x4000;
   }
 
-  response struct TestListInt8UReverseResponse = 4 {
-    INT8U arg1[] = 0;
+  bitmap Bitmap32MaskMap : BITMAP32 {
+    kMaskVal1 = 0x1;
+    kMaskVal2 = 0x2;
+    kMaskVal3 = 0x4;
+    kMaskVal4 = 0x40000000;
   }
 
-  response struct TestEnumsResponse = 5 {
-    vendor_id arg1 = 0;
-    SimpleEnum arg2 = 1;
+  bitmap Bitmap64MaskMap : BITMAP64 {
+    kMaskVal1 = 0x1;
+    kMaskVal2 = 0x2;
+    kMaskVal3 = 0x4;
+    kMaskVal4 = 0x4000000000000000;
   }
 
-  response struct TestNullableOptionalResponse = 6 {
-    BOOLEAN wasPresent = 0;
-    optional BOOLEAN wasNull = 1;
-    optional INT8U value = 2;
-    optional nullable INT8U originalValue = 3;
+  bitmap Bitmap8MaskMap : BITMAP8 {
+    kMaskVal1 = 0x1;
+    kMaskVal2 = 0x2;
+    kMaskVal3 = 0x4;
+    kMaskVal4 = 0x40;
   }
 
-  response struct SimpleStructResponse = 9 {
-    SimpleStruct arg1 = 0;
+  bitmap SimpleBitmap : BITMAP8 {
+    kValueA = 0x1;
+    kValueB = 0x2;
+    kValueC = 0x4;
   }
 
-  response struct TestEmitTestEventResponse = 10 {
-    INT64U value = 0;
+  struct TestListStructOctet {
+    int64u member1 = 0;
+    octet_string<32> member2 = 1;
   }
 
-  response struct TestEmitTestFabricScopedEventResponse = 11 {
-    INT64U value = 0;
+  struct NullablesAndOptionalsStruct {
+    nullable int16u nullableInt = 0;
+    optional int16u optionalInt = 1;
+    optional nullable int16u nullableOptionalInt = 2;
+    nullable char_string nullableString = 3;
+    optional char_string optionalString = 4;
+    optional nullable char_string nullableOptionalString = 5;
+    nullable SimpleStruct nullableStruct = 6;
+    optional SimpleStruct optionalStruct = 7;
+    optional nullable SimpleStruct nullableOptionalStruct = 8;
+    nullable SimpleEnum nullableList[] = 9;
+    optional SimpleEnum optionalList[] = 10;
+    optional nullable SimpleEnum nullableOptionalList[] = 11;
   }
 
-  command Test(): DefaultSuccess = 0;
-  command TestNotHandled(): DefaultSuccess = 1;
-  command TestSpecific(): TestSpecificResponse = 2;
-  command TestAddArguments(TestAddArgumentsRequest): TestAddArgumentsResponse = 4;
-  command TestStructArgumentRequest(TestStructArgumentRequestRequest): BooleanResponse = 7;
-  command TestNestedStructArgumentRequest(TestNestedStructArgumentRequestRequest): BooleanResponse = 8;
-  command TestListStructArgumentRequest(TestListStructArgumentRequestRequest): BooleanResponse = 9;
-  command TestListInt8UArgumentRequest(TestListInt8UArgumentRequestRequest): BooleanResponse = 10;
-  command TestNestedStructListArgumentRequest(TestNestedStructListArgumentRequestRequest): BooleanResponse = 11;
-  command TestListNestedStructListArgumentRequest(TestListNestedStructListArgumentRequestRequest): BooleanResponse = 12;
-  command TestListInt8UReverseRequest(TestListInt8UReverseRequestRequest): TestListInt8UReverseResponse = 13;
-  command TestEnumsRequest(TestEnumsRequestRequest): TestEnumsResponse = 14;
-  command TestNullableOptionalRequest(TestNullableOptionalRequestRequest): TestNullableOptionalResponse = 15;
-  command SimpleStructEchoRequest(SimpleStructEchoRequestRequest): SimpleStructResponse = 17;
-  timed command TimedInvokeRequest(): DefaultSuccess = 18;
-  command TestSimpleOptionalArgumentRequest(TestSimpleOptionalArgumentRequestRequest): DefaultSuccess = 19;
-  command TestEmitTestEventRequest(TestEmitTestEventRequestRequest): TestEmitTestEventResponse = 20;
-  command TestEmitTestFabricScopedEventRequest(TestEmitTestFabricScopedEventRequestRequest): TestEmitTestFabricScopedEventResponse = 21;
-}
-
-server cluster Thermostat = 513 {
-  enum SetpointAdjustMode : ENUM8 {
-    kHeatSetpoint = 0;
-    kCoolSetpoint = 1;
-    kHeatAndCoolSetpoints = 2;
-  }
-
-  enum ThermostatControlSequence : ENUM8 {
-    kCoolingOnly = 0;
-    kCoolingWithReheat = 1;
-    kHeatingOnly = 2;
-    kHeatingWithReheat = 3;
-    kCoolingAndHeating = 4;
-    kCoolingAndHeatingWithReheat = 5;
-  }
-
-  enum ThermostatRunningMode : ENUM8 {
-    kOff = 0;
-    kCool = 3;
-    kHeat = 4;
-  }
-
-  enum ThermostatSystemMode : ENUM8 {
-    kOff = 0;
-    kAuto = 1;
-    kCool = 3;
-    kHeat = 4;
-    kEmergencyHeating = 5;
-    kPrecooling = 6;
-    kFanOnly = 7;
-  }
-
-  bitmap DayOfWeek : BITMAP8 {
-    kSunday = 0x1;
-    kMonday = 0x2;
-    kTuesday = 0x4;
-    kWednesday = 0x8;
-    kThursday = 0x10;
-    kFriday = 0x20;
-    kSaturday = 0x40;
-    kAwayOrVacation = 0x80;
-  }
-
-  bitmap ModeForSequence : BITMAP8 {
-    kHeatSetpointFieldPresent = 0x1;
-    kCoolSetpointFieldPresent = 0x2;
-  }
-
-  bitmap ThermostatFeature : BITMAP32 {
-    kHeating = 0x1;
-    kCooling = 0x2;
-    kOccupancy = 0x4;
-    kSchedule = 0x8;
-    kSetback = 0x10;
-    kAutomode = 0x20;
-  }
-
-  struct ThermostatScheduleTransition {
-    int16u transitionTime = 0;
-    nullable int16s heatSetpoint = 1;
-    nullable int16s coolSetpoint = 2;
-  }
-
-  readonly attribute nullable int16s localTemperature = 0;
-  readonly attribute int16s absMinHeatSetpointLimit = 3;
-  readonly attribute int16s absMaxHeatSetpointLimit = 4;
-  readonly attribute int16s absMinCoolSetpointLimit = 5;
-  readonly attribute int16s absMaxCoolSetpointLimit = 6;
-  attribute int16s occupiedCoolingSetpoint = 17;
-  attribute int16s occupiedHeatingSetpoint = 18;
-  attribute access(write: manage) int16s minHeatSetpointLimit = 21;
-  attribute access(write: manage) int16s maxHeatSetpointLimit = 22;
-  attribute access(write: manage) int16s minCoolSetpointLimit = 23;
-  attribute access(write: manage) int16s maxCoolSetpointLimit = 24;
-  attribute access(write: manage) int8s minSetpointDeadBand = 25;
-  attribute access(write: manage) ThermostatControlSequence controlSequenceOfOperation = 27;
-  attribute access(write: manage) enum8 systemMode = 28;
-  readonly attribute enum8 thermostatRunningMode = 30;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct SetpointRaiseLowerRequest {
-    SetpointAdjustMode mode = 0;
-    INT8S amount = 1;
-  }
-
-  command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0;
-}
-
-server cluster ThermostatUserInterfaceConfiguration = 516 {
-  attribute enum8 temperatureDisplayMode = 0;
-  attribute access(write: manage) enum8 keypadLockout = 1;
-  attribute access(write: manage) enum8 scheduleProgrammingVisibility = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster ThreadNetworkDiagnostics = 53 {
-  enum NetworkFault : ENUM8 {
-    kUnspecified = 0;
-    kLinkDown = 1;
-    kHardwareFailure = 2;
-    kNetworkJammed = 3;
-  }
-
-  enum RoutingRole : ENUM8 {
-    kUnspecified = 0;
-    kUnassigned = 1;
-    kSleepyEndDevice = 2;
-    kEndDevice = 3;
-    kReed = 4;
-    kRouter = 5;
-    kLeader = 6;
-  }
-
-  enum ThreadConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
-  }
-
-  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
-    kPacketCounts = 0x1;
-    kErrorCounts = 0x2;
-    kMLECounts = 0x4;
-    kMACCounts = 0x8;
-  }
-
-  struct NeighborTable {
-    int64u extAddress = 0;
-    int32u age = 1;
-    int16u rloc16 = 2;
-    int32u linkFrameCounter = 3;
-    int32u mleFrameCounter = 4;
-    int8u lqi = 5;
-    nullable int8s averageRssi = 6;
-    nullable int8s lastRssi = 7;
-    int8u frameErrorRate = 8;
-    int8u messageErrorRate = 9;
-    boolean rxOnWhenIdle = 10;
-    boolean fullThreadDevice = 11;
-    boolean fullNetworkData = 12;
-    boolean isChild = 13;
-  }
-
-  struct RouteTable {
-    int64u extAddress = 0;
-    int16u rloc16 = 1;
-    int8u routerId = 2;
-    int8u nextHop = 3;
-    int8u pathCost = 4;
-    int8u LQIIn = 5;
-    int8u LQIOut = 6;
-    int8u age = 7;
-    boolean allocated = 8;
-    boolean linkEstablished = 9;
-  }
-
-  struct SecurityPolicy {
-    int16u rotationTime = 0;
-    bitmap16 flags = 1;
-  }
-
-  struct OperationalDatasetComponents {
-    boolean activeTimestampPresent = 0;
-    boolean pendingTimestampPresent = 1;
-    boolean masterKeyPresent = 2;
-    boolean networkNamePresent = 3;
-    boolean extendedPanIdPresent = 4;
-    boolean meshLocalPrefixPresent = 5;
-    boolean delayPresent = 6;
-    boolean panIdPresent = 7;
-    boolean channelPresent = 8;
-    boolean pskcPresent = 9;
-    boolean securityPolicyPresent = 10;
-    boolean channelMaskPresent = 11;
+  struct SimpleStruct {
+    int8u a = 0;
+    boolean b = 1;
+    SimpleEnum c = 2;
+    octet_string d = 3;
+    char_string e = 4;
+    SimpleBitmap f = 5;
+    single g = 6;
+    double h = 7;
   }
 
-  info event ConnectionStatus = 0 {
-    ThreadConnectionStatus connectionStatus = 0;
+  struct TestFabricScoped {
+    int8u fabricSensitiveInt8u = 1;
+    optional int8u optionalFabricSensitiveInt8u = 2;
+    nullable int8u nullableFabricSensitiveInt8u = 3;
+    optional nullable int8u nullableOptionalFabricSensitiveInt8u = 4;
+    char_string fabricSensitiveCharString = 5;
+    SimpleStruct fabricSensitiveStruct = 6;
+    int8u fabricSensitiveInt8uList[] = 7;
+    fabric_idx fabricIndex = 254;
   }
 
-  readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable RoutingRole routingRole = 1;
-  readonly attribute nullable char_string<16> networkName = 2;
-  readonly attribute nullable int16u panId = 3;
-  readonly attribute nullable int64u extendedPanId = 4;
-  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute NeighborTable neighborTableList[] = 7;
-  readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
-  readonly attribute nullable int8u leaderRouterId = 13;
-  readonly attribute int16u detachedRoleCount = 14;
-  readonly attribute int16u childRoleCount = 15;
-  readonly attribute int16u routerRoleCount = 16;
-  readonly attribute int16u leaderRoleCount = 17;
-  readonly attribute int16u attachAttemptCount = 18;
-  readonly attribute int16u partitionIdChangeCount = 19;
-  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
-  readonly attribute int16u parentChangeCount = 21;
-  readonly attribute int32u txTotalCount = 22;
-  readonly attribute int32u txUnicastCount = 23;
-  readonly attribute int32u txBroadcastCount = 24;
-  readonly attribute int32u txAckRequestedCount = 25;
-  readonly attribute int32u txAckedCount = 26;
-  readonly attribute int32u txNoAckRequestedCount = 27;
-  readonly attribute int32u txDataCount = 28;
-  readonly attribute int32u txDataPollCount = 29;
-  readonly attribute int32u txBeaconCount = 30;
-  readonly attribute int32u txBeaconRequestCount = 31;
-  readonly attribute int32u txOtherCount = 32;
-  readonly attribute int32u txRetryCount = 33;
-  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
-  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
-  readonly attribute int32u txErrCcaCount = 36;
-  readonly attribute int32u txErrAbortCount = 37;
-  readonly attribute int32u txErrBusyChannelCount = 38;
-  readonly attribute int32u rxTotalCount = 39;
-  readonly attribute int32u rxUnicastCount = 40;
-  readonly attribute int32u rxBroadcastCount = 41;
-  readonly attribute int32u rxDataCount = 42;
-  readonly attribute int32u rxDataPollCount = 43;
-  readonly attribute int32u rxBeaconCount = 44;
-  readonly attribute int32u rxBeaconRequestCount = 45;
-  readonly attribute int32u rxOtherCount = 46;
-  readonly attribute int32u rxAddressFilteredCount = 47;
-  readonly attribute int32u rxDestAddrFilteredCount = 48;
-  readonly attribute int32u rxDuplicatedCount = 49;
-  readonly attribute int32u rxErrNoFrameCount = 50;
-  readonly attribute int32u rxErrUnknownNeighborCount = 51;
-  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
-  readonly attribute int32u rxErrSecCount = 53;
-  readonly attribute int32u rxErrFcsCount = 54;
-  readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute nullable int64u activeTimestamp = 56;
-  readonly attribute nullable int64u pendingTimestamp = 57;
-  readonly attribute nullable int32u delay = 58;
-  readonly attribute nullable SecurityPolicy securityPolicy = 59;
-  readonly attribute nullable octet_string<4> channelMask = 60;
-  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
-  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command ResetCounts(): DefaultSuccess = 0;
-}
-
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
+  struct NestedStruct {
+    int8u a = 0;
+    boolean b = 1;
+    SimpleStruct c = 2;
   }
 
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
+  struct NestedStructList {
+    int8u a = 0;
+    boolean b = 1;
+    SimpleStruct c = 2;
+    SimpleStruct d[] = 3;
+    int32u e[] = 4;
+    octet_string f[] = 5;
+    int8u g[] = 6;
   }
 
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster UnitLocalization = 45 {
-  enum TempUnit : ENUM8 {
-    kFahrenheit = 0;
-    kCelsius = 1;
-    kKelvin = 2;
+  info event TestEvent = 1 {
+    INT8U arg1 = 1;
+    SimpleEnum arg2 = 2;
+    BOOLEAN arg3 = 3;
+    SimpleStruct arg4 = 4;
+    SimpleStruct arg5[] = 5;
+    SimpleEnum arg6[] = 6;
   }
 
-  bitmap UnitLocalizationFeature : BITMAP32 {
-    kTemperatureUnit = 0x1;
+  info event TestFabricScopedEvent = 2 {
+    fabric_idx arg1 = 254;
   }
 
-  attribute TempUnit temperatureUnit = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster UserLabel = 65 {
-  attribute access(write: manage) LabelStruct labelList[] = 0;
+  attribute boolean boolean = 0;
+  attribute Bitmap8MaskMap bitmap8 = 1;
+  attribute Bitmap16MaskMap bitmap16 = 2;
+  attribute Bitmap32MaskMap bitmap32 = 3;
+  attribute Bitmap64MaskMap bitmap64 = 4;
+  attribute int8u int8u = 5;
+  attribute int16u int16u = 6;
+  attribute int24u int24u = 7;
+  attribute int32u int32u = 8;
+  attribute int40u int40u = 9;
+  attribute int48u int48u = 10;
+  attribute int56u int56u = 11;
+  attribute int64u int64u = 12;
+  attribute int8s int8s = 13;
+  attribute int16s int16s = 14;
+  attribute int24s int24s = 15;
+  attribute int32s int32s = 16;
+  attribute int40s int40s = 17;
+  attribute int48s int48s = 18;
+  attribute int56s int56s = 19;
+  attribute int64s int64s = 20;
+  attribute enum8 enum8 = 21;
+  attribute enum16 enum16 = 22;
+  attribute single floatSingle = 23;
+  attribute double floatDouble = 24;
+  attribute octet_string<10> octetString = 25;
+  attribute INT8U listInt8u[] = 26;
+  attribute OCTET_STRING listOctetString[] = 27;
+  attribute TestListStructOctet listStructOctetString[] = 28;
+  attribute long_octet_string<1000> longOctetString = 29;
+  attribute char_string<10> charString = 30;
+  attribute long_char_string<1000> longCharString = 31;
+  attribute epoch_us epochUs = 32;
+  attribute epoch_s epochS = 33;
+  attribute vendor_id vendorId = 34;
+  attribute NullablesAndOptionalsStruct listNullablesAndOptionalsStruct[] = 35;
+  attribute SimpleEnum enumAttr = 36;
+  attribute SimpleStruct structAttr = 37;
+  attribute int8u rangeRestrictedInt8u = 38;
+  attribute int8s rangeRestrictedInt8s = 39;
+  attribute int16u rangeRestrictedInt16u = 40;
+  attribute int16s rangeRestrictedInt16s = 41;
+  attribute LONG_OCTET_STRING listLongOctetString[] = 42;
+  attribute TestFabricScoped listFabricScoped[] = 43;
+  attribute boolean timedWriteBoolean = 48;
+  attribute boolean generalErrorBoolean = 49;
+  attribute boolean clusterErrorBoolean = 50;
+  attribute nullable boolean nullableBoolean = 16384;
+  attribute nullable Bitmap8MaskMap nullableBitmap8 = 16385;
+  attribute nullable Bitmap16MaskMap nullableBitmap16 = 16386;
+  attribute nullable Bitmap32MaskMap nullableBitmap32 = 16387;
+  attribute nullable Bitmap64MaskMap nullableBitmap64 = 16388;
+  attribute nullable int8u nullableInt8u = 16389;
+  attribute nullable int16u nullableInt16u = 16390;
+  attribute nullable int24u nullableInt24u = 16391;
+  attribute nullable int32u nullableInt32u = 16392;
+  attribute nullable int40u nullableInt40u = 16393;
+  attribute nullable int48u nullableInt48u = 16394;
+  attribute nullable int56u nullableInt56u = 16395;
+  attribute nullable int64u nullableInt64u = 16396;
+  attribute nullable int8s nullableInt8s = 16397;
+  attribute nullable int16s nullableInt16s = 16398;
+  attribute nullable int24s nullableInt24s = 16399;
+  attribute nullable int32s nullableInt32s = 16400;
+  attribute nullable int40s nullableInt40s = 16401;
+  attribute nullable int48s nullableInt48s = 16402;
+  attribute nullable int56s nullableInt56s = 16403;
+  attribute nullable int64s nullableInt64s = 16404;
+  attribute nullable enum8 nullableEnum8 = 16405;
+  attribute nullable enum16 nullableEnum16 = 16406;
+  attribute nullable single nullableFloatSingle = 16407;
+  attribute nullable double nullableFloatDouble = 16408;
+  attribute nullable octet_string<10> nullableOctetString = 16409;
+  attribute nullable char_string<10> nullableCharString = 16414;
+  attribute nullable SimpleEnum nullableEnumAttr = 16420;
+  attribute nullable SimpleStruct nullableStruct = 16421;
+  attribute nullable int8u nullableRangeRestrictedInt8u = 16422;
+  attribute nullable int8s nullableRangeRestrictedInt8s = 16423;
+  attribute nullable int16u nullableRangeRestrictedInt16u = 16424;
+  attribute nullable int16s nullableRangeRestrictedInt16s = 16425;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster WakeOnLan = 1283 {
-  readonly attribute char_string<32> MACAddress = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  request struct TestAddArgumentsRequest {
+    INT8U arg1 = 0;
+    INT8U arg2 = 1;
+  }
 
-server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCause : ENUM8 {
-    kUnknown = 0;
-    kAssociationFailed = 1;
-    kAuthenticationFailed = 2;
-    kSsidNotFound = 3;
+  request struct TestStructArgumentRequestRequest {
+    SimpleStruct arg1 = 0;
   }
 
-  enum SecurityType : ENUM8 {
-    kUnspecified = 0;
-    kNone = 1;
-    kWep = 2;
-    kWpa = 3;
-    kWpa2 = 4;
-    kWpa3 = 5;
+  request struct TestNestedStructArgumentRequestRequest {
+    NestedStruct arg1 = 0;
   }
 
-  enum WiFiConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  request struct TestListStructArgumentRequestRequest {
+    SimpleStruct arg1[] = 0;
   }
 
-  enum WiFiVersionType : ENUM8 {
-    k80211a = 0;
-    k80211b = 1;
-    k80211g = 2;
-    k80211n = 3;
-    k80211ac = 4;
-    k80211ax = 5;
+  request struct TestListInt8UArgumentRequestRequest {
+    INT8U arg1[] = 0;
   }
 
-  info event Disconnection = 0 {
-    INT16U reasonCode = 0;
+  request struct TestNestedStructListArgumentRequestRequest {
+    NestedStructList arg1 = 0;
   }
 
-  info event AssociationFailure = 1 {
-    AssociationFailureCause associationFailure = 0;
-    INT16U status = 1;
+  request struct TestListNestedStructListArgumentRequestRequest {
+    NestedStructList arg1[] = 0;
   }
 
-  info event ConnectionStatus = 2 {
-    WiFiConnectionStatus connectionStatus = 0;
+  request struct TestListInt8UReverseRequestRequest {
+    INT8U arg1[] = 0;
   }
 
-  readonly attribute nullable octet_string<6> bssid = 0;
-  readonly attribute nullable SecurityType securityType = 1;
-  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
-  readonly attribute nullable int16u channelNumber = 3;
-  readonly attribute nullable int8s rssi = 4;
-  readonly attribute int32u beaconLostCount = 5;
-  readonly attribute int32u beaconRxCount = 6;
-  readonly attribute int32u packetMulticastRxCount = 7;
-  readonly attribute int32u packetMulticastTxCount = 8;
-  readonly attribute int32u packetUnicastRxCount = 9;
-  readonly attribute int32u packetUnicastTxCount = 10;
-  readonly attribute int64u currentMaxRate = 11;
-  readonly attribute int64u overrunCount = 12;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  request struct TestEnumsRequestRequest {
+    vendor_id arg1 = 0;
+    SimpleEnum arg2 = 1;
+  }
 
-  command ResetCounts(): DefaultSuccess = 0;
-}
+  request struct TestNullableOptionalRequestRequest {
+    optional nullable INT8U arg1 = 0;
+  }
 
-server cluster WindowCovering = 258 {
-  enum EndProductType : ENUM8 {
-    kRollerShade = 0;
-    kRomanShade = 1;
-    kBalloonShade = 2;
-    kWovenWood = 3;
-    kPleatedShade = 4;
-    kCellularShade = 5;
-    kLayeredShade = 6;
-    kLayeredShade2D = 7;
-    kSheerShade = 8;
-    kTiltOnlyInteriorBlind = 9;
-    kInteriorBlind = 10;
-    kVerticalBlindStripCurtain = 11;
-    kInteriorVenetianBlind = 12;
-    kExteriorVenetianBlind = 13;
-    kLateralLeftCurtain = 14;
-    kLateralRightCurtain = 15;
-    kCentralCurtain = 16;
-    kRollerShutter = 17;
-    kExteriorVerticalScreen = 18;
-    kAwningTerracePatio = 19;
-    kAwningVerticalScreen = 20;
-    kTiltOnlyPergola = 21;
-    kSwingingShutter = 22;
-    kSlidingShutter = 23;
-    kUnknown = 255;
+  request struct SimpleStructEchoRequestRequest {
+    SimpleStruct arg1 = 0;
   }
 
-  enum Type : ENUM8 {
-    kRollerShade = 0;
-    kRollerShade2Motor = 1;
-    kRollerShadeExterior = 2;
-    kRollerShadeExterior2Motor = 3;
-    kDrapery = 4;
-    kAwning = 5;
-    kShutter = 6;
-    kTiltBlindTiltOnly = 7;
-    kTiltBlindLiftAndTilt = 8;
-    kProjectorScreen = 9;
-    kUnknown = 255;
+  request struct TestSimpleOptionalArgumentRequestRequest {
+    optional BOOLEAN arg1 = 0;
   }
 
-  bitmap ConfigStatus : BITMAP8 {
-    kOperational = 0x1;
-    kOnlineReserved = 0x2;
-    kLiftMovementReversed = 0x4;
-    kLiftPositionAware = 0x8;
-    kTiltPositionAware = 0x10;
-    kLiftEncoderControlled = 0x20;
-    kTiltEncoderControlled = 0x40;
+  request struct TestEmitTestEventRequestRequest {
+    INT8U arg1 = 0;
+    SimpleEnum arg2 = 1;
+    BOOLEAN arg3 = 2;
   }
 
-  bitmap Feature : BITMAP32 {
-    kLift = 0x1;
-    kTilt = 0x2;
-    kPositionAwareLift = 0x4;
-    kAbsolutePosition = 0x8;
-    kPositionAwareTilt = 0x10;
+  request struct TestEmitTestFabricScopedEventRequestRequest {
+    INT8U arg1 = 0;
   }
 
-  bitmap Mode : BITMAP8 {
-    kMotorDirectionReversed = 0x1;
-    kCalibrationMode = 0x2;
-    kMaintenanceMode = 0x4;
-    kLedFeedback = 0x8;
+  response struct TestSpecificResponse = 0 {
+    INT8U returnValue = 0;
   }
 
-  bitmap OperationalStatus : BITMAP8 {
-    kGlobal = 0x3;
-    kLift = 0xC;
-    kTilt = 0x30;
+  response struct TestAddArgumentsResponse = 1 {
+    INT8U returnValue = 0;
   }
 
-  bitmap SafetyStatus : BITMAP16 {
-    kRemoteLockout = 0x1;
-    kTamperDetection = 0x2;
-    kFailedCommunication = 0x4;
-    kPositionFailure = 0x8;
-    kThermalProtection = 0x10;
-    kObstacleDetected = 0x20;
-    kPower = 0x40;
-    kStopInput = 0x80;
-    kMotorJammed = 0x100;
-    kHardwareFailure = 0x200;
-    kManualOperation = 0x400;
-    kProtection = 0x800;
+  response struct TestListInt8UReverseResponse = 4 {
+    INT8U arg1[] = 0;
   }
 
-  readonly attribute Type type = 0;
-  readonly attribute int16u physicalClosedLimitLift = 1;
-  readonly attribute int16u physicalClosedLimitTilt = 2;
-  readonly attribute nullable int16u currentPositionLift = 3;
-  readonly attribute nullable int16u currentPositionTilt = 4;
-  readonly attribute int16u numberOfActuationsLift = 5;
-  readonly attribute int16u numberOfActuationsTilt = 6;
-  readonly attribute ConfigStatus configStatus = 7;
-  readonly attribute nullable Percent currentPositionLiftPercentage = 8;
-  readonly attribute nullable Percent currentPositionTiltPercentage = 9;
-  readonly attribute OperationalStatus operationalStatus = 10;
-  readonly attribute nullable Percent100ths targetPositionLiftPercent100ths = 11;
-  readonly attribute nullable Percent100ths targetPositionTiltPercent100ths = 12;
-  readonly attribute EndProductType endProductType = 13;
-  readonly attribute nullable Percent100ths currentPositionLiftPercent100ths = 14;
-  readonly attribute nullable Percent100ths currentPositionTiltPercent100ths = 15;
-  readonly attribute int16u installedOpenLimitLift = 16;
-  readonly attribute int16u installedClosedLimitLift = 17;
-  readonly attribute int16u installedOpenLimitTilt = 18;
-  readonly attribute int16u installedClosedLimitTilt = 19;
-  attribute access(write: manage) Mode mode = 23;
-  readonly attribute SafetyStatus safetyStatus = 26;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  response struct TestEnumsResponse = 5 {
+    vendor_id arg1 = 0;
+    SimpleEnum arg2 = 1;
+  }
 
-  request struct GoToLiftValueRequest {
-    INT16U liftValue = 0;
+  response struct TestNullableOptionalResponse = 6 {
+    BOOLEAN wasPresent = 0;
+    optional BOOLEAN wasNull = 1;
+    optional INT8U value = 2;
+    optional nullable INT8U originalValue = 3;
   }
 
-  request struct GoToLiftPercentageRequest {
-    Percent100ths liftPercent100thsValue = 0;
+  response struct SimpleStructResponse = 9 {
+    SimpleStruct arg1 = 0;
   }
 
-  request struct GoToTiltValueRequest {
-    INT16U tiltValue = 0;
+  response struct TestEmitTestEventResponse = 10 {
+    INT64U value = 0;
   }
 
-  request struct GoToTiltPercentageRequest {
-    Percent100ths tiltPercent100thsValue = 0;
+  response struct TestEmitTestFabricScopedEventResponse = 11 {
+    INT64U value = 0;
   }
 
-  command UpOrOpen(): DefaultSuccess = 0;
-  command DownOrClose(): DefaultSuccess = 1;
-  command StopMotion(): DefaultSuccess = 2;
-  command GoToLiftValue(GoToLiftValueRequest): DefaultSuccess = 4;
-  command GoToLiftPercentage(GoToLiftPercentageRequest): DefaultSuccess = 5;
-  command GoToTiltValue(GoToTiltValueRequest): DefaultSuccess = 7;
-  command GoToTiltPercentage(GoToTiltPercentageRequest): DefaultSuccess = 8;
+  command Test(): DefaultSuccess = 0;
+  command TestNotHandled(): DefaultSuccess = 1;
+  command TestSpecific(): TestSpecificResponse = 2;
+  command TestAddArguments(TestAddArgumentsRequest): TestAddArgumentsResponse = 4;
+  command TestStructArgumentRequest(TestStructArgumentRequestRequest): BooleanResponse = 7;
+  command TestNestedStructArgumentRequest(TestNestedStructArgumentRequestRequest): BooleanResponse = 8;
+  command TestListStructArgumentRequest(TestListStructArgumentRequestRequest): BooleanResponse = 9;
+  command TestListInt8UArgumentRequest(TestListInt8UArgumentRequestRequest): BooleanResponse = 10;
+  command TestNestedStructListArgumentRequest(TestNestedStructListArgumentRequestRequest): BooleanResponse = 11;
+  command TestListNestedStructListArgumentRequest(TestListNestedStructListArgumentRequestRequest): BooleanResponse = 12;
+  command TestListInt8UReverseRequest(TestListInt8UReverseRequestRequest): TestListInt8UReverseResponse = 13;
+  command TestEnumsRequest(TestEnumsRequestRequest): TestEnumsResponse = 14;
+  command TestNullableOptionalRequest(TestNullableOptionalRequestRequest): TestNullableOptionalResponse = 15;
+  command SimpleStructEchoRequest(SimpleStructEchoRequestRequest): SimpleStructResponse = 17;
+  timed command TimedInvokeRequest(): DefaultSuccess = 18;
+  command TestSimpleOptionalArgumentRequest(TestSimpleOptionalArgumentRequestRequest): DefaultSuccess = 19;
+  command TestEmitTestEventRequest(TestEmitTestEventRequestRequest): TestEmitTestEventResponse = 20;
+  command TestEmitTestFabricScopedEventRequest(TestEmitTestFabricScopedEventRequestRequest): TestEmitTestFabricScopedEventResponse = 21;
 }
 
 endpoint 0 {
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
index 98c16da49266e7..1e94912e495f59 100644
--- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -6,246 +6,334 @@ struct LabelStruct {
     char_string<16> value = 1;
 }
 
-server cluster AccessControl = 31 {
-  enum AuthMode : ENUM8 {
-    kPase = 1;
-    kCase = 2;
-    kGroup = 3;
-  }
-
-  enum ChangeTypeEnum : ENUM8 {
-    kChanged = 0;
-    kAdded = 1;
-    kRemoved = 2;
-  }
-
-  enum Privilege : ENUM8 {
-    kView = 1;
-    kProxyView = 2;
-    kOperate = 3;
-    kManage = 4;
-    kAdminister = 5;
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
   }
 
-  struct AccessControlEntry {
-    Privilege privilege = 1;
-    AuthMode authMode = 2;
-    nullable int64u subjects[] = 3;
-    nullable Target targets[] = 4;
-    fabric_idx fabricIndex = 254;
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
   }
 
-  struct Target {
-    nullable cluster_id cluster = 0;
-    nullable endpoint_no endpoint = 1;
-    nullable devtype_id deviceType = 2;
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
   }
 
-  info event access(read: administer) AccessControlEntryChanged = 0 {
-    nullable node_id adminNodeID = 1;
-    nullable INT16U adminPasscodeID = 2;
-    ChangeTypeEnum changeType = 3;
-    nullable AccessControlEntry latestValue = 4;
-    fabric_idx adminFabricIndex = 254;
-  }
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  info event access(read: administer) AccessControlExtensionChanged = 1 {
-    nullable node_id adminNodeID = 1;
-    nullable INT16U adminPasscodeID = 2;
-    ChangeTypeEnum changeType = 3;
-    nullable ExtensionEntry latestValue = 4;
-    fabric_idx adminFabricIndex = 254;
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
   }
 
-  attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
-  readonly attribute int16u subjectsPerAccessControlEntry = 2;
-  readonly attribute int16u targetsPerAccessControlEntry = 3;
-  readonly attribute int16u accessControlEntriesPerFabric = 4;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
 }
 
-server cluster AccountLogin = 1294 {
+server cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct GetSetupPINRequest {
-    CHAR_STRING tempAccountIdentifier = 0;
+  request struct AddGroupRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
   }
 
-  request struct LoginRequest {
-    CHAR_STRING tempAccountIdentifier = 0;
-    CHAR_STRING setupPIN = 1;
+  request struct ViewGroupRequest {
+    group_id groupId = 0;
   }
 
-  response struct GetSetupPINResponse = 1 {
-    CHAR_STRING setupPIN = 0;
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
   }
 
-  timed command GetSetupPIN(GetSetupPINRequest): GetSetupPINResponse = 0;
-  timed command Login(LoginRequest): DefaultSuccess = 2;
-  timed command Logout(): DefaultSuccess = 3;
-}
-
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
+  request struct RemoveGroupRequest {
+    group_id groupId = 0;
   }
 
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
   }
 
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
+  response struct AddGroupResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
+  response struct ViewGroupResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    CHAR_STRING groupName = 2;
+  }
 
-server cluster ApplicationBasic = 1293 {
-  enum ApplicationStatusEnum : ENUM8 {
-    kStopped = 0;
-    kActiveVisibleFocus = 1;
-    kActiveHidden = 2;
-    kActiveVisibleNotFocus = 3;
+  response struct GetGroupMembershipResponse = 2 {
+    nullable INT8U capacity = 0;
+    group_id groupList[] = 1;
   }
 
-  struct ApplicationBasicApplication {
-    int16u catalogVendorId = 0;
-    char_string applicationId = 1;
+  response struct RemoveGroupResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  readonly attribute char_string<32> applicationName = 2;
-  readonly attribute ApplicationBasicApplication application = 4;
-  readonly attribute ApplicationStatusEnum status = 5;
-  readonly attribute char_string<32> applicationVersion = 6;
-  readonly attribute vendor_id allowedVendorList[] = 7;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
 }
 
-server cluster ApplicationLauncher = 1292 {
-  enum ApplicationLauncherStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kAppNotAvailable = 1;
-    kSystemBusy = 2;
+server cluster Scenes = 5 {
+  bitmap ScenesCopyMode : BITMAP8 {
+    kCopyAllScenes = 0x1;
   }
 
-  bitmap ApplicationLauncherFeature : BITMAP32 {
-    kApplicationPlatform = 0x1;
+  struct ExtensionFieldSet {
+    cluster_id clusterId = 0;
+    AttributeValuePair attributeValueList[] = 1;
   }
 
-  struct Application {
-    int16u catalogVendorId = 0;
-    char_string applicationId = 1;
+  struct AttributeValuePair {
+    optional attrib_id attributeId = 0;
+    int8u attributeValue[] = 1;
   }
 
+  readonly attribute int8u sceneCount = 0;
+  readonly attribute int8u currentScene = 1;
+  readonly attribute group_id currentGroup = 2;
+  readonly attribute boolean sceneValid = 3;
+  readonly attribute bitmap8 nameSupport = 4;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct LaunchAppRequest {
-    Application application = 0;
-    optional OCTET_STRING data = 1;
+  request struct AddSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    INT16U transitionTime = 2;
+    CHAR_STRING sceneName = 3;
+    ExtensionFieldSet extensionFieldSets[] = 4;
   }
 
-  request struct StopAppRequest {
-    Application application = 0;
+  request struct ViewSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  request struct HideAppRequest {
-    Application application = 0;
+  request struct RemoveSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  response struct LauncherResponse = 3 {
-    ApplicationLauncherStatusEnum status = 0;
-    OCTET_STRING data = 1;
+  request struct RemoveAllScenesRequest {
+    group_id groupId = 0;
   }
 
-  command LaunchApp(LaunchAppRequest): LauncherResponse = 0;
-  command StopApp(StopAppRequest): LauncherResponse = 1;
-  command HideApp(HideAppRequest): LauncherResponse = 2;
-}
-
-server cluster AudioOutput = 1291 {
-  enum OutputTypeEnum : ENUM8 {
-    kHdmi = 0;
-    kBt = 1;
-    kOptical = 2;
-    kHeadphone = 3;
-    kInternal = 4;
-    kOther = 5;
+  request struct StoreSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  bitmap AudioOutputFeature : BITMAP32 {
-    kNameUpdates = 0x1;
+  request struct RecallSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    optional nullable INT16U transitionTime = 2;
   }
 
-  struct OutputInfo {
-    int8u index = 0;
-    OutputTypeEnum outputType = 1;
-    char_string<32> name = 2;
+  request struct GetSceneMembershipRequest {
+    group_id groupId = 0;
   }
 
-  readonly attribute OutputInfo outputList[] = 0;
-  readonly attribute int8u currentOutput = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct SelectOutputRequest {
-    INT8U index = 0;
+  response struct AddSceneResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  command SelectOutput(SelectOutputRequest): DefaultSuccess = 0;
-}
+  response struct ViewSceneResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+    optional INT16U transitionTime = 3;
+    optional CHAR_STRING sceneName = 4;
+    optional ExtensionFieldSet extensionFieldSets[] = 5;
+  }
 
-server cluster Basic = 40 {
-  struct CapabilityMinimaStruct {
-    int16u caseSessionsPerFabric = 0;
-    int16u subscriptionsPerFabric = 1;
+  response struct RemoveSceneResponse = 2 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  critical event StartUp = 0 {
-    INT32U softwareVersion = 0;
+  response struct RemoveAllScenesResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  critical event ShutDown = 1 {
+  response struct StoreSceneResponse = 4 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  info event Leave = 2 {
+  response struct GetSceneMembershipResponse = 6 {
+    ENUM8 status = 0;
+    nullable INT8U capacity = 1;
+    group_id groupId = 2;
+    optional INT8U sceneList[] = 3;
   }
 
-  info event ReachableChanged = 3 {
-    boolean reachableNewValue = 0;
+  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
+  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
+  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
+  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
+  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
+  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
+  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
+}
+
+server cluster OnOff = 6 {
+  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
+    kFadeToOffIn0p8Seconds = 0;
+    kNoFade = 1;
+    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
   }
 
-  readonly attribute int16u dataModelRevision = 0;
-  readonly attribute char_string<32> vendorName = 1;
-  readonly attribute vendor_id vendorID = 2;
-  readonly attribute char_string<32> productName = 3;
-  readonly attribute int16u productID = 4;
-  attribute access(write: manage) char_string<32> nodeLabel = 5;
-  attribute access(write: administer) char_string<2> location = 6;
-  readonly attribute int16u hardwareVersion = 7;
-  readonly attribute char_string<64> hardwareVersionString = 8;
-  readonly attribute int32u softwareVersion = 9;
-  readonly attribute char_string<64> softwareVersionString = 10;
-  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  enum OnOffDyingLightEffectVariant : ENUM8 {
+    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
+  }
+
+  enum OnOffEffectIdentifier : ENUM8 {
+    kDelayedAllOff = 0;
+    kDyingLight = 1;
+  }
+
+  enum OnOffStartUpOnOff : ENUM8 {
+    kOff = 0;
+    kOn = 1;
+    kTogglePreviousOnOff = 2;
+  }
+
+  bitmap OnOffControl : BITMAP8 {
+    kAcceptOnlyWhenOn = 0x1;
+  }
+
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
+  }
+
+  bitmap SceneFeatures : BITMAP32 {
+    kSceneNames = 0x1;
+  }
+
+  readonly attribute boolean onOff = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command Off(): DefaultSuccess = 0;
+  command On(): DefaultSuccess = 1;
+  command Toggle(): DefaultSuccess = 2;
+}
+
+server cluster LevelControl = 8 {
+  enum MoveMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
+  }
+
+  enum StepMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
+  }
+
+  bitmap LevelControlFeature : BITMAP32 {
+    kOnOff = 0x1;
+    kLighting = 0x2;
+    kFrequency = 0x4;
+  }
+
+  readonly attribute int8u currentLevel = 0;
+  attribute bitmap8 options = 15;
+  attribute nullable int8u onLevel = 17;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct MoveToLevelRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
+  }
+
+  request struct MoveRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
+  }
+
+  request struct StepRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionMask = 3;
+    BITMAP8 optionOverride = 4;
+  }
+
+  request struct StopRequest {
+    BITMAP8 optionMask = 0;
+    BITMAP8 optionOverride = 1;
+  }
+
+  request struct MoveToLevelWithOnOffRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
+  }
+
+  request struct MoveWithOnOffRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
+  }
+
+  request struct StepWithOnOffRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
+  }
+
+  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
+  command Move(MoveRequest): DefaultSuccess = 1;
+  command Step(StepRequest): DefaultSuccess = 2;
+  command Stop(StopRequest): DefaultSuccess = 3;
+  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
+  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
+  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
+  command StopWithOnOff(): DefaultSuccess = 7;
+}
+
+server cluster Descriptor = 29 {
+  struct DeviceType {
+    devtype_id type = 0;
+    int16u revision = 1;
+  }
+
+  readonly attribute DeviceType deviceList[] = 0;
+  readonly attribute CLUSTER_ID serverList[] = 1;
+  readonly attribute CLUSTER_ID clientList[] = 2;
+  readonly attribute ENDPOINT_NO partsList[] = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
@@ -264,12 +352,61 @@ server cluster Binding = 30 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster BooleanState = 69 {
-  info event StateChange = 0 {
-    boolean stateValue = 0;
+server cluster AccessControl = 31 {
+  enum AuthMode : ENUM8 {
+    kPase = 1;
+    kCase = 2;
+    kGroup = 3;
   }
 
-  readonly attribute boolean stateValue = 0;
+  enum ChangeTypeEnum : ENUM8 {
+    kChanged = 0;
+    kAdded = 1;
+    kRemoved = 2;
+  }
+
+  enum Privilege : ENUM8 {
+    kView = 1;
+    kProxyView = 2;
+    kOperate = 3;
+    kManage = 4;
+    kAdminister = 5;
+  }
+
+  struct AccessControlEntry {
+    Privilege privilege = 1;
+    AuthMode authMode = 2;
+    nullable int64u subjects[] = 3;
+    nullable Target targets[] = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct Target {
+    nullable cluster_id cluster = 0;
+    nullable endpoint_no endpoint = 1;
+    nullable devtype_id deviceType = 2;
+  }
+
+  info event access(read: administer) AccessControlEntryChanged = 0 {
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable AccessControlEntry latestValue = 4;
+    fabric_idx adminFabricIndex = 254;
+  }
+
+  info event access(read: administer) AccessControlExtensionChanged = 1 {
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable ExtensionEntry latestValue = 4;
+    fabric_idx adminFabricIndex = 254;
+  }
+
+  attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
+  readonly attribute int16u subjectsPerAccessControlEntry = 2;
+  readonly attribute int16u targetsPerAccessControlEntry = 3;
+  readonly attribute int16u accessControlEntriesPerFabric = 4;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
@@ -353,783 +490,519 @@ server cluster BridgedActions = 37 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster Channel = 1284 {
-  enum ChannelStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kMultipleMatches = 1;
-    kNoMatches = 2;
+server cluster Basic = 40 {
+  struct CapabilityMinimaStruct {
+    int16u caseSessionsPerFabric = 0;
+    int16u subscriptionsPerFabric = 1;
   }
 
-  enum LineupInfoTypeEnum : ENUM8 {
-    kMso = 0;
+  critical event StartUp = 0 {
+    INT32U softwareVersion = 0;
   }
 
-  bitmap ChannelFeature : BITMAP32 {
-    kChannelList = 0x1;
-    kLineupInfo = 0x2;
+  critical event ShutDown = 1 {
   }
 
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct ChangeChannelByNumberRequest {
-    INT16U majorNumber = 0;
-    INT16U minorNumber = 1;
+  info event Leave = 2 {
   }
 
-  request struct SkipChannelRequest {
-    INT16U count = 0;
+  info event ReachableChanged = 3 {
+    boolean reachableNewValue = 0;
   }
 
-  command ChangeChannelByNumber(ChangeChannelByNumberRequest): DefaultSuccess = 2;
-  command SkipChannel(SkipChannelRequest): DefaultSuccess = 3;
+  readonly attribute int16u dataModelRevision = 0;
+  readonly attribute char_string<32> vendorName = 1;
+  readonly attribute vendor_id vendorID = 2;
+  readonly attribute char_string<32> productName = 3;
+  readonly attribute int16u productID = 4;
+  attribute access(write: manage) char_string<32> nodeLabel = 5;
+  attribute access(write: administer) char_string<2> location = 6;
+  readonly attribute int16u hardwareVersion = 7;
+  readonly attribute char_string<64> hardwareVersionString = 8;
+  readonly attribute int32u softwareVersion = 9;
+  readonly attribute char_string<64> softwareVersionString = 10;
+  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster ColorControl = 768 {
-  enum ColorLoopAction : ENUM8 {
-    kDeactivate = 0;
-    kActivateFromColorLoopStartEnhancedHue = 1;
-    kActivateFromEnhancedCurrentHue = 2;
+client cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
   }
 
-  enum ColorLoopDirection : ENUM8 {
-    kDecrementHue = 0;
-    kIncrementHue = 1;
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
   }
 
-  enum ColorMode : ENUM8 {
-    kCurrentHueAndCurrentSaturation = 0;
-    kCurrentXAndCurrentY = 1;
-    kColorTemperature = 2;
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
   }
 
-  enum HueDirection : ENUM8 {
-    kShortestDistance = 0;
-    kLongestDistance = 1;
-    kUp = 2;
-    kDown = 3;
-  }
+  readonly attribute int16u clusterRevision = 65533;
 
-  enum HueMoveMode : ENUM8 {
-    kStop = 0;
-    kUp = 1;
-    kDown = 3;
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
   }
 
-  enum HueStepMode : ENUM8 {
-    kUp = 1;
-    kDown = 3;
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
   }
 
-  enum SaturationMoveMode : ENUM8 {
-    kStop = 0;
-    kUp = 1;
-    kDown = 3;
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
   }
 
-  enum SaturationStepMode : ENUM8 {
-    kUp = 1;
-    kDown = 3;
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
   }
 
-  bitmap ColorCapabilities : BITMAP16 {
-    kHueSaturationSupported = 0x1;
-    kEnhancedHueSupported = 0x2;
-    kColorLoopSupported = 0x4;
-    kXYAttributesSupported = 0x8;
-    kColorTemperatureSupported = 0x10;
-  }
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
+}
 
-  bitmap ColorControlFeature : BITMAP32 {
-    kHueAndSaturation = 0x1;
-    kEnhancedHue = 0x2;
-    kColorLoop = 0x4;
-    kXy = 0x8;
-    kColorTemperature = 0x10;
+server cluster OtaSoftwareUpdateRequestor = 42 {
+  enum OTAAnnouncementReason : ENUM8 {
+    kSimpleAnnouncement = 0;
+    kUpdateAvailable = 1;
+    kUrgentUpdateAvailable = 2;
   }
 
-  bitmap ColorLoopUpdateFlags : BITMAP8 {
-    kUpdateAction = 0x1;
-    kUpdateDirection = 0x2;
-    kUpdateTime = 0x4;
-    kUpdateStartHue = 0x8;
+  enum OTAChangeReasonEnum : ENUM8 {
+    kUnknown = 0;
+    kSuccess = 1;
+    kFailure = 2;
+    kTimeOut = 3;
+    kDelayByProvider = 4;
   }
 
-  readonly attribute enum8 colorMode = 8;
-  attribute bitmap8 options = 15;
-  readonly attribute nullable int8u numberOfPrimaries = 16;
-  readonly attribute enum8 enhancedColorMode = 16385;
-  readonly attribute bitmap16 colorCapabilities = 16394;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster ContentLauncher = 1290 {
-  enum ContentLaunchStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kUrlNotAvailable = 1;
-    kAuthFailed = 2;
+  enum OTAUpdateStateEnum : ENUM8 {
+    kUnknown = 0;
+    kIdle = 1;
+    kQuerying = 2;
+    kDelayedOnQuery = 3;
+    kDownloading = 4;
+    kApplying = 5;
+    kDelayedOnApply = 6;
+    kRollingBack = 7;
+    kDelayedOnUserConsent = 8;
   }
 
-  enum MetricTypeEnum : ENUM8 {
-    kPixels = 0;
-    kPercentage = 1;
+  struct ProviderLocation {
+    node_id providerNodeID = 1;
+    endpoint_no endpoint = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  enum ParameterEnum : ENUM8 {
-    kActor = 0;
-    kChannel = 1;
-    kCharacter = 2;
-    kDirector = 3;
-    kEvent = 4;
-    kFranchise = 5;
-    kGenre = 6;
-    kLeague = 7;
-    kPopularity = 8;
-    kProvider = 9;
-    kSport = 10;
-    kSportsTeam = 11;
-    kType = 12;
+  info event StateTransition = 0 {
+    OTAUpdateStateEnum previousState = 0;
+    OTAUpdateStateEnum newState = 1;
+    OTAChangeReasonEnum reason = 2;
+    nullable INT32U targetSoftwareVersion = 3;
   }
 
-  bitmap ContentLauncherFeature : BITMAP32 {
-    kContentSearch = 0x1;
-    kURLPlayback = 0x2;
+  critical event VersionApplied = 1 {
+    INT32U softwareVersion = 0;
+    INT16U productID = 1;
   }
 
-  bitmap SupportedStreamingProtocol : BITMAP32 {
-    kDash = 0x1;
-    kHls = 0x2;
+  info event DownloadError = 2 {
+    INT32U softwareVersion = 0;
+    INT64U bytesDownloaded = 1;
+    nullable INT8U progressPercent = 2;
+    nullable INT64S platformCode = 3;
   }
 
-  struct ContentSearch {
-    Parameter parameterList[] = 0;
-  }
+  attribute ProviderLocation defaultOtaProviders[] = 0;
+  readonly attribute boolean updatePossible = 1;
+  readonly attribute OTAUpdateStateEnum updateState = 2;
+  readonly attribute nullable int8u updateStateProgress = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  struct Parameter {
-    ParameterEnum type = 0;
-    char_string value = 1;
-    optional AdditionalInfo externalIDList[] = 2;
+  request struct AnnounceOtaProviderRequest {
+    node_id providerNodeId = 0;
+    vendor_id vendorId = 1;
+    OTAAnnouncementReason announcementReason = 2;
+    optional OCTET_STRING metadataForNode = 3;
+    endpoint_no endpoint = 4;
   }
 
-  struct AdditionalInfo {
-    char_string name = 0;
-    char_string value = 1;
-  }
+  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
+}
 
-  struct BrandingInformation {
-    char_string providerName = 0;
-    optional StyleInformation background = 1;
-    optional StyleInformation logo = 2;
-    optional StyleInformation progressBar = 3;
-    optional StyleInformation splash = 4;
-    optional StyleInformation waterMark = 5;
-  }
+server cluster LocalizationConfiguration = 43 {
+  attribute char_string<35> activeLocale = 0;
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  struct StyleInformation {
-    optional char_string imageUrl = 0;
-    optional char_string color = 1;
-    optional Dimension size = 2;
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
   }
 
-  struct Dimension {
-    double width = 0;
-    double height = 1;
-    MetricTypeEnum metric = 2;
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
   }
 
+  attribute HourFormat hourFormat = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster Descriptor = 29 {
-  struct DeviceType {
-    devtype_id type = 0;
-    int16u revision = 1;
-  }
-
-  readonly attribute DeviceType deviceList[] = 0;
-  readonly attribute CLUSTER_ID serverList[] = 1;
-  readonly attribute CLUSTER_ID clientList[] = 2;
-  readonly attribute ENDPOINT_NO partsList[] = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster DiagnosticLogs = 50 {
-  enum LogsIntent : ENUM8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
+server cluster UnitLocalization = 45 {
+  enum TempUnit : ENUM8 {
+    kFahrenheit = 0;
+    kCelsius = 1;
+    kKelvin = 2;
   }
 
-  enum LogsStatus : ENUM8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
+  bitmap UnitLocalizationFeature : BITMAP32 {
+    kTemperatureUnit = 0x1;
   }
 
-  enum LogsTransferProtocol : ENUM8 {
-    kResponsePayload = 0;
-    kBdx = 1;
-  }
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
+server cluster PowerSourceConfiguration = 46 {
+  readonly attribute INT8U sources[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct RetrieveLogsRequestRequest {
-    LogsIntent intent = 0;
-    LogsTransferProtocol requestedProtocol = 1;
-    OCTET_STRING transferFileDesignator = 2;
+server cluster PowerSource = 47 {
+  enum BatChargeFaultType : ENUM8 {
+    kUnspecfied = 0;
+    kAmbientTooHot = 1;
+    kAmbientTooCold = 2;
+    kBatteryTooHot = 3;
+    kBatteryTooCold = 4;
+    kBatteryAbsent = 5;
+    kBatteryOverVoltage = 6;
+    kBatteryUnderVoltage = 7;
+    kChargerOverVoltage = 8;
+    kChargerUnderVoltage = 9;
+    kSafetyTimeout = 10;
   }
 
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
-}
+  enum BatChargeLevel : ENUM8 {
+    kOk = 0;
+    kWarning = 1;
+    kCritical = 2;
+  }
 
-server cluster DoorLock = 257 {
-  enum DlAlarmCode : ENUM8 {
-    kLockJammed = 0;
-    kLockFactoryReset = 1;
-    kLockRadioPowerCycled = 3;
-    kWrongCodeEntryLimit = 4;
-    kFrontEsceutcheonRemoved = 5;
-    kDoorForcedOpen = 6;
-    kDoorAjar = 7;
-    kForcedUser = 8;
+  enum BatChargeState : ENUM8 {
+    kUnknown = 0;
+    kIsCharging = 1;
+    kIsAtFullCharge = 2;
+    kIsNotCharging = 3;
   }
 
-  enum DlCredentialRule : ENUM8 {
-    kSingle = 0;
-    kDouble = 1;
-    kTri = 2;
+  enum BatFaultType : ENUM8 {
+    kUnspecfied = 0;
+    kOverTemp = 1;
+    kUnderTemp = 2;
   }
 
-  enum DlCredentialType : ENUM8 {
-    kProgrammingPIN = 0;
-    kPin = 1;
-    kRfid = 2;
-    kFingerprint = 3;
-    kFingerVein = 4;
-    kFace = 5;
+  enum BatReplaceability : ENUM8 {
+    kUnspecified = 0;
+    kNotReplaceable = 1;
+    kUserReplaceable = 2;
+    kFactoryReplaceable = 3;
   }
 
-  enum DlDataOperationType : ENUM8 {
-    kAdd = 0;
-    kClear = 1;
-    kModify = 2;
+  enum PowerSourceStatus : ENUM8 {
+    kUnspecfied = 0;
+    kActive = 1;
+    kStandby = 2;
+    kUnavailable = 3;
   }
 
-  enum DlDoorState : ENUM8 {
-    kDoorOpen = 0;
-    kDoorClosed = 1;
-    kDoorJammed = 2;
-    kDoorForcedOpen = 3;
-    kDoorUnspecifiedError = 4;
-    kDoorAjar = 5;
+  enum WiredCurrentType : ENUM8 {
+    kAc = 0;
+    kDc = 1;
   }
 
-  enum DlLockDataType : ENUM8 {
-    kUnspecified = 0;
-    kProgrammingCode = 1;
-    kUserIndex = 2;
-    kWeekDaySchedule = 3;
-    kYearDaySchedule = 4;
-    kHolidaySchedule = 5;
-    kPin = 6;
-    kRfid = 7;
-    kFingerprint = 8;
+  enum WiredFaultType : ENUM8 {
+    kUnspecfied = 0;
+    kOverVoltage = 1;
+    kUnderVoltage = 2;
   }
 
-  enum DlLockOperationType : ENUM8 {
-    kLock = 0;
-    kUnlock = 1;
-    kNonAccessUserEvent = 2;
-    kForcedUserEvent = 3;
+  bitmap PowerSourceFeature : BITMAP32 {
+    kWired = 0x1;
+    kBattery = 0x2;
+    kRechargeable = 0x4;
+    kReplaceable = 0x8;
   }
 
-  enum DlLockState : ENUM8 {
-    kNotFullyLocked = 0;
-    kLocked = 1;
-    kUnlocked = 2;
+  readonly attribute enum8 status = 0;
+  readonly attribute int8u order = 1;
+  readonly attribute char_string<60> description = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster GeneralCommissioning = 48 {
+  enum CommissioningError : ENUM8 {
+    kOk = 0;
+    kValueOutsideRange = 1;
+    kInvalidAuthentication = 2;
+    kNoFailSafe = 3;
+    kBusyWithOtherAdmin = 4;
   }
 
-  enum DlLockType : ENUM8 {
-    kDeadBolt = 0;
-    kMagnetic = 1;
-    kOther = 2;
-    kMortise = 3;
-    kRim = 4;
-    kLatchBolt = 5;
-    kCylindricalLock = 6;
-    kTubularLock = 7;
-    kInterconnectedLock = 8;
-    kDeadLatch = 9;
-    kDoorFurniture = 10;
+  enum RegulatoryLocationType : ENUM8 {
+    kIndoor = 0;
+    kOutdoor = 1;
+    kIndoorOutdoor = 2;
   }
 
-  enum DlOperatingMode : ENUM8 {
-    kNormal = 0;
-    kVacation = 1;
-    kPrivacy = 2;
-    kNoRemoteLockUnlock = 3;
-    kPassage = 4;
+  struct BasicCommissioningInfo {
+    int16u failSafeExpiryLengthSeconds = 0;
+    int16u maxCumulativeFailsafeSeconds = 1;
   }
 
-  enum DlOperationError : ENUM8 {
-    kUnspecified = 0;
-    kInvalidCredential = 1;
-    kDisabledUserDenied = 2;
-    kRestricted = 3;
-    kInsufficientBattery = 4;
+  attribute access(write: administer) int64u breadcrumb = 0;
+  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
+  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
+  readonly attribute RegulatoryLocationType locationCapability = 3;
+  readonly attribute boolean supportsConcurrentConnection = 4;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ArmFailSafeRequest {
+    INT16U expiryLengthSeconds = 0;
+    INT64U breadcrumb = 1;
   }
 
-  enum DlOperationSource : ENUM8 {
-    kUnspecified = 0;
-    kManual = 1;
-    kProprietaryRemote = 2;
-    kKeypad = 3;
-    kAuto = 4;
-    kButton = 5;
-    kSchedule = 6;
-    kRemote = 7;
-    kRfid = 8;
-    kBiometric = 9;
+  request struct SetRegulatoryConfigRequest {
+    RegulatoryLocationType newRegulatoryConfig = 0;
+    CHAR_STRING countryCode = 1;
+    INT64U breadcrumb = 2;
   }
 
-  enum DlStatus : ENUM8 {
-    kSuccess = 0;
-    kFailure = 1;
-    kDuplicate = 2;
-    kOccupied = 3;
-    kInvalidField = 133;
-    kResourceExhausted = 137;
-    kNotFound = 139;
+  response struct ArmFailSafeResponse = 1 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  enum DlUserStatus : ENUM8 {
-    kAvailable = 0;
-    kOccupiedEnabled = 1;
-    kOccupiedDisabled = 3;
+  response struct SetRegulatoryConfigResponse = 3 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  enum DlUserType : ENUM8 {
-    kUnrestrictedUser = 0;
-    kYearDayScheduleUser = 1;
-    kWeekDayScheduleUser = 2;
-    kProgrammingUser = 3;
-    kNonAccessUser = 4;
-    kForcedUser = 5;
-    kDisposableUser = 6;
-    kExpiringUser = 7;
-    kScheduleRestrictedUser = 8;
-    kRemoteOnlyUser = 9;
+  response struct CommissioningCompleteResponse = 5 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  enum DoorLockOperationEventCode : ENUM8 {
-    kUnknownOrMfgSpecific = 0;
-    kLock = 1;
-    kUnlock = 2;
-    kLockInvalidPinOrId = 3;
-    kLockInvalidSchedule = 4;
-    kUnlockInvalidPinOrId = 5;
-    kUnlockInvalidSchedule = 6;
-    kOneTouchLock = 7;
-    kKeyLock = 8;
-    kKeyUnlock = 9;
-    kAutoLock = 10;
-    kScheduleLock = 11;
-    kScheduleUnlock = 12;
-    kManualLock = 13;
-    kManualUnlock = 14;
-  }
-
-  enum DoorLockProgrammingEventCode : ENUM8 {
-    kUnknownOrMfgSpecific = 0;
-    kMasterCodeChanged = 1;
-    kPinAdded = 2;
-    kPinDeleted = 3;
-    kPinChanged = 4;
-    kIdAdded = 5;
-    kIdDeleted = 6;
-  }
+  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
+  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
+  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
+}
 
-  enum DoorLockSetPinOrIdStatus : ENUM8 {
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatus : ENUM8 {
     kSuccess = 0;
-    kGeneralFailure = 1;
-    kMemoryFull = 2;
-    kDuplicateCodeError = 3;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
   }
 
-  enum DoorLockUserStatus : ENUM8 {
-    kAvailable = 0;
-    kOccupiedEnabled = 1;
-    kOccupiedDisabled = 3;
-    kNotSupported = 255;
+  enum WiFiBand : ENUM8 {
+    k2g4 = 0;
+    k3g65 = 1;
+    k5g = 2;
+    k6g = 3;
+    k60g = 4;
   }
 
-  enum DoorLockUserType : ENUM8 {
-    kUnrestricted = 0;
-    kYearDayScheduleUser = 1;
-    kWeekDayScheduleUser = 2;
-    kMasterUser = 3;
-    kNonAccessUser = 4;
-    kNotSupported = 255;
+  bitmap NetworkCommissioningFeature : BITMAP32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap DlCredentialRuleMask : BITMAP8 {
-    kSingle = 0x1;
-    kDual = 0x2;
-    kTri = 0x4;
+  bitmap WiFiSecurity : BITMAP8 {
+    kUnencrypted = 0x1;
+    kWepPersonal = 0x2;
+    kWpaPersonal = 0x4;
+    kWpa2Personal = 0x8;
+    kWpa3Personal = 0x10;
   }
 
-  bitmap DlCredentialRulesSupport : BITMAP8 {
-    kSingle = 0x1;
-    kDual = 0x2;
-    kTri = 0x4;
+  struct NetworkInfo {
+    octet_string<32> networkID = 0;
+    boolean connected = 1;
   }
 
-  bitmap DlDaysMaskMap : BITMAP8 {
-    kSunday = 0x1;
-    kMonday = 0x2;
-    kTuesday = 0x4;
-    kWednesday = 0x8;
-    kThursday = 0x10;
-    kFriday = 0x20;
-    kSaturday = 0x40;
+  struct WiFiInterfaceScanResult {
+    WiFiSecurity security = 0;
+    octet_string<32> ssid = 1;
+    octet_string<6> bssid = 2;
+    int16u channel = 3;
+    WiFiBand wiFiBand = 4;
+    int8s rssi = 5;
   }
 
-  bitmap DlDefaultConfigurationRegister : BITMAP16 {
-    kEnableLocalProgrammingEnabled = 0x1;
-    kKeypadInterfaceDefaultAccessEnabled = 0x2;
-    kRemoteInterfaceDefaultAccessIsEnabled = 0x4;
-    kSoundEnabled = 0x20;
-    kAutoRelockTimeSet = 0x40;
-    kLEDSettingsSet = 0x80;
+  struct ThreadInterfaceScanResult {
+    int16u panId = 0;
+    int64u extendedPanId = 1;
+    char_string<16> networkName = 2;
+    int16u channel = 3;
+    int8u version = 4;
+    octet_string<8> extendedAddress = 5;
+    int8s rssi = 6;
+    int8u lqi = 7;
   }
 
-  bitmap DlKeypadOperationEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kLock = 0x2;
-    kUnlock = 0x4;
-    kLockInvalidPIN = 0x8;
-    kLockInvalidSchedule = 0x10;
-    kUnlockInvalidCode = 0x20;
-    kUnlockInvalidSchedule = 0x40;
-    kNonAccessUserOpEvent = 0x80;
-  }
+  readonly attribute access(read: administer) int8u maxNetworks = 0;
+  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
+  readonly attribute int8u scanMaxTimeSeconds = 2;
+  readonly attribute int8u connectMaxTimeSeconds = 3;
+  attribute access(write: administer) boolean interfaceEnabled = 4;
+  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
+  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
+  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  bitmap DlKeypadProgrammingEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kProgrammingPINChanged = 0x2;
-    kPINAdded = 0x4;
-    kPINCleared = 0x8;
-    kPINChanged = 0x10;
+  request struct ScanNetworksRequest {
+    optional nullable OCTET_STRING ssid = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  bitmap DlLocalProgrammingFeatures : BITMAP8 {
-    kAddUsersCredentialsSchedulesLocally = 0x1;
-    kModifyUsersCredentialsSchedulesLocally = 0x2;
-    kClearUsersCredentialsSchedulesLocally = 0x4;
-    kAdjustLockSettingsLocally = 0x8;
+  request struct AddOrUpdateWiFiNetworkRequest {
+    OCTET_STRING ssid = 0;
+    OCTET_STRING credentials = 1;
+    optional INT64U breadcrumb = 2;
   }
 
-  bitmap DlManualOperationEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kThumbturnLock = 0x2;
-    kThumbturnUnlock = 0x4;
-    kOneTouchLock = 0x8;
-    kKeyLock = 0x10;
-    kKeyUnlock = 0x20;
-    kAutoLock = 0x40;
-    kScheduleLock = 0x80;
-    kScheduleUnlock = 0x100;
-    kManualLock = 0x200;
-    kManualUnlock = 0x400;
+  request struct AddOrUpdateThreadNetworkRequest {
+    OCTET_STRING operationalDataset = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  bitmap DlRFIDOperationEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kLock = 0x2;
-    kUnlock = 0x4;
-    kLockInvalidRFID = 0x8;
-    kLockInvalidSchedule = 0x10;
-    kUnlockInvalidRFID = 0x20;
-    kUnlockInvalidSchedule = 0x40;
+  request struct RemoveNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  bitmap DlRFIDProgrammingEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kRFIDCodeAdded = 0x20;
-    kRFIDCodeCleared = 0x40;
+  request struct ConnectNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  bitmap DlRemoteOperationEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kLock = 0x2;
-    kUnlock = 0x4;
-    kLockInvalidCode = 0x8;
-    kLockInvalidSchedule = 0x10;
-    kUnlockInvalidCode = 0x20;
-    kUnlockInvalidSchedule = 0x40;
+  request struct ReorderNetworkRequest {
+    OCTET_STRING networkID = 0;
+    INT8U networkIndex = 1;
+    optional INT64U breadcrumb = 2;
   }
 
-  bitmap DlRemoteProgrammingEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kProgrammingPINChanged = 0x2;
-    kPINAdded = 0x4;
-    kPINCleared = 0x8;
-    kPINChanged = 0x10;
-    kRFIDCodeAdded = 0x20;
-    kRFIDCodeCleared = 0x40;
+  response struct ScanNetworksResponse = 1 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
+    optional ThreadInterfaceScanResult threadScanResults[] = 3;
   }
 
-  bitmap DlSupportedOperatingModes : BITMAP16 {
-    kNormal = 0x1;
-    kVacation = 0x2;
-    kPrivacy = 0x4;
-    kNoRemoteLockUnlock = 0x8;
-    kPassage = 0x10;
+  response struct NetworkConfigResponse = 5 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional INT8U networkIndex = 2;
   }
 
-  bitmap DoorLockDayOfWeek : BITMAP8 {
-    kSunday = 0x1;
-    kMonday = 0x2;
-    kTuesday = 0x4;
-    kWednesday = 0x8;
-    kThursday = 0x10;
-    kFriday = 0x20;
-    kSaturday = 0x40;
+  response struct ConnectNetworkResponse = 7 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    nullable INT32S errorValue = 2;
   }
 
-  bitmap DoorLockFeature : BITMAP32 {
-    kPINCredentials = 0x1;
-    kRFIDCredentials = 0x2;
-    kFingerCredentials = 0x4;
-    kLogging = 0x8;
-    kAccessSchedules = 0x10;
-    kDoorPositionSensor = 0x20;
-    kFaceCredentials = 0x40;
-    kCredentialsOTA = 0x80;
-    kUsersManagement = 0x100;
-    kNotifications = 0x200;
-  }
+  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
+  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
+  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
+  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
+  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
+  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+}
 
-  struct DlCredential {
-    DlCredentialType credentialType = 0;
-    int16u credentialIndex = 1;
+server cluster DiagnosticLogs = 50 {
+  enum LogsIntent : ENUM8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
   }
 
-  critical event DoorLockAlarm = 0 {
-    DlAlarmCode alarmCode = 0;
-  }
-
-  critical event DoorStateChange = 1 {
-    DlDoorState doorState = 0;
-  }
-
-  critical event LockOperation = 2 {
-    DlLockOperationType lockOperationType = 0;
-    DlOperationSource operationSource = 1;
-    nullable INT16U userIndex = 2;
-    nullable fabric_idx fabricIndex = 3;
-    nullable NODE_ID sourceNode = 4;
-    optional nullable DlCredential credentials[] = 5;
-  }
-
-  critical event LockOperationError = 3 {
-    DlLockOperationType lockOperationType = 0;
-    DlOperationSource operationSource = 1;
-    DlOperationError operationError = 2;
-    nullable INT16U userIndex = 3;
-    nullable fabric_idx fabricIndex = 4;
-    nullable NODE_ID sourceNode = 5;
-    optional nullable DlCredential credentials[] = 6;
-  }
-
-  info event LockUserChange = 4 {
-    DlLockDataType lockDataType = 0;
-    DlDataOperationType dataOperationType = 1;
-    DlOperationSource operationSource = 2;
-    nullable INT16U userIndex = 3;
-    nullable fabric_idx fabricIndex = 4;
-    nullable NODE_ID sourceNode = 5;
-    nullable INT16U dataIndex = 6;
-  }
-
-  readonly attribute nullable DlLockState lockState = 0;
-  readonly attribute DlLockType lockType = 1;
-  readonly attribute boolean actuatorEnabled = 2;
-  attribute access(write: manage) int32u autoRelockTime = 35;
-  attribute access(write: manage) DlOperatingMode operatingMode = 37;
-  readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct LockDoorRequest {
-    optional OCTET_STRING pinCode = 0;
-  }
-
-  request struct UnlockDoorRequest {
-    optional OCTET_STRING pinCode = 0;
-  }
-
-  timed command LockDoor(LockDoorRequest): DefaultSuccess = 0;
-  timed command UnlockDoor(UnlockDoorRequest): DefaultSuccess = 1;
-}
-
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
-  }
-
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command ResetCounts(): DefaultSuccess = 0;
-}
-
-server cluster FanControl = 514 {
-  enum FanModeSequenceType : ENUM8 {
-    kOffLowMedHigh = 0;
-    kOffLowHigh = 1;
-    kOffLowMedHighAuto = 2;
-    kOffLowHighAuto = 3;
-    kOffOnAuto = 4;
-    kOffOn = 5;
-  }
-
-  enum FanModeType : ENUM8 {
-    kOff = 0;
-    kLow = 1;
-    kMedium = 2;
-    kHigh = 3;
-    kOn = 4;
-    kAuto = 5;
-    kSmart = 6;
-  }
-
-  bitmap FanControlFeature : BITMAP32 {
-    kMultiSpeed = 0x1;
-    kAuto = 0x2;
-    kRocking = 0x4;
-    kWind = 0x8;
-  }
-
-  bitmap RockSupportMask : BITMAP8 {
-    kRockLeftRight = 0x1;
-    kRockUpDown = 0x2;
-    kRockRound = 0x4;
-  }
-
-  bitmap WindSettingMask : BITMAP8 {
-    kSleepWind = 0x1;
-    kNaturalWind = 0x2;
-  }
-
-  bitmap WindSupportMask : BITMAP8 {
-    kSleepWind = 0x1;
-    kNaturalWind = 0x2;
-  }
-
-  attribute FanModeType fanMode = 0;
-  attribute FanModeSequenceType fanModeSequence = 1;
-  attribute nullable int8u percentSetting = 2;
-  readonly attribute int8u percentCurrent = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster FlowMeasurement = 1028 {
-  readonly attribute nullable int16u measuredValue = 0;
-  readonly attribute nullable int16u minMeasuredValue = 1;
-  readonly attribute nullable int16u maxMeasuredValue = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster GeneralCommissioning = 48 {
-  enum CommissioningError : ENUM8 {
-    kOk = 0;
-    kValueOutsideRange = 1;
-    kInvalidAuthentication = 2;
-    kNoFailSafe = 3;
-    kBusyWithOtherAdmin = 4;
-  }
-
-  enum RegulatoryLocationType : ENUM8 {
-    kIndoor = 0;
-    kOutdoor = 1;
-    kIndoorOutdoor = 2;
+  enum LogsStatus : ENUM8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
   }
 
-  struct BasicCommissioningInfo {
-    int16u failSafeExpiryLengthSeconds = 0;
-    int16u maxCumulativeFailsafeSeconds = 1;
+  enum LogsTransferProtocol : ENUM8 {
+    kResponsePayload = 0;
+    kBdx = 1;
   }
 
-  attribute access(write: administer) int64u breadcrumb = 0;
-  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
-  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
-  readonly attribute RegulatoryLocationType locationCapability = 3;
-  readonly attribute boolean supportsConcurrentConnection = 4;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct ArmFailSafeRequest {
-    INT16U expiryLengthSeconds = 0;
-    INT64U breadcrumb = 1;
-  }
-
-  request struct SetRegulatoryConfigRequest {
-    RegulatoryLocationType newRegulatoryConfig = 0;
-    CHAR_STRING countryCode = 1;
-    INT64U breadcrumb = 2;
-  }
-
-  response struct ArmFailSafeResponse = 1 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
-  }
-
-  response struct SetRegulatoryConfigResponse = 3 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
-  }
-
-  response struct CommissioningCompleteResponse = 5 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  request struct RetrieveLogsRequestRequest {
+    LogsIntent intent = 0;
+    LogsTransferProtocol requestedProtocol = 1;
+    OCTET_STRING transferFileDesignator = 2;
   }
 
-  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
-  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
-  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
+  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
 }
 
 server cluster GeneralDiagnostics = 51 {
@@ -1229,453 +1102,468 @@ server cluster GeneralDiagnostics = 51 {
   command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
-  }
-
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
-    fabric_idx fabricIndex = 254;
-  }
-
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
+server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
   }
 
-  struct GroupKeySetStruct {
-    int16u groupKeySetID = 0;
-    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
-    nullable octet_string<16> epochKey0 = 2;
-    nullable epoch_us epochStartTime0 = 3;
-    nullable octet_string<16> epochKey1 = 4;
-    nullable epoch_us epochStartTime1 = 5;
-    nullable octet_string<16> epochKey2 = 6;
-    nullable epoch_us epochStartTime2 = 7;
+  info event SoftwareFault = 0 {
+    SoftwareFaultStruct softwareFault = 0;
   }
 
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
-  readonly attribute int16u maxGroupsPerFabric = 2;
-  readonly attribute int16u maxGroupKeysPerFabric = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct KeySetWriteRequest {
-    GroupKeySetStruct groupKeySet = 0;
+server cluster ThreadNetworkDiagnostics = 53 {
+  enum NetworkFault : ENUM8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
   }
 
-  request struct KeySetReadRequest {
-    INT16U groupKeySetID = 0;
+  enum RoutingRole : ENUM8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kReed = 4;
+    kRouter = 5;
+    kLeader = 6;
   }
 
-  request struct KeySetRemoveRequest {
-    INT16U groupKeySetID = 0;
+  enum ThreadConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
+  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+    kMLECounts = 0x4;
+    kMACCounts = 0x8;
   }
 
-  response struct KeySetReadResponse = 2 {
-    GroupKeySetStruct groupKeySet = 0;
+  struct NeighborTable {
+    int64u extAddress = 0;
+    int32u age = 1;
+    int16u rloc16 = 2;
+    int32u linkFrameCounter = 3;
+    int32u mleFrameCounter = 4;
+    int8u lqi = 5;
+    nullable int8s averageRssi = 6;
+    nullable int8s lastRssi = 7;
+    int8u frameErrorRate = 8;
+    int8u messageErrorRate = 9;
+    boolean rxOnWhenIdle = 10;
+    boolean fullThreadDevice = 11;
+    boolean fullNetworkData = 12;
+    boolean isChild = 13;
   }
 
-  response struct KeySetReadAllIndicesResponse = 5 {
-    INT16U groupKeySetIDs[] = 0;
+  struct RouteTable {
+    int64u extAddress = 0;
+    int16u rloc16 = 1;
+    int8u routerId = 2;
+    int8u nextHop = 3;
+    int8u pathCost = 4;
+    int8u LQIIn = 5;
+    int8u LQIOut = 6;
+    int8u age = 7;
+    boolean allocated = 8;
+    boolean linkEstablished = 9;
   }
 
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
-}
+  struct SecurityPolicy {
+    int16u rotationTime = 0;
+    bitmap16 flags = 1;
+  }
 
-server cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
+  struct OperationalDatasetComponents {
+    boolean activeTimestampPresent = 0;
+    boolean pendingTimestampPresent = 1;
+    boolean masterKeyPresent = 2;
+    boolean networkNamePresent = 3;
+    boolean extendedPanIdPresent = 4;
+    boolean meshLocalPrefixPresent = 5;
+    boolean delayPresent = 6;
+    boolean panIdPresent = 7;
+    boolean channelPresent = 8;
+    boolean pskcPresent = 9;
+    boolean securityPolicyPresent = 10;
+    boolean channelMaskPresent = 11;
+  }
+
+  info event ConnectionStatus = 0 {
+    ThreadConnectionStatus connectionStatus = 0;
+  }
+
+  readonly attribute nullable int16u channel = 0;
+  readonly attribute nullable RoutingRole routingRole = 1;
+  readonly attribute nullable char_string<16> networkName = 2;
+  readonly attribute nullable int16u panId = 3;
+  readonly attribute nullable int64u extendedPanId = 4;
+  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
+  readonly attribute NeighborTable neighborTableList[] = 7;
+  readonly attribute RouteTable routeTableList[] = 8;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
+  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct AddGroupRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+server cluster WiFiNetworkDiagnostics = 54 {
+  enum AssociationFailureCause : ENUM8 {
+    kUnknown = 0;
+    kAssociationFailed = 1;
+    kAuthenticationFailed = 2;
+    kSsidNotFound = 3;
   }
 
-  request struct ViewGroupRequest {
-    group_id groupId = 0;
+  enum SecurityType : ENUM8 {
+    kUnspecified = 0;
+    kNone = 1;
+    kWep = 2;
+    kWpa = 3;
+    kWpa2 = 4;
+    kWpa3 = 5;
   }
 
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
+  enum WiFiConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  request struct RemoveGroupRequest {
-    group_id groupId = 0;
+  enum WiFiVersionType : ENUM8 {
+    k80211a = 0;
+    k80211b = 1;
+    k80211g = 2;
+    k80211n = 3;
+    k80211ac = 4;
+    k80211ax = 5;
   }
 
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+  info event Disconnection = 0 {
+    INT16U reasonCode = 0;
   }
 
-  response struct AddGroupResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  info event AssociationFailure = 1 {
+    AssociationFailureCause associationFailure = 0;
+    INT16U status = 1;
   }
 
-  response struct ViewGroupResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    CHAR_STRING groupName = 2;
+  info event ConnectionStatus = 2 {
+    WiFiConnectionStatus connectionStatus = 0;
   }
 
-  response struct GetGroupMembershipResponse = 2 {
-    nullable INT8U capacity = 0;
-    group_id groupList[] = 1;
-  }
+  readonly attribute nullable octet_string<6> bssid = 0;
+  readonly attribute nullable SecurityType securityType = 1;
+  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
+  readonly attribute nullable int16u channelNumber = 3;
+  readonly attribute nullable int8s rssi = 4;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  response struct RemoveGroupResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
   }
 
-  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
+server cluster Switch = 59 {
+  info event SwitchLatched = 0 {
+    INT8U newPosition = 0;
   }
 
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
+  info event InitialPress = 1 {
+    INT8U newPosition = 0;
   }
 
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
+  info event LongPress = 2 {
+    INT8U newPosition = 0;
   }
 
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  info event ShortRelease = 3 {
+    INT8U previousPosition = 0;
+  }
 
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
+  info event LongRelease = 4 {
+    INT8U previousPosition = 0;
   }
 
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
-}
+  info event MultiPressOngoing = 5 {
+    INT8U newPosition = 0;
+    INT8U currentNumberOfPressesCounted = 1;
+  }
 
-server cluster IlluminanceMeasurement = 1024 {
-  enum LightSensorType : ENUM8 {
-    kPhotodiode = 0;
-    kCmos = 1;
+  info event MultiPressComplete = 6 {
+    INT8U newPosition = 0;
+    INT8U totalNumberOfPressesCounted = 1;
   }
 
-  readonly attribute nullable int16u measuredValue = 0;
-  readonly attribute nullable int16u minMeasuredValue = 1;
-  readonly attribute nullable int16u maxMeasuredValue = 2;
+  readonly attribute int8u numberOfPositions = 0;
+  readonly attribute int8u currentPosition = 1;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster KeypadInput = 1289 {
-  enum CecKeyCode : ENUM8 {
-    kSelect = 0;
-    kUp = 1;
-    kDown = 2;
-    kLeft = 3;
-    kRight = 4;
-    kRightUp = 5;
-    kRightDown = 6;
-    kLeftUp = 7;
-    kLeftDown = 8;
-    kRootMenu = 9;
-    kSetupMenu = 10;
-    kContentsMenu = 11;
-    kFavoriteMenu = 12;
-    kExit = 13;
-    kMediaTopMenu = 16;
-    kMediaContextSensitiveMenu = 17;
-    kNumberEntryMode = 29;
-    kNumber11 = 30;
-    kNumber12 = 31;
-    kNumber0OrNumber10 = 32;
-    kNumbers1 = 33;
-    kNumbers2 = 34;
-    kNumbers3 = 35;
-    kNumbers4 = 36;
-    kNumbers5 = 37;
-    kNumbers6 = 38;
-    kNumbers7 = 39;
-    kNumbers8 = 40;
-    kNumbers9 = 41;
-    kDot = 42;
-    kEnter = 43;
-    kClear = 44;
-    kNextFavorite = 47;
-    kChannelUp = 48;
-    kChannelDown = 49;
-    kPreviousChannel = 50;
-    kSoundSelect = 51;
-    kInputSelect = 52;
-    kDisplayInformation = 53;
-    kHelp = 54;
-    kPageUp = 55;
-    kPageDown = 56;
-    kPower = 64;
-    kVolumeUp = 65;
-    kVolumeDown = 66;
-    kMute = 67;
-    kPlay = 68;
-    kStop = 69;
-    kPause = 70;
-    kRecord = 71;
-    kRewind = 72;
-    kFastForward = 73;
-    kEject = 74;
-    kForward = 75;
-    kBackward = 76;
-    kStopRecord = 77;
-    kPauseRecord = 78;
-    kReserved = 79;
-    kAngle = 80;
-    kSubPicture = 81;
-    kVideoOnDemand = 82;
-    kElectronicProgramGuide = 83;
-    kTimerProgramming = 84;
-    kInitialConfiguration = 85;
-    kSelectBroadcastType = 86;
-    kSelectSoundPresentation = 87;
-    kPlayFunction = 96;
-    kPausePlayFunction = 97;
-    kRecordFunction = 98;
-    kPauseRecordFunction = 99;
-    kStopFunction = 100;
-    kMuteFunction = 101;
-    kRestoreVolumeFunction = 102;
-    kTuneFunction = 103;
-    kSelectMediaFunction = 104;
-    kSelectAvInputFunction = 105;
-    kSelectAudioInputFunction = 106;
-    kPowerToggleFunction = 107;
-    kPowerOffFunction = 108;
-    kPowerOnFunction = 109;
-    kF1Blue = 113;
-    kF2Red = 114;
-    kF3Green = 115;
-    kF4Yellow = 116;
-    kF5 = 117;
-    kData = 118;
-  }
-
-  enum KeypadInputStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kUnsupportedKey = 1;
-    kInvalidKeyInCurrentState = 2;
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
   }
 
-  bitmap KeypadInputFeature : BITMAP32 {
-    kNavigationKeyCodes = 0x1;
-    kLocationKeys = 0x2;
-    kNumberKeys = 0x4;
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
   }
 
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct SendKeyRequest {
-    CecKeyCode keyCode = 0;
-  }
-
-  response struct SendKeyResponse = 1 {
-    KeypadInputStatusEnum status = 0;
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
   }
 
-  command SendKey(SendKeyRequest): SendKeyResponse = 0;
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
-server cluster LevelControl = 8 {
-  enum MoveMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
+server cluster OperationalCredentials = 62 {
+  enum OperationalCertStatus : ENUM8 {
+    kSuccess = 0;
+    kInvalidPublicKey = 1;
+    kInvalidNodeOpId = 2;
+    kInvalidNOC = 3;
+    kMissingCsr = 4;
+    kTableFull = 5;
+    kInvalidAdminSubject = 6;
+    kInsufficientPrivilege = 8;
+    kFabricConflict = 9;
+    kLabelConflict = 10;
+    kInvalidFabricIndex = 11;
   }
 
-  enum StepMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
+  struct NOCStruct {
+    octet_string noc = 1;
+    nullable octet_string icac = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  bitmap LevelControlFeature : BITMAP32 {
-    kOnOff = 0x1;
-    kLighting = 0x2;
-    kFrequency = 0x4;
+  struct FabricDescriptor {
+    octet_string<65> rootPublicKey = 1;
+    vendor_id vendorId = 2;
+    fabric_id fabricId = 3;
+    node_id nodeId = 4;
+    char_string<32> label = 5;
+    fabric_idx fabricIndex = 254;
   }
 
-  readonly attribute int8u currentLevel = 0;
-  attribute bitmap8 options = 15;
-  attribute nullable int8u onLevel = 17;
+  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
+  readonly attribute FabricDescriptor fabrics[] = 1;
+  readonly attribute int8u supportedFabrics = 2;
+  readonly attribute int8u commissionedFabrics = 3;
+  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
+  readonly attribute fabric_idx currentFabricIndex = 5;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct MoveToLevelRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
+  request struct AttestationRequestRequest {
+    OCTET_STRING attestationNonce = 0;
   }
 
-  request struct MoveRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
+  request struct CertificateChainRequestRequest {
+    INT8U certificateType = 0;
   }
 
-  request struct StepRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionMask = 3;
-    BITMAP8 optionOverride = 4;
+  request struct CSRRequestRequest {
+    OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
-  request struct StopRequest {
-    BITMAP8 optionMask = 0;
-    BITMAP8 optionOverride = 1;
+  request struct AddNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+    OCTET_STRING IPKValue = 2;
+    Int64u caseAdminSubject = 3;
+    VENDOR_ID adminVendorId = 4;
   }
 
-  request struct MoveToLevelWithOnOffRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
+  request struct UpdateNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
   }
 
-  request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
+  request struct UpdateFabricLabelRequest {
+    CHAR_STRING label = 0;
   }
 
-  request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
   }
 
-  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
-  command Move(MoveRequest): DefaultSuccess = 1;
-  command Step(StepRequest): DefaultSuccess = 2;
-  command Stop(StopRequest): DefaultSuccess = 3;
-  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
-  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
-  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
-  command StopWithOnOff(): DefaultSuccess = 7;
-}
-
-server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster LowPower = 1288 {
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command Sleep(): DefaultSuccess = 0;
-}
+  request struct AddTrustedRootCertificateRequest {
+    OCTET_STRING rootCertificate = 0;
+  }
 
-server cluster MediaInput = 1287 {
-  enum InputTypeEnum : ENUM8 {
-    kInternal = 0;
-    kAux = 1;
-    kCoax = 2;
-    kComposite = 3;
-    kHdmi = 4;
-    kInput = 5;
-    kLine = 6;
-    kOptical = 7;
-    kVideo = 8;
-    kScart = 9;
-    kUsb = 10;
-    kOther = 11;
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
   }
 
-  bitmap MediaInputFeature : BITMAP32 {
-    kNameUpdates = 0x1;
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
   }
 
-  struct InputInfo {
-    int8u index = 0;
-    InputTypeEnum inputType = 1;
-    char_string<32> name = 2;
-    char_string<32> description = 3;
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
   }
 
-  readonly attribute InputInfo inputList[] = 0;
-  readonly attribute int8u currentInput = 1;
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
+  }
+
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
+}
+
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
+  }
+
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct SelectInputRequest {
-    INT8U index = 0;
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  command SelectInput(SelectInputRequest): DefaultSuccess = 0;
-  command ShowInputStatus(): DefaultSuccess = 1;
-  command HideInputStatus(): DefaultSuccess = 2;
-}
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
+  }
 
-server cluster MediaPlayback = 1286 {
-  enum MediaPlaybackStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kInvalidStateForCommand = 1;
-    kNotAllowed = 2;
-    kNotActive = 3;
-    kSpeedOutOfRange = 4;
-    kSeekOutOfRange = 5;
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  enum PlaybackStateEnum : ENUM8 {
-    kPlaying = 0;
-    kPaused = 1;
-    kNotPlaying = 2;
-    kBuffering = 3;
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  readonly attribute PlaybackStateEnum currentState = 0;
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
+
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  response struct PlaybackResponse = 10 {
-    MediaPlaybackStatusEnum status = 0;
-    optional CHAR_STRING data = 1;
+server cluster UserLabel = 65 {
+  attribute access(write: manage) LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster BooleanState = 69 {
+  info event StateChange = 0 {
+    boolean stateValue = 0;
   }
 
-  command Play(): PlaybackResponse = 0;
-  command Pause(): PlaybackResponse = 1;
-  command StopPlayback(): PlaybackResponse = 2;
+  readonly attribute boolean stateValue = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
 server cluster ModeSelect = 80 {
@@ -1711,511 +1599,497 @@ server cluster ModeSelect = 80 {
   command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0;
 }
 
-server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatus : ENUM8 {
-    kSuccess = 0;
-    kOutOfRange = 1;
-    kBoundsExceeded = 2;
-    kNetworkIDNotFound = 3;
-    kDuplicateNetworkID = 4;
-    kNetworkNotFound = 5;
-    kRegulatoryError = 6;
-    kAuthFailure = 7;
-    kUnsupportedSecurity = 8;
-    kOtherConnectionFailure = 9;
-    kIPV6Failed = 10;
-    kIPBindFailed = 11;
-    kUnknownError = 12;
+server cluster DoorLock = 257 {
+  enum DlAlarmCode : ENUM8 {
+    kLockJammed = 0;
+    kLockFactoryReset = 1;
+    kLockRadioPowerCycled = 3;
+    kWrongCodeEntryLimit = 4;
+    kFrontEsceutcheonRemoved = 5;
+    kDoorForcedOpen = 6;
+    kDoorAjar = 7;
+    kForcedUser = 8;
   }
 
-  enum WiFiBand : ENUM8 {
-    k2g4 = 0;
-    k3g65 = 1;
-    k5g = 2;
-    k6g = 3;
-    k60g = 4;
+  enum DlCredentialRule : ENUM8 {
+    kSingle = 0;
+    kDouble = 1;
+    kTri = 2;
   }
 
-  bitmap NetworkCommissioningFeature : BITMAP32 {
-    kWiFiNetworkInterface = 0x1;
-    kThreadNetworkInterface = 0x2;
-    kEthernetNetworkInterface = 0x4;
+  enum DlCredentialType : ENUM8 {
+    kProgrammingPIN = 0;
+    kPin = 1;
+    kRfid = 2;
+    kFingerprint = 3;
+    kFingerVein = 4;
+    kFace = 5;
   }
 
-  bitmap WiFiSecurity : BITMAP8 {
-    kUnencrypted = 0x1;
-    kWepPersonal = 0x2;
-    kWpaPersonal = 0x4;
-    kWpa2Personal = 0x8;
-    kWpa3Personal = 0x10;
+  enum DlDataOperationType : ENUM8 {
+    kAdd = 0;
+    kClear = 1;
+    kModify = 2;
   }
 
-  struct NetworkInfo {
-    octet_string<32> networkID = 0;
-    boolean connected = 1;
+  enum DlDoorState : ENUM8 {
+    kDoorOpen = 0;
+    kDoorClosed = 1;
+    kDoorJammed = 2;
+    kDoorForcedOpen = 3;
+    kDoorUnspecifiedError = 4;
+    kDoorAjar = 5;
   }
 
-  struct WiFiInterfaceScanResult {
-    WiFiSecurity security = 0;
-    octet_string<32> ssid = 1;
-    octet_string<6> bssid = 2;
-    int16u channel = 3;
-    WiFiBand wiFiBand = 4;
-    int8s rssi = 5;
+  enum DlLockDataType : ENUM8 {
+    kUnspecified = 0;
+    kProgrammingCode = 1;
+    kUserIndex = 2;
+    kWeekDaySchedule = 3;
+    kYearDaySchedule = 4;
+    kHolidaySchedule = 5;
+    kPin = 6;
+    kRfid = 7;
+    kFingerprint = 8;
   }
 
-  struct ThreadInterfaceScanResult {
-    int16u panId = 0;
-    int64u extendedPanId = 1;
-    char_string<16> networkName = 2;
-    int16u channel = 3;
-    int8u version = 4;
-    octet_string<8> extendedAddress = 5;
-    int8s rssi = 6;
-    int8u lqi = 7;
+  enum DlLockOperationType : ENUM8 {
+    kLock = 0;
+    kUnlock = 1;
+    kNonAccessUserEvent = 2;
+    kForcedUserEvent = 3;
   }
 
-  readonly attribute access(read: administer) int8u maxNetworks = 0;
-  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
-  readonly attribute int8u scanMaxTimeSeconds = 2;
-  readonly attribute int8u connectMaxTimeSeconds = 3;
-  attribute access(write: administer) boolean interfaceEnabled = 4;
-  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
-  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
-  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct ScanNetworksRequest {
-    optional nullable OCTET_STRING ssid = 0;
-    optional INT64U breadcrumb = 1;
+  enum DlLockState : ENUM8 {
+    kNotFullyLocked = 0;
+    kLocked = 1;
+    kUnlocked = 2;
   }
 
-  request struct AddOrUpdateWiFiNetworkRequest {
-    OCTET_STRING ssid = 0;
-    OCTET_STRING credentials = 1;
-    optional INT64U breadcrumb = 2;
+  enum DlLockType : ENUM8 {
+    kDeadBolt = 0;
+    kMagnetic = 1;
+    kOther = 2;
+    kMortise = 3;
+    kRim = 4;
+    kLatchBolt = 5;
+    kCylindricalLock = 6;
+    kTubularLock = 7;
+    kInterconnectedLock = 8;
+    kDeadLatch = 9;
+    kDoorFurniture = 10;
   }
 
-  request struct AddOrUpdateThreadNetworkRequest {
-    OCTET_STRING operationalDataset = 0;
-    optional INT64U breadcrumb = 1;
+  enum DlOperatingMode : ENUM8 {
+    kNormal = 0;
+    kVacation = 1;
+    kPrivacy = 2;
+    kNoRemoteLockUnlock = 3;
+    kPassage = 4;
   }
 
-  request struct RemoveNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
+  enum DlOperationError : ENUM8 {
+    kUnspecified = 0;
+    kInvalidCredential = 1;
+    kDisabledUserDenied = 2;
+    kRestricted = 3;
+    kInsufficientBattery = 4;
   }
 
-  request struct ConnectNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
+  enum DlOperationSource : ENUM8 {
+    kUnspecified = 0;
+    kManual = 1;
+    kProprietaryRemote = 2;
+    kKeypad = 3;
+    kAuto = 4;
+    kButton = 5;
+    kSchedule = 6;
+    kRemote = 7;
+    kRfid = 8;
+    kBiometric = 9;
   }
 
-  request struct ReorderNetworkRequest {
-    OCTET_STRING networkID = 0;
-    INT8U networkIndex = 1;
-    optional INT64U breadcrumb = 2;
+  enum DlStatus : ENUM8 {
+    kSuccess = 0;
+    kFailure = 1;
+    kDuplicate = 2;
+    kOccupied = 3;
+    kInvalidField = 133;
+    kResourceExhausted = 137;
+    kNotFound = 139;
   }
 
-  response struct ScanNetworksResponse = 1 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
-    optional ThreadInterfaceScanResult threadScanResults[] = 3;
+  enum DlUserStatus : ENUM8 {
+    kAvailable = 0;
+    kOccupiedEnabled = 1;
+    kOccupiedDisabled = 3;
   }
 
-  response struct NetworkConfigResponse = 5 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional INT8U networkIndex = 2;
+  enum DlUserType : ENUM8 {
+    kUnrestrictedUser = 0;
+    kYearDayScheduleUser = 1;
+    kWeekDayScheduleUser = 2;
+    kProgrammingUser = 3;
+    kNonAccessUser = 4;
+    kForcedUser = 5;
+    kDisposableUser = 6;
+    kExpiringUser = 7;
+    kScheduleRestrictedUser = 8;
+    kRemoteOnlyUser = 9;
   }
 
-  response struct ConnectNetworkResponse = 7 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    nullable INT32S errorValue = 2;
+  enum DoorLockOperationEventCode : ENUM8 {
+    kUnknownOrMfgSpecific = 0;
+    kLock = 1;
+    kUnlock = 2;
+    kLockInvalidPinOrId = 3;
+    kLockInvalidSchedule = 4;
+    kUnlockInvalidPinOrId = 5;
+    kUnlockInvalidSchedule = 6;
+    kOneTouchLock = 7;
+    kKeyLock = 8;
+    kKeyUnlock = 9;
+    kAutoLock = 10;
+    kScheduleLock = 11;
+    kScheduleUnlock = 12;
+    kManualLock = 13;
+    kManualUnlock = 14;
   }
 
-  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
-  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
-  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
-  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
-  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
-  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
-}
-
-client cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
+  enum DoorLockProgrammingEventCode : ENUM8 {
+    kUnknownOrMfgSpecific = 0;
+    kMasterCodeChanged = 1;
+    kPinAdded = 2;
+    kPinDeleted = 3;
+    kPinChanged = 4;
+    kIdAdded = 5;
+    kIdDeleted = 6;
   }
 
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
+  enum DoorLockSetPinOrIdStatus : ENUM8 {
+    kSuccess = 0;
+    kGeneralFailure = 1;
+    kMemoryFull = 2;
+    kDuplicateCodeError = 3;
   }
 
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
+  enum DoorLockUserStatus : ENUM8 {
+    kAvailable = 0;
+    kOccupiedEnabled = 1;
+    kOccupiedDisabled = 3;
+    kNotSupported = 255;
   }
 
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
+  enum DoorLockUserType : ENUM8 {
+    kUnrestricted = 0;
+    kYearDayScheduleUser = 1;
+    kWeekDayScheduleUser = 2;
+    kMasterUser = 3;
+    kNonAccessUser = 4;
+    kNotSupported = 255;
   }
 
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
+  bitmap DlCredentialRuleMask : BITMAP8 {
+    kSingle = 0x1;
+    kDual = 0x2;
+    kTri = 0x4;
   }
 
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
+  bitmap DlCredentialRulesSupport : BITMAP8 {
+    kSingle = 0x1;
+    kDual = 0x2;
+    kTri = 0x4;
   }
 
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
+  bitmap DlDaysMaskMap : BITMAP8 {
+    kSunday = 0x1;
+    kMonday = 0x2;
+    kTuesday = 0x4;
+    kWednesday = 0x8;
+    kThursday = 0x10;
+    kFriday = 0x20;
+    kSaturday = 0x40;
   }
 
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
-}
-
-server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum OTAAnnouncementReason : ENUM8 {
-    kSimpleAnnouncement = 0;
-    kUpdateAvailable = 1;
-    kUrgentUpdateAvailable = 2;
+  bitmap DlDefaultConfigurationRegister : BITMAP16 {
+    kEnableLocalProgrammingEnabled = 0x1;
+    kKeypadInterfaceDefaultAccessEnabled = 0x2;
+    kRemoteInterfaceDefaultAccessIsEnabled = 0x4;
+    kSoundEnabled = 0x20;
+    kAutoRelockTimeSet = 0x40;
+    kLEDSettingsSet = 0x80;
   }
 
-  enum OTAChangeReasonEnum : ENUM8 {
-    kUnknown = 0;
-    kSuccess = 1;
-    kFailure = 2;
-    kTimeOut = 3;
-    kDelayByProvider = 4;
+  bitmap DlKeypadOperationEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kLock = 0x2;
+    kUnlock = 0x4;
+    kLockInvalidPIN = 0x8;
+    kLockInvalidSchedule = 0x10;
+    kUnlockInvalidCode = 0x20;
+    kUnlockInvalidSchedule = 0x40;
+    kNonAccessUserOpEvent = 0x80;
   }
 
-  enum OTAUpdateStateEnum : ENUM8 {
-    kUnknown = 0;
-    kIdle = 1;
-    kQuerying = 2;
-    kDelayedOnQuery = 3;
-    kDownloading = 4;
-    kApplying = 5;
-    kDelayedOnApply = 6;
-    kRollingBack = 7;
-    kDelayedOnUserConsent = 8;
+  bitmap DlKeypadProgrammingEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kProgrammingPINChanged = 0x2;
+    kPINAdded = 0x4;
+    kPINCleared = 0x8;
+    kPINChanged = 0x10;
   }
 
-  struct ProviderLocation {
-    node_id providerNodeID = 1;
-    endpoint_no endpoint = 2;
-    fabric_idx fabricIndex = 254;
+  bitmap DlLocalProgrammingFeatures : BITMAP8 {
+    kAddUsersCredentialsSchedulesLocally = 0x1;
+    kModifyUsersCredentialsSchedulesLocally = 0x2;
+    kClearUsersCredentialsSchedulesLocally = 0x4;
+    kAdjustLockSettingsLocally = 0x8;
   }
 
-  info event StateTransition = 0 {
-    OTAUpdateStateEnum previousState = 0;
-    OTAUpdateStateEnum newState = 1;
-    OTAChangeReasonEnum reason = 2;
-    nullable INT32U targetSoftwareVersion = 3;
+  bitmap DlManualOperationEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kThumbturnLock = 0x2;
+    kThumbturnUnlock = 0x4;
+    kOneTouchLock = 0x8;
+    kKeyLock = 0x10;
+    kKeyUnlock = 0x20;
+    kAutoLock = 0x40;
+    kScheduleLock = 0x80;
+    kScheduleUnlock = 0x100;
+    kManualLock = 0x200;
+    kManualUnlock = 0x400;
   }
 
-  critical event VersionApplied = 1 {
-    INT32U softwareVersion = 0;
-    INT16U productID = 1;
+  bitmap DlRFIDOperationEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kLock = 0x2;
+    kUnlock = 0x4;
+    kLockInvalidRFID = 0x8;
+    kLockInvalidSchedule = 0x10;
+    kUnlockInvalidRFID = 0x20;
+    kUnlockInvalidSchedule = 0x40;
   }
 
-  info event DownloadError = 2 {
-    INT32U softwareVersion = 0;
-    INT64U bytesDownloaded = 1;
-    nullable INT8U progressPercent = 2;
-    nullable INT64S platformCode = 3;
+  bitmap DlRFIDProgrammingEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kRFIDCodeAdded = 0x20;
+    kRFIDCodeCleared = 0x40;
   }
 
-  attribute ProviderLocation defaultOtaProviders[] = 0;
-  readonly attribute boolean updatePossible = 1;
-  readonly attribute OTAUpdateStateEnum updateState = 2;
-  readonly attribute nullable int8u updateStateProgress = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AnnounceOtaProviderRequest {
-    node_id providerNodeId = 0;
-    vendor_id vendorId = 1;
-    OTAAnnouncementReason announcementReason = 2;
-    optional OCTET_STRING metadataForNode = 3;
-    endpoint_no endpoint = 4;
+  bitmap DlRemoteOperationEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kLock = 0x2;
+    kUnlock = 0x4;
+    kLockInvalidCode = 0x8;
+    kLockInvalidSchedule = 0x10;
+    kUnlockInvalidCode = 0x20;
+    kUnlockInvalidSchedule = 0x40;
   }
 
-  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
-}
-
-server cluster OccupancySensing = 1030 {
-  readonly attribute bitmap8 occupancy = 0;
-  readonly attribute enum8 occupancySensorType = 1;
-  readonly attribute bitmap8 occupancySensorTypeBitmap = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster OnOff = 6 {
-  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
-    kFadeToOffIn0p8Seconds = 0;
-    kNoFade = 1;
-    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
+  bitmap DlRemoteProgrammingEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kProgrammingPINChanged = 0x2;
+    kPINAdded = 0x4;
+    kPINCleared = 0x8;
+    kPINChanged = 0x10;
+    kRFIDCodeAdded = 0x20;
+    kRFIDCodeCleared = 0x40;
   }
 
-  enum OnOffDyingLightEffectVariant : ENUM8 {
-    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
+  bitmap DlSupportedOperatingModes : BITMAP16 {
+    kNormal = 0x1;
+    kVacation = 0x2;
+    kPrivacy = 0x4;
+    kNoRemoteLockUnlock = 0x8;
+    kPassage = 0x10;
   }
 
-  enum OnOffEffectIdentifier : ENUM8 {
-    kDelayedAllOff = 0;
-    kDyingLight = 1;
+  bitmap DoorLockDayOfWeek : BITMAP8 {
+    kSunday = 0x1;
+    kMonday = 0x2;
+    kTuesday = 0x4;
+    kWednesday = 0x8;
+    kThursday = 0x10;
+    kFriday = 0x20;
+    kSaturday = 0x40;
   }
 
-  enum OnOffStartUpOnOff : ENUM8 {
-    kOff = 0;
-    kOn = 1;
-    kTogglePreviousOnOff = 2;
+  bitmap DoorLockFeature : BITMAP32 {
+    kPINCredentials = 0x1;
+    kRFIDCredentials = 0x2;
+    kFingerCredentials = 0x4;
+    kLogging = 0x8;
+    kAccessSchedules = 0x10;
+    kDoorPositionSensor = 0x20;
+    kFaceCredentials = 0x40;
+    kCredentialsOTA = 0x80;
+    kUsersManagement = 0x100;
+    kNotifications = 0x200;
   }
 
-  bitmap OnOffControl : BITMAP8 {
-    kAcceptOnlyWhenOn = 0x1;
+  struct DlCredential {
+    DlCredentialType credentialType = 0;
+    int16u credentialIndex = 1;
   }
 
-  bitmap OnOffFeature : BITMAP32 {
-    kLighting = 0x1;
+  critical event DoorLockAlarm = 0 {
+    DlAlarmCode alarmCode = 0;
   }
 
-  bitmap SceneFeatures : BITMAP32 {
-    kSceneNames = 0x1;
+  critical event DoorStateChange = 1 {
+    DlDoorState doorState = 0;
   }
 
-  readonly attribute boolean onOff = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command Off(): DefaultSuccess = 0;
-  command On(): DefaultSuccess = 1;
-  command Toggle(): DefaultSuccess = 2;
-}
-
-server cluster OperationalCredentials = 62 {
-  enum OperationalCertStatus : ENUM8 {
-    kSuccess = 0;
-    kInvalidPublicKey = 1;
-    kInvalidNodeOpId = 2;
-    kInvalidNOC = 3;
-    kMissingCsr = 4;
-    kTableFull = 5;
-    kInvalidAdminSubject = 6;
-    kInsufficientPrivilege = 8;
-    kFabricConflict = 9;
-    kLabelConflict = 10;
-    kInvalidFabricIndex = 11;
+  critical event LockOperation = 2 {
+    DlLockOperationType lockOperationType = 0;
+    DlOperationSource operationSource = 1;
+    nullable INT16U userIndex = 2;
+    nullable fabric_idx fabricIndex = 3;
+    nullable NODE_ID sourceNode = 4;
+    optional nullable DlCredential credentials[] = 5;
   }
 
-  struct NOCStruct {
-    octet_string noc = 1;
-    nullable octet_string icac = 2;
-    fabric_idx fabricIndex = 254;
+  critical event LockOperationError = 3 {
+    DlLockOperationType lockOperationType = 0;
+    DlOperationSource operationSource = 1;
+    DlOperationError operationError = 2;
+    nullable INT16U userIndex = 3;
+    nullable fabric_idx fabricIndex = 4;
+    nullable NODE_ID sourceNode = 5;
+    optional nullable DlCredential credentials[] = 6;
   }
 
-  struct FabricDescriptor {
-    octet_string<65> rootPublicKey = 1;
-    vendor_id vendorId = 2;
-    fabric_id fabricId = 3;
-    node_id nodeId = 4;
-    char_string<32> label = 5;
-    fabric_idx fabricIndex = 254;
+  info event LockUserChange = 4 {
+    DlLockDataType lockDataType = 0;
+    DlDataOperationType dataOperationType = 1;
+    DlOperationSource operationSource = 2;
+    nullable INT16U userIndex = 3;
+    nullable fabric_idx fabricIndex = 4;
+    nullable NODE_ID sourceNode = 5;
+    nullable INT16U dataIndex = 6;
   }
 
-  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
-  readonly attribute FabricDescriptor fabrics[] = 1;
-  readonly attribute int8u supportedFabrics = 2;
-  readonly attribute int8u commissionedFabrics = 3;
-  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
-  readonly attribute fabric_idx currentFabricIndex = 5;
+  readonly attribute nullable DlLockState lockState = 0;
+  readonly attribute DlLockType lockType = 1;
+  readonly attribute boolean actuatorEnabled = 2;
+  attribute access(write: manage) int32u autoRelockTime = 35;
+  attribute access(write: manage) DlOperatingMode operatingMode = 37;
+  readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AttestationRequestRequest {
-    OCTET_STRING attestationNonce = 0;
+  request struct LockDoorRequest {
+    optional OCTET_STRING pinCode = 0;
   }
 
-  request struct CertificateChainRequestRequest {
-    INT8U certificateType = 0;
+  request struct UnlockDoorRequest {
+    optional OCTET_STRING pinCode = 0;
   }
 
-  request struct CSRRequestRequest {
-    OCTET_STRING CSRNonce = 0;
-    optional boolean isForUpdateNOC = 1;
+  timed command LockDoor(LockDoorRequest): DefaultSuccess = 0;
+  timed command UnlockDoor(UnlockDoorRequest): DefaultSuccess = 1;
+}
+
+server cluster WindowCovering = 258 {
+  enum EndProductType : ENUM8 {
+    kRollerShade = 0;
+    kRomanShade = 1;
+    kBalloonShade = 2;
+    kWovenWood = 3;
+    kPleatedShade = 4;
+    kCellularShade = 5;
+    kLayeredShade = 6;
+    kLayeredShade2D = 7;
+    kSheerShade = 8;
+    kTiltOnlyInteriorBlind = 9;
+    kInteriorBlind = 10;
+    kVerticalBlindStripCurtain = 11;
+    kInteriorVenetianBlind = 12;
+    kExteriorVenetianBlind = 13;
+    kLateralLeftCurtain = 14;
+    kLateralRightCurtain = 15;
+    kCentralCurtain = 16;
+    kRollerShutter = 17;
+    kExteriorVerticalScreen = 18;
+    kAwningTerracePatio = 19;
+    kAwningVerticalScreen = 20;
+    kTiltOnlyPergola = 21;
+    kSwingingShutter = 22;
+    kSlidingShutter = 23;
+    kUnknown = 255;
   }
 
-  request struct AddNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
-    OCTET_STRING IPKValue = 2;
-    Int64u caseAdminSubject = 3;
-    VENDOR_ID adminVendorId = 4;
+  enum Type : ENUM8 {
+    kRollerShade = 0;
+    kRollerShade2Motor = 1;
+    kRollerShadeExterior = 2;
+    kRollerShadeExterior2Motor = 3;
+    kDrapery = 4;
+    kAwning = 5;
+    kShutter = 6;
+    kTiltBlindTiltOnly = 7;
+    kTiltBlindLiftAndTilt = 8;
+    kProjectorScreen = 9;
+    kUnknown = 255;
   }
 
-  request struct UpdateNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
+  bitmap ConfigStatus : BITMAP8 {
+    kOperational = 0x1;
+    kOnlineReserved = 0x2;
+    kLiftMovementReversed = 0x4;
+    kLiftPositionAware = 0x8;
+    kTiltPositionAware = 0x10;
+    kLiftEncoderControlled = 0x20;
+    kTiltEncoderControlled = 0x40;
   }
 
-  request struct UpdateFabricLabelRequest {
-    CHAR_STRING label = 0;
+  bitmap Feature : BITMAP32 {
+    kLift = 0x1;
+    kTilt = 0x2;
+    kPositionAwareLift = 0x4;
+    kAbsolutePosition = 0x8;
+    kPositionAwareTilt = 0x10;
   }
 
-  request struct RemoveFabricRequest {
-    fabric_idx fabricIndex = 0;
+  bitmap Mode : BITMAP8 {
+    kMotorDirectionReversed = 0x1;
+    kCalibrationMode = 0x2;
+    kMaintenanceMode = 0x4;
+    kLedFeedback = 0x8;
   }
 
-  request struct AddTrustedRootCertificateRequest {
-    OCTET_STRING rootCertificate = 0;
-  }
-
-  response struct AttestationResponse = 1 {
-    OCTET_STRING attestationElements = 0;
-    OCTET_STRING signature = 1;
-  }
-
-  response struct CertificateChainResponse = 3 {
-    OCTET_STRING certificate = 0;
-  }
-
-  response struct CSRResponse = 5 {
-    OCTET_STRING NOCSRElements = 0;
-    OCTET_STRING attestationSignature = 1;
-  }
-
-  response struct NOCResponse = 8 {
-    OperationalCertStatus statusCode = 0;
-    optional fabric_idx fabricIndex = 1;
-    optional CHAR_STRING debugText = 2;
-  }
-
-  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
-  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
-  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
-  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
-  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
-  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
-  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
-  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-}
-
-server cluster PowerSource = 47 {
-  enum BatChargeFaultType : ENUM8 {
-    kUnspecfied = 0;
-    kAmbientTooHot = 1;
-    kAmbientTooCold = 2;
-    kBatteryTooHot = 3;
-    kBatteryTooCold = 4;
-    kBatteryAbsent = 5;
-    kBatteryOverVoltage = 6;
-    kBatteryUnderVoltage = 7;
-    kChargerOverVoltage = 8;
-    kChargerUnderVoltage = 9;
-    kSafetyTimeout = 10;
-  }
-
-  enum BatChargeLevel : ENUM8 {
-    kOk = 0;
-    kWarning = 1;
-    kCritical = 2;
-  }
-
-  enum BatChargeState : ENUM8 {
-    kUnknown = 0;
-    kIsCharging = 1;
-    kIsAtFullCharge = 2;
-    kIsNotCharging = 3;
-  }
-
-  enum BatFaultType : ENUM8 {
-    kUnspecfied = 0;
-    kOverTemp = 1;
-    kUnderTemp = 2;
-  }
-
-  enum BatReplaceability : ENUM8 {
-    kUnspecified = 0;
-    kNotReplaceable = 1;
-    kUserReplaceable = 2;
-    kFactoryReplaceable = 3;
-  }
-
-  enum PowerSourceStatus : ENUM8 {
-    kUnspecfied = 0;
-    kActive = 1;
-    kStandby = 2;
-    kUnavailable = 3;
-  }
-
-  enum WiredCurrentType : ENUM8 {
-    kAc = 0;
-    kDc = 1;
-  }
-
-  enum WiredFaultType : ENUM8 {
-    kUnspecfied = 0;
-    kOverVoltage = 1;
-    kUnderVoltage = 2;
+  bitmap OperationalStatus : BITMAP8 {
+    kGlobal = 0x3;
+    kLift = 0xC;
+    kTilt = 0x30;
   }
 
-  bitmap PowerSourceFeature : BITMAP32 {
-    kWired = 0x1;
-    kBattery = 0x2;
-    kRechargeable = 0x4;
-    kReplaceable = 0x8;
+  bitmap SafetyStatus : BITMAP16 {
+    kRemoteLockout = 0x1;
+    kTamperDetection = 0x2;
+    kFailedCommunication = 0x4;
+    kPositionFailure = 0x8;
+    kThermalProtection = 0x10;
+    kObstacleDetected = 0x20;
+    kPower = 0x40;
+    kStopInput = 0x80;
+    kMotorJammed = 0x100;
+    kHardwareFailure = 0x200;
+    kManualOperation = 0x400;
+    kProtection = 0x800;
   }
 
-  readonly attribute enum8 status = 0;
-  readonly attribute int8u order = 1;
-  readonly attribute char_string<60> description = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster PowerSourceConfiguration = 46 {
-  readonly attribute INT8U sources[] = 0;
+  readonly attribute Type type = 0;
+  readonly attribute ConfigStatus configStatus = 7;
+  readonly attribute OperationalStatus operationalStatus = 10;
+  readonly attribute EndProductType endProductType = 13;
+  attribute access(write: manage) Mode mode = 23;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster PressureMeasurement = 1027 {
-  bitmap PressureFeature : BITMAP32 {
-    kExt = 0x1;
-  }
 
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command UpOrOpen(): DefaultSuccess = 0;
+  command DownOrClose(): DefaultSuccess = 1;
+  command StopMotion(): DefaultSuccess = 2;
 }
 
 server cluster PumpConfigurationAndControl = 512 {
@@ -2309,170 +2183,313 @@ server cluster PumpConfigurationAndControl = 512 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster RelativeHumidityMeasurement = 1029 {
-  readonly attribute nullable int16u measuredValue = 0;
-  readonly attribute nullable int16u minMeasuredValue = 1;
-  readonly attribute nullable int16u maxMeasuredValue = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster Scenes = 5 {
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
+server cluster Thermostat = 513 {
+  enum SetpointAdjustMode : ENUM8 {
+    kHeatSetpoint = 0;
+    kCoolSetpoint = 1;
+    kHeatAndCoolSetpoints = 2;
   }
 
-  struct ExtensionFieldSet {
-    cluster_id clusterId = 0;
-    AttributeValuePair attributeValueList[] = 1;
+  enum ThermostatControlSequence : ENUM8 {
+    kCoolingOnly = 0;
+    kCoolingWithReheat = 1;
+    kHeatingOnly = 2;
+    kHeatingWithReheat = 3;
+    kCoolingAndHeating = 4;
+    kCoolingAndHeatingWithReheat = 5;
   }
 
-  struct AttributeValuePair {
-    optional attrib_id attributeId = 0;
-    int8u attributeValue[] = 1;
+  enum ThermostatRunningMode : ENUM8 {
+    kOff = 0;
+    kCool = 3;
+    kHeat = 4;
   }
 
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AddSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    INT16U transitionTime = 2;
-    CHAR_STRING sceneName = 3;
-    ExtensionFieldSet extensionFieldSets[] = 4;
+  enum ThermostatSystemMode : ENUM8 {
+    kOff = 0;
+    kAuto = 1;
+    kCool = 3;
+    kHeat = 4;
+    kEmergencyHeating = 5;
+    kPrecooling = 6;
+    kFanOnly = 7;
   }
 
-  request struct ViewSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
+  bitmap DayOfWeek : BITMAP8 {
+    kSunday = 0x1;
+    kMonday = 0x2;
+    kTuesday = 0x4;
+    kWednesday = 0x8;
+    kThursday = 0x10;
+    kFriday = 0x20;
+    kSaturday = 0x40;
+    kAwayOrVacation = 0x80;
   }
 
-  request struct RemoveSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
+  bitmap ModeForSequence : BITMAP8 {
+    kHeatSetpointFieldPresent = 0x1;
+    kCoolSetpointFieldPresent = 0x2;
   }
 
-  request struct RemoveAllScenesRequest {
-    group_id groupId = 0;
+  bitmap ThermostatFeature : BITMAP32 {
+    kHeating = 0x1;
+    kCooling = 0x2;
+    kOccupancy = 0x4;
+    kSchedule = 0x8;
+    kSetback = 0x10;
+    kAutomode = 0x20;
   }
 
-  request struct StoreSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
+  struct ThermostatScheduleTransition {
+    int16u transitionTime = 0;
+    nullable int16s heatSetpoint = 1;
+    nullable int16s coolSetpoint = 2;
   }
 
-  request struct RecallSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    optional nullable INT16U transitionTime = 2;
-  }
+  readonly attribute nullable int16s localTemperature = 0;
+  attribute int16s occupiedHeatingSetpoint = 18;
+  attribute access(write: manage) ThermostatControlSequence controlSequenceOfOperation = 27;
+  attribute access(write: manage) enum8 systemMode = 28;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  request struct GetSceneMembershipRequest {
-    group_id groupId = 0;
+  request struct SetpointRaiseLowerRequest {
+    SetpointAdjustMode mode = 0;
+    INT8S amount = 1;
   }
 
-  response struct AddSceneResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
+  command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0;
+}
 
-  response struct ViewSceneResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-    optional INT16U transitionTime = 3;
-    optional CHAR_STRING sceneName = 4;
-    optional ExtensionFieldSet extensionFieldSets[] = 5;
+server cluster FanControl = 514 {
+  enum FanModeSequenceType : ENUM8 {
+    kOffLowMedHigh = 0;
+    kOffLowHigh = 1;
+    kOffLowMedHighAuto = 2;
+    kOffLowHighAuto = 3;
+    kOffOnAuto = 4;
+    kOffOn = 5;
   }
 
-  response struct RemoveSceneResponse = 2 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
+  enum FanModeType : ENUM8 {
+    kOff = 0;
+    kLow = 1;
+    kMedium = 2;
+    kHigh = 3;
+    kOn = 4;
+    kAuto = 5;
+    kSmart = 6;
   }
 
-  response struct RemoveAllScenesResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  bitmap FanControlFeature : BITMAP32 {
+    kMultiSpeed = 0x1;
+    kAuto = 0x2;
+    kRocking = 0x4;
+    kWind = 0x8;
   }
 
-  response struct StoreSceneResponse = 4 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
+  bitmap RockSupportMask : BITMAP8 {
+    kRockLeftRight = 0x1;
+    kRockUpDown = 0x2;
+    kRockRound = 0x4;
   }
 
-  response struct GetSceneMembershipResponse = 6 {
-    ENUM8 status = 0;
-    nullable INT8U capacity = 1;
-    group_id groupId = 2;
-    optional INT8U sceneList[] = 3;
+  bitmap WindSettingMask : BITMAP8 {
+    kSleepWind = 0x1;
+    kNaturalWind = 0x2;
   }
 
-  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
-  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
-  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
-  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
-  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
-  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
-  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
+  bitmap WindSupportMask : BITMAP8 {
+    kSleepWind = 0x1;
+    kNaturalWind = 0x2;
+  }
+
+  attribute FanModeType fanMode = 0;
+  attribute FanModeSequenceType fanModeSequence = 1;
+  attribute nullable int8u percentSetting = 2;
+  readonly attribute int8u percentCurrent = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster SoftwareDiagnostics = 52 {
-  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
-    kWaterMarks = 0x1;
+server cluster ThermostatUserInterfaceConfiguration = 516 {
+  attribute enum8 temperatureDisplayMode = 0;
+  attribute access(write: manage) enum8 keypadLockout = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster ColorControl = 768 {
+  enum ColorLoopAction : ENUM8 {
+    kDeactivate = 0;
+    kActivateFromColorLoopStartEnhancedHue = 1;
+    kActivateFromEnhancedCurrentHue = 2;
   }
 
-  info event SoftwareFault = 0 {
-    SoftwareFaultStruct softwareFault = 0;
+  enum ColorLoopDirection : ENUM8 {
+    kDecrementHue = 0;
+    kIncrementHue = 1;
+  }
+
+  enum ColorMode : ENUM8 {
+    kCurrentHueAndCurrentSaturation = 0;
+    kCurrentXAndCurrentY = 1;
+    kColorTemperature = 2;
+  }
+
+  enum HueDirection : ENUM8 {
+    kShortestDistance = 0;
+    kLongestDistance = 1;
+    kUp = 2;
+    kDown = 3;
+  }
+
+  enum HueMoveMode : ENUM8 {
+    kStop = 0;
+    kUp = 1;
+    kDown = 3;
+  }
+
+  enum HueStepMode : ENUM8 {
+    kUp = 1;
+    kDown = 3;
+  }
+
+  enum SaturationMoveMode : ENUM8 {
+    kStop = 0;
+    kUp = 1;
+    kDown = 3;
+  }
+
+  enum SaturationStepMode : ENUM8 {
+    kUp = 1;
+    kDown = 3;
+  }
+
+  bitmap ColorCapabilities : BITMAP16 {
+    kHueSaturationSupported = 0x1;
+    kEnhancedHueSupported = 0x2;
+    kColorLoopSupported = 0x4;
+    kXYAttributesSupported = 0x8;
+    kColorTemperatureSupported = 0x10;
   }
 
+  bitmap ColorControlFeature : BITMAP32 {
+    kHueAndSaturation = 0x1;
+    kEnhancedHue = 0x2;
+    kColorLoop = 0x4;
+    kXy = 0x8;
+    kColorTemperature = 0x10;
+  }
+
+  bitmap ColorLoopUpdateFlags : BITMAP8 {
+    kUpdateAction = 0x1;
+    kUpdateDirection = 0x2;
+    kUpdateTime = 0x4;
+    kUpdateStartHue = 0x8;
+  }
+
+  readonly attribute enum8 colorMode = 8;
+  attribute bitmap8 options = 15;
+  readonly attribute nullable int8u numberOfPrimaries = 16;
+  readonly attribute enum8 enhancedColorMode = 16385;
+  readonly attribute bitmap16 colorCapabilities = 16394;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster Switch = 59 {
-  info event SwitchLatched = 0 {
-    INT8U newPosition = 0;
+server cluster IlluminanceMeasurement = 1024 {
+  enum LightSensorType : ENUM8 {
+    kPhotodiode = 0;
+    kCmos = 1;
   }
 
-  info event InitialPress = 1 {
-    INT8U newPosition = 0;
-  }
+  readonly attribute nullable int16u measuredValue = 0;
+  readonly attribute nullable int16u minMeasuredValue = 1;
+  readonly attribute nullable int16u maxMeasuredValue = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  info event LongPress = 2 {
-    INT8U newPosition = 0;
-  }
+server cluster TemperatureMeasurement = 1026 {
+  readonly attribute nullable int16s measuredValue = 0;
+  readonly attribute nullable int16s minMeasuredValue = 1;
+  readonly attribute nullable int16s maxMeasuredValue = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  info event ShortRelease = 3 {
-    INT8U previousPosition = 0;
+server cluster PressureMeasurement = 1027 {
+  bitmap PressureFeature : BITMAP32 {
+    kExt = 0x1;
   }
 
-  info event LongRelease = 4 {
-    INT8U previousPosition = 0;
+  readonly attribute nullable int16s measuredValue = 0;
+  readonly attribute nullable int16s minMeasuredValue = 1;
+  readonly attribute nullable int16s maxMeasuredValue = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster FlowMeasurement = 1028 {
+  readonly attribute nullable int16u measuredValue = 0;
+  readonly attribute nullable int16u minMeasuredValue = 1;
+  readonly attribute nullable int16u maxMeasuredValue = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster RelativeHumidityMeasurement = 1029 {
+  readonly attribute nullable int16u measuredValue = 0;
+  readonly attribute nullable int16u minMeasuredValue = 1;
+  readonly attribute nullable int16u maxMeasuredValue = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster OccupancySensing = 1030 {
+  readonly attribute bitmap8 occupancy = 0;
+  readonly attribute enum8 occupancySensorType = 1;
+  readonly attribute bitmap8 occupancySensorTypeBitmap = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster WakeOnLan = 1283 {
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Channel = 1284 {
+  enum ChannelStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kMultipleMatches = 1;
+    kNoMatches = 2;
   }
 
-  info event MultiPressOngoing = 5 {
-    INT8U newPosition = 0;
-    INT8U currentNumberOfPressesCounted = 1;
+  enum LineupInfoTypeEnum : ENUM8 {
+    kMso = 0;
   }
 
-  info event MultiPressComplete = 6 {
-    INT8U newPosition = 0;
-    INT8U totalNumberOfPressesCounted = 1;
+  bitmap ChannelFeature : BITMAP32 {
+    kChannelList = 0x1;
+    kLineupInfo = 0x2;
   }
 
-  readonly attribute int8u numberOfPositions = 0;
-  readonly attribute int8u currentPosition = 1;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct ChangeChannelByNumberRequest {
+    INT16U majorNumber = 0;
+    INT16U minorNumber = 1;
+  }
+
+  request struct SkipChannelRequest {
+    INT16U count = 0;
+  }
+
+  command ChangeChannelByNumber(ChangeChannelByNumberRequest): DefaultSuccess = 2;
+  command SkipChannel(SkipChannelRequest): DefaultSuccess = 3;
 }
 
 server cluster TargetNavigator = 1285 {
@@ -2504,724 +2521,707 @@ server cluster TargetNavigator = 1285 {
   command NavigateTarget(NavigateTargetRequest): NavigateTargetResponse = 0;
 }
 
-server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster TestCluster = 4294048773 {
-  enum SimpleEnum : ENUM8 {
-    kUnspecified = 0;
-    kValueA = 1;
-    kValueB = 2;
-    kValueC = 3;
+server cluster MediaPlayback = 1286 {
+  enum MediaPlaybackStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kInvalidStateForCommand = 1;
+    kNotAllowed = 2;
+    kNotActive = 3;
+    kSpeedOutOfRange = 4;
+    kSeekOutOfRange = 5;
   }
 
-  bitmap Bitmap16MaskMap : BITMAP16 {
-    kMaskVal1 = 0x1;
-    kMaskVal2 = 0x2;
-    kMaskVal3 = 0x4;
-    kMaskVal4 = 0x4000;
+  enum PlaybackStateEnum : ENUM8 {
+    kPlaying = 0;
+    kPaused = 1;
+    kNotPlaying = 2;
+    kBuffering = 3;
   }
 
-  bitmap Bitmap32MaskMap : BITMAP32 {
-    kMaskVal1 = 0x1;
-    kMaskVal2 = 0x2;
-    kMaskVal3 = 0x4;
-    kMaskVal4 = 0x40000000;
-  }
+  readonly attribute PlaybackStateEnum currentState = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  bitmap Bitmap64MaskMap : BITMAP64 {
-    kMaskVal1 = 0x1;
-    kMaskVal2 = 0x2;
-    kMaskVal3 = 0x4;
-    kMaskVal4 = 0x4000000000000000;
+  response struct PlaybackResponse = 10 {
+    MediaPlaybackStatusEnum status = 0;
+    optional CHAR_STRING data = 1;
   }
 
-  bitmap Bitmap8MaskMap : BITMAP8 {
-    kMaskVal1 = 0x1;
-    kMaskVal2 = 0x2;
-    kMaskVal3 = 0x4;
-    kMaskVal4 = 0x40;
-  }
+  command Play(): PlaybackResponse = 0;
+  command Pause(): PlaybackResponse = 1;
+  command StopPlayback(): PlaybackResponse = 2;
+}
 
-  bitmap SimpleBitmap : BITMAP8 {
-    kValueA = 0x1;
-    kValueB = 0x2;
-    kValueC = 0x4;
+server cluster MediaInput = 1287 {
+  enum InputTypeEnum : ENUM8 {
+    kInternal = 0;
+    kAux = 1;
+    kCoax = 2;
+    kComposite = 3;
+    kHdmi = 4;
+    kInput = 5;
+    kLine = 6;
+    kOptical = 7;
+    kVideo = 8;
+    kScart = 9;
+    kUsb = 10;
+    kOther = 11;
   }
 
-  struct TestListStructOctet {
-    int64u member1 = 0;
-    octet_string<32> member2 = 1;
+  bitmap MediaInputFeature : BITMAP32 {
+    kNameUpdates = 0x1;
   }
 
-  struct NullablesAndOptionalsStruct {
-    nullable int16u nullableInt = 0;
-    optional int16u optionalInt = 1;
-    optional nullable int16u nullableOptionalInt = 2;
-    nullable char_string nullableString = 3;
-    optional char_string optionalString = 4;
-    optional nullable char_string nullableOptionalString = 5;
-    nullable SimpleStruct nullableStruct = 6;
-    optional SimpleStruct optionalStruct = 7;
-    optional nullable SimpleStruct nullableOptionalStruct = 8;
-    nullable SimpleEnum nullableList[] = 9;
-    optional SimpleEnum optionalList[] = 10;
-    optional nullable SimpleEnum nullableOptionalList[] = 11;
+  struct InputInfo {
+    int8u index = 0;
+    InputTypeEnum inputType = 1;
+    char_string<32> name = 2;
+    char_string<32> description = 3;
   }
 
-  struct SimpleStruct {
-    int8u a = 0;
-    boolean b = 1;
-    SimpleEnum c = 2;
-    octet_string d = 3;
-    char_string e = 4;
-    SimpleBitmap f = 5;
-    single g = 6;
-    double h = 7;
-  }
+  readonly attribute InputInfo inputList[] = 0;
+  readonly attribute int8u currentInput = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  struct TestFabricScoped {
-    int8u fabricSensitiveInt8u = 1;
-    optional int8u optionalFabricSensitiveInt8u = 2;
-    nullable int8u nullableFabricSensitiveInt8u = 3;
-    optional nullable int8u nullableOptionalFabricSensitiveInt8u = 4;
-    char_string fabricSensitiveCharString = 5;
-    SimpleStruct fabricSensitiveStruct = 6;
-    int8u fabricSensitiveInt8uList[] = 7;
-    fabric_idx fabricIndex = 254;
+  request struct SelectInputRequest {
+    INT8U index = 0;
   }
 
-  struct NestedStructList {
-    int8u a = 0;
-    boolean b = 1;
-    SimpleStruct c = 2;
-    SimpleStruct d[] = 3;
-    int32u e[] = 4;
-    octet_string f[] = 5;
-    int8u g[] = 6;
-  }
+  command SelectInput(SelectInputRequest): DefaultSuccess = 0;
+  command ShowInputStatus(): DefaultSuccess = 1;
+  command HideInputStatus(): DefaultSuccess = 2;
+}
 
-  struct NestedStruct {
-    int8u a = 0;
-    boolean b = 1;
-    SimpleStruct c = 2;
+server cluster LowPower = 1288 {
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command Sleep(): DefaultSuccess = 0;
+}
+
+server cluster KeypadInput = 1289 {
+  enum CecKeyCode : ENUM8 {
+    kSelect = 0;
+    kUp = 1;
+    kDown = 2;
+    kLeft = 3;
+    kRight = 4;
+    kRightUp = 5;
+    kRightDown = 6;
+    kLeftUp = 7;
+    kLeftDown = 8;
+    kRootMenu = 9;
+    kSetupMenu = 10;
+    kContentsMenu = 11;
+    kFavoriteMenu = 12;
+    kExit = 13;
+    kMediaTopMenu = 16;
+    kMediaContextSensitiveMenu = 17;
+    kNumberEntryMode = 29;
+    kNumber11 = 30;
+    kNumber12 = 31;
+    kNumber0OrNumber10 = 32;
+    kNumbers1 = 33;
+    kNumbers2 = 34;
+    kNumbers3 = 35;
+    kNumbers4 = 36;
+    kNumbers5 = 37;
+    kNumbers6 = 38;
+    kNumbers7 = 39;
+    kNumbers8 = 40;
+    kNumbers9 = 41;
+    kDot = 42;
+    kEnter = 43;
+    kClear = 44;
+    kNextFavorite = 47;
+    kChannelUp = 48;
+    kChannelDown = 49;
+    kPreviousChannel = 50;
+    kSoundSelect = 51;
+    kInputSelect = 52;
+    kDisplayInformation = 53;
+    kHelp = 54;
+    kPageUp = 55;
+    kPageDown = 56;
+    kPower = 64;
+    kVolumeUp = 65;
+    kVolumeDown = 66;
+    kMute = 67;
+    kPlay = 68;
+    kStop = 69;
+    kPause = 70;
+    kRecord = 71;
+    kRewind = 72;
+    kFastForward = 73;
+    kEject = 74;
+    kForward = 75;
+    kBackward = 76;
+    kStopRecord = 77;
+    kPauseRecord = 78;
+    kReserved = 79;
+    kAngle = 80;
+    kSubPicture = 81;
+    kVideoOnDemand = 82;
+    kElectronicProgramGuide = 83;
+    kTimerProgramming = 84;
+    kInitialConfiguration = 85;
+    kSelectBroadcastType = 86;
+    kSelectSoundPresentation = 87;
+    kPlayFunction = 96;
+    kPausePlayFunction = 97;
+    kRecordFunction = 98;
+    kPauseRecordFunction = 99;
+    kStopFunction = 100;
+    kMuteFunction = 101;
+    kRestoreVolumeFunction = 102;
+    kTuneFunction = 103;
+    kSelectMediaFunction = 104;
+    kSelectAvInputFunction = 105;
+    kSelectAudioInputFunction = 106;
+    kPowerToggleFunction = 107;
+    kPowerOffFunction = 108;
+    kPowerOnFunction = 109;
+    kF1Blue = 113;
+    kF2Red = 114;
+    kF3Green = 115;
+    kF4Yellow = 116;
+    kF5 = 117;
+    kData = 118;
   }
 
-  info event TestEvent = 1 {
-    INT8U arg1 = 1;
-    SimpleEnum arg2 = 2;
-    BOOLEAN arg3 = 3;
-    SimpleStruct arg4 = 4;
-    SimpleStruct arg5[] = 5;
-    SimpleEnum arg6[] = 6;
+  enum KeypadInputStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kUnsupportedKey = 1;
+    kInvalidKeyInCurrentState = 2;
   }
 
-  info event TestFabricScopedEvent = 2 {
-    fabric_idx arg1 = 254;
+  bitmap KeypadInputFeature : BITMAP32 {
+    kNavigationKeyCodes = 0x1;
+    kLocationKeys = 0x2;
+    kNumberKeys = 0x4;
   }
 
-  attribute boolean boolean = 0;
-  attribute Bitmap8MaskMap bitmap8 = 1;
-  attribute Bitmap16MaskMap bitmap16 = 2;
-  attribute Bitmap32MaskMap bitmap32 = 3;
-  attribute Bitmap64MaskMap bitmap64 = 4;
-  attribute int8u int8u = 5;
-  attribute int16u int16u = 6;
-  attribute int24u int24u = 7;
-  attribute int32u int32u = 8;
-  attribute int40u int40u = 9;
-  attribute int48u int48u = 10;
-  attribute int56u int56u = 11;
-  attribute int64u int64u = 12;
-  attribute int8s int8s = 13;
-  attribute int16s int16s = 14;
-  attribute int24s int24s = 15;
-  attribute int32s int32s = 16;
-  attribute int40s int40s = 17;
-  attribute int48s int48s = 18;
-  attribute int56s int56s = 19;
-  attribute int64s int64s = 20;
-  attribute enum8 enum8 = 21;
-  attribute enum16 enum16 = 22;
-  attribute single floatSingle = 23;
-  attribute double floatDouble = 24;
-  attribute octet_string<10> octetString = 25;
-  attribute INT8U listInt8u[] = 26;
-  attribute OCTET_STRING listOctetString[] = 27;
-  attribute TestListStructOctet listStructOctetString[] = 28;
-  attribute long_octet_string<1000> longOctetString = 29;
-  attribute char_string<10> charString = 30;
-  attribute long_char_string<1000> longCharString = 31;
-  attribute epoch_us epochUs = 32;
-  attribute epoch_s epochS = 33;
-  attribute vendor_id vendorId = 34;
-  attribute NullablesAndOptionalsStruct listNullablesAndOptionalsStruct[] = 35;
-  attribute SimpleEnum enumAttr = 36;
-  attribute SimpleStruct structAttr = 37;
-  attribute int8u rangeRestrictedInt8u = 38;
-  attribute int8s rangeRestrictedInt8s = 39;
-  attribute int16u rangeRestrictedInt16u = 40;
-  attribute int16s rangeRestrictedInt16s = 41;
-  attribute LONG_OCTET_STRING listLongOctetString[] = 42;
-  attribute TestFabricScoped listFabricScoped[] = 43;
-  attribute boolean timedWriteBoolean = 48;
-  attribute boolean generalErrorBoolean = 49;
-  attribute boolean clusterErrorBoolean = 50;
-  attribute nullable boolean nullableBoolean = 16384;
-  attribute nullable Bitmap8MaskMap nullableBitmap8 = 16385;
-  attribute nullable Bitmap16MaskMap nullableBitmap16 = 16386;
-  attribute nullable Bitmap32MaskMap nullableBitmap32 = 16387;
-  attribute nullable Bitmap64MaskMap nullableBitmap64 = 16388;
-  attribute nullable int8u nullableInt8u = 16389;
-  attribute nullable int16u nullableInt16u = 16390;
-  attribute nullable int24u nullableInt24u = 16391;
-  attribute nullable int32u nullableInt32u = 16392;
-  attribute nullable int40u nullableInt40u = 16393;
-  attribute nullable int48u nullableInt48u = 16394;
-  attribute nullable int56u nullableInt56u = 16395;
-  attribute nullable int64u nullableInt64u = 16396;
-  attribute nullable int8s nullableInt8s = 16397;
-  attribute nullable int16s nullableInt16s = 16398;
-  attribute nullable int24s nullableInt24s = 16399;
-  attribute nullable int32s nullableInt32s = 16400;
-  attribute nullable int40s nullableInt40s = 16401;
-  attribute nullable int48s nullableInt48s = 16402;
-  attribute nullable int56s nullableInt56s = 16403;
-  attribute nullable int64s nullableInt64s = 16404;
-  attribute nullable enum8 nullableEnum8 = 16405;
-  attribute nullable enum16 nullableEnum16 = 16406;
-  attribute nullable single nullableFloatSingle = 16407;
-  attribute nullable double nullableFloatDouble = 16408;
-  attribute nullable octet_string<10> nullableOctetString = 16409;
-  attribute nullable char_string<10> nullableCharString = 16414;
-  attribute nullable SimpleEnum nullableEnumAttr = 16420;
-  attribute nullable SimpleStruct nullableStruct = 16421;
-  attribute nullable int8u nullableRangeRestrictedInt8u = 16422;
-  attribute nullable int8s nullableRangeRestrictedInt8s = 16423;
-  attribute nullable int16u nullableRangeRestrictedInt16u = 16424;
-  attribute nullable int16s nullableRangeRestrictedInt16s = 16425;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct TestAddArgumentsRequest {
-    INT8U arg1 = 0;
-    INT8U arg2 = 1;
+  request struct SendKeyRequest {
+    CecKeyCode keyCode = 0;
+  }
+
+  response struct SendKeyResponse = 1 {
+    KeypadInputStatusEnum status = 0;
+  }
+
+  command SendKey(SendKeyRequest): SendKeyResponse = 0;
+}
+
+server cluster ContentLauncher = 1290 {
+  enum ContentLaunchStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kUrlNotAvailable = 1;
+    kAuthFailed = 2;
   }
 
-  request struct TestStructArgumentRequestRequest {
-    SimpleStruct arg1 = 0;
+  enum MetricTypeEnum : ENUM8 {
+    kPixels = 0;
+    kPercentage = 1;
   }
 
-  request struct TestNestedStructArgumentRequestRequest {
-    NestedStruct arg1 = 0;
+  enum ParameterEnum : ENUM8 {
+    kActor = 0;
+    kChannel = 1;
+    kCharacter = 2;
+    kDirector = 3;
+    kEvent = 4;
+    kFranchise = 5;
+    kGenre = 6;
+    kLeague = 7;
+    kPopularity = 8;
+    kProvider = 9;
+    kSport = 10;
+    kSportsTeam = 11;
+    kType = 12;
   }
 
-  request struct TestListStructArgumentRequestRequest {
-    SimpleStruct arg1[] = 0;
+  bitmap ContentLauncherFeature : BITMAP32 {
+    kContentSearch = 0x1;
+    kURLPlayback = 0x2;
   }
 
-  request struct TestListInt8UArgumentRequestRequest {
-    INT8U arg1[] = 0;
+  bitmap SupportedStreamingProtocol : BITMAP32 {
+    kDash = 0x1;
+    kHls = 0x2;
   }
 
-  request struct TestNestedStructListArgumentRequestRequest {
-    NestedStructList arg1 = 0;
+  struct ContentSearch {
+    Parameter parameterList[] = 0;
   }
 
-  request struct TestListNestedStructListArgumentRequestRequest {
-    NestedStructList arg1[] = 0;
+  struct Parameter {
+    ParameterEnum type = 0;
+    char_string value = 1;
+    optional AdditionalInfo externalIDList[] = 2;
   }
 
-  request struct TestListInt8UReverseRequestRequest {
-    INT8U arg1[] = 0;
+  struct AdditionalInfo {
+    char_string name = 0;
+    char_string value = 1;
   }
 
-  request struct TestEnumsRequestRequest {
-    vendor_id arg1 = 0;
-    SimpleEnum arg2 = 1;
+  struct BrandingInformation {
+    char_string providerName = 0;
+    optional StyleInformation background = 1;
+    optional StyleInformation logo = 2;
+    optional StyleInformation progressBar = 3;
+    optional StyleInformation splash = 4;
+    optional StyleInformation waterMark = 5;
   }
 
-  request struct TestNullableOptionalRequestRequest {
-    optional nullable INT8U arg1 = 0;
+  struct StyleInformation {
+    optional char_string imageUrl = 0;
+    optional char_string color = 1;
+    optional Dimension size = 2;
   }
 
-  request struct SimpleStructEchoRequestRequest {
-    SimpleStruct arg1 = 0;
+  struct Dimension {
+    double width = 0;
+    double height = 1;
+    MetricTypeEnum metric = 2;
   }
 
-  request struct TestSimpleOptionalArgumentRequestRequest {
-    optional BOOLEAN arg1 = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster AudioOutput = 1291 {
+  enum OutputTypeEnum : ENUM8 {
+    kHdmi = 0;
+    kBt = 1;
+    kOptical = 2;
+    kHeadphone = 3;
+    kInternal = 4;
+    kOther = 5;
   }
 
-  request struct TestEmitTestEventRequestRequest {
-    INT8U arg1 = 0;
-    SimpleEnum arg2 = 1;
-    BOOLEAN arg3 = 2;
+  bitmap AudioOutputFeature : BITMAP32 {
+    kNameUpdates = 0x1;
   }
 
-  request struct TestEmitTestFabricScopedEventRequestRequest {
-    INT8U arg1 = 0;
+  struct OutputInfo {
+    int8u index = 0;
+    OutputTypeEnum outputType = 1;
+    char_string<32> name = 2;
   }
 
-  response struct TestSpecificResponse = 0 {
-    INT8U returnValue = 0;
+  readonly attribute OutputInfo outputList[] = 0;
+  readonly attribute int8u currentOutput = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct SelectOutputRequest {
+    INT8U index = 0;
   }
 
-  response struct TestAddArgumentsResponse = 1 {
-    INT8U returnValue = 0;
+  command SelectOutput(SelectOutputRequest): DefaultSuccess = 0;
+}
+
+server cluster ApplicationLauncher = 1292 {
+  enum ApplicationLauncherStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kAppNotAvailable = 1;
+    kSystemBusy = 2;
   }
 
-  response struct TestListInt8UReverseResponse = 4 {
-    INT8U arg1[] = 0;
+  bitmap ApplicationLauncherFeature : BITMAP32 {
+    kApplicationPlatform = 0x1;
   }
 
-  response struct TestEnumsResponse = 5 {
-    vendor_id arg1 = 0;
-    SimpleEnum arg2 = 1;
+  struct Application {
+    int16u catalogVendorId = 0;
+    char_string applicationId = 1;
   }
 
-  response struct TestNullableOptionalResponse = 6 {
-    BOOLEAN wasPresent = 0;
-    optional BOOLEAN wasNull = 1;
-    optional INT8U value = 2;
-    optional nullable INT8U originalValue = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct LaunchAppRequest {
+    Application application = 0;
+    optional OCTET_STRING data = 1;
   }
 
-  response struct SimpleStructResponse = 9 {
-    SimpleStruct arg1 = 0;
+  request struct StopAppRequest {
+    Application application = 0;
   }
 
-  response struct TestEmitTestEventResponse = 10 {
-    INT64U value = 0;
+  request struct HideAppRequest {
+    Application application = 0;
   }
 
-  response struct TestEmitTestFabricScopedEventResponse = 11 {
-    INT64U value = 0;
+  response struct LauncherResponse = 3 {
+    ApplicationLauncherStatusEnum status = 0;
+    OCTET_STRING data = 1;
   }
 
-  command Test(): DefaultSuccess = 0;
-  command TestNotHandled(): DefaultSuccess = 1;
-  command TestSpecific(): TestSpecificResponse = 2;
-  command TestAddArguments(TestAddArgumentsRequest): TestAddArgumentsResponse = 4;
-  command TestStructArgumentRequest(TestStructArgumentRequestRequest): BooleanResponse = 7;
-  command TestNestedStructArgumentRequest(TestNestedStructArgumentRequestRequest): BooleanResponse = 8;
-  command TestListStructArgumentRequest(TestListStructArgumentRequestRequest): BooleanResponse = 9;
-  command TestListInt8UArgumentRequest(TestListInt8UArgumentRequestRequest): BooleanResponse = 10;
-  command TestNestedStructListArgumentRequest(TestNestedStructListArgumentRequestRequest): BooleanResponse = 11;
-  command TestListNestedStructListArgumentRequest(TestListNestedStructListArgumentRequestRequest): BooleanResponse = 12;
-  command TestListInt8UReverseRequest(TestListInt8UReverseRequestRequest): TestListInt8UReverseResponse = 13;
-  command TestEnumsRequest(TestEnumsRequestRequest): TestEnumsResponse = 14;
-  command TestNullableOptionalRequest(TestNullableOptionalRequestRequest): TestNullableOptionalResponse = 15;
-  command SimpleStructEchoRequest(SimpleStructEchoRequestRequest): SimpleStructResponse = 17;
-  timed command TimedInvokeRequest(): DefaultSuccess = 18;
-  command TestSimpleOptionalArgumentRequest(TestSimpleOptionalArgumentRequestRequest): DefaultSuccess = 19;
-  command TestEmitTestEventRequest(TestEmitTestEventRequestRequest): TestEmitTestEventResponse = 20;
-  command TestEmitTestFabricScopedEventRequest(TestEmitTestFabricScopedEventRequestRequest): TestEmitTestFabricScopedEventResponse = 21;
+  command LaunchApp(LaunchAppRequest): LauncherResponse = 0;
+  command StopApp(StopAppRequest): LauncherResponse = 1;
+  command HideApp(HideAppRequest): LauncherResponse = 2;
 }
 
-server cluster Thermostat = 513 {
-  enum SetpointAdjustMode : ENUM8 {
-    kHeatSetpoint = 0;
-    kCoolSetpoint = 1;
-    kHeatAndCoolSetpoints = 2;
+server cluster ApplicationBasic = 1293 {
+  enum ApplicationStatusEnum : ENUM8 {
+    kStopped = 0;
+    kActiveVisibleFocus = 1;
+    kActiveHidden = 2;
+    kActiveVisibleNotFocus = 3;
   }
 
-  enum ThermostatControlSequence : ENUM8 {
-    kCoolingOnly = 0;
-    kCoolingWithReheat = 1;
-    kHeatingOnly = 2;
-    kHeatingWithReheat = 3;
-    kCoolingAndHeating = 4;
-    kCoolingAndHeatingWithReheat = 5;
+  struct ApplicationBasicApplication {
+    int16u catalogVendorId = 0;
+    char_string applicationId = 1;
   }
 
-  enum ThermostatRunningMode : ENUM8 {
-    kOff = 0;
-    kCool = 3;
-    kHeat = 4;
-  }
+  readonly attribute char_string<32> applicationName = 2;
+  readonly attribute ApplicationBasicApplication application = 4;
+  readonly attribute ApplicationStatusEnum status = 5;
+  readonly attribute char_string<32> applicationVersion = 6;
+  readonly attribute vendor_id allowedVendorList[] = 7;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  enum ThermostatSystemMode : ENUM8 {
-    kOff = 0;
-    kAuto = 1;
-    kCool = 3;
-    kHeat = 4;
-    kEmergencyHeating = 5;
-    kPrecooling = 6;
-    kFanOnly = 7;
+server cluster AccountLogin = 1294 {
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct GetSetupPINRequest {
+    CHAR_STRING tempAccountIdentifier = 0;
   }
 
-  bitmap DayOfWeek : BITMAP8 {
-    kSunday = 0x1;
-    kMonday = 0x2;
-    kTuesday = 0x4;
-    kWednesday = 0x8;
-    kThursday = 0x10;
-    kFriday = 0x20;
-    kSaturday = 0x40;
-    kAwayOrVacation = 0x80;
+  request struct LoginRequest {
+    CHAR_STRING tempAccountIdentifier = 0;
+    CHAR_STRING setupPIN = 1;
   }
 
-  bitmap ModeForSequence : BITMAP8 {
-    kHeatSetpointFieldPresent = 0x1;
-    kCoolSetpointFieldPresent = 0x2;
+  response struct GetSetupPINResponse = 1 {
+    CHAR_STRING setupPIN = 0;
   }
 
-  bitmap ThermostatFeature : BITMAP32 {
-    kHeating = 0x1;
-    kCooling = 0x2;
-    kOccupancy = 0x4;
-    kSchedule = 0x8;
-    kSetback = 0x10;
-    kAutomode = 0x20;
+  timed command GetSetupPIN(GetSetupPINRequest): GetSetupPINResponse = 0;
+  timed command Login(LoginRequest): DefaultSuccess = 2;
+  timed command Logout(): DefaultSuccess = 3;
+}
+
+server cluster TestCluster = 4294048773 {
+  enum SimpleEnum : ENUM8 {
+    kUnspecified = 0;
+    kValueA = 1;
+    kValueB = 2;
+    kValueC = 3;
   }
 
-  struct ThermostatScheduleTransition {
-    int16u transitionTime = 0;
-    nullable int16s heatSetpoint = 1;
-    nullable int16s coolSetpoint = 2;
+  bitmap Bitmap16MaskMap : BITMAP16 {
+    kMaskVal1 = 0x1;
+    kMaskVal2 = 0x2;
+    kMaskVal3 = 0x4;
+    kMaskVal4 = 0x4000;
   }
 
-  readonly attribute nullable int16s localTemperature = 0;
-  attribute int16s occupiedHeatingSetpoint = 18;
-  attribute access(write: manage) ThermostatControlSequence controlSequenceOfOperation = 27;
-  attribute access(write: manage) enum8 systemMode = 28;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct SetpointRaiseLowerRequest {
-    SetpointAdjustMode mode = 0;
-    INT8S amount = 1;
+  bitmap Bitmap32MaskMap : BITMAP32 {
+    kMaskVal1 = 0x1;
+    kMaskVal2 = 0x2;
+    kMaskVal3 = 0x4;
+    kMaskVal4 = 0x40000000;
   }
 
-  command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0;
-}
+  bitmap Bitmap64MaskMap : BITMAP64 {
+    kMaskVal1 = 0x1;
+    kMaskVal2 = 0x2;
+    kMaskVal3 = 0x4;
+    kMaskVal4 = 0x4000000000000000;
+  }
 
-server cluster ThermostatUserInterfaceConfiguration = 516 {
-  attribute enum8 temperatureDisplayMode = 0;
-  attribute access(write: manage) enum8 keypadLockout = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  bitmap Bitmap8MaskMap : BITMAP8 {
+    kMaskVal1 = 0x1;
+    kMaskVal2 = 0x2;
+    kMaskVal3 = 0x4;
+    kMaskVal4 = 0x40;
+  }
 
-server cluster ThreadNetworkDiagnostics = 53 {
-  enum NetworkFault : ENUM8 {
-    kUnspecified = 0;
-    kLinkDown = 1;
-    kHardwareFailure = 2;
-    kNetworkJammed = 3;
+  bitmap SimpleBitmap : BITMAP8 {
+    kValueA = 0x1;
+    kValueB = 0x2;
+    kValueC = 0x4;
   }
 
-  enum RoutingRole : ENUM8 {
-    kUnspecified = 0;
-    kUnassigned = 1;
-    kSleepyEndDevice = 2;
-    kEndDevice = 3;
-    kReed = 4;
-    kRouter = 5;
-    kLeader = 6;
+  struct TestListStructOctet {
+    int64u member1 = 0;
+    octet_string<32> member2 = 1;
   }
 
-  enum ThreadConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  struct NullablesAndOptionalsStruct {
+    nullable int16u nullableInt = 0;
+    optional int16u optionalInt = 1;
+    optional nullable int16u nullableOptionalInt = 2;
+    nullable char_string nullableString = 3;
+    optional char_string optionalString = 4;
+    optional nullable char_string nullableOptionalString = 5;
+    nullable SimpleStruct nullableStruct = 6;
+    optional SimpleStruct optionalStruct = 7;
+    optional nullable SimpleStruct nullableOptionalStruct = 8;
+    nullable SimpleEnum nullableList[] = 9;
+    optional SimpleEnum optionalList[] = 10;
+    optional nullable SimpleEnum nullableOptionalList[] = 11;
   }
 
-  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
-    kPacketCounts = 0x1;
-    kErrorCounts = 0x2;
-    kMLECounts = 0x4;
-    kMACCounts = 0x8;
+  struct SimpleStruct {
+    int8u a = 0;
+    boolean b = 1;
+    SimpleEnum c = 2;
+    octet_string d = 3;
+    char_string e = 4;
+    SimpleBitmap f = 5;
+    single g = 6;
+    double h = 7;
   }
 
-  struct NeighborTable {
-    int64u extAddress = 0;
-    int32u age = 1;
-    int16u rloc16 = 2;
-    int32u linkFrameCounter = 3;
-    int32u mleFrameCounter = 4;
-    int8u lqi = 5;
-    nullable int8s averageRssi = 6;
-    nullable int8s lastRssi = 7;
-    int8u frameErrorRate = 8;
-    int8u messageErrorRate = 9;
-    boolean rxOnWhenIdle = 10;
-    boolean fullThreadDevice = 11;
-    boolean fullNetworkData = 12;
-    boolean isChild = 13;
+  struct TestFabricScoped {
+    int8u fabricSensitiveInt8u = 1;
+    optional int8u optionalFabricSensitiveInt8u = 2;
+    nullable int8u nullableFabricSensitiveInt8u = 3;
+    optional nullable int8u nullableOptionalFabricSensitiveInt8u = 4;
+    char_string fabricSensitiveCharString = 5;
+    SimpleStruct fabricSensitiveStruct = 6;
+    int8u fabricSensitiveInt8uList[] = 7;
+    fabric_idx fabricIndex = 254;
   }
 
-  struct RouteTable {
-    int64u extAddress = 0;
-    int16u rloc16 = 1;
-    int8u routerId = 2;
-    int8u nextHop = 3;
-    int8u pathCost = 4;
-    int8u LQIIn = 5;
-    int8u LQIOut = 6;
-    int8u age = 7;
-    boolean allocated = 8;
-    boolean linkEstablished = 9;
+  struct NestedStruct {
+    int8u a = 0;
+    boolean b = 1;
+    SimpleStruct c = 2;
   }
 
-  struct SecurityPolicy {
-    int16u rotationTime = 0;
-    bitmap16 flags = 1;
+  struct NestedStructList {
+    int8u a = 0;
+    boolean b = 1;
+    SimpleStruct c = 2;
+    SimpleStruct d[] = 3;
+    int32u e[] = 4;
+    octet_string f[] = 5;
+    int8u g[] = 6;
   }
 
-  struct OperationalDatasetComponents {
-    boolean activeTimestampPresent = 0;
-    boolean pendingTimestampPresent = 1;
-    boolean masterKeyPresent = 2;
-    boolean networkNamePresent = 3;
-    boolean extendedPanIdPresent = 4;
-    boolean meshLocalPrefixPresent = 5;
-    boolean delayPresent = 6;
-    boolean panIdPresent = 7;
-    boolean channelPresent = 8;
-    boolean pskcPresent = 9;
-    boolean securityPolicyPresent = 10;
-    boolean channelMaskPresent = 11;
+  info event TestEvent = 1 {
+    INT8U arg1 = 1;
+    SimpleEnum arg2 = 2;
+    BOOLEAN arg3 = 3;
+    SimpleStruct arg4 = 4;
+    SimpleStruct arg5[] = 5;
+    SimpleEnum arg6[] = 6;
   }
 
-  info event ConnectionStatus = 0 {
-    ThreadConnectionStatus connectionStatus = 0;
+  info event TestFabricScopedEvent = 2 {
+    fabric_idx arg1 = 254;
   }
 
-  readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable RoutingRole routingRole = 1;
-  readonly attribute nullable char_string<16> networkName = 2;
-  readonly attribute nullable int16u panId = 3;
-  readonly attribute nullable int64u extendedPanId = 4;
-  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
-  readonly attribute NeighborTable neighborTableList[] = 7;
-  readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
-  readonly attribute nullable int8u leaderRouterId = 13;
-  readonly attribute nullable SecurityPolicy securityPolicy = 59;
-  readonly attribute nullable octet_string<4> channelMask = 60;
-  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
-  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+  attribute boolean boolean = 0;
+  attribute Bitmap8MaskMap bitmap8 = 1;
+  attribute Bitmap16MaskMap bitmap16 = 2;
+  attribute Bitmap32MaskMap bitmap32 = 3;
+  attribute Bitmap64MaskMap bitmap64 = 4;
+  attribute int8u int8u = 5;
+  attribute int16u int16u = 6;
+  attribute int24u int24u = 7;
+  attribute int32u int32u = 8;
+  attribute int40u int40u = 9;
+  attribute int48u int48u = 10;
+  attribute int56u int56u = 11;
+  attribute int64u int64u = 12;
+  attribute int8s int8s = 13;
+  attribute int16s int16s = 14;
+  attribute int24s int24s = 15;
+  attribute int32s int32s = 16;
+  attribute int40s int40s = 17;
+  attribute int48s int48s = 18;
+  attribute int56s int56s = 19;
+  attribute int64s int64s = 20;
+  attribute enum8 enum8 = 21;
+  attribute enum16 enum16 = 22;
+  attribute single floatSingle = 23;
+  attribute double floatDouble = 24;
+  attribute octet_string<10> octetString = 25;
+  attribute INT8U listInt8u[] = 26;
+  attribute OCTET_STRING listOctetString[] = 27;
+  attribute TestListStructOctet listStructOctetString[] = 28;
+  attribute long_octet_string<1000> longOctetString = 29;
+  attribute char_string<10> charString = 30;
+  attribute long_char_string<1000> longCharString = 31;
+  attribute epoch_us epochUs = 32;
+  attribute epoch_s epochS = 33;
+  attribute vendor_id vendorId = 34;
+  attribute NullablesAndOptionalsStruct listNullablesAndOptionalsStruct[] = 35;
+  attribute SimpleEnum enumAttr = 36;
+  attribute SimpleStruct structAttr = 37;
+  attribute int8u rangeRestrictedInt8u = 38;
+  attribute int8s rangeRestrictedInt8s = 39;
+  attribute int16u rangeRestrictedInt16u = 40;
+  attribute int16s rangeRestrictedInt16s = 41;
+  attribute LONG_OCTET_STRING listLongOctetString[] = 42;
+  attribute TestFabricScoped listFabricScoped[] = 43;
+  attribute boolean timedWriteBoolean = 48;
+  attribute boolean generalErrorBoolean = 49;
+  attribute boolean clusterErrorBoolean = 50;
+  attribute nullable boolean nullableBoolean = 16384;
+  attribute nullable Bitmap8MaskMap nullableBitmap8 = 16385;
+  attribute nullable Bitmap16MaskMap nullableBitmap16 = 16386;
+  attribute nullable Bitmap32MaskMap nullableBitmap32 = 16387;
+  attribute nullable Bitmap64MaskMap nullableBitmap64 = 16388;
+  attribute nullable int8u nullableInt8u = 16389;
+  attribute nullable int16u nullableInt16u = 16390;
+  attribute nullable int24u nullableInt24u = 16391;
+  attribute nullable int32u nullableInt32u = 16392;
+  attribute nullable int40u nullableInt40u = 16393;
+  attribute nullable int48u nullableInt48u = 16394;
+  attribute nullable int56u nullableInt56u = 16395;
+  attribute nullable int64u nullableInt64u = 16396;
+  attribute nullable int8s nullableInt8s = 16397;
+  attribute nullable int16s nullableInt16s = 16398;
+  attribute nullable int24s nullableInt24s = 16399;
+  attribute nullable int32s nullableInt32s = 16400;
+  attribute nullable int40s nullableInt40s = 16401;
+  attribute nullable int48s nullableInt48s = 16402;
+  attribute nullable int56s nullableInt56s = 16403;
+  attribute nullable int64s nullableInt64s = 16404;
+  attribute nullable enum8 nullableEnum8 = 16405;
+  attribute nullable enum16 nullableEnum16 = 16406;
+  attribute nullable single nullableFloatSingle = 16407;
+  attribute nullable double nullableFloatDouble = 16408;
+  attribute nullable octet_string<10> nullableOctetString = 16409;
+  attribute nullable char_string<10> nullableCharString = 16414;
+  attribute nullable SimpleEnum nullableEnumAttr = 16420;
+  attribute nullable SimpleStruct nullableStruct = 16421;
+  attribute nullable int8u nullableRangeRestrictedInt8u = 16422;
+  attribute nullable int8s nullableRangeRestrictedInt8s = 16423;
+  attribute nullable int16u nullableRangeRestrictedInt16u = 16424;
+  attribute nullable int16s nullableRangeRestrictedInt16s = 16425;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
+  request struct TestAddArgumentsRequest {
+    INT8U arg1 = 0;
+    INT8U arg2 = 1;
   }
 
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
+  request struct TestStructArgumentRequestRequest {
+    SimpleStruct arg1 = 0;
   }
 
-  attribute HourFormat hourFormat = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster UnitLocalization = 45 {
-  enum TempUnit : ENUM8 {
-    kFahrenheit = 0;
-    kCelsius = 1;
-    kKelvin = 2;
+  request struct TestNestedStructArgumentRequestRequest {
+    NestedStruct arg1 = 0;
   }
 
-  bitmap UnitLocalizationFeature : BITMAP32 {
-    kTemperatureUnit = 0x1;
+  request struct TestListStructArgumentRequestRequest {
+    SimpleStruct arg1[] = 0;
   }
 
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster UserLabel = 65 {
-  attribute access(write: manage) LabelStruct labelList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  request struct TestListInt8UArgumentRequestRequest {
+    INT8U arg1[] = 0;
+  }
 
-server cluster WakeOnLan = 1283 {
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  request struct TestNestedStructListArgumentRequestRequest {
+    NestedStructList arg1 = 0;
+  }
 
-server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCause : ENUM8 {
-    kUnknown = 0;
-    kAssociationFailed = 1;
-    kAuthenticationFailed = 2;
-    kSsidNotFound = 3;
+  request struct TestListNestedStructListArgumentRequestRequest {
+    NestedStructList arg1[] = 0;
   }
 
-  enum SecurityType : ENUM8 {
-    kUnspecified = 0;
-    kNone = 1;
-    kWep = 2;
-    kWpa = 3;
-    kWpa2 = 4;
-    kWpa3 = 5;
+  request struct TestListInt8UReverseRequestRequest {
+    INT8U arg1[] = 0;
   }
 
-  enum WiFiConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  request struct TestEnumsRequestRequest {
+    vendor_id arg1 = 0;
+    SimpleEnum arg2 = 1;
   }
 
-  enum WiFiVersionType : ENUM8 {
-    k80211a = 0;
-    k80211b = 1;
-    k80211g = 2;
-    k80211n = 3;
-    k80211ac = 4;
-    k80211ax = 5;
+  request struct TestNullableOptionalRequestRequest {
+    optional nullable INT8U arg1 = 0;
   }
 
-  info event Disconnection = 0 {
-    INT16U reasonCode = 0;
+  request struct SimpleStructEchoRequestRequest {
+    SimpleStruct arg1 = 0;
   }
 
-  info event AssociationFailure = 1 {
-    AssociationFailureCause associationFailure = 0;
-    INT16U status = 1;
+  request struct TestSimpleOptionalArgumentRequestRequest {
+    optional BOOLEAN arg1 = 0;
   }
 
-  info event ConnectionStatus = 2 {
-    WiFiConnectionStatus connectionStatus = 0;
+  request struct TestEmitTestEventRequestRequest {
+    INT8U arg1 = 0;
+    SimpleEnum arg2 = 1;
+    BOOLEAN arg3 = 2;
   }
 
-  readonly attribute nullable octet_string<6> bssid = 0;
-  readonly attribute nullable SecurityType securityType = 1;
-  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
-  readonly attribute nullable int16u channelNumber = 3;
-  readonly attribute nullable int8s rssi = 4;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  request struct TestEmitTestFabricScopedEventRequestRequest {
+    INT8U arg1 = 0;
+  }
 
-server cluster WindowCovering = 258 {
-  enum EndProductType : ENUM8 {
-    kRollerShade = 0;
-    kRomanShade = 1;
-    kBalloonShade = 2;
-    kWovenWood = 3;
-    kPleatedShade = 4;
-    kCellularShade = 5;
-    kLayeredShade = 6;
-    kLayeredShade2D = 7;
-    kSheerShade = 8;
-    kTiltOnlyInteriorBlind = 9;
-    kInteriorBlind = 10;
-    kVerticalBlindStripCurtain = 11;
-    kInteriorVenetianBlind = 12;
-    kExteriorVenetianBlind = 13;
-    kLateralLeftCurtain = 14;
-    kLateralRightCurtain = 15;
-    kCentralCurtain = 16;
-    kRollerShutter = 17;
-    kExteriorVerticalScreen = 18;
-    kAwningTerracePatio = 19;
-    kAwningVerticalScreen = 20;
-    kTiltOnlyPergola = 21;
-    kSwingingShutter = 22;
-    kSlidingShutter = 23;
-    kUnknown = 255;
+  response struct TestSpecificResponse = 0 {
+    INT8U returnValue = 0;
   }
 
-  enum Type : ENUM8 {
-    kRollerShade = 0;
-    kRollerShade2Motor = 1;
-    kRollerShadeExterior = 2;
-    kRollerShadeExterior2Motor = 3;
-    kDrapery = 4;
-    kAwning = 5;
-    kShutter = 6;
-    kTiltBlindTiltOnly = 7;
-    kTiltBlindLiftAndTilt = 8;
-    kProjectorScreen = 9;
-    kUnknown = 255;
+  response struct TestAddArgumentsResponse = 1 {
+    INT8U returnValue = 0;
   }
 
-  bitmap ConfigStatus : BITMAP8 {
-    kOperational = 0x1;
-    kOnlineReserved = 0x2;
-    kLiftMovementReversed = 0x4;
-    kLiftPositionAware = 0x8;
-    kTiltPositionAware = 0x10;
-    kLiftEncoderControlled = 0x20;
-    kTiltEncoderControlled = 0x40;
+  response struct TestListInt8UReverseResponse = 4 {
+    INT8U arg1[] = 0;
   }
 
-  bitmap Feature : BITMAP32 {
-    kLift = 0x1;
-    kTilt = 0x2;
-    kPositionAwareLift = 0x4;
-    kAbsolutePosition = 0x8;
-    kPositionAwareTilt = 0x10;
+  response struct TestEnumsResponse = 5 {
+    vendor_id arg1 = 0;
+    SimpleEnum arg2 = 1;
   }
 
-  bitmap Mode : BITMAP8 {
-    kMotorDirectionReversed = 0x1;
-    kCalibrationMode = 0x2;
-    kMaintenanceMode = 0x4;
-    kLedFeedback = 0x8;
+  response struct TestNullableOptionalResponse = 6 {
+    BOOLEAN wasPresent = 0;
+    optional BOOLEAN wasNull = 1;
+    optional INT8U value = 2;
+    optional nullable INT8U originalValue = 3;
   }
 
-  bitmap OperationalStatus : BITMAP8 {
-    kGlobal = 0x3;
-    kLift = 0xC;
-    kTilt = 0x30;
+  response struct SimpleStructResponse = 9 {
+    SimpleStruct arg1 = 0;
   }
 
-  bitmap SafetyStatus : BITMAP16 {
-    kRemoteLockout = 0x1;
-    kTamperDetection = 0x2;
-    kFailedCommunication = 0x4;
-    kPositionFailure = 0x8;
-    kThermalProtection = 0x10;
-    kObstacleDetected = 0x20;
-    kPower = 0x40;
-    kStopInput = 0x80;
-    kMotorJammed = 0x100;
-    kHardwareFailure = 0x200;
-    kManualOperation = 0x400;
-    kProtection = 0x800;
+  response struct TestEmitTestEventResponse = 10 {
+    INT64U value = 0;
   }
 
-  readonly attribute Type type = 0;
-  readonly attribute ConfigStatus configStatus = 7;
-  readonly attribute OperationalStatus operationalStatus = 10;
-  readonly attribute EndProductType endProductType = 13;
-  attribute access(write: manage) Mode mode = 23;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  response struct TestEmitTestFabricScopedEventResponse = 11 {
+    INT64U value = 0;
+  }
 
-  command UpOrOpen(): DefaultSuccess = 0;
-  command DownOrClose(): DefaultSuccess = 1;
-  command StopMotion(): DefaultSuccess = 2;
+  command Test(): DefaultSuccess = 0;
+  command TestNotHandled(): DefaultSuccess = 1;
+  command TestSpecific(): TestSpecificResponse = 2;
+  command TestAddArguments(TestAddArgumentsRequest): TestAddArgumentsResponse = 4;
+  command TestStructArgumentRequest(TestStructArgumentRequestRequest): BooleanResponse = 7;
+  command TestNestedStructArgumentRequest(TestNestedStructArgumentRequestRequest): BooleanResponse = 8;
+  command TestListStructArgumentRequest(TestListStructArgumentRequestRequest): BooleanResponse = 9;
+  command TestListInt8UArgumentRequest(TestListInt8UArgumentRequestRequest): BooleanResponse = 10;
+  command TestNestedStructListArgumentRequest(TestNestedStructListArgumentRequestRequest): BooleanResponse = 11;
+  command TestListNestedStructListArgumentRequest(TestListNestedStructListArgumentRequestRequest): BooleanResponse = 12;
+  command TestListInt8UReverseRequest(TestListInt8UReverseRequestRequest): TestListInt8UReverseResponse = 13;
+  command TestEnumsRequest(TestEnumsRequestRequest): TestEnumsResponse = 14;
+  command TestNullableOptionalRequest(TestNullableOptionalRequestRequest): TestNullableOptionalResponse = 15;
+  command SimpleStructEchoRequest(SimpleStructEchoRequestRequest): SimpleStructResponse = 17;
+  timed command TimedInvokeRequest(): DefaultSuccess = 18;
+  command TestSimpleOptionalArgumentRequest(TestSimpleOptionalArgumentRequestRequest): DefaultSuccess = 19;
+  command TestEmitTestEventRequest(TestEmitTestEventRequestRequest): TestEmitTestEventResponse = 20;
+  command TestEmitTestFabricScopedEventRequest(TestEmitTestFabricScopedEventRequestRequest): TestEmitTestFabricScopedEventResponse = 21;
 }
 
 endpoint 0 {
diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
index f4572fce80c57a..dbf2653109dcb8 100644
--- a/examples/bridge-app/bridge-common/bridge-app.matter
+++ b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -1,6 +1,214 @@
 // This IDL was generated automatically by ZAP.
 // It is for view/code review purposes only.
 
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
+  }
+
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
+  }
+
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
+  }
+
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
+  }
+
+  request struct TriggerEffectRequest {
+    IdentifyEffectIdentifier effectIdentifier = 0;
+    IdentifyEffectVariant effectVariant = 1;
+  }
+
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+  command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
+}
+
+server cluster OnOff = 6 {
+  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
+    kFadeToOffIn0p8Seconds = 0;
+    kNoFade = 1;
+    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
+  }
+
+  enum OnOffDyingLightEffectVariant : ENUM8 {
+    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
+  }
+
+  enum OnOffEffectIdentifier : ENUM8 {
+    kDelayedAllOff = 0;
+    kDyingLight = 1;
+  }
+
+  enum OnOffStartUpOnOff : ENUM8 {
+    kOff = 0;
+    kOn = 1;
+    kTogglePreviousOnOff = 2;
+  }
+
+  bitmap OnOffControl : BITMAP8 {
+    kAcceptOnlyWhenOn = 0x1;
+  }
+
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
+  }
+
+  bitmap SceneFeatures : BITMAP32 {
+    kSceneNames = 0x1;
+  }
+
+  readonly attribute boolean onOff = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command Off(): DefaultSuccess = 0;
+  command On(): DefaultSuccess = 1;
+  command Toggle(): DefaultSuccess = 2;
+}
+
+server cluster LevelControl = 8 {
+  enum MoveMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
+  }
+
+  enum StepMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
+  }
+
+  bitmap LevelControlFeature : BITMAP32 {
+    kOnOff = 0x1;
+    kLighting = 0x2;
+    kFrequency = 0x4;
+  }
+
+  readonly attribute int8u currentLevel = 0;
+  readonly attribute int16u remainingTime = 1;
+  readonly attribute int8u minLevel = 2;
+  readonly attribute int8u maxLevel = 3;
+  readonly attribute int16u currentFrequency = 4;
+  readonly attribute int16u minFrequency = 5;
+  readonly attribute int16u maxFrequency = 6;
+  attribute bitmap8 options = 15;
+  attribute int16u onOffTransitionTime = 16;
+  attribute nullable int8u onLevel = 17;
+  attribute nullable int16u onTransitionTime = 18;
+  attribute nullable int16u offTransitionTime = 19;
+  attribute nullable int8u defaultMoveRate = 20;
+  attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct MoveToLevelRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
+  }
+
+  request struct MoveRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
+  }
+
+  request struct StepRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionMask = 3;
+    BITMAP8 optionOverride = 4;
+  }
+
+  request struct StopRequest {
+    BITMAP8 optionMask = 0;
+    BITMAP8 optionOverride = 1;
+  }
+
+  request struct MoveToLevelWithOnOffRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
+  }
+
+  request struct MoveWithOnOffRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
+  }
+
+  request struct StepWithOnOffRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
+  }
+
+  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
+  command Move(MoveRequest): DefaultSuccess = 1;
+  command Step(StepRequest): DefaultSuccess = 2;
+  command Stop(StopRequest): DefaultSuccess = 3;
+  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
+  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
+  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
+  command StopWithOnOff(): DefaultSuccess = 7;
+}
+
+server cluster Descriptor = 29 {
+  struct DeviceType {
+    devtype_id type = 0;
+    int16u revision = 1;
+  }
+
+  readonly attribute DeviceType deviceList[] = 0;
+  readonly attribute CLUSTER_ID serverList[] = 1;
+  readonly attribute CLUSTER_ID clientList[] = 2;
+  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+client cluster Binding = 30 {
+  struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  attribute TargetStruct binding[] = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
 client cluster AccessControl = 31 {
   enum AuthMode : ENUM8 {
     kPase = 1;
@@ -137,136 +345,33 @@ server cluster AccessControl = 31 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
+server cluster BridgedActions = 37 {
+  enum ActionErrorEnum : ENUM8 {
+    kUnknown = 0;
+    kInterrupted = 1;
   }
 
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
+  enum ActionStateEnum : ENUM8 {
+    kInactive = 0;
+    kActive = 1;
+    kPaused = 2;
+    kDisabled = 3;
   }
 
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
+  enum ActionTypeEnum : ENUM8 {
+    kOther = 0;
+    kScene = 1;
+    kSequence = 2;
+    kAutomation = 3;
+    kException = 4;
+    kNotification = 5;
+    kAlarm = 6;
   }
 
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-  }
-
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
-
-server cluster Basic = 40 {
-  struct CapabilityMinimaStruct {
-    int16u caseSessionsPerFabric = 0;
-    int16u subscriptionsPerFabric = 1;
-  }
-
-  critical event StartUp = 0 {
-    INT32U softwareVersion = 0;
-  }
-
-  critical event ShutDown = 1 {
-  }
-
-  info event Leave = 2 {
-  }
-
-  info event ReachableChanged = 3 {
-    boolean reachableNewValue = 0;
-  }
-
-  readonly attribute int16u dataModelRevision = 0;
-  readonly attribute char_string<32> vendorName = 1;
-  readonly attribute vendor_id vendorID = 2;
-  readonly attribute char_string<32> productName = 3;
-  readonly attribute int16u productID = 4;
-  attribute access(write: manage) char_string<32> nodeLabel = 5;
-  attribute access(write: administer) char_string<2> location = 6;
-  readonly attribute int16u hardwareVersion = 7;
-  readonly attribute char_string<64> hardwareVersionString = 8;
-  readonly attribute int32u softwareVersion = 9;
-  readonly attribute char_string<64> softwareVersionString = 10;
-  readonly attribute char_string<16> manufacturingDate = 11;
-  readonly attribute char_string<32> partNumber = 12;
-  readonly attribute long_char_string<256> productURL = 13;
-  readonly attribute char_string<64> productLabel = 14;
-  readonly attribute char_string<32> serialNumber = 15;
-  attribute access(write: manage) boolean localConfigDisabled = 16;
-  readonly attribute boolean reachable = 17;
-  readonly attribute char_string<32> uniqueID = 18;
-  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-client cluster Binding = 30 {
-  struct TargetStruct {
-    optional node_id node = 1;
-    optional group_id group = 2;
-    optional endpoint_no endpoint = 3;
-    optional cluster_id cluster = 4;
-    fabric_idx fabricIndex = 254;
-  }
-
-  attribute TargetStruct binding[] = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster BridgedActions = 37 {
-  enum ActionErrorEnum : ENUM8 {
-    kUnknown = 0;
-    kInterrupted = 1;
-  }
-
-  enum ActionStateEnum : ENUM8 {
-    kInactive = 0;
-    kActive = 1;
-    kPaused = 2;
-    kDisabled = 3;
-  }
-
-  enum ActionTypeEnum : ENUM8 {
-    kOther = 0;
-    kScene = 1;
-    kSequence = 2;
-    kAutomation = 3;
-    kException = 4;
-    kNotification = 5;
-    kAlarm = 6;
-  }
-
-  enum EndpointListTypeEnum : ENUM8 {
-    kOther = 0;
-    kRoom = 1;
-    kZone = 2;
+  enum EndpointListTypeEnum : ENUM8 {
+    kOther = 0;
+    kRoom = 1;
+    kZone = 2;
   }
 
   bitmap CommandBits : BITMAP16 {
@@ -322,16 +427,46 @@ server cluster BridgedActions = 37 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster Descriptor = 29 {
-  struct DeviceType {
-    devtype_id type = 0;
-    int16u revision = 1;
+server cluster Basic = 40 {
+  struct CapabilityMinimaStruct {
+    int16u caseSessionsPerFabric = 0;
+    int16u subscriptionsPerFabric = 1;
   }
 
-  readonly attribute DeviceType deviceList[] = 0;
-  readonly attribute CLUSTER_ID serverList[] = 1;
-  readonly attribute CLUSTER_ID clientList[] = 2;
-  readonly attribute ENDPOINT_NO partsList[] = 3;
+  critical event StartUp = 0 {
+    INT32U softwareVersion = 0;
+  }
+
+  critical event ShutDown = 1 {
+  }
+
+  info event Leave = 2 {
+  }
+
+  info event ReachableChanged = 3 {
+    boolean reachableNewValue = 0;
+  }
+
+  readonly attribute int16u dataModelRevision = 0;
+  readonly attribute char_string<32> vendorName = 1;
+  readonly attribute vendor_id vendorID = 2;
+  readonly attribute char_string<32> productName = 3;
+  readonly attribute int16u productID = 4;
+  attribute access(write: manage) char_string<32> nodeLabel = 5;
+  attribute access(write: administer) char_string<2> location = 6;
+  readonly attribute int16u hardwareVersion = 7;
+  readonly attribute char_string<64> hardwareVersionString = 8;
+  readonly attribute int32u softwareVersion = 9;
+  readonly attribute char_string<64> softwareVersionString = 10;
+  readonly attribute char_string<16> manufacturingDate = 11;
+  readonly attribute char_string<32> partNumber = 12;
+  readonly attribute long_char_string<256> productURL = 13;
+  readonly attribute char_string<64> productLabel = 14;
+  readonly attribute char_string<32> serialNumber = 15;
+  attribute access(write: manage) boolean localConfigDisabled = 16;
+  readonly attribute boolean reachable = 17;
+  readonly attribute char_string<32> uniqueID = 18;
+  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -339,61 +474,62 @@ server cluster Descriptor = 29 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster DiagnosticLogs = 50 {
-  enum LogsIntent : ENUM8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
-  }
+server cluster LocalizationConfiguration = 43 {
+  attribute char_string<35> activeLocale = 0;
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  enum LogsStatus : ENUM8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
   }
 
-  enum LogsTransferProtocol : ENUM8 {
-    kResponsePayload = 0;
-    kBdx = 1;
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
   }
 
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct RetrieveLogsRequestRequest {
-    LogsIntent intent = 0;
-    LogsTransferProtocol requestedProtocol = 1;
-    OCTET_STRING transferFileDesignator = 2;
+server cluster UnitLocalization = 45 {
+  enum TempUnit : ENUM8 {
+    kFahrenheit = 0;
+    kCelsius = 1;
+    kKelvin = 2;
   }
 
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
-}
-
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
+  bitmap UnitLocalizationFeature : BITMAP32 {
+    kTemperatureUnit = 0x1;
   }
 
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
+  attribute TempUnit temperatureUnit = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
@@ -460,19 +596,188 @@ server cluster GeneralCommissioning = 48 {
   command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
 }
 
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatus : ENUM8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
   }
 
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
+  enum WiFiBand : ENUM8 {
+    k2g4 = 0;
+    k3g65 = 1;
+    k5g = 2;
+    k6g = 3;
+    k60g = 4;
+  }
+
+  bitmap NetworkCommissioningFeature : BITMAP32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
+  }
+
+  bitmap WiFiSecurity : BITMAP8 {
+    kUnencrypted = 0x1;
+    kWepPersonal = 0x2;
+    kWpaPersonal = 0x4;
+    kWpa2Personal = 0x8;
+    kWpa3Personal = 0x10;
+  }
+
+  struct NetworkInfo {
+    octet_string<32> networkID = 0;
+    boolean connected = 1;
+  }
+
+  struct WiFiInterfaceScanResult {
+    WiFiSecurity security = 0;
+    octet_string<32> ssid = 1;
+    octet_string<6> bssid = 2;
+    int16u channel = 3;
+    WiFiBand wiFiBand = 4;
+    int8s rssi = 5;
+  }
+
+  struct ThreadInterfaceScanResult {
+    int16u panId = 0;
+    int64u extendedPanId = 1;
+    char_string<16> networkName = 2;
+    int16u channel = 3;
+    int8u version = 4;
+    octet_string<8> extendedAddress = 5;
+    int8s rssi = 6;
+    int8u lqi = 7;
+  }
+
+  readonly attribute access(read: administer) int8u maxNetworks = 0;
+  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
+  readonly attribute int8u scanMaxTimeSeconds = 2;
+  readonly attribute int8u connectMaxTimeSeconds = 3;
+  attribute access(write: administer) boolean interfaceEnabled = 4;
+  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
+  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
+  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ScanNetworksRequest {
+    optional nullable OCTET_STRING ssid = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct AddOrUpdateWiFiNetworkRequest {
+    OCTET_STRING ssid = 0;
+    OCTET_STRING credentials = 1;
+    optional INT64U breadcrumb = 2;
+  }
+
+  request struct AddOrUpdateThreadNetworkRequest {
+    OCTET_STRING operationalDataset = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct RemoveNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct ConnectNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct ReorderNetworkRequest {
+    OCTET_STRING networkID = 0;
+    INT8U networkIndex = 1;
+    optional INT64U breadcrumb = 2;
+  }
+
+  response struct ScanNetworksResponse = 1 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
+    optional ThreadInterfaceScanResult threadScanResults[] = 3;
+  }
+
+  response struct NetworkConfigResponse = 5 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional INT8U networkIndex = 2;
+  }
+
+  response struct ConnectNetworkResponse = 7 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    nullable INT32S errorValue = 2;
+  }
+
+  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
+  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
+  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
+  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
+  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
+  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+}
+
+server cluster DiagnosticLogs = 50 {
+  enum LogsIntent : ENUM8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
+  }
+
+  enum LogsStatus : ENUM8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
+  }
+
+  enum LogsTransferProtocol : ENUM8 {
+    kResponsePayload = 0;
+    kBdx = 1;
+  }
+
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct RetrieveLogsRequestRequest {
+    LogsIntent intent = 0;
+    LogsTransferProtocol requestedProtocol = 1;
+    OCTET_STRING transferFileDesignator = 2;
+  }
+
+  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+}
+
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
+  }
+
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
     kResettableOverTemp = 3;
@@ -563,598 +868,59 @@ server cluster GeneralDiagnostics = 51 {
   command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
-  }
-
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
-    fabric_idx fabricIndex = 254;
+server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
   }
 
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
+  struct ThreadMetrics {
+    int64u id = 0;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
-  struct GroupKeySetStruct {
-    int16u groupKeySetID = 0;
-    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
-    nullable octet_string<16> epochKey0 = 2;
-    nullable epoch_us epochStartTime0 = 3;
-    nullable octet_string<16> epochKey1 = 4;
-    nullable epoch_us epochStartTime1 = 5;
-    nullable octet_string<16> epochKey2 = 6;
-    nullable epoch_us epochStartTime2 = 7;
+  info event SoftwareFault = 0 {
+    SoftwareFaultStruct softwareFault = 0;
   }
 
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
-  readonly attribute int16u maxGroupsPerFabric = 2;
-  readonly attribute int16u maxGroupKeysPerFabric = 3;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute ThreadMetrics threadMetrics[] = 0;
+  readonly attribute int64u currentHeapFree = 1;
+  readonly attribute int64u currentHeapUsed = 2;
+  readonly attribute int64u currentHeapHighWatermark = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct KeySetWriteRequest {
-    GroupKeySetStruct groupKeySet = 0;
-  }
-
-  request struct KeySetReadRequest {
-    INT16U groupKeySetID = 0;
-  }
-
-  request struct KeySetRemoveRequest {
-    INT16U groupKeySetID = 0;
+server cluster ThreadNetworkDiagnostics = 53 {
+  enum NetworkFault : ENUM8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
   }
 
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
+  enum RoutingRole : ENUM8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kReed = 4;
+    kRouter = 5;
+    kLeader = 6;
   }
 
-  response struct KeySetReadResponse = 2 {
-    GroupKeySetStruct groupKeySet = 0;
+  enum ThreadConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  response struct KeySetReadAllIndicesResponse = 5 {
-    INT16U groupKeySetIDs[] = 0;
-  }
-
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
-}
-
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
-  }
-
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
-  }
-
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
-  }
-
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
-  }
-
-  request struct TriggerEffectRequest {
-    IdentifyEffectIdentifier effectIdentifier = 0;
-    IdentifyEffectVariant effectVariant = 1;
-  }
-
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
-  command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
-}
-
-server cluster LevelControl = 8 {
-  enum MoveMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
-  }
-
-  enum StepMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
-  }
-
-  bitmap LevelControlFeature : BITMAP32 {
-    kOnOff = 0x1;
-    kLighting = 0x2;
-    kFrequency = 0x4;
-  }
-
-  readonly attribute int8u currentLevel = 0;
-  readonly attribute int16u remainingTime = 1;
-  readonly attribute int8u minLevel = 2;
-  readonly attribute int8u maxLevel = 3;
-  readonly attribute int16u currentFrequency = 4;
-  readonly attribute int16u minFrequency = 5;
-  readonly attribute int16u maxFrequency = 6;
-  attribute bitmap8 options = 15;
-  attribute int16u onOffTransitionTime = 16;
-  attribute nullable int8u onLevel = 17;
-  attribute nullable int16u onTransitionTime = 18;
-  attribute nullable int16u offTransitionTime = 19;
-  attribute nullable int8u defaultMoveRate = 20;
-  attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct MoveToLevelRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
-  }
-
-  request struct MoveRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
-  }
-
-  request struct StepRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionMask = 3;
-    BITMAP8 optionOverride = 4;
-  }
-
-  request struct StopRequest {
-    BITMAP8 optionMask = 0;
-    BITMAP8 optionOverride = 1;
-  }
-
-  request struct MoveToLevelWithOnOffRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
-  }
-
-  request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
-  }
-
-  request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
-  }
-
-  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
-  command Move(MoveRequest): DefaultSuccess = 1;
-  command Step(StepRequest): DefaultSuccess = 2;
-  command Stop(StopRequest): DefaultSuccess = 3;
-  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
-  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
-  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
-  command StopWithOnOff(): DefaultSuccess = 7;
-}
-
-server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatus : ENUM8 {
-    kSuccess = 0;
-    kOutOfRange = 1;
-    kBoundsExceeded = 2;
-    kNetworkIDNotFound = 3;
-    kDuplicateNetworkID = 4;
-    kNetworkNotFound = 5;
-    kRegulatoryError = 6;
-    kAuthFailure = 7;
-    kUnsupportedSecurity = 8;
-    kOtherConnectionFailure = 9;
-    kIPV6Failed = 10;
-    kIPBindFailed = 11;
-    kUnknownError = 12;
-  }
-
-  enum WiFiBand : ENUM8 {
-    k2g4 = 0;
-    k3g65 = 1;
-    k5g = 2;
-    k6g = 3;
-    k60g = 4;
-  }
-
-  bitmap NetworkCommissioningFeature : BITMAP32 {
-    kWiFiNetworkInterface = 0x1;
-    kThreadNetworkInterface = 0x2;
-    kEthernetNetworkInterface = 0x4;
-  }
-
-  bitmap WiFiSecurity : BITMAP8 {
-    kUnencrypted = 0x1;
-    kWepPersonal = 0x2;
-    kWpaPersonal = 0x4;
-    kWpa2Personal = 0x8;
-    kWpa3Personal = 0x10;
-  }
-
-  struct NetworkInfo {
-    octet_string<32> networkID = 0;
-    boolean connected = 1;
-  }
-
-  struct WiFiInterfaceScanResult {
-    WiFiSecurity security = 0;
-    octet_string<32> ssid = 1;
-    octet_string<6> bssid = 2;
-    int16u channel = 3;
-    WiFiBand wiFiBand = 4;
-    int8s rssi = 5;
-  }
-
-  struct ThreadInterfaceScanResult {
-    int16u panId = 0;
-    int64u extendedPanId = 1;
-    char_string<16> networkName = 2;
-    int16u channel = 3;
-    int8u version = 4;
-    octet_string<8> extendedAddress = 5;
-    int8s rssi = 6;
-    int8u lqi = 7;
-  }
-
-  readonly attribute access(read: administer) int8u maxNetworks = 0;
-  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
-  readonly attribute int8u scanMaxTimeSeconds = 2;
-  readonly attribute int8u connectMaxTimeSeconds = 3;
-  attribute access(write: administer) boolean interfaceEnabled = 4;
-  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
-  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
-  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct ScanNetworksRequest {
-    optional nullable OCTET_STRING ssid = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct AddOrUpdateWiFiNetworkRequest {
-    OCTET_STRING ssid = 0;
-    OCTET_STRING credentials = 1;
-    optional INT64U breadcrumb = 2;
-  }
-
-  request struct AddOrUpdateThreadNetworkRequest {
-    OCTET_STRING operationalDataset = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct RemoveNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct ConnectNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct ReorderNetworkRequest {
-    OCTET_STRING networkID = 0;
-    INT8U networkIndex = 1;
-    optional INT64U breadcrumb = 2;
-  }
-
-  response struct ScanNetworksResponse = 1 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
-    optional ThreadInterfaceScanResult threadScanResults[] = 3;
-  }
-
-  response struct NetworkConfigResponse = 5 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional INT8U networkIndex = 2;
-  }
-
-  response struct ConnectNetworkResponse = 7 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    nullable INT32S errorValue = 2;
-  }
-
-  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
-  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
-  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
-  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
-  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
-  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
-}
-
-server cluster OnOff = 6 {
-  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
-    kFadeToOffIn0p8Seconds = 0;
-    kNoFade = 1;
-    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
-  }
-
-  enum OnOffDyingLightEffectVariant : ENUM8 {
-    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
-  }
-
-  enum OnOffEffectIdentifier : ENUM8 {
-    kDelayedAllOff = 0;
-    kDyingLight = 1;
-  }
-
-  enum OnOffStartUpOnOff : ENUM8 {
-    kOff = 0;
-    kOn = 1;
-    kTogglePreviousOnOff = 2;
-  }
-
-  bitmap OnOffControl : BITMAP8 {
-    kAcceptOnlyWhenOn = 0x1;
-  }
-
-  bitmap OnOffFeature : BITMAP32 {
-    kLighting = 0x1;
-  }
-
-  bitmap SceneFeatures : BITMAP32 {
-    kSceneNames = 0x1;
-  }
-
-  readonly attribute boolean onOff = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command Off(): DefaultSuccess = 0;
-  command On(): DefaultSuccess = 1;
-  command Toggle(): DefaultSuccess = 2;
-}
-
-server cluster OperationalCredentials = 62 {
-  enum OperationalCertStatus : ENUM8 {
-    kSuccess = 0;
-    kInvalidPublicKey = 1;
-    kInvalidNodeOpId = 2;
-    kInvalidNOC = 3;
-    kMissingCsr = 4;
-    kTableFull = 5;
-    kInvalidAdminSubject = 6;
-    kInsufficientPrivilege = 8;
-    kFabricConflict = 9;
-    kLabelConflict = 10;
-    kInvalidFabricIndex = 11;
-  }
-
-  struct NOCStruct {
-    octet_string noc = 1;
-    nullable octet_string icac = 2;
-    fabric_idx fabricIndex = 254;
-  }
-
-  struct FabricDescriptor {
-    octet_string<65> rootPublicKey = 1;
-    vendor_id vendorId = 2;
-    fabric_id fabricId = 3;
-    node_id nodeId = 4;
-    char_string<32> label = 5;
-    fabric_idx fabricIndex = 254;
-  }
-
-  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
-  readonly attribute FabricDescriptor fabrics[] = 1;
-  readonly attribute int8u supportedFabrics = 2;
-  readonly attribute int8u commissionedFabrics = 3;
-  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
-  readonly attribute fabric_idx currentFabricIndex = 5;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AttestationRequestRequest {
-    OCTET_STRING attestationNonce = 0;
-  }
-
-  request struct CertificateChainRequestRequest {
-    INT8U certificateType = 0;
-  }
-
-  request struct CSRRequestRequest {
-    OCTET_STRING CSRNonce = 0;
-    optional boolean isForUpdateNOC = 1;
-  }
-
-  request struct AddNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
-    OCTET_STRING IPKValue = 2;
-    Int64u caseAdminSubject = 3;
-    VENDOR_ID adminVendorId = 4;
-  }
-
-  request struct UpdateNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
-  }
-
-  request struct UpdateFabricLabelRequest {
-    CHAR_STRING label = 0;
-  }
-
-  request struct RemoveFabricRequest {
-    fabric_idx fabricIndex = 0;
-  }
-
-  request struct AddTrustedRootCertificateRequest {
-    OCTET_STRING rootCertificate = 0;
-  }
-
-  response struct AttestationResponse = 1 {
-    OCTET_STRING attestationElements = 0;
-    OCTET_STRING signature = 1;
-  }
-
-  response struct CertificateChainResponse = 3 {
-    OCTET_STRING certificate = 0;
-  }
-
-  response struct CSRResponse = 5 {
-    OCTET_STRING NOCSRElements = 0;
-    OCTET_STRING attestationSignature = 1;
-  }
-
-  response struct NOCResponse = 8 {
-    OperationalCertStatus statusCode = 0;
-    optional fabric_idx fabricIndex = 1;
-    optional CHAR_STRING debugText = 2;
-  }
-
-  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
-  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
-  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
-  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
-  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
-  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
-  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
-  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-}
-
-server cluster SoftwareDiagnostics = 52 {
-  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
-    kWaterMarks = 0x1;
-  }
-
-  struct ThreadMetrics {
-    int64u id = 0;
-    optional char_string<8> name = 1;
-    optional int32u stackFreeCurrent = 2;
-    optional int32u stackFreeMinimum = 3;
-    optional int32u stackSize = 4;
-  }
-
-  info event SoftwareFault = 0 {
-    SoftwareFaultStruct softwareFault = 0;
-  }
-
-  readonly attribute ThreadMetrics threadMetrics[] = 0;
-  readonly attribute int64u currentHeapFree = 1;
-  readonly attribute int64u currentHeapUsed = 2;
-  readonly attribute int64u currentHeapHighWatermark = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster Switch = 59 {
-  info event SwitchLatched = 0 {
-    INT8U newPosition = 0;
-  }
-
-  info event InitialPress = 1 {
-    INT8U newPosition = 0;
-  }
-
-  info event LongPress = 2 {
-    INT8U newPosition = 0;
-  }
-
-  info event ShortRelease = 3 {
-    INT8U previousPosition = 0;
-  }
-
-  info event LongRelease = 4 {
-    INT8U previousPosition = 0;
-  }
-
-  info event MultiPressOngoing = 5 {
-    INT8U newPosition = 0;
-    INT8U currentNumberOfPressesCounted = 1;
-  }
-
-  info event MultiPressComplete = 6 {
-    INT8U newPosition = 0;
-    INT8U totalNumberOfPressesCounted = 1;
-  }
-
-  readonly attribute int8u numberOfPositions = 0;
-  readonly attribute int8u currentPosition = 1;
-  readonly attribute int8u multiPressMax = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster ThreadNetworkDiagnostics = 53 {
-  enum NetworkFault : ENUM8 {
-    kUnspecified = 0;
-    kLinkDown = 1;
-    kHardwareFailure = 2;
-    kNetworkJammed = 3;
-  }
-
-  enum RoutingRole : ENUM8 {
-    kUnspecified = 0;
-    kUnassigned = 1;
-    kSleepyEndDevice = 2;
-    kEndDevice = 3;
-    kReed = 4;
-    kRouter = 5;
-    kLeader = 6;
-  }
-
-  enum ThreadConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
-  }
-
-  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
-    kPacketCounts = 0x1;
-    kErrorCounts = 0x2;
-    kMLECounts = 0x4;
-    kMACCounts = 0x8;
+  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+    kMLECounts = 0x4;
+    kMACCounts = 0x8;
   }
 
   struct NeighborTable {
@@ -1278,124 +1044,358 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
+server cluster WiFiNetworkDiagnostics = 54 {
+  enum AssociationFailureCause : ENUM8 {
+    kUnknown = 0;
+    kAssociationFailed = 1;
+    kAuthenticationFailed = 2;
+    kSsidNotFound = 3;
+  }
+
+  enum SecurityType : ENUM8 {
+    kUnspecified = 0;
+    kNone = 1;
+    kWep = 2;
+    kWpa = 3;
+    kWpa2 = 4;
+    kWpa3 = 5;
+  }
+
+  enum WiFiConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
+  }
+
+  enum WiFiVersionType : ENUM8 {
+    k80211a = 0;
+    k80211b = 1;
+    k80211g = 2;
+    k80211n = 3;
+    k80211ac = 4;
+    k80211ax = 5;
+  }
+
+  info event Disconnection = 0 {
+    INT16U reasonCode = 0;
+  }
+
+  info event AssociationFailure = 1 {
+    AssociationFailureCause associationFailure = 0;
+    INT16U status = 1;
+  }
+
+  info event ConnectionStatus = 2 {
+    WiFiConnectionStatus connectionStatus = 0;
+  }
+
+  readonly attribute nullable octet_string<6> bssid = 0;
+  readonly attribute nullable SecurityType securityType = 1;
+  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
+  readonly attribute nullable int16u channelNumber = 3;
+  readonly attribute nullable int8s rssi = 4;
+  readonly attribute int32u beaconLostCount = 5;
+  readonly attribute int32u beaconRxCount = 6;
+  readonly attribute int32u packetMulticastRxCount = 7;
+  readonly attribute int32u packetMulticastTxCount = 8;
+  readonly attribute int32u packetUnicastRxCount = 9;
+  readonly attribute int32u packetUnicastTxCount = 10;
+  readonly attribute int64u currentMaxRate = 11;
+  readonly attribute int64u overrunCount = 12;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
+  }
+
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Switch = 59 {
+  info event SwitchLatched = 0 {
+    INT8U newPosition = 0;
+  }
+
+  info event InitialPress = 1 {
+    INT8U newPosition = 0;
+  }
+
+  info event LongPress = 2 {
+    INT8U newPosition = 0;
+  }
+
+  info event ShortRelease = 3 {
+    INT8U previousPosition = 0;
+  }
+
+  info event LongRelease = 4 {
+    INT8U previousPosition = 0;
+  }
+
+  info event MultiPressOngoing = 5 {
+    INT8U newPosition = 0;
+    INT8U currentNumberOfPressesCounted = 1;
+  }
+
+  info event MultiPressComplete = 6 {
+    INT8U newPosition = 0;
+    INT8U totalNumberOfPressesCounted = 1;
+  }
+
+  readonly attribute int8u numberOfPositions = 0;
+  readonly attribute int8u currentPosition = 1;
+  readonly attribute int8u multiPressMax = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
   }
 
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
   }
 
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
+  }
+
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+  }
+
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
-server cluster UnitLocalization = 45 {
-  enum TempUnit : ENUM8 {
-    kFahrenheit = 0;
-    kCelsius = 1;
-    kKelvin = 2;
+server cluster OperationalCredentials = 62 {
+  enum OperationalCertStatus : ENUM8 {
+    kSuccess = 0;
+    kInvalidPublicKey = 1;
+    kInvalidNodeOpId = 2;
+    kInvalidNOC = 3;
+    kMissingCsr = 4;
+    kTableFull = 5;
+    kInvalidAdminSubject = 6;
+    kInsufficientPrivilege = 8;
+    kFabricConflict = 9;
+    kLabelConflict = 10;
+    kInvalidFabricIndex = 11;
   }
 
-  bitmap UnitLocalizationFeature : BITMAP32 {
-    kTemperatureUnit = 0x1;
+  struct NOCStruct {
+    octet_string noc = 1;
+    nullable octet_string icac = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  attribute TempUnit temperatureUnit = 0;
+  struct FabricDescriptor {
+    octet_string<65> rootPublicKey = 1;
+    vendor_id vendorId = 2;
+    fabric_id fabricId = 3;
+    node_id nodeId = 4;
+    char_string<32> label = 5;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
+  readonly attribute FabricDescriptor fabrics[] = 1;
+  readonly attribute int8u supportedFabrics = 2;
+  readonly attribute int8u commissionedFabrics = 3;
+  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
+  readonly attribute fabric_idx currentFabricIndex = 5;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct AttestationRequestRequest {
+    OCTET_STRING attestationNonce = 0;
+  }
+
+  request struct CertificateChainRequestRequest {
+    INT8U certificateType = 0;
+  }
+
+  request struct CSRRequestRequest {
+    OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
+  }
+
+  request struct AddNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+    OCTET_STRING IPKValue = 2;
+    Int64u caseAdminSubject = 3;
+    VENDOR_ID adminVendorId = 4;
+  }
+
+  request struct UpdateNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+  }
+
+  request struct UpdateFabricLabelRequest {
+    CHAR_STRING label = 0;
+  }
+
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
+  }
+
+  request struct AddTrustedRootCertificateRequest {
+    OCTET_STRING rootCertificate = 0;
+  }
+
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
+  }
+
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
+  }
+
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
+  }
+
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
+  }
+
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
 }
 
-server cluster UserLabel = 65 {
-  struct LabelStruct {
-    char_string<16> label = 0;
-    char_string<16> value = 1;
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
   }
 
-  attribute access(write: manage) LabelStruct labelList[] = 0;
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCause : ENUM8 {
-    kUnknown = 0;
-    kAssociationFailed = 1;
-    kAuthenticationFailed = 2;
-    kSsidNotFound = 3;
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  enum SecurityType : ENUM8 {
-    kUnspecified = 0;
-    kNone = 1;
-    kWep = 2;
-    kWpa = 3;
-    kWpa2 = 4;
-    kWpa3 = 5;
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  enum WiFiConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  enum WiFiVersionType : ENUM8 {
-    k80211a = 0;
-    k80211b = 1;
-    k80211g = 2;
-    k80211n = 3;
-    k80211ac = 4;
-    k80211ax = 5;
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  info event Disconnection = 0 {
-    INT16U reasonCode = 0;
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  info event AssociationFailure = 1 {
-    AssociationFailureCause associationFailure = 0;
-    INT16U status = 1;
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  info event ConnectionStatus = 2 {
-    WiFiConnectionStatus connectionStatus = 0;
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
+
+server cluster UserLabel = 65 {
+  struct LabelStruct {
+    char_string<16> label = 0;
+    char_string<16> value = 1;
   }
 
-  readonly attribute nullable octet_string<6> bssid = 0;
-  readonly attribute nullable SecurityType securityType = 1;
-  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
-  readonly attribute nullable int16u channelNumber = 3;
-  readonly attribute nullable int8s rssi = 4;
-  readonly attribute int32u beaconLostCount = 5;
-  readonly attribute int32u beaconRxCount = 6;
-  readonly attribute int32u packetMulticastRxCount = 7;
-  readonly attribute int32u packetMulticastTxCount = 8;
-  readonly attribute int32u packetUnicastRxCount = 9;
-  readonly attribute int32u packetUnicastTxCount = 10;
-  readonly attribute int64u currentMaxRate = 11;
-  readonly attribute int64u overrunCount = 12;
+  attribute access(write: manage) LabelStruct labelList[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
diff --git a/examples/chef/devices/rootnode_contactsensor_DreXRHtsq9.matter b/examples/chef/devices/rootnode_contactsensor_DreXRHtsq9.matter
index 56d1bfa23d0c6e..b02628c964f018 100644
--- a/examples/chef/devices/rootnode_contactsensor_DreXRHtsq9.matter
+++ b/examples/chef/devices/rootnode_contactsensor_DreXRHtsq9.matter
@@ -6,6 +6,136 @@ struct LabelStruct {
     char_string<16> value = 1;
 }
 
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
+  }
+
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
+  }
+
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
+  }
+
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
+  }
+
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+}
+
+server cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AddGroupRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
+
+  request struct ViewGroupRequest {
+    group_id groupId = 0;
+  }
+
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
+  }
+
+  request struct RemoveGroupRequest {
+    group_id groupId = 0;
+  }
+
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
+
+  response struct AddGroupResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  response struct ViewGroupResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    CHAR_STRING groupName = 2;
+  }
+
+  response struct GetGroupMembershipResponse = 2 {
+    nullable INT8U capacity = 0;
+    group_id groupList[] = 1;
+  }
+
+  response struct RemoveGroupResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
+}
+
+server cluster Descriptor = 29 {
+  struct DeviceType {
+    devtype_id type = 0;
+    int16u revision = 1;
+  }
+
+  readonly attribute DeviceType deviceList[] = 0;
+  readonly attribute CLUSTER_ID serverList[] = 1;
+  readonly attribute CLUSTER_ID clientList[] = 2;
+  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+client cluster Binding = 30 {
+  struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  attribute TargetStruct binding[] = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
 server cluster AccessControl = 31 {
   enum AuthMode : ENUM8 {
     kPase = 1;
@@ -69,42 +199,6 @@ server cluster AccessControl = 31 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
-  }
-
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
-  }
-
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
-  }
-
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-  }
-
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
-
 server cluster Basic = 40 {
   critical event StartUp = 0 {
     INT32U softwareVersion = 0;
@@ -143,115 +237,171 @@ server cluster Basic = 40 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-client cluster Binding = 30 {
-  struct TargetStruct {
-    optional node_id node = 1;
-    optional group_id group = 2;
-    optional endpoint_no endpoint = 3;
-    optional cluster_id cluster = 4;
-    fabric_idx fabricIndex = 254;
+client cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
   }
 
-  attribute TargetStruct binding[] = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster BooleanState = 69 {
-  info event StateChange = 0 {
-    boolean stateValue = 0;
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
   }
 
-  readonly attribute boolean stateValue = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster Descriptor = 29 {
-  struct DeviceType {
-    devtype_id type = 0;
-    int16u revision = 1;
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
   }
 
-  readonly attribute DeviceType deviceList[] = 0;
-  readonly attribute CLUSTER_ID serverList[] = 1;
-  readonly attribute CLUSTER_ID clientList[] = 2;
-  readonly attribute ENDPOINT_NO partsList[] = 3;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster DiagnosticLogs = 50 {
-  enum LogsIntent : ENUM8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
   }
 
-  enum LogsStatus : ENUM8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
   }
 
-  enum LogsTransferProtocol : ENUM8 {
-    kResponsePayload = 0;
-    kBdx = 1;
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
   }
 
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct RetrieveLogsRequestRequest {
-    LogsIntent intent = 0;
-    LogsTransferProtocol requestedProtocol = 1;
-    OCTET_STRING transferFileDesignator = 2;
-  }
+  response struct QueryImageResponse = 1 {
+    OTAQueryStatus status = 0;
+    optional INT32U delayedActionTime = 1;
+    optional CHAR_STRING imageURI = 2;
+    optional INT32U softwareVersion = 3;
+    optional CHAR_STRING softwareVersionString = 4;
+    optional OCTET_STRING updateToken = 5;
+    optional BOOLEAN userConsentNeeded = 6;
+    optional OCTET_STRING metadataForRequestor = 7;
+  }
 
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
+  }
+
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
 }
 
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
+server cluster OtaSoftwareUpdateRequestor = 42 {
+  enum OTAAnnouncementReason : ENUM8 {
+    kSimpleAnnouncement = 0;
+    kUpdateAvailable = 1;
+    kUrgentUpdateAvailable = 2;
   }
 
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
+  enum OTAChangeReasonEnum : ENUM8 {
+    kUnknown = 0;
+    kSuccess = 1;
+    kFailure = 2;
+    kTimeOut = 3;
+    kDelayByProvider = 4;
+  }
+
+  enum OTAUpdateStateEnum : ENUM8 {
+    kUnknown = 0;
+    kIdle = 1;
+    kQuerying = 2;
+    kDelayedOnQuery = 3;
+    kDownloading = 4;
+    kApplying = 5;
+    kDelayedOnApply = 6;
+    kRollingBack = 7;
+    kDelayedOnUserConsent = 8;
+  }
+
+  struct ProviderLocation {
+    node_id providerNodeID = 1;
+    endpoint_no endpoint = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  info event StateTransition = 0 {
+    OTAUpdateStateEnum previousState = 0;
+    OTAUpdateStateEnum newState = 1;
+    OTAChangeReasonEnum reason = 2;
+    nullable INT32U targetSoftwareVersion = 3;
+  }
+
+  critical event VersionApplied = 1 {
+    INT32U softwareVersion = 0;
+    INT16U productID = 1;
+  }
+
+  info event DownloadError = 2 {
+    INT32U softwareVersion = 0;
+    INT64U bytesDownloaded = 1;
+    nullable INT8U progressPercent = 2;
+    nullable INT64S platformCode = 3;
+  }
+
+  attribute ProviderLocation defaultOtaProviders[] = 0;
+  readonly attribute boolean updatePossible = 1;
+  readonly attribute OTAUpdateStateEnum updateState = 2;
+  readonly attribute nullable int8u updateStateProgress = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  request struct AnnounceOtaProviderRequest {
+    node_id providerNodeId = 0;
+    vendor_id vendorId = 1;
+    OTAAnnouncementReason announcementReason = 2;
+    optional OCTET_STRING metadataForNode = 3;
+    endpoint_no endpoint = 4;
+  }
+
+  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
 }
 
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
+server cluster LocalizationConfiguration = 43 {
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
+  }
+
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
+  }
+
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
@@ -314,543 +464,613 @@ server cluster GeneralCommissioning = 48 {
   command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
 }
 
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatus : ENUM8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
   }
 
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
+  enum WiFiBand : ENUM8 {
+    k2g4 = 0;
+    k3g65 = 1;
+    k5g = 2;
+    k6g = 3;
+    k60g = 4;
   }
 
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
+  bitmap NetworkCommissioningFeature : BITMAP32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
   }
 
-  enum NetworkFaultType : ENUM8 {
-    kUnspecified = 0;
-    kHardwareFailure = 1;
-    kNetworkJammed = 2;
-    kConnectionFailed = 3;
+  bitmap WiFiSecurity : BITMAP8 {
+    kUnencrypted = 0x1;
+    kWepPersonal = 0x2;
+    kWpaPersonal = 0x4;
+    kWpa2Personal = 0x8;
+    kWpa3Personal = 0x10;
   }
 
-  enum RadioFaultType : ENUM8 {
-    kUnspecified = 0;
-    kWiFiFault = 1;
-    kCellularFault = 2;
-    kThreadFault = 3;
-    kNFCFault = 4;
-    kBLEFault = 5;
-    kEthernetFault = 6;
+  struct NetworkInfo {
+    octet_string<32> networkID = 0;
+    boolean connected = 1;
   }
 
-  struct NetworkInterfaceType {
-    char_string<32> name = 0;
-    boolean isOperational = 1;
-    nullable boolean offPremiseServicesReachableIPv4 = 2;
-    nullable boolean offPremiseServicesReachableIPv6 = 3;
-    octet_string<8> hardwareAddress = 4;
-    octet_string IPv4Addresses[] = 5;
-    octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+  struct WiFiInterfaceScanResult {
+    WiFiSecurity security = 0;
+    octet_string<32> ssid = 1;
+    octet_string<6> bssid = 2;
+    int16u channel = 3;
+    WiFiBand wiFiBand = 4;
+    int8s rssi = 5;
   }
 
-  critical event HardwareFaultChange = 0 {
-    HardwareFaultType current[] = 0;
-    HardwareFaultType previous[] = 1;
+  struct ThreadInterfaceScanResult {
+    int16u panId = 0;
+    int64u extendedPanId = 1;
+    char_string<16> networkName = 2;
+    int16u channel = 3;
+    int8u version = 4;
+    octet_string<8> extendedAddress = 5;
+    int8s rssi = 6;
+    int8u lqi = 7;
   }
 
-  critical event RadioFaultChange = 1 {
-    RadioFaultType current[] = 0;
-    RadioFaultType previous[] = 1;
+  readonly attribute access(read: administer) int8u maxNetworks = 0;
+  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
+  readonly attribute int8u scanMaxTimeSeconds = 2;
+  readonly attribute int8u connectMaxTimeSeconds = 3;
+  attribute access(write: administer) boolean interfaceEnabled = 4;
+  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
+  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
+  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ScanNetworksRequest {
+    optional nullable OCTET_STRING ssid = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+  request struct AddOrUpdateWiFiNetworkRequest {
+    OCTET_STRING ssid = 0;
+    OCTET_STRING credentials = 1;
+    optional INT64U breadcrumb = 2;
   }
 
-  critical event BootReason = 3 {
-    BootReasonType bootReason = 0;
+  request struct AddOrUpdateThreadNetworkRequest {
+    OCTET_STRING operationalDataset = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
-  readonly attribute int16u rebootCount = 1;
-  readonly attribute int64u upTime = 2;
-  readonly attribute int32u totalOperationalHours = 3;
-  readonly attribute enum8 bootReasons = 4;
-  readonly attribute ENUM8 activeHardwareFaults[] = 5;
-  readonly attribute ENUM8 activeRadioFaults[] = 6;
-  readonly attribute ENUM8 activeNetworkFaults[] = 7;
-  readonly attribute boolean testEventTriggersEnabled = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct TestEventTriggerRequest {
-    OCTET_STRING enableKey = 0;
-    INT64U eventTrigger = 1;
+  request struct RemoveNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
-}
-
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
+  request struct ConnectNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
-    fabric_idx fabricIndex = 254;
+  request struct ReorderNetworkRequest {
+    OCTET_STRING networkID = 0;
+    INT8U networkIndex = 1;
+    optional INT64U breadcrumb = 2;
   }
 
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
+  response struct ScanNetworksResponse = 1 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
+    optional ThreadInterfaceScanResult threadScanResults[] = 3;
   }
 
-  struct GroupKeySetStruct {
-    int16u groupKeySetID = 0;
-    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
-    nullable octet_string<16> epochKey0 = 2;
-    nullable epoch_us epochStartTime0 = 3;
-    nullable octet_string<16> epochKey1 = 4;
-    nullable epoch_us epochStartTime1 = 5;
-    nullable octet_string<16> epochKey2 = 6;
-    nullable epoch_us epochStartTime2 = 7;
+  response struct NetworkConfigResponse = 5 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional INT8U networkIndex = 2;
   }
 
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
-  readonly attribute int16u maxGroupsPerFabric = 2;
-  readonly attribute int16u maxGroupKeysPerFabric = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct KeySetWriteRequest {
-    GroupKeySetStruct groupKeySet = 0;
+  response struct ConnectNetworkResponse = 7 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    nullable INT32S errorValue = 2;
   }
 
-  request struct KeySetReadRequest {
-    INT16U groupKeySetID = 0;
-  }
+  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
+  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
+  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
+  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
+  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
+  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+}
 
-  request struct KeySetRemoveRequest {
-    INT16U groupKeySetID = 0;
+server cluster DiagnosticLogs = 50 {
+  enum LogsIntent : ENUM8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
   }
 
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
+  enum LogsStatus : ENUM8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
   }
 
-  response struct KeySetReadResponse = 2 {
-    GroupKeySetStruct groupKeySet = 0;
+  enum LogsTransferProtocol : ENUM8 {
+    kResponsePayload = 0;
+    kBdx = 1;
   }
 
-  response struct KeySetReadAllIndicesResponse = 5 {
-    INT16U groupKeySetIDs[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct RetrieveLogsRequestRequest {
+    LogsIntent intent = 0;
+    LogsTransferProtocol requestedProtocol = 1;
+    OCTET_STRING transferFileDesignator = 2;
   }
 
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
 }
 
-server cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
+  }
 
-  request struct AddGroupRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
   }
 
-  request struct ViewGroupRequest {
-    group_id groupId = 0;
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
   }
 
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
   }
 
-  request struct RemoveGroupRequest {
-    group_id groupId = 0;
+  enum RadioFaultType : ENUM8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
   }
 
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+  struct NetworkInterfaceType {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceType type = 7;
   }
 
-  response struct AddGroupResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultType current[] = 0;
+    HardwareFaultType previous[] = 1;
   }
 
-  response struct ViewGroupResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    CHAR_STRING groupName = 2;
+  critical event RadioFaultChange = 1 {
+    RadioFaultType current[] = 0;
+    RadioFaultType previous[] = 1;
   }
 
-  response struct GetGroupMembershipResponse = 2 {
-    nullable INT8U capacity = 0;
-    group_id groupList[] = 1;
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultType current[] = 0;
+    NetworkFaultType previous[] = 1;
   }
 
-  response struct RemoveGroupResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  critical event BootReason = 3 {
+    BootReasonType bootReason = 0;
   }
 
-  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
-}
+  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
+  readonly attribute int32u totalOperationalHours = 3;
+  readonly attribute enum8 bootReasons = 4;
+  readonly attribute ENUM8 activeHardwareFaults[] = 5;
+  readonly attribute ENUM8 activeRadioFaults[] = 6;
+  readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
   }
 
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
-  }
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+}
 
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
+server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
   }
 
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
+  struct ThreadMetrics {
+    int64u id = 0;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
-}
+  info event SoftwareFault = 0 {
+    SoftwareFaultStruct softwareFault = 0;
+  }
 
-server cluster LocalizationConfiguration = 43 {
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
+  readonly attribute ThreadMetrics threadMetrics[] = 0;
+  readonly attribute int64u currentHeapFree = 1;
+  readonly attribute int64u currentHeapUsed = 2;
+  readonly attribute int64u currentHeapHighWatermark = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatus : ENUM8 {
-    kSuccess = 0;
-    kOutOfRange = 1;
-    kBoundsExceeded = 2;
-    kNetworkIDNotFound = 3;
-    kDuplicateNetworkID = 4;
-    kNetworkNotFound = 5;
-    kRegulatoryError = 6;
-    kAuthFailure = 7;
-    kUnsupportedSecurity = 8;
-    kOtherConnectionFailure = 9;
-    kIPV6Failed = 10;
-    kIPBindFailed = 11;
-    kUnknownError = 12;
-  }
+  command ResetWatermarks(): DefaultSuccess = 0;
+}
 
-  enum WiFiBand : ENUM8 {
-    k2g4 = 0;
-    k3g65 = 1;
-    k5g = 2;
-    k6g = 3;
-    k60g = 4;
+server cluster ThreadNetworkDiagnostics = 53 {
+  enum NetworkFault : ENUM8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
   }
 
-  bitmap NetworkCommissioningFeature : BITMAP32 {
-    kWiFiNetworkInterface = 0x1;
-    kThreadNetworkInterface = 0x2;
-    kEthernetNetworkInterface = 0x4;
+  enum RoutingRole : ENUM8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kReed = 4;
+    kRouter = 5;
+    kLeader = 6;
   }
 
-  bitmap WiFiSecurity : BITMAP8 {
-    kUnencrypted = 0x1;
-    kWepPersonal = 0x2;
-    kWpaPersonal = 0x4;
-    kWpa2Personal = 0x8;
-    kWpa3Personal = 0x10;
+  enum ThreadConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  struct NetworkInfo {
-    octet_string<32> networkID = 0;
-    boolean connected = 1;
+  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+    kMLECounts = 0x4;
+    kMACCounts = 0x8;
   }
 
-  struct WiFiInterfaceScanResult {
-    WiFiSecurity security = 0;
-    octet_string<32> ssid = 1;
-    octet_string<6> bssid = 2;
-    int16u channel = 3;
-    WiFiBand wiFiBand = 4;
-    int8s rssi = 5;
+  struct NeighborTable {
+    int64u extAddress = 0;
+    int32u age = 1;
+    int16u rloc16 = 2;
+    int32u linkFrameCounter = 3;
+    int32u mleFrameCounter = 4;
+    int8u lqi = 5;
+    nullable int8s averageRssi = 6;
+    nullable int8s lastRssi = 7;
+    int8u frameErrorRate = 8;
+    int8u messageErrorRate = 9;
+    boolean rxOnWhenIdle = 10;
+    boolean fullThreadDevice = 11;
+    boolean fullNetworkData = 12;
+    boolean isChild = 13;
   }
 
-  struct ThreadInterfaceScanResult {
-    int16u panId = 0;
-    int64u extendedPanId = 1;
-    char_string<16> networkName = 2;
-    int16u channel = 3;
-    int8u version = 4;
-    octet_string<8> extendedAddress = 5;
-    int8s rssi = 6;
-    int8u lqi = 7;
+  struct RouteTable {
+    int64u extAddress = 0;
+    int16u rloc16 = 1;
+    int8u routerId = 2;
+    int8u nextHop = 3;
+    int8u pathCost = 4;
+    int8u LQIIn = 5;
+    int8u LQIOut = 6;
+    int8u age = 7;
+    boolean allocated = 8;
+    boolean linkEstablished = 9;
   }
 
-  readonly attribute access(read: administer) int8u maxNetworks = 0;
-  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
-  readonly attribute int8u scanMaxTimeSeconds = 2;
-  readonly attribute int8u connectMaxTimeSeconds = 3;
-  attribute access(write: administer) boolean interfaceEnabled = 4;
-  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
-  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
-  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct ScanNetworksRequest {
-    optional nullable OCTET_STRING ssid = 0;
-    optional INT64U breadcrumb = 1;
+  struct SecurityPolicy {
+    int16u rotationTime = 0;
+    bitmap16 flags = 1;
   }
 
-  request struct AddOrUpdateWiFiNetworkRequest {
-    OCTET_STRING ssid = 0;
-    OCTET_STRING credentials = 1;
-    optional INT64U breadcrumb = 2;
+  struct OperationalDatasetComponents {
+    boolean activeTimestampPresent = 0;
+    boolean pendingTimestampPresent = 1;
+    boolean masterKeyPresent = 2;
+    boolean networkNamePresent = 3;
+    boolean extendedPanIdPresent = 4;
+    boolean meshLocalPrefixPresent = 5;
+    boolean delayPresent = 6;
+    boolean panIdPresent = 7;
+    boolean channelPresent = 8;
+    boolean pskcPresent = 9;
+    boolean securityPolicyPresent = 10;
+    boolean channelMaskPresent = 11;
   }
 
-  request struct AddOrUpdateThreadNetworkRequest {
-    OCTET_STRING operationalDataset = 0;
-    optional INT64U breadcrumb = 1;
+  info event ConnectionStatus = 0 {
+    ThreadConnectionStatus connectionStatus = 0;
   }
 
-  request struct RemoveNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
-  }
+  readonly attribute nullable int16u channel = 0;
+  readonly attribute nullable RoutingRole routingRole = 1;
+  readonly attribute nullable char_string<16> networkName = 2;
+  readonly attribute nullable int16u panId = 3;
+  readonly attribute nullable int64u extendedPanId = 4;
+  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute NeighborTable neighborTableList[] = 7;
+  readonly attribute RouteTable routeTableList[] = 8;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
+  readonly attribute int16u detachedRoleCount = 14;
+  readonly attribute int16u childRoleCount = 15;
+  readonly attribute int16u routerRoleCount = 16;
+  readonly attribute int16u leaderRoleCount = 17;
+  readonly attribute int16u attachAttemptCount = 18;
+  readonly attribute int16u partitionIdChangeCount = 19;
+  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
+  readonly attribute int16u parentChangeCount = 21;
+  readonly attribute int32u txTotalCount = 22;
+  readonly attribute int32u txUnicastCount = 23;
+  readonly attribute int32u txBroadcastCount = 24;
+  readonly attribute int32u txAckRequestedCount = 25;
+  readonly attribute int32u txAckedCount = 26;
+  readonly attribute int32u txNoAckRequestedCount = 27;
+  readonly attribute int32u txDataCount = 28;
+  readonly attribute int32u txDataPollCount = 29;
+  readonly attribute int32u txBeaconCount = 30;
+  readonly attribute int32u txBeaconRequestCount = 31;
+  readonly attribute int32u txOtherCount = 32;
+  readonly attribute int32u txRetryCount = 33;
+  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
+  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
+  readonly attribute int32u txErrCcaCount = 36;
+  readonly attribute int32u txErrAbortCount = 37;
+  readonly attribute int32u txErrBusyChannelCount = 38;
+  readonly attribute int32u rxTotalCount = 39;
+  readonly attribute int32u rxUnicastCount = 40;
+  readonly attribute int32u rxBroadcastCount = 41;
+  readonly attribute int32u rxDataCount = 42;
+  readonly attribute int32u rxDataPollCount = 43;
+  readonly attribute int32u rxBeaconCount = 44;
+  readonly attribute int32u rxBeaconRequestCount = 45;
+  readonly attribute int32u rxOtherCount = 46;
+  readonly attribute int32u rxAddressFilteredCount = 47;
+  readonly attribute int32u rxDestAddrFilteredCount = 48;
+  readonly attribute int32u rxDuplicatedCount = 49;
+  readonly attribute int32u rxErrNoFrameCount = 50;
+  readonly attribute int32u rxErrUnknownNeighborCount = 51;
+  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
+  readonly attribute int32u rxErrSecCount = 53;
+  readonly attribute int32u rxErrFcsCount = 54;
+  readonly attribute int32u rxErrOtherCount = 55;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
+  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  request struct ConnectNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
-  }
+  command ResetCounts(): DefaultSuccess = 0;
+}
 
-  request struct ReorderNetworkRequest {
-    OCTET_STRING networkID = 0;
-    INT8U networkIndex = 1;
-    optional INT64U breadcrumb = 2;
+server cluster WiFiNetworkDiagnostics = 54 {
+  enum AssociationFailureCause : ENUM8 {
+    kUnknown = 0;
+    kAssociationFailed = 1;
+    kAuthenticationFailed = 2;
+    kSsidNotFound = 3;
   }
 
-  response struct ScanNetworksResponse = 1 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
-    optional ThreadInterfaceScanResult threadScanResults[] = 3;
+  enum SecurityType : ENUM8 {
+    kUnspecified = 0;
+    kNone = 1;
+    kWep = 2;
+    kWpa = 3;
+    kWpa2 = 4;
+    kWpa3 = 5;
   }
 
-  response struct NetworkConfigResponse = 5 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional INT8U networkIndex = 2;
+  enum WiFiConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  response struct ConnectNetworkResponse = 7 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    nullable INT32S errorValue = 2;
+  enum WiFiVersionType : ENUM8 {
+    k80211a = 0;
+    k80211b = 1;
+    k80211g = 2;
+    k80211n = 3;
+    k80211ac = 4;
+    k80211ax = 5;
   }
 
-  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
-  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
-  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
-  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
-  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
-  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
-}
-
-client cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
+  info event Disconnection = 0 {
+    INT16U reasonCode = 0;
   }
 
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
+  info event AssociationFailure = 1 {
+    AssociationFailureCause associationFailure = 0;
+    INT16U status = 1;
   }
 
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
+  info event ConnectionStatus = 2 {
+    WiFiConnectionStatus connectionStatus = 0;
   }
 
+  readonly attribute nullable octet_string<6> bssid = 0;
+  readonly attribute nullable SecurityType securityType = 1;
+  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
+  readonly attribute nullable int16u channelNumber = 3;
+  readonly attribute nullable int8s rssi = 4;
+  readonly attribute int32u beaconLostCount = 5;
+  readonly attribute int32u beaconRxCount = 6;
+  readonly attribute int32u packetMulticastRxCount = 7;
+  readonly attribute int32u packetMulticastTxCount = 8;
+  readonly attribute int32u packetUnicastRxCount = 9;
+  readonly attribute int32u packetUnicastTxCount = 10;
+  readonly attribute int64u currentMaxRate = 11;
+  readonly attribute int64u overrunCount = 12;
+  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
-  }
+  command ResetCounts(): DefaultSuccess = 0;
+}
 
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
   }
 
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
-  }
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command ResetCounts(): DefaultSuccess = 0;
+}
 
-  response struct QueryImageResponse = 1 {
-    OTAQueryStatus status = 0;
-    optional INT32U delayedActionTime = 1;
-    optional CHAR_STRING imageURI = 2;
-    optional INT32U softwareVersion = 3;
-    optional CHAR_STRING softwareVersionString = 4;
-    optional OCTET_STRING updateToken = 5;
-    optional BOOLEAN userConsentNeeded = 6;
-    optional OCTET_STRING metadataForRequestor = 7;
+server cluster Switch = 59 {
+  info event SwitchLatched = 0 {
+    INT8U newPosition = 0;
   }
 
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
+  info event InitialPress = 1 {
+    INT8U newPosition = 0;
   }
 
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
-}
-
-server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum OTAAnnouncementReason : ENUM8 {
-    kSimpleAnnouncement = 0;
-    kUpdateAvailable = 1;
-    kUrgentUpdateAvailable = 2;
+  info event LongPress = 2 {
+    INT8U newPosition = 0;
   }
 
-  enum OTAChangeReasonEnum : ENUM8 {
-    kUnknown = 0;
-    kSuccess = 1;
-    kFailure = 2;
-    kTimeOut = 3;
-    kDelayByProvider = 4;
+  info event ShortRelease = 3 {
+    INT8U previousPosition = 0;
   }
 
-  enum OTAUpdateStateEnum : ENUM8 {
-    kUnknown = 0;
-    kIdle = 1;
-    kQuerying = 2;
-    kDelayedOnQuery = 3;
-    kDownloading = 4;
-    kApplying = 5;
-    kDelayedOnApply = 6;
-    kRollingBack = 7;
-    kDelayedOnUserConsent = 8;
+  info event LongRelease = 4 {
+    INT8U previousPosition = 0;
   }
 
-  struct ProviderLocation {
-    node_id providerNodeID = 1;
-    endpoint_no endpoint = 2;
-    fabric_idx fabricIndex = 254;
+  info event MultiPressOngoing = 5 {
+    INT8U newPosition = 0;
+    INT8U currentNumberOfPressesCounted = 1;
   }
 
-  info event StateTransition = 0 {
-    OTAUpdateStateEnum previousState = 0;
-    OTAUpdateStateEnum newState = 1;
-    OTAChangeReasonEnum reason = 2;
-    nullable INT32U targetSoftwareVersion = 3;
+  info event MultiPressComplete = 6 {
+    INT8U newPosition = 0;
+    INT8U totalNumberOfPressesCounted = 1;
   }
 
-  critical event VersionApplied = 1 {
-    INT32U softwareVersion = 0;
-    INT16U productID = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
   }
 
-  info event DownloadError = 2 {
-    INT32U softwareVersion = 0;
-    INT64U bytesDownloaded = 1;
-    nullable INT8U progressPercent = 2;
-    nullable INT64S platformCode = 3;
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
   }
 
-  attribute ProviderLocation defaultOtaProviders[] = 0;
-  readonly attribute boolean updatePossible = 1;
-  readonly attribute OTAUpdateStateEnum updateState = 2;
-  readonly attribute nullable int8u updateStateProgress = 3;
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AnnounceOtaProviderRequest {
-    node_id providerNodeId = 0;
-    vendor_id vendorId = 1;
-    OTAAnnouncementReason announcementReason = 2;
-    optional OCTET_STRING metadataForNode = 3;
-    endpoint_no endpoint = 4;
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
   }
 
-  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+  }
+
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
 server cluster OperationalCredentials = 62 {
@@ -923,353 +1143,133 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct RemoveFabricRequest {
-    fabric_idx fabricIndex = 0;
-  }
-
-  request struct AddTrustedRootCertificateRequest {
-    OCTET_STRING rootCertificate = 0;
-  }
-
-  response struct AttestationResponse = 1 {
-    OCTET_STRING attestationElements = 0;
-    OCTET_STRING signature = 1;
-  }
-
-  response struct CertificateChainResponse = 3 {
-    OCTET_STRING certificate = 0;
-  }
-
-  response struct CSRResponse = 5 {
-    OCTET_STRING NOCSRElements = 0;
-    OCTET_STRING attestationSignature = 1;
-  }
-
-  response struct NOCResponse = 8 {
-    OperationalCertStatus statusCode = 0;
-    optional fabric_idx fabricIndex = 1;
-    optional CHAR_STRING debugText = 2;
-  }
-
-  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
-  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
-  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
-  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
-  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
-  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
-  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
-  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-}
-
-server cluster SoftwareDiagnostics = 52 {
-  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
-    kWaterMarks = 0x1;
-  }
-
-  struct ThreadMetrics {
-    int64u id = 0;
-    optional char_string<8> name = 1;
-    optional int32u stackFreeCurrent = 2;
-    optional int32u stackFreeMinimum = 3;
-    optional int32u stackSize = 4;
-  }
-
-  info event SoftwareFault = 0 {
-    SoftwareFaultStruct softwareFault = 0;
-  }
-
-  readonly attribute ThreadMetrics threadMetrics[] = 0;
-  readonly attribute int64u currentHeapFree = 1;
-  readonly attribute int64u currentHeapUsed = 2;
-  readonly attribute int64u currentHeapHighWatermark = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command ResetWatermarks(): DefaultSuccess = 0;
-}
-
-server cluster Switch = 59 {
-  info event SwitchLatched = 0 {
-    INT8U newPosition = 0;
-  }
-
-  info event InitialPress = 1 {
-    INT8U newPosition = 0;
-  }
-
-  info event LongPress = 2 {
-    INT8U newPosition = 0;
-  }
-
-  info event ShortRelease = 3 {
-    INT8U previousPosition = 0;
-  }
-
-  info event LongRelease = 4 {
-    INT8U previousPosition = 0;
-  }
-
-  info event MultiPressOngoing = 5 {
-    INT8U newPosition = 0;
-    INT8U currentNumberOfPressesCounted = 1;
-  }
-
-  info event MultiPressComplete = 6 {
-    INT8U newPosition = 0;
-    INT8U totalNumberOfPressesCounted = 1;
-  }
-
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster ThreadNetworkDiagnostics = 53 {
-  enum NetworkFault : ENUM8 {
-    kUnspecified = 0;
-    kLinkDown = 1;
-    kHardwareFailure = 2;
-    kNetworkJammed = 3;
-  }
-
-  enum RoutingRole : ENUM8 {
-    kUnspecified = 0;
-    kUnassigned = 1;
-    kSleepyEndDevice = 2;
-    kEndDevice = 3;
-    kReed = 4;
-    kRouter = 5;
-    kLeader = 6;
-  }
-
-  enum ThreadConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
-  }
-
-  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
-    kPacketCounts = 0x1;
-    kErrorCounts = 0x2;
-    kMLECounts = 0x4;
-    kMACCounts = 0x8;
-  }
-
-  struct NeighborTable {
-    int64u extAddress = 0;
-    int32u age = 1;
-    int16u rloc16 = 2;
-    int32u linkFrameCounter = 3;
-    int32u mleFrameCounter = 4;
-    int8u lqi = 5;
-    nullable int8s averageRssi = 6;
-    nullable int8s lastRssi = 7;
-    int8u frameErrorRate = 8;
-    int8u messageErrorRate = 9;
-    boolean rxOnWhenIdle = 10;
-    boolean fullThreadDevice = 11;
-    boolean fullNetworkData = 12;
-    boolean isChild = 13;
+    fabric_idx fabricIndex = 0;
   }
 
-  struct RouteTable {
-    int64u extAddress = 0;
-    int16u rloc16 = 1;
-    int8u routerId = 2;
-    int8u nextHop = 3;
-    int8u pathCost = 4;
-    int8u LQIIn = 5;
-    int8u LQIOut = 6;
-    int8u age = 7;
-    boolean allocated = 8;
-    boolean linkEstablished = 9;
+  request struct AddTrustedRootCertificateRequest {
+    OCTET_STRING rootCertificate = 0;
   }
 
-  struct SecurityPolicy {
-    int16u rotationTime = 0;
-    bitmap16 flags = 1;
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
   }
 
-  struct OperationalDatasetComponents {
-    boolean activeTimestampPresent = 0;
-    boolean pendingTimestampPresent = 1;
-    boolean masterKeyPresent = 2;
-    boolean networkNamePresent = 3;
-    boolean extendedPanIdPresent = 4;
-    boolean meshLocalPrefixPresent = 5;
-    boolean delayPresent = 6;
-    boolean panIdPresent = 7;
-    boolean channelPresent = 8;
-    boolean pskcPresent = 9;
-    boolean securityPolicyPresent = 10;
-    boolean channelMaskPresent = 11;
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
   }
 
-  info event ConnectionStatus = 0 {
-    ThreadConnectionStatus connectionStatus = 0;
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
   }
 
-  readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable RoutingRole routingRole = 1;
-  readonly attribute nullable char_string<16> networkName = 2;
-  readonly attribute nullable int16u panId = 3;
-  readonly attribute nullable int64u extendedPanId = 4;
-  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute NeighborTable neighborTableList[] = 7;
-  readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
-  readonly attribute nullable int8u leaderRouterId = 13;
-  readonly attribute int16u detachedRoleCount = 14;
-  readonly attribute int16u childRoleCount = 15;
-  readonly attribute int16u routerRoleCount = 16;
-  readonly attribute int16u leaderRoleCount = 17;
-  readonly attribute int16u attachAttemptCount = 18;
-  readonly attribute int16u partitionIdChangeCount = 19;
-  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
-  readonly attribute int16u parentChangeCount = 21;
-  readonly attribute int32u txTotalCount = 22;
-  readonly attribute int32u txUnicastCount = 23;
-  readonly attribute int32u txBroadcastCount = 24;
-  readonly attribute int32u txAckRequestedCount = 25;
-  readonly attribute int32u txAckedCount = 26;
-  readonly attribute int32u txNoAckRequestedCount = 27;
-  readonly attribute int32u txDataCount = 28;
-  readonly attribute int32u txDataPollCount = 29;
-  readonly attribute int32u txBeaconCount = 30;
-  readonly attribute int32u txBeaconRequestCount = 31;
-  readonly attribute int32u txOtherCount = 32;
-  readonly attribute int32u txRetryCount = 33;
-  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
-  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
-  readonly attribute int32u txErrCcaCount = 36;
-  readonly attribute int32u txErrAbortCount = 37;
-  readonly attribute int32u txErrBusyChannelCount = 38;
-  readonly attribute int32u rxTotalCount = 39;
-  readonly attribute int32u rxUnicastCount = 40;
-  readonly attribute int32u rxBroadcastCount = 41;
-  readonly attribute int32u rxDataCount = 42;
-  readonly attribute int32u rxDataPollCount = 43;
-  readonly attribute int32u rxBeaconCount = 44;
-  readonly attribute int32u rxBeaconRequestCount = 45;
-  readonly attribute int32u rxOtherCount = 46;
-  readonly attribute int32u rxAddressFilteredCount = 47;
-  readonly attribute int32u rxDestAddrFilteredCount = 48;
-  readonly attribute int32u rxDuplicatedCount = 49;
-  readonly attribute int32u rxErrNoFrameCount = 50;
-  readonly attribute int32u rxErrUnknownNeighborCount = 51;
-  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
-  readonly attribute int32u rxErrSecCount = 53;
-  readonly attribute int32u rxErrFcsCount = 54;
-  readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute nullable int64u activeTimestamp = 56;
-  readonly attribute nullable int64u pendingTimestamp = 57;
-  readonly attribute nullable int32u delay = 58;
-  readonly attribute nullable SecurityPolicy securityPolicy = 59;
-  readonly attribute nullable octet_string<4> channelMask = 60;
-  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
-  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
+  }
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
 }
 
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
   }
 
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
 
-server cluster UserLabel = 65 {
-  attribute access(write: manage) LabelStruct labelList[] = 0;
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCause : ENUM8 {
-    kUnknown = 0;
-    kAssociationFailed = 1;
-    kAuthenticationFailed = 2;
-    kSsidNotFound = 3;
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  enum SecurityType : ENUM8 {
-    kUnspecified = 0;
-    kNone = 1;
-    kWep = 2;
-    kWpa = 3;
-    kWpa2 = 4;
-    kWpa3 = 5;
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  enum WiFiConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  enum WiFiVersionType : ENUM8 {
-    k80211a = 0;
-    k80211b = 1;
-    k80211g = 2;
-    k80211n = 3;
-    k80211ac = 4;
-    k80211ax = 5;
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  info event Disconnection = 0 {
-    INT16U reasonCode = 0;
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  info event AssociationFailure = 1 {
-    AssociationFailureCause associationFailure = 0;
-    INT16U status = 1;
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  info event ConnectionStatus = 2 {
-    WiFiConnectionStatus connectionStatus = 0;
-  }
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
 
-  readonly attribute nullable octet_string<6> bssid = 0;
-  readonly attribute nullable SecurityType securityType = 1;
-  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
-  readonly attribute nullable int16u channelNumber = 3;
-  readonly attribute nullable int8s rssi = 4;
-  readonly attribute int32u beaconLostCount = 5;
-  readonly attribute int32u beaconRxCount = 6;
-  readonly attribute int32u packetMulticastRxCount = 7;
-  readonly attribute int32u packetMulticastTxCount = 8;
-  readonly attribute int32u packetUnicastRxCount = 9;
-  readonly attribute int32u packetUnicastTxCount = 10;
-  readonly attribute int64u currentMaxRate = 11;
-  readonly attribute int64u overrunCount = 12;
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  command ResetCounts(): DefaultSuccess = 0;
+server cluster UserLabel = 65 {
+  attribute access(write: manage) LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster BooleanState = 69 {
+  info event StateChange = 0 {
+    boolean stateValue = 0;
+  }
+
+  readonly attribute boolean stateValue = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
 endpoint 0 {
diff --git a/examples/chef/devices/rootnode_dimmablelight_gY80DaqEUL.matter b/examples/chef/devices/rootnode_dimmablelight_gY80DaqEUL.matter
index 017dd383ae3f4a..dd87f8eb7b4d39 100644
--- a/examples/chef/devices/rootnode_dimmablelight_gY80DaqEUL.matter
+++ b/examples/chef/devices/rootnode_dimmablelight_gY80DaqEUL.matter
@@ -6,652 +6,706 @@ struct LabelStruct {
     char_string<16> value = 1;
 }
 
-server cluster AccessControl = 31 {
-  enum AuthMode : ENUM8 {
-    kPase = 1;
-    kCase = 2;
-    kGroup = 3;
-  }
-
-  enum ChangeTypeEnum : ENUM8 {
-    kChanged = 0;
-    kAdded = 1;
-    kRemoved = 2;
-  }
-
-  enum Privilege : ENUM8 {
-    kView = 1;
-    kProxyView = 2;
-    kOperate = 3;
-    kManage = 4;
-    kAdminister = 5;
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
   }
 
-  struct AccessControlEntry {
-    Privilege privilege = 1;
-    AuthMode authMode = 2;
-    nullable int64u subjects[] = 3;
-    nullable Target targets[] = 4;
-    fabric_idx fabricIndex = 254;
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
   }
 
-  struct Target {
-    nullable cluster_id cluster = 0;
-    nullable endpoint_no endpoint = 1;
-    nullable devtype_id deviceType = 2;
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
   }
 
-  struct ExtensionEntry {
-    octet_string<128> data = 1;
-    fabric_idx fabricIndex = 254;
-  }
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  info event access(read: administer) AccessControlEntryChanged = 0 {
-    nullable node_id adminNodeID = 1;
-    nullable INT16U adminPasscodeID = 2;
-    ChangeTypeEnum changeType = 3;
-    nullable AccessControlEntry latestValue = 4;
-    fabric_idx adminFabricIndex = 254;
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
   }
 
-  info event access(read: administer) AccessControlExtensionChanged = 1 {
-    nullable node_id adminNodeID = 1;
-    nullable INT16U adminPasscodeID = 2;
-    ChangeTypeEnum changeType = 3;
-    nullable ExtensionEntry latestValue = 4;
-    fabric_idx adminFabricIndex = 254;
-  }
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+}
 
-  attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
-  attribute access(read: administer, write: administer) ExtensionEntry extension[] = 1;
+server cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
+  request struct AddGroupRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
   }
 
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
+  request struct ViewGroupRequest {
+    group_id groupId = 0;
   }
 
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
   }
 
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
+  request struct RemoveGroupRequest {
+    group_id groupId = 0;
   }
 
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
 
-server cluster Basic = 40 {
-  critical event StartUp = 0 {
-    INT32U softwareVersion = 0;
+  response struct AddGroupResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  critical event ShutDown = 1 {
+  response struct ViewGroupResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    CHAR_STRING groupName = 2;
   }
 
-  info event Leave = 2 {
+  response struct GetGroupMembershipResponse = 2 {
+    nullable INT8U capacity = 0;
+    group_id groupList[] = 1;
   }
 
-  info event ReachableChanged = 3 {
-    boolean reachableNewValue = 0;
+  response struct RemoveGroupResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  readonly attribute int16u dataModelRevision = 0;
-  readonly attribute char_string<32> vendorName = 1;
-  readonly attribute vendor_id vendorID = 2;
-  readonly attribute char_string<32> productName = 3;
-  readonly attribute int16u productID = 4;
-  attribute access(write: manage) char_string<32> nodeLabel = 5;
-  attribute access(write: administer) char_string<2> location = 6;
-  readonly attribute int16u hardwareVersion = 7;
-  readonly attribute char_string<64> hardwareVersionString = 8;
-  readonly attribute int32u softwareVersion = 9;
-  readonly attribute char_string<64> softwareVersionString = 10;
-  readonly attribute char_string<16> manufacturingDate = 11;
-  readonly attribute char_string<32> partNumber = 12;
-  readonly attribute long_char_string<256> productURL = 13;
-  readonly attribute char_string<64> productLabel = 14;
-  readonly attribute char_string<32> serialNumber = 15;
-  attribute access(write: manage) boolean localConfigDisabled = 16;
-  readonly attribute boolean reachable = 17;
-  readonly attribute char_string<32> uniqueID = 18;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
 }
 
-client cluster Binding = 30 {
-  struct TargetStruct {
-    optional node_id node = 1;
-    optional group_id group = 2;
-    optional endpoint_no endpoint = 3;
-    optional cluster_id cluster = 4;
-    fabric_idx fabricIndex = 254;
+server cluster Scenes = 5 {
+  bitmap ScenesCopyMode : BITMAP8 {
+    kCopyAllScenes = 0x1;
   }
 
-  attribute TargetStruct binding[] = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  struct ExtensionFieldSet {
+    cluster_id clusterId = 0;
+    AttributeValuePair attributeValueList[] = 1;
+  }
 
-server cluster Descriptor = 29 {
-  struct DeviceType {
-    devtype_id type = 0;
-    int16u revision = 1;
+  struct AttributeValuePair {
+    optional attrib_id attributeId = 0;
+    int8u attributeValue[] = 1;
   }
 
-  readonly attribute DeviceType deviceList[] = 0;
-  readonly attribute CLUSTER_ID serverList[] = 1;
-  readonly attribute CLUSTER_ID clientList[] = 2;
-  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute int8u sceneCount = 0;
+  readonly attribute int8u currentScene = 1;
+  readonly attribute group_id currentGroup = 2;
+  readonly attribute boolean sceneValid = 3;
+  readonly attribute bitmap8 nameSupport = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster DiagnosticLogs = 50 {
-  enum LogsIntent : ENUM8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
+  request struct AddSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    INT16U transitionTime = 2;
+    CHAR_STRING sceneName = 3;
+    ExtensionFieldSet extensionFieldSets[] = 4;
   }
 
-  enum LogsStatus : ENUM8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
+  request struct ViewSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  enum LogsTransferProtocol : ENUM8 {
-    kResponsePayload = 0;
-    kBdx = 1;
+  request struct RemoveSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  request struct RemoveAllScenesRequest {
+    group_id groupId = 0;
+  }
 
-  request struct RetrieveLogsRequestRequest {
-    LogsIntent intent = 0;
-    LogsTransferProtocol requestedProtocol = 1;
-    OCTET_STRING transferFileDesignator = 2;
+  request struct StoreSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
-}
+  request struct RecallSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    optional nullable INT16U transitionTime = 2;
+  }
 
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
+  request struct GetSceneMembershipRequest {
+    group_id groupId = 0;
   }
 
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  response struct AddSceneResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+  }
 
-  command ResetCounts(): DefaultSuccess = 0;
-}
+  response struct ViewSceneResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+    optional INT16U transitionTime = 3;
+    optional CHAR_STRING sceneName = 4;
+    optional ExtensionFieldSet extensionFieldSets[] = 5;
+  }
 
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  response struct RemoveSceneResponse = 2 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+  }
 
-server cluster GeneralCommissioning = 48 {
-  enum CommissioningError : ENUM8 {
-    kOk = 0;
-    kValueOutsideRange = 1;
-    kInvalidAuthentication = 2;
-    kNoFailSafe = 3;
-    kBusyWithOtherAdmin = 4;
+  response struct RemoveAllScenesResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  enum RegulatoryLocationType : ENUM8 {
-    kIndoor = 0;
-    kOutdoor = 1;
-    kIndoorOutdoor = 2;
+  response struct StoreSceneResponse = 4 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  struct BasicCommissioningInfo {
-    int16u failSafeExpiryLengthSeconds = 0;
-    int16u maxCumulativeFailsafeSeconds = 1;
+  response struct GetSceneMembershipResponse = 6 {
+    ENUM8 status = 0;
+    nullable INT8U capacity = 1;
+    group_id groupId = 2;
+    optional INT8U sceneList[] = 3;
   }
 
-  attribute access(write: administer) int64u breadcrumb = 0;
-  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
-  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
-  readonly attribute RegulatoryLocationType locationCapability = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
+  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
+  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
+  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
+  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
+  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
+  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
+}
 
-  request struct ArmFailSafeRequest {
-    INT16U expiryLengthSeconds = 0;
-    INT64U breadcrumb = 1;
+server cluster OnOff = 6 {
+  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
+    kFadeToOffIn0p8Seconds = 0;
+    kNoFade = 1;
+    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
   }
 
-  request struct SetRegulatoryConfigRequest {
-    RegulatoryLocationType newRegulatoryConfig = 0;
-    CHAR_STRING countryCode = 1;
-    INT64U breadcrumb = 2;
+  enum OnOffDyingLightEffectVariant : ENUM8 {
+    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
   }
 
-  response struct ArmFailSafeResponse = 1 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  enum OnOffEffectIdentifier : ENUM8 {
+    kDelayedAllOff = 0;
+    kDyingLight = 1;
   }
 
-  response struct SetRegulatoryConfigResponse = 3 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  enum OnOffStartUpOnOff : ENUM8 {
+    kOff = 0;
+    kOn = 1;
+    kTogglePreviousOnOff = 2;
   }
 
-  response struct CommissioningCompleteResponse = 5 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  bitmap OnOffControl : BITMAP8 {
+    kAcceptOnlyWhenOn = 0x1;
   }
 
-  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
-  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
-  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
+  }
+
+  bitmap SceneFeatures : BITMAP32 {
+    kSceneNames = 0x1;
+  }
+
+  readonly attribute boolean onOff = 0;
+  readonly attribute boolean globalSceneControl = 16384;
+  attribute int16u onTime = 16385;
+  attribute int16u offWaitTime = 16386;
+  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command Off(): DefaultSuccess = 0;
+  command On(): DefaultSuccess = 1;
+  command Toggle(): DefaultSuccess = 2;
 }
 
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
+server cluster LevelControl = 8 {
+  enum MoveMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
   }
 
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
+  enum StepMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
   }
 
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
+  bitmap LevelControlFeature : BITMAP32 {
+    kOnOff = 0x1;
+    kLighting = 0x2;
+    kFrequency = 0x4;
   }
 
-  enum NetworkFaultType : ENUM8 {
-    kUnspecified = 0;
-    kHardwareFailure = 1;
-    kNetworkJammed = 2;
-    kConnectionFailed = 3;
+  readonly attribute int8u currentLevel = 0;
+  readonly attribute int16u remainingTime = 1;
+  readonly attribute int8u minLevel = 2;
+  readonly attribute int8u maxLevel = 3;
+  attribute bitmap8 options = 15;
+  attribute nullable int8u onLevel = 17;
+  attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct MoveToLevelRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
   }
 
-  enum RadioFaultType : ENUM8 {
-    kUnspecified = 0;
-    kWiFiFault = 1;
-    kCellularFault = 2;
-    kThreadFault = 3;
-    kNFCFault = 4;
-    kBLEFault = 5;
-    kEthernetFault = 6;
+  request struct MoveRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
   }
 
-  struct NetworkInterfaceType {
-    char_string<32> name = 0;
-    boolean isOperational = 1;
-    nullable boolean offPremiseServicesReachableIPv4 = 2;
-    nullable boolean offPremiseServicesReachableIPv6 = 3;
-    octet_string<8> hardwareAddress = 4;
-    octet_string IPv4Addresses[] = 5;
-    octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+  request struct StepRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionMask = 3;
+    BITMAP8 optionOverride = 4;
   }
 
-  critical event HardwareFaultChange = 0 {
-    HardwareFaultType current[] = 0;
-    HardwareFaultType previous[] = 1;
+  request struct StopRequest {
+    BITMAP8 optionMask = 0;
+    BITMAP8 optionOverride = 1;
   }
 
-  critical event RadioFaultChange = 1 {
-    RadioFaultType current[] = 0;
-    RadioFaultType previous[] = 1;
+  request struct MoveToLevelWithOnOffRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
   }
 
-  critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+  request struct MoveWithOnOffRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
   }
 
-  critical event BootReason = 3 {
-    BootReasonType bootReason = 0;
+  request struct StepWithOnOffRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
   }
 
-  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
-  readonly attribute int16u rebootCount = 1;
-  readonly attribute int64u upTime = 2;
-  readonly attribute int32u totalOperationalHours = 3;
-  readonly attribute enum8 bootReasons = 4;
-  readonly attribute ENUM8 activeHardwareFaults[] = 5;
-  readonly attribute ENUM8 activeRadioFaults[] = 6;
-  readonly attribute ENUM8 activeNetworkFaults[] = 7;
-  readonly attribute boolean testEventTriggersEnabled = 8;
+  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
+  command Move(MoveRequest): DefaultSuccess = 1;
+  command Step(StepRequest): DefaultSuccess = 2;
+  command Stop(StopRequest): DefaultSuccess = 3;
+  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
+  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
+  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
+  command StopWithOnOff(): DefaultSuccess = 7;
+}
+
+server cluster Descriptor = 29 {
+  struct DeviceType {
+    devtype_id type = 0;
+    int16u revision = 1;
+  }
+
+  readonly attribute DeviceType deviceList[] = 0;
+  readonly attribute CLUSTER_ID serverList[] = 1;
+  readonly attribute CLUSTER_ID clientList[] = 2;
+  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct TestEventTriggerRequest {
-    OCTET_STRING enableKey = 0;
-    INT64U eventTrigger = 1;
+client cluster Binding = 30 {
+  struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
   }
 
-  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  attribute TargetStruct binding[] = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
+server cluster AccessControl = 31 {
+  enum AuthMode : ENUM8 {
+    kPase = 1;
+    kCase = 2;
+    kGroup = 3;
   }
 
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
-    fabric_idx fabricIndex = 254;
+  enum ChangeTypeEnum : ENUM8 {
+    kChanged = 0;
+    kAdded = 1;
+    kRemoved = 2;
   }
 
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
+  enum Privilege : ENUM8 {
+    kView = 1;
+    kProxyView = 2;
+    kOperate = 3;
+    kManage = 4;
+    kAdminister = 5;
   }
 
-  struct GroupKeySetStruct {
-    int16u groupKeySetID = 0;
-    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
-    nullable octet_string<16> epochKey0 = 2;
-    nullable epoch_us epochStartTime0 = 3;
-    nullable octet_string<16> epochKey1 = 4;
-    nullable epoch_us epochStartTime1 = 5;
-    nullable octet_string<16> epochKey2 = 6;
-    nullable epoch_us epochStartTime2 = 7;
+  struct AccessControlEntry {
+    Privilege privilege = 1;
+    AuthMode authMode = 2;
+    nullable int64u subjects[] = 3;
+    nullable Target targets[] = 4;
+    fabric_idx fabricIndex = 254;
   }
 
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
-  readonly attribute int16u maxGroupsPerFabric = 2;
-  readonly attribute int16u maxGroupKeysPerFabric = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  struct Target {
+    nullable cluster_id cluster = 0;
+    nullable endpoint_no endpoint = 1;
+    nullable devtype_id deviceType = 2;
+  }
 
-  request struct KeySetWriteRequest {
-    GroupKeySetStruct groupKeySet = 0;
+  struct ExtensionEntry {
+    octet_string<128> data = 1;
+    fabric_idx fabricIndex = 254;
   }
 
-  request struct KeySetReadRequest {
-    INT16U groupKeySetID = 0;
+  info event access(read: administer) AccessControlEntryChanged = 0 {
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable AccessControlEntry latestValue = 4;
+    fabric_idx adminFabricIndex = 254;
   }
 
-  request struct KeySetRemoveRequest {
-    INT16U groupKeySetID = 0;
+  info event access(read: administer) AccessControlExtensionChanged = 1 {
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable ExtensionEntry latestValue = 4;
+    fabric_idx adminFabricIndex = 254;
   }
 
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
+  attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
+  attribute access(read: administer, write: administer) ExtensionEntry extension[] = 1;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Basic = 40 {
+  critical event StartUp = 0 {
+    INT32U softwareVersion = 0;
   }
 
-  response struct KeySetReadResponse = 2 {
-    GroupKeySetStruct groupKeySet = 0;
+  critical event ShutDown = 1 {
   }
 
-  response struct KeySetReadAllIndicesResponse = 5 {
-    INT16U groupKeySetIDs[] = 0;
+  info event Leave = 2 {
   }
 
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
-}
+  info event ReachableChanged = 3 {
+    boolean reachableNewValue = 0;
+  }
 
-server cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute int16u dataModelRevision = 0;
+  readonly attribute char_string<32> vendorName = 1;
+  readonly attribute vendor_id vendorID = 2;
+  readonly attribute char_string<32> productName = 3;
+  readonly attribute int16u productID = 4;
+  attribute access(write: manage) char_string<32> nodeLabel = 5;
+  attribute access(write: administer) char_string<2> location = 6;
+  readonly attribute int16u hardwareVersion = 7;
+  readonly attribute char_string<64> hardwareVersionString = 8;
+  readonly attribute int32u softwareVersion = 9;
+  readonly attribute char_string<64> softwareVersionString = 10;
+  readonly attribute char_string<16> manufacturingDate = 11;
+  readonly attribute char_string<32> partNumber = 12;
+  readonly attribute long_char_string<256> productURL = 13;
+  readonly attribute char_string<64> productLabel = 14;
+  readonly attribute char_string<32> serialNumber = 15;
+  attribute access(write: manage) boolean localConfigDisabled = 16;
+  readonly attribute boolean reachable = 17;
+  readonly attribute char_string<32> uniqueID = 18;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct AddGroupRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+client cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
   }
 
-  request struct ViewGroupRequest {
-    group_id groupId = 0;
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
   }
 
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
   }
 
-  request struct RemoveGroupRequest {
-    group_id groupId = 0;
-  }
+  readonly attribute int16u clusterRevision = 65533;
 
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
   }
 
-  response struct AddGroupResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
   }
 
-  response struct ViewGroupResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    CHAR_STRING groupName = 2;
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
   }
 
-  response struct GetGroupMembershipResponse = 2 {
-    nullable INT8U capacity = 0;
-    group_id groupList[] = 1;
+  response struct QueryImageResponse = 1 {
+    OTAQueryStatus status = 0;
+    optional INT32U delayedActionTime = 1;
+    optional CHAR_STRING imageURI = 2;
+    optional INT32U softwareVersion = 3;
+    optional CHAR_STRING softwareVersionString = 4;
+    optional OCTET_STRING updateToken = 5;
+    optional BOOLEAN userConsentNeeded = 6;
+    optional OCTET_STRING metadataForRequestor = 7;
   }
 
-  response struct RemoveGroupResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
   }
 
-  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
 }
 
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
+server cluster OtaSoftwareUpdateRequestor = 42 {
+  enum OTAAnnouncementReason : ENUM8 {
+    kSimpleAnnouncement = 0;
+    kUpdateAvailable = 1;
+    kUrgentUpdateAvailable = 2;
   }
 
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
+  enum OTAChangeReasonEnum : ENUM8 {
+    kUnknown = 0;
+    kSuccess = 1;
+    kFailure = 2;
+    kTimeOut = 3;
+    kDelayByProvider = 4;
   }
 
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
+  enum OTAUpdateStateEnum : ENUM8 {
+    kUnknown = 0;
+    kIdle = 1;
+    kQuerying = 2;
+    kDelayedOnQuery = 3;
+    kDownloading = 4;
+    kApplying = 5;
+    kDelayedOnApply = 6;
+    kRollingBack = 7;
+    kDelayedOnUserConsent = 8;
   }
 
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  struct ProviderLocation {
+    node_id providerNodeID = 1;
+    endpoint_no endpoint = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  info event StateTransition = 0 {
+    OTAUpdateStateEnum previousState = 0;
+    OTAUpdateStateEnum newState = 1;
+    OTAChangeReasonEnum reason = 2;
+    nullable INT32U targetSoftwareVersion = 3;
+  }
+
+  critical event VersionApplied = 1 {
+    INT32U softwareVersion = 0;
+    INT16U productID = 1;
+  }
+
+  info event DownloadError = 2 {
+    INT32U softwareVersion = 0;
+    INT64U bytesDownloaded = 1;
+    nullable INT8U progressPercent = 2;
+    nullable INT64S platformCode = 3;
+  }
+
+  attribute ProviderLocation defaultOtaProviders[] = 0;
+  readonly attribute boolean updatePossible = 1;
+  readonly attribute OTAUpdateStateEnum updateState = 2;
+  readonly attribute nullable int8u updateStateProgress = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
+  request struct AnnounceOtaProviderRequest {
+    node_id providerNodeId = 0;
+    vendor_id vendorId = 1;
+    OTAAnnouncementReason announcementReason = 2;
+    optional OCTET_STRING metadataForNode = 3;
+    endpoint_no endpoint = 4;
   }
 
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
 }
 
-server cluster LevelControl = 8 {
-  enum MoveMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
-  }
+server cluster LocalizationConfiguration = 43 {
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  enum StepMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
   }
 
-  bitmap LevelControlFeature : BITMAP32 {
-    kOnOff = 0x1;
-    kLighting = 0x2;
-    kFrequency = 0x4;
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
   }
 
-  readonly attribute int8u currentLevel = 0;
-  readonly attribute int16u remainingTime = 1;
-  readonly attribute int8u minLevel = 2;
-  readonly attribute int8u maxLevel = 3;
-  attribute bitmap8 options = 15;
-  attribute nullable int8u onLevel = 17;
-  attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct MoveToLevelRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
+server cluster GeneralCommissioning = 48 {
+  enum CommissioningError : ENUM8 {
+    kOk = 0;
+    kValueOutsideRange = 1;
+    kInvalidAuthentication = 2;
+    kNoFailSafe = 3;
+    kBusyWithOtherAdmin = 4;
   }
 
-  request struct MoveRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
+  enum RegulatoryLocationType : ENUM8 {
+    kIndoor = 0;
+    kOutdoor = 1;
+    kIndoorOutdoor = 2;
   }
 
-  request struct StepRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionMask = 3;
-    BITMAP8 optionOverride = 4;
+  struct BasicCommissioningInfo {
+    int16u failSafeExpiryLengthSeconds = 0;
+    int16u maxCumulativeFailsafeSeconds = 1;
   }
 
-  request struct StopRequest {
-    BITMAP8 optionMask = 0;
-    BITMAP8 optionOverride = 1;
+  attribute access(write: administer) int64u breadcrumb = 0;
+  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
+  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
+  readonly attribute RegulatoryLocationType locationCapability = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ArmFailSafeRequest {
+    INT16U expiryLengthSeconds = 0;
+    INT64U breadcrumb = 1;
   }
 
-  request struct MoveToLevelWithOnOffRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
+  request struct SetRegulatoryConfigRequest {
+    RegulatoryLocationType newRegulatoryConfig = 0;
+    CHAR_STRING countryCode = 1;
+    INT64U breadcrumb = 2;
   }
 
-  request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
+  response struct ArmFailSafeResponse = 1 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
+  response struct SetRegulatoryConfigResponse = 3 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
-  command Move(MoveRequest): DefaultSuccess = 1;
-  command Step(StepRequest): DefaultSuccess = 2;
-  command Stop(StopRequest): DefaultSuccess = 3;
-  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
-  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
-  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
-  command StopWithOnOff(): DefaultSuccess = 7;
-}
+  response struct CommissioningCompleteResponse = 5 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
+  }
 
-server cluster LocalizationConfiguration = 43 {
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
+  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
+  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
 }
 
 server cluster NetworkCommissioning = 49 {
@@ -788,444 +842,408 @@ server cluster NetworkCommissioning = 49 {
   command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
 }
 
-client cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
+server cluster DiagnosticLogs = 50 {
+  enum LogsIntent : ENUM8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
   }
 
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
+  enum LogsStatus : ENUM8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
   }
 
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
+  enum LogsTransferProtocol : ENUM8 {
+    kResponsePayload = 0;
+    kBdx = 1;
   }
 
+  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
-  }
-
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
+  request struct RetrieveLogsRequestRequest {
+    LogsIntent intent = 0;
+    LogsTransferProtocol requestedProtocol = 1;
+    OCTET_STRING transferFileDesignator = 2;
   }
 
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
-  }
+  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+}
 
-  response struct QueryImageResponse = 1 {
-    OTAQueryStatus status = 0;
-    optional INT32U delayedActionTime = 1;
-    optional CHAR_STRING imageURI = 2;
-    optional INT32U softwareVersion = 3;
-    optional CHAR_STRING softwareVersionString = 4;
-    optional OCTET_STRING updateToken = 5;
-    optional BOOLEAN userConsentNeeded = 6;
-    optional OCTET_STRING metadataForRequestor = 7;
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
   }
 
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
   }
 
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
-}
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
+  }
 
-server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum OTAAnnouncementReason : ENUM8 {
-    kSimpleAnnouncement = 0;
-    kUpdateAvailable = 1;
-    kUrgentUpdateAvailable = 2;
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
   }
 
-  enum OTAChangeReasonEnum : ENUM8 {
-    kUnknown = 0;
-    kSuccess = 1;
-    kFailure = 2;
-    kTimeOut = 3;
-    kDelayByProvider = 4;
+  enum RadioFaultType : ENUM8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
   }
 
-  enum OTAUpdateStateEnum : ENUM8 {
-    kUnknown = 0;
-    kIdle = 1;
-    kQuerying = 2;
-    kDelayedOnQuery = 3;
-    kDownloading = 4;
-    kApplying = 5;
-    kDelayedOnApply = 6;
-    kRollingBack = 7;
-    kDelayedOnUserConsent = 8;
+  struct NetworkInterfaceType {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceType type = 7;
   }
 
-  struct ProviderLocation {
-    node_id providerNodeID = 1;
-    endpoint_no endpoint = 2;
-    fabric_idx fabricIndex = 254;
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultType current[] = 0;
+    HardwareFaultType previous[] = 1;
   }
 
-  info event StateTransition = 0 {
-    OTAUpdateStateEnum previousState = 0;
-    OTAUpdateStateEnum newState = 1;
-    OTAChangeReasonEnum reason = 2;
-    nullable INT32U targetSoftwareVersion = 3;
+  critical event RadioFaultChange = 1 {
+    RadioFaultType current[] = 0;
+    RadioFaultType previous[] = 1;
   }
 
-  critical event VersionApplied = 1 {
-    INT32U softwareVersion = 0;
-    INT16U productID = 1;
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultType current[] = 0;
+    NetworkFaultType previous[] = 1;
   }
 
-  info event DownloadError = 2 {
-    INT32U softwareVersion = 0;
-    INT64U bytesDownloaded = 1;
-    nullable INT8U progressPercent = 2;
-    nullable INT64S platformCode = 3;
+  critical event BootReason = 3 {
+    BootReasonType bootReason = 0;
   }
 
-  attribute ProviderLocation defaultOtaProviders[] = 0;
-  readonly attribute boolean updatePossible = 1;
-  readonly attribute OTAUpdateStateEnum updateState = 2;
-  readonly attribute nullable int8u updateStateProgress = 3;
+  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
+  readonly attribute int32u totalOperationalHours = 3;
+  readonly attribute enum8 bootReasons = 4;
+  readonly attribute ENUM8 activeHardwareFaults[] = 5;
+  readonly attribute ENUM8 activeRadioFaults[] = 6;
+  readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AnnounceOtaProviderRequest {
-    node_id providerNodeId = 0;
-    vendor_id vendorId = 1;
-    OTAAnnouncementReason announcementReason = 2;
-    optional OCTET_STRING metadataForNode = 3;
-    endpoint_no endpoint = 4;
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
   }
 
-  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
-}
-
-client cluster OccupancySensing = 1030 {
-  readonly attribute bitmap8 occupancy = 0;
-  readonly attribute enum8 occupancySensorType = 1;
-  readonly attribute bitmap8 occupancySensorTypeBitmap = 2;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute int16u clusterRevision = 65533;
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
-server cluster OnOff = 6 {
-  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
-    kFadeToOffIn0p8Seconds = 0;
-    kNoFade = 1;
-    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
-  }
-
-  enum OnOffDyingLightEffectVariant : ENUM8 {
-    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
-  }
-
-  enum OnOffEffectIdentifier : ENUM8 {
-    kDelayedAllOff = 0;
-    kDyingLight = 1;
-  }
-
-  enum OnOffStartUpOnOff : ENUM8 {
-    kOff = 0;
-    kOn = 1;
-    kTogglePreviousOnOff = 2;
-  }
-
-  bitmap OnOffControl : BITMAP8 {
-    kAcceptOnlyWhenOn = 0x1;
+server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
   }
 
-  bitmap OnOffFeature : BITMAP32 {
-    kLighting = 0x1;
+  struct ThreadMetrics {
+    int64u id = 0;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
-  bitmap SceneFeatures : BITMAP32 {
-    kSceneNames = 0x1;
+  info event SoftwareFault = 0 {
+    SoftwareFaultStruct softwareFault = 0;
   }
 
-  readonly attribute boolean onOff = 0;
-  readonly attribute boolean globalSceneControl = 16384;
-  attribute int16u onTime = 16385;
-  attribute int16u offWaitTime = 16386;
-  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute ThreadMetrics threadMetrics[] = 0;
+  readonly attribute int64u currentHeapFree = 1;
+  readonly attribute int64u currentHeapUsed = 2;
+  readonly attribute int64u currentHeapHighWatermark = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command Off(): DefaultSuccess = 0;
-  command On(): DefaultSuccess = 1;
-  command Toggle(): DefaultSuccess = 2;
+  command ResetWatermarks(): DefaultSuccess = 0;
 }
 
-server cluster OperationalCredentials = 62 {
-  enum OperationalCertStatus : ENUM8 {
-    kSuccess = 0;
-    kInvalidPublicKey = 1;
-    kInvalidNodeOpId = 2;
-    kInvalidNOC = 3;
-    kMissingCsr = 4;
-    kTableFull = 5;
-    kInvalidAdminSubject = 6;
-    kInsufficientPrivilege = 8;
-    kFabricConflict = 9;
-    kLabelConflict = 10;
-    kInvalidFabricIndex = 11;
+server cluster ThreadNetworkDiagnostics = 53 {
+  enum NetworkFault : ENUM8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
   }
 
-  struct NOCStruct {
-    octet_string noc = 1;
-    nullable octet_string icac = 2;
-    fabric_idx fabricIndex = 254;
+  enum RoutingRole : ENUM8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kReed = 4;
+    kRouter = 5;
+    kLeader = 6;
   }
 
-  struct FabricDescriptor {
-    octet_string<65> rootPublicKey = 1;
-    vendor_id vendorId = 2;
-    fabric_id fabricId = 3;
-    node_id nodeId = 4;
-    char_string<32> label = 5;
-    fabric_idx fabricIndex = 254;
+  enum ThreadConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
-  readonly attribute FabricDescriptor fabrics[] = 1;
-  readonly attribute int8u supportedFabrics = 2;
-  readonly attribute int8u commissionedFabrics = 3;
-  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
-  readonly attribute fabric_idx currentFabricIndex = 5;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AttestationRequestRequest {
-    OCTET_STRING attestationNonce = 0;
-  }
-
-  request struct CertificateChainRequestRequest {
-    INT8U certificateType = 0;
-  }
-
-  request struct CSRRequestRequest {
-    OCTET_STRING CSRNonce = 0;
-    optional boolean isForUpdateNOC = 1;
-  }
-
-  request struct AddNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
-    OCTET_STRING IPKValue = 2;
-    Int64u caseAdminSubject = 3;
-    VENDOR_ID adminVendorId = 4;
-  }
-
-  request struct UpdateNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
-  }
-
-  request struct UpdateFabricLabelRequest {
-    CHAR_STRING label = 0;
-  }
-
-  request struct RemoveFabricRequest {
-    fabric_idx fabricIndex = 0;
-  }
-
-  request struct AddTrustedRootCertificateRequest {
-    OCTET_STRING rootCertificate = 0;
-  }
-
-  response struct AttestationResponse = 1 {
-    OCTET_STRING attestationElements = 0;
-    OCTET_STRING signature = 1;
-  }
-
-  response struct CertificateChainResponse = 3 {
-    OCTET_STRING certificate = 0;
+  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+    kMLECounts = 0x4;
+    kMACCounts = 0x8;
   }
 
-  response struct CSRResponse = 5 {
-    OCTET_STRING NOCSRElements = 0;
-    OCTET_STRING attestationSignature = 1;
+  struct NeighborTable {
+    int64u extAddress = 0;
+    int32u age = 1;
+    int16u rloc16 = 2;
+    int32u linkFrameCounter = 3;
+    int32u mleFrameCounter = 4;
+    int8u lqi = 5;
+    nullable int8s averageRssi = 6;
+    nullable int8s lastRssi = 7;
+    int8u frameErrorRate = 8;
+    int8u messageErrorRate = 9;
+    boolean rxOnWhenIdle = 10;
+    boolean fullThreadDevice = 11;
+    boolean fullNetworkData = 12;
+    boolean isChild = 13;
   }
 
-  response struct NOCResponse = 8 {
-    OperationalCertStatus statusCode = 0;
-    optional fabric_idx fabricIndex = 1;
-    optional CHAR_STRING debugText = 2;
+  struct RouteTable {
+    int64u extAddress = 0;
+    int16u rloc16 = 1;
+    int8u routerId = 2;
+    int8u nextHop = 3;
+    int8u pathCost = 4;
+    int8u LQIIn = 5;
+    int8u LQIOut = 6;
+    int8u age = 7;
+    boolean allocated = 8;
+    boolean linkEstablished = 9;
   }
 
-  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
-  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
-  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
-  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
-  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
-  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
-  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
-  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-}
-
-server cluster Scenes = 5 {
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
+  struct SecurityPolicy {
+    int16u rotationTime = 0;
+    bitmap16 flags = 1;
   }
 
-  struct ExtensionFieldSet {
-    cluster_id clusterId = 0;
-    AttributeValuePair attributeValueList[] = 1;
+  struct OperationalDatasetComponents {
+    boolean activeTimestampPresent = 0;
+    boolean pendingTimestampPresent = 1;
+    boolean masterKeyPresent = 2;
+    boolean networkNamePresent = 3;
+    boolean extendedPanIdPresent = 4;
+    boolean meshLocalPrefixPresent = 5;
+    boolean delayPresent = 6;
+    boolean panIdPresent = 7;
+    boolean channelPresent = 8;
+    boolean pskcPresent = 9;
+    boolean securityPolicyPresent = 10;
+    boolean channelMaskPresent = 11;
   }
 
-  struct AttributeValuePair {
-    optional attrib_id attributeId = 0;
-    int8u attributeValue[] = 1;
+  info event ConnectionStatus = 0 {
+    ThreadConnectionStatus connectionStatus = 0;
   }
 
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute nullable int16u channel = 0;
+  readonly attribute nullable RoutingRole routingRole = 1;
+  readonly attribute nullable char_string<16> networkName = 2;
+  readonly attribute nullable int16u panId = 3;
+  readonly attribute nullable int64u extendedPanId = 4;
+  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute NeighborTable neighborTableList[] = 7;
+  readonly attribute RouteTable routeTableList[] = 8;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
+  readonly attribute int16u detachedRoleCount = 14;
+  readonly attribute int16u childRoleCount = 15;
+  readonly attribute int16u routerRoleCount = 16;
+  readonly attribute int16u leaderRoleCount = 17;
+  readonly attribute int16u attachAttemptCount = 18;
+  readonly attribute int16u partitionIdChangeCount = 19;
+  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
+  readonly attribute int16u parentChangeCount = 21;
+  readonly attribute int32u txTotalCount = 22;
+  readonly attribute int32u txUnicastCount = 23;
+  readonly attribute int32u txBroadcastCount = 24;
+  readonly attribute int32u txAckRequestedCount = 25;
+  readonly attribute int32u txAckedCount = 26;
+  readonly attribute int32u txNoAckRequestedCount = 27;
+  readonly attribute int32u txDataCount = 28;
+  readonly attribute int32u txDataPollCount = 29;
+  readonly attribute int32u txBeaconCount = 30;
+  readonly attribute int32u txBeaconRequestCount = 31;
+  readonly attribute int32u txOtherCount = 32;
+  readonly attribute int32u txRetryCount = 33;
+  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
+  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
+  readonly attribute int32u txErrCcaCount = 36;
+  readonly attribute int32u txErrAbortCount = 37;
+  readonly attribute int32u txErrBusyChannelCount = 38;
+  readonly attribute int32u rxTotalCount = 39;
+  readonly attribute int32u rxUnicastCount = 40;
+  readonly attribute int32u rxBroadcastCount = 41;
+  readonly attribute int32u rxDataCount = 42;
+  readonly attribute int32u rxDataPollCount = 43;
+  readonly attribute int32u rxBeaconCount = 44;
+  readonly attribute int32u rxBeaconRequestCount = 45;
+  readonly attribute int32u rxOtherCount = 46;
+  readonly attribute int32u rxAddressFilteredCount = 47;
+  readonly attribute int32u rxDestAddrFilteredCount = 48;
+  readonly attribute int32u rxDuplicatedCount = 49;
+  readonly attribute int32u rxErrNoFrameCount = 50;
+  readonly attribute int32u rxErrUnknownNeighborCount = 51;
+  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
+  readonly attribute int32u rxErrSecCount = 53;
+  readonly attribute int32u rxErrFcsCount = 54;
+  readonly attribute int32u rxErrOtherCount = 55;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
+  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AddSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    INT16U transitionTime = 2;
-    CHAR_STRING sceneName = 3;
-    ExtensionFieldSet extensionFieldSets[] = 4;
-  }
-
-  request struct ViewSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RemoveSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RemoveAllScenesRequest {
-    group_id groupId = 0;
-  }
-
-  request struct StoreSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
+  command ResetCounts(): DefaultSuccess = 0;
+}
 
-  request struct RecallSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    optional nullable INT16U transitionTime = 2;
+server cluster WiFiNetworkDiagnostics = 54 {
+  enum AssociationFailureCause : ENUM8 {
+    kUnknown = 0;
+    kAssociationFailed = 1;
+    kAuthenticationFailed = 2;
+    kSsidNotFound = 3;
   }
 
-  request struct GetSceneMembershipRequest {
-    group_id groupId = 0;
+  enum SecurityType : ENUM8 {
+    kUnspecified = 0;
+    kNone = 1;
+    kWep = 2;
+    kWpa = 3;
+    kWpa2 = 4;
+    kWpa3 = 5;
   }
 
-  response struct AddSceneResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
+  enum WiFiConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  response struct ViewSceneResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-    optional INT16U transitionTime = 3;
-    optional CHAR_STRING sceneName = 4;
-    optional ExtensionFieldSet extensionFieldSets[] = 5;
+  enum WiFiVersionType : ENUM8 {
+    k80211a = 0;
+    k80211b = 1;
+    k80211g = 2;
+    k80211n = 3;
+    k80211ac = 4;
+    k80211ax = 5;
   }
 
-  response struct RemoveSceneResponse = 2 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
+  info event Disconnection = 0 {
+    INT16U reasonCode = 0;
   }
 
-  response struct RemoveAllScenesResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  info event AssociationFailure = 1 {
+    AssociationFailureCause associationFailure = 0;
+    INT16U status = 1;
   }
 
-  response struct StoreSceneResponse = 4 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
+  info event ConnectionStatus = 2 {
+    WiFiConnectionStatus connectionStatus = 0;
   }
 
-  response struct GetSceneMembershipResponse = 6 {
-    ENUM8 status = 0;
-    nullable INT8U capacity = 1;
-    group_id groupId = 2;
-    optional INT8U sceneList[] = 3;
-  }
+  readonly attribute nullable octet_string<6> bssid = 0;
+  readonly attribute nullable SecurityType securityType = 1;
+  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
+  readonly attribute nullable int16u channelNumber = 3;
+  readonly attribute nullable int8s rssi = 4;
+  readonly attribute int32u beaconLostCount = 5;
+  readonly attribute int32u beaconRxCount = 6;
+  readonly attribute int32u packetMulticastRxCount = 7;
+  readonly attribute int32u packetMulticastTxCount = 8;
+  readonly attribute int32u packetUnicastRxCount = 9;
+  readonly attribute int32u packetUnicastTxCount = 10;
+  readonly attribute int64u currentMaxRate = 11;
+  readonly attribute int64u overrunCount = 12;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
-  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
-  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
-  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
-  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
-  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
-  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
-server cluster SoftwareDiagnostics = 52 {
-  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
-    kWaterMarks = 0x1;
-  }
-
-  struct ThreadMetrics {
-    int64u id = 0;
-    optional char_string<8> name = 1;
-    optional int32u stackFreeCurrent = 2;
-    optional int32u stackFreeMinimum = 3;
-    optional int32u stackSize = 4;
-  }
-
-  info event SoftwareFault = 0 {
-    SoftwareFaultStruct softwareFault = 0;
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
   }
 
-  readonly attribute ThreadMetrics threadMetrics[] = 0;
-  readonly attribute int64u currentHeapFree = 1;
-  readonly attribute int64u currentHeapUsed = 2;
-  readonly attribute int64u currentHeapHighWatermark = 3;
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
 server cluster Switch = 59 {
@@ -1263,254 +1281,236 @@ server cluster Switch = 59 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster ThreadNetworkDiagnostics = 53 {
-  enum NetworkFault : ENUM8 {
-    kUnspecified = 0;
-    kLinkDown = 1;
-    kHardwareFailure = 2;
-    kNetworkJammed = 3;
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
   }
 
-  enum RoutingRole : ENUM8 {
-    kUnspecified = 0;
-    kUnassigned = 1;
-    kSleepyEndDevice = 2;
-    kEndDevice = 3;
-    kReed = 4;
-    kRouter = 5;
-    kLeader = 6;
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
   }
 
-  enum ThreadConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
   }
 
-  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
-    kPacketCounts = 0x1;
-    kErrorCounts = 0x2;
-    kMLECounts = 0x4;
-    kMACCounts = 0x8;
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
   }
 
-  struct NeighborTable {
-    int64u extAddress = 0;
-    int32u age = 1;
-    int16u rloc16 = 2;
-    int32u linkFrameCounter = 3;
-    int32u mleFrameCounter = 4;
-    int8u lqi = 5;
-    nullable int8s averageRssi = 6;
-    nullable int8s lastRssi = 7;
-    int8u frameErrorRate = 8;
-    int8u messageErrorRate = 9;
-    boolean rxOnWhenIdle = 10;
-    boolean fullThreadDevice = 11;
-    boolean fullNetworkData = 12;
-    boolean isChild = 13;
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
+}
+
+server cluster OperationalCredentials = 62 {
+  enum OperationalCertStatus : ENUM8 {
+    kSuccess = 0;
+    kInvalidPublicKey = 1;
+    kInvalidNodeOpId = 2;
+    kInvalidNOC = 3;
+    kMissingCsr = 4;
+    kTableFull = 5;
+    kInvalidAdminSubject = 6;
+    kInsufficientPrivilege = 8;
+    kFabricConflict = 9;
+    kLabelConflict = 10;
+    kInvalidFabricIndex = 11;
+  }
+
+  struct NOCStruct {
+    octet_string noc = 1;
+    nullable octet_string icac = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct FabricDescriptor {
+    octet_string<65> rootPublicKey = 1;
+    vendor_id vendorId = 2;
+    fabric_id fabricId = 3;
+    node_id nodeId = 4;
+    char_string<32> label = 5;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
+  readonly attribute FabricDescriptor fabrics[] = 1;
+  readonly attribute int8u supportedFabrics = 2;
+  readonly attribute int8u commissionedFabrics = 3;
+  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
+  readonly attribute fabric_idx currentFabricIndex = 5;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AttestationRequestRequest {
+    OCTET_STRING attestationNonce = 0;
+  }
+
+  request struct CertificateChainRequestRequest {
+    INT8U certificateType = 0;
+  }
+
+  request struct CSRRequestRequest {
+    OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
+  }
+
+  request struct AddNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+    OCTET_STRING IPKValue = 2;
+    Int64u caseAdminSubject = 3;
+    VENDOR_ID adminVendorId = 4;
+  }
+
+  request struct UpdateNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+  }
+
+  request struct UpdateFabricLabelRequest {
+    CHAR_STRING label = 0;
   }
 
-  struct RouteTable {
-    int64u extAddress = 0;
-    int16u rloc16 = 1;
-    int8u routerId = 2;
-    int8u nextHop = 3;
-    int8u pathCost = 4;
-    int8u LQIIn = 5;
-    int8u LQIOut = 6;
-    int8u age = 7;
-    boolean allocated = 8;
-    boolean linkEstablished = 9;
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
   }
 
-  struct SecurityPolicy {
-    int16u rotationTime = 0;
-    bitmap16 flags = 1;
+  request struct AddTrustedRootCertificateRequest {
+    OCTET_STRING rootCertificate = 0;
   }
 
-  struct OperationalDatasetComponents {
-    boolean activeTimestampPresent = 0;
-    boolean pendingTimestampPresent = 1;
-    boolean masterKeyPresent = 2;
-    boolean networkNamePresent = 3;
-    boolean extendedPanIdPresent = 4;
-    boolean meshLocalPrefixPresent = 5;
-    boolean delayPresent = 6;
-    boolean panIdPresent = 7;
-    boolean channelPresent = 8;
-    boolean pskcPresent = 9;
-    boolean securityPolicyPresent = 10;
-    boolean channelMaskPresent = 11;
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
   }
 
-  info event ConnectionStatus = 0 {
-    ThreadConnectionStatus connectionStatus = 0;
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
   }
 
-  readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable RoutingRole routingRole = 1;
-  readonly attribute nullable char_string<16> networkName = 2;
-  readonly attribute nullable int16u panId = 3;
-  readonly attribute nullable int64u extendedPanId = 4;
-  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute NeighborTable neighborTableList[] = 7;
-  readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
-  readonly attribute nullable int8u leaderRouterId = 13;
-  readonly attribute int16u detachedRoleCount = 14;
-  readonly attribute int16u childRoleCount = 15;
-  readonly attribute int16u routerRoleCount = 16;
-  readonly attribute int16u leaderRoleCount = 17;
-  readonly attribute int16u attachAttemptCount = 18;
-  readonly attribute int16u partitionIdChangeCount = 19;
-  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
-  readonly attribute int16u parentChangeCount = 21;
-  readonly attribute int32u txTotalCount = 22;
-  readonly attribute int32u txUnicastCount = 23;
-  readonly attribute int32u txBroadcastCount = 24;
-  readonly attribute int32u txAckRequestedCount = 25;
-  readonly attribute int32u txAckedCount = 26;
-  readonly attribute int32u txNoAckRequestedCount = 27;
-  readonly attribute int32u txDataCount = 28;
-  readonly attribute int32u txDataPollCount = 29;
-  readonly attribute int32u txBeaconCount = 30;
-  readonly attribute int32u txBeaconRequestCount = 31;
-  readonly attribute int32u txOtherCount = 32;
-  readonly attribute int32u txRetryCount = 33;
-  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
-  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
-  readonly attribute int32u txErrCcaCount = 36;
-  readonly attribute int32u txErrAbortCount = 37;
-  readonly attribute int32u txErrBusyChannelCount = 38;
-  readonly attribute int32u rxTotalCount = 39;
-  readonly attribute int32u rxUnicastCount = 40;
-  readonly attribute int32u rxBroadcastCount = 41;
-  readonly attribute int32u rxDataCount = 42;
-  readonly attribute int32u rxDataPollCount = 43;
-  readonly attribute int32u rxBeaconCount = 44;
-  readonly attribute int32u rxBeaconRequestCount = 45;
-  readonly attribute int32u rxOtherCount = 46;
-  readonly attribute int32u rxAddressFilteredCount = 47;
-  readonly attribute int32u rxDestAddrFilteredCount = 48;
-  readonly attribute int32u rxDuplicatedCount = 49;
-  readonly attribute int32u rxErrNoFrameCount = 50;
-  readonly attribute int32u rxErrUnknownNeighborCount = 51;
-  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
-  readonly attribute int32u rxErrSecCount = 53;
-  readonly attribute int32u rxErrFcsCount = 54;
-  readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute nullable int64u activeTimestamp = 56;
-  readonly attribute nullable int64u pendingTimestamp = 57;
-  readonly attribute nullable int32u delay = 58;
-  readonly attribute nullable SecurityPolicy securityPolicy = 59;
-  readonly attribute nullable octet_string<4> channelMask = 60;
-  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
-  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
+  }
 
-  command ResetCounts(): DefaultSuccess = 0;
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
+  }
+
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
 }
 
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
   }
 
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
 
-server cluster UserLabel = 65 {
-  attribute access(write: manage) LabelStruct labelList[] = 0;
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCause : ENUM8 {
-    kUnknown = 0;
-    kAssociationFailed = 1;
-    kAuthenticationFailed = 2;
-    kSsidNotFound = 3;
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  enum SecurityType : ENUM8 {
-    kUnspecified = 0;
-    kNone = 1;
-    kWep = 2;
-    kWpa = 3;
-    kWpa2 = 4;
-    kWpa3 = 5;
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  enum WiFiConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  enum WiFiVersionType : ENUM8 {
-    k80211a = 0;
-    k80211b = 1;
-    k80211g = 2;
-    k80211n = 3;
-    k80211ac = 4;
-    k80211ax = 5;
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  info event Disconnection = 0 {
-    INT16U reasonCode = 0;
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  info event AssociationFailure = 1 {
-    AssociationFailureCause associationFailure = 0;
-    INT16U status = 1;
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  info event ConnectionStatus = 2 {
-    WiFiConnectionStatus connectionStatus = 0;
-  }
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
 
-  readonly attribute nullable octet_string<6> bssid = 0;
-  readonly attribute nullable SecurityType securityType = 1;
-  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
-  readonly attribute nullable int16u channelNumber = 3;
-  readonly attribute nullable int8s rssi = 4;
-  readonly attribute int32u beaconLostCount = 5;
-  readonly attribute int32u beaconRxCount = 6;
-  readonly attribute int32u packetMulticastRxCount = 7;
-  readonly attribute int32u packetMulticastTxCount = 8;
-  readonly attribute int32u packetUnicastRxCount = 9;
-  readonly attribute int32u packetUnicastTxCount = 10;
-  readonly attribute int64u currentMaxRate = 11;
-  readonly attribute int64u overrunCount = 12;
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  command ResetCounts(): DefaultSuccess = 0;
+server cluster UserLabel = 65 {
+  attribute access(write: manage) LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+client cluster OccupancySensing = 1030 {
+  readonly attribute bitmap8 occupancy = 0;
+  readonly attribute enum8 occupancySensorType = 1;
+  readonly attribute bitmap8 occupancySensorTypeBitmap = 2;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
 endpoint 0 {
diff --git a/examples/chef/devices/rootnode_flowsensor_nRfPWc0i3j.matter b/examples/chef/devices/rootnode_flowsensor_nRfPWc0i3j.matter
index 39ac9147bd3318..a71841c634a144 100644
--- a/examples/chef/devices/rootnode_flowsensor_nRfPWc0i3j.matter
+++ b/examples/chef/devices/rootnode_flowsensor_nRfPWc0i3j.matter
@@ -6,6 +6,145 @@ struct LabelStruct {
     char_string<16> value = 1;
 }
 
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
+  }
+
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
+  }
+
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
+  }
+
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
+  }
+
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+}
+
+client cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AddGroupRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
+
+  request struct ViewGroupRequest {
+    group_id groupId = 0;
+  }
+
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
+  }
+
+  request struct RemoveGroupRequest {
+    group_id groupId = 0;
+  }
+
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
+
+  response struct AddGroupResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  response struct ViewGroupResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    CHAR_STRING groupName = 2;
+  }
+
+  response struct GetGroupMembershipResponse = 2 {
+    nullable INT8U capacity = 0;
+    group_id groupList[] = 1;
+  }
+
+  response struct RemoveGroupResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
+}
+
+server cluster Descriptor = 29 {
+  struct DeviceType {
+    devtype_id type = 0;
+    int16u revision = 1;
+  }
+
+  readonly attribute DeviceType deviceList[] = 0;
+  readonly attribute CLUSTER_ID serverList[] = 1;
+  readonly attribute CLUSTER_ID clientList[] = 2;
+  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+client cluster Binding = 30 {
+  struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  attribute TargetStruct binding[] = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
 server cluster AccessControl = 31 {
   enum AuthMode : ENUM8 {
     kPase = 1;
@@ -69,42 +208,6 @@ server cluster AccessControl = 31 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
-  }
-
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
-  }
-
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
-  }
-
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-  }
-
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
-
 server cluster Basic = 40 {
   critical event StartUp = 0 {
     INT32U softwareVersion = 0;
@@ -143,114 +246,171 @@ server cluster Basic = 40 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-client cluster Binding = 30 {
-  struct TargetStruct {
-    optional node_id node = 1;
-    optional group_id group = 2;
-    optional endpoint_no endpoint = 3;
-    optional cluster_id cluster = 4;
-    fabric_idx fabricIndex = 254;
+client cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
   }
 
-  attribute TargetStruct binding[] = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
+  }
 
-server cluster Descriptor = 29 {
-  struct DeviceType {
-    devtype_id type = 0;
-    int16u revision = 1;
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
   }
 
-  readonly attribute DeviceType deviceList[] = 0;
-  readonly attribute CLUSTER_ID serverList[] = 1;
-  readonly attribute CLUSTER_ID clientList[] = 2;
-  readonly attribute ENDPOINT_NO partsList[] = 3;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster DiagnosticLogs = 50 {
-  enum LogsIntent : ENUM8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
-  }
 
-  enum LogsStatus : ENUM8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
   }
 
-  enum LogsTransferProtocol : ENUM8 {
-    kResponsePayload = 0;
-    kBdx = 1;
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
   }
 
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct RetrieveLogsRequestRequest {
-    LogsIntent intent = 0;
-    LogsTransferProtocol requestedProtocol = 1;
-    OCTET_STRING transferFileDesignator = 2;
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
   }
 
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+  response struct QueryImageResponse = 1 {
+    OTAQueryStatus status = 0;
+    optional INT32U delayedActionTime = 1;
+    optional CHAR_STRING imageURI = 2;
+    optional INT32U softwareVersion = 3;
+    optional CHAR_STRING softwareVersionString = 4;
+    optional OCTET_STRING updateToken = 5;
+    optional BOOLEAN userConsentNeeded = 6;
+    optional OCTET_STRING metadataForRequestor = 7;
+  }
+
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
+  }
+
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
 }
 
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
+server cluster OtaSoftwareUpdateRequestor = 42 {
+  enum OTAAnnouncementReason : ENUM8 {
+    kSimpleAnnouncement = 0;
+    kUpdateAvailable = 1;
+    kUrgentUpdateAvailable = 2;
   }
 
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
+  enum OTAChangeReasonEnum : ENUM8 {
+    kUnknown = 0;
+    kSuccess = 1;
+    kFailure = 2;
+    kTimeOut = 3;
+    kDelayByProvider = 4;
+  }
+
+  enum OTAUpdateStateEnum : ENUM8 {
+    kUnknown = 0;
+    kIdle = 1;
+    kQuerying = 2;
+    kDelayedOnQuery = 3;
+    kDownloading = 4;
+    kApplying = 5;
+    kDelayedOnApply = 6;
+    kRollingBack = 7;
+    kDelayedOnUserConsent = 8;
+  }
+
+  struct ProviderLocation {
+    node_id providerNodeID = 1;
+    endpoint_no endpoint = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  info event StateTransition = 0 {
+    OTAUpdateStateEnum previousState = 0;
+    OTAUpdateStateEnum newState = 1;
+    OTAChangeReasonEnum reason = 2;
+    nullable INT32U targetSoftwareVersion = 3;
+  }
+
+  critical event VersionApplied = 1 {
+    INT32U softwareVersion = 0;
+    INT16U productID = 1;
+  }
+
+  info event DownloadError = 2 {
+    INT32U softwareVersion = 0;
+    INT64U bytesDownloaded = 1;
+    nullable INT8U progressPercent = 2;
+    nullable INT64S platformCode = 3;
+  }
+
+  attribute ProviderLocation defaultOtaProviders[] = 0;
+  readonly attribute boolean updatePossible = 1;
+  readonly attribute OTAUpdateStateEnum updateState = 2;
+  readonly attribute nullable int8u updateStateProgress = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  request struct AnnounceOtaProviderRequest {
+    node_id providerNodeId = 0;
+    vendor_id vendorId = 1;
+    OTAAnnouncementReason announcementReason = 2;
+    optional OCTET_STRING metadataForNode = 3;
+    endpoint_no endpoint = 4;
+  }
+
+  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
 }
 
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
+server cluster LocalizationConfiguration = 43 {
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster FlowMeasurement = 1028 {
-  readonly attribute nullable int16u measuredValue = 0;
-  readonly attribute nullable int16u minMeasuredValue = 1;
-  readonly attribute nullable int16u maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
+  }
+
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
+  }
+
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
@@ -313,552 +473,613 @@ server cluster GeneralCommissioning = 48 {
   command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
 }
 
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatus : ENUM8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
   }
 
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
+  enum WiFiBand : ENUM8 {
+    k2g4 = 0;
+    k3g65 = 1;
+    k5g = 2;
+    k6g = 3;
+    k60g = 4;
   }
 
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
+  bitmap NetworkCommissioningFeature : BITMAP32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
   }
 
-  enum NetworkFaultType : ENUM8 {
-    kUnspecified = 0;
-    kHardwareFailure = 1;
-    kNetworkJammed = 2;
-    kConnectionFailed = 3;
+  bitmap WiFiSecurity : BITMAP8 {
+    kUnencrypted = 0x1;
+    kWepPersonal = 0x2;
+    kWpaPersonal = 0x4;
+    kWpa2Personal = 0x8;
+    kWpa3Personal = 0x10;
   }
 
-  enum RadioFaultType : ENUM8 {
-    kUnspecified = 0;
-    kWiFiFault = 1;
-    kCellularFault = 2;
-    kThreadFault = 3;
-    kNFCFault = 4;
-    kBLEFault = 5;
-    kEthernetFault = 6;
+  struct NetworkInfo {
+    octet_string<32> networkID = 0;
+    boolean connected = 1;
   }
 
-  struct NetworkInterfaceType {
-    char_string<32> name = 0;
-    boolean isOperational = 1;
-    nullable boolean offPremiseServicesReachableIPv4 = 2;
-    nullable boolean offPremiseServicesReachableIPv6 = 3;
-    octet_string<8> hardwareAddress = 4;
-    octet_string IPv4Addresses[] = 5;
-    octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+  struct WiFiInterfaceScanResult {
+    WiFiSecurity security = 0;
+    octet_string<32> ssid = 1;
+    octet_string<6> bssid = 2;
+    int16u channel = 3;
+    WiFiBand wiFiBand = 4;
+    int8s rssi = 5;
   }
 
-  critical event HardwareFaultChange = 0 {
-    HardwareFaultType current[] = 0;
-    HardwareFaultType previous[] = 1;
+  struct ThreadInterfaceScanResult {
+    int16u panId = 0;
+    int64u extendedPanId = 1;
+    char_string<16> networkName = 2;
+    int16u channel = 3;
+    int8u version = 4;
+    octet_string<8> extendedAddress = 5;
+    int8s rssi = 6;
+    int8u lqi = 7;
   }
 
-  critical event RadioFaultChange = 1 {
-    RadioFaultType current[] = 0;
-    RadioFaultType previous[] = 1;
-  }
+  readonly attribute access(read: administer) int8u maxNetworks = 0;
+  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
+  readonly attribute int8u scanMaxTimeSeconds = 2;
+  readonly attribute int8u connectMaxTimeSeconds = 3;
+  attribute access(write: administer) boolean interfaceEnabled = 4;
+  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
+  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
+  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+  request struct ScanNetworksRequest {
+    optional nullable OCTET_STRING ssid = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  critical event BootReason = 3 {
-    BootReasonType bootReason = 0;
+  request struct AddOrUpdateWiFiNetworkRequest {
+    OCTET_STRING ssid = 0;
+    OCTET_STRING credentials = 1;
+    optional INT64U breadcrumb = 2;
   }
 
-  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
-  readonly attribute int16u rebootCount = 1;
-  readonly attribute int64u upTime = 2;
-  readonly attribute int32u totalOperationalHours = 3;
-  readonly attribute enum8 bootReasons = 4;
-  readonly attribute ENUM8 activeHardwareFaults[] = 5;
-  readonly attribute ENUM8 activeRadioFaults[] = 6;
-  readonly attribute ENUM8 activeNetworkFaults[] = 7;
-  readonly attribute boolean testEventTriggersEnabled = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct TestEventTriggerRequest {
-    OCTET_STRING enableKey = 0;
-    INT64U eventTrigger = 1;
+  request struct AddOrUpdateThreadNetworkRequest {
+    OCTET_STRING operationalDataset = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
-}
-
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
+  request struct RemoveNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
-    fabric_idx fabricIndex = 254;
+  request struct ConnectNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
+  request struct ReorderNetworkRequest {
+    OCTET_STRING networkID = 0;
+    INT8U networkIndex = 1;
+    optional INT64U breadcrumb = 2;
   }
 
-  struct GroupKeySetStruct {
-    int16u groupKeySetID = 0;
-    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
-    nullable octet_string<16> epochKey0 = 2;
-    nullable epoch_us epochStartTime0 = 3;
-    nullable octet_string<16> epochKey1 = 4;
-    nullable epoch_us epochStartTime1 = 5;
-    nullable octet_string<16> epochKey2 = 6;
-    nullable epoch_us epochStartTime2 = 7;
+  response struct ScanNetworksResponse = 1 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
+    optional ThreadInterfaceScanResult threadScanResults[] = 3;
   }
 
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
-  readonly attribute int16u maxGroupsPerFabric = 2;
-  readonly attribute int16u maxGroupKeysPerFabric = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct KeySetWriteRequest {
-    GroupKeySetStruct groupKeySet = 0;
+  response struct NetworkConfigResponse = 5 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional INT8U networkIndex = 2;
   }
 
-  request struct KeySetReadRequest {
-    INT16U groupKeySetID = 0;
+  response struct ConnectNetworkResponse = 7 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    nullable INT32S errorValue = 2;
   }
 
-  request struct KeySetRemoveRequest {
-    INT16U groupKeySetID = 0;
-  }
+  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
+  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
+  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
+  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
+  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
+  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+}
 
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
+server cluster DiagnosticLogs = 50 {
+  enum LogsIntent : ENUM8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
   }
 
-  response struct KeySetReadResponse = 2 {
-    GroupKeySetStruct groupKeySet = 0;
+  enum LogsStatus : ENUM8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
   }
 
-  response struct KeySetReadAllIndicesResponse = 5 {
-    INT16U groupKeySetIDs[] = 0;
+  enum LogsTransferProtocol : ENUM8 {
+    kResponsePayload = 0;
+    kBdx = 1;
   }
 
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
-}
-
-client cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AddGroupRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+  request struct RetrieveLogsRequestRequest {
+    LogsIntent intent = 0;
+    LogsTransferProtocol requestedProtocol = 1;
+    OCTET_STRING transferFileDesignator = 2;
   }
 
-  request struct ViewGroupRequest {
-    group_id groupId = 0;
-  }
+  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+}
 
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
   }
 
-  request struct RemoveGroupRequest {
-    group_id groupId = 0;
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
   }
 
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
   }
 
-  response struct AddGroupResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
   }
 
-  response struct ViewGroupResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    CHAR_STRING groupName = 2;
+  enum RadioFaultType : ENUM8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
   }
 
-  response struct GetGroupMembershipResponse = 2 {
-    nullable INT8U capacity = 0;
-    group_id groupList[] = 1;
+  struct NetworkInterfaceType {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceType type = 7;
   }
 
-  response struct RemoveGroupResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultType current[] = 0;
+    HardwareFaultType previous[] = 1;
   }
 
-  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
-}
-
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
+  critical event RadioFaultChange = 1 {
+    RadioFaultType current[] = 0;
+    RadioFaultType previous[] = 1;
   }
 
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultType current[] = 0;
+    NetworkFaultType previous[] = 1;
   }
 
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
+  critical event BootReason = 3 {
+    BootReasonType bootReason = 0;
   }
 
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
+  readonly attribute int32u totalOperationalHours = 3;
+  readonly attribute enum8 bootReasons = 4;
+  readonly attribute ENUM8 activeHardwareFaults[] = 5;
+  readonly attribute ENUM8 activeRadioFaults[] = 6;
+  readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
   }
 
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
-server cluster LocalizationConfiguration = 43 {
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
+server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
+  }
+
+  struct ThreadMetrics {
+    int64u id = 0;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
+  }
+
+  info event SoftwareFault = 0 {
+    SoftwareFaultStruct softwareFault = 0;
+  }
+
+  readonly attribute ThreadMetrics threadMetrics[] = 0;
+  readonly attribute int64u currentHeapFree = 1;
+  readonly attribute int64u currentHeapUsed = 2;
+  readonly attribute int64u currentHeapHighWatermark = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  command ResetWatermarks(): DefaultSuccess = 0;
 }
 
-server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatus : ENUM8 {
-    kSuccess = 0;
-    kOutOfRange = 1;
-    kBoundsExceeded = 2;
-    kNetworkIDNotFound = 3;
-    kDuplicateNetworkID = 4;
-    kNetworkNotFound = 5;
-    kRegulatoryError = 6;
-    kAuthFailure = 7;
-    kUnsupportedSecurity = 8;
-    kOtherConnectionFailure = 9;
-    kIPV6Failed = 10;
-    kIPBindFailed = 11;
-    kUnknownError = 12;
+server cluster ThreadNetworkDiagnostics = 53 {
+  enum NetworkFault : ENUM8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
   }
 
-  enum WiFiBand : ENUM8 {
-    k2g4 = 0;
-    k3g65 = 1;
-    k5g = 2;
-    k6g = 3;
-    k60g = 4;
+  enum RoutingRole : ENUM8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kReed = 4;
+    kRouter = 5;
+    kLeader = 6;
   }
 
-  bitmap NetworkCommissioningFeature : BITMAP32 {
-    kWiFiNetworkInterface = 0x1;
-    kThreadNetworkInterface = 0x2;
-    kEthernetNetworkInterface = 0x4;
+  enum ThreadConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  bitmap WiFiSecurity : BITMAP8 {
-    kUnencrypted = 0x1;
-    kWepPersonal = 0x2;
-    kWpaPersonal = 0x4;
-    kWpa2Personal = 0x8;
-    kWpa3Personal = 0x10;
+  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+    kMLECounts = 0x4;
+    kMACCounts = 0x8;
   }
 
-  struct NetworkInfo {
-    octet_string<32> networkID = 0;
-    boolean connected = 1;
+  struct NeighborTable {
+    int64u extAddress = 0;
+    int32u age = 1;
+    int16u rloc16 = 2;
+    int32u linkFrameCounter = 3;
+    int32u mleFrameCounter = 4;
+    int8u lqi = 5;
+    nullable int8s averageRssi = 6;
+    nullable int8s lastRssi = 7;
+    int8u frameErrorRate = 8;
+    int8u messageErrorRate = 9;
+    boolean rxOnWhenIdle = 10;
+    boolean fullThreadDevice = 11;
+    boolean fullNetworkData = 12;
+    boolean isChild = 13;
   }
 
-  struct WiFiInterfaceScanResult {
-    WiFiSecurity security = 0;
-    octet_string<32> ssid = 1;
-    octet_string<6> bssid = 2;
-    int16u channel = 3;
-    WiFiBand wiFiBand = 4;
-    int8s rssi = 5;
+  struct RouteTable {
+    int64u extAddress = 0;
+    int16u rloc16 = 1;
+    int8u routerId = 2;
+    int8u nextHop = 3;
+    int8u pathCost = 4;
+    int8u LQIIn = 5;
+    int8u LQIOut = 6;
+    int8u age = 7;
+    boolean allocated = 8;
+    boolean linkEstablished = 9;
   }
 
-  struct ThreadInterfaceScanResult {
-    int16u panId = 0;
-    int64u extendedPanId = 1;
-    char_string<16> networkName = 2;
-    int16u channel = 3;
-    int8u version = 4;
-    octet_string<8> extendedAddress = 5;
-    int8s rssi = 6;
-    int8u lqi = 7;
+  struct SecurityPolicy {
+    int16u rotationTime = 0;
+    bitmap16 flags = 1;
   }
 
-  readonly attribute access(read: administer) int8u maxNetworks = 0;
-  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
-  readonly attribute int8u scanMaxTimeSeconds = 2;
-  readonly attribute int8u connectMaxTimeSeconds = 3;
-  attribute access(write: administer) boolean interfaceEnabled = 4;
-  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
-  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
-  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  struct OperationalDatasetComponents {
+    boolean activeTimestampPresent = 0;
+    boolean pendingTimestampPresent = 1;
+    boolean masterKeyPresent = 2;
+    boolean networkNamePresent = 3;
+    boolean extendedPanIdPresent = 4;
+    boolean meshLocalPrefixPresent = 5;
+    boolean delayPresent = 6;
+    boolean panIdPresent = 7;
+    boolean channelPresent = 8;
+    boolean pskcPresent = 9;
+    boolean securityPolicyPresent = 10;
+    boolean channelMaskPresent = 11;
+  }
+
+  info event ConnectionStatus = 0 {
+    ThreadConnectionStatus connectionStatus = 0;
+  }
+
+  readonly attribute nullable int16u channel = 0;
+  readonly attribute nullable RoutingRole routingRole = 1;
+  readonly attribute nullable char_string<16> networkName = 2;
+  readonly attribute nullable int16u panId = 3;
+  readonly attribute nullable int64u extendedPanId = 4;
+  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute NeighborTable neighborTableList[] = 7;
+  readonly attribute RouteTable routeTableList[] = 8;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
+  readonly attribute int16u detachedRoleCount = 14;
+  readonly attribute int16u childRoleCount = 15;
+  readonly attribute int16u routerRoleCount = 16;
+  readonly attribute int16u leaderRoleCount = 17;
+  readonly attribute int16u attachAttemptCount = 18;
+  readonly attribute int16u partitionIdChangeCount = 19;
+  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
+  readonly attribute int16u parentChangeCount = 21;
+  readonly attribute int32u txTotalCount = 22;
+  readonly attribute int32u txUnicastCount = 23;
+  readonly attribute int32u txBroadcastCount = 24;
+  readonly attribute int32u txAckRequestedCount = 25;
+  readonly attribute int32u txAckedCount = 26;
+  readonly attribute int32u txNoAckRequestedCount = 27;
+  readonly attribute int32u txDataCount = 28;
+  readonly attribute int32u txDataPollCount = 29;
+  readonly attribute int32u txBeaconCount = 30;
+  readonly attribute int32u txBeaconRequestCount = 31;
+  readonly attribute int32u txOtherCount = 32;
+  readonly attribute int32u txRetryCount = 33;
+  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
+  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
+  readonly attribute int32u txErrCcaCount = 36;
+  readonly attribute int32u txErrAbortCount = 37;
+  readonly attribute int32u txErrBusyChannelCount = 38;
+  readonly attribute int32u rxTotalCount = 39;
+  readonly attribute int32u rxUnicastCount = 40;
+  readonly attribute int32u rxBroadcastCount = 41;
+  readonly attribute int32u rxDataCount = 42;
+  readonly attribute int32u rxDataPollCount = 43;
+  readonly attribute int32u rxBeaconCount = 44;
+  readonly attribute int32u rxBeaconRequestCount = 45;
+  readonly attribute int32u rxOtherCount = 46;
+  readonly attribute int32u rxAddressFilteredCount = 47;
+  readonly attribute int32u rxDestAddrFilteredCount = 48;
+  readonly attribute int32u rxDuplicatedCount = 49;
+  readonly attribute int32u rxErrNoFrameCount = 50;
+  readonly attribute int32u rxErrUnknownNeighborCount = 51;
+  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
+  readonly attribute int32u rxErrSecCount = 53;
+  readonly attribute int32u rxErrFcsCount = 54;
+  readonly attribute int32u rxErrOtherCount = 55;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
+  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct ScanNetworksRequest {
-    optional nullable OCTET_STRING ssid = 0;
-    optional INT64U breadcrumb = 1;
-  }
+  command ResetCounts(): DefaultSuccess = 0;
+}
 
-  request struct AddOrUpdateWiFiNetworkRequest {
-    OCTET_STRING ssid = 0;
-    OCTET_STRING credentials = 1;
-    optional INT64U breadcrumb = 2;
+server cluster WiFiNetworkDiagnostics = 54 {
+  enum AssociationFailureCause : ENUM8 {
+    kUnknown = 0;
+    kAssociationFailed = 1;
+    kAuthenticationFailed = 2;
+    kSsidNotFound = 3;
   }
 
-  request struct AddOrUpdateThreadNetworkRequest {
-    OCTET_STRING operationalDataset = 0;
-    optional INT64U breadcrumb = 1;
+  enum SecurityType : ENUM8 {
+    kUnspecified = 0;
+    kNone = 1;
+    kWep = 2;
+    kWpa = 3;
+    kWpa2 = 4;
+    kWpa3 = 5;
   }
 
-  request struct RemoveNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
+  enum WiFiConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  request struct ConnectNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
+  enum WiFiVersionType : ENUM8 {
+    k80211a = 0;
+    k80211b = 1;
+    k80211g = 2;
+    k80211n = 3;
+    k80211ac = 4;
+    k80211ax = 5;
   }
 
-  request struct ReorderNetworkRequest {
-    OCTET_STRING networkID = 0;
-    INT8U networkIndex = 1;
-    optional INT64U breadcrumb = 2;
+  info event Disconnection = 0 {
+    INT16U reasonCode = 0;
   }
 
-  response struct ScanNetworksResponse = 1 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
-    optional ThreadInterfaceScanResult threadScanResults[] = 3;
+  info event AssociationFailure = 1 {
+    AssociationFailureCause associationFailure = 0;
+    INT16U status = 1;
   }
 
-  response struct NetworkConfigResponse = 5 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional INT8U networkIndex = 2;
+  info event ConnectionStatus = 2 {
+    WiFiConnectionStatus connectionStatus = 0;
   }
 
-  response struct ConnectNetworkResponse = 7 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    nullable INT32S errorValue = 2;
-  }
+  readonly attribute nullable octet_string<6> bssid = 0;
+  readonly attribute nullable SecurityType securityType = 1;
+  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
+  readonly attribute nullable int16u channelNumber = 3;
+  readonly attribute nullable int8s rssi = 4;
+  readonly attribute int32u beaconLostCount = 5;
+  readonly attribute int32u beaconRxCount = 6;
+  readonly attribute int32u packetMulticastRxCount = 7;
+  readonly attribute int32u packetMulticastTxCount = 8;
+  readonly attribute int32u packetUnicastRxCount = 9;
+  readonly attribute int32u packetUnicastTxCount = 10;
+  readonly attribute int64u currentMaxRate = 11;
+  readonly attribute int64u overrunCount = 12;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
-  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
-  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
-  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
-  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
-  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
-client cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
-  }
-
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
-  }
-
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
   }
 
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
+  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
-  }
-
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
-  }
+  command ResetCounts(): DefaultSuccess = 0;
+}
 
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
+server cluster Switch = 59 {
+  info event SwitchLatched = 0 {
+    INT8U newPosition = 0;
   }
 
-  response struct QueryImageResponse = 1 {
-    OTAQueryStatus status = 0;
-    optional INT32U delayedActionTime = 1;
-    optional CHAR_STRING imageURI = 2;
-    optional INT32U softwareVersion = 3;
-    optional CHAR_STRING softwareVersionString = 4;
-    optional OCTET_STRING updateToken = 5;
-    optional BOOLEAN userConsentNeeded = 6;
-    optional OCTET_STRING metadataForRequestor = 7;
+  info event InitialPress = 1 {
+    INT8U newPosition = 0;
   }
 
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
+  info event LongPress = 2 {
+    INT8U newPosition = 0;
   }
 
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
-}
-
-server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum OTAAnnouncementReason : ENUM8 {
-    kSimpleAnnouncement = 0;
-    kUpdateAvailable = 1;
-    kUrgentUpdateAvailable = 2;
+  info event ShortRelease = 3 {
+    INT8U previousPosition = 0;
   }
 
-  enum OTAChangeReasonEnum : ENUM8 {
-    kUnknown = 0;
-    kSuccess = 1;
-    kFailure = 2;
-    kTimeOut = 3;
-    kDelayByProvider = 4;
+  info event LongRelease = 4 {
+    INT8U previousPosition = 0;
   }
 
-  enum OTAUpdateStateEnum : ENUM8 {
-    kUnknown = 0;
-    kIdle = 1;
-    kQuerying = 2;
-    kDelayedOnQuery = 3;
-    kDownloading = 4;
-    kApplying = 5;
-    kDelayedOnApply = 6;
-    kRollingBack = 7;
-    kDelayedOnUserConsent = 8;
+  info event MultiPressOngoing = 5 {
+    INT8U newPosition = 0;
+    INT8U currentNumberOfPressesCounted = 1;
   }
 
-  struct ProviderLocation {
-    node_id providerNodeID = 1;
-    endpoint_no endpoint = 2;
-    fabric_idx fabricIndex = 254;
+  info event MultiPressComplete = 6 {
+    INT8U newPosition = 0;
+    INT8U totalNumberOfPressesCounted = 1;
   }
 
-  info event StateTransition = 0 {
-    OTAUpdateStateEnum previousState = 0;
-    OTAUpdateStateEnum newState = 1;
-    OTAChangeReasonEnum reason = 2;
-    nullable INT32U targetSoftwareVersion = 3;
-  }
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  critical event VersionApplied = 1 {
-    INT32U softwareVersion = 0;
-    INT16U productID = 1;
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
   }
 
-  info event DownloadError = 2 {
-    INT32U softwareVersion = 0;
-    INT64U bytesDownloaded = 1;
-    nullable INT8U progressPercent = 2;
-    nullable INT64S platformCode = 3;
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
   }
 
-  attribute ProviderLocation defaultOtaProviders[] = 0;
-  readonly attribute boolean updatePossible = 1;
-  readonly attribute OTAUpdateStateEnum updateState = 2;
-  readonly attribute nullable int8u updateStateProgress = 3;
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AnnounceOtaProviderRequest {
-    node_id providerNodeId = 0;
-    vendor_id vendorId = 1;
-    OTAAnnouncementReason announcementReason = 2;
-    optional OCTET_STRING metadataForNode = 3;
-    endpoint_no endpoint = 4;
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
   }
 
-  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+  }
+
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
 server cluster OperationalCredentials = 62 {
@@ -930,354 +1151,133 @@ server cluster OperationalCredentials = 62 {
     CHAR_STRING label = 0;
   }
 
-  request struct RemoveFabricRequest {
-    fabric_idx fabricIndex = 0;
-  }
-
-  request struct AddTrustedRootCertificateRequest {
-    OCTET_STRING rootCertificate = 0;
-  }
-
-  response struct AttestationResponse = 1 {
-    OCTET_STRING attestationElements = 0;
-    OCTET_STRING signature = 1;
-  }
-
-  response struct CertificateChainResponse = 3 {
-    OCTET_STRING certificate = 0;
-  }
-
-  response struct CSRResponse = 5 {
-    OCTET_STRING NOCSRElements = 0;
-    OCTET_STRING attestationSignature = 1;
-  }
-
-  response struct NOCResponse = 8 {
-    OperationalCertStatus statusCode = 0;
-    optional fabric_idx fabricIndex = 1;
-    optional CHAR_STRING debugText = 2;
-  }
-
-  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
-  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
-  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
-  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
-  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
-  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
-  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
-  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-}
-
-server cluster SoftwareDiagnostics = 52 {
-  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
-    kWaterMarks = 0x1;
-  }
-
-  struct ThreadMetrics {
-    int64u id = 0;
-    optional char_string<8> name = 1;
-    optional int32u stackFreeCurrent = 2;
-    optional int32u stackFreeMinimum = 3;
-    optional int32u stackSize = 4;
-  }
-
-  info event SoftwareFault = 0 {
-    SoftwareFaultStruct softwareFault = 0;
-  }
-
-  readonly attribute ThreadMetrics threadMetrics[] = 0;
-  readonly attribute int64u currentHeapFree = 1;
-  readonly attribute int64u currentHeapUsed = 2;
-  readonly attribute int64u currentHeapHighWatermark = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command ResetWatermarks(): DefaultSuccess = 0;
-}
-
-server cluster Switch = 59 {
-  info event SwitchLatched = 0 {
-    INT8U newPosition = 0;
-  }
-
-  info event InitialPress = 1 {
-    INT8U newPosition = 0;
-  }
-
-  info event LongPress = 2 {
-    INT8U newPosition = 0;
-  }
-
-  info event ShortRelease = 3 {
-    INT8U previousPosition = 0;
-  }
-
-  info event LongRelease = 4 {
-    INT8U previousPosition = 0;
-  }
-
-  info event MultiPressOngoing = 5 {
-    INT8U newPosition = 0;
-    INT8U currentNumberOfPressesCounted = 1;
-  }
-
-  info event MultiPressComplete = 6 {
-    INT8U newPosition = 0;
-    INT8U totalNumberOfPressesCounted = 1;
-  }
-
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster ThreadNetworkDiagnostics = 53 {
-  enum NetworkFault : ENUM8 {
-    kUnspecified = 0;
-    kLinkDown = 1;
-    kHardwareFailure = 2;
-    kNetworkJammed = 3;
-  }
-
-  enum RoutingRole : ENUM8 {
-    kUnspecified = 0;
-    kUnassigned = 1;
-    kSleepyEndDevice = 2;
-    kEndDevice = 3;
-    kReed = 4;
-    kRouter = 5;
-    kLeader = 6;
-  }
-
-  enum ThreadConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
-  }
-
-  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
-    kPacketCounts = 0x1;
-    kErrorCounts = 0x2;
-    kMLECounts = 0x4;
-    kMACCounts = 0x8;
-  }
-
-  struct NeighborTable {
-    int64u extAddress = 0;
-    int32u age = 1;
-    int16u rloc16 = 2;
-    int32u linkFrameCounter = 3;
-    int32u mleFrameCounter = 4;
-    int8u lqi = 5;
-    nullable int8s averageRssi = 6;
-    nullable int8s lastRssi = 7;
-    int8u frameErrorRate = 8;
-    int8u messageErrorRate = 9;
-    boolean rxOnWhenIdle = 10;
-    boolean fullThreadDevice = 11;
-    boolean fullNetworkData = 12;
-    boolean isChild = 13;
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
   }
 
-  struct RouteTable {
-    int64u extAddress = 0;
-    int16u rloc16 = 1;
-    int8u routerId = 2;
-    int8u nextHop = 3;
-    int8u pathCost = 4;
-    int8u LQIIn = 5;
-    int8u LQIOut = 6;
-    int8u age = 7;
-    boolean allocated = 8;
-    boolean linkEstablished = 9;
+  request struct AddTrustedRootCertificateRequest {
+    OCTET_STRING rootCertificate = 0;
   }
 
-  struct SecurityPolicy {
-    int16u rotationTime = 0;
-    bitmap16 flags = 1;
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
   }
 
-  struct OperationalDatasetComponents {
-    boolean activeTimestampPresent = 0;
-    boolean pendingTimestampPresent = 1;
-    boolean masterKeyPresent = 2;
-    boolean networkNamePresent = 3;
-    boolean extendedPanIdPresent = 4;
-    boolean meshLocalPrefixPresent = 5;
-    boolean delayPresent = 6;
-    boolean panIdPresent = 7;
-    boolean channelPresent = 8;
-    boolean pskcPresent = 9;
-    boolean securityPolicyPresent = 10;
-    boolean channelMaskPresent = 11;
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
   }
 
-  info event ConnectionStatus = 0 {
-    ThreadConnectionStatus connectionStatus = 0;
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
   }
 
-  readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable RoutingRole routingRole = 1;
-  readonly attribute nullable char_string<16> networkName = 2;
-  readonly attribute nullable int16u panId = 3;
-  readonly attribute nullable int64u extendedPanId = 4;
-  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute NeighborTable neighborTableList[] = 7;
-  readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
-  readonly attribute nullable int8u leaderRouterId = 13;
-  readonly attribute int16u detachedRoleCount = 14;
-  readonly attribute int16u childRoleCount = 15;
-  readonly attribute int16u routerRoleCount = 16;
-  readonly attribute int16u leaderRoleCount = 17;
-  readonly attribute int16u attachAttemptCount = 18;
-  readonly attribute int16u partitionIdChangeCount = 19;
-  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
-  readonly attribute int16u parentChangeCount = 21;
-  readonly attribute int32u txTotalCount = 22;
-  readonly attribute int32u txUnicastCount = 23;
-  readonly attribute int32u txBroadcastCount = 24;
-  readonly attribute int32u txAckRequestedCount = 25;
-  readonly attribute int32u txAckedCount = 26;
-  readonly attribute int32u txNoAckRequestedCount = 27;
-  readonly attribute int32u txDataCount = 28;
-  readonly attribute int32u txDataPollCount = 29;
-  readonly attribute int32u txBeaconCount = 30;
-  readonly attribute int32u txBeaconRequestCount = 31;
-  readonly attribute int32u txOtherCount = 32;
-  readonly attribute int32u txRetryCount = 33;
-  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
-  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
-  readonly attribute int32u txErrCcaCount = 36;
-  readonly attribute int32u txErrAbortCount = 37;
-  readonly attribute int32u txErrBusyChannelCount = 38;
-  readonly attribute int32u rxTotalCount = 39;
-  readonly attribute int32u rxUnicastCount = 40;
-  readonly attribute int32u rxBroadcastCount = 41;
-  readonly attribute int32u rxDataCount = 42;
-  readonly attribute int32u rxDataPollCount = 43;
-  readonly attribute int32u rxBeaconCount = 44;
-  readonly attribute int32u rxBeaconRequestCount = 45;
-  readonly attribute int32u rxOtherCount = 46;
-  readonly attribute int32u rxAddressFilteredCount = 47;
-  readonly attribute int32u rxDestAddrFilteredCount = 48;
-  readonly attribute int32u rxDuplicatedCount = 49;
-  readonly attribute int32u rxErrNoFrameCount = 50;
-  readonly attribute int32u rxErrUnknownNeighborCount = 51;
-  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
-  readonly attribute int32u rxErrSecCount = 53;
-  readonly attribute int32u rxErrFcsCount = 54;
-  readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute nullable int64u activeTimestamp = 56;
-  readonly attribute nullable int64u pendingTimestamp = 57;
-  readonly attribute nullable int32u delay = 58;
-  readonly attribute nullable SecurityPolicy securityPolicy = 59;
-  readonly attribute nullable octet_string<4> channelMask = 60;
-  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
-  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
+  }
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
 }
 
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
   }
 
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
 
-server cluster UserLabel = 65 {
-  attribute access(write: manage) LabelStruct labelList[] = 0;
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCause : ENUM8 {
-    kUnknown = 0;
-    kAssociationFailed = 1;
-    kAuthenticationFailed = 2;
-    kSsidNotFound = 3;
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  enum SecurityType : ENUM8 {
-    kUnspecified = 0;
-    kNone = 1;
-    kWep = 2;
-    kWpa = 3;
-    kWpa2 = 4;
-    kWpa3 = 5;
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  enum WiFiConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  enum WiFiVersionType : ENUM8 {
-    k80211a = 0;
-    k80211b = 1;
-    k80211g = 2;
-    k80211n = 3;
-    k80211ac = 4;
-    k80211ax = 5;
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  info event Disconnection = 0 {
-    INT16U reasonCode = 0;
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  info event AssociationFailure = 1 {
-    AssociationFailureCause associationFailure = 0;
-    INT16U status = 1;
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  info event ConnectionStatus = 2 {
-    WiFiConnectionStatus connectionStatus = 0;
-  }
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
 
-  readonly attribute nullable octet_string<6> bssid = 0;
-  readonly attribute nullable SecurityType securityType = 1;
-  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
-  readonly attribute nullable int16u channelNumber = 3;
-  readonly attribute nullable int8s rssi = 4;
-  readonly attribute int32u beaconLostCount = 5;
-  readonly attribute int32u beaconRxCount = 6;
-  readonly attribute int32u packetMulticastRxCount = 7;
-  readonly attribute int32u packetMulticastTxCount = 8;
-  readonly attribute int32u packetUnicastRxCount = 9;
-  readonly attribute int32u packetUnicastTxCount = 10;
-  readonly attribute int64u currentMaxRate = 11;
-  readonly attribute int64u overrunCount = 12;
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  command ResetCounts(): DefaultSuccess = 0;
+server cluster UserLabel = 65 {
+  attribute access(write: manage) LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster FlowMeasurement = 1028 {
+  readonly attribute nullable int16u measuredValue = 0;
+  readonly attribute nullable int16u minMeasuredValue = 1;
+  readonly attribute nullable int16u maxMeasuredValue = 2;
+  readonly attribute int16u tolerance = 3;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
 endpoint 0 {
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_Yt3sl2ssuP.matter b/examples/chef/devices/rootnode_heatingcoolingunit_Yt3sl2ssuP.matter
index 6e096faaa24891..671c5581b2e8aa 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_Yt3sl2ssuP.matter
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_Yt3sl2ssuP.matter
@@ -6,706 +6,699 @@ struct LabelStruct {
     char_string<16> value = 1;
 }
 
-server cluster AccessControl = 31 {
-  enum AuthMode : ENUM8 {
-    kPase = 1;
-    kCase = 2;
-    kGroup = 3;
-  }
-
-  enum ChangeTypeEnum : ENUM8 {
-    kChanged = 0;
-    kAdded = 1;
-    kRemoved = 2;
-  }
-
-  enum Privilege : ENUM8 {
-    kView = 1;
-    kProxyView = 2;
-    kOperate = 3;
-    kManage = 4;
-    kAdminister = 5;
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
   }
 
-  struct AccessControlEntry {
-    Privilege privilege = 1;
-    AuthMode authMode = 2;
-    nullable int64u subjects[] = 3;
-    nullable Target targets[] = 4;
-    fabric_idx fabricIndex = 254;
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
   }
 
-  struct Target {
-    nullable cluster_id cluster = 0;
-    nullable endpoint_no endpoint = 1;
-    nullable devtype_id deviceType = 2;
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
   }
 
-  struct ExtensionEntry {
-    octet_string<128> data = 1;
-    fabric_idx fabricIndex = 254;
-  }
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  info event access(read: administer) AccessControlEntryChanged = 0 {
-    nullable node_id adminNodeID = 1;
-    nullable INT16U adminPasscodeID = 2;
-    ChangeTypeEnum changeType = 3;
-    nullable AccessControlEntry latestValue = 4;
-    fabric_idx adminFabricIndex = 254;
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
   }
 
-  info event access(read: administer) AccessControlExtensionChanged = 1 {
-    nullable node_id adminNodeID = 1;
-    nullable INT16U adminPasscodeID = 2;
-    ChangeTypeEnum changeType = 3;
-    nullable ExtensionEntry latestValue = 4;
-    fabric_idx adminFabricIndex = 254;
-  }
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+}
 
-  attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
-  attribute access(read: administer, write: administer) ExtensionEntry extension[] = 1;
+server cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
+  request struct AddGroupRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
   }
 
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
+  request struct ViewGroupRequest {
+    group_id groupId = 0;
   }
 
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
   }
 
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
+  request struct RemoveGroupRequest {
+    group_id groupId = 0;
   }
 
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
 
-server cluster Basic = 40 {
-  critical event StartUp = 0 {
-    INT32U softwareVersion = 0;
+  response struct AddGroupResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  critical event ShutDown = 1 {
+  response struct ViewGroupResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    CHAR_STRING groupName = 2;
   }
 
-  info event Leave = 2 {
+  response struct GetGroupMembershipResponse = 2 {
+    nullable INT8U capacity = 0;
+    group_id groupList[] = 1;
   }
 
-  info event ReachableChanged = 3 {
-    boolean reachableNewValue = 0;
+  response struct RemoveGroupResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  readonly attribute int16u dataModelRevision = 0;
-  readonly attribute char_string<32> vendorName = 1;
-  readonly attribute vendor_id vendorID = 2;
-  readonly attribute char_string<32> productName = 3;
-  readonly attribute int16u productID = 4;
-  attribute access(write: manage) char_string<32> nodeLabel = 5;
-  attribute access(write: administer) char_string<2> location = 6;
-  readonly attribute int16u hardwareVersion = 7;
-  readonly attribute char_string<64> hardwareVersionString = 8;
-  readonly attribute int32u softwareVersion = 9;
-  readonly attribute char_string<64> softwareVersionString = 10;
-  readonly attribute char_string<16> manufacturingDate = 11;
-  readonly attribute char_string<32> partNumber = 12;
-  readonly attribute long_char_string<256> productURL = 13;
-  readonly attribute char_string<64> productLabel = 14;
-  readonly attribute char_string<32> serialNumber = 15;
-  attribute access(write: manage) boolean localConfigDisabled = 16;
-  readonly attribute boolean reachable = 17;
-  readonly attribute char_string<32> uniqueID = 18;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
 }
 
-client cluster Binding = 30 {
-  struct TargetStruct {
-    optional node_id node = 1;
-    optional group_id group = 2;
-    optional endpoint_no endpoint = 3;
-    optional cluster_id cluster = 4;
-    fabric_idx fabricIndex = 254;
+server cluster Scenes = 5 {
+  bitmap ScenesCopyMode : BITMAP8 {
+    kCopyAllScenes = 0x1;
   }
 
-  attribute TargetStruct binding[] = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  struct ExtensionFieldSet {
+    cluster_id clusterId = 0;
+    AttributeValuePair attributeValueList[] = 1;
+  }
 
-server cluster Descriptor = 29 {
-  struct DeviceType {
-    devtype_id type = 0;
-    int16u revision = 1;
+  struct AttributeValuePair {
+    optional attrib_id attributeId = 0;
+    int8u attributeValue[] = 1;
   }
 
-  readonly attribute DeviceType deviceList[] = 0;
-  readonly attribute CLUSTER_ID serverList[] = 1;
-  readonly attribute CLUSTER_ID clientList[] = 2;
-  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute int8u sceneCount = 0;
+  readonly attribute int8u currentScene = 1;
+  readonly attribute group_id currentGroup = 2;
+  readonly attribute boolean sceneValid = 3;
+  readonly attribute bitmap8 nameSupport = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster DiagnosticLogs = 50 {
-  enum LogsIntent : ENUM8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
+  request struct AddSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    INT16U transitionTime = 2;
+    CHAR_STRING sceneName = 3;
+    ExtensionFieldSet extensionFieldSets[] = 4;
   }
 
-  enum LogsStatus : ENUM8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
+  request struct ViewSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  enum LogsTransferProtocol : ENUM8 {
-    kResponsePayload = 0;
-    kBdx = 1;
+  request struct RemoveSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  request struct RemoveAllScenesRequest {
+    group_id groupId = 0;
+  }
 
-  request struct RetrieveLogsRequestRequest {
-    LogsIntent intent = 0;
-    LogsTransferProtocol requestedProtocol = 1;
-    OCTET_STRING transferFileDesignator = 2;
+  request struct StoreSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
-}
+  request struct RecallSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    optional nullable INT16U transitionTime = 2;
+  }
 
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
+  request struct GetSceneMembershipRequest {
+    group_id groupId = 0;
   }
 
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  response struct AddSceneResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+  }
 
-  command ResetCounts(): DefaultSuccess = 0;
+  response struct ViewSceneResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+    optional INT16U transitionTime = 3;
+    optional CHAR_STRING sceneName = 4;
+    optional ExtensionFieldSet extensionFieldSets[] = 5;
+  }
+
+  response struct RemoveSceneResponse = 2 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+  }
+
+  response struct RemoveAllScenesResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  response struct StoreSceneResponse = 4 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+  }
+
+  response struct GetSceneMembershipResponse = 6 {
+    ENUM8 status = 0;
+    nullable INT8U capacity = 1;
+    group_id groupId = 2;
+    optional INT8U sceneList[] = 3;
+  }
+
+  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
+  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
+  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
+  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
+  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
+  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
+  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
 }
 
-server cluster FanControl = 514 {
-  enum FanModeSequenceType : ENUM8 {
-    kOffLowMedHigh = 0;
-    kOffLowHigh = 1;
-    kOffLowMedHighAuto = 2;
-    kOffLowHighAuto = 3;
-    kOffOnAuto = 4;
-    kOffOn = 5;
+server cluster OnOff = 6 {
+  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
+    kFadeToOffIn0p8Seconds = 0;
+    kNoFade = 1;
+    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
   }
 
-  enum FanModeType : ENUM8 {
-    kOff = 0;
-    kLow = 1;
-    kMedium = 2;
-    kHigh = 3;
-    kOn = 4;
-    kAuto = 5;
-    kSmart = 6;
+  enum OnOffDyingLightEffectVariant : ENUM8 {
+    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
   }
 
-  bitmap FanControlFeature : BITMAP32 {
-    kMultiSpeed = 0x1;
-    kAuto = 0x2;
-    kRocking = 0x4;
-    kWind = 0x8;
+  enum OnOffEffectIdentifier : ENUM8 {
+    kDelayedAllOff = 0;
+    kDyingLight = 1;
   }
 
-  bitmap RockSupportMask : BITMAP8 {
-    kRockLeftRight = 0x1;
-    kRockUpDown = 0x2;
-    kRockRound = 0x4;
+  enum OnOffStartUpOnOff : ENUM8 {
+    kOff = 0;
+    kOn = 1;
+    kTogglePreviousOnOff = 2;
   }
 
-  bitmap WindSettingMask : BITMAP8 {
-    kSleepWind = 0x1;
-    kNaturalWind = 0x2;
+  bitmap OnOffControl : BITMAP8 {
+    kAcceptOnlyWhenOn = 0x1;
   }
 
-  bitmap WindSupportMask : BITMAP8 {
-    kSleepWind = 0x1;
-    kNaturalWind = 0x2;
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
   }
 
-  attribute FanModeType fanMode = 0;
-  attribute FanModeSequenceType fanModeSequence = 1;
-  attribute nullable int8u percentSetting = 2;
-  readonly attribute int8u percentCurrent = 3;
-  readonly attribute int8u speedMax = 4;
-  attribute nullable int8u speedSetting = 5;
-  readonly attribute int8u speedCurrent = 6;
+  bitmap SceneFeatures : BITMAP32 {
+    kSceneNames = 0x1;
+  }
+
+  readonly attribute boolean onOff = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command Off(): DefaultSuccess = 0;
+  command On(): DefaultSuccess = 1;
+  command Toggle(): DefaultSuccess = 2;
 }
 
-server cluster GeneralCommissioning = 48 {
-  enum CommissioningError : ENUM8 {
-    kOk = 0;
-    kValueOutsideRange = 1;
-    kInvalidAuthentication = 2;
-    kNoFailSafe = 3;
-    kBusyWithOtherAdmin = 4;
+server cluster LevelControl = 8 {
+  enum MoveMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
   }
 
-  enum RegulatoryLocationType : ENUM8 {
-    kIndoor = 0;
-    kOutdoor = 1;
-    kIndoorOutdoor = 2;
+  enum StepMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
   }
 
-  struct BasicCommissioningInfo {
-    int16u failSafeExpiryLengthSeconds = 0;
-    int16u maxCumulativeFailsafeSeconds = 1;
+  bitmap LevelControlFeature : BITMAP32 {
+    kOnOff = 0x1;
+    kLighting = 0x2;
+    kFrequency = 0x4;
   }
 
-  attribute access(write: administer) int64u breadcrumb = 0;
-  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
-  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
-  readonly attribute RegulatoryLocationType locationCapability = 3;
+  readonly attribute int8u currentLevel = 0;
+  readonly attribute int8u minLevel = 2;
+  readonly attribute int8u maxLevel = 3;
+  attribute nullable int8u onLevel = 17;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct ArmFailSafeRequest {
-    INT16U expiryLengthSeconds = 0;
-    INT64U breadcrumb = 1;
+  request struct MoveToLevelRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
   }
 
-  request struct SetRegulatoryConfigRequest {
-    RegulatoryLocationType newRegulatoryConfig = 0;
-    CHAR_STRING countryCode = 1;
-    INT64U breadcrumb = 2;
+  request struct MoveRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
   }
 
-  response struct ArmFailSafeResponse = 1 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  request struct StepRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionMask = 3;
+    BITMAP8 optionOverride = 4;
   }
 
-  response struct SetRegulatoryConfigResponse = 3 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  request struct StopRequest {
+    BITMAP8 optionMask = 0;
+    BITMAP8 optionOverride = 1;
   }
 
-  response struct CommissioningCompleteResponse = 5 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  request struct MoveToLevelWithOnOffRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
   }
 
-  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
-  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
-  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
-}
+  request struct MoveWithOnOffRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
+  }
 
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
+  request struct StepWithOnOffRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
   }
 
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
+  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
+  command Move(MoveRequest): DefaultSuccess = 1;
+  command Step(StepRequest): DefaultSuccess = 2;
+  command Stop(StopRequest): DefaultSuccess = 3;
+  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
+  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
+  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
+  command StopWithOnOff(): DefaultSuccess = 7;
+}
+
+server cluster Descriptor = 29 {
+  struct DeviceType {
+    devtype_id type = 0;
+    int16u revision = 1;
   }
 
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
-  }
+  readonly attribute DeviceType deviceList[] = 0;
+  readonly attribute CLUSTER_ID serverList[] = 1;
+  readonly attribute CLUSTER_ID clientList[] = 2;
+  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  enum NetworkFaultType : ENUM8 {
-    kUnspecified = 0;
-    kHardwareFailure = 1;
-    kNetworkJammed = 2;
-    kConnectionFailed = 3;
+client cluster Binding = 30 {
+  struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
   }
 
-  enum RadioFaultType : ENUM8 {
-    kUnspecified = 0;
-    kWiFiFault = 1;
-    kCellularFault = 2;
-    kThreadFault = 3;
-    kNFCFault = 4;
-    kBLEFault = 5;
-    kEthernetFault = 6;
+  attribute TargetStruct binding[] = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster AccessControl = 31 {
+  enum AuthMode : ENUM8 {
+    kPase = 1;
+    kCase = 2;
+    kGroup = 3;
   }
 
-  struct NetworkInterfaceType {
-    char_string<32> name = 0;
-    boolean isOperational = 1;
-    nullable boolean offPremiseServicesReachableIPv4 = 2;
-    nullable boolean offPremiseServicesReachableIPv6 = 3;
-    octet_string<8> hardwareAddress = 4;
-    octet_string IPv4Addresses[] = 5;
-    octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+  enum ChangeTypeEnum : ENUM8 {
+    kChanged = 0;
+    kAdded = 1;
+    kRemoved = 2;
   }
 
-  critical event HardwareFaultChange = 0 {
-    HardwareFaultType current[] = 0;
-    HardwareFaultType previous[] = 1;
+  enum Privilege : ENUM8 {
+    kView = 1;
+    kProxyView = 2;
+    kOperate = 3;
+    kManage = 4;
+    kAdminister = 5;
   }
 
-  critical event RadioFaultChange = 1 {
-    RadioFaultType current[] = 0;
-    RadioFaultType previous[] = 1;
+  struct AccessControlEntry {
+    Privilege privilege = 1;
+    AuthMode authMode = 2;
+    nullable int64u subjects[] = 3;
+    nullable Target targets[] = 4;
+    fabric_idx fabricIndex = 254;
   }
 
-  critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+  struct Target {
+    nullable cluster_id cluster = 0;
+    nullable endpoint_no endpoint = 1;
+    nullable devtype_id deviceType = 2;
   }
 
-  critical event BootReason = 3 {
-    BootReasonType bootReason = 0;
+  struct ExtensionEntry {
+    octet_string<128> data = 1;
+    fabric_idx fabricIndex = 254;
   }
 
-  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
-  readonly attribute int16u rebootCount = 1;
-  readonly attribute int64u upTime = 2;
-  readonly attribute int32u totalOperationalHours = 3;
-  readonly attribute enum8 bootReasons = 4;
-  readonly attribute ENUM8 activeHardwareFaults[] = 5;
-  readonly attribute ENUM8 activeRadioFaults[] = 6;
-  readonly attribute ENUM8 activeNetworkFaults[] = 7;
-  readonly attribute boolean testEventTriggersEnabled = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  info event access(read: administer) AccessControlEntryChanged = 0 {
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable AccessControlEntry latestValue = 4;
+    fabric_idx adminFabricIndex = 254;
+  }
 
-  request struct TestEventTriggerRequest {
-    OCTET_STRING enableKey = 0;
-    INT64U eventTrigger = 1;
+  info event access(read: administer) AccessControlExtensionChanged = 1 {
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable ExtensionEntry latestValue = 4;
+    fabric_idx adminFabricIndex = 254;
   }
 
-  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
+  attribute access(read: administer, write: administer) ExtensionEntry extension[] = 1;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
+server cluster Basic = 40 {
+  critical event StartUp = 0 {
+    INT32U softwareVersion = 0;
   }
 
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
-    fabric_idx fabricIndex = 254;
+  critical event ShutDown = 1 {
   }
 
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
+  info event Leave = 2 {
   }
 
-  struct GroupKeySetStruct {
-    int16u groupKeySetID = 0;
-    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
-    nullable octet_string<16> epochKey0 = 2;
-    nullable epoch_us epochStartTime0 = 3;
-    nullable octet_string<16> epochKey1 = 4;
-    nullable epoch_us epochStartTime1 = 5;
-    nullable octet_string<16> epochKey2 = 6;
-    nullable epoch_us epochStartTime2 = 7;
+  info event ReachableChanged = 3 {
+    boolean reachableNewValue = 0;
   }
 
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
-  readonly attribute int16u maxGroupsPerFabric = 2;
-  readonly attribute int16u maxGroupKeysPerFabric = 3;
+  readonly attribute int16u dataModelRevision = 0;
+  readonly attribute char_string<32> vendorName = 1;
+  readonly attribute vendor_id vendorID = 2;
+  readonly attribute char_string<32> productName = 3;
+  readonly attribute int16u productID = 4;
+  attribute access(write: manage) char_string<32> nodeLabel = 5;
+  attribute access(write: administer) char_string<2> location = 6;
+  readonly attribute int16u hardwareVersion = 7;
+  readonly attribute char_string<64> hardwareVersionString = 8;
+  readonly attribute int32u softwareVersion = 9;
+  readonly attribute char_string<64> softwareVersionString = 10;
+  readonly attribute char_string<16> manufacturingDate = 11;
+  readonly attribute char_string<32> partNumber = 12;
+  readonly attribute long_char_string<256> productURL = 13;
+  readonly attribute char_string<64> productLabel = 14;
+  readonly attribute char_string<32> serialNumber = 15;
+  attribute access(write: manage) boolean localConfigDisabled = 16;
+  readonly attribute boolean reachable = 17;
+  readonly attribute char_string<32> uniqueID = 18;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct KeySetWriteRequest {
-    GroupKeySetStruct groupKeySet = 0;
+client cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
   }
 
-  request struct KeySetReadRequest {
-    INT16U groupKeySetID = 0;
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
   }
 
-  request struct KeySetRemoveRequest {
-    INT16U groupKeySetID = 0;
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
   }
 
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
-  }
+  readonly attribute int16u clusterRevision = 65533;
 
-  response struct KeySetReadResponse = 2 {
-    GroupKeySetStruct groupKeySet = 0;
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
   }
 
-  response struct KeySetReadAllIndicesResponse = 5 {
-    INT16U groupKeySetIDs[] = 0;
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
   }
 
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
-}
-
-server cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AddGroupRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
   }
 
-  request struct ViewGroupRequest {
-    group_id groupId = 0;
+  response struct QueryImageResponse = 1 {
+    OTAQueryStatus status = 0;
+    optional INT32U delayedActionTime = 1;
+    optional CHAR_STRING imageURI = 2;
+    optional INT32U softwareVersion = 3;
+    optional CHAR_STRING softwareVersionString = 4;
+    optional OCTET_STRING updateToken = 5;
+    optional BOOLEAN userConsentNeeded = 6;
+    optional OCTET_STRING metadataForRequestor = 7;
   }
 
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
   }
 
-  request struct RemoveGroupRequest {
-    group_id groupId = 0;
-  }
-
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
-  }
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
+}
 
-  response struct AddGroupResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+server cluster OtaSoftwareUpdateRequestor = 42 {
+  enum OTAAnnouncementReason : ENUM8 {
+    kSimpleAnnouncement = 0;
+    kUpdateAvailable = 1;
+    kUrgentUpdateAvailable = 2;
   }
 
-  response struct ViewGroupResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    CHAR_STRING groupName = 2;
+  enum OTAChangeReasonEnum : ENUM8 {
+    kUnknown = 0;
+    kSuccess = 1;
+    kFailure = 2;
+    kTimeOut = 3;
+    kDelayByProvider = 4;
   }
 
-  response struct GetGroupMembershipResponse = 2 {
-    nullable INT8U capacity = 0;
-    group_id groupList[] = 1;
+  enum OTAUpdateStateEnum : ENUM8 {
+    kUnknown = 0;
+    kIdle = 1;
+    kQuerying = 2;
+    kDelayedOnQuery = 3;
+    kDownloading = 4;
+    kApplying = 5;
+    kDelayedOnApply = 6;
+    kRollingBack = 7;
+    kDelayedOnUserConsent = 8;
   }
 
-  response struct RemoveGroupResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  struct ProviderLocation {
+    node_id providerNodeID = 1;
+    endpoint_no endpoint = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
-}
-
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
+  info event StateTransition = 0 {
+    OTAUpdateStateEnum previousState = 0;
+    OTAUpdateStateEnum newState = 1;
+    OTAChangeReasonEnum reason = 2;
+    nullable INT32U targetSoftwareVersion = 3;
   }
 
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
+  critical event VersionApplied = 1 {
+    INT32U softwareVersion = 0;
+    INT16U productID = 1;
   }
 
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
+  info event DownloadError = 2 {
+    INT32U softwareVersion = 0;
+    INT64U bytesDownloaded = 1;
+    nullable INT8U progressPercent = 2;
+    nullable INT64S platformCode = 3;
   }
 
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  attribute ProviderLocation defaultOtaProviders[] = 0;
+  readonly attribute boolean updatePossible = 1;
+  readonly attribute OTAUpdateStateEnum updateState = 2;
+  readonly attribute nullable int8u updateStateProgress = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
+  request struct AnnounceOtaProviderRequest {
+    node_id providerNodeId = 0;
+    vendor_id vendorId = 1;
+    OTAAnnouncementReason announcementReason = 2;
+    optional OCTET_STRING metadataForNode = 3;
+    endpoint_no endpoint = 4;
   }
 
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
 }
 
-server cluster LevelControl = 8 {
-  enum MoveMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
-  }
+server cluster LocalizationConfiguration = 43 {
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  enum StepMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
   }
 
-  bitmap LevelControlFeature : BITMAP32 {
-    kOnOff = 0x1;
-    kLighting = 0x2;
-    kFrequency = 0x4;
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
   }
 
-  readonly attribute int8u currentLevel = 0;
-  readonly attribute int8u minLevel = 2;
-  readonly attribute int8u maxLevel = 3;
-  attribute nullable int8u onLevel = 17;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct MoveToLevelRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
+server cluster GeneralCommissioning = 48 {
+  enum CommissioningError : ENUM8 {
+    kOk = 0;
+    kValueOutsideRange = 1;
+    kInvalidAuthentication = 2;
+    kNoFailSafe = 3;
+    kBusyWithOtherAdmin = 4;
   }
 
-  request struct MoveRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
+  enum RegulatoryLocationType : ENUM8 {
+    kIndoor = 0;
+    kOutdoor = 1;
+    kIndoorOutdoor = 2;
   }
 
-  request struct StepRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionMask = 3;
-    BITMAP8 optionOverride = 4;
+  struct BasicCommissioningInfo {
+    int16u failSafeExpiryLengthSeconds = 0;
+    int16u maxCumulativeFailsafeSeconds = 1;
   }
 
-  request struct StopRequest {
-    BITMAP8 optionMask = 0;
-    BITMAP8 optionOverride = 1;
+  attribute access(write: administer) int64u breadcrumb = 0;
+  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
+  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
+  readonly attribute RegulatoryLocationType locationCapability = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ArmFailSafeRequest {
+    INT16U expiryLengthSeconds = 0;
+    INT64U breadcrumb = 1;
   }
 
-  request struct MoveToLevelWithOnOffRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
+  request struct SetRegulatoryConfigRequest {
+    RegulatoryLocationType newRegulatoryConfig = 0;
+    CHAR_STRING countryCode = 1;
+    INT64U breadcrumb = 2;
   }
 
-  request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
+  response struct ArmFailSafeResponse = 1 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
+  response struct SetRegulatoryConfigResponse = 3 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
-  command Move(MoveRequest): DefaultSuccess = 1;
-  command Step(StepRequest): DefaultSuccess = 2;
-  command Stop(StopRequest): DefaultSuccess = 3;
-  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
-  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
-  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
-  command StopWithOnOff(): DefaultSuccess = 7;
-}
+  response struct CommissioningCompleteResponse = 5 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
+  }
 
-server cluster LocalizationConfiguration = 43 {
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
+  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
+  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
 }
 
 server cluster NetworkCommissioning = 49 {
@@ -842,430 +835,408 @@ server cluster NetworkCommissioning = 49 {
   command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
 }
 
-client cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
+server cluster DiagnosticLogs = 50 {
+  enum LogsIntent : ENUM8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
   }
 
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
+  enum LogsStatus : ENUM8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
   }
 
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
+  enum LogsTransferProtocol : ENUM8 {
+    kResponsePayload = 0;
+    kBdx = 1;
   }
 
+  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
+  request struct RetrieveLogsRequestRequest {
+    LogsIntent intent = 0;
+    LogsTransferProtocol requestedProtocol = 1;
+    OCTET_STRING transferFileDesignator = 2;
   }
 
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
-  }
+  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+}
 
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
   }
 
-  response struct QueryImageResponse = 1 {
-    OTAQueryStatus status = 0;
-    optional INT32U delayedActionTime = 1;
-    optional CHAR_STRING imageURI = 2;
-    optional INT32U softwareVersion = 3;
-    optional CHAR_STRING softwareVersionString = 4;
-    optional OCTET_STRING updateToken = 5;
-    optional BOOLEAN userConsentNeeded = 6;
-    optional OCTET_STRING metadataForRequestor = 7;
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
   }
 
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
   }
 
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
-}
-
-server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum OTAAnnouncementReason : ENUM8 {
-    kSimpleAnnouncement = 0;
-    kUpdateAvailable = 1;
-    kUrgentUpdateAvailable = 2;
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
   }
 
-  enum OTAChangeReasonEnum : ENUM8 {
-    kUnknown = 0;
-    kSuccess = 1;
-    kFailure = 2;
-    kTimeOut = 3;
-    kDelayByProvider = 4;
+  enum RadioFaultType : ENUM8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
   }
 
-  enum OTAUpdateStateEnum : ENUM8 {
-    kUnknown = 0;
-    kIdle = 1;
-    kQuerying = 2;
-    kDelayedOnQuery = 3;
-    kDownloading = 4;
-    kApplying = 5;
-    kDelayedOnApply = 6;
-    kRollingBack = 7;
-    kDelayedOnUserConsent = 8;
+  struct NetworkInterfaceType {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceType type = 7;
   }
 
-  struct ProviderLocation {
-    node_id providerNodeID = 1;
-    endpoint_no endpoint = 2;
-    fabric_idx fabricIndex = 254;
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultType current[] = 0;
+    HardwareFaultType previous[] = 1;
   }
 
-  info event StateTransition = 0 {
-    OTAUpdateStateEnum previousState = 0;
-    OTAUpdateStateEnum newState = 1;
-    OTAChangeReasonEnum reason = 2;
-    nullable INT32U targetSoftwareVersion = 3;
+  critical event RadioFaultChange = 1 {
+    RadioFaultType current[] = 0;
+    RadioFaultType previous[] = 1;
   }
 
-  critical event VersionApplied = 1 {
-    INT32U softwareVersion = 0;
-    INT16U productID = 1;
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultType current[] = 0;
+    NetworkFaultType previous[] = 1;
   }
 
-  info event DownloadError = 2 {
-    INT32U softwareVersion = 0;
-    INT64U bytesDownloaded = 1;
-    nullable INT8U progressPercent = 2;
-    nullable INT64S platformCode = 3;
+  critical event BootReason = 3 {
+    BootReasonType bootReason = 0;
   }
 
-  attribute ProviderLocation defaultOtaProviders[] = 0;
-  readonly attribute boolean updatePossible = 1;
-  readonly attribute OTAUpdateStateEnum updateState = 2;
-  readonly attribute nullable int8u updateStateProgress = 3;
+  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
+  readonly attribute int32u totalOperationalHours = 3;
+  readonly attribute enum8 bootReasons = 4;
+  readonly attribute ENUM8 activeHardwareFaults[] = 5;
+  readonly attribute ENUM8 activeRadioFaults[] = 6;
+  readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AnnounceOtaProviderRequest {
-    node_id providerNodeId = 0;
-    vendor_id vendorId = 1;
-    OTAAnnouncementReason announcementReason = 2;
-    optional OCTET_STRING metadataForNode = 3;
-    endpoint_no endpoint = 4;
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
   }
 
-  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
-server cluster OnOff = 6 {
-  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
-    kFadeToOffIn0p8Seconds = 0;
-    kNoFade = 1;
-    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
-  }
-
-  enum OnOffDyingLightEffectVariant : ENUM8 {
-    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
-  }
-
-  enum OnOffEffectIdentifier : ENUM8 {
-    kDelayedAllOff = 0;
-    kDyingLight = 1;
-  }
-
-  enum OnOffStartUpOnOff : ENUM8 {
-    kOff = 0;
-    kOn = 1;
-    kTogglePreviousOnOff = 2;
-  }
-
-  bitmap OnOffControl : BITMAP8 {
-    kAcceptOnlyWhenOn = 0x1;
+server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
   }
 
-  bitmap OnOffFeature : BITMAP32 {
-    kLighting = 0x1;
+  struct ThreadMetrics {
+    int64u id = 0;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
-  bitmap SceneFeatures : BITMAP32 {
-    kSceneNames = 0x1;
+  info event SoftwareFault = 0 {
+    SoftwareFaultStruct softwareFault = 0;
   }
 
-  readonly attribute boolean onOff = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute ThreadMetrics threadMetrics[] = 0;
+  readonly attribute int64u currentHeapFree = 1;
+  readonly attribute int64u currentHeapUsed = 2;
+  readonly attribute int64u currentHeapHighWatermark = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command Off(): DefaultSuccess = 0;
-  command On(): DefaultSuccess = 1;
-  command Toggle(): DefaultSuccess = 2;
+  command ResetWatermarks(): DefaultSuccess = 0;
 }
 
-server cluster OperationalCredentials = 62 {
-  enum OperationalCertStatus : ENUM8 {
-    kSuccess = 0;
-    kInvalidPublicKey = 1;
-    kInvalidNodeOpId = 2;
-    kInvalidNOC = 3;
-    kMissingCsr = 4;
-    kTableFull = 5;
-    kInvalidAdminSubject = 6;
-    kInsufficientPrivilege = 8;
-    kFabricConflict = 9;
-    kLabelConflict = 10;
-    kInvalidFabricIndex = 11;
+server cluster ThreadNetworkDiagnostics = 53 {
+  enum NetworkFault : ENUM8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
   }
 
-  struct NOCStruct {
-    octet_string noc = 1;
-    nullable octet_string icac = 2;
-    fabric_idx fabricIndex = 254;
+  enum RoutingRole : ENUM8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kReed = 4;
+    kRouter = 5;
+    kLeader = 6;
   }
 
-  struct FabricDescriptor {
-    octet_string<65> rootPublicKey = 1;
-    vendor_id vendorId = 2;
-    fabric_id fabricId = 3;
-    node_id nodeId = 4;
-    char_string<32> label = 5;
-    fabric_idx fabricIndex = 254;
+  enum ThreadConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
-  readonly attribute FabricDescriptor fabrics[] = 1;
-  readonly attribute int8u supportedFabrics = 2;
-  readonly attribute int8u commissionedFabrics = 3;
-  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
-  readonly attribute fabric_idx currentFabricIndex = 5;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AttestationRequestRequest {
-    OCTET_STRING attestationNonce = 0;
+  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+    kMLECounts = 0x4;
+    kMACCounts = 0x8;
   }
 
-  request struct CertificateChainRequestRequest {
-    INT8U certificateType = 0;
+  struct NeighborTable {
+    int64u extAddress = 0;
+    int32u age = 1;
+    int16u rloc16 = 2;
+    int32u linkFrameCounter = 3;
+    int32u mleFrameCounter = 4;
+    int8u lqi = 5;
+    nullable int8s averageRssi = 6;
+    nullable int8s lastRssi = 7;
+    int8u frameErrorRate = 8;
+    int8u messageErrorRate = 9;
+    boolean rxOnWhenIdle = 10;
+    boolean fullThreadDevice = 11;
+    boolean fullNetworkData = 12;
+    boolean isChild = 13;
   }
 
-  request struct CSRRequestRequest {
-    OCTET_STRING CSRNonce = 0;
-    optional boolean isForUpdateNOC = 1;
+  struct RouteTable {
+    int64u extAddress = 0;
+    int16u rloc16 = 1;
+    int8u routerId = 2;
+    int8u nextHop = 3;
+    int8u pathCost = 4;
+    int8u LQIIn = 5;
+    int8u LQIOut = 6;
+    int8u age = 7;
+    boolean allocated = 8;
+    boolean linkEstablished = 9;
   }
 
-  request struct AddNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
-    OCTET_STRING IPKValue = 2;
-    Int64u caseAdminSubject = 3;
-    VENDOR_ID adminVendorId = 4;
+  struct SecurityPolicy {
+    int16u rotationTime = 0;
+    bitmap16 flags = 1;
   }
 
-  request struct UpdateNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
+  struct OperationalDatasetComponents {
+    boolean activeTimestampPresent = 0;
+    boolean pendingTimestampPresent = 1;
+    boolean masterKeyPresent = 2;
+    boolean networkNamePresent = 3;
+    boolean extendedPanIdPresent = 4;
+    boolean meshLocalPrefixPresent = 5;
+    boolean delayPresent = 6;
+    boolean panIdPresent = 7;
+    boolean channelPresent = 8;
+    boolean pskcPresent = 9;
+    boolean securityPolicyPresent = 10;
+    boolean channelMaskPresent = 11;
   }
 
-  request struct UpdateFabricLabelRequest {
-    CHAR_STRING label = 0;
+  info event ConnectionStatus = 0 {
+    ThreadConnectionStatus connectionStatus = 0;
   }
 
-  request struct RemoveFabricRequest {
-    fabric_idx fabricIndex = 0;
-  }
+  readonly attribute nullable int16u channel = 0;
+  readonly attribute nullable RoutingRole routingRole = 1;
+  readonly attribute nullable char_string<16> networkName = 2;
+  readonly attribute nullable int16u panId = 3;
+  readonly attribute nullable int64u extendedPanId = 4;
+  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute NeighborTable neighborTableList[] = 7;
+  readonly attribute RouteTable routeTableList[] = 8;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
+  readonly attribute int16u detachedRoleCount = 14;
+  readonly attribute int16u childRoleCount = 15;
+  readonly attribute int16u routerRoleCount = 16;
+  readonly attribute int16u leaderRoleCount = 17;
+  readonly attribute int16u attachAttemptCount = 18;
+  readonly attribute int16u partitionIdChangeCount = 19;
+  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
+  readonly attribute int16u parentChangeCount = 21;
+  readonly attribute int32u txTotalCount = 22;
+  readonly attribute int32u txUnicastCount = 23;
+  readonly attribute int32u txBroadcastCount = 24;
+  readonly attribute int32u txAckRequestedCount = 25;
+  readonly attribute int32u txAckedCount = 26;
+  readonly attribute int32u txNoAckRequestedCount = 27;
+  readonly attribute int32u txDataCount = 28;
+  readonly attribute int32u txDataPollCount = 29;
+  readonly attribute int32u txBeaconCount = 30;
+  readonly attribute int32u txBeaconRequestCount = 31;
+  readonly attribute int32u txOtherCount = 32;
+  readonly attribute int32u txRetryCount = 33;
+  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
+  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
+  readonly attribute int32u txErrCcaCount = 36;
+  readonly attribute int32u txErrAbortCount = 37;
+  readonly attribute int32u txErrBusyChannelCount = 38;
+  readonly attribute int32u rxTotalCount = 39;
+  readonly attribute int32u rxUnicastCount = 40;
+  readonly attribute int32u rxBroadcastCount = 41;
+  readonly attribute int32u rxDataCount = 42;
+  readonly attribute int32u rxDataPollCount = 43;
+  readonly attribute int32u rxBeaconCount = 44;
+  readonly attribute int32u rxBeaconRequestCount = 45;
+  readonly attribute int32u rxOtherCount = 46;
+  readonly attribute int32u rxAddressFilteredCount = 47;
+  readonly attribute int32u rxDestAddrFilteredCount = 48;
+  readonly attribute int32u rxDuplicatedCount = 49;
+  readonly attribute int32u rxErrNoFrameCount = 50;
+  readonly attribute int32u rxErrUnknownNeighborCount = 51;
+  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
+  readonly attribute int32u rxErrSecCount = 53;
+  readonly attribute int32u rxErrFcsCount = 54;
+  readonly attribute int32u rxErrOtherCount = 55;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
+  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  request struct AddTrustedRootCertificateRequest {
-    OCTET_STRING rootCertificate = 0;
-  }
+  command ResetCounts(): DefaultSuccess = 0;
+}
 
-  response struct AttestationResponse = 1 {
-    OCTET_STRING attestationElements = 0;
-    OCTET_STRING signature = 1;
+server cluster WiFiNetworkDiagnostics = 54 {
+  enum AssociationFailureCause : ENUM8 {
+    kUnknown = 0;
+    kAssociationFailed = 1;
+    kAuthenticationFailed = 2;
+    kSsidNotFound = 3;
   }
 
-  response struct CertificateChainResponse = 3 {
-    OCTET_STRING certificate = 0;
+  enum SecurityType : ENUM8 {
+    kUnspecified = 0;
+    kNone = 1;
+    kWep = 2;
+    kWpa = 3;
+    kWpa2 = 4;
+    kWpa3 = 5;
   }
 
-  response struct CSRResponse = 5 {
-    OCTET_STRING NOCSRElements = 0;
-    OCTET_STRING attestationSignature = 1;
+  enum WiFiConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  response struct NOCResponse = 8 {
-    OperationalCertStatus statusCode = 0;
-    optional fabric_idx fabricIndex = 1;
-    optional CHAR_STRING debugText = 2;
+  enum WiFiVersionType : ENUM8 {
+    k80211a = 0;
+    k80211b = 1;
+    k80211g = 2;
+    k80211n = 3;
+    k80211ac = 4;
+    k80211ax = 5;
   }
 
-  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
-  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
-  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
-  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
-  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
-  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
-  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
-  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-}
-
-server cluster Scenes = 5 {
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
+  info event Disconnection = 0 {
+    INT16U reasonCode = 0;
   }
 
-  struct ExtensionFieldSet {
-    cluster_id clusterId = 0;
-    AttributeValuePair attributeValueList[] = 1;
+  info event AssociationFailure = 1 {
+    AssociationFailureCause associationFailure = 0;
+    INT16U status = 1;
   }
 
-  struct AttributeValuePair {
-    optional attrib_id attributeId = 0;
-    int8u attributeValue[] = 1;
+  info event ConnectionStatus = 2 {
+    WiFiConnectionStatus connectionStatus = 0;
   }
 
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute nullable octet_string<6> bssid = 0;
+  readonly attribute nullable SecurityType securityType = 1;
+  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
+  readonly attribute nullable int16u channelNumber = 3;
+  readonly attribute nullable int8s rssi = 4;
+  readonly attribute int32u beaconLostCount = 5;
+  readonly attribute int32u beaconRxCount = 6;
+  readonly attribute int32u packetMulticastRxCount = 7;
+  readonly attribute int32u packetMulticastTxCount = 8;
+  readonly attribute int32u packetUnicastRxCount = 9;
+  readonly attribute int32u packetUnicastTxCount = 10;
+  readonly attribute int64u currentMaxRate = 11;
+  readonly attribute int64u overrunCount = 12;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AddSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    INT16U transitionTime = 2;
-    CHAR_STRING sceneName = 3;
-    ExtensionFieldSet extensionFieldSets[] = 4;
+  command ResetCounts(): DefaultSuccess = 0;
+}
+
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
   }
 
-  request struct ViewSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RemoveSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RemoveAllScenesRequest {
-    group_id groupId = 0;
-  }
-
-  request struct StoreSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RecallSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    optional nullable INT16U transitionTime = 2;
-  }
-
-  request struct GetSceneMembershipRequest {
-    group_id groupId = 0;
-  }
-
-  response struct AddSceneResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
-
-  response struct ViewSceneResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-    optional INT16U transitionTime = 3;
-    optional CHAR_STRING sceneName = 4;
-    optional ExtensionFieldSet extensionFieldSets[] = 5;
-  }
-
-  response struct RemoveSceneResponse = 2 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
-
-  response struct RemoveAllScenesResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-  }
-
-  response struct StoreSceneResponse = 4 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
-
-  response struct GetSceneMembershipResponse = 6 {
-    ENUM8 status = 0;
-    nullable INT8U capacity = 1;
-    group_id groupId = 2;
-    optional INT8U sceneList[] = 3;
-  }
-
-  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
-  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
-  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
-  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
-  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
-  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
-  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
-}
-
-server cluster SoftwareDiagnostics = 52 {
-  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
-    kWaterMarks = 0x1;
-  }
-
-  struct ThreadMetrics {
-    int64u id = 0;
-    optional char_string<8> name = 1;
-    optional int32u stackFreeCurrent = 2;
-    optional int32u stackFreeMinimum = 3;
-    optional int32u stackSize = 4;
-  }
-
-  info event SoftwareFault = 0 {
-    SoftwareFaultStruct softwareFault = 0;
-  }
-
-  readonly attribute ThreadMetrics threadMetrics[] = 0;
-  readonly attribute int64u currentHeapFree = 1;
-  readonly attribute int64u currentHeapUsed = 2;
-  readonly attribute int64u currentHeapHighWatermark = 3;
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
 server cluster Switch = 59 {
@@ -1303,251 +1274,218 @@ server cluster Switch = 59 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-client cluster Thermostat = 513 {
-  enum SetpointAdjustMode : ENUM8 {
-    kHeatSetpoint = 0;
-    kCoolSetpoint = 1;
-    kHeatAndCoolSetpoints = 2;
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
   }
 
-  enum ThermostatControlSequence : ENUM8 {
-    kCoolingOnly = 0;
-    kCoolingWithReheat = 1;
-    kHeatingOnly = 2;
-    kHeatingWithReheat = 3;
-    kCoolingAndHeating = 4;
-    kCoolingAndHeatingWithReheat = 5;
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
   }
 
-  enum ThermostatRunningMode : ENUM8 {
-    kOff = 0;
-    kCool = 3;
-    kHeat = 4;
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
   }
 
-  enum ThermostatSystemMode : ENUM8 {
-    kOff = 0;
-    kAuto = 1;
-    kCool = 3;
-    kHeat = 4;
-    kEmergencyHeating = 5;
-    kPrecooling = 6;
-    kFanOnly = 7;
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
   }
 
-  bitmap DayOfWeek : BITMAP8 {
-    kSunday = 0x1;
-    kMonday = 0x2;
-    kTuesday = 0x4;
-    kWednesday = 0x8;
-    kThursday = 0x10;
-    kFriday = 0x20;
-    kSaturday = 0x40;
-    kAwayOrVacation = 0x80;
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
+}
+
+server cluster OperationalCredentials = 62 {
+  enum OperationalCertStatus : ENUM8 {
+    kSuccess = 0;
+    kInvalidPublicKey = 1;
+    kInvalidNodeOpId = 2;
+    kInvalidNOC = 3;
+    kMissingCsr = 4;
+    kTableFull = 5;
+    kInvalidAdminSubject = 6;
+    kInsufficientPrivilege = 8;
+    kFabricConflict = 9;
+    kLabelConflict = 10;
+    kInvalidFabricIndex = 11;
   }
 
-  bitmap ModeForSequence : BITMAP8 {
-    kHeatSetpointFieldPresent = 0x1;
-    kCoolSetpointFieldPresent = 0x2;
+  struct NOCStruct {
+    octet_string noc = 1;
+    nullable octet_string icac = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  bitmap ThermostatFeature : BITMAP32 {
-    kHeating = 0x1;
-    kCooling = 0x2;
-    kOccupancy = 0x4;
-    kSchedule = 0x8;
-    kSetback = 0x10;
-    kAutomode = 0x20;
+  struct FabricDescriptor {
+    octet_string<65> rootPublicKey = 1;
+    vendor_id vendorId = 2;
+    fabric_id fabricId = 3;
+    node_id nodeId = 4;
+    char_string<32> label = 5;
+    fabric_idx fabricIndex = 254;
   }
 
-  readonly attribute nullable int16s localTemperature = 0;
-  attribute int16s occupiedCoolingSetpoint = 17;
-  attribute int16s occupiedHeatingSetpoint = 18;
-  attribute access(write: manage) ThermostatControlSequence controlSequenceOfOperation = 27;
-  attribute access(write: manage) enum8 systemMode = 28;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
+  readonly attribute FabricDescriptor fabrics[] = 1;
+  readonly attribute int8u supportedFabrics = 2;
+  readonly attribute int8u commissionedFabrics = 3;
+  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
+  readonly attribute fabric_idx currentFabricIndex = 5;
+  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster ThreadNetworkDiagnostics = 53 {
-  enum NetworkFault : ENUM8 {
-    kUnspecified = 0;
-    kLinkDown = 1;
-    kHardwareFailure = 2;
-    kNetworkJammed = 3;
+  request struct AttestationRequestRequest {
+    OCTET_STRING attestationNonce = 0;
   }
 
-  enum RoutingRole : ENUM8 {
-    kUnspecified = 0;
-    kUnassigned = 1;
-    kSleepyEndDevice = 2;
-    kEndDevice = 3;
-    kReed = 4;
-    kRouter = 5;
-    kLeader = 6;
+  request struct CertificateChainRequestRequest {
+    INT8U certificateType = 0;
   }
 
-  enum ThreadConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  request struct CSRRequestRequest {
+    OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
-  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
-    kPacketCounts = 0x1;
-    kErrorCounts = 0x2;
-    kMLECounts = 0x4;
-    kMACCounts = 0x8;
+  request struct AddNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+    OCTET_STRING IPKValue = 2;
+    Int64u caseAdminSubject = 3;
+    VENDOR_ID adminVendorId = 4;
   }
 
-  struct NeighborTable {
-    int64u extAddress = 0;
-    int32u age = 1;
-    int16u rloc16 = 2;
-    int32u linkFrameCounter = 3;
-    int32u mleFrameCounter = 4;
-    int8u lqi = 5;
-    nullable int8s averageRssi = 6;
-    nullable int8s lastRssi = 7;
-    int8u frameErrorRate = 8;
-    int8u messageErrorRate = 9;
-    boolean rxOnWhenIdle = 10;
-    boolean fullThreadDevice = 11;
-    boolean fullNetworkData = 12;
-    boolean isChild = 13;
+  request struct UpdateNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
   }
 
-  struct RouteTable {
-    int64u extAddress = 0;
-    int16u rloc16 = 1;
-    int8u routerId = 2;
-    int8u nextHop = 3;
-    int8u pathCost = 4;
-    int8u LQIIn = 5;
-    int8u LQIOut = 6;
-    int8u age = 7;
-    boolean allocated = 8;
-    boolean linkEstablished = 9;
+  request struct UpdateFabricLabelRequest {
+    CHAR_STRING label = 0;
   }
 
-  struct SecurityPolicy {
-    int16u rotationTime = 0;
-    bitmap16 flags = 1;
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
   }
 
-  struct OperationalDatasetComponents {
-    boolean activeTimestampPresent = 0;
-    boolean pendingTimestampPresent = 1;
-    boolean masterKeyPresent = 2;
-    boolean networkNamePresent = 3;
-    boolean extendedPanIdPresent = 4;
-    boolean meshLocalPrefixPresent = 5;
-    boolean delayPresent = 6;
-    boolean panIdPresent = 7;
-    boolean channelPresent = 8;
-    boolean pskcPresent = 9;
-    boolean securityPolicyPresent = 10;
-    boolean channelMaskPresent = 11;
+  request struct AddTrustedRootCertificateRequest {
+    OCTET_STRING rootCertificate = 0;
   }
 
-  info event ConnectionStatus = 0 {
-    ThreadConnectionStatus connectionStatus = 0;
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
   }
 
-  readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable RoutingRole routingRole = 1;
-  readonly attribute nullable char_string<16> networkName = 2;
-  readonly attribute nullable int16u panId = 3;
-  readonly attribute nullable int64u extendedPanId = 4;
-  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute NeighborTable neighborTableList[] = 7;
-  readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
-  readonly attribute nullable int8u leaderRouterId = 13;
-  readonly attribute int16u detachedRoleCount = 14;
-  readonly attribute int16u childRoleCount = 15;
-  readonly attribute int16u routerRoleCount = 16;
-  readonly attribute int16u leaderRoleCount = 17;
-  readonly attribute int16u attachAttemptCount = 18;
-  readonly attribute int16u partitionIdChangeCount = 19;
-  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
-  readonly attribute int16u parentChangeCount = 21;
-  readonly attribute int32u txTotalCount = 22;
-  readonly attribute int32u txUnicastCount = 23;
-  readonly attribute int32u txBroadcastCount = 24;
-  readonly attribute int32u txAckRequestedCount = 25;
-  readonly attribute int32u txAckedCount = 26;
-  readonly attribute int32u txNoAckRequestedCount = 27;
-  readonly attribute int32u txDataCount = 28;
-  readonly attribute int32u txDataPollCount = 29;
-  readonly attribute int32u txBeaconCount = 30;
-  readonly attribute int32u txBeaconRequestCount = 31;
-  readonly attribute int32u txOtherCount = 32;
-  readonly attribute int32u txRetryCount = 33;
-  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
-  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
-  readonly attribute int32u txErrCcaCount = 36;
-  readonly attribute int32u txErrAbortCount = 37;
-  readonly attribute int32u txErrBusyChannelCount = 38;
-  readonly attribute int32u rxTotalCount = 39;
-  readonly attribute int32u rxUnicastCount = 40;
-  readonly attribute int32u rxBroadcastCount = 41;
-  readonly attribute int32u rxDataCount = 42;
-  readonly attribute int32u rxDataPollCount = 43;
-  readonly attribute int32u rxBeaconCount = 44;
-  readonly attribute int32u rxBeaconRequestCount = 45;
-  readonly attribute int32u rxOtherCount = 46;
-  readonly attribute int32u rxAddressFilteredCount = 47;
-  readonly attribute int32u rxDestAddrFilteredCount = 48;
-  readonly attribute int32u rxDuplicatedCount = 49;
-  readonly attribute int32u rxErrNoFrameCount = 50;
-  readonly attribute int32u rxErrUnknownNeighborCount = 51;
-  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
-  readonly attribute int32u rxErrSecCount = 53;
-  readonly attribute int32u rxErrFcsCount = 54;
-  readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute nullable int64u activeTimestamp = 56;
-  readonly attribute nullable int64u pendingTimestamp = 57;
-  readonly attribute nullable int32u delay = 58;
-  readonly attribute nullable SecurityPolicy securityPolicy = 59;
-  readonly attribute nullable octet_string<4> channelMask = 60;
-  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
-  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
+  }
+
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
+  }
+
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
+  }
+
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
+}
+
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
+  }
+
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
-}
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
+  }
 
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
+
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
@@ -1558,67 +1496,129 @@ server cluster UserLabel = 65 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCause : ENUM8 {
-    kUnknown = 0;
-    kAssociationFailed = 1;
-    kAuthenticationFailed = 2;
-    kSsidNotFound = 3;
+client cluster Thermostat = 513 {
+  enum SetpointAdjustMode : ENUM8 {
+    kHeatSetpoint = 0;
+    kCoolSetpoint = 1;
+    kHeatAndCoolSetpoints = 2;
   }
 
-  enum SecurityType : ENUM8 {
-    kUnspecified = 0;
-    kNone = 1;
-    kWep = 2;
-    kWpa = 3;
-    kWpa2 = 4;
-    kWpa3 = 5;
+  enum ThermostatControlSequence : ENUM8 {
+    kCoolingOnly = 0;
+    kCoolingWithReheat = 1;
+    kHeatingOnly = 2;
+    kHeatingWithReheat = 3;
+    kCoolingAndHeating = 4;
+    kCoolingAndHeatingWithReheat = 5;
   }
 
-  enum WiFiConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  enum ThermostatRunningMode : ENUM8 {
+    kOff = 0;
+    kCool = 3;
+    kHeat = 4;
   }
 
-  enum WiFiVersionType : ENUM8 {
-    k80211a = 0;
-    k80211b = 1;
-    k80211g = 2;
-    k80211n = 3;
-    k80211ac = 4;
-    k80211ax = 5;
+  enum ThermostatSystemMode : ENUM8 {
+    kOff = 0;
+    kAuto = 1;
+    kCool = 3;
+    kHeat = 4;
+    kEmergencyHeating = 5;
+    kPrecooling = 6;
+    kFanOnly = 7;
   }
 
-  info event Disconnection = 0 {
-    INT16U reasonCode = 0;
+  bitmap DayOfWeek : BITMAP8 {
+    kSunday = 0x1;
+    kMonday = 0x2;
+    kTuesday = 0x4;
+    kWednesday = 0x8;
+    kThursday = 0x10;
+    kFriday = 0x20;
+    kSaturday = 0x40;
+    kAwayOrVacation = 0x80;
   }
 
-  info event AssociationFailure = 1 {
-    AssociationFailureCause associationFailure = 0;
-    INT16U status = 1;
+  bitmap ModeForSequence : BITMAP8 {
+    kHeatSetpointFieldPresent = 0x1;
+    kCoolSetpointFieldPresent = 0x2;
   }
 
-  info event ConnectionStatus = 2 {
-    WiFiConnectionStatus connectionStatus = 0;
+  bitmap ThermostatFeature : BITMAP32 {
+    kHeating = 0x1;
+    kCooling = 0x2;
+    kOccupancy = 0x4;
+    kSchedule = 0x8;
+    kSetback = 0x10;
+    kAutomode = 0x20;
   }
 
-  readonly attribute nullable octet_string<6> bssid = 0;
-  readonly attribute nullable SecurityType securityType = 1;
-  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
-  readonly attribute nullable int16u channelNumber = 3;
-  readonly attribute nullable int8s rssi = 4;
-  readonly attribute int32u beaconLostCount = 5;
-  readonly attribute int32u beaconRxCount = 6;
-  readonly attribute int32u packetMulticastRxCount = 7;
-  readonly attribute int32u packetMulticastTxCount = 8;
-  readonly attribute int32u packetUnicastRxCount = 9;
-  readonly attribute int32u packetUnicastTxCount = 10;
-  readonly attribute int64u currentMaxRate = 11;
-  readonly attribute int64u overrunCount = 12;
-  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute nullable int16s localTemperature = 0;
+  attribute int16s occupiedCoolingSetpoint = 17;
+  attribute int16s occupiedHeatingSetpoint = 18;
+  attribute access(write: manage) ThermostatControlSequence controlSequenceOfOperation = 27;
+  attribute access(write: manage) enum8 systemMode = 28;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  command ResetCounts(): DefaultSuccess = 0;
+server cluster FanControl = 514 {
+  enum FanModeSequenceType : ENUM8 {
+    kOffLowMedHigh = 0;
+    kOffLowHigh = 1;
+    kOffLowMedHighAuto = 2;
+    kOffLowHighAuto = 3;
+    kOffOnAuto = 4;
+    kOffOn = 5;
+  }
+
+  enum FanModeType : ENUM8 {
+    kOff = 0;
+    kLow = 1;
+    kMedium = 2;
+    kHigh = 3;
+    kOn = 4;
+    kAuto = 5;
+    kSmart = 6;
+  }
+
+  bitmap FanControlFeature : BITMAP32 {
+    kMultiSpeed = 0x1;
+    kAuto = 0x2;
+    kRocking = 0x4;
+    kWind = 0x8;
+  }
+
+  bitmap RockSupportMask : BITMAP8 {
+    kRockLeftRight = 0x1;
+    kRockUpDown = 0x2;
+    kRockRound = 0x4;
+  }
+
+  bitmap WindSettingMask : BITMAP8 {
+    kSleepWind = 0x1;
+    kNaturalWind = 0x2;
+  }
+
+  bitmap WindSupportMask : BITMAP8 {
+    kSleepWind = 0x1;
+    kNaturalWind = 0x2;
+  }
+
+  attribute FanModeType fanMode = 0;
+  attribute FanModeSequenceType fanModeSequence = 1;
+  attribute nullable int8u percentSetting = 2;
+  readonly attribute int8u percentCurrent = 3;
+  readonly attribute int8u speedMax = 4;
+  attribute nullable int8u speedSetting = 5;
+  readonly attribute int8u speedCurrent = 6;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
 endpoint 0 {
diff --git a/examples/chef/devices/rootnode_humiditysensor_bCXcaZPQ1O.matter b/examples/chef/devices/rootnode_humiditysensor_bCXcaZPQ1O.matter
index 1eed4813527409..2ea579541f4b25 100644
--- a/examples/chef/devices/rootnode_humiditysensor_bCXcaZPQ1O.matter
+++ b/examples/chef/devices/rootnode_humiditysensor_bCXcaZPQ1O.matter
@@ -6,6 +6,145 @@ struct LabelStruct {
     char_string<16> value = 1;
 }
 
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
+  }
+
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
+  }
+
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
+  }
+
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
+  }
+
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+}
+
+client cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AddGroupRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
+
+  request struct ViewGroupRequest {
+    group_id groupId = 0;
+  }
+
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
+  }
+
+  request struct RemoveGroupRequest {
+    group_id groupId = 0;
+  }
+
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
+
+  response struct AddGroupResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  response struct ViewGroupResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    CHAR_STRING groupName = 2;
+  }
+
+  response struct GetGroupMembershipResponse = 2 {
+    nullable INT8U capacity = 0;
+    group_id groupList[] = 1;
+  }
+
+  response struct RemoveGroupResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
+}
+
+server cluster Descriptor = 29 {
+  struct DeviceType {
+    devtype_id type = 0;
+    int16u revision = 1;
+  }
+
+  readonly attribute DeviceType deviceList[] = 0;
+  readonly attribute CLUSTER_ID serverList[] = 1;
+  readonly attribute CLUSTER_ID clientList[] = 2;
+  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+client cluster Binding = 30 {
+  struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  attribute TargetStruct binding[] = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
 server cluster AccessControl = 31 {
   enum AuthMode : ENUM8 {
     kPase = 1;
@@ -69,42 +208,6 @@ server cluster AccessControl = 31 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
-  }
-
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
-  }
-
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
-  }
-
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-  }
-
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
-
 server cluster Basic = 40 {
   critical event StartUp = 0 {
     INT32U softwareVersion = 0;
@@ -143,102 +246,171 @@ server cluster Basic = 40 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-client cluster Binding = 30 {
-  struct TargetStruct {
-    optional node_id node = 1;
-    optional group_id group = 2;
-    optional endpoint_no endpoint = 3;
-    optional cluster_id cluster = 4;
-    fabric_idx fabricIndex = 254;
+client cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
   }
 
-  attribute TargetStruct binding[] = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
+  }
 
-server cluster Descriptor = 29 {
-  struct DeviceType {
-    devtype_id type = 0;
-    int16u revision = 1;
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
   }
 
-  readonly attribute DeviceType deviceList[] = 0;
-  readonly attribute CLUSTER_ID serverList[] = 1;
-  readonly attribute CLUSTER_ID clientList[] = 2;
-  readonly attribute ENDPOINT_NO partsList[] = 3;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster DiagnosticLogs = 50 {
-  enum LogsIntent : ENUM8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
-  }
 
-  enum LogsStatus : ENUM8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
   }
 
-  enum LogsTransferProtocol : ENUM8 {
-    kResponsePayload = 0;
-    kBdx = 1;
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
   }
 
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct RetrieveLogsRequestRequest {
-    LogsIntent intent = 0;
-    LogsTransferProtocol requestedProtocol = 1;
-    OCTET_STRING transferFileDesignator = 2;
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
   }
 
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+  response struct QueryImageResponse = 1 {
+    OTAQueryStatus status = 0;
+    optional INT32U delayedActionTime = 1;
+    optional CHAR_STRING imageURI = 2;
+    optional INT32U softwareVersion = 3;
+    optional CHAR_STRING softwareVersionString = 4;
+    optional OCTET_STRING updateToken = 5;
+    optional BOOLEAN userConsentNeeded = 6;
+    optional OCTET_STRING metadataForRequestor = 7;
+  }
+
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
+  }
+
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
 }
 
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
+server cluster OtaSoftwareUpdateRequestor = 42 {
+  enum OTAAnnouncementReason : ENUM8 {
+    kSimpleAnnouncement = 0;
+    kUpdateAvailable = 1;
+    kUrgentUpdateAvailable = 2;
   }
 
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
+  enum OTAChangeReasonEnum : ENUM8 {
+    kUnknown = 0;
+    kSuccess = 1;
+    kFailure = 2;
+    kTimeOut = 3;
+    kDelayByProvider = 4;
+  }
+
+  enum OTAUpdateStateEnum : ENUM8 {
+    kUnknown = 0;
+    kIdle = 1;
+    kQuerying = 2;
+    kDelayedOnQuery = 3;
+    kDownloading = 4;
+    kApplying = 5;
+    kDelayedOnApply = 6;
+    kRollingBack = 7;
+    kDelayedOnUserConsent = 8;
+  }
+
+  struct ProviderLocation {
+    node_id providerNodeID = 1;
+    endpoint_no endpoint = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  info event StateTransition = 0 {
+    OTAUpdateStateEnum previousState = 0;
+    OTAUpdateStateEnum newState = 1;
+    OTAChangeReasonEnum reason = 2;
+    nullable INT32U targetSoftwareVersion = 3;
+  }
+
+  critical event VersionApplied = 1 {
+    INT32U softwareVersion = 0;
+    INT16U productID = 1;
+  }
+
+  info event DownloadError = 2 {
+    INT32U softwareVersion = 0;
+    INT64U bytesDownloaded = 1;
+    nullable INT8U progressPercent = 2;
+    nullable INT64S platformCode = 3;
+  }
+
+  attribute ProviderLocation defaultOtaProviders[] = 0;
+  readonly attribute boolean updatePossible = 1;
+  readonly attribute OTAUpdateStateEnum updateState = 2;
+  readonly attribute nullable int8u updateStateProgress = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  request struct AnnounceOtaProviderRequest {
+    node_id providerNodeId = 0;
+    vendor_id vendorId = 1;
+    OTAAnnouncementReason announcementReason = 2;
+    optional OCTET_STRING metadataForNode = 3;
+    endpoint_no endpoint = 4;
+  }
+
+  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
 }
 
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
+server cluster LocalizationConfiguration = 43 {
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
+  }
+
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
+  }
+
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
@@ -301,552 +473,613 @@ server cluster GeneralCommissioning = 48 {
   command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
 }
 
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatus : ENUM8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
   }
 
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
+  enum WiFiBand : ENUM8 {
+    k2g4 = 0;
+    k3g65 = 1;
+    k5g = 2;
+    k6g = 3;
+    k60g = 4;
   }
 
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
+  bitmap NetworkCommissioningFeature : BITMAP32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
   }
 
-  enum NetworkFaultType : ENUM8 {
-    kUnspecified = 0;
-    kHardwareFailure = 1;
-    kNetworkJammed = 2;
-    kConnectionFailed = 3;
+  bitmap WiFiSecurity : BITMAP8 {
+    kUnencrypted = 0x1;
+    kWepPersonal = 0x2;
+    kWpaPersonal = 0x4;
+    kWpa2Personal = 0x8;
+    kWpa3Personal = 0x10;
   }
 
-  enum RadioFaultType : ENUM8 {
-    kUnspecified = 0;
-    kWiFiFault = 1;
-    kCellularFault = 2;
-    kThreadFault = 3;
-    kNFCFault = 4;
-    kBLEFault = 5;
-    kEthernetFault = 6;
+  struct NetworkInfo {
+    octet_string<32> networkID = 0;
+    boolean connected = 1;
   }
 
-  struct NetworkInterfaceType {
-    char_string<32> name = 0;
-    boolean isOperational = 1;
-    nullable boolean offPremiseServicesReachableIPv4 = 2;
-    nullable boolean offPremiseServicesReachableIPv6 = 3;
-    octet_string<8> hardwareAddress = 4;
-    octet_string IPv4Addresses[] = 5;
-    octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+  struct WiFiInterfaceScanResult {
+    WiFiSecurity security = 0;
+    octet_string<32> ssid = 1;
+    octet_string<6> bssid = 2;
+    int16u channel = 3;
+    WiFiBand wiFiBand = 4;
+    int8s rssi = 5;
   }
 
-  critical event HardwareFaultChange = 0 {
-    HardwareFaultType current[] = 0;
-    HardwareFaultType previous[] = 1;
+  struct ThreadInterfaceScanResult {
+    int16u panId = 0;
+    int64u extendedPanId = 1;
+    char_string<16> networkName = 2;
+    int16u channel = 3;
+    int8u version = 4;
+    octet_string<8> extendedAddress = 5;
+    int8s rssi = 6;
+    int8u lqi = 7;
   }
 
-  critical event RadioFaultChange = 1 {
-    RadioFaultType current[] = 0;
-    RadioFaultType previous[] = 1;
+  readonly attribute access(read: administer) int8u maxNetworks = 0;
+  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
+  readonly attribute int8u scanMaxTimeSeconds = 2;
+  readonly attribute int8u connectMaxTimeSeconds = 3;
+  attribute access(write: administer) boolean interfaceEnabled = 4;
+  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
+  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
+  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ScanNetworksRequest {
+    optional nullable OCTET_STRING ssid = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
-  }
-
-  critical event BootReason = 3 {
-    BootReasonType bootReason = 0;
+  request struct AddOrUpdateWiFiNetworkRequest {
+    OCTET_STRING ssid = 0;
+    OCTET_STRING credentials = 1;
+    optional INT64U breadcrumb = 2;
   }
 
-  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
-  readonly attribute int16u rebootCount = 1;
-  readonly attribute int64u upTime = 2;
-  readonly attribute int32u totalOperationalHours = 3;
-  readonly attribute enum8 bootReasons = 4;
-  readonly attribute ENUM8 activeHardwareFaults[] = 5;
-  readonly attribute ENUM8 activeRadioFaults[] = 6;
-  readonly attribute ENUM8 activeNetworkFaults[] = 7;
-  readonly attribute boolean testEventTriggersEnabled = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct TestEventTriggerRequest {
-    OCTET_STRING enableKey = 0;
-    INT64U eventTrigger = 1;
+  request struct AddOrUpdateThreadNetworkRequest {
+    OCTET_STRING operationalDataset = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
-}
-
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
+  request struct RemoveNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
-    fabric_idx fabricIndex = 254;
+  request struct ConnectNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
+  request struct ReorderNetworkRequest {
+    OCTET_STRING networkID = 0;
+    INT8U networkIndex = 1;
+    optional INT64U breadcrumb = 2;
   }
 
-  struct GroupKeySetStruct {
-    int16u groupKeySetID = 0;
-    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
-    nullable octet_string<16> epochKey0 = 2;
-    nullable epoch_us epochStartTime0 = 3;
-    nullable octet_string<16> epochKey1 = 4;
-    nullable epoch_us epochStartTime1 = 5;
-    nullable octet_string<16> epochKey2 = 6;
-    nullable epoch_us epochStartTime2 = 7;
+  response struct ScanNetworksResponse = 1 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
+    optional ThreadInterfaceScanResult threadScanResults[] = 3;
   }
 
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
-  readonly attribute int16u maxGroupsPerFabric = 2;
-  readonly attribute int16u maxGroupKeysPerFabric = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct KeySetWriteRequest {
-    GroupKeySetStruct groupKeySet = 0;
+  response struct NetworkConfigResponse = 5 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional INT8U networkIndex = 2;
   }
 
-  request struct KeySetReadRequest {
-    INT16U groupKeySetID = 0;
+  response struct ConnectNetworkResponse = 7 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    nullable INT32S errorValue = 2;
   }
 
-  request struct KeySetRemoveRequest {
-    INT16U groupKeySetID = 0;
-  }
+  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
+  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
+  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
+  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
+  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
+  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+}
 
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
+server cluster DiagnosticLogs = 50 {
+  enum LogsIntent : ENUM8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
   }
 
-  response struct KeySetReadResponse = 2 {
-    GroupKeySetStruct groupKeySet = 0;
+  enum LogsStatus : ENUM8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
   }
 
-  response struct KeySetReadAllIndicesResponse = 5 {
-    INT16U groupKeySetIDs[] = 0;
+  enum LogsTransferProtocol : ENUM8 {
+    kResponsePayload = 0;
+    kBdx = 1;
   }
 
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
-}
-
-client cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AddGroupRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+  request struct RetrieveLogsRequestRequest {
+    LogsIntent intent = 0;
+    LogsTransferProtocol requestedProtocol = 1;
+    OCTET_STRING transferFileDesignator = 2;
   }
 
-  request struct ViewGroupRequest {
-    group_id groupId = 0;
-  }
+  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+}
 
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
   }
 
-  request struct RemoveGroupRequest {
-    group_id groupId = 0;
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
   }
 
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
   }
 
-  response struct AddGroupResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
   }
 
-  response struct ViewGroupResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    CHAR_STRING groupName = 2;
+  enum RadioFaultType : ENUM8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
   }
 
-  response struct GetGroupMembershipResponse = 2 {
-    nullable INT8U capacity = 0;
-    group_id groupList[] = 1;
+  struct NetworkInterfaceType {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceType type = 7;
   }
 
-  response struct RemoveGroupResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultType current[] = 0;
+    HardwareFaultType previous[] = 1;
   }
 
-  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
-}
-
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
+  critical event RadioFaultChange = 1 {
+    RadioFaultType current[] = 0;
+    RadioFaultType previous[] = 1;
   }
 
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultType current[] = 0;
+    NetworkFaultType previous[] = 1;
   }
 
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
+  critical event BootReason = 3 {
+    BootReasonType bootReason = 0;
   }
 
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
+  readonly attribute int32u totalOperationalHours = 3;
+  readonly attribute enum8 bootReasons = 4;
+  readonly attribute ENUM8 activeHardwareFaults[] = 5;
+  readonly attribute ENUM8 activeRadioFaults[] = 6;
+  readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
   }
 
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
-}
-
-server cluster LocalizationConfiguration = 43 {
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
-server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatus : ENUM8 {
-    kSuccess = 0;
-    kOutOfRange = 1;
-    kBoundsExceeded = 2;
-    kNetworkIDNotFound = 3;
-    kDuplicateNetworkID = 4;
-    kNetworkNotFound = 5;
-    kRegulatoryError = 6;
-    kAuthFailure = 7;
-    kUnsupportedSecurity = 8;
-    kOtherConnectionFailure = 9;
-    kIPV6Failed = 10;
-    kIPBindFailed = 11;
-    kUnknownError = 12;
+server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
   }
 
-  enum WiFiBand : ENUM8 {
-    k2g4 = 0;
-    k3g65 = 1;
-    k5g = 2;
-    k6g = 3;
-    k60g = 4;
+  struct ThreadMetrics {
+    int64u id = 0;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
-  bitmap NetworkCommissioningFeature : BITMAP32 {
-    kWiFiNetworkInterface = 0x1;
-    kThreadNetworkInterface = 0x2;
-    kEthernetNetworkInterface = 0x4;
+  info event SoftwareFault = 0 {
+    SoftwareFaultStruct softwareFault = 0;
   }
 
-  bitmap WiFiSecurity : BITMAP8 {
-    kUnencrypted = 0x1;
-    kWepPersonal = 0x2;
-    kWpaPersonal = 0x4;
-    kWpa2Personal = 0x8;
-    kWpa3Personal = 0x10;
-  }
+  readonly attribute ThreadMetrics threadMetrics[] = 0;
+  readonly attribute int64u currentHeapFree = 1;
+  readonly attribute int64u currentHeapUsed = 2;
+  readonly attribute int64u currentHeapHighWatermark = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  struct NetworkInfo {
-    octet_string<32> networkID = 0;
-    boolean connected = 1;
-  }
+  command ResetWatermarks(): DefaultSuccess = 0;
+}
 
-  struct WiFiInterfaceScanResult {
-    WiFiSecurity security = 0;
-    octet_string<32> ssid = 1;
-    octet_string<6> bssid = 2;
-    int16u channel = 3;
-    WiFiBand wiFiBand = 4;
-    int8s rssi = 5;
+server cluster ThreadNetworkDiagnostics = 53 {
+  enum NetworkFault : ENUM8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
   }
 
-  struct ThreadInterfaceScanResult {
-    int16u panId = 0;
-    int64u extendedPanId = 1;
-    char_string<16> networkName = 2;
-    int16u channel = 3;
-    int8u version = 4;
-    octet_string<8> extendedAddress = 5;
-    int8s rssi = 6;
-    int8u lqi = 7;
+  enum RoutingRole : ENUM8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kReed = 4;
+    kRouter = 5;
+    kLeader = 6;
   }
 
-  readonly attribute access(read: administer) int8u maxNetworks = 0;
-  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
-  readonly attribute int8u scanMaxTimeSeconds = 2;
-  readonly attribute int8u connectMaxTimeSeconds = 3;
-  attribute access(write: administer) boolean interfaceEnabled = 4;
-  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
-  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
-  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  enum ThreadConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
+  }
 
-  request struct ScanNetworksRequest {
-    optional nullable OCTET_STRING ssid = 0;
-    optional INT64U breadcrumb = 1;
+  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+    kMLECounts = 0x4;
+    kMACCounts = 0x8;
   }
 
-  request struct AddOrUpdateWiFiNetworkRequest {
-    OCTET_STRING ssid = 0;
-    OCTET_STRING credentials = 1;
-    optional INT64U breadcrumb = 2;
+  struct NeighborTable {
+    int64u extAddress = 0;
+    int32u age = 1;
+    int16u rloc16 = 2;
+    int32u linkFrameCounter = 3;
+    int32u mleFrameCounter = 4;
+    int8u lqi = 5;
+    nullable int8s averageRssi = 6;
+    nullable int8s lastRssi = 7;
+    int8u frameErrorRate = 8;
+    int8u messageErrorRate = 9;
+    boolean rxOnWhenIdle = 10;
+    boolean fullThreadDevice = 11;
+    boolean fullNetworkData = 12;
+    boolean isChild = 13;
   }
 
-  request struct AddOrUpdateThreadNetworkRequest {
-    OCTET_STRING operationalDataset = 0;
-    optional INT64U breadcrumb = 1;
+  struct RouteTable {
+    int64u extAddress = 0;
+    int16u rloc16 = 1;
+    int8u routerId = 2;
+    int8u nextHop = 3;
+    int8u pathCost = 4;
+    int8u LQIIn = 5;
+    int8u LQIOut = 6;
+    int8u age = 7;
+    boolean allocated = 8;
+    boolean linkEstablished = 9;
   }
 
-  request struct RemoveNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
+  struct SecurityPolicy {
+    int16u rotationTime = 0;
+    bitmap16 flags = 1;
   }
 
-  request struct ConnectNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
+  struct OperationalDatasetComponents {
+    boolean activeTimestampPresent = 0;
+    boolean pendingTimestampPresent = 1;
+    boolean masterKeyPresent = 2;
+    boolean networkNamePresent = 3;
+    boolean extendedPanIdPresent = 4;
+    boolean meshLocalPrefixPresent = 5;
+    boolean delayPresent = 6;
+    boolean panIdPresent = 7;
+    boolean channelPresent = 8;
+    boolean pskcPresent = 9;
+    boolean securityPolicyPresent = 10;
+    boolean channelMaskPresent = 11;
   }
 
-  request struct ReorderNetworkRequest {
-    OCTET_STRING networkID = 0;
-    INT8U networkIndex = 1;
-    optional INT64U breadcrumb = 2;
+  info event ConnectionStatus = 0 {
+    ThreadConnectionStatus connectionStatus = 0;
   }
 
-  response struct ScanNetworksResponse = 1 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
-    optional ThreadInterfaceScanResult threadScanResults[] = 3;
+  readonly attribute nullable int16u channel = 0;
+  readonly attribute nullable RoutingRole routingRole = 1;
+  readonly attribute nullable char_string<16> networkName = 2;
+  readonly attribute nullable int16u panId = 3;
+  readonly attribute nullable int64u extendedPanId = 4;
+  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute NeighborTable neighborTableList[] = 7;
+  readonly attribute RouteTable routeTableList[] = 8;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
+  readonly attribute int16u detachedRoleCount = 14;
+  readonly attribute int16u childRoleCount = 15;
+  readonly attribute int16u routerRoleCount = 16;
+  readonly attribute int16u leaderRoleCount = 17;
+  readonly attribute int16u attachAttemptCount = 18;
+  readonly attribute int16u partitionIdChangeCount = 19;
+  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
+  readonly attribute int16u parentChangeCount = 21;
+  readonly attribute int32u txTotalCount = 22;
+  readonly attribute int32u txUnicastCount = 23;
+  readonly attribute int32u txBroadcastCount = 24;
+  readonly attribute int32u txAckRequestedCount = 25;
+  readonly attribute int32u txAckedCount = 26;
+  readonly attribute int32u txNoAckRequestedCount = 27;
+  readonly attribute int32u txDataCount = 28;
+  readonly attribute int32u txDataPollCount = 29;
+  readonly attribute int32u txBeaconCount = 30;
+  readonly attribute int32u txBeaconRequestCount = 31;
+  readonly attribute int32u txOtherCount = 32;
+  readonly attribute int32u txRetryCount = 33;
+  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
+  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
+  readonly attribute int32u txErrCcaCount = 36;
+  readonly attribute int32u txErrAbortCount = 37;
+  readonly attribute int32u txErrBusyChannelCount = 38;
+  readonly attribute int32u rxTotalCount = 39;
+  readonly attribute int32u rxUnicastCount = 40;
+  readonly attribute int32u rxBroadcastCount = 41;
+  readonly attribute int32u rxDataCount = 42;
+  readonly attribute int32u rxDataPollCount = 43;
+  readonly attribute int32u rxBeaconCount = 44;
+  readonly attribute int32u rxBeaconRequestCount = 45;
+  readonly attribute int32u rxOtherCount = 46;
+  readonly attribute int32u rxAddressFilteredCount = 47;
+  readonly attribute int32u rxDestAddrFilteredCount = 48;
+  readonly attribute int32u rxDuplicatedCount = 49;
+  readonly attribute int32u rxErrNoFrameCount = 50;
+  readonly attribute int32u rxErrUnknownNeighborCount = 51;
+  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
+  readonly attribute int32u rxErrSecCount = 53;
+  readonly attribute int32u rxErrFcsCount = 54;
+  readonly attribute int32u rxErrOtherCount = 55;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
+  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command ResetCounts(): DefaultSuccess = 0;
+}
+
+server cluster WiFiNetworkDiagnostics = 54 {
+  enum AssociationFailureCause : ENUM8 {
+    kUnknown = 0;
+    kAssociationFailed = 1;
+    kAuthenticationFailed = 2;
+    kSsidNotFound = 3;
   }
 
-  response struct NetworkConfigResponse = 5 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional INT8U networkIndex = 2;
+  enum SecurityType : ENUM8 {
+    kUnspecified = 0;
+    kNone = 1;
+    kWep = 2;
+    kWpa = 3;
+    kWpa2 = 4;
+    kWpa3 = 5;
   }
 
-  response struct ConnectNetworkResponse = 7 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    nullable INT32S errorValue = 2;
+  enum WiFiConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
-  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
-  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
-  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
-  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
-  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
-}
+  enum WiFiVersionType : ENUM8 {
+    k80211a = 0;
+    k80211b = 1;
+    k80211g = 2;
+    k80211n = 3;
+    k80211ac = 4;
+    k80211ax = 5;
+  }
 
-client cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
+  info event Disconnection = 0 {
+    INT16U reasonCode = 0;
   }
 
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
+  info event AssociationFailure = 1 {
+    AssociationFailureCause associationFailure = 0;
+    INT16U status = 1;
   }
 
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
+  info event ConnectionStatus = 2 {
+    WiFiConnectionStatus connectionStatus = 0;
   }
 
+  readonly attribute nullable octet_string<6> bssid = 0;
+  readonly attribute nullable SecurityType securityType = 1;
+  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
+  readonly attribute nullable int16u channelNumber = 3;
+  readonly attribute nullable int8s rssi = 4;
+  readonly attribute int32u beaconLostCount = 5;
+  readonly attribute int32u beaconRxCount = 6;
+  readonly attribute int32u packetMulticastRxCount = 7;
+  readonly attribute int32u packetMulticastTxCount = 8;
+  readonly attribute int32u packetUnicastRxCount = 9;
+  readonly attribute int32u packetUnicastTxCount = 10;
+  readonly attribute int64u currentMaxRate = 11;
+  readonly attribute int64u overrunCount = 12;
+  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
-  }
+  command ResetCounts(): DefaultSuccess = 0;
+}
 
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
   }
 
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
-  }
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  response struct QueryImageResponse = 1 {
-    OTAQueryStatus status = 0;
-    optional INT32U delayedActionTime = 1;
-    optional CHAR_STRING imageURI = 2;
-    optional INT32U softwareVersion = 3;
-    optional CHAR_STRING softwareVersionString = 4;
-    optional OCTET_STRING updateToken = 5;
-    optional BOOLEAN userConsentNeeded = 6;
-    optional OCTET_STRING metadataForRequestor = 7;
-  }
+  command ResetCounts(): DefaultSuccess = 0;
+}
 
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
+server cluster Switch = 59 {
+  info event SwitchLatched = 0 {
+    INT8U newPosition = 0;
   }
 
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
-}
+  info event InitialPress = 1 {
+    INT8U newPosition = 0;
+  }
 
-server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum OTAAnnouncementReason : ENUM8 {
-    kSimpleAnnouncement = 0;
-    kUpdateAvailable = 1;
-    kUrgentUpdateAvailable = 2;
+  info event LongPress = 2 {
+    INT8U newPosition = 0;
   }
 
-  enum OTAChangeReasonEnum : ENUM8 {
-    kUnknown = 0;
-    kSuccess = 1;
-    kFailure = 2;
-    kTimeOut = 3;
-    kDelayByProvider = 4;
+  info event ShortRelease = 3 {
+    INT8U previousPosition = 0;
   }
 
-  enum OTAUpdateStateEnum : ENUM8 {
-    kUnknown = 0;
-    kIdle = 1;
-    kQuerying = 2;
-    kDelayedOnQuery = 3;
-    kDownloading = 4;
-    kApplying = 5;
-    kDelayedOnApply = 6;
-    kRollingBack = 7;
-    kDelayedOnUserConsent = 8;
+  info event LongRelease = 4 {
+    INT8U previousPosition = 0;
   }
 
-  struct ProviderLocation {
-    node_id providerNodeID = 1;
-    endpoint_no endpoint = 2;
-    fabric_idx fabricIndex = 254;
+  info event MultiPressOngoing = 5 {
+    INT8U newPosition = 0;
+    INT8U currentNumberOfPressesCounted = 1;
   }
 
-  info event StateTransition = 0 {
-    OTAUpdateStateEnum previousState = 0;
-    OTAUpdateStateEnum newState = 1;
-    OTAChangeReasonEnum reason = 2;
-    nullable INT32U targetSoftwareVersion = 3;
+  info event MultiPressComplete = 6 {
+    INT8U newPosition = 0;
+    INT8U totalNumberOfPressesCounted = 1;
   }
 
-  critical event VersionApplied = 1 {
-    INT32U softwareVersion = 0;
-    INT16U productID = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
   }
 
-  info event DownloadError = 2 {
-    INT32U softwareVersion = 0;
-    INT64U bytesDownloaded = 1;
-    nullable INT8U progressPercent = 2;
-    nullable INT64S platformCode = 3;
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
   }
 
-  attribute ProviderLocation defaultOtaProviders[] = 0;
-  readonly attribute boolean updatePossible = 1;
-  readonly attribute OTAUpdateStateEnum updateState = 2;
-  readonly attribute nullable int8u updateStateProgress = 3;
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AnnounceOtaProviderRequest {
-    node_id providerNodeId = 0;
-    vendor_id vendorId = 1;
-    OTAAnnouncementReason announcementReason = 2;
-    optional OCTET_STRING metadataForNode = 3;
-    endpoint_no endpoint = 4;
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
   }
 
-  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+  }
+
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
 server cluster OperationalCredentials = 62 {
@@ -918,366 +1151,133 @@ server cluster OperationalCredentials = 62 {
     CHAR_STRING label = 0;
   }
 
-  request struct RemoveFabricRequest {
-    fabric_idx fabricIndex = 0;
-  }
-
-  request struct AddTrustedRootCertificateRequest {
-    OCTET_STRING rootCertificate = 0;
-  }
-
-  response struct AttestationResponse = 1 {
-    OCTET_STRING attestationElements = 0;
-    OCTET_STRING signature = 1;
-  }
-
-  response struct CertificateChainResponse = 3 {
-    OCTET_STRING certificate = 0;
-  }
-
-  response struct CSRResponse = 5 {
-    OCTET_STRING NOCSRElements = 0;
-    OCTET_STRING attestationSignature = 1;
-  }
-
-  response struct NOCResponse = 8 {
-    OperationalCertStatus statusCode = 0;
-    optional fabric_idx fabricIndex = 1;
-    optional CHAR_STRING debugText = 2;
-  }
-
-  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
-  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
-  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
-  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
-  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
-  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
-  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
-  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-}
-
-server cluster RelativeHumidityMeasurement = 1029 {
-  readonly attribute nullable int16u measuredValue = 0;
-  readonly attribute nullable int16u minMeasuredValue = 1;
-  readonly attribute nullable int16u maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster SoftwareDiagnostics = 52 {
-  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
-    kWaterMarks = 0x1;
-  }
-
-  struct ThreadMetrics {
-    int64u id = 0;
-    optional char_string<8> name = 1;
-    optional int32u stackFreeCurrent = 2;
-    optional int32u stackFreeMinimum = 3;
-    optional int32u stackSize = 4;
-  }
-
-  info event SoftwareFault = 0 {
-    SoftwareFaultStruct softwareFault = 0;
-  }
-
-  readonly attribute ThreadMetrics threadMetrics[] = 0;
-  readonly attribute int64u currentHeapFree = 1;
-  readonly attribute int64u currentHeapUsed = 2;
-  readonly attribute int64u currentHeapHighWatermark = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command ResetWatermarks(): DefaultSuccess = 0;
-}
-
-server cluster Switch = 59 {
-  info event SwitchLatched = 0 {
-    INT8U newPosition = 0;
-  }
-
-  info event InitialPress = 1 {
-    INT8U newPosition = 0;
-  }
-
-  info event LongPress = 2 {
-    INT8U newPosition = 0;
-  }
-
-  info event ShortRelease = 3 {
-    INT8U previousPosition = 0;
-  }
-
-  info event LongRelease = 4 {
-    INT8U previousPosition = 0;
-  }
-
-  info event MultiPressOngoing = 5 {
-    INT8U newPosition = 0;
-    INT8U currentNumberOfPressesCounted = 1;
-  }
-
-  info event MultiPressComplete = 6 {
-    INT8U newPosition = 0;
-    INT8U totalNumberOfPressesCounted = 1;
-  }
-
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster ThreadNetworkDiagnostics = 53 {
-  enum NetworkFault : ENUM8 {
-    kUnspecified = 0;
-    kLinkDown = 1;
-    kHardwareFailure = 2;
-    kNetworkJammed = 3;
-  }
-
-  enum RoutingRole : ENUM8 {
-    kUnspecified = 0;
-    kUnassigned = 1;
-    kSleepyEndDevice = 2;
-    kEndDevice = 3;
-    kReed = 4;
-    kRouter = 5;
-    kLeader = 6;
-  }
-
-  enum ThreadConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
-  }
-
-  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
-    kPacketCounts = 0x1;
-    kErrorCounts = 0x2;
-    kMLECounts = 0x4;
-    kMACCounts = 0x8;
-  }
-
-  struct NeighborTable {
-    int64u extAddress = 0;
-    int32u age = 1;
-    int16u rloc16 = 2;
-    int32u linkFrameCounter = 3;
-    int32u mleFrameCounter = 4;
-    int8u lqi = 5;
-    nullable int8s averageRssi = 6;
-    nullable int8s lastRssi = 7;
-    int8u frameErrorRate = 8;
-    int8u messageErrorRate = 9;
-    boolean rxOnWhenIdle = 10;
-    boolean fullThreadDevice = 11;
-    boolean fullNetworkData = 12;
-    boolean isChild = 13;
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
   }
 
-  struct RouteTable {
-    int64u extAddress = 0;
-    int16u rloc16 = 1;
-    int8u routerId = 2;
-    int8u nextHop = 3;
-    int8u pathCost = 4;
-    int8u LQIIn = 5;
-    int8u LQIOut = 6;
-    int8u age = 7;
-    boolean allocated = 8;
-    boolean linkEstablished = 9;
+  request struct AddTrustedRootCertificateRequest {
+    OCTET_STRING rootCertificate = 0;
   }
 
-  struct SecurityPolicy {
-    int16u rotationTime = 0;
-    bitmap16 flags = 1;
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
   }
 
-  struct OperationalDatasetComponents {
-    boolean activeTimestampPresent = 0;
-    boolean pendingTimestampPresent = 1;
-    boolean masterKeyPresent = 2;
-    boolean networkNamePresent = 3;
-    boolean extendedPanIdPresent = 4;
-    boolean meshLocalPrefixPresent = 5;
-    boolean delayPresent = 6;
-    boolean panIdPresent = 7;
-    boolean channelPresent = 8;
-    boolean pskcPresent = 9;
-    boolean securityPolicyPresent = 10;
-    boolean channelMaskPresent = 11;
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
   }
 
-  info event ConnectionStatus = 0 {
-    ThreadConnectionStatus connectionStatus = 0;
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
   }
 
-  readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable RoutingRole routingRole = 1;
-  readonly attribute nullable char_string<16> networkName = 2;
-  readonly attribute nullable int16u panId = 3;
-  readonly attribute nullable int64u extendedPanId = 4;
-  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute NeighborTable neighborTableList[] = 7;
-  readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
-  readonly attribute nullable int8u leaderRouterId = 13;
-  readonly attribute int16u detachedRoleCount = 14;
-  readonly attribute int16u childRoleCount = 15;
-  readonly attribute int16u routerRoleCount = 16;
-  readonly attribute int16u leaderRoleCount = 17;
-  readonly attribute int16u attachAttemptCount = 18;
-  readonly attribute int16u partitionIdChangeCount = 19;
-  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
-  readonly attribute int16u parentChangeCount = 21;
-  readonly attribute int32u txTotalCount = 22;
-  readonly attribute int32u txUnicastCount = 23;
-  readonly attribute int32u txBroadcastCount = 24;
-  readonly attribute int32u txAckRequestedCount = 25;
-  readonly attribute int32u txAckedCount = 26;
-  readonly attribute int32u txNoAckRequestedCount = 27;
-  readonly attribute int32u txDataCount = 28;
-  readonly attribute int32u txDataPollCount = 29;
-  readonly attribute int32u txBeaconCount = 30;
-  readonly attribute int32u txBeaconRequestCount = 31;
-  readonly attribute int32u txOtherCount = 32;
-  readonly attribute int32u txRetryCount = 33;
-  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
-  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
-  readonly attribute int32u txErrCcaCount = 36;
-  readonly attribute int32u txErrAbortCount = 37;
-  readonly attribute int32u txErrBusyChannelCount = 38;
-  readonly attribute int32u rxTotalCount = 39;
-  readonly attribute int32u rxUnicastCount = 40;
-  readonly attribute int32u rxBroadcastCount = 41;
-  readonly attribute int32u rxDataCount = 42;
-  readonly attribute int32u rxDataPollCount = 43;
-  readonly attribute int32u rxBeaconCount = 44;
-  readonly attribute int32u rxBeaconRequestCount = 45;
-  readonly attribute int32u rxOtherCount = 46;
-  readonly attribute int32u rxAddressFilteredCount = 47;
-  readonly attribute int32u rxDestAddrFilteredCount = 48;
-  readonly attribute int32u rxDuplicatedCount = 49;
-  readonly attribute int32u rxErrNoFrameCount = 50;
-  readonly attribute int32u rxErrUnknownNeighborCount = 51;
-  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
-  readonly attribute int32u rxErrSecCount = 53;
-  readonly attribute int32u rxErrFcsCount = 54;
-  readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute nullable int64u activeTimestamp = 56;
-  readonly attribute nullable int64u pendingTimestamp = 57;
-  readonly attribute nullable int32u delay = 58;
-  readonly attribute nullable SecurityPolicy securityPolicy = 59;
-  readonly attribute nullable octet_string<4> channelMask = 60;
-  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
-  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
+  }
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
 }
 
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
   }
 
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
 
-server cluster UserLabel = 65 {
-  attribute access(write: manage) LabelStruct labelList[] = 0;
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCause : ENUM8 {
-    kUnknown = 0;
-    kAssociationFailed = 1;
-    kAuthenticationFailed = 2;
-    kSsidNotFound = 3;
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  enum SecurityType : ENUM8 {
-    kUnspecified = 0;
-    kNone = 1;
-    kWep = 2;
-    kWpa = 3;
-    kWpa2 = 4;
-    kWpa3 = 5;
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  enum WiFiConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  enum WiFiVersionType : ENUM8 {
-    k80211a = 0;
-    k80211b = 1;
-    k80211g = 2;
-    k80211n = 3;
-    k80211ac = 4;
-    k80211ax = 5;
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  info event Disconnection = 0 {
-    INT16U reasonCode = 0;
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  info event AssociationFailure = 1 {
-    AssociationFailureCause associationFailure = 0;
-    INT16U status = 1;
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  info event ConnectionStatus = 2 {
-    WiFiConnectionStatus connectionStatus = 0;
-  }
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
 
-  readonly attribute nullable octet_string<6> bssid = 0;
-  readonly attribute nullable SecurityType securityType = 1;
-  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
-  readonly attribute nullable int16u channelNumber = 3;
-  readonly attribute nullable int8s rssi = 4;
-  readonly attribute int32u beaconLostCount = 5;
-  readonly attribute int32u beaconRxCount = 6;
-  readonly attribute int32u packetMulticastRxCount = 7;
-  readonly attribute int32u packetMulticastTxCount = 8;
-  readonly attribute int32u packetUnicastRxCount = 9;
-  readonly attribute int32u packetUnicastTxCount = 10;
-  readonly attribute int64u currentMaxRate = 11;
-  readonly attribute int64u overrunCount = 12;
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  command ResetCounts(): DefaultSuccess = 0;
+server cluster UserLabel = 65 {
+  attribute access(write: manage) LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster RelativeHumidityMeasurement = 1029 {
+  readonly attribute nullable int16u measuredValue = 0;
+  readonly attribute nullable int16u minMeasuredValue = 1;
+  readonly attribute nullable int16u maxMeasuredValue = 2;
+  readonly attribute int16u tolerance = 3;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
 endpoint 0 {
diff --git a/examples/chef/devices/rootnode_occupancysensor_52g0FarxiO.matter b/examples/chef/devices/rootnode_occupancysensor_52g0FarxiO.matter
index a9db88d438a410..e0c717a1bf4aa1 100644
--- a/examples/chef/devices/rootnode_occupancysensor_52g0FarxiO.matter
+++ b/examples/chef/devices/rootnode_occupancysensor_52g0FarxiO.matter
@@ -6,6 +6,145 @@ struct LabelStruct {
     char_string<16> value = 1;
 }
 
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
+  }
+
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
+  }
+
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
+  }
+
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
+  }
+
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+}
+
+client cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AddGroupRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
+
+  request struct ViewGroupRequest {
+    group_id groupId = 0;
+  }
+
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
+  }
+
+  request struct RemoveGroupRequest {
+    group_id groupId = 0;
+  }
+
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
+
+  response struct AddGroupResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  response struct ViewGroupResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    CHAR_STRING groupName = 2;
+  }
+
+  response struct GetGroupMembershipResponse = 2 {
+    nullable INT8U capacity = 0;
+    group_id groupList[] = 1;
+  }
+
+  response struct RemoveGroupResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
+}
+
+server cluster Descriptor = 29 {
+  struct DeviceType {
+    devtype_id type = 0;
+    int16u revision = 1;
+  }
+
+  readonly attribute DeviceType deviceList[] = 0;
+  readonly attribute CLUSTER_ID serverList[] = 1;
+  readonly attribute CLUSTER_ID clientList[] = 2;
+  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+client cluster Binding = 30 {
+  struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  attribute TargetStruct binding[] = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
 server cluster AccessControl = 31 {
   enum AuthMode : ENUM8 {
     kPase = 1;
@@ -69,42 +208,6 @@ server cluster AccessControl = 31 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
-  }
-
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
-  }
-
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
-  }
-
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-  }
-
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
-
 server cluster Basic = 40 {
   critical event StartUp = 0 {
     INT32U softwareVersion = 0;
@@ -143,102 +246,171 @@ server cluster Basic = 40 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-client cluster Binding = 30 {
-  struct TargetStruct {
-    optional node_id node = 1;
-    optional group_id group = 2;
-    optional endpoint_no endpoint = 3;
-    optional cluster_id cluster = 4;
-    fabric_idx fabricIndex = 254;
+client cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
   }
 
-  attribute TargetStruct binding[] = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
+  }
 
-server cluster Descriptor = 29 {
-  struct DeviceType {
-    devtype_id type = 0;
-    int16u revision = 1;
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
   }
 
-  readonly attribute DeviceType deviceList[] = 0;
-  readonly attribute CLUSTER_ID serverList[] = 1;
-  readonly attribute CLUSTER_ID clientList[] = 2;
-  readonly attribute ENDPOINT_NO partsList[] = 3;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster DiagnosticLogs = 50 {
-  enum LogsIntent : ENUM8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
-  }
 
-  enum LogsStatus : ENUM8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
   }
 
-  enum LogsTransferProtocol : ENUM8 {
-    kResponsePayload = 0;
-    kBdx = 1;
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
   }
 
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct RetrieveLogsRequestRequest {
-    LogsIntent intent = 0;
-    LogsTransferProtocol requestedProtocol = 1;
-    OCTET_STRING transferFileDesignator = 2;
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
   }
 
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+  response struct QueryImageResponse = 1 {
+    OTAQueryStatus status = 0;
+    optional INT32U delayedActionTime = 1;
+    optional CHAR_STRING imageURI = 2;
+    optional INT32U softwareVersion = 3;
+    optional CHAR_STRING softwareVersionString = 4;
+    optional OCTET_STRING updateToken = 5;
+    optional BOOLEAN userConsentNeeded = 6;
+    optional OCTET_STRING metadataForRequestor = 7;
+  }
+
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
+  }
+
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
 }
 
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
+server cluster OtaSoftwareUpdateRequestor = 42 {
+  enum OTAAnnouncementReason : ENUM8 {
+    kSimpleAnnouncement = 0;
+    kUpdateAvailable = 1;
+    kUrgentUpdateAvailable = 2;
   }
 
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
+  enum OTAChangeReasonEnum : ENUM8 {
+    kUnknown = 0;
+    kSuccess = 1;
+    kFailure = 2;
+    kTimeOut = 3;
+    kDelayByProvider = 4;
+  }
+
+  enum OTAUpdateStateEnum : ENUM8 {
+    kUnknown = 0;
+    kIdle = 1;
+    kQuerying = 2;
+    kDelayedOnQuery = 3;
+    kDownloading = 4;
+    kApplying = 5;
+    kDelayedOnApply = 6;
+    kRollingBack = 7;
+    kDelayedOnUserConsent = 8;
+  }
+
+  struct ProviderLocation {
+    node_id providerNodeID = 1;
+    endpoint_no endpoint = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  info event StateTransition = 0 {
+    OTAUpdateStateEnum previousState = 0;
+    OTAUpdateStateEnum newState = 1;
+    OTAChangeReasonEnum reason = 2;
+    nullable INT32U targetSoftwareVersion = 3;
+  }
+
+  critical event VersionApplied = 1 {
+    INT32U softwareVersion = 0;
+    INT16U productID = 1;
+  }
+
+  info event DownloadError = 2 {
+    INT32U softwareVersion = 0;
+    INT64U bytesDownloaded = 1;
+    nullable INT8U progressPercent = 2;
+    nullable INT64S platformCode = 3;
+  }
+
+  attribute ProviderLocation defaultOtaProviders[] = 0;
+  readonly attribute boolean updatePossible = 1;
+  readonly attribute OTAUpdateStateEnum updateState = 2;
+  readonly attribute nullable int8u updateStateProgress = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  request struct AnnounceOtaProviderRequest {
+    node_id providerNodeId = 0;
+    vendor_id vendorId = 1;
+    OTAAnnouncementReason announcementReason = 2;
+    optional OCTET_STRING metadataForNode = 3;
+    endpoint_no endpoint = 4;
+  }
+
+  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
 }
 
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
+server cluster LocalizationConfiguration = 43 {
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
+  }
+
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
+  }
+
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
@@ -301,563 +473,613 @@ server cluster GeneralCommissioning = 48 {
   command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
 }
 
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatus : ENUM8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
   }
 
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
+  enum WiFiBand : ENUM8 {
+    k2g4 = 0;
+    k3g65 = 1;
+    k5g = 2;
+    k6g = 3;
+    k60g = 4;
   }
 
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
+  bitmap NetworkCommissioningFeature : BITMAP32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
   }
 
-  enum NetworkFaultType : ENUM8 {
-    kUnspecified = 0;
-    kHardwareFailure = 1;
-    kNetworkJammed = 2;
-    kConnectionFailed = 3;
+  bitmap WiFiSecurity : BITMAP8 {
+    kUnencrypted = 0x1;
+    kWepPersonal = 0x2;
+    kWpaPersonal = 0x4;
+    kWpa2Personal = 0x8;
+    kWpa3Personal = 0x10;
   }
 
-  enum RadioFaultType : ENUM8 {
-    kUnspecified = 0;
-    kWiFiFault = 1;
-    kCellularFault = 2;
-    kThreadFault = 3;
-    kNFCFault = 4;
-    kBLEFault = 5;
-    kEthernetFault = 6;
+  struct NetworkInfo {
+    octet_string<32> networkID = 0;
+    boolean connected = 1;
   }
 
-  struct NetworkInterfaceType {
-    char_string<32> name = 0;
-    boolean isOperational = 1;
-    nullable boolean offPremiseServicesReachableIPv4 = 2;
-    nullable boolean offPremiseServicesReachableIPv6 = 3;
-    octet_string<8> hardwareAddress = 4;
-    octet_string IPv4Addresses[] = 5;
-    octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+  struct WiFiInterfaceScanResult {
+    WiFiSecurity security = 0;
+    octet_string<32> ssid = 1;
+    octet_string<6> bssid = 2;
+    int16u channel = 3;
+    WiFiBand wiFiBand = 4;
+    int8s rssi = 5;
   }
 
-  critical event HardwareFaultChange = 0 {
-    HardwareFaultType current[] = 0;
-    HardwareFaultType previous[] = 1;
+  struct ThreadInterfaceScanResult {
+    int16u panId = 0;
+    int64u extendedPanId = 1;
+    char_string<16> networkName = 2;
+    int16u channel = 3;
+    int8u version = 4;
+    octet_string<8> extendedAddress = 5;
+    int8s rssi = 6;
+    int8u lqi = 7;
   }
 
-  critical event RadioFaultChange = 1 {
-    RadioFaultType current[] = 0;
-    RadioFaultType previous[] = 1;
+  readonly attribute access(read: administer) int8u maxNetworks = 0;
+  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
+  readonly attribute int8u scanMaxTimeSeconds = 2;
+  readonly attribute int8u connectMaxTimeSeconds = 3;
+  attribute access(write: administer) boolean interfaceEnabled = 4;
+  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
+  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
+  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ScanNetworksRequest {
+    optional nullable OCTET_STRING ssid = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
-  }
-
-  critical event BootReason = 3 {
-    BootReasonType bootReason = 0;
+  request struct AddOrUpdateWiFiNetworkRequest {
+    OCTET_STRING ssid = 0;
+    OCTET_STRING credentials = 1;
+    optional INT64U breadcrumb = 2;
   }
 
-  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
-  readonly attribute int16u rebootCount = 1;
-  readonly attribute int64u upTime = 2;
-  readonly attribute int32u totalOperationalHours = 3;
-  readonly attribute enum8 bootReasons = 4;
-  readonly attribute ENUM8 activeHardwareFaults[] = 5;
-  readonly attribute ENUM8 activeRadioFaults[] = 6;
-  readonly attribute ENUM8 activeNetworkFaults[] = 7;
-  readonly attribute boolean testEventTriggersEnabled = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct TestEventTriggerRequest {
-    OCTET_STRING enableKey = 0;
-    INT64U eventTrigger = 1;
+  request struct AddOrUpdateThreadNetworkRequest {
+    OCTET_STRING operationalDataset = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
-}
-
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
+  request struct RemoveNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
-    fabric_idx fabricIndex = 254;
+  request struct ConnectNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
+  request struct ReorderNetworkRequest {
+    OCTET_STRING networkID = 0;
+    INT8U networkIndex = 1;
+    optional INT64U breadcrumb = 2;
   }
 
-  struct GroupKeySetStruct {
-    int16u groupKeySetID = 0;
-    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
-    nullable octet_string<16> epochKey0 = 2;
-    nullable epoch_us epochStartTime0 = 3;
-    nullable octet_string<16> epochKey1 = 4;
-    nullable epoch_us epochStartTime1 = 5;
-    nullable octet_string<16> epochKey2 = 6;
-    nullable epoch_us epochStartTime2 = 7;
+  response struct ScanNetworksResponse = 1 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
+    optional ThreadInterfaceScanResult threadScanResults[] = 3;
   }
 
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
-  readonly attribute int16u maxGroupsPerFabric = 2;
-  readonly attribute int16u maxGroupKeysPerFabric = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct KeySetWriteRequest {
-    GroupKeySetStruct groupKeySet = 0;
+  response struct NetworkConfigResponse = 5 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional INT8U networkIndex = 2;
   }
 
-  request struct KeySetReadRequest {
-    INT16U groupKeySetID = 0;
+  response struct ConnectNetworkResponse = 7 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    nullable INT32S errorValue = 2;
   }
 
-  request struct KeySetRemoveRequest {
-    INT16U groupKeySetID = 0;
-  }
+  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
+  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
+  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
+  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
+  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
+  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+}
 
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
+server cluster DiagnosticLogs = 50 {
+  enum LogsIntent : ENUM8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
   }
 
-  response struct KeySetReadResponse = 2 {
-    GroupKeySetStruct groupKeySet = 0;
+  enum LogsStatus : ENUM8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
   }
 
-  response struct KeySetReadAllIndicesResponse = 5 {
-    INT16U groupKeySetIDs[] = 0;
+  enum LogsTransferProtocol : ENUM8 {
+    kResponsePayload = 0;
+    kBdx = 1;
   }
 
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
-}
-
-client cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AddGroupRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+  request struct RetrieveLogsRequestRequest {
+    LogsIntent intent = 0;
+    LogsTransferProtocol requestedProtocol = 1;
+    OCTET_STRING transferFileDesignator = 2;
   }
 
-  request struct ViewGroupRequest {
-    group_id groupId = 0;
-  }
+  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+}
 
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
   }
 
-  request struct RemoveGroupRequest {
-    group_id groupId = 0;
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
   }
 
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
   }
 
-  response struct AddGroupResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
   }
 
-  response struct ViewGroupResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    CHAR_STRING groupName = 2;
+  enum RadioFaultType : ENUM8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
   }
 
-  response struct GetGroupMembershipResponse = 2 {
-    nullable INT8U capacity = 0;
-    group_id groupList[] = 1;
+  struct NetworkInterfaceType {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceType type = 7;
   }
 
-  response struct RemoveGroupResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultType current[] = 0;
+    HardwareFaultType previous[] = 1;
   }
 
-  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
-}
-
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
+  critical event RadioFaultChange = 1 {
+    RadioFaultType current[] = 0;
+    RadioFaultType previous[] = 1;
   }
 
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultType current[] = 0;
+    NetworkFaultType previous[] = 1;
   }
 
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
+  critical event BootReason = 3 {
+    BootReasonType bootReason = 0;
   }
 
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
+  readonly attribute int32u totalOperationalHours = 3;
+  readonly attribute enum8 bootReasons = 4;
+  readonly attribute ENUM8 activeHardwareFaults[] = 5;
+  readonly attribute ENUM8 activeRadioFaults[] = 6;
+  readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
   }
 
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
-}
-
-server cluster LocalizationConfiguration = 43 {
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
-server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatus : ENUM8 {
-    kSuccess = 0;
-    kOutOfRange = 1;
-    kBoundsExceeded = 2;
-    kNetworkIDNotFound = 3;
-    kDuplicateNetworkID = 4;
-    kNetworkNotFound = 5;
-    kRegulatoryError = 6;
-    kAuthFailure = 7;
-    kUnsupportedSecurity = 8;
-    kOtherConnectionFailure = 9;
-    kIPV6Failed = 10;
-    kIPBindFailed = 11;
-    kUnknownError = 12;
-  }
-
-  enum WiFiBand : ENUM8 {
-    k2g4 = 0;
-    k3g65 = 1;
-    k5g = 2;
-    k6g = 3;
-    k60g = 4;
-  }
-
-  bitmap NetworkCommissioningFeature : BITMAP32 {
-    kWiFiNetworkInterface = 0x1;
-    kThreadNetworkInterface = 0x2;
-    kEthernetNetworkInterface = 0x4;
-  }
-
-  bitmap WiFiSecurity : BITMAP8 {
-    kUnencrypted = 0x1;
-    kWepPersonal = 0x2;
-    kWpaPersonal = 0x4;
-    kWpa2Personal = 0x8;
-    kWpa3Personal = 0x10;
-  }
-
-  struct NetworkInfo {
-    octet_string<32> networkID = 0;
-    boolean connected = 1;
+server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
   }
 
-  struct WiFiInterfaceScanResult {
-    WiFiSecurity security = 0;
-    octet_string<32> ssid = 1;
-    octet_string<6> bssid = 2;
-    int16u channel = 3;
-    WiFiBand wiFiBand = 4;
-    int8s rssi = 5;
+  struct ThreadMetrics {
+    int64u id = 0;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
-  struct ThreadInterfaceScanResult {
-    int16u panId = 0;
-    int64u extendedPanId = 1;
-    char_string<16> networkName = 2;
-    int16u channel = 3;
-    int8u version = 4;
-    octet_string<8> extendedAddress = 5;
-    int8s rssi = 6;
-    int8u lqi = 7;
+  info event SoftwareFault = 0 {
+    SoftwareFaultStruct softwareFault = 0;
   }
 
-  readonly attribute access(read: administer) int8u maxNetworks = 0;
-  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
-  readonly attribute int8u scanMaxTimeSeconds = 2;
-  readonly attribute int8u connectMaxTimeSeconds = 3;
-  attribute access(write: administer) boolean interfaceEnabled = 4;
-  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
-  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
-  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute ThreadMetrics threadMetrics[] = 0;
+  readonly attribute int64u currentHeapFree = 1;
+  readonly attribute int64u currentHeapUsed = 2;
+  readonly attribute int64u currentHeapHighWatermark = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct ScanNetworksRequest {
-    optional nullable OCTET_STRING ssid = 0;
-    optional INT64U breadcrumb = 1;
+  command ResetWatermarks(): DefaultSuccess = 0;
+}
+
+server cluster ThreadNetworkDiagnostics = 53 {
+  enum NetworkFault : ENUM8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
   }
 
-  request struct AddOrUpdateWiFiNetworkRequest {
-    OCTET_STRING ssid = 0;
-    OCTET_STRING credentials = 1;
-    optional INT64U breadcrumb = 2;
+  enum RoutingRole : ENUM8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kReed = 4;
+    kRouter = 5;
+    kLeader = 6;
   }
 
-  request struct AddOrUpdateThreadNetworkRequest {
-    OCTET_STRING operationalDataset = 0;
-    optional INT64U breadcrumb = 1;
+  enum ThreadConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  request struct RemoveNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
+  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+    kMLECounts = 0x4;
+    kMACCounts = 0x8;
   }
 
-  request struct ConnectNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
+  struct NeighborTable {
+    int64u extAddress = 0;
+    int32u age = 1;
+    int16u rloc16 = 2;
+    int32u linkFrameCounter = 3;
+    int32u mleFrameCounter = 4;
+    int8u lqi = 5;
+    nullable int8s averageRssi = 6;
+    nullable int8s lastRssi = 7;
+    int8u frameErrorRate = 8;
+    int8u messageErrorRate = 9;
+    boolean rxOnWhenIdle = 10;
+    boolean fullThreadDevice = 11;
+    boolean fullNetworkData = 12;
+    boolean isChild = 13;
   }
 
-  request struct ReorderNetworkRequest {
-    OCTET_STRING networkID = 0;
-    INT8U networkIndex = 1;
-    optional INT64U breadcrumb = 2;
+  struct RouteTable {
+    int64u extAddress = 0;
+    int16u rloc16 = 1;
+    int8u routerId = 2;
+    int8u nextHop = 3;
+    int8u pathCost = 4;
+    int8u LQIIn = 5;
+    int8u LQIOut = 6;
+    int8u age = 7;
+    boolean allocated = 8;
+    boolean linkEstablished = 9;
   }
 
-  response struct ScanNetworksResponse = 1 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
-    optional ThreadInterfaceScanResult threadScanResults[] = 3;
+  struct SecurityPolicy {
+    int16u rotationTime = 0;
+    bitmap16 flags = 1;
   }
 
-  response struct NetworkConfigResponse = 5 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional INT8U networkIndex = 2;
+  struct OperationalDatasetComponents {
+    boolean activeTimestampPresent = 0;
+    boolean pendingTimestampPresent = 1;
+    boolean masterKeyPresent = 2;
+    boolean networkNamePresent = 3;
+    boolean extendedPanIdPresent = 4;
+    boolean meshLocalPrefixPresent = 5;
+    boolean delayPresent = 6;
+    boolean panIdPresent = 7;
+    boolean channelPresent = 8;
+    boolean pskcPresent = 9;
+    boolean securityPolicyPresent = 10;
+    boolean channelMaskPresent = 11;
   }
 
-  response struct ConnectNetworkResponse = 7 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    nullable INT32S errorValue = 2;
+  info event ConnectionStatus = 0 {
+    ThreadConnectionStatus connectionStatus = 0;
   }
 
-  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
-  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
-  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
-  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
-  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
-  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+  readonly attribute nullable int16u channel = 0;
+  readonly attribute nullable RoutingRole routingRole = 1;
+  readonly attribute nullable char_string<16> networkName = 2;
+  readonly attribute nullable int16u panId = 3;
+  readonly attribute nullable int64u extendedPanId = 4;
+  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute NeighborTable neighborTableList[] = 7;
+  readonly attribute RouteTable routeTableList[] = 8;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
+  readonly attribute int16u detachedRoleCount = 14;
+  readonly attribute int16u childRoleCount = 15;
+  readonly attribute int16u routerRoleCount = 16;
+  readonly attribute int16u leaderRoleCount = 17;
+  readonly attribute int16u attachAttemptCount = 18;
+  readonly attribute int16u partitionIdChangeCount = 19;
+  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
+  readonly attribute int16u parentChangeCount = 21;
+  readonly attribute int32u txTotalCount = 22;
+  readonly attribute int32u txUnicastCount = 23;
+  readonly attribute int32u txBroadcastCount = 24;
+  readonly attribute int32u txAckRequestedCount = 25;
+  readonly attribute int32u txAckedCount = 26;
+  readonly attribute int32u txNoAckRequestedCount = 27;
+  readonly attribute int32u txDataCount = 28;
+  readonly attribute int32u txDataPollCount = 29;
+  readonly attribute int32u txBeaconCount = 30;
+  readonly attribute int32u txBeaconRequestCount = 31;
+  readonly attribute int32u txOtherCount = 32;
+  readonly attribute int32u txRetryCount = 33;
+  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
+  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
+  readonly attribute int32u txErrCcaCount = 36;
+  readonly attribute int32u txErrAbortCount = 37;
+  readonly attribute int32u txErrBusyChannelCount = 38;
+  readonly attribute int32u rxTotalCount = 39;
+  readonly attribute int32u rxUnicastCount = 40;
+  readonly attribute int32u rxBroadcastCount = 41;
+  readonly attribute int32u rxDataCount = 42;
+  readonly attribute int32u rxDataPollCount = 43;
+  readonly attribute int32u rxBeaconCount = 44;
+  readonly attribute int32u rxBeaconRequestCount = 45;
+  readonly attribute int32u rxOtherCount = 46;
+  readonly attribute int32u rxAddressFilteredCount = 47;
+  readonly attribute int32u rxDestAddrFilteredCount = 48;
+  readonly attribute int32u rxDuplicatedCount = 49;
+  readonly attribute int32u rxErrNoFrameCount = 50;
+  readonly attribute int32u rxErrUnknownNeighborCount = 51;
+  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
+  readonly attribute int32u rxErrSecCount = 53;
+  readonly attribute int32u rxErrFcsCount = 54;
+  readonly attribute int32u rxErrOtherCount = 55;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
+  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
-client cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
+server cluster WiFiNetworkDiagnostics = 54 {
+  enum AssociationFailureCause : ENUM8 {
+    kUnknown = 0;
+    kAssociationFailed = 1;
+    kAuthenticationFailed = 2;
+    kSsidNotFound = 3;
   }
 
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
+  enum SecurityType : ENUM8 {
+    kUnspecified = 0;
+    kNone = 1;
+    kWep = 2;
+    kWpa = 3;
+    kWpa2 = 4;
+    kWpa3 = 5;
   }
 
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
+  enum WiFiConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
+  enum WiFiVersionType : ENUM8 {
+    k80211a = 0;
+    k80211b = 1;
+    k80211g = 2;
+    k80211n = 3;
+    k80211ac = 4;
+    k80211ax = 5;
   }
 
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
+  info event Disconnection = 0 {
+    INT16U reasonCode = 0;
   }
 
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
+  info event AssociationFailure = 1 {
+    AssociationFailureCause associationFailure = 0;
+    INT16U status = 1;
   }
 
-  response struct QueryImageResponse = 1 {
-    OTAQueryStatus status = 0;
-    optional INT32U delayedActionTime = 1;
-    optional CHAR_STRING imageURI = 2;
-    optional INT32U softwareVersion = 3;
-    optional CHAR_STRING softwareVersionString = 4;
-    optional OCTET_STRING updateToken = 5;
-    optional BOOLEAN userConsentNeeded = 6;
-    optional OCTET_STRING metadataForRequestor = 7;
+  info event ConnectionStatus = 2 {
+    WiFiConnectionStatus connectionStatus = 0;
   }
 
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
+  readonly attribute nullable octet_string<6> bssid = 0;
+  readonly attribute nullable SecurityType securityType = 1;
+  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
+  readonly attribute nullable int16u channelNumber = 3;
+  readonly attribute nullable int8s rssi = 4;
+  readonly attribute int32u beaconLostCount = 5;
+  readonly attribute int32u beaconRxCount = 6;
+  readonly attribute int32u packetMulticastRxCount = 7;
+  readonly attribute int32u packetMulticastTxCount = 8;
+  readonly attribute int32u packetUnicastRxCount = 9;
+  readonly attribute int32u packetUnicastTxCount = 10;
+  readonly attribute int64u currentMaxRate = 11;
+  readonly attribute int64u overrunCount = 12;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command ResetCounts(): DefaultSuccess = 0;
+}
+
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
   }
 
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
-server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum OTAAnnouncementReason : ENUM8 {
-    kSimpleAnnouncement = 0;
-    kUpdateAvailable = 1;
-    kUrgentUpdateAvailable = 2;
+server cluster Switch = 59 {
+  info event SwitchLatched = 0 {
+    INT8U newPosition = 0;
   }
 
-  enum OTAChangeReasonEnum : ENUM8 {
-    kUnknown = 0;
-    kSuccess = 1;
-    kFailure = 2;
-    kTimeOut = 3;
-    kDelayByProvider = 4;
+  info event InitialPress = 1 {
+    INT8U newPosition = 0;
   }
 
-  enum OTAUpdateStateEnum : ENUM8 {
-    kUnknown = 0;
-    kIdle = 1;
-    kQuerying = 2;
-    kDelayedOnQuery = 3;
-    kDownloading = 4;
-    kApplying = 5;
-    kDelayedOnApply = 6;
-    kRollingBack = 7;
-    kDelayedOnUserConsent = 8;
+  info event LongPress = 2 {
+    INT8U newPosition = 0;
   }
 
-  struct ProviderLocation {
-    node_id providerNodeID = 1;
-    endpoint_no endpoint = 2;
-    fabric_idx fabricIndex = 254;
+  info event ShortRelease = 3 {
+    INT8U previousPosition = 0;
   }
 
-  info event StateTransition = 0 {
-    OTAUpdateStateEnum previousState = 0;
-    OTAUpdateStateEnum newState = 1;
-    OTAChangeReasonEnum reason = 2;
-    nullable INT32U targetSoftwareVersion = 3;
+  info event LongRelease = 4 {
+    INT8U previousPosition = 0;
   }
 
-  critical event VersionApplied = 1 {
-    INT32U softwareVersion = 0;
-    INT16U productID = 1;
+  info event MultiPressOngoing = 5 {
+    INT8U newPosition = 0;
+    INT8U currentNumberOfPressesCounted = 1;
   }
 
-  info event DownloadError = 2 {
-    INT32U softwareVersion = 0;
-    INT64U bytesDownloaded = 1;
-    nullable INT8U progressPercent = 2;
-    nullable INT64S platformCode = 3;
+  info event MultiPressComplete = 6 {
+    INT8U newPosition = 0;
+    INT8U totalNumberOfPressesCounted = 1;
   }
 
-  attribute ProviderLocation defaultOtaProviders[] = 0;
-  readonly attribute boolean updatePossible = 1;
-  readonly attribute OTAUpdateStateEnum updateState = 2;
-  readonly attribute nullable int8u updateStateProgress = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct AnnounceOtaProviderRequest {
-    node_id providerNodeId = 0;
-    vendor_id vendorId = 1;
-    OTAAnnouncementReason announcementReason = 2;
-    optional OCTET_STRING metadataForNode = 3;
-    endpoint_no endpoint = 4;
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
   }
 
-  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
-}
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
+  }
 
-server cluster OccupancySensing = 1030 {
-  readonly attribute bitmap8 occupancy = 0;
-  readonly attribute enum8 occupancySensorType = 1;
-  readonly attribute bitmap8 occupancySensorTypeBitmap = 2;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
+  }
+
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+  }
+
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
 server cluster OperationalCredentials = 62 {
@@ -928,355 +1150,133 @@ server cluster OperationalCredentials = 62 {
   request struct UpdateFabricLabelRequest {
     CHAR_STRING label = 0;
   }
-
-  request struct RemoveFabricRequest {
-    fabric_idx fabricIndex = 0;
-  }
-
-  request struct AddTrustedRootCertificateRequest {
-    OCTET_STRING rootCertificate = 0;
-  }
-
-  response struct AttestationResponse = 1 {
-    OCTET_STRING attestationElements = 0;
-    OCTET_STRING signature = 1;
-  }
-
-  response struct CertificateChainResponse = 3 {
-    OCTET_STRING certificate = 0;
-  }
-
-  response struct CSRResponse = 5 {
-    OCTET_STRING NOCSRElements = 0;
-    OCTET_STRING attestationSignature = 1;
-  }
-
-  response struct NOCResponse = 8 {
-    OperationalCertStatus statusCode = 0;
-    optional fabric_idx fabricIndex = 1;
-    optional CHAR_STRING debugText = 2;
-  }
-
-  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
-  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
-  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
-  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
-  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
-  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
-  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
-  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-}
-
-server cluster SoftwareDiagnostics = 52 {
-  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
-    kWaterMarks = 0x1;
-  }
-
-  struct ThreadMetrics {
-    int64u id = 0;
-    optional char_string<8> name = 1;
-    optional int32u stackFreeCurrent = 2;
-    optional int32u stackFreeMinimum = 3;
-    optional int32u stackSize = 4;
-  }
-
-  info event SoftwareFault = 0 {
-    SoftwareFaultStruct softwareFault = 0;
-  }
-
-  readonly attribute ThreadMetrics threadMetrics[] = 0;
-  readonly attribute int64u currentHeapFree = 1;
-  readonly attribute int64u currentHeapUsed = 2;
-  readonly attribute int64u currentHeapHighWatermark = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command ResetWatermarks(): DefaultSuccess = 0;
-}
-
-server cluster Switch = 59 {
-  info event SwitchLatched = 0 {
-    INT8U newPosition = 0;
-  }
-
-  info event InitialPress = 1 {
-    INT8U newPosition = 0;
-  }
-
-  info event LongPress = 2 {
-    INT8U newPosition = 0;
-  }
-
-  info event ShortRelease = 3 {
-    INT8U previousPosition = 0;
-  }
-
-  info event LongRelease = 4 {
-    INT8U previousPosition = 0;
-  }
-
-  info event MultiPressOngoing = 5 {
-    INT8U newPosition = 0;
-    INT8U currentNumberOfPressesCounted = 1;
-  }
-
-  info event MultiPressComplete = 6 {
-    INT8U newPosition = 0;
-    INT8U totalNumberOfPressesCounted = 1;
-  }
-
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster ThreadNetworkDiagnostics = 53 {
-  enum NetworkFault : ENUM8 {
-    kUnspecified = 0;
-    kLinkDown = 1;
-    kHardwareFailure = 2;
-    kNetworkJammed = 3;
-  }
-
-  enum RoutingRole : ENUM8 {
-    kUnspecified = 0;
-    kUnassigned = 1;
-    kSleepyEndDevice = 2;
-    kEndDevice = 3;
-    kReed = 4;
-    kRouter = 5;
-    kLeader = 6;
-  }
-
-  enum ThreadConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
-  }
-
-  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
-    kPacketCounts = 0x1;
-    kErrorCounts = 0x2;
-    kMLECounts = 0x4;
-    kMACCounts = 0x8;
-  }
-
-  struct NeighborTable {
-    int64u extAddress = 0;
-    int32u age = 1;
-    int16u rloc16 = 2;
-    int32u linkFrameCounter = 3;
-    int32u mleFrameCounter = 4;
-    int8u lqi = 5;
-    nullable int8s averageRssi = 6;
-    nullable int8s lastRssi = 7;
-    int8u frameErrorRate = 8;
-    int8u messageErrorRate = 9;
-    boolean rxOnWhenIdle = 10;
-    boolean fullThreadDevice = 11;
-    boolean fullNetworkData = 12;
-    boolean isChild = 13;
+
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
   }
 
-  struct RouteTable {
-    int64u extAddress = 0;
-    int16u rloc16 = 1;
-    int8u routerId = 2;
-    int8u nextHop = 3;
-    int8u pathCost = 4;
-    int8u LQIIn = 5;
-    int8u LQIOut = 6;
-    int8u age = 7;
-    boolean allocated = 8;
-    boolean linkEstablished = 9;
+  request struct AddTrustedRootCertificateRequest {
+    OCTET_STRING rootCertificate = 0;
   }
 
-  struct SecurityPolicy {
-    int16u rotationTime = 0;
-    bitmap16 flags = 1;
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
   }
 
-  struct OperationalDatasetComponents {
-    boolean activeTimestampPresent = 0;
-    boolean pendingTimestampPresent = 1;
-    boolean masterKeyPresent = 2;
-    boolean networkNamePresent = 3;
-    boolean extendedPanIdPresent = 4;
-    boolean meshLocalPrefixPresent = 5;
-    boolean delayPresent = 6;
-    boolean panIdPresent = 7;
-    boolean channelPresent = 8;
-    boolean pskcPresent = 9;
-    boolean securityPolicyPresent = 10;
-    boolean channelMaskPresent = 11;
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
   }
 
-  info event ConnectionStatus = 0 {
-    ThreadConnectionStatus connectionStatus = 0;
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
   }
 
-  readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable RoutingRole routingRole = 1;
-  readonly attribute nullable char_string<16> networkName = 2;
-  readonly attribute nullable int16u panId = 3;
-  readonly attribute nullable int64u extendedPanId = 4;
-  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute NeighborTable neighborTableList[] = 7;
-  readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
-  readonly attribute nullable int8u leaderRouterId = 13;
-  readonly attribute int16u detachedRoleCount = 14;
-  readonly attribute int16u childRoleCount = 15;
-  readonly attribute int16u routerRoleCount = 16;
-  readonly attribute int16u leaderRoleCount = 17;
-  readonly attribute int16u attachAttemptCount = 18;
-  readonly attribute int16u partitionIdChangeCount = 19;
-  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
-  readonly attribute int16u parentChangeCount = 21;
-  readonly attribute int32u txTotalCount = 22;
-  readonly attribute int32u txUnicastCount = 23;
-  readonly attribute int32u txBroadcastCount = 24;
-  readonly attribute int32u txAckRequestedCount = 25;
-  readonly attribute int32u txAckedCount = 26;
-  readonly attribute int32u txNoAckRequestedCount = 27;
-  readonly attribute int32u txDataCount = 28;
-  readonly attribute int32u txDataPollCount = 29;
-  readonly attribute int32u txBeaconCount = 30;
-  readonly attribute int32u txBeaconRequestCount = 31;
-  readonly attribute int32u txOtherCount = 32;
-  readonly attribute int32u txRetryCount = 33;
-  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
-  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
-  readonly attribute int32u txErrCcaCount = 36;
-  readonly attribute int32u txErrAbortCount = 37;
-  readonly attribute int32u txErrBusyChannelCount = 38;
-  readonly attribute int32u rxTotalCount = 39;
-  readonly attribute int32u rxUnicastCount = 40;
-  readonly attribute int32u rxBroadcastCount = 41;
-  readonly attribute int32u rxDataCount = 42;
-  readonly attribute int32u rxDataPollCount = 43;
-  readonly attribute int32u rxBeaconCount = 44;
-  readonly attribute int32u rxBeaconRequestCount = 45;
-  readonly attribute int32u rxOtherCount = 46;
-  readonly attribute int32u rxAddressFilteredCount = 47;
-  readonly attribute int32u rxDestAddrFilteredCount = 48;
-  readonly attribute int32u rxDuplicatedCount = 49;
-  readonly attribute int32u rxErrNoFrameCount = 50;
-  readonly attribute int32u rxErrUnknownNeighborCount = 51;
-  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
-  readonly attribute int32u rxErrSecCount = 53;
-  readonly attribute int32u rxErrFcsCount = 54;
-  readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute nullable int64u activeTimestamp = 56;
-  readonly attribute nullable int64u pendingTimestamp = 57;
-  readonly attribute nullable int32u delay = 58;
-  readonly attribute nullable SecurityPolicy securityPolicy = 59;
-  readonly attribute nullable octet_string<4> channelMask = 60;
-  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
-  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
+  }
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
 }
 
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
   }
 
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
 
-server cluster UserLabel = 65 {
-  attribute access(write: manage) LabelStruct labelList[] = 0;
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCause : ENUM8 {
-    kUnknown = 0;
-    kAssociationFailed = 1;
-    kAuthenticationFailed = 2;
-    kSsidNotFound = 3;
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  enum SecurityType : ENUM8 {
-    kUnspecified = 0;
-    kNone = 1;
-    kWep = 2;
-    kWpa = 3;
-    kWpa2 = 4;
-    kWpa3 = 5;
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  enum WiFiConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  enum WiFiVersionType : ENUM8 {
-    k80211a = 0;
-    k80211b = 1;
-    k80211g = 2;
-    k80211n = 3;
-    k80211ac = 4;
-    k80211ax = 5;
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  info event Disconnection = 0 {
-    INT16U reasonCode = 0;
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  info event AssociationFailure = 1 {
-    AssociationFailureCause associationFailure = 0;
-    INT16U status = 1;
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  info event ConnectionStatus = 2 {
-    WiFiConnectionStatus connectionStatus = 0;
-  }
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
 
-  readonly attribute nullable octet_string<6> bssid = 0;
-  readonly attribute nullable SecurityType securityType = 1;
-  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
-  readonly attribute nullable int16u channelNumber = 3;
-  readonly attribute nullable int8s rssi = 4;
-  readonly attribute int32u beaconLostCount = 5;
-  readonly attribute int32u beaconRxCount = 6;
-  readonly attribute int32u packetMulticastRxCount = 7;
-  readonly attribute int32u packetMulticastTxCount = 8;
-  readonly attribute int32u packetUnicastRxCount = 9;
-  readonly attribute int32u packetUnicastTxCount = 10;
-  readonly attribute int64u currentMaxRate = 11;
-  readonly attribute int64u overrunCount = 12;
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster UserLabel = 65 {
+  attribute access(write: manage) LabelStruct labelList[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  command ResetCounts(): DefaultSuccess = 0;
+server cluster OccupancySensing = 1030 {
+  readonly attribute bitmap8 occupancy = 0;
+  readonly attribute enum8 occupancySensorType = 1;
+  readonly attribute bitmap8 occupancySensorTypeBitmap = 2;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
 endpoint 0 {
diff --git a/examples/chef/devices/rootnode_onofflightswitch_zbddTYGOPV.matter b/examples/chef/devices/rootnode_onofflightswitch_zbddTYGOPV.matter
index 74c6f1060e0ee8..66f215fbdd9626 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_zbddTYGOPV.matter
+++ b/examples/chef/devices/rootnode_onofflightswitch_zbddTYGOPV.matter
@@ -6,703 +6,549 @@ struct LabelStruct {
     char_string<16> value = 1;
 }
 
-server cluster AccessControl = 31 {
-  enum AuthMode : ENUM8 {
-    kPase = 1;
-    kCase = 2;
-    kGroup = 3;
-  }
-
-  enum ChangeTypeEnum : ENUM8 {
-    kChanged = 0;
-    kAdded = 1;
-    kRemoved = 2;
-  }
-
-  enum Privilege : ENUM8 {
-    kView = 1;
-    kProxyView = 2;
-    kOperate = 3;
-    kManage = 4;
-    kAdminister = 5;
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
   }
 
-  struct AccessControlEntry {
-    Privilege privilege = 1;
-    AuthMode authMode = 2;
-    nullable int64u subjects[] = 3;
-    nullable Target targets[] = 4;
-    fabric_idx fabricIndex = 254;
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
   }
 
-  struct Target {
-    nullable cluster_id cluster = 0;
-    nullable endpoint_no endpoint = 1;
-    nullable devtype_id deviceType = 2;
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
   }
 
-  struct ExtensionEntry {
-    octet_string<128> data = 1;
-    fabric_idx fabricIndex = 254;
-  }
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  info event access(read: administer) AccessControlEntryChanged = 0 {
-    nullable node_id adminNodeID = 1;
-    nullable INT16U adminPasscodeID = 2;
-    ChangeTypeEnum changeType = 3;
-    nullable AccessControlEntry latestValue = 4;
-    fabric_idx adminFabricIndex = 254;
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
   }
 
-  info event access(read: administer) AccessControlExtensionChanged = 1 {
-    nullable node_id adminNodeID = 1;
-    nullable INT16U adminPasscodeID = 2;
-    ChangeTypeEnum changeType = 3;
-    nullable ExtensionEntry latestValue = 4;
-    fabric_idx adminFabricIndex = 254;
-  }
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+}
 
-  attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
-  attribute access(read: administer, write: administer) ExtensionEntry extension[] = 1;
+server cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
+  request struct AddGroupRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
   }
 
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
+  request struct ViewGroupRequest {
+    group_id groupId = 0;
   }
 
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
   }
 
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
+  request struct RemoveGroupRequest {
+    group_id groupId = 0;
   }
 
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
 
-server cluster Basic = 40 {
-  critical event StartUp = 0 {
-    INT32U softwareVersion = 0;
+  response struct AddGroupResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  critical event ShutDown = 1 {
+  response struct ViewGroupResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    CHAR_STRING groupName = 2;
   }
 
-  info event Leave = 2 {
+  response struct GetGroupMembershipResponse = 2 {
+    nullable INT8U capacity = 0;
+    group_id groupList[] = 1;
   }
 
-  info event ReachableChanged = 3 {
-    boolean reachableNewValue = 0;
+  response struct RemoveGroupResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  readonly attribute int16u dataModelRevision = 0;
-  readonly attribute char_string<32> vendorName = 1;
-  readonly attribute vendor_id vendorID = 2;
-  readonly attribute char_string<32> productName = 3;
-  readonly attribute int16u productID = 4;
-  attribute access(write: manage) char_string<32> nodeLabel = 5;
-  attribute access(write: administer) char_string<2> location = 6;
-  readonly attribute int16u hardwareVersion = 7;
-  readonly attribute char_string<64> hardwareVersionString = 8;
-  readonly attribute int32u softwareVersion = 9;
-  readonly attribute char_string<64> softwareVersionString = 10;
-  readonly attribute char_string<16> manufacturingDate = 11;
-  readonly attribute char_string<32> partNumber = 12;
-  readonly attribute long_char_string<256> productURL = 13;
-  readonly attribute char_string<64> productLabel = 14;
-  readonly attribute char_string<32> serialNumber = 15;
-  attribute access(write: manage) boolean localConfigDisabled = 16;
-  readonly attribute boolean reachable = 17;
-  readonly attribute char_string<32> uniqueID = 18;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
 }
 
-client cluster Binding = 30 {
-  struct TargetStruct {
-    optional node_id node = 1;
-    optional group_id group = 2;
-    optional endpoint_no endpoint = 3;
-    optional cluster_id cluster = 4;
-    fabric_idx fabricIndex = 254;
+client cluster Scenes = 5 {
+  bitmap ScenesCopyMode : BITMAP8 {
+    kCopyAllScenes = 0x1;
   }
 
-  attribute TargetStruct binding[] = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  struct ExtensionFieldSet {
+    cluster_id clusterId = 0;
+    AttributeValuePair attributeValueList[] = 1;
+  }
 
-server cluster Descriptor = 29 {
-  struct DeviceType {
-    devtype_id type = 0;
-    int16u revision = 1;
+  struct AttributeValuePair {
+    optional attrib_id attributeId = 0;
+    int8u attributeValue[] = 1;
   }
 
-  readonly attribute DeviceType deviceList[] = 0;
-  readonly attribute CLUSTER_ID serverList[] = 1;
-  readonly attribute CLUSTER_ID clientList[] = 2;
-  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute int8u sceneCount = 0;
+  readonly attribute int8u currentScene = 1;
+  readonly attribute group_id currentGroup = 2;
+  readonly attribute boolean sceneValid = 3;
+  readonly attribute bitmap8 nameSupport = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster DiagnosticLogs = 50 {
-  enum LogsIntent : ENUM8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
+  request struct AddSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    INT16U transitionTime = 2;
+    CHAR_STRING sceneName = 3;
+    ExtensionFieldSet extensionFieldSets[] = 4;
   }
 
-  enum LogsStatus : ENUM8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
+  request struct ViewSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  enum LogsTransferProtocol : ENUM8 {
-    kResponsePayload = 0;
-    kBdx = 1;
+  request struct RemoveSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  request struct RemoveAllScenesRequest {
+    group_id groupId = 0;
+  }
 
-  request struct RetrieveLogsRequestRequest {
-    LogsIntent intent = 0;
-    LogsTransferProtocol requestedProtocol = 1;
-    OCTET_STRING transferFileDesignator = 2;
+  request struct StoreSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
-}
+  request struct RecallSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    optional nullable INT16U transitionTime = 2;
+  }
 
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
-  }
-
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command ResetCounts(): DefaultSuccess = 0;
-}
-
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster GeneralCommissioning = 48 {
-  enum CommissioningError : ENUM8 {
-    kOk = 0;
-    kValueOutsideRange = 1;
-    kInvalidAuthentication = 2;
-    kNoFailSafe = 3;
-    kBusyWithOtherAdmin = 4;
-  }
-
-  enum RegulatoryLocationType : ENUM8 {
-    kIndoor = 0;
-    kOutdoor = 1;
-    kIndoorOutdoor = 2;
+  request struct GetSceneMembershipRequest {
+    group_id groupId = 0;
   }
 
-  struct BasicCommissioningInfo {
-    int16u failSafeExpiryLengthSeconds = 0;
-    int16u maxCumulativeFailsafeSeconds = 1;
+  response struct AddSceneResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  attribute access(write: administer) int64u breadcrumb = 0;
-  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
-  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
-  readonly attribute RegulatoryLocationType locationCapability = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct ArmFailSafeRequest {
-    INT16U expiryLengthSeconds = 0;
-    INT64U breadcrumb = 1;
+  response struct ViewSceneResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+    optional INT16U transitionTime = 3;
+    optional CHAR_STRING sceneName = 4;
+    optional ExtensionFieldSet extensionFieldSets[] = 5;
   }
 
-  request struct SetRegulatoryConfigRequest {
-    RegulatoryLocationType newRegulatoryConfig = 0;
-    CHAR_STRING countryCode = 1;
-    INT64U breadcrumb = 2;
+  response struct RemoveSceneResponse = 2 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  response struct ArmFailSafeResponse = 1 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  response struct RemoveAllScenesResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  response struct SetRegulatoryConfigResponse = 3 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  response struct StoreSceneResponse = 4 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  response struct CommissioningCompleteResponse = 5 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  response struct GetSceneMembershipResponse = 6 {
+    ENUM8 status = 0;
+    nullable INT8U capacity = 1;
+    group_id groupId = 2;
+    optional INT8U sceneList[] = 3;
   }
 
-  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
-  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
-  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
+  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
+  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
+  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
+  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
+  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
+  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
+  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
 }
 
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
+server cluster Scenes = 5 {
+  bitmap ScenesCopyMode : BITMAP8 {
+    kCopyAllScenes = 0x1;
   }
 
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
+  struct ExtensionFieldSet {
+    cluster_id clusterId = 0;
+    AttributeValuePair attributeValueList[] = 1;
   }
 
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
+  struct AttributeValuePair {
+    optional attrib_id attributeId = 0;
+    int8u attributeValue[] = 1;
   }
 
-  enum NetworkFaultType : ENUM8 {
-    kUnspecified = 0;
-    kHardwareFailure = 1;
-    kNetworkJammed = 2;
-    kConnectionFailed = 3;
-  }
+  readonly attribute int8u sceneCount = 0;
+  readonly attribute int8u currentScene = 1;
+  readonly attribute group_id currentGroup = 2;
+  readonly attribute boolean sceneValid = 3;
+  readonly attribute bitmap8 nameSupport = 4;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  enum RadioFaultType : ENUM8 {
-    kUnspecified = 0;
-    kWiFiFault = 1;
-    kCellularFault = 2;
-    kThreadFault = 3;
-    kNFCFault = 4;
-    kBLEFault = 5;
-    kEthernetFault = 6;
+  request struct AddSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    INT16U transitionTime = 2;
+    CHAR_STRING sceneName = 3;
+    ExtensionFieldSet extensionFieldSets[] = 4;
   }
 
-  struct NetworkInterfaceType {
-    char_string<32> name = 0;
-    boolean isOperational = 1;
-    nullable boolean offPremiseServicesReachableIPv4 = 2;
-    nullable boolean offPremiseServicesReachableIPv6 = 3;
-    octet_string<8> hardwareAddress = 4;
-    octet_string IPv4Addresses[] = 5;
-    octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+  request struct ViewSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  critical event HardwareFaultChange = 0 {
-    HardwareFaultType current[] = 0;
-    HardwareFaultType previous[] = 1;
+  request struct RemoveSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  critical event RadioFaultChange = 1 {
-    RadioFaultType current[] = 0;
-    RadioFaultType previous[] = 1;
+  request struct RemoveAllScenesRequest {
+    group_id groupId = 0;
   }
 
-  critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+  request struct StoreSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  critical event BootReason = 3 {
-    BootReasonType bootReason = 0;
+  request struct RecallSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    optional nullable INT16U transitionTime = 2;
   }
 
-  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
-  readonly attribute int16u rebootCount = 1;
-  readonly attribute int64u upTime = 2;
-  readonly attribute int32u totalOperationalHours = 3;
-  readonly attribute enum8 bootReasons = 4;
-  readonly attribute ENUM8 activeHardwareFaults[] = 5;
-  readonly attribute ENUM8 activeRadioFaults[] = 6;
-  readonly attribute ENUM8 activeNetworkFaults[] = 7;
-  readonly attribute boolean testEventTriggersEnabled = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct TestEventTriggerRequest {
-    OCTET_STRING enableKey = 0;
-    INT64U eventTrigger = 1;
+  request struct GetSceneMembershipRequest {
+    group_id groupId = 0;
   }
 
-  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
-}
+  response struct AddSceneResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+  }
 
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
+  response struct ViewSceneResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+    optional INT16U transitionTime = 3;
+    optional CHAR_STRING sceneName = 4;
+    optional ExtensionFieldSet extensionFieldSets[] = 5;
   }
 
-  struct GroupKeyMapStruct {
+  response struct RemoveSceneResponse = 2 {
+    ENUM8 status = 0;
     group_id groupId = 1;
-    int16u groupKeySetID = 2;
-    fabric_idx fabricIndex = 254;
+    INT8U sceneId = 2;
   }
 
-  struct GroupInfoMapStruct {
+  response struct RemoveAllScenesResponse = 3 {
+    ENUM8 status = 0;
     group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
   }
 
-  struct GroupKeySetStruct {
-    int16u groupKeySetID = 0;
-    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
-    nullable octet_string<16> epochKey0 = 2;
-    nullable epoch_us epochStartTime0 = 3;
-    nullable octet_string<16> epochKey1 = 4;
-    nullable epoch_us epochStartTime1 = 5;
-    nullable octet_string<16> epochKey2 = 6;
-    nullable epoch_us epochStartTime2 = 7;
+  response struct StoreSceneResponse = 4 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
-  readonly attribute int16u maxGroupsPerFabric = 2;
-  readonly attribute int16u maxGroupKeysPerFabric = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  response struct GetSceneMembershipResponse = 6 {
+    ENUM8 status = 0;
+    nullable INT8U capacity = 1;
+    group_id groupId = 2;
+    optional INT8U sceneList[] = 3;
+  }
 
-  request struct KeySetWriteRequest {
-    GroupKeySetStruct groupKeySet = 0;
+  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
+  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
+  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
+  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
+  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
+  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
+  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
+}
+
+client cluster OnOff = 6 {
+  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
+    kFadeToOffIn0p8Seconds = 0;
+    kNoFade = 1;
+    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
   }
 
-  request struct KeySetReadRequest {
-    INT16U groupKeySetID = 0;
+  enum OnOffDyingLightEffectVariant : ENUM8 {
+    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
   }
 
-  request struct KeySetRemoveRequest {
-    INT16U groupKeySetID = 0;
+  enum OnOffEffectIdentifier : ENUM8 {
+    kDelayedAllOff = 0;
+    kDyingLight = 1;
   }
 
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
+  enum OnOffStartUpOnOff : ENUM8 {
+    kOff = 0;
+    kOn = 1;
+    kTogglePreviousOnOff = 2;
   }
 
-  response struct KeySetReadResponse = 2 {
-    GroupKeySetStruct groupKeySet = 0;
+  bitmap OnOffControl : BITMAP8 {
+    kAcceptOnlyWhenOn = 0x1;
   }
 
-  response struct KeySetReadAllIndicesResponse = 5 {
-    INT16U groupKeySetIDs[] = 0;
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
   }
 
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
-}
+  bitmap SceneFeatures : BITMAP32 {
+    kSceneNames = 0x1;
+  }
 
-server cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
+  readonly attribute boolean onOff = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AddGroupRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
-  }
+  command Off(): DefaultSuccess = 0;
+  command On(): DefaultSuccess = 1;
+  command Toggle(): DefaultSuccess = 2;
+}
 
-  request struct ViewGroupRequest {
-    group_id groupId = 0;
+server cluster OnOff = 6 {
+  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
+    kFadeToOffIn0p8Seconds = 0;
+    kNoFade = 1;
+    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
   }
 
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
+  enum OnOffDyingLightEffectVariant : ENUM8 {
+    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
   }
 
-  request struct RemoveGroupRequest {
-    group_id groupId = 0;
+  enum OnOffEffectIdentifier : ENUM8 {
+    kDelayedAllOff = 0;
+    kDyingLight = 1;
   }
 
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+  enum OnOffStartUpOnOff : ENUM8 {
+    kOff = 0;
+    kOn = 1;
+    kTogglePreviousOnOff = 2;
   }
 
-  response struct AddGroupResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  bitmap OnOffControl : BITMAP8 {
+    kAcceptOnlyWhenOn = 0x1;
   }
 
-  response struct ViewGroupResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    CHAR_STRING groupName = 2;
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
   }
 
-  response struct GetGroupMembershipResponse = 2 {
-    nullable INT8U capacity = 0;
-    group_id groupList[] = 1;
+  bitmap SceneFeatures : BITMAP32 {
+    kSceneNames = 0x1;
   }
 
-  response struct RemoveGroupResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-  }
+  readonly attribute boolean onOff = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
+  command Off(): DefaultSuccess = 0;
+  command On(): DefaultSuccess = 1;
+  command Toggle(): DefaultSuccess = 2;
 }
 
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
-  }
-
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
-  }
-
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
+server cluster Descriptor = 29 {
+  struct DeviceType {
+    devtype_id type = 0;
+    int16u revision = 1;
   }
 
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
+  readonly attribute DeviceType deviceList[] = 0;
+  readonly attribute CLUSTER_ID serverList[] = 1;
+  readonly attribute CLUSTER_ID clientList[] = 2;
+  readonly attribute ENDPOINT_NO partsList[] = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
+client cluster Binding = 30 {
+  struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
   }
 
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
-}
-
-server cluster LocalizationConfiguration = 43 {
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
-  readonly attribute bitmap32 featureMap = 65532;
+  attribute TargetStruct binding[] = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatus : ENUM8 {
-    kSuccess = 0;
-    kOutOfRange = 1;
-    kBoundsExceeded = 2;
-    kNetworkIDNotFound = 3;
-    kDuplicateNetworkID = 4;
-    kNetworkNotFound = 5;
-    kRegulatoryError = 6;
-    kAuthFailure = 7;
-    kUnsupportedSecurity = 8;
-    kOtherConnectionFailure = 9;
-    kIPV6Failed = 10;
-    kIPBindFailed = 11;
-    kUnknownError = 12;
+server cluster AccessControl = 31 {
+  enum AuthMode : ENUM8 {
+    kPase = 1;
+    kCase = 2;
+    kGroup = 3;
   }
 
-  enum WiFiBand : ENUM8 {
-    k2g4 = 0;
-    k3g65 = 1;
-    k5g = 2;
-    k6g = 3;
-    k60g = 4;
+  enum ChangeTypeEnum : ENUM8 {
+    kChanged = 0;
+    kAdded = 1;
+    kRemoved = 2;
   }
 
-  bitmap NetworkCommissioningFeature : BITMAP32 {
-    kWiFiNetworkInterface = 0x1;
-    kThreadNetworkInterface = 0x2;
-    kEthernetNetworkInterface = 0x4;
+  enum Privilege : ENUM8 {
+    kView = 1;
+    kProxyView = 2;
+    kOperate = 3;
+    kManage = 4;
+    kAdminister = 5;
   }
 
-  bitmap WiFiSecurity : BITMAP8 {
-    kUnencrypted = 0x1;
-    kWepPersonal = 0x2;
-    kWpaPersonal = 0x4;
-    kWpa2Personal = 0x8;
-    kWpa3Personal = 0x10;
+  struct AccessControlEntry {
+    Privilege privilege = 1;
+    AuthMode authMode = 2;
+    nullable int64u subjects[] = 3;
+    nullable Target targets[] = 4;
+    fabric_idx fabricIndex = 254;
   }
 
-  struct NetworkInfo {
-    octet_string<32> networkID = 0;
-    boolean connected = 1;
+  struct Target {
+    nullable cluster_id cluster = 0;
+    nullable endpoint_no endpoint = 1;
+    nullable devtype_id deviceType = 2;
   }
 
-  struct WiFiInterfaceScanResult {
-    WiFiSecurity security = 0;
-    octet_string<32> ssid = 1;
-    octet_string<6> bssid = 2;
-    int16u channel = 3;
-    WiFiBand wiFiBand = 4;
-    int8s rssi = 5;
-  }
-
-  struct ThreadInterfaceScanResult {
-    int16u panId = 0;
-    int64u extendedPanId = 1;
-    char_string<16> networkName = 2;
-    int16u channel = 3;
-    int8u version = 4;
-    octet_string<8> extendedAddress = 5;
-    int8s rssi = 6;
-    int8u lqi = 7;
-  }
-
-  readonly attribute access(read: administer) int8u maxNetworks = 0;
-  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
-  readonly attribute int8u scanMaxTimeSeconds = 2;
-  readonly attribute int8u connectMaxTimeSeconds = 3;
-  attribute access(write: administer) boolean interfaceEnabled = 4;
-  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
-  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
-  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct ScanNetworksRequest {
-    optional nullable OCTET_STRING ssid = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct AddOrUpdateWiFiNetworkRequest {
-    OCTET_STRING ssid = 0;
-    OCTET_STRING credentials = 1;
-    optional INT64U breadcrumb = 2;
+  struct ExtensionEntry {
+    octet_string<128> data = 1;
+    fabric_idx fabricIndex = 254;
   }
 
-  request struct AddOrUpdateThreadNetworkRequest {
-    OCTET_STRING operationalDataset = 0;
-    optional INT64U breadcrumb = 1;
+  info event access(read: administer) AccessControlEntryChanged = 0 {
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable AccessControlEntry latestValue = 4;
+    fabric_idx adminFabricIndex = 254;
   }
 
-  request struct RemoveNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
+  info event access(read: administer) AccessControlExtensionChanged = 1 {
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable ExtensionEntry latestValue = 4;
+    fabric_idx adminFabricIndex = 254;
   }
 
-  request struct ConnectNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
-  }
+  attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
+  attribute access(read: administer, write: administer) ExtensionEntry extension[] = 1;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct ReorderNetworkRequest {
-    OCTET_STRING networkID = 0;
-    INT8U networkIndex = 1;
-    optional INT64U breadcrumb = 2;
+server cluster Basic = 40 {
+  critical event StartUp = 0 {
+    INT32U softwareVersion = 0;
   }
 
-  response struct ScanNetworksResponse = 1 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
-    optional ThreadInterfaceScanResult threadScanResults[] = 3;
+  critical event ShutDown = 1 {
   }
 
-  response struct NetworkConfigResponse = 5 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional INT8U networkIndex = 2;
+  info event Leave = 2 {
   }
 
-  response struct ConnectNetworkResponse = 7 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    nullable INT32S errorValue = 2;
+  info event ReachableChanged = 3 {
+    boolean reachableNewValue = 0;
   }
 
-  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
-  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
-  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
-  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
-  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
-  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+  readonly attribute int16u dataModelRevision = 0;
+  readonly attribute char_string<32> vendorName = 1;
+  readonly attribute vendor_id vendorID = 2;
+  readonly attribute char_string<32> productName = 3;
+  readonly attribute int16u productID = 4;
+  attribute access(write: manage) char_string<32> nodeLabel = 5;
+  attribute access(write: administer) char_string<2> location = 6;
+  readonly attribute int16u hardwareVersion = 7;
+  readonly attribute char_string<64> hardwareVersionString = 8;
+  readonly attribute int32u softwareVersion = 9;
+  readonly attribute char_string<64> softwareVersionString = 10;
+  readonly attribute char_string<16> manufacturingDate = 11;
+  readonly attribute char_string<32> partNumber = 12;
+  readonly attribute long_char_string<256> productURL = 13;
+  readonly attribute char_string<64> productLabel = 14;
+  readonly attribute char_string<32> serialNumber = 15;
+  attribute access(write: manage) boolean localConfigDisabled = 16;
+  readonly attribute boolean reachable = 17;
+  readonly attribute char_string<32> uniqueID = 18;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
 client cluster OtaSoftwareUpdateProvider = 41 {
@@ -840,425 +686,362 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
   command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
 }
 
-client cluster OnOff = 6 {
-  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
-    kFadeToOffIn0p8Seconds = 0;
-    kNoFade = 1;
-    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
-  }
+server cluster LocalizationConfiguration = 43 {
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  enum OnOffDyingLightEffectVariant : ENUM8 {
-    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
   }
 
-  enum OnOffEffectIdentifier : ENUM8 {
-    kDelayedAllOff = 0;
-    kDyingLight = 1;
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
   }
 
-  enum OnOffStartUpOnOff : ENUM8 {
-    kOff = 0;
-    kOn = 1;
-    kTogglePreviousOnOff = 2;
-  }
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  bitmap OnOffControl : BITMAP8 {
-    kAcceptOnlyWhenOn = 0x1;
+server cluster GeneralCommissioning = 48 {
+  enum CommissioningError : ENUM8 {
+    kOk = 0;
+    kValueOutsideRange = 1;
+    kInvalidAuthentication = 2;
+    kNoFailSafe = 3;
+    kBusyWithOtherAdmin = 4;
   }
 
-  bitmap OnOffFeature : BITMAP32 {
-    kLighting = 0x1;
+  enum RegulatoryLocationType : ENUM8 {
+    kIndoor = 0;
+    kOutdoor = 1;
+    kIndoorOutdoor = 2;
   }
 
-  bitmap SceneFeatures : BITMAP32 {
-    kSceneNames = 0x1;
+  struct BasicCommissioningInfo {
+    int16u failSafeExpiryLengthSeconds = 0;
+    int16u maxCumulativeFailsafeSeconds = 1;
   }
 
-  readonly attribute boolean onOff = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  attribute access(write: administer) int64u breadcrumb = 0;
+  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
+  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
+  readonly attribute RegulatoryLocationType locationCapability = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command Off(): DefaultSuccess = 0;
-  command On(): DefaultSuccess = 1;
-  command Toggle(): DefaultSuccess = 2;
-}
-
-server cluster OnOff = 6 {
-  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
-    kFadeToOffIn0p8Seconds = 0;
-    kNoFade = 1;
-    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
+  request struct ArmFailSafeRequest {
+    INT16U expiryLengthSeconds = 0;
+    INT64U breadcrumb = 1;
   }
 
-  enum OnOffDyingLightEffectVariant : ENUM8 {
-    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
+  request struct SetRegulatoryConfigRequest {
+    RegulatoryLocationType newRegulatoryConfig = 0;
+    CHAR_STRING countryCode = 1;
+    INT64U breadcrumb = 2;
   }
 
-  enum OnOffEffectIdentifier : ENUM8 {
-    kDelayedAllOff = 0;
-    kDyingLight = 1;
+  response struct ArmFailSafeResponse = 1 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  enum OnOffStartUpOnOff : ENUM8 {
-    kOff = 0;
-    kOn = 1;
-    kTogglePreviousOnOff = 2;
+  response struct SetRegulatoryConfigResponse = 3 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  bitmap OnOffControl : BITMAP8 {
-    kAcceptOnlyWhenOn = 0x1;
+  response struct CommissioningCompleteResponse = 5 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  bitmap OnOffFeature : BITMAP32 {
-    kLighting = 0x1;
+  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
+  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
+  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
+}
+
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatus : ENUM8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
   }
 
-  bitmap SceneFeatures : BITMAP32 {
-    kSceneNames = 0x1;
+  enum WiFiBand : ENUM8 {
+    k2g4 = 0;
+    k3g65 = 1;
+    k5g = 2;
+    k6g = 3;
+    k60g = 4;
   }
 
-  readonly attribute boolean onOff = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command Off(): DefaultSuccess = 0;
-  command On(): DefaultSuccess = 1;
-  command Toggle(): DefaultSuccess = 2;
-}
-
-server cluster OperationalCredentials = 62 {
-  enum OperationalCertStatus : ENUM8 {
-    kSuccess = 0;
-    kInvalidPublicKey = 1;
-    kInvalidNodeOpId = 2;
-    kInvalidNOC = 3;
-    kMissingCsr = 4;
-    kTableFull = 5;
-    kInvalidAdminSubject = 6;
-    kInsufficientPrivilege = 8;
-    kFabricConflict = 9;
-    kLabelConflict = 10;
-    kInvalidFabricIndex = 11;
+  bitmap NetworkCommissioningFeature : BITMAP32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
   }
 
-  struct NOCStruct {
-    octet_string noc = 1;
-    nullable octet_string icac = 2;
-    fabric_idx fabricIndex = 254;
+  bitmap WiFiSecurity : BITMAP8 {
+    kUnencrypted = 0x1;
+    kWepPersonal = 0x2;
+    kWpaPersonal = 0x4;
+    kWpa2Personal = 0x8;
+    kWpa3Personal = 0x10;
   }
 
-  struct FabricDescriptor {
-    octet_string<65> rootPublicKey = 1;
-    vendor_id vendorId = 2;
-    fabric_id fabricId = 3;
-    node_id nodeId = 4;
-    char_string<32> label = 5;
-    fabric_idx fabricIndex = 254;
+  struct NetworkInfo {
+    octet_string<32> networkID = 0;
+    boolean connected = 1;
   }
 
-  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
-  readonly attribute FabricDescriptor fabrics[] = 1;
-  readonly attribute int8u supportedFabrics = 2;
-  readonly attribute int8u commissionedFabrics = 3;
-  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
-  readonly attribute fabric_idx currentFabricIndex = 5;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AttestationRequestRequest {
-    OCTET_STRING attestationNonce = 0;
+  struct WiFiInterfaceScanResult {
+    WiFiSecurity security = 0;
+    octet_string<32> ssid = 1;
+    octet_string<6> bssid = 2;
+    int16u channel = 3;
+    WiFiBand wiFiBand = 4;
+    int8s rssi = 5;
   }
 
-  request struct CertificateChainRequestRequest {
-    INT8U certificateType = 0;
+  struct ThreadInterfaceScanResult {
+    int16u panId = 0;
+    int64u extendedPanId = 1;
+    char_string<16> networkName = 2;
+    int16u channel = 3;
+    int8u version = 4;
+    octet_string<8> extendedAddress = 5;
+    int8s rssi = 6;
+    int8u lqi = 7;
   }
 
-  request struct CSRRequestRequest {
-    OCTET_STRING CSRNonce = 0;
-    optional boolean isForUpdateNOC = 1;
-  }
+  readonly attribute access(read: administer) int8u maxNetworks = 0;
+  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
+  readonly attribute int8u scanMaxTimeSeconds = 2;
+  readonly attribute int8u connectMaxTimeSeconds = 3;
+  attribute access(write: administer) boolean interfaceEnabled = 4;
+  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
+  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
+  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  request struct AddNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
-    OCTET_STRING IPKValue = 2;
-    Int64u caseAdminSubject = 3;
-    VENDOR_ID adminVendorId = 4;
+  request struct ScanNetworksRequest {
+    optional nullable OCTET_STRING ssid = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  request struct UpdateNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
+  request struct AddOrUpdateWiFiNetworkRequest {
+    OCTET_STRING ssid = 0;
+    OCTET_STRING credentials = 1;
+    optional INT64U breadcrumb = 2;
   }
 
-  request struct UpdateFabricLabelRequest {
-    CHAR_STRING label = 0;
+  request struct AddOrUpdateThreadNetworkRequest {
+    OCTET_STRING operationalDataset = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  request struct RemoveFabricRequest {
-    fabric_idx fabricIndex = 0;
+  request struct RemoveNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  request struct AddTrustedRootCertificateRequest {
-    OCTET_STRING rootCertificate = 0;
+  request struct ConnectNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  response struct AttestationResponse = 1 {
-    OCTET_STRING attestationElements = 0;
-    OCTET_STRING signature = 1;
+  request struct ReorderNetworkRequest {
+    OCTET_STRING networkID = 0;
+    INT8U networkIndex = 1;
+    optional INT64U breadcrumb = 2;
   }
 
-  response struct CertificateChainResponse = 3 {
-    OCTET_STRING certificate = 0;
+  response struct ScanNetworksResponse = 1 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
+    optional ThreadInterfaceScanResult threadScanResults[] = 3;
   }
 
-  response struct CSRResponse = 5 {
-    OCTET_STRING NOCSRElements = 0;
-    OCTET_STRING attestationSignature = 1;
+  response struct NetworkConfigResponse = 5 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional INT8U networkIndex = 2;
   }
 
-  response struct NOCResponse = 8 {
-    OperationalCertStatus statusCode = 0;
-    optional fabric_idx fabricIndex = 1;
-    optional CHAR_STRING debugText = 2;
+  response struct ConnectNetworkResponse = 7 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    nullable INT32S errorValue = 2;
   }
 
-  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
-  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
-  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
-  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
-  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
-  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
-  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
-  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
+  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
+  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
+  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
+  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
+  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
+  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
 }
 
-client cluster Scenes = 5 {
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
+server cluster DiagnosticLogs = 50 {
+  enum LogsIntent : ENUM8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
   }
 
-  struct ExtensionFieldSet {
-    cluster_id clusterId = 0;
-    AttributeValuePair attributeValueList[] = 1;
+  enum LogsStatus : ENUM8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
   }
 
-  struct AttributeValuePair {
-    optional attrib_id attributeId = 0;
-    int8u attributeValue[] = 1;
+  enum LogsTransferProtocol : ENUM8 {
+    kResponsePayload = 0;
+    kBdx = 1;
   }
 
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AddSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    INT16U transitionTime = 2;
-    CHAR_STRING sceneName = 3;
-    ExtensionFieldSet extensionFieldSets[] = 4;
+  request struct RetrieveLogsRequestRequest {
+    LogsIntent intent = 0;
+    LogsTransferProtocol requestedProtocol = 1;
+    OCTET_STRING transferFileDesignator = 2;
   }
 
-  request struct ViewSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
+  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+}
 
-  request struct RemoveSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
   }
 
-  request struct RemoveAllScenesRequest {
-    group_id groupId = 0;
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
   }
 
-  request struct StoreSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
   }
 
-  request struct RecallSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    optional nullable INT16U transitionTime = 2;
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
   }
 
-  request struct GetSceneMembershipRequest {
-    group_id groupId = 0;
-  }
-
-  response struct AddSceneResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
-
-  response struct ViewSceneResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-    optional INT16U transitionTime = 3;
-    optional CHAR_STRING sceneName = 4;
-    optional ExtensionFieldSet extensionFieldSets[] = 5;
-  }
-
-  response struct RemoveSceneResponse = 2 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
-
-  response struct RemoveAllScenesResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  enum RadioFaultType : ENUM8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
   }
 
-  response struct StoreSceneResponse = 4 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
+  struct NetworkInterfaceType {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceType type = 7;
   }
 
-  response struct GetSceneMembershipResponse = 6 {
-    ENUM8 status = 0;
-    nullable INT8U capacity = 1;
-    group_id groupId = 2;
-    optional INT8U sceneList[] = 3;
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultType current[] = 0;
+    HardwareFaultType previous[] = 1;
   }
 
-  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
-  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
-  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
-  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
-  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
-  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
-  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
-}
-
-server cluster Scenes = 5 {
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
+  critical event RadioFaultChange = 1 {
+    RadioFaultType current[] = 0;
+    RadioFaultType previous[] = 1;
   }
 
-  struct ExtensionFieldSet {
-    cluster_id clusterId = 0;
-    AttributeValuePair attributeValueList[] = 1;
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultType current[] = 0;
+    NetworkFaultType previous[] = 1;
   }
 
-  struct AttributeValuePair {
-    optional attrib_id attributeId = 0;
-    int8u attributeValue[] = 1;
+  critical event BootReason = 3 {
+    BootReasonType bootReason = 0;
   }
 
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
+  readonly attribute int32u totalOperationalHours = 3;
+  readonly attribute enum8 bootReasons = 4;
+  readonly attribute ENUM8 activeHardwareFaults[] = 5;
+  readonly attribute ENUM8 activeRadioFaults[] = 6;
+  readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AddSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    INT16U transitionTime = 2;
-    CHAR_STRING sceneName = 3;
-    ExtensionFieldSet extensionFieldSets[] = 4;
-  }
-
-  request struct ViewSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RemoveSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RemoveAllScenesRequest {
-    group_id groupId = 0;
-  }
-
-  request struct StoreSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RecallSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    optional nullable INT16U transitionTime = 2;
-  }
-
-  request struct GetSceneMembershipRequest {
-    group_id groupId = 0;
-  }
-
-  response struct AddSceneResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
-
-  response struct ViewSceneResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-    optional INT16U transitionTime = 3;
-    optional CHAR_STRING sceneName = 4;
-    optional ExtensionFieldSet extensionFieldSets[] = 5;
-  }
-
-  response struct RemoveSceneResponse = 2 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
-
-  response struct RemoveAllScenesResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-  }
-
-  response struct StoreSceneResponse = 4 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
-
-  response struct GetSceneMembershipResponse = 6 {
-    ENUM8 status = 0;
-    nullable INT8U capacity = 1;
-    group_id groupId = 2;
-    optional INT8U sceneList[] = 3;
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
   }
 
-  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
-  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
-  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
-  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
-  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
-  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
-  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
 server cluster SoftwareDiagnostics = 52 {
@@ -1288,41 +1071,6 @@ server cluster SoftwareDiagnostics = 52 {
   command ResetWatermarks(): DefaultSuccess = 0;
 }
 
-server cluster Switch = 59 {
-  info event SwitchLatched = 0 {
-    INT8U newPosition = 0;
-  }
-
-  info event InitialPress = 1 {
-    INT8U newPosition = 0;
-  }
-
-  info event LongPress = 2 {
-    INT8U newPosition = 0;
-  }
-
-  info event ShortRelease = 3 {
-    INT8U previousPosition = 0;
-  }
-
-  info event LongRelease = 4 {
-    INT8U previousPosition = 0;
-  }
-
-  info event MultiPressOngoing = 5 {
-    INT8U newPosition = 0;
-    INT8U currentNumberOfPressesCounted = 1;
-  }
-
-  info event MultiPressComplete = 6 {
-    INT8U newPosition = 0;
-    INT8U totalNumberOfPressesCounted = 1;
-  }
-
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
 server cluster ThreadNetworkDiagnostics = 53 {
   enum NetworkFault : ENUM8 {
     kUnspecified = 0;
@@ -1476,40 +1224,6 @@ server cluster ThreadNetworkDiagnostics = 53 {
   command ResetCounts(): DefaultSuccess = 0;
 }
 
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
-  }
-
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
-  }
-
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster UserLabel = 65 {
-  attribute access(write: manage) LabelStruct labelList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
 server cluster WiFiNetworkDiagnostics = 54 {
   enum AssociationFailureCause : ENUM8 {
     kUnknown = 0;
@@ -1573,6 +1287,292 @@ server cluster WiFiNetworkDiagnostics = 54 {
   command ResetCounts(): DefaultSuccess = 0;
 }
 
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
+  }
+
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command ResetCounts(): DefaultSuccess = 0;
+}
+
+server cluster Switch = 59 {
+  info event SwitchLatched = 0 {
+    INT8U newPosition = 0;
+  }
+
+  info event InitialPress = 1 {
+    INT8U newPosition = 0;
+  }
+
+  info event LongPress = 2 {
+    INT8U newPosition = 0;
+  }
+
+  info event ShortRelease = 3 {
+    INT8U previousPosition = 0;
+  }
+
+  info event LongRelease = 4 {
+    INT8U previousPosition = 0;
+  }
+
+  info event MultiPressOngoing = 5 {
+    INT8U newPosition = 0;
+    INT8U currentNumberOfPressesCounted = 1;
+  }
+
+  info event MultiPressComplete = 6 {
+    INT8U newPosition = 0;
+    INT8U totalNumberOfPressesCounted = 1;
+  }
+
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
+  }
+
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
+  }
+
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
+  }
+
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+  }
+
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
+}
+
+server cluster OperationalCredentials = 62 {
+  enum OperationalCertStatus : ENUM8 {
+    kSuccess = 0;
+    kInvalidPublicKey = 1;
+    kInvalidNodeOpId = 2;
+    kInvalidNOC = 3;
+    kMissingCsr = 4;
+    kTableFull = 5;
+    kInvalidAdminSubject = 6;
+    kInsufficientPrivilege = 8;
+    kFabricConflict = 9;
+    kLabelConflict = 10;
+    kInvalidFabricIndex = 11;
+  }
+
+  struct NOCStruct {
+    octet_string noc = 1;
+    nullable octet_string icac = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct FabricDescriptor {
+    octet_string<65> rootPublicKey = 1;
+    vendor_id vendorId = 2;
+    fabric_id fabricId = 3;
+    node_id nodeId = 4;
+    char_string<32> label = 5;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
+  readonly attribute FabricDescriptor fabrics[] = 1;
+  readonly attribute int8u supportedFabrics = 2;
+  readonly attribute int8u commissionedFabrics = 3;
+  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
+  readonly attribute fabric_idx currentFabricIndex = 5;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AttestationRequestRequest {
+    OCTET_STRING attestationNonce = 0;
+  }
+
+  request struct CertificateChainRequestRequest {
+    INT8U certificateType = 0;
+  }
+
+  request struct CSRRequestRequest {
+    OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
+  }
+
+  request struct AddNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+    OCTET_STRING IPKValue = 2;
+    Int64u caseAdminSubject = 3;
+    VENDOR_ID adminVendorId = 4;
+  }
+
+  request struct UpdateNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+  }
+
+  request struct UpdateFabricLabelRequest {
+    CHAR_STRING label = 0;
+  }
+
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
+  }
+
+  request struct AddTrustedRootCertificateRequest {
+    OCTET_STRING rootCertificate = 0;
+  }
+
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
+  }
+
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
+  }
+
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
+  }
+
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
+  }
+
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
+}
+
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
+  }
+
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
+
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster UserLabel = 65 {
+  attribute access(write: manage) LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
 endpoint 0 {
   device type rootdevice = 22;
   binding cluster OtaSoftwareUpdateProvider;
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Jgnh29qK1p.matter b/examples/chef/devices/rootnode_onoffpluginunit_Jgnh29qK1p.matter
index 317443b8d7795b..5eecf437abc4f6 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Jgnh29qK1p.matter
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Jgnh29qK1p.matter
@@ -6,571 +6,625 @@ struct LabelStruct {
     char_string<16> value = 1;
 }
 
-server cluster AccessControl = 31 {
-  enum AuthMode : ENUM8 {
-    kPase = 1;
-    kCase = 2;
-    kGroup = 3;
-  }
-
-  enum ChangeTypeEnum : ENUM8 {
-    kChanged = 0;
-    kAdded = 1;
-    kRemoved = 2;
-  }
-
-  enum Privilege : ENUM8 {
-    kView = 1;
-    kProxyView = 2;
-    kOperate = 3;
-    kManage = 4;
-    kAdminister = 5;
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
   }
 
-  struct AccessControlEntry {
-    Privilege privilege = 1;
-    AuthMode authMode = 2;
-    nullable int64u subjects[] = 3;
-    nullable Target targets[] = 4;
-    fabric_idx fabricIndex = 254;
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
   }
 
-  struct Target {
-    nullable cluster_id cluster = 0;
-    nullable endpoint_no endpoint = 1;
-    nullable devtype_id deviceType = 2;
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
   }
 
-  struct ExtensionEntry {
-    octet_string<128> data = 1;
-    fabric_idx fabricIndex = 254;
-  }
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  info event access(read: administer) AccessControlEntryChanged = 0 {
-    nullable node_id adminNodeID = 1;
-    nullable INT16U adminPasscodeID = 2;
-    ChangeTypeEnum changeType = 3;
-    nullable AccessControlEntry latestValue = 4;
-    fabric_idx adminFabricIndex = 254;
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
   }
 
-  info event access(read: administer) AccessControlExtensionChanged = 1 {
-    nullable node_id adminNodeID = 1;
-    nullable INT16U adminPasscodeID = 2;
-    ChangeTypeEnum changeType = 3;
-    nullable ExtensionEntry latestValue = 4;
-    fabric_idx adminFabricIndex = 254;
-  }
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+}
 
-  attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
-  attribute access(read: administer, write: administer) ExtensionEntry extension[] = 1;
+server cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
+  request struct AddGroupRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
   }
 
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
+  request struct ViewGroupRequest {
+    group_id groupId = 0;
   }
 
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
   }
 
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
+  request struct RemoveGroupRequest {
+    group_id groupId = 0;
   }
 
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
 
-server cluster Basic = 40 {
-  critical event StartUp = 0 {
-    INT32U softwareVersion = 0;
+  response struct AddGroupResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  critical event ShutDown = 1 {
+  response struct ViewGroupResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    CHAR_STRING groupName = 2;
   }
 
-  info event Leave = 2 {
+  response struct GetGroupMembershipResponse = 2 {
+    nullable INT8U capacity = 0;
+    group_id groupList[] = 1;
   }
 
-  info event ReachableChanged = 3 {
-    boolean reachableNewValue = 0;
+  response struct RemoveGroupResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  readonly attribute int16u dataModelRevision = 0;
-  readonly attribute char_string<32> vendorName = 1;
-  readonly attribute vendor_id vendorID = 2;
-  readonly attribute char_string<32> productName = 3;
-  readonly attribute int16u productID = 4;
-  attribute access(write: manage) char_string<32> nodeLabel = 5;
-  attribute access(write: administer) char_string<2> location = 6;
-  readonly attribute int16u hardwareVersion = 7;
-  readonly attribute char_string<64> hardwareVersionString = 8;
-  readonly attribute int32u softwareVersion = 9;
-  readonly attribute char_string<64> softwareVersionString = 10;
-  readonly attribute char_string<16> manufacturingDate = 11;
-  readonly attribute char_string<32> partNumber = 12;
-  readonly attribute long_char_string<256> productURL = 13;
-  readonly attribute char_string<64> productLabel = 14;
-  readonly attribute char_string<32> serialNumber = 15;
-  attribute access(write: manage) boolean localConfigDisabled = 16;
-  readonly attribute boolean reachable = 17;
-  readonly attribute char_string<32> uniqueID = 18;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
 }
 
-client cluster Binding = 30 {
-  struct TargetStruct {
-    optional node_id node = 1;
-    optional group_id group = 2;
-    optional endpoint_no endpoint = 3;
-    optional cluster_id cluster = 4;
-    fabric_idx fabricIndex = 254;
+server cluster Scenes = 5 {
+  bitmap ScenesCopyMode : BITMAP8 {
+    kCopyAllScenes = 0x1;
   }
 
-  attribute TargetStruct binding[] = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  struct ExtensionFieldSet {
+    cluster_id clusterId = 0;
+    AttributeValuePair attributeValueList[] = 1;
+  }
 
-server cluster Descriptor = 29 {
-  struct DeviceType {
-    devtype_id type = 0;
-    int16u revision = 1;
+  struct AttributeValuePair {
+    optional attrib_id attributeId = 0;
+    int8u attributeValue[] = 1;
   }
 
-  readonly attribute DeviceType deviceList[] = 0;
-  readonly attribute CLUSTER_ID serverList[] = 1;
-  readonly attribute CLUSTER_ID clientList[] = 2;
-  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute int8u sceneCount = 0;
+  readonly attribute int8u currentScene = 1;
+  readonly attribute group_id currentGroup = 2;
+  readonly attribute boolean sceneValid = 3;
+  readonly attribute bitmap8 nameSupport = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster DiagnosticLogs = 50 {
-  enum LogsIntent : ENUM8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
+  request struct AddSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    INT16U transitionTime = 2;
+    CHAR_STRING sceneName = 3;
+    ExtensionFieldSet extensionFieldSets[] = 4;
   }
 
-  enum LogsStatus : ENUM8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
+  request struct ViewSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  enum LogsTransferProtocol : ENUM8 {
-    kResponsePayload = 0;
-    kBdx = 1;
+  request struct RemoveSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  request struct RemoveAllScenesRequest {
+    group_id groupId = 0;
+  }
 
-  request struct RetrieveLogsRequestRequest {
-    LogsIntent intent = 0;
-    LogsTransferProtocol requestedProtocol = 1;
-    OCTET_STRING transferFileDesignator = 2;
+  request struct StoreSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
-}
+  request struct RecallSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    optional nullable INT16U transitionTime = 2;
+  }
 
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
-  }
-
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command ResetCounts(): DefaultSuccess = 0;
-}
-
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster GeneralCommissioning = 48 {
-  enum CommissioningError : ENUM8 {
-    kOk = 0;
-    kValueOutsideRange = 1;
-    kInvalidAuthentication = 2;
-    kNoFailSafe = 3;
-    kBusyWithOtherAdmin = 4;
-  }
-
-  enum RegulatoryLocationType : ENUM8 {
-    kIndoor = 0;
-    kOutdoor = 1;
-    kIndoorOutdoor = 2;
+  request struct GetSceneMembershipRequest {
+    group_id groupId = 0;
   }
 
-  struct BasicCommissioningInfo {
-    int16u failSafeExpiryLengthSeconds = 0;
-    int16u maxCumulativeFailsafeSeconds = 1;
+  response struct AddSceneResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  attribute access(write: administer) int64u breadcrumb = 0;
-  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
-  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
-  readonly attribute RegulatoryLocationType locationCapability = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct ArmFailSafeRequest {
-    INT16U expiryLengthSeconds = 0;
-    INT64U breadcrumb = 1;
+  response struct ViewSceneResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+    optional INT16U transitionTime = 3;
+    optional CHAR_STRING sceneName = 4;
+    optional ExtensionFieldSet extensionFieldSets[] = 5;
   }
 
-  request struct SetRegulatoryConfigRequest {
-    RegulatoryLocationType newRegulatoryConfig = 0;
-    CHAR_STRING countryCode = 1;
-    INT64U breadcrumb = 2;
+  response struct RemoveSceneResponse = 2 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  response struct ArmFailSafeResponse = 1 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  response struct RemoveAllScenesResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  response struct SetRegulatoryConfigResponse = 3 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  response struct StoreSceneResponse = 4 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  response struct CommissioningCompleteResponse = 5 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  response struct GetSceneMembershipResponse = 6 {
+    ENUM8 status = 0;
+    nullable INT8U capacity = 1;
+    group_id groupId = 2;
+    optional INT8U sceneList[] = 3;
   }
 
-  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
-  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
-  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
+  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
+  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
+  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
+  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
+  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
+  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
+  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
 }
 
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
+server cluster OnOff = 6 {
+  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
+    kFadeToOffIn0p8Seconds = 0;
+    kNoFade = 1;
+    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
   }
 
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
+  enum OnOffDyingLightEffectVariant : ENUM8 {
+    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
   }
 
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
+  enum OnOffEffectIdentifier : ENUM8 {
+    kDelayedAllOff = 0;
+    kDyingLight = 1;
   }
 
-  enum NetworkFaultType : ENUM8 {
-    kUnspecified = 0;
-    kHardwareFailure = 1;
-    kNetworkJammed = 2;
-    kConnectionFailed = 3;
+  enum OnOffStartUpOnOff : ENUM8 {
+    kOff = 0;
+    kOn = 1;
+    kTogglePreviousOnOff = 2;
   }
 
-  enum RadioFaultType : ENUM8 {
-    kUnspecified = 0;
-    kWiFiFault = 1;
-    kCellularFault = 2;
-    kThreadFault = 3;
-    kNFCFault = 4;
-    kBLEFault = 5;
-    kEthernetFault = 6;
+  bitmap OnOffControl : BITMAP8 {
+    kAcceptOnlyWhenOn = 0x1;
   }
 
-  struct NetworkInterfaceType {
-    char_string<32> name = 0;
-    boolean isOperational = 1;
-    nullable boolean offPremiseServicesReachableIPv4 = 2;
-    nullable boolean offPremiseServicesReachableIPv6 = 3;
-    octet_string<8> hardwareAddress = 4;
-    octet_string IPv4Addresses[] = 5;
-    octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
   }
 
-  critical event HardwareFaultChange = 0 {
-    HardwareFaultType current[] = 0;
-    HardwareFaultType previous[] = 1;
+  bitmap SceneFeatures : BITMAP32 {
+    kSceneNames = 0x1;
   }
 
-  critical event RadioFaultChange = 1 {
-    RadioFaultType current[] = 0;
-    RadioFaultType previous[] = 1;
-  }
+  readonly attribute boolean onOff = 0;
+  readonly attribute boolean globalSceneControl = 16384;
+  attribute int16u onTime = 16385;
+  attribute int16u offWaitTime = 16386;
+  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
-  }
+  command Off(): DefaultSuccess = 0;
+  command On(): DefaultSuccess = 1;
+  command Toggle(): DefaultSuccess = 2;
+}
 
-  critical event BootReason = 3 {
-    BootReasonType bootReason = 0;
+server cluster Descriptor = 29 {
+  struct DeviceType {
+    devtype_id type = 0;
+    int16u revision = 1;
   }
 
-  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
-  readonly attribute int16u rebootCount = 1;
-  readonly attribute int64u upTime = 2;
-  readonly attribute int32u totalOperationalHours = 3;
-  readonly attribute enum8 bootReasons = 4;
-  readonly attribute ENUM8 activeHardwareFaults[] = 5;
-  readonly attribute ENUM8 activeRadioFaults[] = 6;
-  readonly attribute ENUM8 activeNetworkFaults[] = 7;
-  readonly attribute boolean testEventTriggersEnabled = 8;
+  readonly attribute DeviceType deviceList[] = 0;
+  readonly attribute CLUSTER_ID serverList[] = 1;
+  readonly attribute CLUSTER_ID clientList[] = 2;
+  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct TestEventTriggerRequest {
-    OCTET_STRING enableKey = 0;
-    INT64U eventTrigger = 1;
+client cluster Binding = 30 {
+  struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
   }
 
-  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  attribute TargetStruct binding[] = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
-  }
-
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
-    fabric_idx fabricIndex = 254;
+server cluster AccessControl = 31 {
+  enum AuthMode : ENUM8 {
+    kPase = 1;
+    kCase = 2;
+    kGroup = 3;
   }
 
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
+  enum ChangeTypeEnum : ENUM8 {
+    kChanged = 0;
+    kAdded = 1;
+    kRemoved = 2;
   }
 
-  struct GroupKeySetStruct {
-    int16u groupKeySetID = 0;
-    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
-    nullable octet_string<16> epochKey0 = 2;
-    nullable epoch_us epochStartTime0 = 3;
-    nullable octet_string<16> epochKey1 = 4;
-    nullable epoch_us epochStartTime1 = 5;
-    nullable octet_string<16> epochKey2 = 6;
-    nullable epoch_us epochStartTime2 = 7;
+  enum Privilege : ENUM8 {
+    kView = 1;
+    kProxyView = 2;
+    kOperate = 3;
+    kManage = 4;
+    kAdminister = 5;
   }
 
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
-  readonly attribute int16u maxGroupsPerFabric = 2;
-  readonly attribute int16u maxGroupKeysPerFabric = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  struct AccessControlEntry {
+    Privilege privilege = 1;
+    AuthMode authMode = 2;
+    nullable int64u subjects[] = 3;
+    nullable Target targets[] = 4;
+    fabric_idx fabricIndex = 254;
+  }
 
-  request struct KeySetWriteRequest {
-    GroupKeySetStruct groupKeySet = 0;
+  struct Target {
+    nullable cluster_id cluster = 0;
+    nullable endpoint_no endpoint = 1;
+    nullable devtype_id deviceType = 2;
   }
 
-  request struct KeySetReadRequest {
-    INT16U groupKeySetID = 0;
+  struct ExtensionEntry {
+    octet_string<128> data = 1;
+    fabric_idx fabricIndex = 254;
   }
 
-  request struct KeySetRemoveRequest {
-    INT16U groupKeySetID = 0;
+  info event access(read: administer) AccessControlEntryChanged = 0 {
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable AccessControlEntry latestValue = 4;
+    fabric_idx adminFabricIndex = 254;
   }
 
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
+  info event access(read: administer) AccessControlExtensionChanged = 1 {
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable ExtensionEntry latestValue = 4;
+    fabric_idx adminFabricIndex = 254;
   }
 
-  response struct KeySetReadResponse = 2 {
-    GroupKeySetStruct groupKeySet = 0;
+  attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
+  attribute access(read: administer, write: administer) ExtensionEntry extension[] = 1;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Basic = 40 {
+  critical event StartUp = 0 {
+    INT32U softwareVersion = 0;
   }
 
-  response struct KeySetReadAllIndicesResponse = 5 {
-    INT16U groupKeySetIDs[] = 0;
+  critical event ShutDown = 1 {
   }
 
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
-}
+  info event Leave = 2 {
+  }
 
-server cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  info event ReachableChanged = 3 {
+    boolean reachableNewValue = 0;
+  }
+
+  readonly attribute int16u dataModelRevision = 0;
+  readonly attribute char_string<32> vendorName = 1;
+  readonly attribute vendor_id vendorID = 2;
+  readonly attribute char_string<32> productName = 3;
+  readonly attribute int16u productID = 4;
+  attribute access(write: manage) char_string<32> nodeLabel = 5;
+  attribute access(write: administer) char_string<2> location = 6;
+  readonly attribute int16u hardwareVersion = 7;
+  readonly attribute char_string<64> hardwareVersionString = 8;
+  readonly attribute int32u softwareVersion = 9;
+  readonly attribute char_string<64> softwareVersionString = 10;
+  readonly attribute char_string<16> manufacturingDate = 11;
+  readonly attribute char_string<32> partNumber = 12;
+  readonly attribute long_char_string<256> productURL = 13;
+  readonly attribute char_string<64> productLabel = 14;
+  readonly attribute char_string<32> serialNumber = 15;
+  attribute access(write: manage) boolean localConfigDisabled = 16;
+  readonly attribute boolean reachable = 17;
+  readonly attribute char_string<32> uniqueID = 18;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct AddGroupRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+client cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
   }
 
-  request struct ViewGroupRequest {
-    group_id groupId = 0;
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
   }
 
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
   }
 
-  request struct RemoveGroupRequest {
-    group_id groupId = 0;
-  }
+  readonly attribute int16u clusterRevision = 65533;
 
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
   }
 
-  response struct AddGroupResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
   }
 
-  response struct ViewGroupResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    CHAR_STRING groupName = 2;
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
   }
 
-  response struct GetGroupMembershipResponse = 2 {
-    nullable INT8U capacity = 0;
-    group_id groupList[] = 1;
+  response struct QueryImageResponse = 1 {
+    OTAQueryStatus status = 0;
+    optional INT32U delayedActionTime = 1;
+    optional CHAR_STRING imageURI = 2;
+    optional INT32U softwareVersion = 3;
+    optional CHAR_STRING softwareVersionString = 4;
+    optional OCTET_STRING updateToken = 5;
+    optional BOOLEAN userConsentNeeded = 6;
+    optional OCTET_STRING metadataForRequestor = 7;
   }
 
-  response struct RemoveGroupResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
   }
 
-  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
 }
 
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
+server cluster OtaSoftwareUpdateRequestor = 42 {
+  enum OTAAnnouncementReason : ENUM8 {
+    kSimpleAnnouncement = 0;
+    kUpdateAvailable = 1;
+    kUrgentUpdateAvailable = 2;
   }
 
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
+  enum OTAChangeReasonEnum : ENUM8 {
+    kUnknown = 0;
+    kSuccess = 1;
+    kFailure = 2;
+    kTimeOut = 3;
+    kDelayByProvider = 4;
   }
 
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
+  enum OTAUpdateStateEnum : ENUM8 {
+    kUnknown = 0;
+    kIdle = 1;
+    kQuerying = 2;
+    kDelayedOnQuery = 3;
+    kDownloading = 4;
+    kApplying = 5;
+    kDelayedOnApply = 6;
+    kRollingBack = 7;
+    kDelayedOnUserConsent = 8;
   }
 
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  struct ProviderLocation {
+    node_id providerNodeID = 1;
+    endpoint_no endpoint = 2;
+    fabric_idx fabricIndex = 254;
+  }
 
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
+  info event StateTransition = 0 {
+    OTAUpdateStateEnum previousState = 0;
+    OTAUpdateStateEnum newState = 1;
+    OTAChangeReasonEnum reason = 2;
+    nullable INT32U targetSoftwareVersion = 3;
   }
 
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
-}
+  critical event VersionApplied = 1 {
+    INT32U softwareVersion = 0;
+    INT16U productID = 1;
+  }
 
-server cluster LocalizationConfiguration = 43 {
+  info event DownloadError = 2 {
+    INT32U softwareVersion = 0;
+    INT64U bytesDownloaded = 1;
+    nullable INT8U progressPercent = 2;
+    nullable INT64S platformCode = 3;
+  }
+
+  attribute ProviderLocation defaultOtaProviders[] = 0;
+  readonly attribute boolean updatePossible = 1;
+  readonly attribute OTAUpdateStateEnum updateState = 2;
+  readonly attribute nullable int8u updateStateProgress = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AnnounceOtaProviderRequest {
+    node_id providerNodeId = 0;
+    vendor_id vendorId = 1;
+    OTAAnnouncementReason announcementReason = 2;
+    optional OCTET_STRING metadataForNode = 3;
+    endpoint_no endpoint = 4;
+  }
+
+  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
+}
+
+server cluster LocalizationConfiguration = 43 {
   readonly attribute CHAR_STRING supportedLocales[] = 1;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
 
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
+  }
+
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
+  }
+
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster GeneralCommissioning = 48 {
+  enum CommissioningError : ENUM8 {
+    kOk = 0;
+    kValueOutsideRange = 1;
+    kInvalidAuthentication = 2;
+    kNoFailSafe = 3;
+    kBusyWithOtherAdmin = 4;
+  }
+
+  enum RegulatoryLocationType : ENUM8 {
+    kIndoor = 0;
+    kOutdoor = 1;
+    kIndoorOutdoor = 2;
+  }
+
+  struct BasicCommissioningInfo {
+    int16u failSafeExpiryLengthSeconds = 0;
+    int16u maxCumulativeFailsafeSeconds = 1;
+  }
+
+  attribute access(write: administer) int64u breadcrumb = 0;
+  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
+  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
+  readonly attribute RegulatoryLocationType locationCapability = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ArmFailSafeRequest {
+    INT16U expiryLengthSeconds = 0;
+    INT64U breadcrumb = 1;
+  }
+
+  request struct SetRegulatoryConfigRequest {
+    RegulatoryLocationType newRegulatoryConfig = 0;
+    CHAR_STRING countryCode = 1;
+    INT64U breadcrumb = 2;
+  }
+
+  response struct ArmFailSafeResponse = 1 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
+  }
+
+  response struct SetRegulatoryConfigResponse = 3 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
+  }
+
+  response struct CommissioningCompleteResponse = 5 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
+  }
+
+  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
+  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
+  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
+}
+
 server cluster NetworkCommissioning = 49 {
   enum NetworkCommissioningStatus : ENUM8 {
     kSuccess = 0;
@@ -705,434 +759,408 @@ server cluster NetworkCommissioning = 49 {
   command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
 }
 
-client cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
+server cluster DiagnosticLogs = 50 {
+  enum LogsIntent : ENUM8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
   }
 
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
+  enum LogsStatus : ENUM8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
   }
 
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
+  enum LogsTransferProtocol : ENUM8 {
+    kResponsePayload = 0;
+    kBdx = 1;
   }
 
+  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
+  request struct RetrieveLogsRequestRequest {
+    LogsIntent intent = 0;
+    LogsTransferProtocol requestedProtocol = 1;
+    OCTET_STRING transferFileDesignator = 2;
   }
 
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
-  }
+  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+}
 
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
   }
 
-  response struct QueryImageResponse = 1 {
-    OTAQueryStatus status = 0;
-    optional INT32U delayedActionTime = 1;
-    optional CHAR_STRING imageURI = 2;
-    optional INT32U softwareVersion = 3;
-    optional CHAR_STRING softwareVersionString = 4;
-    optional OCTET_STRING updateToken = 5;
-    optional BOOLEAN userConsentNeeded = 6;
-    optional OCTET_STRING metadataForRequestor = 7;
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
   }
 
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
   }
 
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
-}
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
+  }
 
-server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum OTAAnnouncementReason : ENUM8 {
-    kSimpleAnnouncement = 0;
-    kUpdateAvailable = 1;
-    kUrgentUpdateAvailable = 2;
+  enum RadioFaultType : ENUM8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
   }
 
-  enum OTAChangeReasonEnum : ENUM8 {
-    kUnknown = 0;
-    kSuccess = 1;
-    kFailure = 2;
-    kTimeOut = 3;
-    kDelayByProvider = 4;
+  struct NetworkInterfaceType {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceType type = 7;
   }
 
-  enum OTAUpdateStateEnum : ENUM8 {
-    kUnknown = 0;
-    kIdle = 1;
-    kQuerying = 2;
-    kDelayedOnQuery = 3;
-    kDownloading = 4;
-    kApplying = 5;
-    kDelayedOnApply = 6;
-    kRollingBack = 7;
-    kDelayedOnUserConsent = 8;
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultType current[] = 0;
+    HardwareFaultType previous[] = 1;
   }
 
-  struct ProviderLocation {
-    node_id providerNodeID = 1;
-    endpoint_no endpoint = 2;
-    fabric_idx fabricIndex = 254;
-  }
-
-  info event StateTransition = 0 {
-    OTAUpdateStateEnum previousState = 0;
-    OTAUpdateStateEnum newState = 1;
-    OTAChangeReasonEnum reason = 2;
-    nullable INT32U targetSoftwareVersion = 3;
+  critical event RadioFaultChange = 1 {
+    RadioFaultType current[] = 0;
+    RadioFaultType previous[] = 1;
   }
 
-  critical event VersionApplied = 1 {
-    INT32U softwareVersion = 0;
-    INT16U productID = 1;
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultType current[] = 0;
+    NetworkFaultType previous[] = 1;
   }
 
-  info event DownloadError = 2 {
-    INT32U softwareVersion = 0;
-    INT64U bytesDownloaded = 1;
-    nullable INT8U progressPercent = 2;
-    nullable INT64S platformCode = 3;
+  critical event BootReason = 3 {
+    BootReasonType bootReason = 0;
   }
 
-  attribute ProviderLocation defaultOtaProviders[] = 0;
-  readonly attribute boolean updatePossible = 1;
-  readonly attribute OTAUpdateStateEnum updateState = 2;
-  readonly attribute nullable int8u updateStateProgress = 3;
+  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
+  readonly attribute int32u totalOperationalHours = 3;
+  readonly attribute enum8 bootReasons = 4;
+  readonly attribute ENUM8 activeHardwareFaults[] = 5;
+  readonly attribute ENUM8 activeRadioFaults[] = 6;
+  readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AnnounceOtaProviderRequest {
-    node_id providerNodeId = 0;
-    vendor_id vendorId = 1;
-    OTAAnnouncementReason announcementReason = 2;
-    optional OCTET_STRING metadataForNode = 3;
-    endpoint_no endpoint = 4;
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
   }
 
-  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
-server cluster OnOff = 6 {
-  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
-    kFadeToOffIn0p8Seconds = 0;
-    kNoFade = 1;
-    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
-  }
-
-  enum OnOffDyingLightEffectVariant : ENUM8 {
-    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
-  }
-
-  enum OnOffEffectIdentifier : ENUM8 {
-    kDelayedAllOff = 0;
-    kDyingLight = 1;
-  }
-
-  enum OnOffStartUpOnOff : ENUM8 {
-    kOff = 0;
-    kOn = 1;
-    kTogglePreviousOnOff = 2;
-  }
-
-  bitmap OnOffControl : BITMAP8 {
-    kAcceptOnlyWhenOn = 0x1;
+server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
   }
 
-  bitmap OnOffFeature : BITMAP32 {
-    kLighting = 0x1;
+  struct ThreadMetrics {
+    int64u id = 0;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
-  bitmap SceneFeatures : BITMAP32 {
-    kSceneNames = 0x1;
+  info event SoftwareFault = 0 {
+    SoftwareFaultStruct softwareFault = 0;
   }
 
-  readonly attribute boolean onOff = 0;
-  readonly attribute boolean globalSceneControl = 16384;
-  attribute int16u onTime = 16385;
-  attribute int16u offWaitTime = 16386;
-  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute ThreadMetrics threadMetrics[] = 0;
+  readonly attribute int64u currentHeapFree = 1;
+  readonly attribute int64u currentHeapUsed = 2;
+  readonly attribute int64u currentHeapHighWatermark = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command Off(): DefaultSuccess = 0;
-  command On(): DefaultSuccess = 1;
-  command Toggle(): DefaultSuccess = 2;
+  command ResetWatermarks(): DefaultSuccess = 0;
 }
 
-server cluster OperationalCredentials = 62 {
-  enum OperationalCertStatus : ENUM8 {
-    kSuccess = 0;
-    kInvalidPublicKey = 1;
-    kInvalidNodeOpId = 2;
-    kInvalidNOC = 3;
-    kMissingCsr = 4;
-    kTableFull = 5;
-    kInvalidAdminSubject = 6;
-    kInsufficientPrivilege = 8;
-    kFabricConflict = 9;
-    kLabelConflict = 10;
-    kInvalidFabricIndex = 11;
-  }
-
-  struct NOCStruct {
-    octet_string noc = 1;
-    nullable octet_string icac = 2;
-    fabric_idx fabricIndex = 254;
-  }
-
-  struct FabricDescriptor {
-    octet_string<65> rootPublicKey = 1;
-    vendor_id vendorId = 2;
-    fabric_id fabricId = 3;
-    node_id nodeId = 4;
-    char_string<32> label = 5;
-    fabric_idx fabricIndex = 254;
-  }
-
-  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
-  readonly attribute FabricDescriptor fabrics[] = 1;
-  readonly attribute int8u supportedFabrics = 2;
-  readonly attribute int8u commissionedFabrics = 3;
-  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
-  readonly attribute fabric_idx currentFabricIndex = 5;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AttestationRequestRequest {
-    OCTET_STRING attestationNonce = 0;
-  }
-
-  request struct CertificateChainRequestRequest {
-    INT8U certificateType = 0;
-  }
-
-  request struct CSRRequestRequest {
-    OCTET_STRING CSRNonce = 0;
-    optional boolean isForUpdateNOC = 1;
-  }
-
-  request struct AddNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
-    OCTET_STRING IPKValue = 2;
-    Int64u caseAdminSubject = 3;
-    VENDOR_ID adminVendorId = 4;
+server cluster ThreadNetworkDiagnostics = 53 {
+  enum NetworkFault : ENUM8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
   }
 
-  request struct UpdateNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
+  enum RoutingRole : ENUM8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kReed = 4;
+    kRouter = 5;
+    kLeader = 6;
   }
 
-  request struct UpdateFabricLabelRequest {
-    CHAR_STRING label = 0;
+  enum ThreadConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  request struct RemoveFabricRequest {
-    fabric_idx fabricIndex = 0;
+  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+    kMLECounts = 0x4;
+    kMACCounts = 0x8;
   }
 
-  request struct AddTrustedRootCertificateRequest {
-    OCTET_STRING rootCertificate = 0;
+  struct NeighborTable {
+    int64u extAddress = 0;
+    int32u age = 1;
+    int16u rloc16 = 2;
+    int32u linkFrameCounter = 3;
+    int32u mleFrameCounter = 4;
+    int8u lqi = 5;
+    nullable int8s averageRssi = 6;
+    nullable int8s lastRssi = 7;
+    int8u frameErrorRate = 8;
+    int8u messageErrorRate = 9;
+    boolean rxOnWhenIdle = 10;
+    boolean fullThreadDevice = 11;
+    boolean fullNetworkData = 12;
+    boolean isChild = 13;
   }
 
-  response struct AttestationResponse = 1 {
-    OCTET_STRING attestationElements = 0;
-    OCTET_STRING signature = 1;
+  struct RouteTable {
+    int64u extAddress = 0;
+    int16u rloc16 = 1;
+    int8u routerId = 2;
+    int8u nextHop = 3;
+    int8u pathCost = 4;
+    int8u LQIIn = 5;
+    int8u LQIOut = 6;
+    int8u age = 7;
+    boolean allocated = 8;
+    boolean linkEstablished = 9;
   }
 
-  response struct CertificateChainResponse = 3 {
-    OCTET_STRING certificate = 0;
+  struct SecurityPolicy {
+    int16u rotationTime = 0;
+    bitmap16 flags = 1;
   }
 
-  response struct CSRResponse = 5 {
-    OCTET_STRING NOCSRElements = 0;
-    OCTET_STRING attestationSignature = 1;
+  struct OperationalDatasetComponents {
+    boolean activeTimestampPresent = 0;
+    boolean pendingTimestampPresent = 1;
+    boolean masterKeyPresent = 2;
+    boolean networkNamePresent = 3;
+    boolean extendedPanIdPresent = 4;
+    boolean meshLocalPrefixPresent = 5;
+    boolean delayPresent = 6;
+    boolean panIdPresent = 7;
+    boolean channelPresent = 8;
+    boolean pskcPresent = 9;
+    boolean securityPolicyPresent = 10;
+    boolean channelMaskPresent = 11;
   }
 
-  response struct NOCResponse = 8 {
-    OperationalCertStatus statusCode = 0;
-    optional fabric_idx fabricIndex = 1;
-    optional CHAR_STRING debugText = 2;
+  info event ConnectionStatus = 0 {
+    ThreadConnectionStatus connectionStatus = 0;
   }
 
-  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
-  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
-  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
-  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
-  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
-  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
-  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
-  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-}
-
-server cluster Scenes = 5 {
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
-  }
-
-  struct ExtensionFieldSet {
-    cluster_id clusterId = 0;
-    AttributeValuePair attributeValueList[] = 1;
-  }
-
-  struct AttributeValuePair {
-    optional attrib_id attributeId = 0;
-    int8u attributeValue[] = 1;
-  }
-
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute nullable int16u channel = 0;
+  readonly attribute nullable RoutingRole routingRole = 1;
+  readonly attribute nullable char_string<16> networkName = 2;
+  readonly attribute nullable int16u panId = 3;
+  readonly attribute nullable int64u extendedPanId = 4;
+  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute NeighborTable neighborTableList[] = 7;
+  readonly attribute RouteTable routeTableList[] = 8;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
+  readonly attribute int16u detachedRoleCount = 14;
+  readonly attribute int16u childRoleCount = 15;
+  readonly attribute int16u routerRoleCount = 16;
+  readonly attribute int16u leaderRoleCount = 17;
+  readonly attribute int16u attachAttemptCount = 18;
+  readonly attribute int16u partitionIdChangeCount = 19;
+  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
+  readonly attribute int16u parentChangeCount = 21;
+  readonly attribute int32u txTotalCount = 22;
+  readonly attribute int32u txUnicastCount = 23;
+  readonly attribute int32u txBroadcastCount = 24;
+  readonly attribute int32u txAckRequestedCount = 25;
+  readonly attribute int32u txAckedCount = 26;
+  readonly attribute int32u txNoAckRequestedCount = 27;
+  readonly attribute int32u txDataCount = 28;
+  readonly attribute int32u txDataPollCount = 29;
+  readonly attribute int32u txBeaconCount = 30;
+  readonly attribute int32u txBeaconRequestCount = 31;
+  readonly attribute int32u txOtherCount = 32;
+  readonly attribute int32u txRetryCount = 33;
+  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
+  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
+  readonly attribute int32u txErrCcaCount = 36;
+  readonly attribute int32u txErrAbortCount = 37;
+  readonly attribute int32u txErrBusyChannelCount = 38;
+  readonly attribute int32u rxTotalCount = 39;
+  readonly attribute int32u rxUnicastCount = 40;
+  readonly attribute int32u rxBroadcastCount = 41;
+  readonly attribute int32u rxDataCount = 42;
+  readonly attribute int32u rxDataPollCount = 43;
+  readonly attribute int32u rxBeaconCount = 44;
+  readonly attribute int32u rxBeaconRequestCount = 45;
+  readonly attribute int32u rxOtherCount = 46;
+  readonly attribute int32u rxAddressFilteredCount = 47;
+  readonly attribute int32u rxDestAddrFilteredCount = 48;
+  readonly attribute int32u rxDuplicatedCount = 49;
+  readonly attribute int32u rxErrNoFrameCount = 50;
+  readonly attribute int32u rxErrUnknownNeighborCount = 51;
+  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
+  readonly attribute int32u rxErrSecCount = 53;
+  readonly attribute int32u rxErrFcsCount = 54;
+  readonly attribute int32u rxErrOtherCount = 55;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
+  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AddSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    INT16U transitionTime = 2;
-    CHAR_STRING sceneName = 3;
-    ExtensionFieldSet extensionFieldSets[] = 4;
-  }
-
-  request struct ViewSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RemoveSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RemoveAllScenesRequest {
-    group_id groupId = 0;
-  }
-
-  request struct StoreSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
+  command ResetCounts(): DefaultSuccess = 0;
+}
 
-  request struct RecallSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    optional nullable INT16U transitionTime = 2;
+server cluster WiFiNetworkDiagnostics = 54 {
+  enum AssociationFailureCause : ENUM8 {
+    kUnknown = 0;
+    kAssociationFailed = 1;
+    kAuthenticationFailed = 2;
+    kSsidNotFound = 3;
   }
 
-  request struct GetSceneMembershipRequest {
-    group_id groupId = 0;
+  enum SecurityType : ENUM8 {
+    kUnspecified = 0;
+    kNone = 1;
+    kWep = 2;
+    kWpa = 3;
+    kWpa2 = 4;
+    kWpa3 = 5;
   }
 
-  response struct AddSceneResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
+  enum WiFiConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  response struct ViewSceneResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-    optional INT16U transitionTime = 3;
-    optional CHAR_STRING sceneName = 4;
-    optional ExtensionFieldSet extensionFieldSets[] = 5;
+  enum WiFiVersionType : ENUM8 {
+    k80211a = 0;
+    k80211b = 1;
+    k80211g = 2;
+    k80211n = 3;
+    k80211ac = 4;
+    k80211ax = 5;
   }
 
-  response struct RemoveSceneResponse = 2 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
+  info event Disconnection = 0 {
+    INT16U reasonCode = 0;
   }
 
-  response struct RemoveAllScenesResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  info event AssociationFailure = 1 {
+    AssociationFailureCause associationFailure = 0;
+    INT16U status = 1;
   }
 
-  response struct StoreSceneResponse = 4 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
+  info event ConnectionStatus = 2 {
+    WiFiConnectionStatus connectionStatus = 0;
   }
 
-  response struct GetSceneMembershipResponse = 6 {
-    ENUM8 status = 0;
-    nullable INT8U capacity = 1;
-    group_id groupId = 2;
-    optional INT8U sceneList[] = 3;
-  }
+  readonly attribute nullable octet_string<6> bssid = 0;
+  readonly attribute nullable SecurityType securityType = 1;
+  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
+  readonly attribute nullable int16u channelNumber = 3;
+  readonly attribute nullable int8s rssi = 4;
+  readonly attribute int32u beaconLostCount = 5;
+  readonly attribute int32u beaconRxCount = 6;
+  readonly attribute int32u packetMulticastRxCount = 7;
+  readonly attribute int32u packetMulticastTxCount = 8;
+  readonly attribute int32u packetUnicastRxCount = 9;
+  readonly attribute int32u packetUnicastTxCount = 10;
+  readonly attribute int64u currentMaxRate = 11;
+  readonly attribute int64u overrunCount = 12;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
-  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
-  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
-  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
-  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
-  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
-  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
-server cluster SoftwareDiagnostics = 52 {
-  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
-    kWaterMarks = 0x1;
-  }
-
-  struct ThreadMetrics {
-    int64u id = 0;
-    optional char_string<8> name = 1;
-    optional int32u stackFreeCurrent = 2;
-    optional int32u stackFreeMinimum = 3;
-    optional int32u stackSize = 4;
-  }
-
-  info event SoftwareFault = 0 {
-    SoftwareFaultStruct softwareFault = 0;
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
   }
 
-  readonly attribute ThreadMetrics threadMetrics[] = 0;
-  readonly attribute int64u currentHeapFree = 1;
-  readonly attribute int64u currentHeapUsed = 2;
-  readonly attribute int64u currentHeapHighWatermark = 3;
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
 server cluster Switch = 59 {
@@ -1170,254 +1198,226 @@ server cluster Switch = 59 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster ThreadNetworkDiagnostics = 53 {
-  enum NetworkFault : ENUM8 {
-    kUnspecified = 0;
-    kLinkDown = 1;
-    kHardwareFailure = 2;
-    kNetworkJammed = 3;
-  }
-
-  enum RoutingRole : ENUM8 {
-    kUnspecified = 0;
-    kUnassigned = 1;
-    kSleepyEndDevice = 2;
-    kEndDevice = 3;
-    kReed = 4;
-    kRouter = 5;
-    kLeader = 6;
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
   }
 
-  enum ThreadConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
   }
 
-  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
-    kPacketCounts = 0x1;
-    kErrorCounts = 0x2;
-    kMLECounts = 0x4;
-    kMACCounts = 0x8;
-  }
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  struct NeighborTable {
-    int64u extAddress = 0;
-    int32u age = 1;
-    int16u rloc16 = 2;
-    int32u linkFrameCounter = 3;
-    int32u mleFrameCounter = 4;
-    int8u lqi = 5;
-    nullable int8s averageRssi = 6;
-    nullable int8s lastRssi = 7;
-    int8u frameErrorRate = 8;
-    int8u messageErrorRate = 9;
-    boolean rxOnWhenIdle = 10;
-    boolean fullThreadDevice = 11;
-    boolean fullNetworkData = 12;
-    boolean isChild = 13;
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
   }
 
-  struct RouteTable {
-    int64u extAddress = 0;
-    int16u rloc16 = 1;
-    int8u routerId = 2;
-    int8u nextHop = 3;
-    int8u pathCost = 4;
-    int8u LQIIn = 5;
-    int8u LQIOut = 6;
-    int8u age = 7;
-    boolean allocated = 8;
-    boolean linkEstablished = 9;
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
   }
 
-  struct SecurityPolicy {
-    int16u rotationTime = 0;
-    bitmap16 flags = 1;
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
+}
+
+server cluster OperationalCredentials = 62 {
+  enum OperationalCertStatus : ENUM8 {
+    kSuccess = 0;
+    kInvalidPublicKey = 1;
+    kInvalidNodeOpId = 2;
+    kInvalidNOC = 3;
+    kMissingCsr = 4;
+    kTableFull = 5;
+    kInvalidAdminSubject = 6;
+    kInsufficientPrivilege = 8;
+    kFabricConflict = 9;
+    kLabelConflict = 10;
+    kInvalidFabricIndex = 11;
   }
 
-  struct OperationalDatasetComponents {
-    boolean activeTimestampPresent = 0;
-    boolean pendingTimestampPresent = 1;
-    boolean masterKeyPresent = 2;
-    boolean networkNamePresent = 3;
-    boolean extendedPanIdPresent = 4;
-    boolean meshLocalPrefixPresent = 5;
-    boolean delayPresent = 6;
-    boolean panIdPresent = 7;
-    boolean channelPresent = 8;
-    boolean pskcPresent = 9;
-    boolean securityPolicyPresent = 10;
-    boolean channelMaskPresent = 11;
+  struct NOCStruct {
+    octet_string noc = 1;
+    nullable octet_string icac = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  info event ConnectionStatus = 0 {
-    ThreadConnectionStatus connectionStatus = 0;
+  struct FabricDescriptor {
+    octet_string<65> rootPublicKey = 1;
+    vendor_id vendorId = 2;
+    fabric_id fabricId = 3;
+    node_id nodeId = 4;
+    char_string<32> label = 5;
+    fabric_idx fabricIndex = 254;
   }
 
-  readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable RoutingRole routingRole = 1;
-  readonly attribute nullable char_string<16> networkName = 2;
-  readonly attribute nullable int16u panId = 3;
-  readonly attribute nullable int64u extendedPanId = 4;
-  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute NeighborTable neighborTableList[] = 7;
-  readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
-  readonly attribute nullable int8u leaderRouterId = 13;
-  readonly attribute int16u detachedRoleCount = 14;
-  readonly attribute int16u childRoleCount = 15;
-  readonly attribute int16u routerRoleCount = 16;
-  readonly attribute int16u leaderRoleCount = 17;
-  readonly attribute int16u attachAttemptCount = 18;
-  readonly attribute int16u partitionIdChangeCount = 19;
-  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
-  readonly attribute int16u parentChangeCount = 21;
-  readonly attribute int32u txTotalCount = 22;
-  readonly attribute int32u txUnicastCount = 23;
-  readonly attribute int32u txBroadcastCount = 24;
-  readonly attribute int32u txAckRequestedCount = 25;
-  readonly attribute int32u txAckedCount = 26;
-  readonly attribute int32u txNoAckRequestedCount = 27;
-  readonly attribute int32u txDataCount = 28;
-  readonly attribute int32u txDataPollCount = 29;
-  readonly attribute int32u txBeaconCount = 30;
-  readonly attribute int32u txBeaconRequestCount = 31;
-  readonly attribute int32u txOtherCount = 32;
-  readonly attribute int32u txRetryCount = 33;
-  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
-  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
-  readonly attribute int32u txErrCcaCount = 36;
-  readonly attribute int32u txErrAbortCount = 37;
-  readonly attribute int32u txErrBusyChannelCount = 38;
-  readonly attribute int32u rxTotalCount = 39;
-  readonly attribute int32u rxUnicastCount = 40;
-  readonly attribute int32u rxBroadcastCount = 41;
-  readonly attribute int32u rxDataCount = 42;
-  readonly attribute int32u rxDataPollCount = 43;
-  readonly attribute int32u rxBeaconCount = 44;
-  readonly attribute int32u rxBeaconRequestCount = 45;
-  readonly attribute int32u rxOtherCount = 46;
-  readonly attribute int32u rxAddressFilteredCount = 47;
-  readonly attribute int32u rxDestAddrFilteredCount = 48;
-  readonly attribute int32u rxDuplicatedCount = 49;
-  readonly attribute int32u rxErrNoFrameCount = 50;
-  readonly attribute int32u rxErrUnknownNeighborCount = 51;
-  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
-  readonly attribute int32u rxErrSecCount = 53;
-  readonly attribute int32u rxErrFcsCount = 54;
-  readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute nullable int64u activeTimestamp = 56;
-  readonly attribute nullable int64u pendingTimestamp = 57;
-  readonly attribute nullable int32u delay = 58;
-  readonly attribute nullable SecurityPolicy securityPolicy = 59;
-  readonly attribute nullable octet_string<4> channelMask = 60;
-  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
-  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
+  readonly attribute FabricDescriptor fabrics[] = 1;
+  readonly attribute int8u supportedFabrics = 2;
+  readonly attribute int8u commissionedFabrics = 3;
+  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
+  readonly attribute fabric_idx currentFabricIndex = 5;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
-}
+  request struct AttestationRequestRequest {
+    OCTET_STRING attestationNonce = 0;
+  }
 
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
+  request struct CertificateChainRequestRequest {
+    INT8U certificateType = 0;
   }
 
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
+  request struct CSRRequestRequest {
+    OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  request struct AddNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+    OCTET_STRING IPKValue = 2;
+    Int64u caseAdminSubject = 3;
+    VENDOR_ID adminVendorId = 4;
+  }
+
+  request struct UpdateNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+  }
+
+  request struct UpdateFabricLabelRequest {
+    CHAR_STRING label = 0;
+  }
+
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
+  }
+
+  request struct AddTrustedRootCertificateRequest {
+    OCTET_STRING rootCertificate = 0;
+  }
+
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
+  }
+
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
+  }
+
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
+  }
+
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
+  }
+
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
 }
 
-server cluster UserLabel = 65 {
-  attribute access(write: manage) LabelStruct labelList[] = 0;
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
+  }
+
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCause : ENUM8 {
-    kUnknown = 0;
-    kAssociationFailed = 1;
-    kAuthenticationFailed = 2;
-    kSsidNotFound = 3;
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  enum SecurityType : ENUM8 {
-    kUnspecified = 0;
-    kNone = 1;
-    kWep = 2;
-    kWpa = 3;
-    kWpa2 = 4;
-    kWpa3 = 5;
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  enum WiFiConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  enum WiFiVersionType : ENUM8 {
-    k80211a = 0;
-    k80211b = 1;
-    k80211g = 2;
-    k80211n = 3;
-    k80211ac = 4;
-    k80211ax = 5;
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  info event Disconnection = 0 {
-    INT16U reasonCode = 0;
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  info event AssociationFailure = 1 {
-    AssociationFailureCause associationFailure = 0;
-    INT16U status = 1;
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  info event ConnectionStatus = 2 {
-    WiFiConnectionStatus connectionStatus = 0;
-  }
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
 
-  readonly attribute nullable octet_string<6> bssid = 0;
-  readonly attribute nullable SecurityType securityType = 1;
-  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
-  readonly attribute nullable int16u channelNumber = 3;
-  readonly attribute nullable int8s rssi = 4;
-  readonly attribute int32u beaconLostCount = 5;
-  readonly attribute int32u beaconRxCount = 6;
-  readonly attribute int32u packetMulticastRxCount = 7;
-  readonly attribute int32u packetMulticastTxCount = 8;
-  readonly attribute int32u packetUnicastRxCount = 9;
-  readonly attribute int32u packetUnicastTxCount = 10;
-  readonly attribute int64u currentMaxRate = 11;
-  readonly attribute int64u overrunCount = 12;
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  command ResetCounts(): DefaultSuccess = 0;
+server cluster UserLabel = 65 {
+  attribute access(write: manage) LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
 endpoint 0 {
diff --git a/examples/chef/devices/rootnode_pressuresensor_fBO7Lvhj9j.matter b/examples/chef/devices/rootnode_pressuresensor_fBO7Lvhj9j.matter
index 8662ea183f19ca..b091af234058a2 100644
--- a/examples/chef/devices/rootnode_pressuresensor_fBO7Lvhj9j.matter
+++ b/examples/chef/devices/rootnode_pressuresensor_fBO7Lvhj9j.matter
@@ -6,6 +6,145 @@ struct LabelStruct {
     char_string<16> value = 1;
 }
 
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
+  }
+
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
+  }
+
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
+  }
+
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
+  }
+
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+}
+
+client cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AddGroupRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
+
+  request struct ViewGroupRequest {
+    group_id groupId = 0;
+  }
+
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
+  }
+
+  request struct RemoveGroupRequest {
+    group_id groupId = 0;
+  }
+
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
+
+  response struct AddGroupResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  response struct ViewGroupResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    CHAR_STRING groupName = 2;
+  }
+
+  response struct GetGroupMembershipResponse = 2 {
+    nullable INT8U capacity = 0;
+    group_id groupList[] = 1;
+  }
+
+  response struct RemoveGroupResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
+}
+
+server cluster Descriptor = 29 {
+  struct DeviceType {
+    devtype_id type = 0;
+    int16u revision = 1;
+  }
+
+  readonly attribute DeviceType deviceList[] = 0;
+  readonly attribute CLUSTER_ID serverList[] = 1;
+  readonly attribute CLUSTER_ID clientList[] = 2;
+  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+client cluster Binding = 30 {
+  struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  attribute TargetStruct binding[] = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
 server cluster AccessControl = 31 {
   enum AuthMode : ENUM8 {
     kPase = 1;
@@ -69,42 +208,6 @@ server cluster AccessControl = 31 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
-  }
-
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
-  }
-
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
-  }
-
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-  }
-
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
-
 server cluster Basic = 40 {
   critical event StartUp = 0 {
     INT32U softwareVersion = 0;
@@ -143,102 +246,171 @@ server cluster Basic = 40 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-client cluster Binding = 30 {
-  struct TargetStruct {
-    optional node_id node = 1;
-    optional group_id group = 2;
-    optional endpoint_no endpoint = 3;
-    optional cluster_id cluster = 4;
-    fabric_idx fabricIndex = 254;
+client cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
   }
 
-  attribute TargetStruct binding[] = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
+  }
 
-server cluster Descriptor = 29 {
-  struct DeviceType {
-    devtype_id type = 0;
-    int16u revision = 1;
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
   }
 
-  readonly attribute DeviceType deviceList[] = 0;
-  readonly attribute CLUSTER_ID serverList[] = 1;
-  readonly attribute CLUSTER_ID clientList[] = 2;
-  readonly attribute ENDPOINT_NO partsList[] = 3;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster DiagnosticLogs = 50 {
-  enum LogsIntent : ENUM8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
-  }
 
-  enum LogsStatus : ENUM8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
   }
 
-  enum LogsTransferProtocol : ENUM8 {
-    kResponsePayload = 0;
-    kBdx = 1;
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
   }
 
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct RetrieveLogsRequestRequest {
-    LogsIntent intent = 0;
-    LogsTransferProtocol requestedProtocol = 1;
-    OCTET_STRING transferFileDesignator = 2;
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
   }
 
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+  response struct QueryImageResponse = 1 {
+    OTAQueryStatus status = 0;
+    optional INT32U delayedActionTime = 1;
+    optional CHAR_STRING imageURI = 2;
+    optional INT32U softwareVersion = 3;
+    optional CHAR_STRING softwareVersionString = 4;
+    optional OCTET_STRING updateToken = 5;
+    optional BOOLEAN userConsentNeeded = 6;
+    optional OCTET_STRING metadataForRequestor = 7;
+  }
+
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
+  }
+
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
 }
 
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
+server cluster OtaSoftwareUpdateRequestor = 42 {
+  enum OTAAnnouncementReason : ENUM8 {
+    kSimpleAnnouncement = 0;
+    kUpdateAvailable = 1;
+    kUrgentUpdateAvailable = 2;
   }
 
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
+  enum OTAChangeReasonEnum : ENUM8 {
+    kUnknown = 0;
+    kSuccess = 1;
+    kFailure = 2;
+    kTimeOut = 3;
+    kDelayByProvider = 4;
+  }
+
+  enum OTAUpdateStateEnum : ENUM8 {
+    kUnknown = 0;
+    kIdle = 1;
+    kQuerying = 2;
+    kDelayedOnQuery = 3;
+    kDownloading = 4;
+    kApplying = 5;
+    kDelayedOnApply = 6;
+    kRollingBack = 7;
+    kDelayedOnUserConsent = 8;
+  }
+
+  struct ProviderLocation {
+    node_id providerNodeID = 1;
+    endpoint_no endpoint = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  info event StateTransition = 0 {
+    OTAUpdateStateEnum previousState = 0;
+    OTAUpdateStateEnum newState = 1;
+    OTAChangeReasonEnum reason = 2;
+    nullable INT32U targetSoftwareVersion = 3;
+  }
+
+  critical event VersionApplied = 1 {
+    INT32U softwareVersion = 0;
+    INT16U productID = 1;
+  }
+
+  info event DownloadError = 2 {
+    INT32U softwareVersion = 0;
+    INT64U bytesDownloaded = 1;
+    nullable INT8U progressPercent = 2;
+    nullable INT64S platformCode = 3;
+  }
+
+  attribute ProviderLocation defaultOtaProviders[] = 0;
+  readonly attribute boolean updatePossible = 1;
+  readonly attribute OTAUpdateStateEnum updateState = 2;
+  readonly attribute nullable int8u updateStateProgress = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  request struct AnnounceOtaProviderRequest {
+    node_id providerNodeId = 0;
+    vendor_id vendorId = 1;
+    OTAAnnouncementReason announcementReason = 2;
+    optional OCTET_STRING metadataForNode = 3;
+    endpoint_no endpoint = 4;
+  }
+
+  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
 }
 
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
+server cluster LocalizationConfiguration = 43 {
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
+  }
+
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
+  }
+
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
@@ -301,552 +473,613 @@ server cluster GeneralCommissioning = 48 {
   command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
 }
 
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatus : ENUM8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
   }
 
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
+  enum WiFiBand : ENUM8 {
+    k2g4 = 0;
+    k3g65 = 1;
+    k5g = 2;
+    k6g = 3;
+    k60g = 4;
   }
 
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
+  bitmap NetworkCommissioningFeature : BITMAP32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
   }
 
-  enum NetworkFaultType : ENUM8 {
-    kUnspecified = 0;
-    kHardwareFailure = 1;
-    kNetworkJammed = 2;
-    kConnectionFailed = 3;
+  bitmap WiFiSecurity : BITMAP8 {
+    kUnencrypted = 0x1;
+    kWepPersonal = 0x2;
+    kWpaPersonal = 0x4;
+    kWpa2Personal = 0x8;
+    kWpa3Personal = 0x10;
   }
 
-  enum RadioFaultType : ENUM8 {
-    kUnspecified = 0;
-    kWiFiFault = 1;
-    kCellularFault = 2;
-    kThreadFault = 3;
-    kNFCFault = 4;
-    kBLEFault = 5;
-    kEthernetFault = 6;
+  struct NetworkInfo {
+    octet_string<32> networkID = 0;
+    boolean connected = 1;
   }
 
-  struct NetworkInterfaceType {
-    char_string<32> name = 0;
-    boolean isOperational = 1;
-    nullable boolean offPremiseServicesReachableIPv4 = 2;
-    nullable boolean offPremiseServicesReachableIPv6 = 3;
-    octet_string<8> hardwareAddress = 4;
-    octet_string IPv4Addresses[] = 5;
-    octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+  struct WiFiInterfaceScanResult {
+    WiFiSecurity security = 0;
+    octet_string<32> ssid = 1;
+    octet_string<6> bssid = 2;
+    int16u channel = 3;
+    WiFiBand wiFiBand = 4;
+    int8s rssi = 5;
   }
 
-  critical event HardwareFaultChange = 0 {
-    HardwareFaultType current[] = 0;
-    HardwareFaultType previous[] = 1;
+  struct ThreadInterfaceScanResult {
+    int16u panId = 0;
+    int64u extendedPanId = 1;
+    char_string<16> networkName = 2;
+    int16u channel = 3;
+    int8u version = 4;
+    octet_string<8> extendedAddress = 5;
+    int8s rssi = 6;
+    int8u lqi = 7;
   }
 
-  critical event RadioFaultChange = 1 {
-    RadioFaultType current[] = 0;
-    RadioFaultType previous[] = 1;
+  readonly attribute access(read: administer) int8u maxNetworks = 0;
+  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
+  readonly attribute int8u scanMaxTimeSeconds = 2;
+  readonly attribute int8u connectMaxTimeSeconds = 3;
+  attribute access(write: administer) boolean interfaceEnabled = 4;
+  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
+  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
+  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ScanNetworksRequest {
+    optional nullable OCTET_STRING ssid = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
-  }
-
-  critical event BootReason = 3 {
-    BootReasonType bootReason = 0;
+  request struct AddOrUpdateWiFiNetworkRequest {
+    OCTET_STRING ssid = 0;
+    OCTET_STRING credentials = 1;
+    optional INT64U breadcrumb = 2;
   }
 
-  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
-  readonly attribute int16u rebootCount = 1;
-  readonly attribute int64u upTime = 2;
-  readonly attribute int32u totalOperationalHours = 3;
-  readonly attribute enum8 bootReasons = 4;
-  readonly attribute ENUM8 activeHardwareFaults[] = 5;
-  readonly attribute ENUM8 activeRadioFaults[] = 6;
-  readonly attribute ENUM8 activeNetworkFaults[] = 7;
-  readonly attribute boolean testEventTriggersEnabled = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct TestEventTriggerRequest {
-    OCTET_STRING enableKey = 0;
-    INT64U eventTrigger = 1;
+  request struct AddOrUpdateThreadNetworkRequest {
+    OCTET_STRING operationalDataset = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
-}
-
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
+  request struct RemoveNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
-    fabric_idx fabricIndex = 254;
+  request struct ConnectNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
+  request struct ReorderNetworkRequest {
+    OCTET_STRING networkID = 0;
+    INT8U networkIndex = 1;
+    optional INT64U breadcrumb = 2;
   }
 
-  struct GroupKeySetStruct {
-    int16u groupKeySetID = 0;
-    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
-    nullable octet_string<16> epochKey0 = 2;
-    nullable epoch_us epochStartTime0 = 3;
-    nullable octet_string<16> epochKey1 = 4;
-    nullable epoch_us epochStartTime1 = 5;
-    nullable octet_string<16> epochKey2 = 6;
-    nullable epoch_us epochStartTime2 = 7;
+  response struct ScanNetworksResponse = 1 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
+    optional ThreadInterfaceScanResult threadScanResults[] = 3;
   }
 
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
-  readonly attribute int16u maxGroupsPerFabric = 2;
-  readonly attribute int16u maxGroupKeysPerFabric = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct KeySetWriteRequest {
-    GroupKeySetStruct groupKeySet = 0;
+  response struct NetworkConfigResponse = 5 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional INT8U networkIndex = 2;
   }
 
-  request struct KeySetReadRequest {
-    INT16U groupKeySetID = 0;
+  response struct ConnectNetworkResponse = 7 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    nullable INT32S errorValue = 2;
   }
 
-  request struct KeySetRemoveRequest {
-    INT16U groupKeySetID = 0;
-  }
+  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
+  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
+  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
+  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
+  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
+  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+}
 
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
+server cluster DiagnosticLogs = 50 {
+  enum LogsIntent : ENUM8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
   }
 
-  response struct KeySetReadResponse = 2 {
-    GroupKeySetStruct groupKeySet = 0;
+  enum LogsStatus : ENUM8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
   }
 
-  response struct KeySetReadAllIndicesResponse = 5 {
-    INT16U groupKeySetIDs[] = 0;
+  enum LogsTransferProtocol : ENUM8 {
+    kResponsePayload = 0;
+    kBdx = 1;
   }
 
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
-}
-
-client cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AddGroupRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+  request struct RetrieveLogsRequestRequest {
+    LogsIntent intent = 0;
+    LogsTransferProtocol requestedProtocol = 1;
+    OCTET_STRING transferFileDesignator = 2;
   }
 
-  request struct ViewGroupRequest {
-    group_id groupId = 0;
-  }
+  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+}
 
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
   }
 
-  request struct RemoveGroupRequest {
-    group_id groupId = 0;
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
   }
 
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
   }
 
-  response struct AddGroupResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
   }
 
-  response struct ViewGroupResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    CHAR_STRING groupName = 2;
+  enum RadioFaultType : ENUM8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
   }
 
-  response struct GetGroupMembershipResponse = 2 {
-    nullable INT8U capacity = 0;
-    group_id groupList[] = 1;
+  struct NetworkInterfaceType {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceType type = 7;
   }
 
-  response struct RemoveGroupResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultType current[] = 0;
+    HardwareFaultType previous[] = 1;
   }
 
-  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
-}
-
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
+  critical event RadioFaultChange = 1 {
+    RadioFaultType current[] = 0;
+    RadioFaultType previous[] = 1;
   }
 
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultType current[] = 0;
+    NetworkFaultType previous[] = 1;
   }
 
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
+  critical event BootReason = 3 {
+    BootReasonType bootReason = 0;
   }
 
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
+  readonly attribute int32u totalOperationalHours = 3;
+  readonly attribute enum8 bootReasons = 4;
+  readonly attribute ENUM8 activeHardwareFaults[] = 5;
+  readonly attribute ENUM8 activeRadioFaults[] = 6;
+  readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
   }
 
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
-}
-
-server cluster LocalizationConfiguration = 43 {
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
-server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatus : ENUM8 {
-    kSuccess = 0;
-    kOutOfRange = 1;
-    kBoundsExceeded = 2;
-    kNetworkIDNotFound = 3;
-    kDuplicateNetworkID = 4;
-    kNetworkNotFound = 5;
-    kRegulatoryError = 6;
-    kAuthFailure = 7;
-    kUnsupportedSecurity = 8;
-    kOtherConnectionFailure = 9;
-    kIPV6Failed = 10;
-    kIPBindFailed = 11;
-    kUnknownError = 12;
+server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
   }
 
-  enum WiFiBand : ENUM8 {
-    k2g4 = 0;
-    k3g65 = 1;
-    k5g = 2;
-    k6g = 3;
-    k60g = 4;
+  struct ThreadMetrics {
+    int64u id = 0;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
-  bitmap NetworkCommissioningFeature : BITMAP32 {
-    kWiFiNetworkInterface = 0x1;
-    kThreadNetworkInterface = 0x2;
-    kEthernetNetworkInterface = 0x4;
+  info event SoftwareFault = 0 {
+    SoftwareFaultStruct softwareFault = 0;
   }
 
-  bitmap WiFiSecurity : BITMAP8 {
-    kUnencrypted = 0x1;
-    kWepPersonal = 0x2;
-    kWpaPersonal = 0x4;
-    kWpa2Personal = 0x8;
-    kWpa3Personal = 0x10;
-  }
+  readonly attribute ThreadMetrics threadMetrics[] = 0;
+  readonly attribute int64u currentHeapFree = 1;
+  readonly attribute int64u currentHeapUsed = 2;
+  readonly attribute int64u currentHeapHighWatermark = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  struct NetworkInfo {
-    octet_string<32> networkID = 0;
-    boolean connected = 1;
-  }
+  command ResetWatermarks(): DefaultSuccess = 0;
+}
 
-  struct WiFiInterfaceScanResult {
-    WiFiSecurity security = 0;
-    octet_string<32> ssid = 1;
-    octet_string<6> bssid = 2;
-    int16u channel = 3;
-    WiFiBand wiFiBand = 4;
-    int8s rssi = 5;
+server cluster ThreadNetworkDiagnostics = 53 {
+  enum NetworkFault : ENUM8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
   }
 
-  struct ThreadInterfaceScanResult {
-    int16u panId = 0;
-    int64u extendedPanId = 1;
-    char_string<16> networkName = 2;
-    int16u channel = 3;
-    int8u version = 4;
-    octet_string<8> extendedAddress = 5;
-    int8s rssi = 6;
-    int8u lqi = 7;
+  enum RoutingRole : ENUM8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kReed = 4;
+    kRouter = 5;
+    kLeader = 6;
   }
 
-  readonly attribute access(read: administer) int8u maxNetworks = 0;
-  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
-  readonly attribute int8u scanMaxTimeSeconds = 2;
-  readonly attribute int8u connectMaxTimeSeconds = 3;
-  attribute access(write: administer) boolean interfaceEnabled = 4;
-  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
-  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
-  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  enum ThreadConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
+  }
 
-  request struct ScanNetworksRequest {
-    optional nullable OCTET_STRING ssid = 0;
-    optional INT64U breadcrumb = 1;
+  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+    kMLECounts = 0x4;
+    kMACCounts = 0x8;
   }
 
-  request struct AddOrUpdateWiFiNetworkRequest {
-    OCTET_STRING ssid = 0;
-    OCTET_STRING credentials = 1;
-    optional INT64U breadcrumb = 2;
+  struct NeighborTable {
+    int64u extAddress = 0;
+    int32u age = 1;
+    int16u rloc16 = 2;
+    int32u linkFrameCounter = 3;
+    int32u mleFrameCounter = 4;
+    int8u lqi = 5;
+    nullable int8s averageRssi = 6;
+    nullable int8s lastRssi = 7;
+    int8u frameErrorRate = 8;
+    int8u messageErrorRate = 9;
+    boolean rxOnWhenIdle = 10;
+    boolean fullThreadDevice = 11;
+    boolean fullNetworkData = 12;
+    boolean isChild = 13;
   }
 
-  request struct AddOrUpdateThreadNetworkRequest {
-    OCTET_STRING operationalDataset = 0;
-    optional INT64U breadcrumb = 1;
+  struct RouteTable {
+    int64u extAddress = 0;
+    int16u rloc16 = 1;
+    int8u routerId = 2;
+    int8u nextHop = 3;
+    int8u pathCost = 4;
+    int8u LQIIn = 5;
+    int8u LQIOut = 6;
+    int8u age = 7;
+    boolean allocated = 8;
+    boolean linkEstablished = 9;
   }
 
-  request struct RemoveNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
+  struct SecurityPolicy {
+    int16u rotationTime = 0;
+    bitmap16 flags = 1;
   }
 
-  request struct ConnectNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
+  struct OperationalDatasetComponents {
+    boolean activeTimestampPresent = 0;
+    boolean pendingTimestampPresent = 1;
+    boolean masterKeyPresent = 2;
+    boolean networkNamePresent = 3;
+    boolean extendedPanIdPresent = 4;
+    boolean meshLocalPrefixPresent = 5;
+    boolean delayPresent = 6;
+    boolean panIdPresent = 7;
+    boolean channelPresent = 8;
+    boolean pskcPresent = 9;
+    boolean securityPolicyPresent = 10;
+    boolean channelMaskPresent = 11;
   }
 
-  request struct ReorderNetworkRequest {
-    OCTET_STRING networkID = 0;
-    INT8U networkIndex = 1;
-    optional INT64U breadcrumb = 2;
+  info event ConnectionStatus = 0 {
+    ThreadConnectionStatus connectionStatus = 0;
   }
 
-  response struct ScanNetworksResponse = 1 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
-    optional ThreadInterfaceScanResult threadScanResults[] = 3;
+  readonly attribute nullable int16u channel = 0;
+  readonly attribute nullable RoutingRole routingRole = 1;
+  readonly attribute nullable char_string<16> networkName = 2;
+  readonly attribute nullable int16u panId = 3;
+  readonly attribute nullable int64u extendedPanId = 4;
+  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute NeighborTable neighborTableList[] = 7;
+  readonly attribute RouteTable routeTableList[] = 8;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
+  readonly attribute int16u detachedRoleCount = 14;
+  readonly attribute int16u childRoleCount = 15;
+  readonly attribute int16u routerRoleCount = 16;
+  readonly attribute int16u leaderRoleCount = 17;
+  readonly attribute int16u attachAttemptCount = 18;
+  readonly attribute int16u partitionIdChangeCount = 19;
+  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
+  readonly attribute int16u parentChangeCount = 21;
+  readonly attribute int32u txTotalCount = 22;
+  readonly attribute int32u txUnicastCount = 23;
+  readonly attribute int32u txBroadcastCount = 24;
+  readonly attribute int32u txAckRequestedCount = 25;
+  readonly attribute int32u txAckedCount = 26;
+  readonly attribute int32u txNoAckRequestedCount = 27;
+  readonly attribute int32u txDataCount = 28;
+  readonly attribute int32u txDataPollCount = 29;
+  readonly attribute int32u txBeaconCount = 30;
+  readonly attribute int32u txBeaconRequestCount = 31;
+  readonly attribute int32u txOtherCount = 32;
+  readonly attribute int32u txRetryCount = 33;
+  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
+  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
+  readonly attribute int32u txErrCcaCount = 36;
+  readonly attribute int32u txErrAbortCount = 37;
+  readonly attribute int32u txErrBusyChannelCount = 38;
+  readonly attribute int32u rxTotalCount = 39;
+  readonly attribute int32u rxUnicastCount = 40;
+  readonly attribute int32u rxBroadcastCount = 41;
+  readonly attribute int32u rxDataCount = 42;
+  readonly attribute int32u rxDataPollCount = 43;
+  readonly attribute int32u rxBeaconCount = 44;
+  readonly attribute int32u rxBeaconRequestCount = 45;
+  readonly attribute int32u rxOtherCount = 46;
+  readonly attribute int32u rxAddressFilteredCount = 47;
+  readonly attribute int32u rxDestAddrFilteredCount = 48;
+  readonly attribute int32u rxDuplicatedCount = 49;
+  readonly attribute int32u rxErrNoFrameCount = 50;
+  readonly attribute int32u rxErrUnknownNeighborCount = 51;
+  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
+  readonly attribute int32u rxErrSecCount = 53;
+  readonly attribute int32u rxErrFcsCount = 54;
+  readonly attribute int32u rxErrOtherCount = 55;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
+  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command ResetCounts(): DefaultSuccess = 0;
+}
+
+server cluster WiFiNetworkDiagnostics = 54 {
+  enum AssociationFailureCause : ENUM8 {
+    kUnknown = 0;
+    kAssociationFailed = 1;
+    kAuthenticationFailed = 2;
+    kSsidNotFound = 3;
   }
 
-  response struct NetworkConfigResponse = 5 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional INT8U networkIndex = 2;
+  enum SecurityType : ENUM8 {
+    kUnspecified = 0;
+    kNone = 1;
+    kWep = 2;
+    kWpa = 3;
+    kWpa2 = 4;
+    kWpa3 = 5;
   }
 
-  response struct ConnectNetworkResponse = 7 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    nullable INT32S errorValue = 2;
+  enum WiFiConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
-  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
-  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
-  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
-  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
-  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
-}
+  enum WiFiVersionType : ENUM8 {
+    k80211a = 0;
+    k80211b = 1;
+    k80211g = 2;
+    k80211n = 3;
+    k80211ac = 4;
+    k80211ax = 5;
+  }
 
-client cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
+  info event Disconnection = 0 {
+    INT16U reasonCode = 0;
   }
 
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
+  info event AssociationFailure = 1 {
+    AssociationFailureCause associationFailure = 0;
+    INT16U status = 1;
   }
 
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
+  info event ConnectionStatus = 2 {
+    WiFiConnectionStatus connectionStatus = 0;
   }
 
+  readonly attribute nullable octet_string<6> bssid = 0;
+  readonly attribute nullable SecurityType securityType = 1;
+  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
+  readonly attribute nullable int16u channelNumber = 3;
+  readonly attribute nullable int8s rssi = 4;
+  readonly attribute int32u beaconLostCount = 5;
+  readonly attribute int32u beaconRxCount = 6;
+  readonly attribute int32u packetMulticastRxCount = 7;
+  readonly attribute int32u packetMulticastTxCount = 8;
+  readonly attribute int32u packetUnicastRxCount = 9;
+  readonly attribute int32u packetUnicastTxCount = 10;
+  readonly attribute int64u currentMaxRate = 11;
+  readonly attribute int64u overrunCount = 12;
+  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
-  }
+  command ResetCounts(): DefaultSuccess = 0;
+}
 
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
   }
 
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
-  }
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  response struct QueryImageResponse = 1 {
-    OTAQueryStatus status = 0;
-    optional INT32U delayedActionTime = 1;
-    optional CHAR_STRING imageURI = 2;
-    optional INT32U softwareVersion = 3;
-    optional CHAR_STRING softwareVersionString = 4;
-    optional OCTET_STRING updateToken = 5;
-    optional BOOLEAN userConsentNeeded = 6;
-    optional OCTET_STRING metadataForRequestor = 7;
+  command ResetCounts(): DefaultSuccess = 0;
+}
+
+server cluster Switch = 59 {
+  info event SwitchLatched = 0 {
+    INT8U newPosition = 0;
   }
 
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
+  info event InitialPress = 1 {
+    INT8U newPosition = 0;
   }
 
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
-}
-
-server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum OTAAnnouncementReason : ENUM8 {
-    kSimpleAnnouncement = 0;
-    kUpdateAvailable = 1;
-    kUrgentUpdateAvailable = 2;
+  info event LongPress = 2 {
+    INT8U newPosition = 0;
   }
 
-  enum OTAChangeReasonEnum : ENUM8 {
-    kUnknown = 0;
-    kSuccess = 1;
-    kFailure = 2;
-    kTimeOut = 3;
-    kDelayByProvider = 4;
+  info event ShortRelease = 3 {
+    INT8U previousPosition = 0;
   }
 
-  enum OTAUpdateStateEnum : ENUM8 {
-    kUnknown = 0;
-    kIdle = 1;
-    kQuerying = 2;
-    kDelayedOnQuery = 3;
-    kDownloading = 4;
-    kApplying = 5;
-    kDelayedOnApply = 6;
-    kRollingBack = 7;
-    kDelayedOnUserConsent = 8;
+  info event LongRelease = 4 {
+    INT8U previousPosition = 0;
   }
 
-  struct ProviderLocation {
-    node_id providerNodeID = 1;
-    endpoint_no endpoint = 2;
-    fabric_idx fabricIndex = 254;
+  info event MultiPressOngoing = 5 {
+    INT8U newPosition = 0;
+    INT8U currentNumberOfPressesCounted = 1;
   }
 
-  info event StateTransition = 0 {
-    OTAUpdateStateEnum previousState = 0;
-    OTAUpdateStateEnum newState = 1;
-    OTAChangeReasonEnum reason = 2;
-    nullable INT32U targetSoftwareVersion = 3;
+  info event MultiPressComplete = 6 {
+    INT8U newPosition = 0;
+    INT8U totalNumberOfPressesCounted = 1;
   }
 
-  critical event VersionApplied = 1 {
-    INT32U softwareVersion = 0;
-    INT16U productID = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
   }
 
-  info event DownloadError = 2 {
-    INT32U softwareVersion = 0;
-    INT64U bytesDownloaded = 1;
-    nullable INT8U progressPercent = 2;
-    nullable INT64S platformCode = 3;
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
   }
 
-  attribute ProviderLocation defaultOtaProviders[] = 0;
-  readonly attribute boolean updatePossible = 1;
-  readonly attribute OTAUpdateStateEnum updateState = 2;
-  readonly attribute nullable int8u updateStateProgress = 3;
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AnnounceOtaProviderRequest {
-    node_id providerNodeId = 0;
-    vendor_id vendorId = 1;
-    OTAAnnouncementReason announcementReason = 2;
-    optional OCTET_STRING metadataForNode = 3;
-    endpoint_no endpoint = 4;
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
   }
 
-  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+  }
+
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
 server cluster OperationalCredentials = 62 {
@@ -923,364 +1156,131 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct AddTrustedRootCertificateRequest {
-    OCTET_STRING rootCertificate = 0;
-  }
-
-  response struct AttestationResponse = 1 {
-    OCTET_STRING attestationElements = 0;
-    OCTET_STRING signature = 1;
-  }
-
-  response struct CertificateChainResponse = 3 {
-    OCTET_STRING certificate = 0;
-  }
-
-  response struct CSRResponse = 5 {
-    OCTET_STRING NOCSRElements = 0;
-    OCTET_STRING attestationSignature = 1;
-  }
-
-  response struct NOCResponse = 8 {
-    OperationalCertStatus statusCode = 0;
-    optional fabric_idx fabricIndex = 1;
-    optional CHAR_STRING debugText = 2;
-  }
-
-  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
-  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
-  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
-  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
-  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
-  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
-  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
-  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-}
-
-server cluster PressureMeasurement = 1027 {
-  bitmap PressureFeature : BITMAP32 {
-    kExt = 0x1;
-  }
-
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster SoftwareDiagnostics = 52 {
-  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
-    kWaterMarks = 0x1;
-  }
-
-  struct ThreadMetrics {
-    int64u id = 0;
-    optional char_string<8> name = 1;
-    optional int32u stackFreeCurrent = 2;
-    optional int32u stackFreeMinimum = 3;
-    optional int32u stackSize = 4;
-  }
-
-  info event SoftwareFault = 0 {
-    SoftwareFaultStruct softwareFault = 0;
-  }
-
-  readonly attribute ThreadMetrics threadMetrics[] = 0;
-  readonly attribute int64u currentHeapFree = 1;
-  readonly attribute int64u currentHeapUsed = 2;
-  readonly attribute int64u currentHeapHighWatermark = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command ResetWatermarks(): DefaultSuccess = 0;
-}
-
-server cluster Switch = 59 {
-  info event SwitchLatched = 0 {
-    INT8U newPosition = 0;
-  }
-
-  info event InitialPress = 1 {
-    INT8U newPosition = 0;
-  }
-
-  info event LongPress = 2 {
-    INT8U newPosition = 0;
-  }
-
-  info event ShortRelease = 3 {
-    INT8U previousPosition = 0;
-  }
-
-  info event LongRelease = 4 {
-    INT8U previousPosition = 0;
-  }
-
-  info event MultiPressOngoing = 5 {
-    INT8U newPosition = 0;
-    INT8U currentNumberOfPressesCounted = 1;
-  }
-
-  info event MultiPressComplete = 6 {
-    INT8U newPosition = 0;
-    INT8U totalNumberOfPressesCounted = 1;
-  }
-
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster ThreadNetworkDiagnostics = 53 {
-  enum NetworkFault : ENUM8 {
-    kUnspecified = 0;
-    kLinkDown = 1;
-    kHardwareFailure = 2;
-    kNetworkJammed = 3;
-  }
-
-  enum RoutingRole : ENUM8 {
-    kUnspecified = 0;
-    kUnassigned = 1;
-    kSleepyEndDevice = 2;
-    kEndDevice = 3;
-    kReed = 4;
-    kRouter = 5;
-    kLeader = 6;
-  }
-
-  enum ThreadConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
-  }
-
-  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
-    kPacketCounts = 0x1;
-    kErrorCounts = 0x2;
-    kMLECounts = 0x4;
-    kMACCounts = 0x8;
-  }
-
-  struct NeighborTable {
-    int64u extAddress = 0;
-    int32u age = 1;
-    int16u rloc16 = 2;
-    int32u linkFrameCounter = 3;
-    int32u mleFrameCounter = 4;
-    int8u lqi = 5;
-    nullable int8s averageRssi = 6;
-    nullable int8s lastRssi = 7;
-    int8u frameErrorRate = 8;
-    int8u messageErrorRate = 9;
-    boolean rxOnWhenIdle = 10;
-    boolean fullThreadDevice = 11;
-    boolean fullNetworkData = 12;
-    boolean isChild = 13;
+    OCTET_STRING rootCertificate = 0;
   }
 
-  struct RouteTable {
-    int64u extAddress = 0;
-    int16u rloc16 = 1;
-    int8u routerId = 2;
-    int8u nextHop = 3;
-    int8u pathCost = 4;
-    int8u LQIIn = 5;
-    int8u LQIOut = 6;
-    int8u age = 7;
-    boolean allocated = 8;
-    boolean linkEstablished = 9;
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
   }
 
-  struct SecurityPolicy {
-    int16u rotationTime = 0;
-    bitmap16 flags = 1;
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
   }
 
-  struct OperationalDatasetComponents {
-    boolean activeTimestampPresent = 0;
-    boolean pendingTimestampPresent = 1;
-    boolean masterKeyPresent = 2;
-    boolean networkNamePresent = 3;
-    boolean extendedPanIdPresent = 4;
-    boolean meshLocalPrefixPresent = 5;
-    boolean delayPresent = 6;
-    boolean panIdPresent = 7;
-    boolean channelPresent = 8;
-    boolean pskcPresent = 9;
-    boolean securityPolicyPresent = 10;
-    boolean channelMaskPresent = 11;
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
   }
 
-  info event ConnectionStatus = 0 {
-    ThreadConnectionStatus connectionStatus = 0;
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
   }
 
-  readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable RoutingRole routingRole = 1;
-  readonly attribute nullable char_string<16> networkName = 2;
-  readonly attribute nullable int16u panId = 3;
-  readonly attribute nullable int64u extendedPanId = 4;
-  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute NeighborTable neighborTableList[] = 7;
-  readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
-  readonly attribute nullable int8u leaderRouterId = 13;
-  readonly attribute int16u detachedRoleCount = 14;
-  readonly attribute int16u childRoleCount = 15;
-  readonly attribute int16u routerRoleCount = 16;
-  readonly attribute int16u leaderRoleCount = 17;
-  readonly attribute int16u attachAttemptCount = 18;
-  readonly attribute int16u partitionIdChangeCount = 19;
-  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
-  readonly attribute int16u parentChangeCount = 21;
-  readonly attribute int32u txTotalCount = 22;
-  readonly attribute int32u txUnicastCount = 23;
-  readonly attribute int32u txBroadcastCount = 24;
-  readonly attribute int32u txAckRequestedCount = 25;
-  readonly attribute int32u txAckedCount = 26;
-  readonly attribute int32u txNoAckRequestedCount = 27;
-  readonly attribute int32u txDataCount = 28;
-  readonly attribute int32u txDataPollCount = 29;
-  readonly attribute int32u txBeaconCount = 30;
-  readonly attribute int32u txBeaconRequestCount = 31;
-  readonly attribute int32u txOtherCount = 32;
-  readonly attribute int32u txRetryCount = 33;
-  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
-  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
-  readonly attribute int32u txErrCcaCount = 36;
-  readonly attribute int32u txErrAbortCount = 37;
-  readonly attribute int32u txErrBusyChannelCount = 38;
-  readonly attribute int32u rxTotalCount = 39;
-  readonly attribute int32u rxUnicastCount = 40;
-  readonly attribute int32u rxBroadcastCount = 41;
-  readonly attribute int32u rxDataCount = 42;
-  readonly attribute int32u rxDataPollCount = 43;
-  readonly attribute int32u rxBeaconCount = 44;
-  readonly attribute int32u rxBeaconRequestCount = 45;
-  readonly attribute int32u rxOtherCount = 46;
-  readonly attribute int32u rxAddressFilteredCount = 47;
-  readonly attribute int32u rxDestAddrFilteredCount = 48;
-  readonly attribute int32u rxDuplicatedCount = 49;
-  readonly attribute int32u rxErrNoFrameCount = 50;
-  readonly attribute int32u rxErrUnknownNeighborCount = 51;
-  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
-  readonly attribute int32u rxErrSecCount = 53;
-  readonly attribute int32u rxErrFcsCount = 54;
-  readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute nullable int64u activeTimestamp = 56;
-  readonly attribute nullable int64u pendingTimestamp = 57;
-  readonly attribute nullable int32u delay = 58;
-  readonly attribute nullable SecurityPolicy securityPolicy = 59;
-  readonly attribute nullable octet_string<4> channelMask = 60;
-  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
-  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
 }
 
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
   }
 
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
 
-server cluster UserLabel = 65 {
-  attribute access(write: manage) LabelStruct labelList[] = 0;
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCause : ENUM8 {
-    kUnknown = 0;
-    kAssociationFailed = 1;
-    kAuthenticationFailed = 2;
-    kSsidNotFound = 3;
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  enum SecurityType : ENUM8 {
-    kUnspecified = 0;
-    kNone = 1;
-    kWep = 2;
-    kWpa = 3;
-    kWpa2 = 4;
-    kWpa3 = 5;
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  enum WiFiConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  enum WiFiVersionType : ENUM8 {
-    k80211a = 0;
-    k80211b = 1;
-    k80211g = 2;
-    k80211n = 3;
-    k80211ac = 4;
-    k80211ax = 5;
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  info event Disconnection = 0 {
-    INT16U reasonCode = 0;
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  info event AssociationFailure = 1 {
-    AssociationFailureCause associationFailure = 0;
-    INT16U status = 1;
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  info event ConnectionStatus = 2 {
-    WiFiConnectionStatus connectionStatus = 0;
-  }
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
 
-  readonly attribute nullable octet_string<6> bssid = 0;
-  readonly attribute nullable SecurityType securityType = 1;
-  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
-  readonly attribute nullable int16u channelNumber = 3;
-  readonly attribute nullable int8s rssi = 4;
-  readonly attribute int32u beaconLostCount = 5;
-  readonly attribute int32u beaconRxCount = 6;
-  readonly attribute int32u packetMulticastRxCount = 7;
-  readonly attribute int32u packetMulticastTxCount = 8;
-  readonly attribute int32u packetUnicastRxCount = 9;
-  readonly attribute int32u packetUnicastTxCount = 10;
-  readonly attribute int64u currentMaxRate = 11;
-  readonly attribute int64u overrunCount = 12;
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  command ResetCounts(): DefaultSuccess = 0;
+server cluster UserLabel = 65 {
+  attribute access(write: manage) LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster PressureMeasurement = 1027 {
+  bitmap PressureFeature : BITMAP32 {
+    kExt = 0x1;
+  }
+
+  readonly attribute nullable int16s measuredValue = 0;
+  readonly attribute nullable int16s minMeasuredValue = 1;
+  readonly attribute nullable int16s maxMeasuredValue = 2;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
 endpoint 0 {
diff --git a/examples/chef/devices/rootnode_speaker_TlTVZFjAlM.matter b/examples/chef/devices/rootnode_speaker_TlTVZFjAlM.matter
index bc474bed854075..67a4f9ff4b6572 100644
--- a/examples/chef/devices/rootnode_speaker_TlTVZFjAlM.matter
+++ b/examples/chef/devices/rootnode_speaker_TlTVZFjAlM.matter
@@ -6,6 +6,260 @@ struct LabelStruct {
     char_string<16> value = 1;
 }
 
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
+  }
+
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
+  }
+
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
+  }
+
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
+  }
+
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+}
+
+server cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AddGroupRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
+
+  request struct ViewGroupRequest {
+    group_id groupId = 0;
+  }
+
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
+  }
+
+  request struct RemoveGroupRequest {
+    group_id groupId = 0;
+  }
+
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
+
+  response struct AddGroupResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  response struct ViewGroupResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    CHAR_STRING groupName = 2;
+  }
+
+  response struct GetGroupMembershipResponse = 2 {
+    nullable INT8U capacity = 0;
+    group_id groupList[] = 1;
+  }
+
+  response struct RemoveGroupResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
+}
+
+server cluster OnOff = 6 {
+  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
+    kFadeToOffIn0p8Seconds = 0;
+    kNoFade = 1;
+    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
+  }
+
+  enum OnOffDyingLightEffectVariant : ENUM8 {
+    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
+  }
+
+  enum OnOffEffectIdentifier : ENUM8 {
+    kDelayedAllOff = 0;
+    kDyingLight = 1;
+  }
+
+  enum OnOffStartUpOnOff : ENUM8 {
+    kOff = 0;
+    kOn = 1;
+    kTogglePreviousOnOff = 2;
+  }
+
+  bitmap OnOffControl : BITMAP8 {
+    kAcceptOnlyWhenOn = 0x1;
+  }
+
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
+  }
+
+  bitmap SceneFeatures : BITMAP32 {
+    kSceneNames = 0x1;
+  }
+
+  readonly attribute boolean onOff = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command Off(): DefaultSuccess = 0;
+  command On(): DefaultSuccess = 1;
+  command Toggle(): DefaultSuccess = 2;
+}
+
+server cluster LevelControl = 8 {
+  enum MoveMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
+  }
+
+  enum StepMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
+  }
+
+  bitmap LevelControlFeature : BITMAP32 {
+    kOnOff = 0x1;
+    kLighting = 0x2;
+    kFrequency = 0x4;
+  }
+
+  readonly attribute int8u currentLevel = 0;
+  readonly attribute int8u minLevel = 2;
+  readonly attribute int8u maxLevel = 3;
+  attribute bitmap8 options = 15;
+  attribute nullable int8u onLevel = 17;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct MoveToLevelRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
+  }
+
+  request struct MoveRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
+  }
+
+  request struct StepRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionMask = 3;
+    BITMAP8 optionOverride = 4;
+  }
+
+  request struct StopRequest {
+    BITMAP8 optionMask = 0;
+    BITMAP8 optionOverride = 1;
+  }
+
+  request struct MoveToLevelWithOnOffRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
+  }
+
+  request struct MoveWithOnOffRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
+  }
+
+  request struct StepWithOnOffRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
+  }
+
+  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
+  command Move(MoveRequest): DefaultSuccess = 1;
+  command Step(StepRequest): DefaultSuccess = 2;
+  command Stop(StopRequest): DefaultSuccess = 3;
+  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
+  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
+  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
+  command StopWithOnOff(): DefaultSuccess = 7;
+}
+
+server cluster Descriptor = 29 {
+  struct DeviceType {
+    devtype_id type = 0;
+    int16u revision = 1;
+  }
+
+  readonly attribute DeviceType deviceList[] = 0;
+  readonly attribute CLUSTER_ID serverList[] = 1;
+  readonly attribute CLUSTER_ID clientList[] = 2;
+  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+client cluster Binding = 30 {
+  struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  attribute TargetStruct binding[] = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
 server cluster AccessControl = 31 {
   enum AuthMode : ENUM8 {
     kPase = 1;
@@ -69,42 +323,6 @@ server cluster AccessControl = 31 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
-  }
-
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
-  }
-
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
-  }
-
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-  }
-
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
-
 server cluster Basic = 40 {
   critical event StartUp = 0 {
     INT32U softwareVersion = 0;
@@ -143,102 +361,171 @@ server cluster Basic = 40 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-client cluster Binding = 30 {
-  struct TargetStruct {
-    optional node_id node = 1;
-    optional group_id group = 2;
-    optional endpoint_no endpoint = 3;
-    optional cluster_id cluster = 4;
-    fabric_idx fabricIndex = 254;
+client cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
   }
 
-  attribute TargetStruct binding[] = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
+  }
 
-server cluster Descriptor = 29 {
-  struct DeviceType {
-    devtype_id type = 0;
-    int16u revision = 1;
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
   }
 
-  readonly attribute DeviceType deviceList[] = 0;
-  readonly attribute CLUSTER_ID serverList[] = 1;
-  readonly attribute CLUSTER_ID clientList[] = 2;
-  readonly attribute ENDPOINT_NO partsList[] = 3;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster DiagnosticLogs = 50 {
-  enum LogsIntent : ENUM8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
   }
 
-  enum LogsStatus : ENUM8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
   }
 
-  enum LogsTransferProtocol : ENUM8 {
-    kResponsePayload = 0;
-    kBdx = 1;
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
   }
 
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  response struct QueryImageResponse = 1 {
+    OTAQueryStatus status = 0;
+    optional INT32U delayedActionTime = 1;
+    optional CHAR_STRING imageURI = 2;
+    optional INT32U softwareVersion = 3;
+    optional CHAR_STRING softwareVersionString = 4;
+    optional OCTET_STRING updateToken = 5;
+    optional BOOLEAN userConsentNeeded = 6;
+    optional OCTET_STRING metadataForRequestor = 7;
+  }
 
-  request struct RetrieveLogsRequestRequest {
-    LogsIntent intent = 0;
-    LogsTransferProtocol requestedProtocol = 1;
-    OCTET_STRING transferFileDesignator = 2;
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
   }
 
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
 }
 
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
+server cluster OtaSoftwareUpdateRequestor = 42 {
+  enum OTAAnnouncementReason : ENUM8 {
+    kSimpleAnnouncement = 0;
+    kUpdateAvailable = 1;
+    kUrgentUpdateAvailable = 2;
   }
 
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
+  enum OTAChangeReasonEnum : ENUM8 {
+    kUnknown = 0;
+    kSuccess = 1;
+    kFailure = 2;
+    kTimeOut = 3;
+    kDelayByProvider = 4;
+  }
+
+  enum OTAUpdateStateEnum : ENUM8 {
+    kUnknown = 0;
+    kIdle = 1;
+    kQuerying = 2;
+    kDelayedOnQuery = 3;
+    kDownloading = 4;
+    kApplying = 5;
+    kDelayedOnApply = 6;
+    kRollingBack = 7;
+    kDelayedOnUserConsent = 8;
+  }
+
+  struct ProviderLocation {
+    node_id providerNodeID = 1;
+    endpoint_no endpoint = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  info event StateTransition = 0 {
+    OTAUpdateStateEnum previousState = 0;
+    OTAUpdateStateEnum newState = 1;
+    OTAChangeReasonEnum reason = 2;
+    nullable INT32U targetSoftwareVersion = 3;
+  }
+
+  critical event VersionApplied = 1 {
+    INT32U softwareVersion = 0;
+    INT16U productID = 1;
+  }
+
+  info event DownloadError = 2 {
+    INT32U softwareVersion = 0;
+    INT64U bytesDownloaded = 1;
+    nullable INT8U progressPercent = 2;
+    nullable INT64S platformCode = 3;
+  }
+
+  attribute ProviderLocation defaultOtaProviders[] = 0;
+  readonly attribute boolean updatePossible = 1;
+  readonly attribute OTAUpdateStateEnum updateState = 2;
+  readonly attribute nullable int8u updateStateProgress = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  request struct AnnounceOtaProviderRequest {
+    node_id providerNodeId = 0;
+    vendor_id vendorId = 1;
+    OTAAnnouncementReason announcementReason = 2;
+    optional OCTET_STRING metadataForNode = 3;
+    endpoint_no endpoint = 4;
+  }
+
+  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
 }
 
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
+server cluster LocalizationConfiguration = 43 {
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
+  }
+
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
+  }
+
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
@@ -301,17 +588,183 @@ server cluster GeneralCommissioning = 48 {
   command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
 }
 
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
-  }
-
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatus : ENUM8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
+  }
+
+  enum WiFiBand : ENUM8 {
+    k2g4 = 0;
+    k3g65 = 1;
+    k5g = 2;
+    k6g = 3;
+    k60g = 4;
+  }
+
+  bitmap NetworkCommissioningFeature : BITMAP32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
+  }
+
+  bitmap WiFiSecurity : BITMAP8 {
+    kUnencrypted = 0x1;
+    kWepPersonal = 0x2;
+    kWpaPersonal = 0x4;
+    kWpa2Personal = 0x8;
+    kWpa3Personal = 0x10;
+  }
+
+  struct NetworkInfo {
+    octet_string<32> networkID = 0;
+    boolean connected = 1;
+  }
+
+  struct WiFiInterfaceScanResult {
+    WiFiSecurity security = 0;
+    octet_string<32> ssid = 1;
+    octet_string<6> bssid = 2;
+    int16u channel = 3;
+    WiFiBand wiFiBand = 4;
+    int8s rssi = 5;
+  }
+
+  struct ThreadInterfaceScanResult {
+    int16u panId = 0;
+    int64u extendedPanId = 1;
+    char_string<16> networkName = 2;
+    int16u channel = 3;
+    int8u version = 4;
+    octet_string<8> extendedAddress = 5;
+    int8s rssi = 6;
+    int8u lqi = 7;
+  }
+
+  readonly attribute access(read: administer) int8u maxNetworks = 0;
+  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
+  readonly attribute int8u scanMaxTimeSeconds = 2;
+  readonly attribute int8u connectMaxTimeSeconds = 3;
+  attribute access(write: administer) boolean interfaceEnabled = 4;
+  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
+  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
+  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ScanNetworksRequest {
+    optional nullable OCTET_STRING ssid = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct AddOrUpdateWiFiNetworkRequest {
+    OCTET_STRING ssid = 0;
+    OCTET_STRING credentials = 1;
+    optional INT64U breadcrumb = 2;
+  }
+
+  request struct AddOrUpdateThreadNetworkRequest {
+    OCTET_STRING operationalDataset = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct RemoveNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct ConnectNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct ReorderNetworkRequest {
+    OCTET_STRING networkID = 0;
+    INT8U networkIndex = 1;
+    optional INT64U breadcrumb = 2;
+  }
+
+  response struct ScanNetworksResponse = 1 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
+    optional ThreadInterfaceScanResult threadScanResults[] = 3;
+  }
+
+  response struct NetworkConfigResponse = 5 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional INT8U networkIndex = 2;
+  }
+
+  response struct ConnectNetworkResponse = 7 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    nullable INT32S errorValue = 2;
+  }
+
+  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
+  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
+  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
+  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
+  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
+  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+}
+
+server cluster DiagnosticLogs = 50 {
+  enum LogsIntent : ENUM8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
+  }
+
+  enum LogsStatus : ENUM8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
+  }
+
+  enum LogsTransferProtocol : ENUM8 {
+    kResponsePayload = 0;
+    kBdx = 1;
+  }
+
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct RetrieveLogsRequestRequest {
+    LogsIntent intent = 0;
+    LogsTransferProtocol requestedProtocol = 1;
+    OCTET_STRING transferFileDesignator = 2;
+  }
+
+  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+}
+
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
+  }
+
   enum HardwareFaultType : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
@@ -401,567 +854,347 @@ server cluster GeneralDiagnostics = 51 {
   command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
-  }
-
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
-    fabric_idx fabricIndex = 254;
+server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
   }
 
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
+  struct ThreadMetrics {
+    int64u id = 0;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
-  struct GroupKeySetStruct {
-    int16u groupKeySetID = 0;
-    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
-    nullable octet_string<16> epochKey0 = 2;
-    nullable epoch_us epochStartTime0 = 3;
-    nullable octet_string<16> epochKey1 = 4;
-    nullable epoch_us epochStartTime1 = 5;
-    nullable octet_string<16> epochKey2 = 6;
-    nullable epoch_us epochStartTime2 = 7;
+  info event SoftwareFault = 0 {
+    SoftwareFaultStruct softwareFault = 0;
   }
 
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
-  readonly attribute int16u maxGroupsPerFabric = 2;
-  readonly attribute int16u maxGroupKeysPerFabric = 3;
+  readonly attribute ThreadMetrics threadMetrics[] = 0;
+  readonly attribute int64u currentHeapFree = 1;
+  readonly attribute int64u currentHeapUsed = 2;
+  readonly attribute int64u currentHeapHighWatermark = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct KeySetWriteRequest {
-    GroupKeySetStruct groupKeySet = 0;
-  }
+  command ResetWatermarks(): DefaultSuccess = 0;
+}
 
-  request struct KeySetReadRequest {
-    INT16U groupKeySetID = 0;
+server cluster ThreadNetworkDiagnostics = 53 {
+  enum NetworkFault : ENUM8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
   }
 
-  request struct KeySetRemoveRequest {
-    INT16U groupKeySetID = 0;
+  enum RoutingRole : ENUM8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kReed = 4;
+    kRouter = 5;
+    kLeader = 6;
   }
 
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
+  enum ThreadConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  response struct KeySetReadResponse = 2 {
-    GroupKeySetStruct groupKeySet = 0;
+  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+    kMLECounts = 0x4;
+    kMACCounts = 0x8;
   }
 
-  response struct KeySetReadAllIndicesResponse = 5 {
-    INT16U groupKeySetIDs[] = 0;
-  }
-
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
-}
-
-server cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AddGroupRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
-  }
-
-  request struct ViewGroupRequest {
-    group_id groupId = 0;
-  }
-
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
-  }
-
-  request struct RemoveGroupRequest {
-    group_id groupId = 0;
+  struct NeighborTable {
+    int64u extAddress = 0;
+    int32u age = 1;
+    int16u rloc16 = 2;
+    int32u linkFrameCounter = 3;
+    int32u mleFrameCounter = 4;
+    int8u lqi = 5;
+    nullable int8s averageRssi = 6;
+    nullable int8s lastRssi = 7;
+    int8u frameErrorRate = 8;
+    int8u messageErrorRate = 9;
+    boolean rxOnWhenIdle = 10;
+    boolean fullThreadDevice = 11;
+    boolean fullNetworkData = 12;
+    boolean isChild = 13;
   }
 
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+  struct RouteTable {
+    int64u extAddress = 0;
+    int16u rloc16 = 1;
+    int8u routerId = 2;
+    int8u nextHop = 3;
+    int8u pathCost = 4;
+    int8u LQIIn = 5;
+    int8u LQIOut = 6;
+    int8u age = 7;
+    boolean allocated = 8;
+    boolean linkEstablished = 9;
   }
 
-  response struct AddGroupResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  struct SecurityPolicy {
+    int16u rotationTime = 0;
+    bitmap16 flags = 1;
   }
 
-  response struct ViewGroupResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    CHAR_STRING groupName = 2;
+  struct OperationalDatasetComponents {
+    boolean activeTimestampPresent = 0;
+    boolean pendingTimestampPresent = 1;
+    boolean masterKeyPresent = 2;
+    boolean networkNamePresent = 3;
+    boolean extendedPanIdPresent = 4;
+    boolean meshLocalPrefixPresent = 5;
+    boolean delayPresent = 6;
+    boolean panIdPresent = 7;
+    boolean channelPresent = 8;
+    boolean pskcPresent = 9;
+    boolean securityPolicyPresent = 10;
+    boolean channelMaskPresent = 11;
   }
 
-  response struct GetGroupMembershipResponse = 2 {
-    nullable INT8U capacity = 0;
-    group_id groupList[] = 1;
+  info event ConnectionStatus = 0 {
+    ThreadConnectionStatus connectionStatus = 0;
   }
 
-  response struct RemoveGroupResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-  }
+  readonly attribute nullable int16u channel = 0;
+  readonly attribute nullable RoutingRole routingRole = 1;
+  readonly attribute nullable char_string<16> networkName = 2;
+  readonly attribute nullable int16u panId = 3;
+  readonly attribute nullable int64u extendedPanId = 4;
+  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute NeighborTable neighborTableList[] = 7;
+  readonly attribute RouteTable routeTableList[] = 8;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
+  readonly attribute int16u detachedRoleCount = 14;
+  readonly attribute int16u childRoleCount = 15;
+  readonly attribute int16u routerRoleCount = 16;
+  readonly attribute int16u leaderRoleCount = 17;
+  readonly attribute int16u attachAttemptCount = 18;
+  readonly attribute int16u partitionIdChangeCount = 19;
+  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
+  readonly attribute int16u parentChangeCount = 21;
+  readonly attribute int32u txTotalCount = 22;
+  readonly attribute int32u txUnicastCount = 23;
+  readonly attribute int32u txBroadcastCount = 24;
+  readonly attribute int32u txAckRequestedCount = 25;
+  readonly attribute int32u txAckedCount = 26;
+  readonly attribute int32u txNoAckRequestedCount = 27;
+  readonly attribute int32u txDataCount = 28;
+  readonly attribute int32u txDataPollCount = 29;
+  readonly attribute int32u txBeaconCount = 30;
+  readonly attribute int32u txBeaconRequestCount = 31;
+  readonly attribute int32u txOtherCount = 32;
+  readonly attribute int32u txRetryCount = 33;
+  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
+  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
+  readonly attribute int32u txErrCcaCount = 36;
+  readonly attribute int32u txErrAbortCount = 37;
+  readonly attribute int32u txErrBusyChannelCount = 38;
+  readonly attribute int32u rxTotalCount = 39;
+  readonly attribute int32u rxUnicastCount = 40;
+  readonly attribute int32u rxBroadcastCount = 41;
+  readonly attribute int32u rxDataCount = 42;
+  readonly attribute int32u rxDataPollCount = 43;
+  readonly attribute int32u rxBeaconCount = 44;
+  readonly attribute int32u rxBeaconRequestCount = 45;
+  readonly attribute int32u rxOtherCount = 46;
+  readonly attribute int32u rxAddressFilteredCount = 47;
+  readonly attribute int32u rxDestAddrFilteredCount = 48;
+  readonly attribute int32u rxDuplicatedCount = 49;
+  readonly attribute int32u rxErrNoFrameCount = 50;
+  readonly attribute int32u rxErrUnknownNeighborCount = 51;
+  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
+  readonly attribute int32u rxErrSecCount = 53;
+  readonly attribute int32u rxErrFcsCount = 54;
+  readonly attribute int32u rxErrOtherCount = 55;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
+  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
+server cluster WiFiNetworkDiagnostics = 54 {
+  enum AssociationFailureCause : ENUM8 {
+    kUnknown = 0;
+    kAssociationFailed = 1;
+    kAuthenticationFailed = 2;
+    kSsidNotFound = 3;
   }
 
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
+  enum SecurityType : ENUM8 {
+    kUnspecified = 0;
+    kNone = 1;
+    kWep = 2;
+    kWpa = 3;
+    kWpa2 = 4;
+    kWpa3 = 5;
   }
 
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
+  enum WiFiConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
+  enum WiFiVersionType : ENUM8 {
+    k80211a = 0;
+    k80211b = 1;
+    k80211g = 2;
+    k80211n = 3;
+    k80211ac = 4;
+    k80211ax = 5;
   }
 
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
-}
-
-server cluster LevelControl = 8 {
-  enum MoveMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
+  info event Disconnection = 0 {
+    INT16U reasonCode = 0;
   }
 
-  enum StepMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
+  info event AssociationFailure = 1 {
+    AssociationFailureCause associationFailure = 0;
+    INT16U status = 1;
   }
 
-  bitmap LevelControlFeature : BITMAP32 {
-    kOnOff = 0x1;
-    kLighting = 0x2;
-    kFrequency = 0x4;
+  info event ConnectionStatus = 2 {
+    WiFiConnectionStatus connectionStatus = 0;
   }
 
-  readonly attribute int8u currentLevel = 0;
-  readonly attribute int8u minLevel = 2;
-  readonly attribute int8u maxLevel = 3;
-  attribute bitmap8 options = 15;
-  attribute nullable int8u onLevel = 17;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute nullable octet_string<6> bssid = 0;
+  readonly attribute nullable SecurityType securityType = 1;
+  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
+  readonly attribute nullable int16u channelNumber = 3;
+  readonly attribute nullable int8s rssi = 4;
+  readonly attribute int32u beaconLostCount = 5;
+  readonly attribute int32u beaconRxCount = 6;
+  readonly attribute int32u packetMulticastRxCount = 7;
+  readonly attribute int32u packetMulticastTxCount = 8;
+  readonly attribute int32u packetUnicastRxCount = 9;
+  readonly attribute int32u packetUnicastTxCount = 10;
+  readonly attribute int64u currentMaxRate = 11;
+  readonly attribute int64u overrunCount = 12;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct MoveToLevelRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
-  }
-
-  request struct MoveRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
-  }
-
-  request struct StepRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionMask = 3;
-    BITMAP8 optionOverride = 4;
-  }
-
-  request struct StopRequest {
-    BITMAP8 optionMask = 0;
-    BITMAP8 optionOverride = 1;
-  }
-
-  request struct MoveToLevelWithOnOffRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
-  }
-
-  request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
-  }
-
-  request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
-  }
-
-  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
-  command Move(MoveRequest): DefaultSuccess = 1;
-  command Step(StepRequest): DefaultSuccess = 2;
-  command Stop(StopRequest): DefaultSuccess = 3;
-  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
-  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
-  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
-  command StopWithOnOff(): DefaultSuccess = 7;
-}
-
-server cluster LocalizationConfiguration = 43 {
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatus : ENUM8 {
-    kSuccess = 0;
-    kOutOfRange = 1;
-    kBoundsExceeded = 2;
-    kNetworkIDNotFound = 3;
-    kDuplicateNetworkID = 4;
-    kNetworkNotFound = 5;
-    kRegulatoryError = 6;
-    kAuthFailure = 7;
-    kUnsupportedSecurity = 8;
-    kOtherConnectionFailure = 9;
-    kIPV6Failed = 10;
-    kIPBindFailed = 11;
-    kUnknownError = 12;
-  }
-
-  enum WiFiBand : ENUM8 {
-    k2g4 = 0;
-    k3g65 = 1;
-    k5g = 2;
-    k6g = 3;
-    k60g = 4;
-  }
-
-  bitmap NetworkCommissioningFeature : BITMAP32 {
-    kWiFiNetworkInterface = 0x1;
-    kThreadNetworkInterface = 0x2;
-    kEthernetNetworkInterface = 0x4;
-  }
-
-  bitmap WiFiSecurity : BITMAP8 {
-    kUnencrypted = 0x1;
-    kWepPersonal = 0x2;
-    kWpaPersonal = 0x4;
-    kWpa2Personal = 0x8;
-    kWpa3Personal = 0x10;
-  }
-
-  struct NetworkInfo {
-    octet_string<32> networkID = 0;
-    boolean connected = 1;
-  }
-
-  struct WiFiInterfaceScanResult {
-    WiFiSecurity security = 0;
-    octet_string<32> ssid = 1;
-    octet_string<6> bssid = 2;
-    int16u channel = 3;
-    WiFiBand wiFiBand = 4;
-    int8s rssi = 5;
-  }
-
-  struct ThreadInterfaceScanResult {
-    int16u panId = 0;
-    int64u extendedPanId = 1;
-    char_string<16> networkName = 2;
-    int16u channel = 3;
-    int8u version = 4;
-    octet_string<8> extendedAddress = 5;
-    int8s rssi = 6;
-    int8u lqi = 7;
-  }
-
-  readonly attribute access(read: administer) int8u maxNetworks = 0;
-  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
-  readonly attribute int8u scanMaxTimeSeconds = 2;
-  readonly attribute int8u connectMaxTimeSeconds = 3;
-  attribute access(write: administer) boolean interfaceEnabled = 4;
-  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
-  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
-  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct ScanNetworksRequest {
-    optional nullable OCTET_STRING ssid = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct AddOrUpdateWiFiNetworkRequest {
-    OCTET_STRING ssid = 0;
-    OCTET_STRING credentials = 1;
-    optional INT64U breadcrumb = 2;
-  }
-
-  request struct AddOrUpdateThreadNetworkRequest {
-    OCTET_STRING operationalDataset = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct RemoveNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct ConnectNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct ReorderNetworkRequest {
-    OCTET_STRING networkID = 0;
-    INT8U networkIndex = 1;
-    optional INT64U breadcrumb = 2;
-  }
-
-  response struct ScanNetworksResponse = 1 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
-    optional ThreadInterfaceScanResult threadScanResults[] = 3;
-  }
-
-  response struct NetworkConfigResponse = 5 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional INT8U networkIndex = 2;
-  }
-
-  response struct ConnectNetworkResponse = 7 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    nullable INT32S errorValue = 2;
-  }
-
-  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
-  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
-  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
-  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
-  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
-  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
-}
-
-client cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
-  }
-
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
-  }
-
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
-  }
-
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
-  }
-
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
-  }
-
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
-  }
-
-  response struct QueryImageResponse = 1 {
-    OTAQueryStatus status = 0;
-    optional INT32U delayedActionTime = 1;
-    optional CHAR_STRING imageURI = 2;
-    optional INT32U softwareVersion = 3;
-    optional CHAR_STRING softwareVersionString = 4;
-    optional OCTET_STRING updateToken = 5;
-    optional BOOLEAN userConsentNeeded = 6;
-    optional OCTET_STRING metadataForRequestor = 7;
-  }
-
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
-  }
-
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
-server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum OTAAnnouncementReason : ENUM8 {
-    kSimpleAnnouncement = 0;
-    kUpdateAvailable = 1;
-    kUrgentUpdateAvailable = 2;
-  }
-
-  enum OTAChangeReasonEnum : ENUM8 {
-    kUnknown = 0;
-    kSuccess = 1;
-    kFailure = 2;
-    kTimeOut = 3;
-    kDelayByProvider = 4;
-  }
-
-  enum OTAUpdateStateEnum : ENUM8 {
-    kUnknown = 0;
-    kIdle = 1;
-    kQuerying = 2;
-    kDelayedOnQuery = 3;
-    kDownloading = 4;
-    kApplying = 5;
-    kDelayedOnApply = 6;
-    kRollingBack = 7;
-    kDelayedOnUserConsent = 8;
-  }
-
-  struct ProviderLocation {
-    node_id providerNodeID = 1;
-    endpoint_no endpoint = 2;
-    fabric_idx fabricIndex = 254;
-  }
-
-  info event StateTransition = 0 {
-    OTAUpdateStateEnum previousState = 0;
-    OTAUpdateStateEnum newState = 1;
-    OTAChangeReasonEnum reason = 2;
-    nullable INT32U targetSoftwareVersion = 3;
-  }
-
-  critical event VersionApplied = 1 {
-    INT32U softwareVersion = 0;
-    INT16U productID = 1;
-  }
-
-  info event DownloadError = 2 {
-    INT32U softwareVersion = 0;
-    INT64U bytesDownloaded = 1;
-    nullable INT8U progressPercent = 2;
-    nullable INT64S platformCode = 3;
-  }
-
-  attribute ProviderLocation defaultOtaProviders[] = 0;
-  readonly attribute boolean updatePossible = 1;
-  readonly attribute OTAUpdateStateEnum updateState = 2;
-  readonly attribute nullable int8u updateStateProgress = 3;
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
+  }
+
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AnnounceOtaProviderRequest {
-    node_id providerNodeId = 0;
-    vendor_id vendorId = 1;
-    OTAAnnouncementReason announcementReason = 2;
-    optional OCTET_STRING metadataForNode = 3;
-    endpoint_no endpoint = 4;
+  command ResetCounts(): DefaultSuccess = 0;
+}
+
+server cluster Switch = 59 {
+  info event SwitchLatched = 0 {
+    INT8U newPosition = 0;
   }
 
-  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
-}
+  info event InitialPress = 1 {
+    INT8U newPosition = 0;
+  }
 
-server cluster OnOff = 6 {
-  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
-    kFadeToOffIn0p8Seconds = 0;
-    kNoFade = 1;
-    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
+  info event LongPress = 2 {
+    INT8U newPosition = 0;
   }
 
-  enum OnOffDyingLightEffectVariant : ENUM8 {
-    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
+  info event ShortRelease = 3 {
+    INT8U previousPosition = 0;
   }
 
-  enum OnOffEffectIdentifier : ENUM8 {
-    kDelayedAllOff = 0;
-    kDyingLight = 1;
+  info event LongRelease = 4 {
+    INT8U previousPosition = 0;
   }
 
-  enum OnOffStartUpOnOff : ENUM8 {
-    kOff = 0;
-    kOn = 1;
-    kTogglePreviousOnOff = 2;
+  info event MultiPressOngoing = 5 {
+    INT8U newPosition = 0;
+    INT8U currentNumberOfPressesCounted = 1;
   }
 
-  bitmap OnOffControl : BITMAP8 {
-    kAcceptOnlyWhenOn = 0x1;
+  info event MultiPressComplete = 6 {
+    INT8U newPosition = 0;
+    INT8U totalNumberOfPressesCounted = 1;
   }
 
-  bitmap OnOffFeature : BITMAP32 {
-    kLighting = 0x1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
   }
 
-  bitmap SceneFeatures : BITMAP32 {
-    kSceneNames = 0x1;
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
   }
 
-  readonly attribute boolean onOff = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command Off(): DefaultSuccess = 0;
-  command On(): DefaultSuccess = 1;
-  command Toggle(): DefaultSuccess = 2;
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
+  }
+
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+  }
+
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
 server cluster OperationalCredentials = 62 {
@@ -1021,366 +1254,133 @@ server cluster OperationalCredentials = 62 {
     optional OCTET_STRING ICACValue = 1;
     OCTET_STRING IPKValue = 2;
     Int64u caseAdminSubject = 3;
-    VENDOR_ID adminVendorId = 4;
-  }
-
-  request struct UpdateNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
-  }
-
-  request struct UpdateFabricLabelRequest {
-    CHAR_STRING label = 0;
-  }
-
-  request struct RemoveFabricRequest {
-    fabric_idx fabricIndex = 0;
-  }
-
-  request struct AddTrustedRootCertificateRequest {
-    OCTET_STRING rootCertificate = 0;
-  }
-
-  response struct AttestationResponse = 1 {
-    OCTET_STRING attestationElements = 0;
-    OCTET_STRING signature = 1;
-  }
-
-  response struct CertificateChainResponse = 3 {
-    OCTET_STRING certificate = 0;
-  }
-
-  response struct CSRResponse = 5 {
-    OCTET_STRING NOCSRElements = 0;
-    OCTET_STRING attestationSignature = 1;
-  }
-
-  response struct NOCResponse = 8 {
-    OperationalCertStatus statusCode = 0;
-    optional fabric_idx fabricIndex = 1;
-    optional CHAR_STRING debugText = 2;
-  }
-
-  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
-  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
-  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
-  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
-  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
-  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
-  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
-  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-}
-
-server cluster SoftwareDiagnostics = 52 {
-  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
-    kWaterMarks = 0x1;
-  }
-
-  struct ThreadMetrics {
-    int64u id = 0;
-    optional char_string<8> name = 1;
-    optional int32u stackFreeCurrent = 2;
-    optional int32u stackFreeMinimum = 3;
-    optional int32u stackSize = 4;
-  }
-
-  info event SoftwareFault = 0 {
-    SoftwareFaultStruct softwareFault = 0;
-  }
-
-  readonly attribute ThreadMetrics threadMetrics[] = 0;
-  readonly attribute int64u currentHeapFree = 1;
-  readonly attribute int64u currentHeapUsed = 2;
-  readonly attribute int64u currentHeapHighWatermark = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command ResetWatermarks(): DefaultSuccess = 0;
-}
-
-server cluster Switch = 59 {
-  info event SwitchLatched = 0 {
-    INT8U newPosition = 0;
-  }
-
-  info event InitialPress = 1 {
-    INT8U newPosition = 0;
-  }
-
-  info event LongPress = 2 {
-    INT8U newPosition = 0;
-  }
-
-  info event ShortRelease = 3 {
-    INT8U previousPosition = 0;
-  }
-
-  info event LongRelease = 4 {
-    INT8U previousPosition = 0;
-  }
-
-  info event MultiPressOngoing = 5 {
-    INT8U newPosition = 0;
-    INT8U currentNumberOfPressesCounted = 1;
-  }
-
-  info event MultiPressComplete = 6 {
-    INT8U newPosition = 0;
-    INT8U totalNumberOfPressesCounted = 1;
-  }
-
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster ThreadNetworkDiagnostics = 53 {
-  enum NetworkFault : ENUM8 {
-    kUnspecified = 0;
-    kLinkDown = 1;
-    kHardwareFailure = 2;
-    kNetworkJammed = 3;
-  }
-
-  enum RoutingRole : ENUM8 {
-    kUnspecified = 0;
-    kUnassigned = 1;
-    kSleepyEndDevice = 2;
-    kEndDevice = 3;
-    kReed = 4;
-    kRouter = 5;
-    kLeader = 6;
-  }
-
-  enum ThreadConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
-  }
-
-  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
-    kPacketCounts = 0x1;
-    kErrorCounts = 0x2;
-    kMLECounts = 0x4;
-    kMACCounts = 0x8;
-  }
-
-  struct NeighborTable {
-    int64u extAddress = 0;
-    int32u age = 1;
-    int16u rloc16 = 2;
-    int32u linkFrameCounter = 3;
-    int32u mleFrameCounter = 4;
-    int8u lqi = 5;
-    nullable int8s averageRssi = 6;
-    nullable int8s lastRssi = 7;
-    int8u frameErrorRate = 8;
-    int8u messageErrorRate = 9;
-    boolean rxOnWhenIdle = 10;
-    boolean fullThreadDevice = 11;
-    boolean fullNetworkData = 12;
-    boolean isChild = 13;
+    VENDOR_ID adminVendorId = 4;
   }
 
-  struct RouteTable {
-    int64u extAddress = 0;
-    int16u rloc16 = 1;
-    int8u routerId = 2;
-    int8u nextHop = 3;
-    int8u pathCost = 4;
-    int8u LQIIn = 5;
-    int8u LQIOut = 6;
-    int8u age = 7;
-    boolean allocated = 8;
-    boolean linkEstablished = 9;
+  request struct UpdateNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
   }
 
-  struct SecurityPolicy {
-    int16u rotationTime = 0;
-    bitmap16 flags = 1;
+  request struct UpdateFabricLabelRequest {
+    CHAR_STRING label = 0;
   }
 
-  struct OperationalDatasetComponents {
-    boolean activeTimestampPresent = 0;
-    boolean pendingTimestampPresent = 1;
-    boolean masterKeyPresent = 2;
-    boolean networkNamePresent = 3;
-    boolean extendedPanIdPresent = 4;
-    boolean meshLocalPrefixPresent = 5;
-    boolean delayPresent = 6;
-    boolean panIdPresent = 7;
-    boolean channelPresent = 8;
-    boolean pskcPresent = 9;
-    boolean securityPolicyPresent = 10;
-    boolean channelMaskPresent = 11;
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
   }
 
-  info event ConnectionStatus = 0 {
-    ThreadConnectionStatus connectionStatus = 0;
+  request struct AddTrustedRootCertificateRequest {
+    OCTET_STRING rootCertificate = 0;
   }
 
-  readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable RoutingRole routingRole = 1;
-  readonly attribute nullable char_string<16> networkName = 2;
-  readonly attribute nullable int16u panId = 3;
-  readonly attribute nullable int64u extendedPanId = 4;
-  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute NeighborTable neighborTableList[] = 7;
-  readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
-  readonly attribute nullable int8u leaderRouterId = 13;
-  readonly attribute int16u detachedRoleCount = 14;
-  readonly attribute int16u childRoleCount = 15;
-  readonly attribute int16u routerRoleCount = 16;
-  readonly attribute int16u leaderRoleCount = 17;
-  readonly attribute int16u attachAttemptCount = 18;
-  readonly attribute int16u partitionIdChangeCount = 19;
-  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
-  readonly attribute int16u parentChangeCount = 21;
-  readonly attribute int32u txTotalCount = 22;
-  readonly attribute int32u txUnicastCount = 23;
-  readonly attribute int32u txBroadcastCount = 24;
-  readonly attribute int32u txAckRequestedCount = 25;
-  readonly attribute int32u txAckedCount = 26;
-  readonly attribute int32u txNoAckRequestedCount = 27;
-  readonly attribute int32u txDataCount = 28;
-  readonly attribute int32u txDataPollCount = 29;
-  readonly attribute int32u txBeaconCount = 30;
-  readonly attribute int32u txBeaconRequestCount = 31;
-  readonly attribute int32u txOtherCount = 32;
-  readonly attribute int32u txRetryCount = 33;
-  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
-  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
-  readonly attribute int32u txErrCcaCount = 36;
-  readonly attribute int32u txErrAbortCount = 37;
-  readonly attribute int32u txErrBusyChannelCount = 38;
-  readonly attribute int32u rxTotalCount = 39;
-  readonly attribute int32u rxUnicastCount = 40;
-  readonly attribute int32u rxBroadcastCount = 41;
-  readonly attribute int32u rxDataCount = 42;
-  readonly attribute int32u rxDataPollCount = 43;
-  readonly attribute int32u rxBeaconCount = 44;
-  readonly attribute int32u rxBeaconRequestCount = 45;
-  readonly attribute int32u rxOtherCount = 46;
-  readonly attribute int32u rxAddressFilteredCount = 47;
-  readonly attribute int32u rxDestAddrFilteredCount = 48;
-  readonly attribute int32u rxDuplicatedCount = 49;
-  readonly attribute int32u rxErrNoFrameCount = 50;
-  readonly attribute int32u rxErrUnknownNeighborCount = 51;
-  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
-  readonly attribute int32u rxErrSecCount = 53;
-  readonly attribute int32u rxErrFcsCount = 54;
-  readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute nullable int64u activeTimestamp = 56;
-  readonly attribute nullable int64u pendingTimestamp = 57;
-  readonly attribute nullable int32u delay = 58;
-  readonly attribute nullable SecurityPolicy securityPolicy = 59;
-  readonly attribute nullable octet_string<4> channelMask = 60;
-  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
-  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
+  }
 
-  command ResetCounts(): DefaultSuccess = 0;
-}
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
+  }
 
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
   }
 
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
   }
 
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
 }
 
-server cluster UserLabel = 65 {
-  attribute access(write: manage) LabelStruct labelList[] = 0;
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
+  }
+
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCause : ENUM8 {
-    kUnknown = 0;
-    kAssociationFailed = 1;
-    kAuthenticationFailed = 2;
-    kSsidNotFound = 3;
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  enum SecurityType : ENUM8 {
-    kUnspecified = 0;
-    kNone = 1;
-    kWep = 2;
-    kWpa = 3;
-    kWpa2 = 4;
-    kWpa3 = 5;
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  enum WiFiConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  enum WiFiVersionType : ENUM8 {
-    k80211a = 0;
-    k80211b = 1;
-    k80211g = 2;
-    k80211n = 3;
-    k80211ac = 4;
-    k80211ax = 5;
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  info event Disconnection = 0 {
-    INT16U reasonCode = 0;
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  info event AssociationFailure = 1 {
-    AssociationFailureCause associationFailure = 0;
-    INT16U status = 1;
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  info event ConnectionStatus = 2 {
-    WiFiConnectionStatus connectionStatus = 0;
-  }
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
 
-  readonly attribute nullable octet_string<6> bssid = 0;
-  readonly attribute nullable SecurityType securityType = 1;
-  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
-  readonly attribute nullable int16u channelNumber = 3;
-  readonly attribute nullable int8s rssi = 4;
-  readonly attribute int32u beaconLostCount = 5;
-  readonly attribute int32u beaconRxCount = 6;
-  readonly attribute int32u packetMulticastRxCount = 7;
-  readonly attribute int32u packetMulticastTxCount = 8;
-  readonly attribute int32u packetUnicastRxCount = 9;
-  readonly attribute int32u packetUnicastTxCount = 10;
-  readonly attribute int64u currentMaxRate = 11;
-  readonly attribute int64u overrunCount = 12;
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  command ResetCounts(): DefaultSuccess = 0;
+server cluster UserLabel = 65 {
+  attribute access(write: manage) LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
 endpoint 0 {
diff --git a/examples/chef/devices/rootnode_temperaturesensor_19A4msmCzW.matter b/examples/chef/devices/rootnode_temperaturesensor_19A4msmCzW.matter
index 15645692642975..158524848bdb75 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_19A4msmCzW.matter
+++ b/examples/chef/devices/rootnode_temperaturesensor_19A4msmCzW.matter
@@ -6,6 +6,145 @@ struct LabelStruct {
     char_string<16> value = 1;
 }
 
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
+  }
+
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
+  }
+
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
+  }
+
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
+  }
+
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+}
+
+client cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AddGroupRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
+
+  request struct ViewGroupRequest {
+    group_id groupId = 0;
+  }
+
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
+  }
+
+  request struct RemoveGroupRequest {
+    group_id groupId = 0;
+  }
+
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
+
+  response struct AddGroupResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  response struct ViewGroupResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    CHAR_STRING groupName = 2;
+  }
+
+  response struct GetGroupMembershipResponse = 2 {
+    nullable INT8U capacity = 0;
+    group_id groupList[] = 1;
+  }
+
+  response struct RemoveGroupResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
+}
+
+server cluster Descriptor = 29 {
+  struct DeviceType {
+    devtype_id type = 0;
+    int16u revision = 1;
+  }
+
+  readonly attribute DeviceType deviceList[] = 0;
+  readonly attribute CLUSTER_ID serverList[] = 1;
+  readonly attribute CLUSTER_ID clientList[] = 2;
+  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+client cluster Binding = 30 {
+  struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  attribute TargetStruct binding[] = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
 server cluster AccessControl = 31 {
   enum AuthMode : ENUM8 {
     kPase = 1;
@@ -69,42 +208,6 @@ server cluster AccessControl = 31 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
-  }
-
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
-  }
-
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
-  }
-
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-  }
-
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
-
 server cluster Basic = 40 {
   critical event StartUp = 0 {
     INT32U softwareVersion = 0;
@@ -143,102 +246,171 @@ server cluster Basic = 40 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-client cluster Binding = 30 {
-  struct TargetStruct {
-    optional node_id node = 1;
-    optional group_id group = 2;
-    optional endpoint_no endpoint = 3;
-    optional cluster_id cluster = 4;
-    fabric_idx fabricIndex = 254;
+client cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
   }
 
-  attribute TargetStruct binding[] = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
+  }
 
-server cluster Descriptor = 29 {
-  struct DeviceType {
-    devtype_id type = 0;
-    int16u revision = 1;
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
   }
 
-  readonly attribute DeviceType deviceList[] = 0;
-  readonly attribute CLUSTER_ID serverList[] = 1;
-  readonly attribute CLUSTER_ID clientList[] = 2;
-  readonly attribute ENDPOINT_NO partsList[] = 3;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster DiagnosticLogs = 50 {
-  enum LogsIntent : ENUM8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
-  }
 
-  enum LogsStatus : ENUM8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
   }
 
-  enum LogsTransferProtocol : ENUM8 {
-    kResponsePayload = 0;
-    kBdx = 1;
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
   }
 
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct RetrieveLogsRequestRequest {
-    LogsIntent intent = 0;
-    LogsTransferProtocol requestedProtocol = 1;
-    OCTET_STRING transferFileDesignator = 2;
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
   }
 
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+  response struct QueryImageResponse = 1 {
+    OTAQueryStatus status = 0;
+    optional INT32U delayedActionTime = 1;
+    optional CHAR_STRING imageURI = 2;
+    optional INT32U softwareVersion = 3;
+    optional CHAR_STRING softwareVersionString = 4;
+    optional OCTET_STRING updateToken = 5;
+    optional BOOLEAN userConsentNeeded = 6;
+    optional OCTET_STRING metadataForRequestor = 7;
+  }
+
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
+  }
+
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
 }
 
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
+server cluster OtaSoftwareUpdateRequestor = 42 {
+  enum OTAAnnouncementReason : ENUM8 {
+    kSimpleAnnouncement = 0;
+    kUpdateAvailable = 1;
+    kUrgentUpdateAvailable = 2;
   }
 
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
+  enum OTAChangeReasonEnum : ENUM8 {
+    kUnknown = 0;
+    kSuccess = 1;
+    kFailure = 2;
+    kTimeOut = 3;
+    kDelayByProvider = 4;
+  }
+
+  enum OTAUpdateStateEnum : ENUM8 {
+    kUnknown = 0;
+    kIdle = 1;
+    kQuerying = 2;
+    kDelayedOnQuery = 3;
+    kDownloading = 4;
+    kApplying = 5;
+    kDelayedOnApply = 6;
+    kRollingBack = 7;
+    kDelayedOnUserConsent = 8;
+  }
+
+  struct ProviderLocation {
+    node_id providerNodeID = 1;
+    endpoint_no endpoint = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  info event StateTransition = 0 {
+    OTAUpdateStateEnum previousState = 0;
+    OTAUpdateStateEnum newState = 1;
+    OTAChangeReasonEnum reason = 2;
+    nullable INT32U targetSoftwareVersion = 3;
+  }
+
+  critical event VersionApplied = 1 {
+    INT32U softwareVersion = 0;
+    INT16U productID = 1;
+  }
+
+  info event DownloadError = 2 {
+    INT32U softwareVersion = 0;
+    INT64U bytesDownloaded = 1;
+    nullable INT8U progressPercent = 2;
+    nullable INT64S platformCode = 3;
+  }
+
+  attribute ProviderLocation defaultOtaProviders[] = 0;
+  readonly attribute boolean updatePossible = 1;
+  readonly attribute OTAUpdateStateEnum updateState = 2;
+  readonly attribute nullable int8u updateStateProgress = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  request struct AnnounceOtaProviderRequest {
+    node_id providerNodeId = 0;
+    vendor_id vendorId = 1;
+    OTAAnnouncementReason announcementReason = 2;
+    optional OCTET_STRING metadataForNode = 3;
+    endpoint_no endpoint = 4;
+  }
+
+  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
 }
 
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
+server cluster LocalizationConfiguration = 43 {
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
+  }
+
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
+  }
+
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
@@ -301,552 +473,613 @@ server cluster GeneralCommissioning = 48 {
   command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
 }
 
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatus : ENUM8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
   }
 
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
+  enum WiFiBand : ENUM8 {
+    k2g4 = 0;
+    k3g65 = 1;
+    k5g = 2;
+    k6g = 3;
+    k60g = 4;
   }
 
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
+  bitmap NetworkCommissioningFeature : BITMAP32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
   }
 
-  enum NetworkFaultType : ENUM8 {
-    kUnspecified = 0;
-    kHardwareFailure = 1;
-    kNetworkJammed = 2;
-    kConnectionFailed = 3;
+  bitmap WiFiSecurity : BITMAP8 {
+    kUnencrypted = 0x1;
+    kWepPersonal = 0x2;
+    kWpaPersonal = 0x4;
+    kWpa2Personal = 0x8;
+    kWpa3Personal = 0x10;
   }
 
-  enum RadioFaultType : ENUM8 {
-    kUnspecified = 0;
-    kWiFiFault = 1;
-    kCellularFault = 2;
-    kThreadFault = 3;
-    kNFCFault = 4;
-    kBLEFault = 5;
-    kEthernetFault = 6;
+  struct NetworkInfo {
+    octet_string<32> networkID = 0;
+    boolean connected = 1;
   }
 
-  struct NetworkInterfaceType {
-    char_string<32> name = 0;
-    boolean isOperational = 1;
-    nullable boolean offPremiseServicesReachableIPv4 = 2;
-    nullable boolean offPremiseServicesReachableIPv6 = 3;
-    octet_string<8> hardwareAddress = 4;
-    octet_string IPv4Addresses[] = 5;
-    octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+  struct WiFiInterfaceScanResult {
+    WiFiSecurity security = 0;
+    octet_string<32> ssid = 1;
+    octet_string<6> bssid = 2;
+    int16u channel = 3;
+    WiFiBand wiFiBand = 4;
+    int8s rssi = 5;
   }
 
-  critical event HardwareFaultChange = 0 {
-    HardwareFaultType current[] = 0;
-    HardwareFaultType previous[] = 1;
+  struct ThreadInterfaceScanResult {
+    int16u panId = 0;
+    int64u extendedPanId = 1;
+    char_string<16> networkName = 2;
+    int16u channel = 3;
+    int8u version = 4;
+    octet_string<8> extendedAddress = 5;
+    int8s rssi = 6;
+    int8u lqi = 7;
   }
 
-  critical event RadioFaultChange = 1 {
-    RadioFaultType current[] = 0;
-    RadioFaultType previous[] = 1;
+  readonly attribute access(read: administer) int8u maxNetworks = 0;
+  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
+  readonly attribute int8u scanMaxTimeSeconds = 2;
+  readonly attribute int8u connectMaxTimeSeconds = 3;
+  attribute access(write: administer) boolean interfaceEnabled = 4;
+  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
+  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
+  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ScanNetworksRequest {
+    optional nullable OCTET_STRING ssid = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
-  }
-
-  critical event BootReason = 3 {
-    BootReasonType bootReason = 0;
+  request struct AddOrUpdateWiFiNetworkRequest {
+    OCTET_STRING ssid = 0;
+    OCTET_STRING credentials = 1;
+    optional INT64U breadcrumb = 2;
   }
 
-  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
-  readonly attribute int16u rebootCount = 1;
-  readonly attribute int64u upTime = 2;
-  readonly attribute int32u totalOperationalHours = 3;
-  readonly attribute enum8 bootReasons = 4;
-  readonly attribute ENUM8 activeHardwareFaults[] = 5;
-  readonly attribute ENUM8 activeRadioFaults[] = 6;
-  readonly attribute ENUM8 activeNetworkFaults[] = 7;
-  readonly attribute boolean testEventTriggersEnabled = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct TestEventTriggerRequest {
-    OCTET_STRING enableKey = 0;
-    INT64U eventTrigger = 1;
+  request struct AddOrUpdateThreadNetworkRequest {
+    OCTET_STRING operationalDataset = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
-}
-
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
+  request struct RemoveNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
-    fabric_idx fabricIndex = 254;
+  request struct ConnectNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
+  request struct ReorderNetworkRequest {
+    OCTET_STRING networkID = 0;
+    INT8U networkIndex = 1;
+    optional INT64U breadcrumb = 2;
   }
 
-  struct GroupKeySetStruct {
-    int16u groupKeySetID = 0;
-    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
-    nullable octet_string<16> epochKey0 = 2;
-    nullable epoch_us epochStartTime0 = 3;
-    nullable octet_string<16> epochKey1 = 4;
-    nullable epoch_us epochStartTime1 = 5;
-    nullable octet_string<16> epochKey2 = 6;
-    nullable epoch_us epochStartTime2 = 7;
+  response struct ScanNetworksResponse = 1 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
+    optional ThreadInterfaceScanResult threadScanResults[] = 3;
   }
 
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
-  readonly attribute int16u maxGroupsPerFabric = 2;
-  readonly attribute int16u maxGroupKeysPerFabric = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct KeySetWriteRequest {
-    GroupKeySetStruct groupKeySet = 0;
+  response struct NetworkConfigResponse = 5 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional INT8U networkIndex = 2;
   }
 
-  request struct KeySetReadRequest {
-    INT16U groupKeySetID = 0;
+  response struct ConnectNetworkResponse = 7 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    nullable INT32S errorValue = 2;
   }
 
-  request struct KeySetRemoveRequest {
-    INT16U groupKeySetID = 0;
-  }
+  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
+  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
+  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
+  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
+  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
+  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+}
 
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
+server cluster DiagnosticLogs = 50 {
+  enum LogsIntent : ENUM8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
   }
 
-  response struct KeySetReadResponse = 2 {
-    GroupKeySetStruct groupKeySet = 0;
+  enum LogsStatus : ENUM8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
   }
 
-  response struct KeySetReadAllIndicesResponse = 5 {
-    INT16U groupKeySetIDs[] = 0;
+  enum LogsTransferProtocol : ENUM8 {
+    kResponsePayload = 0;
+    kBdx = 1;
   }
 
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
-}
-
-client cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AddGroupRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+  request struct RetrieveLogsRequestRequest {
+    LogsIntent intent = 0;
+    LogsTransferProtocol requestedProtocol = 1;
+    OCTET_STRING transferFileDesignator = 2;
   }
 
-  request struct ViewGroupRequest {
-    group_id groupId = 0;
-  }
+  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+}
 
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
   }
 
-  request struct RemoveGroupRequest {
-    group_id groupId = 0;
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
   }
 
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
   }
 
-  response struct AddGroupResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
   }
 
-  response struct ViewGroupResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    CHAR_STRING groupName = 2;
+  enum RadioFaultType : ENUM8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
   }
 
-  response struct GetGroupMembershipResponse = 2 {
-    nullable INT8U capacity = 0;
-    group_id groupList[] = 1;
+  struct NetworkInterfaceType {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceType type = 7;
   }
 
-  response struct RemoveGroupResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultType current[] = 0;
+    HardwareFaultType previous[] = 1;
   }
 
-  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
-}
-
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
+  critical event RadioFaultChange = 1 {
+    RadioFaultType current[] = 0;
+    RadioFaultType previous[] = 1;
   }
 
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultType current[] = 0;
+    NetworkFaultType previous[] = 1;
   }
 
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
+  critical event BootReason = 3 {
+    BootReasonType bootReason = 0;
   }
 
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
+  readonly attribute int32u totalOperationalHours = 3;
+  readonly attribute enum8 bootReasons = 4;
+  readonly attribute ENUM8 activeHardwareFaults[] = 5;
+  readonly attribute ENUM8 activeRadioFaults[] = 6;
+  readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
   }
 
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
-}
-
-server cluster LocalizationConfiguration = 43 {
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
-server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatus : ENUM8 {
-    kSuccess = 0;
-    kOutOfRange = 1;
-    kBoundsExceeded = 2;
-    kNetworkIDNotFound = 3;
-    kDuplicateNetworkID = 4;
-    kNetworkNotFound = 5;
-    kRegulatoryError = 6;
-    kAuthFailure = 7;
-    kUnsupportedSecurity = 8;
-    kOtherConnectionFailure = 9;
-    kIPV6Failed = 10;
-    kIPBindFailed = 11;
-    kUnknownError = 12;
+server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
   }
 
-  enum WiFiBand : ENUM8 {
-    k2g4 = 0;
-    k3g65 = 1;
-    k5g = 2;
-    k6g = 3;
-    k60g = 4;
+  struct ThreadMetrics {
+    int64u id = 0;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
-  bitmap NetworkCommissioningFeature : BITMAP32 {
-    kWiFiNetworkInterface = 0x1;
-    kThreadNetworkInterface = 0x2;
-    kEthernetNetworkInterface = 0x4;
+  info event SoftwareFault = 0 {
+    SoftwareFaultStruct softwareFault = 0;
   }
 
-  bitmap WiFiSecurity : BITMAP8 {
-    kUnencrypted = 0x1;
-    kWepPersonal = 0x2;
-    kWpaPersonal = 0x4;
-    kWpa2Personal = 0x8;
-    kWpa3Personal = 0x10;
-  }
+  readonly attribute ThreadMetrics threadMetrics[] = 0;
+  readonly attribute int64u currentHeapFree = 1;
+  readonly attribute int64u currentHeapUsed = 2;
+  readonly attribute int64u currentHeapHighWatermark = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  struct NetworkInfo {
-    octet_string<32> networkID = 0;
-    boolean connected = 1;
-  }
+  command ResetWatermarks(): DefaultSuccess = 0;
+}
 
-  struct WiFiInterfaceScanResult {
-    WiFiSecurity security = 0;
-    octet_string<32> ssid = 1;
-    octet_string<6> bssid = 2;
-    int16u channel = 3;
-    WiFiBand wiFiBand = 4;
-    int8s rssi = 5;
+server cluster ThreadNetworkDiagnostics = 53 {
+  enum NetworkFault : ENUM8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
   }
 
-  struct ThreadInterfaceScanResult {
-    int16u panId = 0;
-    int64u extendedPanId = 1;
-    char_string<16> networkName = 2;
-    int16u channel = 3;
-    int8u version = 4;
-    octet_string<8> extendedAddress = 5;
-    int8s rssi = 6;
-    int8u lqi = 7;
+  enum RoutingRole : ENUM8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kReed = 4;
+    kRouter = 5;
+    kLeader = 6;
   }
 
-  readonly attribute access(read: administer) int8u maxNetworks = 0;
-  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
-  readonly attribute int8u scanMaxTimeSeconds = 2;
-  readonly attribute int8u connectMaxTimeSeconds = 3;
-  attribute access(write: administer) boolean interfaceEnabled = 4;
-  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
-  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
-  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  enum ThreadConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
+  }
 
-  request struct ScanNetworksRequest {
-    optional nullable OCTET_STRING ssid = 0;
-    optional INT64U breadcrumb = 1;
+  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+    kMLECounts = 0x4;
+    kMACCounts = 0x8;
   }
 
-  request struct AddOrUpdateWiFiNetworkRequest {
-    OCTET_STRING ssid = 0;
-    OCTET_STRING credentials = 1;
-    optional INT64U breadcrumb = 2;
+  struct NeighborTable {
+    int64u extAddress = 0;
+    int32u age = 1;
+    int16u rloc16 = 2;
+    int32u linkFrameCounter = 3;
+    int32u mleFrameCounter = 4;
+    int8u lqi = 5;
+    nullable int8s averageRssi = 6;
+    nullable int8s lastRssi = 7;
+    int8u frameErrorRate = 8;
+    int8u messageErrorRate = 9;
+    boolean rxOnWhenIdle = 10;
+    boolean fullThreadDevice = 11;
+    boolean fullNetworkData = 12;
+    boolean isChild = 13;
   }
 
-  request struct AddOrUpdateThreadNetworkRequest {
-    OCTET_STRING operationalDataset = 0;
-    optional INT64U breadcrumb = 1;
+  struct RouteTable {
+    int64u extAddress = 0;
+    int16u rloc16 = 1;
+    int8u routerId = 2;
+    int8u nextHop = 3;
+    int8u pathCost = 4;
+    int8u LQIIn = 5;
+    int8u LQIOut = 6;
+    int8u age = 7;
+    boolean allocated = 8;
+    boolean linkEstablished = 9;
   }
 
-  request struct RemoveNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
+  struct SecurityPolicy {
+    int16u rotationTime = 0;
+    bitmap16 flags = 1;
   }
 
-  request struct ConnectNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
+  struct OperationalDatasetComponents {
+    boolean activeTimestampPresent = 0;
+    boolean pendingTimestampPresent = 1;
+    boolean masterKeyPresent = 2;
+    boolean networkNamePresent = 3;
+    boolean extendedPanIdPresent = 4;
+    boolean meshLocalPrefixPresent = 5;
+    boolean delayPresent = 6;
+    boolean panIdPresent = 7;
+    boolean channelPresent = 8;
+    boolean pskcPresent = 9;
+    boolean securityPolicyPresent = 10;
+    boolean channelMaskPresent = 11;
   }
 
-  request struct ReorderNetworkRequest {
-    OCTET_STRING networkID = 0;
-    INT8U networkIndex = 1;
-    optional INT64U breadcrumb = 2;
+  info event ConnectionStatus = 0 {
+    ThreadConnectionStatus connectionStatus = 0;
   }
 
-  response struct ScanNetworksResponse = 1 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
-    optional ThreadInterfaceScanResult threadScanResults[] = 3;
+  readonly attribute nullable int16u channel = 0;
+  readonly attribute nullable RoutingRole routingRole = 1;
+  readonly attribute nullable char_string<16> networkName = 2;
+  readonly attribute nullable int16u panId = 3;
+  readonly attribute nullable int64u extendedPanId = 4;
+  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute NeighborTable neighborTableList[] = 7;
+  readonly attribute RouteTable routeTableList[] = 8;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
+  readonly attribute int16u detachedRoleCount = 14;
+  readonly attribute int16u childRoleCount = 15;
+  readonly attribute int16u routerRoleCount = 16;
+  readonly attribute int16u leaderRoleCount = 17;
+  readonly attribute int16u attachAttemptCount = 18;
+  readonly attribute int16u partitionIdChangeCount = 19;
+  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
+  readonly attribute int16u parentChangeCount = 21;
+  readonly attribute int32u txTotalCount = 22;
+  readonly attribute int32u txUnicastCount = 23;
+  readonly attribute int32u txBroadcastCount = 24;
+  readonly attribute int32u txAckRequestedCount = 25;
+  readonly attribute int32u txAckedCount = 26;
+  readonly attribute int32u txNoAckRequestedCount = 27;
+  readonly attribute int32u txDataCount = 28;
+  readonly attribute int32u txDataPollCount = 29;
+  readonly attribute int32u txBeaconCount = 30;
+  readonly attribute int32u txBeaconRequestCount = 31;
+  readonly attribute int32u txOtherCount = 32;
+  readonly attribute int32u txRetryCount = 33;
+  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
+  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
+  readonly attribute int32u txErrCcaCount = 36;
+  readonly attribute int32u txErrAbortCount = 37;
+  readonly attribute int32u txErrBusyChannelCount = 38;
+  readonly attribute int32u rxTotalCount = 39;
+  readonly attribute int32u rxUnicastCount = 40;
+  readonly attribute int32u rxBroadcastCount = 41;
+  readonly attribute int32u rxDataCount = 42;
+  readonly attribute int32u rxDataPollCount = 43;
+  readonly attribute int32u rxBeaconCount = 44;
+  readonly attribute int32u rxBeaconRequestCount = 45;
+  readonly attribute int32u rxOtherCount = 46;
+  readonly attribute int32u rxAddressFilteredCount = 47;
+  readonly attribute int32u rxDestAddrFilteredCount = 48;
+  readonly attribute int32u rxDuplicatedCount = 49;
+  readonly attribute int32u rxErrNoFrameCount = 50;
+  readonly attribute int32u rxErrUnknownNeighborCount = 51;
+  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
+  readonly attribute int32u rxErrSecCount = 53;
+  readonly attribute int32u rxErrFcsCount = 54;
+  readonly attribute int32u rxErrOtherCount = 55;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
+  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command ResetCounts(): DefaultSuccess = 0;
+}
+
+server cluster WiFiNetworkDiagnostics = 54 {
+  enum AssociationFailureCause : ENUM8 {
+    kUnknown = 0;
+    kAssociationFailed = 1;
+    kAuthenticationFailed = 2;
+    kSsidNotFound = 3;
   }
 
-  response struct NetworkConfigResponse = 5 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional INT8U networkIndex = 2;
+  enum SecurityType : ENUM8 {
+    kUnspecified = 0;
+    kNone = 1;
+    kWep = 2;
+    kWpa = 3;
+    kWpa2 = 4;
+    kWpa3 = 5;
   }
 
-  response struct ConnectNetworkResponse = 7 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    nullable INT32S errorValue = 2;
+  enum WiFiConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
-  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
-  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
-  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
-  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
-  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
-}
+  enum WiFiVersionType : ENUM8 {
+    k80211a = 0;
+    k80211b = 1;
+    k80211g = 2;
+    k80211n = 3;
+    k80211ac = 4;
+    k80211ax = 5;
+  }
 
-client cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
+  info event Disconnection = 0 {
+    INT16U reasonCode = 0;
   }
 
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
+  info event AssociationFailure = 1 {
+    AssociationFailureCause associationFailure = 0;
+    INT16U status = 1;
   }
 
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
+  info event ConnectionStatus = 2 {
+    WiFiConnectionStatus connectionStatus = 0;
   }
 
+  readonly attribute nullable octet_string<6> bssid = 0;
+  readonly attribute nullable SecurityType securityType = 1;
+  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
+  readonly attribute nullable int16u channelNumber = 3;
+  readonly attribute nullable int8s rssi = 4;
+  readonly attribute int32u beaconLostCount = 5;
+  readonly attribute int32u beaconRxCount = 6;
+  readonly attribute int32u packetMulticastRxCount = 7;
+  readonly attribute int32u packetMulticastTxCount = 8;
+  readonly attribute int32u packetUnicastRxCount = 9;
+  readonly attribute int32u packetUnicastTxCount = 10;
+  readonly attribute int64u currentMaxRate = 11;
+  readonly attribute int64u overrunCount = 12;
+  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
-  }
+  command ResetCounts(): DefaultSuccess = 0;
+}
 
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
   }
 
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
-  }
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  response struct QueryImageResponse = 1 {
-    OTAQueryStatus status = 0;
-    optional INT32U delayedActionTime = 1;
-    optional CHAR_STRING imageURI = 2;
-    optional INT32U softwareVersion = 3;
-    optional CHAR_STRING softwareVersionString = 4;
-    optional OCTET_STRING updateToken = 5;
-    optional BOOLEAN userConsentNeeded = 6;
-    optional OCTET_STRING metadataForRequestor = 7;
-  }
+  command ResetCounts(): DefaultSuccess = 0;
+}
 
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
+server cluster Switch = 59 {
+  info event SwitchLatched = 0 {
+    INT8U newPosition = 0;
   }
 
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
-}
+  info event InitialPress = 1 {
+    INT8U newPosition = 0;
+  }
 
-server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum OTAAnnouncementReason : ENUM8 {
-    kSimpleAnnouncement = 0;
-    kUpdateAvailable = 1;
-    kUrgentUpdateAvailable = 2;
+  info event LongPress = 2 {
+    INT8U newPosition = 0;
   }
 
-  enum OTAChangeReasonEnum : ENUM8 {
-    kUnknown = 0;
-    kSuccess = 1;
-    kFailure = 2;
-    kTimeOut = 3;
-    kDelayByProvider = 4;
+  info event ShortRelease = 3 {
+    INT8U previousPosition = 0;
   }
 
-  enum OTAUpdateStateEnum : ENUM8 {
-    kUnknown = 0;
-    kIdle = 1;
-    kQuerying = 2;
-    kDelayedOnQuery = 3;
-    kDownloading = 4;
-    kApplying = 5;
-    kDelayedOnApply = 6;
-    kRollingBack = 7;
-    kDelayedOnUserConsent = 8;
+  info event LongRelease = 4 {
+    INT8U previousPosition = 0;
   }
 
-  struct ProviderLocation {
-    node_id providerNodeID = 1;
-    endpoint_no endpoint = 2;
-    fabric_idx fabricIndex = 254;
+  info event MultiPressOngoing = 5 {
+    INT8U newPosition = 0;
+    INT8U currentNumberOfPressesCounted = 1;
   }
 
-  info event StateTransition = 0 {
-    OTAUpdateStateEnum previousState = 0;
-    OTAUpdateStateEnum newState = 1;
-    OTAChangeReasonEnum reason = 2;
-    nullable INT32U targetSoftwareVersion = 3;
+  info event MultiPressComplete = 6 {
+    INT8U newPosition = 0;
+    INT8U totalNumberOfPressesCounted = 1;
   }
 
-  critical event VersionApplied = 1 {
-    INT32U softwareVersion = 0;
-    INT16U productID = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
   }
 
-  info event DownloadError = 2 {
-    INT32U softwareVersion = 0;
-    INT64U bytesDownloaded = 1;
-    nullable INT8U progressPercent = 2;
-    nullable INT64S platformCode = 3;
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
   }
 
-  attribute ProviderLocation defaultOtaProviders[] = 0;
-  readonly attribute boolean updatePossible = 1;
-  readonly attribute OTAUpdateStateEnum updateState = 2;
-  readonly attribute nullable int8u updateStateProgress = 3;
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AnnounceOtaProviderRequest {
-    node_id providerNodeId = 0;
-    vendor_id vendorId = 1;
-    OTAAnnouncementReason announcementReason = 2;
-    optional OCTET_STRING metadataForNode = 3;
-    endpoint_no endpoint = 4;
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
   }
 
-  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+  }
+
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
 server cluster OperationalCredentials = 62 {
@@ -917,366 +1150,133 @@ server cluster OperationalCredentials = 62 {
   request struct UpdateFabricLabelRequest {
     CHAR_STRING label = 0;
   }
-
-  request struct RemoveFabricRequest {
-    fabric_idx fabricIndex = 0;
-  }
-
-  request struct AddTrustedRootCertificateRequest {
-    OCTET_STRING rootCertificate = 0;
-  }
-
-  response struct AttestationResponse = 1 {
-    OCTET_STRING attestationElements = 0;
-    OCTET_STRING signature = 1;
-  }
-
-  response struct CertificateChainResponse = 3 {
-    OCTET_STRING certificate = 0;
-  }
-
-  response struct CSRResponse = 5 {
-    OCTET_STRING NOCSRElements = 0;
-    OCTET_STRING attestationSignature = 1;
-  }
-
-  response struct NOCResponse = 8 {
-    OperationalCertStatus statusCode = 0;
-    optional fabric_idx fabricIndex = 1;
-    optional CHAR_STRING debugText = 2;
-  }
-
-  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
-  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
-  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
-  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
-  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
-  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
-  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
-  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-}
-
-server cluster SoftwareDiagnostics = 52 {
-  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
-    kWaterMarks = 0x1;
-  }
-
-  struct ThreadMetrics {
-    int64u id = 0;
-    optional char_string<8> name = 1;
-    optional int32u stackFreeCurrent = 2;
-    optional int32u stackFreeMinimum = 3;
-    optional int32u stackSize = 4;
-  }
-
-  info event SoftwareFault = 0 {
-    SoftwareFaultStruct softwareFault = 0;
-  }
-
-  readonly attribute ThreadMetrics threadMetrics[] = 0;
-  readonly attribute int64u currentHeapFree = 1;
-  readonly attribute int64u currentHeapUsed = 2;
-  readonly attribute int64u currentHeapHighWatermark = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command ResetWatermarks(): DefaultSuccess = 0;
-}
-
-server cluster Switch = 59 {
-  info event SwitchLatched = 0 {
-    INT8U newPosition = 0;
-  }
-
-  info event InitialPress = 1 {
-    INT8U newPosition = 0;
-  }
-
-  info event LongPress = 2 {
-    INT8U newPosition = 0;
-  }
-
-  info event ShortRelease = 3 {
-    INT8U previousPosition = 0;
-  }
-
-  info event LongRelease = 4 {
-    INT8U previousPosition = 0;
-  }
-
-  info event MultiPressOngoing = 5 {
-    INT8U newPosition = 0;
-    INT8U currentNumberOfPressesCounted = 1;
-  }
-
-  info event MultiPressComplete = 6 {
-    INT8U newPosition = 0;
-    INT8U totalNumberOfPressesCounted = 1;
-  }
-
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster ThreadNetworkDiagnostics = 53 {
-  enum NetworkFault : ENUM8 {
-    kUnspecified = 0;
-    kLinkDown = 1;
-    kHardwareFailure = 2;
-    kNetworkJammed = 3;
-  }
-
-  enum RoutingRole : ENUM8 {
-    kUnspecified = 0;
-    kUnassigned = 1;
-    kSleepyEndDevice = 2;
-    kEndDevice = 3;
-    kReed = 4;
-    kRouter = 5;
-    kLeader = 6;
-  }
-
-  enum ThreadConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
-  }
-
-  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
-    kPacketCounts = 0x1;
-    kErrorCounts = 0x2;
-    kMLECounts = 0x4;
-    kMACCounts = 0x8;
-  }
-
-  struct NeighborTable {
-    int64u extAddress = 0;
-    int32u age = 1;
-    int16u rloc16 = 2;
-    int32u linkFrameCounter = 3;
-    int32u mleFrameCounter = 4;
-    int8u lqi = 5;
-    nullable int8s averageRssi = 6;
-    nullable int8s lastRssi = 7;
-    int8u frameErrorRate = 8;
-    int8u messageErrorRate = 9;
-    boolean rxOnWhenIdle = 10;
-    boolean fullThreadDevice = 11;
-    boolean fullNetworkData = 12;
-    boolean isChild = 13;
+
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
   }
 
-  struct RouteTable {
-    int64u extAddress = 0;
-    int16u rloc16 = 1;
-    int8u routerId = 2;
-    int8u nextHop = 3;
-    int8u pathCost = 4;
-    int8u LQIIn = 5;
-    int8u LQIOut = 6;
-    int8u age = 7;
-    boolean allocated = 8;
-    boolean linkEstablished = 9;
+  request struct AddTrustedRootCertificateRequest {
+    OCTET_STRING rootCertificate = 0;
   }
 
-  struct SecurityPolicy {
-    int16u rotationTime = 0;
-    bitmap16 flags = 1;
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
   }
 
-  struct OperationalDatasetComponents {
-    boolean activeTimestampPresent = 0;
-    boolean pendingTimestampPresent = 1;
-    boolean masterKeyPresent = 2;
-    boolean networkNamePresent = 3;
-    boolean extendedPanIdPresent = 4;
-    boolean meshLocalPrefixPresent = 5;
-    boolean delayPresent = 6;
-    boolean panIdPresent = 7;
-    boolean channelPresent = 8;
-    boolean pskcPresent = 9;
-    boolean securityPolicyPresent = 10;
-    boolean channelMaskPresent = 11;
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
   }
 
-  info event ConnectionStatus = 0 {
-    ThreadConnectionStatus connectionStatus = 0;
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
   }
 
-  readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable RoutingRole routingRole = 1;
-  readonly attribute nullable char_string<16> networkName = 2;
-  readonly attribute nullable int16u panId = 3;
-  readonly attribute nullable int64u extendedPanId = 4;
-  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute NeighborTable neighborTableList[] = 7;
-  readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
-  readonly attribute nullable int8u leaderRouterId = 13;
-  readonly attribute int16u detachedRoleCount = 14;
-  readonly attribute int16u childRoleCount = 15;
-  readonly attribute int16u routerRoleCount = 16;
-  readonly attribute int16u leaderRoleCount = 17;
-  readonly attribute int16u attachAttemptCount = 18;
-  readonly attribute int16u partitionIdChangeCount = 19;
-  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
-  readonly attribute int16u parentChangeCount = 21;
-  readonly attribute int32u txTotalCount = 22;
-  readonly attribute int32u txUnicastCount = 23;
-  readonly attribute int32u txBroadcastCount = 24;
-  readonly attribute int32u txAckRequestedCount = 25;
-  readonly attribute int32u txAckedCount = 26;
-  readonly attribute int32u txNoAckRequestedCount = 27;
-  readonly attribute int32u txDataCount = 28;
-  readonly attribute int32u txDataPollCount = 29;
-  readonly attribute int32u txBeaconCount = 30;
-  readonly attribute int32u txBeaconRequestCount = 31;
-  readonly attribute int32u txOtherCount = 32;
-  readonly attribute int32u txRetryCount = 33;
-  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
-  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
-  readonly attribute int32u txErrCcaCount = 36;
-  readonly attribute int32u txErrAbortCount = 37;
-  readonly attribute int32u txErrBusyChannelCount = 38;
-  readonly attribute int32u rxTotalCount = 39;
-  readonly attribute int32u rxUnicastCount = 40;
-  readonly attribute int32u rxBroadcastCount = 41;
-  readonly attribute int32u rxDataCount = 42;
-  readonly attribute int32u rxDataPollCount = 43;
-  readonly attribute int32u rxBeaconCount = 44;
-  readonly attribute int32u rxBeaconRequestCount = 45;
-  readonly attribute int32u rxOtherCount = 46;
-  readonly attribute int32u rxAddressFilteredCount = 47;
-  readonly attribute int32u rxDestAddrFilteredCount = 48;
-  readonly attribute int32u rxDuplicatedCount = 49;
-  readonly attribute int32u rxErrNoFrameCount = 50;
-  readonly attribute int32u rxErrUnknownNeighborCount = 51;
-  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
-  readonly attribute int32u rxErrSecCount = 53;
-  readonly attribute int32u rxErrFcsCount = 54;
-  readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute nullable int64u activeTimestamp = 56;
-  readonly attribute nullable int64u pendingTimestamp = 57;
-  readonly attribute nullable int32u delay = 58;
-  readonly attribute nullable SecurityPolicy securityPolicy = 59;
-  readonly attribute nullable octet_string<4> channelMask = 60;
-  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
-  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
+  }
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
 }
 
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
   }
 
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
 
-server cluster UserLabel = 65 {
-  attribute access(write: manage) LabelStruct labelList[] = 0;
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCause : ENUM8 {
-    kUnknown = 0;
-    kAssociationFailed = 1;
-    kAuthenticationFailed = 2;
-    kSsidNotFound = 3;
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  enum SecurityType : ENUM8 {
-    kUnspecified = 0;
-    kNone = 1;
-    kWep = 2;
-    kWpa = 3;
-    kWpa2 = 4;
-    kWpa3 = 5;
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  enum WiFiConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  enum WiFiVersionType : ENUM8 {
-    k80211a = 0;
-    k80211b = 1;
-    k80211g = 2;
-    k80211n = 3;
-    k80211ac = 4;
-    k80211ax = 5;
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  info event Disconnection = 0 {
-    INT16U reasonCode = 0;
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  info event AssociationFailure = 1 {
-    AssociationFailureCause associationFailure = 0;
-    INT16U status = 1;
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  info event ConnectionStatus = 2 {
-    WiFiConnectionStatus connectionStatus = 0;
-  }
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
 
-  readonly attribute nullable octet_string<6> bssid = 0;
-  readonly attribute nullable SecurityType securityType = 1;
-  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
-  readonly attribute nullable int16u channelNumber = 3;
-  readonly attribute nullable int8s rssi = 4;
-  readonly attribute int32u beaconLostCount = 5;
-  readonly attribute int32u beaconRxCount = 6;
-  readonly attribute int32u packetMulticastRxCount = 7;
-  readonly attribute int32u packetMulticastTxCount = 8;
-  readonly attribute int32u packetUnicastRxCount = 9;
-  readonly attribute int32u packetUnicastTxCount = 10;
-  readonly attribute int64u currentMaxRate = 11;
-  readonly attribute int64u overrunCount = 12;
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster UserLabel = 65 {
+  attribute access(write: manage) LabelStruct labelList[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  command ResetCounts(): DefaultSuccess = 0;
+server cluster TemperatureMeasurement = 1026 {
+  readonly attribute nullable int16s measuredValue = 0;
+  readonly attribute nullable int16s minMeasuredValue = 1;
+  readonly attribute nullable int16s maxMeasuredValue = 2;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
 endpoint 0 {
diff --git a/examples/chef/devices/rootnode_thermostat_dtbxxgX9aj.matter b/examples/chef/devices/rootnode_thermostat_dtbxxgX9aj.matter
index ff90c82dbe6a32..b5edc83c1ea69a 100644
--- a/examples/chef/devices/rootnode_thermostat_dtbxxgX9aj.matter
+++ b/examples/chef/devices/rootnode_thermostat_dtbxxgX9aj.matter
@@ -6,6 +6,255 @@ struct LabelStruct {
     char_string<16> value = 1;
 }
 
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
+  }
+
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
+  }
+
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
+  }
+
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
+  }
+
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+}
+
+server cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AddGroupRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
+
+  request struct ViewGroupRequest {
+    group_id groupId = 0;
+  }
+
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
+  }
+
+  request struct RemoveGroupRequest {
+    group_id groupId = 0;
+  }
+
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
+
+  response struct AddGroupResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  response struct ViewGroupResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    CHAR_STRING groupName = 2;
+  }
+
+  response struct GetGroupMembershipResponse = 2 {
+    nullable INT8U capacity = 0;
+    group_id groupList[] = 1;
+  }
+
+  response struct RemoveGroupResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
+}
+
+server cluster Scenes = 5 {
+  bitmap ScenesCopyMode : BITMAP8 {
+    kCopyAllScenes = 0x1;
+  }
+
+  struct ExtensionFieldSet {
+    cluster_id clusterId = 0;
+    AttributeValuePair attributeValueList[] = 1;
+  }
+
+  struct AttributeValuePair {
+    optional attrib_id attributeId = 0;
+    int8u attributeValue[] = 1;
+  }
+
+  readonly attribute int8u sceneCount = 0;
+  readonly attribute int8u currentScene = 1;
+  readonly attribute group_id currentGroup = 2;
+  readonly attribute boolean sceneValid = 3;
+  readonly attribute bitmap8 nameSupport = 4;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AddSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    INT16U transitionTime = 2;
+    CHAR_STRING sceneName = 3;
+    ExtensionFieldSet extensionFieldSets[] = 4;
+  }
+
+  request struct ViewSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+  }
+
+  request struct RemoveSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+  }
+
+  request struct RemoveAllScenesRequest {
+    group_id groupId = 0;
+  }
+
+  request struct StoreSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+  }
+
+  request struct RecallSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    optional nullable INT16U transitionTime = 2;
+  }
+
+  request struct GetSceneMembershipRequest {
+    group_id groupId = 0;
+  }
+
+  response struct AddSceneResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+  }
+
+  response struct ViewSceneResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+    optional INT16U transitionTime = 3;
+    optional CHAR_STRING sceneName = 4;
+    optional ExtensionFieldSet extensionFieldSets[] = 5;
+  }
+
+  response struct RemoveSceneResponse = 2 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+  }
+
+  response struct RemoveAllScenesResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  response struct StoreSceneResponse = 4 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+  }
+
+  response struct GetSceneMembershipResponse = 6 {
+    ENUM8 status = 0;
+    nullable INT8U capacity = 1;
+    group_id groupId = 2;
+    optional INT8U sceneList[] = 3;
+  }
+
+  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
+  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
+  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
+  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
+  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
+  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
+  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
+}
+
+server cluster Alarms = 9 {
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Descriptor = 29 {
+  struct DeviceType {
+    devtype_id type = 0;
+    int16u revision = 1;
+  }
+
+  readonly attribute DeviceType deviceList[] = 0;
+  readonly attribute CLUSTER_ID serverList[] = 1;
+  readonly attribute CLUSTER_ID clientList[] = 2;
+  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+client cluster Binding = 30 {
+  struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  attribute TargetStruct binding[] = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
 server cluster AccessControl = 31 {
   enum AuthMode : ENUM8 {
     kPase = 1;
@@ -69,50 +318,6 @@ server cluster AccessControl = 31 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
-  }
-
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
-  }
-
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
-  }
-
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-  }
-
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
-
-server cluster Alarms = 9 {
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
 server cluster Basic = 40 {
   critical event StartUp = 0 {
     INT32U softwareVersion = 0;
@@ -151,162 +356,186 @@ server cluster Basic = 40 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-client cluster Binding = 30 {
-  struct TargetStruct {
-    optional node_id node = 1;
-    optional group_id group = 2;
-    optional endpoint_no endpoint = 3;
-    optional cluster_id cluster = 4;
-    fabric_idx fabricIndex = 254;
+client cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
   }
 
-  attribute TargetStruct binding[] = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
+  }
 
-server cluster Descriptor = 29 {
-  struct DeviceType {
-    devtype_id type = 0;
-    int16u revision = 1;
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
   }
 
-  readonly attribute DeviceType deviceList[] = 0;
-  readonly attribute CLUSTER_ID serverList[] = 1;
-  readonly attribute CLUSTER_ID clientList[] = 2;
-  readonly attribute ENDPOINT_NO partsList[] = 3;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster DiagnosticLogs = 50 {
-  enum LogsIntent : ENUM8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
   }
 
-  enum LogsStatus : ENUM8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
   }
 
-  enum LogsTransferProtocol : ENUM8 {
-    kResponsePayload = 0;
-    kBdx = 1;
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
   }
 
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  response struct QueryImageResponse = 1 {
+    OTAQueryStatus status = 0;
+    optional INT32U delayedActionTime = 1;
+    optional CHAR_STRING imageURI = 2;
+    optional INT32U softwareVersion = 3;
+    optional CHAR_STRING softwareVersionString = 4;
+    optional OCTET_STRING updateToken = 5;
+    optional BOOLEAN userConsentNeeded = 6;
+    optional OCTET_STRING metadataForRequestor = 7;
+  }
 
-  request struct RetrieveLogsRequestRequest {
-    LogsIntent intent = 0;
-    LogsTransferProtocol requestedProtocol = 1;
-    OCTET_STRING transferFileDesignator = 2;
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
   }
 
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
 }
 
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
+server cluster OtaSoftwareUpdateRequestor = 42 {
+  enum OTAAnnouncementReason : ENUM8 {
+    kSimpleAnnouncement = 0;
+    kUpdateAvailable = 1;
+    kUrgentUpdateAvailable = 2;
   }
 
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command ResetCounts(): DefaultSuccess = 0;
-}
+  enum OTAChangeReasonEnum : ENUM8 {
+    kUnknown = 0;
+    kSuccess = 1;
+    kFailure = 2;
+    kTimeOut = 3;
+    kDelayByProvider = 4;
+  }
 
-client cluster FanControl = 514 {
-  enum FanModeSequenceType : ENUM8 {
-    kOffLowMedHigh = 0;
-    kOffLowHigh = 1;
-    kOffLowMedHighAuto = 2;
-    kOffLowHighAuto = 3;
-    kOffOnAuto = 4;
-    kOffOn = 5;
+  enum OTAUpdateStateEnum : ENUM8 {
+    kUnknown = 0;
+    kIdle = 1;
+    kQuerying = 2;
+    kDelayedOnQuery = 3;
+    kDownloading = 4;
+    kApplying = 5;
+    kDelayedOnApply = 6;
+    kRollingBack = 7;
+    kDelayedOnUserConsent = 8;
   }
 
-  enum FanModeType : ENUM8 {
-    kOff = 0;
-    kLow = 1;
-    kMedium = 2;
-    kHigh = 3;
-    kOn = 4;
-    kAuto = 5;
-    kSmart = 6;
+  struct ProviderLocation {
+    node_id providerNodeID = 1;
+    endpoint_no endpoint = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  bitmap FanControlFeature : BITMAP32 {
-    kMultiSpeed = 0x1;
-    kAuto = 0x2;
-    kRocking = 0x4;
-    kWind = 0x8;
+  info event StateTransition = 0 {
+    OTAUpdateStateEnum previousState = 0;
+    OTAUpdateStateEnum newState = 1;
+    OTAChangeReasonEnum reason = 2;
+    nullable INT32U targetSoftwareVersion = 3;
   }
 
-  bitmap RockSupportMask : BITMAP8 {
-    kRockLeftRight = 0x1;
-    kRockUpDown = 0x2;
-    kRockRound = 0x4;
+  critical event VersionApplied = 1 {
+    INT32U softwareVersion = 0;
+    INT16U productID = 1;
   }
 
-  bitmap WindSettingMask : BITMAP8 {
-    kSleepWind = 0x1;
-    kNaturalWind = 0x2;
+  info event DownloadError = 2 {
+    INT32U softwareVersion = 0;
+    INT64U bytesDownloaded = 1;
+    nullable INT8U progressPercent = 2;
+    nullable INT64S platformCode = 3;
   }
 
-  bitmap WindSupportMask : BITMAP8 {
-    kSleepWind = 0x1;
-    kNaturalWind = 0x2;
+  attribute ProviderLocation defaultOtaProviders[] = 0;
+  readonly attribute boolean updatePossible = 1;
+  readonly attribute OTAUpdateStateEnum updateState = 2;
+  readonly attribute nullable int8u updateStateProgress = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AnnounceOtaProviderRequest {
+    node_id providerNodeId = 0;
+    vendor_id vendorId = 1;
+    OTAAnnouncementReason announcementReason = 2;
+    optional OCTET_STRING metadataForNode = 3;
+    endpoint_no endpoint = 4;
   }
 
+  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
 }
 
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
+server cluster LocalizationConfiguration = 43 {
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster GeneralCommissioning = 48 {
-  enum CommissioningError : ENUM8 {
-    kOk = 0;
-    kValueOutsideRange = 1;
-    kInvalidAuthentication = 2;
-    kNoFailSafe = 3;
-    kBusyWithOtherAdmin = 4;
-  }
-
-  enum RegulatoryLocationType : ENUM8 {
-    kIndoor = 0;
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
+  }
+
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
+  }
+
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster GeneralCommissioning = 48 {
+  enum CommissioningError : ENUM8 {
+    kOk = 0;
+    kValueOutsideRange = 1;
+    kInvalidAuthentication = 2;
+    kNoFailSafe = 3;
+    kBusyWithOtherAdmin = 4;
+  }
+
+  enum RegulatoryLocationType : ENUM8 {
+    kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
   }
@@ -354,6 +583,172 @@ server cluster GeneralCommissioning = 48 {
   command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
 }
 
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatus : ENUM8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
+  }
+
+  enum WiFiBand : ENUM8 {
+    k2g4 = 0;
+    k3g65 = 1;
+    k5g = 2;
+    k6g = 3;
+    k60g = 4;
+  }
+
+  bitmap NetworkCommissioningFeature : BITMAP32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
+  }
+
+  bitmap WiFiSecurity : BITMAP8 {
+    kUnencrypted = 0x1;
+    kWepPersonal = 0x2;
+    kWpaPersonal = 0x4;
+    kWpa2Personal = 0x8;
+    kWpa3Personal = 0x10;
+  }
+
+  struct NetworkInfo {
+    octet_string<32> networkID = 0;
+    boolean connected = 1;
+  }
+
+  struct WiFiInterfaceScanResult {
+    WiFiSecurity security = 0;
+    octet_string<32> ssid = 1;
+    octet_string<6> bssid = 2;
+    int16u channel = 3;
+    WiFiBand wiFiBand = 4;
+    int8s rssi = 5;
+  }
+
+  struct ThreadInterfaceScanResult {
+    int16u panId = 0;
+    int64u extendedPanId = 1;
+    char_string<16> networkName = 2;
+    int16u channel = 3;
+    int8u version = 4;
+    octet_string<8> extendedAddress = 5;
+    int8s rssi = 6;
+    int8u lqi = 7;
+  }
+
+  readonly attribute access(read: administer) int8u maxNetworks = 0;
+  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
+  readonly attribute int8u scanMaxTimeSeconds = 2;
+  readonly attribute int8u connectMaxTimeSeconds = 3;
+  attribute access(write: administer) boolean interfaceEnabled = 4;
+  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
+  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
+  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ScanNetworksRequest {
+    optional nullable OCTET_STRING ssid = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct AddOrUpdateWiFiNetworkRequest {
+    OCTET_STRING ssid = 0;
+    OCTET_STRING credentials = 1;
+    optional INT64U breadcrumb = 2;
+  }
+
+  request struct AddOrUpdateThreadNetworkRequest {
+    OCTET_STRING operationalDataset = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct RemoveNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct ConnectNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct ReorderNetworkRequest {
+    OCTET_STRING networkID = 0;
+    INT8U networkIndex = 1;
+    optional INT64U breadcrumb = 2;
+  }
+
+  response struct ScanNetworksResponse = 1 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
+    optional ThreadInterfaceScanResult threadScanResults[] = 3;
+  }
+
+  response struct NetworkConfigResponse = 5 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional INT8U networkIndex = 2;
+  }
+
+  response struct ConnectNetworkResponse = 7 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    nullable INT32S errorValue = 2;
+  }
+
+  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
+  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
+  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
+  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
+  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
+  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+}
+
+server cluster DiagnosticLogs = 50 {
+  enum LogsIntent : ENUM8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
+  }
+
+  enum LogsStatus : ENUM8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
+  }
+
+  enum LogsTransferProtocol : ENUM8 {
+    kResponsePayload = 0;
+    kBdx = 1;
+  }
+
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct RetrieveLogsRequestRequest {
+    LogsIntent intent = 0;
+    LogsTransferProtocol requestedProtocol = 1;
+    OCTET_STRING transferFileDesignator = 2;
+  }
+
+  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+}
+
 server cluster GeneralDiagnostics = 51 {
   enum BootReasonType : ENUM8 {
     kUnspecified = 0;
@@ -454,515 +849,416 @@ server cluster GeneralDiagnostics = 51 {
   command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
-  }
-
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
-    fabric_idx fabricIndex = 254;
+server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
   }
 
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
+  struct ThreadMetrics {
+    int64u id = 0;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
-  struct GroupKeySetStruct {
-    int16u groupKeySetID = 0;
-    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
-    nullable octet_string<16> epochKey0 = 2;
-    nullable epoch_us epochStartTime0 = 3;
-    nullable octet_string<16> epochKey1 = 4;
-    nullable epoch_us epochStartTime1 = 5;
-    nullable octet_string<16> epochKey2 = 6;
-    nullable epoch_us epochStartTime2 = 7;
+  info event SoftwareFault = 0 {
+    SoftwareFaultStruct softwareFault = 0;
   }
 
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
-  readonly attribute int16u maxGroupsPerFabric = 2;
-  readonly attribute int16u maxGroupKeysPerFabric = 3;
+  readonly attribute ThreadMetrics threadMetrics[] = 0;
+  readonly attribute int64u currentHeapFree = 1;
+  readonly attribute int64u currentHeapUsed = 2;
+  readonly attribute int64u currentHeapHighWatermark = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct KeySetWriteRequest {
-    GroupKeySetStruct groupKeySet = 0;
-  }
+  command ResetWatermarks(): DefaultSuccess = 0;
+}
 
-  request struct KeySetReadRequest {
-    INT16U groupKeySetID = 0;
-  }
-
-  request struct KeySetRemoveRequest {
-    INT16U groupKeySetID = 0;
+server cluster ThreadNetworkDiagnostics = 53 {
+  enum NetworkFault : ENUM8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
   }
 
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
+  enum RoutingRole : ENUM8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kReed = 4;
+    kRouter = 5;
+    kLeader = 6;
   }
 
-  response struct KeySetReadResponse = 2 {
-    GroupKeySetStruct groupKeySet = 0;
+  enum ThreadConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  response struct KeySetReadAllIndicesResponse = 5 {
-    INT16U groupKeySetIDs[] = 0;
+  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+    kMLECounts = 0x4;
+    kMACCounts = 0x8;
   }
 
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
-}
-
-server cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AddGroupRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+  struct NeighborTable {
+    int64u extAddress = 0;
+    int32u age = 1;
+    int16u rloc16 = 2;
+    int32u linkFrameCounter = 3;
+    int32u mleFrameCounter = 4;
+    int8u lqi = 5;
+    nullable int8s averageRssi = 6;
+    nullable int8s lastRssi = 7;
+    int8u frameErrorRate = 8;
+    int8u messageErrorRate = 9;
+    boolean rxOnWhenIdle = 10;
+    boolean fullThreadDevice = 11;
+    boolean fullNetworkData = 12;
+    boolean isChild = 13;
   }
 
-  request struct ViewGroupRequest {
-    group_id groupId = 0;
+  struct RouteTable {
+    int64u extAddress = 0;
+    int16u rloc16 = 1;
+    int8u routerId = 2;
+    int8u nextHop = 3;
+    int8u pathCost = 4;
+    int8u LQIIn = 5;
+    int8u LQIOut = 6;
+    int8u age = 7;
+    boolean allocated = 8;
+    boolean linkEstablished = 9;
   }
 
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
+  struct SecurityPolicy {
+    int16u rotationTime = 0;
+    bitmap16 flags = 1;
   }
 
-  request struct RemoveGroupRequest {
-    group_id groupId = 0;
+  struct OperationalDatasetComponents {
+    boolean activeTimestampPresent = 0;
+    boolean pendingTimestampPresent = 1;
+    boolean masterKeyPresent = 2;
+    boolean networkNamePresent = 3;
+    boolean extendedPanIdPresent = 4;
+    boolean meshLocalPrefixPresent = 5;
+    boolean delayPresent = 6;
+    boolean panIdPresent = 7;
+    boolean channelPresent = 8;
+    boolean pskcPresent = 9;
+    boolean securityPolicyPresent = 10;
+    boolean channelMaskPresent = 11;
   }
 
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+  info event ConnectionStatus = 0 {
+    ThreadConnectionStatus connectionStatus = 0;
   }
 
-  response struct AddGroupResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-  }
+  readonly attribute nullable int16u channel = 0;
+  readonly attribute nullable RoutingRole routingRole = 1;
+  readonly attribute nullable char_string<16> networkName = 2;
+  readonly attribute nullable int16u panId = 3;
+  readonly attribute nullable int64u extendedPanId = 4;
+  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute NeighborTable neighborTableList[] = 7;
+  readonly attribute RouteTable routeTableList[] = 8;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
+  readonly attribute int16u detachedRoleCount = 14;
+  readonly attribute int16u childRoleCount = 15;
+  readonly attribute int16u routerRoleCount = 16;
+  readonly attribute int16u leaderRoleCount = 17;
+  readonly attribute int16u attachAttemptCount = 18;
+  readonly attribute int16u partitionIdChangeCount = 19;
+  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
+  readonly attribute int16u parentChangeCount = 21;
+  readonly attribute int32u txTotalCount = 22;
+  readonly attribute int32u txUnicastCount = 23;
+  readonly attribute int32u txBroadcastCount = 24;
+  readonly attribute int32u txAckRequestedCount = 25;
+  readonly attribute int32u txAckedCount = 26;
+  readonly attribute int32u txNoAckRequestedCount = 27;
+  readonly attribute int32u txDataCount = 28;
+  readonly attribute int32u txDataPollCount = 29;
+  readonly attribute int32u txBeaconCount = 30;
+  readonly attribute int32u txBeaconRequestCount = 31;
+  readonly attribute int32u txOtherCount = 32;
+  readonly attribute int32u txRetryCount = 33;
+  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
+  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
+  readonly attribute int32u txErrCcaCount = 36;
+  readonly attribute int32u txErrAbortCount = 37;
+  readonly attribute int32u txErrBusyChannelCount = 38;
+  readonly attribute int32u rxTotalCount = 39;
+  readonly attribute int32u rxUnicastCount = 40;
+  readonly attribute int32u rxBroadcastCount = 41;
+  readonly attribute int32u rxDataCount = 42;
+  readonly attribute int32u rxDataPollCount = 43;
+  readonly attribute int32u rxBeaconCount = 44;
+  readonly attribute int32u rxBeaconRequestCount = 45;
+  readonly attribute int32u rxOtherCount = 46;
+  readonly attribute int32u rxAddressFilteredCount = 47;
+  readonly attribute int32u rxDestAddrFilteredCount = 48;
+  readonly attribute int32u rxDuplicatedCount = 49;
+  readonly attribute int32u rxErrNoFrameCount = 50;
+  readonly attribute int32u rxErrUnknownNeighborCount = 51;
+  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
+  readonly attribute int32u rxErrSecCount = 53;
+  readonly attribute int32u rxErrFcsCount = 54;
+  readonly attribute int32u rxErrOtherCount = 55;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
+  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  response struct ViewGroupResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    CHAR_STRING groupName = 2;
+  command ResetCounts(): DefaultSuccess = 0;
+}
+
+server cluster WiFiNetworkDiagnostics = 54 {
+  enum AssociationFailureCause : ENUM8 {
+    kUnknown = 0;
+    kAssociationFailed = 1;
+    kAuthenticationFailed = 2;
+    kSsidNotFound = 3;
   }
 
-  response struct GetGroupMembershipResponse = 2 {
-    nullable INT8U capacity = 0;
-    group_id groupList[] = 1;
+  enum SecurityType : ENUM8 {
+    kUnspecified = 0;
+    kNone = 1;
+    kWep = 2;
+    kWpa = 3;
+    kWpa2 = 4;
+    kWpa3 = 5;
   }
 
-  response struct RemoveGroupResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  enum WiFiConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
-}
+  enum WiFiVersionType : ENUM8 {
+    k80211a = 0;
+    k80211b = 1;
+    k80211g = 2;
+    k80211n = 3;
+    k80211ac = 4;
+    k80211ax = 5;
+  }
 
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
+  info event Disconnection = 0 {
+    INT16U reasonCode = 0;
   }
 
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
+  info event AssociationFailure = 1 {
+    AssociationFailureCause associationFailure = 0;
+    INT16U status = 1;
   }
 
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
+  info event ConnectionStatus = 2 {
+    WiFiConnectionStatus connectionStatus = 0;
   }
 
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute nullable octet_string<6> bssid = 0;
+  readonly attribute nullable SecurityType securityType = 1;
+  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
+  readonly attribute nullable int16u channelNumber = 3;
+  readonly attribute nullable int8s rssi = 4;
+  readonly attribute int32u beaconLostCount = 5;
+  readonly attribute int32u beaconRxCount = 6;
+  readonly attribute int32u packetMulticastRxCount = 7;
+  readonly attribute int32u packetMulticastTxCount = 8;
+  readonly attribute int32u packetUnicastRxCount = 9;
+  readonly attribute int32u packetUnicastTxCount = 10;
+  readonly attribute int64u currentMaxRate = 11;
+  readonly attribute int64u overrunCount = 12;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
-  }
-
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
-server cluster LocalizationConfiguration = 43 {
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
+  }
+
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
-server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatus : ENUM8 {
-    kSuccess = 0;
-    kOutOfRange = 1;
-    kBoundsExceeded = 2;
-    kNetworkIDNotFound = 3;
-    kDuplicateNetworkID = 4;
-    kNetworkNotFound = 5;
-    kRegulatoryError = 6;
-    kAuthFailure = 7;
-    kUnsupportedSecurity = 8;
-    kOtherConnectionFailure = 9;
-    kIPV6Failed = 10;
-    kIPBindFailed = 11;
-    kUnknownError = 12;
+server cluster Switch = 59 {
+  info event SwitchLatched = 0 {
+    INT8U newPosition = 0;
   }
 
-  enum WiFiBand : ENUM8 {
-    k2g4 = 0;
-    k3g65 = 1;
-    k5g = 2;
-    k6g = 3;
-    k60g = 4;
+  info event InitialPress = 1 {
+    INT8U newPosition = 0;
   }
 
-  bitmap NetworkCommissioningFeature : BITMAP32 {
-    kWiFiNetworkInterface = 0x1;
-    kThreadNetworkInterface = 0x2;
-    kEthernetNetworkInterface = 0x4;
+  info event LongPress = 2 {
+    INT8U newPosition = 0;
   }
 
-  bitmap WiFiSecurity : BITMAP8 {
-    kUnencrypted = 0x1;
-    kWepPersonal = 0x2;
-    kWpaPersonal = 0x4;
-    kWpa2Personal = 0x8;
-    kWpa3Personal = 0x10;
+  info event ShortRelease = 3 {
+    INT8U previousPosition = 0;
   }
 
-  struct NetworkInfo {
-    octet_string<32> networkID = 0;
-    boolean connected = 1;
+  info event LongRelease = 4 {
+    INT8U previousPosition = 0;
   }
 
-  struct WiFiInterfaceScanResult {
-    WiFiSecurity security = 0;
-    octet_string<32> ssid = 1;
-    octet_string<6> bssid = 2;
-    int16u channel = 3;
-    WiFiBand wiFiBand = 4;
-    int8s rssi = 5;
+  info event MultiPressOngoing = 5 {
+    INT8U newPosition = 0;
+    INT8U currentNumberOfPressesCounted = 1;
   }
 
-  struct ThreadInterfaceScanResult {
-    int16u panId = 0;
-    int64u extendedPanId = 1;
-    char_string<16> networkName = 2;
-    int16u channel = 3;
-    int8u version = 4;
-    octet_string<8> extendedAddress = 5;
-    int8s rssi = 6;
-    int8u lqi = 7;
+  info event MultiPressComplete = 6 {
+    INT8U newPosition = 0;
+    INT8U totalNumberOfPressesCounted = 1;
   }
 
-  readonly attribute access(read: administer) int8u maxNetworks = 0;
-  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
-  readonly attribute int8u scanMaxTimeSeconds = 2;
-  readonly attribute int8u connectMaxTimeSeconds = 3;
-  attribute access(write: administer) boolean interfaceEnabled = 4;
-  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
-  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
-  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct ScanNetworksRequest {
-    optional nullable OCTET_STRING ssid = 0;
-    optional INT64U breadcrumb = 1;
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
   }
 
-  request struct AddOrUpdateWiFiNetworkRequest {
-    OCTET_STRING ssid = 0;
-    OCTET_STRING credentials = 1;
-    optional INT64U breadcrumb = 2;
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
   }
 
-  request struct AddOrUpdateThreadNetworkRequest {
-    OCTET_STRING operationalDataset = 0;
-    optional INT64U breadcrumb = 1;
-  }
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  request struct RemoveNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
   }
 
-  request struct ConnectNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
   }
 
-  request struct ReorderNetworkRequest {
-    OCTET_STRING networkID = 0;
-    INT8U networkIndex = 1;
-    optional INT64U breadcrumb = 2;
-  }
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
+}
 
-  response struct ScanNetworksResponse = 1 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
-    optional ThreadInterfaceScanResult threadScanResults[] = 3;
+server cluster OperationalCredentials = 62 {
+  enum OperationalCertStatus : ENUM8 {
+    kSuccess = 0;
+    kInvalidPublicKey = 1;
+    kInvalidNodeOpId = 2;
+    kInvalidNOC = 3;
+    kMissingCsr = 4;
+    kTableFull = 5;
+    kInvalidAdminSubject = 6;
+    kInsufficientPrivilege = 8;
+    kFabricConflict = 9;
+    kLabelConflict = 10;
+    kInvalidFabricIndex = 11;
   }
 
-  response struct NetworkConfigResponse = 5 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional INT8U networkIndex = 2;
+  struct NOCStruct {
+    octet_string noc = 1;
+    nullable octet_string icac = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  response struct ConnectNetworkResponse = 7 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    nullable INT32S errorValue = 2;
+  struct FabricDescriptor {
+    octet_string<65> rootPublicKey = 1;
+    vendor_id vendorId = 2;
+    fabric_id fabricId = 3;
+    node_id nodeId = 4;
+    char_string<32> label = 5;
+    fabric_idx fabricIndex = 254;
   }
 
-  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
-  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
-  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
-  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
-  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
-  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
-}
+  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
+  readonly attribute FabricDescriptor fabrics[] = 1;
+  readonly attribute int8u supportedFabrics = 2;
+  readonly attribute int8u commissionedFabrics = 3;
+  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
+  readonly attribute fabric_idx currentFabricIndex = 5;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-client cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
+  request struct AttestationRequestRequest {
+    OCTET_STRING attestationNonce = 0;
   }
 
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
+  request struct CertificateChainRequestRequest {
+    INT8U certificateType = 0;
   }
 
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
+  request struct CSRRequestRequest {
+    OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
-  readonly attribute int16u clusterRevision = 65533;
+  request struct AddNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+    OCTET_STRING IPKValue = 2;
+    Int64u caseAdminSubject = 3;
+    VENDOR_ID adminVendorId = 4;
+  }
 
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
+  request struct UpdateNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
   }
 
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
-  }
-
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
-  }
-
-  response struct QueryImageResponse = 1 {
-    OTAQueryStatus status = 0;
-    optional INT32U delayedActionTime = 1;
-    optional CHAR_STRING imageURI = 2;
-    optional INT32U softwareVersion = 3;
-    optional CHAR_STRING softwareVersionString = 4;
-    optional OCTET_STRING updateToken = 5;
-    optional BOOLEAN userConsentNeeded = 6;
-    optional OCTET_STRING metadataForRequestor = 7;
-  }
-
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
-  }
-
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
-}
-
-server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum OTAAnnouncementReason : ENUM8 {
-    kSimpleAnnouncement = 0;
-    kUpdateAvailable = 1;
-    kUrgentUpdateAvailable = 2;
-  }
-
-  enum OTAChangeReasonEnum : ENUM8 {
-    kUnknown = 0;
-    kSuccess = 1;
-    kFailure = 2;
-    kTimeOut = 3;
-    kDelayByProvider = 4;
-  }
-
-  enum OTAUpdateStateEnum : ENUM8 {
-    kUnknown = 0;
-    kIdle = 1;
-    kQuerying = 2;
-    kDelayedOnQuery = 3;
-    kDownloading = 4;
-    kApplying = 5;
-    kDelayedOnApply = 6;
-    kRollingBack = 7;
-    kDelayedOnUserConsent = 8;
-  }
-
-  struct ProviderLocation {
-    node_id providerNodeID = 1;
-    endpoint_no endpoint = 2;
-    fabric_idx fabricIndex = 254;
-  }
-
-  info event StateTransition = 0 {
-    OTAUpdateStateEnum previousState = 0;
-    OTAUpdateStateEnum newState = 1;
-    OTAChangeReasonEnum reason = 2;
-    nullable INT32U targetSoftwareVersion = 3;
-  }
-
-  critical event VersionApplied = 1 {
-    INT32U softwareVersion = 0;
-    INT16U productID = 1;
-  }
-
-  info event DownloadError = 2 {
-    INT32U softwareVersion = 0;
-    INT64U bytesDownloaded = 1;
-    nullable INT8U progressPercent = 2;
-    nullable INT64S platformCode = 3;
-  }
-
-  attribute ProviderLocation defaultOtaProviders[] = 0;
-  readonly attribute boolean updatePossible = 1;
-  readonly attribute OTAUpdateStateEnum updateState = 2;
-  readonly attribute nullable int8u updateStateProgress = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AnnounceOtaProviderRequest {
-    node_id providerNodeId = 0;
-    vendor_id vendorId = 1;
-    OTAAnnouncementReason announcementReason = 2;
-    optional OCTET_STRING metadataForNode = 3;
-    endpoint_no endpoint = 4;
-  }
-
-  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
-}
-
-client cluster OccupancySensing = 1030 {
-}
-
-server cluster OperationalCredentials = 62 {
-  enum OperationalCertStatus : ENUM8 {
-    kSuccess = 0;
-    kInvalidPublicKey = 1;
-    kInvalidNodeOpId = 2;
-    kInvalidNOC = 3;
-    kMissingCsr = 4;
-    kTableFull = 5;
-    kInvalidAdminSubject = 6;
-    kInsufficientPrivilege = 8;
-    kFabricConflict = 9;
-    kLabelConflict = 10;
-    kInvalidFabricIndex = 11;
-  }
-
-  struct NOCStruct {
-    octet_string noc = 1;
-    nullable octet_string icac = 2;
-    fabric_idx fabricIndex = 254;
-  }
-
-  struct FabricDescriptor {
-    octet_string<65> rootPublicKey = 1;
-    vendor_id vendorId = 2;
-    fabric_id fabricId = 3;
-    node_id nodeId = 4;
-    char_string<32> label = 5;
-    fabric_idx fabricIndex = 254;
-  }
-
-  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
-  readonly attribute FabricDescriptor fabrics[] = 1;
-  readonly attribute int8u supportedFabrics = 2;
-  readonly attribute int8u commissionedFabrics = 3;
-  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
-  readonly attribute fabric_idx currentFabricIndex = 5;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AttestationRequestRequest {
-    OCTET_STRING attestationNonce = 0;
-  }
-
-  request struct CertificateChainRequestRequest {
-    INT8U certificateType = 0;
-  }
-
-  request struct CSRRequestRequest {
-    OCTET_STRING CSRNonce = 0;
-    optional boolean isForUpdateNOC = 1;
-  }
-
-  request struct AddNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
-    OCTET_STRING IPKValue = 2;
-    Int64u caseAdminSubject = 3;
-    VENDOR_ID adminVendorId = 4;
-  }
-
-  request struct UpdateNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
-  }
-
-  request struct UpdateFabricLabelRequest {
-    CHAR_STRING label = 0;
+  request struct UpdateFabricLabelRequest {
+    CHAR_STRING label = 0;
   }
 
   request struct RemoveFabricRequest {
@@ -1003,470 +1299,75 @@ server cluster OperationalCredentials = 62 {
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
 }
 
-client cluster RelativeHumidityMeasurement = 1029 {
-}
-
-server cluster Scenes = 5 {
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
-  }
-
-  struct ExtensionFieldSet {
-    cluster_id clusterId = 0;
-    AttributeValuePair attributeValueList[] = 1;
-  }
-
-  struct AttributeValuePair {
-    optional attrib_id attributeId = 0;
-    int8u attributeValue[] = 1;
-  }
-
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AddSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    INT16U transitionTime = 2;
-    CHAR_STRING sceneName = 3;
-    ExtensionFieldSet extensionFieldSets[] = 4;
-  }
-
-  request struct ViewSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RemoveSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RemoveAllScenesRequest {
-    group_id groupId = 0;
-  }
-
-  request struct StoreSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RecallSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    optional nullable INT16U transitionTime = 2;
-  }
-
-  request struct GetSceneMembershipRequest {
-    group_id groupId = 0;
-  }
-
-  response struct AddSceneResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
   }
 
-  response struct ViewSceneResponse = 1 {
-    ENUM8 status = 0;
+  struct GroupKeyMapStruct {
     group_id groupId = 1;
-    INT8U sceneId = 2;
-    optional INT16U transitionTime = 3;
-    optional CHAR_STRING sceneName = 4;
-    optional ExtensionFieldSet extensionFieldSets[] = 5;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  response struct RemoveSceneResponse = 2 {
-    ENUM8 status = 0;
+  struct GroupInfoMapStruct {
     group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
-
-  response struct RemoveAllScenesResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-  }
-
-  response struct StoreSceneResponse = 4 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
-
-  response struct GetSceneMembershipResponse = 6 {
-    ENUM8 status = 0;
-    nullable INT8U capacity = 1;
-    group_id groupId = 2;
-    optional INT8U sceneList[] = 3;
-  }
-
-  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
-  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
-  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
-  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
-  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
-  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
-  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
-}
-
-server cluster SoftwareDiagnostics = 52 {
-  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
-    kWaterMarks = 0x1;
-  }
-
-  struct ThreadMetrics {
-    int64u id = 0;
-    optional char_string<8> name = 1;
-    optional int32u stackFreeCurrent = 2;
-    optional int32u stackFreeMinimum = 3;
-    optional int32u stackSize = 4;
-  }
-
-  info event SoftwareFault = 0 {
-    SoftwareFaultStruct softwareFault = 0;
-  }
-
-  readonly attribute ThreadMetrics threadMetrics[] = 0;
-  readonly attribute int64u currentHeapFree = 1;
-  readonly attribute int64u currentHeapUsed = 2;
-  readonly attribute int64u currentHeapHighWatermark = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command ResetWatermarks(): DefaultSuccess = 0;
-}
-
-server cluster Switch = 59 {
-  info event SwitchLatched = 0 {
-    INT8U newPosition = 0;
-  }
-
-  info event InitialPress = 1 {
-    INT8U newPosition = 0;
-  }
-
-  info event LongPress = 2 {
-    INT8U newPosition = 0;
-  }
-
-  info event ShortRelease = 3 {
-    INT8U previousPosition = 0;
-  }
-
-  info event LongRelease = 4 {
-    INT8U previousPosition = 0;
-  }
-
-  info event MultiPressOngoing = 5 {
-    INT8U newPosition = 0;
-    INT8U currentNumberOfPressesCounted = 1;
-  }
-
-  info event MultiPressComplete = 6 {
-    INT8U newPosition = 0;
-    INT8U totalNumberOfPressesCounted = 1;
-  }
-
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-client cluster TemperatureMeasurement = 1026 {
-}
-
-server cluster Thermostat = 513 {
-  enum SetpointAdjustMode : ENUM8 {
-    kHeatSetpoint = 0;
-    kCoolSetpoint = 1;
-    kHeatAndCoolSetpoints = 2;
-  }
-
-  enum ThermostatControlSequence : ENUM8 {
-    kCoolingOnly = 0;
-    kCoolingWithReheat = 1;
-    kHeatingOnly = 2;
-    kHeatingWithReheat = 3;
-    kCoolingAndHeating = 4;
-    kCoolingAndHeatingWithReheat = 5;
-  }
-
-  enum ThermostatRunningMode : ENUM8 {
-    kOff = 0;
-    kCool = 3;
-    kHeat = 4;
-  }
-
-  enum ThermostatSystemMode : ENUM8 {
-    kOff = 0;
-    kAuto = 1;
-    kCool = 3;
-    kHeat = 4;
-    kEmergencyHeating = 5;
-    kPrecooling = 6;
-    kFanOnly = 7;
-  }
-
-  bitmap DayOfWeek : BITMAP8 {
-    kSunday = 0x1;
-    kMonday = 0x2;
-    kTuesday = 0x4;
-    kWednesday = 0x8;
-    kThursday = 0x10;
-    kFriday = 0x20;
-    kSaturday = 0x40;
-    kAwayOrVacation = 0x80;
-  }
-
-  bitmap ModeForSequence : BITMAP8 {
-    kHeatSetpointFieldPresent = 0x1;
-    kCoolSetpointFieldPresent = 0x2;
-  }
-
-  bitmap ThermostatFeature : BITMAP32 {
-    kHeating = 0x1;
-    kCooling = 0x2;
-    kOccupancy = 0x4;
-    kSchedule = 0x8;
-    kSetback = 0x10;
-    kAutomode = 0x20;
-  }
-
-  readonly attribute nullable int16s localTemperature = 0;
-  readonly attribute nullable int16s outdoorTemperature = 1;
-  readonly attribute bitmap8 occupancy = 2;
-  readonly attribute int16s absMinHeatSetpointLimit = 3;
-  readonly attribute int16s absMaxHeatSetpointLimit = 4;
-  readonly attribute int16s absMinCoolSetpointLimit = 5;
-  readonly attribute int16s absMaxCoolSetpointLimit = 6;
-  readonly attribute int8u PICoolingDemand = 7;
-  readonly attribute int8u PIHeatingDemand = 8;
-  attribute access(write: manage) bitmap8 HVACSystemTypeConfiguration = 9;
-  attribute access(write: manage) int8s localTemperatureCalibration = 16;
-  attribute int16s occupiedCoolingSetpoint = 17;
-  attribute int16s occupiedHeatingSetpoint = 18;
-  attribute int16s unoccupiedCoolingSetpoint = 19;
-  attribute int16s unoccupiedHeatingSetpoint = 20;
-  attribute access(write: manage) int16s minHeatSetpointLimit = 21;
-  attribute access(write: manage) int16s maxHeatSetpointLimit = 22;
-  attribute access(write: manage) int16s minCoolSetpointLimit = 23;
-  attribute access(write: manage) int16s maxCoolSetpointLimit = 24;
-  attribute access(write: manage) int8s minSetpointDeadBand = 25;
-  attribute access(write: manage) bitmap8 remoteSensing = 26;
-  attribute access(write: manage) ThermostatControlSequence controlSequenceOfOperation = 27;
-  attribute access(write: manage) enum8 systemMode = 28;
-  readonly attribute enum8 thermostatRunningMode = 30;
-  readonly attribute enum8 startOfWeek = 32;
-  readonly attribute int8u numberOfWeeklyTransitions = 33;
-  readonly attribute int8u numberOfDailyTransitions = 34;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct SetpointRaiseLowerRequest {
-    SetpointAdjustMode mode = 0;
-    INT8S amount = 1;
-  }
-
-  command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0;
-}
-
-server cluster ThermostatUserInterfaceConfiguration = 516 {
-  attribute enum8 temperatureDisplayMode = 0;
-  attribute access(write: manage) enum8 keypadLockout = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster ThreadNetworkDiagnostics = 53 {
-  enum NetworkFault : ENUM8 {
-    kUnspecified = 0;
-    kLinkDown = 1;
-    kHardwareFailure = 2;
-    kNetworkJammed = 3;
-  }
-
-  enum RoutingRole : ENUM8 {
-    kUnspecified = 0;
-    kUnassigned = 1;
-    kSleepyEndDevice = 2;
-    kEndDevice = 3;
-    kReed = 4;
-    kRouter = 5;
-    kLeader = 6;
-  }
-
-  enum ThreadConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
-  }
-
-  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
-    kPacketCounts = 0x1;
-    kErrorCounts = 0x2;
-    kMLECounts = 0x4;
-    kMACCounts = 0x8;
-  }
-
-  struct NeighborTable {
-    int64u extAddress = 0;
-    int32u age = 1;
-    int16u rloc16 = 2;
-    int32u linkFrameCounter = 3;
-    int32u mleFrameCounter = 4;
-    int8u lqi = 5;
-    nullable int8s averageRssi = 6;
-    nullable int8s lastRssi = 7;
-    int8u frameErrorRate = 8;
-    int8u messageErrorRate = 9;
-    boolean rxOnWhenIdle = 10;
-    boolean fullThreadDevice = 11;
-    boolean fullNetworkData = 12;
-    boolean isChild = 13;
-  }
-
-  struct RouteTable {
-    int64u extAddress = 0;
-    int16u rloc16 = 1;
-    int8u routerId = 2;
-    int8u nextHop = 3;
-    int8u pathCost = 4;
-    int8u LQIIn = 5;
-    int8u LQIOut = 6;
-    int8u age = 7;
-    boolean allocated = 8;
-    boolean linkEstablished = 9;
-  }
-
-  struct SecurityPolicy {
-    int16u rotationTime = 0;
-    bitmap16 flags = 1;
-  }
-
-  struct OperationalDatasetComponents {
-    boolean activeTimestampPresent = 0;
-    boolean pendingTimestampPresent = 1;
-    boolean masterKeyPresent = 2;
-    boolean networkNamePresent = 3;
-    boolean extendedPanIdPresent = 4;
-    boolean meshLocalPrefixPresent = 5;
-    boolean delayPresent = 6;
-    boolean panIdPresent = 7;
-    boolean channelPresent = 8;
-    boolean pskcPresent = 9;
-    boolean securityPolicyPresent = 10;
-    boolean channelMaskPresent = 11;
-  }
-
-  info event ConnectionStatus = 0 {
-    ThreadConnectionStatus connectionStatus = 0;
-  }
-
-  readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable RoutingRole routingRole = 1;
-  readonly attribute nullable char_string<16> networkName = 2;
-  readonly attribute nullable int16u panId = 3;
-  readonly attribute nullable int64u extendedPanId = 4;
-  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute NeighborTable neighborTableList[] = 7;
-  readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
-  readonly attribute nullable int8u leaderRouterId = 13;
-  readonly attribute int16u detachedRoleCount = 14;
-  readonly attribute int16u childRoleCount = 15;
-  readonly attribute int16u routerRoleCount = 16;
-  readonly attribute int16u leaderRoleCount = 17;
-  readonly attribute int16u attachAttemptCount = 18;
-  readonly attribute int16u partitionIdChangeCount = 19;
-  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
-  readonly attribute int16u parentChangeCount = 21;
-  readonly attribute int32u txTotalCount = 22;
-  readonly attribute int32u txUnicastCount = 23;
-  readonly attribute int32u txBroadcastCount = 24;
-  readonly attribute int32u txAckRequestedCount = 25;
-  readonly attribute int32u txAckedCount = 26;
-  readonly attribute int32u txNoAckRequestedCount = 27;
-  readonly attribute int32u txDataCount = 28;
-  readonly attribute int32u txDataPollCount = 29;
-  readonly attribute int32u txBeaconCount = 30;
-  readonly attribute int32u txBeaconRequestCount = 31;
-  readonly attribute int32u txOtherCount = 32;
-  readonly attribute int32u txRetryCount = 33;
-  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
-  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
-  readonly attribute int32u txErrCcaCount = 36;
-  readonly attribute int32u txErrAbortCount = 37;
-  readonly attribute int32u txErrBusyChannelCount = 38;
-  readonly attribute int32u rxTotalCount = 39;
-  readonly attribute int32u rxUnicastCount = 40;
-  readonly attribute int32u rxBroadcastCount = 41;
-  readonly attribute int32u rxDataCount = 42;
-  readonly attribute int32u rxDataPollCount = 43;
-  readonly attribute int32u rxBeaconCount = 44;
-  readonly attribute int32u rxBeaconRequestCount = 45;
-  readonly attribute int32u rxOtherCount = 46;
-  readonly attribute int32u rxAddressFilteredCount = 47;
-  readonly attribute int32u rxDestAddrFilteredCount = 48;
-  readonly attribute int32u rxDuplicatedCount = 49;
-  readonly attribute int32u rxErrNoFrameCount = 50;
-  readonly attribute int32u rxErrUnknownNeighborCount = 51;
-  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
-  readonly attribute int32u rxErrSecCount = 53;
-  readonly attribute int32u rxErrFcsCount = 54;
-  readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute nullable int64u activeTimestamp = 56;
-  readonly attribute nullable int64u pendingTimestamp = 57;
-  readonly attribute nullable int32u delay = 58;
-  readonly attribute nullable SecurityPolicy securityPolicy = 59;
-  readonly attribute nullable octet_string<4> channelMask = 60;
-  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
-  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
-}
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
+  }
 
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
+
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
@@ -1477,67 +1378,166 @@ server cluster UserLabel = 65 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCause : ENUM8 {
-    kUnknown = 0;
-    kAssociationFailed = 1;
-    kAuthenticationFailed = 2;
-    kSsidNotFound = 3;
+server cluster Thermostat = 513 {
+  enum SetpointAdjustMode : ENUM8 {
+    kHeatSetpoint = 0;
+    kCoolSetpoint = 1;
+    kHeatAndCoolSetpoints = 2;
   }
 
-  enum SecurityType : ENUM8 {
-    kUnspecified = 0;
-    kNone = 1;
-    kWep = 2;
-    kWpa = 3;
-    kWpa2 = 4;
-    kWpa3 = 5;
+  enum ThermostatControlSequence : ENUM8 {
+    kCoolingOnly = 0;
+    kCoolingWithReheat = 1;
+    kHeatingOnly = 2;
+    kHeatingWithReheat = 3;
+    kCoolingAndHeating = 4;
+    kCoolingAndHeatingWithReheat = 5;
   }
 
-  enum WiFiConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  enum ThermostatRunningMode : ENUM8 {
+    kOff = 0;
+    kCool = 3;
+    kHeat = 4;
   }
 
-  enum WiFiVersionType : ENUM8 {
-    k80211a = 0;
-    k80211b = 1;
-    k80211g = 2;
-    k80211n = 3;
-    k80211ac = 4;
-    k80211ax = 5;
+  enum ThermostatSystemMode : ENUM8 {
+    kOff = 0;
+    kAuto = 1;
+    kCool = 3;
+    kHeat = 4;
+    kEmergencyHeating = 5;
+    kPrecooling = 6;
+    kFanOnly = 7;
   }
 
-  info event Disconnection = 0 {
-    INT16U reasonCode = 0;
+  bitmap DayOfWeek : BITMAP8 {
+    kSunday = 0x1;
+    kMonday = 0x2;
+    kTuesday = 0x4;
+    kWednesday = 0x8;
+    kThursday = 0x10;
+    kFriday = 0x20;
+    kSaturday = 0x40;
+    kAwayOrVacation = 0x80;
   }
 
-  info event AssociationFailure = 1 {
-    AssociationFailureCause associationFailure = 0;
-    INT16U status = 1;
+  bitmap ModeForSequence : BITMAP8 {
+    kHeatSetpointFieldPresent = 0x1;
+    kCoolSetpointFieldPresent = 0x2;
   }
 
-  info event ConnectionStatus = 2 {
-    WiFiConnectionStatus connectionStatus = 0;
+  bitmap ThermostatFeature : BITMAP32 {
+    kHeating = 0x1;
+    kCooling = 0x2;
+    kOccupancy = 0x4;
+    kSchedule = 0x8;
+    kSetback = 0x10;
+    kAutomode = 0x20;
   }
 
-  readonly attribute nullable octet_string<6> bssid = 0;
-  readonly attribute nullable SecurityType securityType = 1;
-  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
-  readonly attribute nullable int16u channelNumber = 3;
-  readonly attribute nullable int8s rssi = 4;
-  readonly attribute int32u beaconLostCount = 5;
-  readonly attribute int32u beaconRxCount = 6;
-  readonly attribute int32u packetMulticastRxCount = 7;
-  readonly attribute int32u packetMulticastTxCount = 8;
-  readonly attribute int32u packetUnicastRxCount = 9;
-  readonly attribute int32u packetUnicastTxCount = 10;
-  readonly attribute int64u currentMaxRate = 11;
-  readonly attribute int64u overrunCount = 12;
+  readonly attribute nullable int16s localTemperature = 0;
+  readonly attribute nullable int16s outdoorTemperature = 1;
+  readonly attribute bitmap8 occupancy = 2;
+  readonly attribute int16s absMinHeatSetpointLimit = 3;
+  readonly attribute int16s absMaxHeatSetpointLimit = 4;
+  readonly attribute int16s absMinCoolSetpointLimit = 5;
+  readonly attribute int16s absMaxCoolSetpointLimit = 6;
+  readonly attribute int8u PICoolingDemand = 7;
+  readonly attribute int8u PIHeatingDemand = 8;
+  attribute access(write: manage) bitmap8 HVACSystemTypeConfiguration = 9;
+  attribute access(write: manage) int8s localTemperatureCalibration = 16;
+  attribute int16s occupiedCoolingSetpoint = 17;
+  attribute int16s occupiedHeatingSetpoint = 18;
+  attribute int16s unoccupiedCoolingSetpoint = 19;
+  attribute int16s unoccupiedHeatingSetpoint = 20;
+  attribute access(write: manage) int16s minHeatSetpointLimit = 21;
+  attribute access(write: manage) int16s maxHeatSetpointLimit = 22;
+  attribute access(write: manage) int16s minCoolSetpointLimit = 23;
+  attribute access(write: manage) int16s maxCoolSetpointLimit = 24;
+  attribute access(write: manage) int8s minSetpointDeadBand = 25;
+  attribute access(write: manage) bitmap8 remoteSensing = 26;
+  attribute access(write: manage) ThermostatControlSequence controlSequenceOfOperation = 27;
+  attribute access(write: manage) enum8 systemMode = 28;
+  readonly attribute enum8 thermostatRunningMode = 30;
+  readonly attribute enum8 startOfWeek = 32;
+  readonly attribute int8u numberOfWeeklyTransitions = 33;
+  readonly attribute int8u numberOfDailyTransitions = 34;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  request struct SetpointRaiseLowerRequest {
+    SetpointAdjustMode mode = 0;
+    INT8S amount = 1;
+  }
+
+  command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0;
+}
+
+client cluster FanControl = 514 {
+  enum FanModeSequenceType : ENUM8 {
+    kOffLowMedHigh = 0;
+    kOffLowHigh = 1;
+    kOffLowMedHighAuto = 2;
+    kOffLowHighAuto = 3;
+    kOffOnAuto = 4;
+    kOffOn = 5;
+  }
+
+  enum FanModeType : ENUM8 {
+    kOff = 0;
+    kLow = 1;
+    kMedium = 2;
+    kHigh = 3;
+    kOn = 4;
+    kAuto = 5;
+    kSmart = 6;
+  }
+
+  bitmap FanControlFeature : BITMAP32 {
+    kMultiSpeed = 0x1;
+    kAuto = 0x2;
+    kRocking = 0x4;
+    kWind = 0x8;
+  }
+
+  bitmap RockSupportMask : BITMAP8 {
+    kRockLeftRight = 0x1;
+    kRockUpDown = 0x2;
+    kRockRound = 0x4;
+  }
+
+  bitmap WindSettingMask : BITMAP8 {
+    kSleepWind = 0x1;
+    kNaturalWind = 0x2;
+  }
+
+  bitmap WindSupportMask : BITMAP8 {
+    kSleepWind = 0x1;
+    kNaturalWind = 0x2;
+  }
+
+}
+
+server cluster ThermostatUserInterfaceConfiguration = 516 {
+  attribute enum8 temperatureDisplayMode = 0;
+  attribute access(write: manage) enum8 keypadLockout = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+client cluster TemperatureMeasurement = 1026 {
+}
+
+client cluster RelativeHumidityMeasurement = 1029 {
+}
+
+client cluster OccupancySensing = 1030 {
 }
 
 endpoint 0 {
diff --git a/examples/chef/devices/rootnode_windowcovering_hv8WSnPgSV.matter b/examples/chef/devices/rootnode_windowcovering_hv8WSnPgSV.matter
index 5cace403b3c223..d695a46f481a33 100644
--- a/examples/chef/devices/rootnode_windowcovering_hv8WSnPgSV.matter
+++ b/examples/chef/devices/rootnode_windowcovering_hv8WSnPgSV.matter
@@ -6,6 +6,247 @@ struct LabelStruct {
     char_string<16> value = 1;
 }
 
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
+  }
+
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
+  }
+
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
+  }
+
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
+  }
+
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+}
+
+server cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AddGroupRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
+
+  request struct ViewGroupRequest {
+    group_id groupId = 0;
+  }
+
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
+  }
+
+  request struct RemoveGroupRequest {
+    group_id groupId = 0;
+  }
+
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
+
+  response struct AddGroupResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  response struct ViewGroupResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    CHAR_STRING groupName = 2;
+  }
+
+  response struct GetGroupMembershipResponse = 2 {
+    nullable INT8U capacity = 0;
+    group_id groupList[] = 1;
+  }
+
+  response struct RemoveGroupResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
+}
+
+server cluster Scenes = 5 {
+  bitmap ScenesCopyMode : BITMAP8 {
+    kCopyAllScenes = 0x1;
+  }
+
+  struct ExtensionFieldSet {
+    cluster_id clusterId = 0;
+    AttributeValuePair attributeValueList[] = 1;
+  }
+
+  struct AttributeValuePair {
+    optional attrib_id attributeId = 0;
+    int8u attributeValue[] = 1;
+  }
+
+  readonly attribute int8u sceneCount = 0;
+  readonly attribute int8u currentScene = 1;
+  readonly attribute group_id currentGroup = 2;
+  readonly attribute boolean sceneValid = 3;
+  readonly attribute bitmap8 nameSupport = 4;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AddSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    INT16U transitionTime = 2;
+    CHAR_STRING sceneName = 3;
+    ExtensionFieldSet extensionFieldSets[] = 4;
+  }
+
+  request struct ViewSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+  }
+
+  request struct RemoveSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+  }
+
+  request struct RemoveAllScenesRequest {
+    group_id groupId = 0;
+  }
+
+  request struct StoreSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+  }
+
+  request struct RecallSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    optional nullable INT16U transitionTime = 2;
+  }
+
+  request struct GetSceneMembershipRequest {
+    group_id groupId = 0;
+  }
+
+  response struct AddSceneResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+  }
+
+  response struct ViewSceneResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+    optional INT16U transitionTime = 3;
+    optional CHAR_STRING sceneName = 4;
+    optional ExtensionFieldSet extensionFieldSets[] = 5;
+  }
+
+  response struct RemoveSceneResponse = 2 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+  }
+
+  response struct RemoveAllScenesResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  response struct StoreSceneResponse = 4 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+  }
+
+  response struct GetSceneMembershipResponse = 6 {
+    ENUM8 status = 0;
+    nullable INT8U capacity = 1;
+    group_id groupId = 2;
+    optional INT8U sceneList[] = 3;
+  }
+
+  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
+  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
+  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
+  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
+  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
+  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
+  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
+}
+
+server cluster Descriptor = 29 {
+  struct DeviceType {
+    devtype_id type = 0;
+    int16u revision = 1;
+  }
+
+  readonly attribute DeviceType deviceList[] = 0;
+  readonly attribute CLUSTER_ID serverList[] = 1;
+  readonly attribute CLUSTER_ID clientList[] = 2;
+  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+client cluster Binding = 30 {
+  struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  attribute TargetStruct binding[] = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
 server cluster AccessControl = 31 {
   enum AuthMode : ENUM8 {
     kPase = 1;
@@ -69,48 +310,12 @@ server cluster AccessControl = 31 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
+server cluster Basic = 40 {
+  critical event StartUp = 0 {
+    INT32U softwareVersion = 0;
   }
 
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
-  }
-
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
-  }
-
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-  }
-
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
-
-server cluster Basic = 40 {
-  critical event StartUp = 0 {
-    INT32U softwareVersion = 0;
-  }
-
-  critical event ShutDown = 1 {
+  critical event ShutDown = 1 {
   }
 
   info event Leave = 2 {
@@ -143,102 +348,171 @@ server cluster Basic = 40 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-client cluster Binding = 30 {
-  struct TargetStruct {
-    optional node_id node = 1;
-    optional group_id group = 2;
-    optional endpoint_no endpoint = 3;
-    optional cluster_id cluster = 4;
-    fabric_idx fabricIndex = 254;
+client cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
   }
 
-  attribute TargetStruct binding[] = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
+  }
 
-server cluster Descriptor = 29 {
-  struct DeviceType {
-    devtype_id type = 0;
-    int16u revision = 1;
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
   }
 
-  readonly attribute DeviceType deviceList[] = 0;
-  readonly attribute CLUSTER_ID serverList[] = 1;
-  readonly attribute CLUSTER_ID clientList[] = 2;
-  readonly attribute ENDPOINT_NO partsList[] = 3;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster DiagnosticLogs = 50 {
-  enum LogsIntent : ENUM8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
   }
 
-  enum LogsStatus : ENUM8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
   }
 
-  enum LogsTransferProtocol : ENUM8 {
-    kResponsePayload = 0;
-    kBdx = 1;
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
   }
 
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  response struct QueryImageResponse = 1 {
+    OTAQueryStatus status = 0;
+    optional INT32U delayedActionTime = 1;
+    optional CHAR_STRING imageURI = 2;
+    optional INT32U softwareVersion = 3;
+    optional CHAR_STRING softwareVersionString = 4;
+    optional OCTET_STRING updateToken = 5;
+    optional BOOLEAN userConsentNeeded = 6;
+    optional OCTET_STRING metadataForRequestor = 7;
+  }
 
-  request struct RetrieveLogsRequestRequest {
-    LogsIntent intent = 0;
-    LogsTransferProtocol requestedProtocol = 1;
-    OCTET_STRING transferFileDesignator = 2;
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
   }
 
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
 }
 
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
+server cluster OtaSoftwareUpdateRequestor = 42 {
+  enum OTAAnnouncementReason : ENUM8 {
+    kSimpleAnnouncement = 0;
+    kUpdateAvailable = 1;
+    kUrgentUpdateAvailable = 2;
   }
 
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
+  enum OTAChangeReasonEnum : ENUM8 {
+    kUnknown = 0;
+    kSuccess = 1;
+    kFailure = 2;
+    kTimeOut = 3;
+    kDelayByProvider = 4;
+  }
+
+  enum OTAUpdateStateEnum : ENUM8 {
+    kUnknown = 0;
+    kIdle = 1;
+    kQuerying = 2;
+    kDelayedOnQuery = 3;
+    kDownloading = 4;
+    kApplying = 5;
+    kDelayedOnApply = 6;
+    kRollingBack = 7;
+    kDelayedOnUserConsent = 8;
+  }
+
+  struct ProviderLocation {
+    node_id providerNodeID = 1;
+    endpoint_no endpoint = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  info event StateTransition = 0 {
+    OTAUpdateStateEnum previousState = 0;
+    OTAUpdateStateEnum newState = 1;
+    OTAChangeReasonEnum reason = 2;
+    nullable INT32U targetSoftwareVersion = 3;
+  }
+
+  critical event VersionApplied = 1 {
+    INT32U softwareVersion = 0;
+    INT16U productID = 1;
+  }
+
+  info event DownloadError = 2 {
+    INT32U softwareVersion = 0;
+    INT64U bytesDownloaded = 1;
+    nullable INT8U progressPercent = 2;
+    nullable INT64S platformCode = 3;
+  }
+
+  attribute ProviderLocation defaultOtaProviders[] = 0;
+  readonly attribute boolean updatePossible = 1;
+  readonly attribute OTAUpdateStateEnum updateState = 2;
+  readonly attribute nullable int8u updateStateProgress = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  request struct AnnounceOtaProviderRequest {
+    node_id providerNodeId = 0;
+    vendor_id vendorId = 1;
+    OTAAnnouncementReason announcementReason = 2;
+    optional OCTET_STRING metadataForNode = 3;
+    endpoint_no endpoint = 4;
+  }
+
+  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
 }
 
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
+server cluster LocalizationConfiguration = 43 {
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
+  }
+
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
+  }
+
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
@@ -301,276 +575,6 @@ server cluster GeneralCommissioning = 48 {
   command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
 }
 
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
-  }
-
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
-  }
-
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
-  }
-
-  enum NetworkFaultType : ENUM8 {
-    kUnspecified = 0;
-    kHardwareFailure = 1;
-    kNetworkJammed = 2;
-    kConnectionFailed = 3;
-  }
-
-  enum RadioFaultType : ENUM8 {
-    kUnspecified = 0;
-    kWiFiFault = 1;
-    kCellularFault = 2;
-    kThreadFault = 3;
-    kNFCFault = 4;
-    kBLEFault = 5;
-    kEthernetFault = 6;
-  }
-
-  struct NetworkInterfaceType {
-    char_string<32> name = 0;
-    boolean isOperational = 1;
-    nullable boolean offPremiseServicesReachableIPv4 = 2;
-    nullable boolean offPremiseServicesReachableIPv6 = 3;
-    octet_string<8> hardwareAddress = 4;
-    octet_string IPv4Addresses[] = 5;
-    octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
-  }
-
-  critical event HardwareFaultChange = 0 {
-    HardwareFaultType current[] = 0;
-    HardwareFaultType previous[] = 1;
-  }
-
-  critical event RadioFaultChange = 1 {
-    RadioFaultType current[] = 0;
-    RadioFaultType previous[] = 1;
-  }
-
-  critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
-  }
-
-  critical event BootReason = 3 {
-    BootReasonType bootReason = 0;
-  }
-
-  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
-  readonly attribute int16u rebootCount = 1;
-  readonly attribute int64u upTime = 2;
-  readonly attribute int32u totalOperationalHours = 3;
-  readonly attribute enum8 bootReasons = 4;
-  readonly attribute ENUM8 activeHardwareFaults[] = 5;
-  readonly attribute ENUM8 activeRadioFaults[] = 6;
-  readonly attribute ENUM8 activeNetworkFaults[] = 7;
-  readonly attribute boolean testEventTriggersEnabled = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct TestEventTriggerRequest {
-    OCTET_STRING enableKey = 0;
-    INT64U eventTrigger = 1;
-  }
-
-  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
-}
-
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
-  }
-
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
-    fabric_idx fabricIndex = 254;
-  }
-
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
-  }
-
-  struct GroupKeySetStruct {
-    int16u groupKeySetID = 0;
-    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
-    nullable octet_string<16> epochKey0 = 2;
-    nullable epoch_us epochStartTime0 = 3;
-    nullable octet_string<16> epochKey1 = 4;
-    nullable epoch_us epochStartTime1 = 5;
-    nullable octet_string<16> epochKey2 = 6;
-    nullable epoch_us epochStartTime2 = 7;
-  }
-
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
-  readonly attribute int16u maxGroupsPerFabric = 2;
-  readonly attribute int16u maxGroupKeysPerFabric = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct KeySetWriteRequest {
-    GroupKeySetStruct groupKeySet = 0;
-  }
-
-  request struct KeySetReadRequest {
-    INT16U groupKeySetID = 0;
-  }
-
-  request struct KeySetRemoveRequest {
-    INT16U groupKeySetID = 0;
-  }
-
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
-  }
-
-  response struct KeySetReadResponse = 2 {
-    GroupKeySetStruct groupKeySet = 0;
-  }
-
-  response struct KeySetReadAllIndicesResponse = 5 {
-    INT16U groupKeySetIDs[] = 0;
-  }
-
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
-}
-
-server cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AddGroupRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
-  }
-
-  request struct ViewGroupRequest {
-    group_id groupId = 0;
-  }
-
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
-  }
-
-  request struct RemoveGroupRequest {
-    group_id groupId = 0;
-  }
-
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
-  }
-
-  response struct AddGroupResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-  }
-
-  response struct ViewGroupResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    CHAR_STRING groupName = 2;
-  }
-
-  response struct GetGroupMembershipResponse = 2 {
-    nullable INT8U capacity = 0;
-    group_id groupList[] = 1;
-  }
-
-  response struct RemoveGroupResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-  }
-
-  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
-}
-
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
-  }
-
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
-  }
-
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
-  }
-
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
-  }
-
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
-}
-
-server cluster LocalizationConfiguration = 43 {
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
 server cluster NetworkCommissioning = 49 {
   enum NetworkCommissioningStatus : ENUM8 {
     kSuccess = 0;
@@ -705,437 +709,181 @@ server cluster NetworkCommissioning = 49 {
   command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
 }
 
-client cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
+server cluster DiagnosticLogs = 50 {
+  enum LogsIntent : ENUM8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
   }
 
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
+  enum LogsStatus : ENUM8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
   }
 
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
+  enum LogsTransferProtocol : ENUM8 {
+    kResponsePayload = 0;
+    kBdx = 1;
   }
 
+  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
+  request struct RetrieveLogsRequestRequest {
+    LogsIntent intent = 0;
+    LogsTransferProtocol requestedProtocol = 1;
+    OCTET_STRING transferFileDesignator = 2;
   }
 
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
-  }
+  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+}
 
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
   }
 
-  response struct QueryImageResponse = 1 {
-    OTAQueryStatus status = 0;
-    optional INT32U delayedActionTime = 1;
-    optional CHAR_STRING imageURI = 2;
-    optional INT32U softwareVersion = 3;
-    optional CHAR_STRING softwareVersionString = 4;
-    optional OCTET_STRING updateToken = 5;
-    optional BOOLEAN userConsentNeeded = 6;
-    optional OCTET_STRING metadataForRequestor = 7;
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
   }
 
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
   }
 
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
-}
-
-server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum OTAAnnouncementReason : ENUM8 {
-    kSimpleAnnouncement = 0;
-    kUpdateAvailable = 1;
-    kUrgentUpdateAvailable = 2;
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
   }
 
-  enum OTAChangeReasonEnum : ENUM8 {
-    kUnknown = 0;
-    kSuccess = 1;
-    kFailure = 2;
-    kTimeOut = 3;
-    kDelayByProvider = 4;
+  enum RadioFaultType : ENUM8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
   }
 
-  enum OTAUpdateStateEnum : ENUM8 {
-    kUnknown = 0;
-    kIdle = 1;
-    kQuerying = 2;
-    kDelayedOnQuery = 3;
-    kDownloading = 4;
-    kApplying = 5;
-    kDelayedOnApply = 6;
-    kRollingBack = 7;
-    kDelayedOnUserConsent = 8;
+  struct NetworkInterfaceType {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceType type = 7;
   }
 
-  struct ProviderLocation {
-    node_id providerNodeID = 1;
-    endpoint_no endpoint = 2;
-    fabric_idx fabricIndex = 254;
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultType current[] = 0;
+    HardwareFaultType previous[] = 1;
   }
 
-  info event StateTransition = 0 {
-    OTAUpdateStateEnum previousState = 0;
-    OTAUpdateStateEnum newState = 1;
-    OTAChangeReasonEnum reason = 2;
-    nullable INT32U targetSoftwareVersion = 3;
+  critical event RadioFaultChange = 1 {
+    RadioFaultType current[] = 0;
+    RadioFaultType previous[] = 1;
   }
 
-  critical event VersionApplied = 1 {
-    INT32U softwareVersion = 0;
-    INT16U productID = 1;
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultType current[] = 0;
+    NetworkFaultType previous[] = 1;
   }
 
-  info event DownloadError = 2 {
-    INT32U softwareVersion = 0;
-    INT64U bytesDownloaded = 1;
-    nullable INT8U progressPercent = 2;
-    nullable INT64S platformCode = 3;
+  critical event BootReason = 3 {
+    BootReasonType bootReason = 0;
   }
 
-  attribute ProviderLocation defaultOtaProviders[] = 0;
-  readonly attribute boolean updatePossible = 1;
-  readonly attribute OTAUpdateStateEnum updateState = 2;
-  readonly attribute nullable int8u updateStateProgress = 3;
+  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
+  readonly attribute int32u totalOperationalHours = 3;
+  readonly attribute enum8 bootReasons = 4;
+  readonly attribute ENUM8 activeHardwareFaults[] = 5;
+  readonly attribute ENUM8 activeRadioFaults[] = 6;
+  readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AnnounceOtaProviderRequest {
-    node_id providerNodeId = 0;
-    vendor_id vendorId = 1;
-    OTAAnnouncementReason announcementReason = 2;
-    optional OCTET_STRING metadataForNode = 3;
-    endpoint_no endpoint = 4;
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
   }
 
-  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
-server cluster OperationalCredentials = 62 {
-  enum OperationalCertStatus : ENUM8 {
-    kSuccess = 0;
-    kInvalidPublicKey = 1;
-    kInvalidNodeOpId = 2;
-    kInvalidNOC = 3;
-    kMissingCsr = 4;
-    kTableFull = 5;
-    kInvalidAdminSubject = 6;
-    kInsufficientPrivilege = 8;
-    kFabricConflict = 9;
-    kLabelConflict = 10;
-    kInvalidFabricIndex = 11;
+server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
   }
 
-  struct NOCStruct {
-    octet_string noc = 1;
-    nullable octet_string icac = 2;
-    fabric_idx fabricIndex = 254;
+  struct ThreadMetrics {
+    int64u id = 0;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
-  struct FabricDescriptor {
-    octet_string<65> rootPublicKey = 1;
-    vendor_id vendorId = 2;
-    fabric_id fabricId = 3;
-    node_id nodeId = 4;
-    char_string<32> label = 5;
-    fabric_idx fabricIndex = 254;
+  info event SoftwareFault = 0 {
+    SoftwareFaultStruct softwareFault = 0;
   }
 
-  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
-  readonly attribute FabricDescriptor fabrics[] = 1;
-  readonly attribute int8u supportedFabrics = 2;
-  readonly attribute int8u commissionedFabrics = 3;
-  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
-  readonly attribute fabric_idx currentFabricIndex = 5;
+  readonly attribute ThreadMetrics threadMetrics[] = 0;
+  readonly attribute int64u currentHeapFree = 1;
+  readonly attribute int64u currentHeapUsed = 2;
+  readonly attribute int64u currentHeapHighWatermark = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AttestationRequestRequest {
-    OCTET_STRING attestationNonce = 0;
+  command ResetWatermarks(): DefaultSuccess = 0;
+}
+
+server cluster ThreadNetworkDiagnostics = 53 {
+  enum NetworkFault : ENUM8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
   }
 
-  request struct CertificateChainRequestRequest {
-    INT8U certificateType = 0;
-  }
-
-  request struct CSRRequestRequest {
-    OCTET_STRING CSRNonce = 0;
-    optional boolean isForUpdateNOC = 1;
-  }
-
-  request struct AddNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
-    OCTET_STRING IPKValue = 2;
-    Int64u caseAdminSubject = 3;
-    VENDOR_ID adminVendorId = 4;
-  }
-
-  request struct UpdateNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
-  }
-
-  request struct UpdateFabricLabelRequest {
-    CHAR_STRING label = 0;
-  }
-
-  request struct RemoveFabricRequest {
-    fabric_idx fabricIndex = 0;
-  }
-
-  request struct AddTrustedRootCertificateRequest {
-    OCTET_STRING rootCertificate = 0;
-  }
-
-  response struct AttestationResponse = 1 {
-    OCTET_STRING attestationElements = 0;
-    OCTET_STRING signature = 1;
-  }
-
-  response struct CertificateChainResponse = 3 {
-    OCTET_STRING certificate = 0;
-  }
-
-  response struct CSRResponse = 5 {
-    OCTET_STRING NOCSRElements = 0;
-    OCTET_STRING attestationSignature = 1;
-  }
-
-  response struct NOCResponse = 8 {
-    OperationalCertStatus statusCode = 0;
-    optional fabric_idx fabricIndex = 1;
-    optional CHAR_STRING debugText = 2;
-  }
-
-  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
-  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
-  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
-  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
-  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
-  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
-  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
-  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-}
-
-server cluster Scenes = 5 {
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
-  }
-
-  struct ExtensionFieldSet {
-    cluster_id clusterId = 0;
-    AttributeValuePair attributeValueList[] = 1;
-  }
-
-  struct AttributeValuePair {
-    optional attrib_id attributeId = 0;
-    int8u attributeValue[] = 1;
-  }
-
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AddSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    INT16U transitionTime = 2;
-    CHAR_STRING sceneName = 3;
-    ExtensionFieldSet extensionFieldSets[] = 4;
-  }
-
-  request struct ViewSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RemoveSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RemoveAllScenesRequest {
-    group_id groupId = 0;
-  }
-
-  request struct StoreSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RecallSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    optional nullable INT16U transitionTime = 2;
-  }
-
-  request struct GetSceneMembershipRequest {
-    group_id groupId = 0;
-  }
-
-  response struct AddSceneResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
-
-  response struct ViewSceneResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-    optional INT16U transitionTime = 3;
-    optional CHAR_STRING sceneName = 4;
-    optional ExtensionFieldSet extensionFieldSets[] = 5;
-  }
-
-  response struct RemoveSceneResponse = 2 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
-
-  response struct RemoveAllScenesResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-  }
-
-  response struct StoreSceneResponse = 4 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
-
-  response struct GetSceneMembershipResponse = 6 {
-    ENUM8 status = 0;
-    nullable INT8U capacity = 1;
-    group_id groupId = 2;
-    optional INT8U sceneList[] = 3;
-  }
-
-  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
-  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
-  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
-  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
-  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
-  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
-  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
-}
-
-server cluster SoftwareDiagnostics = 52 {
-  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
-    kWaterMarks = 0x1;
-  }
-
-  struct ThreadMetrics {
-    int64u id = 0;
-    optional char_string<8> name = 1;
-    optional int32u stackFreeCurrent = 2;
-    optional int32u stackFreeMinimum = 3;
-    optional int32u stackSize = 4;
-  }
-
-  info event SoftwareFault = 0 {
-    SoftwareFaultStruct softwareFault = 0;
-  }
-
-  readonly attribute ThreadMetrics threadMetrics[] = 0;
-  readonly attribute int64u currentHeapFree = 1;
-  readonly attribute int64u currentHeapUsed = 2;
-  readonly attribute int64u currentHeapHighWatermark = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command ResetWatermarks(): DefaultSuccess = 0;
-}
-
-server cluster Switch = 59 {
-  info event SwitchLatched = 0 {
-    INT8U newPosition = 0;
-  }
-
-  info event InitialPress = 1 {
-    INT8U newPosition = 0;
-  }
-
-  info event LongPress = 2 {
-    INT8U newPosition = 0;
-  }
-
-  info event ShortRelease = 3 {
-    INT8U previousPosition = 0;
-  }
-
-  info event LongRelease = 4 {
-    INT8U previousPosition = 0;
-  }
-
-  info event MultiPressOngoing = 5 {
-    INT8U newPosition = 0;
-    INT8U currentNumberOfPressesCounted = 1;
-  }
-
-  info event MultiPressComplete = 6 {
-    INT8U newPosition = 0;
-    INT8U totalNumberOfPressesCounted = 1;
-  }
-
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster ThreadNetworkDiagnostics = 53 {
-  enum NetworkFault : ENUM8 {
-    kUnspecified = 0;
-    kLinkDown = 1;
-    kHardwareFailure = 2;
-    kNetworkJammed = 3;
-  }
-
-  enum RoutingRole : ENUM8 {
-    kUnspecified = 0;
-    kUnassigned = 1;
-    kSleepyEndDevice = 2;
-    kEndDevice = 3;
-    kReed = 4;
-    kRouter = 5;
-    kLeader = 6;
+  enum RoutingRole : ENUM8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kReed = 4;
+    kRouter = 5;
+    kLeader = 6;
   }
 
   enum ThreadConnectionStatus : ENUM8 {
@@ -1273,40 +1021,6 @@ server cluster ThreadNetworkDiagnostics = 53 {
   command ResetCounts(): DefaultSuccess = 0;
 }
 
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
-  }
-
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
-  }
-
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster UserLabel = 65 {
-  attribute access(write: manage) LabelStruct labelList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
 server cluster WiFiNetworkDiagnostics = 54 {
   enum AssociationFailureCause : ENUM8 {
     kUnknown = 0;
@@ -1370,6 +1084,292 @@ server cluster WiFiNetworkDiagnostics = 54 {
   command ResetCounts(): DefaultSuccess = 0;
 }
 
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
+  }
+
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command ResetCounts(): DefaultSuccess = 0;
+}
+
+server cluster Switch = 59 {
+  info event SwitchLatched = 0 {
+    INT8U newPosition = 0;
+  }
+
+  info event InitialPress = 1 {
+    INT8U newPosition = 0;
+  }
+
+  info event LongPress = 2 {
+    INT8U newPosition = 0;
+  }
+
+  info event ShortRelease = 3 {
+    INT8U previousPosition = 0;
+  }
+
+  info event LongRelease = 4 {
+    INT8U previousPosition = 0;
+  }
+
+  info event MultiPressOngoing = 5 {
+    INT8U newPosition = 0;
+    INT8U currentNumberOfPressesCounted = 1;
+  }
+
+  info event MultiPressComplete = 6 {
+    INT8U newPosition = 0;
+    INT8U totalNumberOfPressesCounted = 1;
+  }
+
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
+  }
+
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
+  }
+
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
+  }
+
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+  }
+
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
+}
+
+server cluster OperationalCredentials = 62 {
+  enum OperationalCertStatus : ENUM8 {
+    kSuccess = 0;
+    kInvalidPublicKey = 1;
+    kInvalidNodeOpId = 2;
+    kInvalidNOC = 3;
+    kMissingCsr = 4;
+    kTableFull = 5;
+    kInvalidAdminSubject = 6;
+    kInsufficientPrivilege = 8;
+    kFabricConflict = 9;
+    kLabelConflict = 10;
+    kInvalidFabricIndex = 11;
+  }
+
+  struct NOCStruct {
+    octet_string noc = 1;
+    nullable octet_string icac = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct FabricDescriptor {
+    octet_string<65> rootPublicKey = 1;
+    vendor_id vendorId = 2;
+    fabric_id fabricId = 3;
+    node_id nodeId = 4;
+    char_string<32> label = 5;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
+  readonly attribute FabricDescriptor fabrics[] = 1;
+  readonly attribute int8u supportedFabrics = 2;
+  readonly attribute int8u commissionedFabrics = 3;
+  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
+  readonly attribute fabric_idx currentFabricIndex = 5;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AttestationRequestRequest {
+    OCTET_STRING attestationNonce = 0;
+  }
+
+  request struct CertificateChainRequestRequest {
+    INT8U certificateType = 0;
+  }
+
+  request struct CSRRequestRequest {
+    OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
+  }
+
+  request struct AddNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+    OCTET_STRING IPKValue = 2;
+    Int64u caseAdminSubject = 3;
+    VENDOR_ID adminVendorId = 4;
+  }
+
+  request struct UpdateNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+  }
+
+  request struct UpdateFabricLabelRequest {
+    CHAR_STRING label = 0;
+  }
+
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
+  }
+
+  request struct AddTrustedRootCertificateRequest {
+    OCTET_STRING rootCertificate = 0;
+  }
+
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
+  }
+
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
+  }
+
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
+  }
+
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
+  }
+
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
+}
+
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
+  }
+
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
+
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster UserLabel = 65 {
+  attribute access(write: manage) LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
 server cluster WindowCovering = 258 {
   enum EndProductType : ENUM8 {
     kRollerShade = 0;
diff --git a/examples/chef/zzz_generated/rootnode_contactsensor_DreXRHtsq9/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_contactsensor_DreXRHtsq9/ZAPSHA.txt
index 37e00b022574e7..6182e63e8f7dc9 100644
--- a/examples/chef/zzz_generated/rootnode_contactsensor_DreXRHtsq9/ZAPSHA.txt
+++ b/examples/chef/zzz_generated/rootnode_contactsensor_DreXRHtsq9/ZAPSHA.txt
@@ -1 +1 @@
-ca9cbecbc36228db65349864a77402075c39d9d2
\ No newline at end of file
+fd3adabbb2ac031d765da028fb51475260b7cfaf
\ No newline at end of file
diff --git a/examples/chef/zzz_generated/rootnode_contactsensor_DreXRHtsq9/zap-generated/PluginApplicationCallbacks.h b/examples/chef/zzz_generated/rootnode_contactsensor_DreXRHtsq9/zap-generated/PluginApplicationCallbacks.h
index c30ec0cdd7cd26..7cb20885eb6939 100644
--- a/examples/chef/zzz_generated/rootnode_contactsensor_DreXRHtsq9/zap-generated/PluginApplicationCallbacks.h
+++ b/examples/chef/zzz_generated/rootnode_contactsensor_DreXRHtsq9/zap-generated/PluginApplicationCallbacks.h
@@ -22,28 +22,28 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
+    MatterIdentifyPluginServerInitCallback();                                                                                      \
+    MatterGroupsPluginServerInitCallback();                                                                                        \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
+    MatterBindingPluginClientInitCallback();                                                                                       \
     MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
     MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterBooleanStatePluginServerInitCallback();                                                                                  \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
     MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
     MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
     MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
+    MatterSwitchPluginServerInitCallback();                                                                                        \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
     MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();
+    MatterBooleanStatePluginServerInitCallback();
diff --git a/examples/chef/zzz_generated/rootnode_contactsensor_DreXRHtsq9/zap-generated/access.h b/examples/chef/zzz_generated/rootnode_contactsensor_DreXRHtsq9/zap-generated/access.h
index cfa6410afc422f..b88610558e0c15 100644
--- a/examples/chef/zzz_generated/rootnode_contactsensor_DreXRHtsq9/zap-generated/access.h
+++ b/examples/chef/zzz_generated/rootnode_contactsensor_DreXRHtsq9/zap-generated/access.h
@@ -35,7 +35,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -43,6 +42,7 @@
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -54,7 +54,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -62,6 +61,7 @@
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -73,7 +73,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -81,6 +80,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -94,8 +94,8 @@
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -107,8 +107,8 @@
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -120,8 +120,8 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -129,27 +129,23 @@
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -158,31 +154,31 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -191,31 +187,31 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -224,6 +220,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/examples/chef/zzz_generated/rootnode_contactsensor_DreXRHtsq9/zap-generated/gen_config.h b/examples/chef/zzz_generated/rootnode_contactsensor_DreXRHtsq9/zap-generated/gen_config.h
index edf476d42de25d..94e74cb305936a 100644
--- a/examples/chef/zzz_generated/rootnode_contactsensor_DreXRHtsq9/zap-generated/gen_config.h
+++ b/examples/chef/zzz_generated/rootnode_contactsensor_DreXRHtsq9/zap-generated/gen_config.h
@@ -29,153 +29,153 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
+#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_BOOLEAN_STATE_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BOOLEAN_STATE_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
+
+// Use this macro to check if the server side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUPS_SERVER
+#define EMBER_AF_PLUGIN_GROUPS
+
+// Use this macro to check if the server side of the Descriptor cluster is included
+#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR
+
+// Use this macro to check if the client side of the Binding cluster is included
+#define ZCL_USING_BINDING_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_BINDING_CLIENT
+
 // Use this macro to check if the server side of the Access Control cluster is included
 #define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL
 
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
-
 // Use this macro to check if the server side of the Basic cluster is included
 #define ZCL_USING_BASIC_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_BASIC_SERVER
 #define EMBER_AF_PLUGIN_BASIC
 
-// Use this macro to check if the client side of the Binding cluster is included
-#define ZCL_USING_BINDING_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_BINDING_CLIENT
-
-// Use this macro to check if the server side of the Boolean State cluster is included
-#define ZCL_USING_BOOLEAN_STATE_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BOOLEAN_STATE_SERVER
-#define EMBER_AF_PLUGIN_BOOLEAN_STATE
-
-// Use this macro to check if the server side of the Descriptor cluster is included
-#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR
+// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
+#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
 
-// Use this macro to check if the server side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
+#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
 
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Localization Configuration cluster is included
+#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
 
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
 
 // Use this macro to check if the server side of the General Commissioning cluster is included
 #define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
 
-// Use this macro to check if the server side of the General Diagnostics cluster is included
-#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
-
-// Use this macro to check if the server side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUPS_SERVER
-#define EMBER_AF_PLUGIN_GROUPS
-
-// Use this macro to check if the server side of the Identify cluster is included
-#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY
-
-// Use this macro to check if the server side of the Localization Configuration cluster is included
-#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
-
 // Use this macro to check if the server side of the Network Commissioning cluster is included
 #define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
 
-// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
-#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
-
-// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
-#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
 
-// Use this macro to check if the server side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
 // Use this macro to check if the server side of the Software Diagnostics cluster is included
 #define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
 
+// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+
 // Use this macro to check if the server side of the Switch cluster is included
 #define ZCL_USING_SWITCH_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SWITCH_SERVER
 #define EMBER_AF_PLUGIN_SWITCH
 
-// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
-#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
 
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+// Use this macro to check if the server side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
 
 // Use this macro to check if the server side of the User Label cluster is included
 #define ZCL_USING_USER_LABEL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL
 
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Boolean State cluster is included
+#define ZCL_USING_BOOLEAN_STATE_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BOOLEAN_STATE_SERVER
+#define EMBER_AF_PLUGIN_BOOLEAN_STATE
diff --git a/examples/chef/zzz_generated/rootnode_dimmablelight_gY80DaqEUL/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_dimmablelight_gY80DaqEUL/ZAPSHA.txt
index 37e00b022574e7..6182e63e8f7dc9 100644
--- a/examples/chef/zzz_generated/rootnode_dimmablelight_gY80DaqEUL/ZAPSHA.txt
+++ b/examples/chef/zzz_generated/rootnode_dimmablelight_gY80DaqEUL/ZAPSHA.txt
@@ -1 +1 @@
-ca9cbecbc36228db65349864a77402075c39d9d2
\ No newline at end of file
+fd3adabbb2ac031d765da028fb51475260b7cfaf
\ No newline at end of file
diff --git a/examples/chef/zzz_generated/rootnode_dimmablelight_gY80DaqEUL/zap-generated/PluginApplicationCallbacks.h b/examples/chef/zzz_generated/rootnode_dimmablelight_gY80DaqEUL/zap-generated/PluginApplicationCallbacks.h
index 75f86df042d6de..8e4985e7e7ffe2 100644
--- a/examples/chef/zzz_generated/rootnode_dimmablelight_gY80DaqEUL/zap-generated/PluginApplicationCallbacks.h
+++ b/examples/chef/zzz_generated/rootnode_dimmablelight_gY80DaqEUL/zap-generated/PluginApplicationCallbacks.h
@@ -22,31 +22,31 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
     MatterIdentifyPluginServerInitCallback();                                                                                      \
+    MatterGroupsPluginServerInitCallback();                                                                                        \
+    MatterScenesPluginServerInitCallback();                                                                                        \
+    MatterOnOffPluginServerInitCallback();                                                                                         \
     MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
+    MatterBindingPluginClientInitCallback();                                                                                       \
+    MatterAccessControlPluginServerInitCallback();                                                                                 \
+    MatterBasicPluginServerInitCallback();                                                                                         \
     MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
     MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterOccupancySensingPluginClientInitCallback();                                                                              \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterScenesPluginServerInitCallback();                                                                                        \
+    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
     MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
+    MatterSwitchPluginServerInitCallback();                                                                                        \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
     MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();
+    MatterOccupancySensingPluginClientInitCallback();
diff --git a/examples/chef/zzz_generated/rootnode_dimmablelight_gY80DaqEUL/zap-generated/access.h b/examples/chef/zzz_generated/rootnode_dimmablelight_gY80DaqEUL/zap-generated/access.h
index 9ac643c12a6f43..a9d314afc37f8f 100644
--- a/examples/chef/zzz_generated/rootnode_dimmablelight_gY80DaqEUL/zap-generated/access.h
+++ b/examples/chef/zzz_generated/rootnode_dimmablelight_gY80DaqEUL/zap-generated/access.h
@@ -29,64 +29,64 @@
 
 // Parallel array data (*cluster*, attribute, privilege) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__CLUSTER { \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
+    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
-    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
+    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
-    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
     5, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
+    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
-    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -94,46 +94,46 @@
 
 // Parallel array data (*cluster*, attribute, privilege) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__CLUSTER { \
+    6, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    8, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
-    8, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    6, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__ATTRIBUTE { \
+    16387, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    16384, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     5, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
-    16384, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    16387, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__PRIVILEGE { \
+    kMatterAccessPrivilegeManage, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -141,27 +141,27 @@
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -170,35 +170,35 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -207,35 +207,35 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -244,10 +244,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/examples/chef/zzz_generated/rootnode_dimmablelight_gY80DaqEUL/zap-generated/gen_config.h b/examples/chef/zzz_generated/rootnode_dimmablelight_gY80DaqEUL/zap-generated/gen_config.h
index b2358caf80f38d..79b4aa14c8c64f 100644
--- a/examples/chef/zzz_generated/rootnode_dimmablelight_gY80DaqEUL/zap-generated/gen_config.h
+++ b/examples/chef/zzz_generated/rootnode_dimmablelight_gY80DaqEUL/zap-generated/gen_config.h
@@ -29,100 +29,68 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
-#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (2)
 #define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OCCUPANCY_SENSING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OCCUPANCY_SENSING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
-// Use this macro to check if the server side of the Access Control cluster is included
-#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL
-
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
-
-// Use this macro to check if the server side of the Basic cluster is included
-#define ZCL_USING_BASIC_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BASIC_SERVER
-#define EMBER_AF_PLUGIN_BASIC
-
-// Use this macro to check if the client side of the Binding cluster is included
-#define ZCL_USING_BINDING_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_BINDING_CLIENT
-
-// Use this macro to check if the server side of the Descriptor cluster is included
-#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR
-
-// Use this macro to check if the server side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
-
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
-
-// Use this macro to check if the server side of the General Commissioning cluster is included
-#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
-
-// Use this macro to check if the server side of the General Diagnostics cluster is included
-#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
 
 // Use this macro to check if the server side of the Groups cluster is included
 #define ZCL_USING_GROUPS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_GROUPS_SERVER
 #define EMBER_AF_PLUGIN_GROUPS
 
-// Use this macro to check if the server side of the Identify cluster is included
-#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY
+// Use this macro to check if the server side of the Scenes cluster is included
+#define ZCL_USING_SCENES_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SCENES_SERVER
+#define EMBER_AF_PLUGIN_SCENES
+// User options for server plugin Scenes
+// Cluster spec 1.4.8.2
+#ifdef CHIP_CONFIG_MAX_SCENES_PER_FABRIC
+#define MATTER_SCENES_TABLE_SIZE CHIP_CONFIG_MAX_SCENES_PER_FABRIC
+#else
+#define MATTER_SCENES_TABLE_SIZE 16
+#endif
+
+// Scenes FeatureMap Attribute Toggle Scenes Name feature
+// App cluster specs 1.4.4
+#define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
+#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0000 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
+
+// Use this macro to check if the server side of the On/Off cluster is included
+#define ZCL_USING_ON_OFF_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF
 
 // Use this macro to check if the server side of the Level Control cluster is included
 #define ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER
@@ -133,15 +101,24 @@
 #define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0
 #define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0
 
-// Use this macro to check if the server side of the Localization Configuration cluster is included
-#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
+// Use this macro to check if the server side of the Descriptor cluster is included
+#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR
 
-// Use this macro to check if the server side of the Network Commissioning cluster is included
-#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+// Use this macro to check if the client side of the Binding cluster is included
+#define ZCL_USING_BINDING_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_BINDING_CLIENT
+
+// Use this macro to check if the server side of the Access Control cluster is included
+#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL
+
+// Use this macro to check if the server side of the Basic cluster is included
+#define ZCL_USING_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BASIC_SERVER
+#define EMBER_AF_PLUGIN_BASIC
 
 // Use this macro to check if the client side of the OTA Software Update Provider cluster is included
 #define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
@@ -152,63 +129,86 @@
 #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
 #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
 
-// Use this macro to check if the client side of the Occupancy Sensing cluster is included
-#define ZCL_USING_OCCUPANCY_SENSING_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING_CLIENT
+// Use this macro to check if the server side of the Localization Configuration cluster is included
+#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
 
-// Use this macro to check if the server side of the On/Off cluster is included
-#define ZCL_USING_ON_OFF_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
 
-// Use this macro to check if the server side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+// Use this macro to check if the server side of the General Commissioning cluster is included
+#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
 
-// Use this macro to check if the server side of the Scenes cluster is included
-#define ZCL_USING_SCENES_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_SCENES_SERVER
-#define EMBER_AF_PLUGIN_SCENES
-// User options for server plugin Scenes
-// Cluster spec 1.4.8.2
-#ifdef CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#define MATTER_SCENES_TABLE_SIZE CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#else
-#define MATTER_SCENES_TABLE_SIZE 16
-#endif
+// Use this macro to check if the server side of the Network Commissioning cluster is included
+#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
 
-// Scenes FeatureMap Attribute Toggle Scenes Name feature
-// App cluster specs 1.4.4
-#define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
-#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0000 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
 // Use this macro to check if the server side of the Software Diagnostics cluster is included
 #define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
 
+// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+
 // Use this macro to check if the server side of the Switch cluster is included
 #define ZCL_USING_SWITCH_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SWITCH_SERVER
 #define EMBER_AF_PLUGIN_SWITCH
 
-// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
-#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
 
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+// Use this macro to check if the server side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
 
 // Use this macro to check if the server side of the User Label cluster is included
 #define ZCL_USING_USER_LABEL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL
 
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+// Use this macro to check if the client side of the Occupancy Sensing cluster is included
+#define ZCL_USING_OCCUPANCY_SENSING_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING_CLIENT
diff --git a/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/ZAPSHA.txt
index 37e00b022574e7..6182e63e8f7dc9 100644
--- a/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/ZAPSHA.txt
+++ b/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/ZAPSHA.txt
@@ -1 +1 @@
-ca9cbecbc36228db65349864a77402075c39d9d2
\ No newline at end of file
+fd3adabbb2ac031d765da028fb51475260b7cfaf
\ No newline at end of file
diff --git a/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/zap-generated/CHIPClientCallbacks.h b/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/zap-generated/CHIPClientCallbacks.h
index 53466c6014ddd0..5daad91c60c9b9 100644
--- a/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/zap-generated/CHIPClientCallbacks.h
+++ b/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/zap-generated/CHIPClientCallbacks.h
@@ -30,6 +30,12 @@
 #include <lib/support/Span.h>
 
 // List specific responses
+typedef void (*GroupsGeneratedCommandListListAttributeCallback)(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*GroupsAcceptedCommandListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*GroupsAttributeListListAttributeCallback)(void * context,
+                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*BindingBindingListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::Binding::Structs::TargetStruct::DecodableType> & data);
@@ -39,9 +45,3 @@ typedef void (*BindingAcceptedCommandListListAttributeCallback)(void * context,
                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*BindingAttributeListListAttributeCallback)(void * context,
                                                           const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*GroupsGeneratedCommandListListAttributeCallback)(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*GroupsAcceptedCommandListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*GroupsAttributeListListAttributeCallback)(void * context,
-                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
diff --git a/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/zap-generated/CHIPClusters.h b/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/zap-generated/CHIPClusters.h
index a3348268a6bba9..d98f0914173eb9 100644
--- a/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/zap-generated/CHIPClusters.h
+++ b/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/zap-generated/CHIPClusters.h
@@ -30,18 +30,18 @@
 namespace chip {
 namespace Controller {
 
-class DLL_EXPORT BindingCluster : public ClusterBase
+class DLL_EXPORT GroupsCluster : public ClusterBase
 {
 public:
-    BindingCluster() : ClusterBase(app::Clusters::Binding::Id) {}
-    ~BindingCluster() {}
+    GroupsCluster() : ClusterBase(app::Clusters::Groups::Id) {}
+    ~GroupsCluster() {}
 };
 
-class DLL_EXPORT GroupsCluster : public ClusterBase
+class DLL_EXPORT BindingCluster : public ClusterBase
 {
 public:
-    GroupsCluster() : ClusterBase(app::Clusters::Groups::Id) {}
-    ~GroupsCluster() {}
+    BindingCluster() : ClusterBase(app::Clusters::Binding::Id) {}
+    ~BindingCluster() {}
 };
 
 class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
diff --git a/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/zap-generated/PluginApplicationCallbacks.h b/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/zap-generated/PluginApplicationCallbacks.h
index c7e0f1a416fbf0..42b72ac388d102 100644
--- a/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/zap-generated/PluginApplicationCallbacks.h
+++ b/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/zap-generated/PluginApplicationCallbacks.h
@@ -22,29 +22,29 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterFlowMeasurementPluginServerInitCallback();                                                                               \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterIdentifyPluginServerInitCallback();                                                                                      \
     MatterGroupsPluginClientInitCallback();                                                                                        \
     MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
+    MatterBindingPluginClientInitCallback();                                                                                       \
+    MatterAccessControlPluginServerInitCallback();                                                                                 \
+    MatterBasicPluginServerInitCallback();                                                                                         \
     MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
     MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
     MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
+    MatterSwitchPluginServerInitCallback();                                                                                        \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
     MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();
+    MatterFlowMeasurementPluginServerInitCallback();
diff --git a/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/zap-generated/access.h b/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/zap-generated/access.h
index cfa6410afc422f..b88610558e0c15 100644
--- a/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/zap-generated/access.h
+++ b/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/zap-generated/access.h
@@ -35,7 +35,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -43,6 +42,7 @@
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -54,7 +54,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -62,6 +61,7 @@
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -73,7 +73,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -81,6 +80,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -94,8 +94,8 @@
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -107,8 +107,8 @@
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -120,8 +120,8 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -129,27 +129,23 @@
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -158,31 +154,31 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -191,31 +187,31 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -224,6 +220,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/zap-generated/gen_config.h b/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/zap-generated/gen_config.h
index 168fa0770d05e7..6ab95a2ea7f4f9 100644
--- a/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/zap-generated/gen_config.h
+++ b/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/zap-generated/gen_config.h
@@ -29,158 +29,158 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
-#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_GROUPS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
+
+// Use this macro to check if the client side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_GROUPS_CLIENT
+
+// Use this macro to check if the server side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUPS_SERVER
+#define EMBER_AF_PLUGIN_GROUPS
+
+// Use this macro to check if the server side of the Descriptor cluster is included
+#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR
+
+// Use this macro to check if the client side of the Binding cluster is included
+#define ZCL_USING_BINDING_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_BINDING_CLIENT
+
 // Use this macro to check if the server side of the Access Control cluster is included
 #define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL
 
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
-
 // Use this macro to check if the server side of the Basic cluster is included
 #define ZCL_USING_BASIC_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_BASIC_SERVER
 #define EMBER_AF_PLUGIN_BASIC
 
-// Use this macro to check if the client side of the Binding cluster is included
-#define ZCL_USING_BINDING_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_BINDING_CLIENT
-
-// Use this macro to check if the server side of the Descriptor cluster is included
-#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR
-
-// Use this macro to check if the server side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
+#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
 
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
+#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
 
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
+// Use this macro to check if the server side of the Localization Configuration cluster is included
+#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
 
-// Use this macro to check if the server side of the Flow Measurement cluster is included
-#define ZCL_USING_FLOW_MEASUREMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT_SERVER
-#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
 
 // Use this macro to check if the server side of the General Commissioning cluster is included
 #define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
 
-// Use this macro to check if the server side of the General Diagnostics cluster is included
-#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
-
-// Use this macro to check if the client side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_GROUPS_CLIENT
-
-// Use this macro to check if the server side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUPS_SERVER
-#define EMBER_AF_PLUGIN_GROUPS
-
-// Use this macro to check if the server side of the Identify cluster is included
-#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY
-
-// Use this macro to check if the server side of the Localization Configuration cluster is included
-#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
-
 // Use this macro to check if the server side of the Network Commissioning cluster is included
 #define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
 
-// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
-#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
-
-// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
-#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
 
-// Use this macro to check if the server side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
 // Use this macro to check if the server side of the Software Diagnostics cluster is included
 #define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
 
+// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+
 // Use this macro to check if the server side of the Switch cluster is included
 #define ZCL_USING_SWITCH_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SWITCH_SERVER
 #define EMBER_AF_PLUGIN_SWITCH
 
-// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
-#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
 
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+// Use this macro to check if the server side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
 
 // Use this macro to check if the server side of the User Label cluster is included
 #define ZCL_USING_USER_LABEL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL
 
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Flow Measurement cluster is included
+#define ZCL_USING_FLOW_MEASUREMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT_SERVER
+#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT
diff --git a/examples/chef/zzz_generated/rootnode_heatingcoolingunit_Yt3sl2ssuP/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_heatingcoolingunit_Yt3sl2ssuP/ZAPSHA.txt
index 37e00b022574e7..6182e63e8f7dc9 100644
--- a/examples/chef/zzz_generated/rootnode_heatingcoolingunit_Yt3sl2ssuP/ZAPSHA.txt
+++ b/examples/chef/zzz_generated/rootnode_heatingcoolingunit_Yt3sl2ssuP/ZAPSHA.txt
@@ -1 +1 @@
-ca9cbecbc36228db65349864a77402075c39d9d2
\ No newline at end of file
+fd3adabbb2ac031d765da028fb51475260b7cfaf
\ No newline at end of file
diff --git a/examples/chef/zzz_generated/rootnode_heatingcoolingunit_Yt3sl2ssuP/zap-generated/PluginApplicationCallbacks.h b/examples/chef/zzz_generated/rootnode_heatingcoolingunit_Yt3sl2ssuP/zap-generated/PluginApplicationCallbacks.h
index 7d26e5e6f7caa7..3b886f35afccba 100644
--- a/examples/chef/zzz_generated/rootnode_heatingcoolingunit_Yt3sl2ssuP/zap-generated/PluginApplicationCallbacks.h
+++ b/examples/chef/zzz_generated/rootnode_heatingcoolingunit_Yt3sl2ssuP/zap-generated/PluginApplicationCallbacks.h
@@ -22,32 +22,32 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFanControlPluginServerInitCallback();                                                                                    \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
     MatterIdentifyPluginServerInitCallback();                                                                                      \
+    MatterGroupsPluginServerInitCallback();                                                                                        \
+    MatterScenesPluginServerInitCallback();                                                                                        \
+    MatterOnOffPluginServerInitCallback();                                                                                         \
     MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
+    MatterBindingPluginClientInitCallback();                                                                                       \
+    MatterAccessControlPluginServerInitCallback();                                                                                 \
+    MatterBasicPluginServerInitCallback();                                                                                         \
     MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
     MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterScenesPluginServerInitCallback();                                                                                        \
+    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterThermostatPluginClientInitCallback();                                                                                    \
     MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
+    MatterSwitchPluginServerInitCallback();                                                                                        \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
     MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();
+    MatterThermostatPluginClientInitCallback();                                                                                    \
+    MatterFanControlPluginServerInitCallback();
diff --git a/examples/chef/zzz_generated/rootnode_heatingcoolingunit_Yt3sl2ssuP/zap-generated/access.h b/examples/chef/zzz_generated/rootnode_heatingcoolingunit_Yt3sl2ssuP/zap-generated/access.h
index 188c30bcbbe87b..39daac3ddc525c 100644
--- a/examples/chef/zzz_generated/rootnode_heatingcoolingunit_Yt3sl2ssuP/zap-generated/access.h
+++ b/examples/chef/zzz_generated/rootnode_heatingcoolingunit_Yt3sl2ssuP/zap-generated/access.h
@@ -35,7 +35,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -43,6 +42,7 @@
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -54,7 +54,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -62,6 +61,7 @@
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -73,7 +73,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -81,6 +80,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -94,8 +94,8 @@
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -107,8 +107,8 @@
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -120,8 +120,8 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -129,27 +129,27 @@
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -158,35 +158,35 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -195,35 +195,35 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -232,10 +232,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/examples/chef/zzz_generated/rootnode_heatingcoolingunit_Yt3sl2ssuP/zap-generated/gen_config.h b/examples/chef/zzz_generated/rootnode_heatingcoolingunit_Yt3sl2ssuP/zap-generated/gen_config.h
index ce5db4ec001a75..375f45c9a01c49 100644
--- a/examples/chef/zzz_generated/rootnode_heatingcoolingunit_Yt3sl2ssuP/zap-generated/gen_config.h
+++ b/examples/chef/zzz_generated/rootnode_heatingcoolingunit_Yt3sl2ssuP/zap-generated/gen_config.h
@@ -29,106 +29,69 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
-#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FAN_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (2)
 #define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_THERMOSTAT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_THERMOSTAT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_FAN_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
-// Use this macro to check if the server side of the Access Control cluster is included
-#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL
-
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
-
-// Use this macro to check if the server side of the Basic cluster is included
-#define ZCL_USING_BASIC_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BASIC_SERVER
-#define EMBER_AF_PLUGIN_BASIC
-
-// Use this macro to check if the client side of the Binding cluster is included
-#define ZCL_USING_BINDING_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_BINDING_CLIENT
-
-// Use this macro to check if the server side of the Descriptor cluster is included
-#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR
-
-// Use this macro to check if the server side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
-
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Fan Control cluster is included
-#define ZCL_USING_FAN_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FAN_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_FAN_CONTROL
-
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
-
-// Use this macro to check if the server side of the General Commissioning cluster is included
-#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
-
-// Use this macro to check if the server side of the General Diagnostics cluster is included
-#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
 
 // Use this macro to check if the server side of the Groups cluster is included
 #define ZCL_USING_GROUPS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_GROUPS_SERVER
 #define EMBER_AF_PLUGIN_GROUPS
 
-// Use this macro to check if the server side of the Identify cluster is included
-#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY
+// Use this macro to check if the server side of the Scenes cluster is included
+#define ZCL_USING_SCENES_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SCENES_SERVER
+#define EMBER_AF_PLUGIN_SCENES
+// User options for server plugin Scenes
+// Cluster spec 1.4.8.2
+#ifdef CHIP_CONFIG_MAX_SCENES_PER_FABRIC
+#define MATTER_SCENES_TABLE_SIZE CHIP_CONFIG_MAX_SCENES_PER_FABRIC
+#else
+#define MATTER_SCENES_TABLE_SIZE 16
+#endif
+
+// Scenes FeatureMap Attribute Toggle Scenes Name feature
+// App cluster specs 1.4.4
+#define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
+#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0001 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
+
+// Use this macro to check if the server side of the On/Off cluster is included
+#define ZCL_USING_ON_OFF_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF
 
 // Use this macro to check if the server side of the Level Control cluster is included
 #define ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER
@@ -139,15 +102,24 @@
 #define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0
 #define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0
 
-// Use this macro to check if the server side of the Localization Configuration cluster is included
-#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
+// Use this macro to check if the server side of the Descriptor cluster is included
+#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR
 
-// Use this macro to check if the server side of the Network Commissioning cluster is included
-#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+// Use this macro to check if the client side of the Binding cluster is included
+#define ZCL_USING_BINDING_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_BINDING_CLIENT
+
+// Use this macro to check if the server side of the Access Control cluster is included
+#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL
+
+// Use this macro to check if the server side of the Basic cluster is included
+#define ZCL_USING_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BASIC_SERVER
+#define EMBER_AF_PLUGIN_BASIC
 
 // Use this macro to check if the client side of the OTA Software Update Provider cluster is included
 #define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
@@ -158,63 +130,91 @@
 #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
 #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
 
-// Use this macro to check if the server side of the On/Off cluster is included
-#define ZCL_USING_ON_OFF_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF
+// Use this macro to check if the server side of the Localization Configuration cluster is included
+#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
 
-// Use this macro to check if the server side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
 
-// Use this macro to check if the server side of the Scenes cluster is included
-#define ZCL_USING_SCENES_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_SCENES_SERVER
-#define EMBER_AF_PLUGIN_SCENES
-// User options for server plugin Scenes
-// Cluster spec 1.4.8.2
-#ifdef CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#define MATTER_SCENES_TABLE_SIZE CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#else
-#define MATTER_SCENES_TABLE_SIZE 16
-#endif
+// Use this macro to check if the server side of the General Commissioning cluster is included
+#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
 
-// Scenes FeatureMap Attribute Toggle Scenes Name feature
-// App cluster specs 1.4.4
-#define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
-#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0001 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
+// Use this macro to check if the server side of the Network Commissioning cluster is included
+#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
 // Use this macro to check if the server side of the Software Diagnostics cluster is included
 #define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
 
+// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+
 // Use this macro to check if the server side of the Switch cluster is included
 #define ZCL_USING_SWITCH_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SWITCH_SERVER
 #define EMBER_AF_PLUGIN_SWITCH
 
-// Use this macro to check if the client side of the Thermostat cluster is included
-#define ZCL_USING_THERMOSTAT_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_THERMOSTAT_CLIENT
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
 
-// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
-#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
 
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
 
 // Use this macro to check if the server side of the User Label cluster is included
 #define ZCL_USING_USER_LABEL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL
 
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+// Use this macro to check if the client side of the Thermostat cluster is included
+#define ZCL_USING_THERMOSTAT_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_THERMOSTAT_CLIENT
+
+// Use this macro to check if the server side of the Fan Control cluster is included
+#define ZCL_USING_FAN_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FAN_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_FAN_CONTROL
diff --git a/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/ZAPSHA.txt
index 37e00b022574e7..6182e63e8f7dc9 100644
--- a/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/ZAPSHA.txt
+++ b/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/ZAPSHA.txt
@@ -1 +1 @@
-ca9cbecbc36228db65349864a77402075c39d9d2
\ No newline at end of file
+fd3adabbb2ac031d765da028fb51475260b7cfaf
\ No newline at end of file
diff --git a/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/zap-generated/CHIPClientCallbacks.h b/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/zap-generated/CHIPClientCallbacks.h
index 53466c6014ddd0..5daad91c60c9b9 100644
--- a/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/zap-generated/CHIPClientCallbacks.h
+++ b/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/zap-generated/CHIPClientCallbacks.h
@@ -30,6 +30,12 @@
 #include <lib/support/Span.h>
 
 // List specific responses
+typedef void (*GroupsGeneratedCommandListListAttributeCallback)(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*GroupsAcceptedCommandListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*GroupsAttributeListListAttributeCallback)(void * context,
+                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*BindingBindingListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::Binding::Structs::TargetStruct::DecodableType> & data);
@@ -39,9 +45,3 @@ typedef void (*BindingAcceptedCommandListListAttributeCallback)(void * context,
                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*BindingAttributeListListAttributeCallback)(void * context,
                                                           const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*GroupsGeneratedCommandListListAttributeCallback)(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*GroupsAcceptedCommandListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*GroupsAttributeListListAttributeCallback)(void * context,
-                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
diff --git a/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/zap-generated/CHIPClusters.h b/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/zap-generated/CHIPClusters.h
index a3348268a6bba9..d98f0914173eb9 100644
--- a/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/zap-generated/CHIPClusters.h
+++ b/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/zap-generated/CHIPClusters.h
@@ -30,18 +30,18 @@
 namespace chip {
 namespace Controller {
 
-class DLL_EXPORT BindingCluster : public ClusterBase
+class DLL_EXPORT GroupsCluster : public ClusterBase
 {
 public:
-    BindingCluster() : ClusterBase(app::Clusters::Binding::Id) {}
-    ~BindingCluster() {}
+    GroupsCluster() : ClusterBase(app::Clusters::Groups::Id) {}
+    ~GroupsCluster() {}
 };
 
-class DLL_EXPORT GroupsCluster : public ClusterBase
+class DLL_EXPORT BindingCluster : public ClusterBase
 {
 public:
-    GroupsCluster() : ClusterBase(app::Clusters::Groups::Id) {}
-    ~GroupsCluster() {}
+    BindingCluster() : ClusterBase(app::Clusters::Binding::Id) {}
+    ~BindingCluster() {}
 };
 
 class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
diff --git a/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/zap-generated/PluginApplicationCallbacks.h b/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/zap-generated/PluginApplicationCallbacks.h
index 229fba19e36ba9..1e97ffe07f4f74 100644
--- a/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/zap-generated/PluginApplicationCallbacks.h
+++ b/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/zap-generated/PluginApplicationCallbacks.h
@@ -22,29 +22,29 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterIdentifyPluginServerInitCallback();                                                                                      \
     MatterGroupsPluginClientInitCallback();                                                                                        \
     MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
+    MatterBindingPluginClientInitCallback();                                                                                       \
+    MatterAccessControlPluginServerInitCallback();                                                                                 \
+    MatterBasicPluginServerInitCallback();                                                                                         \
     MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
     MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterRelativeHumidityMeasurementPluginServerInitCallback();                                                                   \
+    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
     MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
+    MatterSwitchPluginServerInitCallback();                                                                                        \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
     MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();
+    MatterRelativeHumidityMeasurementPluginServerInitCallback();
diff --git a/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/zap-generated/access.h b/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/zap-generated/access.h
index cfa6410afc422f..b88610558e0c15 100644
--- a/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/zap-generated/access.h
+++ b/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/zap-generated/access.h
@@ -35,7 +35,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -43,6 +42,7 @@
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -54,7 +54,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -62,6 +61,7 @@
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -73,7 +73,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -81,6 +80,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -94,8 +94,8 @@
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -107,8 +107,8 @@
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -120,8 +120,8 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -129,27 +129,23 @@
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -158,31 +154,31 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -191,31 +187,31 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -224,6 +220,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/zap-generated/gen_config.h b/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/zap-generated/gen_config.h
index 09d41898e35f04..dffb6f352272a4 100644
--- a/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/zap-generated/gen_config.h
+++ b/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/zap-generated/gen_config.h
@@ -29,158 +29,158 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
-#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_GROUPS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
+
+// Use this macro to check if the client side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_GROUPS_CLIENT
+
+// Use this macro to check if the server side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUPS_SERVER
+#define EMBER_AF_PLUGIN_GROUPS
+
+// Use this macro to check if the server side of the Descriptor cluster is included
+#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR
+
+// Use this macro to check if the client side of the Binding cluster is included
+#define ZCL_USING_BINDING_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_BINDING_CLIENT
+
 // Use this macro to check if the server side of the Access Control cluster is included
 #define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL
 
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
-
 // Use this macro to check if the server side of the Basic cluster is included
 #define ZCL_USING_BASIC_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_BASIC_SERVER
 #define EMBER_AF_PLUGIN_BASIC
 
-// Use this macro to check if the client side of the Binding cluster is included
-#define ZCL_USING_BINDING_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_BINDING_CLIENT
-
-// Use this macro to check if the server side of the Descriptor cluster is included
-#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR
+// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
+#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
 
-// Use this macro to check if the server side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
+#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
 
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Localization Configuration cluster is included
+#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
 
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
 
 // Use this macro to check if the server side of the General Commissioning cluster is included
 #define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
 
-// Use this macro to check if the server side of the General Diagnostics cluster is included
-#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
-
-// Use this macro to check if the client side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_GROUPS_CLIENT
-
-// Use this macro to check if the server side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUPS_SERVER
-#define EMBER_AF_PLUGIN_GROUPS
-
-// Use this macro to check if the server side of the Identify cluster is included
-#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY
-
-// Use this macro to check if the server side of the Localization Configuration cluster is included
-#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
-
 // Use this macro to check if the server side of the Network Commissioning cluster is included
 #define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
 
-// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
-#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
-
-// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
-#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
-
-// Use this macro to check if the server side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
 
-// Use this macro to check if the server side of the Relative Humidity Measurement cluster is included
-#define ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_RELATIVE_HUMIDITY_MEASUREMENT_SERVER
-#define EMBER_AF_PLUGIN_RELATIVE_HUMIDITY_MEASUREMENT
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
 // Use this macro to check if the server side of the Software Diagnostics cluster is included
 #define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
 
+// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+
 // Use this macro to check if the server side of the Switch cluster is included
 #define ZCL_USING_SWITCH_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SWITCH_SERVER
 #define EMBER_AF_PLUGIN_SWITCH
 
-// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
-#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
 
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+// Use this macro to check if the server side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
 
 // Use this macro to check if the server side of the User Label cluster is included
 #define ZCL_USING_USER_LABEL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL
 
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Relative Humidity Measurement cluster is included
+#define ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_RELATIVE_HUMIDITY_MEASUREMENT_SERVER
+#define EMBER_AF_PLUGIN_RELATIVE_HUMIDITY_MEASUREMENT
diff --git a/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/ZAPSHA.txt
index 37e00b022574e7..6182e63e8f7dc9 100644
--- a/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/ZAPSHA.txt
+++ b/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/ZAPSHA.txt
@@ -1 +1 @@
-ca9cbecbc36228db65349864a77402075c39d9d2
\ No newline at end of file
+fd3adabbb2ac031d765da028fb51475260b7cfaf
\ No newline at end of file
diff --git a/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/zap-generated/CHIPClientCallbacks.h b/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/zap-generated/CHIPClientCallbacks.h
index 53466c6014ddd0..5daad91c60c9b9 100644
--- a/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/zap-generated/CHIPClientCallbacks.h
+++ b/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/zap-generated/CHIPClientCallbacks.h
@@ -30,6 +30,12 @@
 #include <lib/support/Span.h>
 
 // List specific responses
+typedef void (*GroupsGeneratedCommandListListAttributeCallback)(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*GroupsAcceptedCommandListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*GroupsAttributeListListAttributeCallback)(void * context,
+                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*BindingBindingListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::Binding::Structs::TargetStruct::DecodableType> & data);
@@ -39,9 +45,3 @@ typedef void (*BindingAcceptedCommandListListAttributeCallback)(void * context,
                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*BindingAttributeListListAttributeCallback)(void * context,
                                                           const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*GroupsGeneratedCommandListListAttributeCallback)(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*GroupsAcceptedCommandListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*GroupsAttributeListListAttributeCallback)(void * context,
-                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
diff --git a/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/zap-generated/CHIPClusters.h b/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/zap-generated/CHIPClusters.h
index a3348268a6bba9..d98f0914173eb9 100644
--- a/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/zap-generated/CHIPClusters.h
+++ b/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/zap-generated/CHIPClusters.h
@@ -30,18 +30,18 @@
 namespace chip {
 namespace Controller {
 
-class DLL_EXPORT BindingCluster : public ClusterBase
+class DLL_EXPORT GroupsCluster : public ClusterBase
 {
 public:
-    BindingCluster() : ClusterBase(app::Clusters::Binding::Id) {}
-    ~BindingCluster() {}
+    GroupsCluster() : ClusterBase(app::Clusters::Groups::Id) {}
+    ~GroupsCluster() {}
 };
 
-class DLL_EXPORT GroupsCluster : public ClusterBase
+class DLL_EXPORT BindingCluster : public ClusterBase
 {
 public:
-    GroupsCluster() : ClusterBase(app::Clusters::Groups::Id) {}
-    ~GroupsCluster() {}
+    BindingCluster() : ClusterBase(app::Clusters::Binding::Id) {}
+    ~BindingCluster() {}
 };
 
 class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
diff --git a/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/zap-generated/PluginApplicationCallbacks.h b/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/zap-generated/PluginApplicationCallbacks.h
index 6e10d935b07326..e505e9f530832f 100644
--- a/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/zap-generated/PluginApplicationCallbacks.h
+++ b/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/zap-generated/PluginApplicationCallbacks.h
@@ -22,29 +22,29 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterIdentifyPluginServerInitCallback();                                                                                      \
     MatterGroupsPluginClientInitCallback();                                                                                        \
     MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
+    MatterBindingPluginClientInitCallback();                                                                                       \
+    MatterAccessControlPluginServerInitCallback();                                                                                 \
+    MatterBasicPluginServerInitCallback();                                                                                         \
     MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
     MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterOccupancySensingPluginServerInitCallback();                                                                              \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
     MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
+    MatterSwitchPluginServerInitCallback();                                                                                        \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
     MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();
+    MatterOccupancySensingPluginServerInitCallback();
diff --git a/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/zap-generated/access.h b/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/zap-generated/access.h
index cfa6410afc422f..b88610558e0c15 100644
--- a/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/zap-generated/access.h
+++ b/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/zap-generated/access.h
@@ -35,7 +35,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -43,6 +42,7 @@
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -54,7 +54,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -62,6 +61,7 @@
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -73,7 +73,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -81,6 +80,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -94,8 +94,8 @@
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -107,8 +107,8 @@
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -120,8 +120,8 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -129,27 +129,23 @@
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -158,31 +154,31 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -191,31 +187,31 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -224,6 +220,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/zap-generated/gen_config.h b/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/zap-generated/gen_config.h
index f2b5dac1e0866f..484e5db7eac486 100644
--- a/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/zap-generated/gen_config.h
+++ b/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/zap-generated/gen_config.h
@@ -29,158 +29,158 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
-#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_GROUPS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OCCUPANCY_SENSING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OCCUPANCY_SENSING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
+
+// Use this macro to check if the client side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_GROUPS_CLIENT
+
+// Use this macro to check if the server side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUPS_SERVER
+#define EMBER_AF_PLUGIN_GROUPS
+
+// Use this macro to check if the server side of the Descriptor cluster is included
+#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR
+
+// Use this macro to check if the client side of the Binding cluster is included
+#define ZCL_USING_BINDING_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_BINDING_CLIENT
+
 // Use this macro to check if the server side of the Access Control cluster is included
 #define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL
 
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
-
 // Use this macro to check if the server side of the Basic cluster is included
 #define ZCL_USING_BASIC_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_BASIC_SERVER
 #define EMBER_AF_PLUGIN_BASIC
 
-// Use this macro to check if the client side of the Binding cluster is included
-#define ZCL_USING_BINDING_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_BINDING_CLIENT
-
-// Use this macro to check if the server side of the Descriptor cluster is included
-#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR
+// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
+#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
 
-// Use this macro to check if the server side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
+#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
 
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Localization Configuration cluster is included
+#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
 
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
 
 // Use this macro to check if the server side of the General Commissioning cluster is included
 #define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
 
-// Use this macro to check if the server side of the General Diagnostics cluster is included
-#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
-
-// Use this macro to check if the client side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_GROUPS_CLIENT
-
-// Use this macro to check if the server side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUPS_SERVER
-#define EMBER_AF_PLUGIN_GROUPS
-
-// Use this macro to check if the server side of the Identify cluster is included
-#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY
-
-// Use this macro to check if the server side of the Localization Configuration cluster is included
-#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
-
 // Use this macro to check if the server side of the Network Commissioning cluster is included
 #define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
 
-// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
-#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
-
-// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
-#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
-
-// Use this macro to check if the server side of the Occupancy Sensing cluster is included
-#define ZCL_USING_OCCUPANCY_SENSING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING_SERVER
-#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
 
-// Use this macro to check if the server side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
 // Use this macro to check if the server side of the Software Diagnostics cluster is included
 #define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
 
+// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+
 // Use this macro to check if the server side of the Switch cluster is included
 #define ZCL_USING_SWITCH_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SWITCH_SERVER
 #define EMBER_AF_PLUGIN_SWITCH
 
-// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
-#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
 
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+// Use this macro to check if the server side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
 
 // Use this macro to check if the server side of the User Label cluster is included
 #define ZCL_USING_USER_LABEL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL
 
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Occupancy Sensing cluster is included
+#define ZCL_USING_OCCUPANCY_SENSING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING_SERVER
+#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING
diff --git a/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/ZAPSHA.txt
index 37e00b022574e7..6182e63e8f7dc9 100644
--- a/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/ZAPSHA.txt
+++ b/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/ZAPSHA.txt
@@ -1 +1 @@
-ca9cbecbc36228db65349864a77402075c39d9d2
\ No newline at end of file
+fd3adabbb2ac031d765da028fb51475260b7cfaf
\ No newline at end of file
diff --git a/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/zap-generated/CHIPClientCallbacks.h b/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/zap-generated/CHIPClientCallbacks.h
index 7f0bb7815c7014..d565f9c3d53ac8 100644
--- a/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/zap-generated/CHIPClientCallbacks.h
+++ b/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/zap-generated/CHIPClientCallbacks.h
@@ -30,6 +30,18 @@
 #include <lib/support/Span.h>
 
 // List specific responses
+typedef void (*ScenesGeneratedCommandListListAttributeCallback)(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ScenesAcceptedCommandListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ScenesAttributeListListAttributeCallback)(void * context,
+                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*OnOffGeneratedCommandListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*OnOffAcceptedCommandListListAttributeCallback)(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*OnOffAttributeListListAttributeCallback)(void * context,
+                                                        const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*BindingBindingListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::Binding::Structs::TargetStruct::DecodableType> & data);
@@ -39,15 +51,3 @@ typedef void (*BindingAcceptedCommandListListAttributeCallback)(void * context,
                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*BindingAttributeListListAttributeCallback)(void * context,
                                                           const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*OnOffGeneratedCommandListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*OnOffAcceptedCommandListListAttributeCallback)(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*OnOffAttributeListListAttributeCallback)(void * context,
-                                                        const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ScenesGeneratedCommandListListAttributeCallback)(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ScenesAcceptedCommandListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ScenesAttributeListListAttributeCallback)(void * context,
-                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
diff --git a/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/zap-generated/CHIPClusters.h b/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/zap-generated/CHIPClusters.h
index b3bc5fb3fac2fc..bafdad080ae4c8 100644
--- a/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/zap-generated/CHIPClusters.h
+++ b/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/zap-generated/CHIPClusters.h
@@ -30,32 +30,32 @@
 namespace chip {
 namespace Controller {
 
-class DLL_EXPORT BindingCluster : public ClusterBase
+class DLL_EXPORT ScenesCluster : public ClusterBase
 {
 public:
-    BindingCluster() : ClusterBase(app::Clusters::Binding::Id) {}
-    ~BindingCluster() {}
+    ScenesCluster() : ClusterBase(app::Clusters::Scenes::Id) {}
+    ~ScenesCluster() {}
 };
 
-class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
+class DLL_EXPORT OnOffCluster : public ClusterBase
 {
 public:
-    OtaSoftwareUpdateProviderCluster() : ClusterBase(app::Clusters::OtaSoftwareUpdateProvider::Id) {}
-    ~OtaSoftwareUpdateProviderCluster() {}
+    OnOffCluster() : ClusterBase(app::Clusters::OnOff::Id) {}
+    ~OnOffCluster() {}
 };
 
-class DLL_EXPORT OnOffCluster : public ClusterBase
+class DLL_EXPORT BindingCluster : public ClusterBase
 {
 public:
-    OnOffCluster() : ClusterBase(app::Clusters::OnOff::Id) {}
-    ~OnOffCluster() {}
+    BindingCluster() : ClusterBase(app::Clusters::Binding::Id) {}
+    ~BindingCluster() {}
 };
 
-class DLL_EXPORT ScenesCluster : public ClusterBase
+class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
 {
 public:
-    ScenesCluster() : ClusterBase(app::Clusters::Scenes::Id) {}
-    ~ScenesCluster() {}
+    OtaSoftwareUpdateProviderCluster() : ClusterBase(app::Clusters::OtaSoftwareUpdateProvider::Id) {}
+    ~OtaSoftwareUpdateProviderCluster() {}
 };
 
 } // namespace Controller
diff --git a/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/zap-generated/PluginApplicationCallbacks.h b/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/zap-generated/PluginApplicationCallbacks.h
index 7b6ae4f96515bd..3edd89a53f2702 100644
--- a/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/zap-generated/PluginApplicationCallbacks.h
+++ b/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/zap-generated/PluginApplicationCallbacks.h
@@ -22,31 +22,31 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
+    MatterIdentifyPluginServerInitCallback();                                                                                      \
+    MatterGroupsPluginServerInitCallback();                                                                                        \
+    MatterScenesPluginClientInitCallback();                                                                                        \
+    MatterScenesPluginServerInitCallback();                                                                                        \
+    MatterOnOffPluginClientInitCallback();                                                                                         \
+    MatterOnOffPluginServerInitCallback();                                                                                         \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
+    MatterBindingPluginClientInitCallback();                                                                                       \
     MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
     MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
     MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
     MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterOnOffPluginClientInitCallback();                                                                                         \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterScenesPluginClientInitCallback();                                                                                        \
-    MatterScenesPluginServerInitCallback();                                                                                        \
+    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
     MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
+    MatterSwitchPluginServerInitCallback();                                                                                        \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
+    MatterUserLabelPluginServerInitCallback();
diff --git a/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/zap-generated/access.h b/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/zap-generated/access.h
index 188c30bcbbe87b..39daac3ddc525c 100644
--- a/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/zap-generated/access.h
+++ b/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/zap-generated/access.h
@@ -35,7 +35,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -43,6 +42,7 @@
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -54,7 +54,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -62,6 +61,7 @@
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -73,7 +73,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -81,6 +80,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -94,8 +94,8 @@
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -107,8 +107,8 @@
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -120,8 +120,8 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -129,27 +129,27 @@
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -158,35 +158,35 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -195,35 +195,35 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -232,10 +232,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/zap-generated/gen_config.h b/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/zap-generated/gen_config.h
index 1570398a68de14..92fa1fe8c04e77 100644
--- a/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/zap-generated/gen_config.h
+++ b/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/zap-generated/gen_config.h
@@ -29,133 +29,46 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
+#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_SCENES_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ON_OFF_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ON_OFF_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SCENES_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
-// Use this macro to check if the server side of the Access Control cluster is included
-#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL
-
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
-
-// Use this macro to check if the server side of the Basic cluster is included
-#define ZCL_USING_BASIC_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BASIC_SERVER
-#define EMBER_AF_PLUGIN_BASIC
-
-// Use this macro to check if the client side of the Binding cluster is included
-#define ZCL_USING_BINDING_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_BINDING_CLIENT
-
-// Use this macro to check if the server side of the Descriptor cluster is included
-#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR
-
-// Use this macro to check if the server side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
-
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
-
-// Use this macro to check if the server side of the General Commissioning cluster is included
-#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
-
-// Use this macro to check if the server side of the General Diagnostics cluster is included
-#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
-
-// Use this macro to check if the server side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUPS_SERVER
-#define EMBER_AF_PLUGIN_GROUPS
-
 // Use this macro to check if the server side of the Identify cluster is included
 #define ZCL_USING_IDENTIFY_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_IDENTIFY_SERVER
 #define EMBER_AF_PLUGIN_IDENTIFY
 
-// Use this macro to check if the server side of the Localization Configuration cluster is included
-#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
-
-// Use this macro to check if the server side of the Network Commissioning cluster is included
-#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
-
-// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
-#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
-
-// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
-#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
-
-// Use this macro to check if the client side of the On/Off cluster is included
-#define ZCL_USING_ON_OFF_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_ON_OFF_CLIENT
-
-// Use this macro to check if the server side of the On/Off cluster is included
-#define ZCL_USING_ON_OFF_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF
-
-// Use this macro to check if the server side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+// Use this macro to check if the server side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUPS_SERVER
+#define EMBER_AF_PLUGIN_GROUPS
 
 // Use this macro to check if the client side of the Scenes cluster is included
 #define ZCL_USING_SCENES_CLUSTER_CLIENT
@@ -183,32 +96,119 @@
 #define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
 #define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0000 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
 
+// Use this macro to check if the client side of the On/Off cluster is included
+#define ZCL_USING_ON_OFF_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_ON_OFF_CLIENT
+
+// Use this macro to check if the server side of the On/Off cluster is included
+#define ZCL_USING_ON_OFF_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF
+
+// Use this macro to check if the server side of the Descriptor cluster is included
+#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR
+
+// Use this macro to check if the client side of the Binding cluster is included
+#define ZCL_USING_BINDING_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_BINDING_CLIENT
+
+// Use this macro to check if the server side of the Access Control cluster is included
+#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL
+
+// Use this macro to check if the server side of the Basic cluster is included
+#define ZCL_USING_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BASIC_SERVER
+#define EMBER_AF_PLUGIN_BASIC
+
+// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
+#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
+
+// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
+#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
+
+// Use this macro to check if the server side of the Localization Configuration cluster is included
+#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
+
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+
+// Use this macro to check if the server side of the General Commissioning cluster is included
+#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
+
+// Use this macro to check if the server side of the Network Commissioning cluster is included
+#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
+
 // Use this macro to check if the server side of the Software Diagnostics cluster is included
 #define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
 
+// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+
 // Use this macro to check if the server side of the Switch cluster is included
 #define ZCL_USING_SWITCH_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SWITCH_SERVER
 #define EMBER_AF_PLUGIN_SWITCH
 
-// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
-#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
 
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+// Use this macro to check if the server side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
 
 // Use this macro to check if the server side of the User Label cluster is included
 #define ZCL_USING_USER_LABEL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL
-
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
diff --git a/examples/chef/zzz_generated/rootnode_onoffpluginunit_Jgnh29qK1p/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_onoffpluginunit_Jgnh29qK1p/ZAPSHA.txt
index 37e00b022574e7..6182e63e8f7dc9 100644
--- a/examples/chef/zzz_generated/rootnode_onoffpluginunit_Jgnh29qK1p/ZAPSHA.txt
+++ b/examples/chef/zzz_generated/rootnode_onoffpluginunit_Jgnh29qK1p/ZAPSHA.txt
@@ -1 +1 @@
-ca9cbecbc36228db65349864a77402075c39d9d2
\ No newline at end of file
+fd3adabbb2ac031d765da028fb51475260b7cfaf
\ No newline at end of file
diff --git a/examples/chef/zzz_generated/rootnode_onoffpluginunit_Jgnh29qK1p/zap-generated/PluginApplicationCallbacks.h b/examples/chef/zzz_generated/rootnode_onoffpluginunit_Jgnh29qK1p/zap-generated/PluginApplicationCallbacks.h
index ca3a0441bae9c6..e3d4c729a40830 100644
--- a/examples/chef/zzz_generated/rootnode_onoffpluginunit_Jgnh29qK1p/zap-generated/PluginApplicationCallbacks.h
+++ b/examples/chef/zzz_generated/rootnode_onoffpluginunit_Jgnh29qK1p/zap-generated/PluginApplicationCallbacks.h
@@ -22,29 +22,29 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
+    MatterIdentifyPluginServerInitCallback();                                                                                      \
+    MatterGroupsPluginServerInitCallback();                                                                                        \
+    MatterScenesPluginServerInitCallback();                                                                                        \
+    MatterOnOffPluginServerInitCallback();                                                                                         \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
+    MatterBindingPluginClientInitCallback();                                                                                       \
     MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
     MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
     MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
     MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterScenesPluginServerInitCallback();                                                                                        \
+    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
     MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
+    MatterSwitchPluginServerInitCallback();                                                                                        \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
+    MatterUserLabelPluginServerInitCallback();
diff --git a/examples/chef/zzz_generated/rootnode_onoffpluginunit_Jgnh29qK1p/zap-generated/access.h b/examples/chef/zzz_generated/rootnode_onoffpluginunit_Jgnh29qK1p/zap-generated/access.h
index eb74b5b367d473..201090c0eb5788 100644
--- a/examples/chef/zzz_generated/rootnode_onoffpluginunit_Jgnh29qK1p/zap-generated/access.h
+++ b/examples/chef/zzz_generated/rootnode_onoffpluginunit_Jgnh29qK1p/zap-generated/access.h
@@ -29,61 +29,61 @@
 
 // Parallel array data (*cluster*, attribute, privilege) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__CLUSTER { \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
     5, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -91,43 +91,43 @@
 
 // Parallel array data (*cluster*, attribute, privilege) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__CLUSTER { \
+    6, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
     31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    6, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__ATTRIBUTE { \
+    16387, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
     0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     5, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    16387, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__PRIVILEGE { \
+    kMatterAccessPrivilegeManage, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -135,27 +135,27 @@
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -164,35 +164,35 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -201,35 +201,35 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -238,10 +238,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/examples/chef/zzz_generated/rootnode_onoffpluginunit_Jgnh29qK1p/zap-generated/gen_config.h b/examples/chef/zzz_generated/rootnode_onoffpluginunit_Jgnh29qK1p/zap-generated/gen_config.h
index 24c14c380a2238..8d779e1be74c74 100644
--- a/examples/chef/zzz_generated/rootnode_onoffpluginunit_Jgnh29qK1p/zap-generated/gen_config.h
+++ b/examples/chef/zzz_generated/rootnode_onoffpluginunit_Jgnh29qK1p/zap-generated/gen_config.h
@@ -29,171 +29,171 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
+#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
-// Use this macro to check if the server side of the Access Control cluster is included
-#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
 
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
+// Use this macro to check if the server side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUPS_SERVER
+#define EMBER_AF_PLUGIN_GROUPS
 
-// Use this macro to check if the server side of the Basic cluster is included
-#define ZCL_USING_BASIC_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BASIC_SERVER
-#define EMBER_AF_PLUGIN_BASIC
+// Use this macro to check if the server side of the Scenes cluster is included
+#define ZCL_USING_SCENES_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SCENES_SERVER
+#define EMBER_AF_PLUGIN_SCENES
+// User options for server plugin Scenes
+// Cluster spec 1.4.8.2
+#ifdef CHIP_CONFIG_MAX_SCENES_PER_FABRIC
+#define MATTER_SCENES_TABLE_SIZE CHIP_CONFIG_MAX_SCENES_PER_FABRIC
+#else
+#define MATTER_SCENES_TABLE_SIZE 16
+#endif
 
-// Use this macro to check if the client side of the Binding cluster is included
-#define ZCL_USING_BINDING_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_BINDING_CLIENT
+// Scenes FeatureMap Attribute Toggle Scenes Name feature
+// App cluster specs 1.4.4
+#define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
+#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0000 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
+
+// Use this macro to check if the server side of the On/Off cluster is included
+#define ZCL_USING_ON_OFF_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF
 
 // Use this macro to check if the server side of the Descriptor cluster is included
 #define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
 #define EMBER_AF_PLUGIN_DESCRIPTOR
 
-// Use this macro to check if the server side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
-
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
-
-// Use this macro to check if the server side of the General Commissioning cluster is included
-#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
+// Use this macro to check if the client side of the Binding cluster is included
+#define ZCL_USING_BINDING_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_BINDING_CLIENT
 
-// Use this macro to check if the server side of the General Diagnostics cluster is included
-#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
+// Use this macro to check if the server side of the Access Control cluster is included
+#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL
 
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+// Use this macro to check if the server side of the Basic cluster is included
+#define ZCL_USING_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BASIC_SERVER
+#define EMBER_AF_PLUGIN_BASIC
 
-// Use this macro to check if the server side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUPS_SERVER
-#define EMBER_AF_PLUGIN_GROUPS
+// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
+#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
 
-// Use this macro to check if the server side of the Identify cluster is included
-#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY
+// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
+#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
 
 // Use this macro to check if the server side of the Localization Configuration cluster is included
 #define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
 #define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
 
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+
+// Use this macro to check if the server side of the General Commissioning cluster is included
+#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
+
 // Use this macro to check if the server side of the Network Commissioning cluster is included
 #define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
 
-// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
-#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
-
-// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
-#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
-
-// Use this macro to check if the server side of the On/Off cluster is included
-#define ZCL_USING_ON_OFF_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF
-
-// Use this macro to check if the server side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
-
-// Use this macro to check if the server side of the Scenes cluster is included
-#define ZCL_USING_SCENES_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_SCENES_SERVER
-#define EMBER_AF_PLUGIN_SCENES
-// User options for server plugin Scenes
-// Cluster spec 1.4.8.2
-#ifdef CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#define MATTER_SCENES_TABLE_SIZE CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#else
-#define MATTER_SCENES_TABLE_SIZE 16
-#endif
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
 
-// Scenes FeatureMap Attribute Toggle Scenes Name feature
-// App cluster specs 1.4.4
-#define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
-#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0000 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
 // Use this macro to check if the server side of the Software Diagnostics cluster is included
 #define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
 
+// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+
 // Use this macro to check if the server side of the Switch cluster is included
 #define ZCL_USING_SWITCH_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SWITCH_SERVER
 #define EMBER_AF_PLUGIN_SWITCH
 
-// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
-#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
 
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+// Use this macro to check if the server side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
 
 // Use this macro to check if the server side of the User Label cluster is included
 #define ZCL_USING_USER_LABEL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL
-
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
diff --git a/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/ZAPSHA.txt
index 37e00b022574e7..6182e63e8f7dc9 100644
--- a/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/ZAPSHA.txt
+++ b/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/ZAPSHA.txt
@@ -1 +1 @@
-ca9cbecbc36228db65349864a77402075c39d9d2
\ No newline at end of file
+fd3adabbb2ac031d765da028fb51475260b7cfaf
\ No newline at end of file
diff --git a/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/zap-generated/CHIPClientCallbacks.h b/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/zap-generated/CHIPClientCallbacks.h
index 53466c6014ddd0..5daad91c60c9b9 100644
--- a/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/zap-generated/CHIPClientCallbacks.h
+++ b/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/zap-generated/CHIPClientCallbacks.h
@@ -30,6 +30,12 @@
 #include <lib/support/Span.h>
 
 // List specific responses
+typedef void (*GroupsGeneratedCommandListListAttributeCallback)(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*GroupsAcceptedCommandListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*GroupsAttributeListListAttributeCallback)(void * context,
+                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*BindingBindingListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::Binding::Structs::TargetStruct::DecodableType> & data);
@@ -39,9 +45,3 @@ typedef void (*BindingAcceptedCommandListListAttributeCallback)(void * context,
                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*BindingAttributeListListAttributeCallback)(void * context,
                                                           const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*GroupsGeneratedCommandListListAttributeCallback)(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*GroupsAcceptedCommandListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*GroupsAttributeListListAttributeCallback)(void * context,
-                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
diff --git a/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/zap-generated/CHIPClusters.h b/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/zap-generated/CHIPClusters.h
index a3348268a6bba9..d98f0914173eb9 100644
--- a/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/zap-generated/CHIPClusters.h
+++ b/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/zap-generated/CHIPClusters.h
@@ -30,18 +30,18 @@
 namespace chip {
 namespace Controller {
 
-class DLL_EXPORT BindingCluster : public ClusterBase
+class DLL_EXPORT GroupsCluster : public ClusterBase
 {
 public:
-    BindingCluster() : ClusterBase(app::Clusters::Binding::Id) {}
-    ~BindingCluster() {}
+    GroupsCluster() : ClusterBase(app::Clusters::Groups::Id) {}
+    ~GroupsCluster() {}
 };
 
-class DLL_EXPORT GroupsCluster : public ClusterBase
+class DLL_EXPORT BindingCluster : public ClusterBase
 {
 public:
-    GroupsCluster() : ClusterBase(app::Clusters::Groups::Id) {}
-    ~GroupsCluster() {}
+    BindingCluster() : ClusterBase(app::Clusters::Binding::Id) {}
+    ~BindingCluster() {}
 };
 
 class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
diff --git a/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/zap-generated/PluginApplicationCallbacks.h b/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/zap-generated/PluginApplicationCallbacks.h
index e3bdf3c8e38cb7..d636a4c8114913 100644
--- a/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/zap-generated/PluginApplicationCallbacks.h
+++ b/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/zap-generated/PluginApplicationCallbacks.h
@@ -22,29 +22,29 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterIdentifyPluginServerInitCallback();                                                                                      \
     MatterGroupsPluginClientInitCallback();                                                                                        \
     MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
+    MatterBindingPluginClientInitCallback();                                                                                       \
+    MatterAccessControlPluginServerInitCallback();                                                                                 \
+    MatterBasicPluginServerInitCallback();                                                                                         \
     MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
     MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterPressureMeasurementPluginServerInitCallback();                                                                           \
+    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
     MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
+    MatterSwitchPluginServerInitCallback();                                                                                        \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
     MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();
+    MatterPressureMeasurementPluginServerInitCallback();
diff --git a/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/zap-generated/access.h b/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/zap-generated/access.h
index cfa6410afc422f..b88610558e0c15 100644
--- a/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/zap-generated/access.h
+++ b/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/zap-generated/access.h
@@ -35,7 +35,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -43,6 +42,7 @@
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -54,7 +54,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -62,6 +61,7 @@
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -73,7 +73,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -81,6 +80,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -94,8 +94,8 @@
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -107,8 +107,8 @@
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -120,8 +120,8 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -129,27 +129,23 @@
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -158,31 +154,31 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -191,31 +187,31 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -224,6 +220,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/zap-generated/gen_config.h b/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/zap-generated/gen_config.h
index 4248ab2d905a2c..e643850dba61b9 100644
--- a/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/zap-generated/gen_config.h
+++ b/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/zap-generated/gen_config.h
@@ -29,158 +29,158 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
-#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_GROUPS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
+
+// Use this macro to check if the client side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_GROUPS_CLIENT
+
+// Use this macro to check if the server side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUPS_SERVER
+#define EMBER_AF_PLUGIN_GROUPS
+
+// Use this macro to check if the server side of the Descriptor cluster is included
+#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR
+
+// Use this macro to check if the client side of the Binding cluster is included
+#define ZCL_USING_BINDING_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_BINDING_CLIENT
+
 // Use this macro to check if the server side of the Access Control cluster is included
 #define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL
 
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
-
 // Use this macro to check if the server side of the Basic cluster is included
 #define ZCL_USING_BASIC_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_BASIC_SERVER
 #define EMBER_AF_PLUGIN_BASIC
 
-// Use this macro to check if the client side of the Binding cluster is included
-#define ZCL_USING_BINDING_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_BINDING_CLIENT
-
-// Use this macro to check if the server side of the Descriptor cluster is included
-#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR
+// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
+#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
 
-// Use this macro to check if the server side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
+#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
 
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Localization Configuration cluster is included
+#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
 
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
 
 // Use this macro to check if the server side of the General Commissioning cluster is included
 #define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
 
-// Use this macro to check if the server side of the General Diagnostics cluster is included
-#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
-
-// Use this macro to check if the client side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_GROUPS_CLIENT
-
-// Use this macro to check if the server side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUPS_SERVER
-#define EMBER_AF_PLUGIN_GROUPS
-
-// Use this macro to check if the server side of the Identify cluster is included
-#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY
-
-// Use this macro to check if the server side of the Localization Configuration cluster is included
-#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
-
 // Use this macro to check if the server side of the Network Commissioning cluster is included
 #define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
 
-// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
-#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
-
-// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
-#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
-
-// Use this macro to check if the server side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
 
-// Use this macro to check if the server side of the Pressure Measurement cluster is included
-#define ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_PRESSURE_MEASUREMENT_SERVER
-#define EMBER_AF_PLUGIN_PRESSURE_MEASUREMENT
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
 // Use this macro to check if the server side of the Software Diagnostics cluster is included
 #define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
 
+// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+
 // Use this macro to check if the server side of the Switch cluster is included
 #define ZCL_USING_SWITCH_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SWITCH_SERVER
 #define EMBER_AF_PLUGIN_SWITCH
 
-// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
-#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
 
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+// Use this macro to check if the server side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
 
 // Use this macro to check if the server side of the User Label cluster is included
 #define ZCL_USING_USER_LABEL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL
 
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Pressure Measurement cluster is included
+#define ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_PRESSURE_MEASUREMENT_SERVER
+#define EMBER_AF_PLUGIN_PRESSURE_MEASUREMENT
diff --git a/examples/chef/zzz_generated/rootnode_speaker_TlTVZFjAlM/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_speaker_TlTVZFjAlM/ZAPSHA.txt
index 37e00b022574e7..6182e63e8f7dc9 100644
--- a/examples/chef/zzz_generated/rootnode_speaker_TlTVZFjAlM/ZAPSHA.txt
+++ b/examples/chef/zzz_generated/rootnode_speaker_TlTVZFjAlM/ZAPSHA.txt
@@ -1 +1 @@
-ca9cbecbc36228db65349864a77402075c39d9d2
\ No newline at end of file
+fd3adabbb2ac031d765da028fb51475260b7cfaf
\ No newline at end of file
diff --git a/examples/chef/zzz_generated/rootnode_speaker_TlTVZFjAlM/zap-generated/PluginApplicationCallbacks.h b/examples/chef/zzz_generated/rootnode_speaker_TlTVZFjAlM/zap-generated/PluginApplicationCallbacks.h
index 3062bd27ac5d45..a2d936c47deef9 100644
--- a/examples/chef/zzz_generated/rootnode_speaker_TlTVZFjAlM/zap-generated/PluginApplicationCallbacks.h
+++ b/examples/chef/zzz_generated/rootnode_speaker_TlTVZFjAlM/zap-generated/PluginApplicationCallbacks.h
@@ -22,29 +22,29 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
     MatterIdentifyPluginServerInitCallback();                                                                                      \
+    MatterGroupsPluginServerInitCallback();                                                                                        \
+    MatterOnOffPluginServerInitCallback();                                                                                         \
     MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
+    MatterBindingPluginClientInitCallback();                                                                                       \
+    MatterAccessControlPluginServerInitCallback();                                                                                 \
+    MatterBasicPluginServerInitCallback();                                                                                         \
     MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
     MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
     MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
+    MatterSwitchPluginServerInitCallback();                                                                                        \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
+    MatterUserLabelPluginServerInitCallback();
diff --git a/examples/chef/zzz_generated/rootnode_speaker_TlTVZFjAlM/zap-generated/access.h b/examples/chef/zzz_generated/rootnode_speaker_TlTVZFjAlM/zap-generated/access.h
index cfa6410afc422f..b88610558e0c15 100644
--- a/examples/chef/zzz_generated/rootnode_speaker_TlTVZFjAlM/zap-generated/access.h
+++ b/examples/chef/zzz_generated/rootnode_speaker_TlTVZFjAlM/zap-generated/access.h
@@ -35,7 +35,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -43,6 +42,7 @@
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -54,7 +54,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -62,6 +61,7 @@
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -73,7 +73,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -81,6 +80,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -94,8 +94,8 @@
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -107,8 +107,8 @@
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -120,8 +120,8 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -129,27 +129,23 @@
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -158,31 +154,31 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -191,31 +187,31 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -224,6 +220,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/examples/chef/zzz_generated/rootnode_speaker_TlTVZFjAlM/zap-generated/gen_config.h b/examples/chef/zzz_generated/rootnode_speaker_TlTVZFjAlM/zap-generated/gen_config.h
index 8a3663b3b3e5ce..28c225836c75c5 100644
--- a/examples/chef/zzz_generated/rootnode_speaker_TlTVZFjAlM/zap-generated/gen_config.h
+++ b/examples/chef/zzz_generated/rootnode_speaker_TlTVZFjAlM/zap-generated/gen_config.h
@@ -29,98 +29,49 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
-#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
-// Use this macro to check if the server side of the Access Control cluster is included
-#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL
-
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
-
-// Use this macro to check if the server side of the Basic cluster is included
-#define ZCL_USING_BASIC_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BASIC_SERVER
-#define EMBER_AF_PLUGIN_BASIC
-
-// Use this macro to check if the client side of the Binding cluster is included
-#define ZCL_USING_BINDING_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_BINDING_CLIENT
-
-// Use this macro to check if the server side of the Descriptor cluster is included
-#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR
-
-// Use this macro to check if the server side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
-
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
-
-// Use this macro to check if the server side of the General Commissioning cluster is included
-#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
-
-// Use this macro to check if the server side of the General Diagnostics cluster is included
-#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
 
 // Use this macro to check if the server side of the Groups cluster is included
 #define ZCL_USING_GROUPS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_GROUPS_SERVER
 #define EMBER_AF_PLUGIN_GROUPS
 
-// Use this macro to check if the server side of the Identify cluster is included
-#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY
+// Use this macro to check if the server side of the On/Off cluster is included
+#define ZCL_USING_ON_OFF_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF
 
 // Use this macro to check if the server side of the Level Control cluster is included
 #define ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER
@@ -131,15 +82,24 @@
 #define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0
 #define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0
 
-// Use this macro to check if the server side of the Localization Configuration cluster is included
-#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
+// Use this macro to check if the server side of the Descriptor cluster is included
+#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR
 
-// Use this macro to check if the server side of the Network Commissioning cluster is included
-#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+// Use this macro to check if the client side of the Binding cluster is included
+#define ZCL_USING_BINDING_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_BINDING_CLIENT
+
+// Use this macro to check if the server side of the Access Control cluster is included
+#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL
+
+// Use this macro to check if the server side of the Basic cluster is included
+#define ZCL_USING_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BASIC_SERVER
+#define EMBER_AF_PLUGIN_BASIC
 
 // Use this macro to check if the client side of the OTA Software Update Provider cluster is included
 #define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
@@ -150,42 +110,82 @@
 #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
 #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
 
-// Use this macro to check if the server side of the On/Off cluster is included
-#define ZCL_USING_ON_OFF_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF
+// Use this macro to check if the server side of the Localization Configuration cluster is included
+#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
 
-// Use this macro to check if the server side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+
+// Use this macro to check if the server side of the General Commissioning cluster is included
+#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
+
+// Use this macro to check if the server side of the Network Commissioning cluster is included
+#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
 // Use this macro to check if the server side of the Software Diagnostics cluster is included
 #define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
 
+// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+
 // Use this macro to check if the server side of the Switch cluster is included
 #define ZCL_USING_SWITCH_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SWITCH_SERVER
 #define EMBER_AF_PLUGIN_SWITCH
 
-// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
-#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
 
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+// Use this macro to check if the server side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
 
 // Use this macro to check if the server side of the User Label cluster is included
 #define ZCL_USING_USER_LABEL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL
-
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
diff --git a/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/ZAPSHA.txt
index 37e00b022574e7..6182e63e8f7dc9 100644
--- a/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/ZAPSHA.txt
+++ b/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/ZAPSHA.txt
@@ -1 +1 @@
-ca9cbecbc36228db65349864a77402075c39d9d2
\ No newline at end of file
+fd3adabbb2ac031d765da028fb51475260b7cfaf
\ No newline at end of file
diff --git a/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/zap-generated/CHIPClientCallbacks.h b/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/zap-generated/CHIPClientCallbacks.h
index 53466c6014ddd0..5daad91c60c9b9 100644
--- a/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/zap-generated/CHIPClientCallbacks.h
+++ b/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/zap-generated/CHIPClientCallbacks.h
@@ -30,6 +30,12 @@
 #include <lib/support/Span.h>
 
 // List specific responses
+typedef void (*GroupsGeneratedCommandListListAttributeCallback)(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*GroupsAcceptedCommandListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*GroupsAttributeListListAttributeCallback)(void * context,
+                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*BindingBindingListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::Binding::Structs::TargetStruct::DecodableType> & data);
@@ -39,9 +45,3 @@ typedef void (*BindingAcceptedCommandListListAttributeCallback)(void * context,
                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*BindingAttributeListListAttributeCallback)(void * context,
                                                           const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*GroupsGeneratedCommandListListAttributeCallback)(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*GroupsAcceptedCommandListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*GroupsAttributeListListAttributeCallback)(void * context,
-                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
diff --git a/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/zap-generated/CHIPClusters.h b/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/zap-generated/CHIPClusters.h
index a3348268a6bba9..d98f0914173eb9 100644
--- a/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/zap-generated/CHIPClusters.h
+++ b/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/zap-generated/CHIPClusters.h
@@ -30,18 +30,18 @@
 namespace chip {
 namespace Controller {
 
-class DLL_EXPORT BindingCluster : public ClusterBase
+class DLL_EXPORT GroupsCluster : public ClusterBase
 {
 public:
-    BindingCluster() : ClusterBase(app::Clusters::Binding::Id) {}
-    ~BindingCluster() {}
+    GroupsCluster() : ClusterBase(app::Clusters::Groups::Id) {}
+    ~GroupsCluster() {}
 };
 
-class DLL_EXPORT GroupsCluster : public ClusterBase
+class DLL_EXPORT BindingCluster : public ClusterBase
 {
 public:
-    GroupsCluster() : ClusterBase(app::Clusters::Groups::Id) {}
-    ~GroupsCluster() {}
+    BindingCluster() : ClusterBase(app::Clusters::Binding::Id) {}
+    ~BindingCluster() {}
 };
 
 class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
diff --git a/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/zap-generated/PluginApplicationCallbacks.h b/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/zap-generated/PluginApplicationCallbacks.h
index b577173cbb39b0..f1ee9047b7ee0e 100644
--- a/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/zap-generated/PluginApplicationCallbacks.h
+++ b/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/zap-generated/PluginApplicationCallbacks.h
@@ -22,29 +22,29 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterIdentifyPluginServerInitCallback();                                                                                      \
     MatterGroupsPluginClientInitCallback();                                                                                        \
     MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
+    MatterBindingPluginClientInitCallback();                                                                                       \
+    MatterAccessControlPluginServerInitCallback();                                                                                 \
+    MatterBasicPluginServerInitCallback();                                                                                         \
     MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
     MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterTemperatureMeasurementPluginServerInitCallback();                                                                        \
     MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
+    MatterSwitchPluginServerInitCallback();                                                                                        \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
     MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();
+    MatterTemperatureMeasurementPluginServerInitCallback();
diff --git a/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/zap-generated/access.h b/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/zap-generated/access.h
index cfa6410afc422f..b88610558e0c15 100644
--- a/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/zap-generated/access.h
+++ b/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/zap-generated/access.h
@@ -35,7 +35,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -43,6 +42,7 @@
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -54,7 +54,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -62,6 +61,7 @@
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -73,7 +73,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -81,6 +80,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -94,8 +94,8 @@
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -107,8 +107,8 @@
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -120,8 +120,8 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -129,27 +129,23 @@
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -158,31 +154,31 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -191,31 +187,31 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -224,6 +220,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/zap-generated/gen_config.h b/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/zap-generated/gen_config.h
index 60ea5ceb117c1c..7d992152fbd092 100644
--- a/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/zap-generated/gen_config.h
+++ b/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/zap-generated/gen_config.h
@@ -29,158 +29,158 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
-#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_GROUPS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
+
+// Use this macro to check if the client side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_GROUPS_CLIENT
+
+// Use this macro to check if the server side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUPS_SERVER
+#define EMBER_AF_PLUGIN_GROUPS
+
+// Use this macro to check if the server side of the Descriptor cluster is included
+#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR
+
+// Use this macro to check if the client side of the Binding cluster is included
+#define ZCL_USING_BINDING_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_BINDING_CLIENT
+
 // Use this macro to check if the server side of the Access Control cluster is included
 #define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL
 
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
-
 // Use this macro to check if the server side of the Basic cluster is included
 #define ZCL_USING_BASIC_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_BASIC_SERVER
 #define EMBER_AF_PLUGIN_BASIC
 
-// Use this macro to check if the client side of the Binding cluster is included
-#define ZCL_USING_BINDING_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_BINDING_CLIENT
-
-// Use this macro to check if the server side of the Descriptor cluster is included
-#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR
+// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
+#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
 
-// Use this macro to check if the server side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
+#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
 
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Localization Configuration cluster is included
+#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
 
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
 
 // Use this macro to check if the server side of the General Commissioning cluster is included
 #define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
 
-// Use this macro to check if the server side of the General Diagnostics cluster is included
-#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
-
-// Use this macro to check if the client side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_GROUPS_CLIENT
-
-// Use this macro to check if the server side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUPS_SERVER
-#define EMBER_AF_PLUGIN_GROUPS
-
-// Use this macro to check if the server side of the Identify cluster is included
-#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY
-
-// Use this macro to check if the server side of the Localization Configuration cluster is included
-#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
-
 // Use this macro to check if the server side of the Network Commissioning cluster is included
 #define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
 
-// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
-#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
-
-// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
-#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
 
-// Use this macro to check if the server side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
 // Use this macro to check if the server side of the Software Diagnostics cluster is included
 #define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
 
+// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+
 // Use this macro to check if the server side of the Switch cluster is included
 #define ZCL_USING_SWITCH_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SWITCH_SERVER
 #define EMBER_AF_PLUGIN_SWITCH
 
-// Use this macro to check if the server side of the Temperature Measurement cluster is included
-#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER
-#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
 
-// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
-#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
 
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
 
 // Use this macro to check if the server side of the User Label cluster is included
 #define ZCL_USING_USER_LABEL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL
 
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Temperature Measurement cluster is included
+#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER
+#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT
diff --git a/examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/ZAPSHA.txt
index 37e00b022574e7..6182e63e8f7dc9 100644
--- a/examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/ZAPSHA.txt
+++ b/examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/ZAPSHA.txt
@@ -1 +1 @@
-ca9cbecbc36228db65349864a77402075c39d9d2
\ No newline at end of file
+fd3adabbb2ac031d765da028fb51475260b7cfaf
\ No newline at end of file
diff --git a/examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/zap-generated/CHIPClusters.h b/examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/zap-generated/CHIPClusters.h
index 50093ec20dbea4..060843f2e5c9f1 100644
--- a/examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/zap-generated/CHIPClusters.h
+++ b/examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/zap-generated/CHIPClusters.h
@@ -37,25 +37,25 @@ class DLL_EXPORT BindingCluster : public ClusterBase
     ~BindingCluster() {}
 };
 
-class DLL_EXPORT FanControlCluster : public ClusterBase
+class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
 {
 public:
-    FanControlCluster() : ClusterBase(app::Clusters::FanControl::Id) {}
-    ~FanControlCluster() {}
+    OtaSoftwareUpdateProviderCluster() : ClusterBase(app::Clusters::OtaSoftwareUpdateProvider::Id) {}
+    ~OtaSoftwareUpdateProviderCluster() {}
 };
 
-class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
+class DLL_EXPORT FanControlCluster : public ClusterBase
 {
 public:
-    OtaSoftwareUpdateProviderCluster() : ClusterBase(app::Clusters::OtaSoftwareUpdateProvider::Id) {}
-    ~OtaSoftwareUpdateProviderCluster() {}
+    FanControlCluster() : ClusterBase(app::Clusters::FanControl::Id) {}
+    ~FanControlCluster() {}
 };
 
-class DLL_EXPORT OccupancySensingCluster : public ClusterBase
+class DLL_EXPORT TemperatureMeasurementCluster : public ClusterBase
 {
 public:
-    OccupancySensingCluster() : ClusterBase(app::Clusters::OccupancySensing::Id) {}
-    ~OccupancySensingCluster() {}
+    TemperatureMeasurementCluster() : ClusterBase(app::Clusters::TemperatureMeasurement::Id) {}
+    ~TemperatureMeasurementCluster() {}
 };
 
 class DLL_EXPORT RelativeHumidityMeasurementCluster : public ClusterBase
@@ -65,11 +65,11 @@ class DLL_EXPORT RelativeHumidityMeasurementCluster : public ClusterBase
     ~RelativeHumidityMeasurementCluster() {}
 };
 
-class DLL_EXPORT TemperatureMeasurementCluster : public ClusterBase
+class DLL_EXPORT OccupancySensingCluster : public ClusterBase
 {
 public:
-    TemperatureMeasurementCluster() : ClusterBase(app::Clusters::TemperatureMeasurement::Id) {}
-    ~TemperatureMeasurementCluster() {}
+    OccupancySensingCluster() : ClusterBase(app::Clusters::OccupancySensing::Id) {}
+    ~OccupancySensingCluster() {}
 };
 
 } // namespace Controller
diff --git a/examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/zap-generated/PluginApplicationCallbacks.h b/examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/zap-generated/PluginApplicationCallbacks.h
index 190fb700a262d0..8908aef62edb34 100644
--- a/examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/zap-generated/PluginApplicationCallbacks.h
+++ b/examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/zap-generated/PluginApplicationCallbacks.h
@@ -22,35 +22,35 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterIdentifyPluginServerInitCallback();                                                                                      \
+    MatterGroupsPluginServerInitCallback();                                                                                        \
+    MatterScenesPluginServerInitCallback();                                                                                        \
     MatterAlarmsPluginServerInitCallback();                                                                                        \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterBindingPluginClientInitCallback();                                                                                       \
     MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFanControlPluginClientInitCallback();                                                                                    \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterBindingPluginClientInitCallback();                                                                                       \
+    MatterAccessControlPluginServerInitCallback();                                                                                 \
+    MatterBasicPluginServerInitCallback();                                                                                         \
     MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
     MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterOccupancySensingPluginClientInitCallback();                                                                              \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterRelativeHumidityMeasurementPluginClientInitCallback();                                                                   \
-    MatterScenesPluginServerInitCallback();                                                                                        \
+    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
+    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
     MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterTemperatureMeasurementPluginClientInitCallback();                                                                        \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
+    MatterUserLabelPluginServerInitCallback();                                                                                     \
     MatterThermostatPluginServerInitCallback();                                                                                    \
+    MatterFanControlPluginClientInitCallback();                                                                                    \
     MatterThermostatUserInterfaceConfigurationPluginServerInitCallback();                                                          \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();
+    MatterTemperatureMeasurementPluginClientInitCallback();                                                                        \
+    MatterRelativeHumidityMeasurementPluginClientInitCallback();                                                                   \
+    MatterOccupancySensingPluginClientInitCallback();
diff --git a/examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/zap-generated/access.h b/examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/zap-generated/access.h
index d908bab0e87341..b6d1c0dc3d2a25 100644
--- a/examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/zap-generated/access.h
+++ b/examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/zap-generated/access.h
@@ -35,7 +35,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -43,6 +42,8 @@
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
+    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: HVACSystemTypeConfiguration, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: LocalTemperatureCalibration, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: view */ \
@@ -54,7 +55,6 @@
     /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \
-    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for read attribute
@@ -65,7 +65,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -73,6 +72,8 @@
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
+    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: HVACSystemTypeConfiguration, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: LocalTemperatureCalibration, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: view */ \
@@ -84,7 +85,6 @@
     /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \
-    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for read attribute
@@ -95,7 +95,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -103,6 +102,8 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
+    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: HVACSystemTypeConfiguration, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: LocalTemperatureCalibration, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: view */ \
@@ -114,7 +115,6 @@
     /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \
-    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -127,8 +127,9 @@
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
+    65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
     513, /* Cluster: Thermostat, Attribute: HVACSystemTypeConfiguration, Privilege: manage */ \
     513, /* Cluster: Thermostat, Attribute: LocalTemperatureCalibration, Privilege: manage */ \
     513, /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: manage */ \
@@ -140,7 +141,6 @@
     513, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \
     513, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \
     516, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \
-    65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for write attribute
@@ -151,8 +151,9 @@
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
+    0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
     9, /* Cluster: Thermostat, Attribute: HVACSystemTypeConfiguration, Privilege: manage */ \
     16, /* Cluster: Thermostat, Attribute: LocalTemperatureCalibration, Privilege: manage */ \
     21, /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: manage */ \
@@ -164,7 +165,6 @@
     27, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \
     28, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \
     1, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \
-    0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for write attribute
@@ -175,8 +175,9 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: HVACSystemTypeConfiguration, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: LocalTemperatureCalibration, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: manage */ \
@@ -188,34 +189,33 @@
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -224,35 +224,35 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -261,35 +261,35 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -298,10 +298,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/zap-generated/gen_config.h b/examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/zap-generated/gen_config.h
index 13aa06788f39e7..9eea8e49f65714 100644
--- a/examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/zap-generated/gen_config.h
+++ b/examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/zap-generated/gen_config.h
@@ -29,203 +29,203 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
-#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_ALARM_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FAN_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OCCUPANCY_SENSING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_THERMOSTAT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FAN_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_OCCUPANCY_SENSING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
-// Use this macro to check if the server side of the Access Control cluster is included
-#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
 
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
+// Use this macro to check if the server side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUPS_SERVER
+#define EMBER_AF_PLUGIN_GROUPS
+
+// Use this macro to check if the server side of the Scenes cluster is included
+#define ZCL_USING_SCENES_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SCENES_SERVER
+#define EMBER_AF_PLUGIN_SCENES
+// User options for server plugin Scenes
+// Cluster spec 1.4.8.2
+#ifdef CHIP_CONFIG_MAX_SCENES_PER_FABRIC
+#define MATTER_SCENES_TABLE_SIZE CHIP_CONFIG_MAX_SCENES_PER_FABRIC
+#else
+#define MATTER_SCENES_TABLE_SIZE 16
+#endif
+
+// Scenes FeatureMap Attribute Toggle Scenes Name feature
+// App cluster specs 1.4.4
+#define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
+#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0000 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
 
 // Use this macro to check if the server side of the Alarms cluster is included
 #define ZCL_USING_ALARM_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_ALARMS_SERVER
 #define EMBER_AF_PLUGIN_ALARMS
 
-// Use this macro to check if the server side of the Basic cluster is included
-#define ZCL_USING_BASIC_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BASIC_SERVER
-#define EMBER_AF_PLUGIN_BASIC
+// Use this macro to check if the server side of the Descriptor cluster is included
+#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR
 
 // Use this macro to check if the client side of the Binding cluster is included
 #define ZCL_USING_BINDING_CLUSTER_CLIENT
 #define EMBER_AF_PLUGIN_BINDING_CLIENT
 
-// Use this macro to check if the server side of the Descriptor cluster is included
-#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR
+// Use this macro to check if the server side of the Access Control cluster is included
+#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL
 
-// Use this macro to check if the server side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+// Use this macro to check if the server side of the Basic cluster is included
+#define ZCL_USING_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BASIC_SERVER
+#define EMBER_AF_PLUGIN_BASIC
 
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
+#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
 
-// Use this macro to check if the client side of the Fan Control cluster is included
-#define ZCL_USING_FAN_CONTROL_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_FAN_CONTROL_CLIENT
+// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
+#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
 
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
+// Use this macro to check if the server side of the Localization Configuration cluster is included
+#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
+
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
 
 // Use this macro to check if the server side of the General Commissioning cluster is included
 #define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
 
+// Use this macro to check if the server side of the Network Commissioning cluster is included
+#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+
 // Use this macro to check if the server side of the General Diagnostics cluster is included
 #define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
-
-// Use this macro to check if the server side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUPS_SERVER
-#define EMBER_AF_PLUGIN_GROUPS
-
-// Use this macro to check if the server side of the Identify cluster is included
-#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY
+// Use this macro to check if the server side of the Software Diagnostics cluster is included
+#define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
 
-// Use this macro to check if the server side of the Localization Configuration cluster is included
-#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
+// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
 
-// Use this macro to check if the server side of the Network Commissioning cluster is included
-#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
 
-// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
-#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
 
-// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
-#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
+// Use this macro to check if the server side of the Switch cluster is included
+#define ZCL_USING_SWITCH_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SWITCH_SERVER
+#define EMBER_AF_PLUGIN_SWITCH
 
-// Use this macro to check if the client side of the Occupancy Sensing cluster is included
-#define ZCL_USING_OCCUPANCY_SENSING_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING_CLIENT
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
 
 // Use this macro to check if the server side of the Operational Credentials cluster is included
 #define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
 #define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
 
-// Use this macro to check if the client side of the Relative Humidity Measurement cluster is included
-#define ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_RELATIVE_HUMIDITY_MEASUREMENT_CLIENT
-
-// Use this macro to check if the server side of the Scenes cluster is included
-#define ZCL_USING_SCENES_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_SCENES_SERVER
-#define EMBER_AF_PLUGIN_SCENES
-// User options for server plugin Scenes
-// Cluster spec 1.4.8.2
-#ifdef CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#define MATTER_SCENES_TABLE_SIZE CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#else
-#define MATTER_SCENES_TABLE_SIZE 16
-#endif
-
-// Scenes FeatureMap Attribute Toggle Scenes Name feature
-// App cluster specs 1.4.4
-#define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
-#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0000 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
-
-// Use this macro to check if the server side of the Software Diagnostics cluster is included
-#define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
 
-// Use this macro to check if the server side of the Switch cluster is included
-#define ZCL_USING_SWITCH_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_SWITCH_SERVER
-#define EMBER_AF_PLUGIN_SWITCH
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
 
-// Use this macro to check if the client side of the Temperature Measurement cluster is included
-#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_CLIENT
+// Use this macro to check if the server side of the User Label cluster is included
+#define ZCL_USING_USER_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_USER_LABEL_SERVER
+#define EMBER_AF_PLUGIN_USER_LABEL
 
 // Use this macro to check if the server side of the Thermostat cluster is included
 #define ZCL_USING_THERMOSTAT_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_THERMOSTAT_SERVER
 #define EMBER_AF_PLUGIN_THERMOSTAT
 
+// Use this macro to check if the client side of the Fan Control cluster is included
+#define ZCL_USING_FAN_CONTROL_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_FAN_CONTROL_CLIENT
+
 // Use this macro to check if the server side of the Thermostat User Interface Configuration cluster is included
 #define ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_SERVER
 #define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION
 
-// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
-#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+// Use this macro to check if the client side of the Temperature Measurement cluster is included
+#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_CLIENT
 
-// Use this macro to check if the server side of the User Label cluster is included
-#define ZCL_USING_USER_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_USER_LABEL_SERVER
-#define EMBER_AF_PLUGIN_USER_LABEL
+// Use this macro to check if the client side of the Relative Humidity Measurement cluster is included
+#define ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_RELATIVE_HUMIDITY_MEASUREMENT_CLIENT
 
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+// Use this macro to check if the client side of the Occupancy Sensing cluster is included
+#define ZCL_USING_OCCUPANCY_SENSING_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING_CLIENT
diff --git a/examples/chef/zzz_generated/rootnode_windowcovering_hv8WSnPgSV/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_windowcovering_hv8WSnPgSV/ZAPSHA.txt
index 37e00b022574e7..6182e63e8f7dc9 100644
--- a/examples/chef/zzz_generated/rootnode_windowcovering_hv8WSnPgSV/ZAPSHA.txt
+++ b/examples/chef/zzz_generated/rootnode_windowcovering_hv8WSnPgSV/ZAPSHA.txt
@@ -1 +1 @@
-ca9cbecbc36228db65349864a77402075c39d9d2
\ No newline at end of file
+fd3adabbb2ac031d765da028fb51475260b7cfaf
\ No newline at end of file
diff --git a/examples/chef/zzz_generated/rootnode_windowcovering_hv8WSnPgSV/zap-generated/PluginApplicationCallbacks.h b/examples/chef/zzz_generated/rootnode_windowcovering_hv8WSnPgSV/zap-generated/PluginApplicationCallbacks.h
index 846b1da164255b..ad47ce921a578f 100644
--- a/examples/chef/zzz_generated/rootnode_windowcovering_hv8WSnPgSV/zap-generated/PluginApplicationCallbacks.h
+++ b/examples/chef/zzz_generated/rootnode_windowcovering_hv8WSnPgSV/zap-generated/PluginApplicationCallbacks.h
@@ -22,29 +22,29 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
+    MatterIdentifyPluginServerInitCallback();                                                                                      \
+    MatterGroupsPluginServerInitCallback();                                                                                        \
+    MatterScenesPluginServerInitCallback();                                                                                        \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
+    MatterBindingPluginClientInitCallback();                                                                                       \
     MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
     MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
     MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
     MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterScenesPluginServerInitCallback();                                                                                        \
+    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
     MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
     MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
+    MatterSwitchPluginServerInitCallback();                                                                                        \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
+    MatterUserLabelPluginServerInitCallback();                                                                                     \
     MatterWindowCoveringPluginServerInitCallback();
diff --git a/examples/chef/zzz_generated/rootnode_windowcovering_hv8WSnPgSV/zap-generated/access.h b/examples/chef/zzz_generated/rootnode_windowcovering_hv8WSnPgSV/zap-generated/access.h
index 1071ae21fb6d0b..1343f78a42214e 100644
--- a/examples/chef/zzz_generated/rootnode_windowcovering_hv8WSnPgSV/zap-generated/access.h
+++ b/examples/chef/zzz_generated/rootnode_windowcovering_hv8WSnPgSV/zap-generated/access.h
@@ -35,7 +35,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -43,6 +42,7 @@
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
     /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
 }
@@ -55,7 +55,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -63,6 +62,7 @@
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
     /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
 }
@@ -75,7 +75,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -83,6 +82,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
     /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
 }
@@ -97,8 +97,8 @@
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
     258, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
 }
@@ -111,8 +111,8 @@
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
     23, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
 }
@@ -125,8 +125,8 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
 }
@@ -135,27 +135,27 @@
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -164,35 +164,35 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -201,35 +201,35 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -238,10 +238,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/examples/chef/zzz_generated/rootnode_windowcovering_hv8WSnPgSV/zap-generated/gen_config.h b/examples/chef/zzz_generated/rootnode_windowcovering_hv8WSnPgSV/zap-generated/gen_config.h
index fdf7f3b9a4083e..7f377157a811cd 100644
--- a/examples/chef/zzz_generated/rootnode_windowcovering_hv8WSnPgSV/zap-generated/gen_config.h
+++ b/examples/chef/zzz_generated/rootnode_windowcovering_hv8WSnPgSV/zap-generated/gen_config.h
@@ -29,170 +29,170 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
+#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
-// Use this macro to check if the server side of the Access Control cluster is included
-#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
 
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
+// Use this macro to check if the server side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUPS_SERVER
+#define EMBER_AF_PLUGIN_GROUPS
 
-// Use this macro to check if the server side of the Basic cluster is included
-#define ZCL_USING_BASIC_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BASIC_SERVER
-#define EMBER_AF_PLUGIN_BASIC
+// Use this macro to check if the server side of the Scenes cluster is included
+#define ZCL_USING_SCENES_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SCENES_SERVER
+#define EMBER_AF_PLUGIN_SCENES
+// User options for server plugin Scenes
+// Cluster spec 1.4.8.2
+#ifdef CHIP_CONFIG_MAX_SCENES_PER_FABRIC
+#define MATTER_SCENES_TABLE_SIZE CHIP_CONFIG_MAX_SCENES_PER_FABRIC
+#else
+#define MATTER_SCENES_TABLE_SIZE 16
+#endif
 
-// Use this macro to check if the client side of the Binding cluster is included
-#define ZCL_USING_BINDING_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_BINDING_CLIENT
+// Scenes FeatureMap Attribute Toggle Scenes Name feature
+// App cluster specs 1.4.4
+#define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
+#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0000 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
 
 // Use this macro to check if the server side of the Descriptor cluster is included
 #define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
 #define EMBER_AF_PLUGIN_DESCRIPTOR
 
-// Use this macro to check if the server side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
-
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
-
-// Use this macro to check if the server side of the General Commissioning cluster is included
-#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
+// Use this macro to check if the client side of the Binding cluster is included
+#define ZCL_USING_BINDING_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_BINDING_CLIENT
 
-// Use this macro to check if the server side of the General Diagnostics cluster is included
-#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
+// Use this macro to check if the server side of the Access Control cluster is included
+#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL
 
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+// Use this macro to check if the server side of the Basic cluster is included
+#define ZCL_USING_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BASIC_SERVER
+#define EMBER_AF_PLUGIN_BASIC
 
-// Use this macro to check if the server side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUPS_SERVER
-#define EMBER_AF_PLUGIN_GROUPS
+// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
+#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
 
-// Use this macro to check if the server side of the Identify cluster is included
-#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY
+// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
+#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
 
 // Use this macro to check if the server side of the Localization Configuration cluster is included
 #define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
 #define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
 
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+
+// Use this macro to check if the server side of the General Commissioning cluster is included
+#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
+
 // Use this macro to check if the server side of the Network Commissioning cluster is included
 #define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
 
-// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
-#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
-
-// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
-#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
-
-// Use this macro to check if the server side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
-
-// Use this macro to check if the server side of the Scenes cluster is included
-#define ZCL_USING_SCENES_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_SCENES_SERVER
-#define EMBER_AF_PLUGIN_SCENES
-// User options for server plugin Scenes
-// Cluster spec 1.4.8.2
-#ifdef CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#define MATTER_SCENES_TABLE_SIZE CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#else
-#define MATTER_SCENES_TABLE_SIZE 16
-#endif
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
 
-// Scenes FeatureMap Attribute Toggle Scenes Name feature
-// App cluster specs 1.4.4
-#define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
-#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0000 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
 // Use this macro to check if the server side of the Software Diagnostics cluster is included
 #define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
 
+// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+
 // Use this macro to check if the server side of the Switch cluster is included
 #define ZCL_USING_SWITCH_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SWITCH_SERVER
 #define EMBER_AF_PLUGIN_SWITCH
 
-// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
-#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
 
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+// Use this macro to check if the server side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
 
 // Use this macro to check if the server side of the User Label cluster is included
 #define ZCL_USING_USER_LABEL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL
 
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
-
 // Use this macro to check if the server side of the Window Covering cluster is included
 #define ZCL_USING_WINDOW_COVERING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_WINDOW_COVERING_SERVER
diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter
index 055f1a73ff67a2..ce8c24189ee1be 100644
--- a/examples/light-switch-app/light-switch-common/light-switch-app.matter
+++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter
@@ -6,399 +6,288 @@ struct LabelStruct {
     char_string<16> value = 1;
 }
 
-server cluster AccessControl = 31 {
-  enum AuthMode : ENUM8 {
-    kPase = 1;
-    kCase = 2;
-    kGroup = 3;
-  }
-
-  enum ChangeTypeEnum : ENUM8 {
-    kChanged = 0;
-    kAdded = 1;
-    kRemoved = 2;
+client cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
   }
 
-  enum Privilege : ENUM8 {
-    kView = 1;
-    kProxyView = 2;
-    kOperate = 3;
-    kManage = 4;
-    kAdminister = 5;
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
   }
 
-  struct AccessControlEntry {
-    Privilege privilege = 1;
-    AuthMode authMode = 2;
-    nullable int64u subjects[] = 3;
-    nullable Target targets[] = 4;
-    fabric_idx fabricIndex = 254;
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
   }
 
-  struct Target {
-    nullable cluster_id cluster = 0;
-    nullable endpoint_no endpoint = 1;
-    nullable devtype_id deviceType = 2;
-  }
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  struct ExtensionEntry {
-    octet_string<128> data = 1;
-    fabric_idx fabricIndex = 254;
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
   }
 
-  info event access(read: administer) AccessControlEntryChanged = 0 {
-    nullable node_id adminNodeID = 1;
-    nullable INT16U adminPasscodeID = 2;
-    ChangeTypeEnum changeType = 3;
-    nullable AccessControlEntry latestValue = 4;
-    fabric_idx adminFabricIndex = 254;
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
   }
 
-  info event access(read: administer) AccessControlExtensionChanged = 1 {
-    nullable node_id adminNodeID = 1;
-    nullable INT16U adminPasscodeID = 2;
-    ChangeTypeEnum changeType = 3;
-    nullable ExtensionEntry latestValue = 4;
-    fabric_idx adminFabricIndex = 254;
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
   }
 
-  attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
-  attribute access(read: administer, write: administer) ExtensionEntry extension[] = 1;
-  readonly attribute int16u subjectsPerAccessControlEntry = 2;
-  readonly attribute int16u targetsPerAccessControlEntry = 3;
-  readonly attribute int16u accessControlEntriesPerFabric = 4;
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
   }
 
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
+  request struct TriggerEffectRequest {
+    IdentifyEffectIdentifier effectIdentifier = 0;
+    IdentifyEffectVariant effectVariant = 1;
   }
 
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+  command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
+}
+
+server cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
+  request struct AddGroupRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
   }
 
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
+  request struct ViewGroupRequest {
+    group_id groupId = 0;
   }
 
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
-
-server cluster Basic = 40 {
-  struct CapabilityMinimaStruct {
-    int16u caseSessionsPerFabric = 0;
-    int16u subscriptionsPerFabric = 1;
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
   }
 
-  critical event StartUp = 0 {
-    INT32U softwareVersion = 0;
+  request struct RemoveGroupRequest {
+    group_id groupId = 0;
   }
 
-  critical event ShutDown = 1 {
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
   }
 
-  info event Leave = 2 {
+  response struct AddGroupResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  info event ReachableChanged = 3 {
-    boolean reachableNewValue = 0;
+  response struct ViewGroupResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    CHAR_STRING groupName = 2;
   }
 
-  readonly attribute int16u dataModelRevision = 0;
-  readonly attribute char_string<32> vendorName = 1;
-  readonly attribute vendor_id vendorID = 2;
-  readonly attribute char_string<32> productName = 3;
-  readonly attribute int16u productID = 4;
-  attribute access(write: manage) char_string<32> nodeLabel = 5;
-  attribute access(write: administer) char_string<2> location = 6;
-  readonly attribute int16u hardwareVersion = 7;
-  readonly attribute char_string<64> hardwareVersionString = 8;
-  readonly attribute int32u softwareVersion = 9;
-  readonly attribute char_string<64> softwareVersionString = 10;
-  readonly attribute char_string<16> manufacturingDate = 11;
-  readonly attribute char_string<32> partNumber = 12;
-  readonly attribute long_char_string<256> productURL = 13;
-  readonly attribute char_string<64> productLabel = 14;
-  readonly attribute char_string<32> serialNumber = 15;
-  attribute access(write: manage) boolean localConfigDisabled = 16;
-  readonly attribute boolean reachable = 17;
-  readonly attribute char_string<32> uniqueID = 18;
-  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  response struct GetGroupMembershipResponse = 2 {
+    nullable INT8U capacity = 0;
+    group_id groupList[] = 1;
+  }
 
-server cluster Binding = 30 {
-  struct TargetStruct {
-    optional node_id node = 1;
-    optional group_id group = 2;
-    optional endpoint_no endpoint = 3;
-    optional cluster_id cluster = 4;
-    fabric_idx fabricIndex = 254;
+  response struct RemoveGroupResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  attribute TargetStruct binding[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
 }
 
-client cluster ColorControl = 768 {
-  enum ColorLoopAction : ENUM8 {
-    kDeactivate = 0;
-    kActivateFromColorLoopStartEnhancedHue = 1;
-    kActivateFromEnhancedCurrentHue = 2;
+client cluster Scenes = 5 {
+  bitmap ScenesCopyMode : BITMAP8 {
+    kCopyAllScenes = 0x1;
   }
 
-  enum ColorLoopDirection : ENUM8 {
-    kDecrementHue = 0;
-    kIncrementHue = 1;
+  struct ExtensionFieldSet {
+    cluster_id clusterId = 0;
+    AttributeValuePair attributeValueList[] = 1;
   }
 
-  enum ColorMode : ENUM8 {
-    kCurrentHueAndCurrentSaturation = 0;
-    kCurrentXAndCurrentY = 1;
-    kColorTemperature = 2;
+  struct AttributeValuePair {
+    optional attrib_id attributeId = 0;
+    int8u attributeValue[] = 1;
   }
 
-  enum HueDirection : ENUM8 {
-    kShortestDistance = 0;
-    kLongestDistance = 1;
-    kUp = 2;
-    kDown = 3;
+  readonly attribute int8u sceneCount = 0;
+  readonly attribute int8u currentScene = 1;
+  readonly attribute group_id currentGroup = 2;
+  readonly attribute boolean sceneValid = 3;
+  readonly attribute bitmap8 nameSupport = 4;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AddSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    INT16U transitionTime = 2;
+    CHAR_STRING sceneName = 3;
+    ExtensionFieldSet extensionFieldSets[] = 4;
   }
 
-  enum HueMoveMode : ENUM8 {
-    kStop = 0;
-    kUp = 1;
-    kDown = 3;
+  request struct ViewSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  enum HueStepMode : ENUM8 {
-    kUp = 1;
-    kDown = 3;
+  request struct RemoveSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  enum SaturationMoveMode : ENUM8 {
-    kStop = 0;
-    kUp = 1;
-    kDown = 3;
-  }
-
-  enum SaturationStepMode : ENUM8 {
-    kUp = 1;
-    kDown = 3;
-  }
-
-  bitmap ColorCapabilities : BITMAP16 {
-    kHueSaturationSupported = 0x1;
-    kEnhancedHueSupported = 0x2;
-    kColorLoopSupported = 0x4;
-    kXYAttributesSupported = 0x8;
-    kColorTemperatureSupported = 0x10;
+  request struct RemoveAllScenesRequest {
+    group_id groupId = 0;
   }
 
-  bitmap ColorControlFeature : BITMAP32 {
-    kHueAndSaturation = 0x1;
-    kEnhancedHue = 0x2;
-    kColorLoop = 0x4;
-    kXy = 0x8;
-    kColorTemperature = 0x10;
+  request struct StoreSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  bitmap ColorLoopUpdateFlags : BITMAP8 {
-    kUpdateAction = 0x1;
-    kUpdateDirection = 0x2;
-    kUpdateTime = 0x4;
-    kUpdateStartHue = 0x8;
+  request struct RecallSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    optional nullable INT16U transitionTime = 2;
   }
 
-  readonly attribute int8u currentHue = 0;
-  readonly attribute int8u currentSaturation = 1;
-  readonly attribute int16u remainingTime = 2;
-  readonly attribute int16u currentX = 3;
-  readonly attribute int16u currentY = 4;
-  readonly attribute int16u colorTemperature = 7;
-  readonly attribute enum8 colorMode = 8;
-  attribute bitmap8 options = 15;
-  readonly attribute nullable int8u numberOfPrimaries = 16;
-  readonly attribute int16u enhancedCurrentHue = 16384;
-  readonly attribute enum8 enhancedColorMode = 16385;
-  readonly attribute int8u colorLoopActive = 16386;
-  readonly attribute int8u colorLoopDirection = 16387;
-  readonly attribute int16u colorLoopTime = 16388;
-  readonly attribute int16u colorLoopStartEnhancedHue = 16389;
-  readonly attribute int16u colorLoopStoredEnhancedHue = 16390;
-  readonly attribute bitmap16 colorCapabilities = 16394;
-  readonly attribute int16u colorTempPhysicalMinMireds = 16395;
-  readonly attribute int16u colorTempPhysicalMaxMireds = 16396;
-  readonly attribute int16u coupleColorTempToLevelMinMireds = 16397;
-  attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct MoveToHueRequest {
-    INT8U hue = 0;
-    HueDirection direction = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  request struct GetSceneMembershipRequest {
+    group_id groupId = 0;
   }
 
-  request struct MoveHueRequest {
-    HueMoveMode moveMode = 0;
-    INT8U rate = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
+  response struct AddSceneResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  request struct StepHueRequest {
-    HueStepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT8U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  response struct ViewSceneResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+    optional INT16U transitionTime = 3;
+    optional CHAR_STRING sceneName = 4;
+    optional ExtensionFieldSet extensionFieldSets[] = 5;
   }
 
-  request struct MoveToSaturationRequest {
-    INT8U saturation = 0;
-    INT16U transitionTime = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
+  response struct RemoveSceneResponse = 2 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  request struct MoveSaturationRequest {
-    SaturationMoveMode moveMode = 0;
-    INT8U rate = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
+  response struct RemoveAllScenesResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  request struct StepSaturationRequest {
-    SaturationStepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT8U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  response struct StoreSceneResponse = 4 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  request struct MoveToHueAndSaturationRequest {
-    INT8U hue = 0;
-    INT8U saturation = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  response struct GetSceneMembershipResponse = 6 {
+    ENUM8 status = 0;
+    nullable INT8U capacity = 1;
+    group_id groupId = 2;
+    optional INT8U sceneList[] = 3;
   }
 
-  request struct MoveToColorRequest {
-    INT16U colorX = 0;
-    INT16U colorY = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
-  }
+  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
+  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
+  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
+  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
+  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
+  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
+  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
+}
 
-  request struct MoveColorRequest {
-    INT16S rateX = 0;
-    INT16S rateY = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
+client cluster OnOff = 6 {
+  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
+    kFadeToOffIn0p8Seconds = 0;
+    kNoFade = 1;
+    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
   }
 
-  request struct StepColorRequest {
-    INT16S stepX = 0;
-    INT16S stepY = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  enum OnOffDyingLightEffectVariant : ENUM8 {
+    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
   }
 
-  request struct MoveToColorTemperatureRequest {
-    INT16U colorTemperature = 0;
-    INT16U transitionTime = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
+  enum OnOffEffectIdentifier : ENUM8 {
+    kDelayedAllOff = 0;
+    kDyingLight = 1;
   }
 
-  request struct EnhancedMoveToHueRequest {
-    INT16U enhancedHue = 0;
-    HueDirection direction = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  enum OnOffStartUpOnOff : ENUM8 {
+    kOff = 0;
+    kOn = 1;
+    kTogglePreviousOnOff = 2;
   }
 
-  request struct EnhancedMoveHueRequest {
-    HueMoveMode moveMode = 0;
-    INT16U rate = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
+  bitmap OnOffControl : BITMAP8 {
+    kAcceptOnlyWhenOn = 0x1;
   }
 
-  request struct EnhancedStepHueRequest {
-    HueStepMode stepMode = 0;
-    INT16U stepSize = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
   }
 
-  request struct EnhancedMoveToHueAndSaturationRequest {
-    INT16U enhancedHue = 0;
-    INT8U saturation = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  bitmap SceneFeatures : BITMAP32 {
+    kSceneNames = 0x1;
   }
 
-  request struct ColorLoopSetRequest {
-    ColorLoopUpdateFlags updateFlags = 0;
-    ColorLoopAction action = 1;
-    ColorLoopDirection direction = 2;
-    INT16U time = 3;
-    INT16U startHue = 4;
-    BITMAP8 optionsMask = 5;
-    BITMAP8 optionsOverride = 6;
-  }
+  readonly attribute boolean onOff = 0;
+  readonly attribute boolean globalSceneControl = 16384;
+  attribute int16u onTime = 16385;
+  attribute int16u offWaitTime = 16386;
+  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  command MoveToHue(MoveToHueRequest): DefaultSuccess = 0;
-  command MoveHue(MoveHueRequest): DefaultSuccess = 1;
-  command StepHue(StepHueRequest): DefaultSuccess = 2;
-  command MoveToSaturation(MoveToSaturationRequest): DefaultSuccess = 3;
-  command MoveSaturation(MoveSaturationRequest): DefaultSuccess = 4;
-  command StepSaturation(StepSaturationRequest): DefaultSuccess = 5;
-  command MoveToHueAndSaturation(MoveToHueAndSaturationRequest): DefaultSuccess = 6;
-  command MoveToColor(MoveToColorRequest): DefaultSuccess = 7;
-  command MoveColor(MoveColorRequest): DefaultSuccess = 8;
-  command StepColor(StepColorRequest): DefaultSuccess = 9;
-  command MoveToColorTemperature(MoveToColorTemperatureRequest): DefaultSuccess = 10;
-  command EnhancedMoveToHue(EnhancedMoveToHueRequest): DefaultSuccess = 64;
-  command EnhancedMoveHue(EnhancedMoveHueRequest): DefaultSuccess = 65;
-  command EnhancedStepHue(EnhancedStepHueRequest): DefaultSuccess = 66;
-  command EnhancedMoveToHueAndSaturation(EnhancedMoveToHueAndSaturationRequest): DefaultSuccess = 67;
-  command ColorLoopSet(ColorLoopSetRequest): DefaultSuccess = 68;
+  command Off(): DefaultSuccess = 0;
+  command On(): DefaultSuccess = 1;
+  command Toggle(): DefaultSuccess = 2;
 }
 
 server cluster Descriptor = 29 {
@@ -416,463 +305,388 @@ server cluster Descriptor = 29 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster DiagnosticLogs = 50 {
-  enum LogsIntent : ENUM8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
-  }
-
-  enum LogsStatus : ENUM8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
-  }
-
-  enum LogsTransferProtocol : ENUM8 {
-    kResponsePayload = 0;
-    kBdx = 1;
+server cluster Binding = 30 {
+  struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
   }
 
+  attribute TargetStruct binding[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct RetrieveLogsRequestRequest {
-    LogsIntent intent = 0;
-    LogsTransferProtocol requestedProtocol = 1;
-    OCTET_STRING transferFileDesignator = 2;
+server cluster AccessControl = 31 {
+  enum AuthMode : ENUM8 {
+    kPase = 1;
+    kCase = 2;
+    kGroup = 3;
   }
 
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
-}
-
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
+  enum ChangeTypeEnum : ENUM8 {
+    kChanged = 0;
+    kAdded = 1;
+    kRemoved = 2;
   }
 
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  enum Privilege : ENUM8 {
+    kView = 1;
+    kProxyView = 2;
+    kOperate = 3;
+    kManage = 4;
+    kAdminister = 5;
+  }
 
-  command ResetCounts(): DefaultSuccess = 0;
-}
+  struct AccessControlEntry {
+    Privilege privilege = 1;
+    AuthMode authMode = 2;
+    nullable int64u subjects[] = 3;
+    nullable Target targets[] = 4;
+    fabric_idx fabricIndex = 254;
+  }
 
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  struct Target {
+    nullable cluster_id cluster = 0;
+    nullable endpoint_no endpoint = 1;
+    nullable devtype_id deviceType = 2;
+  }
 
-server cluster GeneralCommissioning = 48 {
-  enum CommissioningError : ENUM8 {
-    kOk = 0;
-    kValueOutsideRange = 1;
-    kInvalidAuthentication = 2;
-    kNoFailSafe = 3;
-    kBusyWithOtherAdmin = 4;
+  struct ExtensionEntry {
+    octet_string<128> data = 1;
+    fabric_idx fabricIndex = 254;
   }
 
-  enum RegulatoryLocationType : ENUM8 {
-    kIndoor = 0;
-    kOutdoor = 1;
-    kIndoorOutdoor = 2;
+  info event access(read: administer) AccessControlEntryChanged = 0 {
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable AccessControlEntry latestValue = 4;
+    fabric_idx adminFabricIndex = 254;
   }
 
-  struct BasicCommissioningInfo {
-    int16u failSafeExpiryLengthSeconds = 0;
-    int16u maxCumulativeFailsafeSeconds = 1;
+  info event access(read: administer) AccessControlExtensionChanged = 1 {
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable ExtensionEntry latestValue = 4;
+    fabric_idx adminFabricIndex = 254;
   }
 
-  attribute access(write: administer) int64u breadcrumb = 0;
-  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
-  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
-  readonly attribute RegulatoryLocationType locationCapability = 3;
-  readonly attribute boolean supportsConcurrentConnection = 4;
+  attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
+  attribute access(read: administer, write: administer) ExtensionEntry extension[] = 1;
+  readonly attribute int16u subjectsPerAccessControlEntry = 2;
+  readonly attribute int16u targetsPerAccessControlEntry = 3;
+  readonly attribute int16u accessControlEntriesPerFabric = 4;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct ArmFailSafeRequest {
-    INT16U expiryLengthSeconds = 0;
-    INT64U breadcrumb = 1;
+server cluster Basic = 40 {
+  struct CapabilityMinimaStruct {
+    int16u caseSessionsPerFabric = 0;
+    int16u subscriptionsPerFabric = 1;
   }
 
-  request struct SetRegulatoryConfigRequest {
-    RegulatoryLocationType newRegulatoryConfig = 0;
-    CHAR_STRING countryCode = 1;
-    INT64U breadcrumb = 2;
+  critical event StartUp = 0 {
+    INT32U softwareVersion = 0;
   }
 
-  response struct ArmFailSafeResponse = 1 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  critical event ShutDown = 1 {
   }
 
-  response struct SetRegulatoryConfigResponse = 3 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  info event Leave = 2 {
   }
 
-  response struct CommissioningCompleteResponse = 5 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  info event ReachableChanged = 3 {
+    boolean reachableNewValue = 0;
   }
 
-  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
-  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
-  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
+  readonly attribute int16u dataModelRevision = 0;
+  readonly attribute char_string<32> vendorName = 1;
+  readonly attribute vendor_id vendorID = 2;
+  readonly attribute char_string<32> productName = 3;
+  readonly attribute int16u productID = 4;
+  attribute access(write: manage) char_string<32> nodeLabel = 5;
+  attribute access(write: administer) char_string<2> location = 6;
+  readonly attribute int16u hardwareVersion = 7;
+  readonly attribute char_string<64> hardwareVersionString = 8;
+  readonly attribute int32u softwareVersion = 9;
+  readonly attribute char_string<64> softwareVersionString = 10;
+  readonly attribute char_string<16> manufacturingDate = 11;
+  readonly attribute char_string<32> partNumber = 12;
+  readonly attribute long_char_string<256> productURL = 13;
+  readonly attribute char_string<64> productLabel = 14;
+  readonly attribute char_string<32> serialNumber = 15;
+  attribute access(write: manage) boolean localConfigDisabled = 16;
+  readonly attribute boolean reachable = 17;
+  readonly attribute char_string<32> uniqueID = 18;
+  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
-  }
-
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
+client cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
   }
 
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
   }
 
-  enum NetworkFaultType : ENUM8 {
-    kUnspecified = 0;
-    kHardwareFailure = 1;
-    kNetworkJammed = 2;
-    kConnectionFailed = 3;
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
   }
 
-  enum RadioFaultType : ENUM8 {
-    kUnspecified = 0;
-    kWiFiFault = 1;
-    kCellularFault = 2;
-    kThreadFault = 3;
-    kNFCFault = 4;
-    kBLEFault = 5;
-    kEthernetFault = 6;
-  }
+  readonly attribute int16u clusterRevision = 65533;
 
-  struct NetworkInterfaceType {
-    char_string<32> name = 0;
-    boolean isOperational = 1;
-    nullable boolean offPremiseServicesReachableIPv4 = 2;
-    nullable boolean offPremiseServicesReachableIPv6 = 3;
-    octet_string<8> hardwareAddress = 4;
-    octet_string IPv4Addresses[] = 5;
-    octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
   }
 
-  critical event HardwareFaultChange = 0 {
-    HardwareFaultType current[] = 0;
-    HardwareFaultType previous[] = 1;
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
   }
 
-  critical event RadioFaultChange = 1 {
-    RadioFaultType current[] = 0;
-    RadioFaultType previous[] = 1;
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
   }
 
-  critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+  response struct QueryImageResponse = 1 {
+    OTAQueryStatus status = 0;
+    optional INT32U delayedActionTime = 1;
+    optional CHAR_STRING imageURI = 2;
+    optional INT32U softwareVersion = 3;
+    optional CHAR_STRING softwareVersionString = 4;
+    optional OCTET_STRING updateToken = 5;
+    optional BOOLEAN userConsentNeeded = 6;
+    optional OCTET_STRING metadataForRequestor = 7;
   }
 
-  critical event BootReason = 3 {
-    BootReasonType bootReason = 0;
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
   }
 
-  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
-  readonly attribute int16u rebootCount = 1;
-  readonly attribute int64u upTime = 2;
-  readonly attribute int32u totalOperationalHours = 3;
-  readonly attribute enum8 bootReasons = 4;
-  readonly attribute ENUM8 activeHardwareFaults[] = 5;
-  readonly attribute ENUM8 activeRadioFaults[] = 6;
-  readonly attribute ENUM8 activeNetworkFaults[] = 7;
-  readonly attribute boolean testEventTriggersEnabled = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
+}
 
-  request struct TestEventTriggerRequest {
-    OCTET_STRING enableKey = 0;
-    INT64U eventTrigger = 1;
+server cluster OtaSoftwareUpdateRequestor = 42 {
+  enum OTAAnnouncementReason : ENUM8 {
+    kSimpleAnnouncement = 0;
+    kUpdateAvailable = 1;
+    kUrgentUpdateAvailable = 2;
   }
 
-  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
-}
+  enum OTAChangeReasonEnum : ENUM8 {
+    kUnknown = 0;
+    kSuccess = 1;
+    kFailure = 2;
+    kTimeOut = 3;
+    kDelayByProvider = 4;
+  }
 
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
+  enum OTAUpdateStateEnum : ENUM8 {
+    kUnknown = 0;
+    kIdle = 1;
+    kQuerying = 2;
+    kDelayedOnQuery = 3;
+    kDownloading = 4;
+    kApplying = 5;
+    kDelayedOnApply = 6;
+    kRollingBack = 7;
+    kDelayedOnUserConsent = 8;
   }
 
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
+  struct ProviderLocation {
+    node_id providerNodeID = 1;
+    endpoint_no endpoint = 2;
     fabric_idx fabricIndex = 254;
   }
 
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
+  info event StateTransition = 0 {
+    OTAUpdateStateEnum previousState = 0;
+    OTAUpdateStateEnum newState = 1;
+    OTAChangeReasonEnum reason = 2;
+    nullable INT32U targetSoftwareVersion = 3;
   }
 
-  struct GroupKeySetStruct {
-    int16u groupKeySetID = 0;
-    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
-    nullable octet_string<16> epochKey0 = 2;
-    nullable epoch_us epochStartTime0 = 3;
-    nullable octet_string<16> epochKey1 = 4;
-    nullable epoch_us epochStartTime1 = 5;
-    nullable octet_string<16> epochKey2 = 6;
-    nullable epoch_us epochStartTime2 = 7;
+  critical event VersionApplied = 1 {
+    INT32U softwareVersion = 0;
+    INT16U productID = 1;
   }
 
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
-  readonly attribute int16u maxGroupsPerFabric = 2;
-  readonly attribute int16u maxGroupKeysPerFabric = 3;
+  info event DownloadError = 2 {
+    INT32U softwareVersion = 0;
+    INT64U bytesDownloaded = 1;
+    nullable INT8U progressPercent = 2;
+    nullable INT64S platformCode = 3;
+  }
+
+  attribute ProviderLocation defaultOtaProviders[] = 0;
+  readonly attribute boolean updatePossible = 1;
+  readonly attribute OTAUpdateStateEnum updateState = 2;
+  readonly attribute nullable int8u updateStateProgress = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct KeySetWriteRequest {
-    GroupKeySetStruct groupKeySet = 0;
+  request struct AnnounceOtaProviderRequest {
+    node_id providerNodeId = 0;
+    vendor_id vendorId = 1;
+    OTAAnnouncementReason announcementReason = 2;
+    optional OCTET_STRING metadataForNode = 3;
+    endpoint_no endpoint = 4;
   }
 
-  request struct KeySetReadRequest {
-    INT16U groupKeySetID = 0;
-  }
+  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
+}
 
-  request struct KeySetRemoveRequest {
-    INT16U groupKeySetID = 0;
+server cluster LocalizationConfiguration = 43 {
+  attribute char_string<35> activeLocale = 0;
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
   }
 
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
   }
 
-  response struct KeySetReadResponse = 2 {
-    GroupKeySetStruct groupKeySet = 0;
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster GeneralCommissioning = 48 {
+  enum CommissioningError : ENUM8 {
+    kOk = 0;
+    kValueOutsideRange = 1;
+    kInvalidAuthentication = 2;
+    kNoFailSafe = 3;
+    kBusyWithOtherAdmin = 4;
   }
 
-  response struct KeySetReadAllIndicesResponse = 5 {
-    INT16U groupKeySetIDs[] = 0;
+  enum RegulatoryLocationType : ENUM8 {
+    kIndoor = 0;
+    kOutdoor = 1;
+    kIndoorOutdoor = 2;
   }
 
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
-}
+  struct BasicCommissioningInfo {
+    int16u failSafeExpiryLengthSeconds = 0;
+    int16u maxCumulativeFailsafeSeconds = 1;
+  }
 
-server cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
+  attribute access(write: administer) int64u breadcrumb = 0;
+  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
+  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
+  readonly attribute RegulatoryLocationType locationCapability = 3;
+  readonly attribute boolean supportsConcurrentConnection = 4;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AddGroupRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+  request struct ArmFailSafeRequest {
+    INT16U expiryLengthSeconds = 0;
+    INT64U breadcrumb = 1;
   }
 
-  request struct ViewGroupRequest {
-    group_id groupId = 0;
+  request struct SetRegulatoryConfigRequest {
+    RegulatoryLocationType newRegulatoryConfig = 0;
+    CHAR_STRING countryCode = 1;
+    INT64U breadcrumb = 2;
   }
 
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
+  response struct ArmFailSafeResponse = 1 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  request struct RemoveGroupRequest {
-    group_id groupId = 0;
+  response struct SetRegulatoryConfigResponse = 3 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+  response struct CommissioningCompleteResponse = 5 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  response struct AddGroupResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-  }
+  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
+  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
+  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
+}
 
-  response struct ViewGroupResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    CHAR_STRING groupName = 2;
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatus : ENUM8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
   }
 
-  response struct GetGroupMembershipResponse = 2 {
-    nullable INT8U capacity = 0;
-    group_id groupList[] = 1;
+  enum WiFiBand : ENUM8 {
+    k2g4 = 0;
+    k3g65 = 1;
+    k5g = 2;
+    k6g = 3;
+    k60g = 4;
   }
 
-  response struct RemoveGroupResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-  }
-
-  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
-}
-
-client cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
-  }
-
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
-  }
-
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
-  }
-
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
-  }
-
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
-  }
-
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
-  }
-
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
-  }
-
-  request struct TriggerEffectRequest {
-    IdentifyEffectIdentifier effectIdentifier = 0;
-    IdentifyEffectVariant effectVariant = 1;
-  }
-
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
-  command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
-}
-
-server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatus : ENUM8 {
-    kSuccess = 0;
-    kOutOfRange = 1;
-    kBoundsExceeded = 2;
-    kNetworkIDNotFound = 3;
-    kDuplicateNetworkID = 4;
-    kNetworkNotFound = 5;
-    kRegulatoryError = 6;
-    kAuthFailure = 7;
-    kUnsupportedSecurity = 8;
-    kOtherConnectionFailure = 9;
-    kIPV6Failed = 10;
-    kIPBindFailed = 11;
-    kUnknownError = 12;
-  }
-
-  enum WiFiBand : ENUM8 {
-    k2g4 = 0;
-    k3g65 = 1;
-    k5g = 2;
-    k6g = 3;
-    k60g = 4;
-  }
-
-  bitmap NetworkCommissioningFeature : BITMAP32 {
-    kWiFiNetworkInterface = 0x1;
-    kThreadNetworkInterface = 0x2;
-    kEthernetNetworkInterface = 0x4;
+  bitmap NetworkCommissioningFeature : BITMAP32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
   }
 
   bitmap WiFiSecurity : BITMAP8 {
@@ -978,429 +792,408 @@ server cluster NetworkCommissioning = 49 {
   command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
 }
 
-client cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
+server cluster DiagnosticLogs = 50 {
+  enum LogsIntent : ENUM8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
   }
 
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
+  enum LogsStatus : ENUM8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
   }
 
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
+  enum LogsTransferProtocol : ENUM8 {
+    kResponsePayload = 0;
+    kBdx = 1;
   }
 
+  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
+  request struct RetrieveLogsRequestRequest {
+    LogsIntent intent = 0;
+    LogsTransferProtocol requestedProtocol = 1;
+    OCTET_STRING transferFileDesignator = 2;
   }
 
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
-  }
+  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+}
 
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
   }
 
-  response struct QueryImageResponse = 1 {
-    OTAQueryStatus status = 0;
-    optional INT32U delayedActionTime = 1;
-    optional CHAR_STRING imageURI = 2;
-    optional INT32U softwareVersion = 3;
-    optional CHAR_STRING softwareVersionString = 4;
-    optional OCTET_STRING updateToken = 5;
-    optional BOOLEAN userConsentNeeded = 6;
-    optional OCTET_STRING metadataForRequestor = 7;
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
   }
 
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
   }
 
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
-}
-
-server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum OTAAnnouncementReason : ENUM8 {
-    kSimpleAnnouncement = 0;
-    kUpdateAvailable = 1;
-    kUrgentUpdateAvailable = 2;
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
   }
 
-  enum OTAChangeReasonEnum : ENUM8 {
-    kUnknown = 0;
-    kSuccess = 1;
-    kFailure = 2;
-    kTimeOut = 3;
-    kDelayByProvider = 4;
+  enum RadioFaultType : ENUM8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
   }
 
-  enum OTAUpdateStateEnum : ENUM8 {
-    kUnknown = 0;
-    kIdle = 1;
-    kQuerying = 2;
-    kDelayedOnQuery = 3;
-    kDownloading = 4;
-    kApplying = 5;
-    kDelayedOnApply = 6;
-    kRollingBack = 7;
-    kDelayedOnUserConsent = 8;
+  struct NetworkInterfaceType {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceType type = 7;
   }
 
-  struct ProviderLocation {
-    node_id providerNodeID = 1;
-    endpoint_no endpoint = 2;
-    fabric_idx fabricIndex = 254;
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultType current[] = 0;
+    HardwareFaultType previous[] = 1;
   }
 
-  info event StateTransition = 0 {
-    OTAUpdateStateEnum previousState = 0;
-    OTAUpdateStateEnum newState = 1;
-    OTAChangeReasonEnum reason = 2;
-    nullable INT32U targetSoftwareVersion = 3;
+  critical event RadioFaultChange = 1 {
+    RadioFaultType current[] = 0;
+    RadioFaultType previous[] = 1;
   }
 
-  critical event VersionApplied = 1 {
-    INT32U softwareVersion = 0;
-    INT16U productID = 1;
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultType current[] = 0;
+    NetworkFaultType previous[] = 1;
   }
 
-  info event DownloadError = 2 {
-    INT32U softwareVersion = 0;
-    INT64U bytesDownloaded = 1;
-    nullable INT8U progressPercent = 2;
-    nullable INT64S platformCode = 3;
+  critical event BootReason = 3 {
+    BootReasonType bootReason = 0;
   }
 
-  attribute ProviderLocation defaultOtaProviders[] = 0;
-  readonly attribute boolean updatePossible = 1;
-  readonly attribute OTAUpdateStateEnum updateState = 2;
-  readonly attribute nullable int8u updateStateProgress = 3;
+  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
+  readonly attribute int32u totalOperationalHours = 3;
+  readonly attribute enum8 bootReasons = 4;
+  readonly attribute ENUM8 activeHardwareFaults[] = 5;
+  readonly attribute ENUM8 activeRadioFaults[] = 6;
+  readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AnnounceOtaProviderRequest {
-    node_id providerNodeId = 0;
-    vendor_id vendorId = 1;
-    OTAAnnouncementReason announcementReason = 2;
-    optional OCTET_STRING metadataForNode = 3;
-    endpoint_no endpoint = 4;
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
   }
 
-  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
-client cluster OnOff = 6 {
-  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
-    kFadeToOffIn0p8Seconds = 0;
-    kNoFade = 1;
-    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
-  }
-
-  enum OnOffDyingLightEffectVariant : ENUM8 {
-    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
-  }
-
-  enum OnOffEffectIdentifier : ENUM8 {
-    kDelayedAllOff = 0;
-    kDyingLight = 1;
-  }
-
-  enum OnOffStartUpOnOff : ENUM8 {
-    kOff = 0;
-    kOn = 1;
-    kTogglePreviousOnOff = 2;
-  }
-
-  bitmap OnOffControl : BITMAP8 {
-    kAcceptOnlyWhenOn = 0x1;
+server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
   }
 
-  bitmap OnOffFeature : BITMAP32 {
-    kLighting = 0x1;
+  struct ThreadMetrics {
+    int64u id = 0;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
-  bitmap SceneFeatures : BITMAP32 {
-    kSceneNames = 0x1;
+  info event SoftwareFault = 0 {
+    SoftwareFaultStruct softwareFault = 0;
   }
 
-  readonly attribute boolean onOff = 0;
-  readonly attribute boolean globalSceneControl = 16384;
-  attribute int16u onTime = 16385;
-  attribute int16u offWaitTime = 16386;
-  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute ThreadMetrics threadMetrics[] = 0;
+  readonly attribute int64u currentHeapFree = 1;
+  readonly attribute int64u currentHeapUsed = 2;
+  readonly attribute int64u currentHeapHighWatermark = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command Off(): DefaultSuccess = 0;
-  command On(): DefaultSuccess = 1;
-  command Toggle(): DefaultSuccess = 2;
+  command ResetWatermarks(): DefaultSuccess = 0;
 }
 
-server cluster OperationalCredentials = 62 {
-  enum OperationalCertStatus : ENUM8 {
-    kSuccess = 0;
-    kInvalidPublicKey = 1;
-    kInvalidNodeOpId = 2;
-    kInvalidNOC = 3;
-    kMissingCsr = 4;
-    kTableFull = 5;
-    kInvalidAdminSubject = 6;
-    kInsufficientPrivilege = 8;
-    kFabricConflict = 9;
-    kLabelConflict = 10;
-    kInvalidFabricIndex = 11;
-  }
-
-  struct NOCStruct {
-    octet_string noc = 1;
-    nullable octet_string icac = 2;
-    fabric_idx fabricIndex = 254;
-  }
-
-  struct FabricDescriptor {
-    octet_string<65> rootPublicKey = 1;
-    vendor_id vendorId = 2;
-    fabric_id fabricId = 3;
-    node_id nodeId = 4;
-    char_string<32> label = 5;
-    fabric_idx fabricIndex = 254;
-  }
-
-  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
-  readonly attribute FabricDescriptor fabrics[] = 1;
-  readonly attribute int8u supportedFabrics = 2;
-  readonly attribute int8u commissionedFabrics = 3;
-  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
-  readonly attribute fabric_idx currentFabricIndex = 5;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AttestationRequestRequest {
-    OCTET_STRING attestationNonce = 0;
-  }
-
-  request struct CertificateChainRequestRequest {
-    INT8U certificateType = 0;
-  }
-
-  request struct CSRRequestRequest {
-    OCTET_STRING CSRNonce = 0;
-    optional boolean isForUpdateNOC = 1;
-  }
-
-  request struct AddNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
-    OCTET_STRING IPKValue = 2;
-    Int64u caseAdminSubject = 3;
-    VENDOR_ID adminVendorId = 4;
+server cluster ThreadNetworkDiagnostics = 53 {
+  enum NetworkFault : ENUM8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
   }
 
-  request struct UpdateNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
+  enum RoutingRole : ENUM8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kReed = 4;
+    kRouter = 5;
+    kLeader = 6;
   }
 
-  request struct UpdateFabricLabelRequest {
-    CHAR_STRING label = 0;
+  enum ThreadConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  request struct RemoveFabricRequest {
-    fabric_idx fabricIndex = 0;
+  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+    kMLECounts = 0x4;
+    kMACCounts = 0x8;
   }
 
-  request struct AddTrustedRootCertificateRequest {
-    OCTET_STRING rootCertificate = 0;
+  struct NeighborTable {
+    int64u extAddress = 0;
+    int32u age = 1;
+    int16u rloc16 = 2;
+    int32u linkFrameCounter = 3;
+    int32u mleFrameCounter = 4;
+    int8u lqi = 5;
+    nullable int8s averageRssi = 6;
+    nullable int8s lastRssi = 7;
+    int8u frameErrorRate = 8;
+    int8u messageErrorRate = 9;
+    boolean rxOnWhenIdle = 10;
+    boolean fullThreadDevice = 11;
+    boolean fullNetworkData = 12;
+    boolean isChild = 13;
   }
 
-  response struct AttestationResponse = 1 {
-    OCTET_STRING attestationElements = 0;
-    OCTET_STRING signature = 1;
+  struct RouteTable {
+    int64u extAddress = 0;
+    int16u rloc16 = 1;
+    int8u routerId = 2;
+    int8u nextHop = 3;
+    int8u pathCost = 4;
+    int8u LQIIn = 5;
+    int8u LQIOut = 6;
+    int8u age = 7;
+    boolean allocated = 8;
+    boolean linkEstablished = 9;
   }
 
-  response struct CertificateChainResponse = 3 {
-    OCTET_STRING certificate = 0;
+  struct SecurityPolicy {
+    int16u rotationTime = 0;
+    bitmap16 flags = 1;
   }
 
-  response struct CSRResponse = 5 {
-    OCTET_STRING NOCSRElements = 0;
-    OCTET_STRING attestationSignature = 1;
+  struct OperationalDatasetComponents {
+    boolean activeTimestampPresent = 0;
+    boolean pendingTimestampPresent = 1;
+    boolean masterKeyPresent = 2;
+    boolean networkNamePresent = 3;
+    boolean extendedPanIdPresent = 4;
+    boolean meshLocalPrefixPresent = 5;
+    boolean delayPresent = 6;
+    boolean panIdPresent = 7;
+    boolean channelPresent = 8;
+    boolean pskcPresent = 9;
+    boolean securityPolicyPresent = 10;
+    boolean channelMaskPresent = 11;
   }
 
-  response struct NOCResponse = 8 {
-    OperationalCertStatus statusCode = 0;
-    optional fabric_idx fabricIndex = 1;
-    optional CHAR_STRING debugText = 2;
+  info event ConnectionStatus = 0 {
+    ThreadConnectionStatus connectionStatus = 0;
   }
 
-  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
-  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
-  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
-  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
-  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
-  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
-  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
-  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-}
-
-client cluster Scenes = 5 {
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
-  }
-
-  struct ExtensionFieldSet {
-    cluster_id clusterId = 0;
-    AttributeValuePair attributeValueList[] = 1;
-  }
-
-  struct AttributeValuePair {
-    optional attrib_id attributeId = 0;
-    int8u attributeValue[] = 1;
-  }
-
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute nullable int16u channel = 0;
+  readonly attribute nullable RoutingRole routingRole = 1;
+  readonly attribute nullable char_string<16> networkName = 2;
+  readonly attribute nullable int16u panId = 3;
+  readonly attribute nullable int64u extendedPanId = 4;
+  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute NeighborTable neighborTableList[] = 7;
+  readonly attribute RouteTable routeTableList[] = 8;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
+  readonly attribute int16u detachedRoleCount = 14;
+  readonly attribute int16u childRoleCount = 15;
+  readonly attribute int16u routerRoleCount = 16;
+  readonly attribute int16u leaderRoleCount = 17;
+  readonly attribute int16u attachAttemptCount = 18;
+  readonly attribute int16u partitionIdChangeCount = 19;
+  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
+  readonly attribute int16u parentChangeCount = 21;
+  readonly attribute int32u txTotalCount = 22;
+  readonly attribute int32u txUnicastCount = 23;
+  readonly attribute int32u txBroadcastCount = 24;
+  readonly attribute int32u txAckRequestedCount = 25;
+  readonly attribute int32u txAckedCount = 26;
+  readonly attribute int32u txNoAckRequestedCount = 27;
+  readonly attribute int32u txDataCount = 28;
+  readonly attribute int32u txDataPollCount = 29;
+  readonly attribute int32u txBeaconCount = 30;
+  readonly attribute int32u txBeaconRequestCount = 31;
+  readonly attribute int32u txOtherCount = 32;
+  readonly attribute int32u txRetryCount = 33;
+  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
+  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
+  readonly attribute int32u txErrCcaCount = 36;
+  readonly attribute int32u txErrAbortCount = 37;
+  readonly attribute int32u txErrBusyChannelCount = 38;
+  readonly attribute int32u rxTotalCount = 39;
+  readonly attribute int32u rxUnicastCount = 40;
+  readonly attribute int32u rxBroadcastCount = 41;
+  readonly attribute int32u rxDataCount = 42;
+  readonly attribute int32u rxDataPollCount = 43;
+  readonly attribute int32u rxBeaconCount = 44;
+  readonly attribute int32u rxBeaconRequestCount = 45;
+  readonly attribute int32u rxOtherCount = 46;
+  readonly attribute int32u rxAddressFilteredCount = 47;
+  readonly attribute int32u rxDestAddrFilteredCount = 48;
+  readonly attribute int32u rxDuplicatedCount = 49;
+  readonly attribute int32u rxErrNoFrameCount = 50;
+  readonly attribute int32u rxErrUnknownNeighborCount = 51;
+  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
+  readonly attribute int32u rxErrSecCount = 53;
+  readonly attribute int32u rxErrFcsCount = 54;
+  readonly attribute int32u rxErrOtherCount = 55;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
+  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AddSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    INT16U transitionTime = 2;
-    CHAR_STRING sceneName = 3;
-    ExtensionFieldSet extensionFieldSets[] = 4;
-  }
-
-  request struct ViewSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RemoveSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RemoveAllScenesRequest {
-    group_id groupId = 0;
-  }
-
-  request struct StoreSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
+  command ResetCounts(): DefaultSuccess = 0;
+}
 
-  request struct RecallSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    optional nullable INT16U transitionTime = 2;
+server cluster WiFiNetworkDiagnostics = 54 {
+  enum AssociationFailureCause : ENUM8 {
+    kUnknown = 0;
+    kAssociationFailed = 1;
+    kAuthenticationFailed = 2;
+    kSsidNotFound = 3;
   }
 
-  request struct GetSceneMembershipRequest {
-    group_id groupId = 0;
+  enum SecurityType : ENUM8 {
+    kUnspecified = 0;
+    kNone = 1;
+    kWep = 2;
+    kWpa = 3;
+    kWpa2 = 4;
+    kWpa3 = 5;
   }
 
-  response struct AddSceneResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
+  enum WiFiConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  response struct ViewSceneResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-    optional INT16U transitionTime = 3;
-    optional CHAR_STRING sceneName = 4;
-    optional ExtensionFieldSet extensionFieldSets[] = 5;
+  enum WiFiVersionType : ENUM8 {
+    k80211a = 0;
+    k80211b = 1;
+    k80211g = 2;
+    k80211n = 3;
+    k80211ac = 4;
+    k80211ax = 5;
   }
 
-  response struct RemoveSceneResponse = 2 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
+  info event Disconnection = 0 {
+    INT16U reasonCode = 0;
   }
 
-  response struct RemoveAllScenesResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  info event AssociationFailure = 1 {
+    AssociationFailureCause associationFailure = 0;
+    INT16U status = 1;
   }
 
-  response struct StoreSceneResponse = 4 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
+  info event ConnectionStatus = 2 {
+    WiFiConnectionStatus connectionStatus = 0;
   }
 
-  response struct GetSceneMembershipResponse = 6 {
-    ENUM8 status = 0;
-    nullable INT8U capacity = 1;
-    group_id groupId = 2;
-    optional INT8U sceneList[] = 3;
-  }
+  readonly attribute nullable octet_string<6> bssid = 0;
+  readonly attribute nullable SecurityType securityType = 1;
+  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
+  readonly attribute nullable int16u channelNumber = 3;
+  readonly attribute nullable int8s rssi = 4;
+  readonly attribute int32u beaconLostCount = 5;
+  readonly attribute int32u beaconRxCount = 6;
+  readonly attribute int32u packetMulticastRxCount = 7;
+  readonly attribute int32u packetMulticastTxCount = 8;
+  readonly attribute int32u packetUnicastRxCount = 9;
+  readonly attribute int32u packetUnicastTxCount = 10;
+  readonly attribute int64u currentMaxRate = 11;
+  readonly attribute int64u overrunCount = 12;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
-  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
-  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
-  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
-  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
-  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
-  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
-server cluster SoftwareDiagnostics = 52 {
-  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
-    kWaterMarks = 0x1;
-  }
-
-  struct ThreadMetrics {
-    int64u id = 0;
-    optional char_string<8> name = 1;
-    optional int32u stackFreeCurrent = 2;
-    optional int32u stackFreeMinimum = 3;
-    optional int32u stackSize = 4;
-  }
-
-  info event SoftwareFault = 0 {
-    SoftwareFaultStruct softwareFault = 0;
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
   }
 
-  readonly attribute ThreadMetrics threadMetrics[] = 0;
-  readonly attribute int64u currentHeapFree = 1;
-  readonly attribute int64u currentHeapUsed = 2;
-  readonly attribute int64u currentHeapHighWatermark = 3;
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
 server cluster Switch = 59 {
@@ -1438,254 +1231,461 @@ server cluster Switch = 59 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster ThreadNetworkDiagnostics = 53 {
-  enum NetworkFault : ENUM8 {
-    kUnspecified = 0;
-    kLinkDown = 1;
-    kHardwareFailure = 2;
-    kNetworkJammed = 3;
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
   }
 
-  enum RoutingRole : ENUM8 {
-    kUnspecified = 0;
-    kUnassigned = 1;
-    kSleepyEndDevice = 2;
-    kEndDevice = 3;
-    kReed = 4;
-    kRouter = 5;
-    kLeader = 6;
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
   }
 
-  enum ThreadConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
-  }
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
-    kPacketCounts = 0x1;
-    kErrorCounts = 0x2;
-    kMLECounts = 0x4;
-    kMACCounts = 0x8;
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
   }
 
-  struct NeighborTable {
-    int64u extAddress = 0;
-    int32u age = 1;
-    int16u rloc16 = 2;
-    int32u linkFrameCounter = 3;
-    int32u mleFrameCounter = 4;
-    int8u lqi = 5;
-    nullable int8s averageRssi = 6;
-    nullable int8s lastRssi = 7;
-    int8u frameErrorRate = 8;
-    int8u messageErrorRate = 9;
-    boolean rxOnWhenIdle = 10;
-    boolean fullThreadDevice = 11;
-    boolean fullNetworkData = 12;
-    boolean isChild = 13;
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
   }
 
-  struct RouteTable {
-    int64u extAddress = 0;
-    int16u rloc16 = 1;
-    int8u routerId = 2;
-    int8u nextHop = 3;
-    int8u pathCost = 4;
-    int8u LQIIn = 5;
-    int8u LQIOut = 6;
-    int8u age = 7;
-    boolean allocated = 8;
-    boolean linkEstablished = 9;
-  }
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
+}
 
-  struct SecurityPolicy {
-    int16u rotationTime = 0;
-    bitmap16 flags = 1;
+server cluster OperationalCredentials = 62 {
+  enum OperationalCertStatus : ENUM8 {
+    kSuccess = 0;
+    kInvalidPublicKey = 1;
+    kInvalidNodeOpId = 2;
+    kInvalidNOC = 3;
+    kMissingCsr = 4;
+    kTableFull = 5;
+    kInvalidAdminSubject = 6;
+    kInsufficientPrivilege = 8;
+    kFabricConflict = 9;
+    kLabelConflict = 10;
+    kInvalidFabricIndex = 11;
   }
 
-  struct OperationalDatasetComponents {
-    boolean activeTimestampPresent = 0;
-    boolean pendingTimestampPresent = 1;
-    boolean masterKeyPresent = 2;
-    boolean networkNamePresent = 3;
-    boolean extendedPanIdPresent = 4;
-    boolean meshLocalPrefixPresent = 5;
-    boolean delayPresent = 6;
-    boolean panIdPresent = 7;
-    boolean channelPresent = 8;
-    boolean pskcPresent = 9;
-    boolean securityPolicyPresent = 10;
-    boolean channelMaskPresent = 11;
+  struct NOCStruct {
+    octet_string noc = 1;
+    nullable octet_string icac = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  info event ConnectionStatus = 0 {
-    ThreadConnectionStatus connectionStatus = 0;
+  struct FabricDescriptor {
+    octet_string<65> rootPublicKey = 1;
+    vendor_id vendorId = 2;
+    fabric_id fabricId = 3;
+    node_id nodeId = 4;
+    char_string<32> label = 5;
+    fabric_idx fabricIndex = 254;
   }
 
-  readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable RoutingRole routingRole = 1;
-  readonly attribute nullable char_string<16> networkName = 2;
-  readonly attribute nullable int16u panId = 3;
-  readonly attribute nullable int64u extendedPanId = 4;
-  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute NeighborTable neighborTableList[] = 7;
-  readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
-  readonly attribute nullable int8u leaderRouterId = 13;
-  readonly attribute int16u detachedRoleCount = 14;
-  readonly attribute int16u childRoleCount = 15;
-  readonly attribute int16u routerRoleCount = 16;
-  readonly attribute int16u leaderRoleCount = 17;
-  readonly attribute int16u attachAttemptCount = 18;
-  readonly attribute int16u partitionIdChangeCount = 19;
-  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
-  readonly attribute int16u parentChangeCount = 21;
-  readonly attribute int32u txTotalCount = 22;
-  readonly attribute int32u txUnicastCount = 23;
-  readonly attribute int32u txBroadcastCount = 24;
-  readonly attribute int32u txAckRequestedCount = 25;
-  readonly attribute int32u txAckedCount = 26;
-  readonly attribute int32u txNoAckRequestedCount = 27;
-  readonly attribute int32u txDataCount = 28;
-  readonly attribute int32u txDataPollCount = 29;
-  readonly attribute int32u txBeaconCount = 30;
-  readonly attribute int32u txBeaconRequestCount = 31;
-  readonly attribute int32u txOtherCount = 32;
-  readonly attribute int32u txRetryCount = 33;
-  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
-  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
-  readonly attribute int32u txErrCcaCount = 36;
-  readonly attribute int32u txErrAbortCount = 37;
-  readonly attribute int32u txErrBusyChannelCount = 38;
-  readonly attribute int32u rxTotalCount = 39;
-  readonly attribute int32u rxUnicastCount = 40;
-  readonly attribute int32u rxBroadcastCount = 41;
-  readonly attribute int32u rxDataCount = 42;
-  readonly attribute int32u rxDataPollCount = 43;
-  readonly attribute int32u rxBeaconCount = 44;
-  readonly attribute int32u rxBeaconRequestCount = 45;
-  readonly attribute int32u rxOtherCount = 46;
-  readonly attribute int32u rxAddressFilteredCount = 47;
-  readonly attribute int32u rxDestAddrFilteredCount = 48;
-  readonly attribute int32u rxDuplicatedCount = 49;
-  readonly attribute int32u rxErrNoFrameCount = 50;
-  readonly attribute int32u rxErrUnknownNeighborCount = 51;
-  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
-  readonly attribute int32u rxErrSecCount = 53;
-  readonly attribute int32u rxErrFcsCount = 54;
-  readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute nullable int64u activeTimestamp = 56;
-  readonly attribute nullable int64u pendingTimestamp = 57;
-  readonly attribute nullable int32u delay = 58;
-  readonly attribute nullable SecurityPolicy securityPolicy = 59;
-  readonly attribute nullable octet_string<4> channelMask = 60;
-  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
-  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
+  readonly attribute FabricDescriptor fabrics[] = 1;
+  readonly attribute int8u supportedFabrics = 2;
+  readonly attribute int8u commissionedFabrics = 3;
+  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
+  readonly attribute fabric_idx currentFabricIndex = 5;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
-}
-
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
+  request struct AttestationRequestRequest {
+    OCTET_STRING attestationNonce = 0;
   }
 
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
+  request struct CertificateChainRequestRequest {
+    INT8U certificateType = 0;
   }
 
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster UserLabel = 65 {
-  attribute access(write: manage) LabelStruct labelList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  request struct CSRRequestRequest {
+    OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
+  }
 
-server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCause : ENUM8 {
-    kUnknown = 0;
-    kAssociationFailed = 1;
-    kAuthenticationFailed = 2;
-    kSsidNotFound = 3;
+  request struct AddNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+    OCTET_STRING IPKValue = 2;
+    Int64u caseAdminSubject = 3;
+    VENDOR_ID adminVendorId = 4;
   }
 
-  enum SecurityType : ENUM8 {
-    kUnspecified = 0;
-    kNone = 1;
-    kWep = 2;
-    kWpa = 3;
-    kWpa2 = 4;
-    kWpa3 = 5;
+  request struct UpdateNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
   }
 
-  enum WiFiConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  request struct UpdateFabricLabelRequest {
+    CHAR_STRING label = 0;
   }
 
-  enum WiFiVersionType : ENUM8 {
-    k80211a = 0;
-    k80211b = 1;
-    k80211g = 2;
-    k80211n = 3;
-    k80211ac = 4;
-    k80211ax = 5;
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
   }
 
-  info event Disconnection = 0 {
-    INT16U reasonCode = 0;
+  request struct AddTrustedRootCertificateRequest {
+    OCTET_STRING rootCertificate = 0;
   }
 
-  info event AssociationFailure = 1 {
-    AssociationFailureCause associationFailure = 0;
-    INT16U status = 1;
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
   }
 
-  info event ConnectionStatus = 2 {
-    WiFiConnectionStatus connectionStatus = 0;
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
   }
 
-  readonly attribute nullable octet_string<6> bssid = 0;
-  readonly attribute nullable SecurityType securityType = 1;
-  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
-  readonly attribute nullable int16u channelNumber = 3;
-  readonly attribute nullable int8s rssi = 4;
-  readonly attribute int32u beaconLostCount = 5;
-  readonly attribute int32u beaconRxCount = 6;
-  readonly attribute int32u packetMulticastRxCount = 7;
-  readonly attribute int32u packetMulticastTxCount = 8;
-  readonly attribute int32u packetUnicastRxCount = 9;
-  readonly attribute int32u packetUnicastTxCount = 10;
-  readonly attribute int64u currentMaxRate = 11;
-  readonly attribute int64u overrunCount = 12;
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
+  }
+
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
+  }
+
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
+}
+
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
+  }
+
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
+
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster UserLabel = 65 {
+  attribute access(write: manage) LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+client cluster ColorControl = 768 {
+  enum ColorLoopAction : ENUM8 {
+    kDeactivate = 0;
+    kActivateFromColorLoopStartEnhancedHue = 1;
+    kActivateFromEnhancedCurrentHue = 2;
+  }
+
+  enum ColorLoopDirection : ENUM8 {
+    kDecrementHue = 0;
+    kIncrementHue = 1;
+  }
+
+  enum ColorMode : ENUM8 {
+    kCurrentHueAndCurrentSaturation = 0;
+    kCurrentXAndCurrentY = 1;
+    kColorTemperature = 2;
+  }
+
+  enum HueDirection : ENUM8 {
+    kShortestDistance = 0;
+    kLongestDistance = 1;
+    kUp = 2;
+    kDown = 3;
+  }
+
+  enum HueMoveMode : ENUM8 {
+    kStop = 0;
+    kUp = 1;
+    kDown = 3;
+  }
+
+  enum HueStepMode : ENUM8 {
+    kUp = 1;
+    kDown = 3;
+  }
+
+  enum SaturationMoveMode : ENUM8 {
+    kStop = 0;
+    kUp = 1;
+    kDown = 3;
+  }
+
+  enum SaturationStepMode : ENUM8 {
+    kUp = 1;
+    kDown = 3;
+  }
+
+  bitmap ColorCapabilities : BITMAP16 {
+    kHueSaturationSupported = 0x1;
+    kEnhancedHueSupported = 0x2;
+    kColorLoopSupported = 0x4;
+    kXYAttributesSupported = 0x8;
+    kColorTemperatureSupported = 0x10;
+  }
+
+  bitmap ColorControlFeature : BITMAP32 {
+    kHueAndSaturation = 0x1;
+    kEnhancedHue = 0x2;
+    kColorLoop = 0x4;
+    kXy = 0x8;
+    kColorTemperature = 0x10;
+  }
+
+  bitmap ColorLoopUpdateFlags : BITMAP8 {
+    kUpdateAction = 0x1;
+    kUpdateDirection = 0x2;
+    kUpdateTime = 0x4;
+    kUpdateStartHue = 0x8;
+  }
+
+  readonly attribute int8u currentHue = 0;
+  readonly attribute int8u currentSaturation = 1;
+  readonly attribute int16u remainingTime = 2;
+  readonly attribute int16u currentX = 3;
+  readonly attribute int16u currentY = 4;
+  readonly attribute int16u colorTemperature = 7;
+  readonly attribute enum8 colorMode = 8;
+  attribute bitmap8 options = 15;
+  readonly attribute nullable int8u numberOfPrimaries = 16;
+  readonly attribute int16u enhancedCurrentHue = 16384;
+  readonly attribute enum8 enhancedColorMode = 16385;
+  readonly attribute int8u colorLoopActive = 16386;
+  readonly attribute int8u colorLoopDirection = 16387;
+  readonly attribute int16u colorLoopTime = 16388;
+  readonly attribute int16u colorLoopStartEnhancedHue = 16389;
+  readonly attribute int16u colorLoopStoredEnhancedHue = 16390;
+  readonly attribute bitmap16 colorCapabilities = 16394;
+  readonly attribute int16u colorTempPhysicalMinMireds = 16395;
+  readonly attribute int16u colorTempPhysicalMaxMireds = 16396;
+  readonly attribute int16u coupleColorTempToLevelMinMireds = 16397;
+  attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct MoveToHueRequest {
+    INT8U hue = 0;
+    HueDirection direction = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
+  }
+
+  request struct MoveHueRequest {
+    HueMoveMode moveMode = 0;
+    INT8U rate = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
+  }
+
+  request struct StepHueRequest {
+    HueStepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT8U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
+  }
+
+  request struct MoveToSaturationRequest {
+    INT8U saturation = 0;
+    INT16U transitionTime = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
+  }
+
+  request struct MoveSaturationRequest {
+    SaturationMoveMode moveMode = 0;
+    INT8U rate = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
+  }
+
+  request struct StepSaturationRequest {
+    SaturationStepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT8U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
+  }
+
+  request struct MoveToHueAndSaturationRequest {
+    INT8U hue = 0;
+    INT8U saturation = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
+  }
+
+  request struct MoveToColorRequest {
+    INT16U colorX = 0;
+    INT16U colorY = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
+  }
+
+  request struct MoveColorRequest {
+    INT16S rateX = 0;
+    INT16S rateY = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
+  }
+
+  request struct StepColorRequest {
+    INT16S stepX = 0;
+    INT16S stepY = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
+  }
+
+  request struct MoveToColorTemperatureRequest {
+    INT16U colorTemperature = 0;
+    INT16U transitionTime = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
+  }
+
+  request struct EnhancedMoveToHueRequest {
+    INT16U enhancedHue = 0;
+    HueDirection direction = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
+  }
+
+  request struct EnhancedMoveHueRequest {
+    HueMoveMode moveMode = 0;
+    INT16U rate = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
+  }
+
+  request struct EnhancedStepHueRequest {
+    HueStepMode stepMode = 0;
+    INT16U stepSize = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
+  }
+
+  request struct EnhancedMoveToHueAndSaturationRequest {
+    INT16U enhancedHue = 0;
+    INT8U saturation = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
+  }
+
+  request struct ColorLoopSetRequest {
+    ColorLoopUpdateFlags updateFlags = 0;
+    ColorLoopAction action = 1;
+    ColorLoopDirection direction = 2;
+    INT16U time = 3;
+    INT16U startHue = 4;
+    BITMAP8 optionsMask = 5;
+    BITMAP8 optionsOverride = 6;
+  }
+
+  command MoveToHue(MoveToHueRequest): DefaultSuccess = 0;
+  command MoveHue(MoveHueRequest): DefaultSuccess = 1;
+  command StepHue(StepHueRequest): DefaultSuccess = 2;
+  command MoveToSaturation(MoveToSaturationRequest): DefaultSuccess = 3;
+  command MoveSaturation(MoveSaturationRequest): DefaultSuccess = 4;
+  command StepSaturation(StepSaturationRequest): DefaultSuccess = 5;
+  command MoveToHueAndSaturation(MoveToHueAndSaturationRequest): DefaultSuccess = 6;
+  command MoveToColor(MoveToColorRequest): DefaultSuccess = 7;
+  command MoveColor(MoveColorRequest): DefaultSuccess = 8;
+  command StepColor(StepColorRequest): DefaultSuccess = 9;
+  command MoveToColorTemperature(MoveToColorTemperatureRequest): DefaultSuccess = 10;
+  command EnhancedMoveToHue(EnhancedMoveToHueRequest): DefaultSuccess = 64;
+  command EnhancedMoveHue(EnhancedMoveHueRequest): DefaultSuccess = 65;
+  command EnhancedStepHue(EnhancedStepHueRequest): DefaultSuccess = 66;
+  command EnhancedMoveToHueAndSaturation(EnhancedMoveToHueAndSaturationRequest): DefaultSuccess = 67;
+  command ColorLoopSet(ColorLoopSetRequest): DefaultSuccess = 68;
 }
 
 endpoint 0 {
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
index ef2f89ee2ef987..ad6fd02baafaeb 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -6,413 +6,249 @@ struct LabelStruct {
     char_string<16> value = 1;
 }
 
-server cluster AccessControl = 31 {
-  enum AuthMode : ENUM8 {
-    kPase = 1;
-    kCase = 2;
-    kGroup = 3;
-  }
-
-  enum ChangeTypeEnum : ENUM8 {
-    kChanged = 0;
-    kAdded = 1;
-    kRemoved = 2;
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
   }
 
-  enum Privilege : ENUM8 {
-    kView = 1;
-    kProxyView = 2;
-    kOperate = 3;
-    kManage = 4;
-    kAdminister = 5;
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
   }
 
-  struct AccessControlEntry {
-    Privilege privilege = 1;
-    AuthMode authMode = 2;
-    nullable int64u subjects[] = 3;
-    nullable Target targets[] = 4;
-    fabric_idx fabricIndex = 254;
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
   }
 
-  struct Target {
-    nullable cluster_id cluster = 0;
-    nullable endpoint_no endpoint = 1;
-    nullable devtype_id deviceType = 2;
-  }
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  struct ExtensionEntry {
-    octet_string<128> data = 1;
-    fabric_idx fabricIndex = 254;
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
   }
 
-  info event access(read: administer) AccessControlEntryChanged = 0 {
-    nullable node_id adminNodeID = 1;
-    nullable INT16U adminPasscodeID = 2;
-    ChangeTypeEnum changeType = 3;
-    nullable AccessControlEntry latestValue = 4;
-    fabric_idx adminFabricIndex = 254;
+  request struct TriggerEffectRequest {
+    IdentifyEffectIdentifier effectIdentifier = 0;
+    IdentifyEffectVariant effectVariant = 1;
   }
 
-  info event access(read: administer) AccessControlExtensionChanged = 1 {
-    nullable node_id adminNodeID = 1;
-    nullable INT16U adminPasscodeID = 2;
-    ChangeTypeEnum changeType = 3;
-    nullable ExtensionEntry latestValue = 4;
-    fabric_idx adminFabricIndex = 254;
-  }
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+  command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
+}
 
-  attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
-  attribute access(read: administer, write: administer) ExtensionEntry extension[] = 1;
-  readonly attribute int16u subjectsPerAccessControlEntry = 2;
-  readonly attribute int16u targetsPerAccessControlEntry = 3;
-  readonly attribute int16u accessControlEntriesPerFabric = 4;
-  readonly attribute attrib_id attributeList[] = 65531;
+server cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
+  request struct AddGroupRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
   }
 
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
+  request struct ViewGroupRequest {
+    group_id groupId = 0;
   }
 
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
   }
 
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
+  request struct RemoveGroupRequest {
+    group_id groupId = 0;
   }
 
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
-
-server cluster Basic = 40 {
-  struct CapabilityMinimaStruct {
-    int16u caseSessionsPerFabric = 0;
-    int16u subscriptionsPerFabric = 1;
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
   }
 
-  critical event StartUp = 0 {
-    INT32U softwareVersion = 0;
+  response struct AddGroupResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  critical event ShutDown = 1 {
+  response struct ViewGroupResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    CHAR_STRING groupName = 2;
   }
 
-  info event Leave = 2 {
+  response struct GetGroupMembershipResponse = 2 {
+    nullable INT8U capacity = 0;
+    group_id groupList[] = 1;
   }
 
-  info event ReachableChanged = 3 {
-    boolean reachableNewValue = 0;
+  response struct RemoveGroupResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  readonly attribute int16u dataModelRevision = 0;
-  readonly attribute char_string<32> vendorName = 1;
-  readonly attribute vendor_id vendorID = 2;
-  readonly attribute char_string<32> productName = 3;
-  readonly attribute int16u productID = 4;
-  attribute access(write: manage) char_string<32> nodeLabel = 5;
-  attribute access(write: administer) char_string<2> location = 6;
-  readonly attribute int16u hardwareVersion = 7;
-  readonly attribute char_string<64> hardwareVersionString = 8;
-  readonly attribute int32u softwareVersion = 9;
-  readonly attribute char_string<64> softwareVersionString = 10;
-  readonly attribute char_string<16> manufacturingDate = 11;
-  readonly attribute char_string<32> partNumber = 12;
-  readonly attribute long_char_string<256> productURL = 13;
-  readonly attribute char_string<64> productLabel = 14;
-  readonly attribute char_string<32> serialNumber = 15;
-  attribute access(write: manage) boolean localConfigDisabled = 16;
-  readonly attribute boolean reachable = 17;
-  readonly attribute char_string<32> uniqueID = 18;
-  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
 }
 
-server cluster ColorControl = 768 {
-  enum ColorLoopAction : ENUM8 {
-    kDeactivate = 0;
-    kActivateFromColorLoopStartEnhancedHue = 1;
-    kActivateFromEnhancedCurrentHue = 2;
+server cluster OnOff = 6 {
+  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
+    kFadeToOffIn0p8Seconds = 0;
+    kNoFade = 1;
+    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
   }
 
-  enum ColorLoopDirection : ENUM8 {
-    kDecrementHue = 0;
-    kIncrementHue = 1;
+  enum OnOffDyingLightEffectVariant : ENUM8 {
+    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
   }
 
-  enum ColorMode : ENUM8 {
-    kCurrentHueAndCurrentSaturation = 0;
-    kCurrentXAndCurrentY = 1;
-    kColorTemperature = 2;
+  enum OnOffEffectIdentifier : ENUM8 {
+    kDelayedAllOff = 0;
+    kDyingLight = 1;
   }
 
-  enum HueDirection : ENUM8 {
-    kShortestDistance = 0;
-    kLongestDistance = 1;
-    kUp = 2;
-    kDown = 3;
+  enum OnOffStartUpOnOff : ENUM8 {
+    kOff = 0;
+    kOn = 1;
+    kTogglePreviousOnOff = 2;
   }
 
-  enum HueMoveMode : ENUM8 {
-    kStop = 0;
-    kUp = 1;
-    kDown = 3;
+  bitmap OnOffControl : BITMAP8 {
+    kAcceptOnlyWhenOn = 0x1;
   }
 
-  enum HueStepMode : ENUM8 {
-    kUp = 1;
-    kDown = 3;
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
   }
 
-  enum SaturationMoveMode : ENUM8 {
-    kStop = 0;
-    kUp = 1;
-    kDown = 3;
+  bitmap SceneFeatures : BITMAP32 {
+    kSceneNames = 0x1;
   }
 
-  enum SaturationStepMode : ENUM8 {
-    kUp = 1;
-    kDown = 3;
-  }
+  readonly attribute boolean onOff = 0;
+  readonly attribute boolean globalSceneControl = 16384;
+  attribute int16u onTime = 16385;
+  attribute int16u offWaitTime = 16386;
+  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  bitmap ColorCapabilities : BITMAP16 {
-    kHueSaturationSupported = 0x1;
-    kEnhancedHueSupported = 0x2;
-    kColorLoopSupported = 0x4;
-    kXYAttributesSupported = 0x8;
-    kColorTemperatureSupported = 0x10;
+  request struct OffWithEffectRequest {
+    OnOffEffectIdentifier effectId = 0;
+    OnOffDelayedAllOffEffectVariant effectVariant = 1;
   }
 
-  bitmap ColorControlFeature : BITMAP32 {
-    kHueAndSaturation = 0x1;
-    kEnhancedHue = 0x2;
-    kColorLoop = 0x4;
-    kXy = 0x8;
-    kColorTemperature = 0x10;
+  request struct OnWithTimedOffRequest {
+    OnOffControl onOffControl = 0;
+    int16u onTime = 1;
+    int16u offWaitTime = 2;
   }
 
-  bitmap ColorLoopUpdateFlags : BITMAP8 {
-    kUpdateAction = 0x1;
-    kUpdateDirection = 0x2;
-    kUpdateTime = 0x4;
-    kUpdateStartHue = 0x8;
-  }
-
-  readonly attribute int8u currentHue = 0;
-  readonly attribute int8u currentSaturation = 1;
-  readonly attribute int16u remainingTime = 2;
-  readonly attribute int16u currentX = 3;
-  readonly attribute int16u currentY = 4;
-  readonly attribute int16u colorTemperature = 7;
-  readonly attribute enum8 colorMode = 8;
-  attribute bitmap8 options = 15;
-  readonly attribute nullable int8u numberOfPrimaries = 16;
-  readonly attribute int16u enhancedCurrentHue = 16384;
-  readonly attribute enum8 enhancedColorMode = 16385;
-  readonly attribute int8u colorLoopActive = 16386;
-  readonly attribute int8u colorLoopDirection = 16387;
-  readonly attribute int16u colorLoopTime = 16388;
-  readonly attribute int16u colorLoopStartEnhancedHue = 16389;
-  readonly attribute int16u colorLoopStoredEnhancedHue = 16390;
-  readonly attribute bitmap16 colorCapabilities = 16394;
-  readonly attribute int16u colorTempPhysicalMinMireds = 16395;
-  readonly attribute int16u colorTempPhysicalMaxMireds = 16396;
-  readonly attribute int16u coupleColorTempToLevelMinMireds = 16397;
-  attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command Off(): DefaultSuccess = 0;
+  command On(): DefaultSuccess = 1;
+  command Toggle(): DefaultSuccess = 2;
+  command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64;
+  command OnWithRecallGlobalScene(): DefaultSuccess = 65;
+  command OnWithTimedOff(OnWithTimedOffRequest): DefaultSuccess = 66;
+}
 
-  request struct MoveToHueRequest {
-    INT8U hue = 0;
-    HueDirection direction = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+server cluster LevelControl = 8 {
+  enum MoveMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
   }
 
-  request struct MoveHueRequest {
-    HueMoveMode moveMode = 0;
-    INT8U rate = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
+  enum StepMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
   }
 
-  request struct StepHueRequest {
-    HueStepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT8U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  bitmap LevelControlFeature : BITMAP32 {
+    kOnOff = 0x1;
+    kLighting = 0x2;
+    kFrequency = 0x4;
   }
 
-  request struct MoveToSaturationRequest {
-    INT8U saturation = 0;
+  readonly attribute int8u currentLevel = 0;
+  readonly attribute int16u remainingTime = 1;
+  readonly attribute int8u minLevel = 2;
+  readonly attribute int8u maxLevel = 3;
+  readonly attribute int16u currentFrequency = 4;
+  readonly attribute int16u minFrequency = 5;
+  readonly attribute int16u maxFrequency = 6;
+  attribute bitmap8 options = 15;
+  attribute int16u onOffTransitionTime = 16;
+  attribute nullable int8u onLevel = 17;
+  attribute nullable int16u onTransitionTime = 18;
+  attribute nullable int16u offTransitionTime = 19;
+  attribute nullable int8u defaultMoveRate = 20;
+  attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct MoveToLevelRequest {
+    INT8U level = 0;
     INT16U transitionTime = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
   }
 
-  request struct MoveSaturationRequest {
-    SaturationMoveMode moveMode = 0;
+  request struct MoveRequest {
+    MoveMode moveMode = 0;
     INT8U rate = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
   }
 
-  request struct StepSaturationRequest {
-    SaturationStepMode stepMode = 0;
+  request struct StepRequest {
+    StepMode stepMode = 0;
     INT8U stepSize = 1;
-    INT8U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
-  }
-
-  request struct MoveToHueAndSaturationRequest {
-    INT8U hue = 0;
-    INT8U saturation = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
-  }
-
-  request struct MoveToColorRequest {
-    INT16U colorX = 0;
-    INT16U colorY = 1;
     INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
-  }
-
-  request struct MoveColorRequest {
-    INT16S rateX = 0;
-    INT16S rateY = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
+    BITMAP8 optionMask = 3;
+    BITMAP8 optionOverride = 4;
   }
 
-  request struct StepColorRequest {
-    INT16S stepX = 0;
-    INT16S stepY = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  request struct StopRequest {
+    BITMAP8 optionMask = 0;
+    BITMAP8 optionOverride = 1;
   }
 
-  request struct MoveToColorTemperatureRequest {
-    INT16U colorTemperature = 0;
+  request struct MoveToLevelWithOnOffRequest {
+    INT8U level = 0;
     INT16U transitionTime = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
-  }
-
-  request struct EnhancedMoveToHueRequest {
-    INT16U enhancedHue = 0;
-    HueDirection direction = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
-  }
-
-  request struct EnhancedMoveHueRequest {
-    HueMoveMode moveMode = 0;
-    INT16U rate = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
-  }
-
-  request struct EnhancedStepHueRequest {
-    HueStepMode stepMode = 0;
-    INT16U stepSize = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
-  }
-
-  request struct EnhancedMoveToHueAndSaturationRequest {
-    INT16U enhancedHue = 0;
-    INT8U saturation = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
-  }
-
-  request struct ColorLoopSetRequest {
-    ColorLoopUpdateFlags updateFlags = 0;
-    ColorLoopAction action = 1;
-    ColorLoopDirection direction = 2;
-    INT16U time = 3;
-    INT16U startHue = 4;
-    BITMAP8 optionsMask = 5;
-    BITMAP8 optionsOverride = 6;
-  }
-
-  request struct StopMoveStepRequest {
-    BITMAP8 optionsMask = 0;
-    BITMAP8 optionsOverride = 1;
   }
 
-  request struct MoveColorTemperatureRequest {
-    HueMoveMode moveMode = 0;
-    INT16U rate = 1;
-    INT16U colorTemperatureMinimumMireds = 2;
-    INT16U colorTemperatureMaximumMireds = 3;
-    BITMAP8 optionsMask = 4;
-    BITMAP8 optionsOverride = 5;
+  request struct MoveWithOnOffRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
   }
 
-  request struct StepColorTemperatureRequest {
-    HueStepMode stepMode = 0;
-    INT16U stepSize = 1;
+  request struct StepWithOnOffRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
     INT16U transitionTime = 2;
-    INT16U colorTemperatureMinimumMireds = 3;
-    INT16U colorTemperatureMaximumMireds = 4;
-    BITMAP8 optionsMask = 5;
-    BITMAP8 optionsOverride = 6;
   }
 
-  command MoveToHue(MoveToHueRequest): DefaultSuccess = 0;
-  command MoveHue(MoveHueRequest): DefaultSuccess = 1;
-  command StepHue(StepHueRequest): DefaultSuccess = 2;
-  command MoveToSaturation(MoveToSaturationRequest): DefaultSuccess = 3;
-  command MoveSaturation(MoveSaturationRequest): DefaultSuccess = 4;
-  command StepSaturation(StepSaturationRequest): DefaultSuccess = 5;
-  command MoveToHueAndSaturation(MoveToHueAndSaturationRequest): DefaultSuccess = 6;
-  command MoveToColor(MoveToColorRequest): DefaultSuccess = 7;
-  command MoveColor(MoveColorRequest): DefaultSuccess = 8;
-  command StepColor(StepColorRequest): DefaultSuccess = 9;
-  command MoveToColorTemperature(MoveToColorTemperatureRequest): DefaultSuccess = 10;
-  command EnhancedMoveToHue(EnhancedMoveToHueRequest): DefaultSuccess = 64;
-  command EnhancedMoveHue(EnhancedMoveHueRequest): DefaultSuccess = 65;
-  command EnhancedStepHue(EnhancedStepHueRequest): DefaultSuccess = 66;
-  command EnhancedMoveToHueAndSaturation(EnhancedMoveToHueAndSaturationRequest): DefaultSuccess = 67;
-  command ColorLoopSet(ColorLoopSetRequest): DefaultSuccess = 68;
-  command StopMoveStep(StopMoveStepRequest): DefaultSuccess = 71;
-  command MoveColorTemperature(MoveColorTemperatureRequest): DefaultSuccess = 75;
-  command StepColorTemperature(StepColorTemperatureRequest): DefaultSuccess = 76;
+  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
+  command Move(MoveRequest): DefaultSuccess = 1;
+  command Step(StepRequest): DefaultSuccess = 2;
+  command Stop(StopRequest): DefaultSuccess = 3;
+  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
+  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
+  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
+  command StopWithOnOff(): DefaultSuccess = 7;
 }
 
 server cluster Descriptor = 29 {
@@ -429,513 +265,368 @@ server cluster Descriptor = 29 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster DiagnosticLogs = 50 {
-  enum LogsIntent : ENUM8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
+server cluster AccessControl = 31 {
+  enum AuthMode : ENUM8 {
+    kPase = 1;
+    kCase = 2;
+    kGroup = 3;
   }
 
-  enum LogsStatus : ENUM8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
+  enum ChangeTypeEnum : ENUM8 {
+    kChanged = 0;
+    kAdded = 1;
+    kRemoved = 2;
   }
 
-  enum LogsTransferProtocol : ENUM8 {
-    kResponsePayload = 0;
-    kBdx = 1;
-  }
-
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct RetrieveLogsRequestRequest {
-    LogsIntent intent = 0;
-    LogsTransferProtocol requestedProtocol = 1;
-    OCTET_STRING transferFileDesignator = 2;
+  enum Privilege : ENUM8 {
+    kView = 1;
+    kProxyView = 2;
+    kOperate = 3;
+    kManage = 4;
+    kAdminister = 5;
   }
 
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
-}
-
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
+  struct AccessControlEntry {
+    Privilege privilege = 1;
+    AuthMode authMode = 2;
+    nullable int64u subjects[] = 3;
+    nullable Target targets[] = 4;
+    fabric_idx fabricIndex = 254;
   }
 
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command ResetCounts(): DefaultSuccess = 0;
-}
-
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  struct Target {
+    nullable cluster_id cluster = 0;
+    nullable endpoint_no endpoint = 1;
+    nullable devtype_id deviceType = 2;
+  }
 
-server cluster GeneralCommissioning = 48 {
-  enum CommissioningError : ENUM8 {
-    kOk = 0;
-    kValueOutsideRange = 1;
-    kInvalidAuthentication = 2;
-    kNoFailSafe = 3;
-    kBusyWithOtherAdmin = 4;
+  struct ExtensionEntry {
+    octet_string<128> data = 1;
+    fabric_idx fabricIndex = 254;
   }
 
-  enum RegulatoryLocationType : ENUM8 {
-    kIndoor = 0;
-    kOutdoor = 1;
-    kIndoorOutdoor = 2;
+  info event access(read: administer) AccessControlEntryChanged = 0 {
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable AccessControlEntry latestValue = 4;
+    fabric_idx adminFabricIndex = 254;
   }
 
-  struct BasicCommissioningInfo {
-    int16u failSafeExpiryLengthSeconds = 0;
-    int16u maxCumulativeFailsafeSeconds = 1;
+  info event access(read: administer) AccessControlExtensionChanged = 1 {
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable ExtensionEntry latestValue = 4;
+    fabric_idx adminFabricIndex = 254;
   }
 
-  attribute access(write: administer) int64u breadcrumb = 0;
-  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
-  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
-  readonly attribute RegulatoryLocationType locationCapability = 3;
-  readonly attribute boolean supportsConcurrentConnection = 4;
+  attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
+  attribute access(read: administer, write: administer) ExtensionEntry extension[] = 1;
+  readonly attribute int16u subjectsPerAccessControlEntry = 2;
+  readonly attribute int16u targetsPerAccessControlEntry = 3;
+  readonly attribute int16u accessControlEntriesPerFabric = 4;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct ArmFailSafeRequest {
-    INT16U expiryLengthSeconds = 0;
-    INT64U breadcrumb = 1;
+server cluster Basic = 40 {
+  struct CapabilityMinimaStruct {
+    int16u caseSessionsPerFabric = 0;
+    int16u subscriptionsPerFabric = 1;
   }
 
-  request struct SetRegulatoryConfigRequest {
-    RegulatoryLocationType newRegulatoryConfig = 0;
-    CHAR_STRING countryCode = 1;
-    INT64U breadcrumb = 2;
+  critical event StartUp = 0 {
+    INT32U softwareVersion = 0;
   }
 
-  response struct ArmFailSafeResponse = 1 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  critical event ShutDown = 1 {
   }
 
-  response struct SetRegulatoryConfigResponse = 3 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  info event Leave = 2 {
   }
 
-  response struct CommissioningCompleteResponse = 5 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  info event ReachableChanged = 3 {
+    boolean reachableNewValue = 0;
   }
 
-  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
-  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
-  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
+  readonly attribute int16u dataModelRevision = 0;
+  readonly attribute char_string<32> vendorName = 1;
+  readonly attribute vendor_id vendorID = 2;
+  readonly attribute char_string<32> productName = 3;
+  readonly attribute int16u productID = 4;
+  attribute access(write: manage) char_string<32> nodeLabel = 5;
+  attribute access(write: administer) char_string<2> location = 6;
+  readonly attribute int16u hardwareVersion = 7;
+  readonly attribute char_string<64> hardwareVersionString = 8;
+  readonly attribute int32u softwareVersion = 9;
+  readonly attribute char_string<64> softwareVersionString = 10;
+  readonly attribute char_string<16> manufacturingDate = 11;
+  readonly attribute char_string<32> partNumber = 12;
+  readonly attribute long_char_string<256> productURL = 13;
+  readonly attribute char_string<64> productLabel = 14;
+  readonly attribute char_string<32> serialNumber = 15;
+  attribute access(write: manage) boolean localConfigDisabled = 16;
+  readonly attribute boolean reachable = 17;
+  readonly attribute char_string<32> uniqueID = 18;
+  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
+client cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
   }
 
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
   }
 
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
   }
 
-  enum NetworkFaultType : ENUM8 {
-    kUnspecified = 0;
-    kHardwareFailure = 1;
-    kNetworkJammed = 2;
-    kConnectionFailed = 3;
-  }
+  readonly attribute int16u clusterRevision = 65533;
 
-  enum RadioFaultType : ENUM8 {
-    kUnspecified = 0;
-    kWiFiFault = 1;
-    kCellularFault = 2;
-    kThreadFault = 3;
-    kNFCFault = 4;
-    kBLEFault = 5;
-    kEthernetFault = 6;
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
   }
 
-  struct NetworkInterfaceType {
-    char_string<32> name = 0;
-    boolean isOperational = 1;
-    nullable boolean offPremiseServicesReachableIPv4 = 2;
-    nullable boolean offPremiseServicesReachableIPv6 = 3;
-    octet_string<8> hardwareAddress = 4;
-    octet_string IPv4Addresses[] = 5;
-    octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
   }
 
-  critical event HardwareFaultChange = 0 {
-    HardwareFaultType current[] = 0;
-    HardwareFaultType previous[] = 1;
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
   }
 
-  critical event RadioFaultChange = 1 {
-    RadioFaultType current[] = 0;
-    RadioFaultType previous[] = 1;
+  response struct QueryImageResponse = 1 {
+    OTAQueryStatus status = 0;
+    optional INT32U delayedActionTime = 1;
+    optional CHAR_STRING imageURI = 2;
+    optional INT32U softwareVersion = 3;
+    optional CHAR_STRING softwareVersionString = 4;
+    optional OCTET_STRING updateToken = 5;
+    optional BOOLEAN userConsentNeeded = 6;
+    optional OCTET_STRING metadataForRequestor = 7;
   }
 
-  critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
   }
 
-  critical event BootReason = 3 {
-    BootReasonType bootReason = 0;
-  }
-
-  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
-  readonly attribute int16u rebootCount = 1;
-  readonly attribute int64u upTime = 2;
-  readonly attribute int32u totalOperationalHours = 3;
-  readonly attribute enum8 bootReasons = 4;
-  readonly attribute ENUM8 activeHardwareFaults[] = 5;
-  readonly attribute ENUM8 activeRadioFaults[] = 6;
-  readonly attribute ENUM8 activeNetworkFaults[] = 7;
-  readonly attribute boolean testEventTriggersEnabled = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
+}
 
-  request struct TestEventTriggerRequest {
-    OCTET_STRING enableKey = 0;
-    INT64U eventTrigger = 1;
+server cluster OtaSoftwareUpdateRequestor = 42 {
+  enum OTAAnnouncementReason : ENUM8 {
+    kSimpleAnnouncement = 0;
+    kUpdateAvailable = 1;
+    kUrgentUpdateAvailable = 2;
   }
 
-  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
-}
+  enum OTAChangeReasonEnum : ENUM8 {
+    kUnknown = 0;
+    kSuccess = 1;
+    kFailure = 2;
+    kTimeOut = 3;
+    kDelayByProvider = 4;
+  }
 
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
+  enum OTAUpdateStateEnum : ENUM8 {
+    kUnknown = 0;
+    kIdle = 1;
+    kQuerying = 2;
+    kDelayedOnQuery = 3;
+    kDownloading = 4;
+    kApplying = 5;
+    kDelayedOnApply = 6;
+    kRollingBack = 7;
+    kDelayedOnUserConsent = 8;
   }
 
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
+  struct ProviderLocation {
+    node_id providerNodeID = 1;
+    endpoint_no endpoint = 2;
     fabric_idx fabricIndex = 254;
   }
 
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
+  info event StateTransition = 0 {
+    OTAUpdateStateEnum previousState = 0;
+    OTAUpdateStateEnum newState = 1;
+    OTAChangeReasonEnum reason = 2;
+    nullable INT32U targetSoftwareVersion = 3;
   }
 
-  struct GroupKeySetStruct {
-    int16u groupKeySetID = 0;
-    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
-    nullable octet_string<16> epochKey0 = 2;
-    nullable epoch_us epochStartTime0 = 3;
-    nullable octet_string<16> epochKey1 = 4;
-    nullable epoch_us epochStartTime1 = 5;
-    nullable octet_string<16> epochKey2 = 6;
-    nullable epoch_us epochStartTime2 = 7;
+  critical event VersionApplied = 1 {
+    INT32U softwareVersion = 0;
+    INT16U productID = 1;
   }
 
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
-  readonly attribute int16u maxGroupsPerFabric = 2;
-  readonly attribute int16u maxGroupKeysPerFabric = 3;
+  info event DownloadError = 2 {
+    INT32U softwareVersion = 0;
+    INT64U bytesDownloaded = 1;
+    nullable INT8U progressPercent = 2;
+    nullable INT64S platformCode = 3;
+  }
+
+  attribute ProviderLocation defaultOtaProviders[] = 0;
+  readonly attribute boolean updatePossible = 1;
+  readonly attribute OTAUpdateStateEnum updateState = 2;
+  readonly attribute nullable int8u updateStateProgress = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct KeySetWriteRequest {
-    GroupKeySetStruct groupKeySet = 0;
-  }
-
-  request struct KeySetReadRequest {
-    INT16U groupKeySetID = 0;
+  request struct AnnounceOtaProviderRequest {
+    node_id providerNodeId = 0;
+    vendor_id vendorId = 1;
+    OTAAnnouncementReason announcementReason = 2;
+    optional OCTET_STRING metadataForNode = 3;
+    endpoint_no endpoint = 4;
   }
 
-  request struct KeySetRemoveRequest {
-    INT16U groupKeySetID = 0;
-  }
+  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
+}
 
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
-  }
+server cluster LocalizationConfiguration = 43 {
+  attribute char_string<35> activeLocale = 0;
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  response struct KeySetReadResponse = 2 {
-    GroupKeySetStruct groupKeySet = 0;
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
   }
 
-  response struct KeySetReadAllIndicesResponse = 5 {
-    INT16U groupKeySetIDs[] = 0;
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
   }
 
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
-}
-
-server cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct AddGroupRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+server cluster GeneralCommissioning = 48 {
+  enum CommissioningError : ENUM8 {
+    kOk = 0;
+    kValueOutsideRange = 1;
+    kInvalidAuthentication = 2;
+    kNoFailSafe = 3;
+    kBusyWithOtherAdmin = 4;
   }
 
-  request struct ViewGroupRequest {
-    group_id groupId = 0;
+  enum RegulatoryLocationType : ENUM8 {
+    kIndoor = 0;
+    kOutdoor = 1;
+    kIndoorOutdoor = 2;
   }
 
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
+  struct BasicCommissioningInfo {
+    int16u failSafeExpiryLengthSeconds = 0;
+    int16u maxCumulativeFailsafeSeconds = 1;
   }
 
-  request struct RemoveGroupRequest {
-    group_id groupId = 0;
-  }
+  attribute access(write: administer) int64u breadcrumb = 0;
+  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
+  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
+  readonly attribute RegulatoryLocationType locationCapability = 3;
+  readonly attribute boolean supportsConcurrentConnection = 4;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+  request struct ArmFailSafeRequest {
+    INT16U expiryLengthSeconds = 0;
+    INT64U breadcrumb = 1;
   }
 
-  response struct AddGroupResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  request struct SetRegulatoryConfigRequest {
+    RegulatoryLocationType newRegulatoryConfig = 0;
+    CHAR_STRING countryCode = 1;
+    INT64U breadcrumb = 2;
   }
 
-  response struct ViewGroupResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    CHAR_STRING groupName = 2;
+  response struct ArmFailSafeResponse = 1 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  response struct GetGroupMembershipResponse = 2 {
-    nullable INT8U capacity = 0;
-    group_id groupList[] = 1;
+  response struct SetRegulatoryConfigResponse = 3 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  response struct RemoveGroupResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  response struct CommissioningCompleteResponse = 5 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
+  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
+  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
+  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
 }
 
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatus : ENUM8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
   }
 
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
-  }
-
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
-  }
-
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
-  }
-
-  request struct TriggerEffectRequest {
-    IdentifyEffectIdentifier effectIdentifier = 0;
-    IdentifyEffectVariant effectVariant = 1;
-  }
-
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
-  command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
-}
-
-server cluster LevelControl = 8 {
-  enum MoveMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
-  }
-
-  enum StepMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
-  }
-
-  bitmap LevelControlFeature : BITMAP32 {
-    kOnOff = 0x1;
-    kLighting = 0x2;
-    kFrequency = 0x4;
-  }
-
-  readonly attribute int8u currentLevel = 0;
-  readonly attribute int16u remainingTime = 1;
-  readonly attribute int8u minLevel = 2;
-  readonly attribute int8u maxLevel = 3;
-  readonly attribute int16u currentFrequency = 4;
-  readonly attribute int16u minFrequency = 5;
-  readonly attribute int16u maxFrequency = 6;
-  attribute bitmap8 options = 15;
-  attribute int16u onOffTransitionTime = 16;
-  attribute nullable int8u onLevel = 17;
-  attribute nullable int16u onTransitionTime = 18;
-  attribute nullable int16u offTransitionTime = 19;
-  attribute nullable int8u defaultMoveRate = 20;
-  attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct MoveToLevelRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
-  }
-
-  request struct MoveRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
-  }
-
-  request struct StepRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionMask = 3;
-    BITMAP8 optionOverride = 4;
-  }
-
-  request struct StopRequest {
-    BITMAP8 optionMask = 0;
-    BITMAP8 optionOverride = 1;
-  }
-
-  request struct MoveToLevelWithOnOffRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
-  }
-
-  request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
-  }
-
-  request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
-  }
-
-  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
-  command Move(MoveRequest): DefaultSuccess = 1;
-  command Step(StepRequest): DefaultSuccess = 2;
-  command Stop(StopRequest): DefaultSuccess = 3;
-  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
-  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
-  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
-  command StopWithOnOff(): DefaultSuccess = 7;
-}
-
-server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatus : ENUM8 {
-    kSuccess = 0;
-    kOutOfRange = 1;
-    kBoundsExceeded = 2;
-    kNetworkIDNotFound = 3;
-    kDuplicateNetworkID = 4;
-    kNetworkNotFound = 5;
-    kRegulatoryError = 6;
-    kAuthFailure = 7;
-    kUnsupportedSecurity = 8;
-    kOtherConnectionFailure = 9;
-    kIPV6Failed = 10;
-    kIPBindFailed = 11;
-    kUnknownError = 12;
-  }
-
-  enum WiFiBand : ENUM8 {
-    k2g4 = 0;
-    k3g65 = 1;
-    k5g = 2;
-    k6g = 3;
-    k60g = 4;
+  enum WiFiBand : ENUM8 {
+    k2g4 = 0;
+    k3g65 = 1;
+    k5g = 2;
+    k6g = 3;
+    k60g = 4;
   }
 
   bitmap NetworkCommissioningFeature : BITMAP32 {
@@ -1047,315 +738,136 @@ server cluster NetworkCommissioning = 49 {
   command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
 }
 
-client cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
+server cluster DiagnosticLogs = 50 {
+  enum LogsIntent : ENUM8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
   }
 
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
+  enum LogsStatus : ENUM8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
   }
 
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
+  enum LogsTransferProtocol : ENUM8 {
+    kResponsePayload = 0;
+    kBdx = 1;
   }
 
+  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
+  request struct RetrieveLogsRequestRequest {
+    LogsIntent intent = 0;
+    LogsTransferProtocol requestedProtocol = 1;
+    OCTET_STRING transferFileDesignator = 2;
   }
 
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
-  }
+  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+}
 
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
   }
 
-  response struct QueryImageResponse = 1 {
-    OTAQueryStatus status = 0;
-    optional INT32U delayedActionTime = 1;
-    optional CHAR_STRING imageURI = 2;
-    optional INT32U softwareVersion = 3;
-    optional CHAR_STRING softwareVersionString = 4;
-    optional OCTET_STRING updateToken = 5;
-    optional BOOLEAN userConsentNeeded = 6;
-    optional OCTET_STRING metadataForRequestor = 7;
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
   }
 
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
   }
 
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
-}
-
-server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum OTAAnnouncementReason : ENUM8 {
-    kSimpleAnnouncement = 0;
-    kUpdateAvailable = 1;
-    kUrgentUpdateAvailable = 2;
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
   }
 
-  enum OTAChangeReasonEnum : ENUM8 {
-    kUnknown = 0;
-    kSuccess = 1;
-    kFailure = 2;
-    kTimeOut = 3;
-    kDelayByProvider = 4;
-  }
-
-  enum OTAUpdateStateEnum : ENUM8 {
-    kUnknown = 0;
-    kIdle = 1;
-    kQuerying = 2;
-    kDelayedOnQuery = 3;
-    kDownloading = 4;
-    kApplying = 5;
-    kDelayedOnApply = 6;
-    kRollingBack = 7;
-    kDelayedOnUserConsent = 8;
-  }
-
-  struct ProviderLocation {
-    node_id providerNodeID = 1;
-    endpoint_no endpoint = 2;
-    fabric_idx fabricIndex = 254;
-  }
-
-  info event StateTransition = 0 {
-    OTAUpdateStateEnum previousState = 0;
-    OTAUpdateStateEnum newState = 1;
-    OTAChangeReasonEnum reason = 2;
-    nullable INT32U targetSoftwareVersion = 3;
-  }
-
-  critical event VersionApplied = 1 {
-    INT32U softwareVersion = 0;
-    INT16U productID = 1;
-  }
-
-  info event DownloadError = 2 {
-    INT32U softwareVersion = 0;
-    INT64U bytesDownloaded = 1;
-    nullable INT8U progressPercent = 2;
-    nullable INT64S platformCode = 3;
-  }
-
-  attribute ProviderLocation defaultOtaProviders[] = 0;
-  readonly attribute boolean updatePossible = 1;
-  readonly attribute OTAUpdateStateEnum updateState = 2;
-  readonly attribute nullable int8u updateStateProgress = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AnnounceOtaProviderRequest {
-    node_id providerNodeId = 0;
-    vendor_id vendorId = 1;
-    OTAAnnouncementReason announcementReason = 2;
-    optional OCTET_STRING metadataForNode = 3;
-    endpoint_no endpoint = 4;
-  }
-
-  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
-}
-
-server cluster OccupancySensing = 1030 {
-  readonly attribute bitmap8 occupancy = 0;
-  readonly attribute enum8 occupancySensorType = 1;
-  readonly attribute bitmap8 occupancySensorTypeBitmap = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster OnOff = 6 {
-  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
-    kFadeToOffIn0p8Seconds = 0;
-    kNoFade = 1;
-    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
-  }
-
-  enum OnOffDyingLightEffectVariant : ENUM8 {
-    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
-  }
-
-  enum OnOffEffectIdentifier : ENUM8 {
-    kDelayedAllOff = 0;
-    kDyingLight = 1;
-  }
-
-  enum OnOffStartUpOnOff : ENUM8 {
-    kOff = 0;
-    kOn = 1;
-    kTogglePreviousOnOff = 2;
-  }
-
-  bitmap OnOffControl : BITMAP8 {
-    kAcceptOnlyWhenOn = 0x1;
-  }
-
-  bitmap OnOffFeature : BITMAP32 {
-    kLighting = 0x1;
-  }
-
-  bitmap SceneFeatures : BITMAP32 {
-    kSceneNames = 0x1;
+  enum RadioFaultType : ENUM8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
   }
 
-  readonly attribute boolean onOff = 0;
-  readonly attribute boolean globalSceneControl = 16384;
-  attribute int16u onTime = 16385;
-  attribute int16u offWaitTime = 16386;
-  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct OffWithEffectRequest {
-    OnOffEffectIdentifier effectId = 0;
-    OnOffDelayedAllOffEffectVariant effectVariant = 1;
+  struct NetworkInterfaceType {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceType type = 7;
   }
 
-  request struct OnWithTimedOffRequest {
-    OnOffControl onOffControl = 0;
-    int16u onTime = 1;
-    int16u offWaitTime = 2;
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultType current[] = 0;
+    HardwareFaultType previous[] = 1;
   }
 
-  command Off(): DefaultSuccess = 0;
-  command On(): DefaultSuccess = 1;
-  command Toggle(): DefaultSuccess = 2;
-  command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64;
-  command OnWithRecallGlobalScene(): DefaultSuccess = 65;
-  command OnWithTimedOff(OnWithTimedOffRequest): DefaultSuccess = 66;
-}
-
-server cluster OperationalCredentials = 62 {
-  enum OperationalCertStatus : ENUM8 {
-    kSuccess = 0;
-    kInvalidPublicKey = 1;
-    kInvalidNodeOpId = 2;
-    kInvalidNOC = 3;
-    kMissingCsr = 4;
-    kTableFull = 5;
-    kInvalidAdminSubject = 6;
-    kInsufficientPrivilege = 8;
-    kFabricConflict = 9;
-    kLabelConflict = 10;
-    kInvalidFabricIndex = 11;
+  critical event RadioFaultChange = 1 {
+    RadioFaultType current[] = 0;
+    RadioFaultType previous[] = 1;
   }
 
-  struct NOCStruct {
-    octet_string noc = 1;
-    nullable octet_string icac = 2;
-    fabric_idx fabricIndex = 254;
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultType current[] = 0;
+    NetworkFaultType previous[] = 1;
   }
 
-  struct FabricDescriptor {
-    octet_string<65> rootPublicKey = 1;
-    vendor_id vendorId = 2;
-    fabric_id fabricId = 3;
-    node_id nodeId = 4;
-    char_string<32> label = 5;
-    fabric_idx fabricIndex = 254;
+  critical event BootReason = 3 {
+    BootReasonType bootReason = 0;
   }
 
-  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
-  readonly attribute FabricDescriptor fabrics[] = 1;
-  readonly attribute int8u supportedFabrics = 2;
-  readonly attribute int8u commissionedFabrics = 3;
-  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
-  readonly attribute fabric_idx currentFabricIndex = 5;
+  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
+  readonly attribute int32u totalOperationalHours = 3;
+  readonly attribute enum8 bootReasons = 4;
+  readonly attribute ENUM8 activeHardwareFaults[] = 5;
+  readonly attribute ENUM8 activeRadioFaults[] = 6;
+  readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AttestationRequestRequest {
-    OCTET_STRING attestationNonce = 0;
-  }
-
-  request struct CertificateChainRequestRequest {
-    INT8U certificateType = 0;
-  }
-
-  request struct CSRRequestRequest {
-    OCTET_STRING CSRNonce = 0;
-    optional boolean isForUpdateNOC = 1;
-  }
-
-  request struct AddNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
-    OCTET_STRING IPKValue = 2;
-    Int64u caseAdminSubject = 3;
-    VENDOR_ID adminVendorId = 4;
-  }
-
-  request struct UpdateNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
-  }
-
-  request struct UpdateFabricLabelRequest {
-    CHAR_STRING label = 0;
-  }
-
-  request struct RemoveFabricRequest {
-    fabric_idx fabricIndex = 0;
-  }
-
-  request struct AddTrustedRootCertificateRequest {
-    OCTET_STRING rootCertificate = 0;
-  }
-
-  response struct AttestationResponse = 1 {
-    OCTET_STRING attestationElements = 0;
-    OCTET_STRING signature = 1;
-  }
-
-  response struct CertificateChainResponse = 3 {
-    OCTET_STRING certificate = 0;
-  }
-
-  response struct CSRResponse = 5 {
-    OCTET_STRING NOCSRElements = 0;
-    OCTET_STRING attestationSignature = 1;
-  }
-
-  response struct NOCResponse = 8 {
-    OperationalCertStatus statusCode = 0;
-    optional fabric_idx fabricIndex = 1;
-    optional CHAR_STRING debugText = 2;
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
   }
 
-  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
-  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
-  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
-  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
-  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
-  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
-  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
-  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
 server cluster SoftwareDiagnostics = 52 {
@@ -1385,41 +897,6 @@ server cluster SoftwareDiagnostics = 52 {
   command ResetWatermarks(): DefaultSuccess = 0;
 }
 
-server cluster Switch = 59 {
-  info event SwitchLatched = 0 {
-    INT8U newPosition = 0;
-  }
-
-  info event InitialPress = 1 {
-    INT8U newPosition = 0;
-  }
-
-  info event LongPress = 2 {
-    INT8U newPosition = 0;
-  }
-
-  info event ShortRelease = 3 {
-    INT8U previousPosition = 0;
-  }
-
-  info event LongRelease = 4 {
-    INT8U previousPosition = 0;
-  }
-
-  info event MultiPressOngoing = 5 {
-    INT8U newPosition = 0;
-    INT8U currentNumberOfPressesCounted = 1;
-  }
-
-  info event MultiPressComplete = 6 {
-    INT8U newPosition = 0;
-    INT8U totalNumberOfPressesCounted = 1;
-  }
-
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
 server cluster ThreadNetworkDiagnostics = 53 {
   enum NetworkFault : ENUM8 {
     kUnspecified = 0;
@@ -1573,40 +1050,6 @@ server cluster ThreadNetworkDiagnostics = 53 {
   command ResetCounts(): DefaultSuccess = 0;
 }
 
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
-  }
-
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
-  }
-
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster UserLabel = 65 {
-  attribute access(write: manage) LabelStruct labelList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
 server cluster WiFiNetworkDiagnostics = 54 {
   enum AssociationFailureCause : ENUM8 {
     kUnknown = 0;
@@ -1670,6 +1113,563 @@ server cluster WiFiNetworkDiagnostics = 54 {
   command ResetCounts(): DefaultSuccess = 0;
 }
 
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
+  }
+
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command ResetCounts(): DefaultSuccess = 0;
+}
+
+server cluster Switch = 59 {
+  info event SwitchLatched = 0 {
+    INT8U newPosition = 0;
+  }
+
+  info event InitialPress = 1 {
+    INT8U newPosition = 0;
+  }
+
+  info event LongPress = 2 {
+    INT8U newPosition = 0;
+  }
+
+  info event ShortRelease = 3 {
+    INT8U previousPosition = 0;
+  }
+
+  info event LongRelease = 4 {
+    INT8U previousPosition = 0;
+  }
+
+  info event MultiPressOngoing = 5 {
+    INT8U newPosition = 0;
+    INT8U currentNumberOfPressesCounted = 1;
+  }
+
+  info event MultiPressComplete = 6 {
+    INT8U newPosition = 0;
+    INT8U totalNumberOfPressesCounted = 1;
+  }
+
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
+  }
+
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
+  }
+
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
+  }
+
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+  }
+
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
+}
+
+server cluster OperationalCredentials = 62 {
+  enum OperationalCertStatus : ENUM8 {
+    kSuccess = 0;
+    kInvalidPublicKey = 1;
+    kInvalidNodeOpId = 2;
+    kInvalidNOC = 3;
+    kMissingCsr = 4;
+    kTableFull = 5;
+    kInvalidAdminSubject = 6;
+    kInsufficientPrivilege = 8;
+    kFabricConflict = 9;
+    kLabelConflict = 10;
+    kInvalidFabricIndex = 11;
+  }
+
+  struct NOCStruct {
+    octet_string noc = 1;
+    nullable octet_string icac = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct FabricDescriptor {
+    octet_string<65> rootPublicKey = 1;
+    vendor_id vendorId = 2;
+    fabric_id fabricId = 3;
+    node_id nodeId = 4;
+    char_string<32> label = 5;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
+  readonly attribute FabricDescriptor fabrics[] = 1;
+  readonly attribute int8u supportedFabrics = 2;
+  readonly attribute int8u commissionedFabrics = 3;
+  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
+  readonly attribute fabric_idx currentFabricIndex = 5;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AttestationRequestRequest {
+    OCTET_STRING attestationNonce = 0;
+  }
+
+  request struct CertificateChainRequestRequest {
+    INT8U certificateType = 0;
+  }
+
+  request struct CSRRequestRequest {
+    OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
+  }
+
+  request struct AddNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+    OCTET_STRING IPKValue = 2;
+    Int64u caseAdminSubject = 3;
+    VENDOR_ID adminVendorId = 4;
+  }
+
+  request struct UpdateNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+  }
+
+  request struct UpdateFabricLabelRequest {
+    CHAR_STRING label = 0;
+  }
+
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
+  }
+
+  request struct AddTrustedRootCertificateRequest {
+    OCTET_STRING rootCertificate = 0;
+  }
+
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
+  }
+
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
+  }
+
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
+  }
+
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
+  }
+
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
+}
+
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
+  }
+
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
+
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster UserLabel = 65 {
+  attribute access(write: manage) LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster ColorControl = 768 {
+  enum ColorLoopAction : ENUM8 {
+    kDeactivate = 0;
+    kActivateFromColorLoopStartEnhancedHue = 1;
+    kActivateFromEnhancedCurrentHue = 2;
+  }
+
+  enum ColorLoopDirection : ENUM8 {
+    kDecrementHue = 0;
+    kIncrementHue = 1;
+  }
+
+  enum ColorMode : ENUM8 {
+    kCurrentHueAndCurrentSaturation = 0;
+    kCurrentXAndCurrentY = 1;
+    kColorTemperature = 2;
+  }
+
+  enum HueDirection : ENUM8 {
+    kShortestDistance = 0;
+    kLongestDistance = 1;
+    kUp = 2;
+    kDown = 3;
+  }
+
+  enum HueMoveMode : ENUM8 {
+    kStop = 0;
+    kUp = 1;
+    kDown = 3;
+  }
+
+  enum HueStepMode : ENUM8 {
+    kUp = 1;
+    kDown = 3;
+  }
+
+  enum SaturationMoveMode : ENUM8 {
+    kStop = 0;
+    kUp = 1;
+    kDown = 3;
+  }
+
+  enum SaturationStepMode : ENUM8 {
+    kUp = 1;
+    kDown = 3;
+  }
+
+  bitmap ColorCapabilities : BITMAP16 {
+    kHueSaturationSupported = 0x1;
+    kEnhancedHueSupported = 0x2;
+    kColorLoopSupported = 0x4;
+    kXYAttributesSupported = 0x8;
+    kColorTemperatureSupported = 0x10;
+  }
+
+  bitmap ColorControlFeature : BITMAP32 {
+    kHueAndSaturation = 0x1;
+    kEnhancedHue = 0x2;
+    kColorLoop = 0x4;
+    kXy = 0x8;
+    kColorTemperature = 0x10;
+  }
+
+  bitmap ColorLoopUpdateFlags : BITMAP8 {
+    kUpdateAction = 0x1;
+    kUpdateDirection = 0x2;
+    kUpdateTime = 0x4;
+    kUpdateStartHue = 0x8;
+  }
+
+  readonly attribute int8u currentHue = 0;
+  readonly attribute int8u currentSaturation = 1;
+  readonly attribute int16u remainingTime = 2;
+  readonly attribute int16u currentX = 3;
+  readonly attribute int16u currentY = 4;
+  readonly attribute int16u colorTemperature = 7;
+  readonly attribute enum8 colorMode = 8;
+  attribute bitmap8 options = 15;
+  readonly attribute nullable int8u numberOfPrimaries = 16;
+  readonly attribute int16u enhancedCurrentHue = 16384;
+  readonly attribute enum8 enhancedColorMode = 16385;
+  readonly attribute int8u colorLoopActive = 16386;
+  readonly attribute int8u colorLoopDirection = 16387;
+  readonly attribute int16u colorLoopTime = 16388;
+  readonly attribute int16u colorLoopStartEnhancedHue = 16389;
+  readonly attribute int16u colorLoopStoredEnhancedHue = 16390;
+  readonly attribute bitmap16 colorCapabilities = 16394;
+  readonly attribute int16u colorTempPhysicalMinMireds = 16395;
+  readonly attribute int16u colorTempPhysicalMaxMireds = 16396;
+  readonly attribute int16u coupleColorTempToLevelMinMireds = 16397;
+  attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct MoveToHueRequest {
+    INT8U hue = 0;
+    HueDirection direction = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
+  }
+
+  request struct MoveHueRequest {
+    HueMoveMode moveMode = 0;
+    INT8U rate = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
+  }
+
+  request struct StepHueRequest {
+    HueStepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT8U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
+  }
+
+  request struct MoveToSaturationRequest {
+    INT8U saturation = 0;
+    INT16U transitionTime = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
+  }
+
+  request struct MoveSaturationRequest {
+    SaturationMoveMode moveMode = 0;
+    INT8U rate = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
+  }
+
+  request struct StepSaturationRequest {
+    SaturationStepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT8U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
+  }
+
+  request struct MoveToHueAndSaturationRequest {
+    INT8U hue = 0;
+    INT8U saturation = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
+  }
+
+  request struct MoveToColorRequest {
+    INT16U colorX = 0;
+    INT16U colorY = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
+  }
+
+  request struct MoveColorRequest {
+    INT16S rateX = 0;
+    INT16S rateY = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
+  }
+
+  request struct StepColorRequest {
+    INT16S stepX = 0;
+    INT16S stepY = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
+  }
+
+  request struct MoveToColorTemperatureRequest {
+    INT16U colorTemperature = 0;
+    INT16U transitionTime = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
+  }
+
+  request struct EnhancedMoveToHueRequest {
+    INT16U enhancedHue = 0;
+    HueDirection direction = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
+  }
+
+  request struct EnhancedMoveHueRequest {
+    HueMoveMode moveMode = 0;
+    INT16U rate = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
+  }
+
+  request struct EnhancedStepHueRequest {
+    HueStepMode stepMode = 0;
+    INT16U stepSize = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
+  }
+
+  request struct EnhancedMoveToHueAndSaturationRequest {
+    INT16U enhancedHue = 0;
+    INT8U saturation = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
+  }
+
+  request struct ColorLoopSetRequest {
+    ColorLoopUpdateFlags updateFlags = 0;
+    ColorLoopAction action = 1;
+    ColorLoopDirection direction = 2;
+    INT16U time = 3;
+    INT16U startHue = 4;
+    BITMAP8 optionsMask = 5;
+    BITMAP8 optionsOverride = 6;
+  }
+
+  request struct StopMoveStepRequest {
+    BITMAP8 optionsMask = 0;
+    BITMAP8 optionsOverride = 1;
+  }
+
+  request struct MoveColorTemperatureRequest {
+    HueMoveMode moveMode = 0;
+    INT16U rate = 1;
+    INT16U colorTemperatureMinimumMireds = 2;
+    INT16U colorTemperatureMaximumMireds = 3;
+    BITMAP8 optionsMask = 4;
+    BITMAP8 optionsOverride = 5;
+  }
+
+  request struct StepColorTemperatureRequest {
+    HueStepMode stepMode = 0;
+    INT16U stepSize = 1;
+    INT16U transitionTime = 2;
+    INT16U colorTemperatureMinimumMireds = 3;
+    INT16U colorTemperatureMaximumMireds = 4;
+    BITMAP8 optionsMask = 5;
+    BITMAP8 optionsOverride = 6;
+  }
+
+  command MoveToHue(MoveToHueRequest): DefaultSuccess = 0;
+  command MoveHue(MoveHueRequest): DefaultSuccess = 1;
+  command StepHue(StepHueRequest): DefaultSuccess = 2;
+  command MoveToSaturation(MoveToSaturationRequest): DefaultSuccess = 3;
+  command MoveSaturation(MoveSaturationRequest): DefaultSuccess = 4;
+  command StepSaturation(StepSaturationRequest): DefaultSuccess = 5;
+  command MoveToHueAndSaturation(MoveToHueAndSaturationRequest): DefaultSuccess = 6;
+  command MoveToColor(MoveToColorRequest): DefaultSuccess = 7;
+  command MoveColor(MoveColorRequest): DefaultSuccess = 8;
+  command StepColor(StepColorRequest): DefaultSuccess = 9;
+  command MoveToColorTemperature(MoveToColorTemperatureRequest): DefaultSuccess = 10;
+  command EnhancedMoveToHue(EnhancedMoveToHueRequest): DefaultSuccess = 64;
+  command EnhancedMoveHue(EnhancedMoveHueRequest): DefaultSuccess = 65;
+  command EnhancedStepHue(EnhancedStepHueRequest): DefaultSuccess = 66;
+  command EnhancedMoveToHueAndSaturation(EnhancedMoveToHueAndSaturationRequest): DefaultSuccess = 67;
+  command ColorLoopSet(ColorLoopSetRequest): DefaultSuccess = 68;
+  command StopMoveStep(StopMoveStepRequest): DefaultSuccess = 71;
+  command MoveColorTemperature(MoveColorTemperatureRequest): DefaultSuccess = 75;
+  command StepColorTemperature(StepColorTemperatureRequest): DefaultSuccess = 76;
+}
+
+server cluster OccupancySensing = 1030 {
+  readonly attribute bitmap8 occupancy = 0;
+  readonly attribute enum8 occupancySensorType = 1;
+  readonly attribute bitmap8 occupancySensorTypeBitmap = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
 endpoint 0 {
   device type rootdevice = 22;
   binding cluster OtaSoftwareUpdateProvider;
diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
index d5bd0bf37b4c5f..34009fcf9add01 100644
--- a/examples/lock-app/lock-common/lock-app.matter
+++ b/examples/lock-app/lock-common/lock-app.matter
@@ -6,6 +6,157 @@ struct LabelStruct {
     char_string<16> value = 1;
 }
 
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
+  }
+
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
+  }
+
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
+  }
+
+  attribute int16u identifyTime = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
+  }
+
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+}
+
+server cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AddGroupRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
+
+  request struct ViewGroupRequest {
+    group_id groupId = 0;
+  }
+
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
+  }
+
+  request struct RemoveGroupRequest {
+    group_id groupId = 0;
+  }
+
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
+
+  response struct AddGroupResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  response struct ViewGroupResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    CHAR_STRING groupName = 2;
+  }
+
+  response struct GetGroupMembershipResponse = 2 {
+    nullable INT8U capacity = 0;
+    group_id groupList[] = 1;
+  }
+
+  response struct RemoveGroupResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
+}
+
+server cluster OnOff = 6 {
+  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
+    kFadeToOffIn0p8Seconds = 0;
+    kNoFade = 1;
+    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
+  }
+
+  enum OnOffDyingLightEffectVariant : ENUM8 {
+    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
+  }
+
+  enum OnOffEffectIdentifier : ENUM8 {
+    kDelayedAllOff = 0;
+    kDyingLight = 1;
+  }
+
+  enum OnOffStartUpOnOff : ENUM8 {
+    kOff = 0;
+    kOn = 1;
+    kTogglePreviousOnOff = 2;
+  }
+
+  bitmap OnOffControl : BITMAP8 {
+    kAcceptOnlyWhenOn = 0x1;
+  }
+
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
+  }
+
+  bitmap SceneFeatures : BITMAP32 {
+    kSceneNames = 0x1;
+  }
+
+  readonly attribute boolean onOff = 0;
+  readonly attribute boolean globalSceneControl = 16384;
+  attribute int16u onTime = 16385;
+  attribute int16u offWaitTime = 16386;
+  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command Off(): DefaultSuccess = 0;
+  command On(): DefaultSuccess = 1;
+  command Toggle(): DefaultSuccess = 2;
+}
+
+server cluster Descriptor = 29 {
+  struct DeviceType {
+    devtype_id type = 0;
+    int16u revision = 1;
+  }
+
+  readonly attribute DeviceType deviceList[] = 0;
+  readonly attribute CLUSTER_ID serverList[] = 1;
+  readonly attribute CLUSTER_ID clientList[] = 2;
+  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
 server cluster AccessControl = 31 {
   enum AuthMode : ENUM8 {
     kPase = 1;
@@ -72,42 +223,6 @@ server cluster AccessControl = 31 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
-  }
-
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
-  }
-
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
-  }
-
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-  }
-
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
-
 server cluster Basic = 40 {
   struct CapabilityMinimaStruct {
     int16u caseSessionsPerFabric = 0;
@@ -152,749 +267,516 @@ server cluster Basic = 40 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster Descriptor = 29 {
-  struct DeviceType {
-    devtype_id type = 0;
-    int16u revision = 1;
-  }
-
-  readonly attribute DeviceType deviceList[] = 0;
-  readonly attribute CLUSTER_ID serverList[] = 1;
-  readonly attribute CLUSTER_ID clientList[] = 2;
-  readonly attribute ENDPOINT_NO partsList[] = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster DiagnosticLogs = 50 {
-  enum LogsIntent : ENUM8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
+client cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
   }
 
-  enum LogsStatus : ENUM8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
   }
 
-  enum LogsTransferProtocol : ENUM8 {
-    kResponsePayload = 0;
-    kBdx = 1;
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
   }
 
-  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct RetrieveLogsRequestRequest {
-    LogsIntent intent = 0;
-    LogsTransferProtocol requestedProtocol = 1;
-    OCTET_STRING transferFileDesignator = 2;
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
   }
 
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
-}
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
+  }
 
-server cluster DoorLock = 257 {
-  enum DlAlarmCode : ENUM8 {
-    kLockJammed = 0;
-    kLockFactoryReset = 1;
-    kLockRadioPowerCycled = 3;
-    kWrongCodeEntryLimit = 4;
-    kFrontEsceutcheonRemoved = 5;
-    kDoorForcedOpen = 6;
-    kDoorAjar = 7;
-    kForcedUser = 8;
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
   }
 
-  enum DlCredentialRule : ENUM8 {
-    kSingle = 0;
-    kDouble = 1;
-    kTri = 2;
+  response struct QueryImageResponse = 1 {
+    OTAQueryStatus status = 0;
+    optional INT32U delayedActionTime = 1;
+    optional CHAR_STRING imageURI = 2;
+    optional INT32U softwareVersion = 3;
+    optional CHAR_STRING softwareVersionString = 4;
+    optional OCTET_STRING updateToken = 5;
+    optional BOOLEAN userConsentNeeded = 6;
+    optional OCTET_STRING metadataForRequestor = 7;
   }
 
-  enum DlCredentialType : ENUM8 {
-    kProgrammingPIN = 0;
-    kPin = 1;
-    kRfid = 2;
-    kFingerprint = 3;
-    kFingerVein = 4;
-    kFace = 5;
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
   }
 
-  enum DlDataOperationType : ENUM8 {
-    kAdd = 0;
-    kClear = 1;
-    kModify = 2;
-  }
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
+}
 
-  enum DlDoorState : ENUM8 {
-    kDoorOpen = 0;
-    kDoorClosed = 1;
-    kDoorJammed = 2;
-    kDoorForcedOpen = 3;
-    kDoorUnspecifiedError = 4;
-    kDoorAjar = 5;
+server cluster OtaSoftwareUpdateRequestor = 42 {
+  enum OTAAnnouncementReason : ENUM8 {
+    kSimpleAnnouncement = 0;
+    kUpdateAvailable = 1;
+    kUrgentUpdateAvailable = 2;
   }
 
-  enum DlLockDataType : ENUM8 {
-    kUnspecified = 0;
-    kProgrammingCode = 1;
-    kUserIndex = 2;
-    kWeekDaySchedule = 3;
-    kYearDaySchedule = 4;
-    kHolidaySchedule = 5;
-    kPin = 6;
-    kRfid = 7;
-    kFingerprint = 8;
+  enum OTAChangeReasonEnum : ENUM8 {
+    kUnknown = 0;
+    kSuccess = 1;
+    kFailure = 2;
+    kTimeOut = 3;
+    kDelayByProvider = 4;
   }
 
-  enum DlLockOperationType : ENUM8 {
-    kLock = 0;
-    kUnlock = 1;
-    kNonAccessUserEvent = 2;
-    kForcedUserEvent = 3;
+  enum OTAUpdateStateEnum : ENUM8 {
+    kUnknown = 0;
+    kIdle = 1;
+    kQuerying = 2;
+    kDelayedOnQuery = 3;
+    kDownloading = 4;
+    kApplying = 5;
+    kDelayedOnApply = 6;
+    kRollingBack = 7;
+    kDelayedOnUserConsent = 8;
   }
 
-  enum DlLockState : ENUM8 {
-    kNotFullyLocked = 0;
-    kLocked = 1;
-    kUnlocked = 2;
+  struct ProviderLocation {
+    node_id providerNodeID = 1;
+    endpoint_no endpoint = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  enum DlLockType : ENUM8 {
-    kDeadBolt = 0;
-    kMagnetic = 1;
-    kOther = 2;
-    kMortise = 3;
-    kRim = 4;
-    kLatchBolt = 5;
-    kCylindricalLock = 6;
-    kTubularLock = 7;
-    kInterconnectedLock = 8;
-    kDeadLatch = 9;
-    kDoorFurniture = 10;
+  info event StateTransition = 0 {
+    OTAUpdateStateEnum previousState = 0;
+    OTAUpdateStateEnum newState = 1;
+    OTAChangeReasonEnum reason = 2;
+    nullable INT32U targetSoftwareVersion = 3;
   }
 
-  enum DlOperatingMode : ENUM8 {
-    kNormal = 0;
-    kVacation = 1;
-    kPrivacy = 2;
-    kNoRemoteLockUnlock = 3;
-    kPassage = 4;
+  critical event VersionApplied = 1 {
+    INT32U softwareVersion = 0;
+    INT16U productID = 1;
   }
 
-  enum DlOperationError : ENUM8 {
-    kUnspecified = 0;
-    kInvalidCredential = 1;
-    kDisabledUserDenied = 2;
-    kRestricted = 3;
-    kInsufficientBattery = 4;
+  info event DownloadError = 2 {
+    INT32U softwareVersion = 0;
+    INT64U bytesDownloaded = 1;
+    nullable INT8U progressPercent = 2;
+    nullable INT64S platformCode = 3;
   }
 
-  enum DlOperationSource : ENUM8 {
-    kUnspecified = 0;
-    kManual = 1;
-    kProprietaryRemote = 2;
-    kKeypad = 3;
-    kAuto = 4;
-    kButton = 5;
-    kSchedule = 6;
-    kRemote = 7;
-    kRfid = 8;
-    kBiometric = 9;
-  }
+  attribute ProviderLocation defaultOtaProviders[] = 0;
+  readonly attribute boolean updatePossible = 1;
+  readonly attribute OTAUpdateStateEnum updateState = 2;
+  readonly attribute nullable int8u updateStateProgress = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  enum DlStatus : ENUM8 {
-    kSuccess = 0;
-    kFailure = 1;
-    kDuplicate = 2;
-    kOccupied = 3;
-    kInvalidField = 133;
-    kResourceExhausted = 137;
-    kNotFound = 139;
+  request struct AnnounceOtaProviderRequest {
+    node_id providerNodeId = 0;
+    vendor_id vendorId = 1;
+    OTAAnnouncementReason announcementReason = 2;
+    optional OCTET_STRING metadataForNode = 3;
+    endpoint_no endpoint = 4;
   }
 
-  enum DlUserStatus : ENUM8 {
-    kAvailable = 0;
-    kOccupiedEnabled = 1;
-    kOccupiedDisabled = 3;
-  }
+  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
+}
 
-  enum DlUserType : ENUM8 {
-    kUnrestrictedUser = 0;
-    kYearDayScheduleUser = 1;
-    kWeekDayScheduleUser = 2;
-    kProgrammingUser = 3;
-    kNonAccessUser = 4;
-    kForcedUser = 5;
-    kDisposableUser = 6;
-    kExpiringUser = 7;
-    kScheduleRestrictedUser = 8;
-    kRemoteOnlyUser = 9;
-  }
+server cluster LocalizationConfiguration = 43 {
+  attribute char_string<35> activeLocale = 0;
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  enum DoorLockOperationEventCode : ENUM8 {
-    kUnknownOrMfgSpecific = 0;
-    kLock = 1;
-    kUnlock = 2;
-    kLockInvalidPinOrId = 3;
-    kLockInvalidSchedule = 4;
-    kUnlockInvalidPinOrId = 5;
-    kUnlockInvalidSchedule = 6;
-    kOneTouchLock = 7;
-    kKeyLock = 8;
-    kKeyUnlock = 9;
-    kAutoLock = 10;
-    kScheduleLock = 11;
-    kScheduleUnlock = 12;
-    kManualLock = 13;
-    kManualUnlock = 14;
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
   }
 
-  enum DoorLockProgrammingEventCode : ENUM8 {
-    kUnknownOrMfgSpecific = 0;
-    kMasterCodeChanged = 1;
-    kPinAdded = 2;
-    kPinDeleted = 3;
-    kPinChanged = 4;
-    kIdAdded = 5;
-    kIdDeleted = 6;
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
   }
 
-  enum DoorLockSetPinOrIdStatus : ENUM8 {
-    kSuccess = 0;
-    kGeneralFailure = 1;
-    kMemoryFull = 2;
-    kDuplicateCodeError = 3;
-  }
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  enum DoorLockUserStatus : ENUM8 {
-    kAvailable = 0;
-    kOccupiedEnabled = 1;
-    kOccupiedDisabled = 3;
-    kNotSupported = 255;
-  }
+server cluster PowerSourceConfiguration = 46 {
+  readonly attribute INT8U sources[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  enum DoorLockUserType : ENUM8 {
-    kUnrestricted = 0;
-    kYearDayScheduleUser = 1;
-    kWeekDayScheduleUser = 2;
-    kMasterUser = 3;
-    kNonAccessUser = 4;
-    kNotSupported = 255;
-  }
-
-  bitmap DlCredentialRuleMask : BITMAP8 {
-    kSingle = 0x1;
-    kDual = 0x2;
-    kTri = 0x4;
+server cluster PowerSource = 47 {
+  enum BatChargeFaultType : ENUM8 {
+    kUnspecfied = 0;
+    kAmbientTooHot = 1;
+    kAmbientTooCold = 2;
+    kBatteryTooHot = 3;
+    kBatteryTooCold = 4;
+    kBatteryAbsent = 5;
+    kBatteryOverVoltage = 6;
+    kBatteryUnderVoltage = 7;
+    kChargerOverVoltage = 8;
+    kChargerUnderVoltage = 9;
+    kSafetyTimeout = 10;
   }
 
-  bitmap DlCredentialRulesSupport : BITMAP8 {
-    kSingle = 0x1;
-    kDual = 0x2;
-    kTri = 0x4;
+  enum BatChargeLevel : ENUM8 {
+    kOk = 0;
+    kWarning = 1;
+    kCritical = 2;
   }
 
-  bitmap DlDaysMaskMap : BITMAP8 {
-    kSunday = 0x1;
-    kMonday = 0x2;
-    kTuesday = 0x4;
-    kWednesday = 0x8;
-    kThursday = 0x10;
-    kFriday = 0x20;
-    kSaturday = 0x40;
+  enum BatChargeState : ENUM8 {
+    kUnknown = 0;
+    kIsCharging = 1;
+    kIsAtFullCharge = 2;
+    kIsNotCharging = 3;
   }
 
-  bitmap DlDefaultConfigurationRegister : BITMAP16 {
-    kEnableLocalProgrammingEnabled = 0x1;
-    kKeypadInterfaceDefaultAccessEnabled = 0x2;
-    kRemoteInterfaceDefaultAccessIsEnabled = 0x4;
-    kSoundEnabled = 0x20;
-    kAutoRelockTimeSet = 0x40;
-    kLEDSettingsSet = 0x80;
+  enum BatFaultType : ENUM8 {
+    kUnspecfied = 0;
+    kOverTemp = 1;
+    kUnderTemp = 2;
   }
 
-  bitmap DlKeypadOperationEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kLock = 0x2;
-    kUnlock = 0x4;
-    kLockInvalidPIN = 0x8;
-    kLockInvalidSchedule = 0x10;
-    kUnlockInvalidCode = 0x20;
-    kUnlockInvalidSchedule = 0x40;
-    kNonAccessUserOpEvent = 0x80;
+  enum BatReplaceability : ENUM8 {
+    kUnspecified = 0;
+    kNotReplaceable = 1;
+    kUserReplaceable = 2;
+    kFactoryReplaceable = 3;
   }
 
-  bitmap DlKeypadProgrammingEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kProgrammingPINChanged = 0x2;
-    kPINAdded = 0x4;
-    kPINCleared = 0x8;
-    kPINChanged = 0x10;
+  enum PowerSourceStatus : ENUM8 {
+    kUnspecfied = 0;
+    kActive = 1;
+    kStandby = 2;
+    kUnavailable = 3;
   }
 
-  bitmap DlLocalProgrammingFeatures : BITMAP8 {
-    kAddUsersCredentialsSchedulesLocally = 0x1;
-    kModifyUsersCredentialsSchedulesLocally = 0x2;
-    kClearUsersCredentialsSchedulesLocally = 0x4;
-    kAdjustLockSettingsLocally = 0x8;
+  enum WiredCurrentType : ENUM8 {
+    kAc = 0;
+    kDc = 1;
   }
 
-  bitmap DlManualOperationEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kThumbturnLock = 0x2;
-    kThumbturnUnlock = 0x4;
-    kOneTouchLock = 0x8;
-    kKeyLock = 0x10;
-    kKeyUnlock = 0x20;
-    kAutoLock = 0x40;
-    kScheduleLock = 0x80;
-    kScheduleUnlock = 0x100;
-    kManualLock = 0x200;
-    kManualUnlock = 0x400;
+  enum WiredFaultType : ENUM8 {
+    kUnspecfied = 0;
+    kOverVoltage = 1;
+    kUnderVoltage = 2;
   }
 
-  bitmap DlRFIDOperationEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kLock = 0x2;
-    kUnlock = 0x4;
-    kLockInvalidRFID = 0x8;
-    kLockInvalidSchedule = 0x10;
-    kUnlockInvalidRFID = 0x20;
-    kUnlockInvalidSchedule = 0x40;
+  bitmap PowerSourceFeature : BITMAP32 {
+    kWired = 0x1;
+    kBattery = 0x2;
+    kRechargeable = 0x4;
+    kReplaceable = 0x8;
   }
 
-  bitmap DlRFIDProgrammingEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kRFIDCodeAdded = 0x20;
-    kRFIDCodeCleared = 0x40;
-  }
+  readonly attribute enum8 status = 0;
+  readonly attribute int8u order = 1;
+  readonly attribute char_string<60> description = 2;
+  readonly attribute int32u wiredAssessedCurrent = 6;
+  readonly attribute enum8 batteryChargeLevel = 14;
+  readonly attribute boolean batteryReplacementNeeded = 15;
+  readonly attribute enum8 batteryReplaceability = 16;
+  readonly attribute char_string<60> batteryReplacementDescription = 19;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  bitmap DlRemoteOperationEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kLock = 0x2;
-    kUnlock = 0x4;
-    kLockInvalidCode = 0x8;
-    kLockInvalidSchedule = 0x10;
-    kUnlockInvalidCode = 0x20;
-    kUnlockInvalidSchedule = 0x40;
+server cluster GeneralCommissioning = 48 {
+  enum CommissioningError : ENUM8 {
+    kOk = 0;
+    kValueOutsideRange = 1;
+    kInvalidAuthentication = 2;
+    kNoFailSafe = 3;
+    kBusyWithOtherAdmin = 4;
   }
 
-  bitmap DlRemoteProgrammingEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kProgrammingPINChanged = 0x2;
-    kPINAdded = 0x4;
-    kPINCleared = 0x8;
-    kPINChanged = 0x10;
-    kRFIDCodeAdded = 0x20;
-    kRFIDCodeCleared = 0x40;
+  enum RegulatoryLocationType : ENUM8 {
+    kIndoor = 0;
+    kOutdoor = 1;
+    kIndoorOutdoor = 2;
   }
 
-  bitmap DlSupportedOperatingModes : BITMAP16 {
-    kNormal = 0x1;
-    kVacation = 0x2;
-    kPrivacy = 0x4;
-    kNoRemoteLockUnlock = 0x8;
-    kPassage = 0x10;
+  struct BasicCommissioningInfo {
+    int16u failSafeExpiryLengthSeconds = 0;
+    int16u maxCumulativeFailsafeSeconds = 1;
   }
 
-  bitmap DoorLockDayOfWeek : BITMAP8 {
-    kSunday = 0x1;
-    kMonday = 0x2;
-    kTuesday = 0x4;
-    kWednesday = 0x8;
-    kThursday = 0x10;
-    kFriday = 0x20;
-    kSaturday = 0x40;
+  attribute access(write: administer) int64u breadcrumb = 0;
+  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
+  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
+  readonly attribute RegulatoryLocationType locationCapability = 3;
+  readonly attribute boolean supportsConcurrentConnection = 4;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ArmFailSafeRequest {
+    INT16U expiryLengthSeconds = 0;
+    INT64U breadcrumb = 1;
   }
 
-  bitmap DoorLockFeature : BITMAP32 {
-    kPINCredentials = 0x1;
-    kRFIDCredentials = 0x2;
-    kFingerCredentials = 0x4;
-    kLogging = 0x8;
-    kAccessSchedules = 0x10;
-    kDoorPositionSensor = 0x20;
-    kFaceCredentials = 0x40;
-    kCredentialsOTA = 0x80;
-    kUsersManagement = 0x100;
-    kNotifications = 0x200;
+  request struct SetRegulatoryConfigRequest {
+    RegulatoryLocationType newRegulatoryConfig = 0;
+    CHAR_STRING countryCode = 1;
+    INT64U breadcrumb = 2;
   }
 
-  struct DlCredential {
-    DlCredentialType credentialType = 0;
-    int16u credentialIndex = 1;
+  response struct ArmFailSafeResponse = 1 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  critical event DoorLockAlarm = 0 {
-    DlAlarmCode alarmCode = 0;
+  response struct SetRegulatoryConfigResponse = 3 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  critical event DoorStateChange = 1 {
-    DlDoorState doorState = 0;
+  response struct CommissioningCompleteResponse = 5 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  critical event LockOperation = 2 {
-    DlLockOperationType lockOperationType = 0;
-    DlOperationSource operationSource = 1;
-    nullable INT16U userIndex = 2;
-    nullable fabric_idx fabricIndex = 3;
-    nullable NODE_ID sourceNode = 4;
-    optional nullable DlCredential credentials[] = 5;
+  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
+  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
+  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
+}
+
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatus : ENUM8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
   }
 
-  critical event LockOperationError = 3 {
-    DlLockOperationType lockOperationType = 0;
-    DlOperationSource operationSource = 1;
-    DlOperationError operationError = 2;
-    nullable INT16U userIndex = 3;
-    nullable fabric_idx fabricIndex = 4;
-    nullable NODE_ID sourceNode = 5;
-    optional nullable DlCredential credentials[] = 6;
+  enum WiFiBand : ENUM8 {
+    k2g4 = 0;
+    k3g65 = 1;
+    k5g = 2;
+    k6g = 3;
+    k60g = 4;
   }
 
-  info event LockUserChange = 4 {
-    DlLockDataType lockDataType = 0;
-    DlDataOperationType dataOperationType = 1;
-    DlOperationSource operationSource = 2;
-    nullable INT16U userIndex = 3;
-    nullable fabric_idx fabricIndex = 4;
-    nullable NODE_ID sourceNode = 5;
-    nullable INT16U dataIndex = 6;
+  bitmap NetworkCommissioningFeature : BITMAP32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
   }
 
-  readonly attribute nullable DlLockState lockState = 0;
-  readonly attribute DlLockType lockType = 1;
-  readonly attribute boolean actuatorEnabled = 2;
-  readonly attribute nullable DlDoorState doorState = 3;
-  readonly attribute int16u numberOfTotalUsersSupported = 17;
-  readonly attribute int16u numberOfPINUsersSupported = 18;
-  readonly attribute int16u numberOfRFIDUsersSupported = 19;
-  readonly attribute int8u numberOfWeekDaySchedulesSupportedPerUser = 20;
-  readonly attribute int8u numberOfYearDaySchedulesSupportedPerUser = 21;
-  readonly attribute int8u numberOfHolidaySchedulesSupported = 22;
-  readonly attribute int8u maxPINCodeLength = 23;
-  readonly attribute int8u minPINCodeLength = 24;
-  readonly attribute int8u maxRFIDCodeLength = 25;
-  readonly attribute int8u minRFIDCodeLength = 26;
-  readonly attribute DlCredentialRuleMask credentialRulesSupport = 27;
-  readonly attribute int8u numberOfCredentialsSupportedPerUser = 28;
-  attribute access(write: manage) char_string<3> language = 33;
-  attribute access(write: manage) int32u autoRelockTime = 35;
-  attribute access(write: manage) int8u soundVolume = 36;
-  attribute access(write: manage) DlOperatingMode operatingMode = 37;
-  readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
-  attribute access(write: manage) boolean enableOneTouchLocking = 41;
-  attribute access(write: manage) boolean enablePrivacyModeButton = 43;
-  attribute access(write: administer) int8u wrongCodeEntryLimit = 48;
-  attribute access(write: administer) int8u userCodeTemporaryDisableTime = 49;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct LockDoorRequest {
-    optional OCTET_STRING pinCode = 0;
+  bitmap WiFiSecurity : BITMAP8 {
+    kUnencrypted = 0x1;
+    kWepPersonal = 0x2;
+    kWpaPersonal = 0x4;
+    kWpa2Personal = 0x8;
+    kWpa3Personal = 0x10;
   }
 
-  request struct UnlockDoorRequest {
-    optional OCTET_STRING pinCode = 0;
+  struct NetworkInfo {
+    octet_string<32> networkID = 0;
+    boolean connected = 1;
   }
 
-  request struct UnlockWithTimeoutRequest {
-    INT16U timeout = 0;
-    optional OCTET_STRING pinCode = 1;
+  struct WiFiInterfaceScanResult {
+    WiFiSecurity security = 0;
+    octet_string<32> ssid = 1;
+    octet_string<6> bssid = 2;
+    int16u channel = 3;
+    WiFiBand wiFiBand = 4;
+    int8s rssi = 5;
   }
 
-  request struct SetWeekDayScheduleRequest {
-    INT8U weekDayIndex = 0;
-    INT16U userIndex = 1;
-    DlDaysMaskMap daysMask = 2;
-    INT8U startHour = 3;
-    INT8U startMinute = 4;
-    INT8U endHour = 5;
-    INT8U endMinute = 6;
+  struct ThreadInterfaceScanResult {
+    int16u panId = 0;
+    int64u extendedPanId = 1;
+    char_string<16> networkName = 2;
+    int16u channel = 3;
+    int8u version = 4;
+    octet_string<8> extendedAddress = 5;
+    int8s rssi = 6;
+    int8u lqi = 7;
   }
 
-  request struct GetWeekDayScheduleRequest {
-    INT8U weekDayIndex = 0;
-    INT16U userIndex = 1;
-  }
+  readonly attribute access(read: administer) int8u maxNetworks = 0;
+  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
+  readonly attribute int8u scanMaxTimeSeconds = 2;
+  readonly attribute int8u connectMaxTimeSeconds = 3;
+  attribute access(write: administer) boolean interfaceEnabled = 4;
+  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
+  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
+  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  request struct ClearWeekDayScheduleRequest {
-    INT8U weekDayIndex = 0;
-    INT16U userIndex = 1;
+  request struct ScanNetworksRequest {
+    optional nullable OCTET_STRING ssid = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  request struct SetYearDayScheduleRequest {
-    INT8U yearDayIndex = 0;
-    INT16U userIndex = 1;
-    epoch_s localStartTime = 2;
-    epoch_s localEndTime = 3;
+  request struct AddOrUpdateWiFiNetworkRequest {
+    OCTET_STRING ssid = 0;
+    OCTET_STRING credentials = 1;
+    optional INT64U breadcrumb = 2;
   }
 
-  request struct GetYearDayScheduleRequest {
-    INT8U yearDayIndex = 0;
-    INT16U userIndex = 1;
+  request struct AddOrUpdateThreadNetworkRequest {
+    OCTET_STRING operationalDataset = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  request struct ClearYearDayScheduleRequest {
-    INT8U yearDayIndex = 0;
-    INT16U userIndex = 1;
+  request struct RemoveNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  request struct SetHolidayScheduleRequest {
-    INT8U holidayIndex = 0;
-    epoch_s localStartTime = 1;
-    epoch_s localEndTime = 2;
-    DlOperatingMode operatingMode = 3;
+  request struct ConnectNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  request struct GetHolidayScheduleRequest {
-    INT8U holidayIndex = 0;
+  request struct ReorderNetworkRequest {
+    OCTET_STRING networkID = 0;
+    INT8U networkIndex = 1;
+    optional INT64U breadcrumb = 2;
   }
 
-  request struct ClearHolidayScheduleRequest {
-    INT8U holidayIndex = 0;
+  response struct ScanNetworksResponse = 1 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
+    optional ThreadInterfaceScanResult threadScanResults[] = 3;
   }
 
-  request struct SetUserRequest {
-    DlDataOperationType operationType = 0;
-    INT16U userIndex = 1;
-    nullable CHAR_STRING userName = 2;
-    nullable INT32U userUniqueId = 3;
-    nullable DlUserStatus userStatus = 4;
-    nullable DlUserType userType = 5;
-    nullable DlCredentialRule credentialRule = 6;
+  response struct NetworkConfigResponse = 5 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional INT8U networkIndex = 2;
   }
 
-  request struct GetUserRequest {
-    INT16U userIndex = 0;
+  response struct ConnectNetworkResponse = 7 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    nullable INT32S errorValue = 2;
   }
 
-  request struct ClearUserRequest {
-    INT16U userIndex = 0;
+  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
+  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
+  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
+  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
+  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
+  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+}
+
+server cluster DiagnosticLogs = 50 {
+  enum LogsIntent : ENUM8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
   }
 
-  request struct SetCredentialRequest {
-    DlDataOperationType operationType = 0;
-    DlCredential credential = 1;
-    LONG_OCTET_STRING credentialData = 2;
-    nullable INT16U userIndex = 3;
-    nullable DlUserStatus userStatus = 4;
-    nullable DlUserType userType = 5;
+  enum LogsStatus : ENUM8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
   }
 
-  request struct GetCredentialStatusRequest {
-    DlCredential credential = 0;
+  enum LogsTransferProtocol : ENUM8 {
+    kResponsePayload = 0;
+    kBdx = 1;
   }
 
-  request struct ClearCredentialRequest {
-    nullable DlCredential credential = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct RetrieveLogsRequestRequest {
+    LogsIntent intent = 0;
+    LogsTransferProtocol requestedProtocol = 1;
+    OCTET_STRING transferFileDesignator = 2;
   }
 
-  response struct GetWeekDayScheduleResponse = 12 {
-    INT8U weekDayIndex = 0;
-    INT16U userIndex = 1;
-    DlStatus status = 2;
-    optional DlDaysMaskMap daysMask = 3;
-    optional INT8U startHour = 4;
-    optional INT8U startMinute = 5;
-    optional INT8U endHour = 6;
-    optional INT8U endMinute = 7;
+  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+}
+
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
   }
 
-  response struct GetYearDayScheduleResponse = 15 {
-    INT8U yearDayIndex = 0;
-    INT16U userIndex = 1;
-    DlStatus status = 2;
-    optional epoch_s localStartTime = 3;
-    optional epoch_s localEndTime = 4;
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
   }
 
-  response struct GetHolidayScheduleResponse = 18 {
-    INT8U holidayIndex = 0;
-    DlStatus status = 1;
-    optional epoch_s localStartTime = 2;
-    optional epoch_s localEndTime = 3;
-    optional DlOperatingMode operatingMode = 4;
-  }
-
-  response struct GetUserResponse = 28 {
-    INT16U userIndex = 0;
-    nullable CHAR_STRING userName = 1;
-    nullable INT32U userUniqueId = 2;
-    nullable DlUserStatus userStatus = 3;
-    nullable DlUserType userType = 4;
-    nullable DlCredentialRule credentialRule = 5;
-    nullable DlCredential credentials[] = 6;
-    nullable fabric_idx creatorFabricIndex = 7;
-    nullable fabric_idx lastModifiedFabricIndex = 8;
-    nullable INT16U nextUserIndex = 9;
-  }
-
-  response struct SetCredentialResponse = 35 {
-    DlStatus status = 0;
-    nullable INT16U userIndex = 1;
-    nullable INT16U nextCredentialIndex = 2;
-  }
-
-  response struct GetCredentialStatusResponse = 37 {
-    boolean credentialExists = 0;
-    nullable INT16U userIndex = 1;
-    nullable fabric_idx creatorFabricIndex = 2;
-    nullable fabric_idx lastModifiedFabricIndex = 3;
-    nullable INT16U nextCredentialIndex = 4;
-  }
-
-  timed command LockDoor(LockDoorRequest): DefaultSuccess = 0;
-  timed command UnlockDoor(UnlockDoorRequest): DefaultSuccess = 1;
-  timed command UnlockWithTimeout(UnlockWithTimeoutRequest): DefaultSuccess = 3;
-  command access(invoke: administer) SetWeekDaySchedule(SetWeekDayScheduleRequest): DefaultSuccess = 11;
-  command access(invoke: administer) GetWeekDaySchedule(GetWeekDayScheduleRequest): GetWeekDayScheduleResponse = 12;
-  command access(invoke: administer) ClearWeekDaySchedule(ClearWeekDayScheduleRequest): DefaultSuccess = 13;
-  command access(invoke: administer) SetYearDaySchedule(SetYearDayScheduleRequest): DefaultSuccess = 14;
-  command access(invoke: administer) GetYearDaySchedule(GetYearDayScheduleRequest): GetYearDayScheduleResponse = 15;
-  command access(invoke: administer) ClearYearDaySchedule(ClearYearDayScheduleRequest): DefaultSuccess = 16;
-  command access(invoke: administer) SetHolidaySchedule(SetHolidayScheduleRequest): DefaultSuccess = 17;
-  command access(invoke: administer) GetHolidaySchedule(GetHolidayScheduleRequest): GetHolidayScheduleResponse = 18;
-  command access(invoke: administer) ClearHolidaySchedule(ClearHolidayScheduleRequest): DefaultSuccess = 19;
-  timed command access(invoke: administer) SetUser(SetUserRequest): DefaultSuccess = 26;
-  command access(invoke: administer) GetUser(GetUserRequest): GetUserResponse = 27;
-  timed command access(invoke: administer) ClearUser(ClearUserRequest): DefaultSuccess = 29;
-  timed command access(invoke: administer) SetCredential(SetCredentialRequest): SetCredentialResponse = 34;
-  command access(invoke: administer) GetCredentialStatus(GetCredentialStatusRequest): GetCredentialStatusResponse = 36;
-  timed command access(invoke: administer) ClearCredential(ClearCredentialRequest): DefaultSuccess = 38;
-}
-
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
-  }
-
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command ResetCounts(): DefaultSuccess = 0;
-}
-
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster GeneralCommissioning = 48 {
-  enum CommissioningError : ENUM8 {
-    kOk = 0;
-    kValueOutsideRange = 1;
-    kInvalidAuthentication = 2;
-    kNoFailSafe = 3;
-    kBusyWithOtherAdmin = 4;
-  }
-
-  enum RegulatoryLocationType : ENUM8 {
-    kIndoor = 0;
-    kOutdoor = 1;
-    kIndoorOutdoor = 2;
-  }
-
-  struct BasicCommissioningInfo {
-    int16u failSafeExpiryLengthSeconds = 0;
-    int16u maxCumulativeFailsafeSeconds = 1;
-  }
-
-  attribute access(write: administer) int64u breadcrumb = 0;
-  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
-  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
-  readonly attribute RegulatoryLocationType locationCapability = 3;
-  readonly attribute boolean supportsConcurrentConnection = 4;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct ArmFailSafeRequest {
-    INT16U expiryLengthSeconds = 0;
-    INT64U breadcrumb = 1;
-  }
-
-  request struct SetRegulatoryConfigRequest {
-    RegulatoryLocationType newRegulatoryConfig = 0;
-    CHAR_STRING countryCode = 1;
-    INT64U breadcrumb = 2;
-  }
-
-  response struct ArmFailSafeResponse = 1 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
-  }
-
-  response struct SetRegulatoryConfigResponse = 3 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
-  }
-
-  response struct CommissioningCompleteResponse = 5 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
-  }
-
-  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
-  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
-  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
-}
-
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
-  }
-
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
-  }
-
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
   }
 
   enum NetworkFaultType : ENUM8 {
@@ -964,417 +846,312 @@ server cluster GeneralDiagnostics = 51 {
   command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
-server cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AddGroupRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
   }
 
-  request struct ViewGroupRequest {
-    group_id groupId = 0;
+  struct ThreadMetrics {
+    int64u id = 0;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
+  info event SoftwareFault = 0 {
+    SoftwareFaultStruct softwareFault = 0;
   }
 
-  request struct RemoveGroupRequest {
-    group_id groupId = 0;
-  }
+  readonly attribute ThreadMetrics threadMetrics[] = 0;
+  readonly attribute int64u currentHeapFree = 1;
+  readonly attribute int64u currentHeapUsed = 2;
+  readonly attribute int64u currentHeapHighWatermark = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
-  }
+  command ResetWatermarks(): DefaultSuccess = 0;
+}
 
-  response struct AddGroupResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+server cluster ThreadNetworkDiagnostics = 53 {
+  enum NetworkFault : ENUM8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
   }
 
-  response struct ViewGroupResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    CHAR_STRING groupName = 2;
+  enum RoutingRole : ENUM8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kReed = 4;
+    kRouter = 5;
+    kLeader = 6;
   }
 
-  response struct GetGroupMembershipResponse = 2 {
-    nullable INT8U capacity = 0;
-    group_id groupList[] = 1;
+  enum ThreadConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  response struct RemoveGroupResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+    kMLECounts = 0x4;
+    kMACCounts = 0x8;
   }
 
-  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
-}
-
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
+  struct NeighborTable {
+    int64u extAddress = 0;
+    int32u age = 1;
+    int16u rloc16 = 2;
+    int32u linkFrameCounter = 3;
+    int32u mleFrameCounter = 4;
+    int8u lqi = 5;
+    nullable int8s averageRssi = 6;
+    nullable int8s lastRssi = 7;
+    int8u frameErrorRate = 8;
+    int8u messageErrorRate = 9;
+    boolean rxOnWhenIdle = 10;
+    boolean fullThreadDevice = 11;
+    boolean fullNetworkData = 12;
+    boolean isChild = 13;
   }
 
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
+  struct RouteTable {
+    int64u extAddress = 0;
+    int16u rloc16 = 1;
+    int8u routerId = 2;
+    int8u nextHop = 3;
+    int8u pathCost = 4;
+    int8u LQIIn = 5;
+    int8u LQIOut = 6;
+    int8u age = 7;
+    boolean allocated = 8;
+    boolean linkEstablished = 9;
   }
 
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
+  struct SecurityPolicy {
+    int16u rotationTime = 0;
+    bitmap16 flags = 1;
   }
 
-  attribute int16u identifyTime = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
+  struct OperationalDatasetComponents {
+    boolean activeTimestampPresent = 0;
+    boolean pendingTimestampPresent = 1;
+    boolean masterKeyPresent = 2;
+    boolean networkNamePresent = 3;
+    boolean extendedPanIdPresent = 4;
+    boolean meshLocalPrefixPresent = 5;
+    boolean delayPresent = 6;
+    boolean panIdPresent = 7;
+    boolean channelPresent = 8;
+    boolean pskcPresent = 9;
+    boolean securityPolicyPresent = 10;
+    boolean channelMaskPresent = 11;
   }
 
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
-}
+  info event ConnectionStatus = 0 {
+    ThreadConnectionStatus connectionStatus = 0;
+  }
 
-server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
+  readonly attribute nullable int16u channel = 0;
+  readonly attribute nullable RoutingRole routingRole = 1;
+  readonly attribute nullable char_string<16> networkName = 2;
+  readonly attribute nullable int16u panId = 3;
+  readonly attribute nullable int64u extendedPanId = 4;
+  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute NeighborTable neighborTableList[] = 7;
+  readonly attribute RouteTable routeTableList[] = 8;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
+  readonly attribute int16u detachedRoleCount = 14;
+  readonly attribute int16u childRoleCount = 15;
+  readonly attribute int16u routerRoleCount = 16;
+  readonly attribute int16u leaderRoleCount = 17;
+  readonly attribute int16u attachAttemptCount = 18;
+  readonly attribute int16u partitionIdChangeCount = 19;
+  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
+  readonly attribute int16u parentChangeCount = 21;
+  readonly attribute int32u txTotalCount = 22;
+  readonly attribute int32u txUnicastCount = 23;
+  readonly attribute int32u txBroadcastCount = 24;
+  readonly attribute int32u txAckRequestedCount = 25;
+  readonly attribute int32u txAckedCount = 26;
+  readonly attribute int32u txNoAckRequestedCount = 27;
+  readonly attribute int32u txDataCount = 28;
+  readonly attribute int32u txDataPollCount = 29;
+  readonly attribute int32u txBeaconCount = 30;
+  readonly attribute int32u txBeaconRequestCount = 31;
+  readonly attribute int32u txOtherCount = 32;
+  readonly attribute int32u txRetryCount = 33;
+  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
+  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
+  readonly attribute int32u txErrCcaCount = 36;
+  readonly attribute int32u txErrAbortCount = 37;
+  readonly attribute int32u txErrBusyChannelCount = 38;
+  readonly attribute int32u rxTotalCount = 39;
+  readonly attribute int32u rxUnicastCount = 40;
+  readonly attribute int32u rxBroadcastCount = 41;
+  readonly attribute int32u rxDataCount = 42;
+  readonly attribute int32u rxDataPollCount = 43;
+  readonly attribute int32u rxBeaconCount = 44;
+  readonly attribute int32u rxBeaconRequestCount = 45;
+  readonly attribute int32u rxOtherCount = 46;
+  readonly attribute int32u rxAddressFilteredCount = 47;
+  readonly attribute int32u rxDestAddrFilteredCount = 48;
+  readonly attribute int32u rxDuplicatedCount = 49;
+  readonly attribute int32u rxErrNoFrameCount = 50;
+  readonly attribute int32u rxErrUnknownNeighborCount = 51;
+  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
+  readonly attribute int32u rxErrSecCount = 53;
+  readonly attribute int32u rxErrFcsCount = 54;
+  readonly attribute int32u rxErrOtherCount = 55;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
+  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
-server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatus : ENUM8 {
-    kSuccess = 0;
-    kOutOfRange = 1;
-    kBoundsExceeded = 2;
-    kNetworkIDNotFound = 3;
-    kDuplicateNetworkID = 4;
-    kNetworkNotFound = 5;
-    kRegulatoryError = 6;
-    kAuthFailure = 7;
-    kUnsupportedSecurity = 8;
-    kOtherConnectionFailure = 9;
-    kIPV6Failed = 10;
-    kIPBindFailed = 11;
-    kUnknownError = 12;
+server cluster WiFiNetworkDiagnostics = 54 {
+  enum AssociationFailureCause : ENUM8 {
+    kUnknown = 0;
+    kAssociationFailed = 1;
+    kAuthenticationFailed = 2;
+    kSsidNotFound = 3;
   }
 
-  enum WiFiBand : ENUM8 {
-    k2g4 = 0;
-    k3g65 = 1;
-    k5g = 2;
-    k6g = 3;
-    k60g = 4;
+  enum SecurityType : ENUM8 {
+    kUnspecified = 0;
+    kNone = 1;
+    kWep = 2;
+    kWpa = 3;
+    kWpa2 = 4;
+    kWpa3 = 5;
   }
 
-  bitmap NetworkCommissioningFeature : BITMAP32 {
-    kWiFiNetworkInterface = 0x1;
-    kThreadNetworkInterface = 0x2;
-    kEthernetNetworkInterface = 0x4;
+  enum WiFiConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  bitmap WiFiSecurity : BITMAP8 {
-    kUnencrypted = 0x1;
-    kWepPersonal = 0x2;
-    kWpaPersonal = 0x4;
-    kWpa2Personal = 0x8;
-    kWpa3Personal = 0x10;
+  enum WiFiVersionType : ENUM8 {
+    k80211a = 0;
+    k80211b = 1;
+    k80211g = 2;
+    k80211n = 3;
+    k80211ac = 4;
+    k80211ax = 5;
   }
 
-  struct NetworkInfo {
-    octet_string<32> networkID = 0;
-    boolean connected = 1;
+  info event Disconnection = 0 {
+    INT16U reasonCode = 0;
   }
 
-  struct WiFiInterfaceScanResult {
-    WiFiSecurity security = 0;
-    octet_string<32> ssid = 1;
-    octet_string<6> bssid = 2;
-    int16u channel = 3;
-    WiFiBand wiFiBand = 4;
-    int8s rssi = 5;
+  info event AssociationFailure = 1 {
+    AssociationFailureCause associationFailure = 0;
+    INT16U status = 1;
   }
 
-  struct ThreadInterfaceScanResult {
-    int16u panId = 0;
-    int64u extendedPanId = 1;
-    char_string<16> networkName = 2;
-    int16u channel = 3;
-    int8u version = 4;
-    octet_string<8> extendedAddress = 5;
-    int8s rssi = 6;
-    int8u lqi = 7;
+  info event ConnectionStatus = 2 {
+    WiFiConnectionStatus connectionStatus = 0;
   }
 
-  readonly attribute access(read: administer) int8u maxNetworks = 0;
-  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
-  readonly attribute int8u scanMaxTimeSeconds = 2;
-  readonly attribute int8u connectMaxTimeSeconds = 3;
-  attribute access(write: administer) boolean interfaceEnabled = 4;
-  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
-  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
-  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute nullable octet_string<6> bssid = 0;
+  readonly attribute nullable SecurityType securityType = 1;
+  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
+  readonly attribute nullable int16u channelNumber = 3;
+  readonly attribute nullable int8s rssi = 4;
+  readonly attribute int32u beaconLostCount = 5;
+  readonly attribute int32u beaconRxCount = 6;
+  readonly attribute int32u packetMulticastRxCount = 7;
+  readonly attribute int32u packetMulticastTxCount = 8;
+  readonly attribute int32u packetUnicastRxCount = 9;
+  readonly attribute int32u packetUnicastTxCount = 10;
+  readonly attribute int64u currentMaxRate = 11;
+  readonly attribute int64u overrunCount = 12;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct ScanNetworksRequest {
-    optional nullable OCTET_STRING ssid = 0;
-    optional INT64U breadcrumb = 1;
-  }
+  command ResetCounts(): DefaultSuccess = 0;
+}
 
-  request struct AddOrUpdateWiFiNetworkRequest {
-    OCTET_STRING ssid = 0;
-    OCTET_STRING credentials = 1;
-    optional INT64U breadcrumb = 2;
-  }
-
-  request struct AddOrUpdateThreadNetworkRequest {
-    OCTET_STRING operationalDataset = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct RemoveNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct ConnectNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct ReorderNetworkRequest {
-    OCTET_STRING networkID = 0;
-    INT8U networkIndex = 1;
-    optional INT64U breadcrumb = 2;
-  }
-
-  response struct ScanNetworksResponse = 1 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
-    optional ThreadInterfaceScanResult threadScanResults[] = 3;
-  }
-
-  response struct NetworkConfigResponse = 5 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional INT8U networkIndex = 2;
-  }
-
-  response struct ConnectNetworkResponse = 7 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    nullable INT32S errorValue = 2;
-  }
-
-  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
-  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
-  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
-  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
-  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
-  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
-}
-
-client cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
-  }
-
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
-  }
-
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
   }
 
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
+  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
-  }
-
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
-  }
-
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
-  }
-
-  response struct QueryImageResponse = 1 {
-    OTAQueryStatus status = 0;
-    optional INT32U delayedActionTime = 1;
-    optional CHAR_STRING imageURI = 2;
-    optional INT32U softwareVersion = 3;
-    optional CHAR_STRING softwareVersionString = 4;
-    optional OCTET_STRING updateToken = 5;
-    optional BOOLEAN userConsentNeeded = 6;
-    optional OCTET_STRING metadataForRequestor = 7;
-  }
-
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
-  }
-
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
-server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum OTAAnnouncementReason : ENUM8 {
-    kSimpleAnnouncement = 0;
-    kUpdateAvailable = 1;
-    kUrgentUpdateAvailable = 2;
-  }
-
-  enum OTAChangeReasonEnum : ENUM8 {
-    kUnknown = 0;
-    kSuccess = 1;
-    kFailure = 2;
-    kTimeOut = 3;
-    kDelayByProvider = 4;
-  }
-
-  enum OTAUpdateStateEnum : ENUM8 {
-    kUnknown = 0;
-    kIdle = 1;
-    kQuerying = 2;
-    kDelayedOnQuery = 3;
-    kDownloading = 4;
-    kApplying = 5;
-    kDelayedOnApply = 6;
-    kRollingBack = 7;
-    kDelayedOnUserConsent = 8;
-  }
-
-  struct ProviderLocation {
-    node_id providerNodeID = 1;
-    endpoint_no endpoint = 2;
-    fabric_idx fabricIndex = 254;
-  }
-
-  info event StateTransition = 0 {
-    OTAUpdateStateEnum previousState = 0;
-    OTAUpdateStateEnum newState = 1;
-    OTAChangeReasonEnum reason = 2;
-    nullable INT32U targetSoftwareVersion = 3;
-  }
-
-  critical event VersionApplied = 1 {
-    INT32U softwareVersion = 0;
-    INT16U productID = 1;
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
   }
 
-  info event DownloadError = 2 {
-    INT32U softwareVersion = 0;
-    INT64U bytesDownloaded = 1;
-    nullable INT8U progressPercent = 2;
-    nullable INT64S platformCode = 3;
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
   }
 
-  attribute ProviderLocation defaultOtaProviders[] = 0;
-  readonly attribute boolean updatePossible = 1;
-  readonly attribute OTAUpdateStateEnum updateState = 2;
-  readonly attribute nullable int8u updateStateProgress = 3;
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AnnounceOtaProviderRequest {
-    node_id providerNodeId = 0;
-    vendor_id vendorId = 1;
-    OTAAnnouncementReason announcementReason = 2;
-    optional OCTET_STRING metadataForNode = 3;
-    endpoint_no endpoint = 4;
-  }
-
-  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
-}
-
-server cluster OnOff = 6 {
-  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
-    kFadeToOffIn0p8Seconds = 0;
-    kNoFade = 1;
-    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
-  }
-
-  enum OnOffDyingLightEffectVariant : ENUM8 {
-    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
-  }
-
-  enum OnOffEffectIdentifier : ENUM8 {
-    kDelayedAllOff = 0;
-    kDyingLight = 1;
-  }
-
-  enum OnOffStartUpOnOff : ENUM8 {
-    kOff = 0;
-    kOn = 1;
-    kTogglePreviousOnOff = 2;
-  }
-
-  bitmap OnOffControl : BITMAP8 {
-    kAcceptOnlyWhenOn = 0x1;
-  }
-
-  bitmap OnOffFeature : BITMAP32 {
-    kLighting = 0x1;
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
   }
 
-  bitmap SceneFeatures : BITMAP32 {
-    kSceneNames = 0x1;
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
   }
 
-  readonly attribute boolean onOff = 0;
-  readonly attribute boolean globalSceneControl = 16384;
-  attribute int16u onTime = 16385;
-  attribute int16u offWaitTime = 16386;
-  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command Off(): DefaultSuccess = 0;
-  command On(): DefaultSuccess = 1;
-  command Toggle(): DefaultSuccess = 2;
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
 server cluster OperationalCredentials = 62 {
@@ -1484,365 +1261,588 @@ server cluster OperationalCredentials = 62 {
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
 }
 
-server cluster PowerSource = 47 {
-  enum BatChargeFaultType : ENUM8 {
-    kUnspecfied = 0;
-    kAmbientTooHot = 1;
-    kAmbientTooCold = 2;
-    kBatteryTooHot = 3;
-    kBatteryTooCold = 4;
-    kBatteryAbsent = 5;
-    kBatteryOverVoltage = 6;
-    kBatteryUnderVoltage = 7;
-    kChargerOverVoltage = 8;
-    kChargerUnderVoltage = 9;
-    kSafetyTimeout = 10;
-  }
-
-  enum BatChargeLevel : ENUM8 {
-    kOk = 0;
-    kWarning = 1;
-    kCritical = 2;
-  }
-
-  enum BatChargeState : ENUM8 {
-    kUnknown = 0;
-    kIsCharging = 1;
-    kIsAtFullCharge = 2;
-    kIsNotCharging = 3;
-  }
-
-  enum BatFaultType : ENUM8 {
-    kUnspecfied = 0;
-    kOverTemp = 1;
-    kUnderTemp = 2;
-  }
-
-  enum BatReplaceability : ENUM8 {
-    kUnspecified = 0;
-    kNotReplaceable = 1;
-    kUserReplaceable = 2;
-    kFactoryReplaceable = 3;
-  }
-
-  enum PowerSourceStatus : ENUM8 {
-    kUnspecfied = 0;
-    kActive = 1;
-    kStandby = 2;
-    kUnavailable = 3;
-  }
-
-  enum WiredCurrentType : ENUM8 {
-    kAc = 0;
-    kDc = 1;
-  }
-
-  enum WiredFaultType : ENUM8 {
-    kUnspecfied = 0;
-    kOverVoltage = 1;
-    kUnderVoltage = 2;
-  }
-
-  bitmap PowerSourceFeature : BITMAP32 {
-    kWired = 0x1;
-    kBattery = 0x2;
-    kRechargeable = 0x4;
-    kReplaceable = 0x8;
-  }
-
-  readonly attribute enum8 status = 0;
-  readonly attribute int8u order = 1;
-  readonly attribute char_string<60> description = 2;
-  readonly attribute int32u wiredAssessedCurrent = 6;
-  readonly attribute enum8 batteryChargeLevel = 14;
-  readonly attribute boolean batteryReplacementNeeded = 15;
-  readonly attribute enum8 batteryReplaceability = 16;
-  readonly attribute char_string<60> batteryReplacementDescription = 19;
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster PowerSourceConfiguration = 46 {
-  readonly attribute INT8U sources[] = 0;
+server cluster UserLabel = 65 {
+  attribute access(write: manage) LabelStruct labelList[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster SoftwareDiagnostics = 52 {
-  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
-    kWaterMarks = 0x1;
+server cluster DoorLock = 257 {
+  enum DlAlarmCode : ENUM8 {
+    kLockJammed = 0;
+    kLockFactoryReset = 1;
+    kLockRadioPowerCycled = 3;
+    kWrongCodeEntryLimit = 4;
+    kFrontEsceutcheonRemoved = 5;
+    kDoorForcedOpen = 6;
+    kDoorAjar = 7;
+    kForcedUser = 8;
   }
 
-  struct ThreadMetrics {
-    int64u id = 0;
-    optional char_string<8> name = 1;
-    optional int32u stackFreeCurrent = 2;
-    optional int32u stackFreeMinimum = 3;
-    optional int32u stackSize = 4;
+  enum DlCredentialRule : ENUM8 {
+    kSingle = 0;
+    kDouble = 1;
+    kTri = 2;
   }
 
-  info event SoftwareFault = 0 {
-    SoftwareFaultStruct softwareFault = 0;
+  enum DlCredentialType : ENUM8 {
+    kProgrammingPIN = 0;
+    kPin = 1;
+    kRfid = 2;
+    kFingerprint = 3;
+    kFingerVein = 4;
+    kFace = 5;
   }
 
-  readonly attribute ThreadMetrics threadMetrics[] = 0;
-  readonly attribute int64u currentHeapFree = 1;
-  readonly attribute int64u currentHeapUsed = 2;
-  readonly attribute int64u currentHeapHighWatermark = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  enum DlDataOperationType : ENUM8 {
+    kAdd = 0;
+    kClear = 1;
+    kModify = 2;
+  }
 
-  command ResetWatermarks(): DefaultSuccess = 0;
-}
+  enum DlDoorState : ENUM8 {
+    kDoorOpen = 0;
+    kDoorClosed = 1;
+    kDoorJammed = 2;
+    kDoorForcedOpen = 3;
+    kDoorUnspecifiedError = 4;
+    kDoorAjar = 5;
+  }
 
-server cluster ThreadNetworkDiagnostics = 53 {
-  enum NetworkFault : ENUM8 {
+  enum DlLockDataType : ENUM8 {
     kUnspecified = 0;
-    kLinkDown = 1;
-    kHardwareFailure = 2;
-    kNetworkJammed = 3;
+    kProgrammingCode = 1;
+    kUserIndex = 2;
+    kWeekDaySchedule = 3;
+    kYearDaySchedule = 4;
+    kHolidaySchedule = 5;
+    kPin = 6;
+    kRfid = 7;
+    kFingerprint = 8;
   }
 
-  enum RoutingRole : ENUM8 {
-    kUnspecified = 0;
-    kUnassigned = 1;
-    kSleepyEndDevice = 2;
-    kEndDevice = 3;
-    kReed = 4;
-    kRouter = 5;
-    kLeader = 6;
+  enum DlLockOperationType : ENUM8 {
+    kLock = 0;
+    kUnlock = 1;
+    kNonAccessUserEvent = 2;
+    kForcedUserEvent = 3;
   }
 
-  enum ThreadConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  enum DlLockState : ENUM8 {
+    kNotFullyLocked = 0;
+    kLocked = 1;
+    kUnlocked = 2;
   }
 
-  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
-    kPacketCounts = 0x1;
-    kErrorCounts = 0x2;
-    kMLECounts = 0x4;
-    kMACCounts = 0x8;
+  enum DlLockType : ENUM8 {
+    kDeadBolt = 0;
+    kMagnetic = 1;
+    kOther = 2;
+    kMortise = 3;
+    kRim = 4;
+    kLatchBolt = 5;
+    kCylindricalLock = 6;
+    kTubularLock = 7;
+    kInterconnectedLock = 8;
+    kDeadLatch = 9;
+    kDoorFurniture = 10;
   }
 
-  struct NeighborTable {
-    int64u extAddress = 0;
-    int32u age = 1;
-    int16u rloc16 = 2;
-    int32u linkFrameCounter = 3;
-    int32u mleFrameCounter = 4;
-    int8u lqi = 5;
-    nullable int8s averageRssi = 6;
-    nullable int8s lastRssi = 7;
-    int8u frameErrorRate = 8;
-    int8u messageErrorRate = 9;
-    boolean rxOnWhenIdle = 10;
-    boolean fullThreadDevice = 11;
-    boolean fullNetworkData = 12;
-    boolean isChild = 13;
+  enum DlOperatingMode : ENUM8 {
+    kNormal = 0;
+    kVacation = 1;
+    kPrivacy = 2;
+    kNoRemoteLockUnlock = 3;
+    kPassage = 4;
   }
 
-  struct RouteTable {
-    int64u extAddress = 0;
-    int16u rloc16 = 1;
-    int8u routerId = 2;
-    int8u nextHop = 3;
-    int8u pathCost = 4;
-    int8u LQIIn = 5;
-    int8u LQIOut = 6;
-    int8u age = 7;
-    boolean allocated = 8;
-    boolean linkEstablished = 9;
+  enum DlOperationError : ENUM8 {
+    kUnspecified = 0;
+    kInvalidCredential = 1;
+    kDisabledUserDenied = 2;
+    kRestricted = 3;
+    kInsufficientBattery = 4;
   }
 
-  struct SecurityPolicy {
-    int16u rotationTime = 0;
-    bitmap16 flags = 1;
+  enum DlOperationSource : ENUM8 {
+    kUnspecified = 0;
+    kManual = 1;
+    kProprietaryRemote = 2;
+    kKeypad = 3;
+    kAuto = 4;
+    kButton = 5;
+    kSchedule = 6;
+    kRemote = 7;
+    kRfid = 8;
+    kBiometric = 9;
   }
 
-  struct OperationalDatasetComponents {
-    boolean activeTimestampPresent = 0;
-    boolean pendingTimestampPresent = 1;
-    boolean masterKeyPresent = 2;
-    boolean networkNamePresent = 3;
-    boolean extendedPanIdPresent = 4;
-    boolean meshLocalPrefixPresent = 5;
-    boolean delayPresent = 6;
-    boolean panIdPresent = 7;
-    boolean channelPresent = 8;
-    boolean pskcPresent = 9;
-    boolean securityPolicyPresent = 10;
-    boolean channelMaskPresent = 11;
+  enum DlStatus : ENUM8 {
+    kSuccess = 0;
+    kFailure = 1;
+    kDuplicate = 2;
+    kOccupied = 3;
+    kInvalidField = 133;
+    kResourceExhausted = 137;
+    kNotFound = 139;
   }
 
-  info event ConnectionStatus = 0 {
-    ThreadConnectionStatus connectionStatus = 0;
+  enum DlUserStatus : ENUM8 {
+    kAvailable = 0;
+    kOccupiedEnabled = 1;
+    kOccupiedDisabled = 3;
   }
 
-  readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable RoutingRole routingRole = 1;
-  readonly attribute nullable char_string<16> networkName = 2;
-  readonly attribute nullable int16u panId = 3;
-  readonly attribute nullable int64u extendedPanId = 4;
-  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute NeighborTable neighborTableList[] = 7;
-  readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
-  readonly attribute nullable int8u leaderRouterId = 13;
-  readonly attribute int16u detachedRoleCount = 14;
-  readonly attribute int16u childRoleCount = 15;
-  readonly attribute int16u routerRoleCount = 16;
-  readonly attribute int16u leaderRoleCount = 17;
-  readonly attribute int16u attachAttemptCount = 18;
-  readonly attribute int16u partitionIdChangeCount = 19;
-  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
-  readonly attribute int16u parentChangeCount = 21;
-  readonly attribute int32u txTotalCount = 22;
-  readonly attribute int32u txUnicastCount = 23;
-  readonly attribute int32u txBroadcastCount = 24;
-  readonly attribute int32u txAckRequestedCount = 25;
-  readonly attribute int32u txAckedCount = 26;
-  readonly attribute int32u txNoAckRequestedCount = 27;
-  readonly attribute int32u txDataCount = 28;
-  readonly attribute int32u txDataPollCount = 29;
-  readonly attribute int32u txBeaconCount = 30;
-  readonly attribute int32u txBeaconRequestCount = 31;
-  readonly attribute int32u txOtherCount = 32;
-  readonly attribute int32u txRetryCount = 33;
-  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
-  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
-  readonly attribute int32u txErrCcaCount = 36;
-  readonly attribute int32u txErrAbortCount = 37;
-  readonly attribute int32u txErrBusyChannelCount = 38;
-  readonly attribute int32u rxTotalCount = 39;
-  readonly attribute int32u rxUnicastCount = 40;
-  readonly attribute int32u rxBroadcastCount = 41;
-  readonly attribute int32u rxDataCount = 42;
-  readonly attribute int32u rxDataPollCount = 43;
-  readonly attribute int32u rxBeaconCount = 44;
-  readonly attribute int32u rxBeaconRequestCount = 45;
-  readonly attribute int32u rxOtherCount = 46;
-  readonly attribute int32u rxAddressFilteredCount = 47;
-  readonly attribute int32u rxDestAddrFilteredCount = 48;
-  readonly attribute int32u rxDuplicatedCount = 49;
-  readonly attribute int32u rxErrNoFrameCount = 50;
-  readonly attribute int32u rxErrUnknownNeighborCount = 51;
-  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
-  readonly attribute int32u rxErrSecCount = 53;
-  readonly attribute int32u rxErrFcsCount = 54;
-  readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute nullable int64u activeTimestamp = 56;
-  readonly attribute nullable int64u pendingTimestamp = 57;
-  readonly attribute nullable int32u delay = 58;
-  readonly attribute nullable SecurityPolicy securityPolicy = 59;
-  readonly attribute nullable octet_string<4> channelMask = 60;
-  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
-  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+  enum DlUserType : ENUM8 {
+    kUnrestrictedUser = 0;
+    kYearDayScheduleUser = 1;
+    kWeekDayScheduleUser = 2;
+    kProgrammingUser = 3;
+    kNonAccessUser = 4;
+    kForcedUser = 5;
+    kDisposableUser = 6;
+    kExpiringUser = 7;
+    kScheduleRestrictedUser = 8;
+    kRemoteOnlyUser = 9;
+  }
+
+  enum DoorLockOperationEventCode : ENUM8 {
+    kUnknownOrMfgSpecific = 0;
+    kLock = 1;
+    kUnlock = 2;
+    kLockInvalidPinOrId = 3;
+    kLockInvalidSchedule = 4;
+    kUnlockInvalidPinOrId = 5;
+    kUnlockInvalidSchedule = 6;
+    kOneTouchLock = 7;
+    kKeyLock = 8;
+    kKeyUnlock = 9;
+    kAutoLock = 10;
+    kScheduleLock = 11;
+    kScheduleUnlock = 12;
+    kManualLock = 13;
+    kManualUnlock = 14;
+  }
+
+  enum DoorLockProgrammingEventCode : ENUM8 {
+    kUnknownOrMfgSpecific = 0;
+    kMasterCodeChanged = 1;
+    kPinAdded = 2;
+    kPinDeleted = 3;
+    kPinChanged = 4;
+    kIdAdded = 5;
+    kIdDeleted = 6;
+  }
+
+  enum DoorLockSetPinOrIdStatus : ENUM8 {
+    kSuccess = 0;
+    kGeneralFailure = 1;
+    kMemoryFull = 2;
+    kDuplicateCodeError = 3;
+  }
+
+  enum DoorLockUserStatus : ENUM8 {
+    kAvailable = 0;
+    kOccupiedEnabled = 1;
+    kOccupiedDisabled = 3;
+    kNotSupported = 255;
+  }
+
+  enum DoorLockUserType : ENUM8 {
+    kUnrestricted = 0;
+    kYearDayScheduleUser = 1;
+    kWeekDayScheduleUser = 2;
+    kMasterUser = 3;
+    kNonAccessUser = 4;
+    kNotSupported = 255;
+  }
+
+  bitmap DlCredentialRuleMask : BITMAP8 {
+    kSingle = 0x1;
+    kDual = 0x2;
+    kTri = 0x4;
+  }
+
+  bitmap DlCredentialRulesSupport : BITMAP8 {
+    kSingle = 0x1;
+    kDual = 0x2;
+    kTri = 0x4;
+  }
+
+  bitmap DlDaysMaskMap : BITMAP8 {
+    kSunday = 0x1;
+    kMonday = 0x2;
+    kTuesday = 0x4;
+    kWednesday = 0x8;
+    kThursday = 0x10;
+    kFriday = 0x20;
+    kSaturday = 0x40;
+  }
+
+  bitmap DlDefaultConfigurationRegister : BITMAP16 {
+    kEnableLocalProgrammingEnabled = 0x1;
+    kKeypadInterfaceDefaultAccessEnabled = 0x2;
+    kRemoteInterfaceDefaultAccessIsEnabled = 0x4;
+    kSoundEnabled = 0x20;
+    kAutoRelockTimeSet = 0x40;
+    kLEDSettingsSet = 0x80;
+  }
+
+  bitmap DlKeypadOperationEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kLock = 0x2;
+    kUnlock = 0x4;
+    kLockInvalidPIN = 0x8;
+    kLockInvalidSchedule = 0x10;
+    kUnlockInvalidCode = 0x20;
+    kUnlockInvalidSchedule = 0x40;
+    kNonAccessUserOpEvent = 0x80;
+  }
+
+  bitmap DlKeypadProgrammingEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kProgrammingPINChanged = 0x2;
+    kPINAdded = 0x4;
+    kPINCleared = 0x8;
+    kPINChanged = 0x10;
+  }
+
+  bitmap DlLocalProgrammingFeatures : BITMAP8 {
+    kAddUsersCredentialsSchedulesLocally = 0x1;
+    kModifyUsersCredentialsSchedulesLocally = 0x2;
+    kClearUsersCredentialsSchedulesLocally = 0x4;
+    kAdjustLockSettingsLocally = 0x8;
+  }
+
+  bitmap DlManualOperationEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kThumbturnLock = 0x2;
+    kThumbturnUnlock = 0x4;
+    kOneTouchLock = 0x8;
+    kKeyLock = 0x10;
+    kKeyUnlock = 0x20;
+    kAutoLock = 0x40;
+    kScheduleLock = 0x80;
+    kScheduleUnlock = 0x100;
+    kManualLock = 0x200;
+    kManualUnlock = 0x400;
+  }
+
+  bitmap DlRFIDOperationEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kLock = 0x2;
+    kUnlock = 0x4;
+    kLockInvalidRFID = 0x8;
+    kLockInvalidSchedule = 0x10;
+    kUnlockInvalidRFID = 0x20;
+    kUnlockInvalidSchedule = 0x40;
+  }
+
+  bitmap DlRFIDProgrammingEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kRFIDCodeAdded = 0x20;
+    kRFIDCodeCleared = 0x40;
+  }
+
+  bitmap DlRemoteOperationEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kLock = 0x2;
+    kUnlock = 0x4;
+    kLockInvalidCode = 0x8;
+    kLockInvalidSchedule = 0x10;
+    kUnlockInvalidCode = 0x20;
+    kUnlockInvalidSchedule = 0x40;
+  }
+
+  bitmap DlRemoteProgrammingEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kProgrammingPINChanged = 0x2;
+    kPINAdded = 0x4;
+    kPINCleared = 0x8;
+    kPINChanged = 0x10;
+    kRFIDCodeAdded = 0x20;
+    kRFIDCodeCleared = 0x40;
+  }
+
+  bitmap DlSupportedOperatingModes : BITMAP16 {
+    kNormal = 0x1;
+    kVacation = 0x2;
+    kPrivacy = 0x4;
+    kNoRemoteLockUnlock = 0x8;
+    kPassage = 0x10;
+  }
+
+  bitmap DoorLockDayOfWeek : BITMAP8 {
+    kSunday = 0x1;
+    kMonday = 0x2;
+    kTuesday = 0x4;
+    kWednesday = 0x8;
+    kThursday = 0x10;
+    kFriday = 0x20;
+    kSaturday = 0x40;
+  }
+
+  bitmap DoorLockFeature : BITMAP32 {
+    kPINCredentials = 0x1;
+    kRFIDCredentials = 0x2;
+    kFingerCredentials = 0x4;
+    kLogging = 0x8;
+    kAccessSchedules = 0x10;
+    kDoorPositionSensor = 0x20;
+    kFaceCredentials = 0x40;
+    kCredentialsOTA = 0x80;
+    kUsersManagement = 0x100;
+    kNotifications = 0x200;
+  }
+
+  struct DlCredential {
+    DlCredentialType credentialType = 0;
+    int16u credentialIndex = 1;
+  }
+
+  critical event DoorLockAlarm = 0 {
+    DlAlarmCode alarmCode = 0;
+  }
+
+  critical event DoorStateChange = 1 {
+    DlDoorState doorState = 0;
+  }
+
+  critical event LockOperation = 2 {
+    DlLockOperationType lockOperationType = 0;
+    DlOperationSource operationSource = 1;
+    nullable INT16U userIndex = 2;
+    nullable fabric_idx fabricIndex = 3;
+    nullable NODE_ID sourceNode = 4;
+    optional nullable DlCredential credentials[] = 5;
+  }
+
+  critical event LockOperationError = 3 {
+    DlLockOperationType lockOperationType = 0;
+    DlOperationSource operationSource = 1;
+    DlOperationError operationError = 2;
+    nullable INT16U userIndex = 3;
+    nullable fabric_idx fabricIndex = 4;
+    nullable NODE_ID sourceNode = 5;
+    optional nullable DlCredential credentials[] = 6;
+  }
+
+  info event LockUserChange = 4 {
+    DlLockDataType lockDataType = 0;
+    DlDataOperationType dataOperationType = 1;
+    DlOperationSource operationSource = 2;
+    nullable INT16U userIndex = 3;
+    nullable fabric_idx fabricIndex = 4;
+    nullable NODE_ID sourceNode = 5;
+    nullable INT16U dataIndex = 6;
+  }
+
+  readonly attribute nullable DlLockState lockState = 0;
+  readonly attribute DlLockType lockType = 1;
+  readonly attribute boolean actuatorEnabled = 2;
+  readonly attribute nullable DlDoorState doorState = 3;
+  readonly attribute int16u numberOfTotalUsersSupported = 17;
+  readonly attribute int16u numberOfPINUsersSupported = 18;
+  readonly attribute int16u numberOfRFIDUsersSupported = 19;
+  readonly attribute int8u numberOfWeekDaySchedulesSupportedPerUser = 20;
+  readonly attribute int8u numberOfYearDaySchedulesSupportedPerUser = 21;
+  readonly attribute int8u numberOfHolidaySchedulesSupported = 22;
+  readonly attribute int8u maxPINCodeLength = 23;
+  readonly attribute int8u minPINCodeLength = 24;
+  readonly attribute int8u maxRFIDCodeLength = 25;
+  readonly attribute int8u minRFIDCodeLength = 26;
+  readonly attribute DlCredentialRuleMask credentialRulesSupport = 27;
+  readonly attribute int8u numberOfCredentialsSupportedPerUser = 28;
+  attribute access(write: manage) char_string<3> language = 33;
+  attribute access(write: manage) int32u autoRelockTime = 35;
+  attribute access(write: manage) int8u soundVolume = 36;
+  attribute access(write: manage) DlOperatingMode operatingMode = 37;
+  readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
+  attribute access(write: manage) boolean enableOneTouchLocking = 41;
+  attribute access(write: manage) boolean enablePrivacyModeButton = 43;
+  attribute access(write: administer) int8u wrongCodeEntryLimit = 48;
+  attribute access(write: administer) int8u userCodeTemporaryDisableTime = 49;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
-}
+  request struct LockDoorRequest {
+    optional OCTET_STRING pinCode = 0;
+  }
 
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
+  request struct UnlockDoorRequest {
+    optional OCTET_STRING pinCode = 0;
   }
 
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
+  request struct UnlockWithTimeoutRequest {
+    INT16U timeout = 0;
+    optional OCTET_STRING pinCode = 1;
   }
 
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  request struct SetWeekDayScheduleRequest {
+    INT8U weekDayIndex = 0;
+    INT16U userIndex = 1;
+    DlDaysMaskMap daysMask = 2;
+    INT8U startHour = 3;
+    INT8U startMinute = 4;
+    INT8U endHour = 5;
+    INT8U endMinute = 6;
+  }
 
-server cluster UserLabel = 65 {
-  attribute access(write: manage) LabelStruct labelList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  request struct GetWeekDayScheduleRequest {
+    INT8U weekDayIndex = 0;
+    INT16U userIndex = 1;
+  }
 
-server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCause : ENUM8 {
-    kUnknown = 0;
-    kAssociationFailed = 1;
-    kAuthenticationFailed = 2;
-    kSsidNotFound = 3;
+  request struct ClearWeekDayScheduleRequest {
+    INT8U weekDayIndex = 0;
+    INT16U userIndex = 1;
   }
 
-  enum SecurityType : ENUM8 {
-    kUnspecified = 0;
-    kNone = 1;
-    kWep = 2;
-    kWpa = 3;
-    kWpa2 = 4;
-    kWpa3 = 5;
+  request struct SetYearDayScheduleRequest {
+    INT8U yearDayIndex = 0;
+    INT16U userIndex = 1;
+    epoch_s localStartTime = 2;
+    epoch_s localEndTime = 3;
   }
 
-  enum WiFiConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  request struct GetYearDayScheduleRequest {
+    INT8U yearDayIndex = 0;
+    INT16U userIndex = 1;
   }
 
-  enum WiFiVersionType : ENUM8 {
-    k80211a = 0;
-    k80211b = 1;
-    k80211g = 2;
-    k80211n = 3;
-    k80211ac = 4;
-    k80211ax = 5;
+  request struct ClearYearDayScheduleRequest {
+    INT8U yearDayIndex = 0;
+    INT16U userIndex = 1;
   }
 
-  info event Disconnection = 0 {
-    INT16U reasonCode = 0;
+  request struct SetHolidayScheduleRequest {
+    INT8U holidayIndex = 0;
+    epoch_s localStartTime = 1;
+    epoch_s localEndTime = 2;
+    DlOperatingMode operatingMode = 3;
   }
 
-  info event AssociationFailure = 1 {
-    AssociationFailureCause associationFailure = 0;
-    INT16U status = 1;
+  request struct GetHolidayScheduleRequest {
+    INT8U holidayIndex = 0;
   }
 
-  info event ConnectionStatus = 2 {
-    WiFiConnectionStatus connectionStatus = 0;
+  request struct ClearHolidayScheduleRequest {
+    INT8U holidayIndex = 0;
   }
 
-  readonly attribute nullable octet_string<6> bssid = 0;
-  readonly attribute nullable SecurityType securityType = 1;
-  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
-  readonly attribute nullable int16u channelNumber = 3;
-  readonly attribute nullable int8s rssi = 4;
-  readonly attribute int32u beaconLostCount = 5;
-  readonly attribute int32u beaconRxCount = 6;
-  readonly attribute int32u packetMulticastRxCount = 7;
-  readonly attribute int32u packetMulticastTxCount = 8;
-  readonly attribute int32u packetUnicastRxCount = 9;
-  readonly attribute int32u packetUnicastTxCount = 10;
-  readonly attribute int64u currentMaxRate = 11;
-  readonly attribute int64u overrunCount = 12;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  request struct SetUserRequest {
+    DlDataOperationType operationType = 0;
+    INT16U userIndex = 1;
+    nullable CHAR_STRING userName = 2;
+    nullable INT32U userUniqueId = 3;
+    nullable DlUserStatus userStatus = 4;
+    nullable DlUserType userType = 5;
+    nullable DlCredentialRule credentialRule = 6;
+  }
 
-  command ResetCounts(): DefaultSuccess = 0;
+  request struct GetUserRequest {
+    INT16U userIndex = 0;
+  }
+
+  request struct ClearUserRequest {
+    INT16U userIndex = 0;
+  }
+
+  request struct SetCredentialRequest {
+    DlDataOperationType operationType = 0;
+    DlCredential credential = 1;
+    LONG_OCTET_STRING credentialData = 2;
+    nullable INT16U userIndex = 3;
+    nullable DlUserStatus userStatus = 4;
+    nullable DlUserType userType = 5;
+  }
+
+  request struct GetCredentialStatusRequest {
+    DlCredential credential = 0;
+  }
+
+  request struct ClearCredentialRequest {
+    nullable DlCredential credential = 0;
+  }
+
+  response struct GetWeekDayScheduleResponse = 12 {
+    INT8U weekDayIndex = 0;
+    INT16U userIndex = 1;
+    DlStatus status = 2;
+    optional DlDaysMaskMap daysMask = 3;
+    optional INT8U startHour = 4;
+    optional INT8U startMinute = 5;
+    optional INT8U endHour = 6;
+    optional INT8U endMinute = 7;
+  }
+
+  response struct GetYearDayScheduleResponse = 15 {
+    INT8U yearDayIndex = 0;
+    INT16U userIndex = 1;
+    DlStatus status = 2;
+    optional epoch_s localStartTime = 3;
+    optional epoch_s localEndTime = 4;
+  }
+
+  response struct GetHolidayScheduleResponse = 18 {
+    INT8U holidayIndex = 0;
+    DlStatus status = 1;
+    optional epoch_s localStartTime = 2;
+    optional epoch_s localEndTime = 3;
+    optional DlOperatingMode operatingMode = 4;
+  }
+
+  response struct GetUserResponse = 28 {
+    INT16U userIndex = 0;
+    nullable CHAR_STRING userName = 1;
+    nullable INT32U userUniqueId = 2;
+    nullable DlUserStatus userStatus = 3;
+    nullable DlUserType userType = 4;
+    nullable DlCredentialRule credentialRule = 5;
+    nullable DlCredential credentials[] = 6;
+    nullable fabric_idx creatorFabricIndex = 7;
+    nullable fabric_idx lastModifiedFabricIndex = 8;
+    nullable INT16U nextUserIndex = 9;
+  }
+
+  response struct SetCredentialResponse = 35 {
+    DlStatus status = 0;
+    nullable INT16U userIndex = 1;
+    nullable INT16U nextCredentialIndex = 2;
+  }
+
+  response struct GetCredentialStatusResponse = 37 {
+    boolean credentialExists = 0;
+    nullable INT16U userIndex = 1;
+    nullable fabric_idx creatorFabricIndex = 2;
+    nullable fabric_idx lastModifiedFabricIndex = 3;
+    nullable INT16U nextCredentialIndex = 4;
+  }
+
+  timed command LockDoor(LockDoorRequest): DefaultSuccess = 0;
+  timed command UnlockDoor(UnlockDoorRequest): DefaultSuccess = 1;
+  timed command UnlockWithTimeout(UnlockWithTimeoutRequest): DefaultSuccess = 3;
+  command access(invoke: administer) SetWeekDaySchedule(SetWeekDayScheduleRequest): DefaultSuccess = 11;
+  command access(invoke: administer) GetWeekDaySchedule(GetWeekDayScheduleRequest): GetWeekDayScheduleResponse = 12;
+  command access(invoke: administer) ClearWeekDaySchedule(ClearWeekDayScheduleRequest): DefaultSuccess = 13;
+  command access(invoke: administer) SetYearDaySchedule(SetYearDayScheduleRequest): DefaultSuccess = 14;
+  command access(invoke: administer) GetYearDaySchedule(GetYearDayScheduleRequest): GetYearDayScheduleResponse = 15;
+  command access(invoke: administer) ClearYearDaySchedule(ClearYearDayScheduleRequest): DefaultSuccess = 16;
+  command access(invoke: administer) SetHolidaySchedule(SetHolidayScheduleRequest): DefaultSuccess = 17;
+  command access(invoke: administer) GetHolidaySchedule(GetHolidayScheduleRequest): GetHolidayScheduleResponse = 18;
+  command access(invoke: administer) ClearHolidaySchedule(ClearHolidayScheduleRequest): DefaultSuccess = 19;
+  timed command access(invoke: administer) SetUser(SetUserRequest): DefaultSuccess = 26;
+  command access(invoke: administer) GetUser(GetUserRequest): GetUserResponse = 27;
+  timed command access(invoke: administer) ClearUser(ClearUserRequest): DefaultSuccess = 29;
+  timed command access(invoke: administer) SetCredential(SetCredentialRequest): SetCredentialResponse = 34;
+  command access(invoke: administer) GetCredentialStatus(GetCredentialStatusRequest): GetCredentialStatusResponse = 36;
+  timed command access(invoke: administer) ClearCredential(ClearCredentialRequest): DefaultSuccess = 38;
 }
 
 endpoint 0 {
diff --git a/examples/log-source-app/log-source-common/log-source-app.matter b/examples/log-source-app/log-source-common/log-source-app.matter
index df13f0c7ec186d..d21e442b6b0065 100644
--- a/examples/log-source-app/log-source-common/log-source-app.matter
+++ b/examples/log-source-app/log-source-common/log-source-app.matter
@@ -67,69 +67,6 @@ server cluster AccessControl = 31 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-client cluster DiagnosticLogs = 50 {
-  enum LogsIntent : ENUM8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
-  }
-
-  enum LogsStatus : ENUM8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
-  }
-
-  enum LogsTransferProtocol : ENUM8 {
-    kResponsePayload = 0;
-    kBdx = 1;
-  }
-
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster DiagnosticLogs = 50 {
-  enum LogsIntent : ENUM8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
-  }
-
-  enum LogsStatus : ENUM8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
-  }
-
-  enum LogsTransferProtocol : ENUM8 {
-    kResponsePayload = 0;
-    kBdx = 1;
-  }
-
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct RetrieveLogsRequestRequest {
-    LogsIntent intent = 0;
-    LogsTransferProtocol requestedProtocol = 1;
-    OCTET_STRING transferFileDesignator = 2;
-  }
-
-  response struct RetrieveLogsResponse = 1 {
-    LogsStatus status = 0;
-    OCTET_STRING content = 1;
-    epoch_s timeStamp = 2;
-    INT32U timeSinceBoot = 3;
-  }
-
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
-}
-
 server cluster GeneralCommissioning = 48 {
   enum CommissioningError : ENUM8 {
     kOk = 0;
@@ -308,6 +245,69 @@ server cluster NetworkCommissioning = 49 {
   command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
 }
 
+client cluster DiagnosticLogs = 50 {
+  enum LogsIntent : ENUM8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
+  }
+
+  enum LogsStatus : ENUM8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
+  }
+
+  enum LogsTransferProtocol : ENUM8 {
+    kResponsePayload = 0;
+    kBdx = 1;
+  }
+
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster DiagnosticLogs = 50 {
+  enum LogsIntent : ENUM8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
+  }
+
+  enum LogsStatus : ENUM8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
+  }
+
+  enum LogsTransferProtocol : ENUM8 {
+    kResponsePayload = 0;
+    kBdx = 1;
+  }
+
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct RetrieveLogsRequestRequest {
+    LogsIntent intent = 0;
+    LogsTransferProtocol requestedProtocol = 1;
+    OCTET_STRING transferFileDesignator = 2;
+  }
+
+  response struct RetrieveLogsResponse = 1 {
+    LogsStatus status = 0;
+    OCTET_STRING content = 1;
+    epoch_s timeStamp = 2;
+    INT32U timeSinceBoot = 3;
+  }
+
+  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+}
+
 server cluster OperationalCredentials = 62 {
   enum OperationalCertStatus : ENUM8 {
     kSuccess = 0;
diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
index e8b97b93ae88cf..0d7c9f937d3d46 100644
--- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
+++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
@@ -138,42 +138,6 @@ server cluster AccessControl = 31 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
-  }
-
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
-  }
-
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
-  }
-
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-  }
-
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
-
 server cluster Basic = 40 {
   struct CapabilityMinimaStruct {
     int16u caseSessionsPerFabric = 0;
@@ -218,8 +182,103 @@ server cluster Basic = 40 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
+server cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
+  }
+
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
+  }
+
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
+  }
+
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
+  }
+
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
+  }
+
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
+  }
+
+  response struct QueryImageResponse = 1 {
+    OTAQueryStatus status = 0;
+    optional INT32U delayedActionTime = 1;
+    optional CHAR_STRING imageURI = 2;
+    optional INT32U softwareVersion = 3;
+    optional CHAR_STRING softwareVersionString = 4;
+    optional OCTET_STRING updateToken = 5;
+    optional BOOLEAN userConsentNeeded = 6;
+    optional OCTET_STRING metadataForRequestor = 7;
+  }
+
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
+  }
+
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
+}
+
+server cluster LocalizationConfiguration = 43 {
+  attribute char_string<35> activeLocale = 0;
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
+  }
+
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
+  }
+
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
@@ -274,187 +333,13 @@ server cluster GeneralCommissioning = 48 {
   }
 
   response struct CommissioningCompleteResponse = 5 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
-  }
-
-  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
-  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
-  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
-}
-
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
-  }
-
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
-  }
-
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
-  }
-
-  enum NetworkFaultType : ENUM8 {
-    kUnspecified = 0;
-    kHardwareFailure = 1;
-    kNetworkJammed = 2;
-    kConnectionFailed = 3;
-  }
-
-  enum RadioFaultType : ENUM8 {
-    kUnspecified = 0;
-    kWiFiFault = 1;
-    kCellularFault = 2;
-    kThreadFault = 3;
-    kNFCFault = 4;
-    kBLEFault = 5;
-    kEthernetFault = 6;
-  }
-
-  struct NetworkInterfaceType {
-    char_string<32> name = 0;
-    boolean isOperational = 1;
-    nullable boolean offPremiseServicesReachableIPv4 = 2;
-    nullable boolean offPremiseServicesReachableIPv6 = 3;
-    octet_string<8> hardwareAddress = 4;
-    octet_string IPv4Addresses[] = 5;
-    octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
-  }
-
-  critical event HardwareFaultChange = 0 {
-    HardwareFaultType current[] = 0;
-    HardwareFaultType previous[] = 1;
-  }
-
-  critical event RadioFaultChange = 1 {
-    RadioFaultType current[] = 0;
-    RadioFaultType previous[] = 1;
-  }
-
-  critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
-  }
-
-  critical event BootReason = 3 {
-    BootReasonType bootReason = 0;
-  }
-
-  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
-  readonly attribute int16u rebootCount = 1;
-  readonly attribute int64u upTime = 2;
-  readonly attribute int32u totalOperationalHours = 3;
-  readonly attribute enum8 bootReasons = 4;
-  readonly attribute ENUM8 activeHardwareFaults[] = 5;
-  readonly attribute ENUM8 activeRadioFaults[] = 6;
-  readonly attribute ENUM8 activeNetworkFaults[] = 7;
-  readonly attribute boolean testEventTriggersEnabled = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct TestEventTriggerRequest {
-    OCTET_STRING enableKey = 0;
-    INT64U eventTrigger = 1;
-  }
-
-  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
-}
-
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
-  }
-
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
-    fabric_idx fabricIndex = 254;
-  }
-
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
-  }
-
-  struct GroupKeySetStruct {
-    int16u groupKeySetID = 0;
-    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
-    nullable octet_string<16> epochKey0 = 2;
-    nullable epoch_us epochStartTime0 = 3;
-    nullable octet_string<16> epochKey1 = 4;
-    nullable epoch_us epochStartTime1 = 5;
-    nullable octet_string<16> epochKey2 = 6;
-    nullable epoch_us epochStartTime2 = 7;
-  }
-
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
-  readonly attribute int16u maxGroupsPerFabric = 2;
-  readonly attribute int16u maxGroupKeysPerFabric = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct KeySetWriteRequest {
-    GroupKeySetStruct groupKeySet = 0;
-  }
-
-  request struct KeySetReadRequest {
-    INT16U groupKeySetID = 0;
-  }
-
-  request struct KeySetRemoveRequest {
-    INT16U groupKeySetID = 0;
-  }
-
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
-  }
-
-  response struct KeySetReadResponse = 2 {
-    GroupKeySetStruct groupKeySet = 0;
-  }
-
-  response struct KeySetReadAllIndicesResponse = 5 {
-    INT16U groupKeySetIDs[] = 0;
-  }
-
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
-}
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
+  }
 
-server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
+  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
+  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
 }
 
 server cluster NetworkCommissioning = 49 {
@@ -591,70 +476,140 @@ server cluster NetworkCommissioning = 49 {
   command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
 }
 
-server cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
   }
 
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
   }
 
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
+  }
+
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
+  }
+
+  enum RadioFaultType : ENUM8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
+  }
+
+  struct NetworkInterfaceType {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceType type = 7;
+  }
+
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultType current[] = 0;
+    HardwareFaultType previous[] = 1;
+  }
+
+  critical event RadioFaultChange = 1 {
+    RadioFaultType current[] = 0;
+    RadioFaultType previous[] = 1;
+  }
+
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultType current[] = 0;
+    NetworkFaultType previous[] = 1;
   }
 
+  critical event BootReason = 3 {
+    BootReasonType bootReason = 0;
+  }
+
+  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
+  readonly attribute int32u totalOperationalHours = 3;
+  readonly attribute enum8 bootReasons = 4;
+  readonly attribute ENUM8 activeHardwareFaults[] = 5;
+  readonly attribute ENUM8 activeRadioFaults[] = 6;
+  readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
   }
 
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+}
+
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
   }
 
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
   }
 
-  response struct QueryImageResponse = 1 {
-    OTAQueryStatus status = 0;
-    optional INT32U delayedActionTime = 1;
-    optional CHAR_STRING imageURI = 2;
-    optional INT32U softwareVersion = 3;
-    optional CHAR_STRING softwareVersionString = 4;
-    optional OCTET_STRING updateToken = 5;
-    optional BOOLEAN userConsentNeeded = 6;
-    optional OCTET_STRING metadataForRequestor = 7;
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
   }
 
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
   }
 
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
 server cluster OperationalCredentials = 62 {
@@ -764,30 +719,75 @@ server cluster OperationalCredentials = 62 {
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
 }
 
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
   }
 
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
+
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
index 09184a341332a4..09ffb5b4fad390 100644
--- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
+++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
@@ -72,42 +72,6 @@ server cluster AccessControl = 31 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
-  }
-
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
-  }
-
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
-  }
-
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-  }
-
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
-
 server cluster Basic = 40 {
   struct CapabilityMinimaStruct {
     int16u caseSessionsPerFabric = 0;
@@ -152,243 +116,233 @@ server cluster Basic = 40 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster GeneralCommissioning = 48 {
-  enum CommissioningError : ENUM8 {
-    kOk = 0;
-    kValueOutsideRange = 1;
-    kInvalidAuthentication = 2;
-    kNoFailSafe = 3;
-    kBusyWithOtherAdmin = 4;
+client cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
   }
 
-  enum RegulatoryLocationType : ENUM8 {
-    kIndoor = 0;
-    kOutdoor = 1;
-    kIndoorOutdoor = 2;
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
   }
 
-  struct BasicCommissioningInfo {
-    int16u failSafeExpiryLengthSeconds = 0;
-    int16u maxCumulativeFailsafeSeconds = 1;
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
   }
 
-  attribute access(write: administer) int64u breadcrumb = 0;
-  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
-  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
-  readonly attribute RegulatoryLocationType locationCapability = 3;
-  readonly attribute boolean supportsConcurrentConnection = 4;
-  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct ArmFailSafeRequest {
-    INT16U expiryLengthSeconds = 0;
-    INT64U breadcrumb = 1;
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
   }
 
-  request struct SetRegulatoryConfigRequest {
-    RegulatoryLocationType newRegulatoryConfig = 0;
-    CHAR_STRING countryCode = 1;
-    INT64U breadcrumb = 2;
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
   }
 
-  response struct ArmFailSafeResponse = 1 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
   }
 
-  response struct SetRegulatoryConfigResponse = 3 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  response struct QueryImageResponse = 1 {
+    OTAQueryStatus status = 0;
+    optional INT32U delayedActionTime = 1;
+    optional CHAR_STRING imageURI = 2;
+    optional INT32U softwareVersion = 3;
+    optional CHAR_STRING softwareVersionString = 4;
+    optional OCTET_STRING updateToken = 5;
+    optional BOOLEAN userConsentNeeded = 6;
+    optional OCTET_STRING metadataForRequestor = 7;
   }
 
-  response struct CommissioningCompleteResponse = 5 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
   }
 
-  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
-  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
-  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
 }
 
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
+server cluster OtaSoftwareUpdateRequestor = 42 {
+  enum OTAAnnouncementReason : ENUM8 {
+    kSimpleAnnouncement = 0;
+    kUpdateAvailable = 1;
+    kUrgentUpdateAvailable = 2;
   }
 
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
+  enum OTAChangeReasonEnum : ENUM8 {
+    kUnknown = 0;
+    kSuccess = 1;
+    kFailure = 2;
+    kTimeOut = 3;
+    kDelayByProvider = 4;
   }
 
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
+  enum OTAUpdateStateEnum : ENUM8 {
+    kUnknown = 0;
+    kIdle = 1;
+    kQuerying = 2;
+    kDelayedOnQuery = 3;
+    kDownloading = 4;
+    kApplying = 5;
+    kDelayedOnApply = 6;
+    kRollingBack = 7;
+    kDelayedOnUserConsent = 8;
   }
 
-  enum NetworkFaultType : ENUM8 {
-    kUnspecified = 0;
-    kHardwareFailure = 1;
-    kNetworkJammed = 2;
-    kConnectionFailed = 3;
+  struct ProviderLocation {
+    node_id providerNodeID = 1;
+    endpoint_no endpoint = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  enum RadioFaultType : ENUM8 {
-    kUnspecified = 0;
-    kWiFiFault = 1;
-    kCellularFault = 2;
-    kThreadFault = 3;
-    kNFCFault = 4;
-    kBLEFault = 5;
-    kEthernetFault = 6;
+  info event StateTransition = 0 {
+    OTAUpdateStateEnum previousState = 0;
+    OTAUpdateStateEnum newState = 1;
+    OTAChangeReasonEnum reason = 2;
+    nullable INT32U targetSoftwareVersion = 3;
   }
 
-  struct NetworkInterfaceType {
-    char_string<32> name = 0;
-    boolean isOperational = 1;
-    nullable boolean offPremiseServicesReachableIPv4 = 2;
-    nullable boolean offPremiseServicesReachableIPv6 = 3;
-    octet_string<8> hardwareAddress = 4;
-    octet_string IPv4Addresses[] = 5;
-    octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+  critical event VersionApplied = 1 {
+    INT32U softwareVersion = 0;
+    INT16U productID = 1;
   }
 
-  critical event HardwareFaultChange = 0 {
-    HardwareFaultType current[] = 0;
-    HardwareFaultType previous[] = 1;
+  info event DownloadError = 2 {
+    INT32U softwareVersion = 0;
+    INT64U bytesDownloaded = 1;
+    nullable INT8U progressPercent = 2;
+    nullable INT64S platformCode = 3;
   }
 
-  critical event RadioFaultChange = 1 {
-    RadioFaultType current[] = 0;
-    RadioFaultType previous[] = 1;
-  }
+  attribute ProviderLocation defaultOtaProviders[] = 0;
+  readonly attribute boolean updatePossible = 1;
+  readonly attribute OTAUpdateStateEnum updateState = 2;
+  readonly attribute nullable int8u updateStateProgress = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+  request struct AnnounceOtaProviderRequest {
+    node_id providerNodeId = 0;
+    vendor_id vendorId = 1;
+    OTAAnnouncementReason announcementReason = 2;
+    optional OCTET_STRING metadataForNode = 3;
+    endpoint_no endpoint = 4;
   }
 
-  critical event BootReason = 3 {
-    BootReasonType bootReason = 0;
-  }
+  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
+}
 
-  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
-  readonly attribute int16u rebootCount = 1;
-  readonly attribute int64u upTime = 2;
-  readonly attribute int32u totalOperationalHours = 3;
-  readonly attribute enum8 bootReasons = 4;
-  readonly attribute ENUM8 activeHardwareFaults[] = 5;
-  readonly attribute ENUM8 activeRadioFaults[] = 6;
-  readonly attribute ENUM8 activeNetworkFaults[] = 7;
-  readonly attribute boolean testEventTriggersEnabled = 8;
+server cluster LocalizationConfiguration = 43 {
+  attribute char_string<35> activeLocale = 0;
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct TestEventTriggerRequest {
-    OCTET_STRING enableKey = 0;
-    INT64U eventTrigger = 1;
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
   }
 
-  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
-}
-
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
   }
 
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
-    fabric_idx fabricIndex = 254;
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster GeneralCommissioning = 48 {
+  enum CommissioningError : ENUM8 {
+    kOk = 0;
+    kValueOutsideRange = 1;
+    kInvalidAuthentication = 2;
+    kNoFailSafe = 3;
+    kBusyWithOtherAdmin = 4;
   }
 
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
+  enum RegulatoryLocationType : ENUM8 {
+    kIndoor = 0;
+    kOutdoor = 1;
+    kIndoorOutdoor = 2;
   }
 
-  struct GroupKeySetStruct {
-    int16u groupKeySetID = 0;
-    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
-    nullable octet_string<16> epochKey0 = 2;
-    nullable epoch_us epochStartTime0 = 3;
-    nullable octet_string<16> epochKey1 = 4;
-    nullable epoch_us epochStartTime1 = 5;
-    nullable octet_string<16> epochKey2 = 6;
-    nullable epoch_us epochStartTime2 = 7;
+  struct BasicCommissioningInfo {
+    int16u failSafeExpiryLengthSeconds = 0;
+    int16u maxCumulativeFailsafeSeconds = 1;
   }
 
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
-  readonly attribute int16u maxGroupsPerFabric = 2;
-  readonly attribute int16u maxGroupKeysPerFabric = 3;
+  attribute access(write: administer) int64u breadcrumb = 0;
+  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
+  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
+  readonly attribute RegulatoryLocationType locationCapability = 3;
+  readonly attribute boolean supportsConcurrentConnection = 4;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct KeySetWriteRequest {
-    GroupKeySetStruct groupKeySet = 0;
-  }
-
-  request struct KeySetReadRequest {
-    INT16U groupKeySetID = 0;
+  request struct ArmFailSafeRequest {
+    INT16U expiryLengthSeconds = 0;
+    INT64U breadcrumb = 1;
   }
 
-  request struct KeySetRemoveRequest {
-    INT16U groupKeySetID = 0;
+  request struct SetRegulatoryConfigRequest {
+    RegulatoryLocationType newRegulatoryConfig = 0;
+    CHAR_STRING countryCode = 1;
+    INT64U breadcrumb = 2;
   }
 
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
+  response struct ArmFailSafeResponse = 1 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  response struct KeySetReadResponse = 2 {
-    GroupKeySetStruct groupKeySet = 0;
+  response struct SetRegulatoryConfigResponse = 3 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  response struct KeySetReadAllIndicesResponse = 5 {
-    INT16U groupKeySetIDs[] = 0;
+  response struct CommissioningCompleteResponse = 5 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
-}
-
-server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
+  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
+  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
 }
 
 server cluster NetworkCommissioning = 49 {
@@ -525,139 +479,140 @@ server cluster NetworkCommissioning = 49 {
   command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
 }
 
-client cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
   }
 
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
   }
 
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
   }
 
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
   }
 
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
+  enum RadioFaultType : ENUM8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
   }
 
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
+  struct NetworkInterfaceType {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceType type = 7;
   }
 
-  response struct QueryImageResponse = 1 {
-    OTAQueryStatus status = 0;
-    optional INT32U delayedActionTime = 1;
-    optional CHAR_STRING imageURI = 2;
-    optional INT32U softwareVersion = 3;
-    optional CHAR_STRING softwareVersionString = 4;
-    optional OCTET_STRING updateToken = 5;
-    optional BOOLEAN userConsentNeeded = 6;
-    optional OCTET_STRING metadataForRequestor = 7;
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultType current[] = 0;
+    HardwareFaultType previous[] = 1;
   }
 
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
+  critical event RadioFaultChange = 1 {
+    RadioFaultType current[] = 0;
+    RadioFaultType previous[] = 1;
   }
 
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
-}
-
-server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum OTAAnnouncementReason : ENUM8 {
-    kSimpleAnnouncement = 0;
-    kUpdateAvailable = 1;
-    kUrgentUpdateAvailable = 2;
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultType current[] = 0;
+    NetworkFaultType previous[] = 1;
   }
 
-  enum OTAChangeReasonEnum : ENUM8 {
-    kUnknown = 0;
-    kSuccess = 1;
-    kFailure = 2;
-    kTimeOut = 3;
-    kDelayByProvider = 4;
+  critical event BootReason = 3 {
+    BootReasonType bootReason = 0;
   }
 
-  enum OTAUpdateStateEnum : ENUM8 {
-    kUnknown = 0;
-    kIdle = 1;
-    kQuerying = 2;
-    kDelayedOnQuery = 3;
-    kDownloading = 4;
-    kApplying = 5;
-    kDelayedOnApply = 6;
-    kRollingBack = 7;
-    kDelayedOnUserConsent = 8;
-  }
+  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
+  readonly attribute int32u totalOperationalHours = 3;
+  readonly attribute enum8 bootReasons = 4;
+  readonly attribute ENUM8 activeHardwareFaults[] = 5;
+  readonly attribute ENUM8 activeRadioFaults[] = 6;
+  readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  struct ProviderLocation {
-    node_id providerNodeID = 1;
-    endpoint_no endpoint = 2;
-    fabric_idx fabricIndex = 254;
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
   }
 
-  info event StateTransition = 0 {
-    OTAUpdateStateEnum previousState = 0;
-    OTAUpdateStateEnum newState = 1;
-    OTAChangeReasonEnum reason = 2;
-    nullable INT32U targetSoftwareVersion = 3;
-  }
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+}
 
-  critical event VersionApplied = 1 {
-    INT32U softwareVersion = 0;
-    INT16U productID = 1;
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
   }
 
-  info event DownloadError = 2 {
-    INT32U softwareVersion = 0;
-    INT64U bytesDownloaded = 1;
-    nullable INT8U progressPercent = 2;
-    nullable INT64S platformCode = 3;
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
   }
 
-  attribute ProviderLocation defaultOtaProviders[] = 0;
-  readonly attribute boolean updatePossible = 1;
-  readonly attribute OTAUpdateStateEnum updateState = 2;
-  readonly attribute nullable int8u updateStateProgress = 3;
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AnnounceOtaProviderRequest {
-    node_id providerNodeId = 0;
-    vendor_id vendorId = 1;
-    OTAAnnouncementReason announcementReason = 2;
-    optional OCTET_STRING metadataForNode = 3;
-    endpoint_no endpoint = 4;
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
   }
 
-  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+  }
+
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
 server cluster OperationalCredentials = 62 {
@@ -767,30 +722,75 @@ server cluster OperationalCredentials = 62 {
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
 }
 
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
   }
 
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
+
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index a43b8cc48939bd..afa11b77ac76e1 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -1,542 +1,399 @@
 // This IDL was generated automatically by ZAP.
 // It is for view/code review purposes only.
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
   }
 
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
   }
 
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
+  }
+
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
-  }
-
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
   }
 
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
 }
 
-client cluster ApplicationBasic = 1293 {
-  enum ApplicationStatusEnum : ENUM8 {
-    kStopped = 0;
-    kActiveVisibleFocus = 1;
-    kActiveHidden = 2;
-    kActiveVisibleNotFocus = 3;
-  }
-
-  struct ApplicationBasicApplication {
-    int16u catalogVendorId = 0;
-    char_string applicationId = 1;
-  }
-
-  readonly attribute char_string<32> vendorName = 0;
-  readonly attribute int16u vendorID = 1;
-  readonly attribute char_string<32> applicationName = 2;
-  readonly attribute int16u productID = 3;
-  readonly attribute ApplicationBasicApplication application = 4;
-  readonly attribute ApplicationStatusEnum status = 5;
-  readonly attribute char_string<32> applicationVersion = 6;
-  readonly attribute vendor_id allowedVendorList[] = 7;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+server cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster ApplicationBasic = 1293 {
-  enum ApplicationStatusEnum : ENUM8 {
-    kStopped = 0;
-    kActiveVisibleFocus = 1;
-    kActiveHidden = 2;
-    kActiveVisibleNotFocus = 3;
+  request struct AddGroupRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
   }
 
-  struct ApplicationBasicApplication {
-    int16u catalogVendorId = 0;
-    char_string applicationId = 1;
+  request struct ViewGroupRequest {
+    group_id groupId = 0;
   }
 
-  readonly attribute char_string<32> vendorName = 0;
-  readonly attribute int16u vendorID = 1;
-  readonly attribute char_string<32> applicationName = 2;
-  readonly attribute int16u productID = 3;
-  readonly attribute ApplicationBasicApplication application = 4;
-  readonly attribute ApplicationStatusEnum status = 5;
-  readonly attribute char_string<32> applicationVersion = 6;
-  readonly attribute vendor_id allowedVendorList[] = 7;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster Basic = 40 {
-  struct CapabilityMinimaStruct {
-    int16u caseSessionsPerFabric = 0;
-    int16u subscriptionsPerFabric = 1;
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
   }
 
-  critical event StartUp = 0 {
-    INT32U softwareVersion = 0;
+  request struct RemoveGroupRequest {
+    group_id groupId = 0;
   }
 
-  critical event ShutDown = 1 {
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
   }
 
-  info event Leave = 2 {
+  response struct AddGroupResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  info event ReachableChanged = 3 {
-    boolean reachableNewValue = 0;
+  response struct ViewGroupResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    CHAR_STRING groupName = 2;
   }
 
-  readonly attribute int16u dataModelRevision = 0;
-  readonly attribute char_string<32> vendorName = 1;
-  readonly attribute vendor_id vendorID = 2;
-  readonly attribute char_string<32> productName = 3;
-  readonly attribute int16u productID = 4;
-  attribute access(write: manage) char_string<32> nodeLabel = 5;
-  attribute access(write: administer) char_string<2> location = 6;
-  readonly attribute int16u hardwareVersion = 7;
-  readonly attribute char_string<64> hardwareVersionString = 8;
-  readonly attribute int32u softwareVersion = 9;
-  readonly attribute char_string<64> softwareVersionString = 10;
-  readonly attribute char_string<16> manufacturingDate = 11;
-  readonly attribute char_string<32> partNumber = 12;
-  readonly attribute long_char_string<256> productURL = 13;
-  readonly attribute char_string<64> productLabel = 14;
-  readonly attribute char_string<32> serialNumber = 15;
-  attribute access(write: manage) boolean localConfigDisabled = 16;
-  readonly attribute boolean reachable = 17;
-  readonly attribute char_string<32> uniqueID = 18;
-  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  response struct GetGroupMembershipResponse = 2 {
+    nullable INT8U capacity = 0;
+    group_id groupList[] = 1;
+  }
 
-server cluster BooleanState = 69 {
-  info event StateChange = 0 {
-    boolean stateValue = 0;
+  response struct RemoveGroupResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  readonly attribute boolean stateValue = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
 }
 
-server cluster BridgedActions = 37 {
-  enum ActionErrorEnum : ENUM8 {
-    kUnknown = 0;
-    kInterrupted = 1;
+server cluster Scenes = 5 {
+  bitmap ScenesCopyMode : BITMAP8 {
+    kCopyAllScenes = 0x1;
   }
 
-  enum ActionStateEnum : ENUM8 {
-    kInactive = 0;
-    kActive = 1;
-    kPaused = 2;
-    kDisabled = 3;
+  struct ExtensionFieldSet {
+    cluster_id clusterId = 0;
+    AttributeValuePair attributeValueList[] = 1;
   }
 
-  enum ActionTypeEnum : ENUM8 {
-    kOther = 0;
-    kScene = 1;
-    kSequence = 2;
-    kAutomation = 3;
-    kException = 4;
-    kNotification = 5;
-    kAlarm = 6;
+  struct AttributeValuePair {
+    optional attrib_id attributeId = 0;
+    int8u attributeValue[] = 1;
   }
 
-  enum EndpointListTypeEnum : ENUM8 {
-    kOther = 0;
-    kRoom = 1;
-    kZone = 2;
+  readonly attribute int8u sceneCount = 0;
+  readonly attribute int8u currentScene = 1;
+  readonly attribute group_id currentGroup = 2;
+  readonly attribute boolean sceneValid = 3;
+  readonly attribute bitmap8 nameSupport = 4;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AddSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    INT16U transitionTime = 2;
+    CHAR_STRING sceneName = 3;
+    ExtensionFieldSet extensionFieldSets[] = 4;
   }
 
-  bitmap CommandBits : BITMAP16 {
-    kInstantAction = 0x1;
-    kInstantActionWithTransition = 0x2;
-    kStartAction = 0x4;
-    kStartActionWithDuration = 0x8;
-    kStopAction = 0x10;
-    kPauseAction = 0x20;
-    kPauseActionWithDuration = 0x40;
-    kResumeAction = 0x80;
-    kEnableAction = 0x100;
-    kEnableActionWithDuration = 0x200;
-    kDisableAction = 0x400;
-    kDisableActionWithDuration = 0x800;
+  request struct ViewSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  struct ActionStruct {
-    int16u actionID = 0;
-    char_string<32> name = 1;
-    ActionTypeEnum type = 2;
-    int16u endpointListID = 3;
-    int16u supportedCommands = 4;
-    ActionStateEnum status = 5;
+  request struct RemoveSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  struct EndpointListStruct {
-    int16u endpointListID = 0;
-    char_string<32> name = 1;
-    EndpointListTypeEnum type = 2;
-    endpoint_no endpoints[] = 3;
+  request struct RemoveAllScenesRequest {
+    group_id groupId = 0;
   }
 
-  info event StateChanged = 0 {
-    INT16U actionID = 0;
-    INT32U invokeID = 1;
-    ActionStateEnum newState = 2;
+  request struct StoreSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  info event ActionFailed = 1 {
-    INT16U actionID = 0;
-    INT32U invokeID = 1;
-    ActionStateEnum newState = 2;
-    ActionErrorEnum error = 3;
+  request struct RecallSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    optional nullable INT16U transitionTime = 2;
   }
 
-  readonly attribute ActionStruct actionList[] = 0;
-  readonly attribute EndpointListStruct endpointList[] = 1;
-  readonly attribute long_char_string<512> setupUrl = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster ColorControl = 768 {
-  enum ColorLoopAction : ENUM8 {
-    kDeactivate = 0;
-    kActivateFromColorLoopStartEnhancedHue = 1;
-    kActivateFromEnhancedCurrentHue = 2;
+  request struct GetSceneMembershipRequest {
+    group_id groupId = 0;
   }
 
-  enum ColorLoopDirection : ENUM8 {
-    kDecrementHue = 0;
-    kIncrementHue = 1;
+  response struct AddSceneResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  enum ColorMode : ENUM8 {
-    kCurrentHueAndCurrentSaturation = 0;
-    kCurrentXAndCurrentY = 1;
-    kColorTemperature = 2;
+  response struct ViewSceneResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+    optional INT16U transitionTime = 3;
+    optional CHAR_STRING sceneName = 4;
+    optional ExtensionFieldSet extensionFieldSets[] = 5;
   }
 
-  enum HueDirection : ENUM8 {
-    kShortestDistance = 0;
-    kLongestDistance = 1;
-    kUp = 2;
-    kDown = 3;
+  response struct RemoveSceneResponse = 2 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  enum HueMoveMode : ENUM8 {
-    kStop = 0;
-    kUp = 1;
-    kDown = 3;
+  response struct RemoveAllScenesResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  enum HueStepMode : ENUM8 {
-    kUp = 1;
-    kDown = 3;
+  response struct StoreSceneResponse = 4 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  enum SaturationMoveMode : ENUM8 {
-    kStop = 0;
-    kUp = 1;
-    kDown = 3;
+  response struct GetSceneMembershipResponse = 6 {
+    ENUM8 status = 0;
+    nullable INT8U capacity = 1;
+    group_id groupId = 2;
+    optional INT8U sceneList[] = 3;
   }
 
-  enum SaturationStepMode : ENUM8 {
-    kUp = 1;
-    kDown = 3;
-  }
+  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
+  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
+  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
+  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
+  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
+  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
+  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
+}
 
-  bitmap ColorCapabilities : BITMAP16 {
-    kHueSaturationSupported = 0x1;
-    kEnhancedHueSupported = 0x2;
-    kColorLoopSupported = 0x4;
-    kXYAttributesSupported = 0x8;
-    kColorTemperatureSupported = 0x10;
+client cluster OnOff = 6 {
+  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
+    kFadeToOffIn0p8Seconds = 0;
+    kNoFade = 1;
+    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
   }
 
-  bitmap ColorControlFeature : BITMAP32 {
-    kHueAndSaturation = 0x1;
-    kEnhancedHue = 0x2;
-    kColorLoop = 0x4;
-    kXy = 0x8;
-    kColorTemperature = 0x10;
+  enum OnOffDyingLightEffectVariant : ENUM8 {
+    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
   }
 
-  bitmap ColorLoopUpdateFlags : BITMAP8 {
-    kUpdateAction = 0x1;
-    kUpdateDirection = 0x2;
-    kUpdateTime = 0x4;
-    kUpdateStartHue = 0x8;
+  enum OnOffEffectIdentifier : ENUM8 {
+    kDelayedAllOff = 0;
+    kDyingLight = 1;
   }
 
-  readonly attribute int16u currentX = 3;
-  readonly attribute int16u currentY = 4;
-  attribute bitmap8 options = 15;
-  readonly attribute int16u coupleColorTempToLevelMinMireds = 16397;
-  attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct MoveToColorRequest {
-    INT16U colorX = 0;
-    INT16U colorY = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  enum OnOffStartUpOnOff : ENUM8 {
+    kOff = 0;
+    kOn = 1;
+    kTogglePreviousOnOff = 2;
   }
 
-  request struct MoveColorRequest {
-    INT16S rateX = 0;
-    INT16S rateY = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
+  bitmap OnOffControl : BITMAP8 {
+    kAcceptOnlyWhenOn = 0x1;
   }
 
-  request struct StepColorRequest {
-    INT16S stepX = 0;
-    INT16S stepY = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
   }
 
-  command MoveToColor(MoveToColorRequest): DefaultSuccess = 7;
-  command MoveColor(MoveColorRequest): DefaultSuccess = 8;
-  command StepColor(StepColorRequest): DefaultSuccess = 9;
-}
-
-client cluster ContentLauncher = 1290 {
-  enum ContentLaunchStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kUrlNotAvailable = 1;
-    kAuthFailed = 2;
+  bitmap SceneFeatures : BITMAP32 {
+    kSceneNames = 0x1;
   }
 
-  enum MetricTypeEnum : ENUM8 {
-    kPixels = 0;
-    kPercentage = 1;
-  }
+  readonly attribute boolean onOff = 0;
+  readonly attribute boolean globalSceneControl = 16384;
+  attribute int16u onTime = 16385;
+  attribute int16u offWaitTime = 16386;
+  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  enum ParameterEnum : ENUM8 {
-    kActor = 0;
-    kChannel = 1;
-    kCharacter = 2;
-    kDirector = 3;
-    kEvent = 4;
-    kFranchise = 5;
-    kGenre = 6;
-    kLeague = 7;
-    kPopularity = 8;
-    kProvider = 9;
-    kSport = 10;
-    kSportsTeam = 11;
-    kType = 12;
+  request struct OffWithEffectRequest {
+    OnOffEffectIdentifier effectId = 0;
+    OnOffDelayedAllOffEffectVariant effectVariant = 1;
   }
 
-  bitmap ContentLauncherFeature : BITMAP32 {
-    kContentSearch = 0x1;
-    kURLPlayback = 0x2;
+  request struct OnWithTimedOffRequest {
+    OnOffControl onOffControl = 0;
+    int16u onTime = 1;
+    int16u offWaitTime = 2;
   }
 
-  bitmap SupportedStreamingProtocol : BITMAP32 {
-    kDash = 0x1;
-    kHls = 0x2;
+  command Off(): DefaultSuccess = 0;
+  command On(): DefaultSuccess = 1;
+  command Toggle(): DefaultSuccess = 2;
+  command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64;
+  command OnWithRecallGlobalScene(): DefaultSuccess = 65;
+  command OnWithTimedOff(OnWithTimedOffRequest): DefaultSuccess = 66;
+}
+
+server cluster OnOff = 6 {
+  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
+    kFadeToOffIn0p8Seconds = 0;
+    kNoFade = 1;
+    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
   }
 
-  struct ContentSearch {
-    Parameter parameterList[] = 0;
+  enum OnOffDyingLightEffectVariant : ENUM8 {
+    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
   }
 
-  struct Parameter {
-    ParameterEnum type = 0;
-    char_string value = 1;
-    optional AdditionalInfo externalIDList[] = 2;
+  enum OnOffEffectIdentifier : ENUM8 {
+    kDelayedAllOff = 0;
+    kDyingLight = 1;
   }
 
-  struct AdditionalInfo {
-    char_string name = 0;
-    char_string value = 1;
+  enum OnOffStartUpOnOff : ENUM8 {
+    kOff = 0;
+    kOn = 1;
+    kTogglePreviousOnOff = 2;
   }
 
-  struct BrandingInformation {
-    char_string providerName = 0;
-    optional StyleInformation background = 1;
-    optional StyleInformation logo = 2;
-    optional StyleInformation progressBar = 3;
-    optional StyleInformation splash = 4;
-    optional StyleInformation waterMark = 5;
+  bitmap OnOffControl : BITMAP8 {
+    kAcceptOnlyWhenOn = 0x1;
   }
 
-  struct StyleInformation {
-    optional char_string imageUrl = 0;
-    optional char_string color = 1;
-    optional Dimension size = 2;
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
   }
 
-  struct Dimension {
-    double width = 0;
-    double height = 1;
-    MetricTypeEnum metric = 2;
+  bitmap SceneFeatures : BITMAP32 {
+    kSceneNames = 0x1;
   }
 
-  readonly attribute CHAR_STRING acceptHeader[] = 0;
-  attribute bitmap32 supportedStreamingProtocols = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute boolean onOff = 0;
+  readonly attribute boolean globalSceneControl = 16384;
+  attribute int16u onTime = 16385;
+  attribute int16u offWaitTime = 16386;
+  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct LaunchContentRequest {
-    ContentSearch search = 0;
-    BOOLEAN autoPlay = 1;
-    optional CHAR_STRING data = 2;
-  }
-
-  request struct LaunchURLRequest {
-    CHAR_STRING contentURL = 0;
-    optional CHAR_STRING displayString = 1;
-    optional BrandingInformation brandingInformation = 2;
+  request struct OffWithEffectRequest {
+    OnOffEffectIdentifier effectId = 0;
+    OnOffDelayedAllOffEffectVariant effectVariant = 1;
   }
 
-  response struct LaunchResponse = 2 {
-    ContentLaunchStatusEnum status = 0;
-    optional CHAR_STRING data = 1;
+  request struct OnWithTimedOffRequest {
+    OnOffControl onOffControl = 0;
+    int16u onTime = 1;
+    int16u offWaitTime = 2;
   }
 
-  command LaunchContent(LaunchContentRequest): LaunchResponse = 0;
-  command LaunchURL(LaunchURLRequest): LaunchResponse = 1;
+  command Off(): DefaultSuccess = 0;
+  command On(): DefaultSuccess = 1;
+  command Toggle(): DefaultSuccess = 2;
+  command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64;
+  command OnWithRecallGlobalScene(): DefaultSuccess = 65;
+  command OnWithTimedOff(OnWithTimedOffRequest): DefaultSuccess = 66;
 }
 
-server cluster ContentLauncher = 1290 {
-  enum ContentLaunchStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kUrlNotAvailable = 1;
-    kAuthFailed = 2;
-  }
-
-  enum MetricTypeEnum : ENUM8 {
-    kPixels = 0;
-    kPercentage = 1;
-  }
-
-  enum ParameterEnum : ENUM8 {
-    kActor = 0;
-    kChannel = 1;
-    kCharacter = 2;
-    kDirector = 3;
-    kEvent = 4;
-    kFranchise = 5;
-    kGenre = 6;
-    kLeague = 7;
-    kPopularity = 8;
-    kProvider = 9;
-    kSport = 10;
-    kSportsTeam = 11;
-    kType = 12;
-  }
-
-  bitmap ContentLauncherFeature : BITMAP32 {
-    kContentSearch = 0x1;
-    kURLPlayback = 0x2;
+server cluster LevelControl = 8 {
+  enum MoveMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
   }
 
-  bitmap SupportedStreamingProtocol : BITMAP32 {
-    kDash = 0x1;
-    kHls = 0x2;
+  enum StepMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
   }
 
-  struct ContentSearch {
-    Parameter parameterList[] = 0;
+  bitmap LevelControlFeature : BITMAP32 {
+    kOnOff = 0x1;
+    kLighting = 0x2;
+    kFrequency = 0x4;
   }
 
-  struct Parameter {
-    ParameterEnum type = 0;
-    char_string value = 1;
-    optional AdditionalInfo externalIDList[] = 2;
-  }
+  readonly attribute int8u currentLevel = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  struct AdditionalInfo {
-    char_string name = 0;
-    char_string value = 1;
+  request struct MoveToLevelRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
   }
 
-  struct BrandingInformation {
-    char_string providerName = 0;
-    optional StyleInformation background = 1;
-    optional StyleInformation logo = 2;
-    optional StyleInformation progressBar = 3;
-    optional StyleInformation splash = 4;
-    optional StyleInformation waterMark = 5;
+  request struct MoveRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
   }
 
-  struct StyleInformation {
-    optional char_string imageUrl = 0;
-    optional char_string color = 1;
-    optional Dimension size = 2;
+  request struct StepRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionMask = 3;
+    BITMAP8 optionOverride = 4;
   }
 
-  struct Dimension {
-    double width = 0;
-    double height = 1;
-    MetricTypeEnum metric = 2;
+  request struct StopRequest {
+    BITMAP8 optionMask = 0;
+    BITMAP8 optionOverride = 1;
   }
 
-  readonly attribute CHAR_STRING acceptHeader[] = 0;
-  attribute bitmap32 supportedStreamingProtocols = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct LaunchContentRequest {
-    ContentSearch search = 0;
-    BOOLEAN autoPlay = 1;
-    optional CHAR_STRING data = 2;
+  request struct MoveToLevelWithOnOffRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
   }
 
-  request struct LaunchURLRequest {
-    CHAR_STRING contentURL = 0;
-    optional CHAR_STRING displayString = 1;
-    optional BrandingInformation brandingInformation = 2;
+  request struct MoveWithOnOffRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
   }
 
-  response struct LaunchResponse = 2 {
-    ContentLaunchStatusEnum status = 0;
-    optional CHAR_STRING data = 1;
+  request struct StepWithOnOffRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
   }
 
-  command LaunchContent(LaunchContentRequest): LaunchResponse = 0;
-  command LaunchURL(LaunchURLRequest): LaunchResponse = 1;
+  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
+  command Move(MoveRequest): DefaultSuccess = 1;
+  command Step(StepRequest): DefaultSuccess = 2;
+  command Stop(StopRequest): DefaultSuccess = 3;
+  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
+  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
+  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
+  command StopWithOnOff(): DefaultSuccess = 7;
 }
 
 server cluster Descriptor = 29 {
@@ -553,65 +410,258 @@ server cluster Descriptor = 29 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
+server cluster BridgedActions = 37 {
+  enum ActionErrorEnum : ENUM8 {
+    kUnknown = 0;
+    kInterrupted = 1;
   }
 
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  enum ActionStateEnum : ENUM8 {
+    kInactive = 0;
+    kActive = 1;
+    kPaused = 2;
+    kDisabled = 3;
+  }
 
-  command ResetCounts(): DefaultSuccess = 0;
-}
+  enum ActionTypeEnum : ENUM8 {
+    kOther = 0;
+    kScene = 1;
+    kSequence = 2;
+    kAutomation = 3;
+    kException = 4;
+    kNotification = 5;
+    kAlarm = 6;
+  }
 
-server cluster FlowMeasurement = 1028 {
-  readonly attribute nullable int16u measuredValue = 0;
-  readonly attribute nullable int16u minMeasuredValue = 1;
-  readonly attribute nullable int16u maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  enum EndpointListTypeEnum : ENUM8 {
+    kOther = 0;
+    kRoom = 1;
+    kZone = 2;
+  }
 
-client cluster GeneralCommissioning = 48 {
-  enum CommissioningError : ENUM8 {
-    kOk = 0;
-    kValueOutsideRange = 1;
-    kInvalidAuthentication = 2;
-    kNoFailSafe = 3;
-    kBusyWithOtherAdmin = 4;
+  bitmap CommandBits : BITMAP16 {
+    kInstantAction = 0x1;
+    kInstantActionWithTransition = 0x2;
+    kStartAction = 0x4;
+    kStartActionWithDuration = 0x8;
+    kStopAction = 0x10;
+    kPauseAction = 0x20;
+    kPauseActionWithDuration = 0x40;
+    kResumeAction = 0x80;
+    kEnableAction = 0x100;
+    kEnableActionWithDuration = 0x200;
+    kDisableAction = 0x400;
+    kDisableActionWithDuration = 0x800;
   }
 
-  enum RegulatoryLocationType : ENUM8 {
-    kIndoor = 0;
-    kOutdoor = 1;
-    kIndoorOutdoor = 2;
+  struct ActionStruct {
+    int16u actionID = 0;
+    char_string<32> name = 1;
+    ActionTypeEnum type = 2;
+    int16u endpointListID = 3;
+    int16u supportedCommands = 4;
+    ActionStateEnum status = 5;
   }
 
-  struct BasicCommissioningInfo {
-    int16u failSafeExpiryLengthSeconds = 0;
-    int16u maxCumulativeFailsafeSeconds = 1;
+  struct EndpointListStruct {
+    int16u endpointListID = 0;
+    char_string<32> name = 1;
+    EndpointListTypeEnum type = 2;
+    endpoint_no endpoints[] = 3;
   }
 
-  attribute access(write: administer) int64u breadcrumb = 0;
+  info event StateChanged = 0 {
+    INT16U actionID = 0;
+    INT32U invokeID = 1;
+    ActionStateEnum newState = 2;
+  }
+
+  info event ActionFailed = 1 {
+    INT16U actionID = 0;
+    INT32U invokeID = 1;
+    ActionStateEnum newState = 2;
+    ActionErrorEnum error = 3;
+  }
+
+  readonly attribute ActionStruct actionList[] = 0;
+  readonly attribute EndpointListStruct endpointList[] = 1;
+  readonly attribute long_char_string<512> setupUrl = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Basic = 40 {
+  struct CapabilityMinimaStruct {
+    int16u caseSessionsPerFabric = 0;
+    int16u subscriptionsPerFabric = 1;
+  }
+
+  critical event StartUp = 0 {
+    INT32U softwareVersion = 0;
+  }
+
+  critical event ShutDown = 1 {
+  }
+
+  info event Leave = 2 {
+  }
+
+  info event ReachableChanged = 3 {
+    boolean reachableNewValue = 0;
+  }
+
+  readonly attribute int16u dataModelRevision = 0;
+  readonly attribute char_string<32> vendorName = 1;
+  readonly attribute vendor_id vendorID = 2;
+  readonly attribute char_string<32> productName = 3;
+  readonly attribute int16u productID = 4;
+  attribute access(write: manage) char_string<32> nodeLabel = 5;
+  attribute access(write: administer) char_string<2> location = 6;
+  readonly attribute int16u hardwareVersion = 7;
+  readonly attribute char_string<64> hardwareVersionString = 8;
+  readonly attribute int32u softwareVersion = 9;
+  readonly attribute char_string<64> softwareVersionString = 10;
+  readonly attribute char_string<16> manufacturingDate = 11;
+  readonly attribute char_string<32> partNumber = 12;
+  readonly attribute long_char_string<256> productURL = 13;
+  readonly attribute char_string<64> productLabel = 14;
+  readonly attribute char_string<32> serialNumber = 15;
+  attribute access(write: manage) boolean localConfigDisabled = 16;
+  readonly attribute boolean reachable = 17;
+  readonly attribute char_string<32> uniqueID = 18;
+  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster PowerSourceConfiguration = 46 {
+  readonly attribute INT8U sources[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster PowerSource = 47 {
+  enum BatChargeFaultType : ENUM8 {
+    kUnspecfied = 0;
+    kAmbientTooHot = 1;
+    kAmbientTooCold = 2;
+    kBatteryTooHot = 3;
+    kBatteryTooCold = 4;
+    kBatteryAbsent = 5;
+    kBatteryOverVoltage = 6;
+    kBatteryUnderVoltage = 7;
+    kChargerOverVoltage = 8;
+    kChargerUnderVoltage = 9;
+    kSafetyTimeout = 10;
+  }
+
+  enum BatChargeLevel : ENUM8 {
+    kOk = 0;
+    kWarning = 1;
+    kCritical = 2;
+  }
+
+  enum BatChargeState : ENUM8 {
+    kUnknown = 0;
+    kIsCharging = 1;
+    kIsAtFullCharge = 2;
+    kIsNotCharging = 3;
+  }
+
+  enum BatFaultType : ENUM8 {
+    kUnspecfied = 0;
+    kOverTemp = 1;
+    kUnderTemp = 2;
+  }
+
+  enum BatReplaceability : ENUM8 {
+    kUnspecified = 0;
+    kNotReplaceable = 1;
+    kUserReplaceable = 2;
+    kFactoryReplaceable = 3;
+  }
+
+  enum PowerSourceStatus : ENUM8 {
+    kUnspecfied = 0;
+    kActive = 1;
+    kStandby = 2;
+    kUnavailable = 3;
+  }
+
+  enum WiredCurrentType : ENUM8 {
+    kAc = 0;
+    kDc = 1;
+  }
+
+  enum WiredFaultType : ENUM8 {
+    kUnspecfied = 0;
+    kOverVoltage = 1;
+    kUnderVoltage = 2;
+  }
+
+  bitmap PowerSourceFeature : BITMAP32 {
+    kWired = 0x1;
+    kBattery = 0x2;
+    kRechargeable = 0x4;
+    kReplaceable = 0x8;
+  }
+
+  readonly attribute enum8 status = 0;
+  readonly attribute int8u order = 1;
+  readonly attribute char_string<60> description = 2;
+  readonly attribute int32u wiredAssessedInputVoltage = 3;
+  readonly attribute int16u wiredAssessedInputFrequency = 4;
+  readonly attribute enum8 wiredCurrentType = 5;
+  readonly attribute int32u wiredAssessedCurrent = 6;
+  readonly attribute int32u wiredNominalVoltage = 7;
+  readonly attribute int32u wiredMaximumCurrent = 8;
+  readonly attribute boolean wiredPresent = 9;
+  readonly attribute ENUM8 activeWiredFaults[] = 10;
+  readonly attribute int32u batteryVoltage = 11;
+  readonly attribute int8u batteryPercentRemaining = 12;
+  readonly attribute int32u batteryTimeRemaining = 13;
+  readonly attribute enum8 batteryChargeLevel = 14;
+  readonly attribute boolean batteryReplacementNeeded = 15;
+  readonly attribute enum8 batteryReplaceability = 16;
+  readonly attribute boolean batteryPresent = 17;
+  readonly attribute ENUM8 activeBatteryFaults[] = 18;
+  readonly attribute char_string<60> batteryReplacementDescription = 19;
+  readonly attribute int32u batteryCommonDesignation = 20;
+  readonly attribute char_string<20> batteryANSIDesignation = 21;
+  readonly attribute char_string<20> batteryIECDesignation = 22;
+  readonly attribute int32u batteryApprovedChemistry = 23;
+  readonly attribute int32u batteryCapacity = 24;
+  readonly attribute int8u batteryQuantity = 25;
+  readonly attribute enum8 batteryChargeState = 26;
+  readonly attribute int32u batteryTimeToFullCharge = 27;
+  readonly attribute boolean batteryFunctionalWhileCharging = 28;
+  readonly attribute int32u batteryChargingCurrent = 29;
+  readonly attribute ENUM8 activeBatteryChargeFaults[] = 30;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+client cluster GeneralCommissioning = 48 {
+  enum CommissioningError : ENUM8 {
+    kOk = 0;
+    kValueOutsideRange = 1;
+    kInvalidAuthentication = 2;
+    kNoFailSafe = 3;
+    kBusyWithOtherAdmin = 4;
+  }
+
+  enum RegulatoryLocationType : ENUM8 {
+    kIndoor = 0;
+    kOutdoor = 1;
+    kIndoorOutdoor = 2;
+  }
+
+  struct BasicCommissioningInfo {
+    int16u failSafeExpiryLengthSeconds = 0;
+    int16u maxCumulativeFailsafeSeconds = 1;
+  }
+
+  attribute access(write: administer) int64u breadcrumb = 0;
   readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
   readonly attribute RegulatoryLocationType regulatoryConfig = 2;
   readonly attribute RegulatoryLocationType locationCapability = 3;
@@ -700,47 +750,181 @@ server cluster GeneralCommissioning = 48 {
   command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
 }
 
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatus : ENUM8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
   }
 
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
+  enum WiFiBand : ENUM8 {
+    k2g4 = 0;
+    k3g65 = 1;
+    k5g = 2;
+    k6g = 3;
+    k60g = 4;
   }
 
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
+  bitmap NetworkCommissioningFeature : BITMAP32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
   }
 
-  enum NetworkFaultType : ENUM8 {
-    kUnspecified = 0;
-    kHardwareFailure = 1;
-    kNetworkJammed = 2;
-    kConnectionFailed = 3;
+  bitmap WiFiSecurity : BITMAP8 {
+    kUnencrypted = 0x1;
+    kWepPersonal = 0x2;
+    kWpaPersonal = 0x4;
+    kWpa2Personal = 0x8;
+    kWpa3Personal = 0x10;
   }
 
-  enum RadioFaultType : ENUM8 {
+  struct NetworkInfo {
+    octet_string<32> networkID = 0;
+    boolean connected = 1;
+  }
+
+  struct WiFiInterfaceScanResult {
+    WiFiSecurity security = 0;
+    octet_string<32> ssid = 1;
+    octet_string<6> bssid = 2;
+    int16u channel = 3;
+    WiFiBand wiFiBand = 4;
+    int8s rssi = 5;
+  }
+
+  struct ThreadInterfaceScanResult {
+    int16u panId = 0;
+    int64u extendedPanId = 1;
+    char_string<16> networkName = 2;
+    int16u channel = 3;
+    int8u version = 4;
+    octet_string<8> extendedAddress = 5;
+    int8s rssi = 6;
+    int8u lqi = 7;
+  }
+
+  readonly attribute access(read: administer) int8u maxNetworks = 0;
+  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
+  readonly attribute int8u scanMaxTimeSeconds = 2;
+  readonly attribute int8u connectMaxTimeSeconds = 3;
+  attribute access(write: administer) boolean interfaceEnabled = 4;
+  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
+  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
+  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ScanNetworksRequest {
+    optional nullable OCTET_STRING ssid = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct AddOrUpdateWiFiNetworkRequest {
+    OCTET_STRING ssid = 0;
+    OCTET_STRING credentials = 1;
+    optional INT64U breadcrumb = 2;
+  }
+
+  request struct AddOrUpdateThreadNetworkRequest {
+    OCTET_STRING operationalDataset = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct RemoveNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct ConnectNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct ReorderNetworkRequest {
+    OCTET_STRING networkID = 0;
+    INT8U networkIndex = 1;
+    optional INT64U breadcrumb = 2;
+  }
+
+  response struct ScanNetworksResponse = 1 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
+    optional ThreadInterfaceScanResult threadScanResults[] = 3;
+  }
+
+  response struct NetworkConfigResponse = 5 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional INT8U networkIndex = 2;
+  }
+
+  response struct ConnectNetworkResponse = 7 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    nullable INT32S errorValue = 2;
+  }
+
+  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
+  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
+  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
+  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
+  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
+  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+}
+
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
+  }
+
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
+  }
+
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
+  }
+
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
+  }
+
+  enum RadioFaultType : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -800,746 +984,241 @@ server cluster GeneralDiagnostics = 51 {
   command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
-server cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AddGroupRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
-  }
-
-  request struct ViewGroupRequest {
-    group_id groupId = 0;
+server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
   }
 
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
+  struct ThreadMetrics {
+    int64u id = 0;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
-  request struct RemoveGroupRequest {
-    group_id groupId = 0;
+  info event SoftwareFault = 0 {
+    SoftwareFaultStruct softwareFault = 0;
   }
 
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
-  }
+  readonly attribute ThreadMetrics threadMetrics[] = 0;
+  readonly attribute int64u currentHeapFree = 1;
+  readonly attribute int64u currentHeapUsed = 2;
+  readonly attribute int64u currentHeapHighWatermark = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  response struct AddGroupResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-  }
+  command ResetWatermarks(): DefaultSuccess = 0;
+}
 
-  response struct ViewGroupResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    CHAR_STRING groupName = 2;
+server cluster WiFiNetworkDiagnostics = 54 {
+  enum AssociationFailureCause : ENUM8 {
+    kUnknown = 0;
+    kAssociationFailed = 1;
+    kAuthenticationFailed = 2;
+    kSsidNotFound = 3;
   }
 
-  response struct GetGroupMembershipResponse = 2 {
-    nullable INT8U capacity = 0;
-    group_id groupList[] = 1;
+  enum SecurityType : ENUM8 {
+    kUnspecified = 0;
+    kNone = 1;
+    kWep = 2;
+    kWpa = 3;
+    kWpa2 = 4;
+    kWpa3 = 5;
   }
 
-  response struct RemoveGroupResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  enum WiFiConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
-}
-
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
+  enum WiFiVersionType : ENUM8 {
+    k80211a = 0;
+    k80211b = 1;
+    k80211g = 2;
+    k80211n = 3;
+    k80211ac = 4;
+    k80211ax = 5;
   }
 
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
+  info event Disconnection = 0 {
+    INT16U reasonCode = 0;
   }
 
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
+  info event AssociationFailure = 1 {
+    AssociationFailureCause associationFailure = 0;
+    INT16U status = 1;
   }
 
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
+  info event ConnectionStatus = 2 {
+    WiFiConnectionStatus connectionStatus = 0;
   }
 
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
-}
-
-server cluster IlluminanceMeasurement = 1024 {
-  enum LightSensorType : ENUM8 {
-    kPhotodiode = 0;
-    kCmos = 1;
-  }
-
-  readonly attribute nullable int16u measuredValue = 0;
-  readonly attribute nullable int16u minMeasuredValue = 1;
-  readonly attribute nullable int16u maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
-  readonly attribute nullable enum8 lightSensorType = 4;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-client cluster KeypadInput = 1289 {
-  enum CecKeyCode : ENUM8 {
-    kSelect = 0;
-    kUp = 1;
-    kDown = 2;
-    kLeft = 3;
-    kRight = 4;
-    kRightUp = 5;
-    kRightDown = 6;
-    kLeftUp = 7;
-    kLeftDown = 8;
-    kRootMenu = 9;
-    kSetupMenu = 10;
-    kContentsMenu = 11;
-    kFavoriteMenu = 12;
-    kExit = 13;
-    kMediaTopMenu = 16;
-    kMediaContextSensitiveMenu = 17;
-    kNumberEntryMode = 29;
-    kNumber11 = 30;
-    kNumber12 = 31;
-    kNumber0OrNumber10 = 32;
-    kNumbers1 = 33;
-    kNumbers2 = 34;
-    kNumbers3 = 35;
-    kNumbers4 = 36;
-    kNumbers5 = 37;
-    kNumbers6 = 38;
-    kNumbers7 = 39;
-    kNumbers8 = 40;
-    kNumbers9 = 41;
-    kDot = 42;
-    kEnter = 43;
-    kClear = 44;
-    kNextFavorite = 47;
-    kChannelUp = 48;
-    kChannelDown = 49;
-    kPreviousChannel = 50;
-    kSoundSelect = 51;
-    kInputSelect = 52;
-    kDisplayInformation = 53;
-    kHelp = 54;
-    kPageUp = 55;
-    kPageDown = 56;
-    kPower = 64;
-    kVolumeUp = 65;
-    kVolumeDown = 66;
-    kMute = 67;
-    kPlay = 68;
-    kStop = 69;
-    kPause = 70;
-    kRecord = 71;
-    kRewind = 72;
-    kFastForward = 73;
-    kEject = 74;
-    kForward = 75;
-    kBackward = 76;
-    kStopRecord = 77;
-    kPauseRecord = 78;
-    kReserved = 79;
-    kAngle = 80;
-    kSubPicture = 81;
-    kVideoOnDemand = 82;
-    kElectronicProgramGuide = 83;
-    kTimerProgramming = 84;
-    kInitialConfiguration = 85;
-    kSelectBroadcastType = 86;
-    kSelectSoundPresentation = 87;
-    kPlayFunction = 96;
-    kPausePlayFunction = 97;
-    kRecordFunction = 98;
-    kPauseRecordFunction = 99;
-    kStopFunction = 100;
-    kMuteFunction = 101;
-    kRestoreVolumeFunction = 102;
-    kTuneFunction = 103;
-    kSelectMediaFunction = 104;
-    kSelectAvInputFunction = 105;
-    kSelectAudioInputFunction = 106;
-    kPowerToggleFunction = 107;
-    kPowerOffFunction = 108;
-    kPowerOnFunction = 109;
-    kF1Blue = 113;
-    kF2Red = 114;
-    kF3Green = 115;
-    kF4Yellow = 116;
-    kF5 = 117;
-    kData = 118;
-  }
-
-  enum KeypadInputStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kUnsupportedKey = 1;
-    kInvalidKeyInCurrentState = 2;
-  }
-
-  bitmap KeypadInputFeature : BITMAP32 {
-    kNavigationKeyCodes = 0x1;
-    kLocationKeys = 0x2;
-    kNumberKeys = 0x4;
-  }
-
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct SendKeyRequest {
-    CecKeyCode keyCode = 0;
-  }
-
-  response struct SendKeyResponse = 1 {
-    KeypadInputStatusEnum status = 0;
-  }
-
-  command SendKey(SendKeyRequest): SendKeyResponse = 0;
-}
-
-server cluster KeypadInput = 1289 {
-  enum CecKeyCode : ENUM8 {
-    kSelect = 0;
-    kUp = 1;
-    kDown = 2;
-    kLeft = 3;
-    kRight = 4;
-    kRightUp = 5;
-    kRightDown = 6;
-    kLeftUp = 7;
-    kLeftDown = 8;
-    kRootMenu = 9;
-    kSetupMenu = 10;
-    kContentsMenu = 11;
-    kFavoriteMenu = 12;
-    kExit = 13;
-    kMediaTopMenu = 16;
-    kMediaContextSensitiveMenu = 17;
-    kNumberEntryMode = 29;
-    kNumber11 = 30;
-    kNumber12 = 31;
-    kNumber0OrNumber10 = 32;
-    kNumbers1 = 33;
-    kNumbers2 = 34;
-    kNumbers3 = 35;
-    kNumbers4 = 36;
-    kNumbers5 = 37;
-    kNumbers6 = 38;
-    kNumbers7 = 39;
-    kNumbers8 = 40;
-    kNumbers9 = 41;
-    kDot = 42;
-    kEnter = 43;
-    kClear = 44;
-    kNextFavorite = 47;
-    kChannelUp = 48;
-    kChannelDown = 49;
-    kPreviousChannel = 50;
-    kSoundSelect = 51;
-    kInputSelect = 52;
-    kDisplayInformation = 53;
-    kHelp = 54;
-    kPageUp = 55;
-    kPageDown = 56;
-    kPower = 64;
-    kVolumeUp = 65;
-    kVolumeDown = 66;
-    kMute = 67;
-    kPlay = 68;
-    kStop = 69;
-    kPause = 70;
-    kRecord = 71;
-    kRewind = 72;
-    kFastForward = 73;
-    kEject = 74;
-    kForward = 75;
-    kBackward = 76;
-    kStopRecord = 77;
-    kPauseRecord = 78;
-    kReserved = 79;
-    kAngle = 80;
-    kSubPicture = 81;
-    kVideoOnDemand = 82;
-    kElectronicProgramGuide = 83;
-    kTimerProgramming = 84;
-    kInitialConfiguration = 85;
-    kSelectBroadcastType = 86;
-    kSelectSoundPresentation = 87;
-    kPlayFunction = 96;
-    kPausePlayFunction = 97;
-    kRecordFunction = 98;
-    kPauseRecordFunction = 99;
-    kStopFunction = 100;
-    kMuteFunction = 101;
-    kRestoreVolumeFunction = 102;
-    kTuneFunction = 103;
-    kSelectMediaFunction = 104;
-    kSelectAvInputFunction = 105;
-    kSelectAudioInputFunction = 106;
-    kPowerToggleFunction = 107;
-    kPowerOffFunction = 108;
-    kPowerOnFunction = 109;
-    kF1Blue = 113;
-    kF2Red = 114;
-    kF3Green = 115;
-    kF4Yellow = 116;
-    kF5 = 117;
-    kData = 118;
-  }
-
-  enum KeypadInputStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kUnsupportedKey = 1;
-    kInvalidKeyInCurrentState = 2;
-  }
-
-  bitmap KeypadInputFeature : BITMAP32 {
-    kNavigationKeyCodes = 0x1;
-    kLocationKeys = 0x2;
-    kNumberKeys = 0x4;
-  }
-
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct SendKeyRequest {
-    CecKeyCode keyCode = 0;
-  }
-
-  response struct SendKeyResponse = 1 {
-    KeypadInputStatusEnum status = 0;
-  }
-
-  command SendKey(SendKeyRequest): SendKeyResponse = 0;
-}
-
-server cluster LevelControl = 8 {
-  enum MoveMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
-  }
-
-  enum StepMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
-  }
-
-  bitmap LevelControlFeature : BITMAP32 {
-    kOnOff = 0x1;
-    kLighting = 0x2;
-    kFrequency = 0x4;
-  }
-
-  readonly attribute int8u currentLevel = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct MoveToLevelRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
-  }
-
-  request struct MoveRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
-  }
-
-  request struct StepRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionMask = 3;
-    BITMAP8 optionOverride = 4;
-  }
-
-  request struct StopRequest {
-    BITMAP8 optionMask = 0;
-    BITMAP8 optionOverride = 1;
-  }
-
-  request struct MoveToLevelWithOnOffRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
-  }
-
-  request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
-  }
-
-  request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
-  }
-
-  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
-  command Move(MoveRequest): DefaultSuccess = 1;
-  command Step(StepRequest): DefaultSuccess = 2;
-  command Stop(StopRequest): DefaultSuccess = 3;
-  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
-  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
-  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
-  command StopWithOnOff(): DefaultSuccess = 7;
-}
-
-client cluster ModeSelect = 80 {
-  bitmap ModeSelectFeature : BITMAP32 {
-    kDeponoff = 0x1;
-  }
-
-  struct ModeOptionStruct {
-    char_string<32> label = 0;
-    int8u mode = 1;
-    SemanticTag semanticTags[] = 2;
-  }
-
-  struct SemanticTag {
-    enum16 mfgCode = 0;
-    enum16 value = 1;
-  }
-
-  readonly attribute char_string<32> description = 0;
-  readonly attribute nullable enum16 standardNamespace = 1;
-  readonly attribute ModeOptionStruct supportedModes[] = 2;
-  readonly attribute int8u currentMode = 3;
-  attribute nullable int8u startUpMode = 4;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct ChangeToModeRequest {
-    INT8U newMode = 0;
-  }
-
-  command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0;
-}
-
-server cluster ModeSelect = 80 {
-  bitmap ModeSelectFeature : BITMAP32 {
-    kDeponoff = 0x1;
-  }
-
-  struct ModeOptionStruct {
-    char_string<32> label = 0;
-    int8u mode = 1;
-    SemanticTag semanticTags[] = 2;
-  }
-
-  struct SemanticTag {
-    enum16 mfgCode = 0;
-    enum16 value = 1;
-  }
-
-  readonly attribute char_string<32> description = 0;
-  readonly attribute nullable enum16 standardNamespace = 1;
-  readonly attribute ModeOptionStruct supportedModes[] = 2;
-  readonly attribute int8u currentMode = 3;
-  attribute nullable int8u startUpMode = 4;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute nullable octet_string<6> bssid = 0;
+  readonly attribute nullable SecurityType securityType = 1;
+  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
+  readonly attribute nullable int16u channelNumber = 3;
+  readonly attribute nullable int8s rssi = 4;
+  readonly attribute int32u beaconLostCount = 5;
+  readonly attribute int32u beaconRxCount = 6;
+  readonly attribute int32u packetMulticastRxCount = 7;
+  readonly attribute int32u packetMulticastTxCount = 8;
+  readonly attribute int32u packetUnicastRxCount = 9;
+  readonly attribute int32u packetUnicastTxCount = 10;
+  readonly attribute int64u currentMaxRate = 11;
+  readonly attribute int64u overrunCount = 12;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct ChangeToModeRequest {
-    INT8U newMode = 0;
-  }
-
-  command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0;
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
-server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatus : ENUM8 {
-    kSuccess = 0;
-    kOutOfRange = 1;
-    kBoundsExceeded = 2;
-    kNetworkIDNotFound = 3;
-    kDuplicateNetworkID = 4;
-    kNetworkNotFound = 5;
-    kRegulatoryError = 6;
-    kAuthFailure = 7;
-    kUnsupportedSecurity = 8;
-    kOtherConnectionFailure = 9;
-    kIPV6Failed = 10;
-    kIPBindFailed = 11;
-    kUnknownError = 12;
-  }
-
-  enum WiFiBand : ENUM8 {
-    k2g4 = 0;
-    k3g65 = 1;
-    k5g = 2;
-    k6g = 3;
-    k60g = 4;
-  }
-
-  bitmap NetworkCommissioningFeature : BITMAP32 {
-    kWiFiNetworkInterface = 0x1;
-    kThreadNetworkInterface = 0x2;
-    kEthernetNetworkInterface = 0x4;
-  }
-
-  bitmap WiFiSecurity : BITMAP8 {
-    kUnencrypted = 0x1;
-    kWepPersonal = 0x2;
-    kWpaPersonal = 0x4;
-    kWpa2Personal = 0x8;
-    kWpa3Personal = 0x10;
-  }
-
-  struct NetworkInfo {
-    octet_string<32> networkID = 0;
-    boolean connected = 1;
-  }
-
-  struct WiFiInterfaceScanResult {
-    WiFiSecurity security = 0;
-    octet_string<32> ssid = 1;
-    octet_string<6> bssid = 2;
-    int16u channel = 3;
-    WiFiBand wiFiBand = 4;
-    int8s rssi = 5;
-  }
-
-  struct ThreadInterfaceScanResult {
-    int16u panId = 0;
-    int64u extendedPanId = 1;
-    char_string<16> networkName = 2;
-    int16u channel = 3;
-    int8u version = 4;
-    octet_string<8> extendedAddress = 5;
-    int8s rssi = 6;
-    int8u lqi = 7;
-  }
-
-  readonly attribute access(read: administer) int8u maxNetworks = 0;
-  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
-  readonly attribute int8u scanMaxTimeSeconds = 2;
-  readonly attribute int8u connectMaxTimeSeconds = 3;
-  attribute access(write: administer) boolean interfaceEnabled = 4;
-  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
-  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
-  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct ScanNetworksRequest {
-    optional nullable OCTET_STRING ssid = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct AddOrUpdateWiFiNetworkRequest {
-    OCTET_STRING ssid = 0;
-    OCTET_STRING credentials = 1;
-    optional INT64U breadcrumb = 2;
-  }
-
-  request struct AddOrUpdateThreadNetworkRequest {
-    OCTET_STRING operationalDataset = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct RemoveNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct ConnectNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct ReorderNetworkRequest {
-    OCTET_STRING networkID = 0;
-    INT8U networkIndex = 1;
-    optional INT64U breadcrumb = 2;
-  }
-
-  response struct ScanNetworksResponse = 1 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
-    optional ThreadInterfaceScanResult threadScanResults[] = 3;
-  }
-
-  response struct NetworkConfigResponse = 5 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional INT8U networkIndex = 2;
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
   }
 
-  response struct ConnectNetworkResponse = 7 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    nullable INT32S errorValue = 2;
-  }
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
-  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
-  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
-  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
-  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
-  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
-client cluster OnOff = 6 {
-  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
-    kFadeToOffIn0p8Seconds = 0;
-    kNoFade = 1;
-    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
+client cluster Switch = 59 {
+  info event SwitchLatched = 0 {
+    INT8U newPosition = 0;
   }
 
-  enum OnOffDyingLightEffectVariant : ENUM8 {
-    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
+  info event InitialPress = 1 {
+    INT8U newPosition = 0;
   }
 
-  enum OnOffEffectIdentifier : ENUM8 {
-    kDelayedAllOff = 0;
-    kDyingLight = 1;
+  info event LongPress = 2 {
+    INT8U newPosition = 0;
   }
 
-  enum OnOffStartUpOnOff : ENUM8 {
-    kOff = 0;
-    kOn = 1;
-    kTogglePreviousOnOff = 2;
+  info event ShortRelease = 3 {
+    INT8U previousPosition = 0;
   }
 
-  bitmap OnOffControl : BITMAP8 {
-    kAcceptOnlyWhenOn = 0x1;
+  info event LongRelease = 4 {
+    INT8U previousPosition = 0;
   }
 
-  bitmap OnOffFeature : BITMAP32 {
-    kLighting = 0x1;
+  info event MultiPressOngoing = 5 {
+    INT8U newPosition = 0;
+    INT8U currentNumberOfPressesCounted = 1;
   }
 
-  bitmap SceneFeatures : BITMAP32 {
-    kSceneNames = 0x1;
+  info event MultiPressComplete = 6 {
+    INT8U newPosition = 0;
+    INT8U totalNumberOfPressesCounted = 1;
   }
 
-  readonly attribute boolean onOff = 0;
-  readonly attribute boolean globalSceneControl = 16384;
-  attribute int16u onTime = 16385;
-  attribute int16u offWaitTime = 16386;
-  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
+  readonly attribute int8u numberOfPositions = 0;
+  readonly attribute int8u currentPosition = 1;
+  readonly attribute int8u multiPressMax = 2;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct OffWithEffectRequest {
-    OnOffEffectIdentifier effectId = 0;
-    OnOffDelayedAllOffEffectVariant effectVariant = 1;
+server cluster Switch = 59 {
+  info event SwitchLatched = 0 {
+    INT8U newPosition = 0;
   }
 
-  request struct OnWithTimedOffRequest {
-    OnOffControl onOffControl = 0;
-    int16u onTime = 1;
-    int16u offWaitTime = 2;
+  info event InitialPress = 1 {
+    INT8U newPosition = 0;
   }
 
-  command Off(): DefaultSuccess = 0;
-  command On(): DefaultSuccess = 1;
-  command Toggle(): DefaultSuccess = 2;
-  command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64;
-  command OnWithRecallGlobalScene(): DefaultSuccess = 65;
-  command OnWithTimedOff(OnWithTimedOffRequest): DefaultSuccess = 66;
-}
-
-server cluster OnOff = 6 {
-  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
-    kFadeToOffIn0p8Seconds = 0;
-    kNoFade = 1;
-    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
+  info event LongPress = 2 {
+    INT8U newPosition = 0;
   }
 
-  enum OnOffDyingLightEffectVariant : ENUM8 {
-    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
+  info event ShortRelease = 3 {
+    INT8U previousPosition = 0;
   }
 
-  enum OnOffEffectIdentifier : ENUM8 {
-    kDelayedAllOff = 0;
-    kDyingLight = 1;
+  info event LongRelease = 4 {
+    INT8U previousPosition = 0;
   }
 
-  enum OnOffStartUpOnOff : ENUM8 {
-    kOff = 0;
-    kOn = 1;
-    kTogglePreviousOnOff = 2;
+  info event MultiPressOngoing = 5 {
+    INT8U newPosition = 0;
+    INT8U currentNumberOfPressesCounted = 1;
   }
 
-  bitmap OnOffControl : BITMAP8 {
-    kAcceptOnlyWhenOn = 0x1;
+  info event MultiPressComplete = 6 {
+    INT8U newPosition = 0;
+    INT8U totalNumberOfPressesCounted = 1;
   }
 
-  bitmap OnOffFeature : BITMAP32 {
-    kLighting = 0x1;
+  readonly attribute int8u numberOfPositions = 0;
+  readonly attribute int8u currentPosition = 1;
+  readonly attribute int8u multiPressMax = 2;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
   }
 
-  bitmap SceneFeatures : BITMAP32 {
-    kSceneNames = 0x1;
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
   }
 
-  readonly attribute boolean onOff = 0;
-  readonly attribute boolean globalSceneControl = 16384;
-  attribute int16u onTime = 16385;
-  attribute int16u offWaitTime = 16386;
-  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct OffWithEffectRequest {
-    OnOffEffectIdentifier effectId = 0;
-    OnOffDelayedAllOffEffectVariant effectVariant = 1;
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
   }
 
-  request struct OnWithTimedOffRequest {
-    OnOffControl onOffControl = 0;
-    int16u onTime = 1;
-    int16u offWaitTime = 2;
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
   }
 
-  command Off(): DefaultSuccess = 0;
-  command On(): DefaultSuccess = 1;
-  command Toggle(): DefaultSuccess = 2;
-  command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64;
-  command OnWithRecallGlobalScene(): DefaultSuccess = 65;
-  command OnWithTimedOff(OnWithTimedOffRequest): DefaultSuccess = 66;
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
 client cluster OperationalCredentials = 62 {
@@ -1680,171 +1359,259 @@ server cluster OperationalCredentials = 62 {
     optional OCTET_STRING ICACValue = 1;
   }
 
-  request struct UpdateFabricLabelRequest {
-    CHAR_STRING label = 0;
+  request struct UpdateFabricLabelRequest {
+    CHAR_STRING label = 0;
+  }
+
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
+  }
+
+  request struct AddTrustedRootCertificateRequest {
+    OCTET_STRING rootCertificate = 0;
+  }
+
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
+  }
+
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
+  }
+
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
+  }
+
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
+  }
+
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
+}
+
+server cluster BooleanState = 69 {
+  info event StateChange = 0 {
+    boolean stateValue = 0;
+  }
+
+  readonly attribute boolean stateValue = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+client cluster ModeSelect = 80 {
+  bitmap ModeSelectFeature : BITMAP32 {
+    kDeponoff = 0x1;
+  }
+
+  struct ModeOptionStruct {
+    char_string<32> label = 0;
+    int8u mode = 1;
+    SemanticTag semanticTags[] = 2;
+  }
+
+  struct SemanticTag {
+    enum16 mfgCode = 0;
+    enum16 value = 1;
+  }
+
+  readonly attribute char_string<32> description = 0;
+  readonly attribute nullable enum16 standardNamespace = 1;
+  readonly attribute ModeOptionStruct supportedModes[] = 2;
+  readonly attribute int8u currentMode = 3;
+  attribute nullable int8u startUpMode = 4;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ChangeToModeRequest {
+    INT8U newMode = 0;
   }
 
-  request struct RemoveFabricRequest {
-    fabric_idx fabricIndex = 0;
-  }
+  command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0;
+}
 
-  request struct AddTrustedRootCertificateRequest {
-    OCTET_STRING rootCertificate = 0;
+server cluster ModeSelect = 80 {
+  bitmap ModeSelectFeature : BITMAP32 {
+    kDeponoff = 0x1;
   }
 
-  response struct AttestationResponse = 1 {
-    OCTET_STRING attestationElements = 0;
-    OCTET_STRING signature = 1;
+  struct ModeOptionStruct {
+    char_string<32> label = 0;
+    int8u mode = 1;
+    SemanticTag semanticTags[] = 2;
   }
 
-  response struct CertificateChainResponse = 3 {
-    OCTET_STRING certificate = 0;
+  struct SemanticTag {
+    enum16 mfgCode = 0;
+    enum16 value = 1;
   }
 
-  response struct CSRResponse = 5 {
-    OCTET_STRING NOCSRElements = 0;
-    OCTET_STRING attestationSignature = 1;
-  }
+  readonly attribute char_string<32> description = 0;
+  readonly attribute nullable enum16 standardNamespace = 1;
+  readonly attribute ModeOptionStruct supportedModes[] = 2;
+  readonly attribute int8u currentMode = 3;
+  attribute nullable int8u startUpMode = 4;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  response struct NOCResponse = 8 {
-    OperationalCertStatus statusCode = 0;
-    optional fabric_idx fabricIndex = 1;
-    optional CHAR_STRING debugText = 2;
+  request struct ChangeToModeRequest {
+    INT8U newMode = 0;
   }
 
-  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
-  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
-  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
-  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
-  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
-  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
-  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
-  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
+  command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0;
 }
 
-server cluster PowerSource = 47 {
-  enum BatChargeFaultType : ENUM8 {
-    kUnspecfied = 0;
-    kAmbientTooHot = 1;
-    kAmbientTooCold = 2;
-    kBatteryTooHot = 3;
-    kBatteryTooCold = 4;
-    kBatteryAbsent = 5;
-    kBatteryOverVoltage = 6;
-    kBatteryUnderVoltage = 7;
-    kChargerOverVoltage = 8;
-    kChargerUnderVoltage = 9;
-    kSafetyTimeout = 10;
-  }
-
-  enum BatChargeLevel : ENUM8 {
-    kOk = 0;
-    kWarning = 1;
-    kCritical = 2;
-  }
-
-  enum BatChargeState : ENUM8 {
-    kUnknown = 0;
-    kIsCharging = 1;
-    kIsAtFullCharge = 2;
-    kIsNotCharging = 3;
+server cluster WindowCovering = 258 {
+  enum EndProductType : ENUM8 {
+    kRollerShade = 0;
+    kRomanShade = 1;
+    kBalloonShade = 2;
+    kWovenWood = 3;
+    kPleatedShade = 4;
+    kCellularShade = 5;
+    kLayeredShade = 6;
+    kLayeredShade2D = 7;
+    kSheerShade = 8;
+    kTiltOnlyInteriorBlind = 9;
+    kInteriorBlind = 10;
+    kVerticalBlindStripCurtain = 11;
+    kInteriorVenetianBlind = 12;
+    kExteriorVenetianBlind = 13;
+    kLateralLeftCurtain = 14;
+    kLateralRightCurtain = 15;
+    kCentralCurtain = 16;
+    kRollerShutter = 17;
+    kExteriorVerticalScreen = 18;
+    kAwningTerracePatio = 19;
+    kAwningVerticalScreen = 20;
+    kTiltOnlyPergola = 21;
+    kSwingingShutter = 22;
+    kSlidingShutter = 23;
+    kUnknown = 255;
   }
 
-  enum BatFaultType : ENUM8 {
-    kUnspecfied = 0;
-    kOverTemp = 1;
-    kUnderTemp = 2;
+  enum Type : ENUM8 {
+    kRollerShade = 0;
+    kRollerShade2Motor = 1;
+    kRollerShadeExterior = 2;
+    kRollerShadeExterior2Motor = 3;
+    kDrapery = 4;
+    kAwning = 5;
+    kShutter = 6;
+    kTiltBlindTiltOnly = 7;
+    kTiltBlindLiftAndTilt = 8;
+    kProjectorScreen = 9;
+    kUnknown = 255;
   }
 
-  enum BatReplaceability : ENUM8 {
-    kUnspecified = 0;
-    kNotReplaceable = 1;
-    kUserReplaceable = 2;
-    kFactoryReplaceable = 3;
+  bitmap ConfigStatus : BITMAP8 {
+    kOperational = 0x1;
+    kOnlineReserved = 0x2;
+    kLiftMovementReversed = 0x4;
+    kLiftPositionAware = 0x8;
+    kTiltPositionAware = 0x10;
+    kLiftEncoderControlled = 0x20;
+    kTiltEncoderControlled = 0x40;
   }
 
-  enum PowerSourceStatus : ENUM8 {
-    kUnspecfied = 0;
-    kActive = 1;
-    kStandby = 2;
-    kUnavailable = 3;
+  bitmap Feature : BITMAP32 {
+    kLift = 0x1;
+    kTilt = 0x2;
+    kPositionAwareLift = 0x4;
+    kAbsolutePosition = 0x8;
+    kPositionAwareTilt = 0x10;
   }
 
-  enum WiredCurrentType : ENUM8 {
-    kAc = 0;
-    kDc = 1;
+  bitmap Mode : BITMAP8 {
+    kMotorDirectionReversed = 0x1;
+    kCalibrationMode = 0x2;
+    kMaintenanceMode = 0x4;
+    kLedFeedback = 0x8;
   }
 
-  enum WiredFaultType : ENUM8 {
-    kUnspecfied = 0;
-    kOverVoltage = 1;
-    kUnderVoltage = 2;
+  bitmap OperationalStatus : BITMAP8 {
+    kGlobal = 0x3;
+    kLift = 0xC;
+    kTilt = 0x30;
   }
 
-  bitmap PowerSourceFeature : BITMAP32 {
-    kWired = 0x1;
-    kBattery = 0x2;
-    kRechargeable = 0x4;
-    kReplaceable = 0x8;
+  bitmap SafetyStatus : BITMAP16 {
+    kRemoteLockout = 0x1;
+    kTamperDetection = 0x2;
+    kFailedCommunication = 0x4;
+    kPositionFailure = 0x8;
+    kThermalProtection = 0x10;
+    kObstacleDetected = 0x20;
+    kPower = 0x40;
+    kStopInput = 0x80;
+    kMotorJammed = 0x100;
+    kHardwareFailure = 0x200;
+    kManualOperation = 0x400;
+    kProtection = 0x800;
   }
 
-  readonly attribute enum8 status = 0;
-  readonly attribute int8u order = 1;
-  readonly attribute char_string<60> description = 2;
-  readonly attribute int32u wiredAssessedInputVoltage = 3;
-  readonly attribute int16u wiredAssessedInputFrequency = 4;
-  readonly attribute enum8 wiredCurrentType = 5;
-  readonly attribute int32u wiredAssessedCurrent = 6;
-  readonly attribute int32u wiredNominalVoltage = 7;
-  readonly attribute int32u wiredMaximumCurrent = 8;
-  readonly attribute boolean wiredPresent = 9;
-  readonly attribute ENUM8 activeWiredFaults[] = 10;
-  readonly attribute int32u batteryVoltage = 11;
-  readonly attribute int8u batteryPercentRemaining = 12;
-  readonly attribute int32u batteryTimeRemaining = 13;
-  readonly attribute enum8 batteryChargeLevel = 14;
-  readonly attribute boolean batteryReplacementNeeded = 15;
-  readonly attribute enum8 batteryReplaceability = 16;
-  readonly attribute boolean batteryPresent = 17;
-  readonly attribute ENUM8 activeBatteryFaults[] = 18;
-  readonly attribute char_string<60> batteryReplacementDescription = 19;
-  readonly attribute int32u batteryCommonDesignation = 20;
-  readonly attribute char_string<20> batteryANSIDesignation = 21;
-  readonly attribute char_string<20> batteryIECDesignation = 22;
-  readonly attribute int32u batteryApprovedChemistry = 23;
-  readonly attribute int32u batteryCapacity = 24;
-  readonly attribute int8u batteryQuantity = 25;
-  readonly attribute enum8 batteryChargeState = 26;
-  readonly attribute int32u batteryTimeToFullCharge = 27;
-  readonly attribute boolean batteryFunctionalWhileCharging = 28;
-  readonly attribute int32u batteryChargingCurrent = 29;
-  readonly attribute ENUM8 activeBatteryChargeFaults[] = 30;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster PowerSourceConfiguration = 46 {
-  readonly attribute INT8U sources[] = 0;
+  readonly attribute Type type = 0;
+  readonly attribute nullable int16u currentPositionLift = 3;
+  readonly attribute nullable int16u currentPositionTilt = 4;
+  readonly attribute ConfigStatus configStatus = 7;
+  readonly attribute nullable Percent currentPositionLiftPercentage = 8;
+  readonly attribute nullable Percent currentPositionTiltPercentage = 9;
+  readonly attribute OperationalStatus operationalStatus = 10;
+  readonly attribute nullable Percent100ths targetPositionLiftPercent100ths = 11;
+  readonly attribute nullable Percent100ths targetPositionTiltPercent100ths = 12;
+  readonly attribute EndProductType endProductType = 13;
+  readonly attribute nullable Percent100ths currentPositionLiftPercent100ths = 14;
+  readonly attribute nullable Percent100ths currentPositionTiltPercent100ths = 15;
+  readonly attribute int16u installedOpenLimitLift = 16;
+  readonly attribute int16u installedClosedLimitLift = 17;
+  readonly attribute int16u installedOpenLimitTilt = 18;
+  readonly attribute int16u installedClosedLimitTilt = 19;
+  attribute access(write: manage) Mode mode = 23;
+  readonly attribute SafetyStatus safetyStatus = 26;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster PressureMeasurement = 1027 {
-  bitmap PressureFeature : BITMAP32 {
-    kExt = 0x1;
+  request struct GoToLiftValueRequest {
+    INT16U liftValue = 0;
   }
 
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
-  readonly attribute nullable int16s scaledValue = 16;
-  readonly attribute nullable int16s minScaledValue = 17;
-  readonly attribute nullable int16s maxScaledValue = 18;
-  readonly attribute int16u scaledTolerance = 19;
-  readonly attribute int8s scale = 20;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  request struct GoToLiftPercentageRequest {
+    Percent100ths liftPercent100thsValue = 0;
+  }
+
+  request struct GoToTiltValueRequest {
+    INT16U tiltValue = 0;
+  }
+
+  request struct GoToTiltPercentageRequest {
+    Percent100ths tiltPercent100thsValue = 0;
+  }
+
+  command UpOrOpen(): DefaultSuccess = 0;
+  command DownOrClose(): DefaultSuccess = 1;
+  command StopMotion(): DefaultSuccess = 2;
+  command GoToLiftValue(GoToLiftValueRequest): DefaultSuccess = 4;
+  command GoToLiftPercentage(GoToLiftPercentageRequest): DefaultSuccess = 5;
+  command GoToTiltValue(GoToTiltValueRequest): DefaultSuccess = 7;
+  command GoToTiltPercentage(GoToTiltPercentageRequest): DefaultSuccess = 8;
 }
 
 server cluster PumpConfigurationAndControl = 512 {
@@ -1897,59 +1664,328 @@ server cluster PumpConfigurationAndControl = 512 {
   info event MotorTemperatureHigh = 6 {
   }
 
-  critical event PumpMotorFatalFailure = 7 {
+  critical event PumpMotorFatalFailure = 7 {
+  }
+
+  info event ElectronicTemperatureHigh = 8 {
+  }
+
+  critical event PumpBlocked = 9 {
+  }
+
+  info event SensorFailure = 10 {
+  }
+
+  info event ElectronicNonFatalFailure = 11 {
+  }
+
+  critical event ElectronicFatalFailure = 12 {
+  }
+
+  info event GeneralFault = 13 {
+  }
+
+  info event Leakage = 14 {
+  }
+
+  info event AirDetection = 15 {
+  }
+
+  info event TurbineOperation = 16 {
+  }
+
+  readonly attribute nullable int16s maxPressure = 0;
+  readonly attribute nullable int16u maxSpeed = 1;
+  readonly attribute nullable int16u maxFlow = 2;
+  readonly attribute nullable int16s minConstPressure = 3;
+  readonly attribute nullable int16s maxConstPressure = 4;
+  readonly attribute nullable int16s minCompPressure = 5;
+  readonly attribute nullable int16s maxCompPressure = 6;
+  readonly attribute nullable int16u minConstSpeed = 7;
+  readonly attribute nullable int16u maxConstSpeed = 8;
+  readonly attribute nullable int16u minConstFlow = 9;
+  readonly attribute nullable int16u maxConstFlow = 10;
+  readonly attribute nullable int16s minConstTemp = 11;
+  readonly attribute nullable int16s maxConstTemp = 12;
+  readonly attribute PumpStatus pumpStatus = 16;
+  readonly attribute PumpOperationMode effectiveOperationMode = 17;
+  readonly attribute PumpControlMode effectiveControlMode = 18;
+  readonly attribute nullable int16s capacity = 19;
+  readonly attribute nullable int16u speed = 20;
+  attribute access(write: manage) nullable int24u lifetimeRunningHours = 21;
+  readonly attribute nullable int24u power = 22;
+  attribute access(write: manage) nullable int32u lifetimeEnergyConsumed = 23;
+  attribute access(write: manage) PumpOperationMode operationMode = 32;
+  attribute access(write: manage) PumpControlMode controlMode = 33;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Thermostat = 513 {
+  enum SetpointAdjustMode : ENUM8 {
+    kHeatSetpoint = 0;
+    kCoolSetpoint = 1;
+    kHeatAndCoolSetpoints = 2;
+  }
+
+  enum ThermostatControlSequence : ENUM8 {
+    kCoolingOnly = 0;
+    kCoolingWithReheat = 1;
+    kHeatingOnly = 2;
+    kHeatingWithReheat = 3;
+    kCoolingAndHeating = 4;
+    kCoolingAndHeatingWithReheat = 5;
+  }
+
+  enum ThermostatRunningMode : ENUM8 {
+    kOff = 0;
+    kCool = 3;
+    kHeat = 4;
+  }
+
+  enum ThermostatSystemMode : ENUM8 {
+    kOff = 0;
+    kAuto = 1;
+    kCool = 3;
+    kHeat = 4;
+    kEmergencyHeating = 5;
+    kPrecooling = 6;
+    kFanOnly = 7;
+  }
+
+  bitmap DayOfWeek : BITMAP8 {
+    kSunday = 0x1;
+    kMonday = 0x2;
+    kTuesday = 0x4;
+    kWednesday = 0x8;
+    kThursday = 0x10;
+    kFriday = 0x20;
+    kSaturday = 0x40;
+    kAwayOrVacation = 0x80;
+  }
+
+  bitmap ModeForSequence : BITMAP8 {
+    kHeatSetpointFieldPresent = 0x1;
+    kCoolSetpointFieldPresent = 0x2;
+  }
+
+  bitmap ThermostatFeature : BITMAP32 {
+    kHeating = 0x1;
+    kCooling = 0x2;
+    kOccupancy = 0x4;
+    kSchedule = 0x8;
+    kSetback = 0x10;
+    kAutomode = 0x20;
+  }
+
+  struct ThermostatScheduleTransition {
+    int16u transitionTime = 0;
+    nullable int16s heatSetpoint = 1;
+    nullable int16s coolSetpoint = 2;
+  }
+
+  readonly attribute nullable int16s localTemperature = 0;
+  readonly attribute int16s absMinHeatSetpointLimit = 3;
+  readonly attribute int16s absMinCoolSetpointLimit = 5;
+  readonly attribute int16s absMaxCoolSetpointLimit = 6;
+  attribute int16s occupiedCoolingSetpoint = 17;
+  attribute int16s occupiedHeatingSetpoint = 18;
+  attribute access(write: manage) int16s minHeatSetpointLimit = 21;
+  attribute access(write: manage) int16s maxHeatSetpointLimit = 22;
+  attribute access(write: manage) int16s minCoolSetpointLimit = 23;
+  attribute access(write: manage) int16s maxCoolSetpointLimit = 24;
+  attribute access(write: manage) int8s minSetpointDeadBand = 25;
+  attribute access(write: manage) ThermostatControlSequence controlSequenceOfOperation = 27;
+  attribute access(write: manage) enum8 systemMode = 28;
+  readonly attribute enum8 startOfWeek = 32;
+  readonly attribute int8u numberOfWeeklyTransitions = 33;
+  readonly attribute int8u numberOfDailyTransitions = 34;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+client cluster ThermostatUserInterfaceConfiguration = 516 {
+  attribute enum8 temperatureDisplayMode = 0;
+  attribute access(write: manage) enum8 keypadLockout = 1;
+  attribute access(write: manage) enum8 scheduleProgrammingVisibility = 2;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster ThermostatUserInterfaceConfiguration = 516 {
+  attribute enum8 temperatureDisplayMode = 0;
+  attribute access(write: manage) enum8 keypadLockout = 1;
+  attribute access(write: manage) enum8 scheduleProgrammingVisibility = 2;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster ColorControl = 768 {
+  enum ColorLoopAction : ENUM8 {
+    kDeactivate = 0;
+    kActivateFromColorLoopStartEnhancedHue = 1;
+    kActivateFromEnhancedCurrentHue = 2;
+  }
+
+  enum ColorLoopDirection : ENUM8 {
+    kDecrementHue = 0;
+    kIncrementHue = 1;
+  }
+
+  enum ColorMode : ENUM8 {
+    kCurrentHueAndCurrentSaturation = 0;
+    kCurrentXAndCurrentY = 1;
+    kColorTemperature = 2;
+  }
+
+  enum HueDirection : ENUM8 {
+    kShortestDistance = 0;
+    kLongestDistance = 1;
+    kUp = 2;
+    kDown = 3;
+  }
+
+  enum HueMoveMode : ENUM8 {
+    kStop = 0;
+    kUp = 1;
+    kDown = 3;
+  }
+
+  enum HueStepMode : ENUM8 {
+    kUp = 1;
+    kDown = 3;
+  }
+
+  enum SaturationMoveMode : ENUM8 {
+    kStop = 0;
+    kUp = 1;
+    kDown = 3;
+  }
+
+  enum SaturationStepMode : ENUM8 {
+    kUp = 1;
+    kDown = 3;
+  }
+
+  bitmap ColorCapabilities : BITMAP16 {
+    kHueSaturationSupported = 0x1;
+    kEnhancedHueSupported = 0x2;
+    kColorLoopSupported = 0x4;
+    kXYAttributesSupported = 0x8;
+    kColorTemperatureSupported = 0x10;
+  }
+
+  bitmap ColorControlFeature : BITMAP32 {
+    kHueAndSaturation = 0x1;
+    kEnhancedHue = 0x2;
+    kColorLoop = 0x4;
+    kXy = 0x8;
+    kColorTemperature = 0x10;
+  }
+
+  bitmap ColorLoopUpdateFlags : BITMAP8 {
+    kUpdateAction = 0x1;
+    kUpdateDirection = 0x2;
+    kUpdateTime = 0x4;
+    kUpdateStartHue = 0x8;
+  }
+
+  readonly attribute int16u currentX = 3;
+  readonly attribute int16u currentY = 4;
+  attribute bitmap8 options = 15;
+  readonly attribute int16u coupleColorTempToLevelMinMireds = 16397;
+  attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct MoveToColorRequest {
+    INT16U colorX = 0;
+    INT16U colorY = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
   }
 
-  info event ElectronicTemperatureHigh = 8 {
+  request struct MoveColorRequest {
+    INT16S rateX = 0;
+    INT16S rateY = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
   }
 
-  critical event PumpBlocked = 9 {
+  request struct StepColorRequest {
+    INT16S stepX = 0;
+    INT16S stepY = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
   }
 
-  info event SensorFailure = 10 {
-  }
+  command MoveToColor(MoveToColorRequest): DefaultSuccess = 7;
+  command MoveColor(MoveColorRequest): DefaultSuccess = 8;
+  command StepColor(StepColorRequest): DefaultSuccess = 9;
+}
 
-  info event ElectronicNonFatalFailure = 11 {
+server cluster IlluminanceMeasurement = 1024 {
+  enum LightSensorType : ENUM8 {
+    kPhotodiode = 0;
+    kCmos = 1;
   }
 
-  critical event ElectronicFatalFailure = 12 {
-  }
+  readonly attribute nullable int16u measuredValue = 0;
+  readonly attribute nullable int16u minMeasuredValue = 1;
+  readonly attribute nullable int16u maxMeasuredValue = 2;
+  readonly attribute int16u tolerance = 3;
+  readonly attribute nullable enum8 lightSensorType = 4;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  info event GeneralFault = 13 {
-  }
+client cluster TemperatureMeasurement = 1026 {
+  readonly attribute nullable int16s measuredValue = 0;
+  readonly attribute nullable int16s minMeasuredValue = 1;
+  readonly attribute nullable int16s maxMeasuredValue = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  info event Leakage = 14 {
-  }
+server cluster TemperatureMeasurement = 1026 {
+  readonly attribute nullable int16s measuredValue = 0;
+  readonly attribute nullable int16s minMeasuredValue = 1;
+  readonly attribute nullable int16s maxMeasuredValue = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  info event AirDetection = 15 {
+server cluster PressureMeasurement = 1027 {
+  bitmap PressureFeature : BITMAP32 {
+    kExt = 0x1;
   }
 
-  info event TurbineOperation = 16 {
-  }
+  readonly attribute nullable int16s measuredValue = 0;
+  readonly attribute nullable int16s minMeasuredValue = 1;
+  readonly attribute nullable int16s maxMeasuredValue = 2;
+  readonly attribute int16u tolerance = 3;
+  readonly attribute nullable int16s scaledValue = 16;
+  readonly attribute nullable int16s minScaledValue = 17;
+  readonly attribute nullable int16s maxScaledValue = 18;
+  readonly attribute int16u scaledTolerance = 19;
+  readonly attribute int8s scale = 20;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  readonly attribute nullable int16s maxPressure = 0;
-  readonly attribute nullable int16u maxSpeed = 1;
-  readonly attribute nullable int16u maxFlow = 2;
-  readonly attribute nullable int16s minConstPressure = 3;
-  readonly attribute nullable int16s maxConstPressure = 4;
-  readonly attribute nullable int16s minCompPressure = 5;
-  readonly attribute nullable int16s maxCompPressure = 6;
-  readonly attribute nullable int16u minConstSpeed = 7;
-  readonly attribute nullable int16u maxConstSpeed = 8;
-  readonly attribute nullable int16u minConstFlow = 9;
-  readonly attribute nullable int16u maxConstFlow = 10;
-  readonly attribute nullable int16s minConstTemp = 11;
-  readonly attribute nullable int16s maxConstTemp = 12;
-  readonly attribute PumpStatus pumpStatus = 16;
-  readonly attribute PumpOperationMode effectiveOperationMode = 17;
-  readonly attribute PumpControlMode effectiveControlMode = 18;
-  readonly attribute nullable int16s capacity = 19;
-  readonly attribute nullable int16u speed = 20;
-  attribute access(write: manage) nullable int24u lifetimeRunningHours = 21;
-  readonly attribute nullable int24u power = 22;
-  attribute access(write: manage) nullable int32u lifetimeEnergyConsumed = 23;
-  attribute access(write: manage) PumpOperationMode operationMode = 32;
-  attribute access(write: manage) PumpControlMode controlMode = 33;
+server cluster FlowMeasurement = 1028 {
+  readonly attribute nullable int16u measuredValue = 0;
+  readonly attribute nullable int16u minMeasuredValue = 1;
+  readonly attribute nullable int16u maxMeasuredValue = 2;
+  readonly attribute int16u tolerance = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
@@ -1978,606 +2014,570 @@ server cluster RelativeHumidityMeasurement = 1029 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster Scenes = 5 {
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
-  }
-
-  struct ExtensionFieldSet {
-    cluster_id clusterId = 0;
-    AttributeValuePair attributeValueList[] = 1;
-  }
-
-  struct AttributeValuePair {
-    optional attrib_id attributeId = 0;
-    int8u attributeValue[] = 1;
-  }
-
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AddSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    INT16U transitionTime = 2;
-    CHAR_STRING sceneName = 3;
-    ExtensionFieldSet extensionFieldSets[] = 4;
-  }
-
-  request struct ViewSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RemoveSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RemoveAllScenesRequest {
-    group_id groupId = 0;
-  }
-
-  request struct StoreSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RecallSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    optional nullable INT16U transitionTime = 2;
-  }
-
-  request struct GetSceneMembershipRequest {
-    group_id groupId = 0;
-  }
-
-  response struct AddSceneResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
-
-  response struct ViewSceneResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-    optional INT16U transitionTime = 3;
-    optional CHAR_STRING sceneName = 4;
-    optional ExtensionFieldSet extensionFieldSets[] = 5;
-  }
-
-  response struct RemoveSceneResponse = 2 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
-
-  response struct RemoveAllScenesResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-  }
-
-  response struct StoreSceneResponse = 4 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
-
-  response struct GetSceneMembershipResponse = 6 {
-    ENUM8 status = 0;
-    nullable INT8U capacity = 1;
-    group_id groupId = 2;
-    optional INT8U sceneList[] = 3;
-  }
-
-  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
-  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
-  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
-  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
-  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
-  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
-  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
-}
-
-server cluster SoftwareDiagnostics = 52 {
-  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
-    kWaterMarks = 0x1;
-  }
-
-  struct ThreadMetrics {
-    int64u id = 0;
-    optional char_string<8> name = 1;
-    optional int32u stackFreeCurrent = 2;
-    optional int32u stackFreeMinimum = 3;
-    optional int32u stackSize = 4;
+client cluster TargetNavigator = 1285 {
+  enum TargetNavigatorStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kTargetNotFound = 1;
+    kNotAllowed = 2;
   }
 
-  info event SoftwareFault = 0 {
-    SoftwareFaultStruct softwareFault = 0;
+  struct TargetInfo {
+    int8u identifier = 0;
+    char_string<32> name = 1;
   }
 
-  readonly attribute ThreadMetrics threadMetrics[] = 0;
-  readonly attribute int64u currentHeapFree = 1;
-  readonly attribute int64u currentHeapUsed = 2;
-  readonly attribute int64u currentHeapHighWatermark = 3;
+  readonly attribute TargetInfo targetList[] = 0;
+  readonly attribute int8u currentTarget = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
-}
-
-client cluster Switch = 59 {
-  info event SwitchLatched = 0 {
-    INT8U newPosition = 0;
-  }
-
-  info event InitialPress = 1 {
-    INT8U newPosition = 0;
-  }
-
-  info event LongPress = 2 {
-    INT8U newPosition = 0;
+  request struct NavigateTargetRequest {
+    INT8U target = 0;
+    optional CHAR_STRING data = 1;
   }
 
-  info event ShortRelease = 3 {
-    INT8U previousPosition = 0;
+  response struct NavigateTargetResponse = 1 {
+    TargetNavigatorStatusEnum status = 0;
+    optional CHAR_STRING data = 1;
   }
 
-  info event LongRelease = 4 {
-    INT8U previousPosition = 0;
-  }
+  command NavigateTarget(NavigateTargetRequest): NavigateTargetResponse = 0;
+}
 
-  info event MultiPressOngoing = 5 {
-    INT8U newPosition = 0;
-    INT8U currentNumberOfPressesCounted = 1;
+server cluster TargetNavigator = 1285 {
+  enum TargetNavigatorStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kTargetNotFound = 1;
+    kNotAllowed = 2;
   }
 
-  info event MultiPressComplete = 6 {
-    INT8U newPosition = 0;
-    INT8U totalNumberOfPressesCounted = 1;
+  struct TargetInfo {
+    int8u identifier = 0;
+    char_string<32> name = 1;
   }
 
-  readonly attribute int8u numberOfPositions = 0;
-  readonly attribute int8u currentPosition = 1;
-  readonly attribute int8u multiPressMax = 2;
+  readonly attribute TargetInfo targetList[] = 0;
+  readonly attribute int8u currentTarget = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster Switch = 59 {
-  info event SwitchLatched = 0 {
-    INT8U newPosition = 0;
-  }
 
-  info event InitialPress = 1 {
-    INT8U newPosition = 0;
+  request struct NavigateTargetRequest {
+    INT8U target = 0;
+    optional CHAR_STRING data = 1;
   }
 
-  info event LongPress = 2 {
-    INT8U newPosition = 0;
+  response struct NavigateTargetResponse = 1 {
+    TargetNavigatorStatusEnum status = 0;
+    optional CHAR_STRING data = 1;
   }
 
-  info event ShortRelease = 3 {
-    INT8U previousPosition = 0;
-  }
+  command NavigateTarget(NavigateTargetRequest): NavigateTargetResponse = 0;
+}
 
-  info event LongRelease = 4 {
-    INT8U previousPosition = 0;
+client cluster KeypadInput = 1289 {
+  enum CecKeyCode : ENUM8 {
+    kSelect = 0;
+    kUp = 1;
+    kDown = 2;
+    kLeft = 3;
+    kRight = 4;
+    kRightUp = 5;
+    kRightDown = 6;
+    kLeftUp = 7;
+    kLeftDown = 8;
+    kRootMenu = 9;
+    kSetupMenu = 10;
+    kContentsMenu = 11;
+    kFavoriteMenu = 12;
+    kExit = 13;
+    kMediaTopMenu = 16;
+    kMediaContextSensitiveMenu = 17;
+    kNumberEntryMode = 29;
+    kNumber11 = 30;
+    kNumber12 = 31;
+    kNumber0OrNumber10 = 32;
+    kNumbers1 = 33;
+    kNumbers2 = 34;
+    kNumbers3 = 35;
+    kNumbers4 = 36;
+    kNumbers5 = 37;
+    kNumbers6 = 38;
+    kNumbers7 = 39;
+    kNumbers8 = 40;
+    kNumbers9 = 41;
+    kDot = 42;
+    kEnter = 43;
+    kClear = 44;
+    kNextFavorite = 47;
+    kChannelUp = 48;
+    kChannelDown = 49;
+    kPreviousChannel = 50;
+    kSoundSelect = 51;
+    kInputSelect = 52;
+    kDisplayInformation = 53;
+    kHelp = 54;
+    kPageUp = 55;
+    kPageDown = 56;
+    kPower = 64;
+    kVolumeUp = 65;
+    kVolumeDown = 66;
+    kMute = 67;
+    kPlay = 68;
+    kStop = 69;
+    kPause = 70;
+    kRecord = 71;
+    kRewind = 72;
+    kFastForward = 73;
+    kEject = 74;
+    kForward = 75;
+    kBackward = 76;
+    kStopRecord = 77;
+    kPauseRecord = 78;
+    kReserved = 79;
+    kAngle = 80;
+    kSubPicture = 81;
+    kVideoOnDemand = 82;
+    kElectronicProgramGuide = 83;
+    kTimerProgramming = 84;
+    kInitialConfiguration = 85;
+    kSelectBroadcastType = 86;
+    kSelectSoundPresentation = 87;
+    kPlayFunction = 96;
+    kPausePlayFunction = 97;
+    kRecordFunction = 98;
+    kPauseRecordFunction = 99;
+    kStopFunction = 100;
+    kMuteFunction = 101;
+    kRestoreVolumeFunction = 102;
+    kTuneFunction = 103;
+    kSelectMediaFunction = 104;
+    kSelectAvInputFunction = 105;
+    kSelectAudioInputFunction = 106;
+    kPowerToggleFunction = 107;
+    kPowerOffFunction = 108;
+    kPowerOnFunction = 109;
+    kF1Blue = 113;
+    kF2Red = 114;
+    kF3Green = 115;
+    kF4Yellow = 116;
+    kF5 = 117;
+    kData = 118;
   }
 
-  info event MultiPressOngoing = 5 {
-    INT8U newPosition = 0;
-    INT8U currentNumberOfPressesCounted = 1;
+  enum KeypadInputStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kUnsupportedKey = 1;
+    kInvalidKeyInCurrentState = 2;
   }
 
-  info event MultiPressComplete = 6 {
-    INT8U newPosition = 0;
-    INT8U totalNumberOfPressesCounted = 1;
+  bitmap KeypadInputFeature : BITMAP32 {
+    kNavigationKeyCodes = 0x1;
+    kLocationKeys = 0x2;
+    kNumberKeys = 0x4;
   }
 
-  readonly attribute int8u numberOfPositions = 0;
-  readonly attribute int8u currentPosition = 1;
-  readonly attribute int8u multiPressMax = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct SendKeyRequest {
+    CecKeyCode keyCode = 0;
+  }
+
+  response struct SendKeyResponse = 1 {
+    KeypadInputStatusEnum status = 0;
+  }
+
+  command SendKey(SendKeyRequest): SendKeyResponse = 0;
 }
 
-client cluster TargetNavigator = 1285 {
-  enum TargetNavigatorStatusEnum : ENUM8 {
+server cluster KeypadInput = 1289 {
+  enum CecKeyCode : ENUM8 {
+    kSelect = 0;
+    kUp = 1;
+    kDown = 2;
+    kLeft = 3;
+    kRight = 4;
+    kRightUp = 5;
+    kRightDown = 6;
+    kLeftUp = 7;
+    kLeftDown = 8;
+    kRootMenu = 9;
+    kSetupMenu = 10;
+    kContentsMenu = 11;
+    kFavoriteMenu = 12;
+    kExit = 13;
+    kMediaTopMenu = 16;
+    kMediaContextSensitiveMenu = 17;
+    kNumberEntryMode = 29;
+    kNumber11 = 30;
+    kNumber12 = 31;
+    kNumber0OrNumber10 = 32;
+    kNumbers1 = 33;
+    kNumbers2 = 34;
+    kNumbers3 = 35;
+    kNumbers4 = 36;
+    kNumbers5 = 37;
+    kNumbers6 = 38;
+    kNumbers7 = 39;
+    kNumbers8 = 40;
+    kNumbers9 = 41;
+    kDot = 42;
+    kEnter = 43;
+    kClear = 44;
+    kNextFavorite = 47;
+    kChannelUp = 48;
+    kChannelDown = 49;
+    kPreviousChannel = 50;
+    kSoundSelect = 51;
+    kInputSelect = 52;
+    kDisplayInformation = 53;
+    kHelp = 54;
+    kPageUp = 55;
+    kPageDown = 56;
+    kPower = 64;
+    kVolumeUp = 65;
+    kVolumeDown = 66;
+    kMute = 67;
+    kPlay = 68;
+    kStop = 69;
+    kPause = 70;
+    kRecord = 71;
+    kRewind = 72;
+    kFastForward = 73;
+    kEject = 74;
+    kForward = 75;
+    kBackward = 76;
+    kStopRecord = 77;
+    kPauseRecord = 78;
+    kReserved = 79;
+    kAngle = 80;
+    kSubPicture = 81;
+    kVideoOnDemand = 82;
+    kElectronicProgramGuide = 83;
+    kTimerProgramming = 84;
+    kInitialConfiguration = 85;
+    kSelectBroadcastType = 86;
+    kSelectSoundPresentation = 87;
+    kPlayFunction = 96;
+    kPausePlayFunction = 97;
+    kRecordFunction = 98;
+    kPauseRecordFunction = 99;
+    kStopFunction = 100;
+    kMuteFunction = 101;
+    kRestoreVolumeFunction = 102;
+    kTuneFunction = 103;
+    kSelectMediaFunction = 104;
+    kSelectAvInputFunction = 105;
+    kSelectAudioInputFunction = 106;
+    kPowerToggleFunction = 107;
+    kPowerOffFunction = 108;
+    kPowerOnFunction = 109;
+    kF1Blue = 113;
+    kF2Red = 114;
+    kF3Green = 115;
+    kF4Yellow = 116;
+    kF5 = 117;
+    kData = 118;
+  }
+
+  enum KeypadInputStatusEnum : ENUM8 {
     kSuccess = 0;
-    kTargetNotFound = 1;
-    kNotAllowed = 2;
+    kUnsupportedKey = 1;
+    kInvalidKeyInCurrentState = 2;
   }
 
-  struct TargetInfo {
-    int8u identifier = 0;
-    char_string<32> name = 1;
+  bitmap KeypadInputFeature : BITMAP32 {
+    kNavigationKeyCodes = 0x1;
+    kLocationKeys = 0x2;
+    kNumberKeys = 0x4;
   }
 
-  readonly attribute TargetInfo targetList[] = 0;
-  readonly attribute int8u currentTarget = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct NavigateTargetRequest {
-    INT8U target = 0;
-    optional CHAR_STRING data = 1;
+  request struct SendKeyRequest {
+    CecKeyCode keyCode = 0;
   }
 
-  response struct NavigateTargetResponse = 1 {
-    TargetNavigatorStatusEnum status = 0;
-    optional CHAR_STRING data = 1;
+  response struct SendKeyResponse = 1 {
+    KeypadInputStatusEnum status = 0;
   }
 
-  command NavigateTarget(NavigateTargetRequest): NavigateTargetResponse = 0;
+  command SendKey(SendKeyRequest): SendKeyResponse = 0;
 }
 
-server cluster TargetNavigator = 1285 {
-  enum TargetNavigatorStatusEnum : ENUM8 {
+client cluster ContentLauncher = 1290 {
+  enum ContentLaunchStatusEnum : ENUM8 {
     kSuccess = 0;
-    kTargetNotFound = 1;
-    kNotAllowed = 2;
-  }
-
-  struct TargetInfo {
-    int8u identifier = 0;
-    char_string<32> name = 1;
+    kUrlNotAvailable = 1;
+    kAuthFailed = 2;
   }
 
-  readonly attribute TargetInfo targetList[] = 0;
-  readonly attribute int8u currentTarget = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct NavigateTargetRequest {
-    INT8U target = 0;
-    optional CHAR_STRING data = 1;
+  enum MetricTypeEnum : ENUM8 {
+    kPixels = 0;
+    kPercentage = 1;
   }
 
-  response struct NavigateTargetResponse = 1 {
-    TargetNavigatorStatusEnum status = 0;
-    optional CHAR_STRING data = 1;
+  enum ParameterEnum : ENUM8 {
+    kActor = 0;
+    kChannel = 1;
+    kCharacter = 2;
+    kDirector = 3;
+    kEvent = 4;
+    kFranchise = 5;
+    kGenre = 6;
+    kLeague = 7;
+    kPopularity = 8;
+    kProvider = 9;
+    kSport = 10;
+    kSportsTeam = 11;
+    kType = 12;
   }
 
-  command NavigateTarget(NavigateTargetRequest): NavigateTargetResponse = 0;
-}
-
-client cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster Thermostat = 513 {
-  enum SetpointAdjustMode : ENUM8 {
-    kHeatSetpoint = 0;
-    kCoolSetpoint = 1;
-    kHeatAndCoolSetpoints = 2;
+  bitmap ContentLauncherFeature : BITMAP32 {
+    kContentSearch = 0x1;
+    kURLPlayback = 0x2;
   }
 
-  enum ThermostatControlSequence : ENUM8 {
-    kCoolingOnly = 0;
-    kCoolingWithReheat = 1;
-    kHeatingOnly = 2;
-    kHeatingWithReheat = 3;
-    kCoolingAndHeating = 4;
-    kCoolingAndHeatingWithReheat = 5;
+  bitmap SupportedStreamingProtocol : BITMAP32 {
+    kDash = 0x1;
+    kHls = 0x2;
   }
 
-  enum ThermostatRunningMode : ENUM8 {
-    kOff = 0;
-    kCool = 3;
-    kHeat = 4;
+  struct ContentSearch {
+    Parameter parameterList[] = 0;
   }
 
-  enum ThermostatSystemMode : ENUM8 {
-    kOff = 0;
-    kAuto = 1;
-    kCool = 3;
-    kHeat = 4;
-    kEmergencyHeating = 5;
-    kPrecooling = 6;
-    kFanOnly = 7;
+  struct Parameter {
+    ParameterEnum type = 0;
+    char_string value = 1;
+    optional AdditionalInfo externalIDList[] = 2;
   }
 
-  bitmap DayOfWeek : BITMAP8 {
-    kSunday = 0x1;
-    kMonday = 0x2;
-    kTuesday = 0x4;
-    kWednesday = 0x8;
-    kThursday = 0x10;
-    kFriday = 0x20;
-    kSaturday = 0x40;
-    kAwayOrVacation = 0x80;
+  struct AdditionalInfo {
+    char_string name = 0;
+    char_string value = 1;
   }
 
-  bitmap ModeForSequence : BITMAP8 {
-    kHeatSetpointFieldPresent = 0x1;
-    kCoolSetpointFieldPresent = 0x2;
+  struct BrandingInformation {
+    char_string providerName = 0;
+    optional StyleInformation background = 1;
+    optional StyleInformation logo = 2;
+    optional StyleInformation progressBar = 3;
+    optional StyleInformation splash = 4;
+    optional StyleInformation waterMark = 5;
   }
 
-  bitmap ThermostatFeature : BITMAP32 {
-    kHeating = 0x1;
-    kCooling = 0x2;
-    kOccupancy = 0x4;
-    kSchedule = 0x8;
-    kSetback = 0x10;
-    kAutomode = 0x20;
+  struct StyleInformation {
+    optional char_string imageUrl = 0;
+    optional char_string color = 1;
+    optional Dimension size = 2;
   }
 
-  struct ThermostatScheduleTransition {
-    int16u transitionTime = 0;
-    nullable int16s heatSetpoint = 1;
-    nullable int16s coolSetpoint = 2;
+  struct Dimension {
+    double width = 0;
+    double height = 1;
+    MetricTypeEnum metric = 2;
   }
 
-  readonly attribute nullable int16s localTemperature = 0;
-  readonly attribute int16s absMinHeatSetpointLimit = 3;
-  readonly attribute int16s absMinCoolSetpointLimit = 5;
-  readonly attribute int16s absMaxCoolSetpointLimit = 6;
-  attribute int16s occupiedCoolingSetpoint = 17;
-  attribute int16s occupiedHeatingSetpoint = 18;
-  attribute access(write: manage) int16s minHeatSetpointLimit = 21;
-  attribute access(write: manage) int16s maxHeatSetpointLimit = 22;
-  attribute access(write: manage) int16s minCoolSetpointLimit = 23;
-  attribute access(write: manage) int16s maxCoolSetpointLimit = 24;
-  attribute access(write: manage) int8s minSetpointDeadBand = 25;
-  attribute access(write: manage) ThermostatControlSequence controlSequenceOfOperation = 27;
-  attribute access(write: manage) enum8 systemMode = 28;
-  readonly attribute enum8 startOfWeek = 32;
-  readonly attribute int8u numberOfWeeklyTransitions = 33;
-  readonly attribute int8u numberOfDailyTransitions = 34;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-client cluster ThermostatUserInterfaceConfiguration = 516 {
-  attribute enum8 temperatureDisplayMode = 0;
-  attribute access(write: manage) enum8 keypadLockout = 1;
-  attribute access(write: manage) enum8 scheduleProgrammingVisibility = 2;
+  readonly attribute CHAR_STRING acceptHeader[] = 0;
+  attribute bitmap32 supportedStreamingProtocols = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster ThermostatUserInterfaceConfiguration = 516 {
-  attribute enum8 temperatureDisplayMode = 0;
-  attribute access(write: manage) enum8 keypadLockout = 1;
-  attribute access(write: manage) enum8 scheduleProgrammingVisibility = 2;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  request struct LaunchContentRequest {
+    ContentSearch search = 0;
+    BOOLEAN autoPlay = 1;
+    optional CHAR_STRING data = 2;
+  }
+
+  request struct LaunchURLRequest {
+    CHAR_STRING contentURL = 0;
+    optional CHAR_STRING displayString = 1;
+    optional BrandingInformation brandingInformation = 2;
+  }
+
+  response struct LaunchResponse = 2 {
+    ContentLaunchStatusEnum status = 0;
+    optional CHAR_STRING data = 1;
+  }
+
+  command LaunchContent(LaunchContentRequest): LaunchResponse = 0;
+  command LaunchURL(LaunchURLRequest): LaunchResponse = 1;
 }
 
-server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCause : ENUM8 {
-    kUnknown = 0;
-    kAssociationFailed = 1;
-    kAuthenticationFailed = 2;
-    kSsidNotFound = 3;
+server cluster ContentLauncher = 1290 {
+  enum ContentLaunchStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kUrlNotAvailable = 1;
+    kAuthFailed = 2;
+  }
+
+  enum MetricTypeEnum : ENUM8 {
+    kPixels = 0;
+    kPercentage = 1;
+  }
+
+  enum ParameterEnum : ENUM8 {
+    kActor = 0;
+    kChannel = 1;
+    kCharacter = 2;
+    kDirector = 3;
+    kEvent = 4;
+    kFranchise = 5;
+    kGenre = 6;
+    kLeague = 7;
+    kPopularity = 8;
+    kProvider = 9;
+    kSport = 10;
+    kSportsTeam = 11;
+    kType = 12;
+  }
+
+  bitmap ContentLauncherFeature : BITMAP32 {
+    kContentSearch = 0x1;
+    kURLPlayback = 0x2;
   }
 
-  enum SecurityType : ENUM8 {
-    kUnspecified = 0;
-    kNone = 1;
-    kWep = 2;
-    kWpa = 3;
-    kWpa2 = 4;
-    kWpa3 = 5;
+  bitmap SupportedStreamingProtocol : BITMAP32 {
+    kDash = 0x1;
+    kHls = 0x2;
   }
 
-  enum WiFiConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  struct ContentSearch {
+    Parameter parameterList[] = 0;
   }
 
-  enum WiFiVersionType : ENUM8 {
-    k80211a = 0;
-    k80211b = 1;
-    k80211g = 2;
-    k80211n = 3;
-    k80211ac = 4;
-    k80211ax = 5;
+  struct Parameter {
+    ParameterEnum type = 0;
+    char_string value = 1;
+    optional AdditionalInfo externalIDList[] = 2;
   }
 
-  info event Disconnection = 0 {
-    INT16U reasonCode = 0;
+  struct AdditionalInfo {
+    char_string name = 0;
+    char_string value = 1;
   }
 
-  info event AssociationFailure = 1 {
-    AssociationFailureCause associationFailure = 0;
-    INT16U status = 1;
+  struct BrandingInformation {
+    char_string providerName = 0;
+    optional StyleInformation background = 1;
+    optional StyleInformation logo = 2;
+    optional StyleInformation progressBar = 3;
+    optional StyleInformation splash = 4;
+    optional StyleInformation waterMark = 5;
   }
 
-  info event ConnectionStatus = 2 {
-    WiFiConnectionStatus connectionStatus = 0;
+  struct StyleInformation {
+    optional char_string imageUrl = 0;
+    optional char_string color = 1;
+    optional Dimension size = 2;
   }
 
-  readonly attribute nullable octet_string<6> bssid = 0;
-  readonly attribute nullable SecurityType securityType = 1;
-  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
-  readonly attribute nullable int16u channelNumber = 3;
-  readonly attribute nullable int8s rssi = 4;
-  readonly attribute int32u beaconLostCount = 5;
-  readonly attribute int32u beaconRxCount = 6;
-  readonly attribute int32u packetMulticastRxCount = 7;
-  readonly attribute int32u packetMulticastTxCount = 8;
-  readonly attribute int32u packetUnicastRxCount = 9;
-  readonly attribute int32u packetUnicastTxCount = 10;
-  readonly attribute int64u currentMaxRate = 11;
-  readonly attribute int64u overrunCount = 12;
+  struct Dimension {
+    double width = 0;
+    double height = 1;
+    MetricTypeEnum metric = 2;
+  }
+
+  readonly attribute CHAR_STRING acceptHeader[] = 0;
+  attribute bitmap32 supportedStreamingProtocols = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
-}
-
-server cluster WindowCovering = 258 {
-  enum EndProductType : ENUM8 {
-    kRollerShade = 0;
-    kRomanShade = 1;
-    kBalloonShade = 2;
-    kWovenWood = 3;
-    kPleatedShade = 4;
-    kCellularShade = 5;
-    kLayeredShade = 6;
-    kLayeredShade2D = 7;
-    kSheerShade = 8;
-    kTiltOnlyInteriorBlind = 9;
-    kInteriorBlind = 10;
-    kVerticalBlindStripCurtain = 11;
-    kInteriorVenetianBlind = 12;
-    kExteriorVenetianBlind = 13;
-    kLateralLeftCurtain = 14;
-    kLateralRightCurtain = 15;
-    kCentralCurtain = 16;
-    kRollerShutter = 17;
-    kExteriorVerticalScreen = 18;
-    kAwningTerracePatio = 19;
-    kAwningVerticalScreen = 20;
-    kTiltOnlyPergola = 21;
-    kSwingingShutter = 22;
-    kSlidingShutter = 23;
-    kUnknown = 255;
-  }
-
-  enum Type : ENUM8 {
-    kRollerShade = 0;
-    kRollerShade2Motor = 1;
-    kRollerShadeExterior = 2;
-    kRollerShadeExterior2Motor = 3;
-    kDrapery = 4;
-    kAwning = 5;
-    kShutter = 6;
-    kTiltBlindTiltOnly = 7;
-    kTiltBlindLiftAndTilt = 8;
-    kProjectorScreen = 9;
-    kUnknown = 255;
+  request struct LaunchContentRequest {
+    ContentSearch search = 0;
+    BOOLEAN autoPlay = 1;
+    optional CHAR_STRING data = 2;
   }
 
-  bitmap ConfigStatus : BITMAP8 {
-    kOperational = 0x1;
-    kOnlineReserved = 0x2;
-    kLiftMovementReversed = 0x4;
-    kLiftPositionAware = 0x8;
-    kTiltPositionAware = 0x10;
-    kLiftEncoderControlled = 0x20;
-    kTiltEncoderControlled = 0x40;
+  request struct LaunchURLRequest {
+    CHAR_STRING contentURL = 0;
+    optional CHAR_STRING displayString = 1;
+    optional BrandingInformation brandingInformation = 2;
   }
 
-  bitmap Feature : BITMAP32 {
-    kLift = 0x1;
-    kTilt = 0x2;
-    kPositionAwareLift = 0x4;
-    kAbsolutePosition = 0x8;
-    kPositionAwareTilt = 0x10;
+  response struct LaunchResponse = 2 {
+    ContentLaunchStatusEnum status = 0;
+    optional CHAR_STRING data = 1;
   }
 
-  bitmap Mode : BITMAP8 {
-    kMotorDirectionReversed = 0x1;
-    kCalibrationMode = 0x2;
-    kMaintenanceMode = 0x4;
-    kLedFeedback = 0x8;
-  }
+  command LaunchContent(LaunchContentRequest): LaunchResponse = 0;
+  command LaunchURL(LaunchURLRequest): LaunchResponse = 1;
+}
 
-  bitmap OperationalStatus : BITMAP8 {
-    kGlobal = 0x3;
-    kLift = 0xC;
-    kTilt = 0x30;
+client cluster ApplicationBasic = 1293 {
+  enum ApplicationStatusEnum : ENUM8 {
+    kStopped = 0;
+    kActiveVisibleFocus = 1;
+    kActiveHidden = 2;
+    kActiveVisibleNotFocus = 3;
   }
 
-  bitmap SafetyStatus : BITMAP16 {
-    kRemoteLockout = 0x1;
-    kTamperDetection = 0x2;
-    kFailedCommunication = 0x4;
-    kPositionFailure = 0x8;
-    kThermalProtection = 0x10;
-    kObstacleDetected = 0x20;
-    kPower = 0x40;
-    kStopInput = 0x80;
-    kMotorJammed = 0x100;
-    kHardwareFailure = 0x200;
-    kManualOperation = 0x400;
-    kProtection = 0x800;
+  struct ApplicationBasicApplication {
+    int16u catalogVendorId = 0;
+    char_string applicationId = 1;
   }
 
-  readonly attribute Type type = 0;
-  readonly attribute nullable int16u currentPositionLift = 3;
-  readonly attribute nullable int16u currentPositionTilt = 4;
-  readonly attribute ConfigStatus configStatus = 7;
-  readonly attribute nullable Percent currentPositionLiftPercentage = 8;
-  readonly attribute nullable Percent currentPositionTiltPercentage = 9;
-  readonly attribute OperationalStatus operationalStatus = 10;
-  readonly attribute nullable Percent100ths targetPositionLiftPercent100ths = 11;
-  readonly attribute nullable Percent100ths targetPositionTiltPercent100ths = 12;
-  readonly attribute EndProductType endProductType = 13;
-  readonly attribute nullable Percent100ths currentPositionLiftPercent100ths = 14;
-  readonly attribute nullable Percent100ths currentPositionTiltPercent100ths = 15;
-  readonly attribute int16u installedOpenLimitLift = 16;
-  readonly attribute int16u installedClosedLimitLift = 17;
-  readonly attribute int16u installedOpenLimitTilt = 18;
-  readonly attribute int16u installedClosedLimitTilt = 19;
-  attribute access(write: manage) Mode mode = 23;
-  readonly attribute SafetyStatus safetyStatus = 26;
+  readonly attribute char_string<32> vendorName = 0;
+  readonly attribute int16u vendorID = 1;
+  readonly attribute char_string<32> applicationName = 2;
+  readonly attribute int16u productID = 3;
+  readonly attribute ApplicationBasicApplication application = 4;
+  readonly attribute ApplicationStatusEnum status = 5;
+  readonly attribute char_string<32> applicationVersion = 6;
+  readonly attribute vendor_id allowedVendorList[] = 7;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct GoToLiftValueRequest {
-    INT16U liftValue = 0;
-  }
-
-  request struct GoToLiftPercentageRequest {
-    Percent100ths liftPercent100thsValue = 0;
-  }
-
-  request struct GoToTiltValueRequest {
-    INT16U tiltValue = 0;
+server cluster ApplicationBasic = 1293 {
+  enum ApplicationStatusEnum : ENUM8 {
+    kStopped = 0;
+    kActiveVisibleFocus = 1;
+    kActiveHidden = 2;
+    kActiveVisibleNotFocus = 3;
   }
 
-  request struct GoToTiltPercentageRequest {
-    Percent100ths tiltPercent100thsValue = 0;
+  struct ApplicationBasicApplication {
+    int16u catalogVendorId = 0;
+    char_string applicationId = 1;
   }
 
-  command UpOrOpen(): DefaultSuccess = 0;
-  command DownOrClose(): DefaultSuccess = 1;
-  command StopMotion(): DefaultSuccess = 2;
-  command GoToLiftValue(GoToLiftValueRequest): DefaultSuccess = 4;
-  command GoToLiftPercentage(GoToLiftPercentageRequest): DefaultSuccess = 5;
-  command GoToTiltValue(GoToTiltValueRequest): DefaultSuccess = 7;
-  command GoToTiltPercentage(GoToTiltPercentageRequest): DefaultSuccess = 8;
+  readonly attribute char_string<32> vendorName = 0;
+  readonly attribute int16u vendorID = 1;
+  readonly attribute char_string<32> applicationName = 2;
+  readonly attribute int16u productID = 3;
+  readonly attribute ApplicationBasicApplication application = 4;
+  readonly attribute ApplicationStatusEnum status = 5;
+  readonly attribute char_string<32> applicationVersion = 6;
+  readonly attribute vendor_id allowedVendorList[] = 7;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
 endpoint 0 {
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index a43b8cc48939bd..afa11b77ac76e1 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -1,542 +1,399 @@
 // This IDL was generated automatically by ZAP.
 // It is for view/code review purposes only.
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
   }
 
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
   }
 
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
+  }
+
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
-  }
-
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
   }
 
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
 }
 
-client cluster ApplicationBasic = 1293 {
-  enum ApplicationStatusEnum : ENUM8 {
-    kStopped = 0;
-    kActiveVisibleFocus = 1;
-    kActiveHidden = 2;
-    kActiveVisibleNotFocus = 3;
-  }
-
-  struct ApplicationBasicApplication {
-    int16u catalogVendorId = 0;
-    char_string applicationId = 1;
-  }
-
-  readonly attribute char_string<32> vendorName = 0;
-  readonly attribute int16u vendorID = 1;
-  readonly attribute char_string<32> applicationName = 2;
-  readonly attribute int16u productID = 3;
-  readonly attribute ApplicationBasicApplication application = 4;
-  readonly attribute ApplicationStatusEnum status = 5;
-  readonly attribute char_string<32> applicationVersion = 6;
-  readonly attribute vendor_id allowedVendorList[] = 7;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+server cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster ApplicationBasic = 1293 {
-  enum ApplicationStatusEnum : ENUM8 {
-    kStopped = 0;
-    kActiveVisibleFocus = 1;
-    kActiveHidden = 2;
-    kActiveVisibleNotFocus = 3;
+  request struct AddGroupRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
   }
 
-  struct ApplicationBasicApplication {
-    int16u catalogVendorId = 0;
-    char_string applicationId = 1;
+  request struct ViewGroupRequest {
+    group_id groupId = 0;
   }
 
-  readonly attribute char_string<32> vendorName = 0;
-  readonly attribute int16u vendorID = 1;
-  readonly attribute char_string<32> applicationName = 2;
-  readonly attribute int16u productID = 3;
-  readonly attribute ApplicationBasicApplication application = 4;
-  readonly attribute ApplicationStatusEnum status = 5;
-  readonly attribute char_string<32> applicationVersion = 6;
-  readonly attribute vendor_id allowedVendorList[] = 7;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster Basic = 40 {
-  struct CapabilityMinimaStruct {
-    int16u caseSessionsPerFabric = 0;
-    int16u subscriptionsPerFabric = 1;
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
   }
 
-  critical event StartUp = 0 {
-    INT32U softwareVersion = 0;
+  request struct RemoveGroupRequest {
+    group_id groupId = 0;
   }
 
-  critical event ShutDown = 1 {
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
   }
 
-  info event Leave = 2 {
+  response struct AddGroupResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  info event ReachableChanged = 3 {
-    boolean reachableNewValue = 0;
+  response struct ViewGroupResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    CHAR_STRING groupName = 2;
   }
 
-  readonly attribute int16u dataModelRevision = 0;
-  readonly attribute char_string<32> vendorName = 1;
-  readonly attribute vendor_id vendorID = 2;
-  readonly attribute char_string<32> productName = 3;
-  readonly attribute int16u productID = 4;
-  attribute access(write: manage) char_string<32> nodeLabel = 5;
-  attribute access(write: administer) char_string<2> location = 6;
-  readonly attribute int16u hardwareVersion = 7;
-  readonly attribute char_string<64> hardwareVersionString = 8;
-  readonly attribute int32u softwareVersion = 9;
-  readonly attribute char_string<64> softwareVersionString = 10;
-  readonly attribute char_string<16> manufacturingDate = 11;
-  readonly attribute char_string<32> partNumber = 12;
-  readonly attribute long_char_string<256> productURL = 13;
-  readonly attribute char_string<64> productLabel = 14;
-  readonly attribute char_string<32> serialNumber = 15;
-  attribute access(write: manage) boolean localConfigDisabled = 16;
-  readonly attribute boolean reachable = 17;
-  readonly attribute char_string<32> uniqueID = 18;
-  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  response struct GetGroupMembershipResponse = 2 {
+    nullable INT8U capacity = 0;
+    group_id groupList[] = 1;
+  }
 
-server cluster BooleanState = 69 {
-  info event StateChange = 0 {
-    boolean stateValue = 0;
+  response struct RemoveGroupResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  readonly attribute boolean stateValue = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
 }
 
-server cluster BridgedActions = 37 {
-  enum ActionErrorEnum : ENUM8 {
-    kUnknown = 0;
-    kInterrupted = 1;
+server cluster Scenes = 5 {
+  bitmap ScenesCopyMode : BITMAP8 {
+    kCopyAllScenes = 0x1;
   }
 
-  enum ActionStateEnum : ENUM8 {
-    kInactive = 0;
-    kActive = 1;
-    kPaused = 2;
-    kDisabled = 3;
+  struct ExtensionFieldSet {
+    cluster_id clusterId = 0;
+    AttributeValuePair attributeValueList[] = 1;
   }
 
-  enum ActionTypeEnum : ENUM8 {
-    kOther = 0;
-    kScene = 1;
-    kSequence = 2;
-    kAutomation = 3;
-    kException = 4;
-    kNotification = 5;
-    kAlarm = 6;
+  struct AttributeValuePair {
+    optional attrib_id attributeId = 0;
+    int8u attributeValue[] = 1;
   }
 
-  enum EndpointListTypeEnum : ENUM8 {
-    kOther = 0;
-    kRoom = 1;
-    kZone = 2;
+  readonly attribute int8u sceneCount = 0;
+  readonly attribute int8u currentScene = 1;
+  readonly attribute group_id currentGroup = 2;
+  readonly attribute boolean sceneValid = 3;
+  readonly attribute bitmap8 nameSupport = 4;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AddSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    INT16U transitionTime = 2;
+    CHAR_STRING sceneName = 3;
+    ExtensionFieldSet extensionFieldSets[] = 4;
   }
 
-  bitmap CommandBits : BITMAP16 {
-    kInstantAction = 0x1;
-    kInstantActionWithTransition = 0x2;
-    kStartAction = 0x4;
-    kStartActionWithDuration = 0x8;
-    kStopAction = 0x10;
-    kPauseAction = 0x20;
-    kPauseActionWithDuration = 0x40;
-    kResumeAction = 0x80;
-    kEnableAction = 0x100;
-    kEnableActionWithDuration = 0x200;
-    kDisableAction = 0x400;
-    kDisableActionWithDuration = 0x800;
+  request struct ViewSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  struct ActionStruct {
-    int16u actionID = 0;
-    char_string<32> name = 1;
-    ActionTypeEnum type = 2;
-    int16u endpointListID = 3;
-    int16u supportedCommands = 4;
-    ActionStateEnum status = 5;
+  request struct RemoveSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  struct EndpointListStruct {
-    int16u endpointListID = 0;
-    char_string<32> name = 1;
-    EndpointListTypeEnum type = 2;
-    endpoint_no endpoints[] = 3;
+  request struct RemoveAllScenesRequest {
+    group_id groupId = 0;
   }
 
-  info event StateChanged = 0 {
-    INT16U actionID = 0;
-    INT32U invokeID = 1;
-    ActionStateEnum newState = 2;
+  request struct StoreSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  info event ActionFailed = 1 {
-    INT16U actionID = 0;
-    INT32U invokeID = 1;
-    ActionStateEnum newState = 2;
-    ActionErrorEnum error = 3;
+  request struct RecallSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    optional nullable INT16U transitionTime = 2;
   }
 
-  readonly attribute ActionStruct actionList[] = 0;
-  readonly attribute EndpointListStruct endpointList[] = 1;
-  readonly attribute long_char_string<512> setupUrl = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster ColorControl = 768 {
-  enum ColorLoopAction : ENUM8 {
-    kDeactivate = 0;
-    kActivateFromColorLoopStartEnhancedHue = 1;
-    kActivateFromEnhancedCurrentHue = 2;
+  request struct GetSceneMembershipRequest {
+    group_id groupId = 0;
   }
 
-  enum ColorLoopDirection : ENUM8 {
-    kDecrementHue = 0;
-    kIncrementHue = 1;
+  response struct AddSceneResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  enum ColorMode : ENUM8 {
-    kCurrentHueAndCurrentSaturation = 0;
-    kCurrentXAndCurrentY = 1;
-    kColorTemperature = 2;
+  response struct ViewSceneResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+    optional INT16U transitionTime = 3;
+    optional CHAR_STRING sceneName = 4;
+    optional ExtensionFieldSet extensionFieldSets[] = 5;
   }
 
-  enum HueDirection : ENUM8 {
-    kShortestDistance = 0;
-    kLongestDistance = 1;
-    kUp = 2;
-    kDown = 3;
+  response struct RemoveSceneResponse = 2 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  enum HueMoveMode : ENUM8 {
-    kStop = 0;
-    kUp = 1;
-    kDown = 3;
+  response struct RemoveAllScenesResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  enum HueStepMode : ENUM8 {
-    kUp = 1;
-    kDown = 3;
+  response struct StoreSceneResponse = 4 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  enum SaturationMoveMode : ENUM8 {
-    kStop = 0;
-    kUp = 1;
-    kDown = 3;
+  response struct GetSceneMembershipResponse = 6 {
+    ENUM8 status = 0;
+    nullable INT8U capacity = 1;
+    group_id groupId = 2;
+    optional INT8U sceneList[] = 3;
   }
 
-  enum SaturationStepMode : ENUM8 {
-    kUp = 1;
-    kDown = 3;
-  }
+  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
+  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
+  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
+  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
+  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
+  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
+  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
+}
 
-  bitmap ColorCapabilities : BITMAP16 {
-    kHueSaturationSupported = 0x1;
-    kEnhancedHueSupported = 0x2;
-    kColorLoopSupported = 0x4;
-    kXYAttributesSupported = 0x8;
-    kColorTemperatureSupported = 0x10;
+client cluster OnOff = 6 {
+  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
+    kFadeToOffIn0p8Seconds = 0;
+    kNoFade = 1;
+    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
   }
 
-  bitmap ColorControlFeature : BITMAP32 {
-    kHueAndSaturation = 0x1;
-    kEnhancedHue = 0x2;
-    kColorLoop = 0x4;
-    kXy = 0x8;
-    kColorTemperature = 0x10;
+  enum OnOffDyingLightEffectVariant : ENUM8 {
+    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
   }
 
-  bitmap ColorLoopUpdateFlags : BITMAP8 {
-    kUpdateAction = 0x1;
-    kUpdateDirection = 0x2;
-    kUpdateTime = 0x4;
-    kUpdateStartHue = 0x8;
+  enum OnOffEffectIdentifier : ENUM8 {
+    kDelayedAllOff = 0;
+    kDyingLight = 1;
   }
 
-  readonly attribute int16u currentX = 3;
-  readonly attribute int16u currentY = 4;
-  attribute bitmap8 options = 15;
-  readonly attribute int16u coupleColorTempToLevelMinMireds = 16397;
-  attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct MoveToColorRequest {
-    INT16U colorX = 0;
-    INT16U colorY = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  enum OnOffStartUpOnOff : ENUM8 {
+    kOff = 0;
+    kOn = 1;
+    kTogglePreviousOnOff = 2;
   }
 
-  request struct MoveColorRequest {
-    INT16S rateX = 0;
-    INT16S rateY = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
+  bitmap OnOffControl : BITMAP8 {
+    kAcceptOnlyWhenOn = 0x1;
   }
 
-  request struct StepColorRequest {
-    INT16S stepX = 0;
-    INT16S stepY = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
   }
 
-  command MoveToColor(MoveToColorRequest): DefaultSuccess = 7;
-  command MoveColor(MoveColorRequest): DefaultSuccess = 8;
-  command StepColor(StepColorRequest): DefaultSuccess = 9;
-}
-
-client cluster ContentLauncher = 1290 {
-  enum ContentLaunchStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kUrlNotAvailable = 1;
-    kAuthFailed = 2;
+  bitmap SceneFeatures : BITMAP32 {
+    kSceneNames = 0x1;
   }
 
-  enum MetricTypeEnum : ENUM8 {
-    kPixels = 0;
-    kPercentage = 1;
-  }
+  readonly attribute boolean onOff = 0;
+  readonly attribute boolean globalSceneControl = 16384;
+  attribute int16u onTime = 16385;
+  attribute int16u offWaitTime = 16386;
+  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  enum ParameterEnum : ENUM8 {
-    kActor = 0;
-    kChannel = 1;
-    kCharacter = 2;
-    kDirector = 3;
-    kEvent = 4;
-    kFranchise = 5;
-    kGenre = 6;
-    kLeague = 7;
-    kPopularity = 8;
-    kProvider = 9;
-    kSport = 10;
-    kSportsTeam = 11;
-    kType = 12;
+  request struct OffWithEffectRequest {
+    OnOffEffectIdentifier effectId = 0;
+    OnOffDelayedAllOffEffectVariant effectVariant = 1;
   }
 
-  bitmap ContentLauncherFeature : BITMAP32 {
-    kContentSearch = 0x1;
-    kURLPlayback = 0x2;
+  request struct OnWithTimedOffRequest {
+    OnOffControl onOffControl = 0;
+    int16u onTime = 1;
+    int16u offWaitTime = 2;
   }
 
-  bitmap SupportedStreamingProtocol : BITMAP32 {
-    kDash = 0x1;
-    kHls = 0x2;
+  command Off(): DefaultSuccess = 0;
+  command On(): DefaultSuccess = 1;
+  command Toggle(): DefaultSuccess = 2;
+  command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64;
+  command OnWithRecallGlobalScene(): DefaultSuccess = 65;
+  command OnWithTimedOff(OnWithTimedOffRequest): DefaultSuccess = 66;
+}
+
+server cluster OnOff = 6 {
+  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
+    kFadeToOffIn0p8Seconds = 0;
+    kNoFade = 1;
+    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
   }
 
-  struct ContentSearch {
-    Parameter parameterList[] = 0;
+  enum OnOffDyingLightEffectVariant : ENUM8 {
+    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
   }
 
-  struct Parameter {
-    ParameterEnum type = 0;
-    char_string value = 1;
-    optional AdditionalInfo externalIDList[] = 2;
+  enum OnOffEffectIdentifier : ENUM8 {
+    kDelayedAllOff = 0;
+    kDyingLight = 1;
   }
 
-  struct AdditionalInfo {
-    char_string name = 0;
-    char_string value = 1;
+  enum OnOffStartUpOnOff : ENUM8 {
+    kOff = 0;
+    kOn = 1;
+    kTogglePreviousOnOff = 2;
   }
 
-  struct BrandingInformation {
-    char_string providerName = 0;
-    optional StyleInformation background = 1;
-    optional StyleInformation logo = 2;
-    optional StyleInformation progressBar = 3;
-    optional StyleInformation splash = 4;
-    optional StyleInformation waterMark = 5;
+  bitmap OnOffControl : BITMAP8 {
+    kAcceptOnlyWhenOn = 0x1;
   }
 
-  struct StyleInformation {
-    optional char_string imageUrl = 0;
-    optional char_string color = 1;
-    optional Dimension size = 2;
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
   }
 
-  struct Dimension {
-    double width = 0;
-    double height = 1;
-    MetricTypeEnum metric = 2;
+  bitmap SceneFeatures : BITMAP32 {
+    kSceneNames = 0x1;
   }
 
-  readonly attribute CHAR_STRING acceptHeader[] = 0;
-  attribute bitmap32 supportedStreamingProtocols = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute boolean onOff = 0;
+  readonly attribute boolean globalSceneControl = 16384;
+  attribute int16u onTime = 16385;
+  attribute int16u offWaitTime = 16386;
+  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct LaunchContentRequest {
-    ContentSearch search = 0;
-    BOOLEAN autoPlay = 1;
-    optional CHAR_STRING data = 2;
-  }
-
-  request struct LaunchURLRequest {
-    CHAR_STRING contentURL = 0;
-    optional CHAR_STRING displayString = 1;
-    optional BrandingInformation brandingInformation = 2;
+  request struct OffWithEffectRequest {
+    OnOffEffectIdentifier effectId = 0;
+    OnOffDelayedAllOffEffectVariant effectVariant = 1;
   }
 
-  response struct LaunchResponse = 2 {
-    ContentLaunchStatusEnum status = 0;
-    optional CHAR_STRING data = 1;
+  request struct OnWithTimedOffRequest {
+    OnOffControl onOffControl = 0;
+    int16u onTime = 1;
+    int16u offWaitTime = 2;
   }
 
-  command LaunchContent(LaunchContentRequest): LaunchResponse = 0;
-  command LaunchURL(LaunchURLRequest): LaunchResponse = 1;
+  command Off(): DefaultSuccess = 0;
+  command On(): DefaultSuccess = 1;
+  command Toggle(): DefaultSuccess = 2;
+  command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64;
+  command OnWithRecallGlobalScene(): DefaultSuccess = 65;
+  command OnWithTimedOff(OnWithTimedOffRequest): DefaultSuccess = 66;
 }
 
-server cluster ContentLauncher = 1290 {
-  enum ContentLaunchStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kUrlNotAvailable = 1;
-    kAuthFailed = 2;
-  }
-
-  enum MetricTypeEnum : ENUM8 {
-    kPixels = 0;
-    kPercentage = 1;
-  }
-
-  enum ParameterEnum : ENUM8 {
-    kActor = 0;
-    kChannel = 1;
-    kCharacter = 2;
-    kDirector = 3;
-    kEvent = 4;
-    kFranchise = 5;
-    kGenre = 6;
-    kLeague = 7;
-    kPopularity = 8;
-    kProvider = 9;
-    kSport = 10;
-    kSportsTeam = 11;
-    kType = 12;
-  }
-
-  bitmap ContentLauncherFeature : BITMAP32 {
-    kContentSearch = 0x1;
-    kURLPlayback = 0x2;
+server cluster LevelControl = 8 {
+  enum MoveMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
   }
 
-  bitmap SupportedStreamingProtocol : BITMAP32 {
-    kDash = 0x1;
-    kHls = 0x2;
+  enum StepMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
   }
 
-  struct ContentSearch {
-    Parameter parameterList[] = 0;
+  bitmap LevelControlFeature : BITMAP32 {
+    kOnOff = 0x1;
+    kLighting = 0x2;
+    kFrequency = 0x4;
   }
 
-  struct Parameter {
-    ParameterEnum type = 0;
-    char_string value = 1;
-    optional AdditionalInfo externalIDList[] = 2;
-  }
+  readonly attribute int8u currentLevel = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  struct AdditionalInfo {
-    char_string name = 0;
-    char_string value = 1;
+  request struct MoveToLevelRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
   }
 
-  struct BrandingInformation {
-    char_string providerName = 0;
-    optional StyleInformation background = 1;
-    optional StyleInformation logo = 2;
-    optional StyleInformation progressBar = 3;
-    optional StyleInformation splash = 4;
-    optional StyleInformation waterMark = 5;
+  request struct MoveRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
   }
 
-  struct StyleInformation {
-    optional char_string imageUrl = 0;
-    optional char_string color = 1;
-    optional Dimension size = 2;
+  request struct StepRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionMask = 3;
+    BITMAP8 optionOverride = 4;
   }
 
-  struct Dimension {
-    double width = 0;
-    double height = 1;
-    MetricTypeEnum metric = 2;
+  request struct StopRequest {
+    BITMAP8 optionMask = 0;
+    BITMAP8 optionOverride = 1;
   }
 
-  readonly attribute CHAR_STRING acceptHeader[] = 0;
-  attribute bitmap32 supportedStreamingProtocols = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct LaunchContentRequest {
-    ContentSearch search = 0;
-    BOOLEAN autoPlay = 1;
-    optional CHAR_STRING data = 2;
+  request struct MoveToLevelWithOnOffRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
   }
 
-  request struct LaunchURLRequest {
-    CHAR_STRING contentURL = 0;
-    optional CHAR_STRING displayString = 1;
-    optional BrandingInformation brandingInformation = 2;
+  request struct MoveWithOnOffRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
   }
 
-  response struct LaunchResponse = 2 {
-    ContentLaunchStatusEnum status = 0;
-    optional CHAR_STRING data = 1;
+  request struct StepWithOnOffRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
   }
 
-  command LaunchContent(LaunchContentRequest): LaunchResponse = 0;
-  command LaunchURL(LaunchURLRequest): LaunchResponse = 1;
+  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
+  command Move(MoveRequest): DefaultSuccess = 1;
+  command Step(StepRequest): DefaultSuccess = 2;
+  command Stop(StopRequest): DefaultSuccess = 3;
+  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
+  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
+  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
+  command StopWithOnOff(): DefaultSuccess = 7;
 }
 
 server cluster Descriptor = 29 {
@@ -553,65 +410,258 @@ server cluster Descriptor = 29 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
+server cluster BridgedActions = 37 {
+  enum ActionErrorEnum : ENUM8 {
+    kUnknown = 0;
+    kInterrupted = 1;
   }
 
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  enum ActionStateEnum : ENUM8 {
+    kInactive = 0;
+    kActive = 1;
+    kPaused = 2;
+    kDisabled = 3;
+  }
 
-  command ResetCounts(): DefaultSuccess = 0;
-}
+  enum ActionTypeEnum : ENUM8 {
+    kOther = 0;
+    kScene = 1;
+    kSequence = 2;
+    kAutomation = 3;
+    kException = 4;
+    kNotification = 5;
+    kAlarm = 6;
+  }
 
-server cluster FlowMeasurement = 1028 {
-  readonly attribute nullable int16u measuredValue = 0;
-  readonly attribute nullable int16u minMeasuredValue = 1;
-  readonly attribute nullable int16u maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  enum EndpointListTypeEnum : ENUM8 {
+    kOther = 0;
+    kRoom = 1;
+    kZone = 2;
+  }
 
-client cluster GeneralCommissioning = 48 {
-  enum CommissioningError : ENUM8 {
-    kOk = 0;
-    kValueOutsideRange = 1;
-    kInvalidAuthentication = 2;
-    kNoFailSafe = 3;
-    kBusyWithOtherAdmin = 4;
+  bitmap CommandBits : BITMAP16 {
+    kInstantAction = 0x1;
+    kInstantActionWithTransition = 0x2;
+    kStartAction = 0x4;
+    kStartActionWithDuration = 0x8;
+    kStopAction = 0x10;
+    kPauseAction = 0x20;
+    kPauseActionWithDuration = 0x40;
+    kResumeAction = 0x80;
+    kEnableAction = 0x100;
+    kEnableActionWithDuration = 0x200;
+    kDisableAction = 0x400;
+    kDisableActionWithDuration = 0x800;
   }
 
-  enum RegulatoryLocationType : ENUM8 {
-    kIndoor = 0;
-    kOutdoor = 1;
-    kIndoorOutdoor = 2;
+  struct ActionStruct {
+    int16u actionID = 0;
+    char_string<32> name = 1;
+    ActionTypeEnum type = 2;
+    int16u endpointListID = 3;
+    int16u supportedCommands = 4;
+    ActionStateEnum status = 5;
   }
 
-  struct BasicCommissioningInfo {
-    int16u failSafeExpiryLengthSeconds = 0;
-    int16u maxCumulativeFailsafeSeconds = 1;
+  struct EndpointListStruct {
+    int16u endpointListID = 0;
+    char_string<32> name = 1;
+    EndpointListTypeEnum type = 2;
+    endpoint_no endpoints[] = 3;
   }
 
-  attribute access(write: administer) int64u breadcrumb = 0;
+  info event StateChanged = 0 {
+    INT16U actionID = 0;
+    INT32U invokeID = 1;
+    ActionStateEnum newState = 2;
+  }
+
+  info event ActionFailed = 1 {
+    INT16U actionID = 0;
+    INT32U invokeID = 1;
+    ActionStateEnum newState = 2;
+    ActionErrorEnum error = 3;
+  }
+
+  readonly attribute ActionStruct actionList[] = 0;
+  readonly attribute EndpointListStruct endpointList[] = 1;
+  readonly attribute long_char_string<512> setupUrl = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Basic = 40 {
+  struct CapabilityMinimaStruct {
+    int16u caseSessionsPerFabric = 0;
+    int16u subscriptionsPerFabric = 1;
+  }
+
+  critical event StartUp = 0 {
+    INT32U softwareVersion = 0;
+  }
+
+  critical event ShutDown = 1 {
+  }
+
+  info event Leave = 2 {
+  }
+
+  info event ReachableChanged = 3 {
+    boolean reachableNewValue = 0;
+  }
+
+  readonly attribute int16u dataModelRevision = 0;
+  readonly attribute char_string<32> vendorName = 1;
+  readonly attribute vendor_id vendorID = 2;
+  readonly attribute char_string<32> productName = 3;
+  readonly attribute int16u productID = 4;
+  attribute access(write: manage) char_string<32> nodeLabel = 5;
+  attribute access(write: administer) char_string<2> location = 6;
+  readonly attribute int16u hardwareVersion = 7;
+  readonly attribute char_string<64> hardwareVersionString = 8;
+  readonly attribute int32u softwareVersion = 9;
+  readonly attribute char_string<64> softwareVersionString = 10;
+  readonly attribute char_string<16> manufacturingDate = 11;
+  readonly attribute char_string<32> partNumber = 12;
+  readonly attribute long_char_string<256> productURL = 13;
+  readonly attribute char_string<64> productLabel = 14;
+  readonly attribute char_string<32> serialNumber = 15;
+  attribute access(write: manage) boolean localConfigDisabled = 16;
+  readonly attribute boolean reachable = 17;
+  readonly attribute char_string<32> uniqueID = 18;
+  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster PowerSourceConfiguration = 46 {
+  readonly attribute INT8U sources[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster PowerSource = 47 {
+  enum BatChargeFaultType : ENUM8 {
+    kUnspecfied = 0;
+    kAmbientTooHot = 1;
+    kAmbientTooCold = 2;
+    kBatteryTooHot = 3;
+    kBatteryTooCold = 4;
+    kBatteryAbsent = 5;
+    kBatteryOverVoltage = 6;
+    kBatteryUnderVoltage = 7;
+    kChargerOverVoltage = 8;
+    kChargerUnderVoltage = 9;
+    kSafetyTimeout = 10;
+  }
+
+  enum BatChargeLevel : ENUM8 {
+    kOk = 0;
+    kWarning = 1;
+    kCritical = 2;
+  }
+
+  enum BatChargeState : ENUM8 {
+    kUnknown = 0;
+    kIsCharging = 1;
+    kIsAtFullCharge = 2;
+    kIsNotCharging = 3;
+  }
+
+  enum BatFaultType : ENUM8 {
+    kUnspecfied = 0;
+    kOverTemp = 1;
+    kUnderTemp = 2;
+  }
+
+  enum BatReplaceability : ENUM8 {
+    kUnspecified = 0;
+    kNotReplaceable = 1;
+    kUserReplaceable = 2;
+    kFactoryReplaceable = 3;
+  }
+
+  enum PowerSourceStatus : ENUM8 {
+    kUnspecfied = 0;
+    kActive = 1;
+    kStandby = 2;
+    kUnavailable = 3;
+  }
+
+  enum WiredCurrentType : ENUM8 {
+    kAc = 0;
+    kDc = 1;
+  }
+
+  enum WiredFaultType : ENUM8 {
+    kUnspecfied = 0;
+    kOverVoltage = 1;
+    kUnderVoltage = 2;
+  }
+
+  bitmap PowerSourceFeature : BITMAP32 {
+    kWired = 0x1;
+    kBattery = 0x2;
+    kRechargeable = 0x4;
+    kReplaceable = 0x8;
+  }
+
+  readonly attribute enum8 status = 0;
+  readonly attribute int8u order = 1;
+  readonly attribute char_string<60> description = 2;
+  readonly attribute int32u wiredAssessedInputVoltage = 3;
+  readonly attribute int16u wiredAssessedInputFrequency = 4;
+  readonly attribute enum8 wiredCurrentType = 5;
+  readonly attribute int32u wiredAssessedCurrent = 6;
+  readonly attribute int32u wiredNominalVoltage = 7;
+  readonly attribute int32u wiredMaximumCurrent = 8;
+  readonly attribute boolean wiredPresent = 9;
+  readonly attribute ENUM8 activeWiredFaults[] = 10;
+  readonly attribute int32u batteryVoltage = 11;
+  readonly attribute int8u batteryPercentRemaining = 12;
+  readonly attribute int32u batteryTimeRemaining = 13;
+  readonly attribute enum8 batteryChargeLevel = 14;
+  readonly attribute boolean batteryReplacementNeeded = 15;
+  readonly attribute enum8 batteryReplaceability = 16;
+  readonly attribute boolean batteryPresent = 17;
+  readonly attribute ENUM8 activeBatteryFaults[] = 18;
+  readonly attribute char_string<60> batteryReplacementDescription = 19;
+  readonly attribute int32u batteryCommonDesignation = 20;
+  readonly attribute char_string<20> batteryANSIDesignation = 21;
+  readonly attribute char_string<20> batteryIECDesignation = 22;
+  readonly attribute int32u batteryApprovedChemistry = 23;
+  readonly attribute int32u batteryCapacity = 24;
+  readonly attribute int8u batteryQuantity = 25;
+  readonly attribute enum8 batteryChargeState = 26;
+  readonly attribute int32u batteryTimeToFullCharge = 27;
+  readonly attribute boolean batteryFunctionalWhileCharging = 28;
+  readonly attribute int32u batteryChargingCurrent = 29;
+  readonly attribute ENUM8 activeBatteryChargeFaults[] = 30;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+client cluster GeneralCommissioning = 48 {
+  enum CommissioningError : ENUM8 {
+    kOk = 0;
+    kValueOutsideRange = 1;
+    kInvalidAuthentication = 2;
+    kNoFailSafe = 3;
+    kBusyWithOtherAdmin = 4;
+  }
+
+  enum RegulatoryLocationType : ENUM8 {
+    kIndoor = 0;
+    kOutdoor = 1;
+    kIndoorOutdoor = 2;
+  }
+
+  struct BasicCommissioningInfo {
+    int16u failSafeExpiryLengthSeconds = 0;
+    int16u maxCumulativeFailsafeSeconds = 1;
+  }
+
+  attribute access(write: administer) int64u breadcrumb = 0;
   readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
   readonly attribute RegulatoryLocationType regulatoryConfig = 2;
   readonly attribute RegulatoryLocationType locationCapability = 3;
@@ -700,47 +750,181 @@ server cluster GeneralCommissioning = 48 {
   command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
 }
 
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatus : ENUM8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
   }
 
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
+  enum WiFiBand : ENUM8 {
+    k2g4 = 0;
+    k3g65 = 1;
+    k5g = 2;
+    k6g = 3;
+    k60g = 4;
   }
 
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
+  bitmap NetworkCommissioningFeature : BITMAP32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
   }
 
-  enum NetworkFaultType : ENUM8 {
-    kUnspecified = 0;
-    kHardwareFailure = 1;
-    kNetworkJammed = 2;
-    kConnectionFailed = 3;
+  bitmap WiFiSecurity : BITMAP8 {
+    kUnencrypted = 0x1;
+    kWepPersonal = 0x2;
+    kWpaPersonal = 0x4;
+    kWpa2Personal = 0x8;
+    kWpa3Personal = 0x10;
   }
 
-  enum RadioFaultType : ENUM8 {
+  struct NetworkInfo {
+    octet_string<32> networkID = 0;
+    boolean connected = 1;
+  }
+
+  struct WiFiInterfaceScanResult {
+    WiFiSecurity security = 0;
+    octet_string<32> ssid = 1;
+    octet_string<6> bssid = 2;
+    int16u channel = 3;
+    WiFiBand wiFiBand = 4;
+    int8s rssi = 5;
+  }
+
+  struct ThreadInterfaceScanResult {
+    int16u panId = 0;
+    int64u extendedPanId = 1;
+    char_string<16> networkName = 2;
+    int16u channel = 3;
+    int8u version = 4;
+    octet_string<8> extendedAddress = 5;
+    int8s rssi = 6;
+    int8u lqi = 7;
+  }
+
+  readonly attribute access(read: administer) int8u maxNetworks = 0;
+  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
+  readonly attribute int8u scanMaxTimeSeconds = 2;
+  readonly attribute int8u connectMaxTimeSeconds = 3;
+  attribute access(write: administer) boolean interfaceEnabled = 4;
+  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
+  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
+  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ScanNetworksRequest {
+    optional nullable OCTET_STRING ssid = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct AddOrUpdateWiFiNetworkRequest {
+    OCTET_STRING ssid = 0;
+    OCTET_STRING credentials = 1;
+    optional INT64U breadcrumb = 2;
+  }
+
+  request struct AddOrUpdateThreadNetworkRequest {
+    OCTET_STRING operationalDataset = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct RemoveNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct ConnectNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct ReorderNetworkRequest {
+    OCTET_STRING networkID = 0;
+    INT8U networkIndex = 1;
+    optional INT64U breadcrumb = 2;
+  }
+
+  response struct ScanNetworksResponse = 1 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
+    optional ThreadInterfaceScanResult threadScanResults[] = 3;
+  }
+
+  response struct NetworkConfigResponse = 5 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional INT8U networkIndex = 2;
+  }
+
+  response struct ConnectNetworkResponse = 7 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    nullable INT32S errorValue = 2;
+  }
+
+  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
+  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
+  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
+  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
+  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
+  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+}
+
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
+  }
+
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
+  }
+
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
+  }
+
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
+  }
+
+  enum RadioFaultType : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -800,746 +984,241 @@ server cluster GeneralDiagnostics = 51 {
   command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
-server cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AddGroupRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
-  }
-
-  request struct ViewGroupRequest {
-    group_id groupId = 0;
+server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
   }
 
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
+  struct ThreadMetrics {
+    int64u id = 0;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
-  request struct RemoveGroupRequest {
-    group_id groupId = 0;
+  info event SoftwareFault = 0 {
+    SoftwareFaultStruct softwareFault = 0;
   }
 
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
-  }
+  readonly attribute ThreadMetrics threadMetrics[] = 0;
+  readonly attribute int64u currentHeapFree = 1;
+  readonly attribute int64u currentHeapUsed = 2;
+  readonly attribute int64u currentHeapHighWatermark = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  response struct AddGroupResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-  }
+  command ResetWatermarks(): DefaultSuccess = 0;
+}
 
-  response struct ViewGroupResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    CHAR_STRING groupName = 2;
+server cluster WiFiNetworkDiagnostics = 54 {
+  enum AssociationFailureCause : ENUM8 {
+    kUnknown = 0;
+    kAssociationFailed = 1;
+    kAuthenticationFailed = 2;
+    kSsidNotFound = 3;
   }
 
-  response struct GetGroupMembershipResponse = 2 {
-    nullable INT8U capacity = 0;
-    group_id groupList[] = 1;
+  enum SecurityType : ENUM8 {
+    kUnspecified = 0;
+    kNone = 1;
+    kWep = 2;
+    kWpa = 3;
+    kWpa2 = 4;
+    kWpa3 = 5;
   }
 
-  response struct RemoveGroupResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  enum WiFiConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
-}
-
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
+  enum WiFiVersionType : ENUM8 {
+    k80211a = 0;
+    k80211b = 1;
+    k80211g = 2;
+    k80211n = 3;
+    k80211ac = 4;
+    k80211ax = 5;
   }
 
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
+  info event Disconnection = 0 {
+    INT16U reasonCode = 0;
   }
 
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
+  info event AssociationFailure = 1 {
+    AssociationFailureCause associationFailure = 0;
+    INT16U status = 1;
   }
 
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
+  info event ConnectionStatus = 2 {
+    WiFiConnectionStatus connectionStatus = 0;
   }
 
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
-}
-
-server cluster IlluminanceMeasurement = 1024 {
-  enum LightSensorType : ENUM8 {
-    kPhotodiode = 0;
-    kCmos = 1;
-  }
-
-  readonly attribute nullable int16u measuredValue = 0;
-  readonly attribute nullable int16u minMeasuredValue = 1;
-  readonly attribute nullable int16u maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
-  readonly attribute nullable enum8 lightSensorType = 4;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-client cluster KeypadInput = 1289 {
-  enum CecKeyCode : ENUM8 {
-    kSelect = 0;
-    kUp = 1;
-    kDown = 2;
-    kLeft = 3;
-    kRight = 4;
-    kRightUp = 5;
-    kRightDown = 6;
-    kLeftUp = 7;
-    kLeftDown = 8;
-    kRootMenu = 9;
-    kSetupMenu = 10;
-    kContentsMenu = 11;
-    kFavoriteMenu = 12;
-    kExit = 13;
-    kMediaTopMenu = 16;
-    kMediaContextSensitiveMenu = 17;
-    kNumberEntryMode = 29;
-    kNumber11 = 30;
-    kNumber12 = 31;
-    kNumber0OrNumber10 = 32;
-    kNumbers1 = 33;
-    kNumbers2 = 34;
-    kNumbers3 = 35;
-    kNumbers4 = 36;
-    kNumbers5 = 37;
-    kNumbers6 = 38;
-    kNumbers7 = 39;
-    kNumbers8 = 40;
-    kNumbers9 = 41;
-    kDot = 42;
-    kEnter = 43;
-    kClear = 44;
-    kNextFavorite = 47;
-    kChannelUp = 48;
-    kChannelDown = 49;
-    kPreviousChannel = 50;
-    kSoundSelect = 51;
-    kInputSelect = 52;
-    kDisplayInformation = 53;
-    kHelp = 54;
-    kPageUp = 55;
-    kPageDown = 56;
-    kPower = 64;
-    kVolumeUp = 65;
-    kVolumeDown = 66;
-    kMute = 67;
-    kPlay = 68;
-    kStop = 69;
-    kPause = 70;
-    kRecord = 71;
-    kRewind = 72;
-    kFastForward = 73;
-    kEject = 74;
-    kForward = 75;
-    kBackward = 76;
-    kStopRecord = 77;
-    kPauseRecord = 78;
-    kReserved = 79;
-    kAngle = 80;
-    kSubPicture = 81;
-    kVideoOnDemand = 82;
-    kElectronicProgramGuide = 83;
-    kTimerProgramming = 84;
-    kInitialConfiguration = 85;
-    kSelectBroadcastType = 86;
-    kSelectSoundPresentation = 87;
-    kPlayFunction = 96;
-    kPausePlayFunction = 97;
-    kRecordFunction = 98;
-    kPauseRecordFunction = 99;
-    kStopFunction = 100;
-    kMuteFunction = 101;
-    kRestoreVolumeFunction = 102;
-    kTuneFunction = 103;
-    kSelectMediaFunction = 104;
-    kSelectAvInputFunction = 105;
-    kSelectAudioInputFunction = 106;
-    kPowerToggleFunction = 107;
-    kPowerOffFunction = 108;
-    kPowerOnFunction = 109;
-    kF1Blue = 113;
-    kF2Red = 114;
-    kF3Green = 115;
-    kF4Yellow = 116;
-    kF5 = 117;
-    kData = 118;
-  }
-
-  enum KeypadInputStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kUnsupportedKey = 1;
-    kInvalidKeyInCurrentState = 2;
-  }
-
-  bitmap KeypadInputFeature : BITMAP32 {
-    kNavigationKeyCodes = 0x1;
-    kLocationKeys = 0x2;
-    kNumberKeys = 0x4;
-  }
-
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct SendKeyRequest {
-    CecKeyCode keyCode = 0;
-  }
-
-  response struct SendKeyResponse = 1 {
-    KeypadInputStatusEnum status = 0;
-  }
-
-  command SendKey(SendKeyRequest): SendKeyResponse = 0;
-}
-
-server cluster KeypadInput = 1289 {
-  enum CecKeyCode : ENUM8 {
-    kSelect = 0;
-    kUp = 1;
-    kDown = 2;
-    kLeft = 3;
-    kRight = 4;
-    kRightUp = 5;
-    kRightDown = 6;
-    kLeftUp = 7;
-    kLeftDown = 8;
-    kRootMenu = 9;
-    kSetupMenu = 10;
-    kContentsMenu = 11;
-    kFavoriteMenu = 12;
-    kExit = 13;
-    kMediaTopMenu = 16;
-    kMediaContextSensitiveMenu = 17;
-    kNumberEntryMode = 29;
-    kNumber11 = 30;
-    kNumber12 = 31;
-    kNumber0OrNumber10 = 32;
-    kNumbers1 = 33;
-    kNumbers2 = 34;
-    kNumbers3 = 35;
-    kNumbers4 = 36;
-    kNumbers5 = 37;
-    kNumbers6 = 38;
-    kNumbers7 = 39;
-    kNumbers8 = 40;
-    kNumbers9 = 41;
-    kDot = 42;
-    kEnter = 43;
-    kClear = 44;
-    kNextFavorite = 47;
-    kChannelUp = 48;
-    kChannelDown = 49;
-    kPreviousChannel = 50;
-    kSoundSelect = 51;
-    kInputSelect = 52;
-    kDisplayInformation = 53;
-    kHelp = 54;
-    kPageUp = 55;
-    kPageDown = 56;
-    kPower = 64;
-    kVolumeUp = 65;
-    kVolumeDown = 66;
-    kMute = 67;
-    kPlay = 68;
-    kStop = 69;
-    kPause = 70;
-    kRecord = 71;
-    kRewind = 72;
-    kFastForward = 73;
-    kEject = 74;
-    kForward = 75;
-    kBackward = 76;
-    kStopRecord = 77;
-    kPauseRecord = 78;
-    kReserved = 79;
-    kAngle = 80;
-    kSubPicture = 81;
-    kVideoOnDemand = 82;
-    kElectronicProgramGuide = 83;
-    kTimerProgramming = 84;
-    kInitialConfiguration = 85;
-    kSelectBroadcastType = 86;
-    kSelectSoundPresentation = 87;
-    kPlayFunction = 96;
-    kPausePlayFunction = 97;
-    kRecordFunction = 98;
-    kPauseRecordFunction = 99;
-    kStopFunction = 100;
-    kMuteFunction = 101;
-    kRestoreVolumeFunction = 102;
-    kTuneFunction = 103;
-    kSelectMediaFunction = 104;
-    kSelectAvInputFunction = 105;
-    kSelectAudioInputFunction = 106;
-    kPowerToggleFunction = 107;
-    kPowerOffFunction = 108;
-    kPowerOnFunction = 109;
-    kF1Blue = 113;
-    kF2Red = 114;
-    kF3Green = 115;
-    kF4Yellow = 116;
-    kF5 = 117;
-    kData = 118;
-  }
-
-  enum KeypadInputStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kUnsupportedKey = 1;
-    kInvalidKeyInCurrentState = 2;
-  }
-
-  bitmap KeypadInputFeature : BITMAP32 {
-    kNavigationKeyCodes = 0x1;
-    kLocationKeys = 0x2;
-    kNumberKeys = 0x4;
-  }
-
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct SendKeyRequest {
-    CecKeyCode keyCode = 0;
-  }
-
-  response struct SendKeyResponse = 1 {
-    KeypadInputStatusEnum status = 0;
-  }
-
-  command SendKey(SendKeyRequest): SendKeyResponse = 0;
-}
-
-server cluster LevelControl = 8 {
-  enum MoveMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
-  }
-
-  enum StepMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
-  }
-
-  bitmap LevelControlFeature : BITMAP32 {
-    kOnOff = 0x1;
-    kLighting = 0x2;
-    kFrequency = 0x4;
-  }
-
-  readonly attribute int8u currentLevel = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct MoveToLevelRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
-  }
-
-  request struct MoveRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
-  }
-
-  request struct StepRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionMask = 3;
-    BITMAP8 optionOverride = 4;
-  }
-
-  request struct StopRequest {
-    BITMAP8 optionMask = 0;
-    BITMAP8 optionOverride = 1;
-  }
-
-  request struct MoveToLevelWithOnOffRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
-  }
-
-  request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
-  }
-
-  request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
-  }
-
-  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
-  command Move(MoveRequest): DefaultSuccess = 1;
-  command Step(StepRequest): DefaultSuccess = 2;
-  command Stop(StopRequest): DefaultSuccess = 3;
-  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
-  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
-  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
-  command StopWithOnOff(): DefaultSuccess = 7;
-}
-
-client cluster ModeSelect = 80 {
-  bitmap ModeSelectFeature : BITMAP32 {
-    kDeponoff = 0x1;
-  }
-
-  struct ModeOptionStruct {
-    char_string<32> label = 0;
-    int8u mode = 1;
-    SemanticTag semanticTags[] = 2;
-  }
-
-  struct SemanticTag {
-    enum16 mfgCode = 0;
-    enum16 value = 1;
-  }
-
-  readonly attribute char_string<32> description = 0;
-  readonly attribute nullable enum16 standardNamespace = 1;
-  readonly attribute ModeOptionStruct supportedModes[] = 2;
-  readonly attribute int8u currentMode = 3;
-  attribute nullable int8u startUpMode = 4;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct ChangeToModeRequest {
-    INT8U newMode = 0;
-  }
-
-  command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0;
-}
-
-server cluster ModeSelect = 80 {
-  bitmap ModeSelectFeature : BITMAP32 {
-    kDeponoff = 0x1;
-  }
-
-  struct ModeOptionStruct {
-    char_string<32> label = 0;
-    int8u mode = 1;
-    SemanticTag semanticTags[] = 2;
-  }
-
-  struct SemanticTag {
-    enum16 mfgCode = 0;
-    enum16 value = 1;
-  }
-
-  readonly attribute char_string<32> description = 0;
-  readonly attribute nullable enum16 standardNamespace = 1;
-  readonly attribute ModeOptionStruct supportedModes[] = 2;
-  readonly attribute int8u currentMode = 3;
-  attribute nullable int8u startUpMode = 4;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute nullable octet_string<6> bssid = 0;
+  readonly attribute nullable SecurityType securityType = 1;
+  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
+  readonly attribute nullable int16u channelNumber = 3;
+  readonly attribute nullable int8s rssi = 4;
+  readonly attribute int32u beaconLostCount = 5;
+  readonly attribute int32u beaconRxCount = 6;
+  readonly attribute int32u packetMulticastRxCount = 7;
+  readonly attribute int32u packetMulticastTxCount = 8;
+  readonly attribute int32u packetUnicastRxCount = 9;
+  readonly attribute int32u packetUnicastTxCount = 10;
+  readonly attribute int64u currentMaxRate = 11;
+  readonly attribute int64u overrunCount = 12;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct ChangeToModeRequest {
-    INT8U newMode = 0;
-  }
-
-  command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0;
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
-server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatus : ENUM8 {
-    kSuccess = 0;
-    kOutOfRange = 1;
-    kBoundsExceeded = 2;
-    kNetworkIDNotFound = 3;
-    kDuplicateNetworkID = 4;
-    kNetworkNotFound = 5;
-    kRegulatoryError = 6;
-    kAuthFailure = 7;
-    kUnsupportedSecurity = 8;
-    kOtherConnectionFailure = 9;
-    kIPV6Failed = 10;
-    kIPBindFailed = 11;
-    kUnknownError = 12;
-  }
-
-  enum WiFiBand : ENUM8 {
-    k2g4 = 0;
-    k3g65 = 1;
-    k5g = 2;
-    k6g = 3;
-    k60g = 4;
-  }
-
-  bitmap NetworkCommissioningFeature : BITMAP32 {
-    kWiFiNetworkInterface = 0x1;
-    kThreadNetworkInterface = 0x2;
-    kEthernetNetworkInterface = 0x4;
-  }
-
-  bitmap WiFiSecurity : BITMAP8 {
-    kUnencrypted = 0x1;
-    kWepPersonal = 0x2;
-    kWpaPersonal = 0x4;
-    kWpa2Personal = 0x8;
-    kWpa3Personal = 0x10;
-  }
-
-  struct NetworkInfo {
-    octet_string<32> networkID = 0;
-    boolean connected = 1;
-  }
-
-  struct WiFiInterfaceScanResult {
-    WiFiSecurity security = 0;
-    octet_string<32> ssid = 1;
-    octet_string<6> bssid = 2;
-    int16u channel = 3;
-    WiFiBand wiFiBand = 4;
-    int8s rssi = 5;
-  }
-
-  struct ThreadInterfaceScanResult {
-    int16u panId = 0;
-    int64u extendedPanId = 1;
-    char_string<16> networkName = 2;
-    int16u channel = 3;
-    int8u version = 4;
-    octet_string<8> extendedAddress = 5;
-    int8s rssi = 6;
-    int8u lqi = 7;
-  }
-
-  readonly attribute access(read: administer) int8u maxNetworks = 0;
-  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
-  readonly attribute int8u scanMaxTimeSeconds = 2;
-  readonly attribute int8u connectMaxTimeSeconds = 3;
-  attribute access(write: administer) boolean interfaceEnabled = 4;
-  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
-  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
-  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct ScanNetworksRequest {
-    optional nullable OCTET_STRING ssid = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct AddOrUpdateWiFiNetworkRequest {
-    OCTET_STRING ssid = 0;
-    OCTET_STRING credentials = 1;
-    optional INT64U breadcrumb = 2;
-  }
-
-  request struct AddOrUpdateThreadNetworkRequest {
-    OCTET_STRING operationalDataset = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct RemoveNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct ConnectNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct ReorderNetworkRequest {
-    OCTET_STRING networkID = 0;
-    INT8U networkIndex = 1;
-    optional INT64U breadcrumb = 2;
-  }
-
-  response struct ScanNetworksResponse = 1 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
-    optional ThreadInterfaceScanResult threadScanResults[] = 3;
-  }
-
-  response struct NetworkConfigResponse = 5 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional INT8U networkIndex = 2;
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
   }
 
-  response struct ConnectNetworkResponse = 7 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    nullable INT32S errorValue = 2;
-  }
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
-  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
-  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
-  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
-  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
-  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
-client cluster OnOff = 6 {
-  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
-    kFadeToOffIn0p8Seconds = 0;
-    kNoFade = 1;
-    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
+client cluster Switch = 59 {
+  info event SwitchLatched = 0 {
+    INT8U newPosition = 0;
   }
 
-  enum OnOffDyingLightEffectVariant : ENUM8 {
-    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
+  info event InitialPress = 1 {
+    INT8U newPosition = 0;
   }
 
-  enum OnOffEffectIdentifier : ENUM8 {
-    kDelayedAllOff = 0;
-    kDyingLight = 1;
+  info event LongPress = 2 {
+    INT8U newPosition = 0;
   }
 
-  enum OnOffStartUpOnOff : ENUM8 {
-    kOff = 0;
-    kOn = 1;
-    kTogglePreviousOnOff = 2;
+  info event ShortRelease = 3 {
+    INT8U previousPosition = 0;
   }
 
-  bitmap OnOffControl : BITMAP8 {
-    kAcceptOnlyWhenOn = 0x1;
+  info event LongRelease = 4 {
+    INT8U previousPosition = 0;
   }
 
-  bitmap OnOffFeature : BITMAP32 {
-    kLighting = 0x1;
+  info event MultiPressOngoing = 5 {
+    INT8U newPosition = 0;
+    INT8U currentNumberOfPressesCounted = 1;
   }
 
-  bitmap SceneFeatures : BITMAP32 {
-    kSceneNames = 0x1;
+  info event MultiPressComplete = 6 {
+    INT8U newPosition = 0;
+    INT8U totalNumberOfPressesCounted = 1;
   }
 
-  readonly attribute boolean onOff = 0;
-  readonly attribute boolean globalSceneControl = 16384;
-  attribute int16u onTime = 16385;
-  attribute int16u offWaitTime = 16386;
-  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
+  readonly attribute int8u numberOfPositions = 0;
+  readonly attribute int8u currentPosition = 1;
+  readonly attribute int8u multiPressMax = 2;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct OffWithEffectRequest {
-    OnOffEffectIdentifier effectId = 0;
-    OnOffDelayedAllOffEffectVariant effectVariant = 1;
+server cluster Switch = 59 {
+  info event SwitchLatched = 0 {
+    INT8U newPosition = 0;
   }
 
-  request struct OnWithTimedOffRequest {
-    OnOffControl onOffControl = 0;
-    int16u onTime = 1;
-    int16u offWaitTime = 2;
+  info event InitialPress = 1 {
+    INT8U newPosition = 0;
   }
 
-  command Off(): DefaultSuccess = 0;
-  command On(): DefaultSuccess = 1;
-  command Toggle(): DefaultSuccess = 2;
-  command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64;
-  command OnWithRecallGlobalScene(): DefaultSuccess = 65;
-  command OnWithTimedOff(OnWithTimedOffRequest): DefaultSuccess = 66;
-}
-
-server cluster OnOff = 6 {
-  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
-    kFadeToOffIn0p8Seconds = 0;
-    kNoFade = 1;
-    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
+  info event LongPress = 2 {
+    INT8U newPosition = 0;
   }
 
-  enum OnOffDyingLightEffectVariant : ENUM8 {
-    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
+  info event ShortRelease = 3 {
+    INT8U previousPosition = 0;
   }
 
-  enum OnOffEffectIdentifier : ENUM8 {
-    kDelayedAllOff = 0;
-    kDyingLight = 1;
+  info event LongRelease = 4 {
+    INT8U previousPosition = 0;
   }
 
-  enum OnOffStartUpOnOff : ENUM8 {
-    kOff = 0;
-    kOn = 1;
-    kTogglePreviousOnOff = 2;
+  info event MultiPressOngoing = 5 {
+    INT8U newPosition = 0;
+    INT8U currentNumberOfPressesCounted = 1;
   }
 
-  bitmap OnOffControl : BITMAP8 {
-    kAcceptOnlyWhenOn = 0x1;
+  info event MultiPressComplete = 6 {
+    INT8U newPosition = 0;
+    INT8U totalNumberOfPressesCounted = 1;
   }
 
-  bitmap OnOffFeature : BITMAP32 {
-    kLighting = 0x1;
+  readonly attribute int8u numberOfPositions = 0;
+  readonly attribute int8u currentPosition = 1;
+  readonly attribute int8u multiPressMax = 2;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
   }
 
-  bitmap SceneFeatures : BITMAP32 {
-    kSceneNames = 0x1;
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
   }
 
-  readonly attribute boolean onOff = 0;
-  readonly attribute boolean globalSceneControl = 16384;
-  attribute int16u onTime = 16385;
-  attribute int16u offWaitTime = 16386;
-  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct OffWithEffectRequest {
-    OnOffEffectIdentifier effectId = 0;
-    OnOffDelayedAllOffEffectVariant effectVariant = 1;
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
   }
 
-  request struct OnWithTimedOffRequest {
-    OnOffControl onOffControl = 0;
-    int16u onTime = 1;
-    int16u offWaitTime = 2;
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
   }
 
-  command Off(): DefaultSuccess = 0;
-  command On(): DefaultSuccess = 1;
-  command Toggle(): DefaultSuccess = 2;
-  command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64;
-  command OnWithRecallGlobalScene(): DefaultSuccess = 65;
-  command OnWithTimedOff(OnWithTimedOffRequest): DefaultSuccess = 66;
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
 client cluster OperationalCredentials = 62 {
@@ -1680,171 +1359,259 @@ server cluster OperationalCredentials = 62 {
     optional OCTET_STRING ICACValue = 1;
   }
 
-  request struct UpdateFabricLabelRequest {
-    CHAR_STRING label = 0;
+  request struct UpdateFabricLabelRequest {
+    CHAR_STRING label = 0;
+  }
+
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
+  }
+
+  request struct AddTrustedRootCertificateRequest {
+    OCTET_STRING rootCertificate = 0;
+  }
+
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
+  }
+
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
+  }
+
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
+  }
+
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
+  }
+
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
+}
+
+server cluster BooleanState = 69 {
+  info event StateChange = 0 {
+    boolean stateValue = 0;
+  }
+
+  readonly attribute boolean stateValue = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+client cluster ModeSelect = 80 {
+  bitmap ModeSelectFeature : BITMAP32 {
+    kDeponoff = 0x1;
+  }
+
+  struct ModeOptionStruct {
+    char_string<32> label = 0;
+    int8u mode = 1;
+    SemanticTag semanticTags[] = 2;
+  }
+
+  struct SemanticTag {
+    enum16 mfgCode = 0;
+    enum16 value = 1;
+  }
+
+  readonly attribute char_string<32> description = 0;
+  readonly attribute nullable enum16 standardNamespace = 1;
+  readonly attribute ModeOptionStruct supportedModes[] = 2;
+  readonly attribute int8u currentMode = 3;
+  attribute nullable int8u startUpMode = 4;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ChangeToModeRequest {
+    INT8U newMode = 0;
   }
 
-  request struct RemoveFabricRequest {
-    fabric_idx fabricIndex = 0;
-  }
+  command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0;
+}
 
-  request struct AddTrustedRootCertificateRequest {
-    OCTET_STRING rootCertificate = 0;
+server cluster ModeSelect = 80 {
+  bitmap ModeSelectFeature : BITMAP32 {
+    kDeponoff = 0x1;
   }
 
-  response struct AttestationResponse = 1 {
-    OCTET_STRING attestationElements = 0;
-    OCTET_STRING signature = 1;
+  struct ModeOptionStruct {
+    char_string<32> label = 0;
+    int8u mode = 1;
+    SemanticTag semanticTags[] = 2;
   }
 
-  response struct CertificateChainResponse = 3 {
-    OCTET_STRING certificate = 0;
+  struct SemanticTag {
+    enum16 mfgCode = 0;
+    enum16 value = 1;
   }
 
-  response struct CSRResponse = 5 {
-    OCTET_STRING NOCSRElements = 0;
-    OCTET_STRING attestationSignature = 1;
-  }
+  readonly attribute char_string<32> description = 0;
+  readonly attribute nullable enum16 standardNamespace = 1;
+  readonly attribute ModeOptionStruct supportedModes[] = 2;
+  readonly attribute int8u currentMode = 3;
+  attribute nullable int8u startUpMode = 4;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  response struct NOCResponse = 8 {
-    OperationalCertStatus statusCode = 0;
-    optional fabric_idx fabricIndex = 1;
-    optional CHAR_STRING debugText = 2;
+  request struct ChangeToModeRequest {
+    INT8U newMode = 0;
   }
 
-  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
-  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
-  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
-  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
-  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
-  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
-  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
-  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
+  command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0;
 }
 
-server cluster PowerSource = 47 {
-  enum BatChargeFaultType : ENUM8 {
-    kUnspecfied = 0;
-    kAmbientTooHot = 1;
-    kAmbientTooCold = 2;
-    kBatteryTooHot = 3;
-    kBatteryTooCold = 4;
-    kBatteryAbsent = 5;
-    kBatteryOverVoltage = 6;
-    kBatteryUnderVoltage = 7;
-    kChargerOverVoltage = 8;
-    kChargerUnderVoltage = 9;
-    kSafetyTimeout = 10;
-  }
-
-  enum BatChargeLevel : ENUM8 {
-    kOk = 0;
-    kWarning = 1;
-    kCritical = 2;
-  }
-
-  enum BatChargeState : ENUM8 {
-    kUnknown = 0;
-    kIsCharging = 1;
-    kIsAtFullCharge = 2;
-    kIsNotCharging = 3;
+server cluster WindowCovering = 258 {
+  enum EndProductType : ENUM8 {
+    kRollerShade = 0;
+    kRomanShade = 1;
+    kBalloonShade = 2;
+    kWovenWood = 3;
+    kPleatedShade = 4;
+    kCellularShade = 5;
+    kLayeredShade = 6;
+    kLayeredShade2D = 7;
+    kSheerShade = 8;
+    kTiltOnlyInteriorBlind = 9;
+    kInteriorBlind = 10;
+    kVerticalBlindStripCurtain = 11;
+    kInteriorVenetianBlind = 12;
+    kExteriorVenetianBlind = 13;
+    kLateralLeftCurtain = 14;
+    kLateralRightCurtain = 15;
+    kCentralCurtain = 16;
+    kRollerShutter = 17;
+    kExteriorVerticalScreen = 18;
+    kAwningTerracePatio = 19;
+    kAwningVerticalScreen = 20;
+    kTiltOnlyPergola = 21;
+    kSwingingShutter = 22;
+    kSlidingShutter = 23;
+    kUnknown = 255;
   }
 
-  enum BatFaultType : ENUM8 {
-    kUnspecfied = 0;
-    kOverTemp = 1;
-    kUnderTemp = 2;
+  enum Type : ENUM8 {
+    kRollerShade = 0;
+    kRollerShade2Motor = 1;
+    kRollerShadeExterior = 2;
+    kRollerShadeExterior2Motor = 3;
+    kDrapery = 4;
+    kAwning = 5;
+    kShutter = 6;
+    kTiltBlindTiltOnly = 7;
+    kTiltBlindLiftAndTilt = 8;
+    kProjectorScreen = 9;
+    kUnknown = 255;
   }
 
-  enum BatReplaceability : ENUM8 {
-    kUnspecified = 0;
-    kNotReplaceable = 1;
-    kUserReplaceable = 2;
-    kFactoryReplaceable = 3;
+  bitmap ConfigStatus : BITMAP8 {
+    kOperational = 0x1;
+    kOnlineReserved = 0x2;
+    kLiftMovementReversed = 0x4;
+    kLiftPositionAware = 0x8;
+    kTiltPositionAware = 0x10;
+    kLiftEncoderControlled = 0x20;
+    kTiltEncoderControlled = 0x40;
   }
 
-  enum PowerSourceStatus : ENUM8 {
-    kUnspecfied = 0;
-    kActive = 1;
-    kStandby = 2;
-    kUnavailable = 3;
+  bitmap Feature : BITMAP32 {
+    kLift = 0x1;
+    kTilt = 0x2;
+    kPositionAwareLift = 0x4;
+    kAbsolutePosition = 0x8;
+    kPositionAwareTilt = 0x10;
   }
 
-  enum WiredCurrentType : ENUM8 {
-    kAc = 0;
-    kDc = 1;
+  bitmap Mode : BITMAP8 {
+    kMotorDirectionReversed = 0x1;
+    kCalibrationMode = 0x2;
+    kMaintenanceMode = 0x4;
+    kLedFeedback = 0x8;
   }
 
-  enum WiredFaultType : ENUM8 {
-    kUnspecfied = 0;
-    kOverVoltage = 1;
-    kUnderVoltage = 2;
+  bitmap OperationalStatus : BITMAP8 {
+    kGlobal = 0x3;
+    kLift = 0xC;
+    kTilt = 0x30;
   }
 
-  bitmap PowerSourceFeature : BITMAP32 {
-    kWired = 0x1;
-    kBattery = 0x2;
-    kRechargeable = 0x4;
-    kReplaceable = 0x8;
+  bitmap SafetyStatus : BITMAP16 {
+    kRemoteLockout = 0x1;
+    kTamperDetection = 0x2;
+    kFailedCommunication = 0x4;
+    kPositionFailure = 0x8;
+    kThermalProtection = 0x10;
+    kObstacleDetected = 0x20;
+    kPower = 0x40;
+    kStopInput = 0x80;
+    kMotorJammed = 0x100;
+    kHardwareFailure = 0x200;
+    kManualOperation = 0x400;
+    kProtection = 0x800;
   }
 
-  readonly attribute enum8 status = 0;
-  readonly attribute int8u order = 1;
-  readonly attribute char_string<60> description = 2;
-  readonly attribute int32u wiredAssessedInputVoltage = 3;
-  readonly attribute int16u wiredAssessedInputFrequency = 4;
-  readonly attribute enum8 wiredCurrentType = 5;
-  readonly attribute int32u wiredAssessedCurrent = 6;
-  readonly attribute int32u wiredNominalVoltage = 7;
-  readonly attribute int32u wiredMaximumCurrent = 8;
-  readonly attribute boolean wiredPresent = 9;
-  readonly attribute ENUM8 activeWiredFaults[] = 10;
-  readonly attribute int32u batteryVoltage = 11;
-  readonly attribute int8u batteryPercentRemaining = 12;
-  readonly attribute int32u batteryTimeRemaining = 13;
-  readonly attribute enum8 batteryChargeLevel = 14;
-  readonly attribute boolean batteryReplacementNeeded = 15;
-  readonly attribute enum8 batteryReplaceability = 16;
-  readonly attribute boolean batteryPresent = 17;
-  readonly attribute ENUM8 activeBatteryFaults[] = 18;
-  readonly attribute char_string<60> batteryReplacementDescription = 19;
-  readonly attribute int32u batteryCommonDesignation = 20;
-  readonly attribute char_string<20> batteryANSIDesignation = 21;
-  readonly attribute char_string<20> batteryIECDesignation = 22;
-  readonly attribute int32u batteryApprovedChemistry = 23;
-  readonly attribute int32u batteryCapacity = 24;
-  readonly attribute int8u batteryQuantity = 25;
-  readonly attribute enum8 batteryChargeState = 26;
-  readonly attribute int32u batteryTimeToFullCharge = 27;
-  readonly attribute boolean batteryFunctionalWhileCharging = 28;
-  readonly attribute int32u batteryChargingCurrent = 29;
-  readonly attribute ENUM8 activeBatteryChargeFaults[] = 30;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster PowerSourceConfiguration = 46 {
-  readonly attribute INT8U sources[] = 0;
+  readonly attribute Type type = 0;
+  readonly attribute nullable int16u currentPositionLift = 3;
+  readonly attribute nullable int16u currentPositionTilt = 4;
+  readonly attribute ConfigStatus configStatus = 7;
+  readonly attribute nullable Percent currentPositionLiftPercentage = 8;
+  readonly attribute nullable Percent currentPositionTiltPercentage = 9;
+  readonly attribute OperationalStatus operationalStatus = 10;
+  readonly attribute nullable Percent100ths targetPositionLiftPercent100ths = 11;
+  readonly attribute nullable Percent100ths targetPositionTiltPercent100ths = 12;
+  readonly attribute EndProductType endProductType = 13;
+  readonly attribute nullable Percent100ths currentPositionLiftPercent100ths = 14;
+  readonly attribute nullable Percent100ths currentPositionTiltPercent100ths = 15;
+  readonly attribute int16u installedOpenLimitLift = 16;
+  readonly attribute int16u installedClosedLimitLift = 17;
+  readonly attribute int16u installedOpenLimitTilt = 18;
+  readonly attribute int16u installedClosedLimitTilt = 19;
+  attribute access(write: manage) Mode mode = 23;
+  readonly attribute SafetyStatus safetyStatus = 26;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster PressureMeasurement = 1027 {
-  bitmap PressureFeature : BITMAP32 {
-    kExt = 0x1;
+  request struct GoToLiftValueRequest {
+    INT16U liftValue = 0;
   }
 
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
-  readonly attribute nullable int16s scaledValue = 16;
-  readonly attribute nullable int16s minScaledValue = 17;
-  readonly attribute nullable int16s maxScaledValue = 18;
-  readonly attribute int16u scaledTolerance = 19;
-  readonly attribute int8s scale = 20;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  request struct GoToLiftPercentageRequest {
+    Percent100ths liftPercent100thsValue = 0;
+  }
+
+  request struct GoToTiltValueRequest {
+    INT16U tiltValue = 0;
+  }
+
+  request struct GoToTiltPercentageRequest {
+    Percent100ths tiltPercent100thsValue = 0;
+  }
+
+  command UpOrOpen(): DefaultSuccess = 0;
+  command DownOrClose(): DefaultSuccess = 1;
+  command StopMotion(): DefaultSuccess = 2;
+  command GoToLiftValue(GoToLiftValueRequest): DefaultSuccess = 4;
+  command GoToLiftPercentage(GoToLiftPercentageRequest): DefaultSuccess = 5;
+  command GoToTiltValue(GoToTiltValueRequest): DefaultSuccess = 7;
+  command GoToTiltPercentage(GoToTiltPercentageRequest): DefaultSuccess = 8;
 }
 
 server cluster PumpConfigurationAndControl = 512 {
@@ -1897,59 +1664,328 @@ server cluster PumpConfigurationAndControl = 512 {
   info event MotorTemperatureHigh = 6 {
   }
 
-  critical event PumpMotorFatalFailure = 7 {
+  critical event PumpMotorFatalFailure = 7 {
+  }
+
+  info event ElectronicTemperatureHigh = 8 {
+  }
+
+  critical event PumpBlocked = 9 {
+  }
+
+  info event SensorFailure = 10 {
+  }
+
+  info event ElectronicNonFatalFailure = 11 {
+  }
+
+  critical event ElectronicFatalFailure = 12 {
+  }
+
+  info event GeneralFault = 13 {
+  }
+
+  info event Leakage = 14 {
+  }
+
+  info event AirDetection = 15 {
+  }
+
+  info event TurbineOperation = 16 {
+  }
+
+  readonly attribute nullable int16s maxPressure = 0;
+  readonly attribute nullable int16u maxSpeed = 1;
+  readonly attribute nullable int16u maxFlow = 2;
+  readonly attribute nullable int16s minConstPressure = 3;
+  readonly attribute nullable int16s maxConstPressure = 4;
+  readonly attribute nullable int16s minCompPressure = 5;
+  readonly attribute nullable int16s maxCompPressure = 6;
+  readonly attribute nullable int16u minConstSpeed = 7;
+  readonly attribute nullable int16u maxConstSpeed = 8;
+  readonly attribute nullable int16u minConstFlow = 9;
+  readonly attribute nullable int16u maxConstFlow = 10;
+  readonly attribute nullable int16s minConstTemp = 11;
+  readonly attribute nullable int16s maxConstTemp = 12;
+  readonly attribute PumpStatus pumpStatus = 16;
+  readonly attribute PumpOperationMode effectiveOperationMode = 17;
+  readonly attribute PumpControlMode effectiveControlMode = 18;
+  readonly attribute nullable int16s capacity = 19;
+  readonly attribute nullable int16u speed = 20;
+  attribute access(write: manage) nullable int24u lifetimeRunningHours = 21;
+  readonly attribute nullable int24u power = 22;
+  attribute access(write: manage) nullable int32u lifetimeEnergyConsumed = 23;
+  attribute access(write: manage) PumpOperationMode operationMode = 32;
+  attribute access(write: manage) PumpControlMode controlMode = 33;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Thermostat = 513 {
+  enum SetpointAdjustMode : ENUM8 {
+    kHeatSetpoint = 0;
+    kCoolSetpoint = 1;
+    kHeatAndCoolSetpoints = 2;
+  }
+
+  enum ThermostatControlSequence : ENUM8 {
+    kCoolingOnly = 0;
+    kCoolingWithReheat = 1;
+    kHeatingOnly = 2;
+    kHeatingWithReheat = 3;
+    kCoolingAndHeating = 4;
+    kCoolingAndHeatingWithReheat = 5;
+  }
+
+  enum ThermostatRunningMode : ENUM8 {
+    kOff = 0;
+    kCool = 3;
+    kHeat = 4;
+  }
+
+  enum ThermostatSystemMode : ENUM8 {
+    kOff = 0;
+    kAuto = 1;
+    kCool = 3;
+    kHeat = 4;
+    kEmergencyHeating = 5;
+    kPrecooling = 6;
+    kFanOnly = 7;
+  }
+
+  bitmap DayOfWeek : BITMAP8 {
+    kSunday = 0x1;
+    kMonday = 0x2;
+    kTuesday = 0x4;
+    kWednesday = 0x8;
+    kThursday = 0x10;
+    kFriday = 0x20;
+    kSaturday = 0x40;
+    kAwayOrVacation = 0x80;
+  }
+
+  bitmap ModeForSequence : BITMAP8 {
+    kHeatSetpointFieldPresent = 0x1;
+    kCoolSetpointFieldPresent = 0x2;
+  }
+
+  bitmap ThermostatFeature : BITMAP32 {
+    kHeating = 0x1;
+    kCooling = 0x2;
+    kOccupancy = 0x4;
+    kSchedule = 0x8;
+    kSetback = 0x10;
+    kAutomode = 0x20;
+  }
+
+  struct ThermostatScheduleTransition {
+    int16u transitionTime = 0;
+    nullable int16s heatSetpoint = 1;
+    nullable int16s coolSetpoint = 2;
+  }
+
+  readonly attribute nullable int16s localTemperature = 0;
+  readonly attribute int16s absMinHeatSetpointLimit = 3;
+  readonly attribute int16s absMinCoolSetpointLimit = 5;
+  readonly attribute int16s absMaxCoolSetpointLimit = 6;
+  attribute int16s occupiedCoolingSetpoint = 17;
+  attribute int16s occupiedHeatingSetpoint = 18;
+  attribute access(write: manage) int16s minHeatSetpointLimit = 21;
+  attribute access(write: manage) int16s maxHeatSetpointLimit = 22;
+  attribute access(write: manage) int16s minCoolSetpointLimit = 23;
+  attribute access(write: manage) int16s maxCoolSetpointLimit = 24;
+  attribute access(write: manage) int8s minSetpointDeadBand = 25;
+  attribute access(write: manage) ThermostatControlSequence controlSequenceOfOperation = 27;
+  attribute access(write: manage) enum8 systemMode = 28;
+  readonly attribute enum8 startOfWeek = 32;
+  readonly attribute int8u numberOfWeeklyTransitions = 33;
+  readonly attribute int8u numberOfDailyTransitions = 34;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+client cluster ThermostatUserInterfaceConfiguration = 516 {
+  attribute enum8 temperatureDisplayMode = 0;
+  attribute access(write: manage) enum8 keypadLockout = 1;
+  attribute access(write: manage) enum8 scheduleProgrammingVisibility = 2;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster ThermostatUserInterfaceConfiguration = 516 {
+  attribute enum8 temperatureDisplayMode = 0;
+  attribute access(write: manage) enum8 keypadLockout = 1;
+  attribute access(write: manage) enum8 scheduleProgrammingVisibility = 2;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster ColorControl = 768 {
+  enum ColorLoopAction : ENUM8 {
+    kDeactivate = 0;
+    kActivateFromColorLoopStartEnhancedHue = 1;
+    kActivateFromEnhancedCurrentHue = 2;
+  }
+
+  enum ColorLoopDirection : ENUM8 {
+    kDecrementHue = 0;
+    kIncrementHue = 1;
+  }
+
+  enum ColorMode : ENUM8 {
+    kCurrentHueAndCurrentSaturation = 0;
+    kCurrentXAndCurrentY = 1;
+    kColorTemperature = 2;
+  }
+
+  enum HueDirection : ENUM8 {
+    kShortestDistance = 0;
+    kLongestDistance = 1;
+    kUp = 2;
+    kDown = 3;
+  }
+
+  enum HueMoveMode : ENUM8 {
+    kStop = 0;
+    kUp = 1;
+    kDown = 3;
+  }
+
+  enum HueStepMode : ENUM8 {
+    kUp = 1;
+    kDown = 3;
+  }
+
+  enum SaturationMoveMode : ENUM8 {
+    kStop = 0;
+    kUp = 1;
+    kDown = 3;
+  }
+
+  enum SaturationStepMode : ENUM8 {
+    kUp = 1;
+    kDown = 3;
+  }
+
+  bitmap ColorCapabilities : BITMAP16 {
+    kHueSaturationSupported = 0x1;
+    kEnhancedHueSupported = 0x2;
+    kColorLoopSupported = 0x4;
+    kXYAttributesSupported = 0x8;
+    kColorTemperatureSupported = 0x10;
+  }
+
+  bitmap ColorControlFeature : BITMAP32 {
+    kHueAndSaturation = 0x1;
+    kEnhancedHue = 0x2;
+    kColorLoop = 0x4;
+    kXy = 0x8;
+    kColorTemperature = 0x10;
+  }
+
+  bitmap ColorLoopUpdateFlags : BITMAP8 {
+    kUpdateAction = 0x1;
+    kUpdateDirection = 0x2;
+    kUpdateTime = 0x4;
+    kUpdateStartHue = 0x8;
+  }
+
+  readonly attribute int16u currentX = 3;
+  readonly attribute int16u currentY = 4;
+  attribute bitmap8 options = 15;
+  readonly attribute int16u coupleColorTempToLevelMinMireds = 16397;
+  attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct MoveToColorRequest {
+    INT16U colorX = 0;
+    INT16U colorY = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
   }
 
-  info event ElectronicTemperatureHigh = 8 {
+  request struct MoveColorRequest {
+    INT16S rateX = 0;
+    INT16S rateY = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
   }
 
-  critical event PumpBlocked = 9 {
+  request struct StepColorRequest {
+    INT16S stepX = 0;
+    INT16S stepY = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
   }
 
-  info event SensorFailure = 10 {
-  }
+  command MoveToColor(MoveToColorRequest): DefaultSuccess = 7;
+  command MoveColor(MoveColorRequest): DefaultSuccess = 8;
+  command StepColor(StepColorRequest): DefaultSuccess = 9;
+}
 
-  info event ElectronicNonFatalFailure = 11 {
+server cluster IlluminanceMeasurement = 1024 {
+  enum LightSensorType : ENUM8 {
+    kPhotodiode = 0;
+    kCmos = 1;
   }
 
-  critical event ElectronicFatalFailure = 12 {
-  }
+  readonly attribute nullable int16u measuredValue = 0;
+  readonly attribute nullable int16u minMeasuredValue = 1;
+  readonly attribute nullable int16u maxMeasuredValue = 2;
+  readonly attribute int16u tolerance = 3;
+  readonly attribute nullable enum8 lightSensorType = 4;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  info event GeneralFault = 13 {
-  }
+client cluster TemperatureMeasurement = 1026 {
+  readonly attribute nullable int16s measuredValue = 0;
+  readonly attribute nullable int16s minMeasuredValue = 1;
+  readonly attribute nullable int16s maxMeasuredValue = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  info event Leakage = 14 {
-  }
+server cluster TemperatureMeasurement = 1026 {
+  readonly attribute nullable int16s measuredValue = 0;
+  readonly attribute nullable int16s minMeasuredValue = 1;
+  readonly attribute nullable int16s maxMeasuredValue = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  info event AirDetection = 15 {
+server cluster PressureMeasurement = 1027 {
+  bitmap PressureFeature : BITMAP32 {
+    kExt = 0x1;
   }
 
-  info event TurbineOperation = 16 {
-  }
+  readonly attribute nullable int16s measuredValue = 0;
+  readonly attribute nullable int16s minMeasuredValue = 1;
+  readonly attribute nullable int16s maxMeasuredValue = 2;
+  readonly attribute int16u tolerance = 3;
+  readonly attribute nullable int16s scaledValue = 16;
+  readonly attribute nullable int16s minScaledValue = 17;
+  readonly attribute nullable int16s maxScaledValue = 18;
+  readonly attribute int16u scaledTolerance = 19;
+  readonly attribute int8s scale = 20;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  readonly attribute nullable int16s maxPressure = 0;
-  readonly attribute nullable int16u maxSpeed = 1;
-  readonly attribute nullable int16u maxFlow = 2;
-  readonly attribute nullable int16s minConstPressure = 3;
-  readonly attribute nullable int16s maxConstPressure = 4;
-  readonly attribute nullable int16s minCompPressure = 5;
-  readonly attribute nullable int16s maxCompPressure = 6;
-  readonly attribute nullable int16u minConstSpeed = 7;
-  readonly attribute nullable int16u maxConstSpeed = 8;
-  readonly attribute nullable int16u minConstFlow = 9;
-  readonly attribute nullable int16u maxConstFlow = 10;
-  readonly attribute nullable int16s minConstTemp = 11;
-  readonly attribute nullable int16s maxConstTemp = 12;
-  readonly attribute PumpStatus pumpStatus = 16;
-  readonly attribute PumpOperationMode effectiveOperationMode = 17;
-  readonly attribute PumpControlMode effectiveControlMode = 18;
-  readonly attribute nullable int16s capacity = 19;
-  readonly attribute nullable int16u speed = 20;
-  attribute access(write: manage) nullable int24u lifetimeRunningHours = 21;
-  readonly attribute nullable int24u power = 22;
-  attribute access(write: manage) nullable int32u lifetimeEnergyConsumed = 23;
-  attribute access(write: manage) PumpOperationMode operationMode = 32;
-  attribute access(write: manage) PumpControlMode controlMode = 33;
+server cluster FlowMeasurement = 1028 {
+  readonly attribute nullable int16u measuredValue = 0;
+  readonly attribute nullable int16u minMeasuredValue = 1;
+  readonly attribute nullable int16u maxMeasuredValue = 2;
+  readonly attribute int16u tolerance = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
@@ -1978,606 +2014,570 @@ server cluster RelativeHumidityMeasurement = 1029 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster Scenes = 5 {
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
-  }
-
-  struct ExtensionFieldSet {
-    cluster_id clusterId = 0;
-    AttributeValuePair attributeValueList[] = 1;
-  }
-
-  struct AttributeValuePair {
-    optional attrib_id attributeId = 0;
-    int8u attributeValue[] = 1;
-  }
-
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AddSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    INT16U transitionTime = 2;
-    CHAR_STRING sceneName = 3;
-    ExtensionFieldSet extensionFieldSets[] = 4;
-  }
-
-  request struct ViewSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RemoveSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RemoveAllScenesRequest {
-    group_id groupId = 0;
-  }
-
-  request struct StoreSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RecallSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    optional nullable INT16U transitionTime = 2;
-  }
-
-  request struct GetSceneMembershipRequest {
-    group_id groupId = 0;
-  }
-
-  response struct AddSceneResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
-
-  response struct ViewSceneResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-    optional INT16U transitionTime = 3;
-    optional CHAR_STRING sceneName = 4;
-    optional ExtensionFieldSet extensionFieldSets[] = 5;
-  }
-
-  response struct RemoveSceneResponse = 2 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
-
-  response struct RemoveAllScenesResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-  }
-
-  response struct StoreSceneResponse = 4 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
-
-  response struct GetSceneMembershipResponse = 6 {
-    ENUM8 status = 0;
-    nullable INT8U capacity = 1;
-    group_id groupId = 2;
-    optional INT8U sceneList[] = 3;
-  }
-
-  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
-  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
-  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
-  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
-  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
-  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
-  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
-}
-
-server cluster SoftwareDiagnostics = 52 {
-  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
-    kWaterMarks = 0x1;
-  }
-
-  struct ThreadMetrics {
-    int64u id = 0;
-    optional char_string<8> name = 1;
-    optional int32u stackFreeCurrent = 2;
-    optional int32u stackFreeMinimum = 3;
-    optional int32u stackSize = 4;
+client cluster TargetNavigator = 1285 {
+  enum TargetNavigatorStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kTargetNotFound = 1;
+    kNotAllowed = 2;
   }
 
-  info event SoftwareFault = 0 {
-    SoftwareFaultStruct softwareFault = 0;
+  struct TargetInfo {
+    int8u identifier = 0;
+    char_string<32> name = 1;
   }
 
-  readonly attribute ThreadMetrics threadMetrics[] = 0;
-  readonly attribute int64u currentHeapFree = 1;
-  readonly attribute int64u currentHeapUsed = 2;
-  readonly attribute int64u currentHeapHighWatermark = 3;
+  readonly attribute TargetInfo targetList[] = 0;
+  readonly attribute int8u currentTarget = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
-}
-
-client cluster Switch = 59 {
-  info event SwitchLatched = 0 {
-    INT8U newPosition = 0;
-  }
-
-  info event InitialPress = 1 {
-    INT8U newPosition = 0;
-  }
-
-  info event LongPress = 2 {
-    INT8U newPosition = 0;
+  request struct NavigateTargetRequest {
+    INT8U target = 0;
+    optional CHAR_STRING data = 1;
   }
 
-  info event ShortRelease = 3 {
-    INT8U previousPosition = 0;
+  response struct NavigateTargetResponse = 1 {
+    TargetNavigatorStatusEnum status = 0;
+    optional CHAR_STRING data = 1;
   }
 
-  info event LongRelease = 4 {
-    INT8U previousPosition = 0;
-  }
+  command NavigateTarget(NavigateTargetRequest): NavigateTargetResponse = 0;
+}
 
-  info event MultiPressOngoing = 5 {
-    INT8U newPosition = 0;
-    INT8U currentNumberOfPressesCounted = 1;
+server cluster TargetNavigator = 1285 {
+  enum TargetNavigatorStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kTargetNotFound = 1;
+    kNotAllowed = 2;
   }
 
-  info event MultiPressComplete = 6 {
-    INT8U newPosition = 0;
-    INT8U totalNumberOfPressesCounted = 1;
+  struct TargetInfo {
+    int8u identifier = 0;
+    char_string<32> name = 1;
   }
 
-  readonly attribute int8u numberOfPositions = 0;
-  readonly attribute int8u currentPosition = 1;
-  readonly attribute int8u multiPressMax = 2;
+  readonly attribute TargetInfo targetList[] = 0;
+  readonly attribute int8u currentTarget = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster Switch = 59 {
-  info event SwitchLatched = 0 {
-    INT8U newPosition = 0;
-  }
 
-  info event InitialPress = 1 {
-    INT8U newPosition = 0;
+  request struct NavigateTargetRequest {
+    INT8U target = 0;
+    optional CHAR_STRING data = 1;
   }
 
-  info event LongPress = 2 {
-    INT8U newPosition = 0;
+  response struct NavigateTargetResponse = 1 {
+    TargetNavigatorStatusEnum status = 0;
+    optional CHAR_STRING data = 1;
   }
 
-  info event ShortRelease = 3 {
-    INT8U previousPosition = 0;
-  }
+  command NavigateTarget(NavigateTargetRequest): NavigateTargetResponse = 0;
+}
 
-  info event LongRelease = 4 {
-    INT8U previousPosition = 0;
+client cluster KeypadInput = 1289 {
+  enum CecKeyCode : ENUM8 {
+    kSelect = 0;
+    kUp = 1;
+    kDown = 2;
+    kLeft = 3;
+    kRight = 4;
+    kRightUp = 5;
+    kRightDown = 6;
+    kLeftUp = 7;
+    kLeftDown = 8;
+    kRootMenu = 9;
+    kSetupMenu = 10;
+    kContentsMenu = 11;
+    kFavoriteMenu = 12;
+    kExit = 13;
+    kMediaTopMenu = 16;
+    kMediaContextSensitiveMenu = 17;
+    kNumberEntryMode = 29;
+    kNumber11 = 30;
+    kNumber12 = 31;
+    kNumber0OrNumber10 = 32;
+    kNumbers1 = 33;
+    kNumbers2 = 34;
+    kNumbers3 = 35;
+    kNumbers4 = 36;
+    kNumbers5 = 37;
+    kNumbers6 = 38;
+    kNumbers7 = 39;
+    kNumbers8 = 40;
+    kNumbers9 = 41;
+    kDot = 42;
+    kEnter = 43;
+    kClear = 44;
+    kNextFavorite = 47;
+    kChannelUp = 48;
+    kChannelDown = 49;
+    kPreviousChannel = 50;
+    kSoundSelect = 51;
+    kInputSelect = 52;
+    kDisplayInformation = 53;
+    kHelp = 54;
+    kPageUp = 55;
+    kPageDown = 56;
+    kPower = 64;
+    kVolumeUp = 65;
+    kVolumeDown = 66;
+    kMute = 67;
+    kPlay = 68;
+    kStop = 69;
+    kPause = 70;
+    kRecord = 71;
+    kRewind = 72;
+    kFastForward = 73;
+    kEject = 74;
+    kForward = 75;
+    kBackward = 76;
+    kStopRecord = 77;
+    kPauseRecord = 78;
+    kReserved = 79;
+    kAngle = 80;
+    kSubPicture = 81;
+    kVideoOnDemand = 82;
+    kElectronicProgramGuide = 83;
+    kTimerProgramming = 84;
+    kInitialConfiguration = 85;
+    kSelectBroadcastType = 86;
+    kSelectSoundPresentation = 87;
+    kPlayFunction = 96;
+    kPausePlayFunction = 97;
+    kRecordFunction = 98;
+    kPauseRecordFunction = 99;
+    kStopFunction = 100;
+    kMuteFunction = 101;
+    kRestoreVolumeFunction = 102;
+    kTuneFunction = 103;
+    kSelectMediaFunction = 104;
+    kSelectAvInputFunction = 105;
+    kSelectAudioInputFunction = 106;
+    kPowerToggleFunction = 107;
+    kPowerOffFunction = 108;
+    kPowerOnFunction = 109;
+    kF1Blue = 113;
+    kF2Red = 114;
+    kF3Green = 115;
+    kF4Yellow = 116;
+    kF5 = 117;
+    kData = 118;
   }
 
-  info event MultiPressOngoing = 5 {
-    INT8U newPosition = 0;
-    INT8U currentNumberOfPressesCounted = 1;
+  enum KeypadInputStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kUnsupportedKey = 1;
+    kInvalidKeyInCurrentState = 2;
   }
 
-  info event MultiPressComplete = 6 {
-    INT8U newPosition = 0;
-    INT8U totalNumberOfPressesCounted = 1;
+  bitmap KeypadInputFeature : BITMAP32 {
+    kNavigationKeyCodes = 0x1;
+    kLocationKeys = 0x2;
+    kNumberKeys = 0x4;
   }
 
-  readonly attribute int8u numberOfPositions = 0;
-  readonly attribute int8u currentPosition = 1;
-  readonly attribute int8u multiPressMax = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct SendKeyRequest {
+    CecKeyCode keyCode = 0;
+  }
+
+  response struct SendKeyResponse = 1 {
+    KeypadInputStatusEnum status = 0;
+  }
+
+  command SendKey(SendKeyRequest): SendKeyResponse = 0;
 }
 
-client cluster TargetNavigator = 1285 {
-  enum TargetNavigatorStatusEnum : ENUM8 {
+server cluster KeypadInput = 1289 {
+  enum CecKeyCode : ENUM8 {
+    kSelect = 0;
+    kUp = 1;
+    kDown = 2;
+    kLeft = 3;
+    kRight = 4;
+    kRightUp = 5;
+    kRightDown = 6;
+    kLeftUp = 7;
+    kLeftDown = 8;
+    kRootMenu = 9;
+    kSetupMenu = 10;
+    kContentsMenu = 11;
+    kFavoriteMenu = 12;
+    kExit = 13;
+    kMediaTopMenu = 16;
+    kMediaContextSensitiveMenu = 17;
+    kNumberEntryMode = 29;
+    kNumber11 = 30;
+    kNumber12 = 31;
+    kNumber0OrNumber10 = 32;
+    kNumbers1 = 33;
+    kNumbers2 = 34;
+    kNumbers3 = 35;
+    kNumbers4 = 36;
+    kNumbers5 = 37;
+    kNumbers6 = 38;
+    kNumbers7 = 39;
+    kNumbers8 = 40;
+    kNumbers9 = 41;
+    kDot = 42;
+    kEnter = 43;
+    kClear = 44;
+    kNextFavorite = 47;
+    kChannelUp = 48;
+    kChannelDown = 49;
+    kPreviousChannel = 50;
+    kSoundSelect = 51;
+    kInputSelect = 52;
+    kDisplayInformation = 53;
+    kHelp = 54;
+    kPageUp = 55;
+    kPageDown = 56;
+    kPower = 64;
+    kVolumeUp = 65;
+    kVolumeDown = 66;
+    kMute = 67;
+    kPlay = 68;
+    kStop = 69;
+    kPause = 70;
+    kRecord = 71;
+    kRewind = 72;
+    kFastForward = 73;
+    kEject = 74;
+    kForward = 75;
+    kBackward = 76;
+    kStopRecord = 77;
+    kPauseRecord = 78;
+    kReserved = 79;
+    kAngle = 80;
+    kSubPicture = 81;
+    kVideoOnDemand = 82;
+    kElectronicProgramGuide = 83;
+    kTimerProgramming = 84;
+    kInitialConfiguration = 85;
+    kSelectBroadcastType = 86;
+    kSelectSoundPresentation = 87;
+    kPlayFunction = 96;
+    kPausePlayFunction = 97;
+    kRecordFunction = 98;
+    kPauseRecordFunction = 99;
+    kStopFunction = 100;
+    kMuteFunction = 101;
+    kRestoreVolumeFunction = 102;
+    kTuneFunction = 103;
+    kSelectMediaFunction = 104;
+    kSelectAvInputFunction = 105;
+    kSelectAudioInputFunction = 106;
+    kPowerToggleFunction = 107;
+    kPowerOffFunction = 108;
+    kPowerOnFunction = 109;
+    kF1Blue = 113;
+    kF2Red = 114;
+    kF3Green = 115;
+    kF4Yellow = 116;
+    kF5 = 117;
+    kData = 118;
+  }
+
+  enum KeypadInputStatusEnum : ENUM8 {
     kSuccess = 0;
-    kTargetNotFound = 1;
-    kNotAllowed = 2;
+    kUnsupportedKey = 1;
+    kInvalidKeyInCurrentState = 2;
   }
 
-  struct TargetInfo {
-    int8u identifier = 0;
-    char_string<32> name = 1;
+  bitmap KeypadInputFeature : BITMAP32 {
+    kNavigationKeyCodes = 0x1;
+    kLocationKeys = 0x2;
+    kNumberKeys = 0x4;
   }
 
-  readonly attribute TargetInfo targetList[] = 0;
-  readonly attribute int8u currentTarget = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct NavigateTargetRequest {
-    INT8U target = 0;
-    optional CHAR_STRING data = 1;
+  request struct SendKeyRequest {
+    CecKeyCode keyCode = 0;
   }
 
-  response struct NavigateTargetResponse = 1 {
-    TargetNavigatorStatusEnum status = 0;
-    optional CHAR_STRING data = 1;
+  response struct SendKeyResponse = 1 {
+    KeypadInputStatusEnum status = 0;
   }
 
-  command NavigateTarget(NavigateTargetRequest): NavigateTargetResponse = 0;
+  command SendKey(SendKeyRequest): SendKeyResponse = 0;
 }
 
-server cluster TargetNavigator = 1285 {
-  enum TargetNavigatorStatusEnum : ENUM8 {
+client cluster ContentLauncher = 1290 {
+  enum ContentLaunchStatusEnum : ENUM8 {
     kSuccess = 0;
-    kTargetNotFound = 1;
-    kNotAllowed = 2;
-  }
-
-  struct TargetInfo {
-    int8u identifier = 0;
-    char_string<32> name = 1;
+    kUrlNotAvailable = 1;
+    kAuthFailed = 2;
   }
 
-  readonly attribute TargetInfo targetList[] = 0;
-  readonly attribute int8u currentTarget = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct NavigateTargetRequest {
-    INT8U target = 0;
-    optional CHAR_STRING data = 1;
+  enum MetricTypeEnum : ENUM8 {
+    kPixels = 0;
+    kPercentage = 1;
   }
 
-  response struct NavigateTargetResponse = 1 {
-    TargetNavigatorStatusEnum status = 0;
-    optional CHAR_STRING data = 1;
+  enum ParameterEnum : ENUM8 {
+    kActor = 0;
+    kChannel = 1;
+    kCharacter = 2;
+    kDirector = 3;
+    kEvent = 4;
+    kFranchise = 5;
+    kGenre = 6;
+    kLeague = 7;
+    kPopularity = 8;
+    kProvider = 9;
+    kSport = 10;
+    kSportsTeam = 11;
+    kType = 12;
   }
 
-  command NavigateTarget(NavigateTargetRequest): NavigateTargetResponse = 0;
-}
-
-client cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster Thermostat = 513 {
-  enum SetpointAdjustMode : ENUM8 {
-    kHeatSetpoint = 0;
-    kCoolSetpoint = 1;
-    kHeatAndCoolSetpoints = 2;
+  bitmap ContentLauncherFeature : BITMAP32 {
+    kContentSearch = 0x1;
+    kURLPlayback = 0x2;
   }
 
-  enum ThermostatControlSequence : ENUM8 {
-    kCoolingOnly = 0;
-    kCoolingWithReheat = 1;
-    kHeatingOnly = 2;
-    kHeatingWithReheat = 3;
-    kCoolingAndHeating = 4;
-    kCoolingAndHeatingWithReheat = 5;
+  bitmap SupportedStreamingProtocol : BITMAP32 {
+    kDash = 0x1;
+    kHls = 0x2;
   }
 
-  enum ThermostatRunningMode : ENUM8 {
-    kOff = 0;
-    kCool = 3;
-    kHeat = 4;
+  struct ContentSearch {
+    Parameter parameterList[] = 0;
   }
 
-  enum ThermostatSystemMode : ENUM8 {
-    kOff = 0;
-    kAuto = 1;
-    kCool = 3;
-    kHeat = 4;
-    kEmergencyHeating = 5;
-    kPrecooling = 6;
-    kFanOnly = 7;
+  struct Parameter {
+    ParameterEnum type = 0;
+    char_string value = 1;
+    optional AdditionalInfo externalIDList[] = 2;
   }
 
-  bitmap DayOfWeek : BITMAP8 {
-    kSunday = 0x1;
-    kMonday = 0x2;
-    kTuesday = 0x4;
-    kWednesday = 0x8;
-    kThursday = 0x10;
-    kFriday = 0x20;
-    kSaturday = 0x40;
-    kAwayOrVacation = 0x80;
+  struct AdditionalInfo {
+    char_string name = 0;
+    char_string value = 1;
   }
 
-  bitmap ModeForSequence : BITMAP8 {
-    kHeatSetpointFieldPresent = 0x1;
-    kCoolSetpointFieldPresent = 0x2;
+  struct BrandingInformation {
+    char_string providerName = 0;
+    optional StyleInformation background = 1;
+    optional StyleInformation logo = 2;
+    optional StyleInformation progressBar = 3;
+    optional StyleInformation splash = 4;
+    optional StyleInformation waterMark = 5;
   }
 
-  bitmap ThermostatFeature : BITMAP32 {
-    kHeating = 0x1;
-    kCooling = 0x2;
-    kOccupancy = 0x4;
-    kSchedule = 0x8;
-    kSetback = 0x10;
-    kAutomode = 0x20;
+  struct StyleInformation {
+    optional char_string imageUrl = 0;
+    optional char_string color = 1;
+    optional Dimension size = 2;
   }
 
-  struct ThermostatScheduleTransition {
-    int16u transitionTime = 0;
-    nullable int16s heatSetpoint = 1;
-    nullable int16s coolSetpoint = 2;
+  struct Dimension {
+    double width = 0;
+    double height = 1;
+    MetricTypeEnum metric = 2;
   }
 
-  readonly attribute nullable int16s localTemperature = 0;
-  readonly attribute int16s absMinHeatSetpointLimit = 3;
-  readonly attribute int16s absMinCoolSetpointLimit = 5;
-  readonly attribute int16s absMaxCoolSetpointLimit = 6;
-  attribute int16s occupiedCoolingSetpoint = 17;
-  attribute int16s occupiedHeatingSetpoint = 18;
-  attribute access(write: manage) int16s minHeatSetpointLimit = 21;
-  attribute access(write: manage) int16s maxHeatSetpointLimit = 22;
-  attribute access(write: manage) int16s minCoolSetpointLimit = 23;
-  attribute access(write: manage) int16s maxCoolSetpointLimit = 24;
-  attribute access(write: manage) int8s minSetpointDeadBand = 25;
-  attribute access(write: manage) ThermostatControlSequence controlSequenceOfOperation = 27;
-  attribute access(write: manage) enum8 systemMode = 28;
-  readonly attribute enum8 startOfWeek = 32;
-  readonly attribute int8u numberOfWeeklyTransitions = 33;
-  readonly attribute int8u numberOfDailyTransitions = 34;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-client cluster ThermostatUserInterfaceConfiguration = 516 {
-  attribute enum8 temperatureDisplayMode = 0;
-  attribute access(write: manage) enum8 keypadLockout = 1;
-  attribute access(write: manage) enum8 scheduleProgrammingVisibility = 2;
+  readonly attribute CHAR_STRING acceptHeader[] = 0;
+  attribute bitmap32 supportedStreamingProtocols = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster ThermostatUserInterfaceConfiguration = 516 {
-  attribute enum8 temperatureDisplayMode = 0;
-  attribute access(write: manage) enum8 keypadLockout = 1;
-  attribute access(write: manage) enum8 scheduleProgrammingVisibility = 2;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  request struct LaunchContentRequest {
+    ContentSearch search = 0;
+    BOOLEAN autoPlay = 1;
+    optional CHAR_STRING data = 2;
+  }
+
+  request struct LaunchURLRequest {
+    CHAR_STRING contentURL = 0;
+    optional CHAR_STRING displayString = 1;
+    optional BrandingInformation brandingInformation = 2;
+  }
+
+  response struct LaunchResponse = 2 {
+    ContentLaunchStatusEnum status = 0;
+    optional CHAR_STRING data = 1;
+  }
+
+  command LaunchContent(LaunchContentRequest): LaunchResponse = 0;
+  command LaunchURL(LaunchURLRequest): LaunchResponse = 1;
 }
 
-server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCause : ENUM8 {
-    kUnknown = 0;
-    kAssociationFailed = 1;
-    kAuthenticationFailed = 2;
-    kSsidNotFound = 3;
+server cluster ContentLauncher = 1290 {
+  enum ContentLaunchStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kUrlNotAvailable = 1;
+    kAuthFailed = 2;
+  }
+
+  enum MetricTypeEnum : ENUM8 {
+    kPixels = 0;
+    kPercentage = 1;
+  }
+
+  enum ParameterEnum : ENUM8 {
+    kActor = 0;
+    kChannel = 1;
+    kCharacter = 2;
+    kDirector = 3;
+    kEvent = 4;
+    kFranchise = 5;
+    kGenre = 6;
+    kLeague = 7;
+    kPopularity = 8;
+    kProvider = 9;
+    kSport = 10;
+    kSportsTeam = 11;
+    kType = 12;
+  }
+
+  bitmap ContentLauncherFeature : BITMAP32 {
+    kContentSearch = 0x1;
+    kURLPlayback = 0x2;
   }
 
-  enum SecurityType : ENUM8 {
-    kUnspecified = 0;
-    kNone = 1;
-    kWep = 2;
-    kWpa = 3;
-    kWpa2 = 4;
-    kWpa3 = 5;
+  bitmap SupportedStreamingProtocol : BITMAP32 {
+    kDash = 0x1;
+    kHls = 0x2;
   }
 
-  enum WiFiConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  struct ContentSearch {
+    Parameter parameterList[] = 0;
   }
 
-  enum WiFiVersionType : ENUM8 {
-    k80211a = 0;
-    k80211b = 1;
-    k80211g = 2;
-    k80211n = 3;
-    k80211ac = 4;
-    k80211ax = 5;
+  struct Parameter {
+    ParameterEnum type = 0;
+    char_string value = 1;
+    optional AdditionalInfo externalIDList[] = 2;
   }
 
-  info event Disconnection = 0 {
-    INT16U reasonCode = 0;
+  struct AdditionalInfo {
+    char_string name = 0;
+    char_string value = 1;
   }
 
-  info event AssociationFailure = 1 {
-    AssociationFailureCause associationFailure = 0;
-    INT16U status = 1;
+  struct BrandingInformation {
+    char_string providerName = 0;
+    optional StyleInformation background = 1;
+    optional StyleInformation logo = 2;
+    optional StyleInformation progressBar = 3;
+    optional StyleInformation splash = 4;
+    optional StyleInformation waterMark = 5;
   }
 
-  info event ConnectionStatus = 2 {
-    WiFiConnectionStatus connectionStatus = 0;
+  struct StyleInformation {
+    optional char_string imageUrl = 0;
+    optional char_string color = 1;
+    optional Dimension size = 2;
   }
 
-  readonly attribute nullable octet_string<6> bssid = 0;
-  readonly attribute nullable SecurityType securityType = 1;
-  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
-  readonly attribute nullable int16u channelNumber = 3;
-  readonly attribute nullable int8s rssi = 4;
-  readonly attribute int32u beaconLostCount = 5;
-  readonly attribute int32u beaconRxCount = 6;
-  readonly attribute int32u packetMulticastRxCount = 7;
-  readonly attribute int32u packetMulticastTxCount = 8;
-  readonly attribute int32u packetUnicastRxCount = 9;
-  readonly attribute int32u packetUnicastTxCount = 10;
-  readonly attribute int64u currentMaxRate = 11;
-  readonly attribute int64u overrunCount = 12;
+  struct Dimension {
+    double width = 0;
+    double height = 1;
+    MetricTypeEnum metric = 2;
+  }
+
+  readonly attribute CHAR_STRING acceptHeader[] = 0;
+  attribute bitmap32 supportedStreamingProtocols = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
-}
-
-server cluster WindowCovering = 258 {
-  enum EndProductType : ENUM8 {
-    kRollerShade = 0;
-    kRomanShade = 1;
-    kBalloonShade = 2;
-    kWovenWood = 3;
-    kPleatedShade = 4;
-    kCellularShade = 5;
-    kLayeredShade = 6;
-    kLayeredShade2D = 7;
-    kSheerShade = 8;
-    kTiltOnlyInteriorBlind = 9;
-    kInteriorBlind = 10;
-    kVerticalBlindStripCurtain = 11;
-    kInteriorVenetianBlind = 12;
-    kExteriorVenetianBlind = 13;
-    kLateralLeftCurtain = 14;
-    kLateralRightCurtain = 15;
-    kCentralCurtain = 16;
-    kRollerShutter = 17;
-    kExteriorVerticalScreen = 18;
-    kAwningTerracePatio = 19;
-    kAwningVerticalScreen = 20;
-    kTiltOnlyPergola = 21;
-    kSwingingShutter = 22;
-    kSlidingShutter = 23;
-    kUnknown = 255;
-  }
-
-  enum Type : ENUM8 {
-    kRollerShade = 0;
-    kRollerShade2Motor = 1;
-    kRollerShadeExterior = 2;
-    kRollerShadeExterior2Motor = 3;
-    kDrapery = 4;
-    kAwning = 5;
-    kShutter = 6;
-    kTiltBlindTiltOnly = 7;
-    kTiltBlindLiftAndTilt = 8;
-    kProjectorScreen = 9;
-    kUnknown = 255;
+  request struct LaunchContentRequest {
+    ContentSearch search = 0;
+    BOOLEAN autoPlay = 1;
+    optional CHAR_STRING data = 2;
   }
 
-  bitmap ConfigStatus : BITMAP8 {
-    kOperational = 0x1;
-    kOnlineReserved = 0x2;
-    kLiftMovementReversed = 0x4;
-    kLiftPositionAware = 0x8;
-    kTiltPositionAware = 0x10;
-    kLiftEncoderControlled = 0x20;
-    kTiltEncoderControlled = 0x40;
+  request struct LaunchURLRequest {
+    CHAR_STRING contentURL = 0;
+    optional CHAR_STRING displayString = 1;
+    optional BrandingInformation brandingInformation = 2;
   }
 
-  bitmap Feature : BITMAP32 {
-    kLift = 0x1;
-    kTilt = 0x2;
-    kPositionAwareLift = 0x4;
-    kAbsolutePosition = 0x8;
-    kPositionAwareTilt = 0x10;
+  response struct LaunchResponse = 2 {
+    ContentLaunchStatusEnum status = 0;
+    optional CHAR_STRING data = 1;
   }
 
-  bitmap Mode : BITMAP8 {
-    kMotorDirectionReversed = 0x1;
-    kCalibrationMode = 0x2;
-    kMaintenanceMode = 0x4;
-    kLedFeedback = 0x8;
-  }
+  command LaunchContent(LaunchContentRequest): LaunchResponse = 0;
+  command LaunchURL(LaunchURLRequest): LaunchResponse = 1;
+}
 
-  bitmap OperationalStatus : BITMAP8 {
-    kGlobal = 0x3;
-    kLift = 0xC;
-    kTilt = 0x30;
+client cluster ApplicationBasic = 1293 {
+  enum ApplicationStatusEnum : ENUM8 {
+    kStopped = 0;
+    kActiveVisibleFocus = 1;
+    kActiveHidden = 2;
+    kActiveVisibleNotFocus = 3;
   }
 
-  bitmap SafetyStatus : BITMAP16 {
-    kRemoteLockout = 0x1;
-    kTamperDetection = 0x2;
-    kFailedCommunication = 0x4;
-    kPositionFailure = 0x8;
-    kThermalProtection = 0x10;
-    kObstacleDetected = 0x20;
-    kPower = 0x40;
-    kStopInput = 0x80;
-    kMotorJammed = 0x100;
-    kHardwareFailure = 0x200;
-    kManualOperation = 0x400;
-    kProtection = 0x800;
+  struct ApplicationBasicApplication {
+    int16u catalogVendorId = 0;
+    char_string applicationId = 1;
   }
 
-  readonly attribute Type type = 0;
-  readonly attribute nullable int16u currentPositionLift = 3;
-  readonly attribute nullable int16u currentPositionTilt = 4;
-  readonly attribute ConfigStatus configStatus = 7;
-  readonly attribute nullable Percent currentPositionLiftPercentage = 8;
-  readonly attribute nullable Percent currentPositionTiltPercentage = 9;
-  readonly attribute OperationalStatus operationalStatus = 10;
-  readonly attribute nullable Percent100ths targetPositionLiftPercent100ths = 11;
-  readonly attribute nullable Percent100ths targetPositionTiltPercent100ths = 12;
-  readonly attribute EndProductType endProductType = 13;
-  readonly attribute nullable Percent100ths currentPositionLiftPercent100ths = 14;
-  readonly attribute nullable Percent100ths currentPositionTiltPercent100ths = 15;
-  readonly attribute int16u installedOpenLimitLift = 16;
-  readonly attribute int16u installedClosedLimitLift = 17;
-  readonly attribute int16u installedOpenLimitTilt = 18;
-  readonly attribute int16u installedClosedLimitTilt = 19;
-  attribute access(write: manage) Mode mode = 23;
-  readonly attribute SafetyStatus safetyStatus = 26;
+  readonly attribute char_string<32> vendorName = 0;
+  readonly attribute int16u vendorID = 1;
+  readonly attribute char_string<32> applicationName = 2;
+  readonly attribute int16u productID = 3;
+  readonly attribute ApplicationBasicApplication application = 4;
+  readonly attribute ApplicationStatusEnum status = 5;
+  readonly attribute char_string<32> applicationVersion = 6;
+  readonly attribute vendor_id allowedVendorList[] = 7;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct GoToLiftValueRequest {
-    INT16U liftValue = 0;
-  }
-
-  request struct GoToLiftPercentageRequest {
-    Percent100ths liftPercent100thsValue = 0;
-  }
-
-  request struct GoToTiltValueRequest {
-    INT16U tiltValue = 0;
+server cluster ApplicationBasic = 1293 {
+  enum ApplicationStatusEnum : ENUM8 {
+    kStopped = 0;
+    kActiveVisibleFocus = 1;
+    kActiveHidden = 2;
+    kActiveVisibleNotFocus = 3;
   }
 
-  request struct GoToTiltPercentageRequest {
-    Percent100ths tiltPercent100thsValue = 0;
+  struct ApplicationBasicApplication {
+    int16u catalogVendorId = 0;
+    char_string applicationId = 1;
   }
 
-  command UpOrOpen(): DefaultSuccess = 0;
-  command DownOrClose(): DefaultSuccess = 1;
-  command StopMotion(): DefaultSuccess = 2;
-  command GoToLiftValue(GoToLiftValueRequest): DefaultSuccess = 4;
-  command GoToLiftPercentage(GoToLiftPercentageRequest): DefaultSuccess = 5;
-  command GoToTiltValue(GoToTiltValueRequest): DefaultSuccess = 7;
-  command GoToTiltPercentage(GoToTiltPercentageRequest): DefaultSuccess = 8;
+  readonly attribute char_string<32> vendorName = 0;
+  readonly attribute int16u vendorID = 1;
+  readonly attribute char_string<32> applicationName = 2;
+  readonly attribute int16u productID = 3;
+  readonly attribute ApplicationBasicApplication application = 4;
+  readonly attribute ApplicationStatusEnum status = 5;
+  readonly attribute char_string<32> applicationVersion = 6;
+  readonly attribute vendor_id allowedVendorList[] = 7;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
 endpoint 0 {
diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter
index 4e1febd4c9a69f..073b7e45a9845b 100644
--- a/examples/pump-app/pump-common/pump-app.matter
+++ b/examples/pump-app/pump-common/pump-app.matter
@@ -1,6 +1,205 @@
 // This IDL was generated automatically by ZAP.
 // It is for view/code review purposes only.
 
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
+  }
+
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
+  }
+
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
+  }
+
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
+  }
+
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+}
+
+server cluster OnOff = 6 {
+  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
+    kFadeToOffIn0p8Seconds = 0;
+    kNoFade = 1;
+    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
+  }
+
+  enum OnOffDyingLightEffectVariant : ENUM8 {
+    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
+  }
+
+  enum OnOffEffectIdentifier : ENUM8 {
+    kDelayedAllOff = 0;
+    kDyingLight = 1;
+  }
+
+  enum OnOffStartUpOnOff : ENUM8 {
+    kOff = 0;
+    kOn = 1;
+    kTogglePreviousOnOff = 2;
+  }
+
+  bitmap OnOffControl : BITMAP8 {
+    kAcceptOnlyWhenOn = 0x1;
+  }
+
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
+  }
+
+  bitmap SceneFeatures : BITMAP32 {
+    kSceneNames = 0x1;
+  }
+
+  readonly attribute boolean onOff = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command Off(): DefaultSuccess = 0;
+  command On(): DefaultSuccess = 1;
+  command Toggle(): DefaultSuccess = 2;
+}
+
+server cluster LevelControl = 8 {
+  enum MoveMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
+  }
+
+  enum StepMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
+  }
+
+  bitmap LevelControlFeature : BITMAP32 {
+    kOnOff = 0x1;
+    kLighting = 0x2;
+    kFrequency = 0x4;
+  }
+
+  readonly attribute int8u currentLevel = 0;
+  readonly attribute int8u minLevel = 2;
+  readonly attribute int8u maxLevel = 3;
+  attribute bitmap8 options = 15;
+  attribute nullable int8u onLevel = 17;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct MoveToLevelRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
+  }
+
+  request struct MoveRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
+  }
+
+  request struct StepRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionMask = 3;
+    BITMAP8 optionOverride = 4;
+  }
+
+  request struct StopRequest {
+    BITMAP8 optionMask = 0;
+    BITMAP8 optionOverride = 1;
+  }
+
+  request struct MoveToLevelWithOnOffRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
+  }
+
+  request struct MoveWithOnOffRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
+  }
+
+  request struct StepWithOnOffRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
+  }
+
+  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
+  command Move(MoveRequest): DefaultSuccess = 1;
+  command Step(StepRequest): DefaultSuccess = 2;
+  command Stop(StopRequest): DefaultSuccess = 3;
+  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
+  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
+  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
+  command StopWithOnOff(): DefaultSuccess = 7;
+}
+
+server cluster Descriptor = 29 {
+  struct DeviceType {
+    devtype_id type = 0;
+    int16u revision = 1;
+  }
+
+  readonly attribute DeviceType deviceList[] = 0;
+  readonly attribute CLUSTER_ID serverList[] = 1;
+  readonly attribute CLUSTER_ID clientList[] = 2;
+  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Binding = 30 {
+  struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  attribute TargetStruct binding[] = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
 server cluster AccessControl = 31 {
   enum AuthMode : ENUM8 {
     kPase = 1;
@@ -69,45 +268,6 @@ server cluster AccessControl = 31 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
-  }
-
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
-  }
-
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
-  }
-
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-  }
-
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
-
 server cluster Basic = 40 {
   struct CapabilityMinimaStruct {
     int16u caseSessionsPerFabric = 0;
@@ -152,50 +312,141 @@ server cluster Basic = 40 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster Binding = 30 {
-  struct TargetStruct {
-    optional node_id node = 1;
-    optional group_id group = 2;
-    optional endpoint_no endpoint = 3;
-    optional cluster_id cluster = 4;
-    fabric_idx fabricIndex = 254;
+client cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
   }
 
-  attribute TargetStruct binding[] = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
+  }
 
-server cluster Descriptor = 29 {
-  struct DeviceType {
-    devtype_id type = 0;
-    int16u revision = 1;
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
   }
 
-  readonly attribute DeviceType deviceList[] = 0;
-  readonly attribute CLUSTER_ID serverList[] = 1;
-  readonly attribute CLUSTER_ID clientList[] = 2;
-  readonly attribute ENDPOINT_NO partsList[] = 3;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
+  }
+
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
+  }
+
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
+  }
+
+  response struct QueryImageResponse = 1 {
+    OTAQueryStatus status = 0;
+    optional INT32U delayedActionTime = 1;
+    optional CHAR_STRING imageURI = 2;
+    optional INT32U softwareVersion = 3;
+    optional CHAR_STRING softwareVersionString = 4;
+    optional OCTET_STRING updateToken = 5;
+    optional BOOLEAN userConsentNeeded = 6;
+    optional OCTET_STRING metadataForRequestor = 7;
+  }
+
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
+  }
+
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
 }
 
-server cluster FlowMeasurement = 1028 {
-  readonly attribute nullable int16u measuredValue = 0;
-  readonly attribute nullable int16u minMeasuredValue = 1;
-  readonly attribute nullable int16u maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
+server cluster OtaSoftwareUpdateRequestor = 42 {
+  enum OTAAnnouncementReason : ENUM8 {
+    kSimpleAnnouncement = 0;
+    kUpdateAvailable = 1;
+    kUrgentUpdateAvailable = 2;
+  }
+
+  enum OTAChangeReasonEnum : ENUM8 {
+    kUnknown = 0;
+    kSuccess = 1;
+    kFailure = 2;
+    kTimeOut = 3;
+    kDelayByProvider = 4;
+  }
+
+  enum OTAUpdateStateEnum : ENUM8 {
+    kUnknown = 0;
+    kIdle = 1;
+    kQuerying = 2;
+    kDelayedOnQuery = 3;
+    kDownloading = 4;
+    kApplying = 5;
+    kDelayedOnApply = 6;
+    kRollingBack = 7;
+    kDelayedOnUserConsent = 8;
+  }
+
+  struct ProviderLocation {
+    node_id providerNodeID = 1;
+    endpoint_no endpoint = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  info event StateTransition = 0 {
+    OTAUpdateStateEnum previousState = 0;
+    OTAUpdateStateEnum newState = 1;
+    OTAChangeReasonEnum reason = 2;
+    nullable INT32U targetSoftwareVersion = 3;
+  }
+
+  critical event VersionApplied = 1 {
+    INT32U softwareVersion = 0;
+    INT16U productID = 1;
+  }
+
+  info event DownloadError = 2 {
+    INT32U softwareVersion = 0;
+    INT64U bytesDownloaded = 1;
+    nullable INT8U progressPercent = 2;
+    nullable INT64S platformCode = 3;
+  }
+
+  attribute ProviderLocation defaultOtaProviders[] = 0;
+  readonly attribute boolean updatePossible = 1;
+  readonly attribute OTAUpdateStateEnum updateState = 2;
+  readonly attribute nullable int8u updateStateProgress = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct AnnounceOtaProviderRequest {
+    node_id providerNodeId = 0;
+    vendor_id vendorId = 1;
+    OTAAnnouncementReason announcementReason = 2;
+    optional OCTET_STRING metadataForNode = 3;
+    endpoint_no endpoint = 4;
+  }
+
+  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
 }
 
 server cluster GeneralCommissioning = 48 {
@@ -260,606 +511,380 @@ server cluster GeneralCommissioning = 48 {
   command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
 }
 
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatus : ENUM8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
   }
 
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
+  enum WiFiBand : ENUM8 {
+    k2g4 = 0;
+    k3g65 = 1;
+    k5g = 2;
+    k6g = 3;
+    k60g = 4;
   }
 
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
+  bitmap NetworkCommissioningFeature : BITMAP32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
   }
 
-  enum NetworkFaultType : ENUM8 {
-    kUnspecified = 0;
-    kHardwareFailure = 1;
-    kNetworkJammed = 2;
-    kConnectionFailed = 3;
+  bitmap WiFiSecurity : BITMAP8 {
+    kUnencrypted = 0x1;
+    kWepPersonal = 0x2;
+    kWpaPersonal = 0x4;
+    kWpa2Personal = 0x8;
+    kWpa3Personal = 0x10;
   }
 
-  enum RadioFaultType : ENUM8 {
-    kUnspecified = 0;
-    kWiFiFault = 1;
-    kCellularFault = 2;
-    kThreadFault = 3;
-    kNFCFault = 4;
-    kBLEFault = 5;
-    kEthernetFault = 6;
+  struct NetworkInfo {
+    octet_string<32> networkID = 0;
+    boolean connected = 1;
   }
 
-  struct NetworkInterfaceType {
-    char_string<32> name = 0;
-    boolean isOperational = 1;
-    nullable boolean offPremiseServicesReachableIPv4 = 2;
-    nullable boolean offPremiseServicesReachableIPv6 = 3;
-    octet_string<8> hardwareAddress = 4;
-    octet_string IPv4Addresses[] = 5;
-    octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+  struct WiFiInterfaceScanResult {
+    WiFiSecurity security = 0;
+    octet_string<32> ssid = 1;
+    octet_string<6> bssid = 2;
+    int16u channel = 3;
+    WiFiBand wiFiBand = 4;
+    int8s rssi = 5;
   }
 
-  critical event HardwareFaultChange = 0 {
-    HardwareFaultType current[] = 0;
-    HardwareFaultType previous[] = 1;
+  struct ThreadInterfaceScanResult {
+    int16u panId = 0;
+    int64u extendedPanId = 1;
+    char_string<16> networkName = 2;
+    int16u channel = 3;
+    int8u version = 4;
+    octet_string<8> extendedAddress = 5;
+    int8s rssi = 6;
+    int8u lqi = 7;
   }
 
-  critical event RadioFaultChange = 1 {
-    RadioFaultType current[] = 0;
-    RadioFaultType previous[] = 1;
-  }
+  readonly attribute access(read: administer) int8u maxNetworks = 0;
+  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
+  readonly attribute int8u scanMaxTimeSeconds = 2;
+  readonly attribute int8u connectMaxTimeSeconds = 3;
+  attribute access(write: administer) boolean interfaceEnabled = 4;
+  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
+  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
+  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+  request struct ScanNetworksRequest {
+    optional nullable OCTET_STRING ssid = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  critical event BootReason = 3 {
-    BootReasonType bootReason = 0;
+  request struct AddOrUpdateThreadNetworkRequest {
+    OCTET_STRING operationalDataset = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
-  readonly attribute int16u rebootCount = 1;
-  readonly attribute boolean testEventTriggersEnabled = 8;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct TestEventTriggerRequest {
-    OCTET_STRING enableKey = 0;
-    INT64U eventTrigger = 1;
+  request struct RemoveNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
-}
+  request struct ConnectNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
+  }
 
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
+  request struct ReorderNetworkRequest {
+    OCTET_STRING networkID = 0;
+    INT8U networkIndex = 1;
+    optional INT64U breadcrumb = 2;
   }
 
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
-    fabric_idx fabricIndex = 254;
+  response struct ScanNetworksResponse = 1 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
+    optional ThreadInterfaceScanResult threadScanResults[] = 3;
   }
 
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
+  response struct NetworkConfigResponse = 5 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional INT8U networkIndex = 2;
   }
 
-  struct GroupKeySetStruct {
-    int16u groupKeySetID = 0;
-    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
-    nullable octet_string<16> epochKey0 = 2;
-    nullable epoch_us epochStartTime0 = 3;
-    nullable octet_string<16> epochKey1 = 4;
-    nullable epoch_us epochStartTime1 = 5;
-    nullable octet_string<16> epochKey2 = 6;
-    nullable epoch_us epochStartTime2 = 7;
+  response struct ConnectNetworkResponse = 7 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    nullable INT32S errorValue = 2;
   }
 
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
-  readonly attribute int16u maxGroupsPerFabric = 2;
-  readonly attribute int16u maxGroupKeysPerFabric = 3;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
+  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
+  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
+  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
+  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+}
 
-  request struct KeySetWriteRequest {
-    GroupKeySetStruct groupKeySet = 0;
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
   }
 
-  request struct KeySetReadRequest {
-    INT16U groupKeySetID = 0;
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
   }
 
-  request struct KeySetRemoveRequest {
-    INT16U groupKeySetID = 0;
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
   }
 
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
   }
 
-  response struct KeySetReadResponse = 2 {
-    GroupKeySetStruct groupKeySet = 0;
+  enum RadioFaultType : ENUM8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
   }
 
-  response struct KeySetReadAllIndicesResponse = 5 {
-    INT16U groupKeySetIDs[] = 0;
+  struct NetworkInterfaceType {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceType type = 7;
   }
 
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
-}
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultType current[] = 0;
+    HardwareFaultType previous[] = 1;
+  }
 
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
+  critical event RadioFaultChange = 1 {
+    RadioFaultType current[] = 0;
+    RadioFaultType previous[] = 1;
   }
 
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultType current[] = 0;
+    NetworkFaultType previous[] = 1;
   }
 
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
+  critical event BootReason = 3 {
+    BootReasonType bootReason = 0;
   }
 
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
+  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
   }
 
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
-server cluster LevelControl = 8 {
-  enum MoveMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
-  }
-
-  enum StepMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
+server cluster ThreadNetworkDiagnostics = 53 {
+  enum NetworkFault : ENUM8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
   }
 
-  bitmap LevelControlFeature : BITMAP32 {
-    kOnOff = 0x1;
-    kLighting = 0x2;
-    kFrequency = 0x4;
+  enum RoutingRole : ENUM8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kReed = 4;
+    kRouter = 5;
+    kLeader = 6;
   }
 
-  readonly attribute int8u currentLevel = 0;
-  readonly attribute int8u minLevel = 2;
-  readonly attribute int8u maxLevel = 3;
-  attribute bitmap8 options = 15;
-  attribute nullable int8u onLevel = 17;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct MoveToLevelRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
+  enum ThreadConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  request struct MoveRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
+  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+    kMLECounts = 0x4;
+    kMACCounts = 0x8;
   }
 
-  request struct StepRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionMask = 3;
-    BITMAP8 optionOverride = 4;
-  }
-
-  request struct StopRequest {
-    BITMAP8 optionMask = 0;
-    BITMAP8 optionOverride = 1;
-  }
-
-  request struct MoveToLevelWithOnOffRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
-  }
-
-  request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
-  }
-
-  request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
-  }
-
-  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
-  command Move(MoveRequest): DefaultSuccess = 1;
-  command Step(StepRequest): DefaultSuccess = 2;
-  command Stop(StopRequest): DefaultSuccess = 3;
-  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
-  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
-  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
-  command StopWithOnOff(): DefaultSuccess = 7;
-}
-
-server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatus : ENUM8 {
-    kSuccess = 0;
-    kOutOfRange = 1;
-    kBoundsExceeded = 2;
-    kNetworkIDNotFound = 3;
-    kDuplicateNetworkID = 4;
-    kNetworkNotFound = 5;
-    kRegulatoryError = 6;
-    kAuthFailure = 7;
-    kUnsupportedSecurity = 8;
-    kOtherConnectionFailure = 9;
-    kIPV6Failed = 10;
-    kIPBindFailed = 11;
-    kUnknownError = 12;
-  }
-
-  enum WiFiBand : ENUM8 {
-    k2g4 = 0;
-    k3g65 = 1;
-    k5g = 2;
-    k6g = 3;
-    k60g = 4;
-  }
-
-  bitmap NetworkCommissioningFeature : BITMAP32 {
-    kWiFiNetworkInterface = 0x1;
-    kThreadNetworkInterface = 0x2;
-    kEthernetNetworkInterface = 0x4;
-  }
-
-  bitmap WiFiSecurity : BITMAP8 {
-    kUnencrypted = 0x1;
-    kWepPersonal = 0x2;
-    kWpaPersonal = 0x4;
-    kWpa2Personal = 0x8;
-    kWpa3Personal = 0x10;
-  }
-
-  struct NetworkInfo {
-    octet_string<32> networkID = 0;
-    boolean connected = 1;
-  }
-
-  struct WiFiInterfaceScanResult {
-    WiFiSecurity security = 0;
-    octet_string<32> ssid = 1;
-    octet_string<6> bssid = 2;
-    int16u channel = 3;
-    WiFiBand wiFiBand = 4;
-    int8s rssi = 5;
-  }
-
-  struct ThreadInterfaceScanResult {
-    int16u panId = 0;
-    int64u extendedPanId = 1;
-    char_string<16> networkName = 2;
-    int16u channel = 3;
-    int8u version = 4;
-    octet_string<8> extendedAddress = 5;
-    int8s rssi = 6;
-    int8u lqi = 7;
-  }
-
-  readonly attribute access(read: administer) int8u maxNetworks = 0;
-  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
-  readonly attribute int8u scanMaxTimeSeconds = 2;
-  readonly attribute int8u connectMaxTimeSeconds = 3;
-  attribute access(write: administer) boolean interfaceEnabled = 4;
-  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
-  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
-  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct ScanNetworksRequest {
-    optional nullable OCTET_STRING ssid = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct AddOrUpdateThreadNetworkRequest {
-    OCTET_STRING operationalDataset = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct RemoveNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct ConnectNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct ReorderNetworkRequest {
-    OCTET_STRING networkID = 0;
-    INT8U networkIndex = 1;
-    optional INT64U breadcrumb = 2;
-  }
-
-  response struct ScanNetworksResponse = 1 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
-    optional ThreadInterfaceScanResult threadScanResults[] = 3;
-  }
-
-  response struct NetworkConfigResponse = 5 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional INT8U networkIndex = 2;
-  }
-
-  response struct ConnectNetworkResponse = 7 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    nullable INT32S errorValue = 2;
-  }
-
-  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
-  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
-  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
-  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
-  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
-}
-
-client cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
-  }
-
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
-  }
-
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
-  }
-
-
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
-  }
-
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
-  }
-
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
-  }
-
-  response struct QueryImageResponse = 1 {
-    OTAQueryStatus status = 0;
-    optional INT32U delayedActionTime = 1;
-    optional CHAR_STRING imageURI = 2;
-    optional INT32U softwareVersion = 3;
-    optional CHAR_STRING softwareVersionString = 4;
-    optional OCTET_STRING updateToken = 5;
-    optional BOOLEAN userConsentNeeded = 6;
-    optional OCTET_STRING metadataForRequestor = 7;
-  }
-
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
-  }
-
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
-}
-
-server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum OTAAnnouncementReason : ENUM8 {
-    kSimpleAnnouncement = 0;
-    kUpdateAvailable = 1;
-    kUrgentUpdateAvailable = 2;
-  }
-
-  enum OTAChangeReasonEnum : ENUM8 {
-    kUnknown = 0;
-    kSuccess = 1;
-    kFailure = 2;
-    kTimeOut = 3;
-    kDelayByProvider = 4;
-  }
-
-  enum OTAUpdateStateEnum : ENUM8 {
-    kUnknown = 0;
-    kIdle = 1;
-    kQuerying = 2;
-    kDelayedOnQuery = 3;
-    kDownloading = 4;
-    kApplying = 5;
-    kDelayedOnApply = 6;
-    kRollingBack = 7;
-    kDelayedOnUserConsent = 8;
-  }
-
-  struct ProviderLocation {
-    node_id providerNodeID = 1;
-    endpoint_no endpoint = 2;
-    fabric_idx fabricIndex = 254;
-  }
-
-  info event StateTransition = 0 {
-    OTAUpdateStateEnum previousState = 0;
-    OTAUpdateStateEnum newState = 1;
-    OTAChangeReasonEnum reason = 2;
-    nullable INT32U targetSoftwareVersion = 3;
-  }
-
-  critical event VersionApplied = 1 {
-    INT32U softwareVersion = 0;
-    INT16U productID = 1;
-  }
-
-  info event DownloadError = 2 {
-    INT32U softwareVersion = 0;
-    INT64U bytesDownloaded = 1;
-    nullable INT8U progressPercent = 2;
-    nullable INT64S platformCode = 3;
+  struct NeighborTable {
+    int64u extAddress = 0;
+    int32u age = 1;
+    int16u rloc16 = 2;
+    int32u linkFrameCounter = 3;
+    int32u mleFrameCounter = 4;
+    int8u lqi = 5;
+    nullable int8s averageRssi = 6;
+    nullable int8s lastRssi = 7;
+    int8u frameErrorRate = 8;
+    int8u messageErrorRate = 9;
+    boolean rxOnWhenIdle = 10;
+    boolean fullThreadDevice = 11;
+    boolean fullNetworkData = 12;
+    boolean isChild = 13;
   }
 
-  attribute ProviderLocation defaultOtaProviders[] = 0;
-  readonly attribute boolean updatePossible = 1;
-  readonly attribute OTAUpdateStateEnum updateState = 2;
-  readonly attribute nullable int8u updateStateProgress = 3;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AnnounceOtaProviderRequest {
-    node_id providerNodeId = 0;
-    vendor_id vendorId = 1;
-    OTAAnnouncementReason announcementReason = 2;
-    optional OCTET_STRING metadataForNode = 3;
-    endpoint_no endpoint = 4;
+  struct RouteTable {
+    int64u extAddress = 0;
+    int16u rloc16 = 1;
+    int8u routerId = 2;
+    int8u nextHop = 3;
+    int8u pathCost = 4;
+    int8u LQIIn = 5;
+    int8u LQIOut = 6;
+    int8u age = 7;
+    boolean allocated = 8;
+    boolean linkEstablished = 9;
   }
 
-  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
-}
-
-client cluster OccupancySensing = 1030 {
-}
-
-server cluster OnOff = 6 {
-  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
-    kFadeToOffIn0p8Seconds = 0;
-    kNoFade = 1;
-    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
+  struct SecurityPolicy {
+    int16u rotationTime = 0;
+    bitmap16 flags = 1;
   }
 
-  enum OnOffDyingLightEffectVariant : ENUM8 {
-    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
+  struct OperationalDatasetComponents {
+    boolean activeTimestampPresent = 0;
+    boolean pendingTimestampPresent = 1;
+    boolean masterKeyPresent = 2;
+    boolean networkNamePresent = 3;
+    boolean extendedPanIdPresent = 4;
+    boolean meshLocalPrefixPresent = 5;
+    boolean delayPresent = 6;
+    boolean panIdPresent = 7;
+    boolean channelPresent = 8;
+    boolean pskcPresent = 9;
+    boolean securityPolicyPresent = 10;
+    boolean channelMaskPresent = 11;
   }
 
-  enum OnOffEffectIdentifier : ENUM8 {
-    kDelayedAllOff = 0;
-    kDyingLight = 1;
+  info event ConnectionStatus = 0 {
+    ThreadConnectionStatus connectionStatus = 0;
   }
 
-  enum OnOffStartUpOnOff : ENUM8 {
-    kOff = 0;
-    kOn = 1;
-    kTogglePreviousOnOff = 2;
-  }
+  readonly attribute nullable int16u channel = 0;
+  readonly attribute nullable RoutingRole routingRole = 1;
+  readonly attribute nullable char_string<16> networkName = 2;
+  readonly attribute nullable int16u panId = 3;
+  readonly attribute nullable int64u extendedPanId = 4;
+  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
+  readonly attribute NeighborTable neighborTableList[] = 7;
+  readonly attribute RouteTable routeTableList[] = 8;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
+  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  bitmap OnOffControl : BITMAP8 {
-    kAcceptOnlyWhenOn = 0x1;
-  }
+  command ResetCounts(): DefaultSuccess = 0;
+}
 
-  bitmap OnOffFeature : BITMAP32 {
-    kLighting = 0x1;
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
   }
 
-  bitmap SceneFeatures : BITMAP32 {
-    kSceneNames = 0x1;
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
   }
 
-  readonly attribute boolean onOff = 0;
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command Off(): DefaultSuccess = 0;
-  command On(): DefaultSuccess = 1;
-  command Toggle(): DefaultSuccess = 2;
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
+  }
+
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+  }
+
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
 server cluster OperationalCredentials = 62 {
@@ -972,25 +997,74 @@ server cluster OperationalCredentials = 62 {
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
 }
 
-server cluster PressureMeasurement = 1027 {
-  bitmap PressureFeature : BITMAP32 {
-    kExt = 0x1;
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
   }
 
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
-  readonly attribute nullable int16s scaledValue = 16;
-  readonly attribute nullable int16s minScaledValue = 17;
-  readonly attribute nullable int16s maxScaledValue = 18;
-  readonly attribute int16u scaledTolerance = 19;
-  readonly attribute int8s scale = 20;
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
 }
 
 server cluster PumpConfigurationAndControl = 512 {
@@ -1115,114 +1189,40 @@ server cluster TemperatureMeasurement = 1026 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster ThreadNetworkDiagnostics = 53 {
-  enum NetworkFault : ENUM8 {
-    kUnspecified = 0;
-    kLinkDown = 1;
-    kHardwareFailure = 2;
-    kNetworkJammed = 3;
-  }
-
-  enum RoutingRole : ENUM8 {
-    kUnspecified = 0;
-    kUnassigned = 1;
-    kSleepyEndDevice = 2;
-    kEndDevice = 3;
-    kReed = 4;
-    kRouter = 5;
-    kLeader = 6;
-  }
-
-  enum ThreadConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
-  }
-
-  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
-    kPacketCounts = 0x1;
-    kErrorCounts = 0x2;
-    kMLECounts = 0x4;
-    kMACCounts = 0x8;
-  }
-
-  struct NeighborTable {
-    int64u extAddress = 0;
-    int32u age = 1;
-    int16u rloc16 = 2;
-    int32u linkFrameCounter = 3;
-    int32u mleFrameCounter = 4;
-    int8u lqi = 5;
-    nullable int8s averageRssi = 6;
-    nullable int8s lastRssi = 7;
-    int8u frameErrorRate = 8;
-    int8u messageErrorRate = 9;
-    boolean rxOnWhenIdle = 10;
-    boolean fullThreadDevice = 11;
-    boolean fullNetworkData = 12;
-    boolean isChild = 13;
-  }
-
-  struct RouteTable {
-    int64u extAddress = 0;
-    int16u rloc16 = 1;
-    int8u routerId = 2;
-    int8u nextHop = 3;
-    int8u pathCost = 4;
-    int8u LQIIn = 5;
-    int8u LQIOut = 6;
-    int8u age = 7;
-    boolean allocated = 8;
-    boolean linkEstablished = 9;
-  }
-
-  struct SecurityPolicy {
-    int16u rotationTime = 0;
-    bitmap16 flags = 1;
-  }
-
-  struct OperationalDatasetComponents {
-    boolean activeTimestampPresent = 0;
-    boolean pendingTimestampPresent = 1;
-    boolean masterKeyPresent = 2;
-    boolean networkNamePresent = 3;
-    boolean extendedPanIdPresent = 4;
-    boolean meshLocalPrefixPresent = 5;
-    boolean delayPresent = 6;
-    boolean panIdPresent = 7;
-    boolean channelPresent = 8;
-    boolean pskcPresent = 9;
-    boolean securityPolicyPresent = 10;
-    boolean channelMaskPresent = 11;
+server cluster PressureMeasurement = 1027 {
+  bitmap PressureFeature : BITMAP32 {
+    kExt = 0x1;
   }
 
-  info event ConnectionStatus = 0 {
-    ThreadConnectionStatus connectionStatus = 0;
-  }
+  readonly attribute nullable int16s measuredValue = 0;
+  readonly attribute nullable int16s minMeasuredValue = 1;
+  readonly attribute nullable int16s maxMeasuredValue = 2;
+  readonly attribute int16u tolerance = 3;
+  readonly attribute nullable int16s scaledValue = 16;
+  readonly attribute nullable int16s minScaledValue = 17;
+  readonly attribute nullable int16s maxScaledValue = 18;
+  readonly attribute int16u scaledTolerance = 19;
+  readonly attribute int8s scale = 20;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable RoutingRole routingRole = 1;
-  readonly attribute nullable char_string<16> networkName = 2;
-  readonly attribute nullable int16u panId = 3;
-  readonly attribute nullable int64u extendedPanId = 4;
-  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
-  readonly attribute NeighborTable neighborTableList[] = 7;
-  readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
-  readonly attribute nullable int8u leaderRouterId = 13;
-  readonly attribute nullable SecurityPolicy securityPolicy = 59;
-  readonly attribute nullable octet_string<4> channelMask = 60;
-  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
-  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+server cluster FlowMeasurement = 1028 {
+  readonly attribute nullable int16u measuredValue = 0;
+  readonly attribute nullable int16u minMeasuredValue = 1;
+  readonly attribute nullable int16u maxMeasuredValue = 2;
+  readonly attribute int16u tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  command ResetCounts(): DefaultSuccess = 0;
+client cluster OccupancySensing = 1030 {
 }
 
 endpoint 0 {
diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
index c86635ff3244c6..36e6b77dc6dff7 100644
--- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
+++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
@@ -1,6 +1,120 @@
 // This IDL was generated automatically by ZAP.
 // It is for view/code review purposes only.
 
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
+  }
+
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
+  }
+
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
+  }
+
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
+  }
+
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+}
+
+client cluster OnOff = 6 {
+  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
+    kFadeToOffIn0p8Seconds = 0;
+    kNoFade = 1;
+    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
+  }
+
+  enum OnOffDyingLightEffectVariant : ENUM8 {
+    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
+  }
+
+  enum OnOffEffectIdentifier : ENUM8 {
+    kDelayedAllOff = 0;
+    kDyingLight = 1;
+  }
+
+  enum OnOffStartUpOnOff : ENUM8 {
+    kOff = 0;
+    kOn = 1;
+    kTogglePreviousOnOff = 2;
+  }
+
+  bitmap OnOffControl : BITMAP8 {
+    kAcceptOnlyWhenOn = 0x1;
+  }
+
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
+  }
+
+  bitmap SceneFeatures : BITMAP32 {
+    kSceneNames = 0x1;
+  }
+
+  readonly attribute boolean onOff = 0;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command Off(): DefaultSuccess = 0;
+  command On(): DefaultSuccess = 1;
+  command Toggle(): DefaultSuccess = 2;
+}
+
+server cluster Descriptor = 29 {
+  struct DeviceType {
+    devtype_id type = 0;
+    int16u revision = 1;
+  }
+
+  readonly attribute DeviceType deviceList[] = 0;
+  readonly attribute CLUSTER_ID serverList[] = 1;
+  readonly attribute CLUSTER_ID clientList[] = 2;
+  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Binding = 30 {
+  struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  attribute TargetStruct binding[] = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
 server cluster AccessControl = 31 {
   enum AuthMode : ENUM8 {
     kPase = 1;
@@ -69,45 +183,6 @@ server cluster AccessControl = 31 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
-  }
-
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
-  }
-
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
-  }
-
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-  }
-
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
-
 server cluster Basic = 40 {
   struct CapabilityMinimaStruct {
     int16u caseSessionsPerFabric = 0;
@@ -152,45 +227,141 @@ server cluster Basic = 40 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster Binding = 30 {
-  struct TargetStruct {
-    optional node_id node = 1;
-    optional group_id group = 2;
-    optional endpoint_no endpoint = 3;
-    optional cluster_id cluster = 4;
-    fabric_idx fabricIndex = 254;
+client cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
   }
 
-  attribute TargetStruct binding[] = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
+  }
+
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
+  }
+
+
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
+  }
+
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
+  }
+
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
+  }
+
+  response struct QueryImageResponse = 1 {
+    OTAQueryStatus status = 0;
+    optional INT32U delayedActionTime = 1;
+    optional CHAR_STRING imageURI = 2;
+    optional INT32U softwareVersion = 3;
+    optional CHAR_STRING softwareVersionString = 4;
+    optional OCTET_STRING updateToken = 5;
+    optional BOOLEAN userConsentNeeded = 6;
+    optional OCTET_STRING metadataForRequestor = 7;
+  }
+
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
+  }
+
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
 }
 
-server cluster Descriptor = 29 {
-  struct DeviceType {
-    devtype_id type = 0;
-    int16u revision = 1;
+server cluster OtaSoftwareUpdateRequestor = 42 {
+  enum OTAAnnouncementReason : ENUM8 {
+    kSimpleAnnouncement = 0;
+    kUpdateAvailable = 1;
+    kUrgentUpdateAvailable = 2;
   }
 
-  readonly attribute DeviceType deviceList[] = 0;
-  readonly attribute CLUSTER_ID serverList[] = 1;
-  readonly attribute CLUSTER_ID clientList[] = 2;
-  readonly attribute ENDPOINT_NO partsList[] = 3;
+  enum OTAChangeReasonEnum : ENUM8 {
+    kUnknown = 0;
+    kSuccess = 1;
+    kFailure = 2;
+    kTimeOut = 3;
+    kDelayByProvider = 4;
+  }
+
+  enum OTAUpdateStateEnum : ENUM8 {
+    kUnknown = 0;
+    kIdle = 1;
+    kQuerying = 2;
+    kDelayedOnQuery = 3;
+    kDownloading = 4;
+    kApplying = 5;
+    kDelayedOnApply = 6;
+    kRollingBack = 7;
+    kDelayedOnUserConsent = 8;
+  }
+
+  struct ProviderLocation {
+    node_id providerNodeID = 1;
+    endpoint_no endpoint = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  info event StateTransition = 0 {
+    OTAUpdateStateEnum previousState = 0;
+    OTAUpdateStateEnum newState = 1;
+    OTAChangeReasonEnum reason = 2;
+    nullable INT32U targetSoftwareVersion = 3;
+  }
+
+  critical event VersionApplied = 1 {
+    INT32U softwareVersion = 0;
+    INT16U productID = 1;
+  }
+
+  info event DownloadError = 2 {
+    INT32U softwareVersion = 0;
+    INT64U bytesDownloaded = 1;
+    nullable INT8U progressPercent = 2;
+    nullable INT64S platformCode = 3;
+  }
+
+  attribute ProviderLocation defaultOtaProviders[] = 0;
+  readonly attribute boolean updatePossible = 1;
+  readonly attribute OTAUpdateStateEnum updateState = 2;
+  readonly attribute nullable int8u updateStateProgress = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-client cluster FlowMeasurement = 1028 {
-  readonly attribute nullable int16u measuredValue = 0;
-  readonly attribute nullable int16u minMeasuredValue = 1;
-  readonly attribute nullable int16u maxMeasuredValue = 2;
-  readonly attribute int16u clusterRevision = 65533;
+  request struct AnnounceOtaProviderRequest {
+    node_id providerNodeId = 0;
+    vendor_id vendorId = 1;
+    OTAAnnouncementReason announcementReason = 2;
+    optional OCTET_STRING metadataForNode = 3;
+    endpoint_no endpoint = 4;
+  }
+
+  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
 }
 
 server cluster GeneralCommissioning = 48 {
@@ -250,214 +421,9 @@ server cluster GeneralCommissioning = 48 {
     CHAR_STRING debugText = 1;
   }
 
-  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
-  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
-  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
-}
-
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
-  }
-
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
-  }
-
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
-  }
-
-  enum NetworkFaultType : ENUM8 {
-    kUnspecified = 0;
-    kHardwareFailure = 1;
-    kNetworkJammed = 2;
-    kConnectionFailed = 3;
-  }
-
-  enum RadioFaultType : ENUM8 {
-    kUnspecified = 0;
-    kWiFiFault = 1;
-    kCellularFault = 2;
-    kThreadFault = 3;
-    kNFCFault = 4;
-    kBLEFault = 5;
-    kEthernetFault = 6;
-  }
-
-  struct NetworkInterfaceType {
-    char_string<32> name = 0;
-    boolean isOperational = 1;
-    nullable boolean offPremiseServicesReachableIPv4 = 2;
-    nullable boolean offPremiseServicesReachableIPv6 = 3;
-    octet_string<8> hardwareAddress = 4;
-    octet_string IPv4Addresses[] = 5;
-    octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
-  }
-
-  critical event HardwareFaultChange = 0 {
-    HardwareFaultType current[] = 0;
-    HardwareFaultType previous[] = 1;
-  }
-
-  critical event RadioFaultChange = 1 {
-    RadioFaultType current[] = 0;
-    RadioFaultType previous[] = 1;
-  }
-
-  critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
-  }
-
-  critical event BootReason = 3 {
-    BootReasonType bootReason = 0;
-  }
-
-  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
-  readonly attribute int16u rebootCount = 1;
-  readonly attribute boolean testEventTriggersEnabled = 8;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct TestEventTriggerRequest {
-    OCTET_STRING enableKey = 0;
-    INT64U eventTrigger = 1;
-  }
-
-  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
-}
-
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
-  }
-
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
-    fabric_idx fabricIndex = 254;
-  }
-
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
-  }
-
-  struct GroupKeySetStruct {
-    int16u groupKeySetID = 0;
-    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
-    nullable octet_string<16> epochKey0 = 2;
-    nullable epoch_us epochStartTime0 = 3;
-    nullable octet_string<16> epochKey1 = 4;
-    nullable epoch_us epochStartTime1 = 5;
-    nullable octet_string<16> epochKey2 = 6;
-    nullable epoch_us epochStartTime2 = 7;
-  }
-
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
-  readonly attribute int16u maxGroupsPerFabric = 2;
-  readonly attribute int16u maxGroupKeysPerFabric = 3;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct KeySetWriteRequest {
-    GroupKeySetStruct groupKeySet = 0;
-  }
-
-  request struct KeySetReadRequest {
-    INT16U groupKeySetID = 0;
-  }
-
-  request struct KeySetRemoveRequest {
-    INT16U groupKeySetID = 0;
-  }
-
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
-  }
-
-  response struct KeySetReadResponse = 2 {
-    GroupKeySetStruct groupKeySet = 0;
-  }
-
-  response struct KeySetReadAllIndicesResponse = 5 {
-    INT16U groupKeySetIDs[] = 0;
-  }
-
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
-}
-
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
-  }
-
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
-  }
-
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
-  }
-
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
-  }
-
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
+  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
+  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
 }
 
 server cluster NetworkCommissioning = 49 {
@@ -590,183 +556,250 @@ server cluster NetworkCommissioning = 49 {
   command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
 }
 
-client cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
   }
 
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
   }
 
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
   }
 
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
+  }
 
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
+  enum RadioFaultType : ENUM8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
   }
 
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
+  struct NetworkInterfaceType {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceType type = 7;
   }
 
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultType current[] = 0;
+    HardwareFaultType previous[] = 1;
   }
 
-  response struct QueryImageResponse = 1 {
-    OTAQueryStatus status = 0;
-    optional INT32U delayedActionTime = 1;
-    optional CHAR_STRING imageURI = 2;
-    optional INT32U softwareVersion = 3;
-    optional CHAR_STRING softwareVersionString = 4;
-    optional OCTET_STRING updateToken = 5;
-    optional BOOLEAN userConsentNeeded = 6;
-    optional OCTET_STRING metadataForRequestor = 7;
+  critical event RadioFaultChange = 1 {
+    RadioFaultType current[] = 0;
+    RadioFaultType previous[] = 1;
   }
 
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultType current[] = 0;
+    NetworkFaultType previous[] = 1;
   }
 
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
+  critical event BootReason = 3 {
+    BootReasonType bootReason = 0;
+  }
+
+  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute boolean testEventTriggersEnabled = 8;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
+  }
+
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
-server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum OTAAnnouncementReason : ENUM8 {
-    kSimpleAnnouncement = 0;
-    kUpdateAvailable = 1;
-    kUrgentUpdateAvailable = 2;
+server cluster ThreadNetworkDiagnostics = 53 {
+  enum NetworkFault : ENUM8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
   }
 
-  enum OTAChangeReasonEnum : ENUM8 {
-    kUnknown = 0;
-    kSuccess = 1;
-    kFailure = 2;
-    kTimeOut = 3;
-    kDelayByProvider = 4;
+  enum RoutingRole : ENUM8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kReed = 4;
+    kRouter = 5;
+    kLeader = 6;
   }
 
-  enum OTAUpdateStateEnum : ENUM8 {
-    kUnknown = 0;
-    kIdle = 1;
-    kQuerying = 2;
-    kDelayedOnQuery = 3;
-    kDownloading = 4;
-    kApplying = 5;
-    kDelayedOnApply = 6;
-    kRollingBack = 7;
-    kDelayedOnUserConsent = 8;
+  enum ThreadConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  struct ProviderLocation {
-    node_id providerNodeID = 1;
-    endpoint_no endpoint = 2;
-    fabric_idx fabricIndex = 254;
+  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+    kMLECounts = 0x4;
+    kMACCounts = 0x8;
   }
 
-  info event StateTransition = 0 {
-    OTAUpdateStateEnum previousState = 0;
-    OTAUpdateStateEnum newState = 1;
-    OTAChangeReasonEnum reason = 2;
-    nullable INT32U targetSoftwareVersion = 3;
+  struct NeighborTable {
+    int64u extAddress = 0;
+    int32u age = 1;
+    int16u rloc16 = 2;
+    int32u linkFrameCounter = 3;
+    int32u mleFrameCounter = 4;
+    int8u lqi = 5;
+    nullable int8s averageRssi = 6;
+    nullable int8s lastRssi = 7;
+    int8u frameErrorRate = 8;
+    int8u messageErrorRate = 9;
+    boolean rxOnWhenIdle = 10;
+    boolean fullThreadDevice = 11;
+    boolean fullNetworkData = 12;
+    boolean isChild = 13;
   }
 
-  critical event VersionApplied = 1 {
-    INT32U softwareVersion = 0;
-    INT16U productID = 1;
+  struct RouteTable {
+    int64u extAddress = 0;
+    int16u rloc16 = 1;
+    int8u routerId = 2;
+    int8u nextHop = 3;
+    int8u pathCost = 4;
+    int8u LQIIn = 5;
+    int8u LQIOut = 6;
+    int8u age = 7;
+    boolean allocated = 8;
+    boolean linkEstablished = 9;
   }
 
-  info event DownloadError = 2 {
-    INT32U softwareVersion = 0;
-    INT64U bytesDownloaded = 1;
-    nullable INT8U progressPercent = 2;
-    nullable INT64S platformCode = 3;
+  struct SecurityPolicy {
+    int16u rotationTime = 0;
+    bitmap16 flags = 1;
   }
 
-  attribute ProviderLocation defaultOtaProviders[] = 0;
-  readonly attribute boolean updatePossible = 1;
-  readonly attribute OTAUpdateStateEnum updateState = 2;
-  readonly attribute nullable int8u updateStateProgress = 3;
+  struct OperationalDatasetComponents {
+    boolean activeTimestampPresent = 0;
+    boolean pendingTimestampPresent = 1;
+    boolean masterKeyPresent = 2;
+    boolean networkNamePresent = 3;
+    boolean extendedPanIdPresent = 4;
+    boolean meshLocalPrefixPresent = 5;
+    boolean delayPresent = 6;
+    boolean panIdPresent = 7;
+    boolean channelPresent = 8;
+    boolean pskcPresent = 9;
+    boolean securityPolicyPresent = 10;
+    boolean channelMaskPresent = 11;
+  }
+
+  info event ConnectionStatus = 0 {
+    ThreadConnectionStatus connectionStatus = 0;
+  }
+
+  readonly attribute nullable int16u channel = 0;
+  readonly attribute nullable RoutingRole routingRole = 1;
+  readonly attribute nullable char_string<16> networkName = 2;
+  readonly attribute nullable int16u panId = 3;
+  readonly attribute nullable int64u extendedPanId = 4;
+  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
+  readonly attribute NeighborTable neighborTableList[] = 7;
+  readonly attribute RouteTable routeTableList[] = 8;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
+  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AnnounceOtaProviderRequest {
-    node_id providerNodeId = 0;
-    vendor_id vendorId = 1;
-    OTAAnnouncementReason announcementReason = 2;
-    optional OCTET_STRING metadataForNode = 3;
-    endpoint_no endpoint = 4;
-  }
-
-  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
-client cluster OnOff = 6 {
-  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
-    kFadeToOffIn0p8Seconds = 0;
-    kNoFade = 1;
-    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
-  }
-
-  enum OnOffDyingLightEffectVariant : ENUM8 {
-    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
-  }
-
-  enum OnOffEffectIdentifier : ENUM8 {
-    kDelayedAllOff = 0;
-    kDyingLight = 1;
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
   }
 
-  enum OnOffStartUpOnOff : ENUM8 {
-    kOff = 0;
-    kOn = 1;
-    kTogglePreviousOnOff = 2;
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
   }
 
-  bitmap OnOffControl : BITMAP8 {
-    kAcceptOnlyWhenOn = 0x1;
-  }
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  bitmap OnOffFeature : BITMAP32 {
-    kLighting = 0x1;
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
   }
 
-  bitmap SceneFeatures : BITMAP32 {
-    kSceneNames = 0x1;
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
   }
 
-  readonly attribute boolean onOff = 0;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command Off(): DefaultSuccess = 0;
-  command On(): DefaultSuccess = 1;
-  command Toggle(): DefaultSuccess = 2;
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
 server cluster OperationalCredentials = 62 {
@@ -879,15 +912,74 @@ server cluster OperationalCredentials = 62 {
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
 }
 
-client cluster PressureMeasurement = 1027 {
-  bitmap PressureFeature : BITMAP32 {
-    kExt = 0x1;
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
   }
 
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
+  }
+
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
 }
 
 client cluster PumpConfigurationAndControl = 512 {
@@ -987,114 +1079,22 @@ client cluster TemperatureMeasurement = 1026 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster ThreadNetworkDiagnostics = 53 {
-  enum NetworkFault : ENUM8 {
-    kUnspecified = 0;
-    kLinkDown = 1;
-    kHardwareFailure = 2;
-    kNetworkJammed = 3;
-  }
-
-  enum RoutingRole : ENUM8 {
-    kUnspecified = 0;
-    kUnassigned = 1;
-    kSleepyEndDevice = 2;
-    kEndDevice = 3;
-    kReed = 4;
-    kRouter = 5;
-    kLeader = 6;
-  }
-
-  enum ThreadConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
-  }
-
-  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
-    kPacketCounts = 0x1;
-    kErrorCounts = 0x2;
-    kMLECounts = 0x4;
-    kMACCounts = 0x8;
-  }
-
-  struct NeighborTable {
-    int64u extAddress = 0;
-    int32u age = 1;
-    int16u rloc16 = 2;
-    int32u linkFrameCounter = 3;
-    int32u mleFrameCounter = 4;
-    int8u lqi = 5;
-    nullable int8s averageRssi = 6;
-    nullable int8s lastRssi = 7;
-    int8u frameErrorRate = 8;
-    int8u messageErrorRate = 9;
-    boolean rxOnWhenIdle = 10;
-    boolean fullThreadDevice = 11;
-    boolean fullNetworkData = 12;
-    boolean isChild = 13;
-  }
-
-  struct RouteTable {
-    int64u extAddress = 0;
-    int16u rloc16 = 1;
-    int8u routerId = 2;
-    int8u nextHop = 3;
-    int8u pathCost = 4;
-    int8u LQIIn = 5;
-    int8u LQIOut = 6;
-    int8u age = 7;
-    boolean allocated = 8;
-    boolean linkEstablished = 9;
-  }
-
-  struct SecurityPolicy {
-    int16u rotationTime = 0;
-    bitmap16 flags = 1;
-  }
-
-  struct OperationalDatasetComponents {
-    boolean activeTimestampPresent = 0;
-    boolean pendingTimestampPresent = 1;
-    boolean masterKeyPresent = 2;
-    boolean networkNamePresent = 3;
-    boolean extendedPanIdPresent = 4;
-    boolean meshLocalPrefixPresent = 5;
-    boolean delayPresent = 6;
-    boolean panIdPresent = 7;
-    boolean channelPresent = 8;
-    boolean pskcPresent = 9;
-    boolean securityPolicyPresent = 10;
-    boolean channelMaskPresent = 11;
-  }
-
-  info event ConnectionStatus = 0 {
-    ThreadConnectionStatus connectionStatus = 0;
+client cluster PressureMeasurement = 1027 {
+  bitmap PressureFeature : BITMAP32 {
+    kExt = 0x1;
   }
 
-  readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable RoutingRole routingRole = 1;
-  readonly attribute nullable char_string<16> networkName = 2;
-  readonly attribute nullable int16u panId = 3;
-  readonly attribute nullable int64u extendedPanId = 4;
-  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
-  readonly attribute NeighborTable neighborTableList[] = 7;
-  readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
-  readonly attribute nullable int8u leaderRouterId = 13;
-  readonly attribute nullable SecurityPolicy securityPolicy = 59;
-  readonly attribute nullable octet_string<4> channelMask = 60;
-  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
-  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute nullable int16s measuredValue = 0;
+  readonly attribute nullable int16s minMeasuredValue = 1;
+  readonly attribute nullable int16s maxMeasuredValue = 2;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  command ResetCounts(): DefaultSuccess = 0;
+client cluster FlowMeasurement = 1028 {
+  readonly attribute nullable int16u measuredValue = 0;
+  readonly attribute nullable int16u minMeasuredValue = 1;
+  readonly attribute nullable int16u maxMeasuredValue = 2;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
 endpoint 0 {
diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter
index 335c0909c0729b..e1d44e097ebf7f 100644
--- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter
+++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter
@@ -6,6 +6,20 @@ struct LabelStruct {
     char_string<16> value = 1;
 }
 
+server cluster Descriptor = 29 {
+  struct DeviceType {
+    devtype_id type = 0;
+    int16u revision = 1;
+  }
+
+  readonly attribute DeviceType deviceList[] = 0;
+  readonly attribute CLUSTER_ID serverList[] = 1;
+  readonly attribute CLUSTER_ID clientList[] = 2;
+  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
 server cluster AccessControl = 31 {
   enum AuthMode : ENUM8 {
     kPase = 1;
@@ -72,42 +86,6 @@ server cluster AccessControl = 31 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
-  }
-
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
-  }
-
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
-  }
-
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-  }
-
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
-
 server cluster Basic = 40 {
   struct CapabilityMinimaStruct {
     int16u caseSessionsPerFabric = 0;
@@ -152,83 +130,53 @@ server cluster Basic = 40 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster Descriptor = 29 {
-  struct DeviceType {
-    devtype_id type = 0;
-    int16u revision = 1;
-  }
-
-  readonly attribute DeviceType deviceList[] = 0;
-  readonly attribute CLUSTER_ID serverList[] = 1;
-  readonly attribute CLUSTER_ID clientList[] = 2;
-  readonly attribute ENDPOINT_NO partsList[] = 3;
+server cluster LocalizationConfiguration = 43 {
+  attribute char_string<35> activeLocale = 0;
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster DiagnosticLogs = 50 {
-  enum LogsIntent : ENUM8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
-  }
-
-  enum LogsStatus : ENUM8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
   }
 
-  enum LogsTransferProtocol : ENUM8 {
-    kResponsePayload = 0;
-    kBdx = 1;
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
   }
 
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-
-  request struct RetrieveLogsRequestRequest {
-    LogsIntent intent = 0;
-    LogsTransferProtocol requestedProtocol = 1;
-    OCTET_STRING transferFileDesignator = 2;
-  }
-
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
 }
 
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
+server cluster UnitLocalization = 45 {
+  enum TempUnit : ENUM8 {
+    kFahrenheit = 0;
+    kCelsius = 1;
+    kKelvin = 2;
   }
 
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command ResetCounts(): DefaultSuccess = 0;
-}
+  bitmap UnitLocalizationFeature : BITMAP32 {
+    kTemperatureUnit = 0x1;
+  }
 
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
+  attribute TempUnit temperatureUnit = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
@@ -292,306 +240,404 @@ server cluster GeneralCommissioning = 48 {
   command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
 }
 
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
-  }
-
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
-  }
-
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatus : ENUM8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
   }
 
-  enum NetworkFaultType : ENUM8 {
-    kUnspecified = 0;
-    kHardwareFailure = 1;
-    kNetworkJammed = 2;
-    kConnectionFailed = 3;
+  enum WiFiBand : ENUM8 {
+    k2g4 = 0;
+    k3g65 = 1;
+    k5g = 2;
+    k6g = 3;
+    k60g = 4;
   }
 
-  enum RadioFaultType : ENUM8 {
-    kUnspecified = 0;
-    kWiFiFault = 1;
-    kCellularFault = 2;
-    kThreadFault = 3;
-    kNFCFault = 4;
-    kBLEFault = 5;
-    kEthernetFault = 6;
+  bitmap NetworkCommissioningFeature : BITMAP32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
   }
 
-  struct NetworkInterfaceType {
-    char_string<32> name = 0;
-    boolean isOperational = 1;
-    nullable boolean offPremiseServicesReachableIPv4 = 2;
-    nullable boolean offPremiseServicesReachableIPv6 = 3;
-    octet_string<8> hardwareAddress = 4;
-    octet_string IPv4Addresses[] = 5;
-    octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+  bitmap WiFiSecurity : BITMAP8 {
+    kUnencrypted = 0x1;
+    kWepPersonal = 0x2;
+    kWpaPersonal = 0x4;
+    kWpa2Personal = 0x8;
+    kWpa3Personal = 0x10;
   }
 
-  critical event HardwareFaultChange = 0 {
-    HardwareFaultType current[] = 0;
-    HardwareFaultType previous[] = 1;
+  struct NetworkInfo {
+    octet_string<32> networkID = 0;
+    boolean connected = 1;
   }
 
-  critical event RadioFaultChange = 1 {
-    RadioFaultType current[] = 0;
-    RadioFaultType previous[] = 1;
+  struct WiFiInterfaceScanResult {
+    WiFiSecurity security = 0;
+    octet_string<32> ssid = 1;
+    octet_string<6> bssid = 2;
+    int16u channel = 3;
+    WiFiBand wiFiBand = 4;
+    int8s rssi = 5;
   }
 
-  critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+  struct ThreadInterfaceScanResult {
+    int16u panId = 0;
+    int64u extendedPanId = 1;
+    char_string<16> networkName = 2;
+    int16u channel = 3;
+    int8u version = 4;
+    octet_string<8> extendedAddress = 5;
+    int8s rssi = 6;
+    int8u lqi = 7;
   }
 
-  critical event BootReason = 3 {
-    BootReasonType bootReason = 0;
+  readonly attribute access(read: administer) int8u maxNetworks = 0;
+  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
+  readonly attribute int8u scanMaxTimeSeconds = 2;
+  readonly attribute int8u connectMaxTimeSeconds = 3;
+  attribute access(write: administer) boolean interfaceEnabled = 4;
+  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
+  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
+  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ScanNetworksRequest {
+    optional nullable OCTET_STRING ssid = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct AddOrUpdateWiFiNetworkRequest {
+    OCTET_STRING ssid = 0;
+    OCTET_STRING credentials = 1;
+    optional INT64U breadcrumb = 2;
+  }
+
+  request struct RemoveNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct ConnectNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct ReorderNetworkRequest {
+    OCTET_STRING networkID = 0;
+    INT8U networkIndex = 1;
+    optional INT64U breadcrumb = 2;
+  }
+
+  response struct ScanNetworksResponse = 1 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
+    optional ThreadInterfaceScanResult threadScanResults[] = 3;
+  }
+
+  response struct NetworkConfigResponse = 5 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional INT8U networkIndex = 2;
+  }
+
+  response struct ConnectNetworkResponse = 7 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    nullable INT32S errorValue = 2;
+  }
+
+  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
+  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
+  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
+  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
+  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+}
+
+server cluster DiagnosticLogs = 50 {
+  enum LogsIntent : ENUM8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
+  }
+
+  enum LogsStatus : ENUM8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
+  }
+
+  enum LogsTransferProtocol : ENUM8 {
+    kResponsePayload = 0;
+    kBdx = 1;
   }
 
-  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
-  readonly attribute int16u rebootCount = 1;
-  readonly attribute int64u upTime = 2;
-  readonly attribute int32u totalOperationalHours = 3;
-  readonly attribute enum8 bootReasons = 4;
-  readonly attribute ENUM8 activeHardwareFaults[] = 5;
-  readonly attribute ENUM8 activeRadioFaults[] = 6;
-  readonly attribute ENUM8 activeNetworkFaults[] = 7;
-  readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct TestEventTriggerRequest {
-    OCTET_STRING enableKey = 0;
-    INT64U eventTrigger = 1;
+  request struct RetrieveLogsRequestRequest {
+    LogsIntent intent = 0;
+    LogsTransferProtocol requestedProtocol = 1;
+    OCTET_STRING transferFileDesignator = 2;
   }
 
-  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
 }
 
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
   }
 
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
-    fabric_idx fabricIndex = 254;
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
   }
 
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
   }
 
-  struct GroupKeySetStruct {
-    int16u groupKeySetID = 0;
-    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
-    nullable octet_string<16> epochKey0 = 2;
-    nullable epoch_us epochStartTime0 = 3;
-    nullable octet_string<16> epochKey1 = 4;
-    nullable epoch_us epochStartTime1 = 5;
-    nullable octet_string<16> epochKey2 = 6;
-    nullable epoch_us epochStartTime2 = 7;
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
   }
 
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
-  readonly attribute int16u maxGroupsPerFabric = 2;
-  readonly attribute int16u maxGroupKeysPerFabric = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  enum RadioFaultType : ENUM8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
+  }
 
-  request struct KeySetWriteRequest {
-    GroupKeySetStruct groupKeySet = 0;
+  struct NetworkInterfaceType {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceType type = 7;
   }
 
-  request struct KeySetReadRequest {
-    INT16U groupKeySetID = 0;
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultType current[] = 0;
+    HardwareFaultType previous[] = 1;
   }
 
-  request struct KeySetRemoveRequest {
-    INT16U groupKeySetID = 0;
+  critical event RadioFaultChange = 1 {
+    RadioFaultType current[] = 0;
+    RadioFaultType previous[] = 1;
   }
 
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultType current[] = 0;
+    NetworkFaultType previous[] = 1;
   }
 
-  response struct KeySetReadResponse = 2 {
-    GroupKeySetStruct groupKeySet = 0;
+  critical event BootReason = 3 {
+    BootReasonType bootReason = 0;
   }
 
-  response struct KeySetReadAllIndicesResponse = 5 {
-    INT16U groupKeySetIDs[] = 0;
+  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
+  readonly attribute int32u totalOperationalHours = 3;
+  readonly attribute enum8 bootReasons = 4;
+  readonly attribute ENUM8 activeHardwareFaults[] = 5;
+  readonly attribute ENUM8 activeRadioFaults[] = 6;
+  readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
   }
 
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
-server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
+server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
+  }
+
+  info event SoftwareFault = 0 {
+    SoftwareFaultStruct softwareFault = 0;
+  }
+
+  readonly attribute int64u currentHeapHighWatermark = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatus : ENUM8 {
-    kSuccess = 0;
-    kOutOfRange = 1;
-    kBoundsExceeded = 2;
-    kNetworkIDNotFound = 3;
-    kDuplicateNetworkID = 4;
-    kNetworkNotFound = 5;
-    kRegulatoryError = 6;
-    kAuthFailure = 7;
-    kUnsupportedSecurity = 8;
-    kOtherConnectionFailure = 9;
-    kIPV6Failed = 10;
-    kIPBindFailed = 11;
-    kUnknownError = 12;
+server cluster WiFiNetworkDiagnostics = 54 {
+  enum AssociationFailureCause : ENUM8 {
+    kUnknown = 0;
+    kAssociationFailed = 1;
+    kAuthenticationFailed = 2;
+    kSsidNotFound = 3;
   }
 
-  enum WiFiBand : ENUM8 {
-    k2g4 = 0;
-    k3g65 = 1;
-    k5g = 2;
-    k6g = 3;
-    k60g = 4;
+  enum SecurityType : ENUM8 {
+    kUnspecified = 0;
+    kNone = 1;
+    kWep = 2;
+    kWpa = 3;
+    kWpa2 = 4;
+    kWpa3 = 5;
   }
 
-  bitmap NetworkCommissioningFeature : BITMAP32 {
-    kWiFiNetworkInterface = 0x1;
-    kThreadNetworkInterface = 0x2;
-    kEthernetNetworkInterface = 0x4;
+  enum WiFiConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  bitmap WiFiSecurity : BITMAP8 {
-    kUnencrypted = 0x1;
-    kWepPersonal = 0x2;
-    kWpaPersonal = 0x4;
-    kWpa2Personal = 0x8;
-    kWpa3Personal = 0x10;
+  enum WiFiVersionType : ENUM8 {
+    k80211a = 0;
+    k80211b = 1;
+    k80211g = 2;
+    k80211n = 3;
+    k80211ac = 4;
+    k80211ax = 5;
   }
 
-  struct NetworkInfo {
-    octet_string<32> networkID = 0;
-    boolean connected = 1;
+  info event Disconnection = 0 {
+    INT16U reasonCode = 0;
   }
 
-  struct WiFiInterfaceScanResult {
-    WiFiSecurity security = 0;
-    octet_string<32> ssid = 1;
-    octet_string<6> bssid = 2;
-    int16u channel = 3;
-    WiFiBand wiFiBand = 4;
-    int8s rssi = 5;
+  info event AssociationFailure = 1 {
+    AssociationFailureCause associationFailure = 0;
+    INT16U status = 1;
   }
 
-  struct ThreadInterfaceScanResult {
-    int16u panId = 0;
-    int64u extendedPanId = 1;
-    char_string<16> networkName = 2;
-    int16u channel = 3;
-    int8u version = 4;
-    octet_string<8> extendedAddress = 5;
-    int8s rssi = 6;
-    int8u lqi = 7;
+  info event ConnectionStatus = 2 {
+    WiFiConnectionStatus connectionStatus = 0;
   }
 
-  readonly attribute access(read: administer) int8u maxNetworks = 0;
-  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
-  readonly attribute int8u scanMaxTimeSeconds = 2;
-  readonly attribute int8u connectMaxTimeSeconds = 3;
-  attribute access(write: administer) boolean interfaceEnabled = 4;
-  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
-  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
-  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute nullable octet_string<6> bssid = 0;
+  readonly attribute nullable SecurityType securityType = 1;
+  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
+  readonly attribute nullable int16u channelNumber = 3;
+  readonly attribute nullable int8s rssi = 4;
+  readonly attribute int32u beaconLostCount = 5;
+  readonly attribute int32u beaconRxCount = 6;
+  readonly attribute int32u packetMulticastRxCount = 7;
+  readonly attribute int32u packetMulticastTxCount = 8;
+  readonly attribute int32u packetUnicastRxCount = 9;
+  readonly attribute int32u packetUnicastTxCount = 10;
+  readonly attribute int64u currentMaxRate = 11;
+  readonly attribute int64u overrunCount = 12;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct ScanNetworksRequest {
-    optional nullable OCTET_STRING ssid = 0;
-    optional INT64U breadcrumb = 1;
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
   }
 
-  request struct AddOrUpdateWiFiNetworkRequest {
-    OCTET_STRING ssid = 0;
-    OCTET_STRING credentials = 1;
-    optional INT64U breadcrumb = 2;
-  }
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  request struct RemoveNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
-  }
+  command ResetCounts(): DefaultSuccess = 0;
+}
 
-  request struct ConnectNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
   }
 
-  request struct ReorderNetworkRequest {
-    OCTET_STRING networkID = 0;
-    INT8U networkIndex = 1;
-    optional INT64U breadcrumb = 2;
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
   }
 
-  response struct ScanNetworksResponse = 1 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
-    optional ThreadInterfaceScanResult threadScanResults[] = 3;
-  }
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  response struct NetworkConfigResponse = 5 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional INT8U networkIndex = 2;
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
   }
 
-  response struct ConnectNetworkResponse = 7 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    nullable INT32S errorValue = 2;
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
   }
 
-  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
-  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
-  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
-  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
-  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
 server cluster OperationalCredentials = 62 {
@@ -701,68 +747,75 @@ server cluster OperationalCredentials = 62 {
   command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
 }
 
-server cluster SoftwareDiagnostics = 52 {
-  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
-    kWaterMarks = 0x1;
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
   }
 
-  info event SoftwareFault = 0 {
-    SoftwareFaultStruct softwareFault = 0;
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  readonly attribute int64u currentHeapHighWatermark = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
 
-server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
+  }
 
-server cluster UnitLocalization = 45 {
-  enum TempUnit : ENUM8 {
-    kFahrenheit = 0;
-    kCelsius = 1;
-    kKelvin = 2;
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  bitmap UnitLocalizationFeature : BITMAP32 {
-    kTemperatureUnit = 0x1;
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  attribute TempUnit temperatureUnit = 0;
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
+  }
+
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
+
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
@@ -773,63 +826,10 @@ server cluster UserLabel = 65 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCause : ENUM8 {
-    kUnknown = 0;
-    kAssociationFailed = 1;
-    kAuthenticationFailed = 2;
-    kSsidNotFound = 3;
-  }
-
-  enum SecurityType : ENUM8 {
-    kUnspecified = 0;
-    kNone = 1;
-    kWep = 2;
-    kWpa = 3;
-    kWpa2 = 4;
-    kWpa3 = 5;
-  }
-
-  enum WiFiConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
-  }
-
-  enum WiFiVersionType : ENUM8 {
-    k80211a = 0;
-    k80211b = 1;
-    k80211g = 2;
-    k80211n = 3;
-    k80211ac = 4;
-    k80211ax = 5;
-  }
-
-  info event Disconnection = 0 {
-    INT16U reasonCode = 0;
-  }
-
-  info event AssociationFailure = 1 {
-    AssociationFailureCause associationFailure = 0;
-    INT16U status = 1;
-  }
-
-  info event ConnectionStatus = 2 {
-    WiFiConnectionStatus connectionStatus = 0;
-  }
-
-  readonly attribute nullable octet_string<6> bssid = 0;
-  readonly attribute nullable SecurityType securityType = 1;
-  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
-  readonly attribute nullable int16u channelNumber = 3;
-  readonly attribute nullable int8s rssi = 4;
-  readonly attribute int32u beaconLostCount = 5;
-  readonly attribute int32u beaconRxCount = 6;
-  readonly attribute int32u packetMulticastRxCount = 7;
-  readonly attribute int32u packetMulticastTxCount = 8;
-  readonly attribute int32u packetUnicastRxCount = 9;
-  readonly attribute int32u packetUnicastTxCount = 10;
-  readonly attribute int64u currentMaxRate = 11;
-  readonly attribute int64u overrunCount = 12;
+server cluster TemperatureMeasurement = 1026 {
+  readonly attribute nullable int16s measuredValue = 0;
+  readonly attribute nullable int16s minMeasuredValue = 1;
+  readonly attribute nullable int16s maxMeasuredValue = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter
index a86aad69a981d9..fa688855c72e1a 100644
--- a/examples/thermostat/thermostat-common/thermostat.matter
+++ b/examples/thermostat/thermostat-common/thermostat.matter
@@ -6,553 +6,442 @@ struct LabelStruct {
     char_string<16> value = 1;
 }
 
-server cluster AccessControl = 31 {
-  enum AuthMode : ENUM8 {
-    kPase = 1;
-    kCase = 2;
-    kGroup = 3;
+client cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
-    kChanged = 0;
-    kAdded = 1;
-    kRemoved = 2;
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
   }
 
-  enum Privilege : ENUM8 {
-    kView = 1;
-    kProxyView = 2;
-    kOperate = 3;
-    kManage = 4;
-    kAdminister = 5;
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
   }
 
-  struct AccessControlEntry {
-    Privilege privilege = 1;
-    AuthMode authMode = 2;
-    nullable int64u subjects[] = 3;
-    nullable Target targets[] = 4;
-    fabric_idx fabricIndex = 254;
-  }
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  struct Target {
-    nullable cluster_id cluster = 0;
-    nullable endpoint_no endpoint = 1;
-    nullable devtype_id deviceType = 2;
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
   }
 
-  struct ExtensionEntry {
-    octet_string<128> data = 1;
-    fabric_idx fabricIndex = 254;
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+}
+
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
   }
 
-  info event access(read: administer) AccessControlEntryChanged = 0 {
-    nullable node_id adminNodeID = 1;
-    nullable INT16U adminPasscodeID = 2;
-    ChangeTypeEnum changeType = 3;
-    nullable AccessControlEntry latestValue = 4;
-    fabric_idx adminFabricIndex = 254;
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
   }
 
-  info event access(read: administer) AccessControlExtensionChanged = 1 {
-    nullable node_id adminNodeID = 1;
-    nullable INT16U adminPasscodeID = 2;
-    ChangeTypeEnum changeType = 3;
-    nullable ExtensionEntry latestValue = 4;
-    fabric_idx adminFabricIndex = 254;
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
   }
 
-  attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
-  attribute access(read: administer, write: administer) ExtensionEntry extension[] = 1;
-  readonly attribute int16u subjectsPerAccessControlEntry = 2;
-  readonly attribute int16u targetsPerAccessControlEntry = 3;
-  readonly attribute int16u accessControlEntriesPerFabric = 4;
-  readonly attribute attrib_id attributeList[] = 65531;
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
   }
 
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
-  }
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+}
 
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
+server cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
+  request struct AddGroupRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
   }
 
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
+  request struct ViewGroupRequest {
+    group_id groupId = 0;
   }
 
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
-
-server cluster Basic = 40 {
-  struct CapabilityMinimaStruct {
-    int16u caseSessionsPerFabric = 0;
-    int16u subscriptionsPerFabric = 1;
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
   }
 
-  critical event StartUp = 0 {
-    INT32U softwareVersion = 0;
+  request struct RemoveGroupRequest {
+    group_id groupId = 0;
   }
 
-  critical event ShutDown = 1 {
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
   }
 
-  info event Leave = 2 {
+  response struct AddGroupResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  info event ReachableChanged = 3 {
-    boolean reachableNewValue = 0;
+  response struct ViewGroupResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    CHAR_STRING groupName = 2;
   }
 
-  readonly attribute int16u dataModelRevision = 0;
-  readonly attribute char_string<32> vendorName = 1;
-  readonly attribute vendor_id vendorID = 2;
-  readonly attribute char_string<32> productName = 3;
-  readonly attribute int16u productID = 4;
-  attribute access(write: manage) char_string<32> nodeLabel = 5;
-  attribute access(write: administer) char_string<2> location = 6;
-  readonly attribute int16u hardwareVersion = 7;
-  readonly attribute char_string<64> hardwareVersionString = 8;
-  readonly attribute int32u softwareVersion = 9;
-  readonly attribute char_string<64> softwareVersionString = 10;
-  readonly attribute char_string<16> manufacturingDate = 11;
-  readonly attribute char_string<32> partNumber = 12;
-  readonly attribute long_char_string<256> productURL = 13;
-  readonly attribute char_string<64> productLabel = 14;
-  readonly attribute char_string<32> serialNumber = 15;
-  attribute access(write: manage) boolean localConfigDisabled = 16;
-  readonly attribute boolean reachable = 17;
-  readonly attribute char_string<32> uniqueID = 18;
-  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster Binding = 30 {
-  struct TargetStruct {
-    optional node_id node = 1;
-    optional group_id group = 2;
-    optional endpoint_no endpoint = 3;
-    optional cluster_id cluster = 4;
-    fabric_idx fabricIndex = 254;
+  response struct GetGroupMembershipResponse = 2 {
+    nullable INT8U capacity = 0;
+    group_id groupList[] = 1;
   }
 
-  attribute TargetStruct binding[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster Descriptor = 29 {
-  struct DeviceType {
-    devtype_id type = 0;
-    int16u revision = 1;
+  response struct RemoveGroupResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  readonly attribute DeviceType deviceList[] = 0;
-  readonly attribute CLUSTER_ID serverList[] = 1;
-  readonly attribute CLUSTER_ID clientList[] = 2;
-  readonly attribute ENDPOINT_NO partsList[] = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
 }
 
-server cluster DiagnosticLogs = 50 {
-  enum LogsIntent : ENUM8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
+server cluster Scenes = 5 {
+  bitmap ScenesCopyMode : BITMAP8 {
+    kCopyAllScenes = 0x1;
   }
 
-  enum LogsStatus : ENUM8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
+  struct ExtensionFieldSet {
+    cluster_id clusterId = 0;
+    AttributeValuePair attributeValueList[] = 1;
   }
 
-  enum LogsTransferProtocol : ENUM8 {
-    kResponsePayload = 0;
-    kBdx = 1;
+  struct AttributeValuePair {
+    optional attrib_id attributeId = 0;
+    int8u attributeValue[] = 1;
   }
 
+  readonly attribute int8u sceneCount = 0;
+  readonly attribute int8u currentScene = 1;
+  readonly attribute group_id currentGroup = 2;
+  readonly attribute boolean sceneValid = 3;
+  readonly attribute bitmap8 nameSupport = 4;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct RetrieveLogsRequestRequest {
-    LogsIntent intent = 0;
-    LogsTransferProtocol requestedProtocol = 1;
-    OCTET_STRING transferFileDesignator = 2;
+  request struct AddSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    INT16U transitionTime = 2;
+    CHAR_STRING sceneName = 3;
+    ExtensionFieldSet extensionFieldSets[] = 4;
   }
 
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
-}
+  request struct ViewSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+  }
 
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
+  request struct RemoveSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  request struct RemoveAllScenesRequest {
+    group_id groupId = 0;
+  }
 
-server cluster GeneralCommissioning = 48 {
-  enum CommissioningError : ENUM8 {
-    kOk = 0;
-    kValueOutsideRange = 1;
-    kInvalidAuthentication = 2;
-    kNoFailSafe = 3;
-    kBusyWithOtherAdmin = 4;
+  request struct StoreSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  enum RegulatoryLocationType : ENUM8 {
-    kIndoor = 0;
-    kOutdoor = 1;
-    kIndoorOutdoor = 2;
+  request struct RecallSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    optional nullable INT16U transitionTime = 2;
   }
 
-  struct BasicCommissioningInfo {
-    int16u failSafeExpiryLengthSeconds = 0;
-    int16u maxCumulativeFailsafeSeconds = 1;
+  request struct GetSceneMembershipRequest {
+    group_id groupId = 0;
   }
 
-  attribute access(write: administer) int64u breadcrumb = 0;
-  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
-  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
-  readonly attribute RegulatoryLocationType locationCapability = 3;
-  readonly attribute boolean supportsConcurrentConnection = 4;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  response struct AddSceneResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+  }
 
-  request struct ArmFailSafeRequest {
-    INT16U expiryLengthSeconds = 0;
-    INT64U breadcrumb = 1;
+  response struct ViewSceneResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+    optional INT16U transitionTime = 3;
+    optional CHAR_STRING sceneName = 4;
+    optional ExtensionFieldSet extensionFieldSets[] = 5;
   }
 
-  request struct SetRegulatoryConfigRequest {
-    RegulatoryLocationType newRegulatoryConfig = 0;
-    CHAR_STRING countryCode = 1;
-    INT64U breadcrumb = 2;
+  response struct RemoveSceneResponse = 2 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  response struct ArmFailSafeResponse = 1 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  response struct RemoveAllScenesResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  response struct SetRegulatoryConfigResponse = 3 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  response struct StoreSceneResponse = 4 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  response struct CommissioningCompleteResponse = 5 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  response struct GetSceneMembershipResponse = 6 {
+    ENUM8 status = 0;
+    nullable INT8U capacity = 1;
+    group_id groupId = 2;
+    optional INT8U sceneList[] = 3;
   }
 
-  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
-  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
-  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
+  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
+  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
+  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
+  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
+  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
+  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
+  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
 }
 
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
+server cluster Descriptor = 29 {
+  struct DeviceType {
+    devtype_id type = 0;
+    int16u revision = 1;
   }
 
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
-  }
+  readonly attribute DeviceType deviceList[] = 0;
+  readonly attribute CLUSTER_ID serverList[] = 1;
+  readonly attribute CLUSTER_ID clientList[] = 2;
+  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
+server cluster Binding = 30 {
+  struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
   }
 
-  enum NetworkFaultType : ENUM8 {
-    kUnspecified = 0;
-    kHardwareFailure = 1;
-    kNetworkJammed = 2;
-    kConnectionFailed = 3;
-  }
+  attribute TargetStruct binding[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  enum RadioFaultType : ENUM8 {
-    kUnspecified = 0;
-    kWiFiFault = 1;
-    kCellularFault = 2;
-    kThreadFault = 3;
-    kNFCFault = 4;
-    kBLEFault = 5;
-    kEthernetFault = 6;
+server cluster AccessControl = 31 {
+  enum AuthMode : ENUM8 {
+    kPase = 1;
+    kCase = 2;
+    kGroup = 3;
   }
 
-  struct NetworkInterfaceType {
-    char_string<32> name = 0;
-    boolean isOperational = 1;
-    nullable boolean offPremiseServicesReachableIPv4 = 2;
-    nullable boolean offPremiseServicesReachableIPv6 = 3;
-    octet_string<8> hardwareAddress = 4;
-    octet_string IPv4Addresses[] = 5;
-    octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+  enum ChangeTypeEnum : ENUM8 {
+    kChanged = 0;
+    kAdded = 1;
+    kRemoved = 2;
   }
 
-  critical event HardwareFaultChange = 0 {
-    HardwareFaultType current[] = 0;
-    HardwareFaultType previous[] = 1;
+  enum Privilege : ENUM8 {
+    kView = 1;
+    kProxyView = 2;
+    kOperate = 3;
+    kManage = 4;
+    kAdminister = 5;
   }
 
-  critical event RadioFaultChange = 1 {
-    RadioFaultType current[] = 0;
-    RadioFaultType previous[] = 1;
+  struct AccessControlEntry {
+    Privilege privilege = 1;
+    AuthMode authMode = 2;
+    nullable int64u subjects[] = 3;
+    nullable Target targets[] = 4;
+    fabric_idx fabricIndex = 254;
   }
 
-  critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+  struct Target {
+    nullable cluster_id cluster = 0;
+    nullable endpoint_no endpoint = 1;
+    nullable devtype_id deviceType = 2;
   }
 
-  critical event BootReason = 3 {
-    BootReasonType bootReason = 0;
+  struct ExtensionEntry {
+    octet_string<128> data = 1;
+    fabric_idx fabricIndex = 254;
   }
 
-  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
-  readonly attribute int16u rebootCount = 1;
-  readonly attribute int64u upTime = 2;
-  readonly attribute int32u totalOperationalHours = 3;
-  readonly attribute enum8 bootReasons = 4;
-  readonly attribute ENUM8 activeHardwareFaults[] = 5;
-  readonly attribute ENUM8 activeRadioFaults[] = 6;
-  readonly attribute ENUM8 activeNetworkFaults[] = 7;
-  readonly attribute boolean testEventTriggersEnabled = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct TestEventTriggerRequest {
-    OCTET_STRING enableKey = 0;
-    INT64U eventTrigger = 1;
+  info event access(read: administer) AccessControlEntryChanged = 0 {
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable AccessControlEntry latestValue = 4;
+    fabric_idx adminFabricIndex = 254;
   }
 
-  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
-}
-
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
-  }
-
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
-    fabric_idx fabricIndex = 254;
-  }
-
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
+  info event access(read: administer) AccessControlExtensionChanged = 1 {
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable ExtensionEntry latestValue = 4;
+    fabric_idx adminFabricIndex = 254;
   }
 
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
+  attribute access(read: administer, write: administer) ExtensionEntry extension[] = 1;
+  readonly attribute int16u subjectsPerAccessControlEntry = 2;
+  readonly attribute int16u targetsPerAccessControlEntry = 3;
+  readonly attribute int16u accessControlEntriesPerFabric = 4;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AddGroupRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
-  }
-
-  request struct ViewGroupRequest {
-    group_id groupId = 0;
-  }
-
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
-  }
-
-  request struct RemoveGroupRequest {
-    group_id groupId = 0;
-  }
-
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+server cluster Basic = 40 {
+  struct CapabilityMinimaStruct {
+    int16u caseSessionsPerFabric = 0;
+    int16u subscriptionsPerFabric = 1;
   }
 
-  response struct AddGroupResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  critical event StartUp = 0 {
+    INT32U softwareVersion = 0;
   }
 
-  response struct ViewGroupResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    CHAR_STRING groupName = 2;
+  critical event ShutDown = 1 {
   }
 
-  response struct GetGroupMembershipResponse = 2 {
-    nullable INT8U capacity = 0;
-    group_id groupList[] = 1;
+  info event Leave = 2 {
   }
 
-  response struct RemoveGroupResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  info event ReachableChanged = 3 {
+    boolean reachableNewValue = 0;
   }
 
-  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
+  readonly attribute int16u dataModelRevision = 0;
+  readonly attribute char_string<32> vendorName = 1;
+  readonly attribute vendor_id vendorID = 2;
+  readonly attribute char_string<32> productName = 3;
+  readonly attribute int16u productID = 4;
+  attribute access(write: manage) char_string<32> nodeLabel = 5;
+  attribute access(write: administer) char_string<2> location = 6;
+  readonly attribute int16u hardwareVersion = 7;
+  readonly attribute char_string<64> hardwareVersionString = 8;
+  readonly attribute int32u softwareVersion = 9;
+  readonly attribute char_string<64> softwareVersionString = 10;
+  readonly attribute char_string<16> manufacturingDate = 11;
+  readonly attribute char_string<32> partNumber = 12;
+  readonly attribute long_char_string<256> productURL = 13;
+  readonly attribute char_string<64> productLabel = 14;
+  readonly attribute char_string<32> serialNumber = 15;
+  attribute access(write: manage) boolean localConfigDisabled = 16;
+  readonly attribute boolean reachable = 17;
+  readonly attribute char_string<32> uniqueID = 18;
+  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
-client cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
+server cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
   }
 
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
   }
 
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
   }
 
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
   }
 
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
-}
-
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
   }
 
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
   }
 
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
+  response struct QueryImageResponse = 1 {
+    OTAQueryStatus status = 0;
+    optional INT32U delayedActionTime = 1;
+    optional CHAR_STRING imageURI = 2;
+    optional INT32U softwareVersion = 3;
+    optional CHAR_STRING softwareVersionString = 4;
+    optional OCTET_STRING updateToken = 5;
+    optional BOOLEAN userConsentNeeded = 6;
+    optional OCTET_STRING metadataForRequestor = 7;
   }
 
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
   }
 
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
 }
 
 server cluster LocalizationConfiguration = 43 {
@@ -562,38 +451,141 @@ server cluster LocalizationConfiguration = 43 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatus : ENUM8 {
-    kSuccess = 0;
-    kOutOfRange = 1;
-    kBoundsExceeded = 2;
-    kNetworkIDNotFound = 3;
-    kDuplicateNetworkID = 4;
-    kNetworkNotFound = 5;
-    kRegulatoryError = 6;
-    kAuthFailure = 7;
-    kUnsupportedSecurity = 8;
-    kOtherConnectionFailure = 9;
-    kIPV6Failed = 10;
-    kIPBindFailed = 11;
-    kUnknownError = 12;
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
   }
 
-  enum WiFiBand : ENUM8 {
-    k2g4 = 0;
-    k3g65 = 1;
-    k5g = 2;
-    k6g = 3;
-    k60g = 4;
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
   }
 
-  bitmap NetworkCommissioningFeature : BITMAP32 {
-    kWiFiNetworkInterface = 0x1;
-    kThreadNetworkInterface = 0x2;
-    kEthernetNetworkInterface = 0x4;
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster UnitLocalization = 45 {
+  enum TempUnit : ENUM8 {
+    kFahrenheit = 0;
+    kCelsius = 1;
+    kKelvin = 2;
   }
 
-  bitmap WiFiSecurity : BITMAP8 {
+  bitmap UnitLocalizationFeature : BITMAP32 {
+    kTemperatureUnit = 0x1;
+  }
+
+  attribute TempUnit temperatureUnit = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster GeneralCommissioning = 48 {
+  enum CommissioningError : ENUM8 {
+    kOk = 0;
+    kValueOutsideRange = 1;
+    kInvalidAuthentication = 2;
+    kNoFailSafe = 3;
+    kBusyWithOtherAdmin = 4;
+  }
+
+  enum RegulatoryLocationType : ENUM8 {
+    kIndoor = 0;
+    kOutdoor = 1;
+    kIndoorOutdoor = 2;
+  }
+
+  struct BasicCommissioningInfo {
+    int16u failSafeExpiryLengthSeconds = 0;
+    int16u maxCumulativeFailsafeSeconds = 1;
+  }
+
+  attribute access(write: administer) int64u breadcrumb = 0;
+  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
+  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
+  readonly attribute RegulatoryLocationType locationCapability = 3;
+  readonly attribute boolean supportsConcurrentConnection = 4;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ArmFailSafeRequest {
+    INT16U expiryLengthSeconds = 0;
+    INT64U breadcrumb = 1;
+  }
+
+  request struct SetRegulatoryConfigRequest {
+    RegulatoryLocationType newRegulatoryConfig = 0;
+    CHAR_STRING countryCode = 1;
+    INT64U breadcrumb = 2;
+  }
+
+  response struct ArmFailSafeResponse = 1 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
+  }
+
+  response struct SetRegulatoryConfigResponse = 3 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
+  }
+
+  response struct CommissioningCompleteResponse = 5 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
+  }
+
+  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
+  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
+  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
+}
+
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatus : ENUM8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
+  }
+
+  enum WiFiBand : ENUM8 {
+    k2g4 = 0;
+    k3g65 = 1;
+    k5g = 2;
+    k6g = 3;
+    k60g = 4;
+  }
+
+  bitmap NetworkCommissioningFeature : BITMAP32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
+  }
+
+  bitmap WiFiSecurity : BITMAP8 {
     kUnencrypted = 0x1;
     kWepPersonal = 0x2;
     kWpaPersonal = 0x4;
@@ -696,285 +688,136 @@ server cluster NetworkCommissioning = 49 {
   command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
 }
 
-server cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
+server cluster DiagnosticLogs = 50 {
+  enum LogsIntent : ENUM8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
   }
 
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
+  enum LogsStatus : ENUM8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
   }
 
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
+  enum LogsTransferProtocol : ENUM8 {
+    kResponsePayload = 0;
+    kBdx = 1;
   }
 
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
+  request struct RetrieveLogsRequestRequest {
+    LogsIntent intent = 0;
+    LogsTransferProtocol requestedProtocol = 1;
+    OCTET_STRING transferFileDesignator = 2;
   }
 
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
-  }
+  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+}
 
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
   }
 
-  response struct QueryImageResponse = 1 {
-    OTAQueryStatus status = 0;
-    optional INT32U delayedActionTime = 1;
-    optional CHAR_STRING imageURI = 2;
-    optional INT32U softwareVersion = 3;
-    optional CHAR_STRING softwareVersionString = 4;
-    optional OCTET_STRING updateToken = 5;
-    optional BOOLEAN userConsentNeeded = 6;
-    optional OCTET_STRING metadataForRequestor = 7;
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
   }
 
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
   }
 
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
-}
-
-server cluster OperationalCredentials = 62 {
-  enum OperationalCertStatus : ENUM8 {
-    kSuccess = 0;
-    kInvalidPublicKey = 1;
-    kInvalidNodeOpId = 2;
-    kInvalidNOC = 3;
-    kMissingCsr = 4;
-    kTableFull = 5;
-    kInvalidAdminSubject = 6;
-    kInsufficientPrivilege = 8;
-    kFabricConflict = 9;
-    kLabelConflict = 10;
-    kInvalidFabricIndex = 11;
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
   }
 
-  struct NOCStruct {
-    octet_string noc = 1;
-    nullable octet_string icac = 2;
-    fabric_idx fabricIndex = 254;
+  enum RadioFaultType : ENUM8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
   }
 
-  struct FabricDescriptor {
-    octet_string<65> rootPublicKey = 1;
-    vendor_id vendorId = 2;
-    fabric_id fabricId = 3;
-    node_id nodeId = 4;
-    char_string<32> label = 5;
-    fabric_idx fabricIndex = 254;
+  struct NetworkInterfaceType {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceType type = 7;
   }
 
-  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
-  readonly attribute FabricDescriptor fabrics[] = 1;
-  readonly attribute int8u supportedFabrics = 2;
-  readonly attribute int8u commissionedFabrics = 3;
-  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
-  readonly attribute fabric_idx currentFabricIndex = 5;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AttestationRequestRequest {
-    OCTET_STRING attestationNonce = 0;
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultType current[] = 0;
+    HardwareFaultType previous[] = 1;
   }
 
-  request struct CertificateChainRequestRequest {
-    INT8U certificateType = 0;
-  }
-
-  request struct CSRRequestRequest {
-    OCTET_STRING CSRNonce = 0;
-    optional boolean isForUpdateNOC = 1;
-  }
-
-  request struct AddNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
-    OCTET_STRING IPKValue = 2;
-    Int64u caseAdminSubject = 3;
-    VENDOR_ID adminVendorId = 4;
-  }
-
-  request struct UpdateNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
-  }
-
-  request struct UpdateFabricLabelRequest {
-    CHAR_STRING label = 0;
-  }
-
-  request struct RemoveFabricRequest {
-    fabric_idx fabricIndex = 0;
-  }
-
-  request struct AddTrustedRootCertificateRequest {
-    OCTET_STRING rootCertificate = 0;
-  }
-
-  response struct AttestationResponse = 1 {
-    OCTET_STRING attestationElements = 0;
-    OCTET_STRING signature = 1;
-  }
-
-  response struct CertificateChainResponse = 3 {
-    OCTET_STRING certificate = 0;
-  }
-
-  response struct CSRResponse = 5 {
-    OCTET_STRING NOCSRElements = 0;
-    OCTET_STRING attestationSignature = 1;
-  }
-
-  response struct NOCResponse = 8 {
-    OperationalCertStatus statusCode = 0;
-    optional fabric_idx fabricIndex = 1;
-    optional CHAR_STRING debugText = 2;
-  }
-
-  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
-  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
-  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
-  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
-  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
-  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
-  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
-  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-}
-
-server cluster Scenes = 5 {
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
+  critical event RadioFaultChange = 1 {
+    RadioFaultType current[] = 0;
+    RadioFaultType previous[] = 1;
   }
 
-  struct ExtensionFieldSet {
-    cluster_id clusterId = 0;
-    AttributeValuePair attributeValueList[] = 1;
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultType current[] = 0;
+    NetworkFaultType previous[] = 1;
   }
 
-  struct AttributeValuePair {
-    optional attrib_id attributeId = 0;
-    int8u attributeValue[] = 1;
+  critical event BootReason = 3 {
+    BootReasonType bootReason = 0;
   }
 
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
+  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
+  readonly attribute int32u totalOperationalHours = 3;
+  readonly attribute enum8 bootReasons = 4;
+  readonly attribute ENUM8 activeHardwareFaults[] = 5;
+  readonly attribute ENUM8 activeRadioFaults[] = 6;
+  readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AddSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    INT16U transitionTime = 2;
-    CHAR_STRING sceneName = 3;
-    ExtensionFieldSet extensionFieldSets[] = 4;
-  }
-
-  request struct ViewSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RemoveSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RemoveAllScenesRequest {
-    group_id groupId = 0;
-  }
-
-  request struct StoreSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-  }
-
-  request struct RecallSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    optional nullable INT16U transitionTime = 2;
-  }
-
-  request struct GetSceneMembershipRequest {
-    group_id groupId = 0;
-  }
-
-  response struct AddSceneResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
-
-  response struct ViewSceneResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-    optional INT16U transitionTime = 3;
-    optional CHAR_STRING sceneName = 4;
-    optional ExtensionFieldSet extensionFieldSets[] = 5;
-  }
-
-  response struct RemoveSceneResponse = 2 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
-
-  response struct RemoveAllScenesResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-  }
-
-  response struct StoreSceneResponse = 4 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
-
-  response struct GetSceneMembershipResponse = 6 {
-    ENUM8 status = 0;
-    nullable INT8U capacity = 1;
-    group_id groupId = 2;
-    optional INT8U sceneList[] = 3;
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
   }
 
-  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
-  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
-  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
-  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
-  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
-  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
-  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
 server cluster SoftwareDiagnostics = 52 {
@@ -1002,164 +845,51 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster Thermostat = 513 {
-  enum SetpointAdjustMode : ENUM8 {
-    kHeatSetpoint = 0;
-    kCoolSetpoint = 1;
-    kHeatAndCoolSetpoints = 2;
-  }
-
-  enum ThermostatControlSequence : ENUM8 {
-    kCoolingOnly = 0;
-    kCoolingWithReheat = 1;
-    kHeatingOnly = 2;
-    kHeatingWithReheat = 3;
-    kCoolingAndHeating = 4;
-    kCoolingAndHeatingWithReheat = 5;
+server cluster ThreadNetworkDiagnostics = 53 {
+  enum NetworkFault : ENUM8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
   }
 
-  enum ThermostatRunningMode : ENUM8 {
-    kOff = 0;
-    kCool = 3;
-    kHeat = 4;
+  enum RoutingRole : ENUM8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kReed = 4;
+    kRouter = 5;
+    kLeader = 6;
   }
 
-  enum ThermostatSystemMode : ENUM8 {
-    kOff = 0;
-    kAuto = 1;
-    kCool = 3;
-    kHeat = 4;
-    kEmergencyHeating = 5;
-    kPrecooling = 6;
-    kFanOnly = 7;
+  enum ThreadConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  bitmap DayOfWeek : BITMAP8 {
-    kSunday = 0x1;
-    kMonday = 0x2;
-    kTuesday = 0x4;
-    kWednesday = 0x8;
-    kThursday = 0x10;
-    kFriday = 0x20;
-    kSaturday = 0x40;
-    kAwayOrVacation = 0x80;
+  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+    kMLECounts = 0x4;
+    kMACCounts = 0x8;
   }
 
-  bitmap ModeForSequence : BITMAP8 {
-    kHeatSetpointFieldPresent = 0x1;
-    kCoolSetpointFieldPresent = 0x2;
-  }
-
-  bitmap ThermostatFeature : BITMAP32 {
-    kHeating = 0x1;
-    kCooling = 0x2;
-    kOccupancy = 0x4;
-    kSchedule = 0x8;
-    kSetback = 0x10;
-    kAutomode = 0x20;
-  }
-
-  struct ThermostatScheduleTransition {
-    int16u transitionTime = 0;
-    nullable int16s heatSetpoint = 1;
-    nullable int16s coolSetpoint = 2;
-  }
-
-  readonly attribute nullable int16s localTemperature = 0;
-  readonly attribute int16s absMinHeatSetpointLimit = 3;
-  readonly attribute int16s absMaxHeatSetpointLimit = 4;
-  readonly attribute int16s absMinCoolSetpointLimit = 5;
-  readonly attribute int16s absMaxCoolSetpointLimit = 6;
-  attribute int16s occupiedCoolingSetpoint = 17;
-  attribute int16s occupiedHeatingSetpoint = 18;
-  attribute access(write: manage) int16s minHeatSetpointLimit = 21;
-  attribute access(write: manage) int16s maxHeatSetpointLimit = 22;
-  attribute access(write: manage) int16s minCoolSetpointLimit = 23;
-  attribute access(write: manage) int16s maxCoolSetpointLimit = 24;
-  attribute access(write: manage) int8s minSetpointDeadBand = 25;
-  attribute access(write: manage) ThermostatControlSequence controlSequenceOfOperation = 27;
-  attribute access(write: manage) enum8 systemMode = 28;
-  readonly attribute enum8 startOfWeek = 32;
-  readonly attribute int8u numberOfWeeklyTransitions = 33;
-  readonly attribute int8u numberOfDailyTransitions = 34;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct SetpointRaiseLowerRequest {
-    SetpointAdjustMode mode = 0;
-    INT8S amount = 1;
-  }
-
-  request struct SetWeeklyScheduleRequest {
-    INT8U numberOfTransitionsForSequence = 0;
-    DayOfWeek dayOfWeekForSequence = 1;
-    ModeForSequence modeForSequence = 2;
-    ThermostatScheduleTransition transitions[] = 3;
-  }
-
-  request struct GetWeeklyScheduleRequest {
-    DayOfWeek daysToReturn = 0;
-    ModeForSequence modeToReturn = 1;
-  }
-
-  response struct GetWeeklyScheduleResponse = 0 {
-    INT8U numberOfTransitionsForSequence = 0;
-    DayOfWeek dayOfWeekForSequence = 1;
-    ModeForSequence modeForSequence = 2;
-    ThermostatScheduleTransition transitions[] = 3;
-  }
-
-  command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0;
-  command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1;
-  command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2;
-  command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3;
-}
-
-server cluster ThreadNetworkDiagnostics = 53 {
-  enum NetworkFault : ENUM8 {
-    kUnspecified = 0;
-    kLinkDown = 1;
-    kHardwareFailure = 2;
-    kNetworkJammed = 3;
-  }
-
-  enum RoutingRole : ENUM8 {
-    kUnspecified = 0;
-    kUnassigned = 1;
-    kSleepyEndDevice = 2;
-    kEndDevice = 3;
-    kReed = 4;
-    kRouter = 5;
-    kLeader = 6;
-  }
-
-  enum ThreadConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
-  }
-
-  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
-    kPacketCounts = 0x1;
-    kErrorCounts = 0x2;
-    kMLECounts = 0x4;
-    kMACCounts = 0x8;
-  }
-
-  struct NeighborTable {
-    int64u extAddress = 0;
-    int32u age = 1;
-    int16u rloc16 = 2;
-    int32u linkFrameCounter = 3;
-    int32u mleFrameCounter = 4;
-    int8u lqi = 5;
-    nullable int8s averageRssi = 6;
-    nullable int8s lastRssi = 7;
-    int8u frameErrorRate = 8;
-    int8u messageErrorRate = 9;
-    boolean rxOnWhenIdle = 10;
-    boolean fullThreadDevice = 11;
-    boolean fullNetworkData = 12;
-    boolean isChild = 13;
+  struct NeighborTable {
+    int64u extAddress = 0;
+    int32u age = 1;
+    int16u rloc16 = 2;
+    int32u linkFrameCounter = 3;
+    int32u mleFrameCounter = 4;
+    int8u lqi = 5;
+    nullable int8s averageRssi = 6;
+    nullable int8s lastRssi = 7;
+    int8u frameErrorRate = 8;
+    int8u messageErrorRate = 9;
+    boolean rxOnWhenIdle = 10;
+    boolean fullThreadDevice = 11;
+    boolean fullNetworkData = 12;
+    boolean isChild = 13;
   }
 
   struct RouteTable {
@@ -1266,56 +996,6 @@ server cluster ThreadNetworkDiagnostics = 53 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
-  }
-
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
-  }
-
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster UnitLocalization = 45 {
-  enum TempUnit : ENUM8 {
-    kFahrenheit = 0;
-    kCelsius = 1;
-    kKelvin = 2;
-  }
-
-  bitmap UnitLocalizationFeature : BITMAP32 {
-    kTemperatureUnit = 0x1;
-  }
-
-  attribute TempUnit temperatureUnit = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster UserLabel = 65 {
-  attribute access(write: manage) LabelStruct labelList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
 server cluster WiFiNetworkDiagnostics = 54 {
   enum AssociationFailureCause : ENUM8 {
     kUnknown = 0;
@@ -1377,6 +1057,326 @@ server cluster WiFiNetworkDiagnostics = 54 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
+  }
+
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
+  }
+
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
+  }
+
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
+  }
+
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+  }
+
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
+}
+
+server cluster OperationalCredentials = 62 {
+  enum OperationalCertStatus : ENUM8 {
+    kSuccess = 0;
+    kInvalidPublicKey = 1;
+    kInvalidNodeOpId = 2;
+    kInvalidNOC = 3;
+    kMissingCsr = 4;
+    kTableFull = 5;
+    kInvalidAdminSubject = 6;
+    kInsufficientPrivilege = 8;
+    kFabricConflict = 9;
+    kLabelConflict = 10;
+    kInvalidFabricIndex = 11;
+  }
+
+  struct NOCStruct {
+    octet_string noc = 1;
+    nullable octet_string icac = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct FabricDescriptor {
+    octet_string<65> rootPublicKey = 1;
+    vendor_id vendorId = 2;
+    fabric_id fabricId = 3;
+    node_id nodeId = 4;
+    char_string<32> label = 5;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
+  readonly attribute FabricDescriptor fabrics[] = 1;
+  readonly attribute int8u supportedFabrics = 2;
+  readonly attribute int8u commissionedFabrics = 3;
+  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
+  readonly attribute fabric_idx currentFabricIndex = 5;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AttestationRequestRequest {
+    OCTET_STRING attestationNonce = 0;
+  }
+
+  request struct CertificateChainRequestRequest {
+    INT8U certificateType = 0;
+  }
+
+  request struct CSRRequestRequest {
+    OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
+  }
+
+  request struct AddNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+    OCTET_STRING IPKValue = 2;
+    Int64u caseAdminSubject = 3;
+    VENDOR_ID adminVendorId = 4;
+  }
+
+  request struct UpdateNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+  }
+
+  request struct UpdateFabricLabelRequest {
+    CHAR_STRING label = 0;
+  }
+
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
+  }
+
+  request struct AddTrustedRootCertificateRequest {
+    OCTET_STRING rootCertificate = 0;
+  }
+
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
+  }
+
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
+  }
+
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
+  }
+
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
+  }
+
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
+}
+
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
+  }
+
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster UserLabel = 65 {
+  attribute access(write: manage) LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Thermostat = 513 {
+  enum SetpointAdjustMode : ENUM8 {
+    kHeatSetpoint = 0;
+    kCoolSetpoint = 1;
+    kHeatAndCoolSetpoints = 2;
+  }
+
+  enum ThermostatControlSequence : ENUM8 {
+    kCoolingOnly = 0;
+    kCoolingWithReheat = 1;
+    kHeatingOnly = 2;
+    kHeatingWithReheat = 3;
+    kCoolingAndHeating = 4;
+    kCoolingAndHeatingWithReheat = 5;
+  }
+
+  enum ThermostatRunningMode : ENUM8 {
+    kOff = 0;
+    kCool = 3;
+    kHeat = 4;
+  }
+
+  enum ThermostatSystemMode : ENUM8 {
+    kOff = 0;
+    kAuto = 1;
+    kCool = 3;
+    kHeat = 4;
+    kEmergencyHeating = 5;
+    kPrecooling = 6;
+    kFanOnly = 7;
+  }
+
+  bitmap DayOfWeek : BITMAP8 {
+    kSunday = 0x1;
+    kMonday = 0x2;
+    kTuesday = 0x4;
+    kWednesday = 0x8;
+    kThursday = 0x10;
+    kFriday = 0x20;
+    kSaturday = 0x40;
+    kAwayOrVacation = 0x80;
+  }
+
+  bitmap ModeForSequence : BITMAP8 {
+    kHeatSetpointFieldPresent = 0x1;
+    kCoolSetpointFieldPresent = 0x2;
+  }
+
+  bitmap ThermostatFeature : BITMAP32 {
+    kHeating = 0x1;
+    kCooling = 0x2;
+    kOccupancy = 0x4;
+    kSchedule = 0x8;
+    kSetback = 0x10;
+    kAutomode = 0x20;
+  }
+
+  struct ThermostatScheduleTransition {
+    int16u transitionTime = 0;
+    nullable int16s heatSetpoint = 1;
+    nullable int16s coolSetpoint = 2;
+  }
+
+  readonly attribute nullable int16s localTemperature = 0;
+  readonly attribute int16s absMinHeatSetpointLimit = 3;
+  readonly attribute int16s absMaxHeatSetpointLimit = 4;
+  readonly attribute int16s absMinCoolSetpointLimit = 5;
+  readonly attribute int16s absMaxCoolSetpointLimit = 6;
+  attribute int16s occupiedCoolingSetpoint = 17;
+  attribute int16s occupiedHeatingSetpoint = 18;
+  attribute access(write: manage) int16s minHeatSetpointLimit = 21;
+  attribute access(write: manage) int16s maxHeatSetpointLimit = 22;
+  attribute access(write: manage) int16s minCoolSetpointLimit = 23;
+  attribute access(write: manage) int16s maxCoolSetpointLimit = 24;
+  attribute access(write: manage) int8s minSetpointDeadBand = 25;
+  attribute access(write: manage) ThermostatControlSequence controlSequenceOfOperation = 27;
+  attribute access(write: manage) enum8 systemMode = 28;
+  readonly attribute enum8 startOfWeek = 32;
+  readonly attribute int8u numberOfWeeklyTransitions = 33;
+  readonly attribute int8u numberOfDailyTransitions = 34;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct SetpointRaiseLowerRequest {
+    SetpointAdjustMode mode = 0;
+    INT8S amount = 1;
+  }
+
+  request struct SetWeeklyScheduleRequest {
+    INT8U numberOfTransitionsForSequence = 0;
+    DayOfWeek dayOfWeekForSequence = 1;
+    ModeForSequence modeForSequence = 2;
+    ThermostatScheduleTransition transitions[] = 3;
+  }
+
+  request struct GetWeeklyScheduleRequest {
+    DayOfWeek daysToReturn = 0;
+    ModeForSequence modeToReturn = 1;
+  }
+
+  response struct GetWeeklyScheduleResponse = 0 {
+    INT8U numberOfTransitionsForSequence = 0;
+    DayOfWeek dayOfWeekForSequence = 1;
+    ModeForSequence modeForSequence = 2;
+    ThermostatScheduleTransition transitions[] = 3;
+  }
+
+  command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0;
+  command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1;
+  command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2;
+  command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3;
+}
+
 endpoint 0 {
   device type rootdevice = 22;
 
diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
index 7654b8170e0789..ba087012c461b4 100644
--- a/examples/tv-app/tv-common/tv-app.matter
+++ b/examples/tv-app/tv-common/tv-app.matter
@@ -6,6 +6,178 @@ struct LabelStruct {
     char_string<16> value = 1;
 }
 
+server cluster OnOff = 6 {
+  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
+    kFadeToOffIn0p8Seconds = 0;
+    kNoFade = 1;
+    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
+  }
+
+  enum OnOffDyingLightEffectVariant : ENUM8 {
+    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
+  }
+
+  enum OnOffEffectIdentifier : ENUM8 {
+    kDelayedAllOff = 0;
+    kDyingLight = 1;
+  }
+
+  enum OnOffStartUpOnOff : ENUM8 {
+    kOff = 0;
+    kOn = 1;
+    kTogglePreviousOnOff = 2;
+  }
+
+  bitmap OnOffControl : BITMAP8 {
+    kAcceptOnlyWhenOn = 0x1;
+  }
+
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
+  }
+
+  bitmap SceneFeatures : BITMAP32 {
+    kSceneNames = 0x1;
+  }
+
+  readonly attribute boolean onOff = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command Off(): DefaultSuccess = 0;
+  command On(): DefaultSuccess = 1;
+  command Toggle(): DefaultSuccess = 2;
+}
+
+server cluster LevelControl = 8 {
+  enum MoveMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
+  }
+
+  enum StepMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
+  }
+
+  bitmap LevelControlFeature : BITMAP32 {
+    kOnOff = 0x1;
+    kLighting = 0x2;
+    kFrequency = 0x4;
+  }
+
+  readonly attribute int8u currentLevel = 0;
+  readonly attribute int16u remainingTime = 1;
+  readonly attribute int8u minLevel = 2;
+  readonly attribute int8u maxLevel = 3;
+  readonly attribute int16u currentFrequency = 4;
+  readonly attribute int16u minFrequency = 5;
+  readonly attribute int16u maxFrequency = 6;
+  attribute bitmap8 options = 15;
+  attribute int16u onOffTransitionTime = 16;
+  attribute nullable int8u onLevel = 17;
+  attribute nullable int16u onTransitionTime = 18;
+  attribute nullable int16u offTransitionTime = 19;
+  attribute nullable int8u defaultMoveRate = 20;
+  attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct MoveToLevelRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
+  }
+
+  request struct MoveRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
+  }
+
+  request struct StepRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionMask = 3;
+    BITMAP8 optionOverride = 4;
+  }
+
+  request struct StopRequest {
+    BITMAP8 optionMask = 0;
+    BITMAP8 optionOverride = 1;
+  }
+
+  request struct MoveToLevelWithOnOffRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
+  }
+
+  request struct MoveWithOnOffRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
+  }
+
+  request struct StepWithOnOffRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
+  }
+
+  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
+  command Move(MoveRequest): DefaultSuccess = 1;
+  command Step(StepRequest): DefaultSuccess = 2;
+  command Stop(StopRequest): DefaultSuccess = 3;
+  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
+  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
+  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
+  command StopWithOnOff(): DefaultSuccess = 7;
+}
+
+server cluster Descriptor = 29 {
+  struct DeviceType {
+    devtype_id type = 0;
+    int16u revision = 1;
+  }
+
+  readonly attribute DeviceType deviceList[] = 0;
+  readonly attribute CLUSTER_ID serverList[] = 1;
+  readonly attribute CLUSTER_ID clientList[] = 2;
+  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+client cluster Binding = 30 {
+  struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  attribute TargetStruct binding[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Binding = 30 {
+  struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  attribute TargetStruct binding[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
 server cluster AccessControl = 31 {
   enum AuthMode : ENUM8 {
     kPase = 1;
@@ -72,423 +244,551 @@ server cluster AccessControl = 31 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster AccountLogin = 1294 {
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct GetSetupPINRequest {
-    CHAR_STRING tempAccountIdentifier = 0;
+server cluster Basic = 40 {
+  struct CapabilityMinimaStruct {
+    int16u caseSessionsPerFabric = 0;
+    int16u subscriptionsPerFabric = 1;
   }
 
-  request struct LoginRequest {
-    CHAR_STRING tempAccountIdentifier = 0;
-    CHAR_STRING setupPIN = 1;
+  critical event StartUp = 0 {
+    INT32U softwareVersion = 0;
   }
 
-  response struct GetSetupPINResponse = 1 {
-    CHAR_STRING setupPIN = 0;
+  critical event ShutDown = 1 {
   }
 
-  timed command GetSetupPIN(GetSetupPINRequest): GetSetupPINResponse = 0;
-  timed command Login(LoginRequest): DefaultSuccess = 2;
-  timed command Logout(): DefaultSuccess = 3;
-}
-
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
+  info event Leave = 2 {
   }
 
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
+  info event ReachableChanged = 3 {
+    boolean reachableNewValue = 0;
   }
 
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
+  readonly attribute int16u dataModelRevision = 0;
+  readonly attribute char_string<32> vendorName = 1;
+  readonly attribute vendor_id vendorID = 2;
+  readonly attribute char_string<32> productName = 3;
+  readonly attribute int16u productID = 4;
+  attribute access(write: manage) char_string<32> nodeLabel = 5;
+  attribute access(write: administer) char_string<2> location = 6;
+  readonly attribute int16u hardwareVersion = 7;
+  readonly attribute char_string<64> hardwareVersionString = 8;
+  readonly attribute int32u softwareVersion = 9;
+  readonly attribute char_string<64> softwareVersionString = 10;
+  readonly attribute char_string<16> manufacturingDate = 11;
+  readonly attribute char_string<32> partNumber = 12;
+  readonly attribute long_char_string<256> productURL = 13;
+  readonly attribute char_string<64> productLabel = 14;
+  readonly attribute char_string<32> serialNumber = 15;
+  attribute access(write: manage) boolean localConfigDisabled = 16;
+  readonly attribute boolean reachable = 17;
+  readonly attribute char_string<32> uniqueID = 18;
+  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
+server cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
   }
 
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
   }
 
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
-
-server cluster ApplicationBasic = 1293 {
-  enum ApplicationStatusEnum : ENUM8 {
-    kStopped = 0;
-    kActiveVisibleFocus = 1;
-    kActiveHidden = 2;
-    kActiveVisibleNotFocus = 3;
-  }
-
-  struct ApplicationBasicApplication {
-    int16u catalogVendorId = 0;
-    char_string applicationId = 1;
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
   }
 
-  readonly attribute char_string<32> vendorName = 0;
-  readonly attribute int16u vendorID = 1;
-  readonly attribute char_string<32> applicationName = 2;
-  readonly attribute int16u productID = 3;
-  readonly attribute ApplicationBasicApplication application = 4;
-  readonly attribute ApplicationStatusEnum status = 5;
-  readonly attribute char_string<32> applicationVersion = 6;
-  readonly attribute vendor_id allowedVendorList[] = 7;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster ApplicationLauncher = 1292 {
-  enum ApplicationLauncherStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kAppNotAvailable = 1;
-    kSystemBusy = 2;
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
   }
 
-  bitmap ApplicationLauncherFeature : BITMAP32 {
-    kApplicationPlatform = 0x1;
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
   }
 
-  struct ApplicationEP {
-    Application application = 0;
-    optional endpoint_no endpoint = 1;
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
   }
 
-  struct Application {
-    int16u catalogVendorId = 0;
-    char_string applicationId = 1;
+  response struct QueryImageResponse = 1 {
+    OTAQueryStatus status = 0;
+    optional INT32U delayedActionTime = 1;
+    optional CHAR_STRING imageURI = 2;
+    optional INT32U softwareVersion = 3;
+    optional CHAR_STRING softwareVersionString = 4;
+    optional OCTET_STRING updateToken = 5;
+    optional BOOLEAN userConsentNeeded = 6;
+    optional OCTET_STRING metadataForRequestor = 7;
   }
 
-  readonly attribute INT16U catalogList[] = 0;
-  attribute nullable ApplicationEP currentApp = 1;
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
+  }
+
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
+}
+
+server cluster LocalizationConfiguration = 43 {
+  attribute char_string<35> activeLocale = 0;
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct LaunchAppRequest {
-    Application application = 0;
-    optional OCTET_STRING data = 1;
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
   }
 
-  request struct StopAppRequest {
-    Application application = 0;
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
   }
 
-  request struct HideAppRequest {
-    Application application = 0;
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster UnitLocalization = 45 {
+  enum TempUnit : ENUM8 {
+    kFahrenheit = 0;
+    kCelsius = 1;
+    kKelvin = 2;
   }
 
-  response struct LauncherResponse = 3 {
-    ApplicationLauncherStatusEnum status = 0;
-    OCTET_STRING data = 1;
+  bitmap UnitLocalizationFeature : BITMAP32 {
+    kTemperatureUnit = 0x1;
   }
 
-  command LaunchApp(LaunchAppRequest): LauncherResponse = 0;
-  command StopApp(StopAppRequest): LauncherResponse = 1;
-  command HideApp(HideAppRequest): LauncherResponse = 2;
+  attribute TempUnit temperatureUnit = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster AudioOutput = 1291 {
-  enum OutputTypeEnum : ENUM8 {
-    kHdmi = 0;
-    kBt = 1;
-    kOptical = 2;
-    kHeadphone = 3;
-    kInternal = 4;
-    kOther = 5;
+client cluster GeneralCommissioning = 48 {
+  enum CommissioningError : ENUM8 {
+    kOk = 0;
+    kValueOutsideRange = 1;
+    kInvalidAuthentication = 2;
+    kNoFailSafe = 3;
+    kBusyWithOtherAdmin = 4;
   }
 
-  bitmap AudioOutputFeature : BITMAP32 {
-    kNameUpdates = 0x1;
+  enum RegulatoryLocationType : ENUM8 {
+    kIndoor = 0;
+    kOutdoor = 1;
+    kIndoorOutdoor = 2;
   }
 
-  struct OutputInfo {
-    int8u index = 0;
-    OutputTypeEnum outputType = 1;
-    char_string<32> name = 2;
+  struct BasicCommissioningInfo {
+    int16u failSafeExpiryLengthSeconds = 0;
+    int16u maxCumulativeFailsafeSeconds = 1;
   }
 
-  readonly attribute OutputInfo outputList[] = 0;
-  readonly attribute int8u currentOutput = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
+  attribute access(write: administer) int64u breadcrumb = 0;
+  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
+  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
+  readonly attribute RegulatoryLocationType locationCapability = 3;
+  readonly attribute boolean supportsConcurrentConnection = 4;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct SelectOutputRequest {
-    INT8U index = 0;
+  request struct ArmFailSafeRequest {
+    INT16U expiryLengthSeconds = 0;
+    INT64U breadcrumb = 1;
   }
 
-  request struct RenameOutputRequest {
-    INT8U index = 0;
-    CHAR_STRING name = 1;
+  request struct SetRegulatoryConfigRequest {
+    RegulatoryLocationType newRegulatoryConfig = 0;
+    CHAR_STRING countryCode = 1;
+    INT64U breadcrumb = 2;
   }
 
-  command SelectOutput(SelectOutputRequest): DefaultSuccess = 0;
-  command RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
-}
+  response struct ArmFailSafeResponse = 1 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
+  }
 
-server cluster Basic = 40 {
-  struct CapabilityMinimaStruct {
-    int16u caseSessionsPerFabric = 0;
-    int16u subscriptionsPerFabric = 1;
+  response struct SetRegulatoryConfigResponse = 3 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  critical event StartUp = 0 {
-    INT32U softwareVersion = 0;
+  response struct CommissioningCompleteResponse = 5 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  critical event ShutDown = 1 {
+  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
+  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
+  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
+}
+
+server cluster GeneralCommissioning = 48 {
+  enum CommissioningError : ENUM8 {
+    kOk = 0;
+    kValueOutsideRange = 1;
+    kInvalidAuthentication = 2;
+    kNoFailSafe = 3;
+    kBusyWithOtherAdmin = 4;
   }
 
-  info event Leave = 2 {
+  enum RegulatoryLocationType : ENUM8 {
+    kIndoor = 0;
+    kOutdoor = 1;
+    kIndoorOutdoor = 2;
   }
 
-  info event ReachableChanged = 3 {
-    boolean reachableNewValue = 0;
+  struct BasicCommissioningInfo {
+    int16u failSafeExpiryLengthSeconds = 0;
+    int16u maxCumulativeFailsafeSeconds = 1;
   }
 
-  readonly attribute int16u dataModelRevision = 0;
-  readonly attribute char_string<32> vendorName = 1;
-  readonly attribute vendor_id vendorID = 2;
-  readonly attribute char_string<32> productName = 3;
-  readonly attribute int16u productID = 4;
-  attribute access(write: manage) char_string<32> nodeLabel = 5;
-  attribute access(write: administer) char_string<2> location = 6;
-  readonly attribute int16u hardwareVersion = 7;
-  readonly attribute char_string<64> hardwareVersionString = 8;
-  readonly attribute int32u softwareVersion = 9;
-  readonly attribute char_string<64> softwareVersionString = 10;
-  readonly attribute char_string<16> manufacturingDate = 11;
-  readonly attribute char_string<32> partNumber = 12;
-  readonly attribute long_char_string<256> productURL = 13;
-  readonly attribute char_string<64> productLabel = 14;
-  readonly attribute char_string<32> serialNumber = 15;
-  attribute access(write: manage) boolean localConfigDisabled = 16;
-  readonly attribute boolean reachable = 17;
-  readonly attribute char_string<32> uniqueID = 18;
-  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  attribute access(write: administer) int64u breadcrumb = 0;
+  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
+  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
+  readonly attribute RegulatoryLocationType locationCapability = 3;
+  readonly attribute boolean supportsConcurrentConnection = 4;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-client cluster Binding = 30 {
-  struct TargetStruct {
-    optional node_id node = 1;
-    optional group_id group = 2;
-    optional endpoint_no endpoint = 3;
-    optional cluster_id cluster = 4;
-    fabric_idx fabricIndex = 254;
+  request struct ArmFailSafeRequest {
+    INT16U expiryLengthSeconds = 0;
+    INT64U breadcrumb = 1;
   }
 
-  attribute TargetStruct binding[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster Binding = 30 {
-  struct TargetStruct {
-    optional node_id node = 1;
-    optional group_id group = 2;
-    optional endpoint_no endpoint = 3;
-    optional cluster_id cluster = 4;
-    fabric_idx fabricIndex = 254;
+  request struct SetRegulatoryConfigRequest {
+    RegulatoryLocationType newRegulatoryConfig = 0;
+    CHAR_STRING countryCode = 1;
+    INT64U breadcrumb = 2;
   }
 
-  attribute TargetStruct binding[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  response struct ArmFailSafeResponse = 1 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
+  }
+
+  response struct SetRegulatoryConfigResponse = 3 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
+  }
+
+  response struct CommissioningCompleteResponse = 5 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
+  }
+
+  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
+  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
+  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
 }
 
-server cluster Channel = 1284 {
-  enum ChannelStatusEnum : ENUM8 {
+client cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatus : ENUM8 {
     kSuccess = 0;
-    kMultipleMatches = 1;
-    kNoMatches = 2;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
   }
 
-  enum LineupInfoTypeEnum : ENUM8 {
-    kMso = 0;
+  enum WiFiBand : ENUM8 {
+    k2g4 = 0;
+    k3g65 = 1;
+    k5g = 2;
+    k6g = 3;
+    k60g = 4;
   }
 
-  bitmap ChannelFeature : BITMAP32 {
-    kChannelList = 0x1;
-    kLineupInfo = 0x2;
+  bitmap NetworkCommissioningFeature : BITMAP32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
   }
 
-  struct ChannelInfo {
-    int16u majorNumber = 0;
-    int16u minorNumber = 1;
-    optional char_string<32> name = 2;
-    optional char_string<32> callSign = 3;
-    optional char_string<32> affiliateCallSign = 4;
+  bitmap WiFiSecurity : BITMAP8 {
+    kUnencrypted = 0x1;
+    kWepPersonal = 0x2;
+    kWpaPersonal = 0x4;
+    kWpa2Personal = 0x8;
+    kWpa3Personal = 0x10;
   }
 
-  struct LineupInfo {
-    char_string operatorName = 0;
-    optional char_string lineupName = 1;
-    optional char_string postalCode = 2;
-    LineupInfoTypeEnum lineupInfoType = 3;
+  struct NetworkInfo {
+    octet_string<32> networkID = 0;
+    boolean connected = 1;
   }
 
-  readonly attribute ChannelInfo channelList[] = 0;
-  readonly attribute nullable LineupInfo lineup = 1;
-  readonly attribute nullable ChannelInfo currentChannel = 2;
+  struct WiFiInterfaceScanResult {
+    WiFiSecurity security = 0;
+    octet_string<32> ssid = 1;
+    octet_string<6> bssid = 2;
+    int16u channel = 3;
+    WiFiBand wiFiBand = 4;
+    int8s rssi = 5;
+  }
+
+  struct ThreadInterfaceScanResult {
+    int16u panId = 0;
+    int64u extendedPanId = 1;
+    char_string<16> networkName = 2;
+    int16u channel = 3;
+    int8u version = 4;
+    octet_string<8> extendedAddress = 5;
+    int8s rssi = 6;
+    int8u lqi = 7;
+  }
+
+  readonly attribute access(read: administer) int8u maxNetworks = 0;
+  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
+  readonly attribute int8u scanMaxTimeSeconds = 2;
+  readonly attribute int8u connectMaxTimeSeconds = 3;
+  attribute access(write: administer) boolean interfaceEnabled = 4;
+  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
+  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
+  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct ChangeChannelRequest {
-    CHAR_STRING match = 0;
+  request struct ScanNetworksRequest {
+    optional nullable OCTET_STRING ssid = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  request struct ChangeChannelByNumberRequest {
-    INT16U majorNumber = 0;
-    INT16U minorNumber = 1;
+  request struct AddOrUpdateWiFiNetworkRequest {
+    OCTET_STRING ssid = 0;
+    OCTET_STRING credentials = 1;
+    optional INT64U breadcrumb = 2;
   }
 
-  request struct SkipChannelRequest {
-    INT16U count = 0;
+  request struct AddOrUpdateThreadNetworkRequest {
+    OCTET_STRING operationalDataset = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  response struct ChangeChannelResponse = 1 {
-    ChannelStatusEnum status = 0;
-    optional CHAR_STRING data = 1;
+  request struct RemoveNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  command ChangeChannel(ChangeChannelRequest): ChangeChannelResponse = 0;
-  command ChangeChannelByNumber(ChangeChannelByNumberRequest): DefaultSuccess = 2;
-  command SkipChannel(SkipChannelRequest): DefaultSuccess = 3;
-}
-
-server cluster ContentLauncher = 1290 {
-  enum ContentLaunchStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kUrlNotAvailable = 1;
-    kAuthFailed = 2;
+  request struct ConnectNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  enum MetricTypeEnum : ENUM8 {
-    kPixels = 0;
-    kPercentage = 1;
+  request struct ReorderNetworkRequest {
+    OCTET_STRING networkID = 0;
+    INT8U networkIndex = 1;
+    optional INT64U breadcrumb = 2;
   }
 
-  enum ParameterEnum : ENUM8 {
-    kActor = 0;
-    kChannel = 1;
-    kCharacter = 2;
-    kDirector = 3;
-    kEvent = 4;
-    kFranchise = 5;
-    kGenre = 6;
-    kLeague = 7;
-    kPopularity = 8;
-    kProvider = 9;
-    kSport = 10;
-    kSportsTeam = 11;
-    kType = 12;
+  response struct ScanNetworksResponse = 1 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
+    optional ThreadInterfaceScanResult threadScanResults[] = 3;
   }
 
-  bitmap ContentLauncherFeature : BITMAP32 {
-    kContentSearch = 0x1;
-    kURLPlayback = 0x2;
+  response struct NetworkConfigResponse = 5 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional INT8U networkIndex = 2;
   }
 
-  bitmap SupportedStreamingProtocol : BITMAP32 {
-    kDash = 0x1;
-    kHls = 0x2;
+  response struct ConnectNetworkResponse = 7 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    nullable INT32S errorValue = 2;
   }
 
-  struct ContentSearch {
-    Parameter parameterList[] = 0;
+  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
+  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
+  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
+  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
+  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
+  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+}
+
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatus : ENUM8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
   }
 
-  struct Parameter {
-    ParameterEnum type = 0;
-    char_string value = 1;
-    optional AdditionalInfo externalIDList[] = 2;
+  enum WiFiBand : ENUM8 {
+    k2g4 = 0;
+    k3g65 = 1;
+    k5g = 2;
+    k6g = 3;
+    k60g = 4;
   }
 
-  struct AdditionalInfo {
-    char_string name = 0;
-    char_string value = 1;
+  bitmap NetworkCommissioningFeature : BITMAP32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
   }
 
-  struct BrandingInformation {
-    char_string providerName = 0;
-    optional StyleInformation background = 1;
-    optional StyleInformation logo = 2;
-    optional StyleInformation progressBar = 3;
-    optional StyleInformation splash = 4;
-    optional StyleInformation waterMark = 5;
+  bitmap WiFiSecurity : BITMAP8 {
+    kUnencrypted = 0x1;
+    kWepPersonal = 0x2;
+    kWpaPersonal = 0x4;
+    kWpa2Personal = 0x8;
+    kWpa3Personal = 0x10;
   }
 
-  struct StyleInformation {
-    optional char_string imageUrl = 0;
-    optional char_string color = 1;
-    optional Dimension size = 2;
+  struct NetworkInfo {
+    octet_string<32> networkID = 0;
+    boolean connected = 1;
   }
 
-  struct Dimension {
-    double width = 0;
-    double height = 1;
-    MetricTypeEnum metric = 2;
+  struct WiFiInterfaceScanResult {
+    WiFiSecurity security = 0;
+    octet_string<32> ssid = 1;
+    octet_string<6> bssid = 2;
+    int16u channel = 3;
+    WiFiBand wiFiBand = 4;
+    int8s rssi = 5;
   }
 
-  readonly attribute CHAR_STRING acceptHeader[] = 0;
-  attribute bitmap32 supportedStreamingProtocols = 1;
+  struct ThreadInterfaceScanResult {
+    int16u panId = 0;
+    int64u extendedPanId = 1;
+    char_string<16> networkName = 2;
+    int16u channel = 3;
+    int8u version = 4;
+    octet_string<8> extendedAddress = 5;
+    int8s rssi = 6;
+    int8u lqi = 7;
+  }
+
+  readonly attribute access(read: administer) int8u maxNetworks = 0;
+  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
+  readonly attribute int8u scanMaxTimeSeconds = 2;
+  readonly attribute int8u connectMaxTimeSeconds = 3;
+  attribute access(write: administer) boolean interfaceEnabled = 4;
+  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
+  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
+  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct LaunchContentRequest {
-    ContentSearch search = 0;
-    BOOLEAN autoPlay = 1;
-    optional CHAR_STRING data = 2;
+  request struct ScanNetworksRequest {
+    optional nullable OCTET_STRING ssid = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  request struct LaunchURLRequest {
-    CHAR_STRING contentURL = 0;
-    optional CHAR_STRING displayString = 1;
-    optional BrandingInformation brandingInformation = 2;
+  request struct AddOrUpdateWiFiNetworkRequest {
+    OCTET_STRING ssid = 0;
+    OCTET_STRING credentials = 1;
+    optional INT64U breadcrumb = 2;
   }
 
-  response struct LaunchResponse = 2 {
-    ContentLaunchStatusEnum status = 0;
-    optional CHAR_STRING data = 1;
+  request struct AddOrUpdateThreadNetworkRequest {
+    OCTET_STRING operationalDataset = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  command LaunchContent(LaunchContentRequest): LaunchResponse = 0;
-  command LaunchURL(LaunchURLRequest): LaunchResponse = 1;
-}
+  request struct RemoveNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
+  }
 
-server cluster Descriptor = 29 {
-  struct DeviceType {
-    devtype_id type = 0;
-    int16u revision = 1;
+  request struct ConnectNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  readonly attribute DeviceType deviceList[] = 0;
-  readonly attribute CLUSTER_ID serverList[] = 1;
-  readonly attribute CLUSTER_ID clientList[] = 2;
-  readonly attribute ENDPOINT_NO partsList[] = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  request struct ReorderNetworkRequest {
+    OCTET_STRING networkID = 0;
+    INT8U networkIndex = 1;
+    optional INT64U breadcrumb = 2;
+  }
+
+  response struct ScanNetworksResponse = 1 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
+    optional ThreadInterfaceScanResult threadScanResults[] = 3;
+  }
+
+  response struct NetworkConfigResponse = 5 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional INT8U networkIndex = 2;
+  }
+
+  response struct ConnectNetworkResponse = 7 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    nullable INT32S errorValue = 2;
+  }
+
+  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
+  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
+  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
+  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
+  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
+  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
 }
 
 server cluster DiagnosticLogs = 50 {
@@ -523,159 +823,6 @@ server cluster DiagnosticLogs = 50 {
   command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
 }
 
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
-  }
-
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  command ResetCounts(): DefaultSuccess = 0;
-}
-
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-client cluster GeneralCommissioning = 48 {
-  enum CommissioningError : ENUM8 {
-    kOk = 0;
-    kValueOutsideRange = 1;
-    kInvalidAuthentication = 2;
-    kNoFailSafe = 3;
-    kBusyWithOtherAdmin = 4;
-  }
-
-  enum RegulatoryLocationType : ENUM8 {
-    kIndoor = 0;
-    kOutdoor = 1;
-    kIndoorOutdoor = 2;
-  }
-
-  struct BasicCommissioningInfo {
-    int16u failSafeExpiryLengthSeconds = 0;
-    int16u maxCumulativeFailsafeSeconds = 1;
-  }
-
-  attribute access(write: administer) int64u breadcrumb = 0;
-  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
-  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
-  readonly attribute RegulatoryLocationType locationCapability = 3;
-  readonly attribute boolean supportsConcurrentConnection = 4;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct ArmFailSafeRequest {
-    INT16U expiryLengthSeconds = 0;
-    INT64U breadcrumb = 1;
-  }
-
-  request struct SetRegulatoryConfigRequest {
-    RegulatoryLocationType newRegulatoryConfig = 0;
-    CHAR_STRING countryCode = 1;
-    INT64U breadcrumb = 2;
-  }
-
-  response struct ArmFailSafeResponse = 1 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
-  }
-
-  response struct SetRegulatoryConfigResponse = 3 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
-  }
-
-  response struct CommissioningCompleteResponse = 5 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
-  }
-
-  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
-  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
-  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
-}
-
-server cluster GeneralCommissioning = 48 {
-  enum CommissioningError : ENUM8 {
-    kOk = 0;
-    kValueOutsideRange = 1;
-    kInvalidAuthentication = 2;
-    kNoFailSafe = 3;
-    kBusyWithOtherAdmin = 4;
-  }
-
-  enum RegulatoryLocationType : ENUM8 {
-    kIndoor = 0;
-    kOutdoor = 1;
-    kIndoorOutdoor = 2;
-  }
-
-  struct BasicCommissioningInfo {
-    int16u failSafeExpiryLengthSeconds = 0;
-    int16u maxCumulativeFailsafeSeconds = 1;
-  }
-
-  attribute access(write: administer) int64u breadcrumb = 0;
-  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
-  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
-  readonly attribute RegulatoryLocationType locationCapability = 3;
-  readonly attribute boolean supportsConcurrentConnection = 4;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct ArmFailSafeRequest {
-    INT16U expiryLengthSeconds = 0;
-    INT64U breadcrumb = 1;
-  }
-
-  request struct SetRegulatoryConfigRequest {
-    RegulatoryLocationType newRegulatoryConfig = 0;
-    CHAR_STRING countryCode = 1;
-    INT64U breadcrumb = 2;
-  }
-
-  response struct ArmFailSafeResponse = 1 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
-  }
-
-  response struct SetRegulatoryConfigResponse = 3 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
-  }
-
-  response struct CommissioningCompleteResponse = 5 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
-  }
-
-  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
-  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
-  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
-}
-
 server cluster GeneralDiagnostics = 51 {
   enum BootReasonType : ENUM8 {
     kUnspecified = 0;
@@ -776,1312 +923,1165 @@ server cluster GeneralDiagnostics = 51 {
   command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
-  }
-
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
-    fabric_idx fabricIndex = 254;
+server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
   }
 
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
+  struct ThreadMetrics {
+    int64u id = 0;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
-  struct GroupKeySetStruct {
-    int16u groupKeySetID = 0;
-    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
-    nullable octet_string<16> epochKey0 = 2;
-    nullable epoch_us epochStartTime0 = 3;
-    nullable octet_string<16> epochKey1 = 4;
-    nullable epoch_us epochStartTime1 = 5;
-    nullable octet_string<16> epochKey2 = 6;
-    nullable epoch_us epochStartTime2 = 7;
+  info event SoftwareFault = 0 {
+    SoftwareFaultStruct softwareFault = 0;
   }
 
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
-  readonly attribute int16u maxGroupsPerFabric = 2;
-  readonly attribute int16u maxGroupKeysPerFabric = 3;
+  readonly attribute ThreadMetrics threadMetrics[] = 0;
+  readonly attribute int64u currentHeapFree = 1;
+  readonly attribute int64u currentHeapUsed = 2;
+  readonly attribute int64u currentHeapHighWatermark = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct KeySetWriteRequest {
-    GroupKeySetStruct groupKeySet = 0;
+server cluster ThreadNetworkDiagnostics = 53 {
+  enum NetworkFault : ENUM8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
   }
 
-  request struct KeySetReadRequest {
-    INT16U groupKeySetID = 0;
+  enum RoutingRole : ENUM8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kReed = 4;
+    kRouter = 5;
+    kLeader = 6;
   }
 
-  request struct KeySetRemoveRequest {
-    INT16U groupKeySetID = 0;
+  enum ThreadConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
+  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+    kMLECounts = 0x4;
+    kMACCounts = 0x8;
   }
 
-  response struct KeySetReadResponse = 2 {
-    GroupKeySetStruct groupKeySet = 0;
+  struct NeighborTable {
+    int64u extAddress = 0;
+    int32u age = 1;
+    int16u rloc16 = 2;
+    int32u linkFrameCounter = 3;
+    int32u mleFrameCounter = 4;
+    int8u lqi = 5;
+    nullable int8s averageRssi = 6;
+    nullable int8s lastRssi = 7;
+    int8u frameErrorRate = 8;
+    int8u messageErrorRate = 9;
+    boolean rxOnWhenIdle = 10;
+    boolean fullThreadDevice = 11;
+    boolean fullNetworkData = 12;
+    boolean isChild = 13;
   }
 
-  response struct KeySetReadAllIndicesResponse = 5 {
-    INT16U groupKeySetIDs[] = 0;
+  struct RouteTable {
+    int64u extAddress = 0;
+    int16u rloc16 = 1;
+    int8u routerId = 2;
+    int8u nextHop = 3;
+    int8u pathCost = 4;
+    int8u LQIIn = 5;
+    int8u LQIOut = 6;
+    int8u age = 7;
+    boolean allocated = 8;
+    boolean linkEstablished = 9;
   }
 
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
-}
-
-server cluster KeypadInput = 1289 {
-  enum CecKeyCode : ENUM8 {
-    kSelect = 0;
-    kUp = 1;
-    kDown = 2;
-    kLeft = 3;
-    kRight = 4;
-    kRightUp = 5;
-    kRightDown = 6;
-    kLeftUp = 7;
-    kLeftDown = 8;
-    kRootMenu = 9;
-    kSetupMenu = 10;
-    kContentsMenu = 11;
-    kFavoriteMenu = 12;
-    kExit = 13;
-    kMediaTopMenu = 16;
-    kMediaContextSensitiveMenu = 17;
-    kNumberEntryMode = 29;
-    kNumber11 = 30;
-    kNumber12 = 31;
-    kNumber0OrNumber10 = 32;
-    kNumbers1 = 33;
-    kNumbers2 = 34;
-    kNumbers3 = 35;
-    kNumbers4 = 36;
-    kNumbers5 = 37;
-    kNumbers6 = 38;
-    kNumbers7 = 39;
-    kNumbers8 = 40;
-    kNumbers9 = 41;
-    kDot = 42;
-    kEnter = 43;
-    kClear = 44;
-    kNextFavorite = 47;
-    kChannelUp = 48;
-    kChannelDown = 49;
-    kPreviousChannel = 50;
-    kSoundSelect = 51;
-    kInputSelect = 52;
-    kDisplayInformation = 53;
-    kHelp = 54;
-    kPageUp = 55;
-    kPageDown = 56;
-    kPower = 64;
-    kVolumeUp = 65;
-    kVolumeDown = 66;
-    kMute = 67;
-    kPlay = 68;
-    kStop = 69;
-    kPause = 70;
-    kRecord = 71;
-    kRewind = 72;
-    kFastForward = 73;
-    kEject = 74;
-    kForward = 75;
-    kBackward = 76;
-    kStopRecord = 77;
-    kPauseRecord = 78;
-    kReserved = 79;
-    kAngle = 80;
-    kSubPicture = 81;
-    kVideoOnDemand = 82;
-    kElectronicProgramGuide = 83;
-    kTimerProgramming = 84;
-    kInitialConfiguration = 85;
-    kSelectBroadcastType = 86;
-    kSelectSoundPresentation = 87;
-    kPlayFunction = 96;
-    kPausePlayFunction = 97;
-    kRecordFunction = 98;
-    kPauseRecordFunction = 99;
-    kStopFunction = 100;
-    kMuteFunction = 101;
-    kRestoreVolumeFunction = 102;
-    kTuneFunction = 103;
-    kSelectMediaFunction = 104;
-    kSelectAvInputFunction = 105;
-    kSelectAudioInputFunction = 106;
-    kPowerToggleFunction = 107;
-    kPowerOffFunction = 108;
-    kPowerOnFunction = 109;
-    kF1Blue = 113;
-    kF2Red = 114;
-    kF3Green = 115;
-    kF4Yellow = 116;
-    kF5 = 117;
-    kData = 118;
+  struct SecurityPolicy {
+    int16u rotationTime = 0;
+    bitmap16 flags = 1;
   }
 
-  enum KeypadInputStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kUnsupportedKey = 1;
-    kInvalidKeyInCurrentState = 2;
+  struct OperationalDatasetComponents {
+    boolean activeTimestampPresent = 0;
+    boolean pendingTimestampPresent = 1;
+    boolean masterKeyPresent = 2;
+    boolean networkNamePresent = 3;
+    boolean extendedPanIdPresent = 4;
+    boolean meshLocalPrefixPresent = 5;
+    boolean delayPresent = 6;
+    boolean panIdPresent = 7;
+    boolean channelPresent = 8;
+    boolean pskcPresent = 9;
+    boolean securityPolicyPresent = 10;
+    boolean channelMaskPresent = 11;
   }
 
-  bitmap KeypadInputFeature : BITMAP32 {
-    kNavigationKeyCodes = 0x1;
-    kLocationKeys = 0x2;
-    kNumberKeys = 0x4;
+  info event ConnectionStatus = 0 {
+    ThreadConnectionStatus connectionStatus = 0;
   }
 
+  readonly attribute nullable int16u channel = 0;
+  readonly attribute nullable RoutingRole routingRole = 1;
+  readonly attribute nullable char_string<16> networkName = 2;
+  readonly attribute nullable int16u panId = 3;
+  readonly attribute nullable int64u extendedPanId = 4;
+  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute NeighborTable neighborTableList[] = 7;
+  readonly attribute RouteTable routeTableList[] = 8;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
+  readonly attribute int16u detachedRoleCount = 14;
+  readonly attribute int16u childRoleCount = 15;
+  readonly attribute int16u routerRoleCount = 16;
+  readonly attribute int16u leaderRoleCount = 17;
+  readonly attribute int16u attachAttemptCount = 18;
+  readonly attribute int16u partitionIdChangeCount = 19;
+  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
+  readonly attribute int16u parentChangeCount = 21;
+  readonly attribute int32u txTotalCount = 22;
+  readonly attribute int32u txUnicastCount = 23;
+  readonly attribute int32u txBroadcastCount = 24;
+  readonly attribute int32u txAckRequestedCount = 25;
+  readonly attribute int32u txAckedCount = 26;
+  readonly attribute int32u txNoAckRequestedCount = 27;
+  readonly attribute int32u txDataCount = 28;
+  readonly attribute int32u txDataPollCount = 29;
+  readonly attribute int32u txBeaconCount = 30;
+  readonly attribute int32u txBeaconRequestCount = 31;
+  readonly attribute int32u txOtherCount = 32;
+  readonly attribute int32u txRetryCount = 33;
+  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
+  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
+  readonly attribute int32u txErrCcaCount = 36;
+  readonly attribute int32u txErrAbortCount = 37;
+  readonly attribute int32u txErrBusyChannelCount = 38;
+  readonly attribute int32u rxTotalCount = 39;
+  readonly attribute int32u rxUnicastCount = 40;
+  readonly attribute int32u rxBroadcastCount = 41;
+  readonly attribute int32u rxDataCount = 42;
+  readonly attribute int32u rxDataPollCount = 43;
+  readonly attribute int32u rxBeaconCount = 44;
+  readonly attribute int32u rxBeaconRequestCount = 45;
+  readonly attribute int32u rxOtherCount = 46;
+  readonly attribute int32u rxAddressFilteredCount = 47;
+  readonly attribute int32u rxDestAddrFilteredCount = 48;
+  readonly attribute int32u rxDuplicatedCount = 49;
+  readonly attribute int32u rxErrNoFrameCount = 50;
+  readonly attribute int32u rxErrUnknownNeighborCount = 51;
+  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
+  readonly attribute int32u rxErrSecCount = 53;
+  readonly attribute int32u rxErrFcsCount = 54;
+  readonly attribute int32u rxErrOtherCount = 55;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
+  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-
-  request struct SendKeyRequest {
-    CecKeyCode keyCode = 0;
-  }
-
-  command SendKey(SendKeyRequest): SendKeyResponse = 0;
 }
 
-server cluster LevelControl = 8 {
-  enum MoveMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
-  }
-
-  enum StepMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
-  }
-
-  bitmap LevelControlFeature : BITMAP32 {
-    kOnOff = 0x1;
-    kLighting = 0x2;
-    kFrequency = 0x4;
-  }
-
-  readonly attribute int8u currentLevel = 0;
-  readonly attribute int16u remainingTime = 1;
-  readonly attribute int8u minLevel = 2;
-  readonly attribute int8u maxLevel = 3;
-  readonly attribute int16u currentFrequency = 4;
-  readonly attribute int16u minFrequency = 5;
-  readonly attribute int16u maxFrequency = 6;
-  attribute bitmap8 options = 15;
-  attribute int16u onOffTransitionTime = 16;
-  attribute nullable int8u onLevel = 17;
-  attribute nullable int16u onTransitionTime = 18;
-  attribute nullable int16u offTransitionTime = 19;
-  attribute nullable int8u defaultMoveRate = 20;
-  attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct MoveToLevelRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
-  }
-
-  request struct MoveRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
+server cluster WiFiNetworkDiagnostics = 54 {
+  enum AssociationFailureCause : ENUM8 {
+    kUnknown = 0;
+    kAssociationFailed = 1;
+    kAuthenticationFailed = 2;
+    kSsidNotFound = 3;
   }
 
-  request struct StepRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionMask = 3;
-    BITMAP8 optionOverride = 4;
+  enum SecurityType : ENUM8 {
+    kUnspecified = 0;
+    kNone = 1;
+    kWep = 2;
+    kWpa = 3;
+    kWpa2 = 4;
+    kWpa3 = 5;
   }
 
-  request struct StopRequest {
-    BITMAP8 optionMask = 0;
-    BITMAP8 optionOverride = 1;
+  enum WiFiConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  request struct MoveToLevelWithOnOffRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
+  enum WiFiVersionType : ENUM8 {
+    k80211a = 0;
+    k80211b = 1;
+    k80211g = 2;
+    k80211n = 3;
+    k80211ac = 4;
+    k80211ax = 5;
   }
 
-  request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
+  info event Disconnection = 0 {
+    INT16U reasonCode = 0;
   }
 
-  request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
+  info event AssociationFailure = 1 {
+    AssociationFailureCause associationFailure = 0;
+    INT16U status = 1;
   }
 
-  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
-  command Move(MoveRequest): DefaultSuccess = 1;
-  command Step(StepRequest): DefaultSuccess = 2;
-  command Stop(StopRequest): DefaultSuccess = 3;
-  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
-  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
-  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
-  command StopWithOnOff(): DefaultSuccess = 7;
-}
+  info event ConnectionStatus = 2 {
+    WiFiConnectionStatus connectionStatus = 0;
+  }
 
-server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
+  readonly attribute nullable octet_string<6> bssid = 0;
+  readonly attribute nullable SecurityType securityType = 1;
+  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
+  readonly attribute nullable int16u channelNumber = 3;
+  readonly attribute nullable int8s rssi = 4;
+  readonly attribute int32u beaconLostCount = 5;
+  readonly attribute int32u beaconRxCount = 6;
+  readonly attribute int32u packetMulticastRxCount = 7;
+  readonly attribute int32u packetMulticastTxCount = 8;
+  readonly attribute int32u packetUnicastRxCount = 9;
+  readonly attribute int32u packetUnicastTxCount = 10;
+  readonly attribute int64u currentMaxRate = 11;
+  readonly attribute int64u overrunCount = 12;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster LowPower = 1288 {
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
+  }
+
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command Sleep(): DefaultSuccess = 0;
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
-server cluster MediaInput = 1287 {
-  enum InputTypeEnum : ENUM8 {
-    kInternal = 0;
-    kAux = 1;
-    kCoax = 2;
-    kComposite = 3;
-    kHdmi = 4;
-    kInput = 5;
-    kLine = 6;
-    kOptical = 7;
-    kVideo = 8;
-    kScart = 9;
-    kUsb = 10;
-    kOther = 11;
-  }
-
-  bitmap MediaInputFeature : BITMAP32 {
-    kNameUpdates = 0x1;
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
   }
 
-  struct InputInfo {
-    int8u index = 0;
-    InputTypeEnum inputType = 1;
-    char_string<32> name = 2;
-    char_string<32> description = 3;
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
   }
 
-  readonly attribute InputInfo inputList[] = 0;
-  readonly attribute int8u currentInput = 1;
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct SelectInputRequest {
-    INT8U index = 0;
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
   }
 
-  request struct RenameInputRequest {
-    INT8U index = 0;
-    CHAR_STRING name = 1;
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
   }
 
-  command SelectInput(SelectInputRequest): DefaultSuccess = 0;
-  command ShowInputStatus(): DefaultSuccess = 1;
-  command HideInputStatus(): DefaultSuccess = 2;
-  command RenameInput(RenameInputRequest): DefaultSuccess = 3;
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
-server cluster MediaPlayback = 1286 {
-  enum MediaPlaybackStatusEnum : ENUM8 {
+client cluster OperationalCredentials = 62 {
+  enum OperationalCertStatus : ENUM8 {
     kSuccess = 0;
-    kInvalidStateForCommand = 1;
-    kNotAllowed = 2;
-    kNotActive = 3;
-    kSpeedOutOfRange = 4;
-    kSeekOutOfRange = 5;
-  }
-
-  enum PlaybackStateEnum : ENUM8 {
-    kPlaying = 0;
-    kPaused = 1;
-    kNotPlaying = 2;
-    kBuffering = 3;
-  }
-
-  struct PlaybackPosition {
-    int64u updatedAt = 0;
-    nullable int64u position = 1;
-  }
-
-  readonly attribute PlaybackStateEnum currentState = 0;
-  readonly attribute nullable epoch_us startTime = 1;
-  readonly attribute nullable int64u duration = 2;
-  readonly attribute nullable PlaybackPosition sampledPosition = 3;
-  readonly attribute single playbackSpeed = 4;
-  readonly attribute nullable int64u seekRangeEnd = 5;
-  readonly attribute nullable int64u seekRangeStart = 6;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct SkipForwardRequest {
-    INT64U deltaPositionMilliseconds = 0;
-  }
-
-  request struct SkipBackwardRequest {
-    INT64U deltaPositionMilliseconds = 0;
+    kInvalidPublicKey = 1;
+    kInvalidNodeOpId = 2;
+    kInvalidNOC = 3;
+    kMissingCsr = 4;
+    kTableFull = 5;
+    kInvalidAdminSubject = 6;
+    kInsufficientPrivilege = 8;
+    kFabricConflict = 9;
+    kLabelConflict = 10;
+    kInvalidFabricIndex = 11;
   }
 
-  request struct SeekRequest {
-    INT64U position = 0;
+  struct NOCStruct {
+    octet_string noc = 1;
+    nullable octet_string icac = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  response struct PlaybackResponse = 10 {
-    MediaPlaybackStatusEnum status = 0;
-    optional CHAR_STRING data = 1;
+  struct FabricDescriptor {
+    octet_string<65> rootPublicKey = 1;
+    vendor_id vendorId = 2;
+    fabric_id fabricId = 3;
+    node_id nodeId = 4;
+    char_string<32> label = 5;
+    fabric_idx fabricIndex = 254;
   }
 
-  command Play(): PlaybackResponse = 0;
-  command Pause(): PlaybackResponse = 1;
-  command StopPlayback(): PlaybackResponse = 2;
-  command StartOver(): PlaybackResponse = 3;
-  command Previous(): PlaybackResponse = 4;
-  command Next(): PlaybackResponse = 5;
-  command Rewind(): PlaybackResponse = 6;
-  command FastForward(): PlaybackResponse = 7;
-  command SkipForward(SkipForwardRequest): PlaybackResponse = 8;
-  command SkipBackward(SkipBackwardRequest): PlaybackResponse = 9;
-  command Seek(SeekRequest): PlaybackResponse = 11;
-}
-
-client cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatus : ENUM8 {
-    kSuccess = 0;
-    kOutOfRange = 1;
-    kBoundsExceeded = 2;
-    kNetworkIDNotFound = 3;
-    kDuplicateNetworkID = 4;
-    kNetworkNotFound = 5;
-    kRegulatoryError = 6;
-    kAuthFailure = 7;
-    kUnsupportedSecurity = 8;
-    kOtherConnectionFailure = 9;
-    kIPV6Failed = 10;
-    kIPBindFailed = 11;
-    kUnknownError = 12;
+  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
+  readonly attribute FabricDescriptor fabrics[] = 1;
+  readonly attribute int8u supportedFabrics = 2;
+  readonly attribute int8u commissionedFabrics = 3;
+  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
+  readonly attribute fabric_idx currentFabricIndex = 5;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AttestationRequestRequest {
+    OCTET_STRING attestationNonce = 0;
   }
 
-  enum WiFiBand : ENUM8 {
-    k2g4 = 0;
-    k3g65 = 1;
-    k5g = 2;
-    k6g = 3;
-    k60g = 4;
+  request struct CertificateChainRequestRequest {
+    INT8U certificateType = 0;
   }
 
-  bitmap NetworkCommissioningFeature : BITMAP32 {
-    kWiFiNetworkInterface = 0x1;
-    kThreadNetworkInterface = 0x2;
-    kEthernetNetworkInterface = 0x4;
+  request struct CSRRequestRequest {
+    OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
-  bitmap WiFiSecurity : BITMAP8 {
-    kUnencrypted = 0x1;
-    kWepPersonal = 0x2;
-    kWpaPersonal = 0x4;
-    kWpa2Personal = 0x8;
-    kWpa3Personal = 0x10;
+  request struct AddNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+    OCTET_STRING IPKValue = 2;
+    Int64u caseAdminSubject = 3;
+    VENDOR_ID adminVendorId = 4;
   }
 
-  struct NetworkInfo {
-    octet_string<32> networkID = 0;
-    boolean connected = 1;
+  request struct UpdateFabricLabelRequest {
+    CHAR_STRING label = 0;
   }
 
-  struct WiFiInterfaceScanResult {
-    WiFiSecurity security = 0;
-    octet_string<32> ssid = 1;
-    octet_string<6> bssid = 2;
-    int16u channel = 3;
-    WiFiBand wiFiBand = 4;
-    int8s rssi = 5;
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
   }
 
-  struct ThreadInterfaceScanResult {
-    int16u panId = 0;
-    int64u extendedPanId = 1;
-    char_string<16> networkName = 2;
-    int16u channel = 3;
-    int8u version = 4;
-    octet_string<8> extendedAddress = 5;
-    int8s rssi = 6;
-    int8u lqi = 7;
+  request struct AddTrustedRootCertificateRequest {
+    OCTET_STRING rootCertificate = 0;
   }
 
-  readonly attribute access(read: administer) int8u maxNetworks = 0;
-  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
-  readonly attribute int8u scanMaxTimeSeconds = 2;
-  readonly attribute int8u connectMaxTimeSeconds = 3;
-  attribute access(write: administer) boolean interfaceEnabled = 4;
-  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
-  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
-  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
+  }
 
-  request struct ScanNetworksRequest {
-    optional nullable OCTET_STRING ssid = 0;
-    optional INT64U breadcrumb = 1;
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
   }
 
-  request struct AddOrUpdateWiFiNetworkRequest {
-    OCTET_STRING ssid = 0;
-    OCTET_STRING credentials = 1;
-    optional INT64U breadcrumb = 2;
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
   }
 
-  request struct AddOrUpdateThreadNetworkRequest {
-    OCTET_STRING operationalDataset = 0;
-    optional INT64U breadcrumb = 1;
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
   }
 
-  request struct RemoveNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
+}
+
+server cluster OperationalCredentials = 62 {
+  enum OperationalCertStatus : ENUM8 {
+    kSuccess = 0;
+    kInvalidPublicKey = 1;
+    kInvalidNodeOpId = 2;
+    kInvalidNOC = 3;
+    kMissingCsr = 4;
+    kTableFull = 5;
+    kInvalidAdminSubject = 6;
+    kInsufficientPrivilege = 8;
+    kFabricConflict = 9;
+    kLabelConflict = 10;
+    kInvalidFabricIndex = 11;
   }
 
-  request struct ConnectNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
+  struct NOCStruct {
+    octet_string noc = 1;
+    nullable octet_string icac = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  request struct ReorderNetworkRequest {
-    OCTET_STRING networkID = 0;
-    INT8U networkIndex = 1;
-    optional INT64U breadcrumb = 2;
+  struct FabricDescriptor {
+    octet_string<65> rootPublicKey = 1;
+    vendor_id vendorId = 2;
+    fabric_id fabricId = 3;
+    node_id nodeId = 4;
+    char_string<32> label = 5;
+    fabric_idx fabricIndex = 254;
   }
 
-  response struct ScanNetworksResponse = 1 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
-    optional ThreadInterfaceScanResult threadScanResults[] = 3;
+  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
+  readonly attribute FabricDescriptor fabrics[] = 1;
+  readonly attribute int8u supportedFabrics = 2;
+  readonly attribute int8u commissionedFabrics = 3;
+  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
+  readonly attribute fabric_idx currentFabricIndex = 5;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AttestationRequestRequest {
+    OCTET_STRING attestationNonce = 0;
   }
 
-  response struct NetworkConfigResponse = 5 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional INT8U networkIndex = 2;
+  request struct CertificateChainRequestRequest {
+    INT8U certificateType = 0;
   }
 
-  response struct ConnectNetworkResponse = 7 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    nullable INT32S errorValue = 2;
+  request struct CSRRequestRequest {
+    OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
-  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
-  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
-  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
-  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
-  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
-  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
-}
+  request struct AddNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+    OCTET_STRING IPKValue = 2;
+    Int64u caseAdminSubject = 3;
+    VENDOR_ID adminVendorId = 4;
+  }
 
-server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatus : ENUM8 {
-    kSuccess = 0;
-    kOutOfRange = 1;
-    kBoundsExceeded = 2;
-    kNetworkIDNotFound = 3;
-    kDuplicateNetworkID = 4;
-    kNetworkNotFound = 5;
-    kRegulatoryError = 6;
-    kAuthFailure = 7;
-    kUnsupportedSecurity = 8;
-    kOtherConnectionFailure = 9;
-    kIPV6Failed = 10;
-    kIPBindFailed = 11;
-    kUnknownError = 12;
+  request struct UpdateNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
   }
 
-  enum WiFiBand : ENUM8 {
-    k2g4 = 0;
-    k3g65 = 1;
-    k5g = 2;
-    k6g = 3;
-    k60g = 4;
+  request struct UpdateFabricLabelRequest {
+    CHAR_STRING label = 0;
   }
 
-  bitmap NetworkCommissioningFeature : BITMAP32 {
-    kWiFiNetworkInterface = 0x1;
-    kThreadNetworkInterface = 0x2;
-    kEthernetNetworkInterface = 0x4;
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
   }
 
-  bitmap WiFiSecurity : BITMAP8 {
-    kUnencrypted = 0x1;
-    kWepPersonal = 0x2;
-    kWpaPersonal = 0x4;
-    kWpa2Personal = 0x8;
-    kWpa3Personal = 0x10;
+  request struct AddTrustedRootCertificateRequest {
+    OCTET_STRING rootCertificate = 0;
   }
 
-  struct NetworkInfo {
-    octet_string<32> networkID = 0;
-    boolean connected = 1;
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
   }
 
-  struct WiFiInterfaceScanResult {
-    WiFiSecurity security = 0;
-    octet_string<32> ssid = 1;
-    octet_string<6> bssid = 2;
-    int16u channel = 3;
-    WiFiBand wiFiBand = 4;
-    int8s rssi = 5;
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
   }
 
-  struct ThreadInterfaceScanResult {
-    int16u panId = 0;
-    int64u extendedPanId = 1;
-    char_string<16> networkName = 2;
-    int16u channel = 3;
-    int8u version = 4;
-    octet_string<8> extendedAddress = 5;
-    int8s rssi = 6;
-    int8u lqi = 7;
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
+  }
+
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
   }
 
-  readonly attribute access(read: administer) int8u maxNetworks = 0;
-  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
-  readonly attribute int8u scanMaxTimeSeconds = 2;
-  readonly attribute int8u connectMaxTimeSeconds = 3;
-  attribute access(write: administer) boolean interfaceEnabled = 4;
-  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
-  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
-  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
+}
+
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
+  }
 
-  request struct ScanNetworksRequest {
-    optional nullable OCTET_STRING ssid = 0;
-    optional INT64U breadcrumb = 1;
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  request struct AddOrUpdateWiFiNetworkRequest {
-    OCTET_STRING ssid = 0;
-    OCTET_STRING credentials = 1;
-    optional INT64U breadcrumb = 2;
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
   }
 
-  request struct AddOrUpdateThreadNetworkRequest {
-    OCTET_STRING operationalDataset = 0;
-    optional INT64U breadcrumb = 1;
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
   }
 
-  request struct RemoveNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  request struct ConnectNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  request struct ReorderNetworkRequest {
-    OCTET_STRING networkID = 0;
-    INT8U networkIndex = 1;
-    optional INT64U breadcrumb = 2;
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  response struct ScanNetworksResponse = 1 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
-    optional ThreadInterfaceScanResult threadScanResults[] = 3;
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  response struct NetworkConfigResponse = 5 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional INT8U networkIndex = 2;
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  response struct ConnectNetworkResponse = 7 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    nullable INT32S errorValue = 2;
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
-  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
-  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
-  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
-  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
-  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
 }
 
-server cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
-  }
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
-  }
+server cluster UserLabel = 65 {
+  attribute access(write: manage) LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
-  }
+server cluster RelativeHumidityMeasurement = 1029 {
+  readonly attribute nullable int16u measuredValue = 0;
+  readonly attribute nullable int16u minMeasuredValue = 1;
+  readonly attribute nullable int16u maxMeasuredValue = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
+server cluster WakeOnLan = 1283 {
+  readonly attribute char_string<32> MACAddress = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
+server cluster Channel = 1284 {
+  enum ChannelStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kMultipleMatches = 1;
+    kNoMatches = 2;
   }
 
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
+  enum LineupInfoTypeEnum : ENUM8 {
+    kMso = 0;
   }
 
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
+  bitmap ChannelFeature : BITMAP32 {
+    kChannelList = 0x1;
+    kLineupInfo = 0x2;
   }
 
-  response struct QueryImageResponse = 1 {
-    OTAQueryStatus status = 0;
-    optional INT32U delayedActionTime = 1;
-    optional CHAR_STRING imageURI = 2;
-    optional INT32U softwareVersion = 3;
-    optional CHAR_STRING softwareVersionString = 4;
-    optional OCTET_STRING updateToken = 5;
-    optional BOOLEAN userConsentNeeded = 6;
-    optional OCTET_STRING metadataForRequestor = 7;
+  struct ChannelInfo {
+    int16u majorNumber = 0;
+    int16u minorNumber = 1;
+    optional char_string<32> name = 2;
+    optional char_string<32> callSign = 3;
+    optional char_string<32> affiliateCallSign = 4;
   }
 
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
+  struct LineupInfo {
+    char_string operatorName = 0;
+    optional char_string lineupName = 1;
+    optional char_string postalCode = 2;
+    LineupInfoTypeEnum lineupInfoType = 3;
   }
 
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
-}
+  readonly attribute ChannelInfo channelList[] = 0;
+  readonly attribute nullable LineupInfo lineup = 1;
+  readonly attribute nullable ChannelInfo currentChannel = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-server cluster OnOff = 6 {
-  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
-    kFadeToOffIn0p8Seconds = 0;
-    kNoFade = 1;
-    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
+  request struct ChangeChannelRequest {
+    CHAR_STRING match = 0;
   }
 
-  enum OnOffDyingLightEffectVariant : ENUM8 {
-    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
+  request struct ChangeChannelByNumberRequest {
+    INT16U majorNumber = 0;
+    INT16U minorNumber = 1;
   }
 
-  enum OnOffEffectIdentifier : ENUM8 {
-    kDelayedAllOff = 0;
-    kDyingLight = 1;
+  request struct SkipChannelRequest {
+    INT16U count = 0;
   }
 
-  enum OnOffStartUpOnOff : ENUM8 {
-    kOff = 0;
-    kOn = 1;
-    kTogglePreviousOnOff = 2;
+  response struct ChangeChannelResponse = 1 {
+    ChannelStatusEnum status = 0;
+    optional CHAR_STRING data = 1;
   }
 
-  bitmap OnOffControl : BITMAP8 {
-    kAcceptOnlyWhenOn = 0x1;
-  }
+  command ChangeChannel(ChangeChannelRequest): ChangeChannelResponse = 0;
+  command ChangeChannelByNumber(ChangeChannelByNumberRequest): DefaultSuccess = 2;
+  command SkipChannel(SkipChannelRequest): DefaultSuccess = 3;
+}
 
-  bitmap OnOffFeature : BITMAP32 {
-    kLighting = 0x1;
+server cluster TargetNavigator = 1285 {
+  enum TargetNavigatorStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kTargetNotFound = 1;
+    kNotAllowed = 2;
   }
 
-  bitmap SceneFeatures : BITMAP32 {
-    kSceneNames = 0x1;
+  struct TargetInfo {
+    int8u identifier = 0;
+    char_string<32> name = 1;
   }
 
-  readonly attribute boolean onOff = 0;
+  readonly attribute TargetInfo targetList[] = 0;
+  readonly attribute int8u currentTarget = 1;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command Off(): DefaultSuccess = 0;
-  command On(): DefaultSuccess = 1;
-  command Toggle(): DefaultSuccess = 2;
-}
+  request struct NavigateTargetRequest {
+    INT8U target = 0;
+    optional CHAR_STRING data = 1;
+  }
 
-client cluster OperationalCredentials = 62 {
-  enum OperationalCertStatus : ENUM8 {
+  response struct NavigateTargetResponse = 1 {
+    TargetNavigatorStatusEnum status = 0;
+    optional CHAR_STRING data = 1;
+  }
+
+  command NavigateTarget(NavigateTargetRequest): NavigateTargetResponse = 0;
+}
+
+server cluster MediaPlayback = 1286 {
+  enum MediaPlaybackStatusEnum : ENUM8 {
     kSuccess = 0;
-    kInvalidPublicKey = 1;
-    kInvalidNodeOpId = 2;
-    kInvalidNOC = 3;
-    kMissingCsr = 4;
-    kTableFull = 5;
-    kInvalidAdminSubject = 6;
-    kInsufficientPrivilege = 8;
-    kFabricConflict = 9;
-    kLabelConflict = 10;
-    kInvalidFabricIndex = 11;
+    kInvalidStateForCommand = 1;
+    kNotAllowed = 2;
+    kNotActive = 3;
+    kSpeedOutOfRange = 4;
+    kSeekOutOfRange = 5;
   }
 
-  struct NOCStruct {
-    octet_string noc = 1;
-    nullable octet_string icac = 2;
-    fabric_idx fabricIndex = 254;
+  enum PlaybackStateEnum : ENUM8 {
+    kPlaying = 0;
+    kPaused = 1;
+    kNotPlaying = 2;
+    kBuffering = 3;
   }
 
-  struct FabricDescriptor {
-    octet_string<65> rootPublicKey = 1;
-    vendor_id vendorId = 2;
-    fabric_id fabricId = 3;
-    node_id nodeId = 4;
-    char_string<32> label = 5;
-    fabric_idx fabricIndex = 254;
+  struct PlaybackPosition {
+    int64u updatedAt = 0;
+    nullable int64u position = 1;
   }
 
-  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
-  readonly attribute FabricDescriptor fabrics[] = 1;
-  readonly attribute int8u supportedFabrics = 2;
-  readonly attribute int8u commissionedFabrics = 3;
-  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
-  readonly attribute fabric_idx currentFabricIndex = 5;
+  readonly attribute PlaybackStateEnum currentState = 0;
+  readonly attribute nullable epoch_us startTime = 1;
+  readonly attribute nullable int64u duration = 2;
+  readonly attribute nullable PlaybackPosition sampledPosition = 3;
+  readonly attribute single playbackSpeed = 4;
+  readonly attribute nullable int64u seekRangeEnd = 5;
+  readonly attribute nullable int64u seekRangeStart = 6;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AttestationRequestRequest {
-    OCTET_STRING attestationNonce = 0;
+  request struct SkipForwardRequest {
+    INT64U deltaPositionMilliseconds = 0;
   }
 
-  request struct CertificateChainRequestRequest {
-    INT8U certificateType = 0;
+  request struct SkipBackwardRequest {
+    INT64U deltaPositionMilliseconds = 0;
   }
 
-  request struct CSRRequestRequest {
-    OCTET_STRING CSRNonce = 0;
-    optional boolean isForUpdateNOC = 1;
+  request struct SeekRequest {
+    INT64U position = 0;
   }
 
-  request struct AddNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
-    OCTET_STRING IPKValue = 2;
-    Int64u caseAdminSubject = 3;
-    VENDOR_ID adminVendorId = 4;
+  response struct PlaybackResponse = 10 {
+    MediaPlaybackStatusEnum status = 0;
+    optional CHAR_STRING data = 1;
   }
 
-  request struct UpdateFabricLabelRequest {
-    CHAR_STRING label = 0;
-  }
+  command Play(): PlaybackResponse = 0;
+  command Pause(): PlaybackResponse = 1;
+  command StopPlayback(): PlaybackResponse = 2;
+  command StartOver(): PlaybackResponse = 3;
+  command Previous(): PlaybackResponse = 4;
+  command Next(): PlaybackResponse = 5;
+  command Rewind(): PlaybackResponse = 6;
+  command FastForward(): PlaybackResponse = 7;
+  command SkipForward(SkipForwardRequest): PlaybackResponse = 8;
+  command SkipBackward(SkipBackwardRequest): PlaybackResponse = 9;
+  command Seek(SeekRequest): PlaybackResponse = 11;
+}
 
-  request struct RemoveFabricRequest {
-    fabric_idx fabricIndex = 0;
+server cluster MediaInput = 1287 {
+  enum InputTypeEnum : ENUM8 {
+    kInternal = 0;
+    kAux = 1;
+    kCoax = 2;
+    kComposite = 3;
+    kHdmi = 4;
+    kInput = 5;
+    kLine = 6;
+    kOptical = 7;
+    kVideo = 8;
+    kScart = 9;
+    kUsb = 10;
+    kOther = 11;
   }
 
-  request struct AddTrustedRootCertificateRequest {
-    OCTET_STRING rootCertificate = 0;
+  bitmap MediaInputFeature : BITMAP32 {
+    kNameUpdates = 0x1;
   }
 
-  response struct AttestationResponse = 1 {
-    OCTET_STRING attestationElements = 0;
-    OCTET_STRING signature = 1;
+  struct InputInfo {
+    int8u index = 0;
+    InputTypeEnum inputType = 1;
+    char_string<32> name = 2;
+    char_string<32> description = 3;
   }
 
-  response struct CertificateChainResponse = 3 {
-    OCTET_STRING certificate = 0;
-  }
+  readonly attribute InputInfo inputList[] = 0;
+  readonly attribute int8u currentInput = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  response struct CSRResponse = 5 {
-    OCTET_STRING NOCSRElements = 0;
-    OCTET_STRING attestationSignature = 1;
+  request struct SelectInputRequest {
+    INT8U index = 0;
   }
 
-  response struct NOCResponse = 8 {
-    OperationalCertStatus statusCode = 0;
-    optional fabric_idx fabricIndex = 1;
-    optional CHAR_STRING debugText = 2;
+  request struct RenameInputRequest {
+    INT8U index = 0;
+    CHAR_STRING name = 1;
   }
 
-  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
-  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
-  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
-  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
-  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
-  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
-  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
+  command SelectInput(SelectInputRequest): DefaultSuccess = 0;
+  command ShowInputStatus(): DefaultSuccess = 1;
+  command HideInputStatus(): DefaultSuccess = 2;
+  command RenameInput(RenameInputRequest): DefaultSuccess = 3;
 }
 
-server cluster OperationalCredentials = 62 {
-  enum OperationalCertStatus : ENUM8 {
-    kSuccess = 0;
-    kInvalidPublicKey = 1;
-    kInvalidNodeOpId = 2;
-    kInvalidNOC = 3;
-    kMissingCsr = 4;
-    kTableFull = 5;
-    kInvalidAdminSubject = 6;
-    kInsufficientPrivilege = 8;
-    kFabricConflict = 9;
-    kLabelConflict = 10;
-    kInvalidFabricIndex = 11;
+server cluster LowPower = 1288 {
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command Sleep(): DefaultSuccess = 0;
+}
+
+server cluster KeypadInput = 1289 {
+  enum CecKeyCode : ENUM8 {
+    kSelect = 0;
+    kUp = 1;
+    kDown = 2;
+    kLeft = 3;
+    kRight = 4;
+    kRightUp = 5;
+    kRightDown = 6;
+    kLeftUp = 7;
+    kLeftDown = 8;
+    kRootMenu = 9;
+    kSetupMenu = 10;
+    kContentsMenu = 11;
+    kFavoriteMenu = 12;
+    kExit = 13;
+    kMediaTopMenu = 16;
+    kMediaContextSensitiveMenu = 17;
+    kNumberEntryMode = 29;
+    kNumber11 = 30;
+    kNumber12 = 31;
+    kNumber0OrNumber10 = 32;
+    kNumbers1 = 33;
+    kNumbers2 = 34;
+    kNumbers3 = 35;
+    kNumbers4 = 36;
+    kNumbers5 = 37;
+    kNumbers6 = 38;
+    kNumbers7 = 39;
+    kNumbers8 = 40;
+    kNumbers9 = 41;
+    kDot = 42;
+    kEnter = 43;
+    kClear = 44;
+    kNextFavorite = 47;
+    kChannelUp = 48;
+    kChannelDown = 49;
+    kPreviousChannel = 50;
+    kSoundSelect = 51;
+    kInputSelect = 52;
+    kDisplayInformation = 53;
+    kHelp = 54;
+    kPageUp = 55;
+    kPageDown = 56;
+    kPower = 64;
+    kVolumeUp = 65;
+    kVolumeDown = 66;
+    kMute = 67;
+    kPlay = 68;
+    kStop = 69;
+    kPause = 70;
+    kRecord = 71;
+    kRewind = 72;
+    kFastForward = 73;
+    kEject = 74;
+    kForward = 75;
+    kBackward = 76;
+    kStopRecord = 77;
+    kPauseRecord = 78;
+    kReserved = 79;
+    kAngle = 80;
+    kSubPicture = 81;
+    kVideoOnDemand = 82;
+    kElectronicProgramGuide = 83;
+    kTimerProgramming = 84;
+    kInitialConfiguration = 85;
+    kSelectBroadcastType = 86;
+    kSelectSoundPresentation = 87;
+    kPlayFunction = 96;
+    kPausePlayFunction = 97;
+    kRecordFunction = 98;
+    kPauseRecordFunction = 99;
+    kStopFunction = 100;
+    kMuteFunction = 101;
+    kRestoreVolumeFunction = 102;
+    kTuneFunction = 103;
+    kSelectMediaFunction = 104;
+    kSelectAvInputFunction = 105;
+    kSelectAudioInputFunction = 106;
+    kPowerToggleFunction = 107;
+    kPowerOffFunction = 108;
+    kPowerOnFunction = 109;
+    kF1Blue = 113;
+    kF2Red = 114;
+    kF3Green = 115;
+    kF4Yellow = 116;
+    kF5 = 117;
+    kData = 118;
   }
 
-  struct NOCStruct {
-    octet_string noc = 1;
-    nullable octet_string icac = 2;
-    fabric_idx fabricIndex = 254;
+  enum KeypadInputStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kUnsupportedKey = 1;
+    kInvalidKeyInCurrentState = 2;
   }
 
-  struct FabricDescriptor {
-    octet_string<65> rootPublicKey = 1;
-    vendor_id vendorId = 2;
-    fabric_id fabricId = 3;
-    node_id nodeId = 4;
-    char_string<32> label = 5;
-    fabric_idx fabricIndex = 254;
+  bitmap KeypadInputFeature : BITMAP32 {
+    kNavigationKeyCodes = 0x1;
+    kLocationKeys = 0x2;
+    kNumberKeys = 0x4;
   }
 
-  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
-  readonly attribute FabricDescriptor fabrics[] = 1;
-  readonly attribute int8u supportedFabrics = 2;
-  readonly attribute int8u commissionedFabrics = 3;
-  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
-  readonly attribute fabric_idx currentFabricIndex = 5;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AttestationRequestRequest {
-    OCTET_STRING attestationNonce = 0;
-  }
-
-  request struct CertificateChainRequestRequest {
-    INT8U certificateType = 0;
-  }
-
-  request struct CSRRequestRequest {
-    OCTET_STRING CSRNonce = 0;
-    optional boolean isForUpdateNOC = 1;
+  request struct SendKeyRequest {
+    CecKeyCode keyCode = 0;
   }
 
-  request struct AddNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
-    OCTET_STRING IPKValue = 2;
-    Int64u caseAdminSubject = 3;
-    VENDOR_ID adminVendorId = 4;
-  }
+  command SendKey(SendKeyRequest): SendKeyResponse = 0;
+}
 
-  request struct UpdateNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
+server cluster ContentLauncher = 1290 {
+  enum ContentLaunchStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kUrlNotAvailable = 1;
+    kAuthFailed = 2;
   }
 
-  request struct UpdateFabricLabelRequest {
-    CHAR_STRING label = 0;
+  enum MetricTypeEnum : ENUM8 {
+    kPixels = 0;
+    kPercentage = 1;
   }
 
-  request struct RemoveFabricRequest {
-    fabric_idx fabricIndex = 0;
+  enum ParameterEnum : ENUM8 {
+    kActor = 0;
+    kChannel = 1;
+    kCharacter = 2;
+    kDirector = 3;
+    kEvent = 4;
+    kFranchise = 5;
+    kGenre = 6;
+    kLeague = 7;
+    kPopularity = 8;
+    kProvider = 9;
+    kSport = 10;
+    kSportsTeam = 11;
+    kType = 12;
   }
 
-  request struct AddTrustedRootCertificateRequest {
-    OCTET_STRING rootCertificate = 0;
+  bitmap ContentLauncherFeature : BITMAP32 {
+    kContentSearch = 0x1;
+    kURLPlayback = 0x2;
   }
 
-  response struct AttestationResponse = 1 {
-    OCTET_STRING attestationElements = 0;
-    OCTET_STRING signature = 1;
+  bitmap SupportedStreamingProtocol : BITMAP32 {
+    kDash = 0x1;
+    kHls = 0x2;
   }
 
-  response struct CertificateChainResponse = 3 {
-    OCTET_STRING certificate = 0;
+  struct ContentSearch {
+    Parameter parameterList[] = 0;
   }
 
-  response struct CSRResponse = 5 {
-    OCTET_STRING NOCSRElements = 0;
-    OCTET_STRING attestationSignature = 1;
+  struct Parameter {
+    ParameterEnum type = 0;
+    char_string value = 1;
+    optional AdditionalInfo externalIDList[] = 2;
   }
 
-  response struct NOCResponse = 8 {
-    OperationalCertStatus statusCode = 0;
-    optional fabric_idx fabricIndex = 1;
-    optional CHAR_STRING debugText = 2;
+  struct AdditionalInfo {
+    char_string name = 0;
+    char_string value = 1;
   }
 
-  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
-  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
-  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
-  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
-  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
-  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
-  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
-  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-}
-
-server cluster RelativeHumidityMeasurement = 1029 {
-  readonly attribute nullable int16u measuredValue = 0;
-  readonly attribute nullable int16u minMeasuredValue = 1;
-  readonly attribute nullable int16u maxMeasuredValue = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster SoftwareDiagnostics = 52 {
-  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
-    kWaterMarks = 0x1;
+  struct BrandingInformation {
+    char_string providerName = 0;
+    optional StyleInformation background = 1;
+    optional StyleInformation logo = 2;
+    optional StyleInformation progressBar = 3;
+    optional StyleInformation splash = 4;
+    optional StyleInformation waterMark = 5;
   }
 
-  struct ThreadMetrics {
-    int64u id = 0;
-    optional char_string<8> name = 1;
-    optional int32u stackFreeCurrent = 2;
-    optional int32u stackFreeMinimum = 3;
-    optional int32u stackSize = 4;
+  struct StyleInformation {
+    optional char_string imageUrl = 0;
+    optional char_string color = 1;
+    optional Dimension size = 2;
   }
 
-  info event SoftwareFault = 0 {
-    SoftwareFaultStruct softwareFault = 0;
+  struct Dimension {
+    double width = 0;
+    double height = 1;
+    MetricTypeEnum metric = 2;
   }
 
-  readonly attribute ThreadMetrics threadMetrics[] = 0;
-  readonly attribute int64u currentHeapFree = 1;
-  readonly attribute int64u currentHeapUsed = 2;
-  readonly attribute int64u currentHeapHighWatermark = 3;
+  readonly attribute CHAR_STRING acceptHeader[] = 0;
+  attribute bitmap32 supportedStreamingProtocols = 1;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster TargetNavigator = 1285 {
-  enum TargetNavigatorStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kTargetNotFound = 1;
-    kNotAllowed = 2;
-  }
 
-  struct TargetInfo {
-    int8u identifier = 0;
-    char_string<32> name = 1;
+  request struct LaunchContentRequest {
+    ContentSearch search = 0;
+    BOOLEAN autoPlay = 1;
+    optional CHAR_STRING data = 2;
   }
 
-  readonly attribute TargetInfo targetList[] = 0;
-  readonly attribute int8u currentTarget = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct NavigateTargetRequest {
-    INT8U target = 0;
-    optional CHAR_STRING data = 1;
+  request struct LaunchURLRequest {
+    CHAR_STRING contentURL = 0;
+    optional CHAR_STRING displayString = 1;
+    optional BrandingInformation brandingInformation = 2;
   }
 
-  response struct NavigateTargetResponse = 1 {
-    TargetNavigatorStatusEnum status = 0;
+  response struct LaunchResponse = 2 {
+    ContentLaunchStatusEnum status = 0;
     optional CHAR_STRING data = 1;
   }
 
-  command NavigateTarget(NavigateTargetRequest): NavigateTargetResponse = 0;
+  command LaunchContent(LaunchContentRequest): LaunchResponse = 0;
+  command LaunchURL(LaunchURLRequest): LaunchResponse = 1;
 }
 
-server cluster ThreadNetworkDiagnostics = 53 {
-  enum NetworkFault : ENUM8 {
-    kUnspecified = 0;
-    kLinkDown = 1;
-    kHardwareFailure = 2;
-    kNetworkJammed = 3;
-  }
-
-  enum RoutingRole : ENUM8 {
-    kUnspecified = 0;
-    kUnassigned = 1;
-    kSleepyEndDevice = 2;
-    kEndDevice = 3;
-    kReed = 4;
-    kRouter = 5;
-    kLeader = 6;
-  }
-
-  enum ThreadConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
-  }
-
-  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
-    kPacketCounts = 0x1;
-    kErrorCounts = 0x2;
-    kMLECounts = 0x4;
-    kMACCounts = 0x8;
-  }
-
-  struct NeighborTable {
-    int64u extAddress = 0;
-    int32u age = 1;
-    int16u rloc16 = 2;
-    int32u linkFrameCounter = 3;
-    int32u mleFrameCounter = 4;
-    int8u lqi = 5;
-    nullable int8s averageRssi = 6;
-    nullable int8s lastRssi = 7;
-    int8u frameErrorRate = 8;
-    int8u messageErrorRate = 9;
-    boolean rxOnWhenIdle = 10;
-    boolean fullThreadDevice = 11;
-    boolean fullNetworkData = 12;
-    boolean isChild = 13;
-  }
-
-  struct RouteTable {
-    int64u extAddress = 0;
-    int16u rloc16 = 1;
-    int8u routerId = 2;
-    int8u nextHop = 3;
-    int8u pathCost = 4;
-    int8u LQIIn = 5;
-    int8u LQIOut = 6;
-    int8u age = 7;
-    boolean allocated = 8;
-    boolean linkEstablished = 9;
-  }
-
-  struct SecurityPolicy {
-    int16u rotationTime = 0;
-    bitmap16 flags = 1;
+server cluster AudioOutput = 1291 {
+  enum OutputTypeEnum : ENUM8 {
+    kHdmi = 0;
+    kBt = 1;
+    kOptical = 2;
+    kHeadphone = 3;
+    kInternal = 4;
+    kOther = 5;
   }
 
-  struct OperationalDatasetComponents {
-    boolean activeTimestampPresent = 0;
-    boolean pendingTimestampPresent = 1;
-    boolean masterKeyPresent = 2;
-    boolean networkNamePresent = 3;
-    boolean extendedPanIdPresent = 4;
-    boolean meshLocalPrefixPresent = 5;
-    boolean delayPresent = 6;
-    boolean panIdPresent = 7;
-    boolean channelPresent = 8;
-    boolean pskcPresent = 9;
-    boolean securityPolicyPresent = 10;
-    boolean channelMaskPresent = 11;
+  bitmap AudioOutputFeature : BITMAP32 {
+    kNameUpdates = 0x1;
   }
 
-  info event ConnectionStatus = 0 {
-    ThreadConnectionStatus connectionStatus = 0;
+  struct OutputInfo {
+    int8u index = 0;
+    OutputTypeEnum outputType = 1;
+    char_string<32> name = 2;
   }
 
-  readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable RoutingRole routingRole = 1;
-  readonly attribute nullable char_string<16> networkName = 2;
-  readonly attribute nullable int16u panId = 3;
-  readonly attribute nullable int64u extendedPanId = 4;
-  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute NeighborTable neighborTableList[] = 7;
-  readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
-  readonly attribute nullable int8u leaderRouterId = 13;
-  readonly attribute int16u detachedRoleCount = 14;
-  readonly attribute int16u childRoleCount = 15;
-  readonly attribute int16u routerRoleCount = 16;
-  readonly attribute int16u leaderRoleCount = 17;
-  readonly attribute int16u attachAttemptCount = 18;
-  readonly attribute int16u partitionIdChangeCount = 19;
-  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
-  readonly attribute int16u parentChangeCount = 21;
-  readonly attribute int32u txTotalCount = 22;
-  readonly attribute int32u txUnicastCount = 23;
-  readonly attribute int32u txBroadcastCount = 24;
-  readonly attribute int32u txAckRequestedCount = 25;
-  readonly attribute int32u txAckedCount = 26;
-  readonly attribute int32u txNoAckRequestedCount = 27;
-  readonly attribute int32u txDataCount = 28;
-  readonly attribute int32u txDataPollCount = 29;
-  readonly attribute int32u txBeaconCount = 30;
-  readonly attribute int32u txBeaconRequestCount = 31;
-  readonly attribute int32u txOtherCount = 32;
-  readonly attribute int32u txRetryCount = 33;
-  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
-  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
-  readonly attribute int32u txErrCcaCount = 36;
-  readonly attribute int32u txErrAbortCount = 37;
-  readonly attribute int32u txErrBusyChannelCount = 38;
-  readonly attribute int32u rxTotalCount = 39;
-  readonly attribute int32u rxUnicastCount = 40;
-  readonly attribute int32u rxBroadcastCount = 41;
-  readonly attribute int32u rxDataCount = 42;
-  readonly attribute int32u rxDataPollCount = 43;
-  readonly attribute int32u rxBeaconCount = 44;
-  readonly attribute int32u rxBeaconRequestCount = 45;
-  readonly attribute int32u rxOtherCount = 46;
-  readonly attribute int32u rxAddressFilteredCount = 47;
-  readonly attribute int32u rxDestAddrFilteredCount = 48;
-  readonly attribute int32u rxDuplicatedCount = 49;
-  readonly attribute int32u rxErrNoFrameCount = 50;
-  readonly attribute int32u rxErrUnknownNeighborCount = 51;
-  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
-  readonly attribute int32u rxErrSecCount = 53;
-  readonly attribute int32u rxErrFcsCount = 54;
-  readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute nullable int64u activeTimestamp = 56;
-  readonly attribute nullable int64u pendingTimestamp = 57;
-  readonly attribute nullable int32u delay = 58;
-  readonly attribute nullable SecurityPolicy securityPolicy = 59;
-  readonly attribute nullable octet_string<4> channelMask = 60;
-  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
-  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+  readonly attribute OutputInfo outputList[] = 0;
+  readonly attribute int8u currentOutput = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
+  request struct SelectOutputRequest {
+    INT8U index = 0;
   }
 
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
+  request struct RenameOutputRequest {
+    INT8U index = 0;
+    CHAR_STRING name = 1;
   }
 
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command SelectOutput(SelectOutputRequest): DefaultSuccess = 0;
+  command RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
 }
 
-server cluster UnitLocalization = 45 {
-  enum TempUnit : ENUM8 {
-    kFahrenheit = 0;
-    kCelsius = 1;
-    kKelvin = 2;
+server cluster ApplicationLauncher = 1292 {
+  enum ApplicationLauncherStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kAppNotAvailable = 1;
+    kSystemBusy = 2;
   }
 
-  bitmap UnitLocalizationFeature : BITMAP32 {
-    kTemperatureUnit = 0x1;
+  bitmap ApplicationLauncherFeature : BITMAP32 {
+    kApplicationPlatform = 0x1;
   }
 
-  attribute TempUnit temperatureUnit = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  struct ApplicationEP {
+    Application application = 0;
+    optional endpoint_no endpoint = 1;
+  }
 
-server cluster UserLabel = 65 {
-  attribute access(write: manage) LabelStruct labelList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  struct Application {
+    int16u catalogVendorId = 0;
+    char_string applicationId = 1;
+  }
 
-server cluster WakeOnLan = 1283 {
-  readonly attribute char_string<32> MACAddress = 0;
+  readonly attribute INT16U catalogList[] = 0;
+  attribute nullable ApplicationEP currentApp = 1;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCause : ENUM8 {
-    kUnknown = 0;
-    kAssociationFailed = 1;
-    kAuthenticationFailed = 2;
-    kSsidNotFound = 3;
+  request struct LaunchAppRequest {
+    Application application = 0;
+    optional OCTET_STRING data = 1;
   }
 
-  enum SecurityType : ENUM8 {
-    kUnspecified = 0;
-    kNone = 1;
-    kWep = 2;
-    kWpa = 3;
-    kWpa2 = 4;
-    kWpa3 = 5;
+  request struct StopAppRequest {
+    Application application = 0;
   }
 
-  enum WiFiConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  request struct HideAppRequest {
+    Application application = 0;
   }
 
-  enum WiFiVersionType : ENUM8 {
-    k80211a = 0;
-    k80211b = 1;
-    k80211g = 2;
-    k80211n = 3;
-    k80211ac = 4;
-    k80211ax = 5;
+  response struct LauncherResponse = 3 {
+    ApplicationLauncherStatusEnum status = 0;
+    OCTET_STRING data = 1;
   }
 
-  info event Disconnection = 0 {
-    INT16U reasonCode = 0;
-  }
+  command LaunchApp(LaunchAppRequest): LauncherResponse = 0;
+  command StopApp(StopAppRequest): LauncherResponse = 1;
+  command HideApp(HideAppRequest): LauncherResponse = 2;
+}
 
-  info event AssociationFailure = 1 {
-    AssociationFailureCause associationFailure = 0;
-    INT16U status = 1;
+server cluster ApplicationBasic = 1293 {
+  enum ApplicationStatusEnum : ENUM8 {
+    kStopped = 0;
+    kActiveVisibleFocus = 1;
+    kActiveHidden = 2;
+    kActiveVisibleNotFocus = 3;
   }
 
-  info event ConnectionStatus = 2 {
-    WiFiConnectionStatus connectionStatus = 0;
+  struct ApplicationBasicApplication {
+    int16u catalogVendorId = 0;
+    char_string applicationId = 1;
   }
 
-  readonly attribute nullable octet_string<6> bssid = 0;
-  readonly attribute nullable SecurityType securityType = 1;
-  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
-  readonly attribute nullable int16u channelNumber = 3;
-  readonly attribute nullable int8s rssi = 4;
-  readonly attribute int32u beaconLostCount = 5;
-  readonly attribute int32u beaconRxCount = 6;
-  readonly attribute int32u packetMulticastRxCount = 7;
-  readonly attribute int32u packetMulticastTxCount = 8;
-  readonly attribute int32u packetUnicastRxCount = 9;
-  readonly attribute int32u packetUnicastTxCount = 10;
-  readonly attribute int64u currentMaxRate = 11;
-  readonly attribute int64u overrunCount = 12;
+  readonly attribute char_string<32> vendorName = 0;
+  readonly attribute int16u vendorID = 1;
+  readonly attribute char_string<32> applicationName = 2;
+  readonly attribute int16u productID = 3;
+  readonly attribute ApplicationBasicApplication application = 4;
+  readonly attribute ApplicationStatusEnum status = 5;
+  readonly attribute char_string<32> applicationVersion = 6;
+  readonly attribute vendor_id allowedVendorList[] = 7;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster AccountLogin = 1294 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct GetSetupPINRequest {
+    CHAR_STRING tempAccountIdentifier = 0;
+  }
+
+  request struct LoginRequest {
+    CHAR_STRING tempAccountIdentifier = 0;
+    CHAR_STRING setupPIN = 1;
+  }
+
+  response struct GetSetupPINResponse = 1 {
+    CHAR_STRING setupPIN = 0;
+  }
+
+  timed command GetSetupPIN(GetSetupPINRequest): GetSetupPINResponse = 0;
+  timed command Login(LoginRequest): DefaultSuccess = 2;
+  timed command Logout(): DefaultSuccess = 3;
 }
 
 endpoint 0 {
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
index 1d9055bac0c2c9..f3bbc7109f38fa 100644
--- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
+++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
@@ -6,443 +6,479 @@ struct LabelStruct {
     char_string<16> value = 1;
 }
 
-server cluster AccessControl = 31 {
-  enum AuthMode : ENUM8 {
-    kPase = 1;
-    kCase = 2;
-    kGroup = 3;
-  }
-
-  enum ChangeTypeEnum : ENUM8 {
-    kChanged = 0;
-    kAdded = 1;
-    kRemoved = 2;
-  }
-
-  enum Privilege : ENUM8 {
-    kView = 1;
-    kProxyView = 2;
-    kOperate = 3;
-    kManage = 4;
-    kAdminister = 5;
-  }
-
-  struct AccessControlEntry {
-    Privilege privilege = 1;
-    AuthMode authMode = 2;
-    nullable int64u subjects[] = 3;
-    nullable Target targets[] = 4;
-    fabric_idx fabricIndex = 254;
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
   }
 
-  struct Target {
-    nullable cluster_id cluster = 0;
-    nullable endpoint_no endpoint = 1;
-    nullable devtype_id deviceType = 2;
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
   }
 
-  struct ExtensionEntry {
-    octet_string<128> data = 1;
-    fabric_idx fabricIndex = 254;
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
   }
 
-  info event access(read: administer) AccessControlEntryChanged = 0 {
-    nullable node_id adminNodeID = 1;
-    nullable INT16U adminPasscodeID = 2;
-    ChangeTypeEnum changeType = 3;
-    nullable AccessControlEntry latestValue = 4;
-    fabric_idx adminFabricIndex = 254;
-  }
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  info event access(read: administer) AccessControlExtensionChanged = 1 {
-    nullable node_id adminNodeID = 1;
-    nullable INT16U adminPasscodeID = 2;
-    ChangeTypeEnum changeType = 3;
-    nullable ExtensionEntry latestValue = 4;
-    fabric_idx adminFabricIndex = 254;
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
   }
 
-  attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
-  attribute access(read: administer, write: administer) ExtensionEntry extension[] = 1;
-  readonly attribute int16u subjectsPerAccessControlEntry = 2;
-  readonly attribute int16u targetsPerAccessControlEntry = 3;
-  readonly attribute int16u accessControlEntriesPerFabric = 4;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
 }
 
-client cluster AccountLogin = 1294 {
+server cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
+  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct GetSetupPINRequest {
-    CHAR_STRING tempAccountIdentifier = 0;
+  request struct AddGroupRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
   }
 
-  request struct LoginRequest {
-    CHAR_STRING tempAccountIdentifier = 0;
-    CHAR_STRING setupPIN = 1;
+  request struct ViewGroupRequest {
+    group_id groupId = 0;
   }
 
-  timed command GetSetupPIN(GetSetupPINRequest): GetSetupPINResponse = 0;
-  timed command Login(LoginRequest): DefaultSuccess = 2;
-  timed command Logout(): DefaultSuccess = 3;
-}
-
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
   }
 
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
+  request struct RemoveGroupRequest {
+    group_id groupId = 0;
   }
 
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
 
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
+  response struct AddGroupResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
+  response struct ViewGroupResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    CHAR_STRING groupName = 2;
   }
 
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
+  response struct GetGroupMembershipResponse = 2 {
+    nullable INT8U capacity = 0;
+    group_id groupList[] = 1;
+  }
 
-client cluster ApplicationBasic = 1293 {
-  enum ApplicationStatusEnum : ENUM8 {
-    kStopped = 0;
-    kActiveVisibleFocus = 1;
-    kActiveHidden = 2;
-    kActiveVisibleNotFocus = 3;
+  response struct RemoveGroupResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  readonly attribute char_string<32> vendorName = 0;
-  readonly attribute int16u vendorID = 1;
-  readonly attribute char_string<32> applicationName = 2;
-  readonly attribute int16u productID = 3;
-  readonly attribute ApplicationStatusEnum status = 5;
-  readonly attribute char_string<32> applicationVersion = 6;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
 }
 
-client cluster ApplicationLauncher = 1292 {
-  enum ApplicationLauncherStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kAppNotAvailable = 1;
-    kSystemBusy = 2;
+server cluster Scenes = 5 {
+  bitmap ScenesCopyMode : BITMAP8 {
+    kCopyAllScenes = 0x1;
   }
 
-  bitmap ApplicationLauncherFeature : BITMAP32 {
-    kApplicationPlatform = 0x1;
+  struct ExtensionFieldSet {
+    cluster_id clusterId = 0;
+    AttributeValuePair attributeValueList[] = 1;
   }
 
-  struct Application {
-    int16u catalogVendorId = 0;
-    char_string applicationId = 1;
+  struct AttributeValuePair {
+    optional attrib_id attributeId = 0;
+    int8u attributeValue[] = 1;
   }
 
-  readonly attribute INT16U catalogList[] = 0;
+  readonly attribute int8u sceneCount = 0;
+  readonly attribute int8u currentScene = 1;
+  readonly attribute group_id currentGroup = 2;
+  readonly attribute boolean sceneValid = 3;
+  readonly attribute bitmap8 nameSupport = 4;
+  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct LaunchAppRequest {
-    Application application = 0;
-    optional OCTET_STRING data = 1;
+  request struct AddSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    INT16U transitionTime = 2;
+    CHAR_STRING sceneName = 3;
+    ExtensionFieldSet extensionFieldSets[] = 4;
   }
 
-  request struct StopAppRequest {
-    Application application = 0;
+  request struct ViewSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  request struct HideAppRequest {
-    Application application = 0;
+  request struct RemoveSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  command LaunchApp(LaunchAppRequest): LauncherResponse = 0;
-  command StopApp(StopAppRequest): LauncherResponse = 1;
-  command HideApp(HideAppRequest): LauncherResponse = 2;
-}
-
-client cluster AudioOutput = 1291 {
-  enum OutputTypeEnum : ENUM8 {
-    kHdmi = 0;
-    kBt = 1;
-    kOptical = 2;
-    kHeadphone = 3;
-    kInternal = 4;
-    kOther = 5;
+  request struct RemoveAllScenesRequest {
+    group_id groupId = 0;
   }
 
-  bitmap AudioOutputFeature : BITMAP32 {
-    kNameUpdates = 0x1;
+  request struct StoreSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  struct OutputInfo {
-    int8u index = 0;
-    OutputTypeEnum outputType = 1;
-    char_string<32> name = 2;
+  request struct RecallSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    optional nullable INT16U transitionTime = 2;
   }
 
-  readonly attribute OutputInfo outputList[] = 0;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct SelectOutputRequest {
-    INT8U index = 0;
+  request struct GetSceneMembershipRequest {
+    group_id groupId = 0;
   }
 
-  request struct RenameOutputRequest {
-    INT8U index = 0;
-    CHAR_STRING name = 1;
+  response struct AddSceneResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  command SelectOutput(SelectOutputRequest): DefaultSuccess = 0;
-  command RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
-}
-
-server cluster BarrierControl = 259 {
-  readonly attribute enum8 barrierMovingState = 1;
-  readonly attribute bitmap16 barrierSafetyStatus = 2;
-  readonly attribute bitmap8 barrierCapabilities = 3;
-  readonly attribute int8u barrierPosition = 10;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct BarrierControlGoToPercentRequest {
-    INT8U percentOpen = 0;
-  }
-
-  command BarrierControlGoToPercent(BarrierControlGoToPercentRequest): DefaultSuccess = 0;
-  command BarrierControlStop(): DefaultSuccess = 1;
-}
-
-server cluster Basic = 40 {
-  struct CapabilityMinimaStruct {
-    int16u caseSessionsPerFabric = 0;
-    int16u subscriptionsPerFabric = 1;
+  response struct ViewSceneResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+    optional INT16U transitionTime = 3;
+    optional CHAR_STRING sceneName = 4;
+    optional ExtensionFieldSet extensionFieldSets[] = 5;
   }
 
-  critical event StartUp = 0 {
-    INT32U softwareVersion = 0;
+  response struct RemoveSceneResponse = 2 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  critical event ShutDown = 1 {
+  response struct RemoveAllScenesResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  info event Leave = 2 {
+  response struct StoreSceneResponse = 4 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  info event ReachableChanged = 3 {
-    boolean reachableNewValue = 0;
+  response struct GetSceneMembershipResponse = 6 {
+    ENUM8 status = 0;
+    nullable INT8U capacity = 1;
+    group_id groupId = 2;
+    optional INT8U sceneList[] = 3;
   }
 
-  readonly attribute int16u dataModelRevision = 0;
-  readonly attribute char_string<32> vendorName = 1;
-  readonly attribute vendor_id vendorID = 2;
-  readonly attribute char_string<32> productName = 3;
-  readonly attribute int16u productID = 4;
-  attribute access(write: manage) char_string<32> nodeLabel = 5;
-  attribute access(write: administer) char_string<2> location = 6;
-  readonly attribute int16u hardwareVersion = 7;
-  readonly attribute char_string<64> hardwareVersionString = 8;
-  readonly attribute int32u softwareVersion = 9;
-  readonly attribute char_string<64> softwareVersionString = 10;
-  readonly attribute char_string<16> manufacturingDate = 11;
-  readonly attribute char_string<32> partNumber = 12;
-  readonly attribute long_char_string<256> productURL = 13;
-  readonly attribute char_string<64> productLabel = 14;
-  readonly attribute char_string<32> serialNumber = 15;
-  attribute access(write: manage) boolean localConfigDisabled = 16;
-  readonly attribute boolean reachable = 17;
-  readonly attribute char_string<32> uniqueID = 18;
-  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster BinaryInputBasic = 15 {
-  attribute boolean outOfService = 81;
-  attribute boolean presentValue = 85;
-  readonly attribute bitmap8 statusFlags = 111;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
+  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
+  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
+  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
+  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
+  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
+  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
 }
 
-server cluster Binding = 30 {
-  struct TargetStruct {
-    optional node_id node = 1;
-    optional group_id group = 2;
-    optional endpoint_no endpoint = 3;
-    optional cluster_id cluster = 4;
-    fabric_idx fabricIndex = 254;
+client cluster OnOff = 6 {
+  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
+    kFadeToOffIn0p8Seconds = 0;
+    kNoFade = 1;
+    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
   }
 
-  attribute TargetStruct binding[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  enum OnOffDyingLightEffectVariant : ENUM8 {
+    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
+  }
 
-client cluster Channel = 1284 {
-  enum ChannelStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kMultipleMatches = 1;
-    kNoMatches = 2;
+  enum OnOffEffectIdentifier : ENUM8 {
+    kDelayedAllOff = 0;
+    kDyingLight = 1;
   }
 
-  enum LineupInfoTypeEnum : ENUM8 {
-    kMso = 0;
+  enum OnOffStartUpOnOff : ENUM8 {
+    kOff = 0;
+    kOn = 1;
+    kTogglePreviousOnOff = 2;
   }
 
-  bitmap ChannelFeature : BITMAP32 {
-    kChannelList = 0x1;
-    kLineupInfo = 0x2;
+  bitmap OnOffControl : BITMAP8 {
+    kAcceptOnlyWhenOn = 0x1;
   }
 
-  struct ChannelInfo {
-    int16u majorNumber = 0;
-    int16u minorNumber = 1;
-    optional char_string<32> name = 2;
-    optional char_string<32> callSign = 3;
-    optional char_string<32> affiliateCallSign = 4;
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
   }
 
-  struct LineupInfo {
-    char_string operatorName = 0;
-    optional char_string lineupName = 1;
-    optional char_string postalCode = 2;
-    LineupInfoTypeEnum lineupInfoType = 3;
+  bitmap SceneFeatures : BITMAP32 {
+    kSceneNames = 0x1;
   }
 
-  readonly attribute ChannelInfo channelList[] = 0;
-  readonly attribute nullable LineupInfo lineup = 1;
-  readonly attribute nullable ChannelInfo currentChannel = 2;
+  readonly attribute boolean onOff = 0;
+  readonly attribute boolean globalSceneControl = 16384;
+  attribute int16u onTime = 16385;
+  attribute int16u offWaitTime = 16386;
+  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
+  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct ChangeChannelRequest {
-    CHAR_STRING match = 0;
-  }
+  command Off(): DefaultSuccess = 0;
+  command On(): DefaultSuccess = 1;
+  command Toggle(): DefaultSuccess = 2;
+}
 
-  request struct ChangeChannelByNumberRequest {
-    INT16U majorNumber = 0;
-    INT16U minorNumber = 1;
+server cluster OnOff = 6 {
+  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
+    kFadeToOffIn0p8Seconds = 0;
+    kNoFade = 1;
+    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
   }
 
-  request struct SkipChannelRequest {
-    INT16U count = 0;
+  enum OnOffDyingLightEffectVariant : ENUM8 {
+    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
   }
 
-  command ChangeChannel(ChangeChannelRequest): ChangeChannelResponse = 0;
-  command ChangeChannelByNumber(ChangeChannelByNumberRequest): DefaultSuccess = 2;
-  command SkipChannel(SkipChannelRequest): DefaultSuccess = 3;
-}
-
-client cluster ContentLauncher = 1290 {
-  enum ContentLaunchStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kUrlNotAvailable = 1;
-    kAuthFailed = 2;
+  enum OnOffEffectIdentifier : ENUM8 {
+    kDelayedAllOff = 0;
+    kDyingLight = 1;
   }
 
-  enum MetricTypeEnum : ENUM8 {
-    kPixels = 0;
-    kPercentage = 1;
+  enum OnOffStartUpOnOff : ENUM8 {
+    kOff = 0;
+    kOn = 1;
+    kTogglePreviousOnOff = 2;
   }
 
-  enum ParameterEnum : ENUM8 {
-    kActor = 0;
-    kChannel = 1;
-    kCharacter = 2;
-    kDirector = 3;
-    kEvent = 4;
-    kFranchise = 5;
-    kGenre = 6;
-    kLeague = 7;
-    kPopularity = 8;
-    kProvider = 9;
-    kSport = 10;
-    kSportsTeam = 11;
-    kType = 12;
+  bitmap OnOffControl : BITMAP8 {
+    kAcceptOnlyWhenOn = 0x1;
   }
 
-  bitmap ContentLauncherFeature : BITMAP32 {
-    kContentSearch = 0x1;
-    kURLPlayback = 0x2;
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
   }
 
-  bitmap SupportedStreamingProtocol : BITMAP32 {
-    kDash = 0x1;
-    kHls = 0x2;
+  bitmap SceneFeatures : BITMAP32 {
+    kSceneNames = 0x1;
   }
 
-  struct ContentSearch {
-    Parameter parameterList[] = 0;
-  }
+  readonly attribute boolean onOff = 0;
+  readonly attribute boolean globalSceneControl = 16384;
+  attribute int16u onTime = 16385;
+  attribute int16u offWaitTime = 16386;
+  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  struct Parameter {
-    ParameterEnum type = 0;
-    char_string value = 1;
-    optional AdditionalInfo externalIDList[] = 2;
+  command Off(): DefaultSuccess = 0;
+  command On(): DefaultSuccess = 1;
+  command Toggle(): DefaultSuccess = 2;
+}
+
+client cluster LevelControl = 8 {
+  enum MoveMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
   }
 
-  struct AdditionalInfo {
-    char_string name = 0;
-    char_string value = 1;
+  enum StepMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
   }
 
-  struct BrandingInformation {
-    char_string providerName = 0;
-    optional StyleInformation background = 1;
-    optional StyleInformation logo = 2;
-    optional StyleInformation progressBar = 3;
-    optional StyleInformation splash = 4;
-    optional StyleInformation waterMark = 5;
+  bitmap LevelControlFeature : BITMAP32 {
+    kOnOff = 0x1;
+    kLighting = 0x2;
+    kFrequency = 0x4;
   }
 
-  struct StyleInformation {
-    optional char_string imageUrl = 0;
-    optional char_string color = 1;
-    optional Dimension size = 2;
+  readonly attribute int8u currentLevel = 0;
+  readonly attribute int16u remainingTime = 1;
+  readonly attribute int8u minLevel = 2;
+  readonly attribute int8u maxLevel = 3;
+  readonly attribute int16u currentFrequency = 4;
+  readonly attribute int16u minFrequency = 5;
+  readonly attribute int16u maxFrequency = 6;
+  attribute bitmap8 options = 15;
+  attribute int16u onOffTransitionTime = 16;
+  attribute nullable int8u onLevel = 17;
+  attribute nullable int16u onTransitionTime = 18;
+  attribute nullable int16u offTransitionTime = 19;
+  attribute nullable int8u defaultMoveRate = 20;
+  attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct MoveToLevelRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
   }
 
-  struct Dimension {
-    double width = 0;
-    double height = 1;
-    MetricTypeEnum metric = 2;
+  request struct MoveRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
   }
 
-  readonly attribute CHAR_STRING acceptHeader[] = 0;
-  attribute bitmap32 supportedStreamingProtocols = 1;
+  request struct StepRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionMask = 3;
+    BITMAP8 optionOverride = 4;
+  }
+
+  request struct StopRequest {
+    BITMAP8 optionMask = 0;
+    BITMAP8 optionOverride = 1;
+  }
+
+  request struct MoveToLevelWithOnOffRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
+  }
+
+  request struct MoveWithOnOffRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
+  }
+
+  request struct StepWithOnOffRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
+  }
+
+  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
+  command Move(MoveRequest): DefaultSuccess = 1;
+  command Step(StepRequest): DefaultSuccess = 2;
+  command Stop(StopRequest): DefaultSuccess = 3;
+  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
+  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
+  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
+  command StopWithOnOff(): DefaultSuccess = 7;
+}
+
+server cluster LevelControl = 8 {
+  enum MoveMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
+  }
+
+  enum StepMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
+  }
+
+  bitmap LevelControlFeature : BITMAP32 {
+    kOnOff = 0x1;
+    kLighting = 0x2;
+    kFrequency = 0x4;
+  }
+
+  readonly attribute int8u currentLevel = 0;
+  readonly attribute int16u remainingTime = 1;
+  readonly attribute int8u minLevel = 2;
+  readonly attribute int8u maxLevel = 3;
+  readonly attribute int16u currentFrequency = 4;
+  readonly attribute int16u minFrequency = 5;
+  readonly attribute int16u maxFrequency = 6;
+  attribute bitmap8 options = 15;
+  attribute int16u onOffTransitionTime = 16;
+  attribute nullable int8u onLevel = 17;
+  attribute nullable int16u onTransitionTime = 18;
+  attribute nullable int16u offTransitionTime = 19;
+  attribute nullable int8u defaultMoveRate = 20;
+  attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
+  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct LaunchContentRequest {
-    ContentSearch search = 0;
-    BOOLEAN autoPlay = 1;
-    optional CHAR_STRING data = 2;
+  request struct MoveToLevelRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
   }
 
-  request struct LaunchURLRequest {
-    CHAR_STRING contentURL = 0;
-    optional CHAR_STRING displayString = 1;
-    optional BrandingInformation brandingInformation = 2;
+  request struct MoveRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
   }
 
-  command LaunchContent(LaunchContentRequest): LaunchResponse = 0;
-  command LaunchURL(LaunchURLRequest): LaunchResponse = 1;
+  request struct StepRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionMask = 3;
+    BITMAP8 optionOverride = 4;
+  }
+
+  request struct StopRequest {
+    BITMAP8 optionMask = 0;
+    BITMAP8 optionOverride = 1;
+  }
+
+  request struct MoveToLevelWithOnOffRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
+  }
+
+  request struct MoveWithOnOffRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
+  }
+
+  request struct StepWithOnOffRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
+  }
+
+  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
+  command Move(MoveRequest): DefaultSuccess = 1;
+  command Step(StepRequest): DefaultSuccess = 2;
+  command Stop(StopRequest): DefaultSuccess = 3;
+  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
+  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
+  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
+  command StopWithOnOff(): DefaultSuccess = 7;
+}
+
+server cluster BinaryInputBasic = 15 {
+  attribute boolean outOfService = 81;
+  attribute boolean presentValue = 85;
+  readonly attribute bitmap8 statusFlags = 111;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
 client cluster Descriptor = 29 {
@@ -473,69 +509,243 @@ server cluster Descriptor = 29 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster DiagnosticLogs = 50 {
-  enum LogsIntent : ENUM8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
-  }
-
-  enum LogsStatus : ENUM8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
-  }
-
-  enum LogsTransferProtocol : ENUM8 {
-    kResponsePayload = 0;
-    kBdx = 1;
+server cluster Binding = 30 {
+  struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
   }
 
+  attribute TargetStruct binding[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct RetrieveLogsRequestRequest {
-    LogsIntent intent = 0;
-    LogsTransferProtocol requestedProtocol = 1;
-    OCTET_STRING transferFileDesignator = 2;
+server cluster AccessControl = 31 {
+  enum AuthMode : ENUM8 {
+    kPase = 1;
+    kCase = 2;
+    kGroup = 3;
   }
 
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
-}
+  enum ChangeTypeEnum : ENUM8 {
+    kChanged = 0;
+    kAdded = 1;
+    kRemoved = 2;
+  }
 
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
+  enum Privilege : ENUM8 {
+    kView = 1;
+    kProxyView = 2;
+    kOperate = 3;
+    kManage = 4;
+    kAdminister = 5;
   }
 
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  struct AccessControlEntry {
+    Privilege privilege = 1;
+    AuthMode authMode = 2;
+    nullable int64u subjects[] = 3;
+    nullable Target targets[] = 4;
+    fabric_idx fabricIndex = 254;
+  }
 
-  command ResetCounts(): DefaultSuccess = 0;
-}
+  struct Target {
+    nullable cluster_id cluster = 0;
+    nullable endpoint_no endpoint = 1;
+    nullable devtype_id deviceType = 2;
+  }
 
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
+  struct ExtensionEntry {
+    octet_string<128> data = 1;
+    fabric_idx fabricIndex = 254;
+  }
+
+  info event access(read: administer) AccessControlEntryChanged = 0 {
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable AccessControlEntry latestValue = 4;
+    fabric_idx adminFabricIndex = 254;
+  }
+
+  info event access(read: administer) AccessControlExtensionChanged = 1 {
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable ExtensionEntry latestValue = 4;
+    fabric_idx adminFabricIndex = 254;
+  }
+
+  attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
+  attribute access(read: administer, write: administer) ExtensionEntry extension[] = 1;
+  readonly attribute int16u subjectsPerAccessControlEntry = 2;
+  readonly attribute int16u targetsPerAccessControlEntry = 3;
+  readonly attribute int16u accessControlEntriesPerFabric = 4;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster Basic = 40 {
+  struct CapabilityMinimaStruct {
+    int16u caseSessionsPerFabric = 0;
+    int16u subscriptionsPerFabric = 1;
+  }
+
+  critical event StartUp = 0 {
+    INT32U softwareVersion = 0;
+  }
+
+  critical event ShutDown = 1 {
+  }
+
+  info event Leave = 2 {
+  }
+
+  info event ReachableChanged = 3 {
+    boolean reachableNewValue = 0;
+  }
+
+  readonly attribute int16u dataModelRevision = 0;
+  readonly attribute char_string<32> vendorName = 1;
+  readonly attribute vendor_id vendorID = 2;
+  readonly attribute char_string<32> productName = 3;
+  readonly attribute int16u productID = 4;
+  attribute access(write: manage) char_string<32> nodeLabel = 5;
+  attribute access(write: administer) char_string<2> location = 6;
+  readonly attribute int16u hardwareVersion = 7;
+  readonly attribute char_string<64> hardwareVersionString = 8;
+  readonly attribute int32u softwareVersion = 9;
+  readonly attribute char_string<64> softwareVersionString = 10;
+  readonly attribute char_string<16> manufacturingDate = 11;
+  readonly attribute char_string<32> partNumber = 12;
+  readonly attribute long_char_string<256> productURL = 13;
+  readonly attribute char_string<64> productLabel = 14;
+  readonly attribute char_string<32> serialNumber = 15;
+  attribute access(write: manage) boolean localConfigDisabled = 16;
+  readonly attribute boolean reachable = 17;
+  readonly attribute char_string<32> uniqueID = 18;
+  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
+  }
+
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
+  }
+
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
+  }
+
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
+  }
+
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
+  }
+
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
+  }
+
+  response struct QueryImageResponse = 1 {
+    OTAQueryStatus status = 0;
+    optional INT32U delayedActionTime = 1;
+    optional CHAR_STRING imageURI = 2;
+    optional INT32U softwareVersion = 3;
+    optional CHAR_STRING softwareVersionString = 4;
+    optional OCTET_STRING updateToken = 5;
+    optional BOOLEAN userConsentNeeded = 6;
+    optional OCTET_STRING metadataForRequestor = 7;
+  }
+
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
+  }
+
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
+}
+
+server cluster LocalizationConfiguration = 43 {
+  attribute char_string<35> activeLocale = 0;
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
+  }
+
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
+  }
+
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster UnitLocalization = 45 {
+  enum TempUnit : ENUM8 {
+    kFahrenheit = 0;
+    kCelsius = 1;
+    kKelvin = 2;
+  }
+
+  bitmap UnitLocalizationFeature : BITMAP32 {
+    kTemperatureUnit = 0x1;
+  }
+
+  attribute TempUnit temperatureUnit = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
@@ -599,49 +809,215 @@ server cluster GeneralCommissioning = 48 {
   command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
 }
 
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatus : ENUM8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
   }
 
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
+  enum WiFiBand : ENUM8 {
+    k2g4 = 0;
+    k3g65 = 1;
+    k5g = 2;
+    k6g = 3;
+    k60g = 4;
   }
 
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
+  bitmap NetworkCommissioningFeature : BITMAP32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
   }
 
-  enum NetworkFaultType : ENUM8 {
-    kUnspecified = 0;
-    kHardwareFailure = 1;
-    kNetworkJammed = 2;
-    kConnectionFailed = 3;
+  bitmap WiFiSecurity : BITMAP8 {
+    kUnencrypted = 0x1;
+    kWepPersonal = 0x2;
+    kWpaPersonal = 0x4;
+    kWpa2Personal = 0x8;
+    kWpa3Personal = 0x10;
   }
 
-  enum RadioFaultType : ENUM8 {
-    kUnspecified = 0;
-    kWiFiFault = 1;
+  struct NetworkInfo {
+    octet_string<32> networkID = 0;
+    boolean connected = 1;
+  }
+
+  struct WiFiInterfaceScanResult {
+    WiFiSecurity security = 0;
+    octet_string<32> ssid = 1;
+    octet_string<6> bssid = 2;
+    int16u channel = 3;
+    WiFiBand wiFiBand = 4;
+    int8s rssi = 5;
+  }
+
+  struct ThreadInterfaceScanResult {
+    int16u panId = 0;
+    int64u extendedPanId = 1;
+    char_string<16> networkName = 2;
+    int16u channel = 3;
+    int8u version = 4;
+    octet_string<8> extendedAddress = 5;
+    int8s rssi = 6;
+    int8u lqi = 7;
+  }
+
+  readonly attribute access(read: administer) int8u maxNetworks = 0;
+  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
+  readonly attribute int8u scanMaxTimeSeconds = 2;
+  readonly attribute int8u connectMaxTimeSeconds = 3;
+  attribute access(write: administer) boolean interfaceEnabled = 4;
+  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
+  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
+  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ScanNetworksRequest {
+    optional nullable OCTET_STRING ssid = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct AddOrUpdateWiFiNetworkRequest {
+    OCTET_STRING ssid = 0;
+    OCTET_STRING credentials = 1;
+    optional INT64U breadcrumb = 2;
+  }
+
+  request struct AddOrUpdateThreadNetworkRequest {
+    OCTET_STRING operationalDataset = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct RemoveNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct ConnectNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
+  }
+
+  request struct ReorderNetworkRequest {
+    OCTET_STRING networkID = 0;
+    INT8U networkIndex = 1;
+    optional INT64U breadcrumb = 2;
+  }
+
+  response struct ScanNetworksResponse = 1 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
+    optional ThreadInterfaceScanResult threadScanResults[] = 3;
+  }
+
+  response struct NetworkConfigResponse = 5 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional INT8U networkIndex = 2;
+  }
+
+  response struct ConnectNetworkResponse = 7 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    nullable INT32S errorValue = 2;
+  }
+
+  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
+  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
+  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
+  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
+  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
+  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+}
+
+server cluster DiagnosticLogs = 50 {
+  enum LogsIntent : ENUM8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
+  }
+
+  enum LogsStatus : ENUM8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
+  }
+
+  enum LogsTransferProtocol : ENUM8 {
+    kResponsePayload = 0;
+    kBdx = 1;
+  }
+
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct RetrieveLogsRequestRequest {
+    LogsIntent intent = 0;
+    LogsTransferProtocol requestedProtocol = 1;
+    OCTET_STRING transferFileDesignator = 2;
+  }
+
+  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+}
+
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
+  }
+
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
+  }
+
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
+  }
+
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
+  }
+
+  enum RadioFaultType : ENUM8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
     kCellularFault = 2;
     kThreadFault = 3;
     kNFCFault = 4;
@@ -699,829 +1075,343 @@ server cluster GeneralDiagnostics = 51 {
   command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
-  }
-
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
-    fabric_idx fabricIndex = 254;
+server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
   }
 
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
+  struct ThreadMetrics {
+    int64u id = 0;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
-  struct GroupKeySetStruct {
-    int16u groupKeySetID = 0;
-    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
-    nullable octet_string<16> epochKey0 = 2;
-    nullable epoch_us epochStartTime0 = 3;
-    nullable octet_string<16> epochKey1 = 4;
-    nullable epoch_us epochStartTime1 = 5;
-    nullable octet_string<16> epochKey2 = 6;
-    nullable epoch_us epochStartTime2 = 7;
+  info event SoftwareFault = 0 {
+    SoftwareFaultStruct softwareFault = 0;
   }
 
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
-  readonly attribute int16u maxGroupsPerFabric = 2;
-  readonly attribute int16u maxGroupKeysPerFabric = 3;
+  readonly attribute ThreadMetrics threadMetrics[] = 0;
+  readonly attribute int64u currentHeapFree = 1;
+  readonly attribute int64u currentHeapUsed = 2;
+  readonly attribute int64u currentHeapHighWatermark = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct KeySetWriteRequest {
-    GroupKeySetStruct groupKeySet = 0;
+server cluster ThreadNetworkDiagnostics = 53 {
+  enum NetworkFault : ENUM8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
   }
 
-  request struct KeySetReadRequest {
-    INT16U groupKeySetID = 0;
+  enum RoutingRole : ENUM8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kReed = 4;
+    kRouter = 5;
+    kLeader = 6;
   }
 
-  request struct KeySetRemoveRequest {
-    INT16U groupKeySetID = 0;
+  enum ThreadConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
+  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+    kMLECounts = 0x4;
+    kMACCounts = 0x8;
   }
 
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
-}
-
-server cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AddGroupRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
-  }
-
-  request struct ViewGroupRequest {
-    group_id groupId = 0;
-  }
-
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
-  }
-
-  request struct RemoveGroupRequest {
-    group_id groupId = 0;
-  }
-
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
-  }
-
-  response struct AddGroupResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-  }
-
-  response struct ViewGroupResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    CHAR_STRING groupName = 2;
-  }
-
-  response struct GetGroupMembershipResponse = 2 {
-    nullable INT8U capacity = 0;
-    group_id groupList[] = 1;
-  }
-
-  response struct RemoveGroupResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-  }
-
-  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
-}
-
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
-  }
-
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
-  }
-
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
-  }
-
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
-  }
-
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
-}
-
-client cluster KeypadInput = 1289 {
-  enum CecKeyCode : ENUM8 {
-    kSelect = 0;
-    kUp = 1;
-    kDown = 2;
-    kLeft = 3;
-    kRight = 4;
-    kRightUp = 5;
-    kRightDown = 6;
-    kLeftUp = 7;
-    kLeftDown = 8;
-    kRootMenu = 9;
-    kSetupMenu = 10;
-    kContentsMenu = 11;
-    kFavoriteMenu = 12;
-    kExit = 13;
-    kMediaTopMenu = 16;
-    kMediaContextSensitiveMenu = 17;
-    kNumberEntryMode = 29;
-    kNumber11 = 30;
-    kNumber12 = 31;
-    kNumber0OrNumber10 = 32;
-    kNumbers1 = 33;
-    kNumbers2 = 34;
-    kNumbers3 = 35;
-    kNumbers4 = 36;
-    kNumbers5 = 37;
-    kNumbers6 = 38;
-    kNumbers7 = 39;
-    kNumbers8 = 40;
-    kNumbers9 = 41;
-    kDot = 42;
-    kEnter = 43;
-    kClear = 44;
-    kNextFavorite = 47;
-    kChannelUp = 48;
-    kChannelDown = 49;
-    kPreviousChannel = 50;
-    kSoundSelect = 51;
-    kInputSelect = 52;
-    kDisplayInformation = 53;
-    kHelp = 54;
-    kPageUp = 55;
-    kPageDown = 56;
-    kPower = 64;
-    kVolumeUp = 65;
-    kVolumeDown = 66;
-    kMute = 67;
-    kPlay = 68;
-    kStop = 69;
-    kPause = 70;
-    kRecord = 71;
-    kRewind = 72;
-    kFastForward = 73;
-    kEject = 74;
-    kForward = 75;
-    kBackward = 76;
-    kStopRecord = 77;
-    kPauseRecord = 78;
-    kReserved = 79;
-    kAngle = 80;
-    kSubPicture = 81;
-    kVideoOnDemand = 82;
-    kElectronicProgramGuide = 83;
-    kTimerProgramming = 84;
-    kInitialConfiguration = 85;
-    kSelectBroadcastType = 86;
-    kSelectSoundPresentation = 87;
-    kPlayFunction = 96;
-    kPausePlayFunction = 97;
-    kRecordFunction = 98;
-    kPauseRecordFunction = 99;
-    kStopFunction = 100;
-    kMuteFunction = 101;
-    kRestoreVolumeFunction = 102;
-    kTuneFunction = 103;
-    kSelectMediaFunction = 104;
-    kSelectAvInputFunction = 105;
-    kSelectAudioInputFunction = 106;
-    kPowerToggleFunction = 107;
-    kPowerOffFunction = 108;
-    kPowerOnFunction = 109;
-    kF1Blue = 113;
-    kF2Red = 114;
-    kF3Green = 115;
-    kF4Yellow = 116;
-    kF5 = 117;
-    kData = 118;
-  }
-
-  enum KeypadInputStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kUnsupportedKey = 1;
-    kInvalidKeyInCurrentState = 2;
-  }
-
-  bitmap KeypadInputFeature : BITMAP32 {
-    kNavigationKeyCodes = 0x1;
-    kLocationKeys = 0x2;
-    kNumberKeys = 0x4;
-  }
-
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct SendKeyRequest {
-    CecKeyCode keyCode = 0;
-  }
-
-  command SendKey(SendKeyRequest): SendKeyResponse = 0;
-}
-
-client cluster LevelControl = 8 {
-  enum MoveMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
-  }
-
-  enum StepMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
-  }
-
-  bitmap LevelControlFeature : BITMAP32 {
-    kOnOff = 0x1;
-    kLighting = 0x2;
-    kFrequency = 0x4;
-  }
-
-  readonly attribute int8u currentLevel = 0;
-  readonly attribute int16u remainingTime = 1;
-  readonly attribute int8u minLevel = 2;
-  readonly attribute int8u maxLevel = 3;
-  readonly attribute int16u currentFrequency = 4;
-  readonly attribute int16u minFrequency = 5;
-  readonly attribute int16u maxFrequency = 6;
-  attribute bitmap8 options = 15;
-  attribute int16u onOffTransitionTime = 16;
-  attribute nullable int8u onLevel = 17;
-  attribute nullable int16u onTransitionTime = 18;
-  attribute nullable int16u offTransitionTime = 19;
-  attribute nullable int8u defaultMoveRate = 20;
-  attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct MoveToLevelRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
-  }
-
-  request struct MoveRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
-  }
-
-  request struct StepRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionMask = 3;
-    BITMAP8 optionOverride = 4;
-  }
-
-  request struct StopRequest {
-    BITMAP8 optionMask = 0;
-    BITMAP8 optionOverride = 1;
-  }
-
-  request struct MoveToLevelWithOnOffRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
-  }
-
-  request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
-  }
-
-  request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
-  }
-
-  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
-  command Move(MoveRequest): DefaultSuccess = 1;
-  command Step(StepRequest): DefaultSuccess = 2;
-  command Stop(StopRequest): DefaultSuccess = 3;
-  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
-  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
-  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
-  command StopWithOnOff(): DefaultSuccess = 7;
-}
-
-server cluster LevelControl = 8 {
-  enum MoveMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
-  }
-
-  enum StepMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
-  }
-
-  bitmap LevelControlFeature : BITMAP32 {
-    kOnOff = 0x1;
-    kLighting = 0x2;
-    kFrequency = 0x4;
-  }
-
-  readonly attribute int8u currentLevel = 0;
-  readonly attribute int16u remainingTime = 1;
-  readonly attribute int8u minLevel = 2;
-  readonly attribute int8u maxLevel = 3;
-  readonly attribute int16u currentFrequency = 4;
-  readonly attribute int16u minFrequency = 5;
-  readonly attribute int16u maxFrequency = 6;
-  attribute bitmap8 options = 15;
-  attribute int16u onOffTransitionTime = 16;
-  attribute nullable int8u onLevel = 17;
-  attribute nullable int16u onTransitionTime = 18;
-  attribute nullable int16u offTransitionTime = 19;
-  attribute nullable int8u defaultMoveRate = 20;
-  attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct MoveToLevelRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
-  }
-
-  request struct MoveRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
-  }
-
-  request struct StepRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionMask = 3;
-    BITMAP8 optionOverride = 4;
-  }
-
-  request struct StopRequest {
-    BITMAP8 optionMask = 0;
-    BITMAP8 optionOverride = 1;
-  }
-
-  request struct MoveToLevelWithOnOffRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
-  }
-
-  request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
-  }
-
-  request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
-  }
-
-  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
-  command Move(MoveRequest): DefaultSuccess = 1;
-  command Step(StepRequest): DefaultSuccess = 2;
-  command Stop(StopRequest): DefaultSuccess = 3;
-  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
-  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
-  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
-  command StopWithOnOff(): DefaultSuccess = 7;
-}
-
-server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-client cluster MediaInput = 1287 {
-  enum InputTypeEnum : ENUM8 {
-    kInternal = 0;
-    kAux = 1;
-    kCoax = 2;
-    kComposite = 3;
-    kHdmi = 4;
-    kInput = 5;
-    kLine = 6;
-    kOptical = 7;
-    kVideo = 8;
-    kScart = 9;
-    kUsb = 10;
-    kOther = 11;
-  }
-
-  bitmap MediaInputFeature : BITMAP32 {
-    kNameUpdates = 0x1;
-  }
-
-  struct InputInfo {
-    int8u index = 0;
-    InputTypeEnum inputType = 1;
-    char_string<32> name = 2;
-    char_string<32> description = 3;
-  }
-
-  readonly attribute InputInfo inputList[] = 0;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct SelectInputRequest {
-    INT8U index = 0;
-  }
-
-  request struct RenameInputRequest {
-    INT8U index = 0;
-    CHAR_STRING name = 1;
-  }
-
-  command SelectInput(SelectInputRequest): DefaultSuccess = 0;
-  command ShowInputStatus(): DefaultSuccess = 1;
-  command HideInputStatus(): DefaultSuccess = 2;
-  command RenameInput(RenameInputRequest): DefaultSuccess = 3;
-}
-
-client cluster MediaPlayback = 1286 {
-  enum MediaPlaybackStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kInvalidStateForCommand = 1;
-    kNotAllowed = 2;
-    kNotActive = 3;
-    kSpeedOutOfRange = 4;
-    kSeekOutOfRange = 5;
-  }
-
-  enum PlaybackStateEnum : ENUM8 {
-    kPlaying = 0;
-    kPaused = 1;
-    kNotPlaying = 2;
-    kBuffering = 3;
-  }
-
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct SkipForwardRequest {
-    INT64U deltaPositionMilliseconds = 0;
-  }
-
-  request struct SkipBackwardRequest {
-    INT64U deltaPositionMilliseconds = 0;
-  }
-
-  request struct SeekRequest {
-    INT64U position = 0;
-  }
-
-  command Play(): PlaybackResponse = 0;
-  command Pause(): PlaybackResponse = 1;
-  command StopPlayback(): PlaybackResponse = 2;
-  command StartOver(): PlaybackResponse = 3;
-  command Previous(): PlaybackResponse = 4;
-  command Next(): PlaybackResponse = 5;
-  command Rewind(): PlaybackResponse = 6;
-  command FastForward(): PlaybackResponse = 7;
-  command SkipForward(SkipForwardRequest): PlaybackResponse = 8;
-  command SkipBackward(SkipBackwardRequest): PlaybackResponse = 9;
-  command Seek(SeekRequest): PlaybackResponse = 11;
-}
-
-server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatus : ENUM8 {
-    kSuccess = 0;
-    kOutOfRange = 1;
-    kBoundsExceeded = 2;
-    kNetworkIDNotFound = 3;
-    kDuplicateNetworkID = 4;
-    kNetworkNotFound = 5;
-    kRegulatoryError = 6;
-    kAuthFailure = 7;
-    kUnsupportedSecurity = 8;
-    kOtherConnectionFailure = 9;
-    kIPV6Failed = 10;
-    kIPBindFailed = 11;
-    kUnknownError = 12;
-  }
-
-  enum WiFiBand : ENUM8 {
-    k2g4 = 0;
-    k3g65 = 1;
-    k5g = 2;
-    k6g = 3;
-    k60g = 4;
-  }
-
-  bitmap NetworkCommissioningFeature : BITMAP32 {
-    kWiFiNetworkInterface = 0x1;
-    kThreadNetworkInterface = 0x2;
-    kEthernetNetworkInterface = 0x4;
+  struct NeighborTable {
+    int64u extAddress = 0;
+    int32u age = 1;
+    int16u rloc16 = 2;
+    int32u linkFrameCounter = 3;
+    int32u mleFrameCounter = 4;
+    int8u lqi = 5;
+    nullable int8s averageRssi = 6;
+    nullable int8s lastRssi = 7;
+    int8u frameErrorRate = 8;
+    int8u messageErrorRate = 9;
+    boolean rxOnWhenIdle = 10;
+    boolean fullThreadDevice = 11;
+    boolean fullNetworkData = 12;
+    boolean isChild = 13;
   }
 
-  bitmap WiFiSecurity : BITMAP8 {
-    kUnencrypted = 0x1;
-    kWepPersonal = 0x2;
-    kWpaPersonal = 0x4;
-    kWpa2Personal = 0x8;
-    kWpa3Personal = 0x10;
+  struct RouteTable {
+    int64u extAddress = 0;
+    int16u rloc16 = 1;
+    int8u routerId = 2;
+    int8u nextHop = 3;
+    int8u pathCost = 4;
+    int8u LQIIn = 5;
+    int8u LQIOut = 6;
+    int8u age = 7;
+    boolean allocated = 8;
+    boolean linkEstablished = 9;
   }
 
-  struct NetworkInfo {
-    octet_string<32> networkID = 0;
-    boolean connected = 1;
+  struct SecurityPolicy {
+    int16u rotationTime = 0;
+    bitmap16 flags = 1;
   }
 
-  struct WiFiInterfaceScanResult {
-    WiFiSecurity security = 0;
-    octet_string<32> ssid = 1;
-    octet_string<6> bssid = 2;
-    int16u channel = 3;
-    WiFiBand wiFiBand = 4;
-    int8s rssi = 5;
+  struct OperationalDatasetComponents {
+    boolean activeTimestampPresent = 0;
+    boolean pendingTimestampPresent = 1;
+    boolean masterKeyPresent = 2;
+    boolean networkNamePresent = 3;
+    boolean extendedPanIdPresent = 4;
+    boolean meshLocalPrefixPresent = 5;
+    boolean delayPresent = 6;
+    boolean panIdPresent = 7;
+    boolean channelPresent = 8;
+    boolean pskcPresent = 9;
+    boolean securityPolicyPresent = 10;
+    boolean channelMaskPresent = 11;
   }
 
-  struct ThreadInterfaceScanResult {
-    int16u panId = 0;
-    int64u extendedPanId = 1;
-    char_string<16> networkName = 2;
-    int16u channel = 3;
-    int8u version = 4;
-    octet_string<8> extendedAddress = 5;
-    int8s rssi = 6;
-    int8u lqi = 7;
+  info event ConnectionStatus = 0 {
+    ThreadConnectionStatus connectionStatus = 0;
   }
 
-  readonly attribute access(read: administer) int8u maxNetworks = 0;
-  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
-  readonly attribute int8u scanMaxTimeSeconds = 2;
-  readonly attribute int8u connectMaxTimeSeconds = 3;
-  attribute access(write: administer) boolean interfaceEnabled = 4;
-  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
-  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
-  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute nullable int16u channel = 0;
+  readonly attribute nullable RoutingRole routingRole = 1;
+  readonly attribute nullable char_string<16> networkName = 2;
+  readonly attribute nullable int16u panId = 3;
+  readonly attribute nullable int64u extendedPanId = 4;
+  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute NeighborTable neighborTableList[] = 7;
+  readonly attribute RouteTable routeTableList[] = 8;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
+  readonly attribute int16u detachedRoleCount = 14;
+  readonly attribute int16u childRoleCount = 15;
+  readonly attribute int16u routerRoleCount = 16;
+  readonly attribute int16u leaderRoleCount = 17;
+  readonly attribute int16u attachAttemptCount = 18;
+  readonly attribute int16u partitionIdChangeCount = 19;
+  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
+  readonly attribute int16u parentChangeCount = 21;
+  readonly attribute int32u txTotalCount = 22;
+  readonly attribute int32u txUnicastCount = 23;
+  readonly attribute int32u txBroadcastCount = 24;
+  readonly attribute int32u txAckRequestedCount = 25;
+  readonly attribute int32u txAckedCount = 26;
+  readonly attribute int32u txNoAckRequestedCount = 27;
+  readonly attribute int32u txDataCount = 28;
+  readonly attribute int32u txDataPollCount = 29;
+  readonly attribute int32u txBeaconCount = 30;
+  readonly attribute int32u txBeaconRequestCount = 31;
+  readonly attribute int32u txOtherCount = 32;
+  readonly attribute int32u txRetryCount = 33;
+  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
+  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
+  readonly attribute int32u txErrCcaCount = 36;
+  readonly attribute int32u txErrAbortCount = 37;
+  readonly attribute int32u txErrBusyChannelCount = 38;
+  readonly attribute int32u rxTotalCount = 39;
+  readonly attribute int32u rxUnicastCount = 40;
+  readonly attribute int32u rxBroadcastCount = 41;
+  readonly attribute int32u rxDataCount = 42;
+  readonly attribute int32u rxDataPollCount = 43;
+  readonly attribute int32u rxBeaconCount = 44;
+  readonly attribute int32u rxBeaconRequestCount = 45;
+  readonly attribute int32u rxOtherCount = 46;
+  readonly attribute int32u rxAddressFilteredCount = 47;
+  readonly attribute int32u rxDestAddrFilteredCount = 48;
+  readonly attribute int32u rxDuplicatedCount = 49;
+  readonly attribute int32u rxErrNoFrameCount = 50;
+  readonly attribute int32u rxErrUnknownNeighborCount = 51;
+  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
+  readonly attribute int32u rxErrSecCount = 53;
+  readonly attribute int32u rxErrFcsCount = 54;
+  readonly attribute int32u rxErrOtherCount = 55;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
+  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-
-  request struct ScanNetworksRequest {
-    optional nullable OCTET_STRING ssid = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct AddOrUpdateWiFiNetworkRequest {
-    OCTET_STRING ssid = 0;
-    OCTET_STRING credentials = 1;
-    optional INT64U breadcrumb = 2;
-  }
-
-  request struct AddOrUpdateThreadNetworkRequest {
-    OCTET_STRING operationalDataset = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct RemoveNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct ConnectNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
-  }
-
-  request struct ReorderNetworkRequest {
-    OCTET_STRING networkID = 0;
-    INT8U networkIndex = 1;
-    optional INT64U breadcrumb = 2;
-  }
-
-  response struct ScanNetworksResponse = 1 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
-    optional ThreadInterfaceScanResult threadScanResults[] = 3;
-  }
-
-  response struct NetworkConfigResponse = 5 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional INT8U networkIndex = 2;
-  }
-
-  response struct ConnectNetworkResponse = 7 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    nullable INT32S errorValue = 2;
-  }
-
-  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
-  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
-  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
-  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
-  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
-  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
 }
 
-server cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
-  }
-
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
-  }
-
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
-  }
-
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
-  }
-
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
-  }
-
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
-  }
-
-  response struct QueryImageResponse = 1 {
-    OTAQueryStatus status = 0;
-    optional INT32U delayedActionTime = 1;
-    optional CHAR_STRING imageURI = 2;
-    optional INT32U softwareVersion = 3;
-    optional CHAR_STRING softwareVersionString = 4;
-    optional OCTET_STRING updateToken = 5;
-    optional BOOLEAN userConsentNeeded = 6;
-    optional OCTET_STRING metadataForRequestor = 7;
+server cluster WiFiNetworkDiagnostics = 54 {
+  enum AssociationFailureCause : ENUM8 {
+    kUnknown = 0;
+    kAssociationFailed = 1;
+    kAuthenticationFailed = 2;
+    kSsidNotFound = 3;
   }
 
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
+  enum SecurityType : ENUM8 {
+    kUnspecified = 0;
+    kNone = 1;
+    kWep = 2;
+    kWpa = 3;
+    kWpa2 = 4;
+    kWpa3 = 5;
   }
 
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
-}
-
-client cluster OnOff = 6 {
-  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
-    kFadeToOffIn0p8Seconds = 0;
-    kNoFade = 1;
-    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
+  enum WiFiConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  enum OnOffDyingLightEffectVariant : ENUM8 {
-    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
+  enum WiFiVersionType : ENUM8 {
+    k80211a = 0;
+    k80211b = 1;
+    k80211g = 2;
+    k80211n = 3;
+    k80211ac = 4;
+    k80211ax = 5;
   }
 
-  enum OnOffEffectIdentifier : ENUM8 {
-    kDelayedAllOff = 0;
-    kDyingLight = 1;
+  info event Disconnection = 0 {
+    INT16U reasonCode = 0;
   }
 
-  enum OnOffStartUpOnOff : ENUM8 {
-    kOff = 0;
-    kOn = 1;
-    kTogglePreviousOnOff = 2;
+  info event AssociationFailure = 1 {
+    AssociationFailureCause associationFailure = 0;
+    INT16U status = 1;
   }
 
-  bitmap OnOffControl : BITMAP8 {
-    kAcceptOnlyWhenOn = 0x1;
+  info event ConnectionStatus = 2 {
+    WiFiConnectionStatus connectionStatus = 0;
   }
 
-  bitmap OnOffFeature : BITMAP32 {
-    kLighting = 0x1;
-  }
+  readonly attribute nullable octet_string<6> bssid = 0;
+  readonly attribute nullable SecurityType securityType = 1;
+  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
+  readonly attribute nullable int16u channelNumber = 3;
+  readonly attribute nullable int8s rssi = 4;
+  readonly attribute int32u beaconLostCount = 5;
+  readonly attribute int32u beaconRxCount = 6;
+  readonly attribute int32u packetMulticastRxCount = 7;
+  readonly attribute int32u packetMulticastTxCount = 8;
+  readonly attribute int32u packetUnicastRxCount = 9;
+  readonly attribute int32u packetUnicastTxCount = 10;
+  readonly attribute int64u currentMaxRate = 11;
+  readonly attribute int64u overrunCount = 12;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  bitmap SceneFeatures : BITMAP32 {
-    kSceneNames = 0x1;
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
   }
 
-  readonly attribute boolean onOff = 0;
-  readonly attribute boolean globalSceneControl = 16384;
-  attribute int16u onTime = 16385;
-  attribute int16u offWaitTime = 16386;
-  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command Off(): DefaultSuccess = 0;
-  command On(): DefaultSuccess = 1;
-  command Toggle(): DefaultSuccess = 2;
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
-server cluster OnOff = 6 {
-  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
-    kFadeToOffIn0p8Seconds = 0;
-    kNoFade = 1;
-    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
+server cluster Switch = 59 {
+  info event SwitchLatched = 0 {
+    INT8U newPosition = 0;
   }
 
-  enum OnOffDyingLightEffectVariant : ENUM8 {
-    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
+  info event InitialPress = 1 {
+    INT8U newPosition = 0;
   }
 
-  enum OnOffEffectIdentifier : ENUM8 {
-    kDelayedAllOff = 0;
-    kDyingLight = 1;
+  info event LongPress = 2 {
+    INT8U newPosition = 0;
   }
 
-  enum OnOffStartUpOnOff : ENUM8 {
-    kOff = 0;
-    kOn = 1;
-    kTogglePreviousOnOff = 2;
+  info event ShortRelease = 3 {
+    INT8U previousPosition = 0;
   }
 
-  bitmap OnOffControl : BITMAP8 {
-    kAcceptOnlyWhenOn = 0x1;
+  info event LongRelease = 4 {
+    INT8U previousPosition = 0;
   }
 
-  bitmap OnOffFeature : BITMAP32 {
-    kLighting = 0x1;
+  info event MultiPressOngoing = 5 {
+    INT8U newPosition = 0;
+    INT8U currentNumberOfPressesCounted = 1;
   }
 
-  bitmap SceneFeatures : BITMAP32 {
-    kSceneNames = 0x1;
+  info event MultiPressComplete = 6 {
+    INT8U newPosition = 0;
+    INT8U totalNumberOfPressesCounted = 1;
   }
 
-  readonly attribute boolean onOff = 0;
-  readonly attribute boolean globalSceneControl = 16384;
-  attribute int16u onTime = 16385;
-  attribute int16u offWaitTime = 16386;
-  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
+  readonly attribute int8u numberOfPositions = 0;
+  readonly attribute int8u currentPosition = 1;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  command Off(): DefaultSuccess = 0;
-  command On(): DefaultSuccess = 1;
-  command Toggle(): DefaultSuccess = 2;
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
+  }
+
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
+  }
+
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
+  }
+
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+  }
+
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
 server cluster OperationalCredentials = 62 {
@@ -1601,495 +1491,605 @@ server cluster OperationalCredentials = 62 {
     OCTET_STRING rootCertificate = 0;
   }
 
-  response struct AttestationResponse = 1 {
-    OCTET_STRING attestationElements = 0;
-    OCTET_STRING signature = 1;
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
+  }
+
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
+  }
+
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
+  }
+
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
+  }
+
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
+}
+
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
+  }
+
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  response struct CertificateChainResponse = 3 {
-    OCTET_STRING certificate = 0;
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  response struct CSRResponse = 5 {
-    OCTET_STRING NOCSRElements = 0;
-    OCTET_STRING attestationSignature = 1;
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  response struct NOCResponse = 8 {
-    OperationalCertStatus statusCode = 0;
-    optional fabric_idx fabricIndex = 1;
-    optional CHAR_STRING debugText = 2;
-  }
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
 
-  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
-  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
-  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
-  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
-  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
-  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
-  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
-  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster Scenes = 5 {
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
-  }
+server cluster UserLabel = 65 {
+  attribute access(write: manage) LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  struct ExtensionFieldSet {
-    cluster_id clusterId = 0;
-    AttributeValuePair attributeValueList[] = 1;
-  }
+server cluster BarrierControl = 259 {
+  readonly attribute enum8 barrierMovingState = 1;
+  readonly attribute bitmap16 barrierSafetyStatus = 2;
+  readonly attribute bitmap8 barrierCapabilities = 3;
+  readonly attribute int8u barrierPosition = 10;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  struct AttributeValuePair {
-    optional attrib_id attributeId = 0;
-    int8u attributeValue[] = 1;
+  request struct BarrierControlGoToPercentRequest {
+    INT8U percentOpen = 0;
   }
 
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
+  command BarrierControlGoToPercent(BarrierControlGoToPercentRequest): DefaultSuccess = 0;
+  command BarrierControlStop(): DefaultSuccess = 1;
+}
+
+server cluster WakeOnLan = 1283 {
+  readonly attribute char_string<32> MACAddress = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct AddSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    INT16U transitionTime = 2;
-    CHAR_STRING sceneName = 3;
-    ExtensionFieldSet extensionFieldSets[] = 4;
+client cluster Channel = 1284 {
+  enum ChannelStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kMultipleMatches = 1;
+    kNoMatches = 2;
   }
 
-  request struct ViewSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
+  enum LineupInfoTypeEnum : ENUM8 {
+    kMso = 0;
   }
 
-  request struct RemoveSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
+  bitmap ChannelFeature : BITMAP32 {
+    kChannelList = 0x1;
+    kLineupInfo = 0x2;
   }
 
-  request struct RemoveAllScenesRequest {
-    group_id groupId = 0;
+  struct ChannelInfo {
+    int16u majorNumber = 0;
+    int16u minorNumber = 1;
+    optional char_string<32> name = 2;
+    optional char_string<32> callSign = 3;
+    optional char_string<32> affiliateCallSign = 4;
   }
 
-  request struct StoreSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
+  struct LineupInfo {
+    char_string operatorName = 0;
+    optional char_string lineupName = 1;
+    optional char_string postalCode = 2;
+    LineupInfoTypeEnum lineupInfoType = 3;
   }
 
-  request struct RecallSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    optional nullable INT16U transitionTime = 2;
-  }
+  readonly attribute ChannelInfo channelList[] = 0;
+  readonly attribute nullable LineupInfo lineup = 1;
+  readonly attribute nullable ChannelInfo currentChannel = 2;
+  readonly attribute int16u clusterRevision = 65533;
 
-  request struct GetSceneMembershipRequest {
-    group_id groupId = 0;
+  request struct ChangeChannelRequest {
+    CHAR_STRING match = 0;
   }
 
-  response struct AddSceneResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
+  request struct ChangeChannelByNumberRequest {
+    INT16U majorNumber = 0;
+    INT16U minorNumber = 1;
   }
 
-  response struct ViewSceneResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-    optional INT16U transitionTime = 3;
-    optional CHAR_STRING sceneName = 4;
-    optional ExtensionFieldSet extensionFieldSets[] = 5;
+  request struct SkipChannelRequest {
+    INT16U count = 0;
   }
 
-  response struct RemoveSceneResponse = 2 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
+  command ChangeChannel(ChangeChannelRequest): ChangeChannelResponse = 0;
+  command ChangeChannelByNumber(ChangeChannelByNumberRequest): DefaultSuccess = 2;
+  command SkipChannel(SkipChannelRequest): DefaultSuccess = 3;
+}
 
-  response struct RemoveAllScenesResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+client cluster TargetNavigator = 1285 {
+  enum TargetNavigatorStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kTargetNotFound = 1;
+    kNotAllowed = 2;
   }
 
-  response struct StoreSceneResponse = 4 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
+  struct TargetInfo {
+    int8u identifier = 0;
+    char_string<32> name = 1;
   }
 
-  response struct GetSceneMembershipResponse = 6 {
-    ENUM8 status = 0;
-    nullable INT8U capacity = 1;
-    group_id groupId = 2;
-    optional INT8U sceneList[] = 3;
+  readonly attribute TargetInfo targetList[] = 0;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct NavigateTargetRequest {
+    INT8U target = 0;
+    optional CHAR_STRING data = 1;
   }
 
-  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
-  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
-  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
-  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
-  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
-  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
-  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
+  command NavigateTarget(NavigateTargetRequest): NavigateTargetResponse = 0;
 }
 
-server cluster SoftwareDiagnostics = 52 {
-  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
-    kWaterMarks = 0x1;
+client cluster MediaPlayback = 1286 {
+  enum MediaPlaybackStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kInvalidStateForCommand = 1;
+    kNotAllowed = 2;
+    kNotActive = 3;
+    kSpeedOutOfRange = 4;
+    kSeekOutOfRange = 5;
   }
 
-  struct ThreadMetrics {
-    int64u id = 0;
-    optional char_string<8> name = 1;
-    optional int32u stackFreeCurrent = 2;
-    optional int32u stackFreeMinimum = 3;
-    optional int32u stackSize = 4;
+  enum PlaybackStateEnum : ENUM8 {
+    kPlaying = 0;
+    kPaused = 1;
+    kNotPlaying = 2;
+    kBuffering = 3;
   }
 
-  info event SoftwareFault = 0 {
-    SoftwareFaultStruct softwareFault = 0;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct SkipForwardRequest {
+    INT64U deltaPositionMilliseconds = 0;
   }
 
-  readonly attribute ThreadMetrics threadMetrics[] = 0;
-  readonly attribute int64u currentHeapFree = 1;
-  readonly attribute int64u currentHeapUsed = 2;
-  readonly attribute int64u currentHeapHighWatermark = 3;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  request struct SkipBackwardRequest {
+    INT64U deltaPositionMilliseconds = 0;
+  }
 
-server cluster Switch = 59 {
-  info event SwitchLatched = 0 {
-    INT8U newPosition = 0;
+  request struct SeekRequest {
+    INT64U position = 0;
   }
 
-  info event InitialPress = 1 {
-    INT8U newPosition = 0;
+  command Play(): PlaybackResponse = 0;
+  command Pause(): PlaybackResponse = 1;
+  command StopPlayback(): PlaybackResponse = 2;
+  command StartOver(): PlaybackResponse = 3;
+  command Previous(): PlaybackResponse = 4;
+  command Next(): PlaybackResponse = 5;
+  command Rewind(): PlaybackResponse = 6;
+  command FastForward(): PlaybackResponse = 7;
+  command SkipForward(SkipForwardRequest): PlaybackResponse = 8;
+  command SkipBackward(SkipBackwardRequest): PlaybackResponse = 9;
+  command Seek(SeekRequest): PlaybackResponse = 11;
+}
+
+client cluster MediaInput = 1287 {
+  enum InputTypeEnum : ENUM8 {
+    kInternal = 0;
+    kAux = 1;
+    kCoax = 2;
+    kComposite = 3;
+    kHdmi = 4;
+    kInput = 5;
+    kLine = 6;
+    kOptical = 7;
+    kVideo = 8;
+    kScart = 9;
+    kUsb = 10;
+    kOther = 11;
   }
 
-  info event LongPress = 2 {
-    INT8U newPosition = 0;
+  bitmap MediaInputFeature : BITMAP32 {
+    kNameUpdates = 0x1;
   }
 
-  info event ShortRelease = 3 {
-    INT8U previousPosition = 0;
+  struct InputInfo {
+    int8u index = 0;
+    InputTypeEnum inputType = 1;
+    char_string<32> name = 2;
+    char_string<32> description = 3;
   }
 
-  info event LongRelease = 4 {
-    INT8U previousPosition = 0;
-  }
+  readonly attribute InputInfo inputList[] = 0;
+  readonly attribute int16u clusterRevision = 65533;
 
-  info event MultiPressOngoing = 5 {
-    INT8U newPosition = 0;
-    INT8U currentNumberOfPressesCounted = 1;
+  request struct SelectInputRequest {
+    INT8U index = 0;
   }
 
-  info event MultiPressComplete = 6 {
-    INT8U newPosition = 0;
-    INT8U totalNumberOfPressesCounted = 1;
+  request struct RenameInputRequest {
+    INT8U index = 0;
+    CHAR_STRING name = 1;
   }
 
-  readonly attribute int8u numberOfPositions = 0;
-  readonly attribute int8u currentPosition = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command SelectInput(SelectInputRequest): DefaultSuccess = 0;
+  command ShowInputStatus(): DefaultSuccess = 1;
+  command HideInputStatus(): DefaultSuccess = 2;
+  command RenameInput(RenameInputRequest): DefaultSuccess = 3;
 }
 
-client cluster TargetNavigator = 1285 {
-  enum TargetNavigatorStatusEnum : ENUM8 {
+client cluster KeypadInput = 1289 {
+  enum CecKeyCode : ENUM8 {
+    kSelect = 0;
+    kUp = 1;
+    kDown = 2;
+    kLeft = 3;
+    kRight = 4;
+    kRightUp = 5;
+    kRightDown = 6;
+    kLeftUp = 7;
+    kLeftDown = 8;
+    kRootMenu = 9;
+    kSetupMenu = 10;
+    kContentsMenu = 11;
+    kFavoriteMenu = 12;
+    kExit = 13;
+    kMediaTopMenu = 16;
+    kMediaContextSensitiveMenu = 17;
+    kNumberEntryMode = 29;
+    kNumber11 = 30;
+    kNumber12 = 31;
+    kNumber0OrNumber10 = 32;
+    kNumbers1 = 33;
+    kNumbers2 = 34;
+    kNumbers3 = 35;
+    kNumbers4 = 36;
+    kNumbers5 = 37;
+    kNumbers6 = 38;
+    kNumbers7 = 39;
+    kNumbers8 = 40;
+    kNumbers9 = 41;
+    kDot = 42;
+    kEnter = 43;
+    kClear = 44;
+    kNextFavorite = 47;
+    kChannelUp = 48;
+    kChannelDown = 49;
+    kPreviousChannel = 50;
+    kSoundSelect = 51;
+    kInputSelect = 52;
+    kDisplayInformation = 53;
+    kHelp = 54;
+    kPageUp = 55;
+    kPageDown = 56;
+    kPower = 64;
+    kVolumeUp = 65;
+    kVolumeDown = 66;
+    kMute = 67;
+    kPlay = 68;
+    kStop = 69;
+    kPause = 70;
+    kRecord = 71;
+    kRewind = 72;
+    kFastForward = 73;
+    kEject = 74;
+    kForward = 75;
+    kBackward = 76;
+    kStopRecord = 77;
+    kPauseRecord = 78;
+    kReserved = 79;
+    kAngle = 80;
+    kSubPicture = 81;
+    kVideoOnDemand = 82;
+    kElectronicProgramGuide = 83;
+    kTimerProgramming = 84;
+    kInitialConfiguration = 85;
+    kSelectBroadcastType = 86;
+    kSelectSoundPresentation = 87;
+    kPlayFunction = 96;
+    kPausePlayFunction = 97;
+    kRecordFunction = 98;
+    kPauseRecordFunction = 99;
+    kStopFunction = 100;
+    kMuteFunction = 101;
+    kRestoreVolumeFunction = 102;
+    kTuneFunction = 103;
+    kSelectMediaFunction = 104;
+    kSelectAvInputFunction = 105;
+    kSelectAudioInputFunction = 106;
+    kPowerToggleFunction = 107;
+    kPowerOffFunction = 108;
+    kPowerOnFunction = 109;
+    kF1Blue = 113;
+    kF2Red = 114;
+    kF3Green = 115;
+    kF4Yellow = 116;
+    kF5 = 117;
+    kData = 118;
+  }
+
+  enum KeypadInputStatusEnum : ENUM8 {
     kSuccess = 0;
-    kTargetNotFound = 1;
-    kNotAllowed = 2;
+    kUnsupportedKey = 1;
+    kInvalidKeyInCurrentState = 2;
   }
 
-  struct TargetInfo {
-    int8u identifier = 0;
-    char_string<32> name = 1;
+  bitmap KeypadInputFeature : BITMAP32 {
+    kNavigationKeyCodes = 0x1;
+    kLocationKeys = 0x2;
+    kNumberKeys = 0x4;
   }
 
-  readonly attribute TargetInfo targetList[] = 0;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct NavigateTargetRequest {
-    INT8U target = 0;
-    optional CHAR_STRING data = 1;
+  request struct SendKeyRequest {
+    CecKeyCode keyCode = 0;
   }
 
-  command NavigateTarget(NavigateTargetRequest): NavigateTargetResponse = 0;
+  command SendKey(SendKeyRequest): SendKeyResponse = 0;
 }
 
-server cluster ThreadNetworkDiagnostics = 53 {
-  enum NetworkFault : ENUM8 {
-    kUnspecified = 0;
-    kLinkDown = 1;
-    kHardwareFailure = 2;
-    kNetworkJammed = 3;
+client cluster ContentLauncher = 1290 {
+  enum ContentLaunchStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kUrlNotAvailable = 1;
+    kAuthFailed = 2;
   }
 
-  enum RoutingRole : ENUM8 {
-    kUnspecified = 0;
-    kUnassigned = 1;
-    kSleepyEndDevice = 2;
-    kEndDevice = 3;
-    kReed = 4;
-    kRouter = 5;
-    kLeader = 6;
+  enum MetricTypeEnum : ENUM8 {
+    kPixels = 0;
+    kPercentage = 1;
   }
 
-  enum ThreadConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  enum ParameterEnum : ENUM8 {
+    kActor = 0;
+    kChannel = 1;
+    kCharacter = 2;
+    kDirector = 3;
+    kEvent = 4;
+    kFranchise = 5;
+    kGenre = 6;
+    kLeague = 7;
+    kPopularity = 8;
+    kProvider = 9;
+    kSport = 10;
+    kSportsTeam = 11;
+    kType = 12;
   }
 
-  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
-    kPacketCounts = 0x1;
-    kErrorCounts = 0x2;
-    kMLECounts = 0x4;
-    kMACCounts = 0x8;
+  bitmap ContentLauncherFeature : BITMAP32 {
+    kContentSearch = 0x1;
+    kURLPlayback = 0x2;
   }
 
-  struct NeighborTable {
-    int64u extAddress = 0;
-    int32u age = 1;
-    int16u rloc16 = 2;
-    int32u linkFrameCounter = 3;
-    int32u mleFrameCounter = 4;
-    int8u lqi = 5;
-    nullable int8s averageRssi = 6;
-    nullable int8s lastRssi = 7;
-    int8u frameErrorRate = 8;
-    int8u messageErrorRate = 9;
-    boolean rxOnWhenIdle = 10;
-    boolean fullThreadDevice = 11;
-    boolean fullNetworkData = 12;
-    boolean isChild = 13;
+  bitmap SupportedStreamingProtocol : BITMAP32 {
+    kDash = 0x1;
+    kHls = 0x2;
   }
 
-  struct RouteTable {
-    int64u extAddress = 0;
-    int16u rloc16 = 1;
-    int8u routerId = 2;
-    int8u nextHop = 3;
-    int8u pathCost = 4;
-    int8u LQIIn = 5;
-    int8u LQIOut = 6;
-    int8u age = 7;
-    boolean allocated = 8;
-    boolean linkEstablished = 9;
+  struct ContentSearch {
+    Parameter parameterList[] = 0;
   }
 
-  struct SecurityPolicy {
-    int16u rotationTime = 0;
-    bitmap16 flags = 1;
+  struct Parameter {
+    ParameterEnum type = 0;
+    char_string value = 1;
+    optional AdditionalInfo externalIDList[] = 2;
   }
 
-  struct OperationalDatasetComponents {
-    boolean activeTimestampPresent = 0;
-    boolean pendingTimestampPresent = 1;
-    boolean masterKeyPresent = 2;
-    boolean networkNamePresent = 3;
-    boolean extendedPanIdPresent = 4;
-    boolean meshLocalPrefixPresent = 5;
-    boolean delayPresent = 6;
-    boolean panIdPresent = 7;
-    boolean channelPresent = 8;
-    boolean pskcPresent = 9;
-    boolean securityPolicyPresent = 10;
-    boolean channelMaskPresent = 11;
+  struct AdditionalInfo {
+    char_string name = 0;
+    char_string value = 1;
+  }
+
+  struct BrandingInformation {
+    char_string providerName = 0;
+    optional StyleInformation background = 1;
+    optional StyleInformation logo = 2;
+    optional StyleInformation progressBar = 3;
+    optional StyleInformation splash = 4;
+    optional StyleInformation waterMark = 5;
   }
 
-  info event ConnectionStatus = 0 {
-    ThreadConnectionStatus connectionStatus = 0;
+  struct StyleInformation {
+    optional char_string imageUrl = 0;
+    optional char_string color = 1;
+    optional Dimension size = 2;
   }
 
-  readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable RoutingRole routingRole = 1;
-  readonly attribute nullable char_string<16> networkName = 2;
-  readonly attribute nullable int16u panId = 3;
-  readonly attribute nullable int64u extendedPanId = 4;
-  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute NeighborTable neighborTableList[] = 7;
-  readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
-  readonly attribute nullable int8u leaderRouterId = 13;
-  readonly attribute int16u detachedRoleCount = 14;
-  readonly attribute int16u childRoleCount = 15;
-  readonly attribute int16u routerRoleCount = 16;
-  readonly attribute int16u leaderRoleCount = 17;
-  readonly attribute int16u attachAttemptCount = 18;
-  readonly attribute int16u partitionIdChangeCount = 19;
-  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
-  readonly attribute int16u parentChangeCount = 21;
-  readonly attribute int32u txTotalCount = 22;
-  readonly attribute int32u txUnicastCount = 23;
-  readonly attribute int32u txBroadcastCount = 24;
-  readonly attribute int32u txAckRequestedCount = 25;
-  readonly attribute int32u txAckedCount = 26;
-  readonly attribute int32u txNoAckRequestedCount = 27;
-  readonly attribute int32u txDataCount = 28;
-  readonly attribute int32u txDataPollCount = 29;
-  readonly attribute int32u txBeaconCount = 30;
-  readonly attribute int32u txBeaconRequestCount = 31;
-  readonly attribute int32u txOtherCount = 32;
-  readonly attribute int32u txRetryCount = 33;
-  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
-  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
-  readonly attribute int32u txErrCcaCount = 36;
-  readonly attribute int32u txErrAbortCount = 37;
-  readonly attribute int32u txErrBusyChannelCount = 38;
-  readonly attribute int32u rxTotalCount = 39;
-  readonly attribute int32u rxUnicastCount = 40;
-  readonly attribute int32u rxBroadcastCount = 41;
-  readonly attribute int32u rxDataCount = 42;
-  readonly attribute int32u rxDataPollCount = 43;
-  readonly attribute int32u rxBeaconCount = 44;
-  readonly attribute int32u rxBeaconRequestCount = 45;
-  readonly attribute int32u rxOtherCount = 46;
-  readonly attribute int32u rxAddressFilteredCount = 47;
-  readonly attribute int32u rxDestAddrFilteredCount = 48;
-  readonly attribute int32u rxDuplicatedCount = 49;
-  readonly attribute int32u rxErrNoFrameCount = 50;
-  readonly attribute int32u rxErrUnknownNeighborCount = 51;
-  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
-  readonly attribute int32u rxErrSecCount = 53;
-  readonly attribute int32u rxErrFcsCount = 54;
-  readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute nullable int64u activeTimestamp = 56;
-  readonly attribute nullable int64u pendingTimestamp = 57;
-  readonly attribute nullable int32u delay = 58;
-  readonly attribute nullable SecurityPolicy securityPolicy = 59;
-  readonly attribute nullable octet_string<4> channelMask = 60;
-  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
-  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
-  readonly attribute bitmap32 featureMap = 65532;
+  struct Dimension {
+    double width = 0;
+    double height = 1;
+    MetricTypeEnum metric = 2;
+  }
+
+  readonly attribute CHAR_STRING acceptHeader[] = 0;
+  attribute bitmap32 supportedStreamingProtocols = 1;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
+  request struct LaunchContentRequest {
+    ContentSearch search = 0;
+    BOOLEAN autoPlay = 1;
+    optional CHAR_STRING data = 2;
   }
 
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
+  request struct LaunchURLRequest {
+    CHAR_STRING contentURL = 0;
+    optional CHAR_STRING displayString = 1;
+    optional BrandingInformation brandingInformation = 2;
   }
 
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command LaunchContent(LaunchContentRequest): LaunchResponse = 0;
+  command LaunchURL(LaunchURLRequest): LaunchResponse = 1;
 }
 
-server cluster UnitLocalization = 45 {
-  enum TempUnit : ENUM8 {
-    kFahrenheit = 0;
-    kCelsius = 1;
-    kKelvin = 2;
+client cluster AudioOutput = 1291 {
+  enum OutputTypeEnum : ENUM8 {
+    kHdmi = 0;
+    kBt = 1;
+    kOptical = 2;
+    kHeadphone = 3;
+    kInternal = 4;
+    kOther = 5;
   }
 
-  bitmap UnitLocalizationFeature : BITMAP32 {
-    kTemperatureUnit = 0x1;
+  bitmap AudioOutputFeature : BITMAP32 {
+    kNameUpdates = 0x1;
   }
 
-  attribute TempUnit temperatureUnit = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  struct OutputInfo {
+    int8u index = 0;
+    OutputTypeEnum outputType = 1;
+    char_string<32> name = 2;
+  }
 
-server cluster UserLabel = 65 {
-  attribute access(write: manage) LabelStruct labelList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute OutputInfo outputList[] = 0;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster WakeOnLan = 1283 {
-  readonly attribute char_string<32> MACAddress = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  request struct SelectOutputRequest {
+    INT8U index = 0;
+  }
+
+  request struct RenameOutputRequest {
+    INT8U index = 0;
+    CHAR_STRING name = 1;
+  }
+
+  command SelectOutput(SelectOutputRequest): DefaultSuccess = 0;
+  command RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
 }
 
-server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCause : ENUM8 {
-    kUnknown = 0;
-    kAssociationFailed = 1;
-    kAuthenticationFailed = 2;
-    kSsidNotFound = 3;
+client cluster ApplicationLauncher = 1292 {
+  enum ApplicationLauncherStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kAppNotAvailable = 1;
+    kSystemBusy = 2;
   }
 
-  enum SecurityType : ENUM8 {
-    kUnspecified = 0;
-    kNone = 1;
-    kWep = 2;
-    kWpa = 3;
-    kWpa2 = 4;
-    kWpa3 = 5;
+  bitmap ApplicationLauncherFeature : BITMAP32 {
+    kApplicationPlatform = 0x1;
   }
 
-  enum WiFiConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  struct Application {
+    int16u catalogVendorId = 0;
+    char_string applicationId = 1;
   }
 
-  enum WiFiVersionType : ENUM8 {
-    k80211a = 0;
-    k80211b = 1;
-    k80211g = 2;
-    k80211n = 3;
-    k80211ac = 4;
-    k80211ax = 5;
+  readonly attribute INT16U catalogList[] = 0;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct LaunchAppRequest {
+    Application application = 0;
+    optional OCTET_STRING data = 1;
   }
 
-  info event Disconnection = 0 {
-    INT16U reasonCode = 0;
+  request struct StopAppRequest {
+    Application application = 0;
   }
 
-  info event AssociationFailure = 1 {
-    AssociationFailureCause associationFailure = 0;
-    INT16U status = 1;
+  request struct HideAppRequest {
+    Application application = 0;
   }
 
-  info event ConnectionStatus = 2 {
-    WiFiConnectionStatus connectionStatus = 0;
+  command LaunchApp(LaunchAppRequest): LauncherResponse = 0;
+  command StopApp(StopAppRequest): LauncherResponse = 1;
+  command HideApp(HideAppRequest): LauncherResponse = 2;
+}
+
+client cluster ApplicationBasic = 1293 {
+  enum ApplicationStatusEnum : ENUM8 {
+    kStopped = 0;
+    kActiveVisibleFocus = 1;
+    kActiveHidden = 2;
+    kActiveVisibleNotFocus = 3;
   }
 
-  readonly attribute nullable octet_string<6> bssid = 0;
-  readonly attribute nullable SecurityType securityType = 1;
-  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
-  readonly attribute nullable int16u channelNumber = 3;
-  readonly attribute nullable int8s rssi = 4;
-  readonly attribute int32u beaconLostCount = 5;
-  readonly attribute int32u beaconRxCount = 6;
-  readonly attribute int32u packetMulticastRxCount = 7;
-  readonly attribute int32u packetMulticastTxCount = 8;
-  readonly attribute int32u packetUnicastRxCount = 9;
-  readonly attribute int32u packetUnicastTxCount = 10;
-  readonly attribute int64u currentMaxRate = 11;
-  readonly attribute int64u overrunCount = 12;
-  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute char_string<32> vendorName = 0;
+  readonly attribute int16u vendorID = 1;
+  readonly attribute char_string<32> applicationName = 2;
+  readonly attribute int16u productID = 3;
+  readonly attribute ApplicationStatusEnum status = 5;
+  readonly attribute char_string<32> applicationVersion = 6;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+client cluster AccountLogin = 1294 {
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct GetSetupPINRequest {
+    CHAR_STRING tempAccountIdentifier = 0;
+  }
+
+  request struct LoginRequest {
+    CHAR_STRING tempAccountIdentifier = 0;
+    CHAR_STRING setupPIN = 1;
+  }
+
+  timed command GetSetupPIN(GetSetupPINRequest): GetSetupPINResponse = 0;
+  timed command Login(LoginRequest): DefaultSuccess = 2;
+  timed command Logout(): DefaultSuccess = 3;
 }
 
 endpoint 0 {
diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter
index 20c5a7e539dc90..d2716f2130a26e 100644
--- a/examples/window-app/common/window-app.matter
+++ b/examples/window-app/common/window-app.matter
@@ -6,6 +6,228 @@ struct LabelStruct {
     char_string<16> value = 1;
 }
 
+server cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
+  }
+
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
+  }
+
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
+  }
+
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
+  }
+
+  request struct TriggerEffectRequest {
+    IdentifyEffectIdentifier effectIdentifier = 0;
+    IdentifyEffectVariant effectVariant = 1;
+  }
+
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+  command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
+}
+
+server cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AddGroupRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
+
+  request struct ViewGroupRequest {
+    group_id groupId = 0;
+  }
+
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
+  }
+
+  request struct RemoveGroupRequest {
+    group_id groupId = 0;
+  }
+
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
+  }
+
+  response struct AddGroupResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  response struct ViewGroupResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    CHAR_STRING groupName = 2;
+  }
+
+  response struct GetGroupMembershipResponse = 2 {
+    nullable INT8U capacity = 0;
+    group_id groupList[] = 1;
+  }
+
+  response struct RemoveGroupResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
+}
+
+client cluster Scenes = 5 {
+  bitmap ScenesCopyMode : BITMAP8 {
+    kCopyAllScenes = 0x1;
+  }
+
+  struct ExtensionFieldSet {
+    cluster_id clusterId = 0;
+    AttributeValuePair attributeValueList[] = 1;
+  }
+
+  struct AttributeValuePair {
+    optional attrib_id attributeId = 0;
+    int8u attributeValue[] = 1;
+  }
+
+  readonly attribute int8u sceneCount = 0;
+  readonly attribute int8u currentScene = 1;
+  readonly attribute group_id currentGroup = 2;
+  readonly attribute boolean sceneValid = 3;
+  readonly attribute bitmap8 nameSupport = 4;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AddSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    INT16U transitionTime = 2;
+    CHAR_STRING sceneName = 3;
+    ExtensionFieldSet extensionFieldSets[] = 4;
+  }
+
+  request struct ViewSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+  }
+
+  request struct RemoveSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+  }
+
+  request struct RemoveAllScenesRequest {
+    group_id groupId = 0;
+  }
+
+  request struct StoreSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+  }
+
+  request struct RecallSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    optional nullable INT16U transitionTime = 2;
+  }
+
+  request struct GetSceneMembershipRequest {
+    group_id groupId = 0;
+  }
+
+  response struct AddSceneResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+  }
+
+  response struct ViewSceneResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+    optional INT16U transitionTime = 3;
+    optional CHAR_STRING sceneName = 4;
+    optional ExtensionFieldSet extensionFieldSets[] = 5;
+  }
+
+  response struct RemoveSceneResponse = 2 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+  }
+
+  response struct RemoveAllScenesResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  response struct StoreSceneResponse = 4 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+  }
+
+  response struct GetSceneMembershipResponse = 6 {
+    ENUM8 status = 0;
+    nullable INT8U capacity = 1;
+    group_id groupId = 2;
+    optional INT8U sceneList[] = 3;
+  }
+
+  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
+  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
+  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
+  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
+  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
+  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
+  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
+}
+
+server cluster Descriptor = 29 {
+  struct DeviceType {
+    devtype_id type = 0;
+    int16u revision = 1;
+  }
+
+  readonly attribute DeviceType deviceList[] = 0;
+  readonly attribute CLUSTER_ID serverList[] = 1;
+  readonly attribute CLUSTER_ID clientList[] = 2;
+  readonly attribute ENDPOINT_NO partsList[] = 3;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
 server cluster AccessControl = 31 {
   enum AuthMode : ENUM8 {
     kPase = 1;
@@ -74,59 +296,20 @@ server cluster AccessControl = 31 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
+server cluster Basic = 40 {
+  struct CapabilityMinimaStruct {
+    int16u caseSessionsPerFabric = 0;
+    int16u subscriptionsPerFabric = 1;
   }
 
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
+  critical event StartUp = 0 {
+    INT32U softwareVersion = 0;
   }
 
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
+  critical event ShutDown = 1 {
   }
 
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-  }
-
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
-}
-
-server cluster Basic = 40 {
-  struct CapabilityMinimaStruct {
-    int16u caseSessionsPerFabric = 0;
-    int16u subscriptionsPerFabric = 1;
-  }
-
-  critical event StartUp = 0 {
-    INT32U softwareVersion = 0;
-  }
-
-  critical event ShutDown = 1 {
-  }
-
-  info event Leave = 2 {
+  info event Leave = 2 {
   }
 
   info event ReachableChanged = 3 {
@@ -160,395 +343,338 @@ server cluster Basic = 40 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster Descriptor = 29 {
-  struct DeviceType {
-    devtype_id type = 0;
-    int16u revision = 1;
-  }
-
-  readonly attribute DeviceType deviceList[] = 0;
-  readonly attribute CLUSTER_ID serverList[] = 1;
-  readonly attribute CLUSTER_ID clientList[] = 2;
-  readonly attribute ENDPOINT_NO partsList[] = 3;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateType : ENUM8 {
-    k10m = 0;
-    k100m = 1;
-    k1000m = 2;
-    k25g = 3;
-    k5g = 4;
-    k10g = 5;
-    k40g = 6;
-    k100g = 7;
-    k200g = 8;
-    k400g = 9;
-  }
-
-  readonly attribute nullable PHYRateType PHYRate = 0;
-  readonly attribute nullable boolean fullDuplex = 1;
-  readonly attribute int64u packetRxCount = 2;
-  readonly attribute int64u packetTxCount = 3;
-  readonly attribute int64u txErrCount = 4;
-  readonly attribute int64u collisionCount = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute nullable boolean carrierDetect = 7;
-  readonly attribute int64u timeSinceReset = 8;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster GeneralCommissioning = 48 {
-  enum CommissioningError : ENUM8 {
-    kOk = 0;
-    kValueOutsideRange = 1;
-    kInvalidAuthentication = 2;
-    kNoFailSafe = 3;
-    kBusyWithOtherAdmin = 4;
+client cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
   }
 
-  enum RegulatoryLocationType : ENUM8 {
-    kIndoor = 0;
-    kOutdoor = 1;
-    kIndoorOutdoor = 2;
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
   }
 
-  struct BasicCommissioningInfo {
-    int16u failSafeExpiryLengthSeconds = 0;
-    int16u maxCumulativeFailsafeSeconds = 1;
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
   }
 
-  attribute access(write: administer) int64u breadcrumb = 0;
-  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
-  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
-  readonly attribute RegulatoryLocationType locationCapability = 3;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct ArmFailSafeRequest {
-    INT16U expiryLengthSeconds = 0;
-    INT64U breadcrumb = 1;
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
   }
 
-  request struct SetRegulatoryConfigRequest {
-    RegulatoryLocationType newRegulatoryConfig = 0;
-    CHAR_STRING countryCode = 1;
-    INT64U breadcrumb = 2;
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
   }
 
-  response struct ArmFailSafeResponse = 1 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
   }
 
-  response struct SetRegulatoryConfigResponse = 3 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  response struct QueryImageResponse = 1 {
+    OTAQueryStatus status = 0;
+    optional INT32U delayedActionTime = 1;
+    optional CHAR_STRING imageURI = 2;
+    optional INT32U softwareVersion = 3;
+    optional CHAR_STRING softwareVersionString = 4;
+    optional OCTET_STRING updateToken = 5;
+    optional BOOLEAN userConsentNeeded = 6;
+    optional OCTET_STRING metadataForRequestor = 7;
   }
 
-  response struct CommissioningCompleteResponse = 5 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
   }
 
-  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
-  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
-  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
 }
 
-server cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
-  }
-
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
+server cluster OtaSoftwareUpdateRequestor = 42 {
+  enum OTAAnnouncementReason : ENUM8 {
+    kSimpleAnnouncement = 0;
+    kUpdateAvailable = 1;
+    kUrgentUpdateAvailable = 2;
   }
 
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
+  enum OTAChangeReasonEnum : ENUM8 {
+    kUnknown = 0;
+    kSuccess = 1;
+    kFailure = 2;
+    kTimeOut = 3;
+    kDelayByProvider = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
-    kUnspecified = 0;
-    kHardwareFailure = 1;
-    kNetworkJammed = 2;
-    kConnectionFailed = 3;
+  enum OTAUpdateStateEnum : ENUM8 {
+    kUnknown = 0;
+    kIdle = 1;
+    kQuerying = 2;
+    kDelayedOnQuery = 3;
+    kDownloading = 4;
+    kApplying = 5;
+    kDelayedOnApply = 6;
+    kRollingBack = 7;
+    kDelayedOnUserConsent = 8;
   }
 
-  enum RadioFaultType : ENUM8 {
-    kUnspecified = 0;
-    kWiFiFault = 1;
-    kCellularFault = 2;
-    kThreadFault = 3;
-    kNFCFault = 4;
-    kBLEFault = 5;
-    kEthernetFault = 6;
+  struct ProviderLocation {
+    node_id providerNodeID = 1;
+    endpoint_no endpoint = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  struct NetworkInterfaceType {
-    char_string<32> name = 0;
-    boolean isOperational = 1;
-    nullable boolean offPremiseServicesReachableIPv4 = 2;
-    nullable boolean offPremiseServicesReachableIPv6 = 3;
-    octet_string<8> hardwareAddress = 4;
-    octet_string IPv4Addresses[] = 5;
-    octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+  info event StateTransition = 0 {
+    OTAUpdateStateEnum previousState = 0;
+    OTAUpdateStateEnum newState = 1;
+    OTAChangeReasonEnum reason = 2;
+    nullable INT32U targetSoftwareVersion = 3;
   }
 
-  critical event HardwareFaultChange = 0 {
-    HardwareFaultType current[] = 0;
-    HardwareFaultType previous[] = 1;
+  critical event VersionApplied = 1 {
+    INT32U softwareVersion = 0;
+    INT16U productID = 1;
   }
 
-  critical event RadioFaultChange = 1 {
-    RadioFaultType current[] = 0;
-    RadioFaultType previous[] = 1;
+  info event DownloadError = 2 {
+    INT32U softwareVersion = 0;
+    INT64U bytesDownloaded = 1;
+    nullable INT8U progressPercent = 2;
+    nullable INT64S platformCode = 3;
   }
 
-  critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
-  }
+  attribute ProviderLocation defaultOtaProviders[] = 0;
+  readonly attribute boolean updatePossible = 1;
+  readonly attribute OTAUpdateStateEnum updateState = 2;
+  readonly attribute nullable int8u updateStateProgress = 3;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  critical event BootReason = 3 {
-    BootReasonType bootReason = 0;
+  request struct AnnounceOtaProviderRequest {
+    node_id providerNodeId = 0;
+    vendor_id vendorId = 1;
+    OTAAnnouncementReason announcementReason = 2;
+    optional OCTET_STRING metadataForNode = 3;
+    endpoint_no endpoint = 4;
   }
 
-  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
-  readonly attribute int16u rebootCount = 1;
-  readonly attribute int64u upTime = 2;
-  readonly attribute int32u totalOperationalHours = 3;
-  readonly attribute enum8 bootReasons = 4;
-  readonly attribute ENUM8 activeHardwareFaults[] = 5;
-  readonly attribute ENUM8 activeRadioFaults[] = 6;
-  readonly attribute ENUM8 activeNetworkFaults[] = 7;
-  readonly attribute boolean testEventTriggersEnabled = 8;
+  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
+}
+
+server cluster LocalizationConfiguration = 43 {
+  attribute char_string<35> activeLocale = 0;
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-
-  request struct TestEventTriggerRequest {
-    OCTET_STRING enableKey = 0;
-    INT64U eventTrigger = 1;
-  }
-
-  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
 }
 
-server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicy : ENUM8 {
-    kTrustFirst = 0;
-    kCacheAndSync = 1;
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
   }
 
-  struct GroupKeyMapStruct {
-    group_id groupId = 1;
-    int16u groupKeySetID = 2;
-    fabric_idx fabricIndex = 254;
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
   }
 
-  struct GroupInfoMapStruct {
-    group_id groupId = 1;
-    endpoint_no endpoints[] = 2;
-    optional char_string<16> groupName = 3;
-    fabric_idx fabricIndex = 254;
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster UnitLocalization = 45 {
+  enum TempUnit : ENUM8 {
+    kFahrenheit = 0;
+    kCelsius = 1;
+    kKelvin = 2;
   }
 
-  struct GroupKeySetStruct {
-    int16u groupKeySetID = 0;
-    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
-    nullable octet_string<16> epochKey0 = 2;
-    nullable epoch_us epochStartTime0 = 3;
-    nullable octet_string<16> epochKey1 = 4;
-    nullable epoch_us epochStartTime1 = 5;
-    nullable octet_string<16> epochKey2 = 6;
-    nullable epoch_us epochStartTime2 = 7;
+  bitmap UnitLocalizationFeature : BITMAP32 {
+    kTemperatureUnit = 0x1;
   }
 
-  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
-  readonly attribute GroupInfoMapStruct groupTable[] = 1;
-  readonly attribute int16u maxGroupsPerFabric = 2;
-  readonly attribute int16u maxGroupKeysPerFabric = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct KeySetWriteRequest {
-    GroupKeySetStruct groupKeySet = 0;
+server cluster PowerSource = 47 {
+  enum BatChargeFaultType : ENUM8 {
+    kUnspecfied = 0;
+    kAmbientTooHot = 1;
+    kAmbientTooCold = 2;
+    kBatteryTooHot = 3;
+    kBatteryTooCold = 4;
+    kBatteryAbsent = 5;
+    kBatteryOverVoltage = 6;
+    kBatteryUnderVoltage = 7;
+    kChargerOverVoltage = 8;
+    kChargerUnderVoltage = 9;
+    kSafetyTimeout = 10;
   }
 
-  request struct KeySetReadRequest {
-    INT16U groupKeySetID = 0;
+  enum BatChargeLevel : ENUM8 {
+    kOk = 0;
+    kWarning = 1;
+    kCritical = 2;
   }
 
-  request struct KeySetRemoveRequest {
-    INT16U groupKeySetID = 0;
+  enum BatChargeState : ENUM8 {
+    kUnknown = 0;
+    kIsCharging = 1;
+    kIsAtFullCharge = 2;
+    kIsNotCharging = 3;
   }
 
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
+  enum BatFaultType : ENUM8 {
+    kUnspecfied = 0;
+    kOverTemp = 1;
+    kUnderTemp = 2;
   }
 
-  response struct KeySetReadResponse = 2 {
-    GroupKeySetStruct groupKeySet = 0;
+  enum BatReplaceability : ENUM8 {
+    kUnspecified = 0;
+    kNotReplaceable = 1;
+    kUserReplaceable = 2;
+    kFactoryReplaceable = 3;
   }
 
-  response struct KeySetReadAllIndicesResponse = 5 {
-    INT16U groupKeySetIDs[] = 0;
+  enum PowerSourceStatus : ENUM8 {
+    kUnspecfied = 0;
+    kActive = 1;
+    kStandby = 2;
+    kUnavailable = 3;
   }
 
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
-}
+  enum WiredCurrentType : ENUM8 {
+    kAc = 0;
+    kDc = 1;
+  }
 
-server cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
+  enum WiredFaultType : ENUM8 {
+    kUnspecfied = 0;
+    kOverVoltage = 1;
+    kUnderVoltage = 2;
+  }
+
+  bitmap PowerSourceFeature : BITMAP32 {
+    kWired = 0x1;
+    kBattery = 0x2;
+    kRechargeable = 0x4;
+    kReplaceable = 0x8;
+  }
+
+  readonly attribute enum8 status = 0;
+  readonly attribute int8u order = 1;
+  readonly attribute char_string<60> description = 2;
+  readonly attribute int32u batteryVoltage = 11;
+  readonly attribute int8u batteryPercentRemaining = 12;
+  readonly attribute int32u batteryTimeRemaining = 13;
+  readonly attribute enum8 batteryChargeLevel = 14;
+  readonly attribute ENUM8 activeBatteryFaults[] = 18;
+  readonly attribute enum8 batteryChargeState = 26;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct AddGroupRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+server cluster GeneralCommissioning = 48 {
+  enum CommissioningError : ENUM8 {
+    kOk = 0;
+    kValueOutsideRange = 1;
+    kInvalidAuthentication = 2;
+    kNoFailSafe = 3;
+    kBusyWithOtherAdmin = 4;
   }
 
-  request struct ViewGroupRequest {
-    group_id groupId = 0;
+  enum RegulatoryLocationType : ENUM8 {
+    kIndoor = 0;
+    kOutdoor = 1;
+    kIndoorOutdoor = 2;
   }
 
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
+  struct BasicCommissioningInfo {
+    int16u failSafeExpiryLengthSeconds = 0;
+    int16u maxCumulativeFailsafeSeconds = 1;
   }
 
-  request struct RemoveGroupRequest {
-    group_id groupId = 0;
-  }
+  attribute access(write: administer) int64u breadcrumb = 0;
+  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
+  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
+  readonly attribute RegulatoryLocationType locationCapability = 3;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
+  request struct ArmFailSafeRequest {
+    INT16U expiryLengthSeconds = 0;
+    INT64U breadcrumb = 1;
   }
 
-  response struct AddGroupResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  request struct SetRegulatoryConfigRequest {
+    RegulatoryLocationType newRegulatoryConfig = 0;
+    CHAR_STRING countryCode = 1;
+    INT64U breadcrumb = 2;
   }
 
-  response struct ViewGroupResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    CHAR_STRING groupName = 2;
+  response struct ArmFailSafeResponse = 1 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  response struct GetGroupMembershipResponse = 2 {
-    nullable INT8U capacity = 0;
-    group_id groupList[] = 1;
+  response struct SetRegulatoryConfigResponse = 3 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  response struct RemoveGroupResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  response struct CommissioningCompleteResponse = 5 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
-}
-
-server cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
-  }
-
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
-  }
-
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
-  }
-
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
-  }
-
-  request struct TriggerEffectRequest {
-    IdentifyEffectIdentifier effectIdentifier = 0;
-    IdentifyEffectVariant effectVariant = 1;
-  }
-
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
-  command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
-}
-
-server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
+  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
+  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
 }
 
 server cluster NetworkCommissioning = 49 {
@@ -688,730 +814,604 @@ server cluster NetworkCommissioning = 49 {
   command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
 }
 
-client cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
   }
 
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
   }
 
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
   }
 
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
   }
 
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
+  enum RadioFaultType : ENUM8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
   }
 
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
+  struct NetworkInterfaceType {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceType type = 7;
   }
 
-  response struct QueryImageResponse = 1 {
-    OTAQueryStatus status = 0;
-    optional INT32U delayedActionTime = 1;
-    optional CHAR_STRING imageURI = 2;
-    optional INT32U softwareVersion = 3;
-    optional CHAR_STRING softwareVersionString = 4;
-    optional OCTET_STRING updateToken = 5;
-    optional BOOLEAN userConsentNeeded = 6;
-    optional OCTET_STRING metadataForRequestor = 7;
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultType current[] = 0;
+    HardwareFaultType previous[] = 1;
   }
 
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
+  critical event RadioFaultChange = 1 {
+    RadioFaultType current[] = 0;
+    RadioFaultType previous[] = 1;
   }
 
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
-}
-
-server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum OTAAnnouncementReason : ENUM8 {
-    kSimpleAnnouncement = 0;
-    kUpdateAvailable = 1;
-    kUrgentUpdateAvailable = 2;
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultType current[] = 0;
+    NetworkFaultType previous[] = 1;
   }
 
-  enum OTAChangeReasonEnum : ENUM8 {
-    kUnknown = 0;
-    kSuccess = 1;
-    kFailure = 2;
-    kTimeOut = 3;
-    kDelayByProvider = 4;
+  critical event BootReason = 3 {
+    BootReasonType bootReason = 0;
   }
 
-  enum OTAUpdateStateEnum : ENUM8 {
-    kUnknown = 0;
-    kIdle = 1;
-    kQuerying = 2;
-    kDelayedOnQuery = 3;
-    kDownloading = 4;
-    kApplying = 5;
-    kDelayedOnApply = 6;
-    kRollingBack = 7;
-    kDelayedOnUserConsent = 8;
-  }
+  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
+  readonly attribute int32u totalOperationalHours = 3;
+  readonly attribute enum8 bootReasons = 4;
+  readonly attribute ENUM8 activeHardwareFaults[] = 5;
+  readonly attribute ENUM8 activeRadioFaults[] = 6;
+  readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  struct ProviderLocation {
-    node_id providerNodeID = 1;
-    endpoint_no endpoint = 2;
-    fabric_idx fabricIndex = 254;
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
   }
 
-  info event StateTransition = 0 {
-    OTAUpdateStateEnum previousState = 0;
-    OTAUpdateStateEnum newState = 1;
-    OTAChangeReasonEnum reason = 2;
-    nullable INT32U targetSoftwareVersion = 3;
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+}
+
+server cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
   }
 
-  critical event VersionApplied = 1 {
-    INT32U softwareVersion = 0;
-    INT16U productID = 1;
+  struct ThreadMetrics {
+    int64u id = 0;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
-  info event DownloadError = 2 {
-    INT32U softwareVersion = 0;
-    INT64U bytesDownloaded = 1;
-    nullable INT8U progressPercent = 2;
-    nullable INT64S platformCode = 3;
+  info event SoftwareFault = 0 {
+    SoftwareFaultStruct softwareFault = 0;
   }
 
-  attribute ProviderLocation defaultOtaProviders[] = 0;
-  readonly attribute boolean updatePossible = 1;
-  readonly attribute OTAUpdateStateEnum updateState = 2;
-  readonly attribute nullable int8u updateStateProgress = 3;
+  readonly attribute ThreadMetrics threadMetrics[] = 0;
+  readonly attribute int64u currentHeapFree = 1;
+  readonly attribute int64u currentHeapUsed = 2;
+  readonly attribute int64u currentHeapHighWatermark = 3;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct AnnounceOtaProviderRequest {
-    node_id providerNodeId = 0;
-    vendor_id vendorId = 1;
-    OTAAnnouncementReason announcementReason = 2;
-    optional OCTET_STRING metadataForNode = 3;
-    endpoint_no endpoint = 4;
-  }
-
-  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
+  command ResetWatermarks(): DefaultSuccess = 0;
 }
 
-server cluster OperationalCredentials = 62 {
-  enum OperationalCertStatus : ENUM8 {
-    kSuccess = 0;
-    kInvalidPublicKey = 1;
-    kInvalidNodeOpId = 2;
-    kInvalidNOC = 3;
-    kMissingCsr = 4;
-    kTableFull = 5;
-    kInvalidAdminSubject = 6;
-    kInsufficientPrivilege = 8;
-    kFabricConflict = 9;
-    kLabelConflict = 10;
-    kInvalidFabricIndex = 11;
-  }
-
-  struct NOCStruct {
-    octet_string noc = 1;
-    nullable octet_string icac = 2;
-    fabric_idx fabricIndex = 254;
-  }
-
-  struct FabricDescriptor {
-    octet_string<65> rootPublicKey = 1;
-    vendor_id vendorId = 2;
-    fabric_id fabricId = 3;
-    node_id nodeId = 4;
-    char_string<32> label = 5;
-    fabric_idx fabricIndex = 254;
-  }
-
-  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
-  readonly attribute FabricDescriptor fabrics[] = 1;
-  readonly attribute int8u supportedFabrics = 2;
-  readonly attribute int8u commissionedFabrics = 3;
-  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
-  readonly attribute fabric_idx currentFabricIndex = 5;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AttestationRequestRequest {
-    OCTET_STRING attestationNonce = 0;
-  }
-
-  request struct CertificateChainRequestRequest {
-    INT8U certificateType = 0;
-  }
-
-  request struct CSRRequestRequest {
-    OCTET_STRING CSRNonce = 0;
-    optional boolean isForUpdateNOC = 1;
-  }
-
-  request struct AddNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
-    OCTET_STRING IPKValue = 2;
-    Int64u caseAdminSubject = 3;
-    VENDOR_ID adminVendorId = 4;
-  }
-
-  request struct UpdateNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
-  }
-
-  request struct UpdateFabricLabelRequest {
-    CHAR_STRING label = 0;
-  }
-
-  request struct RemoveFabricRequest {
-    fabric_idx fabricIndex = 0;
-  }
-
-  request struct AddTrustedRootCertificateRequest {
-    OCTET_STRING rootCertificate = 0;
-  }
-
-  response struct AttestationResponse = 1 {
-    OCTET_STRING attestationElements = 0;
-    OCTET_STRING signature = 1;
-  }
-
-  response struct CertificateChainResponse = 3 {
-    OCTET_STRING certificate = 0;
-  }
-
-  response struct CSRResponse = 5 {
-    OCTET_STRING NOCSRElements = 0;
-    OCTET_STRING attestationSignature = 1;
-  }
-
-  response struct NOCResponse = 8 {
-    OperationalCertStatus statusCode = 0;
-    optional fabric_idx fabricIndex = 1;
-    optional CHAR_STRING debugText = 2;
-  }
-
-  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
-  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
-  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
-  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
-  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
-  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
-  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
-  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-}
-
-server cluster PowerSource = 47 {
-  enum BatChargeFaultType : ENUM8 {
-    kUnspecfied = 0;
-    kAmbientTooHot = 1;
-    kAmbientTooCold = 2;
-    kBatteryTooHot = 3;
-    kBatteryTooCold = 4;
-    kBatteryAbsent = 5;
-    kBatteryOverVoltage = 6;
-    kBatteryUnderVoltage = 7;
-    kChargerOverVoltage = 8;
-    kChargerUnderVoltage = 9;
-    kSafetyTimeout = 10;
+server cluster ThreadNetworkDiagnostics = 53 {
+  enum NetworkFault : ENUM8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
   }
 
-  enum BatChargeLevel : ENUM8 {
-    kOk = 0;
-    kWarning = 1;
-    kCritical = 2;
+  enum RoutingRole : ENUM8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kReed = 4;
+    kRouter = 5;
+    kLeader = 6;
   }
 
-  enum BatChargeState : ENUM8 {
-    kUnknown = 0;
-    kIsCharging = 1;
-    kIsAtFullCharge = 2;
-    kIsNotCharging = 3;
+  enum ThreadConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  enum BatFaultType : ENUM8 {
-    kUnspecfied = 0;
-    kOverTemp = 1;
-    kUnderTemp = 2;
+  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+    kMLECounts = 0x4;
+    kMACCounts = 0x8;
   }
 
-  enum BatReplaceability : ENUM8 {
-    kUnspecified = 0;
-    kNotReplaceable = 1;
-    kUserReplaceable = 2;
-    kFactoryReplaceable = 3;
+  struct NeighborTable {
+    int64u extAddress = 0;
+    int32u age = 1;
+    int16u rloc16 = 2;
+    int32u linkFrameCounter = 3;
+    int32u mleFrameCounter = 4;
+    int8u lqi = 5;
+    nullable int8s averageRssi = 6;
+    nullable int8s lastRssi = 7;
+    int8u frameErrorRate = 8;
+    int8u messageErrorRate = 9;
+    boolean rxOnWhenIdle = 10;
+    boolean fullThreadDevice = 11;
+    boolean fullNetworkData = 12;
+    boolean isChild = 13;
   }
 
-  enum PowerSourceStatus : ENUM8 {
-    kUnspecfied = 0;
-    kActive = 1;
-    kStandby = 2;
-    kUnavailable = 3;
+  struct RouteTable {
+    int64u extAddress = 0;
+    int16u rloc16 = 1;
+    int8u routerId = 2;
+    int8u nextHop = 3;
+    int8u pathCost = 4;
+    int8u LQIIn = 5;
+    int8u LQIOut = 6;
+    int8u age = 7;
+    boolean allocated = 8;
+    boolean linkEstablished = 9;
   }
 
-  enum WiredCurrentType : ENUM8 {
-    kAc = 0;
-    kDc = 1;
+  struct SecurityPolicy {
+    int16u rotationTime = 0;
+    bitmap16 flags = 1;
   }
 
-  enum WiredFaultType : ENUM8 {
-    kUnspecfied = 0;
-    kOverVoltage = 1;
-    kUnderVoltage = 2;
+  struct OperationalDatasetComponents {
+    boolean activeTimestampPresent = 0;
+    boolean pendingTimestampPresent = 1;
+    boolean masterKeyPresent = 2;
+    boolean networkNamePresent = 3;
+    boolean extendedPanIdPresent = 4;
+    boolean meshLocalPrefixPresent = 5;
+    boolean delayPresent = 6;
+    boolean panIdPresent = 7;
+    boolean channelPresent = 8;
+    boolean pskcPresent = 9;
+    boolean securityPolicyPresent = 10;
+    boolean channelMaskPresent = 11;
   }
 
-  bitmap PowerSourceFeature : BITMAP32 {
-    kWired = 0x1;
-    kBattery = 0x2;
-    kRechargeable = 0x4;
-    kReplaceable = 0x8;
+  info event ConnectionStatus = 0 {
+    ThreadConnectionStatus connectionStatus = 0;
   }
 
-  readonly attribute enum8 status = 0;
-  readonly attribute int8u order = 1;
-  readonly attribute char_string<60> description = 2;
-  readonly attribute int32u batteryVoltage = 11;
-  readonly attribute int8u batteryPercentRemaining = 12;
-  readonly attribute int32u batteryTimeRemaining = 13;
-  readonly attribute enum8 batteryChargeLevel = 14;
-  readonly attribute ENUM8 activeBatteryFaults[] = 18;
-  readonly attribute enum8 batteryChargeState = 26;
+  readonly attribute nullable int16u channel = 0;
+  readonly attribute nullable RoutingRole routingRole = 1;
+  readonly attribute nullable char_string<16> networkName = 2;
+  readonly attribute nullable int16u panId = 3;
+  readonly attribute nullable int64u extendedPanId = 4;
+  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute NeighborTable neighborTableList[] = 7;
+  readonly attribute RouteTable routeTableList[] = 8;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
+  readonly attribute int16u detachedRoleCount = 14;
+  readonly attribute int16u childRoleCount = 15;
+  readonly attribute int16u routerRoleCount = 16;
+  readonly attribute int16u leaderRoleCount = 17;
+  readonly attribute int16u attachAttemptCount = 18;
+  readonly attribute int16u partitionIdChangeCount = 19;
+  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
+  readonly attribute int16u parentChangeCount = 21;
+  readonly attribute int32u txTotalCount = 22;
+  readonly attribute int32u txUnicastCount = 23;
+  readonly attribute int32u txBroadcastCount = 24;
+  readonly attribute int32u txAckRequestedCount = 25;
+  readonly attribute int32u txAckedCount = 26;
+  readonly attribute int32u txNoAckRequestedCount = 27;
+  readonly attribute int32u txDataCount = 28;
+  readonly attribute int32u txDataPollCount = 29;
+  readonly attribute int32u txBeaconCount = 30;
+  readonly attribute int32u txBeaconRequestCount = 31;
+  readonly attribute int32u txOtherCount = 32;
+  readonly attribute int32u txRetryCount = 33;
+  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
+  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
+  readonly attribute int32u txErrCcaCount = 36;
+  readonly attribute int32u txErrAbortCount = 37;
+  readonly attribute int32u txErrBusyChannelCount = 38;
+  readonly attribute int32u rxTotalCount = 39;
+  readonly attribute int32u rxUnicastCount = 40;
+  readonly attribute int32u rxBroadcastCount = 41;
+  readonly attribute int32u rxDataCount = 42;
+  readonly attribute int32u rxDataPollCount = 43;
+  readonly attribute int32u rxBeaconCount = 44;
+  readonly attribute int32u rxBeaconRequestCount = 45;
+  readonly attribute int32u rxOtherCount = 46;
+  readonly attribute int32u rxAddressFilteredCount = 47;
+  readonly attribute int32u rxDestAddrFilteredCount = 48;
+  readonly attribute int32u rxDuplicatedCount = 49;
+  readonly attribute int32u rxErrNoFrameCount = 50;
+  readonly attribute int32u rxErrUnknownNeighborCount = 51;
+  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
+  readonly attribute int32u rxErrSecCount = 53;
+  readonly attribute int32u rxErrFcsCount = 54;
+  readonly attribute int32u rxErrOtherCount = 55;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
+  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
-
-client cluster Scenes = 5 {
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
-  }
-
-  struct ExtensionFieldSet {
-    cluster_id clusterId = 0;
-    AttributeValuePair attributeValueList[] = 1;
-  }
-
-  struct AttributeValuePair {
-    optional attrib_id attributeId = 0;
-    int8u attributeValue[] = 1;
-  }
 
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute int16u clusterRevision = 65533;
+  command ResetCounts(): DefaultSuccess = 0;
+}
 
-  request struct AddSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    INT16U transitionTime = 2;
-    CHAR_STRING sceneName = 3;
-    ExtensionFieldSet extensionFieldSets[] = 4;
+server cluster WiFiNetworkDiagnostics = 54 {
+  enum AssociationFailureCause : ENUM8 {
+    kUnknown = 0;
+    kAssociationFailed = 1;
+    kAuthenticationFailed = 2;
+    kSsidNotFound = 3;
   }
 
-  request struct ViewSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
+  enum SecurityType : ENUM8 {
+    kUnspecified = 0;
+    kNone = 1;
+    kWep = 2;
+    kWpa = 3;
+    kWpa2 = 4;
+    kWpa3 = 5;
   }
 
-  request struct RemoveSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
+  enum WiFiConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  request struct RemoveAllScenesRequest {
-    group_id groupId = 0;
+  enum WiFiVersionType : ENUM8 {
+    k80211a = 0;
+    k80211b = 1;
+    k80211g = 2;
+    k80211n = 3;
+    k80211ac = 4;
+    k80211ax = 5;
   }
 
-  request struct StoreSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
+  info event Disconnection = 0 {
+    INT16U reasonCode = 0;
   }
 
-  request struct RecallSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    optional nullable INT16U transitionTime = 2;
+  info event AssociationFailure = 1 {
+    AssociationFailureCause associationFailure = 0;
+    INT16U status = 1;
   }
 
-  request struct GetSceneMembershipRequest {
-    group_id groupId = 0;
+  info event ConnectionStatus = 2 {
+    WiFiConnectionStatus connectionStatus = 0;
   }
 
-  response struct AddSceneResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-  }
+  readonly attribute nullable octet_string<6> bssid = 0;
+  readonly attribute nullable SecurityType securityType = 1;
+  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
+  readonly attribute nullable int16u channelNumber = 3;
+  readonly attribute nullable int8s rssi = 4;
+  readonly attribute int32u beaconLostCount = 5;
+  readonly attribute int32u beaconRxCount = 6;
+  readonly attribute int32u packetMulticastRxCount = 7;
+  readonly attribute int32u packetMulticastTxCount = 8;
+  readonly attribute int32u packetUnicastRxCount = 9;
+  readonly attribute int32u packetUnicastTxCount = 10;
+  readonly attribute int64u currentMaxRate = 11;
+  readonly attribute int64u overrunCount = 12;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  response struct ViewSceneResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-    optional INT16U transitionTime = 3;
-    optional CHAR_STRING sceneName = 4;
-    optional ExtensionFieldSet extensionFieldSets[] = 5;
+server cluster EthernetNetworkDiagnostics = 55 {
+  enum PHYRateType : ENUM8 {
+    k10m = 0;
+    k100m = 1;
+    k1000m = 2;
+    k25g = 3;
+    k5g = 4;
+    k10g = 5;
+    k40g = 6;
+    k100g = 7;
+    k200g = 8;
+    k400g = 9;
   }
 
-  response struct RemoveSceneResponse = 2 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
+  readonly attribute nullable PHYRateType PHYRate = 0;
+  readonly attribute nullable boolean fullDuplex = 1;
+  readonly attribute int64u packetRxCount = 2;
+  readonly attribute int64u packetTxCount = 3;
+  readonly attribute int64u txErrCount = 4;
+  readonly attribute int64u collisionCount = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute nullable boolean carrierDetect = 7;
+  readonly attribute int64u timeSinceReset = 8;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
   }
 
-  response struct RemoveAllScenesResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
   }
 
-  response struct StoreSceneResponse = 4 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
   }
 
-  response struct GetSceneMembershipResponse = 6 {
-    ENUM8 status = 0;
-    nullable INT8U capacity = 1;
-    group_id groupId = 2;
-    optional INT8U sceneList[] = 3;
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
   }
 
-  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
-  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
-  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
-  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
-  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
-  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
-  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
-server cluster SoftwareDiagnostics = 52 {
-  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
-    kWaterMarks = 0x1;
+server cluster OperationalCredentials = 62 {
+  enum OperationalCertStatus : ENUM8 {
+    kSuccess = 0;
+    kInvalidPublicKey = 1;
+    kInvalidNodeOpId = 2;
+    kInvalidNOC = 3;
+    kMissingCsr = 4;
+    kTableFull = 5;
+    kInvalidAdminSubject = 6;
+    kInsufficientPrivilege = 8;
+    kFabricConflict = 9;
+    kLabelConflict = 10;
+    kInvalidFabricIndex = 11;
   }
 
-  struct ThreadMetrics {
-    int64u id = 0;
-    optional char_string<8> name = 1;
-    optional int32u stackFreeCurrent = 2;
-    optional int32u stackFreeMinimum = 3;
-    optional int32u stackSize = 4;
+  struct NOCStruct {
+    octet_string noc = 1;
+    nullable octet_string icac = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  info event SoftwareFault = 0 {
-    SoftwareFaultStruct softwareFault = 0;
+  struct FabricDescriptor {
+    octet_string<65> rootPublicKey = 1;
+    vendor_id vendorId = 2;
+    fabric_id fabricId = 3;
+    node_id nodeId = 4;
+    char_string<32> label = 5;
+    fabric_idx fabricIndex = 254;
   }
 
-  readonly attribute ThreadMetrics threadMetrics[] = 0;
-  readonly attribute int64u currentHeapFree = 1;
-  readonly attribute int64u currentHeapUsed = 2;
-  readonly attribute int64u currentHeapHighWatermark = 3;
+  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
+  readonly attribute FabricDescriptor fabrics[] = 1;
+  readonly attribute int8u supportedFabrics = 2;
+  readonly attribute int8u commissionedFabrics = 3;
+  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
+  readonly attribute fabric_idx currentFabricIndex = 5;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
-}
+  request struct AttestationRequestRequest {
+    OCTET_STRING attestationNonce = 0;
+  }
 
-server cluster ThreadNetworkDiagnostics = 53 {
-  enum NetworkFault : ENUM8 {
-    kUnspecified = 0;
-    kLinkDown = 1;
-    kHardwareFailure = 2;
-    kNetworkJammed = 3;
+  request struct CertificateChainRequestRequest {
+    INT8U certificateType = 0;
   }
 
-  enum RoutingRole : ENUM8 {
-    kUnspecified = 0;
-    kUnassigned = 1;
-    kSleepyEndDevice = 2;
-    kEndDevice = 3;
-    kReed = 4;
-    kRouter = 5;
-    kLeader = 6;
+  request struct CSRRequestRequest {
+    OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
-  enum ThreadConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  request struct AddNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+    OCTET_STRING IPKValue = 2;
+    Int64u caseAdminSubject = 3;
+    VENDOR_ID adminVendorId = 4;
   }
 
-  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
-    kPacketCounts = 0x1;
-    kErrorCounts = 0x2;
-    kMLECounts = 0x4;
-    kMACCounts = 0x8;
+  request struct UpdateNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
   }
 
-  struct NeighborTable {
-    int64u extAddress = 0;
-    int32u age = 1;
-    int16u rloc16 = 2;
-    int32u linkFrameCounter = 3;
-    int32u mleFrameCounter = 4;
-    int8u lqi = 5;
-    nullable int8s averageRssi = 6;
-    nullable int8s lastRssi = 7;
-    int8u frameErrorRate = 8;
-    int8u messageErrorRate = 9;
-    boolean rxOnWhenIdle = 10;
-    boolean fullThreadDevice = 11;
-    boolean fullNetworkData = 12;
-    boolean isChild = 13;
+  request struct UpdateFabricLabelRequest {
+    CHAR_STRING label = 0;
+  }
+
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
   }
 
-  struct RouteTable {
-    int64u extAddress = 0;
-    int16u rloc16 = 1;
-    int8u routerId = 2;
-    int8u nextHop = 3;
-    int8u pathCost = 4;
-    int8u LQIIn = 5;
-    int8u LQIOut = 6;
-    int8u age = 7;
-    boolean allocated = 8;
-    boolean linkEstablished = 9;
+  request struct AddTrustedRootCertificateRequest {
+    OCTET_STRING rootCertificate = 0;
   }
 
-  struct SecurityPolicy {
-    int16u rotationTime = 0;
-    bitmap16 flags = 1;
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
   }
 
-  struct OperationalDatasetComponents {
-    boolean activeTimestampPresent = 0;
-    boolean pendingTimestampPresent = 1;
-    boolean masterKeyPresent = 2;
-    boolean networkNamePresent = 3;
-    boolean extendedPanIdPresent = 4;
-    boolean meshLocalPrefixPresent = 5;
-    boolean delayPresent = 6;
-    boolean panIdPresent = 7;
-    boolean channelPresent = 8;
-    boolean pskcPresent = 9;
-    boolean securityPolicyPresent = 10;
-    boolean channelMaskPresent = 11;
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
   }
 
-  info event ConnectionStatus = 0 {
-    ThreadConnectionStatus connectionStatus = 0;
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
   }
 
-  readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable RoutingRole routingRole = 1;
-  readonly attribute nullable char_string<16> networkName = 2;
-  readonly attribute nullable int16u panId = 3;
-  readonly attribute nullable int64u extendedPanId = 4;
-  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute NeighborTable neighborTableList[] = 7;
-  readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
-  readonly attribute nullable int8u leaderRouterId = 13;
-  readonly attribute int16u detachedRoleCount = 14;
-  readonly attribute int16u childRoleCount = 15;
-  readonly attribute int16u routerRoleCount = 16;
-  readonly attribute int16u leaderRoleCount = 17;
-  readonly attribute int16u attachAttemptCount = 18;
-  readonly attribute int16u partitionIdChangeCount = 19;
-  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
-  readonly attribute int16u parentChangeCount = 21;
-  readonly attribute int32u txTotalCount = 22;
-  readonly attribute int32u txUnicastCount = 23;
-  readonly attribute int32u txBroadcastCount = 24;
-  readonly attribute int32u txAckRequestedCount = 25;
-  readonly attribute int32u txAckedCount = 26;
-  readonly attribute int32u txNoAckRequestedCount = 27;
-  readonly attribute int32u txDataCount = 28;
-  readonly attribute int32u txDataPollCount = 29;
-  readonly attribute int32u txBeaconCount = 30;
-  readonly attribute int32u txBeaconRequestCount = 31;
-  readonly attribute int32u txOtherCount = 32;
-  readonly attribute int32u txRetryCount = 33;
-  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
-  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
-  readonly attribute int32u txErrCcaCount = 36;
-  readonly attribute int32u txErrAbortCount = 37;
-  readonly attribute int32u txErrBusyChannelCount = 38;
-  readonly attribute int32u rxTotalCount = 39;
-  readonly attribute int32u rxUnicastCount = 40;
-  readonly attribute int32u rxBroadcastCount = 41;
-  readonly attribute int32u rxDataCount = 42;
-  readonly attribute int32u rxDataPollCount = 43;
-  readonly attribute int32u rxBeaconCount = 44;
-  readonly attribute int32u rxBeaconRequestCount = 45;
-  readonly attribute int32u rxOtherCount = 46;
-  readonly attribute int32u rxAddressFilteredCount = 47;
-  readonly attribute int32u rxDestAddrFilteredCount = 48;
-  readonly attribute int32u rxDuplicatedCount = 49;
-  readonly attribute int32u rxErrNoFrameCount = 50;
-  readonly attribute int32u rxErrUnknownNeighborCount = 51;
-  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
-  readonly attribute int32u rxErrSecCount = 53;
-  readonly attribute int32u rxErrFcsCount = 54;
-  readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute nullable int64u activeTimestamp = 56;
-  readonly attribute nullable int64u pendingTimestamp = 57;
-  readonly attribute nullable int32u delay = 58;
-  readonly attribute nullable SecurityPolicy securityPolicy = 59;
-  readonly attribute nullable octet_string<4> channelMask = 60;
-  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
-  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
+  }
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
 }
 
-server cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicy : ENUM8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
   }
 
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
+  struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster UnitLocalization = 45 {
-  enum TempUnit : ENUM8 {
-    kFahrenheit = 0;
-    kCelsius = 1;
-    kKelvin = 2;
+  struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
   }
 
-  bitmap UnitLocalizationFeature : BITMAP32 {
-    kTemperatureUnit = 0x1;
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
   }
 
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
-
-server cluster UserLabel = 65 {
-  attribute access(write: manage) LabelStruct labelList[] = 0;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
 
-server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCause : ENUM8 {
-    kUnknown = 0;
-    kAssociationFailed = 1;
-    kAuthenticationFailed = 2;
-    kSsidNotFound = 3;
+  request struct KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  enum SecurityType : ENUM8 {
-    kUnspecified = 0;
-    kNone = 1;
-    kWep = 2;
-    kWpa = 3;
-    kWpa2 = 4;
-    kWpa3 = 5;
+  request struct KeySetReadRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  enum WiFiConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  request struct KeySetRemoveRequest {
+    INT16U groupKeySetID = 0;
   }
 
-  enum WiFiVersionType : ENUM8 {
-    k80211a = 0;
-    k80211b = 1;
-    k80211g = 2;
-    k80211n = 3;
-    k80211ac = 4;
-    k80211ax = 5;
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  info event Disconnection = 0 {
-    INT16U reasonCode = 0;
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  info event AssociationFailure = 1 {
-    AssociationFailureCause associationFailure = 0;
-    INT16U status = 1;
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  info event ConnectionStatus = 2 {
-    WiFiConnectionStatus connectionStatus = 0;
-  }
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
+}
 
-  readonly attribute nullable octet_string<6> bssid = 0;
-  readonly attribute nullable SecurityType securityType = 1;
-  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
-  readonly attribute nullable int16u channelNumber = 3;
-  readonly attribute nullable int8s rssi = 4;
-  readonly attribute int32u beaconLostCount = 5;
-  readonly attribute int32u beaconRxCount = 6;
-  readonly attribute int32u packetMulticastRxCount = 7;
-  readonly attribute int32u packetMulticastTxCount = 8;
-  readonly attribute int32u packetUnicastRxCount = 9;
-  readonly attribute int32u packetUnicastTxCount = 10;
-  readonly attribute int64u currentMaxRate = 11;
-  readonly attribute int64u overrunCount = 12;
+server cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+server cluster UserLabel = 65 {
+  attribute access(write: manage) LabelStruct labelList[] = 0;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index 921f17b4d3cfcc..192b8f54d93e83 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -6,318 +6,388 @@ struct LabelStruct {
     char_string<16> value = 1;
 }
 
-client cluster AccessControl = 31 {
-  enum AuthMode : ENUM8 {
-    kPase = 1;
-    kCase = 2;
-    kGroup = 3;
-  }
-
-  enum ChangeTypeEnum : ENUM8 {
-    kChanged = 0;
-    kAdded = 1;
-    kRemoved = 2;
-  }
-
-  enum Privilege : ENUM8 {
-    kView = 1;
-    kProxyView = 2;
-    kOperate = 3;
-    kManage = 4;
-    kAdminister = 5;
-  }
-
-  struct AccessControlEntry {
-    Privilege privilege = 1;
-    AuthMode authMode = 2;
-    nullable int64u subjects[] = 3;
-    nullable Target targets[] = 4;
-    fabric_idx fabricIndex = 254;
-  }
-
-  struct Target {
-    nullable cluster_id cluster = 0;
-    nullable endpoint_no endpoint = 1;
-    nullable devtype_id deviceType = 2;
-  }
-
-  struct ExtensionEntry {
-    octet_string<128> data = 1;
-    fabric_idx fabricIndex = 254;
+client cluster Identify = 3 {
+  enum IdentifyEffectIdentifier : ENUM8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
   }
 
-  info event access(read: administer) AccessControlEntryChanged = 0 {
-    nullable node_id adminNodeID = 1;
-    nullable INT16U adminPasscodeID = 2;
-    ChangeTypeEnum changeType = 3;
-    nullable AccessControlEntry latestValue = 4;
-    fabric_idx adminFabricIndex = 254;
+  enum IdentifyEffectVariant : ENUM8 {
+    kDefault = 0;
   }
 
-  info event access(read: administer) AccessControlExtensionChanged = 1 {
-    nullable node_id adminNodeID = 1;
-    nullable INT16U adminPasscodeID = 2;
-    ChangeTypeEnum changeType = 3;
-    nullable ExtensionEntry latestValue = 4;
-    fabric_idx adminFabricIndex = 254;
+  enum IdentifyIdentifyType : ENUM8 {
+    kNone = 0;
+    kVisibleLight = 1;
+    kVisibleLED = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
   }
 
-  attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
-  attribute access(read: administer, write: administer) ExtensionEntry extension[] = 1;
-  readonly attribute int16u subjectsPerAccessControlEntry = 2;
-  readonly attribute int16u targetsPerAccessControlEntry = 3;
-  readonly attribute int16u accessControlEntriesPerFabric = 4;
+  attribute int16u identifyTime = 0;
+  readonly attribute enum8 identifyType = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct IdentifyRequest {
+    INT16U identifyTime = 0;
+  }
+
+  request struct TriggerEffectRequest {
+    IdentifyEffectIdentifier effectIdentifier = 0;
+    IdentifyEffectVariant effectVariant = 1;
+  }
+
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+  command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
 }
 
-client cluster AccountLogin = 1294 {
+client cluster Groups = 4 {
+  readonly attribute bitmap8 nameSupport = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct GetSetupPINRequest {
-    CHAR_STRING tempAccountIdentifier = 0;
+  request struct AddGroupRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
   }
 
-  request struct LoginRequest {
-    CHAR_STRING tempAccountIdentifier = 0;
-    CHAR_STRING setupPIN = 1;
+  request struct ViewGroupRequest {
+    group_id groupId = 0;
   }
 
-  response struct GetSetupPINResponse = 1 {
-    CHAR_STRING setupPIN = 0;
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
   }
 
-  timed command GetSetupPIN(GetSetupPINRequest): GetSetupPINResponse = 0;
-  timed command Login(LoginRequest): DefaultSuccess = 2;
-  timed command Logout(): DefaultSuccess = 3;
-}
+  request struct RemoveGroupRequest {
+    group_id groupId = 0;
+  }
 
-client cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
-    kWindowNotOpen = 0;
-    kEnhancedWindowOpen = 1;
-    kBasicWindowOpen = 2;
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupId = 0;
+    CHAR_STRING groupName = 1;
   }
 
-  enum StatusCode : ENUM8 {
-    kBusy = 1;
-    kPAKEParameterError = 2;
-    kWindowNotOpen = 3;
+  response struct AddGroupResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  readonly attribute int8u windowStatus = 0;
-  readonly attribute fabric_idx adminFabricIndex = 1;
-  readonly attribute int16u adminVendorId = 2;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  response struct ViewGroupResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    CHAR_STRING groupName = 2;
+  }
 
-  request struct OpenCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
-    OCTET_STRING PAKEVerifier = 1;
-    INT16U discriminator = 2;
-    INT32U iterations = 3;
-    OCTET_STRING salt = 4;
+  response struct GetGroupMembershipResponse = 2 {
+    nullable INT8U capacity = 0;
+    group_id groupList[] = 1;
   }
 
-  request struct OpenBasicCommissioningWindowRequest {
-    INT16U commissioningTimeout = 0;
+  response struct RemoveGroupResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
   }
 
-  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
-  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
+  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
 }
 
-client cluster ApplicationBasic = 1293 {
-  enum ApplicationStatusEnum : ENUM8 {
-    kStopped = 0;
-    kActiveVisibleFocus = 1;
-    kActiveHidden = 2;
-    kActiveVisibleNotFocus = 3;
+client cluster Scenes = 5 {
+  bitmap ScenesCopyMode : BITMAP8 {
+    kCopyAllScenes = 0x1;
   }
 
-  struct ApplicationBasicApplication {
-    int16u catalogVendorId = 0;
-    char_string applicationId = 1;
+  struct ExtensionFieldSet {
+    cluster_id clusterId = 0;
+    AttributeValuePair attributeValueList[] = 1;
   }
 
-  readonly attribute char_string<32> vendorName = 0;
-  readonly attribute int16u vendorID = 1;
-  readonly attribute char_string<32> applicationName = 2;
-  readonly attribute int16u productID = 3;
-  readonly attribute ApplicationBasicApplication application = 4;
-  readonly attribute ApplicationStatusEnum status = 5;
-  readonly attribute char_string<32> applicationVersion = 6;
-  readonly attribute vendor_id allowedVendorList[] = 7;
+  struct AttributeValuePair {
+    optional attrib_id attributeId = 0;
+    int8u attributeValue[] = 1;
+  }
+
+  readonly attribute int8u sceneCount = 0;
+  readonly attribute int8u currentScene = 1;
+  readonly attribute group_id currentGroup = 2;
+  readonly attribute boolean sceneValid = 3;
+  readonly attribute bitmap8 nameSupport = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-client cluster ApplicationLauncher = 1292 {
-  enum ApplicationLauncherStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kAppNotAvailable = 1;
-    kSystemBusy = 2;
+  request struct AddSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    INT16U transitionTime = 2;
+    CHAR_STRING sceneName = 3;
+    ExtensionFieldSet extensionFieldSets[] = 4;
   }
 
-  bitmap ApplicationLauncherFeature : BITMAP32 {
-    kApplicationPlatform = 0x1;
+  request struct ViewSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  struct ApplicationEP {
-    Application application = 0;
-    optional endpoint_no endpoint = 1;
+  request struct RemoveSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  struct Application {
-    int16u catalogVendorId = 0;
-    char_string applicationId = 1;
+  request struct RemoveAllScenesRequest {
+    group_id groupId = 0;
   }
 
-  readonly attribute INT16U catalogList[] = 0;
-  attribute nullable ApplicationEP currentApp = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct LaunchAppRequest {
-    Application application = 0;
-    optional OCTET_STRING data = 1;
+  request struct StoreSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
   }
 
-  request struct StopAppRequest {
-    Application application = 0;
+  request struct RecallSceneRequest {
+    group_id groupId = 0;
+    INT8U sceneId = 1;
+    optional nullable INT16U transitionTime = 2;
   }
 
-  request struct HideAppRequest {
-    Application application = 0;
+  request struct GetSceneMembershipRequest {
+    group_id groupId = 0;
   }
 
-  response struct LauncherResponse = 3 {
-    ApplicationLauncherStatusEnum status = 0;
-    OCTET_STRING data = 1;
+  response struct AddSceneResponse = 0 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
   }
 
-  command LaunchApp(LaunchAppRequest): LauncherResponse = 0;
-  command StopApp(StopAppRequest): LauncherResponse = 1;
-  command HideApp(HideAppRequest): LauncherResponse = 2;
+  response struct ViewSceneResponse = 1 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+    optional INT16U transitionTime = 3;
+    optional CHAR_STRING sceneName = 4;
+    optional ExtensionFieldSet extensionFieldSets[] = 5;
+  }
+
+  response struct RemoveSceneResponse = 2 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+  }
+
+  response struct RemoveAllScenesResponse = 3 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+  }
+
+  response struct StoreSceneResponse = 4 {
+    ENUM8 status = 0;
+    group_id groupId = 1;
+    INT8U sceneId = 2;
+  }
+
+  response struct GetSceneMembershipResponse = 6 {
+    ENUM8 status = 0;
+    nullable INT8U capacity = 1;
+    group_id groupId = 2;
+    optional INT8U sceneList[] = 3;
+  }
+
+  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
+  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
+  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
+  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
+  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
+  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
+  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
 }
 
-client cluster AudioOutput = 1291 {
-  enum OutputTypeEnum : ENUM8 {
-    kHdmi = 0;
-    kBt = 1;
-    kOptical = 2;
-    kHeadphone = 3;
-    kInternal = 4;
-    kOther = 5;
+client cluster OnOff = 6 {
+  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
+    kFadeToOffIn0p8Seconds = 0;
+    kNoFade = 1;
+    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
   }
 
-  bitmap AudioOutputFeature : BITMAP32 {
-    kNameUpdates = 0x1;
+  enum OnOffDyingLightEffectVariant : ENUM8 {
+    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
   }
 
-  struct OutputInfo {
-    int8u index = 0;
-    OutputTypeEnum outputType = 1;
-    char_string<32> name = 2;
+  enum OnOffEffectIdentifier : ENUM8 {
+    kDelayedAllOff = 0;
+    kDyingLight = 1;
   }
 
-  readonly attribute OutputInfo outputList[] = 0;
-  readonly attribute int8u currentOutput = 1;
+  enum OnOffStartUpOnOff : ENUM8 {
+    kOff = 0;
+    kOn = 1;
+    kTogglePreviousOnOff = 2;
+  }
+
+  bitmap OnOffControl : BITMAP8 {
+    kAcceptOnlyWhenOn = 0x1;
+  }
+
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
+  }
+
+  bitmap SceneFeatures : BITMAP32 {
+    kSceneNames = 0x1;
+  }
+
+  readonly attribute boolean onOff = 0;
+  readonly attribute boolean globalSceneControl = 16384;
+  attribute int16u onTime = 16385;
+  attribute int16u offWaitTime = 16386;
+  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct SelectOutputRequest {
-    INT8U index = 0;
+  request struct OffWithEffectRequest {
+    OnOffEffectIdentifier effectId = 0;
+    OnOffDelayedAllOffEffectVariant effectVariant = 1;
   }
 
-  request struct RenameOutputRequest {
-    INT8U index = 0;
-    CHAR_STRING name = 1;
+  request struct OnWithTimedOffRequest {
+    OnOffControl onOffControl = 0;
+    int16u onTime = 1;
+    int16u offWaitTime = 2;
   }
 
-  command SelectOutput(SelectOutputRequest): DefaultSuccess = 0;
-  command RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
+  command Off(): DefaultSuccess = 0;
+  command On(): DefaultSuccess = 1;
+  command Toggle(): DefaultSuccess = 2;
+  command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64;
+  command OnWithRecallGlobalScene(): DefaultSuccess = 65;
+  command OnWithTimedOff(OnWithTimedOffRequest): DefaultSuccess = 66;
 }
 
-client cluster BarrierControl = 259 {
-  readonly attribute enum8 barrierMovingState = 1;
-  readonly attribute bitmap16 barrierSafetyStatus = 2;
-  readonly attribute bitmap8 barrierCapabilities = 3;
-  readonly attribute int8u barrierPosition = 10;
+client cluster OnOffSwitchConfiguration = 7 {
+  readonly attribute enum8 switchType = 0;
+  attribute enum8 switchActions = 16;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct BarrierControlGoToPercentRequest {
-    INT8U percentOpen = 0;
+client cluster LevelControl = 8 {
+  enum MoveMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
   }
 
-  command BarrierControlGoToPercent(BarrierControlGoToPercentRequest): DefaultSuccess = 0;
-  command BarrierControlStop(): DefaultSuccess = 1;
-}
+  enum StepMode : ENUM8 {
+    kUp = 0;
+    kDown = 1;
+  }
 
-client cluster Basic = 40 {
-  struct CapabilityMinimaStruct {
-    int16u caseSessionsPerFabric = 0;
-    int16u subscriptionsPerFabric = 1;
+  bitmap LevelControlFeature : BITMAP32 {
+    kOnOff = 0x1;
+    kLighting = 0x2;
+    kFrequency = 0x4;
   }
 
-  critical event StartUp = 0 {
-    INT32U softwareVersion = 0;
+  readonly attribute int8u currentLevel = 0;
+  readonly attribute int16u remainingTime = 1;
+  readonly attribute int8u minLevel = 2;
+  readonly attribute int8u maxLevel = 3;
+  readonly attribute int16u currentFrequency = 4;
+  readonly attribute int16u minFrequency = 5;
+  readonly attribute int16u maxFrequency = 6;
+  attribute bitmap8 options = 15;
+  attribute int16u onOffTransitionTime = 16;
+  attribute nullable int8u onLevel = 17;
+  attribute nullable int16u onTransitionTime = 18;
+  attribute nullable int16u offTransitionTime = 19;
+  attribute nullable int8u defaultMoveRate = 20;
+  attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct MoveToLevelRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
   }
 
-  critical event ShutDown = 1 {
+  request struct MoveRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
+    BITMAP8 optionMask = 2;
+    BITMAP8 optionOverride = 3;
   }
 
-  info event Leave = 2 {
+  request struct StepRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionMask = 3;
+    BITMAP8 optionOverride = 4;
   }
 
-  info event ReachableChanged = 3 {
-    boolean reachableNewValue = 0;
+  request struct StopRequest {
+    BITMAP8 optionMask = 0;
+    BITMAP8 optionOverride = 1;
   }
 
-  readonly attribute int16u dataModelRevision = 0;
-  readonly attribute char_string<32> vendorName = 1;
-  readonly attribute vendor_id vendorID = 2;
-  readonly attribute char_string<32> productName = 3;
-  readonly attribute int16u productID = 4;
-  attribute access(write: manage) char_string<32> nodeLabel = 5;
-  attribute access(write: administer) char_string<2> location = 6;
-  readonly attribute int16u hardwareVersion = 7;
-  readonly attribute char_string<64> hardwareVersionString = 8;
-  readonly attribute int32u softwareVersion = 9;
-  readonly attribute char_string<64> softwareVersionString = 10;
-  readonly attribute char_string<16> manufacturingDate = 11;
-  readonly attribute char_string<32> partNumber = 12;
-  readonly attribute long_char_string<256> productURL = 13;
-  readonly attribute char_string<64> productLabel = 14;
-  readonly attribute char_string<32> serialNumber = 15;
-  attribute access(write: manage) boolean localConfigDisabled = 16;
-  readonly attribute boolean reachable = 17;
-  readonly attribute char_string<32> uniqueID = 18;
-  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  request struct MoveToLevelWithOnOffRequest {
+    INT8U level = 0;
+    INT16U transitionTime = 1;
+  }
+
+  request struct MoveWithOnOffRequest {
+    MoveMode moveMode = 0;
+    INT8U rate = 1;
+  }
+
+  request struct StepWithOnOffRequest {
+    StepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT16U transitionTime = 2;
+  }
+
+  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
+  command Move(MoveRequest): DefaultSuccess = 1;
+  command Step(StepRequest): DefaultSuccess = 2;
+  command Stop(StopRequest): DefaultSuccess = 3;
+  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
+  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
+  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
+  command StopWithOnOff(): DefaultSuccess = 7;
+}
+
+client cluster BinaryInputBasic = 15 {
+  attribute boolean outOfService = 81;
+  attribute boolean presentValue = 85;
+  readonly attribute bitmap8 statusFlags = 111;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -325,10 +395,16 @@ client cluster Basic = 40 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-client cluster BinaryInputBasic = 15 {
-  attribute boolean outOfService = 81;
-  attribute boolean presentValue = 85;
-  readonly attribute bitmap8 statusFlags = 111;
+client cluster Descriptor = 29 {
+  struct DeviceType {
+    devtype_id type = 0;
+    int16u revision = 1;
+  }
+
+  readonly attribute DeviceType deviceList[] = 0;
+  readonly attribute CLUSTER_ID serverList[] = 1;
+  readonly attribute CLUSTER_ID clientList[] = 2;
+  readonly attribute ENDPOINT_NO partsList[] = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -353,12 +429,67 @@ client cluster Binding = 30 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-client cluster BooleanState = 69 {
-  info event StateChange = 0 {
-    boolean stateValue = 0;
+client cluster AccessControl = 31 {
+  enum AuthMode : ENUM8 {
+    kPase = 1;
+    kCase = 2;
+    kGroup = 3;
   }
 
-  readonly attribute boolean stateValue = 0;
+  enum ChangeTypeEnum : ENUM8 {
+    kChanged = 0;
+    kAdded = 1;
+    kRemoved = 2;
+  }
+
+  enum Privilege : ENUM8 {
+    kView = 1;
+    kProxyView = 2;
+    kOperate = 3;
+    kManage = 4;
+    kAdminister = 5;
+  }
+
+  struct AccessControlEntry {
+    Privilege privilege = 1;
+    AuthMode authMode = 2;
+    nullable int64u subjects[] = 3;
+    nullable Target targets[] = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct Target {
+    nullable cluster_id cluster = 0;
+    nullable endpoint_no endpoint = 1;
+    nullable devtype_id deviceType = 2;
+  }
+
+  struct ExtensionEntry {
+    octet_string<128> data = 1;
+    fabric_idx fabricIndex = 254;
+  }
+
+  info event access(read: administer) AccessControlEntryChanged = 0 {
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable AccessControlEntry latestValue = 4;
+    fabric_idx adminFabricIndex = 254;
+  }
+
+  info event access(read: administer) AccessControlExtensionChanged = 1 {
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable ExtensionEntry latestValue = 4;
+    fabric_idx adminFabricIndex = 254;
+  }
+
+  attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
+  attribute access(read: administer, write: administer) ExtensionEntry extension[] = 1;
+  readonly attribute int16u subjectsPerAccessControlEntry = 2;
+  readonly attribute int16u targetsPerAccessControlEntry = 3;
+  readonly attribute int16u accessControlEntriesPerFabric = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -527,7 +658,12 @@ client cluster BridgedActions = 37 {
   command DisableActionWithDuration(DisableActionWithDurationRequest): DefaultSuccess = 11;
 }
 
-client cluster BridgedDeviceBasic = 57 {
+client cluster Basic = 40 {
+  struct CapabilityMinimaStruct {
+    int16u caseSessionsPerFabric = 0;
+    int16u subscriptionsPerFabric = 1;
+  }
+
   critical event StartUp = 0 {
     INT32U softwareVersion = 0;
   }
@@ -542,10 +678,13 @@ client cluster BridgedDeviceBasic = 57 {
     boolean reachableNewValue = 0;
   }
 
+  readonly attribute int16u dataModelRevision = 0;
   readonly attribute char_string<32> vendorName = 1;
   readonly attribute vendor_id vendorID = 2;
   readonly attribute char_string<32> productName = 3;
-  attribute char_string<32> nodeLabel = 5;
+  readonly attribute int16u productID = 4;
+  attribute access(write: manage) char_string<32> nodeLabel = 5;
+  attribute access(write: administer) char_string<2> location = 6;
   readonly attribute int16u hardwareVersion = 7;
   readonly attribute char_string<64> hardwareVersionString = 8;
   readonly attribute int32u softwareVersion = 9;
@@ -555,8 +694,10 @@ client cluster BridgedDeviceBasic = 57 {
   readonly attribute long_char_string<256> productURL = 13;
   readonly attribute char_string<64> productLabel = 14;
   readonly attribute char_string<32> serialNumber = 15;
+  attribute access(write: manage) boolean localConfigDisabled = 16;
   readonly attribute boolean reachable = 17;
   readonly attribute char_string<32> uniqueID = 18;
+  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -564,484 +705,509 @@ client cluster BridgedDeviceBasic = 57 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-client cluster Channel = 1284 {
-  enum ChannelStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kMultipleMatches = 1;
-    kNoMatches = 2;
-  }
-
-  enum LineupInfoTypeEnum : ENUM8 {
-    kMso = 0;
-  }
-
-  bitmap ChannelFeature : BITMAP32 {
-    kChannelList = 0x1;
-    kLineupInfo = 0x2;
+client cluster OtaSoftwareUpdateProvider = 41 {
+  enum OTAApplyUpdateAction : ENUM8 {
+    kProceed = 0;
+    kAwaitNextAction = 1;
+    kDiscontinue = 2;
   }
 
-  struct ChannelInfo {
-    int16u majorNumber = 0;
-    int16u minorNumber = 1;
-    optional char_string<32> name = 2;
-    optional char_string<32> callSign = 3;
-    optional char_string<32> affiliateCallSign = 4;
+  enum OTADownloadProtocol : ENUM8 {
+    kBDXSynchronous = 0;
+    kBDXAsynchronous = 1;
+    kHttps = 2;
+    kVendorSpecific = 3;
   }
 
-  struct LineupInfo {
-    char_string operatorName = 0;
-    optional char_string lineupName = 1;
-    optional char_string postalCode = 2;
-    LineupInfoTypeEnum lineupInfoType = 3;
+  enum OTAQueryStatus : ENUM8 {
+    kUpdateAvailable = 0;
+    kBusy = 1;
+    kNotAvailable = 2;
+    kDownloadProtocolNotSupported = 3;
   }
 
-  readonly attribute ChannelInfo channelList[] = 0;
-  readonly attribute nullable LineupInfo lineup = 1;
-  readonly attribute nullable ChannelInfo currentChannel = 2;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct ChangeChannelRequest {
-    CHAR_STRING match = 0;
+  request struct QueryImageRequest {
+    vendor_id vendorId = 0;
+    INT16U productId = 1;
+    INT32U softwareVersion = 2;
+    OTADownloadProtocol protocolsSupported[] = 3;
+    optional INT16U hardwareVersion = 4;
+    optional CHAR_STRING location = 5;
+    optional BOOLEAN requestorCanConsent = 6;
+    optional OCTET_STRING metadataForProvider = 7;
   }
 
-  request struct ChangeChannelByNumberRequest {
-    INT16U majorNumber = 0;
-    INT16U minorNumber = 1;
+  request struct ApplyUpdateRequestRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U newVersion = 1;
   }
 
-  request struct SkipChannelRequest {
-    INT16U count = 0;
+  request struct NotifyUpdateAppliedRequest {
+    OCTET_STRING updateToken = 0;
+    INT32U softwareVersion = 1;
   }
 
-  response struct ChangeChannelResponse = 1 {
-    ChannelStatusEnum status = 0;
-    optional CHAR_STRING data = 1;
+  response struct QueryImageResponse = 1 {
+    OTAQueryStatus status = 0;
+    optional INT32U delayedActionTime = 1;
+    optional CHAR_STRING imageURI = 2;
+    optional INT32U softwareVersion = 3;
+    optional CHAR_STRING softwareVersionString = 4;
+    optional OCTET_STRING updateToken = 5;
+    optional BOOLEAN userConsentNeeded = 6;
+    optional OCTET_STRING metadataForRequestor = 7;
   }
 
-  command ChangeChannel(ChangeChannelRequest): ChangeChannelResponse = 0;
-  command ChangeChannelByNumber(ChangeChannelByNumberRequest): DefaultSuccess = 2;
-  command SkipChannel(SkipChannelRequest): DefaultSuccess = 3;
-}
-
-client cluster ColorControl = 768 {
-  enum ColorLoopAction : ENUM8 {
-    kDeactivate = 0;
-    kActivateFromColorLoopStartEnhancedHue = 1;
-    kActivateFromEnhancedCurrentHue = 2;
+  response struct ApplyUpdateResponse = 3 {
+    OTAApplyUpdateAction action = 0;
+    INT32U delayedActionTime = 1;
   }
 
-  enum ColorLoopDirection : ENUM8 {
-    kDecrementHue = 0;
-    kIncrementHue = 1;
-  }
+  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
+  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
+  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
+}
 
-  enum ColorMode : ENUM8 {
-    kCurrentHueAndCurrentSaturation = 0;
-    kCurrentXAndCurrentY = 1;
-    kColorTemperature = 2;
+client cluster OtaSoftwareUpdateRequestor = 42 {
+  enum OTAAnnouncementReason : ENUM8 {
+    kSimpleAnnouncement = 0;
+    kUpdateAvailable = 1;
+    kUrgentUpdateAvailable = 2;
   }
 
-  enum HueDirection : ENUM8 {
-    kShortestDistance = 0;
-    kLongestDistance = 1;
-    kUp = 2;
-    kDown = 3;
+  enum OTAChangeReasonEnum : ENUM8 {
+    kUnknown = 0;
+    kSuccess = 1;
+    kFailure = 2;
+    kTimeOut = 3;
+    kDelayByProvider = 4;
   }
 
-  enum HueMoveMode : ENUM8 {
-    kStop = 0;
-    kUp = 1;
-    kDown = 3;
+  enum OTAUpdateStateEnum : ENUM8 {
+    kUnknown = 0;
+    kIdle = 1;
+    kQuerying = 2;
+    kDelayedOnQuery = 3;
+    kDownloading = 4;
+    kApplying = 5;
+    kDelayedOnApply = 6;
+    kRollingBack = 7;
+    kDelayedOnUserConsent = 8;
   }
 
-  enum HueStepMode : ENUM8 {
-    kUp = 1;
-    kDown = 3;
+  struct ProviderLocation {
+    node_id providerNodeID = 1;
+    endpoint_no endpoint = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  enum SaturationMoveMode : ENUM8 {
-    kStop = 0;
-    kUp = 1;
-    kDown = 3;
+  info event StateTransition = 0 {
+    OTAUpdateStateEnum previousState = 0;
+    OTAUpdateStateEnum newState = 1;
+    OTAChangeReasonEnum reason = 2;
+    nullable INT32U targetSoftwareVersion = 3;
   }
 
-  enum SaturationStepMode : ENUM8 {
-    kUp = 1;
-    kDown = 3;
+  critical event VersionApplied = 1 {
+    INT32U softwareVersion = 0;
+    INT16U productID = 1;
   }
 
-  bitmap ColorCapabilities : BITMAP16 {
-    kHueSaturationSupported = 0x1;
-    kEnhancedHueSupported = 0x2;
-    kColorLoopSupported = 0x4;
-    kXYAttributesSupported = 0x8;
-    kColorTemperatureSupported = 0x10;
+  info event DownloadError = 2 {
+    INT32U softwareVersion = 0;
+    INT64U bytesDownloaded = 1;
+    nullable INT8U progressPercent = 2;
+    nullable INT64S platformCode = 3;
   }
 
-  bitmap ColorControlFeature : BITMAP32 {
-    kHueAndSaturation = 0x1;
-    kEnhancedHue = 0x2;
-    kColorLoop = 0x4;
-    kXy = 0x8;
-    kColorTemperature = 0x10;
+  attribute ProviderLocation defaultOtaProviders[] = 0;
+  readonly attribute boolean updatePossible = 1;
+  readonly attribute OTAUpdateStateEnum updateState = 2;
+  readonly attribute nullable int8u updateStateProgress = 3;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AnnounceOtaProviderRequest {
+    node_id providerNodeId = 0;
+    vendor_id vendorId = 1;
+    OTAAnnouncementReason announcementReason = 2;
+    optional OCTET_STRING metadataForNode = 3;
+    endpoint_no endpoint = 4;
   }
 
-  bitmap ColorLoopUpdateFlags : BITMAP8 {
-    kUpdateAction = 0x1;
-    kUpdateDirection = 0x2;
-    kUpdateTime = 0x4;
-    kUpdateStartHue = 0x8;
-  }
+  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
+}
 
-  readonly attribute int8u currentHue = 0;
-  readonly attribute int8u currentSaturation = 1;
-  readonly attribute int16u remainingTime = 2;
-  readonly attribute int16u currentX = 3;
-  readonly attribute int16u currentY = 4;
-  readonly attribute enum8 driftCompensation = 5;
-  readonly attribute char_string<254> compensationText = 6;
-  readonly attribute int16u colorTemperature = 7;
-  readonly attribute enum8 colorMode = 8;
-  attribute bitmap8 options = 15;
-  readonly attribute nullable int8u numberOfPrimaries = 16;
-  readonly attribute int16u primary1X = 17;
-  readonly attribute int16u primary1Y = 18;
-  readonly attribute nullable int8u primary1Intensity = 19;
-  readonly attribute int16u primary2X = 21;
-  readonly attribute int16u primary2Y = 22;
-  readonly attribute nullable int8u primary2Intensity = 23;
-  readonly attribute int16u primary3X = 25;
-  readonly attribute int16u primary3Y = 26;
-  readonly attribute nullable int8u primary3Intensity = 27;
-  readonly attribute int16u primary4X = 32;
-  readonly attribute int16u primary4Y = 33;
-  readonly attribute nullable int8u primary4Intensity = 34;
-  readonly attribute int16u primary5X = 36;
-  readonly attribute int16u primary5Y = 37;
-  readonly attribute nullable int8u primary5Intensity = 38;
-  readonly attribute int16u primary6X = 40;
-  readonly attribute int16u primary6Y = 41;
-  readonly attribute nullable int8u primary6Intensity = 42;
-  attribute access(write: manage) int16u whitePointX = 48;
-  attribute access(write: manage) int16u whitePointY = 49;
-  attribute access(write: manage) int16u colorPointRX = 50;
-  attribute access(write: manage) int16u colorPointRY = 51;
-  attribute access(write: manage) nullable int8u colorPointRIntensity = 52;
-  attribute access(write: manage) int16u colorPointGX = 54;
-  attribute access(write: manage) int16u colorPointGY = 55;
-  attribute access(write: manage) nullable int8u colorPointGIntensity = 56;
-  attribute access(write: manage) int16u colorPointBX = 58;
-  attribute access(write: manage) int16u colorPointBY = 59;
-  attribute access(write: manage) nullable int8u colorPointBIntensity = 60;
-  readonly attribute int16u enhancedCurrentHue = 16384;
-  readonly attribute enum8 enhancedColorMode = 16385;
-  readonly attribute int8u colorLoopActive = 16386;
-  readonly attribute int8u colorLoopDirection = 16387;
-  readonly attribute int16u colorLoopTime = 16388;
-  readonly attribute int16u colorLoopStartEnhancedHue = 16389;
-  readonly attribute int16u colorLoopStoredEnhancedHue = 16390;
-  readonly attribute bitmap16 colorCapabilities = 16394;
-  readonly attribute int16u colorTempPhysicalMinMireds = 16395;
-  readonly attribute int16u colorTempPhysicalMaxMireds = 16396;
-  readonly attribute int16u coupleColorTempToLevelMinMireds = 16397;
-  attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400;
+client cluster LocalizationConfiguration = 43 {
+  attribute char_string<35> activeLocale = 0;
+  readonly attribute CHAR_STRING supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct MoveToHueRequest {
-    INT8U hue = 0;
-    HueDirection direction = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+client cluster TimeFormatLocalization = 44 {
+  enum CalendarType : ENUM8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
   }
 
-  request struct MoveHueRequest {
-    HueMoveMode moveMode = 0;
-    INT8U rate = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
+  enum HourFormat : ENUM8 {
+    k12hr = 0;
+    k24hr = 1;
   }
 
-  request struct StepHueRequest {
-    HueStepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT8U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
-  }
+  attribute HourFormat hourFormat = 0;
+  attribute CalendarType activeCalendarType = 1;
+  readonly attribute CalendarType supportedCalendarTypes[] = 2;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct MoveToSaturationRequest {
-    INT8U saturation = 0;
-    INT16U transitionTime = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
+client cluster UnitLocalization = 45 {
+  enum TempUnit : ENUM8 {
+    kFahrenheit = 0;
+    kCelsius = 1;
+    kKelvin = 2;
   }
 
-  request struct MoveSaturationRequest {
-    SaturationMoveMode moveMode = 0;
-    INT8U rate = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
+  bitmap UnitLocalizationFeature : BITMAP32 {
+    kTemperatureUnit = 0x1;
   }
 
-  request struct StepSaturationRequest {
-    SaturationStepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT8U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
-  }
+  attribute TempUnit temperatureUnit = 0;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct MoveToHueAndSaturationRequest {
-    INT8U hue = 0;
-    INT8U saturation = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
-  }
+client cluster PowerSourceConfiguration = 46 {
+  readonly attribute INT8U sources[] = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct MoveToColorRequest {
-    INT16U colorX = 0;
-    INT16U colorY = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+client cluster PowerSource = 47 {
+  enum BatChargeFaultType : ENUM8 {
+    kUnspecfied = 0;
+    kAmbientTooHot = 1;
+    kAmbientTooCold = 2;
+    kBatteryTooHot = 3;
+    kBatteryTooCold = 4;
+    kBatteryAbsent = 5;
+    kBatteryOverVoltage = 6;
+    kBatteryUnderVoltage = 7;
+    kChargerOverVoltage = 8;
+    kChargerUnderVoltage = 9;
+    kSafetyTimeout = 10;
   }
 
-  request struct MoveColorRequest {
-    INT16S rateX = 0;
-    INT16S rateY = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
+  enum BatChargeLevel : ENUM8 {
+    kOk = 0;
+    kWarning = 1;
+    kCritical = 2;
   }
 
-  request struct StepColorRequest {
-    INT16S stepX = 0;
-    INT16S stepY = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  enum BatChargeState : ENUM8 {
+    kUnknown = 0;
+    kIsCharging = 1;
+    kIsAtFullCharge = 2;
+    kIsNotCharging = 3;
   }
 
-  request struct MoveToColorTemperatureRequest {
-    INT16U colorTemperature = 0;
-    INT16U transitionTime = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
+  enum BatFaultType : ENUM8 {
+    kUnspecfied = 0;
+    kOverTemp = 1;
+    kUnderTemp = 2;
   }
 
-  request struct EnhancedMoveToHueRequest {
-    INT16U enhancedHue = 0;
-    HueDirection direction = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  enum BatReplaceability : ENUM8 {
+    kUnspecified = 0;
+    kNotReplaceable = 1;
+    kUserReplaceable = 2;
+    kFactoryReplaceable = 3;
   }
 
-  request struct EnhancedMoveHueRequest {
-    HueMoveMode moveMode = 0;
-    INT16U rate = 1;
-    BITMAP8 optionsMask = 2;
-    BITMAP8 optionsOverride = 3;
+  enum PowerSourceStatus : ENUM8 {
+    kUnspecfied = 0;
+    kActive = 1;
+    kStandby = 2;
+    kUnavailable = 3;
   }
 
-  request struct EnhancedStepHueRequest {
-    HueStepMode stepMode = 0;
-    INT16U stepSize = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  enum WiredCurrentType : ENUM8 {
+    kAc = 0;
+    kDc = 1;
   }
 
-  request struct EnhancedMoveToHueAndSaturationRequest {
-    INT16U enhancedHue = 0;
-    INT8U saturation = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionsMask = 3;
-    BITMAP8 optionsOverride = 4;
+  enum WiredFaultType : ENUM8 {
+    kUnspecfied = 0;
+    kOverVoltage = 1;
+    kUnderVoltage = 2;
   }
 
-  request struct ColorLoopSetRequest {
-    ColorLoopUpdateFlags updateFlags = 0;
-    ColorLoopAction action = 1;
-    ColorLoopDirection direction = 2;
-    INT16U time = 3;
-    INT16U startHue = 4;
-    BITMAP8 optionsMask = 5;
-    BITMAP8 optionsOverride = 6;
+  bitmap PowerSourceFeature : BITMAP32 {
+    kWired = 0x1;
+    kBattery = 0x2;
+    kRechargeable = 0x4;
+    kReplaceable = 0x8;
   }
 
-  request struct StopMoveStepRequest {
-    BITMAP8 optionsMask = 0;
-    BITMAP8 optionsOverride = 1;
+  readonly attribute enum8 status = 0;
+  readonly attribute int8u order = 1;
+  readonly attribute char_string<60> description = 2;
+  readonly attribute int32u wiredAssessedInputVoltage = 3;
+  readonly attribute int16u wiredAssessedInputFrequency = 4;
+  readonly attribute enum8 wiredCurrentType = 5;
+  readonly attribute int32u wiredAssessedCurrent = 6;
+  readonly attribute int32u wiredNominalVoltage = 7;
+  readonly attribute int32u wiredMaximumCurrent = 8;
+  readonly attribute boolean wiredPresent = 9;
+  readonly attribute ENUM8 activeWiredFaults[] = 10;
+  readonly attribute int32u batteryVoltage = 11;
+  readonly attribute int8u batteryPercentRemaining = 12;
+  readonly attribute int32u batteryTimeRemaining = 13;
+  readonly attribute enum8 batteryChargeLevel = 14;
+  readonly attribute boolean batteryReplacementNeeded = 15;
+  readonly attribute enum8 batteryReplaceability = 16;
+  readonly attribute boolean batteryPresent = 17;
+  readonly attribute ENUM8 activeBatteryFaults[] = 18;
+  readonly attribute char_string<60> batteryReplacementDescription = 19;
+  readonly attribute int32u batteryCommonDesignation = 20;
+  readonly attribute char_string<20> batteryANSIDesignation = 21;
+  readonly attribute char_string<20> batteryIECDesignation = 22;
+  readonly attribute int32u batteryApprovedChemistry = 23;
+  readonly attribute int32u batteryCapacity = 24;
+  readonly attribute int8u batteryQuantity = 25;
+  readonly attribute enum8 batteryChargeState = 26;
+  readonly attribute int32u batteryTimeToFullCharge = 27;
+  readonly attribute boolean batteryFunctionalWhileCharging = 28;
+  readonly attribute int32u batteryChargingCurrent = 29;
+  readonly attribute ENUM8 activeBatteryChargeFaults[] = 30;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+client cluster GeneralCommissioning = 48 {
+  enum CommissioningError : ENUM8 {
+    kOk = 0;
+    kValueOutsideRange = 1;
+    kInvalidAuthentication = 2;
+    kNoFailSafe = 3;
+    kBusyWithOtherAdmin = 4;
   }
 
-  request struct MoveColorTemperatureRequest {
-    HueMoveMode moveMode = 0;
-    INT16U rate = 1;
-    INT16U colorTemperatureMinimumMireds = 2;
-    INT16U colorTemperatureMaximumMireds = 3;
-    BITMAP8 optionsMask = 4;
-    BITMAP8 optionsOverride = 5;
+  enum RegulatoryLocationType : ENUM8 {
+    kIndoor = 0;
+    kOutdoor = 1;
+    kIndoorOutdoor = 2;
   }
 
-  request struct StepColorTemperatureRequest {
-    HueStepMode stepMode = 0;
-    INT16U stepSize = 1;
-    INT16U transitionTime = 2;
-    INT16U colorTemperatureMinimumMireds = 3;
-    INT16U colorTemperatureMaximumMireds = 4;
-    BITMAP8 optionsMask = 5;
-    BITMAP8 optionsOverride = 6;
+  struct BasicCommissioningInfo {
+    int16u failSafeExpiryLengthSeconds = 0;
+    int16u maxCumulativeFailsafeSeconds = 1;
   }
 
-  command MoveToHue(MoveToHueRequest): DefaultSuccess = 0;
-  command MoveHue(MoveHueRequest): DefaultSuccess = 1;
-  command StepHue(StepHueRequest): DefaultSuccess = 2;
-  command MoveToSaturation(MoveToSaturationRequest): DefaultSuccess = 3;
-  command MoveSaturation(MoveSaturationRequest): DefaultSuccess = 4;
-  command StepSaturation(StepSaturationRequest): DefaultSuccess = 5;
-  command MoveToHueAndSaturation(MoveToHueAndSaturationRequest): DefaultSuccess = 6;
-  command MoveToColor(MoveToColorRequest): DefaultSuccess = 7;
-  command MoveColor(MoveColorRequest): DefaultSuccess = 8;
-  command StepColor(StepColorRequest): DefaultSuccess = 9;
-  command MoveToColorTemperature(MoveToColorTemperatureRequest): DefaultSuccess = 10;
-  command EnhancedMoveToHue(EnhancedMoveToHueRequest): DefaultSuccess = 64;
-  command EnhancedMoveHue(EnhancedMoveHueRequest): DefaultSuccess = 65;
-  command EnhancedStepHue(EnhancedStepHueRequest): DefaultSuccess = 66;
-  command EnhancedMoveToHueAndSaturation(EnhancedMoveToHueAndSaturationRequest): DefaultSuccess = 67;
-  command ColorLoopSet(ColorLoopSetRequest): DefaultSuccess = 68;
-  command StopMoveStep(StopMoveStepRequest): DefaultSuccess = 71;
-  command MoveColorTemperature(MoveColorTemperatureRequest): DefaultSuccess = 75;
-  command StepColorTemperature(StepColorTemperatureRequest): DefaultSuccess = 76;
-}
+  attribute access(write: administer) int64u breadcrumb = 0;
+  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
+  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
+  readonly attribute RegulatoryLocationType locationCapability = 3;
+  readonly attribute boolean supportsConcurrentConnection = 4;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-client cluster ContentLauncher = 1290 {
-  enum ContentLaunchStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kUrlNotAvailable = 1;
-    kAuthFailed = 2;
+  request struct ArmFailSafeRequest {
+    INT16U expiryLengthSeconds = 0;
+    INT64U breadcrumb = 1;
   }
 
-  enum MetricTypeEnum : ENUM8 {
-    kPixels = 0;
-    kPercentage = 1;
+  request struct SetRegulatoryConfigRequest {
+    RegulatoryLocationType newRegulatoryConfig = 0;
+    CHAR_STRING countryCode = 1;
+    INT64U breadcrumb = 2;
   }
 
-  enum ParameterEnum : ENUM8 {
-    kActor = 0;
-    kChannel = 1;
-    kCharacter = 2;
-    kDirector = 3;
-    kEvent = 4;
-    kFranchise = 5;
-    kGenre = 6;
-    kLeague = 7;
-    kPopularity = 8;
-    kProvider = 9;
-    kSport = 10;
-    kSportsTeam = 11;
-    kType = 12;
+  response struct ArmFailSafeResponse = 1 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  bitmap ContentLauncherFeature : BITMAP32 {
-    kContentSearch = 0x1;
-    kURLPlayback = 0x2;
+  response struct SetRegulatoryConfigResponse = 3 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  bitmap SupportedStreamingProtocol : BITMAP32 {
-    kDash = 0x1;
-    kHls = 0x2;
+  response struct CommissioningCompleteResponse = 5 {
+    CommissioningError errorCode = 0;
+    CHAR_STRING debugText = 1;
   }
 
-  struct ContentSearch {
-    Parameter parameterList[] = 0;
+  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
+  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
+  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
+}
+
+client cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatus : ENUM8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
   }
 
-  struct Parameter {
-    ParameterEnum type = 0;
-    char_string value = 1;
-    optional AdditionalInfo externalIDList[] = 2;
+  enum WiFiBand : ENUM8 {
+    k2g4 = 0;
+    k3g65 = 1;
+    k5g = 2;
+    k6g = 3;
+    k60g = 4;
   }
 
-  struct AdditionalInfo {
-    char_string name = 0;
-    char_string value = 1;
+  bitmap NetworkCommissioningFeature : BITMAP32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
   }
 
-  struct BrandingInformation {
-    char_string providerName = 0;
-    optional StyleInformation background = 1;
-    optional StyleInformation logo = 2;
-    optional StyleInformation progressBar = 3;
-    optional StyleInformation splash = 4;
-    optional StyleInformation waterMark = 5;
+  bitmap WiFiSecurity : BITMAP8 {
+    kUnencrypted = 0x1;
+    kWepPersonal = 0x2;
+    kWpaPersonal = 0x4;
+    kWpa2Personal = 0x8;
+    kWpa3Personal = 0x10;
   }
 
-  struct StyleInformation {
-    optional char_string imageUrl = 0;
-    optional char_string color = 1;
-    optional Dimension size = 2;
+  struct NetworkInfo {
+    octet_string<32> networkID = 0;
+    boolean connected = 1;
   }
 
-  struct Dimension {
-    double width = 0;
-    double height = 1;
-    MetricTypeEnum metric = 2;
+  struct WiFiInterfaceScanResult {
+    WiFiSecurity security = 0;
+    octet_string<32> ssid = 1;
+    octet_string<6> bssid = 2;
+    int16u channel = 3;
+    WiFiBand wiFiBand = 4;
+    int8s rssi = 5;
   }
 
-  readonly attribute CHAR_STRING acceptHeader[] = 0;
-  attribute bitmap32 supportedStreamingProtocols = 1;
+  struct ThreadInterfaceScanResult {
+    int16u panId = 0;
+    int64u extendedPanId = 1;
+    char_string<16> networkName = 2;
+    int16u channel = 3;
+    int8u version = 4;
+    octet_string<8> extendedAddress = 5;
+    int8s rssi = 6;
+    int8u lqi = 7;
+  }
+
+  readonly attribute access(read: administer) int8u maxNetworks = 0;
+  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
+  readonly attribute int8u scanMaxTimeSeconds = 2;
+  readonly attribute int8u connectMaxTimeSeconds = 3;
+  attribute access(write: administer) boolean interfaceEnabled = 4;
+  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
+  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
+  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct LaunchContentRequest {
-    ContentSearch search = 0;
-    BOOLEAN autoPlay = 1;
-    optional CHAR_STRING data = 2;
+  request struct ScanNetworksRequest {
+    optional nullable OCTET_STRING ssid = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  request struct LaunchURLRequest {
-    CHAR_STRING contentURL = 0;
-    optional CHAR_STRING displayString = 1;
-    optional BrandingInformation brandingInformation = 2;
+  request struct AddOrUpdateWiFiNetworkRequest {
+    OCTET_STRING ssid = 0;
+    OCTET_STRING credentials = 1;
+    optional INT64U breadcrumb = 2;
   }
 
-  response struct LaunchResponse = 2 {
-    ContentLaunchStatusEnum status = 0;
-    optional CHAR_STRING data = 1;
+  request struct AddOrUpdateThreadNetworkRequest {
+    OCTET_STRING operationalDataset = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  command LaunchContent(LaunchContentRequest): LaunchResponse = 0;
-  command LaunchURL(LaunchURLRequest): LaunchResponse = 1;
-}
+  request struct RemoveNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
+  }
 
-client cluster Descriptor = 29 {
-  struct DeviceType {
-    devtype_id type = 0;
-    int16u revision = 1;
+  request struct ConnectNetworkRequest {
+    OCTET_STRING networkID = 0;
+    optional INT64U breadcrumb = 1;
   }
 
-  readonly attribute DeviceType deviceList[] = 0;
-  readonly attribute CLUSTER_ID serverList[] = 1;
-  readonly attribute CLUSTER_ID clientList[] = 2;
-  readonly attribute ENDPOINT_NO partsList[] = 3;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  request struct ReorderNetworkRequest {
+    OCTET_STRING networkID = 0;
+    INT8U networkIndex = 1;
+    optional INT64U breadcrumb = 2;
+  }
+
+  response struct ScanNetworksResponse = 1 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
+    optional ThreadInterfaceScanResult threadScanResults[] = 3;
+  }
+
+  response struct NetworkConfigResponse = 5 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    optional INT8U networkIndex = 2;
+  }
+
+  response struct ConnectNetworkResponse = 7 {
+    NetworkCommissioningStatus networkingStatus = 0;
+    optional CHAR_STRING debugText = 1;
+    nullable INT32S errorValue = 2;
+  }
+
+  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
+  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
+  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
+  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
+  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
+  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
 }
 
 client cluster DiagnosticLogs = 50 {
@@ -1086,598 +1252,359 @@ client cluster DiagnosticLogs = 50 {
   command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
 }
 
-client cluster DoorLock = 257 {
-  enum DlAlarmCode : ENUM8 {
-    kLockJammed = 0;
-    kLockFactoryReset = 1;
-    kLockRadioPowerCycled = 3;
-    kWrongCodeEntryLimit = 4;
-    kFrontEsceutcheonRemoved = 5;
-    kDoorForcedOpen = 6;
-    kDoorAjar = 7;
-    kForcedUser = 8;
-  }
-
-  enum DlCredentialRule : ENUM8 {
-    kSingle = 0;
-    kDouble = 1;
-    kTri = 2;
+client cluster GeneralDiagnostics = 51 {
+  enum BootReasonType : ENUM8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
   }
 
-  enum DlCredentialType : ENUM8 {
-    kProgrammingPIN = 0;
-    kPin = 1;
-    kRfid = 2;
-    kFingerprint = 3;
-    kFingerVein = 4;
-    kFace = 5;
+  enum HardwareFaultType : ENUM8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
   }
 
-  enum DlDataOperationType : ENUM8 {
-    kAdd = 0;
-    kClear = 1;
-    kModify = 2;
+  enum InterfaceType : ENUM8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
   }
 
-  enum DlDoorState : ENUM8 {
-    kDoorOpen = 0;
-    kDoorClosed = 1;
-    kDoorJammed = 2;
-    kDoorForcedOpen = 3;
-    kDoorUnspecifiedError = 4;
-    kDoorAjar = 5;
+  enum NetworkFaultType : ENUM8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
   }
 
-  enum DlLockDataType : ENUM8 {
+  enum RadioFaultType : ENUM8 {
     kUnspecified = 0;
-    kProgrammingCode = 1;
-    kUserIndex = 2;
-    kWeekDaySchedule = 3;
-    kYearDaySchedule = 4;
-    kHolidaySchedule = 5;
-    kPin = 6;
-    kRfid = 7;
-    kFingerprint = 8;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
   }
 
-  enum DlLockOperationType : ENUM8 {
-    kLock = 0;
-    kUnlock = 1;
-    kNonAccessUserEvent = 2;
-    kForcedUserEvent = 3;
+  struct NetworkInterfaceType {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceType type = 7;
   }
 
-  enum DlLockState : ENUM8 {
-    kNotFullyLocked = 0;
-    kLocked = 1;
-    kUnlocked = 2;
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultType current[] = 0;
+    HardwareFaultType previous[] = 1;
   }
 
-  enum DlLockType : ENUM8 {
-    kDeadBolt = 0;
-    kMagnetic = 1;
-    kOther = 2;
-    kMortise = 3;
-    kRim = 4;
-    kLatchBolt = 5;
-    kCylindricalLock = 6;
-    kTubularLock = 7;
-    kInterconnectedLock = 8;
-    kDeadLatch = 9;
-    kDoorFurniture = 10;
+  critical event RadioFaultChange = 1 {
+    RadioFaultType current[] = 0;
+    RadioFaultType previous[] = 1;
   }
 
-  enum DlOperatingMode : ENUM8 {
-    kNormal = 0;
-    kVacation = 1;
-    kPrivacy = 2;
-    kNoRemoteLockUnlock = 3;
-    kPassage = 4;
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultType current[] = 0;
+    NetworkFaultType previous[] = 1;
   }
 
-  enum DlOperationError : ENUM8 {
-    kUnspecified = 0;
-    kInvalidCredential = 1;
-    kDisabledUserDenied = 2;
-    kRestricted = 3;
-    kInsufficientBattery = 4;
+  critical event BootReason = 3 {
+    BootReasonType bootReason = 0;
   }
 
-  enum DlOperationSource : ENUM8 {
-    kUnspecified = 0;
-    kManual = 1;
-    kProprietaryRemote = 2;
-    kKeypad = 3;
-    kAuto = 4;
-    kButton = 5;
-    kSchedule = 6;
-    kRemote = 7;
-    kRfid = 8;
-    kBiometric = 9;
+  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
+  readonly attribute int32u totalOperationalHours = 3;
+  readonly attribute enum8 bootReasons = 4;
+  readonly attribute ENUM8 activeHardwareFaults[] = 5;
+  readonly attribute ENUM8 activeRadioFaults[] = 6;
+  readonly attribute ENUM8 activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct TestEventTriggerRequest {
+    OCTET_STRING enableKey = 0;
+    INT64U eventTrigger = 1;
   }
 
-  enum DlStatus : ENUM8 {
-    kSuccess = 0;
-    kFailure = 1;
-    kDuplicate = 2;
-    kOccupied = 3;
-    kInvalidField = 133;
-    kResourceExhausted = 137;
-    kNotFound = 139;
+  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+}
+
+client cluster SoftwareDiagnostics = 52 {
+  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
+    kWaterMarks = 0x1;
   }
 
-  enum DlUserStatus : ENUM8 {
-    kAvailable = 0;
-    kOccupiedEnabled = 1;
-    kOccupiedDisabled = 3;
+  struct ThreadMetrics {
+    int64u id = 0;
+    optional char_string<8> name = 1;
+    optional int32u stackFreeCurrent = 2;
+    optional int32u stackFreeMinimum = 3;
+    optional int32u stackSize = 4;
   }
 
-  enum DlUserType : ENUM8 {
-    kUnrestrictedUser = 0;
-    kYearDayScheduleUser = 1;
-    kWeekDayScheduleUser = 2;
-    kProgrammingUser = 3;
-    kNonAccessUser = 4;
-    kForcedUser = 5;
-    kDisposableUser = 6;
-    kExpiringUser = 7;
-    kScheduleRestrictedUser = 8;
-    kRemoteOnlyUser = 9;
+  info event SoftwareFault = 0 {
+    SoftwareFaultStruct softwareFault = 0;
   }
 
-  enum DoorLockOperationEventCode : ENUM8 {
-    kUnknownOrMfgSpecific = 0;
-    kLock = 1;
-    kUnlock = 2;
-    kLockInvalidPinOrId = 3;
-    kLockInvalidSchedule = 4;
-    kUnlockInvalidPinOrId = 5;
-    kUnlockInvalidSchedule = 6;
-    kOneTouchLock = 7;
-    kKeyLock = 8;
-    kKeyUnlock = 9;
-    kAutoLock = 10;
-    kScheduleLock = 11;
-    kScheduleUnlock = 12;
-    kManualLock = 13;
-    kManualUnlock = 14;
-  }
-
-  enum DoorLockProgrammingEventCode : ENUM8 {
-    kUnknownOrMfgSpecific = 0;
-    kMasterCodeChanged = 1;
-    kPinAdded = 2;
-    kPinDeleted = 3;
-    kPinChanged = 4;
-    kIdAdded = 5;
-    kIdDeleted = 6;
-  }
-
-  enum DoorLockSetPinOrIdStatus : ENUM8 {
-    kSuccess = 0;
-    kGeneralFailure = 1;
-    kMemoryFull = 2;
-    kDuplicateCodeError = 3;
-  }
-
-  enum DoorLockUserStatus : ENUM8 {
-    kAvailable = 0;
-    kOccupiedEnabled = 1;
-    kOccupiedDisabled = 3;
-    kNotSupported = 255;
-  }
-
-  enum DoorLockUserType : ENUM8 {
-    kUnrestricted = 0;
-    kYearDayScheduleUser = 1;
-    kWeekDayScheduleUser = 2;
-    kMasterUser = 3;
-    kNonAccessUser = 4;
-    kNotSupported = 255;
-  }
-
-  bitmap DlCredentialRuleMask : BITMAP8 {
-    kSingle = 0x1;
-    kDual = 0x2;
-    kTri = 0x4;
-  }
-
-  bitmap DlCredentialRulesSupport : BITMAP8 {
-    kSingle = 0x1;
-    kDual = 0x2;
-    kTri = 0x4;
-  }
-
-  bitmap DlDaysMaskMap : BITMAP8 {
-    kSunday = 0x1;
-    kMonday = 0x2;
-    kTuesday = 0x4;
-    kWednesday = 0x8;
-    kThursday = 0x10;
-    kFriday = 0x20;
-    kSaturday = 0x40;
-  }
-
-  bitmap DlDefaultConfigurationRegister : BITMAP16 {
-    kEnableLocalProgrammingEnabled = 0x1;
-    kKeypadInterfaceDefaultAccessEnabled = 0x2;
-    kRemoteInterfaceDefaultAccessIsEnabled = 0x4;
-    kSoundEnabled = 0x20;
-    kAutoRelockTimeSet = 0x40;
-    kLEDSettingsSet = 0x80;
-  }
-
-  bitmap DlKeypadOperationEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kLock = 0x2;
-    kUnlock = 0x4;
-    kLockInvalidPIN = 0x8;
-    kLockInvalidSchedule = 0x10;
-    kUnlockInvalidCode = 0x20;
-    kUnlockInvalidSchedule = 0x40;
-    kNonAccessUserOpEvent = 0x80;
-  }
-
-  bitmap DlKeypadProgrammingEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kProgrammingPINChanged = 0x2;
-    kPINAdded = 0x4;
-    kPINCleared = 0x8;
-    kPINChanged = 0x10;
-  }
-
-  bitmap DlLocalProgrammingFeatures : BITMAP8 {
-    kAddUsersCredentialsSchedulesLocally = 0x1;
-    kModifyUsersCredentialsSchedulesLocally = 0x2;
-    kClearUsersCredentialsSchedulesLocally = 0x4;
-    kAdjustLockSettingsLocally = 0x8;
-  }
-
-  bitmap DlManualOperationEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kThumbturnLock = 0x2;
-    kThumbturnUnlock = 0x4;
-    kOneTouchLock = 0x8;
-    kKeyLock = 0x10;
-    kKeyUnlock = 0x20;
-    kAutoLock = 0x40;
-    kScheduleLock = 0x80;
-    kScheduleUnlock = 0x100;
-    kManualLock = 0x200;
-    kManualUnlock = 0x400;
-  }
-
-  bitmap DlRFIDOperationEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kLock = 0x2;
-    kUnlock = 0x4;
-    kLockInvalidRFID = 0x8;
-    kLockInvalidSchedule = 0x10;
-    kUnlockInvalidRFID = 0x20;
-    kUnlockInvalidSchedule = 0x40;
-  }
-
-  bitmap DlRFIDProgrammingEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kRFIDCodeAdded = 0x20;
-    kRFIDCodeCleared = 0x40;
-  }
-
-  bitmap DlRemoteOperationEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kLock = 0x2;
-    kUnlock = 0x4;
-    kLockInvalidCode = 0x8;
-    kLockInvalidSchedule = 0x10;
-    kUnlockInvalidCode = 0x20;
-    kUnlockInvalidSchedule = 0x40;
-  }
-
-  bitmap DlRemoteProgrammingEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kProgrammingPINChanged = 0x2;
-    kPINAdded = 0x4;
-    kPINCleared = 0x8;
-    kPINChanged = 0x10;
-    kRFIDCodeAdded = 0x20;
-    kRFIDCodeCleared = 0x40;
-  }
-
-  bitmap DlSupportedOperatingModes : BITMAP16 {
-    kNormal = 0x1;
-    kVacation = 0x2;
-    kPrivacy = 0x4;
-    kNoRemoteLockUnlock = 0x8;
-    kPassage = 0x10;
-  }
-
-  bitmap DoorLockDayOfWeek : BITMAP8 {
-    kSunday = 0x1;
-    kMonday = 0x2;
-    kTuesday = 0x4;
-    kWednesday = 0x8;
-    kThursday = 0x10;
-    kFriday = 0x20;
-    kSaturday = 0x40;
-  }
-
-  bitmap DoorLockFeature : BITMAP32 {
-    kPINCredentials = 0x1;
-    kRFIDCredentials = 0x2;
-    kFingerCredentials = 0x4;
-    kLogging = 0x8;
-    kAccessSchedules = 0x10;
-    kDoorPositionSensor = 0x20;
-    kFaceCredentials = 0x40;
-    kCredentialsOTA = 0x80;
-    kUsersManagement = 0x100;
-    kNotifications = 0x200;
-  }
-
-  struct DlCredential {
-    DlCredentialType credentialType = 0;
-    int16u credentialIndex = 1;
-  }
-
-  critical event DoorLockAlarm = 0 {
-    DlAlarmCode alarmCode = 0;
-  }
-
-  critical event DoorStateChange = 1 {
-    DlDoorState doorState = 0;
-  }
-
-  critical event LockOperation = 2 {
-    DlLockOperationType lockOperationType = 0;
-    DlOperationSource operationSource = 1;
-    nullable INT16U userIndex = 2;
-    nullable fabric_idx fabricIndex = 3;
-    nullable NODE_ID sourceNode = 4;
-    optional nullable DlCredential credentials[] = 5;
-  }
-
-  critical event LockOperationError = 3 {
-    DlLockOperationType lockOperationType = 0;
-    DlOperationSource operationSource = 1;
-    DlOperationError operationError = 2;
-    nullable INT16U userIndex = 3;
-    nullable fabric_idx fabricIndex = 4;
-    nullable NODE_ID sourceNode = 5;
-    optional nullable DlCredential credentials[] = 6;
-  }
-
-  info event LockUserChange = 4 {
-    DlLockDataType lockDataType = 0;
-    DlDataOperationType dataOperationType = 1;
-    DlOperationSource operationSource = 2;
-    nullable INT16U userIndex = 3;
-    nullable fabric_idx fabricIndex = 4;
-    nullable NODE_ID sourceNode = 5;
-    nullable INT16U dataIndex = 6;
-  }
-
-  readonly attribute nullable DlLockState lockState = 0;
-  readonly attribute DlLockType lockType = 1;
-  readonly attribute boolean actuatorEnabled = 2;
-  readonly attribute nullable DlDoorState doorState = 3;
-  readonly attribute int16u numberOfTotalUsersSupported = 17;
-  readonly attribute int16u numberOfPINUsersSupported = 18;
-  readonly attribute int16u numberOfRFIDUsersSupported = 19;
-  readonly attribute int8u numberOfWeekDaySchedulesSupportedPerUser = 20;
-  readonly attribute int8u numberOfYearDaySchedulesSupportedPerUser = 21;
-  readonly attribute int8u numberOfHolidaySchedulesSupported = 22;
-  readonly attribute int8u maxPINCodeLength = 23;
-  readonly attribute int8u minPINCodeLength = 24;
-  readonly attribute int8u maxRFIDCodeLength = 25;
-  readonly attribute int8u minRFIDCodeLength = 26;
-  readonly attribute int8u numberOfCredentialsSupportedPerUser = 28;
-  attribute access(write: manage) char_string<3> language = 33;
-  attribute access(write: manage) int32u autoRelockTime = 35;
-  attribute access(write: manage) int8u soundVolume = 36;
-  attribute access(write: manage) DlOperatingMode operatingMode = 37;
-  readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
-  attribute access(write: manage) boolean enableOneTouchLocking = 41;
-  attribute access(write: manage) boolean enablePrivacyModeButton = 43;
-  attribute access(write: administer) int8u wrongCodeEntryLimit = 48;
-  attribute access(write: administer) int8u userCodeTemporaryDisableTime = 49;
-  nosubscribe attribute access(write: administer) boolean requirePINforRemoteOperation = 51;
+  readonly attribute ThreadMetrics threadMetrics[] = 0;
+  readonly attribute int64u currentHeapFree = 1;
+  readonly attribute int64u currentHeapUsed = 2;
+  readonly attribute int64u currentHeapHighWatermark = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct LockDoorRequest {
-    optional OCTET_STRING pinCode = 0;
-  }
-
-  request struct UnlockDoorRequest {
-    optional OCTET_STRING pinCode = 0;
-  }
-
-  request struct UnlockWithTimeoutRequest {
-    INT16U timeout = 0;
-    optional OCTET_STRING pinCode = 1;
-  }
-
-  request struct SetWeekDayScheduleRequest {
-    INT8U weekDayIndex = 0;
-    INT16U userIndex = 1;
-    DlDaysMaskMap daysMask = 2;
-    INT8U startHour = 3;
-    INT8U startMinute = 4;
-    INT8U endHour = 5;
-    INT8U endMinute = 6;
-  }
-
-  request struct GetWeekDayScheduleRequest {
-    INT8U weekDayIndex = 0;
-    INT16U userIndex = 1;
-  }
-
-  request struct ClearWeekDayScheduleRequest {
-    INT8U weekDayIndex = 0;
-    INT16U userIndex = 1;
-  }
-
-  request struct SetYearDayScheduleRequest {
-    INT8U yearDayIndex = 0;
-    INT16U userIndex = 1;
-    epoch_s localStartTime = 2;
-    epoch_s localEndTime = 3;
-  }
+  command ResetWatermarks(): DefaultSuccess = 0;
+}
 
-  request struct GetYearDayScheduleRequest {
-    INT8U yearDayIndex = 0;
-    INT16U userIndex = 1;
+client cluster ThreadNetworkDiagnostics = 53 {
+  enum NetworkFault : ENUM8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
   }
 
-  request struct ClearYearDayScheduleRequest {
-    INT8U yearDayIndex = 0;
-    INT16U userIndex = 1;
+  enum RoutingRole : ENUM8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kReed = 4;
+    kRouter = 5;
+    kLeader = 6;
   }
 
-  request struct SetHolidayScheduleRequest {
-    INT8U holidayIndex = 0;
-    epoch_s localStartTime = 1;
-    epoch_s localEndTime = 2;
-    DlOperatingMode operatingMode = 3;
+  enum ThreadConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  request struct GetHolidayScheduleRequest {
-    INT8U holidayIndex = 0;
+  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+    kMLECounts = 0x4;
+    kMACCounts = 0x8;
   }
 
-  request struct ClearHolidayScheduleRequest {
-    INT8U holidayIndex = 0;
+  struct NeighborTable {
+    int64u extAddress = 0;
+    int32u age = 1;
+    int16u rloc16 = 2;
+    int32u linkFrameCounter = 3;
+    int32u mleFrameCounter = 4;
+    int8u lqi = 5;
+    nullable int8s averageRssi = 6;
+    nullable int8s lastRssi = 7;
+    int8u frameErrorRate = 8;
+    int8u messageErrorRate = 9;
+    boolean rxOnWhenIdle = 10;
+    boolean fullThreadDevice = 11;
+    boolean fullNetworkData = 12;
+    boolean isChild = 13;
   }
 
-  request struct SetUserRequest {
-    DlDataOperationType operationType = 0;
-    INT16U userIndex = 1;
-    nullable CHAR_STRING userName = 2;
-    nullable INT32U userUniqueId = 3;
-    nullable DlUserStatus userStatus = 4;
-    nullable DlUserType userType = 5;
-    nullable DlCredentialRule credentialRule = 6;
+  struct RouteTable {
+    int64u extAddress = 0;
+    int16u rloc16 = 1;
+    int8u routerId = 2;
+    int8u nextHop = 3;
+    int8u pathCost = 4;
+    int8u LQIIn = 5;
+    int8u LQIOut = 6;
+    int8u age = 7;
+    boolean allocated = 8;
+    boolean linkEstablished = 9;
   }
 
-  request struct GetUserRequest {
-    INT16U userIndex = 0;
+  struct SecurityPolicy {
+    int16u rotationTime = 0;
+    bitmap16 flags = 1;
   }
 
-  request struct ClearUserRequest {
-    INT16U userIndex = 0;
+  struct OperationalDatasetComponents {
+    boolean activeTimestampPresent = 0;
+    boolean pendingTimestampPresent = 1;
+    boolean masterKeyPresent = 2;
+    boolean networkNamePresent = 3;
+    boolean extendedPanIdPresent = 4;
+    boolean meshLocalPrefixPresent = 5;
+    boolean delayPresent = 6;
+    boolean panIdPresent = 7;
+    boolean channelPresent = 8;
+    boolean pskcPresent = 9;
+    boolean securityPolicyPresent = 10;
+    boolean channelMaskPresent = 11;
   }
 
-  request struct SetCredentialRequest {
-    DlDataOperationType operationType = 0;
-    DlCredential credential = 1;
-    LONG_OCTET_STRING credentialData = 2;
-    nullable INT16U userIndex = 3;
-    nullable DlUserStatus userStatus = 4;
-    nullable DlUserType userType = 5;
+  info event ConnectionStatus = 0 {
+    ThreadConnectionStatus connectionStatus = 0;
   }
 
-  request struct GetCredentialStatusRequest {
-    DlCredential credential = 0;
-  }
+  readonly attribute nullable int16u channel = 0;
+  readonly attribute nullable RoutingRole routingRole = 1;
+  readonly attribute nullable char_string<16> networkName = 2;
+  readonly attribute nullable int16u panId = 3;
+  readonly attribute nullable int64u extendedPanId = 4;
+  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute NeighborTable neighborTableList[] = 7;
+  readonly attribute RouteTable routeTableList[] = 8;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
+  readonly attribute int16u detachedRoleCount = 14;
+  readonly attribute int16u childRoleCount = 15;
+  readonly attribute int16u routerRoleCount = 16;
+  readonly attribute int16u leaderRoleCount = 17;
+  readonly attribute int16u attachAttemptCount = 18;
+  readonly attribute int16u partitionIdChangeCount = 19;
+  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
+  readonly attribute int16u parentChangeCount = 21;
+  readonly attribute int32u txTotalCount = 22;
+  readonly attribute int32u txUnicastCount = 23;
+  readonly attribute int32u txBroadcastCount = 24;
+  readonly attribute int32u txAckRequestedCount = 25;
+  readonly attribute int32u txAckedCount = 26;
+  readonly attribute int32u txNoAckRequestedCount = 27;
+  readonly attribute int32u txDataCount = 28;
+  readonly attribute int32u txDataPollCount = 29;
+  readonly attribute int32u txBeaconCount = 30;
+  readonly attribute int32u txBeaconRequestCount = 31;
+  readonly attribute int32u txOtherCount = 32;
+  readonly attribute int32u txRetryCount = 33;
+  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
+  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
+  readonly attribute int32u txErrCcaCount = 36;
+  readonly attribute int32u txErrAbortCount = 37;
+  readonly attribute int32u txErrBusyChannelCount = 38;
+  readonly attribute int32u rxTotalCount = 39;
+  readonly attribute int32u rxUnicastCount = 40;
+  readonly attribute int32u rxBroadcastCount = 41;
+  readonly attribute int32u rxDataCount = 42;
+  readonly attribute int32u rxDataPollCount = 43;
+  readonly attribute int32u rxBeaconCount = 44;
+  readonly attribute int32u rxBeaconRequestCount = 45;
+  readonly attribute int32u rxOtherCount = 46;
+  readonly attribute int32u rxAddressFilteredCount = 47;
+  readonly attribute int32u rxDestAddrFilteredCount = 48;
+  readonly attribute int32u rxDuplicatedCount = 49;
+  readonly attribute int32u rxErrNoFrameCount = 50;
+  readonly attribute int32u rxErrUnknownNeighborCount = 51;
+  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
+  readonly attribute int32u rxErrSecCount = 53;
+  readonly attribute int32u rxErrFcsCount = 54;
+  readonly attribute int32u rxErrOtherCount = 55;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelMask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
+  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  request struct ClearCredentialRequest {
-    nullable DlCredential credential = 0;
-  }
+  command ResetCounts(): DefaultSuccess = 0;
+}
 
-  response struct GetWeekDayScheduleResponse = 12 {
-    INT8U weekDayIndex = 0;
-    INT16U userIndex = 1;
-    DlStatus status = 2;
-    optional DlDaysMaskMap daysMask = 3;
-    optional INT8U startHour = 4;
-    optional INT8U startMinute = 5;
-    optional INT8U endHour = 6;
-    optional INT8U endMinute = 7;
+client cluster WiFiNetworkDiagnostics = 54 {
+  enum AssociationFailureCause : ENUM8 {
+    kUnknown = 0;
+    kAssociationFailed = 1;
+    kAuthenticationFailed = 2;
+    kSsidNotFound = 3;
   }
 
-  response struct GetYearDayScheduleResponse = 15 {
-    INT8U yearDayIndex = 0;
-    INT16U userIndex = 1;
-    DlStatus status = 2;
-    optional epoch_s localStartTime = 3;
-    optional epoch_s localEndTime = 4;
+  enum SecurityType : ENUM8 {
+    kUnspecified = 0;
+    kNone = 1;
+    kWep = 2;
+    kWpa = 3;
+    kWpa2 = 4;
+    kWpa3 = 5;
   }
 
-  response struct GetHolidayScheduleResponse = 18 {
-    INT8U holidayIndex = 0;
-    DlStatus status = 1;
-    optional epoch_s localStartTime = 2;
-    optional epoch_s localEndTime = 3;
-    optional DlOperatingMode operatingMode = 4;
+  enum WiFiConnectionStatus : ENUM8 {
+    kConnected = 0;
+    kNotConnected = 1;
   }
 
-  response struct GetUserResponse = 28 {
-    INT16U userIndex = 0;
-    nullable CHAR_STRING userName = 1;
-    nullable INT32U userUniqueId = 2;
-    nullable DlUserStatus userStatus = 3;
-    nullable DlUserType userType = 4;
-    nullable DlCredentialRule credentialRule = 5;
-    nullable DlCredential credentials[] = 6;
-    nullable fabric_idx creatorFabricIndex = 7;
-    nullable fabric_idx lastModifiedFabricIndex = 8;
-    nullable INT16U nextUserIndex = 9;
+  enum WiFiVersionType : ENUM8 {
+    k80211a = 0;
+    k80211b = 1;
+    k80211g = 2;
+    k80211n = 3;
+    k80211ac = 4;
+    k80211ax = 5;
   }
 
-  response struct SetCredentialResponse = 35 {
-    DlStatus status = 0;
-    nullable INT16U userIndex = 1;
-    nullable INT16U nextCredentialIndex = 2;
+  info event Disconnection = 0 {
+    INT16U reasonCode = 0;
   }
 
-  response struct GetCredentialStatusResponse = 37 {
-    boolean credentialExists = 0;
-    nullable INT16U userIndex = 1;
-    nullable fabric_idx creatorFabricIndex = 2;
-    nullable fabric_idx lastModifiedFabricIndex = 3;
-    nullable INT16U nextCredentialIndex = 4;
+  info event AssociationFailure = 1 {
+    AssociationFailureCause associationFailure = 0;
+    INT16U status = 1;
   }
 
-  timed command LockDoor(LockDoorRequest): DefaultSuccess = 0;
-  timed command UnlockDoor(UnlockDoorRequest): DefaultSuccess = 1;
-  timed command UnlockWithTimeout(UnlockWithTimeoutRequest): DefaultSuccess = 3;
-  command access(invoke: administer) SetWeekDaySchedule(SetWeekDayScheduleRequest): DefaultSuccess = 11;
-  command access(invoke: administer) GetWeekDaySchedule(GetWeekDayScheduleRequest): GetWeekDayScheduleResponse = 12;
-  command access(invoke: administer) ClearWeekDaySchedule(ClearWeekDayScheduleRequest): DefaultSuccess = 13;
-  command access(invoke: administer) SetYearDaySchedule(SetYearDayScheduleRequest): DefaultSuccess = 14;
-  command access(invoke: administer) GetYearDaySchedule(GetYearDayScheduleRequest): GetYearDayScheduleResponse = 15;
-  command access(invoke: administer) ClearYearDaySchedule(ClearYearDayScheduleRequest): DefaultSuccess = 16;
-  command access(invoke: administer) SetHolidaySchedule(SetHolidayScheduleRequest): DefaultSuccess = 17;
-  command access(invoke: administer) GetHolidaySchedule(GetHolidayScheduleRequest): GetHolidayScheduleResponse = 18;
-  command access(invoke: administer) ClearHolidaySchedule(ClearHolidayScheduleRequest): DefaultSuccess = 19;
-  timed command access(invoke: administer) SetUser(SetUserRequest): DefaultSuccess = 26;
-  command access(invoke: administer) GetUser(GetUserRequest): GetUserResponse = 27;
-  timed command access(invoke: administer) ClearUser(ClearUserRequest): DefaultSuccess = 29;
-  timed command access(invoke: administer) SetCredential(SetCredentialRequest): SetCredentialResponse = 34;
-  command access(invoke: administer) GetCredentialStatus(GetCredentialStatusRequest): GetCredentialStatusResponse = 36;
-  timed command access(invoke: administer) ClearCredential(ClearCredentialRequest): DefaultSuccess = 38;
-}
+  info event ConnectionStatus = 2 {
+    WiFiConnectionStatus connectionStatus = 0;
+  }
 
-client cluster ElectricalMeasurement = 2820 {
-  readonly attribute bitmap32 measurementType = 0;
-  readonly attribute int32s totalActivePower = 772;
-  readonly attribute int16u rmsVoltage = 1285;
-  readonly attribute int16u rmsVoltageMin = 1286;
-  readonly attribute int16u rmsVoltageMax = 1287;
-  readonly attribute int16u rmsCurrent = 1288;
-  readonly attribute int16u rmsCurrentMin = 1289;
-  readonly attribute int16u rmsCurrentMax = 1290;
-  readonly attribute int16s activePower = 1291;
-  readonly attribute int16s activePowerMin = 1292;
-  readonly attribute int16s activePowerMax = 1293;
+  readonly attribute nullable octet_string<6> bssid = 0;
+  readonly attribute nullable SecurityType securityType = 1;
+  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
+  readonly attribute nullable int16u channelNumber = 3;
+  readonly attribute nullable int8s rssi = 4;
+  readonly attribute int32u beaconLostCount = 5;
+  readonly attribute int32u beaconRxCount = 6;
+  readonly attribute int32u packetMulticastRxCount = 7;
+  readonly attribute int32u packetMulticastTxCount = 8;
+  readonly attribute int32u packetUnicastRxCount = 9;
+  readonly attribute int32u packetUnicastTxCount = 10;
+  readonly attribute int64u currentMaxRate = 11;
+  readonly attribute int64u overrunCount = 12;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  command ResetCounts(): DefaultSuccess = 0;
 }
 
 client cluster EthernetNetworkDiagnostics = 55 {
@@ -1712,60 +1639,36 @@ client cluster EthernetNetworkDiagnostics = 55 {
   command ResetCounts(): DefaultSuccess = 0;
 }
 
-client cluster FanControl = 514 {
-  enum FanModeSequenceType : ENUM8 {
-    kOffLowMedHigh = 0;
-    kOffLowHigh = 1;
-    kOffLowMedHighAuto = 2;
-    kOffLowHighAuto = 3;
-    kOffOnAuto = 4;
-    kOffOn = 5;
-  }
-
-  enum FanModeType : ENUM8 {
-    kOff = 0;
-    kLow = 1;
-    kMedium = 2;
-    kHigh = 3;
-    kOn = 4;
-    kAuto = 5;
-    kSmart = 6;
-  }
-
-  bitmap FanControlFeature : BITMAP32 {
-    kMultiSpeed = 0x1;
-    kAuto = 0x2;
-    kRocking = 0x4;
-    kWind = 0x8;
+client cluster BridgedDeviceBasic = 57 {
+  critical event StartUp = 0 {
+    INT32U softwareVersion = 0;
   }
 
-  bitmap RockSupportMask : BITMAP8 {
-    kRockLeftRight = 0x1;
-    kRockUpDown = 0x2;
-    kRockRound = 0x4;
+  critical event ShutDown = 1 {
   }
 
-  bitmap WindSettingMask : BITMAP8 {
-    kSleepWind = 0x1;
-    kNaturalWind = 0x2;
+  info event Leave = 2 {
   }
 
-  bitmap WindSupportMask : BITMAP8 {
-    kSleepWind = 0x1;
-    kNaturalWind = 0x2;
+  info event ReachableChanged = 3 {
+    boolean reachableNewValue = 0;
   }
 
-  attribute FanModeType fanMode = 0;
-  attribute FanModeSequenceType fanModeSequence = 1;
-  attribute nullable int8u percentSetting = 2;
-  readonly attribute int8u percentCurrent = 3;
-  readonly attribute int8u speedMax = 4;
-  attribute nullable int8u speedSetting = 5;
-  readonly attribute int8u speedCurrent = 6;
-  readonly attribute bitmap8 rockSupport = 7;
-  attribute bitmap8 rockSetting = 8;
-  readonly attribute bitmap8 windSupport = 9;
-  attribute bitmap8 windSetting = 10;
+  readonly attribute char_string<32> vendorName = 1;
+  readonly attribute vendor_id vendorID = 2;
+  readonly attribute char_string<32> productName = 3;
+  attribute char_string<32> nodeLabel = 5;
+  readonly attribute int16u hardwareVersion = 7;
+  readonly attribute char_string<64> hardwareVersionString = 8;
+  readonly attribute int32u softwareVersion = 9;
+  readonly attribute char_string<64> softwareVersionString = 10;
+  readonly attribute char_string<16> manufacturingDate = 11;
+  readonly attribute char_string<32> partNumber = 12;
+  readonly attribute long_char_string<256> productURL = 13;
+  readonly attribute char_string<64> productLabel = 14;
+  readonly attribute char_string<32> serialNumber = 15;
+  readonly attribute boolean reachable = 17;
+  readonly attribute char_string<32> uniqueID = 18;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1773,20 +1676,40 @@ client cluster FanControl = 514 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-client cluster FixedLabel = 64 {
-  readonly attribute LabelStruct labelList[] = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+client cluster Switch = 59 {
+  info event SwitchLatched = 0 {
+    INT8U newPosition = 0;
+  }
 
-client cluster FlowMeasurement = 1028 {
-  readonly attribute nullable int16u measuredValue = 0;
-  readonly attribute nullable int16u minMeasuredValue = 1;
-  readonly attribute nullable int16u maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
+  info event InitialPress = 1 {
+    INT8U newPosition = 0;
+  }
+
+  info event LongPress = 2 {
+    INT8U newPosition = 0;
+  }
+
+  info event ShortRelease = 3 {
+    INT8U previousPosition = 0;
+  }
+
+  info event LongRelease = 4 {
+    INT8U previousPosition = 0;
+  }
+
+  info event MultiPressOngoing = 5 {
+    INT8U newPosition = 0;
+    INT8U currentNumberOfPressesCounted = 1;
+  }
+
+  info event MultiPressComplete = 6 {
+    INT8U newPosition = 0;
+    INT8U totalNumberOfPressesCounted = 1;
+  }
+
+  readonly attribute int8u numberOfPositions = 0;
+  readonly attribute int8u currentPosition = 1;
+  readonly attribute int8u multiPressMax = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1794,169 +1717,153 @@ client cluster FlowMeasurement = 1028 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-client cluster GeneralCommissioning = 48 {
-  enum CommissioningError : ENUM8 {
-    kOk = 0;
-    kValueOutsideRange = 1;
-    kInvalidAuthentication = 2;
-    kNoFailSafe = 3;
-    kBusyWithOtherAdmin = 4;
-  }
-
-  enum RegulatoryLocationType : ENUM8 {
-    kIndoor = 0;
-    kOutdoor = 1;
-    kIndoorOutdoor = 2;
+client cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatus : ENUM8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
   }
 
-  struct BasicCommissioningInfo {
-    int16u failSafeExpiryLengthSeconds = 0;
-    int16u maxCumulativeFailsafeSeconds = 1;
+  enum StatusCode : ENUM8 {
+    kBusy = 1;
+    kPAKEParameterError = 2;
+    kWindowNotOpen = 3;
   }
 
-  attribute access(write: administer) int64u breadcrumb = 0;
-  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
-  readonly attribute RegulatoryLocationType regulatoryConfig = 2;
-  readonly attribute RegulatoryLocationType locationCapability = 3;
-  readonly attribute boolean supportsConcurrentConnection = 4;
+  readonly attribute int8u windowStatus = 0;
+  readonly attribute fabric_idx adminFabricIndex = 1;
+  readonly attribute int16u adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct ArmFailSafeRequest {
-    INT16U expiryLengthSeconds = 0;
-    INT64U breadcrumb = 1;
+  request struct OpenCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
+    OCTET_STRING PAKEVerifier = 1;
+    INT16U discriminator = 2;
+    INT32U iterations = 3;
+    OCTET_STRING salt = 4;
   }
 
-  request struct SetRegulatoryConfigRequest {
-    RegulatoryLocationType newRegulatoryConfig = 0;
-    CHAR_STRING countryCode = 1;
-    INT64U breadcrumb = 2;
+  request struct OpenBasicCommissioningWindowRequest {
+    INT16U commissioningTimeout = 0;
   }
 
-  response struct ArmFailSafeResponse = 1 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
+}
+
+client cluster OperationalCredentials = 62 {
+  enum OperationalCertStatus : ENUM8 {
+    kSuccess = 0;
+    kInvalidPublicKey = 1;
+    kInvalidNodeOpId = 2;
+    kInvalidNOC = 3;
+    kMissingCsr = 4;
+    kTableFull = 5;
+    kInvalidAdminSubject = 6;
+    kInsufficientPrivilege = 8;
+    kFabricConflict = 9;
+    kLabelConflict = 10;
+    kInvalidFabricIndex = 11;
   }
 
-  response struct SetRegulatoryConfigResponse = 3 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  struct NOCStruct {
+    octet_string noc = 1;
+    nullable octet_string icac = 2;
+    fabric_idx fabricIndex = 254;
   }
 
-  response struct CommissioningCompleteResponse = 5 {
-    CommissioningError errorCode = 0;
-    CHAR_STRING debugText = 1;
+  struct FabricDescriptor {
+    octet_string<65> rootPublicKey = 1;
+    vendor_id vendorId = 2;
+    fabric_id fabricId = 3;
+    node_id nodeId = 4;
+    char_string<32> label = 5;
+    fabric_idx fabricIndex = 254;
   }
 
-  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
-  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
-  command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
-}
+  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
+  readonly attribute FabricDescriptor fabrics[] = 1;
+  readonly attribute int8u supportedFabrics = 2;
+  readonly attribute int8u commissionedFabrics = 3;
+  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
+  readonly attribute fabric_idx currentFabricIndex = 5;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-client cluster GeneralDiagnostics = 51 {
-  enum BootReasonType : ENUM8 {
-    kUnspecified = 0;
-    kPowerOnReboot = 1;
-    kBrownOutReset = 2;
-    kSoftwareWatchdogReset = 3;
-    kHardwareWatchdogReset = 4;
-    kSoftwareUpdateCompleted = 5;
-    kSoftwareReset = 6;
+  request struct AttestationRequestRequest {
+    OCTET_STRING attestationNonce = 0;
   }
 
-  enum HardwareFaultType : ENUM8 {
-    kUnspecified = 0;
-    kRadio = 1;
-    kSensor = 2;
-    kResettableOverTemp = 3;
-    kNonResettableOverTemp = 4;
-    kPowerSource = 5;
-    kVisualDisplayFault = 6;
-    kAudioOutputFault = 7;
-    kUserInterfaceFault = 8;
-    kNonVolatileMemoryError = 9;
-    kTamperDetected = 10;
+  request struct CertificateChainRequestRequest {
+    INT8U certificateType = 0;
   }
 
-  enum InterfaceType : ENUM8 {
-    kUnspecified = 0;
-    kWiFi = 1;
-    kEthernet = 2;
-    kCellular = 3;
-    kThread = 4;
+  request struct CSRRequestRequest {
+    OCTET_STRING CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
   }
 
-  enum NetworkFaultType : ENUM8 {
-    kUnspecified = 0;
-    kHardwareFailure = 1;
-    kNetworkJammed = 2;
-    kConnectionFailed = 3;
+  request struct AddNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
+    OCTET_STRING IPKValue = 2;
+    Int64u caseAdminSubject = 3;
+    VENDOR_ID adminVendorId = 4;
   }
 
-  enum RadioFaultType : ENUM8 {
-    kUnspecified = 0;
-    kWiFiFault = 1;
-    kCellularFault = 2;
-    kThreadFault = 3;
-    kNFCFault = 4;
-    kBLEFault = 5;
-    kEthernetFault = 6;
+  request struct UpdateNOCRequest {
+    OCTET_STRING NOCValue = 0;
+    optional OCTET_STRING ICACValue = 1;
   }
 
-  struct NetworkInterfaceType {
-    char_string<32> name = 0;
-    boolean isOperational = 1;
-    nullable boolean offPremiseServicesReachableIPv4 = 2;
-    nullable boolean offPremiseServicesReachableIPv6 = 3;
-    octet_string<8> hardwareAddress = 4;
-    octet_string IPv4Addresses[] = 5;
-    octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+  request struct UpdateFabricLabelRequest {
+    CHAR_STRING label = 0;
   }
 
-  critical event HardwareFaultChange = 0 {
-    HardwareFaultType current[] = 0;
-    HardwareFaultType previous[] = 1;
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
   }
 
-  critical event RadioFaultChange = 1 {
-    RadioFaultType current[] = 0;
-    RadioFaultType previous[] = 1;
+  request struct AddTrustedRootCertificateRequest {
+    OCTET_STRING rootCertificate = 0;
   }
 
-  critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+  response struct AttestationResponse = 1 {
+    OCTET_STRING attestationElements = 0;
+    OCTET_STRING signature = 1;
   }
 
-  critical event BootReason = 3 {
-    BootReasonType bootReason = 0;
+  response struct CertificateChainResponse = 3 {
+    OCTET_STRING certificate = 0;
   }
 
-  readonly attribute NetworkInterfaceType networkInterfaces[] = 0;
-  readonly attribute int16u rebootCount = 1;
-  readonly attribute int64u upTime = 2;
-  readonly attribute int32u totalOperationalHours = 3;
-  readonly attribute enum8 bootReasons = 4;
-  readonly attribute ENUM8 activeHardwareFaults[] = 5;
-  readonly attribute ENUM8 activeRadioFaults[] = 6;
-  readonly attribute ENUM8 activeNetworkFaults[] = 7;
-  readonly attribute boolean testEventTriggersEnabled = 8;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  response struct CSRResponse = 5 {
+    OCTET_STRING NOCSRElements = 0;
+    OCTET_STRING attestationSignature = 1;
+  }
 
-  request struct TestEventTriggerRequest {
-    OCTET_STRING enableKey = 0;
-    INT64U eventTrigger = 1;
+  response struct NOCResponse = 8 {
+    OperationalCertStatus statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional CHAR_STRING debugText = 2;
   }
 
-  command TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
 }
 
 client cluster GroupKeyManagement = 63 {
@@ -2011,1089 +1918,1103 @@ client cluster GroupKeyManagement = 63 {
     INT16U groupKeySetID = 0;
   }
 
-  request struct KeySetReadAllIndicesRequest {
-    INT16U groupKeySetIDs[] = 0;
-  }
-
-  response struct KeySetReadResponse = 2 {
-    GroupKeySetStruct groupKeySet = 0;
-  }
-
-  response struct KeySetReadAllIndicesResponse = 5 {
-    INT16U groupKeySetIDs[] = 0;
-  }
-
-  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
-  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
-  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
-  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
-}
-
-client cluster Groups = 4 {
-  readonly attribute bitmap8 nameSupport = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AddGroupRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
-  }
-
-  request struct ViewGroupRequest {
-    group_id groupId = 0;
-  }
-
-  request struct GetGroupMembershipRequest {
-    group_id groupList[] = 0;
-  }
-
-  request struct RemoveGroupRequest {
-    group_id groupId = 0;
-  }
-
-  request struct AddGroupIfIdentifyingRequest {
-    group_id groupId = 0;
-    CHAR_STRING groupName = 1;
-  }
-
-  response struct AddGroupResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-  }
-
-  response struct ViewGroupResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    CHAR_STRING groupName = 2;
+  request struct KeySetReadAllIndicesRequest {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  response struct GetGroupMembershipResponse = 2 {
-    nullable INT8U capacity = 0;
-    group_id groupList[] = 1;
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
   }
 
-  response struct RemoveGroupResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  response struct KeySetReadAllIndicesResponse = 5 {
+    INT16U groupKeySetIDs[] = 0;
   }
 
-  command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
-  command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
-  command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
-  command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
-  command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
-  command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
+  command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
 }
 
-client cluster Identify = 3 {
-  enum IdentifyEffectIdentifier : ENUM8 {
-    kBlink = 0;
-    kBreathe = 1;
-    kOkay = 2;
-    kChannelChange = 11;
-    kFinishEffect = 254;
-    kStopEffect = 255;
-  }
+client cluster FixedLabel = 64 {
+  readonly attribute LabelStruct labelList[] = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  enum IdentifyEffectVariant : ENUM8 {
-    kDefault = 0;
-  }
+client cluster UserLabel = 65 {
+  attribute access(write: manage) LabelStruct labelList[] = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  enum IdentifyIdentifyType : ENUM8 {
-    kNone = 0;
-    kVisibleLight = 1;
-    kVisibleLED = 2;
-    kAudibleBeep = 3;
-    kDisplay = 4;
-    kActuator = 5;
+client cluster BooleanState = 69 {
+  info event StateChange = 0 {
+    boolean stateValue = 0;
   }
 
-  attribute int16u identifyTime = 0;
-  readonly attribute enum8 identifyType = 1;
+  readonly attribute boolean stateValue = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct IdentifyRequest {
-    INT16U identifyTime = 0;
+client cluster ModeSelect = 80 {
+  bitmap ModeSelectFeature : BITMAP32 {
+    kDeponoff = 0x1;
   }
 
-  request struct TriggerEffectRequest {
-    IdentifyEffectIdentifier effectIdentifier = 0;
-    IdentifyEffectVariant effectVariant = 1;
+  struct ModeOptionStruct {
+    char_string<32> label = 0;
+    int8u mode = 1;
+    SemanticTag semanticTags[] = 2;
   }
 
-  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
-  command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
-}
-
-client cluster IlluminanceMeasurement = 1024 {
-  enum LightSensorType : ENUM8 {
-    kPhotodiode = 0;
-    kCmos = 1;
+  struct SemanticTag {
+    enum16 mfgCode = 0;
+    enum16 value = 1;
   }
 
-  readonly attribute nullable int16u measuredValue = 0;
-  readonly attribute nullable int16u minMeasuredValue = 1;
-  readonly attribute nullable int16u maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
-  readonly attribute nullable enum8 lightSensorType = 4;
+  readonly attribute char_string<32> description = 0;
+  readonly attribute nullable enum16 standardNamespace = 1;
+  readonly attribute ModeOptionStruct supportedModes[] = 2;
+  readonly attribute int8u currentMode = 3;
+  attribute nullable int8u startUpMode = 4;
+  attribute nullable int8u onMode = 5;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct ChangeToModeRequest {
+    INT8U newMode = 0;
+  }
+
+  command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0;
 }
 
-client cluster KeypadInput = 1289 {
-  enum CecKeyCode : ENUM8 {
-    kSelect = 0;
-    kUp = 1;
-    kDown = 2;
-    kLeft = 3;
-    kRight = 4;
-    kRightUp = 5;
-    kRightDown = 6;
-    kLeftUp = 7;
-    kLeftDown = 8;
-    kRootMenu = 9;
-    kSetupMenu = 10;
-    kContentsMenu = 11;
-    kFavoriteMenu = 12;
-    kExit = 13;
-    kMediaTopMenu = 16;
-    kMediaContextSensitiveMenu = 17;
-    kNumberEntryMode = 29;
-    kNumber11 = 30;
-    kNumber12 = 31;
-    kNumber0OrNumber10 = 32;
-    kNumbers1 = 33;
-    kNumbers2 = 34;
-    kNumbers3 = 35;
-    kNumbers4 = 36;
-    kNumbers5 = 37;
-    kNumbers6 = 38;
-    kNumbers7 = 39;
-    kNumbers8 = 40;
-    kNumbers9 = 41;
-    kDot = 42;
-    kEnter = 43;
-    kClear = 44;
-    kNextFavorite = 47;
-    kChannelUp = 48;
-    kChannelDown = 49;
-    kPreviousChannel = 50;
-    kSoundSelect = 51;
-    kInputSelect = 52;
-    kDisplayInformation = 53;
-    kHelp = 54;
-    kPageUp = 55;
-    kPageDown = 56;
-    kPower = 64;
-    kVolumeUp = 65;
-    kVolumeDown = 66;
-    kMute = 67;
-    kPlay = 68;
-    kStop = 69;
-    kPause = 70;
-    kRecord = 71;
-    kRewind = 72;
-    kFastForward = 73;
-    kEject = 74;
-    kForward = 75;
-    kBackward = 76;
-    kStopRecord = 77;
-    kPauseRecord = 78;
-    kReserved = 79;
-    kAngle = 80;
-    kSubPicture = 81;
-    kVideoOnDemand = 82;
-    kElectronicProgramGuide = 83;
-    kTimerProgramming = 84;
-    kInitialConfiguration = 85;
-    kSelectBroadcastType = 86;
-    kSelectSoundPresentation = 87;
-    kPlayFunction = 96;
-    kPausePlayFunction = 97;
-    kRecordFunction = 98;
-    kPauseRecordFunction = 99;
-    kStopFunction = 100;
-    kMuteFunction = 101;
-    kRestoreVolumeFunction = 102;
-    kTuneFunction = 103;
-    kSelectMediaFunction = 104;
-    kSelectAvInputFunction = 105;
-    kSelectAudioInputFunction = 106;
-    kPowerToggleFunction = 107;
-    kPowerOffFunction = 108;
-    kPowerOnFunction = 109;
-    kF1Blue = 113;
-    kF2Red = 114;
-    kF3Green = 115;
-    kF4Yellow = 116;
-    kF5 = 117;
-    kData = 118;
+client cluster DoorLock = 257 {
+  enum DlAlarmCode : ENUM8 {
+    kLockJammed = 0;
+    kLockFactoryReset = 1;
+    kLockRadioPowerCycled = 3;
+    kWrongCodeEntryLimit = 4;
+    kFrontEsceutcheonRemoved = 5;
+    kDoorForcedOpen = 6;
+    kDoorAjar = 7;
+    kForcedUser = 8;
+  }
+
+  enum DlCredentialRule : ENUM8 {
+    kSingle = 0;
+    kDouble = 1;
+    kTri = 2;
+  }
+
+  enum DlCredentialType : ENUM8 {
+    kProgrammingPIN = 0;
+    kPin = 1;
+    kRfid = 2;
+    kFingerprint = 3;
+    kFingerVein = 4;
+    kFace = 5;
+  }
+
+  enum DlDataOperationType : ENUM8 {
+    kAdd = 0;
+    kClear = 1;
+    kModify = 2;
+  }
+
+  enum DlDoorState : ENUM8 {
+    kDoorOpen = 0;
+    kDoorClosed = 1;
+    kDoorJammed = 2;
+    kDoorForcedOpen = 3;
+    kDoorUnspecifiedError = 4;
+    kDoorAjar = 5;
+  }
+
+  enum DlLockDataType : ENUM8 {
+    kUnspecified = 0;
+    kProgrammingCode = 1;
+    kUserIndex = 2;
+    kWeekDaySchedule = 3;
+    kYearDaySchedule = 4;
+    kHolidaySchedule = 5;
+    kPin = 6;
+    kRfid = 7;
+    kFingerprint = 8;
+  }
+
+  enum DlLockOperationType : ENUM8 {
+    kLock = 0;
+    kUnlock = 1;
+    kNonAccessUserEvent = 2;
+    kForcedUserEvent = 3;
+  }
+
+  enum DlLockState : ENUM8 {
+    kNotFullyLocked = 0;
+    kLocked = 1;
+    kUnlocked = 2;
   }
 
-  enum KeypadInputStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kUnsupportedKey = 1;
-    kInvalidKeyInCurrentState = 2;
+  enum DlLockType : ENUM8 {
+    kDeadBolt = 0;
+    kMagnetic = 1;
+    kOther = 2;
+    kMortise = 3;
+    kRim = 4;
+    kLatchBolt = 5;
+    kCylindricalLock = 6;
+    kTubularLock = 7;
+    kInterconnectedLock = 8;
+    kDeadLatch = 9;
+    kDoorFurniture = 10;
   }
 
-  bitmap KeypadInputFeature : BITMAP32 {
-    kNavigationKeyCodes = 0x1;
-    kLocationKeys = 0x2;
-    kNumberKeys = 0x4;
+  enum DlOperatingMode : ENUM8 {
+    kNormal = 0;
+    kVacation = 1;
+    kPrivacy = 2;
+    kNoRemoteLockUnlock = 3;
+    kPassage = 4;
   }
 
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  enum DlOperationError : ENUM8 {
+    kUnspecified = 0;
+    kInvalidCredential = 1;
+    kDisabledUserDenied = 2;
+    kRestricted = 3;
+    kInsufficientBattery = 4;
+  }
 
-  request struct SendKeyRequest {
-    CecKeyCode keyCode = 0;
+  enum DlOperationSource : ENUM8 {
+    kUnspecified = 0;
+    kManual = 1;
+    kProprietaryRemote = 2;
+    kKeypad = 3;
+    kAuto = 4;
+    kButton = 5;
+    kSchedule = 6;
+    kRemote = 7;
+    kRfid = 8;
+    kBiometric = 9;
   }
 
-  response struct SendKeyResponse = 1 {
-    KeypadInputStatusEnum status = 0;
+  enum DlStatus : ENUM8 {
+    kSuccess = 0;
+    kFailure = 1;
+    kDuplicate = 2;
+    kOccupied = 3;
+    kInvalidField = 133;
+    kResourceExhausted = 137;
+    kNotFound = 139;
   }
 
-  command SendKey(SendKeyRequest): SendKeyResponse = 0;
-}
+  enum DlUserStatus : ENUM8 {
+    kAvailable = 0;
+    kOccupiedEnabled = 1;
+    kOccupiedDisabled = 3;
+  }
 
-client cluster LevelControl = 8 {
-  enum MoveMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
+  enum DlUserType : ENUM8 {
+    kUnrestrictedUser = 0;
+    kYearDayScheduleUser = 1;
+    kWeekDayScheduleUser = 2;
+    kProgrammingUser = 3;
+    kNonAccessUser = 4;
+    kForcedUser = 5;
+    kDisposableUser = 6;
+    kExpiringUser = 7;
+    kScheduleRestrictedUser = 8;
+    kRemoteOnlyUser = 9;
   }
 
-  enum StepMode : ENUM8 {
-    kUp = 0;
-    kDown = 1;
+  enum DoorLockOperationEventCode : ENUM8 {
+    kUnknownOrMfgSpecific = 0;
+    kLock = 1;
+    kUnlock = 2;
+    kLockInvalidPinOrId = 3;
+    kLockInvalidSchedule = 4;
+    kUnlockInvalidPinOrId = 5;
+    kUnlockInvalidSchedule = 6;
+    kOneTouchLock = 7;
+    kKeyLock = 8;
+    kKeyUnlock = 9;
+    kAutoLock = 10;
+    kScheduleLock = 11;
+    kScheduleUnlock = 12;
+    kManualLock = 13;
+    kManualUnlock = 14;
   }
 
-  bitmap LevelControlFeature : BITMAP32 {
-    kOnOff = 0x1;
-    kLighting = 0x2;
-    kFrequency = 0x4;
+  enum DoorLockProgrammingEventCode : ENUM8 {
+    kUnknownOrMfgSpecific = 0;
+    kMasterCodeChanged = 1;
+    kPinAdded = 2;
+    kPinDeleted = 3;
+    kPinChanged = 4;
+    kIdAdded = 5;
+    kIdDeleted = 6;
   }
 
-  readonly attribute int8u currentLevel = 0;
-  readonly attribute int16u remainingTime = 1;
-  readonly attribute int8u minLevel = 2;
-  readonly attribute int8u maxLevel = 3;
-  readonly attribute int16u currentFrequency = 4;
-  readonly attribute int16u minFrequency = 5;
-  readonly attribute int16u maxFrequency = 6;
-  attribute bitmap8 options = 15;
-  attribute int16u onOffTransitionTime = 16;
-  attribute nullable int8u onLevel = 17;
-  attribute nullable int16u onTransitionTime = 18;
-  attribute nullable int16u offTransitionTime = 19;
-  attribute nullable int8u defaultMoveRate = 20;
-  attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  enum DoorLockSetPinOrIdStatus : ENUM8 {
+    kSuccess = 0;
+    kGeneralFailure = 1;
+    kMemoryFull = 2;
+    kDuplicateCodeError = 3;
+  }
 
-  request struct MoveToLevelRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
+  enum DoorLockUserStatus : ENUM8 {
+    kAvailable = 0;
+    kOccupiedEnabled = 1;
+    kOccupiedDisabled = 3;
+    kNotSupported = 255;
   }
 
-  request struct MoveRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
-    BITMAP8 optionMask = 2;
-    BITMAP8 optionOverride = 3;
+  enum DoorLockUserType : ENUM8 {
+    kUnrestricted = 0;
+    kYearDayScheduleUser = 1;
+    kWeekDayScheduleUser = 2;
+    kMasterUser = 3;
+    kNonAccessUser = 4;
+    kNotSupported = 255;
   }
 
-  request struct StepRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
-    BITMAP8 optionMask = 3;
-    BITMAP8 optionOverride = 4;
+  bitmap DlCredentialRuleMask : BITMAP8 {
+    kSingle = 0x1;
+    kDual = 0x2;
+    kTri = 0x4;
   }
 
-  request struct StopRequest {
-    BITMAP8 optionMask = 0;
-    BITMAP8 optionOverride = 1;
+  bitmap DlCredentialRulesSupport : BITMAP8 {
+    kSingle = 0x1;
+    kDual = 0x2;
+    kTri = 0x4;
   }
 
-  request struct MoveToLevelWithOnOffRequest {
-    INT8U level = 0;
-    INT16U transitionTime = 1;
+  bitmap DlDaysMaskMap : BITMAP8 {
+    kSunday = 0x1;
+    kMonday = 0x2;
+    kTuesday = 0x4;
+    kWednesday = 0x8;
+    kThursday = 0x10;
+    kFriday = 0x20;
+    kSaturday = 0x40;
   }
 
-  request struct MoveWithOnOffRequest {
-    MoveMode moveMode = 0;
-    INT8U rate = 1;
+  bitmap DlDefaultConfigurationRegister : BITMAP16 {
+    kEnableLocalProgrammingEnabled = 0x1;
+    kKeypadInterfaceDefaultAccessEnabled = 0x2;
+    kRemoteInterfaceDefaultAccessIsEnabled = 0x4;
+    kSoundEnabled = 0x20;
+    kAutoRelockTimeSet = 0x40;
+    kLEDSettingsSet = 0x80;
   }
 
-  request struct StepWithOnOffRequest {
-    StepMode stepMode = 0;
-    INT8U stepSize = 1;
-    INT16U transitionTime = 2;
+  bitmap DlKeypadOperationEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kLock = 0x2;
+    kUnlock = 0x4;
+    kLockInvalidPIN = 0x8;
+    kLockInvalidSchedule = 0x10;
+    kUnlockInvalidCode = 0x20;
+    kUnlockInvalidSchedule = 0x40;
+    kNonAccessUserOpEvent = 0x80;
   }
 
-  command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0;
-  command Move(MoveRequest): DefaultSuccess = 1;
-  command Step(StepRequest): DefaultSuccess = 2;
-  command Stop(StopRequest): DefaultSuccess = 3;
-  command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4;
-  command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5;
-  command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6;
-  command StopWithOnOff(): DefaultSuccess = 7;
-}
+  bitmap DlKeypadProgrammingEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kProgrammingPINChanged = 0x2;
+    kPINAdded = 0x4;
+    kPINCleared = 0x8;
+    kPINChanged = 0x10;
+  }
 
-client cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
-  readonly attribute CHAR_STRING supportedLocales[] = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  bitmap DlLocalProgrammingFeatures : BITMAP8 {
+    kAddUsersCredentialsSchedulesLocally = 0x1;
+    kModifyUsersCredentialsSchedulesLocally = 0x2;
+    kClearUsersCredentialsSchedulesLocally = 0x4;
+    kAdjustLockSettingsLocally = 0x8;
+  }
+
+  bitmap DlManualOperationEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kThumbturnLock = 0x2;
+    kThumbturnUnlock = 0x4;
+    kOneTouchLock = 0x8;
+    kKeyLock = 0x10;
+    kKeyUnlock = 0x20;
+    kAutoLock = 0x40;
+    kScheduleLock = 0x80;
+    kScheduleUnlock = 0x100;
+    kManualLock = 0x200;
+    kManualUnlock = 0x400;
+  }
 
-client cluster LowPower = 1288 {
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  bitmap DlRFIDOperationEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kLock = 0x2;
+    kUnlock = 0x4;
+    kLockInvalidRFID = 0x8;
+    kLockInvalidSchedule = 0x10;
+    kUnlockInvalidRFID = 0x20;
+    kUnlockInvalidSchedule = 0x40;
+  }
 
-  command Sleep(): DefaultSuccess = 0;
-}
+  bitmap DlRFIDProgrammingEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kRFIDCodeAdded = 0x20;
+    kRFIDCodeCleared = 0x40;
+  }
 
-client cluster MediaInput = 1287 {
-  enum InputTypeEnum : ENUM8 {
-    kInternal = 0;
-    kAux = 1;
-    kCoax = 2;
-    kComposite = 3;
-    kHdmi = 4;
-    kInput = 5;
-    kLine = 6;
-    kOptical = 7;
-    kVideo = 8;
-    kScart = 9;
-    kUsb = 10;
-    kOther = 11;
+  bitmap DlRemoteOperationEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kLock = 0x2;
+    kUnlock = 0x4;
+    kLockInvalidCode = 0x8;
+    kLockInvalidSchedule = 0x10;
+    kUnlockInvalidCode = 0x20;
+    kUnlockInvalidSchedule = 0x40;
   }
 
-  bitmap MediaInputFeature : BITMAP32 {
-    kNameUpdates = 0x1;
+  bitmap DlRemoteProgrammingEventMask : BITMAP16 {
+    kUnknown = 0x1;
+    kProgrammingPINChanged = 0x2;
+    kPINAdded = 0x4;
+    kPINCleared = 0x8;
+    kPINChanged = 0x10;
+    kRFIDCodeAdded = 0x20;
+    kRFIDCodeCleared = 0x40;
   }
 
-  struct InputInfo {
-    int8u index = 0;
-    InputTypeEnum inputType = 1;
-    char_string<32> name = 2;
-    char_string<32> description = 3;
+  bitmap DlSupportedOperatingModes : BITMAP16 {
+    kNormal = 0x1;
+    kVacation = 0x2;
+    kPrivacy = 0x4;
+    kNoRemoteLockUnlock = 0x8;
+    kPassage = 0x10;
   }
 
-  readonly attribute InputInfo inputList[] = 0;
-  readonly attribute int8u currentInput = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  bitmap DoorLockDayOfWeek : BITMAP8 {
+    kSunday = 0x1;
+    kMonday = 0x2;
+    kTuesday = 0x4;
+    kWednesday = 0x8;
+    kThursday = 0x10;
+    kFriday = 0x20;
+    kSaturday = 0x40;
+  }
 
-  request struct SelectInputRequest {
-    INT8U index = 0;
+  bitmap DoorLockFeature : BITMAP32 {
+    kPINCredentials = 0x1;
+    kRFIDCredentials = 0x2;
+    kFingerCredentials = 0x4;
+    kLogging = 0x8;
+    kAccessSchedules = 0x10;
+    kDoorPositionSensor = 0x20;
+    kFaceCredentials = 0x40;
+    kCredentialsOTA = 0x80;
+    kUsersManagement = 0x100;
+    kNotifications = 0x200;
   }
 
-  request struct RenameInputRequest {
-    INT8U index = 0;
-    CHAR_STRING name = 1;
+  struct DlCredential {
+    DlCredentialType credentialType = 0;
+    int16u credentialIndex = 1;
   }
 
-  command SelectInput(SelectInputRequest): DefaultSuccess = 0;
-  command ShowInputStatus(): DefaultSuccess = 1;
-  command HideInputStatus(): DefaultSuccess = 2;
-  command RenameInput(RenameInputRequest): DefaultSuccess = 3;
-}
+  critical event DoorLockAlarm = 0 {
+    DlAlarmCode alarmCode = 0;
+  }
 
-client cluster MediaPlayback = 1286 {
-  enum MediaPlaybackStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kInvalidStateForCommand = 1;
-    kNotAllowed = 2;
-    kNotActive = 3;
-    kSpeedOutOfRange = 4;
-    kSeekOutOfRange = 5;
+  critical event DoorStateChange = 1 {
+    DlDoorState doorState = 0;
   }
 
-  enum PlaybackStateEnum : ENUM8 {
-    kPlaying = 0;
-    kPaused = 1;
-    kNotPlaying = 2;
-    kBuffering = 3;
+  critical event LockOperation = 2 {
+    DlLockOperationType lockOperationType = 0;
+    DlOperationSource operationSource = 1;
+    nullable INT16U userIndex = 2;
+    nullable fabric_idx fabricIndex = 3;
+    nullable NODE_ID sourceNode = 4;
+    optional nullable DlCredential credentials[] = 5;
   }
 
-  struct PlaybackPosition {
-    int64u updatedAt = 0;
-    nullable int64u position = 1;
+  critical event LockOperationError = 3 {
+    DlLockOperationType lockOperationType = 0;
+    DlOperationSource operationSource = 1;
+    DlOperationError operationError = 2;
+    nullable INT16U userIndex = 3;
+    nullable fabric_idx fabricIndex = 4;
+    nullable NODE_ID sourceNode = 5;
+    optional nullable DlCredential credentials[] = 6;
   }
 
-  readonly attribute PlaybackStateEnum currentState = 0;
-  readonly attribute nullable epoch_us startTime = 1;
-  readonly attribute nullable int64u duration = 2;
-  readonly attribute nullable PlaybackPosition sampledPosition = 3;
-  readonly attribute single playbackSpeed = 4;
-  readonly attribute nullable int64u seekRangeEnd = 5;
-  readonly attribute nullable int64u seekRangeStart = 6;
+  info event LockUserChange = 4 {
+    DlLockDataType lockDataType = 0;
+    DlDataOperationType dataOperationType = 1;
+    DlOperationSource operationSource = 2;
+    nullable INT16U userIndex = 3;
+    nullable fabric_idx fabricIndex = 4;
+    nullable NODE_ID sourceNode = 5;
+    nullable INT16U dataIndex = 6;
+  }
+
+  readonly attribute nullable DlLockState lockState = 0;
+  readonly attribute DlLockType lockType = 1;
+  readonly attribute boolean actuatorEnabled = 2;
+  readonly attribute nullable DlDoorState doorState = 3;
+  readonly attribute int16u numberOfTotalUsersSupported = 17;
+  readonly attribute int16u numberOfPINUsersSupported = 18;
+  readonly attribute int16u numberOfRFIDUsersSupported = 19;
+  readonly attribute int8u numberOfWeekDaySchedulesSupportedPerUser = 20;
+  readonly attribute int8u numberOfYearDaySchedulesSupportedPerUser = 21;
+  readonly attribute int8u numberOfHolidaySchedulesSupported = 22;
+  readonly attribute int8u maxPINCodeLength = 23;
+  readonly attribute int8u minPINCodeLength = 24;
+  readonly attribute int8u maxRFIDCodeLength = 25;
+  readonly attribute int8u minRFIDCodeLength = 26;
+  readonly attribute int8u numberOfCredentialsSupportedPerUser = 28;
+  attribute access(write: manage) char_string<3> language = 33;
+  attribute access(write: manage) int32u autoRelockTime = 35;
+  attribute access(write: manage) int8u soundVolume = 36;
+  attribute access(write: manage) DlOperatingMode operatingMode = 37;
+  readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
+  attribute access(write: manage) boolean enableOneTouchLocking = 41;
+  attribute access(write: manage) boolean enablePrivacyModeButton = 43;
+  attribute access(write: administer) int8u wrongCodeEntryLimit = 48;
+  attribute access(write: administer) int8u userCodeTemporaryDisableTime = 49;
+  nosubscribe attribute access(write: administer) boolean requirePINforRemoteOperation = 51;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct SkipForwardRequest {
-    INT64U deltaPositionMilliseconds = 0;
+  request struct LockDoorRequest {
+    optional OCTET_STRING pinCode = 0;
   }
 
-  request struct SkipBackwardRequest {
-    INT64U deltaPositionMilliseconds = 0;
+  request struct UnlockDoorRequest {
+    optional OCTET_STRING pinCode = 0;
   }
 
-  request struct SeekRequest {
-    INT64U position = 0;
+  request struct UnlockWithTimeoutRequest {
+    INT16U timeout = 0;
+    optional OCTET_STRING pinCode = 1;
   }
 
-  response struct PlaybackResponse = 10 {
-    MediaPlaybackStatusEnum status = 0;
-    optional CHAR_STRING data = 1;
+  request struct SetWeekDayScheduleRequest {
+    INT8U weekDayIndex = 0;
+    INT16U userIndex = 1;
+    DlDaysMaskMap daysMask = 2;
+    INT8U startHour = 3;
+    INT8U startMinute = 4;
+    INT8U endHour = 5;
+    INT8U endMinute = 6;
   }
 
-  command Play(): PlaybackResponse = 0;
-  command Pause(): PlaybackResponse = 1;
-  command StopPlayback(): PlaybackResponse = 2;
-  command StartOver(): PlaybackResponse = 3;
-  command Previous(): PlaybackResponse = 4;
-  command Next(): PlaybackResponse = 5;
-  command Rewind(): PlaybackResponse = 6;
-  command FastForward(): PlaybackResponse = 7;
-  command SkipForward(SkipForwardRequest): PlaybackResponse = 8;
-  command SkipBackward(SkipBackwardRequest): PlaybackResponse = 9;
-  command Seek(SeekRequest): PlaybackResponse = 11;
-}
-
-client cluster ModeSelect = 80 {
-  bitmap ModeSelectFeature : BITMAP32 {
-    kDeponoff = 0x1;
+  request struct GetWeekDayScheduleRequest {
+    INT8U weekDayIndex = 0;
+    INT16U userIndex = 1;
   }
 
-  struct ModeOptionStruct {
-    char_string<32> label = 0;
-    int8u mode = 1;
-    SemanticTag semanticTags[] = 2;
+  request struct ClearWeekDayScheduleRequest {
+    INT8U weekDayIndex = 0;
+    INT16U userIndex = 1;
   }
 
-  struct SemanticTag {
-    enum16 mfgCode = 0;
-    enum16 value = 1;
+  request struct SetYearDayScheduleRequest {
+    INT8U yearDayIndex = 0;
+    INT16U userIndex = 1;
+    epoch_s localStartTime = 2;
+    epoch_s localEndTime = 3;
   }
 
-  readonly attribute char_string<32> description = 0;
-  readonly attribute nullable enum16 standardNamespace = 1;
-  readonly attribute ModeOptionStruct supportedModes[] = 2;
-  readonly attribute int8u currentMode = 3;
-  attribute nullable int8u startUpMode = 4;
-  attribute nullable int8u onMode = 5;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  request struct GetYearDayScheduleRequest {
+    INT8U yearDayIndex = 0;
+    INT16U userIndex = 1;
+  }
 
-  request struct ChangeToModeRequest {
-    INT8U newMode = 0;
+  request struct ClearYearDayScheduleRequest {
+    INT8U yearDayIndex = 0;
+    INT16U userIndex = 1;
   }
 
-  command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0;
-}
+  request struct SetHolidayScheduleRequest {
+    INT8U holidayIndex = 0;
+    epoch_s localStartTime = 1;
+    epoch_s localEndTime = 2;
+    DlOperatingMode operatingMode = 3;
+  }
 
-client cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatus : ENUM8 {
-    kSuccess = 0;
-    kOutOfRange = 1;
-    kBoundsExceeded = 2;
-    kNetworkIDNotFound = 3;
-    kDuplicateNetworkID = 4;
-    kNetworkNotFound = 5;
-    kRegulatoryError = 6;
-    kAuthFailure = 7;
-    kUnsupportedSecurity = 8;
-    kOtherConnectionFailure = 9;
-    kIPV6Failed = 10;
-    kIPBindFailed = 11;
-    kUnknownError = 12;
+  request struct GetHolidayScheduleRequest {
+    INT8U holidayIndex = 0;
   }
 
-  enum WiFiBand : ENUM8 {
-    k2g4 = 0;
-    k3g65 = 1;
-    k5g = 2;
-    k6g = 3;
-    k60g = 4;
+  request struct ClearHolidayScheduleRequest {
+    INT8U holidayIndex = 0;
   }
 
-  bitmap NetworkCommissioningFeature : BITMAP32 {
-    kWiFiNetworkInterface = 0x1;
-    kThreadNetworkInterface = 0x2;
-    kEthernetNetworkInterface = 0x4;
+  request struct SetUserRequest {
+    DlDataOperationType operationType = 0;
+    INT16U userIndex = 1;
+    nullable CHAR_STRING userName = 2;
+    nullable INT32U userUniqueId = 3;
+    nullable DlUserStatus userStatus = 4;
+    nullable DlUserType userType = 5;
+    nullable DlCredentialRule credentialRule = 6;
   }
 
-  bitmap WiFiSecurity : BITMAP8 {
-    kUnencrypted = 0x1;
-    kWepPersonal = 0x2;
-    kWpaPersonal = 0x4;
-    kWpa2Personal = 0x8;
-    kWpa3Personal = 0x10;
+  request struct GetUserRequest {
+    INT16U userIndex = 0;
   }
 
-  struct NetworkInfo {
-    octet_string<32> networkID = 0;
-    boolean connected = 1;
+  request struct ClearUserRequest {
+    INT16U userIndex = 0;
   }
 
-  struct WiFiInterfaceScanResult {
-    WiFiSecurity security = 0;
-    octet_string<32> ssid = 1;
-    octet_string<6> bssid = 2;
-    int16u channel = 3;
-    WiFiBand wiFiBand = 4;
-    int8s rssi = 5;
+  request struct SetCredentialRequest {
+    DlDataOperationType operationType = 0;
+    DlCredential credential = 1;
+    LONG_OCTET_STRING credentialData = 2;
+    nullable INT16U userIndex = 3;
+    nullable DlUserStatus userStatus = 4;
+    nullable DlUserType userType = 5;
   }
 
-  struct ThreadInterfaceScanResult {
-    int16u panId = 0;
-    int64u extendedPanId = 1;
-    char_string<16> networkName = 2;
-    int16u channel = 3;
-    int8u version = 4;
-    octet_string<8> extendedAddress = 5;
-    int8s rssi = 6;
-    int8u lqi = 7;
+  request struct GetCredentialStatusRequest {
+    DlCredential credential = 0;
   }
 
-  readonly attribute access(read: administer) int8u maxNetworks = 0;
-  readonly attribute access(read: administer) NetworkInfo networks[] = 1;
-  readonly attribute int8u scanMaxTimeSeconds = 2;
-  readonly attribute int8u connectMaxTimeSeconds = 3;
-  attribute access(write: administer) boolean interfaceEnabled = 4;
-  readonly attribute access(read: administer) nullable NetworkCommissioningStatus lastNetworkingStatus = 5;
-  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
-  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  request struct ClearCredentialRequest {
+    nullable DlCredential credential = 0;
+  }
 
-  request struct ScanNetworksRequest {
-    optional nullable OCTET_STRING ssid = 0;
-    optional INT64U breadcrumb = 1;
+  response struct GetWeekDayScheduleResponse = 12 {
+    INT8U weekDayIndex = 0;
+    INT16U userIndex = 1;
+    DlStatus status = 2;
+    optional DlDaysMaskMap daysMask = 3;
+    optional INT8U startHour = 4;
+    optional INT8U startMinute = 5;
+    optional INT8U endHour = 6;
+    optional INT8U endMinute = 7;
   }
 
-  request struct AddOrUpdateWiFiNetworkRequest {
-    OCTET_STRING ssid = 0;
-    OCTET_STRING credentials = 1;
-    optional INT64U breadcrumb = 2;
+  response struct GetYearDayScheduleResponse = 15 {
+    INT8U yearDayIndex = 0;
+    INT16U userIndex = 1;
+    DlStatus status = 2;
+    optional epoch_s localStartTime = 3;
+    optional epoch_s localEndTime = 4;
   }
 
-  request struct AddOrUpdateThreadNetworkRequest {
-    OCTET_STRING operationalDataset = 0;
-    optional INT64U breadcrumb = 1;
+  response struct GetHolidayScheduleResponse = 18 {
+    INT8U holidayIndex = 0;
+    DlStatus status = 1;
+    optional epoch_s localStartTime = 2;
+    optional epoch_s localEndTime = 3;
+    optional DlOperatingMode operatingMode = 4;
   }
 
-  request struct RemoveNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
+  response struct GetUserResponse = 28 {
+    INT16U userIndex = 0;
+    nullable CHAR_STRING userName = 1;
+    nullable INT32U userUniqueId = 2;
+    nullable DlUserStatus userStatus = 3;
+    nullable DlUserType userType = 4;
+    nullable DlCredentialRule credentialRule = 5;
+    nullable DlCredential credentials[] = 6;
+    nullable fabric_idx creatorFabricIndex = 7;
+    nullable fabric_idx lastModifiedFabricIndex = 8;
+    nullable INT16U nextUserIndex = 9;
   }
 
-  request struct ConnectNetworkRequest {
-    OCTET_STRING networkID = 0;
-    optional INT64U breadcrumb = 1;
+  response struct SetCredentialResponse = 35 {
+    DlStatus status = 0;
+    nullable INT16U userIndex = 1;
+    nullable INT16U nextCredentialIndex = 2;
   }
 
-  request struct ReorderNetworkRequest {
-    OCTET_STRING networkID = 0;
-    INT8U networkIndex = 1;
-    optional INT64U breadcrumb = 2;
+  response struct GetCredentialStatusResponse = 37 {
+    boolean credentialExists = 0;
+    nullable INT16U userIndex = 1;
+    nullable fabric_idx creatorFabricIndex = 2;
+    nullable fabric_idx lastModifiedFabricIndex = 3;
+    nullable INT16U nextCredentialIndex = 4;
   }
 
-  response struct ScanNetworksResponse = 1 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional WiFiInterfaceScanResult wiFiScanResults[] = 2;
-    optional ThreadInterfaceScanResult threadScanResults[] = 3;
+  timed command LockDoor(LockDoorRequest): DefaultSuccess = 0;
+  timed command UnlockDoor(UnlockDoorRequest): DefaultSuccess = 1;
+  timed command UnlockWithTimeout(UnlockWithTimeoutRequest): DefaultSuccess = 3;
+  command access(invoke: administer) SetWeekDaySchedule(SetWeekDayScheduleRequest): DefaultSuccess = 11;
+  command access(invoke: administer) GetWeekDaySchedule(GetWeekDayScheduleRequest): GetWeekDayScheduleResponse = 12;
+  command access(invoke: administer) ClearWeekDaySchedule(ClearWeekDayScheduleRequest): DefaultSuccess = 13;
+  command access(invoke: administer) SetYearDaySchedule(SetYearDayScheduleRequest): DefaultSuccess = 14;
+  command access(invoke: administer) GetYearDaySchedule(GetYearDayScheduleRequest): GetYearDayScheduleResponse = 15;
+  command access(invoke: administer) ClearYearDaySchedule(ClearYearDayScheduleRequest): DefaultSuccess = 16;
+  command access(invoke: administer) SetHolidaySchedule(SetHolidayScheduleRequest): DefaultSuccess = 17;
+  command access(invoke: administer) GetHolidaySchedule(GetHolidayScheduleRequest): GetHolidayScheduleResponse = 18;
+  command access(invoke: administer) ClearHolidaySchedule(ClearHolidayScheduleRequest): DefaultSuccess = 19;
+  timed command access(invoke: administer) SetUser(SetUserRequest): DefaultSuccess = 26;
+  command access(invoke: administer) GetUser(GetUserRequest): GetUserResponse = 27;
+  timed command access(invoke: administer) ClearUser(ClearUserRequest): DefaultSuccess = 29;
+  timed command access(invoke: administer) SetCredential(SetCredentialRequest): SetCredentialResponse = 34;
+  command access(invoke: administer) GetCredentialStatus(GetCredentialStatusRequest): GetCredentialStatusResponse = 36;
+  timed command access(invoke: administer) ClearCredential(ClearCredentialRequest): DefaultSuccess = 38;
+}
+
+client cluster WindowCovering = 258 {
+  enum EndProductType : ENUM8 {
+    kRollerShade = 0;
+    kRomanShade = 1;
+    kBalloonShade = 2;
+    kWovenWood = 3;
+    kPleatedShade = 4;
+    kCellularShade = 5;
+    kLayeredShade = 6;
+    kLayeredShade2D = 7;
+    kSheerShade = 8;
+    kTiltOnlyInteriorBlind = 9;
+    kInteriorBlind = 10;
+    kVerticalBlindStripCurtain = 11;
+    kInteriorVenetianBlind = 12;
+    kExteriorVenetianBlind = 13;
+    kLateralLeftCurtain = 14;
+    kLateralRightCurtain = 15;
+    kCentralCurtain = 16;
+    kRollerShutter = 17;
+    kExteriorVerticalScreen = 18;
+    kAwningTerracePatio = 19;
+    kAwningVerticalScreen = 20;
+    kTiltOnlyPergola = 21;
+    kSwingingShutter = 22;
+    kSlidingShutter = 23;
+    kUnknown = 255;
   }
 
-  response struct NetworkConfigResponse = 5 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    optional INT8U networkIndex = 2;
+  enum Type : ENUM8 {
+    kRollerShade = 0;
+    kRollerShade2Motor = 1;
+    kRollerShadeExterior = 2;
+    kRollerShadeExterior2Motor = 3;
+    kDrapery = 4;
+    kAwning = 5;
+    kShutter = 6;
+    kTiltBlindTiltOnly = 7;
+    kTiltBlindLiftAndTilt = 8;
+    kProjectorScreen = 9;
+    kUnknown = 255;
   }
 
-  response struct ConnectNetworkResponse = 7 {
-    NetworkCommissioningStatus networkingStatus = 0;
-    optional CHAR_STRING debugText = 1;
-    nullable INT32S errorValue = 2;
+  bitmap ConfigStatus : BITMAP8 {
+    kOperational = 0x1;
+    kOnlineReserved = 0x2;
+    kLiftMovementReversed = 0x4;
+    kLiftPositionAware = 0x8;
+    kTiltPositionAware = 0x10;
+    kLiftEncoderControlled = 0x20;
+    kTiltEncoderControlled = 0x40;
   }
 
-  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
-  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
-  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
-  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
-  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
-  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
-}
+  bitmap Feature : BITMAP32 {
+    kLift = 0x1;
+    kTilt = 0x2;
+    kPositionAwareLift = 0x4;
+    kAbsolutePosition = 0x8;
+    kPositionAwareTilt = 0x10;
+  }
 
-client cluster OtaSoftwareUpdateProvider = 41 {
-  enum OTAApplyUpdateAction : ENUM8 {
-    kProceed = 0;
-    kAwaitNextAction = 1;
-    kDiscontinue = 2;
+  bitmap Mode : BITMAP8 {
+    kMotorDirectionReversed = 0x1;
+    kCalibrationMode = 0x2;
+    kMaintenanceMode = 0x4;
+    kLedFeedback = 0x8;
   }
 
-  enum OTADownloadProtocol : ENUM8 {
-    kBDXSynchronous = 0;
-    kBDXAsynchronous = 1;
-    kHttps = 2;
-    kVendorSpecific = 3;
+  bitmap OperationalStatus : BITMAP8 {
+    kGlobal = 0x3;
+    kLift = 0xC;
+    kTilt = 0x30;
   }
 
-  enum OTAQueryStatus : ENUM8 {
-    kUpdateAvailable = 0;
-    kBusy = 1;
-    kNotAvailable = 2;
-    kDownloadProtocolNotSupported = 3;
+  bitmap SafetyStatus : BITMAP16 {
+    kRemoteLockout = 0x1;
+    kTamperDetection = 0x2;
+    kFailedCommunication = 0x4;
+    kPositionFailure = 0x8;
+    kThermalProtection = 0x10;
+    kObstacleDetected = 0x20;
+    kPower = 0x40;
+    kStopInput = 0x80;
+    kMotorJammed = 0x100;
+    kHardwareFailure = 0x200;
+    kManualOperation = 0x400;
+    kProtection = 0x800;
   }
 
+  readonly attribute Type type = 0;
+  readonly attribute int16u physicalClosedLimitLift = 1;
+  readonly attribute int16u physicalClosedLimitTilt = 2;
+  readonly attribute nullable int16u currentPositionLift = 3;
+  readonly attribute nullable int16u currentPositionTilt = 4;
+  readonly attribute int16u numberOfActuationsLift = 5;
+  readonly attribute int16u numberOfActuationsTilt = 6;
+  readonly attribute ConfigStatus configStatus = 7;
+  readonly attribute nullable Percent currentPositionLiftPercentage = 8;
+  readonly attribute nullable Percent currentPositionTiltPercentage = 9;
+  readonly attribute OperationalStatus operationalStatus = 10;
+  readonly attribute nullable Percent100ths targetPositionLiftPercent100ths = 11;
+  readonly attribute nullable Percent100ths targetPositionTiltPercent100ths = 12;
+  readonly attribute EndProductType endProductType = 13;
+  readonly attribute nullable Percent100ths currentPositionLiftPercent100ths = 14;
+  readonly attribute nullable Percent100ths currentPositionTiltPercent100ths = 15;
+  readonly attribute int16u installedOpenLimitLift = 16;
+  readonly attribute int16u installedClosedLimitLift = 17;
+  readonly attribute int16u installedOpenLimitTilt = 18;
+  readonly attribute int16u installedClosedLimitTilt = 19;
+  attribute access(write: manage) Mode mode = 23;
+  readonly attribute SafetyStatus safetyStatus = 26;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct QueryImageRequest {
-    vendor_id vendorId = 0;
-    INT16U productId = 1;
-    INT32U softwareVersion = 2;
-    OTADownloadProtocol protocolsSupported[] = 3;
-    optional INT16U hardwareVersion = 4;
-    optional CHAR_STRING location = 5;
-    optional BOOLEAN requestorCanConsent = 6;
-    optional OCTET_STRING metadataForProvider = 7;
-  }
-
-  request struct ApplyUpdateRequestRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U newVersion = 1;
+  request struct GoToLiftValueRequest {
+    INT16U liftValue = 0;
   }
 
-  request struct NotifyUpdateAppliedRequest {
-    OCTET_STRING updateToken = 0;
-    INT32U softwareVersion = 1;
+  request struct GoToLiftPercentageRequest {
+    Percent100ths liftPercent100thsValue = 0;
   }
 
-  response struct QueryImageResponse = 1 {
-    OTAQueryStatus status = 0;
-    optional INT32U delayedActionTime = 1;
-    optional CHAR_STRING imageURI = 2;
-    optional INT32U softwareVersion = 3;
-    optional CHAR_STRING softwareVersionString = 4;
-    optional OCTET_STRING updateToken = 5;
-    optional BOOLEAN userConsentNeeded = 6;
-    optional OCTET_STRING metadataForRequestor = 7;
+  request struct GoToTiltValueRequest {
+    INT16U tiltValue = 0;
   }
 
-  response struct ApplyUpdateResponse = 3 {
-    OTAApplyUpdateAction action = 0;
-    INT32U delayedActionTime = 1;
+  request struct GoToTiltPercentageRequest {
+    Percent100ths tiltPercent100thsValue = 0;
   }
 
-  command QueryImage(QueryImageRequest): QueryImageResponse = 0;
-  command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2;
-  command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4;
+  command UpOrOpen(): DefaultSuccess = 0;
+  command DownOrClose(): DefaultSuccess = 1;
+  command StopMotion(): DefaultSuccess = 2;
+  command GoToLiftValue(GoToLiftValueRequest): DefaultSuccess = 4;
+  command GoToLiftPercentage(GoToLiftPercentageRequest): DefaultSuccess = 5;
+  command GoToTiltValue(GoToTiltValueRequest): DefaultSuccess = 7;
+  command GoToTiltPercentage(GoToTiltPercentageRequest): DefaultSuccess = 8;
 }
 
-client cluster OtaSoftwareUpdateRequestor = 42 {
-  enum OTAAnnouncementReason : ENUM8 {
-    kSimpleAnnouncement = 0;
-    kUpdateAvailable = 1;
-    kUrgentUpdateAvailable = 2;
-  }
+client cluster BarrierControl = 259 {
+  readonly attribute enum8 barrierMovingState = 1;
+  readonly attribute bitmap16 barrierSafetyStatus = 2;
+  readonly attribute bitmap8 barrierCapabilities = 3;
+  readonly attribute int8u barrierPosition = 10;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  enum OTAChangeReasonEnum : ENUM8 {
-    kUnknown = 0;
-    kSuccess = 1;
-    kFailure = 2;
-    kTimeOut = 3;
-    kDelayByProvider = 4;
+  request struct BarrierControlGoToPercentRequest {
+    INT8U percentOpen = 0;
   }
 
-  enum OTAUpdateStateEnum : ENUM8 {
-    kUnknown = 0;
-    kIdle = 1;
-    kQuerying = 2;
-    kDelayedOnQuery = 3;
-    kDownloading = 4;
-    kApplying = 5;
-    kDelayedOnApply = 6;
-    kRollingBack = 7;
-    kDelayedOnUserConsent = 8;
-  }
+  command BarrierControlGoToPercent(BarrierControlGoToPercentRequest): DefaultSuccess = 0;
+  command BarrierControlStop(): DefaultSuccess = 1;
+}
 
-  struct ProviderLocation {
-    node_id providerNodeID = 1;
-    endpoint_no endpoint = 2;
-    fabric_idx fabricIndex = 254;
+client cluster PumpConfigurationAndControl = 512 {
+  enum PumpControlMode : ENUM8 {
+    kConstantSpeed = 0;
+    kConstantPressure = 1;
+    kProportionalPressure = 2;
+    kConstantFlow = 3;
+    kConstantTemperature = 5;
+    kAutomatic = 7;
   }
 
-  info event StateTransition = 0 {
-    OTAUpdateStateEnum previousState = 0;
-    OTAUpdateStateEnum newState = 1;
-    OTAChangeReasonEnum reason = 2;
-    nullable INT32U targetSoftwareVersion = 3;
+  enum PumpOperationMode : ENUM8 {
+    kNormal = 0;
+    kMinimum = 1;
+    kMaximum = 2;
+    kLocal = 3;
   }
 
-  critical event VersionApplied = 1 {
-    INT32U softwareVersion = 0;
-    INT16U productID = 1;
+  bitmap PumpStatus : BITMAP16 {
+    kDeviceFault = 0x1;
+    kSupplyfault = 0x2;
+    kSpeedLow = 0x4;
+    kSpeedHigh = 0x8;
+    kLocalOverride = 0x10;
+    kRunning = 0x20;
+    kRemotePressure = 0x40;
+    kRemoteFlow = 0x80;
+    kRemoteTemperature = 0x100;
   }
 
-  info event DownloadError = 2 {
-    INT32U softwareVersion = 0;
-    INT64U bytesDownloaded = 1;
-    nullable INT8U progressPercent = 2;
-    nullable INT64S platformCode = 3;
+  info event SupplyVoltageLow = 0 {
   }
 
-  attribute ProviderLocation defaultOtaProviders[] = 0;
-  readonly attribute boolean updatePossible = 1;
-  readonly attribute OTAUpdateStateEnum updateState = 2;
-  readonly attribute nullable int8u updateStateProgress = 3;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AnnounceOtaProviderRequest {
-    node_id providerNodeId = 0;
-    vendor_id vendorId = 1;
-    OTAAnnouncementReason announcementReason = 2;
-    optional OCTET_STRING metadataForNode = 3;
-    endpoint_no endpoint = 4;
+  info event SupplyVoltageHigh = 1 {
   }
 
-  command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0;
-}
-
-client cluster OccupancySensing = 1030 {
-  readonly attribute bitmap8 occupancy = 0;
-  readonly attribute enum8 occupancySensorType = 1;
-  readonly attribute bitmap8 occupancySensorTypeBitmap = 2;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-client cluster OnOff = 6 {
-  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
-    kFadeToOffIn0p8Seconds = 0;
-    kNoFade = 1;
-    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
+  info event PowerMissingPhase = 2 {
   }
 
-  enum OnOffDyingLightEffectVariant : ENUM8 {
-    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
+  info event SystemPressureLow = 3 {
   }
 
-  enum OnOffEffectIdentifier : ENUM8 {
-    kDelayedAllOff = 0;
-    kDyingLight = 1;
+  info event SystemPressureHigh = 4 {
   }
 
-  enum OnOffStartUpOnOff : ENUM8 {
-    kOff = 0;
-    kOn = 1;
-    kTogglePreviousOnOff = 2;
+  critical event DryRunning = 5 {
   }
 
-  bitmap OnOffControl : BITMAP8 {
-    kAcceptOnlyWhenOn = 0x1;
+  info event MotorTemperatureHigh = 6 {
   }
 
-  bitmap OnOffFeature : BITMAP32 {
-    kLighting = 0x1;
+  critical event PumpMotorFatalFailure = 7 {
   }
 
-  bitmap SceneFeatures : BITMAP32 {
-    kSceneNames = 0x1;
+  info event ElectronicTemperatureHigh = 8 {
   }
 
-  readonly attribute boolean onOff = 0;
-  readonly attribute boolean globalSceneControl = 16384;
-  attribute int16u onTime = 16385;
-  attribute int16u offWaitTime = 16386;
-  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  critical event PumpBlocked = 9 {
+  }
 
-  request struct OffWithEffectRequest {
-    OnOffEffectIdentifier effectId = 0;
-    OnOffDelayedAllOffEffectVariant effectVariant = 1;
+  info event SensorFailure = 10 {
   }
 
-  request struct OnWithTimedOffRequest {
-    OnOffControl onOffControl = 0;
-    int16u onTime = 1;
-    int16u offWaitTime = 2;
+  info event ElectronicNonFatalFailure = 11 {
   }
 
-  command Off(): DefaultSuccess = 0;
-  command On(): DefaultSuccess = 1;
-  command Toggle(): DefaultSuccess = 2;
-  command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64;
-  command OnWithRecallGlobalScene(): DefaultSuccess = 65;
-  command OnWithTimedOff(OnWithTimedOffRequest): DefaultSuccess = 66;
-}
+  critical event ElectronicFatalFailure = 12 {
+  }
 
-client cluster OnOffSwitchConfiguration = 7 {
-  readonly attribute enum8 switchType = 0;
-  attribute enum8 switchActions = 16;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  info event GeneralFault = 13 {
+  }
 
-client cluster OperationalCredentials = 62 {
-  enum OperationalCertStatus : ENUM8 {
-    kSuccess = 0;
-    kInvalidPublicKey = 1;
-    kInvalidNodeOpId = 2;
-    kInvalidNOC = 3;
-    kMissingCsr = 4;
-    kTableFull = 5;
-    kInvalidAdminSubject = 6;
-    kInsufficientPrivilege = 8;
-    kFabricConflict = 9;
-    kLabelConflict = 10;
-    kInvalidFabricIndex = 11;
+  info event Leakage = 14 {
   }
 
-  struct NOCStruct {
-    octet_string noc = 1;
-    nullable octet_string icac = 2;
-    fabric_idx fabricIndex = 254;
+  info event AirDetection = 15 {
   }
 
-  struct FabricDescriptor {
-    octet_string<65> rootPublicKey = 1;
-    vendor_id vendorId = 2;
-    fabric_id fabricId = 3;
-    node_id nodeId = 4;
-    char_string<32> label = 5;
-    fabric_idx fabricIndex = 254;
+  info event TurbineOperation = 16 {
   }
 
-  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
-  readonly attribute FabricDescriptor fabrics[] = 1;
-  readonly attribute int8u supportedFabrics = 2;
-  readonly attribute int8u commissionedFabrics = 3;
-  readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
-  readonly attribute fabric_idx currentFabricIndex = 5;
+  readonly attribute nullable int16s maxPressure = 0;
+  readonly attribute nullable int16u maxSpeed = 1;
+  readonly attribute nullable int16u maxFlow = 2;
+  readonly attribute nullable int16s minConstPressure = 3;
+  readonly attribute nullable int16s maxConstPressure = 4;
+  readonly attribute nullable int16s minCompPressure = 5;
+  readonly attribute nullable int16s maxCompPressure = 6;
+  readonly attribute nullable int16u minConstSpeed = 7;
+  readonly attribute nullable int16u maxConstSpeed = 8;
+  readonly attribute nullable int16u minConstFlow = 9;
+  readonly attribute nullable int16u maxConstFlow = 10;
+  readonly attribute nullable int16s minConstTemp = 11;
+  readonly attribute nullable int16s maxConstTemp = 12;
+  readonly attribute PumpStatus pumpStatus = 16;
+  readonly attribute PumpOperationMode effectiveOperationMode = 17;
+  readonly attribute PumpControlMode effectiveControlMode = 18;
+  readonly attribute nullable int16s capacity = 19;
+  readonly attribute nullable int16u speed = 20;
+  attribute access(write: manage) nullable int24u lifetimeRunningHours = 21;
+  readonly attribute nullable int24u power = 22;
+  attribute access(write: manage) nullable int32u lifetimeEnergyConsumed = 23;
+  attribute access(write: manage) PumpOperationMode operationMode = 32;
+  attribute access(write: manage) PumpControlMode controlMode = 33;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct AttestationRequestRequest {
-    OCTET_STRING attestationNonce = 0;
-  }
-
-  request struct CertificateChainRequestRequest {
-    INT8U certificateType = 0;
+client cluster Thermostat = 513 {
+  enum SetpointAdjustMode : ENUM8 {
+    kHeatSetpoint = 0;
+    kCoolSetpoint = 1;
+    kHeatAndCoolSetpoints = 2;
   }
 
-  request struct CSRRequestRequest {
-    OCTET_STRING CSRNonce = 0;
-    optional boolean isForUpdateNOC = 1;
+  enum ThermostatControlSequence : ENUM8 {
+    kCoolingOnly = 0;
+    kCoolingWithReheat = 1;
+    kHeatingOnly = 2;
+    kHeatingWithReheat = 3;
+    kCoolingAndHeating = 4;
+    kCoolingAndHeatingWithReheat = 5;
   }
 
-  request struct AddNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
-    OCTET_STRING IPKValue = 2;
-    Int64u caseAdminSubject = 3;
-    VENDOR_ID adminVendorId = 4;
+  enum ThermostatRunningMode : ENUM8 {
+    kOff = 0;
+    kCool = 3;
+    kHeat = 4;
   }
 
-  request struct UpdateNOCRequest {
-    OCTET_STRING NOCValue = 0;
-    optional OCTET_STRING ICACValue = 1;
+  enum ThermostatSystemMode : ENUM8 {
+    kOff = 0;
+    kAuto = 1;
+    kCool = 3;
+    kHeat = 4;
+    kEmergencyHeating = 5;
+    kPrecooling = 6;
+    kFanOnly = 7;
   }
 
-  request struct UpdateFabricLabelRequest {
-    CHAR_STRING label = 0;
+  bitmap DayOfWeek : BITMAP8 {
+    kSunday = 0x1;
+    kMonday = 0x2;
+    kTuesday = 0x4;
+    kWednesday = 0x8;
+    kThursday = 0x10;
+    kFriday = 0x20;
+    kSaturday = 0x40;
+    kAwayOrVacation = 0x80;
   }
 
-  request struct RemoveFabricRequest {
-    fabric_idx fabricIndex = 0;
+  bitmap ModeForSequence : BITMAP8 {
+    kHeatSetpointFieldPresent = 0x1;
+    kCoolSetpointFieldPresent = 0x2;
   }
 
-  request struct AddTrustedRootCertificateRequest {
-    OCTET_STRING rootCertificate = 0;
+  bitmap ThermostatFeature : BITMAP32 {
+    kHeating = 0x1;
+    kCooling = 0x2;
+    kOccupancy = 0x4;
+    kSchedule = 0x8;
+    kSetback = 0x10;
+    kAutomode = 0x20;
   }
 
-  response struct AttestationResponse = 1 {
-    OCTET_STRING attestationElements = 0;
-    OCTET_STRING signature = 1;
+  struct ThermostatScheduleTransition {
+    int16u transitionTime = 0;
+    nullable int16s heatSetpoint = 1;
+    nullable int16s coolSetpoint = 2;
   }
 
-  response struct CertificateChainResponse = 3 {
-    OCTET_STRING certificate = 0;
-  }
+  readonly attribute nullable int16s localTemperature = 0;
+  readonly attribute int16s absMinHeatSetpointLimit = 3;
+  readonly attribute int16s absMaxHeatSetpointLimit = 4;
+  readonly attribute int16s absMinCoolSetpointLimit = 5;
+  readonly attribute int16s absMaxCoolSetpointLimit = 6;
+  attribute int16s occupiedCoolingSetpoint = 17;
+  attribute int16s occupiedHeatingSetpoint = 18;
+  attribute access(write: manage) int16s minHeatSetpointLimit = 21;
+  attribute access(write: manage) int16s maxHeatSetpointLimit = 22;
+  attribute access(write: manage) int16s minCoolSetpointLimit = 23;
+  attribute access(write: manage) int16s maxCoolSetpointLimit = 24;
+  attribute access(write: manage) int8s minSetpointDeadBand = 25;
+  attribute access(write: manage) ThermostatControlSequence controlSequenceOfOperation = 27;
+  attribute access(write: manage) enum8 systemMode = 28;
+  readonly attribute enum8 startOfWeek = 32;
+  readonly attribute int8u numberOfWeeklyTransitions = 33;
+  readonly attribute int8u numberOfDailyTransitions = 34;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  response struct CSRResponse = 5 {
-    OCTET_STRING NOCSRElements = 0;
-    OCTET_STRING attestationSignature = 1;
+  request struct SetpointRaiseLowerRequest {
+    SetpointAdjustMode mode = 0;
+    INT8S amount = 1;
   }
 
-  response struct NOCResponse = 8 {
-    OperationalCertStatus statusCode = 0;
-    optional fabric_idx fabricIndex = 1;
-    optional CHAR_STRING debugText = 2;
+  request struct SetWeeklyScheduleRequest {
+    INT8U numberOfTransitionsForSequence = 0;
+    DayOfWeek dayOfWeekForSequence = 1;
+    ModeForSequence modeForSequence = 2;
+    ThermostatScheduleTransition transitions[] = 3;
   }
 
-  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
-  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
-  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
-  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
-  command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
-  command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
-  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
-  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
-}
-
-client cluster PowerSource = 47 {
-  enum BatChargeFaultType : ENUM8 {
-    kUnspecfied = 0;
-    kAmbientTooHot = 1;
-    kAmbientTooCold = 2;
-    kBatteryTooHot = 3;
-    kBatteryTooCold = 4;
-    kBatteryAbsent = 5;
-    kBatteryOverVoltage = 6;
-    kBatteryUnderVoltage = 7;
-    kChargerOverVoltage = 8;
-    kChargerUnderVoltage = 9;
-    kSafetyTimeout = 10;
+  request struct GetWeeklyScheduleRequest {
+    DayOfWeek daysToReturn = 0;
+    ModeForSequence modeToReturn = 1;
   }
 
-  enum BatChargeLevel : ENUM8 {
-    kOk = 0;
-    kWarning = 1;
-    kCritical = 2;
+  response struct GetWeeklyScheduleResponse = 0 {
+    INT8U numberOfTransitionsForSequence = 0;
+    DayOfWeek dayOfWeekForSequence = 1;
+    ModeForSequence modeForSequence = 2;
+    ThermostatScheduleTransition transitions[] = 3;
   }
 
-  enum BatChargeState : ENUM8 {
-    kUnknown = 0;
-    kIsCharging = 1;
-    kIsAtFullCharge = 2;
-    kIsNotCharging = 3;
-  }
+  command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0;
+  command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1;
+  command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2;
+  command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3;
+}
 
-  enum BatFaultType : ENUM8 {
-    kUnspecfied = 0;
-    kOverTemp = 1;
-    kUnderTemp = 2;
+client cluster FanControl = 514 {
+  enum FanModeSequenceType : ENUM8 {
+    kOffLowMedHigh = 0;
+    kOffLowHigh = 1;
+    kOffLowMedHighAuto = 2;
+    kOffLowHighAuto = 3;
+    kOffOnAuto = 4;
+    kOffOn = 5;
   }
 
-  enum BatReplaceability : ENUM8 {
-    kUnspecified = 0;
-    kNotReplaceable = 1;
-    kUserReplaceable = 2;
-    kFactoryReplaceable = 3;
+  enum FanModeType : ENUM8 {
+    kOff = 0;
+    kLow = 1;
+    kMedium = 2;
+    kHigh = 3;
+    kOn = 4;
+    kAuto = 5;
+    kSmart = 6;
   }
 
-  enum PowerSourceStatus : ENUM8 {
-    kUnspecfied = 0;
-    kActive = 1;
-    kStandby = 2;
-    kUnavailable = 3;
+  bitmap FanControlFeature : BITMAP32 {
+    kMultiSpeed = 0x1;
+    kAuto = 0x2;
+    kRocking = 0x4;
+    kWind = 0x8;
   }
 
-  enum WiredCurrentType : ENUM8 {
-    kAc = 0;
-    kDc = 1;
+  bitmap RockSupportMask : BITMAP8 {
+    kRockLeftRight = 0x1;
+    kRockUpDown = 0x2;
+    kRockRound = 0x4;
   }
 
-  enum WiredFaultType : ENUM8 {
-    kUnspecfied = 0;
-    kOverVoltage = 1;
-    kUnderVoltage = 2;
+  bitmap WindSettingMask : BITMAP8 {
+    kSleepWind = 0x1;
+    kNaturalWind = 0x2;
   }
 
-  bitmap PowerSourceFeature : BITMAP32 {
-    kWired = 0x1;
-    kBattery = 0x2;
-    kRechargeable = 0x4;
-    kReplaceable = 0x8;
+  bitmap WindSupportMask : BITMAP8 {
+    kSleepWind = 0x1;
+    kNaturalWind = 0x2;
   }
 
-  readonly attribute enum8 status = 0;
-  readonly attribute int8u order = 1;
-  readonly attribute char_string<60> description = 2;
-  readonly attribute int32u wiredAssessedInputVoltage = 3;
-  readonly attribute int16u wiredAssessedInputFrequency = 4;
-  readonly attribute enum8 wiredCurrentType = 5;
-  readonly attribute int32u wiredAssessedCurrent = 6;
-  readonly attribute int32u wiredNominalVoltage = 7;
-  readonly attribute int32u wiredMaximumCurrent = 8;
-  readonly attribute boolean wiredPresent = 9;
-  readonly attribute ENUM8 activeWiredFaults[] = 10;
-  readonly attribute int32u batteryVoltage = 11;
-  readonly attribute int8u batteryPercentRemaining = 12;
-  readonly attribute int32u batteryTimeRemaining = 13;
-  readonly attribute enum8 batteryChargeLevel = 14;
-  readonly attribute boolean batteryReplacementNeeded = 15;
-  readonly attribute enum8 batteryReplaceability = 16;
-  readonly attribute boolean batteryPresent = 17;
-  readonly attribute ENUM8 activeBatteryFaults[] = 18;
-  readonly attribute char_string<60> batteryReplacementDescription = 19;
-  readonly attribute int32u batteryCommonDesignation = 20;
-  readonly attribute char_string<20> batteryANSIDesignation = 21;
-  readonly attribute char_string<20> batteryIECDesignation = 22;
-  readonly attribute int32u batteryApprovedChemistry = 23;
-  readonly attribute int32u batteryCapacity = 24;
-  readonly attribute int8u batteryQuantity = 25;
-  readonly attribute enum8 batteryChargeState = 26;
-  readonly attribute int32u batteryTimeToFullCharge = 27;
-  readonly attribute boolean batteryFunctionalWhileCharging = 28;
-  readonly attribute int32u batteryChargingCurrent = 29;
-  readonly attribute ENUM8 activeBatteryChargeFaults[] = 30;
+  attribute FanModeType fanMode = 0;
+  attribute FanModeSequenceType fanModeSequence = 1;
+  attribute nullable int8u percentSetting = 2;
+  readonly attribute int8u percentCurrent = 3;
+  readonly attribute int8u speedMax = 4;
+  attribute nullable int8u speedSetting = 5;
+  readonly attribute int8u speedCurrent = 6;
+  readonly attribute bitmap8 rockSupport = 7;
+  attribute bitmap8 rockSetting = 8;
+  readonly attribute bitmap8 windSupport = 9;
+  attribute bitmap8 windSetting = 10;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -3101,8 +3022,10 @@ client cluster PowerSource = 47 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-client cluster PowerSourceConfiguration = 46 {
-  readonly attribute INT8U sources[] = 0;
+client cluster ThermostatUserInterfaceConfiguration = 516 {
+  attribute enum8 temperatureDisplayMode = 0;
+  attribute access(write: manage) enum8 keypadLockout = 1;
+  attribute access(write: manage) enum8 scheduleProgrammingVisibility = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -3110,322 +3033,355 @@ client cluster PowerSourceConfiguration = 46 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-client cluster PressureMeasurement = 1027 {
-  bitmap PressureFeature : BITMAP32 {
-    kExt = 0x1;
-  }
-
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
-  readonly attribute nullable int16s scaledValue = 16;
-  readonly attribute nullable int16s minScaledValue = 17;
-  readonly attribute nullable int16s maxScaledValue = 18;
-  readonly attribute int16u scaledTolerance = 19;
-  readonly attribute int8s scale = 20;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-client cluster PumpConfigurationAndControl = 512 {
-  enum PumpControlMode : ENUM8 {
-    kConstantSpeed = 0;
-    kConstantPressure = 1;
-    kProportionalPressure = 2;
-    kConstantFlow = 3;
-    kConstantTemperature = 5;
-    kAutomatic = 7;
-  }
-
-  enum PumpOperationMode : ENUM8 {
-    kNormal = 0;
-    kMinimum = 1;
-    kMaximum = 2;
-    kLocal = 3;
-  }
-
-  bitmap PumpStatus : BITMAP16 {
-    kDeviceFault = 0x1;
-    kSupplyfault = 0x2;
-    kSpeedLow = 0x4;
-    kSpeedHigh = 0x8;
-    kLocalOverride = 0x10;
-    kRunning = 0x20;
-    kRemotePressure = 0x40;
-    kRemoteFlow = 0x80;
-    kRemoteTemperature = 0x100;
-  }
-
-  info event SupplyVoltageLow = 0 {
-  }
-
-  info event SupplyVoltageHigh = 1 {
-  }
-
-  info event PowerMissingPhase = 2 {
-  }
-
-  info event SystemPressureLow = 3 {
-  }
-
-  info event SystemPressureHigh = 4 {
-  }
-
-  critical event DryRunning = 5 {
-  }
-
-  info event MotorTemperatureHigh = 6 {
+client cluster ColorControl = 768 {
+  enum ColorLoopAction : ENUM8 {
+    kDeactivate = 0;
+    kActivateFromColorLoopStartEnhancedHue = 1;
+    kActivateFromEnhancedCurrentHue = 2;
   }
 
-  critical event PumpMotorFatalFailure = 7 {
+  enum ColorLoopDirection : ENUM8 {
+    kDecrementHue = 0;
+    kIncrementHue = 1;
   }
 
-  info event ElectronicTemperatureHigh = 8 {
+  enum ColorMode : ENUM8 {
+    kCurrentHueAndCurrentSaturation = 0;
+    kCurrentXAndCurrentY = 1;
+    kColorTemperature = 2;
   }
 
-  critical event PumpBlocked = 9 {
+  enum HueDirection : ENUM8 {
+    kShortestDistance = 0;
+    kLongestDistance = 1;
+    kUp = 2;
+    kDown = 3;
   }
 
-  info event SensorFailure = 10 {
+  enum HueMoveMode : ENUM8 {
+    kStop = 0;
+    kUp = 1;
+    kDown = 3;
   }
 
-  info event ElectronicNonFatalFailure = 11 {
+  enum HueStepMode : ENUM8 {
+    kUp = 1;
+    kDown = 3;
   }
 
-  critical event ElectronicFatalFailure = 12 {
+  enum SaturationMoveMode : ENUM8 {
+    kStop = 0;
+    kUp = 1;
+    kDown = 3;
   }
 
-  info event GeneralFault = 13 {
+  enum SaturationStepMode : ENUM8 {
+    kUp = 1;
+    kDown = 3;
   }
 
-  info event Leakage = 14 {
+  bitmap ColorCapabilities : BITMAP16 {
+    kHueSaturationSupported = 0x1;
+    kEnhancedHueSupported = 0x2;
+    kColorLoopSupported = 0x4;
+    kXYAttributesSupported = 0x8;
+    kColorTemperatureSupported = 0x10;
   }
 
-  info event AirDetection = 15 {
+  bitmap ColorControlFeature : BITMAP32 {
+    kHueAndSaturation = 0x1;
+    kEnhancedHue = 0x2;
+    kColorLoop = 0x4;
+    kXy = 0x8;
+    kColorTemperature = 0x10;
   }
 
-  info event TurbineOperation = 16 {
+  bitmap ColorLoopUpdateFlags : BITMAP8 {
+    kUpdateAction = 0x1;
+    kUpdateDirection = 0x2;
+    kUpdateTime = 0x4;
+    kUpdateStartHue = 0x8;
   }
 
-  readonly attribute nullable int16s maxPressure = 0;
-  readonly attribute nullable int16u maxSpeed = 1;
-  readonly attribute nullable int16u maxFlow = 2;
-  readonly attribute nullable int16s minConstPressure = 3;
-  readonly attribute nullable int16s maxConstPressure = 4;
-  readonly attribute nullable int16s minCompPressure = 5;
-  readonly attribute nullable int16s maxCompPressure = 6;
-  readonly attribute nullable int16u minConstSpeed = 7;
-  readonly attribute nullable int16u maxConstSpeed = 8;
-  readonly attribute nullable int16u minConstFlow = 9;
-  readonly attribute nullable int16u maxConstFlow = 10;
-  readonly attribute nullable int16s minConstTemp = 11;
-  readonly attribute nullable int16s maxConstTemp = 12;
-  readonly attribute PumpStatus pumpStatus = 16;
-  readonly attribute PumpOperationMode effectiveOperationMode = 17;
-  readonly attribute PumpControlMode effectiveControlMode = 18;
-  readonly attribute nullable int16s capacity = 19;
-  readonly attribute nullable int16u speed = 20;
-  attribute access(write: manage) nullable int24u lifetimeRunningHours = 21;
-  readonly attribute nullable int24u power = 22;
-  attribute access(write: manage) nullable int32u lifetimeEnergyConsumed = 23;
-  attribute access(write: manage) PumpOperationMode operationMode = 32;
-  attribute access(write: manage) PumpControlMode controlMode = 33;
+  readonly attribute int8u currentHue = 0;
+  readonly attribute int8u currentSaturation = 1;
+  readonly attribute int16u remainingTime = 2;
+  readonly attribute int16u currentX = 3;
+  readonly attribute int16u currentY = 4;
+  readonly attribute enum8 driftCompensation = 5;
+  readonly attribute char_string<254> compensationText = 6;
+  readonly attribute int16u colorTemperature = 7;
+  readonly attribute enum8 colorMode = 8;
+  attribute bitmap8 options = 15;
+  readonly attribute nullable int8u numberOfPrimaries = 16;
+  readonly attribute int16u primary1X = 17;
+  readonly attribute int16u primary1Y = 18;
+  readonly attribute nullable int8u primary1Intensity = 19;
+  readonly attribute int16u primary2X = 21;
+  readonly attribute int16u primary2Y = 22;
+  readonly attribute nullable int8u primary2Intensity = 23;
+  readonly attribute int16u primary3X = 25;
+  readonly attribute int16u primary3Y = 26;
+  readonly attribute nullable int8u primary3Intensity = 27;
+  readonly attribute int16u primary4X = 32;
+  readonly attribute int16u primary4Y = 33;
+  readonly attribute nullable int8u primary4Intensity = 34;
+  readonly attribute int16u primary5X = 36;
+  readonly attribute int16u primary5Y = 37;
+  readonly attribute nullable int8u primary5Intensity = 38;
+  readonly attribute int16u primary6X = 40;
+  readonly attribute int16u primary6Y = 41;
+  readonly attribute nullable int8u primary6Intensity = 42;
+  attribute access(write: manage) int16u whitePointX = 48;
+  attribute access(write: manage) int16u whitePointY = 49;
+  attribute access(write: manage) int16u colorPointRX = 50;
+  attribute access(write: manage) int16u colorPointRY = 51;
+  attribute access(write: manage) nullable int8u colorPointRIntensity = 52;
+  attribute access(write: manage) int16u colorPointGX = 54;
+  attribute access(write: manage) int16u colorPointGY = 55;
+  attribute access(write: manage) nullable int8u colorPointGIntensity = 56;
+  attribute access(write: manage) int16u colorPointBX = 58;
+  attribute access(write: manage) int16u colorPointBY = 59;
+  attribute access(write: manage) nullable int8u colorPointBIntensity = 60;
+  readonly attribute int16u enhancedCurrentHue = 16384;
+  readonly attribute enum8 enhancedColorMode = 16385;
+  readonly attribute int8u colorLoopActive = 16386;
+  readonly attribute int8u colorLoopDirection = 16387;
+  readonly attribute int16u colorLoopTime = 16388;
+  readonly attribute int16u colorLoopStartEnhancedHue = 16389;
+  readonly attribute int16u colorLoopStoredEnhancedHue = 16390;
+  readonly attribute bitmap16 colorCapabilities = 16394;
+  readonly attribute int16u colorTempPhysicalMinMireds = 16395;
+  readonly attribute int16u colorTempPhysicalMaxMireds = 16396;
+  readonly attribute int16u coupleColorTempToLevelMinMireds = 16397;
+  attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-client cluster RelativeHumidityMeasurement = 1029 {
-  readonly attribute nullable int16u measuredValue = 0;
-  readonly attribute nullable int16u minMeasuredValue = 1;
-  readonly attribute nullable int16u maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
+  request struct MoveToHueRequest {
+    INT8U hue = 0;
+    HueDirection direction = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
+  }
 
-client cluster Scenes = 5 {
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
+  request struct MoveHueRequest {
+    HueMoveMode moveMode = 0;
+    INT8U rate = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
   }
 
-  struct ExtensionFieldSet {
-    cluster_id clusterId = 0;
-    AttributeValuePair attributeValueList[] = 1;
+  request struct StepHueRequest {
+    HueStepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT8U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
   }
 
-  struct AttributeValuePair {
-    optional attrib_id attributeId = 0;
-    int8u attributeValue[] = 1;
+  request struct MoveToSaturationRequest {
+    INT8U saturation = 0;
+    INT16U transitionTime = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
   }
 
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  request struct MoveSaturationRequest {
+    SaturationMoveMode moveMode = 0;
+    INT8U rate = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
+  }
 
-  request struct AddSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
+  request struct StepSaturationRequest {
+    SaturationStepMode stepMode = 0;
+    INT8U stepSize = 1;
+    INT8U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
+  }
+
+  request struct MoveToHueAndSaturationRequest {
+    INT8U hue = 0;
+    INT8U saturation = 1;
     INT16U transitionTime = 2;
-    CHAR_STRING sceneName = 3;
-    ExtensionFieldSet extensionFieldSets[] = 4;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
   }
 
-  request struct ViewSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
+  request struct MoveToColorRequest {
+    INT16U colorX = 0;
+    INT16U colorY = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
   }
 
-  request struct RemoveSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
+  request struct MoveColorRequest {
+    INT16S rateX = 0;
+    INT16S rateY = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
   }
 
-  request struct RemoveAllScenesRequest {
-    group_id groupId = 0;
+  request struct StepColorRequest {
+    INT16S stepX = 0;
+    INT16S stepY = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
   }
 
-  request struct StoreSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
+  request struct MoveToColorTemperatureRequest {
+    INT16U colorTemperature = 0;
+    INT16U transitionTime = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
   }
 
-  request struct RecallSceneRequest {
-    group_id groupId = 0;
-    INT8U sceneId = 1;
-    optional nullable INT16U transitionTime = 2;
+  request struct EnhancedMoveToHueRequest {
+    INT16U enhancedHue = 0;
+    HueDirection direction = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
   }
 
-  request struct GetSceneMembershipRequest {
-    group_id groupId = 0;
+  request struct EnhancedMoveHueRequest {
+    HueMoveMode moveMode = 0;
+    INT16U rate = 1;
+    BITMAP8 optionsMask = 2;
+    BITMAP8 optionsOverride = 3;
   }
 
-  response struct AddSceneResponse = 0 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
+  request struct EnhancedStepHueRequest {
+    HueStepMode stepMode = 0;
+    INT16U stepSize = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
   }
 
-  response struct ViewSceneResponse = 1 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
-    optional INT16U transitionTime = 3;
-    optional CHAR_STRING sceneName = 4;
-    optional ExtensionFieldSet extensionFieldSets[] = 5;
+  request struct EnhancedMoveToHueAndSaturationRequest {
+    INT16U enhancedHue = 0;
+    INT8U saturation = 1;
+    INT16U transitionTime = 2;
+    BITMAP8 optionsMask = 3;
+    BITMAP8 optionsOverride = 4;
   }
 
-  response struct RemoveSceneResponse = 2 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
+  request struct ColorLoopSetRequest {
+    ColorLoopUpdateFlags updateFlags = 0;
+    ColorLoopAction action = 1;
+    ColorLoopDirection direction = 2;
+    INT16U time = 3;
+    INT16U startHue = 4;
+    BITMAP8 optionsMask = 5;
+    BITMAP8 optionsOverride = 6;
   }
 
-  response struct RemoveAllScenesResponse = 3 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
+  request struct StopMoveStepRequest {
+    BITMAP8 optionsMask = 0;
+    BITMAP8 optionsOverride = 1;
   }
 
-  response struct StoreSceneResponse = 4 {
-    ENUM8 status = 0;
-    group_id groupId = 1;
-    INT8U sceneId = 2;
+  request struct MoveColorTemperatureRequest {
+    HueMoveMode moveMode = 0;
+    INT16U rate = 1;
+    INT16U colorTemperatureMinimumMireds = 2;
+    INT16U colorTemperatureMaximumMireds = 3;
+    BITMAP8 optionsMask = 4;
+    BITMAP8 optionsOverride = 5;
   }
 
-  response struct GetSceneMembershipResponse = 6 {
-    ENUM8 status = 0;
-    nullable INT8U capacity = 1;
-    group_id groupId = 2;
-    optional INT8U sceneList[] = 3;
+  request struct StepColorTemperatureRequest {
+    HueStepMode stepMode = 0;
+    INT16U stepSize = 1;
+    INT16U transitionTime = 2;
+    INT16U colorTemperatureMinimumMireds = 3;
+    INT16U colorTemperatureMaximumMireds = 4;
+    BITMAP8 optionsMask = 5;
+    BITMAP8 optionsOverride = 6;
   }
 
-  command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
-  command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
-  command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
-  command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
-  command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
-  command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
-  command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
+  command MoveToHue(MoveToHueRequest): DefaultSuccess = 0;
+  command MoveHue(MoveHueRequest): DefaultSuccess = 1;
+  command StepHue(StepHueRequest): DefaultSuccess = 2;
+  command MoveToSaturation(MoveToSaturationRequest): DefaultSuccess = 3;
+  command MoveSaturation(MoveSaturationRequest): DefaultSuccess = 4;
+  command StepSaturation(StepSaturationRequest): DefaultSuccess = 5;
+  command MoveToHueAndSaturation(MoveToHueAndSaturationRequest): DefaultSuccess = 6;
+  command MoveToColor(MoveToColorRequest): DefaultSuccess = 7;
+  command MoveColor(MoveColorRequest): DefaultSuccess = 8;
+  command StepColor(StepColorRequest): DefaultSuccess = 9;
+  command MoveToColorTemperature(MoveToColorTemperatureRequest): DefaultSuccess = 10;
+  command EnhancedMoveToHue(EnhancedMoveToHueRequest): DefaultSuccess = 64;
+  command EnhancedMoveHue(EnhancedMoveHueRequest): DefaultSuccess = 65;
+  command EnhancedStepHue(EnhancedStepHueRequest): DefaultSuccess = 66;
+  command EnhancedMoveToHueAndSaturation(EnhancedMoveToHueAndSaturationRequest): DefaultSuccess = 67;
+  command ColorLoopSet(ColorLoopSetRequest): DefaultSuccess = 68;
+  command StopMoveStep(StopMoveStepRequest): DefaultSuccess = 71;
+  command MoveColorTemperature(MoveColorTemperatureRequest): DefaultSuccess = 75;
+  command StepColorTemperature(StepColorTemperatureRequest): DefaultSuccess = 76;
 }
 
-client cluster SoftwareDiagnostics = 52 {
-  bitmap SoftwareDiagnosticsFeature : BITMAP32 {
-    kWaterMarks = 0x1;
-  }
-
-  struct ThreadMetrics {
-    int64u id = 0;
-    optional char_string<8> name = 1;
-    optional int32u stackFreeCurrent = 2;
-    optional int32u stackFreeMinimum = 3;
-    optional int32u stackSize = 4;
-  }
-
-  info event SoftwareFault = 0 {
-    SoftwareFaultStruct softwareFault = 0;
+client cluster IlluminanceMeasurement = 1024 {
+  enum LightSensorType : ENUM8 {
+    kPhotodiode = 0;
+    kCmos = 1;
   }
 
-  readonly attribute ThreadMetrics threadMetrics[] = 0;
-  readonly attribute int64u currentHeapFree = 1;
-  readonly attribute int64u currentHeapUsed = 2;
-  readonly attribute int64u currentHeapHighWatermark = 3;
+  readonly attribute nullable int16u measuredValue = 0;
+  readonly attribute nullable int16u minMeasuredValue = 1;
+  readonly attribute nullable int16u maxMeasuredValue = 2;
+  readonly attribute int16u tolerance = 3;
+  readonly attribute nullable enum8 lightSensorType = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-
-  command ResetWatermarks(): DefaultSuccess = 0;
 }
 
-client cluster Switch = 59 {
-  info event SwitchLatched = 0 {
-    INT8U newPosition = 0;
-  }
-
-  info event InitialPress = 1 {
-    INT8U newPosition = 0;
-  }
-
-  info event LongPress = 2 {
-    INT8U newPosition = 0;
-  }
-
-  info event ShortRelease = 3 {
-    INT8U previousPosition = 0;
-  }
-
-  info event LongRelease = 4 {
-    INT8U previousPosition = 0;
-  }
+client cluster TemperatureMeasurement = 1026 {
+  readonly attribute nullable int16s measuredValue = 0;
+  readonly attribute nullable int16s minMeasuredValue = 1;
+  readonly attribute nullable int16s maxMeasuredValue = 2;
+  readonly attribute int16u tolerance = 3;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  info event MultiPressOngoing = 5 {
-    INT8U newPosition = 0;
-    INT8U currentNumberOfPressesCounted = 1;
+client cluster PressureMeasurement = 1027 {
+  bitmap PressureFeature : BITMAP32 {
+    kExt = 0x1;
   }
 
-  info event MultiPressComplete = 6 {
-    INT8U newPosition = 0;
-    INT8U totalNumberOfPressesCounted = 1;
-  }
+  readonly attribute nullable int16s measuredValue = 0;
+  readonly attribute nullable int16s minMeasuredValue = 1;
+  readonly attribute nullable int16s maxMeasuredValue = 2;
+  readonly attribute int16u tolerance = 3;
+  readonly attribute nullable int16s scaledValue = 16;
+  readonly attribute nullable int16s minScaledValue = 17;
+  readonly attribute nullable int16s maxScaledValue = 18;
+  readonly attribute int16u scaledTolerance = 19;
+  readonly attribute int8s scale = 20;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
 
-  readonly attribute int8u numberOfPositions = 0;
-  readonly attribute int8u currentPosition = 1;
-  readonly attribute int8u multiPressMax = 2;
+client cluster FlowMeasurement = 1028 {
+  readonly attribute nullable int16u measuredValue = 0;
+  readonly attribute nullable int16u minMeasuredValue = 1;
+  readonly attribute nullable int16u maxMeasuredValue = 2;
+  readonly attribute int16u tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -3433,912 +3389,956 @@ client cluster Switch = 59 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-client cluster TargetNavigator = 1285 {
-  enum TargetNavigatorStatusEnum : ENUM8 {
-    kSuccess = 0;
-    kTargetNotFound = 1;
-    kNotAllowed = 2;
-  }
-
-  struct TargetInfo {
-    int8u identifier = 0;
-    char_string<32> name = 1;
-  }
-
-  readonly attribute TargetInfo targetList[] = 0;
-  readonly attribute int8u currentTarget = 1;
+client cluster RelativeHumidityMeasurement = 1029 {
+  readonly attribute nullable int16u measuredValue = 0;
+  readonly attribute nullable int16u minMeasuredValue = 1;
+  readonly attribute nullable int16u maxMeasuredValue = 2;
+  readonly attribute int16u tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+}
 
-  request struct NavigateTargetRequest {
-    INT8U target = 0;
-    optional CHAR_STRING data = 1;
-  }
-
-  response struct NavigateTargetResponse = 1 {
-    TargetNavigatorStatusEnum status = 0;
-    optional CHAR_STRING data = 1;
-  }
-
-  command NavigateTarget(NavigateTargetRequest): NavigateTargetResponse = 0;
+client cluster OccupancySensing = 1030 {
+  readonly attribute bitmap8 occupancy = 0;
+  readonly attribute enum8 occupancySensorType = 1;
+  readonly attribute bitmap8 occupancySensorTypeBitmap = 2;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 }
 
-client cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
+client cluster WakeOnLan = 1283 {
+  readonly attribute char_string<32> MACAddress = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
 
-client cluster TestCluster = 4294048773 {
-  enum SimpleEnum : ENUM8 {
-    kUnspecified = 0;
-    kValueA = 1;
-    kValueB = 2;
-    kValueC = 3;
+client cluster Channel = 1284 {
+  enum ChannelStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kMultipleMatches = 1;
+    kNoMatches = 2;
   }
 
-  bitmap Bitmap16MaskMap : BITMAP16 {
-    kMaskVal1 = 0x1;
-    kMaskVal2 = 0x2;
-    kMaskVal3 = 0x4;
-    kMaskVal4 = 0x4000;
+  enum LineupInfoTypeEnum : ENUM8 {
+    kMso = 0;
   }
 
-  bitmap Bitmap32MaskMap : BITMAP32 {
-    kMaskVal1 = 0x1;
-    kMaskVal2 = 0x2;
-    kMaskVal3 = 0x4;
-    kMaskVal4 = 0x40000000;
+  bitmap ChannelFeature : BITMAP32 {
+    kChannelList = 0x1;
+    kLineupInfo = 0x2;
   }
 
-  bitmap Bitmap64MaskMap : BITMAP64 {
-    kMaskVal1 = 0x1;
-    kMaskVal2 = 0x2;
-    kMaskVal3 = 0x4;
-    kMaskVal4 = 0x4000000000000000;
+  struct ChannelInfo {
+    int16u majorNumber = 0;
+    int16u minorNumber = 1;
+    optional char_string<32> name = 2;
+    optional char_string<32> callSign = 3;
+    optional char_string<32> affiliateCallSign = 4;
   }
 
-  bitmap Bitmap8MaskMap : BITMAP8 {
-    kMaskVal1 = 0x1;
-    kMaskVal2 = 0x2;
-    kMaskVal3 = 0x4;
-    kMaskVal4 = 0x40;
+  struct LineupInfo {
+    char_string operatorName = 0;
+    optional char_string lineupName = 1;
+    optional char_string postalCode = 2;
+    LineupInfoTypeEnum lineupInfoType = 3;
   }
 
-  bitmap SimpleBitmap : BITMAP8 {
-    kValueA = 0x1;
-    kValueB = 0x2;
-    kValueC = 0x4;
+  readonly attribute ChannelInfo channelList[] = 0;
+  readonly attribute nullable LineupInfo lineup = 1;
+  readonly attribute nullable ChannelInfo currentChannel = 2;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ChangeChannelRequest {
+    CHAR_STRING match = 0;
   }
 
-  struct TestListStructOctet {
-    int64u member1 = 0;
-    octet_string<32> member2 = 1;
+  request struct ChangeChannelByNumberRequest {
+    INT16U majorNumber = 0;
+    INT16U minorNumber = 1;
   }
 
-  struct NullablesAndOptionalsStruct {
-    nullable int16u nullableInt = 0;
-    optional int16u optionalInt = 1;
-    optional nullable int16u nullableOptionalInt = 2;
-    nullable char_string nullableString = 3;
-    optional char_string optionalString = 4;
-    optional nullable char_string nullableOptionalString = 5;
-    nullable SimpleStruct nullableStruct = 6;
-    optional SimpleStruct optionalStruct = 7;
-    optional nullable SimpleStruct nullableOptionalStruct = 8;
-    nullable SimpleEnum nullableList[] = 9;
-    optional SimpleEnum optionalList[] = 10;
-    optional nullable SimpleEnum nullableOptionalList[] = 11;
+  request struct SkipChannelRequest {
+    INT16U count = 0;
   }
 
-  struct SimpleStruct {
-    int8u a = 0;
-    boolean b = 1;
-    SimpleEnum c = 2;
-    octet_string d = 3;
-    char_string e = 4;
-    SimpleBitmap f = 5;
-    single g = 6;
-    double h = 7;
+  response struct ChangeChannelResponse = 1 {
+    ChannelStatusEnum status = 0;
+    optional CHAR_STRING data = 1;
+  }
+
+  command ChangeChannel(ChangeChannelRequest): ChangeChannelResponse = 0;
+  command ChangeChannelByNumber(ChangeChannelByNumberRequest): DefaultSuccess = 2;
+  command SkipChannel(SkipChannelRequest): DefaultSuccess = 3;
+}
+
+client cluster TargetNavigator = 1285 {
+  enum TargetNavigatorStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kTargetNotFound = 1;
+    kNotAllowed = 2;
   }
 
-  struct TestFabricScoped {
-    int8u fabricSensitiveInt8u = 1;
-    optional int8u optionalFabricSensitiveInt8u = 2;
-    nullable int8u nullableFabricSensitiveInt8u = 3;
-    optional nullable int8u nullableOptionalFabricSensitiveInt8u = 4;
-    char_string fabricSensitiveCharString = 5;
-    SimpleStruct fabricSensitiveStruct = 6;
-    int8u fabricSensitiveInt8uList[] = 7;
-    fabric_idx fabricIndex = 254;
+  struct TargetInfo {
+    int8u identifier = 0;
+    char_string<32> name = 1;
+  }
+
+  readonly attribute TargetInfo targetList[] = 0;
+  readonly attribute int8u currentTarget = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct NavigateTargetRequest {
+    INT8U target = 0;
+    optional CHAR_STRING data = 1;
   }
 
-  struct NestedStructList {
-    int8u a = 0;
-    boolean b = 1;
-    SimpleStruct c = 2;
-    SimpleStruct d[] = 3;
-    int32u e[] = 4;
-    octet_string f[] = 5;
-    int8u g[] = 6;
+  response struct NavigateTargetResponse = 1 {
+    TargetNavigatorStatusEnum status = 0;
+    optional CHAR_STRING data = 1;
   }
 
-  struct NestedStruct {
-    int8u a = 0;
-    boolean b = 1;
-    SimpleStruct c = 2;
+  command NavigateTarget(NavigateTargetRequest): NavigateTargetResponse = 0;
+}
+
+client cluster MediaPlayback = 1286 {
+  enum MediaPlaybackStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kInvalidStateForCommand = 1;
+    kNotAllowed = 2;
+    kNotActive = 3;
+    kSpeedOutOfRange = 4;
+    kSeekOutOfRange = 5;
   }
 
-  info event TestEvent = 1 {
-    INT8U arg1 = 1;
-    SimpleEnum arg2 = 2;
-    BOOLEAN arg3 = 3;
-    SimpleStruct arg4 = 4;
-    SimpleStruct arg5[] = 5;
-    SimpleEnum arg6[] = 6;
+  enum PlaybackStateEnum : ENUM8 {
+    kPlaying = 0;
+    kPaused = 1;
+    kNotPlaying = 2;
+    kBuffering = 3;
   }
 
-  info event TestFabricScopedEvent = 2 {
-    fabric_idx arg1 = 254;
+  struct PlaybackPosition {
+    int64u updatedAt = 0;
+    nullable int64u position = 1;
   }
 
-  attribute boolean boolean = 0;
-  attribute Bitmap8MaskMap bitmap8 = 1;
-  attribute Bitmap16MaskMap bitmap16 = 2;
-  attribute Bitmap32MaskMap bitmap32 = 3;
-  attribute Bitmap64MaskMap bitmap64 = 4;
-  attribute int8u int8u = 5;
-  attribute int16u int16u = 6;
-  attribute int24u int24u = 7;
-  attribute int32u int32u = 8;
-  attribute int40u int40u = 9;
-  attribute int48u int48u = 10;
-  attribute int56u int56u = 11;
-  attribute int64u int64u = 12;
-  attribute int8s int8s = 13;
-  attribute int16s int16s = 14;
-  attribute int24s int24s = 15;
-  attribute int32s int32s = 16;
-  attribute int40s int40s = 17;
-  attribute int48s int48s = 18;
-  attribute int56s int56s = 19;
-  attribute int64s int64s = 20;
-  attribute enum8 enum8 = 21;
-  attribute enum16 enum16 = 22;
-  attribute single floatSingle = 23;
-  attribute double floatDouble = 24;
-  attribute octet_string<10> octetString = 25;
-  attribute INT8U listInt8u[] = 26;
-  attribute OCTET_STRING listOctetString[] = 27;
-  attribute TestListStructOctet listStructOctetString[] = 28;
-  attribute long_octet_string<1000> longOctetString = 29;
-  attribute char_string<10> charString = 30;
-  attribute long_char_string<1000> longCharString = 31;
-  attribute epoch_us epochUs = 32;
-  attribute epoch_s epochS = 33;
-  attribute vendor_id vendorId = 34;
-  attribute NullablesAndOptionalsStruct listNullablesAndOptionalsStruct[] = 35;
-  attribute SimpleEnum enumAttr = 36;
-  attribute SimpleStruct structAttr = 37;
-  attribute int8u rangeRestrictedInt8u = 38;
-  attribute int8s rangeRestrictedInt8s = 39;
-  attribute int16u rangeRestrictedInt16u = 40;
-  attribute int16s rangeRestrictedInt16s = 41;
-  attribute LONG_OCTET_STRING listLongOctetString[] = 42;
-  attribute TestFabricScoped listFabricScoped[] = 43;
-  attribute boolean timedWriteBoolean = 48;
-  attribute boolean generalErrorBoolean = 49;
-  attribute boolean clusterErrorBoolean = 50;
-  attribute boolean unsupported = 255;
-  attribute nullable boolean nullableBoolean = 16384;
-  attribute nullable Bitmap8MaskMap nullableBitmap8 = 16385;
-  attribute nullable Bitmap16MaskMap nullableBitmap16 = 16386;
-  attribute nullable Bitmap32MaskMap nullableBitmap32 = 16387;
-  attribute nullable Bitmap64MaskMap nullableBitmap64 = 16388;
-  attribute nullable int8u nullableInt8u = 16389;
-  attribute nullable int16u nullableInt16u = 16390;
-  attribute nullable int24u nullableInt24u = 16391;
-  attribute nullable int32u nullableInt32u = 16392;
-  attribute nullable int40u nullableInt40u = 16393;
-  attribute nullable int48u nullableInt48u = 16394;
-  attribute nullable int56u nullableInt56u = 16395;
-  attribute nullable int64u nullableInt64u = 16396;
-  attribute nullable int8s nullableInt8s = 16397;
-  attribute nullable int16s nullableInt16s = 16398;
-  attribute nullable int24s nullableInt24s = 16399;
-  attribute nullable int32s nullableInt32s = 16400;
-  attribute nullable int40s nullableInt40s = 16401;
-  attribute nullable int48s nullableInt48s = 16402;
-  attribute nullable int56s nullableInt56s = 16403;
-  attribute nullable int64s nullableInt64s = 16404;
-  attribute nullable enum8 nullableEnum8 = 16405;
-  attribute nullable enum16 nullableEnum16 = 16406;
-  attribute nullable single nullableFloatSingle = 16407;
-  attribute nullable double nullableFloatDouble = 16408;
-  attribute nullable octet_string<10> nullableOctetString = 16409;
-  attribute nullable char_string<10> nullableCharString = 16414;
-  attribute nullable SimpleEnum nullableEnumAttr = 16420;
-  attribute nullable SimpleStruct nullableStruct = 16421;
-  attribute nullable int8u nullableRangeRestrictedInt8u = 16422;
-  attribute nullable int8s nullableRangeRestrictedInt8s = 16423;
-  attribute nullable int16u nullableRangeRestrictedInt16u = 16424;
-  attribute nullable int16s nullableRangeRestrictedInt16s = 16425;
+  readonly attribute PlaybackStateEnum currentState = 0;
+  readonly attribute nullable epoch_us startTime = 1;
+  readonly attribute nullable int64u duration = 2;
+  readonly attribute nullable PlaybackPosition sampledPosition = 3;
+  readonly attribute single playbackSpeed = 4;
+  readonly attribute nullable int64u seekRangeEnd = 5;
+  readonly attribute nullable int64u seekRangeStart = 6;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct TestAddArgumentsRequest {
-    INT8U arg1 = 0;
-    INT8U arg2 = 1;
+  request struct SkipForwardRequest {
+    INT64U deltaPositionMilliseconds = 0;
   }
 
-  request struct TestStructArgumentRequestRequest {
-    SimpleStruct arg1 = 0;
+  request struct SkipBackwardRequest {
+    INT64U deltaPositionMilliseconds = 0;
   }
 
-  request struct TestNestedStructArgumentRequestRequest {
-    NestedStruct arg1 = 0;
+  request struct SeekRequest {
+    INT64U position = 0;
   }
 
-  request struct TestListStructArgumentRequestRequest {
-    SimpleStruct arg1[] = 0;
+  response struct PlaybackResponse = 10 {
+    MediaPlaybackStatusEnum status = 0;
+    optional CHAR_STRING data = 1;
   }
 
-  request struct TestListInt8UArgumentRequestRequest {
-    INT8U arg1[] = 0;
-  }
+  command Play(): PlaybackResponse = 0;
+  command Pause(): PlaybackResponse = 1;
+  command StopPlayback(): PlaybackResponse = 2;
+  command StartOver(): PlaybackResponse = 3;
+  command Previous(): PlaybackResponse = 4;
+  command Next(): PlaybackResponse = 5;
+  command Rewind(): PlaybackResponse = 6;
+  command FastForward(): PlaybackResponse = 7;
+  command SkipForward(SkipForwardRequest): PlaybackResponse = 8;
+  command SkipBackward(SkipBackwardRequest): PlaybackResponse = 9;
+  command Seek(SeekRequest): PlaybackResponse = 11;
+}
 
-  request struct TestNestedStructListArgumentRequestRequest {
-    NestedStructList arg1 = 0;
+client cluster MediaInput = 1287 {
+  enum InputTypeEnum : ENUM8 {
+    kInternal = 0;
+    kAux = 1;
+    kCoax = 2;
+    kComposite = 3;
+    kHdmi = 4;
+    kInput = 5;
+    kLine = 6;
+    kOptical = 7;
+    kVideo = 8;
+    kScart = 9;
+    kUsb = 10;
+    kOther = 11;
   }
 
-  request struct TestListNestedStructListArgumentRequestRequest {
-    NestedStructList arg1[] = 0;
+  bitmap MediaInputFeature : BITMAP32 {
+    kNameUpdates = 0x1;
   }
 
-  request struct TestListInt8UReverseRequestRequest {
-    INT8U arg1[] = 0;
+  struct InputInfo {
+    int8u index = 0;
+    InputTypeEnum inputType = 1;
+    char_string<32> name = 2;
+    char_string<32> description = 3;
   }
 
-  request struct TestEnumsRequestRequest {
-    vendor_id arg1 = 0;
-    SimpleEnum arg2 = 1;
-  }
+  readonly attribute InputInfo inputList[] = 0;
+  readonly attribute int8u currentInput = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  request struct TestNullableOptionalRequestRequest {
-    optional nullable INT8U arg1 = 0;
+  request struct SelectInputRequest {
+    INT8U index = 0;
   }
 
-  request struct SimpleStructEchoRequestRequest {
-    SimpleStruct arg1 = 0;
+  request struct RenameInputRequest {
+    INT8U index = 0;
+    CHAR_STRING name = 1;
   }
 
-  request struct TestSimpleOptionalArgumentRequestRequest {
-    optional BOOLEAN arg1 = 0;
-  }
+  command SelectInput(SelectInputRequest): DefaultSuccess = 0;
+  command ShowInputStatus(): DefaultSuccess = 1;
+  command HideInputStatus(): DefaultSuccess = 2;
+  command RenameInput(RenameInputRequest): DefaultSuccess = 3;
+}
 
-  request struct TestEmitTestEventRequestRequest {
-    INT8U arg1 = 0;
-    SimpleEnum arg2 = 1;
-    BOOLEAN arg3 = 2;
+client cluster LowPower = 1288 {
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command Sleep(): DefaultSuccess = 0;
+}
+
+client cluster KeypadInput = 1289 {
+  enum CecKeyCode : ENUM8 {
+    kSelect = 0;
+    kUp = 1;
+    kDown = 2;
+    kLeft = 3;
+    kRight = 4;
+    kRightUp = 5;
+    kRightDown = 6;
+    kLeftUp = 7;
+    kLeftDown = 8;
+    kRootMenu = 9;
+    kSetupMenu = 10;
+    kContentsMenu = 11;
+    kFavoriteMenu = 12;
+    kExit = 13;
+    kMediaTopMenu = 16;
+    kMediaContextSensitiveMenu = 17;
+    kNumberEntryMode = 29;
+    kNumber11 = 30;
+    kNumber12 = 31;
+    kNumber0OrNumber10 = 32;
+    kNumbers1 = 33;
+    kNumbers2 = 34;
+    kNumbers3 = 35;
+    kNumbers4 = 36;
+    kNumbers5 = 37;
+    kNumbers6 = 38;
+    kNumbers7 = 39;
+    kNumbers8 = 40;
+    kNumbers9 = 41;
+    kDot = 42;
+    kEnter = 43;
+    kClear = 44;
+    kNextFavorite = 47;
+    kChannelUp = 48;
+    kChannelDown = 49;
+    kPreviousChannel = 50;
+    kSoundSelect = 51;
+    kInputSelect = 52;
+    kDisplayInformation = 53;
+    kHelp = 54;
+    kPageUp = 55;
+    kPageDown = 56;
+    kPower = 64;
+    kVolumeUp = 65;
+    kVolumeDown = 66;
+    kMute = 67;
+    kPlay = 68;
+    kStop = 69;
+    kPause = 70;
+    kRecord = 71;
+    kRewind = 72;
+    kFastForward = 73;
+    kEject = 74;
+    kForward = 75;
+    kBackward = 76;
+    kStopRecord = 77;
+    kPauseRecord = 78;
+    kReserved = 79;
+    kAngle = 80;
+    kSubPicture = 81;
+    kVideoOnDemand = 82;
+    kElectronicProgramGuide = 83;
+    kTimerProgramming = 84;
+    kInitialConfiguration = 85;
+    kSelectBroadcastType = 86;
+    kSelectSoundPresentation = 87;
+    kPlayFunction = 96;
+    kPausePlayFunction = 97;
+    kRecordFunction = 98;
+    kPauseRecordFunction = 99;
+    kStopFunction = 100;
+    kMuteFunction = 101;
+    kRestoreVolumeFunction = 102;
+    kTuneFunction = 103;
+    kSelectMediaFunction = 104;
+    kSelectAvInputFunction = 105;
+    kSelectAudioInputFunction = 106;
+    kPowerToggleFunction = 107;
+    kPowerOffFunction = 108;
+    kPowerOnFunction = 109;
+    kF1Blue = 113;
+    kF2Red = 114;
+    kF3Green = 115;
+    kF4Yellow = 116;
+    kF5 = 117;
+    kData = 118;
   }
 
-  response struct TestSpecificResponse = 0 {
-    INT8U returnValue = 0;
+  enum KeypadInputStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kUnsupportedKey = 1;
+    kInvalidKeyInCurrentState = 2;
   }
 
-  response struct TestAddArgumentsResponse = 1 {
-    INT8U returnValue = 0;
+  bitmap KeypadInputFeature : BITMAP32 {
+    kNavigationKeyCodes = 0x1;
+    kLocationKeys = 0x2;
+    kNumberKeys = 0x4;
   }
 
-  response struct TestListInt8UReverseResponse = 4 {
-    INT8U arg1[] = 0;
-  }
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
 
-  response struct TestEnumsResponse = 5 {
-    vendor_id arg1 = 0;
-    SimpleEnum arg2 = 1;
+  request struct SendKeyRequest {
+    CecKeyCode keyCode = 0;
   }
 
-  response struct TestNullableOptionalResponse = 6 {
-    BOOLEAN wasPresent = 0;
-    optional BOOLEAN wasNull = 1;
-    optional INT8U value = 2;
-    optional nullable INT8U originalValue = 3;
+  response struct SendKeyResponse = 1 {
+    KeypadInputStatusEnum status = 0;
   }
 
-  response struct BooleanResponse = 8 {
-    BOOLEAN value = 0;
-  }
+  command SendKey(SendKeyRequest): SendKeyResponse = 0;
+}
 
-  response struct SimpleStructResponse = 9 {
-    SimpleStruct arg1 = 0;
+client cluster ContentLauncher = 1290 {
+  enum ContentLaunchStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kUrlNotAvailable = 1;
+    kAuthFailed = 2;
   }
 
-  response struct TestEmitTestEventResponse = 10 {
-    INT64U value = 0;
+  enum MetricTypeEnum : ENUM8 {
+    kPixels = 0;
+    kPercentage = 1;
   }
 
-  command Test(): DefaultSuccess = 0;
-  command TestNotHandled(): DefaultSuccess = 1;
-  command TestSpecific(): TestSpecificResponse = 2;
-  command TestUnknownCommand(): DefaultSuccess = 3;
-  command TestAddArguments(TestAddArgumentsRequest): TestAddArgumentsResponse = 4;
-  command TestStructArgumentRequest(TestStructArgumentRequestRequest): BooleanResponse = 7;
-  command TestNestedStructArgumentRequest(TestNestedStructArgumentRequestRequest): BooleanResponse = 8;
-  command TestListStructArgumentRequest(TestListStructArgumentRequestRequest): BooleanResponse = 9;
-  command TestListInt8UArgumentRequest(TestListInt8UArgumentRequestRequest): BooleanResponse = 10;
-  command TestNestedStructListArgumentRequest(TestNestedStructListArgumentRequestRequest): BooleanResponse = 11;
-  command TestListNestedStructListArgumentRequest(TestListNestedStructListArgumentRequestRequest): BooleanResponse = 12;
-  command TestListInt8UReverseRequest(TestListInt8UReverseRequestRequest): TestListInt8UReverseResponse = 13;
-  command TestEnumsRequest(TestEnumsRequestRequest): TestEnumsResponse = 14;
-  command TestNullableOptionalRequest(TestNullableOptionalRequestRequest): TestNullableOptionalResponse = 15;
-  command SimpleStructEchoRequest(SimpleStructEchoRequestRequest): SimpleStructResponse = 17;
-  timed command TimedInvokeRequest(): DefaultSuccess = 18;
-  command TestSimpleOptionalArgumentRequest(TestSimpleOptionalArgumentRequestRequest): DefaultSuccess = 19;
-  command TestEmitTestEventRequest(TestEmitTestEventRequestRequest): TestEmitTestEventResponse = 20;
-}
-
-client cluster Thermostat = 513 {
-  enum SetpointAdjustMode : ENUM8 {
-    kHeatSetpoint = 0;
-    kCoolSetpoint = 1;
-    kHeatAndCoolSetpoints = 2;
+  enum ParameterEnum : ENUM8 {
+    kActor = 0;
+    kChannel = 1;
+    kCharacter = 2;
+    kDirector = 3;
+    kEvent = 4;
+    kFranchise = 5;
+    kGenre = 6;
+    kLeague = 7;
+    kPopularity = 8;
+    kProvider = 9;
+    kSport = 10;
+    kSportsTeam = 11;
+    kType = 12;
   }
 
-  enum ThermostatControlSequence : ENUM8 {
-    kCoolingOnly = 0;
-    kCoolingWithReheat = 1;
-    kHeatingOnly = 2;
-    kHeatingWithReheat = 3;
-    kCoolingAndHeating = 4;
-    kCoolingAndHeatingWithReheat = 5;
+  bitmap ContentLauncherFeature : BITMAP32 {
+    kContentSearch = 0x1;
+    kURLPlayback = 0x2;
   }
 
-  enum ThermostatRunningMode : ENUM8 {
-    kOff = 0;
-    kCool = 3;
-    kHeat = 4;
+  bitmap SupportedStreamingProtocol : BITMAP32 {
+    kDash = 0x1;
+    kHls = 0x2;
   }
 
-  enum ThermostatSystemMode : ENUM8 {
-    kOff = 0;
-    kAuto = 1;
-    kCool = 3;
-    kHeat = 4;
-    kEmergencyHeating = 5;
-    kPrecooling = 6;
-    kFanOnly = 7;
+  struct ContentSearch {
+    Parameter parameterList[] = 0;
   }
 
-  bitmap DayOfWeek : BITMAP8 {
-    kSunday = 0x1;
-    kMonday = 0x2;
-    kTuesday = 0x4;
-    kWednesday = 0x8;
-    kThursday = 0x10;
-    kFriday = 0x20;
-    kSaturday = 0x40;
-    kAwayOrVacation = 0x80;
+  struct Parameter {
+    ParameterEnum type = 0;
+    char_string value = 1;
+    optional AdditionalInfo externalIDList[] = 2;
   }
 
-  bitmap ModeForSequence : BITMAP8 {
-    kHeatSetpointFieldPresent = 0x1;
-    kCoolSetpointFieldPresent = 0x2;
+  struct AdditionalInfo {
+    char_string name = 0;
+    char_string value = 1;
   }
 
-  bitmap ThermostatFeature : BITMAP32 {
-    kHeating = 0x1;
-    kCooling = 0x2;
-    kOccupancy = 0x4;
-    kSchedule = 0x8;
-    kSetback = 0x10;
-    kAutomode = 0x20;
+  struct BrandingInformation {
+    char_string providerName = 0;
+    optional StyleInformation background = 1;
+    optional StyleInformation logo = 2;
+    optional StyleInformation progressBar = 3;
+    optional StyleInformation splash = 4;
+    optional StyleInformation waterMark = 5;
   }
 
-  struct ThermostatScheduleTransition {
-    int16u transitionTime = 0;
-    nullable int16s heatSetpoint = 1;
-    nullable int16s coolSetpoint = 2;
+  struct StyleInformation {
+    optional char_string imageUrl = 0;
+    optional char_string color = 1;
+    optional Dimension size = 2;
   }
-
-  readonly attribute nullable int16s localTemperature = 0;
-  readonly attribute int16s absMinHeatSetpointLimit = 3;
-  readonly attribute int16s absMaxHeatSetpointLimit = 4;
-  readonly attribute int16s absMinCoolSetpointLimit = 5;
-  readonly attribute int16s absMaxCoolSetpointLimit = 6;
-  attribute int16s occupiedCoolingSetpoint = 17;
-  attribute int16s occupiedHeatingSetpoint = 18;
-  attribute access(write: manage) int16s minHeatSetpointLimit = 21;
-  attribute access(write: manage) int16s maxHeatSetpointLimit = 22;
-  attribute access(write: manage) int16s minCoolSetpointLimit = 23;
-  attribute access(write: manage) int16s maxCoolSetpointLimit = 24;
-  attribute access(write: manage) int8s minSetpointDeadBand = 25;
-  attribute access(write: manage) ThermostatControlSequence controlSequenceOfOperation = 27;
-  attribute access(write: manage) enum8 systemMode = 28;
-  readonly attribute enum8 startOfWeek = 32;
-  readonly attribute int8u numberOfWeeklyTransitions = 33;
-  readonly attribute int8u numberOfDailyTransitions = 34;
+
+  struct Dimension {
+    double width = 0;
+    double height = 1;
+    MetricTypeEnum metric = 2;
+  }
+
+  readonly attribute CHAR_STRING acceptHeader[] = 0;
+  attribute bitmap32 supportedStreamingProtocols = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  request struct SetpointRaiseLowerRequest {
-    SetpointAdjustMode mode = 0;
-    INT8S amount = 1;
+  request struct LaunchContentRequest {
+    ContentSearch search = 0;
+    BOOLEAN autoPlay = 1;
+    optional CHAR_STRING data = 2;
   }
 
-  request struct SetWeeklyScheduleRequest {
-    INT8U numberOfTransitionsForSequence = 0;
-    DayOfWeek dayOfWeekForSequence = 1;
-    ModeForSequence modeForSequence = 2;
-    ThermostatScheduleTransition transitions[] = 3;
+  request struct LaunchURLRequest {
+    CHAR_STRING contentURL = 0;
+    optional CHAR_STRING displayString = 1;
+    optional BrandingInformation brandingInformation = 2;
   }
 
-  request struct GetWeeklyScheduleRequest {
-    DayOfWeek daysToReturn = 0;
-    ModeForSequence modeToReturn = 1;
+  response struct LaunchResponse = 2 {
+    ContentLaunchStatusEnum status = 0;
+    optional CHAR_STRING data = 1;
   }
 
-  response struct GetWeeklyScheduleResponse = 0 {
-    INT8U numberOfTransitionsForSequence = 0;
-    DayOfWeek dayOfWeekForSequence = 1;
-    ModeForSequence modeForSequence = 2;
-    ThermostatScheduleTransition transitions[] = 3;
+  command LaunchContent(LaunchContentRequest): LaunchResponse = 0;
+  command LaunchURL(LaunchURLRequest): LaunchResponse = 1;
+}
+
+client cluster AudioOutput = 1291 {
+  enum OutputTypeEnum : ENUM8 {
+    kHdmi = 0;
+    kBt = 1;
+    kOptical = 2;
+    kHeadphone = 3;
+    kInternal = 4;
+    kOther = 5;
   }
 
-  command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0;
-  command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1;
-  command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2;
-  command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3;
-}
+  bitmap AudioOutputFeature : BITMAP32 {
+    kNameUpdates = 0x1;
+  }
 
-client cluster ThermostatUserInterfaceConfiguration = 516 {
-  attribute enum8 temperatureDisplayMode = 0;
-  attribute access(write: manage) enum8 keypadLockout = 1;
-  attribute access(write: manage) enum8 scheduleProgrammingVisibility = 2;
+  struct OutputInfo {
+    int8u index = 0;
+    OutputTypeEnum outputType = 1;
+    char_string<32> name = 2;
+  }
+
+  readonly attribute OutputInfo outputList[] = 0;
+  readonly attribute int8u currentOutput = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+
+  request struct SelectOutputRequest {
+    INT8U index = 0;
+  }
+
+  request struct RenameOutputRequest {
+    INT8U index = 0;
+    CHAR_STRING name = 1;
+  }
+
+  command SelectOutput(SelectOutputRequest): DefaultSuccess = 0;
+  command RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
 }
 
-client cluster ThreadNetworkDiagnostics = 53 {
-  enum NetworkFault : ENUM8 {
-    kUnspecified = 0;
-    kLinkDown = 1;
-    kHardwareFailure = 2;
-    kNetworkJammed = 3;
+client cluster ApplicationLauncher = 1292 {
+  enum ApplicationLauncherStatusEnum : ENUM8 {
+    kSuccess = 0;
+    kAppNotAvailable = 1;
+    kSystemBusy = 2;
   }
 
-  enum RoutingRole : ENUM8 {
-    kUnspecified = 0;
-    kUnassigned = 1;
-    kSleepyEndDevice = 2;
-    kEndDevice = 3;
-    kReed = 4;
-    kRouter = 5;
-    kLeader = 6;
+  bitmap ApplicationLauncherFeature : BITMAP32 {
+    kApplicationPlatform = 0x1;
   }
 
-  enum ThreadConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  struct ApplicationEP {
+    Application application = 0;
+    optional endpoint_no endpoint = 1;
   }
 
-  bitmap ThreadNetworkDiagnosticsFeature : BITMAP32 {
-    kPacketCounts = 0x1;
-    kErrorCounts = 0x2;
-    kMLECounts = 0x4;
-    kMACCounts = 0x8;
+  struct Application {
+    int16u catalogVendorId = 0;
+    char_string applicationId = 1;
   }
 
-  struct NeighborTable {
-    int64u extAddress = 0;
-    int32u age = 1;
-    int16u rloc16 = 2;
-    int32u linkFrameCounter = 3;
-    int32u mleFrameCounter = 4;
-    int8u lqi = 5;
-    nullable int8s averageRssi = 6;
-    nullable int8s lastRssi = 7;
-    int8u frameErrorRate = 8;
-    int8u messageErrorRate = 9;
-    boolean rxOnWhenIdle = 10;
-    boolean fullThreadDevice = 11;
-    boolean fullNetworkData = 12;
-    boolean isChild = 13;
+  readonly attribute INT16U catalogList[] = 0;
+  attribute nullable ApplicationEP currentApp = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct LaunchAppRequest {
+    Application application = 0;
+    optional OCTET_STRING data = 1;
   }
 
-  struct RouteTable {
-    int64u extAddress = 0;
-    int16u rloc16 = 1;
-    int8u routerId = 2;
-    int8u nextHop = 3;
-    int8u pathCost = 4;
-    int8u LQIIn = 5;
-    int8u LQIOut = 6;
-    int8u age = 7;
-    boolean allocated = 8;
-    boolean linkEstablished = 9;
+  request struct StopAppRequest {
+    Application application = 0;
   }
 
-  struct SecurityPolicy {
-    int16u rotationTime = 0;
-    bitmap16 flags = 1;
+  request struct HideAppRequest {
+    Application application = 0;
   }
 
-  struct OperationalDatasetComponents {
-    boolean activeTimestampPresent = 0;
-    boolean pendingTimestampPresent = 1;
-    boolean masterKeyPresent = 2;
-    boolean networkNamePresent = 3;
-    boolean extendedPanIdPresent = 4;
-    boolean meshLocalPrefixPresent = 5;
-    boolean delayPresent = 6;
-    boolean panIdPresent = 7;
-    boolean channelPresent = 8;
-    boolean pskcPresent = 9;
-    boolean securityPolicyPresent = 10;
-    boolean channelMaskPresent = 11;
+  response struct LauncherResponse = 3 {
+    ApplicationLauncherStatusEnum status = 0;
+    OCTET_STRING data = 1;
   }
 
-  info event ConnectionStatus = 0 {
-    ThreadConnectionStatus connectionStatus = 0;
+  command LaunchApp(LaunchAppRequest): LauncherResponse = 0;
+  command StopApp(StopAppRequest): LauncherResponse = 1;
+  command HideApp(HideAppRequest): LauncherResponse = 2;
+}
+
+client cluster ApplicationBasic = 1293 {
+  enum ApplicationStatusEnum : ENUM8 {
+    kStopped = 0;
+    kActiveVisibleFocus = 1;
+    kActiveHidden = 2;
+    kActiveVisibleNotFocus = 3;
   }
 
-  readonly attribute nullable int16u channel = 0;
-  readonly attribute nullable RoutingRole routingRole = 1;
-  readonly attribute nullable char_string<16> networkName = 2;
-  readonly attribute nullable int16u panId = 3;
-  readonly attribute nullable int64u extendedPanId = 4;
-  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
-  readonly attribute int64u overrunCount = 6;
-  readonly attribute NeighborTable neighborTableList[] = 7;
-  readonly attribute RouteTable routeTableList[] = 8;
-  readonly attribute nullable int32u partitionId = 9;
-  readonly attribute nullable int8u weighting = 10;
-  readonly attribute nullable int8u dataVersion = 11;
-  readonly attribute nullable int8u stableDataVersion = 12;
-  readonly attribute nullable int8u leaderRouterId = 13;
-  readonly attribute int16u detachedRoleCount = 14;
-  readonly attribute int16u childRoleCount = 15;
-  readonly attribute int16u routerRoleCount = 16;
-  readonly attribute int16u leaderRoleCount = 17;
-  readonly attribute int16u attachAttemptCount = 18;
-  readonly attribute int16u partitionIdChangeCount = 19;
-  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
-  readonly attribute int16u parentChangeCount = 21;
-  readonly attribute int32u txTotalCount = 22;
-  readonly attribute int32u txUnicastCount = 23;
-  readonly attribute int32u txBroadcastCount = 24;
-  readonly attribute int32u txAckRequestedCount = 25;
-  readonly attribute int32u txAckedCount = 26;
-  readonly attribute int32u txNoAckRequestedCount = 27;
-  readonly attribute int32u txDataCount = 28;
-  readonly attribute int32u txDataPollCount = 29;
-  readonly attribute int32u txBeaconCount = 30;
-  readonly attribute int32u txBeaconRequestCount = 31;
-  readonly attribute int32u txOtherCount = 32;
-  readonly attribute int32u txRetryCount = 33;
-  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
-  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
-  readonly attribute int32u txErrCcaCount = 36;
-  readonly attribute int32u txErrAbortCount = 37;
-  readonly attribute int32u txErrBusyChannelCount = 38;
-  readonly attribute int32u rxTotalCount = 39;
-  readonly attribute int32u rxUnicastCount = 40;
-  readonly attribute int32u rxBroadcastCount = 41;
-  readonly attribute int32u rxDataCount = 42;
-  readonly attribute int32u rxDataPollCount = 43;
-  readonly attribute int32u rxBeaconCount = 44;
-  readonly attribute int32u rxBeaconRequestCount = 45;
-  readonly attribute int32u rxOtherCount = 46;
-  readonly attribute int32u rxAddressFilteredCount = 47;
-  readonly attribute int32u rxDestAddrFilteredCount = 48;
-  readonly attribute int32u rxDuplicatedCount = 49;
-  readonly attribute int32u rxErrNoFrameCount = 50;
-  readonly attribute int32u rxErrUnknownNeighborCount = 51;
-  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
-  readonly attribute int32u rxErrSecCount = 53;
-  readonly attribute int32u rxErrFcsCount = 54;
-  readonly attribute int32u rxErrOtherCount = 55;
-  readonly attribute nullable int64u activeTimestamp = 56;
-  readonly attribute nullable int64u pendingTimestamp = 57;
-  readonly attribute nullable int32u delay = 58;
-  readonly attribute nullable SecurityPolicy securityPolicy = 59;
-  readonly attribute nullable octet_string<4> channelMask = 60;
-  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
-  readonly attribute NetworkFault activeNetworkFaultsList[] = 62;
+  struct ApplicationBasicApplication {
+    int16u catalogVendorId = 0;
+    char_string applicationId = 1;
+  }
+
+  readonly attribute char_string<32> vendorName = 0;
+  readonly attribute int16u vendorID = 1;
+  readonly attribute char_string<32> applicationName = 2;
+  readonly attribute int16u productID = 3;
+  readonly attribute ApplicationBasicApplication application = 4;
+  readonly attribute ApplicationStatusEnum status = 5;
+  readonly attribute char_string<32> applicationVersion = 6;
+  readonly attribute vendor_id allowedVendorList[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-
-  command ResetCounts(): DefaultSuccess = 0;
 }
 
-client cluster TimeFormatLocalization = 44 {
-  enum CalendarType : ENUM8 {
-    kBuddhist = 0;
-    kChinese = 1;
-    kCoptic = 2;
-    kEthiopian = 3;
-    kGregorian = 4;
-    kHebrew = 5;
-    kIndian = 6;
-    kIslamic = 7;
-    kJapanese = 8;
-    kKorean = 9;
-    kPersian = 10;
-    kTaiwanese = 11;
-  }
-
-  enum HourFormat : ENUM8 {
-    k12hr = 0;
-    k24hr = 1;
-  }
-
-  attribute HourFormat hourFormat = 0;
-  attribute CalendarType activeCalendarType = 1;
-  readonly attribute CalendarType supportedCalendarTypes[] = 2;
+client cluster AccountLogin = 1294 {
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-client cluster UnitLocalization = 45 {
-  enum TempUnit : ENUM8 {
-    kFahrenheit = 0;
-    kCelsius = 1;
-    kKelvin = 2;
+  request struct GetSetupPINRequest {
+    CHAR_STRING tempAccountIdentifier = 0;
   }
 
-  bitmap UnitLocalizationFeature : BITMAP32 {
-    kTemperatureUnit = 0x1;
+  request struct LoginRequest {
+    CHAR_STRING tempAccountIdentifier = 0;
+    CHAR_STRING setupPIN = 1;
   }
 
-  attribute TempUnit temperatureUnit = 0;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  response struct GetSetupPINResponse = 1 {
+    CHAR_STRING setupPIN = 0;
+  }
+
+  timed command GetSetupPIN(GetSetupPINRequest): GetSetupPINResponse = 0;
+  timed command Login(LoginRequest): DefaultSuccess = 2;
+  timed command Logout(): DefaultSuccess = 3;
 }
 
-client cluster UserLabel = 65 {
-  attribute access(write: manage) LabelStruct labelList[] = 0;
+client cluster ElectricalMeasurement = 2820 {
+  readonly attribute bitmap32 measurementType = 0;
+  readonly attribute int32s totalActivePower = 772;
+  readonly attribute int16u rmsVoltage = 1285;
+  readonly attribute int16u rmsVoltageMin = 1286;
+  readonly attribute int16u rmsVoltageMax = 1287;
+  readonly attribute int16u rmsCurrent = 1288;
+  readonly attribute int16u rmsCurrentMin = 1289;
+  readonly attribute int16u rmsCurrentMax = 1290;
+  readonly attribute int16s activePower = 1291;
+  readonly attribute int16s activePowerMin = 1292;
+  readonly attribute int16s activePowerMax = 1293;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 }
 
-client cluster WakeOnLan = 1283 {
-  readonly attribute char_string<32> MACAddress = 0;
+client cluster TestCluster = 4294048773 {
+  enum SimpleEnum : ENUM8 {
+    kUnspecified = 0;
+    kValueA = 1;
+    kValueB = 2;
+    kValueC = 3;
+  }
+
+  bitmap Bitmap16MaskMap : BITMAP16 {
+    kMaskVal1 = 0x1;
+    kMaskVal2 = 0x2;
+    kMaskVal3 = 0x4;
+    kMaskVal4 = 0x4000;
+  }
+
+  bitmap Bitmap32MaskMap : BITMAP32 {
+    kMaskVal1 = 0x1;
+    kMaskVal2 = 0x2;
+    kMaskVal3 = 0x4;
+    kMaskVal4 = 0x40000000;
+  }
+
+  bitmap Bitmap64MaskMap : BITMAP64 {
+    kMaskVal1 = 0x1;
+    kMaskVal2 = 0x2;
+    kMaskVal3 = 0x4;
+    kMaskVal4 = 0x4000000000000000;
+  }
+
+  bitmap Bitmap8MaskMap : BITMAP8 {
+    kMaskVal1 = 0x1;
+    kMaskVal2 = 0x2;
+    kMaskVal3 = 0x4;
+    kMaskVal4 = 0x40;
+  }
+
+  bitmap SimpleBitmap : BITMAP8 {
+    kValueA = 0x1;
+    kValueB = 0x2;
+    kValueC = 0x4;
+  }
+
+  struct TestListStructOctet {
+    int64u member1 = 0;
+    octet_string<32> member2 = 1;
+  }
+
+  struct NullablesAndOptionalsStruct {
+    nullable int16u nullableInt = 0;
+    optional int16u optionalInt = 1;
+    optional nullable int16u nullableOptionalInt = 2;
+    nullable char_string nullableString = 3;
+    optional char_string optionalString = 4;
+    optional nullable char_string nullableOptionalString = 5;
+    nullable SimpleStruct nullableStruct = 6;
+    optional SimpleStruct optionalStruct = 7;
+    optional nullable SimpleStruct nullableOptionalStruct = 8;
+    nullable SimpleEnum nullableList[] = 9;
+    optional SimpleEnum optionalList[] = 10;
+    optional nullable SimpleEnum nullableOptionalList[] = 11;
+  }
+
+  struct SimpleStruct {
+    int8u a = 0;
+    boolean b = 1;
+    SimpleEnum c = 2;
+    octet_string d = 3;
+    char_string e = 4;
+    SimpleBitmap f = 5;
+    single g = 6;
+    double h = 7;
+  }
+
+  struct TestFabricScoped {
+    int8u fabricSensitiveInt8u = 1;
+    optional int8u optionalFabricSensitiveInt8u = 2;
+    nullable int8u nullableFabricSensitiveInt8u = 3;
+    optional nullable int8u nullableOptionalFabricSensitiveInt8u = 4;
+    char_string fabricSensitiveCharString = 5;
+    SimpleStruct fabricSensitiveStruct = 6;
+    int8u fabricSensitiveInt8uList[] = 7;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct NestedStruct {
+    int8u a = 0;
+    boolean b = 1;
+    SimpleStruct c = 2;
+  }
+
+  struct NestedStructList {
+    int8u a = 0;
+    boolean b = 1;
+    SimpleStruct c = 2;
+    SimpleStruct d[] = 3;
+    int32u e[] = 4;
+    octet_string f[] = 5;
+    int8u g[] = 6;
+  }
+
+  info event TestEvent = 1 {
+    INT8U arg1 = 1;
+    SimpleEnum arg2 = 2;
+    BOOLEAN arg3 = 3;
+    SimpleStruct arg4 = 4;
+    SimpleStruct arg5[] = 5;
+    SimpleEnum arg6[] = 6;
+  }
+
+  info event TestFabricScopedEvent = 2 {
+    fabric_idx arg1 = 254;
+  }
+
+  attribute boolean boolean = 0;
+  attribute Bitmap8MaskMap bitmap8 = 1;
+  attribute Bitmap16MaskMap bitmap16 = 2;
+  attribute Bitmap32MaskMap bitmap32 = 3;
+  attribute Bitmap64MaskMap bitmap64 = 4;
+  attribute int8u int8u = 5;
+  attribute int16u int16u = 6;
+  attribute int24u int24u = 7;
+  attribute int32u int32u = 8;
+  attribute int40u int40u = 9;
+  attribute int48u int48u = 10;
+  attribute int56u int56u = 11;
+  attribute int64u int64u = 12;
+  attribute int8s int8s = 13;
+  attribute int16s int16s = 14;
+  attribute int24s int24s = 15;
+  attribute int32s int32s = 16;
+  attribute int40s int40s = 17;
+  attribute int48s int48s = 18;
+  attribute int56s int56s = 19;
+  attribute int64s int64s = 20;
+  attribute enum8 enum8 = 21;
+  attribute enum16 enum16 = 22;
+  attribute single floatSingle = 23;
+  attribute double floatDouble = 24;
+  attribute octet_string<10> octetString = 25;
+  attribute INT8U listInt8u[] = 26;
+  attribute OCTET_STRING listOctetString[] = 27;
+  attribute TestListStructOctet listStructOctetString[] = 28;
+  attribute long_octet_string<1000> longOctetString = 29;
+  attribute char_string<10> charString = 30;
+  attribute long_char_string<1000> longCharString = 31;
+  attribute epoch_us epochUs = 32;
+  attribute epoch_s epochS = 33;
+  attribute vendor_id vendorId = 34;
+  attribute NullablesAndOptionalsStruct listNullablesAndOptionalsStruct[] = 35;
+  attribute SimpleEnum enumAttr = 36;
+  attribute SimpleStruct structAttr = 37;
+  attribute int8u rangeRestrictedInt8u = 38;
+  attribute int8s rangeRestrictedInt8s = 39;
+  attribute int16u rangeRestrictedInt16u = 40;
+  attribute int16s rangeRestrictedInt16s = 41;
+  attribute LONG_OCTET_STRING listLongOctetString[] = 42;
+  attribute TestFabricScoped listFabricScoped[] = 43;
+  attribute boolean timedWriteBoolean = 48;
+  attribute boolean generalErrorBoolean = 49;
+  attribute boolean clusterErrorBoolean = 50;
+  attribute boolean unsupported = 255;
+  attribute nullable boolean nullableBoolean = 16384;
+  attribute nullable Bitmap8MaskMap nullableBitmap8 = 16385;
+  attribute nullable Bitmap16MaskMap nullableBitmap16 = 16386;
+  attribute nullable Bitmap32MaskMap nullableBitmap32 = 16387;
+  attribute nullable Bitmap64MaskMap nullableBitmap64 = 16388;
+  attribute nullable int8u nullableInt8u = 16389;
+  attribute nullable int16u nullableInt16u = 16390;
+  attribute nullable int24u nullableInt24u = 16391;
+  attribute nullable int32u nullableInt32u = 16392;
+  attribute nullable int40u nullableInt40u = 16393;
+  attribute nullable int48u nullableInt48u = 16394;
+  attribute nullable int56u nullableInt56u = 16395;
+  attribute nullable int64u nullableInt64u = 16396;
+  attribute nullable int8s nullableInt8s = 16397;
+  attribute nullable int16s nullableInt16s = 16398;
+  attribute nullable int24s nullableInt24s = 16399;
+  attribute nullable int32s nullableInt32s = 16400;
+  attribute nullable int40s nullableInt40s = 16401;
+  attribute nullable int48s nullableInt48s = 16402;
+  attribute nullable int56s nullableInt56s = 16403;
+  attribute nullable int64s nullableInt64s = 16404;
+  attribute nullable enum8 nullableEnum8 = 16405;
+  attribute nullable enum16 nullableEnum16 = 16406;
+  attribute nullable single nullableFloatSingle = 16407;
+  attribute nullable double nullableFloatDouble = 16408;
+  attribute nullable octet_string<10> nullableOctetString = 16409;
+  attribute nullable char_string<10> nullableCharString = 16414;
+  attribute nullable SimpleEnum nullableEnumAttr = 16420;
+  attribute nullable SimpleStruct nullableStruct = 16421;
+  attribute nullable int8u nullableRangeRestrictedInt8u = 16422;
+  attribute nullable int8s nullableRangeRestrictedInt8s = 16423;
+  attribute nullable int16u nullableRangeRestrictedInt16u = 16424;
+  attribute nullable int16s nullableRangeRestrictedInt16s = 16425;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
-}
 
-client cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCause : ENUM8 {
-    kUnknown = 0;
-    kAssociationFailed = 1;
-    kAuthenticationFailed = 2;
-    kSsidNotFound = 3;
+  request struct TestAddArgumentsRequest {
+    INT8U arg1 = 0;
+    INT8U arg2 = 1;
   }
 
-  enum SecurityType : ENUM8 {
-    kUnspecified = 0;
-    kNone = 1;
-    kWep = 2;
-    kWpa = 3;
-    kWpa2 = 4;
-    kWpa3 = 5;
+  request struct TestStructArgumentRequestRequest {
+    SimpleStruct arg1 = 0;
   }
 
-  enum WiFiConnectionStatus : ENUM8 {
-    kConnected = 0;
-    kNotConnected = 1;
+  request struct TestNestedStructArgumentRequestRequest {
+    NestedStruct arg1 = 0;
   }
 
-  enum WiFiVersionType : ENUM8 {
-    k80211a = 0;
-    k80211b = 1;
-    k80211g = 2;
-    k80211n = 3;
-    k80211ac = 4;
-    k80211ax = 5;
+  request struct TestListStructArgumentRequestRequest {
+    SimpleStruct arg1[] = 0;
   }
 
-  info event Disconnection = 0 {
-    INT16U reasonCode = 0;
+  request struct TestListInt8UArgumentRequestRequest {
+    INT8U arg1[] = 0;
   }
 
-  info event AssociationFailure = 1 {
-    AssociationFailureCause associationFailure = 0;
-    INT16U status = 1;
+  request struct TestNestedStructListArgumentRequestRequest {
+    NestedStructList arg1 = 0;
   }
 
-  info event ConnectionStatus = 2 {
-    WiFiConnectionStatus connectionStatus = 0;
+  request struct TestListNestedStructListArgumentRequestRequest {
+    NestedStructList arg1[] = 0;
   }
 
-  readonly attribute nullable octet_string<6> bssid = 0;
-  readonly attribute nullable SecurityType securityType = 1;
-  readonly attribute nullable WiFiVersionType wiFiVersion = 2;
-  readonly attribute nullable int16u channelNumber = 3;
-  readonly attribute nullable int8s rssi = 4;
-  readonly attribute int32u beaconLostCount = 5;
-  readonly attribute int32u beaconRxCount = 6;
-  readonly attribute int32u packetMulticastRxCount = 7;
-  readonly attribute int32u packetMulticastTxCount = 8;
-  readonly attribute int32u packetUnicastRxCount = 9;
-  readonly attribute int32u packetUnicastTxCount = 10;
-  readonly attribute int64u currentMaxRate = 11;
-  readonly attribute int64u overrunCount = 12;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  request struct TestListInt8UReverseRequestRequest {
+    INT8U arg1[] = 0;
+  }
 
-  command ResetCounts(): DefaultSuccess = 0;
-}
+  request struct TestEnumsRequestRequest {
+    vendor_id arg1 = 0;
+    SimpleEnum arg2 = 1;
+  }
 
-client cluster WindowCovering = 258 {
-  enum EndProductType : ENUM8 {
-    kRollerShade = 0;
-    kRomanShade = 1;
-    kBalloonShade = 2;
-    kWovenWood = 3;
-    kPleatedShade = 4;
-    kCellularShade = 5;
-    kLayeredShade = 6;
-    kLayeredShade2D = 7;
-    kSheerShade = 8;
-    kTiltOnlyInteriorBlind = 9;
-    kInteriorBlind = 10;
-    kVerticalBlindStripCurtain = 11;
-    kInteriorVenetianBlind = 12;
-    kExteriorVenetianBlind = 13;
-    kLateralLeftCurtain = 14;
-    kLateralRightCurtain = 15;
-    kCentralCurtain = 16;
-    kRollerShutter = 17;
-    kExteriorVerticalScreen = 18;
-    kAwningTerracePatio = 19;
-    kAwningVerticalScreen = 20;
-    kTiltOnlyPergola = 21;
-    kSwingingShutter = 22;
-    kSlidingShutter = 23;
-    kUnknown = 255;
+  request struct TestNullableOptionalRequestRequest {
+    optional nullable INT8U arg1 = 0;
   }
 
-  enum Type : ENUM8 {
-    kRollerShade = 0;
-    kRollerShade2Motor = 1;
-    kRollerShadeExterior = 2;
-    kRollerShadeExterior2Motor = 3;
-    kDrapery = 4;
-    kAwning = 5;
-    kShutter = 6;
-    kTiltBlindTiltOnly = 7;
-    kTiltBlindLiftAndTilt = 8;
-    kProjectorScreen = 9;
-    kUnknown = 255;
+  request struct SimpleStructEchoRequestRequest {
+    SimpleStruct arg1 = 0;
   }
 
-  bitmap ConfigStatus : BITMAP8 {
-    kOperational = 0x1;
-    kOnlineReserved = 0x2;
-    kLiftMovementReversed = 0x4;
-    kLiftPositionAware = 0x8;
-    kTiltPositionAware = 0x10;
-    kLiftEncoderControlled = 0x20;
-    kTiltEncoderControlled = 0x40;
+  request struct TestSimpleOptionalArgumentRequestRequest {
+    optional BOOLEAN arg1 = 0;
   }
 
-  bitmap Feature : BITMAP32 {
-    kLift = 0x1;
-    kTilt = 0x2;
-    kPositionAwareLift = 0x4;
-    kAbsolutePosition = 0x8;
-    kPositionAwareTilt = 0x10;
+  request struct TestEmitTestEventRequestRequest {
+    INT8U arg1 = 0;
+    SimpleEnum arg2 = 1;
+    BOOLEAN arg3 = 2;
   }
 
-  bitmap Mode : BITMAP8 {
-    kMotorDirectionReversed = 0x1;
-    kCalibrationMode = 0x2;
-    kMaintenanceMode = 0x4;
-    kLedFeedback = 0x8;
+  response struct TestSpecificResponse = 0 {
+    INT8U returnValue = 0;
   }
 
-  bitmap OperationalStatus : BITMAP8 {
-    kGlobal = 0x3;
-    kLift = 0xC;
-    kTilt = 0x30;
+  response struct TestAddArgumentsResponse = 1 {
+    INT8U returnValue = 0;
   }
 
-  bitmap SafetyStatus : BITMAP16 {
-    kRemoteLockout = 0x1;
-    kTamperDetection = 0x2;
-    kFailedCommunication = 0x4;
-    kPositionFailure = 0x8;
-    kThermalProtection = 0x10;
-    kObstacleDetected = 0x20;
-    kPower = 0x40;
-    kStopInput = 0x80;
-    kMotorJammed = 0x100;
-    kHardwareFailure = 0x200;
-    kManualOperation = 0x400;
-    kProtection = 0x800;
+  response struct TestListInt8UReverseResponse = 4 {
+    INT8U arg1[] = 0;
   }
 
-  readonly attribute Type type = 0;
-  readonly attribute int16u physicalClosedLimitLift = 1;
-  readonly attribute int16u physicalClosedLimitTilt = 2;
-  readonly attribute nullable int16u currentPositionLift = 3;
-  readonly attribute nullable int16u currentPositionTilt = 4;
-  readonly attribute int16u numberOfActuationsLift = 5;
-  readonly attribute int16u numberOfActuationsTilt = 6;
-  readonly attribute ConfigStatus configStatus = 7;
-  readonly attribute nullable Percent currentPositionLiftPercentage = 8;
-  readonly attribute nullable Percent currentPositionTiltPercentage = 9;
-  readonly attribute OperationalStatus operationalStatus = 10;
-  readonly attribute nullable Percent100ths targetPositionLiftPercent100ths = 11;
-  readonly attribute nullable Percent100ths targetPositionTiltPercent100ths = 12;
-  readonly attribute EndProductType endProductType = 13;
-  readonly attribute nullable Percent100ths currentPositionLiftPercent100ths = 14;
-  readonly attribute nullable Percent100ths currentPositionTiltPercent100ths = 15;
-  readonly attribute int16u installedOpenLimitLift = 16;
-  readonly attribute int16u installedClosedLimitLift = 17;
-  readonly attribute int16u installedOpenLimitTilt = 18;
-  readonly attribute int16u installedClosedLimitTilt = 19;
-  attribute access(write: manage) Mode mode = 23;
-  readonly attribute SafetyStatus safetyStatus = 26;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
+  response struct TestEnumsResponse = 5 {
+    vendor_id arg1 = 0;
+    SimpleEnum arg2 = 1;
+  }
 
-  request struct GoToLiftValueRequest {
-    INT16U liftValue = 0;
+  response struct TestNullableOptionalResponse = 6 {
+    BOOLEAN wasPresent = 0;
+    optional BOOLEAN wasNull = 1;
+    optional INT8U value = 2;
+    optional nullable INT8U originalValue = 3;
   }
 
-  request struct GoToLiftPercentageRequest {
-    Percent100ths liftPercent100thsValue = 0;
+  response struct BooleanResponse = 8 {
+    BOOLEAN value = 0;
   }
 
-  request struct GoToTiltValueRequest {
-    INT16U tiltValue = 0;
+  response struct SimpleStructResponse = 9 {
+    SimpleStruct arg1 = 0;
   }
 
-  request struct GoToTiltPercentageRequest {
-    Percent100ths tiltPercent100thsValue = 0;
+  response struct TestEmitTestEventResponse = 10 {
+    INT64U value = 0;
   }
 
-  command UpOrOpen(): DefaultSuccess = 0;
-  command DownOrClose(): DefaultSuccess = 1;
-  command StopMotion(): DefaultSuccess = 2;
-  command GoToLiftValue(GoToLiftValueRequest): DefaultSuccess = 4;
-  command GoToLiftPercentage(GoToLiftPercentageRequest): DefaultSuccess = 5;
-  command GoToTiltValue(GoToTiltValueRequest): DefaultSuccess = 7;
-  command GoToTiltPercentage(GoToTiltPercentageRequest): DefaultSuccess = 8;
+  command Test(): DefaultSuccess = 0;
+  command TestNotHandled(): DefaultSuccess = 1;
+  command TestSpecific(): TestSpecificResponse = 2;
+  command TestUnknownCommand(): DefaultSuccess = 3;
+  command TestAddArguments(TestAddArgumentsRequest): TestAddArgumentsResponse = 4;
+  command TestStructArgumentRequest(TestStructArgumentRequestRequest): BooleanResponse = 7;
+  command TestNestedStructArgumentRequest(TestNestedStructArgumentRequestRequest): BooleanResponse = 8;
+  command TestListStructArgumentRequest(TestListStructArgumentRequestRequest): BooleanResponse = 9;
+  command TestListInt8UArgumentRequest(TestListInt8UArgumentRequestRequest): BooleanResponse = 10;
+  command TestNestedStructListArgumentRequest(TestNestedStructListArgumentRequestRequest): BooleanResponse = 11;
+  command TestListNestedStructListArgumentRequest(TestListNestedStructListArgumentRequestRequest): BooleanResponse = 12;
+  command TestListInt8UReverseRequest(TestListInt8UReverseRequestRequest): TestListInt8UReverseResponse = 13;
+  command TestEnumsRequest(TestEnumsRequestRequest): TestEnumsResponse = 14;
+  command TestNullableOptionalRequest(TestNullableOptionalRequestRequest): TestNullableOptionalResponse = 15;
+  command SimpleStructEchoRequest(SimpleStructEchoRequestRequest): SimpleStructResponse = 17;
+  timed command TimedInvokeRequest(): DefaultSuccess = 18;
+  command TestSimpleOptionalArgumentRequest(TestSimpleOptionalArgumentRequestRequest): DefaultSuccess = 19;
+  command TestEmitTestEventRequest(TestEmitTestEventRequestRequest): TestEmitTestEventResponse = 20;
 }
 
 endpoint 1 {
diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
index 346b0f80aac941..4d373322db5ced 100644
--- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
+++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
@@ -37,232 +37,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
 
     switch (aPath.mClusterId)
     {
-    case app::Clusters::AccessControl::Id: {
-        using namespace app::Clusters::AccessControl;
+    case app::Clusters::Identify::Id: {
+        using namespace app::Clusters::Identify;
         switch (aPath.mAttributeId)
         {
-        case Attributes::Acl::Id: {
-            using TypeInfo = Attributes::Acl::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                jobject newElement_0_privilege;
-                std::string newElement_0_privilegeClassName     = "java/lang/Integer";
-                std::string newElement_0_privilegeCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0_privilegeClassName.c_str(), newElement_0_privilegeCtorSignature.c_str(),
-                    static_cast<uint8_t>(entry_0.privilege), newElement_0_privilege);
-                jobject newElement_0_authMode;
-                std::string newElement_0_authModeClassName     = "java/lang/Integer";
-                std::string newElement_0_authModeCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0_authModeClassName.c_str(), newElement_0_authModeCtorSignature.c_str(),
-                    static_cast<uint8_t>(entry_0.authMode), newElement_0_authMode);
-                jobject newElement_0_subjects;
-                if (entry_0.subjects.IsNull())
-                {
-                    newElement_0_subjects = nullptr;
-                }
-                else
-                {
-                    chip::JniReferences::GetInstance().CreateArrayList(newElement_0_subjects);
-
-                    auto iter_newElement_0_subjects_3 = entry_0.subjects.Value().begin();
-                    while (iter_newElement_0_subjects_3.Next())
-                    {
-                        auto & entry_3 = iter_newElement_0_subjects_3.GetValue();
-                        jobject newElement_3;
-                        std::string newElement_3ClassName     = "java/lang/Long";
-                        std::string newElement_3CtorSignature = "(J)V";
-                        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(
-                            newElement_3ClassName.c_str(), newElement_3CtorSignature.c_str(), entry_3, newElement_3);
-                        chip::JniReferences::GetInstance().AddToList(newElement_0_subjects, newElement_3);
-                    }
-                }
-                jobject newElement_0_targets;
-                if (entry_0.targets.IsNull())
-                {
-                    newElement_0_targets = nullptr;
-                }
-                else
-                {
-                    chip::JniReferences::GetInstance().CreateArrayList(newElement_0_targets);
-
-                    auto iter_newElement_0_targets_3 = entry_0.targets.Value().begin();
-                    while (iter_newElement_0_targets_3.Next())
-                    {
-                        auto & entry_3 = iter_newElement_0_targets_3.GetValue();
-                        jobject newElement_3;
-                        jobject newElement_3_cluster;
-                        if (entry_3.cluster.IsNull())
-                        {
-                            newElement_3_cluster = nullptr;
-                        }
-                        else
-                        {
-                            std::string newElement_3_clusterClassName     = "java/lang/Long";
-                            std::string newElement_3_clusterCtorSignature = "(J)V";
-                            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                                newElement_3_clusterClassName.c_str(), newElement_3_clusterCtorSignature.c_str(),
-                                entry_3.cluster.Value(), newElement_3_cluster);
-                        }
-                        jobject newElement_3_endpoint;
-                        if (entry_3.endpoint.IsNull())
-                        {
-                            newElement_3_endpoint = nullptr;
-                        }
-                        else
-                        {
-                            std::string newElement_3_endpointClassName     = "java/lang/Integer";
-                            std::string newElement_3_endpointCtorSignature = "(I)V";
-                            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-                                newElement_3_endpointClassName.c_str(), newElement_3_endpointCtorSignature.c_str(),
-                                entry_3.endpoint.Value(), newElement_3_endpoint);
-                        }
-                        jobject newElement_3_deviceType;
-                        if (entry_3.deviceType.IsNull())
-                        {
-                            newElement_3_deviceType = nullptr;
-                        }
-                        else
-                        {
-                            std::string newElement_3_deviceTypeClassName     = "java/lang/Long";
-                            std::string newElement_3_deviceTypeCtorSignature = "(J)V";
-                            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                                newElement_3_deviceTypeClassName.c_str(), newElement_3_deviceTypeCtorSignature.c_str(),
-                                entry_3.deviceType.Value(), newElement_3_deviceType);
-                        }
-
-                        jclass targetStructClass;
-                        err = chip::JniReferences::GetInstance().GetClassRef(
-                            env, "chip/devicecontroller/ChipStructs$AccessControlClusterTarget", targetStructClass);
-                        if (err != CHIP_NO_ERROR)
-                        {
-                            ChipLogError(Zcl, "Could not find class ChipStructs$AccessControlClusterTarget");
-                            return nullptr;
-                        }
-                        jmethodID targetStructCtor =
-                            env->GetMethodID(targetStructClass, "<init>", "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Long;)V");
-                        if (targetStructCtor == nullptr)
-                        {
-                            ChipLogError(Zcl, "Could not find ChipStructs$AccessControlClusterTarget constructor");
-                            return nullptr;
-                        }
-
-                        newElement_3 = env->NewObject(targetStructClass, targetStructCtor, newElement_3_cluster,
-                                                      newElement_3_endpoint, newElement_3_deviceType);
-                        chip::JniReferences::GetInstance().AddToList(newElement_0_targets, newElement_3);
-                    }
-                }
-                jobject newElement_0_fabricIndex;
-                std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
-                std::string newElement_0_fabricIndexCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
-                                                                              newElement_0_fabricIndexCtorSignature.c_str(),
-                                                                              entry_0.fabricIndex, newElement_0_fabricIndex);
-
-                jclass accessControlEntryStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$AccessControlClusterAccessControlEntry", accessControlEntryStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$AccessControlClusterAccessControlEntry");
-                    return nullptr;
-                }
-                jmethodID accessControlEntryStructCtor = env->GetMethodID(
-                    accessControlEntryStructClass, "<init>",
-                    "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/ArrayList;Ljava/util/ArrayList;Ljava/lang/Integer;)V");
-                if (accessControlEntryStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$AccessControlClusterAccessControlEntry constructor");
-                    return nullptr;
-                }
-
-                newElement_0 =
-                    env->NewObject(accessControlEntryStructClass, accessControlEntryStructCtor, newElement_0_privilege,
-                                   newElement_0_authMode, newElement_0_subjects, newElement_0_targets, newElement_0_fabricIndex);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::Extension::Id: {
-            using TypeInfo = Attributes::Extension::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                jobject newElement_0_data;
-                jbyteArray newElement_0_dataByteArray = env->NewByteArray(static_cast<jsize>(entry_0.data.size()));
-                env->SetByteArrayRegion(newElement_0_dataByteArray, 0, static_cast<jsize>(entry_0.data.size()),
-                                        reinterpret_cast<const jbyte *>(entry_0.data.data()));
-                newElement_0_data = newElement_0_dataByteArray;
-                jobject newElement_0_fabricIndex;
-                std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
-                std::string newElement_0_fabricIndexCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
-                                                                              newElement_0_fabricIndexCtorSignature.c_str(),
-                                                                              entry_0.fabricIndex, newElement_0_fabricIndex);
-
-                jclass extensionEntryStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$AccessControlClusterExtensionEntry", extensionEntryStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$AccessControlClusterExtensionEntry");
-                    return nullptr;
-                }
-                jmethodID extensionEntryStructCtor =
-                    env->GetMethodID(extensionEntryStructClass, "<init>", "([BLjava/lang/Integer;)V");
-                if (extensionEntryStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$AccessControlClusterExtensionEntry constructor");
-                    return nullptr;
-                }
-
-                newElement_0 = env->NewObject(extensionEntryStructClass, extensionEntryStructCtor, newElement_0_data,
-                                              newElement_0_fabricIndex);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::SubjectsPerAccessControlEntry::Id: {
-            using TypeInfo = Attributes::SubjectsPerAccessControlEntry::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        case Attributes::TargetsPerAccessControlEntry::Id: {
-            using TypeInfo = Attributes::TargetsPerAccessControlEntry::TypeInfo;
+        case Attributes::IdentifyTime::Id: {
+            using TypeInfo = Attributes::IdentifyTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -276,8 +56,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::AccessControlEntriesPerFabric::Id: {
-            using TypeInfo = Attributes::AccessControlEntriesPerFabric::TypeInfo;
+        case Attributes::IdentifyType::Id: {
+            using TypeInfo = Attributes::IdentifyType::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -287,8 +67,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -399,10 +179,25 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::AccountLogin::Id: {
-        using namespace app::Clusters::AccountLogin;
+    case app::Clusters::Groups::Id: {
+        using namespace app::Clusters::Groups;
         switch (aPath.mAttributeId)
         {
+        case Attributes::NameSupport::Id: {
+            using TypeInfo = Attributes::NameSupport::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
+            return value;
+        }
         case Attributes::GeneratedCommandList::Id: {
             using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -511,12 +306,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::AdministratorCommissioning::Id: {
-        using namespace app::Clusters::AdministratorCommissioning;
+    case app::Clusters::Scenes::Id: {
+        using namespace app::Clusters::Scenes;
         switch (aPath.mAttributeId)
         {
-        case Attributes::WindowStatus::Id: {
-            using TypeInfo = Attributes::WindowStatus::TypeInfo;
+        case Attributes::SceneCount::Id: {
+            using TypeInfo = Attributes::SceneCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -530,8 +325,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                           cppValue, value);
             return value;
         }
-        case Attributes::AdminFabricIndex::Id: {
-            using TypeInfo = Attributes::AdminFabricIndex::TypeInfo;
+        case Attributes::CurrentScene::Id: {
+            using TypeInfo = Attributes::CurrentScene::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -545,8 +340,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                           cppValue, value);
             return value;
         }
-        case Attributes::AdminVendorId::Id: {
-            using TypeInfo = Attributes::AdminVendorId::TypeInfo;
+        case Attributes::CurrentGroup::Id: {
+            using TypeInfo = Attributes::CurrentGroup::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -560,6 +355,36 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
+        case Attributes::SceneValid::Id: {
+            using TypeInfo = Attributes::SceneValid::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::NameSupport::Id: {
+            using TypeInfo = Attributes::NameSupport::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
+            return value;
+        }
         case Attributes::GeneratedCommandList::Id: {
             using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -668,12 +493,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::ApplicationBasic::Id: {
-        using namespace app::Clusters::ApplicationBasic;
+    case app::Clusters::OnOff::Id: {
+        using namespace app::Clusters::OnOff;
         switch (aPath.mAttributeId)
         {
-        case Attributes::VendorName::Id: {
-            using TypeInfo = Attributes::VendorName::TypeInfo;
+        case Attributes::OnOff::Id: {
+            using TypeInfo = Attributes::OnOff::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -681,11 +506,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
+                                                                       value);
             return value;
         }
-        case Attributes::VendorID::Id: {
-            using TypeInfo = Attributes::VendorID::TypeInfo;
+        case Attributes::GlobalSceneControl::Id: {
+            using TypeInfo = Attributes::GlobalSceneControl::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -693,14 +521,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
+                                                                       value);
             return value;
         }
-        case Attributes::ApplicationName::Id: {
-            using TypeInfo = Attributes::ApplicationName::TypeInfo;
+        case Attributes::OnTime::Id: {
+            using TypeInfo = Attributes::OnTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -708,11 +536,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::ProductID::Id: {
-            using TypeInfo = Attributes::ProductID::TypeInfo;
+        case Attributes::OffWaitTime::Id: {
+            using TypeInfo = Attributes::OffWaitTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -726,8 +557,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::Application::Id: {
-            using TypeInfo = Attributes::Application::TypeInfo;
+        case Attributes::StartUpOnOff::Id: {
+            using TypeInfo = Attributes::StartUpOnOff::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -735,39 +566,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            jobject value_catalogVendorId;
-            std::string value_catalogVendorIdClassName     = "java/lang/Integer";
-            std::string value_catalogVendorIdCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(value_catalogVendorIdClassName.c_str(),
-                                                                           value_catalogVendorIdCtorSignature.c_str(),
-                                                                           cppValue.catalogVendorId, value_catalogVendorId);
-            jobject value_applicationId;
-            value_applicationId =
-                env->NewStringUTF(std::string(cppValue.applicationId.data(), cppValue.applicationId.size()).c_str());
-
-            jclass applicationBasicApplicationStructClass;
-            err = chip::JniReferences::GetInstance().GetClassRef(
-                env, "chip/devicecontroller/ChipStructs$ApplicationBasicClusterApplicationBasicApplication",
-                applicationBasicApplicationStructClass);
-            if (err != CHIP_NO_ERROR)
+            if (cppValue.IsNull())
             {
-                ChipLogError(Zcl, "Could not find class ChipStructs$ApplicationBasicClusterApplicationBasicApplication");
-                return nullptr;
+                value = nullptr;
             }
-            jmethodID applicationBasicApplicationStructCtor =
-                env->GetMethodID(applicationBasicApplicationStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/String;)V");
-            if (applicationBasicApplicationStructCtor == nullptr)
+            else
             {
-                ChipLogError(Zcl, "Could not find ChipStructs$ApplicationBasicClusterApplicationBasicApplication constructor");
-                return nullptr;
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              static_cast<uint8_t>(cppValue.Value()), value);
             }
-
-            value = env->NewObject(applicationBasicApplicationStructClass, applicationBasicApplicationStructCtor,
-                                   value_catalogVendorId, value_applicationId);
             return value;
         }
-        case Attributes::Status::Id: {
-            using TypeInfo = Attributes::Status::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -775,14 +588,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          static_cast<uint8_t>(cppValue), value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::ApplicationVersion::Id: {
-            using TypeInfo = Attributes::ApplicationVersion::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -790,11 +612,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::AllowedVendorList::Id: {
-            using TypeInfo = Attributes::AllowedVendorList::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -809,14 +643,84 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 auto & entry_0 = iter_value_0.GetValue();
                 jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Integer";
-                std::string newElement_0CtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), static_cast<uint16_t>(entry_0), newElement_0);
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
                 chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::OnOffSwitchConfiguration::Id: {
+        using namespace app::Clusters::OnOffSwitchConfiguration;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::SwitchType::Id: {
+            using TypeInfo = Attributes::SwitchType::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
+            return value;
+        }
+        case Attributes::SwitchActions::Id: {
+            using TypeInfo = Attributes::SwitchActions::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
+            return value;
+        }
         case Attributes::GeneratedCommandList::Id: {
             using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -925,12 +829,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::ApplicationLauncher::Id: {
-        using namespace app::Clusters::ApplicationLauncher;
+    case app::Clusters::LevelControl::Id: {
+        using namespace app::Clusters::LevelControl;
         switch (aPath.mAttributeId)
         {
-        case Attributes::CatalogList::Id: {
-            using TypeInfo = Attributes::CatalogList::TypeInfo;
+        case Attributes::CurrentLevel::Id: {
+            using TypeInfo = Attributes::CurrentLevel::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -938,23 +842,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Integer";
-                std::string newElement_0CtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::CurrentApp::Id: {
-            using TypeInfo = Attributes::CurrentApp::TypeInfo;
+        case Attributes::RemainingTime::Id: {
+            using TypeInfo = Attributes::RemainingTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -962,81 +857,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                jobject value_application;
-                jobject value_application_catalogVendorId;
-                std::string value_application_catalogVendorIdClassName     = "java/lang/Integer";
-                std::string value_application_catalogVendorIdCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-                    value_application_catalogVendorIdClassName.c_str(), value_application_catalogVendorIdCtorSignature.c_str(),
-                    cppValue.Value().application.catalogVendorId, value_application_catalogVendorId);
-                jobject value_application_applicationId;
-                value_application_applicationId = env->NewStringUTF(std::string(cppValue.Value().application.applicationId.data(),
-                                                                                cppValue.Value().application.applicationId.size())
-                                                                        .c_str());
-
-                jclass applicationStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$ApplicationLauncherClusterApplication", applicationStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$ApplicationLauncherClusterApplication");
-                    return nullptr;
-                }
-                jmethodID applicationStructCtor =
-                    env->GetMethodID(applicationStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/String;)V");
-                if (applicationStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$ApplicationLauncherClusterApplication constructor");
-                    return nullptr;
-                }
-
-                value_application = env->NewObject(applicationStructClass, applicationStructCtor, value_application_catalogVendorId,
-                                                   value_application_applicationId);
-                jobject value_endpoint;
-                if (!cppValue.Value().endpoint.HasValue())
-                {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, value_endpoint);
-                }
-                else
-                {
-                    jobject value_endpointInsideOptional;
-                    std::string value_endpointInsideOptionalClassName     = "java/lang/Integer";
-                    std::string value_endpointInsideOptionalCtorSignature = "(I)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-                        value_endpointInsideOptionalClassName.c_str(), value_endpointInsideOptionalCtorSignature.c_str(),
-                        cppValue.Value().endpoint.Value(), value_endpointInsideOptional);
-                    chip::JniReferences::GetInstance().CreateOptional(value_endpointInsideOptional, value_endpoint);
-                }
-
-                jclass applicationEPStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$ApplicationLauncherClusterApplicationEP", applicationEPStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$ApplicationLauncherClusterApplicationEP");
-                    return nullptr;
-                }
-                jmethodID applicationEPStructCtor = env->GetMethodID(
-                    applicationEPStructClass, "<init>",
-                    "(Lchip/devicecontroller/ChipStructs$ApplicationLauncherClusterApplication;Ljava/util/Optional;)V");
-                if (applicationEPStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$ApplicationLauncherClusterApplicationEP constructor");
-                    return nullptr;
-                }
-
-                value = env->NewObject(applicationEPStructClass, applicationEPStructCtor, value_application, value_endpoint);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::MinLevel::Id: {
+            using TypeInfo = Attributes::MinLevel::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -1044,23 +872,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::MaxLevel::Id: {
+            using TypeInfo = Attributes::MaxLevel::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -1068,23 +887,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::CurrentFrequency::Id: {
+            using TypeInfo = Attributes::CurrentFrequency::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -1092,23 +902,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::MinFrequency::Id: {
+            using TypeInfo = Attributes::MinFrequency::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -1116,14 +917,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::MaxFrequency::Id: {
+            using TypeInfo = Attributes::MaxFrequency::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -1137,18 +938,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::AudioOutput::Id: {
-        using namespace app::Clusters::AudioOutput;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::OutputList::Id: {
-            using TypeInfo = Attributes::OutputList::TypeInfo;
+        case Attributes::Options::Id: {
+            using TypeInfo = Attributes::Options::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -1156,52 +947,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                jobject newElement_0_index;
-                std::string newElement_0_indexClassName     = "java/lang/Integer";
-                std::string newElement_0_indexCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_indexClassName.c_str(),
-                                                                              newElement_0_indexCtorSignature.c_str(),
-                                                                              entry_0.index, newElement_0_index);
-                jobject newElement_0_outputType;
-                std::string newElement_0_outputTypeClassName     = "java/lang/Integer";
-                std::string newElement_0_outputTypeCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0_outputTypeClassName.c_str(), newElement_0_outputTypeCtorSignature.c_str(),
-                    static_cast<uint8_t>(entry_0.outputType), newElement_0_outputType);
-                jobject newElement_0_name;
-                newElement_0_name = env->NewStringUTF(std::string(entry_0.name.data(), entry_0.name.size()).c_str());
-
-                jclass outputInfoStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$AudioOutputClusterOutputInfo", outputInfoStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$AudioOutputClusterOutputInfo");
-                    return nullptr;
-                }
-                jmethodID outputInfoStructCtor = env->GetMethodID(outputInfoStructClass, "<init>",
-                                                                  "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;)V");
-                if (outputInfoStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$AudioOutputClusterOutputInfo constructor");
-                    return nullptr;
-                }
-
-                newElement_0 = env->NewObject(outputInfoStructClass, outputInfoStructCtor, newElement_0_index,
-                                              newElement_0_outputType, newElement_0_name);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::CurrentOutput::Id: {
-            using TypeInfo = Attributes::CurrentOutput::TypeInfo;
+        case Attributes::OnOffTransitionTime::Id: {
+            using TypeInfo = Attributes::OnOffTransitionTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -1211,12 +964,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::OnLevel::Id: {
+            using TypeInfo = Attributes::OnLevel::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -1224,25 +977,135 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = nullptr;
             }
-            return value;
-        }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
+            return value;
+        }
+        case Attributes::OnTransitionTime::Id: {
+            using TypeInfo = Attributes::OnTransitionTime::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
+            return value;
+        }
+        case Attributes::OffTransitionTime::Id: {
+            using TypeInfo = Attributes::OffTransitionTime::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
+            return value;
+        }
+        case Attributes::DefaultMoveRate::Id: {
+            using TypeInfo = Attributes::DefaultMoveRate::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
+            return value;
+        }
+        case Attributes::StartUpCurrentLevel::Id: {
+            using TypeInfo = Attributes::StartUpCurrentLevel::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
+            return value;
+        }
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
             {
                 return nullptr;
@@ -1323,27 +1186,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::BarrierControl::Id: {
-        using namespace app::Clusters::BarrierControl;
+    case app::Clusters::BinaryInputBasic::Id: {
+        using namespace app::Clusters::BinaryInputBasic;
         switch (aPath.mAttributeId)
         {
-        case Attributes::BarrierMovingState::Id: {
-            using TypeInfo = Attributes::BarrierMovingState::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
-            return value;
-        }
-        case Attributes::BarrierSafetyStatus::Id: {
-            using TypeInfo = Attributes::BarrierSafetyStatus::TypeInfo;
+        case Attributes::OutOfService::Id: {
+            using TypeInfo = Attributes::OutOfService::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -1351,14 +1199,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
+                                                                       value);
             return value;
         }
-        case Attributes::BarrierCapabilities::Id: {
-            using TypeInfo = Attributes::BarrierCapabilities::TypeInfo;
+        case Attributes::PresentValue::Id: {
+            using TypeInfo = Attributes::PresentValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -1366,14 +1214,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
+                                                                       value);
             return value;
         }
-        case Attributes::BarrierPosition::Id: {
-            using TypeInfo = Attributes::BarrierPosition::TypeInfo;
+        case Attributes::StatusFlags::Id: {
+            using TypeInfo = Attributes::StatusFlags::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -1495,12 +1343,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::Basic::Id: {
-        using namespace app::Clusters::Basic;
+    case app::Clusters::Descriptor::Id: {
+        using namespace app::Clusters::Descriptor;
         switch (aPath.mAttributeId)
         {
-        case Attributes::DataModelRevision::Id: {
-            using TypeInfo = Attributes::DataModelRevision::TypeInfo;
+        case Attributes::DeviceList::Id: {
+            using TypeInfo = Attributes::DeviceList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -1508,26 +1356,49 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        case Attributes::VendorName::Id: {
-            using TypeInfo = Attributes::VendorName::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                return nullptr;
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_type;
+                std::string newElement_0_typeClassName     = "java/lang/Long";
+                std::string newElement_0_typeCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0_typeClassName.c_str(), newElement_0_typeCtorSignature.c_str(), entry_0.type, newElement_0_type);
+                jobject newElement_0_revision;
+                std::string newElement_0_revisionClassName     = "java/lang/Integer";
+                std::string newElement_0_revisionCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_revisionClassName.c_str(),
+                                                                               newElement_0_revisionCtorSignature.c_str(),
+                                                                               entry_0.revision, newElement_0_revision);
+
+                jclass deviceTypeStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$DescriptorClusterDeviceType", deviceTypeStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$DescriptorClusterDeviceType");
+                    return nullptr;
+                }
+                jmethodID deviceTypeStructCtor =
+                    env->GetMethodID(deviceTypeStructClass, "<init>", "(Ljava/lang/Long;Ljava/lang/Integer;)V");
+                if (deviceTypeStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$DescriptorClusterDeviceType constructor");
+                    return nullptr;
+                }
+
+                newElement_0 =
+                    env->NewObject(deviceTypeStructClass, deviceTypeStructCtor, newElement_0_type, newElement_0_revision);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
-            jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
             return value;
         }
-        case Attributes::VendorID::Id: {
-            using TypeInfo = Attributes::VendorID::TypeInfo;
+        case Attributes::ServerList::Id: {
+            using TypeInfo = Attributes::ServerList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -1535,14 +1406,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           static_cast<uint16_t>(cppValue), value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::ProductName::Id: {
-            using TypeInfo = Attributes::ProductName::TypeInfo;
+        case Attributes::ClientList::Id: {
+            using TypeInfo = Attributes::ClientList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -1550,206 +1430,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
-            return value;
-        }
-        case Attributes::ProductID::Id: {
-            using TypeInfo = Attributes::ProductID::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        case Attributes::NodeLabel::Id: {
-            using TypeInfo = Attributes::NodeLabel::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
-            return value;
-        }
-        case Attributes::Location::Id: {
-            using TypeInfo = Attributes::Location::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
-            return value;
-        }
-        case Attributes::HardwareVersion::Id: {
-            using TypeInfo = Attributes::HardwareVersion::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        case Attributes::HardwareVersionString::Id: {
-            using TypeInfo = Attributes::HardwareVersionString::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
-            return value;
-        }
-        case Attributes::SoftwareVersion::Id: {
-            using TypeInfo = Attributes::SoftwareVersion::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        case Attributes::SoftwareVersionString::Id: {
-            using TypeInfo = Attributes::SoftwareVersionString::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
-            return value;
-        }
-        case Attributes::ManufacturingDate::Id: {
-            using TypeInfo = Attributes::ManufacturingDate::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
-            return value;
-        }
-        case Attributes::PartNumber::Id: {
-            using TypeInfo = Attributes::PartNumber::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
-            return value;
-        }
-        case Attributes::ProductURL::Id: {
-            using TypeInfo = Attributes::ProductURL::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
-            return value;
-        }
-        case Attributes::ProductLabel::Id: {
-            using TypeInfo = Attributes::ProductLabel::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
-            return value;
-        }
-        case Attributes::SerialNumber::Id: {
-            using TypeInfo = Attributes::SerialNumber::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
-            return value;
-        }
-        case Attributes::LocalConfigDisabled::Id: {
-            using TypeInfo = Attributes::LocalConfigDisabled::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
-                                                                       value);
-            return value;
-        }
-        case Attributes::Reachable::Id: {
-            using TypeInfo = Attributes::Reachable::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
-                                                                       value);
-            return value;
-        }
-        case Attributes::UniqueID::Id: {
-            using TypeInfo = Attributes::UniqueID::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                return nullptr;
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
-            jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
             return value;
         }
-        case Attributes::CapabilityMinima::Id: {
-            using TypeInfo = Attributes::CapabilityMinima::TypeInfo;
+        case Attributes::PartsList::Id: {
+            using TypeInfo = Attributes::PartsList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -1757,37 +1454,19 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            jobject value_caseSessionsPerFabric;
-            std::string value_caseSessionsPerFabricClassName     = "java/lang/Integer";
-            std::string value_caseSessionsPerFabricCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-                value_caseSessionsPerFabricClassName.c_str(), value_caseSessionsPerFabricCtorSignature.c_str(),
-                cppValue.caseSessionsPerFabric, value_caseSessionsPerFabric);
-            jobject value_subscriptionsPerFabric;
-            std::string value_subscriptionsPerFabricClassName     = "java/lang/Integer";
-            std::string value_subscriptionsPerFabricCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-                value_subscriptionsPerFabricClassName.c_str(), value_subscriptionsPerFabricCtorSignature.c_str(),
-                cppValue.subscriptionsPerFabric, value_subscriptionsPerFabric);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
 
-            jclass capabilityMinimaStructStructClass;
-            err = chip::JniReferences::GetInstance().GetClassRef(
-                env, "chip/devicecontroller/ChipStructs$BasicClusterCapabilityMinimaStruct", capabilityMinimaStructStructClass);
-            if (err != CHIP_NO_ERROR)
-            {
-                ChipLogError(Zcl, "Could not find class ChipStructs$BasicClusterCapabilityMinimaStruct");
-                return nullptr;
-            }
-            jmethodID capabilityMinimaStructStructCtor =
-                env->GetMethodID(capabilityMinimaStructStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;)V");
-            if (capabilityMinimaStructStructCtor == nullptr)
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                ChipLogError(Zcl, "Could not find ChipStructs$BasicClusterCapabilityMinimaStruct constructor");
-                return nullptr;
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Integer";
+                std::string newElement_0CtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
-
-            value = env->NewObject(capabilityMinimaStructStructClass, capabilityMinimaStructStructCtor, value_caseSessionsPerFabric,
-                                   value_subscriptionsPerFabric);
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -1898,169 +1577,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::BinaryInputBasic::Id: {
-        using namespace app::Clusters::BinaryInputBasic;
+    case app::Clusters::Binding::Id: {
+        using namespace app::Clusters::Binding;
         switch (aPath.mAttributeId)
         {
-        case Attributes::OutOfService::Id: {
-            using TypeInfo = Attributes::OutOfService::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
-                                                                       value);
-            return value;
-        }
-        case Attributes::PresentValue::Id: {
-            using TypeInfo = Attributes::PresentValue::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
-                                                                       value);
-            return value;
-        }
-        case Attributes::StatusFlags::Id: {
-            using TypeInfo = Attributes::StatusFlags::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
-            return value;
-        }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::Binding::Id: {
-        using namespace app::Clusters::Binding;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::Binding::Id: {
-            using TypeInfo = Attributes::Binding::TypeInfo;
+        case Attributes::Binding::Id: {
+            using TypeInfo = Attributes::Binding::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -2276,51 +1798,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::BooleanState::Id: {
-        using namespace app::Clusters::BooleanState;
+    case app::Clusters::AccessControl::Id: {
+        using namespace app::Clusters::AccessControl;
         switch (aPath.mAttributeId)
         {
-        case Attributes::StateValue::Id: {
-            using TypeInfo = Attributes::StateValue::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
-                                                                       value);
-            return value;
-        }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::Acl::Id: {
+            using TypeInfo = Attributes::Acl::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -2335,80 +1818,147 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 auto & entry_0 = iter_value_0.GetValue();
                 jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
+                jobject newElement_0_privilege;
+                std::string newElement_0_privilegeClassName     = "java/lang/Integer";
+                std::string newElement_0_privilegeCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0_privilegeClassName.c_str(), newElement_0_privilegeCtorSignature.c_str(),
+                    static_cast<uint8_t>(entry_0.privilege), newElement_0_privilege);
+                jobject newElement_0_authMode;
+                std::string newElement_0_authModeClassName     = "java/lang/Integer";
+                std::string newElement_0_authModeCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0_authModeClassName.c_str(), newElement_0_authModeCtorSignature.c_str(),
+                    static_cast<uint8_t>(entry_0.authMode), newElement_0_authMode);
+                jobject newElement_0_subjects;
+                if (entry_0.subjects.IsNull())
+                {
+                    newElement_0_subjects = nullptr;
+                }
+                else
+                {
+                    chip::JniReferences::GetInstance().CreateArrayList(newElement_0_subjects);
 
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
+                    auto iter_newElement_0_subjects_3 = entry_0.subjects.Value().begin();
+                    while (iter_newElement_0_subjects_3.Next())
+                    {
+                        auto & entry_3 = iter_newElement_0_subjects_3.GetValue();
+                        jobject newElement_3;
+                        std::string newElement_3ClassName     = "java/lang/Long";
+                        std::string newElement_3CtorSignature = "(J)V";
+                        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(
+                            newElement_3ClassName.c_str(), newElement_3CtorSignature.c_str(), entry_3, newElement_3);
+                        chip::JniReferences::GetInstance().AddToList(newElement_0_subjects, newElement_3);
+                    }
+                }
+                jobject newElement_0_targets;
+                if (entry_0.targets.IsNull())
+                {
+                    newElement_0_targets = nullptr;
+                }
+                else
+                {
+                    chip::JniReferences::GetInstance().CreateArrayList(newElement_0_targets);
+
+                    auto iter_newElement_0_targets_3 = entry_0.targets.Value().begin();
+                    while (iter_newElement_0_targets_3.Next())
+                    {
+                        auto & entry_3 = iter_newElement_0_targets_3.GetValue();
+                        jobject newElement_3;
+                        jobject newElement_3_cluster;
+                        if (entry_3.cluster.IsNull())
+                        {
+                            newElement_3_cluster = nullptr;
+                        }
+                        else
+                        {
+                            std::string newElement_3_clusterClassName     = "java/lang/Long";
+                            std::string newElement_3_clusterCtorSignature = "(J)V";
+                            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                                newElement_3_clusterClassName.c_str(), newElement_3_clusterCtorSignature.c_str(),
+                                entry_3.cluster.Value(), newElement_3_cluster);
+                        }
+                        jobject newElement_3_endpoint;
+                        if (entry_3.endpoint.IsNull())
+                        {
+                            newElement_3_endpoint = nullptr;
+                        }
+                        else
+                        {
+                            std::string newElement_3_endpointClassName     = "java/lang/Integer";
+                            std::string newElement_3_endpointCtorSignature = "(I)V";
+                            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+                                newElement_3_endpointClassName.c_str(), newElement_3_endpointCtorSignature.c_str(),
+                                entry_3.endpoint.Value(), newElement_3_endpoint);
+                        }
+                        jobject newElement_3_deviceType;
+                        if (entry_3.deviceType.IsNull())
+                        {
+                            newElement_3_deviceType = nullptr;
+                        }
+                        else
+                        {
+                            std::string newElement_3_deviceTypeClassName     = "java/lang/Long";
+                            std::string newElement_3_deviceTypeCtorSignature = "(J)V";
+                            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                                newElement_3_deviceTypeClassName.c_str(), newElement_3_deviceTypeCtorSignature.c_str(),
+                                entry_3.deviceType.Value(), newElement_3_deviceType);
+                        }
+
+                        jclass targetStructClass;
+                        err = chip::JniReferences::GetInstance().GetClassRef(
+                            env, "chip/devicecontroller/ChipStructs$AccessControlClusterTarget", targetStructClass);
+                        if (err != CHIP_NO_ERROR)
+                        {
+                            ChipLogError(Zcl, "Could not find class ChipStructs$AccessControlClusterTarget");
+                            return nullptr;
+                        }
+                        jmethodID targetStructCtor =
+                            env->GetMethodID(targetStructClass, "<init>", "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Long;)V");
+                        if (targetStructCtor == nullptr)
+                        {
+                            ChipLogError(Zcl, "Could not find ChipStructs$AccessControlClusterTarget constructor");
+                            return nullptr;
+                        }
+
+                        newElement_3 = env->NewObject(targetStructClass, targetStructCtor, newElement_3_cluster,
+                                                      newElement_3_endpoint, newElement_3_deviceType);
+                        chip::JniReferences::GetInstance().AddToList(newElement_0_targets, newElement_3);
+                    }
+                }
+                jobject newElement_0_fabricIndex;
+                std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
+                std::string newElement_0_fabricIndexCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
+                                                                              newElement_0_fabricIndexCtorSignature.c_str(),
+                                                                              entry_0.fabricIndex, newElement_0_fabricIndex);
+
+                jclass accessControlEntryStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$AccessControlClusterAccessControlEntry", accessControlEntryStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$AccessControlClusterAccessControlEntry");
+                    return nullptr;
+                }
+                jmethodID accessControlEntryStructCtor = env->GetMethodID(
+                    accessControlEntryStructClass, "<init>",
+                    "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/ArrayList;Ljava/util/ArrayList;Ljava/lang/Integer;)V");
+                if (accessControlEntryStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$AccessControlClusterAccessControlEntry constructor");
+                    return nullptr;
+                }
+
+                newElement_0 =
+                    env->NewObject(accessControlEntryStructClass, accessControlEntryStructCtor, newElement_0_privilege,
+                                   newElement_0_authMode, newElement_0_subjects, newElement_0_targets, newElement_0_fabricIndex);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::BridgedActions::Id: {
-        using namespace app::Clusters::BridgedActions;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::ActionList::Id: {
-            using TypeInfo = Attributes::ActionList::TypeInfo;
+        case Attributes::Extension::Id: {
+            using TypeInfo = Attributes::Extension::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -2423,66 +1973,42 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 auto & entry_0 = iter_value_0.GetValue();
                 jobject newElement_0;
-                jobject newElement_0_actionID;
-                std::string newElement_0_actionIDClassName     = "java/lang/Integer";
-                std::string newElement_0_actionIDCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_actionIDClassName.c_str(),
-                                                                               newElement_0_actionIDCtorSignature.c_str(),
-                                                                               entry_0.actionID, newElement_0_actionID);
-                jobject newElement_0_name;
-                newElement_0_name = env->NewStringUTF(std::string(entry_0.name.data(), entry_0.name.size()).c_str());
-                jobject newElement_0_type;
-                std::string newElement_0_typeClassName     = "java/lang/Integer";
-                std::string newElement_0_typeCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0_typeClassName.c_str(), newElement_0_typeCtorSignature.c_str(), static_cast<uint8_t>(entry_0.type),
-                    newElement_0_type);
-                jobject newElement_0_endpointListID;
-                std::string newElement_0_endpointListIDClassName     = "java/lang/Integer";
-                std::string newElement_0_endpointListIDCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_endpointListIDClassName.c_str(),
-                                                                               newElement_0_endpointListIDCtorSignature.c_str(),
-                                                                               entry_0.endpointListID, newElement_0_endpointListID);
-                jobject newElement_0_supportedCommands;
-                std::string newElement_0_supportedCommandsClassName     = "java/lang/Integer";
-                std::string newElement_0_supportedCommandsCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-                    newElement_0_supportedCommandsClassName.c_str(), newElement_0_supportedCommandsCtorSignature.c_str(),
-                    entry_0.supportedCommands, newElement_0_supportedCommands);
-                jobject newElement_0_status;
-                std::string newElement_0_statusClassName     = "java/lang/Integer";
-                std::string newElement_0_statusCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0_statusClassName.c_str(), newElement_0_statusCtorSignature.c_str(),
-                    static_cast<uint8_t>(entry_0.status), newElement_0_status);
+                jobject newElement_0_data;
+                jbyteArray newElement_0_dataByteArray = env->NewByteArray(static_cast<jsize>(entry_0.data.size()));
+                env->SetByteArrayRegion(newElement_0_dataByteArray, 0, static_cast<jsize>(entry_0.data.size()),
+                                        reinterpret_cast<const jbyte *>(entry_0.data.data()));
+                newElement_0_data = newElement_0_dataByteArray;
+                jobject newElement_0_fabricIndex;
+                std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
+                std::string newElement_0_fabricIndexCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
+                                                                              newElement_0_fabricIndexCtorSignature.c_str(),
+                                                                              entry_0.fabricIndex, newElement_0_fabricIndex);
 
-                jclass actionStructStructClass;
+                jclass extensionEntryStructClass;
                 err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$BridgedActionsClusterActionStruct", actionStructStructClass);
+                    env, "chip/devicecontroller/ChipStructs$AccessControlClusterExtensionEntry", extensionEntryStructClass);
                 if (err != CHIP_NO_ERROR)
                 {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$BridgedActionsClusterActionStruct");
+                    ChipLogError(Zcl, "Could not find class ChipStructs$AccessControlClusterExtensionEntry");
                     return nullptr;
                 }
-                jmethodID actionStructStructCtor =
-                    env->GetMethodID(actionStructStructClass, "<init>",
-                                     "(Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/"
-                                     "Integer;Ljava/lang/Integer;)V");
-                if (actionStructStructCtor == nullptr)
+                jmethodID extensionEntryStructCtor =
+                    env->GetMethodID(extensionEntryStructClass, "<init>", "([BLjava/lang/Integer;)V");
+                if (extensionEntryStructCtor == nullptr)
                 {
-                    ChipLogError(Zcl, "Could not find ChipStructs$BridgedActionsClusterActionStruct constructor");
+                    ChipLogError(Zcl, "Could not find ChipStructs$AccessControlClusterExtensionEntry constructor");
                     return nullptr;
                 }
 
-                newElement_0 = env->NewObject(actionStructStructClass, actionStructStructCtor, newElement_0_actionID,
-                                              newElement_0_name, newElement_0_type, newElement_0_endpointListID,
-                                              newElement_0_supportedCommands, newElement_0_status);
+                newElement_0 = env->NewObject(extensionEntryStructClass, extensionEntryStructCtor, newElement_0_data,
+                                              newElement_0_fabricIndex);
                 chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::EndpointList::Id: {
-            using TypeInfo = Attributes::EndpointList::TypeInfo;
+        case Attributes::SubjectsPerAccessControlEntry::Id: {
+            using TypeInfo = Attributes::SubjectsPerAccessControlEntry::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -2490,69 +2016,29 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::TargetsPerAccessControlEntry::Id: {
+            using TypeInfo = Attributes::TargetsPerAccessControlEntry::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                jobject newElement_0_endpointListID;
-                std::string newElement_0_endpointListIDClassName     = "java/lang/Integer";
-                std::string newElement_0_endpointListIDCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_endpointListIDClassName.c_str(),
-                                                                               newElement_0_endpointListIDCtorSignature.c_str(),
-                                                                               entry_0.endpointListID, newElement_0_endpointListID);
-                jobject newElement_0_name;
-                newElement_0_name = env->NewStringUTF(std::string(entry_0.name.data(), entry_0.name.size()).c_str());
-                jobject newElement_0_type;
-                std::string newElement_0_typeClassName     = "java/lang/Integer";
-                std::string newElement_0_typeCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0_typeClassName.c_str(), newElement_0_typeCtorSignature.c_str(), static_cast<uint8_t>(entry_0.type),
-                    newElement_0_type);
-                jobject newElement_0_endpoints;
-                chip::JniReferences::GetInstance().CreateArrayList(newElement_0_endpoints);
-
-                auto iter_newElement_0_endpoints_2 = entry_0.endpoints.begin();
-                while (iter_newElement_0_endpoints_2.Next())
-                {
-                    auto & entry_2 = iter_newElement_0_endpoints_2.GetValue();
-                    jobject newElement_2;
-                    std::string newElement_2ClassName     = "java/lang/Integer";
-                    std::string newElement_2CtorSignature = "(I)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-                        newElement_2ClassName.c_str(), newElement_2CtorSignature.c_str(), entry_2, newElement_2);
-                    chip::JniReferences::GetInstance().AddToList(newElement_0_endpoints, newElement_2);
-                }
-
-                jclass endpointListStructStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$BridgedActionsClusterEndpointListStruct",
-                    endpointListStructStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$BridgedActionsClusterEndpointListStruct");
-                    return nullptr;
-                }
-                jmethodID endpointListStructStructCtor =
-                    env->GetMethodID(endpointListStructStructClass, "<init>",
-                                     "(Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V");
-                if (endpointListStructStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$BridgedActionsClusterEndpointListStruct constructor");
-                    return nullptr;
-                }
-
-                newElement_0 =
-                    env->NewObject(endpointListStructStructClass, endpointListStructStructCtor, newElement_0_endpointListID,
-                                   newElement_0_name, newElement_0_type, newElement_0_endpoints);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::SetupUrl::Id: {
-            using TypeInfo = Attributes::SetupUrl::TypeInfo;
+        case Attributes::AccessControlEntriesPerFabric::Id: {
+            using TypeInfo = Attributes::AccessControlEntriesPerFabric::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -2560,7 +2046,10 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -2671,12 +2160,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::BridgedDeviceBasic::Id: {
-        using namespace app::Clusters::BridgedDeviceBasic;
+    case app::Clusters::BridgedActions::Id: {
+        using namespace app::Clusters::BridgedActions;
         switch (aPath.mAttributeId)
         {
-        case Attributes::VendorName::Id: {
-            using TypeInfo = Attributes::VendorName::TypeInfo;
+        case Attributes::ActionList::Id: {
+            using TypeInfo = Attributes::ActionList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -2684,11 +2173,73 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_actionID;
+                std::string newElement_0_actionIDClassName     = "java/lang/Integer";
+                std::string newElement_0_actionIDCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_actionIDClassName.c_str(),
+                                                                               newElement_0_actionIDCtorSignature.c_str(),
+                                                                               entry_0.actionID, newElement_0_actionID);
+                jobject newElement_0_name;
+                newElement_0_name = env->NewStringUTF(std::string(entry_0.name.data(), entry_0.name.size()).c_str());
+                jobject newElement_0_type;
+                std::string newElement_0_typeClassName     = "java/lang/Integer";
+                std::string newElement_0_typeCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0_typeClassName.c_str(), newElement_0_typeCtorSignature.c_str(), static_cast<uint8_t>(entry_0.type),
+                    newElement_0_type);
+                jobject newElement_0_endpointListID;
+                std::string newElement_0_endpointListIDClassName     = "java/lang/Integer";
+                std::string newElement_0_endpointListIDCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_endpointListIDClassName.c_str(),
+                                                                               newElement_0_endpointListIDCtorSignature.c_str(),
+                                                                               entry_0.endpointListID, newElement_0_endpointListID);
+                jobject newElement_0_supportedCommands;
+                std::string newElement_0_supportedCommandsClassName     = "java/lang/Integer";
+                std::string newElement_0_supportedCommandsCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+                    newElement_0_supportedCommandsClassName.c_str(), newElement_0_supportedCommandsCtorSignature.c_str(),
+                    entry_0.supportedCommands, newElement_0_supportedCommands);
+                jobject newElement_0_status;
+                std::string newElement_0_statusClassName     = "java/lang/Integer";
+                std::string newElement_0_statusCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0_statusClassName.c_str(), newElement_0_statusCtorSignature.c_str(),
+                    static_cast<uint8_t>(entry_0.status), newElement_0_status);
+
+                jclass actionStructStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$BridgedActionsClusterActionStruct", actionStructStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$BridgedActionsClusterActionStruct");
+                    return nullptr;
+                }
+                jmethodID actionStructStructCtor =
+                    env->GetMethodID(actionStructStructClass, "<init>",
+                                     "(Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/"
+                                     "Integer;Ljava/lang/Integer;)V");
+                if (actionStructStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$BridgedActionsClusterActionStruct constructor");
+                    return nullptr;
+                }
+
+                newElement_0 = env->NewObject(actionStructStructClass, actionStructStructCtor, newElement_0_actionID,
+                                              newElement_0_name, newElement_0_type, newElement_0_endpointListID,
+                                              newElement_0_supportedCommands, newElement_0_status);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::VendorID::Id: {
-            using TypeInfo = Attributes::VendorID::TypeInfo;
+        case Attributes::EndpointList::Id: {
+            using TypeInfo = Attributes::EndpointList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -2696,14 +2247,69 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           static_cast<uint16_t>(cppValue), value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_endpointListID;
+                std::string newElement_0_endpointListIDClassName     = "java/lang/Integer";
+                std::string newElement_0_endpointListIDCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_endpointListIDClassName.c_str(),
+                                                                               newElement_0_endpointListIDCtorSignature.c_str(),
+                                                                               entry_0.endpointListID, newElement_0_endpointListID);
+                jobject newElement_0_name;
+                newElement_0_name = env->NewStringUTF(std::string(entry_0.name.data(), entry_0.name.size()).c_str());
+                jobject newElement_0_type;
+                std::string newElement_0_typeClassName     = "java/lang/Integer";
+                std::string newElement_0_typeCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0_typeClassName.c_str(), newElement_0_typeCtorSignature.c_str(), static_cast<uint8_t>(entry_0.type),
+                    newElement_0_type);
+                jobject newElement_0_endpoints;
+                chip::JniReferences::GetInstance().CreateArrayList(newElement_0_endpoints);
+
+                auto iter_newElement_0_endpoints_2 = entry_0.endpoints.begin();
+                while (iter_newElement_0_endpoints_2.Next())
+                {
+                    auto & entry_2 = iter_newElement_0_endpoints_2.GetValue();
+                    jobject newElement_2;
+                    std::string newElement_2ClassName     = "java/lang/Integer";
+                    std::string newElement_2CtorSignature = "(I)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+                        newElement_2ClassName.c_str(), newElement_2CtorSignature.c_str(), entry_2, newElement_2);
+                    chip::JniReferences::GetInstance().AddToList(newElement_0_endpoints, newElement_2);
+                }
+
+                jclass endpointListStructStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$BridgedActionsClusterEndpointListStruct",
+                    endpointListStructStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$BridgedActionsClusterEndpointListStruct");
+                    return nullptr;
+                }
+                jmethodID endpointListStructStructCtor =
+                    env->GetMethodID(endpointListStructStructClass, "<init>",
+                                     "(Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V");
+                if (endpointListStructStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$BridgedActionsClusterEndpointListStruct constructor");
+                    return nullptr;
+                }
+
+                newElement_0 =
+                    env->NewObject(endpointListStructStructClass, endpointListStructStructCtor, newElement_0_endpointListID,
+                                   newElement_0_name, newElement_0_type, newElement_0_endpoints);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::ProductName::Id: {
-            using TypeInfo = Attributes::ProductName::TypeInfo;
+        case Attributes::SetupUrl::Id: {
+            using TypeInfo = Attributes::SetupUrl::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -2714,8 +2320,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
             return value;
         }
-        case Attributes::NodeLabel::Id: {
-            using TypeInfo = Attributes::NodeLabel::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -2723,11 +2329,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::HardwareVersion::Id: {
-            using TypeInfo = Attributes::HardwareVersion::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -2735,14 +2353,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::HardwareVersionString::Id: {
-            using TypeInfo = Attributes::HardwareVersionString::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -2750,11 +2377,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::SoftwareVersion::Id: {
-            using TypeInfo = Attributes::SoftwareVersion::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -2768,9 +2407,169 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::SoftwareVersionString::Id: {
-            using TypeInfo = Attributes::SoftwareVersionString::TypeInfo;
-            TypeInfo::DecodableType cppValue;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::Basic::Id: {
+        using namespace app::Clusters::Basic;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::DataModelRevision::Id: {
+            using TypeInfo = Attributes::DataModelRevision::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::VendorName::Id: {
+            using TypeInfo = Attributes::VendorName::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
+            return value;
+        }
+        case Attributes::VendorID::Id: {
+            using TypeInfo = Attributes::VendorID::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           static_cast<uint16_t>(cppValue), value);
+            return value;
+        }
+        case Attributes::ProductName::Id: {
+            using TypeInfo = Attributes::ProductName::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
+            return value;
+        }
+        case Attributes::ProductID::Id: {
+            using TypeInfo = Attributes::ProductID::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::NodeLabel::Id: {
+            using TypeInfo = Attributes::NodeLabel::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
+            return value;
+        }
+        case Attributes::Location::Id: {
+            using TypeInfo = Attributes::Location::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
+            return value;
+        }
+        case Attributes::HardwareVersion::Id: {
+            using TypeInfo = Attributes::HardwareVersion::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::HardwareVersionString::Id: {
+            using TypeInfo = Attributes::HardwareVersionString::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
+            return value;
+        }
+        case Attributes::SoftwareVersion::Id: {
+            using TypeInfo = Attributes::SoftwareVersion::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::SoftwareVersionString::Id: {
+            using TypeInfo = Attributes::SoftwareVersionString::TypeInfo;
+            TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
             {
@@ -2840,6 +2639,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
             return value;
         }
+        case Attributes::LocalConfigDisabled::Id: {
+            using TypeInfo = Attributes::LocalConfigDisabled::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
+                                                                       value);
+            return value;
+        }
         case Attributes::Reachable::Id: {
             using TypeInfo = Attributes::Reachable::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -2867,6 +2681,48 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
             return value;
         }
+        case Attributes::CapabilityMinima::Id: {
+            using TypeInfo = Attributes::CapabilityMinima::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            jobject value_caseSessionsPerFabric;
+            std::string value_caseSessionsPerFabricClassName     = "java/lang/Integer";
+            std::string value_caseSessionsPerFabricCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+                value_caseSessionsPerFabricClassName.c_str(), value_caseSessionsPerFabricCtorSignature.c_str(),
+                cppValue.caseSessionsPerFabric, value_caseSessionsPerFabric);
+            jobject value_subscriptionsPerFabric;
+            std::string value_subscriptionsPerFabricClassName     = "java/lang/Integer";
+            std::string value_subscriptionsPerFabricCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+                value_subscriptionsPerFabricClassName.c_str(), value_subscriptionsPerFabricCtorSignature.c_str(),
+                cppValue.subscriptionsPerFabric, value_subscriptionsPerFabric);
+
+            jclass capabilityMinimaStructStructClass;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipStructs$BasicClusterCapabilityMinimaStruct", capabilityMinimaStructStructClass);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl, "Could not find class ChipStructs$BasicClusterCapabilityMinimaStruct");
+                return nullptr;
+            }
+            jmethodID capabilityMinimaStructStructCtor =
+                env->GetMethodID(capabilityMinimaStructStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;)V");
+            if (capabilityMinimaStructStructCtor == nullptr)
+            {
+                ChipLogError(Zcl, "Could not find ChipStructs$BasicClusterCapabilityMinimaStruct constructor");
+                return nullptr;
+            }
+
+            value = env->NewObject(capabilityMinimaStructStructClass, capabilityMinimaStructStructCtor, value_caseSessionsPerFabric,
+                                   value_subscriptionsPerFabric);
+            return value;
+        }
         case Attributes::GeneratedCommandList::Id: {
             using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -2975,12 +2831,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::Channel::Id: {
-        using namespace app::Clusters::Channel;
+    case app::Clusters::OtaSoftwareUpdateProvider::Id: {
+        using namespace app::Clusters::OtaSoftwareUpdateProvider;
         switch (aPath.mAttributeId)
         {
-        case Attributes::ChannelList::Id: {
-            using TypeInfo = Attributes::ChannelList::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -2995,82 +2851,16 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 auto & entry_0 = iter_value_0.GetValue();
                 jobject newElement_0;
-                jobject newElement_0_majorNumber;
-                std::string newElement_0_majorNumberClassName     = "java/lang/Integer";
-                std::string newElement_0_majorNumberCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_majorNumberClassName.c_str(),
-                                                                               newElement_0_majorNumberCtorSignature.c_str(),
-                                                                               entry_0.majorNumber, newElement_0_majorNumber);
-                jobject newElement_0_minorNumber;
-                std::string newElement_0_minorNumberClassName     = "java/lang/Integer";
-                std::string newElement_0_minorNumberCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_minorNumberClassName.c_str(),
-                                                                               newElement_0_minorNumberCtorSignature.c_str(),
-                                                                               entry_0.minorNumber, newElement_0_minorNumber);
-                jobject newElement_0_name;
-                if (!entry_0.name.HasValue())
-                {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_name);
-                }
-                else
-                {
-                    jobject newElement_0_nameInsideOptional;
-                    newElement_0_nameInsideOptional =
-                        env->NewStringUTF(std::string(entry_0.name.Value().data(), entry_0.name.Value().size()).c_str());
-                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_nameInsideOptional, newElement_0_name);
-                }
-                jobject newElement_0_callSign;
-                if (!entry_0.callSign.HasValue())
-                {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_callSign);
-                }
-                else
-                {
-                    jobject newElement_0_callSignInsideOptional;
-                    newElement_0_callSignInsideOptional =
-                        env->NewStringUTF(std::string(entry_0.callSign.Value().data(), entry_0.callSign.Value().size()).c_str());
-                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_callSignInsideOptional, newElement_0_callSign);
-                }
-                jobject newElement_0_affiliateCallSign;
-                if (!entry_0.affiliateCallSign.HasValue())
-                {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_affiliateCallSign);
-                }
-                else
-                {
-                    jobject newElement_0_affiliateCallSignInsideOptional;
-                    newElement_0_affiliateCallSignInsideOptional = env->NewStringUTF(
-                        std::string(entry_0.affiliateCallSign.Value().data(), entry_0.affiliateCallSign.Value().size()).c_str());
-                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_affiliateCallSignInsideOptional,
-                                                                      newElement_0_affiliateCallSign);
-                }
-
-                jclass channelInfoStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$ChannelClusterChannelInfo", channelInfoStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$ChannelClusterChannelInfo");
-                    return nullptr;
-                }
-                jmethodID channelInfoStructCtor = env->GetMethodID(
-                    channelInfoStructClass, "<init>",
-                    "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V");
-                if (channelInfoStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$ChannelClusterChannelInfo constructor");
-                    return nullptr;
-                }
-
-                newElement_0 = env->NewObject(channelInfoStructClass, channelInfoStructCtor, newElement_0_majorNumber,
-                                              newElement_0_minorNumber, newElement_0_name, newElement_0_callSign,
-                                              newElement_0_affiliateCallSign);
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
                 chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::Lineup::Id: {
-            using TypeInfo = Attributes::Lineup::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3078,72 +2868,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                jobject value_operatorName;
-                value_operatorName = env->NewStringUTF(
-                    std::string(cppValue.Value().operatorName.data(), cppValue.Value().operatorName.size()).c_str());
-                jobject value_lineupName;
-                if (!cppValue.Value().lineupName.HasValue())
-                {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, value_lineupName);
-                }
-                else
-                {
-                    jobject value_lineupNameInsideOptional;
-                    value_lineupNameInsideOptional = env->NewStringUTF(
-                        std::string(cppValue.Value().lineupName.Value().data(), cppValue.Value().lineupName.Value().size())
-                            .c_str());
-                    chip::JniReferences::GetInstance().CreateOptional(value_lineupNameInsideOptional, value_lineupName);
-                }
-                jobject value_postalCode;
-                if (!cppValue.Value().postalCode.HasValue())
-                {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, value_postalCode);
-                }
-                else
-                {
-                    jobject value_postalCodeInsideOptional;
-                    value_postalCodeInsideOptional = env->NewStringUTF(
-                        std::string(cppValue.Value().postalCode.Value().data(), cppValue.Value().postalCode.Value().size())
-                            .c_str());
-                    chip::JniReferences::GetInstance().CreateOptional(value_postalCodeInsideOptional, value_postalCode);
-                }
-                jobject value_lineupInfoType;
-                std::string value_lineupInfoTypeClassName     = "java/lang/Integer";
-                std::string value_lineupInfoTypeCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    value_lineupInfoTypeClassName.c_str(), value_lineupInfoTypeCtorSignature.c_str(),
-                    static_cast<uint8_t>(cppValue.Value().lineupInfoType), value_lineupInfoType);
-
-                jclass lineupInfoStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$ChannelClusterLineupInfo", lineupInfoStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$ChannelClusterLineupInfo");
-                    return nullptr;
-                }
-                jmethodID lineupInfoStructCtor =
-                    env->GetMethodID(lineupInfoStructClass, "<init>",
-                                     "(Ljava/lang/String;Ljava/util/Optional;Ljava/util/Optional;Ljava/lang/Integer;)V");
-                if (lineupInfoStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$ChannelClusterLineupInfo constructor");
-                    return nullptr;
-                }
-
-                value = env->NewObject(lineupInfoStructClass, lineupInfoStructCtor, value_operatorName, value_lineupName,
-                                       value_postalCode, value_lineupInfoType);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::CurrentChannel::Id: {
-            using TypeInfo = Attributes::CurrentChannel::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3151,88 +2883,82 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::OtaSoftwareUpdateRequestor::Id: {
+        using namespace app::Clusters::OtaSoftwareUpdateRequestor;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::DefaultOtaProviders::Id: {
+            using TypeInfo = Attributes::DefaultOtaProviders::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                value = nullptr;
+                return nullptr;
             }
-            else
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                jobject value_majorNumber;
-                std::string value_majorNumberClassName     = "java/lang/Integer";
-                std::string value_majorNumberCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(value_majorNumberClassName.c_str(),
-                                                                               value_majorNumberCtorSignature.c_str(),
-                                                                               cppValue.Value().majorNumber, value_majorNumber);
-                jobject value_minorNumber;
-                std::string value_minorNumberClassName     = "java/lang/Integer";
-                std::string value_minorNumberCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(value_minorNumberClassName.c_str(),
-                                                                               value_minorNumberCtorSignature.c_str(),
-                                                                               cppValue.Value().minorNumber, value_minorNumber);
-                jobject value_name;
-                if (!cppValue.Value().name.HasValue())
-                {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, value_name);
-                }
-                else
-                {
-                    jobject value_nameInsideOptional;
-                    value_nameInsideOptional = env->NewStringUTF(
-                        std::string(cppValue.Value().name.Value().data(), cppValue.Value().name.Value().size()).c_str());
-                    chip::JniReferences::GetInstance().CreateOptional(value_nameInsideOptional, value_name);
-                }
-                jobject value_callSign;
-                if (!cppValue.Value().callSign.HasValue())
-                {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, value_callSign);
-                }
-                else
-                {
-                    jobject value_callSignInsideOptional;
-                    value_callSignInsideOptional = env->NewStringUTF(
-                        std::string(cppValue.Value().callSign.Value().data(), cppValue.Value().callSign.Value().size()).c_str());
-                    chip::JniReferences::GetInstance().CreateOptional(value_callSignInsideOptional, value_callSign);
-                }
-                jobject value_affiliateCallSign;
-                if (!cppValue.Value().affiliateCallSign.HasValue())
-                {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, value_affiliateCallSign);
-                }
-                else
-                {
-                    jobject value_affiliateCallSignInsideOptional;
-                    value_affiliateCallSignInsideOptional =
-                        env->NewStringUTF(std::string(cppValue.Value().affiliateCallSign.Value().data(),
-                                                      cppValue.Value().affiliateCallSign.Value().size())
-                                              .c_str());
-                    chip::JniReferences::GetInstance().CreateOptional(value_affiliateCallSignInsideOptional,
-                                                                      value_affiliateCallSign);
-                }
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_providerNodeID;
+                std::string newElement_0_providerNodeIDClassName     = "java/lang/Long";
+                std::string newElement_0_providerNodeIDCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_providerNodeIDClassName.c_str(),
+                                                                               newElement_0_providerNodeIDCtorSignature.c_str(),
+                                                                               entry_0.providerNodeID, newElement_0_providerNodeID);
+                jobject newElement_0_endpoint;
+                std::string newElement_0_endpointClassName     = "java/lang/Integer";
+                std::string newElement_0_endpointCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_endpointClassName.c_str(),
+                                                                               newElement_0_endpointCtorSignature.c_str(),
+                                                                               entry_0.endpoint, newElement_0_endpoint);
+                jobject newElement_0_fabricIndex;
+                std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
+                std::string newElement_0_fabricIndexCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
+                                                                              newElement_0_fabricIndexCtorSignature.c_str(),
+                                                                              entry_0.fabricIndex, newElement_0_fabricIndex);
 
-                jclass channelInfoStructClass;
+                jclass providerLocationStructClass;
                 err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$ChannelClusterChannelInfo", channelInfoStructClass);
+                    env, "chip/devicecontroller/ChipStructs$OtaSoftwareUpdateRequestorClusterProviderLocation",
+                    providerLocationStructClass);
                 if (err != CHIP_NO_ERROR)
                 {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$ChannelClusterChannelInfo");
+                    ChipLogError(Zcl, "Could not find class ChipStructs$OtaSoftwareUpdateRequestorClusterProviderLocation");
                     return nullptr;
                 }
-                jmethodID channelInfoStructCtor = env->GetMethodID(
-                    channelInfoStructClass, "<init>",
-                    "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V");
-                if (channelInfoStructCtor == nullptr)
+                jmethodID providerLocationStructCtor = env->GetMethodID(
+                    providerLocationStructClass, "<init>", "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Integer;)V");
+                if (providerLocationStructCtor == nullptr)
                 {
-                    ChipLogError(Zcl, "Could not find ChipStructs$ChannelClusterChannelInfo constructor");
+                    ChipLogError(Zcl, "Could not find ChipStructs$OtaSoftwareUpdateRequestorClusterProviderLocation constructor");
                     return nullptr;
                 }
 
-                value = env->NewObject(channelInfoStructClass, channelInfoStructCtor, value_majorNumber, value_minorNumber,
-                                       value_name, value_callSign, value_affiliateCallSign);
+                newElement_0 = env->NewObject(providerLocationStructClass, providerLocationStructCtor, newElement_0_providerNodeID,
+                                              newElement_0_endpoint, newElement_0_fabricIndex);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::UpdatePossible::Id: {
+            using TypeInfo = Attributes::UpdatePossible::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3240,23 +2966,29 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::UpdateState::Id: {
+            using TypeInfo = Attributes::UpdateState::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          static_cast<uint8_t>(cppValue), value);
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::UpdateStateProgress::Id: {
+            using TypeInfo = Attributes::UpdateStateProgress::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3264,18 +2996,16 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
             }
             return value;
         }
@@ -3339,12 +3069,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::ColorControl::Id: {
-        using namespace app::Clusters::ColorControl;
+    case app::Clusters::LocalizationConfiguration::Id: {
+        using namespace app::Clusters::LocalizationConfiguration;
         switch (aPath.mAttributeId)
         {
-        case Attributes::CurrentHue::Id: {
-            using TypeInfo = Attributes::CurrentHue::TypeInfo;
+        case Attributes::ActiveLocale::Id: {
+            using TypeInfo = Attributes::ActiveLocale::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3352,14 +3082,11 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
             return value;
         }
-        case Attributes::CurrentSaturation::Id: {
-            using TypeInfo = Attributes::CurrentSaturation::TypeInfo;
+        case Attributes::SupportedLocales::Id: {
+            using TypeInfo = Attributes::SupportedLocales::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3367,14 +3094,20 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                newElement_0 = env->NewStringUTF(std::string(entry_0.data(), entry_0.size()).c_str());
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::RemainingTime::Id: {
-            using TypeInfo = Attributes::RemainingTime::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3382,14 +3115,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::CurrentX::Id: {
-            using TypeInfo = Attributes::CurrentX::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3397,14 +3139,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::CurrentY::Id: {
-            using TypeInfo = Attributes::CurrentY::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3412,14 +3163,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::DriftCompensation::Id: {
-            using TypeInfo = Attributes::DriftCompensation::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3429,12 +3180,22 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::CompensationText::Id: {
-            using TypeInfo = Attributes::CompensationText::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::TimeFormatLocalization::Id: {
+        using namespace app::Clusters::TimeFormatLocalization;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::HourFormat::Id: {
+            using TypeInfo = Attributes::HourFormat::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3442,11 +3203,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          static_cast<uint8_t>(cppValue), value);
             return value;
         }
-        case Attributes::ColorTemperature::Id: {
-            using TypeInfo = Attributes::ColorTemperature::TypeInfo;
+        case Attributes::ActiveCalendarType::Id: {
+            using TypeInfo = Attributes::ActiveCalendarType::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3456,12 +3220,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          static_cast<uint8_t>(cppValue), value);
             return value;
         }
-        case Attributes::ColorMode::Id: {
-            using TypeInfo = Attributes::ColorMode::TypeInfo;
+        case Attributes::SupportedCalendarTypes::Id: {
+            using TypeInfo = Attributes::SupportedCalendarTypes::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3469,14 +3233,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Integer";
+                std::string newElement_0CtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), static_cast<uint8_t>(entry_0), newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::Options::Id: {
-            using TypeInfo = Attributes::Options::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3484,14 +3257,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::NumberOfPrimaries::Id: {
-            using TypeInfo = Attributes::NumberOfPrimaries::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3499,21 +3281,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::Primary1X::Id: {
-            using TypeInfo = Attributes::Primary1X::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3521,14 +3305,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::Primary1Y::Id: {
-            using TypeInfo = Attributes::Primary1Y::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3542,8 +3326,18 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::Primary1Intensity::Id: {
-            using TypeInfo = Attributes::Primary1Intensity::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::UnitLocalization::Id: {
+        using namespace app::Clusters::UnitLocalization;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::TemperatureUnit::Id: {
+            using TypeInfo = Attributes::TemperatureUnit::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3551,21 +3345,38 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          static_cast<uint8_t>(cppValue), value);
+            return value;
+        }
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                value = nullptr;
+                return nullptr;
             }
-            else
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::Primary2X::Id: {
-            using TypeInfo = Attributes::Primary2X::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3573,14 +3384,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::Primary2Y::Id: {
-            using TypeInfo = Attributes::Primary2Y::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3594,8 +3405,18 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::Primary2Intensity::Id: {
-            using TypeInfo = Attributes::Primary2Intensity::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::PowerSourceConfiguration::Id: {
+        using namespace app::Clusters::PowerSourceConfiguration;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::Sources::Id: {
+            using TypeInfo = Attributes::Sources::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3603,21 +3424,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Integer";
+                std::string newElement_0CtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::Primary3X::Id: {
-            using TypeInfo = Attributes::Primary3X::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3625,14 +3448,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::Primary3Y::Id: {
-            using TypeInfo = Attributes::Primary3Y::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3640,14 +3472,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::Primary3Intensity::Id: {
-            using TypeInfo = Attributes::Primary3Intensity::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3655,21 +3496,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::Primary4X::Id: {
-            using TypeInfo = Attributes::Primary4X::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3677,14 +3520,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::Primary4Y::Id: {
-            using TypeInfo = Attributes::Primary4Y::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3698,8 +3541,18 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::Primary4Intensity::Id: {
-            using TypeInfo = Attributes::Primary4Intensity::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::PowerSource::Id: {
+        using namespace app::Clusters::PowerSource;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::Status::Id: {
+            using TypeInfo = Attributes::Status::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3707,21 +3560,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::Primary5X::Id: {
-            using TypeInfo = Attributes::Primary5X::TypeInfo;
+        case Attributes::Order::Id: {
+            using TypeInfo = Attributes::Order::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3731,12 +3577,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::Primary5Y::Id: {
-            using TypeInfo = Attributes::Primary5Y::TypeInfo;
+        case Attributes::Description::Id: {
+            using TypeInfo = Attributes::Description::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3744,14 +3590,11 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
             return value;
         }
-        case Attributes::Primary5Intensity::Id: {
-            using TypeInfo = Attributes::Primary5Intensity::TypeInfo;
+        case Attributes::WiredAssessedInputVoltage::Id: {
+            using TypeInfo = Attributes::WiredAssessedInputVoltage::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3759,21 +3602,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::Primary6X::Id: {
-            using TypeInfo = Attributes::Primary6X::TypeInfo;
+        case Attributes::WiredAssessedInputFrequency::Id: {
+            using TypeInfo = Attributes::WiredAssessedInputFrequency::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3787,8 +3623,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::Primary6Y::Id: {
-            using TypeInfo = Attributes::Primary6Y::TypeInfo;
+        case Attributes::WiredCurrentType::Id: {
+            using TypeInfo = Attributes::WiredCurrentType::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3798,12 +3634,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::Primary6Intensity::Id: {
-            using TypeInfo = Attributes::Primary6Intensity::TypeInfo;
+        case Attributes::WiredAssessedCurrent::Id: {
+            using TypeInfo = Attributes::WiredAssessedCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3811,21 +3647,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::WhitePointX::Id: {
-            using TypeInfo = Attributes::WhitePointX::TypeInfo;
+        case Attributes::WiredNominalVoltage::Id: {
+            using TypeInfo = Attributes::WiredNominalVoltage::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3833,14 +3662,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::WhitePointY::Id: {
-            using TypeInfo = Attributes::WhitePointY::TypeInfo;
+        case Attributes::WiredMaximumCurrent::Id: {
+            using TypeInfo = Attributes::WiredMaximumCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3848,14 +3677,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::ColorPointRX::Id: {
-            using TypeInfo = Attributes::ColorPointRX::TypeInfo;
+        case Attributes::WiredPresent::Id: {
+            using TypeInfo = Attributes::WiredPresent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3863,14 +3692,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
+                                                                       value);
             return value;
         }
-        case Attributes::ColorPointRY::Id: {
-            using TypeInfo = Attributes::ColorPointRY::TypeInfo;
+        case Attributes::ActiveWiredFaults::Id: {
+            using TypeInfo = Attributes::ActiveWiredFaults::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3878,14 +3707,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Integer";
+                std::string newElement_0CtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::ColorPointRIntensity::Id: {
-            using TypeInfo = Attributes::ColorPointRIntensity::TypeInfo;
+        case Attributes::BatteryVoltage::Id: {
+            using TypeInfo = Attributes::BatteryVoltage::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3893,21 +3731,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::ColorPointGX::Id: {
-            using TypeInfo = Attributes::ColorPointGX::TypeInfo;
+        case Attributes::BatteryPercentRemaining::Id: {
+            using TypeInfo = Attributes::BatteryPercentRemaining::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3917,12 +3748,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::ColorPointGY::Id: {
-            using TypeInfo = Attributes::ColorPointGY::TypeInfo;
+        case Attributes::BatteryTimeRemaining::Id: {
+            using TypeInfo = Attributes::BatteryTimeRemaining::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3930,14 +3761,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::ColorPointGIntensity::Id: {
-            using TypeInfo = Attributes::ColorPointGIntensity::TypeInfo;
+        case Attributes::BatteryChargeLevel::Id: {
+            using TypeInfo = Attributes::BatteryChargeLevel::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3945,21 +3776,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::ColorPointBX::Id: {
-            using TypeInfo = Attributes::ColorPointBX::TypeInfo;
+        case Attributes::BatteryReplacementNeeded::Id: {
+            using TypeInfo = Attributes::BatteryReplacementNeeded::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3967,14 +3791,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
+                                                                       value);
             return value;
         }
-        case Attributes::ColorPointBY::Id: {
-            using TypeInfo = Attributes::ColorPointBY::TypeInfo;
+        case Attributes::BatteryReplaceability::Id: {
+            using TypeInfo = Attributes::BatteryReplaceability::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3984,12 +3808,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::ColorPointBIntensity::Id: {
-            using TypeInfo = Attributes::ColorPointBIntensity::TypeInfo;
+        case Attributes::BatteryPresent::Id: {
+            using TypeInfo = Attributes::BatteryPresent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -3997,21 +3821,38 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
+                                                                       value);
+            return value;
+        }
+        case Attributes::ActiveBatteryFaults::Id: {
+            using TypeInfo = Attributes::ActiveBatteryFaults::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                value = nullptr;
+                return nullptr;
             }
-            else
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Integer";
+                std::string newElement_0CtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::EnhancedCurrentHue::Id: {
-            using TypeInfo = Attributes::EnhancedCurrentHue::TypeInfo;
+        case Attributes::BatteryReplacementDescription::Id: {
+            using TypeInfo = Attributes::BatteryReplacementDescription::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4019,14 +3860,11 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
             return value;
         }
-        case Attributes::EnhancedColorMode::Id: {
-            using TypeInfo = Attributes::EnhancedColorMode::TypeInfo;
+        case Attributes::BatteryCommonDesignation::Id: {
+            using TypeInfo = Attributes::BatteryCommonDesignation::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4034,14 +3872,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::ColorLoopActive::Id: {
-            using TypeInfo = Attributes::ColorLoopActive::TypeInfo;
+        case Attributes::BatteryANSIDesignation::Id: {
+            using TypeInfo = Attributes::BatteryANSIDesignation::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4049,14 +3887,11 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
             return value;
         }
-        case Attributes::ColorLoopDirection::Id: {
-            using TypeInfo = Attributes::ColorLoopDirection::TypeInfo;
+        case Attributes::BatteryIECDesignation::Id: {
+            using TypeInfo = Attributes::BatteryIECDesignation::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4064,14 +3899,11 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
             return value;
         }
-        case Attributes::ColorLoopTime::Id: {
-            using TypeInfo = Attributes::ColorLoopTime::TypeInfo;
+        case Attributes::BatteryApprovedChemistry::Id: {
+            using TypeInfo = Attributes::BatteryApprovedChemistry::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4079,14 +3911,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::ColorLoopStartEnhancedHue::Id: {
-            using TypeInfo = Attributes::ColorLoopStartEnhancedHue::TypeInfo;
+        case Attributes::BatteryCapacity::Id: {
+            using TypeInfo = Attributes::BatteryCapacity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4094,14 +3926,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::ColorLoopStoredEnhancedHue::Id: {
-            using TypeInfo = Attributes::ColorLoopStoredEnhancedHue::TypeInfo;
+        case Attributes::BatteryQuantity::Id: {
+            using TypeInfo = Attributes::BatteryQuantity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4111,12 +3943,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::ColorCapabilities::Id: {
-            using TypeInfo = Attributes::ColorCapabilities::TypeInfo;
+        case Attributes::BatteryChargeState::Id: {
+            using TypeInfo = Attributes::BatteryChargeState::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4126,12 +3958,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::ColorTempPhysicalMinMireds::Id: {
-            using TypeInfo = Attributes::ColorTempPhysicalMinMireds::TypeInfo;
+        case Attributes::BatteryTimeToFullCharge::Id: {
+            using TypeInfo = Attributes::BatteryTimeToFullCharge::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4139,14 +3971,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::ColorTempPhysicalMaxMireds::Id: {
-            using TypeInfo = Attributes::ColorTempPhysicalMaxMireds::TypeInfo;
+        case Attributes::BatteryFunctionalWhileCharging::Id: {
+            using TypeInfo = Attributes::BatteryFunctionalWhileCharging::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4154,14 +3986,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
+                                                                       value);
             return value;
         }
-        case Attributes::CoupleColorTempToLevelMinMireds::Id: {
-            using TypeInfo = Attributes::CoupleColorTempToLevelMinMireds::TypeInfo;
+        case Attributes::BatteryChargingCurrent::Id: {
+            using TypeInfo = Attributes::BatteryChargingCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4169,14 +4001,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::StartUpColorTemperatureMireds::Id: {
-            using TypeInfo = Attributes::StartUpColorTemperatureMireds::TypeInfo;
+        case Attributes::ActiveBatteryChargeFaults::Id: {
+            using TypeInfo = Attributes::ActiveBatteryChargeFaults::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4184,10 +4016,19 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Integer";
+                std::string newElement_0CtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -4298,12 +4139,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::ContentLauncher::Id: {
-        using namespace app::Clusters::ContentLauncher;
+    case app::Clusters::GeneralCommissioning::Id: {
+        using namespace app::Clusters::GeneralCommissioning;
         switch (aPath.mAttributeId)
         {
-        case Attributes::AcceptHeader::Id: {
-            using TypeInfo = Attributes::AcceptHeader::TypeInfo;
+        case Attributes::Breadcrumb::Id: {
+            using TypeInfo = Attributes::Breadcrumb::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4311,20 +4152,57 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::BasicCommissioningInfo::Id: {
+            using TypeInfo = Attributes::BasicCommissioningInfo::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            jobject value_failSafeExpiryLengthSeconds;
+            std::string value_failSafeExpiryLengthSecondsClassName     = "java/lang/Integer";
+            std::string value_failSafeExpiryLengthSecondsCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+                value_failSafeExpiryLengthSecondsClassName.c_str(), value_failSafeExpiryLengthSecondsCtorSignature.c_str(),
+                cppValue.failSafeExpiryLengthSeconds, value_failSafeExpiryLengthSeconds);
+            jobject value_maxCumulativeFailsafeSeconds;
+            std::string value_maxCumulativeFailsafeSecondsClassName     = "java/lang/Integer";
+            std::string value_maxCumulativeFailsafeSecondsCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+                value_maxCumulativeFailsafeSecondsClassName.c_str(), value_maxCumulativeFailsafeSecondsCtorSignature.c_str(),
+                cppValue.maxCumulativeFailsafeSeconds, value_maxCumulativeFailsafeSeconds);
 
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            jclass basicCommissioningInfoStructClass;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipStructs$GeneralCommissioningClusterBasicCommissioningInfo",
+                basicCommissioningInfoStructClass);
+            if (err != CHIP_NO_ERROR)
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                newElement_0 = env->NewStringUTF(std::string(entry_0.data(), entry_0.size()).c_str());
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                ChipLogError(Zcl, "Could not find class ChipStructs$GeneralCommissioningClusterBasicCommissioningInfo");
+                return nullptr;
+            }
+            jmethodID basicCommissioningInfoStructCtor =
+                env->GetMethodID(basicCommissioningInfoStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;)V");
+            if (basicCommissioningInfoStructCtor == nullptr)
+            {
+                ChipLogError(Zcl, "Could not find ChipStructs$GeneralCommissioningClusterBasicCommissioningInfo constructor");
+                return nullptr;
             }
+
+            value = env->NewObject(basicCommissioningInfoStructClass, basicCommissioningInfoStructCtor,
+                                   value_failSafeExpiryLengthSeconds, value_maxCumulativeFailsafeSeconds);
             return value;
         }
-        case Attributes::SupportedStreamingProtocols::Id: {
-            using TypeInfo = Attributes::SupportedStreamingProtocols::TypeInfo;
+        case Attributes::RegulatoryConfig::Id: {
+            using TypeInfo = Attributes::RegulatoryConfig::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4332,10 +4210,40 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          static_cast<uint8_t>(cppValue), value);
+            return value;
+        }
+        case Attributes::LocationCapability::Id: {
+            using TypeInfo = Attributes::LocationCapability::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          static_cast<uint8_t>(cppValue), value);
+            return value;
+        }
+        case Attributes::SupportsConcurrentConnection::Id: {
+            using TypeInfo = Attributes::SupportsConcurrentConnection::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
+                                                                       value);
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -4446,12 +4354,27 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::Descriptor::Id: {
-        using namespace app::Clusters::Descriptor;
+    case app::Clusters::NetworkCommissioning::Id: {
+        using namespace app::Clusters::NetworkCommissioning;
         switch (aPath.mAttributeId)
         {
-        case Attributes::DeviceList::Id: {
-            using TypeInfo = Attributes::DeviceList::TypeInfo;
+        case Attributes::MaxNetworks::Id: {
+            using TypeInfo = Attributes::MaxNetworks::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
+            return value;
+        }
+        case Attributes::Networks::Id: {
+            using TypeInfo = Attributes::Networks::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4466,42 +4389,41 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 auto & entry_0 = iter_value_0.GetValue();
                 jobject newElement_0;
-                jobject newElement_0_type;
-                std::string newElement_0_typeClassName     = "java/lang/Long";
-                std::string newElement_0_typeCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0_typeClassName.c_str(), newElement_0_typeCtorSignature.c_str(), entry_0.type, newElement_0_type);
-                jobject newElement_0_revision;
-                std::string newElement_0_revisionClassName     = "java/lang/Integer";
-                std::string newElement_0_revisionCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_revisionClassName.c_str(),
-                                                                               newElement_0_revisionCtorSignature.c_str(),
-                                                                               entry_0.revision, newElement_0_revision);
+                jobject newElement_0_networkID;
+                jbyteArray newElement_0_networkIDByteArray = env->NewByteArray(static_cast<jsize>(entry_0.networkID.size()));
+                env->SetByteArrayRegion(newElement_0_networkIDByteArray, 0, static_cast<jsize>(entry_0.networkID.size()),
+                                        reinterpret_cast<const jbyte *>(entry_0.networkID.data()));
+                newElement_0_networkID = newElement_0_networkIDByteArray;
+                jobject newElement_0_connected;
+                std::string newElement_0_connectedClassName     = "java/lang/Boolean";
+                std::string newElement_0_connectedCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_connectedClassName.c_str(),
+                                                                           newElement_0_connectedCtorSignature.c_str(),
+                                                                           entry_0.connected, newElement_0_connected);
 
-                jclass deviceTypeStructClass;
+                jclass networkInfoStructClass;
                 err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$DescriptorClusterDeviceType", deviceTypeStructClass);
+                    env, "chip/devicecontroller/ChipStructs$NetworkCommissioningClusterNetworkInfo", networkInfoStructClass);
                 if (err != CHIP_NO_ERROR)
                 {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$DescriptorClusterDeviceType");
+                    ChipLogError(Zcl, "Could not find class ChipStructs$NetworkCommissioningClusterNetworkInfo");
                     return nullptr;
                 }
-                jmethodID deviceTypeStructCtor =
-                    env->GetMethodID(deviceTypeStructClass, "<init>", "(Ljava/lang/Long;Ljava/lang/Integer;)V");
-                if (deviceTypeStructCtor == nullptr)
+                jmethodID networkInfoStructCtor = env->GetMethodID(networkInfoStructClass, "<init>", "([BLjava/lang/Boolean;)V");
+                if (networkInfoStructCtor == nullptr)
                 {
-                    ChipLogError(Zcl, "Could not find ChipStructs$DescriptorClusterDeviceType constructor");
+                    ChipLogError(Zcl, "Could not find ChipStructs$NetworkCommissioningClusterNetworkInfo constructor");
                     return nullptr;
                 }
 
                 newElement_0 =
-                    env->NewObject(deviceTypeStructClass, deviceTypeStructCtor, newElement_0_type, newElement_0_revision);
+                    env->NewObject(networkInfoStructClass, networkInfoStructCtor, newElement_0_networkID, newElement_0_connected);
                 chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::ServerList::Id: {
-            using TypeInfo = Attributes::ServerList::TypeInfo;
+        case Attributes::ScanMaxTimeSeconds::Id: {
+            using TypeInfo = Attributes::ScanMaxTimeSeconds::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4509,23 +4431,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::ClientList::Id: {
-            using TypeInfo = Attributes::ClientList::TypeInfo;
+        case Attributes::ConnectMaxTimeSeconds::Id: {
+            using TypeInfo = Attributes::ConnectMaxTimeSeconds::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4533,23 +4446,29 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
+            return value;
+        }
+        case Attributes::InterfaceEnabled::Id: {
+            using TypeInfo = Attributes::InterfaceEnabled::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
+                                                                       value);
             return value;
         }
-        case Attributes::PartsList::Id: {
-            using TypeInfo = Attributes::PartsList::TypeInfo;
+        case Attributes::LastNetworkingStatus::Id: {
+            using TypeInfo = Attributes::LastNetworkingStatus::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4557,23 +4476,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Integer";
-                std::string newElement_0CtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              static_cast<uint8_t>(cppValue.Value()), value);
             }
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::LastNetworkID::Id: {
+            using TypeInfo = Attributes::LastNetworkID::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4581,23 +4498,43 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = nullptr;
+            }
+            else
+            {
+                jbyteArray valueByteArray = env->NewByteArray(static_cast<jsize>(cppValue.Value().size()));
+                env->SetByteArrayRegion(valueByteArray, 0, static_cast<jsize>(cppValue.Value().size()),
+                                        reinterpret_cast<const jbyte *>(cppValue.Value().data()));
+                value = valueByteArray;
             }
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::LastConnectErrorValue::Id: {
+            using TypeInfo = Attributes::LastConnectErrorValue::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
+            return value;
+        }
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4620,8 +4557,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4792,12 +4729,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::DoorLock::Id: {
-        using namespace app::Clusters::DoorLock;
+    case app::Clusters::GeneralDiagnostics::Id: {
+        using namespace app::Clusters::GeneralDiagnostics;
         switch (aPath.mAttributeId)
         {
-        case Attributes::LockState::Id: {
-            using TypeInfo = Attributes::LockState::TypeInfo;
+        case Attributes::NetworkInterfaces::Id: {
+            using TypeInfo = Attributes::NetworkInterfaces::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4805,21 +4742,120 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              static_cast<uint8_t>(cppValue.Value()), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_name;
+                newElement_0_name = env->NewStringUTF(std::string(entry_0.name.data(), entry_0.name.size()).c_str());
+                jobject newElement_0_isOperational;
+                std::string newElement_0_isOperationalClassName     = "java/lang/Boolean";
+                std::string newElement_0_isOperationalCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_isOperationalClassName.c_str(),
+                                                                           newElement_0_isOperationalCtorSignature.c_str(),
+                                                                           entry_0.isOperational, newElement_0_isOperational);
+                jobject newElement_0_offPremiseServicesReachableIPv4;
+                if (entry_0.offPremiseServicesReachableIPv4.IsNull())
+                {
+                    newElement_0_offPremiseServicesReachableIPv4 = nullptr;
+                }
+                else
+                {
+                    std::string newElement_0_offPremiseServicesReachableIPv4ClassName     = "java/lang/Boolean";
+                    std::string newElement_0_offPremiseServicesReachableIPv4CtorSignature = "(Z)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
+                        newElement_0_offPremiseServicesReachableIPv4ClassName.c_str(),
+                        newElement_0_offPremiseServicesReachableIPv4CtorSignature.c_str(),
+                        entry_0.offPremiseServicesReachableIPv4.Value(), newElement_0_offPremiseServicesReachableIPv4);
+                }
+                jobject newElement_0_offPremiseServicesReachableIPv6;
+                if (entry_0.offPremiseServicesReachableIPv6.IsNull())
+                {
+                    newElement_0_offPremiseServicesReachableIPv6 = nullptr;
+                }
+                else
+                {
+                    std::string newElement_0_offPremiseServicesReachableIPv6ClassName     = "java/lang/Boolean";
+                    std::string newElement_0_offPremiseServicesReachableIPv6CtorSignature = "(Z)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
+                        newElement_0_offPremiseServicesReachableIPv6ClassName.c_str(),
+                        newElement_0_offPremiseServicesReachableIPv6CtorSignature.c_str(),
+                        entry_0.offPremiseServicesReachableIPv6.Value(), newElement_0_offPremiseServicesReachableIPv6);
+                }
+                jobject newElement_0_hardwareAddress;
+                jbyteArray newElement_0_hardwareAddressByteArray =
+                    env->NewByteArray(static_cast<jsize>(entry_0.hardwareAddress.size()));
+                env->SetByteArrayRegion(newElement_0_hardwareAddressByteArray, 0,
+                                        static_cast<jsize>(entry_0.hardwareAddress.size()),
+                                        reinterpret_cast<const jbyte *>(entry_0.hardwareAddress.data()));
+                newElement_0_hardwareAddress = newElement_0_hardwareAddressByteArray;
+                jobject newElement_0_IPv4Addresses;
+                chip::JniReferences::GetInstance().CreateArrayList(newElement_0_IPv4Addresses);
+
+                auto iter_newElement_0_IPv4Addresses_2 = entry_0.IPv4Addresses.begin();
+                while (iter_newElement_0_IPv4Addresses_2.Next())
+                {
+                    auto & entry_2 = iter_newElement_0_IPv4Addresses_2.GetValue();
+                    jobject newElement_2;
+                    jbyteArray newElement_2ByteArray = env->NewByteArray(static_cast<jsize>(entry_2.size()));
+                    env->SetByteArrayRegion(newElement_2ByteArray, 0, static_cast<jsize>(entry_2.size()),
+                                            reinterpret_cast<const jbyte *>(entry_2.data()));
+                    newElement_2 = newElement_2ByteArray;
+                    chip::JniReferences::GetInstance().AddToList(newElement_0_IPv4Addresses, newElement_2);
+                }
+                jobject newElement_0_IPv6Addresses;
+                chip::JniReferences::GetInstance().CreateArrayList(newElement_0_IPv6Addresses);
+
+                auto iter_newElement_0_IPv6Addresses_2 = entry_0.IPv6Addresses.begin();
+                while (iter_newElement_0_IPv6Addresses_2.Next())
+                {
+                    auto & entry_2 = iter_newElement_0_IPv6Addresses_2.GetValue();
+                    jobject newElement_2;
+                    jbyteArray newElement_2ByteArray = env->NewByteArray(static_cast<jsize>(entry_2.size()));
+                    env->SetByteArrayRegion(newElement_2ByteArray, 0, static_cast<jsize>(entry_2.size()),
+                                            reinterpret_cast<const jbyte *>(entry_2.data()));
+                    newElement_2 = newElement_2ByteArray;
+                    chip::JniReferences::GetInstance().AddToList(newElement_0_IPv6Addresses, newElement_2);
+                }
+                jobject newElement_0_type;
+                std::string newElement_0_typeClassName     = "java/lang/Integer";
+                std::string newElement_0_typeCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0_typeClassName.c_str(), newElement_0_typeCtorSignature.c_str(), static_cast<uint8_t>(entry_0.type),
+                    newElement_0_type);
+
+                jclass networkInterfaceTypeStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$GeneralDiagnosticsClusterNetworkInterfaceType",
+                    networkInterfaceTypeStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$GeneralDiagnosticsClusterNetworkInterfaceType");
+                    return nullptr;
+                }
+                jmethodID networkInterfaceTypeStructCtor =
+                    env->GetMethodID(networkInterfaceTypeStructClass, "<init>",
+                                     "(Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;[BLjava/util/"
+                                     "ArrayList;Ljava/util/ArrayList;Ljava/lang/Integer;)V");
+                if (networkInterfaceTypeStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$GeneralDiagnosticsClusterNetworkInterfaceType constructor");
+                    return nullptr;
+                }
+
+                newElement_0 = env->NewObject(networkInterfaceTypeStructClass, networkInterfaceTypeStructCtor, newElement_0_name,
+                                              newElement_0_isOperational, newElement_0_offPremiseServicesReachableIPv4,
+                                              newElement_0_offPremiseServicesReachableIPv6, newElement_0_hardwareAddress,
+                                              newElement_0_IPv4Addresses, newElement_0_IPv6Addresses, newElement_0_type);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::LockType::Id: {
-            using TypeInfo = Attributes::LockType::TypeInfo;
+        case Attributes::RebootCount::Id: {
+            using TypeInfo = Attributes::RebootCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4829,12 +4865,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          static_cast<uint8_t>(cppValue), value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::ActuatorEnabled::Id: {
-            using TypeInfo = Attributes::ActuatorEnabled::TypeInfo;
+        case Attributes::UpTime::Id: {
+            using TypeInfo = Attributes::UpTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4842,14 +4878,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
-                                                                       value);
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::DoorState::Id: {
-            using TypeInfo = Attributes::DoorState::TypeInfo;
+        case Attributes::TotalOperationalHours::Id: {
+            using TypeInfo = Attributes::TotalOperationalHours::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4857,21 +4893,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              static_cast<uint8_t>(cppValue.Value()), value);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::NumberOfTotalUsersSupported::Id: {
-            using TypeInfo = Attributes::NumberOfTotalUsersSupported::TypeInfo;
+        case Attributes::BootReasons::Id: {
+            using TypeInfo = Attributes::BootReasons::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4881,12 +4910,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::NumberOfPINUsersSupported::Id: {
-            using TypeInfo = Attributes::NumberOfPINUsersSupported::TypeInfo;
+        case Attributes::ActiveHardwareFaults::Id: {
+            using TypeInfo = Attributes::ActiveHardwareFaults::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4894,29 +4923,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        case Attributes::NumberOfRFIDUsersSupported::Id: {
-            using TypeInfo = Attributes::NumberOfRFIDUsersSupported::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                return nullptr;
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Integer";
+                std::string newElement_0CtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
             return value;
         }
-        case Attributes::NumberOfWeekDaySchedulesSupportedPerUser::Id: {
-            using TypeInfo = Attributes::NumberOfWeekDaySchedulesSupportedPerUser::TypeInfo;
+        case Attributes::ActiveRadioFaults::Id: {
+            using TypeInfo = Attributes::ActiveRadioFaults::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4924,29 +4947,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
-            return value;
-        }
-        case Attributes::NumberOfYearDaySchedulesSupportedPerUser::Id: {
-            using TypeInfo = Attributes::NumberOfYearDaySchedulesSupportedPerUser::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                return nullptr;
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Integer";
+                std::string newElement_0CtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
             return value;
         }
-        case Attributes::NumberOfHolidaySchedulesSupported::Id: {
-            using TypeInfo = Attributes::NumberOfHolidaySchedulesSupported::TypeInfo;
+        case Attributes::ActiveNetworkFaults::Id: {
+            using TypeInfo = Attributes::ActiveNetworkFaults::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4954,29 +4971,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
-            return value;
-        }
-        case Attributes::MaxPINCodeLength::Id: {
-            using TypeInfo = Attributes::MaxPINCodeLength::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                return nullptr;
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Integer";
+                std::string newElement_0CtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
             return value;
         }
-        case Attributes::MinPINCodeLength::Id: {
-            using TypeInfo = Attributes::MinPINCodeLength::TypeInfo;
+        case Attributes::TestEventTriggersEnabled::Id: {
+            using TypeInfo = Attributes::TestEventTriggersEnabled::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4984,14 +4995,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
+                                                                       value);
             return value;
         }
-        case Attributes::MaxRFIDCodeLength::Id: {
-            using TypeInfo = Attributes::MaxRFIDCodeLength::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -4999,29 +5010,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
-            return value;
-        }
-        case Attributes::MinRFIDCodeLength::Id: {
-            using TypeInfo = Attributes::MinRFIDCodeLength::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                return nullptr;
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
             return value;
         }
-        case Attributes::NumberOfCredentialsSupportedPerUser::Id: {
-            using TypeInfo = Attributes::NumberOfCredentialsSupportedPerUser::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5029,26 +5034,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
-            return value;
-        }
-        case Attributes::Language::Id: {
-            using TypeInfo = Attributes::Language::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                return nullptr;
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
-            jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
             return value;
         }
-        case Attributes::AutoRelockTime::Id: {
-            using TypeInfo = Attributes::AutoRelockTime::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5056,29 +5058,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        case Attributes::SoundVolume::Id: {
-            using TypeInfo = Attributes::SoundVolume::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                return nullptr;
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
             return value;
         }
-        case Attributes::OperatingMode::Id: {
-            using TypeInfo = Attributes::OperatingMode::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5086,14 +5082,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          static_cast<uint8_t>(cppValue), value);
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::SupportedOperatingModes::Id: {
-            using TypeInfo = Attributes::SupportedOperatingModes::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5104,26 +5100,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
             chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue.Raw(), value);
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::EnableOneTouchLocking::Id: {
-            using TypeInfo = Attributes::EnableOneTouchLocking::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
-                                                                       value);
-            return value;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
         }
-        case Attributes::EnablePrivacyModeButton::Id: {
-            using TypeInfo = Attributes::EnablePrivacyModeButton::TypeInfo;
+        break;
+    }
+    case app::Clusters::SoftwareDiagnostics::Id: {
+        using namespace app::Clusters::SoftwareDiagnostics;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::ThreadMetrics::Id: {
+            using TypeInfo = Attributes::ThreadMetrics::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5131,29 +5122,106 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
-                                                                       value);
-            return value;
-        }
-        case Attributes::WrongCodeEntryLimit::Id: {
-            using TypeInfo = Attributes::WrongCodeEntryLimit::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
-            return value;
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_id;
+                std::string newElement_0_idClassName     = "java/lang/Long";
+                std::string newElement_0_idCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(
+                    newElement_0_idClassName.c_str(), newElement_0_idCtorSignature.c_str(), entry_0.id, newElement_0_id);
+                jobject newElement_0_name;
+                if (!entry_0.name.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_name);
+                }
+                else
+                {
+                    jobject newElement_0_nameInsideOptional;
+                    newElement_0_nameInsideOptional =
+                        env->NewStringUTF(std::string(entry_0.name.Value().data(), entry_0.name.Value().size()).c_str());
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_nameInsideOptional, newElement_0_name);
+                }
+                jobject newElement_0_stackFreeCurrent;
+                if (!entry_0.stackFreeCurrent.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_stackFreeCurrent);
+                }
+                else
+                {
+                    jobject newElement_0_stackFreeCurrentInsideOptional;
+                    std::string newElement_0_stackFreeCurrentInsideOptionalClassName     = "java/lang/Long";
+                    std::string newElement_0_stackFreeCurrentInsideOptionalCtorSignature = "(J)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                        newElement_0_stackFreeCurrentInsideOptionalClassName.c_str(),
+                        newElement_0_stackFreeCurrentInsideOptionalCtorSignature.c_str(), entry_0.stackFreeCurrent.Value(),
+                        newElement_0_stackFreeCurrentInsideOptional);
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_stackFreeCurrentInsideOptional,
+                                                                      newElement_0_stackFreeCurrent);
+                }
+                jobject newElement_0_stackFreeMinimum;
+                if (!entry_0.stackFreeMinimum.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_stackFreeMinimum);
+                }
+                else
+                {
+                    jobject newElement_0_stackFreeMinimumInsideOptional;
+                    std::string newElement_0_stackFreeMinimumInsideOptionalClassName     = "java/lang/Long";
+                    std::string newElement_0_stackFreeMinimumInsideOptionalCtorSignature = "(J)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                        newElement_0_stackFreeMinimumInsideOptionalClassName.c_str(),
+                        newElement_0_stackFreeMinimumInsideOptionalCtorSignature.c_str(), entry_0.stackFreeMinimum.Value(),
+                        newElement_0_stackFreeMinimumInsideOptional);
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_stackFreeMinimumInsideOptional,
+                                                                      newElement_0_stackFreeMinimum);
+                }
+                jobject newElement_0_stackSize;
+                if (!entry_0.stackSize.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_stackSize);
+                }
+                else
+                {
+                    jobject newElement_0_stackSizeInsideOptional;
+                    std::string newElement_0_stackSizeInsideOptionalClassName     = "java/lang/Long";
+                    std::string newElement_0_stackSizeInsideOptionalCtorSignature = "(J)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                        newElement_0_stackSizeInsideOptionalClassName.c_str(),
+                        newElement_0_stackSizeInsideOptionalCtorSignature.c_str(), entry_0.stackSize.Value(),
+                        newElement_0_stackSizeInsideOptional);
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_stackSizeInsideOptional, newElement_0_stackSize);
+                }
+
+                jclass threadMetricsStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$SoftwareDiagnosticsClusterThreadMetrics", threadMetricsStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$SoftwareDiagnosticsClusterThreadMetrics");
+                    return nullptr;
+                }
+                jmethodID threadMetricsStructCtor = env->GetMethodID(
+                    threadMetricsStructClass, "<init>",
+                    "(Ljava/lang/Long;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V");
+                if (threadMetricsStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$SoftwareDiagnosticsClusterThreadMetrics constructor");
+                    return nullptr;
+                }
+
+                newElement_0 = env->NewObject(threadMetricsStructClass, threadMetricsStructCtor, newElement_0_id, newElement_0_name,
+                                              newElement_0_stackFreeCurrent, newElement_0_stackFreeMinimum, newElement_0_stackSize);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
         }
-        case Attributes::UserCodeTemporaryDisableTime::Id: {
-            using TypeInfo = Attributes::UserCodeTemporaryDisableTime::TypeInfo;
+        case Attributes::CurrentHeapFree::Id: {
+            using TypeInfo = Attributes::CurrentHeapFree::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5161,14 +5229,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::RequirePINforRemoteOperation::Id: {
-            using TypeInfo = Attributes::RequirePINforRemoteOperation::TypeInfo;
+        case Attributes::CurrentHeapUsed::Id: {
+            using TypeInfo = Attributes::CurrentHeapUsed::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5176,10 +5244,25 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
-                                                                       value);
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::CurrentHeapHighWatermark::Id: {
+            using TypeInfo = Attributes::CurrentHeapHighWatermark::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -5290,12 +5373,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::ElectricalMeasurement::Id: {
-        using namespace app::Clusters::ElectricalMeasurement;
+    case app::Clusters::ThreadNetworkDiagnostics::Id: {
+        using namespace app::Clusters::ThreadNetworkDiagnostics;
         switch (aPath.mAttributeId)
         {
-        case Attributes::MeasurementType::Id: {
-            using TypeInfo = Attributes::MeasurementType::TypeInfo;
+        case Attributes::Channel::Id: {
+            using TypeInfo = Attributes::Channel::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5303,14 +5386,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::TotalActivePower::Id: {
-            using TypeInfo = Attributes::TotalActivePower::TypeInfo;
+        case Attributes::RoutingRole::Id: {
+            using TypeInfo = Attributes::RoutingRole::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5318,14 +5408,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              static_cast<uint8_t>(cppValue.Value()), value);
+            }
             return value;
         }
-        case Attributes::RmsVoltage::Id: {
-            using TypeInfo = Attributes::RmsVoltage::TypeInfo;
+        case Attributes::NetworkName::Id: {
+            using TypeInfo = Attributes::NetworkName::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5333,14 +5430,18 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                value = env->NewStringUTF(std::string(cppValue.Value().data(), cppValue.Value().size()).c_str());
+            }
             return value;
         }
-        case Attributes::RmsVoltageMin::Id: {
-            using TypeInfo = Attributes::RmsVoltageMin::TypeInfo;
+        case Attributes::PanId::Id: {
+            using TypeInfo = Attributes::PanId::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5348,14 +5449,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::RmsVoltageMax::Id: {
-            using TypeInfo = Attributes::RmsVoltageMax::TypeInfo;
+        case Attributes::ExtendedPanId::Id: {
+            using TypeInfo = Attributes::ExtendedPanId::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5363,14 +5471,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::RmsCurrent::Id: {
-            using TypeInfo = Attributes::RmsCurrent::TypeInfo;
+        case Attributes::MeshLocalPrefix::Id: {
+            using TypeInfo = Attributes::MeshLocalPrefix::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5378,14 +5493,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                jbyteArray valueByteArray = env->NewByteArray(static_cast<jsize>(cppValue.Value().size()));
+                env->SetByteArrayRegion(valueByteArray, 0, static_cast<jsize>(cppValue.Value().size()),
+                                        reinterpret_cast<const jbyte *>(cppValue.Value().data()));
+                value = valueByteArray;
+            }
             return value;
         }
-        case Attributes::RmsCurrentMin::Id: {
-            using TypeInfo = Attributes::RmsCurrentMin::TypeInfo;
+        case Attributes::OverrunCount::Id: {
+            using TypeInfo = Attributes::OverrunCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5393,74 +5515,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::RmsCurrentMax::Id: {
-            using TypeInfo = Attributes::RmsCurrentMax::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        case Attributes::ActivePower::Id: {
-            using TypeInfo = Attributes::ActivePower::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
-            return value;
-        }
-        case Attributes::ActivePowerMin::Id: {
-            using TypeInfo = Attributes::ActivePowerMin::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
-            return value;
-        }
-        case Attributes::ActivePowerMax::Id: {
-            using TypeInfo = Attributes::ActivePowerMax::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
-            return value;
-        }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::NeighborTableList::Id: {
+            using TypeInfo = Attributes::NeighborTableList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5475,40 +5537,134 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 auto & entry_0 = iter_value_0.GetValue();
                 jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
+                jobject newElement_0_extAddress;
+                std::string newElement_0_extAddressClassName     = "java/lang/Long";
+                std::string newElement_0_extAddressCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_extAddressClassName.c_str(),
+                                                                               newElement_0_extAddressCtorSignature.c_str(),
+                                                                               entry_0.extAddress, newElement_0_extAddress);
+                jobject newElement_0_age;
+                std::string newElement_0_ageClassName     = "java/lang/Long";
+                std::string newElement_0_ageCtorSignature = "(J)V";
                 chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
+                    newElement_0_ageClassName.c_str(), newElement_0_ageCtorSignature.c_str(), entry_0.age, newElement_0_age);
+                jobject newElement_0_rloc16;
+                std::string newElement_0_rloc16ClassName     = "java/lang/Integer";
+                std::string newElement_0_rloc16CtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_rloc16ClassName.c_str(),
+                                                                               newElement_0_rloc16CtorSignature.c_str(),
+                                                                               entry_0.rloc16, newElement_0_rloc16);
+                jobject newElement_0_linkFrameCounter;
+                std::string newElement_0_linkFrameCounterClassName     = "java/lang/Long";
+                std::string newElement_0_linkFrameCounterCtorSignature = "(J)V";
                 chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                    newElement_0_linkFrameCounterClassName.c_str(), newElement_0_linkFrameCounterCtorSignature.c_str(),
+                    entry_0.linkFrameCounter, newElement_0_linkFrameCounter);
+                jobject newElement_0_mleFrameCounter;
+                std::string newElement_0_mleFrameCounterClassName     = "java/lang/Long";
+                std::string newElement_0_mleFrameCounterCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0_mleFrameCounterClassName.c_str(), newElement_0_mleFrameCounterCtorSignature.c_str(),
+                    entry_0.mleFrameCounter, newElement_0_mleFrameCounter);
+                jobject newElement_0_lqi;
+                std::string newElement_0_lqiClassName     = "java/lang/Integer";
+                std::string newElement_0_lqiCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0_lqiClassName.c_str(), newElement_0_lqiCtorSignature.c_str(), entry_0.lqi, newElement_0_lqi);
+                jobject newElement_0_averageRssi;
+                if (entry_0.averageRssi.IsNull())
+                {
+                    newElement_0_averageRssi = nullptr;
+                }
+                else
+                {
+                    std::string newElement_0_averageRssiClassName     = "java/lang/Integer";
+                    std::string newElement_0_averageRssiCtorSignature = "(I)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(
+                        newElement_0_averageRssiClassName.c_str(), newElement_0_averageRssiCtorSignature.c_str(),
+                        entry_0.averageRssi.Value(), newElement_0_averageRssi);
+                }
+                jobject newElement_0_lastRssi;
+                if (entry_0.lastRssi.IsNull())
+                {
+                    newElement_0_lastRssi = nullptr;
+                }
+                else
+                {
+                    std::string newElement_0_lastRssiClassName     = "java/lang/Integer";
+                    std::string newElement_0_lastRssiCtorSignature = "(I)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(newElement_0_lastRssiClassName.c_str(),
+                                                                                 newElement_0_lastRssiCtorSignature.c_str(),
+                                                                                 entry_0.lastRssi.Value(), newElement_0_lastRssi);
+                }
+                jobject newElement_0_frameErrorRate;
+                std::string newElement_0_frameErrorRateClassName     = "java/lang/Integer";
+                std::string newElement_0_frameErrorRateCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_frameErrorRateClassName.c_str(),
+                                                                              newElement_0_frameErrorRateCtorSignature.c_str(),
+                                                                              entry_0.frameErrorRate, newElement_0_frameErrorRate);
+                jobject newElement_0_messageErrorRate;
+                std::string newElement_0_messageErrorRateClassName     = "java/lang/Integer";
+                std::string newElement_0_messageErrorRateCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0_messageErrorRateClassName.c_str(), newElement_0_messageErrorRateCtorSignature.c_str(),
+                    entry_0.messageErrorRate, newElement_0_messageErrorRate);
+                jobject newElement_0_rxOnWhenIdle;
+                std::string newElement_0_rxOnWhenIdleClassName     = "java/lang/Boolean";
+                std::string newElement_0_rxOnWhenIdleCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_rxOnWhenIdleClassName.c_str(),
+                                                                           newElement_0_rxOnWhenIdleCtorSignature.c_str(),
+                                                                           entry_0.rxOnWhenIdle, newElement_0_rxOnWhenIdle);
+                jobject newElement_0_fullThreadDevice;
+                std::string newElement_0_fullThreadDeviceClassName     = "java/lang/Boolean";
+                std::string newElement_0_fullThreadDeviceCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_fullThreadDeviceClassName.c_str(),
+                                                                           newElement_0_fullThreadDeviceCtorSignature.c_str(),
+                                                                           entry_0.fullThreadDevice, newElement_0_fullThreadDevice);
+                jobject newElement_0_fullNetworkData;
+                std::string newElement_0_fullNetworkDataClassName     = "java/lang/Boolean";
+                std::string newElement_0_fullNetworkDataCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_fullNetworkDataClassName.c_str(),
+                                                                           newElement_0_fullNetworkDataCtorSignature.c_str(),
+                                                                           entry_0.fullNetworkData, newElement_0_fullNetworkData);
+                jobject newElement_0_isChild;
+                std::string newElement_0_isChildClassName     = "java/lang/Boolean";
+                std::string newElement_0_isChildCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_isChildClassName.c_str(),
+                                                                           newElement_0_isChildCtorSignature.c_str(),
+                                                                           entry_0.isChild, newElement_0_isChild);
+
+                jclass neighborTableStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterNeighborTable",
+                    neighborTableStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterNeighborTable");
+                    return nullptr;
+                }
+                jmethodID neighborTableStructCtor =
+                    env->GetMethodID(neighborTableStructClass, "<init>",
+                                     "(Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Long;Ljava/"
+                                     "lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/"
+                                     "Integer;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V");
+                if (neighborTableStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterNeighborTable constructor");
+                    return nullptr;
+                }
+
+                newElement_0 = env->NewObject(
+                    neighborTableStructClass, neighborTableStructCtor, newElement_0_extAddress, newElement_0_age,
+                    newElement_0_rloc16, newElement_0_linkFrameCounter, newElement_0_mleFrameCounter, newElement_0_lqi,
+                    newElement_0_averageRssi, newElement_0_lastRssi, newElement_0_frameErrorRate, newElement_0_messageErrorRate,
+                    newElement_0_rxOnWhenIdle, newElement_0_fullThreadDevice, newElement_0_fullNetworkData, newElement_0_isChild);
                 chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::RouteTableList::Id: {
+            using TypeInfo = Attributes::RouteTableList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5523,56 +5679,116 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 auto & entry_0 = iter_value_0.GetValue();
                 jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::EthernetNetworkDiagnostics::Id: {
-        using namespace app::Clusters::EthernetNetworkDiagnostics;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::PHYRate::Id: {
-            using TypeInfo = Attributes::PHYRate::TypeInfo;
+                jobject newElement_0_extAddress;
+                std::string newElement_0_extAddressClassName     = "java/lang/Long";
+                std::string newElement_0_extAddressCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_extAddressClassName.c_str(),
+                                                                               newElement_0_extAddressCtorSignature.c_str(),
+                                                                               entry_0.extAddress, newElement_0_extAddress);
+                jobject newElement_0_rloc16;
+                std::string newElement_0_rloc16ClassName     = "java/lang/Integer";
+                std::string newElement_0_rloc16CtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_rloc16ClassName.c_str(),
+                                                                               newElement_0_rloc16CtorSignature.c_str(),
+                                                                               entry_0.rloc16, newElement_0_rloc16);
+                jobject newElement_0_routerId;
+                std::string newElement_0_routerIdClassName     = "java/lang/Integer";
+                std::string newElement_0_routerIdCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_routerIdClassName.c_str(),
+                                                                              newElement_0_routerIdCtorSignature.c_str(),
+                                                                              entry_0.routerId, newElement_0_routerId);
+                jobject newElement_0_nextHop;
+                std::string newElement_0_nextHopClassName     = "java/lang/Integer";
+                std::string newElement_0_nextHopCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_nextHopClassName.c_str(),
+                                                                              newElement_0_nextHopCtorSignature.c_str(),
+                                                                              entry_0.nextHop, newElement_0_nextHop);
+                jobject newElement_0_pathCost;
+                std::string newElement_0_pathCostClassName     = "java/lang/Integer";
+                std::string newElement_0_pathCostCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_pathCostClassName.c_str(),
+                                                                              newElement_0_pathCostCtorSignature.c_str(),
+                                                                              entry_0.pathCost, newElement_0_pathCost);
+                jobject newElement_0_LQIIn;
+                std::string newElement_0_LQIInClassName     = "java/lang/Integer";
+                std::string newElement_0_LQIInCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_LQIInClassName.c_str(),
+                                                                              newElement_0_LQIInCtorSignature.c_str(),
+                                                                              entry_0.LQIIn, newElement_0_LQIIn);
+                jobject newElement_0_LQIOut;
+                std::string newElement_0_LQIOutClassName     = "java/lang/Integer";
+                std::string newElement_0_LQIOutCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_LQIOutClassName.c_str(),
+                                                                              newElement_0_LQIOutCtorSignature.c_str(),
+                                                                              entry_0.LQIOut, newElement_0_LQIOut);
+                jobject newElement_0_age;
+                std::string newElement_0_ageClassName     = "java/lang/Integer";
+                std::string newElement_0_ageCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0_ageClassName.c_str(), newElement_0_ageCtorSignature.c_str(), entry_0.age, newElement_0_age);
+                jobject newElement_0_allocated;
+                std::string newElement_0_allocatedClassName     = "java/lang/Boolean";
+                std::string newElement_0_allocatedCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_allocatedClassName.c_str(),
+                                                                           newElement_0_allocatedCtorSignature.c_str(),
+                                                                           entry_0.allocated, newElement_0_allocated);
+                jobject newElement_0_linkEstablished;
+                std::string newElement_0_linkEstablishedClassName     = "java/lang/Boolean";
+                std::string newElement_0_linkEstablishedCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_linkEstablishedClassName.c_str(),
+                                                                           newElement_0_linkEstablishedCtorSignature.c_str(),
+                                                                           entry_0.linkEstablished, newElement_0_linkEstablished);
+
+                jclass routeTableStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterRouteTable", routeTableStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterRouteTable");
+                    return nullptr;
+                }
+                jmethodID routeTableStructCtor = env->GetMethodID(
+                    routeTableStructClass, "<init>",
+                    "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/"
+                    "Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Boolean;)V");
+                if (routeTableStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterRouteTable constructor");
+                    return nullptr;
+                }
+
+                newElement_0 =
+                    env->NewObject(routeTableStructClass, routeTableStructCtor, newElement_0_extAddress, newElement_0_rloc16,
+                                   newElement_0_routerId, newElement_0_nextHop, newElement_0_pathCost, newElement_0_LQIIn,
+                                   newElement_0_LQIOut, newElement_0_age, newElement_0_allocated, newElement_0_linkEstablished);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::PartitionId::Id: {
+            using TypeInfo = Attributes::PartitionId::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
+            return value;
+        }
+        case Attributes::Weighting::Id: {
+            using TypeInfo = Attributes::Weighting::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5589,12 +5805,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 std::string valueClassName     = "java/lang/Integer";
                 std::string valueCtorSignature = "(I)V";
                 chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              static_cast<uint8_t>(cppValue.Value()), value);
+                                                                              cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::FullDuplex::Id: {
-            using TypeInfo = Attributes::FullDuplex::TypeInfo;
+        case Attributes::DataVersion::Id: {
+            using TypeInfo = Attributes::DataVersion::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5608,15 +5824,15 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             else
             {
-                std::string valueClassName     = "java/lang/Boolean";
-                std::string valueCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue.Value(), value);
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::PacketRxCount::Id: {
-            using TypeInfo = Attributes::PacketRxCount::TypeInfo;
+        case Attributes::StableDataVersion::Id: {
+            using TypeInfo = Attributes::StableDataVersion::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5624,14 +5840,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::PacketTxCount::Id: {
-            using TypeInfo = Attributes::PacketTxCount::TypeInfo;
+        case Attributes::LeaderRouterId::Id: {
+            using TypeInfo = Attributes::LeaderRouterId::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5639,14 +5862,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::TxErrCount::Id: {
-            using TypeInfo = Attributes::TxErrCount::TypeInfo;
+        case Attributes::DetachedRoleCount::Id: {
+            using TypeInfo = Attributes::DetachedRoleCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5654,14 +5884,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::CollisionCount::Id: {
-            using TypeInfo = Attributes::CollisionCount::TypeInfo;
+        case Attributes::ChildRoleCount::Id: {
+            using TypeInfo = Attributes::ChildRoleCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5669,14 +5899,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::OverrunCount::Id: {
-            using TypeInfo = Attributes::OverrunCount::TypeInfo;
+        case Attributes::RouterRoleCount::Id: {
+            using TypeInfo = Attributes::RouterRoleCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5684,14 +5914,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::CarrierDetect::Id: {
-            using TypeInfo = Attributes::CarrierDetect::TypeInfo;
+        case Attributes::LeaderRoleCount::Id: {
+            using TypeInfo = Attributes::LeaderRoleCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5699,21 +5929,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Boolean";
-                std::string valueCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::TimeSinceReset::Id: {
-            using TypeInfo = Attributes::TimeSinceReset::TypeInfo;
+        case Attributes::AttachAttemptCount::Id: {
+            using TypeInfo = Attributes::AttachAttemptCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5721,14 +5944,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::PartitionIdChangeCount::Id: {
+            using TypeInfo = Attributes::PartitionIdChangeCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5736,23 +5959,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::BetterPartitionAttachAttemptCount::Id: {
+            using TypeInfo = Attributes::BetterPartitionAttachAttemptCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5760,23 +5974,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::ParentChangeCount::Id: {
+            using TypeInfo = Attributes::ParentChangeCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5784,23 +5989,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::TxTotalCount::Id: {
+            using TypeInfo = Attributes::TxTotalCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5814,8 +6010,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::TxUnicastCount::Id: {
+            using TypeInfo = Attributes::TxUnicastCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5823,24 +6019,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::FanControl::Id: {
-        using namespace app::Clusters::FanControl;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::FanMode::Id: {
-            using TypeInfo = Attributes::FanMode::TypeInfo;
+        case Attributes::TxBroadcastCount::Id: {
+            using TypeInfo = Attributes::TxBroadcastCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5848,14 +6034,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          static_cast<uint8_t>(cppValue), value);
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::FanModeSequence::Id: {
-            using TypeInfo = Attributes::FanModeSequence::TypeInfo;
+        case Attributes::TxAckRequestedCount::Id: {
+            using TypeInfo = Attributes::TxAckRequestedCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5863,14 +6049,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          static_cast<uint8_t>(cppValue), value);
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::PercentSetting::Id: {
-            using TypeInfo = Attributes::PercentSetting::TypeInfo;
+        case Attributes::TxAckedCount::Id: {
+            using TypeInfo = Attributes::TxAckedCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5878,21 +6064,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::PercentCurrent::Id: {
-            using TypeInfo = Attributes::PercentCurrent::TypeInfo;
+        case Attributes::TxNoAckRequestedCount::Id: {
+            using TypeInfo = Attributes::TxNoAckRequestedCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5900,14 +6079,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::SpeedMax::Id: {
-            using TypeInfo = Attributes::SpeedMax::TypeInfo;
+        case Attributes::TxDataCount::Id: {
+            using TypeInfo = Attributes::TxDataCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5915,14 +6094,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::SpeedSetting::Id: {
-            using TypeInfo = Attributes::SpeedSetting::TypeInfo;
+        case Attributes::TxDataPollCount::Id: {
+            using TypeInfo = Attributes::TxDataPollCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5930,21 +6109,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::SpeedCurrent::Id: {
-            using TypeInfo = Attributes::SpeedCurrent::TypeInfo;
+        case Attributes::TxBeaconCount::Id: {
+            using TypeInfo = Attributes::TxBeaconCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5952,14 +6124,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::RockSupport::Id: {
-            using TypeInfo = Attributes::RockSupport::TypeInfo;
+        case Attributes::TxBeaconRequestCount::Id: {
+            using TypeInfo = Attributes::TxBeaconRequestCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5967,14 +6139,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::RockSetting::Id: {
-            using TypeInfo = Attributes::RockSetting::TypeInfo;
+        case Attributes::TxOtherCount::Id: {
+            using TypeInfo = Attributes::TxOtherCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5982,14 +6154,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::WindSupport::Id: {
-            using TypeInfo = Attributes::WindSupport::TypeInfo;
+        case Attributes::TxRetryCount::Id: {
+            using TypeInfo = Attributes::TxRetryCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -5997,14 +6169,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::WindSetting::Id: {
-            using TypeInfo = Attributes::WindSetting::TypeInfo;
+        case Attributes::TxDirectMaxRetryExpiryCount::Id: {
+            using TypeInfo = Attributes::TxDirectMaxRetryExpiryCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6012,14 +6184,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::TxIndirectMaxRetryExpiryCount::Id: {
+            using TypeInfo = Attributes::TxIndirectMaxRetryExpiryCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6027,23 +6199,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::TxErrCcaCount::Id: {
+            using TypeInfo = Attributes::TxErrCcaCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6051,23 +6214,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::TxErrAbortCount::Id: {
+            using TypeInfo = Attributes::TxErrAbortCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6075,23 +6229,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::TxErrBusyChannelCount::Id: {
+            using TypeInfo = Attributes::TxErrBusyChannelCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6105,8 +6250,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::RxTotalCount::Id: {
+            using TypeInfo = Attributes::RxTotalCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6114,24 +6259,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::FixedLabel::Id: {
-        using namespace app::Clusters::FixedLabel;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::LabelList::Id: {
-            using TypeInfo = Attributes::LabelList::TypeInfo;
+        case Attributes::RxUnicastCount::Id: {
+            using TypeInfo = Attributes::RxUnicastCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6139,42 +6274,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                jobject newElement_0_label;
-                newElement_0_label = env->NewStringUTF(std::string(entry_0.label.data(), entry_0.label.size()).c_str());
-                jobject newElement_0_value;
-                newElement_0_value = env->NewStringUTF(std::string(entry_0.value.data(), entry_0.value.size()).c_str());
-
-                jclass labelStructStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$FixedLabelClusterLabelStruct", labelStructStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$FixedLabelClusterLabelStruct");
-                    return nullptr;
-                }
-                jmethodID labelStructStructCtor =
-                    env->GetMethodID(labelStructStructClass, "<init>", "(Ljava/lang/String;Ljava/lang/String;)V");
-                if (labelStructStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$FixedLabelClusterLabelStruct constructor");
-                    return nullptr;
-                }
-
-                newElement_0 =
-                    env->NewObject(labelStructStructClass, labelStructStructCtor, newElement_0_label, newElement_0_value);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::RxBroadcastCount::Id: {
+            using TypeInfo = Attributes::RxBroadcastCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6182,23 +6289,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::RxDataCount::Id: {
+            using TypeInfo = Attributes::RxDataCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6206,23 +6304,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::RxDataPollCount::Id: {
+            using TypeInfo = Attributes::RxDataPollCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6230,23 +6319,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::RxBeaconCount::Id: {
+            using TypeInfo = Attributes::RxBeaconCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6260,8 +6340,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::RxBeaconRequestCount::Id: {
+            using TypeInfo = Attributes::RxBeaconRequestCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6269,24 +6349,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::FlowMeasurement::Id: {
-        using namespace app::Clusters::FlowMeasurement;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::MeasuredValue::Id: {
-            using TypeInfo = Attributes::MeasuredValue::TypeInfo;
+        case Attributes::RxOtherCount::Id: {
+            using TypeInfo = Attributes::RxOtherCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6294,21 +6364,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::MinMeasuredValue::Id: {
-            using TypeInfo = Attributes::MinMeasuredValue::TypeInfo;
+        case Attributes::RxAddressFilteredCount::Id: {
+            using TypeInfo = Attributes::RxAddressFilteredCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6316,21 +6379,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::MaxMeasuredValue::Id: {
-            using TypeInfo = Attributes::MaxMeasuredValue::TypeInfo;
+        case Attributes::RxDestAddrFilteredCount::Id: {
+            using TypeInfo = Attributes::RxDestAddrFilteredCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6338,21 +6394,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::Tolerance::Id: {
-            using TypeInfo = Attributes::Tolerance::TypeInfo;
+        case Attributes::RxDuplicatedCount::Id: {
+            using TypeInfo = Attributes::RxDuplicatedCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6360,14 +6409,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::RxErrNoFrameCount::Id: {
+            using TypeInfo = Attributes::RxErrNoFrameCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6375,23 +6424,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::RxErrUnknownNeighborCount::Id: {
+            using TypeInfo = Attributes::RxErrUnknownNeighborCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6399,23 +6439,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::RxErrInvalidSrcAddrCount::Id: {
+            using TypeInfo = Attributes::RxErrInvalidSrcAddrCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6423,23 +6454,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::RxErrSecCount::Id: {
+            using TypeInfo = Attributes::RxErrSecCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6453,8 +6475,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::RxErrFcsCount::Id: {
+            using TypeInfo = Attributes::RxErrFcsCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6462,24 +6484,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::GeneralCommissioning::Id: {
-        using namespace app::Clusters::GeneralCommissioning;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::Breadcrumb::Id: {
-            using TypeInfo = Attributes::Breadcrumb::TypeInfo;
+        case Attributes::RxErrOtherCount::Id: {
+            using TypeInfo = Attributes::RxErrOtherCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6489,12 +6501,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Long";
             std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::BasicCommissioningInfo::Id: {
-            using TypeInfo = Attributes::BasicCommissioningInfo::TypeInfo;
+        case Attributes::ActiveTimestamp::Id: {
+            using TypeInfo = Attributes::ActiveTimestamp::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6502,42 +6514,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            jobject value_failSafeExpiryLengthSeconds;
-            std::string value_failSafeExpiryLengthSecondsClassName     = "java/lang/Integer";
-            std::string value_failSafeExpiryLengthSecondsCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-                value_failSafeExpiryLengthSecondsClassName.c_str(), value_failSafeExpiryLengthSecondsCtorSignature.c_str(),
-                cppValue.failSafeExpiryLengthSeconds, value_failSafeExpiryLengthSeconds);
-            jobject value_maxCumulativeFailsafeSeconds;
-            std::string value_maxCumulativeFailsafeSecondsClassName     = "java/lang/Integer";
-            std::string value_maxCumulativeFailsafeSecondsCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-                value_maxCumulativeFailsafeSecondsClassName.c_str(), value_maxCumulativeFailsafeSecondsCtorSignature.c_str(),
-                cppValue.maxCumulativeFailsafeSeconds, value_maxCumulativeFailsafeSeconds);
-
-            jclass basicCommissioningInfoStructClass;
-            err = chip::JniReferences::GetInstance().GetClassRef(
-                env, "chip/devicecontroller/ChipStructs$GeneralCommissioningClusterBasicCommissioningInfo",
-                basicCommissioningInfoStructClass);
-            if (err != CHIP_NO_ERROR)
+            if (cppValue.IsNull())
             {
-                ChipLogError(Zcl, "Could not find class ChipStructs$GeneralCommissioningClusterBasicCommissioningInfo");
-                return nullptr;
+                value = nullptr;
             }
-            jmethodID basicCommissioningInfoStructCtor =
-                env->GetMethodID(basicCommissioningInfoStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;)V");
-            if (basicCommissioningInfoStructCtor == nullptr)
+            else
             {
-                ChipLogError(Zcl, "Could not find ChipStructs$GeneralCommissioningClusterBasicCommissioningInfo constructor");
-                return nullptr;
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
             }
-
-            value = env->NewObject(basicCommissioningInfoStructClass, basicCommissioningInfoStructCtor,
-                                   value_failSafeExpiryLengthSeconds, value_maxCumulativeFailsafeSeconds);
             return value;
         }
-        case Attributes::RegulatoryConfig::Id: {
-            using TypeInfo = Attributes::RegulatoryConfig::TypeInfo;
+        case Attributes::PendingTimestamp::Id: {
+            using TypeInfo = Attributes::PendingTimestamp::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6545,44 +6536,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          static_cast<uint8_t>(cppValue), value);
-            return value;
-        }
-        case Attributes::LocationCapability::Id: {
-            using TypeInfo = Attributes::LocationCapability::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            if (cppValue.IsNull())
             {
-                return nullptr;
+                value = nullptr;
             }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          static_cast<uint8_t>(cppValue), value);
-            return value;
-        }
-        case Attributes::SupportsConcurrentConnection::Id: {
-            using TypeInfo = Attributes::SupportsConcurrentConnection::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            else
             {
-                return nullptr;
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
             }
-            jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
-                                                                       value);
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::Delay::Id: {
+            using TypeInfo = Attributes::Delay::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6590,23 +6558,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::SecurityPolicy::Id: {
+            using TypeInfo = Attributes::SecurityPolicy::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6614,23 +6580,47 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = nullptr;
+            }
+            else
+            {
+                jobject value_rotationTime;
+                std::string value_rotationTimeClassName     = "java/lang/Integer";
+                std::string value_rotationTimeCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(value_rotationTimeClassName.c_str(),
+                                                                               value_rotationTimeCtorSignature.c_str(),
+                                                                               cppValue.Value().rotationTime, value_rotationTime);
+                jobject value_flags;
+                std::string value_flagsClassName     = "java/lang/Integer";
+                std::string value_flagsCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+                    value_flagsClassName.c_str(), value_flagsCtorSignature.c_str(), cppValue.Value().flags, value_flags);
+
+                jclass securityPolicyStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterSecurityPolicy",
+                    securityPolicyStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterSecurityPolicy");
+                    return nullptr;
+                }
+                jmethodID securityPolicyStructCtor =
+                    env->GetMethodID(securityPolicyStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;)V");
+                if (securityPolicyStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterSecurityPolicy constructor");
+                    return nullptr;
+                }
+
+                value = env->NewObject(securityPolicyStructClass, securityPolicyStructCtor, value_rotationTime, value_flags);
             }
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::ChannelMask::Id: {
+            using TypeInfo = Attributes::ChannelMask::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6638,23 +6628,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = nullptr;
+            }
+            else
+            {
+                jbyteArray valueByteArray = env->NewByteArray(static_cast<jsize>(cppValue.Value().size()));
+                env->SetByteArrayRegion(valueByteArray, 0, static_cast<jsize>(cppValue.Value().size()),
+                                        reinterpret_cast<const jbyte *>(cppValue.Value().data()));
+                value = valueByteArray;
             }
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::OperationalDatasetComponents::Id: {
+            using TypeInfo = Attributes::OperationalDatasetComponents::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6662,14 +6650,117 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                jobject value_activeTimestampPresent;
+                std::string value_activeTimestampPresentClassName     = "java/lang/Boolean";
+                std::string value_activeTimestampPresentCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
+                    value_activeTimestampPresentClassName.c_str(), value_activeTimestampPresentCtorSignature.c_str(),
+                    cppValue.Value().activeTimestampPresent, value_activeTimestampPresent);
+                jobject value_pendingTimestampPresent;
+                std::string value_pendingTimestampPresentClassName     = "java/lang/Boolean";
+                std::string value_pendingTimestampPresentCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
+                    value_pendingTimestampPresentClassName.c_str(), value_pendingTimestampPresentCtorSignature.c_str(),
+                    cppValue.Value().pendingTimestampPresent, value_pendingTimestampPresent);
+                jobject value_masterKeyPresent;
+                std::string value_masterKeyPresentClassName     = "java/lang/Boolean";
+                std::string value_masterKeyPresentCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
+                    value_masterKeyPresentClassName.c_str(), value_masterKeyPresentCtorSignature.c_str(),
+                    cppValue.Value().masterKeyPresent, value_masterKeyPresent);
+                jobject value_networkNamePresent;
+                std::string value_networkNamePresentClassName     = "java/lang/Boolean";
+                std::string value_networkNamePresentCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
+                    value_networkNamePresentClassName.c_str(), value_networkNamePresentCtorSignature.c_str(),
+                    cppValue.Value().networkNamePresent, value_networkNamePresent);
+                jobject value_extendedPanIdPresent;
+                std::string value_extendedPanIdPresentClassName     = "java/lang/Boolean";
+                std::string value_extendedPanIdPresentCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
+                    value_extendedPanIdPresentClassName.c_str(), value_extendedPanIdPresentCtorSignature.c_str(),
+                    cppValue.Value().extendedPanIdPresent, value_extendedPanIdPresent);
+                jobject value_meshLocalPrefixPresent;
+                std::string value_meshLocalPrefixPresentClassName     = "java/lang/Boolean";
+                std::string value_meshLocalPrefixPresentCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
+                    value_meshLocalPrefixPresentClassName.c_str(), value_meshLocalPrefixPresentCtorSignature.c_str(),
+                    cppValue.Value().meshLocalPrefixPresent, value_meshLocalPrefixPresent);
+                jobject value_delayPresent;
+                std::string value_delayPresentClassName     = "java/lang/Boolean";
+                std::string value_delayPresentCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(value_delayPresentClassName.c_str(),
+                                                                           value_delayPresentCtorSignature.c_str(),
+                                                                           cppValue.Value().delayPresent, value_delayPresent);
+                jobject value_panIdPresent;
+                std::string value_panIdPresentClassName     = "java/lang/Boolean";
+                std::string value_panIdPresentCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(value_panIdPresentClassName.c_str(),
+                                                                           value_panIdPresentCtorSignature.c_str(),
+                                                                           cppValue.Value().panIdPresent, value_panIdPresent);
+                jobject value_channelPresent;
+                std::string value_channelPresentClassName     = "java/lang/Boolean";
+                std::string value_channelPresentCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(value_channelPresentClassName.c_str(),
+                                                                           value_channelPresentCtorSignature.c_str(),
+                                                                           cppValue.Value().channelPresent, value_channelPresent);
+                jobject value_pskcPresent;
+                std::string value_pskcPresentClassName     = "java/lang/Boolean";
+                std::string value_pskcPresentCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(value_pskcPresentClassName.c_str(),
+                                                                           value_pskcPresentCtorSignature.c_str(),
+                                                                           cppValue.Value().pskcPresent, value_pskcPresent);
+                jobject value_securityPolicyPresent;
+                std::string value_securityPolicyPresentClassName     = "java/lang/Boolean";
+                std::string value_securityPolicyPresentCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
+                    value_securityPolicyPresentClassName.c_str(), value_securityPolicyPresentCtorSignature.c_str(),
+                    cppValue.Value().securityPolicyPresent, value_securityPolicyPresent);
+                jobject value_channelMaskPresent;
+                std::string value_channelMaskPresentClassName     = "java/lang/Boolean";
+                std::string value_channelMaskPresentCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
+                    value_channelMaskPresentClassName.c_str(), value_channelMaskPresentCtorSignature.c_str(),
+                    cppValue.Value().channelMaskPresent, value_channelMaskPresent);
+
+                jclass operationalDatasetComponentsStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterOperationalDatasetComponents",
+                    operationalDatasetComponentsStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl,
+                                 "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterOperationalDatasetComponents");
+                    return nullptr;
+                }
+                jmethodID operationalDatasetComponentsStructCtor =
+                    env->GetMethodID(operationalDatasetComponentsStructClass, "<init>",
+                                     "(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/"
+                                     "Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/"
+                                     "lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V");
+                if (operationalDatasetComponentsStructCtor == nullptr)
+                {
+                    ChipLogError(
+                        Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterOperationalDatasetComponents constructor");
+                    return nullptr;
+                }
+
+                value = env->NewObject(operationalDatasetComponentsStructClass, operationalDatasetComponentsStructCtor,
+                                       value_activeTimestampPresent, value_pendingTimestampPresent, value_masterKeyPresent,
+                                       value_networkNamePresent, value_extendedPanIdPresent, value_meshLocalPrefixPresent,
+                                       value_delayPresent, value_panIdPresent, value_channelPresent, value_pskcPresent,
+                                       value_securityPolicyPresent, value_channelMaskPresent);
+            }
+            return value;
+        }
+        case Attributes::ActiveNetworkFaultsList::Id: {
+            using TypeInfo = Attributes::ActiveNetworkFaultsList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6677,24 +6768,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Integer";
+                std::string newElement_0CtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), static_cast<uint8_t>(entry_0), newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::GeneralDiagnostics::Id: {
-        using namespace app::Clusters::GeneralDiagnostics;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::NetworkInterfaces::Id: {
-            using TypeInfo = Attributes::NetworkInterfaces::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6709,113 +6799,16 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 auto & entry_0 = iter_value_0.GetValue();
                 jobject newElement_0;
-                jobject newElement_0_name;
-                newElement_0_name = env->NewStringUTF(std::string(entry_0.name.data(), entry_0.name.size()).c_str());
-                jobject newElement_0_isOperational;
-                std::string newElement_0_isOperationalClassName     = "java/lang/Boolean";
-                std::string newElement_0_isOperationalCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_isOperationalClassName.c_str(),
-                                                                           newElement_0_isOperationalCtorSignature.c_str(),
-                                                                           entry_0.isOperational, newElement_0_isOperational);
-                jobject newElement_0_offPremiseServicesReachableIPv4;
-                if (entry_0.offPremiseServicesReachableIPv4.IsNull())
-                {
-                    newElement_0_offPremiseServicesReachableIPv4 = nullptr;
-                }
-                else
-                {
-                    std::string newElement_0_offPremiseServicesReachableIPv4ClassName     = "java/lang/Boolean";
-                    std::string newElement_0_offPremiseServicesReachableIPv4CtorSignature = "(Z)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                        newElement_0_offPremiseServicesReachableIPv4ClassName.c_str(),
-                        newElement_0_offPremiseServicesReachableIPv4CtorSignature.c_str(),
-                        entry_0.offPremiseServicesReachableIPv4.Value(), newElement_0_offPremiseServicesReachableIPv4);
-                }
-                jobject newElement_0_offPremiseServicesReachableIPv6;
-                if (entry_0.offPremiseServicesReachableIPv6.IsNull())
-                {
-                    newElement_0_offPremiseServicesReachableIPv6 = nullptr;
-                }
-                else
-                {
-                    std::string newElement_0_offPremiseServicesReachableIPv6ClassName     = "java/lang/Boolean";
-                    std::string newElement_0_offPremiseServicesReachableIPv6CtorSignature = "(Z)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                        newElement_0_offPremiseServicesReachableIPv6ClassName.c_str(),
-                        newElement_0_offPremiseServicesReachableIPv6CtorSignature.c_str(),
-                        entry_0.offPremiseServicesReachableIPv6.Value(), newElement_0_offPremiseServicesReachableIPv6);
-                }
-                jobject newElement_0_hardwareAddress;
-                jbyteArray newElement_0_hardwareAddressByteArray =
-                    env->NewByteArray(static_cast<jsize>(entry_0.hardwareAddress.size()));
-                env->SetByteArrayRegion(newElement_0_hardwareAddressByteArray, 0,
-                                        static_cast<jsize>(entry_0.hardwareAddress.size()),
-                                        reinterpret_cast<const jbyte *>(entry_0.hardwareAddress.data()));
-                newElement_0_hardwareAddress = newElement_0_hardwareAddressByteArray;
-                jobject newElement_0_IPv4Addresses;
-                chip::JniReferences::GetInstance().CreateArrayList(newElement_0_IPv4Addresses);
-
-                auto iter_newElement_0_IPv4Addresses_2 = entry_0.IPv4Addresses.begin();
-                while (iter_newElement_0_IPv4Addresses_2.Next())
-                {
-                    auto & entry_2 = iter_newElement_0_IPv4Addresses_2.GetValue();
-                    jobject newElement_2;
-                    jbyteArray newElement_2ByteArray = env->NewByteArray(static_cast<jsize>(entry_2.size()));
-                    env->SetByteArrayRegion(newElement_2ByteArray, 0, static_cast<jsize>(entry_2.size()),
-                                            reinterpret_cast<const jbyte *>(entry_2.data()));
-                    newElement_2 = newElement_2ByteArray;
-                    chip::JniReferences::GetInstance().AddToList(newElement_0_IPv4Addresses, newElement_2);
-                }
-                jobject newElement_0_IPv6Addresses;
-                chip::JniReferences::GetInstance().CreateArrayList(newElement_0_IPv6Addresses);
-
-                auto iter_newElement_0_IPv6Addresses_2 = entry_0.IPv6Addresses.begin();
-                while (iter_newElement_0_IPv6Addresses_2.Next())
-                {
-                    auto & entry_2 = iter_newElement_0_IPv6Addresses_2.GetValue();
-                    jobject newElement_2;
-                    jbyteArray newElement_2ByteArray = env->NewByteArray(static_cast<jsize>(entry_2.size()));
-                    env->SetByteArrayRegion(newElement_2ByteArray, 0, static_cast<jsize>(entry_2.size()),
-                                            reinterpret_cast<const jbyte *>(entry_2.data()));
-                    newElement_2 = newElement_2ByteArray;
-                    chip::JniReferences::GetInstance().AddToList(newElement_0_IPv6Addresses, newElement_2);
-                }
-                jobject newElement_0_type;
-                std::string newElement_0_typeClassName     = "java/lang/Integer";
-                std::string newElement_0_typeCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0_typeClassName.c_str(), newElement_0_typeCtorSignature.c_str(), static_cast<uint8_t>(entry_0.type),
-                    newElement_0_type);
-
-                jclass networkInterfaceTypeStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$GeneralDiagnosticsClusterNetworkInterfaceType",
-                    networkInterfaceTypeStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$GeneralDiagnosticsClusterNetworkInterfaceType");
-                    return nullptr;
-                }
-                jmethodID networkInterfaceTypeStructCtor =
-                    env->GetMethodID(networkInterfaceTypeStructClass, "<init>",
-                                     "(Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;[BLjava/util/"
-                                     "ArrayList;Ljava/util/ArrayList;Ljava/lang/Integer;)V");
-                if (networkInterfaceTypeStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$GeneralDiagnosticsClusterNetworkInterfaceType constructor");
-                    return nullptr;
-                }
-
-                newElement_0 = env->NewObject(networkInterfaceTypeStructClass, networkInterfaceTypeStructCtor, newElement_0_name,
-                                              newElement_0_isOperational, newElement_0_offPremiseServicesReachableIPv4,
-                                              newElement_0_offPremiseServicesReachableIPv6, newElement_0_hardwareAddress,
-                                              newElement_0_IPv4Addresses, newElement_0_IPv6Addresses, newElement_0_type);
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
                 chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::RebootCount::Id: {
-            using TypeInfo = Attributes::RebootCount::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6823,14 +6816,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::UpTime::Id: {
-            using TypeInfo = Attributes::UpTime::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6838,14 +6840,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::TotalOperationalHours::Id: {
-            using TypeInfo = Attributes::TotalOperationalHours::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6859,8 +6870,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::BootReasons::Id: {
-            using TypeInfo = Attributes::BootReasons::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6870,12 +6881,22 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::ActiveHardwareFaults::Id: {
-            using TypeInfo = Attributes::ActiveHardwareFaults::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::WiFiNetworkDiagnostics::Id: {
+        using namespace app::Clusters::WiFiNetworkDiagnostics;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::Bssid::Id: {
+            using TypeInfo = Attributes::Bssid::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6883,23 +6904,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Integer";
-                std::string newElement_0CtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = nullptr;
+            }
+            else
+            {
+                jbyteArray valueByteArray = env->NewByteArray(static_cast<jsize>(cppValue.Value().size()));
+                env->SetByteArrayRegion(valueByteArray, 0, static_cast<jsize>(cppValue.Value().size()),
+                                        reinterpret_cast<const jbyte *>(cppValue.Value().data()));
+                value = valueByteArray;
             }
             return value;
         }
-        case Attributes::ActiveRadioFaults::Id: {
-            using TypeInfo = Attributes::ActiveRadioFaults::TypeInfo;
+        case Attributes::SecurityType::Id: {
+            using TypeInfo = Attributes::SecurityType::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6907,23 +6926,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Integer";
-                std::string newElement_0CtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              static_cast<uint8_t>(cppValue.Value()), value);
             }
             return value;
         }
-        case Attributes::ActiveNetworkFaults::Id: {
-            using TypeInfo = Attributes::ActiveNetworkFaults::TypeInfo;
+        case Attributes::WiFiVersion::Id: {
+            using TypeInfo = Attributes::WiFiVersion::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6931,23 +6948,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Integer";
-                std::string newElement_0CtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              static_cast<uint8_t>(cppValue.Value()), value);
             }
             return value;
         }
-        case Attributes::TestEventTriggersEnabled::Id: {
-            using TypeInfo = Attributes::TestEventTriggersEnabled::TypeInfo;
+        case Attributes::ChannelNumber::Id: {
+            using TypeInfo = Attributes::ChannelNumber::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6955,14 +6970,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
-                                                                       value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::Rssi::Id: {
+            using TypeInfo = Attributes::Rssi::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6970,23 +6992,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                             cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::BeaconLostCount::Id: {
+            using TypeInfo = Attributes::BeaconLostCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -6994,23 +7014,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::BeaconRxCount::Id: {
+            using TypeInfo = Attributes::BeaconRxCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7018,23 +7029,29 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::PacketMulticastRxCount::Id: {
+            using TypeInfo = Attributes::PacketMulticastRxCount::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::PacketMulticastTxCount::Id: {
+            using TypeInfo = Attributes::PacketMulticastTxCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7048,8 +7065,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::PacketUnicastRxCount::Id: {
+            using TypeInfo = Attributes::PacketUnicastRxCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7057,24 +7074,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::GroupKeyManagement::Id: {
-        using namespace app::Clusters::GroupKeyManagement;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::GroupKeyMap::Id: {
-            using TypeInfo = Attributes::GroupKeyMap::TypeInfo;
+        case Attributes::PacketUnicastTxCount::Id: {
+            using TypeInfo = Attributes::PacketUnicastTxCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7082,136 +7089,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                jobject newElement_0_groupId;
-                std::string newElement_0_groupIdClassName     = "java/lang/Integer";
-                std::string newElement_0_groupIdCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_groupIdClassName.c_str(),
-                                                                               newElement_0_groupIdCtorSignature.c_str(),
-                                                                               entry_0.groupId, newElement_0_groupId);
-                jobject newElement_0_groupKeySetID;
-                std::string newElement_0_groupKeySetIDClassName     = "java/lang/Integer";
-                std::string newElement_0_groupKeySetIDCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_groupKeySetIDClassName.c_str(),
-                                                                               newElement_0_groupKeySetIDCtorSignature.c_str(),
-                                                                               entry_0.groupKeySetID, newElement_0_groupKeySetID);
-                jobject newElement_0_fabricIndex;
-                std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
-                std::string newElement_0_fabricIndexCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
-                                                                              newElement_0_fabricIndexCtorSignature.c_str(),
-                                                                              entry_0.fabricIndex, newElement_0_fabricIndex);
-
-                jclass groupKeyMapStructStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$GroupKeyManagementClusterGroupKeyMapStruct",
-                    groupKeyMapStructStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$GroupKeyManagementClusterGroupKeyMapStruct");
-                    return nullptr;
-                }
-                jmethodID groupKeyMapStructStructCtor = env->GetMethodID(
-                    groupKeyMapStructStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V");
-                if (groupKeyMapStructStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$GroupKeyManagementClusterGroupKeyMapStruct constructor");
-                    return nullptr;
-                }
-
-                newElement_0 = env->NewObject(groupKeyMapStructStructClass, groupKeyMapStructStructCtor, newElement_0_groupId,
-                                              newElement_0_groupKeySetID, newElement_0_fabricIndex);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::GroupTable::Id: {
-            using TypeInfo = Attributes::GroupTable::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                jobject newElement_0_groupId;
-                std::string newElement_0_groupIdClassName     = "java/lang/Integer";
-                std::string newElement_0_groupIdCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_groupIdClassName.c_str(),
-                                                                               newElement_0_groupIdCtorSignature.c_str(),
-                                                                               entry_0.groupId, newElement_0_groupId);
-                jobject newElement_0_endpoints;
-                chip::JniReferences::GetInstance().CreateArrayList(newElement_0_endpoints);
-
-                auto iter_newElement_0_endpoints_2 = entry_0.endpoints.begin();
-                while (iter_newElement_0_endpoints_2.Next())
-                {
-                    auto & entry_2 = iter_newElement_0_endpoints_2.GetValue();
-                    jobject newElement_2;
-                    std::string newElement_2ClassName     = "java/lang/Integer";
-                    std::string newElement_2CtorSignature = "(I)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-                        newElement_2ClassName.c_str(), newElement_2CtorSignature.c_str(), entry_2, newElement_2);
-                    chip::JniReferences::GetInstance().AddToList(newElement_0_endpoints, newElement_2);
-                }
-                jobject newElement_0_groupName;
-                if (!entry_0.groupName.HasValue())
-                {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_groupName);
-                }
-                else
-                {
-                    jobject newElement_0_groupNameInsideOptional;
-                    newElement_0_groupNameInsideOptional =
-                        env->NewStringUTF(std::string(entry_0.groupName.Value().data(), entry_0.groupName.Value().size()).c_str());
-                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_groupNameInsideOptional, newElement_0_groupName);
-                }
-                jobject newElement_0_fabricIndex;
-                std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
-                std::string newElement_0_fabricIndexCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
-                                                                              newElement_0_fabricIndexCtorSignature.c_str(),
-                                                                              entry_0.fabricIndex, newElement_0_fabricIndex);
-
-                jclass groupInfoMapStructStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$GroupKeyManagementClusterGroupInfoMapStruct",
-                    groupInfoMapStructStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$GroupKeyManagementClusterGroupInfoMapStruct");
-                    return nullptr;
-                }
-                jmethodID groupInfoMapStructStructCtor =
-                    env->GetMethodID(groupInfoMapStructStructClass, "<init>",
-                                     "(Ljava/lang/Integer;Ljava/util/ArrayList;Ljava/util/Optional;Ljava/lang/Integer;)V");
-                if (groupInfoMapStructStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$GroupKeyManagementClusterGroupInfoMapStruct constructor");
-                    return nullptr;
-                }
-
-                newElement_0 = env->NewObject(groupInfoMapStructStructClass, groupInfoMapStructStructCtor, newElement_0_groupId,
-                                              newElement_0_endpoints, newElement_0_groupName, newElement_0_fabricIndex);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::MaxGroupsPerFabric::Id: {
-            using TypeInfo = Attributes::MaxGroupsPerFabric::TypeInfo;
+        case Attributes::CurrentMaxRate::Id: {
+            using TypeInfo = Attributes::CurrentMaxRate::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7219,14 +7104,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::MaxGroupKeysPerFabric::Id: {
-            using TypeInfo = Attributes::MaxGroupKeysPerFabric::TypeInfo;
+        case Attributes::OverrunCount::Id: {
+            using TypeInfo = Attributes::OverrunCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7234,9 +7119,9 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
@@ -7348,12 +7233,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::Groups::Id: {
-        using namespace app::Clusters::Groups;
+    case app::Clusters::EthernetNetworkDiagnostics::Id: {
+        using namespace app::Clusters::EthernetNetworkDiagnostics;
         switch (aPath.mAttributeId)
         {
-        case Attributes::NameSupport::Id: {
-            using TypeInfo = Attributes::NameSupport::TypeInfo;
+        case Attributes::PHYRate::Id: {
+            using TypeInfo = Attributes::PHYRate::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7361,14 +7246,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              static_cast<uint8_t>(cppValue.Value()), value);
+            }
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::FullDuplex::Id: {
+            using TypeInfo = Attributes::FullDuplex::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7376,23 +7268,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Boolean";
+                std::string valueCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::PacketRxCount::Id: {
+            using TypeInfo = Attributes::PacketRxCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7400,23 +7290,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::PacketTxCount::Id: {
+            using TypeInfo = Attributes::PacketTxCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7424,23 +7305,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::TxErrCount::Id: {
+            using TypeInfo = Attributes::TxErrCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7450,12 +7322,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Long";
             std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::CollisionCount::Id: {
+            using TypeInfo = Attributes::CollisionCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7463,24 +7335,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::Identify::Id: {
-        using namespace app::Clusters::Identify;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::IdentifyTime::Id: {
-            using TypeInfo = Attributes::IdentifyTime::TypeInfo;
+        case Attributes::OverrunCount::Id: {
+            using TypeInfo = Attributes::OverrunCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7488,14 +7350,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::IdentifyType::Id: {
-            using TypeInfo = Attributes::IdentifyType::TypeInfo;
+        case Attributes::CarrierDetect::Id: {
+            using TypeInfo = Attributes::CarrierDetect::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7503,10 +7365,32 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Boolean";
+                std::string valueCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue.Value(), value);
+            }
+            return value;
+        }
+        case Attributes::TimeSinceReset::Id: {
+            using TypeInfo = Attributes::TimeSinceReset::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -7617,12 +7501,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::IlluminanceMeasurement::Id: {
-        using namespace app::Clusters::IlluminanceMeasurement;
+    case app::Clusters::BridgedDeviceBasic::Id: {
+        using namespace app::Clusters::BridgedDeviceBasic;
         switch (aPath.mAttributeId)
         {
-        case Attributes::MeasuredValue::Id: {
-            using TypeInfo = Attributes::MeasuredValue::TypeInfo;
+        case Attributes::VendorName::Id: {
+            using TypeInfo = Attributes::VendorName::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7630,21 +7514,11 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
-            }
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
             return value;
         }
-        case Attributes::MinMeasuredValue::Id: {
-            using TypeInfo = Attributes::MinMeasuredValue::TypeInfo;
+        case Attributes::VendorID::Id: {
+            using TypeInfo = Attributes::VendorID::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7652,21 +7526,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           static_cast<uint16_t>(cppValue), value);
             return value;
         }
-        case Attributes::MaxMeasuredValue::Id: {
-            using TypeInfo = Attributes::MaxMeasuredValue::TypeInfo;
+        case Attributes::ProductName::Id: {
+            using TypeInfo = Attributes::ProductName::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7674,21 +7541,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
+            return value;
+        }
+        case Attributes::NodeLabel::Id: {
+            using TypeInfo = Attributes::NodeLabel::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                return nullptr;
             }
+            jobject value;
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
             return value;
         }
-        case Attributes::Tolerance::Id: {
-            using TypeInfo = Attributes::Tolerance::TypeInfo;
+        case Attributes::HardwareVersion::Id: {
+            using TypeInfo = Attributes::HardwareVersion::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7702,8 +7571,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::LightSensorType::Id: {
-            using TypeInfo = Attributes::LightSensorType::TypeInfo;
+        case Attributes::HardwareVersionString::Id: {
+            using TypeInfo = Attributes::HardwareVersionString::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7711,21 +7580,26 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
+            return value;
+        }
+        case Attributes::SoftwareVersion::Id: {
+            using TypeInfo = Attributes::SoftwareVersion::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::SoftwareVersionString::Id: {
+            using TypeInfo = Attributes::SoftwareVersionString::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7733,23 +7607,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
+            return value;
+        }
+        case Attributes::ManufacturingDate::Id: {
+            using TypeInfo = Attributes::ManufacturingDate::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                return nullptr;
             }
+            jobject value;
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::PartNumber::Id: {
+            using TypeInfo = Attributes::PartNumber::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7757,23 +7631,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
+            return value;
+        }
+        case Attributes::ProductURL::Id: {
+            using TypeInfo = Attributes::ProductURL::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                return nullptr;
             }
+            jobject value;
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::ProductLabel::Id: {
+            using TypeInfo = Attributes::ProductLabel::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7781,23 +7655,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
+            return value;
+        }
+        case Attributes::SerialNumber::Id: {
+            using TypeInfo = Attributes::SerialNumber::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                return nullptr;
             }
+            jobject value;
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::Reachable::Id: {
+            using TypeInfo = Attributes::Reachable::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7805,14 +7679,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
+                                                                       value);
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::UniqueID::Id: {
+            using TypeInfo = Attributes::UniqueID::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7820,22 +7694,9 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::KeypadInput::Id: {
-        using namespace app::Clusters::KeypadInput;
-        switch (aPath.mAttributeId)
-        {
         case Attributes::GeneratedCommandList::Id: {
             using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -7944,12 +7805,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::LevelControl::Id: {
-        using namespace app::Clusters::LevelControl;
-        switch (aPath.mAttributeId)
+    case app::Clusters::Switch::Id: {
+        using namespace app::Clusters::Switch;
+        switch (aPath.mAttributeId)
         {
-        case Attributes::CurrentLevel::Id: {
-            using TypeInfo = Attributes::CurrentLevel::TypeInfo;
+        case Attributes::NumberOfPositions::Id: {
+            using TypeInfo = Attributes::NumberOfPositions::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7963,23 +7824,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                           cppValue, value);
             return value;
         }
-        case Attributes::RemainingTime::Id: {
-            using TypeInfo = Attributes::RemainingTime::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        case Attributes::MinLevel::Id: {
-            using TypeInfo = Attributes::MinLevel::TypeInfo;
+        case Attributes::CurrentPosition::Id: {
+            using TypeInfo = Attributes::CurrentPosition::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -7993,8 +7839,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                           cppValue, value);
             return value;
         }
-        case Attributes::MaxLevel::Id: {
-            using TypeInfo = Attributes::MaxLevel::TypeInfo;
+        case Attributes::MultiPressMax::Id: {
+            using TypeInfo = Attributes::MultiPressMax::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -8008,8 +7854,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                           cppValue, value);
             return value;
         }
-        case Attributes::CurrentFrequency::Id: {
-            using TypeInfo = Attributes::CurrentFrequency::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -8017,14 +7863,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::MinFrequency::Id: {
-            using TypeInfo = Attributes::MinFrequency::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -8032,14 +7887,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::MaxFrequency::Id: {
-            using TypeInfo = Attributes::MaxFrequency::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -8047,14 +7911,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::Options::Id: {
-            using TypeInfo = Attributes::Options::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -8062,14 +7935,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::OnOffTransitionTime::Id: {
-            using TypeInfo = Attributes::OnOffTransitionTime::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -8083,52 +7956,18 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::OnLevel::Id: {
-            using TypeInfo = Attributes::OnLevel::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
-            }
-            return value;
-        }
-        case Attributes::OnTransitionTime::Id: {
-            using TypeInfo = Attributes::OnTransitionTime::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
-            }
-            return value;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
         }
-        case Attributes::OffTransitionTime::Id: {
-            using TypeInfo = Attributes::OffTransitionTime::TypeInfo;
+        break;
+    }
+    case app::Clusters::AdministratorCommissioning::Id: {
+        using namespace app::Clusters::AdministratorCommissioning;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::WindowStatus::Id: {
+            using TypeInfo = Attributes::WindowStatus::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -8136,21 +7975,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::DefaultMoveRate::Id: {
-            using TypeInfo = Attributes::DefaultMoveRate::TypeInfo;
+        case Attributes::AdminFabricIndex::Id: {
+            using TypeInfo = Attributes::AdminFabricIndex::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -8158,21 +7990,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::StartUpCurrentLevel::Id: {
-            using TypeInfo = Attributes::StartUpCurrentLevel::TypeInfo;
+        case Attributes::AdminVendorId::Id: {
+            using TypeInfo = Attributes::AdminVendorId::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -8180,17 +8005,10 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -8301,24 +8119,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::LocalizationConfiguration::Id: {
-        using namespace app::Clusters::LocalizationConfiguration;
+    case app::Clusters::OperationalCredentials::Id: {
+        using namespace app::Clusters::OperationalCredentials;
         switch (aPath.mAttributeId)
         {
-        case Attributes::ActiveLocale::Id: {
-            using TypeInfo = Attributes::ActiveLocale::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
-            return value;
-        }
-        case Attributes::SupportedLocales::Id: {
-            using TypeInfo = Attributes::SupportedLocales::TypeInfo;
+        case Attributes::NOCs::Id: {
+            using TypeInfo = Attributes::NOCs::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -8333,37 +8139,53 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 auto & entry_0 = iter_value_0.GetValue();
                 jobject newElement_0;
-                newElement_0 = env->NewStringUTF(std::string(entry_0.data(), entry_0.size()).c_str());
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                jobject newElement_0_noc;
+                jbyteArray newElement_0_nocByteArray = env->NewByteArray(static_cast<jsize>(entry_0.noc.size()));
+                env->SetByteArrayRegion(newElement_0_nocByteArray, 0, static_cast<jsize>(entry_0.noc.size()),
+                                        reinterpret_cast<const jbyte *>(entry_0.noc.data()));
+                newElement_0_noc = newElement_0_nocByteArray;
+                jobject newElement_0_icac;
+                if (entry_0.icac.IsNull())
+                {
+                    newElement_0_icac = nullptr;
+                }
+                else
+                {
+                    jbyteArray newElement_0_icacByteArray = env->NewByteArray(static_cast<jsize>(entry_0.icac.Value().size()));
+                    env->SetByteArrayRegion(newElement_0_icacByteArray, 0, static_cast<jsize>(entry_0.icac.Value().size()),
+                                            reinterpret_cast<const jbyte *>(entry_0.icac.Value().data()));
+                    newElement_0_icac = newElement_0_icacByteArray;
+                }
+                jobject newElement_0_fabricIndex;
+                std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
+                std::string newElement_0_fabricIndexCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
+                                                                              newElement_0_fabricIndexCtorSignature.c_str(),
+                                                                              entry_0.fabricIndex, newElement_0_fabricIndex);
+
+                jclass NOCStructStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$OperationalCredentialsClusterNOCStruct", NOCStructStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$OperationalCredentialsClusterNOCStruct");
+                    return nullptr;
+                }
+                jmethodID NOCStructStructCtor = env->GetMethodID(NOCStructStructClass, "<init>", "([B[BLjava/lang/Integer;)V");
+                if (NOCStructStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$OperationalCredentialsClusterNOCStruct constructor");
+                    return nullptr;
+                }
+
+                newElement_0 = env->NewObject(NOCStructStructClass, NOCStructStructCtor, newElement_0_noc, newElement_0_icac,
+                                              newElement_0_fabricIndex);
                 chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::Fabrics::Id: {
+            using TypeInfo = Attributes::Fabrics::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -8378,16 +8200,66 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 auto & entry_0 = iter_value_0.GetValue();
                 jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                jobject newElement_0_rootPublicKey;
+                jbyteArray newElement_0_rootPublicKeyByteArray =
+                    env->NewByteArray(static_cast<jsize>(entry_0.rootPublicKey.size()));
+                env->SetByteArrayRegion(newElement_0_rootPublicKeyByteArray, 0, static_cast<jsize>(entry_0.rootPublicKey.size()),
+                                        reinterpret_cast<const jbyte *>(entry_0.rootPublicKey.data()));
+                newElement_0_rootPublicKey = newElement_0_rootPublicKeyByteArray;
+                jobject newElement_0_vendorId;
+                std::string newElement_0_vendorIdClassName     = "java/lang/Integer";
+                std::string newElement_0_vendorIdCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+                    newElement_0_vendorIdClassName.c_str(), newElement_0_vendorIdCtorSignature.c_str(),
+                    static_cast<uint16_t>(entry_0.vendorId), newElement_0_vendorId);
+                jobject newElement_0_fabricId;
+                std::string newElement_0_fabricIdClassName     = "java/lang/Long";
+                std::string newElement_0_fabricIdCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_fabricIdClassName.c_str(),
+                                                                               newElement_0_fabricIdCtorSignature.c_str(),
+                                                                               entry_0.fabricId, newElement_0_fabricId);
+                jobject newElement_0_nodeId;
+                std::string newElement_0_nodeIdClassName     = "java/lang/Long";
+                std::string newElement_0_nodeIdCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_nodeIdClassName.c_str(),
+                                                                               newElement_0_nodeIdCtorSignature.c_str(),
+                                                                               entry_0.nodeId, newElement_0_nodeId);
+                jobject newElement_0_label;
+                newElement_0_label = env->NewStringUTF(std::string(entry_0.label.data(), entry_0.label.size()).c_str());
+                jobject newElement_0_fabricIndex;
+                std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
+                std::string newElement_0_fabricIndexCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
+                                                                              newElement_0_fabricIndexCtorSignature.c_str(),
+                                                                              entry_0.fabricIndex, newElement_0_fabricIndex);
+
+                jclass fabricDescriptorStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$OperationalCredentialsClusterFabricDescriptor",
+                    fabricDescriptorStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$OperationalCredentialsClusterFabricDescriptor");
+                    return nullptr;
+                }
+                jmethodID fabricDescriptorStructCtor = env->GetMethodID(
+                    fabricDescriptorStructClass, "<init>",
+                    "([BLjava/lang/Integer;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Integer;)V");
+                if (fabricDescriptorStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$OperationalCredentialsClusterFabricDescriptor constructor");
+                    return nullptr;
+                }
+
+                newElement_0 = env->NewObject(fabricDescriptorStructClass, fabricDescriptorStructCtor, newElement_0_rootPublicKey,
+                                              newElement_0_vendorId, newElement_0_fabricId, newElement_0_nodeId, newElement_0_label,
+                                              newElement_0_fabricIndex);
                 chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::SupportedFabrics::Id: {
+            using TypeInfo = Attributes::SupportedFabrics::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -8395,14 +8267,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::CommissionedFabrics::Id: {
+            using TypeInfo = Attributes::CommissionedFabrics::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -8412,20 +8284,49 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
+        case Attributes::TrustedRootCertificates::Id: {
+            using TypeInfo = Attributes::TrustedRootCertificates::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jbyteArray newElement_0ByteArray = env->NewByteArray(static_cast<jsize>(entry_0.size()));
+                env->SetByteArrayRegion(newElement_0ByteArray, 0, static_cast<jsize>(entry_0.size()),
+                                        reinterpret_cast<const jbyte *>(entry_0.data()));
+                newElement_0 = newElement_0ByteArray;
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::CurrentFabricIndex::Id: {
+            using TypeInfo = Attributes::CurrentFabricIndex::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
+            return value;
         }
-        break;
-    }
-    case app::Clusters::LowPower::Id: {
-        using namespace app::Clusters::LowPower;
-        switch (aPath.mAttributeId)
-        {
         case Attributes::GeneratedCommandList::Id: {
             using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -8534,12 +8435,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::MediaInput::Id: {
-        using namespace app::Clusters::MediaInput;
+    case app::Clusters::GroupKeyManagement::Id: {
+        using namespace app::Clusters::GroupKeyManagement;
         switch (aPath.mAttributeId)
         {
-        case Attributes::InputList::Id: {
-            using TypeInfo = Attributes::InputList::TypeInfo;
+        case Attributes::GroupKeyMap::Id: {
+            using TypeInfo = Attributes::GroupKeyMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -8554,49 +8455,50 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 auto & entry_0 = iter_value_0.GetValue();
                 jobject newElement_0;
-                jobject newElement_0_index;
-                std::string newElement_0_indexClassName     = "java/lang/Integer";
-                std::string newElement_0_indexCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_indexClassName.c_str(),
-                                                                              newElement_0_indexCtorSignature.c_str(),
-                                                                              entry_0.index, newElement_0_index);
-                jobject newElement_0_inputType;
-                std::string newElement_0_inputTypeClassName     = "java/lang/Integer";
-                std::string newElement_0_inputTypeCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0_inputTypeClassName.c_str(), newElement_0_inputTypeCtorSignature.c_str(),
-                    static_cast<uint8_t>(entry_0.inputType), newElement_0_inputType);
-                jobject newElement_0_name;
-                newElement_0_name = env->NewStringUTF(std::string(entry_0.name.data(), entry_0.name.size()).c_str());
-                jobject newElement_0_description;
-                newElement_0_description =
-                    env->NewStringUTF(std::string(entry_0.description.data(), entry_0.description.size()).c_str());
+                jobject newElement_0_groupId;
+                std::string newElement_0_groupIdClassName     = "java/lang/Integer";
+                std::string newElement_0_groupIdCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_groupIdClassName.c_str(),
+                                                                               newElement_0_groupIdCtorSignature.c_str(),
+                                                                               entry_0.groupId, newElement_0_groupId);
+                jobject newElement_0_groupKeySetID;
+                std::string newElement_0_groupKeySetIDClassName     = "java/lang/Integer";
+                std::string newElement_0_groupKeySetIDCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_groupKeySetIDClassName.c_str(),
+                                                                               newElement_0_groupKeySetIDCtorSignature.c_str(),
+                                                                               entry_0.groupKeySetID, newElement_0_groupKeySetID);
+                jobject newElement_0_fabricIndex;
+                std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
+                std::string newElement_0_fabricIndexCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
+                                                                              newElement_0_fabricIndexCtorSignature.c_str(),
+                                                                              entry_0.fabricIndex, newElement_0_fabricIndex);
 
-                jclass inputInfoStructClass;
+                jclass groupKeyMapStructStructClass;
                 err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$MediaInputClusterInputInfo", inputInfoStructClass);
+                    env, "chip/devicecontroller/ChipStructs$GroupKeyManagementClusterGroupKeyMapStruct",
+                    groupKeyMapStructStructClass);
                 if (err != CHIP_NO_ERROR)
                 {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$MediaInputClusterInputInfo");
+                    ChipLogError(Zcl, "Could not find class ChipStructs$GroupKeyManagementClusterGroupKeyMapStruct");
                     return nullptr;
                 }
-                jmethodID inputInfoStructCtor =
-                    env->GetMethodID(inputInfoStructClass, "<init>",
-                                     "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;)V");
-                if (inputInfoStructCtor == nullptr)
+                jmethodID groupKeyMapStructStructCtor = env->GetMethodID(
+                    groupKeyMapStructStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V");
+                if (groupKeyMapStructStructCtor == nullptr)
                 {
-                    ChipLogError(Zcl, "Could not find ChipStructs$MediaInputClusterInputInfo constructor");
+                    ChipLogError(Zcl, "Could not find ChipStructs$GroupKeyManagementClusterGroupKeyMapStruct constructor");
                     return nullptr;
                 }
 
-                newElement_0 = env->NewObject(inputInfoStructClass, inputInfoStructCtor, newElement_0_index, newElement_0_inputType,
-                                              newElement_0_name, newElement_0_description);
+                newElement_0 = env->NewObject(groupKeyMapStructStructClass, groupKeyMapStructStructCtor, newElement_0_groupId,
+                                              newElement_0_groupKeySetID, newElement_0_fabricIndex);
                 chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::CurrentInput::Id: {
-            using TypeInfo = Attributes::CurrentInput::TypeInfo;
+        case Attributes::GroupTable::Id: {
+            using TypeInfo = Attributes::GroupTable::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -8604,18 +8506,112 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
-            return value;
-        }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_groupId;
+                std::string newElement_0_groupIdClassName     = "java/lang/Integer";
+                std::string newElement_0_groupIdCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_groupIdClassName.c_str(),
+                                                                               newElement_0_groupIdCtorSignature.c_str(),
+                                                                               entry_0.groupId, newElement_0_groupId);
+                jobject newElement_0_endpoints;
+                chip::JniReferences::GetInstance().CreateArrayList(newElement_0_endpoints);
+
+                auto iter_newElement_0_endpoints_2 = entry_0.endpoints.begin();
+                while (iter_newElement_0_endpoints_2.Next())
+                {
+                    auto & entry_2 = iter_newElement_0_endpoints_2.GetValue();
+                    jobject newElement_2;
+                    std::string newElement_2ClassName     = "java/lang/Integer";
+                    std::string newElement_2CtorSignature = "(I)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+                        newElement_2ClassName.c_str(), newElement_2CtorSignature.c_str(), entry_2, newElement_2);
+                    chip::JniReferences::GetInstance().AddToList(newElement_0_endpoints, newElement_2);
+                }
+                jobject newElement_0_groupName;
+                if (!entry_0.groupName.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_groupName);
+                }
+                else
+                {
+                    jobject newElement_0_groupNameInsideOptional;
+                    newElement_0_groupNameInsideOptional =
+                        env->NewStringUTF(std::string(entry_0.groupName.Value().data(), entry_0.groupName.Value().size()).c_str());
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_groupNameInsideOptional, newElement_0_groupName);
+                }
+                jobject newElement_0_fabricIndex;
+                std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
+                std::string newElement_0_fabricIndexCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
+                                                                              newElement_0_fabricIndexCtorSignature.c_str(),
+                                                                              entry_0.fabricIndex, newElement_0_fabricIndex);
+
+                jclass groupInfoMapStructStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$GroupKeyManagementClusterGroupInfoMapStruct",
+                    groupInfoMapStructStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$GroupKeyManagementClusterGroupInfoMapStruct");
+                    return nullptr;
+                }
+                jmethodID groupInfoMapStructStructCtor =
+                    env->GetMethodID(groupInfoMapStructStructClass, "<init>",
+                                     "(Ljava/lang/Integer;Ljava/util/ArrayList;Ljava/util/Optional;Ljava/lang/Integer;)V");
+                if (groupInfoMapStructStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$GroupKeyManagementClusterGroupInfoMapStruct constructor");
+                    return nullptr;
+                }
+
+                newElement_0 = env->NewObject(groupInfoMapStructStructClass, groupInfoMapStructStructCtor, newElement_0_groupId,
+                                              newElement_0_endpoints, newElement_0_groupName, newElement_0_fabricIndex);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::MaxGroupsPerFabric::Id: {
+            using TypeInfo = Attributes::MaxGroupsPerFabric::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::MaxGroupKeysPerFabric::Id: {
+            using TypeInfo = Attributes::MaxGroupKeysPerFabric::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
                 return nullptr;
             }
             jobject value;
@@ -8718,12 +8714,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::MediaPlayback::Id: {
-        using namespace app::Clusters::MediaPlayback;
+    case app::Clusters::FixedLabel::Id: {
+        using namespace app::Clusters::FixedLabel;
         switch (aPath.mAttributeId)
         {
-        case Attributes::CurrentState::Id: {
-            using TypeInfo = Attributes::CurrentState::TypeInfo;
+        case Attributes::LabelList::Id: {
+            using TypeInfo = Attributes::LabelList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -8731,14 +8727,42 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          static_cast<uint8_t>(cppValue), value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_label;
+                newElement_0_label = env->NewStringUTF(std::string(entry_0.label.data(), entry_0.label.size()).c_str());
+                jobject newElement_0_value;
+                newElement_0_value = env->NewStringUTF(std::string(entry_0.value.data(), entry_0.value.size()).c_str());
+
+                jclass labelStructStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$FixedLabelClusterLabelStruct", labelStructStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$FixedLabelClusterLabelStruct");
+                    return nullptr;
+                }
+                jmethodID labelStructStructCtor =
+                    env->GetMethodID(labelStructStructClass, "<init>", "(Ljava/lang/String;Ljava/lang/String;)V");
+                if (labelStructStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$FixedLabelClusterLabelStruct constructor");
+                    return nullptr;
+                }
+
+                newElement_0 =
+                    env->NewObject(labelStructStructClass, labelStructStructCtor, newElement_0_label, newElement_0_value);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::StartTime::Id: {
-            using TypeInfo = Attributes::StartTime::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -8746,21 +8770,47 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                value = nullptr;
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
-            else
+            return value;
+        }
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                std::string valueClassName     = "java/lang/Long";
-                std::string valueCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::Duration::Id: {
-            using TypeInfo = Attributes::Duration::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -8768,21 +8818,38 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                value = nullptr;
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
-            else
+            return value;
+        }
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                std::string valueClassName     = "java/lang/Long";
-                std::string valueCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::SampledPosition::Id: {
-            using TypeInfo = Attributes::SampledPosition::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -8790,54 +8857,67 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::UserLabel::Id: {
+        using namespace app::Clusters::UserLabel;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::LabelList::Id: {
+            using TypeInfo = Attributes::LabelList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                value = nullptr;
+                return nullptr;
             }
-            else
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                jobject value_updatedAt;
-                std::string value_updatedAtClassName     = "java/lang/Long";
-                std::string value_updatedAtCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(value_updatedAtClassName.c_str(),
-                                                                               value_updatedAtCtorSignature.c_str(),
-                                                                               cppValue.Value().updatedAt, value_updatedAt);
-                jobject value_position;
-                if (cppValue.Value().position.IsNull())
-                {
-                    value_position = nullptr;
-                }
-                else
-                {
-                    std::string value_positionClassName     = "java/lang/Long";
-                    std::string value_positionCtorSignature = "(J)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(
-                        value_positionClassName.c_str(), value_positionCtorSignature.c_str(), cppValue.Value().position.Value(),
-                        value_position);
-                }
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_label;
+                newElement_0_label = env->NewStringUTF(std::string(entry_0.label.data(), entry_0.label.size()).c_str());
+                jobject newElement_0_value;
+                newElement_0_value = env->NewStringUTF(std::string(entry_0.value.data(), entry_0.value.size()).c_str());
 
-                jclass playbackPositionStructClass;
+                jclass labelStructStructClass;
                 err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$MediaPlaybackClusterPlaybackPosition", playbackPositionStructClass);
+                    env, "chip/devicecontroller/ChipStructs$UserLabelClusterLabelStruct", labelStructStructClass);
                 if (err != CHIP_NO_ERROR)
                 {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$MediaPlaybackClusterPlaybackPosition");
+                    ChipLogError(Zcl, "Could not find class ChipStructs$UserLabelClusterLabelStruct");
                     return nullptr;
                 }
-                jmethodID playbackPositionStructCtor =
-                    env->GetMethodID(playbackPositionStructClass, "<init>", "(Ljava/lang/Long;Ljava/lang/Long;)V");
-                if (playbackPositionStructCtor == nullptr)
+                jmethodID labelStructStructCtor =
+                    env->GetMethodID(labelStructStructClass, "<init>", "(Ljava/lang/String;Ljava/lang/String;)V");
+                if (labelStructStructCtor == nullptr)
                 {
-                    ChipLogError(Zcl, "Could not find ChipStructs$MediaPlaybackClusterPlaybackPosition constructor");
+                    ChipLogError(Zcl, "Could not find ChipStructs$UserLabelClusterLabelStruct constructor");
                     return nullptr;
                 }
 
-                value = env->NewObject(playbackPositionStructClass, playbackPositionStructCtor, value_updatedAt, value_position);
+                newElement_0 =
+                    env->NewObject(labelStructStructClass, labelStructStructCtor, newElement_0_label, newElement_0_value);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::PlaybackSpeed::Id: {
-            using TypeInfo = Attributes::PlaybackSpeed::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -8845,14 +8925,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Float";
-            std::string valueCtorSignature = "(F)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<float>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                        cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::SeekRangeEnd::Id: {
-            using TypeInfo = Attributes::SeekRangeEnd::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -8860,21 +8949,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Long";
-                std::string valueCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::SeekRangeStart::Id: {
-            using TypeInfo = Attributes::SeekRangeStart::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -8882,17 +8973,50 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                value = nullptr;
+                return nullptr;
             }
-            else
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::BooleanState::Id: {
+        using namespace app::Clusters::BooleanState;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::StateValue::Id: {
+            using TypeInfo = Attributes::StateValue::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                std::string valueClassName     = "java/lang/Long";
-                std::string valueCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
+                                                                       value);
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -9295,27 +9419,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::NetworkCommissioning::Id: {
-        using namespace app::Clusters::NetworkCommissioning;
+    case app::Clusters::DoorLock::Id: {
+        using namespace app::Clusters::DoorLock;
         switch (aPath.mAttributeId)
         {
-        case Attributes::MaxNetworks::Id: {
-            using TypeInfo = Attributes::MaxNetworks::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
-            return value;
-        }
-        case Attributes::Networks::Id: {
-            using TypeInfo = Attributes::Networks::TypeInfo;
+        case Attributes::LockState::Id: {
+            using TypeInfo = Attributes::LockState::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -9323,63 +9432,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                jobject newElement_0_networkID;
-                jbyteArray newElement_0_networkIDByteArray = env->NewByteArray(static_cast<jsize>(entry_0.networkID.size()));
-                env->SetByteArrayRegion(newElement_0_networkIDByteArray, 0, static_cast<jsize>(entry_0.networkID.size()),
-                                        reinterpret_cast<const jbyte *>(entry_0.networkID.data()));
-                newElement_0_networkID = newElement_0_networkIDByteArray;
-                jobject newElement_0_connected;
-                std::string newElement_0_connectedClassName     = "java/lang/Boolean";
-                std::string newElement_0_connectedCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_connectedClassName.c_str(),
-                                                                           newElement_0_connectedCtorSignature.c_str(),
-                                                                           entry_0.connected, newElement_0_connected);
-
-                jclass networkInfoStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$NetworkCommissioningClusterNetworkInfo", networkInfoStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$NetworkCommissioningClusterNetworkInfo");
-                    return nullptr;
-                }
-                jmethodID networkInfoStructCtor = env->GetMethodID(networkInfoStructClass, "<init>", "([BLjava/lang/Boolean;)V");
-                if (networkInfoStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$NetworkCommissioningClusterNetworkInfo constructor");
-                    return nullptr;
-                }
-
-                newElement_0 =
-                    env->NewObject(networkInfoStructClass, networkInfoStructCtor, newElement_0_networkID, newElement_0_connected);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = nullptr;
             }
-            return value;
-        }
-        case Attributes::ScanMaxTimeSeconds::Id: {
-            using TypeInfo = Attributes::ScanMaxTimeSeconds::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            else
             {
-                return nullptr;
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              static_cast<uint8_t>(cppValue.Value()), value);
             }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
             return value;
         }
-        case Attributes::ConnectMaxTimeSeconds::Id: {
-            using TypeInfo = Attributes::ConnectMaxTimeSeconds::TypeInfo;
+        case Attributes::LockType::Id: {
+            using TypeInfo = Attributes::LockType::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -9390,11 +9457,11 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
             chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+                                                                          static_cast<uint8_t>(cppValue), value);
             return value;
         }
-        case Attributes::InterfaceEnabled::Id: {
-            using TypeInfo = Attributes::InterfaceEnabled::TypeInfo;
+        case Attributes::ActuatorEnabled::Id: {
+            using TypeInfo = Attributes::ActuatorEnabled::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -9408,8 +9475,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
-        case Attributes::LastNetworkingStatus::Id: {
-            using TypeInfo = Attributes::LastNetworkingStatus::TypeInfo;
+        case Attributes::DoorState::Id: {
+            using TypeInfo = Attributes::DoorState::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -9430,8 +9497,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             return value;
         }
-        case Attributes::LastNetworkID::Id: {
-            using TypeInfo = Attributes::LastNetworkID::TypeInfo;
+        case Attributes::NumberOfTotalUsersSupported::Id: {
+            using TypeInfo = Attributes::NumberOfTotalUsersSupported::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -9439,21 +9506,29 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::NumberOfPINUsersSupported::Id: {
+            using TypeInfo = Attributes::NumberOfPINUsersSupported::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                value = nullptr;
-            }
-            else
-            {
-                jbyteArray valueByteArray = env->NewByteArray(static_cast<jsize>(cppValue.Value().size()));
-                env->SetByteArrayRegion(valueByteArray, 0, static_cast<jsize>(cppValue.Value().size()),
-                                        reinterpret_cast<const jbyte *>(cppValue.Value().data()));
-                value = valueByteArray;
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::LastConnectErrorValue::Id: {
-            using TypeInfo = Attributes::LastConnectErrorValue::TypeInfo;
+        case Attributes::NumberOfRFIDUsersSupported::Id: {
+            using TypeInfo = Attributes::NumberOfRFIDUsersSupported::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -9461,21 +9536,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Long";
-                std::string valueCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::NumberOfWeekDaySchedulesSupportedPerUser::Id: {
+            using TypeInfo = Attributes::NumberOfWeekDaySchedulesSupportedPerUser::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -9483,23 +9551,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::NumberOfYearDaySchedulesSupportedPerUser::Id: {
+            using TypeInfo = Attributes::NumberOfYearDaySchedulesSupportedPerUser::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -9507,23 +9566,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::NumberOfHolidaySchedulesSupported::Id: {
+            using TypeInfo = Attributes::NumberOfHolidaySchedulesSupported::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -9531,14 +9581,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::MaxPINCodeLength::Id: {
+            using TypeInfo = Attributes::MaxPINCodeLength::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -9548,22 +9598,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::OtaSoftwareUpdateProvider::Id: {
-        using namespace app::Clusters::OtaSoftwareUpdateProvider;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::MinPINCodeLength::Id: {
+            using TypeInfo = Attributes::MinPINCodeLength::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -9571,23 +9611,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::MaxRFIDCodeLength::Id: {
+            using TypeInfo = Attributes::MaxRFIDCodeLength::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -9595,14 +9626,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::MinRFIDCodeLength::Id: {
+            using TypeInfo = Attributes::MinRFIDCodeLength::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -9612,22 +9643,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::OtaSoftwareUpdateRequestor::Id: {
-        using namespace app::Clusters::OtaSoftwareUpdateRequestor;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::DefaultOtaProviders::Id: {
-            using TypeInfo = Attributes::DefaultOtaProviders::TypeInfo;
+        case Attributes::NumberOfCredentialsSupportedPerUser::Id: {
+            using TypeInfo = Attributes::NumberOfCredentialsSupportedPerUser::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -9635,57 +9656,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                jobject newElement_0_providerNodeID;
-                std::string newElement_0_providerNodeIDClassName     = "java/lang/Long";
-                std::string newElement_0_providerNodeIDCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_providerNodeIDClassName.c_str(),
-                                                                               newElement_0_providerNodeIDCtorSignature.c_str(),
-                                                                               entry_0.providerNodeID, newElement_0_providerNodeID);
-                jobject newElement_0_endpoint;
-                std::string newElement_0_endpointClassName     = "java/lang/Integer";
-                std::string newElement_0_endpointCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_endpointClassName.c_str(),
-                                                                               newElement_0_endpointCtorSignature.c_str(),
-                                                                               entry_0.endpoint, newElement_0_endpoint);
-                jobject newElement_0_fabricIndex;
-                std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
-                std::string newElement_0_fabricIndexCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
-                                                                              newElement_0_fabricIndexCtorSignature.c_str(),
-                                                                              entry_0.fabricIndex, newElement_0_fabricIndex);
-
-                jclass providerLocationStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$OtaSoftwareUpdateRequestorClusterProviderLocation",
-                    providerLocationStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$OtaSoftwareUpdateRequestorClusterProviderLocation");
-                    return nullptr;
-                }
-                jmethodID providerLocationStructCtor = env->GetMethodID(
-                    providerLocationStructClass, "<init>", "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Integer;)V");
-                if (providerLocationStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$OtaSoftwareUpdateRequestorClusterProviderLocation constructor");
-                    return nullptr;
-                }
-
-                newElement_0 = env->NewObject(providerLocationStructClass, providerLocationStructCtor, newElement_0_providerNodeID,
-                                              newElement_0_endpoint, newElement_0_fabricIndex);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::UpdatePossible::Id: {
-            using TypeInfo = Attributes::UpdatePossible::TypeInfo;
+        case Attributes::Language::Id: {
+            using TypeInfo = Attributes::Language::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -9693,14 +9671,11 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
-                                                                       value);
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
             return value;
         }
-        case Attributes::UpdateState::Id: {
-            using TypeInfo = Attributes::UpdateState::TypeInfo;
+        case Attributes::AutoRelockTime::Id: {
+            using TypeInfo = Attributes::AutoRelockTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -9708,14 +9683,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          static_cast<uint8_t>(cppValue), value);
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::UpdateStateProgress::Id: {
-            using TypeInfo = Attributes::UpdateStateProgress::TypeInfo;
+        case Attributes::SoundVolume::Id: {
+            using TypeInfo = Attributes::SoundVolume::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -9723,21 +9698,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::OperatingMode::Id: {
+            using TypeInfo = Attributes::OperatingMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -9745,23 +9713,29 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          static_cast<uint8_t>(cppValue), value);
+            return value;
+        }
+        case Attributes::SupportedOperatingModes::Id: {
+            using TypeInfo = Attributes::SupportedOperatingModes::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue.Raw(), value);
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::EnableOneTouchLocking::Id: {
+            using TypeInfo = Attributes::EnableOneTouchLocking::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -9769,14 +9743,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
+                                                                       value);
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::EnablePrivacyModeButton::Id: {
+            using TypeInfo = Attributes::EnablePrivacyModeButton::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -9784,24 +9758,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
+                                                                       value);
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::OccupancySensing::Id: {
-        using namespace app::Clusters::OccupancySensing;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::Occupancy::Id: {
-            using TypeInfo = Attributes::Occupancy::TypeInfo;
+        case Attributes::WrongCodeEntryLimit::Id: {
+            using TypeInfo = Attributes::WrongCodeEntryLimit::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -9815,8 +9779,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                           cppValue, value);
             return value;
         }
-        case Attributes::OccupancySensorType::Id: {
-            using TypeInfo = Attributes::OccupancySensorType::TypeInfo;
+        case Attributes::UserCodeTemporaryDisableTime::Id: {
+            using TypeInfo = Attributes::UserCodeTemporaryDisableTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -9830,8 +9794,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                           cppValue, value);
             return value;
         }
-        case Attributes::OccupancySensorTypeBitmap::Id: {
-            using TypeInfo = Attributes::OccupancySensorTypeBitmap::TypeInfo;
+        case Attributes::RequirePINforRemoteOperation::Id: {
+            using TypeInfo = Attributes::RequirePINforRemoteOperation::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -9839,10 +9803,10 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
+                                                                       value);
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -9953,27 +9917,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::OnOff::Id: {
-        using namespace app::Clusters::OnOff;
+    case app::Clusters::WindowCovering::Id: {
+        using namespace app::Clusters::WindowCovering;
         switch (aPath.mAttributeId)
         {
-        case Attributes::OnOff::Id: {
-            using TypeInfo = Attributes::OnOff::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
-                                                                       value);
-            return value;
-        }
-        case Attributes::GlobalSceneControl::Id: {
-            using TypeInfo = Attributes::GlobalSceneControl::TypeInfo;
+        case Attributes::Type::Id: {
+            using TypeInfo = Attributes::Type::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -9981,14 +9930,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
-                                                                       value);
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          static_cast<uint8_t>(cppValue), value);
             return value;
         }
-        case Attributes::OnTime::Id: {
-            using TypeInfo = Attributes::OnTime::TypeInfo;
+        case Attributes::PhysicalClosedLimitLift::Id: {
+            using TypeInfo = Attributes::PhysicalClosedLimitLift::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10002,8 +9951,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::OffWaitTime::Id: {
-            using TypeInfo = Attributes::OffWaitTime::TypeInfo;
+        case Attributes::PhysicalClosedLimitTilt::Id: {
+            using TypeInfo = Attributes::PhysicalClosedLimitTilt::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10017,8 +9966,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::StartUpOnOff::Id: {
-            using TypeInfo = Attributes::StartUpOnOff::TypeInfo;
+        case Attributes::CurrentPositionLift::Id: {
+            using TypeInfo = Attributes::CurrentPositionLift::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10034,37 +9983,13 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 std::string valueClassName     = "java/lang/Integer";
                 std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              static_cast<uint8_t>(cppValue.Value()), value);
-            }
-            return value;
-        }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::CurrentPositionTilt::Id: {
+            using TypeInfo = Attributes::CurrentPositionTilt::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10072,47 +9997,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            if (cppValue.IsNull())
             {
-                return nullptr;
+                value = nullptr;
             }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            else
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::NumberOfActuationsLift::Id: {
+            using TypeInfo = Attributes::NumberOfActuationsLift::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10120,14 +10019,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::NumberOfActuationsTilt::Id: {
+            using TypeInfo = Attributes::NumberOfActuationsTilt::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10141,18 +10040,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::OnOffSwitchConfiguration::Id: {
-        using namespace app::Clusters::OnOffSwitchConfiguration;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::SwitchType::Id: {
-            using TypeInfo = Attributes::SwitchType::TypeInfo;
+        case Attributes::ConfigStatus::Id: {
+            using TypeInfo = Attributes::ConfigStatus::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10163,11 +10052,11 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
             chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+                                                                          cppValue.Raw(), value);
             return value;
         }
-        case Attributes::SwitchActions::Id: {
-            using TypeInfo = Attributes::SwitchActions::TypeInfo;
+        case Attributes::CurrentPositionLiftPercentage::Id: {
+            using TypeInfo = Attributes::CurrentPositionLiftPercentage::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10175,14 +10064,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::CurrentPositionTiltPercentage::Id: {
+            using TypeInfo = Attributes::CurrentPositionTiltPercentage::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10190,14 +10086,244 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
+            return value;
+        }
+        case Attributes::OperationalStatus::Id: {
+            using TypeInfo = Attributes::OperationalStatus::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue.Raw(), value);
+            return value;
+        }
+        case Attributes::TargetPositionLiftPercent100ths::Id: {
+            using TypeInfo = Attributes::TargetPositionLiftPercent100ths::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
+            return value;
+        }
+        case Attributes::TargetPositionTiltPercent100ths::Id: {
+            using TypeInfo = Attributes::TargetPositionTiltPercent100ths::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
+            return value;
+        }
+        case Attributes::EndProductType::Id: {
+            using TypeInfo = Attributes::EndProductType::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          static_cast<uint8_t>(cppValue), value);
+            return value;
+        }
+        case Attributes::CurrentPositionLiftPercent100ths::Id: {
+            using TypeInfo = Attributes::CurrentPositionLiftPercent100ths::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
+            return value;
+        }
+        case Attributes::CurrentPositionTiltPercent100ths::Id: {
+            using TypeInfo = Attributes::CurrentPositionTiltPercent100ths::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
+            return value;
+        }
+        case Attributes::InstalledOpenLimitLift::Id: {
+            using TypeInfo = Attributes::InstalledOpenLimitLift::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::InstalledClosedLimitLift::Id: {
+            using TypeInfo = Attributes::InstalledClosedLimitLift::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::InstalledOpenLimitTilt::Id: {
+            using TypeInfo = Attributes::InstalledOpenLimitTilt::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::InstalledClosedLimitTilt::Id: {
+            using TypeInfo = Attributes::InstalledClosedLimitTilt::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::Mode::Id: {
+            using TypeInfo = Attributes::Mode::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue.Raw(), value);
+            return value;
+        }
+        case Attributes::SafetyStatus::Id: {
+            using TypeInfo = Attributes::SafetyStatus::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue.Raw(), value);
+            return value;
+        }
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
                 std::string newElement_0CtorSignature = "(J)V";
                 chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
                     newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
@@ -10289,147 +10415,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::OperationalCredentials::Id: {
-        using namespace app::Clusters::OperationalCredentials;
+    case app::Clusters::BarrierControl::Id: {
+        using namespace app::Clusters::BarrierControl;
         switch (aPath.mAttributeId)
         {
-        case Attributes::NOCs::Id: {
-            using TypeInfo = Attributes::NOCs::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                jobject newElement_0_noc;
-                jbyteArray newElement_0_nocByteArray = env->NewByteArray(static_cast<jsize>(entry_0.noc.size()));
-                env->SetByteArrayRegion(newElement_0_nocByteArray, 0, static_cast<jsize>(entry_0.noc.size()),
-                                        reinterpret_cast<const jbyte *>(entry_0.noc.data()));
-                newElement_0_noc = newElement_0_nocByteArray;
-                jobject newElement_0_icac;
-                if (entry_0.icac.IsNull())
-                {
-                    newElement_0_icac = nullptr;
-                }
-                else
-                {
-                    jbyteArray newElement_0_icacByteArray = env->NewByteArray(static_cast<jsize>(entry_0.icac.Value().size()));
-                    env->SetByteArrayRegion(newElement_0_icacByteArray, 0, static_cast<jsize>(entry_0.icac.Value().size()),
-                                            reinterpret_cast<const jbyte *>(entry_0.icac.Value().data()));
-                    newElement_0_icac = newElement_0_icacByteArray;
-                }
-                jobject newElement_0_fabricIndex;
-                std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
-                std::string newElement_0_fabricIndexCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
-                                                                              newElement_0_fabricIndexCtorSignature.c_str(),
-                                                                              entry_0.fabricIndex, newElement_0_fabricIndex);
-
-                jclass NOCStructStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$OperationalCredentialsClusterNOCStruct", NOCStructStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$OperationalCredentialsClusterNOCStruct");
-                    return nullptr;
-                }
-                jmethodID NOCStructStructCtor = env->GetMethodID(NOCStructStructClass, "<init>", "([B[BLjava/lang/Integer;)V");
-                if (NOCStructStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$OperationalCredentialsClusterNOCStruct constructor");
-                    return nullptr;
-                }
-
-                newElement_0 = env->NewObject(NOCStructStructClass, NOCStructStructCtor, newElement_0_noc, newElement_0_icac,
-                                              newElement_0_fabricIndex);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::Fabrics::Id: {
-            using TypeInfo = Attributes::Fabrics::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                jobject newElement_0_rootPublicKey;
-                jbyteArray newElement_0_rootPublicKeyByteArray =
-                    env->NewByteArray(static_cast<jsize>(entry_0.rootPublicKey.size()));
-                env->SetByteArrayRegion(newElement_0_rootPublicKeyByteArray, 0, static_cast<jsize>(entry_0.rootPublicKey.size()),
-                                        reinterpret_cast<const jbyte *>(entry_0.rootPublicKey.data()));
-                newElement_0_rootPublicKey = newElement_0_rootPublicKeyByteArray;
-                jobject newElement_0_vendorId;
-                std::string newElement_0_vendorIdClassName     = "java/lang/Integer";
-                std::string newElement_0_vendorIdCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-                    newElement_0_vendorIdClassName.c_str(), newElement_0_vendorIdCtorSignature.c_str(),
-                    static_cast<uint16_t>(entry_0.vendorId), newElement_0_vendorId);
-                jobject newElement_0_fabricId;
-                std::string newElement_0_fabricIdClassName     = "java/lang/Long";
-                std::string newElement_0_fabricIdCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_fabricIdClassName.c_str(),
-                                                                               newElement_0_fabricIdCtorSignature.c_str(),
-                                                                               entry_0.fabricId, newElement_0_fabricId);
-                jobject newElement_0_nodeId;
-                std::string newElement_0_nodeIdClassName     = "java/lang/Long";
-                std::string newElement_0_nodeIdCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_nodeIdClassName.c_str(),
-                                                                               newElement_0_nodeIdCtorSignature.c_str(),
-                                                                               entry_0.nodeId, newElement_0_nodeId);
-                jobject newElement_0_label;
-                newElement_0_label = env->NewStringUTF(std::string(entry_0.label.data(), entry_0.label.size()).c_str());
-                jobject newElement_0_fabricIndex;
-                std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
-                std::string newElement_0_fabricIndexCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
-                                                                              newElement_0_fabricIndexCtorSignature.c_str(),
-                                                                              entry_0.fabricIndex, newElement_0_fabricIndex);
-
-                jclass fabricDescriptorStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$OperationalCredentialsClusterFabricDescriptor",
-                    fabricDescriptorStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$OperationalCredentialsClusterFabricDescriptor");
-                    return nullptr;
-                }
-                jmethodID fabricDescriptorStructCtor = env->GetMethodID(
-                    fabricDescriptorStructClass, "<init>",
-                    "([BLjava/lang/Integer;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Integer;)V");
-                if (fabricDescriptorStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$OperationalCredentialsClusterFabricDescriptor constructor");
-                    return nullptr;
-                }
-
-                newElement_0 = env->NewObject(fabricDescriptorStructClass, fabricDescriptorStructCtor, newElement_0_rootPublicKey,
-                                              newElement_0_vendorId, newElement_0_fabricId, newElement_0_nodeId, newElement_0_label,
-                                              newElement_0_fabricIndex);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::SupportedFabrics::Id: {
-            using TypeInfo = Attributes::SupportedFabrics::TypeInfo;
+        case Attributes::BarrierMovingState::Id: {
+            using TypeInfo = Attributes::BarrierMovingState::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10443,8 +10434,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                           cppValue, value);
             return value;
         }
-        case Attributes::CommissionedFabrics::Id: {
-            using TypeInfo = Attributes::CommissionedFabrics::TypeInfo;
+        case Attributes::BarrierSafetyStatus::Id: {
+            using TypeInfo = Attributes::BarrierSafetyStatus::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10454,12 +10445,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::TrustedRootCertificates::Id: {
-            using TypeInfo = Attributes::TrustedRootCertificates::TypeInfo;
+        case Attributes::BarrierCapabilities::Id: {
+            using TypeInfo = Attributes::BarrierCapabilities::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10467,23 +10458,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                jbyteArray newElement_0ByteArray = env->NewByteArray(static_cast<jsize>(entry_0.size()));
-                env->SetByteArrayRegion(newElement_0ByteArray, 0, static_cast<jsize>(entry_0.size()),
-                                        reinterpret_cast<const jbyte *>(entry_0.data()));
-                newElement_0 = newElement_0ByteArray;
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::CurrentFabricIndex::Id: {
-            using TypeInfo = Attributes::CurrentFabricIndex::TypeInfo;
+        case Attributes::BarrierPosition::Id: {
+            using TypeInfo = Attributes::BarrierPosition::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10605,12 +10587,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::PowerSource::Id: {
-        using namespace app::Clusters::PowerSource;
+    case app::Clusters::PumpConfigurationAndControl::Id: {
+        using namespace app::Clusters::PumpConfigurationAndControl;
         switch (aPath.mAttributeId)
         {
-        case Attributes::Status::Id: {
-            using TypeInfo = Attributes::Status::TypeInfo;
+        case Attributes::MaxPressure::Id: {
+            using TypeInfo = Attributes::MaxPressure::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10618,14 +10600,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::Order::Id: {
-            using TypeInfo = Attributes::Order::TypeInfo;
+        case Attributes::MaxSpeed::Id: {
+            using TypeInfo = Attributes::MaxSpeed::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10633,14 +10622,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::Description::Id: {
-            using TypeInfo = Attributes::Description::TypeInfo;
+        case Attributes::MaxFlow::Id: {
+            using TypeInfo = Attributes::MaxFlow::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10648,11 +10644,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::WiredAssessedInputVoltage::Id: {
-            using TypeInfo = Attributes::WiredAssessedInputVoltage::TypeInfo;
+        case Attributes::MinConstPressure::Id: {
+            using TypeInfo = Attributes::MinConstPressure::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10660,14 +10666,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::WiredAssessedInputFrequency::Id: {
-            using TypeInfo = Attributes::WiredAssessedInputFrequency::TypeInfo;
+        case Attributes::MaxConstPressure::Id: {
+            using TypeInfo = Attributes::MaxConstPressure::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10675,14 +10688,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::WiredCurrentType::Id: {
-            using TypeInfo = Attributes::WiredCurrentType::TypeInfo;
+        case Attributes::MinCompPressure::Id: {
+            using TypeInfo = Attributes::MinCompPressure::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10690,29 +10710,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
-            return value;
-        }
-        case Attributes::WiredAssessedCurrent::Id: {
-            using TypeInfo = Attributes::WiredAssessedCurrent::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            if (cppValue.IsNull())
             {
-                return nullptr;
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
             }
-            jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
             return value;
         }
-        case Attributes::WiredNominalVoltage::Id: {
-            using TypeInfo = Attributes::WiredNominalVoltage::TypeInfo;
+        case Attributes::MaxCompPressure::Id: {
+            using TypeInfo = Attributes::MaxCompPressure::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10720,14 +10732,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::WiredMaximumCurrent::Id: {
-            using TypeInfo = Attributes::WiredMaximumCurrent::TypeInfo;
+        case Attributes::MinConstSpeed::Id: {
+            using TypeInfo = Attributes::MinConstSpeed::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10735,14 +10754,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::WiredPresent::Id: {
-            using TypeInfo = Attributes::WiredPresent::TypeInfo;
+        case Attributes::MaxConstSpeed::Id: {
+            using TypeInfo = Attributes::MaxConstSpeed::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10750,14 +10776,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
-                                                                       value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::ActiveWiredFaults::Id: {
-            using TypeInfo = Attributes::ActiveWiredFaults::TypeInfo;
+        case Attributes::MinConstFlow::Id: {
+            using TypeInfo = Attributes::MinConstFlow::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10765,23 +10798,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Integer";
-                std::string newElement_0CtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::BatteryVoltage::Id: {
-            using TypeInfo = Attributes::BatteryVoltage::TypeInfo;
+        case Attributes::MaxConstFlow::Id: {
+            using TypeInfo = Attributes::MaxConstFlow::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10789,14 +10820,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::BatteryPercentRemaining::Id: {
-            using TypeInfo = Attributes::BatteryPercentRemaining::TypeInfo;
+        case Attributes::MinConstTemp::Id: {
+            using TypeInfo = Attributes::MinConstTemp::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10804,14 +10842,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::BatteryTimeRemaining::Id: {
-            using TypeInfo = Attributes::BatteryTimeRemaining::TypeInfo;
+        case Attributes::MaxConstTemp::Id: {
+            using TypeInfo = Attributes::MaxConstTemp::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10819,14 +10864,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::BatteryChargeLevel::Id: {
-            using TypeInfo = Attributes::BatteryChargeLevel::TypeInfo;
+        case Attributes::PumpStatus::Id: {
+            using TypeInfo = Attributes::PumpStatus::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10836,12 +10888,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue.Raw(), value);
             return value;
         }
-        case Attributes::BatteryReplacementNeeded::Id: {
-            using TypeInfo = Attributes::BatteryReplacementNeeded::TypeInfo;
+        case Attributes::EffectiveOperationMode::Id: {
+            using TypeInfo = Attributes::EffectiveOperationMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10849,14 +10901,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
-                                                                       value);
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          static_cast<uint8_t>(cppValue), value);
             return value;
         }
-        case Attributes::BatteryReplaceability::Id: {
-            using TypeInfo = Attributes::BatteryReplaceability::TypeInfo;
+        case Attributes::EffectiveControlMode::Id: {
+            using TypeInfo = Attributes::EffectiveControlMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10867,11 +10919,11 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
             chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+                                                                          static_cast<uint8_t>(cppValue), value);
             return value;
         }
-        case Attributes::BatteryPresent::Id: {
-            using TypeInfo = Attributes::BatteryPresent::TypeInfo;
+        case Attributes::Capacity::Id: {
+            using TypeInfo = Attributes::Capacity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10879,14 +10931,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
-                                                                       value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::ActiveBatteryFaults::Id: {
-            using TypeInfo = Attributes::ActiveBatteryFaults::TypeInfo;
+        case Attributes::Speed::Id: {
+            using TypeInfo = Attributes::Speed::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10894,23 +10953,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Integer";
-                std::string newElement_0CtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::BatteryReplacementDescription::Id: {
-            using TypeInfo = Attributes::BatteryReplacementDescription::TypeInfo;
+        case Attributes::LifetimeRunningHours::Id: {
+            using TypeInfo = Attributes::LifetimeRunningHours::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10918,11 +10975,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::BatteryCommonDesignation::Id: {
-            using TypeInfo = Attributes::BatteryCommonDesignation::TypeInfo;
+        case Attributes::Power::Id: {
+            using TypeInfo = Attributes::Power::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10930,38 +10997,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        case Attributes::BatteryANSIDesignation::Id: {
-            using TypeInfo = Attributes::BatteryANSIDesignation::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            if (cppValue.IsNull())
             {
-                return nullptr;
+                value = nullptr;
             }
-            jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
-            return value;
-        }
-        case Attributes::BatteryIECDesignation::Id: {
-            using TypeInfo = Attributes::BatteryIECDesignation::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            else
             {
-                return nullptr;
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
             }
-            jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
             return value;
         }
-        case Attributes::BatteryApprovedChemistry::Id: {
-            using TypeInfo = Attributes::BatteryApprovedChemistry::TypeInfo;
+        case Attributes::LifetimeEnergyConsumed::Id: {
+            using TypeInfo = Attributes::LifetimeEnergyConsumed::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -10969,29 +11019,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        case Attributes::BatteryCapacity::Id: {
-            using TypeInfo = Attributes::BatteryCapacity::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            if (cppValue.IsNull())
             {
-                return nullptr;
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
             }
-            jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
             return value;
         }
-        case Attributes::BatteryQuantity::Id: {
-            using TypeInfo = Attributes::BatteryQuantity::TypeInfo;
+        case Attributes::OperationMode::Id: {
+            using TypeInfo = Attributes::OperationMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11002,11 +11044,11 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
             chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+                                                                          static_cast<uint8_t>(cppValue), value);
             return value;
         }
-        case Attributes::BatteryChargeState::Id: {
-            using TypeInfo = Attributes::BatteryChargeState::TypeInfo;
+        case Attributes::ControlMode::Id: {
+            using TypeInfo = Attributes::ControlMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11017,76 +11059,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
             chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
-            return value;
-        }
-        case Attributes::BatteryTimeToFullCharge::Id: {
-            using TypeInfo = Attributes::BatteryTimeToFullCharge::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        case Attributes::BatteryFunctionalWhileCharging::Id: {
-            using TypeInfo = Attributes::BatteryFunctionalWhileCharging::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
-                                                                       value);
-            return value;
-        }
-        case Attributes::BatteryChargingCurrent::Id: {
-            using TypeInfo = Attributes::BatteryChargingCurrent::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        case Attributes::ActiveBatteryChargeFaults::Id: {
-            using TypeInfo = Attributes::ActiveBatteryChargeFaults::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Integer";
-                std::string newElement_0CtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+                                                                          static_cast<uint8_t>(cppValue), value);
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -11197,12 +11170,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::PowerSourceConfiguration::Id: {
-        using namespace app::Clusters::PowerSourceConfiguration;
+    case app::Clusters::Thermostat::Id: {
+        using namespace app::Clusters::Thermostat;
         switch (aPath.mAttributeId)
         {
-        case Attributes::Sources::Id: {
-            using TypeInfo = Attributes::Sources::TypeInfo;
+        case Attributes::LocalTemperature::Id: {
+            using TypeInfo = Attributes::LocalTemperature::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11210,23 +11183,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Integer";
-                std::string newElement_0CtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::AbsMinHeatSetpointLimit::Id: {
+            using TypeInfo = Attributes::AbsMinHeatSetpointLimit::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11234,23 +11205,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::AbsMaxHeatSetpointLimit::Id: {
+            using TypeInfo = Attributes::AbsMaxHeatSetpointLimit::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11258,23 +11220,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::AbsMinCoolSetpointLimit::Id: {
+            using TypeInfo = Attributes::AbsMinCoolSetpointLimit::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11282,23 +11235,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::AbsMaxCoolSetpointLimit::Id: {
+            using TypeInfo = Attributes::AbsMaxCoolSetpointLimit::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11306,14 +11250,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::OccupiedCoolingSetpoint::Id: {
+            using TypeInfo = Attributes::OccupiedCoolingSetpoint::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11323,22 +11267,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::PressureMeasurement::Id: {
-        using namespace app::Clusters::PressureMeasurement;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::MeasuredValue::Id: {
-            using TypeInfo = Attributes::MeasuredValue::TypeInfo;
+        case Attributes::OccupiedHeatingSetpoint::Id: {
+            using TypeInfo = Attributes::OccupiedHeatingSetpoint::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11346,21 +11280,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::MinMeasuredValue::Id: {
-            using TypeInfo = Attributes::MinMeasuredValue::TypeInfo;
+        case Attributes::MinHeatSetpointLimit::Id: {
+            using TypeInfo = Attributes::MinHeatSetpointLimit::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11368,21 +11295,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::MaxMeasuredValue::Id: {
-            using TypeInfo = Attributes::MaxMeasuredValue::TypeInfo;
+        case Attributes::MaxHeatSetpointLimit::Id: {
+            using TypeInfo = Attributes::MaxHeatSetpointLimit::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11390,21 +11310,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::Tolerance::Id: {
-            using TypeInfo = Attributes::Tolerance::TypeInfo;
+        case Attributes::MinCoolSetpointLimit::Id: {
+            using TypeInfo = Attributes::MinCoolSetpointLimit::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11414,12 +11327,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::ScaledValue::Id: {
-            using TypeInfo = Attributes::ScaledValue::TypeInfo;
+        case Attributes::MaxCoolSetpointLimit::Id: {
+            using TypeInfo = Attributes::MaxCoolSetpointLimit::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11427,21 +11340,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::MinScaledValue::Id: {
-            using TypeInfo = Attributes::MinScaledValue::TypeInfo;
+        case Attributes::MinSetpointDeadBand::Id: {
+            using TypeInfo = Attributes::MinSetpointDeadBand::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11449,21 +11355,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                         cppValue, value);
             return value;
         }
-        case Attributes::MaxScaledValue::Id: {
-            using TypeInfo = Attributes::MaxScaledValue::TypeInfo;
+        case Attributes::ControlSequenceOfOperation::Id: {
+            using TypeInfo = Attributes::ControlSequenceOfOperation::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11471,21 +11370,44 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          static_cast<uint8_t>(cppValue), value);
+            return value;
+        }
+        case Attributes::SystemMode::Id: {
+            using TypeInfo = Attributes::SystemMode::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                value = nullptr;
+                return nullptr;
             }
-            else
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
+            return value;
+        }
+        case Attributes::StartOfWeek::Id: {
+            using TypeInfo = Attributes::StartOfWeek::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::ScaledTolerance::Id: {
-            using TypeInfo = Attributes::ScaledTolerance::TypeInfo;
+        case Attributes::NumberOfWeeklyTransitions::Id: {
+            using TypeInfo = Attributes::NumberOfWeeklyTransitions::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11495,12 +11417,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::Scale::Id: {
-            using TypeInfo = Attributes::Scale::TypeInfo;
+        case Attributes::NumberOfDailyTransitions::Id: {
+            using TypeInfo = Attributes::NumberOfDailyTransitions::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11510,8 +11432,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                         cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
         case Attributes::AttributeList::Id: {
@@ -11574,12 +11496,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::PumpConfigurationAndControl::Id: {
-        using namespace app::Clusters::PumpConfigurationAndControl;
+    case app::Clusters::FanControl::Id: {
+        using namespace app::Clusters::FanControl;
         switch (aPath.mAttributeId)
         {
-        case Attributes::MaxPressure::Id: {
-            using TypeInfo = Attributes::MaxPressure::TypeInfo;
+        case Attributes::FanMode::Id: {
+            using TypeInfo = Attributes::FanMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11587,21 +11509,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          static_cast<uint8_t>(cppValue), value);
             return value;
         }
-        case Attributes::MaxSpeed::Id: {
-            using TypeInfo = Attributes::MaxSpeed::TypeInfo;
+        case Attributes::FanModeSequence::Id: {
+            using TypeInfo = Attributes::FanModeSequence::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11609,21 +11524,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          static_cast<uint8_t>(cppValue), value);
             return value;
         }
-        case Attributes::MaxFlow::Id: {
-            using TypeInfo = Attributes::MaxFlow::TypeInfo;
+        case Attributes::PercentSetting::Id: {
+            using TypeInfo = Attributes::PercentSetting::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11639,13 +11547,13 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 std::string valueClassName     = "java/lang/Integer";
                 std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::MinConstPressure::Id: {
-            using TypeInfo = Attributes::MinConstPressure::TypeInfo;
+        case Attributes::PercentCurrent::Id: {
+            using TypeInfo = Attributes::PercentCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11653,21 +11561,29 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
+            return value;
+        }
+        case Attributes::SpeedMax::Id: {
+            using TypeInfo = Attributes::SpeedMax::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::MaxConstPressure::Id: {
-            using TypeInfo = Attributes::MaxConstPressure::TypeInfo;
+        case Attributes::SpeedSetting::Id: {
+            using TypeInfo = Attributes::SpeedSetting::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11683,13 +11599,13 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 std::string valueClassName     = "java/lang/Integer";
                 std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                               cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::MinCompPressure::Id: {
-            using TypeInfo = Attributes::MinCompPressure::TypeInfo;
+        case Attributes::SpeedCurrent::Id: {
+            using TypeInfo = Attributes::SpeedCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11697,21 +11613,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::MaxCompPressure::Id: {
-            using TypeInfo = Attributes::MaxCompPressure::TypeInfo;
+        case Attributes::RockSupport::Id: {
+            using TypeInfo = Attributes::RockSupport::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11719,21 +11628,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::MinConstSpeed::Id: {
-            using TypeInfo = Attributes::MinConstSpeed::TypeInfo;
+        case Attributes::RockSetting::Id: {
+            using TypeInfo = Attributes::RockSetting::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11741,21 +11643,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::MaxConstSpeed::Id: {
-            using TypeInfo = Attributes::MaxConstSpeed::TypeInfo;
+        case Attributes::WindSupport::Id: {
+            using TypeInfo = Attributes::WindSupport::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11763,21 +11658,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::MinConstFlow::Id: {
-            using TypeInfo = Attributes::MinConstFlow::TypeInfo;
+        case Attributes::WindSetting::Id: {
+            using TypeInfo = Attributes::WindSetting::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11785,21 +11673,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::MaxConstFlow::Id: {
-            using TypeInfo = Attributes::MaxConstFlow::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11807,21 +11688,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::MinConstTemp::Id: {
-            using TypeInfo = Attributes::MinConstTemp::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11829,21 +11712,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::MaxConstTemp::Id: {
-            using TypeInfo = Attributes::MaxConstTemp::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11851,21 +11736,38 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                value = nullptr;
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
-            else
+            return value;
+        }
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::PumpStatus::Id: {
-            using TypeInfo = Attributes::PumpStatus::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11876,11 +11778,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
             chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue.Raw(), value);
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::EffectiveOperationMode::Id: {
-            using TypeInfo = Attributes::EffectiveOperationMode::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::ThermostatUserInterfaceConfiguration::Id: {
+        using namespace app::Clusters::ThermostatUserInterfaceConfiguration;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::TemperatureDisplayMode::Id: {
+            using TypeInfo = Attributes::TemperatureDisplayMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11891,11 +11803,11 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
             chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          static_cast<uint8_t>(cppValue), value);
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::EffectiveControlMode::Id: {
-            using TypeInfo = Attributes::EffectiveControlMode::TypeInfo;
+        case Attributes::KeypadLockout::Id: {
+            using TypeInfo = Attributes::KeypadLockout::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11906,11 +11818,11 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
             chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          static_cast<uint8_t>(cppValue), value);
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::Capacity::Id: {
-            using TypeInfo = Attributes::Capacity::TypeInfo;
+        case Attributes::ScheduleProgrammingVisibility::Id: {
+            using TypeInfo = Attributes::ScheduleProgrammingVisibility::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11918,21 +11830,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::Speed::Id: {
-            using TypeInfo = Attributes::Speed::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11940,21 +11845,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::LifetimeRunningHours::Id: {
-            using TypeInfo = Attributes::LifetimeRunningHours::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11962,21 +11869,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Long";
-                std::string valueCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::Power::Id: {
-            using TypeInfo = Attributes::Power::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -11984,21 +11893,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Long";
-                std::string valueCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::LifetimeEnergyConsumed::Id: {
-            using TypeInfo = Attributes::LifetimeEnergyConsumed::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12006,21 +11917,39 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                std::string valueClassName     = "java/lang/Long";
-                std::string valueCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::OperationMode::Id: {
-            using TypeInfo = Attributes::OperationMode::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::ColorControl::Id: {
+        using namespace app::Clusters::ColorControl;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::CurrentHue::Id: {
+            using TypeInfo = Attributes::CurrentHue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12031,11 +11960,11 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
             chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          static_cast<uint8_t>(cppValue), value);
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::ControlMode::Id: {
-            using TypeInfo = Attributes::ControlMode::TypeInfo;
+        case Attributes::CurrentSaturation::Id: {
+            using TypeInfo = Attributes::CurrentSaturation::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12046,11 +11975,11 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
             chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          static_cast<uint8_t>(cppValue), value);
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::RemainingTime::Id: {
+            using TypeInfo = Attributes::RemainingTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12058,23 +11987,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::CurrentX::Id: {
+            using TypeInfo = Attributes::CurrentX::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12082,23 +12002,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::CurrentY::Id: {
+            using TypeInfo = Attributes::CurrentY::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12106,23 +12017,29 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::DriftCompensation::Id: {
+            using TypeInfo = Attributes::DriftCompensation::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::CompensationText::Id: {
+            using TypeInfo = Attributes::CompensationText::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12130,14 +12047,11 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::ColorTemperature::Id: {
+            using TypeInfo = Attributes::ColorTemperature::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12151,18 +12065,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::RelativeHumidityMeasurement::Id: {
-        using namespace app::Clusters::RelativeHumidityMeasurement;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::MeasuredValue::Id: {
-            using TypeInfo = Attributes::MeasuredValue::TypeInfo;
+        case Attributes::ColorMode::Id: {
+            using TypeInfo = Attributes::ColorMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12170,21 +12074,29 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
+            return value;
+        }
+        case Attributes::Options::Id: {
+            using TypeInfo = Attributes::Options::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::MinMeasuredValue::Id: {
-            using TypeInfo = Attributes::MinMeasuredValue::TypeInfo;
+        case Attributes::NumberOfPrimaries::Id: {
+            using TypeInfo = Attributes::NumberOfPrimaries::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12200,13 +12112,13 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 std::string valueClassName     = "java/lang/Integer";
                 std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::MaxMeasuredValue::Id: {
-            using TypeInfo = Attributes::MaxMeasuredValue::TypeInfo;
+        case Attributes::Primary1X::Id: {
+            using TypeInfo = Attributes::Primary1X::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12214,21 +12126,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::Tolerance::Id: {
-            using TypeInfo = Attributes::Tolerance::TypeInfo;
+        case Attributes::Primary1Y::Id: {
+            using TypeInfo = Attributes::Primary1Y::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12242,8 +12147,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::Primary1Intensity::Id: {
+            using TypeInfo = Attributes::Primary1Intensity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12251,23 +12156,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::Primary2X::Id: {
+            using TypeInfo = Attributes::Primary2X::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12275,23 +12178,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::Primary2Y::Id: {
+            using TypeInfo = Attributes::Primary2Y::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12299,23 +12193,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::Primary2Intensity::Id: {
+            using TypeInfo = Attributes::Primary2Intensity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12323,14 +12208,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::Primary3X::Id: {
+            using TypeInfo = Attributes::Primary3X::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12344,18 +12236,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::Scenes::Id: {
-        using namespace app::Clusters::Scenes;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::SceneCount::Id: {
-            using TypeInfo = Attributes::SceneCount::TypeInfo;
+        case Attributes::Primary3Y::Id: {
+            using TypeInfo = Attributes::Primary3Y::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12365,12 +12247,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::CurrentScene::Id: {
-            using TypeInfo = Attributes::CurrentScene::TypeInfo;
+        case Attributes::Primary3Intensity::Id: {
+            using TypeInfo = Attributes::Primary3Intensity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12378,14 +12260,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::CurrentGroup::Id: {
-            using TypeInfo = Attributes::CurrentGroup::TypeInfo;
+        case Attributes::Primary4X::Id: {
+            using TypeInfo = Attributes::Primary4X::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12399,8 +12288,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::SceneValid::Id: {
-            using TypeInfo = Attributes::SceneValid::TypeInfo;
+        case Attributes::Primary4Y::Id: {
+            using TypeInfo = Attributes::Primary4Y::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12408,14 +12297,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
-                                                                       value);
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::NameSupport::Id: {
-            using TypeInfo = Attributes::NameSupport::TypeInfo;
+        case Attributes::Primary4Intensity::Id: {
+            using TypeInfo = Attributes::Primary4Intensity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12423,14 +12312,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::Primary5X::Id: {
+            using TypeInfo = Attributes::Primary5X::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12438,23 +12334,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::Primary5Y::Id: {
+            using TypeInfo = Attributes::Primary5Y::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12462,23 +12349,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::Primary5Intensity::Id: {
+            using TypeInfo = Attributes::Primary5Intensity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12486,23 +12364,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::Primary6X::Id: {
+            using TypeInfo = Attributes::Primary6X::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12510,14 +12386,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::Primary6Y::Id: {
+            using TypeInfo = Attributes::Primary6Y::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12531,18 +12407,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::SoftwareDiagnostics::Id: {
-        using namespace app::Clusters::SoftwareDiagnostics;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::ThreadMetrics::Id: {
-            using TypeInfo = Attributes::ThreadMetrics::TypeInfo;
+        case Attributes::Primary6Intensity::Id: {
+            using TypeInfo = Attributes::Primary6Intensity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12550,106 +12416,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                jobject newElement_0_id;
-                std::string newElement_0_idClassName     = "java/lang/Long";
-                std::string newElement_0_idCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(
-                    newElement_0_idClassName.c_str(), newElement_0_idCtorSignature.c_str(), entry_0.id, newElement_0_id);
-                jobject newElement_0_name;
-                if (!entry_0.name.HasValue())
-                {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_name);
-                }
-                else
-                {
-                    jobject newElement_0_nameInsideOptional;
-                    newElement_0_nameInsideOptional =
-                        env->NewStringUTF(std::string(entry_0.name.Value().data(), entry_0.name.Value().size()).c_str());
-                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_nameInsideOptional, newElement_0_name);
-                }
-                jobject newElement_0_stackFreeCurrent;
-                if (!entry_0.stackFreeCurrent.HasValue())
-                {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_stackFreeCurrent);
-                }
-                else
-                {
-                    jobject newElement_0_stackFreeCurrentInsideOptional;
-                    std::string newElement_0_stackFreeCurrentInsideOptionalClassName     = "java/lang/Long";
-                    std::string newElement_0_stackFreeCurrentInsideOptionalCtorSignature = "(J)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                        newElement_0_stackFreeCurrentInsideOptionalClassName.c_str(),
-                        newElement_0_stackFreeCurrentInsideOptionalCtorSignature.c_str(), entry_0.stackFreeCurrent.Value(),
-                        newElement_0_stackFreeCurrentInsideOptional);
-                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_stackFreeCurrentInsideOptional,
-                                                                      newElement_0_stackFreeCurrent);
-                }
-                jobject newElement_0_stackFreeMinimum;
-                if (!entry_0.stackFreeMinimum.HasValue())
-                {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_stackFreeMinimum);
-                }
-                else
-                {
-                    jobject newElement_0_stackFreeMinimumInsideOptional;
-                    std::string newElement_0_stackFreeMinimumInsideOptionalClassName     = "java/lang/Long";
-                    std::string newElement_0_stackFreeMinimumInsideOptionalCtorSignature = "(J)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                        newElement_0_stackFreeMinimumInsideOptionalClassName.c_str(),
-                        newElement_0_stackFreeMinimumInsideOptionalCtorSignature.c_str(), entry_0.stackFreeMinimum.Value(),
-                        newElement_0_stackFreeMinimumInsideOptional);
-                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_stackFreeMinimumInsideOptional,
-                                                                      newElement_0_stackFreeMinimum);
-                }
-                jobject newElement_0_stackSize;
-                if (!entry_0.stackSize.HasValue())
-                {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_stackSize);
-                }
-                else
-                {
-                    jobject newElement_0_stackSizeInsideOptional;
-                    std::string newElement_0_stackSizeInsideOptionalClassName     = "java/lang/Long";
-                    std::string newElement_0_stackSizeInsideOptionalCtorSignature = "(J)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                        newElement_0_stackSizeInsideOptionalClassName.c_str(),
-                        newElement_0_stackSizeInsideOptionalCtorSignature.c_str(), entry_0.stackSize.Value(),
-                        newElement_0_stackSizeInsideOptional);
-                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_stackSizeInsideOptional, newElement_0_stackSize);
-                }
-
-                jclass threadMetricsStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$SoftwareDiagnosticsClusterThreadMetrics", threadMetricsStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$SoftwareDiagnosticsClusterThreadMetrics");
-                    return nullptr;
-                }
-                jmethodID threadMetricsStructCtor = env->GetMethodID(
-                    threadMetricsStructClass, "<init>",
-                    "(Ljava/lang/Long;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V");
-                if (threadMetricsStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$SoftwareDiagnosticsClusterThreadMetrics constructor");
-                    return nullptr;
-                }
-
-                newElement_0 = env->NewObject(threadMetricsStructClass, threadMetricsStructCtor, newElement_0_id, newElement_0_name,
-                                              newElement_0_stackFreeCurrent, newElement_0_stackFreeMinimum, newElement_0_stackSize);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::CurrentHeapFree::Id: {
-            using TypeInfo = Attributes::CurrentHeapFree::TypeInfo;
+        case Attributes::WhitePointX::Id: {
+            using TypeInfo = Attributes::WhitePointX::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12657,14 +12438,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::CurrentHeapUsed::Id: {
-            using TypeInfo = Attributes::CurrentHeapUsed::TypeInfo;
+        case Attributes::WhitePointY::Id: {
+            using TypeInfo = Attributes::WhitePointY::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12672,14 +12453,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::CurrentHeapHighWatermark::Id: {
-            using TypeInfo = Attributes::CurrentHeapHighWatermark::TypeInfo;
+        case Attributes::ColorPointRX::Id: {
+            using TypeInfo = Attributes::ColorPointRX::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12687,14 +12468,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::ColorPointRY::Id: {
+            using TypeInfo = Attributes::ColorPointRY::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12702,23 +12483,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::ColorPointRIntensity::Id: {
+            using TypeInfo = Attributes::ColorPointRIntensity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12726,47 +12498,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            if (cppValue.IsNull())
             {
-                return nullptr;
+                value = nullptr;
             }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            else
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::ColorPointGX::Id: {
+            using TypeInfo = Attributes::ColorPointGX::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12774,14 +12520,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::ColorPointGY::Id: {
+            using TypeInfo = Attributes::ColorPointGY::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12795,18 +12541,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::Switch::Id: {
-        using namespace app::Clusters::Switch;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::NumberOfPositions::Id: {
-            using TypeInfo = Attributes::NumberOfPositions::TypeInfo;
+        case Attributes::ColorPointGIntensity::Id: {
+            using TypeInfo = Attributes::ColorPointGIntensity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12814,14 +12550,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::CurrentPosition::Id: {
-            using TypeInfo = Attributes::CurrentPosition::TypeInfo;
+        case Attributes::ColorPointBX::Id: {
+            using TypeInfo = Attributes::ColorPointBX::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12831,12 +12574,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::MultiPressMax::Id: {
-            using TypeInfo = Attributes::MultiPressMax::TypeInfo;
+        case Attributes::ColorPointBY::Id: {
+            using TypeInfo = Attributes::ColorPointBY::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12846,12 +12589,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::ColorPointBIntensity::Id: {
+            using TypeInfo = Attributes::ColorPointBIntensity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12859,23 +12602,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::EnhancedCurrentHue::Id: {
+            using TypeInfo = Attributes::EnhancedCurrentHue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12883,23 +12624,29 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::EnhancedColorMode::Id: {
+            using TypeInfo = Attributes::EnhancedColorMode::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::ColorLoopActive::Id: {
+            using TypeInfo = Attributes::ColorLoopActive::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12907,23 +12654,29 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
+            return value;
+        }
+        case Attributes::ColorLoopDirection::Id: {
+            using TypeInfo = Attributes::ColorLoopDirection::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::ColorLoopTime::Id: {
+            using TypeInfo = Attributes::ColorLoopTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12931,14 +12684,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::ColorLoopStartEnhancedHue::Id: {
+            using TypeInfo = Attributes::ColorLoopStartEnhancedHue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12952,18 +12705,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
+        case Attributes::ColorLoopStoredEnhancedHue::Id: {
+            using TypeInfo = Attributes::ColorLoopStoredEnhancedHue::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
         }
-        break;
-    }
-    case app::Clusters::TargetNavigator::Id: {
-        using namespace app::Clusters::TargetNavigator;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::TargetList::Id: {
-            using TypeInfo = Attributes::TargetList::TypeInfo;
+        case Attributes::ColorCapabilities::Id: {
+            using TypeInfo = Attributes::ColorCapabilities::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12971,46 +12729,29 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::ColorTempPhysicalMinMireds::Id: {
+            using TypeInfo = Attributes::ColorTempPhysicalMinMireds::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                jobject newElement_0_identifier;
-                std::string newElement_0_identifierClassName     = "java/lang/Integer";
-                std::string newElement_0_identifierCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_identifierClassName.c_str(),
-                                                                              newElement_0_identifierCtorSignature.c_str(),
-                                                                              entry_0.identifier, newElement_0_identifier);
-                jobject newElement_0_name;
-                newElement_0_name = env->NewStringUTF(std::string(entry_0.name.data(), entry_0.name.size()).c_str());
-
-                jclass targetInfoStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$TargetNavigatorClusterTargetInfo", targetInfoStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$TargetNavigatorClusterTargetInfo");
-                    return nullptr;
-                }
-                jmethodID targetInfoStructCtor =
-                    env->GetMethodID(targetInfoStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/String;)V");
-                if (targetInfoStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$TargetNavigatorClusterTargetInfo constructor");
-                    return nullptr;
-                }
-
-                newElement_0 =
-                    env->NewObject(targetInfoStructClass, targetInfoStructCtor, newElement_0_identifier, newElement_0_name);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::CurrentTarget::Id: {
-            using TypeInfo = Attributes::CurrentTarget::TypeInfo;
+        case Attributes::ColorTempPhysicalMaxMireds::Id: {
+            using TypeInfo = Attributes::ColorTempPhysicalMaxMireds::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13020,8 +12761,38 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::CoupleColorTempToLevelMinMireds::Id: {
+            using TypeInfo = Attributes::CoupleColorTempToLevelMinMireds::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::StartUpColorTemperatureMireds::Id: {
+            using TypeInfo = Attributes::StartUpColorTemperatureMireds::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -13132,8 +12903,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::TemperatureMeasurement::Id: {
-        using namespace app::Clusters::TemperatureMeasurement;
+    case app::Clusters::IlluminanceMeasurement::Id: {
+        using namespace app::Clusters::IlluminanceMeasurement;
         switch (aPath.mAttributeId)
         {
         case Attributes::MeasuredValue::Id: {
@@ -13153,8 +12924,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 std::string valueClassName     = "java/lang/Integer";
                 std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
             }
             return value;
         }
@@ -13175,8 +12946,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 std::string valueClassName     = "java/lang/Integer";
                 std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
             }
             return value;
         }
@@ -13197,8 +12968,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 std::string valueClassName     = "java/lang/Integer";
                 std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
             }
             return value;
         }
@@ -13217,8 +12988,30 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::LightSensorType::Id: {
+            using TypeInfo = Attributes::LightSensorType::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
+            return value;
+        }
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13241,8 +13034,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13250,14 +13043,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13265,24 +13067,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::TestCluster::Id: {
-        using namespace app::Clusters::TestCluster;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::Boolean::Id: {
-            using TypeInfo = Attributes::Boolean::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13290,14 +13091,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
-                                                                       value);
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::Bitmap8::Id: {
-            using TypeInfo = Attributes::Bitmap8::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13307,12 +13108,22 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue.Raw(), value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::Bitmap16::Id: {
-            using TypeInfo = Attributes::Bitmap16::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::TemperatureMeasurement::Id: {
+        using namespace app::Clusters::TemperatureMeasurement;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::MeasuredValue::Id: {
+            using TypeInfo = Attributes::MeasuredValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13320,14 +13131,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue.Raw(), value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::Bitmap32::Id: {
-            using TypeInfo = Attributes::Bitmap32::TypeInfo;
+        case Attributes::MinMeasuredValue::Id: {
+            using TypeInfo = Attributes::MinMeasuredValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13335,14 +13153,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue.Raw(), value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::Bitmap64::Id: {
-            using TypeInfo = Attributes::Bitmap64::TypeInfo;
+        case Attributes::MaxMeasuredValue::Id: {
+            using TypeInfo = Attributes::MaxMeasuredValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13350,14 +13175,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue.Raw(), value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::Int8u::Id: {
-            using TypeInfo = Attributes::Int8u::TypeInfo;
+        case Attributes::Tolerance::Id: {
+            using TypeInfo = Attributes::Tolerance::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13367,12 +13199,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::Int16u::Id: {
-            using TypeInfo = Attributes::Int16u::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13380,14 +13212,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::Int24u::Id: {
-            using TypeInfo = Attributes::Int24u::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13401,8 +13242,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::Int32u::Id: {
-            using TypeInfo = Attributes::Int32u::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13410,14 +13251,24 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::Int40u::Id: {
-            using TypeInfo = Attributes::Int40u::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::PressureMeasurement::Id: {
+        using namespace app::Clusters::PressureMeasurement;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::MeasuredValue::Id: {
+            using TypeInfo = Attributes::MeasuredValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13425,14 +13276,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::Int48u::Id: {
-            using TypeInfo = Attributes::Int48u::TypeInfo;
+        case Attributes::MinMeasuredValue::Id: {
+            using TypeInfo = Attributes::MinMeasuredValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13440,14 +13298,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::Int56u::Id: {
-            using TypeInfo = Attributes::Int56u::TypeInfo;
+        case Attributes::MaxMeasuredValue::Id: {
+            using TypeInfo = Attributes::MaxMeasuredValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13455,14 +13320,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::Int64u::Id: {
-            using TypeInfo = Attributes::Int64u::TypeInfo;
+        case Attributes::Tolerance::Id: {
+            using TypeInfo = Attributes::Tolerance::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13470,14 +13342,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::Int8s::Id: {
-            using TypeInfo = Attributes::Int8s::TypeInfo;
+        case Attributes::ScaledValue::Id: {
+            using TypeInfo = Attributes::ScaledValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13485,29 +13357,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                         cppValue, value);
-            return value;
-        }
-        case Attributes::Int16s::Id: {
-            using TypeInfo = Attributes::Int16s::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            if (cppValue.IsNull())
             {
-                return nullptr;
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
             }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
             return value;
         }
-        case Attributes::Int24s::Id: {
-            using TypeInfo = Attributes::Int24s::TypeInfo;
+        case Attributes::MinScaledValue::Id: {
+            using TypeInfo = Attributes::MinScaledValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13515,14 +13379,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::Int32s::Id: {
-            using TypeInfo = Attributes::Int32s::TypeInfo;
+        case Attributes::MaxScaledValue::Id: {
+            using TypeInfo = Attributes::MaxScaledValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13530,14 +13401,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::Int40s::Id: {
-            using TypeInfo = Attributes::Int40s::TypeInfo;
+        case Attributes::ScaledTolerance::Id: {
+            using TypeInfo = Attributes::ScaledTolerance::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13545,14 +13423,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::Int48s::Id: {
-            using TypeInfo = Attributes::Int48s::TypeInfo;
+        case Attributes::Scale::Id: {
+            using TypeInfo = Attributes::Scale::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13560,14 +13438,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                         cppValue, value);
             return value;
         }
-        case Attributes::Int56s::Id: {
-            using TypeInfo = Attributes::Int56s::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13575,14 +13453,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::Int64s::Id: {
-            using TypeInfo = Attributes::Int64s::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13592,12 +13479,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Long";
             std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::Enum8::Id: {
-            using TypeInfo = Attributes::Enum8::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13607,12 +13494,22 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::Enum16::Id: {
-            using TypeInfo = Attributes::Enum16::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::FlowMeasurement::Id: {
+        using namespace app::Clusters::FlowMeasurement;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::MeasuredValue::Id: {
+            using TypeInfo = Attributes::MeasuredValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13620,14 +13517,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::FloatSingle::Id: {
-            using TypeInfo = Attributes::FloatSingle::TypeInfo;
+        case Attributes::MinMeasuredValue::Id: {
+            using TypeInfo = Attributes::MinMeasuredValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13635,14 +13539,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Float";
-            std::string valueCtorSignature = "(F)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<float>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                        cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::FloatDouble::Id: {
-            using TypeInfo = Attributes::FloatDouble::TypeInfo;
+        case Attributes::MaxMeasuredValue::Id: {
+            using TypeInfo = Attributes::MaxMeasuredValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13650,14 +13561,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Double";
-            std::string valueCtorSignature = "(D)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<double>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                         cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::OctetString::Id: {
-            using TypeInfo = Attributes::OctetString::TypeInfo;
+        case Attributes::Tolerance::Id: {
+            using TypeInfo = Attributes::Tolerance::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13665,14 +13583,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            jbyteArray valueByteArray = env->NewByteArray(static_cast<jsize>(cppValue.size()));
-            env->SetByteArrayRegion(valueByteArray, 0, static_cast<jsize>(cppValue.size()),
-                                    reinterpret_cast<const jbyte *>(cppValue.data()));
-            value = valueByteArray;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::ListInt8u::Id: {
-            using TypeInfo = Attributes::ListInt8u::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13687,16 +13605,16 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 auto & entry_0 = iter_value_0.GetValue();
                 jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Integer";
-                std::string newElement_0CtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
                     newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
                 chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::ListOctetString::Id: {
-            using TypeInfo = Attributes::ListOctetString::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13711,16 +13629,16 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 auto & entry_0 = iter_value_0.GetValue();
                 jobject newElement_0;
-                jbyteArray newElement_0ByteArray = env->NewByteArray(static_cast<jsize>(entry_0.size()));
-                env->SetByteArrayRegion(newElement_0ByteArray, 0, static_cast<jsize>(entry_0.size()),
-                                        reinterpret_cast<const jbyte *>(entry_0.data()));
-                newElement_0 = newElement_0ByteArray;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
                 chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::ListStructOctetString::Id: {
-            using TypeInfo = Attributes::ListStructOctetString::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13735,42 +13653,16 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 auto & entry_0 = iter_value_0.GetValue();
                 jobject newElement_0;
-                jobject newElement_0_member1;
-                std::string newElement_0_member1ClassName     = "java/lang/Long";
-                std::string newElement_0_member1CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_member1ClassName.c_str(),
-                                                                               newElement_0_member1CtorSignature.c_str(),
-                                                                               entry_0.member1, newElement_0_member1);
-                jobject newElement_0_member2;
-                jbyteArray newElement_0_member2ByteArray = env->NewByteArray(static_cast<jsize>(entry_0.member2.size()));
-                env->SetByteArrayRegion(newElement_0_member2ByteArray, 0, static_cast<jsize>(entry_0.member2.size()),
-                                        reinterpret_cast<const jbyte *>(entry_0.member2.data()));
-                newElement_0_member2 = newElement_0_member2ByteArray;
-
-                jclass testListStructOctetStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$TestClusterClusterTestListStructOctet", testListStructOctetStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterTestListStructOctet");
-                    return nullptr;
-                }
-                jmethodID testListStructOctetStructCtor =
-                    env->GetMethodID(testListStructOctetStructClass, "<init>", "(Ljava/lang/Long;[B)V");
-                if (testListStructOctetStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterTestListStructOctet constructor");
-                    return nullptr;
-                }
-
-                newElement_0 = env->NewObject(testListStructOctetStructClass, testListStructOctetStructCtor, newElement_0_member1,
-                                              newElement_0_member2);
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
                 chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::LongOctetString::Id: {
-            using TypeInfo = Attributes::LongOctetString::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13778,14 +13670,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            jbyteArray valueByteArray = env->NewByteArray(static_cast<jsize>(cppValue.size()));
-            env->SetByteArrayRegion(valueByteArray, 0, static_cast<jsize>(cppValue.size()),
-                                    reinterpret_cast<const jbyte *>(cppValue.data()));
-            value = valueByteArray;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::CharString::Id: {
-            using TypeInfo = Attributes::CharString::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13793,11 +13685,24 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::LongCharString::Id: {
-            using TypeInfo = Attributes::LongCharString::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::RelativeHumidityMeasurement::Id: {
+        using namespace app::Clusters::RelativeHumidityMeasurement;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::MeasuredValue::Id: {
+            using TypeInfo = Attributes::MeasuredValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13805,11 +13710,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::EpochUs::Id: {
-            using TypeInfo = Attributes::EpochUs::TypeInfo;
+        case Attributes::MinMeasuredValue::Id: {
+            using TypeInfo = Attributes::MinMeasuredValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13817,14 +13732,130 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
+            return value;
+        }
+        case Attributes::MaxMeasuredValue::Id: {
+            using TypeInfo = Attributes::MaxMeasuredValue::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
+            return value;
+        }
+        case Attributes::Tolerance::Id: {
+            using TypeInfo = Attributes::Tolerance::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::EpochS::Id: {
-            using TypeInfo = Attributes::EpochS::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13838,8 +13869,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::VendorId::Id: {
-            using TypeInfo = Attributes::VendorId::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13850,11 +13881,66 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
             chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           static_cast<uint16_t>(cppValue), value);
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::ListNullablesAndOptionalsStruct::Id: {
-            using TypeInfo = Attributes::ListNullablesAndOptionalsStruct::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::OccupancySensing::Id: {
+        using namespace app::Clusters::OccupancySensing;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::Occupancy::Id: {
+            using TypeInfo = Attributes::Occupancy::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
+            return value;
+        }
+        case Attributes::OccupancySensorType::Id: {
+            using TypeInfo = Attributes::OccupancySensorType::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
+            return value;
+        }
+        case Attributes::OccupancySensorTypeBitmap::Id: {
+            using TypeInfo = Attributes::OccupancySensorTypeBitmap::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
+            return value;
+        }
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13869,489 +13955,16 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 auto & entry_0 = iter_value_0.GetValue();
                 jobject newElement_0;
-                jobject newElement_0_nullableInt;
-                if (entry_0.nullableInt.IsNull())
-                {
-                    newElement_0_nullableInt = nullptr;
-                }
-                else
-                {
-                    std::string newElement_0_nullableIntClassName     = "java/lang/Integer";
-                    std::string newElement_0_nullableIntCtorSignature = "(I)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-                        newElement_0_nullableIntClassName.c_str(), newElement_0_nullableIntCtorSignature.c_str(),
-                        entry_0.nullableInt.Value(), newElement_0_nullableInt);
-                }
-                jobject newElement_0_optionalInt;
-                if (!entry_0.optionalInt.HasValue())
-                {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_optionalInt);
-                }
-                else
-                {
-                    jobject newElement_0_optionalIntInsideOptional;
-                    std::string newElement_0_optionalIntInsideOptionalClassName     = "java/lang/Integer";
-                    std::string newElement_0_optionalIntInsideOptionalCtorSignature = "(I)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-                        newElement_0_optionalIntInsideOptionalClassName.c_str(),
-                        newElement_0_optionalIntInsideOptionalCtorSignature.c_str(), entry_0.optionalInt.Value(),
-                        newElement_0_optionalIntInsideOptional);
-                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_optionalIntInsideOptional,
-                                                                      newElement_0_optionalInt);
-                }
-                jobject newElement_0_nullableOptionalInt;
-                if (!entry_0.nullableOptionalInt.HasValue())
-                {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_nullableOptionalInt);
-                }
-                else
-                {
-                    jobject newElement_0_nullableOptionalIntInsideOptional;
-                    if (entry_0.nullableOptionalInt.Value().IsNull())
-                    {
-                        newElement_0_nullableOptionalIntInsideOptional = nullptr;
-                    }
-                    else
-                    {
-                        std::string newElement_0_nullableOptionalIntInsideOptionalClassName     = "java/lang/Integer";
-                        std::string newElement_0_nullableOptionalIntInsideOptionalCtorSignature = "(I)V";
-                        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-                            newElement_0_nullableOptionalIntInsideOptionalClassName.c_str(),
-                            newElement_0_nullableOptionalIntInsideOptionalCtorSignature.c_str(),
-                            entry_0.nullableOptionalInt.Value().Value(), newElement_0_nullableOptionalIntInsideOptional);
-                    }
-                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_nullableOptionalIntInsideOptional,
-                                                                      newElement_0_nullableOptionalInt);
-                }
-                jobject newElement_0_nullableString;
-                if (entry_0.nullableString.IsNull())
-                {
-                    newElement_0_nullableString = nullptr;
-                }
-                else
-                {
-                    newElement_0_nullableString = env->NewStringUTF(
-                        std::string(entry_0.nullableString.Value().data(), entry_0.nullableString.Value().size()).c_str());
-                }
-                jobject newElement_0_optionalString;
-                if (!entry_0.optionalString.HasValue())
-                {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_optionalString);
-                }
-                else
-                {
-                    jobject newElement_0_optionalStringInsideOptional;
-                    newElement_0_optionalStringInsideOptional = env->NewStringUTF(
-                        std::string(entry_0.optionalString.Value().data(), entry_0.optionalString.Value().size()).c_str());
-                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_optionalStringInsideOptional,
-                                                                      newElement_0_optionalString);
-                }
-                jobject newElement_0_nullableOptionalString;
-                if (!entry_0.nullableOptionalString.HasValue())
-                {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_nullableOptionalString);
-                }
-                else
-                {
-                    jobject newElement_0_nullableOptionalStringInsideOptional;
-                    if (entry_0.nullableOptionalString.Value().IsNull())
-                    {
-                        newElement_0_nullableOptionalStringInsideOptional = nullptr;
-                    }
-                    else
-                    {
-                        newElement_0_nullableOptionalStringInsideOptional =
-                            env->NewStringUTF(std::string(entry_0.nullableOptionalString.Value().Value().data(),
-                                                          entry_0.nullableOptionalString.Value().Value().size())
-                                                  .c_str());
-                    }
-                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_nullableOptionalStringInsideOptional,
-                                                                      newElement_0_nullableOptionalString);
-                }
-                jobject newElement_0_nullableStruct;
-                if (entry_0.nullableStruct.IsNull())
-                {
-                    newElement_0_nullableStruct = nullptr;
-                }
-                else
-                {
-                    jobject newElement_0_nullableStruct_a;
-                    std::string newElement_0_nullableStruct_aClassName     = "java/lang/Integer";
-                    std::string newElement_0_nullableStruct_aCtorSignature = "(I)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                        newElement_0_nullableStruct_aClassName.c_str(), newElement_0_nullableStruct_aCtorSignature.c_str(),
-                        entry_0.nullableStruct.Value().a, newElement_0_nullableStruct_a);
-                    jobject newElement_0_nullableStruct_b;
-                    std::string newElement_0_nullableStruct_bClassName     = "java/lang/Boolean";
-                    std::string newElement_0_nullableStruct_bCtorSignature = "(Z)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                        newElement_0_nullableStruct_bClassName.c_str(), newElement_0_nullableStruct_bCtorSignature.c_str(),
-                        entry_0.nullableStruct.Value().b, newElement_0_nullableStruct_b);
-                    jobject newElement_0_nullableStruct_c;
-                    std::string newElement_0_nullableStruct_cClassName     = "java/lang/Integer";
-                    std::string newElement_0_nullableStruct_cCtorSignature = "(I)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                        newElement_0_nullableStruct_cClassName.c_str(), newElement_0_nullableStruct_cCtorSignature.c_str(),
-                        static_cast<uint8_t>(entry_0.nullableStruct.Value().c), newElement_0_nullableStruct_c);
-                    jobject newElement_0_nullableStruct_d;
-                    jbyteArray newElement_0_nullableStruct_dByteArray =
-                        env->NewByteArray(static_cast<jsize>(entry_0.nullableStruct.Value().d.size()));
-                    env->SetByteArrayRegion(newElement_0_nullableStruct_dByteArray, 0,
-                                            static_cast<jsize>(entry_0.nullableStruct.Value().d.size()),
-                                            reinterpret_cast<const jbyte *>(entry_0.nullableStruct.Value().d.data()));
-                    newElement_0_nullableStruct_d = newElement_0_nullableStruct_dByteArray;
-                    jobject newElement_0_nullableStruct_e;
-                    newElement_0_nullableStruct_e = env->NewStringUTF(
-                        std::string(entry_0.nullableStruct.Value().e.data(), entry_0.nullableStruct.Value().e.size()).c_str());
-                    jobject newElement_0_nullableStruct_f;
-                    std::string newElement_0_nullableStruct_fClassName     = "java/lang/Integer";
-                    std::string newElement_0_nullableStruct_fCtorSignature = "(I)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                        newElement_0_nullableStruct_fClassName.c_str(), newElement_0_nullableStruct_fCtorSignature.c_str(),
-                        entry_0.nullableStruct.Value().f.Raw(), newElement_0_nullableStruct_f);
-                    jobject newElement_0_nullableStruct_g;
-                    std::string newElement_0_nullableStruct_gClassName     = "java/lang/Float";
-                    std::string newElement_0_nullableStruct_gCtorSignature = "(F)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<float>(
-                        newElement_0_nullableStruct_gClassName.c_str(), newElement_0_nullableStruct_gCtorSignature.c_str(),
-                        entry_0.nullableStruct.Value().g, newElement_0_nullableStruct_g);
-                    jobject newElement_0_nullableStruct_h;
-                    std::string newElement_0_nullableStruct_hClassName     = "java/lang/Double";
-                    std::string newElement_0_nullableStruct_hCtorSignature = "(D)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<double>(
-                        newElement_0_nullableStruct_hClassName.c_str(), newElement_0_nullableStruct_hCtorSignature.c_str(),
-                        entry_0.nullableStruct.Value().h, newElement_0_nullableStruct_h);
-
-                    jclass simpleStructStructClass;
-                    err = chip::JniReferences::GetInstance().GetClassRef(
-                        env, "chip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct", simpleStructStructClass);
-                    if (err != CHIP_NO_ERROR)
-                    {
-                        ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterSimpleStruct");
-                        return nullptr;
-                    }
-                    jmethodID simpleStructStructCtor =
-                        env->GetMethodID(simpleStructStructClass, "<init>",
-                                         "(Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;[BLjava/lang/String;Ljava/lang/"
-                                         "Integer;Ljava/lang/Float;Ljava/lang/Double;)V");
-                    if (simpleStructStructCtor == nullptr)
-                    {
-                        ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterSimpleStruct constructor");
-                        return nullptr;
-                    }
-
-                    newElement_0_nullableStruct =
-                        env->NewObject(simpleStructStructClass, simpleStructStructCtor, newElement_0_nullableStruct_a,
-                                       newElement_0_nullableStruct_b, newElement_0_nullableStruct_c, newElement_0_nullableStruct_d,
-                                       newElement_0_nullableStruct_e, newElement_0_nullableStruct_f, newElement_0_nullableStruct_g,
-                                       newElement_0_nullableStruct_h);
-                }
-                jobject newElement_0_optionalStruct;
-                if (!entry_0.optionalStruct.HasValue())
-                {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_optionalStruct);
-                }
-                else
-                {
-                    jobject newElement_0_optionalStructInsideOptional;
-                    jobject newElement_0_optionalStructInsideOptional_a;
-                    std::string newElement_0_optionalStructInsideOptional_aClassName     = "java/lang/Integer";
-                    std::string newElement_0_optionalStructInsideOptional_aCtorSignature = "(I)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                        newElement_0_optionalStructInsideOptional_aClassName.c_str(),
-                        newElement_0_optionalStructInsideOptional_aCtorSignature.c_str(), entry_0.optionalStruct.Value().a,
-                        newElement_0_optionalStructInsideOptional_a);
-                    jobject newElement_0_optionalStructInsideOptional_b;
-                    std::string newElement_0_optionalStructInsideOptional_bClassName     = "java/lang/Boolean";
-                    std::string newElement_0_optionalStructInsideOptional_bCtorSignature = "(Z)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                        newElement_0_optionalStructInsideOptional_bClassName.c_str(),
-                        newElement_0_optionalStructInsideOptional_bCtorSignature.c_str(), entry_0.optionalStruct.Value().b,
-                        newElement_0_optionalStructInsideOptional_b);
-                    jobject newElement_0_optionalStructInsideOptional_c;
-                    std::string newElement_0_optionalStructInsideOptional_cClassName     = "java/lang/Integer";
-                    std::string newElement_0_optionalStructInsideOptional_cCtorSignature = "(I)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                        newElement_0_optionalStructInsideOptional_cClassName.c_str(),
-                        newElement_0_optionalStructInsideOptional_cCtorSignature.c_str(),
-                        static_cast<uint8_t>(entry_0.optionalStruct.Value().c), newElement_0_optionalStructInsideOptional_c);
-                    jobject newElement_0_optionalStructInsideOptional_d;
-                    jbyteArray newElement_0_optionalStructInsideOptional_dByteArray =
-                        env->NewByteArray(static_cast<jsize>(entry_0.optionalStruct.Value().d.size()));
-                    env->SetByteArrayRegion(newElement_0_optionalStructInsideOptional_dByteArray, 0,
-                                            static_cast<jsize>(entry_0.optionalStruct.Value().d.size()),
-                                            reinterpret_cast<const jbyte *>(entry_0.optionalStruct.Value().d.data()));
-                    newElement_0_optionalStructInsideOptional_d = newElement_0_optionalStructInsideOptional_dByteArray;
-                    jobject newElement_0_optionalStructInsideOptional_e;
-                    newElement_0_optionalStructInsideOptional_e = env->NewStringUTF(
-                        std::string(entry_0.optionalStruct.Value().e.data(), entry_0.optionalStruct.Value().e.size()).c_str());
-                    jobject newElement_0_optionalStructInsideOptional_f;
-                    std::string newElement_0_optionalStructInsideOptional_fClassName     = "java/lang/Integer";
-                    std::string newElement_0_optionalStructInsideOptional_fCtorSignature = "(I)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                        newElement_0_optionalStructInsideOptional_fClassName.c_str(),
-                        newElement_0_optionalStructInsideOptional_fCtorSignature.c_str(), entry_0.optionalStruct.Value().f.Raw(),
-                        newElement_0_optionalStructInsideOptional_f);
-                    jobject newElement_0_optionalStructInsideOptional_g;
-                    std::string newElement_0_optionalStructInsideOptional_gClassName     = "java/lang/Float";
-                    std::string newElement_0_optionalStructInsideOptional_gCtorSignature = "(F)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<float>(
-                        newElement_0_optionalStructInsideOptional_gClassName.c_str(),
-                        newElement_0_optionalStructInsideOptional_gCtorSignature.c_str(), entry_0.optionalStruct.Value().g,
-                        newElement_0_optionalStructInsideOptional_g);
-                    jobject newElement_0_optionalStructInsideOptional_h;
-                    std::string newElement_0_optionalStructInsideOptional_hClassName     = "java/lang/Double";
-                    std::string newElement_0_optionalStructInsideOptional_hCtorSignature = "(D)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<double>(
-                        newElement_0_optionalStructInsideOptional_hClassName.c_str(),
-                        newElement_0_optionalStructInsideOptional_hCtorSignature.c_str(), entry_0.optionalStruct.Value().h,
-                        newElement_0_optionalStructInsideOptional_h);
-
-                    jclass simpleStructStructClass;
-                    err = chip::JniReferences::GetInstance().GetClassRef(
-                        env, "chip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct", simpleStructStructClass);
-                    if (err != CHIP_NO_ERROR)
-                    {
-                        ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterSimpleStruct");
-                        return nullptr;
-                    }
-                    jmethodID simpleStructStructCtor =
-                        env->GetMethodID(simpleStructStructClass, "<init>",
-                                         "(Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;[BLjava/lang/String;Ljava/lang/"
-                                         "Integer;Ljava/lang/Float;Ljava/lang/Double;)V");
-                    if (simpleStructStructCtor == nullptr)
-                    {
-                        ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterSimpleStruct constructor");
-                        return nullptr;
-                    }
-
-                    newElement_0_optionalStructInsideOptional =
-                        env->NewObject(simpleStructStructClass, simpleStructStructCtor, newElement_0_optionalStructInsideOptional_a,
-                                       newElement_0_optionalStructInsideOptional_b, newElement_0_optionalStructInsideOptional_c,
-                                       newElement_0_optionalStructInsideOptional_d, newElement_0_optionalStructInsideOptional_e,
-                                       newElement_0_optionalStructInsideOptional_f, newElement_0_optionalStructInsideOptional_g,
-                                       newElement_0_optionalStructInsideOptional_h);
-                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_optionalStructInsideOptional,
-                                                                      newElement_0_optionalStruct);
-                }
-                jobject newElement_0_nullableOptionalStruct;
-                if (!entry_0.nullableOptionalStruct.HasValue())
-                {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_nullableOptionalStruct);
-                }
-                else
-                {
-                    jobject newElement_0_nullableOptionalStructInsideOptional;
-                    if (entry_0.nullableOptionalStruct.Value().IsNull())
-                    {
-                        newElement_0_nullableOptionalStructInsideOptional = nullptr;
-                    }
-                    else
-                    {
-                        jobject newElement_0_nullableOptionalStructInsideOptional_a;
-                        std::string newElement_0_nullableOptionalStructInsideOptional_aClassName     = "java/lang/Integer";
-                        std::string newElement_0_nullableOptionalStructInsideOptional_aCtorSignature = "(I)V";
-                        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                            newElement_0_nullableOptionalStructInsideOptional_aClassName.c_str(),
-                            newElement_0_nullableOptionalStructInsideOptional_aCtorSignature.c_str(),
-                            entry_0.nullableOptionalStruct.Value().Value().a, newElement_0_nullableOptionalStructInsideOptional_a);
-                        jobject newElement_0_nullableOptionalStructInsideOptional_b;
-                        std::string newElement_0_nullableOptionalStructInsideOptional_bClassName     = "java/lang/Boolean";
-                        std::string newElement_0_nullableOptionalStructInsideOptional_bCtorSignature = "(Z)V";
-                        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                            newElement_0_nullableOptionalStructInsideOptional_bClassName.c_str(),
-                            newElement_0_nullableOptionalStructInsideOptional_bCtorSignature.c_str(),
-                            entry_0.nullableOptionalStruct.Value().Value().b, newElement_0_nullableOptionalStructInsideOptional_b);
-                        jobject newElement_0_nullableOptionalStructInsideOptional_c;
-                        std::string newElement_0_nullableOptionalStructInsideOptional_cClassName     = "java/lang/Integer";
-                        std::string newElement_0_nullableOptionalStructInsideOptional_cCtorSignature = "(I)V";
-                        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                            newElement_0_nullableOptionalStructInsideOptional_cClassName.c_str(),
-                            newElement_0_nullableOptionalStructInsideOptional_cCtorSignature.c_str(),
-                            static_cast<uint8_t>(entry_0.nullableOptionalStruct.Value().Value().c),
-                            newElement_0_nullableOptionalStructInsideOptional_c);
-                        jobject newElement_0_nullableOptionalStructInsideOptional_d;
-                        jbyteArray newElement_0_nullableOptionalStructInsideOptional_dByteArray =
-                            env->NewByteArray(static_cast<jsize>(entry_0.nullableOptionalStruct.Value().Value().d.size()));
-                        env->SetByteArrayRegion(
-                            newElement_0_nullableOptionalStructInsideOptional_dByteArray, 0,
-                            static_cast<jsize>(entry_0.nullableOptionalStruct.Value().Value().d.size()),
-                            reinterpret_cast<const jbyte *>(entry_0.nullableOptionalStruct.Value().Value().d.data()));
-                        newElement_0_nullableOptionalStructInsideOptional_d =
-                            newElement_0_nullableOptionalStructInsideOptional_dByteArray;
-                        jobject newElement_0_nullableOptionalStructInsideOptional_e;
-                        newElement_0_nullableOptionalStructInsideOptional_e =
-                            env->NewStringUTF(std::string(entry_0.nullableOptionalStruct.Value().Value().e.data(),
-                                                          entry_0.nullableOptionalStruct.Value().Value().e.size())
-                                                  .c_str());
-                        jobject newElement_0_nullableOptionalStructInsideOptional_f;
-                        std::string newElement_0_nullableOptionalStructInsideOptional_fClassName     = "java/lang/Integer";
-                        std::string newElement_0_nullableOptionalStructInsideOptional_fCtorSignature = "(I)V";
-                        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                            newElement_0_nullableOptionalStructInsideOptional_fClassName.c_str(),
-                            newElement_0_nullableOptionalStructInsideOptional_fCtorSignature.c_str(),
-                            entry_0.nullableOptionalStruct.Value().Value().f.Raw(),
-                            newElement_0_nullableOptionalStructInsideOptional_f);
-                        jobject newElement_0_nullableOptionalStructInsideOptional_g;
-                        std::string newElement_0_nullableOptionalStructInsideOptional_gClassName     = "java/lang/Float";
-                        std::string newElement_0_nullableOptionalStructInsideOptional_gCtorSignature = "(F)V";
-                        chip::JniReferences::GetInstance().CreateBoxedObject<float>(
-                            newElement_0_nullableOptionalStructInsideOptional_gClassName.c_str(),
-                            newElement_0_nullableOptionalStructInsideOptional_gCtorSignature.c_str(),
-                            entry_0.nullableOptionalStruct.Value().Value().g, newElement_0_nullableOptionalStructInsideOptional_g);
-                        jobject newElement_0_nullableOptionalStructInsideOptional_h;
-                        std::string newElement_0_nullableOptionalStructInsideOptional_hClassName     = "java/lang/Double";
-                        std::string newElement_0_nullableOptionalStructInsideOptional_hCtorSignature = "(D)V";
-                        chip::JniReferences::GetInstance().CreateBoxedObject<double>(
-                            newElement_0_nullableOptionalStructInsideOptional_hClassName.c_str(),
-                            newElement_0_nullableOptionalStructInsideOptional_hCtorSignature.c_str(),
-                            entry_0.nullableOptionalStruct.Value().Value().h, newElement_0_nullableOptionalStructInsideOptional_h);
-
-                        jclass simpleStructStructClass;
-                        err = chip::JniReferences::GetInstance().GetClassRef(
-                            env, "chip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct", simpleStructStructClass);
-                        if (err != CHIP_NO_ERROR)
-                        {
-                            ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterSimpleStruct");
-                            return nullptr;
-                        }
-                        jmethodID simpleStructStructCtor =
-                            env->GetMethodID(simpleStructStructClass, "<init>",
-                                             "(Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;[BLjava/lang/String;Ljava/"
-                                             "lang/Integer;Ljava/lang/Float;Ljava/lang/Double;)V");
-                        if (simpleStructStructCtor == nullptr)
-                        {
-                            ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterSimpleStruct constructor");
-                            return nullptr;
-                        }
-
-                        newElement_0_nullableOptionalStructInsideOptional = env->NewObject(
-                            simpleStructStructClass, simpleStructStructCtor, newElement_0_nullableOptionalStructInsideOptional_a,
-                            newElement_0_nullableOptionalStructInsideOptional_b,
-                            newElement_0_nullableOptionalStructInsideOptional_c,
-                            newElement_0_nullableOptionalStructInsideOptional_d,
-                            newElement_0_nullableOptionalStructInsideOptional_e,
-                            newElement_0_nullableOptionalStructInsideOptional_f,
-                            newElement_0_nullableOptionalStructInsideOptional_g,
-                            newElement_0_nullableOptionalStructInsideOptional_h);
-                    }
-                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_nullableOptionalStructInsideOptional,
-                                                                      newElement_0_nullableOptionalStruct);
-                }
-                jobject newElement_0_nullableList;
-                if (entry_0.nullableList.IsNull())
-                {
-                    newElement_0_nullableList = nullptr;
-                }
-                else
-                {
-                    chip::JniReferences::GetInstance().CreateArrayList(newElement_0_nullableList);
-
-                    auto iter_newElement_0_nullableList_3 = entry_0.nullableList.Value().begin();
-                    while (iter_newElement_0_nullableList_3.Next())
-                    {
-                        auto & entry_3 = iter_newElement_0_nullableList_3.GetValue();
-                        jobject newElement_3;
-                        std::string newElement_3ClassName     = "java/lang/Integer";
-                        std::string newElement_3CtorSignature = "(I)V";
-                        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_3ClassName.c_str(),
-                                                                                      newElement_3CtorSignature.c_str(),
-                                                                                      static_cast<uint8_t>(entry_3), newElement_3);
-                        chip::JniReferences::GetInstance().AddToList(newElement_0_nullableList, newElement_3);
-                    }
-                }
-                jobject newElement_0_optionalList;
-                if (!entry_0.optionalList.HasValue())
-                {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_optionalList);
-                }
-                else
-                {
-                    jobject newElement_0_optionalListInsideOptional;
-                    chip::JniReferences::GetInstance().CreateArrayList(newElement_0_optionalListInsideOptional);
-
-                    auto iter_newElement_0_optionalListInsideOptional_3 = entry_0.optionalList.Value().begin();
-                    while (iter_newElement_0_optionalListInsideOptional_3.Next())
-                    {
-                        auto & entry_3 = iter_newElement_0_optionalListInsideOptional_3.GetValue();
-                        jobject newElement_3;
-                        std::string newElement_3ClassName     = "java/lang/Integer";
-                        std::string newElement_3CtorSignature = "(I)V";
-                        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_3ClassName.c_str(),
-                                                                                      newElement_3CtorSignature.c_str(),
-                                                                                      static_cast<uint8_t>(entry_3), newElement_3);
-                        chip::JniReferences::GetInstance().AddToList(newElement_0_optionalListInsideOptional, newElement_3);
-                    }
-                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_optionalListInsideOptional,
-                                                                      newElement_0_optionalList);
-                }
-                jobject newElement_0_nullableOptionalList;
-                if (!entry_0.nullableOptionalList.HasValue())
-                {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_nullableOptionalList);
-                }
-                else
-                {
-                    jobject newElement_0_nullableOptionalListInsideOptional;
-                    if (entry_0.nullableOptionalList.Value().IsNull())
-                    {
-                        newElement_0_nullableOptionalListInsideOptional = nullptr;
-                    }
-                    else
-                    {
-                        chip::JniReferences::GetInstance().CreateArrayList(newElement_0_nullableOptionalListInsideOptional);
-
-                        auto iter_newElement_0_nullableOptionalListInsideOptional_4 =
-                            entry_0.nullableOptionalList.Value().Value().begin();
-                        while (iter_newElement_0_nullableOptionalListInsideOptional_4.Next())
-                        {
-                            auto & entry_4 = iter_newElement_0_nullableOptionalListInsideOptional_4.GetValue();
-                            jobject newElement_4;
-                            std::string newElement_4ClassName     = "java/lang/Integer";
-                            std::string newElement_4CtorSignature = "(I)V";
-                            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                                newElement_4ClassName.c_str(), newElement_4CtorSignature.c_str(), static_cast<uint8_t>(entry_4),
-                                newElement_4);
-                            chip::JniReferences::GetInstance().AddToList(newElement_0_nullableOptionalListInsideOptional,
-                                                                         newElement_4);
-                        }
-                    }
-                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_nullableOptionalListInsideOptional,
-                                                                      newElement_0_nullableOptionalList);
-                }
-
-                jclass nullablesAndOptionalsStructStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$TestClusterClusterNullablesAndOptionalsStruct",
-                    nullablesAndOptionalsStructStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterNullablesAndOptionalsStruct");
-                    return nullptr;
-                }
-                jmethodID nullablesAndOptionalsStructStructCtor = env->GetMethodID(
-                    nullablesAndOptionalsStructStructClass, "<init>",
-                    "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/lang/String;Ljava/util/Optional;Ljava/util/"
-                    "Optional;Lchip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct;Ljava/util/Optional;Ljava/util/"
-                    "Optional;Ljava/util/ArrayList;Ljava/util/Optional;Ljava/util/Optional;)V");
-                if (nullablesAndOptionalsStructStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterNullablesAndOptionalsStruct constructor");
-                    return nullptr;
-                }
-
-                newElement_0 =
-                    env->NewObject(nullablesAndOptionalsStructStructClass, nullablesAndOptionalsStructStructCtor,
-                                   newElement_0_nullableInt, newElement_0_optionalInt, newElement_0_nullableOptionalInt,
-                                   newElement_0_nullableString, newElement_0_optionalString, newElement_0_nullableOptionalString,
-                                   newElement_0_nullableStruct, newElement_0_optionalStruct, newElement_0_nullableOptionalStruct,
-                                   newElement_0_nullableList, newElement_0_optionalList, newElement_0_nullableOptionalList);
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
                 chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::EnumAttr::Id: {
-            using TypeInfo = Attributes::EnumAttr::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14359,14 +13972,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          static_cast<uint8_t>(cppValue), value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::StructAttr::Id: {
-            using TypeInfo = Attributes::StructAttr::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14374,68 +13996,38 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            jobject value_a;
-            std::string value_aClassName     = "java/lang/Integer";
-            std::string value_aCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(value_aClassName.c_str(), value_aCtorSignature.c_str(),
-                                                                          cppValue.a, value_a);
-            jobject value_b;
-            std::string value_bClassName     = "java/lang/Boolean";
-            std::string value_bCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(value_bClassName.c_str(), value_bCtorSignature.c_str(),
-                                                                       cppValue.b, value_b);
-            jobject value_c;
-            std::string value_cClassName     = "java/lang/Integer";
-            std::string value_cCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(value_cClassName.c_str(), value_cCtorSignature.c_str(),
-                                                                          static_cast<uint8_t>(cppValue.c), value_c);
-            jobject value_d;
-            jbyteArray value_dByteArray = env->NewByteArray(static_cast<jsize>(cppValue.d.size()));
-            env->SetByteArrayRegion(value_dByteArray, 0, static_cast<jsize>(cppValue.d.size()),
-                                    reinterpret_cast<const jbyte *>(cppValue.d.data()));
-            value_d = value_dByteArray;
-            jobject value_e;
-            value_e = env->NewStringUTF(std::string(cppValue.e.data(), cppValue.e.size()).c_str());
-            jobject value_f;
-            std::string value_fClassName     = "java/lang/Integer";
-            std::string value_fCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(value_fClassName.c_str(), value_fCtorSignature.c_str(),
-                                                                          cppValue.f.Raw(), value_f);
-            jobject value_g;
-            std::string value_gClassName     = "java/lang/Float";
-            std::string value_gCtorSignature = "(F)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<float>(value_gClassName.c_str(), value_gCtorSignature.c_str(),
-                                                                        cppValue.g, value_g);
-            jobject value_h;
-            std::string value_hClassName     = "java/lang/Double";
-            std::string value_hCtorSignature = "(D)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<double>(value_hClassName.c_str(), value_hCtorSignature.c_str(),
-                                                                         cppValue.h, value_h);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
 
-            jclass simpleStructStructClass;
-            err = chip::JniReferences::GetInstance().GetClassRef(
-                env, "chip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct", simpleStructStructClass);
-            if (err != CHIP_NO_ERROR)
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterSimpleStruct");
-                return nullptr;
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
-            jmethodID simpleStructStructCtor =
-                env->GetMethodID(simpleStructStructClass, "<init>",
-                                 "(Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;[BLjava/lang/String;Ljava/lang/"
-                                 "Integer;Ljava/lang/Float;Ljava/lang/Double;)V");
-            if (simpleStructStructCtor == nullptr)
+            return value;
+        }
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterSimpleStruct constructor");
                 return nullptr;
             }
-
-            value = env->NewObject(simpleStructStructClass, simpleStructStructCtor, value_a, value_b, value_c, value_d, value_e,
-                                   value_f, value_g, value_h);
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::RangeRestrictedInt8u::Id: {
-            using TypeInfo = Attributes::RangeRestrictedInt8u::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14445,12 +14037,22 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::RangeRestrictedInt8s::Id: {
-            using TypeInfo = Attributes::RangeRestrictedInt8s::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::WakeOnLan::Id: {
+        using namespace app::Clusters::WakeOnLan;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::MACAddress::Id: {
+            using TypeInfo = Attributes::MACAddress::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14458,14 +14060,11 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                         cppValue, value);
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
             return value;
         }
-        case Attributes::RangeRestrictedInt16u::Id: {
-            using TypeInfo = Attributes::RangeRestrictedInt16u::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14473,14 +14072,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::RangeRestrictedInt16s::Id: {
-            using TypeInfo = Attributes::RangeRestrictedInt16s::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14488,14 +14096,62 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::ListLongOctetString::Id: {
-            using TypeInfo = Attributes::ListLongOctetString::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14503,23 +14159,24 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                jbyteArray newElement_0ByteArray = env->NewByteArray(static_cast<jsize>(entry_0.size()));
-                env->SetByteArrayRegion(newElement_0ByteArray, 0, static_cast<jsize>(entry_0.size()),
-                                        reinterpret_cast<const jbyte *>(entry_0.data()));
-                newElement_0 = newElement_0ByteArray;
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::ListFabricScoped::Id: {
-            using TypeInfo = Attributes::ListFabricScoped::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::Channel::Id: {
+        using namespace app::Clusters::Channel;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::ChannelList::Id: {
+            using TypeInfo = Attributes::ChannelList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14534,200 +14191,155 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 auto & entry_0 = iter_value_0.GetValue();
                 jobject newElement_0;
-                jobject newElement_0_fabricSensitiveInt8u;
-                std::string newElement_0_fabricSensitiveInt8uClassName     = "java/lang/Integer";
-                std::string newElement_0_fabricSensitiveInt8uCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0_fabricSensitiveInt8uClassName.c_str(), newElement_0_fabricSensitiveInt8uCtorSignature.c_str(),
-                    entry_0.fabricSensitiveInt8u, newElement_0_fabricSensitiveInt8u);
-                jobject newElement_0_optionalFabricSensitiveInt8u;
-                if (!entry_0.optionalFabricSensitiveInt8u.HasValue())
+                jobject newElement_0_majorNumber;
+                std::string newElement_0_majorNumberClassName     = "java/lang/Integer";
+                std::string newElement_0_majorNumberCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_majorNumberClassName.c_str(),
+                                                                               newElement_0_majorNumberCtorSignature.c_str(),
+                                                                               entry_0.majorNumber, newElement_0_majorNumber);
+                jobject newElement_0_minorNumber;
+                std::string newElement_0_minorNumberClassName     = "java/lang/Integer";
+                std::string newElement_0_minorNumberCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_minorNumberClassName.c_str(),
+                                                                               newElement_0_minorNumberCtorSignature.c_str(),
+                                                                               entry_0.minorNumber, newElement_0_minorNumber);
+                jobject newElement_0_name;
+                if (!entry_0.name.HasValue())
                 {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_optionalFabricSensitiveInt8u);
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_name);
                 }
                 else
                 {
-                    jobject newElement_0_optionalFabricSensitiveInt8uInsideOptional;
-                    std::string newElement_0_optionalFabricSensitiveInt8uInsideOptionalClassName     = "java/lang/Integer";
-                    std::string newElement_0_optionalFabricSensitiveInt8uInsideOptionalCtorSignature = "(I)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                        newElement_0_optionalFabricSensitiveInt8uInsideOptionalClassName.c_str(),
-                        newElement_0_optionalFabricSensitiveInt8uInsideOptionalCtorSignature.c_str(),
-                        entry_0.optionalFabricSensitiveInt8u.Value(), newElement_0_optionalFabricSensitiveInt8uInsideOptional);
-                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_optionalFabricSensitiveInt8uInsideOptional,
-                                                                      newElement_0_optionalFabricSensitiveInt8u);
+                    jobject newElement_0_nameInsideOptional;
+                    newElement_0_nameInsideOptional =
+                        env->NewStringUTF(std::string(entry_0.name.Value().data(), entry_0.name.Value().size()).c_str());
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_nameInsideOptional, newElement_0_name);
                 }
-                jobject newElement_0_nullableFabricSensitiveInt8u;
-                if (entry_0.nullableFabricSensitiveInt8u.IsNull())
+                jobject newElement_0_callSign;
+                if (!entry_0.callSign.HasValue())
                 {
-                    newElement_0_nullableFabricSensitiveInt8u = nullptr;
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_callSign);
                 }
                 else
                 {
-                    std::string newElement_0_nullableFabricSensitiveInt8uClassName     = "java/lang/Integer";
-                    std::string newElement_0_nullableFabricSensitiveInt8uCtorSignature = "(I)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                        newElement_0_nullableFabricSensitiveInt8uClassName.c_str(),
-                        newElement_0_nullableFabricSensitiveInt8uCtorSignature.c_str(),
-                        entry_0.nullableFabricSensitiveInt8u.Value(), newElement_0_nullableFabricSensitiveInt8u);
+                    jobject newElement_0_callSignInsideOptional;
+                    newElement_0_callSignInsideOptional =
+                        env->NewStringUTF(std::string(entry_0.callSign.Value().data(), entry_0.callSign.Value().size()).c_str());
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_callSignInsideOptional, newElement_0_callSign);
                 }
-                jobject newElement_0_nullableOptionalFabricSensitiveInt8u;
-                if (!entry_0.nullableOptionalFabricSensitiveInt8u.HasValue())
+                jobject newElement_0_affiliateCallSign;
+                if (!entry_0.affiliateCallSign.HasValue())
                 {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_nullableOptionalFabricSensitiveInt8u);
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_affiliateCallSign);
                 }
                 else
                 {
-                    jobject newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptional;
-                    if (entry_0.nullableOptionalFabricSensitiveInt8u.Value().IsNull())
-                    {
-                        newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptional = nullptr;
-                    }
-                    else
-                    {
-                        std::string newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptionalClassName = "java/lang/Integer";
-                        std::string newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptionalCtorSignature = "(I)V";
-                        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                            newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptionalClassName.c_str(),
-                            newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptionalCtorSignature.c_str(),
-                            entry_0.nullableOptionalFabricSensitiveInt8u.Value().Value(),
-                            newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptional);
-                    }
-                    chip::JniReferences::GetInstance().CreateOptional(
-                        newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptional,
-                        newElement_0_nullableOptionalFabricSensitiveInt8u);
+                    jobject newElement_0_affiliateCallSignInsideOptional;
+                    newElement_0_affiliateCallSignInsideOptional = env->NewStringUTF(
+                        std::string(entry_0.affiliateCallSign.Value().data(), entry_0.affiliateCallSign.Value().size()).c_str());
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_affiliateCallSignInsideOptional,
+                                                                      newElement_0_affiliateCallSign);
                 }
-                jobject newElement_0_fabricSensitiveCharString;
-                newElement_0_fabricSensitiveCharString = env->NewStringUTF(
-                    std::string(entry_0.fabricSensitiveCharString.data(), entry_0.fabricSensitiveCharString.size()).c_str());
-                jobject newElement_0_fabricSensitiveStruct;
-                jobject newElement_0_fabricSensitiveStruct_a;
-                std::string newElement_0_fabricSensitiveStruct_aClassName     = "java/lang/Integer";
-                std::string newElement_0_fabricSensitiveStruct_aCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0_fabricSensitiveStruct_aClassName.c_str(),
-                    newElement_0_fabricSensitiveStruct_aCtorSignature.c_str(), entry_0.fabricSensitiveStruct.a,
-                    newElement_0_fabricSensitiveStruct_a);
-                jobject newElement_0_fabricSensitiveStruct_b;
-                std::string newElement_0_fabricSensitiveStruct_bClassName     = "java/lang/Boolean";
-                std::string newElement_0_fabricSensitiveStruct_bCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                    newElement_0_fabricSensitiveStruct_bClassName.c_str(),
-                    newElement_0_fabricSensitiveStruct_bCtorSignature.c_str(), entry_0.fabricSensitiveStruct.b,
-                    newElement_0_fabricSensitiveStruct_b);
-                jobject newElement_0_fabricSensitiveStruct_c;
-                std::string newElement_0_fabricSensitiveStruct_cClassName     = "java/lang/Integer";
-                std::string newElement_0_fabricSensitiveStruct_cCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0_fabricSensitiveStruct_cClassName.c_str(),
-                    newElement_0_fabricSensitiveStruct_cCtorSignature.c_str(),
-                    static_cast<uint8_t>(entry_0.fabricSensitiveStruct.c), newElement_0_fabricSensitiveStruct_c);
-                jobject newElement_0_fabricSensitiveStruct_d;
-                jbyteArray newElement_0_fabricSensitiveStruct_dByteArray =
-                    env->NewByteArray(static_cast<jsize>(entry_0.fabricSensitiveStruct.d.size()));
-                env->SetByteArrayRegion(newElement_0_fabricSensitiveStruct_dByteArray, 0,
-                                        static_cast<jsize>(entry_0.fabricSensitiveStruct.d.size()),
-                                        reinterpret_cast<const jbyte *>(entry_0.fabricSensitiveStruct.d.data()));
-                newElement_0_fabricSensitiveStruct_d = newElement_0_fabricSensitiveStruct_dByteArray;
-                jobject newElement_0_fabricSensitiveStruct_e;
-                newElement_0_fabricSensitiveStruct_e = env->NewStringUTF(
-                    std::string(entry_0.fabricSensitiveStruct.e.data(), entry_0.fabricSensitiveStruct.e.size()).c_str());
-                jobject newElement_0_fabricSensitiveStruct_f;
-                std::string newElement_0_fabricSensitiveStruct_fClassName     = "java/lang/Integer";
-                std::string newElement_0_fabricSensitiveStruct_fCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0_fabricSensitiveStruct_fClassName.c_str(),
-                    newElement_0_fabricSensitiveStruct_fCtorSignature.c_str(), entry_0.fabricSensitiveStruct.f.Raw(),
-                    newElement_0_fabricSensitiveStruct_f);
-                jobject newElement_0_fabricSensitiveStruct_g;
-                std::string newElement_0_fabricSensitiveStruct_gClassName     = "java/lang/Float";
-                std::string newElement_0_fabricSensitiveStruct_gCtorSignature = "(F)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<float>(
-                    newElement_0_fabricSensitiveStruct_gClassName.c_str(),
-                    newElement_0_fabricSensitiveStruct_gCtorSignature.c_str(), entry_0.fabricSensitiveStruct.g,
-                    newElement_0_fabricSensitiveStruct_g);
-                jobject newElement_0_fabricSensitiveStruct_h;
-                std::string newElement_0_fabricSensitiveStruct_hClassName     = "java/lang/Double";
-                std::string newElement_0_fabricSensitiveStruct_hCtorSignature = "(D)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<double>(
-                    newElement_0_fabricSensitiveStruct_hClassName.c_str(),
-                    newElement_0_fabricSensitiveStruct_hCtorSignature.c_str(), entry_0.fabricSensitiveStruct.h,
-                    newElement_0_fabricSensitiveStruct_h);
 
-                jclass simpleStructStructClass;
+                jclass channelInfoStructClass;
                 err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct", simpleStructStructClass);
+                    env, "chip/devicecontroller/ChipStructs$ChannelClusterChannelInfo", channelInfoStructClass);
                 if (err != CHIP_NO_ERROR)
                 {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterSimpleStruct");
+                    ChipLogError(Zcl, "Could not find class ChipStructs$ChannelClusterChannelInfo");
                     return nullptr;
                 }
-                jmethodID simpleStructStructCtor =
-                    env->GetMethodID(simpleStructStructClass, "<init>",
-                                     "(Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;[BLjava/lang/String;Ljava/lang/"
-                                     "Integer;Ljava/lang/Float;Ljava/lang/Double;)V");
-                if (simpleStructStructCtor == nullptr)
+                jmethodID channelInfoStructCtor = env->GetMethodID(
+                    channelInfoStructClass, "<init>",
+                    "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V");
+                if (channelInfoStructCtor == nullptr)
                 {
-                    ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterSimpleStruct constructor");
+                    ChipLogError(Zcl, "Could not find ChipStructs$ChannelClusterChannelInfo constructor");
                     return nullptr;
                 }
 
-                newElement_0_fabricSensitiveStruct =
-                    env->NewObject(simpleStructStructClass, simpleStructStructCtor, newElement_0_fabricSensitiveStruct_a,
-                                   newElement_0_fabricSensitiveStruct_b, newElement_0_fabricSensitiveStruct_c,
-                                   newElement_0_fabricSensitiveStruct_d, newElement_0_fabricSensitiveStruct_e,
-                                   newElement_0_fabricSensitiveStruct_f, newElement_0_fabricSensitiveStruct_g,
-                                   newElement_0_fabricSensitiveStruct_h);
-                jobject newElement_0_fabricSensitiveInt8uList;
-                chip::JniReferences::GetInstance().CreateArrayList(newElement_0_fabricSensitiveInt8uList);
-
-                auto iter_newElement_0_fabricSensitiveInt8uList_2 = entry_0.fabricSensitiveInt8uList.begin();
-                while (iter_newElement_0_fabricSensitiveInt8uList_2.Next())
+                newElement_0 = env->NewObject(channelInfoStructClass, channelInfoStructCtor, newElement_0_majorNumber,
+                                              newElement_0_minorNumber, newElement_0_name, newElement_0_callSign,
+                                              newElement_0_affiliateCallSign);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
+            return value;
+        }
+        case Attributes::Lineup::Id: {
+            using TypeInfo = Attributes::Lineup::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                jobject value_operatorName;
+                value_operatorName = env->NewStringUTF(
+                    std::string(cppValue.Value().operatorName.data(), cppValue.Value().operatorName.size()).c_str());
+                jobject value_lineupName;
+                if (!cppValue.Value().lineupName.HasValue())
                 {
-                    auto & entry_2 = iter_newElement_0_fabricSensitiveInt8uList_2.GetValue();
-                    jobject newElement_2;
-                    std::string newElement_2ClassName     = "java/lang/Integer";
-                    std::string newElement_2CtorSignature = "(I)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                        newElement_2ClassName.c_str(), newElement_2CtorSignature.c_str(), entry_2, newElement_2);
-                    chip::JniReferences::GetInstance().AddToList(newElement_0_fabricSensitiveInt8uList, newElement_2);
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, value_lineupName);
                 }
-                jobject newElement_0_fabricIndex;
-                std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
-                std::string newElement_0_fabricIndexCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
-                                                                              newElement_0_fabricIndexCtorSignature.c_str(),
-                                                                              entry_0.fabricIndex, newElement_0_fabricIndex);
+                else
+                {
+                    jobject value_lineupNameInsideOptional;
+                    value_lineupNameInsideOptional = env->NewStringUTF(
+                        std::string(cppValue.Value().lineupName.Value().data(), cppValue.Value().lineupName.Value().size())
+                            .c_str());
+                    chip::JniReferences::GetInstance().CreateOptional(value_lineupNameInsideOptional, value_lineupName);
+                }
+                jobject value_postalCode;
+                if (!cppValue.Value().postalCode.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, value_postalCode);
+                }
+                else
+                {
+                    jobject value_postalCodeInsideOptional;
+                    value_postalCodeInsideOptional = env->NewStringUTF(
+                        std::string(cppValue.Value().postalCode.Value().data(), cppValue.Value().postalCode.Value().size())
+                            .c_str());
+                    chip::JniReferences::GetInstance().CreateOptional(value_postalCodeInsideOptional, value_postalCode);
+                }
+                jobject value_lineupInfoType;
+                std::string value_lineupInfoTypeClassName     = "java/lang/Integer";
+                std::string value_lineupInfoTypeCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    value_lineupInfoTypeClassName.c_str(), value_lineupInfoTypeCtorSignature.c_str(),
+                    static_cast<uint8_t>(cppValue.Value().lineupInfoType), value_lineupInfoType);
 
-                jclass testFabricScopedStructClass;
+                jclass lineupInfoStructClass;
                 err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$TestClusterClusterTestFabricScoped", testFabricScopedStructClass);
+                    env, "chip/devicecontroller/ChipStructs$ChannelClusterLineupInfo", lineupInfoStructClass);
                 if (err != CHIP_NO_ERROR)
                 {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterTestFabricScoped");
+                    ChipLogError(Zcl, "Could not find class ChipStructs$ChannelClusterLineupInfo");
                     return nullptr;
                 }
-                jmethodID testFabricScopedStructCtor = env->GetMethodID(
-                    testFabricScopedStructClass, "<init>",
-                    "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/lang/Integer;Ljava/util/Optional;Ljava/lang/String;Lchip/"
-                    "devicecontroller/ChipStructs$TestClusterClusterSimpleStruct;Ljava/util/ArrayList;Ljava/lang/Integer;)V");
-                if (testFabricScopedStructCtor == nullptr)
+                jmethodID lineupInfoStructCtor =
+                    env->GetMethodID(lineupInfoStructClass, "<init>",
+                                     "(Ljava/lang/String;Ljava/util/Optional;Ljava/util/Optional;Ljava/lang/Integer;)V");
+                if (lineupInfoStructCtor == nullptr)
                 {
-                    ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterTestFabricScoped constructor");
+                    ChipLogError(Zcl, "Could not find ChipStructs$ChannelClusterLineupInfo constructor");
                     return nullptr;
                 }
 
-                newElement_0 = env->NewObject(
-                    testFabricScopedStructClass, testFabricScopedStructCtor, newElement_0_fabricSensitiveInt8u,
-                    newElement_0_optionalFabricSensitiveInt8u, newElement_0_nullableFabricSensitiveInt8u,
-                    newElement_0_nullableOptionalFabricSensitiveInt8u, newElement_0_fabricSensitiveCharString,
-                    newElement_0_fabricSensitiveStruct, newElement_0_fabricSensitiveInt8uList, newElement_0_fabricIndex);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = env->NewObject(lineupInfoStructClass, lineupInfoStructCtor, value_operatorName, value_lineupName,
+                                       value_postalCode, value_lineupInfoType);
             }
             return value;
         }
-        case Attributes::TimedWriteBoolean::Id: {
-            using TypeInfo = Attributes::TimedWriteBoolean::TypeInfo;
+        case Attributes::CurrentChannel::Id: {
+            using TypeInfo = Attributes::CurrentChannel::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14735,29 +14347,88 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
-                                                                       value);
-            return value;
-        }
-        case Attributes::GeneralErrorBoolean::Id: {
-            using TypeInfo = Attributes::GeneralErrorBoolean::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            if (cppValue.IsNull())
             {
-                return nullptr;
+                value = nullptr;
+            }
+            else
+            {
+                jobject value_majorNumber;
+                std::string value_majorNumberClassName     = "java/lang/Integer";
+                std::string value_majorNumberCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(value_majorNumberClassName.c_str(),
+                                                                               value_majorNumberCtorSignature.c_str(),
+                                                                               cppValue.Value().majorNumber, value_majorNumber);
+                jobject value_minorNumber;
+                std::string value_minorNumberClassName     = "java/lang/Integer";
+                std::string value_minorNumberCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(value_minorNumberClassName.c_str(),
+                                                                               value_minorNumberCtorSignature.c_str(),
+                                                                               cppValue.Value().minorNumber, value_minorNumber);
+                jobject value_name;
+                if (!cppValue.Value().name.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, value_name);
+                }
+                else
+                {
+                    jobject value_nameInsideOptional;
+                    value_nameInsideOptional = env->NewStringUTF(
+                        std::string(cppValue.Value().name.Value().data(), cppValue.Value().name.Value().size()).c_str());
+                    chip::JniReferences::GetInstance().CreateOptional(value_nameInsideOptional, value_name);
+                }
+                jobject value_callSign;
+                if (!cppValue.Value().callSign.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, value_callSign);
+                }
+                else
+                {
+                    jobject value_callSignInsideOptional;
+                    value_callSignInsideOptional = env->NewStringUTF(
+                        std::string(cppValue.Value().callSign.Value().data(), cppValue.Value().callSign.Value().size()).c_str());
+                    chip::JniReferences::GetInstance().CreateOptional(value_callSignInsideOptional, value_callSign);
+                }
+                jobject value_affiliateCallSign;
+                if (!cppValue.Value().affiliateCallSign.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, value_affiliateCallSign);
+                }
+                else
+                {
+                    jobject value_affiliateCallSignInsideOptional;
+                    value_affiliateCallSignInsideOptional =
+                        env->NewStringUTF(std::string(cppValue.Value().affiliateCallSign.Value().data(),
+                                                      cppValue.Value().affiliateCallSign.Value().size())
+                                              .c_str());
+                    chip::JniReferences::GetInstance().CreateOptional(value_affiliateCallSignInsideOptional,
+                                                                      value_affiliateCallSign);
+                }
+
+                jclass channelInfoStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$ChannelClusterChannelInfo", channelInfoStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$ChannelClusterChannelInfo");
+                    return nullptr;
+                }
+                jmethodID channelInfoStructCtor = env->GetMethodID(
+                    channelInfoStructClass, "<init>",
+                    "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V");
+                if (channelInfoStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$ChannelClusterChannelInfo constructor");
+                    return nullptr;
+                }
+
+                value = env->NewObject(channelInfoStructClass, channelInfoStructCtor, value_majorNumber, value_minorNumber,
+                                       value_name, value_callSign, value_affiliateCallSign);
             }
-            jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
-                                                                       value);
             return value;
         }
-        case Attributes::ClusterErrorBoolean::Id: {
-            using TypeInfo = Attributes::ClusterErrorBoolean::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14765,14 +14436,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
-                                                                       value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::Unsupported::Id: {
-            using TypeInfo = Attributes::Unsupported::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14780,14 +14460,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Boolean";
-            std::string valueCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
-                                                                       value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::NullableBoolean::Id: {
-            using TypeInfo = Attributes::NullableBoolean::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14795,21 +14484,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Boolean";
-                std::string valueCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::NullableBitmap8::Id: {
-            using TypeInfo = Attributes::NullableBitmap8::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14817,21 +14508,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value().Raw(), value);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::NullableBitmap16::Id: {
-            using TypeInfo = Attributes::NullableBitmap16::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14839,43 +14523,71 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value().Raw(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::NullableBitmap32::Id: {
-            using TypeInfo = Attributes::NullableBitmap32::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::TargetNavigator::Id: {
+        using namespace app::Clusters::TargetNavigator;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::TargetList::Id: {
+            using TypeInfo = Attributes::TargetList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
             {
-                return nullptr;
-            }
-            jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
+                return nullptr;
             }
-            else
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Long";
-                std::string valueCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value().Raw(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_identifier;
+                std::string newElement_0_identifierClassName     = "java/lang/Integer";
+                std::string newElement_0_identifierCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_identifierClassName.c_str(),
+                                                                              newElement_0_identifierCtorSignature.c_str(),
+                                                                              entry_0.identifier, newElement_0_identifier);
+                jobject newElement_0_name;
+                newElement_0_name = env->NewStringUTF(std::string(entry_0.name.data(), entry_0.name.size()).c_str());
+
+                jclass targetInfoStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$TargetNavigatorClusterTargetInfo", targetInfoStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$TargetNavigatorClusterTargetInfo");
+                    return nullptr;
+                }
+                jmethodID targetInfoStructCtor =
+                    env->GetMethodID(targetInfoStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/String;)V");
+                if (targetInfoStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$TargetNavigatorClusterTargetInfo constructor");
+                    return nullptr;
+                }
+
+                newElement_0 =
+                    env->NewObject(targetInfoStructClass, targetInfoStructCtor, newElement_0_identifier, newElement_0_name);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::NullableBitmap64::Id: {
-            using TypeInfo = Attributes::NullableBitmap64::TypeInfo;
+        case Attributes::CurrentTarget::Id: {
+            using TypeInfo = Attributes::CurrentTarget::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14883,21 +14595,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Long";
-                std::string valueCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value().Raw(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::NullableInt8u::Id: {
-            using TypeInfo = Attributes::NullableInt8u::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14905,21 +14610,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::NullableInt16u::Id: {
-            using TypeInfo = Attributes::NullableInt16u::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14927,21 +14634,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::NullableInt24u::Id: {
-            using TypeInfo = Attributes::NullableInt24u::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14949,21 +14658,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Long";
-                std::string valueCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::NullableInt32u::Id: {
-            using TypeInfo = Attributes::NullableInt32u::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14971,21 +14682,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Long";
-                std::string valueCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::NullableInt40u::Id: {
-            using TypeInfo = Attributes::NullableInt40u::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14993,21 +14697,24 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Long";
-                std::string valueCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::NullableInt48u::Id: {
-            using TypeInfo = Attributes::NullableInt48u::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::MediaPlayback::Id: {
+        using namespace app::Clusters::MediaPlayback;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::CurrentState::Id: {
+            using TypeInfo = Attributes::CurrentState::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15015,21 +14722,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Long";
-                std::string valueCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          static_cast<uint8_t>(cppValue), value);
             return value;
         }
-        case Attributes::NullableInt56u::Id: {
-            using TypeInfo = Attributes::NullableInt56u::TypeInfo;
+        case Attributes::StartTime::Id: {
+            using TypeInfo = Attributes::StartTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15050,8 +14750,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             return value;
         }
-        case Attributes::NullableInt64u::Id: {
-            using TypeInfo = Attributes::NullableInt64u::TypeInfo;
+        case Attributes::Duration::Id: {
+            using TypeInfo = Attributes::Duration::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15072,8 +14772,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             return value;
         }
-        case Attributes::NullableInt8s::Id: {
-            using TypeInfo = Attributes::NullableInt8s::TypeInfo;
+        case Attributes::SampledPosition::Id: {
+            using TypeInfo = Attributes::SampledPosition::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15087,15 +14787,48 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             else
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                             cppValue.Value(), value);
+                jobject value_updatedAt;
+                std::string value_updatedAtClassName     = "java/lang/Long";
+                std::string value_updatedAtCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(value_updatedAtClassName.c_str(),
+                                                                               value_updatedAtCtorSignature.c_str(),
+                                                                               cppValue.Value().updatedAt, value_updatedAt);
+                jobject value_position;
+                if (cppValue.Value().position.IsNull())
+                {
+                    value_position = nullptr;
+                }
+                else
+                {
+                    std::string value_positionClassName     = "java/lang/Long";
+                    std::string value_positionCtorSignature = "(J)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(
+                        value_positionClassName.c_str(), value_positionCtorSignature.c_str(), cppValue.Value().position.Value(),
+                        value_position);
+                }
+
+                jclass playbackPositionStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$MediaPlaybackClusterPlaybackPosition", playbackPositionStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$MediaPlaybackClusterPlaybackPosition");
+                    return nullptr;
+                }
+                jmethodID playbackPositionStructCtor =
+                    env->GetMethodID(playbackPositionStructClass, "<init>", "(Ljava/lang/Long;Ljava/lang/Long;)V");
+                if (playbackPositionStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$MediaPlaybackClusterPlaybackPosition constructor");
+                    return nullptr;
+                }
+
+                value = env->NewObject(playbackPositionStructClass, playbackPositionStructCtor, value_updatedAt, value_position);
             }
             return value;
-        }
-        case Attributes::NullableInt16s::Id: {
-            using TypeInfo = Attributes::NullableInt16s::TypeInfo;
+        }
+        case Attributes::PlaybackSpeed::Id: {
+            using TypeInfo = Attributes::PlaybackSpeed::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15103,21 +14836,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Float";
+            std::string valueCtorSignature = "(F)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<float>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        cppValue, value);
             return value;
         }
-        case Attributes::NullableInt24s::Id: {
-            using TypeInfo = Attributes::NullableInt24s::TypeInfo;
+        case Attributes::SeekRangeEnd::Id: {
+            using TypeInfo = Attributes::SeekRangeEnd::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15133,13 +14859,13 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 std::string valueClassName     = "java/lang/Long";
                 std::string valueCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::NullableInt32s::Id: {
-            using TypeInfo = Attributes::NullableInt32s::TypeInfo;
+        case Attributes::SeekRangeStart::Id: {
+            using TypeInfo = Attributes::SeekRangeStart::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15155,13 +14881,13 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 std::string valueClassName     = "java/lang/Long";
                 std::string valueCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::NullableInt40s::Id: {
-            using TypeInfo = Attributes::NullableInt40s::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15169,21 +14895,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Long";
-                std::string valueCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::NullableInt48s::Id: {
-            using TypeInfo = Attributes::NullableInt48s::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15191,21 +14919,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Long";
-                std::string valueCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::NullableInt56s::Id: {
-            using TypeInfo = Attributes::NullableInt56s::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15213,21 +14943,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Long";
-                std::string valueCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::NullableInt64s::Id: {
-            using TypeInfo = Attributes::NullableInt64s::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15235,21 +14967,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Long";
-                std::string valueCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::NullableEnum8::Id: {
-            using TypeInfo = Attributes::NullableEnum8::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15257,21 +14982,24 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::NullableEnum16::Id: {
-            using TypeInfo = Attributes::NullableEnum16::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::MediaInput::Id: {
+        using namespace app::Clusters::MediaInput;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::InputList::Id: {
+            using TypeInfo = Attributes::InputList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15279,21 +15007,56 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_index;
+                std::string newElement_0_indexClassName     = "java/lang/Integer";
+                std::string newElement_0_indexCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_indexClassName.c_str(),
+                                                                              newElement_0_indexCtorSignature.c_str(),
+                                                                              entry_0.index, newElement_0_index);
+                jobject newElement_0_inputType;
+                std::string newElement_0_inputTypeClassName     = "java/lang/Integer";
+                std::string newElement_0_inputTypeCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0_inputTypeClassName.c_str(), newElement_0_inputTypeCtorSignature.c_str(),
+                    static_cast<uint8_t>(entry_0.inputType), newElement_0_inputType);
+                jobject newElement_0_name;
+                newElement_0_name = env->NewStringUTF(std::string(entry_0.name.data(), entry_0.name.size()).c_str());
+                jobject newElement_0_description;
+                newElement_0_description =
+                    env->NewStringUTF(std::string(entry_0.description.data(), entry_0.description.size()).c_str());
+
+                jclass inputInfoStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$MediaInputClusterInputInfo", inputInfoStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$MediaInputClusterInputInfo");
+                    return nullptr;
+                }
+                jmethodID inputInfoStructCtor =
+                    env->GetMethodID(inputInfoStructClass, "<init>",
+                                     "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;)V");
+                if (inputInfoStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$MediaInputClusterInputInfo constructor");
+                    return nullptr;
+                }
+
+                newElement_0 = env->NewObject(inputInfoStructClass, inputInfoStructCtor, newElement_0_index, newElement_0_inputType,
+                                              newElement_0_name, newElement_0_description);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::NullableFloatSingle::Id: {
-            using TypeInfo = Attributes::NullableFloatSingle::TypeInfo;
+        case Attributes::CurrentInput::Id: {
+            using TypeInfo = Attributes::CurrentInput::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15301,21 +15064,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Float";
-                std::string valueCtorSignature = "(F)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<float>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                            cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::NullableFloatDouble::Id: {
-            using TypeInfo = Attributes::NullableFloatDouble::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15323,21 +15079,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Double";
-                std::string valueCtorSignature = "(D)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<double>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                             cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::NullableOctetString::Id: {
-            using TypeInfo = Attributes::NullableOctetString::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15345,21 +15103,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                jbyteArray valueByteArray = env->NewByteArray(static_cast<jsize>(cppValue.Value().size()));
-                env->SetByteArrayRegion(valueByteArray, 0, static_cast<jsize>(cppValue.Value().size()),
-                                        reinterpret_cast<const jbyte *>(cppValue.Value().data()));
-                value = valueByteArray;
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::NullableCharString::Id: {
-            using TypeInfo = Attributes::NullableCharString::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15367,18 +15127,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                value = env->NewStringUTF(std::string(cppValue.Value().data(), cppValue.Value().size()).c_str());
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::NullableEnumAttr::Id: {
-            using TypeInfo = Attributes::NullableEnumAttr::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15386,21 +15151,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              static_cast<uint8_t>(cppValue.Value()), value);
-            }
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::NullableStruct::Id: {
-            using TypeInfo = Attributes::NullableStruct::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15408,75 +15166,24 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                jobject value_a;
-                std::string value_aClassName     = "java/lang/Integer";
-                std::string value_aCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    value_aClassName.c_str(), value_aCtorSignature.c_str(), cppValue.Value().a, value_a);
-                jobject value_b;
-                std::string value_bClassName     = "java/lang/Boolean";
-                std::string value_bCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(value_bClassName.c_str(), value_bCtorSignature.c_str(),
-                                                                           cppValue.Value().b, value_b);
-                jobject value_c;
-                std::string value_cClassName     = "java/lang/Integer";
-                std::string value_cCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    value_cClassName.c_str(), value_cCtorSignature.c_str(), static_cast<uint8_t>(cppValue.Value().c), value_c);
-                jobject value_d;
-                jbyteArray value_dByteArray = env->NewByteArray(static_cast<jsize>(cppValue.Value().d.size()));
-                env->SetByteArrayRegion(value_dByteArray, 0, static_cast<jsize>(cppValue.Value().d.size()),
-                                        reinterpret_cast<const jbyte *>(cppValue.Value().d.data()));
-                value_d = value_dByteArray;
-                jobject value_e;
-                value_e = env->NewStringUTF(std::string(cppValue.Value().e.data(), cppValue.Value().e.size()).c_str());
-                jobject value_f;
-                std::string value_fClassName     = "java/lang/Integer";
-                std::string value_fCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    value_fClassName.c_str(), value_fCtorSignature.c_str(), cppValue.Value().f.Raw(), value_f);
-                jobject value_g;
-                std::string value_gClassName     = "java/lang/Float";
-                std::string value_gCtorSignature = "(F)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<float>(value_gClassName.c_str(), value_gCtorSignature.c_str(),
-                                                                            cppValue.Value().g, value_g);
-                jobject value_h;
-                std::string value_hClassName     = "java/lang/Double";
-                std::string value_hCtorSignature = "(D)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<double>(value_hClassName.c_str(), value_hCtorSignature.c_str(),
-                                                                             cppValue.Value().h, value_h);
-
-                jclass simpleStructStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct", simpleStructStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterSimpleStruct");
-                    return nullptr;
-                }
-                jmethodID simpleStructStructCtor =
-                    env->GetMethodID(simpleStructStructClass, "<init>",
-                                     "(Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;[BLjava/lang/String;Ljava/lang/"
-                                     "Integer;Ljava/lang/Float;Ljava/lang/Double;)V");
-                if (simpleStructStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterSimpleStruct constructor");
-                    return nullptr;
-                }
-
-                value = env->NewObject(simpleStructStructClass, simpleStructStructCtor, value_a, value_b, value_c, value_d, value_e,
-                                       value_f, value_g, value_h);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::NullableRangeRestrictedInt8u::Id: {
-            using TypeInfo = Attributes::NullableRangeRestrictedInt8u::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::LowPower::Id: {
+        using namespace app::Clusters::LowPower;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15484,21 +15191,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::NullableRangeRestrictedInt8s::Id: {
-            using TypeInfo = Attributes::NullableRangeRestrictedInt8s::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15506,21 +15215,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                             cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::NullableRangeRestrictedInt16u::Id: {
-            using TypeInfo = Attributes::NullableRangeRestrictedInt16u::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15528,21 +15239,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::NullableRangeRestrictedInt16s::Id: {
-            using TypeInfo = Attributes::NullableRangeRestrictedInt16s::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15550,19 +15263,37 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::KeypadInput::Id: {
+        using namespace app::Clusters::KeypadInput;
+        switch (aPath.mAttributeId)
+        {
         case Attributes::GeneratedCommandList::Id: {
             using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -15671,12 +15402,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::Thermostat::Id: {
-        using namespace app::Clusters::Thermostat;
+    case app::Clusters::ContentLauncher::Id: {
+        using namespace app::Clusters::ContentLauncher;
         switch (aPath.mAttributeId)
         {
-        case Attributes::LocalTemperature::Id: {
-            using TypeInfo = Attributes::LocalTemperature::TypeInfo;
+        case Attributes::AcceptHeader::Id: {
+            using TypeInfo = Attributes::AcceptHeader::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15684,36 +15415,20 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
-            }
-            return value;
-        }
-        case Attributes::AbsMinHeatSetpointLimit::Id: {
-            using TypeInfo = Attributes::AbsMinHeatSetpointLimit::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                return nullptr;
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                newElement_0 = env->NewStringUTF(std::string(entry_0.data(), entry_0.size()).c_str());
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
             return value;
         }
-        case Attributes::AbsMaxHeatSetpointLimit::Id: {
-            using TypeInfo = Attributes::AbsMaxHeatSetpointLimit::TypeInfo;
+        case Attributes::SupportedStreamingProtocols::Id: {
+            using TypeInfo = Attributes::SupportedStreamingProtocols::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15721,14 +15436,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::AbsMinCoolSetpointLimit::Id: {
-            using TypeInfo = Attributes::AbsMinCoolSetpointLimit::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15736,29 +15451,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
-            return value;
-        }
-        case Attributes::AbsMaxCoolSetpointLimit::Id: {
-            using TypeInfo = Attributes::AbsMaxCoolSetpointLimit::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                return nullptr;
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
             return value;
         }
-        case Attributes::OccupiedCoolingSetpoint::Id: {
-            using TypeInfo = Attributes::OccupiedCoolingSetpoint::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15766,29 +15475,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
-            return value;
-        }
-        case Attributes::OccupiedHeatingSetpoint::Id: {
-            using TypeInfo = Attributes::OccupiedHeatingSetpoint::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                return nullptr;
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
             return value;
         }
-        case Attributes::MinHeatSetpointLimit::Id: {
-            using TypeInfo = Attributes::MinHeatSetpointLimit::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15796,29 +15499,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
-            return value;
-        }
-        case Attributes::MaxHeatSetpointLimit::Id: {
-            using TypeInfo = Attributes::MaxHeatSetpointLimit::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                return nullptr;
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
             return value;
         }
-        case Attributes::MinCoolSetpointLimit::Id: {
-            using TypeInfo = Attributes::MinCoolSetpointLimit::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15826,14 +15523,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::MaxCoolSetpointLimit::Id: {
-            using TypeInfo = Attributes::MaxCoolSetpointLimit::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15843,27 +15540,22 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::MinSetpointDeadBand::Id: {
-            using TypeInfo = Attributes::MinSetpointDeadBand::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                         cppValue, value);
-            return value;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
         }
-        case Attributes::ControlSequenceOfOperation::Id: {
-            using TypeInfo = Attributes::ControlSequenceOfOperation::TypeInfo;
+        break;
+    }
+    case app::Clusters::AudioOutput::Id: {
+        using namespace app::Clusters::AudioOutput;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::OutputList::Id: {
+            using TypeInfo = Attributes::OutputList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15871,29 +15563,52 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          static_cast<uint8_t>(cppValue), value);
-            return value;
-        }
-        case Attributes::SystemMode::Id: {
-            using TypeInfo = Attributes::SystemMode::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                return nullptr;
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_index;
+                std::string newElement_0_indexClassName     = "java/lang/Integer";
+                std::string newElement_0_indexCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_indexClassName.c_str(),
+                                                                              newElement_0_indexCtorSignature.c_str(),
+                                                                              entry_0.index, newElement_0_index);
+                jobject newElement_0_outputType;
+                std::string newElement_0_outputTypeClassName     = "java/lang/Integer";
+                std::string newElement_0_outputTypeCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0_outputTypeClassName.c_str(), newElement_0_outputTypeCtorSignature.c_str(),
+                    static_cast<uint8_t>(entry_0.outputType), newElement_0_outputType);
+                jobject newElement_0_name;
+                newElement_0_name = env->NewStringUTF(std::string(entry_0.name.data(), entry_0.name.size()).c_str());
+
+                jclass outputInfoStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$AudioOutputClusterOutputInfo", outputInfoStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$AudioOutputClusterOutputInfo");
+                    return nullptr;
+                }
+                jmethodID outputInfoStructCtor = env->GetMethodID(outputInfoStructClass, "<init>",
+                                                                  "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;)V");
+                if (outputInfoStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$AudioOutputClusterOutputInfo constructor");
+                    return nullptr;
+                }
+
+                newElement_0 = env->NewObject(outputInfoStructClass, outputInfoStructCtor, newElement_0_index,
+                                              newElement_0_outputType, newElement_0_name);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
             return value;
-        }
-        case Attributes::StartOfWeek::Id: {
-            using TypeInfo = Attributes::StartOfWeek::TypeInfo;
+        }
+        case Attributes::CurrentOutput::Id: {
+            using TypeInfo = Attributes::CurrentOutput::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15907,8 +15622,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                           cppValue, value);
             return value;
         }
-        case Attributes::NumberOfWeeklyTransitions::Id: {
-            using TypeInfo = Attributes::NumberOfWeeklyTransitions::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15916,14 +15631,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::NumberOfDailyTransitions::Id: {
-            using TypeInfo = Attributes::NumberOfDailyTransitions::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15931,10 +15655,19 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
         case Attributes::AttributeList::Id: {
@@ -15997,12 +15730,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::ThermostatUserInterfaceConfiguration::Id: {
-        using namespace app::Clusters::ThermostatUserInterfaceConfiguration;
+    case app::Clusters::ApplicationLauncher::Id: {
+        using namespace app::Clusters::ApplicationLauncher;
         switch (aPath.mAttributeId)
         {
-        case Attributes::TemperatureDisplayMode::Id: {
-            using TypeInfo = Attributes::TemperatureDisplayMode::TypeInfo;
+        case Attributes::CatalogList::Id: {
+            using TypeInfo = Attributes::CatalogList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16010,29 +15743,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
-            return value;
-        }
-        case Attributes::KeypadLockout::Id: {
-            using TypeInfo = Attributes::KeypadLockout::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                return nullptr;
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Integer";
+                std::string newElement_0CtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
             return value;
         }
-        case Attributes::ScheduleProgrammingVisibility::Id: {
-            using TypeInfo = Attributes::ScheduleProgrammingVisibility::TypeInfo;
+        case Attributes::CurrentApp::Id: {
+            using TypeInfo = Attributes::CurrentApp::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16040,10 +15767,77 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                jobject value_application;
+                jobject value_application_catalogVendorId;
+                std::string value_application_catalogVendorIdClassName     = "java/lang/Integer";
+                std::string value_application_catalogVendorIdCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+                    value_application_catalogVendorIdClassName.c_str(), value_application_catalogVendorIdCtorSignature.c_str(),
+                    cppValue.Value().application.catalogVendorId, value_application_catalogVendorId);
+                jobject value_application_applicationId;
+                value_application_applicationId = env->NewStringUTF(std::string(cppValue.Value().application.applicationId.data(),
+                                                                                cppValue.Value().application.applicationId.size())
+                                                                        .c_str());
+
+                jclass applicationStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$ApplicationLauncherClusterApplication", applicationStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$ApplicationLauncherClusterApplication");
+                    return nullptr;
+                }
+                jmethodID applicationStructCtor =
+                    env->GetMethodID(applicationStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/String;)V");
+                if (applicationStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$ApplicationLauncherClusterApplication constructor");
+                    return nullptr;
+                }
+
+                value_application = env->NewObject(applicationStructClass, applicationStructCtor, value_application_catalogVendorId,
+                                                   value_application_applicationId);
+                jobject value_endpoint;
+                if (!cppValue.Value().endpoint.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, value_endpoint);
+                }
+                else
+                {
+                    jobject value_endpointInsideOptional;
+                    std::string value_endpointInsideOptionalClassName     = "java/lang/Integer";
+                    std::string value_endpointInsideOptionalCtorSignature = "(I)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+                        value_endpointInsideOptionalClassName.c_str(), value_endpointInsideOptionalCtorSignature.c_str(),
+                        cppValue.Value().endpoint.Value(), value_endpointInsideOptional);
+                    chip::JniReferences::GetInstance().CreateOptional(value_endpointInsideOptional, value_endpoint);
+                }
+
+                jclass applicationEPStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$ApplicationLauncherClusterApplicationEP", applicationEPStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$ApplicationLauncherClusterApplicationEP");
+                    return nullptr;
+                }
+                jmethodID applicationEPStructCtor = env->GetMethodID(
+                    applicationEPStructClass, "<init>",
+                    "(Lchip/devicecontroller/ChipStructs$ApplicationLauncherClusterApplication;Ljava/util/Optional;)V");
+                if (applicationEPStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$ApplicationLauncherClusterApplicationEP constructor");
+                    return nullptr;
+                }
+
+                value = env->NewObject(applicationEPStructClass, applicationEPStructCtor, value_application, value_endpoint);
+            }
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -16154,12 +15948,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::ThreadNetworkDiagnostics::Id: {
-        using namespace app::Clusters::ThreadNetworkDiagnostics;
+    case app::Clusters::ApplicationBasic::Id: {
+        using namespace app::Clusters::ApplicationBasic;
         switch (aPath.mAttributeId)
         {
-        case Attributes::Channel::Id: {
-            using TypeInfo = Attributes::Channel::TypeInfo;
+        case Attributes::VendorName::Id: {
+            using TypeInfo = Attributes::VendorName::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16167,21 +15961,11 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
-            }
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
             return value;
         }
-        case Attributes::RoutingRole::Id: {
-            using TypeInfo = Attributes::RoutingRole::TypeInfo;
+        case Attributes::VendorID::Id: {
+            using TypeInfo = Attributes::VendorID::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16189,21 +15973,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              static_cast<uint8_t>(cppValue.Value()), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::NetworkName::Id: {
-            using TypeInfo = Attributes::NetworkName::TypeInfo;
+        case Attributes::ApplicationName::Id: {
+            using TypeInfo = Attributes::ApplicationName::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16211,18 +15988,11 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                value = env->NewStringUTF(std::string(cppValue.Value().data(), cppValue.Value().size()).c_str());
-            }
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
             return value;
         }
-        case Attributes::PanId::Id: {
-            using TypeInfo = Attributes::PanId::TypeInfo;
+        case Attributes::ProductID::Id: {
+            using TypeInfo = Attributes::ProductID::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16230,21 +16000,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::ExtendedPanId::Id: {
-            using TypeInfo = Attributes::ExtendedPanId::TypeInfo;
+        case Attributes::Application::Id: {
+            using TypeInfo = Attributes::Application::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16252,21 +16015,39 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
+            jobject value_catalogVendorId;
+            std::string value_catalogVendorIdClassName     = "java/lang/Integer";
+            std::string value_catalogVendorIdCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(value_catalogVendorIdClassName.c_str(),
+                                                                           value_catalogVendorIdCtorSignature.c_str(),
+                                                                           cppValue.catalogVendorId, value_catalogVendorId);
+            jobject value_applicationId;
+            value_applicationId =
+                env->NewStringUTF(std::string(cppValue.applicationId.data(), cppValue.applicationId.size()).c_str());
+
+            jclass applicationBasicApplicationStructClass;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipStructs$ApplicationBasicClusterApplicationBasicApplication",
+                applicationBasicApplicationStructClass);
+            if (err != CHIP_NO_ERROR)
             {
-                value = nullptr;
+                ChipLogError(Zcl, "Could not find class ChipStructs$ApplicationBasicClusterApplicationBasicApplication");
+                return nullptr;
             }
-            else
+            jmethodID applicationBasicApplicationStructCtor =
+                env->GetMethodID(applicationBasicApplicationStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/String;)V");
+            if (applicationBasicApplicationStructCtor == nullptr)
             {
-                std::string valueClassName     = "java/lang/Long";
-                std::string valueCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                ChipLogError(Zcl, "Could not find ChipStructs$ApplicationBasicClusterApplicationBasicApplication constructor");
+                return nullptr;
             }
+
+            value = env->NewObject(applicationBasicApplicationStructClass, applicationBasicApplicationStructCtor,
+                                   value_catalogVendorId, value_applicationId);
             return value;
         }
-        case Attributes::MeshLocalPrefix::Id: {
-            using TypeInfo = Attributes::MeshLocalPrefix::TypeInfo;
+        case Attributes::Status::Id: {
+            using TypeInfo = Attributes::Status::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16274,21 +16055,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                jbyteArray valueByteArray = env->NewByteArray(static_cast<jsize>(cppValue.Value().size()));
-                env->SetByteArrayRegion(valueByteArray, 0, static_cast<jsize>(cppValue.Value().size()),
-                                        reinterpret_cast<const jbyte *>(cppValue.Value().data()));
-                value = valueByteArray;
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          static_cast<uint8_t>(cppValue), value);
             return value;
         }
-        case Attributes::OverrunCount::Id: {
-            using TypeInfo = Attributes::OverrunCount::TypeInfo;
+        case Attributes::ApplicationVersion::Id: {
+            using TypeInfo = Attributes::ApplicationVersion::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16296,14 +16070,11 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
             return value;
         }
-        case Attributes::NeighborTableList::Id: {
-            using TypeInfo = Attributes::NeighborTableList::TypeInfo;
+        case Attributes::AllowedVendorList::Id: {
+            using TypeInfo = Attributes::AllowedVendorList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16318,134 +16089,16 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 auto & entry_0 = iter_value_0.GetValue();
                 jobject newElement_0;
-                jobject newElement_0_extAddress;
-                std::string newElement_0_extAddressClassName     = "java/lang/Long";
-                std::string newElement_0_extAddressCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_extAddressClassName.c_str(),
-                                                                               newElement_0_extAddressCtorSignature.c_str(),
-                                                                               entry_0.extAddress, newElement_0_extAddress);
-                jobject newElement_0_age;
-                std::string newElement_0_ageClassName     = "java/lang/Long";
-                std::string newElement_0_ageCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0_ageClassName.c_str(), newElement_0_ageCtorSignature.c_str(), entry_0.age, newElement_0_age);
-                jobject newElement_0_rloc16;
-                std::string newElement_0_rloc16ClassName     = "java/lang/Integer";
-                std::string newElement_0_rloc16CtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_rloc16ClassName.c_str(),
-                                                                               newElement_0_rloc16CtorSignature.c_str(),
-                                                                               entry_0.rloc16, newElement_0_rloc16);
-                jobject newElement_0_linkFrameCounter;
-                std::string newElement_0_linkFrameCounterClassName     = "java/lang/Long";
-                std::string newElement_0_linkFrameCounterCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0_linkFrameCounterClassName.c_str(), newElement_0_linkFrameCounterCtorSignature.c_str(),
-                    entry_0.linkFrameCounter, newElement_0_linkFrameCounter);
-                jobject newElement_0_mleFrameCounter;
-                std::string newElement_0_mleFrameCounterClassName     = "java/lang/Long";
-                std::string newElement_0_mleFrameCounterCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0_mleFrameCounterClassName.c_str(), newElement_0_mleFrameCounterCtorSignature.c_str(),
-                    entry_0.mleFrameCounter, newElement_0_mleFrameCounter);
-                jobject newElement_0_lqi;
-                std::string newElement_0_lqiClassName     = "java/lang/Integer";
-                std::string newElement_0_lqiCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0_lqiClassName.c_str(), newElement_0_lqiCtorSignature.c_str(), entry_0.lqi, newElement_0_lqi);
-                jobject newElement_0_averageRssi;
-                if (entry_0.averageRssi.IsNull())
-                {
-                    newElement_0_averageRssi = nullptr;
-                }
-                else
-                {
-                    std::string newElement_0_averageRssiClassName     = "java/lang/Integer";
-                    std::string newElement_0_averageRssiCtorSignature = "(I)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(
-                        newElement_0_averageRssiClassName.c_str(), newElement_0_averageRssiCtorSignature.c_str(),
-                        entry_0.averageRssi.Value(), newElement_0_averageRssi);
-                }
-                jobject newElement_0_lastRssi;
-                if (entry_0.lastRssi.IsNull())
-                {
-                    newElement_0_lastRssi = nullptr;
-                }
-                else
-                {
-                    std::string newElement_0_lastRssiClassName     = "java/lang/Integer";
-                    std::string newElement_0_lastRssiCtorSignature = "(I)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(newElement_0_lastRssiClassName.c_str(),
-                                                                                 newElement_0_lastRssiCtorSignature.c_str(),
-                                                                                 entry_0.lastRssi.Value(), newElement_0_lastRssi);
-                }
-                jobject newElement_0_frameErrorRate;
-                std::string newElement_0_frameErrorRateClassName     = "java/lang/Integer";
-                std::string newElement_0_frameErrorRateCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_frameErrorRateClassName.c_str(),
-                                                                              newElement_0_frameErrorRateCtorSignature.c_str(),
-                                                                              entry_0.frameErrorRate, newElement_0_frameErrorRate);
-                jobject newElement_0_messageErrorRate;
-                std::string newElement_0_messageErrorRateClassName     = "java/lang/Integer";
-                std::string newElement_0_messageErrorRateCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0_messageErrorRateClassName.c_str(), newElement_0_messageErrorRateCtorSignature.c_str(),
-                    entry_0.messageErrorRate, newElement_0_messageErrorRate);
-                jobject newElement_0_rxOnWhenIdle;
-                std::string newElement_0_rxOnWhenIdleClassName     = "java/lang/Boolean";
-                std::string newElement_0_rxOnWhenIdleCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_rxOnWhenIdleClassName.c_str(),
-                                                                           newElement_0_rxOnWhenIdleCtorSignature.c_str(),
-                                                                           entry_0.rxOnWhenIdle, newElement_0_rxOnWhenIdle);
-                jobject newElement_0_fullThreadDevice;
-                std::string newElement_0_fullThreadDeviceClassName     = "java/lang/Boolean";
-                std::string newElement_0_fullThreadDeviceCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_fullThreadDeviceClassName.c_str(),
-                                                                           newElement_0_fullThreadDeviceCtorSignature.c_str(),
-                                                                           entry_0.fullThreadDevice, newElement_0_fullThreadDevice);
-                jobject newElement_0_fullNetworkData;
-                std::string newElement_0_fullNetworkDataClassName     = "java/lang/Boolean";
-                std::string newElement_0_fullNetworkDataCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_fullNetworkDataClassName.c_str(),
-                                                                           newElement_0_fullNetworkDataCtorSignature.c_str(),
-                                                                           entry_0.fullNetworkData, newElement_0_fullNetworkData);
-                jobject newElement_0_isChild;
-                std::string newElement_0_isChildClassName     = "java/lang/Boolean";
-                std::string newElement_0_isChildCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_isChildClassName.c_str(),
-                                                                           newElement_0_isChildCtorSignature.c_str(),
-                                                                           entry_0.isChild, newElement_0_isChild);
-
-                jclass neighborTableStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterNeighborTable",
-                    neighborTableStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterNeighborTable");
-                    return nullptr;
-                }
-                jmethodID neighborTableStructCtor =
-                    env->GetMethodID(neighborTableStructClass, "<init>",
-                                     "(Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Long;Ljava/"
-                                     "lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/"
-                                     "Integer;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V");
-                if (neighborTableStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterNeighborTable constructor");
-                    return nullptr;
-                }
-
-                newElement_0 = env->NewObject(
-                    neighborTableStructClass, neighborTableStructCtor, newElement_0_extAddress, newElement_0_age,
-                    newElement_0_rloc16, newElement_0_linkFrameCounter, newElement_0_mleFrameCounter, newElement_0_lqi,
-                    newElement_0_averageRssi, newElement_0_lastRssi, newElement_0_frameErrorRate, newElement_0_messageErrorRate,
-                    newElement_0_rxOnWhenIdle, newElement_0_fullThreadDevice, newElement_0_fullNetworkData, newElement_0_isChild);
+                std::string newElement_0ClassName     = "java/lang/Integer";
+                std::string newElement_0CtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), static_cast<uint16_t>(entry_0), newElement_0);
                 chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::RouteTableList::Id: {
-            using TypeInfo = Attributes::RouteTableList::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16459,95 +16112,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             while (iter_value_0.Next())
             {
                 auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                jobject newElement_0_extAddress;
-                std::string newElement_0_extAddressClassName     = "java/lang/Long";
-                std::string newElement_0_extAddressCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_extAddressClassName.c_str(),
-                                                                               newElement_0_extAddressCtorSignature.c_str(),
-                                                                               entry_0.extAddress, newElement_0_extAddress);
-                jobject newElement_0_rloc16;
-                std::string newElement_0_rloc16ClassName     = "java/lang/Integer";
-                std::string newElement_0_rloc16CtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_rloc16ClassName.c_str(),
-                                                                               newElement_0_rloc16CtorSignature.c_str(),
-                                                                               entry_0.rloc16, newElement_0_rloc16);
-                jobject newElement_0_routerId;
-                std::string newElement_0_routerIdClassName     = "java/lang/Integer";
-                std::string newElement_0_routerIdCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_routerIdClassName.c_str(),
-                                                                              newElement_0_routerIdCtorSignature.c_str(),
-                                                                              entry_0.routerId, newElement_0_routerId);
-                jobject newElement_0_nextHop;
-                std::string newElement_0_nextHopClassName     = "java/lang/Integer";
-                std::string newElement_0_nextHopCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_nextHopClassName.c_str(),
-                                                                              newElement_0_nextHopCtorSignature.c_str(),
-                                                                              entry_0.nextHop, newElement_0_nextHop);
-                jobject newElement_0_pathCost;
-                std::string newElement_0_pathCostClassName     = "java/lang/Integer";
-                std::string newElement_0_pathCostCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_pathCostClassName.c_str(),
-                                                                              newElement_0_pathCostCtorSignature.c_str(),
-                                                                              entry_0.pathCost, newElement_0_pathCost);
-                jobject newElement_0_LQIIn;
-                std::string newElement_0_LQIInClassName     = "java/lang/Integer";
-                std::string newElement_0_LQIInCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_LQIInClassName.c_str(),
-                                                                              newElement_0_LQIInCtorSignature.c_str(),
-                                                                              entry_0.LQIIn, newElement_0_LQIIn);
-                jobject newElement_0_LQIOut;
-                std::string newElement_0_LQIOutClassName     = "java/lang/Integer";
-                std::string newElement_0_LQIOutCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_LQIOutClassName.c_str(),
-                                                                              newElement_0_LQIOutCtorSignature.c_str(),
-                                                                              entry_0.LQIOut, newElement_0_LQIOut);
-                jobject newElement_0_age;
-                std::string newElement_0_ageClassName     = "java/lang/Integer";
-                std::string newElement_0_ageCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0_ageClassName.c_str(), newElement_0_ageCtorSignature.c_str(), entry_0.age, newElement_0_age);
-                jobject newElement_0_allocated;
-                std::string newElement_0_allocatedClassName     = "java/lang/Boolean";
-                std::string newElement_0_allocatedCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_allocatedClassName.c_str(),
-                                                                           newElement_0_allocatedCtorSignature.c_str(),
-                                                                           entry_0.allocated, newElement_0_allocated);
-                jobject newElement_0_linkEstablished;
-                std::string newElement_0_linkEstablishedClassName     = "java/lang/Boolean";
-                std::string newElement_0_linkEstablishedCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_linkEstablishedClassName.c_str(),
-                                                                           newElement_0_linkEstablishedCtorSignature.c_str(),
-                                                                           entry_0.linkEstablished, newElement_0_linkEstablished);
-
-                jclass routeTableStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterRouteTable", routeTableStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterRouteTable");
-                    return nullptr;
-                }
-                jmethodID routeTableStructCtor = env->GetMethodID(
-                    routeTableStructClass, "<init>",
-                    "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/"
-                    "Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Boolean;)V");
-                if (routeTableStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterRouteTable constructor");
-                    return nullptr;
-                }
-
-                newElement_0 =
-                    env->NewObject(routeTableStructClass, routeTableStructCtor, newElement_0_extAddress, newElement_0_rloc16,
-                                   newElement_0_routerId, newElement_0_nextHop, newElement_0_pathCost, newElement_0_LQIIn,
-                                   newElement_0_LQIOut, newElement_0_age, newElement_0_allocated, newElement_0_linkEstablished);
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
                 chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::PartitionId::Id: {
-            using TypeInfo = Attributes::PartitionId::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16555,21 +16130,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Long";
-                std::string valueCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::Weighting::Id: {
-            using TypeInfo = Attributes::Weighting::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16577,21 +16154,38 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                value = nullptr;
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
-            else
+            return value;
+        }
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::DataVersion::Id: {
-            using TypeInfo = Attributes::DataVersion::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16599,21 +16193,48 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::AccountLogin::Id: {
+        using namespace app::Clusters::AccountLogin;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                value = nullptr;
+                return nullptr;
             }
-            else
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::StableDataVersion::Id: {
-            using TypeInfo = Attributes::StableDataVersion::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16621,21 +16242,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::LeaderRouterId::Id: {
-            using TypeInfo = Attributes::LeaderRouterId::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16643,21 +16266,38 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                value = nullptr;
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
-            else
+            return value;
+        }
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              cppValue.Value(), value);
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::DetachedRoleCount::Id: {
-            using TypeInfo = Attributes::DetachedRoleCount::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16671,8 +16311,18 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::ChildRoleCount::Id: {
-            using TypeInfo = Attributes::ChildRoleCount::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::ElectricalMeasurement::Id: {
+        using namespace app::Clusters::ElectricalMeasurement;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::MeasurementType::Id: {
+            using TypeInfo = Attributes::MeasurementType::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16680,14 +16330,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::RouterRoleCount::Id: {
-            using TypeInfo = Attributes::RouterRoleCount::TypeInfo;
+        case Attributes::TotalActivePower::Id: {
+            using TypeInfo = Attributes::TotalActivePower::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16695,14 +16345,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<int32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::LeaderRoleCount::Id: {
-            using TypeInfo = Attributes::LeaderRoleCount::TypeInfo;
+        case Attributes::RmsVoltage::Id: {
+            using TypeInfo = Attributes::RmsVoltage::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16716,8 +16366,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::AttachAttemptCount::Id: {
-            using TypeInfo = Attributes::AttachAttemptCount::TypeInfo;
+        case Attributes::RmsVoltageMin::Id: {
+            using TypeInfo = Attributes::RmsVoltageMin::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16731,8 +16381,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::PartitionIdChangeCount::Id: {
-            using TypeInfo = Attributes::PartitionIdChangeCount::TypeInfo;
+        case Attributes::RmsVoltageMax::Id: {
+            using TypeInfo = Attributes::RmsVoltageMax::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16746,8 +16396,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::BetterPartitionAttachAttemptCount::Id: {
-            using TypeInfo = Attributes::BetterPartitionAttachAttemptCount::TypeInfo;
+        case Attributes::RmsCurrent::Id: {
+            using TypeInfo = Attributes::RmsCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16761,8 +16411,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::ParentChangeCount::Id: {
-            using TypeInfo = Attributes::ParentChangeCount::TypeInfo;
+        case Attributes::RmsCurrentMin::Id: {
+            using TypeInfo = Attributes::RmsCurrentMin::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16776,8 +16426,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::TxTotalCount::Id: {
-            using TypeInfo = Attributes::TxTotalCount::TypeInfo;
+        case Attributes::RmsCurrentMax::Id: {
+            using TypeInfo = Attributes::RmsCurrentMax::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16785,14 +16435,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::TxUnicastCount::Id: {
-            using TypeInfo = Attributes::TxUnicastCount::TypeInfo;
+        case Attributes::ActivePower::Id: {
+            using TypeInfo = Attributes::ActivePower::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16800,14 +16450,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::TxBroadcastCount::Id: {
-            using TypeInfo = Attributes::TxBroadcastCount::TypeInfo;
+        case Attributes::ActivePowerMin::Id: {
+            using TypeInfo = Attributes::ActivePowerMin::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16815,14 +16465,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::TxAckRequestedCount::Id: {
-            using TypeInfo = Attributes::TxAckRequestedCount::TypeInfo;
+        case Attributes::ActivePowerMax::Id: {
+            using TypeInfo = Attributes::ActivePowerMax::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16830,14 +16480,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::TxAckedCount::Id: {
-            using TypeInfo = Attributes::TxAckedCount::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16845,14 +16495,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::TxNoAckRequestedCount::Id: {
-            using TypeInfo = Attributes::TxNoAckRequestedCount::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16860,14 +16519,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::TxDataCount::Id: {
-            using TypeInfo = Attributes::TxDataCount::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16875,14 +16543,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Long";
+                std::string newElement_0CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::TxDataPollCount::Id: {
-            using TypeInfo = Attributes::TxDataPollCount::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16896,8 +16573,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::TxBeaconCount::Id: {
-            using TypeInfo = Attributes::TxBeaconCount::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16905,14 +16582,24 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::TxBeaconRequestCount::Id: {
-            using TypeInfo = Attributes::TxBeaconRequestCount::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case app::Clusters::TestCluster::Id: {
+        using namespace app::Clusters::TestCluster;
+        switch (aPath.mAttributeId)
+        {
+        case Attributes::Boolean::Id: {
+            using TypeInfo = Attributes::Boolean::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16920,14 +16607,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
+                                                                       value);
             return value;
         }
-        case Attributes::TxOtherCount::Id: {
-            using TypeInfo = Attributes::TxOtherCount::TypeInfo;
+        case Attributes::Bitmap8::Id: {
+            using TypeInfo = Attributes::Bitmap8::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16935,14 +16622,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue.Raw(), value);
             return value;
         }
-        case Attributes::TxRetryCount::Id: {
-            using TypeInfo = Attributes::TxRetryCount::TypeInfo;
+        case Attributes::Bitmap16::Id: {
+            using TypeInfo = Attributes::Bitmap16::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16950,14 +16637,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue.Raw(), value);
             return value;
         }
-        case Attributes::TxDirectMaxRetryExpiryCount::Id: {
-            using TypeInfo = Attributes::TxDirectMaxRetryExpiryCount::TypeInfo;
+        case Attributes::Bitmap32::Id: {
+            using TypeInfo = Attributes::Bitmap32::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16968,11 +16655,11 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             std::string valueClassName     = "java/lang/Long";
             std::string valueCtorSignature = "(J)V";
             chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+                                                                           cppValue.Raw(), value);
             return value;
         }
-        case Attributes::TxIndirectMaxRetryExpiryCount::Id: {
-            using TypeInfo = Attributes::TxIndirectMaxRetryExpiryCount::TypeInfo;
+        case Attributes::Bitmap64::Id: {
+            using TypeInfo = Attributes::Bitmap64::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16982,12 +16669,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Long";
             std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue.Raw(), value);
             return value;
         }
-        case Attributes::TxErrCcaCount::Id: {
-            using TypeInfo = Attributes::TxErrCcaCount::TypeInfo;
+        case Attributes::Int8u::Id: {
+            using TypeInfo = Attributes::Int8u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16995,14 +16682,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::TxErrAbortCount::Id: {
-            using TypeInfo = Attributes::TxErrAbortCount::TypeInfo;
+        case Attributes::Int16u::Id: {
+            using TypeInfo = Attributes::Int16u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17010,14 +16697,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::TxErrBusyChannelCount::Id: {
-            using TypeInfo = Attributes::TxErrBusyChannelCount::TypeInfo;
+        case Attributes::Int24u::Id: {
+            using TypeInfo = Attributes::Int24u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17031,8 +16718,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::RxTotalCount::Id: {
-            using TypeInfo = Attributes::RxTotalCount::TypeInfo;
+        case Attributes::Int32u::Id: {
+            using TypeInfo = Attributes::Int32u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17046,8 +16733,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::RxUnicastCount::Id: {
-            using TypeInfo = Attributes::RxUnicastCount::TypeInfo;
+        case Attributes::Int40u::Id: {
+            using TypeInfo = Attributes::Int40u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17057,12 +16744,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Long";
             std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::RxBroadcastCount::Id: {
-            using TypeInfo = Attributes::RxBroadcastCount::TypeInfo;
+        case Attributes::Int48u::Id: {
+            using TypeInfo = Attributes::Int48u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17072,12 +16759,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Long";
             std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::RxDataCount::Id: {
-            using TypeInfo = Attributes::RxDataCount::TypeInfo;
+        case Attributes::Int56u::Id: {
+            using TypeInfo = Attributes::Int56u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17087,12 +16774,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Long";
             std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::RxDataPollCount::Id: {
-            using TypeInfo = Attributes::RxDataPollCount::TypeInfo;
+        case Attributes::Int64u::Id: {
+            using TypeInfo = Attributes::Int64u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17102,12 +16789,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Long";
             std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::RxBeaconCount::Id: {
-            using TypeInfo = Attributes::RxBeaconCount::TypeInfo;
+        case Attributes::Int8s::Id: {
+            using TypeInfo = Attributes::Int8s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17115,14 +16802,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                         cppValue, value);
             return value;
         }
-        case Attributes::RxBeaconRequestCount::Id: {
-            using TypeInfo = Attributes::RxBeaconRequestCount::TypeInfo;
+        case Attributes::Int16s::Id: {
+            using TypeInfo = Attributes::Int16s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17130,14 +16817,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::RxOtherCount::Id: {
-            using TypeInfo = Attributes::RxOtherCount::TypeInfo;
+        case Attributes::Int24s::Id: {
+            using TypeInfo = Attributes::Int24s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17147,12 +16834,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Long";
             std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<int32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::RxAddressFilteredCount::Id: {
-            using TypeInfo = Attributes::RxAddressFilteredCount::TypeInfo;
+        case Attributes::Int32s::Id: {
+            using TypeInfo = Attributes::Int32s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17162,12 +16849,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Long";
             std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<int32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::RxDestAddrFilteredCount::Id: {
-            using TypeInfo = Attributes::RxDestAddrFilteredCount::TypeInfo;
+        case Attributes::Int40s::Id: {
+            using TypeInfo = Attributes::Int40s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17177,12 +16864,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Long";
             std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<int64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
-        }
-        case Attributes::RxDuplicatedCount::Id: {
-            using TypeInfo = Attributes::RxDuplicatedCount::TypeInfo;
+        }
+        case Attributes::Int48s::Id: {
+            using TypeInfo = Attributes::Int48s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17192,12 +16879,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Long";
             std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<int64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::RxErrNoFrameCount::Id: {
-            using TypeInfo = Attributes::RxErrNoFrameCount::TypeInfo;
+        case Attributes::Int56s::Id: {
+            using TypeInfo = Attributes::Int56s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17207,12 +16894,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Long";
             std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<int64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::RxErrUnknownNeighborCount::Id: {
-            using TypeInfo = Attributes::RxErrUnknownNeighborCount::TypeInfo;
+        case Attributes::Int64s::Id: {
+            using TypeInfo = Attributes::Int64s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17222,12 +16909,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Long";
             std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<int64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::RxErrInvalidSrcAddrCount::Id: {
-            using TypeInfo = Attributes::RxErrInvalidSrcAddrCount::TypeInfo;
+        case Attributes::Enum8::Id: {
+            using TypeInfo = Attributes::Enum8::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17235,14 +16922,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::RxErrSecCount::Id: {
-            using TypeInfo = Attributes::RxErrSecCount::TypeInfo;
+        case Attributes::Enum16::Id: {
+            using TypeInfo = Attributes::Enum16::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17250,14 +16937,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::RxErrFcsCount::Id: {
-            using TypeInfo = Attributes::RxErrFcsCount::TypeInfo;
+        case Attributes::FloatSingle::Id: {
+            using TypeInfo = Attributes::FloatSingle::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17265,14 +16952,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Float";
+            std::string valueCtorSignature = "(F)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<float>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                        cppValue, value);
             return value;
         }
-        case Attributes::RxErrOtherCount::Id: {
-            using TypeInfo = Attributes::RxErrOtherCount::TypeInfo;
+        case Attributes::FloatDouble::Id: {
+            using TypeInfo = Attributes::FloatDouble::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17280,14 +16967,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Double";
+            std::string valueCtorSignature = "(D)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<double>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                         cppValue, value);
             return value;
         }
-        case Attributes::ActiveTimestamp::Id: {
-            using TypeInfo = Attributes::ActiveTimestamp::TypeInfo;
+        case Attributes::OctetString::Id: {
+            using TypeInfo = Attributes::OctetString::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17295,21 +16982,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
-            {
-                std::string valueClassName     = "java/lang/Long";
-                std::string valueCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
-            }
+            jbyteArray valueByteArray = env->NewByteArray(static_cast<jsize>(cppValue.size()));
+            env->SetByteArrayRegion(valueByteArray, 0, static_cast<jsize>(cppValue.size()),
+                                    reinterpret_cast<const jbyte *>(cppValue.data()));
+            value = valueByteArray;
             return value;
         }
-        case Attributes::PendingTimestamp::Id: {
-            using TypeInfo = Attributes::PendingTimestamp::TypeInfo;
+        case Attributes::ListInt8u::Id: {
+            using TypeInfo = Attributes::ListInt8u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17317,21 +16997,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Long";
-                std::string valueCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                std::string newElement_0ClassName     = "java/lang/Integer";
+                std::string newElement_0CtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::Delay::Id: {
-            using TypeInfo = Attributes::Delay::TypeInfo;
+        case Attributes::ListOctetString::Id: {
+            using TypeInfo = Attributes::ListOctetString::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17339,21 +17021,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                std::string valueClassName     = "java/lang/Long";
-                std::string valueCtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jbyteArray newElement_0ByteArray = env->NewByteArray(static_cast<jsize>(entry_0.size()));
+                env->SetByteArrayRegion(newElement_0ByteArray, 0, static_cast<jsize>(entry_0.size()),
+                                        reinterpret_cast<const jbyte *>(entry_0.data()));
+                newElement_0 = newElement_0ByteArray;
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::SecurityPolicy::Id: {
-            using TypeInfo = Attributes::SecurityPolicy::TypeInfo;
+        case Attributes::ListStructOctetString::Id: {
+            using TypeInfo = Attributes::ListStructOctetString::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17361,47 +17045,49 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
-            {
-                value = nullptr;
-            }
-            else
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                jobject value_rotationTime;
-                std::string value_rotationTimeClassName     = "java/lang/Integer";
-                std::string value_rotationTimeCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(value_rotationTimeClassName.c_str(),
-                                                                               value_rotationTimeCtorSignature.c_str(),
-                                                                               cppValue.Value().rotationTime, value_rotationTime);
-                jobject value_flags;
-                std::string value_flagsClassName     = "java/lang/Integer";
-                std::string value_flagsCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-                    value_flagsClassName.c_str(), value_flagsCtorSignature.c_str(), cppValue.Value().flags, value_flags);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_member1;
+                std::string newElement_0_member1ClassName     = "java/lang/Long";
+                std::string newElement_0_member1CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_member1ClassName.c_str(),
+                                                                               newElement_0_member1CtorSignature.c_str(),
+                                                                               entry_0.member1, newElement_0_member1);
+                jobject newElement_0_member2;
+                jbyteArray newElement_0_member2ByteArray = env->NewByteArray(static_cast<jsize>(entry_0.member2.size()));
+                env->SetByteArrayRegion(newElement_0_member2ByteArray, 0, static_cast<jsize>(entry_0.member2.size()),
+                                        reinterpret_cast<const jbyte *>(entry_0.member2.data()));
+                newElement_0_member2 = newElement_0_member2ByteArray;
 
-                jclass securityPolicyStructClass;
+                jclass testListStructOctetStructClass;
                 err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterSecurityPolicy",
-                    securityPolicyStructClass);
+                    env, "chip/devicecontroller/ChipStructs$TestClusterClusterTestListStructOctet", testListStructOctetStructClass);
                 if (err != CHIP_NO_ERROR)
                 {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterSecurityPolicy");
+                    ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterTestListStructOctet");
                     return nullptr;
                 }
-                jmethodID securityPolicyStructCtor =
-                    env->GetMethodID(securityPolicyStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;)V");
-                if (securityPolicyStructCtor == nullptr)
+                jmethodID testListStructOctetStructCtor =
+                    env->GetMethodID(testListStructOctetStructClass, "<init>", "(Ljava/lang/Long;[B)V");
+                if (testListStructOctetStructCtor == nullptr)
                 {
-                    ChipLogError(Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterSecurityPolicy constructor");
+                    ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterTestListStructOctet constructor");
                     return nullptr;
                 }
 
-                value = env->NewObject(securityPolicyStructClass, securityPolicyStructCtor, value_rotationTime, value_flags);
+                newElement_0 = env->NewObject(testListStructOctetStructClass, testListStructOctetStructCtor, newElement_0_member1,
+                                              newElement_0_member2);
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::ChannelMask::Id: {
-            using TypeInfo = Attributes::ChannelMask::TypeInfo;
+        case Attributes::LongOctetString::Id: {
+            using TypeInfo = Attributes::LongOctetString::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17409,21 +17095,68 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
+            jbyteArray valueByteArray = env->NewByteArray(static_cast<jsize>(cppValue.size()));
+            env->SetByteArrayRegion(valueByteArray, 0, static_cast<jsize>(cppValue.size()),
+                                    reinterpret_cast<const jbyte *>(cppValue.data()));
+            value = valueByteArray;
+            return value;
+        }
+        case Attributes::CharString::Id: {
+            using TypeInfo = Attributes::CharString::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                value = nullptr;
+                return nullptr;
             }
-            else
+            jobject value;
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
+            return value;
+        }
+        case Attributes::LongCharString::Id: {
+            using TypeInfo = Attributes::LongCharString::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                jbyteArray valueByteArray = env->NewByteArray(static_cast<jsize>(cppValue.Value().size()));
-                env->SetByteArrayRegion(valueByteArray, 0, static_cast<jsize>(cppValue.Value().size()),
-                                        reinterpret_cast<const jbyte *>(cppValue.Value().data()));
-                value = valueByteArray;
+                return nullptr;
+            }
+            jobject value;
+            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
+            return value;
+        }
+        case Attributes::EpochUs::Id: {
+            using TypeInfo = Attributes::EpochUs::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
+            return value;
+        }
+        case Attributes::EpochS::Id: {
+            using TypeInfo = Attributes::EpochS::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
             }
+            jobject value;
+            std::string valueClassName     = "java/lang/Long";
+            std::string valueCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue, value);
             return value;
         }
-        case Attributes::OperationalDatasetComponents::Id: {
-            using TypeInfo = Attributes::OperationalDatasetComponents::TypeInfo;
+        case Attributes::VendorId::Id: {
+            using TypeInfo = Attributes::VendorId::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17431,395 +17164,511 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           static_cast<uint16_t>(cppValue), value);
+            return value;
+        }
+        case Attributes::ListNullablesAndOptionalsStruct::Id: {
+            using TypeInfo = Attributes::ListNullablesAndOptionalsStruct::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                value = nullptr;
+                return nullptr;
             }
-            else
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                jobject value_activeTimestampPresent;
-                std::string value_activeTimestampPresentClassName     = "java/lang/Boolean";
-                std::string value_activeTimestampPresentCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                    value_activeTimestampPresentClassName.c_str(), value_activeTimestampPresentCtorSignature.c_str(),
-                    cppValue.Value().activeTimestampPresent, value_activeTimestampPresent);
-                jobject value_pendingTimestampPresent;
-                std::string value_pendingTimestampPresentClassName     = "java/lang/Boolean";
-                std::string value_pendingTimestampPresentCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                    value_pendingTimestampPresentClassName.c_str(), value_pendingTimestampPresentCtorSignature.c_str(),
-                    cppValue.Value().pendingTimestampPresent, value_pendingTimestampPresent);
-                jobject value_masterKeyPresent;
-                std::string value_masterKeyPresentClassName     = "java/lang/Boolean";
-                std::string value_masterKeyPresentCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                    value_masterKeyPresentClassName.c_str(), value_masterKeyPresentCtorSignature.c_str(),
-                    cppValue.Value().masterKeyPresent, value_masterKeyPresent);
-                jobject value_networkNamePresent;
-                std::string value_networkNamePresentClassName     = "java/lang/Boolean";
-                std::string value_networkNamePresentCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                    value_networkNamePresentClassName.c_str(), value_networkNamePresentCtorSignature.c_str(),
-                    cppValue.Value().networkNamePresent, value_networkNamePresent);
-                jobject value_extendedPanIdPresent;
-                std::string value_extendedPanIdPresentClassName     = "java/lang/Boolean";
-                std::string value_extendedPanIdPresentCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                    value_extendedPanIdPresentClassName.c_str(), value_extendedPanIdPresentCtorSignature.c_str(),
-                    cppValue.Value().extendedPanIdPresent, value_extendedPanIdPresent);
-                jobject value_meshLocalPrefixPresent;
-                std::string value_meshLocalPrefixPresentClassName     = "java/lang/Boolean";
-                std::string value_meshLocalPrefixPresentCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                    value_meshLocalPrefixPresentClassName.c_str(), value_meshLocalPrefixPresentCtorSignature.c_str(),
-                    cppValue.Value().meshLocalPrefixPresent, value_meshLocalPrefixPresent);
-                jobject value_delayPresent;
-                std::string value_delayPresentClassName     = "java/lang/Boolean";
-                std::string value_delayPresentCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(value_delayPresentClassName.c_str(),
-                                                                           value_delayPresentCtorSignature.c_str(),
-                                                                           cppValue.Value().delayPresent, value_delayPresent);
-                jobject value_panIdPresent;
-                std::string value_panIdPresentClassName     = "java/lang/Boolean";
-                std::string value_panIdPresentCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(value_panIdPresentClassName.c_str(),
-                                                                           value_panIdPresentCtorSignature.c_str(),
-                                                                           cppValue.Value().panIdPresent, value_panIdPresent);
-                jobject value_channelPresent;
-                std::string value_channelPresentClassName     = "java/lang/Boolean";
-                std::string value_channelPresentCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(value_channelPresentClassName.c_str(),
-                                                                           value_channelPresentCtorSignature.c_str(),
-                                                                           cppValue.Value().channelPresent, value_channelPresent);
-                jobject value_pskcPresent;
-                std::string value_pskcPresentClassName     = "java/lang/Boolean";
-                std::string value_pskcPresentCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(value_pskcPresentClassName.c_str(),
-                                                                           value_pskcPresentCtorSignature.c_str(),
-                                                                           cppValue.Value().pskcPresent, value_pskcPresent);
-                jobject value_securityPolicyPresent;
-                std::string value_securityPolicyPresentClassName     = "java/lang/Boolean";
-                std::string value_securityPolicyPresentCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                    value_securityPolicyPresentClassName.c_str(), value_securityPolicyPresentCtorSignature.c_str(),
-                    cppValue.Value().securityPolicyPresent, value_securityPolicyPresent);
-                jobject value_channelMaskPresent;
-                std::string value_channelMaskPresentClassName     = "java/lang/Boolean";
-                std::string value_channelMaskPresentCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                    value_channelMaskPresentClassName.c_str(), value_channelMaskPresentCtorSignature.c_str(),
-                    cppValue.Value().channelMaskPresent, value_channelMaskPresent);
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_nullableInt;
+                if (entry_0.nullableInt.IsNull())
+                {
+                    newElement_0_nullableInt = nullptr;
+                }
+                else
+                {
+                    std::string newElement_0_nullableIntClassName     = "java/lang/Integer";
+                    std::string newElement_0_nullableIntCtorSignature = "(I)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+                        newElement_0_nullableIntClassName.c_str(), newElement_0_nullableIntCtorSignature.c_str(),
+                        entry_0.nullableInt.Value(), newElement_0_nullableInt);
+                }
+                jobject newElement_0_optionalInt;
+                if (!entry_0.optionalInt.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_optionalInt);
+                }
+                else
+                {
+                    jobject newElement_0_optionalIntInsideOptional;
+                    std::string newElement_0_optionalIntInsideOptionalClassName     = "java/lang/Integer";
+                    std::string newElement_0_optionalIntInsideOptionalCtorSignature = "(I)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+                        newElement_0_optionalIntInsideOptionalClassName.c_str(),
+                        newElement_0_optionalIntInsideOptionalCtorSignature.c_str(), entry_0.optionalInt.Value(),
+                        newElement_0_optionalIntInsideOptional);
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_optionalIntInsideOptional,
+                                                                      newElement_0_optionalInt);
+                }
+                jobject newElement_0_nullableOptionalInt;
+                if (!entry_0.nullableOptionalInt.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_nullableOptionalInt);
+                }
+                else
+                {
+                    jobject newElement_0_nullableOptionalIntInsideOptional;
+                    if (entry_0.nullableOptionalInt.Value().IsNull())
+                    {
+                        newElement_0_nullableOptionalIntInsideOptional = nullptr;
+                    }
+                    else
+                    {
+                        std::string newElement_0_nullableOptionalIntInsideOptionalClassName     = "java/lang/Integer";
+                        std::string newElement_0_nullableOptionalIntInsideOptionalCtorSignature = "(I)V";
+                        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+                            newElement_0_nullableOptionalIntInsideOptionalClassName.c_str(),
+                            newElement_0_nullableOptionalIntInsideOptionalCtorSignature.c_str(),
+                            entry_0.nullableOptionalInt.Value().Value(), newElement_0_nullableOptionalIntInsideOptional);
+                    }
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_nullableOptionalIntInsideOptional,
+                                                                      newElement_0_nullableOptionalInt);
+                }
+                jobject newElement_0_nullableString;
+                if (entry_0.nullableString.IsNull())
+                {
+                    newElement_0_nullableString = nullptr;
+                }
+                else
+                {
+                    newElement_0_nullableString = env->NewStringUTF(
+                        std::string(entry_0.nullableString.Value().data(), entry_0.nullableString.Value().size()).c_str());
+                }
+                jobject newElement_0_optionalString;
+                if (!entry_0.optionalString.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_optionalString);
+                }
+                else
+                {
+                    jobject newElement_0_optionalStringInsideOptional;
+                    newElement_0_optionalStringInsideOptional = env->NewStringUTF(
+                        std::string(entry_0.optionalString.Value().data(), entry_0.optionalString.Value().size()).c_str());
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_optionalStringInsideOptional,
+                                                                      newElement_0_optionalString);
+                }
+                jobject newElement_0_nullableOptionalString;
+                if (!entry_0.nullableOptionalString.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_nullableOptionalString);
+                }
+                else
+                {
+                    jobject newElement_0_nullableOptionalStringInsideOptional;
+                    if (entry_0.nullableOptionalString.Value().IsNull())
+                    {
+                        newElement_0_nullableOptionalStringInsideOptional = nullptr;
+                    }
+                    else
+                    {
+                        newElement_0_nullableOptionalStringInsideOptional =
+                            env->NewStringUTF(std::string(entry_0.nullableOptionalString.Value().Value().data(),
+                                                          entry_0.nullableOptionalString.Value().Value().size())
+                                                  .c_str());
+                    }
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_nullableOptionalStringInsideOptional,
+                                                                      newElement_0_nullableOptionalString);
+                }
+                jobject newElement_0_nullableStruct;
+                if (entry_0.nullableStruct.IsNull())
+                {
+                    newElement_0_nullableStruct = nullptr;
+                }
+                else
+                {
+                    jobject newElement_0_nullableStruct_a;
+                    std::string newElement_0_nullableStruct_aClassName     = "java/lang/Integer";
+                    std::string newElement_0_nullableStruct_aCtorSignature = "(I)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                        newElement_0_nullableStruct_aClassName.c_str(), newElement_0_nullableStruct_aCtorSignature.c_str(),
+                        entry_0.nullableStruct.Value().a, newElement_0_nullableStruct_a);
+                    jobject newElement_0_nullableStruct_b;
+                    std::string newElement_0_nullableStruct_bClassName     = "java/lang/Boolean";
+                    std::string newElement_0_nullableStruct_bCtorSignature = "(Z)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
+                        newElement_0_nullableStruct_bClassName.c_str(), newElement_0_nullableStruct_bCtorSignature.c_str(),
+                        entry_0.nullableStruct.Value().b, newElement_0_nullableStruct_b);
+                    jobject newElement_0_nullableStruct_c;
+                    std::string newElement_0_nullableStruct_cClassName     = "java/lang/Integer";
+                    std::string newElement_0_nullableStruct_cCtorSignature = "(I)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                        newElement_0_nullableStruct_cClassName.c_str(), newElement_0_nullableStruct_cCtorSignature.c_str(),
+                        static_cast<uint8_t>(entry_0.nullableStruct.Value().c), newElement_0_nullableStruct_c);
+                    jobject newElement_0_nullableStruct_d;
+                    jbyteArray newElement_0_nullableStruct_dByteArray =
+                        env->NewByteArray(static_cast<jsize>(entry_0.nullableStruct.Value().d.size()));
+                    env->SetByteArrayRegion(newElement_0_nullableStruct_dByteArray, 0,
+                                            static_cast<jsize>(entry_0.nullableStruct.Value().d.size()),
+                                            reinterpret_cast<const jbyte *>(entry_0.nullableStruct.Value().d.data()));
+                    newElement_0_nullableStruct_d = newElement_0_nullableStruct_dByteArray;
+                    jobject newElement_0_nullableStruct_e;
+                    newElement_0_nullableStruct_e = env->NewStringUTF(
+                        std::string(entry_0.nullableStruct.Value().e.data(), entry_0.nullableStruct.Value().e.size()).c_str());
+                    jobject newElement_0_nullableStruct_f;
+                    std::string newElement_0_nullableStruct_fClassName     = "java/lang/Integer";
+                    std::string newElement_0_nullableStruct_fCtorSignature = "(I)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                        newElement_0_nullableStruct_fClassName.c_str(), newElement_0_nullableStruct_fCtorSignature.c_str(),
+                        entry_0.nullableStruct.Value().f.Raw(), newElement_0_nullableStruct_f);
+                    jobject newElement_0_nullableStruct_g;
+                    std::string newElement_0_nullableStruct_gClassName     = "java/lang/Float";
+                    std::string newElement_0_nullableStruct_gCtorSignature = "(F)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<float>(
+                        newElement_0_nullableStruct_gClassName.c_str(), newElement_0_nullableStruct_gCtorSignature.c_str(),
+                        entry_0.nullableStruct.Value().g, newElement_0_nullableStruct_g);
+                    jobject newElement_0_nullableStruct_h;
+                    std::string newElement_0_nullableStruct_hClassName     = "java/lang/Double";
+                    std::string newElement_0_nullableStruct_hCtorSignature = "(D)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<double>(
+                        newElement_0_nullableStruct_hClassName.c_str(), newElement_0_nullableStruct_hCtorSignature.c_str(),
+                        entry_0.nullableStruct.Value().h, newElement_0_nullableStruct_h);
+
+                    jclass simpleStructStructClass;
+                    err = chip::JniReferences::GetInstance().GetClassRef(
+                        env, "chip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct", simpleStructStructClass);
+                    if (err != CHIP_NO_ERROR)
+                    {
+                        ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterSimpleStruct");
+                        return nullptr;
+                    }
+                    jmethodID simpleStructStructCtor =
+                        env->GetMethodID(simpleStructStructClass, "<init>",
+                                         "(Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;[BLjava/lang/String;Ljava/lang/"
+                                         "Integer;Ljava/lang/Float;Ljava/lang/Double;)V");
+                    if (simpleStructStructCtor == nullptr)
+                    {
+                        ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterSimpleStruct constructor");
+                        return nullptr;
+                    }
 
-                jclass operationalDatasetComponentsStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterOperationalDatasetComponents",
-                    operationalDatasetComponentsStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl,
-                                 "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterOperationalDatasetComponents");
-                    return nullptr;
+                    newElement_0_nullableStruct =
+                        env->NewObject(simpleStructStructClass, simpleStructStructCtor, newElement_0_nullableStruct_a,
+                                       newElement_0_nullableStruct_b, newElement_0_nullableStruct_c, newElement_0_nullableStruct_d,
+                                       newElement_0_nullableStruct_e, newElement_0_nullableStruct_f, newElement_0_nullableStruct_g,
+                                       newElement_0_nullableStruct_h);
                 }
-                jmethodID operationalDatasetComponentsStructCtor =
-                    env->GetMethodID(operationalDatasetComponentsStructClass, "<init>",
-                                     "(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/"
-                                     "Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/"
-                                     "lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V");
-                if (operationalDatasetComponentsStructCtor == nullptr)
+                jobject newElement_0_optionalStruct;
+                if (!entry_0.optionalStruct.HasValue())
                 {
-                    ChipLogError(
-                        Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterOperationalDatasetComponents constructor");
-                    return nullptr;
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_optionalStruct);
                 }
+                else
+                {
+                    jobject newElement_0_optionalStructInsideOptional;
+                    jobject newElement_0_optionalStructInsideOptional_a;
+                    std::string newElement_0_optionalStructInsideOptional_aClassName     = "java/lang/Integer";
+                    std::string newElement_0_optionalStructInsideOptional_aCtorSignature = "(I)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                        newElement_0_optionalStructInsideOptional_aClassName.c_str(),
+                        newElement_0_optionalStructInsideOptional_aCtorSignature.c_str(), entry_0.optionalStruct.Value().a,
+                        newElement_0_optionalStructInsideOptional_a);
+                    jobject newElement_0_optionalStructInsideOptional_b;
+                    std::string newElement_0_optionalStructInsideOptional_bClassName     = "java/lang/Boolean";
+                    std::string newElement_0_optionalStructInsideOptional_bCtorSignature = "(Z)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
+                        newElement_0_optionalStructInsideOptional_bClassName.c_str(),
+                        newElement_0_optionalStructInsideOptional_bCtorSignature.c_str(), entry_0.optionalStruct.Value().b,
+                        newElement_0_optionalStructInsideOptional_b);
+                    jobject newElement_0_optionalStructInsideOptional_c;
+                    std::string newElement_0_optionalStructInsideOptional_cClassName     = "java/lang/Integer";
+                    std::string newElement_0_optionalStructInsideOptional_cCtorSignature = "(I)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                        newElement_0_optionalStructInsideOptional_cClassName.c_str(),
+                        newElement_0_optionalStructInsideOptional_cCtorSignature.c_str(),
+                        static_cast<uint8_t>(entry_0.optionalStruct.Value().c), newElement_0_optionalStructInsideOptional_c);
+                    jobject newElement_0_optionalStructInsideOptional_d;
+                    jbyteArray newElement_0_optionalStructInsideOptional_dByteArray =
+                        env->NewByteArray(static_cast<jsize>(entry_0.optionalStruct.Value().d.size()));
+                    env->SetByteArrayRegion(newElement_0_optionalStructInsideOptional_dByteArray, 0,
+                                            static_cast<jsize>(entry_0.optionalStruct.Value().d.size()),
+                                            reinterpret_cast<const jbyte *>(entry_0.optionalStruct.Value().d.data()));
+                    newElement_0_optionalStructInsideOptional_d = newElement_0_optionalStructInsideOptional_dByteArray;
+                    jobject newElement_0_optionalStructInsideOptional_e;
+                    newElement_0_optionalStructInsideOptional_e = env->NewStringUTF(
+                        std::string(entry_0.optionalStruct.Value().e.data(), entry_0.optionalStruct.Value().e.size()).c_str());
+                    jobject newElement_0_optionalStructInsideOptional_f;
+                    std::string newElement_0_optionalStructInsideOptional_fClassName     = "java/lang/Integer";
+                    std::string newElement_0_optionalStructInsideOptional_fCtorSignature = "(I)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                        newElement_0_optionalStructInsideOptional_fClassName.c_str(),
+                        newElement_0_optionalStructInsideOptional_fCtorSignature.c_str(), entry_0.optionalStruct.Value().f.Raw(),
+                        newElement_0_optionalStructInsideOptional_f);
+                    jobject newElement_0_optionalStructInsideOptional_g;
+                    std::string newElement_0_optionalStructInsideOptional_gClassName     = "java/lang/Float";
+                    std::string newElement_0_optionalStructInsideOptional_gCtorSignature = "(F)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<float>(
+                        newElement_0_optionalStructInsideOptional_gClassName.c_str(),
+                        newElement_0_optionalStructInsideOptional_gCtorSignature.c_str(), entry_0.optionalStruct.Value().g,
+                        newElement_0_optionalStructInsideOptional_g);
+                    jobject newElement_0_optionalStructInsideOptional_h;
+                    std::string newElement_0_optionalStructInsideOptional_hClassName     = "java/lang/Double";
+                    std::string newElement_0_optionalStructInsideOptional_hCtorSignature = "(D)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<double>(
+                        newElement_0_optionalStructInsideOptional_hClassName.c_str(),
+                        newElement_0_optionalStructInsideOptional_hCtorSignature.c_str(), entry_0.optionalStruct.Value().h,
+                        newElement_0_optionalStructInsideOptional_h);
 
-                value = env->NewObject(operationalDatasetComponentsStructClass, operationalDatasetComponentsStructCtor,
-                                       value_activeTimestampPresent, value_pendingTimestampPresent, value_masterKeyPresent,
-                                       value_networkNamePresent, value_extendedPanIdPresent, value_meshLocalPrefixPresent,
-                                       value_delayPresent, value_panIdPresent, value_channelPresent, value_pskcPresent,
-                                       value_securityPolicyPresent, value_channelMaskPresent);
-            }
-            return value;
-        }
-        case Attributes::ActiveNetworkFaultsList::Id: {
-            using TypeInfo = Attributes::ActiveNetworkFaultsList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
+                    jclass simpleStructStructClass;
+                    err = chip::JniReferences::GetInstance().GetClassRef(
+                        env, "chip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct", simpleStructStructClass);
+                    if (err != CHIP_NO_ERROR)
+                    {
+                        ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterSimpleStruct");
+                        return nullptr;
+                    }
+                    jmethodID simpleStructStructCtor =
+                        env->GetMethodID(simpleStructStructClass, "<init>",
+                                         "(Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;[BLjava/lang/String;Ljava/lang/"
+                                         "Integer;Ljava/lang/Float;Ljava/lang/Double;)V");
+                    if (simpleStructStructCtor == nullptr)
+                    {
+                        ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterSimpleStruct constructor");
+                        return nullptr;
+                    }
 
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Integer";
-                std::string newElement_0CtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), static_cast<uint8_t>(entry_0), newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
+                    newElement_0_optionalStructInsideOptional =
+                        env->NewObject(simpleStructStructClass, simpleStructStructCtor, newElement_0_optionalStructInsideOptional_a,
+                                       newElement_0_optionalStructInsideOptional_b, newElement_0_optionalStructInsideOptional_c,
+                                       newElement_0_optionalStructInsideOptional_d, newElement_0_optionalStructInsideOptional_e,
+                                       newElement_0_optionalStructInsideOptional_f, newElement_0_optionalStructInsideOptional_g,
+                                       newElement_0_optionalStructInsideOptional_h);
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_optionalStructInsideOptional,
+                                                                      newElement_0_optionalStruct);
+                }
+                jobject newElement_0_nullableOptionalStruct;
+                if (!entry_0.nullableOptionalStruct.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_nullableOptionalStruct);
+                }
+                else
+                {
+                    jobject newElement_0_nullableOptionalStructInsideOptional;
+                    if (entry_0.nullableOptionalStruct.Value().IsNull())
+                    {
+                        newElement_0_nullableOptionalStructInsideOptional = nullptr;
+                    }
+                    else
+                    {
+                        jobject newElement_0_nullableOptionalStructInsideOptional_a;
+                        std::string newElement_0_nullableOptionalStructInsideOptional_aClassName     = "java/lang/Integer";
+                        std::string newElement_0_nullableOptionalStructInsideOptional_aCtorSignature = "(I)V";
+                        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                            newElement_0_nullableOptionalStructInsideOptional_aClassName.c_str(),
+                            newElement_0_nullableOptionalStructInsideOptional_aCtorSignature.c_str(),
+                            entry_0.nullableOptionalStruct.Value().Value().a, newElement_0_nullableOptionalStructInsideOptional_a);
+                        jobject newElement_0_nullableOptionalStructInsideOptional_b;
+                        std::string newElement_0_nullableOptionalStructInsideOptional_bClassName     = "java/lang/Boolean";
+                        std::string newElement_0_nullableOptionalStructInsideOptional_bCtorSignature = "(Z)V";
+                        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
+                            newElement_0_nullableOptionalStructInsideOptional_bClassName.c_str(),
+                            newElement_0_nullableOptionalStructInsideOptional_bCtorSignature.c_str(),
+                            entry_0.nullableOptionalStruct.Value().Value().b, newElement_0_nullableOptionalStructInsideOptional_b);
+                        jobject newElement_0_nullableOptionalStructInsideOptional_c;
+                        std::string newElement_0_nullableOptionalStructInsideOptional_cClassName     = "java/lang/Integer";
+                        std::string newElement_0_nullableOptionalStructInsideOptional_cCtorSignature = "(I)V";
+                        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                            newElement_0_nullableOptionalStructInsideOptional_cClassName.c_str(),
+                            newElement_0_nullableOptionalStructInsideOptional_cCtorSignature.c_str(),
+                            static_cast<uint8_t>(entry_0.nullableOptionalStruct.Value().Value().c),
+                            newElement_0_nullableOptionalStructInsideOptional_c);
+                        jobject newElement_0_nullableOptionalStructInsideOptional_d;
+                        jbyteArray newElement_0_nullableOptionalStructInsideOptional_dByteArray =
+                            env->NewByteArray(static_cast<jsize>(entry_0.nullableOptionalStruct.Value().Value().d.size()));
+                        env->SetByteArrayRegion(
+                            newElement_0_nullableOptionalStructInsideOptional_dByteArray, 0,
+                            static_cast<jsize>(entry_0.nullableOptionalStruct.Value().Value().d.size()),
+                            reinterpret_cast<const jbyte *>(entry_0.nullableOptionalStruct.Value().Value().d.data()));
+                        newElement_0_nullableOptionalStructInsideOptional_d =
+                            newElement_0_nullableOptionalStructInsideOptional_dByteArray;
+                        jobject newElement_0_nullableOptionalStructInsideOptional_e;
+                        newElement_0_nullableOptionalStructInsideOptional_e =
+                            env->NewStringUTF(std::string(entry_0.nullableOptionalStruct.Value().Value().e.data(),
+                                                          entry_0.nullableOptionalStruct.Value().Value().e.size())
+                                                  .c_str());
+                        jobject newElement_0_nullableOptionalStructInsideOptional_f;
+                        std::string newElement_0_nullableOptionalStructInsideOptional_fClassName     = "java/lang/Integer";
+                        std::string newElement_0_nullableOptionalStructInsideOptional_fCtorSignature = "(I)V";
+                        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                            newElement_0_nullableOptionalStructInsideOptional_fClassName.c_str(),
+                            newElement_0_nullableOptionalStructInsideOptional_fCtorSignature.c_str(),
+                            entry_0.nullableOptionalStruct.Value().Value().f.Raw(),
+                            newElement_0_nullableOptionalStructInsideOptional_f);
+                        jobject newElement_0_nullableOptionalStructInsideOptional_g;
+                        std::string newElement_0_nullableOptionalStructInsideOptional_gClassName     = "java/lang/Float";
+                        std::string newElement_0_nullableOptionalStructInsideOptional_gCtorSignature = "(F)V";
+                        chip::JniReferences::GetInstance().CreateBoxedObject<float>(
+                            newElement_0_nullableOptionalStructInsideOptional_gClassName.c_str(),
+                            newElement_0_nullableOptionalStructInsideOptional_gCtorSignature.c_str(),
+                            entry_0.nullableOptionalStruct.Value().Value().g, newElement_0_nullableOptionalStructInsideOptional_g);
+                        jobject newElement_0_nullableOptionalStructInsideOptional_h;
+                        std::string newElement_0_nullableOptionalStructInsideOptional_hClassName     = "java/lang/Double";
+                        std::string newElement_0_nullableOptionalStructInsideOptional_hCtorSignature = "(D)V";
+                        chip::JniReferences::GetInstance().CreateBoxedObject<double>(
+                            newElement_0_nullableOptionalStructInsideOptional_hClassName.c_str(),
+                            newElement_0_nullableOptionalStructInsideOptional_hCtorSignature.c_str(),
+                            entry_0.nullableOptionalStruct.Value().Value().h, newElement_0_nullableOptionalStructInsideOptional_h);
 
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
+                        jclass simpleStructStructClass;
+                        err = chip::JniReferences::GetInstance().GetClassRef(
+                            env, "chip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct", simpleStructStructClass);
+                        if (err != CHIP_NO_ERROR)
+                        {
+                            ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterSimpleStruct");
+                            return nullptr;
+                        }
+                        jmethodID simpleStructStructCtor =
+                            env->GetMethodID(simpleStructStructClass, "<init>",
+                                             "(Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;[BLjava/lang/String;Ljava/"
+                                             "lang/Integer;Ljava/lang/Float;Ljava/lang/Double;)V");
+                        if (simpleStructStructCtor == nullptr)
+                        {
+                            ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterSimpleStruct constructor");
+                            return nullptr;
+                        }
 
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
+                        newElement_0_nullableOptionalStructInsideOptional = env->NewObject(
+                            simpleStructStructClass, simpleStructStructCtor, newElement_0_nullableOptionalStructInsideOptional_a,
+                            newElement_0_nullableOptionalStructInsideOptional_b,
+                            newElement_0_nullableOptionalStructInsideOptional_c,
+                            newElement_0_nullableOptionalStructInsideOptional_d,
+                            newElement_0_nullableOptionalStructInsideOptional_e,
+                            newElement_0_nullableOptionalStructInsideOptional_f,
+                            newElement_0_nullableOptionalStructInsideOptional_g,
+                            newElement_0_nullableOptionalStructInsideOptional_h);
+                    }
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_nullableOptionalStructInsideOptional,
+                                                                      newElement_0_nullableOptionalStruct);
+                }
+                jobject newElement_0_nullableList;
+                if (entry_0.nullableList.IsNull())
+                {
+                    newElement_0_nullableList = nullptr;
+                }
+                else
+                {
+                    chip::JniReferences::GetInstance().CreateArrayList(newElement_0_nullableList);
 
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::TimeFormatLocalization::Id: {
-        using namespace app::Clusters::TimeFormatLocalization;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::HourFormat::Id: {
-            using TypeInfo = Attributes::HourFormat::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          static_cast<uint8_t>(cppValue), value);
-            return value;
-        }
-        case Attributes::ActiveCalendarType::Id: {
-            using TypeInfo = Attributes::ActiveCalendarType::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          static_cast<uint8_t>(cppValue), value);
-            return value;
-        }
-        case Attributes::SupportedCalendarTypes::Id: {
-            using TypeInfo = Attributes::SupportedCalendarTypes::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
+                    auto iter_newElement_0_nullableList_3 = entry_0.nullableList.Value().begin();
+                    while (iter_newElement_0_nullableList_3.Next())
+                    {
+                        auto & entry_3 = iter_newElement_0_nullableList_3.GetValue();
+                        jobject newElement_3;
+                        std::string newElement_3ClassName     = "java/lang/Integer";
+                        std::string newElement_3CtorSignature = "(I)V";
+                        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_3ClassName.c_str(),
+                                                                                      newElement_3CtorSignature.c_str(),
+                                                                                      static_cast<uint8_t>(entry_3), newElement_3);
+                        chip::JniReferences::GetInstance().AddToList(newElement_0_nullableList, newElement_3);
+                    }
+                }
+                jobject newElement_0_optionalList;
+                if (!entry_0.optionalList.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_optionalList);
+                }
+                else
+                {
+                    jobject newElement_0_optionalListInsideOptional;
+                    chip::JniReferences::GetInstance().CreateArrayList(newElement_0_optionalListInsideOptional);
 
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Integer";
-                std::string newElement_0CtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), static_cast<uint8_t>(entry_0), newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
+                    auto iter_newElement_0_optionalListInsideOptional_3 = entry_0.optionalList.Value().begin();
+                    while (iter_newElement_0_optionalListInsideOptional_3.Next())
+                    {
+                        auto & entry_3 = iter_newElement_0_optionalListInsideOptional_3.GetValue();
+                        jobject newElement_3;
+                        std::string newElement_3ClassName     = "java/lang/Integer";
+                        std::string newElement_3CtorSignature = "(I)V";
+                        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_3ClassName.c_str(),
+                                                                                      newElement_3CtorSignature.c_str(),
+                                                                                      static_cast<uint8_t>(entry_3), newElement_3);
+                        chip::JniReferences::GetInstance().AddToList(newElement_0_optionalListInsideOptional, newElement_3);
+                    }
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_optionalListInsideOptional,
+                                                                      newElement_0_optionalList);
+                }
+                jobject newElement_0_nullableOptionalList;
+                if (!entry_0.nullableOptionalList.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_nullableOptionalList);
+                }
+                else
+                {
+                    jobject newElement_0_nullableOptionalListInsideOptional;
+                    if (entry_0.nullableOptionalList.Value().IsNull())
+                    {
+                        newElement_0_nullableOptionalListInsideOptional = nullptr;
+                    }
+                    else
+                    {
+                        chip::JniReferences::GetInstance().CreateArrayList(newElement_0_nullableOptionalListInsideOptional);
 
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
+                        auto iter_newElement_0_nullableOptionalListInsideOptional_4 =
+                            entry_0.nullableOptionalList.Value().Value().begin();
+                        while (iter_newElement_0_nullableOptionalListInsideOptional_4.Next())
+                        {
+                            auto & entry_4 = iter_newElement_0_nullableOptionalListInsideOptional_4.GetValue();
+                            jobject newElement_4;
+                            std::string newElement_4ClassName     = "java/lang/Integer";
+                            std::string newElement_4CtorSignature = "(I)V";
+                            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                                newElement_4ClassName.c_str(), newElement_4CtorSignature.c_str(), static_cast<uint8_t>(entry_4),
+                                newElement_4);
+                            chip::JniReferences::GetInstance().AddToList(newElement_0_nullableOptionalListInsideOptional,
+                                                                         newElement_4);
+                        }
+                    }
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_nullableOptionalListInsideOptional,
+                                                                      newElement_0_nullableOptionalList);
+                }
 
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+                jclass nullablesAndOptionalsStructStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$TestClusterClusterNullablesAndOptionalsStruct",
+                    nullablesAndOptionalsStructStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterNullablesAndOptionalsStruct");
+                    return nullptr;
+                }
+                jmethodID nullablesAndOptionalsStructStructCtor = env->GetMethodID(
+                    nullablesAndOptionalsStructStructClass, "<init>",
+                    "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/lang/String;Ljava/util/Optional;Ljava/util/"
+                    "Optional;Lchip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct;Ljava/util/Optional;Ljava/util/"
+                    "Optional;Ljava/util/ArrayList;Ljava/util/Optional;Ljava/util/Optional;)V");
+                if (nullablesAndOptionalsStructStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterNullablesAndOptionalsStruct constructor");
+                    return nullptr;
+                }
+
+                newElement_0 =
+                    env->NewObject(nullablesAndOptionalsStructStructClass, nullablesAndOptionalsStructStructCtor,
+                                   newElement_0_nullableInt, newElement_0_optionalInt, newElement_0_nullableOptionalInt,
+                                   newElement_0_nullableString, newElement_0_optionalString, newElement_0_nullableOptionalString,
+                                   newElement_0_nullableStruct, newElement_0_optionalStruct, newElement_0_nullableOptionalStruct,
+                                   newElement_0_nullableList, newElement_0_optionalList, newElement_0_nullableOptionalList);
                 chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::UnitLocalization::Id: {
-        using namespace app::Clusters::UnitLocalization;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::TemperatureUnit::Id: {
-            using TypeInfo = Attributes::TemperatureUnit::TypeInfo;
+        case Attributes::EnumAttr::Id: {
+            using TypeInfo = Attributes::EnumAttr::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17833,8 +17682,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                           static_cast<uint8_t>(cppValue), value);
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::StructAttr::Id: {
+            using TypeInfo = Attributes::StructAttr::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17842,106 +17691,68 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
+            jobject value_a;
+            std::string value_aClassName     = "java/lang/Integer";
+            std::string value_aCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(value_aClassName.c_str(), value_aCtorSignature.c_str(),
+                                                                          cppValue.a, value_a);
+            jobject value_b;
+            std::string value_bClassName     = "java/lang/Boolean";
+            std::string value_bCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(value_bClassName.c_str(), value_bCtorSignature.c_str(),
+                                                                       cppValue.b, value_b);
+            jobject value_c;
+            std::string value_cClassName     = "java/lang/Integer";
+            std::string value_cCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(value_cClassName.c_str(), value_cCtorSignature.c_str(),
+                                                                          static_cast<uint8_t>(cppValue.c), value_c);
+            jobject value_d;
+            jbyteArray value_dByteArray = env->NewByteArray(static_cast<jsize>(cppValue.d.size()));
+            env->SetByteArrayRegion(value_dByteArray, 0, static_cast<jsize>(cppValue.d.size()),
+                                    reinterpret_cast<const jbyte *>(cppValue.d.data()));
+            value_d = value_dByteArray;
+            jobject value_e;
+            value_e = env->NewStringUTF(std::string(cppValue.e.data(), cppValue.e.size()).c_str());
+            jobject value_f;
+            std::string value_fClassName     = "java/lang/Integer";
+            std::string value_fCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(value_fClassName.c_str(), value_fCtorSignature.c_str(),
+                                                                          cppValue.f.Raw(), value_f);
+            jobject value_g;
+            std::string value_gClassName     = "java/lang/Float";
+            std::string value_gCtorSignature = "(F)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<float>(value_gClassName.c_str(), value_gCtorSignature.c_str(),
+                                                                        cppValue.g, value_g);
+            jobject value_h;
+            std::string value_hClassName     = "java/lang/Double";
+            std::string value_hCtorSignature = "(D)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<double>(value_hClassName.c_str(), value_hCtorSignature.c_str(),
+                                                                         cppValue.h, value_h);
 
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
-            return value;
-        }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            jclass simpleStructStructClass;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct", simpleStructStructClass);
+            if (err != CHIP_NO_ERROR)
             {
+                ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterSimpleStruct");
                 return nullptr;
             }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::UserLabel::Id: {
-        using namespace app::Clusters::UserLabel;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::LabelList::Id: {
-            using TypeInfo = Attributes::LabelList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            jmethodID simpleStructStructCtor =
+                env->GetMethodID(simpleStructStructClass, "<init>",
+                                 "(Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;[BLjava/lang/String;Ljava/lang/"
+                                 "Integer;Ljava/lang/Float;Ljava/lang/Double;)V");
+            if (simpleStructStructCtor == nullptr)
             {
+                ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterSimpleStruct constructor");
                 return nullptr;
             }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                jobject newElement_0_label;
-                newElement_0_label = env->NewStringUTF(std::string(entry_0.label.data(), entry_0.label.size()).c_str());
-                jobject newElement_0_value;
-                newElement_0_value = env->NewStringUTF(std::string(entry_0.value.data(), entry_0.value.size()).c_str());
-
-                jclass labelStructStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$UserLabelClusterLabelStruct", labelStructStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$UserLabelClusterLabelStruct");
-                    return nullptr;
-                }
-                jmethodID labelStructStructCtor =
-                    env->GetMethodID(labelStructStructClass, "<init>", "(Ljava/lang/String;Ljava/lang/String;)V");
-                if (labelStructStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$UserLabelClusterLabelStruct constructor");
-                    return nullptr;
-                }
 
-                newElement_0 =
-                    env->NewObject(labelStructStructClass, labelStructStructCtor, newElement_0_label, newElement_0_value);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            value = env->NewObject(simpleStructStructClass, simpleStructStructCtor, value_a, value_b, value_c, value_d, value_e,
+                                   value_f, value_g, value_h);
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::RangeRestrictedInt8u::Id: {
+            using TypeInfo = Attributes::RangeRestrictedInt8u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17949,23 +17760,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::RangeRestrictedInt8s::Id: {
+            using TypeInfo = Attributes::RangeRestrictedInt8s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17973,23 +17775,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                         cppValue, value);
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::RangeRestrictedInt16u::Id: {
+            using TypeInfo = Attributes::RangeRestrictedInt16u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17997,14 +17790,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+            std::string valueClassName     = "java/lang/Integer";
+            std::string valueCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                            cppValue, value);
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::RangeRestrictedInt16s::Id: {
+            using TypeInfo = Attributes::RangeRestrictedInt16s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18014,22 +17807,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             std::string valueClassName     = "java/lang/Integer";
             std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                          cppValue, value);
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::WakeOnLan::Id: {
-        using namespace app::Clusters::WakeOnLan;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::MACAddress::Id: {
-            using TypeInfo = Attributes::MACAddress::TypeInfo;
+        case Attributes::ListLongOctetString::Id: {
+            using TypeInfo = Attributes::ListLongOctetString::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18037,11 +17820,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str());
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jbyteArray newElement_0ByteArray = env->NewByteArray(static_cast<jsize>(entry_0.size()));
+                env->SetByteArrayRegion(newElement_0ByteArray, 0, static_cast<jsize>(entry_0.size()),
+                                        reinterpret_cast<const jbyte *>(entry_0.data()));
+                newElement_0 = newElement_0ByteArray;
+                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+            }
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::ListFabricScoped::Id: {
+            using TypeInfo = Attributes::ListFabricScoped::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18051,21 +17846,205 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             jobject value;
             chip::JniReferences::GetInstance().CreateArrayList(value);
 
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
+            {
+                auto & entry_0 = iter_value_0.GetValue();
+                jobject newElement_0;
+                jobject newElement_0_fabricSensitiveInt8u;
+                std::string newElement_0_fabricSensitiveInt8uClassName     = "java/lang/Integer";
+                std::string newElement_0_fabricSensitiveInt8uCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0_fabricSensitiveInt8uClassName.c_str(), newElement_0_fabricSensitiveInt8uCtorSignature.c_str(),
+                    entry_0.fabricSensitiveInt8u, newElement_0_fabricSensitiveInt8u);
+                jobject newElement_0_optionalFabricSensitiveInt8u;
+                if (!entry_0.optionalFabricSensitiveInt8u.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_optionalFabricSensitiveInt8u);
+                }
+                else
+                {
+                    jobject newElement_0_optionalFabricSensitiveInt8uInsideOptional;
+                    std::string newElement_0_optionalFabricSensitiveInt8uInsideOptionalClassName     = "java/lang/Integer";
+                    std::string newElement_0_optionalFabricSensitiveInt8uInsideOptionalCtorSignature = "(I)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                        newElement_0_optionalFabricSensitiveInt8uInsideOptionalClassName.c_str(),
+                        newElement_0_optionalFabricSensitiveInt8uInsideOptionalCtorSignature.c_str(),
+                        entry_0.optionalFabricSensitiveInt8u.Value(), newElement_0_optionalFabricSensitiveInt8uInsideOptional);
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_0_optionalFabricSensitiveInt8uInsideOptional,
+                                                                      newElement_0_optionalFabricSensitiveInt8u);
+                }
+                jobject newElement_0_nullableFabricSensitiveInt8u;
+                if (entry_0.nullableFabricSensitiveInt8u.IsNull())
+                {
+                    newElement_0_nullableFabricSensitiveInt8u = nullptr;
+                }
+                else
+                {
+                    std::string newElement_0_nullableFabricSensitiveInt8uClassName     = "java/lang/Integer";
+                    std::string newElement_0_nullableFabricSensitiveInt8uCtorSignature = "(I)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                        newElement_0_nullableFabricSensitiveInt8uClassName.c_str(),
+                        newElement_0_nullableFabricSensitiveInt8uCtorSignature.c_str(),
+                        entry_0.nullableFabricSensitiveInt8u.Value(), newElement_0_nullableFabricSensitiveInt8u);
+                }
+                jobject newElement_0_nullableOptionalFabricSensitiveInt8u;
+                if (!entry_0.nullableOptionalFabricSensitiveInt8u.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_nullableOptionalFabricSensitiveInt8u);
+                }
+                else
+                {
+                    jobject newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptional;
+                    if (entry_0.nullableOptionalFabricSensitiveInt8u.Value().IsNull())
+                    {
+                        newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptional = nullptr;
+                    }
+                    else
+                    {
+                        std::string newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptionalClassName = "java/lang/Integer";
+                        std::string newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptionalCtorSignature = "(I)V";
+                        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                            newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptionalClassName.c_str(),
+                            newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptionalCtorSignature.c_str(),
+                            entry_0.nullableOptionalFabricSensitiveInt8u.Value().Value(),
+                            newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptional);
+                    }
+                    chip::JniReferences::GetInstance().CreateOptional(
+                        newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptional,
+                        newElement_0_nullableOptionalFabricSensitiveInt8u);
+                }
+                jobject newElement_0_fabricSensitiveCharString;
+                newElement_0_fabricSensitiveCharString = env->NewStringUTF(
+                    std::string(entry_0.fabricSensitiveCharString.data(), entry_0.fabricSensitiveCharString.size()).c_str());
+                jobject newElement_0_fabricSensitiveStruct;
+                jobject newElement_0_fabricSensitiveStruct_a;
+                std::string newElement_0_fabricSensitiveStruct_aClassName     = "java/lang/Integer";
+                std::string newElement_0_fabricSensitiveStruct_aCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0_fabricSensitiveStruct_aClassName.c_str(),
+                    newElement_0_fabricSensitiveStruct_aCtorSignature.c_str(), entry_0.fabricSensitiveStruct.a,
+                    newElement_0_fabricSensitiveStruct_a);
+                jobject newElement_0_fabricSensitiveStruct_b;
+                std::string newElement_0_fabricSensitiveStruct_bClassName     = "java/lang/Boolean";
+                std::string newElement_0_fabricSensitiveStruct_bCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
+                    newElement_0_fabricSensitiveStruct_bClassName.c_str(),
+                    newElement_0_fabricSensitiveStruct_bCtorSignature.c_str(), entry_0.fabricSensitiveStruct.b,
+                    newElement_0_fabricSensitiveStruct_b);
+                jobject newElement_0_fabricSensitiveStruct_c;
+                std::string newElement_0_fabricSensitiveStruct_cClassName     = "java/lang/Integer";
+                std::string newElement_0_fabricSensitiveStruct_cCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0_fabricSensitiveStruct_cClassName.c_str(),
+                    newElement_0_fabricSensitiveStruct_cCtorSignature.c_str(),
+                    static_cast<uint8_t>(entry_0.fabricSensitiveStruct.c), newElement_0_fabricSensitiveStruct_c);
+                jobject newElement_0_fabricSensitiveStruct_d;
+                jbyteArray newElement_0_fabricSensitiveStruct_dByteArray =
+                    env->NewByteArray(static_cast<jsize>(entry_0.fabricSensitiveStruct.d.size()));
+                env->SetByteArrayRegion(newElement_0_fabricSensitiveStruct_dByteArray, 0,
+                                        static_cast<jsize>(entry_0.fabricSensitiveStruct.d.size()),
+                                        reinterpret_cast<const jbyte *>(entry_0.fabricSensitiveStruct.d.data()));
+                newElement_0_fabricSensitiveStruct_d = newElement_0_fabricSensitiveStruct_dByteArray;
+                jobject newElement_0_fabricSensitiveStruct_e;
+                newElement_0_fabricSensitiveStruct_e = env->NewStringUTF(
+                    std::string(entry_0.fabricSensitiveStruct.e.data(), entry_0.fabricSensitiveStruct.e.size()).c_str());
+                jobject newElement_0_fabricSensitiveStruct_f;
+                std::string newElement_0_fabricSensitiveStruct_fClassName     = "java/lang/Integer";
+                std::string newElement_0_fabricSensitiveStruct_fCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0_fabricSensitiveStruct_fClassName.c_str(),
+                    newElement_0_fabricSensitiveStruct_fCtorSignature.c_str(), entry_0.fabricSensitiveStruct.f.Raw(),
+                    newElement_0_fabricSensitiveStruct_f);
+                jobject newElement_0_fabricSensitiveStruct_g;
+                std::string newElement_0_fabricSensitiveStruct_gClassName     = "java/lang/Float";
+                std::string newElement_0_fabricSensitiveStruct_gCtorSignature = "(F)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<float>(
+                    newElement_0_fabricSensitiveStruct_gClassName.c_str(),
+                    newElement_0_fabricSensitiveStruct_gCtorSignature.c_str(), entry_0.fabricSensitiveStruct.g,
+                    newElement_0_fabricSensitiveStruct_g);
+                jobject newElement_0_fabricSensitiveStruct_h;
+                std::string newElement_0_fabricSensitiveStruct_hClassName     = "java/lang/Double";
+                std::string newElement_0_fabricSensitiveStruct_hCtorSignature = "(D)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<double>(
+                    newElement_0_fabricSensitiveStruct_hClassName.c_str(),
+                    newElement_0_fabricSensitiveStruct_hCtorSignature.c_str(), entry_0.fabricSensitiveStruct.h,
+                    newElement_0_fabricSensitiveStruct_h);
+
+                jclass simpleStructStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct", simpleStructStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterSimpleStruct");
+                    return nullptr;
+                }
+                jmethodID simpleStructStructCtor =
+                    env->GetMethodID(simpleStructStructClass, "<init>",
+                                     "(Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;[BLjava/lang/String;Ljava/lang/"
+                                     "Integer;Ljava/lang/Float;Ljava/lang/Double;)V");
+                if (simpleStructStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterSimpleStruct constructor");
+                    return nullptr;
+                }
+
+                newElement_0_fabricSensitiveStruct =
+                    env->NewObject(simpleStructStructClass, simpleStructStructCtor, newElement_0_fabricSensitiveStruct_a,
+                                   newElement_0_fabricSensitiveStruct_b, newElement_0_fabricSensitiveStruct_c,
+                                   newElement_0_fabricSensitiveStruct_d, newElement_0_fabricSensitiveStruct_e,
+                                   newElement_0_fabricSensitiveStruct_f, newElement_0_fabricSensitiveStruct_g,
+                                   newElement_0_fabricSensitiveStruct_h);
+                jobject newElement_0_fabricSensitiveInt8uList;
+                chip::JniReferences::GetInstance().CreateArrayList(newElement_0_fabricSensitiveInt8uList);
+
+                auto iter_newElement_0_fabricSensitiveInt8uList_2 = entry_0.fabricSensitiveInt8uList.begin();
+                while (iter_newElement_0_fabricSensitiveInt8uList_2.Next())
+                {
+                    auto & entry_2 = iter_newElement_0_fabricSensitiveInt8uList_2.GetValue();
+                    jobject newElement_2;
+                    std::string newElement_2ClassName     = "java/lang/Integer";
+                    std::string newElement_2CtorSignature = "(I)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                        newElement_2ClassName.c_str(), newElement_2CtorSignature.c_str(), entry_2, newElement_2);
+                    chip::JniReferences::GetInstance().AddToList(newElement_0_fabricSensitiveInt8uList, newElement_2);
+                }
+                jobject newElement_0_fabricIndex;
+                std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
+                std::string newElement_0_fabricIndexCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
+                                                                              newElement_0_fabricIndexCtorSignature.c_str(),
+                                                                              entry_0.fabricIndex, newElement_0_fabricIndex);
+
+                jclass testFabricScopedStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$TestClusterClusterTestFabricScoped", testFabricScopedStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterTestFabricScoped");
+                    return nullptr;
+                }
+                jmethodID testFabricScopedStructCtor = env->GetMethodID(
+                    testFabricScopedStructClass, "<init>",
+                    "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/lang/Integer;Ljava/util/Optional;Ljava/lang/String;Lchip/"
+                    "devicecontroller/ChipStructs$TestClusterClusterSimpleStruct;Ljava/util/ArrayList;Ljava/lang/Integer;)V");
+                if (testFabricScopedStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterTestFabricScoped constructor");
+                    return nullptr;
+                }
+
+                newElement_0 = env->NewObject(
+                    testFabricScopedStructClass, testFabricScopedStructCtor, newElement_0_fabricSensitiveInt8u,
+                    newElement_0_optionalFabricSensitiveInt8u, newElement_0_nullableFabricSensitiveInt8u,
+                    newElement_0_nullableOptionalFabricSensitiveInt8u, newElement_0_fabricSensitiveCharString,
+                    newElement_0_fabricSensitiveStruct, newElement_0_fabricSensitiveInt8uList, newElement_0_fabricIndex);
                 chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::TimedWriteBoolean::Id: {
+            using TypeInfo = Attributes::TimedWriteBoolean::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18073,23 +18052,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
+                                                                       value);
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::GeneralErrorBoolean::Id: {
+            using TypeInfo = Attributes::GeneralErrorBoolean::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18097,23 +18067,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
-            {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
+                                                                       value);
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::ClusterErrorBoolean::Id: {
+            using TypeInfo = Attributes::ClusterErrorBoolean::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18121,14 +18082,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
+                                                                       value);
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::Unsupported::Id: {
+            using TypeInfo = Attributes::Unsupported::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18136,24 +18097,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            std::string valueClassName     = "java/lang/Boolean";
+            std::string valueCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(), cppValue,
+                                                                       value);
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::WiFiNetworkDiagnostics::Id: {
-        using namespace app::Clusters::WiFiNetworkDiagnostics;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::Bssid::Id: {
-            using TypeInfo = Attributes::Bssid::TypeInfo;
+        case Attributes::NullableBoolean::Id: {
+            using TypeInfo = Attributes::NullableBoolean::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18167,15 +18118,15 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             else
             {
-                jbyteArray valueByteArray = env->NewByteArray(static_cast<jsize>(cppValue.Value().size()));
-                env->SetByteArrayRegion(valueByteArray, 0, static_cast<jsize>(cppValue.Value().size()),
-                                        reinterpret_cast<const jbyte *>(cppValue.Value().data()));
-                value = valueByteArray;
+                std::string valueClassName     = "java/lang/Boolean";
+                std::string valueCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                           cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::SecurityType::Id: {
-            using TypeInfo = Attributes::SecurityType::TypeInfo;
+        case Attributes::NullableBitmap8::Id: {
+            using TypeInfo = Attributes::NullableBitmap8::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18192,12 +18143,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 std::string valueClassName     = "java/lang/Integer";
                 std::string valueCtorSignature = "(I)V";
                 chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              static_cast<uint8_t>(cppValue.Value()), value);
+                                                                              cppValue.Value().Raw(), value);
             }
             return value;
         }
-        case Attributes::WiFiVersion::Id: {
-            using TypeInfo = Attributes::WiFiVersion::TypeInfo;
+        case Attributes::NullableBitmap16::Id: {
+            using TypeInfo = Attributes::NullableBitmap16::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18213,13 +18164,13 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 std::string valueClassName     = "java/lang/Integer";
                 std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                              static_cast<uint8_t>(cppValue.Value()), value);
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value().Raw(), value);
             }
             return value;
         }
-        case Attributes::ChannelNumber::Id: {
-            using TypeInfo = Attributes::ChannelNumber::TypeInfo;
+        case Attributes::NullableBitmap32::Id: {
+            using TypeInfo = Attributes::NullableBitmap32::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18233,15 +18184,15 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             else
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value().Raw(), value);
             }
             return value;
         }
-        case Attributes::Rssi::Id: {
-            using TypeInfo = Attributes::Rssi::TypeInfo;
+        case Attributes::NullableBitmap64::Id: {
+            using TypeInfo = Attributes::NullableBitmap64::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18255,45 +18206,15 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             else
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                             cppValue.Value(), value);
-            }
-            return value;
-        }
-        case Attributes::BeaconLostCount::Id: {
-            using TypeInfo = Attributes::BeaconLostCount::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        case Attributes::BeaconRxCount::Id: {
-            using TypeInfo = Attributes::BeaconRxCount::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value().Raw(), value);
             }
-            jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
             return value;
         }
-        case Attributes::PacketMulticastRxCount::Id: {
-            using TypeInfo = Attributes::PacketMulticastRxCount::TypeInfo;
+        case Attributes::NullableInt8u::Id: {
+            using TypeInfo = Attributes::NullableInt8u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18301,44 +18222,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        case Attributes::PacketMulticastTxCount::Id: {
-            using TypeInfo = Attributes::PacketMulticastTxCount::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            if (cppValue.IsNull())
             {
-                return nullptr;
+                value = nullptr;
             }
-            jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        case Attributes::PacketUnicastRxCount::Id: {
-            using TypeInfo = Attributes::PacketUnicastRxCount::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            else
             {
-                return nullptr;
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
             }
-            jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
             return value;
         }
-        case Attributes::PacketUnicastTxCount::Id: {
-            using TypeInfo = Attributes::PacketUnicastTxCount::TypeInfo;
+        case Attributes::NullableInt16u::Id: {
+            using TypeInfo = Attributes::NullableInt16u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18346,44 +18244,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        case Attributes::CurrentMaxRate::Id: {
-            using TypeInfo = Attributes::CurrentMaxRate::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            if (cppValue.IsNull())
             {
-                return nullptr;
+                value = nullptr;
             }
-            jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
-            return value;
-        }
-        case Attributes::OverrunCount::Id: {
-            using TypeInfo = Attributes::OverrunCount::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            else
             {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::NullableInt24u::Id: {
+            using TypeInfo = Attributes::NullableInt24u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18391,23 +18266,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::NullableInt32u::Id: {
+            using TypeInfo = Attributes::NullableInt32u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18415,23 +18288,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::NullableInt40u::Id: {
+            using TypeInfo = Attributes::NullableInt40u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18439,23 +18310,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            if (cppValue.IsNull())
             {
-                auto & entry_0 = iter_value_0.GetValue();
-                jobject newElement_0;
-                std::string newElement_0ClassName     = "java/lang/Long";
-                std::string newElement_0CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                    newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::NullableInt48u::Id: {
+            using TypeInfo = Attributes::NullableInt48u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18463,14 +18332,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Long";
-            std::string valueCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::NullableInt56u::Id: {
+            using TypeInfo = Attributes::NullableInt56u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18478,24 +18354,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case app::Clusters::WindowCovering::Id: {
-        using namespace app::Clusters::WindowCovering;
-        switch (aPath.mAttributeId)
-        {
-        case Attributes::Type::Id: {
-            using TypeInfo = Attributes::Type::TypeInfo;
+        case Attributes::NullableInt64u::Id: {
+            using TypeInfo = Attributes::NullableInt64u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18503,14 +18376,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          static_cast<uint8_t>(cppValue), value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::PhysicalClosedLimitLift::Id: {
-            using TypeInfo = Attributes::PhysicalClosedLimitLift::TypeInfo;
+        case Attributes::NullableInt8s::Id: {
+            using TypeInfo = Attributes::NullableInt8s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18518,14 +18398,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                             cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::PhysicalClosedLimitTilt::Id: {
-            using TypeInfo = Attributes::PhysicalClosedLimitTilt::TypeInfo;
+        case Attributes::NullableInt16s::Id: {
+            using TypeInfo = Attributes::NullableInt16s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18533,14 +18420,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::CurrentPositionLift::Id: {
-            using TypeInfo = Attributes::CurrentPositionLift::TypeInfo;
+        case Attributes::NullableInt24s::Id: {
+            using TypeInfo = Attributes::NullableInt24s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18554,15 +18448,15 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             else
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::CurrentPositionTilt::Id: {
-            using TypeInfo = Attributes::CurrentPositionTilt::TypeInfo;
+        case Attributes::NullableInt32s::Id: {
+            using TypeInfo = Attributes::NullableInt32s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18576,15 +18470,15 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             else
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int32_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::NumberOfActuationsLift::Id: {
-            using TypeInfo = Attributes::NumberOfActuationsLift::TypeInfo;
+        case Attributes::NullableInt40s::Id: {
+            using TypeInfo = Attributes::NullableInt40s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18592,14 +18486,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::NumberOfActuationsTilt::Id: {
-            using TypeInfo = Attributes::NumberOfActuationsTilt::TypeInfo;
+        case Attributes::NullableInt48s::Id: {
+            using TypeInfo = Attributes::NullableInt48s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18607,14 +18508,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::ConfigStatus::Id: {
-            using TypeInfo = Attributes::ConfigStatus::TypeInfo;
+        case Attributes::NullableInt56s::Id: {
+            using TypeInfo = Attributes::NullableInt56s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18622,14 +18530,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue.Raw(), value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::CurrentPositionLiftPercentage::Id: {
-            using TypeInfo = Attributes::CurrentPositionLiftPercentage::TypeInfo;
+        case Attributes::NullableInt64s::Id: {
+            using TypeInfo = Attributes::NullableInt64s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18643,15 +18558,15 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             else
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                std::string valueClassName     = "java/lang/Long";
+                std::string valueCtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
                                                                               cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::CurrentPositionTiltPercentage::Id: {
-            using TypeInfo = Attributes::CurrentPositionTiltPercentage::TypeInfo;
+        case Attributes::NullableEnum8::Id: {
+            using TypeInfo = Attributes::NullableEnum8::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18672,23 +18587,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             return value;
         }
-        case Attributes::OperationalStatus::Id: {
-            using TypeInfo = Attributes::OperationalStatus::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue.Raw(), value);
-            return value;
-        }
-        case Attributes::TargetPositionLiftPercent100ths::Id: {
-            using TypeInfo = Attributes::TargetPositionLiftPercent100ths::TypeInfo;
+        case Attributes::NullableEnum16::Id: {
+            using TypeInfo = Attributes::NullableEnum16::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18709,8 +18609,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             return value;
         }
-        case Attributes::TargetPositionTiltPercent100ths::Id: {
-            using TypeInfo = Attributes::TargetPositionTiltPercent100ths::TypeInfo;
+        case Attributes::NullableFloatSingle::Id: {
+            using TypeInfo = Attributes::NullableFloatSingle::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18724,15 +18624,15 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             else
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                std::string valueClassName     = "java/lang/Float";
+                std::string valueCtorSignature = "(F)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<float>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                            cppValue.Value(), value);
             }
             return value;
         }
-        case Attributes::EndProductType::Id: {
-            using TypeInfo = Attributes::EndProductType::TypeInfo;
+        case Attributes::NullableFloatDouble::Id: {
+            using TypeInfo = Attributes::NullableFloatDouble::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18740,14 +18640,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          static_cast<uint8_t>(cppValue), value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Double";
+                std::string valueCtorSignature = "(D)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<double>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                             cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::CurrentPositionLiftPercent100ths::Id: {
-            using TypeInfo = Attributes::CurrentPositionLiftPercent100ths::TypeInfo;
+        case Attributes::NullableOctetString::Id: {
+            using TypeInfo = Attributes::NullableOctetString::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18761,15 +18668,15 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             else
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                jbyteArray valueByteArray = env->NewByteArray(static_cast<jsize>(cppValue.Value().size()));
+                env->SetByteArrayRegion(valueByteArray, 0, static_cast<jsize>(cppValue.Value().size()),
+                                        reinterpret_cast<const jbyte *>(cppValue.Value().data()));
+                value = valueByteArray;
             }
             return value;
         }
-        case Attributes::CurrentPositionTiltPercent100ths::Id: {
-            using TypeInfo = Attributes::CurrentPositionTiltPercent100ths::TypeInfo;
+        case Attributes::NullableCharString::Id: {
+            using TypeInfo = Attributes::NullableCharString::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18783,15 +18690,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             else
             {
-                std::string valueClassName     = "java/lang/Integer";
-                std::string valueCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                               cppValue.Value(), value);
+                value = env->NewStringUTF(std::string(cppValue.Value().data(), cppValue.Value().size()).c_str());
             }
             return value;
         }
-        case Attributes::InstalledOpenLimitLift::Id: {
-            using TypeInfo = Attributes::InstalledOpenLimitLift::TypeInfo;
+        case Attributes::NullableEnumAttr::Id: {
+            using TypeInfo = Attributes::NullableEnumAttr::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18799,14 +18703,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              static_cast<uint8_t>(cppValue.Value()), value);
+            }
             return value;
         }
-        case Attributes::InstalledClosedLimitLift::Id: {
-            using TypeInfo = Attributes::InstalledClosedLimitLift::TypeInfo;
+        case Attributes::NullableStruct::Id: {
+            using TypeInfo = Attributes::NullableStruct::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18814,14 +18725,75 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                jobject value_a;
+                std::string value_aClassName     = "java/lang/Integer";
+                std::string value_aCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    value_aClassName.c_str(), value_aCtorSignature.c_str(), cppValue.Value().a, value_a);
+                jobject value_b;
+                std::string value_bClassName     = "java/lang/Boolean";
+                std::string value_bCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(value_bClassName.c_str(), value_bCtorSignature.c_str(),
+                                                                           cppValue.Value().b, value_b);
+                jobject value_c;
+                std::string value_cClassName     = "java/lang/Integer";
+                std::string value_cCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    value_cClassName.c_str(), value_cCtorSignature.c_str(), static_cast<uint8_t>(cppValue.Value().c), value_c);
+                jobject value_d;
+                jbyteArray value_dByteArray = env->NewByteArray(static_cast<jsize>(cppValue.Value().d.size()));
+                env->SetByteArrayRegion(value_dByteArray, 0, static_cast<jsize>(cppValue.Value().d.size()),
+                                        reinterpret_cast<const jbyte *>(cppValue.Value().d.data()));
+                value_d = value_dByteArray;
+                jobject value_e;
+                value_e = env->NewStringUTF(std::string(cppValue.Value().e.data(), cppValue.Value().e.size()).c_str());
+                jobject value_f;
+                std::string value_fClassName     = "java/lang/Integer";
+                std::string value_fCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    value_fClassName.c_str(), value_fCtorSignature.c_str(), cppValue.Value().f.Raw(), value_f);
+                jobject value_g;
+                std::string value_gClassName     = "java/lang/Float";
+                std::string value_gCtorSignature = "(F)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<float>(value_gClassName.c_str(), value_gCtorSignature.c_str(),
+                                                                            cppValue.Value().g, value_g);
+                jobject value_h;
+                std::string value_hClassName     = "java/lang/Double";
+                std::string value_hCtorSignature = "(D)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<double>(value_hClassName.c_str(), value_hCtorSignature.c_str(),
+                                                                             cppValue.Value().h, value_h);
+
+                jclass simpleStructStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct", simpleStructStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterSimpleStruct");
+                    return nullptr;
+                }
+                jmethodID simpleStructStructCtor =
+                    env->GetMethodID(simpleStructStructClass, "<init>",
+                                     "(Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;[BLjava/lang/String;Ljava/lang/"
+                                     "Integer;Ljava/lang/Float;Ljava/lang/Double;)V");
+                if (simpleStructStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterSimpleStruct constructor");
+                    return nullptr;
+                }
+
+                value = env->NewObject(simpleStructStructClass, simpleStructStructCtor, value_a, value_b, value_c, value_d, value_e,
+                                       value_f, value_g, value_h);
+            }
             return value;
         }
-        case Attributes::InstalledOpenLimitTilt::Id: {
-            using TypeInfo = Attributes::InstalledOpenLimitTilt::TypeInfo;
+        case Attributes::NullableRangeRestrictedInt8u::Id: {
+            using TypeInfo = Attributes::NullableRangeRestrictedInt8u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18829,14 +18801,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::InstalledClosedLimitTilt::Id: {
-            using TypeInfo = Attributes::InstalledClosedLimitTilt::TypeInfo;
+        case Attributes::NullableRangeRestrictedInt8s::Id: {
+            using TypeInfo = Attributes::NullableRangeRestrictedInt8s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18844,14 +18823,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue, value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                             cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::Mode::Id: {
-            using TypeInfo = Attributes::Mode::TypeInfo;
+        case Attributes::NullableRangeRestrictedInt16u::Id: {
+            using TypeInfo = Attributes::NullableRangeRestrictedInt16u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18859,14 +18845,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                          cppValue.Raw(), value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                               cppValue.Value(), value);
+            }
             return value;
         }
-        case Attributes::SafetyStatus::Id: {
-            using TypeInfo = Attributes::SafetyStatus::TypeInfo;
+        case Attributes::NullableRangeRestrictedInt16s::Id: {
+            using TypeInfo = Attributes::NullableRangeRestrictedInt16s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -18874,10 +18867,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            std::string valueClassName     = "java/lang/Integer";
-            std::string valueCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                           cppValue.Raw(), value);
+            if (cppValue.IsNull())
+            {
+                value = nullptr;
+            }
+            else
+            {
+                std::string valueClassName     = "java/lang/Integer";
+                std::string valueCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                              cppValue.Value(), value);
+            }
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
diff --git a/src/controller/java/zap-generated/CHIPCallbackTypes.h b/src/controller/java/zap-generated/CHIPCallbackTypes.h
index 257190cef397d4..efab094c2cf87f 100644
--- a/src/controller/java/zap-generated/CHIPCallbackTypes.h
+++ b/src/controller/java/zap-generated/CHIPCallbackTypes.h
@@ -23,6 +23,199 @@ typedef void (*CHIPDefaultSuccessCallbackType)(void *, const chip::app::DataMode
 typedef void (*CHIPDefaultWriteSuccessCallbackType)(void *);
 typedef void (*CHIPDefaultFailureCallbackType)(void *, CHIP_ERROR);
 
+typedef void (*CHIPIdentifyClusterIdentifyTimeAttributeCallbackType)(
+    void *, chip::app::Clusters::Identify::Attributes::IdentifyTime::TypeInfo::DecodableArgType);
+typedef void (*CHIPIdentifyClusterIdentifyTypeAttributeCallbackType)(
+    void *, chip::app::Clusters::Identify::Attributes::IdentifyType::TypeInfo::DecodableArgType);
+typedef void (*CHIPIdentifyClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Identify::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPIdentifyClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Identify::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPIdentifyClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Identify::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPIdentifyClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::Identify::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPIdentifyClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::Identify::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPGroupsClusterAddGroupResponseCallbackType)(
+    void *, const chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType &);
+typedef void (*CHIPGroupsClusterViewGroupResponseCallbackType)(
+    void *, const chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType &);
+typedef void (*CHIPGroupsClusterGetGroupMembershipResponseCallbackType)(
+    void *, const chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType &);
+typedef void (*CHIPGroupsClusterRemoveGroupResponseCallbackType)(
+    void *, const chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType &);
+
+typedef void (*CHIPGroupsClusterNameSupportAttributeCallbackType)(
+    void *, chip::app::Clusters::Groups::Attributes::NameSupport::TypeInfo::DecodableArgType);
+typedef void (*CHIPGroupsClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Groups::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPGroupsClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Groups::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPGroupsClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Groups::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPGroupsClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::Groups::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPGroupsClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::Groups::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPScenesClusterAddSceneResponseCallbackType)(
+    void *, const chip::app::Clusters::Scenes::Commands::AddSceneResponse::DecodableType &);
+typedef void (*CHIPScenesClusterViewSceneResponseCallbackType)(
+    void *, const chip::app::Clusters::Scenes::Commands::ViewSceneResponse::DecodableType &);
+typedef void (*CHIPScenesClusterRemoveSceneResponseCallbackType)(
+    void *, const chip::app::Clusters::Scenes::Commands::RemoveSceneResponse::DecodableType &);
+typedef void (*CHIPScenesClusterRemoveAllScenesResponseCallbackType)(
+    void *, const chip::app::Clusters::Scenes::Commands::RemoveAllScenesResponse::DecodableType &);
+typedef void (*CHIPScenesClusterStoreSceneResponseCallbackType)(
+    void *, const chip::app::Clusters::Scenes::Commands::StoreSceneResponse::DecodableType &);
+typedef void (*CHIPScenesClusterGetSceneMembershipResponseCallbackType)(
+    void *, const chip::app::Clusters::Scenes::Commands::GetSceneMembershipResponse::DecodableType &);
+
+typedef void (*CHIPScenesClusterSceneCountAttributeCallbackType)(
+    void *, chip::app::Clusters::Scenes::Attributes::SceneCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPScenesClusterCurrentSceneAttributeCallbackType)(
+    void *, chip::app::Clusters::Scenes::Attributes::CurrentScene::TypeInfo::DecodableArgType);
+typedef void (*CHIPScenesClusterCurrentGroupAttributeCallbackType)(
+    void *, chip::app::Clusters::Scenes::Attributes::CurrentGroup::TypeInfo::DecodableArgType);
+typedef void (*CHIPScenesClusterSceneValidAttributeCallbackType)(
+    void *, chip::app::Clusters::Scenes::Attributes::SceneValid::TypeInfo::DecodableArgType);
+typedef void (*CHIPScenesClusterNameSupportAttributeCallbackType)(
+    void *, chip::app::Clusters::Scenes::Attributes::NameSupport::TypeInfo::DecodableArgType);
+typedef void (*CHIPScenesClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Scenes::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPScenesClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Scenes::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPScenesClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Scenes::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPScenesClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::Scenes::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPScenesClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::Scenes::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+
+typedef void (*CHIPOnOffClusterOnOffAttributeCallbackType)(
+    void *, chip::app::Clusters::OnOff::Attributes::OnOff::TypeInfo::DecodableArgType);
+typedef void (*CHIPOnOffClusterGlobalSceneControlAttributeCallbackType)(
+    void *, chip::app::Clusters::OnOff::Attributes::GlobalSceneControl::TypeInfo::DecodableArgType);
+typedef void (*CHIPOnOffClusterOnTimeAttributeCallbackType)(
+    void *, chip::app::Clusters::OnOff::Attributes::OnTime::TypeInfo::DecodableArgType);
+typedef void (*CHIPOnOffClusterOffWaitTimeAttributeCallbackType)(
+    void *, chip::app::Clusters::OnOff::Attributes::OffWaitTime::TypeInfo::DecodableArgType);
+typedef void (*CHIPOnOffClusterStartUpOnOffAttributeCallbackType)(
+    void *, chip::app::Clusters::OnOff::Attributes::StartUpOnOff::TypeInfo::DecodableArgType);
+typedef void (*CHIPOnOffClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::OnOff::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPOnOffClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::OnOff::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPOnOffClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::OnOff::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPOnOffClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::OnOff::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPOnOffClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::OnOff::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+
+typedef void (*CHIPOnOffSwitchConfigurationClusterSwitchTypeAttributeCallbackType)(
+    void *, chip::app::Clusters::OnOffSwitchConfiguration::Attributes::SwitchType::TypeInfo::DecodableArgType);
+typedef void (*CHIPOnOffSwitchConfigurationClusterSwitchActionsAttributeCallbackType)(
+    void *, chip::app::Clusters::OnOffSwitchConfiguration::Attributes::SwitchActions::TypeInfo::DecodableArgType);
+typedef void (*CHIPOnOffSwitchConfigurationClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::OnOffSwitchConfiguration::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPOnOffSwitchConfigurationClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::OnOffSwitchConfiguration::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPOnOffSwitchConfigurationClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::OnOffSwitchConfiguration::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPOnOffSwitchConfigurationClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::OnOffSwitchConfiguration::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPOnOffSwitchConfigurationClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::OnOffSwitchConfiguration::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+
+typedef void (*CHIPLevelControlClusterCurrentLevelAttributeCallbackType)(
+    void *, chip::app::Clusters::LevelControl::Attributes::CurrentLevel::TypeInfo::DecodableArgType);
+typedef void (*CHIPLevelControlClusterRemainingTimeAttributeCallbackType)(
+    void *, chip::app::Clusters::LevelControl::Attributes::RemainingTime::TypeInfo::DecodableArgType);
+typedef void (*CHIPLevelControlClusterMinLevelAttributeCallbackType)(
+    void *, chip::app::Clusters::LevelControl::Attributes::MinLevel::TypeInfo::DecodableArgType);
+typedef void (*CHIPLevelControlClusterMaxLevelAttributeCallbackType)(
+    void *, chip::app::Clusters::LevelControl::Attributes::MaxLevel::TypeInfo::DecodableArgType);
+typedef void (*CHIPLevelControlClusterCurrentFrequencyAttributeCallbackType)(
+    void *, chip::app::Clusters::LevelControl::Attributes::CurrentFrequency::TypeInfo::DecodableArgType);
+typedef void (*CHIPLevelControlClusterMinFrequencyAttributeCallbackType)(
+    void *, chip::app::Clusters::LevelControl::Attributes::MinFrequency::TypeInfo::DecodableArgType);
+typedef void (*CHIPLevelControlClusterMaxFrequencyAttributeCallbackType)(
+    void *, chip::app::Clusters::LevelControl::Attributes::MaxFrequency::TypeInfo::DecodableArgType);
+typedef void (*CHIPLevelControlClusterOptionsAttributeCallbackType)(
+    void *, chip::app::Clusters::LevelControl::Attributes::Options::TypeInfo::DecodableArgType);
+typedef void (*CHIPLevelControlClusterOnOffTransitionTimeAttributeCallbackType)(
+    void *, chip::app::Clusters::LevelControl::Attributes::OnOffTransitionTime::TypeInfo::DecodableArgType);
+typedef void (*CHIPLevelControlClusterOnLevelAttributeCallbackType)(
+    void *, chip::app::Clusters::LevelControl::Attributes::OnLevel::TypeInfo::DecodableArgType);
+typedef void (*CHIPLevelControlClusterOnTransitionTimeAttributeCallbackType)(
+    void *, chip::app::Clusters::LevelControl::Attributes::OnTransitionTime::TypeInfo::DecodableArgType);
+typedef void (*CHIPLevelControlClusterOffTransitionTimeAttributeCallbackType)(
+    void *, chip::app::Clusters::LevelControl::Attributes::OffTransitionTime::TypeInfo::DecodableArgType);
+typedef void (*CHIPLevelControlClusterDefaultMoveRateAttributeCallbackType)(
+    void *, chip::app::Clusters::LevelControl::Attributes::DefaultMoveRate::TypeInfo::DecodableArgType);
+typedef void (*CHIPLevelControlClusterStartUpCurrentLevelAttributeCallbackType)(
+    void *, chip::app::Clusters::LevelControl::Attributes::StartUpCurrentLevel::TypeInfo::DecodableArgType);
+typedef void (*CHIPLevelControlClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::LevelControl::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPLevelControlClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::LevelControl::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPLevelControlClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::LevelControl::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPLevelControlClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::LevelControl::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPLevelControlClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::LevelControl::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+
+typedef void (*CHIPBinaryInputBasicClusterOutOfServiceAttributeCallbackType)(
+    void *, chip::app::Clusters::BinaryInputBasic::Attributes::OutOfService::TypeInfo::DecodableArgType);
+typedef void (*CHIPBinaryInputBasicClusterPresentValueAttributeCallbackType)(
+    void *, chip::app::Clusters::BinaryInputBasic::Attributes::PresentValue::TypeInfo::DecodableArgType);
+typedef void (*CHIPBinaryInputBasicClusterStatusFlagsAttributeCallbackType)(
+    void *, chip::app::Clusters::BinaryInputBasic::Attributes::StatusFlags::TypeInfo::DecodableArgType);
+typedef void (*CHIPBinaryInputBasicClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::BinaryInputBasic::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPBinaryInputBasicClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::BinaryInputBasic::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPBinaryInputBasicClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::BinaryInputBasic::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPBinaryInputBasicClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::BinaryInputBasic::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPBinaryInputBasicClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::BinaryInputBasic::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+
+typedef void (*CHIPDescriptorClusterDeviceListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Descriptor::Attributes::DeviceList::TypeInfo::DecodableType &);
+typedef void (*CHIPDescriptorClusterServerListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Descriptor::Attributes::ServerList::TypeInfo::DecodableType &);
+typedef void (*CHIPDescriptorClusterClientListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Descriptor::Attributes::ClientList::TypeInfo::DecodableType &);
+typedef void (*CHIPDescriptorClusterPartsListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Descriptor::Attributes::PartsList::TypeInfo::DecodableType &);
+typedef void (*CHIPDescriptorClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Descriptor::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPDescriptorClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Descriptor::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPDescriptorClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Descriptor::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPDescriptorClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::Descriptor::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPDescriptorClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::Descriptor::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+
+typedef void (*CHIPBindingClusterBindingAttributeCallbackType)(
+    void *, const chip::app::Clusters::Binding::Attributes::Binding::TypeInfo::DecodableType &);
+typedef void (*CHIPBindingClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Binding::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPBindingClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Binding::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPBindingClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Binding::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPBindingClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::Binding::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPBindingClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::Binding::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+
 typedef void (*CHIPAccessControlClusterAclAttributeCallbackType)(
     void *, const chip::app::Clusters::AccessControl::Attributes::Acl::TypeInfo::DecodableType &);
 typedef void (*CHIPAccessControlClusterExtensionAttributeCallbackType)(
@@ -43,114 +236,23 @@ typedef void (*CHIPAccessControlClusterFeatureMapAttributeCallbackType)(
     void *, chip::app::Clusters::AccessControl::Attributes::FeatureMap::TypeInfo::DecodableArgType);
 typedef void (*CHIPAccessControlClusterClusterRevisionAttributeCallbackType)(
     void *, chip::app::Clusters::AccessControl::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-typedef void (*CHIPAccountLoginClusterGetSetupPINResponseCallbackType)(
-    void *, const chip::app::Clusters::AccountLogin::Commands::GetSetupPINResponse::DecodableType &);
-
-typedef void (*CHIPAccountLoginClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::AccountLogin::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPAccountLoginClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::AccountLogin::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPAccountLoginClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::AccountLogin::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPAccountLoginClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::AccountLogin::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPAccountLoginClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::AccountLogin::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPAdministratorCommissioningClusterWindowStatusAttributeCallbackType)(
-    void *, chip::app::Clusters::AdministratorCommissioning::Attributes::WindowStatus::TypeInfo::DecodableArgType);
-typedef void (*CHIPAdministratorCommissioningClusterAdminFabricIndexAttributeCallbackType)(
-    void *, chip::app::Clusters::AdministratorCommissioning::Attributes::AdminFabricIndex::TypeInfo::DecodableArgType);
-typedef void (*CHIPAdministratorCommissioningClusterAdminVendorIdAttributeCallbackType)(
-    void *, chip::app::Clusters::AdministratorCommissioning::Attributes::AdminVendorId::TypeInfo::DecodableArgType);
-typedef void (*CHIPAdministratorCommissioningClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::AdministratorCommissioning::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPAdministratorCommissioningClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::AdministratorCommissioning::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPAdministratorCommissioningClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::AdministratorCommissioning::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPAdministratorCommissioningClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::AdministratorCommissioning::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPAdministratorCommissioningClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::AdministratorCommissioning::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-
-typedef void (*CHIPApplicationBasicClusterVendorNameAttributeCallbackType)(
-    void *, chip::app::Clusters::ApplicationBasic::Attributes::VendorName::TypeInfo::DecodableArgType);
-typedef void (*CHIPApplicationBasicClusterVendorIDAttributeCallbackType)(
-    void *, chip::app::Clusters::ApplicationBasic::Attributes::VendorID::TypeInfo::DecodableArgType);
-typedef void (*CHIPApplicationBasicClusterApplicationNameAttributeCallbackType)(
-    void *, chip::app::Clusters::ApplicationBasic::Attributes::ApplicationName::TypeInfo::DecodableArgType);
-typedef void (*CHIPApplicationBasicClusterProductIDAttributeCallbackType)(
-    void *, chip::app::Clusters::ApplicationBasic::Attributes::ProductID::TypeInfo::DecodableArgType);
-typedef void (*CHIPApplicationBasicClusterApplicationAttributeCallbackType)(
-    void *, chip::app::Clusters::ApplicationBasic::Attributes::Application::TypeInfo::DecodableArgType);
-typedef void (*CHIPApplicationBasicClusterStatusAttributeCallbackType)(
-    void *, chip::app::Clusters::ApplicationBasic::Attributes::Status::TypeInfo::DecodableArgType);
-typedef void (*CHIPApplicationBasicClusterApplicationVersionAttributeCallbackType)(
-    void *, chip::app::Clusters::ApplicationBasic::Attributes::ApplicationVersion::TypeInfo::DecodableArgType);
-typedef void (*CHIPApplicationBasicClusterAllowedVendorListAttributeCallbackType)(
-    void *, const chip::app::Clusters::ApplicationBasic::Attributes::AllowedVendorList::TypeInfo::DecodableType &);
-typedef void (*CHIPApplicationBasicClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::ApplicationBasic::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPApplicationBasicClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::ApplicationBasic::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPApplicationBasicClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::ApplicationBasic::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPApplicationBasicClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::ApplicationBasic::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPApplicationBasicClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::ApplicationBasic::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-typedef void (*CHIPApplicationLauncherClusterLauncherResponseCallbackType)(
-    void *, const chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType &);
-
-typedef void (*CHIPApplicationLauncherClusterCatalogListAttributeCallbackType)(
-    void *, const chip::app::Clusters::ApplicationLauncher::Attributes::CatalogList::TypeInfo::DecodableType &);
-typedef void (*CHIPApplicationLauncherClusterCurrentAppAttributeCallbackType)(
-    void *, chip::app::Clusters::ApplicationLauncher::Attributes::CurrentApp::TypeInfo::DecodableArgType);
-typedef void (*CHIPApplicationLauncherClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::ApplicationLauncher::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPApplicationLauncherClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::ApplicationLauncher::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPApplicationLauncherClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::ApplicationLauncher::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPApplicationLauncherClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::ApplicationLauncher::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPApplicationLauncherClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::ApplicationLauncher::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-
-typedef void (*CHIPAudioOutputClusterOutputListAttributeCallbackType)(
-    void *, const chip::app::Clusters::AudioOutput::Attributes::OutputList::TypeInfo::DecodableType &);
-typedef void (*CHIPAudioOutputClusterCurrentOutputAttributeCallbackType)(
-    void *, chip::app::Clusters::AudioOutput::Attributes::CurrentOutput::TypeInfo::DecodableArgType);
-typedef void (*CHIPAudioOutputClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::AudioOutput::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPAudioOutputClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::AudioOutput::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPAudioOutputClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::AudioOutput::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPAudioOutputClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::AudioOutput::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPAudioOutputClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::AudioOutput::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-
-typedef void (*CHIPBarrierControlClusterBarrierMovingStateAttributeCallbackType)(
-    void *, chip::app::Clusters::BarrierControl::Attributes::BarrierMovingState::TypeInfo::DecodableArgType);
-typedef void (*CHIPBarrierControlClusterBarrierSafetyStatusAttributeCallbackType)(
-    void *, chip::app::Clusters::BarrierControl::Attributes::BarrierSafetyStatus::TypeInfo::DecodableArgType);
-typedef void (*CHIPBarrierControlClusterBarrierCapabilitiesAttributeCallbackType)(
-    void *, chip::app::Clusters::BarrierControl::Attributes::BarrierCapabilities::TypeInfo::DecodableArgType);
-typedef void (*CHIPBarrierControlClusterBarrierPositionAttributeCallbackType)(
-    void *, chip::app::Clusters::BarrierControl::Attributes::BarrierPosition::TypeInfo::DecodableArgType);
-typedef void (*CHIPBarrierControlClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::BarrierControl::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPBarrierControlClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::BarrierControl::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPBarrierControlClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::BarrierControl::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPBarrierControlClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::BarrierControl::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPBarrierControlClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::BarrierControl::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPBridgedActionsClusterActionListAttributeCallbackType)(
+    void *, const chip::app::Clusters::BridgedActions::Attributes::ActionList::TypeInfo::DecodableType &);
+typedef void (*CHIPBridgedActionsClusterEndpointListAttributeCallbackType)(
+    void *, const chip::app::Clusters::BridgedActions::Attributes::EndpointList::TypeInfo::DecodableType &);
+typedef void (*CHIPBridgedActionsClusterSetupUrlAttributeCallbackType)(
+    void *, chip::app::Clusters::BridgedActions::Attributes::SetupUrl::TypeInfo::DecodableArgType);
+typedef void (*CHIPBridgedActionsClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::BridgedActions::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPBridgedActionsClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::BridgedActions::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPBridgedActionsClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::BridgedActions::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPBridgedActionsClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::BridgedActions::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPBridgedActionsClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::BridgedActions::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
 typedef void (*CHIPBasicClusterDataModelRevisionAttributeCallbackType)(
     void *, chip::app::Clusters::Basic::Attributes::DataModelRevision::TypeInfo::DecodableArgType);
@@ -202,550 +304,588 @@ typedef void (*CHIPBasicClusterFeatureMapAttributeCallbackType)(
     void *, chip::app::Clusters::Basic::Attributes::FeatureMap::TypeInfo::DecodableArgType);
 typedef void (*CHIPBasicClusterClusterRevisionAttributeCallbackType)(
     void *, chip::app::Clusters::Basic::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallbackType)(
+    void *, const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImageResponse::DecodableType &);
+typedef void (*CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallbackType)(
+    void *, const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::DecodableType &);
 
-typedef void (*CHIPBinaryInputBasicClusterOutOfServiceAttributeCallbackType)(
-    void *, chip::app::Clusters::BinaryInputBasic::Attributes::OutOfService::TypeInfo::DecodableArgType);
-typedef void (*CHIPBinaryInputBasicClusterPresentValueAttributeCallbackType)(
-    void *, chip::app::Clusters::BinaryInputBasic::Attributes::PresentValue::TypeInfo::DecodableArgType);
-typedef void (*CHIPBinaryInputBasicClusterStatusFlagsAttributeCallbackType)(
-    void *, chip::app::Clusters::BinaryInputBasic::Attributes::StatusFlags::TypeInfo::DecodableArgType);
-typedef void (*CHIPBinaryInputBasicClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::BinaryInputBasic::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPBinaryInputBasicClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::BinaryInputBasic::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPBinaryInputBasicClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::BinaryInputBasic::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPBinaryInputBasicClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::BinaryInputBasic::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPBinaryInputBasicClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::BinaryInputBasic::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPOtaSoftwareUpdateProviderClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::OtaSoftwareUpdateProvider::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPOtaSoftwareUpdateProviderClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::OtaSoftwareUpdateProvider::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPOtaSoftwareUpdateProviderClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::OtaSoftwareUpdateProvider::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPBindingClusterBindingAttributeCallbackType)(
-    void *, const chip::app::Clusters::Binding::Attributes::Binding::TypeInfo::DecodableType &);
-typedef void (*CHIPBindingClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Binding::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPBindingClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Binding::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPBindingClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Binding::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPBindingClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::Binding::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPBindingClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::Binding::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPOtaSoftwareUpdateRequestorClusterDefaultOtaProvidersAttributeCallbackType)(
+    void *, const chip::app::Clusters::OtaSoftwareUpdateRequestor::Attributes::DefaultOtaProviders::TypeInfo::DecodableType &);
+typedef void (*CHIPOtaSoftwareUpdateRequestorClusterUpdatePossibleAttributeCallbackType)(
+    void *, chip::app::Clusters::OtaSoftwareUpdateRequestor::Attributes::UpdatePossible::TypeInfo::DecodableArgType);
+typedef void (*CHIPOtaSoftwareUpdateRequestorClusterUpdateStateAttributeCallbackType)(
+    void *, chip::app::Clusters::OtaSoftwareUpdateRequestor::Attributes::UpdateState::TypeInfo::DecodableArgType);
+typedef void (*CHIPOtaSoftwareUpdateRequestorClusterUpdateStateProgressAttributeCallbackType)(
+    void *, chip::app::Clusters::OtaSoftwareUpdateRequestor::Attributes::UpdateStateProgress::TypeInfo::DecodableArgType);
+typedef void (*CHIPOtaSoftwareUpdateRequestorClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::OtaSoftwareUpdateRequestor::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPOtaSoftwareUpdateRequestorClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::OtaSoftwareUpdateRequestor::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPOtaSoftwareUpdateRequestorClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::OtaSoftwareUpdateRequestor::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPBooleanStateClusterStateValueAttributeCallbackType)(
-    void *, chip::app::Clusters::BooleanState::Attributes::StateValue::TypeInfo::DecodableArgType);
-typedef void (*CHIPBooleanStateClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::BooleanState::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPBooleanStateClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::BooleanState::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPBooleanStateClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::BooleanState::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPBooleanStateClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::BooleanState::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPBooleanStateClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::BooleanState::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPLocalizationConfigurationClusterActiveLocaleAttributeCallbackType)(
+    void *, chip::app::Clusters::LocalizationConfiguration::Attributes::ActiveLocale::TypeInfo::DecodableArgType);
+typedef void (*CHIPLocalizationConfigurationClusterSupportedLocalesAttributeCallbackType)(
+    void *, const chip::app::Clusters::LocalizationConfiguration::Attributes::SupportedLocales::TypeInfo::DecodableType &);
+typedef void (*CHIPLocalizationConfigurationClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::LocalizationConfiguration::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPLocalizationConfigurationClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::LocalizationConfiguration::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPLocalizationConfigurationClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::LocalizationConfiguration::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPLocalizationConfigurationClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::LocalizationConfiguration::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPBridgedActionsClusterActionListAttributeCallbackType)(
-    void *, const chip::app::Clusters::BridgedActions::Attributes::ActionList::TypeInfo::DecodableType &);
-typedef void (*CHIPBridgedActionsClusterEndpointListAttributeCallbackType)(
-    void *, const chip::app::Clusters::BridgedActions::Attributes::EndpointList::TypeInfo::DecodableType &);
-typedef void (*CHIPBridgedActionsClusterSetupUrlAttributeCallbackType)(
-    void *, chip::app::Clusters::BridgedActions::Attributes::SetupUrl::TypeInfo::DecodableArgType);
-typedef void (*CHIPBridgedActionsClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::BridgedActions::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPBridgedActionsClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::BridgedActions::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPBridgedActionsClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::BridgedActions::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPBridgedActionsClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::BridgedActions::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPBridgedActionsClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::BridgedActions::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPTimeFormatLocalizationClusterHourFormatAttributeCallbackType)(
+    void *, chip::app::Clusters::TimeFormatLocalization::Attributes::HourFormat::TypeInfo::DecodableArgType);
+typedef void (*CHIPTimeFormatLocalizationClusterActiveCalendarTypeAttributeCallbackType)(
+    void *, chip::app::Clusters::TimeFormatLocalization::Attributes::ActiveCalendarType::TypeInfo::DecodableArgType);
+typedef void (*CHIPTimeFormatLocalizationClusterSupportedCalendarTypesAttributeCallbackType)(
+    void *, const chip::app::Clusters::TimeFormatLocalization::Attributes::SupportedCalendarTypes::TypeInfo::DecodableType &);
+typedef void (*CHIPTimeFormatLocalizationClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::TimeFormatLocalization::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPTimeFormatLocalizationClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::TimeFormatLocalization::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPTimeFormatLocalizationClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::TimeFormatLocalization::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPTimeFormatLocalizationClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::TimeFormatLocalization::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPBridgedDeviceBasicClusterVendorNameAttributeCallbackType)(
-    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::VendorName::TypeInfo::DecodableArgType);
-typedef void (*CHIPBridgedDeviceBasicClusterVendorIDAttributeCallbackType)(
-    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::VendorID::TypeInfo::DecodableArgType);
-typedef void (*CHIPBridgedDeviceBasicClusterProductNameAttributeCallbackType)(
-    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::ProductName::TypeInfo::DecodableArgType);
-typedef void (*CHIPBridgedDeviceBasicClusterNodeLabelAttributeCallbackType)(
-    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::NodeLabel::TypeInfo::DecodableArgType);
-typedef void (*CHIPBridgedDeviceBasicClusterHardwareVersionAttributeCallbackType)(
-    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::HardwareVersion::TypeInfo::DecodableArgType);
-typedef void (*CHIPBridgedDeviceBasicClusterHardwareVersionStringAttributeCallbackType)(
-    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::HardwareVersionString::TypeInfo::DecodableArgType);
-typedef void (*CHIPBridgedDeviceBasicClusterSoftwareVersionAttributeCallbackType)(
-    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::SoftwareVersion::TypeInfo::DecodableArgType);
-typedef void (*CHIPBridgedDeviceBasicClusterSoftwareVersionStringAttributeCallbackType)(
-    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::SoftwareVersionString::TypeInfo::DecodableArgType);
-typedef void (*CHIPBridgedDeviceBasicClusterManufacturingDateAttributeCallbackType)(
-    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::ManufacturingDate::TypeInfo::DecodableArgType);
-typedef void (*CHIPBridgedDeviceBasicClusterPartNumberAttributeCallbackType)(
-    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::PartNumber::TypeInfo::DecodableArgType);
-typedef void (*CHIPBridgedDeviceBasicClusterProductURLAttributeCallbackType)(
-    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::ProductURL::TypeInfo::DecodableArgType);
-typedef void (*CHIPBridgedDeviceBasicClusterProductLabelAttributeCallbackType)(
-    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::ProductLabel::TypeInfo::DecodableArgType);
-typedef void (*CHIPBridgedDeviceBasicClusterSerialNumberAttributeCallbackType)(
-    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::SerialNumber::TypeInfo::DecodableArgType);
-typedef void (*CHIPBridgedDeviceBasicClusterReachableAttributeCallbackType)(
-    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::Reachable::TypeInfo::DecodableArgType);
-typedef void (*CHIPBridgedDeviceBasicClusterUniqueIDAttributeCallbackType)(
-    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::UniqueID::TypeInfo::DecodableArgType);
-typedef void (*CHIPBridgedDeviceBasicClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::BridgedDeviceBasic::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPBridgedDeviceBasicClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::BridgedDeviceBasic::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPBridgedDeviceBasicClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::BridgedDeviceBasic::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPBridgedDeviceBasicClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPBridgedDeviceBasicClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-typedef void (*CHIPChannelClusterChangeChannelResponseCallbackType)(
-    void *, const chip::app::Clusters::Channel::Commands::ChangeChannelResponse::DecodableType &);
+typedef void (*CHIPUnitLocalizationClusterTemperatureUnitAttributeCallbackType)(
+    void *, chip::app::Clusters::UnitLocalization::Attributes::TemperatureUnit::TypeInfo::DecodableArgType);
+typedef void (*CHIPUnitLocalizationClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::UnitLocalization::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPUnitLocalizationClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::UnitLocalization::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPUnitLocalizationClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::UnitLocalization::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPChannelClusterChannelListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Channel::Attributes::ChannelList::TypeInfo::DecodableType &);
-typedef void (*CHIPChannelClusterLineupAttributeCallbackType)(
-    void *, chip::app::Clusters::Channel::Attributes::Lineup::TypeInfo::DecodableArgType);
-typedef void (*CHIPChannelClusterCurrentChannelAttributeCallbackType)(
-    void *, chip::app::Clusters::Channel::Attributes::CurrentChannel::TypeInfo::DecodableArgType);
-typedef void (*CHIPChannelClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Channel::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPChannelClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Channel::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPChannelClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Channel::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPChannelClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::Channel::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPChannelClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::Channel::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceConfigurationClusterSourcesAttributeCallbackType)(
+    void *, const chip::app::Clusters::PowerSourceConfiguration::Attributes::Sources::TypeInfo::DecodableType &);
+typedef void (*CHIPPowerSourceConfigurationClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::PowerSourceConfiguration::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPPowerSourceConfigurationClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::PowerSourceConfiguration::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPPowerSourceConfigurationClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::PowerSourceConfiguration::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPPowerSourceConfigurationClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSourceConfiguration::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceConfigurationClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSourceConfiguration::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPColorControlClusterCurrentHueAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::CurrentHue::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterCurrentSaturationAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::CurrentSaturation::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterRemainingTimeAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::RemainingTime::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterCurrentXAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::CurrentX::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterCurrentYAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::CurrentY::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterDriftCompensationAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::DriftCompensation::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterCompensationTextAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::CompensationText::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterColorTemperatureAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::ColorTemperature::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterColorModeAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::ColorMode::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterOptionsAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::Options::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterNumberOfPrimariesAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::NumberOfPrimaries::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterPrimary1XAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::Primary1X::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterPrimary1YAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::Primary1Y::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterPrimary1IntensityAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::Primary1Intensity::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterPrimary2XAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::Primary2X::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterPrimary2YAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::Primary2Y::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterPrimary2IntensityAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::Primary2Intensity::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterPrimary3XAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::Primary3X::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterPrimary3YAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::Primary3Y::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterPrimary3IntensityAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::Primary3Intensity::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterPrimary4XAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::Primary4X::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterPrimary4YAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::Primary4Y::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterPrimary4IntensityAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::Primary4Intensity::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterPrimary5XAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::Primary5X::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterPrimary5YAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::Primary5Y::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterPrimary5IntensityAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::Primary5Intensity::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterPrimary6XAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::Primary6X::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterPrimary6YAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::Primary6Y::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterPrimary6IntensityAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::Primary6Intensity::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterWhitePointXAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::WhitePointX::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterWhitePointYAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::WhitePointY::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterColorPointRXAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::ColorPointRX::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterColorPointRYAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::ColorPointRY::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterColorPointRIntensityAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::ColorPointRIntensity::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterColorPointGXAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::ColorPointGX::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterColorPointGYAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::ColorPointGY::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterColorPointGIntensityAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::ColorPointGIntensity::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterColorPointBXAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::ColorPointBX::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterColorPointBYAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::ColorPointBY::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterColorPointBIntensityAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::ColorPointBIntensity::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterEnhancedCurrentHueAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::EnhancedCurrentHue::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterEnhancedColorModeAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::EnhancedColorMode::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterColorLoopActiveAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::ColorLoopActive::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterColorLoopDirectionAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::ColorLoopDirection::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterColorLoopTimeAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::ColorLoopTime::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterColorLoopStartEnhancedHueAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::ColorLoopStartEnhancedHue::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterColorLoopStoredEnhancedHueAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::ColorLoopStoredEnhancedHue::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterColorCapabilitiesAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::ColorCapabilities::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterColorTempPhysicalMinMiredsAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::ColorTempPhysicalMinMireds::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterColorTempPhysicalMaxMiredsAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::ColorTempPhysicalMaxMireds::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterCoupleColorTempToLevelMinMiredsAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::CoupleColorTempToLevelMinMireds::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterStartUpColorTemperatureMiredsAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::StartUpColorTemperatureMireds::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::ColorControl::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPColorControlClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::ColorControl::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPColorControlClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::ColorControl::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPColorControlClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::ColorControl::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-typedef void (*CHIPContentLauncherClusterLaunchResponseCallbackType)(
-    void *, const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType &);
-
-typedef void (*CHIPContentLauncherClusterAcceptHeaderAttributeCallbackType)(
-    void *, const chip::app::Clusters::ContentLauncher::Attributes::AcceptHeader::TypeInfo::DecodableType &);
-typedef void (*CHIPContentLauncherClusterSupportedStreamingProtocolsAttributeCallbackType)(
-    void *, chip::app::Clusters::ContentLauncher::Attributes::SupportedStreamingProtocols::TypeInfo::DecodableArgType);
-typedef void (*CHIPContentLauncherClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::ContentLauncher::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPContentLauncherClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::ContentLauncher::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPContentLauncherClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::ContentLauncher::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPContentLauncherClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::ContentLauncher::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPContentLauncherClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::ContentLauncher::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterStatusAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::Status::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterOrderAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::Order::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterDescriptionAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::Description::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterWiredAssessedInputVoltageAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::WiredAssessedInputVoltage::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterWiredAssessedInputFrequencyAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::WiredAssessedInputFrequency::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterWiredCurrentTypeAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::WiredCurrentType::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterWiredAssessedCurrentAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::WiredAssessedCurrent::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterWiredNominalVoltageAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::WiredNominalVoltage::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterWiredMaximumCurrentAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::WiredMaximumCurrent::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterWiredPresentAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::WiredPresent::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterActiveWiredFaultsAttributeCallbackType)(
+    void *, const chip::app::Clusters::PowerSource::Attributes::ActiveWiredFaults::TypeInfo::DecodableType &);
+typedef void (*CHIPPowerSourceClusterBatteryVoltageAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::BatteryVoltage::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterBatteryPercentRemainingAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::BatteryPercentRemaining::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterBatteryTimeRemainingAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::BatteryTimeRemaining::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterBatteryChargeLevelAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::BatteryChargeLevel::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterBatteryReplacementNeededAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::BatteryReplacementNeeded::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterBatteryReplaceabilityAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::BatteryReplaceability::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterBatteryPresentAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::BatteryPresent::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterActiveBatteryFaultsAttributeCallbackType)(
+    void *, const chip::app::Clusters::PowerSource::Attributes::ActiveBatteryFaults::TypeInfo::DecodableType &);
+typedef void (*CHIPPowerSourceClusterBatteryReplacementDescriptionAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::BatteryReplacementDescription::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterBatteryCommonDesignationAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::BatteryCommonDesignation::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterBatteryANSIDesignationAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::BatteryANSIDesignation::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterBatteryIECDesignationAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::BatteryIECDesignation::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterBatteryApprovedChemistryAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::BatteryApprovedChemistry::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterBatteryCapacityAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::BatteryCapacity::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterBatteryQuantityAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::BatteryQuantity::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterBatteryChargeStateAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::BatteryChargeState::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterBatteryTimeToFullChargeAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::BatteryTimeToFullCharge::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterBatteryFunctionalWhileChargingAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::BatteryFunctionalWhileCharging::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterBatteryChargingCurrentAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::BatteryChargingCurrent::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterActiveBatteryChargeFaultsAttributeCallbackType)(
+    void *, const chip::app::Clusters::PowerSource::Attributes::ActiveBatteryChargeFaults::TypeInfo::DecodableType &);
+typedef void (*CHIPPowerSourceClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::PowerSource::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPPowerSourceClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::PowerSource::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPPowerSourceClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::PowerSource::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPPowerSourceClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPPowerSourceClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::PowerSource::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackType)(
+    void *, const chip::app::Clusters::GeneralCommissioning::Commands::ArmFailSafeResponse::DecodableType &);
+typedef void (*CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallbackType)(
+    void *, const chip::app::Clusters::GeneralCommissioning::Commands::SetRegulatoryConfigResponse::DecodableType &);
+typedef void (*CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackType)(
+    void *, const chip::app::Clusters::GeneralCommissioning::Commands::CommissioningCompleteResponse::DecodableType &);
 
-typedef void (*CHIPDescriptorClusterDeviceListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Descriptor::Attributes::DeviceList::TypeInfo::DecodableType &);
-typedef void (*CHIPDescriptorClusterServerListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Descriptor::Attributes::ServerList::TypeInfo::DecodableType &);
-typedef void (*CHIPDescriptorClusterClientListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Descriptor::Attributes::ClientList::TypeInfo::DecodableType &);
-typedef void (*CHIPDescriptorClusterPartsListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Descriptor::Attributes::PartsList::TypeInfo::DecodableType &);
-typedef void (*CHIPDescriptorClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Descriptor::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPDescriptorClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Descriptor::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPDescriptorClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Descriptor::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPDescriptorClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::Descriptor::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPDescriptorClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::Descriptor::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-typedef void (*CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackType)(
-    void *, const chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType &);
+typedef void (*CHIPGeneralCommissioningClusterBreadcrumbAttributeCallbackType)(
+    void *, chip::app::Clusters::GeneralCommissioning::Attributes::Breadcrumb::TypeInfo::DecodableArgType);
+typedef void (*CHIPGeneralCommissioningClusterBasicCommissioningInfoAttributeCallbackType)(
+    void *, chip::app::Clusters::GeneralCommissioning::Attributes::BasicCommissioningInfo::TypeInfo::DecodableArgType);
+typedef void (*CHIPGeneralCommissioningClusterRegulatoryConfigAttributeCallbackType)(
+    void *, chip::app::Clusters::GeneralCommissioning::Attributes::RegulatoryConfig::TypeInfo::DecodableArgType);
+typedef void (*CHIPGeneralCommissioningClusterLocationCapabilityAttributeCallbackType)(
+    void *, chip::app::Clusters::GeneralCommissioning::Attributes::LocationCapability::TypeInfo::DecodableArgType);
+typedef void (*CHIPGeneralCommissioningClusterSupportsConcurrentConnectionAttributeCallbackType)(
+    void *, chip::app::Clusters::GeneralCommissioning::Attributes::SupportsConcurrentConnection::TypeInfo::DecodableArgType);
+typedef void (*CHIPGeneralCommissioningClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::GeneralCommissioning::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPGeneralCommissioningClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::GeneralCommissioning::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPGeneralCommissioningClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::GeneralCommissioning::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPGeneralCommissioningClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::GeneralCommissioning::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPGeneralCommissioningClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::GeneralCommissioning::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPNetworkCommissioningClusterScanNetworksResponseCallbackType)(
+    void *, const chip::app::Clusters::NetworkCommissioning::Commands::ScanNetworksResponse::DecodableType &);
+typedef void (*CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackType)(
+    void *, const chip::app::Clusters::NetworkCommissioning::Commands::NetworkConfigResponse::DecodableType &);
+typedef void (*CHIPNetworkCommissioningClusterConnectNetworkResponseCallbackType)(
+    void *, const chip::app::Clusters::NetworkCommissioning::Commands::ConnectNetworkResponse::DecodableType &);
 
-typedef void (*CHIPDiagnosticLogsClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::DiagnosticLogs::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPDiagnosticLogsClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::DiagnosticLogs::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPDiagnosticLogsClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::DiagnosticLogs::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPDiagnosticLogsClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::DiagnosticLogs::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPDiagnosticLogsClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::DiagnosticLogs::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterGetCredentialStatusResponseCallbackType)(
-    void *, const chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType &);
-typedef void (*CHIPDoorLockClusterGetHolidayScheduleResponseCallbackType)(
-    void *, const chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType &);
-typedef void (*CHIPDoorLockClusterGetUserResponseCallbackType)(
-    void *, const chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType &);
-typedef void (*CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackType)(
-    void *, const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType &);
-typedef void (*CHIPDoorLockClusterGetYearDayScheduleResponseCallbackType)(
-    void *, const chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType &);
-typedef void (*CHIPDoorLockClusterSetCredentialResponseCallbackType)(
-    void *, const chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType &);
-
-typedef void (*CHIPDoorLockClusterLockStateAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::LockState::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterLockTypeAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::LockType::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterActuatorEnabledAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::ActuatorEnabled::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterDoorStateAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::DoorState::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterNumberOfTotalUsersSupportedAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::NumberOfTotalUsersSupported::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterNumberOfPINUsersSupportedAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::NumberOfPINUsersSupported::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterNumberOfRFIDUsersSupportedAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::NumberOfRFIDUsersSupported::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterNumberOfWeekDaySchedulesSupportedPerUserAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::NumberOfWeekDaySchedulesSupportedPerUser::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterNumberOfYearDaySchedulesSupportedPerUserAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::NumberOfYearDaySchedulesSupportedPerUser::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterNumberOfHolidaySchedulesSupportedAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::NumberOfHolidaySchedulesSupported::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterMaxPINCodeLengthAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::MaxPINCodeLength::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterMinPINCodeLengthAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::MinPINCodeLength::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterMaxRFIDCodeLengthAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::MaxRFIDCodeLength::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterMinRFIDCodeLengthAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::MinRFIDCodeLength::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterNumberOfCredentialsSupportedPerUserAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::NumberOfCredentialsSupportedPerUser::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterLanguageAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::Language::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterAutoRelockTimeAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::AutoRelockTime::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterSoundVolumeAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::SoundVolume::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterOperatingModeAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::OperatingMode::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterSupportedOperatingModesAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::SupportedOperatingModes::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterEnableOneTouchLockingAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::EnableOneTouchLocking::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterEnablePrivacyModeButtonAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::EnablePrivacyModeButton::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterWrongCodeEntryLimitAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::WrongCodeEntryLimit::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterUserCodeTemporaryDisableTimeAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::UserCodeTemporaryDisableTime::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterRequirePINforRemoteOperationAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::RequirePINforRemoteOperation::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::DoorLock::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPDoorLockClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::DoorLock::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPDoorLockClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::DoorLock::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPDoorLockClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPDoorLockClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::DoorLock::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPNetworkCommissioningClusterMaxNetworksAttributeCallbackType)(
+    void *, chip::app::Clusters::NetworkCommissioning::Attributes::MaxNetworks::TypeInfo::DecodableArgType);
+typedef void (*CHIPNetworkCommissioningClusterNetworksAttributeCallbackType)(
+    void *, const chip::app::Clusters::NetworkCommissioning::Attributes::Networks::TypeInfo::DecodableType &);
+typedef void (*CHIPNetworkCommissioningClusterScanMaxTimeSecondsAttributeCallbackType)(
+    void *, chip::app::Clusters::NetworkCommissioning::Attributes::ScanMaxTimeSeconds::TypeInfo::DecodableArgType);
+typedef void (*CHIPNetworkCommissioningClusterConnectMaxTimeSecondsAttributeCallbackType)(
+    void *, chip::app::Clusters::NetworkCommissioning::Attributes::ConnectMaxTimeSeconds::TypeInfo::DecodableArgType);
+typedef void (*CHIPNetworkCommissioningClusterInterfaceEnabledAttributeCallbackType)(
+    void *, chip::app::Clusters::NetworkCommissioning::Attributes::InterfaceEnabled::TypeInfo::DecodableArgType);
+typedef void (*CHIPNetworkCommissioningClusterLastNetworkingStatusAttributeCallbackType)(
+    void *, chip::app::Clusters::NetworkCommissioning::Attributes::LastNetworkingStatus::TypeInfo::DecodableArgType);
+typedef void (*CHIPNetworkCommissioningClusterLastNetworkIDAttributeCallbackType)(
+    void *, chip::app::Clusters::NetworkCommissioning::Attributes::LastNetworkID::TypeInfo::DecodableArgType);
+typedef void (*CHIPNetworkCommissioningClusterLastConnectErrorValueAttributeCallbackType)(
+    void *, chip::app::Clusters::NetworkCommissioning::Attributes::LastConnectErrorValue::TypeInfo::DecodableArgType);
+typedef void (*CHIPNetworkCommissioningClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::NetworkCommissioning::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPNetworkCommissioningClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::NetworkCommissioning::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPNetworkCommissioningClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::NetworkCommissioning::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPNetworkCommissioningClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::NetworkCommissioning::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackType)(
+    void *, const chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType &);
 
-typedef void (*CHIPElectricalMeasurementClusterMeasurementTypeAttributeCallbackType)(
-    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::MeasurementType::TypeInfo::DecodableArgType);
-typedef void (*CHIPElectricalMeasurementClusterTotalActivePowerAttributeCallbackType)(
-    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::TotalActivePower::TypeInfo::DecodableArgType);
-typedef void (*CHIPElectricalMeasurementClusterRmsVoltageAttributeCallbackType)(
-    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::RmsVoltage::TypeInfo::DecodableArgType);
-typedef void (*CHIPElectricalMeasurementClusterRmsVoltageMinAttributeCallbackType)(
-    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::RmsVoltageMin::TypeInfo::DecodableArgType);
-typedef void (*CHIPElectricalMeasurementClusterRmsVoltageMaxAttributeCallbackType)(
-    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::RmsVoltageMax::TypeInfo::DecodableArgType);
-typedef void (*CHIPElectricalMeasurementClusterRmsCurrentAttributeCallbackType)(
-    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::RmsCurrent::TypeInfo::DecodableArgType);
-typedef void (*CHIPElectricalMeasurementClusterRmsCurrentMinAttributeCallbackType)(
-    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::RmsCurrentMin::TypeInfo::DecodableArgType);
-typedef void (*CHIPElectricalMeasurementClusterRmsCurrentMaxAttributeCallbackType)(
-    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::RmsCurrentMax::TypeInfo::DecodableArgType);
-typedef void (*CHIPElectricalMeasurementClusterActivePowerAttributeCallbackType)(
-    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::ActivePower::TypeInfo::DecodableArgType);
-typedef void (*CHIPElectricalMeasurementClusterActivePowerMinAttributeCallbackType)(
-    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::ActivePowerMin::TypeInfo::DecodableArgType);
-typedef void (*CHIPElectricalMeasurementClusterActivePowerMaxAttributeCallbackType)(
-    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::ActivePowerMax::TypeInfo::DecodableArgType);
-typedef void (*CHIPElectricalMeasurementClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::ElectricalMeasurement::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPElectricalMeasurementClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::ElectricalMeasurement::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPElectricalMeasurementClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::ElectricalMeasurement::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPElectricalMeasurementClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPElectricalMeasurementClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPDiagnosticLogsClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::DiagnosticLogs::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPDiagnosticLogsClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::DiagnosticLogs::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPDiagnosticLogsClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::DiagnosticLogs::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPDiagnosticLogsClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::DiagnosticLogs::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPDiagnosticLogsClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::DiagnosticLogs::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackType)(
-    void *, chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::PHYRate::TypeInfo::DecodableArgType);
-typedef void (*CHIPEthernetNetworkDiagnosticsClusterFullDuplexAttributeCallbackType)(
-    void *, chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::FullDuplex::TypeInfo::DecodableArgType);
-typedef void (*CHIPEthernetNetworkDiagnosticsClusterPacketRxCountAttributeCallbackType)(
-    void *, chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::PacketRxCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPEthernetNetworkDiagnosticsClusterPacketTxCountAttributeCallbackType)(
-    void *, chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::PacketTxCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPEthernetNetworkDiagnosticsClusterTxErrCountAttributeCallbackType)(
-    void *, chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::TxErrCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPEthernetNetworkDiagnosticsClusterCollisionCountAttributeCallbackType)(
-    void *, chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::CollisionCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPEthernetNetworkDiagnosticsClusterOverrunCountAttributeCallbackType)(
-    void *, chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::OverrunCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPEthernetNetworkDiagnosticsClusterCarrierDetectAttributeCallbackType)(
-    void *, chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::CarrierDetect::TypeInfo::DecodableArgType);
-typedef void (*CHIPEthernetNetworkDiagnosticsClusterTimeSinceResetAttributeCallbackType)(
-    void *, chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::TimeSinceReset::TypeInfo::DecodableArgType);
-typedef void (*CHIPEthernetNetworkDiagnosticsClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPEthernetNetworkDiagnosticsClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPEthernetNetworkDiagnosticsClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPEthernetNetworkDiagnosticsClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPEthernetNetworkDiagnosticsClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPGeneralDiagnosticsClusterNetworkInterfacesAttributeCallbackType)(
+    void *, const chip::app::Clusters::GeneralDiagnostics::Attributes::NetworkInterfaces::TypeInfo::DecodableType &);
+typedef void (*CHIPGeneralDiagnosticsClusterRebootCountAttributeCallbackType)(
+    void *, chip::app::Clusters::GeneralDiagnostics::Attributes::RebootCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPGeneralDiagnosticsClusterUpTimeAttributeCallbackType)(
+    void *, chip::app::Clusters::GeneralDiagnostics::Attributes::UpTime::TypeInfo::DecodableArgType);
+typedef void (*CHIPGeneralDiagnosticsClusterTotalOperationalHoursAttributeCallbackType)(
+    void *, chip::app::Clusters::GeneralDiagnostics::Attributes::TotalOperationalHours::TypeInfo::DecodableArgType);
+typedef void (*CHIPGeneralDiagnosticsClusterBootReasonsAttributeCallbackType)(
+    void *, chip::app::Clusters::GeneralDiagnostics::Attributes::BootReasons::TypeInfo::DecodableArgType);
+typedef void (*CHIPGeneralDiagnosticsClusterActiveHardwareFaultsAttributeCallbackType)(
+    void *, const chip::app::Clusters::GeneralDiagnostics::Attributes::ActiveHardwareFaults::TypeInfo::DecodableType &);
+typedef void (*CHIPGeneralDiagnosticsClusterActiveRadioFaultsAttributeCallbackType)(
+    void *, const chip::app::Clusters::GeneralDiagnostics::Attributes::ActiveRadioFaults::TypeInfo::DecodableType &);
+typedef void (*CHIPGeneralDiagnosticsClusterActiveNetworkFaultsAttributeCallbackType)(
+    void *, const chip::app::Clusters::GeneralDiagnostics::Attributes::ActiveNetworkFaults::TypeInfo::DecodableType &);
+typedef void (*CHIPGeneralDiagnosticsClusterTestEventTriggersEnabledAttributeCallbackType)(
+    void *, chip::app::Clusters::GeneralDiagnostics::Attributes::TestEventTriggersEnabled::TypeInfo::DecodableArgType);
+typedef void (*CHIPGeneralDiagnosticsClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::GeneralDiagnostics::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPGeneralDiagnosticsClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::GeneralDiagnostics::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPGeneralDiagnosticsClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::GeneralDiagnostics::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPGeneralDiagnosticsClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::GeneralDiagnostics::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPGeneralDiagnosticsClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::GeneralDiagnostics::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPFanControlClusterFanModeAttributeCallbackType)(
-    void *, chip::app::Clusters::FanControl::Attributes::FanMode::TypeInfo::DecodableArgType);
-typedef void (*CHIPFanControlClusterFanModeSequenceAttributeCallbackType)(
-    void *, chip::app::Clusters::FanControl::Attributes::FanModeSequence::TypeInfo::DecodableArgType);
-typedef void (*CHIPFanControlClusterPercentSettingAttributeCallbackType)(
-    void *, chip::app::Clusters::FanControl::Attributes::PercentSetting::TypeInfo::DecodableArgType);
-typedef void (*CHIPFanControlClusterPercentCurrentAttributeCallbackType)(
-    void *, chip::app::Clusters::FanControl::Attributes::PercentCurrent::TypeInfo::DecodableArgType);
-typedef void (*CHIPFanControlClusterSpeedMaxAttributeCallbackType)(
-    void *, chip::app::Clusters::FanControl::Attributes::SpeedMax::TypeInfo::DecodableArgType);
-typedef void (*CHIPFanControlClusterSpeedSettingAttributeCallbackType)(
-    void *, chip::app::Clusters::FanControl::Attributes::SpeedSetting::TypeInfo::DecodableArgType);
-typedef void (*CHIPFanControlClusterSpeedCurrentAttributeCallbackType)(
-    void *, chip::app::Clusters::FanControl::Attributes::SpeedCurrent::TypeInfo::DecodableArgType);
-typedef void (*CHIPFanControlClusterRockSupportAttributeCallbackType)(
-    void *, chip::app::Clusters::FanControl::Attributes::RockSupport::TypeInfo::DecodableArgType);
-typedef void (*CHIPFanControlClusterRockSettingAttributeCallbackType)(
-    void *, chip::app::Clusters::FanControl::Attributes::RockSetting::TypeInfo::DecodableArgType);
-typedef void (*CHIPFanControlClusterWindSupportAttributeCallbackType)(
-    void *, chip::app::Clusters::FanControl::Attributes::WindSupport::TypeInfo::DecodableArgType);
-typedef void (*CHIPFanControlClusterWindSettingAttributeCallbackType)(
-    void *, chip::app::Clusters::FanControl::Attributes::WindSetting::TypeInfo::DecodableArgType);
-typedef void (*CHIPFanControlClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::FanControl::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPFanControlClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::FanControl::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPFanControlClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::FanControl::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPFanControlClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::FanControl::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPFanControlClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::FanControl::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPSoftwareDiagnosticsClusterThreadMetricsAttributeCallbackType)(
+    void *, const chip::app::Clusters::SoftwareDiagnostics::Attributes::ThreadMetrics::TypeInfo::DecodableType &);
+typedef void (*CHIPSoftwareDiagnosticsClusterCurrentHeapFreeAttributeCallbackType)(
+    void *, chip::app::Clusters::SoftwareDiagnostics::Attributes::CurrentHeapFree::TypeInfo::DecodableArgType);
+typedef void (*CHIPSoftwareDiagnosticsClusterCurrentHeapUsedAttributeCallbackType)(
+    void *, chip::app::Clusters::SoftwareDiagnostics::Attributes::CurrentHeapUsed::TypeInfo::DecodableArgType);
+typedef void (*CHIPSoftwareDiagnosticsClusterCurrentHeapHighWatermarkAttributeCallbackType)(
+    void *, chip::app::Clusters::SoftwareDiagnostics::Attributes::CurrentHeapHighWatermark::TypeInfo::DecodableArgType);
+typedef void (*CHIPSoftwareDiagnosticsClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::SoftwareDiagnostics::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPSoftwareDiagnosticsClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::SoftwareDiagnostics::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPSoftwareDiagnosticsClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::SoftwareDiagnostics::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPSoftwareDiagnosticsClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::SoftwareDiagnostics::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPSoftwareDiagnosticsClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::SoftwareDiagnostics::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPFixedLabelClusterLabelListAttributeCallbackType)(
-    void *, const chip::app::Clusters::FixedLabel::Attributes::LabelList::TypeInfo::DecodableType &);
-typedef void (*CHIPFixedLabelClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::FixedLabel::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPFixedLabelClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::FixedLabel::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPFixedLabelClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::FixedLabel::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPFixedLabelClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::FixedLabel::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPFixedLabelClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::FixedLabel::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterChannelAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::Channel::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RoutingRole::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterNetworkNameAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::NetworkName::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterPanIdAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::PanId::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterExtendedPanIdAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::ExtendedPanId::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterMeshLocalPrefixAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::MeshLocalPrefix::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterOverrunCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::OverrunCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterNeighborTableListAttributeCallbackType)(
+    void *, const chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::NeighborTableList::TypeInfo::DecodableType &);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterRouteTableListAttributeCallbackType)(
+    void *, const chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RouteTableList::TypeInfo::DecodableType &);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterPartitionIdAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::PartitionId::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterWeightingAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::Weighting::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterDataVersionAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::DataVersion::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterStableDataVersionAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::StableDataVersion::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterLeaderRouterIdAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::LeaderRouterId::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterDetachedRoleCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::DetachedRoleCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterChildRoleCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::ChildRoleCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterRouterRoleCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RouterRoleCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterLeaderRoleCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::LeaderRoleCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterAttachAttemptCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::AttachAttemptCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterPartitionIdChangeCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::PartitionIdChangeCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterBetterPartitionAttachAttemptCountAttributeCallbackType)(
+    void *,
+    chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::BetterPartitionAttachAttemptCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterParentChangeCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::ParentChangeCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterTxTotalCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxTotalCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterTxUnicastCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxUnicastCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterTxBroadcastCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxBroadcastCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterTxAckRequestedCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxAckRequestedCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterTxAckedCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxAckedCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterTxNoAckRequestedCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxNoAckRequestedCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterTxDataCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxDataCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterTxDataPollCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxDataPollCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterTxBeaconCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxBeaconCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterTxBeaconRequestCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxBeaconRequestCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterTxOtherCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxOtherCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterTxRetryCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxRetryCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterTxDirectMaxRetryExpiryCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxDirectMaxRetryExpiryCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterTxIndirectMaxRetryExpiryCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxIndirectMaxRetryExpiryCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterTxErrCcaCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxErrCcaCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterTxErrAbortCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxErrAbortCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterTxErrBusyChannelCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxErrBusyChannelCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterRxTotalCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxTotalCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterRxUnicastCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxUnicastCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterRxBroadcastCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxBroadcastCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterRxDataCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxDataCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterRxDataPollCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxDataPollCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterRxBeaconCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxBeaconCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterRxBeaconRequestCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxBeaconRequestCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterRxOtherCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxOtherCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterRxAddressFilteredCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxAddressFilteredCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterRxDestAddrFilteredCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxDestAddrFilteredCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterRxDuplicatedCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxDuplicatedCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterRxErrNoFrameCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxErrNoFrameCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterRxErrUnknownNeighborCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxErrUnknownNeighborCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterRxErrInvalidSrcAddrCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxErrInvalidSrcAddrCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterRxErrSecCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxErrSecCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterRxErrFcsCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxErrFcsCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterRxErrOtherCountAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxErrOtherCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterActiveTimestampAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterPendingTimestampAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::PendingTimestamp::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterDelayAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::Delay::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterSecurityPolicyAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::SecurityPolicy::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterChannelMaskAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::ChannelMask::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponentsAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterActiveNetworkFaultsListAttributeCallbackType)(
+    void *, const chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::TypeInfo::DecodableType &);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPThreadNetworkDiagnosticsClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPFlowMeasurementClusterMeasuredValueAttributeCallbackType)(
-    void *, chip::app::Clusters::FlowMeasurement::Attributes::MeasuredValue::TypeInfo::DecodableArgType);
-typedef void (*CHIPFlowMeasurementClusterMinMeasuredValueAttributeCallbackType)(
-    void *, chip::app::Clusters::FlowMeasurement::Attributes::MinMeasuredValue::TypeInfo::DecodableArgType);
-typedef void (*CHIPFlowMeasurementClusterMaxMeasuredValueAttributeCallbackType)(
-    void *, chip::app::Clusters::FlowMeasurement::Attributes::MaxMeasuredValue::TypeInfo::DecodableArgType);
-typedef void (*CHIPFlowMeasurementClusterToleranceAttributeCallbackType)(
-    void *, chip::app::Clusters::FlowMeasurement::Attributes::Tolerance::TypeInfo::DecodableArgType);
-typedef void (*CHIPFlowMeasurementClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::FlowMeasurement::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPFlowMeasurementClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::FlowMeasurement::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPFlowMeasurementClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::FlowMeasurement::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPFlowMeasurementClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::FlowMeasurement::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPFlowMeasurementClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::FlowMeasurement::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-typedef void (*CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackType)(
-    void *, const chip::app::Clusters::GeneralCommissioning::Commands::ArmFailSafeResponse::DecodableType &);
-typedef void (*CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackType)(
-    void *, const chip::app::Clusters::GeneralCommissioning::Commands::CommissioningCompleteResponse::DecodableType &);
-typedef void (*CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallbackType)(
-    void *, const chip::app::Clusters::GeneralCommissioning::Commands::SetRegulatoryConfigResponse::DecodableType &);
+typedef void (*CHIPWiFiNetworkDiagnosticsClusterBssidAttributeCallbackType)(
+    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::Bssid::TypeInfo::DecodableArgType);
+typedef void (*CHIPWiFiNetworkDiagnosticsClusterSecurityTypeAttributeCallbackType)(
+    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::SecurityType::TypeInfo::DecodableArgType);
+typedef void (*CHIPWiFiNetworkDiagnosticsClusterWiFiVersionAttributeCallbackType)(
+    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::WiFiVersion::TypeInfo::DecodableArgType);
+typedef void (*CHIPWiFiNetworkDiagnosticsClusterChannelNumberAttributeCallbackType)(
+    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::ChannelNumber::TypeInfo::DecodableArgType);
+typedef void (*CHIPWiFiNetworkDiagnosticsClusterRssiAttributeCallbackType)(
+    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::Rssi::TypeInfo::DecodableArgType);
+typedef void (*CHIPWiFiNetworkDiagnosticsClusterBeaconLostCountAttributeCallbackType)(
+    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::BeaconLostCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPWiFiNetworkDiagnosticsClusterBeaconRxCountAttributeCallbackType)(
+    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::BeaconRxCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPWiFiNetworkDiagnosticsClusterPacketMulticastRxCountAttributeCallbackType)(
+    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::PacketMulticastRxCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPWiFiNetworkDiagnosticsClusterPacketMulticastTxCountAttributeCallbackType)(
+    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::PacketMulticastTxCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPWiFiNetworkDiagnosticsClusterPacketUnicastRxCountAttributeCallbackType)(
+    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::PacketUnicastRxCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPWiFiNetworkDiagnosticsClusterPacketUnicastTxCountAttributeCallbackType)(
+    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::PacketUnicastTxCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPWiFiNetworkDiagnosticsClusterCurrentMaxRateAttributeCallbackType)(
+    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::CurrentMaxRate::TypeInfo::DecodableArgType);
+typedef void (*CHIPWiFiNetworkDiagnosticsClusterOverrunCountAttributeCallbackType)(
+    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::OverrunCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPWiFiNetworkDiagnosticsClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPWiFiNetworkDiagnosticsClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPWiFiNetworkDiagnosticsClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPWiFiNetworkDiagnosticsClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPWiFiNetworkDiagnosticsClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPGeneralCommissioningClusterBreadcrumbAttributeCallbackType)(
-    void *, chip::app::Clusters::GeneralCommissioning::Attributes::Breadcrumb::TypeInfo::DecodableArgType);
-typedef void (*CHIPGeneralCommissioningClusterBasicCommissioningInfoAttributeCallbackType)(
-    void *, chip::app::Clusters::GeneralCommissioning::Attributes::BasicCommissioningInfo::TypeInfo::DecodableArgType);
-typedef void (*CHIPGeneralCommissioningClusterRegulatoryConfigAttributeCallbackType)(
-    void *, chip::app::Clusters::GeneralCommissioning::Attributes::RegulatoryConfig::TypeInfo::DecodableArgType);
-typedef void (*CHIPGeneralCommissioningClusterLocationCapabilityAttributeCallbackType)(
-    void *, chip::app::Clusters::GeneralCommissioning::Attributes::LocationCapability::TypeInfo::DecodableArgType);
-typedef void (*CHIPGeneralCommissioningClusterSupportsConcurrentConnectionAttributeCallbackType)(
-    void *, chip::app::Clusters::GeneralCommissioning::Attributes::SupportsConcurrentConnection::TypeInfo::DecodableArgType);
-typedef void (*CHIPGeneralCommissioningClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::GeneralCommissioning::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPGeneralCommissioningClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::GeneralCommissioning::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPGeneralCommissioningClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::GeneralCommissioning::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPGeneralCommissioningClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::GeneralCommissioning::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPGeneralCommissioningClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::GeneralCommissioning::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackType)(
+    void *, chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::PHYRate::TypeInfo::DecodableArgType);
+typedef void (*CHIPEthernetNetworkDiagnosticsClusterFullDuplexAttributeCallbackType)(
+    void *, chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::FullDuplex::TypeInfo::DecodableArgType);
+typedef void (*CHIPEthernetNetworkDiagnosticsClusterPacketRxCountAttributeCallbackType)(
+    void *, chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::PacketRxCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPEthernetNetworkDiagnosticsClusterPacketTxCountAttributeCallbackType)(
+    void *, chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::PacketTxCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPEthernetNetworkDiagnosticsClusterTxErrCountAttributeCallbackType)(
+    void *, chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::TxErrCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPEthernetNetworkDiagnosticsClusterCollisionCountAttributeCallbackType)(
+    void *, chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::CollisionCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPEthernetNetworkDiagnosticsClusterOverrunCountAttributeCallbackType)(
+    void *, chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::OverrunCount::TypeInfo::DecodableArgType);
+typedef void (*CHIPEthernetNetworkDiagnosticsClusterCarrierDetectAttributeCallbackType)(
+    void *, chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::CarrierDetect::TypeInfo::DecodableArgType);
+typedef void (*CHIPEthernetNetworkDiagnosticsClusterTimeSinceResetAttributeCallbackType)(
+    void *, chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::TimeSinceReset::TypeInfo::DecodableArgType);
+typedef void (*CHIPEthernetNetworkDiagnosticsClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPEthernetNetworkDiagnosticsClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPEthernetNetworkDiagnosticsClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPEthernetNetworkDiagnosticsClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPEthernetNetworkDiagnosticsClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPGeneralDiagnosticsClusterNetworkInterfacesAttributeCallbackType)(
-    void *, const chip::app::Clusters::GeneralDiagnostics::Attributes::NetworkInterfaces::TypeInfo::DecodableType &);
-typedef void (*CHIPGeneralDiagnosticsClusterRebootCountAttributeCallbackType)(
-    void *, chip::app::Clusters::GeneralDiagnostics::Attributes::RebootCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPGeneralDiagnosticsClusterUpTimeAttributeCallbackType)(
-    void *, chip::app::Clusters::GeneralDiagnostics::Attributes::UpTime::TypeInfo::DecodableArgType);
-typedef void (*CHIPGeneralDiagnosticsClusterTotalOperationalHoursAttributeCallbackType)(
-    void *, chip::app::Clusters::GeneralDiagnostics::Attributes::TotalOperationalHours::TypeInfo::DecodableArgType);
-typedef void (*CHIPGeneralDiagnosticsClusterBootReasonsAttributeCallbackType)(
-    void *, chip::app::Clusters::GeneralDiagnostics::Attributes::BootReasons::TypeInfo::DecodableArgType);
-typedef void (*CHIPGeneralDiagnosticsClusterActiveHardwareFaultsAttributeCallbackType)(
-    void *, const chip::app::Clusters::GeneralDiagnostics::Attributes::ActiveHardwareFaults::TypeInfo::DecodableType &);
-typedef void (*CHIPGeneralDiagnosticsClusterActiveRadioFaultsAttributeCallbackType)(
-    void *, const chip::app::Clusters::GeneralDiagnostics::Attributes::ActiveRadioFaults::TypeInfo::DecodableType &);
-typedef void (*CHIPGeneralDiagnosticsClusterActiveNetworkFaultsAttributeCallbackType)(
-    void *, const chip::app::Clusters::GeneralDiagnostics::Attributes::ActiveNetworkFaults::TypeInfo::DecodableType &);
-typedef void (*CHIPGeneralDiagnosticsClusterTestEventTriggersEnabledAttributeCallbackType)(
-    void *, chip::app::Clusters::GeneralDiagnostics::Attributes::TestEventTriggersEnabled::TypeInfo::DecodableArgType);
-typedef void (*CHIPGeneralDiagnosticsClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::GeneralDiagnostics::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPGeneralDiagnosticsClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::GeneralDiagnostics::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPGeneralDiagnosticsClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::GeneralDiagnostics::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPGeneralDiagnosticsClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::GeneralDiagnostics::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPGeneralDiagnosticsClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::GeneralDiagnostics::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-typedef void (*CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallbackType)(
-    void *, const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::DecodableType &);
+typedef void (*CHIPBridgedDeviceBasicClusterVendorNameAttributeCallbackType)(
+    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::VendorName::TypeInfo::DecodableArgType);
+typedef void (*CHIPBridgedDeviceBasicClusterVendorIDAttributeCallbackType)(
+    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::VendorID::TypeInfo::DecodableArgType);
+typedef void (*CHIPBridgedDeviceBasicClusterProductNameAttributeCallbackType)(
+    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::ProductName::TypeInfo::DecodableArgType);
+typedef void (*CHIPBridgedDeviceBasicClusterNodeLabelAttributeCallbackType)(
+    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::NodeLabel::TypeInfo::DecodableArgType);
+typedef void (*CHIPBridgedDeviceBasicClusterHardwareVersionAttributeCallbackType)(
+    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::HardwareVersion::TypeInfo::DecodableArgType);
+typedef void (*CHIPBridgedDeviceBasicClusterHardwareVersionStringAttributeCallbackType)(
+    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::HardwareVersionString::TypeInfo::DecodableArgType);
+typedef void (*CHIPBridgedDeviceBasicClusterSoftwareVersionAttributeCallbackType)(
+    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::SoftwareVersion::TypeInfo::DecodableArgType);
+typedef void (*CHIPBridgedDeviceBasicClusterSoftwareVersionStringAttributeCallbackType)(
+    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::SoftwareVersionString::TypeInfo::DecodableArgType);
+typedef void (*CHIPBridgedDeviceBasicClusterManufacturingDateAttributeCallbackType)(
+    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::ManufacturingDate::TypeInfo::DecodableArgType);
+typedef void (*CHIPBridgedDeviceBasicClusterPartNumberAttributeCallbackType)(
+    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::PartNumber::TypeInfo::DecodableArgType);
+typedef void (*CHIPBridgedDeviceBasicClusterProductURLAttributeCallbackType)(
+    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::ProductURL::TypeInfo::DecodableArgType);
+typedef void (*CHIPBridgedDeviceBasicClusterProductLabelAttributeCallbackType)(
+    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::ProductLabel::TypeInfo::DecodableArgType);
+typedef void (*CHIPBridgedDeviceBasicClusterSerialNumberAttributeCallbackType)(
+    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::SerialNumber::TypeInfo::DecodableArgType);
+typedef void (*CHIPBridgedDeviceBasicClusterReachableAttributeCallbackType)(
+    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::Reachable::TypeInfo::DecodableArgType);
+typedef void (*CHIPBridgedDeviceBasicClusterUniqueIDAttributeCallbackType)(
+    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::UniqueID::TypeInfo::DecodableArgType);
+typedef void (*CHIPBridgedDeviceBasicClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::BridgedDeviceBasic::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPBridgedDeviceBasicClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::BridgedDeviceBasic::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPBridgedDeviceBasicClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::BridgedDeviceBasic::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPBridgedDeviceBasicClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPBridgedDeviceBasicClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+
+typedef void (*CHIPSwitchClusterNumberOfPositionsAttributeCallbackType)(
+    void *, chip::app::Clusters::Switch::Attributes::NumberOfPositions::TypeInfo::DecodableArgType);
+typedef void (*CHIPSwitchClusterCurrentPositionAttributeCallbackType)(
+    void *, chip::app::Clusters::Switch::Attributes::CurrentPosition::TypeInfo::DecodableArgType);
+typedef void (*CHIPSwitchClusterMultiPressMaxAttributeCallbackType)(
+    void *, chip::app::Clusters::Switch::Attributes::MultiPressMax::TypeInfo::DecodableArgType);
+typedef void (*CHIPSwitchClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Switch::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPSwitchClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Switch::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPSwitchClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Switch::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPSwitchClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::Switch::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPSwitchClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::Switch::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+
+typedef void (*CHIPAdministratorCommissioningClusterWindowStatusAttributeCallbackType)(
+    void *, chip::app::Clusters::AdministratorCommissioning::Attributes::WindowStatus::TypeInfo::DecodableArgType);
+typedef void (*CHIPAdministratorCommissioningClusterAdminFabricIndexAttributeCallbackType)(
+    void *, chip::app::Clusters::AdministratorCommissioning::Attributes::AdminFabricIndex::TypeInfo::DecodableArgType);
+typedef void (*CHIPAdministratorCommissioningClusterAdminVendorIdAttributeCallbackType)(
+    void *, chip::app::Clusters::AdministratorCommissioning::Attributes::AdminVendorId::TypeInfo::DecodableArgType);
+typedef void (*CHIPAdministratorCommissioningClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::AdministratorCommissioning::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPAdministratorCommissioningClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::AdministratorCommissioning::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPAdministratorCommissioningClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::AdministratorCommissioning::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPAdministratorCommissioningClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::AdministratorCommissioning::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPAdministratorCommissioningClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::AdministratorCommissioning::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPOperationalCredentialsClusterAttestationResponseCallbackType)(
+    void *, const chip::app::Clusters::OperationalCredentials::Commands::AttestationResponse::DecodableType &);
+typedef void (*CHIPOperationalCredentialsClusterCertificateChainResponseCallbackType)(
+    void *, const chip::app::Clusters::OperationalCredentials::Commands::CertificateChainResponse::DecodableType &);
+typedef void (*CHIPOperationalCredentialsClusterCSRResponseCallbackType)(
+    void *, const chip::app::Clusters::OperationalCredentials::Commands::CSRResponse::DecodableType &);
+typedef void (*CHIPOperationalCredentialsClusterNOCResponseCallbackType)(
+    void *, const chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::DecodableType &);
+
+typedef void (*CHIPOperationalCredentialsClusterNOCsAttributeCallbackType)(
+    void *, const chip::app::Clusters::OperationalCredentials::Attributes::NOCs::TypeInfo::DecodableType &);
+typedef void (*CHIPOperationalCredentialsClusterFabricsAttributeCallbackType)(
+    void *, const chip::app::Clusters::OperationalCredentials::Attributes::Fabrics::TypeInfo::DecodableType &);
+typedef void (*CHIPOperationalCredentialsClusterSupportedFabricsAttributeCallbackType)(
+    void *, chip::app::Clusters::OperationalCredentials::Attributes::SupportedFabrics::TypeInfo::DecodableArgType);
+typedef void (*CHIPOperationalCredentialsClusterCommissionedFabricsAttributeCallbackType)(
+    void *, chip::app::Clusters::OperationalCredentials::Attributes::CommissionedFabrics::TypeInfo::DecodableArgType);
+typedef void (*CHIPOperationalCredentialsClusterTrustedRootCertificatesAttributeCallbackType)(
+    void *, const chip::app::Clusters::OperationalCredentials::Attributes::TrustedRootCertificates::TypeInfo::DecodableType &);
+typedef void (*CHIPOperationalCredentialsClusterCurrentFabricIndexAttributeCallbackType)(
+    void *, chip::app::Clusters::OperationalCredentials::Attributes::CurrentFabricIndex::TypeInfo::DecodableArgType);
+typedef void (*CHIPOperationalCredentialsClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::OperationalCredentials::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPOperationalCredentialsClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::OperationalCredentials::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPOperationalCredentialsClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::OperationalCredentials::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPOperationalCredentialsClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::OperationalCredentials::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPOperationalCredentialsClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::OperationalCredentials::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 typedef void (*CHIPGroupKeyManagementClusterKeySetReadResponseCallbackType)(
     void *, const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadResponse::DecodableType &);
+typedef void (*CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallbackType)(
+    void *, const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::DecodableType &);
 
 typedef void (*CHIPGroupKeyManagementClusterGroupKeyMapAttributeCallbackType)(
     void *, const chip::app::Clusters::GroupKeyManagement::Attributes::GroupKeyMap::TypeInfo::DecodableType &);
@@ -765,181 +905,43 @@ typedef void (*CHIPGroupKeyManagementClusterFeatureMapAttributeCallbackType)(
     void *, chip::app::Clusters::GroupKeyManagement::Attributes::FeatureMap::TypeInfo::DecodableArgType);
 typedef void (*CHIPGroupKeyManagementClusterClusterRevisionAttributeCallbackType)(
     void *, chip::app::Clusters::GroupKeyManagement::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-typedef void (*CHIPGroupsClusterAddGroupResponseCallbackType)(
-    void *, const chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType &);
-typedef void (*CHIPGroupsClusterGetGroupMembershipResponseCallbackType)(
-    void *, const chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType &);
-typedef void (*CHIPGroupsClusterRemoveGroupResponseCallbackType)(
-    void *, const chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType &);
-typedef void (*CHIPGroupsClusterViewGroupResponseCallbackType)(
-    void *, const chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType &);
-
-typedef void (*CHIPGroupsClusterNameSupportAttributeCallbackType)(
-    void *, chip::app::Clusters::Groups::Attributes::NameSupport::TypeInfo::DecodableArgType);
-typedef void (*CHIPGroupsClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Groups::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPGroupsClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Groups::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPGroupsClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Groups::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPGroupsClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::Groups::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPGroupsClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::Groups::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPIdentifyClusterIdentifyTimeAttributeCallbackType)(
-    void *, chip::app::Clusters::Identify::Attributes::IdentifyTime::TypeInfo::DecodableArgType);
-typedef void (*CHIPIdentifyClusterIdentifyTypeAttributeCallbackType)(
-    void *, chip::app::Clusters::Identify::Attributes::IdentifyType::TypeInfo::DecodableArgType);
-typedef void (*CHIPIdentifyClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Identify::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPIdentifyClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Identify::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPIdentifyClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Identify::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPIdentifyClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::Identify::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPIdentifyClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::Identify::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPFixedLabelClusterLabelListAttributeCallbackType)(
+    void *, const chip::app::Clusters::FixedLabel::Attributes::LabelList::TypeInfo::DecodableType &);
+typedef void (*CHIPFixedLabelClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::FixedLabel::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPFixedLabelClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::FixedLabel::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPFixedLabelClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::FixedLabel::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPFixedLabelClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::FixedLabel::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPFixedLabelClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::FixedLabel::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPIlluminanceMeasurementClusterMeasuredValueAttributeCallbackType)(
-    void *, chip::app::Clusters::IlluminanceMeasurement::Attributes::MeasuredValue::TypeInfo::DecodableArgType);
-typedef void (*CHIPIlluminanceMeasurementClusterMinMeasuredValueAttributeCallbackType)(
-    void *, chip::app::Clusters::IlluminanceMeasurement::Attributes::MinMeasuredValue::TypeInfo::DecodableArgType);
-typedef void (*CHIPIlluminanceMeasurementClusterMaxMeasuredValueAttributeCallbackType)(
-    void *, chip::app::Clusters::IlluminanceMeasurement::Attributes::MaxMeasuredValue::TypeInfo::DecodableArgType);
-typedef void (*CHIPIlluminanceMeasurementClusterToleranceAttributeCallbackType)(
-    void *, chip::app::Clusters::IlluminanceMeasurement::Attributes::Tolerance::TypeInfo::DecodableArgType);
-typedef void (*CHIPIlluminanceMeasurementClusterLightSensorTypeAttributeCallbackType)(
-    void *, chip::app::Clusters::IlluminanceMeasurement::Attributes::LightSensorType::TypeInfo::DecodableArgType);
-typedef void (*CHIPIlluminanceMeasurementClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::IlluminanceMeasurement::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPIlluminanceMeasurementClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::IlluminanceMeasurement::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPIlluminanceMeasurementClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::IlluminanceMeasurement::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPIlluminanceMeasurementClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::IlluminanceMeasurement::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPIlluminanceMeasurementClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::IlluminanceMeasurement::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-typedef void (*CHIPKeypadInputClusterSendKeyResponseCallbackType)(
-    void *, const chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType &);
+typedef void (*CHIPUserLabelClusterLabelListAttributeCallbackType)(
+    void *, const chip::app::Clusters::UserLabel::Attributes::LabelList::TypeInfo::DecodableType &);
+typedef void (*CHIPUserLabelClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::UserLabel::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPUserLabelClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::UserLabel::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPUserLabelClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::UserLabel::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPUserLabelClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::UserLabel::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPKeypadInputClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::KeypadInput::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPKeypadInputClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::KeypadInput::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPKeypadInputClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::KeypadInput::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPKeypadInputClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::KeypadInput::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPKeypadInputClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::KeypadInput::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-
-typedef void (*CHIPLevelControlClusterCurrentLevelAttributeCallbackType)(
-    void *, chip::app::Clusters::LevelControl::Attributes::CurrentLevel::TypeInfo::DecodableArgType);
-typedef void (*CHIPLevelControlClusterRemainingTimeAttributeCallbackType)(
-    void *, chip::app::Clusters::LevelControl::Attributes::RemainingTime::TypeInfo::DecodableArgType);
-typedef void (*CHIPLevelControlClusterMinLevelAttributeCallbackType)(
-    void *, chip::app::Clusters::LevelControl::Attributes::MinLevel::TypeInfo::DecodableArgType);
-typedef void (*CHIPLevelControlClusterMaxLevelAttributeCallbackType)(
-    void *, chip::app::Clusters::LevelControl::Attributes::MaxLevel::TypeInfo::DecodableArgType);
-typedef void (*CHIPLevelControlClusterCurrentFrequencyAttributeCallbackType)(
-    void *, chip::app::Clusters::LevelControl::Attributes::CurrentFrequency::TypeInfo::DecodableArgType);
-typedef void (*CHIPLevelControlClusterMinFrequencyAttributeCallbackType)(
-    void *, chip::app::Clusters::LevelControl::Attributes::MinFrequency::TypeInfo::DecodableArgType);
-typedef void (*CHIPLevelControlClusterMaxFrequencyAttributeCallbackType)(
-    void *, chip::app::Clusters::LevelControl::Attributes::MaxFrequency::TypeInfo::DecodableArgType);
-typedef void (*CHIPLevelControlClusterOptionsAttributeCallbackType)(
-    void *, chip::app::Clusters::LevelControl::Attributes::Options::TypeInfo::DecodableArgType);
-typedef void (*CHIPLevelControlClusterOnOffTransitionTimeAttributeCallbackType)(
-    void *, chip::app::Clusters::LevelControl::Attributes::OnOffTransitionTime::TypeInfo::DecodableArgType);
-typedef void (*CHIPLevelControlClusterOnLevelAttributeCallbackType)(
-    void *, chip::app::Clusters::LevelControl::Attributes::OnLevel::TypeInfo::DecodableArgType);
-typedef void (*CHIPLevelControlClusterOnTransitionTimeAttributeCallbackType)(
-    void *, chip::app::Clusters::LevelControl::Attributes::OnTransitionTime::TypeInfo::DecodableArgType);
-typedef void (*CHIPLevelControlClusterOffTransitionTimeAttributeCallbackType)(
-    void *, chip::app::Clusters::LevelControl::Attributes::OffTransitionTime::TypeInfo::DecodableArgType);
-typedef void (*CHIPLevelControlClusterDefaultMoveRateAttributeCallbackType)(
-    void *, chip::app::Clusters::LevelControl::Attributes::DefaultMoveRate::TypeInfo::DecodableArgType);
-typedef void (*CHIPLevelControlClusterStartUpCurrentLevelAttributeCallbackType)(
-    void *, chip::app::Clusters::LevelControl::Attributes::StartUpCurrentLevel::TypeInfo::DecodableArgType);
-typedef void (*CHIPLevelControlClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::LevelControl::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPLevelControlClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::LevelControl::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPLevelControlClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::LevelControl::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPLevelControlClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::LevelControl::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPLevelControlClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::LevelControl::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-
-typedef void (*CHIPLocalizationConfigurationClusterActiveLocaleAttributeCallbackType)(
-    void *, chip::app::Clusters::LocalizationConfiguration::Attributes::ActiveLocale::TypeInfo::DecodableArgType);
-typedef void (*CHIPLocalizationConfigurationClusterSupportedLocalesAttributeCallbackType)(
-    void *, const chip::app::Clusters::LocalizationConfiguration::Attributes::SupportedLocales::TypeInfo::DecodableType &);
-typedef void (*CHIPLocalizationConfigurationClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::LocalizationConfiguration::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPLocalizationConfigurationClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::LocalizationConfiguration::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPLocalizationConfigurationClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::LocalizationConfiguration::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPLocalizationConfigurationClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::LocalizationConfiguration::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-
-typedef void (*CHIPLowPowerClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::LowPower::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPLowPowerClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::LowPower::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPLowPowerClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::LowPower::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPLowPowerClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::LowPower::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPLowPowerClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::LowPower::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-
-typedef void (*CHIPMediaInputClusterInputListAttributeCallbackType)(
-    void *, const chip::app::Clusters::MediaInput::Attributes::InputList::TypeInfo::DecodableType &);
-typedef void (*CHIPMediaInputClusterCurrentInputAttributeCallbackType)(
-    void *, chip::app::Clusters::MediaInput::Attributes::CurrentInput::TypeInfo::DecodableArgType);
-typedef void (*CHIPMediaInputClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::MediaInput::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPMediaInputClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::MediaInput::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPMediaInputClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::MediaInput::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPMediaInputClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::MediaInput::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPMediaInputClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::MediaInput::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-typedef void (*CHIPMediaPlaybackClusterPlaybackResponseCallbackType)(
-    void *, const chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType &);
-
-typedef void (*CHIPMediaPlaybackClusterCurrentStateAttributeCallbackType)(
-    void *, chip::app::Clusters::MediaPlayback::Attributes::CurrentState::TypeInfo::DecodableArgType);
-typedef void (*CHIPMediaPlaybackClusterStartTimeAttributeCallbackType)(
-    void *, chip::app::Clusters::MediaPlayback::Attributes::StartTime::TypeInfo::DecodableArgType);
-typedef void (*CHIPMediaPlaybackClusterDurationAttributeCallbackType)(
-    void *, chip::app::Clusters::MediaPlayback::Attributes::Duration::TypeInfo::DecodableArgType);
-typedef void (*CHIPMediaPlaybackClusterSampledPositionAttributeCallbackType)(
-    void *, chip::app::Clusters::MediaPlayback::Attributes::SampledPosition::TypeInfo::DecodableArgType);
-typedef void (*CHIPMediaPlaybackClusterPlaybackSpeedAttributeCallbackType)(
-    void *, chip::app::Clusters::MediaPlayback::Attributes::PlaybackSpeed::TypeInfo::DecodableArgType);
-typedef void (*CHIPMediaPlaybackClusterSeekRangeEndAttributeCallbackType)(
-    void *, chip::app::Clusters::MediaPlayback::Attributes::SeekRangeEnd::TypeInfo::DecodableArgType);
-typedef void (*CHIPMediaPlaybackClusterSeekRangeStartAttributeCallbackType)(
-    void *, chip::app::Clusters::MediaPlayback::Attributes::SeekRangeStart::TypeInfo::DecodableArgType);
-typedef void (*CHIPMediaPlaybackClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::MediaPlayback::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPMediaPlaybackClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::MediaPlayback::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPMediaPlaybackClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::MediaPlayback::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPMediaPlaybackClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::MediaPlayback::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPMediaPlaybackClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::MediaPlayback::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPBooleanStateClusterStateValueAttributeCallbackType)(
+    void *, chip::app::Clusters::BooleanState::Attributes::StateValue::TypeInfo::DecodableArgType);
+typedef void (*CHIPBooleanStateClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::BooleanState::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPBooleanStateClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::BooleanState::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPBooleanStateClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::BooleanState::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPBooleanStateClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::BooleanState::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPBooleanStateClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::BooleanState::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
 typedef void (*CHIPModeSelectClusterDescriptionAttributeCallbackType)(
     void *, chip::app::Clusters::ModeSelect::Attributes::Description::TypeInfo::DecodableArgType);
@@ -963,258 +965,153 @@ typedef void (*CHIPModeSelectClusterFeatureMapAttributeCallbackType)(
     void *, chip::app::Clusters::ModeSelect::Attributes::FeatureMap::TypeInfo::DecodableArgType);
 typedef void (*CHIPModeSelectClusterClusterRevisionAttributeCallbackType)(
     void *, chip::app::Clusters::ModeSelect::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-typedef void (*CHIPNetworkCommissioningClusterConnectNetworkResponseCallbackType)(
-    void *, const chip::app::Clusters::NetworkCommissioning::Commands::ConnectNetworkResponse::DecodableType &);
-typedef void (*CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackType)(
-    void *, const chip::app::Clusters::NetworkCommissioning::Commands::NetworkConfigResponse::DecodableType &);
-typedef void (*CHIPNetworkCommissioningClusterScanNetworksResponseCallbackType)(
-    void *, const chip::app::Clusters::NetworkCommissioning::Commands::ScanNetworksResponse::DecodableType &);
+typedef void (*CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackType)(
+    void *, const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType &);
+typedef void (*CHIPDoorLockClusterGetYearDayScheduleResponseCallbackType)(
+    void *, const chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType &);
+typedef void (*CHIPDoorLockClusterGetHolidayScheduleResponseCallbackType)(
+    void *, const chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType &);
+typedef void (*CHIPDoorLockClusterGetUserResponseCallbackType)(
+    void *, const chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType &);
+typedef void (*CHIPDoorLockClusterSetCredentialResponseCallbackType)(
+    void *, const chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType &);
+typedef void (*CHIPDoorLockClusterGetCredentialStatusResponseCallbackType)(
+    void *, const chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType &);
 
-typedef void (*CHIPNetworkCommissioningClusterMaxNetworksAttributeCallbackType)(
-    void *, chip::app::Clusters::NetworkCommissioning::Attributes::MaxNetworks::TypeInfo::DecodableArgType);
-typedef void (*CHIPNetworkCommissioningClusterNetworksAttributeCallbackType)(
-    void *, const chip::app::Clusters::NetworkCommissioning::Attributes::Networks::TypeInfo::DecodableType &);
-typedef void (*CHIPNetworkCommissioningClusterScanMaxTimeSecondsAttributeCallbackType)(
-    void *, chip::app::Clusters::NetworkCommissioning::Attributes::ScanMaxTimeSeconds::TypeInfo::DecodableArgType);
-typedef void (*CHIPNetworkCommissioningClusterConnectMaxTimeSecondsAttributeCallbackType)(
-    void *, chip::app::Clusters::NetworkCommissioning::Attributes::ConnectMaxTimeSeconds::TypeInfo::DecodableArgType);
-typedef void (*CHIPNetworkCommissioningClusterInterfaceEnabledAttributeCallbackType)(
-    void *, chip::app::Clusters::NetworkCommissioning::Attributes::InterfaceEnabled::TypeInfo::DecodableArgType);
-typedef void (*CHIPNetworkCommissioningClusterLastNetworkingStatusAttributeCallbackType)(
-    void *, chip::app::Clusters::NetworkCommissioning::Attributes::LastNetworkingStatus::TypeInfo::DecodableArgType);
-typedef void (*CHIPNetworkCommissioningClusterLastNetworkIDAttributeCallbackType)(
-    void *, chip::app::Clusters::NetworkCommissioning::Attributes::LastNetworkID::TypeInfo::DecodableArgType);
-typedef void (*CHIPNetworkCommissioningClusterLastConnectErrorValueAttributeCallbackType)(
-    void *, chip::app::Clusters::NetworkCommissioning::Attributes::LastConnectErrorValue::TypeInfo::DecodableArgType);
-typedef void (*CHIPNetworkCommissioningClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::NetworkCommissioning::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPNetworkCommissioningClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::NetworkCommissioning::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPNetworkCommissioningClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::NetworkCommissioning::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPNetworkCommissioningClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::NetworkCommissioning::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-typedef void (*CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallbackType)(
-    void *, const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::DecodableType &);
-typedef void (*CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallbackType)(
-    void *, const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImageResponse::DecodableType &);
+typedef void (*CHIPDoorLockClusterLockStateAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::LockState::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterLockTypeAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::LockType::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterActuatorEnabledAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::ActuatorEnabled::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterDoorStateAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::DoorState::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterNumberOfTotalUsersSupportedAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::NumberOfTotalUsersSupported::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterNumberOfPINUsersSupportedAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::NumberOfPINUsersSupported::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterNumberOfRFIDUsersSupportedAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::NumberOfRFIDUsersSupported::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterNumberOfWeekDaySchedulesSupportedPerUserAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::NumberOfWeekDaySchedulesSupportedPerUser::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterNumberOfYearDaySchedulesSupportedPerUserAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::NumberOfYearDaySchedulesSupportedPerUser::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterNumberOfHolidaySchedulesSupportedAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::NumberOfHolidaySchedulesSupported::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterMaxPINCodeLengthAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::MaxPINCodeLength::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterMinPINCodeLengthAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::MinPINCodeLength::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterMaxRFIDCodeLengthAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::MaxRFIDCodeLength::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterMinRFIDCodeLengthAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::MinRFIDCodeLength::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterNumberOfCredentialsSupportedPerUserAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::NumberOfCredentialsSupportedPerUser::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterLanguageAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::Language::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterAutoRelockTimeAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::AutoRelockTime::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterSoundVolumeAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::SoundVolume::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterOperatingModeAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::OperatingMode::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterSupportedOperatingModesAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::SupportedOperatingModes::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterEnableOneTouchLockingAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::EnableOneTouchLocking::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterEnablePrivacyModeButtonAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::EnablePrivacyModeButton::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterWrongCodeEntryLimitAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::WrongCodeEntryLimit::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterUserCodeTemporaryDisableTimeAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::UserCodeTemporaryDisableTime::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterRequirePINforRemoteOperationAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::RequirePINforRemoteOperation::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::DoorLock::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPDoorLockClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::DoorLock::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPDoorLockClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::DoorLock::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPDoorLockClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPDoorLockClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::DoorLock::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPOtaSoftwareUpdateProviderClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::OtaSoftwareUpdateProvider::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPOtaSoftwareUpdateProviderClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::OtaSoftwareUpdateProvider::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPOtaSoftwareUpdateProviderClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::OtaSoftwareUpdateProvider::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterTypeAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::Type::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterPhysicalClosedLimitLiftAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::PhysicalClosedLimitLift::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterPhysicalClosedLimitTiltAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::PhysicalClosedLimitTilt::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterCurrentPositionLiftAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::CurrentPositionLift::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterCurrentPositionTiltAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::CurrentPositionTilt::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterNumberOfActuationsLiftAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::NumberOfActuationsLift::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterNumberOfActuationsTiltAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::NumberOfActuationsTilt::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterConfigStatusAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::ConfigStatus::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterCurrentPositionLiftPercentageAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::CurrentPositionLiftPercentage::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterCurrentPositionTiltPercentageAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::CurrentPositionTiltPercentage::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterOperationalStatusAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::OperationalStatus::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterTargetPositionLiftPercent100thsAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::TargetPositionLiftPercent100ths::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterTargetPositionTiltPercent100thsAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::TargetPositionTiltPercent100ths::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterEndProductTypeAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::EndProductType::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterCurrentPositionLiftPercent100thsAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::CurrentPositionLiftPercent100ths::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterCurrentPositionTiltPercent100thsAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::CurrentPositionTiltPercent100ths::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterInstalledOpenLimitLiftAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::InstalledOpenLimitLift::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterInstalledClosedLimitLiftAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::InstalledClosedLimitLift::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterInstalledOpenLimitTiltAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::InstalledOpenLimitTilt::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterInstalledClosedLimitTiltAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::InstalledClosedLimitTilt::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterModeAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::Mode::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterSafetyStatusAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::SafetyStatus::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::WindowCovering::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPWindowCoveringClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::WindowCovering::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPWindowCoveringClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::WindowCovering::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPWindowCoveringClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPWindowCoveringClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::WindowCovering::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPOtaSoftwareUpdateRequestorClusterDefaultOtaProvidersAttributeCallbackType)(
-    void *, const chip::app::Clusters::OtaSoftwareUpdateRequestor::Attributes::DefaultOtaProviders::TypeInfo::DecodableType &);
-typedef void (*CHIPOtaSoftwareUpdateRequestorClusterUpdatePossibleAttributeCallbackType)(
-    void *, chip::app::Clusters::OtaSoftwareUpdateRequestor::Attributes::UpdatePossible::TypeInfo::DecodableArgType);
-typedef void (*CHIPOtaSoftwareUpdateRequestorClusterUpdateStateAttributeCallbackType)(
-    void *, chip::app::Clusters::OtaSoftwareUpdateRequestor::Attributes::UpdateState::TypeInfo::DecodableArgType);
-typedef void (*CHIPOtaSoftwareUpdateRequestorClusterUpdateStateProgressAttributeCallbackType)(
-    void *, chip::app::Clusters::OtaSoftwareUpdateRequestor::Attributes::UpdateStateProgress::TypeInfo::DecodableArgType);
-typedef void (*CHIPOtaSoftwareUpdateRequestorClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::OtaSoftwareUpdateRequestor::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPOtaSoftwareUpdateRequestorClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::OtaSoftwareUpdateRequestor::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPOtaSoftwareUpdateRequestorClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::OtaSoftwareUpdateRequestor::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-
-typedef void (*CHIPOccupancySensingClusterOccupancyAttributeCallbackType)(
-    void *, chip::app::Clusters::OccupancySensing::Attributes::Occupancy::TypeInfo::DecodableArgType);
-typedef void (*CHIPOccupancySensingClusterOccupancySensorTypeAttributeCallbackType)(
-    void *, chip::app::Clusters::OccupancySensing::Attributes::OccupancySensorType::TypeInfo::DecodableArgType);
-typedef void (*CHIPOccupancySensingClusterOccupancySensorTypeBitmapAttributeCallbackType)(
-    void *, chip::app::Clusters::OccupancySensing::Attributes::OccupancySensorTypeBitmap::TypeInfo::DecodableArgType);
-typedef void (*CHIPOccupancySensingClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::OccupancySensing::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPOccupancySensingClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::OccupancySensing::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPOccupancySensingClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::OccupancySensing::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPOccupancySensingClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::OccupancySensing::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPOccupancySensingClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::OccupancySensing::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-
-typedef void (*CHIPOnOffClusterOnOffAttributeCallbackType)(
-    void *, chip::app::Clusters::OnOff::Attributes::OnOff::TypeInfo::DecodableArgType);
-typedef void (*CHIPOnOffClusterGlobalSceneControlAttributeCallbackType)(
-    void *, chip::app::Clusters::OnOff::Attributes::GlobalSceneControl::TypeInfo::DecodableArgType);
-typedef void (*CHIPOnOffClusterOnTimeAttributeCallbackType)(
-    void *, chip::app::Clusters::OnOff::Attributes::OnTime::TypeInfo::DecodableArgType);
-typedef void (*CHIPOnOffClusterOffWaitTimeAttributeCallbackType)(
-    void *, chip::app::Clusters::OnOff::Attributes::OffWaitTime::TypeInfo::DecodableArgType);
-typedef void (*CHIPOnOffClusterStartUpOnOffAttributeCallbackType)(
-    void *, chip::app::Clusters::OnOff::Attributes::StartUpOnOff::TypeInfo::DecodableArgType);
-typedef void (*CHIPOnOffClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::OnOff::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPOnOffClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::OnOff::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPOnOffClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::OnOff::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPOnOffClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::OnOff::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPOnOffClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::OnOff::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-
-typedef void (*CHIPOnOffSwitchConfigurationClusterSwitchTypeAttributeCallbackType)(
-    void *, chip::app::Clusters::OnOffSwitchConfiguration::Attributes::SwitchType::TypeInfo::DecodableArgType);
-typedef void (*CHIPOnOffSwitchConfigurationClusterSwitchActionsAttributeCallbackType)(
-    void *, chip::app::Clusters::OnOffSwitchConfiguration::Attributes::SwitchActions::TypeInfo::DecodableArgType);
-typedef void (*CHIPOnOffSwitchConfigurationClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::OnOffSwitchConfiguration::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPOnOffSwitchConfigurationClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::OnOffSwitchConfiguration::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPOnOffSwitchConfigurationClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::OnOffSwitchConfiguration::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPOnOffSwitchConfigurationClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::OnOffSwitchConfiguration::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPOnOffSwitchConfigurationClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::OnOffSwitchConfiguration::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-typedef void (*CHIPOperationalCredentialsClusterAttestationResponseCallbackType)(
-    void *, const chip::app::Clusters::OperationalCredentials::Commands::AttestationResponse::DecodableType &);
-typedef void (*CHIPOperationalCredentialsClusterCSRResponseCallbackType)(
-    void *, const chip::app::Clusters::OperationalCredentials::Commands::CSRResponse::DecodableType &);
-typedef void (*CHIPOperationalCredentialsClusterCertificateChainResponseCallbackType)(
-    void *, const chip::app::Clusters::OperationalCredentials::Commands::CertificateChainResponse::DecodableType &);
-typedef void (*CHIPOperationalCredentialsClusterNOCResponseCallbackType)(
-    void *, const chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::DecodableType &);
-
-typedef void (*CHIPOperationalCredentialsClusterNOCsAttributeCallbackType)(
-    void *, const chip::app::Clusters::OperationalCredentials::Attributes::NOCs::TypeInfo::DecodableType &);
-typedef void (*CHIPOperationalCredentialsClusterFabricsAttributeCallbackType)(
-    void *, const chip::app::Clusters::OperationalCredentials::Attributes::Fabrics::TypeInfo::DecodableType &);
-typedef void (*CHIPOperationalCredentialsClusterSupportedFabricsAttributeCallbackType)(
-    void *, chip::app::Clusters::OperationalCredentials::Attributes::SupportedFabrics::TypeInfo::DecodableArgType);
-typedef void (*CHIPOperationalCredentialsClusterCommissionedFabricsAttributeCallbackType)(
-    void *, chip::app::Clusters::OperationalCredentials::Attributes::CommissionedFabrics::TypeInfo::DecodableArgType);
-typedef void (*CHIPOperationalCredentialsClusterTrustedRootCertificatesAttributeCallbackType)(
-    void *, const chip::app::Clusters::OperationalCredentials::Attributes::TrustedRootCertificates::TypeInfo::DecodableType &);
-typedef void (*CHIPOperationalCredentialsClusterCurrentFabricIndexAttributeCallbackType)(
-    void *, chip::app::Clusters::OperationalCredentials::Attributes::CurrentFabricIndex::TypeInfo::DecodableArgType);
-typedef void (*CHIPOperationalCredentialsClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::OperationalCredentials::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPOperationalCredentialsClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::OperationalCredentials::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPOperationalCredentialsClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::OperationalCredentials::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPOperationalCredentialsClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::OperationalCredentials::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPOperationalCredentialsClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::OperationalCredentials::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-
-typedef void (*CHIPPowerSourceClusterStatusAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::Status::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterOrderAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::Order::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterDescriptionAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::Description::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterWiredAssessedInputVoltageAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::WiredAssessedInputVoltage::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterWiredAssessedInputFrequencyAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::WiredAssessedInputFrequency::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterWiredCurrentTypeAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::WiredCurrentType::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterWiredAssessedCurrentAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::WiredAssessedCurrent::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterWiredNominalVoltageAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::WiredNominalVoltage::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterWiredMaximumCurrentAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::WiredMaximumCurrent::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterWiredPresentAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::WiredPresent::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterActiveWiredFaultsAttributeCallbackType)(
-    void *, const chip::app::Clusters::PowerSource::Attributes::ActiveWiredFaults::TypeInfo::DecodableType &);
-typedef void (*CHIPPowerSourceClusterBatteryVoltageAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::BatteryVoltage::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterBatteryPercentRemainingAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::BatteryPercentRemaining::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterBatteryTimeRemainingAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::BatteryTimeRemaining::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterBatteryChargeLevelAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::BatteryChargeLevel::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterBatteryReplacementNeededAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::BatteryReplacementNeeded::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterBatteryReplaceabilityAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::BatteryReplaceability::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterBatteryPresentAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::BatteryPresent::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterActiveBatteryFaultsAttributeCallbackType)(
-    void *, const chip::app::Clusters::PowerSource::Attributes::ActiveBatteryFaults::TypeInfo::DecodableType &);
-typedef void (*CHIPPowerSourceClusterBatteryReplacementDescriptionAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::BatteryReplacementDescription::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterBatteryCommonDesignationAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::BatteryCommonDesignation::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterBatteryANSIDesignationAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::BatteryANSIDesignation::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterBatteryIECDesignationAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::BatteryIECDesignation::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterBatteryApprovedChemistryAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::BatteryApprovedChemistry::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterBatteryCapacityAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::BatteryCapacity::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterBatteryQuantityAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::BatteryQuantity::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterBatteryChargeStateAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::BatteryChargeState::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterBatteryTimeToFullChargeAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::BatteryTimeToFullCharge::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterBatteryFunctionalWhileChargingAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::BatteryFunctionalWhileCharging::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterBatteryChargingCurrentAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::BatteryChargingCurrent::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterActiveBatteryChargeFaultsAttributeCallbackType)(
-    void *, const chip::app::Clusters::PowerSource::Attributes::ActiveBatteryChargeFaults::TypeInfo::DecodableType &);
-typedef void (*CHIPPowerSourceClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::PowerSource::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPPowerSourceClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::PowerSource::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPPowerSourceClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::PowerSource::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPPowerSourceClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSource::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-
-typedef void (*CHIPPowerSourceConfigurationClusterSourcesAttributeCallbackType)(
-    void *, const chip::app::Clusters::PowerSourceConfiguration::Attributes::Sources::TypeInfo::DecodableType &);
-typedef void (*CHIPPowerSourceConfigurationClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::PowerSourceConfiguration::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPPowerSourceConfigurationClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::PowerSourceConfiguration::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPPowerSourceConfigurationClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::PowerSourceConfiguration::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPPowerSourceConfigurationClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSourceConfiguration::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPPowerSourceConfigurationClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::PowerSourceConfiguration::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-
-typedef void (*CHIPPressureMeasurementClusterMeasuredValueAttributeCallbackType)(
-    void *, chip::app::Clusters::PressureMeasurement::Attributes::MeasuredValue::TypeInfo::DecodableArgType);
-typedef void (*CHIPPressureMeasurementClusterMinMeasuredValueAttributeCallbackType)(
-    void *, chip::app::Clusters::PressureMeasurement::Attributes::MinMeasuredValue::TypeInfo::DecodableArgType);
-typedef void (*CHIPPressureMeasurementClusterMaxMeasuredValueAttributeCallbackType)(
-    void *, chip::app::Clusters::PressureMeasurement::Attributes::MaxMeasuredValue::TypeInfo::DecodableArgType);
-typedef void (*CHIPPressureMeasurementClusterToleranceAttributeCallbackType)(
-    void *, chip::app::Clusters::PressureMeasurement::Attributes::Tolerance::TypeInfo::DecodableArgType);
-typedef void (*CHIPPressureMeasurementClusterScaledValueAttributeCallbackType)(
-    void *, chip::app::Clusters::PressureMeasurement::Attributes::ScaledValue::TypeInfo::DecodableArgType);
-typedef void (*CHIPPressureMeasurementClusterMinScaledValueAttributeCallbackType)(
-    void *, chip::app::Clusters::PressureMeasurement::Attributes::MinScaledValue::TypeInfo::DecodableArgType);
-typedef void (*CHIPPressureMeasurementClusterMaxScaledValueAttributeCallbackType)(
-    void *, chip::app::Clusters::PressureMeasurement::Attributes::MaxScaledValue::TypeInfo::DecodableArgType);
-typedef void (*CHIPPressureMeasurementClusterScaledToleranceAttributeCallbackType)(
-    void *, chip::app::Clusters::PressureMeasurement::Attributes::ScaledTolerance::TypeInfo::DecodableArgType);
-typedef void (*CHIPPressureMeasurementClusterScaleAttributeCallbackType)(
-    void *, chip::app::Clusters::PressureMeasurement::Attributes::Scale::TypeInfo::DecodableArgType);
-typedef void (*CHIPPressureMeasurementClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::PressureMeasurement::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPPressureMeasurementClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::PressureMeasurement::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPPressureMeasurementClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::PressureMeasurement::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPBarrierControlClusterBarrierMovingStateAttributeCallbackType)(
+    void *, chip::app::Clusters::BarrierControl::Attributes::BarrierMovingState::TypeInfo::DecodableArgType);
+typedef void (*CHIPBarrierControlClusterBarrierSafetyStatusAttributeCallbackType)(
+    void *, chip::app::Clusters::BarrierControl::Attributes::BarrierSafetyStatus::TypeInfo::DecodableArgType);
+typedef void (*CHIPBarrierControlClusterBarrierCapabilitiesAttributeCallbackType)(
+    void *, chip::app::Clusters::BarrierControl::Attributes::BarrierCapabilities::TypeInfo::DecodableArgType);
+typedef void (*CHIPBarrierControlClusterBarrierPositionAttributeCallbackType)(
+    void *, chip::app::Clusters::BarrierControl::Attributes::BarrierPosition::TypeInfo::DecodableArgType);
+typedef void (*CHIPBarrierControlClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::BarrierControl::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPBarrierControlClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::BarrierControl::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPBarrierControlClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::BarrierControl::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPBarrierControlClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::BarrierControl::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPBarrierControlClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::BarrierControl::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
 typedef void (*CHIPPumpConfigurationAndControlClusterMaxPressureAttributeCallbackType)(
     void *, chip::app::Clusters::PumpConfigurationAndControl::Attributes::MaxPressure::TypeInfo::DecodableArgType);
@@ -1272,553 +1169,335 @@ typedef void (*CHIPPumpConfigurationAndControlClusterFeatureMapAttributeCallback
     void *, chip::app::Clusters::PumpConfigurationAndControl::Attributes::FeatureMap::TypeInfo::DecodableArgType);
 typedef void (*CHIPPumpConfigurationAndControlClusterClusterRevisionAttributeCallbackType)(
     void *, chip::app::Clusters::PumpConfigurationAndControl::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPThermostatClusterGetWeeklyScheduleResponseCallbackType)(
+    void *, const chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType &);
 
-typedef void (*CHIPRelativeHumidityMeasurementClusterMeasuredValueAttributeCallbackType)(
-    void *, chip::app::Clusters::RelativeHumidityMeasurement::Attributes::MeasuredValue::TypeInfo::DecodableArgType);
-typedef void (*CHIPRelativeHumidityMeasurementClusterMinMeasuredValueAttributeCallbackType)(
-    void *, chip::app::Clusters::RelativeHumidityMeasurement::Attributes::MinMeasuredValue::TypeInfo::DecodableArgType);
-typedef void (*CHIPRelativeHumidityMeasurementClusterMaxMeasuredValueAttributeCallbackType)(
-    void *, chip::app::Clusters::RelativeHumidityMeasurement::Attributes::MaxMeasuredValue::TypeInfo::DecodableArgType);
-typedef void (*CHIPRelativeHumidityMeasurementClusterToleranceAttributeCallbackType)(
-    void *, chip::app::Clusters::RelativeHumidityMeasurement::Attributes::Tolerance::TypeInfo::DecodableArgType);
-typedef void (*CHIPRelativeHumidityMeasurementClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::RelativeHumidityMeasurement::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPRelativeHumidityMeasurementClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::RelativeHumidityMeasurement::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPRelativeHumidityMeasurementClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::RelativeHumidityMeasurement::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPRelativeHumidityMeasurementClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::RelativeHumidityMeasurement::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPRelativeHumidityMeasurementClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::RelativeHumidityMeasurement::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-typedef void (*CHIPScenesClusterAddSceneResponseCallbackType)(
-    void *, const chip::app::Clusters::Scenes::Commands::AddSceneResponse::DecodableType &);
-typedef void (*CHIPScenesClusterGetSceneMembershipResponseCallbackType)(
-    void *, const chip::app::Clusters::Scenes::Commands::GetSceneMembershipResponse::DecodableType &);
-typedef void (*CHIPScenesClusterRemoveAllScenesResponseCallbackType)(
-    void *, const chip::app::Clusters::Scenes::Commands::RemoveAllScenesResponse::DecodableType &);
-typedef void (*CHIPScenesClusterRemoveSceneResponseCallbackType)(
-    void *, const chip::app::Clusters::Scenes::Commands::RemoveSceneResponse::DecodableType &);
-typedef void (*CHIPScenesClusterStoreSceneResponseCallbackType)(
-    void *, const chip::app::Clusters::Scenes::Commands::StoreSceneResponse::DecodableType &);
-typedef void (*CHIPScenesClusterViewSceneResponseCallbackType)(
-    void *, const chip::app::Clusters::Scenes::Commands::ViewSceneResponse::DecodableType &);
-
-typedef void (*CHIPScenesClusterSceneCountAttributeCallbackType)(
-    void *, chip::app::Clusters::Scenes::Attributes::SceneCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPScenesClusterCurrentSceneAttributeCallbackType)(
-    void *, chip::app::Clusters::Scenes::Attributes::CurrentScene::TypeInfo::DecodableArgType);
-typedef void (*CHIPScenesClusterCurrentGroupAttributeCallbackType)(
-    void *, chip::app::Clusters::Scenes::Attributes::CurrentGroup::TypeInfo::DecodableArgType);
-typedef void (*CHIPScenesClusterSceneValidAttributeCallbackType)(
-    void *, chip::app::Clusters::Scenes::Attributes::SceneValid::TypeInfo::DecodableArgType);
-typedef void (*CHIPScenesClusterNameSupportAttributeCallbackType)(
-    void *, chip::app::Clusters::Scenes::Attributes::NameSupport::TypeInfo::DecodableArgType);
-typedef void (*CHIPScenesClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Scenes::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPScenesClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Scenes::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPScenesClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Scenes::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPScenesClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::Scenes::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPScenesClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::Scenes::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-
-typedef void (*CHIPSoftwareDiagnosticsClusterThreadMetricsAttributeCallbackType)(
-    void *, const chip::app::Clusters::SoftwareDiagnostics::Attributes::ThreadMetrics::TypeInfo::DecodableType &);
-typedef void (*CHIPSoftwareDiagnosticsClusterCurrentHeapFreeAttributeCallbackType)(
-    void *, chip::app::Clusters::SoftwareDiagnostics::Attributes::CurrentHeapFree::TypeInfo::DecodableArgType);
-typedef void (*CHIPSoftwareDiagnosticsClusterCurrentHeapUsedAttributeCallbackType)(
-    void *, chip::app::Clusters::SoftwareDiagnostics::Attributes::CurrentHeapUsed::TypeInfo::DecodableArgType);
-typedef void (*CHIPSoftwareDiagnosticsClusterCurrentHeapHighWatermarkAttributeCallbackType)(
-    void *, chip::app::Clusters::SoftwareDiagnostics::Attributes::CurrentHeapHighWatermark::TypeInfo::DecodableArgType);
-typedef void (*CHIPSoftwareDiagnosticsClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::SoftwareDiagnostics::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPSoftwareDiagnosticsClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::SoftwareDiagnostics::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPSoftwareDiagnosticsClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::SoftwareDiagnostics::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPSoftwareDiagnosticsClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::SoftwareDiagnostics::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPSoftwareDiagnosticsClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::SoftwareDiagnostics::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-
-typedef void (*CHIPSwitchClusterNumberOfPositionsAttributeCallbackType)(
-    void *, chip::app::Clusters::Switch::Attributes::NumberOfPositions::TypeInfo::DecodableArgType);
-typedef void (*CHIPSwitchClusterCurrentPositionAttributeCallbackType)(
-    void *, chip::app::Clusters::Switch::Attributes::CurrentPosition::TypeInfo::DecodableArgType);
-typedef void (*CHIPSwitchClusterMultiPressMaxAttributeCallbackType)(
-    void *, chip::app::Clusters::Switch::Attributes::MultiPressMax::TypeInfo::DecodableArgType);
-typedef void (*CHIPSwitchClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Switch::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPSwitchClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Switch::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPSwitchClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Switch::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPSwitchClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::Switch::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPSwitchClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::Switch::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-typedef void (*CHIPTargetNavigatorClusterNavigateTargetResponseCallbackType)(
-    void *, const chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::DecodableType &);
+typedef void (*CHIPThermostatClusterLocalTemperatureAttributeCallbackType)(
+    void *, chip::app::Clusters::Thermostat::Attributes::LocalTemperature::TypeInfo::DecodableArgType);
+typedef void (*CHIPThermostatClusterAbsMinHeatSetpointLimitAttributeCallbackType)(
+    void *, chip::app::Clusters::Thermostat::Attributes::AbsMinHeatSetpointLimit::TypeInfo::DecodableArgType);
+typedef void (*CHIPThermostatClusterAbsMaxHeatSetpointLimitAttributeCallbackType)(
+    void *, chip::app::Clusters::Thermostat::Attributes::AbsMaxHeatSetpointLimit::TypeInfo::DecodableArgType);
+typedef void (*CHIPThermostatClusterAbsMinCoolSetpointLimitAttributeCallbackType)(
+    void *, chip::app::Clusters::Thermostat::Attributes::AbsMinCoolSetpointLimit::TypeInfo::DecodableArgType);
+typedef void (*CHIPThermostatClusterAbsMaxCoolSetpointLimitAttributeCallbackType)(
+    void *, chip::app::Clusters::Thermostat::Attributes::AbsMaxCoolSetpointLimit::TypeInfo::DecodableArgType);
+typedef void (*CHIPThermostatClusterOccupiedCoolingSetpointAttributeCallbackType)(
+    void *, chip::app::Clusters::Thermostat::Attributes::OccupiedCoolingSetpoint::TypeInfo::DecodableArgType);
+typedef void (*CHIPThermostatClusterOccupiedHeatingSetpointAttributeCallbackType)(
+    void *, chip::app::Clusters::Thermostat::Attributes::OccupiedHeatingSetpoint::TypeInfo::DecodableArgType);
+typedef void (*CHIPThermostatClusterMinHeatSetpointLimitAttributeCallbackType)(
+    void *, chip::app::Clusters::Thermostat::Attributes::MinHeatSetpointLimit::TypeInfo::DecodableArgType);
+typedef void (*CHIPThermostatClusterMaxHeatSetpointLimitAttributeCallbackType)(
+    void *, chip::app::Clusters::Thermostat::Attributes::MaxHeatSetpointLimit::TypeInfo::DecodableArgType);
+typedef void (*CHIPThermostatClusterMinCoolSetpointLimitAttributeCallbackType)(
+    void *, chip::app::Clusters::Thermostat::Attributes::MinCoolSetpointLimit::TypeInfo::DecodableArgType);
+typedef void (*CHIPThermostatClusterMaxCoolSetpointLimitAttributeCallbackType)(
+    void *, chip::app::Clusters::Thermostat::Attributes::MaxCoolSetpointLimit::TypeInfo::DecodableArgType);
+typedef void (*CHIPThermostatClusterMinSetpointDeadBandAttributeCallbackType)(
+    void *, chip::app::Clusters::Thermostat::Attributes::MinSetpointDeadBand::TypeInfo::DecodableArgType);
+typedef void (*CHIPThermostatClusterControlSequenceOfOperationAttributeCallbackType)(
+    void *, chip::app::Clusters::Thermostat::Attributes::ControlSequenceOfOperation::TypeInfo::DecodableArgType);
+typedef void (*CHIPThermostatClusterSystemModeAttributeCallbackType)(
+    void *, chip::app::Clusters::Thermostat::Attributes::SystemMode::TypeInfo::DecodableArgType);
+typedef void (*CHIPThermostatClusterStartOfWeekAttributeCallbackType)(
+    void *, chip::app::Clusters::Thermostat::Attributes::StartOfWeek::TypeInfo::DecodableArgType);
+typedef void (*CHIPThermostatClusterNumberOfWeeklyTransitionsAttributeCallbackType)(
+    void *, chip::app::Clusters::Thermostat::Attributes::NumberOfWeeklyTransitions::TypeInfo::DecodableArgType);
+typedef void (*CHIPThermostatClusterNumberOfDailyTransitionsAttributeCallbackType)(
+    void *, chip::app::Clusters::Thermostat::Attributes::NumberOfDailyTransitions::TypeInfo::DecodableArgType);
+typedef void (*CHIPThermostatClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Thermostat::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPThermostatClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::Thermostat::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPThermostatClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::Thermostat::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPTargetNavigatorClusterTargetListAttributeCallbackType)(
-    void *, const chip::app::Clusters::TargetNavigator::Attributes::TargetList::TypeInfo::DecodableType &);
-typedef void (*CHIPTargetNavigatorClusterCurrentTargetAttributeCallbackType)(
-    void *, chip::app::Clusters::TargetNavigator::Attributes::CurrentTarget::TypeInfo::DecodableArgType);
-typedef void (*CHIPTargetNavigatorClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::TargetNavigator::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPTargetNavigatorClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::TargetNavigator::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPTargetNavigatorClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::TargetNavigator::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPTargetNavigatorClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::TargetNavigator::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPTargetNavigatorClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::TargetNavigator::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPFanControlClusterFanModeAttributeCallbackType)(
+    void *, chip::app::Clusters::FanControl::Attributes::FanMode::TypeInfo::DecodableArgType);
+typedef void (*CHIPFanControlClusterFanModeSequenceAttributeCallbackType)(
+    void *, chip::app::Clusters::FanControl::Attributes::FanModeSequence::TypeInfo::DecodableArgType);
+typedef void (*CHIPFanControlClusterPercentSettingAttributeCallbackType)(
+    void *, chip::app::Clusters::FanControl::Attributes::PercentSetting::TypeInfo::DecodableArgType);
+typedef void (*CHIPFanControlClusterPercentCurrentAttributeCallbackType)(
+    void *, chip::app::Clusters::FanControl::Attributes::PercentCurrent::TypeInfo::DecodableArgType);
+typedef void (*CHIPFanControlClusterSpeedMaxAttributeCallbackType)(
+    void *, chip::app::Clusters::FanControl::Attributes::SpeedMax::TypeInfo::DecodableArgType);
+typedef void (*CHIPFanControlClusterSpeedSettingAttributeCallbackType)(
+    void *, chip::app::Clusters::FanControl::Attributes::SpeedSetting::TypeInfo::DecodableArgType);
+typedef void (*CHIPFanControlClusterSpeedCurrentAttributeCallbackType)(
+    void *, chip::app::Clusters::FanControl::Attributes::SpeedCurrent::TypeInfo::DecodableArgType);
+typedef void (*CHIPFanControlClusterRockSupportAttributeCallbackType)(
+    void *, chip::app::Clusters::FanControl::Attributes::RockSupport::TypeInfo::DecodableArgType);
+typedef void (*CHIPFanControlClusterRockSettingAttributeCallbackType)(
+    void *, chip::app::Clusters::FanControl::Attributes::RockSetting::TypeInfo::DecodableArgType);
+typedef void (*CHIPFanControlClusterWindSupportAttributeCallbackType)(
+    void *, chip::app::Clusters::FanControl::Attributes::WindSupport::TypeInfo::DecodableArgType);
+typedef void (*CHIPFanControlClusterWindSettingAttributeCallbackType)(
+    void *, chip::app::Clusters::FanControl::Attributes::WindSetting::TypeInfo::DecodableArgType);
+typedef void (*CHIPFanControlClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::FanControl::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPFanControlClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::FanControl::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPFanControlClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::FanControl::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPFanControlClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::FanControl::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPFanControlClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::FanControl::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPTemperatureMeasurementClusterMeasuredValueAttributeCallbackType)(
-    void *, chip::app::Clusters::TemperatureMeasurement::Attributes::MeasuredValue::TypeInfo::DecodableArgType);
-typedef void (*CHIPTemperatureMeasurementClusterMinMeasuredValueAttributeCallbackType)(
-    void *, chip::app::Clusters::TemperatureMeasurement::Attributes::MinMeasuredValue::TypeInfo::DecodableArgType);
-typedef void (*CHIPTemperatureMeasurementClusterMaxMeasuredValueAttributeCallbackType)(
-    void *, chip::app::Clusters::TemperatureMeasurement::Attributes::MaxMeasuredValue::TypeInfo::DecodableArgType);
-typedef void (*CHIPTemperatureMeasurementClusterToleranceAttributeCallbackType)(
-    void *, chip::app::Clusters::TemperatureMeasurement::Attributes::Tolerance::TypeInfo::DecodableArgType);
-typedef void (*CHIPTemperatureMeasurementClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::TemperatureMeasurement::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPTemperatureMeasurementClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::TemperatureMeasurement::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPTemperatureMeasurementClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::TemperatureMeasurement::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterBooleanResponseCallbackType)(
-    void *, const chip::app::Clusters::TestCluster::Commands::BooleanResponse::DecodableType &);
-typedef void (*CHIPTestClusterClusterSimpleStructResponseCallbackType)(
-    void *, const chip::app::Clusters::TestCluster::Commands::SimpleStructResponse::DecodableType &);
-typedef void (*CHIPTestClusterClusterTestAddArgumentsResponseCallbackType)(
-    void *, const chip::app::Clusters::TestCluster::Commands::TestAddArgumentsResponse::DecodableType &);
-typedef void (*CHIPTestClusterClusterTestEmitTestEventResponseCallbackType)(
-    void *, const chip::app::Clusters::TestCluster::Commands::TestEmitTestEventResponse::DecodableType &);
-typedef void (*CHIPTestClusterClusterTestEnumsResponseCallbackType)(
-    void *, const chip::app::Clusters::TestCluster::Commands::TestEnumsResponse::DecodableType &);
-typedef void (*CHIPTestClusterClusterTestListInt8UReverseResponseCallbackType)(
-    void *, const chip::app::Clusters::TestCluster::Commands::TestListInt8UReverseResponse::DecodableType &);
-typedef void (*CHIPTestClusterClusterTestNullableOptionalResponseCallbackType)(
-    void *, const chip::app::Clusters::TestCluster::Commands::TestNullableOptionalResponse::DecodableType &);
-typedef void (*CHIPTestClusterClusterTestSpecificResponseCallbackType)(
-    void *, const chip::app::Clusters::TestCluster::Commands::TestSpecificResponse::DecodableType &);
+typedef void (*CHIPThermostatUserInterfaceConfigurationClusterTemperatureDisplayModeAttributeCallbackType)(
+    void *,
+    chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::TemperatureDisplayMode::TypeInfo::DecodableArgType);
+typedef void (*CHIPThermostatUserInterfaceConfigurationClusterKeypadLockoutAttributeCallbackType)(
+    void *, chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::KeypadLockout::TypeInfo::DecodableArgType);
+typedef void (*CHIPThermostatUserInterfaceConfigurationClusterScheduleProgrammingVisibilityAttributeCallbackType)(
+    void *,
+    chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::TypeInfo::
+        DecodableArgType);
+typedef void (*CHIPThermostatUserInterfaceConfigurationClusterGeneratedCommandListAttributeCallbackType)(
+    void *,
+    const chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPThermostatUserInterfaceConfigurationClusterAcceptedCommandListAttributeCallbackType)(
+    void *,
+    const chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPThermostatUserInterfaceConfigurationClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPThermostatUserInterfaceConfigurationClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPThermostatUserInterfaceConfigurationClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPTestClusterClusterBooleanAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::Boolean::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterBitmap8AttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::Bitmap8::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterBitmap16AttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::Bitmap16::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterBitmap32AttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::Bitmap32::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterBitmap64AttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::Bitmap64::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterInt8uAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::Int8u::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterInt16uAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::Int16u::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterInt24uAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::Int24u::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterInt32uAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::Int32u::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterInt40uAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::Int40u::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterInt48uAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::Int48u::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterInt56uAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::Int56u::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterInt64uAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::Int64u::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterInt8sAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::Int8s::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterInt16sAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::Int16s::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterInt24sAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::Int24s::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterInt32sAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::Int32s::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterInt40sAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::Int40s::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterInt48sAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::Int48s::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterInt56sAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::Int56s::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterInt64sAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::Int64s::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterEnum8AttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::Enum8::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterEnum16AttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::Enum16::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterFloatSingleAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::FloatSingle::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterFloatDoubleAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::FloatDouble::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterOctetStringAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::OctetString::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterListInt8uAttributeCallbackType)(
-    void *, const chip::app::Clusters::TestCluster::Attributes::ListInt8u::TypeInfo::DecodableType &);
-typedef void (*CHIPTestClusterClusterListOctetStringAttributeCallbackType)(
-    void *, const chip::app::Clusters::TestCluster::Attributes::ListOctetString::TypeInfo::DecodableType &);
-typedef void (*CHIPTestClusterClusterListStructOctetStringAttributeCallbackType)(
-    void *, const chip::app::Clusters::TestCluster::Attributes::ListStructOctetString::TypeInfo::DecodableType &);
-typedef void (*CHIPTestClusterClusterLongOctetStringAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::LongOctetString::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterCharStringAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::CharString::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterLongCharStringAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::LongCharString::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterEpochUsAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::EpochUs::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterEpochSAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::EpochS::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterVendorIdAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::VendorId::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterListNullablesAndOptionalsStructAttributeCallbackType)(
-    void *, const chip::app::Clusters::TestCluster::Attributes::ListNullablesAndOptionalsStruct::TypeInfo::DecodableType &);
-typedef void (*CHIPTestClusterClusterEnumAttrAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::EnumAttr::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterStructAttrAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::StructAttr::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterRangeRestrictedInt8uAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::RangeRestrictedInt8u::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterRangeRestrictedInt8sAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::RangeRestrictedInt8s::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterRangeRestrictedInt16uAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::RangeRestrictedInt16u::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterRangeRestrictedInt16sAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::RangeRestrictedInt16s::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterListLongOctetStringAttributeCallbackType)(
-    void *, const chip::app::Clusters::TestCluster::Attributes::ListLongOctetString::TypeInfo::DecodableType &);
-typedef void (*CHIPTestClusterClusterListFabricScopedAttributeCallbackType)(
-    void *, const chip::app::Clusters::TestCluster::Attributes::ListFabricScoped::TypeInfo::DecodableType &);
-typedef void (*CHIPTestClusterClusterTimedWriteBooleanAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::TimedWriteBoolean::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterGeneralErrorBooleanAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::GeneralErrorBoolean::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterClusterErrorBooleanAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::ClusterErrorBoolean::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterUnsupportedAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::Unsupported::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableBooleanAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableBoolean::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableBitmap8AttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableBitmap8::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableBitmap16AttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableBitmap16::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableBitmap32AttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableBitmap32::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableBitmap64AttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableBitmap64::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableInt8uAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt8u::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableInt16uAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt16u::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableInt24uAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt24u::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableInt32uAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt32u::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableInt40uAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt40u::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableInt48uAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt48u::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableInt56uAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt56u::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableInt64uAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt64u::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableInt8sAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt8s::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableInt16sAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt16s::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableInt24sAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt24s::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableInt32sAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt32s::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableInt40sAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt40s::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableInt48sAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt48s::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableInt56sAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt56s::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableInt64sAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt64s::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableEnum8AttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableEnum8::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableEnum16AttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableEnum16::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableFloatSingleAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableFloatSingle::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableFloatDoubleAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableFloatDouble::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableOctetStringAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableOctetString::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableCharStringAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableCharString::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableEnumAttrAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableEnumAttr::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableStructAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableStruct::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableRangeRestrictedInt8uAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableRangeRestrictedInt8u::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableRangeRestrictedInt8sAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableRangeRestrictedInt8s::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableRangeRestrictedInt16uAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableRangeRestrictedInt16u::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterNullableRangeRestrictedInt16sAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::NullableRangeRestrictedInt16s::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::TestCluster::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPTestClusterClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::TestCluster::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPTestClusterClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::TestCluster::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPTestClusterClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPTestClusterClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::TestCluster::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-typedef void (*CHIPThermostatClusterGetWeeklyScheduleResponseCallbackType)(
-    void *, const chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType &);
-
-typedef void (*CHIPThermostatClusterLocalTemperatureAttributeCallbackType)(
-    void *, chip::app::Clusters::Thermostat::Attributes::LocalTemperature::TypeInfo::DecodableArgType);
-typedef void (*CHIPThermostatClusterAbsMinHeatSetpointLimitAttributeCallbackType)(
-    void *, chip::app::Clusters::Thermostat::Attributes::AbsMinHeatSetpointLimit::TypeInfo::DecodableArgType);
-typedef void (*CHIPThermostatClusterAbsMaxHeatSetpointLimitAttributeCallbackType)(
-    void *, chip::app::Clusters::Thermostat::Attributes::AbsMaxHeatSetpointLimit::TypeInfo::DecodableArgType);
-typedef void (*CHIPThermostatClusterAbsMinCoolSetpointLimitAttributeCallbackType)(
-    void *, chip::app::Clusters::Thermostat::Attributes::AbsMinCoolSetpointLimit::TypeInfo::DecodableArgType);
-typedef void (*CHIPThermostatClusterAbsMaxCoolSetpointLimitAttributeCallbackType)(
-    void *, chip::app::Clusters::Thermostat::Attributes::AbsMaxCoolSetpointLimit::TypeInfo::DecodableArgType);
-typedef void (*CHIPThermostatClusterOccupiedCoolingSetpointAttributeCallbackType)(
-    void *, chip::app::Clusters::Thermostat::Attributes::OccupiedCoolingSetpoint::TypeInfo::DecodableArgType);
-typedef void (*CHIPThermostatClusterOccupiedHeatingSetpointAttributeCallbackType)(
-    void *, chip::app::Clusters::Thermostat::Attributes::OccupiedHeatingSetpoint::TypeInfo::DecodableArgType);
-typedef void (*CHIPThermostatClusterMinHeatSetpointLimitAttributeCallbackType)(
-    void *, chip::app::Clusters::Thermostat::Attributes::MinHeatSetpointLimit::TypeInfo::DecodableArgType);
-typedef void (*CHIPThermostatClusterMaxHeatSetpointLimitAttributeCallbackType)(
-    void *, chip::app::Clusters::Thermostat::Attributes::MaxHeatSetpointLimit::TypeInfo::DecodableArgType);
-typedef void (*CHIPThermostatClusterMinCoolSetpointLimitAttributeCallbackType)(
-    void *, chip::app::Clusters::Thermostat::Attributes::MinCoolSetpointLimit::TypeInfo::DecodableArgType);
-typedef void (*CHIPThermostatClusterMaxCoolSetpointLimitAttributeCallbackType)(
-    void *, chip::app::Clusters::Thermostat::Attributes::MaxCoolSetpointLimit::TypeInfo::DecodableArgType);
-typedef void (*CHIPThermostatClusterMinSetpointDeadBandAttributeCallbackType)(
-    void *, chip::app::Clusters::Thermostat::Attributes::MinSetpointDeadBand::TypeInfo::DecodableArgType);
-typedef void (*CHIPThermostatClusterControlSequenceOfOperationAttributeCallbackType)(
-    void *, chip::app::Clusters::Thermostat::Attributes::ControlSequenceOfOperation::TypeInfo::DecodableArgType);
-typedef void (*CHIPThermostatClusterSystemModeAttributeCallbackType)(
-    void *, chip::app::Clusters::Thermostat::Attributes::SystemMode::TypeInfo::DecodableArgType);
-typedef void (*CHIPThermostatClusterStartOfWeekAttributeCallbackType)(
-    void *, chip::app::Clusters::Thermostat::Attributes::StartOfWeek::TypeInfo::DecodableArgType);
-typedef void (*CHIPThermostatClusterNumberOfWeeklyTransitionsAttributeCallbackType)(
-    void *, chip::app::Clusters::Thermostat::Attributes::NumberOfWeeklyTransitions::TypeInfo::DecodableArgType);
-typedef void (*CHIPThermostatClusterNumberOfDailyTransitionsAttributeCallbackType)(
-    void *, chip::app::Clusters::Thermostat::Attributes::NumberOfDailyTransitions::TypeInfo::DecodableArgType);
-typedef void (*CHIPThermostatClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::Thermostat::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPThermostatClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::Thermostat::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPThermostatClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::Thermostat::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterCurrentHueAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::CurrentHue::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterCurrentSaturationAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::CurrentSaturation::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterRemainingTimeAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::RemainingTime::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterCurrentXAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::CurrentX::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterCurrentYAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::CurrentY::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterDriftCompensationAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::DriftCompensation::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterCompensationTextAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::CompensationText::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterColorTemperatureAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::ColorTemperature::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterColorModeAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::ColorMode::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterOptionsAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::Options::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterNumberOfPrimariesAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::NumberOfPrimaries::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterPrimary1XAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::Primary1X::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterPrimary1YAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::Primary1Y::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterPrimary1IntensityAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::Primary1Intensity::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterPrimary2XAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::Primary2X::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterPrimary2YAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::Primary2Y::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterPrimary2IntensityAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::Primary2Intensity::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterPrimary3XAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::Primary3X::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterPrimary3YAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::Primary3Y::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterPrimary3IntensityAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::Primary3Intensity::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterPrimary4XAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::Primary4X::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterPrimary4YAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::Primary4Y::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterPrimary4IntensityAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::Primary4Intensity::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterPrimary5XAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::Primary5X::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterPrimary5YAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::Primary5Y::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterPrimary5IntensityAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::Primary5Intensity::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterPrimary6XAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::Primary6X::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterPrimary6YAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::Primary6Y::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterPrimary6IntensityAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::Primary6Intensity::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterWhitePointXAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::WhitePointX::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterWhitePointYAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::WhitePointY::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterColorPointRXAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::ColorPointRX::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterColorPointRYAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::ColorPointRY::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterColorPointRIntensityAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::ColorPointRIntensity::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterColorPointGXAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::ColorPointGX::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterColorPointGYAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::ColorPointGY::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterColorPointGIntensityAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::ColorPointGIntensity::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterColorPointBXAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::ColorPointBX::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterColorPointBYAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::ColorPointBY::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterColorPointBIntensityAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::ColorPointBIntensity::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterEnhancedCurrentHueAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::EnhancedCurrentHue::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterEnhancedColorModeAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::EnhancedColorMode::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterColorLoopActiveAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::ColorLoopActive::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterColorLoopDirectionAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::ColorLoopDirection::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterColorLoopTimeAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::ColorLoopTime::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterColorLoopStartEnhancedHueAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::ColorLoopStartEnhancedHue::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterColorLoopStoredEnhancedHueAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::ColorLoopStoredEnhancedHue::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterColorCapabilitiesAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::ColorCapabilities::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterColorTempPhysicalMinMiredsAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::ColorTempPhysicalMinMireds::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterColorTempPhysicalMaxMiredsAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::ColorTempPhysicalMaxMireds::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterCoupleColorTempToLevelMinMiredsAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::CoupleColorTempToLevelMinMireds::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterStartUpColorTemperatureMiredsAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::StartUpColorTemperatureMireds::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::ColorControl::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPColorControlClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::ColorControl::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPColorControlClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::ColorControl::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPColorControlClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::ColorControl::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPThermostatUserInterfaceConfigurationClusterTemperatureDisplayModeAttributeCallbackType)(
-    void *,
-    chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::TemperatureDisplayMode::TypeInfo::DecodableArgType);
-typedef void (*CHIPThermostatUserInterfaceConfigurationClusterKeypadLockoutAttributeCallbackType)(
-    void *, chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::KeypadLockout::TypeInfo::DecodableArgType);
-typedef void (*CHIPThermostatUserInterfaceConfigurationClusterScheduleProgrammingVisibilityAttributeCallbackType)(
-    void *,
-    chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::TypeInfo::
-        DecodableArgType);
-typedef void (*CHIPThermostatUserInterfaceConfigurationClusterGeneratedCommandListAttributeCallbackType)(
-    void *,
-    const chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPThermostatUserInterfaceConfigurationClusterAcceptedCommandListAttributeCallbackType)(
-    void *,
-    const chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPThermostatUserInterfaceConfigurationClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPThermostatUserInterfaceConfigurationClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPThermostatUserInterfaceConfigurationClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPIlluminanceMeasurementClusterMeasuredValueAttributeCallbackType)(
+    void *, chip::app::Clusters::IlluminanceMeasurement::Attributes::MeasuredValue::TypeInfo::DecodableArgType);
+typedef void (*CHIPIlluminanceMeasurementClusterMinMeasuredValueAttributeCallbackType)(
+    void *, chip::app::Clusters::IlluminanceMeasurement::Attributes::MinMeasuredValue::TypeInfo::DecodableArgType);
+typedef void (*CHIPIlluminanceMeasurementClusterMaxMeasuredValueAttributeCallbackType)(
+    void *, chip::app::Clusters::IlluminanceMeasurement::Attributes::MaxMeasuredValue::TypeInfo::DecodableArgType);
+typedef void (*CHIPIlluminanceMeasurementClusterToleranceAttributeCallbackType)(
+    void *, chip::app::Clusters::IlluminanceMeasurement::Attributes::Tolerance::TypeInfo::DecodableArgType);
+typedef void (*CHIPIlluminanceMeasurementClusterLightSensorTypeAttributeCallbackType)(
+    void *, chip::app::Clusters::IlluminanceMeasurement::Attributes::LightSensorType::TypeInfo::DecodableArgType);
+typedef void (*CHIPIlluminanceMeasurementClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::IlluminanceMeasurement::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPIlluminanceMeasurementClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::IlluminanceMeasurement::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPIlluminanceMeasurementClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::IlluminanceMeasurement::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPIlluminanceMeasurementClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::IlluminanceMeasurement::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPIlluminanceMeasurementClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::IlluminanceMeasurement::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPThreadNetworkDiagnosticsClusterChannelAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::Channel::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RoutingRole::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterNetworkNameAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::NetworkName::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterPanIdAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::PanId::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterExtendedPanIdAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::ExtendedPanId::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterMeshLocalPrefixAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::MeshLocalPrefix::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterOverrunCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::OverrunCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterNeighborTableListAttributeCallbackType)(
-    void *, const chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::NeighborTableList::TypeInfo::DecodableType &);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterRouteTableListAttributeCallbackType)(
-    void *, const chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RouteTableList::TypeInfo::DecodableType &);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterPartitionIdAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::PartitionId::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterWeightingAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::Weighting::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterDataVersionAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::DataVersion::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterStableDataVersionAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::StableDataVersion::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterLeaderRouterIdAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::LeaderRouterId::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterDetachedRoleCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::DetachedRoleCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterChildRoleCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::ChildRoleCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterRouterRoleCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RouterRoleCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterLeaderRoleCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::LeaderRoleCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterAttachAttemptCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::AttachAttemptCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterPartitionIdChangeCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::PartitionIdChangeCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterBetterPartitionAttachAttemptCountAttributeCallbackType)(
-    void *,
-    chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::BetterPartitionAttachAttemptCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterParentChangeCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::ParentChangeCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterTxTotalCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxTotalCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterTxUnicastCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxUnicastCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterTxBroadcastCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxBroadcastCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterTxAckRequestedCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxAckRequestedCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterTxAckedCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxAckedCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterTxNoAckRequestedCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxNoAckRequestedCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterTxDataCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxDataCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterTxDataPollCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxDataPollCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterTxBeaconCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxBeaconCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterTxBeaconRequestCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxBeaconRequestCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterTxOtherCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxOtherCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterTxRetryCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxRetryCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterTxDirectMaxRetryExpiryCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxDirectMaxRetryExpiryCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterTxIndirectMaxRetryExpiryCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxIndirectMaxRetryExpiryCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterTxErrCcaCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxErrCcaCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterTxErrAbortCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxErrAbortCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterTxErrBusyChannelCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::TxErrBusyChannelCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterRxTotalCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxTotalCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterRxUnicastCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxUnicastCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterRxBroadcastCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxBroadcastCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterRxDataCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxDataCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterRxDataPollCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxDataPollCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterRxBeaconCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxBeaconCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterRxBeaconRequestCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxBeaconRequestCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterRxOtherCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxOtherCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterRxAddressFilteredCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxAddressFilteredCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterRxDestAddrFilteredCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxDestAddrFilteredCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterRxDuplicatedCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxDuplicatedCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterRxErrNoFrameCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxErrNoFrameCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterRxErrUnknownNeighborCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxErrUnknownNeighborCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterRxErrInvalidSrcAddrCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxErrInvalidSrcAddrCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterRxErrSecCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxErrSecCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterRxErrFcsCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxErrFcsCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterRxErrOtherCountAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::RxErrOtherCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterActiveTimestampAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterPendingTimestampAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::PendingTimestamp::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterDelayAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::Delay::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterSecurityPolicyAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::SecurityPolicy::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterChannelMaskAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::ChannelMask::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponentsAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterActiveNetworkFaultsListAttributeCallbackType)(
-    void *, const chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::TypeInfo::DecodableType &);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPThreadNetworkDiagnosticsClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::ThreadNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPTemperatureMeasurementClusterMeasuredValueAttributeCallbackType)(
+    void *, chip::app::Clusters::TemperatureMeasurement::Attributes::MeasuredValue::TypeInfo::DecodableArgType);
+typedef void (*CHIPTemperatureMeasurementClusterMinMeasuredValueAttributeCallbackType)(
+    void *, chip::app::Clusters::TemperatureMeasurement::Attributes::MinMeasuredValue::TypeInfo::DecodableArgType);
+typedef void (*CHIPTemperatureMeasurementClusterMaxMeasuredValueAttributeCallbackType)(
+    void *, chip::app::Clusters::TemperatureMeasurement::Attributes::MaxMeasuredValue::TypeInfo::DecodableArgType);
+typedef void (*CHIPTemperatureMeasurementClusterToleranceAttributeCallbackType)(
+    void *, chip::app::Clusters::TemperatureMeasurement::Attributes::Tolerance::TypeInfo::DecodableArgType);
+typedef void (*CHIPTemperatureMeasurementClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::TemperatureMeasurement::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPTemperatureMeasurementClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::TemperatureMeasurement::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPTemperatureMeasurementClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::TemperatureMeasurement::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPTimeFormatLocalizationClusterHourFormatAttributeCallbackType)(
-    void *, chip::app::Clusters::TimeFormatLocalization::Attributes::HourFormat::TypeInfo::DecodableArgType);
-typedef void (*CHIPTimeFormatLocalizationClusterActiveCalendarTypeAttributeCallbackType)(
-    void *, chip::app::Clusters::TimeFormatLocalization::Attributes::ActiveCalendarType::TypeInfo::DecodableArgType);
-typedef void (*CHIPTimeFormatLocalizationClusterSupportedCalendarTypesAttributeCallbackType)(
-    void *, const chip::app::Clusters::TimeFormatLocalization::Attributes::SupportedCalendarTypes::TypeInfo::DecodableType &);
-typedef void (*CHIPTimeFormatLocalizationClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::TimeFormatLocalization::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPTimeFormatLocalizationClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::TimeFormatLocalization::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPTimeFormatLocalizationClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::TimeFormatLocalization::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPTimeFormatLocalizationClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::TimeFormatLocalization::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPPressureMeasurementClusterMeasuredValueAttributeCallbackType)(
+    void *, chip::app::Clusters::PressureMeasurement::Attributes::MeasuredValue::TypeInfo::DecodableArgType);
+typedef void (*CHIPPressureMeasurementClusterMinMeasuredValueAttributeCallbackType)(
+    void *, chip::app::Clusters::PressureMeasurement::Attributes::MinMeasuredValue::TypeInfo::DecodableArgType);
+typedef void (*CHIPPressureMeasurementClusterMaxMeasuredValueAttributeCallbackType)(
+    void *, chip::app::Clusters::PressureMeasurement::Attributes::MaxMeasuredValue::TypeInfo::DecodableArgType);
+typedef void (*CHIPPressureMeasurementClusterToleranceAttributeCallbackType)(
+    void *, chip::app::Clusters::PressureMeasurement::Attributes::Tolerance::TypeInfo::DecodableArgType);
+typedef void (*CHIPPressureMeasurementClusterScaledValueAttributeCallbackType)(
+    void *, chip::app::Clusters::PressureMeasurement::Attributes::ScaledValue::TypeInfo::DecodableArgType);
+typedef void (*CHIPPressureMeasurementClusterMinScaledValueAttributeCallbackType)(
+    void *, chip::app::Clusters::PressureMeasurement::Attributes::MinScaledValue::TypeInfo::DecodableArgType);
+typedef void (*CHIPPressureMeasurementClusterMaxScaledValueAttributeCallbackType)(
+    void *, chip::app::Clusters::PressureMeasurement::Attributes::MaxScaledValue::TypeInfo::DecodableArgType);
+typedef void (*CHIPPressureMeasurementClusterScaledToleranceAttributeCallbackType)(
+    void *, chip::app::Clusters::PressureMeasurement::Attributes::ScaledTolerance::TypeInfo::DecodableArgType);
+typedef void (*CHIPPressureMeasurementClusterScaleAttributeCallbackType)(
+    void *, chip::app::Clusters::PressureMeasurement::Attributes::Scale::TypeInfo::DecodableArgType);
+typedef void (*CHIPPressureMeasurementClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::PressureMeasurement::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPPressureMeasurementClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::PressureMeasurement::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPPressureMeasurementClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::PressureMeasurement::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPUnitLocalizationClusterTemperatureUnitAttributeCallbackType)(
-    void *, chip::app::Clusters::UnitLocalization::Attributes::TemperatureUnit::TypeInfo::DecodableArgType);
-typedef void (*CHIPUnitLocalizationClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::UnitLocalization::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPUnitLocalizationClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::UnitLocalization::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPUnitLocalizationClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::UnitLocalization::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPFlowMeasurementClusterMeasuredValueAttributeCallbackType)(
+    void *, chip::app::Clusters::FlowMeasurement::Attributes::MeasuredValue::TypeInfo::DecodableArgType);
+typedef void (*CHIPFlowMeasurementClusterMinMeasuredValueAttributeCallbackType)(
+    void *, chip::app::Clusters::FlowMeasurement::Attributes::MinMeasuredValue::TypeInfo::DecodableArgType);
+typedef void (*CHIPFlowMeasurementClusterMaxMeasuredValueAttributeCallbackType)(
+    void *, chip::app::Clusters::FlowMeasurement::Attributes::MaxMeasuredValue::TypeInfo::DecodableArgType);
+typedef void (*CHIPFlowMeasurementClusterToleranceAttributeCallbackType)(
+    void *, chip::app::Clusters::FlowMeasurement::Attributes::Tolerance::TypeInfo::DecodableArgType);
+typedef void (*CHIPFlowMeasurementClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::FlowMeasurement::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPFlowMeasurementClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::FlowMeasurement::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPFlowMeasurementClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::FlowMeasurement::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPFlowMeasurementClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::FlowMeasurement::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPFlowMeasurementClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::FlowMeasurement::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
-typedef void (*CHIPUserLabelClusterLabelListAttributeCallbackType)(
-    void *, const chip::app::Clusters::UserLabel::Attributes::LabelList::TypeInfo::DecodableType &);
-typedef void (*CHIPUserLabelClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::UserLabel::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPUserLabelClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::UserLabel::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPUserLabelClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::UserLabel::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPUserLabelClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::UserLabel::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPRelativeHumidityMeasurementClusterMeasuredValueAttributeCallbackType)(
+    void *, chip::app::Clusters::RelativeHumidityMeasurement::Attributes::MeasuredValue::TypeInfo::DecodableArgType);
+typedef void (*CHIPRelativeHumidityMeasurementClusterMinMeasuredValueAttributeCallbackType)(
+    void *, chip::app::Clusters::RelativeHumidityMeasurement::Attributes::MinMeasuredValue::TypeInfo::DecodableArgType);
+typedef void (*CHIPRelativeHumidityMeasurementClusterMaxMeasuredValueAttributeCallbackType)(
+    void *, chip::app::Clusters::RelativeHumidityMeasurement::Attributes::MaxMeasuredValue::TypeInfo::DecodableArgType);
+typedef void (*CHIPRelativeHumidityMeasurementClusterToleranceAttributeCallbackType)(
+    void *, chip::app::Clusters::RelativeHumidityMeasurement::Attributes::Tolerance::TypeInfo::DecodableArgType);
+typedef void (*CHIPRelativeHumidityMeasurementClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::RelativeHumidityMeasurement::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPRelativeHumidityMeasurementClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::RelativeHumidityMeasurement::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPRelativeHumidityMeasurementClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::RelativeHumidityMeasurement::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPRelativeHumidityMeasurementClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::RelativeHumidityMeasurement::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPRelativeHumidityMeasurementClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::RelativeHumidityMeasurement::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+
+typedef void (*CHIPOccupancySensingClusterOccupancyAttributeCallbackType)(
+    void *, chip::app::Clusters::OccupancySensing::Attributes::Occupancy::TypeInfo::DecodableArgType);
+typedef void (*CHIPOccupancySensingClusterOccupancySensorTypeAttributeCallbackType)(
+    void *, chip::app::Clusters::OccupancySensing::Attributes::OccupancySensorType::TypeInfo::DecodableArgType);
+typedef void (*CHIPOccupancySensingClusterOccupancySensorTypeBitmapAttributeCallbackType)(
+    void *, chip::app::Clusters::OccupancySensing::Attributes::OccupancySensorTypeBitmap::TypeInfo::DecodableArgType);
+typedef void (*CHIPOccupancySensingClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::OccupancySensing::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPOccupancySensingClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::OccupancySensing::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPOccupancySensingClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::OccupancySensing::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPOccupancySensingClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::OccupancySensing::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPOccupancySensingClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::OccupancySensing::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
 
 typedef void (*CHIPWakeOnLanClusterMACAddressAttributeCallbackType)(
     void *, chip::app::Clusters::WakeOnLan::Attributes::MACAddress::TypeInfo::DecodableArgType);
@@ -1832,95 +1511,416 @@ typedef void (*CHIPWakeOnLanClusterFeatureMapAttributeCallbackType)(
     void *, chip::app::Clusters::WakeOnLan::Attributes::FeatureMap::TypeInfo::DecodableArgType);
 typedef void (*CHIPWakeOnLanClusterClusterRevisionAttributeCallbackType)(
     void *, chip::app::Clusters::WakeOnLan::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPChannelClusterChangeChannelResponseCallbackType)(
+    void *, const chip::app::Clusters::Channel::Commands::ChangeChannelResponse::DecodableType &);
 
-typedef void (*CHIPWiFiNetworkDiagnosticsClusterBssidAttributeCallbackType)(
-    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::Bssid::TypeInfo::DecodableArgType);
-typedef void (*CHIPWiFiNetworkDiagnosticsClusterSecurityTypeAttributeCallbackType)(
-    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::SecurityType::TypeInfo::DecodableArgType);
-typedef void (*CHIPWiFiNetworkDiagnosticsClusterWiFiVersionAttributeCallbackType)(
-    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::WiFiVersion::TypeInfo::DecodableArgType);
-typedef void (*CHIPWiFiNetworkDiagnosticsClusterChannelNumberAttributeCallbackType)(
-    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::ChannelNumber::TypeInfo::DecodableArgType);
-typedef void (*CHIPWiFiNetworkDiagnosticsClusterRssiAttributeCallbackType)(
-    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::Rssi::TypeInfo::DecodableArgType);
-typedef void (*CHIPWiFiNetworkDiagnosticsClusterBeaconLostCountAttributeCallbackType)(
-    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::BeaconLostCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPWiFiNetworkDiagnosticsClusterBeaconRxCountAttributeCallbackType)(
-    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::BeaconRxCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPWiFiNetworkDiagnosticsClusterPacketMulticastRxCountAttributeCallbackType)(
-    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::PacketMulticastRxCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPWiFiNetworkDiagnosticsClusterPacketMulticastTxCountAttributeCallbackType)(
-    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::PacketMulticastTxCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPWiFiNetworkDiagnosticsClusterPacketUnicastRxCountAttributeCallbackType)(
-    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::PacketUnicastRxCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPWiFiNetworkDiagnosticsClusterPacketUnicastTxCountAttributeCallbackType)(
-    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::PacketUnicastTxCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPWiFiNetworkDiagnosticsClusterCurrentMaxRateAttributeCallbackType)(
-    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::CurrentMaxRate::TypeInfo::DecodableArgType);
-typedef void (*CHIPWiFiNetworkDiagnosticsClusterOverrunCountAttributeCallbackType)(
-    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::OverrunCount::TypeInfo::DecodableArgType);
-typedef void (*CHIPWiFiNetworkDiagnosticsClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPWiFiNetworkDiagnosticsClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPWiFiNetworkDiagnosticsClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPWiFiNetworkDiagnosticsClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPWiFiNetworkDiagnosticsClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::WiFiNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPChannelClusterChannelListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Channel::Attributes::ChannelList::TypeInfo::DecodableType &);
+typedef void (*CHIPChannelClusterLineupAttributeCallbackType)(
+    void *, chip::app::Clusters::Channel::Attributes::Lineup::TypeInfo::DecodableArgType);
+typedef void (*CHIPChannelClusterCurrentChannelAttributeCallbackType)(
+    void *, chip::app::Clusters::Channel::Attributes::CurrentChannel::TypeInfo::DecodableArgType);
+typedef void (*CHIPChannelClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Channel::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPChannelClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Channel::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPChannelClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::Channel::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPChannelClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::Channel::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPChannelClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::Channel::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPTargetNavigatorClusterNavigateTargetResponseCallbackType)(
+    void *, const chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::DecodableType &);
+
+typedef void (*CHIPTargetNavigatorClusterTargetListAttributeCallbackType)(
+    void *, const chip::app::Clusters::TargetNavigator::Attributes::TargetList::TypeInfo::DecodableType &);
+typedef void (*CHIPTargetNavigatorClusterCurrentTargetAttributeCallbackType)(
+    void *, chip::app::Clusters::TargetNavigator::Attributes::CurrentTarget::TypeInfo::DecodableArgType);
+typedef void (*CHIPTargetNavigatorClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::TargetNavigator::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPTargetNavigatorClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::TargetNavigator::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPTargetNavigatorClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::TargetNavigator::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPTargetNavigatorClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::TargetNavigator::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPTargetNavigatorClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::TargetNavigator::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPMediaPlaybackClusterPlaybackResponseCallbackType)(
+    void *, const chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType &);
+
+typedef void (*CHIPMediaPlaybackClusterCurrentStateAttributeCallbackType)(
+    void *, chip::app::Clusters::MediaPlayback::Attributes::CurrentState::TypeInfo::DecodableArgType);
+typedef void (*CHIPMediaPlaybackClusterStartTimeAttributeCallbackType)(
+    void *, chip::app::Clusters::MediaPlayback::Attributes::StartTime::TypeInfo::DecodableArgType);
+typedef void (*CHIPMediaPlaybackClusterDurationAttributeCallbackType)(
+    void *, chip::app::Clusters::MediaPlayback::Attributes::Duration::TypeInfo::DecodableArgType);
+typedef void (*CHIPMediaPlaybackClusterSampledPositionAttributeCallbackType)(
+    void *, chip::app::Clusters::MediaPlayback::Attributes::SampledPosition::TypeInfo::DecodableArgType);
+typedef void (*CHIPMediaPlaybackClusterPlaybackSpeedAttributeCallbackType)(
+    void *, chip::app::Clusters::MediaPlayback::Attributes::PlaybackSpeed::TypeInfo::DecodableArgType);
+typedef void (*CHIPMediaPlaybackClusterSeekRangeEndAttributeCallbackType)(
+    void *, chip::app::Clusters::MediaPlayback::Attributes::SeekRangeEnd::TypeInfo::DecodableArgType);
+typedef void (*CHIPMediaPlaybackClusterSeekRangeStartAttributeCallbackType)(
+    void *, chip::app::Clusters::MediaPlayback::Attributes::SeekRangeStart::TypeInfo::DecodableArgType);
+typedef void (*CHIPMediaPlaybackClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::MediaPlayback::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPMediaPlaybackClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::MediaPlayback::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPMediaPlaybackClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::MediaPlayback::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPMediaPlaybackClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::MediaPlayback::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPMediaPlaybackClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::MediaPlayback::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+
+typedef void (*CHIPMediaInputClusterInputListAttributeCallbackType)(
+    void *, const chip::app::Clusters::MediaInput::Attributes::InputList::TypeInfo::DecodableType &);
+typedef void (*CHIPMediaInputClusterCurrentInputAttributeCallbackType)(
+    void *, chip::app::Clusters::MediaInput::Attributes::CurrentInput::TypeInfo::DecodableArgType);
+typedef void (*CHIPMediaInputClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::MediaInput::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPMediaInputClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::MediaInput::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPMediaInputClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::MediaInput::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPMediaInputClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::MediaInput::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPMediaInputClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::MediaInput::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+
+typedef void (*CHIPLowPowerClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::LowPower::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPLowPowerClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::LowPower::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPLowPowerClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::LowPower::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPLowPowerClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::LowPower::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPLowPowerClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::LowPower::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPKeypadInputClusterSendKeyResponseCallbackType)(
+    void *, const chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType &);
+
+typedef void (*CHIPKeypadInputClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::KeypadInput::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPKeypadInputClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::KeypadInput::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPKeypadInputClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::KeypadInput::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPKeypadInputClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::KeypadInput::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPKeypadInputClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::KeypadInput::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPContentLauncherClusterLaunchResponseCallbackType)(
+    void *, const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType &);
+
+typedef void (*CHIPContentLauncherClusterAcceptHeaderAttributeCallbackType)(
+    void *, const chip::app::Clusters::ContentLauncher::Attributes::AcceptHeader::TypeInfo::DecodableType &);
+typedef void (*CHIPContentLauncherClusterSupportedStreamingProtocolsAttributeCallbackType)(
+    void *, chip::app::Clusters::ContentLauncher::Attributes::SupportedStreamingProtocols::TypeInfo::DecodableArgType);
+typedef void (*CHIPContentLauncherClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::ContentLauncher::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPContentLauncherClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::ContentLauncher::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPContentLauncherClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::ContentLauncher::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPContentLauncherClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::ContentLauncher::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPContentLauncherClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::ContentLauncher::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+
+typedef void (*CHIPAudioOutputClusterOutputListAttributeCallbackType)(
+    void *, const chip::app::Clusters::AudioOutput::Attributes::OutputList::TypeInfo::DecodableType &);
+typedef void (*CHIPAudioOutputClusterCurrentOutputAttributeCallbackType)(
+    void *, chip::app::Clusters::AudioOutput::Attributes::CurrentOutput::TypeInfo::DecodableArgType);
+typedef void (*CHIPAudioOutputClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::AudioOutput::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPAudioOutputClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::AudioOutput::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPAudioOutputClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::AudioOutput::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPAudioOutputClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::AudioOutput::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPAudioOutputClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::AudioOutput::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPApplicationLauncherClusterLauncherResponseCallbackType)(
+    void *, const chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType &);
+
+typedef void (*CHIPApplicationLauncherClusterCatalogListAttributeCallbackType)(
+    void *, const chip::app::Clusters::ApplicationLauncher::Attributes::CatalogList::TypeInfo::DecodableType &);
+typedef void (*CHIPApplicationLauncherClusterCurrentAppAttributeCallbackType)(
+    void *, chip::app::Clusters::ApplicationLauncher::Attributes::CurrentApp::TypeInfo::DecodableArgType);
+typedef void (*CHIPApplicationLauncherClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::ApplicationLauncher::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPApplicationLauncherClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::ApplicationLauncher::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPApplicationLauncherClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::ApplicationLauncher::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPApplicationLauncherClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::ApplicationLauncher::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPApplicationLauncherClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::ApplicationLauncher::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+
+typedef void (*CHIPApplicationBasicClusterVendorNameAttributeCallbackType)(
+    void *, chip::app::Clusters::ApplicationBasic::Attributes::VendorName::TypeInfo::DecodableArgType);
+typedef void (*CHIPApplicationBasicClusterVendorIDAttributeCallbackType)(
+    void *, chip::app::Clusters::ApplicationBasic::Attributes::VendorID::TypeInfo::DecodableArgType);
+typedef void (*CHIPApplicationBasicClusterApplicationNameAttributeCallbackType)(
+    void *, chip::app::Clusters::ApplicationBasic::Attributes::ApplicationName::TypeInfo::DecodableArgType);
+typedef void (*CHIPApplicationBasicClusterProductIDAttributeCallbackType)(
+    void *, chip::app::Clusters::ApplicationBasic::Attributes::ProductID::TypeInfo::DecodableArgType);
+typedef void (*CHIPApplicationBasicClusterApplicationAttributeCallbackType)(
+    void *, chip::app::Clusters::ApplicationBasic::Attributes::Application::TypeInfo::DecodableArgType);
+typedef void (*CHIPApplicationBasicClusterStatusAttributeCallbackType)(
+    void *, chip::app::Clusters::ApplicationBasic::Attributes::Status::TypeInfo::DecodableArgType);
+typedef void (*CHIPApplicationBasicClusterApplicationVersionAttributeCallbackType)(
+    void *, chip::app::Clusters::ApplicationBasic::Attributes::ApplicationVersion::TypeInfo::DecodableArgType);
+typedef void (*CHIPApplicationBasicClusterAllowedVendorListAttributeCallbackType)(
+    void *, const chip::app::Clusters::ApplicationBasic::Attributes::AllowedVendorList::TypeInfo::DecodableType &);
+typedef void (*CHIPApplicationBasicClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::ApplicationBasic::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPApplicationBasicClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::ApplicationBasic::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPApplicationBasicClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::ApplicationBasic::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPApplicationBasicClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::ApplicationBasic::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPApplicationBasicClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::ApplicationBasic::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPAccountLoginClusterGetSetupPINResponseCallbackType)(
+    void *, const chip::app::Clusters::AccountLogin::Commands::GetSetupPINResponse::DecodableType &);
+
+typedef void (*CHIPAccountLoginClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::AccountLogin::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPAccountLoginClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::AccountLogin::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPAccountLoginClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::AccountLogin::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPAccountLoginClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::AccountLogin::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPAccountLoginClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::AccountLogin::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+
+typedef void (*CHIPElectricalMeasurementClusterMeasurementTypeAttributeCallbackType)(
+    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::MeasurementType::TypeInfo::DecodableArgType);
+typedef void (*CHIPElectricalMeasurementClusterTotalActivePowerAttributeCallbackType)(
+    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::TotalActivePower::TypeInfo::DecodableArgType);
+typedef void (*CHIPElectricalMeasurementClusterRmsVoltageAttributeCallbackType)(
+    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::RmsVoltage::TypeInfo::DecodableArgType);
+typedef void (*CHIPElectricalMeasurementClusterRmsVoltageMinAttributeCallbackType)(
+    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::RmsVoltageMin::TypeInfo::DecodableArgType);
+typedef void (*CHIPElectricalMeasurementClusterRmsVoltageMaxAttributeCallbackType)(
+    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::RmsVoltageMax::TypeInfo::DecodableArgType);
+typedef void (*CHIPElectricalMeasurementClusterRmsCurrentAttributeCallbackType)(
+    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::RmsCurrent::TypeInfo::DecodableArgType);
+typedef void (*CHIPElectricalMeasurementClusterRmsCurrentMinAttributeCallbackType)(
+    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::RmsCurrentMin::TypeInfo::DecodableArgType);
+typedef void (*CHIPElectricalMeasurementClusterRmsCurrentMaxAttributeCallbackType)(
+    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::RmsCurrentMax::TypeInfo::DecodableArgType);
+typedef void (*CHIPElectricalMeasurementClusterActivePowerAttributeCallbackType)(
+    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::ActivePower::TypeInfo::DecodableArgType);
+typedef void (*CHIPElectricalMeasurementClusterActivePowerMinAttributeCallbackType)(
+    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::ActivePowerMin::TypeInfo::DecodableArgType);
+typedef void (*CHIPElectricalMeasurementClusterActivePowerMaxAttributeCallbackType)(
+    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::ActivePowerMax::TypeInfo::DecodableArgType);
+typedef void (*CHIPElectricalMeasurementClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::ElectricalMeasurement::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPElectricalMeasurementClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::ElectricalMeasurement::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPElectricalMeasurementClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::ElectricalMeasurement::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPElectricalMeasurementClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPElectricalMeasurementClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::ElectricalMeasurement::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterTestSpecificResponseCallbackType)(
+    void *, const chip::app::Clusters::TestCluster::Commands::TestSpecificResponse::DecodableType &);
+typedef void (*CHIPTestClusterClusterTestAddArgumentsResponseCallbackType)(
+    void *, const chip::app::Clusters::TestCluster::Commands::TestAddArgumentsResponse::DecodableType &);
+typedef void (*CHIPTestClusterClusterTestListInt8UReverseResponseCallbackType)(
+    void *, const chip::app::Clusters::TestCluster::Commands::TestListInt8UReverseResponse::DecodableType &);
+typedef void (*CHIPTestClusterClusterTestEnumsResponseCallbackType)(
+    void *, const chip::app::Clusters::TestCluster::Commands::TestEnumsResponse::DecodableType &);
+typedef void (*CHIPTestClusterClusterTestNullableOptionalResponseCallbackType)(
+    void *, const chip::app::Clusters::TestCluster::Commands::TestNullableOptionalResponse::DecodableType &);
+typedef void (*CHIPTestClusterClusterBooleanResponseCallbackType)(
+    void *, const chip::app::Clusters::TestCluster::Commands::BooleanResponse::DecodableType &);
+typedef void (*CHIPTestClusterClusterSimpleStructResponseCallbackType)(
+    void *, const chip::app::Clusters::TestCluster::Commands::SimpleStructResponse::DecodableType &);
+typedef void (*CHIPTestClusterClusterTestEmitTestEventResponseCallbackType)(
+    void *, const chip::app::Clusters::TestCluster::Commands::TestEmitTestEventResponse::DecodableType &);
 
-typedef void (*CHIPWindowCoveringClusterTypeAttributeCallbackType)(
-    void *, chip::app::Clusters::WindowCovering::Attributes::Type::TypeInfo::DecodableArgType);
-typedef void (*CHIPWindowCoveringClusterPhysicalClosedLimitLiftAttributeCallbackType)(
-    void *, chip::app::Clusters::WindowCovering::Attributes::PhysicalClosedLimitLift::TypeInfo::DecodableArgType);
-typedef void (*CHIPWindowCoveringClusterPhysicalClosedLimitTiltAttributeCallbackType)(
-    void *, chip::app::Clusters::WindowCovering::Attributes::PhysicalClosedLimitTilt::TypeInfo::DecodableArgType);
-typedef void (*CHIPWindowCoveringClusterCurrentPositionLiftAttributeCallbackType)(
-    void *, chip::app::Clusters::WindowCovering::Attributes::CurrentPositionLift::TypeInfo::DecodableArgType);
-typedef void (*CHIPWindowCoveringClusterCurrentPositionTiltAttributeCallbackType)(
-    void *, chip::app::Clusters::WindowCovering::Attributes::CurrentPositionTilt::TypeInfo::DecodableArgType);
-typedef void (*CHIPWindowCoveringClusterNumberOfActuationsLiftAttributeCallbackType)(
-    void *, chip::app::Clusters::WindowCovering::Attributes::NumberOfActuationsLift::TypeInfo::DecodableArgType);
-typedef void (*CHIPWindowCoveringClusterNumberOfActuationsTiltAttributeCallbackType)(
-    void *, chip::app::Clusters::WindowCovering::Attributes::NumberOfActuationsTilt::TypeInfo::DecodableArgType);
-typedef void (*CHIPWindowCoveringClusterConfigStatusAttributeCallbackType)(
-    void *, chip::app::Clusters::WindowCovering::Attributes::ConfigStatus::TypeInfo::DecodableArgType);
-typedef void (*CHIPWindowCoveringClusterCurrentPositionLiftPercentageAttributeCallbackType)(
-    void *, chip::app::Clusters::WindowCovering::Attributes::CurrentPositionLiftPercentage::TypeInfo::DecodableArgType);
-typedef void (*CHIPWindowCoveringClusterCurrentPositionTiltPercentageAttributeCallbackType)(
-    void *, chip::app::Clusters::WindowCovering::Attributes::CurrentPositionTiltPercentage::TypeInfo::DecodableArgType);
-typedef void (*CHIPWindowCoveringClusterOperationalStatusAttributeCallbackType)(
-    void *, chip::app::Clusters::WindowCovering::Attributes::OperationalStatus::TypeInfo::DecodableArgType);
-typedef void (*CHIPWindowCoveringClusterTargetPositionLiftPercent100thsAttributeCallbackType)(
-    void *, chip::app::Clusters::WindowCovering::Attributes::TargetPositionLiftPercent100ths::TypeInfo::DecodableArgType);
-typedef void (*CHIPWindowCoveringClusterTargetPositionTiltPercent100thsAttributeCallbackType)(
-    void *, chip::app::Clusters::WindowCovering::Attributes::TargetPositionTiltPercent100ths::TypeInfo::DecodableArgType);
-typedef void (*CHIPWindowCoveringClusterEndProductTypeAttributeCallbackType)(
-    void *, chip::app::Clusters::WindowCovering::Attributes::EndProductType::TypeInfo::DecodableArgType);
-typedef void (*CHIPWindowCoveringClusterCurrentPositionLiftPercent100thsAttributeCallbackType)(
-    void *, chip::app::Clusters::WindowCovering::Attributes::CurrentPositionLiftPercent100ths::TypeInfo::DecodableArgType);
-typedef void (*CHIPWindowCoveringClusterCurrentPositionTiltPercent100thsAttributeCallbackType)(
-    void *, chip::app::Clusters::WindowCovering::Attributes::CurrentPositionTiltPercent100ths::TypeInfo::DecodableArgType);
-typedef void (*CHIPWindowCoveringClusterInstalledOpenLimitLiftAttributeCallbackType)(
-    void *, chip::app::Clusters::WindowCovering::Attributes::InstalledOpenLimitLift::TypeInfo::DecodableArgType);
-typedef void (*CHIPWindowCoveringClusterInstalledClosedLimitLiftAttributeCallbackType)(
-    void *, chip::app::Clusters::WindowCovering::Attributes::InstalledClosedLimitLift::TypeInfo::DecodableArgType);
-typedef void (*CHIPWindowCoveringClusterInstalledOpenLimitTiltAttributeCallbackType)(
-    void *, chip::app::Clusters::WindowCovering::Attributes::InstalledOpenLimitTilt::TypeInfo::DecodableArgType);
-typedef void (*CHIPWindowCoveringClusterInstalledClosedLimitTiltAttributeCallbackType)(
-    void *, chip::app::Clusters::WindowCovering::Attributes::InstalledClosedLimitTilt::TypeInfo::DecodableArgType);
-typedef void (*CHIPWindowCoveringClusterModeAttributeCallbackType)(
-    void *, chip::app::Clusters::WindowCovering::Attributes::Mode::TypeInfo::DecodableArgType);
-typedef void (*CHIPWindowCoveringClusterSafetyStatusAttributeCallbackType)(
-    void *, chip::app::Clusters::WindowCovering::Attributes::SafetyStatus::TypeInfo::DecodableArgType);
-typedef void (*CHIPWindowCoveringClusterGeneratedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::WindowCovering::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPWindowCoveringClusterAcceptedCommandListAttributeCallbackType)(
-    void *, const chip::app::Clusters::WindowCovering::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPWindowCoveringClusterAttributeListAttributeCallbackType)(
-    void *, const chip::app::Clusters::WindowCovering::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPWindowCoveringClusterFeatureMapAttributeCallbackType)(
-    void *, chip::app::Clusters::WindowCovering::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPWindowCoveringClusterClusterRevisionAttributeCallbackType)(
-    void *, chip::app::Clusters::WindowCovering::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterBooleanAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::Boolean::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterBitmap8AttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::Bitmap8::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterBitmap16AttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::Bitmap16::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterBitmap32AttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::Bitmap32::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterBitmap64AttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::Bitmap64::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterInt8uAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::Int8u::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterInt16uAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::Int16u::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterInt24uAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::Int24u::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterInt32uAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::Int32u::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterInt40uAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::Int40u::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterInt48uAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::Int48u::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterInt56uAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::Int56u::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterInt64uAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::Int64u::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterInt8sAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::Int8s::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterInt16sAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::Int16s::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterInt24sAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::Int24s::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterInt32sAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::Int32s::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterInt40sAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::Int40s::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterInt48sAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::Int48s::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterInt56sAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::Int56s::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterInt64sAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::Int64s::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterEnum8AttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::Enum8::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterEnum16AttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::Enum16::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterFloatSingleAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::FloatSingle::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterFloatDoubleAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::FloatDouble::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterOctetStringAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::OctetString::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterListInt8uAttributeCallbackType)(
+    void *, const chip::app::Clusters::TestCluster::Attributes::ListInt8u::TypeInfo::DecodableType &);
+typedef void (*CHIPTestClusterClusterListOctetStringAttributeCallbackType)(
+    void *, const chip::app::Clusters::TestCluster::Attributes::ListOctetString::TypeInfo::DecodableType &);
+typedef void (*CHIPTestClusterClusterListStructOctetStringAttributeCallbackType)(
+    void *, const chip::app::Clusters::TestCluster::Attributes::ListStructOctetString::TypeInfo::DecodableType &);
+typedef void (*CHIPTestClusterClusterLongOctetStringAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::LongOctetString::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterCharStringAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::CharString::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterLongCharStringAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::LongCharString::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterEpochUsAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::EpochUs::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterEpochSAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::EpochS::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterVendorIdAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::VendorId::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterListNullablesAndOptionalsStructAttributeCallbackType)(
+    void *, const chip::app::Clusters::TestCluster::Attributes::ListNullablesAndOptionalsStruct::TypeInfo::DecodableType &);
+typedef void (*CHIPTestClusterClusterEnumAttrAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::EnumAttr::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterStructAttrAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::StructAttr::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterRangeRestrictedInt8uAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::RangeRestrictedInt8u::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterRangeRestrictedInt8sAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::RangeRestrictedInt8s::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterRangeRestrictedInt16uAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::RangeRestrictedInt16u::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterRangeRestrictedInt16sAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::RangeRestrictedInt16s::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterListLongOctetStringAttributeCallbackType)(
+    void *, const chip::app::Clusters::TestCluster::Attributes::ListLongOctetString::TypeInfo::DecodableType &);
+typedef void (*CHIPTestClusterClusterListFabricScopedAttributeCallbackType)(
+    void *, const chip::app::Clusters::TestCluster::Attributes::ListFabricScoped::TypeInfo::DecodableType &);
+typedef void (*CHIPTestClusterClusterTimedWriteBooleanAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::TimedWriteBoolean::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterGeneralErrorBooleanAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::GeneralErrorBoolean::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterClusterErrorBooleanAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::ClusterErrorBoolean::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterUnsupportedAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::Unsupported::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableBooleanAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableBoolean::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableBitmap8AttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableBitmap8::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableBitmap16AttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableBitmap16::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableBitmap32AttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableBitmap32::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableBitmap64AttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableBitmap64::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableInt8uAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt8u::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableInt16uAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt16u::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableInt24uAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt24u::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableInt32uAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt32u::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableInt40uAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt40u::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableInt48uAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt48u::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableInt56uAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt56u::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableInt64uAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt64u::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableInt8sAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt8s::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableInt16sAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt16s::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableInt24sAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt24s::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableInt32sAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt32s::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableInt40sAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt40s::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableInt48sAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt48s::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableInt56sAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt56s::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableInt64sAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableInt64s::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableEnum8AttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableEnum8::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableEnum16AttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableEnum16::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableFloatSingleAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableFloatSingle::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableFloatDoubleAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableFloatDouble::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableOctetStringAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableOctetString::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableCharStringAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableCharString::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableEnumAttrAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableEnumAttr::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableStructAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableStruct::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableRangeRestrictedInt8uAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableRangeRestrictedInt8u::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableRangeRestrictedInt8sAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableRangeRestrictedInt8s::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableRangeRestrictedInt16uAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableRangeRestrictedInt16u::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterNullableRangeRestrictedInt16sAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::NullableRangeRestrictedInt16s::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterGeneratedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::TestCluster::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPTestClusterClusterAcceptedCommandListAttributeCallbackType)(
+    void *, const chip::app::Clusters::TestCluster::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPTestClusterClusterAttributeListAttributeCallbackType)(
+    void *, const chip::app::Clusters::TestCluster::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPTestClusterClusterFeatureMapAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPTestClusterClusterClusterRevisionAttributeCallbackType)(
+    void *, chip::app::Clusters::TestCluster::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
diff --git a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp
index d21c690816cb13..a8c3724dea95d4 100644
--- a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp
+++ b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp
@@ -42,164 +42,19 @@
 using namespace chip;
 using namespace chip::Controller;
 
-JNI_METHOD(void, AccessControlCluster, writeAclAttribute)
+JNI_METHOD(void, IdentifyCluster, writeIdentifyTimeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::AccessControl::Attributes::Acl::TypeInfo;
+    using TypeInfo = chip::app::Clusters::Identify::Attributes::IdentifyTime::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    {
-        using ListType_0       = std::remove_reference_t<decltype(cppValue)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        jint valueSize;
-        chip::JniReferences::GetInstance().GetListSize(value, valueSize);
-        if (valueSize != 0)
-        {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(valueSize);
-            listFreer.add(listHolder_0);
-
-            for (size_t i_0 = 0; i_0 < static_cast<size_t>(valueSize); ++i_0)
-            {
-                jobject element_0;
-                chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0);
-                jobject element_0_privilegeItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "privilege", "Ljava/lang/Integer;",
-                                                                  element_0_privilegeItem_1);
-                listHolder_0->mList[i_0].privilege =
-                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].privilege)>>(
-                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_privilegeItem_1));
-                jobject element_0_authModeItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "authMode", "Ljava/lang/Integer;",
-                                                                  element_0_authModeItem_1);
-                listHolder_0->mList[i_0].authMode =
-                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].authMode)>>(
-                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_authModeItem_1));
-                jobject element_0_subjectsItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "subjects", "Ljava/util/ArrayList;",
-                                                                  element_0_subjectsItem_1);
-                if (element_0_subjectsItem_1 == nullptr)
-                {
-                    listHolder_0->mList[i_0].subjects.SetNull();
-                }
-                else
-                {
-                    auto & nonNullValue_2 = listHolder_0->mList[i_0].subjects.SetNonNull();
-                    {
-                        using ListType_3       = std::remove_reference_t<decltype(nonNullValue_2)>;
-                        using ListMemberType_3 = ListMemberTypeGetter<ListType_3>::Type;
-                        jint element_0_subjectsItem_1Size;
-                        chip::JniReferences::GetInstance().GetListSize(element_0_subjectsItem_1, element_0_subjectsItem_1Size);
-                        if (element_0_subjectsItem_1Size != 0)
-                        {
-                            auto * listHolder_3 = new ListHolder<ListMemberType_3>(element_0_subjectsItem_1Size);
-                            listFreer.add(listHolder_3);
-
-                            for (size_t i_3 = 0; i_3 < static_cast<size_t>(element_0_subjectsItem_1Size); ++i_3)
-                            {
-                                jobject element_3;
-                                chip::JniReferences::GetInstance().GetListItem(element_0_subjectsItem_1, i_3, element_3);
-                                listHolder_3->mList[i_3] = static_cast<std::remove_reference_t<decltype(listHolder_3->mList[i_3])>>(
-                                    chip::JniReferences::GetInstance().LongToPrimitive(element_3));
-                            }
-                            nonNullValue_2 = ListType_3(listHolder_3->mList, element_0_subjectsItem_1Size);
-                        }
-                        else
-                        {
-                            nonNullValue_2 = ListType_3();
-                        }
-                    }
-                }
-                jobject element_0_targetsItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "targets", "Ljava/util/ArrayList;",
-                                                                  element_0_targetsItem_1);
-                if (element_0_targetsItem_1 == nullptr)
-                {
-                    listHolder_0->mList[i_0].targets.SetNull();
-                }
-                else
-                {
-                    auto & nonNullValue_2 = listHolder_0->mList[i_0].targets.SetNonNull();
-                    {
-                        using ListType_3       = std::remove_reference_t<decltype(nonNullValue_2)>;
-                        using ListMemberType_3 = ListMemberTypeGetter<ListType_3>::Type;
-                        jint element_0_targetsItem_1Size;
-                        chip::JniReferences::GetInstance().GetListSize(element_0_targetsItem_1, element_0_targetsItem_1Size);
-                        if (element_0_targetsItem_1Size != 0)
-                        {
-                            auto * listHolder_3 = new ListHolder<ListMemberType_3>(element_0_targetsItem_1Size);
-                            listFreer.add(listHolder_3);
-
-                            for (size_t i_3 = 0; i_3 < static_cast<size_t>(element_0_targetsItem_1Size); ++i_3)
-                            {
-                                jobject element_3;
-                                chip::JniReferences::GetInstance().GetListItem(element_0_targetsItem_1, i_3, element_3);
-                                jobject element_3_clusterItem_4;
-                                chip::JniReferences::GetInstance().GetObjectField(element_3, "cluster", "Ljava/lang/Long;",
-                                                                                  element_3_clusterItem_4);
-                                if (element_3_clusterItem_4 == nullptr)
-                                {
-                                    listHolder_3->mList[i_3].cluster.SetNull();
-                                }
-                                else
-                                {
-                                    auto & nonNullValue_5 = listHolder_3->mList[i_3].cluster.SetNonNull();
-                                    nonNullValue_5        = static_cast<std::remove_reference_t<decltype(nonNullValue_5)>>(
-                                        chip::JniReferences::GetInstance().LongToPrimitive(element_3_clusterItem_4));
-                                }
-                                jobject element_3_endpointItem_4;
-                                chip::JniReferences::GetInstance().GetObjectField(element_3, "endpoint", "Ljava/lang/Integer;",
-                                                                                  element_3_endpointItem_4);
-                                if (element_3_endpointItem_4 == nullptr)
-                                {
-                                    listHolder_3->mList[i_3].endpoint.SetNull();
-                                }
-                                else
-                                {
-                                    auto & nonNullValue_5 = listHolder_3->mList[i_3].endpoint.SetNonNull();
-                                    nonNullValue_5        = static_cast<std::remove_reference_t<decltype(nonNullValue_5)>>(
-                                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_3_endpointItem_4));
-                                }
-                                jobject element_3_deviceTypeItem_4;
-                                chip::JniReferences::GetInstance().GetObjectField(element_3, "deviceType", "Ljava/lang/Long;",
-                                                                                  element_3_deviceTypeItem_4);
-                                if (element_3_deviceTypeItem_4 == nullptr)
-                                {
-                                    listHolder_3->mList[i_3].deviceType.SetNull();
-                                }
-                                else
-                                {
-                                    auto & nonNullValue_5 = listHolder_3->mList[i_3].deviceType.SetNonNull();
-                                    nonNullValue_5        = static_cast<std::remove_reference_t<decltype(nonNullValue_5)>>(
-                                        chip::JniReferences::GetInstance().LongToPrimitive(element_3_deviceTypeItem_4));
-                                }
-                            }
-                            nonNullValue_2 = ListType_3(listHolder_3->mList, element_0_targetsItem_1Size);
-                        }
-                        else
-                        {
-                            nonNullValue_2 = ListType_3();
-                        }
-                    }
-                }
-                jobject element_0_fabricIndexItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricIndex", "Ljava/lang/Integer;",
-                                                                  element_0_fabricIndexItem_1);
-                listHolder_0->mList[i_0].fabricIndex =
-                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricIndex)>>(
-                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricIndexItem_1));
-            }
-            cppValue = ListType_0(listHolder_0->mList, valueSize);
-        }
-        else
-        {
-            cppValue = ListType_0();
-        }
-    }
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -213,8 +68,8 @@ JNI_METHOD(void, AccessControlCluster, writeAclAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                    = CHIP_NO_ERROR;
-    AccessControlCluster * cppCluster = reinterpret_cast<AccessControlCluster *>(clusterPtr);
+    CHIP_ERROR err               = CHIP_NO_ERROR;
+    IdentifyCluster * cppCluster = reinterpret_cast<IdentifyCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -239,50 +94,19 @@ JNI_METHOD(void, AccessControlCluster, writeAclAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, AccessControlCluster, writeExtensionAttribute)
+JNI_METHOD(void, OnOffCluster, writeOnTimeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::AccessControl::Attributes::Extension::TypeInfo;
+    using TypeInfo = chip::app::Clusters::OnOff::Attributes::OnTime::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    {
-        using ListType_0       = std::remove_reference_t<decltype(cppValue)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        jint valueSize;
-        chip::JniReferences::GetInstance().GetListSize(value, valueSize);
-        if (valueSize != 0)
-        {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(valueSize);
-            listFreer.add(listHolder_0);
-
-            for (size_t i_0 = 0; i_0 < static_cast<size_t>(valueSize); ++i_0)
-            {
-                jobject element_0;
-                chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0);
-                jobject element_0_dataItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "data", "[B", element_0_dataItem_1);
-                cleanupByteArrays.push_back(
-                    chip::Platform::MakeUnique<chip::JniByteArray>(env, static_cast<jbyteArray>(element_0_dataItem_1)));
-                listHolder_0->mList[i_0].data = cleanupByteArrays.back()->byteSpan();
-                jobject element_0_fabricIndexItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricIndex", "Ljava/lang/Integer;",
-                                                                  element_0_fabricIndexItem_1);
-                listHolder_0->mList[i_0].fabricIndex =
-                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricIndex)>>(
-                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricIndexItem_1));
-            }
-            cppValue = ListType_0(listHolder_0->mList, valueSize);
-        }
-        else
-        {
-            cppValue = ListType_0();
-        }
-    }
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -296,8 +120,8 @@ JNI_METHOD(void, AccessControlCluster, writeExtensionAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                    = CHIP_NO_ERROR;
-    AccessControlCluster * cppCluster = reinterpret_cast<AccessControlCluster *>(clusterPtr);
+    CHIP_ERROR err            = CHIP_NO_ERROR;
+    OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -322,19 +146,19 @@ JNI_METHOD(void, AccessControlCluster, writeExtensionAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, BasicCluster, writeNodeLabelAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value, jobject timedWriteTimeoutMs)
+JNI_METHOD(void, OnOffCluster, writeOffWaitTimeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::Basic::Attributes::NodeLabel::TypeInfo;
+    using TypeInfo = chip::app::Clusters::OnOff::Attributes::OffWaitTime::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cleanupStrings.push_back(chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(value)));
-    cppValue = cleanupStrings.back()->charSpan();
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -349,7 +173,7 @@ JNI_METHOD(void, BasicCluster, writeNodeLabelAttribute)
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err            = CHIP_NO_ERROR;
-    BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
+    OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -374,19 +198,27 @@ JNI_METHOD(void, BasicCluster, writeNodeLabelAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, BasicCluster, writeLocationAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value, jobject timedWriteTimeoutMs)
+JNI_METHOD(void, OnOffCluster, writeStartUpOnOffAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::Basic::Attributes::Location::TypeInfo;
+    using TypeInfo = chip::app::Clusters::OnOff::Attributes::StartUpOnOff::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cleanupStrings.push_back(chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(value)));
-    cppValue = cleanupStrings.back()->charSpan();
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -401,7 +233,7 @@ JNI_METHOD(void, BasicCluster, writeLocationAttribute)
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err            = CHIP_NO_ERROR;
-    BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
+    OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -426,19 +258,19 @@ JNI_METHOD(void, BasicCluster, writeLocationAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, BasicCluster, writeLocalConfigDisabledAttribute)
+JNI_METHOD(void, OnOffSwitchConfigurationCluster, writeSwitchActionsAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::Basic::Attributes::LocalConfigDisabled::TypeInfo;
+    using TypeInfo = chip::app::Clusters::OnOffSwitchConfiguration::Attributes::SwitchActions::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
     cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().BooleanToPrimitive(value));
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -452,8 +284,8 @@ JNI_METHOD(void, BasicCluster, writeLocalConfigDisabledAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
-    BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    OnOffSwitchConfigurationCluster * cppCluster = reinterpret_cast<OnOffSwitchConfigurationCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -478,19 +310,19 @@ JNI_METHOD(void, BasicCluster, writeLocalConfigDisabledAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, BinaryInputBasicCluster, writeOutOfServiceAttribute)
+JNI_METHOD(void, LevelControlCluster, writeOptionsAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::BinaryInputBasic::Attributes::OutOfService::TypeInfo;
+    using TypeInfo = chip::app::Clusters::LevelControl::Attributes::Options::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
     cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().BooleanToPrimitive(value));
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -504,8 +336,8 @@ JNI_METHOD(void, BinaryInputBasicCluster, writeOutOfServiceAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
-    BinaryInputBasicCluster * cppCluster = reinterpret_cast<BinaryInputBasicCluster *>(clusterPtr);
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -530,19 +362,19 @@ JNI_METHOD(void, BinaryInputBasicCluster, writeOutOfServiceAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, BinaryInputBasicCluster, writePresentValueAttribute)
+JNI_METHOD(void, LevelControlCluster, writeOnOffTransitionTimeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::BinaryInputBasic::Attributes::PresentValue::TypeInfo;
+    using TypeInfo = chip::app::Clusters::LevelControl::Attributes::OnOffTransitionTime::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
     cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().BooleanToPrimitive(value));
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -556,8 +388,8 @@ JNI_METHOD(void, BinaryInputBasicCluster, writePresentValueAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
-    BinaryInputBasicCluster * cppCluster = reinterpret_cast<BinaryInputBasicCluster *>(clusterPtr);
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -582,99 +414,26 @@ JNI_METHOD(void, BinaryInputBasicCluster, writePresentValueAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, BindingCluster, writeBindingAttribute)
+JNI_METHOD(void, LevelControlCluster, writeOnLevelAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::Binding::Attributes::Binding::TypeInfo;
+    using TypeInfo = chip::app::Clusters::LevelControl::Attributes::OnLevel::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
+    if (value == nullptr)
     {
-        using ListType_0       = std::remove_reference_t<decltype(cppValue)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        jint valueSize;
-        chip::JniReferences::GetInstance().GetListSize(value, valueSize);
-        if (valueSize != 0)
-        {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(valueSize);
-            listFreer.add(listHolder_0);
-
-            for (size_t i_0 = 0; i_0 < static_cast<size_t>(valueSize); ++i_0)
-            {
-                jobject element_0;
-                chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0);
-                jobject element_0_nodeItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "node", "Ljava/util/Optional;", element_0_nodeItem_1);
-                if (element_0_nodeItem_1 != nullptr)
-                {
-                    jobject optionalValue_2;
-                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_nodeItem_1, optionalValue_2);
-                    if (optionalValue_2 != nullptr)
-                    {
-                        auto & definedValue_2 = listHolder_0->mList[i_0].node.Emplace();
-                        definedValue_2        = static_cast<std::remove_reference_t<decltype(definedValue_2)>>(
-                            chip::JniReferences::GetInstance().LongToPrimitive(optionalValue_2));
-                    }
-                }
-                jobject element_0_groupItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "group", "Ljava/util/Optional;",
-                                                                  element_0_groupItem_1);
-                if (element_0_groupItem_1 != nullptr)
-                {
-                    jobject optionalValue_2;
-                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_groupItem_1, optionalValue_2);
-                    if (optionalValue_2 != nullptr)
-                    {
-                        auto & definedValue_2 = listHolder_0->mList[i_0].group.Emplace();
-                        definedValue_2        = static_cast<std::remove_reference_t<decltype(definedValue_2)>>(
-                            chip::JniReferences::GetInstance().IntegerToPrimitive(optionalValue_2));
-                    }
-                }
-                jobject element_0_endpointItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "endpoint", "Ljava/util/Optional;",
-                                                                  element_0_endpointItem_1);
-                if (element_0_endpointItem_1 != nullptr)
-                {
-                    jobject optionalValue_2;
-                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_endpointItem_1, optionalValue_2);
-                    if (optionalValue_2 != nullptr)
-                    {
-                        auto & definedValue_2 = listHolder_0->mList[i_0].endpoint.Emplace();
-                        definedValue_2        = static_cast<std::remove_reference_t<decltype(definedValue_2)>>(
-                            chip::JniReferences::GetInstance().IntegerToPrimitive(optionalValue_2));
-                    }
-                }
-                jobject element_0_clusterItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "cluster", "Ljava/util/Optional;",
-                                                                  element_0_clusterItem_1);
-                if (element_0_clusterItem_1 != nullptr)
-                {
-                    jobject optionalValue_2;
-                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_clusterItem_1, optionalValue_2);
-                    if (optionalValue_2 != nullptr)
-                    {
-                        auto & definedValue_2 = listHolder_0->mList[i_0].cluster.Emplace();
-                        definedValue_2        = static_cast<std::remove_reference_t<decltype(definedValue_2)>>(
-                            chip::JniReferences::GetInstance().LongToPrimitive(optionalValue_2));
-                    }
-                }
-                jobject element_0_fabricIndexItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricIndex", "Ljava/lang/Integer;",
-                                                                  element_0_fabricIndexItem_1);
-                listHolder_0->mList[i_0].fabricIndex =
-                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricIndex)>>(
-                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricIndexItem_1));
-            }
-            cppValue = ListType_0(listHolder_0->mList, valueSize);
-        }
-        else
-        {
-            cppValue = ListType_0();
-        }
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
     }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
@@ -689,8 +448,8 @@ JNI_METHOD(void, BindingCluster, writeBindingAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err              = CHIP_NO_ERROR;
-    BindingCluster * cppCluster = reinterpret_cast<BindingCluster *>(clusterPtr);
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -715,71 +474,27 @@ JNI_METHOD(void, BindingCluster, writeBindingAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, BridgedDeviceBasicCluster, writeNodeLabelAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value, jobject timedWriteTimeoutMs)
+JNI_METHOD(void, LevelControlCluster, writeOnTransitionTimeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::BridgedDeviceBasic::Attributes::NodeLabel::TypeInfo;
+    using TypeInfo = chip::app::Clusters::LevelControl::Attributes::OnTransitionTime::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cleanupStrings.push_back(chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(value)));
-    cppValue = cleanupStrings.back()->charSpan();
-
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
-                       env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
-
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
-                       env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
-    BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
-                       env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
-
-    auto successFn = chip::Callback::Callback<CHIPDefaultWriteSuccessCallbackType>::FromCancelable(onSuccess->Cancel());
-    auto failureFn = chip::Callback::Callback<CHIPDefaultFailureCallbackType>::FromCancelable(onFailure->Cancel());
-
-    if (timedWriteTimeoutMs == nullptr)
+    if (value == nullptr)
     {
-        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall);
+        cppValue.SetNull();
     }
     else
     {
-        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall,
-                                                   chip::JniReferences::GetInstance().IntegerToPrimitive(timedWriteTimeoutMs));
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
     }
-    VerifyOrReturn(
-        err == CHIP_NO_ERROR,
-        chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error writing attribute", err));
-
-    onSuccess.release();
-    onFailure.release();
-}
-
-JNI_METHOD(void, ColorControlCluster, writeOptionsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
-{
-    chip::DeviceLayer::StackLock lock;
-    ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::Options::TypeInfo;
-    TypeInfo::Type cppValue;
-
-    std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
-    std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
-
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -794,7 +509,7 @@ JNI_METHOD(void, ColorControlCluster, writeOptionsAttribute)
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err                   = CHIP_NO_ERROR;
-    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
+    LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -819,19 +534,27 @@ JNI_METHOD(void, ColorControlCluster, writeOptionsAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeWhitePointXAttribute)
+JNI_METHOD(void, LevelControlCluster, writeOffTransitionTimeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::WhitePointX::TypeInfo;
+    using TypeInfo = chip::app::Clusters::LevelControl::Attributes::OffTransitionTime::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -846,7 +569,7 @@ JNI_METHOD(void, ColorControlCluster, writeWhitePointXAttribute)
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err                   = CHIP_NO_ERROR;
-    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
+    LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -871,19 +594,27 @@ JNI_METHOD(void, ColorControlCluster, writeWhitePointXAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeWhitePointYAttribute)
+JNI_METHOD(void, LevelControlCluster, writeDefaultMoveRateAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::WhitePointY::TypeInfo;
+    using TypeInfo = chip::app::Clusters::LevelControl::Attributes::DefaultMoveRate::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -898,7 +629,7 @@ JNI_METHOD(void, ColorControlCluster, writeWhitePointYAttribute)
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err                   = CHIP_NO_ERROR;
-    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
+    LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -923,19 +654,27 @@ JNI_METHOD(void, ColorControlCluster, writeWhitePointYAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointRXAttribute)
+JNI_METHOD(void, LevelControlCluster, writeStartUpCurrentLevelAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::ColorPointRX::TypeInfo;
+    using TypeInfo = chip::app::Clusters::LevelControl::Attributes::StartUpCurrentLevel::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -950,7 +689,7 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointRXAttribute)
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err                   = CHIP_NO_ERROR;
-    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
+    LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -975,19 +714,19 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointRXAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointRYAttribute)
+JNI_METHOD(void, BinaryInputBasicCluster, writeOutOfServiceAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::ColorPointRY::TypeInfo;
+    using TypeInfo = chip::app::Clusters::BinaryInputBasic::Attributes::OutOfService::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
     cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().BooleanToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -1001,8 +740,8 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointRYAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
-    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    BinaryInputBasicCluster * cppCluster = reinterpret_cast<BinaryInputBasicCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -1027,27 +766,19 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointRYAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointRIntensityAttribute)
+JNI_METHOD(void, BinaryInputBasicCluster, writePresentValueAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::ColorPointRIntensity::TypeInfo;
+    using TypeInfo = chip::app::Clusters::BinaryInputBasic::Attributes::PresentValue::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
-    }
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().BooleanToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -1061,8 +792,8 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointRIntensityAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
-    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    BinaryInputBasicCluster * cppCluster = reinterpret_cast<BinaryInputBasicCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -1087,20 +818,101 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointRIntensityAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointGXAttribute)
+JNI_METHOD(void, BindingCluster, writeBindingAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::ColorPointGX::TypeInfo;
+    using TypeInfo = chip::app::Clusters::Binding::Attributes::Binding::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
-
+    {
+        using ListType_0       = std::remove_reference_t<decltype(cppValue)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        jint valueSize;
+        chip::JniReferences::GetInstance().GetListSize(value, valueSize);
+        if (valueSize != 0)
+        {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(valueSize);
+            listFreer.add(listHolder_0);
+
+            for (size_t i_0 = 0; i_0 < static_cast<size_t>(valueSize); ++i_0)
+            {
+                jobject element_0;
+                chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0);
+                jobject element_0_nodeItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "node", "Ljava/util/Optional;", element_0_nodeItem_1);
+                if (element_0_nodeItem_1 != nullptr)
+                {
+                    jobject optionalValue_2;
+                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_nodeItem_1, optionalValue_2);
+                    if (optionalValue_2 != nullptr)
+                    {
+                        auto & definedValue_2 = listHolder_0->mList[i_0].node.Emplace();
+                        definedValue_2        = static_cast<std::remove_reference_t<decltype(definedValue_2)>>(
+                            chip::JniReferences::GetInstance().LongToPrimitive(optionalValue_2));
+                    }
+                }
+                jobject element_0_groupItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "group", "Ljava/util/Optional;",
+                                                                  element_0_groupItem_1);
+                if (element_0_groupItem_1 != nullptr)
+                {
+                    jobject optionalValue_2;
+                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_groupItem_1, optionalValue_2);
+                    if (optionalValue_2 != nullptr)
+                    {
+                        auto & definedValue_2 = listHolder_0->mList[i_0].group.Emplace();
+                        definedValue_2        = static_cast<std::remove_reference_t<decltype(definedValue_2)>>(
+                            chip::JniReferences::GetInstance().IntegerToPrimitive(optionalValue_2));
+                    }
+                }
+                jobject element_0_endpointItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "endpoint", "Ljava/util/Optional;",
+                                                                  element_0_endpointItem_1);
+                if (element_0_endpointItem_1 != nullptr)
+                {
+                    jobject optionalValue_2;
+                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_endpointItem_1, optionalValue_2);
+                    if (optionalValue_2 != nullptr)
+                    {
+                        auto & definedValue_2 = listHolder_0->mList[i_0].endpoint.Emplace();
+                        definedValue_2        = static_cast<std::remove_reference_t<decltype(definedValue_2)>>(
+                            chip::JniReferences::GetInstance().IntegerToPrimitive(optionalValue_2));
+                    }
+                }
+                jobject element_0_clusterItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "cluster", "Ljava/util/Optional;",
+                                                                  element_0_clusterItem_1);
+                if (element_0_clusterItem_1 != nullptr)
+                {
+                    jobject optionalValue_2;
+                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_clusterItem_1, optionalValue_2);
+                    if (optionalValue_2 != nullptr)
+                    {
+                        auto & definedValue_2 = listHolder_0->mList[i_0].cluster.Emplace();
+                        definedValue_2        = static_cast<std::remove_reference_t<decltype(definedValue_2)>>(
+                            chip::JniReferences::GetInstance().LongToPrimitive(optionalValue_2));
+                    }
+                }
+                jobject element_0_fabricIndexItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricIndex", "Ljava/lang/Integer;",
+                                                                  element_0_fabricIndexItem_1);
+                listHolder_0->mList[i_0].fabricIndex =
+                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricIndex)>>(
+                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricIndexItem_1));
+            }
+            cppValue = ListType_0(listHolder_0->mList, valueSize);
+        }
+        else
+        {
+            cppValue = ListType_0();
+        }
+    }
+
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
     VerifyOrReturn(onSuccess.get() != nullptr,
@@ -1113,8 +925,8 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointGXAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
-    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
+    CHIP_ERROR err              = CHIP_NO_ERROR;
+    BindingCluster * cppCluster = reinterpret_cast<BindingCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -1139,19 +951,164 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointGXAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointGYAttribute)
+JNI_METHOD(void, AccessControlCluster, writeAclAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::ColorPointGY::TypeInfo;
+    using TypeInfo = chip::app::Clusters::AccessControl::Attributes::Acl::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    {
+        using ListType_0       = std::remove_reference_t<decltype(cppValue)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        jint valueSize;
+        chip::JniReferences::GetInstance().GetListSize(value, valueSize);
+        if (valueSize != 0)
+        {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(valueSize);
+            listFreer.add(listHolder_0);
+
+            for (size_t i_0 = 0; i_0 < static_cast<size_t>(valueSize); ++i_0)
+            {
+                jobject element_0;
+                chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0);
+                jobject element_0_privilegeItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "privilege", "Ljava/lang/Integer;",
+                                                                  element_0_privilegeItem_1);
+                listHolder_0->mList[i_0].privilege =
+                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].privilege)>>(
+                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_privilegeItem_1));
+                jobject element_0_authModeItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "authMode", "Ljava/lang/Integer;",
+                                                                  element_0_authModeItem_1);
+                listHolder_0->mList[i_0].authMode =
+                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].authMode)>>(
+                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_authModeItem_1));
+                jobject element_0_subjectsItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "subjects", "Ljava/util/ArrayList;",
+                                                                  element_0_subjectsItem_1);
+                if (element_0_subjectsItem_1 == nullptr)
+                {
+                    listHolder_0->mList[i_0].subjects.SetNull();
+                }
+                else
+                {
+                    auto & nonNullValue_2 = listHolder_0->mList[i_0].subjects.SetNonNull();
+                    {
+                        using ListType_3       = std::remove_reference_t<decltype(nonNullValue_2)>;
+                        using ListMemberType_3 = ListMemberTypeGetter<ListType_3>::Type;
+                        jint element_0_subjectsItem_1Size;
+                        chip::JniReferences::GetInstance().GetListSize(element_0_subjectsItem_1, element_0_subjectsItem_1Size);
+                        if (element_0_subjectsItem_1Size != 0)
+                        {
+                            auto * listHolder_3 = new ListHolder<ListMemberType_3>(element_0_subjectsItem_1Size);
+                            listFreer.add(listHolder_3);
+
+                            for (size_t i_3 = 0; i_3 < static_cast<size_t>(element_0_subjectsItem_1Size); ++i_3)
+                            {
+                                jobject element_3;
+                                chip::JniReferences::GetInstance().GetListItem(element_0_subjectsItem_1, i_3, element_3);
+                                listHolder_3->mList[i_3] = static_cast<std::remove_reference_t<decltype(listHolder_3->mList[i_3])>>(
+                                    chip::JniReferences::GetInstance().LongToPrimitive(element_3));
+                            }
+                            nonNullValue_2 = ListType_3(listHolder_3->mList, element_0_subjectsItem_1Size);
+                        }
+                        else
+                        {
+                            nonNullValue_2 = ListType_3();
+                        }
+                    }
+                }
+                jobject element_0_targetsItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "targets", "Ljava/util/ArrayList;",
+                                                                  element_0_targetsItem_1);
+                if (element_0_targetsItem_1 == nullptr)
+                {
+                    listHolder_0->mList[i_0].targets.SetNull();
+                }
+                else
+                {
+                    auto & nonNullValue_2 = listHolder_0->mList[i_0].targets.SetNonNull();
+                    {
+                        using ListType_3       = std::remove_reference_t<decltype(nonNullValue_2)>;
+                        using ListMemberType_3 = ListMemberTypeGetter<ListType_3>::Type;
+                        jint element_0_targetsItem_1Size;
+                        chip::JniReferences::GetInstance().GetListSize(element_0_targetsItem_1, element_0_targetsItem_1Size);
+                        if (element_0_targetsItem_1Size != 0)
+                        {
+                            auto * listHolder_3 = new ListHolder<ListMemberType_3>(element_0_targetsItem_1Size);
+                            listFreer.add(listHolder_3);
+
+                            for (size_t i_3 = 0; i_3 < static_cast<size_t>(element_0_targetsItem_1Size); ++i_3)
+                            {
+                                jobject element_3;
+                                chip::JniReferences::GetInstance().GetListItem(element_0_targetsItem_1, i_3, element_3);
+                                jobject element_3_clusterItem_4;
+                                chip::JniReferences::GetInstance().GetObjectField(element_3, "cluster", "Ljava/lang/Long;",
+                                                                                  element_3_clusterItem_4);
+                                if (element_3_clusterItem_4 == nullptr)
+                                {
+                                    listHolder_3->mList[i_3].cluster.SetNull();
+                                }
+                                else
+                                {
+                                    auto & nonNullValue_5 = listHolder_3->mList[i_3].cluster.SetNonNull();
+                                    nonNullValue_5        = static_cast<std::remove_reference_t<decltype(nonNullValue_5)>>(
+                                        chip::JniReferences::GetInstance().LongToPrimitive(element_3_clusterItem_4));
+                                }
+                                jobject element_3_endpointItem_4;
+                                chip::JniReferences::GetInstance().GetObjectField(element_3, "endpoint", "Ljava/lang/Integer;",
+                                                                                  element_3_endpointItem_4);
+                                if (element_3_endpointItem_4 == nullptr)
+                                {
+                                    listHolder_3->mList[i_3].endpoint.SetNull();
+                                }
+                                else
+                                {
+                                    auto & nonNullValue_5 = listHolder_3->mList[i_3].endpoint.SetNonNull();
+                                    nonNullValue_5        = static_cast<std::remove_reference_t<decltype(nonNullValue_5)>>(
+                                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_3_endpointItem_4));
+                                }
+                                jobject element_3_deviceTypeItem_4;
+                                chip::JniReferences::GetInstance().GetObjectField(element_3, "deviceType", "Ljava/lang/Long;",
+                                                                                  element_3_deviceTypeItem_4);
+                                if (element_3_deviceTypeItem_4 == nullptr)
+                                {
+                                    listHolder_3->mList[i_3].deviceType.SetNull();
+                                }
+                                else
+                                {
+                                    auto & nonNullValue_5 = listHolder_3->mList[i_3].deviceType.SetNonNull();
+                                    nonNullValue_5        = static_cast<std::remove_reference_t<decltype(nonNullValue_5)>>(
+                                        chip::JniReferences::GetInstance().LongToPrimitive(element_3_deviceTypeItem_4));
+                                }
+                            }
+                            nonNullValue_2 = ListType_3(listHolder_3->mList, element_0_targetsItem_1Size);
+                        }
+                        else
+                        {
+                            nonNullValue_2 = ListType_3();
+                        }
+                    }
+                }
+                jobject element_0_fabricIndexItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricIndex", "Ljava/lang/Integer;",
+                                                                  element_0_fabricIndexItem_1);
+                listHolder_0->mList[i_0].fabricIndex =
+                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricIndex)>>(
+                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricIndexItem_1));
+            }
+            cppValue = ListType_0(listHolder_0->mList, valueSize);
+        }
+        else
+        {
+            cppValue = ListType_0();
+        }
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -1165,8 +1122,8 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointGYAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
-    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
+    CHIP_ERROR err                    = CHIP_NO_ERROR;
+    AccessControlCluster * cppCluster = reinterpret_cast<AccessControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -1191,79 +1148,50 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointGYAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointGIntensityAttribute)
+JNI_METHOD(void, AccessControlCluster, writeExtensionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::ColorPointGIntensity::TypeInfo;
+    using TypeInfo = chip::app::Clusters::AccessControl::Attributes::Extension::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
     {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
-    }
-
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
-                       env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
-
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
-                       env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
-    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
-                       env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
-
-    auto successFn = chip::Callback::Callback<CHIPDefaultWriteSuccessCallbackType>::FromCancelable(onSuccess->Cancel());
-    auto failureFn = chip::Callback::Callback<CHIPDefaultFailureCallbackType>::FromCancelable(onFailure->Cancel());
+        using ListType_0       = std::remove_reference_t<decltype(cppValue)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        jint valueSize;
+        chip::JniReferences::GetInstance().GetListSize(value, valueSize);
+        if (valueSize != 0)
+        {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(valueSize);
+            listFreer.add(listHolder_0);
 
-    if (timedWriteTimeoutMs == nullptr)
-    {
-        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall);
-    }
-    else
-    {
-        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall,
-                                                   chip::JniReferences::GetInstance().IntegerToPrimitive(timedWriteTimeoutMs));
+            for (size_t i_0 = 0; i_0 < static_cast<size_t>(valueSize); ++i_0)
+            {
+                jobject element_0;
+                chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0);
+                jobject element_0_dataItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "data", "[B", element_0_dataItem_1);
+                cleanupByteArrays.push_back(
+                    chip::Platform::MakeUnique<chip::JniByteArray>(env, static_cast<jbyteArray>(element_0_dataItem_1)));
+                listHolder_0->mList[i_0].data = cleanupByteArrays.back()->byteSpan();
+                jobject element_0_fabricIndexItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricIndex", "Ljava/lang/Integer;",
+                                                                  element_0_fabricIndexItem_1);
+                listHolder_0->mList[i_0].fabricIndex =
+                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricIndex)>>(
+                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricIndexItem_1));
+            }
+            cppValue = ListType_0(listHolder_0->mList, valueSize);
+        }
+        else
+        {
+            cppValue = ListType_0();
+        }
     }
-    VerifyOrReturn(
-        err == CHIP_NO_ERROR,
-        chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error writing attribute", err));
-
-    onSuccess.release();
-    onFailure.release();
-}
-
-JNI_METHOD(void, ColorControlCluster, writeColorPointBXAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
-{
-    chip::DeviceLayer::StackLock lock;
-    ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::ColorPointBX::TypeInfo;
-    TypeInfo::Type cppValue;
-
-    std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
-    std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
-
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -1277,8 +1205,8 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointBXAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
-    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
+    CHIP_ERROR err                    = CHIP_NO_ERROR;
+    AccessControlCluster * cppCluster = reinterpret_cast<AccessControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -1303,19 +1231,19 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointBXAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointBYAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+JNI_METHOD(void, BasicCluster, writeNodeLabelAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::ColorPointBY::TypeInfo;
+    using TypeInfo = chip::app::Clusters::Basic::Attributes::NodeLabel::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    cleanupStrings.push_back(chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(value)));
+    cppValue = cleanupStrings.back()->charSpan();
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -1329,8 +1257,8 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointBYAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
-    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
+    CHIP_ERROR err            = CHIP_NO_ERROR;
+    BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -1355,27 +1283,19 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointBYAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointBIntensityAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+JNI_METHOD(void, BasicCluster, writeLocationAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::ColorPointBIntensity::TypeInfo;
+    using TypeInfo = chip::app::Clusters::Basic::Attributes::Location::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
-    }
+    cleanupStrings.push_back(chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(value)));
+    cppValue = cleanupStrings.back()->charSpan();
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -1389,8 +1309,8 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointBIntensityAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
-    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
+    CHIP_ERROR err            = CHIP_NO_ERROR;
+    BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -1415,19 +1335,19 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointBIntensityAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeStartUpColorTemperatureMiredsAttribute)
+JNI_METHOD(void, BasicCluster, writeLocalConfigDisabledAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::StartUpColorTemperatureMireds::TypeInfo;
+    using TypeInfo = chip::app::Clusters::Basic::Attributes::LocalConfigDisabled::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
     cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().BooleanToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -1441,8 +1361,8 @@ JNI_METHOD(void, ColorControlCluster, writeStartUpColorTemperatureMiredsAttribut
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
-    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
+    CHIP_ERROR err            = CHIP_NO_ERROR;
+    BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -1467,18 +1387,57 @@ JNI_METHOD(void, ColorControlCluster, writeStartUpColorTemperatureMiredsAttribut
     onFailure.release();
 }
 
-JNI_METHOD(void, ContentLauncherCluster, writeSupportedStreamingProtocolsAttribute)
+JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, writeDefaultOtaProvidersAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::ContentLauncher::Attributes::SupportedStreamingProtocols::TypeInfo;
+    using TypeInfo = chip::app::Clusters::OtaSoftwareUpdateRequestor::Attributes::DefaultOtaProviders::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
+    {
+        using ListType_0       = std::remove_reference_t<decltype(cppValue)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        jint valueSize;
+        chip::JniReferences::GetInstance().GetListSize(value, valueSize);
+        if (valueSize != 0)
+        {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(valueSize);
+            listFreer.add(listHolder_0);
+
+            for (size_t i_0 = 0; i_0 < static_cast<size_t>(valueSize); ++i_0)
+            {
+                jobject element_0;
+                chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0);
+                jobject element_0_providerNodeIDItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "providerNodeID", "Ljava/lang/Long;",
+                                                                  element_0_providerNodeIDItem_1);
+                listHolder_0->mList[i_0].providerNodeID =
+                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].providerNodeID)>>(
+                        chip::JniReferences::GetInstance().LongToPrimitive(element_0_providerNodeIDItem_1));
+                jobject element_0_endpointItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "endpoint", "Ljava/lang/Integer;",
+                                                                  element_0_endpointItem_1);
+                listHolder_0->mList[i_0].endpoint =
+                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].endpoint)>>(
+                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_endpointItem_1));
+                jobject element_0_fabricIndexItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricIndex", "Ljava/lang/Integer;",
+                                                                  element_0_fabricIndexItem_1);
+                listHolder_0->mList[i_0].fabricIndex =
+                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricIndex)>>(
+                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricIndexItem_1));
+            }
+            cppValue = ListType_0(listHolder_0->mList, valueSize);
+        }
+        else
+        {
+            cppValue = ListType_0();
+        }
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -1492,8 +1451,8 @@ JNI_METHOD(void, ContentLauncherCluster, writeSupportedStreamingProtocolsAttribu
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                      = CHIP_NO_ERROR;
-    ContentLauncherCluster * cppCluster = reinterpret_cast<ContentLauncherCluster *>(clusterPtr);
+    CHIP_ERROR err                                 = CHIP_NO_ERROR;
+    OtaSoftwareUpdateRequestorCluster * cppCluster = reinterpret_cast<OtaSoftwareUpdateRequestorCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -1518,12 +1477,12 @@ JNI_METHOD(void, ContentLauncherCluster, writeSupportedStreamingProtocolsAttribu
     onFailure.release();
 }
 
-JNI_METHOD(void, DoorLockCluster, writeLanguageAttribute)
+JNI_METHOD(void, LocalizationConfigurationCluster, writeActiveLocaleAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::DoorLock::Attributes::Language::TypeInfo;
+    using TypeInfo = chip::app::Clusters::LocalizationConfiguration::Attributes::ActiveLocale::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -1544,8 +1503,8 @@ JNI_METHOD(void, DoorLockCluster, writeLanguageAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err               = CHIP_NO_ERROR;
-    DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
+    CHIP_ERROR err                                = CHIP_NO_ERROR;
+    LocalizationConfigurationCluster * cppCluster = reinterpret_cast<LocalizationConfigurationCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -1570,18 +1529,19 @@ JNI_METHOD(void, DoorLockCluster, writeLanguageAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, DoorLockCluster, writeAutoRelockTimeAttribute)
+JNI_METHOD(void, TimeFormatLocalizationCluster, writeHourFormatAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::DoorLock::Attributes::AutoRelockTime::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TimeFormatLocalization::Attributes::HourFormat::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -1595,8 +1555,8 @@ JNI_METHOD(void, DoorLockCluster, writeAutoRelockTimeAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err               = CHIP_NO_ERROR;
-    DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    TimeFormatLocalizationCluster * cppCluster = reinterpret_cast<TimeFormatLocalizationCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -1621,12 +1581,12 @@ JNI_METHOD(void, DoorLockCluster, writeAutoRelockTimeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, DoorLockCluster, writeSoundVolumeAttribute)
+JNI_METHOD(void, TimeFormatLocalizationCluster, writeActiveCalendarTypeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::DoorLock::Attributes::SoundVolume::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TimeFormatLocalization::Attributes::ActiveCalendarType::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -1647,8 +1607,8 @@ JNI_METHOD(void, DoorLockCluster, writeSoundVolumeAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err               = CHIP_NO_ERROR;
-    DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    TimeFormatLocalizationCluster * cppCluster = reinterpret_cast<TimeFormatLocalizationCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -1673,12 +1633,12 @@ JNI_METHOD(void, DoorLockCluster, writeSoundVolumeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, DoorLockCluster, writeOperatingModeAttribute)
+JNI_METHOD(void, UnitLocalizationCluster, writeTemperatureUnitAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::DoorLock::Attributes::OperatingMode::TypeInfo;
+    using TypeInfo = chip::app::Clusters::UnitLocalization::Attributes::TemperatureUnit::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -1699,8 +1659,8 @@ JNI_METHOD(void, DoorLockCluster, writeOperatingModeAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err               = CHIP_NO_ERROR;
-    DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    UnitLocalizationCluster * cppCluster = reinterpret_cast<UnitLocalizationCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -1725,19 +1685,18 @@ JNI_METHOD(void, DoorLockCluster, writeOperatingModeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, DoorLockCluster, writeEnableOneTouchLockingAttribute)
+JNI_METHOD(void, GeneralCommissioningCluster, writeBreadcrumbAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::DoorLock::Attributes::EnableOneTouchLocking::TypeInfo;
+    using TypeInfo = chip::app::Clusters::GeneralCommissioning::Attributes::Breadcrumb::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().BooleanToPrimitive(value));
+    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -1751,8 +1710,8 @@ JNI_METHOD(void, DoorLockCluster, writeEnableOneTouchLockingAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err               = CHIP_NO_ERROR;
-    DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
+    CHIP_ERROR err                           = CHIP_NO_ERROR;
+    GeneralCommissioningCluster * cppCluster = reinterpret_cast<GeneralCommissioningCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -1777,12 +1736,12 @@ JNI_METHOD(void, DoorLockCluster, writeEnableOneTouchLockingAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, DoorLockCluster, writeEnablePrivacyModeButtonAttribute)
+JNI_METHOD(void, NetworkCommissioningCluster, writeInterfaceEnabledAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::DoorLock::Attributes::EnablePrivacyModeButton::TypeInfo;
+    using TypeInfo = chip::app::Clusters::NetworkCommissioning::Attributes::InterfaceEnabled::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -1803,8 +1762,8 @@ JNI_METHOD(void, DoorLockCluster, writeEnablePrivacyModeButtonAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err               = CHIP_NO_ERROR;
-    DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
+    CHIP_ERROR err                           = CHIP_NO_ERROR;
+    NetworkCommissioningCluster * cppCluster = reinterpret_cast<NetworkCommissioningCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -1829,19 +1788,19 @@ JNI_METHOD(void, DoorLockCluster, writeEnablePrivacyModeButtonAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, DoorLockCluster, writeWrongCodeEntryLimitAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+JNI_METHOD(void, BridgedDeviceBasicCluster, writeNodeLabelAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::DoorLock::Attributes::WrongCodeEntryLimit::TypeInfo;
+    using TypeInfo = chip::app::Clusters::BridgedDeviceBasic::Attributes::NodeLabel::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    cleanupStrings.push_back(chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(value)));
+    cppValue = cleanupStrings.back()->charSpan();
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -1855,8 +1814,8 @@ JNI_METHOD(void, DoorLockCluster, writeWrongCodeEntryLimitAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err               = CHIP_NO_ERROR;
-    DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -1881,20 +1840,57 @@ JNI_METHOD(void, DoorLockCluster, writeWrongCodeEntryLimitAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, DoorLockCluster, writeUserCodeTemporaryDisableTimeAttribute)
+JNI_METHOD(void, GroupKeyManagementCluster, writeGroupKeyMapAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::DoorLock::Attributes::UserCodeTemporaryDisableTime::TypeInfo;
+    using TypeInfo = chip::app::Clusters::GroupKeyManagement::Attributes::GroupKeyMap::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
-
+    {
+        using ListType_0       = std::remove_reference_t<decltype(cppValue)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        jint valueSize;
+        chip::JniReferences::GetInstance().GetListSize(value, valueSize);
+        if (valueSize != 0)
+        {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(valueSize);
+            listFreer.add(listHolder_0);
+
+            for (size_t i_0 = 0; i_0 < static_cast<size_t>(valueSize); ++i_0)
+            {
+                jobject element_0;
+                chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0);
+                jobject element_0_groupIdItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "groupId", "Ljava/lang/Integer;",
+                                                                  element_0_groupIdItem_1);
+                listHolder_0->mList[i_0].groupId = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].groupId)>>(
+                    chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_groupIdItem_1));
+                jobject element_0_groupKeySetIDItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "groupKeySetID", "Ljava/lang/Integer;",
+                                                                  element_0_groupKeySetIDItem_1);
+                listHolder_0->mList[i_0].groupKeySetID =
+                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].groupKeySetID)>>(
+                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_groupKeySetIDItem_1));
+                jobject element_0_fabricIndexItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricIndex", "Ljava/lang/Integer;",
+                                                                  element_0_fabricIndexItem_1);
+                listHolder_0->mList[i_0].fabricIndex =
+                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricIndex)>>(
+                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricIndexItem_1));
+            }
+            cppValue = ListType_0(listHolder_0->mList, valueSize);
+        }
+        else
+        {
+            cppValue = ListType_0();
+        }
+    }
+
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
     VerifyOrReturn(onSuccess.get() != nullptr,
@@ -1907,8 +1903,8 @@ JNI_METHOD(void, DoorLockCluster, writeUserCodeTemporaryDisableTimeAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err               = CHIP_NO_ERROR;
-    DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    GroupKeyManagementCluster * cppCluster = reinterpret_cast<GroupKeyManagementCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -1933,19 +1929,49 @@ JNI_METHOD(void, DoorLockCluster, writeUserCodeTemporaryDisableTimeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, DoorLockCluster, writeRequirePINforRemoteOperationAttribute)
+JNI_METHOD(void, UserLabelCluster, writeLabelListAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::DoorLock::Attributes::RequirePINforRemoteOperation::TypeInfo;
+    using TypeInfo = chip::app::Clusters::UserLabel::Attributes::LabelList::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().BooleanToPrimitive(value));
+    {
+        using ListType_0       = std::remove_reference_t<decltype(cppValue)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        jint valueSize;
+        chip::JniReferences::GetInstance().GetListSize(value, valueSize);
+        if (valueSize != 0)
+        {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(valueSize);
+            listFreer.add(listHolder_0);
+
+            for (size_t i_0 = 0; i_0 < static_cast<size_t>(valueSize); ++i_0)
+            {
+                jobject element_0;
+                chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0);
+                jobject element_0_labelItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "label", "Ljava/lang/String;", element_0_labelItem_1);
+                cleanupStrings.push_back(
+                    chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(element_0_labelItem_1)));
+                listHolder_0->mList[i_0].label = cleanupStrings.back()->charSpan();
+                jobject element_0_valueItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "value", "Ljava/lang/String;", element_0_valueItem_1);
+                cleanupStrings.push_back(
+                    chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(element_0_valueItem_1)));
+                listHolder_0->mList[i_0].value = cleanupStrings.back()->charSpan();
+            }
+            cppValue = ListType_0(listHolder_0->mList, valueSize);
+        }
+        else
+        {
+            cppValue = ListType_0();
+        }
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -1959,8 +1985,8 @@ JNI_METHOD(void, DoorLockCluster, writeRequirePINforRemoteOperationAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err               = CHIP_NO_ERROR;
-    DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
+    CHIP_ERROR err                = CHIP_NO_ERROR;
+    UserLabelCluster * cppCluster = reinterpret_cast<UserLabelCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -1985,19 +2011,27 @@ JNI_METHOD(void, DoorLockCluster, writeRequirePINforRemoteOperationAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, FanControlCluster, writeFanModeAttribute)
+JNI_METHOD(void, ModeSelectCluster, writeStartUpModeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::FanControl::Attributes::FanMode::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ModeSelect::Attributes::StartUpMode::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -2012,7 +2046,7 @@ JNI_METHOD(void, FanControlCluster, writeFanModeAttribute)
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err                 = CHIP_NO_ERROR;
-    FanControlCluster * cppCluster = reinterpret_cast<FanControlCluster *>(clusterPtr);
+    ModeSelectCluster * cppCluster = reinterpret_cast<ModeSelectCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2037,19 +2071,27 @@ JNI_METHOD(void, FanControlCluster, writeFanModeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, FanControlCluster, writeFanModeSequenceAttribute)
+JNI_METHOD(void, ModeSelectCluster, writeOnModeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::FanControl::Attributes::FanModeSequence::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ModeSelect::Attributes::OnMode::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -2064,7 +2106,7 @@ JNI_METHOD(void, FanControlCluster, writeFanModeSequenceAttribute)
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err                 = CHIP_NO_ERROR;
-    FanControlCluster * cppCluster = reinterpret_cast<FanControlCluster *>(clusterPtr);
+    ModeSelectCluster * cppCluster = reinterpret_cast<ModeSelectCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2089,27 +2131,19 @@ JNI_METHOD(void, FanControlCluster, writeFanModeSequenceAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, FanControlCluster, writePercentSettingAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+JNI_METHOD(void, DoorLockCluster, writeLanguageAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::FanControl::Attributes::PercentSetting::TypeInfo;
+    using TypeInfo = chip::app::Clusters::DoorLock::Attributes::Language::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
-    }
+    cleanupStrings.push_back(chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(value)));
+    cppValue = cleanupStrings.back()->charSpan();
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -2123,8 +2157,8 @@ JNI_METHOD(void, FanControlCluster, writePercentSettingAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
-    FanControlCluster * cppCluster = reinterpret_cast<FanControlCluster *>(clusterPtr);
+    CHIP_ERROR err               = CHIP_NO_ERROR;
+    DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2149,27 +2183,18 @@ JNI_METHOD(void, FanControlCluster, writePercentSettingAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, FanControlCluster, writeSpeedSettingAttribute)
+JNI_METHOD(void, DoorLockCluster, writeAutoRelockTimeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::FanControl::Attributes::SpeedSetting::TypeInfo;
+    using TypeInfo = chip::app::Clusters::DoorLock::Attributes::AutoRelockTime::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
-    }
+    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -2183,8 +2208,8 @@ JNI_METHOD(void, FanControlCluster, writeSpeedSettingAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
-    FanControlCluster * cppCluster = reinterpret_cast<FanControlCluster *>(clusterPtr);
+    CHIP_ERROR err               = CHIP_NO_ERROR;
+    DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2209,12 +2234,12 @@ JNI_METHOD(void, FanControlCluster, writeSpeedSettingAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, FanControlCluster, writeRockSettingAttribute)
+JNI_METHOD(void, DoorLockCluster, writeSoundVolumeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::FanControl::Attributes::RockSetting::TypeInfo;
+    using TypeInfo = chip::app::Clusters::DoorLock::Attributes::SoundVolume::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -2235,8 +2260,8 @@ JNI_METHOD(void, FanControlCluster, writeRockSettingAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
-    FanControlCluster * cppCluster = reinterpret_cast<FanControlCluster *>(clusterPtr);
+    CHIP_ERROR err               = CHIP_NO_ERROR;
+    DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2261,12 +2286,12 @@ JNI_METHOD(void, FanControlCluster, writeRockSettingAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, FanControlCluster, writeWindSettingAttribute)
+JNI_METHOD(void, DoorLockCluster, writeOperatingModeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::FanControl::Attributes::WindSetting::TypeInfo;
+    using TypeInfo = chip::app::Clusters::DoorLock::Attributes::OperatingMode::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -2287,8 +2312,8 @@ JNI_METHOD(void, FanControlCluster, writeWindSettingAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
-    FanControlCluster * cppCluster = reinterpret_cast<FanControlCluster *>(clusterPtr);
+    CHIP_ERROR err               = CHIP_NO_ERROR;
+    DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2313,18 +2338,19 @@ JNI_METHOD(void, FanControlCluster, writeWindSettingAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, GeneralCommissioningCluster, writeBreadcrumbAttribute)
+JNI_METHOD(void, DoorLockCluster, writeEnableOneTouchLockingAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::GeneralCommissioning::Attributes::Breadcrumb::TypeInfo;
+    using TypeInfo = chip::app::Clusters::DoorLock::Attributes::EnableOneTouchLocking::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().BooleanToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -2338,8 +2364,8 @@ JNI_METHOD(void, GeneralCommissioningCluster, writeBreadcrumbAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                           = CHIP_NO_ERROR;
-    GeneralCommissioningCluster * cppCluster = reinterpret_cast<GeneralCommissioningCluster *>(clusterPtr);
+    CHIP_ERROR err               = CHIP_NO_ERROR;
+    DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2364,56 +2390,19 @@ JNI_METHOD(void, GeneralCommissioningCluster, writeBreadcrumbAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, GroupKeyManagementCluster, writeGroupKeyMapAttribute)
+JNI_METHOD(void, DoorLockCluster, writeEnablePrivacyModeButtonAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::GroupKeyManagement::Attributes::GroupKeyMap::TypeInfo;
+    using TypeInfo = chip::app::Clusters::DoorLock::Attributes::EnablePrivacyModeButton::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    {
-        using ListType_0       = std::remove_reference_t<decltype(cppValue)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        jint valueSize;
-        chip::JniReferences::GetInstance().GetListSize(value, valueSize);
-        if (valueSize != 0)
-        {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(valueSize);
-            listFreer.add(listHolder_0);
-
-            for (size_t i_0 = 0; i_0 < static_cast<size_t>(valueSize); ++i_0)
-            {
-                jobject element_0;
-                chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0);
-                jobject element_0_groupIdItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "groupId", "Ljava/lang/Integer;",
-                                                                  element_0_groupIdItem_1);
-                listHolder_0->mList[i_0].groupId = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].groupId)>>(
-                    chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_groupIdItem_1));
-                jobject element_0_groupKeySetIDItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "groupKeySetID", "Ljava/lang/Integer;",
-                                                                  element_0_groupKeySetIDItem_1);
-                listHolder_0->mList[i_0].groupKeySetID =
-                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].groupKeySetID)>>(
-                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_groupKeySetIDItem_1));
-                jobject element_0_fabricIndexItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricIndex", "Ljava/lang/Integer;",
-                                                                  element_0_fabricIndexItem_1);
-                listHolder_0->mList[i_0].fabricIndex =
-                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricIndex)>>(
-                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricIndexItem_1));
-            }
-            cppValue = ListType_0(listHolder_0->mList, valueSize);
-        }
-        else
-        {
-            cppValue = ListType_0();
-        }
-    }
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().BooleanToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -2427,8 +2416,8 @@ JNI_METHOD(void, GroupKeyManagementCluster, writeGroupKeyMapAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
-    GroupKeyManagementCluster * cppCluster = reinterpret_cast<GroupKeyManagementCluster *>(clusterPtr);
+    CHIP_ERROR err               = CHIP_NO_ERROR;
+    DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2453,12 +2442,12 @@ JNI_METHOD(void, GroupKeyManagementCluster, writeGroupKeyMapAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, IdentifyCluster, writeIdentifyTimeAttribute)
+JNI_METHOD(void, DoorLockCluster, writeWrongCodeEntryLimitAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::Identify::Attributes::IdentifyTime::TypeInfo;
+    using TypeInfo = chip::app::Clusters::DoorLock::Attributes::WrongCodeEntryLimit::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -2480,7 +2469,7 @@ JNI_METHOD(void, IdentifyCluster, writeIdentifyTimeAttribute)
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err               = CHIP_NO_ERROR;
-    IdentifyCluster * cppCluster = reinterpret_cast<IdentifyCluster *>(clusterPtr);
+    DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2505,12 +2494,12 @@ JNI_METHOD(void, IdentifyCluster, writeIdentifyTimeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, writeOptionsAttribute)
+JNI_METHOD(void, DoorLockCluster, writeUserCodeTemporaryDisableTimeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::LevelControl::Attributes::Options::TypeInfo;
+    using TypeInfo = chip::app::Clusters::DoorLock::Attributes::UserCodeTemporaryDisableTime::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -2531,8 +2520,8 @@ JNI_METHOD(void, LevelControlCluster, writeOptionsAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
-    LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
+    CHIP_ERROR err               = CHIP_NO_ERROR;
+    DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2557,19 +2546,19 @@ JNI_METHOD(void, LevelControlCluster, writeOptionsAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, writeOnOffTransitionTimeAttribute)
+JNI_METHOD(void, DoorLockCluster, writeRequirePINforRemoteOperationAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::LevelControl::Attributes::OnOffTransitionTime::TypeInfo;
+    using TypeInfo = chip::app::Clusters::DoorLock::Attributes::RequirePINforRemoteOperation::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
     cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().BooleanToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -2583,8 +2572,8 @@ JNI_METHOD(void, LevelControlCluster, writeOnOffTransitionTimeAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
-    LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
+    CHIP_ERROR err               = CHIP_NO_ERROR;
+    DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2609,27 +2598,19 @@ JNI_METHOD(void, LevelControlCluster, writeOnOffTransitionTimeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, writeOnLevelAttribute)
+JNI_METHOD(void, WindowCoveringCluster, writeModeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::LevelControl::Attributes::OnLevel::TypeInfo;
+    using TypeInfo = chip::app::Clusters::WindowCovering::Attributes::Mode::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
-    }
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -2643,8 +2624,8 @@ JNI_METHOD(void, LevelControlCluster, writeOnLevelAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
-    LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2669,12 +2650,12 @@ JNI_METHOD(void, LevelControlCluster, writeOnLevelAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, writeOnTransitionTimeAttribute)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, writeLifetimeRunningHoursAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::LevelControl::Attributes::OnTransitionTime::TypeInfo;
+    using TypeInfo = chip::app::Clusters::PumpConfigurationAndControl::Attributes::LifetimeRunningHours::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -2688,7 +2669,7 @@ JNI_METHOD(void, LevelControlCluster, writeOnTransitionTimeAttribute)
     {
         auto & nonNullValue_0 = cppValue.SetNonNull();
         nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+            chip::JniReferences::GetInstance().LongToPrimitive(value));
     }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
@@ -2703,8 +2684,8 @@ JNI_METHOD(void, LevelControlCluster, writeOnTransitionTimeAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
-    LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2729,12 +2710,12 @@ JNI_METHOD(void, LevelControlCluster, writeOnTransitionTimeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, writeOffTransitionTimeAttribute)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, writeLifetimeEnergyConsumedAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::LevelControl::Attributes::OffTransitionTime::TypeInfo;
+    using TypeInfo = chip::app::Clusters::PumpConfigurationAndControl::Attributes::LifetimeEnergyConsumed::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -2748,7 +2729,7 @@ JNI_METHOD(void, LevelControlCluster, writeOffTransitionTimeAttribute)
     {
         auto & nonNullValue_0 = cppValue.SetNonNull();
         nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+            chip::JniReferences::GetInstance().LongToPrimitive(value));
     }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
@@ -2763,8 +2744,8 @@ JNI_METHOD(void, LevelControlCluster, writeOffTransitionTimeAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
-    LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2789,27 +2770,19 @@ JNI_METHOD(void, LevelControlCluster, writeOffTransitionTimeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, writeDefaultMoveRateAttribute)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, writeOperationModeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::LevelControl::Attributes::DefaultMoveRate::TypeInfo;
+    using TypeInfo = chip::app::Clusters::PumpConfigurationAndControl::Attributes::OperationMode::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
-    }
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -2823,8 +2796,8 @@ JNI_METHOD(void, LevelControlCluster, writeDefaultMoveRateAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
-    LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2849,27 +2822,19 @@ JNI_METHOD(void, LevelControlCluster, writeDefaultMoveRateAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, writeStartUpCurrentLevelAttribute)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, writeControlModeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::LevelControl::Attributes::StartUpCurrentLevel::TypeInfo;
+    using TypeInfo = chip::app::Clusters::PumpConfigurationAndControl::Attributes::ControlMode::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
-    }
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -2883,8 +2848,8 @@ JNI_METHOD(void, LevelControlCluster, writeStartUpCurrentLevelAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
-    LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2909,19 +2874,19 @@ JNI_METHOD(void, LevelControlCluster, writeStartUpCurrentLevelAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, LocalizationConfigurationCluster, writeActiveLocaleAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value, jobject timedWriteTimeoutMs)
+JNI_METHOD(void, ThermostatCluster, writeOccupiedCoolingSetpointAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::LocalizationConfiguration::Attributes::ActiveLocale::TypeInfo;
+    using TypeInfo = chip::app::Clusters::Thermostat::Attributes::OccupiedCoolingSetpoint::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cleanupStrings.push_back(chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(value)));
-    cppValue = cleanupStrings.back()->charSpan();
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -2935,8 +2900,8 @@ JNI_METHOD(void, LocalizationConfigurationCluster, writeActiveLocaleAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                = CHIP_NO_ERROR;
-    LocalizationConfigurationCluster * cppCluster = reinterpret_cast<LocalizationConfigurationCluster *>(clusterPtr);
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2961,27 +2926,19 @@ JNI_METHOD(void, LocalizationConfigurationCluster, writeActiveLocaleAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ModeSelectCluster, writeStartUpModeAttribute)
+JNI_METHOD(void, ThermostatCluster, writeOccupiedHeatingSetpointAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::ModeSelect::Attributes::StartUpMode::TypeInfo;
+    using TypeInfo = chip::app::Clusters::Thermostat::Attributes::OccupiedHeatingSetpoint::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
-    }
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -2996,7 +2953,7 @@ JNI_METHOD(void, ModeSelectCluster, writeStartUpModeAttribute)
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err                 = CHIP_NO_ERROR;
-    ModeSelectCluster * cppCluster = reinterpret_cast<ModeSelectCluster *>(clusterPtr);
+    ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -3021,27 +2978,19 @@ JNI_METHOD(void, ModeSelectCluster, writeStartUpModeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ModeSelectCluster, writeOnModeAttribute)
+JNI_METHOD(void, ThermostatCluster, writeMinHeatSetpointLimitAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::ModeSelect::Attributes::OnMode::TypeInfo;
+    using TypeInfo = chip::app::Clusters::Thermostat::Attributes::MinHeatSetpointLimit::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
-    }
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -3056,7 +3005,7 @@ JNI_METHOD(void, ModeSelectCluster, writeOnModeAttribute)
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err                 = CHIP_NO_ERROR;
-    ModeSelectCluster * cppCluster = reinterpret_cast<ModeSelectCluster *>(clusterPtr);
+    ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -3081,19 +3030,19 @@ JNI_METHOD(void, ModeSelectCluster, writeOnModeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, NetworkCommissioningCluster, writeInterfaceEnabledAttribute)
+JNI_METHOD(void, ThermostatCluster, writeMaxHeatSetpointLimitAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::NetworkCommissioning::Attributes::InterfaceEnabled::TypeInfo;
+    using TypeInfo = chip::app::Clusters::Thermostat::Attributes::MaxHeatSetpointLimit::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
     cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().BooleanToPrimitive(value));
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -3107,8 +3056,8 @@ JNI_METHOD(void, NetworkCommissioningCluster, writeInterfaceEnabledAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                           = CHIP_NO_ERROR;
-    NetworkCommissioningCluster * cppCluster = reinterpret_cast<NetworkCommissioningCluster *>(clusterPtr);
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -3133,57 +3082,19 @@ JNI_METHOD(void, NetworkCommissioningCluster, writeInterfaceEnabledAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, writeDefaultOtaProvidersAttribute)
+JNI_METHOD(void, ThermostatCluster, writeMinCoolSetpointLimitAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::OtaSoftwareUpdateRequestor::Attributes::DefaultOtaProviders::TypeInfo;
+    using TypeInfo = chip::app::Clusters::Thermostat::Attributes::MinCoolSetpointLimit::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    {
-        using ListType_0       = std::remove_reference_t<decltype(cppValue)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        jint valueSize;
-        chip::JniReferences::GetInstance().GetListSize(value, valueSize);
-        if (valueSize != 0)
-        {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(valueSize);
-            listFreer.add(listHolder_0);
-
-            for (size_t i_0 = 0; i_0 < static_cast<size_t>(valueSize); ++i_0)
-            {
-                jobject element_0;
-                chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0);
-                jobject element_0_providerNodeIDItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "providerNodeID", "Ljava/lang/Long;",
-                                                                  element_0_providerNodeIDItem_1);
-                listHolder_0->mList[i_0].providerNodeID =
-                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].providerNodeID)>>(
-                        chip::JniReferences::GetInstance().LongToPrimitive(element_0_providerNodeIDItem_1));
-                jobject element_0_endpointItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "endpoint", "Ljava/lang/Integer;",
-                                                                  element_0_endpointItem_1);
-                listHolder_0->mList[i_0].endpoint =
-                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].endpoint)>>(
-                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_endpointItem_1));
-                jobject element_0_fabricIndexItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricIndex", "Ljava/lang/Integer;",
-                                                                  element_0_fabricIndexItem_1);
-                listHolder_0->mList[i_0].fabricIndex =
-                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricIndex)>>(
-                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricIndexItem_1));
-            }
-            cppValue = ListType_0(listHolder_0->mList, valueSize);
-        }
-        else
-        {
-            cppValue = ListType_0();
-        }
-    }
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -3197,8 +3108,8 @@ JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, writeDefaultOtaProvidersAttr
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                 = CHIP_NO_ERROR;
-    OtaSoftwareUpdateRequestorCluster * cppCluster = reinterpret_cast<OtaSoftwareUpdateRequestorCluster *>(clusterPtr);
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -3223,12 +3134,12 @@ JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, writeDefaultOtaProvidersAttr
     onFailure.release();
 }
 
-JNI_METHOD(void, OnOffCluster, writeOnTimeAttribute)
+JNI_METHOD(void, ThermostatCluster, writeMaxCoolSetpointLimitAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::OnOff::Attributes::OnTime::TypeInfo;
+    using TypeInfo = chip::app::Clusters::Thermostat::Attributes::MaxCoolSetpointLimit::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -3249,8 +3160,8 @@ JNI_METHOD(void, OnOffCluster, writeOnTimeAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
-    OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -3275,12 +3186,12 @@ JNI_METHOD(void, OnOffCluster, writeOnTimeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, OnOffCluster, writeOffWaitTimeAttribute)
+JNI_METHOD(void, ThermostatCluster, writeMinSetpointDeadBandAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::OnOff::Attributes::OffWaitTime::TypeInfo;
+    using TypeInfo = chip::app::Clusters::Thermostat::Attributes::MinSetpointDeadBand::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -3301,8 +3212,8 @@ JNI_METHOD(void, OnOffCluster, writeOffWaitTimeAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
-    OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -3327,27 +3238,19 @@ JNI_METHOD(void, OnOffCluster, writeOffWaitTimeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, OnOffCluster, writeStartUpOnOffAttribute)
+JNI_METHOD(void, ThermostatCluster, writeControlSequenceOfOperationAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::OnOff::Attributes::StartUpOnOff::TypeInfo;
+    using TypeInfo = chip::app::Clusters::Thermostat::Attributes::ControlSequenceOfOperation::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
-    }
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -3361,8 +3264,8 @@ JNI_METHOD(void, OnOffCluster, writeStartUpOnOffAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
-    OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -3387,12 +3290,12 @@ JNI_METHOD(void, OnOffCluster, writeStartUpOnOffAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, OnOffSwitchConfigurationCluster, writeSwitchActionsAttribute)
+JNI_METHOD(void, ThermostatCluster, writeSystemModeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::OnOffSwitchConfiguration::Attributes::SwitchActions::TypeInfo;
+    using TypeInfo = chip::app::Clusters::Thermostat::Attributes::SystemMode::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -3413,8 +3316,8 @@ JNI_METHOD(void, OnOffSwitchConfigurationCluster, writeSwitchActionsAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
-    OnOffSwitchConfigurationCluster * cppCluster = reinterpret_cast<OnOffSwitchConfigurationCluster *>(clusterPtr);
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -3439,28 +3342,20 @@ JNI_METHOD(void, OnOffSwitchConfigurationCluster, writeSwitchActionsAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, writeLifetimeRunningHoursAttribute)
+JNI_METHOD(void, FanControlCluster, writeFanModeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::PumpConfigurationAndControl::Attributes::LifetimeRunningHours::TypeInfo;
+    using TypeInfo = chip::app::Clusters::FanControl::Attributes::FanMode::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().LongToPrimitive(value));
-    }
-
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
     VerifyOrReturn(onSuccess.get() != nullptr,
@@ -3473,8 +3368,8 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, writeLifetimeRunningHoursAt
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
-    PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    FanControlCluster * cppCluster = reinterpret_cast<FanControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -3499,27 +3394,19 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, writeLifetimeRunningHoursAt
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, writeLifetimeEnergyConsumedAttribute)
+JNI_METHOD(void, FanControlCluster, writeFanModeSequenceAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::PumpConfigurationAndControl::Attributes::LifetimeEnergyConsumed::TypeInfo;
+    using TypeInfo = chip::app::Clusters::FanControl::Attributes::FanModeSequence::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().LongToPrimitive(value));
-    }
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -3533,8 +3420,8 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, writeLifetimeEnergyConsumed
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
-    PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    FanControlCluster * cppCluster = reinterpret_cast<FanControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -3559,19 +3446,27 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, writeLifetimeEnergyConsumed
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, writeOperationModeAttribute)
+JNI_METHOD(void, FanControlCluster, writePercentSettingAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::PumpConfigurationAndControl::Attributes::OperationMode::TypeInfo;
+    using TypeInfo = chip::app::Clusters::FanControl::Attributes::PercentSetting::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -3585,8 +3480,8 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, writeOperationModeAttribute
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
-    PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    FanControlCluster * cppCluster = reinterpret_cast<FanControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -3611,19 +3506,27 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, writeOperationModeAttribute
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, writeControlModeAttribute)
+JNI_METHOD(void, FanControlCluster, writeSpeedSettingAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::PumpConfigurationAndControl::Attributes::ControlMode::TypeInfo;
+    using TypeInfo = chip::app::Clusters::FanControl::Attributes::SpeedSetting::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -3637,8 +3540,8 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, writeControlModeAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
-    PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    FanControlCluster * cppCluster = reinterpret_cast<FanControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -3663,19 +3566,19 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, writeControlModeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeBooleanAttribute)
+JNI_METHOD(void, FanControlCluster, writeRockSettingAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Boolean::TypeInfo;
+    using TypeInfo = chip::app::Clusters::FanControl::Attributes::RockSetting::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
     cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().BooleanToPrimitive(value));
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -3689,8 +3592,8 @@ JNI_METHOD(void, TestClusterCluster, writeBooleanAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
-    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    FanControlCluster * cppCluster = reinterpret_cast<FanControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -3715,12 +3618,12 @@ JNI_METHOD(void, TestClusterCluster, writeBooleanAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeBitmap8Attribute)
+JNI_METHOD(void, FanControlCluster, writeWindSettingAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Bitmap8::TypeInfo;
+    using TypeInfo = chip::app::Clusters::FanControl::Attributes::WindSetting::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -3741,8 +3644,8 @@ JNI_METHOD(void, TestClusterCluster, writeBitmap8Attribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
-    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    FanControlCluster * cppCluster = reinterpret_cast<FanControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -3767,12 +3670,12 @@ JNI_METHOD(void, TestClusterCluster, writeBitmap8Attribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeBitmap16Attribute)
+JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeTemperatureDisplayModeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Bitmap16::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::TemperatureDisplayMode::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -3793,8 +3696,9 @@ JNI_METHOD(void, TestClusterCluster, writeBitmap16Attribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
-    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    ThermostatUserInterfaceConfigurationCluster * cppCluster =
+        reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -3819,18 +3723,19 @@ JNI_METHOD(void, TestClusterCluster, writeBitmap16Attribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeBitmap32Attribute)
+JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeKeypadLockoutAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Bitmap32::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::KeypadLockout::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -3844,8 +3749,9 @@ JNI_METHOD(void, TestClusterCluster, writeBitmap32Attribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
-    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    ThermostatUserInterfaceConfigurationCluster * cppCluster =
+        reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -3870,18 +3776,19 @@ JNI_METHOD(void, TestClusterCluster, writeBitmap32Attribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeBitmap64Attribute)
+JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeScheduleProgrammingVisibilityAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Bitmap64::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -3895,8 +3802,9 @@ JNI_METHOD(void, TestClusterCluster, writeBitmap64Attribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
-    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    ThermostatUserInterfaceConfigurationCluster * cppCluster =
+        reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -3921,12 +3829,12 @@ JNI_METHOD(void, TestClusterCluster, writeBitmap64Attribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt8uAttribute)
+JNI_METHOD(void, ColorControlCluster, writeOptionsAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int8u::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::Options::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -3947,8 +3855,8 @@ JNI_METHOD(void, TestClusterCluster, writeInt8uAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
-    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -3973,12 +3881,12 @@ JNI_METHOD(void, TestClusterCluster, writeInt8uAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt16uAttribute)
+JNI_METHOD(void, ColorControlCluster, writeWhitePointXAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int16u::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::WhitePointX::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -3999,8 +3907,8 @@ JNI_METHOD(void, TestClusterCluster, writeInt16uAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
-    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -4025,18 +3933,19 @@ JNI_METHOD(void, TestClusterCluster, writeInt16uAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt24uAttribute)
+JNI_METHOD(void, ColorControlCluster, writeWhitePointYAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int24u::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::WhitePointY::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -4050,8 +3959,8 @@ JNI_METHOD(void, TestClusterCluster, writeInt24uAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
-    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -4076,18 +3985,19 @@ JNI_METHOD(void, TestClusterCluster, writeInt24uAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt32uAttribute)
+JNI_METHOD(void, ColorControlCluster, writeColorPointRXAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int32u::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::ColorPointRX::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -4101,8 +4011,8 @@ JNI_METHOD(void, TestClusterCluster, writeInt32uAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
-    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -4127,18 +4037,19 @@ JNI_METHOD(void, TestClusterCluster, writeInt32uAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt40uAttribute)
+JNI_METHOD(void, ColorControlCluster, writeColorPointRYAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int40u::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::ColorPointRY::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -4152,8 +4063,8 @@ JNI_METHOD(void, TestClusterCluster, writeInt40uAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
-    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -4178,18 +4089,27 @@ JNI_METHOD(void, TestClusterCluster, writeInt40uAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt48uAttribute)
+JNI_METHOD(void, ColorControlCluster, writeColorPointRIntensityAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int48u::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::ColorPointRIntensity::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -4203,8 +4123,8 @@ JNI_METHOD(void, TestClusterCluster, writeInt48uAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
-    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -4229,18 +4149,19 @@ JNI_METHOD(void, TestClusterCluster, writeInt48uAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt56uAttribute)
+JNI_METHOD(void, ColorControlCluster, writeColorPointGXAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int56u::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::ColorPointGX::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -4254,8 +4175,8 @@ JNI_METHOD(void, TestClusterCluster, writeInt56uAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
-    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -4280,18 +4201,19 @@ JNI_METHOD(void, TestClusterCluster, writeInt56uAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt64uAttribute)
+JNI_METHOD(void, ColorControlCluster, writeColorPointGYAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int64u::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::ColorPointGY::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -4305,8 +4227,8 @@ JNI_METHOD(void, TestClusterCluster, writeInt64uAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
-    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -4331,19 +4253,27 @@ JNI_METHOD(void, TestClusterCluster, writeInt64uAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt8sAttribute)
+JNI_METHOD(void, ColorControlCluster, writeColorPointGIntensityAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int8s::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::ColorPointGIntensity::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -4357,8 +4287,8 @@ JNI_METHOD(void, TestClusterCluster, writeInt8sAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
-    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -4383,12 +4313,12 @@ JNI_METHOD(void, TestClusterCluster, writeInt8sAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt16sAttribute)
+JNI_METHOD(void, ColorControlCluster, writeColorPointBXAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int16s::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::ColorPointBX::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -4409,8 +4339,8 @@ JNI_METHOD(void, TestClusterCluster, writeInt16sAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
-    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -4435,18 +4365,19 @@ JNI_METHOD(void, TestClusterCluster, writeInt16sAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt24sAttribute)
+JNI_METHOD(void, ColorControlCluster, writeColorPointBYAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int24s::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::ColorPointBY::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -4460,8 +4391,8 @@ JNI_METHOD(void, TestClusterCluster, writeInt24sAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
-    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -4486,22 +4417,31 @@ JNI_METHOD(void, TestClusterCluster, writeInt24sAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt32sAttribute)
+JNI_METHOD(void, ColorControlCluster, writeColorPointBIntensityAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int32s::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::ColorPointBIntensity::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
-
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
+
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
@@ -4511,8 +4451,8 @@ JNI_METHOD(void, TestClusterCluster, writeInt32sAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
-    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -4537,18 +4477,19 @@ JNI_METHOD(void, TestClusterCluster, writeInt32sAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt40sAttribute)
+JNI_METHOD(void, ColorControlCluster, writeStartUpColorTemperatureMiredsAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int40s::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ColorControl::Attributes::StartUpColorTemperatureMireds::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -4562,8 +4503,8 @@ JNI_METHOD(void, TestClusterCluster, writeInt40sAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
-    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -4588,12 +4529,12 @@ JNI_METHOD(void, TestClusterCluster, writeInt40sAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt48sAttribute)
+JNI_METHOD(void, ContentLauncherCluster, writeSupportedStreamingProtocolsAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int48s::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ContentLauncher::Attributes::SupportedStreamingProtocols::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -4613,8 +4554,8 @@ JNI_METHOD(void, TestClusterCluster, writeInt48sAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
-    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
+    CHIP_ERROR err                      = CHIP_NO_ERROR;
+    ContentLauncherCluster * cppCluster = reinterpret_cast<ContentLauncherCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -4639,18 +4580,19 @@ JNI_METHOD(void, TestClusterCluster, writeInt48sAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt56sAttribute)
+JNI_METHOD(void, TestClusterCluster, writeBooleanAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int56s::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Boolean::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().BooleanToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -4690,18 +4632,19 @@ JNI_METHOD(void, TestClusterCluster, writeInt56sAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt64sAttribute)
+JNI_METHOD(void, TestClusterCluster, writeBitmap8Attribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int64s::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Bitmap8::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -4741,12 +4684,12 @@ JNI_METHOD(void, TestClusterCluster, writeInt64sAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeEnum8Attribute)
+JNI_METHOD(void, TestClusterCluster, writeBitmap16Attribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Enum8::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Bitmap16::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -4793,19 +4736,18 @@ JNI_METHOD(void, TestClusterCluster, writeEnum8Attribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeEnum16Attribute)
+JNI_METHOD(void, TestClusterCluster, writeBitmap32Attribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Enum16::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Bitmap32::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -4845,18 +4787,18 @@ JNI_METHOD(void, TestClusterCluster, writeEnum16Attribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeFloatSingleAttribute)
+JNI_METHOD(void, TestClusterCluster, writeBitmap64Attribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::FloatSingle::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Bitmap64::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().FloatToPrimitive(value));
+    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -4896,19 +4838,19 @@ JNI_METHOD(void, TestClusterCluster, writeFloatSingleAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeFloatDoubleAttribute)
+JNI_METHOD(void, TestClusterCluster, writeInt8uAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::FloatDouble::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int8u::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
     cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().DoubleToPrimitive(value));
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -4948,19 +4890,19 @@ JNI_METHOD(void, TestClusterCluster, writeFloatDoubleAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeOctetStringAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray value, jobject timedWriteTimeoutMs)
+JNI_METHOD(void, TestClusterCluster, writeInt16uAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::OctetString::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int16u::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cleanupByteArrays.push_back(chip::Platform::MakeUnique<chip::JniByteArray>(env, static_cast<jbyteArray>(value)));
-    cppValue = cleanupByteArrays.back()->byteSpan();
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -5000,41 +4942,18 @@ JNI_METHOD(void, TestClusterCluster, writeOctetStringAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeListInt8uAttribute)
+JNI_METHOD(void, TestClusterCluster, writeInt24uAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::ListInt8u::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int24u::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    {
-        using ListType_0       = std::remove_reference_t<decltype(cppValue)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        jint valueSize;
-        chip::JniReferences::GetInstance().GetListSize(value, valueSize);
-        if (valueSize != 0)
-        {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(valueSize);
-            listFreer.add(listHolder_0);
-
-            for (size_t i_0 = 0; i_0 < static_cast<size_t>(valueSize); ++i_0)
-            {
-                jobject element_0;
-                chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0);
-                listHolder_0->mList[i_0] = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0])>>(
-                    chip::JniReferences::GetInstance().IntegerToPrimitive(element_0));
-            }
-            cppValue = ListType_0(listHolder_0->mList, valueSize);
-        }
-        else
-        {
-            cppValue = ListType_0();
-        }
-    }
+    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -5074,42 +4993,18 @@ JNI_METHOD(void, TestClusterCluster, writeListInt8uAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeListOctetStringAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray value, jobject timedWriteTimeoutMs)
+JNI_METHOD(void, TestClusterCluster, writeInt32uAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::ListOctetString::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int32u::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    {
-        using ListType_0       = std::remove_reference_t<decltype(cppValue)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        jint valueSize;
-        chip::JniReferences::GetInstance().GetListSize(value, valueSize);
-        if (valueSize != 0)
-        {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(valueSize);
-            listFreer.add(listHolder_0);
-
-            for (size_t i_0 = 0; i_0 < static_cast<size_t>(valueSize); ++i_0)
-            {
-                jobject element_0;
-                chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0);
-                cleanupByteArrays.push_back(
-                    chip::Platform::MakeUnique<chip::JniByteArray>(env, static_cast<jbyteArray>(element_0)));
-                listHolder_0->mList[i_0] = cleanupByteArrays.back()->byteSpan();
-            }
-            cppValue = ListType_0(listHolder_0->mList, valueSize);
-        }
-        else
-        {
-            cppValue = ListType_0();
-        }
-    }
+    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -5149,49 +5044,18 @@ JNI_METHOD(void, TestClusterCluster, writeListOctetStringAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeListStructOctetStringAttribute)
+JNI_METHOD(void, TestClusterCluster, writeInt40uAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::ListStructOctetString::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int40u::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    {
-        using ListType_0       = std::remove_reference_t<decltype(cppValue)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        jint valueSize;
-        chip::JniReferences::GetInstance().GetListSize(value, valueSize);
-        if (valueSize != 0)
-        {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(valueSize);
-            listFreer.add(listHolder_0);
-
-            for (size_t i_0 = 0; i_0 < static_cast<size_t>(valueSize); ++i_0)
-            {
-                jobject element_0;
-                chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0);
-                jobject element_0_member1Item_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "member1", "Ljava/lang/Long;",
-                                                                  element_0_member1Item_1);
-                listHolder_0->mList[i_0].member1 = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].member1)>>(
-                    chip::JniReferences::GetInstance().LongToPrimitive(element_0_member1Item_1));
-                jobject element_0_member2Item_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "member2", "[B", element_0_member2Item_1);
-                cleanupByteArrays.push_back(
-                    chip::Platform::MakeUnique<chip::JniByteArray>(env, static_cast<jbyteArray>(element_0_member2Item_1)));
-                listHolder_0->mList[i_0].member2 = cleanupByteArrays.back()->byteSpan();
-            }
-            cppValue = ListType_0(listHolder_0->mList, valueSize);
-        }
-        else
-        {
-            cppValue = ListType_0();
-        }
-    }
+    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -5231,19 +5095,18 @@ JNI_METHOD(void, TestClusterCluster, writeListStructOctetStringAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeLongOctetStringAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray value, jobject timedWriteTimeoutMs)
+JNI_METHOD(void, TestClusterCluster, writeInt48uAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::LongOctetString::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int48u::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cleanupByteArrays.push_back(chip::Platform::MakeUnique<chip::JniByteArray>(env, static_cast<jbyteArray>(value)));
-    cppValue = cleanupByteArrays.back()->byteSpan();
+    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -5283,19 +5146,18 @@ JNI_METHOD(void, TestClusterCluster, writeLongOctetStringAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeCharStringAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value, jobject timedWriteTimeoutMs)
+JNI_METHOD(void, TestClusterCluster, writeInt56uAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::CharString::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int56u::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cleanupStrings.push_back(chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(value)));
-    cppValue = cleanupStrings.back()->charSpan();
+    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -5335,19 +5197,18 @@ JNI_METHOD(void, TestClusterCluster, writeCharStringAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeLongCharStringAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value, jobject timedWriteTimeoutMs)
+JNI_METHOD(void, TestClusterCluster, writeInt64uAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::LongCharString::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int64u::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cleanupStrings.push_back(chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(value)));
-    cppValue = cleanupStrings.back()->charSpan();
+    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -5387,18 +5248,19 @@ JNI_METHOD(void, TestClusterCluster, writeLongCharStringAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeEpochUsAttribute)
+JNI_METHOD(void, TestClusterCluster, writeInt8sAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::EpochUs::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int8s::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -5438,18 +5300,19 @@ JNI_METHOD(void, TestClusterCluster, writeEpochUsAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeEpochSAttribute)
+JNI_METHOD(void, TestClusterCluster, writeInt16sAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::EpochS::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int16s::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -5489,19 +5352,18 @@ JNI_METHOD(void, TestClusterCluster, writeEpochSAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeVendorIdAttribute)
+JNI_METHOD(void, TestClusterCluster, writeInt24sAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::VendorId::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int24s::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -5541,426 +5403,69 @@ JNI_METHOD(void, TestClusterCluster, writeVendorIdAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeListNullablesAndOptionalsStructAttribute)
+JNI_METHOD(void, TestClusterCluster, writeInt32sAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::ListNullablesAndOptionalsStruct::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int32s::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    {
-        using ListType_0       = std::remove_reference_t<decltype(cppValue)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        jint valueSize;
-        chip::JniReferences::GetInstance().GetListSize(value, valueSize);
-        if (valueSize != 0)
-        {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(valueSize);
-            listFreer.add(listHolder_0);
+    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
 
-            for (size_t i_0 = 0; i_0 < static_cast<size_t>(valueSize); ++i_0)
-            {
-                jobject element_0;
-                chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0);
-                jobject element_0_nullableIntItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "nullableInt", "Ljava/lang/Integer;",
-                                                                  element_0_nullableIntItem_1);
-                if (element_0_nullableIntItem_1 == nullptr)
-                {
-                    listHolder_0->mList[i_0].nullableInt.SetNull();
-                }
-                else
-                {
-                    auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableInt.SetNonNull();
-                    nonNullValue_2        = static_cast<std::remove_reference_t<decltype(nonNullValue_2)>>(
-                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_nullableIntItem_1));
-                }
-                jobject element_0_optionalIntItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "optionalInt", "Ljava/util/Optional;",
-                                                                  element_0_optionalIntItem_1);
-                if (element_0_optionalIntItem_1 != nullptr)
-                {
-                    jobject optionalValue_2;
-                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_optionalIntItem_1, optionalValue_2);
-                    if (optionalValue_2 != nullptr)
-                    {
-                        auto & definedValue_2 = listHolder_0->mList[i_0].optionalInt.Emplace();
-                        definedValue_2        = static_cast<std::remove_reference_t<decltype(definedValue_2)>>(
-                            chip::JniReferences::GetInstance().IntegerToPrimitive(optionalValue_2));
-                    }
-                }
-                jobject element_0_nullableOptionalIntItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "nullableOptionalInt", "Ljava/util/Optional;",
-                                                                  element_0_nullableOptionalIntItem_1);
-                if (element_0_nullableOptionalIntItem_1 != nullptr)
-                {
-                    jobject optionalValue_2;
-                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_nullableOptionalIntItem_1, optionalValue_2);
-                    if (optionalValue_2 != nullptr)
-                    {
-                        auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalInt.Emplace();
-                        if (optionalValue_2 == nullptr)
-                        {
-                            definedValue_2.SetNull();
-                        }
-                        else
-                        {
-                            auto & nonNullValue_3 = definedValue_2.SetNonNull();
-                            nonNullValue_3        = static_cast<std::remove_reference_t<decltype(nonNullValue_3)>>(
-                                chip::JniReferences::GetInstance().IntegerToPrimitive(optionalValue_2));
-                        }
-                    }
-                }
-                jobject element_0_nullableStringItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "nullableString", "Ljava/lang/String;",
-                                                                  element_0_nullableStringItem_1);
-                if (element_0_nullableStringItem_1 == nullptr)
-                {
-                    listHolder_0->mList[i_0].nullableString.SetNull();
-                }
-                else
-                {
-                    auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableString.SetNonNull();
-                    cleanupStrings.push_back(
-                        chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(element_0_nullableStringItem_1)));
-                    nonNullValue_2 = cleanupStrings.back()->charSpan();
-                }
-                jobject element_0_optionalStringItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "optionalString", "Ljava/util/Optional;",
-                                                                  element_0_optionalStringItem_1);
-                if (element_0_optionalStringItem_1 != nullptr)
-                {
-                    jobject optionalValue_2;
-                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_optionalStringItem_1, optionalValue_2);
-                    if (optionalValue_2 != nullptr)
-                    {
-                        auto & definedValue_2 = listHolder_0->mList[i_0].optionalString.Emplace();
-                        cleanupStrings.push_back(
-                            chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(optionalValue_2)));
-                        definedValue_2 = cleanupStrings.back()->charSpan();
-                    }
-                }
-                jobject element_0_nullableOptionalStringItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "nullableOptionalString", "Ljava/util/Optional;",
-                                                                  element_0_nullableOptionalStringItem_1);
-                if (element_0_nullableOptionalStringItem_1 != nullptr)
-                {
-                    jobject optionalValue_2;
-                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_nullableOptionalStringItem_1, optionalValue_2);
-                    if (optionalValue_2 != nullptr)
-                    {
-                        auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalString.Emplace();
-                        if (optionalValue_2 == nullptr)
-                        {
-                            definedValue_2.SetNull();
-                        }
-                        else
-                        {
-                            auto & nonNullValue_3 = definedValue_2.SetNonNull();
-                            cleanupStrings.push_back(
-                                chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(optionalValue_2)));
-                            nonNullValue_3 = cleanupStrings.back()->charSpan();
-                        }
-                    }
-                }
-                jobject element_0_nullableStructItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(
-                    element_0, "nullableStruct", "Lchip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct;",
-                    element_0_nullableStructItem_1);
-                if (element_0_nullableStructItem_1 == nullptr)
-                {
-                    listHolder_0->mList[i_0].nullableStruct.SetNull();
-                }
-                else
-                {
-                    auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableStruct.SetNonNull();
-                    jobject element_0_nullableStructItem_1_aItem_3;
-                    chip::JniReferences::GetInstance().GetObjectField(element_0_nullableStructItem_1, "a", "Ljava/lang/Integer;",
-                                                                      element_0_nullableStructItem_1_aItem_3);
-                    nonNullValue_2.a = static_cast<std::remove_reference_t<decltype(nonNullValue_2.a)>>(
-                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_nullableStructItem_1_aItem_3));
-                    jobject element_0_nullableStructItem_1_bItem_3;
-                    chip::JniReferences::GetInstance().GetObjectField(element_0_nullableStructItem_1, "b", "Ljava/lang/Boolean;",
-                                                                      element_0_nullableStructItem_1_bItem_3);
-                    nonNullValue_2.b = static_cast<std::remove_reference_t<decltype(nonNullValue_2.b)>>(
-                        chip::JniReferences::GetInstance().BooleanToPrimitive(element_0_nullableStructItem_1_bItem_3));
-                    jobject element_0_nullableStructItem_1_cItem_3;
-                    chip::JniReferences::GetInstance().GetObjectField(element_0_nullableStructItem_1, "c", "Ljava/lang/Integer;",
-                                                                      element_0_nullableStructItem_1_cItem_3);
-                    nonNullValue_2.c = static_cast<std::remove_reference_t<decltype(nonNullValue_2.c)>>(
-                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_nullableStructItem_1_cItem_3));
-                    jobject element_0_nullableStructItem_1_dItem_3;
-                    chip::JniReferences::GetInstance().GetObjectField(element_0_nullableStructItem_1, "d", "[B",
-                                                                      element_0_nullableStructItem_1_dItem_3);
-                    cleanupByteArrays.push_back(chip::Platform::MakeUnique<chip::JniByteArray>(
-                        env, static_cast<jbyteArray>(element_0_nullableStructItem_1_dItem_3)));
-                    nonNullValue_2.d = cleanupByteArrays.back()->byteSpan();
-                    jobject element_0_nullableStructItem_1_eItem_3;
-                    chip::JniReferences::GetInstance().GetObjectField(element_0_nullableStructItem_1, "e", "Ljava/lang/String;",
-                                                                      element_0_nullableStructItem_1_eItem_3);
-                    cleanupStrings.push_back(chip::Platform::MakeUnique<chip::JniUtfString>(
-                        env, static_cast<jstring>(element_0_nullableStructItem_1_eItem_3)));
-                    nonNullValue_2.e = cleanupStrings.back()->charSpan();
-                    jobject element_0_nullableStructItem_1_fItem_3;
-                    chip::JniReferences::GetInstance().GetObjectField(element_0_nullableStructItem_1, "f", "Ljava/lang/Integer;",
-                                                                      element_0_nullableStructItem_1_fItem_3);
-                    nonNullValue_2.f = static_cast<std::remove_reference_t<decltype(nonNullValue_2.f)>>(
-                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_nullableStructItem_1_fItem_3));
-                    jobject element_0_nullableStructItem_1_gItem_3;
-                    chip::JniReferences::GetInstance().GetObjectField(element_0_nullableStructItem_1, "g", "Ljava/lang/Float;",
-                                                                      element_0_nullableStructItem_1_gItem_3);
-                    nonNullValue_2.g = static_cast<std::remove_reference_t<decltype(nonNullValue_2.g)>>(
-                        chip::JniReferences::GetInstance().FloatToPrimitive(element_0_nullableStructItem_1_gItem_3));
-                    jobject element_0_nullableStructItem_1_hItem_3;
-                    chip::JniReferences::GetInstance().GetObjectField(element_0_nullableStructItem_1, "h", "Ljava/lang/Double;",
-                                                                      element_0_nullableStructItem_1_hItem_3);
-                    nonNullValue_2.h = static_cast<std::remove_reference_t<decltype(nonNullValue_2.h)>>(
-                        chip::JniReferences::GetInstance().DoubleToPrimitive(element_0_nullableStructItem_1_hItem_3));
-                }
-                jobject element_0_optionalStructItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "optionalStruct", "Ljava/util/Optional;",
-                                                                  element_0_optionalStructItem_1);
-                if (element_0_optionalStructItem_1 != nullptr)
-                {
-                    jobject optionalValue_2;
-                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_optionalStructItem_1, optionalValue_2);
-                    if (optionalValue_2 != nullptr)
-                    {
-                        auto & definedValue_2 = listHolder_0->mList[i_0].optionalStruct.Emplace();
-                        jobject optionalValue_2_aItem_3;
-                        chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "a", "Ljava/lang/Integer;",
-                                                                          optionalValue_2_aItem_3);
-                        definedValue_2.a = static_cast<std::remove_reference_t<decltype(definedValue_2.a)>>(
-                            chip::JniReferences::GetInstance().IntegerToPrimitive(optionalValue_2_aItem_3));
-                        jobject optionalValue_2_bItem_3;
-                        chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "b", "Ljava/lang/Boolean;",
-                                                                          optionalValue_2_bItem_3);
-                        definedValue_2.b = static_cast<std::remove_reference_t<decltype(definedValue_2.b)>>(
-                            chip::JniReferences::GetInstance().BooleanToPrimitive(optionalValue_2_bItem_3));
-                        jobject optionalValue_2_cItem_3;
-                        chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "c", "Ljava/lang/Integer;",
-                                                                          optionalValue_2_cItem_3);
-                        definedValue_2.c = static_cast<std::remove_reference_t<decltype(definedValue_2.c)>>(
-                            chip::JniReferences::GetInstance().IntegerToPrimitive(optionalValue_2_cItem_3));
-                        jobject optionalValue_2_dItem_3;
-                        chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "d", "[B", optionalValue_2_dItem_3);
-                        cleanupByteArrays.push_back(
-                            chip::Platform::MakeUnique<chip::JniByteArray>(env, static_cast<jbyteArray>(optionalValue_2_dItem_3)));
-                        definedValue_2.d = cleanupByteArrays.back()->byteSpan();
-                        jobject optionalValue_2_eItem_3;
-                        chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "e", "Ljava/lang/String;",
-                                                                          optionalValue_2_eItem_3);
-                        cleanupStrings.push_back(
-                            chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(optionalValue_2_eItem_3)));
-                        definedValue_2.e = cleanupStrings.back()->charSpan();
-                        jobject optionalValue_2_fItem_3;
-                        chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "f", "Ljava/lang/Integer;",
-                                                                          optionalValue_2_fItem_3);
-                        definedValue_2.f = static_cast<std::remove_reference_t<decltype(definedValue_2.f)>>(
-                            chip::JniReferences::GetInstance().IntegerToPrimitive(optionalValue_2_fItem_3));
-                        jobject optionalValue_2_gItem_3;
-                        chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "g", "Ljava/lang/Float;",
-                                                                          optionalValue_2_gItem_3);
-                        definedValue_2.g = static_cast<std::remove_reference_t<decltype(definedValue_2.g)>>(
-                            chip::JniReferences::GetInstance().FloatToPrimitive(optionalValue_2_gItem_3));
-                        jobject optionalValue_2_hItem_3;
-                        chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "h", "Ljava/lang/Double;",
-                                                                          optionalValue_2_hItem_3);
-                        definedValue_2.h = static_cast<std::remove_reference_t<decltype(definedValue_2.h)>>(
-                            chip::JniReferences::GetInstance().DoubleToPrimitive(optionalValue_2_hItem_3));
-                    }
-                }
-                jobject element_0_nullableOptionalStructItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "nullableOptionalStruct", "Ljava/util/Optional;",
-                                                                  element_0_nullableOptionalStructItem_1);
-                if (element_0_nullableOptionalStructItem_1 != nullptr)
-                {
-                    jobject optionalValue_2;
-                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_nullableOptionalStructItem_1, optionalValue_2);
-                    if (optionalValue_2 != nullptr)
-                    {
-                        auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalStruct.Emplace();
-                        if (optionalValue_2 == nullptr)
-                        {
-                            definedValue_2.SetNull();
-                        }
-                        else
-                        {
-                            auto & nonNullValue_3 = definedValue_2.SetNonNull();
-                            jobject optionalValue_2_aItem_4;
-                            chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "a", "Ljava/lang/Integer;",
-                                                                              optionalValue_2_aItem_4);
-                            nonNullValue_3.a = static_cast<std::remove_reference_t<decltype(nonNullValue_3.a)>>(
-                                chip::JniReferences::GetInstance().IntegerToPrimitive(optionalValue_2_aItem_4));
-                            jobject optionalValue_2_bItem_4;
-                            chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "b", "Ljava/lang/Boolean;",
-                                                                              optionalValue_2_bItem_4);
-                            nonNullValue_3.b = static_cast<std::remove_reference_t<decltype(nonNullValue_3.b)>>(
-                                chip::JniReferences::GetInstance().BooleanToPrimitive(optionalValue_2_bItem_4));
-                            jobject optionalValue_2_cItem_4;
-                            chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "c", "Ljava/lang/Integer;",
-                                                                              optionalValue_2_cItem_4);
-                            nonNullValue_3.c = static_cast<std::remove_reference_t<decltype(nonNullValue_3.c)>>(
-                                chip::JniReferences::GetInstance().IntegerToPrimitive(optionalValue_2_cItem_4));
-                            jobject optionalValue_2_dItem_4;
-                            chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "d", "[B", optionalValue_2_dItem_4);
-                            cleanupByteArrays.push_back(chip::Platform::MakeUnique<chip::JniByteArray>(
-                                env, static_cast<jbyteArray>(optionalValue_2_dItem_4)));
-                            nonNullValue_3.d = cleanupByteArrays.back()->byteSpan();
-                            jobject optionalValue_2_eItem_4;
-                            chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "e", "Ljava/lang/String;",
-                                                                              optionalValue_2_eItem_4);
-                            cleanupStrings.push_back(
-                                chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(optionalValue_2_eItem_4)));
-                            nonNullValue_3.e = cleanupStrings.back()->charSpan();
-                            jobject optionalValue_2_fItem_4;
-                            chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "f", "Ljava/lang/Integer;",
-                                                                              optionalValue_2_fItem_4);
-                            nonNullValue_3.f = static_cast<std::remove_reference_t<decltype(nonNullValue_3.f)>>(
-                                chip::JniReferences::GetInstance().IntegerToPrimitive(optionalValue_2_fItem_4));
-                            jobject optionalValue_2_gItem_4;
-                            chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "g", "Ljava/lang/Float;",
-                                                                              optionalValue_2_gItem_4);
-                            nonNullValue_3.g = static_cast<std::remove_reference_t<decltype(nonNullValue_3.g)>>(
-                                chip::JniReferences::GetInstance().FloatToPrimitive(optionalValue_2_gItem_4));
-                            jobject optionalValue_2_hItem_4;
-                            chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "h", "Ljava/lang/Double;",
-                                                                              optionalValue_2_hItem_4);
-                            nonNullValue_3.h = static_cast<std::remove_reference_t<decltype(nonNullValue_3.h)>>(
-                                chip::JniReferences::GetInstance().DoubleToPrimitive(optionalValue_2_hItem_4));
-                        }
-                    }
-                }
-                jobject element_0_nullableListItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "nullableList", "Ljava/util/ArrayList;",
-                                                                  element_0_nullableListItem_1);
-                if (element_0_nullableListItem_1 == nullptr)
-                {
-                    listHolder_0->mList[i_0].nullableList.SetNull();
-                }
-                else
-                {
-                    auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableList.SetNonNull();
-                    {
-                        using ListType_3       = std::remove_reference_t<decltype(nonNullValue_2)>;
-                        using ListMemberType_3 = ListMemberTypeGetter<ListType_3>::Type;
-                        jint element_0_nullableListItem_1Size;
-                        chip::JniReferences::GetInstance().GetListSize(element_0_nullableListItem_1,
-                                                                       element_0_nullableListItem_1Size);
-                        if (element_0_nullableListItem_1Size != 0)
-                        {
-                            auto * listHolder_3 = new ListHolder<ListMemberType_3>(element_0_nullableListItem_1Size);
-                            listFreer.add(listHolder_3);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-                            for (size_t i_3 = 0; i_3 < static_cast<size_t>(element_0_nullableListItem_1Size); ++i_3)
-                            {
-                                jobject element_3;
-                                chip::JniReferences::GetInstance().GetListItem(element_0_nullableListItem_1, i_3, element_3);
-                                listHolder_3->mList[i_3] = static_cast<std::remove_reference_t<decltype(listHolder_3->mList[i_3])>>(
-                                    chip::JniReferences::GetInstance().IntegerToPrimitive(element_3));
-                            }
-                            nonNullValue_2 = ListType_3(listHolder_3->mList, element_0_nullableListItem_1Size);
-                        }
-                        else
-                        {
-                            nonNullValue_2 = ListType_3();
-                        }
-                    }
-                }
-                jobject element_0_optionalListItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "optionalList", "Ljava/util/Optional;",
-                                                                  element_0_optionalListItem_1);
-                if (element_0_optionalListItem_1 != nullptr)
-                {
-                    jobject optionalValue_2;
-                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_optionalListItem_1, optionalValue_2);
-                    if (optionalValue_2 != nullptr)
-                    {
-                        auto & definedValue_2 = listHolder_0->mList[i_0].optionalList.Emplace();
-                        {
-                            using ListType_3       = std::remove_reference_t<decltype(definedValue_2)>;
-                            using ListMemberType_3 = ListMemberTypeGetter<ListType_3>::Type;
-                            jint optionalValue_2Size;
-                            chip::JniReferences::GetInstance().GetListSize(optionalValue_2, optionalValue_2Size);
-                            if (optionalValue_2Size != 0)
-                            {
-                                auto * listHolder_3 = new ListHolder<ListMemberType_3>(optionalValue_2Size);
-                                listFreer.add(listHolder_3);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-                                for (size_t i_3 = 0; i_3 < static_cast<size_t>(optionalValue_2Size); ++i_3)
-                                {
-                                    jobject element_3;
-                                    chip::JniReferences::GetInstance().GetListItem(optionalValue_2, i_3, element_3);
-                                    listHolder_3->mList[i_3] =
-                                        static_cast<std::remove_reference_t<decltype(listHolder_3->mList[i_3])>>(
-                                            chip::JniReferences::GetInstance().IntegerToPrimitive(element_3));
-                                }
-                                definedValue_2 = ListType_3(listHolder_3->mList, optionalValue_2Size);
-                            }
-                            else
-                            {
-                                definedValue_2 = ListType_3();
-                            }
-                        }
-                    }
-                }
-                jobject element_0_nullableOptionalListItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "nullableOptionalList", "Ljava/util/Optional;",
-                                                                  element_0_nullableOptionalListItem_1);
-                if (element_0_nullableOptionalListItem_1 != nullptr)
-                {
-                    jobject optionalValue_2;
-                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_nullableOptionalListItem_1, optionalValue_2);
-                    if (optionalValue_2 != nullptr)
-                    {
-                        auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalList.Emplace();
-                        if (optionalValue_2 == nullptr)
-                        {
-                            definedValue_2.SetNull();
-                        }
-                        else
-                        {
-                            auto & nonNullValue_3 = definedValue_2.SetNonNull();
-                            {
-                                using ListType_4       = std::remove_reference_t<decltype(nonNullValue_3)>;
-                                using ListMemberType_4 = ListMemberTypeGetter<ListType_4>::Type;
-                                jint optionalValue_2Size;
-                                chip::JniReferences::GetInstance().GetListSize(optionalValue_2, optionalValue_2Size);
-                                if (optionalValue_2Size != 0)
-                                {
-                                    auto * listHolder_4 = new ListHolder<ListMemberType_4>(optionalValue_2Size);
-                                    listFreer.add(listHolder_4);
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-                                    for (size_t i_4 = 0; i_4 < static_cast<size_t>(optionalValue_2Size); ++i_4)
-                                    {
-                                        jobject element_4;
-                                        chip::JniReferences::GetInstance().GetListItem(optionalValue_2, i_4, element_4);
-                                        listHolder_4->mList[i_4] =
-                                            static_cast<std::remove_reference_t<decltype(listHolder_4->mList[i_4])>>(
-                                                chip::JniReferences::GetInstance().IntegerToPrimitive(element_4));
-                                    }
-                                    nonNullValue_3 = ListType_4(listHolder_4->mList, optionalValue_2Size);
-                                }
-                                else
-                                {
-                                    nonNullValue_3 = ListType_4();
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            cppValue = ListType_0(listHolder_0->mList, valueSize);
-        }
-        else
-        {
-            cppValue = ListType_0();
-        }
+    auto successFn = chip::Callback::Callback<CHIPDefaultWriteSuccessCallbackType>::FromCancelable(onSuccess->Cancel());
+    auto failureFn = chip::Callback::Callback<CHIPDefaultFailureCallbackType>::FromCancelable(onFailure->Cancel());
+
+    if (timedWriteTimeoutMs == nullptr)
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall);
+    }
+    else
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall,
+                                                   chip::JniReferences::GetInstance().IntegerToPrimitive(timedWriteTimeoutMs));
     }
+    VerifyOrReturn(
+        err == CHIP_NO_ERROR,
+        chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+
+    onSuccess.release();
+    onFailure.release();
+}
+
+JNI_METHOD(void, TestClusterCluster, writeInt40sAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+{
+    chip::DeviceLayer::StackLock lock;
+    ListFreer listFreer;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int40s::TypeInfo;
+    TypeInfo::Type cppValue;
+
+    std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
+    std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
+
+    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -6000,19 +5505,18 @@ JNI_METHOD(void, TestClusterCluster, writeListNullablesAndOptionalsStructAttribu
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeEnumAttrAttribute)
+JNI_METHOD(void, TestClusterCluster, writeInt48sAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::EnumAttr::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int48s::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -6052,19 +5556,18 @@ JNI_METHOD(void, TestClusterCluster, writeEnumAttrAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeRangeRestrictedInt8uAttribute)
+JNI_METHOD(void, TestClusterCluster, writeInt56sAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::RangeRestrictedInt8u::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int56s::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -6104,19 +5607,18 @@ JNI_METHOD(void, TestClusterCluster, writeRangeRestrictedInt8uAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeRangeRestrictedInt8sAttribute)
+JNI_METHOD(void, TestClusterCluster, writeInt64sAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::RangeRestrictedInt8s::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Int64s::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -6156,12 +5658,12 @@ JNI_METHOD(void, TestClusterCluster, writeRangeRestrictedInt8sAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeRangeRestrictedInt16uAttribute)
+JNI_METHOD(void, TestClusterCluster, writeEnum8Attribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::RangeRestrictedInt16u::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Enum8::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -6208,12 +5710,12 @@ JNI_METHOD(void, TestClusterCluster, writeRangeRestrictedInt16uAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeRangeRestrictedInt16sAttribute)
+JNI_METHOD(void, TestClusterCluster, writeEnum16Attribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::RangeRestrictedInt16s::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Enum16::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -6260,42 +5762,18 @@ JNI_METHOD(void, TestClusterCluster, writeRangeRestrictedInt16sAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeListLongOctetStringAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray value, jobject timedWriteTimeoutMs)
+JNI_METHOD(void, TestClusterCluster, writeFloatSingleAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::ListLongOctetString::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::FloatSingle::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    {
-        using ListType_0       = std::remove_reference_t<decltype(cppValue)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        jint valueSize;
-        chip::JniReferences::GetInstance().GetListSize(value, valueSize);
-        if (valueSize != 0)
-        {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(valueSize);
-            listFreer.add(listHolder_0);
-
-            for (size_t i_0 = 0; i_0 < static_cast<size_t>(valueSize); ++i_0)
-            {
-                jobject element_0;
-                chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0);
-                cleanupByteArrays.push_back(
-                    chip::Platform::MakeUnique<chip::JniByteArray>(env, static_cast<jbyteArray>(element_0)));
-                listHolder_0->mList[i_0] = cleanupByteArrays.back()->byteSpan();
-            }
-            cppValue = ListType_0(listHolder_0->mList, valueSize);
-        }
-        else
-        {
-            cppValue = ListType_0();
-        }
-    }
+    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().FloatToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -6335,191 +5813,71 @@ JNI_METHOD(void, TestClusterCluster, writeListLongOctetStringAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeListFabricScopedAttribute)
+JNI_METHOD(void, TestClusterCluster, writeFloatDoubleAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::ListFabricScoped::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::FloatDouble::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    {
-        using ListType_0       = std::remove_reference_t<decltype(cppValue)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        jint valueSize;
-        chip::JniReferences::GetInstance().GetListSize(value, valueSize);
-        if (valueSize != 0)
-        {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(valueSize);
-            listFreer.add(listHolder_0);
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().DoubleToPrimitive(value));
 
-            for (size_t i_0 = 0; i_0 < static_cast<size_t>(valueSize); ++i_0)
-            {
-                jobject element_0;
-                chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0);
-                jobject element_0_fabricSensitiveInt8uItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricSensitiveInt8u", "Ljava/lang/Integer;",
-                                                                  element_0_fabricSensitiveInt8uItem_1);
-                listHolder_0->mList[i_0].fabricSensitiveInt8u =
-                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveInt8u)>>(
-                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricSensitiveInt8uItem_1));
-                jobject element_0_optionalFabricSensitiveInt8uItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "optionalFabricSensitiveInt8u", "Ljava/util/Optional;",
-                                                                  element_0_optionalFabricSensitiveInt8uItem_1);
-                if (element_0_optionalFabricSensitiveInt8uItem_1 != nullptr)
-                {
-                    jobject optionalValue_2;
-                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_optionalFabricSensitiveInt8uItem_1,
-                                                                        optionalValue_2);
-                    if (optionalValue_2 != nullptr)
-                    {
-                        auto & definedValue_2 = listHolder_0->mList[i_0].optionalFabricSensitiveInt8u.Emplace();
-                        definedValue_2        = static_cast<std::remove_reference_t<decltype(definedValue_2)>>(
-                            chip::JniReferences::GetInstance().IntegerToPrimitive(optionalValue_2));
-                    }
-                }
-                jobject element_0_nullableFabricSensitiveInt8uItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "nullableFabricSensitiveInt8u", "Ljava/lang/Integer;",
-                                                                  element_0_nullableFabricSensitiveInt8uItem_1);
-                if (element_0_nullableFabricSensitiveInt8uItem_1 == nullptr)
-                {
-                    listHolder_0->mList[i_0].nullableFabricSensitiveInt8u.SetNull();
-                }
-                else
-                {
-                    auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableFabricSensitiveInt8u.SetNonNull();
-                    nonNullValue_2        = static_cast<std::remove_reference_t<decltype(nonNullValue_2)>>(
-                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_nullableFabricSensitiveInt8uItem_1));
-                }
-                jobject element_0_nullableOptionalFabricSensitiveInt8uItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "nullableOptionalFabricSensitiveInt8u",
-                                                                  "Ljava/util/Optional;",
-                                                                  element_0_nullableOptionalFabricSensitiveInt8uItem_1);
-                if (element_0_nullableOptionalFabricSensitiveInt8uItem_1 != nullptr)
-                {
-                    jobject optionalValue_2;
-                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_nullableOptionalFabricSensitiveInt8uItem_1,
-                                                                        optionalValue_2);
-                    if (optionalValue_2 != nullptr)
-                    {
-                        auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalFabricSensitiveInt8u.Emplace();
-                        if (optionalValue_2 == nullptr)
-                        {
-                            definedValue_2.SetNull();
-                        }
-                        else
-                        {
-                            auto & nonNullValue_3 = definedValue_2.SetNonNull();
-                            nonNullValue_3        = static_cast<std::remove_reference_t<decltype(nonNullValue_3)>>(
-                                chip::JniReferences::GetInstance().IntegerToPrimitive(optionalValue_2));
-                        }
-                    }
-                }
-                jobject element_0_fabricSensitiveCharStringItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricSensitiveCharString", "Ljava/lang/String;",
-                                                                  element_0_fabricSensitiveCharStringItem_1);
-                cleanupStrings.push_back(chip::Platform::MakeUnique<chip::JniUtfString>(
-                    env, static_cast<jstring>(element_0_fabricSensitiveCharStringItem_1)));
-                listHolder_0->mList[i_0].fabricSensitiveCharString = cleanupStrings.back()->charSpan();
-                jobject element_0_fabricSensitiveStructItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(
-                    element_0, "fabricSensitiveStruct", "Lchip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct;",
-                    element_0_fabricSensitiveStructItem_1);
-                jobject element_0_fabricSensitiveStructItem_1_aItem_2;
-                chip::JniReferences::GetInstance().GetObjectField(element_0_fabricSensitiveStructItem_1, "a", "Ljava/lang/Integer;",
-                                                                  element_0_fabricSensitiveStructItem_1_aItem_2);
-                listHolder_0->mList[i_0].fabricSensitiveStruct.a =
-                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveStruct.a)>>(
-                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricSensitiveStructItem_1_aItem_2));
-                jobject element_0_fabricSensitiveStructItem_1_bItem_2;
-                chip::JniReferences::GetInstance().GetObjectField(element_0_fabricSensitiveStructItem_1, "b", "Ljava/lang/Boolean;",
-                                                                  element_0_fabricSensitiveStructItem_1_bItem_2);
-                listHolder_0->mList[i_0].fabricSensitiveStruct.b =
-                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveStruct.b)>>(
-                        chip::JniReferences::GetInstance().BooleanToPrimitive(element_0_fabricSensitiveStructItem_1_bItem_2));
-                jobject element_0_fabricSensitiveStructItem_1_cItem_2;
-                chip::JniReferences::GetInstance().GetObjectField(element_0_fabricSensitiveStructItem_1, "c", "Ljava/lang/Integer;",
-                                                                  element_0_fabricSensitiveStructItem_1_cItem_2);
-                listHolder_0->mList[i_0].fabricSensitiveStruct.c =
-                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveStruct.c)>>(
-                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricSensitiveStructItem_1_cItem_2));
-                jobject element_0_fabricSensitiveStructItem_1_dItem_2;
-                chip::JniReferences::GetInstance().GetObjectField(element_0_fabricSensitiveStructItem_1, "d", "[B",
-                                                                  element_0_fabricSensitiveStructItem_1_dItem_2);
-                cleanupByteArrays.push_back(chip::Platform::MakeUnique<chip::JniByteArray>(
-                    env, static_cast<jbyteArray>(element_0_fabricSensitiveStructItem_1_dItem_2)));
-                listHolder_0->mList[i_0].fabricSensitiveStruct.d = cleanupByteArrays.back()->byteSpan();
-                jobject element_0_fabricSensitiveStructItem_1_eItem_2;
-                chip::JniReferences::GetInstance().GetObjectField(element_0_fabricSensitiveStructItem_1, "e", "Ljava/lang/String;",
-                                                                  element_0_fabricSensitiveStructItem_1_eItem_2);
-                cleanupStrings.push_back(chip::Platform::MakeUnique<chip::JniUtfString>(
-                    env, static_cast<jstring>(element_0_fabricSensitiveStructItem_1_eItem_2)));
-                listHolder_0->mList[i_0].fabricSensitiveStruct.e = cleanupStrings.back()->charSpan();
-                jobject element_0_fabricSensitiveStructItem_1_fItem_2;
-                chip::JniReferences::GetInstance().GetObjectField(element_0_fabricSensitiveStructItem_1, "f", "Ljava/lang/Integer;",
-                                                                  element_0_fabricSensitiveStructItem_1_fItem_2);
-                listHolder_0->mList[i_0].fabricSensitiveStruct.f =
-                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveStruct.f)>>(
-                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricSensitiveStructItem_1_fItem_2));
-                jobject element_0_fabricSensitiveStructItem_1_gItem_2;
-                chip::JniReferences::GetInstance().GetObjectField(element_0_fabricSensitiveStructItem_1, "g", "Ljava/lang/Float;",
-                                                                  element_0_fabricSensitiveStructItem_1_gItem_2);
-                listHolder_0->mList[i_0].fabricSensitiveStruct.g =
-                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveStruct.g)>>(
-                        chip::JniReferences::GetInstance().FloatToPrimitive(element_0_fabricSensitiveStructItem_1_gItem_2));
-                jobject element_0_fabricSensitiveStructItem_1_hItem_2;
-                chip::JniReferences::GetInstance().GetObjectField(element_0_fabricSensitiveStructItem_1, "h", "Ljava/lang/Double;",
-                                                                  element_0_fabricSensitiveStructItem_1_hItem_2);
-                listHolder_0->mList[i_0].fabricSensitiveStruct.h =
-                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveStruct.h)>>(
-                        chip::JniReferences::GetInstance().DoubleToPrimitive(element_0_fabricSensitiveStructItem_1_hItem_2));
-                jobject element_0_fabricSensitiveInt8uListItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricSensitiveInt8uList", "Ljava/util/ArrayList;",
-                                                                  element_0_fabricSensitiveInt8uListItem_1);
-                {
-                    using ListType_2       = std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveInt8uList)>;
-                    using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
-                    jint element_0_fabricSensitiveInt8uListItem_1Size;
-                    chip::JniReferences::GetInstance().GetListSize(element_0_fabricSensitiveInt8uListItem_1,
-                                                                   element_0_fabricSensitiveInt8uListItem_1Size);
-                    if (element_0_fabricSensitiveInt8uListItem_1Size != 0)
-                    {
-                        auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0_fabricSensitiveInt8uListItem_1Size);
-                        listFreer.add(listHolder_2);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-                        for (size_t i_2 = 0; i_2 < static_cast<size_t>(element_0_fabricSensitiveInt8uListItem_1Size); ++i_2)
-                        {
-                            jobject element_2;
-                            chip::JniReferences::GetInstance().GetListItem(element_0_fabricSensitiveInt8uListItem_1, i_2,
-                                                                           element_2);
-                            listHolder_2->mList[i_2] = static_cast<std::remove_reference_t<decltype(listHolder_2->mList[i_2])>>(
-                                chip::JniReferences::GetInstance().IntegerToPrimitive(element_2));
-                        }
-                        listHolder_0->mList[i_0].fabricSensitiveInt8uList =
-                            ListType_2(listHolder_2->mList, element_0_fabricSensitiveInt8uListItem_1Size);
-                    }
-                    else
-                    {
-                        listHolder_0->mList[i_0].fabricSensitiveInt8uList = ListType_2();
-                    }
-                }
-                jobject element_0_fabricIndexItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricIndex", "Ljava/lang/Integer;",
-                                                                  element_0_fabricIndexItem_1);
-                listHolder_0->mList[i_0].fabricIndex =
-                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricIndex)>>(
-                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricIndexItem_1));
-            }
-            cppValue = ListType_0(listHolder_0->mList, valueSize);
-        }
-        else
-        {
-            cppValue = ListType_0();
-        }
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr,
+                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+                       env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+
+    auto successFn = chip::Callback::Callback<CHIPDefaultWriteSuccessCallbackType>::FromCancelable(onSuccess->Cancel());
+    auto failureFn = chip::Callback::Callback<CHIPDefaultFailureCallbackType>::FromCancelable(onFailure->Cancel());
+
+    if (timedWriteTimeoutMs == nullptr)
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall);
+    }
+    else
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall,
+                                                   chip::JniReferences::GetInstance().IntegerToPrimitive(timedWriteTimeoutMs));
     }
+    VerifyOrReturn(
+        err == CHIP_NO_ERROR,
+        chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+
+    onSuccess.release();
+    onFailure.release();
+}
+
+JNI_METHOD(void, TestClusterCluster, writeOctetStringAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray value, jobject timedWriteTimeoutMs)
+{
+    chip::DeviceLayer::StackLock lock;
+    ListFreer listFreer;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::OctetString::TypeInfo;
+    TypeInfo::Type cppValue;
+
+    std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
+    std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
+
+    cleanupByteArrays.push_back(chip::Platform::MakeUnique<chip::JniByteArray>(env, static_cast<jbyteArray>(value)));
+    cppValue = cleanupByteArrays.back()->byteSpan();
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -6559,19 +5917,41 @@ JNI_METHOD(void, TestClusterCluster, writeListFabricScopedAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeTimedWriteBooleanAttribute)
+JNI_METHOD(void, TestClusterCluster, writeListInt8uAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::TimedWriteBoolean::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::ListInt8u::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().BooleanToPrimitive(value));
+    {
+        using ListType_0       = std::remove_reference_t<decltype(cppValue)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        jint valueSize;
+        chip::JniReferences::GetInstance().GetListSize(value, valueSize);
+        if (valueSize != 0)
+        {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(valueSize);
+            listFreer.add(listHolder_0);
+
+            for (size_t i_0 = 0; i_0 < static_cast<size_t>(valueSize); ++i_0)
+            {
+                jobject element_0;
+                chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0);
+                listHolder_0->mList[i_0] = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0])>>(
+                    chip::JniReferences::GetInstance().IntegerToPrimitive(element_0));
+            }
+            cppValue = ListType_0(listHolder_0->mList, valueSize);
+        }
+        else
+        {
+            cppValue = ListType_0();
+        }
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -6594,8 +5974,15 @@ JNI_METHOD(void, TestClusterCluster, writeTimedWriteBooleanAttribute)
     auto successFn = chip::Callback::Callback<CHIPDefaultWriteSuccessCallbackType>::FromCancelable(onSuccess->Cancel());
     auto failureFn = chip::Callback::Callback<CHIPDefaultFailureCallbackType>::FromCancelable(onFailure->Cancel());
 
-    err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall,
-                                               chip::JniReferences::GetInstance().IntegerToPrimitive(timedWriteTimeoutMs));
+    if (timedWriteTimeoutMs == nullptr)
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall);
+    }
+    else
+    {
+        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall,
+                                                   chip::JniReferences::GetInstance().IntegerToPrimitive(timedWriteTimeoutMs));
+    }
     VerifyOrReturn(
         err == CHIP_NO_ERROR,
         chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error writing attribute", err));
@@ -6604,19 +5991,42 @@ JNI_METHOD(void, TestClusterCluster, writeTimedWriteBooleanAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeGeneralErrorBooleanAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+JNI_METHOD(void, TestClusterCluster, writeListOctetStringAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::GeneralErrorBoolean::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::ListOctetString::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().BooleanToPrimitive(value));
+    {
+        using ListType_0       = std::remove_reference_t<decltype(cppValue)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        jint valueSize;
+        chip::JniReferences::GetInstance().GetListSize(value, valueSize);
+        if (valueSize != 0)
+        {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(valueSize);
+            listFreer.add(listHolder_0);
+
+            for (size_t i_0 = 0; i_0 < static_cast<size_t>(valueSize); ++i_0)
+            {
+                jobject element_0;
+                chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0);
+                cleanupByteArrays.push_back(
+                    chip::Platform::MakeUnique<chip::JniByteArray>(env, static_cast<jbyteArray>(element_0)));
+                listHolder_0->mList[i_0] = cleanupByteArrays.back()->byteSpan();
+            }
+            cppValue = ListType_0(listHolder_0->mList, valueSize);
+        }
+        else
+        {
+            cppValue = ListType_0();
+        }
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -6656,19 +6066,49 @@ JNI_METHOD(void, TestClusterCluster, writeGeneralErrorBooleanAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeClusterErrorBooleanAttribute)
+JNI_METHOD(void, TestClusterCluster, writeListStructOctetStringAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::ClusterErrorBoolean::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::ListStructOctetString::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().BooleanToPrimitive(value));
+    {
+        using ListType_0       = std::remove_reference_t<decltype(cppValue)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        jint valueSize;
+        chip::JniReferences::GetInstance().GetListSize(value, valueSize);
+        if (valueSize != 0)
+        {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(valueSize);
+            listFreer.add(listHolder_0);
+
+            for (size_t i_0 = 0; i_0 < static_cast<size_t>(valueSize); ++i_0)
+            {
+                jobject element_0;
+                chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0);
+                jobject element_0_member1Item_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "member1", "Ljava/lang/Long;",
+                                                                  element_0_member1Item_1);
+                listHolder_0->mList[i_0].member1 = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].member1)>>(
+                    chip::JniReferences::GetInstance().LongToPrimitive(element_0_member1Item_1));
+                jobject element_0_member2Item_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "member2", "[B", element_0_member2Item_1);
+                cleanupByteArrays.push_back(
+                    chip::Platform::MakeUnique<chip::JniByteArray>(env, static_cast<jbyteArray>(element_0_member2Item_1)));
+                listHolder_0->mList[i_0].member2 = cleanupByteArrays.back()->byteSpan();
+            }
+            cppValue = ListType_0(listHolder_0->mList, valueSize);
+        }
+        else
+        {
+            cppValue = ListType_0();
+        }
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -6708,19 +6148,19 @@ JNI_METHOD(void, TestClusterCluster, writeClusterErrorBooleanAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeUnsupportedAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+JNI_METHOD(void, TestClusterCluster, writeLongOctetStringAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Unsupported::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::LongOctetString::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().BooleanToPrimitive(value));
+    cleanupByteArrays.push_back(chip::Platform::MakeUnique<chip::JniByteArray>(env, static_cast<jbyteArray>(value)));
+    cppValue = cleanupByteArrays.back()->byteSpan();
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -6760,27 +6200,19 @@ JNI_METHOD(void, TestClusterCluster, writeUnsupportedAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableBooleanAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+JNI_METHOD(void, TestClusterCluster, writeCharStringAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableBoolean::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::CharString::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().BooleanToPrimitive(value));
-    }
+    cleanupStrings.push_back(chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(value)));
+    cppValue = cleanupStrings.back()->charSpan();
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -6820,27 +6252,19 @@ JNI_METHOD(void, TestClusterCluster, writeNullableBooleanAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableBitmap8Attribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+JNI_METHOD(void, TestClusterCluster, writeLongCharStringAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableBitmap8::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::LongCharString::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
-    }
+    cleanupStrings.push_back(chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(value)));
+    cppValue = cleanupStrings.back()->charSpan();
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -6880,27 +6304,18 @@ JNI_METHOD(void, TestClusterCluster, writeNullableBitmap8Attribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableBitmap16Attribute)
+JNI_METHOD(void, TestClusterCluster, writeEpochUsAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableBitmap16::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::EpochUs::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
-    }
+    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -6940,27 +6355,18 @@ JNI_METHOD(void, TestClusterCluster, writeNullableBitmap16Attribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableBitmap32Attribute)
+JNI_METHOD(void, TestClusterCluster, writeEpochSAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableBitmap32::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::EpochS::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().LongToPrimitive(value));
-    }
+    cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().LongToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -7000,27 +6406,19 @@ JNI_METHOD(void, TestClusterCluster, writeNullableBitmap32Attribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableBitmap64Attribute)
+JNI_METHOD(void, TestClusterCluster, writeVendorIdAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableBitmap64::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::VendorId::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().LongToPrimitive(value));
-    }
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -7056,30 +6454,429 @@ JNI_METHOD(void, TestClusterCluster, writeNullableBitmap64Attribute)
         err == CHIP_NO_ERROR,
         chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
-    onSuccess.release();
-    onFailure.release();
-}
+    onSuccess.release();
+    onFailure.release();
+}
+
+JNI_METHOD(void, TestClusterCluster, writeListNullablesAndOptionalsStructAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+{
+    chip::DeviceLayer::StackLock lock;
+    ListFreer listFreer;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::ListNullablesAndOptionalsStruct::TypeInfo;
+    TypeInfo::Type cppValue;
+
+    std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
+    std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
+
+    {
+        using ListType_0       = std::remove_reference_t<decltype(cppValue)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        jint valueSize;
+        chip::JniReferences::GetInstance().GetListSize(value, valueSize);
+        if (valueSize != 0)
+        {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(valueSize);
+            listFreer.add(listHolder_0);
+
+            for (size_t i_0 = 0; i_0 < static_cast<size_t>(valueSize); ++i_0)
+            {
+                jobject element_0;
+                chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0);
+                jobject element_0_nullableIntItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "nullableInt", "Ljava/lang/Integer;",
+                                                                  element_0_nullableIntItem_1);
+                if (element_0_nullableIntItem_1 == nullptr)
+                {
+                    listHolder_0->mList[i_0].nullableInt.SetNull();
+                }
+                else
+                {
+                    auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableInt.SetNonNull();
+                    nonNullValue_2        = static_cast<std::remove_reference_t<decltype(nonNullValue_2)>>(
+                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_nullableIntItem_1));
+                }
+                jobject element_0_optionalIntItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "optionalInt", "Ljava/util/Optional;",
+                                                                  element_0_optionalIntItem_1);
+                if (element_0_optionalIntItem_1 != nullptr)
+                {
+                    jobject optionalValue_2;
+                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_optionalIntItem_1, optionalValue_2);
+                    if (optionalValue_2 != nullptr)
+                    {
+                        auto & definedValue_2 = listHolder_0->mList[i_0].optionalInt.Emplace();
+                        definedValue_2        = static_cast<std::remove_reference_t<decltype(definedValue_2)>>(
+                            chip::JniReferences::GetInstance().IntegerToPrimitive(optionalValue_2));
+                    }
+                }
+                jobject element_0_nullableOptionalIntItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "nullableOptionalInt", "Ljava/util/Optional;",
+                                                                  element_0_nullableOptionalIntItem_1);
+                if (element_0_nullableOptionalIntItem_1 != nullptr)
+                {
+                    jobject optionalValue_2;
+                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_nullableOptionalIntItem_1, optionalValue_2);
+                    if (optionalValue_2 != nullptr)
+                    {
+                        auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalInt.Emplace();
+                        if (optionalValue_2 == nullptr)
+                        {
+                            definedValue_2.SetNull();
+                        }
+                        else
+                        {
+                            auto & nonNullValue_3 = definedValue_2.SetNonNull();
+                            nonNullValue_3        = static_cast<std::remove_reference_t<decltype(nonNullValue_3)>>(
+                                chip::JniReferences::GetInstance().IntegerToPrimitive(optionalValue_2));
+                        }
+                    }
+                }
+                jobject element_0_nullableStringItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "nullableString", "Ljava/lang/String;",
+                                                                  element_0_nullableStringItem_1);
+                if (element_0_nullableStringItem_1 == nullptr)
+                {
+                    listHolder_0->mList[i_0].nullableString.SetNull();
+                }
+                else
+                {
+                    auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableString.SetNonNull();
+                    cleanupStrings.push_back(
+                        chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(element_0_nullableStringItem_1)));
+                    nonNullValue_2 = cleanupStrings.back()->charSpan();
+                }
+                jobject element_0_optionalStringItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "optionalString", "Ljava/util/Optional;",
+                                                                  element_0_optionalStringItem_1);
+                if (element_0_optionalStringItem_1 != nullptr)
+                {
+                    jobject optionalValue_2;
+                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_optionalStringItem_1, optionalValue_2);
+                    if (optionalValue_2 != nullptr)
+                    {
+                        auto & definedValue_2 = listHolder_0->mList[i_0].optionalString.Emplace();
+                        cleanupStrings.push_back(
+                            chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(optionalValue_2)));
+                        definedValue_2 = cleanupStrings.back()->charSpan();
+                    }
+                }
+                jobject element_0_nullableOptionalStringItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "nullableOptionalString", "Ljava/util/Optional;",
+                                                                  element_0_nullableOptionalStringItem_1);
+                if (element_0_nullableOptionalStringItem_1 != nullptr)
+                {
+                    jobject optionalValue_2;
+                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_nullableOptionalStringItem_1, optionalValue_2);
+                    if (optionalValue_2 != nullptr)
+                    {
+                        auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalString.Emplace();
+                        if (optionalValue_2 == nullptr)
+                        {
+                            definedValue_2.SetNull();
+                        }
+                        else
+                        {
+                            auto & nonNullValue_3 = definedValue_2.SetNonNull();
+                            cleanupStrings.push_back(
+                                chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(optionalValue_2)));
+                            nonNullValue_3 = cleanupStrings.back()->charSpan();
+                        }
+                    }
+                }
+                jobject element_0_nullableStructItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(
+                    element_0, "nullableStruct", "Lchip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct;",
+                    element_0_nullableStructItem_1);
+                if (element_0_nullableStructItem_1 == nullptr)
+                {
+                    listHolder_0->mList[i_0].nullableStruct.SetNull();
+                }
+                else
+                {
+                    auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableStruct.SetNonNull();
+                    jobject element_0_nullableStructItem_1_aItem_3;
+                    chip::JniReferences::GetInstance().GetObjectField(element_0_nullableStructItem_1, "a", "Ljava/lang/Integer;",
+                                                                      element_0_nullableStructItem_1_aItem_3);
+                    nonNullValue_2.a = static_cast<std::remove_reference_t<decltype(nonNullValue_2.a)>>(
+                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_nullableStructItem_1_aItem_3));
+                    jobject element_0_nullableStructItem_1_bItem_3;
+                    chip::JniReferences::GetInstance().GetObjectField(element_0_nullableStructItem_1, "b", "Ljava/lang/Boolean;",
+                                                                      element_0_nullableStructItem_1_bItem_3);
+                    nonNullValue_2.b = static_cast<std::remove_reference_t<decltype(nonNullValue_2.b)>>(
+                        chip::JniReferences::GetInstance().BooleanToPrimitive(element_0_nullableStructItem_1_bItem_3));
+                    jobject element_0_nullableStructItem_1_cItem_3;
+                    chip::JniReferences::GetInstance().GetObjectField(element_0_nullableStructItem_1, "c", "Ljava/lang/Integer;",
+                                                                      element_0_nullableStructItem_1_cItem_3);
+                    nonNullValue_2.c = static_cast<std::remove_reference_t<decltype(nonNullValue_2.c)>>(
+                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_nullableStructItem_1_cItem_3));
+                    jobject element_0_nullableStructItem_1_dItem_3;
+                    chip::JniReferences::GetInstance().GetObjectField(element_0_nullableStructItem_1, "d", "[B",
+                                                                      element_0_nullableStructItem_1_dItem_3);
+                    cleanupByteArrays.push_back(chip::Platform::MakeUnique<chip::JniByteArray>(
+                        env, static_cast<jbyteArray>(element_0_nullableStructItem_1_dItem_3)));
+                    nonNullValue_2.d = cleanupByteArrays.back()->byteSpan();
+                    jobject element_0_nullableStructItem_1_eItem_3;
+                    chip::JniReferences::GetInstance().GetObjectField(element_0_nullableStructItem_1, "e", "Ljava/lang/String;",
+                                                                      element_0_nullableStructItem_1_eItem_3);
+                    cleanupStrings.push_back(chip::Platform::MakeUnique<chip::JniUtfString>(
+                        env, static_cast<jstring>(element_0_nullableStructItem_1_eItem_3)));
+                    nonNullValue_2.e = cleanupStrings.back()->charSpan();
+                    jobject element_0_nullableStructItem_1_fItem_3;
+                    chip::JniReferences::GetInstance().GetObjectField(element_0_nullableStructItem_1, "f", "Ljava/lang/Integer;",
+                                                                      element_0_nullableStructItem_1_fItem_3);
+                    nonNullValue_2.f = static_cast<std::remove_reference_t<decltype(nonNullValue_2.f)>>(
+                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_nullableStructItem_1_fItem_3));
+                    jobject element_0_nullableStructItem_1_gItem_3;
+                    chip::JniReferences::GetInstance().GetObjectField(element_0_nullableStructItem_1, "g", "Ljava/lang/Float;",
+                                                                      element_0_nullableStructItem_1_gItem_3);
+                    nonNullValue_2.g = static_cast<std::remove_reference_t<decltype(nonNullValue_2.g)>>(
+                        chip::JniReferences::GetInstance().FloatToPrimitive(element_0_nullableStructItem_1_gItem_3));
+                    jobject element_0_nullableStructItem_1_hItem_3;
+                    chip::JniReferences::GetInstance().GetObjectField(element_0_nullableStructItem_1, "h", "Ljava/lang/Double;",
+                                                                      element_0_nullableStructItem_1_hItem_3);
+                    nonNullValue_2.h = static_cast<std::remove_reference_t<decltype(nonNullValue_2.h)>>(
+                        chip::JniReferences::GetInstance().DoubleToPrimitive(element_0_nullableStructItem_1_hItem_3));
+                }
+                jobject element_0_optionalStructItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "optionalStruct", "Ljava/util/Optional;",
+                                                                  element_0_optionalStructItem_1);
+                if (element_0_optionalStructItem_1 != nullptr)
+                {
+                    jobject optionalValue_2;
+                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_optionalStructItem_1, optionalValue_2);
+                    if (optionalValue_2 != nullptr)
+                    {
+                        auto & definedValue_2 = listHolder_0->mList[i_0].optionalStruct.Emplace();
+                        jobject optionalValue_2_aItem_3;
+                        chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "a", "Ljava/lang/Integer;",
+                                                                          optionalValue_2_aItem_3);
+                        definedValue_2.a = static_cast<std::remove_reference_t<decltype(definedValue_2.a)>>(
+                            chip::JniReferences::GetInstance().IntegerToPrimitive(optionalValue_2_aItem_3));
+                        jobject optionalValue_2_bItem_3;
+                        chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "b", "Ljava/lang/Boolean;",
+                                                                          optionalValue_2_bItem_3);
+                        definedValue_2.b = static_cast<std::remove_reference_t<decltype(definedValue_2.b)>>(
+                            chip::JniReferences::GetInstance().BooleanToPrimitive(optionalValue_2_bItem_3));
+                        jobject optionalValue_2_cItem_3;
+                        chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "c", "Ljava/lang/Integer;",
+                                                                          optionalValue_2_cItem_3);
+                        definedValue_2.c = static_cast<std::remove_reference_t<decltype(definedValue_2.c)>>(
+                            chip::JniReferences::GetInstance().IntegerToPrimitive(optionalValue_2_cItem_3));
+                        jobject optionalValue_2_dItem_3;
+                        chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "d", "[B", optionalValue_2_dItem_3);
+                        cleanupByteArrays.push_back(
+                            chip::Platform::MakeUnique<chip::JniByteArray>(env, static_cast<jbyteArray>(optionalValue_2_dItem_3)));
+                        definedValue_2.d = cleanupByteArrays.back()->byteSpan();
+                        jobject optionalValue_2_eItem_3;
+                        chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "e", "Ljava/lang/String;",
+                                                                          optionalValue_2_eItem_3);
+                        cleanupStrings.push_back(
+                            chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(optionalValue_2_eItem_3)));
+                        definedValue_2.e = cleanupStrings.back()->charSpan();
+                        jobject optionalValue_2_fItem_3;
+                        chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "f", "Ljava/lang/Integer;",
+                                                                          optionalValue_2_fItem_3);
+                        definedValue_2.f = static_cast<std::remove_reference_t<decltype(definedValue_2.f)>>(
+                            chip::JniReferences::GetInstance().IntegerToPrimitive(optionalValue_2_fItem_3));
+                        jobject optionalValue_2_gItem_3;
+                        chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "g", "Ljava/lang/Float;",
+                                                                          optionalValue_2_gItem_3);
+                        definedValue_2.g = static_cast<std::remove_reference_t<decltype(definedValue_2.g)>>(
+                            chip::JniReferences::GetInstance().FloatToPrimitive(optionalValue_2_gItem_3));
+                        jobject optionalValue_2_hItem_3;
+                        chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "h", "Ljava/lang/Double;",
+                                                                          optionalValue_2_hItem_3);
+                        definedValue_2.h = static_cast<std::remove_reference_t<decltype(definedValue_2.h)>>(
+                            chip::JniReferences::GetInstance().DoubleToPrimitive(optionalValue_2_hItem_3));
+                    }
+                }
+                jobject element_0_nullableOptionalStructItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "nullableOptionalStruct", "Ljava/util/Optional;",
+                                                                  element_0_nullableOptionalStructItem_1);
+                if (element_0_nullableOptionalStructItem_1 != nullptr)
+                {
+                    jobject optionalValue_2;
+                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_nullableOptionalStructItem_1, optionalValue_2);
+                    if (optionalValue_2 != nullptr)
+                    {
+                        auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalStruct.Emplace();
+                        if (optionalValue_2 == nullptr)
+                        {
+                            definedValue_2.SetNull();
+                        }
+                        else
+                        {
+                            auto & nonNullValue_3 = definedValue_2.SetNonNull();
+                            jobject optionalValue_2_aItem_4;
+                            chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "a", "Ljava/lang/Integer;",
+                                                                              optionalValue_2_aItem_4);
+                            nonNullValue_3.a = static_cast<std::remove_reference_t<decltype(nonNullValue_3.a)>>(
+                                chip::JniReferences::GetInstance().IntegerToPrimitive(optionalValue_2_aItem_4));
+                            jobject optionalValue_2_bItem_4;
+                            chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "b", "Ljava/lang/Boolean;",
+                                                                              optionalValue_2_bItem_4);
+                            nonNullValue_3.b = static_cast<std::remove_reference_t<decltype(nonNullValue_3.b)>>(
+                                chip::JniReferences::GetInstance().BooleanToPrimitive(optionalValue_2_bItem_4));
+                            jobject optionalValue_2_cItem_4;
+                            chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "c", "Ljava/lang/Integer;",
+                                                                              optionalValue_2_cItem_4);
+                            nonNullValue_3.c = static_cast<std::remove_reference_t<decltype(nonNullValue_3.c)>>(
+                                chip::JniReferences::GetInstance().IntegerToPrimitive(optionalValue_2_cItem_4));
+                            jobject optionalValue_2_dItem_4;
+                            chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "d", "[B", optionalValue_2_dItem_4);
+                            cleanupByteArrays.push_back(chip::Platform::MakeUnique<chip::JniByteArray>(
+                                env, static_cast<jbyteArray>(optionalValue_2_dItem_4)));
+                            nonNullValue_3.d = cleanupByteArrays.back()->byteSpan();
+                            jobject optionalValue_2_eItem_4;
+                            chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "e", "Ljava/lang/String;",
+                                                                              optionalValue_2_eItem_4);
+                            cleanupStrings.push_back(
+                                chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(optionalValue_2_eItem_4)));
+                            nonNullValue_3.e = cleanupStrings.back()->charSpan();
+                            jobject optionalValue_2_fItem_4;
+                            chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "f", "Ljava/lang/Integer;",
+                                                                              optionalValue_2_fItem_4);
+                            nonNullValue_3.f = static_cast<std::remove_reference_t<decltype(nonNullValue_3.f)>>(
+                                chip::JniReferences::GetInstance().IntegerToPrimitive(optionalValue_2_fItem_4));
+                            jobject optionalValue_2_gItem_4;
+                            chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "g", "Ljava/lang/Float;",
+                                                                              optionalValue_2_gItem_4);
+                            nonNullValue_3.g = static_cast<std::remove_reference_t<decltype(nonNullValue_3.g)>>(
+                                chip::JniReferences::GetInstance().FloatToPrimitive(optionalValue_2_gItem_4));
+                            jobject optionalValue_2_hItem_4;
+                            chip::JniReferences::GetInstance().GetObjectField(optionalValue_2, "h", "Ljava/lang/Double;",
+                                                                              optionalValue_2_hItem_4);
+                            nonNullValue_3.h = static_cast<std::remove_reference_t<decltype(nonNullValue_3.h)>>(
+                                chip::JniReferences::GetInstance().DoubleToPrimitive(optionalValue_2_hItem_4));
+                        }
+                    }
+                }
+                jobject element_0_nullableListItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "nullableList", "Ljava/util/ArrayList;",
+                                                                  element_0_nullableListItem_1);
+                if (element_0_nullableListItem_1 == nullptr)
+                {
+                    listHolder_0->mList[i_0].nullableList.SetNull();
+                }
+                else
+                {
+                    auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableList.SetNonNull();
+                    {
+                        using ListType_3       = std::remove_reference_t<decltype(nonNullValue_2)>;
+                        using ListMemberType_3 = ListMemberTypeGetter<ListType_3>::Type;
+                        jint element_0_nullableListItem_1Size;
+                        chip::JniReferences::GetInstance().GetListSize(element_0_nullableListItem_1,
+                                                                       element_0_nullableListItem_1Size);
+                        if (element_0_nullableListItem_1Size != 0)
+                        {
+                            auto * listHolder_3 = new ListHolder<ListMemberType_3>(element_0_nullableListItem_1Size);
+                            listFreer.add(listHolder_3);
 
-JNI_METHOD(void, TestClusterCluster, writeNullableInt8uAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
-{
-    chip::DeviceLayer::StackLock lock;
-    ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt8u::TypeInfo;
-    TypeInfo::Type cppValue;
+                            for (size_t i_3 = 0; i_3 < static_cast<size_t>(element_0_nullableListItem_1Size); ++i_3)
+                            {
+                                jobject element_3;
+                                chip::JniReferences::GetInstance().GetListItem(element_0_nullableListItem_1, i_3, element_3);
+                                listHolder_3->mList[i_3] = static_cast<std::remove_reference_t<decltype(listHolder_3->mList[i_3])>>(
+                                    chip::JniReferences::GetInstance().IntegerToPrimitive(element_3));
+                            }
+                            nonNullValue_2 = ListType_3(listHolder_3->mList, element_0_nullableListItem_1Size);
+                        }
+                        else
+                        {
+                            nonNullValue_2 = ListType_3();
+                        }
+                    }
+                }
+                jobject element_0_optionalListItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "optionalList", "Ljava/util/Optional;",
+                                                                  element_0_optionalListItem_1);
+                if (element_0_optionalListItem_1 != nullptr)
+                {
+                    jobject optionalValue_2;
+                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_optionalListItem_1, optionalValue_2);
+                    if (optionalValue_2 != nullptr)
+                    {
+                        auto & definedValue_2 = listHolder_0->mList[i_0].optionalList.Emplace();
+                        {
+                            using ListType_3       = std::remove_reference_t<decltype(definedValue_2)>;
+                            using ListMemberType_3 = ListMemberTypeGetter<ListType_3>::Type;
+                            jint optionalValue_2Size;
+                            chip::JniReferences::GetInstance().GetListSize(optionalValue_2, optionalValue_2Size);
+                            if (optionalValue_2Size != 0)
+                            {
+                                auto * listHolder_3 = new ListHolder<ListMemberType_3>(optionalValue_2Size);
+                                listFreer.add(listHolder_3);
 
-    std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
-    std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
+                                for (size_t i_3 = 0; i_3 < static_cast<size_t>(optionalValue_2Size); ++i_3)
+                                {
+                                    jobject element_3;
+                                    chip::JniReferences::GetInstance().GetListItem(optionalValue_2, i_3, element_3);
+                                    listHolder_3->mList[i_3] =
+                                        static_cast<std::remove_reference_t<decltype(listHolder_3->mList[i_3])>>(
+                                            chip::JniReferences::GetInstance().IntegerToPrimitive(element_3));
+                                }
+                                definedValue_2 = ListType_3(listHolder_3->mList, optionalValue_2Size);
+                            }
+                            else
+                            {
+                                definedValue_2 = ListType_3();
+                            }
+                        }
+                    }
+                }
+                jobject element_0_nullableOptionalListItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "nullableOptionalList", "Ljava/util/Optional;",
+                                                                  element_0_nullableOptionalListItem_1);
+                if (element_0_nullableOptionalListItem_1 != nullptr)
+                {
+                    jobject optionalValue_2;
+                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_nullableOptionalListItem_1, optionalValue_2);
+                    if (optionalValue_2 != nullptr)
+                    {
+                        auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalList.Emplace();
+                        if (optionalValue_2 == nullptr)
+                        {
+                            definedValue_2.SetNull();
+                        }
+                        else
+                        {
+                            auto & nonNullValue_3 = definedValue_2.SetNonNull();
+                            {
+                                using ListType_4       = std::remove_reference_t<decltype(nonNullValue_3)>;
+                                using ListMemberType_4 = ListMemberTypeGetter<ListType_4>::Type;
+                                jint optionalValue_2Size;
+                                chip::JniReferences::GetInstance().GetListSize(optionalValue_2, optionalValue_2Size);
+                                if (optionalValue_2Size != 0)
+                                {
+                                    auto * listHolder_4 = new ListHolder<ListMemberType_4>(optionalValue_2Size);
+                                    listFreer.add(listHolder_4);
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+                                    for (size_t i_4 = 0; i_4 < static_cast<size_t>(optionalValue_2Size); ++i_4)
+                                    {
+                                        jobject element_4;
+                                        chip::JniReferences::GetInstance().GetListItem(optionalValue_2, i_4, element_4);
+                                        listHolder_4->mList[i_4] =
+                                            static_cast<std::remove_reference_t<decltype(listHolder_4->mList[i_4])>>(
+                                                chip::JniReferences::GetInstance().IntegerToPrimitive(element_4));
+                                    }
+                                    nonNullValue_3 = ListType_4(listHolder_4->mList, optionalValue_2Size);
+                                }
+                                else
+                                {
+                                    nonNullValue_3 = ListType_4();
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            cppValue = ListType_0(listHolder_0->mList, valueSize);
+        }
+        else
+        {
+            cppValue = ListType_0();
+        }
     }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
@@ -7120,27 +6917,19 @@ JNI_METHOD(void, TestClusterCluster, writeNullableInt8uAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableInt16uAttribute)
+JNI_METHOD(void, TestClusterCluster, writeEnumAttrAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt16u::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::EnumAttr::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
-    }
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -7180,27 +6969,19 @@ JNI_METHOD(void, TestClusterCluster, writeNullableInt16uAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableInt24uAttribute)
+JNI_METHOD(void, TestClusterCluster, writeRangeRestrictedInt8uAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt24u::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::RangeRestrictedInt8u::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().LongToPrimitive(value));
-    }
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -7240,27 +7021,19 @@ JNI_METHOD(void, TestClusterCluster, writeNullableInt24uAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableInt32uAttribute)
+JNI_METHOD(void, TestClusterCluster, writeRangeRestrictedInt8sAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt32u::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::RangeRestrictedInt8s::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().LongToPrimitive(value));
-    }
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -7300,27 +7073,19 @@ JNI_METHOD(void, TestClusterCluster, writeNullableInt32uAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableInt40uAttribute)
+JNI_METHOD(void, TestClusterCluster, writeRangeRestrictedInt16uAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt40u::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::RangeRestrictedInt16u::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().LongToPrimitive(value));
-    }
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -7360,27 +7125,19 @@ JNI_METHOD(void, TestClusterCluster, writeNullableInt40uAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableInt48uAttribute)
+JNI_METHOD(void, TestClusterCluster, writeRangeRestrictedInt16sAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt48u::TypeInfo;
-    TypeInfo::Type cppValue;
-
-    std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
-    std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
-
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().LongToPrimitive(value));
-    }
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::RangeRestrictedInt16s::TypeInfo;
+    TypeInfo::Type cppValue;
+
+    std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
+    std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
+
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -7420,26 +7177,41 @@ JNI_METHOD(void, TestClusterCluster, writeNullableInt48uAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableInt56uAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+JNI_METHOD(void, TestClusterCluster, writeListLongOctetStringAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt56u::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::ListLongOctetString::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
     {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().LongToPrimitive(value));
+        using ListType_0       = std::remove_reference_t<decltype(cppValue)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        jint valueSize;
+        chip::JniReferences::GetInstance().GetListSize(value, valueSize);
+        if (valueSize != 0)
+        {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(valueSize);
+            listFreer.add(listHolder_0);
+
+            for (size_t i_0 = 0; i_0 < static_cast<size_t>(valueSize); ++i_0)
+            {
+                jobject element_0;
+                chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0);
+                cleanupByteArrays.push_back(
+                    chip::Platform::MakeUnique<chip::JniByteArray>(env, static_cast<jbyteArray>(element_0)));
+                listHolder_0->mList[i_0] = cleanupByteArrays.back()->byteSpan();
+            }
+            cppValue = ListType_0(listHolder_0->mList, valueSize);
+        }
+        else
+        {
+            cppValue = ListType_0();
+        }
     }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
@@ -7480,26 +7252,190 @@ JNI_METHOD(void, TestClusterCluster, writeNullableInt56uAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableInt64uAttribute)
+JNI_METHOD(void, TestClusterCluster, writeListFabricScopedAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt64u::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::ListFabricScoped::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
     {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().LongToPrimitive(value));
+        using ListType_0       = std::remove_reference_t<decltype(cppValue)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        jint valueSize;
+        chip::JniReferences::GetInstance().GetListSize(value, valueSize);
+        if (valueSize != 0)
+        {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(valueSize);
+            listFreer.add(listHolder_0);
+
+            for (size_t i_0 = 0; i_0 < static_cast<size_t>(valueSize); ++i_0)
+            {
+                jobject element_0;
+                chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0);
+                jobject element_0_fabricSensitiveInt8uItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricSensitiveInt8u", "Ljava/lang/Integer;",
+                                                                  element_0_fabricSensitiveInt8uItem_1);
+                listHolder_0->mList[i_0].fabricSensitiveInt8u =
+                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveInt8u)>>(
+                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricSensitiveInt8uItem_1));
+                jobject element_0_optionalFabricSensitiveInt8uItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "optionalFabricSensitiveInt8u", "Ljava/util/Optional;",
+                                                                  element_0_optionalFabricSensitiveInt8uItem_1);
+                if (element_0_optionalFabricSensitiveInt8uItem_1 != nullptr)
+                {
+                    jobject optionalValue_2;
+                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_optionalFabricSensitiveInt8uItem_1,
+                                                                        optionalValue_2);
+                    if (optionalValue_2 != nullptr)
+                    {
+                        auto & definedValue_2 = listHolder_0->mList[i_0].optionalFabricSensitiveInt8u.Emplace();
+                        definedValue_2        = static_cast<std::remove_reference_t<decltype(definedValue_2)>>(
+                            chip::JniReferences::GetInstance().IntegerToPrimitive(optionalValue_2));
+                    }
+                }
+                jobject element_0_nullableFabricSensitiveInt8uItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "nullableFabricSensitiveInt8u", "Ljava/lang/Integer;",
+                                                                  element_0_nullableFabricSensitiveInt8uItem_1);
+                if (element_0_nullableFabricSensitiveInt8uItem_1 == nullptr)
+                {
+                    listHolder_0->mList[i_0].nullableFabricSensitiveInt8u.SetNull();
+                }
+                else
+                {
+                    auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableFabricSensitiveInt8u.SetNonNull();
+                    nonNullValue_2        = static_cast<std::remove_reference_t<decltype(nonNullValue_2)>>(
+                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_nullableFabricSensitiveInt8uItem_1));
+                }
+                jobject element_0_nullableOptionalFabricSensitiveInt8uItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "nullableOptionalFabricSensitiveInt8u",
+                                                                  "Ljava/util/Optional;",
+                                                                  element_0_nullableOptionalFabricSensitiveInt8uItem_1);
+                if (element_0_nullableOptionalFabricSensitiveInt8uItem_1 != nullptr)
+                {
+                    jobject optionalValue_2;
+                    chip::JniReferences::GetInstance().GetOptionalValue(element_0_nullableOptionalFabricSensitiveInt8uItem_1,
+                                                                        optionalValue_2);
+                    if (optionalValue_2 != nullptr)
+                    {
+                        auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalFabricSensitiveInt8u.Emplace();
+                        if (optionalValue_2 == nullptr)
+                        {
+                            definedValue_2.SetNull();
+                        }
+                        else
+                        {
+                            auto & nonNullValue_3 = definedValue_2.SetNonNull();
+                            nonNullValue_3        = static_cast<std::remove_reference_t<decltype(nonNullValue_3)>>(
+                                chip::JniReferences::GetInstance().IntegerToPrimitive(optionalValue_2));
+                        }
+                    }
+                }
+                jobject element_0_fabricSensitiveCharStringItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricSensitiveCharString", "Ljava/lang/String;",
+                                                                  element_0_fabricSensitiveCharStringItem_1);
+                cleanupStrings.push_back(chip::Platform::MakeUnique<chip::JniUtfString>(
+                    env, static_cast<jstring>(element_0_fabricSensitiveCharStringItem_1)));
+                listHolder_0->mList[i_0].fabricSensitiveCharString = cleanupStrings.back()->charSpan();
+                jobject element_0_fabricSensitiveStructItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(
+                    element_0, "fabricSensitiveStruct", "Lchip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct;",
+                    element_0_fabricSensitiveStructItem_1);
+                jobject element_0_fabricSensitiveStructItem_1_aItem_2;
+                chip::JniReferences::GetInstance().GetObjectField(element_0_fabricSensitiveStructItem_1, "a", "Ljava/lang/Integer;",
+                                                                  element_0_fabricSensitiveStructItem_1_aItem_2);
+                listHolder_0->mList[i_0].fabricSensitiveStruct.a =
+                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveStruct.a)>>(
+                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricSensitiveStructItem_1_aItem_2));
+                jobject element_0_fabricSensitiveStructItem_1_bItem_2;
+                chip::JniReferences::GetInstance().GetObjectField(element_0_fabricSensitiveStructItem_1, "b", "Ljava/lang/Boolean;",
+                                                                  element_0_fabricSensitiveStructItem_1_bItem_2);
+                listHolder_0->mList[i_0].fabricSensitiveStruct.b =
+                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveStruct.b)>>(
+                        chip::JniReferences::GetInstance().BooleanToPrimitive(element_0_fabricSensitiveStructItem_1_bItem_2));
+                jobject element_0_fabricSensitiveStructItem_1_cItem_2;
+                chip::JniReferences::GetInstance().GetObjectField(element_0_fabricSensitiveStructItem_1, "c", "Ljava/lang/Integer;",
+                                                                  element_0_fabricSensitiveStructItem_1_cItem_2);
+                listHolder_0->mList[i_0].fabricSensitiveStruct.c =
+                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveStruct.c)>>(
+                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricSensitiveStructItem_1_cItem_2));
+                jobject element_0_fabricSensitiveStructItem_1_dItem_2;
+                chip::JniReferences::GetInstance().GetObjectField(element_0_fabricSensitiveStructItem_1, "d", "[B",
+                                                                  element_0_fabricSensitiveStructItem_1_dItem_2);
+                cleanupByteArrays.push_back(chip::Platform::MakeUnique<chip::JniByteArray>(
+                    env, static_cast<jbyteArray>(element_0_fabricSensitiveStructItem_1_dItem_2)));
+                listHolder_0->mList[i_0].fabricSensitiveStruct.d = cleanupByteArrays.back()->byteSpan();
+                jobject element_0_fabricSensitiveStructItem_1_eItem_2;
+                chip::JniReferences::GetInstance().GetObjectField(element_0_fabricSensitiveStructItem_1, "e", "Ljava/lang/String;",
+                                                                  element_0_fabricSensitiveStructItem_1_eItem_2);
+                cleanupStrings.push_back(chip::Platform::MakeUnique<chip::JniUtfString>(
+                    env, static_cast<jstring>(element_0_fabricSensitiveStructItem_1_eItem_2)));
+                listHolder_0->mList[i_0].fabricSensitiveStruct.e = cleanupStrings.back()->charSpan();
+                jobject element_0_fabricSensitiveStructItem_1_fItem_2;
+                chip::JniReferences::GetInstance().GetObjectField(element_0_fabricSensitiveStructItem_1, "f", "Ljava/lang/Integer;",
+                                                                  element_0_fabricSensitiveStructItem_1_fItem_2);
+                listHolder_0->mList[i_0].fabricSensitiveStruct.f =
+                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveStruct.f)>>(
+                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricSensitiveStructItem_1_fItem_2));
+                jobject element_0_fabricSensitiveStructItem_1_gItem_2;
+                chip::JniReferences::GetInstance().GetObjectField(element_0_fabricSensitiveStructItem_1, "g", "Ljava/lang/Float;",
+                                                                  element_0_fabricSensitiveStructItem_1_gItem_2);
+                listHolder_0->mList[i_0].fabricSensitiveStruct.g =
+                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveStruct.g)>>(
+                        chip::JniReferences::GetInstance().FloatToPrimitive(element_0_fabricSensitiveStructItem_1_gItem_2));
+                jobject element_0_fabricSensitiveStructItem_1_hItem_2;
+                chip::JniReferences::GetInstance().GetObjectField(element_0_fabricSensitiveStructItem_1, "h", "Ljava/lang/Double;",
+                                                                  element_0_fabricSensitiveStructItem_1_hItem_2);
+                listHolder_0->mList[i_0].fabricSensitiveStruct.h =
+                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveStruct.h)>>(
+                        chip::JniReferences::GetInstance().DoubleToPrimitive(element_0_fabricSensitiveStructItem_1_hItem_2));
+                jobject element_0_fabricSensitiveInt8uListItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricSensitiveInt8uList", "Ljava/util/ArrayList;",
+                                                                  element_0_fabricSensitiveInt8uListItem_1);
+                {
+                    using ListType_2       = std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveInt8uList)>;
+                    using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
+                    jint element_0_fabricSensitiveInt8uListItem_1Size;
+                    chip::JniReferences::GetInstance().GetListSize(element_0_fabricSensitiveInt8uListItem_1,
+                                                                   element_0_fabricSensitiveInt8uListItem_1Size);
+                    if (element_0_fabricSensitiveInt8uListItem_1Size != 0)
+                    {
+                        auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0_fabricSensitiveInt8uListItem_1Size);
+                        listFreer.add(listHolder_2);
+
+                        for (size_t i_2 = 0; i_2 < static_cast<size_t>(element_0_fabricSensitiveInt8uListItem_1Size); ++i_2)
+                        {
+                            jobject element_2;
+                            chip::JniReferences::GetInstance().GetListItem(element_0_fabricSensitiveInt8uListItem_1, i_2,
+                                                                           element_2);
+                            listHolder_2->mList[i_2] = static_cast<std::remove_reference_t<decltype(listHolder_2->mList[i_2])>>(
+                                chip::JniReferences::GetInstance().IntegerToPrimitive(element_2));
+                        }
+                        listHolder_0->mList[i_0].fabricSensitiveInt8uList =
+                            ListType_2(listHolder_2->mList, element_0_fabricSensitiveInt8uListItem_1Size);
+                    }
+                    else
+                    {
+                        listHolder_0->mList[i_0].fabricSensitiveInt8uList = ListType_2();
+                    }
+                }
+                jobject element_0_fabricIndexItem_1;
+                chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricIndex", "Ljava/lang/Integer;",
+                                                                  element_0_fabricIndexItem_1);
+                listHolder_0->mList[i_0].fabricIndex =
+                    static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricIndex)>>(
+                        chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricIndexItem_1));
+            }
+            cppValue = ListType_0(listHolder_0->mList, valueSize);
+        }
+        else
+        {
+            cppValue = ListType_0();
+        }
     }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
@@ -7540,27 +7476,19 @@ JNI_METHOD(void, TestClusterCluster, writeNullableInt64uAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableInt8sAttribute)
+JNI_METHOD(void, TestClusterCluster, writeTimedWriteBooleanAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt8s::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::TimedWriteBoolean::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
-    }
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().BooleanToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -7583,15 +7511,8 @@ JNI_METHOD(void, TestClusterCluster, writeNullableInt8sAttribute)
     auto successFn = chip::Callback::Callback<CHIPDefaultWriteSuccessCallbackType>::FromCancelable(onSuccess->Cancel());
     auto failureFn = chip::Callback::Callback<CHIPDefaultFailureCallbackType>::FromCancelable(onFailure->Cancel());
 
-    if (timedWriteTimeoutMs == nullptr)
-    {
-        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall);
-    }
-    else
-    {
-        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall,
-                                                   chip::JniReferences::GetInstance().IntegerToPrimitive(timedWriteTimeoutMs));
-    }
+    err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall,
+                                               chip::JniReferences::GetInstance().IntegerToPrimitive(timedWriteTimeoutMs));
     VerifyOrReturn(
         err == CHIP_NO_ERROR,
         chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error writing attribute", err));
@@ -7600,27 +7521,19 @@ JNI_METHOD(void, TestClusterCluster, writeNullableInt8sAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableInt16sAttribute)
+JNI_METHOD(void, TestClusterCluster, writeGeneralErrorBooleanAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt16s::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::GeneralErrorBoolean::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
-    }
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().BooleanToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -7660,27 +7573,19 @@ JNI_METHOD(void, TestClusterCluster, writeNullableInt16sAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableInt24sAttribute)
+JNI_METHOD(void, TestClusterCluster, writeClusterErrorBooleanAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt24s::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::ClusterErrorBoolean::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().LongToPrimitive(value));
-    }
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().BooleanToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -7720,27 +7625,19 @@ JNI_METHOD(void, TestClusterCluster, writeNullableInt24sAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableInt32sAttribute)
+JNI_METHOD(void, TestClusterCluster, writeUnsupportedAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt32s::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::Unsupported::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    if (value == nullptr)
-    {
-        cppValue.SetNull();
-    }
-    else
-    {
-        auto & nonNullValue_0 = cppValue.SetNonNull();
-        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().LongToPrimitive(value));
-    }
+    cppValue =
+        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().BooleanToPrimitive(value));
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -7780,12 +7677,12 @@ JNI_METHOD(void, TestClusterCluster, writeNullableInt32sAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableInt40sAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableBooleanAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt40s::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableBoolean::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -7799,7 +7696,7 @@ JNI_METHOD(void, TestClusterCluster, writeNullableInt40sAttribute)
     {
         auto & nonNullValue_0 = cppValue.SetNonNull();
         nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().LongToPrimitive(value));
+            chip::JniReferences::GetInstance().BooleanToPrimitive(value));
     }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
@@ -7840,12 +7737,12 @@ JNI_METHOD(void, TestClusterCluster, writeNullableInt40sAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableInt48sAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableBitmap8Attribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt48s::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableBitmap8::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -7859,7 +7756,7 @@ JNI_METHOD(void, TestClusterCluster, writeNullableInt48sAttribute)
     {
         auto & nonNullValue_0 = cppValue.SetNonNull();
         nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().LongToPrimitive(value));
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
     }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
@@ -7900,12 +7797,12 @@ JNI_METHOD(void, TestClusterCluster, writeNullableInt48sAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableInt56sAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableBitmap16Attribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt56s::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableBitmap16::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -7919,7 +7816,7 @@ JNI_METHOD(void, TestClusterCluster, writeNullableInt56sAttribute)
     {
         auto & nonNullValue_0 = cppValue.SetNonNull();
         nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().LongToPrimitive(value));
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
     }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
@@ -7960,12 +7857,12 @@ JNI_METHOD(void, TestClusterCluster, writeNullableInt56sAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableInt64sAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableBitmap32Attribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt64s::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableBitmap32::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -8020,12 +7917,12 @@ JNI_METHOD(void, TestClusterCluster, writeNullableInt64sAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableEnum8Attribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableBitmap64Attribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableEnum8::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableBitmap64::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -8039,7 +7936,7 @@ JNI_METHOD(void, TestClusterCluster, writeNullableEnum8Attribute)
     {
         auto & nonNullValue_0 = cppValue.SetNonNull();
         nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+            chip::JniReferences::GetInstance().LongToPrimitive(value));
     }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
@@ -8080,12 +7977,12 @@ JNI_METHOD(void, TestClusterCluster, writeNullableEnum8Attribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableEnum16Attribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableInt8uAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableEnum16::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt8u::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -8140,12 +8037,12 @@ JNI_METHOD(void, TestClusterCluster, writeNullableEnum16Attribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableFloatSingleAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableInt16uAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableFloatSingle::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt16u::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -8159,7 +8056,7 @@ JNI_METHOD(void, TestClusterCluster, writeNullableFloatSingleAttribute)
     {
         auto & nonNullValue_0 = cppValue.SetNonNull();
         nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().FloatToPrimitive(value));
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
     }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
@@ -8200,12 +8097,12 @@ JNI_METHOD(void, TestClusterCluster, writeNullableFloatSingleAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableFloatDoubleAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableInt24uAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableFloatDouble::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt24u::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -8219,7 +8116,7 @@ JNI_METHOD(void, TestClusterCluster, writeNullableFloatDoubleAttribute)
     {
         auto & nonNullValue_0 = cppValue.SetNonNull();
         nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().DoubleToPrimitive(value));
+            chip::JniReferences::GetInstance().LongToPrimitive(value));
     }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
@@ -8260,12 +8157,12 @@ JNI_METHOD(void, TestClusterCluster, writeNullableFloatDoubleAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableOctetStringAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray value, jobject timedWriteTimeoutMs)
+JNI_METHOD(void, TestClusterCluster, writeNullableInt32uAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableOctetString::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt32u::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -8278,8 +8175,8 @@ JNI_METHOD(void, TestClusterCluster, writeNullableOctetStringAttribute)
     else
     {
         auto & nonNullValue_0 = cppValue.SetNonNull();
-        cleanupByteArrays.push_back(chip::Platform::MakeUnique<chip::JniByteArray>(env, static_cast<jbyteArray>(value)));
-        nonNullValue_0 = cleanupByteArrays.back()->byteSpan();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().LongToPrimitive(value));
     }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
@@ -8320,12 +8217,12 @@ JNI_METHOD(void, TestClusterCluster, writeNullableOctetStringAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableCharStringAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value, jobject timedWriteTimeoutMs)
+JNI_METHOD(void, TestClusterCluster, writeNullableInt40uAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableCharString::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt40u::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -8338,8 +8235,8 @@ JNI_METHOD(void, TestClusterCluster, writeNullableCharStringAttribute)
     else
     {
         auto & nonNullValue_0 = cppValue.SetNonNull();
-        cleanupStrings.push_back(chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(value)));
-        nonNullValue_0 = cleanupStrings.back()->charSpan();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().LongToPrimitive(value));
     }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
@@ -8380,12 +8277,12 @@ JNI_METHOD(void, TestClusterCluster, writeNullableCharStringAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableEnumAttrAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableInt48uAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableEnumAttr::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt48u::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -8399,7 +8296,7 @@ JNI_METHOD(void, TestClusterCluster, writeNullableEnumAttrAttribute)
     {
         auto & nonNullValue_0 = cppValue.SetNonNull();
         nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+            chip::JniReferences::GetInstance().LongToPrimitive(value));
     }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
@@ -8440,12 +8337,12 @@ JNI_METHOD(void, TestClusterCluster, writeNullableEnumAttrAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableRangeRestrictedInt8uAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableInt56uAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableRangeRestrictedInt8u::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt56u::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -8459,7 +8356,7 @@ JNI_METHOD(void, TestClusterCluster, writeNullableRangeRestrictedInt8uAttribute)
     {
         auto & nonNullValue_0 = cppValue.SetNonNull();
         nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+            chip::JniReferences::GetInstance().LongToPrimitive(value));
     }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
@@ -8500,12 +8397,12 @@ JNI_METHOD(void, TestClusterCluster, writeNullableRangeRestrictedInt8uAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableRangeRestrictedInt8sAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableInt64uAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableRangeRestrictedInt8s::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt64u::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -8519,7 +8416,7 @@ JNI_METHOD(void, TestClusterCluster, writeNullableRangeRestrictedInt8sAttribute)
     {
         auto & nonNullValue_0 = cppValue.SetNonNull();
         nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
-            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+            chip::JniReferences::GetInstance().LongToPrimitive(value));
     }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
@@ -8560,12 +8457,12 @@ JNI_METHOD(void, TestClusterCluster, writeNullableRangeRestrictedInt8sAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableRangeRestrictedInt16uAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableInt8sAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableRangeRestrictedInt16u::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt8s::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -8620,12 +8517,12 @@ JNI_METHOD(void, TestClusterCluster, writeNullableRangeRestrictedInt16uAttribute
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeNullableRangeRestrictedInt16sAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableInt16sAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableRangeRestrictedInt16s::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt16s::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -8680,19 +8577,27 @@ JNI_METHOD(void, TestClusterCluster, writeNullableRangeRestrictedInt16sAttribute
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, writeOccupiedCoolingSetpointAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableInt24sAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::Thermostat::Attributes::OccupiedCoolingSetpoint::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt24s::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().LongToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -8706,8 +8611,8 @@ JNI_METHOD(void, ThermostatCluster, writeOccupiedCoolingSetpointAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
-    ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -8732,19 +8637,27 @@ JNI_METHOD(void, ThermostatCluster, writeOccupiedCoolingSetpointAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, writeOccupiedHeatingSetpointAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableInt32sAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::Thermostat::Attributes::OccupiedHeatingSetpoint::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt32s::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().LongToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -8758,8 +8671,8 @@ JNI_METHOD(void, ThermostatCluster, writeOccupiedHeatingSetpointAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
-    ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -8784,19 +8697,27 @@ JNI_METHOD(void, ThermostatCluster, writeOccupiedHeatingSetpointAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, writeMinHeatSetpointLimitAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableInt40sAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::Thermostat::Attributes::MinHeatSetpointLimit::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt40s::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().LongToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -8810,8 +8731,8 @@ JNI_METHOD(void, ThermostatCluster, writeMinHeatSetpointLimitAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
-    ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -8836,19 +8757,27 @@ JNI_METHOD(void, ThermostatCluster, writeMinHeatSetpointLimitAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, writeMaxHeatSetpointLimitAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableInt48sAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::Thermostat::Attributes::MaxHeatSetpointLimit::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt48s::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().LongToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -8862,8 +8791,8 @@ JNI_METHOD(void, ThermostatCluster, writeMaxHeatSetpointLimitAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
-    ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -8888,19 +8817,27 @@ JNI_METHOD(void, ThermostatCluster, writeMaxHeatSetpointLimitAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, writeMinCoolSetpointLimitAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableInt56sAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::Thermostat::Attributes::MinCoolSetpointLimit::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt56s::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().LongToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -8914,8 +8851,8 @@ JNI_METHOD(void, ThermostatCluster, writeMinCoolSetpointLimitAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
-    ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -8940,19 +8877,27 @@ JNI_METHOD(void, ThermostatCluster, writeMinCoolSetpointLimitAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, writeMaxCoolSetpointLimitAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableInt64sAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::Thermostat::Attributes::MaxCoolSetpointLimit::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt64s::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().LongToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -8965,9 +8910,9 @@ JNI_METHOD(void, ThermostatCluster, writeMaxCoolSetpointLimitAttribute)
     VerifyOrReturn(onFailure.get() != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
-    ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
+
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -8992,19 +8937,27 @@ JNI_METHOD(void, ThermostatCluster, writeMaxCoolSetpointLimitAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, writeMinSetpointDeadBandAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableEnum8Attribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::Thermostat::Attributes::MinSetpointDeadBand::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableEnum8::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -9018,8 +8971,8 @@ JNI_METHOD(void, ThermostatCluster, writeMinSetpointDeadBandAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
-    ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -9044,19 +8997,27 @@ JNI_METHOD(void, ThermostatCluster, writeMinSetpointDeadBandAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, writeControlSequenceOfOperationAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableEnum16Attribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::Thermostat::Attributes::ControlSequenceOfOperation::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableEnum16::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -9070,8 +9031,8 @@ JNI_METHOD(void, ThermostatCluster, writeControlSequenceOfOperationAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
-    ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -9096,19 +9057,27 @@ JNI_METHOD(void, ThermostatCluster, writeControlSequenceOfOperationAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, writeSystemModeAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableFloatSingleAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::Thermostat::Attributes::SystemMode::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableFloatSingle::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().FloatToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -9122,8 +9091,8 @@ JNI_METHOD(void, ThermostatCluster, writeSystemModeAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
-    ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -9148,19 +9117,27 @@ JNI_METHOD(void, ThermostatCluster, writeSystemModeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeTemperatureDisplayModeAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableFloatDoubleAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::TemperatureDisplayMode::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableFloatDouble::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().DoubleToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -9174,9 +9151,8 @@ JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeTemperatureDi
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    ThermostatUserInterfaceConfigurationCluster * cppCluster =
-        reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -9201,19 +9177,27 @@ JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeTemperatureDi
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeKeypadLockoutAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+JNI_METHOD(void, TestClusterCluster, writeNullableOctetStringAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::KeypadLockout::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableOctetString::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        cleanupByteArrays.push_back(chip::Platform::MakeUnique<chip::JniByteArray>(env, static_cast<jbyteArray>(value)));
+        nonNullValue_0 = cleanupByteArrays.back()->byteSpan();
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -9227,9 +9211,8 @@ JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeKeypadLockout
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    ThermostatUserInterfaceConfigurationCluster * cppCluster =
-        reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -9254,19 +9237,27 @@ JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeKeypadLockout
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeScheduleProgrammingVisibilityAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+JNI_METHOD(void, TestClusterCluster, writeNullableCharStringAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableCharString::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        cleanupStrings.push_back(chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(value)));
+        nonNullValue_0 = cleanupStrings.back()->charSpan();
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -9280,9 +9271,8 @@ JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeScheduleProgr
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    ThermostatUserInterfaceConfigurationCluster * cppCluster =
-        reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -9307,19 +9297,27 @@ JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeScheduleProgr
     onFailure.release();
 }
 
-JNI_METHOD(void, TimeFormatLocalizationCluster, writeHourFormatAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableEnumAttrAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TimeFormatLocalization::Attributes::HourFormat::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableEnumAttr::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -9333,8 +9331,8 @@ JNI_METHOD(void, TimeFormatLocalizationCluster, writeHourFormatAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
-    TimeFormatLocalizationCluster * cppCluster = reinterpret_cast<TimeFormatLocalizationCluster *>(clusterPtr);
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -9359,19 +9357,27 @@ JNI_METHOD(void, TimeFormatLocalizationCluster, writeHourFormatAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TimeFormatLocalizationCluster, writeActiveCalendarTypeAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableRangeRestrictedInt8uAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::TimeFormatLocalization::Attributes::ActiveCalendarType::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableRangeRestrictedInt8u::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -9385,8 +9391,8 @@ JNI_METHOD(void, TimeFormatLocalizationCluster, writeActiveCalendarTypeAttribute
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
-    TimeFormatLocalizationCluster * cppCluster = reinterpret_cast<TimeFormatLocalizationCluster *>(clusterPtr);
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -9411,19 +9417,27 @@ JNI_METHOD(void, TimeFormatLocalizationCluster, writeActiveCalendarTypeAttribute
     onFailure.release();
 }
 
-JNI_METHOD(void, UnitLocalizationCluster, writeTemperatureUnitAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableRangeRestrictedInt8sAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::UnitLocalization::Attributes::TemperatureUnit::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableRangeRestrictedInt8s::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -9437,8 +9451,8 @@ JNI_METHOD(void, UnitLocalizationCluster, writeTemperatureUnitAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
-    UnitLocalizationCluster * cppCluster = reinterpret_cast<UnitLocalizationCluster *>(clusterPtr);
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -9463,48 +9477,26 @@ JNI_METHOD(void, UnitLocalizationCluster, writeTemperatureUnitAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, UserLabelCluster, writeLabelListAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableRangeRestrictedInt16uAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::UserLabel::Attributes::LabelList::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableRangeRestrictedInt16u::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
+    if (value == nullptr)
     {
-        using ListType_0       = std::remove_reference_t<decltype(cppValue)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        jint valueSize;
-        chip::JniReferences::GetInstance().GetListSize(value, valueSize);
-        if (valueSize != 0)
-        {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(valueSize);
-            listFreer.add(listHolder_0);
-
-            for (size_t i_0 = 0; i_0 < static_cast<size_t>(valueSize); ++i_0)
-            {
-                jobject element_0;
-                chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0);
-                jobject element_0_labelItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "label", "Ljava/lang/String;", element_0_labelItem_1);
-                cleanupStrings.push_back(
-                    chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(element_0_labelItem_1)));
-                listHolder_0->mList[i_0].label = cleanupStrings.back()->charSpan();
-                jobject element_0_valueItem_1;
-                chip::JniReferences::GetInstance().GetObjectField(element_0, "value", "Ljava/lang/String;", element_0_valueItem_1);
-                cleanupStrings.push_back(
-                    chip::Platform::MakeUnique<chip::JniUtfString>(env, static_cast<jstring>(element_0_valueItem_1)));
-                listHolder_0->mList[i_0].value = cleanupStrings.back()->charSpan();
-            }
-            cppValue = ListType_0(listHolder_0->mList, valueSize);
-        }
-        else
-        {
-            cppValue = ListType_0();
-        }
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
     }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
@@ -9519,8 +9511,8 @@ JNI_METHOD(void, UserLabelCluster, writeLabelListAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                = CHIP_NO_ERROR;
-    UserLabelCluster * cppCluster = reinterpret_cast<UserLabelCluster *>(clusterPtr);
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -9545,19 +9537,27 @@ JNI_METHOD(void, UserLabelCluster, writeLabelListAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, writeModeAttribute)
+JNI_METHOD(void, TestClusterCluster, writeNullableRangeRestrictedInt16sAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::WindowCovering::Attributes::Mode::TypeInfo;
+    using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableRangeRestrictedInt16s::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
     std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;
 
-    cppValue =
-        static_cast<std::remove_reference_t<decltype(cppValue)>>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    if (value == nullptr)
+    {
+        cppValue.SetNull();
+    }
+    else
+    {
+        auto & nonNullValue_0 = cppValue.SetNonNull();
+        nonNullValue_0        = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(
+            chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -9571,8 +9571,8 @@ JNI_METHOD(void, WindowCoveringCluster, writeModeAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
-    WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
index c338d62132e1cd..90981fc2e2ac71 100644
--- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
+++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
@@ -29,8 +29,8 @@
 
 namespace chip {
 
-CHIPAccountLoginClusterGetSetupPINResponseCallback::CHIPAccountLoginClusterGetSetupPINResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPAccountLoginClusterGetSetupPINResponseCallbackType>(CallbackFn, this)
+CHIPGroupsClusterAddGroupResponseCallback::CHIPGroupsClusterAddGroupResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPGroupsClusterAddGroupResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -46,7 +46,7 @@ CHIPAccountLoginClusterGetSetupPINResponseCallback::CHIPAccountLoginClusterGetSe
     }
 }
 
-CHIPAccountLoginClusterGetSetupPINResponseCallback::~CHIPAccountLoginClusterGetSetupPINResponseCallback()
+CHIPGroupsClusterAddGroupResponseCallback::~CHIPGroupsClusterAddGroupResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -57,8 +57,8 @@ CHIPAccountLoginClusterGetSetupPINResponseCallback::~CHIPAccountLoginClusterGetS
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPAccountLoginClusterGetSetupPINResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::AccountLogin::Commands::GetSetupPINResponse::DecodableType & dataResponse)
+void CHIPGroupsClusterAddGroupResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -68,27 +68,34 @@ void CHIPAccountLoginClusterGetSetupPINResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPAccountLoginClusterGetSetupPINResponseCallback,
-                    void (*)(CHIPAccountLoginClusterGetSetupPINResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPAccountLoginClusterGetSetupPINResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPAccountLoginClusterGetSetupPINResponseCallback>);
+    std::unique_ptr<CHIPGroupsClusterAddGroupResponseCallback, void (*)(CHIPGroupsClusterAddGroupResponseCallback *)> cppCallback(
+        reinterpret_cast<CHIPGroupsClusterAddGroupResponseCallback *>(context),
+        chip::Platform::Delete<CHIPGroupsClusterAddGroupResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/String;)V", &javaMethod);
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/lang/Integer;)V",
+                                                  &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject setupPIN;
-    setupPIN = env->NewStringUTF(std::string(dataResponse.setupPIN.data(), dataResponse.setupPIN.size()).c_str());
+    jobject status;
+    std::string statusClassName     = "java/lang/Integer";
+    std::string statusCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
+                                                                  dataResponse.status, status);
+    jobject groupId;
+    std::string groupIdClassName     = "java/lang/Integer";
+    std::string groupIdCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(groupIdClassName.c_str(), groupIdCtorSignature.c_str(),
+                                                                   dataResponse.groupId, groupId);
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, setupPIN);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, status, groupId);
 }
-CHIPApplicationLauncherClusterLauncherResponseCallback::CHIPApplicationLauncherClusterLauncherResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPApplicationLauncherClusterLauncherResponseCallbackType>(CallbackFn, this)
+CHIPGroupsClusterViewGroupResponseCallback::CHIPGroupsClusterViewGroupResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPGroupsClusterViewGroupResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -104,7 +111,7 @@ CHIPApplicationLauncherClusterLauncherResponseCallback::CHIPApplicationLauncherC
     }
 }
 
-CHIPApplicationLauncherClusterLauncherResponseCallback::~CHIPApplicationLauncherClusterLauncherResponseCallback()
+CHIPGroupsClusterViewGroupResponseCallback::~CHIPGroupsClusterViewGroupResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -115,8 +122,8 @@ CHIPApplicationLauncherClusterLauncherResponseCallback::~CHIPApplicationLauncher
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPApplicationLauncherClusterLauncherResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType & dataResponse)
+void CHIPGroupsClusterViewGroupResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -126,34 +133,36 @@ void CHIPApplicationLauncherClusterLauncherResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPApplicationLauncherClusterLauncherResponseCallback,
-                    void (*)(CHIPApplicationLauncherClusterLauncherResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPApplicationLauncherClusterLauncherResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPApplicationLauncherClusterLauncherResponseCallback>);
+    std::unique_ptr<CHIPGroupsClusterViewGroupResponseCallback, void (*)(CHIPGroupsClusterViewGroupResponseCallback *)> cppCallback(
+        reinterpret_cast<CHIPGroupsClusterViewGroupResponseCallback *>(context),
+        chip::Platform::Delete<CHIPGroupsClusterViewGroupResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;[B)V", &javaMethod);
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess",
+                                                  "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
     jobject status;
     std::string statusClassName     = "java/lang/Integer";
     std::string statusCtorSignature = "(I)V";
     chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
-                                                                  static_cast<uint8_t>(dataResponse.status), status);
-    jobject data;
-    jbyteArray dataByteArray = env->NewByteArray(static_cast<jsize>(dataResponse.data.size()));
-    env->SetByteArrayRegion(dataByteArray, 0, static_cast<jsize>(dataResponse.data.size()),
-                            reinterpret_cast<const jbyte *>(dataResponse.data.data()));
-    data = dataByteArray;
+                                                                  dataResponse.status, status);
+    jobject groupId;
+    std::string groupIdClassName     = "java/lang/Integer";
+    std::string groupIdCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(groupIdClassName.c_str(), groupIdCtorSignature.c_str(),
+                                                                   dataResponse.groupId, groupId);
+    jobject groupName;
+    groupName = env->NewStringUTF(std::string(dataResponse.groupName.data(), dataResponse.groupName.size()).c_str());
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, status, data);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, status, groupId, groupName);
 }
-CHIPChannelClusterChangeChannelResponseCallback::CHIPChannelClusterChangeChannelResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPChannelClusterChangeChannelResponseCallbackType>(CallbackFn, this)
+CHIPGroupsClusterGetGroupMembershipResponseCallback::CHIPGroupsClusterGetGroupMembershipResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPGroupsClusterGetGroupMembershipResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -169,7 +178,7 @@ CHIPChannelClusterChangeChannelResponseCallback::CHIPChannelClusterChangeChannel
     }
 }
 
-CHIPChannelClusterChangeChannelResponseCallback::~CHIPChannelClusterChangeChannelResponseCallback()
+CHIPGroupsClusterGetGroupMembershipResponseCallback::~CHIPGroupsClusterGetGroupMembershipResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -180,8 +189,8 @@ CHIPChannelClusterChangeChannelResponseCallback::~CHIPChannelClusterChangeChanne
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPChannelClusterChangeChannelResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::Channel::Commands::ChangeChannelResponse::DecodableType & dataResponse)
+void CHIPGroupsClusterGetGroupMembershipResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -191,41 +200,51 @@ void CHIPChannelClusterChangeChannelResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPChannelClusterChangeChannelResponseCallback, void (*)(CHIPChannelClusterChangeChannelResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPChannelClusterChangeChannelResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPChannelClusterChangeChannelResponseCallback>);
+    std::unique_ptr<CHIPGroupsClusterGetGroupMembershipResponseCallback,
+                    void (*)(CHIPGroupsClusterGetGroupMembershipResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPGroupsClusterGetGroupMembershipResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPGroupsClusterGetGroupMembershipResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/util/Optional;)V",
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/util/ArrayList;)V",
                                                   &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject status;
-    std::string statusClassName     = "java/lang/Integer";
-    std::string statusCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
-                                                                  static_cast<uint8_t>(dataResponse.status), status);
-    jobject data;
-    if (!dataResponse.data.HasValue())
+    jobject capacity;
+    if (dataResponse.capacity.IsNull())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, data);
+        capacity = nullptr;
     }
     else
     {
-        jobject dataInsideOptional;
-        dataInsideOptional =
-            env->NewStringUTF(std::string(dataResponse.data.Value().data(), dataResponse.data.Value().size()).c_str());
-        chip::JniReferences::GetInstance().CreateOptional(dataInsideOptional, data);
+        std::string capacityClassName     = "java/lang/Integer";
+        std::string capacityCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(capacityClassName.c_str(), capacityCtorSignature.c_str(),
+                                                                      dataResponse.capacity.Value(), capacity);
     }
+    jobject groupList;
+    chip::JniReferences::GetInstance().CreateArrayList(groupList);
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, status, data);
+    auto iter_groupList_0 = dataResponse.groupList.begin();
+    while (iter_groupList_0.Next())
+    {
+        auto & entry_0 = iter_groupList_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Integer";
+        std::string newElement_0CtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(groupList, newElement_0);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, capacity, groupList);
 }
-CHIPContentLauncherClusterLaunchResponseCallback::CHIPContentLauncherClusterLaunchResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPContentLauncherClusterLaunchResponseCallbackType>(CallbackFn, this)
+CHIPGroupsClusterRemoveGroupResponseCallback::CHIPGroupsClusterRemoveGroupResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPGroupsClusterRemoveGroupResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -241,7 +260,7 @@ CHIPContentLauncherClusterLaunchResponseCallback::CHIPContentLauncherClusterLaun
     }
 }
 
-CHIPContentLauncherClusterLaunchResponseCallback::~CHIPContentLauncherClusterLaunchResponseCallback()
+CHIPGroupsClusterRemoveGroupResponseCallback::~CHIPGroupsClusterRemoveGroupResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -252,8 +271,8 @@ CHIPContentLauncherClusterLaunchResponseCallback::~CHIPContentLauncherClusterLau
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPContentLauncherClusterLaunchResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & dataResponse)
+void CHIPGroupsClusterRemoveGroupResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -263,16 +282,16 @@ void CHIPContentLauncherClusterLaunchResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPContentLauncherClusterLaunchResponseCallback, void (*)(CHIPContentLauncherClusterLaunchResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPContentLauncherClusterLaunchResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPContentLauncherClusterLaunchResponseCallback>);
+    std::unique_ptr<CHIPGroupsClusterRemoveGroupResponseCallback, void (*)(CHIPGroupsClusterRemoveGroupResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPGroupsClusterRemoveGroupResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPGroupsClusterRemoveGroupResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/util/Optional;)V",
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/lang/Integer;)V",
                                                   &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
@@ -280,24 +299,17 @@ void CHIPContentLauncherClusterLaunchResponseCallback::CallbackFn(
     std::string statusClassName     = "java/lang/Integer";
     std::string statusCtorSignature = "(I)V";
     chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
-                                                                  static_cast<uint8_t>(dataResponse.status), status);
-    jobject data;
-    if (!dataResponse.data.HasValue())
-    {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, data);
-    }
-    else
-    {
-        jobject dataInsideOptional;
-        dataInsideOptional =
-            env->NewStringUTF(std::string(dataResponse.data.Value().data(), dataResponse.data.Value().size()).c_str());
-        chip::JniReferences::GetInstance().CreateOptional(dataInsideOptional, data);
-    }
+                                                                  dataResponse.status, status);
+    jobject groupId;
+    std::string groupIdClassName     = "java/lang/Integer";
+    std::string groupIdCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(groupIdClassName.c_str(), groupIdCtorSignature.c_str(),
+                                                                   dataResponse.groupId, groupId);
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, status, data);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, status, groupId);
 }
-CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback::CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackType>(CallbackFn, this)
+CHIPScenesClusterAddSceneResponseCallback::CHIPScenesClusterAddSceneResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPScenesClusterAddSceneResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -313,7 +325,7 @@ CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback::CHIPDiagnosticLogsCluster
     }
 }
 
-CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback::~CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback()
+CHIPScenesClusterAddSceneResponseCallback::~CHIPScenesClusterAddSceneResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -324,8 +336,8 @@ CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback::~CHIPDiagnosticLogsCluste
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType & dataResponse)
+void CHIPScenesClusterAddSceneResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::Scenes::Commands::AddSceneResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -335,10 +347,9 @@ void CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback,
-                    void (*)(CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback>);
+    std::unique_ptr<CHIPScenesClusterAddSceneResponseCallback, void (*)(CHIPScenesClusterAddSceneResponseCallback *)> cppCallback(
+        reinterpret_cast<CHIPScenesClusterAddSceneResponseCallback *>(context),
+        chip::Platform::Delete<CHIPScenesClusterAddSceneResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
@@ -346,35 +357,29 @@ void CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback::CallbackFn(
     VerifyOrReturn(javaCallbackRef != nullptr);
 
     err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess",
-                                                  "(Ljava/lang/Integer;[BLjava/lang/Long;Ljava/lang/Long;)V", &javaMethod);
+                                                  "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject status;
-    std::string statusClassName     = "java/lang/Integer";
-    std::string statusCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
-                                                                  static_cast<uint8_t>(dataResponse.status), status);
-    jobject content;
-    jbyteArray contentByteArray = env->NewByteArray(static_cast<jsize>(dataResponse.content.size()));
-    env->SetByteArrayRegion(contentByteArray, 0, static_cast<jsize>(dataResponse.content.size()),
-                            reinterpret_cast<const jbyte *>(dataResponse.content.data()));
-    content = contentByteArray;
-    jobject timeStamp;
-    std::string timeStampClassName     = "java/lang/Long";
-    std::string timeStampCtorSignature = "(J)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(timeStampClassName.c_str(), timeStampCtorSignature.c_str(),
-                                                                   dataResponse.timeStamp, timeStamp);
-    jobject timeSinceBoot;
-    std::string timeSinceBootClassName     = "java/lang/Long";
-    std::string timeSinceBootCtorSignature = "(J)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-        timeSinceBootClassName.c_str(), timeSinceBootCtorSignature.c_str(), dataResponse.timeSinceBoot, timeSinceBoot);
+    jobject Status;
+    std::string StatusClassName     = "java/lang/Integer";
+    std::string StatusCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(StatusClassName.c_str(), StatusCtorSignature.c_str(),
+                                                                  dataResponse.status, Status);
+    jobject GroupId;
+    std::string GroupIdClassName     = "java/lang/Integer";
+    std::string GroupIdCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(GroupIdClassName.c_str(), GroupIdCtorSignature.c_str(),
+                                                                   dataResponse.groupId, GroupId);
+    jobject SceneId;
+    std::string SceneIdClassName     = "java/lang/Integer";
+    std::string SceneIdCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(SceneIdClassName.c_str(), SceneIdCtorSignature.c_str(),
+                                                                  dataResponse.sceneId, SceneId);
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, status, content, timeStamp, timeSinceBoot);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, Status, GroupId, SceneId);
 }
-CHIPDoorLockClusterGetCredentialStatusResponseCallback::CHIPDoorLockClusterGetCredentialStatusResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPDoorLockClusterGetCredentialStatusResponseCallbackType>(CallbackFn, this)
+CHIPScenesClusterViewSceneResponseCallback::CHIPScenesClusterViewSceneResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPScenesClusterViewSceneResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -390,7 +395,7 @@ CHIPDoorLockClusterGetCredentialStatusResponseCallback::CHIPDoorLockClusterGetCr
     }
 }
 
-CHIPDoorLockClusterGetCredentialStatusResponseCallback::~CHIPDoorLockClusterGetCredentialStatusResponseCallback()
+CHIPScenesClusterViewSceneResponseCallback::~CHIPScenesClusterViewSceneResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -401,8 +406,8 @@ CHIPDoorLockClusterGetCredentialStatusResponseCallback::~CHIPDoorLockClusterGetC
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPDoorLockClusterGetCredentialStatusResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType & dataResponse)
+void CHIPScenesClusterViewSceneResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::Scenes::Commands::ViewSceneResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -412,10 +417,9 @@ void CHIPDoorLockClusterGetCredentialStatusResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPDoorLockClusterGetCredentialStatusResponseCallback,
-                    void (*)(CHIPDoorLockClusterGetCredentialStatusResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPDoorLockClusterGetCredentialStatusResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPDoorLockClusterGetCredentialStatusResponseCallback>);
+    std::unique_ptr<CHIPScenesClusterViewSceneResponseCallback, void (*)(CHIPScenesClusterViewSceneResponseCallback *)> cppCallback(
+        reinterpret_cast<CHIPScenesClusterViewSceneResponseCallback *>(context),
+        chip::Platform::Delete<CHIPScenesClusterViewSceneResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
@@ -424,71 +428,161 @@ void CHIPDoorLockClusterGetCredentialStatusResponseCallback::CallbackFn(
 
     err = JniReferences::GetInstance().FindMethod(
         env, javaCallbackRef, "onSuccess",
-        "(Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V", &javaMethod);
+        "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V",
+        &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject credentialExists;
-    std::string credentialExistsClassName     = "java/lang/Boolean";
-    std::string credentialExistsCtorSignature = "(Z)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-        credentialExistsClassName.c_str(), credentialExistsCtorSignature.c_str(), dataResponse.credentialExists, credentialExists);
-    jobject userIndex;
-    if (dataResponse.userIndex.IsNull())
-    {
-        userIndex = nullptr;
-    }
-    else
-    {
-        std::string userIndexClassName     = "java/lang/Integer";
-        std::string userIndexCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(userIndexClassName.c_str(), userIndexCtorSignature.c_str(),
-                                                                       dataResponse.userIndex.Value(), userIndex);
-    }
-    jobject creatorFabricIndex;
-    if (dataResponse.creatorFabricIndex.IsNull())
+    jobject Status;
+    std::string StatusClassName     = "java/lang/Integer";
+    std::string StatusCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(StatusClassName.c_str(), StatusCtorSignature.c_str(),
+                                                                  dataResponse.status, Status);
+    jobject GroupId;
+    std::string GroupIdClassName     = "java/lang/Integer";
+    std::string GroupIdCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(GroupIdClassName.c_str(), GroupIdCtorSignature.c_str(),
+                                                                   dataResponse.groupId, GroupId);
+    jobject SceneId;
+    std::string SceneIdClassName     = "java/lang/Integer";
+    std::string SceneIdCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(SceneIdClassName.c_str(), SceneIdCtorSignature.c_str(),
+                                                                  dataResponse.sceneId, SceneId);
+    jobject TransitionTime;
+    if (!dataResponse.transitionTime.HasValue())
     {
-        creatorFabricIndex = nullptr;
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, TransitionTime);
     }
     else
     {
-        std::string creatorFabricIndexClassName     = "java/lang/Integer";
-        std::string creatorFabricIndexCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(creatorFabricIndexClassName.c_str(),
-                                                                      creatorFabricIndexCtorSignature.c_str(),
-                                                                      dataResponse.creatorFabricIndex.Value(), creatorFabricIndex);
+        jobject TransitionTimeInsideOptional;
+        std::string TransitionTimeInsideOptionalClassName     = "java/lang/Integer";
+        std::string TransitionTimeInsideOptionalCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+            TransitionTimeInsideOptionalClassName.c_str(), TransitionTimeInsideOptionalCtorSignature.c_str(),
+            dataResponse.transitionTime.Value(), TransitionTimeInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(TransitionTimeInsideOptional, TransitionTime);
     }
-    jobject lastModifiedFabricIndex;
-    if (dataResponse.lastModifiedFabricIndex.IsNull())
+    jobject SceneName;
+    if (!dataResponse.sceneName.HasValue())
     {
-        lastModifiedFabricIndex = nullptr;
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, SceneName);
     }
     else
     {
-        std::string lastModifiedFabricIndexClassName     = "java/lang/Integer";
-        std::string lastModifiedFabricIndexCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-            lastModifiedFabricIndexClassName.c_str(), lastModifiedFabricIndexCtorSignature.c_str(),
-            dataResponse.lastModifiedFabricIndex.Value(), lastModifiedFabricIndex);
+        jobject SceneNameInsideOptional;
+        SceneNameInsideOptional =
+            env->NewStringUTF(std::string(dataResponse.sceneName.Value().data(), dataResponse.sceneName.Value().size()).c_str());
+        chip::JniReferences::GetInstance().CreateOptional(SceneNameInsideOptional, SceneName);
     }
-    jobject nextCredentialIndex;
-    if (dataResponse.nextCredentialIndex.IsNull())
+    jobject ExtensionFieldSets;
+    if (!dataResponse.extensionFieldSets.HasValue())
     {
-        nextCredentialIndex = nullptr;
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, ExtensionFieldSets);
     }
     else
     {
-        std::string nextCredentialIndexClassName     = "java/lang/Integer";
-        std::string nextCredentialIndexCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-            nextCredentialIndexClassName.c_str(), nextCredentialIndexCtorSignature.c_str(),
-            dataResponse.nextCredentialIndex.Value(), nextCredentialIndex);
+        jobject ExtensionFieldSetsInsideOptional;
+        chip::JniReferences::GetInstance().CreateArrayList(ExtensionFieldSetsInsideOptional);
+
+        auto iter_ExtensionFieldSetsInsideOptional_1 = dataResponse.extensionFieldSets.Value().begin();
+        while (iter_ExtensionFieldSetsInsideOptional_1.Next())
+        {
+            auto & entry_1 = iter_ExtensionFieldSetsInsideOptional_1.GetValue();
+            jobject newElement_1;
+            jobject newElement_1_clusterId;
+            std::string newElement_1_clusterIdClassName     = "java/lang/Long";
+            std::string newElement_1_clusterIdCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_1_clusterIdClassName.c_str(),
+                                                                           newElement_1_clusterIdCtorSignature.c_str(),
+                                                                           entry_1.clusterId, newElement_1_clusterId);
+            jobject newElement_1_attributeValueList;
+            chip::JniReferences::GetInstance().CreateArrayList(newElement_1_attributeValueList);
+
+            auto iter_newElement_1_attributeValueList_3 = entry_1.attributeValueList.begin();
+            while (iter_newElement_1_attributeValueList_3.Next())
+            {
+                auto & entry_3 = iter_newElement_1_attributeValueList_3.GetValue();
+                jobject newElement_3;
+                jobject newElement_3_attributeId;
+                if (!entry_3.attributeId.HasValue())
+                {
+                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_3_attributeId);
+                }
+                else
+                {
+                    jobject newElement_3_attributeIdInsideOptional;
+                    std::string newElement_3_attributeIdInsideOptionalClassName     = "java/lang/Long";
+                    std::string newElement_3_attributeIdInsideOptionalCtorSignature = "(J)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                        newElement_3_attributeIdInsideOptionalClassName.c_str(),
+                        newElement_3_attributeIdInsideOptionalCtorSignature.c_str(), entry_3.attributeId.Value(),
+                        newElement_3_attributeIdInsideOptional);
+                    chip::JniReferences::GetInstance().CreateOptional(newElement_3_attributeIdInsideOptional,
+                                                                      newElement_3_attributeId);
+                }
+                jobject newElement_3_attributeValue;
+                chip::JniReferences::GetInstance().CreateArrayList(newElement_3_attributeValue);
+
+                auto iter_newElement_3_attributeValue_5 = entry_3.attributeValue.begin();
+                while (iter_newElement_3_attributeValue_5.Next())
+                {
+                    auto & entry_5 = iter_newElement_3_attributeValue_5.GetValue();
+                    jobject newElement_5;
+                    std::string newElement_5ClassName     = "java/lang/Integer";
+                    std::string newElement_5CtorSignature = "(I)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                        newElement_5ClassName.c_str(), newElement_5CtorSignature.c_str(), entry_5, newElement_5);
+                    chip::JniReferences::GetInstance().AddToList(newElement_3_attributeValue, newElement_5);
+                }
+
+                jclass attributeValuePairStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$ScenesClusterAttributeValuePair", attributeValuePairStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$ScenesClusterAttributeValuePair");
+                    return;
+                }
+                jmethodID attributeValuePairStructCtor =
+                    env->GetMethodID(attributeValuePairStructClass, "<init>", "(Ljava/util/Optional;Ljava/util/ArrayList;)V");
+                if (attributeValuePairStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$ScenesClusterAttributeValuePair constructor");
+                    return;
+                }
+
+                newElement_3 = env->NewObject(attributeValuePairStructClass, attributeValuePairStructCtor, newElement_3_attributeId,
+                                              newElement_3_attributeValue);
+                chip::JniReferences::GetInstance().AddToList(newElement_1_attributeValueList, newElement_3);
+            }
+
+            jclass extensionFieldSetStructClass;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipStructs$ScenesClusterExtensionFieldSet", extensionFieldSetStructClass);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl, "Could not find class ChipStructs$ScenesClusterExtensionFieldSet");
+                return;
+            }
+            jmethodID extensionFieldSetStructCtor =
+                env->GetMethodID(extensionFieldSetStructClass, "<init>", "(Ljava/lang/Long;Ljava/util/ArrayList;)V");
+            if (extensionFieldSetStructCtor == nullptr)
+            {
+                ChipLogError(Zcl, "Could not find ChipStructs$ScenesClusterExtensionFieldSet constructor");
+                return;
+            }
+
+            newElement_1 = env->NewObject(extensionFieldSetStructClass, extensionFieldSetStructCtor, newElement_1_clusterId,
+                                          newElement_1_attributeValueList);
+            chip::JniReferences::GetInstance().AddToList(ExtensionFieldSetsInsideOptional, newElement_1);
+        }
+        chip::JniReferences::GetInstance().CreateOptional(ExtensionFieldSetsInsideOptional, ExtensionFieldSets);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, credentialExists, userIndex, creatorFabricIndex, lastModifiedFabricIndex,
-                        nextCredentialIndex);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, Status, GroupId, SceneId, TransitionTime, SceneName, ExtensionFieldSets);
 }
-CHIPDoorLockClusterGetHolidayScheduleResponseCallback::CHIPDoorLockClusterGetHolidayScheduleResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPDoorLockClusterGetHolidayScheduleResponseCallbackType>(CallbackFn, this)
+CHIPScenesClusterRemoveSceneResponseCallback::CHIPScenesClusterRemoveSceneResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPScenesClusterRemoveSceneResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -504,7 +598,7 @@ CHIPDoorLockClusterGetHolidayScheduleResponseCallback::CHIPDoorLockClusterGetHol
     }
 }
 
-CHIPDoorLockClusterGetHolidayScheduleResponseCallback::~CHIPDoorLockClusterGetHolidayScheduleResponseCallback()
+CHIPScenesClusterRemoveSceneResponseCallback::~CHIPScenesClusterRemoveSceneResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -515,8 +609,8 @@ CHIPDoorLockClusterGetHolidayScheduleResponseCallback::~CHIPDoorLockClusterGetHo
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPDoorLockClusterGetHolidayScheduleResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType & dataResponse)
+void CHIPScenesClusterRemoveSceneResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::Scenes::Commands::RemoveSceneResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -526,81 +620,104 @@ void CHIPDoorLockClusterGetHolidayScheduleResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPDoorLockClusterGetHolidayScheduleResponseCallback,
-                    void (*)(CHIPDoorLockClusterGetHolidayScheduleResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPDoorLockClusterGetHolidayScheduleResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPDoorLockClusterGetHolidayScheduleResponseCallback>);
+    std::unique_ptr<CHIPScenesClusterRemoveSceneResponseCallback, void (*)(CHIPScenesClusterRemoveSceneResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPScenesClusterRemoveSceneResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPScenesClusterRemoveSceneResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(
-        env, javaCallbackRef, "onSuccess",
-        "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V", &javaMethod);
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess",
+                                                  "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject holidayIndex;
-    std::string holidayIndexClassName     = "java/lang/Integer";
-    std::string holidayIndexCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(holidayIndexClassName.c_str(), holidayIndexCtorSignature.c_str(),
-                                                                  dataResponse.holidayIndex, holidayIndex);
-    jobject status;
-    std::string statusClassName     = "java/lang/Integer";
-    std::string statusCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
-                                                                  static_cast<uint8_t>(dataResponse.status), status);
-    jobject localStartTime;
-    if (!dataResponse.localStartTime.HasValue())
-    {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, localStartTime);
-    }
-    else
+    jobject Status;
+    std::string StatusClassName     = "java/lang/Integer";
+    std::string StatusCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(StatusClassName.c_str(), StatusCtorSignature.c_str(),
+                                                                  dataResponse.status, Status);
+    jobject GroupId;
+    std::string GroupIdClassName     = "java/lang/Integer";
+    std::string GroupIdCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(GroupIdClassName.c_str(), GroupIdCtorSignature.c_str(),
+                                                                   dataResponse.groupId, GroupId);
+    jobject SceneId;
+    std::string SceneIdClassName     = "java/lang/Integer";
+    std::string SceneIdCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(SceneIdClassName.c_str(), SceneIdCtorSignature.c_str(),
+                                                                  dataResponse.sceneId, SceneId);
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, Status, GroupId, SceneId);
+}
+CHIPScenesClusterRemoveAllScenesResponseCallback::CHIPScenesClusterRemoveAllScenesResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPScenesClusterRemoveAllScenesResponseCallbackType>(CallbackFn, this)
+{
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
     {
-        jobject localStartTimeInsideOptional;
-        std::string localStartTimeInsideOptionalClassName     = "java/lang/Long";
-        std::string localStartTimeInsideOptionalCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-            localStartTimeInsideOptionalClassName.c_str(), localStartTimeInsideOptionalCtorSignature.c_str(),
-            dataResponse.localStartTime.Value(), localStartTimeInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(localStartTimeInsideOptional, localStartTime);
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
     }
-    jobject localEndTime;
-    if (!dataResponse.localEndTime.HasValue())
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, localEndTime);
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
     }
-    else
+}
+
+CHIPScenesClusterRemoveAllScenesResponseCallback::~CHIPScenesClusterRemoveAllScenesResponseCallback()
+{
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
     {
-        jobject localEndTimeInsideOptional;
-        std::string localEndTimeInsideOptionalClassName     = "java/lang/Long";
-        std::string localEndTimeInsideOptionalCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-            localEndTimeInsideOptionalClassName.c_str(), localEndTimeInsideOptionalCtorSignature.c_str(),
-            dataResponse.localEndTime.Value(), localEndTimeInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(localEndTimeInsideOptional, localEndTime);
-    }
-    jobject operatingMode;
-    if (!dataResponse.operatingMode.HasValue())
-    {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, operatingMode);
-    }
-    else
-    {
-        jobject operatingModeInsideOptional;
-        std::string operatingModeInsideOptionalClassName     = "java/lang/Integer";
-        std::string operatingModeInsideOptionalCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-            operatingModeInsideOptionalClassName.c_str(), operatingModeInsideOptionalCtorSignature.c_str(),
-            static_cast<uint8_t>(dataResponse.operatingMode.Value()), operatingModeInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(operatingModeInsideOptional, operatingMode);
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
     }
+    env->DeleteGlobalRef(javaCallbackRef);
+};
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, holidayIndex, status, localStartTime, localEndTime, operatingMode);
+void CHIPScenesClusterRemoveAllScenesResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::Scenes::Commands::RemoveAllScenesResponse::DecodableType & dataResponse)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+    jmethodID javaMethod;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
+
+    std::unique_ptr<CHIPScenesClusterRemoveAllScenesResponseCallback, void (*)(CHIPScenesClusterRemoveAllScenesResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPScenesClusterRemoveAllScenesResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPScenesClusterRemoveAllScenesResponseCallback>);
+    VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
+
+    javaCallbackRef = cppCallback->javaCallbackRef;
+    // Java callback is allowed to be null, exit early if this is the case.
+    VerifyOrReturn(javaCallbackRef != nullptr);
+
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/lang/Integer;)V",
+                                                  &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
+
+    jobject Status;
+    std::string StatusClassName     = "java/lang/Integer";
+    std::string StatusCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(StatusClassName.c_str(), StatusCtorSignature.c_str(),
+                                                                  dataResponse.status, Status);
+    jobject GroupId;
+    std::string GroupIdClassName     = "java/lang/Integer";
+    std::string GroupIdCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(GroupIdClassName.c_str(), GroupIdCtorSignature.c_str(),
+                                                                   dataResponse.groupId, GroupId);
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, Status, GroupId);
 }
-CHIPDoorLockClusterGetUserResponseCallback::CHIPDoorLockClusterGetUserResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPDoorLockClusterGetUserResponseCallbackType>(CallbackFn, this)
+CHIPScenesClusterStoreSceneResponseCallback::CHIPScenesClusterStoreSceneResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPScenesClusterStoreSceneResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -616,7 +733,7 @@ CHIPDoorLockClusterGetUserResponseCallback::CHIPDoorLockClusterGetUserResponseCa
     }
 }
 
-CHIPDoorLockClusterGetUserResponseCallback::~CHIPDoorLockClusterGetUserResponseCallback()
+CHIPScenesClusterStoreSceneResponseCallback::~CHIPScenesClusterStoreSceneResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -627,8 +744,8 @@ CHIPDoorLockClusterGetUserResponseCallback::~CHIPDoorLockClusterGetUserResponseC
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPDoorLockClusterGetUserResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType & dataResponse)
+void CHIPScenesClusterStoreSceneResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::Scenes::Commands::StoreSceneResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -638,180 +755,39 @@ void CHIPDoorLockClusterGetUserResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPDoorLockClusterGetUserResponseCallback, void (*)(CHIPDoorLockClusterGetUserResponseCallback *)> cppCallback(
-        reinterpret_cast<CHIPDoorLockClusterGetUserResponseCallback *>(context),
-        chip::Platform::Delete<CHIPDoorLockClusterGetUserResponseCallback>);
+    std::unique_ptr<CHIPScenesClusterStoreSceneResponseCallback, void (*)(CHIPScenesClusterStoreSceneResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPScenesClusterStoreSceneResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPScenesClusterStoreSceneResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(
-        env, javaCallbackRef, "onSuccess",
-        "(Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/"
-        "ArrayList;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V",
-        &javaMethod);
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess",
+                                                  "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject userIndex;
-    std::string userIndexClassName     = "java/lang/Integer";
-    std::string userIndexCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(userIndexClassName.c_str(), userIndexCtorSignature.c_str(),
-                                                                   dataResponse.userIndex, userIndex);
-    jobject userName;
-    if (dataResponse.userName.IsNull())
-    {
-        userName = nullptr;
-    }
-    else
-    {
-        userName =
-            env->NewStringUTF(std::string(dataResponse.userName.Value().data(), dataResponse.userName.Value().size()).c_str());
-    }
-    jobject userUniqueId;
-    if (dataResponse.userUniqueId.IsNull())
-    {
-        userUniqueId = nullptr;
-    }
-    else
-    {
-        std::string userUniqueIdClassName     = "java/lang/Long";
-        std::string userUniqueIdCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-            userUniqueIdClassName.c_str(), userUniqueIdCtorSignature.c_str(), dataResponse.userUniqueId.Value(), userUniqueId);
-    }
-    jobject userStatus;
-    if (dataResponse.userStatus.IsNull())
-    {
-        userStatus = nullptr;
-    }
-    else
-    {
-        std::string userStatusClassName     = "java/lang/Integer";
-        std::string userStatusCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(userStatusClassName.c_str(), userStatusCtorSignature.c_str(),
-                                                                      static_cast<uint8_t>(dataResponse.userStatus.Value()),
-                                                                      userStatus);
-    }
-    jobject userType;
-    if (dataResponse.userType.IsNull())
-    {
-        userType = nullptr;
-    }
-    else
-    {
-        std::string userTypeClassName     = "java/lang/Integer";
-        std::string userTypeCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(userTypeClassName.c_str(), userTypeCtorSignature.c_str(),
-                                                                      static_cast<uint8_t>(dataResponse.userType.Value()),
-                                                                      userType);
-    }
-    jobject credentialRule;
-    if (dataResponse.credentialRule.IsNull())
-    {
-        credentialRule = nullptr;
-    }
-    else
-    {
-        std::string credentialRuleClassName     = "java/lang/Integer";
-        std::string credentialRuleCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-            credentialRuleClassName.c_str(), credentialRuleCtorSignature.c_str(),
-            static_cast<uint8_t>(dataResponse.credentialRule.Value()), credentialRule);
-    }
-    jobject credentials;
-    if (dataResponse.credentials.IsNull())
-    {
-        credentials = nullptr;
-    }
-    else
-    {
-        chip::JniReferences::GetInstance().CreateArrayList(credentials);
-
-        auto iter_credentials_1 = dataResponse.credentials.Value().begin();
-        while (iter_credentials_1.Next())
-        {
-            auto & entry_1 = iter_credentials_1.GetValue();
-            jobject newElement_1;
-            jobject newElement_1_credentialType;
-            std::string newElement_1_credentialTypeClassName     = "java/lang/Integer";
-            std::string newElement_1_credentialTypeCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                newElement_1_credentialTypeClassName.c_str(), newElement_1_credentialTypeCtorSignature.c_str(),
-                static_cast<uint8_t>(entry_1.credentialType), newElement_1_credentialType);
-            jobject newElement_1_credentialIndex;
-            std::string newElement_1_credentialIndexClassName     = "java/lang/Integer";
-            std::string newElement_1_credentialIndexCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_1_credentialIndexClassName.c_str(),
-                                                                           newElement_1_credentialIndexCtorSignature.c_str(),
-                                                                           entry_1.credentialIndex, newElement_1_credentialIndex);
-
-            jclass dlCredentialStructClass;
-            err = chip::JniReferences::GetInstance().GetClassRef(
-                env, "chip/devicecontroller/ChipStructs$DoorLockClusterDlCredential", dlCredentialStructClass);
-            if (err != CHIP_NO_ERROR)
-            {
-                ChipLogError(Zcl, "Could not find class ChipStructs$DoorLockClusterDlCredential");
-                return;
-            }
-            jmethodID dlCredentialStructCtor =
-                env->GetMethodID(dlCredentialStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;)V");
-            if (dlCredentialStructCtor == nullptr)
-            {
-                ChipLogError(Zcl, "Could not find ChipStructs$DoorLockClusterDlCredential constructor");
-                return;
-            }
-
-            newElement_1 = env->NewObject(dlCredentialStructClass, dlCredentialStructCtor, newElement_1_credentialType,
-                                          newElement_1_credentialIndex);
-            chip::JniReferences::GetInstance().AddToList(credentials, newElement_1);
-        }
-    }
-    jobject creatorFabricIndex;
-    if (dataResponse.creatorFabricIndex.IsNull())
-    {
-        creatorFabricIndex = nullptr;
-    }
-    else
-    {
-        std::string creatorFabricIndexClassName     = "java/lang/Integer";
-        std::string creatorFabricIndexCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(creatorFabricIndexClassName.c_str(),
-                                                                      creatorFabricIndexCtorSignature.c_str(),
-                                                                      dataResponse.creatorFabricIndex.Value(), creatorFabricIndex);
-    }
-    jobject lastModifiedFabricIndex;
-    if (dataResponse.lastModifiedFabricIndex.IsNull())
-    {
-        lastModifiedFabricIndex = nullptr;
-    }
-    else
-    {
-        std::string lastModifiedFabricIndexClassName     = "java/lang/Integer";
-        std::string lastModifiedFabricIndexCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-            lastModifiedFabricIndexClassName.c_str(), lastModifiedFabricIndexCtorSignature.c_str(),
-            dataResponse.lastModifiedFabricIndex.Value(), lastModifiedFabricIndex);
-    }
-    jobject nextUserIndex;
-    if (dataResponse.nextUserIndex.IsNull())
-    {
-        nextUserIndex = nullptr;
-    }
-    else
-    {
-        std::string nextUserIndexClassName     = "java/lang/Integer";
-        std::string nextUserIndexCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-            nextUserIndexClassName.c_str(), nextUserIndexCtorSignature.c_str(), dataResponse.nextUserIndex.Value(), nextUserIndex);
-    }
+    jobject Status;
+    std::string StatusClassName     = "java/lang/Integer";
+    std::string StatusCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(StatusClassName.c_str(), StatusCtorSignature.c_str(),
+                                                                  dataResponse.status, Status);
+    jobject GroupId;
+    std::string GroupIdClassName     = "java/lang/Integer";
+    std::string GroupIdCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(GroupIdClassName.c_str(), GroupIdCtorSignature.c_str(),
+                                                                   dataResponse.groupId, GroupId);
+    jobject SceneId;
+    std::string SceneIdClassName     = "java/lang/Integer";
+    std::string SceneIdCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(SceneIdClassName.c_str(), SceneIdCtorSignature.c_str(),
+                                                                  dataResponse.sceneId, SceneId);
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, userIndex, userName, userUniqueId, userStatus, userType, credentialRule,
-                        credentials, creatorFabricIndex, lastModifiedFabricIndex, nextUserIndex);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, Status, GroupId, SceneId);
 }
-CHIPDoorLockClusterGetWeekDayScheduleResponseCallback::CHIPDoorLockClusterGetWeekDayScheduleResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackType>(CallbackFn, this)
+CHIPScenesClusterGetSceneMembershipResponseCallback::CHIPScenesClusterGetSceneMembershipResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPScenesClusterGetSceneMembershipResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -827,7 +803,7 @@ CHIPDoorLockClusterGetWeekDayScheduleResponseCallback::CHIPDoorLockClusterGetWee
     }
 }
 
-CHIPDoorLockClusterGetWeekDayScheduleResponseCallback::~CHIPDoorLockClusterGetWeekDayScheduleResponseCallback()
+CHIPScenesClusterGetSceneMembershipResponseCallback::~CHIPScenesClusterGetSceneMembershipResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -838,8 +814,8 @@ CHIPDoorLockClusterGetWeekDayScheduleResponseCallback::~CHIPDoorLockClusterGetWe
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPDoorLockClusterGetWeekDayScheduleResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType & dataResponse)
+void CHIPScenesClusterGetSceneMembershipResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::Scenes::Commands::GetSceneMembershipResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -849,10 +825,10 @@ void CHIPDoorLockClusterGetWeekDayScheduleResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPDoorLockClusterGetWeekDayScheduleResponseCallback,
-                    void (*)(CHIPDoorLockClusterGetWeekDayScheduleResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPDoorLockClusterGetWeekDayScheduleResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPDoorLockClusterGetWeekDayScheduleResponseCallback>);
+    std::unique_ptr<CHIPScenesClusterGetSceneMembershipResponseCallback,
+                    void (*)(CHIPScenesClusterGetSceneMembershipResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPScenesClusterGetSceneMembershipResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPScenesClusterGetSceneMembershipResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
@@ -860,108 +836,61 @@ void CHIPDoorLockClusterGetWeekDayScheduleResponseCallback::CallbackFn(
     VerifyOrReturn(javaCallbackRef != nullptr);
 
     err = JniReferences::GetInstance().FindMethod(
-        env, javaCallbackRef, "onSuccess",
-        "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/"
-        "Optional;Ljava/util/Optional;Ljava/util/Optional;)V",
+        env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;)V",
         &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject weekDayIndex;
-    std::string weekDayIndexClassName     = "java/lang/Integer";
-    std::string weekDayIndexCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(weekDayIndexClassName.c_str(), weekDayIndexCtorSignature.c_str(),
-                                                                  dataResponse.weekDayIndex, weekDayIndex);
-    jobject userIndex;
-    std::string userIndexClassName     = "java/lang/Integer";
-    std::string userIndexCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(userIndexClassName.c_str(), userIndexCtorSignature.c_str(),
-                                                                   dataResponse.userIndex, userIndex);
-    jobject status;
-    std::string statusClassName     = "java/lang/Integer";
-    std::string statusCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
-                                                                  static_cast<uint8_t>(dataResponse.status), status);
-    jobject daysMask;
-    if (!dataResponse.daysMask.HasValue())
-    {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, daysMask);
-    }
-    else
-    {
-        jobject daysMaskInsideOptional;
-        std::string daysMaskInsideOptionalClassName     = "java/lang/Integer";
-        std::string daysMaskInsideOptionalCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(daysMaskInsideOptionalClassName.c_str(),
-                                                                      daysMaskInsideOptionalCtorSignature.c_str(),
-                                                                      dataResponse.daysMask.Value().Raw(), daysMaskInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(daysMaskInsideOptional, daysMask);
-    }
-    jobject startHour;
-    if (!dataResponse.startHour.HasValue())
-    {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, startHour);
-    }
-    else
-    {
-        jobject startHourInsideOptional;
-        std::string startHourInsideOptionalClassName     = "java/lang/Integer";
-        std::string startHourInsideOptionalCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(startHourInsideOptionalClassName.c_str(),
-                                                                      startHourInsideOptionalCtorSignature.c_str(),
-                                                                      dataResponse.startHour.Value(), startHourInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(startHourInsideOptional, startHour);
-    }
-    jobject startMinute;
-    if (!dataResponse.startMinute.HasValue())
-    {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, startMinute);
-    }
-    else
-    {
-        jobject startMinuteInsideOptional;
-        std::string startMinuteInsideOptionalClassName     = "java/lang/Integer";
-        std::string startMinuteInsideOptionalCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(startMinuteInsideOptionalClassName.c_str(),
-                                                                      startMinuteInsideOptionalCtorSignature.c_str(),
-                                                                      dataResponse.startMinute.Value(), startMinuteInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(startMinuteInsideOptional, startMinute);
-    }
-    jobject endHour;
-    if (!dataResponse.endHour.HasValue())
+    jobject Status;
+    std::string StatusClassName     = "java/lang/Integer";
+    std::string StatusCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(StatusClassName.c_str(), StatusCtorSignature.c_str(),
+                                                                  dataResponse.status, Status);
+    jobject Capacity;
+    if (dataResponse.capacity.IsNull())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, endHour);
+        Capacity = nullptr;
     }
     else
     {
-        jobject endHourInsideOptional;
-        std::string endHourInsideOptionalClassName     = "java/lang/Integer";
-        std::string endHourInsideOptionalCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(endHourInsideOptionalClassName.c_str(),
-                                                                      endHourInsideOptionalCtorSignature.c_str(),
-                                                                      dataResponse.endHour.Value(), endHourInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(endHourInsideOptional, endHour);
+        std::string CapacityClassName     = "java/lang/Integer";
+        std::string CapacityCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(CapacityClassName.c_str(), CapacityCtorSignature.c_str(),
+                                                                      dataResponse.capacity.Value(), Capacity);
     }
-    jobject endMinute;
-    if (!dataResponse.endMinute.HasValue())
+    jobject GroupId;
+    std::string GroupIdClassName     = "java/lang/Integer";
+    std::string GroupIdCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(GroupIdClassName.c_str(), GroupIdCtorSignature.c_str(),
+                                                                   dataResponse.groupId, GroupId);
+    jobject SceneList;
+    if (!dataResponse.sceneList.HasValue())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, endMinute);
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, SceneList);
     }
     else
     {
-        jobject endMinuteInsideOptional;
-        std::string endMinuteInsideOptionalClassName     = "java/lang/Integer";
-        std::string endMinuteInsideOptionalCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(endMinuteInsideOptionalClassName.c_str(),
-                                                                      endMinuteInsideOptionalCtorSignature.c_str(),
-                                                                      dataResponse.endMinute.Value(), endMinuteInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(endMinuteInsideOptional, endMinute);
+        jobject SceneListInsideOptional;
+        chip::JniReferences::GetInstance().CreateArrayList(SceneListInsideOptional);
+
+        auto iter_SceneListInsideOptional_1 = dataResponse.sceneList.Value().begin();
+        while (iter_SceneListInsideOptional_1.Next())
+        {
+            auto & entry_1 = iter_SceneListInsideOptional_1.GetValue();
+            jobject newElement_1;
+            std::string newElement_1ClassName     = "java/lang/Integer";
+            std::string newElement_1CtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_1ClassName.c_str(),
+                                                                          newElement_1CtorSignature.c_str(), entry_1, newElement_1);
+            chip::JniReferences::GetInstance().AddToList(SceneListInsideOptional, newElement_1);
+        }
+        chip::JniReferences::GetInstance().CreateOptional(SceneListInsideOptional, SceneList);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, weekDayIndex, userIndex, status, daysMask, startHour, startMinute, endHour,
-                        endMinute);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, Status, Capacity, GroupId, SceneList);
 }
-CHIPDoorLockClusterGetYearDayScheduleResponseCallback::CHIPDoorLockClusterGetYearDayScheduleResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPDoorLockClusterGetYearDayScheduleResponseCallbackType>(CallbackFn, this)
+CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback::CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback(
+    jobject javaCallback) :
+    Callback::Callback<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -977,7 +906,7 @@ CHIPDoorLockClusterGetYearDayScheduleResponseCallback::CHIPDoorLockClusterGetYea
     }
 }
 
-CHIPDoorLockClusterGetYearDayScheduleResponseCallback::~CHIPDoorLockClusterGetYearDayScheduleResponseCallback()
+CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback::~CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -988,8 +917,9 @@ CHIPDoorLockClusterGetYearDayScheduleResponseCallback::~CHIPDoorLockClusterGetYe
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPDoorLockClusterGetYearDayScheduleResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType & dataResponse)
+void CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback::CallbackFn(
+    void * context,
+    const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImageResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -999,10 +929,10 @@ void CHIPDoorLockClusterGetYearDayScheduleResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPDoorLockClusterGetYearDayScheduleResponseCallback,
-                    void (*)(CHIPDoorLockClusterGetYearDayScheduleResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPDoorLockClusterGetYearDayScheduleResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPDoorLockClusterGetYearDayScheduleResponseCallback>);
+    std::unique_ptr<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback,
+                    void (*)(CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
@@ -1011,145 +941,124 @@ void CHIPDoorLockClusterGetYearDayScheduleResponseCallback::CallbackFn(
 
     err = JniReferences::GetInstance().FindMethod(
         env, javaCallbackRef, "onSuccess",
-        "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;)V", &javaMethod);
+        "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/"
+        "Optional;Ljava/util/Optional;Ljava/util/Optional;)V",
+        &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject yearDayIndex;
-    std::string yearDayIndexClassName     = "java/lang/Integer";
-    std::string yearDayIndexCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(yearDayIndexClassName.c_str(), yearDayIndexCtorSignature.c_str(),
-                                                                  dataResponse.yearDayIndex, yearDayIndex);
-    jobject userIndex;
-    std::string userIndexClassName     = "java/lang/Integer";
-    std::string userIndexCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(userIndexClassName.c_str(), userIndexCtorSignature.c_str(),
-                                                                   dataResponse.userIndex, userIndex);
     jobject status;
     std::string statusClassName     = "java/lang/Integer";
     std::string statusCtorSignature = "(I)V";
     chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
                                                                   static_cast<uint8_t>(dataResponse.status), status);
-    jobject localStartTime;
-    if (!dataResponse.localStartTime.HasValue())
+    jobject delayedActionTime;
+    if (!dataResponse.delayedActionTime.HasValue())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, localStartTime);
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, delayedActionTime);
     }
     else
     {
-        jobject localStartTimeInsideOptional;
-        std::string localStartTimeInsideOptionalClassName     = "java/lang/Long";
-        std::string localStartTimeInsideOptionalCtorSignature = "(J)V";
+        jobject delayedActionTimeInsideOptional;
+        std::string delayedActionTimeInsideOptionalClassName     = "java/lang/Long";
+        std::string delayedActionTimeInsideOptionalCtorSignature = "(J)V";
         chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-            localStartTimeInsideOptionalClassName.c_str(), localStartTimeInsideOptionalCtorSignature.c_str(),
-            dataResponse.localStartTime.Value(), localStartTimeInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(localStartTimeInsideOptional, localStartTime);
+            delayedActionTimeInsideOptionalClassName.c_str(), delayedActionTimeInsideOptionalCtorSignature.c_str(),
+            dataResponse.delayedActionTime.Value(), delayedActionTimeInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(delayedActionTimeInsideOptional, delayedActionTime);
     }
-    jobject localEndTime;
-    if (!dataResponse.localEndTime.HasValue())
+    jobject imageURI;
+    if (!dataResponse.imageURI.HasValue())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, localEndTime);
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, imageURI);
     }
     else
     {
-        jobject localEndTimeInsideOptional;
-        std::string localEndTimeInsideOptionalClassName     = "java/lang/Long";
-        std::string localEndTimeInsideOptionalCtorSignature = "(J)V";
+        jobject imageURIInsideOptional;
+        imageURIInsideOptional =
+            env->NewStringUTF(std::string(dataResponse.imageURI.Value().data(), dataResponse.imageURI.Value().size()).c_str());
+        chip::JniReferences::GetInstance().CreateOptional(imageURIInsideOptional, imageURI);
+    }
+    jobject softwareVersion;
+    if (!dataResponse.softwareVersion.HasValue())
+    {
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, softwareVersion);
+    }
+    else
+    {
+        jobject softwareVersionInsideOptional;
+        std::string softwareVersionInsideOptionalClassName     = "java/lang/Long";
+        std::string softwareVersionInsideOptionalCtorSignature = "(J)V";
         chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-            localEndTimeInsideOptionalClassName.c_str(), localEndTimeInsideOptionalCtorSignature.c_str(),
-            dataResponse.localEndTime.Value(), localEndTimeInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(localEndTimeInsideOptional, localEndTime);
+            softwareVersionInsideOptionalClassName.c_str(), softwareVersionInsideOptionalCtorSignature.c_str(),
+            dataResponse.softwareVersion.Value(), softwareVersionInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(softwareVersionInsideOptional, softwareVersion);
     }
-
-    env->CallVoidMethod(javaCallbackRef, javaMethod, yearDayIndex, userIndex, status, localStartTime, localEndTime);
-}
-CHIPDoorLockClusterSetCredentialResponseCallback::CHIPDoorLockClusterSetCredentialResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPDoorLockClusterSetCredentialResponseCallbackType>(CallbackFn, this)
-{
-    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
+    jobject softwareVersionString;
+    if (!dataResponse.softwareVersionString.HasValue())
     {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-        return;
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, softwareVersionString);
     }
-
-    javaCallbackRef = env->NewGlobalRef(javaCallback);
-    if (javaCallbackRef == nullptr)
+    else
     {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        jobject softwareVersionStringInsideOptional;
+        softwareVersionStringInsideOptional = env->NewStringUTF(
+            std::string(dataResponse.softwareVersionString.Value().data(), dataResponse.softwareVersionString.Value().size())
+                .c_str());
+        chip::JniReferences::GetInstance().CreateOptional(softwareVersionStringInsideOptional, softwareVersionString);
     }
-}
-
-CHIPDoorLockClusterSetCredentialResponseCallback::~CHIPDoorLockClusterSetCredentialResponseCallback()
-{
-    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
+    jobject updateToken;
+    if (!dataResponse.updateToken.HasValue())
     {
-        ChipLogError(Zcl, "Could not delete global reference for Java callback");
-        return;
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, updateToken);
     }
-    env->DeleteGlobalRef(javaCallbackRef);
-};
-
-void CHIPDoorLockClusterSetCredentialResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType & dataResponse)
-{
-    chip::DeviceLayer::StackUnlock unlock;
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-    jobject javaCallbackRef;
-    jmethodID javaMethod;
-
-    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
-
-    std::unique_ptr<CHIPDoorLockClusterSetCredentialResponseCallback, void (*)(CHIPDoorLockClusterSetCredentialResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPDoorLockClusterSetCredentialResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPDoorLockClusterSetCredentialResponseCallback>);
-    VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
-
-    javaCallbackRef = cppCallback->javaCallbackRef;
-    // Java callback is allowed to be null, exit early if this is the case.
-    VerifyOrReturn(javaCallbackRef != nullptr);
-
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess",
-                                                  "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V", &javaMethod);
-    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
-
-    jobject status;
-    std::string statusClassName     = "java/lang/Integer";
-    std::string statusCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
-                                                                  static_cast<uint8_t>(dataResponse.status), status);
-    jobject userIndex;
-    if (dataResponse.userIndex.IsNull())
+    else
     {
-        userIndex = nullptr;
+        jobject updateTokenInsideOptional;
+        jbyteArray updateTokenInsideOptionalByteArray =
+            env->NewByteArray(static_cast<jsize>(dataResponse.updateToken.Value().size()));
+        env->SetByteArrayRegion(updateTokenInsideOptionalByteArray, 0, static_cast<jsize>(dataResponse.updateToken.Value().size()),
+                                reinterpret_cast<const jbyte *>(dataResponse.updateToken.Value().data()));
+        updateTokenInsideOptional = updateTokenInsideOptionalByteArray;
+        chip::JniReferences::GetInstance().CreateOptional(updateTokenInsideOptional, updateToken);
+    }
+    jobject userConsentNeeded;
+    if (!dataResponse.userConsentNeeded.HasValue())
+    {
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, userConsentNeeded);
     }
     else
     {
-        std::string userIndexClassName     = "java/lang/Integer";
-        std::string userIndexCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(userIndexClassName.c_str(), userIndexCtorSignature.c_str(),
-                                                                       dataResponse.userIndex.Value(), userIndex);
+        jobject userConsentNeededInsideOptional;
+        std::string userConsentNeededInsideOptionalClassName     = "java/lang/Boolean";
+        std::string userConsentNeededInsideOptionalCtorSignature = "(Z)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
+            userConsentNeededInsideOptionalClassName.c_str(), userConsentNeededInsideOptionalCtorSignature.c_str(),
+            dataResponse.userConsentNeeded.Value(), userConsentNeededInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(userConsentNeededInsideOptional, userConsentNeeded);
     }
-    jobject nextCredentialIndex;
-    if (dataResponse.nextCredentialIndex.IsNull())
+    jobject metadataForRequestor;
+    if (!dataResponse.metadataForRequestor.HasValue())
     {
-        nextCredentialIndex = nullptr;
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, metadataForRequestor);
     }
     else
     {
-        std::string nextCredentialIndexClassName     = "java/lang/Integer";
-        std::string nextCredentialIndexCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-            nextCredentialIndexClassName.c_str(), nextCredentialIndexCtorSignature.c_str(),
-            dataResponse.nextCredentialIndex.Value(), nextCredentialIndex);
+        jobject metadataForRequestorInsideOptional;
+        jbyteArray metadataForRequestorInsideOptionalByteArray =
+            env->NewByteArray(static_cast<jsize>(dataResponse.metadataForRequestor.Value().size()));
+        env->SetByteArrayRegion(metadataForRequestorInsideOptionalByteArray, 0,
+                                static_cast<jsize>(dataResponse.metadataForRequestor.Value().size()),
+                                reinterpret_cast<const jbyte *>(dataResponse.metadataForRequestor.Value().data()));
+        metadataForRequestorInsideOptional = metadataForRequestorInsideOptionalByteArray;
+        chip::JniReferences::GetInstance().CreateOptional(metadataForRequestorInsideOptional, metadataForRequestor);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, status, userIndex, nextCredentialIndex);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, status, delayedActionTime, imageURI, softwareVersion, softwareVersionString,
+                        updateToken, userConsentNeeded, metadataForRequestor);
 }
-CHIPGeneralCommissioningClusterArmFailSafeResponseCallback::CHIPGeneralCommissioningClusterArmFailSafeResponseCallback(
+CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback::CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback(
     jobject javaCallback) :
-    Callback::Callback<CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackType>(CallbackFn, this)
+    Callback::Callback<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1165,7 +1074,7 @@ CHIPGeneralCommissioningClusterArmFailSafeResponseCallback::CHIPGeneralCommissio
     }
 }
 
-CHIPGeneralCommissioningClusterArmFailSafeResponseCallback::~CHIPGeneralCommissioningClusterArmFailSafeResponseCallback()
+CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback::~CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1176,8 +1085,9 @@ CHIPGeneralCommissioningClusterArmFailSafeResponseCallback::~CHIPGeneralCommissi
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPGeneralCommissioningClusterArmFailSafeResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::GeneralCommissioning::Commands::ArmFailSafeResponse::DecodableType & dataResponse)
+void CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback::CallbackFn(
+    void * context,
+    const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1187,33 +1097,37 @@ void CHIPGeneralCommissioningClusterArmFailSafeResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPGeneralCommissioningClusterArmFailSafeResponseCallback,
-                    void (*)(CHIPGeneralCommissioningClusterArmFailSafeResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPGeneralCommissioningClusterArmFailSafeResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPGeneralCommissioningClusterArmFailSafeResponseCallback>);
+    std::unique_ptr<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback,
+                    void (*)(CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/lang/String;)V",
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/lang/Long;)V",
                                                   &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject errorCode;
-    std::string errorCodeClassName     = "java/lang/Integer";
-    std::string errorCodeCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(errorCodeClassName.c_str(), errorCodeCtorSignature.c_str(),
-                                                                  static_cast<uint8_t>(dataResponse.errorCode), errorCode);
-    jobject debugText;
-    debugText = env->NewStringUTF(std::string(dataResponse.debugText.data(), dataResponse.debugText.size()).c_str());
+    jobject action;
+    std::string actionClassName     = "java/lang/Integer";
+    std::string actionCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(actionClassName.c_str(), actionCtorSignature.c_str(),
+                                                                  static_cast<uint8_t>(dataResponse.action), action);
+    jobject delayedActionTime;
+    std::string delayedActionTimeClassName     = "java/lang/Long";
+    std::string delayedActionTimeCtorSignature = "(J)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(delayedActionTimeClassName.c_str(),
+                                                                   delayedActionTimeCtorSignature.c_str(),
+                                                                   dataResponse.delayedActionTime, delayedActionTime);
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, errorCode, debugText);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, action, delayedActionTime);
 }
-CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback::
-    CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackType>(CallbackFn, this)
+CHIPGeneralCommissioningClusterArmFailSafeResponseCallback::CHIPGeneralCommissioningClusterArmFailSafeResponseCallback(
+    jobject javaCallback) :
+    Callback::Callback<CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1229,8 +1143,7 @@ CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback::
     }
 }
 
-CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback::
-    ~CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback()
+CHIPGeneralCommissioningClusterArmFailSafeResponseCallback::~CHIPGeneralCommissioningClusterArmFailSafeResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1241,9 +1154,8 @@ CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback::CallbackFn(
-    void * context,
-    const chip::app::Clusters::GeneralCommissioning::Commands::CommissioningCompleteResponse::DecodableType & dataResponse)
+void CHIPGeneralCommissioningClusterArmFailSafeResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::GeneralCommissioning::Commands::ArmFailSafeResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1253,10 +1165,10 @@ void CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback::Callb
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback,
-                    void (*)(CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback>);
+    std::unique_ptr<CHIPGeneralCommissioningClusterArmFailSafeResponseCallback,
+                    void (*)(CHIPGeneralCommissioningClusterArmFailSafeResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPGeneralCommissioningClusterArmFailSafeResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPGeneralCommissioningClusterArmFailSafeResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
@@ -1343,9 +1255,9 @@ void CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback::Callbac
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, errorCode, debugText);
 }
-CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback::
-    CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallbackType>(CallbackFn, this)
+CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback::
+    CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1361,8 +1273,8 @@ CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback::
     }
 }
 
-CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback::
-    ~CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback()
+CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback::
+    ~CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1373,9 +1285,9 @@ CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback::CallbackFn(
+void CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback::CallbackFn(
     void * context,
-    const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::DecodableType & dataResponse)
+    const chip::app::Clusters::GeneralCommissioning::Commands::CommissioningCompleteResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1385,39 +1297,33 @@ void CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback::Callback
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback,
-                    void (*)(CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback>);
+    std::unique_ptr<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback,
+                    void (*)(CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/ArrayList;)V", &javaMethod);
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/lang/String;)V",
+                                                  &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject GroupKeySetIDs;
-    chip::JniReferences::GetInstance().CreateArrayList(GroupKeySetIDs);
-
-    auto iter_GroupKeySetIDs_0 = dataResponse.groupKeySetIDs.begin();
-    while (iter_GroupKeySetIDs_0.Next())
-    {
-        auto & entry_0 = iter_GroupKeySetIDs_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Integer";
-        std::string newElement_0CtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(GroupKeySetIDs, newElement_0);
-    }
+    jobject errorCode;
+    std::string errorCodeClassName     = "java/lang/Integer";
+    std::string errorCodeCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(errorCodeClassName.c_str(), errorCodeCtorSignature.c_str(),
+                                                                  static_cast<uint8_t>(dataResponse.errorCode), errorCode);
+    jobject debugText;
+    debugText = env->NewStringUTF(std::string(dataResponse.debugText.data(), dataResponse.debugText.size()).c_str());
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, GroupKeySetIDs);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, errorCode, debugText);
 }
-CHIPGroupKeyManagementClusterKeySetReadResponseCallback::CHIPGroupKeyManagementClusterKeySetReadResponseCallback(
+CHIPNetworkCommissioningClusterScanNetworksResponseCallback::CHIPNetworkCommissioningClusterScanNetworksResponseCallback(
     jobject javaCallback) :
-    Callback::Callback<CHIPGroupKeyManagementClusterKeySetReadResponseCallbackType>(CallbackFn, this)
+    Callback::Callback<CHIPNetworkCommissioningClusterScanNetworksResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1433,7 +1339,7 @@ CHIPGroupKeyManagementClusterKeySetReadResponseCallback::CHIPGroupKeyManagementC
     }
 }
 
-CHIPGroupKeyManagementClusterKeySetReadResponseCallback::~CHIPGroupKeyManagementClusterKeySetReadResponseCallback()
+CHIPNetworkCommissioningClusterScanNetworksResponseCallback::~CHIPNetworkCommissioningClusterScanNetworksResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1444,8 +1350,8 @@ CHIPGroupKeyManagementClusterKeySetReadResponseCallback::~CHIPGroupKeyManagement
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPGroupKeyManagementClusterKeySetReadResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadResponse::DecodableType & dataResponse)
+void CHIPNetworkCommissioningClusterScanNetworksResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::NetworkCommissioning::Commands::ScanNetworksResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1455,10 +1361,10 @@ void CHIPGroupKeyManagementClusterKeySetReadResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPGroupKeyManagementClusterKeySetReadResponseCallback,
-                    void (*)(CHIPGroupKeyManagementClusterKeySetReadResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPGroupKeyManagementClusterKeySetReadResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPGroupKeyManagementClusterKeySetReadResponseCallback>);
+    std::unique_ptr<CHIPNetworkCommissioningClusterScanNetworksResponseCallback,
+                    void (*)(CHIPNetworkCommissioningClusterScanNetworksResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPNetworkCommissioningClusterScanNetworksResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPNetworkCommissioningClusterScanNetworksResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
@@ -1466,196 +1372,193 @@ void CHIPGroupKeyManagementClusterKeySetReadResponseCallback::CallbackFn(
     VerifyOrReturn(javaCallbackRef != nullptr);
 
     err = JniReferences::GetInstance().FindMethod(
-        env, javaCallbackRef, "onSuccess", "(Lchip/devicecontroller/ChipStructs$GroupKeyManagementClusterGroupKeySetStruct;)V",
+        env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V",
         &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject GroupKeySet;
-    jobject GroupKeySet_groupKeySetID;
-    std::string GroupKeySet_groupKeySetIDClassName     = "java/lang/Integer";
-    std::string GroupKeySet_groupKeySetIDCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-        GroupKeySet_groupKeySetIDClassName.c_str(), GroupKeySet_groupKeySetIDCtorSignature.c_str(),
-        dataResponse.groupKeySet.groupKeySetID, GroupKeySet_groupKeySetID);
-    jobject GroupKeySet_groupKeySecurityPolicy;
-    std::string GroupKeySet_groupKeySecurityPolicyClassName     = "java/lang/Integer";
-    std::string GroupKeySet_groupKeySecurityPolicyCtorSignature = "(I)V";
+    jobject NetworkingStatus;
+    std::string NetworkingStatusClassName     = "java/lang/Integer";
+    std::string NetworkingStatusCtorSignature = "(I)V";
     chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-        GroupKeySet_groupKeySecurityPolicyClassName.c_str(), GroupKeySet_groupKeySecurityPolicyCtorSignature.c_str(),
-        static_cast<uint8_t>(dataResponse.groupKeySet.groupKeySecurityPolicy), GroupKeySet_groupKeySecurityPolicy);
-    jobject GroupKeySet_epochKey0;
-    if (dataResponse.groupKeySet.epochKey0.IsNull())
-    {
-        GroupKeySet_epochKey0 = nullptr;
-    }
-    else
-    {
-        jbyteArray GroupKeySet_epochKey0ByteArray =
-            env->NewByteArray(static_cast<jsize>(dataResponse.groupKeySet.epochKey0.Value().size()));
-        env->SetByteArrayRegion(GroupKeySet_epochKey0ByteArray, 0,
-                                static_cast<jsize>(dataResponse.groupKeySet.epochKey0.Value().size()),
-                                reinterpret_cast<const jbyte *>(dataResponse.groupKeySet.epochKey0.Value().data()));
-        GroupKeySet_epochKey0 = GroupKeySet_epochKey0ByteArray;
-    }
-    jobject GroupKeySet_epochStartTime0;
-    if (dataResponse.groupKeySet.epochStartTime0.IsNull())
+        NetworkingStatusClassName.c_str(), NetworkingStatusCtorSignature.c_str(),
+        static_cast<uint8_t>(dataResponse.networkingStatus), NetworkingStatus);
+    jobject DebugText;
+    if (!dataResponse.debugText.HasValue())
     {
-        GroupKeySet_epochStartTime0 = nullptr;
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, DebugText);
     }
     else
     {
-        std::string GroupKeySet_epochStartTime0ClassName     = "java/lang/Long";
-        std::string GroupKeySet_epochStartTime0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(
-            GroupKeySet_epochStartTime0ClassName.c_str(), GroupKeySet_epochStartTime0CtorSignature.c_str(),
-            dataResponse.groupKeySet.epochStartTime0.Value(), GroupKeySet_epochStartTime0);
+        jobject DebugTextInsideOptional;
+        DebugTextInsideOptional =
+            env->NewStringUTF(std::string(dataResponse.debugText.Value().data(), dataResponse.debugText.Value().size()).c_str());
+        chip::JniReferences::GetInstance().CreateOptional(DebugTextInsideOptional, DebugText);
     }
-    jobject GroupKeySet_epochKey1;
-    if (dataResponse.groupKeySet.epochKey1.IsNull())
+    jobject WiFiScanResults;
+    if (!dataResponse.wiFiScanResults.HasValue())
     {
-        GroupKeySet_epochKey1 = nullptr;
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, WiFiScanResults);
     }
     else
     {
-        jbyteArray GroupKeySet_epochKey1ByteArray =
-            env->NewByteArray(static_cast<jsize>(dataResponse.groupKeySet.epochKey1.Value().size()));
-        env->SetByteArrayRegion(GroupKeySet_epochKey1ByteArray, 0,
-                                static_cast<jsize>(dataResponse.groupKeySet.epochKey1.Value().size()),
-                                reinterpret_cast<const jbyte *>(dataResponse.groupKeySet.epochKey1.Value().data()));
-        GroupKeySet_epochKey1 = GroupKeySet_epochKey1ByteArray;
-    }
-    jobject GroupKeySet_epochStartTime1;
-    if (dataResponse.groupKeySet.epochStartTime1.IsNull())
-    {
-        GroupKeySet_epochStartTime1 = nullptr;
-    }
-    else
-    {
-        std::string GroupKeySet_epochStartTime1ClassName     = "java/lang/Long";
-        std::string GroupKeySet_epochStartTime1CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(
-            GroupKeySet_epochStartTime1ClassName.c_str(), GroupKeySet_epochStartTime1CtorSignature.c_str(),
-            dataResponse.groupKeySet.epochStartTime1.Value(), GroupKeySet_epochStartTime1);
-    }
-    jobject GroupKeySet_epochKey2;
-    if (dataResponse.groupKeySet.epochKey2.IsNull())
-    {
-        GroupKeySet_epochKey2 = nullptr;
-    }
-    else
-    {
-        jbyteArray GroupKeySet_epochKey2ByteArray =
-            env->NewByteArray(static_cast<jsize>(dataResponse.groupKeySet.epochKey2.Value().size()));
-        env->SetByteArrayRegion(GroupKeySet_epochKey2ByteArray, 0,
-                                static_cast<jsize>(dataResponse.groupKeySet.epochKey2.Value().size()),
-                                reinterpret_cast<const jbyte *>(dataResponse.groupKeySet.epochKey2.Value().data()));
-        GroupKeySet_epochKey2 = GroupKeySet_epochKey2ByteArray;
-    }
-    jobject GroupKeySet_epochStartTime2;
-    if (dataResponse.groupKeySet.epochStartTime2.IsNull())
-    {
-        GroupKeySet_epochStartTime2 = nullptr;
-    }
-    else
-    {
-        std::string GroupKeySet_epochStartTime2ClassName     = "java/lang/Long";
-        std::string GroupKeySet_epochStartTime2CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(
-            GroupKeySet_epochStartTime2ClassName.c_str(), GroupKeySet_epochStartTime2CtorSignature.c_str(),
-            dataResponse.groupKeySet.epochStartTime2.Value(), GroupKeySet_epochStartTime2);
-    }
+        jobject WiFiScanResultsInsideOptional;
+        chip::JniReferences::GetInstance().CreateArrayList(WiFiScanResultsInsideOptional);
 
-    jclass groupKeySetStructStructClass;
-    err = chip::JniReferences::GetInstance().GetClassRef(
-        env, "chip/devicecontroller/ChipStructs$GroupKeyManagementClusterGroupKeySetStruct", groupKeySetStructStructClass);
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogError(Zcl, "Could not find class ChipStructs$GroupKeyManagementClusterGroupKeySetStruct");
-        return;
-    }
-    jmethodID groupKeySetStructStructCtor =
-        env->GetMethodID(groupKeySetStructStructClass, "<init>",
-                         "(Ljava/lang/Integer;Ljava/lang/Integer;[BLjava/lang/Long;[BLjava/lang/Long;[BLjava/lang/Long;)V");
-    if (groupKeySetStructStructCtor == nullptr)
-    {
-        ChipLogError(Zcl, "Could not find ChipStructs$GroupKeyManagementClusterGroupKeySetStruct constructor");
-        return;
-    }
+        auto iter_WiFiScanResultsInsideOptional_1 = dataResponse.wiFiScanResults.Value().begin();
+        while (iter_WiFiScanResultsInsideOptional_1.Next())
+        {
+            auto & entry_1 = iter_WiFiScanResultsInsideOptional_1.GetValue();
+            jobject newElement_1;
+            jobject newElement_1_security;
+            std::string newElement_1_securityClassName     = "java/lang/Integer";
+            std::string newElement_1_securityCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_1_securityClassName.c_str(),
+                                                                          newElement_1_securityCtorSignature.c_str(),
+                                                                          entry_1.security.Raw(), newElement_1_security);
+            jobject newElement_1_ssid;
+            jbyteArray newElement_1_ssidByteArray = env->NewByteArray(static_cast<jsize>(entry_1.ssid.size()));
+            env->SetByteArrayRegion(newElement_1_ssidByteArray, 0, static_cast<jsize>(entry_1.ssid.size()),
+                                    reinterpret_cast<const jbyte *>(entry_1.ssid.data()));
+            newElement_1_ssid = newElement_1_ssidByteArray;
+            jobject newElement_1_bssid;
+            jbyteArray newElement_1_bssidByteArray = env->NewByteArray(static_cast<jsize>(entry_1.bssid.size()));
+            env->SetByteArrayRegion(newElement_1_bssidByteArray, 0, static_cast<jsize>(entry_1.bssid.size()),
+                                    reinterpret_cast<const jbyte *>(entry_1.bssid.data()));
+            newElement_1_bssid = newElement_1_bssidByteArray;
+            jobject newElement_1_channel;
+            std::string newElement_1_channelClassName     = "java/lang/Integer";
+            std::string newElement_1_channelCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_1_channelClassName.c_str(),
+                                                                           newElement_1_channelCtorSignature.c_str(),
+                                                                           entry_1.channel, newElement_1_channel);
+            jobject newElement_1_wiFiBand;
+            std::string newElement_1_wiFiBandClassName     = "java/lang/Integer";
+            std::string newElement_1_wiFiBandCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                newElement_1_wiFiBandClassName.c_str(), newElement_1_wiFiBandCtorSignature.c_str(),
+                static_cast<uint8_t>(entry_1.wiFiBand), newElement_1_wiFiBand);
+            jobject newElement_1_rssi;
+            std::string newElement_1_rssiClassName     = "java/lang/Integer";
+            std::string newElement_1_rssiCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(
+                newElement_1_rssiClassName.c_str(), newElement_1_rssiCtorSignature.c_str(), entry_1.rssi, newElement_1_rssi);
 
-    GroupKeySet =
-        env->NewObject(groupKeySetStructStructClass, groupKeySetStructStructCtor, GroupKeySet_groupKeySetID,
-                       GroupKeySet_groupKeySecurityPolicy, GroupKeySet_epochKey0, GroupKeySet_epochStartTime0,
-                       GroupKeySet_epochKey1, GroupKeySet_epochStartTime1, GroupKeySet_epochKey2, GroupKeySet_epochStartTime2);
+            jclass wiFiInterfaceScanResultStructClass;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipStructs$NetworkCommissioningClusterWiFiInterfaceScanResult",
+                wiFiInterfaceScanResultStructClass);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl, "Could not find class ChipStructs$NetworkCommissioningClusterWiFiInterfaceScanResult");
+                return;
+            }
+            jmethodID wiFiInterfaceScanResultStructCtor =
+                env->GetMethodID(wiFiInterfaceScanResultStructClass, "<init>",
+                                 "(Ljava/lang/Integer;[B[BLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V");
+            if (wiFiInterfaceScanResultStructCtor == nullptr)
+            {
+                ChipLogError(Zcl, "Could not find ChipStructs$NetworkCommissioningClusterWiFiInterfaceScanResult constructor");
+                return;
+            }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, GroupKeySet);
-}
-CHIPGroupsClusterAddGroupResponseCallback::CHIPGroupsClusterAddGroupResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPGroupsClusterAddGroupResponseCallbackType>(CallbackFn, this)
-{
-    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-        return;
+            newElement_1 = env->NewObject(wiFiInterfaceScanResultStructClass, wiFiInterfaceScanResultStructCtor,
+                                          newElement_1_security, newElement_1_ssid, newElement_1_bssid, newElement_1_channel,
+                                          newElement_1_wiFiBand, newElement_1_rssi);
+            chip::JniReferences::GetInstance().AddToList(WiFiScanResultsInsideOptional, newElement_1);
+        }
+        chip::JniReferences::GetInstance().CreateOptional(WiFiScanResultsInsideOptional, WiFiScanResults);
     }
-
-    javaCallbackRef = env->NewGlobalRef(javaCallback);
-    if (javaCallbackRef == nullptr)
+    jobject ThreadScanResults;
+    if (!dataResponse.threadScanResults.HasValue())
     {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, ThreadScanResults);
     }
-}
-
-CHIPGroupsClusterAddGroupResponseCallback::~CHIPGroupsClusterAddGroupResponseCallback()
-{
-    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
+    else
     {
-        ChipLogError(Zcl, "Could not delete global reference for Java callback");
-        return;
-    }
-    env->DeleteGlobalRef(javaCallbackRef);
-};
-
-void CHIPGroupsClusterAddGroupResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType & dataResponse)
-{
-    chip::DeviceLayer::StackUnlock unlock;
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-    jobject javaCallbackRef;
-    jmethodID javaMethod;
-
-    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
-
-    std::unique_ptr<CHIPGroupsClusterAddGroupResponseCallback, void (*)(CHIPGroupsClusterAddGroupResponseCallback *)> cppCallback(
-        reinterpret_cast<CHIPGroupsClusterAddGroupResponseCallback *>(context),
-        chip::Platform::Delete<CHIPGroupsClusterAddGroupResponseCallback>);
-    VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
+        jobject ThreadScanResultsInsideOptional;
+        chip::JniReferences::GetInstance().CreateArrayList(ThreadScanResultsInsideOptional);
 
-    javaCallbackRef = cppCallback->javaCallbackRef;
-    // Java callback is allowed to be null, exit early if this is the case.
-    VerifyOrReturn(javaCallbackRef != nullptr);
+        auto iter_ThreadScanResultsInsideOptional_1 = dataResponse.threadScanResults.Value().begin();
+        while (iter_ThreadScanResultsInsideOptional_1.Next())
+        {
+            auto & entry_1 = iter_ThreadScanResultsInsideOptional_1.GetValue();
+            jobject newElement_1;
+            jobject newElement_1_panId;
+            std::string newElement_1_panIdClassName     = "java/lang/Integer";
+            std::string newElement_1_panIdCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+                newElement_1_panIdClassName.c_str(), newElement_1_panIdCtorSignature.c_str(), entry_1.panId, newElement_1_panId);
+            jobject newElement_1_extendedPanId;
+            std::string newElement_1_extendedPanIdClassName     = "java/lang/Long";
+            std::string newElement_1_extendedPanIdCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_1_extendedPanIdClassName.c_str(),
+                                                                           newElement_1_extendedPanIdCtorSignature.c_str(),
+                                                                           entry_1.extendedPanId, newElement_1_extendedPanId);
+            jobject newElement_1_networkName;
+            newElement_1_networkName =
+                env->NewStringUTF(std::string(entry_1.networkName.data(), entry_1.networkName.size()).c_str());
+            jobject newElement_1_channel;
+            std::string newElement_1_channelClassName     = "java/lang/Integer";
+            std::string newElement_1_channelCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_1_channelClassName.c_str(),
+                                                                           newElement_1_channelCtorSignature.c_str(),
+                                                                           entry_1.channel, newElement_1_channel);
+            jobject newElement_1_version;
+            std::string newElement_1_versionClassName     = "java/lang/Integer";
+            std::string newElement_1_versionCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_1_versionClassName.c_str(),
+                                                                          newElement_1_versionCtorSignature.c_str(),
+                                                                          entry_1.version, newElement_1_version);
+            jobject newElement_1_extendedAddress;
+            jbyteArray newElement_1_extendedAddressByteArray =
+                env->NewByteArray(static_cast<jsize>(entry_1.extendedAddress.size()));
+            env->SetByteArrayRegion(newElement_1_extendedAddressByteArray, 0, static_cast<jsize>(entry_1.extendedAddress.size()),
+                                    reinterpret_cast<const jbyte *>(entry_1.extendedAddress.data()));
+            newElement_1_extendedAddress = newElement_1_extendedAddressByteArray;
+            jobject newElement_1_rssi;
+            std::string newElement_1_rssiClassName     = "java/lang/Integer";
+            std::string newElement_1_rssiCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(
+                newElement_1_rssiClassName.c_str(), newElement_1_rssiCtorSignature.c_str(), entry_1.rssi, newElement_1_rssi);
+            jobject newElement_1_lqi;
+            std::string newElement_1_lqiClassName     = "java/lang/Integer";
+            std::string newElement_1_lqiCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                newElement_1_lqiClassName.c_str(), newElement_1_lqiCtorSignature.c_str(), entry_1.lqi, newElement_1_lqi);
 
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/lang/Integer;)V",
-                                                  &javaMethod);
-    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
+            jclass threadInterfaceScanResultStructClass;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipStructs$NetworkCommissioningClusterThreadInterfaceScanResult",
+                threadInterfaceScanResultStructClass);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl, "Could not find class ChipStructs$NetworkCommissioningClusterThreadInterfaceScanResult");
+                return;
+            }
+            jmethodID threadInterfaceScanResultStructCtor =
+                env->GetMethodID(threadInterfaceScanResultStructClass, "<init>",
+                                 "(Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/"
+                                 "Integer;[BLjava/lang/Integer;Ljava/lang/Integer;)V");
+            if (threadInterfaceScanResultStructCtor == nullptr)
+            {
+                ChipLogError(Zcl, "Could not find ChipStructs$NetworkCommissioningClusterThreadInterfaceScanResult constructor");
+                return;
+            }
 
-    jobject status;
-    std::string statusClassName     = "java/lang/Integer";
-    std::string statusCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
-                                                                  dataResponse.status, status);
-    jobject groupId;
-    std::string groupIdClassName     = "java/lang/Integer";
-    std::string groupIdCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(groupIdClassName.c_str(), groupIdCtorSignature.c_str(),
-                                                                   dataResponse.groupId, groupId);
+            newElement_1 =
+                env->NewObject(threadInterfaceScanResultStructClass, threadInterfaceScanResultStructCtor, newElement_1_panId,
+                               newElement_1_extendedPanId, newElement_1_networkName, newElement_1_channel, newElement_1_version,
+                               newElement_1_extendedAddress, newElement_1_rssi, newElement_1_lqi);
+            chip::JniReferences::GetInstance().AddToList(ThreadScanResultsInsideOptional, newElement_1);
+        }
+        chip::JniReferences::GetInstance().CreateOptional(ThreadScanResultsInsideOptional, ThreadScanResults);
+    }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, status, groupId);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, NetworkingStatus, DebugText, WiFiScanResults, ThreadScanResults);
 }
-CHIPGroupsClusterGetGroupMembershipResponseCallback::CHIPGroupsClusterGetGroupMembershipResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPGroupsClusterGetGroupMembershipResponseCallbackType>(CallbackFn, this)
+CHIPNetworkCommissioningClusterNetworkConfigResponseCallback::CHIPNetworkCommissioningClusterNetworkConfigResponseCallback(
+    jobject javaCallback) :
+    Callback::Callback<CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1671,7 +1574,7 @@ CHIPGroupsClusterGetGroupMembershipResponseCallback::CHIPGroupsClusterGetGroupMe
     }
 }
 
-CHIPGroupsClusterGetGroupMembershipResponseCallback::~CHIPGroupsClusterGetGroupMembershipResponseCallback()
+CHIPNetworkCommissioningClusterNetworkConfigResponseCallback::~CHIPNetworkCommissioningClusterNetworkConfigResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1682,8 +1585,8 @@ CHIPGroupsClusterGetGroupMembershipResponseCallback::~CHIPGroupsClusterGetGroupM
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPGroupsClusterGetGroupMembershipResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType & dataResponse)
+void CHIPNetworkCommissioningClusterNetworkConfigResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::NetworkCommissioning::Commands::NetworkConfigResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1693,51 +1596,59 @@ void CHIPGroupsClusterGetGroupMembershipResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPGroupsClusterGetGroupMembershipResponseCallback,
-                    void (*)(CHIPGroupsClusterGetGroupMembershipResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPGroupsClusterGetGroupMembershipResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPGroupsClusterGetGroupMembershipResponseCallback>);
+    std::unique_ptr<CHIPNetworkCommissioningClusterNetworkConfigResponseCallback,
+                    void (*)(CHIPNetworkCommissioningClusterNetworkConfigResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPNetworkCommissioningClusterNetworkConfigResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPNetworkCommissioningClusterNetworkConfigResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/util/ArrayList;)V",
-                                                  &javaMethod);
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess",
+                                                  "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject capacity;
-    if (dataResponse.capacity.IsNull())
+    jobject NetworkingStatus;
+    std::string NetworkingStatusClassName     = "java/lang/Integer";
+    std::string NetworkingStatusCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+        NetworkingStatusClassName.c_str(), NetworkingStatusCtorSignature.c_str(),
+        static_cast<uint8_t>(dataResponse.networkingStatus), NetworkingStatus);
+    jobject DebugText;
+    if (!dataResponse.debugText.HasValue())
     {
-        capacity = nullptr;
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, DebugText);
     }
     else
     {
-        std::string capacityClassName     = "java/lang/Integer";
-        std::string capacityCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(capacityClassName.c_str(), capacityCtorSignature.c_str(),
-                                                                      dataResponse.capacity.Value(), capacity);
+        jobject DebugTextInsideOptional;
+        DebugTextInsideOptional =
+            env->NewStringUTF(std::string(dataResponse.debugText.Value().data(), dataResponse.debugText.Value().size()).c_str());
+        chip::JniReferences::GetInstance().CreateOptional(DebugTextInsideOptional, DebugText);
     }
-    jobject groupList;
-    chip::JniReferences::GetInstance().CreateArrayList(groupList);
-
-    auto iter_groupList_0 = dataResponse.groupList.begin();
-    while (iter_groupList_0.Next())
+    jobject NetworkIndex;
+    if (!dataResponse.networkIndex.HasValue())
     {
-        auto & entry_0 = iter_groupList_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Integer";
-        std::string newElement_0CtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(groupList, newElement_0);
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, NetworkIndex);
+    }
+    else
+    {
+        jobject NetworkIndexInsideOptional;
+        std::string NetworkIndexInsideOptionalClassName     = "java/lang/Integer";
+        std::string NetworkIndexInsideOptionalCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+            NetworkIndexInsideOptionalClassName.c_str(), NetworkIndexInsideOptionalCtorSignature.c_str(),
+            dataResponse.networkIndex.Value(), NetworkIndexInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(NetworkIndexInsideOptional, NetworkIndex);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, capacity, groupList);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, NetworkingStatus, DebugText, NetworkIndex);
 }
-CHIPGroupsClusterRemoveGroupResponseCallback::CHIPGroupsClusterRemoveGroupResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPGroupsClusterRemoveGroupResponseCallbackType>(CallbackFn, this)
+CHIPNetworkCommissioningClusterConnectNetworkResponseCallback::CHIPNetworkCommissioningClusterConnectNetworkResponseCallback(
+    jobject javaCallback) :
+    Callback::Callback<CHIPNetworkCommissioningClusterConnectNetworkResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1753,7 +1664,7 @@ CHIPGroupsClusterRemoveGroupResponseCallback::CHIPGroupsClusterRemoveGroupRespon
     }
 }
 
-CHIPGroupsClusterRemoveGroupResponseCallback::~CHIPGroupsClusterRemoveGroupResponseCallback()
+CHIPNetworkCommissioningClusterConnectNetworkResponseCallback::~CHIPNetworkCommissioningClusterConnectNetworkResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1764,8 +1675,8 @@ CHIPGroupsClusterRemoveGroupResponseCallback::~CHIPGroupsClusterRemoveGroupRespo
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPGroupsClusterRemoveGroupResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType & dataResponse)
+void CHIPNetworkCommissioningClusterConnectNetworkResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::NetworkCommissioning::Commands::ConnectNetworkResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1775,34 +1686,55 @@ void CHIPGroupsClusterRemoveGroupResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPGroupsClusterRemoveGroupResponseCallback, void (*)(CHIPGroupsClusterRemoveGroupResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPGroupsClusterRemoveGroupResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPGroupsClusterRemoveGroupResponseCallback>);
+    std::unique_ptr<CHIPNetworkCommissioningClusterConnectNetworkResponseCallback,
+                    void (*)(CHIPNetworkCommissioningClusterConnectNetworkResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPNetworkCommissioningClusterConnectNetworkResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPNetworkCommissioningClusterConnectNetworkResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/lang/Integer;)V",
-                                                  &javaMethod);
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess",
+                                                  "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject status;
-    std::string statusClassName     = "java/lang/Integer";
-    std::string statusCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
-                                                                  dataResponse.status, status);
-    jobject groupId;
-    std::string groupIdClassName     = "java/lang/Integer";
-    std::string groupIdCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(groupIdClassName.c_str(), groupIdCtorSignature.c_str(),
-                                                                   dataResponse.groupId, groupId);
+    jobject NetworkingStatus;
+    std::string NetworkingStatusClassName     = "java/lang/Integer";
+    std::string NetworkingStatusCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+        NetworkingStatusClassName.c_str(), NetworkingStatusCtorSignature.c_str(),
+        static_cast<uint8_t>(dataResponse.networkingStatus), NetworkingStatus);
+    jobject DebugText;
+    if (!dataResponse.debugText.HasValue())
+    {
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, DebugText);
+    }
+    else
+    {
+        jobject DebugTextInsideOptional;
+        DebugTextInsideOptional =
+            env->NewStringUTF(std::string(dataResponse.debugText.Value().data(), dataResponse.debugText.Value().size()).c_str());
+        chip::JniReferences::GetInstance().CreateOptional(DebugTextInsideOptional, DebugText);
+    }
+    jobject ErrorValue;
+    if (dataResponse.errorValue.IsNull())
+    {
+        ErrorValue = nullptr;
+    }
+    else
+    {
+        std::string ErrorValueClassName     = "java/lang/Long";
+        std::string ErrorValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int32_t>(ErrorValueClassName.c_str(), ErrorValueCtorSignature.c_str(),
+                                                                      dataResponse.errorValue.Value(), ErrorValue);
+    }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, status, groupId);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, NetworkingStatus, DebugText, ErrorValue);
 }
-CHIPGroupsClusterViewGroupResponseCallback::CHIPGroupsClusterViewGroupResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPGroupsClusterViewGroupResponseCallbackType>(CallbackFn, this)
+CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback::CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1818,7 +1750,7 @@ CHIPGroupsClusterViewGroupResponseCallback::CHIPGroupsClusterViewGroupResponseCa
     }
 }
 
-CHIPGroupsClusterViewGroupResponseCallback::~CHIPGroupsClusterViewGroupResponseCallback()
+CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback::~CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1829,8 +1761,8 @@ CHIPGroupsClusterViewGroupResponseCallback::~CHIPGroupsClusterViewGroupResponseC
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPGroupsClusterViewGroupResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType & dataResponse)
+void CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1840,9 +1772,10 @@ void CHIPGroupsClusterViewGroupResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPGroupsClusterViewGroupResponseCallback, void (*)(CHIPGroupsClusterViewGroupResponseCallback *)> cppCallback(
-        reinterpret_cast<CHIPGroupsClusterViewGroupResponseCallback *>(context),
-        chip::Platform::Delete<CHIPGroupsClusterViewGroupResponseCallback>);
+    std::unique_ptr<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback,
+                    void (*)(CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
@@ -1850,26 +1783,35 @@ void CHIPGroupsClusterViewGroupResponseCallback::CallbackFn(
     VerifyOrReturn(javaCallbackRef != nullptr);
 
     err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess",
-                                                  "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;)V", &javaMethod);
+                                                  "(Ljava/lang/Integer;[BLjava/lang/Long;Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
     jobject status;
     std::string statusClassName     = "java/lang/Integer";
     std::string statusCtorSignature = "(I)V";
     chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
-                                                                  dataResponse.status, status);
-    jobject groupId;
-    std::string groupIdClassName     = "java/lang/Integer";
-    std::string groupIdCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(groupIdClassName.c_str(), groupIdCtorSignature.c_str(),
-                                                                   dataResponse.groupId, groupId);
-    jobject groupName;
-    groupName = env->NewStringUTF(std::string(dataResponse.groupName.data(), dataResponse.groupName.size()).c_str());
+                                                                  static_cast<uint8_t>(dataResponse.status), status);
+    jobject content;
+    jbyteArray contentByteArray = env->NewByteArray(static_cast<jsize>(dataResponse.content.size()));
+    env->SetByteArrayRegion(contentByteArray, 0, static_cast<jsize>(dataResponse.content.size()),
+                            reinterpret_cast<const jbyte *>(dataResponse.content.data()));
+    content = contentByteArray;
+    jobject timeStamp;
+    std::string timeStampClassName     = "java/lang/Long";
+    std::string timeStampCtorSignature = "(J)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(timeStampClassName.c_str(), timeStampCtorSignature.c_str(),
+                                                                   dataResponse.timeStamp, timeStamp);
+    jobject timeSinceBoot;
+    std::string timeSinceBootClassName     = "java/lang/Long";
+    std::string timeSinceBootCtorSignature = "(J)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+        timeSinceBootClassName.c_str(), timeSinceBootCtorSignature.c_str(), dataResponse.timeSinceBoot, timeSinceBoot);
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, status, groupId, groupName);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, status, content, timeStamp, timeSinceBoot);
 }
-CHIPKeypadInputClusterSendKeyResponseCallback::CHIPKeypadInputClusterSendKeyResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPKeypadInputClusterSendKeyResponseCallbackType>(CallbackFn, this)
+CHIPOperationalCredentialsClusterAttestationResponseCallback::CHIPOperationalCredentialsClusterAttestationResponseCallback(
+    jobject javaCallback) :
+    Callback::Callback<CHIPOperationalCredentialsClusterAttestationResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1885,7 +1827,7 @@ CHIPKeypadInputClusterSendKeyResponseCallback::CHIPKeypadInputClusterSendKeyResp
     }
 }
 
-CHIPKeypadInputClusterSendKeyResponseCallback::~CHIPKeypadInputClusterSendKeyResponseCallback()
+CHIPOperationalCredentialsClusterAttestationResponseCallback::~CHIPOperationalCredentialsClusterAttestationResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1896,8 +1838,8 @@ CHIPKeypadInputClusterSendKeyResponseCallback::~CHIPKeypadInputClusterSendKeyRes
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPKeypadInputClusterSendKeyResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType & dataResponse)
+void CHIPOperationalCredentialsClusterAttestationResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::OperationalCredentials::Commands::AttestationResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1907,28 +1849,35 @@ void CHIPKeypadInputClusterSendKeyResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPKeypadInputClusterSendKeyResponseCallback, void (*)(CHIPKeypadInputClusterSendKeyResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPKeypadInputClusterSendKeyResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPKeypadInputClusterSendKeyResponseCallback>);
+    std::unique_ptr<CHIPOperationalCredentialsClusterAttestationResponseCallback,
+                    void (*)(CHIPOperationalCredentialsClusterAttestationResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPOperationalCredentialsClusterAttestationResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPOperationalCredentialsClusterAttestationResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B[B)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject status;
-    std::string statusClassName     = "java/lang/Integer";
-    std::string statusCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
-                                                                  static_cast<uint8_t>(dataResponse.status), status);
+    jobject AttestationElements;
+    jbyteArray AttestationElementsByteArray = env->NewByteArray(static_cast<jsize>(dataResponse.attestationElements.size()));
+    env->SetByteArrayRegion(AttestationElementsByteArray, 0, static_cast<jsize>(dataResponse.attestationElements.size()),
+                            reinterpret_cast<const jbyte *>(dataResponse.attestationElements.data()));
+    AttestationElements = AttestationElementsByteArray;
+    jobject Signature;
+    jbyteArray SignatureByteArray = env->NewByteArray(static_cast<jsize>(dataResponse.signature.size()));
+    env->SetByteArrayRegion(SignatureByteArray, 0, static_cast<jsize>(dataResponse.signature.size()),
+                            reinterpret_cast<const jbyte *>(dataResponse.signature.data()));
+    Signature = SignatureByteArray;
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, status);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, AttestationElements, Signature);
 }
-CHIPMediaPlaybackClusterPlaybackResponseCallback::CHIPMediaPlaybackClusterPlaybackResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>(CallbackFn, this)
+CHIPOperationalCredentialsClusterCertificateChainResponseCallback::
+    CHIPOperationalCredentialsClusterCertificateChainResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPOperationalCredentialsClusterCertificateChainResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1944,7 +1893,8 @@ CHIPMediaPlaybackClusterPlaybackResponseCallback::CHIPMediaPlaybackClusterPlayba
     }
 }
 
-CHIPMediaPlaybackClusterPlaybackResponseCallback::~CHIPMediaPlaybackClusterPlaybackResponseCallback()
+CHIPOperationalCredentialsClusterCertificateChainResponseCallback::
+    ~CHIPOperationalCredentialsClusterCertificateChainResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1955,8 +1905,9 @@ CHIPMediaPlaybackClusterPlaybackResponseCallback::~CHIPMediaPlaybackClusterPlayb
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPMediaPlaybackClusterPlaybackResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType & dataResponse)
+void CHIPOperationalCredentialsClusterCertificateChainResponseCallback::CallbackFn(
+    void * context,
+    const chip::app::Clusters::OperationalCredentials::Commands::CertificateChainResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1966,42 +1917,29 @@ void CHIPMediaPlaybackClusterPlaybackResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPMediaPlaybackClusterPlaybackResponseCallback, void (*)(CHIPMediaPlaybackClusterPlaybackResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPMediaPlaybackClusterPlaybackResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPMediaPlaybackClusterPlaybackResponseCallback>);
+    std::unique_ptr<CHIPOperationalCredentialsClusterCertificateChainResponseCallback,
+                    void (*)(CHIPOperationalCredentialsClusterCertificateChainResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPOperationalCredentialsClusterCertificateChainResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPOperationalCredentialsClusterCertificateChainResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/util/Optional;)V",
-                                                  &javaMethod);
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject status;
-    std::string statusClassName     = "java/lang/Integer";
-    std::string statusCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
-                                                                  static_cast<uint8_t>(dataResponse.status), status);
-    jobject data;
-    if (!dataResponse.data.HasValue())
-    {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, data);
-    }
-    else
-    {
-        jobject dataInsideOptional;
-        dataInsideOptional =
-            env->NewStringUTF(std::string(dataResponse.data.Value().data(), dataResponse.data.Value().size()).c_str());
-        chip::JniReferences::GetInstance().CreateOptional(dataInsideOptional, data);
-    }
+    jobject Certificate;
+    jbyteArray CertificateByteArray = env->NewByteArray(static_cast<jsize>(dataResponse.certificate.size()));
+    env->SetByteArrayRegion(CertificateByteArray, 0, static_cast<jsize>(dataResponse.certificate.size()),
+                            reinterpret_cast<const jbyte *>(dataResponse.certificate.data()));
+    Certificate = CertificateByteArray;
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, status, data);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, Certificate);
 }
-CHIPNetworkCommissioningClusterConnectNetworkResponseCallback::CHIPNetworkCommissioningClusterConnectNetworkResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPNetworkCommissioningClusterConnectNetworkResponseCallbackType>(CallbackFn, this)
+CHIPOperationalCredentialsClusterCSRResponseCallback::CHIPOperationalCredentialsClusterCSRResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPOperationalCredentialsClusterCSRResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2017,7 +1955,7 @@ CHIPNetworkCommissioningClusterConnectNetworkResponseCallback::CHIPNetworkCommis
     }
 }
 
-CHIPNetworkCommissioningClusterConnectNetworkResponseCallback::~CHIPNetworkCommissioningClusterConnectNetworkResponseCallback()
+CHIPOperationalCredentialsClusterCSRResponseCallback::~CHIPOperationalCredentialsClusterCSRResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2028,8 +1966,8 @@ CHIPNetworkCommissioningClusterConnectNetworkResponseCallback::~CHIPNetworkCommi
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPNetworkCommissioningClusterConnectNetworkResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::NetworkCommissioning::Commands::ConnectNetworkResponse::DecodableType & dataResponse)
+void CHIPOperationalCredentialsClusterCSRResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::OperationalCredentials::Commands::CSRResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -2039,56 +1977,34 @@ void CHIPNetworkCommissioningClusterConnectNetworkResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPNetworkCommissioningClusterConnectNetworkResponseCallback,
-                    void (*)(CHIPNetworkCommissioningClusterConnectNetworkResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPNetworkCommissioningClusterConnectNetworkResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPNetworkCommissioningClusterConnectNetworkResponseCallback>);
+    std::unique_ptr<CHIPOperationalCredentialsClusterCSRResponseCallback,
+                    void (*)(CHIPOperationalCredentialsClusterCSRResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPOperationalCredentialsClusterCSRResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPOperationalCredentialsClusterCSRResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess",
-                                                  "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/lang/Long;)V", &javaMethod);
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B[B)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject NetworkingStatus;
-    std::string NetworkingStatusClassName     = "java/lang/Integer";
-    std::string NetworkingStatusCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-        NetworkingStatusClassName.c_str(), NetworkingStatusCtorSignature.c_str(),
-        static_cast<uint8_t>(dataResponse.networkingStatus), NetworkingStatus);
-    jobject DebugText;
-    if (!dataResponse.debugText.HasValue())
-    {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, DebugText);
-    }
-    else
-    {
-        jobject DebugTextInsideOptional;
-        DebugTextInsideOptional =
-            env->NewStringUTF(std::string(dataResponse.debugText.Value().data(), dataResponse.debugText.Value().size()).c_str());
-        chip::JniReferences::GetInstance().CreateOptional(DebugTextInsideOptional, DebugText);
-    }
-    jobject ErrorValue;
-    if (dataResponse.errorValue.IsNull())
-    {
-        ErrorValue = nullptr;
-    }
-    else
-    {
-        std::string ErrorValueClassName     = "java/lang/Long";
-        std::string ErrorValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int32_t>(ErrorValueClassName.c_str(), ErrorValueCtorSignature.c_str(),
-                                                                      dataResponse.errorValue.Value(), ErrorValue);
-    }
+    jobject NOCSRElements;
+    jbyteArray NOCSRElementsByteArray = env->NewByteArray(static_cast<jsize>(dataResponse.NOCSRElements.size()));
+    env->SetByteArrayRegion(NOCSRElementsByteArray, 0, static_cast<jsize>(dataResponse.NOCSRElements.size()),
+                            reinterpret_cast<const jbyte *>(dataResponse.NOCSRElements.data()));
+    NOCSRElements = NOCSRElementsByteArray;
+    jobject AttestationSignature;
+    jbyteArray AttestationSignatureByteArray = env->NewByteArray(static_cast<jsize>(dataResponse.attestationSignature.size()));
+    env->SetByteArrayRegion(AttestationSignatureByteArray, 0, static_cast<jsize>(dataResponse.attestationSignature.size()),
+                            reinterpret_cast<const jbyte *>(dataResponse.attestationSignature.data()));
+    AttestationSignature = AttestationSignatureByteArray;
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, NetworkingStatus, DebugText, ErrorValue);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, NOCSRElements, AttestationSignature);
 }
-CHIPNetworkCommissioningClusterNetworkConfigResponseCallback::CHIPNetworkCommissioningClusterNetworkConfigResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackType>(CallbackFn, this)
+CHIPOperationalCredentialsClusterNOCResponseCallback::CHIPOperationalCredentialsClusterNOCResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPOperationalCredentialsClusterNOCResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2104,7 +2020,7 @@ CHIPNetworkCommissioningClusterNetworkConfigResponseCallback::CHIPNetworkCommiss
     }
 }
 
-CHIPNetworkCommissioningClusterNetworkConfigResponseCallback::~CHIPNetworkCommissioningClusterNetworkConfigResponseCallback()
+CHIPOperationalCredentialsClusterNOCResponseCallback::~CHIPOperationalCredentialsClusterNOCResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2115,8 +2031,8 @@ CHIPNetworkCommissioningClusterNetworkConfigResponseCallback::~CHIPNetworkCommis
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPNetworkCommissioningClusterNetworkConfigResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::NetworkCommissioning::Commands::NetworkConfigResponse::DecodableType & dataResponse)
+void CHIPOperationalCredentialsClusterNOCResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -2126,10 +2042,10 @@ void CHIPNetworkCommissioningClusterNetworkConfigResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPNetworkCommissioningClusterNetworkConfigResponseCallback,
-                    void (*)(CHIPNetworkCommissioningClusterNetworkConfigResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPNetworkCommissioningClusterNetworkConfigResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPNetworkCommissioningClusterNetworkConfigResponseCallback>);
+    std::unique_ptr<CHIPOperationalCredentialsClusterNOCResponseCallback,
+                    void (*)(CHIPOperationalCredentialsClusterNOCResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPOperationalCredentialsClusterNOCResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPOperationalCredentialsClusterNOCResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
@@ -2140,12 +2056,26 @@ void CHIPNetworkCommissioningClusterNetworkConfigResponseCallback::CallbackFn(
                                                   "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject NetworkingStatus;
-    std::string NetworkingStatusClassName     = "java/lang/Integer";
-    std::string NetworkingStatusCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-        NetworkingStatusClassName.c_str(), NetworkingStatusCtorSignature.c_str(),
-        static_cast<uint8_t>(dataResponse.networkingStatus), NetworkingStatus);
+    jobject StatusCode;
+    std::string StatusCodeClassName     = "java/lang/Integer";
+    std::string StatusCodeCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(StatusCodeClassName.c_str(), StatusCodeCtorSignature.c_str(),
+                                                                  static_cast<uint8_t>(dataResponse.statusCode), StatusCode);
+    jobject FabricIndex;
+    if (!dataResponse.fabricIndex.HasValue())
+    {
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, FabricIndex);
+    }
+    else
+    {
+        jobject FabricIndexInsideOptional;
+        std::string FabricIndexInsideOptionalClassName     = "java/lang/Integer";
+        std::string FabricIndexInsideOptionalCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(FabricIndexInsideOptionalClassName.c_str(),
+                                                                      FabricIndexInsideOptionalCtorSignature.c_str(),
+                                                                      dataResponse.fabricIndex.Value(), FabricIndexInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(FabricIndexInsideOptional, FabricIndex);
+    }
     jobject DebugText;
     if (!dataResponse.debugText.HasValue())
     {
@@ -2158,27 +2088,12 @@ void CHIPNetworkCommissioningClusterNetworkConfigResponseCallback::CallbackFn(
             env->NewStringUTF(std::string(dataResponse.debugText.Value().data(), dataResponse.debugText.Value().size()).c_str());
         chip::JniReferences::GetInstance().CreateOptional(DebugTextInsideOptional, DebugText);
     }
-    jobject NetworkIndex;
-    if (!dataResponse.networkIndex.HasValue())
-    {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, NetworkIndex);
-    }
-    else
-    {
-        jobject NetworkIndexInsideOptional;
-        std::string NetworkIndexInsideOptionalClassName     = "java/lang/Integer";
-        std::string NetworkIndexInsideOptionalCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-            NetworkIndexInsideOptionalClassName.c_str(), NetworkIndexInsideOptionalCtorSignature.c_str(),
-            dataResponse.networkIndex.Value(), NetworkIndexInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(NetworkIndexInsideOptional, NetworkIndex);
-    }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, NetworkingStatus, DebugText, NetworkIndex);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, StatusCode, FabricIndex, DebugText);
 }
-CHIPNetworkCommissioningClusterScanNetworksResponseCallback::CHIPNetworkCommissioningClusterScanNetworksResponseCallback(
+CHIPGroupKeyManagementClusterKeySetReadResponseCallback::CHIPGroupKeyManagementClusterKeySetReadResponseCallback(
     jobject javaCallback) :
-    Callback::Callback<CHIPNetworkCommissioningClusterScanNetworksResponseCallbackType>(CallbackFn, this)
+    Callback::Callback<CHIPGroupKeyManagementClusterKeySetReadResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2194,7 +2109,7 @@ CHIPNetworkCommissioningClusterScanNetworksResponseCallback::CHIPNetworkCommissi
     }
 }
 
-CHIPNetworkCommissioningClusterScanNetworksResponseCallback::~CHIPNetworkCommissioningClusterScanNetworksResponseCallback()
+CHIPGroupKeyManagementClusterKeySetReadResponseCallback::~CHIPGroupKeyManagementClusterKeySetReadResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2205,8 +2120,8 @@ CHIPNetworkCommissioningClusterScanNetworksResponseCallback::~CHIPNetworkCommiss
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPNetworkCommissioningClusterScanNetworksResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::NetworkCommissioning::Commands::ScanNetworksResponse::DecodableType & dataResponse)
+void CHIPGroupKeyManagementClusterKeySetReadResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -2216,10 +2131,10 @@ void CHIPNetworkCommissioningClusterScanNetworksResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPNetworkCommissioningClusterScanNetworksResponseCallback,
-                    void (*)(CHIPNetworkCommissioningClusterScanNetworksResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPNetworkCommissioningClusterScanNetworksResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPNetworkCommissioningClusterScanNetworksResponseCallback>);
+    std::unique_ptr<CHIPGroupKeyManagementClusterKeySetReadResponseCallback,
+                    void (*)(CHIPGroupKeyManagementClusterKeySetReadResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPGroupKeyManagementClusterKeySetReadResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPGroupKeyManagementClusterKeySetReadResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
@@ -2227,193 +2142,132 @@ void CHIPNetworkCommissioningClusterScanNetworksResponseCallback::CallbackFn(
     VerifyOrReturn(javaCallbackRef != nullptr);
 
     err = JniReferences::GetInstance().FindMethod(
-        env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V",
+        env, javaCallbackRef, "onSuccess", "(Lchip/devicecontroller/ChipStructs$GroupKeyManagementClusterGroupKeySetStruct;)V",
         &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject NetworkingStatus;
-    std::string NetworkingStatusClassName     = "java/lang/Integer";
-    std::string NetworkingStatusCtorSignature = "(I)V";
+    jobject GroupKeySet;
+    jobject GroupKeySet_groupKeySetID;
+    std::string GroupKeySet_groupKeySetIDClassName     = "java/lang/Integer";
+    std::string GroupKeySet_groupKeySetIDCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+        GroupKeySet_groupKeySetIDClassName.c_str(), GroupKeySet_groupKeySetIDCtorSignature.c_str(),
+        dataResponse.groupKeySet.groupKeySetID, GroupKeySet_groupKeySetID);
+    jobject GroupKeySet_groupKeySecurityPolicy;
+    std::string GroupKeySet_groupKeySecurityPolicyClassName     = "java/lang/Integer";
+    std::string GroupKeySet_groupKeySecurityPolicyCtorSignature = "(I)V";
     chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-        NetworkingStatusClassName.c_str(), NetworkingStatusCtorSignature.c_str(),
-        static_cast<uint8_t>(dataResponse.networkingStatus), NetworkingStatus);
-    jobject DebugText;
-    if (!dataResponse.debugText.HasValue())
+        GroupKeySet_groupKeySecurityPolicyClassName.c_str(), GroupKeySet_groupKeySecurityPolicyCtorSignature.c_str(),
+        static_cast<uint8_t>(dataResponse.groupKeySet.groupKeySecurityPolicy), GroupKeySet_groupKeySecurityPolicy);
+    jobject GroupKeySet_epochKey0;
+    if (dataResponse.groupKeySet.epochKey0.IsNull())
+    {
+        GroupKeySet_epochKey0 = nullptr;
+    }
+    else
+    {
+        jbyteArray GroupKeySet_epochKey0ByteArray =
+            env->NewByteArray(static_cast<jsize>(dataResponse.groupKeySet.epochKey0.Value().size()));
+        env->SetByteArrayRegion(GroupKeySet_epochKey0ByteArray, 0,
+                                static_cast<jsize>(dataResponse.groupKeySet.epochKey0.Value().size()),
+                                reinterpret_cast<const jbyte *>(dataResponse.groupKeySet.epochKey0.Value().data()));
+        GroupKeySet_epochKey0 = GroupKeySet_epochKey0ByteArray;
+    }
+    jobject GroupKeySet_epochStartTime0;
+    if (dataResponse.groupKeySet.epochStartTime0.IsNull())
+    {
+        GroupKeySet_epochStartTime0 = nullptr;
+    }
+    else
+    {
+        std::string GroupKeySet_epochStartTime0ClassName     = "java/lang/Long";
+        std::string GroupKeySet_epochStartTime0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(
+            GroupKeySet_epochStartTime0ClassName.c_str(), GroupKeySet_epochStartTime0CtorSignature.c_str(),
+            dataResponse.groupKeySet.epochStartTime0.Value(), GroupKeySet_epochStartTime0);
+    }
+    jobject GroupKeySet_epochKey1;
+    if (dataResponse.groupKeySet.epochKey1.IsNull())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, DebugText);
+        GroupKeySet_epochKey1 = nullptr;
     }
     else
     {
-        jobject DebugTextInsideOptional;
-        DebugTextInsideOptional =
-            env->NewStringUTF(std::string(dataResponse.debugText.Value().data(), dataResponse.debugText.Value().size()).c_str());
-        chip::JniReferences::GetInstance().CreateOptional(DebugTextInsideOptional, DebugText);
+        jbyteArray GroupKeySet_epochKey1ByteArray =
+            env->NewByteArray(static_cast<jsize>(dataResponse.groupKeySet.epochKey1.Value().size()));
+        env->SetByteArrayRegion(GroupKeySet_epochKey1ByteArray, 0,
+                                static_cast<jsize>(dataResponse.groupKeySet.epochKey1.Value().size()),
+                                reinterpret_cast<const jbyte *>(dataResponse.groupKeySet.epochKey1.Value().data()));
+        GroupKeySet_epochKey1 = GroupKeySet_epochKey1ByteArray;
     }
-    jobject WiFiScanResults;
-    if (!dataResponse.wiFiScanResults.HasValue())
+    jobject GroupKeySet_epochStartTime1;
+    if (dataResponse.groupKeySet.epochStartTime1.IsNull())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, WiFiScanResults);
+        GroupKeySet_epochStartTime1 = nullptr;
     }
     else
     {
-        jobject WiFiScanResultsInsideOptional;
-        chip::JniReferences::GetInstance().CreateArrayList(WiFiScanResultsInsideOptional);
-
-        auto iter_WiFiScanResultsInsideOptional_1 = dataResponse.wiFiScanResults.Value().begin();
-        while (iter_WiFiScanResultsInsideOptional_1.Next())
-        {
-            auto & entry_1 = iter_WiFiScanResultsInsideOptional_1.GetValue();
-            jobject newElement_1;
-            jobject newElement_1_security;
-            std::string newElement_1_securityClassName     = "java/lang/Integer";
-            std::string newElement_1_securityCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_1_securityClassName.c_str(),
-                                                                          newElement_1_securityCtorSignature.c_str(),
-                                                                          entry_1.security.Raw(), newElement_1_security);
-            jobject newElement_1_ssid;
-            jbyteArray newElement_1_ssidByteArray = env->NewByteArray(static_cast<jsize>(entry_1.ssid.size()));
-            env->SetByteArrayRegion(newElement_1_ssidByteArray, 0, static_cast<jsize>(entry_1.ssid.size()),
-                                    reinterpret_cast<const jbyte *>(entry_1.ssid.data()));
-            newElement_1_ssid = newElement_1_ssidByteArray;
-            jobject newElement_1_bssid;
-            jbyteArray newElement_1_bssidByteArray = env->NewByteArray(static_cast<jsize>(entry_1.bssid.size()));
-            env->SetByteArrayRegion(newElement_1_bssidByteArray, 0, static_cast<jsize>(entry_1.bssid.size()),
-                                    reinterpret_cast<const jbyte *>(entry_1.bssid.data()));
-            newElement_1_bssid = newElement_1_bssidByteArray;
-            jobject newElement_1_channel;
-            std::string newElement_1_channelClassName     = "java/lang/Integer";
-            std::string newElement_1_channelCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_1_channelClassName.c_str(),
-                                                                           newElement_1_channelCtorSignature.c_str(),
-                                                                           entry_1.channel, newElement_1_channel);
-            jobject newElement_1_wiFiBand;
-            std::string newElement_1_wiFiBandClassName     = "java/lang/Integer";
-            std::string newElement_1_wiFiBandCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                newElement_1_wiFiBandClassName.c_str(), newElement_1_wiFiBandCtorSignature.c_str(),
-                static_cast<uint8_t>(entry_1.wiFiBand), newElement_1_wiFiBand);
-            jobject newElement_1_rssi;
-            std::string newElement_1_rssiClassName     = "java/lang/Integer";
-            std::string newElement_1_rssiCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(
-                newElement_1_rssiClassName.c_str(), newElement_1_rssiCtorSignature.c_str(), entry_1.rssi, newElement_1_rssi);
-
-            jclass wiFiInterfaceScanResultStructClass;
-            err = chip::JniReferences::GetInstance().GetClassRef(
-                env, "chip/devicecontroller/ChipStructs$NetworkCommissioningClusterWiFiInterfaceScanResult",
-                wiFiInterfaceScanResultStructClass);
-            if (err != CHIP_NO_ERROR)
-            {
-                ChipLogError(Zcl, "Could not find class ChipStructs$NetworkCommissioningClusterWiFiInterfaceScanResult");
-                return;
-            }
-            jmethodID wiFiInterfaceScanResultStructCtor =
-                env->GetMethodID(wiFiInterfaceScanResultStructClass, "<init>",
-                                 "(Ljava/lang/Integer;[B[BLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V");
-            if (wiFiInterfaceScanResultStructCtor == nullptr)
-            {
-                ChipLogError(Zcl, "Could not find ChipStructs$NetworkCommissioningClusterWiFiInterfaceScanResult constructor");
-                return;
-            }
-
-            newElement_1 = env->NewObject(wiFiInterfaceScanResultStructClass, wiFiInterfaceScanResultStructCtor,
-                                          newElement_1_security, newElement_1_ssid, newElement_1_bssid, newElement_1_channel,
-                                          newElement_1_wiFiBand, newElement_1_rssi);
-            chip::JniReferences::GetInstance().AddToList(WiFiScanResultsInsideOptional, newElement_1);
-        }
-        chip::JniReferences::GetInstance().CreateOptional(WiFiScanResultsInsideOptional, WiFiScanResults);
+        std::string GroupKeySet_epochStartTime1ClassName     = "java/lang/Long";
+        std::string GroupKeySet_epochStartTime1CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(
+            GroupKeySet_epochStartTime1ClassName.c_str(), GroupKeySet_epochStartTime1CtorSignature.c_str(),
+            dataResponse.groupKeySet.epochStartTime1.Value(), GroupKeySet_epochStartTime1);
     }
-    jobject ThreadScanResults;
-    if (!dataResponse.threadScanResults.HasValue())
+    jobject GroupKeySet_epochKey2;
+    if (dataResponse.groupKeySet.epochKey2.IsNull())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, ThreadScanResults);
+        GroupKeySet_epochKey2 = nullptr;
     }
     else
     {
-        jobject ThreadScanResultsInsideOptional;
-        chip::JniReferences::GetInstance().CreateArrayList(ThreadScanResultsInsideOptional);
-
-        auto iter_ThreadScanResultsInsideOptional_1 = dataResponse.threadScanResults.Value().begin();
-        while (iter_ThreadScanResultsInsideOptional_1.Next())
-        {
-            auto & entry_1 = iter_ThreadScanResultsInsideOptional_1.GetValue();
-            jobject newElement_1;
-            jobject newElement_1_panId;
-            std::string newElement_1_panIdClassName     = "java/lang/Integer";
-            std::string newElement_1_panIdCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-                newElement_1_panIdClassName.c_str(), newElement_1_panIdCtorSignature.c_str(), entry_1.panId, newElement_1_panId);
-            jobject newElement_1_extendedPanId;
-            std::string newElement_1_extendedPanIdClassName     = "java/lang/Long";
-            std::string newElement_1_extendedPanIdCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_1_extendedPanIdClassName.c_str(),
-                                                                           newElement_1_extendedPanIdCtorSignature.c_str(),
-                                                                           entry_1.extendedPanId, newElement_1_extendedPanId);
-            jobject newElement_1_networkName;
-            newElement_1_networkName =
-                env->NewStringUTF(std::string(entry_1.networkName.data(), entry_1.networkName.size()).c_str());
-            jobject newElement_1_channel;
-            std::string newElement_1_channelClassName     = "java/lang/Integer";
-            std::string newElement_1_channelCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_1_channelClassName.c_str(),
-                                                                           newElement_1_channelCtorSignature.c_str(),
-                                                                           entry_1.channel, newElement_1_channel);
-            jobject newElement_1_version;
-            std::string newElement_1_versionClassName     = "java/lang/Integer";
-            std::string newElement_1_versionCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_1_versionClassName.c_str(),
-                                                                          newElement_1_versionCtorSignature.c_str(),
-                                                                          entry_1.version, newElement_1_version);
-            jobject newElement_1_extendedAddress;
-            jbyteArray newElement_1_extendedAddressByteArray =
-                env->NewByteArray(static_cast<jsize>(entry_1.extendedAddress.size()));
-            env->SetByteArrayRegion(newElement_1_extendedAddressByteArray, 0, static_cast<jsize>(entry_1.extendedAddress.size()),
-                                    reinterpret_cast<const jbyte *>(entry_1.extendedAddress.data()));
-            newElement_1_extendedAddress = newElement_1_extendedAddressByteArray;
-            jobject newElement_1_rssi;
-            std::string newElement_1_rssiClassName     = "java/lang/Integer";
-            std::string newElement_1_rssiCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(
-                newElement_1_rssiClassName.c_str(), newElement_1_rssiCtorSignature.c_str(), entry_1.rssi, newElement_1_rssi);
-            jobject newElement_1_lqi;
-            std::string newElement_1_lqiClassName     = "java/lang/Integer";
-            std::string newElement_1_lqiCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                newElement_1_lqiClassName.c_str(), newElement_1_lqiCtorSignature.c_str(), entry_1.lqi, newElement_1_lqi);
-
-            jclass threadInterfaceScanResultStructClass;
-            err = chip::JniReferences::GetInstance().GetClassRef(
-                env, "chip/devicecontroller/ChipStructs$NetworkCommissioningClusterThreadInterfaceScanResult",
-                threadInterfaceScanResultStructClass);
-            if (err != CHIP_NO_ERROR)
-            {
-                ChipLogError(Zcl, "Could not find class ChipStructs$NetworkCommissioningClusterThreadInterfaceScanResult");
-                return;
-            }
-            jmethodID threadInterfaceScanResultStructCtor =
-                env->GetMethodID(threadInterfaceScanResultStructClass, "<init>",
-                                 "(Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/"
-                                 "Integer;[BLjava/lang/Integer;Ljava/lang/Integer;)V");
-            if (threadInterfaceScanResultStructCtor == nullptr)
-            {
-                ChipLogError(Zcl, "Could not find ChipStructs$NetworkCommissioningClusterThreadInterfaceScanResult constructor");
-                return;
-            }
+        jbyteArray GroupKeySet_epochKey2ByteArray =
+            env->NewByteArray(static_cast<jsize>(dataResponse.groupKeySet.epochKey2.Value().size()));
+        env->SetByteArrayRegion(GroupKeySet_epochKey2ByteArray, 0,
+                                static_cast<jsize>(dataResponse.groupKeySet.epochKey2.Value().size()),
+                                reinterpret_cast<const jbyte *>(dataResponse.groupKeySet.epochKey2.Value().data()));
+        GroupKeySet_epochKey2 = GroupKeySet_epochKey2ByteArray;
+    }
+    jobject GroupKeySet_epochStartTime2;
+    if (dataResponse.groupKeySet.epochStartTime2.IsNull())
+    {
+        GroupKeySet_epochStartTime2 = nullptr;
+    }
+    else
+    {
+        std::string GroupKeySet_epochStartTime2ClassName     = "java/lang/Long";
+        std::string GroupKeySet_epochStartTime2CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(
+            GroupKeySet_epochStartTime2ClassName.c_str(), GroupKeySet_epochStartTime2CtorSignature.c_str(),
+            dataResponse.groupKeySet.epochStartTime2.Value(), GroupKeySet_epochStartTime2);
+    }
 
-            newElement_1 =
-                env->NewObject(threadInterfaceScanResultStructClass, threadInterfaceScanResultStructCtor, newElement_1_panId,
-                               newElement_1_extendedPanId, newElement_1_networkName, newElement_1_channel, newElement_1_version,
-                               newElement_1_extendedAddress, newElement_1_rssi, newElement_1_lqi);
-            chip::JniReferences::GetInstance().AddToList(ThreadScanResultsInsideOptional, newElement_1);
-        }
-        chip::JniReferences::GetInstance().CreateOptional(ThreadScanResultsInsideOptional, ThreadScanResults);
+    jclass groupKeySetStructStructClass;
+    err = chip::JniReferences::GetInstance().GetClassRef(
+        env, "chip/devicecontroller/ChipStructs$GroupKeyManagementClusterGroupKeySetStruct", groupKeySetStructStructClass);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(Zcl, "Could not find class ChipStructs$GroupKeyManagementClusterGroupKeySetStruct");
+        return;
+    }
+    jmethodID groupKeySetStructStructCtor =
+        env->GetMethodID(groupKeySetStructStructClass, "<init>",
+                         "(Ljava/lang/Integer;Ljava/lang/Integer;[BLjava/lang/Long;[BLjava/lang/Long;[BLjava/lang/Long;)V");
+    if (groupKeySetStructStructCtor == nullptr)
+    {
+        ChipLogError(Zcl, "Could not find ChipStructs$GroupKeyManagementClusterGroupKeySetStruct constructor");
+        return;
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, NetworkingStatus, DebugText, WiFiScanResults, ThreadScanResults);
+    GroupKeySet =
+        env->NewObject(groupKeySetStructStructClass, groupKeySetStructStructCtor, GroupKeySet_groupKeySetID,
+                       GroupKeySet_groupKeySecurityPolicy, GroupKeySet_epochKey0, GroupKeySet_epochStartTime0,
+                       GroupKeySet_epochKey1, GroupKeySet_epochStartTime1, GroupKeySet_epochKey2, GroupKeySet_epochStartTime2);
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, GroupKeySet);
 }
-CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback::CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallbackType>(CallbackFn, this)
+CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback::
+    CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2429,7 +2283,8 @@ CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback::CHIPOtaSoftware
     }
 }
 
-CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback::~CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback()
+CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback::
+    ~CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2440,9 +2295,9 @@ CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback::~CHIPOtaSoftwar
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback::CallbackFn(
+void CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback::CallbackFn(
     void * context,
-    const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::DecodableType & dataResponse)
+    const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -2452,37 +2307,38 @@ void CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback::CallbackFn
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback,
-                    void (*)(CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback>);
+    std::unique_ptr<CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback,
+                    void (*)(CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/lang/Long;)V",
-                                                  &javaMethod);
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/ArrayList;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject action;
-    std::string actionClassName     = "java/lang/Integer";
-    std::string actionCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(actionClassName.c_str(), actionCtorSignature.c_str(),
-                                                                  static_cast<uint8_t>(dataResponse.action), action);
-    jobject delayedActionTime;
-    std::string delayedActionTimeClassName     = "java/lang/Long";
-    std::string delayedActionTimeCtorSignature = "(J)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(delayedActionTimeClassName.c_str(),
-                                                                   delayedActionTimeCtorSignature.c_str(),
-                                                                   dataResponse.delayedActionTime, delayedActionTime);
+    jobject GroupKeySetIDs;
+    chip::JniReferences::GetInstance().CreateArrayList(GroupKeySetIDs);
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, action, delayedActionTime);
+    auto iter_GroupKeySetIDs_0 = dataResponse.groupKeySetIDs.begin();
+    while (iter_GroupKeySetIDs_0.Next())
+    {
+        auto & entry_0 = iter_GroupKeySetIDs_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Integer";
+        std::string newElement_0CtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(GroupKeySetIDs, newElement_0);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, GroupKeySetIDs);
 }
-CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback::CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallbackType>(CallbackFn, this)
+CHIPDoorLockClusterGetWeekDayScheduleResponseCallback::CHIPDoorLockClusterGetWeekDayScheduleResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2498,7 +2354,7 @@ CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback::CHIPOtaSoftwareU
     }
 }
 
-CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback::~CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback()
+CHIPDoorLockClusterGetWeekDayScheduleResponseCallback::~CHIPDoorLockClusterGetWeekDayScheduleResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2509,9 +2365,8 @@ CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback::~CHIPOtaSoftware
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback::CallbackFn(
-    void * context,
-    const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImageResponse::DecodableType & dataResponse)
+void CHIPDoorLockClusterGetWeekDayScheduleResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -2521,10 +2376,10 @@ void CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback,
-                    void (*)(CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback>);
+    std::unique_ptr<CHIPDoorLockClusterGetWeekDayScheduleResponseCallback,
+                    void (*)(CHIPDoorLockClusterGetWeekDayScheduleResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPDoorLockClusterGetWeekDayScheduleResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPDoorLockClusterGetWeekDayScheduleResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
@@ -2533,124 +2388,209 @@ void CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback::CallbackFn(
 
     err = JniReferences::GetInstance().FindMethod(
         env, javaCallbackRef, "onSuccess",
-        "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/"
+        "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/"
         "Optional;Ljava/util/Optional;Ljava/util/Optional;)V",
         &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
+    jobject weekDayIndex;
+    std::string weekDayIndexClassName     = "java/lang/Integer";
+    std::string weekDayIndexCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(weekDayIndexClassName.c_str(), weekDayIndexCtorSignature.c_str(),
+                                                                  dataResponse.weekDayIndex, weekDayIndex);
+    jobject userIndex;
+    std::string userIndexClassName     = "java/lang/Integer";
+    std::string userIndexCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(userIndexClassName.c_str(), userIndexCtorSignature.c_str(),
+                                                                   dataResponse.userIndex, userIndex);
     jobject status;
     std::string statusClassName     = "java/lang/Integer";
     std::string statusCtorSignature = "(I)V";
     chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
                                                                   static_cast<uint8_t>(dataResponse.status), status);
-    jobject delayedActionTime;
-    if (!dataResponse.delayedActionTime.HasValue())
+    jobject daysMask;
+    if (!dataResponse.daysMask.HasValue())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, delayedActionTime);
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, daysMask);
     }
     else
     {
-        jobject delayedActionTimeInsideOptional;
-        std::string delayedActionTimeInsideOptionalClassName     = "java/lang/Long";
-        std::string delayedActionTimeInsideOptionalCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-            delayedActionTimeInsideOptionalClassName.c_str(), delayedActionTimeInsideOptionalCtorSignature.c_str(),
-            dataResponse.delayedActionTime.Value(), delayedActionTimeInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(delayedActionTimeInsideOptional, delayedActionTime);
+        jobject daysMaskInsideOptional;
+        std::string daysMaskInsideOptionalClassName     = "java/lang/Integer";
+        std::string daysMaskInsideOptionalCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(daysMaskInsideOptionalClassName.c_str(),
+                                                                      daysMaskInsideOptionalCtorSignature.c_str(),
+                                                                      dataResponse.daysMask.Value().Raw(), daysMaskInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(daysMaskInsideOptional, daysMask);
     }
-    jobject imageURI;
-    if (!dataResponse.imageURI.HasValue())
+    jobject startHour;
+    if (!dataResponse.startHour.HasValue())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, imageURI);
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, startHour);
     }
     else
     {
-        jobject imageURIInsideOptional;
-        imageURIInsideOptional =
-            env->NewStringUTF(std::string(dataResponse.imageURI.Value().data(), dataResponse.imageURI.Value().size()).c_str());
-        chip::JniReferences::GetInstance().CreateOptional(imageURIInsideOptional, imageURI);
+        jobject startHourInsideOptional;
+        std::string startHourInsideOptionalClassName     = "java/lang/Integer";
+        std::string startHourInsideOptionalCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(startHourInsideOptionalClassName.c_str(),
+                                                                      startHourInsideOptionalCtorSignature.c_str(),
+                                                                      dataResponse.startHour.Value(), startHourInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(startHourInsideOptional, startHour);
     }
-    jobject softwareVersion;
-    if (!dataResponse.softwareVersion.HasValue())
+    jobject startMinute;
+    if (!dataResponse.startMinute.HasValue())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, softwareVersion);
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, startMinute);
     }
     else
     {
-        jobject softwareVersionInsideOptional;
-        std::string softwareVersionInsideOptionalClassName     = "java/lang/Long";
-        std::string softwareVersionInsideOptionalCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-            softwareVersionInsideOptionalClassName.c_str(), softwareVersionInsideOptionalCtorSignature.c_str(),
-            dataResponse.softwareVersion.Value(), softwareVersionInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(softwareVersionInsideOptional, softwareVersion);
+        jobject startMinuteInsideOptional;
+        std::string startMinuteInsideOptionalClassName     = "java/lang/Integer";
+        std::string startMinuteInsideOptionalCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(startMinuteInsideOptionalClassName.c_str(),
+                                                                      startMinuteInsideOptionalCtorSignature.c_str(),
+                                                                      dataResponse.startMinute.Value(), startMinuteInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(startMinuteInsideOptional, startMinute);
     }
-    jobject softwareVersionString;
-    if (!dataResponse.softwareVersionString.HasValue())
+    jobject endHour;
+    if (!dataResponse.endHour.HasValue())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, softwareVersionString);
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, endHour);
     }
     else
     {
-        jobject softwareVersionStringInsideOptional;
-        softwareVersionStringInsideOptional = env->NewStringUTF(
-            std::string(dataResponse.softwareVersionString.Value().data(), dataResponse.softwareVersionString.Value().size())
-                .c_str());
-        chip::JniReferences::GetInstance().CreateOptional(softwareVersionStringInsideOptional, softwareVersionString);
+        jobject endHourInsideOptional;
+        std::string endHourInsideOptionalClassName     = "java/lang/Integer";
+        std::string endHourInsideOptionalCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(endHourInsideOptionalClassName.c_str(),
+                                                                      endHourInsideOptionalCtorSignature.c_str(),
+                                                                      dataResponse.endHour.Value(), endHourInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(endHourInsideOptional, endHour);
     }
-    jobject updateToken;
-    if (!dataResponse.updateToken.HasValue())
+    jobject endMinute;
+    if (!dataResponse.endMinute.HasValue())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, updateToken);
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, endMinute);
     }
     else
     {
-        jobject updateTokenInsideOptional;
-        jbyteArray updateTokenInsideOptionalByteArray =
-            env->NewByteArray(static_cast<jsize>(dataResponse.updateToken.Value().size()));
-        env->SetByteArrayRegion(updateTokenInsideOptionalByteArray, 0, static_cast<jsize>(dataResponse.updateToken.Value().size()),
-                                reinterpret_cast<const jbyte *>(dataResponse.updateToken.Value().data()));
-        updateTokenInsideOptional = updateTokenInsideOptionalByteArray;
-        chip::JniReferences::GetInstance().CreateOptional(updateTokenInsideOptional, updateToken);
+        jobject endMinuteInsideOptional;
+        std::string endMinuteInsideOptionalClassName     = "java/lang/Integer";
+        std::string endMinuteInsideOptionalCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(endMinuteInsideOptionalClassName.c_str(),
+                                                                      endMinuteInsideOptionalCtorSignature.c_str(),
+                                                                      dataResponse.endMinute.Value(), endMinuteInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(endMinuteInsideOptional, endMinute);
     }
-    jobject userConsentNeeded;
-    if (!dataResponse.userConsentNeeded.HasValue())
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, weekDayIndex, userIndex, status, daysMask, startHour, startMinute, endHour,
+                        endMinute);
+}
+CHIPDoorLockClusterGetYearDayScheduleResponseCallback::CHIPDoorLockClusterGetYearDayScheduleResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPDoorLockClusterGetYearDayScheduleResponseCallbackType>(CallbackFn, this)
+{
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, userConsentNeeded);
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPDoorLockClusterGetYearDayScheduleResponseCallback::~CHIPDoorLockClusterGetYearDayScheduleResponseCallback()
+{
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+};
+
+void CHIPDoorLockClusterGetYearDayScheduleResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType & dataResponse)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+    jmethodID javaMethod;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
+
+    std::unique_ptr<CHIPDoorLockClusterGetYearDayScheduleResponseCallback,
+                    void (*)(CHIPDoorLockClusterGetYearDayScheduleResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPDoorLockClusterGetYearDayScheduleResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPDoorLockClusterGetYearDayScheduleResponseCallback>);
+    VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
+
+    javaCallbackRef = cppCallback->javaCallbackRef;
+    // Java callback is allowed to be null, exit early if this is the case.
+    VerifyOrReturn(javaCallbackRef != nullptr);
+
+    err = JniReferences::GetInstance().FindMethod(
+        env, javaCallbackRef, "onSuccess",
+        "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
+
+    jobject yearDayIndex;
+    std::string yearDayIndexClassName     = "java/lang/Integer";
+    std::string yearDayIndexCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(yearDayIndexClassName.c_str(), yearDayIndexCtorSignature.c_str(),
+                                                                  dataResponse.yearDayIndex, yearDayIndex);
+    jobject userIndex;
+    std::string userIndexClassName     = "java/lang/Integer";
+    std::string userIndexCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(userIndexClassName.c_str(), userIndexCtorSignature.c_str(),
+                                                                   dataResponse.userIndex, userIndex);
+    jobject status;
+    std::string statusClassName     = "java/lang/Integer";
+    std::string statusCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
+                                                                  static_cast<uint8_t>(dataResponse.status), status);
+    jobject localStartTime;
+    if (!dataResponse.localStartTime.HasValue())
+    {
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, localStartTime);
     }
     else
     {
-        jobject userConsentNeededInsideOptional;
-        std::string userConsentNeededInsideOptionalClassName     = "java/lang/Boolean";
-        std::string userConsentNeededInsideOptionalCtorSignature = "(Z)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-            userConsentNeededInsideOptionalClassName.c_str(), userConsentNeededInsideOptionalCtorSignature.c_str(),
-            dataResponse.userConsentNeeded.Value(), userConsentNeededInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(userConsentNeededInsideOptional, userConsentNeeded);
+        jobject localStartTimeInsideOptional;
+        std::string localStartTimeInsideOptionalClassName     = "java/lang/Long";
+        std::string localStartTimeInsideOptionalCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+            localStartTimeInsideOptionalClassName.c_str(), localStartTimeInsideOptionalCtorSignature.c_str(),
+            dataResponse.localStartTime.Value(), localStartTimeInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(localStartTimeInsideOptional, localStartTime);
     }
-    jobject metadataForRequestor;
-    if (!dataResponse.metadataForRequestor.HasValue())
+    jobject localEndTime;
+    if (!dataResponse.localEndTime.HasValue())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, metadataForRequestor);
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, localEndTime);
     }
     else
     {
-        jobject metadataForRequestorInsideOptional;
-        jbyteArray metadataForRequestorInsideOptionalByteArray =
-            env->NewByteArray(static_cast<jsize>(dataResponse.metadataForRequestor.Value().size()));
-        env->SetByteArrayRegion(metadataForRequestorInsideOptionalByteArray, 0,
-                                static_cast<jsize>(dataResponse.metadataForRequestor.Value().size()),
-                                reinterpret_cast<const jbyte *>(dataResponse.metadataForRequestor.Value().data()));
-        metadataForRequestorInsideOptional = metadataForRequestorInsideOptionalByteArray;
-        chip::JniReferences::GetInstance().CreateOptional(metadataForRequestorInsideOptional, metadataForRequestor);
+        jobject localEndTimeInsideOptional;
+        std::string localEndTimeInsideOptionalClassName     = "java/lang/Long";
+        std::string localEndTimeInsideOptionalCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+            localEndTimeInsideOptionalClassName.c_str(), localEndTimeInsideOptionalCtorSignature.c_str(),
+            dataResponse.localEndTime.Value(), localEndTimeInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(localEndTimeInsideOptional, localEndTime);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, status, delayedActionTime, imageURI, softwareVersion, softwareVersionString,
-                        updateToken, userConsentNeeded, metadataForRequestor);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, yearDayIndex, userIndex, status, localStartTime, localEndTime);
 }
-CHIPOperationalCredentialsClusterAttestationResponseCallback::CHIPOperationalCredentialsClusterAttestationResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPOperationalCredentialsClusterAttestationResponseCallbackType>(CallbackFn, this)
+CHIPDoorLockClusterGetHolidayScheduleResponseCallback::CHIPDoorLockClusterGetHolidayScheduleResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPDoorLockClusterGetHolidayScheduleResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2666,7 +2606,7 @@ CHIPOperationalCredentialsClusterAttestationResponseCallback::CHIPOperationalCre
     }
 }
 
-CHIPOperationalCredentialsClusterAttestationResponseCallback::~CHIPOperationalCredentialsClusterAttestationResponseCallback()
+CHIPDoorLockClusterGetHolidayScheduleResponseCallback::~CHIPDoorLockClusterGetHolidayScheduleResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2677,8 +2617,8 @@ CHIPOperationalCredentialsClusterAttestationResponseCallback::~CHIPOperationalCr
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPOperationalCredentialsClusterAttestationResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::OperationalCredentials::Commands::AttestationResponse::DecodableType & dataResponse)
+void CHIPDoorLockClusterGetHolidayScheduleResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -2688,34 +2628,81 @@ void CHIPOperationalCredentialsClusterAttestationResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPOperationalCredentialsClusterAttestationResponseCallback,
-                    void (*)(CHIPOperationalCredentialsClusterAttestationResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPOperationalCredentialsClusterAttestationResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPOperationalCredentialsClusterAttestationResponseCallback>);
+    std::unique_ptr<CHIPDoorLockClusterGetHolidayScheduleResponseCallback,
+                    void (*)(CHIPDoorLockClusterGetHolidayScheduleResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPDoorLockClusterGetHolidayScheduleResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPDoorLockClusterGetHolidayScheduleResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B[B)V", &javaMethod);
+    err = JniReferences::GetInstance().FindMethod(
+        env, javaCallbackRef, "onSuccess",
+        "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject AttestationElements;
-    jbyteArray AttestationElementsByteArray = env->NewByteArray(static_cast<jsize>(dataResponse.attestationElements.size()));
-    env->SetByteArrayRegion(AttestationElementsByteArray, 0, static_cast<jsize>(dataResponse.attestationElements.size()),
-                            reinterpret_cast<const jbyte *>(dataResponse.attestationElements.data()));
-    AttestationElements = AttestationElementsByteArray;
-    jobject Signature;
-    jbyteArray SignatureByteArray = env->NewByteArray(static_cast<jsize>(dataResponse.signature.size()));
-    env->SetByteArrayRegion(SignatureByteArray, 0, static_cast<jsize>(dataResponse.signature.size()),
-                            reinterpret_cast<const jbyte *>(dataResponse.signature.data()));
-    Signature = SignatureByteArray;
+    jobject holidayIndex;
+    std::string holidayIndexClassName     = "java/lang/Integer";
+    std::string holidayIndexCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(holidayIndexClassName.c_str(), holidayIndexCtorSignature.c_str(),
+                                                                  dataResponse.holidayIndex, holidayIndex);
+    jobject status;
+    std::string statusClassName     = "java/lang/Integer";
+    std::string statusCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
+                                                                  static_cast<uint8_t>(dataResponse.status), status);
+    jobject localStartTime;
+    if (!dataResponse.localStartTime.HasValue())
+    {
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, localStartTime);
+    }
+    else
+    {
+        jobject localStartTimeInsideOptional;
+        std::string localStartTimeInsideOptionalClassName     = "java/lang/Long";
+        std::string localStartTimeInsideOptionalCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+            localStartTimeInsideOptionalClassName.c_str(), localStartTimeInsideOptionalCtorSignature.c_str(),
+            dataResponse.localStartTime.Value(), localStartTimeInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(localStartTimeInsideOptional, localStartTime);
+    }
+    jobject localEndTime;
+    if (!dataResponse.localEndTime.HasValue())
+    {
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, localEndTime);
+    }
+    else
+    {
+        jobject localEndTimeInsideOptional;
+        std::string localEndTimeInsideOptionalClassName     = "java/lang/Long";
+        std::string localEndTimeInsideOptionalCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+            localEndTimeInsideOptionalClassName.c_str(), localEndTimeInsideOptionalCtorSignature.c_str(),
+            dataResponse.localEndTime.Value(), localEndTimeInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(localEndTimeInsideOptional, localEndTime);
+    }
+    jobject operatingMode;
+    if (!dataResponse.operatingMode.HasValue())
+    {
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, operatingMode);
+    }
+    else
+    {
+        jobject operatingModeInsideOptional;
+        std::string operatingModeInsideOptionalClassName     = "java/lang/Integer";
+        std::string operatingModeInsideOptionalCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+            operatingModeInsideOptionalClassName.c_str(), operatingModeInsideOptionalCtorSignature.c_str(),
+            static_cast<uint8_t>(dataResponse.operatingMode.Value()), operatingModeInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(operatingModeInsideOptional, operatingMode);
+    }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, AttestationElements, Signature);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, holidayIndex, status, localStartTime, localEndTime, operatingMode);
 }
-CHIPOperationalCredentialsClusterCSRResponseCallback::CHIPOperationalCredentialsClusterCSRResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPOperationalCredentialsClusterCSRResponseCallbackType>(CallbackFn, this)
+CHIPDoorLockClusterGetUserResponseCallback::CHIPDoorLockClusterGetUserResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPDoorLockClusterGetUserResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2731,119 +2718,202 @@ CHIPOperationalCredentialsClusterCSRResponseCallback::CHIPOperationalCredentials
     }
 }
 
-CHIPOperationalCredentialsClusterCSRResponseCallback::~CHIPOperationalCredentialsClusterCSRResponseCallback()
+CHIPDoorLockClusterGetUserResponseCallback::~CHIPDoorLockClusterGetUserResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
     {
-        ChipLogError(Zcl, "Could not delete global reference for Java callback");
-        return;
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+};
+
+void CHIPDoorLockClusterGetUserResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType & dataResponse)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+    jmethodID javaMethod;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
+
+    std::unique_ptr<CHIPDoorLockClusterGetUserResponseCallback, void (*)(CHIPDoorLockClusterGetUserResponseCallback *)> cppCallback(
+        reinterpret_cast<CHIPDoorLockClusterGetUserResponseCallback *>(context),
+        chip::Platform::Delete<CHIPDoorLockClusterGetUserResponseCallback>);
+    VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
+
+    javaCallbackRef = cppCallback->javaCallbackRef;
+    // Java callback is allowed to be null, exit early if this is the case.
+    VerifyOrReturn(javaCallbackRef != nullptr);
+
+    err = JniReferences::GetInstance().FindMethod(
+        env, javaCallbackRef, "onSuccess",
+        "(Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/"
+        "ArrayList;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V",
+        &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
+
+    jobject userIndex;
+    std::string userIndexClassName     = "java/lang/Integer";
+    std::string userIndexCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(userIndexClassName.c_str(), userIndexCtorSignature.c_str(),
+                                                                   dataResponse.userIndex, userIndex);
+    jobject userName;
+    if (dataResponse.userName.IsNull())
+    {
+        userName = nullptr;
+    }
+    else
+    {
+        userName =
+            env->NewStringUTF(std::string(dataResponse.userName.Value().data(), dataResponse.userName.Value().size()).c_str());
+    }
+    jobject userUniqueId;
+    if (dataResponse.userUniqueId.IsNull())
+    {
+        userUniqueId = nullptr;
+    }
+    else
+    {
+        std::string userUniqueIdClassName     = "java/lang/Long";
+        std::string userUniqueIdCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+            userUniqueIdClassName.c_str(), userUniqueIdCtorSignature.c_str(), dataResponse.userUniqueId.Value(), userUniqueId);
+    }
+    jobject userStatus;
+    if (dataResponse.userStatus.IsNull())
+    {
+        userStatus = nullptr;
+    }
+    else
+    {
+        std::string userStatusClassName     = "java/lang/Integer";
+        std::string userStatusCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(userStatusClassName.c_str(), userStatusCtorSignature.c_str(),
+                                                                      static_cast<uint8_t>(dataResponse.userStatus.Value()),
+                                                                      userStatus);
+    }
+    jobject userType;
+    if (dataResponse.userType.IsNull())
+    {
+        userType = nullptr;
+    }
+    else
+    {
+        std::string userTypeClassName     = "java/lang/Integer";
+        std::string userTypeCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(userTypeClassName.c_str(), userTypeCtorSignature.c_str(),
+                                                                      static_cast<uint8_t>(dataResponse.userType.Value()),
+                                                                      userType);
+    }
+    jobject credentialRule;
+    if (dataResponse.credentialRule.IsNull())
+    {
+        credentialRule = nullptr;
+    }
+    else
+    {
+        std::string credentialRuleClassName     = "java/lang/Integer";
+        std::string credentialRuleCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+            credentialRuleClassName.c_str(), credentialRuleCtorSignature.c_str(),
+            static_cast<uint8_t>(dataResponse.credentialRule.Value()), credentialRule);
+    }
+    jobject credentials;
+    if (dataResponse.credentials.IsNull())
+    {
+        credentials = nullptr;
+    }
+    else
+    {
+        chip::JniReferences::GetInstance().CreateArrayList(credentials);
+
+        auto iter_credentials_1 = dataResponse.credentials.Value().begin();
+        while (iter_credentials_1.Next())
+        {
+            auto & entry_1 = iter_credentials_1.GetValue();
+            jobject newElement_1;
+            jobject newElement_1_credentialType;
+            std::string newElement_1_credentialTypeClassName     = "java/lang/Integer";
+            std::string newElement_1_credentialTypeCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                newElement_1_credentialTypeClassName.c_str(), newElement_1_credentialTypeCtorSignature.c_str(),
+                static_cast<uint8_t>(entry_1.credentialType), newElement_1_credentialType);
+            jobject newElement_1_credentialIndex;
+            std::string newElement_1_credentialIndexClassName     = "java/lang/Integer";
+            std::string newElement_1_credentialIndexCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_1_credentialIndexClassName.c_str(),
+                                                                           newElement_1_credentialIndexCtorSignature.c_str(),
+                                                                           entry_1.credentialIndex, newElement_1_credentialIndex);
+
+            jclass dlCredentialStructClass;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipStructs$DoorLockClusterDlCredential", dlCredentialStructClass);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl, "Could not find class ChipStructs$DoorLockClusterDlCredential");
+                return;
+            }
+            jmethodID dlCredentialStructCtor =
+                env->GetMethodID(dlCredentialStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;)V");
+            if (dlCredentialStructCtor == nullptr)
+            {
+                ChipLogError(Zcl, "Could not find ChipStructs$DoorLockClusterDlCredential constructor");
+                return;
+            }
+
+            newElement_1 = env->NewObject(dlCredentialStructClass, dlCredentialStructCtor, newElement_1_credentialType,
+                                          newElement_1_credentialIndex);
+            chip::JniReferences::GetInstance().AddToList(credentials, newElement_1);
+        }
+    }
+    jobject creatorFabricIndex;
+    if (dataResponse.creatorFabricIndex.IsNull())
+    {
+        creatorFabricIndex = nullptr;
+    }
+    else
+    {
+        std::string creatorFabricIndexClassName     = "java/lang/Integer";
+        std::string creatorFabricIndexCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(creatorFabricIndexClassName.c_str(),
+                                                                      creatorFabricIndexCtorSignature.c_str(),
+                                                                      dataResponse.creatorFabricIndex.Value(), creatorFabricIndex);
+    }
+    jobject lastModifiedFabricIndex;
+    if (dataResponse.lastModifiedFabricIndex.IsNull())
+    {
+        lastModifiedFabricIndex = nullptr;
     }
-    env->DeleteGlobalRef(javaCallbackRef);
-};
-
-void CHIPOperationalCredentialsClusterCSRResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::OperationalCredentials::Commands::CSRResponse::DecodableType & dataResponse)
-{
-    chip::DeviceLayer::StackUnlock unlock;
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-    jobject javaCallbackRef;
-    jmethodID javaMethod;
-
-    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
-
-    std::unique_ptr<CHIPOperationalCredentialsClusterCSRResponseCallback,
-                    void (*)(CHIPOperationalCredentialsClusterCSRResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPOperationalCredentialsClusterCSRResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPOperationalCredentialsClusterCSRResponseCallback>);
-    VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
-
-    javaCallbackRef = cppCallback->javaCallbackRef;
-    // Java callback is allowed to be null, exit early if this is the case.
-    VerifyOrReturn(javaCallbackRef != nullptr);
-
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B[B)V", &javaMethod);
-    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
-
-    jobject NOCSRElements;
-    jbyteArray NOCSRElementsByteArray = env->NewByteArray(static_cast<jsize>(dataResponse.NOCSRElements.size()));
-    env->SetByteArrayRegion(NOCSRElementsByteArray, 0, static_cast<jsize>(dataResponse.NOCSRElements.size()),
-                            reinterpret_cast<const jbyte *>(dataResponse.NOCSRElements.data()));
-    NOCSRElements = NOCSRElementsByteArray;
-    jobject AttestationSignature;
-    jbyteArray AttestationSignatureByteArray = env->NewByteArray(static_cast<jsize>(dataResponse.attestationSignature.size()));
-    env->SetByteArrayRegion(AttestationSignatureByteArray, 0, static_cast<jsize>(dataResponse.attestationSignature.size()),
-                            reinterpret_cast<const jbyte *>(dataResponse.attestationSignature.data()));
-    AttestationSignature = AttestationSignatureByteArray;
-
-    env->CallVoidMethod(javaCallbackRef, javaMethod, NOCSRElements, AttestationSignature);
-}
-CHIPOperationalCredentialsClusterCertificateChainResponseCallback::
-    CHIPOperationalCredentialsClusterCertificateChainResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPOperationalCredentialsClusterCertificateChainResponseCallbackType>(CallbackFn, this)
-{
-    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
+    else
     {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-        return;
+        std::string lastModifiedFabricIndexClassName     = "java/lang/Integer";
+        std::string lastModifiedFabricIndexCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+            lastModifiedFabricIndexClassName.c_str(), lastModifiedFabricIndexCtorSignature.c_str(),
+            dataResponse.lastModifiedFabricIndex.Value(), lastModifiedFabricIndex);
     }
-
-    javaCallbackRef = env->NewGlobalRef(javaCallback);
-    if (javaCallbackRef == nullptr)
+    jobject nextUserIndex;
+    if (dataResponse.nextUserIndex.IsNull())
     {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        nextUserIndex = nullptr;
     }
-}
-
-CHIPOperationalCredentialsClusterCertificateChainResponseCallback::
-    ~CHIPOperationalCredentialsClusterCertificateChainResponseCallback()
-{
-    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
+    else
     {
-        ChipLogError(Zcl, "Could not delete global reference for Java callback");
-        return;
+        std::string nextUserIndexClassName     = "java/lang/Integer";
+        std::string nextUserIndexCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+            nextUserIndexClassName.c_str(), nextUserIndexCtorSignature.c_str(), dataResponse.nextUserIndex.Value(), nextUserIndex);
     }
-    env->DeleteGlobalRef(javaCallbackRef);
-};
-
-void CHIPOperationalCredentialsClusterCertificateChainResponseCallback::CallbackFn(
-    void * context,
-    const chip::app::Clusters::OperationalCredentials::Commands::CertificateChainResponse::DecodableType & dataResponse)
-{
-    chip::DeviceLayer::StackUnlock unlock;
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-    jobject javaCallbackRef;
-    jmethodID javaMethod;
 
-    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
-
-    std::unique_ptr<CHIPOperationalCredentialsClusterCertificateChainResponseCallback,
-                    void (*)(CHIPOperationalCredentialsClusterCertificateChainResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPOperationalCredentialsClusterCertificateChainResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPOperationalCredentialsClusterCertificateChainResponseCallback>);
-    VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
-
-    javaCallbackRef = cppCallback->javaCallbackRef;
-    // Java callback is allowed to be null, exit early if this is the case.
-    VerifyOrReturn(javaCallbackRef != nullptr);
-
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B)V", &javaMethod);
-    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
-
-    jobject Certificate;
-    jbyteArray CertificateByteArray = env->NewByteArray(static_cast<jsize>(dataResponse.certificate.size()));
-    env->SetByteArrayRegion(CertificateByteArray, 0, static_cast<jsize>(dataResponse.certificate.size()),
-                            reinterpret_cast<const jbyte *>(dataResponse.certificate.data()));
-    Certificate = CertificateByteArray;
-
-    env->CallVoidMethod(javaCallbackRef, javaMethod, Certificate);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, userIndex, userName, userUniqueId, userStatus, userType, credentialRule,
+                        credentials, creatorFabricIndex, lastModifiedFabricIndex, nextUserIndex);
 }
-CHIPOperationalCredentialsClusterNOCResponseCallback::CHIPOperationalCredentialsClusterNOCResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPOperationalCredentialsClusterNOCResponseCallbackType>(CallbackFn, this)
+CHIPDoorLockClusterSetCredentialResponseCallback::CHIPDoorLockClusterSetCredentialResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPDoorLockClusterSetCredentialResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2859,7 +2929,7 @@ CHIPOperationalCredentialsClusterNOCResponseCallback::CHIPOperationalCredentials
     }
 }
 
-CHIPOperationalCredentialsClusterNOCResponseCallback::~CHIPOperationalCredentialsClusterNOCResponseCallback()
+CHIPDoorLockClusterSetCredentialResponseCallback::~CHIPDoorLockClusterSetCredentialResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2870,8 +2940,8 @@ CHIPOperationalCredentialsClusterNOCResponseCallback::~CHIPOperationalCredential
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPOperationalCredentialsClusterNOCResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::DecodableType & dataResponse)
+void CHIPDoorLockClusterSetCredentialResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -2881,10 +2951,9 @@ void CHIPOperationalCredentialsClusterNOCResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPOperationalCredentialsClusterNOCResponseCallback,
-                    void (*)(CHIPOperationalCredentialsClusterNOCResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPOperationalCredentialsClusterNOCResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPOperationalCredentialsClusterNOCResponseCallback>);
+    std::unique_ptr<CHIPDoorLockClusterSetCredentialResponseCallback, void (*)(CHIPDoorLockClusterSetCredentialResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPDoorLockClusterSetCredentialResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPDoorLockClusterSetCredentialResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
@@ -2892,46 +2961,45 @@ void CHIPOperationalCredentialsClusterNOCResponseCallback::CallbackFn(
     VerifyOrReturn(javaCallbackRef != nullptr);
 
     err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess",
-                                                  "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;)V", &javaMethod);
+                                                  "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject StatusCode;
-    std::string StatusCodeClassName     = "java/lang/Integer";
-    std::string StatusCodeCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(StatusCodeClassName.c_str(), StatusCodeCtorSignature.c_str(),
-                                                                  static_cast<uint8_t>(dataResponse.statusCode), StatusCode);
-    jobject FabricIndex;
-    if (!dataResponse.fabricIndex.HasValue())
+    jobject status;
+    std::string statusClassName     = "java/lang/Integer";
+    std::string statusCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
+                                                                  static_cast<uint8_t>(dataResponse.status), status);
+    jobject userIndex;
+    if (dataResponse.userIndex.IsNull())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, FabricIndex);
+        userIndex = nullptr;
     }
     else
     {
-        jobject FabricIndexInsideOptional;
-        std::string FabricIndexInsideOptionalClassName     = "java/lang/Integer";
-        std::string FabricIndexInsideOptionalCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(FabricIndexInsideOptionalClassName.c_str(),
-                                                                      FabricIndexInsideOptionalCtorSignature.c_str(),
-                                                                      dataResponse.fabricIndex.Value(), FabricIndexInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(FabricIndexInsideOptional, FabricIndex);
+        std::string userIndexClassName     = "java/lang/Integer";
+        std::string userIndexCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(userIndexClassName.c_str(), userIndexCtorSignature.c_str(),
+                                                                       dataResponse.userIndex.Value(), userIndex);
     }
-    jobject DebugText;
-    if (!dataResponse.debugText.HasValue())
+    jobject nextCredentialIndex;
+    if (dataResponse.nextCredentialIndex.IsNull())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, DebugText);
+        nextCredentialIndex = nullptr;
     }
     else
     {
-        jobject DebugTextInsideOptional;
-        DebugTextInsideOptional =
-            env->NewStringUTF(std::string(dataResponse.debugText.Value().data(), dataResponse.debugText.Value().size()).c_str());
-        chip::JniReferences::GetInstance().CreateOptional(DebugTextInsideOptional, DebugText);
+        std::string nextCredentialIndexClassName     = "java/lang/Integer";
+        std::string nextCredentialIndexCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+            nextCredentialIndexClassName.c_str(), nextCredentialIndexCtorSignature.c_str(),
+            dataResponse.nextCredentialIndex.Value(), nextCredentialIndex);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, StatusCode, FabricIndex, DebugText);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, status, userIndex, nextCredentialIndex);
 }
-CHIPScenesClusterAddSceneResponseCallback::CHIPScenesClusterAddSceneResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPScenesClusterAddSceneResponseCallbackType>(CallbackFn, this)
+CHIPDoorLockClusterGetCredentialStatusResponseCallback::CHIPDoorLockClusterGetCredentialStatusResponseCallback(
+    jobject javaCallback) :
+    Callback::Callback<CHIPDoorLockClusterGetCredentialStatusResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2947,7 +3015,7 @@ CHIPScenesClusterAddSceneResponseCallback::CHIPScenesClusterAddSceneResponseCall
     }
 }
 
-CHIPScenesClusterAddSceneResponseCallback::~CHIPScenesClusterAddSceneResponseCallback()
+CHIPDoorLockClusterGetCredentialStatusResponseCallback::~CHIPDoorLockClusterGetCredentialStatusResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2958,8 +3026,8 @@ CHIPScenesClusterAddSceneResponseCallback::~CHIPScenesClusterAddSceneResponseCal
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPScenesClusterAddSceneResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::Scenes::Commands::AddSceneResponse::DecodableType & dataResponse)
+void CHIPDoorLockClusterGetCredentialStatusResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -2969,39 +3037,84 @@ void CHIPScenesClusterAddSceneResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPScenesClusterAddSceneResponseCallback, void (*)(CHIPScenesClusterAddSceneResponseCallback *)> cppCallback(
-        reinterpret_cast<CHIPScenesClusterAddSceneResponseCallback *>(context),
-        chip::Platform::Delete<CHIPScenesClusterAddSceneResponseCallback>);
+    std::unique_ptr<CHIPDoorLockClusterGetCredentialStatusResponseCallback,
+                    void (*)(CHIPDoorLockClusterGetCredentialStatusResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPDoorLockClusterGetCredentialStatusResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPDoorLockClusterGetCredentialStatusResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess",
-                                                  "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V", &javaMethod);
+    err = JniReferences::GetInstance().FindMethod(
+        env, javaCallbackRef, "onSuccess",
+        "(Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject Status;
-    std::string StatusClassName     = "java/lang/Integer";
-    std::string StatusCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(StatusClassName.c_str(), StatusCtorSignature.c_str(),
-                                                                  dataResponse.status, Status);
-    jobject GroupId;
-    std::string GroupIdClassName     = "java/lang/Integer";
-    std::string GroupIdCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(GroupIdClassName.c_str(), GroupIdCtorSignature.c_str(),
-                                                                   dataResponse.groupId, GroupId);
-    jobject SceneId;
-    std::string SceneIdClassName     = "java/lang/Integer";
-    std::string SceneIdCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(SceneIdClassName.c_str(), SceneIdCtorSignature.c_str(),
-                                                                  dataResponse.sceneId, SceneId);
+    jobject credentialExists;
+    std::string credentialExistsClassName     = "java/lang/Boolean";
+    std::string credentialExistsCtorSignature = "(Z)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
+        credentialExistsClassName.c_str(), credentialExistsCtorSignature.c_str(), dataResponse.credentialExists, credentialExists);
+    jobject userIndex;
+    if (dataResponse.userIndex.IsNull())
+    {
+        userIndex = nullptr;
+    }
+    else
+    {
+        std::string userIndexClassName     = "java/lang/Integer";
+        std::string userIndexCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(userIndexClassName.c_str(), userIndexCtorSignature.c_str(),
+                                                                       dataResponse.userIndex.Value(), userIndex);
+    }
+    jobject creatorFabricIndex;
+    if (dataResponse.creatorFabricIndex.IsNull())
+    {
+        creatorFabricIndex = nullptr;
+    }
+    else
+    {
+        std::string creatorFabricIndexClassName     = "java/lang/Integer";
+        std::string creatorFabricIndexCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(creatorFabricIndexClassName.c_str(),
+                                                                      creatorFabricIndexCtorSignature.c_str(),
+                                                                      dataResponse.creatorFabricIndex.Value(), creatorFabricIndex);
+    }
+    jobject lastModifiedFabricIndex;
+    if (dataResponse.lastModifiedFabricIndex.IsNull())
+    {
+        lastModifiedFabricIndex = nullptr;
+    }
+    else
+    {
+        std::string lastModifiedFabricIndexClassName     = "java/lang/Integer";
+        std::string lastModifiedFabricIndexCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+            lastModifiedFabricIndexClassName.c_str(), lastModifiedFabricIndexCtorSignature.c_str(),
+            dataResponse.lastModifiedFabricIndex.Value(), lastModifiedFabricIndex);
+    }
+    jobject nextCredentialIndex;
+    if (dataResponse.nextCredentialIndex.IsNull())
+    {
+        nextCredentialIndex = nullptr;
+    }
+    else
+    {
+        std::string nextCredentialIndexClassName     = "java/lang/Integer";
+        std::string nextCredentialIndexCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+            nextCredentialIndexClassName.c_str(), nextCredentialIndexCtorSignature.c_str(),
+            dataResponse.nextCredentialIndex.Value(), nextCredentialIndex);
+    }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, Status, GroupId, SceneId);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, credentialExists, userIndex, creatorFabricIndex, lastModifiedFabricIndex,
+                        nextCredentialIndex);
 }
-CHIPScenesClusterGetSceneMembershipResponseCallback::CHIPScenesClusterGetSceneMembershipResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPScenesClusterGetSceneMembershipResponseCallbackType>(CallbackFn, this)
+CHIPThermostatClusterGetWeeklyScheduleResponseCallback::CHIPThermostatClusterGetWeeklyScheduleResponseCallback(
+    jobject javaCallback) :
+    Callback::Callback<CHIPThermostatClusterGetWeeklyScheduleResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3017,7 +3130,7 @@ CHIPScenesClusterGetSceneMembershipResponseCallback::CHIPScenesClusterGetSceneMe
     }
 }
 
-CHIPScenesClusterGetSceneMembershipResponseCallback::~CHIPScenesClusterGetSceneMembershipResponseCallback()
+CHIPThermostatClusterGetWeeklyScheduleResponseCallback::~CHIPThermostatClusterGetWeeklyScheduleResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3028,8 +3141,8 @@ CHIPScenesClusterGetSceneMembershipResponseCallback::~CHIPScenesClusterGetSceneM
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPScenesClusterGetSceneMembershipResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::Scenes::Commands::GetSceneMembershipResponse::DecodableType & dataResponse)
+void CHIPThermostatClusterGetWeeklyScheduleResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -3039,10 +3152,10 @@ void CHIPScenesClusterGetSceneMembershipResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPScenesClusterGetSceneMembershipResponseCallback,
-                    void (*)(CHIPScenesClusterGetSceneMembershipResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPScenesClusterGetSceneMembershipResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPScenesClusterGetSceneMembershipResponseCallback>);
+    std::unique_ptr<CHIPThermostatClusterGetWeeklyScheduleResponseCallback,
+                    void (*)(CHIPThermostatClusterGetWeeklyScheduleResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPThermostatClusterGetWeeklyScheduleResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPThermostatClusterGetWeeklyScheduleResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
@@ -3050,60 +3163,96 @@ void CHIPScenesClusterGetSceneMembershipResponseCallback::CallbackFn(
     VerifyOrReturn(javaCallbackRef != nullptr);
 
     err = JniReferences::GetInstance().FindMethod(
-        env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;)V",
+        env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/ArrayList;)V",
         &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject Status;
-    std::string StatusClassName     = "java/lang/Integer";
-    std::string StatusCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(StatusClassName.c_str(), StatusCtorSignature.c_str(),
-                                                                  dataResponse.status, Status);
-    jobject Capacity;
-    if (dataResponse.capacity.IsNull())
-    {
-        Capacity = nullptr;
-    }
-    else
-    {
-        std::string CapacityClassName     = "java/lang/Integer";
-        std::string CapacityCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(CapacityClassName.c_str(), CapacityCtorSignature.c_str(),
-                                                                      dataResponse.capacity.Value(), Capacity);
-    }
-    jobject GroupId;
-    std::string GroupIdClassName     = "java/lang/Integer";
-    std::string GroupIdCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(GroupIdClassName.c_str(), GroupIdCtorSignature.c_str(),
-                                                                   dataResponse.groupId, GroupId);
-    jobject SceneList;
-    if (!dataResponse.sceneList.HasValue())
-    {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, SceneList);
-    }
-    else
+    jobject NumberOfTransitionsForSequence;
+    std::string NumberOfTransitionsForSequenceClassName     = "java/lang/Integer";
+    std::string NumberOfTransitionsForSequenceCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+        NumberOfTransitionsForSequenceClassName.c_str(), NumberOfTransitionsForSequenceCtorSignature.c_str(),
+        dataResponse.numberOfTransitionsForSequence, NumberOfTransitionsForSequence);
+    jobject DayOfWeekForSequence;
+    std::string DayOfWeekForSequenceClassName     = "java/lang/Integer";
+    std::string DayOfWeekForSequenceCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(DayOfWeekForSequenceClassName.c_str(),
+                                                                  DayOfWeekForSequenceCtorSignature.c_str(),
+                                                                  dataResponse.dayOfWeekForSequence.Raw(), DayOfWeekForSequence);
+    jobject ModeForSequence;
+    std::string ModeForSequenceClassName     = "java/lang/Integer";
+    std::string ModeForSequenceCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(ModeForSequenceClassName.c_str(),
+                                                                  ModeForSequenceCtorSignature.c_str(),
+                                                                  dataResponse.modeForSequence.Raw(), ModeForSequence);
+    jobject Transitions;
+    chip::JniReferences::GetInstance().CreateArrayList(Transitions);
+
+    auto iter_Transitions_0 = dataResponse.transitions.begin();
+    while (iter_Transitions_0.Next())
     {
-        jobject SceneListInsideOptional;
-        chip::JniReferences::GetInstance().CreateArrayList(SceneListInsideOptional);
+        auto & entry_0 = iter_Transitions_0.GetValue();
+        jobject newElement_0;
+        jobject newElement_0_transitionTime;
+        std::string newElement_0_transitionTimeClassName     = "java/lang/Integer";
+        std::string newElement_0_transitionTimeCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_transitionTimeClassName.c_str(),
+                                                                       newElement_0_transitionTimeCtorSignature.c_str(),
+                                                                       entry_0.transitionTime, newElement_0_transitionTime);
+        jobject newElement_0_heatSetpoint;
+        if (entry_0.heatSetpoint.IsNull())
+        {
+            newElement_0_heatSetpoint = nullptr;
+        }
+        else
+        {
+            std::string newElement_0_heatSetpointClassName     = "java/lang/Integer";
+            std::string newElement_0_heatSetpointCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(newElement_0_heatSetpointClassName.c_str(),
+                                                                          newElement_0_heatSetpointCtorSignature.c_str(),
+                                                                          entry_0.heatSetpoint.Value(), newElement_0_heatSetpoint);
+        }
+        jobject newElement_0_coolSetpoint;
+        if (entry_0.coolSetpoint.IsNull())
+        {
+            newElement_0_coolSetpoint = nullptr;
+        }
+        else
+        {
+            std::string newElement_0_coolSetpointClassName     = "java/lang/Integer";
+            std::string newElement_0_coolSetpointCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(newElement_0_coolSetpointClassName.c_str(),
+                                                                          newElement_0_coolSetpointCtorSignature.c_str(),
+                                                                          entry_0.coolSetpoint.Value(), newElement_0_coolSetpoint);
+        }
 
-        auto iter_SceneListInsideOptional_1 = dataResponse.sceneList.Value().begin();
-        while (iter_SceneListInsideOptional_1.Next())
+        jclass thermostatScheduleTransitionStructClass;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$ThermostatClusterThermostatScheduleTransition",
+            thermostatScheduleTransitionStructClass);
+        if (err != CHIP_NO_ERROR)
         {
-            auto & entry_1 = iter_SceneListInsideOptional_1.GetValue();
-            jobject newElement_1;
-            std::string newElement_1ClassName     = "java/lang/Integer";
-            std::string newElement_1CtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_1ClassName.c_str(),
-                                                                          newElement_1CtorSignature.c_str(), entry_1, newElement_1);
-            chip::JniReferences::GetInstance().AddToList(SceneListInsideOptional, newElement_1);
+            ChipLogError(Zcl, "Could not find class ChipStructs$ThermostatClusterThermostatScheduleTransition");
+            return;
         }
-        chip::JniReferences::GetInstance().CreateOptional(SceneListInsideOptional, SceneList);
+        jmethodID thermostatScheduleTransitionStructCtor = env->GetMethodID(
+            thermostatScheduleTransitionStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V");
+        if (thermostatScheduleTransitionStructCtor == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$ThermostatClusterThermostatScheduleTransition constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(thermostatScheduleTransitionStructClass, thermostatScheduleTransitionStructCtor,
+                                      newElement_0_transitionTime, newElement_0_heatSetpoint, newElement_0_coolSetpoint);
+        chip::JniReferences::GetInstance().AddToList(Transitions, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, Status, Capacity, GroupId, SceneList);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, NumberOfTransitionsForSequence, DayOfWeekForSequence, ModeForSequence,
+                        Transitions);
 }
-CHIPScenesClusterRemoveAllScenesResponseCallback::CHIPScenesClusterRemoveAllScenesResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPScenesClusterRemoveAllScenesResponseCallbackType>(CallbackFn, this)
+CHIPChannelClusterChangeChannelResponseCallback::CHIPChannelClusterChangeChannelResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPChannelClusterChangeChannelResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3119,7 +3268,7 @@ CHIPScenesClusterRemoveAllScenesResponseCallback::CHIPScenesClusterRemoveAllScen
     }
 }
 
-CHIPScenesClusterRemoveAllScenesResponseCallback::~CHIPScenesClusterRemoveAllScenesResponseCallback()
+CHIPChannelClusterChangeChannelResponseCallback::~CHIPChannelClusterChangeChannelResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3130,8 +3279,8 @@ CHIPScenesClusterRemoveAllScenesResponseCallback::~CHIPScenesClusterRemoveAllSce
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPScenesClusterRemoveAllScenesResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::Scenes::Commands::RemoveAllScenesResponse::DecodableType & dataResponse)
+void CHIPChannelClusterChangeChannelResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::Channel::Commands::ChangeChannelResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -3141,34 +3290,42 @@ void CHIPScenesClusterRemoveAllScenesResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPScenesClusterRemoveAllScenesResponseCallback, void (*)(CHIPScenesClusterRemoveAllScenesResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPScenesClusterRemoveAllScenesResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPScenesClusterRemoveAllScenesResponseCallback>);
+    std::unique_ptr<CHIPChannelClusterChangeChannelResponseCallback, void (*)(CHIPChannelClusterChangeChannelResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPChannelClusterChangeChannelResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPChannelClusterChangeChannelResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/lang/Integer;)V",
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/util/Optional;)V",
                                                   &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject Status;
-    std::string StatusClassName     = "java/lang/Integer";
-    std::string StatusCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(StatusClassName.c_str(), StatusCtorSignature.c_str(),
-                                                                  dataResponse.status, Status);
-    jobject GroupId;
-    std::string GroupIdClassName     = "java/lang/Integer";
-    std::string GroupIdCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(GroupIdClassName.c_str(), GroupIdCtorSignature.c_str(),
-                                                                   dataResponse.groupId, GroupId);
+    jobject status;
+    std::string statusClassName     = "java/lang/Integer";
+    std::string statusCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
+                                                                  static_cast<uint8_t>(dataResponse.status), status);
+    jobject data;
+    if (!dataResponse.data.HasValue())
+    {
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, data);
+    }
+    else
+    {
+        jobject dataInsideOptional;
+        dataInsideOptional =
+            env->NewStringUTF(std::string(dataResponse.data.Value().data(), dataResponse.data.Value().size()).c_str());
+        chip::JniReferences::GetInstance().CreateOptional(dataInsideOptional, data);
+    }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, Status, GroupId);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, status, data);
 }
-CHIPScenesClusterRemoveSceneResponseCallback::CHIPScenesClusterRemoveSceneResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPScenesClusterRemoveSceneResponseCallbackType>(CallbackFn, this)
+CHIPTargetNavigatorClusterNavigateTargetResponseCallback::CHIPTargetNavigatorClusterNavigateTargetResponseCallback(
+    jobject javaCallback) :
+    Callback::Callback<CHIPTargetNavigatorClusterNavigateTargetResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3184,7 +3341,7 @@ CHIPScenesClusterRemoveSceneResponseCallback::CHIPScenesClusterRemoveSceneRespon
     }
 }
 
-CHIPScenesClusterRemoveSceneResponseCallback::~CHIPScenesClusterRemoveSceneResponseCallback()
+CHIPTargetNavigatorClusterNavigateTargetResponseCallback::~CHIPTargetNavigatorClusterNavigateTargetResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3195,8 +3352,8 @@ CHIPScenesClusterRemoveSceneResponseCallback::~CHIPScenesClusterRemoveSceneRespo
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPScenesClusterRemoveSceneResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::Scenes::Commands::RemoveSceneResponse::DecodableType & dataResponse)
+void CHIPTargetNavigatorClusterNavigateTargetResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -3206,39 +3363,42 @@ void CHIPScenesClusterRemoveSceneResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPScenesClusterRemoveSceneResponseCallback, void (*)(CHIPScenesClusterRemoveSceneResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPScenesClusterRemoveSceneResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPScenesClusterRemoveSceneResponseCallback>);
+    std::unique_ptr<CHIPTargetNavigatorClusterNavigateTargetResponseCallback,
+                    void (*)(CHIPTargetNavigatorClusterNavigateTargetResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPTargetNavigatorClusterNavigateTargetResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPTargetNavigatorClusterNavigateTargetResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess",
-                                                  "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V", &javaMethod);
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/util/Optional;)V",
+                                                  &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject Status;
-    std::string StatusClassName     = "java/lang/Integer";
-    std::string StatusCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(StatusClassName.c_str(), StatusCtorSignature.c_str(),
-                                                                  dataResponse.status, Status);
-    jobject GroupId;
-    std::string GroupIdClassName     = "java/lang/Integer";
-    std::string GroupIdCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(GroupIdClassName.c_str(), GroupIdCtorSignature.c_str(),
-                                                                   dataResponse.groupId, GroupId);
-    jobject SceneId;
-    std::string SceneIdClassName     = "java/lang/Integer";
-    std::string SceneIdCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(SceneIdClassName.c_str(), SceneIdCtorSignature.c_str(),
-                                                                  dataResponse.sceneId, SceneId);
+    jobject status;
+    std::string statusClassName     = "java/lang/Integer";
+    std::string statusCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
+                                                                  static_cast<uint8_t>(dataResponse.status), status);
+    jobject data;
+    if (!dataResponse.data.HasValue())
+    {
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, data);
+    }
+    else
+    {
+        jobject dataInsideOptional;
+        dataInsideOptional =
+            env->NewStringUTF(std::string(dataResponse.data.Value().data(), dataResponse.data.Value().size()).c_str());
+        chip::JniReferences::GetInstance().CreateOptional(dataInsideOptional, data);
+    }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, Status, GroupId, SceneId);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, status, data);
 }
-CHIPScenesClusterStoreSceneResponseCallback::CHIPScenesClusterStoreSceneResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPScenesClusterStoreSceneResponseCallbackType>(CallbackFn, this)
+CHIPMediaPlaybackClusterPlaybackResponseCallback::CHIPMediaPlaybackClusterPlaybackResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3254,7 +3414,7 @@ CHIPScenesClusterStoreSceneResponseCallback::CHIPScenesClusterStoreSceneResponse
     }
 }
 
-CHIPScenesClusterStoreSceneResponseCallback::~CHIPScenesClusterStoreSceneResponseCallback()
+CHIPMediaPlaybackClusterPlaybackResponseCallback::~CHIPMediaPlaybackClusterPlaybackResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3265,8 +3425,8 @@ CHIPScenesClusterStoreSceneResponseCallback::~CHIPScenesClusterStoreSceneRespons
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPScenesClusterStoreSceneResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::Scenes::Commands::StoreSceneResponse::DecodableType & dataResponse)
+void CHIPMediaPlaybackClusterPlaybackResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -3276,39 +3436,41 @@ void CHIPScenesClusterStoreSceneResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPScenesClusterStoreSceneResponseCallback, void (*)(CHIPScenesClusterStoreSceneResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPScenesClusterStoreSceneResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPScenesClusterStoreSceneResponseCallback>);
+    std::unique_ptr<CHIPMediaPlaybackClusterPlaybackResponseCallback, void (*)(CHIPMediaPlaybackClusterPlaybackResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPMediaPlaybackClusterPlaybackResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPMediaPlaybackClusterPlaybackResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess",
-                                                  "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V", &javaMethod);
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/util/Optional;)V",
+                                                  &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject Status;
-    std::string StatusClassName     = "java/lang/Integer";
-    std::string StatusCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(StatusClassName.c_str(), StatusCtorSignature.c_str(),
-                                                                  dataResponse.status, Status);
-    jobject GroupId;
-    std::string GroupIdClassName     = "java/lang/Integer";
-    std::string GroupIdCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(GroupIdClassName.c_str(), GroupIdCtorSignature.c_str(),
-                                                                   dataResponse.groupId, GroupId);
-    jobject SceneId;
-    std::string SceneIdClassName     = "java/lang/Integer";
-    std::string SceneIdCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(SceneIdClassName.c_str(), SceneIdCtorSignature.c_str(),
-                                                                  dataResponse.sceneId, SceneId);
+    jobject status;
+    std::string statusClassName     = "java/lang/Integer";
+    std::string statusCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
+                                                                  static_cast<uint8_t>(dataResponse.status), status);
+    jobject data;
+    if (!dataResponse.data.HasValue())
+    {
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, data);
+    }
+    else
+    {
+        jobject dataInsideOptional;
+        dataInsideOptional =
+            env->NewStringUTF(std::string(dataResponse.data.Value().data(), dataResponse.data.Value().size()).c_str());
+        chip::JniReferences::GetInstance().CreateOptional(dataInsideOptional, data);
+    }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, Status, GroupId, SceneId);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, status, data);
 }
-CHIPScenesClusterViewSceneResponseCallback::CHIPScenesClusterViewSceneResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPScenesClusterViewSceneResponseCallbackType>(CallbackFn, this)
+CHIPKeypadInputClusterSendKeyResponseCallback::CHIPKeypadInputClusterSendKeyResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPKeypadInputClusterSendKeyResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3324,7 +3486,7 @@ CHIPScenesClusterViewSceneResponseCallback::CHIPScenesClusterViewSceneResponseCa
     }
 }
 
-CHIPScenesClusterViewSceneResponseCallback::~CHIPScenesClusterViewSceneResponseCallback()
+CHIPKeypadInputClusterSendKeyResponseCallback::~CHIPKeypadInputClusterSendKeyResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3335,8 +3497,8 @@ CHIPScenesClusterViewSceneResponseCallback::~CHIPScenesClusterViewSceneResponseC
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPScenesClusterViewSceneResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::Scenes::Commands::ViewSceneResponse::DecodableType & dataResponse)
+void CHIPKeypadInputClusterSendKeyResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -3346,173 +3508,28 @@ void CHIPScenesClusterViewSceneResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPScenesClusterViewSceneResponseCallback, void (*)(CHIPScenesClusterViewSceneResponseCallback *)> cppCallback(
-        reinterpret_cast<CHIPScenesClusterViewSceneResponseCallback *>(context),
-        chip::Platform::Delete<CHIPScenesClusterViewSceneResponseCallback>);
+    std::unique_ptr<CHIPKeypadInputClusterSendKeyResponseCallback, void (*)(CHIPKeypadInputClusterSendKeyResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPKeypadInputClusterSendKeyResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPKeypadInputClusterSendKeyResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(
-        env, javaCallbackRef, "onSuccess",
-        "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V",
-        &javaMethod);
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject Status;
-    std::string StatusClassName     = "java/lang/Integer";
-    std::string StatusCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(StatusClassName.c_str(), StatusCtorSignature.c_str(),
-                                                                  dataResponse.status, Status);
-    jobject GroupId;
-    std::string GroupIdClassName     = "java/lang/Integer";
-    std::string GroupIdCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(GroupIdClassName.c_str(), GroupIdCtorSignature.c_str(),
-                                                                   dataResponse.groupId, GroupId);
-    jobject SceneId;
-    std::string SceneIdClassName     = "java/lang/Integer";
-    std::string SceneIdCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(SceneIdClassName.c_str(), SceneIdCtorSignature.c_str(),
-                                                                  dataResponse.sceneId, SceneId);
-    jobject TransitionTime;
-    if (!dataResponse.transitionTime.HasValue())
-    {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, TransitionTime);
-    }
-    else
-    {
-        jobject TransitionTimeInsideOptional;
-        std::string TransitionTimeInsideOptionalClassName     = "java/lang/Integer";
-        std::string TransitionTimeInsideOptionalCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-            TransitionTimeInsideOptionalClassName.c_str(), TransitionTimeInsideOptionalCtorSignature.c_str(),
-            dataResponse.transitionTime.Value(), TransitionTimeInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(TransitionTimeInsideOptional, TransitionTime);
-    }
-    jobject SceneName;
-    if (!dataResponse.sceneName.HasValue())
-    {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, SceneName);
-    }
-    else
-    {
-        jobject SceneNameInsideOptional;
-        SceneNameInsideOptional =
-            env->NewStringUTF(std::string(dataResponse.sceneName.Value().data(), dataResponse.sceneName.Value().size()).c_str());
-        chip::JniReferences::GetInstance().CreateOptional(SceneNameInsideOptional, SceneName);
-    }
-    jobject ExtensionFieldSets;
-    if (!dataResponse.extensionFieldSets.HasValue())
-    {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, ExtensionFieldSets);
-    }
-    else
-    {
-        jobject ExtensionFieldSetsInsideOptional;
-        chip::JniReferences::GetInstance().CreateArrayList(ExtensionFieldSetsInsideOptional);
-
-        auto iter_ExtensionFieldSetsInsideOptional_1 = dataResponse.extensionFieldSets.Value().begin();
-        while (iter_ExtensionFieldSetsInsideOptional_1.Next())
-        {
-            auto & entry_1 = iter_ExtensionFieldSetsInsideOptional_1.GetValue();
-            jobject newElement_1;
-            jobject newElement_1_clusterId;
-            std::string newElement_1_clusterIdClassName     = "java/lang/Long";
-            std::string newElement_1_clusterIdCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_1_clusterIdClassName.c_str(),
-                                                                           newElement_1_clusterIdCtorSignature.c_str(),
-                                                                           entry_1.clusterId, newElement_1_clusterId);
-            jobject newElement_1_attributeValueList;
-            chip::JniReferences::GetInstance().CreateArrayList(newElement_1_attributeValueList);
-
-            auto iter_newElement_1_attributeValueList_3 = entry_1.attributeValueList.begin();
-            while (iter_newElement_1_attributeValueList_3.Next())
-            {
-                auto & entry_3 = iter_newElement_1_attributeValueList_3.GetValue();
-                jobject newElement_3;
-                jobject newElement_3_attributeId;
-                if (!entry_3.attributeId.HasValue())
-                {
-                    chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_3_attributeId);
-                }
-                else
-                {
-                    jobject newElement_3_attributeIdInsideOptional;
-                    std::string newElement_3_attributeIdInsideOptionalClassName     = "java/lang/Long";
-                    std::string newElement_3_attributeIdInsideOptionalCtorSignature = "(J)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                        newElement_3_attributeIdInsideOptionalClassName.c_str(),
-                        newElement_3_attributeIdInsideOptionalCtorSignature.c_str(), entry_3.attributeId.Value(),
-                        newElement_3_attributeIdInsideOptional);
-                    chip::JniReferences::GetInstance().CreateOptional(newElement_3_attributeIdInsideOptional,
-                                                                      newElement_3_attributeId);
-                }
-                jobject newElement_3_attributeValue;
-                chip::JniReferences::GetInstance().CreateArrayList(newElement_3_attributeValue);
-
-                auto iter_newElement_3_attributeValue_5 = entry_3.attributeValue.begin();
-                while (iter_newElement_3_attributeValue_5.Next())
-                {
-                    auto & entry_5 = iter_newElement_3_attributeValue_5.GetValue();
-                    jobject newElement_5;
-                    std::string newElement_5ClassName     = "java/lang/Integer";
-                    std::string newElement_5CtorSignature = "(I)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                        newElement_5ClassName.c_str(), newElement_5CtorSignature.c_str(), entry_5, newElement_5);
-                    chip::JniReferences::GetInstance().AddToList(newElement_3_attributeValue, newElement_5);
-                }
-
-                jclass attributeValuePairStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$ScenesClusterAttributeValuePair", attributeValuePairStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$ScenesClusterAttributeValuePair");
-                    return;
-                }
-                jmethodID attributeValuePairStructCtor =
-                    env->GetMethodID(attributeValuePairStructClass, "<init>", "(Ljava/util/Optional;Ljava/util/ArrayList;)V");
-                if (attributeValuePairStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$ScenesClusterAttributeValuePair constructor");
-                    return;
-                }
-
-                newElement_3 = env->NewObject(attributeValuePairStructClass, attributeValuePairStructCtor, newElement_3_attributeId,
-                                              newElement_3_attributeValue);
-                chip::JniReferences::GetInstance().AddToList(newElement_1_attributeValueList, newElement_3);
-            }
-
-            jclass extensionFieldSetStructClass;
-            err = chip::JniReferences::GetInstance().GetClassRef(
-                env, "chip/devicecontroller/ChipStructs$ScenesClusterExtensionFieldSet", extensionFieldSetStructClass);
-            if (err != CHIP_NO_ERROR)
-            {
-                ChipLogError(Zcl, "Could not find class ChipStructs$ScenesClusterExtensionFieldSet");
-                return;
-            }
-            jmethodID extensionFieldSetStructCtor =
-                env->GetMethodID(extensionFieldSetStructClass, "<init>", "(Ljava/lang/Long;Ljava/util/ArrayList;)V");
-            if (extensionFieldSetStructCtor == nullptr)
-            {
-                ChipLogError(Zcl, "Could not find ChipStructs$ScenesClusterExtensionFieldSet constructor");
-                return;
-            }
-
-            newElement_1 = env->NewObject(extensionFieldSetStructClass, extensionFieldSetStructCtor, newElement_1_clusterId,
-                                          newElement_1_attributeValueList);
-            chip::JniReferences::GetInstance().AddToList(ExtensionFieldSetsInsideOptional, newElement_1);
-        }
-        chip::JniReferences::GetInstance().CreateOptional(ExtensionFieldSetsInsideOptional, ExtensionFieldSets);
-    }
+    jobject status;
+    std::string statusClassName     = "java/lang/Integer";
+    std::string statusCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
+                                                                  static_cast<uint8_t>(dataResponse.status), status);
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, Status, GroupId, SceneId, TransitionTime, SceneName, ExtensionFieldSets);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, status);
 }
-CHIPTargetNavigatorClusterNavigateTargetResponseCallback::CHIPTargetNavigatorClusterNavigateTargetResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPTargetNavigatorClusterNavigateTargetResponseCallbackType>(CallbackFn, this)
+CHIPContentLauncherClusterLaunchResponseCallback::CHIPContentLauncherClusterLaunchResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPContentLauncherClusterLaunchResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3528,7 +3545,7 @@ CHIPTargetNavigatorClusterNavigateTargetResponseCallback::CHIPTargetNavigatorClu
     }
 }
 
-CHIPTargetNavigatorClusterNavigateTargetResponseCallback::~CHIPTargetNavigatorClusterNavigateTargetResponseCallback()
+CHIPContentLauncherClusterLaunchResponseCallback::~CHIPContentLauncherClusterLaunchResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3539,21 +3556,20 @@ CHIPTargetNavigatorClusterNavigateTargetResponseCallback::~CHIPTargetNavigatorCl
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPTargetNavigatorClusterNavigateTargetResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::DecodableType & dataResponse)
+void CHIPContentLauncherClusterLaunchResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
     jobject javaCallbackRef;
     jmethodID javaMethod;
-
-    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
-
-    std::unique_ptr<CHIPTargetNavigatorClusterNavigateTargetResponseCallback,
-                    void (*)(CHIPTargetNavigatorClusterNavigateTargetResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPTargetNavigatorClusterNavigateTargetResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPTargetNavigatorClusterNavigateTargetResponseCallback>);
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
+
+    std::unique_ptr<CHIPContentLauncherClusterLaunchResponseCallback, void (*)(CHIPContentLauncherClusterLaunchResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPContentLauncherClusterLaunchResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPContentLauncherClusterLaunchResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
@@ -3584,8 +3600,9 @@ void CHIPTargetNavigatorClusterNavigateTargetResponseCallback::CallbackFn(
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, status, data);
 }
-CHIPTestClusterClusterBooleanResponseCallback::CHIPTestClusterClusterBooleanResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPTestClusterClusterBooleanResponseCallbackType>(CallbackFn, this)
+CHIPApplicationLauncherClusterLauncherResponseCallback::CHIPApplicationLauncherClusterLauncherResponseCallback(
+    jobject javaCallback) :
+    Callback::Callback<CHIPApplicationLauncherClusterLauncherResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3601,7 +3618,7 @@ CHIPTestClusterClusterBooleanResponseCallback::CHIPTestClusterClusterBooleanResp
     }
 }
 
-CHIPTestClusterClusterBooleanResponseCallback::~CHIPTestClusterClusterBooleanResponseCallback()
+CHIPApplicationLauncherClusterLauncherResponseCallback::~CHIPApplicationLauncherClusterLauncherResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3612,8 +3629,8 @@ CHIPTestClusterClusterBooleanResponseCallback::~CHIPTestClusterClusterBooleanRes
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPTestClusterClusterBooleanResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::TestCluster::Commands::BooleanResponse::DecodableType & dataResponse)
+void CHIPApplicationLauncherClusterLauncherResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -3623,28 +3640,34 @@ void CHIPTestClusterClusterBooleanResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPTestClusterClusterBooleanResponseCallback, void (*)(CHIPTestClusterClusterBooleanResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPTestClusterClusterBooleanResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPTestClusterClusterBooleanResponseCallback>);
+    std::unique_ptr<CHIPApplicationLauncherClusterLauncherResponseCallback,
+                    void (*)(CHIPApplicationLauncherClusterLauncherResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPApplicationLauncherClusterLauncherResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPApplicationLauncherClusterLauncherResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Boolean;)V", &javaMethod);
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;[B)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject value;
-    std::string valueClassName     = "java/lang/Boolean";
-    std::string valueCtorSignature = "(Z)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                               dataResponse.value, value);
+    jobject status;
+    std::string statusClassName     = "java/lang/Integer";
+    std::string statusCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
+                                                                  static_cast<uint8_t>(dataResponse.status), status);
+    jobject data;
+    jbyteArray dataByteArray = env->NewByteArray(static_cast<jsize>(dataResponse.data.size()));
+    env->SetByteArrayRegion(dataByteArray, 0, static_cast<jsize>(dataResponse.data.size()),
+                            reinterpret_cast<const jbyte *>(dataResponse.data.data()));
+    data = dataByteArray;
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, value);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, status, data);
 }
-CHIPTestClusterClusterSimpleStructResponseCallback::CHIPTestClusterClusterSimpleStructResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPTestClusterClusterSimpleStructResponseCallbackType>(CallbackFn, this)
+CHIPAccountLoginClusterGetSetupPINResponseCallback::CHIPAccountLoginClusterGetSetupPINResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPAccountLoginClusterGetSetupPINResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3660,7 +3683,7 @@ CHIPTestClusterClusterSimpleStructResponseCallback::CHIPTestClusterClusterSimple
     }
 }
 
-CHIPTestClusterClusterSimpleStructResponseCallback::~CHIPTestClusterClusterSimpleStructResponseCallback()
+CHIPAccountLoginClusterGetSetupPINResponseCallback::~CHIPAccountLoginClusterGetSetupPINResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3671,8 +3694,8 @@ CHIPTestClusterClusterSimpleStructResponseCallback::~CHIPTestClusterClusterSimpl
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPTestClusterClusterSimpleStructResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::TestCluster::Commands::SimpleStructResponse::DecodableType & dataResponse)
+void CHIPAccountLoginClusterGetSetupPINResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::AccountLogin::Commands::GetSetupPINResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -3682,84 +3705,26 @@ void CHIPTestClusterClusterSimpleStructResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPTestClusterClusterSimpleStructResponseCallback,
-                    void (*)(CHIPTestClusterClusterSimpleStructResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPTestClusterClusterSimpleStructResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPTestClusterClusterSimpleStructResponseCallback>);
+    std::unique_ptr<CHIPAccountLoginClusterGetSetupPINResponseCallback,
+                    void (*)(CHIPAccountLoginClusterGetSetupPINResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPAccountLoginClusterGetSetupPINResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPAccountLoginClusterGetSetupPINResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(
-        env, javaCallbackRef, "onSuccess", "(Lchip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct;)V", &javaMethod);
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/String;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject arg1;
-    jobject arg1_a;
-    std::string arg1_aClassName     = "java/lang/Integer";
-    std::string arg1_aCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(arg1_aClassName.c_str(), arg1_aCtorSignature.c_str(),
-                                                                  dataResponse.arg1.a, arg1_a);
-    jobject arg1_b;
-    std::string arg1_bClassName     = "java/lang/Boolean";
-    std::string arg1_bCtorSignature = "(Z)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<bool>(arg1_bClassName.c_str(), arg1_bCtorSignature.c_str(),
-                                                               dataResponse.arg1.b, arg1_b);
-    jobject arg1_c;
-    std::string arg1_cClassName     = "java/lang/Integer";
-    std::string arg1_cCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(arg1_cClassName.c_str(), arg1_cCtorSignature.c_str(),
-                                                                  static_cast<uint8_t>(dataResponse.arg1.c), arg1_c);
-    jobject arg1_d;
-    jbyteArray arg1_dByteArray = env->NewByteArray(static_cast<jsize>(dataResponse.arg1.d.size()));
-    env->SetByteArrayRegion(arg1_dByteArray, 0, static_cast<jsize>(dataResponse.arg1.d.size()),
-                            reinterpret_cast<const jbyte *>(dataResponse.arg1.d.data()));
-    arg1_d = arg1_dByteArray;
-    jobject arg1_e;
-    arg1_e = env->NewStringUTF(std::string(dataResponse.arg1.e.data(), dataResponse.arg1.e.size()).c_str());
-    jobject arg1_f;
-    std::string arg1_fClassName     = "java/lang/Integer";
-    std::string arg1_fCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(arg1_fClassName.c_str(), arg1_fCtorSignature.c_str(),
-                                                                  dataResponse.arg1.f.Raw(), arg1_f);
-    jobject arg1_g;
-    std::string arg1_gClassName     = "java/lang/Float";
-    std::string arg1_gCtorSignature = "(F)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<float>(arg1_gClassName.c_str(), arg1_gCtorSignature.c_str(),
-                                                                dataResponse.arg1.g, arg1_g);
-    jobject arg1_h;
-    std::string arg1_hClassName     = "java/lang/Double";
-    std::string arg1_hCtorSignature = "(D)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<double>(arg1_hClassName.c_str(), arg1_hCtorSignature.c_str(),
-                                                                 dataResponse.arg1.h, arg1_h);
-
-    jclass simpleStructStructClass;
-    err = chip::JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct",
-                                                         simpleStructStructClass);
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterSimpleStruct");
-        return;
-    }
-    jmethodID simpleStructStructCtor = env->GetMethodID(simpleStructStructClass, "<init>",
-                                                        "(Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;[BLjava/lang/"
-                                                        "String;Ljava/lang/Integer;Ljava/lang/Float;Ljava/lang/Double;)V");
-    if (simpleStructStructCtor == nullptr)
-    {
-        ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterSimpleStruct constructor");
-        return;
-    }
-
-    arg1 = env->NewObject(simpleStructStructClass, simpleStructStructCtor, arg1_a, arg1_b, arg1_c, arg1_d, arg1_e, arg1_f, arg1_g,
-                          arg1_h);
+    jobject setupPIN;
+    setupPIN = env->NewStringUTF(std::string(dataResponse.setupPIN.data(), dataResponse.setupPIN.size()).c_str());
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arg1);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, setupPIN);
 }
-CHIPTestClusterClusterTestAddArgumentsResponseCallback::CHIPTestClusterClusterTestAddArgumentsResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPTestClusterClusterTestAddArgumentsResponseCallbackType>(CallbackFn, this)
+CHIPTestClusterClusterTestSpecificResponseCallback::CHIPTestClusterClusterTestSpecificResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPTestClusterClusterTestSpecificResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3775,7 +3740,7 @@ CHIPTestClusterClusterTestAddArgumentsResponseCallback::CHIPTestClusterClusterTe
     }
 }
 
-CHIPTestClusterClusterTestAddArgumentsResponseCallback::~CHIPTestClusterClusterTestAddArgumentsResponseCallback()
+CHIPTestClusterClusterTestSpecificResponseCallback::~CHIPTestClusterClusterTestSpecificResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3786,8 +3751,8 @@ CHIPTestClusterClusterTestAddArgumentsResponseCallback::~CHIPTestClusterClusterT
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPTestClusterClusterTestAddArgumentsResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::TestCluster::Commands::TestAddArgumentsResponse::DecodableType & dataResponse)
+void CHIPTestClusterClusterTestSpecificResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::TestCluster::Commands::TestSpecificResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -3797,10 +3762,10 @@ void CHIPTestClusterClusterTestAddArgumentsResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPTestClusterClusterTestAddArgumentsResponseCallback,
-                    void (*)(CHIPTestClusterClusterTestAddArgumentsResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPTestClusterClusterTestAddArgumentsResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPTestClusterClusterTestAddArgumentsResponseCallback>);
+    std::unique_ptr<CHIPTestClusterClusterTestSpecificResponseCallback,
+                    void (*)(CHIPTestClusterClusterTestSpecificResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPTestClusterClusterTestSpecificResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPTestClusterClusterTestSpecificResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
@@ -3818,9 +3783,9 @@ void CHIPTestClusterClusterTestAddArgumentsResponseCallback::CallbackFn(
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, returnValue);
 }
-CHIPTestClusterClusterTestEmitTestEventResponseCallback::CHIPTestClusterClusterTestEmitTestEventResponseCallback(
+CHIPTestClusterClusterTestAddArgumentsResponseCallback::CHIPTestClusterClusterTestAddArgumentsResponseCallback(
     jobject javaCallback) :
-    Callback::Callback<CHIPTestClusterClusterTestEmitTestEventResponseCallbackType>(CallbackFn, this)
+    Callback::Callback<CHIPTestClusterClusterTestAddArgumentsResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3836,7 +3801,7 @@ CHIPTestClusterClusterTestEmitTestEventResponseCallback::CHIPTestClusterClusterT
     }
 }
 
-CHIPTestClusterClusterTestEmitTestEventResponseCallback::~CHIPTestClusterClusterTestEmitTestEventResponseCallback()
+CHIPTestClusterClusterTestAddArgumentsResponseCallback::~CHIPTestClusterClusterTestAddArgumentsResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3847,8 +3812,8 @@ CHIPTestClusterClusterTestEmitTestEventResponseCallback::~CHIPTestClusterCluster
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPTestClusterClusterTestEmitTestEventResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::TestCluster::Commands::TestEmitTestEventResponse::DecodableType & dataResponse)
+void CHIPTestClusterClusterTestAddArgumentsResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::TestCluster::Commands::TestAddArgumentsResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -3858,29 +3823,30 @@ void CHIPTestClusterClusterTestEmitTestEventResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPTestClusterClusterTestEmitTestEventResponseCallback,
-                    void (*)(CHIPTestClusterClusterTestEmitTestEventResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPTestClusterClusterTestEmitTestEventResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPTestClusterClusterTestEmitTestEventResponseCallback>);
+    std::unique_ptr<CHIPTestClusterClusterTestAddArgumentsResponseCallback,
+                    void (*)(CHIPTestClusterClusterTestAddArgumentsResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPTestClusterClusterTestAddArgumentsResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPTestClusterClusterTestAddArgumentsResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject value;
-    std::string valueClassName     = "java/lang/Long";
-    std::string valueCtorSignature = "(J)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                   dataResponse.value, value);
+    jobject returnValue;
+    std::string returnValueClassName     = "java/lang/Integer";
+    std::string returnValueCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(returnValueClassName.c_str(), returnValueCtorSignature.c_str(),
+                                                                  dataResponse.returnValue, returnValue);
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, value);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, returnValue);
 }
-CHIPTestClusterClusterTestEnumsResponseCallback::CHIPTestClusterClusterTestEnumsResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPTestClusterClusterTestEnumsResponseCallbackType>(CallbackFn, this)
+CHIPTestClusterClusterTestListInt8UReverseResponseCallback::CHIPTestClusterClusterTestListInt8UReverseResponseCallback(
+    jobject javaCallback) :
+    Callback::Callback<CHIPTestClusterClusterTestListInt8UReverseResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3896,7 +3862,7 @@ CHIPTestClusterClusterTestEnumsResponseCallback::CHIPTestClusterClusterTestEnums
     }
 }
 
-CHIPTestClusterClusterTestEnumsResponseCallback::~CHIPTestClusterClusterTestEnumsResponseCallback()
+CHIPTestClusterClusterTestListInt8UReverseResponseCallback::~CHIPTestClusterClusterTestListInt8UReverseResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3907,8 +3873,8 @@ CHIPTestClusterClusterTestEnumsResponseCallback::~CHIPTestClusterClusterTestEnum
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPTestClusterClusterTestEnumsResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::TestCluster::Commands::TestEnumsResponse::DecodableType & dataResponse)
+void CHIPTestClusterClusterTestListInt8UReverseResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::TestCluster::Commands::TestListInt8UReverseResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -3918,35 +3884,38 @@ void CHIPTestClusterClusterTestEnumsResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPTestClusterClusterTestEnumsResponseCallback, void (*)(CHIPTestClusterClusterTestEnumsResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPTestClusterClusterTestEnumsResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPTestClusterClusterTestEnumsResponseCallback>);
+    std::unique_ptr<CHIPTestClusterClusterTestListInt8UReverseResponseCallback,
+                    void (*)(CHIPTestClusterClusterTestListInt8UReverseResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPTestClusterClusterTestListInt8UReverseResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPTestClusterClusterTestListInt8UReverseResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/lang/Integer;)V",
-                                                  &javaMethod);
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/ArrayList;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
     jobject arg1;
-    std::string arg1ClassName     = "java/lang/Integer";
-    std::string arg1CtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(arg1ClassName.c_str(), arg1CtorSignature.c_str(),
-                                                                   static_cast<uint16_t>(dataResponse.arg1), arg1);
-    jobject arg2;
-    std::string arg2ClassName     = "java/lang/Integer";
-    std::string arg2CtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(arg2ClassName.c_str(), arg2CtorSignature.c_str(),
-                                                                  static_cast<uint8_t>(dataResponse.arg2), arg2);
+    chip::JniReferences::GetInstance().CreateArrayList(arg1);
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arg1, arg2);
+    auto iter_arg1_0 = dataResponse.arg1.begin();
+    while (iter_arg1_0.Next())
+    {
+        auto & entry_0 = iter_arg1_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Integer";
+        std::string newElement_0CtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0ClassName.c_str(),
+                                                                      newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arg1, newElement_0);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arg1);
 }
-CHIPTestClusterClusterTestListInt8UReverseResponseCallback::CHIPTestClusterClusterTestListInt8UReverseResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPTestClusterClusterTestListInt8UReverseResponseCallbackType>(CallbackFn, this)
+CHIPTestClusterClusterTestEnumsResponseCallback::CHIPTestClusterClusterTestEnumsResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPTestClusterClusterTestEnumsResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3962,7 +3931,7 @@ CHIPTestClusterClusterTestListInt8UReverseResponseCallback::CHIPTestClusterClust
     }
 }
 
-CHIPTestClusterClusterTestListInt8UReverseResponseCallback::~CHIPTestClusterClusterTestListInt8UReverseResponseCallback()
+CHIPTestClusterClusterTestEnumsResponseCallback::~CHIPTestClusterClusterTestEnumsResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3973,8 +3942,8 @@ CHIPTestClusterClusterTestListInt8UReverseResponseCallback::~CHIPTestClusterClus
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPTestClusterClusterTestListInt8UReverseResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::TestCluster::Commands::TestListInt8UReverseResponse::DecodableType & dataResponse)
+void CHIPTestClusterClusterTestEnumsResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::TestCluster::Commands::TestEnumsResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -3984,35 +3953,31 @@ void CHIPTestClusterClusterTestListInt8UReverseResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPTestClusterClusterTestListInt8UReverseResponseCallback,
-                    void (*)(CHIPTestClusterClusterTestListInt8UReverseResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPTestClusterClusterTestListInt8UReverseResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPTestClusterClusterTestListInt8UReverseResponseCallback>);
+    std::unique_ptr<CHIPTestClusterClusterTestEnumsResponseCallback, void (*)(CHIPTestClusterClusterTestEnumsResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPTestClusterClusterTestEnumsResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPTestClusterClusterTestEnumsResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/ArrayList;)V", &javaMethod);
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/lang/Integer;)V",
+                                                  &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
     jobject arg1;
-    chip::JniReferences::GetInstance().CreateArrayList(arg1);
-
-    auto iter_arg1_0 = dataResponse.arg1.begin();
-    while (iter_arg1_0.Next())
-    {
-        auto & entry_0 = iter_arg1_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Integer";
-        std::string newElement_0CtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0ClassName.c_str(),
-                                                                      newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arg1, newElement_0);
-    }
+    std::string arg1ClassName     = "java/lang/Integer";
+    std::string arg1CtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(arg1ClassName.c_str(), arg1CtorSignature.c_str(),
+                                                                   static_cast<uint16_t>(dataResponse.arg1), arg1);
+    jobject arg2;
+    std::string arg2ClassName     = "java/lang/Integer";
+    std::string arg2CtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(arg2ClassName.c_str(), arg2CtorSignature.c_str(),
+                                                                  static_cast<uint8_t>(dataResponse.arg2), arg2);
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arg1);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arg1, arg2);
 }
 CHIPTestClusterClusterTestNullableOptionalResponseCallback::CHIPTestClusterClusterTestNullableOptionalResponseCallback(
     jobject javaCallback) :
@@ -4129,8 +4094,8 @@ void CHIPTestClusterClusterTestNullableOptionalResponseCallback::CallbackFn(
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, wasPresent, wasNull, value, originalValue);
 }
-CHIPTestClusterClusterTestSpecificResponseCallback::CHIPTestClusterClusterTestSpecificResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPTestClusterClusterTestSpecificResponseCallbackType>(CallbackFn, this)
+CHIPTestClusterClusterBooleanResponseCallback::CHIPTestClusterClusterBooleanResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPTestClusterClusterBooleanResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4146,7 +4111,7 @@ CHIPTestClusterClusterTestSpecificResponseCallback::CHIPTestClusterClusterTestSp
     }
 }
 
-CHIPTestClusterClusterTestSpecificResponseCallback::~CHIPTestClusterClusterTestSpecificResponseCallback()
+CHIPTestClusterClusterBooleanResponseCallback::~CHIPTestClusterClusterBooleanResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4157,8 +4122,8 @@ CHIPTestClusterClusterTestSpecificResponseCallback::~CHIPTestClusterClusterTestS
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPTestClusterClusterTestSpecificResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::TestCluster::Commands::TestSpecificResponse::DecodableType & dataResponse)
+void CHIPTestClusterClusterBooleanResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::TestCluster::Commands::BooleanResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -4168,30 +4133,28 @@ void CHIPTestClusterClusterTestSpecificResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPTestClusterClusterTestSpecificResponseCallback,
-                    void (*)(CHIPTestClusterClusterTestSpecificResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPTestClusterClusterTestSpecificResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPTestClusterClusterTestSpecificResponseCallback>);
+    std::unique_ptr<CHIPTestClusterClusterBooleanResponseCallback, void (*)(CHIPTestClusterClusterBooleanResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPTestClusterClusterBooleanResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPTestClusterClusterBooleanResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
     // Java callback is allowed to be null, exit early if this is the case.
     VerifyOrReturn(javaCallbackRef != nullptr);
 
-    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Boolean;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject returnValue;
-    std::string returnValueClassName     = "java/lang/Integer";
-    std::string returnValueCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(returnValueClassName.c_str(), returnValueCtorSignature.c_str(),
-                                                                  dataResponse.returnValue, returnValue);
+    jobject value;
+    std::string valueClassName     = "java/lang/Boolean";
+    std::string valueCtorSignature = "(Z)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<bool>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                               dataResponse.value, value);
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, returnValue);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, value);
 }
-CHIPThermostatClusterGetWeeklyScheduleResponseCallback::CHIPThermostatClusterGetWeeklyScheduleResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPThermostatClusterGetWeeklyScheduleResponseCallbackType>(CallbackFn, this)
+CHIPTestClusterClusterSimpleStructResponseCallback::CHIPTestClusterClusterSimpleStructResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPTestClusterClusterSimpleStructResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4207,7 +4170,7 @@ CHIPThermostatClusterGetWeeklyScheduleResponseCallback::CHIPThermostatClusterGet
     }
 }
 
-CHIPThermostatClusterGetWeeklyScheduleResponseCallback::~CHIPThermostatClusterGetWeeklyScheduleResponseCallback()
+CHIPTestClusterClusterSimpleStructResponseCallback::~CHIPTestClusterClusterSimpleStructResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4218,8 +4181,8 @@ CHIPThermostatClusterGetWeeklyScheduleResponseCallback::~CHIPThermostatClusterGe
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPThermostatClusterGetWeeklyScheduleResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType & dataResponse)
+void CHIPTestClusterClusterSimpleStructResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::TestCluster::Commands::SimpleStructResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -4229,10 +4192,10 @@ void CHIPThermostatClusterGetWeeklyScheduleResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPThermostatClusterGetWeeklyScheduleResponseCallback,
-                    void (*)(CHIPThermostatClusterGetWeeklyScheduleResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPThermostatClusterGetWeeklyScheduleResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPThermostatClusterGetWeeklyScheduleResponseCallback>);
+    std::unique_ptr<CHIPTestClusterClusterSimpleStructResponseCallback,
+                    void (*)(CHIPTestClusterClusterSimpleStructResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPTestClusterClusterSimpleStructResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPTestClusterClusterSimpleStructResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
@@ -4240,92 +4203,129 @@ void CHIPThermostatClusterGetWeeklyScheduleResponseCallback::CallbackFn(
     VerifyOrReturn(javaCallbackRef != nullptr);
 
     err = JniReferences::GetInstance().FindMethod(
-        env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/ArrayList;)V",
-        &javaMethod);
+        env, javaCallbackRef, "onSuccess", "(Lchip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject NumberOfTransitionsForSequence;
-    std::string NumberOfTransitionsForSequenceClassName     = "java/lang/Integer";
-    std::string NumberOfTransitionsForSequenceCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-        NumberOfTransitionsForSequenceClassName.c_str(), NumberOfTransitionsForSequenceCtorSignature.c_str(),
-        dataResponse.numberOfTransitionsForSequence, NumberOfTransitionsForSequence);
-    jobject DayOfWeekForSequence;
-    std::string DayOfWeekForSequenceClassName     = "java/lang/Integer";
-    std::string DayOfWeekForSequenceCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(DayOfWeekForSequenceClassName.c_str(),
-                                                                  DayOfWeekForSequenceCtorSignature.c_str(),
-                                                                  dataResponse.dayOfWeekForSequence.Raw(), DayOfWeekForSequence);
-    jobject ModeForSequence;
-    std::string ModeForSequenceClassName     = "java/lang/Integer";
-    std::string ModeForSequenceCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(ModeForSequenceClassName.c_str(),
-                                                                  ModeForSequenceCtorSignature.c_str(),
-                                                                  dataResponse.modeForSequence.Raw(), ModeForSequence);
-    jobject Transitions;
-    chip::JniReferences::GetInstance().CreateArrayList(Transitions);
+    jobject arg1;
+    jobject arg1_a;
+    std::string arg1_aClassName     = "java/lang/Integer";
+    std::string arg1_aCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(arg1_aClassName.c_str(), arg1_aCtorSignature.c_str(),
+                                                                  dataResponse.arg1.a, arg1_a);
+    jobject arg1_b;
+    std::string arg1_bClassName     = "java/lang/Boolean";
+    std::string arg1_bCtorSignature = "(Z)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<bool>(arg1_bClassName.c_str(), arg1_bCtorSignature.c_str(),
+                                                               dataResponse.arg1.b, arg1_b);
+    jobject arg1_c;
+    std::string arg1_cClassName     = "java/lang/Integer";
+    std::string arg1_cCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(arg1_cClassName.c_str(), arg1_cCtorSignature.c_str(),
+                                                                  static_cast<uint8_t>(dataResponse.arg1.c), arg1_c);
+    jobject arg1_d;
+    jbyteArray arg1_dByteArray = env->NewByteArray(static_cast<jsize>(dataResponse.arg1.d.size()));
+    env->SetByteArrayRegion(arg1_dByteArray, 0, static_cast<jsize>(dataResponse.arg1.d.size()),
+                            reinterpret_cast<const jbyte *>(dataResponse.arg1.d.data()));
+    arg1_d = arg1_dByteArray;
+    jobject arg1_e;
+    arg1_e = env->NewStringUTF(std::string(dataResponse.arg1.e.data(), dataResponse.arg1.e.size()).c_str());
+    jobject arg1_f;
+    std::string arg1_fClassName     = "java/lang/Integer";
+    std::string arg1_fCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(arg1_fClassName.c_str(), arg1_fCtorSignature.c_str(),
+                                                                  dataResponse.arg1.f.Raw(), arg1_f);
+    jobject arg1_g;
+    std::string arg1_gClassName     = "java/lang/Float";
+    std::string arg1_gCtorSignature = "(F)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<float>(arg1_gClassName.c_str(), arg1_gCtorSignature.c_str(),
+                                                                dataResponse.arg1.g, arg1_g);
+    jobject arg1_h;
+    std::string arg1_hClassName     = "java/lang/Double";
+    std::string arg1_hCtorSignature = "(D)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<double>(arg1_hClassName.c_str(), arg1_hCtorSignature.c_str(),
+                                                                 dataResponse.arg1.h, arg1_h);
 
-    auto iter_Transitions_0 = dataResponse.transitions.begin();
-    while (iter_Transitions_0.Next())
+    jclass simpleStructStructClass;
+    err = chip::JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct",
+                                                         simpleStructStructClass);
+    if (err != CHIP_NO_ERROR)
     {
-        auto & entry_0 = iter_Transitions_0.GetValue();
-        jobject newElement_0;
-        jobject newElement_0_transitionTime;
-        std::string newElement_0_transitionTimeClassName     = "java/lang/Integer";
-        std::string newElement_0_transitionTimeCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_transitionTimeClassName.c_str(),
-                                                                       newElement_0_transitionTimeCtorSignature.c_str(),
-                                                                       entry_0.transitionTime, newElement_0_transitionTime);
-        jobject newElement_0_heatSetpoint;
-        if (entry_0.heatSetpoint.IsNull())
-        {
-            newElement_0_heatSetpoint = nullptr;
-        }
-        else
-        {
-            std::string newElement_0_heatSetpointClassName     = "java/lang/Integer";
-            std::string newElement_0_heatSetpointCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(newElement_0_heatSetpointClassName.c_str(),
-                                                                          newElement_0_heatSetpointCtorSignature.c_str(),
-                                                                          entry_0.heatSetpoint.Value(), newElement_0_heatSetpoint);
-        }
-        jobject newElement_0_coolSetpoint;
-        if (entry_0.coolSetpoint.IsNull())
-        {
-            newElement_0_coolSetpoint = nullptr;
-        }
-        else
-        {
-            std::string newElement_0_coolSetpointClassName     = "java/lang/Integer";
-            std::string newElement_0_coolSetpointCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(newElement_0_coolSetpointClassName.c_str(),
-                                                                          newElement_0_coolSetpointCtorSignature.c_str(),
-                                                                          entry_0.coolSetpoint.Value(), newElement_0_coolSetpoint);
-        }
+        ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterSimpleStruct");
+        return;
+    }
+    jmethodID simpleStructStructCtor = env->GetMethodID(simpleStructStructClass, "<init>",
+                                                        "(Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;[BLjava/lang/"
+                                                        "String;Ljava/lang/Integer;Ljava/lang/Float;Ljava/lang/Double;)V");
+    if (simpleStructStructCtor == nullptr)
+    {
+        ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterSimpleStruct constructor");
+        return;
+    }
 
-        jclass thermostatScheduleTransitionStructClass;
-        err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$ThermostatClusterThermostatScheduleTransition",
-            thermostatScheduleTransitionStructClass);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$ThermostatClusterThermostatScheduleTransition");
-            return;
-        }
-        jmethodID thermostatScheduleTransitionStructCtor = env->GetMethodID(
-            thermostatScheduleTransitionStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V");
-        if (thermostatScheduleTransitionStructCtor == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$ThermostatClusterThermostatScheduleTransition constructor");
-            return;
-        }
+    arg1 = env->NewObject(simpleStructStructClass, simpleStructStructCtor, arg1_a, arg1_b, arg1_c, arg1_d, arg1_e, arg1_f, arg1_g,
+                          arg1_h);
 
-        newElement_0 = env->NewObject(thermostatScheduleTransitionStructClass, thermostatScheduleTransitionStructCtor,
-                                      newElement_0_transitionTime, newElement_0_heatSetpoint, newElement_0_coolSetpoint);
-        chip::JniReferences::GetInstance().AddToList(Transitions, newElement_0);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arg1);
+}
+CHIPTestClusterClusterTestEmitTestEventResponseCallback::CHIPTestClusterClusterTestEmitTestEventResponseCallback(
+    jobject javaCallback) :
+    Callback::Callback<CHIPTestClusterClusterTestEmitTestEventResponseCallbackType>(CallbackFn, this)
+{
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, NumberOfTransitionsForSequence, DayOfWeekForSequence, ModeForSequence,
-                        Transitions);
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPTestClusterClusterTestEmitTestEventResponseCallback::~CHIPTestClusterClusterTestEmitTestEventResponseCallback()
+{
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+};
+
+void CHIPTestClusterClusterTestEmitTestEventResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::TestCluster::Commands::TestEmitTestEventResponse::DecodableType & dataResponse)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+    jmethodID javaMethod;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
+
+    std::unique_ptr<CHIPTestClusterClusterTestEmitTestEventResponseCallback,
+                    void (*)(CHIPTestClusterClusterTestEmitTestEventResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPTestClusterClusterTestEmitTestEventResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPTestClusterClusterTestEmitTestEventResponseCallback>);
+    VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
+
+    javaCallbackRef = cppCallback->javaCallbackRef;
+    // Java callback is allowed to be null, exit early if this is the case.
+    VerifyOrReturn(javaCallbackRef != nullptr);
+
+    err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
+
+    jobject value;
+    std::string valueClassName     = "java/lang/Long";
+    std::string valueCtorSignature = "(J)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(valueClassName.c_str(), valueCtorSignature.c_str(),
+                                                                   dataResponse.value, value);
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, value);
 }
 } // namespace chip
diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.h b/src/controller/java/zap-generated/CHIPInvokeCallbacks.h
index f248dc4c60ff62..48ed9d967954c9 100644
--- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.h
+++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.h
@@ -24,195 +24,184 @@
 
 namespace chip {
 
-class CHIPAccountLoginClusterGetSetupPINResponseCallback
-    : public Callback::Callback<CHIPAccountLoginClusterGetSetupPINResponseCallbackType>
+class CHIPGroupsClusterAddGroupResponseCallback : public Callback::Callback<CHIPGroupsClusterAddGroupResponseCallbackType>
 {
 public:
-    CHIPAccountLoginClusterGetSetupPINResponseCallback(jobject javaCallback);
+    CHIPGroupsClusterAddGroupResponseCallback(jobject javaCallback);
 
-    ~CHIPAccountLoginClusterGetSetupPINResponseCallback();
+    ~CHIPGroupsClusterAddGroupResponseCallback();
 
-    static void CallbackFn(void * context,
-                           const chip::app::Clusters::AccountLogin::Commands::GetSetupPINResponse::DecodableType & data);
+    static void CallbackFn(void * context, const chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPApplicationLauncherClusterLauncherResponseCallback
-    : public Callback::Callback<CHIPApplicationLauncherClusterLauncherResponseCallbackType>
+class CHIPGroupsClusterViewGroupResponseCallback : public Callback::Callback<CHIPGroupsClusterViewGroupResponseCallbackType>
 {
 public:
-    CHIPApplicationLauncherClusterLauncherResponseCallback(jobject javaCallback);
+    CHIPGroupsClusterViewGroupResponseCallback(jobject javaCallback);
 
-    ~CHIPApplicationLauncherClusterLauncherResponseCallback();
+    ~CHIPGroupsClusterViewGroupResponseCallback();
 
-    static void CallbackFn(void * context,
-                           const chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType & data);
+    static void CallbackFn(void * context, const chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPChannelClusterChangeChannelResponseCallback
-    : public Callback::Callback<CHIPChannelClusterChangeChannelResponseCallbackType>
+class CHIPGroupsClusterGetGroupMembershipResponseCallback
+    : public Callback::Callback<CHIPGroupsClusterGetGroupMembershipResponseCallbackType>
 {
 public:
-    CHIPChannelClusterChangeChannelResponseCallback(jobject javaCallback);
+    CHIPGroupsClusterGetGroupMembershipResponseCallback(jobject javaCallback);
 
-    ~CHIPChannelClusterChangeChannelResponseCallback();
+    ~CHIPGroupsClusterGetGroupMembershipResponseCallback();
 
     static void CallbackFn(void * context,
-                           const chip::app::Clusters::Channel::Commands::ChangeChannelResponse::DecodableType & data);
+                           const chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPContentLauncherClusterLaunchResponseCallback
-    : public Callback::Callback<CHIPContentLauncherClusterLaunchResponseCallbackType>
+class CHIPGroupsClusterRemoveGroupResponseCallback : public Callback::Callback<CHIPGroupsClusterRemoveGroupResponseCallbackType>
 {
 public:
-    CHIPContentLauncherClusterLaunchResponseCallback(jobject javaCallback);
+    CHIPGroupsClusterRemoveGroupResponseCallback(jobject javaCallback);
 
-    ~CHIPContentLauncherClusterLaunchResponseCallback();
+    ~CHIPGroupsClusterRemoveGroupResponseCallback();
 
-    static void CallbackFn(void * context,
-                           const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & data);
+    static void CallbackFn(void * context, const chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback
-    : public Callback::Callback<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackType>
+class CHIPScenesClusterAddSceneResponseCallback : public Callback::Callback<CHIPScenesClusterAddSceneResponseCallbackType>
 {
 public:
-    CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback(jobject javaCallback);
+    CHIPScenesClusterAddSceneResponseCallback(jobject javaCallback);
 
-    ~CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback();
+    ~CHIPScenesClusterAddSceneResponseCallback();
 
-    static void CallbackFn(void * context,
-                           const chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType & data);
+    static void CallbackFn(void * context, const chip::app::Clusters::Scenes::Commands::AddSceneResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterGetCredentialStatusResponseCallback
-    : public Callback::Callback<CHIPDoorLockClusterGetCredentialStatusResponseCallbackType>
+class CHIPScenesClusterViewSceneResponseCallback : public Callback::Callback<CHIPScenesClusterViewSceneResponseCallbackType>
 {
 public:
-    CHIPDoorLockClusterGetCredentialStatusResponseCallback(jobject javaCallback);
+    CHIPScenesClusterViewSceneResponseCallback(jobject javaCallback);
 
-    ~CHIPDoorLockClusterGetCredentialStatusResponseCallback();
+    ~CHIPScenesClusterViewSceneResponseCallback();
 
-    static void CallbackFn(void * context,
-                           const chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType & data);
+    static void CallbackFn(void * context, const chip::app::Clusters::Scenes::Commands::ViewSceneResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterGetHolidayScheduleResponseCallback
-    : public Callback::Callback<CHIPDoorLockClusterGetHolidayScheduleResponseCallbackType>
+class CHIPScenesClusterRemoveSceneResponseCallback : public Callback::Callback<CHIPScenesClusterRemoveSceneResponseCallbackType>
 {
 public:
-    CHIPDoorLockClusterGetHolidayScheduleResponseCallback(jobject javaCallback);
+    CHIPScenesClusterRemoveSceneResponseCallback(jobject javaCallback);
 
-    ~CHIPDoorLockClusterGetHolidayScheduleResponseCallback();
+    ~CHIPScenesClusterRemoveSceneResponseCallback();
 
-    static void CallbackFn(void * context,
-                           const chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType & data);
+    static void CallbackFn(void * context, const chip::app::Clusters::Scenes::Commands::RemoveSceneResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterGetUserResponseCallback : public Callback::Callback<CHIPDoorLockClusterGetUserResponseCallbackType>
+class CHIPScenesClusterRemoveAllScenesResponseCallback
+    : public Callback::Callback<CHIPScenesClusterRemoveAllScenesResponseCallbackType>
 {
 public:
-    CHIPDoorLockClusterGetUserResponseCallback(jobject javaCallback);
+    CHIPScenesClusterRemoveAllScenesResponseCallback(jobject javaCallback);
 
-    ~CHIPDoorLockClusterGetUserResponseCallback();
+    ~CHIPScenesClusterRemoveAllScenesResponseCallback();
 
-    static void CallbackFn(void * context, const chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType & data);
+    static void CallbackFn(void * context,
+                           const chip::app::Clusters::Scenes::Commands::RemoveAllScenesResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterGetWeekDayScheduleResponseCallback
-    : public Callback::Callback<CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackType>
+class CHIPScenesClusterStoreSceneResponseCallback : public Callback::Callback<CHIPScenesClusterStoreSceneResponseCallbackType>
 {
 public:
-    CHIPDoorLockClusterGetWeekDayScheduleResponseCallback(jobject javaCallback);
+    CHIPScenesClusterStoreSceneResponseCallback(jobject javaCallback);
 
-    ~CHIPDoorLockClusterGetWeekDayScheduleResponseCallback();
+    ~CHIPScenesClusterStoreSceneResponseCallback();
 
-    static void CallbackFn(void * context,
-                           const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType & data);
+    static void CallbackFn(void * context, const chip::app::Clusters::Scenes::Commands::StoreSceneResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterGetYearDayScheduleResponseCallback
-    : public Callback::Callback<CHIPDoorLockClusterGetYearDayScheduleResponseCallbackType>
+class CHIPScenesClusterGetSceneMembershipResponseCallback
+    : public Callback::Callback<CHIPScenesClusterGetSceneMembershipResponseCallbackType>
 {
 public:
-    CHIPDoorLockClusterGetYearDayScheduleResponseCallback(jobject javaCallback);
+    CHIPScenesClusterGetSceneMembershipResponseCallback(jobject javaCallback);
 
-    ~CHIPDoorLockClusterGetYearDayScheduleResponseCallback();
+    ~CHIPScenesClusterGetSceneMembershipResponseCallback();
 
     static void CallbackFn(void * context,
-                           const chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType & data);
+                           const chip::app::Clusters::Scenes::Commands::GetSceneMembershipResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterSetCredentialResponseCallback
-    : public Callback::Callback<CHIPDoorLockClusterSetCredentialResponseCallbackType>
+class CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback
+    : public Callback::Callback<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallbackType>
 {
 public:
-    CHIPDoorLockClusterSetCredentialResponseCallback(jobject javaCallback);
+    CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback(jobject javaCallback);
 
-    ~CHIPDoorLockClusterSetCredentialResponseCallback();
+    ~CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback();
 
-    static void CallbackFn(void * context,
-                           const chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType & data);
+    static void
+    CallbackFn(void * context,
+               const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImageResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPGeneralCommissioningClusterArmFailSafeResponseCallback
-    : public Callback::Callback<CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackType>
+class CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback
+    : public Callback::Callback<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallbackType>
 {
 public:
-    CHIPGeneralCommissioningClusterArmFailSafeResponseCallback(jobject javaCallback);
+    CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback(jobject javaCallback);
 
-    ~CHIPGeneralCommissioningClusterArmFailSafeResponseCallback();
+    ~CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback();
 
-    static void CallbackFn(void * context,
-                           const chip::app::Clusters::GeneralCommissioning::Commands::ArmFailSafeResponse::DecodableType & data);
+    static void
+    CallbackFn(void * context,
+               const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback
-    : public Callback::Callback<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackType>
+class CHIPGeneralCommissioningClusterArmFailSafeResponseCallback
+    : public Callback::Callback<CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackType>
 {
 public:
-    CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback(jobject javaCallback);
+    CHIPGeneralCommissioningClusterArmFailSafeResponseCallback(jobject javaCallback);
 
-    ~CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback();
+    ~CHIPGeneralCommissioningClusterArmFailSafeResponseCallback();
 
-    static void
-    CallbackFn(void * context,
-               const chip::app::Clusters::GeneralCommissioning::Commands::CommissioningCompleteResponse::DecodableType & data);
+    static void CallbackFn(void * context,
+                           const chip::app::Clusters::GeneralCommissioning::Commands::ArmFailSafeResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
@@ -234,377 +223,390 @@ class CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback
     jobject javaCallbackRef;
 };
 
-class CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback
-    : public Callback::Callback<CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallbackType>
+class CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback
+    : public Callback::Callback<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackType>
 {
 public:
-    CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback(jobject javaCallback);
+    CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback(jobject javaCallback);
 
-    ~CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback();
+    ~CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback();
 
     static void
     CallbackFn(void * context,
-               const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::DecodableType & data);
+               const chip::app::Clusters::GeneralCommissioning::Commands::CommissioningCompleteResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPGroupKeyManagementClusterKeySetReadResponseCallback
-    : public Callback::Callback<CHIPGroupKeyManagementClusterKeySetReadResponseCallbackType>
+class CHIPNetworkCommissioningClusterScanNetworksResponseCallback
+    : public Callback::Callback<CHIPNetworkCommissioningClusterScanNetworksResponseCallbackType>
 {
 public:
-    CHIPGroupKeyManagementClusterKeySetReadResponseCallback(jobject javaCallback);
+    CHIPNetworkCommissioningClusterScanNetworksResponseCallback(jobject javaCallback);
 
-    ~CHIPGroupKeyManagementClusterKeySetReadResponseCallback();
+    ~CHIPNetworkCommissioningClusterScanNetworksResponseCallback();
 
     static void CallbackFn(void * context,
-                           const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadResponse::DecodableType & data);
+                           const chip::app::Clusters::NetworkCommissioning::Commands::ScanNetworksResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPGroupsClusterAddGroupResponseCallback : public Callback::Callback<CHIPGroupsClusterAddGroupResponseCallbackType>
+class CHIPNetworkCommissioningClusterNetworkConfigResponseCallback
+    : public Callback::Callback<CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackType>
 {
 public:
-    CHIPGroupsClusterAddGroupResponseCallback(jobject javaCallback);
+    CHIPNetworkCommissioningClusterNetworkConfigResponseCallback(jobject javaCallback);
 
-    ~CHIPGroupsClusterAddGroupResponseCallback();
+    ~CHIPNetworkCommissioningClusterNetworkConfigResponseCallback();
 
-    static void CallbackFn(void * context, const chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType & data);
+    static void CallbackFn(void * context,
+                           const chip::app::Clusters::NetworkCommissioning::Commands::NetworkConfigResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPGroupsClusterGetGroupMembershipResponseCallback
-    : public Callback::Callback<CHIPGroupsClusterGetGroupMembershipResponseCallbackType>
+class CHIPNetworkCommissioningClusterConnectNetworkResponseCallback
+    : public Callback::Callback<CHIPNetworkCommissioningClusterConnectNetworkResponseCallbackType>
 {
 public:
-    CHIPGroupsClusterGetGroupMembershipResponseCallback(jobject javaCallback);
+    CHIPNetworkCommissioningClusterConnectNetworkResponseCallback(jobject javaCallback);
 
-    ~CHIPGroupsClusterGetGroupMembershipResponseCallback();
+    ~CHIPNetworkCommissioningClusterConnectNetworkResponseCallback();
 
     static void CallbackFn(void * context,
-                           const chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType & data);
+                           const chip::app::Clusters::NetworkCommissioning::Commands::ConnectNetworkResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPGroupsClusterRemoveGroupResponseCallback : public Callback::Callback<CHIPGroupsClusterRemoveGroupResponseCallbackType>
+class CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback
+    : public Callback::Callback<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackType>
 {
 public:
-    CHIPGroupsClusterRemoveGroupResponseCallback(jobject javaCallback);
+    CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback(jobject javaCallback);
 
-    ~CHIPGroupsClusterRemoveGroupResponseCallback();
+    ~CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback();
 
-    static void CallbackFn(void * context, const chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType & data);
+    static void CallbackFn(void * context,
+                           const chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPGroupsClusterViewGroupResponseCallback : public Callback::Callback<CHIPGroupsClusterViewGroupResponseCallbackType>
+class CHIPOperationalCredentialsClusterAttestationResponseCallback
+    : public Callback::Callback<CHIPOperationalCredentialsClusterAttestationResponseCallbackType>
 {
 public:
-    CHIPGroupsClusterViewGroupResponseCallback(jobject javaCallback);
+    CHIPOperationalCredentialsClusterAttestationResponseCallback(jobject javaCallback);
 
-    ~CHIPGroupsClusterViewGroupResponseCallback();
+    ~CHIPOperationalCredentialsClusterAttestationResponseCallback();
 
-    static void CallbackFn(void * context, const chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType & data);
+    static void CallbackFn(void * context,
+                           const chip::app::Clusters::OperationalCredentials::Commands::AttestationResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPKeypadInputClusterSendKeyResponseCallback : public Callback::Callback<CHIPKeypadInputClusterSendKeyResponseCallbackType>
+class CHIPOperationalCredentialsClusterCertificateChainResponseCallback
+    : public Callback::Callback<CHIPOperationalCredentialsClusterCertificateChainResponseCallbackType>
 {
 public:
-    CHIPKeypadInputClusterSendKeyResponseCallback(jobject javaCallback);
+    CHIPOperationalCredentialsClusterCertificateChainResponseCallback(jobject javaCallback);
 
-    ~CHIPKeypadInputClusterSendKeyResponseCallback();
+    ~CHIPOperationalCredentialsClusterCertificateChainResponseCallback();
 
-    static void CallbackFn(void * context, const chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType & data);
+    static void
+    CallbackFn(void * context,
+               const chip::app::Clusters::OperationalCredentials::Commands::CertificateChainResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPMediaPlaybackClusterPlaybackResponseCallback
-    : public Callback::Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>
+class CHIPOperationalCredentialsClusterCSRResponseCallback
+    : public Callback::Callback<CHIPOperationalCredentialsClusterCSRResponseCallbackType>
 {
 public:
-    CHIPMediaPlaybackClusterPlaybackResponseCallback(jobject javaCallback);
+    CHIPOperationalCredentialsClusterCSRResponseCallback(jobject javaCallback);
 
-    ~CHIPMediaPlaybackClusterPlaybackResponseCallback();
+    ~CHIPOperationalCredentialsClusterCSRResponseCallback();
 
     static void CallbackFn(void * context,
-                           const chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType & data);
+                           const chip::app::Clusters::OperationalCredentials::Commands::CSRResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPNetworkCommissioningClusterConnectNetworkResponseCallback
-    : public Callback::Callback<CHIPNetworkCommissioningClusterConnectNetworkResponseCallbackType>
+class CHIPOperationalCredentialsClusterNOCResponseCallback
+    : public Callback::Callback<CHIPOperationalCredentialsClusterNOCResponseCallbackType>
 {
 public:
-    CHIPNetworkCommissioningClusterConnectNetworkResponseCallback(jobject javaCallback);
+    CHIPOperationalCredentialsClusterNOCResponseCallback(jobject javaCallback);
 
-    ~CHIPNetworkCommissioningClusterConnectNetworkResponseCallback();
+    ~CHIPOperationalCredentialsClusterNOCResponseCallback();
 
     static void CallbackFn(void * context,
-                           const chip::app::Clusters::NetworkCommissioning::Commands::ConnectNetworkResponse::DecodableType & data);
+                           const chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPNetworkCommissioningClusterNetworkConfigResponseCallback
-    : public Callback::Callback<CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackType>
+class CHIPGroupKeyManagementClusterKeySetReadResponseCallback
+    : public Callback::Callback<CHIPGroupKeyManagementClusterKeySetReadResponseCallbackType>
 {
 public:
-    CHIPNetworkCommissioningClusterNetworkConfigResponseCallback(jobject javaCallback);
+    CHIPGroupKeyManagementClusterKeySetReadResponseCallback(jobject javaCallback);
 
-    ~CHIPNetworkCommissioningClusterNetworkConfigResponseCallback();
+    ~CHIPGroupKeyManagementClusterKeySetReadResponseCallback();
 
     static void CallbackFn(void * context,
-                           const chip::app::Clusters::NetworkCommissioning::Commands::NetworkConfigResponse::DecodableType & data);
+                           const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPNetworkCommissioningClusterScanNetworksResponseCallback
-    : public Callback::Callback<CHIPNetworkCommissioningClusterScanNetworksResponseCallbackType>
+class CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback
+    : public Callback::Callback<CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallbackType>
 {
 public:
-    CHIPNetworkCommissioningClusterScanNetworksResponseCallback(jobject javaCallback);
+    CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback(jobject javaCallback);
 
-    ~CHIPNetworkCommissioningClusterScanNetworksResponseCallback();
+    ~CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback();
 
-    static void CallbackFn(void * context,
-                           const chip::app::Clusters::NetworkCommissioning::Commands::ScanNetworksResponse::DecodableType & data);
+    static void
+    CallbackFn(void * context,
+               const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback
-    : public Callback::Callback<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallbackType>
+class CHIPDoorLockClusterGetWeekDayScheduleResponseCallback
+    : public Callback::Callback<CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackType>
 {
 public:
-    CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback(jobject javaCallback);
+    CHIPDoorLockClusterGetWeekDayScheduleResponseCallback(jobject javaCallback);
 
-    ~CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback();
+    ~CHIPDoorLockClusterGetWeekDayScheduleResponseCallback();
 
-    static void
-    CallbackFn(void * context,
-               const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::DecodableType & data);
+    static void CallbackFn(void * context,
+                           const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback
-    : public Callback::Callback<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallbackType>
+class CHIPDoorLockClusterGetYearDayScheduleResponseCallback
+    : public Callback::Callback<CHIPDoorLockClusterGetYearDayScheduleResponseCallbackType>
 {
 public:
-    CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback(jobject javaCallback);
+    CHIPDoorLockClusterGetYearDayScheduleResponseCallback(jobject javaCallback);
 
-    ~CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback();
+    ~CHIPDoorLockClusterGetYearDayScheduleResponseCallback();
 
-    static void
-    CallbackFn(void * context,
-               const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImageResponse::DecodableType & data);
+    static void CallbackFn(void * context,
+                           const chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPOperationalCredentialsClusterAttestationResponseCallback
-    : public Callback::Callback<CHIPOperationalCredentialsClusterAttestationResponseCallbackType>
+class CHIPDoorLockClusterGetHolidayScheduleResponseCallback
+    : public Callback::Callback<CHIPDoorLockClusterGetHolidayScheduleResponseCallbackType>
 {
 public:
-    CHIPOperationalCredentialsClusterAttestationResponseCallback(jobject javaCallback);
+    CHIPDoorLockClusterGetHolidayScheduleResponseCallback(jobject javaCallback);
 
-    ~CHIPOperationalCredentialsClusterAttestationResponseCallback();
+    ~CHIPDoorLockClusterGetHolidayScheduleResponseCallback();
 
     static void CallbackFn(void * context,
-                           const chip::app::Clusters::OperationalCredentials::Commands::AttestationResponse::DecodableType & data);
+                           const chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPOperationalCredentialsClusterCSRResponseCallback
-    : public Callback::Callback<CHIPOperationalCredentialsClusterCSRResponseCallbackType>
+class CHIPDoorLockClusterGetUserResponseCallback : public Callback::Callback<CHIPDoorLockClusterGetUserResponseCallbackType>
 {
 public:
-    CHIPOperationalCredentialsClusterCSRResponseCallback(jobject javaCallback);
+    CHIPDoorLockClusterGetUserResponseCallback(jobject javaCallback);
 
-    ~CHIPOperationalCredentialsClusterCSRResponseCallback();
+    ~CHIPDoorLockClusterGetUserResponseCallback();
 
-    static void CallbackFn(void * context,
-                           const chip::app::Clusters::OperationalCredentials::Commands::CSRResponse::DecodableType & data);
+    static void CallbackFn(void * context, const chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPOperationalCredentialsClusterCertificateChainResponseCallback
-    : public Callback::Callback<CHIPOperationalCredentialsClusterCertificateChainResponseCallbackType>
+class CHIPDoorLockClusterSetCredentialResponseCallback
+    : public Callback::Callback<CHIPDoorLockClusterSetCredentialResponseCallbackType>
 {
 public:
-    CHIPOperationalCredentialsClusterCertificateChainResponseCallback(jobject javaCallback);
+    CHIPDoorLockClusterSetCredentialResponseCallback(jobject javaCallback);
 
-    ~CHIPOperationalCredentialsClusterCertificateChainResponseCallback();
+    ~CHIPDoorLockClusterSetCredentialResponseCallback();
 
-    static void
-    CallbackFn(void * context,
-               const chip::app::Clusters::OperationalCredentials::Commands::CertificateChainResponse::DecodableType & data);
+    static void CallbackFn(void * context,
+                           const chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPOperationalCredentialsClusterNOCResponseCallback
-    : public Callback::Callback<CHIPOperationalCredentialsClusterNOCResponseCallbackType>
+class CHIPDoorLockClusterGetCredentialStatusResponseCallback
+    : public Callback::Callback<CHIPDoorLockClusterGetCredentialStatusResponseCallbackType>
 {
 public:
-    CHIPOperationalCredentialsClusterNOCResponseCallback(jobject javaCallback);
+    CHIPDoorLockClusterGetCredentialStatusResponseCallback(jobject javaCallback);
 
-    ~CHIPOperationalCredentialsClusterNOCResponseCallback();
+    ~CHIPDoorLockClusterGetCredentialStatusResponseCallback();
 
     static void CallbackFn(void * context,
-                           const chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::DecodableType & data);
+                           const chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPScenesClusterAddSceneResponseCallback : public Callback::Callback<CHIPScenesClusterAddSceneResponseCallbackType>
+class CHIPThermostatClusterGetWeeklyScheduleResponseCallback
+    : public Callback::Callback<CHIPThermostatClusterGetWeeklyScheduleResponseCallbackType>
 {
 public:
-    CHIPScenesClusterAddSceneResponseCallback(jobject javaCallback);
+    CHIPThermostatClusterGetWeeklyScheduleResponseCallback(jobject javaCallback);
 
-    ~CHIPScenesClusterAddSceneResponseCallback();
+    ~CHIPThermostatClusterGetWeeklyScheduleResponseCallback();
 
-    static void CallbackFn(void * context, const chip::app::Clusters::Scenes::Commands::AddSceneResponse::DecodableType & data);
+    static void CallbackFn(void * context,
+                           const chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPScenesClusterGetSceneMembershipResponseCallback
-    : public Callback::Callback<CHIPScenesClusterGetSceneMembershipResponseCallbackType>
+class CHIPChannelClusterChangeChannelResponseCallback
+    : public Callback::Callback<CHIPChannelClusterChangeChannelResponseCallbackType>
 {
 public:
-    CHIPScenesClusterGetSceneMembershipResponseCallback(jobject javaCallback);
+    CHIPChannelClusterChangeChannelResponseCallback(jobject javaCallback);
 
-    ~CHIPScenesClusterGetSceneMembershipResponseCallback();
+    ~CHIPChannelClusterChangeChannelResponseCallback();
 
     static void CallbackFn(void * context,
-                           const chip::app::Clusters::Scenes::Commands::GetSceneMembershipResponse::DecodableType & data);
+                           const chip::app::Clusters::Channel::Commands::ChangeChannelResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPScenesClusterRemoveAllScenesResponseCallback
-    : public Callback::Callback<CHIPScenesClusterRemoveAllScenesResponseCallbackType>
+class CHIPTargetNavigatorClusterNavigateTargetResponseCallback
+    : public Callback::Callback<CHIPTargetNavigatorClusterNavigateTargetResponseCallbackType>
 {
 public:
-    CHIPScenesClusterRemoveAllScenesResponseCallback(jobject javaCallback);
+    CHIPTargetNavigatorClusterNavigateTargetResponseCallback(jobject javaCallback);
 
-    ~CHIPScenesClusterRemoveAllScenesResponseCallback();
+    ~CHIPTargetNavigatorClusterNavigateTargetResponseCallback();
 
     static void CallbackFn(void * context,
-                           const chip::app::Clusters::Scenes::Commands::RemoveAllScenesResponse::DecodableType & data);
+                           const chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPScenesClusterRemoveSceneResponseCallback : public Callback::Callback<CHIPScenesClusterRemoveSceneResponseCallbackType>
+class CHIPMediaPlaybackClusterPlaybackResponseCallback
+    : public Callback::Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>
 {
 public:
-    CHIPScenesClusterRemoveSceneResponseCallback(jobject javaCallback);
+    CHIPMediaPlaybackClusterPlaybackResponseCallback(jobject javaCallback);
 
-    ~CHIPScenesClusterRemoveSceneResponseCallback();
+    ~CHIPMediaPlaybackClusterPlaybackResponseCallback();
 
-    static void CallbackFn(void * context, const chip::app::Clusters::Scenes::Commands::RemoveSceneResponse::DecodableType & data);
+    static void CallbackFn(void * context,
+                           const chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPScenesClusterStoreSceneResponseCallback : public Callback::Callback<CHIPScenesClusterStoreSceneResponseCallbackType>
+class CHIPKeypadInputClusterSendKeyResponseCallback : public Callback::Callback<CHIPKeypadInputClusterSendKeyResponseCallbackType>
 {
 public:
-    CHIPScenesClusterStoreSceneResponseCallback(jobject javaCallback);
+    CHIPKeypadInputClusterSendKeyResponseCallback(jobject javaCallback);
 
-    ~CHIPScenesClusterStoreSceneResponseCallback();
+    ~CHIPKeypadInputClusterSendKeyResponseCallback();
 
-    static void CallbackFn(void * context, const chip::app::Clusters::Scenes::Commands::StoreSceneResponse::DecodableType & data);
+    static void CallbackFn(void * context, const chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPScenesClusterViewSceneResponseCallback : public Callback::Callback<CHIPScenesClusterViewSceneResponseCallbackType>
+class CHIPContentLauncherClusterLaunchResponseCallback
+    : public Callback::Callback<CHIPContentLauncherClusterLaunchResponseCallbackType>
 {
 public:
-    CHIPScenesClusterViewSceneResponseCallback(jobject javaCallback);
+    CHIPContentLauncherClusterLaunchResponseCallback(jobject javaCallback);
 
-    ~CHIPScenesClusterViewSceneResponseCallback();
+    ~CHIPContentLauncherClusterLaunchResponseCallback();
 
-    static void CallbackFn(void * context, const chip::app::Clusters::Scenes::Commands::ViewSceneResponse::DecodableType & data);
+    static void CallbackFn(void * context,
+                           const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPTargetNavigatorClusterNavigateTargetResponseCallback
-    : public Callback::Callback<CHIPTargetNavigatorClusterNavigateTargetResponseCallbackType>
+class CHIPApplicationLauncherClusterLauncherResponseCallback
+    : public Callback::Callback<CHIPApplicationLauncherClusterLauncherResponseCallbackType>
 {
 public:
-    CHIPTargetNavigatorClusterNavigateTargetResponseCallback(jobject javaCallback);
+    CHIPApplicationLauncherClusterLauncherResponseCallback(jobject javaCallback);
 
-    ~CHIPTargetNavigatorClusterNavigateTargetResponseCallback();
+    ~CHIPApplicationLauncherClusterLauncherResponseCallback();
 
     static void CallbackFn(void * context,
-                           const chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::DecodableType & data);
+                           const chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPTestClusterClusterBooleanResponseCallback : public Callback::Callback<CHIPTestClusterClusterBooleanResponseCallbackType>
+class CHIPAccountLoginClusterGetSetupPINResponseCallback
+    : public Callback::Callback<CHIPAccountLoginClusterGetSetupPINResponseCallbackType>
 {
 public:
-    CHIPTestClusterClusterBooleanResponseCallback(jobject javaCallback);
+    CHIPAccountLoginClusterGetSetupPINResponseCallback(jobject javaCallback);
 
-    ~CHIPTestClusterClusterBooleanResponseCallback();
+    ~CHIPAccountLoginClusterGetSetupPINResponseCallback();
 
-    static void CallbackFn(void * context, const chip::app::Clusters::TestCluster::Commands::BooleanResponse::DecodableType & data);
+    static void CallbackFn(void * context,
+                           const chip::app::Clusters::AccountLogin::Commands::GetSetupPINResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPTestClusterClusterSimpleStructResponseCallback
-    : public Callback::Callback<CHIPTestClusterClusterSimpleStructResponseCallbackType>
+class CHIPTestClusterClusterTestSpecificResponseCallback
+    : public Callback::Callback<CHIPTestClusterClusterTestSpecificResponseCallbackType>
 {
 public:
-    CHIPTestClusterClusterSimpleStructResponseCallback(jobject javaCallback);
+    CHIPTestClusterClusterTestSpecificResponseCallback(jobject javaCallback);
 
-    ~CHIPTestClusterClusterSimpleStructResponseCallback();
+    ~CHIPTestClusterClusterTestSpecificResponseCallback();
 
     static void CallbackFn(void * context,
-                           const chip::app::Clusters::TestCluster::Commands::SimpleStructResponse::DecodableType & data);
+                           const chip::app::Clusters::TestCluster::Commands::TestSpecificResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
@@ -625,16 +627,16 @@ class CHIPTestClusterClusterTestAddArgumentsResponseCallback
     jobject javaCallbackRef;
 };
 
-class CHIPTestClusterClusterTestEmitTestEventResponseCallback
-    : public Callback::Callback<CHIPTestClusterClusterTestEmitTestEventResponseCallbackType>
+class CHIPTestClusterClusterTestListInt8UReverseResponseCallback
+    : public Callback::Callback<CHIPTestClusterClusterTestListInt8UReverseResponseCallbackType>
 {
 public:
-    CHIPTestClusterClusterTestEmitTestEventResponseCallback(jobject javaCallback);
+    CHIPTestClusterClusterTestListInt8UReverseResponseCallback(jobject javaCallback);
 
-    ~CHIPTestClusterClusterTestEmitTestEventResponseCallback();
+    ~CHIPTestClusterClusterTestListInt8UReverseResponseCallback();
 
     static void CallbackFn(void * context,
-                           const chip::app::Clusters::TestCluster::Commands::TestEmitTestEventResponse::DecodableType & data);
+                           const chip::app::Clusters::TestCluster::Commands::TestListInt8UReverseResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
@@ -655,61 +657,59 @@ class CHIPTestClusterClusterTestEnumsResponseCallback
     jobject javaCallbackRef;
 };
 
-class CHIPTestClusterClusterTestListInt8UReverseResponseCallback
-    : public Callback::Callback<CHIPTestClusterClusterTestListInt8UReverseResponseCallbackType>
+class CHIPTestClusterClusterTestNullableOptionalResponseCallback
+    : public Callback::Callback<CHIPTestClusterClusterTestNullableOptionalResponseCallbackType>
 {
 public:
-    CHIPTestClusterClusterTestListInt8UReverseResponseCallback(jobject javaCallback);
+    CHIPTestClusterClusterTestNullableOptionalResponseCallback(jobject javaCallback);
 
-    ~CHIPTestClusterClusterTestListInt8UReverseResponseCallback();
+    ~CHIPTestClusterClusterTestNullableOptionalResponseCallback();
 
     static void CallbackFn(void * context,
-                           const chip::app::Clusters::TestCluster::Commands::TestListInt8UReverseResponse::DecodableType & data);
+                           const chip::app::Clusters::TestCluster::Commands::TestNullableOptionalResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPTestClusterClusterTestNullableOptionalResponseCallback
-    : public Callback::Callback<CHIPTestClusterClusterTestNullableOptionalResponseCallbackType>
+class CHIPTestClusterClusterBooleanResponseCallback : public Callback::Callback<CHIPTestClusterClusterBooleanResponseCallbackType>
 {
 public:
-    CHIPTestClusterClusterTestNullableOptionalResponseCallback(jobject javaCallback);
+    CHIPTestClusterClusterBooleanResponseCallback(jobject javaCallback);
 
-    ~CHIPTestClusterClusterTestNullableOptionalResponseCallback();
+    ~CHIPTestClusterClusterBooleanResponseCallback();
 
-    static void CallbackFn(void * context,
-                           const chip::app::Clusters::TestCluster::Commands::TestNullableOptionalResponse::DecodableType & data);
+    static void CallbackFn(void * context, const chip::app::Clusters::TestCluster::Commands::BooleanResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPTestClusterClusterTestSpecificResponseCallback
-    : public Callback::Callback<CHIPTestClusterClusterTestSpecificResponseCallbackType>
+class CHIPTestClusterClusterSimpleStructResponseCallback
+    : public Callback::Callback<CHIPTestClusterClusterSimpleStructResponseCallbackType>
 {
 public:
-    CHIPTestClusterClusterTestSpecificResponseCallback(jobject javaCallback);
+    CHIPTestClusterClusterSimpleStructResponseCallback(jobject javaCallback);
 
-    ~CHIPTestClusterClusterTestSpecificResponseCallback();
+    ~CHIPTestClusterClusterSimpleStructResponseCallback();
 
     static void CallbackFn(void * context,
-                           const chip::app::Clusters::TestCluster::Commands::TestSpecificResponse::DecodableType & data);
+                           const chip::app::Clusters::TestCluster::Commands::SimpleStructResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPThermostatClusterGetWeeklyScheduleResponseCallback
-    : public Callback::Callback<CHIPThermostatClusterGetWeeklyScheduleResponseCallbackType>
+class CHIPTestClusterClusterTestEmitTestEventResponseCallback
+    : public Callback::Callback<CHIPTestClusterClusterTestEmitTestEventResponseCallbackType>
 {
 public:
-    CHIPThermostatClusterGetWeeklyScheduleResponseCallback(jobject javaCallback);
+    CHIPTestClusterClusterTestEmitTestEventResponseCallback(jobject javaCallback);
 
-    ~CHIPThermostatClusterGetWeeklyScheduleResponseCallback();
+    ~CHIPTestClusterClusterTestEmitTestEventResponseCallback();
 
     static void CallbackFn(void * context,
-                           const chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType & data);
+                           const chip::app::Clusters::TestCluster::Commands::TestEmitTestEventResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
index a1e32b98819411..7b0982326aa632 100644
--- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
+++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
@@ -672,8 +672,10 @@ void CHIPOctetStringAttributeCallback::CallbackFn(void * context, const chip::By
     env->CallVoidMethod(javaCallbackRef, javaMethod, valueArr);
 }
 
-CHIPAccessControlAclAttributeCallback::CHIPAccessControlAclAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPAccessControlClusterAclAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPIdentifyGeneratedCommandListAttributeCallback::CHIPIdentifyGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPIdentifyClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -689,7 +691,7 @@ CHIPAccessControlAclAttributeCallback::CHIPAccessControlAclAttributeCallback(job
     }
 }
 
-CHIPAccessControlAclAttributeCallback::~CHIPAccessControlAclAttributeCallback()
+CHIPIdentifyGeneratedCommandListAttributeCallback::~CHIPIdentifyGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -700,10 +702,8 @@ CHIPAccessControlAclAttributeCallback::~CHIPAccessControlAclAttributeCallback()
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPAccessControlAclAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::DecodableType> &
-        list)
+void CHIPIdentifyGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -712,8 +712,8 @@ void CHIPAccessControlAclAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPAccessControlAclAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPAccessControlAclAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPIdentifyGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPIdentifyGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -732,140 +732,10 @@ void CHIPAccessControlAclAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        jobject newElement_0_privilege;
-        std::string newElement_0_privilegeClassName     = "java/lang/Integer";
-        std::string newElement_0_privilegeCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-            newElement_0_privilegeClassName.c_str(), newElement_0_privilegeCtorSignature.c_str(),
-            static_cast<uint8_t>(entry_0.privilege), newElement_0_privilege);
-        jobject newElement_0_authMode;
-        std::string newElement_0_authModeClassName     = "java/lang/Integer";
-        std::string newElement_0_authModeCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-            newElement_0_authModeClassName.c_str(), newElement_0_authModeCtorSignature.c_str(),
-            static_cast<uint8_t>(entry_0.authMode), newElement_0_authMode);
-        jobject newElement_0_subjects;
-        if (entry_0.subjects.IsNull())
-        {
-            newElement_0_subjects = nullptr;
-        }
-        else
-        {
-            chip::JniReferences::GetInstance().CreateArrayList(newElement_0_subjects);
-
-            auto iter_newElement_0_subjects_3 = entry_0.subjects.Value().begin();
-            while (iter_newElement_0_subjects_3.Next())
-            {
-                auto & entry_3 = iter_newElement_0_subjects_3.GetValue();
-                jobject newElement_3;
-                std::string newElement_3ClassName     = "java/lang/Long";
-                std::string newElement_3CtorSignature = "(J)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(
-                    newElement_3ClassName.c_str(), newElement_3CtorSignature.c_str(), entry_3, newElement_3);
-                chip::JniReferences::GetInstance().AddToList(newElement_0_subjects, newElement_3);
-            }
-        }
-        jobject newElement_0_targets;
-        if (entry_0.targets.IsNull())
-        {
-            newElement_0_targets = nullptr;
-        }
-        else
-        {
-            chip::JniReferences::GetInstance().CreateArrayList(newElement_0_targets);
-
-            auto iter_newElement_0_targets_3 = entry_0.targets.Value().begin();
-            while (iter_newElement_0_targets_3.Next())
-            {
-                auto & entry_3 = iter_newElement_0_targets_3.GetValue();
-                jobject newElement_3;
-                jobject newElement_3_cluster;
-                if (entry_3.cluster.IsNull())
-                {
-                    newElement_3_cluster = nullptr;
-                }
-                else
-                {
-                    std::string newElement_3_clusterClassName     = "java/lang/Long";
-                    std::string newElement_3_clusterCtorSignature = "(J)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_3_clusterClassName.c_str(),
-                                                                                   newElement_3_clusterCtorSignature.c_str(),
-                                                                                   entry_3.cluster.Value(), newElement_3_cluster);
-                }
-                jobject newElement_3_endpoint;
-                if (entry_3.endpoint.IsNull())
-                {
-                    newElement_3_endpoint = nullptr;
-                }
-                else
-                {
-                    std::string newElement_3_endpointClassName     = "java/lang/Integer";
-                    std::string newElement_3_endpointCtorSignature = "(I)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_3_endpointClassName.c_str(),
-                                                                                   newElement_3_endpointCtorSignature.c_str(),
-                                                                                   entry_3.endpoint.Value(), newElement_3_endpoint);
-                }
-                jobject newElement_3_deviceType;
-                if (entry_3.deviceType.IsNull())
-                {
-                    newElement_3_deviceType = nullptr;
-                }
-                else
-                {
-                    std::string newElement_3_deviceTypeClassName     = "java/lang/Long";
-                    std::string newElement_3_deviceTypeCtorSignature = "(J)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                        newElement_3_deviceTypeClassName.c_str(), newElement_3_deviceTypeCtorSignature.c_str(),
-                        entry_3.deviceType.Value(), newElement_3_deviceType);
-                }
-
-                jclass targetStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$AccessControlClusterTarget", targetStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$AccessControlClusterTarget");
-                    return;
-                }
-                jmethodID targetStructCtor =
-                    env->GetMethodID(targetStructClass, "<init>", "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Long;)V");
-                if (targetStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$AccessControlClusterTarget constructor");
-                    return;
-                }
-
-                newElement_3 = env->NewObject(targetStructClass, targetStructCtor, newElement_3_cluster, newElement_3_endpoint,
-                                              newElement_3_deviceType);
-                chip::JniReferences::GetInstance().AddToList(newElement_0_targets, newElement_3);
-            }
-        }
-        jobject newElement_0_fabricIndex;
-        std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
-        std::string newElement_0_fabricIndexCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
-                                                                      newElement_0_fabricIndexCtorSignature.c_str(),
-                                                                      entry_0.fabricIndex, newElement_0_fabricIndex);
-
-        jclass accessControlEntryStructClass;
-        err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$AccessControlClusterAccessControlEntry", accessControlEntryStructClass);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$AccessControlClusterAccessControlEntry");
-            return;
-        }
-        jmethodID accessControlEntryStructCtor = env->GetMethodID(
-            accessControlEntryStructClass, "<init>",
-            "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/ArrayList;Ljava/util/ArrayList;Ljava/lang/Integer;)V");
-        if (accessControlEntryStructCtor == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$AccessControlClusterAccessControlEntry constructor");
-            return;
-        }
-
-        newElement_0 = env->NewObject(accessControlEntryStructClass, accessControlEntryStructCtor, newElement_0_privilege,
-                                      newElement_0_authMode, newElement_0_subjects, newElement_0_targets, newElement_0_fabricIndex);
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -873,8 +743,10 @@ void CHIPAccessControlAclAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPAccessControlExtensionAttributeCallback::CHIPAccessControlExtensionAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPAccessControlClusterExtensionAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPIdentifyAcceptedCommandListAttributeCallback::CHIPIdentifyAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                   bool keepAlive) :
+    chip::Callback::Callback<CHIPIdentifyClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -890,7 +762,7 @@ CHIPAccessControlExtensionAttributeCallback::CHIPAccessControlExtensionAttribute
     }
 }
 
-CHIPAccessControlExtensionAttributeCallback::~CHIPAccessControlExtensionAttributeCallback()
+CHIPIdentifyAcceptedCommandListAttributeCallback::~CHIPIdentifyAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -901,9 +773,8 @@ CHIPAccessControlExtensionAttributeCallback::~CHIPAccessControlExtensionAttribut
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPAccessControlExtensionAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::ExtensionEntry::DecodableType> & list)
+void CHIPIdentifyAcceptedCommandListAttributeCallback::CallbackFn(void * context,
+                                                                  const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -912,8 +783,8 @@ void CHIPAccessControlExtensionAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPAccessControlExtensionAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPAccessControlExtensionAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPIdentifyAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPIdentifyAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -932,35 +803,10 @@ void CHIPAccessControlExtensionAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        jobject newElement_0_data;
-        jbyteArray newElement_0_dataByteArray = env->NewByteArray(static_cast<jsize>(entry_0.data.size()));
-        env->SetByteArrayRegion(newElement_0_dataByteArray, 0, static_cast<jsize>(entry_0.data.size()),
-                                reinterpret_cast<const jbyte *>(entry_0.data.data()));
-        newElement_0_data = newElement_0_dataByteArray;
-        jobject newElement_0_fabricIndex;
-        std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
-        std::string newElement_0_fabricIndexCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
-                                                                      newElement_0_fabricIndexCtorSignature.c_str(),
-                                                                      entry_0.fabricIndex, newElement_0_fabricIndex);
-
-        jclass extensionEntryStructClass;
-        err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$AccessControlClusterExtensionEntry", extensionEntryStructClass);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$AccessControlClusterExtensionEntry");
-            return;
-        }
-        jmethodID extensionEntryStructCtor = env->GetMethodID(extensionEntryStructClass, "<init>", "([BLjava/lang/Integer;)V");
-        if (extensionEntryStructCtor == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$AccessControlClusterExtensionEntry constructor");
-            return;
-        }
-
-        newElement_0 =
-            env->NewObject(extensionEntryStructClass, extensionEntryStructCtor, newElement_0_data, newElement_0_fabricIndex);
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -968,10 +814,8 @@ void CHIPAccessControlExtensionAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPAccessControlGeneratedCommandListAttributeCallback::CHIPAccessControlGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPAccessControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPIdentifyAttributeListAttributeCallback::CHIPIdentifyAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPIdentifyClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -987,7 +831,7 @@ CHIPAccessControlGeneratedCommandListAttributeCallback::CHIPAccessControlGenerat
     }
 }
 
-CHIPAccessControlGeneratedCommandListAttributeCallback::~CHIPAccessControlGeneratedCommandListAttributeCallback()
+CHIPIdentifyAttributeListAttributeCallback::~CHIPIdentifyAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -998,8 +842,8 @@ CHIPAccessControlGeneratedCommandListAttributeCallback::~CHIPAccessControlGenera
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPAccessControlGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPIdentifyAttributeListAttributeCallback::CallbackFn(void * context,
+                                                            const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1008,8 +852,8 @@ void CHIPAccessControlGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPAccessControlGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPAccessControlGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPIdentifyAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPIdentifyAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -1039,9 +883,9 @@ void CHIPAccessControlGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPAccessControlAcceptedCommandListAttributeCallback::CHIPAccessControlAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                             bool keepAlive) :
-    chip::Callback::Callback<CHIPAccessControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPGroupsGeneratedCommandListAttributeCallback::CHIPGroupsGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                 bool keepAlive) :
+    chip::Callback::Callback<CHIPGroupsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -1058,7 +902,7 @@ CHIPAccessControlAcceptedCommandListAttributeCallback::CHIPAccessControlAccepted
     }
 }
 
-CHIPAccessControlAcceptedCommandListAttributeCallback::~CHIPAccessControlAcceptedCommandListAttributeCallback()
+CHIPGroupsGeneratedCommandListAttributeCallback::~CHIPGroupsGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1069,8 +913,8 @@ CHIPAccessControlAcceptedCommandListAttributeCallback::~CHIPAccessControlAccepte
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPAccessControlAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPGroupsGeneratedCommandListAttributeCallback::CallbackFn(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1079,8 +923,8 @@ void CHIPAccessControlAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPAccessControlAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPAccessControlAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPGroupsGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPGroupsGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -1110,9 +954,9 @@ void CHIPAccessControlAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPAccessControlAttributeListAttributeCallback::CHIPAccessControlAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                 bool keepAlive) :
-    chip::Callback::Callback<CHIPAccessControlClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPGroupsAcceptedCommandListAttributeCallback::CHIPGroupsAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPGroupsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -1129,7 +973,7 @@ CHIPAccessControlAttributeListAttributeCallback::CHIPAccessControlAttributeListA
     }
 }
 
-CHIPAccessControlAttributeListAttributeCallback::~CHIPAccessControlAttributeListAttributeCallback()
+CHIPGroupsAcceptedCommandListAttributeCallback::~CHIPGroupsAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1140,8 +984,8 @@ CHIPAccessControlAttributeListAttributeCallback::~CHIPAccessControlAttributeList
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPAccessControlAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPGroupsAcceptedCommandListAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1150,8 +994,8 @@ void CHIPAccessControlAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPAccessControlAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPAccessControlAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPGroupsAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPGroupsAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -1181,10 +1025,8 @@ void CHIPAccessControlAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPAccountLoginGeneratedCommandListAttributeCallback::CHIPAccountLoginGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                             bool keepAlive) :
-    chip::Callback::Callback<CHIPAccountLoginClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPGroupsAttributeListAttributeCallback::CHIPGroupsAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPGroupsClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1200,7 +1042,7 @@ CHIPAccountLoginGeneratedCommandListAttributeCallback::CHIPAccountLoginGenerated
     }
 }
 
-CHIPAccountLoginGeneratedCommandListAttributeCallback::~CHIPAccountLoginGeneratedCommandListAttributeCallback()
+CHIPGroupsAttributeListAttributeCallback::~CHIPGroupsAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1211,8 +1053,8 @@ CHIPAccountLoginGeneratedCommandListAttributeCallback::~CHIPAccountLoginGenerate
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPAccountLoginGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPGroupsAttributeListAttributeCallback::CallbackFn(void * context,
+                                                          const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1221,8 +1063,8 @@ void CHIPAccountLoginGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPAccountLoginGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPAccountLoginGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPGroupsAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPGroupsAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -1252,10 +1094,8 @@ void CHIPAccountLoginGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPAccountLoginAcceptedCommandListAttributeCallback::CHIPAccountLoginAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPAccountLoginClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPScenesCurrentGroupAttributeCallback::CHIPScenesCurrentGroupAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPScenesClusterCurrentGroupAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1271,7 +1111,7 @@ CHIPAccountLoginAcceptedCommandListAttributeCallback::CHIPAccountLoginAcceptedCo
     }
 }
 
-CHIPAccountLoginAcceptedCommandListAttributeCallback::~CHIPAccountLoginAcceptedCommandListAttributeCallback()
+CHIPScenesCurrentGroupAttributeCallback::~CHIPScenesCurrentGroupAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1282,8 +1122,7 @@ CHIPAccountLoginAcceptedCommandListAttributeCallback::~CHIPAccountLoginAcceptedC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPAccountLoginAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPScenesCurrentGroupAttributeCallback::CallbackFn(void * context, chip::GroupId value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1291,9 +1130,8 @@ void CHIPAccountLoginAcceptedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPAccountLoginAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPAccountLoginAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPScenesCurrentGroupAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPScenesCurrentGroupAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -1301,31 +1139,21 @@ void CHIPAccountLoginAcceptedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
-    {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
-    }
+    jobject javaValue;
+    std::string javaValueClassName     = "java/lang/Integer";
+    std::string javaValueCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   value, javaValue);
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPAccountLoginAttributeListAttributeCallback::CHIPAccountLoginAttributeListAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPAccountLoginClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPScenesGeneratedCommandListAttributeCallback::CHIPScenesGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                 bool keepAlive) :
+    chip::Callback::Callback<CHIPScenesClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -1342,7 +1170,7 @@ CHIPAccountLoginAttributeListAttributeCallback::CHIPAccountLoginAttributeListAtt
     }
 }
 
-CHIPAccountLoginAttributeListAttributeCallback::~CHIPAccountLoginAttributeListAttributeCallback()
+CHIPScenesGeneratedCommandListAttributeCallback::~CHIPScenesGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1353,8 +1181,8 @@ CHIPAccountLoginAttributeListAttributeCallback::~CHIPAccountLoginAttributeListAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPAccountLoginAttributeListAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPScenesGeneratedCommandListAttributeCallback::CallbackFn(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1363,8 +1191,8 @@ void CHIPAccountLoginAttributeListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPAccountLoginAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPAccountLoginAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPScenesGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPScenesGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -1394,9 +1222,9 @@ void CHIPAccountLoginAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback::CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPAdministratorCommissioningClusterAdminFabricIndexAttributeCallbackType>(CallbackFn, this),
+CHIPScenesAcceptedCommandListAttributeCallback::CHIPScenesAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPScenesClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -1413,7 +1241,7 @@ CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback::CHIPAdministrat
     }
 }
 
-CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback::~CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback()
+CHIPScenesAcceptedCommandListAttributeCallback::~CHIPScenesAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1424,7 +1252,8 @@ CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback::~CHIPAdministra
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback::CallbackFn(void * context, chip::FabricIndex value)
+void CHIPScenesAcceptedCommandListAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1432,8 +1261,9 @@ void CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback::CallbackFn
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPScenesAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPScenesAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -1441,22 +1271,30 @@ void CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback::CallbackFn
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    std::string javaValueClassName     = "java/lang/Integer";
-    std::string javaValueCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(), value,
-                                                                  javaValue);
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback::
-    CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPAdministratorCommissioningClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPScenesAttributeListAttributeCallback::CHIPScenesAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPScenesClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1472,8 +1310,7 @@ CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback::
-    ~CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback()
+CHIPScenesAttributeListAttributeCallback::~CHIPScenesAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1484,8 +1321,8 @@ CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPScenesAttributeListAttributeCallback::CallbackFn(void * context,
+                                                          const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1494,8 +1331,8 @@ void CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback::Callba
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPScenesAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPScenesAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -1525,10 +1362,8 @@ void CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback::Callba
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback::
-    CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPAdministratorCommissioningClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPOnOffStartUpOnOffAttributeCallback::CHIPOnOffStartUpOnOffAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOnOffClusterStartUpOnOffAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1544,8 +1379,7 @@ CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback::
     }
 }
 
-CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback::
-    ~CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback()
+CHIPOnOffStartUpOnOffAttributeCallback::~CHIPOnOffStartUpOnOffAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1556,8 +1390,8 @@ CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPOnOffStartUpOnOffAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::OnOff::OnOffStartUpOnOff> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1565,9 +1399,8 @@ void CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback::Callbac
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOnOffStartUpOnOffAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOnOffStartUpOnOffAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -1575,31 +1408,28 @@ void CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback::Callbac
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      static_cast<uint8_t>(value.Value()), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPAdministratorCommissioningAttributeListAttributeCallback::CHIPAdministratorCommissioningAttributeListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPAdministratorCommissioningClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPOnOffGeneratedCommandListAttributeCallback::CHIPOnOffGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPOnOffClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -1616,7 +1446,7 @@ CHIPAdministratorCommissioningAttributeListAttributeCallback::CHIPAdministratorC
     }
 }
 
-CHIPAdministratorCommissioningAttributeListAttributeCallback::~CHIPAdministratorCommissioningAttributeListAttributeCallback()
+CHIPOnOffGeneratedCommandListAttributeCallback::~CHIPOnOffGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1627,8 +1457,8 @@ CHIPAdministratorCommissioningAttributeListAttributeCallback::~CHIPAdministrator
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPAdministratorCommissioningAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPOnOffGeneratedCommandListAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1637,8 +1467,8 @@ void CHIPAdministratorCommissioningAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPAdministratorCommissioningAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPAdministratorCommissioningAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOnOffGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOnOffGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -1668,10 +1498,8 @@ void CHIPAdministratorCommissioningAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPApplicationBasicAllowedVendorListAttributeCallback::CHIPApplicationBasicAllowedVendorListAttributeCallback(jobject javaCallback,
-                                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPApplicationBasicClusterAllowedVendorListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPOnOffAcceptedCommandListAttributeCallback::CHIPOnOffAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOnOffClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1687,7 +1515,7 @@ CHIPApplicationBasicAllowedVendorListAttributeCallback::CHIPApplicationBasicAllo
     }
 }
 
-CHIPApplicationBasicAllowedVendorListAttributeCallback::~CHIPApplicationBasicAllowedVendorListAttributeCallback()
+CHIPOnOffAcceptedCommandListAttributeCallback::~CHIPOnOffAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1698,8 +1526,8 @@ CHIPApplicationBasicAllowedVendorListAttributeCallback::~CHIPApplicationBasicAll
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPApplicationBasicAllowedVendorListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::VendorId> & list)
+void CHIPOnOffAcceptedCommandListAttributeCallback::CallbackFn(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1708,8 +1536,8 @@ void CHIPApplicationBasicAllowedVendorListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPApplicationBasicAllowedVendorListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPApplicationBasicAllowedVendorListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOnOffAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOnOffAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -1728,10 +1556,10 @@ void CHIPApplicationBasicAllowedVendorListAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Integer";
-        std::string newElement_0CtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), static_cast<uint16_t>(entry_0), newElement_0);
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -1739,10 +1567,8 @@ void CHIPApplicationBasicAllowedVendorListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPApplicationBasicGeneratedCommandListAttributeCallback::CHIPApplicationBasicGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPApplicationBasicClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPOnOffAttributeListAttributeCallback::CHIPOnOffAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOnOffClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1758,7 +1584,7 @@ CHIPApplicationBasicGeneratedCommandListAttributeCallback::CHIPApplicationBasicG
     }
 }
 
-CHIPApplicationBasicGeneratedCommandListAttributeCallback::~CHIPApplicationBasicGeneratedCommandListAttributeCallback()
+CHIPOnOffAttributeListAttributeCallback::~CHIPOnOffAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1769,8 +1595,8 @@ CHIPApplicationBasicGeneratedCommandListAttributeCallback::~CHIPApplicationBasic
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPApplicationBasicGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPOnOffAttributeListAttributeCallback::CallbackFn(void * context,
+                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1779,8 +1605,8 @@ void CHIPApplicationBasicGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPApplicationBasicGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPApplicationBasicGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOnOffAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOnOffAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -1810,9 +1636,9 @@ void CHIPApplicationBasicGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPApplicationBasicAcceptedCommandListAttributeCallback::CHIPApplicationBasicAcceptedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPApplicationBasicClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback::
+    CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOnOffSwitchConfigurationClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -1829,7 +1655,8 @@ CHIPApplicationBasicAcceptedCommandListAttributeCallback::CHIPApplicationBasicAc
     }
 }
 
-CHIPApplicationBasicAcceptedCommandListAttributeCallback::~CHIPApplicationBasicAcceptedCommandListAttributeCallback()
+CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback::
+    ~CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1840,7 +1667,7 @@ CHIPApplicationBasicAcceptedCommandListAttributeCallback::~CHIPApplicationBasicA
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPApplicationBasicAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -1850,8 +1677,8 @@ void CHIPApplicationBasicAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPApplicationBasicAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPApplicationBasicAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -1881,9 +1708,9 @@ void CHIPApplicationBasicAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPApplicationBasicAttributeListAttributeCallback::CHIPApplicationBasicAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPApplicationBasicClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback::CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOnOffSwitchConfigurationClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -1900,7 +1727,8 @@ CHIPApplicationBasicAttributeListAttributeCallback::CHIPApplicationBasicAttribut
     }
 }
 
-CHIPApplicationBasicAttributeListAttributeCallback::~CHIPApplicationBasicAttributeListAttributeCallback()
+CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback::
+    ~CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1911,8 +1739,8 @@ CHIPApplicationBasicAttributeListAttributeCallback::~CHIPApplicationBasicAttribu
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPApplicationBasicAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1921,8 +1749,8 @@ void CHIPApplicationBasicAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPApplicationBasicAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPApplicationBasicAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -1952,9 +1780,9 @@ void CHIPApplicationBasicAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPApplicationLauncherCatalogListAttributeCallback::CHIPApplicationLauncherCatalogListAttributeCallback(jobject javaCallback,
-                                                                                                         bool keepAlive) :
-    chip::Callback::Callback<CHIPApplicationLauncherClusterCatalogListAttributeCallbackType>(CallbackFn, this),
+CHIPOnOffSwitchConfigurationAttributeListAttributeCallback::CHIPOnOffSwitchConfigurationAttributeListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOnOffSwitchConfigurationClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -1971,7 +1799,7 @@ CHIPApplicationLauncherCatalogListAttributeCallback::CHIPApplicationLauncherCata
     }
 }
 
-CHIPApplicationLauncherCatalogListAttributeCallback::~CHIPApplicationLauncherCatalogListAttributeCallback()
+CHIPOnOffSwitchConfigurationAttributeListAttributeCallback::~CHIPOnOffSwitchConfigurationAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1982,8 +1810,8 @@ CHIPApplicationLauncherCatalogListAttributeCallback::~CHIPApplicationLauncherCat
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPApplicationLauncherCatalogListAttributeCallback::CallbackFn(void * context,
-                                                                     const chip::app::DataModel::DecodableList<uint16_t> & list)
+void CHIPOnOffSwitchConfigurationAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1992,8 +1820,8 @@ void CHIPApplicationLauncherCatalogListAttributeCallback::CallbackFn(void * cont
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPApplicationLauncherCatalogListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPApplicationLauncherCatalogListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOnOffSwitchConfigurationAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOnOffSwitchConfigurationAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -2012,9 +1840,9 @@ void CHIPApplicationLauncherCatalogListAttributeCallback::CallbackFn(void * cont
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Integer";
-        std::string newElement_0CtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0ClassName.c_str(),
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
                                                                        newElement_0CtorSignature.c_str(), entry_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
@@ -2023,10 +1851,8 @@ void CHIPApplicationLauncherCatalogListAttributeCallback::CallbackFn(void * cont
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPApplicationLauncherGeneratedCommandListAttributeCallback::CHIPApplicationLauncherGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPApplicationLauncherClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPLevelControlOnLevelAttributeCallback::CHIPLevelControlOnLevelAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPLevelControlClusterOnLevelAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2042,7 +1868,7 @@ CHIPApplicationLauncherGeneratedCommandListAttributeCallback::CHIPApplicationLau
     }
 }
 
-CHIPApplicationLauncherGeneratedCommandListAttributeCallback::~CHIPApplicationLauncherGeneratedCommandListAttributeCallback()
+CHIPLevelControlOnLevelAttributeCallback::~CHIPLevelControlOnLevelAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2053,8 +1879,7 @@ CHIPApplicationLauncherGeneratedCommandListAttributeCallback::~CHIPApplicationLa
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPApplicationLauncherGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPLevelControlOnLevelAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -2062,9 +1887,8 @@ void CHIPApplicationLauncherGeneratedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPApplicationLauncherGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPApplicationLauncherGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPLevelControlOnLevelAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLevelControlOnLevelAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -2072,31 +1896,28 @@ void CHIPApplicationLauncherGeneratedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPApplicationLauncherAcceptedCommandListAttributeCallback::CHIPApplicationLauncherAcceptedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPApplicationLauncherClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPLevelControlOnTransitionTimeAttributeCallback::CHIPLevelControlOnTransitionTimeAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPLevelControlClusterOnTransitionTimeAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -2113,7 +1934,7 @@ CHIPApplicationLauncherAcceptedCommandListAttributeCallback::CHIPApplicationLaun
     }
 }
 
-CHIPApplicationLauncherAcceptedCommandListAttributeCallback::~CHIPApplicationLauncherAcceptedCommandListAttributeCallback()
+CHIPLevelControlOnTransitionTimeAttributeCallback::~CHIPLevelControlOnTransitionTimeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2124,8 +1945,8 @@ CHIPApplicationLauncherAcceptedCommandListAttributeCallback::~CHIPApplicationLau
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPApplicationLauncherAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPLevelControlOnTransitionTimeAttributeCallback::CallbackFn(void * context,
+                                                                   const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -2133,9 +1954,8 @@ void CHIPApplicationLauncherAcceptedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPApplicationLauncherAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPApplicationLauncherAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPLevelControlOnTransitionTimeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLevelControlOnTransitionTimeAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -2143,31 +1963,28 @@ void CHIPApplicationLauncherAcceptedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPApplicationLauncherAttributeListAttributeCallback::CHIPApplicationLauncherAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                             bool keepAlive) :
-    chip::Callback::Callback<CHIPApplicationLauncherClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPLevelControlOffTransitionTimeAttributeCallback::CHIPLevelControlOffTransitionTimeAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPLevelControlClusterOffTransitionTimeAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -2184,7 +2001,7 @@ CHIPApplicationLauncherAttributeListAttributeCallback::CHIPApplicationLauncherAt
     }
 }
 
-CHIPApplicationLauncherAttributeListAttributeCallback::~CHIPApplicationLauncherAttributeListAttributeCallback()
+CHIPLevelControlOffTransitionTimeAttributeCallback::~CHIPLevelControlOffTransitionTimeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2195,8 +2012,8 @@ CHIPApplicationLauncherAttributeListAttributeCallback::~CHIPApplicationLauncherA
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPApplicationLauncherAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPLevelControlOffTransitionTimeAttributeCallback::CallbackFn(void * context,
+                                                                    const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -2204,9 +2021,8 @@ void CHIPApplicationLauncherAttributeListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPApplicationLauncherAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPApplicationLauncherAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPLevelControlOffTransitionTimeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLevelControlOffTransitionTimeAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -2214,30 +2030,29 @@ void CHIPApplicationLauncherAttributeListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPAudioOutputOutputListAttributeCallback::CHIPAudioOutputOutputListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPAudioOutputClusterOutputListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPLevelControlDefaultMoveRateAttributeCallback::CHIPLevelControlDefaultMoveRateAttributeCallback(jobject javaCallback,
+                                                                                                   bool keepAlive) :
+    chip::Callback::Callback<CHIPLevelControlClusterDefaultMoveRateAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2253,7 +2068,7 @@ CHIPAudioOutputOutputListAttributeCallback::CHIPAudioOutputOutputListAttributeCa
     }
 }
 
-CHIPAudioOutputOutputListAttributeCallback::~CHIPAudioOutputOutputListAttributeCallback()
+CHIPLevelControlDefaultMoveRateAttributeCallback::~CHIPLevelControlDefaultMoveRateAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2264,9 +2079,8 @@ CHIPAudioOutputOutputListAttributeCallback::~CHIPAudioOutputOutputListAttributeC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPAudioOutputOutputListAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::OutputInfo::DecodableType> & list)
+void CHIPLevelControlDefaultMoveRateAttributeCallback::CallbackFn(void * context,
+                                                                  const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -2274,9 +2088,8 @@ void CHIPAudioOutputOutputListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPAudioOutputOutputListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPAudioOutputOutputListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPLevelControlDefaultMoveRateAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLevelControlDefaultMoveRateAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -2284,59 +2097,28 @@ void CHIPAudioOutputOutputListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        jobject newElement_0_index;
-        std::string newElement_0_indexClassName     = "java/lang/Integer";
-        std::string newElement_0_indexCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-            newElement_0_indexClassName.c_str(), newElement_0_indexCtorSignature.c_str(), entry_0.index, newElement_0_index);
-        jobject newElement_0_outputType;
-        std::string newElement_0_outputTypeClassName     = "java/lang/Integer";
-        std::string newElement_0_outputTypeCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-            newElement_0_outputTypeClassName.c_str(), newElement_0_outputTypeCtorSignature.c_str(),
-            static_cast<uint8_t>(entry_0.outputType), newElement_0_outputType);
-        jobject newElement_0_name;
-        newElement_0_name = env->NewStringUTF(std::string(entry_0.name.data(), entry_0.name.size()).c_str());
-
-        jclass outputInfoStructClass;
-        err = chip::JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipStructs$AudioOutputClusterOutputInfo",
-                                                             outputInfoStructClass);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$AudioOutputClusterOutputInfo");
-            return;
-        }
-        jmethodID outputInfoStructCtor =
-            env->GetMethodID(outputInfoStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;)V");
-        if (outputInfoStructCtor == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$AudioOutputClusterOutputInfo constructor");
-            return;
-        }
-
-        newElement_0 = env->NewObject(outputInfoStructClass, outputInfoStructCtor, newElement_0_index, newElement_0_outputType,
-                                      newElement_0_name);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPAudioOutputGeneratedCommandListAttributeCallback::CHIPAudioOutputGeneratedCommandListAttributeCallback(jobject javaCallback,
+CHIPLevelControlStartUpCurrentLevelAttributeCallback::CHIPLevelControlStartUpCurrentLevelAttributeCallback(jobject javaCallback,
                                                                                                            bool keepAlive) :
-    chip::Callback::Callback<CHIPAudioOutputClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPLevelControlClusterStartUpCurrentLevelAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -2353,7 +2135,7 @@ CHIPAudioOutputGeneratedCommandListAttributeCallback::CHIPAudioOutputGeneratedCo
     }
 }
 
-CHIPAudioOutputGeneratedCommandListAttributeCallback::~CHIPAudioOutputGeneratedCommandListAttributeCallback()
+CHIPLevelControlStartUpCurrentLevelAttributeCallback::~CHIPLevelControlStartUpCurrentLevelAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2364,8 +2146,8 @@ CHIPAudioOutputGeneratedCommandListAttributeCallback::~CHIPAudioOutputGeneratedC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPAudioOutputGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPLevelControlStartUpCurrentLevelAttributeCallback::CallbackFn(void * context,
+                                                                      const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -2373,9 +2155,8 @@ void CHIPAudioOutputGeneratedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPAudioOutputGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPAudioOutputGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPLevelControlStartUpCurrentLevelAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLevelControlStartUpCurrentLevelAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -2383,31 +2164,28 @@ void CHIPAudioOutputGeneratedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPAudioOutputAcceptedCommandListAttributeCallback::CHIPAudioOutputAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                         bool keepAlive) :
-    chip::Callback::Callback<CHIPAudioOutputClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPLevelControlGeneratedCommandListAttributeCallback::CHIPLevelControlGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                             bool keepAlive) :
+    chip::Callback::Callback<CHIPLevelControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -2424,7 +2202,7 @@ CHIPAudioOutputAcceptedCommandListAttributeCallback::CHIPAudioOutputAcceptedComm
     }
 }
 
-CHIPAudioOutputAcceptedCommandListAttributeCallback::~CHIPAudioOutputAcceptedCommandListAttributeCallback()
+CHIPLevelControlGeneratedCommandListAttributeCallback::~CHIPLevelControlGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2435,7 +2213,7 @@ CHIPAudioOutputAcceptedCommandListAttributeCallback::~CHIPAudioOutputAcceptedCom
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPAudioOutputAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPLevelControlGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -2445,8 +2223,8 @@ void CHIPAudioOutputAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPAudioOutputAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPAudioOutputAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPLevelControlGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLevelControlGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -2476,8 +2254,10 @@ void CHIPAudioOutputAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPAudioOutputAttributeListAttributeCallback::CHIPAudioOutputAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPAudioOutputClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPLevelControlAcceptedCommandListAttributeCallback::CHIPLevelControlAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPLevelControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2493,7 +2273,7 @@ CHIPAudioOutputAttributeListAttributeCallback::CHIPAudioOutputAttributeListAttri
     }
 }
 
-CHIPAudioOutputAttributeListAttributeCallback::~CHIPAudioOutputAttributeListAttributeCallback()
+CHIPLevelControlAcceptedCommandListAttributeCallback::~CHIPLevelControlAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2504,8 +2284,8 @@ CHIPAudioOutputAttributeListAttributeCallback::~CHIPAudioOutputAttributeListAttr
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPAudioOutputAttributeListAttributeCallback::CallbackFn(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPLevelControlAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -2514,8 +2294,8 @@ void CHIPAudioOutputAttributeListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPAudioOutputAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPAudioOutputAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPLevelControlAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLevelControlAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -2545,9 +2325,9 @@ void CHIPAudioOutputAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPBarrierControlGeneratedCommandListAttributeCallback::CHIPBarrierControlGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPBarrierControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPLevelControlAttributeListAttributeCallback::CHIPLevelControlAttributeListAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPLevelControlClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -2564,7 +2344,7 @@ CHIPBarrierControlGeneratedCommandListAttributeCallback::CHIPBarrierControlGener
     }
 }
 
-CHIPBarrierControlGeneratedCommandListAttributeCallback::~CHIPBarrierControlGeneratedCommandListAttributeCallback()
+CHIPLevelControlAttributeListAttributeCallback::~CHIPLevelControlAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2575,8 +2355,8 @@ CHIPBarrierControlGeneratedCommandListAttributeCallback::~CHIPBarrierControlGene
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPBarrierControlGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPLevelControlAttributeListAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -2585,8 +2365,8 @@ void CHIPBarrierControlGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPBarrierControlGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPBarrierControlGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPLevelControlAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLevelControlAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -2616,9 +2396,9 @@ void CHIPBarrierControlGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPBarrierControlAcceptedCommandListAttributeCallback::CHIPBarrierControlAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPBarrierControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPBinaryInputBasicGeneratedCommandListAttributeCallback::CHIPBinaryInputBasicGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPBinaryInputBasicClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -2635,7 +2415,7 @@ CHIPBarrierControlAcceptedCommandListAttributeCallback::CHIPBarrierControlAccept
     }
 }
 
-CHIPBarrierControlAcceptedCommandListAttributeCallback::~CHIPBarrierControlAcceptedCommandListAttributeCallback()
+CHIPBinaryInputBasicGeneratedCommandListAttributeCallback::~CHIPBinaryInputBasicGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2646,7 +2426,7 @@ CHIPBarrierControlAcceptedCommandListAttributeCallback::~CHIPBarrierControlAccep
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPBarrierControlAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPBinaryInputBasicGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -2656,8 +2436,8 @@ void CHIPBarrierControlAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPBarrierControlAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPBarrierControlAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPBinaryInputBasicGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPBinaryInputBasicGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -2687,9 +2467,9 @@ void CHIPBarrierControlAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPBarrierControlAttributeListAttributeCallback::CHIPBarrierControlAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                   bool keepAlive) :
-    chip::Callback::Callback<CHIPBarrierControlClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPBinaryInputBasicAcceptedCommandListAttributeCallback::CHIPBinaryInputBasicAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPBinaryInputBasicClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -2706,7 +2486,7 @@ CHIPBarrierControlAttributeListAttributeCallback::CHIPBarrierControlAttributeLis
     }
 }
 
-CHIPBarrierControlAttributeListAttributeCallback::~CHIPBarrierControlAttributeListAttributeCallback()
+CHIPBinaryInputBasicAcceptedCommandListAttributeCallback::~CHIPBinaryInputBasicAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2717,8 +2497,8 @@ CHIPBarrierControlAttributeListAttributeCallback::~CHIPBarrierControlAttributeLi
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPBarrierControlAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPBinaryInputBasicAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -2727,8 +2507,8 @@ void CHIPBarrierControlAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPBarrierControlAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPBarrierControlAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPBinaryInputBasicAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPBinaryInputBasicAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -2758,8 +2538,10 @@ void CHIPBarrierControlAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPBasicVendorIDAttributeCallback::CHIPBasicVendorIDAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPBasicClusterVendorIDAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPBinaryInputBasicAttributeListAttributeCallback::CHIPBinaryInputBasicAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPBinaryInputBasicClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2775,7 +2557,7 @@ CHIPBasicVendorIDAttributeCallback::CHIPBasicVendorIDAttributeCallback(jobject j
     }
 }
 
-CHIPBasicVendorIDAttributeCallback::~CHIPBasicVendorIDAttributeCallback()
+CHIPBinaryInputBasicAttributeListAttributeCallback::~CHIPBinaryInputBasicAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2786,7 +2568,8 @@ CHIPBasicVendorIDAttributeCallback::~CHIPBasicVendorIDAttributeCallback()
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPBasicVendorIDAttributeCallback::CallbackFn(void * context, chip::VendorId value)
+void CHIPBinaryInputBasicAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -2794,8 +2577,9 @@ void CHIPBasicVendorIDAttributeCallback::CallbackFn(void * context, chip::Vendor
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPBasicVendorIDAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPBasicVendorIDAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPBinaryInputBasicAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPBinaryInputBasicAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -2803,22 +2587,30 @@ void CHIPBasicVendorIDAttributeCallback::CallbackFn(void * context, chip::Vendor
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    std::string javaValueClassName     = "java/lang/Integer";
-    std::string javaValueCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                   static_cast<uint16_t>(value), javaValue);
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPBasicGeneratedCommandListAttributeCallback::CHIPBasicGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPBasicClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPDescriptorDeviceListAttributeCallback::CHIPDescriptorDeviceListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDescriptorClusterDeviceListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2834,7 +2626,7 @@ CHIPBasicGeneratedCommandListAttributeCallback::CHIPBasicGeneratedCommandListAtt
     }
 }
 
-CHIPBasicGeneratedCommandListAttributeCallback::~CHIPBasicGeneratedCommandListAttributeCallback()
+CHIPDescriptorDeviceListAttributeCallback::~CHIPDescriptorDeviceListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2845,8 +2637,9 @@ CHIPBasicGeneratedCommandListAttributeCallback::~CHIPBasicGeneratedCommandListAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPBasicGeneratedCommandListAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPDescriptorDeviceListAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::DeviceType::DecodableType> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -2855,8 +2648,8 @@ void CHIPBasicGeneratedCommandListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPBasicGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPBasicGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPDescriptorDeviceListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDescriptorDeviceListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -2875,10 +2668,35 @@ void CHIPBasicGeneratedCommandListAttributeCallback::CallbackFn(void * context,
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        jobject newElement_0_type;
+        std::string newElement_0_typeClassName     = "java/lang/Long";
+        std::string newElement_0_typeCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+            newElement_0_typeClassName.c_str(), newElement_0_typeCtorSignature.c_str(), entry_0.type, newElement_0_type);
+        jobject newElement_0_revision;
+        std::string newElement_0_revisionClassName     = "java/lang/Integer";
+        std::string newElement_0_revisionCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_revisionClassName.c_str(),
+                                                                       newElement_0_revisionCtorSignature.c_str(), entry_0.revision,
+                                                                       newElement_0_revision);
+
+        jclass deviceTypeStructClass;
+        err = chip::JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipStructs$DescriptorClusterDeviceType",
+                                                             deviceTypeStructClass);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$DescriptorClusterDeviceType");
+            return;
+        }
+        jmethodID deviceTypeStructCtor =
+            env->GetMethodID(deviceTypeStructClass, "<init>", "(Ljava/lang/Long;Ljava/lang/Integer;)V");
+        if (deviceTypeStructCtor == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$DescriptorClusterDeviceType constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(deviceTypeStructClass, deviceTypeStructCtor, newElement_0_type, newElement_0_revision);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -2886,8 +2704,8 @@ void CHIPBasicGeneratedCommandListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPBasicAcceptedCommandListAttributeCallback::CHIPBasicAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPBasicClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPDescriptorServerListAttributeCallback::CHIPDescriptorServerListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDescriptorClusterServerListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2903,7 +2721,7 @@ CHIPBasicAcceptedCommandListAttributeCallback::CHIPBasicAcceptedCommandListAttri
     }
 }
 
-CHIPBasicAcceptedCommandListAttributeCallback::~CHIPBasicAcceptedCommandListAttributeCallback()
+CHIPDescriptorServerListAttributeCallback::~CHIPDescriptorServerListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2914,8 +2732,8 @@ CHIPBasicAcceptedCommandListAttributeCallback::~CHIPBasicAcceptedCommandListAttr
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPBasicAcceptedCommandListAttributeCallback::CallbackFn(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPDescriptorServerListAttributeCallback::CallbackFn(void * context,
+                                                           const chip::app::DataModel::DecodableList<chip::ClusterId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -2924,8 +2742,8 @@ void CHIPBasicAcceptedCommandListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPBasicAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPBasicAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPDescriptorServerListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDescriptorServerListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -2955,8 +2773,8 @@ void CHIPBasicAcceptedCommandListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPBasicAttributeListAttributeCallback::CHIPBasicAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPBasicClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPDescriptorClientListAttributeCallback::CHIPDescriptorClientListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDescriptorClusterClientListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2972,7 +2790,7 @@ CHIPBasicAttributeListAttributeCallback::CHIPBasicAttributeListAttributeCallback
     }
 }
 
-CHIPBasicAttributeListAttributeCallback::~CHIPBasicAttributeListAttributeCallback()
+CHIPDescriptorClientListAttributeCallback::~CHIPDescriptorClientListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2983,8 +2801,8 @@ CHIPBasicAttributeListAttributeCallback::~CHIPBasicAttributeListAttributeCallbac
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPBasicAttributeListAttributeCallback::CallbackFn(void * context,
-                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPDescriptorClientListAttributeCallback::CallbackFn(void * context,
+                                                           const chip::app::DataModel::DecodableList<chip::ClusterId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -2993,8 +2811,8 @@ void CHIPBasicAttributeListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPBasicAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPBasicAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPDescriptorClientListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDescriptorClientListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -3024,10 +2842,8 @@ void CHIPBasicAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPBinaryInputBasicGeneratedCommandListAttributeCallback::CHIPBinaryInputBasicGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPBinaryInputBasicClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPDescriptorPartsListAttributeCallback::CHIPDescriptorPartsListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDescriptorClusterPartsListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3043,7 +2859,7 @@ CHIPBinaryInputBasicGeneratedCommandListAttributeCallback::CHIPBinaryInputBasicG
     }
 }
 
-CHIPBinaryInputBasicGeneratedCommandListAttributeCallback::~CHIPBinaryInputBasicGeneratedCommandListAttributeCallback()
+CHIPDescriptorPartsListAttributeCallback::~CHIPDescriptorPartsListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3054,8 +2870,8 @@ CHIPBinaryInputBasicGeneratedCommandListAttributeCallback::~CHIPBinaryInputBasic
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPBinaryInputBasicGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPDescriptorPartsListAttributeCallback::CallbackFn(void * context,
+                                                          const chip::app::DataModel::DecodableList<chip::EndpointId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -3064,8 +2880,8 @@ void CHIPBinaryInputBasicGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPBinaryInputBasicGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPBinaryInputBasicGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPDescriptorPartsListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDescriptorPartsListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -3084,9 +2900,9 @@ void CHIPBinaryInputBasicGeneratedCommandListAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+        std::string newElement_0ClassName     = "java/lang/Integer";
+        std::string newElement_0CtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0ClassName.c_str(),
                                                                        newElement_0CtorSignature.c_str(), entry_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
@@ -3095,9 +2911,9 @@ void CHIPBinaryInputBasicGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPBinaryInputBasicAcceptedCommandListAttributeCallback::CHIPBinaryInputBasicAcceptedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPBinaryInputBasicClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPDescriptorGeneratedCommandListAttributeCallback::CHIPDescriptorGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPDescriptorClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -3114,7 +2930,7 @@ CHIPBinaryInputBasicAcceptedCommandListAttributeCallback::CHIPBinaryInputBasicAc
     }
 }
 
-CHIPBinaryInputBasicAcceptedCommandListAttributeCallback::~CHIPBinaryInputBasicAcceptedCommandListAttributeCallback()
+CHIPDescriptorGeneratedCommandListAttributeCallback::~CHIPDescriptorGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3125,7 +2941,7 @@ CHIPBinaryInputBasicAcceptedCommandListAttributeCallback::~CHIPBinaryInputBasicA
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPBinaryInputBasicAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPDescriptorGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -3135,8 +2951,8 @@ void CHIPBinaryInputBasicAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPBinaryInputBasicAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPBinaryInputBasicAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPDescriptorGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDescriptorGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -3166,9 +2982,9 @@ void CHIPBinaryInputBasicAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPBinaryInputBasicAttributeListAttributeCallback::CHIPBinaryInputBasicAttributeListAttributeCallback(jobject javaCallback,
+CHIPDescriptorAcceptedCommandListAttributeCallback::CHIPDescriptorAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPBinaryInputBasicClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPDescriptorClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -3185,7 +3001,7 @@ CHIPBinaryInputBasicAttributeListAttributeCallback::CHIPBinaryInputBasicAttribut
     }
 }
 
-CHIPBinaryInputBasicAttributeListAttributeCallback::~CHIPBinaryInputBasicAttributeListAttributeCallback()
+CHIPDescriptorAcceptedCommandListAttributeCallback::~CHIPDescriptorAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3196,8 +3012,8 @@ CHIPBinaryInputBasicAttributeListAttributeCallback::~CHIPBinaryInputBasicAttribu
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPBinaryInputBasicAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPDescriptorAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -3206,8 +3022,77 @@ void CHIPBinaryInputBasicAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPBinaryInputBasicAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPBinaryInputBasicAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPDescriptorAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDescriptorAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPDescriptorAttributeListAttributeCallback::CHIPDescriptorAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDescriptorClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPDescriptorAttributeListAttributeCallback::~CHIPDescriptorAttributeListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPDescriptorAttributeListAttributeCallback::CallbackFn(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPDescriptorAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDescriptorAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -3600,10 +3485,8 @@ void CHIPBindingAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPBooleanStateGeneratedCommandListAttributeCallback::CHIPBooleanStateGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                             bool keepAlive) :
-    chip::Callback::Callback<CHIPBooleanStateClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPAccessControlAclAttributeCallback::CHIPAccessControlAclAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPAccessControlClusterAclAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3619,7 +3502,7 @@ CHIPBooleanStateGeneratedCommandListAttributeCallback::CHIPBooleanStateGenerated
     }
 }
 
-CHIPBooleanStateGeneratedCommandListAttributeCallback::~CHIPBooleanStateGeneratedCommandListAttributeCallback()
+CHIPAccessControlAclAttributeCallback::~CHIPAccessControlAclAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3630,8 +3513,10 @@ CHIPBooleanStateGeneratedCommandListAttributeCallback::~CHIPBooleanStateGenerate
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPBooleanStateGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPAccessControlAclAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::DecodableType> &
+        list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -3640,8 +3525,8 @@ void CHIPBooleanStateGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPBooleanStateGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPBooleanStateGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPAccessControlAclAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPAccessControlAclAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -3660,10 +3545,140 @@ void CHIPBooleanStateGeneratedCommandListAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        jobject newElement_0_privilege;
+        std::string newElement_0_privilegeClassName     = "java/lang/Integer";
+        std::string newElement_0_privilegeCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+            newElement_0_privilegeClassName.c_str(), newElement_0_privilegeCtorSignature.c_str(),
+            static_cast<uint8_t>(entry_0.privilege), newElement_0_privilege);
+        jobject newElement_0_authMode;
+        std::string newElement_0_authModeClassName     = "java/lang/Integer";
+        std::string newElement_0_authModeCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+            newElement_0_authModeClassName.c_str(), newElement_0_authModeCtorSignature.c_str(),
+            static_cast<uint8_t>(entry_0.authMode), newElement_0_authMode);
+        jobject newElement_0_subjects;
+        if (entry_0.subjects.IsNull())
+        {
+            newElement_0_subjects = nullptr;
+        }
+        else
+        {
+            chip::JniReferences::GetInstance().CreateArrayList(newElement_0_subjects);
+
+            auto iter_newElement_0_subjects_3 = entry_0.subjects.Value().begin();
+            while (iter_newElement_0_subjects_3.Next())
+            {
+                auto & entry_3 = iter_newElement_0_subjects_3.GetValue();
+                jobject newElement_3;
+                std::string newElement_3ClassName     = "java/lang/Long";
+                std::string newElement_3CtorSignature = "(J)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(
+                    newElement_3ClassName.c_str(), newElement_3CtorSignature.c_str(), entry_3, newElement_3);
+                chip::JniReferences::GetInstance().AddToList(newElement_0_subjects, newElement_3);
+            }
+        }
+        jobject newElement_0_targets;
+        if (entry_0.targets.IsNull())
+        {
+            newElement_0_targets = nullptr;
+        }
+        else
+        {
+            chip::JniReferences::GetInstance().CreateArrayList(newElement_0_targets);
+
+            auto iter_newElement_0_targets_3 = entry_0.targets.Value().begin();
+            while (iter_newElement_0_targets_3.Next())
+            {
+                auto & entry_3 = iter_newElement_0_targets_3.GetValue();
+                jobject newElement_3;
+                jobject newElement_3_cluster;
+                if (entry_3.cluster.IsNull())
+                {
+                    newElement_3_cluster = nullptr;
+                }
+                else
+                {
+                    std::string newElement_3_clusterClassName     = "java/lang/Long";
+                    std::string newElement_3_clusterCtorSignature = "(J)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_3_clusterClassName.c_str(),
+                                                                                   newElement_3_clusterCtorSignature.c_str(),
+                                                                                   entry_3.cluster.Value(), newElement_3_cluster);
+                }
+                jobject newElement_3_endpoint;
+                if (entry_3.endpoint.IsNull())
+                {
+                    newElement_3_endpoint = nullptr;
+                }
+                else
+                {
+                    std::string newElement_3_endpointClassName     = "java/lang/Integer";
+                    std::string newElement_3_endpointCtorSignature = "(I)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_3_endpointClassName.c_str(),
+                                                                                   newElement_3_endpointCtorSignature.c_str(),
+                                                                                   entry_3.endpoint.Value(), newElement_3_endpoint);
+                }
+                jobject newElement_3_deviceType;
+                if (entry_3.deviceType.IsNull())
+                {
+                    newElement_3_deviceType = nullptr;
+                }
+                else
+                {
+                    std::string newElement_3_deviceTypeClassName     = "java/lang/Long";
+                    std::string newElement_3_deviceTypeCtorSignature = "(J)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                        newElement_3_deviceTypeClassName.c_str(), newElement_3_deviceTypeCtorSignature.c_str(),
+                        entry_3.deviceType.Value(), newElement_3_deviceType);
+                }
+
+                jclass targetStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$AccessControlClusterTarget", targetStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$AccessControlClusterTarget");
+                    return;
+                }
+                jmethodID targetStructCtor =
+                    env->GetMethodID(targetStructClass, "<init>", "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Long;)V");
+                if (targetStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$AccessControlClusterTarget constructor");
+                    return;
+                }
+
+                newElement_3 = env->NewObject(targetStructClass, targetStructCtor, newElement_3_cluster, newElement_3_endpoint,
+                                              newElement_3_deviceType);
+                chip::JniReferences::GetInstance().AddToList(newElement_0_targets, newElement_3);
+            }
+        }
+        jobject newElement_0_fabricIndex;
+        std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
+        std::string newElement_0_fabricIndexCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
+                                                                      newElement_0_fabricIndexCtorSignature.c_str(),
+                                                                      entry_0.fabricIndex, newElement_0_fabricIndex);
+
+        jclass accessControlEntryStructClass;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$AccessControlClusterAccessControlEntry", accessControlEntryStructClass);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$AccessControlClusterAccessControlEntry");
+            return;
+        }
+        jmethodID accessControlEntryStructCtor = env->GetMethodID(
+            accessControlEntryStructClass, "<init>",
+            "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/ArrayList;Ljava/util/ArrayList;Ljava/lang/Integer;)V");
+        if (accessControlEntryStructCtor == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$AccessControlClusterAccessControlEntry constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(accessControlEntryStructClass, accessControlEntryStructCtor, newElement_0_privilege,
+                                      newElement_0_authMode, newElement_0_subjects, newElement_0_targets, newElement_0_fabricIndex);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -3671,10 +3686,8 @@ void CHIPBooleanStateGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPBooleanStateAcceptedCommandListAttributeCallback::CHIPBooleanStateAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPBooleanStateClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPAccessControlExtensionAttributeCallback::CHIPAccessControlExtensionAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPAccessControlClusterExtensionAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3690,7 +3703,7 @@ CHIPBooleanStateAcceptedCommandListAttributeCallback::CHIPBooleanStateAcceptedCo
     }
 }
 
-CHIPBooleanStateAcceptedCommandListAttributeCallback::~CHIPBooleanStateAcceptedCommandListAttributeCallback()
+CHIPAccessControlExtensionAttributeCallback::~CHIPAccessControlExtensionAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3701,8 +3714,9 @@ CHIPBooleanStateAcceptedCommandListAttributeCallback::~CHIPBooleanStateAcceptedC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPBooleanStateAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPAccessControlExtensionAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::ExtensionEntry::DecodableType> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -3711,8 +3725,8 @@ void CHIPBooleanStateAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPBooleanStateAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPBooleanStateAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPAccessControlExtensionAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPAccessControlExtensionAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -3731,20 +3745,45 @@ void CHIPBooleanStateAcceptedCommandListAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
-    }
-
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-}
+        jobject newElement_0_data;
+        jbyteArray newElement_0_dataByteArray = env->NewByteArray(static_cast<jsize>(entry_0.data.size()));
+        env->SetByteArrayRegion(newElement_0_dataByteArray, 0, static_cast<jsize>(entry_0.data.size()),
+                                reinterpret_cast<const jbyte *>(entry_0.data.data()));
+        newElement_0_data = newElement_0_dataByteArray;
+        jobject newElement_0_fabricIndex;
+        std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
+        std::string newElement_0_fabricIndexCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
+                                                                      newElement_0_fabricIndexCtorSignature.c_str(),
+                                                                      entry_0.fabricIndex, newElement_0_fabricIndex);
 
-CHIPBooleanStateAttributeListAttributeCallback::CHIPBooleanStateAttributeListAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPBooleanStateClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+        jclass extensionEntryStructClass;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$AccessControlClusterExtensionEntry", extensionEntryStructClass);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$AccessControlClusterExtensionEntry");
+            return;
+        }
+        jmethodID extensionEntryStructCtor = env->GetMethodID(extensionEntryStructClass, "<init>", "([BLjava/lang/Integer;)V");
+        if (extensionEntryStructCtor == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$AccessControlClusterExtensionEntry constructor");
+            return;
+        }
+
+        newElement_0 =
+            env->NewObject(extensionEntryStructClass, extensionEntryStructCtor, newElement_0_data, newElement_0_fabricIndex);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPAccessControlGeneratedCommandListAttributeCallback::CHIPAccessControlGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPAccessControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -3761,7 +3800,7 @@ CHIPBooleanStateAttributeListAttributeCallback::CHIPBooleanStateAttributeListAtt
     }
 }
 
-CHIPBooleanStateAttributeListAttributeCallback::~CHIPBooleanStateAttributeListAttributeCallback()
+CHIPAccessControlGeneratedCommandListAttributeCallback::~CHIPAccessControlGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3772,8 +3811,8 @@ CHIPBooleanStateAttributeListAttributeCallback::~CHIPBooleanStateAttributeListAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPBooleanStateAttributeListAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPAccessControlGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -3782,8 +3821,150 @@ void CHIPBooleanStateAttributeListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPBooleanStateAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPBooleanStateAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPAccessControlGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPAccessControlGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPAccessControlAcceptedCommandListAttributeCallback::CHIPAccessControlAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                             bool keepAlive) :
+    chip::Callback::Callback<CHIPAccessControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPAccessControlAcceptedCommandListAttributeCallback::~CHIPAccessControlAcceptedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPAccessControlAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPAccessControlAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPAccessControlAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPAccessControlAttributeListAttributeCallback::CHIPAccessControlAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                 bool keepAlive) :
+    chip::Callback::Callback<CHIPAccessControlClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPAccessControlAttributeListAttributeCallback::~CHIPAccessControlAttributeListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPAccessControlAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPAccessControlAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPAccessControlAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -4262,10 +4443,8 @@ void CHIPBridgedActionsAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPBridgedDeviceBasicVendorIDAttributeCallback::CHIPBridgedDeviceBasicVendorIDAttributeCallback(jobject javaCallback,
-                                                                                                 bool keepAlive) :
-    chip::Callback::Callback<CHIPBridgedDeviceBasicClusterVendorIDAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPBasicVendorIDAttributeCallback::CHIPBasicVendorIDAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPBasicClusterVendorIDAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4281,7 +4460,7 @@ CHIPBridgedDeviceBasicVendorIDAttributeCallback::CHIPBridgedDeviceBasicVendorIDA
     }
 }
 
-CHIPBridgedDeviceBasicVendorIDAttributeCallback::~CHIPBridgedDeviceBasicVendorIDAttributeCallback()
+CHIPBasicVendorIDAttributeCallback::~CHIPBasicVendorIDAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4292,7 +4471,7 @@ CHIPBridgedDeviceBasicVendorIDAttributeCallback::~CHIPBridgedDeviceBasicVendorID
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPBridgedDeviceBasicVendorIDAttributeCallback::CallbackFn(void * context, chip::VendorId value)
+void CHIPBasicVendorIDAttributeCallback::CallbackFn(void * context, chip::VendorId value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -4300,8 +4479,8 @@ void CHIPBridgedDeviceBasicVendorIDAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPBridgedDeviceBasicVendorIDAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPBridgedDeviceBasicVendorIDAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPBasicVendorIDAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPBasicVendorIDAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -4321,9 +4500,9 @@ void CHIPBridgedDeviceBasicVendorIDAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback::CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPBridgedDeviceBasicClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPBasicGeneratedCommandListAttributeCallback::CHIPBasicGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPBasicClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -4340,7 +4519,7 @@ CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback::CHIPBridgedDeviceBa
     }
 }
 
-CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback::~CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback()
+CHIPBasicGeneratedCommandListAttributeCallback::~CHIPBasicGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4351,8 +4530,8 @@ CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback::~CHIPBridgedDeviceB
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPBasicGeneratedCommandListAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -4361,8 +4540,8 @@ void CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPBasicGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPBasicGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -4392,10 +4571,8 @@ void CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback::CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPBridgedDeviceBasicClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPBasicAcceptedCommandListAttributeCallback::CHIPBasicAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPBasicClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4411,7 +4588,7 @@ CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback::CHIPBridgedDeviceBas
     }
 }
 
-CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback::~CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback()
+CHIPBasicAcceptedCommandListAttributeCallback::~CHIPBasicAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4422,8 +4599,8 @@ CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback::~CHIPBridgedDeviceBa
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPBasicAcceptedCommandListAttributeCallback::CallbackFn(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -4432,8 +4609,8 @@ void CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPBasicAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPBasicAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -4463,10 +4640,8 @@ void CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPBridgedDeviceBasicAttributeListAttributeCallback::CHIPBridgedDeviceBasicAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPBridgedDeviceBasicClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPBasicAttributeListAttributeCallback::CHIPBasicAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPBasicClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4482,7 +4657,7 @@ CHIPBridgedDeviceBasicAttributeListAttributeCallback::CHIPBridgedDeviceBasicAttr
     }
 }
 
-CHIPBridgedDeviceBasicAttributeListAttributeCallback::~CHIPBridgedDeviceBasicAttributeListAttributeCallback()
+CHIPBasicAttributeListAttributeCallback::~CHIPBasicAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4493,8 +4668,8 @@ CHIPBridgedDeviceBasicAttributeListAttributeCallback::~CHIPBridgedDeviceBasicAtt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPBridgedDeviceBasicAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPBasicAttributeListAttributeCallback::CallbackFn(void * context,
+                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -4503,8 +4678,8 @@ void CHIPBridgedDeviceBasicAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPBridgedDeviceBasicAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPBridgedDeviceBasicAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPBasicAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPBasicAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -4534,8 +4709,10 @@ void CHIPBridgedDeviceBasicAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPChannelChannelListAttributeCallback::CHIPChannelChannelListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPChannelClusterChannelListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback::CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOtaSoftwareUpdateProviderClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4551,7 +4728,7 @@ CHIPChannelChannelListAttributeCallback::CHIPChannelChannelListAttributeCallback
     }
 }
 
-CHIPChannelChannelListAttributeCallback::~CHIPChannelChannelListAttributeCallback()
+CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback::~CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4562,9 +4739,8 @@ CHIPChannelChannelListAttributeCallback::~CHIPChannelChannelListAttributeCallbac
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPChannelChannelListAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> & list)
+void CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -4573,8 +4749,8 @@ void CHIPChannelChannelListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPChannelChannelListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPChannelChannelListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -4593,76 +4769,10 @@ void CHIPChannelChannelListAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        jobject newElement_0_majorNumber;
-        std::string newElement_0_majorNumberClassName     = "java/lang/Integer";
-        std::string newElement_0_majorNumberCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_majorNumberClassName.c_str(),
-                                                                       newElement_0_majorNumberCtorSignature.c_str(),
-                                                                       entry_0.majorNumber, newElement_0_majorNumber);
-        jobject newElement_0_minorNumber;
-        std::string newElement_0_minorNumberClassName     = "java/lang/Integer";
-        std::string newElement_0_minorNumberCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_minorNumberClassName.c_str(),
-                                                                       newElement_0_minorNumberCtorSignature.c_str(),
-                                                                       entry_0.minorNumber, newElement_0_minorNumber);
-        jobject newElement_0_name;
-        if (!entry_0.name.HasValue())
-        {
-            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_name);
-        }
-        else
-        {
-            jobject newElement_0_nameInsideOptional;
-            newElement_0_nameInsideOptional =
-                env->NewStringUTF(std::string(entry_0.name.Value().data(), entry_0.name.Value().size()).c_str());
-            chip::JniReferences::GetInstance().CreateOptional(newElement_0_nameInsideOptional, newElement_0_name);
-        }
-        jobject newElement_0_callSign;
-        if (!entry_0.callSign.HasValue())
-        {
-            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_callSign);
-        }
-        else
-        {
-            jobject newElement_0_callSignInsideOptional;
-            newElement_0_callSignInsideOptional =
-                env->NewStringUTF(std::string(entry_0.callSign.Value().data(), entry_0.callSign.Value().size()).c_str());
-            chip::JniReferences::GetInstance().CreateOptional(newElement_0_callSignInsideOptional, newElement_0_callSign);
-        }
-        jobject newElement_0_affiliateCallSign;
-        if (!entry_0.affiliateCallSign.HasValue())
-        {
-            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_affiliateCallSign);
-        }
-        else
-        {
-            jobject newElement_0_affiliateCallSignInsideOptional;
-            newElement_0_affiliateCallSignInsideOptional = env->NewStringUTF(
-                std::string(entry_0.affiliateCallSign.Value().data(), entry_0.affiliateCallSign.Value().size()).c_str());
-            chip::JniReferences::GetInstance().CreateOptional(newElement_0_affiliateCallSignInsideOptional,
-                                                              newElement_0_affiliateCallSign);
-        }
-
-        jclass channelInfoStructClass;
-        err = chip::JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipStructs$ChannelClusterChannelInfo",
-                                                             channelInfoStructClass);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$ChannelClusterChannelInfo");
-            return;
-        }
-        jmethodID channelInfoStructCtor = env->GetMethodID(
-            channelInfoStructClass, "<init>",
-            "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V");
-        if (channelInfoStructCtor == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$ChannelClusterChannelInfo constructor");
-            return;
-        }
-
-        newElement_0 =
-            env->NewObject(channelInfoStructClass, channelInfoStructCtor, newElement_0_majorNumber, newElement_0_minorNumber,
-                           newElement_0_name, newElement_0_callSign, newElement_0_affiliateCallSign);
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -4670,9 +4780,9 @@ void CHIPChannelChannelListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPChannelGeneratedCommandListAttributeCallback::CHIPChannelGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                   bool keepAlive) :
-    chip::Callback::Callback<CHIPChannelClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback::
+    CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOtaSoftwareUpdateRequestorClusterDefaultOtaProvidersAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -4689,7 +4799,8 @@ CHIPChannelGeneratedCommandListAttributeCallback::CHIPChannelGeneratedCommandLis
     }
 }
 
-CHIPChannelGeneratedCommandListAttributeCallback::~CHIPChannelGeneratedCommandListAttributeCallback()
+CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback::
+    ~CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4700,8 +4811,10 @@ CHIPChannelGeneratedCommandListAttributeCallback::~CHIPChannelGeneratedCommandLi
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPChannelGeneratedCommandListAttributeCallback::CallbackFn(void * context,
-                                                                  const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -4710,8 +4823,8 @@ void CHIPChannelGeneratedCommandListAttributeCallback::CallbackFn(void * context
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPChannelGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPChannelGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -4730,10 +4843,44 @@ void CHIPChannelGeneratedCommandListAttributeCallback::CallbackFn(void * context
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        jobject newElement_0_providerNodeID;
+        std::string newElement_0_providerNodeIDClassName     = "java/lang/Long";
+        std::string newElement_0_providerNodeIDCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_providerNodeIDClassName.c_str(),
+                                                                       newElement_0_providerNodeIDCtorSignature.c_str(),
+                                                                       entry_0.providerNodeID, newElement_0_providerNodeID);
+        jobject newElement_0_endpoint;
+        std::string newElement_0_endpointClassName     = "java/lang/Integer";
+        std::string newElement_0_endpointCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_endpointClassName.c_str(),
+                                                                       newElement_0_endpointCtorSignature.c_str(), entry_0.endpoint,
+                                                                       newElement_0_endpoint);
+        jobject newElement_0_fabricIndex;
+        std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
+        std::string newElement_0_fabricIndexCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
+                                                                      newElement_0_fabricIndexCtorSignature.c_str(),
+                                                                      entry_0.fabricIndex, newElement_0_fabricIndex);
+
+        jclass providerLocationStructClass;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$OtaSoftwareUpdateRequestorClusterProviderLocation",
+            providerLocationStructClass);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$OtaSoftwareUpdateRequestorClusterProviderLocation");
+            return;
+        }
+        jmethodID providerLocationStructCtor =
+            env->GetMethodID(providerLocationStructClass, "<init>", "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Integer;)V");
+        if (providerLocationStructCtor == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$OtaSoftwareUpdateRequestorClusterProviderLocation constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(providerLocationStructClass, providerLocationStructCtor, newElement_0_providerNodeID,
+                                      newElement_0_endpoint, newElement_0_fabricIndex);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -4741,9 +4888,9 @@ void CHIPChannelGeneratedCommandListAttributeCallback::CallbackFn(void * context
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPChannelAcceptedCommandListAttributeCallback::CHIPChannelAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                 bool keepAlive) :
-    chip::Callback::Callback<CHIPChannelClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback::
+    CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOtaSoftwareUpdateRequestorClusterUpdateStateProgressAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -4760,7 +4907,8 @@ CHIPChannelAcceptedCommandListAttributeCallback::CHIPChannelAcceptedCommandListA
     }
 }
 
-CHIPChannelAcceptedCommandListAttributeCallback::~CHIPChannelAcceptedCommandListAttributeCallback()
+CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback::
+    ~CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4771,8 +4919,8 @@ CHIPChannelAcceptedCommandListAttributeCallback::~CHIPChannelAcceptedCommandList
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPChannelAcceptedCommandListAttributeCallback::CallbackFn(void * context,
-                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -4780,9 +4928,8 @@ void CHIPChannelAcceptedCommandListAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPChannelAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPChannelAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -4790,30 +4937,29 @@ void CHIPChannelAcceptedCommandListAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPChannelAttributeListAttributeCallback::CHIPChannelAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPChannelClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback::CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOtaSoftwareUpdateRequestorClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4829,7 +4975,7 @@ CHIPChannelAttributeListAttributeCallback::CHIPChannelAttributeListAttributeCall
     }
 }
 
-CHIPChannelAttributeListAttributeCallback::~CHIPChannelAttributeListAttributeCallback()
+CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback::~CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4840,8 +4986,8 @@ CHIPChannelAttributeListAttributeCallback::~CHIPChannelAttributeListAttributeCal
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPChannelAttributeListAttributeCallback::CallbackFn(void * context,
-                                                           const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -4850,8 +4996,8 @@ void CHIPChannelAttributeListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPChannelAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPChannelAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -4881,9 +5027,9 @@ void CHIPChannelAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPColorControlNumberOfPrimariesAttributeCallback::CHIPColorControlNumberOfPrimariesAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPColorControlClusterNumberOfPrimariesAttributeCallbackType>(CallbackFn, this),
+CHIPLocalizationConfigurationSupportedLocalesAttributeCallback::CHIPLocalizationConfigurationSupportedLocalesAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPLocalizationConfigurationClusterSupportedLocalesAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -4900,7 +5046,7 @@ CHIPColorControlNumberOfPrimariesAttributeCallback::CHIPColorControlNumberOfPrim
     }
 }
 
-CHIPColorControlNumberOfPrimariesAttributeCallback::~CHIPColorControlNumberOfPrimariesAttributeCallback()
+CHIPLocalizationConfigurationSupportedLocalesAttributeCallback::~CHIPLocalizationConfigurationSupportedLocalesAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4911,8 +5057,8 @@ CHIPColorControlNumberOfPrimariesAttributeCallback::~CHIPColorControlNumberOfPri
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPColorControlNumberOfPrimariesAttributeCallback::CallbackFn(void * context,
-                                                                    const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPLocalizationConfigurationSupportedLocalesAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CharSpan> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -4920,8 +5066,9 @@ void CHIPColorControlNumberOfPrimariesAttributeCallback::CallbackFn(void * conte
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPColorControlNumberOfPrimariesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPColorControlNumberOfPrimariesAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPLocalizationConfigurationSupportedLocalesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLocalizationConfigurationSupportedLocalesAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -4929,28 +5076,28 @@ void CHIPColorControlNumberOfPrimariesAttributeCallback::CallbackFn(void * conte
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        newElement_0 = env->NewStringUTF(std::string(entry_0.data(), entry_0.size()).c_str());
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPColorControlPrimary1IntensityAttributeCallback::CHIPColorControlPrimary1IntensityAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPColorControlClusterPrimary1IntensityAttributeCallbackType>(CallbackFn, this),
+CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback::
+    CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPLocalizationConfigurationClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -4967,7 +5114,8 @@ CHIPColorControlPrimary1IntensityAttributeCallback::CHIPColorControlPrimary1Inte
     }
 }
 
-CHIPColorControlPrimary1IntensityAttributeCallback::~CHIPColorControlPrimary1IntensityAttributeCallback()
+CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback::
+    ~CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4978,8 +5126,8 @@ CHIPColorControlPrimary1IntensityAttributeCallback::~CHIPColorControlPrimary1Int
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPColorControlPrimary1IntensityAttributeCallback::CallbackFn(void * context,
-                                                                    const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -4987,8 +5135,9 @@ void CHIPColorControlPrimary1IntensityAttributeCallback::CallbackFn(void * conte
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPColorControlPrimary1IntensityAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPColorControlPrimary1IntensityAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -4996,28 +5145,31 @@ void CHIPColorControlPrimary1IntensityAttributeCallback::CallbackFn(void * conte
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPColorControlPrimary2IntensityAttributeCallback::CHIPColorControlPrimary2IntensityAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPColorControlClusterPrimary2IntensityAttributeCallbackType>(CallbackFn, this),
+CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback::
+    CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPLocalizationConfigurationClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -5034,7 +5186,8 @@ CHIPColorControlPrimary2IntensityAttributeCallback::CHIPColorControlPrimary2Inte
     }
 }
 
-CHIPColorControlPrimary2IntensityAttributeCallback::~CHIPColorControlPrimary2IntensityAttributeCallback()
+CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback::
+    ~CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5045,8 +5198,8 @@ CHIPColorControlPrimary2IntensityAttributeCallback::~CHIPColorControlPrimary2Int
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPColorControlPrimary2IntensityAttributeCallback::CallbackFn(void * context,
-                                                                    const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -5054,8 +5207,9 @@ void CHIPColorControlPrimary2IntensityAttributeCallback::CallbackFn(void * conte
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPColorControlPrimary2IntensityAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPColorControlPrimary2IntensityAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -5063,28 +5217,31 @@ void CHIPColorControlPrimary2IntensityAttributeCallback::CallbackFn(void * conte
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPColorControlPrimary3IntensityAttributeCallback::CHIPColorControlPrimary3IntensityAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPColorControlClusterPrimary3IntensityAttributeCallbackType>(CallbackFn, this),
+CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback::
+    CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTimeFormatLocalizationClusterSupportedCalendarTypesAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -5101,7 +5258,8 @@ CHIPColorControlPrimary3IntensityAttributeCallback::CHIPColorControlPrimary3Inte
     }
 }
 
-CHIPColorControlPrimary3IntensityAttributeCallback::~CHIPColorControlPrimary3IntensityAttributeCallback()
+CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback::
+    ~CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5112,8 +5270,8 @@ CHIPColorControlPrimary3IntensityAttributeCallback::~CHIPColorControlPrimary3Int
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPColorControlPrimary3IntensityAttributeCallback::CallbackFn(void * context,
-                                                                    const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::TimeFormatLocalization::CalendarType> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -5121,8 +5279,9 @@ void CHIPColorControlPrimary3IntensityAttributeCallback::CallbackFn(void * conte
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPColorControlPrimary3IntensityAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPColorControlPrimary3IntensityAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -5130,28 +5289,31 @@ void CHIPColorControlPrimary3IntensityAttributeCallback::CallbackFn(void * conte
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Integer";
+        std::string newElement_0CtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), static_cast<uint8_t>(entry_0), newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPColorControlPrimary4IntensityAttributeCallback::CHIPColorControlPrimary4IntensityAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPColorControlClusterPrimary4IntensityAttributeCallbackType>(CallbackFn, this),
+CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback::CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTimeFormatLocalizationClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -5168,7 +5330,7 @@ CHIPColorControlPrimary4IntensityAttributeCallback::CHIPColorControlPrimary4Inte
     }
 }
 
-CHIPColorControlPrimary4IntensityAttributeCallback::~CHIPColorControlPrimary4IntensityAttributeCallback()
+CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback::~CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5179,8 +5341,8 @@ CHIPColorControlPrimary4IntensityAttributeCallback::~CHIPColorControlPrimary4Int
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPColorControlPrimary4IntensityAttributeCallback::CallbackFn(void * context,
-                                                                    const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -5188,8 +5350,9 @@ void CHIPColorControlPrimary4IntensityAttributeCallback::CallbackFn(void * conte
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPColorControlPrimary4IntensityAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPColorControlPrimary4IntensityAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -5197,28 +5360,31 @@ void CHIPColorControlPrimary4IntensityAttributeCallback::CallbackFn(void * conte
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPColorControlPrimary5IntensityAttributeCallback::CHIPColorControlPrimary5IntensityAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPColorControlClusterPrimary5IntensityAttributeCallbackType>(CallbackFn, this),
+CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback::CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTimeFormatLocalizationClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -5235,7 +5401,7 @@ CHIPColorControlPrimary5IntensityAttributeCallback::CHIPColorControlPrimary5Inte
     }
 }
 
-CHIPColorControlPrimary5IntensityAttributeCallback::~CHIPColorControlPrimary5IntensityAttributeCallback()
+CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback::~CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5246,8 +5412,8 @@ CHIPColorControlPrimary5IntensityAttributeCallback::~CHIPColorControlPrimary5Int
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPColorControlPrimary5IntensityAttributeCallback::CallbackFn(void * context,
-                                                                    const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -5255,8 +5421,9 @@ void CHIPColorControlPrimary5IntensityAttributeCallback::CallbackFn(void * conte
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPColorControlPrimary5IntensityAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPColorControlPrimary5IntensityAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -5264,28 +5431,31 @@ void CHIPColorControlPrimary5IntensityAttributeCallback::CallbackFn(void * conte
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPColorControlPrimary6IntensityAttributeCallback::CHIPColorControlPrimary6IntensityAttributeCallback(jobject javaCallback,
+CHIPUnitLocalizationAttributeListAttributeCallback::CHIPUnitLocalizationAttributeListAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPColorControlClusterPrimary6IntensityAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPUnitLocalizationClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -5302,7 +5472,7 @@ CHIPColorControlPrimary6IntensityAttributeCallback::CHIPColorControlPrimary6Inte
     }
 }
 
-CHIPColorControlPrimary6IntensityAttributeCallback::~CHIPColorControlPrimary6IntensityAttributeCallback()
+CHIPUnitLocalizationAttributeListAttributeCallback::~CHIPUnitLocalizationAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5313,8 +5483,8 @@ CHIPColorControlPrimary6IntensityAttributeCallback::~CHIPColorControlPrimary6Int
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPColorControlPrimary6IntensityAttributeCallback::CallbackFn(void * context,
-                                                                    const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPUnitLocalizationAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -5322,8 +5492,9 @@ void CHIPColorControlPrimary6IntensityAttributeCallback::CallbackFn(void * conte
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPColorControlPrimary6IntensityAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPColorControlPrimary6IntensityAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPUnitLocalizationAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPUnitLocalizationAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -5331,28 +5502,31 @@ void CHIPColorControlPrimary6IntensityAttributeCallback::CallbackFn(void * conte
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        javaValue = nullptr;
-    }
-    else
-    {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPColorControlColorPointRIntensityAttributeCallback::CHIPColorControlColorPointRIntensityAttributeCallback(jobject javaCallback,
-                                                                                                             bool keepAlive) :
-    chip::Callback::Callback<CHIPColorControlClusterColorPointRIntensityAttributeCallbackType>(CallbackFn, this),
+CHIPPowerSourceConfigurationSourcesAttributeCallback::CHIPPowerSourceConfigurationSourcesAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPPowerSourceConfigurationClusterSourcesAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -5369,7 +5543,7 @@ CHIPColorControlColorPointRIntensityAttributeCallback::CHIPColorControlColorPoin
     }
 }
 
-CHIPColorControlColorPointRIntensityAttributeCallback::~CHIPColorControlColorPointRIntensityAttributeCallback()
+CHIPPowerSourceConfigurationSourcesAttributeCallback::~CHIPPowerSourceConfigurationSourcesAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5380,8 +5554,8 @@ CHIPColorControlColorPointRIntensityAttributeCallback::~CHIPColorControlColorPoi
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPColorControlColorPointRIntensityAttributeCallback::CallbackFn(void * context,
-                                                                       const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPPowerSourceConfigurationSourcesAttributeCallback::CallbackFn(void * context,
+                                                                      const chip::app::DataModel::DecodableList<uint8_t> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -5389,8 +5563,9 @@ void CHIPColorControlColorPointRIntensityAttributeCallback::CallbackFn(void * co
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPColorControlColorPointRIntensityAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPColorControlColorPointRIntensityAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPPowerSourceConfigurationSourcesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPowerSourceConfigurationSourcesAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -5398,28 +5573,31 @@ void CHIPColorControlColorPointRIntensityAttributeCallback::CallbackFn(void * co
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Integer";
+        std::string newElement_0CtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0ClassName.c_str(),
+                                                                      newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPColorControlColorPointGIntensityAttributeCallback::CHIPColorControlColorPointGIntensityAttributeCallback(jobject javaCallback,
-                                                                                                             bool keepAlive) :
-    chip::Callback::Callback<CHIPColorControlClusterColorPointGIntensityAttributeCallbackType>(CallbackFn, this),
+CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback::
+    CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPPowerSourceConfigurationClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -5436,7 +5614,8 @@ CHIPColorControlColorPointGIntensityAttributeCallback::CHIPColorControlColorPoin
     }
 }
 
-CHIPColorControlColorPointGIntensityAttributeCallback::~CHIPColorControlColorPointGIntensityAttributeCallback()
+CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback::
+    ~CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5447,8 +5626,8 @@ CHIPColorControlColorPointGIntensityAttributeCallback::~CHIPColorControlColorPoi
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPColorControlColorPointGIntensityAttributeCallback::CallbackFn(void * context,
-                                                                       const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -5456,8 +5635,9 @@ void CHIPColorControlColorPointGIntensityAttributeCallback::CallbackFn(void * co
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPColorControlColorPointGIntensityAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPColorControlColorPointGIntensityAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -5465,28 +5645,31 @@ void CHIPColorControlColorPointGIntensityAttributeCallback::CallbackFn(void * co
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPColorControlColorPointBIntensityAttributeCallback::CHIPColorControlColorPointBIntensityAttributeCallback(jobject javaCallback,
-                                                                                                             bool keepAlive) :
-    chip::Callback::Callback<CHIPColorControlClusterColorPointBIntensityAttributeCallbackType>(CallbackFn, this),
+CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback::CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPPowerSourceConfigurationClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -5503,7 +5686,8 @@ CHIPColorControlColorPointBIntensityAttributeCallback::CHIPColorControlColorPoin
     }
 }
 
-CHIPColorControlColorPointBIntensityAttributeCallback::~CHIPColorControlColorPointBIntensityAttributeCallback()
+CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback::
+    ~CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5514,8 +5698,8 @@ CHIPColorControlColorPointBIntensityAttributeCallback::~CHIPColorControlColorPoi
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPColorControlColorPointBIntensityAttributeCallback::CallbackFn(void * context,
-                                                                       const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -5523,8 +5707,9 @@ void CHIPColorControlColorPointBIntensityAttributeCallback::CallbackFn(void * co
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPColorControlColorPointBIntensityAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPColorControlColorPointBIntensityAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -5532,28 +5717,31 @@ void CHIPColorControlColorPointBIntensityAttributeCallback::CallbackFn(void * co
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPColorControlGeneratedCommandListAttributeCallback::CHIPColorControlGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                             bool keepAlive) :
-    chip::Callback::Callback<CHIPColorControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPPowerSourceConfigurationAttributeListAttributeCallback::CHIPPowerSourceConfigurationAttributeListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPPowerSourceConfigurationClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -5570,7 +5758,7 @@ CHIPColorControlGeneratedCommandListAttributeCallback::CHIPColorControlGenerated
     }
 }
 
-CHIPColorControlGeneratedCommandListAttributeCallback::~CHIPColorControlGeneratedCommandListAttributeCallback()
+CHIPPowerSourceConfigurationAttributeListAttributeCallback::~CHIPPowerSourceConfigurationAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5581,8 +5769,8 @@ CHIPColorControlGeneratedCommandListAttributeCallback::~CHIPColorControlGenerate
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPColorControlGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPPowerSourceConfigurationAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -5591,8 +5779,8 @@ void CHIPColorControlGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPColorControlGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPColorControlGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPowerSourceConfigurationAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPowerSourceConfigurationAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -5622,9 +5810,9 @@ void CHIPColorControlGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPColorControlAcceptedCommandListAttributeCallback::CHIPColorControlAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPColorControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPPowerSourceActiveWiredFaultsAttributeCallback::CHIPPowerSourceActiveWiredFaultsAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPPowerSourceClusterActiveWiredFaultsAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -5641,7 +5829,7 @@ CHIPColorControlAcceptedCommandListAttributeCallback::CHIPColorControlAcceptedCo
     }
 }
 
-CHIPColorControlAcceptedCommandListAttributeCallback::~CHIPColorControlAcceptedCommandListAttributeCallback()
+CHIPPowerSourceActiveWiredFaultsAttributeCallback::~CHIPPowerSourceActiveWiredFaultsAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5652,8 +5840,8 @@ CHIPColorControlAcceptedCommandListAttributeCallback::~CHIPColorControlAcceptedC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPColorControlAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPPowerSourceActiveWiredFaultsAttributeCallback::CallbackFn(void * context,
+                                                                   const chip::app::DataModel::DecodableList<uint8_t> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -5662,8 +5850,8 @@ void CHIPColorControlAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPColorControlAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPColorControlAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPowerSourceActiveWiredFaultsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPowerSourceActiveWiredFaultsAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -5682,10 +5870,10 @@ void CHIPColorControlAcceptedCommandListAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        std::string newElement_0ClassName     = "java/lang/Integer";
+        std::string newElement_0CtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0ClassName.c_str(),
+                                                                      newElement_0CtorSignature.c_str(), entry_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -5693,9 +5881,9 @@ void CHIPColorControlAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPColorControlAttributeListAttributeCallback::CHIPColorControlAttributeListAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPColorControlClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPPowerSourceActiveBatteryFaultsAttributeCallback::CHIPPowerSourceActiveBatteryFaultsAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPPowerSourceClusterActiveBatteryFaultsAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -5712,7 +5900,7 @@ CHIPColorControlAttributeListAttributeCallback::CHIPColorControlAttributeListAtt
     }
 }
 
-CHIPColorControlAttributeListAttributeCallback::~CHIPColorControlAttributeListAttributeCallback()
+CHIPPowerSourceActiveBatteryFaultsAttributeCallback::~CHIPPowerSourceActiveBatteryFaultsAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5723,8 +5911,8 @@ CHIPColorControlAttributeListAttributeCallback::~CHIPColorControlAttributeListAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPColorControlAttributeListAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPPowerSourceActiveBatteryFaultsAttributeCallback::CallbackFn(void * context,
+                                                                     const chip::app::DataModel::DecodableList<uint8_t> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -5733,8 +5921,8 @@ void CHIPColorControlAttributeListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPColorControlAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPColorControlAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPowerSourceActiveBatteryFaultsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPowerSourceActiveBatteryFaultsAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -5753,10 +5941,10 @@ void CHIPColorControlAttributeListAttributeCallback::CallbackFn(void * context,
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        std::string newElement_0ClassName     = "java/lang/Integer";
+        std::string newElement_0CtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0ClassName.c_str(),
+                                                                      newElement_0CtorSignature.c_str(), entry_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -5764,9 +5952,9 @@ void CHIPColorControlAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPContentLauncherAcceptHeaderAttributeCallback::CHIPContentLauncherAcceptHeaderAttributeCallback(jobject javaCallback,
-                                                                                                   bool keepAlive) :
-    chip::Callback::Callback<CHIPContentLauncherClusterAcceptHeaderAttributeCallbackType>(CallbackFn, this),
+CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback::CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPPowerSourceClusterActiveBatteryChargeFaultsAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -5783,7 +5971,7 @@ CHIPContentLauncherAcceptHeaderAttributeCallback::CHIPContentLauncherAcceptHeade
     }
 }
 
-CHIPContentLauncherAcceptHeaderAttributeCallback::~CHIPContentLauncherAcceptHeaderAttributeCallback()
+CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback::~CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5794,8 +5982,8 @@ CHIPContentLauncherAcceptHeaderAttributeCallback::~CHIPContentLauncherAcceptHead
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPContentLauncherAcceptHeaderAttributeCallback::CallbackFn(void * context,
-                                                                  const chip::app::DataModel::DecodableList<chip::CharSpan> & list)
+void CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<uint8_t> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -5804,8 +5992,8 @@ void CHIPContentLauncherAcceptHeaderAttributeCallback::CallbackFn(void * context
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPContentLauncherAcceptHeaderAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPContentLauncherAcceptHeaderAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -5824,7 +6012,10 @@ void CHIPContentLauncherAcceptHeaderAttributeCallback::CallbackFn(void * context
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        newElement_0 = env->NewStringUTF(std::string(entry_0.data(), entry_0.size()).c_str());
+        std::string newElement_0ClassName     = "java/lang/Integer";
+        std::string newElement_0CtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0ClassName.c_str(),
+                                                                      newElement_0CtorSignature.c_str(), entry_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -5832,9 +6023,9 @@ void CHIPContentLauncherAcceptHeaderAttributeCallback::CallbackFn(void * context
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPContentLauncherGeneratedCommandListAttributeCallback::CHIPContentLauncherGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPContentLauncherClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPPowerSourceGeneratedCommandListAttributeCallback::CHIPPowerSourceGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPPowerSourceClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -5851,7 +6042,7 @@ CHIPContentLauncherGeneratedCommandListAttributeCallback::CHIPContentLauncherGen
     }
 }
 
-CHIPContentLauncherGeneratedCommandListAttributeCallback::~CHIPContentLauncherGeneratedCommandListAttributeCallback()
+CHIPPowerSourceGeneratedCommandListAttributeCallback::~CHIPPowerSourceGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5862,7 +6053,7 @@ CHIPContentLauncherGeneratedCommandListAttributeCallback::~CHIPContentLauncherGe
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPContentLauncherGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPPowerSourceGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -5872,8 +6063,8 @@ void CHIPContentLauncherGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPContentLauncherGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPContentLauncherGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPowerSourceGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPowerSourceGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -5903,9 +6094,9 @@ void CHIPContentLauncherGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPContentLauncherAcceptedCommandListAttributeCallback::CHIPContentLauncherAcceptedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPContentLauncherClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPPowerSourceAcceptedCommandListAttributeCallback::CHIPPowerSourceAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPPowerSourceClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -5922,7 +6113,7 @@ CHIPContentLauncherAcceptedCommandListAttributeCallback::CHIPContentLauncherAcce
     }
 }
 
-CHIPContentLauncherAcceptedCommandListAttributeCallback::~CHIPContentLauncherAcceptedCommandListAttributeCallback()
+CHIPPowerSourceAcceptedCommandListAttributeCallback::~CHIPPowerSourceAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5933,7 +6124,7 @@ CHIPContentLauncherAcceptedCommandListAttributeCallback::~CHIPContentLauncherAcc
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPContentLauncherAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPPowerSourceAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -5943,8 +6134,8 @@ void CHIPContentLauncherAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPContentLauncherAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPContentLauncherAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPowerSourceAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPowerSourceAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -5974,10 +6165,8 @@ void CHIPContentLauncherAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPContentLauncherAttributeListAttributeCallback::CHIPContentLauncherAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                     bool keepAlive) :
-    chip::Callback::Callback<CHIPContentLauncherClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPPowerSourceAttributeListAttributeCallback::CHIPPowerSourceAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPPowerSourceClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5993,7 +6182,7 @@ CHIPContentLauncherAttributeListAttributeCallback::CHIPContentLauncherAttributeL
     }
 }
 
-CHIPContentLauncherAttributeListAttributeCallback::~CHIPContentLauncherAttributeListAttributeCallback()
+CHIPPowerSourceAttributeListAttributeCallback::~CHIPPowerSourceAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -6004,8 +6193,8 @@ CHIPContentLauncherAttributeListAttributeCallback::~CHIPContentLauncherAttribute
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPContentLauncherAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPPowerSourceAttributeListAttributeCallback::CallbackFn(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -6014,8 +6203,8 @@ void CHIPContentLauncherAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPContentLauncherAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPContentLauncherAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPowerSourceAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPowerSourceAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -6045,8 +6234,10 @@ void CHIPContentLauncherAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPDescriptorDeviceListAttributeCallback::CHIPDescriptorDeviceListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPDescriptorClusterDeviceListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPGeneralCommissioningGeneratedCommandListAttributeCallback::CHIPGeneralCommissioningGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPGeneralCommissioningClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -6062,7 +6253,7 @@ CHIPDescriptorDeviceListAttributeCallback::CHIPDescriptorDeviceListAttributeCall
     }
 }
 
-CHIPDescriptorDeviceListAttributeCallback::~CHIPDescriptorDeviceListAttributeCallback()
+CHIPGeneralCommissioningGeneratedCommandListAttributeCallback::~CHIPGeneralCommissioningGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -6073,9 +6264,8 @@ CHIPDescriptorDeviceListAttributeCallback::~CHIPDescriptorDeviceListAttributeCal
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDescriptorDeviceListAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::DeviceType::DecodableType> & list)
+void CHIPGeneralCommissioningGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -6084,8 +6274,8 @@ void CHIPDescriptorDeviceListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPDescriptorDeviceListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDescriptorDeviceListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPGeneralCommissioningGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPGeneralCommissioningGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -6104,35 +6294,10 @@ void CHIPDescriptorDeviceListAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        jobject newElement_0_type;
-        std::string newElement_0_typeClassName     = "java/lang/Long";
-        std::string newElement_0_typeCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-            newElement_0_typeClassName.c_str(), newElement_0_typeCtorSignature.c_str(), entry_0.type, newElement_0_type);
-        jobject newElement_0_revision;
-        std::string newElement_0_revisionClassName     = "java/lang/Integer";
-        std::string newElement_0_revisionCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_revisionClassName.c_str(),
-                                                                       newElement_0_revisionCtorSignature.c_str(), entry_0.revision,
-                                                                       newElement_0_revision);
-
-        jclass deviceTypeStructClass;
-        err = chip::JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipStructs$DescriptorClusterDeviceType",
-                                                             deviceTypeStructClass);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$DescriptorClusterDeviceType");
-            return;
-        }
-        jmethodID deviceTypeStructCtor =
-            env->GetMethodID(deviceTypeStructClass, "<init>", "(Ljava/lang/Long;Ljava/lang/Integer;)V");
-        if (deviceTypeStructCtor == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$DescriptorClusterDeviceType constructor");
-            return;
-        }
-
-        newElement_0 = env->NewObject(deviceTypeStructClass, deviceTypeStructCtor, newElement_0_type, newElement_0_revision);
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -6140,8 +6305,10 @@ void CHIPDescriptorDeviceListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPDescriptorServerListAttributeCallback::CHIPDescriptorServerListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPDescriptorClusterServerListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPGeneralCommissioningAcceptedCommandListAttributeCallback::CHIPGeneralCommissioningAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPGeneralCommissioningClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -6157,7 +6324,7 @@ CHIPDescriptorServerListAttributeCallback::CHIPDescriptorServerListAttributeCall
     }
 }
 
-CHIPDescriptorServerListAttributeCallback::~CHIPDescriptorServerListAttributeCallback()
+CHIPGeneralCommissioningAcceptedCommandListAttributeCallback::~CHIPGeneralCommissioningAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -6168,8 +6335,8 @@ CHIPDescriptorServerListAttributeCallback::~CHIPDescriptorServerListAttributeCal
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDescriptorServerListAttributeCallback::CallbackFn(void * context,
-                                                           const chip::app::DataModel::DecodableList<chip::ClusterId> & list)
+void CHIPGeneralCommissioningAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -6178,8 +6345,8 @@ void CHIPDescriptorServerListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPDescriptorServerListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDescriptorServerListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPGeneralCommissioningAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPGeneralCommissioningAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -6209,8 +6376,10 @@ void CHIPDescriptorServerListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPDescriptorClientListAttributeCallback::CHIPDescriptorClientListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPDescriptorClusterClientListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPGeneralCommissioningAttributeListAttributeCallback::CHIPGeneralCommissioningAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPGeneralCommissioningClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -6226,7 +6395,7 @@ CHIPDescriptorClientListAttributeCallback::CHIPDescriptorClientListAttributeCall
     }
 }
 
-CHIPDescriptorClientListAttributeCallback::~CHIPDescriptorClientListAttributeCallback()
+CHIPGeneralCommissioningAttributeListAttributeCallback::~CHIPGeneralCommissioningAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -6237,8 +6406,8 @@ CHIPDescriptorClientListAttributeCallback::~CHIPDescriptorClientListAttributeCal
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDescriptorClientListAttributeCallback::CallbackFn(void * context,
-                                                           const chip::app::DataModel::DecodableList<chip::ClusterId> & list)
+void CHIPGeneralCommissioningAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -6247,8 +6416,8 @@ void CHIPDescriptorClientListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPDescriptorClientListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDescriptorClientListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPGeneralCommissioningAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPGeneralCommissioningAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -6278,8 +6447,10 @@ void CHIPDescriptorClientListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPDescriptorPartsListAttributeCallback::CHIPDescriptorPartsListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPDescriptorClusterPartsListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPNetworkCommissioningNetworksAttributeCallback::CHIPNetworkCommissioningNetworksAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPNetworkCommissioningClusterNetworksAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -6295,7 +6466,7 @@ CHIPDescriptorPartsListAttributeCallback::CHIPDescriptorPartsListAttributeCallba
     }
 }
 
-CHIPDescriptorPartsListAttributeCallback::~CHIPDescriptorPartsListAttributeCallback()
+CHIPNetworkCommissioningNetworksAttributeCallback::~CHIPNetworkCommissioningNetworksAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -6306,8 +6477,10 @@ CHIPDescriptorPartsListAttributeCallback::~CHIPDescriptorPartsListAttributeCallb
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDescriptorPartsListAttributeCallback::CallbackFn(void * context,
-                                                          const chip::app::DataModel::DecodableList<chip::EndpointId> & list)
+void CHIPNetworkCommissioningNetworksAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::DecodableType> &
+        list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -6316,8 +6489,8 @@ void CHIPDescriptorPartsListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPDescriptorPartsListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDescriptorPartsListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPNetworkCommissioningNetworksAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPNetworkCommissioningNetworksAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -6336,10 +6509,35 @@ void CHIPDescriptorPartsListAttributeCallback::CallbackFn(void * context,
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Integer";
-        std::string newElement_0CtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        jobject newElement_0_networkID;
+        jbyteArray newElement_0_networkIDByteArray = env->NewByteArray(static_cast<jsize>(entry_0.networkID.size()));
+        env->SetByteArrayRegion(newElement_0_networkIDByteArray, 0, static_cast<jsize>(entry_0.networkID.size()),
+                                reinterpret_cast<const jbyte *>(entry_0.networkID.data()));
+        newElement_0_networkID = newElement_0_networkIDByteArray;
+        jobject newElement_0_connected;
+        std::string newElement_0_connectedClassName     = "java/lang/Boolean";
+        std::string newElement_0_connectedCtorSignature = "(Z)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_connectedClassName.c_str(),
+                                                                   newElement_0_connectedCtorSignature.c_str(), entry_0.connected,
+                                                                   newElement_0_connected);
+
+        jclass networkInfoStructClass;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$NetworkCommissioningClusterNetworkInfo", networkInfoStructClass);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$NetworkCommissioningClusterNetworkInfo");
+            return;
+        }
+        jmethodID networkInfoStructCtor = env->GetMethodID(networkInfoStructClass, "<init>", "([BLjava/lang/Boolean;)V");
+        if (networkInfoStructCtor == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$NetworkCommissioningClusterNetworkInfo constructor");
+            return;
+        }
+
+        newElement_0 =
+            env->NewObject(networkInfoStructClass, networkInfoStructCtor, newElement_0_networkID, newElement_0_connected);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -6347,9 +6545,9 @@ void CHIPDescriptorPartsListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPDescriptorGeneratedCommandListAttributeCallback::CHIPDescriptorGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                         bool keepAlive) :
-    chip::Callback::Callback<CHIPDescriptorClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback::CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPNetworkCommissioningClusterLastNetworkingStatusAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -6366,7 +6564,7 @@ CHIPDescriptorGeneratedCommandListAttributeCallback::CHIPDescriptorGeneratedComm
     }
 }
 
-CHIPDescriptorGeneratedCommandListAttributeCallback::~CHIPDescriptorGeneratedCommandListAttributeCallback()
+CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback::~CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -6377,8 +6575,9 @@ CHIPDescriptorGeneratedCommandListAttributeCallback::~CHIPDescriptorGeneratedCom
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDescriptorGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::Nullable<chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatus> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -6386,9 +6585,8 @@ void CHIPDescriptorGeneratedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPDescriptorGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDescriptorGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -6396,31 +6594,28 @@ void CHIPDescriptorGeneratedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      static_cast<uint8_t>(value.Value()), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPDescriptorAcceptedCommandListAttributeCallback::CHIPDescriptorAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPDescriptorClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPNetworkCommissioningLastNetworkIDAttributeCallback::CHIPNetworkCommissioningLastNetworkIDAttributeCallback(jobject javaCallback,
+                                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPNetworkCommissioningClusterLastNetworkIDAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -6437,7 +6632,7 @@ CHIPDescriptorAcceptedCommandListAttributeCallback::CHIPDescriptorAcceptedComman
     }
 }
 
-CHIPDescriptorAcceptedCommandListAttributeCallback::~CHIPDescriptorAcceptedCommandListAttributeCallback()
+CHIPNetworkCommissioningLastNetworkIDAttributeCallback::~CHIPNetworkCommissioningLastNetworkIDAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -6448,8 +6643,8 @@ CHIPDescriptorAcceptedCommandListAttributeCallback::~CHIPDescriptorAcceptedComma
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDescriptorAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPNetworkCommissioningLastNetworkIDAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::ByteSpan> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -6457,9 +6652,8 @@ void CHIPDescriptorAcceptedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPDescriptorAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDescriptorAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPNetworkCommissioningLastNetworkIDAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPNetworkCommissioningLastNetworkIDAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -6467,30 +6661,29 @@ void CHIPDescriptorAcceptedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        jbyteArray javaValueByteArray = env->NewByteArray(static_cast<jsize>(value.Value().size()));
+        env->SetByteArrayRegion(javaValueByteArray, 0, static_cast<jsize>(value.Value().size()),
+                                reinterpret_cast<const jbyte *>(value.Value().data()));
+        javaValue = javaValueByteArray;
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPDescriptorAttributeListAttributeCallback::CHIPDescriptorAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPDescriptorClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback::CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPNetworkCommissioningClusterLastConnectErrorValueAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -6506,7 +6699,7 @@ CHIPDescriptorAttributeListAttributeCallback::CHIPDescriptorAttributeListAttribu
     }
 }
 
-CHIPDescriptorAttributeListAttributeCallback::~CHIPDescriptorAttributeListAttributeCallback()
+CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback::~CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -6517,8 +6710,8 @@ CHIPDescriptorAttributeListAttributeCallback::~CHIPDescriptorAttributeListAttrib
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDescriptorAttributeListAttributeCallback::CallbackFn(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<int32_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -6526,9 +6719,8 @@ void CHIPDescriptorAttributeListAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPDescriptorAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDescriptorAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -6536,31 +6728,28 @@ void CHIPDescriptorAttributeListAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int32_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPDiagnosticLogsGeneratedCommandListAttributeCallback::CHIPDiagnosticLogsGeneratedCommandListAttributeCallback(
+CHIPNetworkCommissioningGeneratedCommandListAttributeCallback::CHIPNetworkCommissioningGeneratedCommandListAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPDiagnosticLogsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPNetworkCommissioningClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -6577,7 +6766,7 @@ CHIPDiagnosticLogsGeneratedCommandListAttributeCallback::CHIPDiagnosticLogsGener
     }
 }
 
-CHIPDiagnosticLogsGeneratedCommandListAttributeCallback::~CHIPDiagnosticLogsGeneratedCommandListAttributeCallback()
+CHIPNetworkCommissioningGeneratedCommandListAttributeCallback::~CHIPNetworkCommissioningGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -6588,7 +6777,7 @@ CHIPDiagnosticLogsGeneratedCommandListAttributeCallback::~CHIPDiagnosticLogsGene
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDiagnosticLogsGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPNetworkCommissioningGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -6598,8 +6787,8 @@ void CHIPDiagnosticLogsGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPDiagnosticLogsGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDiagnosticLogsGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPNetworkCommissioningGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPNetworkCommissioningGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -6629,9 +6818,9 @@ void CHIPDiagnosticLogsGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPDiagnosticLogsAcceptedCommandListAttributeCallback::CHIPDiagnosticLogsAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPDiagnosticLogsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPNetworkCommissioningAcceptedCommandListAttributeCallback::CHIPNetworkCommissioningAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPNetworkCommissioningClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -6648,7 +6837,7 @@ CHIPDiagnosticLogsAcceptedCommandListAttributeCallback::CHIPDiagnosticLogsAccept
     }
 }
 
-CHIPDiagnosticLogsAcceptedCommandListAttributeCallback::~CHIPDiagnosticLogsAcceptedCommandListAttributeCallback()
+CHIPNetworkCommissioningAcceptedCommandListAttributeCallback::~CHIPNetworkCommissioningAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -6659,7 +6848,7 @@ CHIPDiagnosticLogsAcceptedCommandListAttributeCallback::~CHIPDiagnosticLogsAccep
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDiagnosticLogsAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPNetworkCommissioningAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -6669,8 +6858,8 @@ void CHIPDiagnosticLogsAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPDiagnosticLogsAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDiagnosticLogsAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPNetworkCommissioningAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPNetworkCommissioningAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -6700,9 +6889,9 @@ void CHIPDiagnosticLogsAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPDiagnosticLogsAttributeListAttributeCallback::CHIPDiagnosticLogsAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                   bool keepAlive) :
-    chip::Callback::Callback<CHIPDiagnosticLogsClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPDiagnosticLogsGeneratedCommandListAttributeCallback::CHIPDiagnosticLogsGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDiagnosticLogsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -6719,7 +6908,7 @@ CHIPDiagnosticLogsAttributeListAttributeCallback::CHIPDiagnosticLogsAttributeLis
     }
 }
 
-CHIPDiagnosticLogsAttributeListAttributeCallback::~CHIPDiagnosticLogsAttributeListAttributeCallback()
+CHIPDiagnosticLogsGeneratedCommandListAttributeCallback::~CHIPDiagnosticLogsGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -6730,8 +6919,8 @@ CHIPDiagnosticLogsAttributeListAttributeCallback::~CHIPDiagnosticLogsAttributeLi
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDiagnosticLogsAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPDiagnosticLogsGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -6740,8 +6929,8 @@ void CHIPDiagnosticLogsAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPDiagnosticLogsAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDiagnosticLogsAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPDiagnosticLogsGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDiagnosticLogsGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -6771,139 +6960,9 @@ void CHIPDiagnosticLogsAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPDoorLockLockStateAttributeCallback::CHIPDoorLockLockStateAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPDoorLockClusterLockStateAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-        return;
-    }
-
-    javaCallbackRef = env->NewGlobalRef(javaCallback);
-    if (javaCallbackRef == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-    }
-}
-
-CHIPDoorLockLockStateAttributeCallback::~CHIPDoorLockLockStateAttributeCallback()
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not delete global reference for Java callback");
-        return;
-    }
-    env->DeleteGlobalRef(javaCallbackRef);
-}
-
-void CHIPDoorLockLockStateAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> & value)
-{
-    chip::DeviceLayer::StackUnlock unlock;
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    jobject javaCallbackRef;
-
-    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPDoorLockLockStateAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDoorLockLockStateAttributeCallback *>(context), maybeDestroy);
-
-    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-    javaCallbackRef = cppCallback.get()->javaCallbackRef;
-    VerifyOrReturn(javaCallbackRef != nullptr,
-                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-    jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
-    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
-    {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      static_cast<uint8_t>(value.Value()), javaValue);
-    }
-
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
-}
-
-CHIPDoorLockDoorStateAttributeCallback::CHIPDoorLockDoorStateAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPDoorLockClusterDoorStateAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-        return;
-    }
-
-    javaCallbackRef = env->NewGlobalRef(javaCallback);
-    if (javaCallbackRef == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-    }
-}
-
-CHIPDoorLockDoorStateAttributeCallback::~CHIPDoorLockDoorStateAttributeCallback()
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not delete global reference for Java callback");
-        return;
-    }
-    env->DeleteGlobalRef(javaCallbackRef);
-}
-
-void CHIPDoorLockDoorStateAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlDoorState> & value)
-{
-    chip::DeviceLayer::StackUnlock unlock;
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    jobject javaCallbackRef;
-
-    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPDoorLockDoorStateAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDoorLockDoorStateAttributeCallback *>(context), maybeDestroy);
-
-    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-    javaCallbackRef = cppCallback.get()->javaCallbackRef;
-    VerifyOrReturn(javaCallbackRef != nullptr,
-                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-    jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
-    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
-    {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      static_cast<uint8_t>(value.Value()), javaValue);
-    }
-
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
-}
-
-CHIPDoorLockGeneratedCommandListAttributeCallback::CHIPDoorLockGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                     bool keepAlive) :
-    chip::Callback::Callback<CHIPDoorLockClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPDiagnosticLogsAcceptedCommandListAttributeCallback::CHIPDiagnosticLogsAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPDiagnosticLogsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -6920,7 +6979,7 @@ CHIPDoorLockGeneratedCommandListAttributeCallback::CHIPDoorLockGeneratedCommandL
     }
 }
 
-CHIPDoorLockGeneratedCommandListAttributeCallback::~CHIPDoorLockGeneratedCommandListAttributeCallback()
+CHIPDiagnosticLogsAcceptedCommandListAttributeCallback::~CHIPDiagnosticLogsAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -6931,7 +6990,7 @@ CHIPDoorLockGeneratedCommandListAttributeCallback::~CHIPDoorLockGeneratedCommand
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDoorLockGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPDiagnosticLogsAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -6941,8 +7000,8 @@ void CHIPDoorLockGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPDoorLockGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDoorLockGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPDiagnosticLogsAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDiagnosticLogsAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -6972,9 +7031,9 @@ void CHIPDoorLockGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPDoorLockAcceptedCommandListAttributeCallback::CHIPDoorLockAcceptedCommandListAttributeCallback(jobject javaCallback,
+CHIPDiagnosticLogsAttributeListAttributeCallback::CHIPDiagnosticLogsAttributeListAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPDoorLockClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPDiagnosticLogsClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -6991,7 +7050,7 @@ CHIPDoorLockAcceptedCommandListAttributeCallback::CHIPDoorLockAcceptedCommandLis
     }
 }
 
-CHIPDoorLockAcceptedCommandListAttributeCallback::~CHIPDoorLockAcceptedCommandListAttributeCallback()
+CHIPDiagnosticLogsAttributeListAttributeCallback::~CHIPDiagnosticLogsAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7002,8 +7061,8 @@ CHIPDoorLockAcceptedCommandListAttributeCallback::~CHIPDoorLockAcceptedCommandLi
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDoorLockAcceptedCommandListAttributeCallback::CallbackFn(void * context,
-                                                                  const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPDiagnosticLogsAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7012,8 +7071,8 @@ void CHIPDoorLockAcceptedCommandListAttributeCallback::CallbackFn(void * context
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPDoorLockAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDoorLockAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPDiagnosticLogsAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDiagnosticLogsAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -7043,8 +7102,10 @@ void CHIPDoorLockAcceptedCommandListAttributeCallback::CallbackFn(void * context
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPDoorLockAttributeListAttributeCallback::CHIPDoorLockAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPDoorLockClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback::CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPGeneralDiagnosticsClusterNetworkInterfacesAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7060,7 +7121,7 @@ CHIPDoorLockAttributeListAttributeCallback::CHIPDoorLockAttributeListAttributeCa
     }
 }
 
-CHIPDoorLockAttributeListAttributeCallback::~CHIPDoorLockAttributeListAttributeCallback()
+CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback::~CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7071,8 +7132,10 @@ CHIPDoorLockAttributeListAttributeCallback::~CHIPDoorLockAttributeListAttributeC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDoorLockAttributeListAttributeCallback::CallbackFn(void * context,
-                                                            const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7081,8 +7144,8 @@ void CHIPDoorLockAttributeListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPDoorLockAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPDoorLockAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -7101,21 +7164,116 @@ void CHIPDoorLockAttributeListAttributeCallback::CallbackFn(void * context,
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
-    }
-
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-}
-
-CHIPElectricalMeasurementGeneratedCommandListAttributeCallback::CHIPElectricalMeasurementGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPElectricalMeasurementClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+        jobject newElement_0_name;
+        newElement_0_name = env->NewStringUTF(std::string(entry_0.name.data(), entry_0.name.size()).c_str());
+        jobject newElement_0_isOperational;
+        std::string newElement_0_isOperationalClassName     = "java/lang/Boolean";
+        std::string newElement_0_isOperationalCtorSignature = "(Z)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_isOperationalClassName.c_str(),
+                                                                   newElement_0_isOperationalCtorSignature.c_str(),
+                                                                   entry_0.isOperational, newElement_0_isOperational);
+        jobject newElement_0_offPremiseServicesReachableIPv4;
+        if (entry_0.offPremiseServicesReachableIPv4.IsNull())
+        {
+            newElement_0_offPremiseServicesReachableIPv4 = nullptr;
+        }
+        else
+        {
+            std::string newElement_0_offPremiseServicesReachableIPv4ClassName     = "java/lang/Boolean";
+            std::string newElement_0_offPremiseServicesReachableIPv4CtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
+                newElement_0_offPremiseServicesReachableIPv4ClassName.c_str(),
+                newElement_0_offPremiseServicesReachableIPv4CtorSignature.c_str(), entry_0.offPremiseServicesReachableIPv4.Value(),
+                newElement_0_offPremiseServicesReachableIPv4);
+        }
+        jobject newElement_0_offPremiseServicesReachableIPv6;
+        if (entry_0.offPremiseServicesReachableIPv6.IsNull())
+        {
+            newElement_0_offPremiseServicesReachableIPv6 = nullptr;
+        }
+        else
+        {
+            std::string newElement_0_offPremiseServicesReachableIPv6ClassName     = "java/lang/Boolean";
+            std::string newElement_0_offPremiseServicesReachableIPv6CtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
+                newElement_0_offPremiseServicesReachableIPv6ClassName.c_str(),
+                newElement_0_offPremiseServicesReachableIPv6CtorSignature.c_str(), entry_0.offPremiseServicesReachableIPv6.Value(),
+                newElement_0_offPremiseServicesReachableIPv6);
+        }
+        jobject newElement_0_hardwareAddress;
+        jbyteArray newElement_0_hardwareAddressByteArray = env->NewByteArray(static_cast<jsize>(entry_0.hardwareAddress.size()));
+        env->SetByteArrayRegion(newElement_0_hardwareAddressByteArray, 0, static_cast<jsize>(entry_0.hardwareAddress.size()),
+                                reinterpret_cast<const jbyte *>(entry_0.hardwareAddress.data()));
+        newElement_0_hardwareAddress = newElement_0_hardwareAddressByteArray;
+        jobject newElement_0_IPv4Addresses;
+        chip::JniReferences::GetInstance().CreateArrayList(newElement_0_IPv4Addresses);
+
+        auto iter_newElement_0_IPv4Addresses_2 = entry_0.IPv4Addresses.begin();
+        while (iter_newElement_0_IPv4Addresses_2.Next())
+        {
+            auto & entry_2 = iter_newElement_0_IPv4Addresses_2.GetValue();
+            jobject newElement_2;
+            jbyteArray newElement_2ByteArray = env->NewByteArray(static_cast<jsize>(entry_2.size()));
+            env->SetByteArrayRegion(newElement_2ByteArray, 0, static_cast<jsize>(entry_2.size()),
+                                    reinterpret_cast<const jbyte *>(entry_2.data()));
+            newElement_2 = newElement_2ByteArray;
+            chip::JniReferences::GetInstance().AddToList(newElement_0_IPv4Addresses, newElement_2);
+        }
+        jobject newElement_0_IPv6Addresses;
+        chip::JniReferences::GetInstance().CreateArrayList(newElement_0_IPv6Addresses);
+
+        auto iter_newElement_0_IPv6Addresses_2 = entry_0.IPv6Addresses.begin();
+        while (iter_newElement_0_IPv6Addresses_2.Next())
+        {
+            auto & entry_2 = iter_newElement_0_IPv6Addresses_2.GetValue();
+            jobject newElement_2;
+            jbyteArray newElement_2ByteArray = env->NewByteArray(static_cast<jsize>(entry_2.size()));
+            env->SetByteArrayRegion(newElement_2ByteArray, 0, static_cast<jsize>(entry_2.size()),
+                                    reinterpret_cast<const jbyte *>(entry_2.data()));
+            newElement_2 = newElement_2ByteArray;
+            chip::JniReferences::GetInstance().AddToList(newElement_0_IPv6Addresses, newElement_2);
+        }
+        jobject newElement_0_type;
+        std::string newElement_0_typeClassName     = "java/lang/Integer";
+        std::string newElement_0_typeCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_typeClassName.c_str(),
+                                                                      newElement_0_typeCtorSignature.c_str(),
+                                                                      static_cast<uint8_t>(entry_0.type), newElement_0_type);
+
+        jclass networkInterfaceTypeStructClass;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$GeneralDiagnosticsClusterNetworkInterfaceType",
+            networkInterfaceTypeStructClass);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$GeneralDiagnosticsClusterNetworkInterfaceType");
+            return;
+        }
+        jmethodID networkInterfaceTypeStructCtor =
+            env->GetMethodID(networkInterfaceTypeStructClass, "<init>",
+                             "(Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;[BLjava/util/"
+                             "ArrayList;Ljava/util/ArrayList;Ljava/lang/Integer;)V");
+        if (networkInterfaceTypeStructCtor == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$GeneralDiagnosticsClusterNetworkInterfaceType constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(networkInterfaceTypeStructClass, networkInterfaceTypeStructCtor, newElement_0_name,
+                                      newElement_0_isOperational, newElement_0_offPremiseServicesReachableIPv4,
+                                      newElement_0_offPremiseServicesReachableIPv6, newElement_0_hardwareAddress,
+                                      newElement_0_IPv4Addresses, newElement_0_IPv6Addresses, newElement_0_type);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback::CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPGeneralDiagnosticsClusterActiveHardwareFaultsAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7131,7 +7289,7 @@ CHIPElectricalMeasurementGeneratedCommandListAttributeCallback::CHIPElectricalMe
     }
 }
 
-CHIPElectricalMeasurementGeneratedCommandListAttributeCallback::~CHIPElectricalMeasurementGeneratedCommandListAttributeCallback()
+CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback::~CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7142,8 +7300,8 @@ CHIPElectricalMeasurementGeneratedCommandListAttributeCallback::~CHIPElectricalM
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPElectricalMeasurementGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<uint8_t> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7152,8 +7310,8 @@ void CHIPElectricalMeasurementGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPElectricalMeasurementGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPElectricalMeasurementGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -7172,10 +7330,10 @@ void CHIPElectricalMeasurementGeneratedCommandListAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        std::string newElement_0ClassName     = "java/lang/Integer";
+        std::string newElement_0CtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0ClassName.c_str(),
+                                                                      newElement_0CtorSignature.c_str(), entry_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -7183,9 +7341,9 @@ void CHIPElectricalMeasurementGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPElectricalMeasurementAcceptedCommandListAttributeCallback::CHIPElectricalMeasurementAcceptedCommandListAttributeCallback(
+CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback::CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPElectricalMeasurementClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPGeneralDiagnosticsClusterActiveRadioFaultsAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -7202,7 +7360,7 @@ CHIPElectricalMeasurementAcceptedCommandListAttributeCallback::CHIPElectricalMea
     }
 }
 
-CHIPElectricalMeasurementAcceptedCommandListAttributeCallback::~CHIPElectricalMeasurementAcceptedCommandListAttributeCallback()
+CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback::~CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7213,8 +7371,8 @@ CHIPElectricalMeasurementAcceptedCommandListAttributeCallback::~CHIPElectricalMe
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPElectricalMeasurementAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback::CallbackFn(void * context,
+                                                                          const chip::app::DataModel::DecodableList<uint8_t> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7223,8 +7381,8 @@ void CHIPElectricalMeasurementAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPElectricalMeasurementAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPElectricalMeasurementAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -7243,10 +7401,10 @@ void CHIPElectricalMeasurementAcceptedCommandListAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        std::string newElement_0ClassName     = "java/lang/Integer";
+        std::string newElement_0CtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0ClassName.c_str(),
+                                                                      newElement_0CtorSignature.c_str(), entry_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -7254,9 +7412,9 @@ void CHIPElectricalMeasurementAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPElectricalMeasurementAttributeListAttributeCallback::CHIPElectricalMeasurementAttributeListAttributeCallback(
+CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback::CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPElectricalMeasurementClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPGeneralDiagnosticsClusterActiveNetworkFaultsAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -7273,7 +7431,7 @@ CHIPElectricalMeasurementAttributeListAttributeCallback::CHIPElectricalMeasureme
     }
 }
 
-CHIPElectricalMeasurementAttributeListAttributeCallback::~CHIPElectricalMeasurementAttributeListAttributeCallback()
+CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback::~CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7284,8 +7442,8 @@ CHIPElectricalMeasurementAttributeListAttributeCallback::~CHIPElectricalMeasurem
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPElectricalMeasurementAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<uint8_t> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7294,8 +7452,8 @@ void CHIPElectricalMeasurementAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPElectricalMeasurementAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPElectricalMeasurementAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -7314,10 +7472,10 @@ void CHIPElectricalMeasurementAttributeListAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        std::string newElement_0ClassName     = "java/lang/Integer";
+        std::string newElement_0CtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0ClassName.c_str(),
+                                                                      newElement_0CtorSignature.c_str(), entry_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -7325,9 +7483,9 @@ void CHIPElectricalMeasurementAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback::CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback(jobject javaCallback,
-                                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackType>(CallbackFn, this),
+CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback::CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPGeneralDiagnosticsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -7344,7 +7502,7 @@ CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback::CHIPEthernetNetworkDiagn
     }
 }
 
-CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback::~CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback()
+CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback::~CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7355,8 +7513,8 @@ CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback::~CHIPEthernetNetworkDiag
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateType> & value)
+void CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7364,8 +7522,9 @@ void CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -7373,28 +7532,31 @@ void CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      static_cast<uint8_t>(value.Value()), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback::CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback(
+CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback::CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterFullDuplexAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPGeneralDiagnosticsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -7411,7 +7573,7 @@ CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback::CHIPEthernetNetworkDi
     }
 }
 
-CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback::~CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback()
+CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback::~CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7422,8 +7584,8 @@ CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback::~CHIPEthernetNetworkD
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback::CallbackFn(void * context,
-                                                                           const chip::app::DataModel::Nullable<bool> & value)
+void CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7431,8 +7593,9 @@ void CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback::CallbackFn(void
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -7440,28 +7603,31 @@ void CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback::CallbackFn(void
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Boolean;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Boolean";
-        std::string javaValueCtorSignature = "(Z)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                   value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback::CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterCarrierDetectAttributeCallbackType>(CallbackFn, this),
+CHIPGeneralDiagnosticsAttributeListAttributeCallback::CHIPGeneralDiagnosticsAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPGeneralDiagnosticsClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -7478,7 +7644,7 @@ CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback::CHIPEthernetNetwor
     }
 }
 
-CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback::~CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback()
+CHIPGeneralDiagnosticsAttributeListAttributeCallback::~CHIPGeneralDiagnosticsAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7489,8 +7655,8 @@ CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback::~CHIPEthernetNetwo
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback::CallbackFn(void * context,
-                                                                              const chip::app::DataModel::Nullable<bool> & value)
+void CHIPGeneralDiagnosticsAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7498,8 +7664,9 @@ void CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback::CallbackFn(vo
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPGeneralDiagnosticsAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPGeneralDiagnosticsAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -7507,28 +7674,31 @@ void CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback::CallbackFn(vo
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Boolean;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Boolean";
-        std::string javaValueCtorSignature = "(Z)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                   value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback::
-    CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback::CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback(jobject javaCallback,
+                                                                                                             bool keepAlive) :
+    chip::Callback::Callback<CHIPSoftwareDiagnosticsClusterThreadMetricsAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -7545,8 +7715,7 @@ CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback::
-    ~CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback()
+CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback::~CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7557,8 +7726,10 @@ CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType> &
+        list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7567,8 +7738,8 @@ void CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback::Callba
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -7587,10 +7758,92 @@ void CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback::Callba
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        jobject newElement_0_id;
+        std::string newElement_0_idClassName     = "java/lang/Long";
+        std::string newElement_0_idCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(
+            newElement_0_idClassName.c_str(), newElement_0_idCtorSignature.c_str(), entry_0.id, newElement_0_id);
+        jobject newElement_0_name;
+        if (!entry_0.name.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_name);
+        }
+        else
+        {
+            jobject newElement_0_nameInsideOptional;
+            newElement_0_nameInsideOptional =
+                env->NewStringUTF(std::string(entry_0.name.Value().data(), entry_0.name.Value().size()).c_str());
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_nameInsideOptional, newElement_0_name);
+        }
+        jobject newElement_0_stackFreeCurrent;
+        if (!entry_0.stackFreeCurrent.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_stackFreeCurrent);
+        }
+        else
+        {
+            jobject newElement_0_stackFreeCurrentInsideOptional;
+            std::string newElement_0_stackFreeCurrentInsideOptionalClassName     = "java/lang/Long";
+            std::string newElement_0_stackFreeCurrentInsideOptionalCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                newElement_0_stackFreeCurrentInsideOptionalClassName.c_str(),
+                newElement_0_stackFreeCurrentInsideOptionalCtorSignature.c_str(), entry_0.stackFreeCurrent.Value(),
+                newElement_0_stackFreeCurrentInsideOptional);
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_stackFreeCurrentInsideOptional,
+                                                              newElement_0_stackFreeCurrent);
+        }
+        jobject newElement_0_stackFreeMinimum;
+        if (!entry_0.stackFreeMinimum.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_stackFreeMinimum);
+        }
+        else
+        {
+            jobject newElement_0_stackFreeMinimumInsideOptional;
+            std::string newElement_0_stackFreeMinimumInsideOptionalClassName     = "java/lang/Long";
+            std::string newElement_0_stackFreeMinimumInsideOptionalCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                newElement_0_stackFreeMinimumInsideOptionalClassName.c_str(),
+                newElement_0_stackFreeMinimumInsideOptionalCtorSignature.c_str(), entry_0.stackFreeMinimum.Value(),
+                newElement_0_stackFreeMinimumInsideOptional);
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_stackFreeMinimumInsideOptional,
+                                                              newElement_0_stackFreeMinimum);
+        }
+        jobject newElement_0_stackSize;
+        if (!entry_0.stackSize.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_stackSize);
+        }
+        else
+        {
+            jobject newElement_0_stackSizeInsideOptional;
+            std::string newElement_0_stackSizeInsideOptionalClassName     = "java/lang/Long";
+            std::string newElement_0_stackSizeInsideOptionalCtorSignature = "(J)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+                newElement_0_stackSizeInsideOptionalClassName.c_str(), newElement_0_stackSizeInsideOptionalCtorSignature.c_str(),
+                entry_0.stackSize.Value(), newElement_0_stackSizeInsideOptional);
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_stackSizeInsideOptional, newElement_0_stackSize);
+        }
+
+        jclass threadMetricsStructClass;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$SoftwareDiagnosticsClusterThreadMetrics", threadMetricsStructClass);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$SoftwareDiagnosticsClusterThreadMetrics");
+            return;
+        }
+        jmethodID threadMetricsStructCtor =
+            env->GetMethodID(threadMetricsStructClass, "<init>",
+                             "(Ljava/lang/Long;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V");
+        if (threadMetricsStructCtor == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$SoftwareDiagnosticsClusterThreadMetrics constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(threadMetricsStructClass, threadMetricsStructCtor, newElement_0_id, newElement_0_name,
+                                      newElement_0_stackFreeCurrent, newElement_0_stackFreeMinimum, newElement_0_stackSize);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -7598,9 +7851,9 @@ void CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback::Callba
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback::
-    CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback::CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPSoftwareDiagnosticsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -7617,8 +7870,7 @@ CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback::
     }
 }
 
-CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback::
-    ~CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback()
+CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback::~CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7629,7 +7881,7 @@ CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -7639,8 +7891,8 @@ void CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback::Callbac
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -7670,9 +7922,9 @@ void CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback::Callbac
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback::CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback(
+CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback::CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPSoftwareDiagnosticsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -7689,7 +7941,7 @@ CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback::CHIPEthernetNetwor
     }
 }
 
-CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback::~CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback()
+CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback::~CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7700,8 +7952,8 @@ CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback::~CHIPEthernetNetwo
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7710,8 +7962,8 @@ void CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -7741,8 +7993,10 @@ void CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPFanControlPercentSettingAttributeCallback::CHIPFanControlPercentSettingAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPFanControlClusterPercentSettingAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPSoftwareDiagnosticsAttributeListAttributeCallback::CHIPSoftwareDiagnosticsAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                             bool keepAlive) :
+    chip::Callback::Callback<CHIPSoftwareDiagnosticsClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7758,7 +8012,7 @@ CHIPFanControlPercentSettingAttributeCallback::CHIPFanControlPercentSettingAttri
     }
 }
 
-CHIPFanControlPercentSettingAttributeCallback::~CHIPFanControlPercentSettingAttributeCallback()
+CHIPSoftwareDiagnosticsAttributeListAttributeCallback::~CHIPSoftwareDiagnosticsAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7769,8 +8023,8 @@ CHIPFanControlPercentSettingAttributeCallback::~CHIPFanControlPercentSettingAttr
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPFanControlPercentSettingAttributeCallback::CallbackFn(void * context,
-                                                               const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPSoftwareDiagnosticsAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7778,8 +8032,9 @@ void CHIPFanControlPercentSettingAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPFanControlPercentSettingAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPFanControlPercentSettingAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPSoftwareDiagnosticsAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPSoftwareDiagnosticsAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -7787,27 +8042,32 @@ void CHIPFanControlPercentSettingAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPFanControlSpeedSettingAttributeCallback::CHIPFanControlSpeedSettingAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPFanControlClusterSpeedSettingAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPThreadNetworkDiagnosticsChannelAttributeCallback::CHIPThreadNetworkDiagnosticsChannelAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterChannelAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7823,7 +8083,7 @@ CHIPFanControlSpeedSettingAttributeCallback::CHIPFanControlSpeedSettingAttribute
     }
 }
 
-CHIPFanControlSpeedSettingAttributeCallback::~CHIPFanControlSpeedSettingAttributeCallback()
+CHIPThreadNetworkDiagnosticsChannelAttributeCallback::~CHIPThreadNetworkDiagnosticsChannelAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7834,7 +8094,8 @@ CHIPFanControlSpeedSettingAttributeCallback::~CHIPFanControlSpeedSettingAttribut
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPFanControlSpeedSettingAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPThreadNetworkDiagnosticsChannelAttributeCallback::CallbackFn(void * context,
+                                                                      const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7842,8 +8103,8 @@ void CHIPFanControlSpeedSettingAttributeCallback::CallbackFn(void * context, con
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPFanControlSpeedSettingAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPFanControlSpeedSettingAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsChannelAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsChannelAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -7863,16 +8124,16 @@ void CHIPFanControlSpeedSettingAttributeCallback::CallbackFn(void * context, con
     {
         std::string javaValueClassName     = "java/lang/Integer";
         std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPFanControlGeneratedCommandListAttributeCallback::CHIPFanControlGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                         bool keepAlive) :
-    chip::Callback::Callback<CHIPFanControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback::CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -7889,7 +8150,7 @@ CHIPFanControlGeneratedCommandListAttributeCallback::CHIPFanControlGeneratedComm
     }
 }
 
-CHIPFanControlGeneratedCommandListAttributeCallback::~CHIPFanControlGeneratedCommandListAttributeCallback()
+CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback::~CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7900,8 +8161,8 @@ CHIPFanControlGeneratedCommandListAttributeCallback::~CHIPFanControlGeneratedCom
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPFanControlGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7909,9 +8170,8 @@ void CHIPFanControlGeneratedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPFanControlGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPFanControlGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -7919,31 +8179,28 @@ void CHIPFanControlGeneratedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      static_cast<uint8_t>(value.Value()), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPFanControlAcceptedCommandListAttributeCallback::CHIPFanControlAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPFanControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback::CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterNetworkNameAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -7960,7 +8217,7 @@ CHIPFanControlAcceptedCommandListAttributeCallback::CHIPFanControlAcceptedComman
     }
 }
 
-CHIPFanControlAcceptedCommandListAttributeCallback::~CHIPFanControlAcceptedCommandListAttributeCallback()
+CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback::~CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7971,8 +8228,8 @@ CHIPFanControlAcceptedCommandListAttributeCallback::~CHIPFanControlAcceptedComma
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPFanControlAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::CharSpan> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7980,9 +8237,8 @@ void CHIPFanControlAcceptedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPFanControlAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPFanControlAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -7990,30 +8246,26 @@ void CHIPFanControlAcceptedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/String;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        javaValue = env->NewStringUTF(std::string(value.Value().data(), value.Value().size()).c_str());
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPFanControlAttributeListAttributeCallback::CHIPFanControlAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPFanControlClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPThreadNetworkDiagnosticsPanIdAttributeCallback::CHIPThreadNetworkDiagnosticsPanIdAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterPanIdAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -8029,7 +8281,7 @@ CHIPFanControlAttributeListAttributeCallback::CHIPFanControlAttributeListAttribu
     }
 }
 
-CHIPFanControlAttributeListAttributeCallback::~CHIPFanControlAttributeListAttributeCallback()
+CHIPThreadNetworkDiagnosticsPanIdAttributeCallback::~CHIPThreadNetworkDiagnosticsPanIdAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -8040,8 +8292,8 @@ CHIPFanControlAttributeListAttributeCallback::~CHIPFanControlAttributeListAttrib
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPFanControlAttributeListAttributeCallback::CallbackFn(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPThreadNetworkDiagnosticsPanIdAttributeCallback::CallbackFn(void * context,
+                                                                    const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8049,9 +8301,8 @@ void CHIPFanControlAttributeListAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPFanControlAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPFanControlAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsPanIdAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsPanIdAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -8059,30 +8310,29 @@ void CHIPFanControlAttributeListAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPFixedLabelLabelListAttributeCallback::CHIPFixedLabelLabelListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPFixedLabelClusterLabelListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback::CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterExtendedPanIdAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -8098,7 +8348,7 @@ CHIPFixedLabelLabelListAttributeCallback::CHIPFixedLabelLabelListAttributeCallba
     }
 }
 
-CHIPFixedLabelLabelListAttributeCallback::~CHIPFixedLabelLabelListAttributeCallback()
+CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback::~CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -8109,9 +8359,8 @@ CHIPFixedLabelLabelListAttributeCallback::~CHIPFixedLabelLabelListAttributeCallb
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPFixedLabelLabelListAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::FixedLabel::Structs::LabelStruct::DecodableType> & list)
+void CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback::CallbackFn(void * context,
+                                                                            const chip::app::DataModel::Nullable<uint64_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8119,9 +8368,8 @@ void CHIPFixedLabelLabelListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPFixedLabelLabelListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPFixedLabelLabelListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -8129,49 +8377,28 @@ void CHIPFixedLabelLabelListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        jobject newElement_0_label;
-        newElement_0_label = env->NewStringUTF(std::string(entry_0.label.data(), entry_0.label.size()).c_str());
-        jobject newElement_0_value;
-        newElement_0_value = env->NewStringUTF(std::string(entry_0.value.data(), entry_0.value.size()).c_str());
-
-        jclass labelStructStructClass;
-        err = chip::JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipStructs$FixedLabelClusterLabelStruct",
-                                                             labelStructStructClass);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$FixedLabelClusterLabelStruct");
-            return;
-        }
-        jmethodID labelStructStructCtor =
-            env->GetMethodID(labelStructStructClass, "<init>", "(Ljava/lang/String;Ljava/lang/String;)V");
-        if (labelStructStructCtor == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$FixedLabelClusterLabelStruct constructor");
-            return;
-        }
-
-        newElement_0 = env->NewObject(labelStructStructClass, labelStructStructCtor, newElement_0_label, newElement_0_value);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPFixedLabelGeneratedCommandListAttributeCallback::CHIPFixedLabelGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                         bool keepAlive) :
-    chip::Callback::Callback<CHIPFixedLabelClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback::CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterMeshLocalPrefixAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -8188,7 +8415,7 @@ CHIPFixedLabelGeneratedCommandListAttributeCallback::CHIPFixedLabelGeneratedComm
     }
 }
 
-CHIPFixedLabelGeneratedCommandListAttributeCallback::~CHIPFixedLabelGeneratedCommandListAttributeCallback()
+CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback::~CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -8199,8 +8426,8 @@ CHIPFixedLabelGeneratedCommandListAttributeCallback::~CHIPFixedLabelGeneratedCom
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPFixedLabelGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::ByteSpan> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8208,9 +8435,8 @@ void CHIPFixedLabelGeneratedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPFixedLabelGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPFixedLabelGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -8218,31 +8444,28 @@ void CHIPFixedLabelGeneratedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        jbyteArray javaValueByteArray = env->NewByteArray(static_cast<jsize>(value.Value().size()));
+        env->SetByteArrayRegion(javaValueByteArray, 0, static_cast<jsize>(value.Value().size()),
+                                reinterpret_cast<const jbyte *>(value.Value().data()));
+        javaValue = javaValueByteArray;
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPFixedLabelAcceptedCommandListAttributeCallback::CHIPFixedLabelAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPFixedLabelClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback::CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterNeighborTableListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -8259,7 +8482,7 @@ CHIPFixedLabelAcceptedCommandListAttributeCallback::CHIPFixedLabelAcceptedComman
     }
 }
 
-CHIPFixedLabelAcceptedCommandListAttributeCallback::~CHIPFixedLabelAcceptedCommandListAttributeCallback()
+CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback::~CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -8270,8 +8493,10 @@ CHIPFixedLabelAcceptedCommandListAttributeCallback::~CHIPFixedLabelAcceptedComma
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPFixedLabelAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8280,8 +8505,8 @@ void CHIPFixedLabelAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPFixedLabelAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPFixedLabelAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -8300,19 +8525,137 @@ void CHIPFixedLabelAcceptedCommandListAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
-    }
-
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-}
-
-CHIPFixedLabelAttributeListAttributeCallback::CHIPFixedLabelAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPFixedLabelClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+        jobject newElement_0_extAddress;
+        std::string newElement_0_extAddressClassName     = "java/lang/Long";
+        std::string newElement_0_extAddressCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_extAddressClassName.c_str(),
+                                                                       newElement_0_extAddressCtorSignature.c_str(),
+                                                                       entry_0.extAddress, newElement_0_extAddress);
+        jobject newElement_0_age;
+        std::string newElement_0_ageClassName     = "java/lang/Long";
+        std::string newElement_0_ageCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
+            newElement_0_ageClassName.c_str(), newElement_0_ageCtorSignature.c_str(), entry_0.age, newElement_0_age);
+        jobject newElement_0_rloc16;
+        std::string newElement_0_rloc16ClassName     = "java/lang/Integer";
+        std::string newElement_0_rloc16CtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+            newElement_0_rloc16ClassName.c_str(), newElement_0_rloc16CtorSignature.c_str(), entry_0.rloc16, newElement_0_rloc16);
+        jobject newElement_0_linkFrameCounter;
+        std::string newElement_0_linkFrameCounterClassName     = "java/lang/Long";
+        std::string newElement_0_linkFrameCounterCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0_linkFrameCounterClassName.c_str(),
+                                                                       newElement_0_linkFrameCounterCtorSignature.c_str(),
+                                                                       entry_0.linkFrameCounter, newElement_0_linkFrameCounter);
+        jobject newElement_0_mleFrameCounter;
+        std::string newElement_0_mleFrameCounterClassName     = "java/lang/Long";
+        std::string newElement_0_mleFrameCounterCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0_mleFrameCounterClassName.c_str(),
+                                                                       newElement_0_mleFrameCounterCtorSignature.c_str(),
+                                                                       entry_0.mleFrameCounter, newElement_0_mleFrameCounter);
+        jobject newElement_0_lqi;
+        std::string newElement_0_lqiClassName     = "java/lang/Integer";
+        std::string newElement_0_lqiCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+            newElement_0_lqiClassName.c_str(), newElement_0_lqiCtorSignature.c_str(), entry_0.lqi, newElement_0_lqi);
+        jobject newElement_0_averageRssi;
+        if (entry_0.averageRssi.IsNull())
+        {
+            newElement_0_averageRssi = nullptr;
+        }
+        else
+        {
+            std::string newElement_0_averageRssiClassName     = "java/lang/Integer";
+            std::string newElement_0_averageRssiCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(newElement_0_averageRssiClassName.c_str(),
+                                                                         newElement_0_averageRssiCtorSignature.c_str(),
+                                                                         entry_0.averageRssi.Value(), newElement_0_averageRssi);
+        }
+        jobject newElement_0_lastRssi;
+        if (entry_0.lastRssi.IsNull())
+        {
+            newElement_0_lastRssi = nullptr;
+        }
+        else
+        {
+            std::string newElement_0_lastRssiClassName     = "java/lang/Integer";
+            std::string newElement_0_lastRssiCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(newElement_0_lastRssiClassName.c_str(),
+                                                                         newElement_0_lastRssiCtorSignature.c_str(),
+                                                                         entry_0.lastRssi.Value(), newElement_0_lastRssi);
+        }
+        jobject newElement_0_frameErrorRate;
+        std::string newElement_0_frameErrorRateClassName     = "java/lang/Integer";
+        std::string newElement_0_frameErrorRateCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_frameErrorRateClassName.c_str(),
+                                                                      newElement_0_frameErrorRateCtorSignature.c_str(),
+                                                                      entry_0.frameErrorRate, newElement_0_frameErrorRate);
+        jobject newElement_0_messageErrorRate;
+        std::string newElement_0_messageErrorRateClassName     = "java/lang/Integer";
+        std::string newElement_0_messageErrorRateCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_messageErrorRateClassName.c_str(),
+                                                                      newElement_0_messageErrorRateCtorSignature.c_str(),
+                                                                      entry_0.messageErrorRate, newElement_0_messageErrorRate);
+        jobject newElement_0_rxOnWhenIdle;
+        std::string newElement_0_rxOnWhenIdleClassName     = "java/lang/Boolean";
+        std::string newElement_0_rxOnWhenIdleCtorSignature = "(Z)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_rxOnWhenIdleClassName.c_str(),
+                                                                   newElement_0_rxOnWhenIdleCtorSignature.c_str(),
+                                                                   entry_0.rxOnWhenIdle, newElement_0_rxOnWhenIdle);
+        jobject newElement_0_fullThreadDevice;
+        std::string newElement_0_fullThreadDeviceClassName     = "java/lang/Boolean";
+        std::string newElement_0_fullThreadDeviceCtorSignature = "(Z)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_fullThreadDeviceClassName.c_str(),
+                                                                   newElement_0_fullThreadDeviceCtorSignature.c_str(),
+                                                                   entry_0.fullThreadDevice, newElement_0_fullThreadDevice);
+        jobject newElement_0_fullNetworkData;
+        std::string newElement_0_fullNetworkDataClassName     = "java/lang/Boolean";
+        std::string newElement_0_fullNetworkDataCtorSignature = "(Z)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_fullNetworkDataClassName.c_str(),
+                                                                   newElement_0_fullNetworkDataCtorSignature.c_str(),
+                                                                   entry_0.fullNetworkData, newElement_0_fullNetworkData);
+        jobject newElement_0_isChild;
+        std::string newElement_0_isChildClassName     = "java/lang/Boolean";
+        std::string newElement_0_isChildCtorSignature = "(Z)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_isChildClassName.c_str(),
+                                                                   newElement_0_isChildCtorSignature.c_str(), entry_0.isChild,
+                                                                   newElement_0_isChild);
+
+        jclass neighborTableStructClass;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterNeighborTable", neighborTableStructClass);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterNeighborTable");
+            return;
+        }
+        jmethodID neighborTableStructCtor =
+            env->GetMethodID(neighborTableStructClass, "<init>",
+                             "(Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/"
+                             "Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/"
+                             "Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V");
+        if (neighborTableStructCtor == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterNeighborTable constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(neighborTableStructClass, neighborTableStructCtor, newElement_0_extAddress, newElement_0_age,
+                                      newElement_0_rloc16, newElement_0_linkFrameCounter, newElement_0_mleFrameCounter,
+                                      newElement_0_lqi, newElement_0_averageRssi, newElement_0_lastRssi,
+                                      newElement_0_frameErrorRate, newElement_0_messageErrorRate, newElement_0_rxOnWhenIdle,
+                                      newElement_0_fullThreadDevice, newElement_0_fullNetworkData, newElement_0_isChild);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback::CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterRouteTableListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -8328,7 +8671,7 @@ CHIPFixedLabelAttributeListAttributeCallback::CHIPFixedLabelAttributeListAttribu
     }
 }
 
-CHIPFixedLabelAttributeListAttributeCallback::~CHIPFixedLabelAttributeListAttributeCallback()
+CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback::~CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -8339,8 +8682,10 @@ CHIPFixedLabelAttributeListAttributeCallback::~CHIPFixedLabelAttributeListAttrib
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPFixedLabelAttributeListAttributeCallback::CallbackFn(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> &
+        list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8349,8 +8694,8 @@ void CHIPFixedLabelAttributeListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPFixedLabelAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPFixedLabelAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -8369,10 +8714,84 @@ void CHIPFixedLabelAttributeListAttributeCallback::CallbackFn(void * context,
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        jobject newElement_0_extAddress;
+        std::string newElement_0_extAddressClassName     = "java/lang/Long";
+        std::string newElement_0_extAddressCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_extAddressClassName.c_str(),
+                                                                       newElement_0_extAddressCtorSignature.c_str(),
+                                                                       entry_0.extAddress, newElement_0_extAddress);
+        jobject newElement_0_rloc16;
+        std::string newElement_0_rloc16ClassName     = "java/lang/Integer";
+        std::string newElement_0_rloc16CtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+            newElement_0_rloc16ClassName.c_str(), newElement_0_rloc16CtorSignature.c_str(), entry_0.rloc16, newElement_0_rloc16);
+        jobject newElement_0_routerId;
+        std::string newElement_0_routerIdClassName     = "java/lang/Integer";
+        std::string newElement_0_routerIdCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_routerIdClassName.c_str(),
+                                                                      newElement_0_routerIdCtorSignature.c_str(), entry_0.routerId,
+                                                                      newElement_0_routerId);
+        jobject newElement_0_nextHop;
+        std::string newElement_0_nextHopClassName     = "java/lang/Integer";
+        std::string newElement_0_nextHopCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_nextHopClassName.c_str(),
+                                                                      newElement_0_nextHopCtorSignature.c_str(), entry_0.nextHop,
+                                                                      newElement_0_nextHop);
+        jobject newElement_0_pathCost;
+        std::string newElement_0_pathCostClassName     = "java/lang/Integer";
+        std::string newElement_0_pathCostCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_pathCostClassName.c_str(),
+                                                                      newElement_0_pathCostCtorSignature.c_str(), entry_0.pathCost,
+                                                                      newElement_0_pathCost);
+        jobject newElement_0_LQIIn;
+        std::string newElement_0_LQIInClassName     = "java/lang/Integer";
+        std::string newElement_0_LQIInCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+            newElement_0_LQIInClassName.c_str(), newElement_0_LQIInCtorSignature.c_str(), entry_0.LQIIn, newElement_0_LQIIn);
+        jobject newElement_0_LQIOut;
+        std::string newElement_0_LQIOutClassName     = "java/lang/Integer";
+        std::string newElement_0_LQIOutCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+            newElement_0_LQIOutClassName.c_str(), newElement_0_LQIOutCtorSignature.c_str(), entry_0.LQIOut, newElement_0_LQIOut);
+        jobject newElement_0_age;
+        std::string newElement_0_ageClassName     = "java/lang/Integer";
+        std::string newElement_0_ageCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+            newElement_0_ageClassName.c_str(), newElement_0_ageCtorSignature.c_str(), entry_0.age, newElement_0_age);
+        jobject newElement_0_allocated;
+        std::string newElement_0_allocatedClassName     = "java/lang/Boolean";
+        std::string newElement_0_allocatedCtorSignature = "(Z)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_allocatedClassName.c_str(),
+                                                                   newElement_0_allocatedCtorSignature.c_str(), entry_0.allocated,
+                                                                   newElement_0_allocated);
+        jobject newElement_0_linkEstablished;
+        std::string newElement_0_linkEstablishedClassName     = "java/lang/Boolean";
+        std::string newElement_0_linkEstablishedCtorSignature = "(Z)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_linkEstablishedClassName.c_str(),
+                                                                   newElement_0_linkEstablishedCtorSignature.c_str(),
+                                                                   entry_0.linkEstablished, newElement_0_linkEstablished);
+
+        jclass routeTableStructClass;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterRouteTable", routeTableStructClass);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterRouteTable");
+            return;
+        }
+        jmethodID routeTableStructCtor =
+            env->GetMethodID(routeTableStructClass, "<init>",
+                             "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/"
+                             "lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Boolean;)V");
+        if (routeTableStructCtor == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterRouteTable constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(routeTableStructClass, routeTableStructCtor, newElement_0_extAddress, newElement_0_rloc16,
+                                      newElement_0_routerId, newElement_0_nextHop, newElement_0_pathCost, newElement_0_LQIIn,
+                                      newElement_0_LQIOut, newElement_0_age, newElement_0_allocated, newElement_0_linkEstablished);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -8380,9 +8799,9 @@ void CHIPFixedLabelAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPFlowMeasurementMeasuredValueAttributeCallback::CHIPFlowMeasurementMeasuredValueAttributeCallback(jobject javaCallback,
-                                                                                                     bool keepAlive) :
-    chip::Callback::Callback<CHIPFlowMeasurementClusterMeasuredValueAttributeCallbackType>(CallbackFn, this),
+CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback::CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterPartitionIdAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -8399,7 +8818,7 @@ CHIPFlowMeasurementMeasuredValueAttributeCallback::CHIPFlowMeasurementMeasuredVa
     }
 }
 
-CHIPFlowMeasurementMeasuredValueAttributeCallback::~CHIPFlowMeasurementMeasuredValueAttributeCallback()
+CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback::~CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -8410,8 +8829,8 @@ CHIPFlowMeasurementMeasuredValueAttributeCallback::~CHIPFlowMeasurementMeasuredV
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPFlowMeasurementMeasuredValueAttributeCallback::CallbackFn(void * context,
-                                                                   const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback::CallbackFn(void * context,
+                                                                          const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8419,8 +8838,8 @@ void CHIPFlowMeasurementMeasuredValueAttributeCallback::CallbackFn(void * contex
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPFlowMeasurementMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPFlowMeasurementMeasuredValueAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -8428,7 +8847,7 @@ void CHIPFlowMeasurementMeasuredValueAttributeCallback::CallbackFn(void * contex
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
@@ -8438,20 +8857,20 @@ void CHIPFlowMeasurementMeasuredValueAttributeCallback::CallbackFn(void * contex
     }
     else
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
                                                                        value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPFlowMeasurementMinMeasuredValueAttributeCallback::CHIPFlowMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPFlowMeasurementClusterMinMeasuredValueAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
-{
+CHIPThreadNetworkDiagnosticsWeightingAttributeCallback::CHIPThreadNetworkDiagnosticsWeightingAttributeCallback(jobject javaCallback,
+                                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterWeightingAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
     {
@@ -8466,7 +8885,7 @@ CHIPFlowMeasurementMinMeasuredValueAttributeCallback::CHIPFlowMeasurementMinMeas
     }
 }
 
-CHIPFlowMeasurementMinMeasuredValueAttributeCallback::~CHIPFlowMeasurementMinMeasuredValueAttributeCallback()
+CHIPThreadNetworkDiagnosticsWeightingAttributeCallback::~CHIPThreadNetworkDiagnosticsWeightingAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -8477,8 +8896,8 @@ CHIPFlowMeasurementMinMeasuredValueAttributeCallback::~CHIPFlowMeasurementMinMea
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPFlowMeasurementMinMeasuredValueAttributeCallback::CallbackFn(void * context,
-                                                                      const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPThreadNetworkDiagnosticsWeightingAttributeCallback::CallbackFn(void * context,
+                                                                        const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8486,8 +8905,8 @@ void CHIPFlowMeasurementMinMeasuredValueAttributeCallback::CallbackFn(void * con
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPFlowMeasurementMinMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPFlowMeasurementMinMeasuredValueAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsWeightingAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsWeightingAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -8507,16 +8926,16 @@ void CHIPFlowMeasurementMinMeasuredValueAttributeCallback::CallbackFn(void * con
     {
         std::string javaValueClassName     = "java/lang/Integer";
         std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPFlowMeasurementMaxMeasuredValueAttributeCallback::CHIPFlowMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPFlowMeasurementClusterMaxMeasuredValueAttributeCallbackType>(CallbackFn, this),
+CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback::CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterDataVersionAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -8533,7 +8952,7 @@ CHIPFlowMeasurementMaxMeasuredValueAttributeCallback::CHIPFlowMeasurementMaxMeas
     }
 }
 
-CHIPFlowMeasurementMaxMeasuredValueAttributeCallback::~CHIPFlowMeasurementMaxMeasuredValueAttributeCallback()
+CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback::~CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -8544,8 +8963,8 @@ CHIPFlowMeasurementMaxMeasuredValueAttributeCallback::~CHIPFlowMeasurementMaxMea
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPFlowMeasurementMaxMeasuredValueAttributeCallback::CallbackFn(void * context,
-                                                                      const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback::CallbackFn(void * context,
+                                                                          const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8553,8 +8972,8 @@ void CHIPFlowMeasurementMaxMeasuredValueAttributeCallback::CallbackFn(void * con
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPFlowMeasurementMaxMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPFlowMeasurementMaxMeasuredValueAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -8574,16 +8993,16 @@ void CHIPFlowMeasurementMaxMeasuredValueAttributeCallback::CallbackFn(void * con
     {
         std::string javaValueClassName     = "java/lang/Integer";
         std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPFlowMeasurementGeneratedCommandListAttributeCallback::CHIPFlowMeasurementGeneratedCommandListAttributeCallback(
+CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback::CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPFlowMeasurementClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterStableDataVersionAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -8600,7 +9019,7 @@ CHIPFlowMeasurementGeneratedCommandListAttributeCallback::CHIPFlowMeasurementGen
     }
 }
 
-CHIPFlowMeasurementGeneratedCommandListAttributeCallback::~CHIPFlowMeasurementGeneratedCommandListAttributeCallback()
+CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback::~CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -8611,8 +9030,8 @@ CHIPFlowMeasurementGeneratedCommandListAttributeCallback::~CHIPFlowMeasurementGe
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPFlowMeasurementGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8620,9 +9039,8 @@ void CHIPFlowMeasurementGeneratedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPFlowMeasurementGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPFlowMeasurementGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -8630,31 +9048,28 @@ void CHIPFlowMeasurementGeneratedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPFlowMeasurementAcceptedCommandListAttributeCallback::CHIPFlowMeasurementAcceptedCommandListAttributeCallback(
+CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback::CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPFlowMeasurementClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterLeaderRouterIdAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -8671,7 +9086,7 @@ CHIPFlowMeasurementAcceptedCommandListAttributeCallback::CHIPFlowMeasurementAcce
     }
 }
 
-CHIPFlowMeasurementAcceptedCommandListAttributeCallback::~CHIPFlowMeasurementAcceptedCommandListAttributeCallback()
+CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback::~CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -8682,8 +9097,8 @@ CHIPFlowMeasurementAcceptedCommandListAttributeCallback::~CHIPFlowMeasurementAcc
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPFlowMeasurementAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback::CallbackFn(void * context,
+                                                                             const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8691,9 +9106,8 @@ void CHIPFlowMeasurementAcceptedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPFlowMeasurementAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPFlowMeasurementAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -8701,31 +9115,28 @@ void CHIPFlowMeasurementAcceptedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPFlowMeasurementAttributeListAttributeCallback::CHIPFlowMeasurementAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                     bool keepAlive) :
-    chip::Callback::Callback<CHIPFlowMeasurementClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback::CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterActiveTimestampAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -8742,7 +9153,7 @@ CHIPFlowMeasurementAttributeListAttributeCallback::CHIPFlowMeasurementAttributeL
     }
 }
 
-CHIPFlowMeasurementAttributeListAttributeCallback::~CHIPFlowMeasurementAttributeListAttributeCallback()
+CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback::~CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -8753,8 +9164,8 @@ CHIPFlowMeasurementAttributeListAttributeCallback::~CHIPFlowMeasurementAttribute
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPFlowMeasurementAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint64_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8762,9 +9173,8 @@ void CHIPFlowMeasurementAttributeListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPFlowMeasurementAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPFlowMeasurementAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -8772,31 +9182,28 @@ void CHIPFlowMeasurementAttributeListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPGeneralCommissioningGeneratedCommandListAttributeCallback::CHIPGeneralCommissioningGeneratedCommandListAttributeCallback(
+CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback::CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPGeneralCommissioningClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterPendingTimestampAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -8813,7 +9220,7 @@ CHIPGeneralCommissioningGeneratedCommandListAttributeCallback::CHIPGeneralCommis
     }
 }
 
-CHIPGeneralCommissioningGeneratedCommandListAttributeCallback::~CHIPGeneralCommissioningGeneratedCommandListAttributeCallback()
+CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback::~CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -8824,8 +9231,8 @@ CHIPGeneralCommissioningGeneratedCommandListAttributeCallback::~CHIPGeneralCommi
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPGeneralCommissioningGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint64_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8833,9 +9240,8 @@ void CHIPGeneralCommissioningGeneratedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPGeneralCommissioningGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPGeneralCommissioningGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -8843,31 +9249,28 @@ void CHIPGeneralCommissioningGeneratedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPGeneralCommissioningAcceptedCommandListAttributeCallback::CHIPGeneralCommissioningAcceptedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPGeneralCommissioningClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPThreadNetworkDiagnosticsDelayAttributeCallback::CHIPThreadNetworkDiagnosticsDelayAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterDelayAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -8884,7 +9287,7 @@ CHIPGeneralCommissioningAcceptedCommandListAttributeCallback::CHIPGeneralCommiss
     }
 }
 
-CHIPGeneralCommissioningAcceptedCommandListAttributeCallback::~CHIPGeneralCommissioningAcceptedCommandListAttributeCallback()
+CHIPThreadNetworkDiagnosticsDelayAttributeCallback::~CHIPThreadNetworkDiagnosticsDelayAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -8895,8 +9298,8 @@ CHIPGeneralCommissioningAcceptedCommandListAttributeCallback::~CHIPGeneralCommis
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPGeneralCommissioningAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPThreadNetworkDiagnosticsDelayAttributeCallback::CallbackFn(void * context,
+                                                                    const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8904,9 +9307,8 @@ void CHIPGeneralCommissioningAcceptedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPGeneralCommissioningAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPGeneralCommissioningAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsDelayAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsDelayAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -8914,31 +9316,28 @@ void CHIPGeneralCommissioningAcceptedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPGeneralCommissioningAttributeListAttributeCallback::CHIPGeneralCommissioningAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPGeneralCommissioningClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback::CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterChannelMaskAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -8955,7 +9354,7 @@ CHIPGeneralCommissioningAttributeListAttributeCallback::CHIPGeneralCommissioning
     }
 }
 
-CHIPGeneralCommissioningAttributeListAttributeCallback::~CHIPGeneralCommissioningAttributeListAttributeCallback()
+CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback::~CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -8966,8 +9365,8 @@ CHIPGeneralCommissioningAttributeListAttributeCallback::~CHIPGeneralCommissionin
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPGeneralCommissioningAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::ByteSpan> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8975,9 +9374,8 @@ void CHIPGeneralCommissioningAttributeListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPGeneralCommissioningAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPGeneralCommissioningAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -8985,31 +9383,28 @@ void CHIPGeneralCommissioningAttributeListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        jbyteArray javaValueByteArray = env->NewByteArray(static_cast<jsize>(value.Value().size()));
+        env->SetByteArrayRegion(javaValueByteArray, 0, static_cast<jsize>(value.Value().size()),
+                                reinterpret_cast<const jbyte *>(value.Value().data()));
+        javaValue = javaValueByteArray;
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback::CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPGeneralDiagnosticsClusterNetworkInterfacesAttributeCallbackType>(CallbackFn, this),
+CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback::
+    CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterActiveNetworkFaultsListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -9026,7 +9421,8 @@ CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback::CHIPGeneralDiagnostics
     }
 }
 
-CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback::~CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback()
+CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback::
+    ~CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -9037,10 +9433,8 @@ CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback::~CHIPGeneralDiagnostic
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> & list)
+void CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -9049,8 +9443,8 @@ void CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -9069,105 +9463,10 @@ void CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        jobject newElement_0_name;
-        newElement_0_name = env->NewStringUTF(std::string(entry_0.name.data(), entry_0.name.size()).c_str());
-        jobject newElement_0_isOperational;
-        std::string newElement_0_isOperationalClassName     = "java/lang/Boolean";
-        std::string newElement_0_isOperationalCtorSignature = "(Z)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_isOperationalClassName.c_str(),
-                                                                   newElement_0_isOperationalCtorSignature.c_str(),
-                                                                   entry_0.isOperational, newElement_0_isOperational);
-        jobject newElement_0_offPremiseServicesReachableIPv4;
-        if (entry_0.offPremiseServicesReachableIPv4.IsNull())
-        {
-            newElement_0_offPremiseServicesReachableIPv4 = nullptr;
-        }
-        else
-        {
-            std::string newElement_0_offPremiseServicesReachableIPv4ClassName     = "java/lang/Boolean";
-            std::string newElement_0_offPremiseServicesReachableIPv4CtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                newElement_0_offPremiseServicesReachableIPv4ClassName.c_str(),
-                newElement_0_offPremiseServicesReachableIPv4CtorSignature.c_str(), entry_0.offPremiseServicesReachableIPv4.Value(),
-                newElement_0_offPremiseServicesReachableIPv4);
-        }
-        jobject newElement_0_offPremiseServicesReachableIPv6;
-        if (entry_0.offPremiseServicesReachableIPv6.IsNull())
-        {
-            newElement_0_offPremiseServicesReachableIPv6 = nullptr;
-        }
-        else
-        {
-            std::string newElement_0_offPremiseServicesReachableIPv6ClassName     = "java/lang/Boolean";
-            std::string newElement_0_offPremiseServicesReachableIPv6CtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                newElement_0_offPremiseServicesReachableIPv6ClassName.c_str(),
-                newElement_0_offPremiseServicesReachableIPv6CtorSignature.c_str(), entry_0.offPremiseServicesReachableIPv6.Value(),
-                newElement_0_offPremiseServicesReachableIPv6);
-        }
-        jobject newElement_0_hardwareAddress;
-        jbyteArray newElement_0_hardwareAddressByteArray = env->NewByteArray(static_cast<jsize>(entry_0.hardwareAddress.size()));
-        env->SetByteArrayRegion(newElement_0_hardwareAddressByteArray, 0, static_cast<jsize>(entry_0.hardwareAddress.size()),
-                                reinterpret_cast<const jbyte *>(entry_0.hardwareAddress.data()));
-        newElement_0_hardwareAddress = newElement_0_hardwareAddressByteArray;
-        jobject newElement_0_IPv4Addresses;
-        chip::JniReferences::GetInstance().CreateArrayList(newElement_0_IPv4Addresses);
-
-        auto iter_newElement_0_IPv4Addresses_2 = entry_0.IPv4Addresses.begin();
-        while (iter_newElement_0_IPv4Addresses_2.Next())
-        {
-            auto & entry_2 = iter_newElement_0_IPv4Addresses_2.GetValue();
-            jobject newElement_2;
-            jbyteArray newElement_2ByteArray = env->NewByteArray(static_cast<jsize>(entry_2.size()));
-            env->SetByteArrayRegion(newElement_2ByteArray, 0, static_cast<jsize>(entry_2.size()),
-                                    reinterpret_cast<const jbyte *>(entry_2.data()));
-            newElement_2 = newElement_2ByteArray;
-            chip::JniReferences::GetInstance().AddToList(newElement_0_IPv4Addresses, newElement_2);
-        }
-        jobject newElement_0_IPv6Addresses;
-        chip::JniReferences::GetInstance().CreateArrayList(newElement_0_IPv6Addresses);
-
-        auto iter_newElement_0_IPv6Addresses_2 = entry_0.IPv6Addresses.begin();
-        while (iter_newElement_0_IPv6Addresses_2.Next())
-        {
-            auto & entry_2 = iter_newElement_0_IPv6Addresses_2.GetValue();
-            jobject newElement_2;
-            jbyteArray newElement_2ByteArray = env->NewByteArray(static_cast<jsize>(entry_2.size()));
-            env->SetByteArrayRegion(newElement_2ByteArray, 0, static_cast<jsize>(entry_2.size()),
-                                    reinterpret_cast<const jbyte *>(entry_2.data()));
-            newElement_2 = newElement_2ByteArray;
-            chip::JniReferences::GetInstance().AddToList(newElement_0_IPv6Addresses, newElement_2);
-        }
-        jobject newElement_0_type;
-        std::string newElement_0_typeClassName     = "java/lang/Integer";
-        std::string newElement_0_typeCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_typeClassName.c_str(),
-                                                                      newElement_0_typeCtorSignature.c_str(),
-                                                                      static_cast<uint8_t>(entry_0.type), newElement_0_type);
-
-        jclass networkInterfaceTypeStructClass;
-        err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$GeneralDiagnosticsClusterNetworkInterfaceType",
-            networkInterfaceTypeStructClass);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$GeneralDiagnosticsClusterNetworkInterfaceType");
-            return;
-        }
-        jmethodID networkInterfaceTypeStructCtor =
-            env->GetMethodID(networkInterfaceTypeStructClass, "<init>",
-                             "(Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;[BLjava/util/"
-                             "ArrayList;Ljava/util/ArrayList;Ljava/lang/Integer;)V");
-        if (networkInterfaceTypeStructCtor == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$GeneralDiagnosticsClusterNetworkInterfaceType constructor");
-            return;
-        }
-
-        newElement_0 = env->NewObject(networkInterfaceTypeStructClass, networkInterfaceTypeStructCtor, newElement_0_name,
-                                      newElement_0_isOperational, newElement_0_offPremiseServicesReachableIPv4,
-                                      newElement_0_offPremiseServicesReachableIPv6, newElement_0_hardwareAddress,
-                                      newElement_0_IPv4Addresses, newElement_0_IPv6Addresses, newElement_0_type);
+        std::string newElement_0ClassName     = "java/lang/Integer";
+        std::string newElement_0CtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), static_cast<uint8_t>(entry_0), newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -9175,9 +9474,9 @@ void CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback::CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPGeneralDiagnosticsClusterActiveHardwareFaultsAttributeCallbackType>(CallbackFn, this),
+CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback::
+    CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -9194,7 +9493,8 @@ CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback::CHIPGeneralDiagnost
     }
 }
 
-CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback::~CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback()
+CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback::
+    ~CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -9205,8 +9505,8 @@ CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback::~CHIPGeneralDiagnos
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<uint8_t> & list)
+void CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -9215,8 +9515,8 @@ void CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -9235,10 +9535,10 @@ void CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Integer";
-        std::string newElement_0CtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0ClassName.c_str(),
-                                                                      newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -9246,9 +9546,9 @@ void CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback::CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback(
+CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback::CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPGeneralDiagnosticsClusterActiveRadioFaultsAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -9265,7 +9565,8 @@ CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback::CHIPGeneralDiagnostics
     }
 }
 
-CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback::~CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback()
+CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback::
+    ~CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -9276,8 +9577,8 @@ CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback::~CHIPGeneralDiagnostic
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback::CallbackFn(void * context,
-                                                                          const chip::app::DataModel::DecodableList<uint8_t> & list)
+void CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -9286,8 +9587,8 @@ void CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback::CallbackFn(void *
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -9306,10 +9607,10 @@ void CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback::CallbackFn(void *
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Integer";
-        std::string newElement_0CtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0ClassName.c_str(),
-                                                                      newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -9317,9 +9618,9 @@ void CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback::CallbackFn(void *
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback::CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback(
+CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback::CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPGeneralDiagnosticsClusterActiveNetworkFaultsAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -9336,7 +9637,7 @@ CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback::CHIPGeneralDiagnosti
     }
 }
 
-CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback::~CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback()
+CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback::~CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -9347,8 +9648,8 @@ CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback::~CHIPGeneralDiagnost
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<uint8_t> & list)
+void CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -9357,8 +9658,8 @@ void CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -9377,10 +9678,10 @@ void CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Integer";
-        std::string newElement_0CtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0ClassName.c_str(),
-                                                                      newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -9388,9 +9689,9 @@ void CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback::CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPGeneralDiagnosticsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPWiFiNetworkDiagnosticsBssidAttributeCallback::CHIPWiFiNetworkDiagnosticsBssidAttributeCallback(jobject javaCallback,
+                                                                                                   bool keepAlive) :
+    chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterBssidAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -9407,7 +9708,7 @@ CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback::CHIPGeneralDiagnost
     }
 }
 
-CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback::~CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback()
+CHIPWiFiNetworkDiagnosticsBssidAttributeCallback::~CHIPWiFiNetworkDiagnosticsBssidAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -9418,8 +9719,8 @@ CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback::~CHIPGeneralDiagnos
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPWiFiNetworkDiagnosticsBssidAttributeCallback::CallbackFn(void * context,
+                                                                  const chip::app::DataModel::Nullable<chip::ByteSpan> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -9427,9 +9728,8 @@ void CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPWiFiNetworkDiagnosticsBssidAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPWiFiNetworkDiagnosticsBssidAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -9437,31 +9737,28 @@ void CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        jbyteArray javaValueByteArray = env->NewByteArray(static_cast<jsize>(value.Value().size()));
+        env->SetByteArrayRegion(javaValueByteArray, 0, static_cast<jsize>(value.Value().size()),
+                                reinterpret_cast<const jbyte *>(value.Value().data()));
+        javaValue = javaValueByteArray;
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback::CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback(
+CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback::CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPGeneralDiagnosticsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterSecurityTypeAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -9478,7 +9775,7 @@ CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback::CHIPGeneralDiagnosti
     }
 }
 
-CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback::~CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback()
+CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback::~CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -9489,8 +9786,8 @@ CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback::~CHIPGeneralDiagnost
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::WiFiNetworkDiagnostics::SecurityType> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -9498,9 +9795,8 @@ void CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -9508,31 +9804,28 @@ void CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      static_cast<uint8_t>(value.Value()), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPGeneralDiagnosticsAttributeListAttributeCallback::CHIPGeneralDiagnosticsAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPGeneralDiagnosticsClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback::CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback(jobject javaCallback,
+                                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterWiFiVersionAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -9549,7 +9842,7 @@ CHIPGeneralDiagnosticsAttributeListAttributeCallback::CHIPGeneralDiagnosticsAttr
     }
 }
 
-CHIPGeneralDiagnosticsAttributeListAttributeCallback::~CHIPGeneralDiagnosticsAttributeListAttributeCallback()
+CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback::~CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -9560,8 +9853,8 @@ CHIPGeneralDiagnosticsAttributeListAttributeCallback::~CHIPGeneralDiagnosticsAtt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPGeneralDiagnosticsAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::WiFiNetworkDiagnostics::WiFiVersionType> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -9569,9 +9862,8 @@ void CHIPGeneralDiagnosticsAttributeListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPGeneralDiagnosticsAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPGeneralDiagnosticsAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -9579,31 +9871,28 @@ void CHIPGeneralDiagnosticsAttributeListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      static_cast<uint8_t>(value.Value()), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPGroupKeyManagementGroupKeyMapAttributeCallback::CHIPGroupKeyManagementGroupKeyMapAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPGroupKeyManagementClusterGroupKeyMapAttributeCallbackType>(CallbackFn, this),
+CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback::CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterChannelNumberAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -9620,7 +9909,7 @@ CHIPGroupKeyManagementGroupKeyMapAttributeCallback::CHIPGroupKeyManagementGroupK
     }
 }
 
-CHIPGroupKeyManagementGroupKeyMapAttributeCallback::~CHIPGroupKeyManagementGroupKeyMapAttributeCallback()
+CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback::~CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -9631,10 +9920,8 @@ CHIPGroupKeyManagementGroupKeyMapAttributeCallback::~CHIPGroupKeyManagementGroup
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPGroupKeyManagementGroupKeyMapAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::DecodableType> &
-        list)
+void CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback::CallbackFn(void * context,
+                                                                          const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -9642,9 +9929,8 @@ void CHIPGroupKeyManagementGroupKeyMapAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPGroupKeyManagementGroupKeyMapAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPGroupKeyManagementGroupKeyMapAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -9652,64 +9938,28 @@ void CHIPGroupKeyManagementGroupKeyMapAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        jobject newElement_0_groupId;
-        std::string newElement_0_groupIdClassName     = "java/lang/Integer";
-        std::string newElement_0_groupIdCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_groupIdClassName.c_str(),
-                                                                       newElement_0_groupIdCtorSignature.c_str(), entry_0.groupId,
-                                                                       newElement_0_groupId);
-        jobject newElement_0_groupKeySetID;
-        std::string newElement_0_groupKeySetIDClassName     = "java/lang/Integer";
-        std::string newElement_0_groupKeySetIDCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_groupKeySetIDClassName.c_str(),
-                                                                       newElement_0_groupKeySetIDCtorSignature.c_str(),
-                                                                       entry_0.groupKeySetID, newElement_0_groupKeySetID);
-        jobject newElement_0_fabricIndex;
-        std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
-        std::string newElement_0_fabricIndexCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
-                                                                      newElement_0_fabricIndexCtorSignature.c_str(),
-                                                                      entry_0.fabricIndex, newElement_0_fabricIndex);
-
-        jclass groupKeyMapStructStructClass;
-        err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$GroupKeyManagementClusterGroupKeyMapStruct", groupKeyMapStructStructClass);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$GroupKeyManagementClusterGroupKeyMapStruct");
-            return;
-        }
-        jmethodID groupKeyMapStructStructCtor = env->GetMethodID(groupKeyMapStructStructClass, "<init>",
-                                                                 "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V");
-        if (groupKeyMapStructStructCtor == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$GroupKeyManagementClusterGroupKeyMapStruct constructor");
-            return;
-        }
-
-        newElement_0 = env->NewObject(groupKeyMapStructStructClass, groupKeyMapStructStructCtor, newElement_0_groupId,
-                                      newElement_0_groupKeySetID, newElement_0_fabricIndex);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPGroupKeyManagementGroupTableAttributeCallback::CHIPGroupKeyManagementGroupTableAttributeCallback(jobject javaCallback,
-                                                                                                     bool keepAlive) :
-    chip::Callback::Callback<CHIPGroupKeyManagementClusterGroupTableAttributeCallbackType>(CallbackFn, this),
+CHIPWiFiNetworkDiagnosticsRssiAttributeCallback::CHIPWiFiNetworkDiagnosticsRssiAttributeCallback(jobject javaCallback,
+                                                                                                 bool keepAlive) :
+    chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterRssiAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -9726,7 +9976,7 @@ CHIPGroupKeyManagementGroupTableAttributeCallback::CHIPGroupKeyManagementGroupTa
     }
 }
 
-CHIPGroupKeyManagementGroupTableAttributeCallback::~CHIPGroupKeyManagementGroupTableAttributeCallback()
+CHIPWiFiNetworkDiagnosticsRssiAttributeCallback::~CHIPWiFiNetworkDiagnosticsRssiAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -9737,10 +9987,8 @@ CHIPGroupKeyManagementGroupTableAttributeCallback::~CHIPGroupKeyManagementGroupT
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPGroupKeyManagementGroupTableAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupInfoMapStruct::DecodableType> &
-        list)
+void CHIPWiFiNetworkDiagnosticsRssiAttributeCallback::CallbackFn(void * context,
+                                                                 const chip::app::DataModel::Nullable<int8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -9748,9 +9996,8 @@ void CHIPGroupKeyManagementGroupTableAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPGroupKeyManagementGroupTableAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPGroupKeyManagementGroupTableAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPWiFiNetworkDiagnosticsRssiAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPWiFiNetworkDiagnosticsRssiAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -9758,93 +10005,36 @@ void CHIPGroupKeyManagementGroupTableAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                     value.Value(), javaValue);
+    }
 
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback::CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        jobject newElement_0_groupId;
-        std::string newElement_0_groupIdClassName     = "java/lang/Integer";
-        std::string newElement_0_groupIdCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_groupIdClassName.c_str(),
-                                                                       newElement_0_groupIdCtorSignature.c_str(), entry_0.groupId,
-                                                                       newElement_0_groupId);
-        jobject newElement_0_endpoints;
-        chip::JniReferences::GetInstance().CreateArrayList(newElement_0_endpoints);
-
-        auto iter_newElement_0_endpoints_2 = entry_0.endpoints.begin();
-        while (iter_newElement_0_endpoints_2.Next())
-        {
-            auto & entry_2 = iter_newElement_0_endpoints_2.GetValue();
-            jobject newElement_2;
-            std::string newElement_2ClassName     = "java/lang/Integer";
-            std::string newElement_2CtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-                newElement_2ClassName.c_str(), newElement_2CtorSignature.c_str(), entry_2, newElement_2);
-            chip::JniReferences::GetInstance().AddToList(newElement_0_endpoints, newElement_2);
-        }
-        jobject newElement_0_groupName;
-        if (!entry_0.groupName.HasValue())
-        {
-            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_groupName);
-        }
-        else
-        {
-            jobject newElement_0_groupNameInsideOptional;
-            newElement_0_groupNameInsideOptional =
-                env->NewStringUTF(std::string(entry_0.groupName.Value().data(), entry_0.groupName.Value().size()).c_str());
-            chip::JniReferences::GetInstance().CreateOptional(newElement_0_groupNameInsideOptional, newElement_0_groupName);
-        }
-        jobject newElement_0_fabricIndex;
-        std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
-        std::string newElement_0_fabricIndexCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
-                                                                      newElement_0_fabricIndexCtorSignature.c_str(),
-                                                                      entry_0.fabricIndex, newElement_0_fabricIndex);
-
-        jclass groupInfoMapStructStructClass;
-        err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$GroupKeyManagementClusterGroupInfoMapStruct", groupInfoMapStructStructClass);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$GroupKeyManagementClusterGroupInfoMapStruct");
-            return;
-        }
-        jmethodID groupInfoMapStructStructCtor =
-            env->GetMethodID(groupInfoMapStructStructClass, "<init>",
-                             "(Ljava/lang/Integer;Ljava/util/ArrayList;Ljava/util/Optional;Ljava/lang/Integer;)V");
-        if (groupInfoMapStructStructCtor == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$GroupKeyManagementClusterGroupInfoMapStruct constructor");
-            return;
-        }
-
-        newElement_0 = env->NewObject(groupInfoMapStructStructClass, groupInfoMapStructStructCtor, newElement_0_groupId,
-                                      newElement_0_endpoints, newElement_0_groupName, newElement_0_fabricIndex);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
-    }
-
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-}
-
-CHIPGroupKeyManagementGeneratedCommandListAttributeCallback::CHIPGroupKeyManagementGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPGroupKeyManagementClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-        return;
-    }
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
 
     javaCallbackRef = env->NewGlobalRef(javaCallback);
     if (javaCallbackRef == nullptr)
@@ -9853,7 +10043,7 @@ CHIPGroupKeyManagementGeneratedCommandListAttributeCallback::CHIPGroupKeyManagem
     }
 }
 
-CHIPGroupKeyManagementGeneratedCommandListAttributeCallback::~CHIPGroupKeyManagementGeneratedCommandListAttributeCallback()
+CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback::~CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -9864,7 +10054,7 @@ CHIPGroupKeyManagementGeneratedCommandListAttributeCallback::~CHIPGroupKeyManage
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPGroupKeyManagementGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -9874,8 +10064,8 @@ void CHIPGroupKeyManagementGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPGroupKeyManagementGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPGroupKeyManagementGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -9905,9 +10095,9 @@ void CHIPGroupKeyManagementGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPGroupKeyManagementAcceptedCommandListAttributeCallback::CHIPGroupKeyManagementAcceptedCommandListAttributeCallback(
+CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback::CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPGroupKeyManagementClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -9924,7 +10114,7 @@ CHIPGroupKeyManagementAcceptedCommandListAttributeCallback::CHIPGroupKeyManageme
     }
 }
 
-CHIPGroupKeyManagementAcceptedCommandListAttributeCallback::~CHIPGroupKeyManagementAcceptedCommandListAttributeCallback()
+CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback::~CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -9935,7 +10125,7 @@ CHIPGroupKeyManagementAcceptedCommandListAttributeCallback::~CHIPGroupKeyManagem
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPGroupKeyManagementAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -9945,8 +10135,8 @@ void CHIPGroupKeyManagementAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPGroupKeyManagementAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPGroupKeyManagementAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -9976,9 +10166,9 @@ void CHIPGroupKeyManagementAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPGroupKeyManagementAttributeListAttributeCallback::CHIPGroupKeyManagementAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPGroupKeyManagementClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback::CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -9995,7 +10185,7 @@ CHIPGroupKeyManagementAttributeListAttributeCallback::CHIPGroupKeyManagementAttr
     }
 }
 
-CHIPGroupKeyManagementAttributeListAttributeCallback::~CHIPGroupKeyManagementAttributeListAttributeCallback()
+CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback::~CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -10006,7 +10196,7 @@ CHIPGroupKeyManagementAttributeListAttributeCallback::~CHIPGroupKeyManagementAtt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPGroupKeyManagementAttributeListAttributeCallback::CallbackFn(
+void CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -10016,8 +10206,8 @@ void CHIPGroupKeyManagementAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPGroupKeyManagementAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPGroupKeyManagementAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -10047,9 +10237,9 @@ void CHIPGroupKeyManagementAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPGroupsGeneratedCommandListAttributeCallback::CHIPGroupsGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                 bool keepAlive) :
-    chip::Callback::Callback<CHIPGroupsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback::CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback(jobject javaCallback,
+                                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -10066,7 +10256,7 @@ CHIPGroupsGeneratedCommandListAttributeCallback::CHIPGroupsGeneratedCommandListA
     }
 }
 
-CHIPGroupsGeneratedCommandListAttributeCallback::~CHIPGroupsGeneratedCommandListAttributeCallback()
+CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback::~CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -10077,8 +10267,8 @@ CHIPGroupsGeneratedCommandListAttributeCallback::~CHIPGroupsGeneratedCommandList
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPGroupsGeneratedCommandListAttributeCallback::CallbackFn(void * context,
-                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateType> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -10086,9 +10276,8 @@ void CHIPGroupsGeneratedCommandListAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPGroupsGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPGroupsGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -10096,31 +10285,28 @@ void CHIPGroupsGeneratedCommandListAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      static_cast<uint8_t>(value.Value()), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPGroupsAcceptedCommandListAttributeCallback::CHIPGroupsAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPGroupsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback::CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterFullDuplexAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -10137,7 +10323,7 @@ CHIPGroupsAcceptedCommandListAttributeCallback::CHIPGroupsAcceptedCommandListAtt
     }
 }
 
-CHIPGroupsAcceptedCommandListAttributeCallback::~CHIPGroupsAcceptedCommandListAttributeCallback()
+CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback::~CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -10148,8 +10334,8 @@ CHIPGroupsAcceptedCommandListAttributeCallback::~CHIPGroupsAcceptedCommandListAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPGroupsAcceptedCommandListAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback::CallbackFn(void * context,
+                                                                           const chip::app::DataModel::Nullable<bool> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -10157,9 +10343,8 @@ void CHIPGroupsAcceptedCommandListAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPGroupsAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPGroupsAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -10167,30 +10352,29 @@ void CHIPGroupsAcceptedCommandListAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Boolean;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Boolean";
+        std::string javaValueCtorSignature = "(Z)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPGroupsAttributeListAttributeCallback::CHIPGroupsAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPGroupsClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback::CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterCarrierDetectAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -10206,7 +10390,7 @@ CHIPGroupsAttributeListAttributeCallback::CHIPGroupsAttributeListAttributeCallba
     }
 }
 
-CHIPGroupsAttributeListAttributeCallback::~CHIPGroupsAttributeListAttributeCallback()
+CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback::~CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -10217,8 +10401,8 @@ CHIPGroupsAttributeListAttributeCallback::~CHIPGroupsAttributeListAttributeCallb
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPGroupsAttributeListAttributeCallback::CallbackFn(void * context,
-                                                          const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback::CallbackFn(void * context,
+                                                                              const chip::app::DataModel::Nullable<bool> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -10226,9 +10410,8 @@ void CHIPGroupsAttributeListAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPGroupsAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPGroupsAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -10236,31 +10419,28 @@ void CHIPGroupsAttributeListAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Boolean;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Boolean";
+        std::string javaValueCtorSignature = "(Z)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPIdentifyGeneratedCommandListAttributeCallback::CHIPIdentifyGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                     bool keepAlive) :
-    chip::Callback::Callback<CHIPIdentifyClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback::
+    CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -10277,7 +10457,8 @@ CHIPIdentifyGeneratedCommandListAttributeCallback::CHIPIdentifyGeneratedCommandL
     }
 }
 
-CHIPIdentifyGeneratedCommandListAttributeCallback::~CHIPIdentifyGeneratedCommandListAttributeCallback()
+CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback::
+    ~CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -10288,7 +10469,7 @@ CHIPIdentifyGeneratedCommandListAttributeCallback::~CHIPIdentifyGeneratedCommand
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPIdentifyGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -10298,8 +10479,8 @@ void CHIPIdentifyGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPIdentifyGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPIdentifyGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -10329,9 +10510,9 @@ void CHIPIdentifyGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPIdentifyAcceptedCommandListAttributeCallback::CHIPIdentifyAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                   bool keepAlive) :
-    chip::Callback::Callback<CHIPIdentifyClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback::
+    CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -10348,7 +10529,8 @@ CHIPIdentifyAcceptedCommandListAttributeCallback::CHIPIdentifyAcceptedCommandLis
     }
 }
 
-CHIPIdentifyAcceptedCommandListAttributeCallback::~CHIPIdentifyAcceptedCommandListAttributeCallback()
+CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback::
+    ~CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -10359,8 +10541,8 @@ CHIPIdentifyAcceptedCommandListAttributeCallback::~CHIPIdentifyAcceptedCommandLi
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPIdentifyAcceptedCommandListAttributeCallback::CallbackFn(void * context,
-                                                                  const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -10369,8 +10551,8 @@ void CHIPIdentifyAcceptedCommandListAttributeCallback::CallbackFn(void * context
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPIdentifyAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPIdentifyAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -10400,8 +10582,10 @@ void CHIPIdentifyAcceptedCommandListAttributeCallback::CallbackFn(void * context
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPIdentifyAttributeListAttributeCallback::CHIPIdentifyAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPIdentifyClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback::CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -10417,7 +10601,7 @@ CHIPIdentifyAttributeListAttributeCallback::CHIPIdentifyAttributeListAttributeCa
     }
 }
 
-CHIPIdentifyAttributeListAttributeCallback::~CHIPIdentifyAttributeListAttributeCallback()
+CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback::~CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -10428,8 +10612,8 @@ CHIPIdentifyAttributeListAttributeCallback::~CHIPIdentifyAttributeListAttributeC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPIdentifyAttributeListAttributeCallback::CallbackFn(void * context,
-                                                            const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -10438,8 +10622,8 @@ void CHIPIdentifyAttributeListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPIdentifyAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPIdentifyAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -10469,9 +10653,9 @@ void CHIPIdentifyAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPIlluminanceMeasurementMeasuredValueAttributeCallback::CHIPIlluminanceMeasurementMeasuredValueAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPIlluminanceMeasurementClusterMeasuredValueAttributeCallbackType>(CallbackFn, this),
+CHIPBridgedDeviceBasicVendorIDAttributeCallback::CHIPBridgedDeviceBasicVendorIDAttributeCallback(jobject javaCallback,
+                                                                                                 bool keepAlive) :
+    chip::Callback::Callback<CHIPBridgedDeviceBasicClusterVendorIDAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -10488,7 +10672,7 @@ CHIPIlluminanceMeasurementMeasuredValueAttributeCallback::CHIPIlluminanceMeasure
     }
 }
 
-CHIPIlluminanceMeasurementMeasuredValueAttributeCallback::~CHIPIlluminanceMeasurementMeasuredValueAttributeCallback()
+CHIPBridgedDeviceBasicVendorIDAttributeCallback::~CHIPBridgedDeviceBasicVendorIDAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -10499,8 +10683,7 @@ CHIPIlluminanceMeasurementMeasuredValueAttributeCallback::~CHIPIlluminanceMeasur
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPIlluminanceMeasurementMeasuredValueAttributeCallback::CallbackFn(void * context,
-                                                                          const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPBridgedDeviceBasicVendorIDAttributeCallback::CallbackFn(void * context, chip::VendorId value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -10508,8 +10691,8 @@ void CHIPIlluminanceMeasurementMeasuredValueAttributeCallback::CallbackFn(void *
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPIlluminanceMeasurementMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPIlluminanceMeasurementMeasuredValueAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPBridgedDeviceBasicVendorIDAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPBridgedDeviceBasicVendorIDAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -10521,24 +10704,17 @@ void CHIPIlluminanceMeasurementMeasuredValueAttributeCallback::CallbackFn(void *
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
-    {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
-    }
+    std::string javaValueClassName     = "java/lang/Integer";
+    std::string javaValueCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   static_cast<uint16_t>(value), javaValue);
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback::CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback(
+CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback::CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPIlluminanceMeasurementClusterMinMeasuredValueAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPBridgedDeviceBasicClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -10555,7 +10731,7 @@ CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback::CHIPIlluminanceMeas
     }
 }
 
-CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback::~CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback()
+CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback::~CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -10566,8 +10742,8 @@ CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback::~CHIPIlluminanceMea
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback::CallbackFn(void * context,
-                                                                             const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -10575,8 +10751,9 @@ void CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback::CallbackFn(voi
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -10584,28 +10761,31 @@ void CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback::CallbackFn(voi
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback::CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback(
+CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback::CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPIlluminanceMeasurementClusterMaxMeasuredValueAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPBridgedDeviceBasicClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -10622,7 +10802,7 @@ CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback::CHIPIlluminanceMeas
     }
 }
 
-CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback::~CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback()
+CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback::~CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -10633,8 +10813,8 @@ CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback::~CHIPIlluminanceMea
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback::CallbackFn(void * context,
-                                                                             const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -10642,8 +10822,9 @@ void CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback::CallbackFn(voi
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -10651,28 +10832,31 @@ void CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback::CallbackFn(voi
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback::CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPIlluminanceMeasurementClusterLightSensorTypeAttributeCallbackType>(CallbackFn, this),
+CHIPBridgedDeviceBasicAttributeListAttributeCallback::CHIPBridgedDeviceBasicAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPBridgedDeviceBasicClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -10689,7 +10873,7 @@ CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback::CHIPIlluminanceMeasu
     }
 }
 
-CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback::~CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback()
+CHIPBridgedDeviceBasicAttributeListAttributeCallback::~CHIPBridgedDeviceBasicAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -10700,8 +10884,8 @@ CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback::~CHIPIlluminanceMeas
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback::CallbackFn(void * context,
-                                                                            const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPBridgedDeviceBasicAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -10709,8 +10893,9 @@ void CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback::CallbackFn(void
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPBridgedDeviceBasicAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPBridgedDeviceBasicAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -10718,28 +10903,31 @@ void CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback::CallbackFn(void
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback::CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPIlluminanceMeasurementClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPSwitchGeneratedCommandListAttributeCallback::CHIPSwitchGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                 bool keepAlive) :
+    chip::Callback::Callback<CHIPSwitchClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -10756,7 +10944,7 @@ CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback::CHIPIlluminance
     }
 }
 
-CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback::~CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback()
+CHIPSwitchGeneratedCommandListAttributeCallback::~CHIPSwitchGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -10767,8 +10955,8 @@ CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback::~CHIPIlluminanc
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPSwitchGeneratedCommandListAttributeCallback::CallbackFn(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -10777,8 +10965,8 @@ void CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback::CallbackFn
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPSwitchGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPSwitchGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -10808,9 +10996,9 @@ void CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback::CallbackFn
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback::CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPIlluminanceMeasurementClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPSwitchAcceptedCommandListAttributeCallback::CHIPSwitchAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPSwitchClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -10827,7 +11015,7 @@ CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback::CHIPIlluminanceM
     }
 }
 
-CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback::~CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback()
+CHIPSwitchAcceptedCommandListAttributeCallback::~CHIPSwitchAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -10838,8 +11026,8 @@ CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback::~CHIPIlluminance
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPSwitchAcceptedCommandListAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -10848,8 +11036,8 @@ void CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPSwitchAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPSwitchAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -10879,10 +11067,8 @@ void CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPIlluminanceMeasurementAttributeListAttributeCallback::CHIPIlluminanceMeasurementAttributeListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPIlluminanceMeasurementClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPSwitchAttributeListAttributeCallback::CHIPSwitchAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPSwitchClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -10898,7 +11084,7 @@ CHIPIlluminanceMeasurementAttributeListAttributeCallback::CHIPIlluminanceMeasure
     }
 }
 
-CHIPIlluminanceMeasurementAttributeListAttributeCallback::~CHIPIlluminanceMeasurementAttributeListAttributeCallback()
+CHIPSwitchAttributeListAttributeCallback::~CHIPSwitchAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -10909,8 +11095,8 @@ CHIPIlluminanceMeasurementAttributeListAttributeCallback::~CHIPIlluminanceMeasur
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPIlluminanceMeasurementAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPSwitchAttributeListAttributeCallback::CallbackFn(void * context,
+                                                          const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -10919,8 +11105,8 @@ void CHIPIlluminanceMeasurementAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPIlluminanceMeasurementAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPIlluminanceMeasurementAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPSwitchAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPSwitchAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -10950,9 +11136,9 @@ void CHIPIlluminanceMeasurementAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPKeypadInputGeneratedCommandListAttributeCallback::CHIPKeypadInputGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPKeypadInputClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback::CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPAdministratorCommissioningClusterAdminFabricIndexAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -10969,7 +11155,7 @@ CHIPKeypadInputGeneratedCommandListAttributeCallback::CHIPKeypadInputGeneratedCo
     }
 }
 
-CHIPKeypadInputGeneratedCommandListAttributeCallback::~CHIPKeypadInputGeneratedCommandListAttributeCallback()
+CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback::~CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -10980,8 +11166,7 @@ CHIPKeypadInputGeneratedCommandListAttributeCallback::~CHIPKeypadInputGeneratedC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPKeypadInputGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback::CallbackFn(void * context, chip::FabricIndex value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -10989,9 +11174,8 @@ void CHIPKeypadInputGeneratedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPKeypadInputGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPKeypadInputGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -10999,31 +11183,21 @@ void CHIPKeypadInputGeneratedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+    jobject javaValue;
+    std::string javaValueClassName     = "java/lang/Integer";
+    std::string javaValueCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(), value,
+                                                                  javaValue);
 
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
-    {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
-    }
-
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPKeypadInputAcceptedCommandListAttributeCallback::CHIPKeypadInputAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                         bool keepAlive) :
-    chip::Callback::Callback<CHIPKeypadInputClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback::
+    CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPAdministratorCommissioningClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -11040,7 +11214,8 @@ CHIPKeypadInputAcceptedCommandListAttributeCallback::CHIPKeypadInputAcceptedComm
     }
 }
 
-CHIPKeypadInputAcceptedCommandListAttributeCallback::~CHIPKeypadInputAcceptedCommandListAttributeCallback()
+CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback::
+    ~CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -11051,7 +11226,7 @@ CHIPKeypadInputAcceptedCommandListAttributeCallback::~CHIPKeypadInputAcceptedCom
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPKeypadInputAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -11061,8 +11236,8 @@ void CHIPKeypadInputAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPKeypadInputAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPKeypadInputAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -11092,8 +11267,10 @@ void CHIPKeypadInputAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPKeypadInputAttributeListAttributeCallback::CHIPKeypadInputAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPKeypadInputClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback::
+    CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPAdministratorCommissioningClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -11109,7 +11286,8 @@ CHIPKeypadInputAttributeListAttributeCallback::CHIPKeypadInputAttributeListAttri
     }
 }
 
-CHIPKeypadInputAttributeListAttributeCallback::~CHIPKeypadInputAttributeListAttributeCallback()
+CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback::
+    ~CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -11120,8 +11298,8 @@ CHIPKeypadInputAttributeListAttributeCallback::~CHIPKeypadInputAttributeListAttr
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPKeypadInputAttributeListAttributeCallback::CallbackFn(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -11130,8 +11308,8 @@ void CHIPKeypadInputAttributeListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPKeypadInputAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPKeypadInputAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -11161,8 +11339,10 @@ void CHIPKeypadInputAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLevelControlOnLevelAttributeCallback::CHIPLevelControlOnLevelAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPLevelControlClusterOnLevelAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPAdministratorCommissioningAttributeListAttributeCallback::CHIPAdministratorCommissioningAttributeListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPAdministratorCommissioningClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -11178,7 +11358,7 @@ CHIPLevelControlOnLevelAttributeCallback::CHIPLevelControlOnLevelAttributeCallba
     }
 }
 
-CHIPLevelControlOnLevelAttributeCallback::~CHIPLevelControlOnLevelAttributeCallback()
+CHIPAdministratorCommissioningAttributeListAttributeCallback::~CHIPAdministratorCommissioningAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -11189,7 +11369,8 @@ CHIPLevelControlOnLevelAttributeCallback::~CHIPLevelControlOnLevelAttributeCallb
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLevelControlOnLevelAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPAdministratorCommissioningAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -11197,8 +11378,9 @@ void CHIPLevelControlOnLevelAttributeCallback::CallbackFn(void * context, const
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPLevelControlOnLevelAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLevelControlOnLevelAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPAdministratorCommissioningAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPAdministratorCommissioningAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -11206,28 +11388,31 @@ void CHIPLevelControlOnLevelAttributeCallback::CallbackFn(void * context, const
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLevelControlOnTransitionTimeAttributeCallback::CHIPLevelControlOnTransitionTimeAttributeCallback(jobject javaCallback,
-                                                                                                     bool keepAlive) :
-    chip::Callback::Callback<CHIPLevelControlClusterOnTransitionTimeAttributeCallbackType>(CallbackFn, this),
+CHIPOperationalCredentialsNOCsAttributeCallback::CHIPOperationalCredentialsNOCsAttributeCallback(jobject javaCallback,
+                                                                                                 bool keepAlive) :
+    chip::Callback::Callback<CHIPOperationalCredentialsClusterNOCsAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -11244,7 +11429,7 @@ CHIPLevelControlOnTransitionTimeAttributeCallback::CHIPLevelControlOnTransitionT
     }
 }
 
-CHIPLevelControlOnTransitionTimeAttributeCallback::~CHIPLevelControlOnTransitionTimeAttributeCallback()
+CHIPOperationalCredentialsNOCsAttributeCallback::~CHIPOperationalCredentialsNOCsAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -11255,8 +11440,10 @@ CHIPLevelControlOnTransitionTimeAttributeCallback::~CHIPLevelControlOnTransition
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLevelControlOnTransitionTimeAttributeCallback::CallbackFn(void * context,
-                                                                   const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPOperationalCredentialsNOCsAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::DecodableType> &
+        list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -11264,8 +11451,9 @@ void CHIPLevelControlOnTransitionTimeAttributeCallback::CallbackFn(void * contex
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPLevelControlOnTransitionTimeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLevelControlOnTransitionTimeAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPOperationalCredentialsNOCsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOperationalCredentialsNOCsAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -11273,28 +11461,68 @@ void CHIPLevelControlOnTransitionTimeAttributeCallback::CallbackFn(void * contex
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        jobject newElement_0_noc;
+        jbyteArray newElement_0_nocByteArray = env->NewByteArray(static_cast<jsize>(entry_0.noc.size()));
+        env->SetByteArrayRegion(newElement_0_nocByteArray, 0, static_cast<jsize>(entry_0.noc.size()),
+                                reinterpret_cast<const jbyte *>(entry_0.noc.data()));
+        newElement_0_noc = newElement_0_nocByteArray;
+        jobject newElement_0_icac;
+        if (entry_0.icac.IsNull())
+        {
+            newElement_0_icac = nullptr;
+        }
+        else
+        {
+            jbyteArray newElement_0_icacByteArray = env->NewByteArray(static_cast<jsize>(entry_0.icac.Value().size()));
+            env->SetByteArrayRegion(newElement_0_icacByteArray, 0, static_cast<jsize>(entry_0.icac.Value().size()),
+                                    reinterpret_cast<const jbyte *>(entry_0.icac.Value().data()));
+            newElement_0_icac = newElement_0_icacByteArray;
+        }
+        jobject newElement_0_fabricIndex;
+        std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
+        std::string newElement_0_fabricIndexCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
+                                                                      newElement_0_fabricIndexCtorSignature.c_str(),
+                                                                      entry_0.fabricIndex, newElement_0_fabricIndex);
+
+        jclass NOCStructStructClass;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$OperationalCredentialsClusterNOCStruct", NOCStructStructClass);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$OperationalCredentialsClusterNOCStruct");
+            return;
+        }
+        jmethodID NOCStructStructCtor = env->GetMethodID(NOCStructStructClass, "<init>", "([B[BLjava/lang/Integer;)V");
+        if (NOCStructStructCtor == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$OperationalCredentialsClusterNOCStruct constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(NOCStructStructClass, NOCStructStructCtor, newElement_0_noc, newElement_0_icac,
+                                      newElement_0_fabricIndex);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLevelControlOffTransitionTimeAttributeCallback::CHIPLevelControlOffTransitionTimeAttributeCallback(jobject javaCallback,
+CHIPOperationalCredentialsFabricsAttributeCallback::CHIPOperationalCredentialsFabricsAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPLevelControlClusterOffTransitionTimeAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPOperationalCredentialsClusterFabricsAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -11311,7 +11539,7 @@ CHIPLevelControlOffTransitionTimeAttributeCallback::CHIPLevelControlOffTransitio
     }
 }
 
-CHIPLevelControlOffTransitionTimeAttributeCallback::~CHIPLevelControlOffTransitionTimeAttributeCallback()
+CHIPOperationalCredentialsFabricsAttributeCallback::~CHIPOperationalCredentialsFabricsAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -11322,8 +11550,10 @@ CHIPLevelControlOffTransitionTimeAttributeCallback::~CHIPLevelControlOffTransiti
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLevelControlOffTransitionTimeAttributeCallback::CallbackFn(void * context,
-                                                                    const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPOperationalCredentialsFabricsAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -11331,8 +11561,9 @@ void CHIPLevelControlOffTransitionTimeAttributeCallback::CallbackFn(void * conte
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPLevelControlOffTransitionTimeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLevelControlOffTransitionTimeAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPOperationalCredentialsFabricsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOperationalCredentialsFabricsAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -11340,28 +11571,78 @@ void CHIPLevelControlOffTransitionTimeAttributeCallback::CallbackFn(void * conte
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        jobject newElement_0_rootPublicKey;
+        jbyteArray newElement_0_rootPublicKeyByteArray = env->NewByteArray(static_cast<jsize>(entry_0.rootPublicKey.size()));
+        env->SetByteArrayRegion(newElement_0_rootPublicKeyByteArray, 0, static_cast<jsize>(entry_0.rootPublicKey.size()),
+                                reinterpret_cast<const jbyte *>(entry_0.rootPublicKey.data()));
+        newElement_0_rootPublicKey = newElement_0_rootPublicKeyByteArray;
+        jobject newElement_0_vendorId;
+        std::string newElement_0_vendorIdClassName     = "java/lang/Integer";
+        std::string newElement_0_vendorIdCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+            newElement_0_vendorIdClassName.c_str(), newElement_0_vendorIdCtorSignature.c_str(),
+            static_cast<uint16_t>(entry_0.vendorId), newElement_0_vendorId);
+        jobject newElement_0_fabricId;
+        std::string newElement_0_fabricIdClassName     = "java/lang/Long";
+        std::string newElement_0_fabricIdCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_fabricIdClassName.c_str(),
+                                                                       newElement_0_fabricIdCtorSignature.c_str(), entry_0.fabricId,
+                                                                       newElement_0_fabricId);
+        jobject newElement_0_nodeId;
+        std::string newElement_0_nodeIdClassName     = "java/lang/Long";
+        std::string newElement_0_nodeIdCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(
+            newElement_0_nodeIdClassName.c_str(), newElement_0_nodeIdCtorSignature.c_str(), entry_0.nodeId, newElement_0_nodeId);
+        jobject newElement_0_label;
+        newElement_0_label = env->NewStringUTF(std::string(entry_0.label.data(), entry_0.label.size()).c_str());
+        jobject newElement_0_fabricIndex;
+        std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
+        std::string newElement_0_fabricIndexCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
+                                                                      newElement_0_fabricIndexCtorSignature.c_str(),
+                                                                      entry_0.fabricIndex, newElement_0_fabricIndex);
+
+        jclass fabricDescriptorStructClass;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$OperationalCredentialsClusterFabricDescriptor", fabricDescriptorStructClass);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$OperationalCredentialsClusterFabricDescriptor");
+            return;
+        }
+        jmethodID fabricDescriptorStructCtor =
+            env->GetMethodID(fabricDescriptorStructClass, "<init>",
+                             "([BLjava/lang/Integer;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Integer;)V");
+        if (fabricDescriptorStructCtor == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$OperationalCredentialsClusterFabricDescriptor constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(fabricDescriptorStructClass, fabricDescriptorStructCtor, newElement_0_rootPublicKey,
+                                      newElement_0_vendorId, newElement_0_fabricId, newElement_0_nodeId, newElement_0_label,
+                                      newElement_0_fabricIndex);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLevelControlDefaultMoveRateAttributeCallback::CHIPLevelControlDefaultMoveRateAttributeCallback(jobject javaCallback,
-                                                                                                   bool keepAlive) :
-    chip::Callback::Callback<CHIPLevelControlClusterDefaultMoveRateAttributeCallbackType>(CallbackFn, this),
+CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback::
+    CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOperationalCredentialsClusterTrustedRootCertificatesAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -11378,7 +11659,8 @@ CHIPLevelControlDefaultMoveRateAttributeCallback::CHIPLevelControlDefaultMoveRat
     }
 }
 
-CHIPLevelControlDefaultMoveRateAttributeCallback::~CHIPLevelControlDefaultMoveRateAttributeCallback()
+CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback::
+    ~CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -11389,8 +11671,8 @@ CHIPLevelControlDefaultMoveRateAttributeCallback::~CHIPLevelControlDefaultMoveRa
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLevelControlDefaultMoveRateAttributeCallback::CallbackFn(void * context,
-                                                                  const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -11398,8 +11680,9 @@ void CHIPLevelControlDefaultMoveRateAttributeCallback::CallbackFn(void * context
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPLevelControlDefaultMoveRateAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLevelControlDefaultMoveRateAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -11407,28 +11690,31 @@ void CHIPLevelControlDefaultMoveRateAttributeCallback::CallbackFn(void * context
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        jbyteArray newElement_0ByteArray = env->NewByteArray(static_cast<jsize>(entry_0.size()));
+        env->SetByteArrayRegion(newElement_0ByteArray, 0, static_cast<jsize>(entry_0.size()),
+                                reinterpret_cast<const jbyte *>(entry_0.data()));
+        newElement_0 = newElement_0ByteArray;
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLevelControlStartUpCurrentLevelAttributeCallback::CHIPLevelControlStartUpCurrentLevelAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPLevelControlClusterStartUpCurrentLevelAttributeCallbackType>(CallbackFn, this),
+CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback::CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOperationalCredentialsClusterCurrentFabricIndexAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -11445,7 +11731,7 @@ CHIPLevelControlStartUpCurrentLevelAttributeCallback::CHIPLevelControlStartUpCur
     }
 }
 
-CHIPLevelControlStartUpCurrentLevelAttributeCallback::~CHIPLevelControlStartUpCurrentLevelAttributeCallback()
+CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback::~CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -11456,8 +11742,7 @@ CHIPLevelControlStartUpCurrentLevelAttributeCallback::~CHIPLevelControlStartUpCu
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLevelControlStartUpCurrentLevelAttributeCallback::CallbackFn(void * context,
-                                                                      const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback::CallbackFn(void * context, chip::FabricIndex value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -11465,8 +11750,8 @@ void CHIPLevelControlStartUpCurrentLevelAttributeCallback::CallbackFn(void * con
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPLevelControlStartUpCurrentLevelAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLevelControlStartUpCurrentLevelAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -11478,24 +11763,17 @@ void CHIPLevelControlStartUpCurrentLevelAttributeCallback::CallbackFn(void * con
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
-    {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
-    }
+    std::string javaValueClassName     = "java/lang/Integer";
+    std::string javaValueCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(), value,
+                                                                  javaValue);
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPLevelControlGeneratedCommandListAttributeCallback::CHIPLevelControlGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                             bool keepAlive) :
-    chip::Callback::Callback<CHIPLevelControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPOperationalCredentialsGeneratedCommandListAttributeCallback::CHIPOperationalCredentialsGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOperationalCredentialsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -11512,7 +11790,7 @@ CHIPLevelControlGeneratedCommandListAttributeCallback::CHIPLevelControlGenerated
     }
 }
 
-CHIPLevelControlGeneratedCommandListAttributeCallback::~CHIPLevelControlGeneratedCommandListAttributeCallback()
+CHIPOperationalCredentialsGeneratedCommandListAttributeCallback::~CHIPOperationalCredentialsGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -11523,7 +11801,7 @@ CHIPLevelControlGeneratedCommandListAttributeCallback::~CHIPLevelControlGenerate
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLevelControlGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPOperationalCredentialsGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -11533,8 +11811,8 @@ void CHIPLevelControlGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPLevelControlGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLevelControlGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOperationalCredentialsGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOperationalCredentialsGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -11564,9 +11842,9 @@ void CHIPLevelControlGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLevelControlAcceptedCommandListAttributeCallback::CHIPLevelControlAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPLevelControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPOperationalCredentialsAcceptedCommandListAttributeCallback::CHIPOperationalCredentialsAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOperationalCredentialsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -11583,7 +11861,7 @@ CHIPLevelControlAcceptedCommandListAttributeCallback::CHIPLevelControlAcceptedCo
     }
 }
 
-CHIPLevelControlAcceptedCommandListAttributeCallback::~CHIPLevelControlAcceptedCommandListAttributeCallback()
+CHIPOperationalCredentialsAcceptedCommandListAttributeCallback::~CHIPOperationalCredentialsAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -11594,7 +11872,7 @@ CHIPLevelControlAcceptedCommandListAttributeCallback::~CHIPLevelControlAcceptedC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLevelControlAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPOperationalCredentialsAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -11604,8 +11882,8 @@ void CHIPLevelControlAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPLevelControlAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLevelControlAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOperationalCredentialsAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOperationalCredentialsAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -11635,9 +11913,9 @@ void CHIPLevelControlAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLevelControlAttributeListAttributeCallback::CHIPLevelControlAttributeListAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPLevelControlClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPOperationalCredentialsAttributeListAttributeCallback::CHIPOperationalCredentialsAttributeListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOperationalCredentialsClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -11654,7 +11932,7 @@ CHIPLevelControlAttributeListAttributeCallback::CHIPLevelControlAttributeListAtt
     }
 }
 
-CHIPLevelControlAttributeListAttributeCallback::~CHIPLevelControlAttributeListAttributeCallback()
+CHIPOperationalCredentialsAttributeListAttributeCallback::~CHIPOperationalCredentialsAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -11665,8 +11943,8 @@ CHIPLevelControlAttributeListAttributeCallback::~CHIPLevelControlAttributeListAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLevelControlAttributeListAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPOperationalCredentialsAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -11675,8 +11953,8 @@ void CHIPLevelControlAttributeListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPLevelControlAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLevelControlAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOperationalCredentialsAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOperationalCredentialsAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -11706,9 +11984,9 @@ void CHIPLevelControlAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLocalizationConfigurationSupportedLocalesAttributeCallback::CHIPLocalizationConfigurationSupportedLocalesAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPLocalizationConfigurationClusterSupportedLocalesAttributeCallbackType>(CallbackFn, this),
+CHIPGroupKeyManagementGroupKeyMapAttributeCallback::CHIPGroupKeyManagementGroupKeyMapAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPGroupKeyManagementClusterGroupKeyMapAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -11725,7 +12003,7 @@ CHIPLocalizationConfigurationSupportedLocalesAttributeCallback::CHIPLocalization
     }
 }
 
-CHIPLocalizationConfigurationSupportedLocalesAttributeCallback::~CHIPLocalizationConfigurationSupportedLocalesAttributeCallback()
+CHIPGroupKeyManagementGroupKeyMapAttributeCallback::~CHIPGroupKeyManagementGroupKeyMapAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -11736,8 +12014,10 @@ CHIPLocalizationConfigurationSupportedLocalesAttributeCallback::~CHIPLocalizatio
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLocalizationConfigurationSupportedLocalesAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CharSpan> & list)
+void CHIPGroupKeyManagementGroupKeyMapAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::DecodableType> &
+        list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -11746,8 +12026,8 @@ void CHIPLocalizationConfigurationSupportedLocalesAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPLocalizationConfigurationSupportedLocalesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLocalizationConfigurationSupportedLocalesAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPGroupKeyManagementGroupKeyMapAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPGroupKeyManagementGroupKeyMapAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -11766,7 +12046,43 @@ void CHIPLocalizationConfigurationSupportedLocalesAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        newElement_0 = env->NewStringUTF(std::string(entry_0.data(), entry_0.size()).c_str());
+        jobject newElement_0_groupId;
+        std::string newElement_0_groupIdClassName     = "java/lang/Integer";
+        std::string newElement_0_groupIdCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_groupIdClassName.c_str(),
+                                                                       newElement_0_groupIdCtorSignature.c_str(), entry_0.groupId,
+                                                                       newElement_0_groupId);
+        jobject newElement_0_groupKeySetID;
+        std::string newElement_0_groupKeySetIDClassName     = "java/lang/Integer";
+        std::string newElement_0_groupKeySetIDCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_groupKeySetIDClassName.c_str(),
+                                                                       newElement_0_groupKeySetIDCtorSignature.c_str(),
+                                                                       entry_0.groupKeySetID, newElement_0_groupKeySetID);
+        jobject newElement_0_fabricIndex;
+        std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
+        std::string newElement_0_fabricIndexCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
+                                                                      newElement_0_fabricIndexCtorSignature.c_str(),
+                                                                      entry_0.fabricIndex, newElement_0_fabricIndex);
+
+        jclass groupKeyMapStructStructClass;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$GroupKeyManagementClusterGroupKeyMapStruct", groupKeyMapStructStructClass);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$GroupKeyManagementClusterGroupKeyMapStruct");
+            return;
+        }
+        jmethodID groupKeyMapStructStructCtor = env->GetMethodID(groupKeyMapStructStructClass, "<init>",
+                                                                 "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V");
+        if (groupKeyMapStructStructCtor == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$GroupKeyManagementClusterGroupKeyMapStruct constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(groupKeyMapStructStructClass, groupKeyMapStructStructCtor, newElement_0_groupId,
+                                      newElement_0_groupKeySetID, newElement_0_fabricIndex);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -11774,9 +12090,9 @@ void CHIPLocalizationConfigurationSupportedLocalesAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback::
-    CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPLocalizationConfigurationClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPGroupKeyManagementGroupTableAttributeCallback::CHIPGroupKeyManagementGroupTableAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPGroupKeyManagementClusterGroupTableAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -11793,8 +12109,7 @@ CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback::
-    ~CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback()
+CHIPGroupKeyManagementGroupTableAttributeCallback::~CHIPGroupKeyManagementGroupTableAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -11805,8 +12120,10 @@ CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPGroupKeyManagementGroupTableAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupInfoMapStruct::DecodableType> &
+        list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -11815,8 +12132,8 @@ void CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback::Callbac
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPGroupKeyManagementGroupTableAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPGroupKeyManagementGroupTableAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -11835,10 +12152,64 @@ void CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback::Callbac
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        jobject newElement_0_groupId;
+        std::string newElement_0_groupIdClassName     = "java/lang/Integer";
+        std::string newElement_0_groupIdCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_groupIdClassName.c_str(),
+                                                                       newElement_0_groupIdCtorSignature.c_str(), entry_0.groupId,
+                                                                       newElement_0_groupId);
+        jobject newElement_0_endpoints;
+        chip::JniReferences::GetInstance().CreateArrayList(newElement_0_endpoints);
+
+        auto iter_newElement_0_endpoints_2 = entry_0.endpoints.begin();
+        while (iter_newElement_0_endpoints_2.Next())
+        {
+            auto & entry_2 = iter_newElement_0_endpoints_2.GetValue();
+            jobject newElement_2;
+            std::string newElement_2ClassName     = "java/lang/Integer";
+            std::string newElement_2CtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+                newElement_2ClassName.c_str(), newElement_2CtorSignature.c_str(), entry_2, newElement_2);
+            chip::JniReferences::GetInstance().AddToList(newElement_0_endpoints, newElement_2);
+        }
+        jobject newElement_0_groupName;
+        if (!entry_0.groupName.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_groupName);
+        }
+        else
+        {
+            jobject newElement_0_groupNameInsideOptional;
+            newElement_0_groupNameInsideOptional =
+                env->NewStringUTF(std::string(entry_0.groupName.Value().data(), entry_0.groupName.Value().size()).c_str());
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_groupNameInsideOptional, newElement_0_groupName);
+        }
+        jobject newElement_0_fabricIndex;
+        std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
+        std::string newElement_0_fabricIndexCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
+                                                                      newElement_0_fabricIndexCtorSignature.c_str(),
+                                                                      entry_0.fabricIndex, newElement_0_fabricIndex);
+
+        jclass groupInfoMapStructStructClass;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$GroupKeyManagementClusterGroupInfoMapStruct", groupInfoMapStructStructClass);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$GroupKeyManagementClusterGroupInfoMapStruct");
+            return;
+        }
+        jmethodID groupInfoMapStructStructCtor =
+            env->GetMethodID(groupInfoMapStructStructClass, "<init>",
+                             "(Ljava/lang/Integer;Ljava/util/ArrayList;Ljava/util/Optional;Ljava/lang/Integer;)V");
+        if (groupInfoMapStructStructCtor == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$GroupKeyManagementClusterGroupInfoMapStruct constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(groupInfoMapStructStructClass, groupInfoMapStructStructCtor, newElement_0_groupId,
+                                      newElement_0_endpoints, newElement_0_groupName, newElement_0_fabricIndex);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -11846,9 +12217,9 @@ void CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback::Callbac
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback::
-    CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPLocalizationConfigurationClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPGroupKeyManagementGeneratedCommandListAttributeCallback::CHIPGroupKeyManagementGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPGroupKeyManagementClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -11865,8 +12236,7 @@ CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback::
     }
 }
 
-CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback::
-    ~CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback()
+CHIPGroupKeyManagementGeneratedCommandListAttributeCallback::~CHIPGroupKeyManagementGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -11877,7 +12247,7 @@ CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPGroupKeyManagementGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -11887,8 +12257,8 @@ void CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback::Callback
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPGroupKeyManagementGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPGroupKeyManagementGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -11918,9 +12288,9 @@ void CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback::Callback
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLowPowerGeneratedCommandListAttributeCallback::CHIPLowPowerGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                     bool keepAlive) :
-    chip::Callback::Callback<CHIPLowPowerClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPGroupKeyManagementAcceptedCommandListAttributeCallback::CHIPGroupKeyManagementAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPGroupKeyManagementClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -11937,7 +12307,7 @@ CHIPLowPowerGeneratedCommandListAttributeCallback::CHIPLowPowerGeneratedCommandL
     }
 }
 
-CHIPLowPowerGeneratedCommandListAttributeCallback::~CHIPLowPowerGeneratedCommandListAttributeCallback()
+CHIPGroupKeyManagementAcceptedCommandListAttributeCallback::~CHIPGroupKeyManagementAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -11948,7 +12318,7 @@ CHIPLowPowerGeneratedCommandListAttributeCallback::~CHIPLowPowerGeneratedCommand
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLowPowerGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPGroupKeyManagementAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -11958,8 +12328,8 @@ void CHIPLowPowerGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPLowPowerGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLowPowerGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPGroupKeyManagementAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPGroupKeyManagementAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -11989,9 +12359,9 @@ void CHIPLowPowerGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLowPowerAcceptedCommandListAttributeCallback::CHIPLowPowerAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                   bool keepAlive) :
-    chip::Callback::Callback<CHIPLowPowerClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPGroupKeyManagementAttributeListAttributeCallback::CHIPGroupKeyManagementAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPGroupKeyManagementClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -12008,7 +12378,7 @@ CHIPLowPowerAcceptedCommandListAttributeCallback::CHIPLowPowerAcceptedCommandLis
     }
 }
 
-CHIPLowPowerAcceptedCommandListAttributeCallback::~CHIPLowPowerAcceptedCommandListAttributeCallback()
+CHIPGroupKeyManagementAttributeListAttributeCallback::~CHIPGroupKeyManagementAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -12019,8 +12389,8 @@ CHIPLowPowerAcceptedCommandListAttributeCallback::~CHIPLowPowerAcceptedCommandLi
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLowPowerAcceptedCommandListAttributeCallback::CallbackFn(void * context,
-                                                                  const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPGroupKeyManagementAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -12029,8 +12399,8 @@ void CHIPLowPowerAcceptedCommandListAttributeCallback::CallbackFn(void * context
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPLowPowerAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLowPowerAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPGroupKeyManagementAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPGroupKeyManagementAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -12060,8 +12430,8 @@ void CHIPLowPowerAcceptedCommandListAttributeCallback::CallbackFn(void * context
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLowPowerAttributeListAttributeCallback::CHIPLowPowerAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPLowPowerClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPFixedLabelLabelListAttributeCallback::CHIPFixedLabelLabelListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPFixedLabelClusterLabelListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -12077,7 +12447,7 @@ CHIPLowPowerAttributeListAttributeCallback::CHIPLowPowerAttributeListAttributeCa
     }
 }
 
-CHIPLowPowerAttributeListAttributeCallback::~CHIPLowPowerAttributeListAttributeCallback()
+CHIPFixedLabelLabelListAttributeCallback::~CHIPFixedLabelLabelListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -12088,8 +12458,9 @@ CHIPLowPowerAttributeListAttributeCallback::~CHIPLowPowerAttributeListAttributeC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLowPowerAttributeListAttributeCallback::CallbackFn(void * context,
-                                                            const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPFixedLabelLabelListAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::FixedLabel::Structs::LabelStruct::DecodableType> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -12098,8 +12469,8 @@ void CHIPLowPowerAttributeListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPLowPowerAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLowPowerAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPFixedLabelLabelListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPFixedLabelLabelListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -12118,10 +12489,28 @@ void CHIPLowPowerAttributeListAttributeCallback::CallbackFn(void * context,
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        jobject newElement_0_label;
+        newElement_0_label = env->NewStringUTF(std::string(entry_0.label.data(), entry_0.label.size()).c_str());
+        jobject newElement_0_value;
+        newElement_0_value = env->NewStringUTF(std::string(entry_0.value.data(), entry_0.value.size()).c_str());
+
+        jclass labelStructStructClass;
+        err = chip::JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipStructs$FixedLabelClusterLabelStruct",
+                                                             labelStructStructClass);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$FixedLabelClusterLabelStruct");
+            return;
+        }
+        jmethodID labelStructStructCtor =
+            env->GetMethodID(labelStructStructClass, "<init>", "(Ljava/lang/String;Ljava/lang/String;)V");
+        if (labelStructStructCtor == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$FixedLabelClusterLabelStruct constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(labelStructStructClass, labelStructStructCtor, newElement_0_label, newElement_0_value);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -12129,8 +12518,10 @@ void CHIPLowPowerAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPMediaInputInputListAttributeCallback::CHIPMediaInputInputListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPMediaInputClusterInputListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPFixedLabelGeneratedCommandListAttributeCallback::CHIPFixedLabelGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPFixedLabelClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -12146,7 +12537,7 @@ CHIPMediaInputInputListAttributeCallback::CHIPMediaInputInputListAttributeCallba
     }
 }
 
-CHIPMediaInputInputListAttributeCallback::~CHIPMediaInputInputListAttributeCallback()
+CHIPFixedLabelGeneratedCommandListAttributeCallback::~CHIPFixedLabelGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -12157,9 +12548,8 @@ CHIPMediaInputInputListAttributeCallback::~CHIPMediaInputInputListAttributeCallb
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPMediaInputInputListAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::InputInfo::DecodableType> & list)
+void CHIPFixedLabelGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -12168,8 +12558,8 @@ void CHIPMediaInputInputListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPMediaInputInputListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPMediaInputInputListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPFixedLabelGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPFixedLabelGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -12188,40 +12578,10 @@ void CHIPMediaInputInputListAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        jobject newElement_0_index;
-        std::string newElement_0_indexClassName     = "java/lang/Integer";
-        std::string newElement_0_indexCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-            newElement_0_indexClassName.c_str(), newElement_0_indexCtorSignature.c_str(), entry_0.index, newElement_0_index);
-        jobject newElement_0_inputType;
-        std::string newElement_0_inputTypeClassName     = "java/lang/Integer";
-        std::string newElement_0_inputTypeCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-            newElement_0_inputTypeClassName.c_str(), newElement_0_inputTypeCtorSignature.c_str(),
-            static_cast<uint8_t>(entry_0.inputType), newElement_0_inputType);
-        jobject newElement_0_name;
-        newElement_0_name = env->NewStringUTF(std::string(entry_0.name.data(), entry_0.name.size()).c_str());
-        jobject newElement_0_description;
-        newElement_0_description = env->NewStringUTF(std::string(entry_0.description.data(), entry_0.description.size()).c_str());
-
-        jclass inputInfoStructClass;
-        err = chip::JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipStructs$MediaInputClusterInputInfo",
-                                                             inputInfoStructClass);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$MediaInputClusterInputInfo");
-            return;
-        }
-        jmethodID inputInfoStructCtor = env->GetMethodID(
-            inputInfoStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;)V");
-        if (inputInfoStructCtor == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$MediaInputClusterInputInfo constructor");
-            return;
-        }
-
-        newElement_0 = env->NewObject(inputInfoStructClass, inputInfoStructCtor, newElement_0_index, newElement_0_inputType,
-                                      newElement_0_name, newElement_0_description);
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -12229,9 +12589,9 @@ void CHIPMediaInputInputListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPMediaInputGeneratedCommandListAttributeCallback::CHIPMediaInputGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                         bool keepAlive) :
-    chip::Callback::Callback<CHIPMediaInputClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPFixedLabelAcceptedCommandListAttributeCallback::CHIPFixedLabelAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPFixedLabelClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -12248,7 +12608,7 @@ CHIPMediaInputGeneratedCommandListAttributeCallback::CHIPMediaInputGeneratedComm
     }
 }
 
-CHIPMediaInputGeneratedCommandListAttributeCallback::~CHIPMediaInputGeneratedCommandListAttributeCallback()
+CHIPFixedLabelAcceptedCommandListAttributeCallback::~CHIPFixedLabelAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -12259,7 +12619,7 @@ CHIPMediaInputGeneratedCommandListAttributeCallback::~CHIPMediaInputGeneratedCom
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPMediaInputGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPFixedLabelAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -12269,8 +12629,8 @@ void CHIPMediaInputGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPMediaInputGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPMediaInputGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPFixedLabelAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPFixedLabelAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -12300,10 +12660,8 @@ void CHIPMediaInputGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPMediaInputAcceptedCommandListAttributeCallback::CHIPMediaInputAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPMediaInputClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPFixedLabelAttributeListAttributeCallback::CHIPFixedLabelAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPFixedLabelClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -12319,7 +12677,7 @@ CHIPMediaInputAcceptedCommandListAttributeCallback::CHIPMediaInputAcceptedComman
     }
 }
 
-CHIPMediaInputAcceptedCommandListAttributeCallback::~CHIPMediaInputAcceptedCommandListAttributeCallback()
+CHIPFixedLabelAttributeListAttributeCallback::~CHIPFixedLabelAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -12330,8 +12688,8 @@ CHIPMediaInputAcceptedCommandListAttributeCallback::~CHIPMediaInputAcceptedComma
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPMediaInputAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPFixedLabelAttributeListAttributeCallback::CallbackFn(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -12340,8 +12698,8 @@ void CHIPMediaInputAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPMediaInputAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPMediaInputAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPFixedLabelAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPFixedLabelAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -12371,8 +12729,8 @@ void CHIPMediaInputAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPMediaInputAttributeListAttributeCallback::CHIPMediaInputAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPMediaInputClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPUserLabelLabelListAttributeCallback::CHIPUserLabelLabelListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPUserLabelClusterLabelListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -12388,7 +12746,7 @@ CHIPMediaInputAttributeListAttributeCallback::CHIPMediaInputAttributeListAttribu
     }
 }
 
-CHIPMediaInputAttributeListAttributeCallback::~CHIPMediaInputAttributeListAttributeCallback()
+CHIPUserLabelLabelListAttributeCallback::~CHIPUserLabelLabelListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -12399,8 +12757,9 @@ CHIPMediaInputAttributeListAttributeCallback::~CHIPMediaInputAttributeListAttrib
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPMediaInputAttributeListAttributeCallback::CallbackFn(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPUserLabelLabelListAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::UserLabel::Structs::LabelStruct::DecodableType> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -12409,8 +12768,8 @@ void CHIPMediaInputAttributeListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPMediaInputAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPMediaInputAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPUserLabelLabelListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPUserLabelLabelListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -12429,10 +12788,28 @@ void CHIPMediaInputAttributeListAttributeCallback::CallbackFn(void * context,
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        jobject newElement_0_label;
+        newElement_0_label = env->NewStringUTF(std::string(entry_0.label.data(), entry_0.label.size()).c_str());
+        jobject newElement_0_value;
+        newElement_0_value = env->NewStringUTF(std::string(entry_0.value.data(), entry_0.value.size()).c_str());
+
+        jclass labelStructStructClass;
+        err = chip::JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipStructs$UserLabelClusterLabelStruct",
+                                                             labelStructStructClass);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$UserLabelClusterLabelStruct");
+            return;
+        }
+        jmethodID labelStructStructCtor =
+            env->GetMethodID(labelStructStructClass, "<init>", "(Ljava/lang/String;Ljava/lang/String;)V");
+        if (labelStructStructCtor == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$UserLabelClusterLabelStruct constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(labelStructStructClass, labelStructStructCtor, newElement_0_label, newElement_0_value);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -12440,8 +12817,10 @@ void CHIPMediaInputAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPMediaPlaybackStartTimeAttributeCallback::CHIPMediaPlaybackStartTimeAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPMediaPlaybackClusterStartTimeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPUserLabelGeneratedCommandListAttributeCallback::CHIPUserLabelGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPUserLabelClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -12457,7 +12836,7 @@ CHIPMediaPlaybackStartTimeAttributeCallback::CHIPMediaPlaybackStartTimeAttribute
     }
 }
 
-CHIPMediaPlaybackStartTimeAttributeCallback::~CHIPMediaPlaybackStartTimeAttributeCallback()
+CHIPUserLabelGeneratedCommandListAttributeCallback::~CHIPUserLabelGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -12468,7 +12847,8 @@ CHIPMediaPlaybackStartTimeAttributeCallback::~CHIPMediaPlaybackStartTimeAttribut
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPMediaPlaybackStartTimeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint64_t> & value)
+void CHIPUserLabelGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -12476,8 +12856,9 @@ void CHIPMediaPlaybackStartTimeAttributeCallback::CallbackFn(void * context, con
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPMediaPlaybackStartTimeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPMediaPlaybackStartTimeAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPUserLabelGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPUserLabelGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -12485,92 +12866,31 @@ void CHIPMediaPlaybackStartTimeAttributeCallback::CallbackFn(void * context, con
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPMediaPlaybackDurationAttributeCallback::CHIPMediaPlaybackDurationAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPMediaPlaybackClusterDurationAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-        return;
-    }
-
-    javaCallbackRef = env->NewGlobalRef(javaCallback);
-    if (javaCallbackRef == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-    }
-}
-
-CHIPMediaPlaybackDurationAttributeCallback::~CHIPMediaPlaybackDurationAttributeCallback()
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not delete global reference for Java callback");
-        return;
-    }
-    env->DeleteGlobalRef(javaCallbackRef);
-}
-
-void CHIPMediaPlaybackDurationAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint64_t> & value)
-{
-    chip::DeviceLayer::StackUnlock unlock;
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    jobject javaCallbackRef;
-
-    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPMediaPlaybackDurationAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPMediaPlaybackDurationAttributeCallback *>(context), maybeDestroy);
-
-    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-    javaCallbackRef = cppCallback.get()->javaCallbackRef;
-    VerifyOrReturn(javaCallbackRef != nullptr,
-                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-    jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
-    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
-    {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
-    }
-
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
-}
-
-CHIPMediaPlaybackSeekRangeEndAttributeCallback::CHIPMediaPlaybackSeekRangeEndAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPMediaPlaybackClusterSeekRangeEndAttributeCallbackType>(CallbackFn, this),
+CHIPUserLabelAcceptedCommandListAttributeCallback::CHIPUserLabelAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPUserLabelClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -12587,7 +12907,7 @@ CHIPMediaPlaybackSeekRangeEndAttributeCallback::CHIPMediaPlaybackSeekRangeEndAtt
     }
 }
 
-CHIPMediaPlaybackSeekRangeEndAttributeCallback::~CHIPMediaPlaybackSeekRangeEndAttributeCallback()
+CHIPUserLabelAcceptedCommandListAttributeCallback::~CHIPUserLabelAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -12598,8 +12918,8 @@ CHIPMediaPlaybackSeekRangeEndAttributeCallback::~CHIPMediaPlaybackSeekRangeEndAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPMediaPlaybackSeekRangeEndAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::Nullable<uint64_t> & value)
+void CHIPUserLabelAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -12607,75 +12927,9 @@ void CHIPMediaPlaybackSeekRangeEndAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPMediaPlaybackSeekRangeEndAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPMediaPlaybackSeekRangeEndAttributeCallback *>(context), maybeDestroy);
-
-    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-    javaCallbackRef = cppCallback.get()->javaCallbackRef;
-    VerifyOrReturn(javaCallbackRef != nullptr,
-                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-    jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
-    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
-    {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
-    }
-
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
-}
-
-CHIPMediaPlaybackSeekRangeStartAttributeCallback::CHIPMediaPlaybackSeekRangeStartAttributeCallback(jobject javaCallback,
-                                                                                                   bool keepAlive) :
-    chip::Callback::Callback<CHIPMediaPlaybackClusterSeekRangeStartAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-        return;
-    }
-
-    javaCallbackRef = env->NewGlobalRef(javaCallback);
-    if (javaCallbackRef == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-    }
-}
-
-CHIPMediaPlaybackSeekRangeStartAttributeCallback::~CHIPMediaPlaybackSeekRangeStartAttributeCallback()
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not delete global reference for Java callback");
-        return;
-    }
-    env->DeleteGlobalRef(javaCallbackRef);
-}
-
-void CHIPMediaPlaybackSeekRangeStartAttributeCallback::CallbackFn(void * context,
-                                                                  const chip::app::DataModel::Nullable<uint64_t> & value)
-{
-    chip::DeviceLayer::StackUnlock unlock;
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    jobject javaCallbackRef;
 
-    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPMediaPlaybackSeekRangeStartAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPMediaPlaybackSeekRangeStartAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPUserLabelAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPUserLabelAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -12683,28 +12937,31 @@ void CHIPMediaPlaybackSeekRangeStartAttributeCallback::CallbackFn(void * context
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPMediaPlaybackGeneratedCommandListAttributeCallback::CHIPMediaPlaybackGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPMediaPlaybackClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPBooleanStateGeneratedCommandListAttributeCallback::CHIPBooleanStateGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                             bool keepAlive) :
+    chip::Callback::Callback<CHIPBooleanStateClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -12721,7 +12978,7 @@ CHIPMediaPlaybackGeneratedCommandListAttributeCallback::CHIPMediaPlaybackGenerat
     }
 }
 
-CHIPMediaPlaybackGeneratedCommandListAttributeCallback::~CHIPMediaPlaybackGeneratedCommandListAttributeCallback()
+CHIPBooleanStateGeneratedCommandListAttributeCallback::~CHIPBooleanStateGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -12732,7 +12989,7 @@ CHIPMediaPlaybackGeneratedCommandListAttributeCallback::~CHIPMediaPlaybackGenera
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPMediaPlaybackGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPBooleanStateGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -12742,8 +12999,8 @@ void CHIPMediaPlaybackGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPMediaPlaybackGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPMediaPlaybackGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPBooleanStateGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPBooleanStateGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -12773,9 +13030,9 @@ void CHIPMediaPlaybackGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPMediaPlaybackAcceptedCommandListAttributeCallback::CHIPMediaPlaybackAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                             bool keepAlive) :
-    chip::Callback::Callback<CHIPMediaPlaybackClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPBooleanStateAcceptedCommandListAttributeCallback::CHIPBooleanStateAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPBooleanStateClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -12792,7 +13049,7 @@ CHIPMediaPlaybackAcceptedCommandListAttributeCallback::CHIPMediaPlaybackAccepted
     }
 }
 
-CHIPMediaPlaybackAcceptedCommandListAttributeCallback::~CHIPMediaPlaybackAcceptedCommandListAttributeCallback()
+CHIPBooleanStateAcceptedCommandListAttributeCallback::~CHIPBooleanStateAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -12803,7 +13060,7 @@ CHIPMediaPlaybackAcceptedCommandListAttributeCallback::~CHIPMediaPlaybackAccepte
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPMediaPlaybackAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPBooleanStateAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -12813,8 +13070,8 @@ void CHIPMediaPlaybackAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPMediaPlaybackAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPMediaPlaybackAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPBooleanStateAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPBooleanStateAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -12844,9 +13101,9 @@ void CHIPMediaPlaybackAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPMediaPlaybackAttributeListAttributeCallback::CHIPMediaPlaybackAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                 bool keepAlive) :
-    chip::Callback::Callback<CHIPMediaPlaybackClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPBooleanStateAttributeListAttributeCallback::CHIPBooleanStateAttributeListAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPBooleanStateClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -12863,7 +13120,7 @@ CHIPMediaPlaybackAttributeListAttributeCallback::CHIPMediaPlaybackAttributeListA
     }
 }
 
-CHIPMediaPlaybackAttributeListAttributeCallback::~CHIPMediaPlaybackAttributeListAttributeCallback()
+CHIPBooleanStateAttributeListAttributeCallback::~CHIPBooleanStateAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -12874,8 +13131,8 @@ CHIPMediaPlaybackAttributeListAttributeCallback::~CHIPMediaPlaybackAttributeList
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPMediaPlaybackAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPBooleanStateAttributeListAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -12884,8 +13141,8 @@ void CHIPMediaPlaybackAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPMediaPlaybackAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPMediaPlaybackAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPBooleanStateAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPBooleanStateAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -13452,10 +13709,8 @@ void CHIPModeSelectAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPNetworkCommissioningNetworksAttributeCallback::CHIPNetworkCommissioningNetworksAttributeCallback(jobject javaCallback,
-                                                                                                     bool keepAlive) :
-    chip::Callback::Callback<CHIPNetworkCommissioningClusterNetworksAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPDoorLockLockStateAttributeCallback::CHIPDoorLockLockStateAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDoorLockClusterLockStateAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -13471,7 +13726,7 @@ CHIPNetworkCommissioningNetworksAttributeCallback::CHIPNetworkCommissioningNetwo
     }
 }
 
-CHIPNetworkCommissioningNetworksAttributeCallback::~CHIPNetworkCommissioningNetworksAttributeCallback()
+CHIPDoorLockLockStateAttributeCallback::~CHIPDoorLockLockStateAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -13482,10 +13737,8 @@ CHIPNetworkCommissioningNetworksAttributeCallback::~CHIPNetworkCommissioningNetw
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPNetworkCommissioningNetworksAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::DecodableType> &
-        list)
+void CHIPDoorLockLockStateAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -13493,9 +13746,8 @@ void CHIPNetworkCommissioningNetworksAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPNetworkCommissioningNetworksAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPNetworkCommissioningNetworksAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPDoorLockLockStateAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDoorLockLockStateAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -13503,57 +13755,27 @@ void CHIPNetworkCommissioningNetworksAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        jobject newElement_0_networkID;
-        jbyteArray newElement_0_networkIDByteArray = env->NewByteArray(static_cast<jsize>(entry_0.networkID.size()));
-        env->SetByteArrayRegion(newElement_0_networkIDByteArray, 0, static_cast<jsize>(entry_0.networkID.size()),
-                                reinterpret_cast<const jbyte *>(entry_0.networkID.data()));
-        newElement_0_networkID = newElement_0_networkIDByteArray;
-        jobject newElement_0_connected;
-        std::string newElement_0_connectedClassName     = "java/lang/Boolean";
-        std::string newElement_0_connectedCtorSignature = "(Z)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_connectedClassName.c_str(),
-                                                                   newElement_0_connectedCtorSignature.c_str(), entry_0.connected,
-                                                                   newElement_0_connected);
-
-        jclass networkInfoStructClass;
-        err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$NetworkCommissioningClusterNetworkInfo", networkInfoStructClass);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$NetworkCommissioningClusterNetworkInfo");
-            return;
-        }
-        jmethodID networkInfoStructCtor = env->GetMethodID(networkInfoStructClass, "<init>", "([BLjava/lang/Boolean;)V");
-        if (networkInfoStructCtor == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$NetworkCommissioningClusterNetworkInfo constructor");
-            return;
-        }
-
-        newElement_0 =
-            env->NewObject(networkInfoStructClass, networkInfoStructCtor, newElement_0_networkID, newElement_0_connected);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      static_cast<uint8_t>(value.Value()), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback::CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPNetworkCommissioningClusterLastNetworkingStatusAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPDoorLockDoorStateAttributeCallback::CHIPDoorLockDoorStateAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDoorLockClusterDoorStateAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -13569,7 +13791,7 @@ CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback::CHIPNetworkCommis
     }
 }
 
-CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback::~CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback()
+CHIPDoorLockDoorStateAttributeCallback::~CHIPDoorLockDoorStateAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -13580,9 +13802,8 @@ CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback::~CHIPNetworkCommi
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::Nullable<chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatus> & value)
+void CHIPDoorLockDoorStateAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlDoorState> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -13590,8 +13811,8 @@ void CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPDoorLockDoorStateAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDoorLockDoorStateAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -13618,9 +13839,9 @@ void CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPNetworkCommissioningLastNetworkIDAttributeCallback::CHIPNetworkCommissioningLastNetworkIDAttributeCallback(jobject javaCallback,
-                                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPNetworkCommissioningClusterLastNetworkIDAttributeCallbackType>(CallbackFn, this),
+CHIPDoorLockGeneratedCommandListAttributeCallback::CHIPDoorLockGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPDoorLockClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -13637,7 +13858,7 @@ CHIPNetworkCommissioningLastNetworkIDAttributeCallback::CHIPNetworkCommissioning
     }
 }
 
-CHIPNetworkCommissioningLastNetworkIDAttributeCallback::~CHIPNetworkCommissioningLastNetworkIDAttributeCallback()
+CHIPDoorLockGeneratedCommandListAttributeCallback::~CHIPDoorLockGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -13648,8 +13869,8 @@ CHIPNetworkCommissioningLastNetworkIDAttributeCallback::~CHIPNetworkCommissionin
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPNetworkCommissioningLastNetworkIDAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::ByteSpan> & value)
+void CHIPDoorLockGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -13657,8 +13878,9 @@ void CHIPNetworkCommissioningLastNetworkIDAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPNetworkCommissioningLastNetworkIDAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPNetworkCommissioningLastNetworkIDAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPDoorLockGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDoorLockGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -13666,28 +13888,31 @@ void CHIPNetworkCommissioningLastNetworkIDAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        jbyteArray javaValueByteArray = env->NewByteArray(static_cast<jsize>(value.Value().size()));
-        env->SetByteArrayRegion(javaValueByteArray, 0, static_cast<jsize>(value.Value().size()),
-                                reinterpret_cast<const jbyte *>(value.Value().data()));
-        javaValue = javaValueByteArray;
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback::CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPNetworkCommissioningClusterLastConnectErrorValueAttributeCallbackType>(CallbackFn, this),
+CHIPDoorLockAcceptedCommandListAttributeCallback::CHIPDoorLockAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                   bool keepAlive) :
+    chip::Callback::Callback<CHIPDoorLockClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -13704,7 +13929,7 @@ CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback::CHIPNetworkCommi
     }
 }
 
-CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback::~CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback()
+CHIPDoorLockAcceptedCommandListAttributeCallback::~CHIPDoorLockAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -13715,8 +13940,8 @@ CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback::~CHIPNetworkComm
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<int32_t> & value)
+void CHIPDoorLockAcceptedCommandListAttributeCallback::CallbackFn(void * context,
+                                                                  const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -13724,8 +13949,9 @@ void CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPDoorLockAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDoorLockAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -13733,29 +13959,30 @@ void CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int32_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPNetworkCommissioningGeneratedCommandListAttributeCallback::CHIPNetworkCommissioningGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPNetworkCommissioningClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPDoorLockAttributeListAttributeCallback::CHIPDoorLockAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDoorLockClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -13771,7 +13998,7 @@ CHIPNetworkCommissioningGeneratedCommandListAttributeCallback::CHIPNetworkCommis
     }
 }
 
-CHIPNetworkCommissioningGeneratedCommandListAttributeCallback::~CHIPNetworkCommissioningGeneratedCommandListAttributeCallback()
+CHIPDoorLockAttributeListAttributeCallback::~CHIPDoorLockAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -13782,8 +14009,8 @@ CHIPNetworkCommissioningGeneratedCommandListAttributeCallback::~CHIPNetworkCommi
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPNetworkCommissioningGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPDoorLockAttributeListAttributeCallback::CallbackFn(void * context,
+                                                            const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -13792,8 +14019,8 @@ void CHIPNetworkCommissioningGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPNetworkCommissioningGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPNetworkCommissioningGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPDoorLockAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPDoorLockAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -13823,9 +14050,9 @@ void CHIPNetworkCommissioningGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPNetworkCommissioningAcceptedCommandListAttributeCallback::CHIPNetworkCommissioningAcceptedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPNetworkCommissioningClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPWindowCoveringCurrentPositionLiftAttributeCallback::CHIPWindowCoveringCurrentPositionLiftAttributeCallback(jobject javaCallback,
+                                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionLiftAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -13842,7 +14069,7 @@ CHIPNetworkCommissioningAcceptedCommandListAttributeCallback::CHIPNetworkCommiss
     }
 }
 
-CHIPNetworkCommissioningAcceptedCommandListAttributeCallback::~CHIPNetworkCommissioningAcceptedCommandListAttributeCallback()
+CHIPWindowCoveringCurrentPositionLiftAttributeCallback::~CHIPWindowCoveringCurrentPositionLiftAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -13853,8 +14080,8 @@ CHIPNetworkCommissioningAcceptedCommandListAttributeCallback::~CHIPNetworkCommis
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPNetworkCommissioningAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPWindowCoveringCurrentPositionLiftAttributeCallback::CallbackFn(void * context,
+                                                                        const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -13862,9 +14089,8 @@ void CHIPNetworkCommissioningAcceptedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPNetworkCommissioningAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPNetworkCommissioningAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPWindowCoveringCurrentPositionLiftAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPWindowCoveringCurrentPositionLiftAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -13872,31 +14098,28 @@ void CHIPNetworkCommissioningAcceptedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback::CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPOtaSoftwareUpdateProviderClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPWindowCoveringCurrentPositionTiltAttributeCallback::CHIPWindowCoveringCurrentPositionTiltAttributeCallback(jobject javaCallback,
+                                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionTiltAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -13913,7 +14136,7 @@ CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback::CHIPOtaSoftwareUpda
     }
 }
 
-CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback::~CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback()
+CHIPWindowCoveringCurrentPositionTiltAttributeCallback::~CHIPWindowCoveringCurrentPositionTiltAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -13924,8 +14147,8 @@ CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback::~CHIPOtaSoftwareUpd
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPWindowCoveringCurrentPositionTiltAttributeCallback::CallbackFn(void * context,
+                                                                        const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -13933,9 +14156,8 @@ void CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPWindowCoveringCurrentPositionTiltAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPWindowCoveringCurrentPositionTiltAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -13943,31 +14165,28 @@ void CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback::
-    CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPOtaSoftwareUpdateRequestorClusterDefaultOtaProvidersAttributeCallbackType>(CallbackFn, this),
+CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback::CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionLiftPercentageAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -13984,8 +14203,8 @@ CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback::
     }
 }
 
-CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback::
-    ~CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback()
+CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback::
+    ~CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -13996,10 +14215,8 @@ CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType> & list)
+void CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::Percent> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -14007,9 +14224,8 @@ void CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback::Callbac
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -14017,65 +14233,28 @@ void CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback::Callbac
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        jobject newElement_0_providerNodeID;
-        std::string newElement_0_providerNodeIDClassName     = "java/lang/Long";
-        std::string newElement_0_providerNodeIDCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_providerNodeIDClassName.c_str(),
-                                                                       newElement_0_providerNodeIDCtorSignature.c_str(),
-                                                                       entry_0.providerNodeID, newElement_0_providerNodeID);
-        jobject newElement_0_endpoint;
-        std::string newElement_0_endpointClassName     = "java/lang/Integer";
-        std::string newElement_0_endpointCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_endpointClassName.c_str(),
-                                                                       newElement_0_endpointCtorSignature.c_str(), entry_0.endpoint,
-                                                                       newElement_0_endpoint);
-        jobject newElement_0_fabricIndex;
-        std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
-        std::string newElement_0_fabricIndexCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
-                                                                      newElement_0_fabricIndexCtorSignature.c_str(),
-                                                                      entry_0.fabricIndex, newElement_0_fabricIndex);
-
-        jclass providerLocationStructClass;
-        err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$OtaSoftwareUpdateRequestorClusterProviderLocation",
-            providerLocationStructClass);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$OtaSoftwareUpdateRequestorClusterProviderLocation");
-            return;
-        }
-        jmethodID providerLocationStructCtor =
-            env->GetMethodID(providerLocationStructClass, "<init>", "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Integer;)V");
-        if (providerLocationStructCtor == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$OtaSoftwareUpdateRequestorClusterProviderLocation constructor");
-            return;
-        }
-
-        newElement_0 = env->NewObject(providerLocationStructClass, providerLocationStructCtor, newElement_0_providerNodeID,
-                                      newElement_0_endpoint, newElement_0_fabricIndex);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback::
-    CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPOtaSoftwareUpdateRequestorClusterUpdateStateProgressAttributeCallbackType>(CallbackFn, this),
+CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback::CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionTiltPercentageAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -14092,8 +14271,8 @@ CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback::
     }
 }
 
-CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback::
-    ~CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback()
+CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback::
+    ~CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -14104,8 +14283,8 @@ CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::Percent> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -14113,8 +14292,8 @@ void CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback::Callbac
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -14141,9 +14320,9 @@ void CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback::Callbac
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback::CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPOtaSoftwareUpdateRequestorClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback::
+    CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPWindowCoveringClusterTargetPositionLiftPercent100thsAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -14160,7 +14339,8 @@ CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback::CHIPOtaSoftwareUpd
     }
 }
 
-CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback::~CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback()
+CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback::
+    ~CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -14171,8 +14351,8 @@ CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback::~CHIPOtaSoftwareUp
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::Percent100ths> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -14180,9 +14360,8 @@ void CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -14190,31 +14369,28 @@ void CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPOccupancySensingGeneratedCommandListAttributeCallback::CHIPOccupancySensingGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPOccupancySensingClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback::
+    CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPWindowCoveringClusterTargetPositionTiltPercent100thsAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -14231,7 +14407,8 @@ CHIPOccupancySensingGeneratedCommandListAttributeCallback::CHIPOccupancySensingG
     }
 }
 
-CHIPOccupancySensingGeneratedCommandListAttributeCallback::~CHIPOccupancySensingGeneratedCommandListAttributeCallback()
+CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback::
+    ~CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -14242,8 +14419,8 @@ CHIPOccupancySensingGeneratedCommandListAttributeCallback::~CHIPOccupancySensing
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOccupancySensingGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::Percent100ths> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -14251,9 +14428,8 @@ void CHIPOccupancySensingGeneratedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPOccupancySensingGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOccupancySensingGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -14261,31 +14437,28 @@ void CHIPOccupancySensingGeneratedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPOccupancySensingAcceptedCommandListAttributeCallback::CHIPOccupancySensingAcceptedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPOccupancySensingClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback::
+    CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionLiftPercent100thsAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -14302,7 +14475,8 @@ CHIPOccupancySensingAcceptedCommandListAttributeCallback::CHIPOccupancySensingAc
     }
 }
 
-CHIPOccupancySensingAcceptedCommandListAttributeCallback::~CHIPOccupancySensingAcceptedCommandListAttributeCallback()
+CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback::
+    ~CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -14313,8 +14487,8 @@ CHIPOccupancySensingAcceptedCommandListAttributeCallback::~CHIPOccupancySensingA
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOccupancySensingAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::Percent100ths> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -14322,9 +14496,8 @@ void CHIPOccupancySensingAcceptedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPOccupancySensingAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOccupancySensingAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -14332,31 +14505,28 @@ void CHIPOccupancySensingAcceptedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPOccupancySensingAttributeListAttributeCallback::CHIPOccupancySensingAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPOccupancySensingClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback::
+    CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionTiltPercent100thsAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -14373,7 +14543,8 @@ CHIPOccupancySensingAttributeListAttributeCallback::CHIPOccupancySensingAttribut
     }
 }
 
-CHIPOccupancySensingAttributeListAttributeCallback::~CHIPOccupancySensingAttributeListAttributeCallback()
+CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback::
+    ~CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -14384,8 +14555,8 @@ CHIPOccupancySensingAttributeListAttributeCallback::~CHIPOccupancySensingAttribu
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOccupancySensingAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::Percent100ths> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -14393,9 +14564,8 @@ void CHIPOccupancySensingAttributeListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPOccupancySensingAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOccupancySensingAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -14403,96 +14573,28 @@ void CHIPOccupancySensingAttributeListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
-    }
-
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-}
-
-CHIPOnOffStartUpOnOffAttributeCallback::CHIPOnOffStartUpOnOffAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPOnOffClusterStartUpOnOffAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-        return;
-    }
-
-    javaCallbackRef = env->NewGlobalRef(javaCallback);
-    if (javaCallbackRef == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-    }
-}
-
-CHIPOnOffStartUpOnOffAttributeCallback::~CHIPOnOffStartUpOnOffAttributeCallback()
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not delete global reference for Java callback");
-        return;
-    }
-    env->DeleteGlobalRef(javaCallbackRef);
-}
-
-void CHIPOnOffStartUpOnOffAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::OnOff::OnOffStartUpOnOff> & value)
-{
-    chip::DeviceLayer::StackUnlock unlock;
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    jobject javaCallbackRef;
-
-    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPOnOffStartUpOnOffAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOnOffStartUpOnOffAttributeCallback *>(context), maybeDestroy);
-
-    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-    javaCallbackRef = cppCallback.get()->javaCallbackRef;
-    VerifyOrReturn(javaCallbackRef != nullptr,
-                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-    jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
-    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
+        javaValue = nullptr;
     }
     else
     {
         std::string javaValueClassName     = "java/lang/Integer";
         std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      static_cast<uint8_t>(value.Value()), javaValue);
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPOnOffGeneratedCommandListAttributeCallback::CHIPOnOffGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPOnOffClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPWindowCoveringGeneratedCommandListAttributeCallback::CHIPWindowCoveringGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPWindowCoveringClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -14509,7 +14611,7 @@ CHIPOnOffGeneratedCommandListAttributeCallback::CHIPOnOffGeneratedCommandListAtt
     }
 }
 
-CHIPOnOffGeneratedCommandListAttributeCallback::~CHIPOnOffGeneratedCommandListAttributeCallback()
+CHIPWindowCoveringGeneratedCommandListAttributeCallback::~CHIPWindowCoveringGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -14520,8 +14622,8 @@ CHIPOnOffGeneratedCommandListAttributeCallback::~CHIPOnOffGeneratedCommandListAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOnOffGeneratedCommandListAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPWindowCoveringGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -14530,8 +14632,8 @@ void CHIPOnOffGeneratedCommandListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPOnOffGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOnOffGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPWindowCoveringGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPWindowCoveringGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -14561,8 +14663,10 @@ void CHIPOnOffGeneratedCommandListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPOnOffAcceptedCommandListAttributeCallback::CHIPOnOffAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPOnOffClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPWindowCoveringAcceptedCommandListAttributeCallback::CHIPWindowCoveringAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPWindowCoveringClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -14578,7 +14682,7 @@ CHIPOnOffAcceptedCommandListAttributeCallback::CHIPOnOffAcceptedCommandListAttri
     }
 }
 
-CHIPOnOffAcceptedCommandListAttributeCallback::~CHIPOnOffAcceptedCommandListAttributeCallback()
+CHIPWindowCoveringAcceptedCommandListAttributeCallback::~CHIPWindowCoveringAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -14589,8 +14693,8 @@ CHIPOnOffAcceptedCommandListAttributeCallback::~CHIPOnOffAcceptedCommandListAttr
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOnOffAcceptedCommandListAttributeCallback::CallbackFn(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPWindowCoveringAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -14599,8 +14703,8 @@ void CHIPOnOffAcceptedCommandListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPOnOffAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOnOffAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPWindowCoveringAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPWindowCoveringAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -14630,8 +14734,10 @@ void CHIPOnOffAcceptedCommandListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPOnOffAttributeListAttributeCallback::CHIPOnOffAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPOnOffClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPWindowCoveringAttributeListAttributeCallback::CHIPWindowCoveringAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                   bool keepAlive) :
+    chip::Callback::Callback<CHIPWindowCoveringClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -14647,7 +14753,7 @@ CHIPOnOffAttributeListAttributeCallback::CHIPOnOffAttributeListAttributeCallback
     }
 }
 
-CHIPOnOffAttributeListAttributeCallback::~CHIPOnOffAttributeListAttributeCallback()
+CHIPWindowCoveringAttributeListAttributeCallback::~CHIPWindowCoveringAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -14658,8 +14764,8 @@ CHIPOnOffAttributeListAttributeCallback::~CHIPOnOffAttributeListAttributeCallbac
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOnOffAttributeListAttributeCallback::CallbackFn(void * context,
-                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPWindowCoveringAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -14668,8 +14774,8 @@ void CHIPOnOffAttributeListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPOnOffAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOnOffAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPWindowCoveringAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPWindowCoveringAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -14699,9 +14805,9 @@ void CHIPOnOffAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback::
-    CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPOnOffSwitchConfigurationClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPBarrierControlGeneratedCommandListAttributeCallback::CHIPBarrierControlGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPBarrierControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -14718,8 +14824,7 @@ CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback::
-    ~CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback()
+CHIPBarrierControlGeneratedCommandListAttributeCallback::~CHIPBarrierControlGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -14730,7 +14835,7 @@ CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPBarrierControlGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -14740,8 +14845,8 @@ void CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback::Callback
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPBarrierControlGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPBarrierControlGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -14771,9 +14876,9 @@ void CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback::Callback
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback::CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPOnOffSwitchConfigurationClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPBarrierControlAcceptedCommandListAttributeCallback::CHIPBarrierControlAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPBarrierControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -14790,8 +14895,7 @@ CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback::CHIPOnOffSwitc
     }
 }
 
-CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback::
-    ~CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback()
+CHIPBarrierControlAcceptedCommandListAttributeCallback::~CHIPBarrierControlAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -14802,7 +14906,7 @@ CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPBarrierControlAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -14812,8 +14916,8 @@ void CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback::CallbackF
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPBarrierControlAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPBarrierControlAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -14843,9 +14947,9 @@ void CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback::CallbackF
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPOnOffSwitchConfigurationAttributeListAttributeCallback::CHIPOnOffSwitchConfigurationAttributeListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPOnOffSwitchConfigurationClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPBarrierControlAttributeListAttributeCallback::CHIPBarrierControlAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                   bool keepAlive) :
+    chip::Callback::Callback<CHIPBarrierControlClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -14862,7 +14966,7 @@ CHIPOnOffSwitchConfigurationAttributeListAttributeCallback::CHIPOnOffSwitchConfi
     }
 }
 
-CHIPOnOffSwitchConfigurationAttributeListAttributeCallback::~CHIPOnOffSwitchConfigurationAttributeListAttributeCallback()
+CHIPBarrierControlAttributeListAttributeCallback::~CHIPBarrierControlAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -14873,7 +14977,7 @@ CHIPOnOffSwitchConfigurationAttributeListAttributeCallback::~CHIPOnOffSwitchConf
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOnOffSwitchConfigurationAttributeListAttributeCallback::CallbackFn(
+void CHIPBarrierControlAttributeListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -14883,8 +14987,8 @@ void CHIPOnOffSwitchConfigurationAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPOnOffSwitchConfigurationAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOnOffSwitchConfigurationAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPBarrierControlAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPBarrierControlAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -14914,9 +15018,9 @@ void CHIPOnOffSwitchConfigurationAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPOperationalCredentialsNOCsAttributeCallback::CHIPOperationalCredentialsNOCsAttributeCallback(jobject javaCallback,
-                                                                                                 bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalCredentialsClusterNOCsAttributeCallbackType>(CallbackFn, this),
+CHIPPumpConfigurationAndControlMaxPressureAttributeCallback::CHIPPumpConfigurationAndControlMaxPressureAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxPressureAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -14933,7 +15037,7 @@ CHIPOperationalCredentialsNOCsAttributeCallback::CHIPOperationalCredentialsNOCsA
     }
 }
 
-CHIPOperationalCredentialsNOCsAttributeCallback::~CHIPOperationalCredentialsNOCsAttributeCallback()
+CHIPPumpConfigurationAndControlMaxPressureAttributeCallback::~CHIPPumpConfigurationAndControlMaxPressureAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -14944,10 +15048,8 @@ CHIPOperationalCredentialsNOCsAttributeCallback::~CHIPOperationalCredentialsNOCs
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOperationalCredentialsNOCsAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::DecodableType> &
-        list)
+void CHIPPumpConfigurationAndControlMaxPressureAttributeCallback::CallbackFn(void * context,
+                                                                             const chip::app::DataModel::Nullable<int16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -14955,9 +15057,8 @@ void CHIPOperationalCredentialsNOCsAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPOperationalCredentialsNOCsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOperationalCredentialsNOCsAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPumpConfigurationAndControlMaxPressureAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPumpConfigurationAndControlMaxPressureAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -14965,68 +15066,28 @@ void CHIPOperationalCredentialsNOCsAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        jobject newElement_0_noc;
-        jbyteArray newElement_0_nocByteArray = env->NewByteArray(static_cast<jsize>(entry_0.noc.size()));
-        env->SetByteArrayRegion(newElement_0_nocByteArray, 0, static_cast<jsize>(entry_0.noc.size()),
-                                reinterpret_cast<const jbyte *>(entry_0.noc.data()));
-        newElement_0_noc = newElement_0_nocByteArray;
-        jobject newElement_0_icac;
-        if (entry_0.icac.IsNull())
-        {
-            newElement_0_icac = nullptr;
-        }
-        else
-        {
-            jbyteArray newElement_0_icacByteArray = env->NewByteArray(static_cast<jsize>(entry_0.icac.Value().size()));
-            env->SetByteArrayRegion(newElement_0_icacByteArray, 0, static_cast<jsize>(entry_0.icac.Value().size()),
-                                    reinterpret_cast<const jbyte *>(entry_0.icac.Value().data()));
-            newElement_0_icac = newElement_0_icacByteArray;
-        }
-        jobject newElement_0_fabricIndex;
-        std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
-        std::string newElement_0_fabricIndexCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
-                                                                      newElement_0_fabricIndexCtorSignature.c_str(),
-                                                                      entry_0.fabricIndex, newElement_0_fabricIndex);
-
-        jclass NOCStructStructClass;
-        err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$OperationalCredentialsClusterNOCStruct", NOCStructStructClass);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$OperationalCredentialsClusterNOCStruct");
-            return;
-        }
-        jmethodID NOCStructStructCtor = env->GetMethodID(NOCStructStructClass, "<init>", "([B[BLjava/lang/Integer;)V");
-        if (NOCStructStructCtor == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$OperationalCredentialsClusterNOCStruct constructor");
-            return;
-        }
-
-        newElement_0 = env->NewObject(NOCStructStructClass, NOCStructStructCtor, newElement_0_noc, newElement_0_icac,
-                                      newElement_0_fabricIndex);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPOperationalCredentialsFabricsAttributeCallback::CHIPOperationalCredentialsFabricsAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalCredentialsClusterFabricsAttributeCallbackType>(CallbackFn, this),
+CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback::CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxSpeedAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -15043,7 +15104,7 @@ CHIPOperationalCredentialsFabricsAttributeCallback::CHIPOperationalCredentialsFa
     }
 }
 
-CHIPOperationalCredentialsFabricsAttributeCallback::~CHIPOperationalCredentialsFabricsAttributeCallback()
+CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback::~CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -15054,10 +15115,8 @@ CHIPOperationalCredentialsFabricsAttributeCallback::~CHIPOperationalCredentialsF
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOperationalCredentialsFabricsAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & list)
+void CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback::CallbackFn(void * context,
+                                                                          const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -15065,9 +15124,8 @@ void CHIPOperationalCredentialsFabricsAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPOperationalCredentialsFabricsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOperationalCredentialsFabricsAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -15075,78 +15133,28 @@ void CHIPOperationalCredentialsFabricsAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        jobject newElement_0_rootPublicKey;
-        jbyteArray newElement_0_rootPublicKeyByteArray = env->NewByteArray(static_cast<jsize>(entry_0.rootPublicKey.size()));
-        env->SetByteArrayRegion(newElement_0_rootPublicKeyByteArray, 0, static_cast<jsize>(entry_0.rootPublicKey.size()),
-                                reinterpret_cast<const jbyte *>(entry_0.rootPublicKey.data()));
-        newElement_0_rootPublicKey = newElement_0_rootPublicKeyByteArray;
-        jobject newElement_0_vendorId;
-        std::string newElement_0_vendorIdClassName     = "java/lang/Integer";
-        std::string newElement_0_vendorIdCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-            newElement_0_vendorIdClassName.c_str(), newElement_0_vendorIdCtorSignature.c_str(),
-            static_cast<uint16_t>(entry_0.vendorId), newElement_0_vendorId);
-        jobject newElement_0_fabricId;
-        std::string newElement_0_fabricIdClassName     = "java/lang/Long";
-        std::string newElement_0_fabricIdCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_fabricIdClassName.c_str(),
-                                                                       newElement_0_fabricIdCtorSignature.c_str(), entry_0.fabricId,
-                                                                       newElement_0_fabricId);
-        jobject newElement_0_nodeId;
-        std::string newElement_0_nodeIdClassName     = "java/lang/Long";
-        std::string newElement_0_nodeIdCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(
-            newElement_0_nodeIdClassName.c_str(), newElement_0_nodeIdCtorSignature.c_str(), entry_0.nodeId, newElement_0_nodeId);
-        jobject newElement_0_label;
-        newElement_0_label = env->NewStringUTF(std::string(entry_0.label.data(), entry_0.label.size()).c_str());
-        jobject newElement_0_fabricIndex;
-        std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
-        std::string newElement_0_fabricIndexCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
-                                                                      newElement_0_fabricIndexCtorSignature.c_str(),
-                                                                      entry_0.fabricIndex, newElement_0_fabricIndex);
-
-        jclass fabricDescriptorStructClass;
-        err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$OperationalCredentialsClusterFabricDescriptor", fabricDescriptorStructClass);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$OperationalCredentialsClusterFabricDescriptor");
-            return;
-        }
-        jmethodID fabricDescriptorStructCtor =
-            env->GetMethodID(fabricDescriptorStructClass, "<init>",
-                             "([BLjava/lang/Integer;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Integer;)V");
-        if (fabricDescriptorStructCtor == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$OperationalCredentialsClusterFabricDescriptor constructor");
-            return;
-        }
-
-        newElement_0 = env->NewObject(fabricDescriptorStructClass, fabricDescriptorStructCtor, newElement_0_rootPublicKey,
-                                      newElement_0_vendorId, newElement_0_fabricId, newElement_0_nodeId, newElement_0_label,
-                                      newElement_0_fabricIndex);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback::
-    CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalCredentialsClusterTrustedRootCertificatesAttributeCallbackType>(CallbackFn, this),
+CHIPPumpConfigurationAndControlMaxFlowAttributeCallback::CHIPPumpConfigurationAndControlMaxFlowAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxFlowAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -15163,8 +15171,7 @@ CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback::
     }
 }
 
-CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback::
-    ~CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback()
+CHIPPumpConfigurationAndControlMaxFlowAttributeCallback::~CHIPPumpConfigurationAndControlMaxFlowAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -15175,8 +15182,8 @@ CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & list)
+void CHIPPumpConfigurationAndControlMaxFlowAttributeCallback::CallbackFn(void * context,
+                                                                         const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -15184,9 +15191,8 @@ void CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback::Callbac
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPumpConfigurationAndControlMaxFlowAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPumpConfigurationAndControlMaxFlowAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -15194,31 +15200,28 @@ void CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback::Callbac
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        jbyteArray newElement_0ByteArray = env->NewByteArray(static_cast<jsize>(entry_0.size()));
-        env->SetByteArrayRegion(newElement_0ByteArray, 0, static_cast<jsize>(entry_0.size()),
-                                reinterpret_cast<const jbyte *>(entry_0.data()));
-        newElement_0 = newElement_0ByteArray;
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback::CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback(
+CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback::CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalCredentialsClusterCurrentFabricIndexAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMinConstPressureAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -15235,7 +15238,8 @@ CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback::CHIPOperationalCr
     }
 }
 
-CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback::~CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback()
+CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback::
+    ~CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -15246,7 +15250,8 @@ CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback::~CHIPOperationalC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback::CallbackFn(void * context, chip::FabricIndex value)
+void CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -15254,8 +15259,8 @@ void CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback::CallbackFn(v
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -15267,17 +15272,24 @@ void CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback::CallbackFn(v
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
-    std::string javaValueClassName     = "java/lang/Integer";
-    std::string javaValueCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(), value,
-                                                                  javaValue);
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
+    }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPOperationalCredentialsGeneratedCommandListAttributeCallback::CHIPOperationalCredentialsGeneratedCommandListAttributeCallback(
+CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback::CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalCredentialsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxConstPressureAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -15294,7 +15306,8 @@ CHIPOperationalCredentialsGeneratedCommandListAttributeCallback::CHIPOperational
     }
 }
 
-CHIPOperationalCredentialsGeneratedCommandListAttributeCallback::~CHIPOperationalCredentialsGeneratedCommandListAttributeCallback()
+CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback::
+    ~CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -15305,8 +15318,8 @@ CHIPOperationalCredentialsGeneratedCommandListAttributeCallback::~CHIPOperationa
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOperationalCredentialsGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -15314,9 +15327,8 @@ void CHIPOperationalCredentialsGeneratedCommandListAttributeCallback::CallbackFn
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPOperationalCredentialsGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOperationalCredentialsGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -15324,31 +15336,28 @@ void CHIPOperationalCredentialsGeneratedCommandListAttributeCallback::CallbackFn
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPOperationalCredentialsAcceptedCommandListAttributeCallback::CHIPOperationalCredentialsAcceptedCommandListAttributeCallback(
+CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback::CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalCredentialsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMinCompPressureAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -15365,7 +15374,7 @@ CHIPOperationalCredentialsAcceptedCommandListAttributeCallback::CHIPOperationalC
     }
 }
 
-CHIPOperationalCredentialsAcceptedCommandListAttributeCallback::~CHIPOperationalCredentialsAcceptedCommandListAttributeCallback()
+CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback::~CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -15376,8 +15385,8 @@ CHIPOperationalCredentialsAcceptedCommandListAttributeCallback::~CHIPOperational
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOperationalCredentialsAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -15385,9 +15394,8 @@ void CHIPOperationalCredentialsAcceptedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPOperationalCredentialsAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOperationalCredentialsAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -15395,31 +15403,28 @@ void CHIPOperationalCredentialsAcceptedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPOperationalCredentialsAttributeListAttributeCallback::CHIPOperationalCredentialsAttributeListAttributeCallback(
+CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback::CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalCredentialsClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxCompPressureAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -15436,7 +15441,7 @@ CHIPOperationalCredentialsAttributeListAttributeCallback::CHIPOperationalCredent
     }
 }
 
-CHIPOperationalCredentialsAttributeListAttributeCallback::~CHIPOperationalCredentialsAttributeListAttributeCallback()
+CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback::~CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -15447,8 +15452,8 @@ CHIPOperationalCredentialsAttributeListAttributeCallback::~CHIPOperationalCreden
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOperationalCredentialsAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -15456,9 +15461,8 @@ void CHIPOperationalCredentialsAttributeListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPOperationalCredentialsAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPOperationalCredentialsAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -15466,31 +15470,28 @@ void CHIPOperationalCredentialsAttributeListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPPowerSourceActiveWiredFaultsAttributeCallback::CHIPPowerSourceActiveWiredFaultsAttributeCallback(jobject javaCallback,
-                                                                                                     bool keepAlive) :
-    chip::Callback::Callback<CHIPPowerSourceClusterActiveWiredFaultsAttributeCallbackType>(CallbackFn, this),
+CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback::CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMinConstSpeedAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -15507,7 +15508,7 @@ CHIPPowerSourceActiveWiredFaultsAttributeCallback::CHIPPowerSourceActiveWiredFau
     }
 }
 
-CHIPPowerSourceActiveWiredFaultsAttributeCallback::~CHIPPowerSourceActiveWiredFaultsAttributeCallback()
+CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback::~CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -15518,8 +15519,8 @@ CHIPPowerSourceActiveWiredFaultsAttributeCallback::~CHIPPowerSourceActiveWiredFa
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPowerSourceActiveWiredFaultsAttributeCallback::CallbackFn(void * context,
-                                                                   const chip::app::DataModel::DecodableList<uint8_t> & list)
+void CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -15527,9 +15528,8 @@ void CHIPPowerSourceActiveWiredFaultsAttributeCallback::CallbackFn(void * contex
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPPowerSourceActiveWiredFaultsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPowerSourceActiveWiredFaultsAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -15537,31 +15537,28 @@ void CHIPPowerSourceActiveWiredFaultsAttributeCallback::CallbackFn(void * contex
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Integer";
-        std::string newElement_0CtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0ClassName.c_str(),
-                                                                      newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPPowerSourceActiveBatteryFaultsAttributeCallback::CHIPPowerSourceActiveBatteryFaultsAttributeCallback(jobject javaCallback,
-                                                                                                         bool keepAlive) :
-    chip::Callback::Callback<CHIPPowerSourceClusterActiveBatteryFaultsAttributeCallbackType>(CallbackFn, this),
+CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback::CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxConstSpeedAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -15578,7 +15575,7 @@ CHIPPowerSourceActiveBatteryFaultsAttributeCallback::CHIPPowerSourceActiveBatter
     }
 }
 
-CHIPPowerSourceActiveBatteryFaultsAttributeCallback::~CHIPPowerSourceActiveBatteryFaultsAttributeCallback()
+CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback::~CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -15589,8 +15586,8 @@ CHIPPowerSourceActiveBatteryFaultsAttributeCallback::~CHIPPowerSourceActiveBatte
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPowerSourceActiveBatteryFaultsAttributeCallback::CallbackFn(void * context,
-                                                                     const chip::app::DataModel::DecodableList<uint8_t> & list)
+void CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -15598,9 +15595,8 @@ void CHIPPowerSourceActiveBatteryFaultsAttributeCallback::CallbackFn(void * cont
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPPowerSourceActiveBatteryFaultsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPowerSourceActiveBatteryFaultsAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -15608,31 +15604,28 @@ void CHIPPowerSourceActiveBatteryFaultsAttributeCallback::CallbackFn(void * cont
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Integer";
-        std::string newElement_0CtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0ClassName.c_str(),
-                                                                      newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback::CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback(
+CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback::CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPowerSourceClusterActiveBatteryChargeFaultsAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMinConstFlowAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -15649,7 +15642,7 @@ CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback::CHIPPowerSourceActive
     }
 }
 
-CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback::~CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback()
+CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback::~CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -15660,8 +15653,8 @@ CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback::~CHIPPowerSourceActiv
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<uint8_t> & list)
+void CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -15669,9 +15662,8 @@ void CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -15679,31 +15671,28 @@ void CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Integer";
-        std::string newElement_0CtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0ClassName.c_str(),
-                                                                      newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPPowerSourceGeneratedCommandListAttributeCallback::CHIPPowerSourceGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPPowerSourceClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback::CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxConstFlowAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -15720,7 +15709,7 @@ CHIPPowerSourceGeneratedCommandListAttributeCallback::CHIPPowerSourceGeneratedCo
     }
 }
 
-CHIPPowerSourceGeneratedCommandListAttributeCallback::~CHIPPowerSourceGeneratedCommandListAttributeCallback()
+CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback::~CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -15731,8 +15720,8 @@ CHIPPowerSourceGeneratedCommandListAttributeCallback::~CHIPPowerSourceGeneratedC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPowerSourceGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -15740,9 +15729,8 @@ void CHIPPowerSourceGeneratedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPPowerSourceGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPowerSourceGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -15750,31 +15738,28 @@ void CHIPPowerSourceGeneratedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPPowerSourceAcceptedCommandListAttributeCallback::CHIPPowerSourceAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                         bool keepAlive) :
-    chip::Callback::Callback<CHIPPowerSourceClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPPumpConfigurationAndControlMinConstTempAttributeCallback::CHIPPumpConfigurationAndControlMinConstTempAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMinConstTempAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -15791,7 +15776,7 @@ CHIPPowerSourceAcceptedCommandListAttributeCallback::CHIPPowerSourceAcceptedComm
     }
 }
 
-CHIPPowerSourceAcceptedCommandListAttributeCallback::~CHIPPowerSourceAcceptedCommandListAttributeCallback()
+CHIPPumpConfigurationAndControlMinConstTempAttributeCallback::~CHIPPumpConfigurationAndControlMinConstTempAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -15802,8 +15787,8 @@ CHIPPowerSourceAcceptedCommandListAttributeCallback::~CHIPPowerSourceAcceptedCom
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPowerSourceAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPPumpConfigurationAndControlMinConstTempAttributeCallback::CallbackFn(void * context,
+                                                                              const chip::app::DataModel::Nullable<int16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -15811,9 +15796,8 @@ void CHIPPowerSourceAcceptedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPPowerSourceAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPowerSourceAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPumpConfigurationAndControlMinConstTempAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPumpConfigurationAndControlMinConstTempAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -15821,30 +15805,29 @@ void CHIPPowerSourceAcceptedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPPowerSourceAttributeListAttributeCallback::CHIPPowerSourceAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPowerSourceClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback::CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxConstTempAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -15860,7 +15843,7 @@ CHIPPowerSourceAttributeListAttributeCallback::CHIPPowerSourceAttributeListAttri
     }
 }
 
-CHIPPowerSourceAttributeListAttributeCallback::~CHIPPowerSourceAttributeListAttributeCallback()
+CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback::~CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -15871,8 +15854,8 @@ CHIPPowerSourceAttributeListAttributeCallback::~CHIPPowerSourceAttributeListAttr
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPowerSourceAttributeListAttributeCallback::CallbackFn(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback::CallbackFn(void * context,
+                                                                              const chip::app::DataModel::Nullable<int16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -15880,9 +15863,8 @@ void CHIPPowerSourceAttributeListAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPPowerSourceAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPowerSourceAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -15890,31 +15872,28 @@ void CHIPPowerSourceAttributeListAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPPowerSourceConfigurationSourcesAttributeCallback::CHIPPowerSourceConfigurationSourcesAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPPowerSourceConfigurationClusterSourcesAttributeCallbackType>(CallbackFn, this),
+CHIPPumpConfigurationAndControlCapacityAttributeCallback::CHIPPumpConfigurationAndControlCapacityAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterCapacityAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -15931,7 +15910,7 @@ CHIPPowerSourceConfigurationSourcesAttributeCallback::CHIPPowerSourceConfigurati
     }
 }
 
-CHIPPowerSourceConfigurationSourcesAttributeCallback::~CHIPPowerSourceConfigurationSourcesAttributeCallback()
+CHIPPumpConfigurationAndControlCapacityAttributeCallback::~CHIPPumpConfigurationAndControlCapacityAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -15942,8 +15921,8 @@ CHIPPowerSourceConfigurationSourcesAttributeCallback::~CHIPPowerSourceConfigurat
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPowerSourceConfigurationSourcesAttributeCallback::CallbackFn(void * context,
-                                                                      const chip::app::DataModel::DecodableList<uint8_t> & list)
+void CHIPPumpConfigurationAndControlCapacityAttributeCallback::CallbackFn(void * context,
+                                                                          const chip::app::DataModel::Nullable<int16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -15951,9 +15930,8 @@ void CHIPPowerSourceConfigurationSourcesAttributeCallback::CallbackFn(void * con
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPPowerSourceConfigurationSourcesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPowerSourceConfigurationSourcesAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPumpConfigurationAndControlCapacityAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPumpConfigurationAndControlCapacityAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -15961,31 +15939,28 @@ void CHIPPowerSourceConfigurationSourcesAttributeCallback::CallbackFn(void * con
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Integer";
-        std::string newElement_0CtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0ClassName.c_str(),
-                                                                      newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback::
-    CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPowerSourceConfigurationClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPPumpConfigurationAndControlSpeedAttributeCallback::CHIPPumpConfigurationAndControlSpeedAttributeCallback(jobject javaCallback,
+                                                                                                             bool keepAlive) :
+    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterSpeedAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -16002,8 +15977,7 @@ CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback::
-    ~CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback()
+CHIPPumpConfigurationAndControlSpeedAttributeCallback::~CHIPPumpConfigurationAndControlSpeedAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -16014,8 +15988,8 @@ CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPPumpConfigurationAndControlSpeedAttributeCallback::CallbackFn(void * context,
+                                                                       const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -16023,9 +15997,8 @@ void CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback::Callback
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPumpConfigurationAndControlSpeedAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPumpConfigurationAndControlSpeedAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -16033,31 +16006,28 @@ void CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback::Callback
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback::CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPowerSourceConfigurationClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback::
+    CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterLifetimeRunningHoursAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -16074,8 +16044,8 @@ CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback::CHIPPowerSourc
     }
 }
 
-CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback::
-    ~CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback()
+CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback::
+    ~CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -16086,8 +16056,8 @@ CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -16095,9 +16065,8 @@ void CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback::CallbackF
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -16105,31 +16074,28 @@ void CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback::CallbackF
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPPowerSourceConfigurationAttributeListAttributeCallback::CHIPPowerSourceConfigurationAttributeListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPowerSourceConfigurationClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPPumpConfigurationAndControlPowerAttributeCallback::CHIPPumpConfigurationAndControlPowerAttributeCallback(jobject javaCallback,
+                                                                                                             bool keepAlive) :
+    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterPowerAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -16146,7 +16112,7 @@ CHIPPowerSourceConfigurationAttributeListAttributeCallback::CHIPPowerSourceConfi
     }
 }
 
-CHIPPowerSourceConfigurationAttributeListAttributeCallback::~CHIPPowerSourceConfigurationAttributeListAttributeCallback()
+CHIPPumpConfigurationAndControlPowerAttributeCallback::~CHIPPumpConfigurationAndControlPowerAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -16157,8 +16123,8 @@ CHIPPowerSourceConfigurationAttributeListAttributeCallback::~CHIPPowerSourceConf
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPowerSourceConfigurationAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPPumpConfigurationAndControlPowerAttributeCallback::CallbackFn(void * context,
+                                                                       const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -16166,9 +16132,8 @@ void CHIPPowerSourceConfigurationAttributeListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPPowerSourceConfigurationAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPowerSourceConfigurationAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPumpConfigurationAndControlPowerAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPumpConfigurationAndControlPowerAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -16176,31 +16141,28 @@ void CHIPPowerSourceConfigurationAttributeListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPPressureMeasurementMeasuredValueAttributeCallback::CHIPPressureMeasurementMeasuredValueAttributeCallback(jobject javaCallback,
-                                                                                                             bool keepAlive) :
-    chip::Callback::Callback<CHIPPressureMeasurementClusterMeasuredValueAttributeCallbackType>(CallbackFn, this),
+CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback::
+    CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterLifetimeEnergyConsumedAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -16217,7 +16179,8 @@ CHIPPressureMeasurementMeasuredValueAttributeCallback::CHIPPressureMeasurementMe
     }
 }
 
-CHIPPressureMeasurementMeasuredValueAttributeCallback::~CHIPPressureMeasurementMeasuredValueAttributeCallback()
+CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback::
+    ~CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -16228,8 +16191,8 @@ CHIPPressureMeasurementMeasuredValueAttributeCallback::~CHIPPressureMeasurementM
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPressureMeasurementMeasuredValueAttributeCallback::CallbackFn(void * context,
-                                                                       const chip::app::DataModel::Nullable<int16_t> & value)
+void CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -16237,8 +16200,8 @@ void CHIPPressureMeasurementMeasuredValueAttributeCallback::CallbackFn(void * co
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPPressureMeasurementMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPressureMeasurementMeasuredValueAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -16246,7 +16209,7 @@ void CHIPPressureMeasurementMeasuredValueAttributeCallback::CallbackFn(void * co
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
@@ -16256,18 +16219,18 @@ void CHIPPressureMeasurementMeasuredValueAttributeCallback::CallbackFn(void * co
     }
     else
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPPressureMeasurementMinMeasuredValueAttributeCallback::CHIPPressureMeasurementMinMeasuredValueAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPressureMeasurementClusterMinMeasuredValueAttributeCallbackType>(CallbackFn, this),
+CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback::
+    CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -16284,7 +16247,8 @@ CHIPPressureMeasurementMinMeasuredValueAttributeCallback::CHIPPressureMeasuremen
     }
 }
 
-CHIPPressureMeasurementMinMeasuredValueAttributeCallback::~CHIPPressureMeasurementMinMeasuredValueAttributeCallback()
+CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback::
+    ~CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -16295,8 +16259,8 @@ CHIPPressureMeasurementMinMeasuredValueAttributeCallback::~CHIPPressureMeasureme
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPressureMeasurementMinMeasuredValueAttributeCallback::CallbackFn(void * context,
-                                                                          const chip::app::DataModel::Nullable<int16_t> & value)
+void CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -16304,8 +16268,9 @@ void CHIPPressureMeasurementMinMeasuredValueAttributeCallback::CallbackFn(void *
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPPressureMeasurementMinMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPressureMeasurementMinMeasuredValueAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -16313,28 +16278,31 @@ void CHIPPressureMeasurementMinMeasuredValueAttributeCallback::CallbackFn(void *
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        javaValue = nullptr;
-    }
-    else
-    {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPPressureMeasurementMaxMeasuredValueAttributeCallback::CHIPPressureMeasurementMaxMeasuredValueAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPressureMeasurementClusterMaxMeasuredValueAttributeCallbackType>(CallbackFn, this),
+CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback::
+    CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -16351,7 +16319,8 @@ CHIPPressureMeasurementMaxMeasuredValueAttributeCallback::CHIPPressureMeasuremen
     }
 }
 
-CHIPPressureMeasurementMaxMeasuredValueAttributeCallback::~CHIPPressureMeasurementMaxMeasuredValueAttributeCallback()
+CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback::
+    ~CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -16362,8 +16331,8 @@ CHIPPressureMeasurementMaxMeasuredValueAttributeCallback::~CHIPPressureMeasureme
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPressureMeasurementMaxMeasuredValueAttributeCallback::CallbackFn(void * context,
-                                                                          const chip::app::DataModel::Nullable<int16_t> & value)
+void CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -16371,75 +16340,9 @@ void CHIPPressureMeasurementMaxMeasuredValueAttributeCallback::CallbackFn(void *
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPPressureMeasurementMaxMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPressureMeasurementMaxMeasuredValueAttributeCallback *>(context), maybeDestroy);
-
-    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-    javaCallbackRef = cppCallback.get()->javaCallbackRef;
-    VerifyOrReturn(javaCallbackRef != nullptr,
-                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-    jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
-    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
-    {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
-    }
-
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
-}
-
-CHIPPressureMeasurementScaledValueAttributeCallback::CHIPPressureMeasurementScaledValueAttributeCallback(jobject javaCallback,
-                                                                                                         bool keepAlive) :
-    chip::Callback::Callback<CHIPPressureMeasurementClusterScaledValueAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-        return;
-    }
-
-    javaCallbackRef = env->NewGlobalRef(javaCallback);
-    if (javaCallbackRef == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-    }
-}
-
-CHIPPressureMeasurementScaledValueAttributeCallback::~CHIPPressureMeasurementScaledValueAttributeCallback()
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not delete global reference for Java callback");
-        return;
-    }
-    env->DeleteGlobalRef(javaCallbackRef);
-}
-
-void CHIPPressureMeasurementScaledValueAttributeCallback::CallbackFn(void * context,
-                                                                     const chip::app::DataModel::Nullable<int16_t> & value)
-{
-    chip::DeviceLayer::StackUnlock unlock;
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    jobject javaCallbackRef;
 
-    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPPressureMeasurementScaledValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPressureMeasurementScaledValueAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -16447,28 +16350,31 @@ void CHIPPressureMeasurementScaledValueAttributeCallback::CallbackFn(void * cont
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPPressureMeasurementMinScaledValueAttributeCallback::CHIPPressureMeasurementMinScaledValueAttributeCallback(jobject javaCallback,
-                                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPPressureMeasurementClusterMinScaledValueAttributeCallbackType>(CallbackFn, this),
+CHIPPumpConfigurationAndControlAttributeListAttributeCallback::CHIPPumpConfigurationAndControlAttributeListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -16485,7 +16391,7 @@ CHIPPressureMeasurementMinScaledValueAttributeCallback::CHIPPressureMeasurementM
     }
 }
 
-CHIPPressureMeasurementMinScaledValueAttributeCallback::~CHIPPressureMeasurementMinScaledValueAttributeCallback()
+CHIPPumpConfigurationAndControlAttributeListAttributeCallback::~CHIPPumpConfigurationAndControlAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -16496,8 +16402,8 @@ CHIPPressureMeasurementMinScaledValueAttributeCallback::~CHIPPressureMeasurement
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPressureMeasurementMinScaledValueAttributeCallback::CallbackFn(void * context,
-                                                                        const chip::app::DataModel::Nullable<int16_t> & value)
+void CHIPPumpConfigurationAndControlAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -16505,8 +16411,9 @@ void CHIPPressureMeasurementMinScaledValueAttributeCallback::CallbackFn(void * c
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPPressureMeasurementMinScaledValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPressureMeasurementMinScaledValueAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPPumpConfigurationAndControlAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPumpConfigurationAndControlAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -16514,28 +16421,31 @@ void CHIPPressureMeasurementMinScaledValueAttributeCallback::CallbackFn(void * c
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPPressureMeasurementMaxScaledValueAttributeCallback::CHIPPressureMeasurementMaxScaledValueAttributeCallback(jobject javaCallback,
-                                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPPressureMeasurementClusterMaxScaledValueAttributeCallbackType>(CallbackFn, this),
+CHIPThermostatLocalTemperatureAttributeCallback::CHIPThermostatLocalTemperatureAttributeCallback(jobject javaCallback,
+                                                                                                 bool keepAlive) :
+    chip::Callback::Callback<CHIPThermostatClusterLocalTemperatureAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -16552,7 +16462,7 @@ CHIPPressureMeasurementMaxScaledValueAttributeCallback::CHIPPressureMeasurementM
     }
 }
 
-CHIPPressureMeasurementMaxScaledValueAttributeCallback::~CHIPPressureMeasurementMaxScaledValueAttributeCallback()
+CHIPThermostatLocalTemperatureAttributeCallback::~CHIPThermostatLocalTemperatureAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -16563,8 +16473,8 @@ CHIPPressureMeasurementMaxScaledValueAttributeCallback::~CHIPPressureMeasurement
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPressureMeasurementMaxScaledValueAttributeCallback::CallbackFn(void * context,
-                                                                        const chip::app::DataModel::Nullable<int16_t> & value)
+void CHIPThermostatLocalTemperatureAttributeCallback::CallbackFn(void * context,
+                                                                 const chip::app::DataModel::Nullable<int16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -16572,8 +16482,8 @@ void CHIPPressureMeasurementMaxScaledValueAttributeCallback::CallbackFn(void * c
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPPressureMeasurementMaxScaledValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPressureMeasurementMaxScaledValueAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPThermostatLocalTemperatureAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThermostatLocalTemperatureAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -16600,10 +16510,8 @@ void CHIPPressureMeasurementMaxScaledValueAttributeCallback::CallbackFn(void * c
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPPressureMeasurementAttributeListAttributeCallback::CHIPPressureMeasurementAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                             bool keepAlive) :
-    chip::Callback::Callback<CHIPPressureMeasurementClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPThermostatAttributeListAttributeCallback::CHIPThermostatAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPThermostatClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -16619,7 +16527,7 @@ CHIPPressureMeasurementAttributeListAttributeCallback::CHIPPressureMeasurementAt
     }
 }
 
-CHIPPressureMeasurementAttributeListAttributeCallback::~CHIPPressureMeasurementAttributeListAttributeCallback()
+CHIPThermostatAttributeListAttributeCallback::~CHIPThermostatAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -16630,8 +16538,8 @@ CHIPPressureMeasurementAttributeListAttributeCallback::~CHIPPressureMeasurementA
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPressureMeasurementAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPThermostatAttributeListAttributeCallback::CallbackFn(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -16640,8 +16548,8 @@ void CHIPPressureMeasurementAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPPressureMeasurementAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPressureMeasurementAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPThermostatAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThermostatAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -16671,10 +16579,8 @@ void CHIPPressureMeasurementAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPPumpConfigurationAndControlMaxPressureAttributeCallback::CHIPPumpConfigurationAndControlMaxPressureAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxPressureAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPFanControlPercentSettingAttributeCallback::CHIPFanControlPercentSettingAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPFanControlClusterPercentSettingAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -16690,7 +16596,7 @@ CHIPPumpConfigurationAndControlMaxPressureAttributeCallback::CHIPPumpConfigurati
     }
 }
 
-CHIPPumpConfigurationAndControlMaxPressureAttributeCallback::~CHIPPumpConfigurationAndControlMaxPressureAttributeCallback()
+CHIPFanControlPercentSettingAttributeCallback::~CHIPFanControlPercentSettingAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -16701,8 +16607,8 @@ CHIPPumpConfigurationAndControlMaxPressureAttributeCallback::~CHIPPumpConfigurat
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPumpConfigurationAndControlMaxPressureAttributeCallback::CallbackFn(void * context,
-                                                                             const chip::app::DataModel::Nullable<int16_t> & value)
+void CHIPFanControlPercentSettingAttributeCallback::CallbackFn(void * context,
+                                                               const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -16710,8 +16616,8 @@ void CHIPPumpConfigurationAndControlMaxPressureAttributeCallback::CallbackFn(voi
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPPumpConfigurationAndControlMaxPressureAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPumpConfigurationAndControlMaxPressureAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPFanControlPercentSettingAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPFanControlPercentSettingAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -16731,17 +16637,15 @@ void CHIPPumpConfigurationAndControlMaxPressureAttributeCallback::CallbackFn(voi
     {
         std::string javaValueClassName     = "java/lang/Integer";
         std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
                                                                       value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback::CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxSpeedAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPFanControlSpeedSettingAttributeCallback::CHIPFanControlSpeedSettingAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPFanControlClusterSpeedSettingAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -16757,7 +16661,7 @@ CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback::CHIPPumpConfigurationA
     }
 }
 
-CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback::~CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback()
+CHIPFanControlSpeedSettingAttributeCallback::~CHIPFanControlSpeedSettingAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -16768,8 +16672,7 @@ CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback::~CHIPPumpConfiguration
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback::CallbackFn(void * context,
-                                                                          const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPFanControlSpeedSettingAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -16777,8 +16680,8 @@ void CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback::CallbackFn(void *
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPFanControlSpeedSettingAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPFanControlSpeedSettingAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -16798,16 +16701,16 @@ void CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback::CallbackFn(void *
     {
         std::string javaValueClassName     = "java/lang/Integer";
         std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPPumpConfigurationAndControlMaxFlowAttributeCallback::CHIPPumpConfigurationAndControlMaxFlowAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxFlowAttributeCallbackType>(CallbackFn, this),
+CHIPFanControlGeneratedCommandListAttributeCallback::CHIPFanControlGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPFanControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -16824,7 +16727,7 @@ CHIPPumpConfigurationAndControlMaxFlowAttributeCallback::CHIPPumpConfigurationAn
     }
 }
 
-CHIPPumpConfigurationAndControlMaxFlowAttributeCallback::~CHIPPumpConfigurationAndControlMaxFlowAttributeCallback()
+CHIPFanControlGeneratedCommandListAttributeCallback::~CHIPFanControlGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -16835,8 +16738,8 @@ CHIPPumpConfigurationAndControlMaxFlowAttributeCallback::~CHIPPumpConfigurationA
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPumpConfigurationAndControlMaxFlowAttributeCallback::CallbackFn(void * context,
-                                                                         const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPFanControlGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -16844,37 +16747,41 @@ void CHIPPumpConfigurationAndControlMaxFlowAttributeCallback::CallbackFn(void *
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPPumpConfigurationAndControlMaxFlowAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPumpConfigurationAndControlMaxFlowAttributeCallback *>(context), maybeDestroy);
 
-    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    std::unique_ptr<CHIPFanControlGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPFanControlGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
     VerifyOrReturn(javaCallbackRef != nullptr,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback::CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMinConstPressureAttributeCallbackType>(CallbackFn, this),
+CHIPFanControlAcceptedCommandListAttributeCallback::CHIPFanControlAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPFanControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -16891,8 +16798,7 @@ CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback::CHIPPumpConfig
     }
 }
 
-CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback::
-    ~CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback()
+CHIPFanControlAcceptedCommandListAttributeCallback::~CHIPFanControlAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -16903,8 +16809,8 @@ CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<int16_t> & value)
+void CHIPFanControlAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -16912,8 +16818,9 @@ void CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback::CallbackF
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPFanControlAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPFanControlAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -16921,29 +16828,30 @@ void CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback::CallbackF
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback::CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxConstPressureAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPFanControlAttributeListAttributeCallback::CHIPFanControlAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPFanControlClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -16959,8 +16867,7 @@ CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback::CHIPPumpConfig
     }
 }
 
-CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback::
-    ~CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback()
+CHIPFanControlAttributeListAttributeCallback::~CHIPFanControlAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -16971,8 +16878,8 @@ CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<int16_t> & value)
+void CHIPFanControlAttributeListAttributeCallback::CallbackFn(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -16980,8 +16887,9 @@ void CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback::CallbackF
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPFanControlAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPFanControlAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -16989,28 +16897,32 @@ void CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback::CallbackF
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback::CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMinCompPressureAttributeCallbackType>(CallbackFn, this),
+CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback::
+    CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPThermostatUserInterfaceConfigurationClusterGeneratedCommandListAttributeCallbackType>(CallbackFn,
+                                                                                                                       this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -17027,7 +16939,8 @@ CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback::CHIPPumpConfigu
     }
 }
 
-CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback::~CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback()
+CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback::
+    ~CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -17038,8 +16951,8 @@ CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback::~CHIPPumpConfig
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<int16_t> & value)
+void CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -17047,8 +16960,10 @@ void CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback::CallbackFn
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)>
+        cppCallback(reinterpret_cast<CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback *>(context),
+                    maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -17056,28 +16971,32 @@ void CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback::CallbackFn
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback::CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxCompPressureAttributeCallbackType>(CallbackFn, this),
+CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback::
+    CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPThermostatUserInterfaceConfigurationClusterAcceptedCommandListAttributeCallbackType>(CallbackFn,
+                                                                                                                      this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -17094,7 +17013,8 @@ CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback::CHIPPumpConfigu
     }
 }
 
-CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback::~CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback()
+CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback::
+    ~CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -17105,8 +17025,8 @@ CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback::~CHIPPumpConfig
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<int16_t> & value)
+void CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -17114,8 +17034,10 @@ void CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback::CallbackFn
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)>
+        cppCallback(reinterpret_cast<CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback *>(context),
+                    maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -17123,28 +17045,31 @@ void CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback::CallbackFn
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback::CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMinConstSpeedAttributeCallbackType>(CallbackFn, this),
+CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback::
+    CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPThermostatUserInterfaceConfigurationClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -17161,7 +17086,8 @@ CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback::CHIPPumpConfigura
     }
 }
 
-CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback::~CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback()
+CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback::
+    ~CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -17172,8 +17098,8 @@ CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback::~CHIPPumpConfigur
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -17181,8 +17107,9 @@ void CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -17190,28 +17117,31 @@ void CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        javaValue = nullptr;
-    }
-    else
-    {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback::CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxConstSpeedAttributeCallbackType>(CallbackFn, this),
+CHIPColorControlNumberOfPrimariesAttributeCallback::CHIPColorControlNumberOfPrimariesAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPColorControlClusterNumberOfPrimariesAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -17228,7 +17158,7 @@ CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback::CHIPPumpConfigura
     }
 }
 
-CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback::~CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback()
+CHIPColorControlNumberOfPrimariesAttributeCallback::~CHIPColorControlNumberOfPrimariesAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -17239,8 +17169,8 @@ CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback::~CHIPPumpConfigur
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPColorControlNumberOfPrimariesAttributeCallback::CallbackFn(void * context,
+                                                                    const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -17248,8 +17178,8 @@ void CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPColorControlNumberOfPrimariesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPColorControlNumberOfPrimariesAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -17269,16 +17199,16 @@ void CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback::CallbackFn(
     {
         std::string javaValueClassName     = "java/lang/Integer";
         std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback::CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMinConstFlowAttributeCallbackType>(CallbackFn, this),
+CHIPColorControlPrimary1IntensityAttributeCallback::CHIPColorControlPrimary1IntensityAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPColorControlClusterPrimary1IntensityAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -17295,7 +17225,7 @@ CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback::CHIPPumpConfigurat
     }
 }
 
-CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback::~CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback()
+CHIPColorControlPrimary1IntensityAttributeCallback::~CHIPColorControlPrimary1IntensityAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -17306,8 +17236,8 @@ CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback::~CHIPPumpConfigura
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPColorControlPrimary1IntensityAttributeCallback::CallbackFn(void * context,
+                                                                    const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -17315,8 +17245,8 @@ void CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPColorControlPrimary1IntensityAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPColorControlPrimary1IntensityAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -17336,16 +17266,16 @@ void CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback::CallbackFn(
     {
         std::string javaValueClassName     = "java/lang/Integer";
         std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback::CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxConstFlowAttributeCallbackType>(CallbackFn, this),
+CHIPColorControlPrimary2IntensityAttributeCallback::CHIPColorControlPrimary2IntensityAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPColorControlClusterPrimary2IntensityAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -17362,7 +17292,7 @@ CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback::CHIPPumpConfigurat
     }
 }
 
-CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback::~CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback()
+CHIPColorControlPrimary2IntensityAttributeCallback::~CHIPColorControlPrimary2IntensityAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -17373,8 +17303,8 @@ CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback::~CHIPPumpConfigura
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPColorControlPrimary2IntensityAttributeCallback::CallbackFn(void * context,
+                                                                    const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -17382,8 +17312,8 @@ void CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPColorControlPrimary2IntensityAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPColorControlPrimary2IntensityAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -17403,16 +17333,16 @@ void CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback::CallbackFn(
     {
         std::string javaValueClassName     = "java/lang/Integer";
         std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPPumpConfigurationAndControlMinConstTempAttributeCallback::CHIPPumpConfigurationAndControlMinConstTempAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMinConstTempAttributeCallbackType>(CallbackFn, this),
+CHIPColorControlPrimary3IntensityAttributeCallback::CHIPColorControlPrimary3IntensityAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPColorControlClusterPrimary3IntensityAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -17429,7 +17359,7 @@ CHIPPumpConfigurationAndControlMinConstTempAttributeCallback::CHIPPumpConfigurat
     }
 }
 
-CHIPPumpConfigurationAndControlMinConstTempAttributeCallback::~CHIPPumpConfigurationAndControlMinConstTempAttributeCallback()
+CHIPColorControlPrimary3IntensityAttributeCallback::~CHIPColorControlPrimary3IntensityAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -17440,8 +17370,8 @@ CHIPPumpConfigurationAndControlMinConstTempAttributeCallback::~CHIPPumpConfigura
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPumpConfigurationAndControlMinConstTempAttributeCallback::CallbackFn(void * context,
-                                                                              const chip::app::DataModel::Nullable<int16_t> & value)
+void CHIPColorControlPrimary3IntensityAttributeCallback::CallbackFn(void * context,
+                                                                    const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -17449,8 +17379,8 @@ void CHIPPumpConfigurationAndControlMinConstTempAttributeCallback::CallbackFn(vo
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPPumpConfigurationAndControlMinConstTempAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPumpConfigurationAndControlMinConstTempAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPColorControlPrimary3IntensityAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPColorControlPrimary3IntensityAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -17470,16 +17400,16 @@ void CHIPPumpConfigurationAndControlMinConstTempAttributeCallback::CallbackFn(vo
     {
         std::string javaValueClassName     = "java/lang/Integer";
         std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
                                                                       value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback::CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxConstTempAttributeCallbackType>(CallbackFn, this),
+CHIPColorControlPrimary4IntensityAttributeCallback::CHIPColorControlPrimary4IntensityAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPColorControlClusterPrimary4IntensityAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -17496,7 +17426,7 @@ CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback::CHIPPumpConfigurat
     }
 }
 
-CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback::~CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback()
+CHIPColorControlPrimary4IntensityAttributeCallback::~CHIPColorControlPrimary4IntensityAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -17507,8 +17437,8 @@ CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback::~CHIPPumpConfigura
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback::CallbackFn(void * context,
-                                                                              const chip::app::DataModel::Nullable<int16_t> & value)
+void CHIPColorControlPrimary4IntensityAttributeCallback::CallbackFn(void * context,
+                                                                    const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -17516,8 +17446,8 @@ void CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback::CallbackFn(vo
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPColorControlPrimary4IntensityAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPColorControlPrimary4IntensityAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -17537,16 +17467,16 @@ void CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback::CallbackFn(vo
     {
         std::string javaValueClassName     = "java/lang/Integer";
         std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
                                                                       value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPPumpConfigurationAndControlCapacityAttributeCallback::CHIPPumpConfigurationAndControlCapacityAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterCapacityAttributeCallbackType>(CallbackFn, this),
+CHIPColorControlPrimary5IntensityAttributeCallback::CHIPColorControlPrimary5IntensityAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPColorControlClusterPrimary5IntensityAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -17563,7 +17493,7 @@ CHIPPumpConfigurationAndControlCapacityAttributeCallback::CHIPPumpConfigurationA
     }
 }
 
-CHIPPumpConfigurationAndControlCapacityAttributeCallback::~CHIPPumpConfigurationAndControlCapacityAttributeCallback()
+CHIPColorControlPrimary5IntensityAttributeCallback::~CHIPColorControlPrimary5IntensityAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -17574,8 +17504,8 @@ CHIPPumpConfigurationAndControlCapacityAttributeCallback::~CHIPPumpConfiguration
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPumpConfigurationAndControlCapacityAttributeCallback::CallbackFn(void * context,
-                                                                          const chip::app::DataModel::Nullable<int16_t> & value)
+void CHIPColorControlPrimary5IntensityAttributeCallback::CallbackFn(void * context,
+                                                                    const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -17583,8 +17513,8 @@ void CHIPPumpConfigurationAndControlCapacityAttributeCallback::CallbackFn(void *
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPPumpConfigurationAndControlCapacityAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPumpConfigurationAndControlCapacityAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPColorControlPrimary5IntensityAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPColorControlPrimary5IntensityAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -17604,16 +17534,16 @@ void CHIPPumpConfigurationAndControlCapacityAttributeCallback::CallbackFn(void *
     {
         std::string javaValueClassName     = "java/lang/Integer";
         std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
                                                                       value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPPumpConfigurationAndControlSpeedAttributeCallback::CHIPPumpConfigurationAndControlSpeedAttributeCallback(jobject javaCallback,
-                                                                                                             bool keepAlive) :
-    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterSpeedAttributeCallbackType>(CallbackFn, this),
+CHIPColorControlPrimary6IntensityAttributeCallback::CHIPColorControlPrimary6IntensityAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPColorControlClusterPrimary6IntensityAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -17630,7 +17560,7 @@ CHIPPumpConfigurationAndControlSpeedAttributeCallback::CHIPPumpConfigurationAndC
     }
 }
 
-CHIPPumpConfigurationAndControlSpeedAttributeCallback::~CHIPPumpConfigurationAndControlSpeedAttributeCallback()
+CHIPColorControlPrimary6IntensityAttributeCallback::~CHIPColorControlPrimary6IntensityAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -17641,8 +17571,8 @@ CHIPPumpConfigurationAndControlSpeedAttributeCallback::~CHIPPumpConfigurationAnd
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPumpConfigurationAndControlSpeedAttributeCallback::CallbackFn(void * context,
-                                                                       const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPColorControlPrimary6IntensityAttributeCallback::CallbackFn(void * context,
+                                                                    const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -17650,8 +17580,8 @@ void CHIPPumpConfigurationAndControlSpeedAttributeCallback::CallbackFn(void * co
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPPumpConfigurationAndControlSpeedAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPumpConfigurationAndControlSpeedAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPColorControlPrimary6IntensityAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPColorControlPrimary6IntensityAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -17671,16 +17601,16 @@ void CHIPPumpConfigurationAndControlSpeedAttributeCallback::CallbackFn(void * co
     {
         std::string javaValueClassName     = "java/lang/Integer";
         std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback::
-    CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterLifetimeRunningHoursAttributeCallbackType>(CallbackFn, this),
+CHIPColorControlColorPointRIntensityAttributeCallback::CHIPColorControlColorPointRIntensityAttributeCallback(jobject javaCallback,
+                                                                                                             bool keepAlive) :
+    chip::Callback::Callback<CHIPColorControlClusterColorPointRIntensityAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -17697,8 +17627,7 @@ CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback::
     }
 }
 
-CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback::
-    ~CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback()
+CHIPColorControlColorPointRIntensityAttributeCallback::~CHIPColorControlColorPointRIntensityAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -17709,8 +17638,8 @@ CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<uint32_t> & value)
+void CHIPColorControlColorPointRIntensityAttributeCallback::CallbackFn(void * context,
+                                                                       const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -17718,8 +17647,8 @@ void CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback::Callb
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPColorControlColorPointRIntensityAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPColorControlColorPointRIntensityAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -17727,7 +17656,7 @@ void CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback::Callb
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
@@ -17737,18 +17666,18 @@ void CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback::Callb
     }
     else
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPPumpConfigurationAndControlPowerAttributeCallback::CHIPPumpConfigurationAndControlPowerAttributeCallback(jobject javaCallback,
+CHIPColorControlColorPointGIntensityAttributeCallback::CHIPColorControlColorPointGIntensityAttributeCallback(jobject javaCallback,
                                                                                                              bool keepAlive) :
-    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterPowerAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPColorControlClusterColorPointGIntensityAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -17765,7 +17694,7 @@ CHIPPumpConfigurationAndControlPowerAttributeCallback::CHIPPumpConfigurationAndC
     }
 }
 
-CHIPPumpConfigurationAndControlPowerAttributeCallback::~CHIPPumpConfigurationAndControlPowerAttributeCallback()
+CHIPColorControlColorPointGIntensityAttributeCallback::~CHIPColorControlColorPointGIntensityAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -17776,8 +17705,8 @@ CHIPPumpConfigurationAndControlPowerAttributeCallback::~CHIPPumpConfigurationAnd
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPumpConfigurationAndControlPowerAttributeCallback::CallbackFn(void * context,
-                                                                       const chip::app::DataModel::Nullable<uint32_t> & value)
+void CHIPColorControlColorPointGIntensityAttributeCallback::CallbackFn(void * context,
+                                                                       const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -17785,8 +17714,8 @@ void CHIPPumpConfigurationAndControlPowerAttributeCallback::CallbackFn(void * co
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPPumpConfigurationAndControlPowerAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPumpConfigurationAndControlPowerAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPColorControlColorPointGIntensityAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPColorControlColorPointGIntensityAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -17794,7 +17723,7 @@ void CHIPPumpConfigurationAndControlPowerAttributeCallback::CallbackFn(void * co
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
@@ -17804,18 +17733,18 @@ void CHIPPumpConfigurationAndControlPowerAttributeCallback::CallbackFn(void * co
     }
     else
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback::
-    CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterLifetimeEnergyConsumedAttributeCallbackType>(CallbackFn, this),
+CHIPColorControlColorPointBIntensityAttributeCallback::CHIPColorControlColorPointBIntensityAttributeCallback(jobject javaCallback,
+                                                                                                             bool keepAlive) :
+    chip::Callback::Callback<CHIPColorControlClusterColorPointBIntensityAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -17832,8 +17761,7 @@ CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback::
     }
 }
 
-CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback::
-    ~CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback()
+CHIPColorControlColorPointBIntensityAttributeCallback::~CHIPColorControlColorPointBIntensityAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -17844,8 +17772,8 @@ CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<uint32_t> & value)
+void CHIPColorControlColorPointBIntensityAttributeCallback::CallbackFn(void * context,
+                                                                       const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -17853,8 +17781,8 @@ void CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback::Cal
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPColorControlColorPointBIntensityAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPColorControlColorPointBIntensityAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -17862,7 +17790,7 @@ void CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback::Cal
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
@@ -17872,18 +17800,18 @@ void CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback::Cal
     }
     else
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback::
-    CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPColorControlGeneratedCommandListAttributeCallback::CHIPColorControlGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                             bool keepAlive) :
+    chip::Callback::Callback<CHIPColorControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -17900,8 +17828,7 @@ CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback::
-    ~CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback()
+CHIPColorControlGeneratedCommandListAttributeCallback::~CHIPColorControlGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -17912,7 +17839,7 @@ CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPColorControlGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -17922,8 +17849,8 @@ void CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback::Callb
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPColorControlGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPColorControlGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -17953,9 +17880,9 @@ void CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback::Callb
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback::
-    CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPColorControlAcceptedCommandListAttributeCallback::CHIPColorControlAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPColorControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -17972,8 +17899,7 @@ CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback::
     }
 }
 
-CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback::
-    ~CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback()
+CHIPColorControlAcceptedCommandListAttributeCallback::~CHIPColorControlAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -17984,7 +17910,7 @@ CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPColorControlAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -17994,8 +17920,8 @@ void CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback::Callba
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPColorControlAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPColorControlAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -18025,9 +17951,9 @@ void CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback::Callba
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPPumpConfigurationAndControlAttributeListAttributeCallback::CHIPPumpConfigurationAndControlAttributeListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPColorControlAttributeListAttributeCallback::CHIPColorControlAttributeListAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPColorControlClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -18044,7 +17970,7 @@ CHIPPumpConfigurationAndControlAttributeListAttributeCallback::CHIPPumpConfigura
     }
 }
 
-CHIPPumpConfigurationAndControlAttributeListAttributeCallback::~CHIPPumpConfigurationAndControlAttributeListAttributeCallback()
+CHIPColorControlAttributeListAttributeCallback::~CHIPColorControlAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -18055,8 +17981,8 @@ CHIPPumpConfigurationAndControlAttributeListAttributeCallback::~CHIPPumpConfigur
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPumpConfigurationAndControlAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPColorControlAttributeListAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -18065,8 +17991,8 @@ void CHIPPumpConfigurationAndControlAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPPumpConfigurationAndControlAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPPumpConfigurationAndControlAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPColorControlAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPColorControlAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -18096,9 +18022,9 @@ void CHIPPumpConfigurationAndControlAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback::CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback(
+CHIPIlluminanceMeasurementMeasuredValueAttributeCallback::CHIPIlluminanceMeasurementMeasuredValueAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterMeasuredValueAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPIlluminanceMeasurementClusterMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -18115,7 +18041,7 @@ CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback::CHIPRelativeHumid
     }
 }
 
-CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback::~CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback()
+CHIPIlluminanceMeasurementMeasuredValueAttributeCallback::~CHIPIlluminanceMeasurementMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -18126,8 +18052,8 @@ CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback::~CHIPRelativeHumi
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPIlluminanceMeasurementMeasuredValueAttributeCallback::CallbackFn(void * context,
+                                                                          const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -18135,8 +18061,8 @@ void CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPIlluminanceMeasurementMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPIlluminanceMeasurementMeasuredValueAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -18163,9 +18089,9 @@ void CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback::CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback(
+CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback::CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterMinMeasuredValueAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPIlluminanceMeasurementClusterMinMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -18182,8 +18108,7 @@ CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback::CHIPRelativeHu
     }
 }
 
-CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback::
-    ~CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback()
+CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback::~CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -18194,8 +18119,8 @@ CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback::CallbackFn(void * context,
+                                                                             const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -18203,8 +18128,8 @@ void CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback::CallbackF
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -18231,9 +18156,9 @@ void CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback::CallbackF
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback::CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback(
+CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback::CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterMaxMeasuredValueAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPIlluminanceMeasurementClusterMaxMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -18250,8 +18175,7 @@ CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback::CHIPRelativeHu
     }
 }
 
-CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback::
-    ~CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback()
+CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback::~CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -18262,8 +18186,8 @@ CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback::CallbackFn(void * context,
+                                                                             const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -18271,8 +18195,8 @@ void CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback::CallbackF
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -18299,9 +18223,9 @@ void CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback::CallbackF
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback::
-    CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback::CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPIlluminanceMeasurementClusterLightSensorTypeAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -18318,8 +18242,7 @@ CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback::
-    ~CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback()
+CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback::~CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -18330,7 +18253,74 @@ CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback::CallbackFn(void * context,
+                                                                            const chip::app::DataModel::Nullable<uint8_t> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback::CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPIlluminanceMeasurementClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback::~CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -18340,8 +18330,8 @@ void CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback::Callb
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -18371,9 +18361,9 @@ void CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback::Callb
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback::
-    CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback::CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPIlluminanceMeasurementClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -18390,8 +18380,7 @@ CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback::
     }
 }
 
-CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback::
-    ~CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback()
+CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback::~CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -18402,7 +18391,7 @@ CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -18412,8 +18401,8 @@ void CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback::Callba
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -18443,9 +18432,9 @@ void CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback::Callba
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRelativeHumidityMeasurementAttributeListAttributeCallback::CHIPRelativeHumidityMeasurementAttributeListAttributeCallback(
+CHIPIlluminanceMeasurementAttributeListAttributeCallback::CHIPIlluminanceMeasurementAttributeListAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPIlluminanceMeasurementClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -18462,7 +18451,7 @@ CHIPRelativeHumidityMeasurementAttributeListAttributeCallback::CHIPRelativeHumid
     }
 }
 
-CHIPRelativeHumidityMeasurementAttributeListAttributeCallback::~CHIPRelativeHumidityMeasurementAttributeListAttributeCallback()
+CHIPIlluminanceMeasurementAttributeListAttributeCallback::~CHIPIlluminanceMeasurementAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -18473,7 +18462,7 @@ CHIPRelativeHumidityMeasurementAttributeListAttributeCallback::~CHIPRelativeHumi
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRelativeHumidityMeasurementAttributeListAttributeCallback::CallbackFn(
+void CHIPIlluminanceMeasurementAttributeListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -18483,8 +18472,8 @@ void CHIPRelativeHumidityMeasurementAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRelativeHumidityMeasurementAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRelativeHumidityMeasurementAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPIlluminanceMeasurementAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPIlluminanceMeasurementAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -18514,8 +18503,10 @@ void CHIPRelativeHumidityMeasurementAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPScenesCurrentGroupAttributeCallback::CHIPScenesCurrentGroupAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPScenesClusterCurrentGroupAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPTemperatureMeasurementMeasuredValueAttributeCallback::CHIPTemperatureMeasurementMeasuredValueAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTemperatureMeasurementClusterMeasuredValueAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -18531,7 +18522,7 @@ CHIPScenesCurrentGroupAttributeCallback::CHIPScenesCurrentGroupAttributeCallback
     }
 }
 
-CHIPScenesCurrentGroupAttributeCallback::~CHIPScenesCurrentGroupAttributeCallback()
+CHIPTemperatureMeasurementMeasuredValueAttributeCallback::~CHIPTemperatureMeasurementMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -18542,7 +18533,8 @@ CHIPScenesCurrentGroupAttributeCallback::~CHIPScenesCurrentGroupAttributeCallbac
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPScenesCurrentGroupAttributeCallback::CallbackFn(void * context, chip::GroupId value)
+void CHIPTemperatureMeasurementMeasuredValueAttributeCallback::CallbackFn(void * context,
+                                                                          const chip::app::DataModel::Nullable<int16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -18550,8 +18542,8 @@ void CHIPScenesCurrentGroupAttributeCallback::CallbackFn(void * context, chip::G
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPScenesCurrentGroupAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPScenesCurrentGroupAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTemperatureMeasurementMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTemperatureMeasurementMeasuredValueAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -18563,17 +18555,24 @@ void CHIPScenesCurrentGroupAttributeCallback::CallbackFn(void * context, chip::G
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
-    std::string javaValueClassName     = "java/lang/Integer";
-    std::string javaValueCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                   value, javaValue);
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
+    }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPScenesGeneratedCommandListAttributeCallback::CHIPScenesGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                 bool keepAlive) :
-    chip::Callback::Callback<CHIPScenesClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback::CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTemperatureMeasurementClusterMinMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -18590,7 +18589,7 @@ CHIPScenesGeneratedCommandListAttributeCallback::CHIPScenesGeneratedCommandListA
     }
 }
 
-CHIPScenesGeneratedCommandListAttributeCallback::~CHIPScenesGeneratedCommandListAttributeCallback()
+CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback::~CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -18601,8 +18600,8 @@ CHIPScenesGeneratedCommandListAttributeCallback::~CHIPScenesGeneratedCommandList
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPScenesGeneratedCommandListAttributeCallback::CallbackFn(void * context,
-                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback::CallbackFn(void * context,
+                                                                             const chip::app::DataModel::Nullable<int16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -18610,9 +18609,8 @@ void CHIPScenesGeneratedCommandListAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPScenesGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPScenesGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -18620,31 +18618,28 @@ void CHIPScenesGeneratedCommandListAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPScenesAcceptedCommandListAttributeCallback::CHIPScenesAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPScenesClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback::CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTemperatureMeasurementClusterMaxMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -18661,7 +18656,7 @@ CHIPScenesAcceptedCommandListAttributeCallback::CHIPScenesAcceptedCommandListAtt
     }
 }
 
-CHIPScenesAcceptedCommandListAttributeCallback::~CHIPScenesAcceptedCommandListAttributeCallback()
+CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback::~CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -18672,8 +18667,8 @@ CHIPScenesAcceptedCommandListAttributeCallback::~CHIPScenesAcceptedCommandListAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPScenesAcceptedCommandListAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback::CallbackFn(void * context,
+                                                                             const chip::app::DataModel::Nullable<int16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -18681,9 +18676,8 @@ void CHIPScenesAcceptedCommandListAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPScenesAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPScenesAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -18691,30 +18685,29 @@ void CHIPScenesAcceptedCommandListAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPScenesAttributeListAttributeCallback::CHIPScenesAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPScenesClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPTemperatureMeasurementAttributeListAttributeCallback::CHIPTemperatureMeasurementAttributeListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTemperatureMeasurementClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -18730,7 +18723,7 @@ CHIPScenesAttributeListAttributeCallback::CHIPScenesAttributeListAttributeCallba
     }
 }
 
-CHIPScenesAttributeListAttributeCallback::~CHIPScenesAttributeListAttributeCallback()
+CHIPTemperatureMeasurementAttributeListAttributeCallback::~CHIPTemperatureMeasurementAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -18741,8 +18734,8 @@ CHIPScenesAttributeListAttributeCallback::~CHIPScenesAttributeListAttributeCallb
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPScenesAttributeListAttributeCallback::CallbackFn(void * context,
-                                                          const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPTemperatureMeasurementAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -18751,8 +18744,8 @@ void CHIPScenesAttributeListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPScenesAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPScenesAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTemperatureMeasurementAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTemperatureMeasurementAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -18782,9 +18775,9 @@ void CHIPScenesAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback::CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback(jobject javaCallback,
+CHIPPressureMeasurementMeasuredValueAttributeCallback::CHIPPressureMeasurementMeasuredValueAttributeCallback(jobject javaCallback,
                                                                                                              bool keepAlive) :
-    chip::Callback::Callback<CHIPSoftwareDiagnosticsClusterThreadMetricsAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPPressureMeasurementClusterMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -18801,7 +18794,7 @@ CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback::CHIPSoftwareDiagnosticsTh
     }
 }
 
-CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback::~CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback()
+CHIPPressureMeasurementMeasuredValueAttributeCallback::~CHIPPressureMeasurementMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -18812,10 +18805,8 @@ CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback::~CHIPSoftwareDiagnosticsT
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType> &
-        list)
+void CHIPPressureMeasurementMeasuredValueAttributeCallback::CallbackFn(void * context,
+                                                                       const chip::app::DataModel::Nullable<int16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -18823,9 +18814,8 @@ void CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPressureMeasurementMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPressureMeasurementMeasuredValueAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -18833,113 +18823,28 @@ void CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        jobject newElement_0_id;
-        std::string newElement_0_idClassName     = "java/lang/Long";
-        std::string newElement_0_idCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(
-            newElement_0_idClassName.c_str(), newElement_0_idCtorSignature.c_str(), entry_0.id, newElement_0_id);
-        jobject newElement_0_name;
-        if (!entry_0.name.HasValue())
-        {
-            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_name);
-        }
-        else
-        {
-            jobject newElement_0_nameInsideOptional;
-            newElement_0_nameInsideOptional =
-                env->NewStringUTF(std::string(entry_0.name.Value().data(), entry_0.name.Value().size()).c_str());
-            chip::JniReferences::GetInstance().CreateOptional(newElement_0_nameInsideOptional, newElement_0_name);
-        }
-        jobject newElement_0_stackFreeCurrent;
-        if (!entry_0.stackFreeCurrent.HasValue())
-        {
-            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_stackFreeCurrent);
-        }
-        else
-        {
-            jobject newElement_0_stackFreeCurrentInsideOptional;
-            std::string newElement_0_stackFreeCurrentInsideOptionalClassName     = "java/lang/Long";
-            std::string newElement_0_stackFreeCurrentInsideOptionalCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                newElement_0_stackFreeCurrentInsideOptionalClassName.c_str(),
-                newElement_0_stackFreeCurrentInsideOptionalCtorSignature.c_str(), entry_0.stackFreeCurrent.Value(),
-                newElement_0_stackFreeCurrentInsideOptional);
-            chip::JniReferences::GetInstance().CreateOptional(newElement_0_stackFreeCurrentInsideOptional,
-                                                              newElement_0_stackFreeCurrent);
-        }
-        jobject newElement_0_stackFreeMinimum;
-        if (!entry_0.stackFreeMinimum.HasValue())
-        {
-            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_stackFreeMinimum);
-        }
-        else
-        {
-            jobject newElement_0_stackFreeMinimumInsideOptional;
-            std::string newElement_0_stackFreeMinimumInsideOptionalClassName     = "java/lang/Long";
-            std::string newElement_0_stackFreeMinimumInsideOptionalCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                newElement_0_stackFreeMinimumInsideOptionalClassName.c_str(),
-                newElement_0_stackFreeMinimumInsideOptionalCtorSignature.c_str(), entry_0.stackFreeMinimum.Value(),
-                newElement_0_stackFreeMinimumInsideOptional);
-            chip::JniReferences::GetInstance().CreateOptional(newElement_0_stackFreeMinimumInsideOptional,
-                                                              newElement_0_stackFreeMinimum);
-        }
-        jobject newElement_0_stackSize;
-        if (!entry_0.stackSize.HasValue())
-        {
-            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_stackSize);
-        }
-        else
-        {
-            jobject newElement_0_stackSizeInsideOptional;
-            std::string newElement_0_stackSizeInsideOptionalClassName     = "java/lang/Long";
-            std::string newElement_0_stackSizeInsideOptionalCtorSignature = "(J)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-                newElement_0_stackSizeInsideOptionalClassName.c_str(), newElement_0_stackSizeInsideOptionalCtorSignature.c_str(),
-                entry_0.stackSize.Value(), newElement_0_stackSizeInsideOptional);
-            chip::JniReferences::GetInstance().CreateOptional(newElement_0_stackSizeInsideOptional, newElement_0_stackSize);
-        }
-
-        jclass threadMetricsStructClass;
-        err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$SoftwareDiagnosticsClusterThreadMetrics", threadMetricsStructClass);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$SoftwareDiagnosticsClusterThreadMetrics");
-            return;
-        }
-        jmethodID threadMetricsStructCtor =
-            env->GetMethodID(threadMetricsStructClass, "<init>",
-                             "(Ljava/lang/Long;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V");
-        if (threadMetricsStructCtor == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$SoftwareDiagnosticsClusterThreadMetrics constructor");
-            return;
-        }
-
-        newElement_0 = env->NewObject(threadMetricsStructClass, threadMetricsStructCtor, newElement_0_id, newElement_0_name,
-                                      newElement_0_stackFreeCurrent, newElement_0_stackFreeMinimum, newElement_0_stackSize);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback::CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback(
+CHIPPressureMeasurementMinMeasuredValueAttributeCallback::CHIPPressureMeasurementMinMeasuredValueAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPSoftwareDiagnosticsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPPressureMeasurementClusterMinMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -18956,7 +18861,7 @@ CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback::CHIPSoftwareDiagno
     }
 }
 
-CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback::~CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback()
+CHIPPressureMeasurementMinMeasuredValueAttributeCallback::~CHIPPressureMeasurementMinMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -18967,8 +18872,8 @@ CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback::~CHIPSoftwareDiagn
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPPressureMeasurementMinMeasuredValueAttributeCallback::CallbackFn(void * context,
+                                                                          const chip::app::DataModel::Nullable<int16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -18976,9 +18881,8 @@ void CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPressureMeasurementMinMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPressureMeasurementMinMeasuredValueAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -18986,31 +18890,28 @@ void CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback::CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback(
+CHIPPressureMeasurementMaxMeasuredValueAttributeCallback::CHIPPressureMeasurementMaxMeasuredValueAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPSoftwareDiagnosticsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPPressureMeasurementClusterMaxMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -19027,7 +18928,7 @@ CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback::CHIPSoftwareDiagnos
     }
 }
 
-CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback::~CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback()
+CHIPPressureMeasurementMaxMeasuredValueAttributeCallback::~CHIPPressureMeasurementMaxMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19038,8 +18939,8 @@ CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback::~CHIPSoftwareDiagno
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPPressureMeasurementMaxMeasuredValueAttributeCallback::CallbackFn(void * context,
+                                                                          const chip::app::DataModel::Nullable<int16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -19047,9 +18948,8 @@ void CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPressureMeasurementMaxMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPressureMeasurementMaxMeasuredValueAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -19057,31 +18957,28 @@ void CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPSoftwareDiagnosticsAttributeListAttributeCallback::CHIPSoftwareDiagnosticsAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                             bool keepAlive) :
-    chip::Callback::Callback<CHIPSoftwareDiagnosticsClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPPressureMeasurementScaledValueAttributeCallback::CHIPPressureMeasurementScaledValueAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPPressureMeasurementClusterScaledValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -19098,7 +18995,7 @@ CHIPSoftwareDiagnosticsAttributeListAttributeCallback::CHIPSoftwareDiagnosticsAt
     }
 }
 
-CHIPSoftwareDiagnosticsAttributeListAttributeCallback::~CHIPSoftwareDiagnosticsAttributeListAttributeCallback()
+CHIPPressureMeasurementScaledValueAttributeCallback::~CHIPPressureMeasurementScaledValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19109,8 +19006,8 @@ CHIPSoftwareDiagnosticsAttributeListAttributeCallback::~CHIPSoftwareDiagnosticsA
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPSoftwareDiagnosticsAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPPressureMeasurementScaledValueAttributeCallback::CallbackFn(void * context,
+                                                                     const chip::app::DataModel::Nullable<int16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -19118,9 +19015,8 @@ void CHIPSoftwareDiagnosticsAttributeListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPSoftwareDiagnosticsAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPSoftwareDiagnosticsAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPressureMeasurementScaledValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPressureMeasurementScaledValueAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -19128,31 +19024,28 @@ void CHIPSoftwareDiagnosticsAttributeListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPSwitchGeneratedCommandListAttributeCallback::CHIPSwitchGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                 bool keepAlive) :
-    chip::Callback::Callback<CHIPSwitchClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPPressureMeasurementMinScaledValueAttributeCallback::CHIPPressureMeasurementMinScaledValueAttributeCallback(jobject javaCallback,
+                                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPPressureMeasurementClusterMinScaledValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -19169,7 +19062,7 @@ CHIPSwitchGeneratedCommandListAttributeCallback::CHIPSwitchGeneratedCommandListA
     }
 }
 
-CHIPSwitchGeneratedCommandListAttributeCallback::~CHIPSwitchGeneratedCommandListAttributeCallback()
+CHIPPressureMeasurementMinScaledValueAttributeCallback::~CHIPPressureMeasurementMinScaledValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19180,8 +19073,8 @@ CHIPSwitchGeneratedCommandListAttributeCallback::~CHIPSwitchGeneratedCommandList
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPSwitchGeneratedCommandListAttributeCallback::CallbackFn(void * context,
-                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPPressureMeasurementMinScaledValueAttributeCallback::CallbackFn(void * context,
+                                                                        const chip::app::DataModel::Nullable<int16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -19189,9 +19082,8 @@ void CHIPSwitchGeneratedCommandListAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPSwitchGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPSwitchGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPressureMeasurementMinScaledValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPressureMeasurementMinScaledValueAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -19199,31 +19091,28 @@ void CHIPSwitchGeneratedCommandListAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPSwitchAcceptedCommandListAttributeCallback::CHIPSwitchAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPSwitchClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPPressureMeasurementMaxScaledValueAttributeCallback::CHIPPressureMeasurementMaxScaledValueAttributeCallback(jobject javaCallback,
+                                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPPressureMeasurementClusterMaxScaledValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -19240,7 +19129,7 @@ CHIPSwitchAcceptedCommandListAttributeCallback::CHIPSwitchAcceptedCommandListAtt
     }
 }
 
-CHIPSwitchAcceptedCommandListAttributeCallback::~CHIPSwitchAcceptedCommandListAttributeCallback()
+CHIPPressureMeasurementMaxScaledValueAttributeCallback::~CHIPPressureMeasurementMaxScaledValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19251,8 +19140,8 @@ CHIPSwitchAcceptedCommandListAttributeCallback::~CHIPSwitchAcceptedCommandListAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPSwitchAcceptedCommandListAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPPressureMeasurementMaxScaledValueAttributeCallback::CallbackFn(void * context,
+                                                                        const chip::app::DataModel::Nullable<int16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -19260,9 +19149,8 @@ void CHIPSwitchAcceptedCommandListAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPSwitchAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPSwitchAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPressureMeasurementMaxScaledValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPressureMeasurementMaxScaledValueAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -19270,30 +19158,29 @@ void CHIPSwitchAcceptedCommandListAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPSwitchAttributeListAttributeCallback::CHIPSwitchAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPSwitchClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPPressureMeasurementAttributeListAttributeCallback::CHIPPressureMeasurementAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                             bool keepAlive) :
+    chip::Callback::Callback<CHIPPressureMeasurementClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19309,7 +19196,7 @@ CHIPSwitchAttributeListAttributeCallback::CHIPSwitchAttributeListAttributeCallba
     }
 }
 
-CHIPSwitchAttributeListAttributeCallback::~CHIPSwitchAttributeListAttributeCallback()
+CHIPPressureMeasurementAttributeListAttributeCallback::~CHIPPressureMeasurementAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19320,8 +19207,8 @@ CHIPSwitchAttributeListAttributeCallback::~CHIPSwitchAttributeListAttributeCallb
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPSwitchAttributeListAttributeCallback::CallbackFn(void * context,
-                                                          const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPPressureMeasurementAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -19330,8 +19217,8 @@ void CHIPSwitchAttributeListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPSwitchAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPSwitchAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPPressureMeasurementAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPPressureMeasurementAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -19361,9 +19248,9 @@ void CHIPSwitchAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTargetNavigatorTargetListAttributeCallback::CHIPTargetNavigatorTargetListAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPTargetNavigatorClusterTargetListAttributeCallbackType>(CallbackFn, this),
+CHIPFlowMeasurementMeasuredValueAttributeCallback::CHIPFlowMeasurementMeasuredValueAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPFlowMeasurementClusterMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -19380,7 +19267,7 @@ CHIPTargetNavigatorTargetListAttributeCallback::CHIPTargetNavigatorTargetListAtt
     }
 }
 
-CHIPTargetNavigatorTargetListAttributeCallback::~CHIPTargetNavigatorTargetListAttributeCallback()
+CHIPFlowMeasurementMeasuredValueAttributeCallback::~CHIPFlowMeasurementMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19391,9 +19278,8 @@ CHIPTargetNavigatorTargetListAttributeCallback::~CHIPTargetNavigatorTargetListAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTargetNavigatorTargetListAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType> & list)
+void CHIPFlowMeasurementMeasuredValueAttributeCallback::CallbackFn(void * context,
+                                                                   const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -19401,9 +19287,8 @@ void CHIPTargetNavigatorTargetListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPTargetNavigatorTargetListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTargetNavigatorTargetListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPFlowMeasurementMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPFlowMeasurementMeasuredValueAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -19411,53 +19296,28 @@ void CHIPTargetNavigatorTargetListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        jobject newElement_0_identifier;
-        std::string newElement_0_identifierClassName     = "java/lang/Integer";
-        std::string newElement_0_identifierCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_identifierClassName.c_str(),
-                                                                      newElement_0_identifierCtorSignature.c_str(),
-                                                                      entry_0.identifier, newElement_0_identifier);
-        jobject newElement_0_name;
-        newElement_0_name = env->NewStringUTF(std::string(entry_0.name.data(), entry_0.name.size()).c_str());
-
-        jclass targetInfoStructClass;
-        err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$TargetNavigatorClusterTargetInfo", targetInfoStructClass);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$TargetNavigatorClusterTargetInfo");
-            return;
-        }
-        jmethodID targetInfoStructCtor =
-            env->GetMethodID(targetInfoStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/String;)V");
-        if (targetInfoStructCtor == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$TargetNavigatorClusterTargetInfo constructor");
-            return;
-        }
-
-        newElement_0 = env->NewObject(targetInfoStructClass, targetInfoStructCtor, newElement_0_identifier, newElement_0_name);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPTargetNavigatorGeneratedCommandListAttributeCallback::CHIPTargetNavigatorGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTargetNavigatorClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPFlowMeasurementMinMeasuredValueAttributeCallback::CHIPFlowMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPFlowMeasurementClusterMinMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -19474,7 +19334,7 @@ CHIPTargetNavigatorGeneratedCommandListAttributeCallback::CHIPTargetNavigatorGen
     }
 }
 
-CHIPTargetNavigatorGeneratedCommandListAttributeCallback::~CHIPTargetNavigatorGeneratedCommandListAttributeCallback()
+CHIPFlowMeasurementMinMeasuredValueAttributeCallback::~CHIPFlowMeasurementMinMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19485,8 +19345,8 @@ CHIPTargetNavigatorGeneratedCommandListAttributeCallback::~CHIPTargetNavigatorGe
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTargetNavigatorGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPFlowMeasurementMinMeasuredValueAttributeCallback::CallbackFn(void * context,
+                                                                      const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -19494,9 +19354,8 @@ void CHIPTargetNavigatorGeneratedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPTargetNavigatorGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTargetNavigatorGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPFlowMeasurementMinMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPFlowMeasurementMinMeasuredValueAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -19504,31 +19363,28 @@ void CHIPTargetNavigatorGeneratedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPTargetNavigatorAcceptedCommandListAttributeCallback::CHIPTargetNavigatorAcceptedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTargetNavigatorClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPFlowMeasurementMaxMeasuredValueAttributeCallback::CHIPFlowMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPFlowMeasurementClusterMaxMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -19545,7 +19401,7 @@ CHIPTargetNavigatorAcceptedCommandListAttributeCallback::CHIPTargetNavigatorAcce
     }
 }
 
-CHIPTargetNavigatorAcceptedCommandListAttributeCallback::~CHIPTargetNavigatorAcceptedCommandListAttributeCallback()
+CHIPFlowMeasurementMaxMeasuredValueAttributeCallback::~CHIPFlowMeasurementMaxMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19556,7 +19412,74 @@ CHIPTargetNavigatorAcceptedCommandListAttributeCallback::~CHIPTargetNavigatorAcc
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTargetNavigatorAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPFlowMeasurementMaxMeasuredValueAttributeCallback::CallbackFn(void * context,
+                                                                      const chip::app::DataModel::Nullable<uint16_t> & value)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPFlowMeasurementMaxMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPFlowMeasurementMaxMeasuredValueAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject javaValue;
+    if (value.IsNull())
+    {
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
+    }
+
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPFlowMeasurementGeneratedCommandListAttributeCallback::CHIPFlowMeasurementGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPFlowMeasurementClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPFlowMeasurementGeneratedCommandListAttributeCallback::~CHIPFlowMeasurementGeneratedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPFlowMeasurementGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -19566,8 +19489,8 @@ void CHIPTargetNavigatorAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPTargetNavigatorAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTargetNavigatorAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPFlowMeasurementGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPFlowMeasurementGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -19597,9 +19520,9 @@ void CHIPTargetNavigatorAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTargetNavigatorAttributeListAttributeCallback::CHIPTargetNavigatorAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                     bool keepAlive) :
-    chip::Callback::Callback<CHIPTargetNavigatorClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPFlowMeasurementAcceptedCommandListAttributeCallback::CHIPFlowMeasurementAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPFlowMeasurementClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -19616,7 +19539,7 @@ CHIPTargetNavigatorAttributeListAttributeCallback::CHIPTargetNavigatorAttributeL
     }
 }
 
-CHIPTargetNavigatorAttributeListAttributeCallback::~CHIPTargetNavigatorAttributeListAttributeCallback()
+CHIPFlowMeasurementAcceptedCommandListAttributeCallback::~CHIPFlowMeasurementAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19627,8 +19550,8 @@ CHIPTargetNavigatorAttributeListAttributeCallback::~CHIPTargetNavigatorAttribute
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTargetNavigatorAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPFlowMeasurementAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -19637,8 +19560,8 @@ void CHIPTargetNavigatorAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPTargetNavigatorAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTargetNavigatorAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPFlowMeasurementAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPFlowMeasurementAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -19668,9 +19591,9 @@ void CHIPTargetNavigatorAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTemperatureMeasurementMeasuredValueAttributeCallback::CHIPTemperatureMeasurementMeasuredValueAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTemperatureMeasurementClusterMeasuredValueAttributeCallbackType>(CallbackFn, this),
+CHIPFlowMeasurementAttributeListAttributeCallback::CHIPFlowMeasurementAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPFlowMeasurementClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -19687,7 +19610,7 @@ CHIPTemperatureMeasurementMeasuredValueAttributeCallback::CHIPTemperatureMeasure
     }
 }
 
-CHIPTemperatureMeasurementMeasuredValueAttributeCallback::~CHIPTemperatureMeasurementMeasuredValueAttributeCallback()
+CHIPFlowMeasurementAttributeListAttributeCallback::~CHIPFlowMeasurementAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19698,8 +19621,8 @@ CHIPTemperatureMeasurementMeasuredValueAttributeCallback::~CHIPTemperatureMeasur
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTemperatureMeasurementMeasuredValueAttributeCallback::CallbackFn(void * context,
-                                                                          const chip::app::DataModel::Nullable<int16_t> & value)
+void CHIPFlowMeasurementAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -19707,8 +19630,9 @@ void CHIPTemperatureMeasurementMeasuredValueAttributeCallback::CallbackFn(void *
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTemperatureMeasurementMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTemperatureMeasurementMeasuredValueAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPFlowMeasurementAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPFlowMeasurementAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -19716,28 +19640,31 @@ void CHIPTemperatureMeasurementMeasuredValueAttributeCallback::CallbackFn(void *
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback::CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback(
+CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback::CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTemperatureMeasurementClusterMinMeasuredValueAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -19754,7 +19681,7 @@ CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback::CHIPTemperatureMeas
     }
 }
 
-CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback::~CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback()
+CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback::~CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19765,8 +19692,8 @@ CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback::~CHIPTemperatureMea
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback::CallbackFn(void * context,
-                                                                             const chip::app::DataModel::Nullable<int16_t> & value)
+void CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -19774,8 +19701,8 @@ void CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback::CallbackFn(voi
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -19795,16 +19722,16 @@ void CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback::CallbackFn(voi
     {
         std::string javaValueClassName     = "java/lang/Integer";
         std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback::CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback(
+CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback::CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTemperatureMeasurementClusterMaxMeasuredValueAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterMinMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -19821,7 +19748,8 @@ CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback::CHIPTemperatureMeas
     }
 }
 
-CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback::~CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback()
+CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback::
+    ~CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19832,8 +19760,8 @@ CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback::~CHIPTemperatureMea
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback::CallbackFn(void * context,
-                                                                             const chip::app::DataModel::Nullable<int16_t> & value)
+void CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -19841,8 +19769,8 @@ void CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback::CallbackFn(voi
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -19862,16 +19790,16 @@ void CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback::CallbackFn(voi
     {
         std::string javaValueClassName     = "java/lang/Integer";
         std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPTemperatureMeasurementAttributeListAttributeCallback::CHIPTemperatureMeasurementAttributeListAttributeCallback(
+CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback::CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTemperatureMeasurementClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterMaxMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -19888,7 +19816,8 @@ CHIPTemperatureMeasurementAttributeListAttributeCallback::CHIPTemperatureMeasure
     }
 }
 
-CHIPTemperatureMeasurementAttributeListAttributeCallback::~CHIPTemperatureMeasurementAttributeListAttributeCallback()
+CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback::
+    ~CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19899,8 +19828,8 @@ CHIPTemperatureMeasurementAttributeListAttributeCallback::~CHIPTemperatureMeasur
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTemperatureMeasurementAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -19908,9 +19837,8 @@ void CHIPTemperatureMeasurementAttributeListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPTemperatureMeasurementAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTemperatureMeasurementAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -19918,30 +19846,29 @@ void CHIPTemperatureMeasurementAttributeListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPTestClusterListInt8uAttributeCallback::CHIPTestClusterListInt8uAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterListInt8uAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback::
+    CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19957,7 +19884,8 @@ CHIPTestClusterListInt8uAttributeCallback::CHIPTestClusterListInt8uAttributeCall
     }
 }
 
-CHIPTestClusterListInt8uAttributeCallback::~CHIPTestClusterListInt8uAttributeCallback()
+CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback::
+    ~CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19968,8 +19896,8 @@ CHIPTestClusterListInt8uAttributeCallback::~CHIPTestClusterListInt8uAttributeCal
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterListInt8uAttributeCallback::CallbackFn(void * context,
-                                                           const chip::app::DataModel::DecodableList<uint8_t> & list)
+void CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -19978,8 +19906,8 @@ void CHIPTestClusterListInt8uAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPTestClusterListInt8uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterListInt8uAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -19998,10 +19926,10 @@ void CHIPTestClusterListInt8uAttributeCallback::CallbackFn(void * context,
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Integer";
-        std::string newElement_0CtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0ClassName.c_str(),
-                                                                      newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -20009,9 +19937,9 @@ void CHIPTestClusterListInt8uAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterListOctetStringAttributeCallback::CHIPTestClusterListOctetStringAttributeCallback(jobject javaCallback,
-                                                                                                 bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterListOctetStringAttributeCallbackType>(CallbackFn, this),
+CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback::
+    CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -20028,7 +19956,8 @@ CHIPTestClusterListOctetStringAttributeCallback::CHIPTestClusterListOctetStringA
     }
 }
 
-CHIPTestClusterListOctetStringAttributeCallback::~CHIPTestClusterListOctetStringAttributeCallback()
+CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback::
+    ~CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20039,8 +19968,8 @@ CHIPTestClusterListOctetStringAttributeCallback::~CHIPTestClusterListOctetString
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterListOctetStringAttributeCallback::CallbackFn(void * context,
-                                                                 const chip::app::DataModel::DecodableList<chip::ByteSpan> & list)
+void CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -20049,9 +19978,9 @@ void CHIPTestClusterListOctetStringAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPTestClusterListOctetStringAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterListOctetStringAttributeCallback *>(context), maybeDestroy);
-
+    std::unique_ptr<CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
     VerifyOrReturn(javaCallbackRef != nullptr,
@@ -20069,10 +19998,10 @@ void CHIPTestClusterListOctetStringAttributeCallback::CallbackFn(void * context,
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        jbyteArray newElement_0ByteArray = env->NewByteArray(static_cast<jsize>(entry_0.size()));
-        env->SetByteArrayRegion(newElement_0ByteArray, 0, static_cast<jsize>(entry_0.size()),
-                                reinterpret_cast<const jbyte *>(entry_0.data()));
-        newElement_0 = newElement_0ByteArray;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -20080,9 +20009,9 @@ void CHIPTestClusterListOctetStringAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterListStructOctetStringAttributeCallback::CHIPTestClusterListStructOctetStringAttributeCallback(jobject javaCallback,
-                                                                                                             bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterListStructOctetStringAttributeCallbackType>(CallbackFn, this),
+CHIPRelativeHumidityMeasurementAttributeListAttributeCallback::CHIPRelativeHumidityMeasurementAttributeListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -20099,7 +20028,7 @@ CHIPTestClusterListStructOctetStringAttributeCallback::CHIPTestClusterListStruct
     }
 }
 
-CHIPTestClusterListStructOctetStringAttributeCallback::~CHIPTestClusterListStructOctetStringAttributeCallback()
+CHIPRelativeHumidityMeasurementAttributeListAttributeCallback::~CHIPRelativeHumidityMeasurementAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20110,9 +20039,8 @@ CHIPTestClusterListStructOctetStringAttributeCallback::~CHIPTestClusterListStruc
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterListStructOctetStringAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType> & list)
+void CHIPRelativeHumidityMeasurementAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -20121,8 +20049,8 @@ void CHIPTestClusterListStructOctetStringAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPTestClusterListStructOctetStringAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterListStructOctetStringAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPRelativeHumidityMeasurementAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPRelativeHumidityMeasurementAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -20141,36 +20069,81 @@ void CHIPTestClusterListStructOctetStringAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        jobject newElement_0_member1;
-        std::string newElement_0_member1ClassName     = "java/lang/Long";
-        std::string newElement_0_member1CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_member1ClassName.c_str(),
-                                                                       newElement_0_member1CtorSignature.c_str(), entry_0.member1,
-                                                                       newElement_0_member1);
-        jobject newElement_0_member2;
-        jbyteArray newElement_0_member2ByteArray = env->NewByteArray(static_cast<jsize>(entry_0.member2.size()));
-        env->SetByteArrayRegion(newElement_0_member2ByteArray, 0, static_cast<jsize>(entry_0.member2.size()),
-                                reinterpret_cast<const jbyte *>(entry_0.member2.data()));
-        newElement_0_member2 = newElement_0_member2ByteArray;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
 
-        jclass testListStructOctetStructClass;
-        err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$TestClusterClusterTestListStructOctet", testListStructOctetStructClass);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterTestListStructOctet");
-            return;
-        }
-        jmethodID testListStructOctetStructCtor =
-            env->GetMethodID(testListStructOctetStructClass, "<init>", "(Ljava/lang/Long;[B)V");
-        if (testListStructOctetStructCtor == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterTestListStructOctet constructor");
-            return;
-        }
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
 
-        newElement_0 = env->NewObject(testListStructOctetStructClass, testListStructOctetStructCtor, newElement_0_member1,
-                                      newElement_0_member2);
+CHIPOccupancySensingGeneratedCommandListAttributeCallback::CHIPOccupancySensingGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOccupancySensingClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPOccupancySensingGeneratedCommandListAttributeCallback::~CHIPOccupancySensingGeneratedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPOccupancySensingGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPOccupancySensingGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOccupancySensingGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -20178,8 +20151,10 @@ void CHIPTestClusterListStructOctetStringAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterVendorIdAttributeCallback::CHIPTestClusterVendorIdAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterVendorIdAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPOccupancySensingAcceptedCommandListAttributeCallback::CHIPOccupancySensingAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOccupancySensingClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20195,7 +20170,7 @@ CHIPTestClusterVendorIdAttributeCallback::CHIPTestClusterVendorIdAttributeCallba
     }
 }
 
-CHIPTestClusterVendorIdAttributeCallback::~CHIPTestClusterVendorIdAttributeCallback()
+CHIPOccupancySensingAcceptedCommandListAttributeCallback::~CHIPOccupancySensingAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20206,7 +20181,8 @@ CHIPTestClusterVendorIdAttributeCallback::~CHIPTestClusterVendorIdAttributeCallb
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterVendorIdAttributeCallback::CallbackFn(void * context, chip::VendorId value)
+void CHIPOccupancySensingAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -20214,8 +20190,9 @@ void CHIPTestClusterVendorIdAttributeCallback::CallbackFn(void * context, chip::
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterVendorIdAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterVendorIdAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPOccupancySensingAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOccupancySensingAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -20223,21 +20200,31 @@ void CHIPTestClusterVendorIdAttributeCallback::CallbackFn(void * context, chip::
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    std::string javaValueClassName     = "java/lang/Integer";
-    std::string javaValueCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                   static_cast<uint16_t>(value), javaValue);
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback::CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterListNullablesAndOptionalsStructAttributeCallbackType>(CallbackFn, this),
+CHIPOccupancySensingAttributeListAttributeCallback::CHIPOccupancySensingAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPOccupancySensingClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -20254,7 +20241,7 @@ CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback::CHIPTestCluster
     }
 }
 
-CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback::~CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback()
+CHIPOccupancySensingAttributeListAttributeCallback::~CHIPOccupancySensingAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20265,10 +20252,8 @@ CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback::~CHIPTestCluste
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::DecodableType> & list)
+void CHIPOccupancySensingAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -20277,8 +20262,8 @@ void CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback::CallbackFn
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPOccupancySensingAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPOccupancySensingAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -20297,469 +20282,428 @@ void CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback::CallbackFn
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        jobject newElement_0_nullableInt;
-        if (entry_0.nullableInt.IsNull())
-        {
-            newElement_0_nullableInt = nullptr;
-        }
-        else
-        {
-            std::string newElement_0_nullableIntClassName     = "java/lang/Integer";
-            std::string newElement_0_nullableIntCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_nullableIntClassName.c_str(),
-                                                                           newElement_0_nullableIntCtorSignature.c_str(),
-                                                                           entry_0.nullableInt.Value(), newElement_0_nullableInt);
-        }
-        jobject newElement_0_optionalInt;
-        if (!entry_0.optionalInt.HasValue())
-        {
-            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_optionalInt);
-        }
-        else
-        {
-            jobject newElement_0_optionalIntInsideOptional;
-            std::string newElement_0_optionalIntInsideOptionalClassName     = "java/lang/Integer";
-            std::string newElement_0_optionalIntInsideOptionalCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-                newElement_0_optionalIntInsideOptionalClassName.c_str(),
-                newElement_0_optionalIntInsideOptionalCtorSignature.c_str(), entry_0.optionalInt.Value(),
-                newElement_0_optionalIntInsideOptional);
-            chip::JniReferences::GetInstance().CreateOptional(newElement_0_optionalIntInsideOptional, newElement_0_optionalInt);
-        }
-        jobject newElement_0_nullableOptionalInt;
-        if (!entry_0.nullableOptionalInt.HasValue())
-        {
-            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_nullableOptionalInt);
-        }
-        else
-        {
-            jobject newElement_0_nullableOptionalIntInsideOptional;
-            if (entry_0.nullableOptionalInt.Value().IsNull())
-            {
-                newElement_0_nullableOptionalIntInsideOptional = nullptr;
-            }
-            else
-            {
-                std::string newElement_0_nullableOptionalIntInsideOptionalClassName     = "java/lang/Integer";
-                std::string newElement_0_nullableOptionalIntInsideOptionalCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-                    newElement_0_nullableOptionalIntInsideOptionalClassName.c_str(),
-                    newElement_0_nullableOptionalIntInsideOptionalCtorSignature.c_str(),
-                    entry_0.nullableOptionalInt.Value().Value(), newElement_0_nullableOptionalIntInsideOptional);
-            }
-            chip::JniReferences::GetInstance().CreateOptional(newElement_0_nullableOptionalIntInsideOptional,
-                                                              newElement_0_nullableOptionalInt);
-        }
-        jobject newElement_0_nullableString;
-        if (entry_0.nullableString.IsNull())
-        {
-            newElement_0_nullableString = nullptr;
-        }
-        else
-        {
-            newElement_0_nullableString = env->NewStringUTF(
-                std::string(entry_0.nullableString.Value().data(), entry_0.nullableString.Value().size()).c_str());
-        }
-        jobject newElement_0_optionalString;
-        if (!entry_0.optionalString.HasValue())
-        {
-            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_optionalString);
-        }
-        else
-        {
-            jobject newElement_0_optionalStringInsideOptional;
-            newElement_0_optionalStringInsideOptional = env->NewStringUTF(
-                std::string(entry_0.optionalString.Value().data(), entry_0.optionalString.Value().size()).c_str());
-            chip::JniReferences::GetInstance().CreateOptional(newElement_0_optionalStringInsideOptional,
-                                                              newElement_0_optionalString);
-        }
-        jobject newElement_0_nullableOptionalString;
-        if (!entry_0.nullableOptionalString.HasValue())
-        {
-            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_nullableOptionalString);
-        }
-        else
-        {
-            jobject newElement_0_nullableOptionalStringInsideOptional;
-            if (entry_0.nullableOptionalString.Value().IsNull())
-            {
-                newElement_0_nullableOptionalStringInsideOptional = nullptr;
-            }
-            else
-            {
-                newElement_0_nullableOptionalStringInsideOptional =
-                    env->NewStringUTF(std::string(entry_0.nullableOptionalString.Value().Value().data(),
-                                                  entry_0.nullableOptionalString.Value().Value().size())
-                                          .c_str());
-            }
-            chip::JniReferences::GetInstance().CreateOptional(newElement_0_nullableOptionalStringInsideOptional,
-                                                              newElement_0_nullableOptionalString);
-        }
-        jobject newElement_0_nullableStruct;
-        if (entry_0.nullableStruct.IsNull())
-        {
-            newElement_0_nullableStruct = nullptr;
-        }
-        else
-        {
-            jobject newElement_0_nullableStruct_a;
-            std::string newElement_0_nullableStruct_aClassName     = "java/lang/Integer";
-            std::string newElement_0_nullableStruct_aCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                newElement_0_nullableStruct_aClassName.c_str(), newElement_0_nullableStruct_aCtorSignature.c_str(),
-                entry_0.nullableStruct.Value().a, newElement_0_nullableStruct_a);
-            jobject newElement_0_nullableStruct_b;
-            std::string newElement_0_nullableStruct_bClassName     = "java/lang/Boolean";
-            std::string newElement_0_nullableStruct_bCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                newElement_0_nullableStruct_bClassName.c_str(), newElement_0_nullableStruct_bCtorSignature.c_str(),
-                entry_0.nullableStruct.Value().b, newElement_0_nullableStruct_b);
-            jobject newElement_0_nullableStruct_c;
-            std::string newElement_0_nullableStruct_cClassName     = "java/lang/Integer";
-            std::string newElement_0_nullableStruct_cCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                newElement_0_nullableStruct_cClassName.c_str(), newElement_0_nullableStruct_cCtorSignature.c_str(),
-                static_cast<uint8_t>(entry_0.nullableStruct.Value().c), newElement_0_nullableStruct_c);
-            jobject newElement_0_nullableStruct_d;
-            jbyteArray newElement_0_nullableStruct_dByteArray =
-                env->NewByteArray(static_cast<jsize>(entry_0.nullableStruct.Value().d.size()));
-            env->SetByteArrayRegion(newElement_0_nullableStruct_dByteArray, 0,
-                                    static_cast<jsize>(entry_0.nullableStruct.Value().d.size()),
-                                    reinterpret_cast<const jbyte *>(entry_0.nullableStruct.Value().d.data()));
-            newElement_0_nullableStruct_d = newElement_0_nullableStruct_dByteArray;
-            jobject newElement_0_nullableStruct_e;
-            newElement_0_nullableStruct_e = env->NewStringUTF(
-                std::string(entry_0.nullableStruct.Value().e.data(), entry_0.nullableStruct.Value().e.size()).c_str());
-            jobject newElement_0_nullableStruct_f;
-            std::string newElement_0_nullableStruct_fClassName     = "java/lang/Integer";
-            std::string newElement_0_nullableStruct_fCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                newElement_0_nullableStruct_fClassName.c_str(), newElement_0_nullableStruct_fCtorSignature.c_str(),
-                entry_0.nullableStruct.Value().f.Raw(), newElement_0_nullableStruct_f);
-            jobject newElement_0_nullableStruct_g;
-            std::string newElement_0_nullableStruct_gClassName     = "java/lang/Float";
-            std::string newElement_0_nullableStruct_gCtorSignature = "(F)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<float>(
-                newElement_0_nullableStruct_gClassName.c_str(), newElement_0_nullableStruct_gCtorSignature.c_str(),
-                entry_0.nullableStruct.Value().g, newElement_0_nullableStruct_g);
-            jobject newElement_0_nullableStruct_h;
-            std::string newElement_0_nullableStruct_hClassName     = "java/lang/Double";
-            std::string newElement_0_nullableStruct_hCtorSignature = "(D)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<double>(
-                newElement_0_nullableStruct_hClassName.c_str(), newElement_0_nullableStruct_hCtorSignature.c_str(),
-                entry_0.nullableStruct.Value().h, newElement_0_nullableStruct_h);
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
 
-            jclass simpleStructStructClass;
-            err = chip::JniReferences::GetInstance().GetClassRef(
-                env, "chip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct", simpleStructStructClass);
-            if (err != CHIP_NO_ERROR)
-            {
-                ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterSimpleStruct");
-                return;
-            }
-            jmethodID simpleStructStructCtor =
-                env->GetMethodID(simpleStructStructClass, "<init>",
-                                 "(Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;[BLjava/lang/String;Ljava/lang/"
-                                 "Integer;Ljava/lang/Float;Ljava/lang/Double;)V");
-            if (simpleStructStructCtor == nullptr)
-            {
-                ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterSimpleStruct constructor");
-                return;
-            }
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
 
-            newElement_0_nullableStruct = env->NewObject(
-                simpleStructStructClass, simpleStructStructCtor, newElement_0_nullableStruct_a, newElement_0_nullableStruct_b,
-                newElement_0_nullableStruct_c, newElement_0_nullableStruct_d, newElement_0_nullableStruct_e,
-                newElement_0_nullableStruct_f, newElement_0_nullableStruct_g, newElement_0_nullableStruct_h);
-        }
-        jobject newElement_0_optionalStruct;
-        if (!entry_0.optionalStruct.HasValue())
-        {
-            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_optionalStruct);
-        }
-        else
-        {
-            jobject newElement_0_optionalStructInsideOptional;
-            jobject newElement_0_optionalStructInsideOptional_a;
-            std::string newElement_0_optionalStructInsideOptional_aClassName     = "java/lang/Integer";
-            std::string newElement_0_optionalStructInsideOptional_aCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                newElement_0_optionalStructInsideOptional_aClassName.c_str(),
-                newElement_0_optionalStructInsideOptional_aCtorSignature.c_str(), entry_0.optionalStruct.Value().a,
-                newElement_0_optionalStructInsideOptional_a);
-            jobject newElement_0_optionalStructInsideOptional_b;
-            std::string newElement_0_optionalStructInsideOptional_bClassName     = "java/lang/Boolean";
-            std::string newElement_0_optionalStructInsideOptional_bCtorSignature = "(Z)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                newElement_0_optionalStructInsideOptional_bClassName.c_str(),
-                newElement_0_optionalStructInsideOptional_bCtorSignature.c_str(), entry_0.optionalStruct.Value().b,
-                newElement_0_optionalStructInsideOptional_b);
-            jobject newElement_0_optionalStructInsideOptional_c;
-            std::string newElement_0_optionalStructInsideOptional_cClassName     = "java/lang/Integer";
-            std::string newElement_0_optionalStructInsideOptional_cCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                newElement_0_optionalStructInsideOptional_cClassName.c_str(),
-                newElement_0_optionalStructInsideOptional_cCtorSignature.c_str(),
-                static_cast<uint8_t>(entry_0.optionalStruct.Value().c), newElement_0_optionalStructInsideOptional_c);
-            jobject newElement_0_optionalStructInsideOptional_d;
-            jbyteArray newElement_0_optionalStructInsideOptional_dByteArray =
-                env->NewByteArray(static_cast<jsize>(entry_0.optionalStruct.Value().d.size()));
-            env->SetByteArrayRegion(newElement_0_optionalStructInsideOptional_dByteArray, 0,
-                                    static_cast<jsize>(entry_0.optionalStruct.Value().d.size()),
-                                    reinterpret_cast<const jbyte *>(entry_0.optionalStruct.Value().d.data()));
-            newElement_0_optionalStructInsideOptional_d = newElement_0_optionalStructInsideOptional_dByteArray;
-            jobject newElement_0_optionalStructInsideOptional_e;
-            newElement_0_optionalStructInsideOptional_e = env->NewStringUTF(
-                std::string(entry_0.optionalStruct.Value().e.data(), entry_0.optionalStruct.Value().e.size()).c_str());
-            jobject newElement_0_optionalStructInsideOptional_f;
-            std::string newElement_0_optionalStructInsideOptional_fClassName     = "java/lang/Integer";
-            std::string newElement_0_optionalStructInsideOptional_fCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                newElement_0_optionalStructInsideOptional_fClassName.c_str(),
-                newElement_0_optionalStructInsideOptional_fCtorSignature.c_str(), entry_0.optionalStruct.Value().f.Raw(),
-                newElement_0_optionalStructInsideOptional_f);
-            jobject newElement_0_optionalStructInsideOptional_g;
-            std::string newElement_0_optionalStructInsideOptional_gClassName     = "java/lang/Float";
-            std::string newElement_0_optionalStructInsideOptional_gCtorSignature = "(F)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<float>(
-                newElement_0_optionalStructInsideOptional_gClassName.c_str(),
-                newElement_0_optionalStructInsideOptional_gCtorSignature.c_str(), entry_0.optionalStruct.Value().g,
-                newElement_0_optionalStructInsideOptional_g);
-            jobject newElement_0_optionalStructInsideOptional_h;
-            std::string newElement_0_optionalStructInsideOptional_hClassName     = "java/lang/Double";
-            std::string newElement_0_optionalStructInsideOptional_hCtorSignature = "(D)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<double>(
-                newElement_0_optionalStructInsideOptional_hClassName.c_str(),
-                newElement_0_optionalStructInsideOptional_hCtorSignature.c_str(), entry_0.optionalStruct.Value().h,
-                newElement_0_optionalStructInsideOptional_h);
+CHIPWakeOnLanGeneratedCommandListAttributeCallback::CHIPWakeOnLanGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPWakeOnLanClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
 
-            jclass simpleStructStructClass;
-            err = chip::JniReferences::GetInstance().GetClassRef(
-                env, "chip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct", simpleStructStructClass);
-            if (err != CHIP_NO_ERROR)
-            {
-                ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterSimpleStruct");
-                return;
-            }
-            jmethodID simpleStructStructCtor =
-                env->GetMethodID(simpleStructStructClass, "<init>",
-                                 "(Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;[BLjava/lang/String;Ljava/lang/"
-                                 "Integer;Ljava/lang/Float;Ljava/lang/Double;)V");
-            if (simpleStructStructCtor == nullptr)
-            {
-                ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterSimpleStruct constructor");
-                return;
-            }
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
 
-            newElement_0_optionalStructInsideOptional =
-                env->NewObject(simpleStructStructClass, simpleStructStructCtor, newElement_0_optionalStructInsideOptional_a,
-                               newElement_0_optionalStructInsideOptional_b, newElement_0_optionalStructInsideOptional_c,
-                               newElement_0_optionalStructInsideOptional_d, newElement_0_optionalStructInsideOptional_e,
-                               newElement_0_optionalStructInsideOptional_f, newElement_0_optionalStructInsideOptional_g,
-                               newElement_0_optionalStructInsideOptional_h);
-            chip::JniReferences::GetInstance().CreateOptional(newElement_0_optionalStructInsideOptional,
-                                                              newElement_0_optionalStruct);
-        }
-        jobject newElement_0_nullableOptionalStruct;
-        if (!entry_0.nullableOptionalStruct.HasValue())
+CHIPWakeOnLanGeneratedCommandListAttributeCallback::~CHIPWakeOnLanGeneratedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPWakeOnLanGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPWakeOnLanGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPWakeOnLanGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPWakeOnLanAcceptedCommandListAttributeCallback::CHIPWakeOnLanAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPWakeOnLanClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPWakeOnLanAcceptedCommandListAttributeCallback::~CHIPWakeOnLanAcceptedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPWakeOnLanAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPWakeOnLanAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPWakeOnLanAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPWakeOnLanAttributeListAttributeCallback::CHIPWakeOnLanAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPWakeOnLanClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPWakeOnLanAttributeListAttributeCallback::~CHIPWakeOnLanAttributeListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPWakeOnLanAttributeListAttributeCallback::CallbackFn(void * context,
+                                                             const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPWakeOnLanAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPWakeOnLanAttributeListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPChannelChannelListAttributeCallback::CHIPChannelChannelListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPChannelClusterChannelListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPChannelChannelListAttributeCallback::~CHIPChannelChannelListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPChannelChannelListAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPChannelChannelListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPChannelChannelListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        jobject newElement_0_majorNumber;
+        std::string newElement_0_majorNumberClassName     = "java/lang/Integer";
+        std::string newElement_0_majorNumberCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_majorNumberClassName.c_str(),
+                                                                       newElement_0_majorNumberCtorSignature.c_str(),
+                                                                       entry_0.majorNumber, newElement_0_majorNumber);
+        jobject newElement_0_minorNumber;
+        std::string newElement_0_minorNumberClassName     = "java/lang/Integer";
+        std::string newElement_0_minorNumberCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_minorNumberClassName.c_str(),
+                                                                       newElement_0_minorNumberCtorSignature.c_str(),
+                                                                       entry_0.minorNumber, newElement_0_minorNumber);
+        jobject newElement_0_name;
+        if (!entry_0.name.HasValue())
         {
-            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_nullableOptionalStruct);
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_name);
         }
         else
         {
-            jobject newElement_0_nullableOptionalStructInsideOptional;
-            if (entry_0.nullableOptionalStruct.Value().IsNull())
-            {
-                newElement_0_nullableOptionalStructInsideOptional = nullptr;
-            }
-            else
-            {
-                jobject newElement_0_nullableOptionalStructInsideOptional_a;
-                std::string newElement_0_nullableOptionalStructInsideOptional_aClassName     = "java/lang/Integer";
-                std::string newElement_0_nullableOptionalStructInsideOptional_aCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0_nullableOptionalStructInsideOptional_aClassName.c_str(),
-                    newElement_0_nullableOptionalStructInsideOptional_aCtorSignature.c_str(),
-                    entry_0.nullableOptionalStruct.Value().Value().a, newElement_0_nullableOptionalStructInsideOptional_a);
-                jobject newElement_0_nullableOptionalStructInsideOptional_b;
-                std::string newElement_0_nullableOptionalStructInsideOptional_bClassName     = "java/lang/Boolean";
-                std::string newElement_0_nullableOptionalStructInsideOptional_bCtorSignature = "(Z)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-                    newElement_0_nullableOptionalStructInsideOptional_bClassName.c_str(),
-                    newElement_0_nullableOptionalStructInsideOptional_bCtorSignature.c_str(),
-                    entry_0.nullableOptionalStruct.Value().Value().b, newElement_0_nullableOptionalStructInsideOptional_b);
-                jobject newElement_0_nullableOptionalStructInsideOptional_c;
-                std::string newElement_0_nullableOptionalStructInsideOptional_cClassName     = "java/lang/Integer";
-                std::string newElement_0_nullableOptionalStructInsideOptional_cCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0_nullableOptionalStructInsideOptional_cClassName.c_str(),
-                    newElement_0_nullableOptionalStructInsideOptional_cCtorSignature.c_str(),
-                    static_cast<uint8_t>(entry_0.nullableOptionalStruct.Value().Value().c),
-                    newElement_0_nullableOptionalStructInsideOptional_c);
-                jobject newElement_0_nullableOptionalStructInsideOptional_d;
-                jbyteArray newElement_0_nullableOptionalStructInsideOptional_dByteArray =
-                    env->NewByteArray(static_cast<jsize>(entry_0.nullableOptionalStruct.Value().Value().d.size()));
-                env->SetByteArrayRegion(newElement_0_nullableOptionalStructInsideOptional_dByteArray, 0,
-                                        static_cast<jsize>(entry_0.nullableOptionalStruct.Value().Value().d.size()),
-                                        reinterpret_cast<const jbyte *>(entry_0.nullableOptionalStruct.Value().Value().d.data()));
-                newElement_0_nullableOptionalStructInsideOptional_d = newElement_0_nullableOptionalStructInsideOptional_dByteArray;
-                jobject newElement_0_nullableOptionalStructInsideOptional_e;
-                newElement_0_nullableOptionalStructInsideOptional_e =
-                    env->NewStringUTF(std::string(entry_0.nullableOptionalStruct.Value().Value().e.data(),
-                                                  entry_0.nullableOptionalStruct.Value().Value().e.size())
-                                          .c_str());
-                jobject newElement_0_nullableOptionalStructInsideOptional_f;
-                std::string newElement_0_nullableOptionalStructInsideOptional_fClassName     = "java/lang/Integer";
-                std::string newElement_0_nullableOptionalStructInsideOptional_fCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0_nullableOptionalStructInsideOptional_fClassName.c_str(),
-                    newElement_0_nullableOptionalStructInsideOptional_fCtorSignature.c_str(),
-                    entry_0.nullableOptionalStruct.Value().Value().f.Raw(), newElement_0_nullableOptionalStructInsideOptional_f);
-                jobject newElement_0_nullableOptionalStructInsideOptional_g;
-                std::string newElement_0_nullableOptionalStructInsideOptional_gClassName     = "java/lang/Float";
-                std::string newElement_0_nullableOptionalStructInsideOptional_gCtorSignature = "(F)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<float>(
-                    newElement_0_nullableOptionalStructInsideOptional_gClassName.c_str(),
-                    newElement_0_nullableOptionalStructInsideOptional_gCtorSignature.c_str(),
-                    entry_0.nullableOptionalStruct.Value().Value().g, newElement_0_nullableOptionalStructInsideOptional_g);
-                jobject newElement_0_nullableOptionalStructInsideOptional_h;
-                std::string newElement_0_nullableOptionalStructInsideOptional_hClassName     = "java/lang/Double";
-                std::string newElement_0_nullableOptionalStructInsideOptional_hCtorSignature = "(D)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<double>(
-                    newElement_0_nullableOptionalStructInsideOptional_hClassName.c_str(),
-                    newElement_0_nullableOptionalStructInsideOptional_hCtorSignature.c_str(),
-                    entry_0.nullableOptionalStruct.Value().Value().h, newElement_0_nullableOptionalStructInsideOptional_h);
-
-                jclass simpleStructStructClass;
-                err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct", simpleStructStructClass);
-                if (err != CHIP_NO_ERROR)
-                {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterSimpleStruct");
-                    return;
-                }
-                jmethodID simpleStructStructCtor =
-                    env->GetMethodID(simpleStructStructClass, "<init>",
-                                     "(Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;[BLjava/lang/String;Ljava/lang/"
-                                     "Integer;Ljava/lang/Float;Ljava/lang/Double;)V");
-                if (simpleStructStructCtor == nullptr)
-                {
-                    ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterSimpleStruct constructor");
-                    return;
-                }
-
-                newElement_0_nullableOptionalStructInsideOptional = env->NewObject(
-                    simpleStructStructClass, simpleStructStructCtor, newElement_0_nullableOptionalStructInsideOptional_a,
-                    newElement_0_nullableOptionalStructInsideOptional_b, newElement_0_nullableOptionalStructInsideOptional_c,
-                    newElement_0_nullableOptionalStructInsideOptional_d, newElement_0_nullableOptionalStructInsideOptional_e,
-                    newElement_0_nullableOptionalStructInsideOptional_f, newElement_0_nullableOptionalStructInsideOptional_g,
-                    newElement_0_nullableOptionalStructInsideOptional_h);
-            }
-            chip::JniReferences::GetInstance().CreateOptional(newElement_0_nullableOptionalStructInsideOptional,
-                                                              newElement_0_nullableOptionalStruct);
+            jobject newElement_0_nameInsideOptional;
+            newElement_0_nameInsideOptional =
+                env->NewStringUTF(std::string(entry_0.name.Value().data(), entry_0.name.Value().size()).c_str());
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_nameInsideOptional, newElement_0_name);
         }
-        jobject newElement_0_nullableList;
-        if (entry_0.nullableList.IsNull())
+        jobject newElement_0_callSign;
+        if (!entry_0.callSign.HasValue())
         {
-            newElement_0_nullableList = nullptr;
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_callSign);
         }
         else
         {
-            chip::JniReferences::GetInstance().CreateArrayList(newElement_0_nullableList);
-
-            auto iter_newElement_0_nullableList_3 = entry_0.nullableList.Value().begin();
-            while (iter_newElement_0_nullableList_3.Next())
-            {
-                auto & entry_3 = iter_newElement_0_nullableList_3.GetValue();
-                jobject newElement_3;
-                std::string newElement_3ClassName     = "java/lang/Integer";
-                std::string newElement_3CtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_3ClassName.c_str(), newElement_3CtorSignature.c_str(), static_cast<uint8_t>(entry_3), newElement_3);
-                chip::JniReferences::GetInstance().AddToList(newElement_0_nullableList, newElement_3);
-            }
+            jobject newElement_0_callSignInsideOptional;
+            newElement_0_callSignInsideOptional =
+                env->NewStringUTF(std::string(entry_0.callSign.Value().data(), entry_0.callSign.Value().size()).c_str());
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_callSignInsideOptional, newElement_0_callSign);
         }
-        jobject newElement_0_optionalList;
-        if (!entry_0.optionalList.HasValue())
+        jobject newElement_0_affiliateCallSign;
+        if (!entry_0.affiliateCallSign.HasValue())
         {
-            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_optionalList);
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_affiliateCallSign);
         }
         else
         {
-            jobject newElement_0_optionalListInsideOptional;
-            chip::JniReferences::GetInstance().CreateArrayList(newElement_0_optionalListInsideOptional);
-
-            auto iter_newElement_0_optionalListInsideOptional_3 = entry_0.optionalList.Value().begin();
-            while (iter_newElement_0_optionalListInsideOptional_3.Next())
-            {
-                auto & entry_3 = iter_newElement_0_optionalListInsideOptional_3.GetValue();
-                jobject newElement_3;
-                std::string newElement_3ClassName     = "java/lang/Integer";
-                std::string newElement_3CtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_3ClassName.c_str(), newElement_3CtorSignature.c_str(), static_cast<uint8_t>(entry_3), newElement_3);
-                chip::JniReferences::GetInstance().AddToList(newElement_0_optionalListInsideOptional, newElement_3);
-            }
-            chip::JniReferences::GetInstance().CreateOptional(newElement_0_optionalListInsideOptional, newElement_0_optionalList);
+            jobject newElement_0_affiliateCallSignInsideOptional;
+            newElement_0_affiliateCallSignInsideOptional = env->NewStringUTF(
+                std::string(entry_0.affiliateCallSign.Value().data(), entry_0.affiliateCallSign.Value().size()).c_str());
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_affiliateCallSignInsideOptional,
+                                                              newElement_0_affiliateCallSign);
         }
-        jobject newElement_0_nullableOptionalList;
-        if (!entry_0.nullableOptionalList.HasValue())
+
+        jclass channelInfoStructClass;
+        err = chip::JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipStructs$ChannelClusterChannelInfo",
+                                                             channelInfoStructClass);
+        if (err != CHIP_NO_ERROR)
         {
-            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_nullableOptionalList);
+            ChipLogError(Zcl, "Could not find class ChipStructs$ChannelClusterChannelInfo");
+            return;
         }
-        else
+        jmethodID channelInfoStructCtor = env->GetMethodID(
+            channelInfoStructClass, "<init>",
+            "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V");
+        if (channelInfoStructCtor == nullptr)
         {
-            jobject newElement_0_nullableOptionalListInsideOptional;
-            if (entry_0.nullableOptionalList.Value().IsNull())
-            {
-                newElement_0_nullableOptionalListInsideOptional = nullptr;
-            }
-            else
-            {
-                chip::JniReferences::GetInstance().CreateArrayList(newElement_0_nullableOptionalListInsideOptional);
-
-                auto iter_newElement_0_nullableOptionalListInsideOptional_4 = entry_0.nullableOptionalList.Value().Value().begin();
-                while (iter_newElement_0_nullableOptionalListInsideOptional_4.Next())
-                {
-                    auto & entry_4 = iter_newElement_0_nullableOptionalListInsideOptional_4.GetValue();
-                    jobject newElement_4;
-                    std::string newElement_4ClassName     = "java/lang/Integer";
-                    std::string newElement_4CtorSignature = "(I)V";
-                    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_4ClassName.c_str(),
-                                                                                  newElement_4CtorSignature.c_str(),
-                                                                                  static_cast<uint8_t>(entry_4), newElement_4);
-                    chip::JniReferences::GetInstance().AddToList(newElement_0_nullableOptionalListInsideOptional, newElement_4);
-                }
-            }
-            chip::JniReferences::GetInstance().CreateOptional(newElement_0_nullableOptionalListInsideOptional,
-                                                              newElement_0_nullableOptionalList);
+            ChipLogError(Zcl, "Could not find ChipStructs$ChannelClusterChannelInfo constructor");
+            return;
         }
 
-        jclass nullablesAndOptionalsStructStructClass;
-        err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$TestClusterClusterNullablesAndOptionalsStruct",
-            nullablesAndOptionalsStructStructClass);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterNullablesAndOptionalsStruct");
-            return;
-        }
-        jmethodID nullablesAndOptionalsStructStructCtor =
-            env->GetMethodID(nullablesAndOptionalsStructStructClass, "<init>",
-                             "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/lang/String;Ljava/util/"
-                             "Optional;Ljava/util/Optional;Lchip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct;Ljava/"
-                             "util/Optional;Ljava/util/Optional;Ljava/util/ArrayList;Ljava/util/Optional;Ljava/util/Optional;)V");
-        if (nullablesAndOptionalsStructStructCtor == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterNullablesAndOptionalsStruct constructor");
-            return;
-        }
+        newElement_0 =
+            env->NewObject(channelInfoStructClass, channelInfoStructCtor, newElement_0_majorNumber, newElement_0_minorNumber,
+                           newElement_0_name, newElement_0_callSign, newElement_0_affiliateCallSign);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPChannelGeneratedCommandListAttributeCallback::CHIPChannelGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                   bool keepAlive) :
+    chip::Callback::Callback<CHIPChannelClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPChannelGeneratedCommandListAttributeCallback::~CHIPChannelGeneratedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPChannelGeneratedCommandListAttributeCallback::CallbackFn(void * context,
+                                                                  const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPChannelGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPChannelGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
 
-        newElement_0 = env->NewObject(nullablesAndOptionalsStructStructClass, nullablesAndOptionalsStructStructCtor,
-                                      newElement_0_nullableInt, newElement_0_optionalInt, newElement_0_nullableOptionalInt,
-                                      newElement_0_nullableString, newElement_0_optionalString, newElement_0_nullableOptionalString,
-                                      newElement_0_nullableStruct, newElement_0_optionalStruct, newElement_0_nullableOptionalStruct,
-                                      newElement_0_nullableList, newElement_0_optionalList, newElement_0_nullableOptionalList);
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -20767,9 +20711,9 @@ void CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback::CallbackFn
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterListLongOctetStringAttributeCallback::CHIPTestClusterListLongOctetStringAttributeCallback(jobject javaCallback,
-                                                                                                         bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterListLongOctetStringAttributeCallbackType>(CallbackFn, this),
+CHIPChannelAcceptedCommandListAttributeCallback::CHIPChannelAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                 bool keepAlive) :
+    chip::Callback::Callback<CHIPChannelClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -20786,7 +20730,7 @@ CHIPTestClusterListLongOctetStringAttributeCallback::CHIPTestClusterListLongOcte
     }
 }
 
-CHIPTestClusterListLongOctetStringAttributeCallback::~CHIPTestClusterListLongOctetStringAttributeCallback()
+CHIPChannelAcceptedCommandListAttributeCallback::~CHIPChannelAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20797,8 +20741,8 @@ CHIPTestClusterListLongOctetStringAttributeCallback::~CHIPTestClusterListLongOct
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterListLongOctetStringAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & list)
+void CHIPChannelAcceptedCommandListAttributeCallback::CallbackFn(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -20807,8 +20751,8 @@ void CHIPTestClusterListLongOctetStringAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPTestClusterListLongOctetStringAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterListLongOctetStringAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPChannelAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPChannelAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -20827,10 +20771,10 @@ void CHIPTestClusterListLongOctetStringAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        jbyteArray newElement_0ByteArray = env->NewByteArray(static_cast<jsize>(entry_0.size()));
-        env->SetByteArrayRegion(newElement_0ByteArray, 0, static_cast<jsize>(entry_0.size()),
-                                reinterpret_cast<const jbyte *>(entry_0.data()));
-        newElement_0 = newElement_0ByteArray;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -20838,10 +20782,8 @@ void CHIPTestClusterListLongOctetStringAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterListFabricScopedAttributeCallback::CHIPTestClusterListFabricScopedAttributeCallback(jobject javaCallback,
-                                                                                                   bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterListFabricScopedAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPChannelAttributeListAttributeCallback::CHIPChannelAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPChannelClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20857,7 +20799,7 @@ CHIPTestClusterListFabricScopedAttributeCallback::CHIPTestClusterListFabricScope
     }
 }
 
-CHIPTestClusterListFabricScopedAttributeCallback::~CHIPTestClusterListFabricScopedAttributeCallback()
+CHIPChannelAttributeListAttributeCallback::~CHIPChannelAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20868,9 +20810,8 @@ CHIPTestClusterListFabricScopedAttributeCallback::~CHIPTestClusterListFabricScop
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterListFabricScopedAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestFabricScoped::DecodableType> & list)
+void CHIPChannelAttributeListAttributeCallback::CallbackFn(void * context,
+                                                           const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -20879,8 +20820,8 @@ void CHIPTestClusterListFabricScopedAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPTestClusterListFabricScopedAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterListFabricScopedAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPChannelAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPChannelAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -20899,185 +20840,104 @@ void CHIPTestClusterListFabricScopedAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        jobject newElement_0_fabricSensitiveInt8u;
-        std::string newElement_0_fabricSensitiveInt8uClassName     = "java/lang/Integer";
-        std::string newElement_0_fabricSensitiveInt8uCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-            newElement_0_fabricSensitiveInt8uClassName.c_str(), newElement_0_fabricSensitiveInt8uCtorSignature.c_str(),
-            entry_0.fabricSensitiveInt8u, newElement_0_fabricSensitiveInt8u);
-        jobject newElement_0_optionalFabricSensitiveInt8u;
-        if (!entry_0.optionalFabricSensitiveInt8u.HasValue())
-        {
-            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_optionalFabricSensitiveInt8u);
-        }
-        else
-        {
-            jobject newElement_0_optionalFabricSensitiveInt8uInsideOptional;
-            std::string newElement_0_optionalFabricSensitiveInt8uInsideOptionalClassName     = "java/lang/Integer";
-            std::string newElement_0_optionalFabricSensitiveInt8uInsideOptionalCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                newElement_0_optionalFabricSensitiveInt8uInsideOptionalClassName.c_str(),
-                newElement_0_optionalFabricSensitiveInt8uInsideOptionalCtorSignature.c_str(),
-                entry_0.optionalFabricSensitiveInt8u.Value(), newElement_0_optionalFabricSensitiveInt8uInsideOptional);
-            chip::JniReferences::GetInstance().CreateOptional(newElement_0_optionalFabricSensitiveInt8uInsideOptional,
-                                                              newElement_0_optionalFabricSensitiveInt8u);
-        }
-        jobject newElement_0_nullableFabricSensitiveInt8u;
-        if (entry_0.nullableFabricSensitiveInt8u.IsNull())
-        {
-            newElement_0_nullableFabricSensitiveInt8u = nullptr;
-        }
-        else
-        {
-            std::string newElement_0_nullableFabricSensitiveInt8uClassName     = "java/lang/Integer";
-            std::string newElement_0_nullableFabricSensitiveInt8uCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                newElement_0_nullableFabricSensitiveInt8uClassName.c_str(),
-                newElement_0_nullableFabricSensitiveInt8uCtorSignature.c_str(), entry_0.nullableFabricSensitiveInt8u.Value(),
-                newElement_0_nullableFabricSensitiveInt8u);
-        }
-        jobject newElement_0_nullableOptionalFabricSensitiveInt8u;
-        if (!entry_0.nullableOptionalFabricSensitiveInt8u.HasValue())
-        {
-            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_nullableOptionalFabricSensitiveInt8u);
-        }
-        else
-        {
-            jobject newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptional;
-            if (entry_0.nullableOptionalFabricSensitiveInt8u.Value().IsNull())
-            {
-                newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptional = nullptr;
-            }
-            else
-            {
-                std::string newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptionalClassName     = "java/lang/Integer";
-                std::string newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptionalCtorSignature = "(I)V";
-                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-                    newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptionalClassName.c_str(),
-                    newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptionalCtorSignature.c_str(),
-                    entry_0.nullableOptionalFabricSensitiveInt8u.Value().Value(),
-                    newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptional);
-            }
-            chip::JniReferences::GetInstance().CreateOptional(newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptional,
-                                                              newElement_0_nullableOptionalFabricSensitiveInt8u);
-        }
-        jobject newElement_0_fabricSensitiveCharString;
-        newElement_0_fabricSensitiveCharString = env->NewStringUTF(
-            std::string(entry_0.fabricSensitiveCharString.data(), entry_0.fabricSensitiveCharString.size()).c_str());
-        jobject newElement_0_fabricSensitiveStruct;
-        jobject newElement_0_fabricSensitiveStruct_a;
-        std::string newElement_0_fabricSensitiveStruct_aClassName     = "java/lang/Integer";
-        std::string newElement_0_fabricSensitiveStruct_aCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-            newElement_0_fabricSensitiveStruct_aClassName.c_str(), newElement_0_fabricSensitiveStruct_aCtorSignature.c_str(),
-            entry_0.fabricSensitiveStruct.a, newElement_0_fabricSensitiveStruct_a);
-        jobject newElement_0_fabricSensitiveStruct_b;
-        std::string newElement_0_fabricSensitiveStruct_bClassName     = "java/lang/Boolean";
-        std::string newElement_0_fabricSensitiveStruct_bCtorSignature = "(Z)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-            newElement_0_fabricSensitiveStruct_bClassName.c_str(), newElement_0_fabricSensitiveStruct_bCtorSignature.c_str(),
-            entry_0.fabricSensitiveStruct.b, newElement_0_fabricSensitiveStruct_b);
-        jobject newElement_0_fabricSensitiveStruct_c;
-        std::string newElement_0_fabricSensitiveStruct_cClassName     = "java/lang/Integer";
-        std::string newElement_0_fabricSensitiveStruct_cCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-            newElement_0_fabricSensitiveStruct_cClassName.c_str(), newElement_0_fabricSensitiveStruct_cCtorSignature.c_str(),
-            static_cast<uint8_t>(entry_0.fabricSensitiveStruct.c), newElement_0_fabricSensitiveStruct_c);
-        jobject newElement_0_fabricSensitiveStruct_d;
-        jbyteArray newElement_0_fabricSensitiveStruct_dByteArray =
-            env->NewByteArray(static_cast<jsize>(entry_0.fabricSensitiveStruct.d.size()));
-        env->SetByteArrayRegion(newElement_0_fabricSensitiveStruct_dByteArray, 0,
-                                static_cast<jsize>(entry_0.fabricSensitiveStruct.d.size()),
-                                reinterpret_cast<const jbyte *>(entry_0.fabricSensitiveStruct.d.data()));
-        newElement_0_fabricSensitiveStruct_d = newElement_0_fabricSensitiveStruct_dByteArray;
-        jobject newElement_0_fabricSensitiveStruct_e;
-        newElement_0_fabricSensitiveStruct_e =
-            env->NewStringUTF(std::string(entry_0.fabricSensitiveStruct.e.data(), entry_0.fabricSensitiveStruct.e.size()).c_str());
-        jobject newElement_0_fabricSensitiveStruct_f;
-        std::string newElement_0_fabricSensitiveStruct_fClassName     = "java/lang/Integer";
-        std::string newElement_0_fabricSensitiveStruct_fCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-            newElement_0_fabricSensitiveStruct_fClassName.c_str(), newElement_0_fabricSensitiveStruct_fCtorSignature.c_str(),
-            entry_0.fabricSensitiveStruct.f.Raw(), newElement_0_fabricSensitiveStruct_f);
-        jobject newElement_0_fabricSensitiveStruct_g;
-        std::string newElement_0_fabricSensitiveStruct_gClassName     = "java/lang/Float";
-        std::string newElement_0_fabricSensitiveStruct_gCtorSignature = "(F)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<float>(
-            newElement_0_fabricSensitiveStruct_gClassName.c_str(), newElement_0_fabricSensitiveStruct_gCtorSignature.c_str(),
-            entry_0.fabricSensitiveStruct.g, newElement_0_fabricSensitiveStruct_g);
-        jobject newElement_0_fabricSensitiveStruct_h;
-        std::string newElement_0_fabricSensitiveStruct_hClassName     = "java/lang/Double";
-        std::string newElement_0_fabricSensitiveStruct_hCtorSignature = "(D)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<double>(
-            newElement_0_fabricSensitiveStruct_hClassName.c_str(), newElement_0_fabricSensitiveStruct_hCtorSignature.c_str(),
-            entry_0.fabricSensitiveStruct.h, newElement_0_fabricSensitiveStruct_h);
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
 
-        jclass simpleStructStructClass;
-        err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct", simpleStructStructClass);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterSimpleStruct");
-            return;
-        }
-        jmethodID simpleStructStructCtor = env->GetMethodID(simpleStructStructClass, "<init>",
-                                                            "(Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;[BLjava/"
-                                                            "lang/String;Ljava/lang/Integer;Ljava/lang/Float;Ljava/lang/Double;)V");
-        if (simpleStructStructCtor == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterSimpleStruct constructor");
-            return;
-        }
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPTargetNavigatorTargetListAttributeCallback::CHIPTargetNavigatorTargetListAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPTargetNavigatorClusterTargetListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+        return;
+    }
+
+    javaCallbackRef = env->NewGlobalRef(javaCallback);
+    if (javaCallbackRef == nullptr)
+    {
+        ChipLogError(Zcl, "Could not create global reference for Java callback");
+    }
+}
+
+CHIPTargetNavigatorTargetListAttributeCallback::~CHIPTargetNavigatorTargetListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPTargetNavigatorTargetListAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType> & list)
+{
+    chip::DeviceLayer::StackUnlock unlock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPTargetNavigatorTargetListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTargetNavigatorTargetListAttributeCallback *>(context), maybeDestroy);
 
-        newElement_0_fabricSensitiveStruct = env->NewObject(
-            simpleStructStructClass, simpleStructStructCtor, newElement_0_fabricSensitiveStruct_a,
-            newElement_0_fabricSensitiveStruct_b, newElement_0_fabricSensitiveStruct_c, newElement_0_fabricSensitiveStruct_d,
-            newElement_0_fabricSensitiveStruct_e, newElement_0_fabricSensitiveStruct_f, newElement_0_fabricSensitiveStruct_g,
-            newElement_0_fabricSensitiveStruct_h);
-        jobject newElement_0_fabricSensitiveInt8uList;
-        chip::JniReferences::GetInstance().CreateArrayList(newElement_0_fabricSensitiveInt8uList);
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        auto iter_newElement_0_fabricSensitiveInt8uList_2 = entry_0.fabricSensitiveInt8uList.begin();
-        while (iter_newElement_0_fabricSensitiveInt8uList_2.Next())
-        {
-            auto & entry_2 = iter_newElement_0_fabricSensitiveInt8uList_2.GetValue();
-            jobject newElement_2;
-            std::string newElement_2ClassName     = "java/lang/Integer";
-            std::string newElement_2CtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_2ClassName.c_str(),
-                                                                          newElement_2CtorSignature.c_str(), entry_2, newElement_2);
-            chip::JniReferences::GetInstance().AddToList(newElement_0_fabricSensitiveInt8uList, newElement_2);
-        }
-        jobject newElement_0_fabricIndex;
-        std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
-        std::string newElement_0_fabricIndexCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
-                                                                      newElement_0_fabricIndexCtorSignature.c_str(),
-                                                                      entry_0.fabricIndex, newElement_0_fabricIndex);
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        jclass testFabricScopedStructClass;
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        jobject newElement_0_identifier;
+        std::string newElement_0_identifierClassName     = "java/lang/Integer";
+        std::string newElement_0_identifierCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_identifierClassName.c_str(),
+                                                                      newElement_0_identifierCtorSignature.c_str(),
+                                                                      entry_0.identifier, newElement_0_identifier);
+        jobject newElement_0_name;
+        newElement_0_name = env->NewStringUTF(std::string(entry_0.name.data(), entry_0.name.size()).c_str());
+
+        jclass targetInfoStructClass;
         err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$TestClusterClusterTestFabricScoped", testFabricScopedStructClass);
+            env, "chip/devicecontroller/ChipStructs$TargetNavigatorClusterTargetInfo", targetInfoStructClass);
         if (err != CHIP_NO_ERROR)
         {
-            ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterTestFabricScoped");
+            ChipLogError(Zcl, "Could not find class ChipStructs$TargetNavigatorClusterTargetInfo");
             return;
         }
-        jmethodID testFabricScopedStructCtor = env->GetMethodID(
-            testFabricScopedStructClass, "<init>",
-            "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/lang/Integer;Ljava/util/Optional;Ljava/lang/String;Lchip/"
-            "devicecontroller/ChipStructs$TestClusterClusterSimpleStruct;Ljava/util/ArrayList;Ljava/lang/Integer;)V");
-        if (testFabricScopedStructCtor == nullptr)
+        jmethodID targetInfoStructCtor =
+            env->GetMethodID(targetInfoStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/String;)V");
+        if (targetInfoStructCtor == nullptr)
         {
-            ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterTestFabricScoped constructor");
+            ChipLogError(Zcl, "Could not find ChipStructs$TargetNavigatorClusterTargetInfo constructor");
             return;
         }
 
-        newElement_0 =
-            env->NewObject(testFabricScopedStructClass, testFabricScopedStructCtor, newElement_0_fabricSensitiveInt8u,
-                           newElement_0_optionalFabricSensitiveInt8u, newElement_0_nullableFabricSensitiveInt8u,
-                           newElement_0_nullableOptionalFabricSensitiveInt8u, newElement_0_fabricSensitiveCharString,
-                           newElement_0_fabricSensitiveStruct, newElement_0_fabricSensitiveInt8uList, newElement_0_fabricIndex);
+        newElement_0 = env->NewObject(targetInfoStructClass, targetInfoStructCtor, newElement_0_identifier, newElement_0_name);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -21085,9 +20945,9 @@ void CHIPTestClusterListFabricScopedAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableBooleanAttributeCallback::CHIPTestClusterNullableBooleanAttributeCallback(jobject javaCallback,
-                                                                                                 bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableBooleanAttributeCallbackType>(CallbackFn, this),
+CHIPTargetNavigatorGeneratedCommandListAttributeCallback::CHIPTargetNavigatorGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTargetNavigatorClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -21104,7 +20964,7 @@ CHIPTestClusterNullableBooleanAttributeCallback::CHIPTestClusterNullableBooleanA
     }
 }
 
-CHIPTestClusterNullableBooleanAttributeCallback::~CHIPTestClusterNullableBooleanAttributeCallback()
+CHIPTargetNavigatorGeneratedCommandListAttributeCallback::~CHIPTargetNavigatorGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21115,7 +20975,8 @@ CHIPTestClusterNullableBooleanAttributeCallback::~CHIPTestClusterNullableBoolean
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableBooleanAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<bool> & value)
+void CHIPTargetNavigatorGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21123,8 +20984,9 @@ void CHIPTestClusterNullableBooleanAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableBooleanAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableBooleanAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPTargetNavigatorGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTargetNavigatorGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21132,28 +20994,31 @@ void CHIPTestClusterNullableBooleanAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Boolean;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Boolean";
-        std::string javaValueCtorSignature = "(Z)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                   value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableBitmap8AttributeCallback::CHIPTestClusterNullableBitmap8AttributeCallback(jobject javaCallback,
-                                                                                                 bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableBitmap8AttributeCallbackType>(CallbackFn, this),
+CHIPTargetNavigatorAcceptedCommandListAttributeCallback::CHIPTargetNavigatorAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTargetNavigatorClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -21170,7 +21035,7 @@ CHIPTestClusterNullableBitmap8AttributeCallback::CHIPTestClusterNullableBitmap8A
     }
 }
 
-CHIPTestClusterNullableBitmap8AttributeCallback::~CHIPTestClusterNullableBitmap8AttributeCallback()
+CHIPTargetNavigatorAcceptedCommandListAttributeCallback::~CHIPTargetNavigatorAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21181,8 +21046,8 @@ CHIPTestClusterNullableBitmap8AttributeCallback::~CHIPTestClusterNullableBitmap8
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableBitmap8AttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> & value)
+void CHIPTargetNavigatorAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21190,8 +21055,9 @@ void CHIPTestClusterNullableBitmap8AttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableBitmap8AttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableBitmap8AttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPTargetNavigatorAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTargetNavigatorAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21199,28 +21065,31 @@ void CHIPTestClusterNullableBitmap8AttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value().Raw(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableBitmap16AttributeCallback::CHIPTestClusterNullableBitmap16AttributeCallback(jobject javaCallback,
-                                                                                                   bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableBitmap16AttributeCallbackType>(CallbackFn, this),
+CHIPTargetNavigatorAttributeListAttributeCallback::CHIPTargetNavigatorAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPTargetNavigatorClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -21237,7 +21106,7 @@ CHIPTestClusterNullableBitmap16AttributeCallback::CHIPTestClusterNullableBitmap1
     }
 }
 
-CHIPTestClusterNullableBitmap16AttributeCallback::~CHIPTestClusterNullableBitmap16AttributeCallback()
+CHIPTargetNavigatorAttributeListAttributeCallback::~CHIPTargetNavigatorAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21248,8 +21117,8 @@ CHIPTestClusterNullableBitmap16AttributeCallback::~CHIPTestClusterNullableBitmap
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableBitmap16AttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> & value)
+void CHIPTargetNavigatorAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21257,8 +21126,9 @@ void CHIPTestClusterNullableBitmap16AttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableBitmap16AttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableBitmap16AttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPTargetNavigatorAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTargetNavigatorAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21266,29 +21136,30 @@ void CHIPTestClusterNullableBitmap16AttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value().Raw(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableBitmap32AttributeCallback::CHIPTestClusterNullableBitmap32AttributeCallback(jobject javaCallback,
-                                                                                                   bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableBitmap32AttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPMediaPlaybackStartTimeAttributeCallback::CHIPMediaPlaybackStartTimeAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPMediaPlaybackClusterStartTimeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21304,7 +21175,7 @@ CHIPTestClusterNullableBitmap32AttributeCallback::CHIPTestClusterNullableBitmap3
     }
 }
 
-CHIPTestClusterNullableBitmap32AttributeCallback::~CHIPTestClusterNullableBitmap32AttributeCallback()
+CHIPMediaPlaybackStartTimeAttributeCallback::~CHIPMediaPlaybackStartTimeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21315,8 +21186,7 @@ CHIPTestClusterNullableBitmap32AttributeCallback::~CHIPTestClusterNullableBitmap
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableBitmap32AttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> & value)
+void CHIPMediaPlaybackStartTimeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint64_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21324,8 +21194,8 @@ void CHIPTestClusterNullableBitmap32AttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableBitmap32AttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableBitmap32AttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPMediaPlaybackStartTimeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPMediaPlaybackStartTimeAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21345,17 +21215,15 @@ void CHIPTestClusterNullableBitmap32AttributeCallback::CallbackFn(
     {
         std::string javaValueClassName     = "java/lang/Long";
         std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value().Raw(), javaValue);
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPTestClusterNullableBitmap64AttributeCallback::CHIPTestClusterNullableBitmap64AttributeCallback(jobject javaCallback,
-                                                                                                   bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableBitmap64AttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPMediaPlaybackDurationAttributeCallback::CHIPMediaPlaybackDurationAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPMediaPlaybackClusterDurationAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21371,7 +21239,7 @@ CHIPTestClusterNullableBitmap64AttributeCallback::CHIPTestClusterNullableBitmap6
     }
 }
 
-CHIPTestClusterNullableBitmap64AttributeCallback::~CHIPTestClusterNullableBitmap64AttributeCallback()
+CHIPMediaPlaybackDurationAttributeCallback::~CHIPMediaPlaybackDurationAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21382,8 +21250,7 @@ CHIPTestClusterNullableBitmap64AttributeCallback::~CHIPTestClusterNullableBitmap
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableBitmap64AttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> & value)
+void CHIPMediaPlaybackDurationAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint64_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21391,8 +21258,8 @@ void CHIPTestClusterNullableBitmap64AttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableBitmap64AttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableBitmap64AttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPMediaPlaybackDurationAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPMediaPlaybackDurationAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21413,14 +21280,16 @@ void CHIPTestClusterNullableBitmap64AttributeCallback::CallbackFn(
         std::string javaValueClassName     = "java/lang/Long";
         std::string javaValueCtorSignature = "(J)V";
         chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value().Raw(), javaValue);
+                                                                       value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPTestClusterNullableInt8uAttributeCallback::CHIPTestClusterNullableInt8uAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableInt8uAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPMediaPlaybackSeekRangeEndAttributeCallback::CHIPMediaPlaybackSeekRangeEndAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPMediaPlaybackClusterSeekRangeEndAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21436,7 +21305,7 @@ CHIPTestClusterNullableInt8uAttributeCallback::CHIPTestClusterNullableInt8uAttri
     }
 }
 
-CHIPTestClusterNullableInt8uAttributeCallback::~CHIPTestClusterNullableInt8uAttributeCallback()
+CHIPMediaPlaybackSeekRangeEndAttributeCallback::~CHIPMediaPlaybackSeekRangeEndAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21447,8 +21316,8 @@ CHIPTestClusterNullableInt8uAttributeCallback::~CHIPTestClusterNullableInt8uAttr
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableInt8uAttributeCallback::CallbackFn(void * context,
-                                                               const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPMediaPlaybackSeekRangeEndAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::Nullable<uint64_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21456,8 +21325,8 @@ void CHIPTestClusterNullableInt8uAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableInt8uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableInt8uAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPMediaPlaybackSeekRangeEndAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPMediaPlaybackSeekRangeEndAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21465,7 +21334,7 @@ void CHIPTestClusterNullableInt8uAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
@@ -21475,18 +21344,18 @@ void CHIPTestClusterNullableInt8uAttributeCallback::CallbackFn(void * context,
     }
     else
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPTestClusterNullableInt16uAttributeCallback::CHIPTestClusterNullableInt16uAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableInt16uAttributeCallbackType>(CallbackFn, this),
+CHIPMediaPlaybackSeekRangeStartAttributeCallback::CHIPMediaPlaybackSeekRangeStartAttributeCallback(jobject javaCallback,
+                                                                                                   bool keepAlive) :
+    chip::Callback::Callback<CHIPMediaPlaybackClusterSeekRangeStartAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -21503,7 +21372,7 @@ CHIPTestClusterNullableInt16uAttributeCallback::CHIPTestClusterNullableInt16uAtt
     }
 }
 
-CHIPTestClusterNullableInt16uAttributeCallback::~CHIPTestClusterNullableInt16uAttributeCallback()
+CHIPMediaPlaybackSeekRangeStartAttributeCallback::~CHIPMediaPlaybackSeekRangeStartAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21514,8 +21383,8 @@ CHIPTestClusterNullableInt16uAttributeCallback::~CHIPTestClusterNullableInt16uAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableInt16uAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPMediaPlaybackSeekRangeStartAttributeCallback::CallbackFn(void * context,
+                                                                  const chip::app::DataModel::Nullable<uint64_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21523,8 +21392,8 @@ void CHIPTestClusterNullableInt16uAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableInt16uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableInt16uAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPMediaPlaybackSeekRangeStartAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPMediaPlaybackSeekRangeStartAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21532,7 +21401,7 @@ void CHIPTestClusterNullableInt16uAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
@@ -21542,18 +21411,18 @@ void CHIPTestClusterNullableInt16uAttributeCallback::CallbackFn(void * context,
     }
     else
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
                                                                        value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPTestClusterNullableInt24uAttributeCallback::CHIPTestClusterNullableInt24uAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableInt24uAttributeCallbackType>(CallbackFn, this),
+CHIPMediaPlaybackGeneratedCommandListAttributeCallback::CHIPMediaPlaybackGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPMediaPlaybackClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -21570,7 +21439,7 @@ CHIPTestClusterNullableInt24uAttributeCallback::CHIPTestClusterNullableInt24uAtt
     }
 }
 
-CHIPTestClusterNullableInt24uAttributeCallback::~CHIPTestClusterNullableInt24uAttributeCallback()
+CHIPMediaPlaybackGeneratedCommandListAttributeCallback::~CHIPMediaPlaybackGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21581,8 +21450,8 @@ CHIPTestClusterNullableInt24uAttributeCallback::~CHIPTestClusterNullableInt24uAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableInt24uAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::Nullable<uint32_t> & value)
+void CHIPMediaPlaybackGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21590,8 +21459,9 @@ void CHIPTestClusterNullableInt24uAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableInt24uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableInt24uAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPMediaPlaybackGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPMediaPlaybackGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21599,28 +21469,31 @@ void CHIPTestClusterNullableInt24uAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableInt32uAttributeCallback::CHIPTestClusterNullableInt32uAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableInt32uAttributeCallbackType>(CallbackFn, this),
+CHIPMediaPlaybackAcceptedCommandListAttributeCallback::CHIPMediaPlaybackAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                             bool keepAlive) :
+    chip::Callback::Callback<CHIPMediaPlaybackClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -21637,7 +21510,7 @@ CHIPTestClusterNullableInt32uAttributeCallback::CHIPTestClusterNullableInt32uAtt
     }
 }
 
-CHIPTestClusterNullableInt32uAttributeCallback::~CHIPTestClusterNullableInt32uAttributeCallback()
+CHIPMediaPlaybackAcceptedCommandListAttributeCallback::~CHIPMediaPlaybackAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21648,8 +21521,8 @@ CHIPTestClusterNullableInt32uAttributeCallback::~CHIPTestClusterNullableInt32uAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableInt32uAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::Nullable<uint32_t> & value)
+void CHIPMediaPlaybackAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21657,8 +21530,9 @@ void CHIPTestClusterNullableInt32uAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableInt32uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableInt32uAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPMediaPlaybackAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPMediaPlaybackAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21666,28 +21540,31 @@ void CHIPTestClusterNullableInt32uAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableInt40uAttributeCallback::CHIPTestClusterNullableInt40uAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableInt40uAttributeCallbackType>(CallbackFn, this),
+CHIPMediaPlaybackAttributeListAttributeCallback::CHIPMediaPlaybackAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                 bool keepAlive) :
+    chip::Callback::Callback<CHIPMediaPlaybackClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -21704,7 +21581,7 @@ CHIPTestClusterNullableInt40uAttributeCallback::CHIPTestClusterNullableInt40uAtt
     }
 }
 
-CHIPTestClusterNullableInt40uAttributeCallback::~CHIPTestClusterNullableInt40uAttributeCallback()
+CHIPMediaPlaybackAttributeListAttributeCallback::~CHIPMediaPlaybackAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21715,8 +21592,8 @@ CHIPTestClusterNullableInt40uAttributeCallback::~CHIPTestClusterNullableInt40uAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableInt40uAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::Nullable<uint64_t> & value)
+void CHIPMediaPlaybackAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21724,8 +21601,9 @@ void CHIPTestClusterNullableInt40uAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableInt40uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableInt40uAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPMediaPlaybackAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPMediaPlaybackAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21733,29 +21611,30 @@ void CHIPTestClusterNullableInt40uAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableInt48uAttributeCallback::CHIPTestClusterNullableInt48uAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableInt48uAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPMediaInputInputListAttributeCallback::CHIPMediaInputInputListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPMediaInputClusterInputListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21771,7 +21650,7 @@ CHIPTestClusterNullableInt48uAttributeCallback::CHIPTestClusterNullableInt48uAtt
     }
 }
 
-CHIPTestClusterNullableInt48uAttributeCallback::~CHIPTestClusterNullableInt48uAttributeCallback()
+CHIPMediaInputInputListAttributeCallback::~CHIPMediaInputInputListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21782,8 +21661,9 @@ CHIPTestClusterNullableInt48uAttributeCallback::~CHIPTestClusterNullableInt48uAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableInt48uAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::Nullable<uint64_t> & value)
+void CHIPMediaInputInputListAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::InputInfo::DecodableType> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21791,8 +21671,9 @@ void CHIPTestClusterNullableInt48uAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableInt48uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableInt48uAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPMediaInputInputListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPMediaInputInputListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21800,28 +21681,61 @@ void CHIPTestClusterNullableInt48uAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        jobject newElement_0_index;
+        std::string newElement_0_indexClassName     = "java/lang/Integer";
+        std::string newElement_0_indexCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+            newElement_0_indexClassName.c_str(), newElement_0_indexCtorSignature.c_str(), entry_0.index, newElement_0_index);
+        jobject newElement_0_inputType;
+        std::string newElement_0_inputTypeClassName     = "java/lang/Integer";
+        std::string newElement_0_inputTypeCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+            newElement_0_inputTypeClassName.c_str(), newElement_0_inputTypeCtorSignature.c_str(),
+            static_cast<uint8_t>(entry_0.inputType), newElement_0_inputType);
+        jobject newElement_0_name;
+        newElement_0_name = env->NewStringUTF(std::string(entry_0.name.data(), entry_0.name.size()).c_str());
+        jobject newElement_0_description;
+        newElement_0_description = env->NewStringUTF(std::string(entry_0.description.data(), entry_0.description.size()).c_str());
+
+        jclass inputInfoStructClass;
+        err = chip::JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipStructs$MediaInputClusterInputInfo",
+                                                             inputInfoStructClass);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$MediaInputClusterInputInfo");
+            return;
+        }
+        jmethodID inputInfoStructCtor = env->GetMethodID(
+            inputInfoStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;)V");
+        if (inputInfoStructCtor == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$MediaInputClusterInputInfo constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(inputInfoStructClass, inputInfoStructCtor, newElement_0_index, newElement_0_inputType,
+                                      newElement_0_name, newElement_0_description);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableInt56uAttributeCallback::CHIPTestClusterNullableInt56uAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableInt56uAttributeCallbackType>(CallbackFn, this),
+CHIPMediaInputGeneratedCommandListAttributeCallback::CHIPMediaInputGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPMediaInputClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -21838,7 +21752,7 @@ CHIPTestClusterNullableInt56uAttributeCallback::CHIPTestClusterNullableInt56uAtt
     }
 }
 
-CHIPTestClusterNullableInt56uAttributeCallback::~CHIPTestClusterNullableInt56uAttributeCallback()
+CHIPMediaInputGeneratedCommandListAttributeCallback::~CHIPMediaInputGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21849,8 +21763,8 @@ CHIPTestClusterNullableInt56uAttributeCallback::~CHIPTestClusterNullableInt56uAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableInt56uAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::Nullable<uint64_t> & value)
+void CHIPMediaInputGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21858,8 +21772,9 @@ void CHIPTestClusterNullableInt56uAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableInt56uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableInt56uAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPMediaInputGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPMediaInputGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21867,28 +21782,31 @@ void CHIPTestClusterNullableInt56uAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableInt64uAttributeCallback::CHIPTestClusterNullableInt64uAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableInt64uAttributeCallbackType>(CallbackFn, this),
+CHIPMediaInputAcceptedCommandListAttributeCallback::CHIPMediaInputAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPMediaInputClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -21905,7 +21823,7 @@ CHIPTestClusterNullableInt64uAttributeCallback::CHIPTestClusterNullableInt64uAtt
     }
 }
 
-CHIPTestClusterNullableInt64uAttributeCallback::~CHIPTestClusterNullableInt64uAttributeCallback()
+CHIPMediaInputAcceptedCommandListAttributeCallback::~CHIPMediaInputAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21916,8 +21834,8 @@ CHIPTestClusterNullableInt64uAttributeCallback::~CHIPTestClusterNullableInt64uAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableInt64uAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::Nullable<uint64_t> & value)
+void CHIPMediaInputAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21925,8 +21843,9 @@ void CHIPTestClusterNullableInt64uAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableInt64uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableInt64uAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPMediaInputAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPMediaInputAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21934,27 +21853,30 @@ void CHIPTestClusterNullableInt64uAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableInt8sAttributeCallback::CHIPTestClusterNullableInt8sAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableInt8sAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPMediaInputAttributeListAttributeCallback::CHIPMediaInputAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPMediaInputClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21970,7 +21892,7 @@ CHIPTestClusterNullableInt8sAttributeCallback::CHIPTestClusterNullableInt8sAttri
     }
 }
 
-CHIPTestClusterNullableInt8sAttributeCallback::~CHIPTestClusterNullableInt8sAttributeCallback()
+CHIPMediaInputAttributeListAttributeCallback::~CHIPMediaInputAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21981,7 +21903,8 @@ CHIPTestClusterNullableInt8sAttributeCallback::~CHIPTestClusterNullableInt8sAttr
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableInt8sAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<int8_t> & value)
+void CHIPMediaInputAttributeListAttributeCallback::CallbackFn(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21989,8 +21912,9 @@ void CHIPTestClusterNullableInt8sAttributeCallback::CallbackFn(void * context, c
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableInt8sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableInt8sAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPMediaInputAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPMediaInputAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -21998,28 +21922,31 @@ void CHIPTestClusterNullableInt8sAttributeCallback::CallbackFn(void * context, c
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                     value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableInt16sAttributeCallback::CHIPTestClusterNullableInt16sAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableInt16sAttributeCallbackType>(CallbackFn, this),
+CHIPLowPowerGeneratedCommandListAttributeCallback::CHIPLowPowerGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPLowPowerClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -22036,7 +21963,7 @@ CHIPTestClusterNullableInt16sAttributeCallback::CHIPTestClusterNullableInt16sAtt
     }
 }
 
-CHIPTestClusterNullableInt16sAttributeCallback::~CHIPTestClusterNullableInt16sAttributeCallback()
+CHIPLowPowerGeneratedCommandListAttributeCallback::~CHIPLowPowerGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22047,8 +21974,8 @@ CHIPTestClusterNullableInt16sAttributeCallback::~CHIPTestClusterNullableInt16sAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableInt16sAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::Nullable<int16_t> & value)
+void CHIPLowPowerGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22056,8 +21983,9 @@ void CHIPTestClusterNullableInt16sAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableInt16sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableInt16sAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPLowPowerGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLowPowerGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22065,28 +21993,31 @@ void CHIPTestClusterNullableInt16sAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableInt24sAttributeCallback::CHIPTestClusterNullableInt24sAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableInt24sAttributeCallbackType>(CallbackFn, this),
+CHIPLowPowerAcceptedCommandListAttributeCallback::CHIPLowPowerAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                   bool keepAlive) :
+    chip::Callback::Callback<CHIPLowPowerClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -22103,7 +22034,7 @@ CHIPTestClusterNullableInt24sAttributeCallback::CHIPTestClusterNullableInt24sAtt
     }
 }
 
-CHIPTestClusterNullableInt24sAttributeCallback::~CHIPTestClusterNullableInt24sAttributeCallback()
+CHIPLowPowerAcceptedCommandListAttributeCallback::~CHIPLowPowerAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22114,8 +22045,8 @@ CHIPTestClusterNullableInt24sAttributeCallback::~CHIPTestClusterNullableInt24sAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableInt24sAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::Nullable<int32_t> & value)
+void CHIPLowPowerAcceptedCommandListAttributeCallback::CallbackFn(void * context,
+                                                                  const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22123,8 +22054,9 @@ void CHIPTestClusterNullableInt24sAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableInt24sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableInt24sAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPLowPowerAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLowPowerAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22132,29 +22064,30 @@ void CHIPTestClusterNullableInt24sAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int32_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableInt32sAttributeCallback::CHIPTestClusterNullableInt32sAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableInt32sAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPLowPowerAttributeListAttributeCallback::CHIPLowPowerAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPLowPowerClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22170,7 +22103,7 @@ CHIPTestClusterNullableInt32sAttributeCallback::CHIPTestClusterNullableInt32sAtt
     }
 }
 
-CHIPTestClusterNullableInt32sAttributeCallback::~CHIPTestClusterNullableInt32sAttributeCallback()
+CHIPLowPowerAttributeListAttributeCallback::~CHIPLowPowerAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22181,8 +22114,8 @@ CHIPTestClusterNullableInt32sAttributeCallback::~CHIPTestClusterNullableInt32sAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableInt32sAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::Nullable<int32_t> & value)
+void CHIPLowPowerAttributeListAttributeCallback::CallbackFn(void * context,
+                                                            const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22190,8 +22123,9 @@ void CHIPTestClusterNullableInt32sAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableInt32sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableInt32sAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPLowPowerAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPLowPowerAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22199,28 +22133,31 @@ void CHIPTestClusterNullableInt32sAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int32_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableInt40sAttributeCallback::CHIPTestClusterNullableInt40sAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableInt40sAttributeCallbackType>(CallbackFn, this),
+CHIPKeypadInputGeneratedCommandListAttributeCallback::CHIPKeypadInputGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPKeypadInputClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -22237,7 +22174,7 @@ CHIPTestClusterNullableInt40sAttributeCallback::CHIPTestClusterNullableInt40sAtt
     }
 }
 
-CHIPTestClusterNullableInt40sAttributeCallback::~CHIPTestClusterNullableInt40sAttributeCallback()
+CHIPKeypadInputGeneratedCommandListAttributeCallback::~CHIPKeypadInputGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22247,9 +22184,9 @@ CHIPTestClusterNullableInt40sAttributeCallback::~CHIPTestClusterNullableInt40sAt
     }
     env->DeleteGlobalRef(javaCallbackRef);
 }
-
-void CHIPTestClusterNullableInt40sAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::Nullable<int64_t> & value)
+
+void CHIPKeypadInputGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22257,8 +22194,9 @@ void CHIPTestClusterNullableInt40sAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableInt40sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableInt40sAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPKeypadInputGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPKeypadInputGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22266,28 +22204,31 @@ void CHIPTestClusterNullableInt40sAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableInt48sAttributeCallback::CHIPTestClusterNullableInt48sAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableInt48sAttributeCallbackType>(CallbackFn, this),
+CHIPKeypadInputAcceptedCommandListAttributeCallback::CHIPKeypadInputAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPKeypadInputClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -22304,7 +22245,7 @@ CHIPTestClusterNullableInt48sAttributeCallback::CHIPTestClusterNullableInt48sAtt
     }
 }
 
-CHIPTestClusterNullableInt48sAttributeCallback::~CHIPTestClusterNullableInt48sAttributeCallback()
+CHIPKeypadInputAcceptedCommandListAttributeCallback::~CHIPKeypadInputAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22315,8 +22256,8 @@ CHIPTestClusterNullableInt48sAttributeCallback::~CHIPTestClusterNullableInt48sAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableInt48sAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::Nullable<int64_t> & value)
+void CHIPKeypadInputAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22324,8 +22265,9 @@ void CHIPTestClusterNullableInt48sAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableInt48sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableInt48sAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPKeypadInputAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPKeypadInputAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22333,29 +22275,30 @@ void CHIPTestClusterNullableInt48sAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableInt56sAttributeCallback::CHIPTestClusterNullableInt56sAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableInt56sAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPKeypadInputAttributeListAttributeCallback::CHIPKeypadInputAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPKeypadInputClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22371,7 +22314,7 @@ CHIPTestClusterNullableInt56sAttributeCallback::CHIPTestClusterNullableInt56sAtt
     }
 }
 
-CHIPTestClusterNullableInt56sAttributeCallback::~CHIPTestClusterNullableInt56sAttributeCallback()
+CHIPKeypadInputAttributeListAttributeCallback::~CHIPKeypadInputAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22382,8 +22325,8 @@ CHIPTestClusterNullableInt56sAttributeCallback::~CHIPTestClusterNullableInt56sAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableInt56sAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::Nullable<int64_t> & value)
+void CHIPKeypadInputAttributeListAttributeCallback::CallbackFn(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22391,8 +22334,9 @@ void CHIPTestClusterNullableInt56sAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableInt56sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableInt56sAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPKeypadInputAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPKeypadInputAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22400,28 +22344,31 @@ void CHIPTestClusterNullableInt56sAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableInt64sAttributeCallback::CHIPTestClusterNullableInt64sAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableInt64sAttributeCallbackType>(CallbackFn, this),
+CHIPContentLauncherAcceptHeaderAttributeCallback::CHIPContentLauncherAcceptHeaderAttributeCallback(jobject javaCallback,
+                                                                                                   bool keepAlive) :
+    chip::Callback::Callback<CHIPContentLauncherClusterAcceptHeaderAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -22438,7 +22385,7 @@ CHIPTestClusterNullableInt64sAttributeCallback::CHIPTestClusterNullableInt64sAtt
     }
 }
 
-CHIPTestClusterNullableInt64sAttributeCallback::~CHIPTestClusterNullableInt64sAttributeCallback()
+CHIPContentLauncherAcceptHeaderAttributeCallback::~CHIPContentLauncherAcceptHeaderAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22449,8 +22396,8 @@ CHIPTestClusterNullableInt64sAttributeCallback::~CHIPTestClusterNullableInt64sAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableInt64sAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::Nullable<int64_t> & value)
+void CHIPContentLauncherAcceptHeaderAttributeCallback::CallbackFn(void * context,
+                                                                  const chip::app::DataModel::DecodableList<chip::CharSpan> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22458,8 +22405,9 @@ void CHIPTestClusterNullableInt64sAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableInt64sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableInt64sAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPContentLauncherAcceptHeaderAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPContentLauncherAcceptHeaderAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22467,27 +22415,29 @@ void CHIPTestClusterNullableInt64sAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        newElement_0 = env->NewStringUTF(std::string(entry_0.data(), entry_0.size()).c_str());
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableEnum8AttributeCallback::CHIPTestClusterNullableEnum8AttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableEnum8AttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPContentLauncherGeneratedCommandListAttributeCallback::CHIPContentLauncherGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPContentLauncherClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22503,7 +22453,7 @@ CHIPTestClusterNullableEnum8AttributeCallback::CHIPTestClusterNullableEnum8Attri
     }
 }
 
-CHIPTestClusterNullableEnum8AttributeCallback::~CHIPTestClusterNullableEnum8AttributeCallback()
+CHIPContentLauncherGeneratedCommandListAttributeCallback::~CHIPContentLauncherGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22514,8 +22464,8 @@ CHIPTestClusterNullableEnum8AttributeCallback::~CHIPTestClusterNullableEnum8Attr
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableEnum8AttributeCallback::CallbackFn(void * context,
-                                                               const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPContentLauncherGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22523,8 +22473,9 @@ void CHIPTestClusterNullableEnum8AttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableEnum8AttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableEnum8AttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPContentLauncherGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPContentLauncherGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22532,28 +22483,31 @@ void CHIPTestClusterNullableEnum8AttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableEnum16AttributeCallback::CHIPTestClusterNullableEnum16AttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableEnum16AttributeCallbackType>(CallbackFn, this),
+CHIPContentLauncherAcceptedCommandListAttributeCallback::CHIPContentLauncherAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPContentLauncherClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -22570,7 +22524,7 @@ CHIPTestClusterNullableEnum16AttributeCallback::CHIPTestClusterNullableEnum16Att
     }
 }
 
-CHIPTestClusterNullableEnum16AttributeCallback::~CHIPTestClusterNullableEnum16AttributeCallback()
+CHIPContentLauncherAcceptedCommandListAttributeCallback::~CHIPContentLauncherAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22581,8 +22535,8 @@ CHIPTestClusterNullableEnum16AttributeCallback::~CHIPTestClusterNullableEnum16At
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableEnum16AttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPContentLauncherAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22590,8 +22544,9 @@ void CHIPTestClusterNullableEnum16AttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableEnum16AttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableEnum16AttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPContentLauncherAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPContentLauncherAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22599,28 +22554,31 @@ void CHIPTestClusterNullableEnum16AttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableFloatSingleAttributeCallback::CHIPTestClusterNullableFloatSingleAttributeCallback(jobject javaCallback,
-                                                                                                         bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableFloatSingleAttributeCallbackType>(CallbackFn, this),
+CHIPContentLauncherAttributeListAttributeCallback::CHIPContentLauncherAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPContentLauncherClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -22637,7 +22595,7 @@ CHIPTestClusterNullableFloatSingleAttributeCallback::CHIPTestClusterNullableFloa
     }
 }
 
-CHIPTestClusterNullableFloatSingleAttributeCallback::~CHIPTestClusterNullableFloatSingleAttributeCallback()
+CHIPContentLauncherAttributeListAttributeCallback::~CHIPContentLauncherAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22648,8 +22606,8 @@ CHIPTestClusterNullableFloatSingleAttributeCallback::~CHIPTestClusterNullableFlo
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableFloatSingleAttributeCallback::CallbackFn(void * context,
-                                                                     const chip::app::DataModel::Nullable<float> & value)
+void CHIPContentLauncherAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22657,8 +22615,9 @@ void CHIPTestClusterNullableFloatSingleAttributeCallback::CallbackFn(void * cont
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableFloatSingleAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableFloatSingleAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPContentLauncherAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPContentLauncherAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22666,29 +22625,30 @@ void CHIPTestClusterNullableFloatSingleAttributeCallback::CallbackFn(void * cont
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Float;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Float";
-        std::string javaValueCtorSignature = "(F)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<float>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                    value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableFloatDoubleAttributeCallback::CHIPTestClusterNullableFloatDoubleAttributeCallback(jobject javaCallback,
-                                                                                                         bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableFloatDoubleAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPAudioOutputOutputListAttributeCallback::CHIPAudioOutputOutputListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPAudioOutputClusterOutputListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22704,7 +22664,7 @@ CHIPTestClusterNullableFloatDoubleAttributeCallback::CHIPTestClusterNullableFloa
     }
 }
 
-CHIPTestClusterNullableFloatDoubleAttributeCallback::~CHIPTestClusterNullableFloatDoubleAttributeCallback()
+CHIPAudioOutputOutputListAttributeCallback::~CHIPAudioOutputOutputListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22715,8 +22675,9 @@ CHIPTestClusterNullableFloatDoubleAttributeCallback::~CHIPTestClusterNullableFlo
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableFloatDoubleAttributeCallback::CallbackFn(void * context,
-                                                                     const chip::app::DataModel::Nullable<double> & value)
+void CHIPAudioOutputOutputListAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::OutputInfo::DecodableType> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22724,8 +22685,9 @@ void CHIPTestClusterNullableFloatDoubleAttributeCallback::CallbackFn(void * cont
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableFloatDoubleAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableFloatDoubleAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPAudioOutputOutputListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPAudioOutputOutputListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22733,28 +22695,59 @@ void CHIPTestClusterNullableFloatDoubleAttributeCallback::CallbackFn(void * cont
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Double;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Double";
-        std::string javaValueCtorSignature = "(D)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<double>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                     value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        jobject newElement_0_index;
+        std::string newElement_0_indexClassName     = "java/lang/Integer";
+        std::string newElement_0_indexCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+            newElement_0_indexClassName.c_str(), newElement_0_indexCtorSignature.c_str(), entry_0.index, newElement_0_index);
+        jobject newElement_0_outputType;
+        std::string newElement_0_outputTypeClassName     = "java/lang/Integer";
+        std::string newElement_0_outputTypeCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+            newElement_0_outputTypeClassName.c_str(), newElement_0_outputTypeCtorSignature.c_str(),
+            static_cast<uint8_t>(entry_0.outputType), newElement_0_outputType);
+        jobject newElement_0_name;
+        newElement_0_name = env->NewStringUTF(std::string(entry_0.name.data(), entry_0.name.size()).c_str());
+
+        jclass outputInfoStructClass;
+        err = chip::JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipStructs$AudioOutputClusterOutputInfo",
+                                                             outputInfoStructClass);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$AudioOutputClusterOutputInfo");
+            return;
+        }
+        jmethodID outputInfoStructCtor =
+            env->GetMethodID(outputInfoStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;)V");
+        if (outputInfoStructCtor == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$AudioOutputClusterOutputInfo constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(outputInfoStructClass, outputInfoStructCtor, newElement_0_index, newElement_0_outputType,
+                                      newElement_0_name);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableOctetStringAttributeCallback::CHIPTestClusterNullableOctetStringAttributeCallback(jobject javaCallback,
-                                                                                                         bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableOctetStringAttributeCallbackType>(CallbackFn, this),
+CHIPAudioOutputGeneratedCommandListAttributeCallback::CHIPAudioOutputGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPAudioOutputClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -22771,7 +22764,7 @@ CHIPTestClusterNullableOctetStringAttributeCallback::CHIPTestClusterNullableOcte
     }
 }
 
-CHIPTestClusterNullableOctetStringAttributeCallback::~CHIPTestClusterNullableOctetStringAttributeCallback()
+CHIPAudioOutputGeneratedCommandListAttributeCallback::~CHIPAudioOutputGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22782,8 +22775,8 @@ CHIPTestClusterNullableOctetStringAttributeCallback::~CHIPTestClusterNullableOct
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableOctetStringAttributeCallback::CallbackFn(void * context,
-                                                                     const chip::app::DataModel::Nullable<chip::ByteSpan> & value)
+void CHIPAudioOutputGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22791,8 +22784,9 @@ void CHIPTestClusterNullableOctetStringAttributeCallback::CallbackFn(void * cont
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableOctetStringAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableOctetStringAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPAudioOutputGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPAudioOutputGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22800,28 +22794,31 @@ void CHIPTestClusterNullableOctetStringAttributeCallback::CallbackFn(void * cont
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        jbyteArray javaValueByteArray = env->NewByteArray(static_cast<jsize>(value.Value().size()));
-        env->SetByteArrayRegion(javaValueByteArray, 0, static_cast<jsize>(value.Value().size()),
-                                reinterpret_cast<const jbyte *>(value.Value().data()));
-        javaValue = javaValueByteArray;
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableCharStringAttributeCallback::CHIPTestClusterNullableCharStringAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableCharStringAttributeCallbackType>(CallbackFn, this),
+CHIPAudioOutputAcceptedCommandListAttributeCallback::CHIPAudioOutputAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPAudioOutputClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -22838,7 +22835,7 @@ CHIPTestClusterNullableCharStringAttributeCallback::CHIPTestClusterNullableCharS
     }
 }
 
-CHIPTestClusterNullableCharStringAttributeCallback::~CHIPTestClusterNullableCharStringAttributeCallback()
+CHIPAudioOutputAcceptedCommandListAttributeCallback::~CHIPAudioOutputAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22849,8 +22846,8 @@ CHIPTestClusterNullableCharStringAttributeCallback::~CHIPTestClusterNullableChar
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableCharStringAttributeCallback::CallbackFn(void * context,
-                                                                    const chip::app::DataModel::Nullable<chip::CharSpan> & value)
+void CHIPAudioOutputAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22858,8 +22855,9 @@ void CHIPTestClusterNullableCharStringAttributeCallback::CallbackFn(void * conte
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableCharStringAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableCharStringAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPAudioOutputAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPAudioOutputAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22867,26 +22865,30 @@ void CHIPTestClusterNullableCharStringAttributeCallback::CallbackFn(void * conte
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/String;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        javaValue = env->NewStringUTF(std::string(value.Value().data(), value.Value().size()).c_str());
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableEnumAttrAttributeCallback::CHIPTestClusterNullableEnumAttrAttributeCallback(jobject javaCallback,
-                                                                                                   bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableEnumAttrAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPAudioOutputAttributeListAttributeCallback::CHIPAudioOutputAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPAudioOutputClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22902,7 +22904,7 @@ CHIPTestClusterNullableEnumAttrAttributeCallback::CHIPTestClusterNullableEnumAtt
     }
 }
 
-CHIPTestClusterNullableEnumAttrAttributeCallback::~CHIPTestClusterNullableEnumAttrAttributeCallback()
+CHIPAudioOutputAttributeListAttributeCallback::~CHIPAudioOutputAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22913,8 +22915,8 @@ CHIPTestClusterNullableEnumAttrAttributeCallback::~CHIPTestClusterNullableEnumAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableEnumAttrAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> & value)
+void CHIPAudioOutputAttributeListAttributeCallback::CallbackFn(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22922,8 +22924,9 @@ void CHIPTestClusterNullableEnumAttrAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableEnumAttrAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableEnumAttrAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPAudioOutputAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPAudioOutputAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22931,28 +22934,31 @@ void CHIPTestClusterNullableEnumAttrAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      static_cast<uint8_t>(value.Value()), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback::CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableRangeRestrictedInt8uAttributeCallbackType>(CallbackFn, this),
+CHIPApplicationLauncherCatalogListAttributeCallback::CHIPApplicationLauncherCatalogListAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPApplicationLauncherClusterCatalogListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -22969,7 +22975,7 @@ CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback::CHIPTestClusterNul
     }
 }
 
-CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback::~CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback()
+CHIPApplicationLauncherCatalogListAttributeCallback::~CHIPApplicationLauncherCatalogListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22980,8 +22986,8 @@ CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback::~CHIPTestClusterNu
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback::CallbackFn(void * context,
-                                                                              const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPApplicationLauncherCatalogListAttributeCallback::CallbackFn(void * context,
+                                                                     const chip::app::DataModel::DecodableList<uint16_t> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22989,8 +22995,9 @@ void CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback::CallbackFn(vo
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPApplicationLauncherCatalogListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPApplicationLauncherCatalogListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -22998,28 +23005,31 @@ void CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback::CallbackFn(vo
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Integer";
+        std::string newElement_0CtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback::CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback(
+CHIPApplicationLauncherGeneratedCommandListAttributeCallback::CHIPApplicationLauncherGeneratedCommandListAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableRangeRestrictedInt8sAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPApplicationLauncherClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -23036,7 +23046,7 @@ CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback::CHIPTestClusterNul
     }
 }
 
-CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback::~CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback()
+CHIPApplicationLauncherGeneratedCommandListAttributeCallback::~CHIPApplicationLauncherGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23047,8 +23057,8 @@ CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback::~CHIPTestClusterNu
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback::CallbackFn(void * context,
-                                                                              const chip::app::DataModel::Nullable<int8_t> & value)
+void CHIPApplicationLauncherGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23056,8 +23066,9 @@ void CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback::CallbackFn(vo
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPApplicationLauncherGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPApplicationLauncherGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23065,28 +23076,31 @@ void CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback::CallbackFn(vo
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                     value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback::CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback(
+CHIPApplicationLauncherAcceptedCommandListAttributeCallback::CHIPApplicationLauncherAcceptedCommandListAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableRangeRestrictedInt16uAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPApplicationLauncherClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -23103,7 +23117,7 @@ CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback::CHIPTestClusterNu
     }
 }
 
-CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback::~CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback()
+CHIPApplicationLauncherAcceptedCommandListAttributeCallback::~CHIPApplicationLauncherAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23114,8 +23128,8 @@ CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback::~CHIPTestClusterN
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPApplicationLauncherAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23123,8 +23137,9 @@ void CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPApplicationLauncherAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPApplicationLauncherAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23132,28 +23147,31 @@ void CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback::CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterNullableRangeRestrictedInt16sAttributeCallbackType>(CallbackFn, this),
+CHIPApplicationLauncherAttributeListAttributeCallback::CHIPApplicationLauncherAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                             bool keepAlive) :
+    chip::Callback::Callback<CHIPApplicationLauncherClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -23170,7 +23188,7 @@ CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback::CHIPTestClusterNu
     }
 }
 
-CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback::~CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback()
+CHIPApplicationLauncherAttributeListAttributeCallback::~CHIPApplicationLauncherAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23181,8 +23199,8 @@ CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback::~CHIPTestClusterN
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<int16_t> & value)
+void CHIPApplicationLauncherAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23190,8 +23208,9 @@ void CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPApplicationLauncherAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPApplicationLauncherAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23199,28 +23218,31 @@ void CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterGeneratedCommandListAttributeCallback::CHIPTestClusterGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPApplicationBasicAllowedVendorListAttributeCallback::CHIPApplicationBasicAllowedVendorListAttributeCallback(jobject javaCallback,
+                                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPApplicationBasicClusterAllowedVendorListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -23237,7 +23259,7 @@ CHIPTestClusterGeneratedCommandListAttributeCallback::CHIPTestClusterGeneratedCo
     }
 }
 
-CHIPTestClusterGeneratedCommandListAttributeCallback::~CHIPTestClusterGeneratedCommandListAttributeCallback()
+CHIPApplicationBasicAllowedVendorListAttributeCallback::~CHIPApplicationBasicAllowedVendorListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23248,8 +23270,8 @@ CHIPTestClusterGeneratedCommandListAttributeCallback::~CHIPTestClusterGeneratedC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPApplicationBasicAllowedVendorListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::VendorId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23258,8 +23280,8 @@ void CHIPTestClusterGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPTestClusterGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPApplicationBasicAllowedVendorListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPApplicationBasicAllowedVendorListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23278,10 +23300,10 @@ void CHIPTestClusterGeneratedCommandListAttributeCallback::CallbackFn(
     {
         auto & entry_0 = iter_arrayListObj_0.GetValue();
         jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        std::string newElement_0ClassName     = "java/lang/Integer";
+        std::string newElement_0CtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), static_cast<uint16_t>(entry_0), newElement_0);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -23289,9 +23311,9 @@ void CHIPTestClusterGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterAcceptedCommandListAttributeCallback::CHIPTestClusterAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                         bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPApplicationBasicGeneratedCommandListAttributeCallback::CHIPApplicationBasicGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPApplicationBasicClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -23308,7 +23330,7 @@ CHIPTestClusterAcceptedCommandListAttributeCallback::CHIPTestClusterAcceptedComm
     }
 }
 
-CHIPTestClusterAcceptedCommandListAttributeCallback::~CHIPTestClusterAcceptedCommandListAttributeCallback()
+CHIPApplicationBasicGeneratedCommandListAttributeCallback::~CHIPApplicationBasicGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23319,7 +23341,7 @@ CHIPTestClusterAcceptedCommandListAttributeCallback::~CHIPTestClusterAcceptedCom
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPApplicationBasicGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -23329,8 +23351,8 @@ void CHIPTestClusterAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPTestClusterAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPApplicationBasicGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPApplicationBasicGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23360,8 +23382,10 @@ void CHIPTestClusterAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTestClusterAttributeListAttributeCallback::CHIPTestClusterAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTestClusterClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPApplicationBasicAcceptedCommandListAttributeCallback::CHIPApplicationBasicAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPApplicationBasicClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23377,7 +23401,7 @@ CHIPTestClusterAttributeListAttributeCallback::CHIPTestClusterAttributeListAttri
     }
 }
 
-CHIPTestClusterAttributeListAttributeCallback::~CHIPTestClusterAttributeListAttributeCallback()
+CHIPApplicationBasicAcceptedCommandListAttributeCallback::~CHIPApplicationBasicAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23388,8 +23412,8 @@ CHIPTestClusterAttributeListAttributeCallback::~CHIPTestClusterAttributeListAttr
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTestClusterAttributeListAttributeCallback::CallbackFn(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPApplicationBasicAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23398,8 +23422,8 @@ void CHIPTestClusterAttributeListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPTestClusterAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTestClusterAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPApplicationBasicAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPApplicationBasicAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23429,9 +23453,9 @@ void CHIPTestClusterAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPThermostatLocalTemperatureAttributeCallback::CHIPThermostatLocalTemperatureAttributeCallback(jobject javaCallback,
-                                                                                                 bool keepAlive) :
-    chip::Callback::Callback<CHIPThermostatClusterLocalTemperatureAttributeCallbackType>(CallbackFn, this),
+CHIPApplicationBasicAttributeListAttributeCallback::CHIPApplicationBasicAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPApplicationBasicClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -23448,7 +23472,7 @@ CHIPThermostatLocalTemperatureAttributeCallback::CHIPThermostatLocalTemperatureA
     }
 }
 
-CHIPThermostatLocalTemperatureAttributeCallback::~CHIPThermostatLocalTemperatureAttributeCallback()
+CHIPApplicationBasicAttributeListAttributeCallback::~CHIPApplicationBasicAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23459,8 +23483,8 @@ CHIPThermostatLocalTemperatureAttributeCallback::~CHIPThermostatLocalTemperature
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPThermostatLocalTemperatureAttributeCallback::CallbackFn(void * context,
-                                                                 const chip::app::DataModel::Nullable<int16_t> & value)
+void CHIPApplicationBasicAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23468,8 +23492,9 @@ void CHIPThermostatLocalTemperatureAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPThermostatLocalTemperatureAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThermostatLocalTemperatureAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPApplicationBasicAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPApplicationBasicAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23477,27 +23502,32 @@ void CHIPThermostatLocalTemperatureAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPThermostatAttributeListAttributeCallback::CHIPThermostatAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPThermostatClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPAccountLoginGeneratedCommandListAttributeCallback::CHIPAccountLoginGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                             bool keepAlive) :
+    chip::Callback::Callback<CHIPAccountLoginClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23513,7 +23543,7 @@ CHIPThermostatAttributeListAttributeCallback::CHIPThermostatAttributeListAttribu
     }
 }
 
-CHIPThermostatAttributeListAttributeCallback::~CHIPThermostatAttributeListAttributeCallback()
+CHIPAccountLoginGeneratedCommandListAttributeCallback::~CHIPAccountLoginGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23524,8 +23554,8 @@ CHIPThermostatAttributeListAttributeCallback::~CHIPThermostatAttributeListAttrib
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPThermostatAttributeListAttributeCallback::CallbackFn(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPAccountLoginGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23534,8 +23564,8 @@ void CHIPThermostatAttributeListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPThermostatAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThermostatAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPAccountLoginGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPAccountLoginGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23565,10 +23595,9 @@ void CHIPThermostatAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback::
-    CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPThermostatUserInterfaceConfigurationClusterGeneratedCommandListAttributeCallbackType>(CallbackFn,
-                                                                                                                       this),
+CHIPAccountLoginAcceptedCommandListAttributeCallback::CHIPAccountLoginAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPAccountLoginClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -23585,8 +23614,7 @@ CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback::
-    ~CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback()
+CHIPAccountLoginAcceptedCommandListAttributeCallback::~CHIPAccountLoginAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23597,7 +23625,7 @@ CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPAccountLoginAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -23607,9 +23635,8 @@ void CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallba
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)>
-        cppCallback(reinterpret_cast<CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback *>(context),
-                    maybeDestroy);
+    std::unique_ptr<CHIPAccountLoginAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPAccountLoginAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23639,10 +23666,9 @@ void CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallba
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback::
-    CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPThermostatUserInterfaceConfigurationClusterAcceptedCommandListAttributeCallbackType>(CallbackFn,
-                                                                                                                      this),
+CHIPAccountLoginAttributeListAttributeCallback::CHIPAccountLoginAttributeListAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPAccountLoginClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -23659,8 +23685,7 @@ CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback::
     }
 }
 
-CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback::
-    ~CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback()
+CHIPAccountLoginAttributeListAttributeCallback::~CHIPAccountLoginAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23671,8 +23696,8 @@ CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPAccountLoginAttributeListAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23681,9 +23706,8 @@ void CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallbac
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)>
-        cppCallback(reinterpret_cast<CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback *>(context),
-                    maybeDestroy);
+    std::unique_ptr<CHIPAccountLoginAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPAccountLoginAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23713,9 +23737,9 @@ void CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallbac
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback::
-    CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPThermostatUserInterfaceConfigurationClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPElectricalMeasurementGeneratedCommandListAttributeCallback::CHIPElectricalMeasurementGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPElectricalMeasurementClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -23732,8 +23756,7 @@ CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback::
     }
 }
 
-CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback::
-    ~CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback()
+CHIPElectricalMeasurementGeneratedCommandListAttributeCallback::~CHIPElectricalMeasurementGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23744,8 +23767,8 @@ CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPElectricalMeasurementGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23754,8 +23777,8 @@ void CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback::Cal
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPElectricalMeasurementGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPElectricalMeasurementGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23785,9 +23808,9 @@ void CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback::Cal
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPThreadNetworkDiagnosticsChannelAttributeCallback::CHIPThreadNetworkDiagnosticsChannelAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterChannelAttributeCallbackType>(CallbackFn, this),
+CHIPElectricalMeasurementAcceptedCommandListAttributeCallback::CHIPElectricalMeasurementAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPElectricalMeasurementClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -23804,7 +23827,7 @@ CHIPThreadNetworkDiagnosticsChannelAttributeCallback::CHIPThreadNetworkDiagnosti
     }
 }
 
-CHIPThreadNetworkDiagnosticsChannelAttributeCallback::~CHIPThreadNetworkDiagnosticsChannelAttributeCallback()
+CHIPElectricalMeasurementAcceptedCommandListAttributeCallback::~CHIPElectricalMeasurementAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23815,8 +23838,8 @@ CHIPThreadNetworkDiagnosticsChannelAttributeCallback::~CHIPThreadNetworkDiagnost
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPThreadNetworkDiagnosticsChannelAttributeCallback::CallbackFn(void * context,
-                                                                      const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPElectricalMeasurementAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23824,8 +23847,9 @@ void CHIPThreadNetworkDiagnosticsChannelAttributeCallback::CallbackFn(void * con
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsChannelAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThreadNetworkDiagnosticsChannelAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPElectricalMeasurementAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPElectricalMeasurementAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23833,28 +23857,31 @@ void CHIPThreadNetworkDiagnosticsChannelAttributeCallback::CallbackFn(void * con
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback::CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback(
+CHIPElectricalMeasurementAttributeListAttributeCallback::CHIPElectricalMeasurementAttributeListAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPElectricalMeasurementClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -23871,7 +23898,7 @@ CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback::CHIPThreadNetworkDiagn
     }
 }
 
-CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback::~CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback()
+CHIPElectricalMeasurementAttributeListAttributeCallback::~CHIPElectricalMeasurementAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23882,8 +23909,8 @@ CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback::~CHIPThreadNetworkDiag
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole> & value)
+void CHIPElectricalMeasurementAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23891,8 +23918,9 @@ void CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPElectricalMeasurementAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPElectricalMeasurementAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23900,29 +23928,30 @@ void CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      static_cast<uint8_t>(value.Value()), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Long";
+        std::string newElement_0CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback::CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterNetworkNameAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPTestClusterListInt8uAttributeCallback::CHIPTestClusterListInt8uAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterListInt8uAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23938,7 +23967,7 @@ CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback::CHIPThreadNetworkDiagn
     }
 }
 
-CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback::~CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback()
+CHIPTestClusterListInt8uAttributeCallback::~CHIPTestClusterListInt8uAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23949,8 +23978,8 @@ CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback::~CHIPThreadNetworkDiag
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::CharSpan> & value)
+void CHIPTestClusterListInt8uAttributeCallback::CallbackFn(void * context,
+                                                           const chip::app::DataModel::DecodableList<uint8_t> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23958,8 +23987,9 @@ void CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPTestClusterListInt8uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterListInt8uAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -23967,25 +23997,31 @@ void CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/String;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        javaValue = env->NewStringUTF(std::string(value.Value().data(), value.Value().size()).c_str());
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        std::string newElement_0ClassName     = "java/lang/Integer";
+        std::string newElement_0CtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0ClassName.c_str(),
+                                                                      newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPThreadNetworkDiagnosticsPanIdAttributeCallback::CHIPThreadNetworkDiagnosticsPanIdAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterPanIdAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterListOctetStringAttributeCallback::CHIPTestClusterListOctetStringAttributeCallback(jobject javaCallback,
+                                                                                                 bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterListOctetStringAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -24002,7 +24038,7 @@ CHIPThreadNetworkDiagnosticsPanIdAttributeCallback::CHIPThreadNetworkDiagnostics
     }
 }
 
-CHIPThreadNetworkDiagnosticsPanIdAttributeCallback::~CHIPThreadNetworkDiagnosticsPanIdAttributeCallback()
+CHIPTestClusterListOctetStringAttributeCallback::~CHIPTestClusterListOctetStringAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24013,8 +24049,8 @@ CHIPThreadNetworkDiagnosticsPanIdAttributeCallback::~CHIPThreadNetworkDiagnostic
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPThreadNetworkDiagnosticsPanIdAttributeCallback::CallbackFn(void * context,
-                                                                    const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPTestClusterListOctetStringAttributeCallback::CallbackFn(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::ByteSpan> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24022,8 +24058,9 @@ void CHIPThreadNetworkDiagnosticsPanIdAttributeCallback::CallbackFn(void * conte
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsPanIdAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThreadNetworkDiagnosticsPanIdAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPTestClusterListOctetStringAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterListOctetStringAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -24031,28 +24068,31 @@ void CHIPThreadNetworkDiagnosticsPanIdAttributeCallback::CallbackFn(void * conte
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        jbyteArray newElement_0ByteArray = env->NewByteArray(static_cast<jsize>(entry_0.size()));
+        env->SetByteArrayRegion(newElement_0ByteArray, 0, static_cast<jsize>(entry_0.size()),
+                                reinterpret_cast<const jbyte *>(entry_0.data()));
+        newElement_0 = newElement_0ByteArray;
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback::CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterExtendedPanIdAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterListStructOctetStringAttributeCallback::CHIPTestClusterListStructOctetStringAttributeCallback(jobject javaCallback,
+                                                                                                             bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterListStructOctetStringAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -24069,7 +24109,7 @@ CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback::CHIPThreadNetworkDia
     }
 }
 
-CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback::~CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback()
+CHIPTestClusterListStructOctetStringAttributeCallback::~CHIPTestClusterListStructOctetStringAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24080,17 +24120,19 @@ CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback::~CHIPThreadNetworkDi
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback::CallbackFn(void * context,
-                                                                            const chip::app::DataModel::Nullable<uint64_t> & value)
+void CHIPTestClusterListStructOctetStringAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     jobject javaCallbackRef;
 
-    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback *>(context), maybeDestroy);
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    std::unique_ptr<CHIPTestClusterListStructOctetStringAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterListStructOctetStringAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -24098,29 +24140,56 @@ void CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback::CallbackFn(void
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        jobject newElement_0_member1;
+        std::string newElement_0_member1ClassName     = "java/lang/Long";
+        std::string newElement_0_member1CtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_member1ClassName.c_str(),
+                                                                       newElement_0_member1CtorSignature.c_str(), entry_0.member1,
+                                                                       newElement_0_member1);
+        jobject newElement_0_member2;
+        jbyteArray newElement_0_member2ByteArray = env->NewByteArray(static_cast<jsize>(entry_0.member2.size()));
+        env->SetByteArrayRegion(newElement_0_member2ByteArray, 0, static_cast<jsize>(entry_0.member2.size()),
+                                reinterpret_cast<const jbyte *>(entry_0.member2.data()));
+        newElement_0_member2 = newElement_0_member2ByteArray;
+
+        jclass testListStructOctetStructClass;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$TestClusterClusterTestListStructOctet", testListStructOctetStructClass);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterTestListStructOctet");
+            return;
+        }
+        jmethodID testListStructOctetStructCtor =
+            env->GetMethodID(testListStructOctetStructClass, "<init>", "(Ljava/lang/Long;[B)V");
+        if (testListStructOctetStructCtor == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterTestListStructOctet constructor");
+            return;
+        }
+
+        newElement_0 = env->NewObject(testListStructOctetStructClass, testListStructOctetStructCtor, newElement_0_member1,
+                                      newElement_0_member2);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback::CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterMeshLocalPrefixAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPTestClusterVendorIdAttributeCallback::CHIPTestClusterVendorIdAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterVendorIdAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24136,7 +24205,7 @@ CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback::CHIPThreadNetworkD
     }
 }
 
-CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback::~CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback()
+CHIPTestClusterVendorIdAttributeCallback::~CHIPTestClusterVendorIdAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24147,8 +24216,7 @@ CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback::~CHIPThreadNetwork
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::ByteSpan> & value)
+void CHIPTestClusterVendorIdAttributeCallback::CallbackFn(void * context, chip::VendorId value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24156,8 +24224,8 @@ void CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterVendorIdAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterVendorIdAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -24165,28 +24233,21 @@ void CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
-    {
-        jbyteArray javaValueByteArray = env->NewByteArray(static_cast<jsize>(value.Value().size()));
-        env->SetByteArrayRegion(javaValueByteArray, 0, static_cast<jsize>(value.Value().size()),
-                                reinterpret_cast<const jbyte *>(value.Value().data()));
-        javaValue = javaValueByteArray;
-    }
+    std::string javaValueClassName     = "java/lang/Integer";
+    std::string javaValueCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   static_cast<uint16_t>(value), javaValue);
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback::CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback(
+CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback::CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterNeighborTableListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPTestClusterClusterListNullablesAndOptionalsStructAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -24203,7 +24264,7 @@ CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback::CHIPThreadNetwor
     }
 }
 
-CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback::~CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback()
+CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback::~CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24214,10 +24275,10 @@ CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback::~CHIPThreadNetwo
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback::CallbackFn(
+void CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback::CallbackFn(
     void * context,
     const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & list)
+        chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::DecodableType> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24226,293 +24287,489 @@ void CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback *>(context), maybeDestroy);
+
+    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+    javaCallbackRef = cppCallback.get()->javaCallbackRef;
+    VerifyOrReturn(javaCallbackRef != nullptr,
+                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+    jmethodID javaMethod;
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
+    {
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        jobject newElement_0_nullableInt;
+        if (entry_0.nullableInt.IsNull())
+        {
+            newElement_0_nullableInt = nullptr;
+        }
+        else
+        {
+            std::string newElement_0_nullableIntClassName     = "java/lang/Integer";
+            std::string newElement_0_nullableIntCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_nullableIntClassName.c_str(),
+                                                                           newElement_0_nullableIntCtorSignature.c_str(),
+                                                                           entry_0.nullableInt.Value(), newElement_0_nullableInt);
+        }
+        jobject newElement_0_optionalInt;
+        if (!entry_0.optionalInt.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_optionalInt);
+        }
+        else
+        {
+            jobject newElement_0_optionalIntInsideOptional;
+            std::string newElement_0_optionalIntInsideOptionalClassName     = "java/lang/Integer";
+            std::string newElement_0_optionalIntInsideOptionalCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+                newElement_0_optionalIntInsideOptionalClassName.c_str(),
+                newElement_0_optionalIntInsideOptionalCtorSignature.c_str(), entry_0.optionalInt.Value(),
+                newElement_0_optionalIntInsideOptional);
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_optionalIntInsideOptional, newElement_0_optionalInt);
+        }
+        jobject newElement_0_nullableOptionalInt;
+        if (!entry_0.nullableOptionalInt.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_nullableOptionalInt);
+        }
+        else
+        {
+            jobject newElement_0_nullableOptionalIntInsideOptional;
+            if (entry_0.nullableOptionalInt.Value().IsNull())
+            {
+                newElement_0_nullableOptionalIntInsideOptional = nullptr;
+            }
+            else
+            {
+                std::string newElement_0_nullableOptionalIntInsideOptionalClassName     = "java/lang/Integer";
+                std::string newElement_0_nullableOptionalIntInsideOptionalCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+                    newElement_0_nullableOptionalIntInsideOptionalClassName.c_str(),
+                    newElement_0_nullableOptionalIntInsideOptionalCtorSignature.c_str(),
+                    entry_0.nullableOptionalInt.Value().Value(), newElement_0_nullableOptionalIntInsideOptional);
+            }
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_nullableOptionalIntInsideOptional,
+                                                              newElement_0_nullableOptionalInt);
+        }
+        jobject newElement_0_nullableString;
+        if (entry_0.nullableString.IsNull())
+        {
+            newElement_0_nullableString = nullptr;
+        }
+        else
+        {
+            newElement_0_nullableString = env->NewStringUTF(
+                std::string(entry_0.nullableString.Value().data(), entry_0.nullableString.Value().size()).c_str());
+        }
+        jobject newElement_0_optionalString;
+        if (!entry_0.optionalString.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_optionalString);
+        }
+        else
+        {
+            jobject newElement_0_optionalStringInsideOptional;
+            newElement_0_optionalStringInsideOptional = env->NewStringUTF(
+                std::string(entry_0.optionalString.Value().data(), entry_0.optionalString.Value().size()).c_str());
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_optionalStringInsideOptional,
+                                                              newElement_0_optionalString);
+        }
+        jobject newElement_0_nullableOptionalString;
+        if (!entry_0.nullableOptionalString.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_nullableOptionalString);
+        }
+        else
+        {
+            jobject newElement_0_nullableOptionalStringInsideOptional;
+            if (entry_0.nullableOptionalString.Value().IsNull())
+            {
+                newElement_0_nullableOptionalStringInsideOptional = nullptr;
+            }
+            else
+            {
+                newElement_0_nullableOptionalStringInsideOptional =
+                    env->NewStringUTF(std::string(entry_0.nullableOptionalString.Value().Value().data(),
+                                                  entry_0.nullableOptionalString.Value().Value().size())
+                                          .c_str());
+            }
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_nullableOptionalStringInsideOptional,
+                                                              newElement_0_nullableOptionalString);
+        }
+        jobject newElement_0_nullableStruct;
+        if (entry_0.nullableStruct.IsNull())
+        {
+            newElement_0_nullableStruct = nullptr;
+        }
+        else
+        {
+            jobject newElement_0_nullableStruct_a;
+            std::string newElement_0_nullableStruct_aClassName     = "java/lang/Integer";
+            std::string newElement_0_nullableStruct_aCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                newElement_0_nullableStruct_aClassName.c_str(), newElement_0_nullableStruct_aCtorSignature.c_str(),
+                entry_0.nullableStruct.Value().a, newElement_0_nullableStruct_a);
+            jobject newElement_0_nullableStruct_b;
+            std::string newElement_0_nullableStruct_bClassName     = "java/lang/Boolean";
+            std::string newElement_0_nullableStruct_bCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
+                newElement_0_nullableStruct_bClassName.c_str(), newElement_0_nullableStruct_bCtorSignature.c_str(),
+                entry_0.nullableStruct.Value().b, newElement_0_nullableStruct_b);
+            jobject newElement_0_nullableStruct_c;
+            std::string newElement_0_nullableStruct_cClassName     = "java/lang/Integer";
+            std::string newElement_0_nullableStruct_cCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                newElement_0_nullableStruct_cClassName.c_str(), newElement_0_nullableStruct_cCtorSignature.c_str(),
+                static_cast<uint8_t>(entry_0.nullableStruct.Value().c), newElement_0_nullableStruct_c);
+            jobject newElement_0_nullableStruct_d;
+            jbyteArray newElement_0_nullableStruct_dByteArray =
+                env->NewByteArray(static_cast<jsize>(entry_0.nullableStruct.Value().d.size()));
+            env->SetByteArrayRegion(newElement_0_nullableStruct_dByteArray, 0,
+                                    static_cast<jsize>(entry_0.nullableStruct.Value().d.size()),
+                                    reinterpret_cast<const jbyte *>(entry_0.nullableStruct.Value().d.data()));
+            newElement_0_nullableStruct_d = newElement_0_nullableStruct_dByteArray;
+            jobject newElement_0_nullableStruct_e;
+            newElement_0_nullableStruct_e = env->NewStringUTF(
+                std::string(entry_0.nullableStruct.Value().e.data(), entry_0.nullableStruct.Value().e.size()).c_str());
+            jobject newElement_0_nullableStruct_f;
+            std::string newElement_0_nullableStruct_fClassName     = "java/lang/Integer";
+            std::string newElement_0_nullableStruct_fCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                newElement_0_nullableStruct_fClassName.c_str(), newElement_0_nullableStruct_fCtorSignature.c_str(),
+                entry_0.nullableStruct.Value().f.Raw(), newElement_0_nullableStruct_f);
+            jobject newElement_0_nullableStruct_g;
+            std::string newElement_0_nullableStruct_gClassName     = "java/lang/Float";
+            std::string newElement_0_nullableStruct_gCtorSignature = "(F)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<float>(
+                newElement_0_nullableStruct_gClassName.c_str(), newElement_0_nullableStruct_gCtorSignature.c_str(),
+                entry_0.nullableStruct.Value().g, newElement_0_nullableStruct_g);
+            jobject newElement_0_nullableStruct_h;
+            std::string newElement_0_nullableStruct_hClassName     = "java/lang/Double";
+            std::string newElement_0_nullableStruct_hCtorSignature = "(D)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<double>(
+                newElement_0_nullableStruct_hClassName.c_str(), newElement_0_nullableStruct_hCtorSignature.c_str(),
+                entry_0.nullableStruct.Value().h, newElement_0_nullableStruct_h);
+
+            jclass simpleStructStructClass;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct", simpleStructStructClass);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterSimpleStruct");
+                return;
+            }
+            jmethodID simpleStructStructCtor =
+                env->GetMethodID(simpleStructStructClass, "<init>",
+                                 "(Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;[BLjava/lang/String;Ljava/lang/"
+                                 "Integer;Ljava/lang/Float;Ljava/lang/Double;)V");
+            if (simpleStructStructCtor == nullptr)
+            {
+                ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterSimpleStruct constructor");
+                return;
+            }
 
-    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-    javaCallbackRef = cppCallback.get()->javaCallbackRef;
-    VerifyOrReturn(javaCallbackRef != nullptr,
-                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+            newElement_0_nullableStruct = env->NewObject(
+                simpleStructStructClass, simpleStructStructCtor, newElement_0_nullableStruct_a, newElement_0_nullableStruct_b,
+                newElement_0_nullableStruct_c, newElement_0_nullableStruct_d, newElement_0_nullableStruct_e,
+                newElement_0_nullableStruct_f, newElement_0_nullableStruct_g, newElement_0_nullableStruct_h);
+        }
+        jobject newElement_0_optionalStruct;
+        if (!entry_0.optionalStruct.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_optionalStruct);
+        }
+        else
+        {
+            jobject newElement_0_optionalStructInsideOptional;
+            jobject newElement_0_optionalStructInsideOptional_a;
+            std::string newElement_0_optionalStructInsideOptional_aClassName     = "java/lang/Integer";
+            std::string newElement_0_optionalStructInsideOptional_aCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                newElement_0_optionalStructInsideOptional_aClassName.c_str(),
+                newElement_0_optionalStructInsideOptional_aCtorSignature.c_str(), entry_0.optionalStruct.Value().a,
+                newElement_0_optionalStructInsideOptional_a);
+            jobject newElement_0_optionalStructInsideOptional_b;
+            std::string newElement_0_optionalStructInsideOptional_bClassName     = "java/lang/Boolean";
+            std::string newElement_0_optionalStructInsideOptional_bCtorSignature = "(Z)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
+                newElement_0_optionalStructInsideOptional_bClassName.c_str(),
+                newElement_0_optionalStructInsideOptional_bCtorSignature.c_str(), entry_0.optionalStruct.Value().b,
+                newElement_0_optionalStructInsideOptional_b);
+            jobject newElement_0_optionalStructInsideOptional_c;
+            std::string newElement_0_optionalStructInsideOptional_cClassName     = "java/lang/Integer";
+            std::string newElement_0_optionalStructInsideOptional_cCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                newElement_0_optionalStructInsideOptional_cClassName.c_str(),
+                newElement_0_optionalStructInsideOptional_cCtorSignature.c_str(),
+                static_cast<uint8_t>(entry_0.optionalStruct.Value().c), newElement_0_optionalStructInsideOptional_c);
+            jobject newElement_0_optionalStructInsideOptional_d;
+            jbyteArray newElement_0_optionalStructInsideOptional_dByteArray =
+                env->NewByteArray(static_cast<jsize>(entry_0.optionalStruct.Value().d.size()));
+            env->SetByteArrayRegion(newElement_0_optionalStructInsideOptional_dByteArray, 0,
+                                    static_cast<jsize>(entry_0.optionalStruct.Value().d.size()),
+                                    reinterpret_cast<const jbyte *>(entry_0.optionalStruct.Value().d.data()));
+            newElement_0_optionalStructInsideOptional_d = newElement_0_optionalStructInsideOptional_dByteArray;
+            jobject newElement_0_optionalStructInsideOptional_e;
+            newElement_0_optionalStructInsideOptional_e = env->NewStringUTF(
+                std::string(entry_0.optionalStruct.Value().e.data(), entry_0.optionalStruct.Value().e.size()).c_str());
+            jobject newElement_0_optionalStructInsideOptional_f;
+            std::string newElement_0_optionalStructInsideOptional_fClassName     = "java/lang/Integer";
+            std::string newElement_0_optionalStructInsideOptional_fCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                newElement_0_optionalStructInsideOptional_fClassName.c_str(),
+                newElement_0_optionalStructInsideOptional_fCtorSignature.c_str(), entry_0.optionalStruct.Value().f.Raw(),
+                newElement_0_optionalStructInsideOptional_f);
+            jobject newElement_0_optionalStructInsideOptional_g;
+            std::string newElement_0_optionalStructInsideOptional_gClassName     = "java/lang/Float";
+            std::string newElement_0_optionalStructInsideOptional_gCtorSignature = "(F)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<float>(
+                newElement_0_optionalStructInsideOptional_gClassName.c_str(),
+                newElement_0_optionalStructInsideOptional_gCtorSignature.c_str(), entry_0.optionalStruct.Value().g,
+                newElement_0_optionalStructInsideOptional_g);
+            jobject newElement_0_optionalStructInsideOptional_h;
+            std::string newElement_0_optionalStructInsideOptional_hClassName     = "java/lang/Double";
+            std::string newElement_0_optionalStructInsideOptional_hCtorSignature = "(D)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<double>(
+                newElement_0_optionalStructInsideOptional_hClassName.c_str(),
+                newElement_0_optionalStructInsideOptional_hCtorSignature.c_str(), entry_0.optionalStruct.Value().h,
+                newElement_0_optionalStructInsideOptional_h);
 
-    jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+            jclass simpleStructStructClass;
+            err = chip::JniReferences::GetInstance().GetClassRef(
+                env, "chip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct", simpleStructStructClass);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterSimpleStruct");
+                return;
+            }
+            jmethodID simpleStructStructCtor =
+                env->GetMethodID(simpleStructStructClass, "<init>",
+                                 "(Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;[BLjava/lang/String;Ljava/lang/"
+                                 "Integer;Ljava/lang/Float;Ljava/lang/Double;)V");
+            if (simpleStructStructCtor == nullptr)
+            {
+                ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterSimpleStruct constructor");
+                return;
+            }
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+            newElement_0_optionalStructInsideOptional =
+                env->NewObject(simpleStructStructClass, simpleStructStructCtor, newElement_0_optionalStructInsideOptional_a,
+                               newElement_0_optionalStructInsideOptional_b, newElement_0_optionalStructInsideOptional_c,
+                               newElement_0_optionalStructInsideOptional_d, newElement_0_optionalStructInsideOptional_e,
+                               newElement_0_optionalStructInsideOptional_f, newElement_0_optionalStructInsideOptional_g,
+                               newElement_0_optionalStructInsideOptional_h);
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_optionalStructInsideOptional,
+                                                              newElement_0_optionalStruct);
+        }
+        jobject newElement_0_nullableOptionalStruct;
+        if (!entry_0.nullableOptionalStruct.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_nullableOptionalStruct);
+        }
+        else
+        {
+            jobject newElement_0_nullableOptionalStructInsideOptional;
+            if (entry_0.nullableOptionalStruct.Value().IsNull())
+            {
+                newElement_0_nullableOptionalStructInsideOptional = nullptr;
+            }
+            else
+            {
+                jobject newElement_0_nullableOptionalStructInsideOptional_a;
+                std::string newElement_0_nullableOptionalStructInsideOptional_aClassName     = "java/lang/Integer";
+                std::string newElement_0_nullableOptionalStructInsideOptional_aCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0_nullableOptionalStructInsideOptional_aClassName.c_str(),
+                    newElement_0_nullableOptionalStructInsideOptional_aCtorSignature.c_str(),
+                    entry_0.nullableOptionalStruct.Value().Value().a, newElement_0_nullableOptionalStructInsideOptional_a);
+                jobject newElement_0_nullableOptionalStructInsideOptional_b;
+                std::string newElement_0_nullableOptionalStructInsideOptional_bClassName     = "java/lang/Boolean";
+                std::string newElement_0_nullableOptionalStructInsideOptional_bCtorSignature = "(Z)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
+                    newElement_0_nullableOptionalStructInsideOptional_bClassName.c_str(),
+                    newElement_0_nullableOptionalStructInsideOptional_bCtorSignature.c_str(),
+                    entry_0.nullableOptionalStruct.Value().Value().b, newElement_0_nullableOptionalStructInsideOptional_b);
+                jobject newElement_0_nullableOptionalStructInsideOptional_c;
+                std::string newElement_0_nullableOptionalStructInsideOptional_cClassName     = "java/lang/Integer";
+                std::string newElement_0_nullableOptionalStructInsideOptional_cCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0_nullableOptionalStructInsideOptional_cClassName.c_str(),
+                    newElement_0_nullableOptionalStructInsideOptional_cCtorSignature.c_str(),
+                    static_cast<uint8_t>(entry_0.nullableOptionalStruct.Value().Value().c),
+                    newElement_0_nullableOptionalStructInsideOptional_c);
+                jobject newElement_0_nullableOptionalStructInsideOptional_d;
+                jbyteArray newElement_0_nullableOptionalStructInsideOptional_dByteArray =
+                    env->NewByteArray(static_cast<jsize>(entry_0.nullableOptionalStruct.Value().Value().d.size()));
+                env->SetByteArrayRegion(newElement_0_nullableOptionalStructInsideOptional_dByteArray, 0,
+                                        static_cast<jsize>(entry_0.nullableOptionalStruct.Value().Value().d.size()),
+                                        reinterpret_cast<const jbyte *>(entry_0.nullableOptionalStruct.Value().Value().d.data()));
+                newElement_0_nullableOptionalStructInsideOptional_d = newElement_0_nullableOptionalStructInsideOptional_dByteArray;
+                jobject newElement_0_nullableOptionalStructInsideOptional_e;
+                newElement_0_nullableOptionalStructInsideOptional_e =
+                    env->NewStringUTF(std::string(entry_0.nullableOptionalStruct.Value().Value().e.data(),
+                                                  entry_0.nullableOptionalStruct.Value().Value().e.size())
+                                          .c_str());
+                jobject newElement_0_nullableOptionalStructInsideOptional_f;
+                std::string newElement_0_nullableOptionalStructInsideOptional_fClassName     = "java/lang/Integer";
+                std::string newElement_0_nullableOptionalStructInsideOptional_fCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0_nullableOptionalStructInsideOptional_fClassName.c_str(),
+                    newElement_0_nullableOptionalStructInsideOptional_fCtorSignature.c_str(),
+                    entry_0.nullableOptionalStruct.Value().Value().f.Raw(), newElement_0_nullableOptionalStructInsideOptional_f);
+                jobject newElement_0_nullableOptionalStructInsideOptional_g;
+                std::string newElement_0_nullableOptionalStructInsideOptional_gClassName     = "java/lang/Float";
+                std::string newElement_0_nullableOptionalStructInsideOptional_gCtorSignature = "(F)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<float>(
+                    newElement_0_nullableOptionalStructInsideOptional_gClassName.c_str(),
+                    newElement_0_nullableOptionalStructInsideOptional_gCtorSignature.c_str(),
+                    entry_0.nullableOptionalStruct.Value().Value().g, newElement_0_nullableOptionalStructInsideOptional_g);
+                jobject newElement_0_nullableOptionalStructInsideOptional_h;
+                std::string newElement_0_nullableOptionalStructInsideOptional_hClassName     = "java/lang/Double";
+                std::string newElement_0_nullableOptionalStructInsideOptional_hCtorSignature = "(D)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<double>(
+                    newElement_0_nullableOptionalStructInsideOptional_hClassName.c_str(),
+                    newElement_0_nullableOptionalStructInsideOptional_hCtorSignature.c_str(),
+                    entry_0.nullableOptionalStruct.Value().Value().h, newElement_0_nullableOptionalStructInsideOptional_h);
 
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
-    {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        jobject newElement_0_extAddress;
-        std::string newElement_0_extAddressClassName     = "java/lang/Long";
-        std::string newElement_0_extAddressCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_extAddressClassName.c_str(),
-                                                                       newElement_0_extAddressCtorSignature.c_str(),
-                                                                       entry_0.extAddress, newElement_0_extAddress);
-        jobject newElement_0_age;
-        std::string newElement_0_ageClassName     = "java/lang/Long";
-        std::string newElement_0_ageCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-            newElement_0_ageClassName.c_str(), newElement_0_ageCtorSignature.c_str(), entry_0.age, newElement_0_age);
-        jobject newElement_0_rloc16;
-        std::string newElement_0_rloc16ClassName     = "java/lang/Integer";
-        std::string newElement_0_rloc16CtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-            newElement_0_rloc16ClassName.c_str(), newElement_0_rloc16CtorSignature.c_str(), entry_0.rloc16, newElement_0_rloc16);
-        jobject newElement_0_linkFrameCounter;
-        std::string newElement_0_linkFrameCounterClassName     = "java/lang/Long";
-        std::string newElement_0_linkFrameCounterCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0_linkFrameCounterClassName.c_str(),
-                                                                       newElement_0_linkFrameCounterCtorSignature.c_str(),
-                                                                       entry_0.linkFrameCounter, newElement_0_linkFrameCounter);
-        jobject newElement_0_mleFrameCounter;
-        std::string newElement_0_mleFrameCounterClassName     = "java/lang/Long";
-        std::string newElement_0_mleFrameCounterCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0_mleFrameCounterClassName.c_str(),
-                                                                       newElement_0_mleFrameCounterCtorSignature.c_str(),
-                                                                       entry_0.mleFrameCounter, newElement_0_mleFrameCounter);
-        jobject newElement_0_lqi;
-        std::string newElement_0_lqiClassName     = "java/lang/Integer";
-        std::string newElement_0_lqiCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-            newElement_0_lqiClassName.c_str(), newElement_0_lqiCtorSignature.c_str(), entry_0.lqi, newElement_0_lqi);
-        jobject newElement_0_averageRssi;
-        if (entry_0.averageRssi.IsNull())
+                jclass simpleStructStructClass;
+                err = chip::JniReferences::GetInstance().GetClassRef(
+                    env, "chip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct", simpleStructStructClass);
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterSimpleStruct");
+                    return;
+                }
+                jmethodID simpleStructStructCtor =
+                    env->GetMethodID(simpleStructStructClass, "<init>",
+                                     "(Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;[BLjava/lang/String;Ljava/lang/"
+                                     "Integer;Ljava/lang/Float;Ljava/lang/Double;)V");
+                if (simpleStructStructCtor == nullptr)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterSimpleStruct constructor");
+                    return;
+                }
+
+                newElement_0_nullableOptionalStructInsideOptional = env->NewObject(
+                    simpleStructStructClass, simpleStructStructCtor, newElement_0_nullableOptionalStructInsideOptional_a,
+                    newElement_0_nullableOptionalStructInsideOptional_b, newElement_0_nullableOptionalStructInsideOptional_c,
+                    newElement_0_nullableOptionalStructInsideOptional_d, newElement_0_nullableOptionalStructInsideOptional_e,
+                    newElement_0_nullableOptionalStructInsideOptional_f, newElement_0_nullableOptionalStructInsideOptional_g,
+                    newElement_0_nullableOptionalStructInsideOptional_h);
+            }
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_nullableOptionalStructInsideOptional,
+                                                              newElement_0_nullableOptionalStruct);
+        }
+        jobject newElement_0_nullableList;
+        if (entry_0.nullableList.IsNull())
         {
-            newElement_0_averageRssi = nullptr;
+            newElement_0_nullableList = nullptr;
         }
         else
         {
-            std::string newElement_0_averageRssiClassName     = "java/lang/Integer";
-            std::string newElement_0_averageRssiCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(newElement_0_averageRssiClassName.c_str(),
-                                                                         newElement_0_averageRssiCtorSignature.c_str(),
-                                                                         entry_0.averageRssi.Value(), newElement_0_averageRssi);
+            chip::JniReferences::GetInstance().CreateArrayList(newElement_0_nullableList);
+
+            auto iter_newElement_0_nullableList_3 = entry_0.nullableList.Value().begin();
+            while (iter_newElement_0_nullableList_3.Next())
+            {
+                auto & entry_3 = iter_newElement_0_nullableList_3.GetValue();
+                jobject newElement_3;
+                std::string newElement_3ClassName     = "java/lang/Integer";
+                std::string newElement_3CtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_3ClassName.c_str(), newElement_3CtorSignature.c_str(), static_cast<uint8_t>(entry_3), newElement_3);
+                chip::JniReferences::GetInstance().AddToList(newElement_0_nullableList, newElement_3);
+            }
         }
-        jobject newElement_0_lastRssi;
-        if (entry_0.lastRssi.IsNull())
+        jobject newElement_0_optionalList;
+        if (!entry_0.optionalList.HasValue())
         {
-            newElement_0_lastRssi = nullptr;
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_optionalList);
         }
         else
         {
-            std::string newElement_0_lastRssiClassName     = "java/lang/Integer";
-            std::string newElement_0_lastRssiCtorSignature = "(I)V";
-            chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(newElement_0_lastRssiClassName.c_str(),
-                                                                         newElement_0_lastRssiCtorSignature.c_str(),
-                                                                         entry_0.lastRssi.Value(), newElement_0_lastRssi);
-        }
-        jobject newElement_0_frameErrorRate;
-        std::string newElement_0_frameErrorRateClassName     = "java/lang/Integer";
-        std::string newElement_0_frameErrorRateCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_frameErrorRateClassName.c_str(),
-                                                                      newElement_0_frameErrorRateCtorSignature.c_str(),
-                                                                      entry_0.frameErrorRate, newElement_0_frameErrorRate);
-        jobject newElement_0_messageErrorRate;
-        std::string newElement_0_messageErrorRateClassName     = "java/lang/Integer";
-        std::string newElement_0_messageErrorRateCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_messageErrorRateClassName.c_str(),
-                                                                      newElement_0_messageErrorRateCtorSignature.c_str(),
-                                                                      entry_0.messageErrorRate, newElement_0_messageErrorRate);
-        jobject newElement_0_rxOnWhenIdle;
-        std::string newElement_0_rxOnWhenIdleClassName     = "java/lang/Boolean";
-        std::string newElement_0_rxOnWhenIdleCtorSignature = "(Z)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_rxOnWhenIdleClassName.c_str(),
-                                                                   newElement_0_rxOnWhenIdleCtorSignature.c_str(),
-                                                                   entry_0.rxOnWhenIdle, newElement_0_rxOnWhenIdle);
-        jobject newElement_0_fullThreadDevice;
-        std::string newElement_0_fullThreadDeviceClassName     = "java/lang/Boolean";
-        std::string newElement_0_fullThreadDeviceCtorSignature = "(Z)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_fullThreadDeviceClassName.c_str(),
-                                                                   newElement_0_fullThreadDeviceCtorSignature.c_str(),
-                                                                   entry_0.fullThreadDevice, newElement_0_fullThreadDevice);
-        jobject newElement_0_fullNetworkData;
-        std::string newElement_0_fullNetworkDataClassName     = "java/lang/Boolean";
-        std::string newElement_0_fullNetworkDataCtorSignature = "(Z)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_fullNetworkDataClassName.c_str(),
-                                                                   newElement_0_fullNetworkDataCtorSignature.c_str(),
-                                                                   entry_0.fullNetworkData, newElement_0_fullNetworkData);
-        jobject newElement_0_isChild;
-        std::string newElement_0_isChildClassName     = "java/lang/Boolean";
-        std::string newElement_0_isChildCtorSignature = "(Z)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_isChildClassName.c_str(),
-                                                                   newElement_0_isChildCtorSignature.c_str(), entry_0.isChild,
-                                                                   newElement_0_isChild);
+            jobject newElement_0_optionalListInsideOptional;
+            chip::JniReferences::GetInstance().CreateArrayList(newElement_0_optionalListInsideOptional);
 
-        jclass neighborTableStructClass;
-        err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterNeighborTable", neighborTableStructClass);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterNeighborTable");
-            return;
+            auto iter_newElement_0_optionalListInsideOptional_3 = entry_0.optionalList.Value().begin();
+            while (iter_newElement_0_optionalListInsideOptional_3.Next())
+            {
+                auto & entry_3 = iter_newElement_0_optionalListInsideOptional_3.GetValue();
+                jobject newElement_3;
+                std::string newElement_3ClassName     = "java/lang/Integer";
+                std::string newElement_3CtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_3ClassName.c_str(), newElement_3CtorSignature.c_str(), static_cast<uint8_t>(entry_3), newElement_3);
+                chip::JniReferences::GetInstance().AddToList(newElement_0_optionalListInsideOptional, newElement_3);
+            }
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_optionalListInsideOptional, newElement_0_optionalList);
         }
-        jmethodID neighborTableStructCtor =
-            env->GetMethodID(neighborTableStructClass, "<init>",
-                             "(Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/"
-                             "Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/"
-                             "Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V");
-        if (neighborTableStructCtor == nullptr)
+        jobject newElement_0_nullableOptionalList;
+        if (!entry_0.nullableOptionalList.HasValue())
         {
-            ChipLogError(Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterNeighborTable constructor");
-            return;
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_nullableOptionalList);
         }
+        else
+        {
+            jobject newElement_0_nullableOptionalListInsideOptional;
+            if (entry_0.nullableOptionalList.Value().IsNull())
+            {
+                newElement_0_nullableOptionalListInsideOptional = nullptr;
+            }
+            else
+            {
+                chip::JniReferences::GetInstance().CreateArrayList(newElement_0_nullableOptionalListInsideOptional);
 
-        newElement_0 = env->NewObject(neighborTableStructClass, neighborTableStructCtor, newElement_0_extAddress, newElement_0_age,
-                                      newElement_0_rloc16, newElement_0_linkFrameCounter, newElement_0_mleFrameCounter,
-                                      newElement_0_lqi, newElement_0_averageRssi, newElement_0_lastRssi,
-                                      newElement_0_frameErrorRate, newElement_0_messageErrorRate, newElement_0_rxOnWhenIdle,
-                                      newElement_0_fullThreadDevice, newElement_0_fullNetworkData, newElement_0_isChild);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
-    }
-
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-}
-
-CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback::CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterRouteTableListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-        return;
-    }
-
-    javaCallbackRef = env->NewGlobalRef(javaCallback);
-    if (javaCallbackRef == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-    }
-}
-
-CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback::~CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback()
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not delete global reference for Java callback");
-        return;
-    }
-    env->DeleteGlobalRef(javaCallbackRef);
-}
-
-void CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> &
-        list)
-{
-    chip::DeviceLayer::StackUnlock unlock;
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    jobject javaCallbackRef;
-
-    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback *>(context), maybeDestroy);
-
-    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-    javaCallbackRef = cppCallback.get()->javaCallbackRef;
-    VerifyOrReturn(javaCallbackRef != nullptr,
-                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-    jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
-    {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        jobject newElement_0_extAddress;
-        std::string newElement_0_extAddressClassName     = "java/lang/Long";
-        std::string newElement_0_extAddressCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(newElement_0_extAddressClassName.c_str(),
-                                                                       newElement_0_extAddressCtorSignature.c_str(),
-                                                                       entry_0.extAddress, newElement_0_extAddress);
-        jobject newElement_0_rloc16;
-        std::string newElement_0_rloc16ClassName     = "java/lang/Integer";
-        std::string newElement_0_rloc16CtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-            newElement_0_rloc16ClassName.c_str(), newElement_0_rloc16CtorSignature.c_str(), entry_0.rloc16, newElement_0_rloc16);
-        jobject newElement_0_routerId;
-        std::string newElement_0_routerIdClassName     = "java/lang/Integer";
-        std::string newElement_0_routerIdCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_routerIdClassName.c_str(),
-                                                                      newElement_0_routerIdCtorSignature.c_str(), entry_0.routerId,
-                                                                      newElement_0_routerId);
-        jobject newElement_0_nextHop;
-        std::string newElement_0_nextHopClassName     = "java/lang/Integer";
-        std::string newElement_0_nextHopCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_nextHopClassName.c_str(),
-                                                                      newElement_0_nextHopCtorSignature.c_str(), entry_0.nextHop,
-                                                                      newElement_0_nextHop);
-        jobject newElement_0_pathCost;
-        std::string newElement_0_pathCostClassName     = "java/lang/Integer";
-        std::string newElement_0_pathCostCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_pathCostClassName.c_str(),
-                                                                      newElement_0_pathCostCtorSignature.c_str(), entry_0.pathCost,
-                                                                      newElement_0_pathCost);
-        jobject newElement_0_LQIIn;
-        std::string newElement_0_LQIInClassName     = "java/lang/Integer";
-        std::string newElement_0_LQIInCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-            newElement_0_LQIInClassName.c_str(), newElement_0_LQIInCtorSignature.c_str(), entry_0.LQIIn, newElement_0_LQIIn);
-        jobject newElement_0_LQIOut;
-        std::string newElement_0_LQIOutClassName     = "java/lang/Integer";
-        std::string newElement_0_LQIOutCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-            newElement_0_LQIOutClassName.c_str(), newElement_0_LQIOutCtorSignature.c_str(), entry_0.LQIOut, newElement_0_LQIOut);
-        jobject newElement_0_age;
-        std::string newElement_0_ageClassName     = "java/lang/Integer";
-        std::string newElement_0_ageCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-            newElement_0_ageClassName.c_str(), newElement_0_ageCtorSignature.c_str(), entry_0.age, newElement_0_age);
-        jobject newElement_0_allocated;
-        std::string newElement_0_allocatedClassName     = "java/lang/Boolean";
-        std::string newElement_0_allocatedCtorSignature = "(Z)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_allocatedClassName.c_str(),
-                                                                   newElement_0_allocatedCtorSignature.c_str(), entry_0.allocated,
-                                                                   newElement_0_allocated);
-        jobject newElement_0_linkEstablished;
-        std::string newElement_0_linkEstablishedClassName     = "java/lang/Boolean";
-        std::string newElement_0_linkEstablishedCtorSignature = "(Z)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(newElement_0_linkEstablishedClassName.c_str(),
-                                                                   newElement_0_linkEstablishedCtorSignature.c_str(),
-                                                                   entry_0.linkEstablished, newElement_0_linkEstablished);
-
-        jclass routeTableStructClass;
+                auto iter_newElement_0_nullableOptionalListInsideOptional_4 = entry_0.nullableOptionalList.Value().Value().begin();
+                while (iter_newElement_0_nullableOptionalListInsideOptional_4.Next())
+                {
+                    auto & entry_4 = iter_newElement_0_nullableOptionalListInsideOptional_4.GetValue();
+                    jobject newElement_4;
+                    std::string newElement_4ClassName     = "java/lang/Integer";
+                    std::string newElement_4CtorSignature = "(I)V";
+                    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_4ClassName.c_str(),
+                                                                                  newElement_4CtorSignature.c_str(),
+                                                                                  static_cast<uint8_t>(entry_4), newElement_4);
+                    chip::JniReferences::GetInstance().AddToList(newElement_0_nullableOptionalListInsideOptional, newElement_4);
+                }
+            }
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_nullableOptionalListInsideOptional,
+                                                              newElement_0_nullableOptionalList);
+        }
+
+        jclass nullablesAndOptionalsStructStructClass;
         err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$ThreadNetworkDiagnosticsClusterRouteTable", routeTableStructClass);
+            env, "chip/devicecontroller/ChipStructs$TestClusterClusterNullablesAndOptionalsStruct",
+            nullablesAndOptionalsStructStructClass);
         if (err != CHIP_NO_ERROR)
         {
-            ChipLogError(Zcl, "Could not find class ChipStructs$ThreadNetworkDiagnosticsClusterRouteTable");
+            ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterNullablesAndOptionalsStruct");
             return;
         }
-        jmethodID routeTableStructCtor =
-            env->GetMethodID(routeTableStructClass, "<init>",
-                             "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/"
-                             "lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Boolean;)V");
-        if (routeTableStructCtor == nullptr)
+        jmethodID nullablesAndOptionalsStructStructCtor =
+            env->GetMethodID(nullablesAndOptionalsStructStructClass, "<init>",
+                             "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/lang/String;Ljava/util/"
+                             "Optional;Ljava/util/Optional;Lchip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct;Ljava/"
+                             "util/Optional;Ljava/util/Optional;Ljava/util/ArrayList;Ljava/util/Optional;Ljava/util/Optional;)V");
+        if (nullablesAndOptionalsStructStructCtor == nullptr)
         {
-            ChipLogError(Zcl, "Could not find ChipStructs$ThreadNetworkDiagnosticsClusterRouteTable constructor");
+            ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterNullablesAndOptionalsStruct constructor");
             return;
         }
 
-        newElement_0 = env->NewObject(routeTableStructClass, routeTableStructCtor, newElement_0_extAddress, newElement_0_rloc16,
-                                      newElement_0_routerId, newElement_0_nextHop, newElement_0_pathCost, newElement_0_LQIIn,
-                                      newElement_0_LQIOut, newElement_0_age, newElement_0_allocated, newElement_0_linkEstablished);
+        newElement_0 = env->NewObject(nullablesAndOptionalsStructStructClass, nullablesAndOptionalsStructStructCtor,
+                                      newElement_0_nullableInt, newElement_0_optionalInt, newElement_0_nullableOptionalInt,
+                                      newElement_0_nullableString, newElement_0_optionalString, newElement_0_nullableOptionalString,
+                                      newElement_0_nullableStruct, newElement_0_optionalStruct, newElement_0_nullableOptionalStruct,
+                                      newElement_0_nullableList, newElement_0_optionalList, newElement_0_nullableOptionalList);
         chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
@@ -24520,210 +24777,9 @@ void CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback::CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterPartitionIdAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-        return;
-    }
-
-    javaCallbackRef = env->NewGlobalRef(javaCallback);
-    if (javaCallbackRef == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-    }
-}
-
-CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback::~CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback()
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not delete global reference for Java callback");
-        return;
-    }
-    env->DeleteGlobalRef(javaCallbackRef);
-}
-
-void CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback::CallbackFn(void * context,
-                                                                          const chip::app::DataModel::Nullable<uint32_t> & value)
-{
-    chip::DeviceLayer::StackUnlock unlock;
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    jobject javaCallbackRef;
-
-    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback *>(context), maybeDestroy);
-
-    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-    javaCallbackRef = cppCallback.get()->javaCallbackRef;
-    VerifyOrReturn(javaCallbackRef != nullptr,
-                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-    jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
-    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
-    {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
-    }
-
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
-}
-
-CHIPThreadNetworkDiagnosticsWeightingAttributeCallback::CHIPThreadNetworkDiagnosticsWeightingAttributeCallback(jobject javaCallback,
-                                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterWeightingAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-        return;
-    }
-
-    javaCallbackRef = env->NewGlobalRef(javaCallback);
-    if (javaCallbackRef == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-    }
-}
-
-CHIPThreadNetworkDiagnosticsWeightingAttributeCallback::~CHIPThreadNetworkDiagnosticsWeightingAttributeCallback()
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not delete global reference for Java callback");
-        return;
-    }
-    env->DeleteGlobalRef(javaCallbackRef);
-}
-
-void CHIPThreadNetworkDiagnosticsWeightingAttributeCallback::CallbackFn(void * context,
-                                                                        const chip::app::DataModel::Nullable<uint8_t> & value)
-{
-    chip::DeviceLayer::StackUnlock unlock;
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    jobject javaCallbackRef;
-
-    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsWeightingAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThreadNetworkDiagnosticsWeightingAttributeCallback *>(context), maybeDestroy);
-
-    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-    javaCallbackRef = cppCallback.get()->javaCallbackRef;
-    VerifyOrReturn(javaCallbackRef != nullptr,
-                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-    jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
-    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
-    {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
-    }
-
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
-}
-
-CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback::CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterDataVersionAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-        return;
-    }
-
-    javaCallbackRef = env->NewGlobalRef(javaCallback);
-    if (javaCallbackRef == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-    }
-}
-
-CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback::~CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback()
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not delete global reference for Java callback");
-        return;
-    }
-    env->DeleteGlobalRef(javaCallbackRef);
-}
-
-void CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback::CallbackFn(void * context,
-                                                                          const chip::app::DataModel::Nullable<uint8_t> & value)
-{
-    chip::DeviceLayer::StackUnlock unlock;
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    jobject javaCallbackRef;
-
-    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback *>(context), maybeDestroy);
-
-    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-    javaCallbackRef = cppCallback.get()->javaCallbackRef;
-    VerifyOrReturn(javaCallbackRef != nullptr,
-                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-    jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
-    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
-    {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
-    }
-
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
-}
-
-CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback::CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterStableDataVersionAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterListLongOctetStringAttributeCallback::CHIPTestClusterListLongOctetStringAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterListLongOctetStringAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -24740,7 +24796,7 @@ CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback::CHIPThreadNetwor
     }
 }
 
-CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback::~CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback()
+CHIPTestClusterListLongOctetStringAttributeCallback::~CHIPTestClusterListLongOctetStringAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24751,8 +24807,8 @@ CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback::~CHIPThreadNetwo
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPTestClusterListLongOctetStringAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24760,8 +24816,9 @@ void CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPTestClusterListLongOctetStringAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterListLongOctetStringAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -24769,28 +24826,31 @@ void CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        jbyteArray newElement_0ByteArray = env->NewByteArray(static_cast<jsize>(entry_0.size()));
+        env->SetByteArrayRegion(newElement_0ByteArray, 0, static_cast<jsize>(entry_0.size()),
+                                reinterpret_cast<const jbyte *>(entry_0.data()));
+        newElement_0 = newElement_0ByteArray;
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback::CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterLeaderRouterIdAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterListFabricScopedAttributeCallback::CHIPTestClusterListFabricScopedAttributeCallback(jobject javaCallback,
+                                                                                                   bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterListFabricScopedAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -24807,7 +24867,7 @@ CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback::CHIPThreadNetworkDi
     }
 }
 
-CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback::~CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback()
+CHIPTestClusterListFabricScopedAttributeCallback::~CHIPTestClusterListFabricScopedAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24818,8 +24878,9 @@ CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback::~CHIPThreadNetworkD
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback::CallbackFn(void * context,
-                                                                             const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPTestClusterListFabricScopedAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestFabricScoped::DecodableType> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24827,8 +24888,9 @@ void CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback::CallbackFn(voi
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback *>(context), maybeDestroy);
+
+    std::unique_ptr<CHIPTestClusterListFabricScopedAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterListFabricScopedAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -24836,28 +24898,206 @@ void CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback::CallbackFn(voi
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject javaValue;
-    if (value.IsNull())
-    {
-        javaValue = nullptr;
-    }
-    else
+    jobject arrayListObj;
+    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        auto & entry_0 = iter_arrayListObj_0.GetValue();
+        jobject newElement_0;
+        jobject newElement_0_fabricSensitiveInt8u;
+        std::string newElement_0_fabricSensitiveInt8uClassName     = "java/lang/Integer";
+        std::string newElement_0_fabricSensitiveInt8uCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+            newElement_0_fabricSensitiveInt8uClassName.c_str(), newElement_0_fabricSensitiveInt8uCtorSignature.c_str(),
+            entry_0.fabricSensitiveInt8u, newElement_0_fabricSensitiveInt8u);
+        jobject newElement_0_optionalFabricSensitiveInt8u;
+        if (!entry_0.optionalFabricSensitiveInt8u.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_optionalFabricSensitiveInt8u);
+        }
+        else
+        {
+            jobject newElement_0_optionalFabricSensitiveInt8uInsideOptional;
+            std::string newElement_0_optionalFabricSensitiveInt8uInsideOptionalClassName     = "java/lang/Integer";
+            std::string newElement_0_optionalFabricSensitiveInt8uInsideOptionalCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                newElement_0_optionalFabricSensitiveInt8uInsideOptionalClassName.c_str(),
+                newElement_0_optionalFabricSensitiveInt8uInsideOptionalCtorSignature.c_str(),
+                entry_0.optionalFabricSensitiveInt8u.Value(), newElement_0_optionalFabricSensitiveInt8uInsideOptional);
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_optionalFabricSensitiveInt8uInsideOptional,
+                                                              newElement_0_optionalFabricSensitiveInt8u);
+        }
+        jobject newElement_0_nullableFabricSensitiveInt8u;
+        if (entry_0.nullableFabricSensitiveInt8u.IsNull())
+        {
+            newElement_0_nullableFabricSensitiveInt8u = nullptr;
+        }
+        else
+        {
+            std::string newElement_0_nullableFabricSensitiveInt8uClassName     = "java/lang/Integer";
+            std::string newElement_0_nullableFabricSensitiveInt8uCtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                newElement_0_nullableFabricSensitiveInt8uClassName.c_str(),
+                newElement_0_nullableFabricSensitiveInt8uCtorSignature.c_str(), entry_0.nullableFabricSensitiveInt8u.Value(),
+                newElement_0_nullableFabricSensitiveInt8u);
+        }
+        jobject newElement_0_nullableOptionalFabricSensitiveInt8u;
+        if (!entry_0.nullableOptionalFabricSensitiveInt8u.HasValue())
+        {
+            chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_nullableOptionalFabricSensitiveInt8u);
+        }
+        else
+        {
+            jobject newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptional;
+            if (entry_0.nullableOptionalFabricSensitiveInt8u.Value().IsNull())
+            {
+                newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptional = nullptr;
+            }
+            else
+            {
+                std::string newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptionalClassName     = "java/lang/Integer";
+                std::string newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptionalCtorSignature = "(I)V";
+                chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+                    newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptionalClassName.c_str(),
+                    newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptionalCtorSignature.c_str(),
+                    entry_0.nullableOptionalFabricSensitiveInt8u.Value().Value(),
+                    newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptional);
+            }
+            chip::JniReferences::GetInstance().CreateOptional(newElement_0_nullableOptionalFabricSensitiveInt8uInsideOptional,
+                                                              newElement_0_nullableOptionalFabricSensitiveInt8u);
+        }
+        jobject newElement_0_fabricSensitiveCharString;
+        newElement_0_fabricSensitiveCharString = env->NewStringUTF(
+            std::string(entry_0.fabricSensitiveCharString.data(), entry_0.fabricSensitiveCharString.size()).c_str());
+        jobject newElement_0_fabricSensitiveStruct;
+        jobject newElement_0_fabricSensitiveStruct_a;
+        std::string newElement_0_fabricSensitiveStruct_aClassName     = "java/lang/Integer";
+        std::string newElement_0_fabricSensitiveStruct_aCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+            newElement_0_fabricSensitiveStruct_aClassName.c_str(), newElement_0_fabricSensitiveStruct_aCtorSignature.c_str(),
+            entry_0.fabricSensitiveStruct.a, newElement_0_fabricSensitiveStruct_a);
+        jobject newElement_0_fabricSensitiveStruct_b;
+        std::string newElement_0_fabricSensitiveStruct_bClassName     = "java/lang/Boolean";
+        std::string newElement_0_fabricSensitiveStruct_bCtorSignature = "(Z)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
+            newElement_0_fabricSensitiveStruct_bClassName.c_str(), newElement_0_fabricSensitiveStruct_bCtorSignature.c_str(),
+            entry_0.fabricSensitiveStruct.b, newElement_0_fabricSensitiveStruct_b);
+        jobject newElement_0_fabricSensitiveStruct_c;
+        std::string newElement_0_fabricSensitiveStruct_cClassName     = "java/lang/Integer";
+        std::string newElement_0_fabricSensitiveStruct_cCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+            newElement_0_fabricSensitiveStruct_cClassName.c_str(), newElement_0_fabricSensitiveStruct_cCtorSignature.c_str(),
+            static_cast<uint8_t>(entry_0.fabricSensitiveStruct.c), newElement_0_fabricSensitiveStruct_c);
+        jobject newElement_0_fabricSensitiveStruct_d;
+        jbyteArray newElement_0_fabricSensitiveStruct_dByteArray =
+            env->NewByteArray(static_cast<jsize>(entry_0.fabricSensitiveStruct.d.size()));
+        env->SetByteArrayRegion(newElement_0_fabricSensitiveStruct_dByteArray, 0,
+                                static_cast<jsize>(entry_0.fabricSensitiveStruct.d.size()),
+                                reinterpret_cast<const jbyte *>(entry_0.fabricSensitiveStruct.d.data()));
+        newElement_0_fabricSensitiveStruct_d = newElement_0_fabricSensitiveStruct_dByteArray;
+        jobject newElement_0_fabricSensitiveStruct_e;
+        newElement_0_fabricSensitiveStruct_e =
+            env->NewStringUTF(std::string(entry_0.fabricSensitiveStruct.e.data(), entry_0.fabricSensitiveStruct.e.size()).c_str());
+        jobject newElement_0_fabricSensitiveStruct_f;
+        std::string newElement_0_fabricSensitiveStruct_fClassName     = "java/lang/Integer";
+        std::string newElement_0_fabricSensitiveStruct_fCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
+            newElement_0_fabricSensitiveStruct_fClassName.c_str(), newElement_0_fabricSensitiveStruct_fCtorSignature.c_str(),
+            entry_0.fabricSensitiveStruct.f.Raw(), newElement_0_fabricSensitiveStruct_f);
+        jobject newElement_0_fabricSensitiveStruct_g;
+        std::string newElement_0_fabricSensitiveStruct_gClassName     = "java/lang/Float";
+        std::string newElement_0_fabricSensitiveStruct_gCtorSignature = "(F)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<float>(
+            newElement_0_fabricSensitiveStruct_gClassName.c_str(), newElement_0_fabricSensitiveStruct_gCtorSignature.c_str(),
+            entry_0.fabricSensitiveStruct.g, newElement_0_fabricSensitiveStruct_g);
+        jobject newElement_0_fabricSensitiveStruct_h;
+        std::string newElement_0_fabricSensitiveStruct_hClassName     = "java/lang/Double";
+        std::string newElement_0_fabricSensitiveStruct_hCtorSignature = "(D)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<double>(
+            newElement_0_fabricSensitiveStruct_hClassName.c_str(), newElement_0_fabricSensitiveStruct_hCtorSignature.c_str(),
+            entry_0.fabricSensitiveStruct.h, newElement_0_fabricSensitiveStruct_h);
+
+        jclass simpleStructStructClass;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct", simpleStructStructClass);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterSimpleStruct");
+            return;
+        }
+        jmethodID simpleStructStructCtor = env->GetMethodID(simpleStructStructClass, "<init>",
+                                                            "(Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;[BLjava/"
+                                                            "lang/String;Ljava/lang/Integer;Ljava/lang/Float;Ljava/lang/Double;)V");
+        if (simpleStructStructCtor == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterSimpleStruct constructor");
+            return;
+        }
+
+        newElement_0_fabricSensitiveStruct = env->NewObject(
+            simpleStructStructClass, simpleStructStructCtor, newElement_0_fabricSensitiveStruct_a,
+            newElement_0_fabricSensitiveStruct_b, newElement_0_fabricSensitiveStruct_c, newElement_0_fabricSensitiveStruct_d,
+            newElement_0_fabricSensitiveStruct_e, newElement_0_fabricSensitiveStruct_f, newElement_0_fabricSensitiveStruct_g,
+            newElement_0_fabricSensitiveStruct_h);
+        jobject newElement_0_fabricSensitiveInt8uList;
+        chip::JniReferences::GetInstance().CreateArrayList(newElement_0_fabricSensitiveInt8uList);
+
+        auto iter_newElement_0_fabricSensitiveInt8uList_2 = entry_0.fabricSensitiveInt8uList.begin();
+        while (iter_newElement_0_fabricSensitiveInt8uList_2.Next())
+        {
+            auto & entry_2 = iter_newElement_0_fabricSensitiveInt8uList_2.GetValue();
+            jobject newElement_2;
+            std::string newElement_2ClassName     = "java/lang/Integer";
+            std::string newElement_2CtorSignature = "(I)V";
+            chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_2ClassName.c_str(),
+                                                                          newElement_2CtorSignature.c_str(), entry_2, newElement_2);
+            chip::JniReferences::GetInstance().AddToList(newElement_0_fabricSensitiveInt8uList, newElement_2);
+        }
+        jobject newElement_0_fabricIndex;
+        std::string newElement_0_fabricIndexClassName     = "java/lang/Integer";
+        std::string newElement_0_fabricIndexCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_fabricIndexClassName.c_str(),
+                                                                      newElement_0_fabricIndexCtorSignature.c_str(),
+                                                                      entry_0.fabricIndex, newElement_0_fabricIndex);
+
+        jclass testFabricScopedStructClass;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$TestClusterClusterTestFabricScoped", testFabricScopedStructClass);
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Could not find class ChipStructs$TestClusterClusterTestFabricScoped");
+            return;
+        }
+        jmethodID testFabricScopedStructCtor = env->GetMethodID(
+            testFabricScopedStructClass, "<init>",
+            "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/lang/Integer;Ljava/util/Optional;Ljava/lang/String;Lchip/"
+            "devicecontroller/ChipStructs$TestClusterClusterSimpleStruct;Ljava/util/ArrayList;Ljava/lang/Integer;)V");
+        if (testFabricScopedStructCtor == nullptr)
+        {
+            ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterTestFabricScoped constructor");
+            return;
+        }
+
+        newElement_0 =
+            env->NewObject(testFabricScopedStructClass, testFabricScopedStructCtor, newElement_0_fabricSensitiveInt8u,
+                           newElement_0_optionalFabricSensitiveInt8u, newElement_0_nullableFabricSensitiveInt8u,
+                           newElement_0_nullableOptionalFabricSensitiveInt8u, newElement_0_fabricSensitiveCharString,
+                           newElement_0_fabricSensitiveStruct, newElement_0_fabricSensitiveInt8uList, newElement_0_fabricIndex);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback::CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterActiveTimestampAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableBooleanAttributeCallback::CHIPTestClusterNullableBooleanAttributeCallback(jobject javaCallback,
+                                                                                                 bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableBooleanAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -24874,7 +25114,7 @@ CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback::CHIPThreadNetworkD
     }
 }
 
-CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback::~CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback()
+CHIPTestClusterNullableBooleanAttributeCallback::~CHIPTestClusterNullableBooleanAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24885,8 +25125,7 @@ CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback::~CHIPThreadNetwork
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<uint64_t> & value)
+void CHIPTestClusterNullableBooleanAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<bool> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24894,8 +25133,8 @@ void CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableBooleanAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableBooleanAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -24903,7 +25142,7 @@ void CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Boolean;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
@@ -24913,18 +25152,18 @@ void CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback::CallbackFn(
     }
     else
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        std::string javaValueClassName     = "java/lang/Boolean";
+        std::string javaValueCtorSignature = "(Z)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<bool>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                   value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback::CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterPendingTimestampAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableBitmap8AttributeCallback::CHIPTestClusterNullableBitmap8AttributeCallback(jobject javaCallback,
+                                                                                                 bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableBitmap8AttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -24941,7 +25180,7 @@ CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback::CHIPThreadNetwork
     }
 }
 
-CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback::~CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback()
+CHIPTestClusterNullableBitmap8AttributeCallback::~CHIPTestClusterNullableBitmap8AttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24952,8 +25191,8 @@ CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback::~CHIPThreadNetwor
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<uint64_t> & value)
+void CHIPTestClusterNullableBitmap8AttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24961,8 +25200,8 @@ void CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableBitmap8AttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableBitmap8AttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -24970,7 +25209,7 @@ void CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
@@ -24980,18 +25219,18 @@ void CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback::CallbackFn(
     }
     else
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value().Raw(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPThreadNetworkDiagnosticsDelayAttributeCallback::CHIPThreadNetworkDiagnosticsDelayAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterDelayAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableBitmap16AttributeCallback::CHIPTestClusterNullableBitmap16AttributeCallback(jobject javaCallback,
+                                                                                                   bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableBitmap16AttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -25008,7 +25247,7 @@ CHIPThreadNetworkDiagnosticsDelayAttributeCallback::CHIPThreadNetworkDiagnostics
     }
 }
 
-CHIPThreadNetworkDiagnosticsDelayAttributeCallback::~CHIPThreadNetworkDiagnosticsDelayAttributeCallback()
+CHIPTestClusterNullableBitmap16AttributeCallback::~CHIPTestClusterNullableBitmap16AttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25019,8 +25258,8 @@ CHIPThreadNetworkDiagnosticsDelayAttributeCallback::~CHIPThreadNetworkDiagnostic
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPThreadNetworkDiagnosticsDelayAttributeCallback::CallbackFn(void * context,
-                                                                    const chip::app::DataModel::Nullable<uint32_t> & value)
+void CHIPTestClusterNullableBitmap16AttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25028,8 +25267,8 @@ void CHIPThreadNetworkDiagnosticsDelayAttributeCallback::CallbackFn(void * conte
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsDelayAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThreadNetworkDiagnosticsDelayAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableBitmap16AttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableBitmap16AttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -25037,7 +25276,7 @@ void CHIPThreadNetworkDiagnosticsDelayAttributeCallback::CallbackFn(void * conte
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
@@ -25047,18 +25286,18 @@ void CHIPThreadNetworkDiagnosticsDelayAttributeCallback::CallbackFn(void * conte
     }
     else
     {
-        std::string javaValueClassName     = "java/lang/Long";
-        std::string javaValueCtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value().Raw(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback::CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterChannelMaskAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableBitmap32AttributeCallback::CHIPTestClusterNullableBitmap32AttributeCallback(jobject javaCallback,
+                                                                                                   bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableBitmap32AttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -25075,7 +25314,7 @@ CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback::CHIPThreadNetworkDiagn
     }
 }
 
-CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback::~CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback()
+CHIPTestClusterNullableBitmap32AttributeCallback::~CHIPTestClusterNullableBitmap32AttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25086,8 +25325,8 @@ CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback::~CHIPThreadNetworkDiag
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::ByteSpan> & value)
+void CHIPTestClusterNullableBitmap32AttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25095,8 +25334,8 @@ void CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableBitmap32AttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableBitmap32AttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -25104,7 +25343,7 @@ void CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
@@ -25114,162 +25353,18 @@ void CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback::CallbackFn(
     }
     else
     {
-        jbyteArray javaValueByteArray = env->NewByteArray(static_cast<jsize>(value.Value().size()));
-        env->SetByteArrayRegion(javaValueByteArray, 0, static_cast<jsize>(value.Value().size()),
-                                reinterpret_cast<const jbyte *>(value.Value().data()));
-        javaValue = javaValueByteArray;
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value().Raw(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback::
-    CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterActiveNetworkFaultsListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-        return;
-    }
-
-    javaCallbackRef = env->NewGlobalRef(javaCallback);
-    if (javaCallbackRef == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-    }
-}
-
-CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback::
-    ~CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback()
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not delete global reference for Java callback");
-        return;
-    }
-    env->DeleteGlobalRef(javaCallbackRef);
-}
-
-void CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & list)
-{
-    chip::DeviceLayer::StackUnlock unlock;
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    jobject javaCallbackRef;
-
-    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback *>(context), maybeDestroy);
-
-    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-    javaCallbackRef = cppCallback.get()->javaCallbackRef;
-    VerifyOrReturn(javaCallbackRef != nullptr,
-                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-    jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
-    {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Integer";
-        std::string newElement_0CtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), static_cast<uint8_t>(entry_0), newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
-    }
-
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-}
-
-CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback::
-    CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-        return;
-    }
-
-    javaCallbackRef = env->NewGlobalRef(javaCallback);
-    if (javaCallbackRef == nullptr)
-    {
-        ChipLogError(Zcl, "Could not create global reference for Java callback");
-    }
-}
-
-CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback::
-    ~CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback()
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not delete global reference for Java callback");
-        return;
-    }
-    env->DeleteGlobalRef(javaCallbackRef);
-}
-
-void CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
-{
-    chip::DeviceLayer::StackUnlock unlock;
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    jobject javaCallbackRef;
-
-    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
-
-    // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-    javaCallbackRef = cppCallback.get()->javaCallbackRef;
-    VerifyOrReturn(javaCallbackRef != nullptr,
-                   ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-    jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
-    {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
-    }
-
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-}
-
-CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback::CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableBitmap64AttributeCallback::CHIPTestClusterNullableBitmap64AttributeCallback(jobject javaCallback,
+                                                                                                   bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableBitmap64AttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -25286,8 +25381,7 @@ CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback::CHIPThreadNetw
     }
 }
 
-CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback::
-    ~CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback()
+CHIPTestClusterNullableBitmap64AttributeCallback::~CHIPTestClusterNullableBitmap64AttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25298,8 +25392,8 @@ CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPTestClusterNullableBitmap64AttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25307,9 +25401,8 @@ void CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback::CallbackF
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableBitmap64AttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableBitmap64AttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -25317,32 +25410,27 @@ void CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback::CallbackF
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value().Raw(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback::CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPTestClusterNullableInt8uAttributeCallback::CHIPTestClusterNullableInt8uAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableInt8uAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25358,7 +25446,7 @@ CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback::CHIPThreadNetworkDia
     }
 }
 
-CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback::~CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback()
+CHIPTestClusterNullableInt8uAttributeCallback::~CHIPTestClusterNullableInt8uAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25369,8 +25457,8 @@ CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback::~CHIPThreadNetworkDi
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPTestClusterNullableInt8uAttributeCallback::CallbackFn(void * context,
+                                                               const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25378,9 +25466,8 @@ void CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableInt8uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableInt8uAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -25388,31 +25475,28 @@ void CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback::
-    CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTimeFormatLocalizationClusterSupportedCalendarTypesAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableInt16uAttributeCallback::CHIPTestClusterNullableInt16uAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableInt16uAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -25429,8 +25513,7 @@ CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback::
     }
 }
 
-CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback::
-    ~CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback()
+CHIPTestClusterNullableInt16uAttributeCallback::~CHIPTestClusterNullableInt16uAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25441,8 +25524,8 @@ CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::TimeFormatLocalization::CalendarType> & list)
+void CHIPTestClusterNullableInt16uAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25450,9 +25533,8 @@ void CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback::Callback
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableInt16uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableInt16uAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -25460,31 +25542,28 @@ void CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback::Callback
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Integer";
-        std::string newElement_0CtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-            newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), static_cast<uint8_t>(entry_0), newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback::CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTimeFormatLocalizationClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableInt24uAttributeCallback::CHIPTestClusterNullableInt24uAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableInt24uAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -25501,7 +25580,7 @@ CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback::CHIPTimeFormatL
     }
 }
 
-CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback::~CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback()
+CHIPTestClusterNullableInt24uAttributeCallback::~CHIPTestClusterNullableInt24uAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25512,8 +25591,8 @@ CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback::~CHIPTimeFormat
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPTestClusterNullableInt24uAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25521,9 +25600,8 @@ void CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback::CallbackFn
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableInt24uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableInt24uAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -25531,31 +25609,28 @@ void CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback::CallbackFn
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback::CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTimeFormatLocalizationClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableInt32uAttributeCallback::CHIPTestClusterNullableInt32uAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableInt32uAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -25572,7 +25647,7 @@ CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback::CHIPTimeFormatLo
     }
 }
 
-CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback::~CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback()
+CHIPTestClusterNullableInt32uAttributeCallback::~CHIPTestClusterNullableInt32uAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25583,8 +25658,8 @@ CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback::~CHIPTimeFormatL
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPTestClusterNullableInt32uAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25592,9 +25667,8 @@ void CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableInt32uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableInt32uAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -25602,31 +25676,28 @@ void CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPUnitLocalizationAttributeListAttributeCallback::CHIPUnitLocalizationAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitLocalizationClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableInt40uAttributeCallback::CHIPTestClusterNullableInt40uAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableInt40uAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -25643,7 +25714,7 @@ CHIPUnitLocalizationAttributeListAttributeCallback::CHIPUnitLocalizationAttribut
     }
 }
 
-CHIPUnitLocalizationAttributeListAttributeCallback::~CHIPUnitLocalizationAttributeListAttributeCallback()
+CHIPTestClusterNullableInt40uAttributeCallback::~CHIPTestClusterNullableInt40uAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25654,8 +25725,8 @@ CHIPUnitLocalizationAttributeListAttributeCallback::~CHIPUnitLocalizationAttribu
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPUnitLocalizationAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPTestClusterNullableInt40uAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::Nullable<uint64_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25663,9 +25734,8 @@ void CHIPUnitLocalizationAttributeListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPUnitLocalizationAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPUnitLocalizationAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableInt40uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableInt40uAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -25673,30 +25743,29 @@ void CHIPUnitLocalizationAttributeListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPUserLabelLabelListAttributeCallback::CHIPUserLabelLabelListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPUserLabelClusterLabelListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPTestClusterNullableInt48uAttributeCallback::CHIPTestClusterNullableInt48uAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableInt48uAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25712,7 +25781,7 @@ CHIPUserLabelLabelListAttributeCallback::CHIPUserLabelLabelListAttributeCallback
     }
 }
 
-CHIPUserLabelLabelListAttributeCallback::~CHIPUserLabelLabelListAttributeCallback()
+CHIPTestClusterNullableInt48uAttributeCallback::~CHIPTestClusterNullableInt48uAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25723,9 +25792,8 @@ CHIPUserLabelLabelListAttributeCallback::~CHIPUserLabelLabelListAttributeCallbac
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPUserLabelLabelListAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::UserLabel::Structs::LabelStruct::DecodableType> & list)
+void CHIPTestClusterNullableInt48uAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::Nullable<uint64_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25733,9 +25801,8 @@ void CHIPUserLabelLabelListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPUserLabelLabelListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPUserLabelLabelListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableInt48uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableInt48uAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -25743,49 +25810,28 @@ void CHIPUserLabelLabelListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        jobject newElement_0_label;
-        newElement_0_label = env->NewStringUTF(std::string(entry_0.label.data(), entry_0.label.size()).c_str());
-        jobject newElement_0_value;
-        newElement_0_value = env->NewStringUTF(std::string(entry_0.value.data(), entry_0.value.size()).c_str());
-
-        jclass labelStructStructClass;
-        err = chip::JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipStructs$UserLabelClusterLabelStruct",
-                                                             labelStructStructClass);
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Could not find class ChipStructs$UserLabelClusterLabelStruct");
-            return;
-        }
-        jmethodID labelStructStructCtor =
-            env->GetMethodID(labelStructStructClass, "<init>", "(Ljava/lang/String;Ljava/lang/String;)V");
-        if (labelStructStructCtor == nullptr)
-        {
-            ChipLogError(Zcl, "Could not find ChipStructs$UserLabelClusterLabelStruct constructor");
-            return;
-        }
-
-        newElement_0 = env->NewObject(labelStructStructClass, labelStructStructCtor, newElement_0_label, newElement_0_value);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPUserLabelGeneratedCommandListAttributeCallback::CHIPUserLabelGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPUserLabelClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableInt56uAttributeCallback::CHIPTestClusterNullableInt56uAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableInt56uAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -25802,7 +25848,7 @@ CHIPUserLabelGeneratedCommandListAttributeCallback::CHIPUserLabelGeneratedComman
     }
 }
 
-CHIPUserLabelGeneratedCommandListAttributeCallback::~CHIPUserLabelGeneratedCommandListAttributeCallback()
+CHIPTestClusterNullableInt56uAttributeCallback::~CHIPTestClusterNullableInt56uAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25813,8 +25859,8 @@ CHIPUserLabelGeneratedCommandListAttributeCallback::~CHIPUserLabelGeneratedComma
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPUserLabelGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPTestClusterNullableInt56uAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::Nullable<uint64_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25822,9 +25868,8 @@ void CHIPUserLabelGeneratedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPUserLabelGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPUserLabelGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableInt56uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableInt56uAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -25832,31 +25877,28 @@ void CHIPUserLabelGeneratedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPUserLabelAcceptedCommandListAttributeCallback::CHIPUserLabelAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                     bool keepAlive) :
-    chip::Callback::Callback<CHIPUserLabelClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableInt64uAttributeCallback::CHIPTestClusterNullableInt64uAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableInt64uAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -25873,7 +25915,7 @@ CHIPUserLabelAcceptedCommandListAttributeCallback::CHIPUserLabelAcceptedCommandL
     }
 }
 
-CHIPUserLabelAcceptedCommandListAttributeCallback::~CHIPUserLabelAcceptedCommandListAttributeCallback()
+CHIPTestClusterNullableInt64uAttributeCallback::~CHIPTestClusterNullableInt64uAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25884,8 +25926,8 @@ CHIPUserLabelAcceptedCommandListAttributeCallback::~CHIPUserLabelAcceptedCommand
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPUserLabelAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPTestClusterNullableInt64uAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::Nullable<uint64_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25893,9 +25935,8 @@ void CHIPUserLabelAcceptedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPUserLabelAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPUserLabelAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableInt64uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableInt64uAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -25903,32 +25944,27 @@ void CHIPUserLabelAcceptedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPWakeOnLanGeneratedCommandListAttributeCallback::CHIPWakeOnLanGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPWakeOnLanClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPTestClusterNullableInt8sAttributeCallback::CHIPTestClusterNullableInt8sAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableInt8sAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25944,7 +25980,7 @@ CHIPWakeOnLanGeneratedCommandListAttributeCallback::CHIPWakeOnLanGeneratedComman
     }
 }
 
-CHIPWakeOnLanGeneratedCommandListAttributeCallback::~CHIPWakeOnLanGeneratedCommandListAttributeCallback()
+CHIPTestClusterNullableInt8sAttributeCallback::~CHIPTestClusterNullableInt8sAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25955,8 +25991,7 @@ CHIPWakeOnLanGeneratedCommandListAttributeCallback::~CHIPWakeOnLanGeneratedComma
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPWakeOnLanGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPTestClusterNullableInt8sAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<int8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25964,9 +25999,8 @@ void CHIPWakeOnLanGeneratedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPWakeOnLanGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPWakeOnLanGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableInt8sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableInt8sAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -25974,31 +26008,28 @@ void CHIPWakeOnLanGeneratedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                     value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPWakeOnLanAcceptedCommandListAttributeCallback::CHIPWakeOnLanAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                     bool keepAlive) :
-    chip::Callback::Callback<CHIPWakeOnLanClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableInt16sAttributeCallback::CHIPTestClusterNullableInt16sAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableInt16sAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -26015,7 +26046,7 @@ CHIPWakeOnLanAcceptedCommandListAttributeCallback::CHIPWakeOnLanAcceptedCommandL
     }
 }
 
-CHIPWakeOnLanAcceptedCommandListAttributeCallback::~CHIPWakeOnLanAcceptedCommandListAttributeCallback()
+CHIPTestClusterNullableInt16sAttributeCallback::~CHIPTestClusterNullableInt16sAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26026,8 +26057,8 @@ CHIPWakeOnLanAcceptedCommandListAttributeCallback::~CHIPWakeOnLanAcceptedCommand
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPWakeOnLanAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPTestClusterNullableInt16sAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::Nullable<int16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26035,9 +26066,8 @@ void CHIPWakeOnLanAcceptedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPWakeOnLanAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPWakeOnLanAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableInt16sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableInt16sAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -26045,30 +26075,29 @@ void CHIPWakeOnLanAcceptedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPWakeOnLanAttributeListAttributeCallback::CHIPWakeOnLanAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPWakeOnLanClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPTestClusterNullableInt24sAttributeCallback::CHIPTestClusterNullableInt24sAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableInt24sAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26084,7 +26113,7 @@ CHIPWakeOnLanAttributeListAttributeCallback::CHIPWakeOnLanAttributeListAttribute
     }
 }
 
-CHIPWakeOnLanAttributeListAttributeCallback::~CHIPWakeOnLanAttributeListAttributeCallback()
+CHIPTestClusterNullableInt24sAttributeCallback::~CHIPTestClusterNullableInt24sAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26095,50 +26124,46 @@ CHIPWakeOnLanAttributeListAttributeCallback::~CHIPWakeOnLanAttributeListAttribut
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPWakeOnLanAttributeListAttributeCallback::CallbackFn(void * context,
-                                                             const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPTestClusterNullableInt24sAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::Nullable<int32_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     jobject javaCallbackRef;
 
-    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPWakeOnLanAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPWakeOnLanAttributeListAttributeCallback *>(context), maybeDestroy);
-
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    std::unique_ptr<CHIPTestClusterNullableInt24sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableInt24sAttributeCallback *>(context), maybeDestroy);
+
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
     VerifyOrReturn(javaCallbackRef != nullptr,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int32_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPWiFiNetworkDiagnosticsBssidAttributeCallback::CHIPWiFiNetworkDiagnosticsBssidAttributeCallback(jobject javaCallback,
-                                                                                                   bool keepAlive) :
-    chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterBssidAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableInt32sAttributeCallback::CHIPTestClusterNullableInt32sAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableInt32sAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -26155,7 +26180,7 @@ CHIPWiFiNetworkDiagnosticsBssidAttributeCallback::CHIPWiFiNetworkDiagnosticsBssi
     }
 }
 
-CHIPWiFiNetworkDiagnosticsBssidAttributeCallback::~CHIPWiFiNetworkDiagnosticsBssidAttributeCallback()
+CHIPTestClusterNullableInt32sAttributeCallback::~CHIPTestClusterNullableInt32sAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26166,8 +26191,8 @@ CHIPWiFiNetworkDiagnosticsBssidAttributeCallback::~CHIPWiFiNetworkDiagnosticsBss
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPWiFiNetworkDiagnosticsBssidAttributeCallback::CallbackFn(void * context,
-                                                                  const chip::app::DataModel::Nullable<chip::ByteSpan> & value)
+void CHIPTestClusterNullableInt32sAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::Nullable<int32_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26175,8 +26200,8 @@ void CHIPWiFiNetworkDiagnosticsBssidAttributeCallback::CallbackFn(void * context
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPWiFiNetworkDiagnosticsBssidAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPWiFiNetworkDiagnosticsBssidAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableInt32sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableInt32sAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -26184,7 +26209,7 @@ void CHIPWiFiNetworkDiagnosticsBssidAttributeCallback::CallbackFn(void * context
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
@@ -26194,18 +26219,18 @@ void CHIPWiFiNetworkDiagnosticsBssidAttributeCallback::CallbackFn(void * context
     }
     else
     {
-        jbyteArray javaValueByteArray = env->NewByteArray(static_cast<jsize>(value.Value().size()));
-        env->SetByteArrayRegion(javaValueByteArray, 0, static_cast<jsize>(value.Value().size()),
-                                reinterpret_cast<const jbyte *>(value.Value().data()));
-        javaValue = javaValueByteArray;
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int32_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback::CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterSecurityTypeAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableInt40sAttributeCallback::CHIPTestClusterNullableInt40sAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableInt40sAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -26222,7 +26247,7 @@ CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback::CHIPWiFiNetworkDiagnost
     }
 }
 
-CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback::~CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback()
+CHIPTestClusterNullableInt40sAttributeCallback::~CHIPTestClusterNullableInt40sAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26233,8 +26258,8 @@ CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback::~CHIPWiFiNetworkDiagnos
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::WiFiNetworkDiagnostics::SecurityType> & value)
+void CHIPTestClusterNullableInt40sAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::Nullable<int64_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26242,8 +26267,8 @@ void CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableInt40sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableInt40sAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -26251,7 +26276,7 @@ void CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
@@ -26261,18 +26286,18 @@ void CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback::CallbackFn(
     }
     else
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      static_cast<uint8_t>(value.Value()), javaValue);
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback::CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback(jobject javaCallback,
-                                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterWiFiVersionAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableInt48sAttributeCallback::CHIPTestClusterNullableInt48sAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableInt48sAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -26289,7 +26314,7 @@ CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback::CHIPWiFiNetworkDiagnosti
     }
 }
 
-CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback::~CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback()
+CHIPTestClusterNullableInt48sAttributeCallback::~CHIPTestClusterNullableInt48sAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26300,8 +26325,8 @@ CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback::~CHIPWiFiNetworkDiagnost
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::WiFiNetworkDiagnostics::WiFiVersionType> & value)
+void CHIPTestClusterNullableInt48sAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::Nullable<int64_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26309,8 +26334,8 @@ void CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableInt48sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableInt48sAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -26318,7 +26343,7 @@ void CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
@@ -26328,18 +26353,18 @@ void CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback::CallbackFn(
     }
     else
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      static_cast<uint8_t>(value.Value()), javaValue);
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback::CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterChannelNumberAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableInt56sAttributeCallback::CHIPTestClusterNullableInt56sAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableInt56sAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -26356,7 +26381,7 @@ CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback::CHIPWiFiNetworkDiagnos
     }
 }
 
-CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback::~CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback()
+CHIPTestClusterNullableInt56sAttributeCallback::~CHIPTestClusterNullableInt56sAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26367,8 +26392,8 @@ CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback::~CHIPWiFiNetworkDiagno
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback::CallbackFn(void * context,
-                                                                          const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPTestClusterNullableInt56sAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::Nullable<int64_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26376,8 +26401,8 @@ void CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback::CallbackFn(void *
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableInt56sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableInt56sAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -26385,7 +26410,7 @@ void CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback::CallbackFn(void *
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
@@ -26395,18 +26420,18 @@ void CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback::CallbackFn(void *
     }
     else
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPWiFiNetworkDiagnosticsRssiAttributeCallback::CHIPWiFiNetworkDiagnosticsRssiAttributeCallback(jobject javaCallback,
-                                                                                                 bool keepAlive) :
-    chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterRssiAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableInt64sAttributeCallback::CHIPTestClusterNullableInt64sAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableInt64sAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -26423,7 +26448,7 @@ CHIPWiFiNetworkDiagnosticsRssiAttributeCallback::CHIPWiFiNetworkDiagnosticsRssiA
     }
 }
 
-CHIPWiFiNetworkDiagnosticsRssiAttributeCallback::~CHIPWiFiNetworkDiagnosticsRssiAttributeCallback()
+CHIPTestClusterNullableInt64sAttributeCallback::~CHIPTestClusterNullableInt64sAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26434,8 +26459,8 @@ CHIPWiFiNetworkDiagnosticsRssiAttributeCallback::~CHIPWiFiNetworkDiagnosticsRssi
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPWiFiNetworkDiagnosticsRssiAttributeCallback::CallbackFn(void * context,
-                                                                 const chip::app::DataModel::Nullable<int8_t> & value)
+void CHIPTestClusterNullableInt64sAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::Nullable<int64_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26443,8 +26468,8 @@ void CHIPWiFiNetworkDiagnosticsRssiAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPWiFiNetworkDiagnosticsRssiAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPWiFiNetworkDiagnosticsRssiAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableInt64sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableInt64sAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -26452,7 +26477,7 @@ void CHIPWiFiNetworkDiagnosticsRssiAttributeCallback::CallbackFn(void * context,
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
@@ -26462,19 +26487,17 @@ void CHIPWiFiNetworkDiagnosticsRssiAttributeCallback::CallbackFn(void * context,
     }
     else
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                     value.Value(), javaValue);
+        std::string javaValueClassName     = "java/lang/Long";
+        std::string javaValueCtorSignature = "(J)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<int64_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback::CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPTestClusterNullableEnum8AttributeCallback::CHIPTestClusterNullableEnum8AttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableEnum8AttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26490,7 +26513,7 @@ CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback::CHIPWiFiNetwork
     }
 }
 
-CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback::~CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback()
+CHIPTestClusterNullableEnum8AttributeCallback::~CHIPTestClusterNullableEnum8AttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26501,8 +26524,8 @@ CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback::~CHIPWiFiNetwor
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPTestClusterNullableEnum8AttributeCallback::CallbackFn(void * context,
+                                                               const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26510,9 +26533,8 @@ void CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback::CallbackFn
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableEnum8AttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableEnum8AttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -26520,31 +26542,28 @@ void CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback::CallbackFn
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback::CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableEnum16AttributeCallback::CHIPTestClusterNullableEnum16AttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableEnum16AttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -26561,7 +26580,7 @@ CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback::CHIPWiFiNetworkD
     }
 }
 
-CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback::~CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback()
+CHIPTestClusterNullableEnum16AttributeCallback::~CHIPTestClusterNullableEnum16AttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26572,8 +26591,8 @@ CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback::~CHIPWiFiNetwork
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPTestClusterNullableEnum16AttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26581,9 +26600,8 @@ void CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableEnum16AttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableEnum16AttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -26591,31 +26609,28 @@ void CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Integer";
+        std::string javaValueCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                       value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback::CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableFloatSingleAttributeCallback::CHIPTestClusterNullableFloatSingleAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableFloatSingleAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -26632,7 +26647,7 @@ CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback::CHIPWiFiNetworkDiagnos
     }
 }
 
-CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback::~CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback()
+CHIPTestClusterNullableFloatSingleAttributeCallback::~CHIPTestClusterNullableFloatSingleAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26643,8 +26658,8 @@ CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback::~CHIPWiFiNetworkDiagno
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPTestClusterNullableFloatSingleAttributeCallback::CallbackFn(void * context,
+                                                                     const chip::app::DataModel::Nullable<float> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26652,9 +26667,8 @@ void CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableFloatSingleAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableFloatSingleAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -26662,31 +26676,28 @@ void CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback::CallbackFn(
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Float;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-    jobject arrayListObj;
-    chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
-    auto iter_arrayListObj_0 = list.begin();
-    while (iter_arrayListObj_0.Next())
+    jobject javaValue;
+    if (value.IsNull())
     {
-        auto & entry_0 = iter_arrayListObj_0.GetValue();
-        jobject newElement_0;
-        std::string newElement_0ClassName     = "java/lang/Long";
-        std::string newElement_0CtorSignature = "(J)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
-                                                                       newElement_0CtorSignature.c_str(), entry_0, newElement_0);
-        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+        javaValue = nullptr;
+    }
+    else
+    {
+        std::string javaValueClassName     = "java/lang/Float";
+        std::string javaValueCtorSignature = "(F)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<float>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                    value.Value(), javaValue);
     }
 
-    env->ExceptionClear();
-    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPWindowCoveringCurrentPositionLiftAttributeCallback::CHIPWindowCoveringCurrentPositionLiftAttributeCallback(jobject javaCallback,
-                                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionLiftAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableFloatDoubleAttributeCallback::CHIPTestClusterNullableFloatDoubleAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableFloatDoubleAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -26703,7 +26714,7 @@ CHIPWindowCoveringCurrentPositionLiftAttributeCallback::CHIPWindowCoveringCurren
     }
 }
 
-CHIPWindowCoveringCurrentPositionLiftAttributeCallback::~CHIPWindowCoveringCurrentPositionLiftAttributeCallback()
+CHIPTestClusterNullableFloatDoubleAttributeCallback::~CHIPTestClusterNullableFloatDoubleAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26714,8 +26725,8 @@ CHIPWindowCoveringCurrentPositionLiftAttributeCallback::~CHIPWindowCoveringCurre
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPWindowCoveringCurrentPositionLiftAttributeCallback::CallbackFn(void * context,
-                                                                        const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPTestClusterNullableFloatDoubleAttributeCallback::CallbackFn(void * context,
+                                                                     const chip::app::DataModel::Nullable<double> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26723,8 +26734,8 @@ void CHIPWindowCoveringCurrentPositionLiftAttributeCallback::CallbackFn(void * c
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPWindowCoveringCurrentPositionLiftAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPWindowCoveringCurrentPositionLiftAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableFloatDoubleAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableFloatDoubleAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -26732,7 +26743,7 @@ void CHIPWindowCoveringCurrentPositionLiftAttributeCallback::CallbackFn(void * c
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Double;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
@@ -26742,18 +26753,18 @@ void CHIPWindowCoveringCurrentPositionLiftAttributeCallback::CallbackFn(void * c
     }
     else
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        std::string javaValueClassName     = "java/lang/Double";
+        std::string javaValueCtorSignature = "(D)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<double>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                     value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPWindowCoveringCurrentPositionTiltAttributeCallback::CHIPWindowCoveringCurrentPositionTiltAttributeCallback(jobject javaCallback,
-                                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionTiltAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableOctetStringAttributeCallback::CHIPTestClusterNullableOctetStringAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableOctetStringAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -26770,7 +26781,7 @@ CHIPWindowCoveringCurrentPositionTiltAttributeCallback::CHIPWindowCoveringCurren
     }
 }
 
-CHIPWindowCoveringCurrentPositionTiltAttributeCallback::~CHIPWindowCoveringCurrentPositionTiltAttributeCallback()
+CHIPTestClusterNullableOctetStringAttributeCallback::~CHIPTestClusterNullableOctetStringAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26781,8 +26792,8 @@ CHIPWindowCoveringCurrentPositionTiltAttributeCallback::~CHIPWindowCoveringCurre
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPWindowCoveringCurrentPositionTiltAttributeCallback::CallbackFn(void * context,
-                                                                        const chip::app::DataModel::Nullable<uint16_t> & value)
+void CHIPTestClusterNullableOctetStringAttributeCallback::CallbackFn(void * context,
+                                                                     const chip::app::DataModel::Nullable<chip::ByteSpan> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26790,8 +26801,8 @@ void CHIPWindowCoveringCurrentPositionTiltAttributeCallback::CallbackFn(void * c
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPWindowCoveringCurrentPositionTiltAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPWindowCoveringCurrentPositionTiltAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableOctetStringAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableOctetStringAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -26799,7 +26810,7 @@ void CHIPWindowCoveringCurrentPositionTiltAttributeCallback::CallbackFn(void * c
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
@@ -26809,18 +26820,18 @@ void CHIPWindowCoveringCurrentPositionTiltAttributeCallback::CallbackFn(void * c
     }
     else
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        jbyteArray javaValueByteArray = env->NewByteArray(static_cast<jsize>(value.Value().size()));
+        env->SetByteArrayRegion(javaValueByteArray, 0, static_cast<jsize>(value.Value().size()),
+                                reinterpret_cast<const jbyte *>(value.Value().data()));
+        javaValue = javaValueByteArray;
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback::CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionLiftPercentageAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableCharStringAttributeCallback::CHIPTestClusterNullableCharStringAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableCharStringAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -26837,8 +26848,7 @@ CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback::CHIPWindowCove
     }
 }
 
-CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback::
-    ~CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback()
+CHIPTestClusterNullableCharStringAttributeCallback::~CHIPTestClusterNullableCharStringAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26849,8 +26859,8 @@ CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::Percent> & value)
+void CHIPTestClusterNullableCharStringAttributeCallback::CallbackFn(void * context,
+                                                                    const chip::app::DataModel::Nullable<chip::CharSpan> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26858,8 +26868,8 @@ void CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback::CallbackF
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableCharStringAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableCharStringAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -26867,7 +26877,7 @@ void CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback::CallbackF
                    ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
     jmethodID javaMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+    err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/String;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
@@ -26877,18 +26887,15 @@ void CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback::CallbackF
     }
     else
     {
-        std::string javaValueClassName     = "java/lang/Integer";
-        std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+        javaValue = env->NewStringUTF(std::string(value.Value().data(), value.Value().size()).c_str());
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback::CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionTiltPercentageAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableEnumAttrAttributeCallback::CHIPTestClusterNullableEnumAttrAttributeCallback(jobject javaCallback,
+                                                                                                   bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableEnumAttrAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -26905,8 +26912,7 @@ CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback::CHIPWindowCove
     }
 }
 
-CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback::
-    ~CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback()
+CHIPTestClusterNullableEnumAttrAttributeCallback::~CHIPTestClusterNullableEnumAttrAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26917,8 +26923,8 @@ CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::Percent> & value)
+void CHIPTestClusterNullableEnumAttrAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26926,8 +26932,8 @@ void CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback::CallbackF
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableEnumAttrAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableEnumAttrAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -26948,15 +26954,15 @@ void CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback::CallbackF
         std::string javaValueClassName     = "java/lang/Integer";
         std::string javaValueCtorSignature = "(I)V";
         chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                      value.Value(), javaValue);
+                                                                      static_cast<uint8_t>(value.Value()), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback::
-    CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPWindowCoveringClusterTargetPositionLiftPercent100thsAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback::CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableRangeRestrictedInt8uAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -26973,8 +26979,7 @@ CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback::
     }
 }
 
-CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback::
-    ~CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback()
+CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback::~CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26985,8 +26990,8 @@ CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::Percent100ths> & value)
+void CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback::CallbackFn(void * context,
+                                                                              const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26994,8 +26999,8 @@ void CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback::Callbac
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -27015,16 +27020,16 @@ void CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback::Callbac
     {
         std::string javaValueClassName     = "java/lang/Integer";
         std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback::
-    CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPWindowCoveringClusterTargetPositionTiltPercent100thsAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback::CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableRangeRestrictedInt8sAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -27041,8 +27046,7 @@ CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback::
     }
 }
 
-CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback::
-    ~CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback()
+CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback::~CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -27053,8 +27057,8 @@ CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::Percent100ths> & value)
+void CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback::CallbackFn(void * context,
+                                                                              const chip::app::DataModel::Nullable<int8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -27062,8 +27066,8 @@ void CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback::Callbac
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -27083,16 +27087,16 @@ void CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback::Callbac
     {
         std::string javaValueClassName     = "java/lang/Integer";
         std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        chip::JniReferences::GetInstance().CreateBoxedObject<int8_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                     value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback::
-    CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionLiftPercent100thsAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback::CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableRangeRestrictedInt16uAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -27109,8 +27113,7 @@ CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback::
     }
 }
 
-CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback::
-    ~CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback()
+CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback::~CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -27121,8 +27124,8 @@ CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::Percent100ths> & value)
+void CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -27130,8 +27133,8 @@ void CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback::Callba
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -27158,9 +27161,9 @@ void CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback::Callba
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback::
-    CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionTiltPercent100thsAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback::CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterNullableRangeRestrictedInt16sAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -27177,8 +27180,7 @@ CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback::
     }
 }
 
-CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback::
-    ~CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback()
+CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback::~CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -27189,8 +27191,8 @@ CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback::
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::Percent100ths> & value)
+void CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -27198,8 +27200,8 @@ void CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback::Callba
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -27219,16 +27221,16 @@ void CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback::Callba
     {
         std::string javaValueClassName     = "java/lang/Integer";
         std::string javaValueCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
-                                                                       value.Value(), javaValue);
+        chip::JniReferences::GetInstance().CreateBoxedObject<int16_t>(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+                                                                      value.Value(), javaValue);
     }
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPWindowCoveringGeneratedCommandListAttributeCallback::CHIPWindowCoveringGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPWindowCoveringClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterGeneratedCommandListAttributeCallback::CHIPTestClusterGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -27245,7 +27247,7 @@ CHIPWindowCoveringGeneratedCommandListAttributeCallback::CHIPWindowCoveringGener
     }
 }
 
-CHIPWindowCoveringGeneratedCommandListAttributeCallback::~CHIPWindowCoveringGeneratedCommandListAttributeCallback()
+CHIPTestClusterGeneratedCommandListAttributeCallback::~CHIPTestClusterGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -27256,7 +27258,7 @@ CHIPWindowCoveringGeneratedCommandListAttributeCallback::~CHIPWindowCoveringGene
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPWindowCoveringGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPTestClusterGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -27266,8 +27268,8 @@ void CHIPWindowCoveringGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPWindowCoveringGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPWindowCoveringGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -27297,9 +27299,9 @@ void CHIPWindowCoveringGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPWindowCoveringAcceptedCommandListAttributeCallback::CHIPWindowCoveringAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPWindowCoveringClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPTestClusterAcceptedCommandListAttributeCallback::CHIPTestClusterAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -27316,7 +27318,7 @@ CHIPWindowCoveringAcceptedCommandListAttributeCallback::CHIPWindowCoveringAccept
     }
 }
 
-CHIPWindowCoveringAcceptedCommandListAttributeCallback::~CHIPWindowCoveringAcceptedCommandListAttributeCallback()
+CHIPTestClusterAcceptedCommandListAttributeCallback::~CHIPTestClusterAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -27327,7 +27329,7 @@ CHIPWindowCoveringAcceptedCommandListAttributeCallback::~CHIPWindowCoveringAccep
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPWindowCoveringAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPTestClusterAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -27337,8 +27339,8 @@ void CHIPWindowCoveringAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPWindowCoveringAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPWindowCoveringAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -27368,10 +27370,8 @@ void CHIPWindowCoveringAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPWindowCoveringAttributeListAttributeCallback::CHIPWindowCoveringAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                   bool keepAlive) :
-    chip::Callback::Callback<CHIPWindowCoveringClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPTestClusterAttributeListAttributeCallback::CHIPTestClusterAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTestClusterClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -27387,7 +27387,7 @@ CHIPWindowCoveringAttributeListAttributeCallback::CHIPWindowCoveringAttributeLis
     }
 }
 
-CHIPWindowCoveringAttributeListAttributeCallback::~CHIPWindowCoveringAttributeListAttributeCallback()
+CHIPTestClusterAttributeListAttributeCallback::~CHIPTestClusterAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -27398,8 +27398,8 @@ CHIPWindowCoveringAttributeListAttributeCallback::~CHIPWindowCoveringAttributeLi
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPWindowCoveringAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPTestClusterAttributeListAttributeCallback::CallbackFn(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -27408,8 +27408,8 @@ void CHIPWindowCoveringAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPWindowCoveringAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPWindowCoveringAttributeListAttributeCallback *>(context), maybeDestroy);
+    std::unique_ptr<CHIPTestClusterAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPTestClusterAttributeListAttributeCallback *>(context), maybeDestroy);
 
     // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
     javaCallbackRef = cppCallback.get()->javaCallbackRef;
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.h b/src/controller/java/zap-generated/CHIPReadCallbacks.h
index 47cdbfab4e3917..073e75f478ad15 100644
--- a/src/controller/java/zap-generated/CHIPReadCallbacks.h
+++ b/src/controller/java/zap-generated/CHIPReadCallbacks.h
@@ -389,30 +389,28 @@ class CHIPOctetStringAttributeCallback : public chip::Callback::Callback<OctetSt
     bool keepAlive;
 };
 
-class CHIPAccessControlAclAttributeCallback : public chip::Callback::Callback<CHIPAccessControlClusterAclAttributeCallbackType>
+class CHIPIdentifyGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPIdentifyClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPAccessControlAclAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPIdentifyGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPAccessControlAclAttributeCallback();
+    ~CHIPIdentifyGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPAccessControlAclAttributeCallback * callback)
+    static void maybeDestroy(CHIPIdentifyGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPAccessControlAclAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPIdentifyGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::DecodableType> &
-            list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPAccessControlAclAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPIdentifyGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -421,31 +419,28 @@ class CHIPAccessControlAclAttributeCallback : public chip::Callback::Callback<CH
     bool keepAlive;
 };
 
-class CHIPAccessControlExtensionAttributeCallback
-    : public chip::Callback::Callback<CHIPAccessControlClusterExtensionAttributeCallbackType>
+class CHIPIdentifyAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPIdentifyClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPAccessControlExtensionAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPIdentifyAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPAccessControlExtensionAttributeCallback();
+    ~CHIPIdentifyAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPAccessControlExtensionAttributeCallback * callback)
+    static void maybeDestroy(CHIPIdentifyAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPAccessControlExtensionAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPIdentifyAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::ExtensionEntry::DecodableType> &
-            list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPAccessControlExtensionAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPIdentifyAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -454,28 +449,28 @@ class CHIPAccessControlExtensionAttributeCallback
     bool keepAlive;
 };
 
-class CHIPAccessControlGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPAccessControlClusterGeneratedCommandListAttributeCallbackType>
+class CHIPIdentifyAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPIdentifyClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPAccessControlGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPIdentifyAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPAccessControlGeneratedCommandListAttributeCallback();
+    ~CHIPIdentifyAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPAccessControlGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPIdentifyAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPAccessControlGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPIdentifyAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPAccessControlGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPIdentifyAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -484,20 +479,20 @@ class CHIPAccessControlGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPAccessControlAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPAccessControlClusterAcceptedCommandListAttributeCallbackType>
+class CHIPGroupsGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPGroupsClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPAccessControlAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPGroupsGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPAccessControlAcceptedCommandListAttributeCallback();
+    ~CHIPGroupsGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPAccessControlAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPGroupsGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPAccessControlAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPGroupsGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -505,7 +500,7 @@ class CHIPAccessControlAcceptedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPAccessControlAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPGroupsGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -514,28 +509,28 @@ class CHIPAccessControlAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPAccessControlAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPAccessControlClusterAttributeListAttributeCallbackType>
+class CHIPGroupsAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPGroupsClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPAccessControlAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPGroupsAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPAccessControlAttributeListAttributeCallback();
+    ~CHIPGroupsAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPAccessControlAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPGroupsAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPAccessControlAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPGroupsAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPAccessControlAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPGroupsAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -544,28 +539,28 @@ class CHIPAccessControlAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPAccountLoginGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPAccountLoginClusterGeneratedCommandListAttributeCallbackType>
+class CHIPGroupsAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPGroupsClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPAccountLoginGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPGroupsAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPAccountLoginGeneratedCommandListAttributeCallback();
+    ~CHIPGroupsAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPAccountLoginGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPGroupsAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPAccountLoginGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPGroupsAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPAccountLoginGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPGroupsAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -574,28 +569,27 @@ class CHIPAccountLoginGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPAccountLoginAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPAccountLoginClusterAcceptedCommandListAttributeCallbackType>
+class CHIPScenesCurrentGroupAttributeCallback : public chip::Callback::Callback<CHIPScenesClusterCurrentGroupAttributeCallbackType>
 {
 public:
-    CHIPAccountLoginAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPScenesCurrentGroupAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPAccountLoginAcceptedCommandListAttributeCallback();
+    ~CHIPScenesCurrentGroupAttributeCallback();
 
-    static void maybeDestroy(CHIPAccountLoginAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPScenesCurrentGroupAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPAccountLoginAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPScenesCurrentGroupAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, chip::GroupId value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPAccountLoginAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPScenesCurrentGroupAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -604,28 +598,28 @@ class CHIPAccountLoginAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPAccountLoginAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPAccountLoginClusterAttributeListAttributeCallbackType>
+class CHIPScenesGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPScenesClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPAccountLoginAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPScenesGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPAccountLoginAttributeListAttributeCallback();
+    ~CHIPScenesGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPAccountLoginAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPScenesGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPAccountLoginAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPScenesGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPAccountLoginAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPScenesGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -634,28 +628,28 @@ class CHIPAccountLoginAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback
-    : public chip::Callback::Callback<CHIPAdministratorCommissioningClusterAdminFabricIndexAttributeCallbackType>
+class CHIPScenesAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPScenesClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPScenesAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback();
+    ~CHIPScenesAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback * callback)
+    static void maybeDestroy(CHIPScenesAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPScenesAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, chip::FabricIndex value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPScenesAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -664,28 +658,28 @@ class CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback
     bool keepAlive;
 };
 
-class CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPAdministratorCommissioningClusterGeneratedCommandListAttributeCallbackType>
+class CHIPScenesAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPScenesClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPScenesAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback();
+    ~CHIPScenesAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPScenesAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPScenesAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPScenesAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -694,28 +688,28 @@ class CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPAdministratorCommissioningClusterAcceptedCommandListAttributeCallbackType>
+class CHIPOnOffStartUpOnOffAttributeCallback : public chip::Callback::Callback<CHIPOnOffClusterStartUpOnOffAttributeCallbackType>
 {
 public:
-    CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPOnOffStartUpOnOffAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback();
+    ~CHIPOnOffStartUpOnOffAttributeCallback();
 
-    static void maybeDestroy(CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPOnOffStartUpOnOffAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPOnOffStartUpOnOffAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context,
+                           const chip::app::DataModel::Nullable<chip::app::Clusters::OnOff::OnOffStartUpOnOff> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPOnOffStartUpOnOffAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -724,28 +718,28 @@ class CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPAdministratorCommissioningAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPAdministratorCommissioningClusterAttributeListAttributeCallbackType>
+class CHIPOnOffGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPOnOffClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPAdministratorCommissioningAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPOnOffGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPAdministratorCommissioningAttributeListAttributeCallback();
+    ~CHIPOnOffGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPAdministratorCommissioningAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPOnOffGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPAdministratorCommissioningAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPOnOffGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPAdministratorCommissioningAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPOnOffGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -754,28 +748,28 @@ class CHIPAdministratorCommissioningAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPApplicationBasicAllowedVendorListAttributeCallback
-    : public chip::Callback::Callback<CHIPApplicationBasicClusterAllowedVendorListAttributeCallbackType>
+class CHIPOnOffAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPOnOffClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPApplicationBasicAllowedVendorListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPOnOffAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPApplicationBasicAllowedVendorListAttributeCallback();
+    ~CHIPOnOffAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPApplicationBasicAllowedVendorListAttributeCallback * callback)
+    static void maybeDestroy(CHIPOnOffAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPApplicationBasicAllowedVendorListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPOnOffAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::VendorId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPApplicationBasicAllowedVendorListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPOnOffAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -784,28 +778,27 @@ class CHIPApplicationBasicAllowedVendorListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPApplicationBasicGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPApplicationBasicClusterGeneratedCommandListAttributeCallbackType>
+class CHIPOnOffAttributeListAttributeCallback : public chip::Callback::Callback<CHIPOnOffClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPApplicationBasicGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPOnOffAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPApplicationBasicGeneratedCommandListAttributeCallback();
+    ~CHIPOnOffAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPApplicationBasicGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPOnOffAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPApplicationBasicGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPOnOffAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPApplicationBasicGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPOnOffAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -814,20 +807,20 @@ class CHIPApplicationBasicGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPApplicationBasicAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPApplicationBasicClusterAcceptedCommandListAttributeCallbackType>
+class CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPOnOffSwitchConfigurationClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPApplicationBasicAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPApplicationBasicAcceptedCommandListAttributeCallback();
+    ~CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPApplicationBasicAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPApplicationBasicAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -835,7 +828,7 @@ class CHIPApplicationBasicAcceptedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPApplicationBasicAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -844,28 +837,28 @@ class CHIPApplicationBasicAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPApplicationBasicAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPApplicationBasicClusterAttributeListAttributeCallbackType>
+class CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPOnOffSwitchConfigurationClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPApplicationBasicAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPApplicationBasicAttributeListAttributeCallback();
+    ~CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPApplicationBasicAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPApplicationBasicAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPApplicationBasicAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -874,28 +867,28 @@ class CHIPApplicationBasicAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPApplicationLauncherCatalogListAttributeCallback
-    : public chip::Callback::Callback<CHIPApplicationLauncherClusterCatalogListAttributeCallbackType>
+class CHIPOnOffSwitchConfigurationAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPOnOffSwitchConfigurationClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPApplicationLauncherCatalogListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPOnOffSwitchConfigurationAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPApplicationLauncherCatalogListAttributeCallback();
+    ~CHIPOnOffSwitchConfigurationAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPApplicationLauncherCatalogListAttributeCallback * callback)
+    static void maybeDestroy(CHIPOnOffSwitchConfigurationAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPApplicationLauncherCatalogListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPOnOffSwitchConfigurationAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint16_t> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPApplicationLauncherCatalogListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPOnOffSwitchConfigurationAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -904,28 +897,28 @@ class CHIPApplicationLauncherCatalogListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPApplicationLauncherGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPApplicationLauncherClusterGeneratedCommandListAttributeCallbackType>
+class CHIPLevelControlOnLevelAttributeCallback
+    : public chip::Callback::Callback<CHIPLevelControlClusterOnLevelAttributeCallbackType>
 {
 public:
-    CHIPApplicationLauncherGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPLevelControlOnLevelAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPApplicationLauncherGeneratedCommandListAttributeCallback();
+    ~CHIPLevelControlOnLevelAttributeCallback();
 
-    static void maybeDestroy(CHIPApplicationLauncherGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPLevelControlOnLevelAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPApplicationLauncherGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPLevelControlOnLevelAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPApplicationLauncherGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPLevelControlOnLevelAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -934,28 +927,28 @@ class CHIPApplicationLauncherGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPApplicationLauncherAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPApplicationLauncherClusterAcceptedCommandListAttributeCallbackType>
+class CHIPLevelControlOnTransitionTimeAttributeCallback
+    : public chip::Callback::Callback<CHIPLevelControlClusterOnTransitionTimeAttributeCallbackType>
 {
 public:
-    CHIPApplicationLauncherAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPLevelControlOnTransitionTimeAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPApplicationLauncherAcceptedCommandListAttributeCallback();
+    ~CHIPLevelControlOnTransitionTimeAttributeCallback();
 
-    static void maybeDestroy(CHIPApplicationLauncherAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPLevelControlOnTransitionTimeAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPApplicationLauncherAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPLevelControlOnTransitionTimeAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPApplicationLauncherAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPLevelControlOnTransitionTimeAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -964,28 +957,28 @@ class CHIPApplicationLauncherAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPApplicationLauncherAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPApplicationLauncherClusterAttributeListAttributeCallbackType>
+class CHIPLevelControlOffTransitionTimeAttributeCallback
+    : public chip::Callback::Callback<CHIPLevelControlClusterOffTransitionTimeAttributeCallbackType>
 {
 public:
-    CHIPApplicationLauncherAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPLevelControlOffTransitionTimeAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPApplicationLauncherAttributeListAttributeCallback();
+    ~CHIPLevelControlOffTransitionTimeAttributeCallback();
 
-    static void maybeDestroy(CHIPApplicationLauncherAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPLevelControlOffTransitionTimeAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPApplicationLauncherAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPLevelControlOffTransitionTimeAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPApplicationLauncherAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPLevelControlOffTransitionTimeAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -994,30 +987,28 @@ class CHIPApplicationLauncherAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPAudioOutputOutputListAttributeCallback
-    : public chip::Callback::Callback<CHIPAudioOutputClusterOutputListAttributeCallbackType>
+class CHIPLevelControlDefaultMoveRateAttributeCallback
+    : public chip::Callback::Callback<CHIPLevelControlClusterDefaultMoveRateAttributeCallbackType>
 {
 public:
-    CHIPAudioOutputOutputListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPLevelControlDefaultMoveRateAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPAudioOutputOutputListAttributeCallback();
+    ~CHIPLevelControlDefaultMoveRateAttributeCallback();
 
-    static void maybeDestroy(CHIPAudioOutputOutputListAttributeCallback * callback)
+    static void maybeDestroy(CHIPLevelControlDefaultMoveRateAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPAudioOutputOutputListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPLevelControlDefaultMoveRateAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::OutputInfo::DecodableType> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPAudioOutputOutputListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPLevelControlDefaultMoveRateAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -1026,28 +1017,28 @@ class CHIPAudioOutputOutputListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPAudioOutputGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPAudioOutputClusterGeneratedCommandListAttributeCallbackType>
+class CHIPLevelControlStartUpCurrentLevelAttributeCallback
+    : public chip::Callback::Callback<CHIPLevelControlClusterStartUpCurrentLevelAttributeCallbackType>
 {
 public:
-    CHIPAudioOutputGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPLevelControlStartUpCurrentLevelAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPAudioOutputGeneratedCommandListAttributeCallback();
+    ~CHIPLevelControlStartUpCurrentLevelAttributeCallback();
 
-    static void maybeDestroy(CHIPAudioOutputGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPLevelControlStartUpCurrentLevelAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPAudioOutputGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPLevelControlStartUpCurrentLevelAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPAudioOutputGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPLevelControlStartUpCurrentLevelAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -1056,20 +1047,20 @@ class CHIPAudioOutputGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPAudioOutputAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPAudioOutputClusterAcceptedCommandListAttributeCallbackType>
+class CHIPLevelControlGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPLevelControlClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPAudioOutputAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPLevelControlGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPAudioOutputAcceptedCommandListAttributeCallback();
+    ~CHIPLevelControlGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPAudioOutputAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPLevelControlGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPAudioOutputAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPLevelControlGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -1077,7 +1068,7 @@ class CHIPAudioOutputAcceptedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPAudioOutputAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPLevelControlGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -1086,28 +1077,28 @@ class CHIPAudioOutputAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPAudioOutputAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPAudioOutputClusterAttributeListAttributeCallbackType>
+class CHIPLevelControlAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPLevelControlClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPAudioOutputAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPLevelControlAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPAudioOutputAttributeListAttributeCallback();
+    ~CHIPLevelControlAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPAudioOutputAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPLevelControlAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPAudioOutputAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPLevelControlAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPAudioOutputAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPLevelControlAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -1116,28 +1107,28 @@ class CHIPAudioOutputAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPBarrierControlGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPBarrierControlClusterGeneratedCommandListAttributeCallbackType>
+class CHIPLevelControlAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPLevelControlClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPBarrierControlGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPLevelControlAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPBarrierControlGeneratedCommandListAttributeCallback();
+    ~CHIPLevelControlAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPBarrierControlGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPLevelControlAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPBarrierControlGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPLevelControlAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPBarrierControlGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPLevelControlAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -1146,20 +1137,20 @@ class CHIPBarrierControlGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPBarrierControlAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPBarrierControlClusterAcceptedCommandListAttributeCallbackType>
+class CHIPBinaryInputBasicGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPBinaryInputBasicClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPBarrierControlAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPBinaryInputBasicGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPBarrierControlAcceptedCommandListAttributeCallback();
+    ~CHIPBinaryInputBasicGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPBarrierControlAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPBinaryInputBasicGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPBarrierControlAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPBinaryInputBasicGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -1167,7 +1158,7 @@ class CHIPBarrierControlAcceptedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPBarrierControlAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPBinaryInputBasicGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -1176,28 +1167,28 @@ class CHIPBarrierControlAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPBarrierControlAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPBarrierControlClusterAttributeListAttributeCallbackType>
+class CHIPBinaryInputBasicAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPBinaryInputBasicClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPBarrierControlAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPBinaryInputBasicAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPBarrierControlAttributeListAttributeCallback();
+    ~CHIPBinaryInputBasicAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPBarrierControlAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPBinaryInputBasicAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPBarrierControlAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPBinaryInputBasicAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPBarrierControlAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPBinaryInputBasicAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -1206,27 +1197,28 @@ class CHIPBarrierControlAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPBasicVendorIDAttributeCallback : public chip::Callback::Callback<CHIPBasicClusterVendorIDAttributeCallbackType>
+class CHIPBinaryInputBasicAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPBinaryInputBasicClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPBasicVendorIDAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPBinaryInputBasicAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPBasicVendorIDAttributeCallback();
+    ~CHIPBinaryInputBasicAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPBasicVendorIDAttributeCallback * callback)
+    static void maybeDestroy(CHIPBinaryInputBasicAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPBasicVendorIDAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPBinaryInputBasicAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, chip::VendorId value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPBasicVendorIDAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPBinaryInputBasicAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -1235,28 +1227,30 @@ class CHIPBasicVendorIDAttributeCallback : public chip::Callback::Callback<CHIPB
     bool keepAlive;
 };
 
-class CHIPBasicGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPBasicClusterGeneratedCommandListAttributeCallbackType>
+class CHIPDescriptorDeviceListAttributeCallback
+    : public chip::Callback::Callback<CHIPDescriptorClusterDeviceListAttributeCallbackType>
 {
 public:
-    CHIPBasicGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPDescriptorDeviceListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPBasicGeneratedCommandListAttributeCallback();
+    ~CHIPDescriptorDeviceListAttributeCallback();
 
-    static void maybeDestroy(CHIPBasicGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPDescriptorDeviceListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPBasicGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPDescriptorDeviceListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::DeviceType::DecodableType> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPBasicGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPDescriptorDeviceListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -1265,28 +1259,28 @@ class CHIPBasicGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPBasicAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPBasicClusterAcceptedCommandListAttributeCallbackType>
+class CHIPDescriptorServerListAttributeCallback
+    : public chip::Callback::Callback<CHIPDescriptorClusterServerListAttributeCallbackType>
 {
 public:
-    CHIPBasicAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPDescriptorServerListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPBasicAcceptedCommandListAttributeCallback();
+    ~CHIPDescriptorServerListAttributeCallback();
 
-    static void maybeDestroy(CHIPBasicAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPDescriptorServerListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPBasicAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPDescriptorServerListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ClusterId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPBasicAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPDescriptorServerListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -1295,27 +1289,28 @@ class CHIPBasicAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPBasicAttributeListAttributeCallback : public chip::Callback::Callback<CHIPBasicClusterAttributeListAttributeCallbackType>
+class CHIPDescriptorClientListAttributeCallback
+    : public chip::Callback::Callback<CHIPDescriptorClusterClientListAttributeCallbackType>
 {
 public:
-    CHIPBasicAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPDescriptorClientListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPBasicAttributeListAttributeCallback();
+    ~CHIPDescriptorClientListAttributeCallback();
 
-    static void maybeDestroy(CHIPBasicAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPDescriptorClientListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPBasicAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPDescriptorClientListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ClusterId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPBasicAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPDescriptorClientListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -1324,28 +1319,28 @@ class CHIPBasicAttributeListAttributeCallback : public chip::Callback::Callback<
     bool keepAlive;
 };
 
-class CHIPBinaryInputBasicGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPBinaryInputBasicClusterGeneratedCommandListAttributeCallbackType>
+class CHIPDescriptorPartsListAttributeCallback
+    : public chip::Callback::Callback<CHIPDescriptorClusterPartsListAttributeCallbackType>
 {
 public:
-    CHIPBinaryInputBasicGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPDescriptorPartsListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPBinaryInputBasicGeneratedCommandListAttributeCallback();
+    ~CHIPDescriptorPartsListAttributeCallback();
 
-    static void maybeDestroy(CHIPBinaryInputBasicGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPDescriptorPartsListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPBinaryInputBasicGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPDescriptorPartsListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::EndpointId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPBinaryInputBasicGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPDescriptorPartsListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -1354,20 +1349,20 @@ class CHIPBinaryInputBasicGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPBinaryInputBasicAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPBinaryInputBasicClusterAcceptedCommandListAttributeCallbackType>
-{
+class CHIPDescriptorGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPDescriptorClusterGeneratedCommandListAttributeCallbackType>
+{
 public:
-    CHIPBinaryInputBasicAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPDescriptorGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPBinaryInputBasicAcceptedCommandListAttributeCallback();
+    ~CHIPDescriptorGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPBinaryInputBasicAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPDescriptorGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPBinaryInputBasicAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPDescriptorGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -1375,7 +1370,7 @@ class CHIPBinaryInputBasicAcceptedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPBinaryInputBasicAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPDescriptorGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -1384,20 +1379,50 @@ class CHIPBinaryInputBasicAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPBinaryInputBasicAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPBinaryInputBasicClusterAttributeListAttributeCallbackType>
+class CHIPDescriptorAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPDescriptorClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPBinaryInputBasicAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPDescriptorAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPBinaryInputBasicAttributeListAttributeCallback();
+    ~CHIPDescriptorAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPBinaryInputBasicAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPDescriptorAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPBinaryInputBasicAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPDescriptorAcceptedCommandListAttributeCallback>(callback);
+        }
+    }
+
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void OnSubscriptionEstablished(void * context)
+    {
+        CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
+            reinterpret_cast<CHIPDescriptorAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
+    };
+
+private:
+    jobject javaCallbackRef;
+    bool keepAlive;
+};
+
+class CHIPDescriptorAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPDescriptorClusterAttributeListAttributeCallbackType>
+{
+public:
+    CHIPDescriptorAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+
+    ~CHIPDescriptorAttributeListAttributeCallback();
+
+    static void maybeDestroy(CHIPDescriptorAttributeListAttributeCallback * callback)
+    {
+        if (!callback->keepAlive)
+        {
+            callback->Cancel();
+            chip::Platform::Delete<CHIPDescriptorAttributeListAttributeCallback>(callback);
         }
     }
 
@@ -1405,7 +1430,7 @@ class CHIPBinaryInputBasicAttributeListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPBinaryInputBasicAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPDescriptorAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -1535,20 +1560,85 @@ class CHIPBindingAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPBooleanStateGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPBooleanStateClusterGeneratedCommandListAttributeCallbackType>
+class CHIPAccessControlAclAttributeCallback : public chip::Callback::Callback<CHIPAccessControlClusterAclAttributeCallbackType>
 {
 public:
-    CHIPBooleanStateGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPAccessControlAclAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPBooleanStateGeneratedCommandListAttributeCallback();
+    ~CHIPAccessControlAclAttributeCallback();
 
-    static void maybeDestroy(CHIPBooleanStateGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPAccessControlAclAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPBooleanStateGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPAccessControlAclAttributeCallback>(callback);
+        }
+    }
+
+    static void CallbackFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::DecodableType> &
+            list);
+    static void OnSubscriptionEstablished(void * context)
+    {
+        CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
+            reinterpret_cast<CHIPAccessControlAclAttributeCallback *>(context)->javaCallbackRef);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
+    };
+
+private:
+    jobject javaCallbackRef;
+    bool keepAlive;
+};
+
+class CHIPAccessControlExtensionAttributeCallback
+    : public chip::Callback::Callback<CHIPAccessControlClusterExtensionAttributeCallbackType>
+{
+public:
+    CHIPAccessControlExtensionAttributeCallback(jobject javaCallback, bool keepAlive = false);
+
+    ~CHIPAccessControlExtensionAttributeCallback();
+
+    static void maybeDestroy(CHIPAccessControlExtensionAttributeCallback * callback)
+    {
+        if (!callback->keepAlive)
+        {
+            callback->Cancel();
+            chip::Platform::Delete<CHIPAccessControlExtensionAttributeCallback>(callback);
+        }
+    }
+
+    static void CallbackFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::ExtensionEntry::DecodableType> &
+            list);
+    static void OnSubscriptionEstablished(void * context)
+    {
+        CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
+            reinterpret_cast<CHIPAccessControlExtensionAttributeCallback *>(context)->javaCallbackRef);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
+    };
+
+private:
+    jobject javaCallbackRef;
+    bool keepAlive;
+};
+
+class CHIPAccessControlGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPAccessControlClusterGeneratedCommandListAttributeCallbackType>
+{
+public:
+    CHIPAccessControlGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+
+    ~CHIPAccessControlGeneratedCommandListAttributeCallback();
+
+    static void maybeDestroy(CHIPAccessControlGeneratedCommandListAttributeCallback * callback)
+    {
+        if (!callback->keepAlive)
+        {
+            callback->Cancel();
+            chip::Platform::Delete<CHIPAccessControlGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -1556,7 +1646,7 @@ class CHIPBooleanStateGeneratedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPBooleanStateGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPAccessControlGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -1565,20 +1655,20 @@ class CHIPBooleanStateGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPBooleanStateAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPBooleanStateClusterAcceptedCommandListAttributeCallbackType>
+class CHIPAccessControlAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPAccessControlClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPBooleanStateAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPAccessControlAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPBooleanStateAcceptedCommandListAttributeCallback();
+    ~CHIPAccessControlAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPBooleanStateAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPAccessControlAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPBooleanStateAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPAccessControlAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -1586,7 +1676,7 @@ class CHIPBooleanStateAcceptedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPBooleanStateAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPAccessControlAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -1595,20 +1685,20 @@ class CHIPBooleanStateAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPBooleanStateAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPBooleanStateClusterAttributeListAttributeCallbackType>
+class CHIPAccessControlAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPAccessControlClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPBooleanStateAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPAccessControlAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPBooleanStateAttributeListAttributeCallback();
+    ~CHIPAccessControlAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPBooleanStateAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPAccessControlAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPBooleanStateAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPAccessControlAttributeListAttributeCallback>(callback);
         }
     }
 
@@ -1616,7 +1706,7 @@ class CHIPBooleanStateAttributeListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPBooleanStateAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPAccessControlAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -1781,20 +1871,19 @@ class CHIPBridgedActionsAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPBridgedDeviceBasicVendorIDAttributeCallback
-    : public chip::Callback::Callback<CHIPBridgedDeviceBasicClusterVendorIDAttributeCallbackType>
+class CHIPBasicVendorIDAttributeCallback : public chip::Callback::Callback<CHIPBasicClusterVendorIDAttributeCallbackType>
 {
 public:
-    CHIPBridgedDeviceBasicVendorIDAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPBasicVendorIDAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPBridgedDeviceBasicVendorIDAttributeCallback();
+    ~CHIPBasicVendorIDAttributeCallback();
 
-    static void maybeDestroy(CHIPBridgedDeviceBasicVendorIDAttributeCallback * callback)
+    static void maybeDestroy(CHIPBasicVendorIDAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPBridgedDeviceBasicVendorIDAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPBasicVendorIDAttributeCallback>(callback);
         }
     }
 
@@ -1802,7 +1891,7 @@ class CHIPBridgedDeviceBasicVendorIDAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPBridgedDeviceBasicVendorIDAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPBasicVendorIDAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -1811,20 +1900,20 @@ class CHIPBridgedDeviceBasicVendorIDAttributeCallback
     bool keepAlive;
 };
 
-class CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPBridgedDeviceBasicClusterGeneratedCommandListAttributeCallbackType>
+class CHIPBasicGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPBasicClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPBasicGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback();
+    ~CHIPBasicGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPBasicGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPBasicGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -1832,7 +1921,7 @@ class CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPBasicGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -1841,20 +1930,20 @@ class CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPBridgedDeviceBasicClusterAcceptedCommandListAttributeCallbackType>
+class CHIPBasicAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPBasicClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPBasicAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback();
+    ~CHIPBasicAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPBasicAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPBasicAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -1862,7 +1951,7 @@ class CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPBasicAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -1871,20 +1960,19 @@ class CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPBridgedDeviceBasicAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPBridgedDeviceBasicClusterAttributeListAttributeCallbackType>
+class CHIPBasicAttributeListAttributeCallback : public chip::Callback::Callback<CHIPBasicClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPBridgedDeviceBasicAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPBasicAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPBridgedDeviceBasicAttributeListAttributeCallback();
+    ~CHIPBasicAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPBridgedDeviceBasicAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPBasicAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPBridgedDeviceBasicAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPBasicAttributeListAttributeCallback>(callback);
         }
     }
 
@@ -1892,7 +1980,7 @@ class CHIPBridgedDeviceBasicAttributeListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPBridgedDeviceBasicAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPBasicAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -1901,29 +1989,28 @@ class CHIPBridgedDeviceBasicAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPChannelChannelListAttributeCallback : public chip::Callback::Callback<CHIPChannelClusterChannelListAttributeCallbackType>
+class CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPOtaSoftwareUpdateProviderClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPChannelChannelListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPChannelChannelListAttributeCallback();
+    ~CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPChannelChannelListAttributeCallback * callback)
+    static void maybeDestroy(CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPChannelChannelListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void
-    CallbackFn(void * context,
-               const chip::app::DataModel::DecodableList<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPChannelChannelListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -1932,28 +2019,30 @@ class CHIPChannelChannelListAttributeCallback : public chip::Callback::Callback<
     bool keepAlive;
 };
 
-class CHIPChannelGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPChannelClusterGeneratedCommandListAttributeCallbackType>
+class CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback
+    : public chip::Callback::Callback<CHIPOtaSoftwareUpdateRequestorClusterDefaultOtaProvidersAttributeCallbackType>
 {
 public:
-    CHIPChannelGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPChannelGeneratedCommandListAttributeCallback();
+    ~CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback();
 
-    static void maybeDestroy(CHIPChannelGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPChannelGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context,
+                           const chip::app::DataModel::DecodableList<
+                               chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPChannelGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -1962,28 +2051,28 @@ class CHIPChannelGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPChannelAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPChannelClusterAcceptedCommandListAttributeCallbackType>
-{
+class CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback
+    : public chip::Callback::Callback<CHIPOtaSoftwareUpdateRequestorClusterUpdateStateProgressAttributeCallbackType>
+{
 public:
-    CHIPChannelAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPChannelAcceptedCommandListAttributeCallback();
+    ~CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback();
 
-    static void maybeDestroy(CHIPChannelAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPChannelAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPChannelAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -1992,20 +2081,20 @@ class CHIPChannelAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPChannelAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPChannelClusterAttributeListAttributeCallbackType>
+class CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPOtaSoftwareUpdateRequestorClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPChannelAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPChannelAttributeListAttributeCallback();
+    ~CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPChannelAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPChannelAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback>(callback);
         }
     }
 
@@ -2013,7 +2102,7 @@ class CHIPChannelAttributeListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPChannelAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2022,28 +2111,28 @@ class CHIPChannelAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPColorControlNumberOfPrimariesAttributeCallback
-    : public chip::Callback::Callback<CHIPColorControlClusterNumberOfPrimariesAttributeCallbackType>
+class CHIPLocalizationConfigurationSupportedLocalesAttributeCallback
+    : public chip::Callback::Callback<CHIPLocalizationConfigurationClusterSupportedLocalesAttributeCallbackType>
 {
 public:
-    CHIPColorControlNumberOfPrimariesAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPLocalizationConfigurationSupportedLocalesAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPColorControlNumberOfPrimariesAttributeCallback();
+    ~CHIPLocalizationConfigurationSupportedLocalesAttributeCallback();
 
-    static void maybeDestroy(CHIPColorControlNumberOfPrimariesAttributeCallback * callback)
+    static void maybeDestroy(CHIPLocalizationConfigurationSupportedLocalesAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPColorControlNumberOfPrimariesAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPLocalizationConfigurationSupportedLocalesAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CharSpan> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPColorControlNumberOfPrimariesAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPLocalizationConfigurationSupportedLocalesAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2052,28 +2141,28 @@ class CHIPColorControlNumberOfPrimariesAttributeCallback
     bool keepAlive;
 };
 
-class CHIPColorControlPrimary1IntensityAttributeCallback
-    : public chip::Callback::Callback<CHIPColorControlClusterPrimary1IntensityAttributeCallbackType>
+class CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPLocalizationConfigurationClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPColorControlPrimary1IntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPColorControlPrimary1IntensityAttributeCallback();
+    ~CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPColorControlPrimary1IntensityAttributeCallback * callback)
+    static void maybeDestroy(CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPColorControlPrimary1IntensityAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPColorControlPrimary1IntensityAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2082,28 +2171,28 @@ class CHIPColorControlPrimary1IntensityAttributeCallback
     bool keepAlive;
 };
 
-class CHIPColorControlPrimary2IntensityAttributeCallback
-    : public chip::Callback::Callback<CHIPColorControlClusterPrimary2IntensityAttributeCallbackType>
+class CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPLocalizationConfigurationClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPColorControlPrimary2IntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPColorControlPrimary2IntensityAttributeCallback();
+    ~CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPColorControlPrimary2IntensityAttributeCallback * callback)
+    static void maybeDestroy(CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPColorControlPrimary2IntensityAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPColorControlPrimary2IntensityAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2112,28 +2201,30 @@ class CHIPColorControlPrimary2IntensityAttributeCallback
     bool keepAlive;
 };
 
-class CHIPColorControlPrimary3IntensityAttributeCallback
-    : public chip::Callback::Callback<CHIPColorControlClusterPrimary3IntensityAttributeCallbackType>
+class CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback
+    : public chip::Callback::Callback<CHIPTimeFormatLocalizationClusterSupportedCalendarTypesAttributeCallbackType>
 {
 public:
-    CHIPColorControlPrimary3IntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPColorControlPrimary3IntensityAttributeCallback();
+    ~CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback();
 
-    static void maybeDestroy(CHIPColorControlPrimary3IntensityAttributeCallback * callback)
+    static void maybeDestroy(CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPColorControlPrimary3IntensityAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void
+    CallbackFn(void * context,
+               const chip::app::DataModel::DecodableList<chip::app::Clusters::TimeFormatLocalization::CalendarType> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPColorControlPrimary3IntensityAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2142,28 +2233,28 @@ class CHIPColorControlPrimary3IntensityAttributeCallback
     bool keepAlive;
 };
 
-class CHIPColorControlPrimary4IntensityAttributeCallback
-    : public chip::Callback::Callback<CHIPColorControlClusterPrimary4IntensityAttributeCallbackType>
+class CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPTimeFormatLocalizationClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPColorControlPrimary4IntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPColorControlPrimary4IntensityAttributeCallback();
+    ~CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPColorControlPrimary4IntensityAttributeCallback * callback)
+    static void maybeDestroy(CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPColorControlPrimary4IntensityAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPColorControlPrimary4IntensityAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2172,28 +2263,28 @@ class CHIPColorControlPrimary4IntensityAttributeCallback
     bool keepAlive;
 };
 
-class CHIPColorControlPrimary5IntensityAttributeCallback
-    : public chip::Callback::Callback<CHIPColorControlClusterPrimary5IntensityAttributeCallbackType>
+class CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPTimeFormatLocalizationClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPColorControlPrimary5IntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPColorControlPrimary5IntensityAttributeCallback();
+    ~CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPColorControlPrimary5IntensityAttributeCallback * callback)
+    static void maybeDestroy(CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPColorControlPrimary5IntensityAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPColorControlPrimary5IntensityAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2202,28 +2293,28 @@ class CHIPColorControlPrimary5IntensityAttributeCallback
     bool keepAlive;
 };
 
-class CHIPColorControlPrimary6IntensityAttributeCallback
-    : public chip::Callback::Callback<CHIPColorControlClusterPrimary6IntensityAttributeCallbackType>
+class CHIPUnitLocalizationAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPUnitLocalizationClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPColorControlPrimary6IntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPUnitLocalizationAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPColorControlPrimary6IntensityAttributeCallback();
+    ~CHIPUnitLocalizationAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPColorControlPrimary6IntensityAttributeCallback * callback)
+    static void maybeDestroy(CHIPUnitLocalizationAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPColorControlPrimary6IntensityAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPUnitLocalizationAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPColorControlPrimary6IntensityAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPUnitLocalizationAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2232,28 +2323,28 @@ class CHIPColorControlPrimary6IntensityAttributeCallback
     bool keepAlive;
 };
 
-class CHIPColorControlColorPointRIntensityAttributeCallback
-    : public chip::Callback::Callback<CHIPColorControlClusterColorPointRIntensityAttributeCallbackType>
+class CHIPPowerSourceConfigurationSourcesAttributeCallback
+    : public chip::Callback::Callback<CHIPPowerSourceConfigurationClusterSourcesAttributeCallbackType>
 {
 public:
-    CHIPColorControlColorPointRIntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPowerSourceConfigurationSourcesAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPColorControlColorPointRIntensityAttributeCallback();
+    ~CHIPPowerSourceConfigurationSourcesAttributeCallback();
 
-    static void maybeDestroy(CHIPColorControlColorPointRIntensityAttributeCallback * callback)
+    static void maybeDestroy(CHIPPowerSourceConfigurationSourcesAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPColorControlColorPointRIntensityAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPowerSourceConfigurationSourcesAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPColorControlColorPointRIntensityAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPowerSourceConfigurationSourcesAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2262,28 +2353,28 @@ class CHIPColorControlColorPointRIntensityAttributeCallback
     bool keepAlive;
 };
 
-class CHIPColorControlColorPointGIntensityAttributeCallback
-    : public chip::Callback::Callback<CHIPColorControlClusterColorPointGIntensityAttributeCallbackType>
+class CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPPowerSourceConfigurationClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPColorControlColorPointGIntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPColorControlColorPointGIntensityAttributeCallback();
+    ~CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPColorControlColorPointGIntensityAttributeCallback * callback)
+    static void maybeDestroy(CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPColorControlColorPointGIntensityAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPColorControlColorPointGIntensityAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2292,28 +2383,28 @@ class CHIPColorControlColorPointGIntensityAttributeCallback
     bool keepAlive;
 };
 
-class CHIPColorControlColorPointBIntensityAttributeCallback
-    : public chip::Callback::Callback<CHIPColorControlClusterColorPointBIntensityAttributeCallbackType>
+class CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPPowerSourceConfigurationClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPColorControlColorPointBIntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPColorControlColorPointBIntensityAttributeCallback();
+    ~CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPColorControlColorPointBIntensityAttributeCallback * callback)
+    static void maybeDestroy(CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPColorControlColorPointBIntensityAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPColorControlColorPointBIntensityAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2322,28 +2413,28 @@ class CHIPColorControlColorPointBIntensityAttributeCallback
     bool keepAlive;
 };
 
-class CHIPColorControlGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPColorControlClusterGeneratedCommandListAttributeCallbackType>
+class CHIPPowerSourceConfigurationAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPPowerSourceConfigurationClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPColorControlGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPowerSourceConfigurationAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPColorControlGeneratedCommandListAttributeCallback();
+    ~CHIPPowerSourceConfigurationAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPColorControlGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPPowerSourceConfigurationAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPColorControlGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPowerSourceConfigurationAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPColorControlGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPowerSourceConfigurationAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2352,28 +2443,28 @@ class CHIPColorControlGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPColorControlAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPColorControlClusterAcceptedCommandListAttributeCallbackType>
+class CHIPPowerSourceActiveWiredFaultsAttributeCallback
+    : public chip::Callback::Callback<CHIPPowerSourceClusterActiveWiredFaultsAttributeCallbackType>
 {
 public:
-    CHIPColorControlAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPowerSourceActiveWiredFaultsAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPColorControlAcceptedCommandListAttributeCallback();
+    ~CHIPPowerSourceActiveWiredFaultsAttributeCallback();
 
-    static void maybeDestroy(CHIPColorControlAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPPowerSourceActiveWiredFaultsAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPColorControlAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPowerSourceActiveWiredFaultsAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPColorControlAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPowerSourceActiveWiredFaultsAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2382,28 +2473,28 @@ class CHIPColorControlAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPColorControlAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPColorControlClusterAttributeListAttributeCallbackType>
+class CHIPPowerSourceActiveBatteryFaultsAttributeCallback
+    : public chip::Callback::Callback<CHIPPowerSourceClusterActiveBatteryFaultsAttributeCallbackType>
 {
 public:
-    CHIPColorControlAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPowerSourceActiveBatteryFaultsAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPColorControlAttributeListAttributeCallback();
+    ~CHIPPowerSourceActiveBatteryFaultsAttributeCallback();
 
-    static void maybeDestroy(CHIPColorControlAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPPowerSourceActiveBatteryFaultsAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPColorControlAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPowerSourceActiveBatteryFaultsAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPColorControlAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPowerSourceActiveBatteryFaultsAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2412,28 +2503,28 @@ class CHIPColorControlAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPContentLauncherAcceptHeaderAttributeCallback
-    : public chip::Callback::Callback<CHIPContentLauncherClusterAcceptHeaderAttributeCallbackType>
+class CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback
+    : public chip::Callback::Callback<CHIPPowerSourceClusterActiveBatteryChargeFaultsAttributeCallbackType>
 {
 public:
-    CHIPContentLauncherAcceptHeaderAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPContentLauncherAcceptHeaderAttributeCallback();
+    ~CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback();
 
-    static void maybeDestroy(CHIPContentLauncherAcceptHeaderAttributeCallback * callback)
+    static void maybeDestroy(CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPContentLauncherAcceptHeaderAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CharSpan> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPContentLauncherAcceptHeaderAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2442,20 +2533,20 @@ class CHIPContentLauncherAcceptHeaderAttributeCallback
     bool keepAlive;
 };
 
-class CHIPContentLauncherGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPContentLauncherClusterGeneratedCommandListAttributeCallbackType>
+class CHIPPowerSourceGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPPowerSourceClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPContentLauncherGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPowerSourceGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPContentLauncherGeneratedCommandListAttributeCallback();
+    ~CHIPPowerSourceGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPContentLauncherGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPPowerSourceGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPContentLauncherGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPowerSourceGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -2463,7 +2554,7 @@ class CHIPContentLauncherGeneratedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPContentLauncherGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPowerSourceGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2472,20 +2563,20 @@ class CHIPContentLauncherGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPContentLauncherAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPContentLauncherClusterAcceptedCommandListAttributeCallbackType>
+class CHIPPowerSourceAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPPowerSourceClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPContentLauncherAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPowerSourceAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPContentLauncherAcceptedCommandListAttributeCallback();
+    ~CHIPPowerSourceAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPContentLauncherAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPPowerSourceAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPContentLauncherAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPowerSourceAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -2493,7 +2584,7 @@ class CHIPContentLauncherAcceptedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPContentLauncherAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPowerSourceAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2502,20 +2593,20 @@ class CHIPContentLauncherAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPContentLauncherAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPContentLauncherClusterAttributeListAttributeCallbackType>
+class CHIPPowerSourceAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPPowerSourceClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPContentLauncherAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPowerSourceAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPContentLauncherAttributeListAttributeCallback();
+    ~CHIPPowerSourceAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPContentLauncherAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPPowerSourceAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPContentLauncherAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPowerSourceAttributeListAttributeCallback>(callback);
         }
     }
 
@@ -2523,7 +2614,7 @@ class CHIPContentLauncherAttributeListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPContentLauncherAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPowerSourceAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2532,30 +2623,28 @@ class CHIPContentLauncherAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPDescriptorDeviceListAttributeCallback
-    : public chip::Callback::Callback<CHIPDescriptorClusterDeviceListAttributeCallbackType>
+class CHIPGeneralCommissioningGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPGeneralCommissioningClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPDescriptorDeviceListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPGeneralCommissioningGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPDescriptorDeviceListAttributeCallback();
+    ~CHIPGeneralCommissioningGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPDescriptorDeviceListAttributeCallback * callback)
+    static void maybeDestroy(CHIPGeneralCommissioningGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPDescriptorDeviceListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPGeneralCommissioningGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::DeviceType::DecodableType> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPDescriptorDeviceListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPGeneralCommissioningGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2564,28 +2653,28 @@ class CHIPDescriptorDeviceListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPDescriptorServerListAttributeCallback
-    : public chip::Callback::Callback<CHIPDescriptorClusterServerListAttributeCallbackType>
+class CHIPGeneralCommissioningAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPGeneralCommissioningClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPDescriptorServerListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPGeneralCommissioningAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPDescriptorServerListAttributeCallback();
+    ~CHIPGeneralCommissioningAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPDescriptorServerListAttributeCallback * callback)
+    static void maybeDestroy(CHIPGeneralCommissioningAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPDescriptorServerListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPGeneralCommissioningAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ClusterId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPDescriptorServerListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPGeneralCommissioningAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2594,28 +2683,28 @@ class CHIPDescriptorServerListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPDescriptorClientListAttributeCallback
-    : public chip::Callback::Callback<CHIPDescriptorClusterClientListAttributeCallbackType>
+class CHIPGeneralCommissioningAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPGeneralCommissioningClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPDescriptorClientListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPGeneralCommissioningAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPDescriptorClientListAttributeCallback();
+    ~CHIPGeneralCommissioningAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPDescriptorClientListAttributeCallback * callback)
+    static void maybeDestroy(CHIPGeneralCommissioningAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPDescriptorClientListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPGeneralCommissioningAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ClusterId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPDescriptorClientListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPGeneralCommissioningAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2624,28 +2713,31 @@ class CHIPDescriptorClientListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPDescriptorPartsListAttributeCallback
-    : public chip::Callback::Callback<CHIPDescriptorClusterPartsListAttributeCallbackType>
+class CHIPNetworkCommissioningNetworksAttributeCallback
+    : public chip::Callback::Callback<CHIPNetworkCommissioningClusterNetworksAttributeCallbackType>
 {
 public:
-    CHIPDescriptorPartsListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPNetworkCommissioningNetworksAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPDescriptorPartsListAttributeCallback();
+    ~CHIPNetworkCommissioningNetworksAttributeCallback();
 
-    static void maybeDestroy(CHIPDescriptorPartsListAttributeCallback * callback)
+    static void maybeDestroy(CHIPNetworkCommissioningNetworksAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPDescriptorPartsListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPNetworkCommissioningNetworksAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::EndpointId> & list);
+    static void CallbackFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::DecodableType> &
+            list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPDescriptorPartsListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPNetworkCommissioningNetworksAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2654,28 +2746,30 @@ class CHIPDescriptorPartsListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPDescriptorGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPDescriptorClusterGeneratedCommandListAttributeCallbackType>
+class CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback
+    : public chip::Callback::Callback<CHIPNetworkCommissioningClusterLastNetworkingStatusAttributeCallbackType>
 {
 public:
-    CHIPDescriptorGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPDescriptorGeneratedCommandListAttributeCallback();
+    ~CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback();
 
-    static void maybeDestroy(CHIPDescriptorGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPDescriptorGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void
+    CallbackFn(void * context,
+               const chip::app::DataModel::Nullable<chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatus> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPDescriptorGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2684,20 +2778,80 @@ class CHIPDescriptorGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPDescriptorAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPDescriptorClusterAcceptedCommandListAttributeCallbackType>
+class CHIPNetworkCommissioningLastNetworkIDAttributeCallback
+    : public chip::Callback::Callback<CHIPNetworkCommissioningClusterLastNetworkIDAttributeCallbackType>
 {
 public:
-    CHIPDescriptorAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPNetworkCommissioningLastNetworkIDAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPDescriptorAcceptedCommandListAttributeCallback();
+    ~CHIPNetworkCommissioningLastNetworkIDAttributeCallback();
 
-    static void maybeDestroy(CHIPDescriptorAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPNetworkCommissioningLastNetworkIDAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPDescriptorAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPNetworkCommissioningLastNetworkIDAttributeCallback>(callback);
+        }
+    }
+
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::ByteSpan> & value);
+    static void OnSubscriptionEstablished(void * context)
+    {
+        CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
+            reinterpret_cast<CHIPNetworkCommissioningLastNetworkIDAttributeCallback *>(context)->javaCallbackRef);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
+    };
+
+private:
+    jobject javaCallbackRef;
+    bool keepAlive;
+};
+
+class CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback
+    : public chip::Callback::Callback<CHIPNetworkCommissioningClusterLastConnectErrorValueAttributeCallbackType>
+{
+public:
+    CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
+
+    ~CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback();
+
+    static void maybeDestroy(CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback * callback)
+    {
+        if (!callback->keepAlive)
+        {
+            callback->Cancel();
+            chip::Platform::Delete<CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback>(callback);
+        }
+    }
+
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int32_t> & value);
+    static void OnSubscriptionEstablished(void * context)
+    {
+        CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
+            reinterpret_cast<CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback *>(context)->javaCallbackRef);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
+    };
+
+private:
+    jobject javaCallbackRef;
+    bool keepAlive;
+};
+
+class CHIPNetworkCommissioningGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPNetworkCommissioningClusterGeneratedCommandListAttributeCallbackType>
+{
+public:
+    CHIPNetworkCommissioningGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+
+    ~CHIPNetworkCommissioningGeneratedCommandListAttributeCallback();
+
+    static void maybeDestroy(CHIPNetworkCommissioningGeneratedCommandListAttributeCallback * callback)
+    {
+        if (!callback->keepAlive)
+        {
+            callback->Cancel();
+            chip::Platform::Delete<CHIPNetworkCommissioningGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -2705,7 +2859,7 @@ class CHIPDescriptorAcceptedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPDescriptorAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPNetworkCommissioningGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2714,28 +2868,28 @@ class CHIPDescriptorAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPDescriptorAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPDescriptorClusterAttributeListAttributeCallbackType>
+class CHIPNetworkCommissioningAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPNetworkCommissioningClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPDescriptorAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPNetworkCommissioningAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPDescriptorAttributeListAttributeCallback();
+    ~CHIPNetworkCommissioningAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPDescriptorAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPNetworkCommissioningAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPDescriptorAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPNetworkCommissioningAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPDescriptorAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPNetworkCommissioningAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2834,28 +2988,30 @@ class CHIPDiagnosticLogsAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPDoorLockLockStateAttributeCallback : public chip::Callback::Callback<CHIPDoorLockClusterLockStateAttributeCallbackType>
+class CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback
+    : public chip::Callback::Callback<CHIPGeneralDiagnosticsClusterNetworkInterfacesAttributeCallbackType>
 {
 public:
-    CHIPDoorLockLockStateAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPDoorLockLockStateAttributeCallback();
+    ~CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback();
 
-    static void maybeDestroy(CHIPDoorLockLockStateAttributeCallback * callback)
+    static void maybeDestroy(CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPDoorLockLockStateAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback>(callback);
         }
     }
 
     static void CallbackFn(void * context,
-                           const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> & value);
+                           const chip::app::DataModel::DecodableList<
+                               chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPDoorLockLockStateAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2864,28 +3020,28 @@ class CHIPDoorLockLockStateAttributeCallback : public chip::Callback::Callback<C
     bool keepAlive;
 };
 
-class CHIPDoorLockDoorStateAttributeCallback : public chip::Callback::Callback<CHIPDoorLockClusterDoorStateAttributeCallbackType>
+class CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback
+    : public chip::Callback::Callback<CHIPGeneralDiagnosticsClusterActiveHardwareFaultsAttributeCallbackType>
 {
 public:
-    CHIPDoorLockDoorStateAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPDoorLockDoorStateAttributeCallback();
+    ~CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback();
 
-    static void maybeDestroy(CHIPDoorLockDoorStateAttributeCallback * callback)
+    static void maybeDestroy(CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPDoorLockDoorStateAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context,
-                           const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlDoorState> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPDoorLockDoorStateAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2894,28 +3050,28 @@ class CHIPDoorLockDoorStateAttributeCallback : public chip::Callback::Callback<C
     bool keepAlive;
 };
 
-class CHIPDoorLockGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPDoorLockClusterGeneratedCommandListAttributeCallbackType>
+class CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback
+    : public chip::Callback::Callback<CHIPGeneralDiagnosticsClusterActiveRadioFaultsAttributeCallbackType>
 {
 public:
-    CHIPDoorLockGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPDoorLockGeneratedCommandListAttributeCallback();
+    ~CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback();
 
-    static void maybeDestroy(CHIPDoorLockGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPDoorLockGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPDoorLockGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2924,28 +3080,28 @@ class CHIPDoorLockGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPDoorLockAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPDoorLockClusterAcceptedCommandListAttributeCallbackType>
+class CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback
+    : public chip::Callback::Callback<CHIPGeneralDiagnosticsClusterActiveNetworkFaultsAttributeCallbackType>
 {
 public:
-    CHIPDoorLockAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPDoorLockAcceptedCommandListAttributeCallback();
+    ~CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback();
 
-    static void maybeDestroy(CHIPDoorLockAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPDoorLockAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPDoorLockAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2954,28 +3110,28 @@ class CHIPDoorLockAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPDoorLockAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPDoorLockClusterAttributeListAttributeCallbackType>
+class CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPGeneralDiagnosticsClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPDoorLockAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPDoorLockAttributeListAttributeCallback();
+    ~CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPDoorLockAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPDoorLockAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPDoorLockAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -2984,20 +3140,20 @@ class CHIPDoorLockAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPElectricalMeasurementGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPElectricalMeasurementClusterGeneratedCommandListAttributeCallbackType>
+class CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPGeneralDiagnosticsClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPElectricalMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPElectricalMeasurementGeneratedCommandListAttributeCallback();
+    ~CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPElectricalMeasurementGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPElectricalMeasurementGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -3005,7 +3161,7 @@ class CHIPElectricalMeasurementGeneratedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPElectricalMeasurementGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3014,28 +3170,28 @@ class CHIPElectricalMeasurementGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPElectricalMeasurementAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPElectricalMeasurementClusterAcceptedCommandListAttributeCallbackType>
+class CHIPGeneralDiagnosticsAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPGeneralDiagnosticsClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPElectricalMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPGeneralDiagnosticsAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPElectricalMeasurementAcceptedCommandListAttributeCallback();
+    ~CHIPGeneralDiagnosticsAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPElectricalMeasurementAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPGeneralDiagnosticsAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPElectricalMeasurementAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPGeneralDiagnosticsAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPElectricalMeasurementAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPGeneralDiagnosticsAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3044,28 +3200,31 @@ class CHIPElectricalMeasurementAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPElectricalMeasurementAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPElectricalMeasurementClusterAttributeListAttributeCallbackType>
+class CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback
+    : public chip::Callback::Callback<CHIPSoftwareDiagnosticsClusterThreadMetricsAttributeCallbackType>
 {
 public:
-    CHIPElectricalMeasurementAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPElectricalMeasurementAttributeListAttributeCallback();
+    ~CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback();
 
-    static void maybeDestroy(CHIPElectricalMeasurementAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPElectricalMeasurementAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType> &
+            list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPElectricalMeasurementAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3074,30 +3233,28 @@ class CHIPElectricalMeasurementAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback
-    : public chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackType>
+class CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPSoftwareDiagnosticsClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback();
+    ~CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback * callback)
+    static void maybeDestroy(CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void
-    CallbackFn(void * context,
-               const chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateType> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3106,28 +3263,28 @@ class CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback
     bool keepAlive;
 };
 
-class CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback
-    : public chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterFullDuplexAttributeCallbackType>
+class CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPSoftwareDiagnosticsClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback();
+    ~CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback * callback)
+    static void maybeDestroy(CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<bool> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3136,28 +3293,28 @@ class CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback
     bool keepAlive;
 };
 
-class CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback
-    : public chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterCarrierDetectAttributeCallbackType>
+class CHIPSoftwareDiagnosticsAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPSoftwareDiagnosticsClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPSoftwareDiagnosticsAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback();
+    ~CHIPSoftwareDiagnosticsAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback * callback)
+    static void maybeDestroy(CHIPSoftwareDiagnosticsAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPSoftwareDiagnosticsAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<bool> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPSoftwareDiagnosticsAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3166,28 +3323,28 @@ class CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback
     bool keepAlive;
 };
 
-class CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterGeneratedCommandListAttributeCallbackType>
+class CHIPThreadNetworkDiagnosticsChannelAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterChannelAttributeCallbackType>
 {
 public:
-    CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThreadNetworkDiagnosticsChannelAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback();
+    ~CHIPThreadNetworkDiagnosticsChannelAttributeCallback();
 
-    static void maybeDestroy(CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsChannelAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsChannelAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsChannelAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3196,28 +3353,30 @@ class CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterAcceptedCommandListAttributeCallbackType>
+class CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackType>
 {
 public:
-    CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback();
+    ~CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback();
 
-    static void maybeDestroy(CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void
+    CallbackFn(void * context,
+               const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3226,28 +3385,28 @@ class CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterAttributeListAttributeCallbackType>
+class CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterNetworkNameAttributeCallbackType>
 {
 public:
-    CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback();
+    ~CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback();
 
-    static void maybeDestroy(CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::CharSpan> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3256,28 +3415,28 @@ class CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPFanControlPercentSettingAttributeCallback
-    : public chip::Callback::Callback<CHIPFanControlClusterPercentSettingAttributeCallbackType>
+class CHIPThreadNetworkDiagnosticsPanIdAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterPanIdAttributeCallbackType>
 {
 public:
-    CHIPFanControlPercentSettingAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThreadNetworkDiagnosticsPanIdAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPFanControlPercentSettingAttributeCallback();
+    ~CHIPThreadNetworkDiagnosticsPanIdAttributeCallback();
 
-    static void maybeDestroy(CHIPFanControlPercentSettingAttributeCallback * callback)
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsPanIdAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPFanControlPercentSettingAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsPanIdAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPFanControlPercentSettingAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsPanIdAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3286,28 +3445,28 @@ class CHIPFanControlPercentSettingAttributeCallback
     bool keepAlive;
 };
 
-class CHIPFanControlSpeedSettingAttributeCallback
-    : public chip::Callback::Callback<CHIPFanControlClusterSpeedSettingAttributeCallbackType>
+class CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterExtendedPanIdAttributeCallbackType>
 {
 public:
-    CHIPFanControlSpeedSettingAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPFanControlSpeedSettingAttributeCallback();
+    ~CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback();
 
-    static void maybeDestroy(CHIPFanControlSpeedSettingAttributeCallback * callback)
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPFanControlSpeedSettingAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint64_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPFanControlSpeedSettingAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3316,28 +3475,28 @@ class CHIPFanControlSpeedSettingAttributeCallback
     bool keepAlive;
 };
 
-class CHIPFanControlGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPFanControlClusterGeneratedCommandListAttributeCallbackType>
+class CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterMeshLocalPrefixAttributeCallbackType>
 {
 public:
-    CHIPFanControlGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPFanControlGeneratedCommandListAttributeCallback();
+    ~CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback();
 
-    static void maybeDestroy(CHIPFanControlGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPFanControlGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::ByteSpan> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPFanControlGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3346,28 +3505,30 @@ class CHIPFanControlGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPFanControlAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPFanControlClusterAcceptedCommandListAttributeCallbackType>
+class CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterNeighborTableListAttributeCallbackType>
 {
 public:
-    CHIPFanControlAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPFanControlAcceptedCommandListAttributeCallback();
+    ~CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback();
 
-    static void maybeDestroy(CHIPFanControlAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPFanControlAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context,
+                           const chip::app::DataModel::DecodableList<
+                               chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPFanControlAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3376,28 +3537,30 @@ class CHIPFanControlAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPFanControlAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPFanControlClusterAttributeListAttributeCallbackType>
+class CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterRouteTableListAttributeCallbackType>
 {
 public:
-    CHIPFanControlAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPFanControlAttributeListAttributeCallback();
+    ~CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback();
 
-    static void maybeDestroy(CHIPFanControlAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPFanControlAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context,
+                           const chip::app::DataModel::DecodableList<
+                               chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPFanControlAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3406,30 +3569,28 @@ class CHIPFanControlAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPFixedLabelLabelListAttributeCallback
-    : public chip::Callback::Callback<CHIPFixedLabelClusterLabelListAttributeCallbackType>
+class CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterPartitionIdAttributeCallbackType>
 {
 public:
-    CHIPFixedLabelLabelListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPFixedLabelLabelListAttributeCallback();
+    ~CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback();
 
-    static void maybeDestroy(CHIPFixedLabelLabelListAttributeCallback * callback)
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPFixedLabelLabelListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::FixedLabel::Structs::LabelStruct::DecodableType> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint32_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPFixedLabelLabelListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3438,28 +3599,28 @@ class CHIPFixedLabelLabelListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPFixedLabelGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPFixedLabelClusterGeneratedCommandListAttributeCallbackType>
+class CHIPThreadNetworkDiagnosticsWeightingAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterWeightingAttributeCallbackType>
 {
 public:
-    CHIPFixedLabelGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThreadNetworkDiagnosticsWeightingAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPFixedLabelGeneratedCommandListAttributeCallback();
+    ~CHIPThreadNetworkDiagnosticsWeightingAttributeCallback();
 
-    static void maybeDestroy(CHIPFixedLabelGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsWeightingAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPFixedLabelGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsWeightingAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPFixedLabelGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsWeightingAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3468,28 +3629,28 @@ class CHIPFixedLabelGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPFixedLabelAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPFixedLabelClusterAcceptedCommandListAttributeCallbackType>
+class CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterDataVersionAttributeCallbackType>
 {
 public:
-    CHIPFixedLabelAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPFixedLabelAcceptedCommandListAttributeCallback();
+    ~CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback();
 
-    static void maybeDestroy(CHIPFixedLabelAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPFixedLabelAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPFixedLabelAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3498,28 +3659,28 @@ class CHIPFixedLabelAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPFixedLabelAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPFixedLabelClusterAttributeListAttributeCallbackType>
+class CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterStableDataVersionAttributeCallbackType>
 {
 public:
-    CHIPFixedLabelAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPFixedLabelAttributeListAttributeCallback();
+    ~CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback();
 
-    static void maybeDestroy(CHIPFixedLabelAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPFixedLabelAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPFixedLabelAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3528,28 +3689,28 @@ class CHIPFixedLabelAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPFlowMeasurementMeasuredValueAttributeCallback
-    : public chip::Callback::Callback<CHIPFlowMeasurementClusterMeasuredValueAttributeCallbackType>
+class CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterLeaderRouterIdAttributeCallbackType>
 {
 public:
-    CHIPFlowMeasurementMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPFlowMeasurementMeasuredValueAttributeCallback();
+    ~CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback();
 
-    static void maybeDestroy(CHIPFlowMeasurementMeasuredValueAttributeCallback * callback)
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPFlowMeasurementMeasuredValueAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPFlowMeasurementMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3558,28 +3719,28 @@ class CHIPFlowMeasurementMeasuredValueAttributeCallback
     bool keepAlive;
 };
 
-class CHIPFlowMeasurementMinMeasuredValueAttributeCallback
-    : public chip::Callback::Callback<CHIPFlowMeasurementClusterMinMeasuredValueAttributeCallbackType>
+class CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterActiveTimestampAttributeCallbackType>
 {
 public:
-    CHIPFlowMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPFlowMeasurementMinMeasuredValueAttributeCallback();
+    ~CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback();
 
-    static void maybeDestroy(CHIPFlowMeasurementMinMeasuredValueAttributeCallback * callback)
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPFlowMeasurementMinMeasuredValueAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint64_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPFlowMeasurementMinMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3588,28 +3749,28 @@ class CHIPFlowMeasurementMinMeasuredValueAttributeCallback
     bool keepAlive;
 };
 
-class CHIPFlowMeasurementMaxMeasuredValueAttributeCallback
-    : public chip::Callback::Callback<CHIPFlowMeasurementClusterMaxMeasuredValueAttributeCallbackType>
+class CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterPendingTimestampAttributeCallbackType>
 {
 public:
-    CHIPFlowMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPFlowMeasurementMaxMeasuredValueAttributeCallback();
+    ~CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback();
 
-    static void maybeDestroy(CHIPFlowMeasurementMaxMeasuredValueAttributeCallback * callback)
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPFlowMeasurementMaxMeasuredValueAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint64_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPFlowMeasurementMaxMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3618,28 +3779,28 @@ class CHIPFlowMeasurementMaxMeasuredValueAttributeCallback
     bool keepAlive;
 };
 
-class CHIPFlowMeasurementGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPFlowMeasurementClusterGeneratedCommandListAttributeCallbackType>
+class CHIPThreadNetworkDiagnosticsDelayAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterDelayAttributeCallbackType>
 {
 public:
-    CHIPFlowMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThreadNetworkDiagnosticsDelayAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPFlowMeasurementGeneratedCommandListAttributeCallback();
+    ~CHIPThreadNetworkDiagnosticsDelayAttributeCallback();
 
-    static void maybeDestroy(CHIPFlowMeasurementGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsDelayAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPFlowMeasurementGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsDelayAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint32_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPFlowMeasurementGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsDelayAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3648,28 +3809,28 @@ class CHIPFlowMeasurementGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPFlowMeasurementAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPFlowMeasurementClusterAcceptedCommandListAttributeCallbackType>
+class CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterChannelMaskAttributeCallbackType>
 {
 public:
-    CHIPFlowMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPFlowMeasurementAcceptedCommandListAttributeCallback();
+    ~CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback();
 
-    static void maybeDestroy(CHIPFlowMeasurementAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPFlowMeasurementAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::ByteSpan> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPFlowMeasurementAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3678,28 +3839,30 @@ class CHIPFlowMeasurementAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPFlowMeasurementAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPFlowMeasurementClusterAttributeListAttributeCallbackType>
+class CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterActiveNetworkFaultsListAttributeCallbackType>
 {
 public:
-    CHIPFlowMeasurementAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPFlowMeasurementAttributeListAttributeCallback();
+    ~CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback();
 
-    static void maybeDestroy(CHIPFlowMeasurementAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPFlowMeasurementAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void
+    CallbackFn(void * context,
+               const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPFlowMeasurementAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3708,20 +3871,20 @@ class CHIPFlowMeasurementAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPGeneralCommissioningGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPGeneralCommissioningClusterGeneratedCommandListAttributeCallbackType>
+class CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPGeneralCommissioningGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPGeneralCommissioningGeneratedCommandListAttributeCallback();
+    ~CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPGeneralCommissioningGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPGeneralCommissioningGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -3729,7 +3892,7 @@ class CHIPGeneralCommissioningGeneratedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPGeneralCommissioningGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3738,20 +3901,20 @@ class CHIPGeneralCommissioningGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPGeneralCommissioningAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPGeneralCommissioningClusterAcceptedCommandListAttributeCallbackType>
+class CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPGeneralCommissioningAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPGeneralCommissioningAcceptedCommandListAttributeCallback();
+    ~CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPGeneralCommissioningAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPGeneralCommissioningAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -3759,7 +3922,7 @@ class CHIPGeneralCommissioningAcceptedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPGeneralCommissioningAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3768,20 +3931,20 @@ class CHIPGeneralCommissioningAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPGeneralCommissioningAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPGeneralCommissioningClusterAttributeListAttributeCallbackType>
+class CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPGeneralCommissioningAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPGeneralCommissioningAttributeListAttributeCallback();
+    ~CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPGeneralCommissioningAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPGeneralCommissioningAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback>(callback);
         }
     }
 
@@ -3789,7 +3952,7 @@ class CHIPGeneralCommissioningAttributeListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPGeneralCommissioningAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3798,30 +3961,28 @@ class CHIPGeneralCommissioningAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback
-    : public chip::Callback::Callback<CHIPGeneralDiagnosticsClusterNetworkInterfacesAttributeCallbackType>
+class CHIPWiFiNetworkDiagnosticsBssidAttributeCallback
+    : public chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterBssidAttributeCallbackType>
 {
 public:
-    CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPWiFiNetworkDiagnosticsBssidAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback();
+    ~CHIPWiFiNetworkDiagnosticsBssidAttributeCallback();
 
-    static void maybeDestroy(CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback * callback)
+    static void maybeDestroy(CHIPWiFiNetworkDiagnosticsBssidAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPWiFiNetworkDiagnosticsBssidAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context,
-                           const chip::app::DataModel::DecodableList<
-                               chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::ByteSpan> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPWiFiNetworkDiagnosticsBssidAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3830,28 +3991,29 @@ class CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback
     bool keepAlive;
 };
 
-class CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback
-    : public chip::Callback::Callback<CHIPGeneralDiagnosticsClusterActiveHardwareFaultsAttributeCallbackType>
+class CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback
+    : public chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterSecurityTypeAttributeCallbackType>
 {
 public:
-    CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback();
+    ~CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback();
 
-    static void maybeDestroy(CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback * callback)
+    static void maybeDestroy(CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list);
+    static void CallbackFn(void * context,
+                           const chip::app::DataModel::Nullable<chip::app::Clusters::WiFiNetworkDiagnostics::SecurityType> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3860,28 +4022,30 @@ class CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback
     bool keepAlive;
 };
 
-class CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback
-    : public chip::Callback::Callback<CHIPGeneralDiagnosticsClusterActiveRadioFaultsAttributeCallbackType>
+class CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback
+    : public chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterWiFiVersionAttributeCallbackType>
 {
 public:
-    CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback();
+    ~CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback();
 
-    static void maybeDestroy(CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback * callback)
+    static void maybeDestroy(CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list);
+    static void
+    CallbackFn(void * context,
+               const chip::app::DataModel::Nullable<chip::app::Clusters::WiFiNetworkDiagnostics::WiFiVersionType> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3890,28 +4054,28 @@ class CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback
     bool keepAlive;
 };
 
-class CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback
-    : public chip::Callback::Callback<CHIPGeneralDiagnosticsClusterActiveNetworkFaultsAttributeCallbackType>
+class CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback
+    : public chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterChannelNumberAttributeCallbackType>
 {
 public:
-    CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback();
+    ~CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback();
 
-    static void maybeDestroy(CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback * callback)
+    static void maybeDestroy(CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3920,28 +4084,28 @@ class CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback
     bool keepAlive;
 };
 
-class CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPGeneralDiagnosticsClusterGeneratedCommandListAttributeCallbackType>
+class CHIPWiFiNetworkDiagnosticsRssiAttributeCallback
+    : public chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterRssiAttributeCallbackType>
 {
 public:
-    CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPWiFiNetworkDiagnosticsRssiAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback();
+    ~CHIPWiFiNetworkDiagnosticsRssiAttributeCallback();
 
-    static void maybeDestroy(CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPWiFiNetworkDiagnosticsRssiAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPWiFiNetworkDiagnosticsRssiAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPWiFiNetworkDiagnosticsRssiAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3950,20 +4114,20 @@ class CHIPGeneralDiagnosticsGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPGeneralDiagnosticsClusterAcceptedCommandListAttributeCallbackType>
+class CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback();
+    ~CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -3971,7 +4135,7 @@ class CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -3980,28 +4144,28 @@ class CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPGeneralDiagnosticsAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPGeneralDiagnosticsClusterAttributeListAttributeCallbackType>
+class CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPGeneralDiagnosticsAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPGeneralDiagnosticsAttributeListAttributeCallback();
+    ~CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPGeneralDiagnosticsAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPGeneralDiagnosticsAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPGeneralDiagnosticsAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4010,30 +4174,28 @@ class CHIPGeneralDiagnosticsAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPGroupKeyManagementGroupKeyMapAttributeCallback
-    : public chip::Callback::Callback<CHIPGroupKeyManagementClusterGroupKeyMapAttributeCallbackType>
+class CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPGroupKeyManagementGroupKeyMapAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPGroupKeyManagementGroupKeyMapAttributeCallback();
+    ~CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPGroupKeyManagementGroupKeyMapAttributeCallback * callback)
+    static void maybeDestroy(CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPGroupKeyManagementGroupKeyMapAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context,
-                           const chip::app::DataModel::DecodableList<
-                               chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::DecodableType> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPGroupKeyManagementGroupKeyMapAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4042,30 +4204,30 @@ class CHIPGroupKeyManagementGroupKeyMapAttributeCallback
     bool keepAlive;
 };
 
-class CHIPGroupKeyManagementGroupTableAttributeCallback
-    : public chip::Callback::Callback<CHIPGroupKeyManagementClusterGroupTableAttributeCallbackType>
+class CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback
+    : public chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackType>
 {
 public:
-    CHIPGroupKeyManagementGroupTableAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPGroupKeyManagementGroupTableAttributeCallback();
+    ~CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback();
 
-    static void maybeDestroy(CHIPGroupKeyManagementGroupTableAttributeCallback * callback)
+    static void maybeDestroy(CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPGroupKeyManagementGroupTableAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context,
-                           const chip::app::DataModel::DecodableList<
-                               chip::app::Clusters::GroupKeyManagement::Structs::GroupInfoMapStruct::DecodableType> & list);
+    static void
+    CallbackFn(void * context,
+               const chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateType> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPGroupKeyManagementGroupTableAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4074,28 +4236,28 @@ class CHIPGroupKeyManagementGroupTableAttributeCallback
     bool keepAlive;
 };
 
-class CHIPGroupKeyManagementGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPGroupKeyManagementClusterGeneratedCommandListAttributeCallbackType>
+class CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback
+    : public chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterFullDuplexAttributeCallbackType>
 {
 public:
-    CHIPGroupKeyManagementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPGroupKeyManagementGeneratedCommandListAttributeCallback();
+    ~CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback();
 
-    static void maybeDestroy(CHIPGroupKeyManagementGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPGroupKeyManagementGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<bool> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPGroupKeyManagementGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPEthernetNetworkDiagnosticsFullDuplexAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4104,28 +4266,28 @@ class CHIPGroupKeyManagementGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPGroupKeyManagementAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPGroupKeyManagementClusterAcceptedCommandListAttributeCallbackType>
+class CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback
+    : public chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterCarrierDetectAttributeCallbackType>
 {
 public:
-    CHIPGroupKeyManagementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPGroupKeyManagementAcceptedCommandListAttributeCallback();
+    ~CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback();
 
-    static void maybeDestroy(CHIPGroupKeyManagementAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPGroupKeyManagementAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<bool> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPGroupKeyManagementAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4134,28 +4296,28 @@ class CHIPGroupKeyManagementAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPGroupKeyManagementAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPGroupKeyManagementClusterAttributeListAttributeCallbackType>
+class CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPGroupKeyManagementAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPGroupKeyManagementAttributeListAttributeCallback();
+    ~CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPGroupKeyManagementAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPGroupKeyManagementAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPGroupKeyManagementAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4164,20 +4326,20 @@ class CHIPGroupKeyManagementAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPGroupsGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPGroupsClusterGeneratedCommandListAttributeCallbackType>
+class CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPGroupsGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPGroupsGeneratedCommandListAttributeCallback();
+    ~CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPGroupsGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPGroupsGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -4185,7 +4347,7 @@ class CHIPGroupsGeneratedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPGroupsGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4194,28 +4356,28 @@ class CHIPGroupsGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPGroupsAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPGroupsClusterAcceptedCommandListAttributeCallbackType>
+class CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPGroupsAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPGroupsAcceptedCommandListAttributeCallback();
+    ~CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPGroupsAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPGroupsAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPGroupsAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4224,28 +4386,28 @@ class CHIPGroupsAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPGroupsAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPGroupsClusterAttributeListAttributeCallbackType>
+class CHIPBridgedDeviceBasicVendorIDAttributeCallback
+    : public chip::Callback::Callback<CHIPBridgedDeviceBasicClusterVendorIDAttributeCallbackType>
 {
 public:
-    CHIPGroupsAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPBridgedDeviceBasicVendorIDAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPGroupsAttributeListAttributeCallback();
+    ~CHIPBridgedDeviceBasicVendorIDAttributeCallback();
 
-    static void maybeDestroy(CHIPGroupsAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPBridgedDeviceBasicVendorIDAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPGroupsAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPBridgedDeviceBasicVendorIDAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, chip::VendorId value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPGroupsAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPBridgedDeviceBasicVendorIDAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4254,20 +4416,20 @@ class CHIPGroupsAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPIdentifyGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPIdentifyClusterGeneratedCommandListAttributeCallbackType>
+class CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPBridgedDeviceBasicClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPIdentifyGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPIdentifyGeneratedCommandListAttributeCallback();
+    ~CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPIdentifyGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPIdentifyGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -4275,7 +4437,7 @@ class CHIPIdentifyGeneratedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPIdentifyGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4284,20 +4446,20 @@ class CHIPIdentifyGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPIdentifyAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPIdentifyClusterAcceptedCommandListAttributeCallbackType>
+class CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPBridgedDeviceBasicClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPIdentifyAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPIdentifyAcceptedCommandListAttributeCallback();
+    ~CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPIdentifyAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPIdentifyAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -4305,7 +4467,7 @@ class CHIPIdentifyAcceptedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPIdentifyAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4314,20 +4476,20 @@ class CHIPIdentifyAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPIdentifyAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPIdentifyClusterAttributeListAttributeCallbackType>
+class CHIPBridgedDeviceBasicAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPBridgedDeviceBasicClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPIdentifyAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPBridgedDeviceBasicAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPIdentifyAttributeListAttributeCallback();
+    ~CHIPBridgedDeviceBasicAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPIdentifyAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPBridgedDeviceBasicAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPIdentifyAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPBridgedDeviceBasicAttributeListAttributeCallback>(callback);
         }
     }
 
@@ -4335,7 +4497,7 @@ class CHIPIdentifyAttributeListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPIdentifyAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPBridgedDeviceBasicAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4344,28 +4506,28 @@ class CHIPIdentifyAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPIlluminanceMeasurementMeasuredValueAttributeCallback
-    : public chip::Callback::Callback<CHIPIlluminanceMeasurementClusterMeasuredValueAttributeCallbackType>
+class CHIPSwitchGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPSwitchClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPIlluminanceMeasurementMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPSwitchGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPIlluminanceMeasurementMeasuredValueAttributeCallback();
+    ~CHIPSwitchGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPIlluminanceMeasurementMeasuredValueAttributeCallback * callback)
+    static void maybeDestroy(CHIPSwitchGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPIlluminanceMeasurementMeasuredValueAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPSwitchGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPIlluminanceMeasurementMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPSwitchGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4374,28 +4536,28 @@ class CHIPIlluminanceMeasurementMeasuredValueAttributeCallback
     bool keepAlive;
 };
 
-class CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback
-    : public chip::Callback::Callback<CHIPIlluminanceMeasurementClusterMinMeasuredValueAttributeCallbackType>
+class CHIPSwitchAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPSwitchClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPSwitchAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback();
+    ~CHIPSwitchAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback * callback)
+    static void maybeDestroy(CHIPSwitchAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPSwitchAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPSwitchAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4404,28 +4566,28 @@ class CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback
     bool keepAlive;
 };
 
-class CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback
-    : public chip::Callback::Callback<CHIPIlluminanceMeasurementClusterMaxMeasuredValueAttributeCallbackType>
+class CHIPSwitchAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPSwitchClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPSwitchAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback();
+    ~CHIPSwitchAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback * callback)
+    static void maybeDestroy(CHIPSwitchAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPSwitchAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPSwitchAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4434,28 +4596,28 @@ class CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback
     bool keepAlive;
 };
 
-class CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback
-    : public chip::Callback::Callback<CHIPIlluminanceMeasurementClusterLightSensorTypeAttributeCallbackType>
+class CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback
+    : public chip::Callback::Callback<CHIPAdministratorCommissioningClusterAdminFabricIndexAttributeCallbackType>
 {
 public:
-    CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback();
+    ~CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback();
 
-    static void maybeDestroy(CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback * callback)
+    static void maybeDestroy(CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void CallbackFn(void * context, chip::FabricIndex value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPAdministratorCommissioningAdminFabricIndexAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4464,20 +4626,20 @@ class CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback
     bool keepAlive;
 };
 
-class CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPIlluminanceMeasurementClusterGeneratedCommandListAttributeCallbackType>
+class CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPAdministratorCommissioningClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback();
+    ~CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -4485,7 +4647,7 @@ class CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4494,20 +4656,20 @@ class CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPIlluminanceMeasurementClusterAcceptedCommandListAttributeCallbackType>
+class CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPAdministratorCommissioningClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback();
+    ~CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -4515,7 +4677,7 @@ class CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4524,20 +4686,20 @@ class CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPIlluminanceMeasurementAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPIlluminanceMeasurementClusterAttributeListAttributeCallbackType>
+class CHIPAdministratorCommissioningAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPAdministratorCommissioningClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPIlluminanceMeasurementAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPAdministratorCommissioningAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPIlluminanceMeasurementAttributeListAttributeCallback();
+    ~CHIPAdministratorCommissioningAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPIlluminanceMeasurementAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPAdministratorCommissioningAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPIlluminanceMeasurementAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPAdministratorCommissioningAttributeListAttributeCallback>(callback);
         }
     }
 
@@ -4545,7 +4707,7 @@ class CHIPIlluminanceMeasurementAttributeListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPIlluminanceMeasurementAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPAdministratorCommissioningAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4554,28 +4716,31 @@ class CHIPIlluminanceMeasurementAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPKeypadInputGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPKeypadInputClusterGeneratedCommandListAttributeCallbackType>
+class CHIPOperationalCredentialsNOCsAttributeCallback
+    : public chip::Callback::Callback<CHIPOperationalCredentialsClusterNOCsAttributeCallbackType>
 {
 public:
-    CHIPKeypadInputGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPOperationalCredentialsNOCsAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPKeypadInputGeneratedCommandListAttributeCallback();
+    ~CHIPOperationalCredentialsNOCsAttributeCallback();
 
-    static void maybeDestroy(CHIPKeypadInputGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPOperationalCredentialsNOCsAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPKeypadInputGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPOperationalCredentialsNOCsAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::DecodableType> &
+            list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPKeypadInputGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPOperationalCredentialsNOCsAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4584,28 +4749,30 @@ class CHIPKeypadInputGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPKeypadInputAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPKeypadInputClusterAcceptedCommandListAttributeCallbackType>
+class CHIPOperationalCredentialsFabricsAttributeCallback
+    : public chip::Callback::Callback<CHIPOperationalCredentialsClusterFabricsAttributeCallbackType>
 {
 public:
-    CHIPKeypadInputAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPOperationalCredentialsFabricsAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPKeypadInputAcceptedCommandListAttributeCallback();
+    ~CHIPOperationalCredentialsFabricsAttributeCallback();
 
-    static void maybeDestroy(CHIPKeypadInputAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPOperationalCredentialsFabricsAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPKeypadInputAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPOperationalCredentialsFabricsAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context,
+                           const chip::app::DataModel::DecodableList<
+                               chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPKeypadInputAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPOperationalCredentialsFabricsAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4614,28 +4781,28 @@ class CHIPKeypadInputAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPKeypadInputAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPKeypadInputClusterAttributeListAttributeCallbackType>
+class CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback
+    : public chip::Callback::Callback<CHIPOperationalCredentialsClusterTrustedRootCertificatesAttributeCallbackType>
 {
 public:
-    CHIPKeypadInputAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPKeypadInputAttributeListAttributeCallback();
+    ~CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback();
 
-    static void maybeDestroy(CHIPKeypadInputAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPKeypadInputAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPKeypadInputAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4644,28 +4811,28 @@ class CHIPKeypadInputAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPLevelControlOnLevelAttributeCallback
-    : public chip::Callback::Callback<CHIPLevelControlClusterOnLevelAttributeCallbackType>
+class CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback
+    : public chip::Callback::Callback<CHIPOperationalCredentialsClusterCurrentFabricIndexAttributeCallbackType>
 {
 public:
-    CHIPLevelControlOnLevelAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPLevelControlOnLevelAttributeCallback();
+    ~CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback();
 
-    static void maybeDestroy(CHIPLevelControlOnLevelAttributeCallback * callback)
+    static void maybeDestroy(CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPLevelControlOnLevelAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void CallbackFn(void * context, chip::FabricIndex value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPLevelControlOnLevelAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4674,28 +4841,28 @@ class CHIPLevelControlOnLevelAttributeCallback
     bool keepAlive;
 };
 
-class CHIPLevelControlOnTransitionTimeAttributeCallback
-    : public chip::Callback::Callback<CHIPLevelControlClusterOnTransitionTimeAttributeCallbackType>
+class CHIPOperationalCredentialsGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPOperationalCredentialsClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPLevelControlOnTransitionTimeAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPOperationalCredentialsGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPLevelControlOnTransitionTimeAttributeCallback();
+    ~CHIPOperationalCredentialsGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPLevelControlOnTransitionTimeAttributeCallback * callback)
+    static void maybeDestroy(CHIPOperationalCredentialsGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPLevelControlOnTransitionTimeAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPOperationalCredentialsGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPLevelControlOnTransitionTimeAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPOperationalCredentialsGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4704,28 +4871,28 @@ class CHIPLevelControlOnTransitionTimeAttributeCallback
     bool keepAlive;
 };
 
-class CHIPLevelControlOffTransitionTimeAttributeCallback
-    : public chip::Callback::Callback<CHIPLevelControlClusterOffTransitionTimeAttributeCallbackType>
+class CHIPOperationalCredentialsAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPOperationalCredentialsClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPLevelControlOffTransitionTimeAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPOperationalCredentialsAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPLevelControlOffTransitionTimeAttributeCallback();
+    ~CHIPOperationalCredentialsAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPLevelControlOffTransitionTimeAttributeCallback * callback)
+    static void maybeDestroy(CHIPOperationalCredentialsAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPLevelControlOffTransitionTimeAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPOperationalCredentialsAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPLevelControlOffTransitionTimeAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPOperationalCredentialsAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4734,28 +4901,28 @@ class CHIPLevelControlOffTransitionTimeAttributeCallback
     bool keepAlive;
 };
 
-class CHIPLevelControlDefaultMoveRateAttributeCallback
-    : public chip::Callback::Callback<CHIPLevelControlClusterDefaultMoveRateAttributeCallbackType>
+class CHIPOperationalCredentialsAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPOperationalCredentialsClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPLevelControlDefaultMoveRateAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPOperationalCredentialsAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPLevelControlDefaultMoveRateAttributeCallback();
+    ~CHIPOperationalCredentialsAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPLevelControlDefaultMoveRateAttributeCallback * callback)
+    static void maybeDestroy(CHIPOperationalCredentialsAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPLevelControlDefaultMoveRateAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPOperationalCredentialsAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPLevelControlDefaultMoveRateAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPOperationalCredentialsAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4764,28 +4931,30 @@ class CHIPLevelControlDefaultMoveRateAttributeCallback
     bool keepAlive;
 };
 
-class CHIPLevelControlStartUpCurrentLevelAttributeCallback
-    : public chip::Callback::Callback<CHIPLevelControlClusterStartUpCurrentLevelAttributeCallbackType>
+class CHIPGroupKeyManagementGroupKeyMapAttributeCallback
+    : public chip::Callback::Callback<CHIPGroupKeyManagementClusterGroupKeyMapAttributeCallbackType>
 {
 public:
-    CHIPLevelControlStartUpCurrentLevelAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPGroupKeyManagementGroupKeyMapAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPLevelControlStartUpCurrentLevelAttributeCallback();
+    ~CHIPGroupKeyManagementGroupKeyMapAttributeCallback();
 
-    static void maybeDestroy(CHIPLevelControlStartUpCurrentLevelAttributeCallback * callback)
+    static void maybeDestroy(CHIPGroupKeyManagementGroupKeyMapAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPLevelControlStartUpCurrentLevelAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPGroupKeyManagementGroupKeyMapAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void CallbackFn(void * context,
+                           const chip::app::DataModel::DecodableList<
+                               chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::DecodableType> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPLevelControlStartUpCurrentLevelAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPGroupKeyManagementGroupKeyMapAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4794,28 +4963,30 @@ class CHIPLevelControlStartUpCurrentLevelAttributeCallback
     bool keepAlive;
 };
 
-class CHIPLevelControlGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPLevelControlClusterGeneratedCommandListAttributeCallbackType>
+class CHIPGroupKeyManagementGroupTableAttributeCallback
+    : public chip::Callback::Callback<CHIPGroupKeyManagementClusterGroupTableAttributeCallbackType>
 {
 public:
-    CHIPLevelControlGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPGroupKeyManagementGroupTableAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPLevelControlGeneratedCommandListAttributeCallback();
+    ~CHIPGroupKeyManagementGroupTableAttributeCallback();
 
-    static void maybeDestroy(CHIPLevelControlGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPGroupKeyManagementGroupTableAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPLevelControlGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPGroupKeyManagementGroupTableAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context,
+                           const chip::app::DataModel::DecodableList<
+                               chip::app::Clusters::GroupKeyManagement::Structs::GroupInfoMapStruct::DecodableType> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPLevelControlGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPGroupKeyManagementGroupTableAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4824,20 +4995,20 @@ class CHIPLevelControlGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPLevelControlAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPLevelControlClusterAcceptedCommandListAttributeCallbackType>
+class CHIPGroupKeyManagementGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPGroupKeyManagementClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPLevelControlAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPGroupKeyManagementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPLevelControlAcceptedCommandListAttributeCallback();
+    ~CHIPGroupKeyManagementGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPLevelControlAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPGroupKeyManagementGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPLevelControlAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPGroupKeyManagementGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -4845,7 +5016,7 @@ class CHIPLevelControlAcceptedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPLevelControlAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPGroupKeyManagementGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4854,28 +5025,28 @@ class CHIPLevelControlAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPLevelControlAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPLevelControlClusterAttributeListAttributeCallbackType>
+class CHIPGroupKeyManagementAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPGroupKeyManagementClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPLevelControlAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPGroupKeyManagementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPLevelControlAttributeListAttributeCallback();
+    ~CHIPGroupKeyManagementAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPLevelControlAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPGroupKeyManagementAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPLevelControlAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPGroupKeyManagementAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPLevelControlAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPGroupKeyManagementAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4884,28 +5055,28 @@ class CHIPLevelControlAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPLocalizationConfigurationSupportedLocalesAttributeCallback
-    : public chip::Callback::Callback<CHIPLocalizationConfigurationClusterSupportedLocalesAttributeCallbackType>
+class CHIPGroupKeyManagementAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPGroupKeyManagementClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPLocalizationConfigurationSupportedLocalesAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPGroupKeyManagementAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPLocalizationConfigurationSupportedLocalesAttributeCallback();
+    ~CHIPGroupKeyManagementAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPLocalizationConfigurationSupportedLocalesAttributeCallback * callback)
+    static void maybeDestroy(CHIPGroupKeyManagementAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPLocalizationConfigurationSupportedLocalesAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPGroupKeyManagementAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CharSpan> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPLocalizationConfigurationSupportedLocalesAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPGroupKeyManagementAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4914,28 +5085,30 @@ class CHIPLocalizationConfigurationSupportedLocalesAttributeCallback
     bool keepAlive;
 };
 
-class CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPLocalizationConfigurationClusterGeneratedCommandListAttributeCallbackType>
+class CHIPFixedLabelLabelListAttributeCallback
+    : public chip::Callback::Callback<CHIPFixedLabelClusterLabelListAttributeCallbackType>
 {
 public:
-    CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPFixedLabelLabelListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback();
+    ~CHIPFixedLabelLabelListAttributeCallback();
 
-    static void maybeDestroy(CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPFixedLabelLabelListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPFixedLabelLabelListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::FixedLabel::Structs::LabelStruct::DecodableType> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPFixedLabelLabelListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4944,20 +5117,20 @@ class CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPLocalizationConfigurationClusterAcceptedCommandListAttributeCallbackType>
+class CHIPFixedLabelGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPFixedLabelClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPFixedLabelGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback();
+    ~CHIPFixedLabelGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPFixedLabelGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPFixedLabelGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -4965,7 +5138,7 @@ class CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPFixedLabelGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -4974,20 +5147,20 @@ class CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPLowPowerGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPLowPowerClusterGeneratedCommandListAttributeCallbackType>
+class CHIPFixedLabelAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPFixedLabelClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPLowPowerGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPFixedLabelAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPLowPowerGeneratedCommandListAttributeCallback();
+    ~CHIPFixedLabelAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPLowPowerGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPFixedLabelAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPLowPowerGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPFixedLabelAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -4995,7 +5168,7 @@ class CHIPLowPowerGeneratedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPLowPowerGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPFixedLabelAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5004,28 +5177,28 @@ class CHIPLowPowerGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPLowPowerAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPLowPowerClusterAcceptedCommandListAttributeCallbackType>
+class CHIPFixedLabelAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPFixedLabelClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPLowPowerAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPFixedLabelAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPLowPowerAcceptedCommandListAttributeCallback();
+    ~CHIPFixedLabelAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPLowPowerAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPFixedLabelAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPLowPowerAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPFixedLabelAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPLowPowerAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPFixedLabelAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5034,28 +5207,29 @@ class CHIPLowPowerAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPLowPowerAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPLowPowerClusterAttributeListAttributeCallbackType>
+class CHIPUserLabelLabelListAttributeCallback : public chip::Callback::Callback<CHIPUserLabelClusterLabelListAttributeCallbackType>
 {
 public:
-    CHIPLowPowerAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPUserLabelLabelListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPLowPowerAttributeListAttributeCallback();
+    ~CHIPUserLabelLabelListAttributeCallback();
 
-    static void maybeDestroy(CHIPLowPowerAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPUserLabelLabelListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPLowPowerAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPUserLabelLabelListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::UserLabel::Structs::LabelStruct::DecodableType> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPLowPowerAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPUserLabelLabelListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5064,30 +5238,28 @@ class CHIPLowPowerAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPMediaInputInputListAttributeCallback
-    : public chip::Callback::Callback<CHIPMediaInputClusterInputListAttributeCallbackType>
+class CHIPUserLabelGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPUserLabelClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPMediaInputInputListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPUserLabelGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPMediaInputInputListAttributeCallback();
+    ~CHIPUserLabelGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPMediaInputInputListAttributeCallback * callback)
+    static void maybeDestroy(CHIPUserLabelGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPMediaInputInputListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPUserLabelGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::InputInfo::DecodableType> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPMediaInputInputListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPUserLabelGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5096,20 +5268,20 @@ class CHIPMediaInputInputListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPMediaInputGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPMediaInputClusterGeneratedCommandListAttributeCallbackType>
+class CHIPUserLabelAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPUserLabelClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPMediaInputGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPUserLabelAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPMediaInputGeneratedCommandListAttributeCallback();
+    ~CHIPUserLabelAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPMediaInputGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPUserLabelAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPMediaInputGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPUserLabelAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -5117,7 +5289,7 @@ class CHIPMediaInputGeneratedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPMediaInputGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPUserLabelAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5126,20 +5298,20 @@ class CHIPMediaInputGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPMediaInputAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPMediaInputClusterAcceptedCommandListAttributeCallbackType>
+class CHIPBooleanStateGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPBooleanStateClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPMediaInputAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPBooleanStateGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPMediaInputAcceptedCommandListAttributeCallback();
+    ~CHIPBooleanStateGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPMediaInputAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPBooleanStateGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPMediaInputAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPBooleanStateGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -5147,7 +5319,7 @@ class CHIPMediaInputAcceptedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPMediaInputAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPBooleanStateGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5156,28 +5328,28 @@ class CHIPMediaInputAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPMediaInputAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPMediaInputClusterAttributeListAttributeCallbackType>
+class CHIPBooleanStateAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPBooleanStateClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPMediaInputAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPBooleanStateAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPMediaInputAttributeListAttributeCallback();
+    ~CHIPBooleanStateAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPMediaInputAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPBooleanStateAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPMediaInputAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPBooleanStateAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPMediaInputAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPBooleanStateAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5186,28 +5358,28 @@ class CHIPMediaInputAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPMediaPlaybackStartTimeAttributeCallback
-    : public chip::Callback::Callback<CHIPMediaPlaybackClusterStartTimeAttributeCallbackType>
+class CHIPBooleanStateAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPBooleanStateClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPMediaPlaybackStartTimeAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPBooleanStateAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPMediaPlaybackStartTimeAttributeCallback();
+    ~CHIPBooleanStateAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPMediaPlaybackStartTimeAttributeCallback * callback)
+    static void maybeDestroy(CHIPBooleanStateAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPMediaPlaybackStartTimeAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPBooleanStateAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint64_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPMediaPlaybackStartTimeAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPBooleanStateAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5216,28 +5388,28 @@ class CHIPMediaPlaybackStartTimeAttributeCallback
     bool keepAlive;
 };
 
-class CHIPMediaPlaybackDurationAttributeCallback
-    : public chip::Callback::Callback<CHIPMediaPlaybackClusterDurationAttributeCallbackType>
+class CHIPModeSelectStandardNamespaceAttributeCallback
+    : public chip::Callback::Callback<CHIPModeSelectClusterStandardNamespaceAttributeCallbackType>
 {
 public:
-    CHIPMediaPlaybackDurationAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPModeSelectStandardNamespaceAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPMediaPlaybackDurationAttributeCallback();
+    ~CHIPModeSelectStandardNamespaceAttributeCallback();
 
-    static void maybeDestroy(CHIPMediaPlaybackDurationAttributeCallback * callback)
+    static void maybeDestroy(CHIPModeSelectStandardNamespaceAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPMediaPlaybackDurationAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPModeSelectStandardNamespaceAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint64_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPMediaPlaybackDurationAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPModeSelectStandardNamespaceAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5246,28 +5418,31 @@ class CHIPMediaPlaybackDurationAttributeCallback
     bool keepAlive;
 };
 
-class CHIPMediaPlaybackSeekRangeEndAttributeCallback
-    : public chip::Callback::Callback<CHIPMediaPlaybackClusterSeekRangeEndAttributeCallbackType>
+class CHIPModeSelectSupportedModesAttributeCallback
+    : public chip::Callback::Callback<CHIPModeSelectClusterSupportedModesAttributeCallbackType>
 {
 public:
-    CHIPMediaPlaybackSeekRangeEndAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPModeSelectSupportedModesAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPMediaPlaybackSeekRangeEndAttributeCallback();
+    ~CHIPModeSelectSupportedModesAttributeCallback();
 
-    static void maybeDestroy(CHIPMediaPlaybackSeekRangeEndAttributeCallback * callback)
+    static void maybeDestroy(CHIPModeSelectSupportedModesAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPMediaPlaybackSeekRangeEndAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPModeSelectSupportedModesAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint64_t> & value);
+    static void CallbackFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType> &
+            list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPMediaPlaybackSeekRangeEndAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPModeSelectSupportedModesAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5276,28 +5451,28 @@ class CHIPMediaPlaybackSeekRangeEndAttributeCallback
     bool keepAlive;
 };
 
-class CHIPMediaPlaybackSeekRangeStartAttributeCallback
-    : public chip::Callback::Callback<CHIPMediaPlaybackClusterSeekRangeStartAttributeCallbackType>
+class CHIPModeSelectStartUpModeAttributeCallback
+    : public chip::Callback::Callback<CHIPModeSelectClusterStartUpModeAttributeCallbackType>
 {
 public:
-    CHIPMediaPlaybackSeekRangeStartAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPModeSelectStartUpModeAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPMediaPlaybackSeekRangeStartAttributeCallback();
+    ~CHIPModeSelectStartUpModeAttributeCallback();
 
-    static void maybeDestroy(CHIPMediaPlaybackSeekRangeStartAttributeCallback * callback)
+    static void maybeDestroy(CHIPModeSelectStartUpModeAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPMediaPlaybackSeekRangeStartAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPModeSelectStartUpModeAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint64_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPMediaPlaybackSeekRangeStartAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPModeSelectStartUpModeAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5306,28 +5481,27 @@ class CHIPMediaPlaybackSeekRangeStartAttributeCallback
     bool keepAlive;
 };
 
-class CHIPMediaPlaybackGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPMediaPlaybackClusterGeneratedCommandListAttributeCallbackType>
+class CHIPModeSelectOnModeAttributeCallback : public chip::Callback::Callback<CHIPModeSelectClusterOnModeAttributeCallbackType>
 {
 public:
-    CHIPMediaPlaybackGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPModeSelectOnModeAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPMediaPlaybackGeneratedCommandListAttributeCallback();
+    ~CHIPModeSelectOnModeAttributeCallback();
 
-    static void maybeDestroy(CHIPMediaPlaybackGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPModeSelectOnModeAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPMediaPlaybackGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPModeSelectOnModeAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPMediaPlaybackGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPModeSelectOnModeAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5336,20 +5510,20 @@ class CHIPMediaPlaybackGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPMediaPlaybackAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPMediaPlaybackClusterAcceptedCommandListAttributeCallbackType>
+class CHIPModeSelectGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPModeSelectClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPMediaPlaybackAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPModeSelectGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPMediaPlaybackAcceptedCommandListAttributeCallback();
+    ~CHIPModeSelectGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPMediaPlaybackAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPModeSelectGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPMediaPlaybackAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPModeSelectGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -5357,7 +5531,7 @@ class CHIPMediaPlaybackAcceptedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPMediaPlaybackAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPModeSelectGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5366,28 +5540,28 @@ class CHIPMediaPlaybackAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPMediaPlaybackAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPMediaPlaybackClusterAttributeListAttributeCallbackType>
+class CHIPModeSelectAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPModeSelectClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPMediaPlaybackAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPModeSelectAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPMediaPlaybackAttributeListAttributeCallback();
+    ~CHIPModeSelectAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPMediaPlaybackAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPModeSelectAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPMediaPlaybackAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPModeSelectAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPMediaPlaybackAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPModeSelectAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5396,28 +5570,28 @@ class CHIPMediaPlaybackAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPModeSelectStandardNamespaceAttributeCallback
-    : public chip::Callback::Callback<CHIPModeSelectClusterStandardNamespaceAttributeCallbackType>
+class CHIPModeSelectAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPModeSelectClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPModeSelectStandardNamespaceAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPModeSelectAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPModeSelectStandardNamespaceAttributeCallback();
+    ~CHIPModeSelectAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPModeSelectStandardNamespaceAttributeCallback * callback)
+    static void maybeDestroy(CHIPModeSelectAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPModeSelectStandardNamespaceAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPModeSelectAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPModeSelectStandardNamespaceAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPModeSelectAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5426,31 +5600,28 @@ class CHIPModeSelectStandardNamespaceAttributeCallback
     bool keepAlive;
 };
 
-class CHIPModeSelectSupportedModesAttributeCallback
-    : public chip::Callback::Callback<CHIPModeSelectClusterSupportedModesAttributeCallbackType>
+class CHIPDoorLockLockStateAttributeCallback : public chip::Callback::Callback<CHIPDoorLockClusterLockStateAttributeCallbackType>
 {
 public:
-    CHIPModeSelectSupportedModesAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPDoorLockLockStateAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPModeSelectSupportedModesAttributeCallback();
+    ~CHIPDoorLockLockStateAttributeCallback();
 
-    static void maybeDestroy(CHIPModeSelectSupportedModesAttributeCallback * callback)
+    static void maybeDestroy(CHIPDoorLockLockStateAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPModeSelectSupportedModesAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPDoorLockLockStateAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType> &
-            list);
+    static void CallbackFn(void * context,
+                           const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPModeSelectSupportedModesAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPDoorLockLockStateAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5459,28 +5630,28 @@ class CHIPModeSelectSupportedModesAttributeCallback
     bool keepAlive;
 };
 
-class CHIPModeSelectStartUpModeAttributeCallback
-    : public chip::Callback::Callback<CHIPModeSelectClusterStartUpModeAttributeCallbackType>
+class CHIPDoorLockDoorStateAttributeCallback : public chip::Callback::Callback<CHIPDoorLockClusterDoorStateAttributeCallbackType>
 {
 public:
-    CHIPModeSelectStartUpModeAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPDoorLockDoorStateAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPModeSelectStartUpModeAttributeCallback();
+    ~CHIPDoorLockDoorStateAttributeCallback();
 
-    static void maybeDestroy(CHIPModeSelectStartUpModeAttributeCallback * callback)
+    static void maybeDestroy(CHIPDoorLockDoorStateAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPModeSelectStartUpModeAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPDoorLockDoorStateAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void CallbackFn(void * context,
+                           const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlDoorState> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPModeSelectStartUpModeAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPDoorLockDoorStateAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5489,27 +5660,28 @@ class CHIPModeSelectStartUpModeAttributeCallback
     bool keepAlive;
 };
 
-class CHIPModeSelectOnModeAttributeCallback : public chip::Callback::Callback<CHIPModeSelectClusterOnModeAttributeCallbackType>
+class CHIPDoorLockGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPDoorLockClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPModeSelectOnModeAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPDoorLockGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPModeSelectOnModeAttributeCallback();
+    ~CHIPDoorLockGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPModeSelectOnModeAttributeCallback * callback)
+    static void maybeDestroy(CHIPDoorLockGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPModeSelectOnModeAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPDoorLockGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPModeSelectOnModeAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPDoorLockGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5518,20 +5690,20 @@ class CHIPModeSelectOnModeAttributeCallback : public chip::Callback::Callback<CH
     bool keepAlive;
 };
 
-class CHIPModeSelectGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPModeSelectClusterGeneratedCommandListAttributeCallbackType>
+class CHIPDoorLockAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPDoorLockClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPModeSelectGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPDoorLockAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPModeSelectGeneratedCommandListAttributeCallback();
+    ~CHIPDoorLockAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPModeSelectGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPDoorLockAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPModeSelectGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPDoorLockAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -5539,7 +5711,7 @@ class CHIPModeSelectGeneratedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPModeSelectGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPDoorLockAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5548,28 +5720,28 @@ class CHIPModeSelectGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPModeSelectAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPModeSelectClusterAcceptedCommandListAttributeCallbackType>
+class CHIPDoorLockAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPDoorLockClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPModeSelectAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPDoorLockAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPModeSelectAcceptedCommandListAttributeCallback();
+    ~CHIPDoorLockAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPModeSelectAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPDoorLockAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPModeSelectAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPDoorLockAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPModeSelectAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPDoorLockAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5578,28 +5750,28 @@ class CHIPModeSelectAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPModeSelectAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPModeSelectClusterAttributeListAttributeCallbackType>
+class CHIPWindowCoveringCurrentPositionLiftAttributeCallback
+    : public chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionLiftAttributeCallbackType>
 {
 public:
-    CHIPModeSelectAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPWindowCoveringCurrentPositionLiftAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPModeSelectAttributeListAttributeCallback();
+    ~CHIPWindowCoveringCurrentPositionLiftAttributeCallback();
 
-    static void maybeDestroy(CHIPModeSelectAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPWindowCoveringCurrentPositionLiftAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPModeSelectAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPWindowCoveringCurrentPositionLiftAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPModeSelectAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPWindowCoveringCurrentPositionLiftAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5608,31 +5780,28 @@ class CHIPModeSelectAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPNetworkCommissioningNetworksAttributeCallback
-    : public chip::Callback::Callback<CHIPNetworkCommissioningClusterNetworksAttributeCallbackType>
+class CHIPWindowCoveringCurrentPositionTiltAttributeCallback
+    : public chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionTiltAttributeCallbackType>
 {
 public:
-    CHIPNetworkCommissioningNetworksAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPWindowCoveringCurrentPositionTiltAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPNetworkCommissioningNetworksAttributeCallback();
+    ~CHIPWindowCoveringCurrentPositionTiltAttributeCallback();
 
-    static void maybeDestroy(CHIPNetworkCommissioningNetworksAttributeCallback * callback)
+    static void maybeDestroy(CHIPWindowCoveringCurrentPositionTiltAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPNetworkCommissioningNetworksAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPWindowCoveringCurrentPositionTiltAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::DecodableType> &
-            list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPNetworkCommissioningNetworksAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPWindowCoveringCurrentPositionTiltAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5641,30 +5810,28 @@ class CHIPNetworkCommissioningNetworksAttributeCallback
     bool keepAlive;
 };
 
-class CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback
-    : public chip::Callback::Callback<CHIPNetworkCommissioningClusterLastNetworkingStatusAttributeCallbackType>
+class CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback
+    : public chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionLiftPercentageAttributeCallbackType>
 {
 public:
-    CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback();
+    ~CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback();
 
-    static void maybeDestroy(CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback * callback)
+    static void maybeDestroy(CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback>(callback);
         }
     }
 
-    static void
-    CallbackFn(void * context,
-               const chip::app::DataModel::Nullable<chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatus> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::Percent> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5673,28 +5840,28 @@ class CHIPNetworkCommissioningLastNetworkingStatusAttributeCallback
     bool keepAlive;
 };
 
-class CHIPNetworkCommissioningLastNetworkIDAttributeCallback
-    : public chip::Callback::Callback<CHIPNetworkCommissioningClusterLastNetworkIDAttributeCallbackType>
+class CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback
+    : public chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionTiltPercentageAttributeCallbackType>
 {
 public:
-    CHIPNetworkCommissioningLastNetworkIDAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPNetworkCommissioningLastNetworkIDAttributeCallback();
+    ~CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback();
 
-    static void maybeDestroy(CHIPNetworkCommissioningLastNetworkIDAttributeCallback * callback)
+    static void maybeDestroy(CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPNetworkCommissioningLastNetworkIDAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::ByteSpan> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::Percent> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPNetworkCommissioningLastNetworkIDAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5703,28 +5870,28 @@ class CHIPNetworkCommissioningLastNetworkIDAttributeCallback
     bool keepAlive;
 };
 
-class CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback
-    : public chip::Callback::Callback<CHIPNetworkCommissioningClusterLastConnectErrorValueAttributeCallbackType>
+class CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback
+    : public chip::Callback::Callback<CHIPWindowCoveringClusterTargetPositionLiftPercent100thsAttributeCallbackType>
 {
 public:
-    CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback();
+    ~CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback();
 
-    static void maybeDestroy(CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback * callback)
+    static void maybeDestroy(CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int32_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::Percent100ths> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5733,28 +5900,28 @@ class CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback
     bool keepAlive;
 };
 
-class CHIPNetworkCommissioningGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPNetworkCommissioningClusterGeneratedCommandListAttributeCallbackType>
+class CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback
+    : public chip::Callback::Callback<CHIPWindowCoveringClusterTargetPositionTiltPercent100thsAttributeCallbackType>
 {
 public:
-    CHIPNetworkCommissioningGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPNetworkCommissioningGeneratedCommandListAttributeCallback();
+    ~CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback();
 
-    static void maybeDestroy(CHIPNetworkCommissioningGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPNetworkCommissioningGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::Percent100ths> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPNetworkCommissioningGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5763,28 +5930,28 @@ class CHIPNetworkCommissioningGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPNetworkCommissioningAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPNetworkCommissioningClusterAcceptedCommandListAttributeCallbackType>
+class CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback
+    : public chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionLiftPercent100thsAttributeCallbackType>
 {
 public:
-    CHIPNetworkCommissioningAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPNetworkCommissioningAcceptedCommandListAttributeCallback();
+    ~CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback();
 
-    static void maybeDestroy(CHIPNetworkCommissioningAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPNetworkCommissioningAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::Percent100ths> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPNetworkCommissioningAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5793,28 +5960,28 @@ class CHIPNetworkCommissioningAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPOtaSoftwareUpdateProviderClusterAttributeListAttributeCallbackType>
+class CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback
+    : public chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionTiltPercent100thsAttributeCallbackType>
 {
 public:
-    CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback();
+    ~CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback();
 
-    static void maybeDestroy(CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::Percent100ths> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5823,30 +5990,28 @@ class CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback
-    : public chip::Callback::Callback<CHIPOtaSoftwareUpdateRequestorClusterDefaultOtaProvidersAttributeCallbackType>
+class CHIPWindowCoveringGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPWindowCoveringClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPWindowCoveringGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback();
+    ~CHIPWindowCoveringGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback * callback)
+    static void maybeDestroy(CHIPWindowCoveringGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPWindowCoveringGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context,
-                           const chip::app::DataModel::DecodableList<
-                               chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPWindowCoveringGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5855,28 +6020,28 @@ class CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback
     bool keepAlive;
 };
 
-class CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback
-    : public chip::Callback::Callback<CHIPOtaSoftwareUpdateRequestorClusterUpdateStateProgressAttributeCallbackType>
+class CHIPWindowCoveringAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPWindowCoveringClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPWindowCoveringAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback();
+    ~CHIPWindowCoveringAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback * callback)
+    static void maybeDestroy(CHIPWindowCoveringAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPWindowCoveringAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPWindowCoveringAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5885,20 +6050,20 @@ class CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback
     bool keepAlive;
 };
 
-class CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPOtaSoftwareUpdateRequestorClusterAttributeListAttributeCallbackType>
+class CHIPWindowCoveringAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPWindowCoveringClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPWindowCoveringAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback();
+    ~CHIPWindowCoveringAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPWindowCoveringAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPWindowCoveringAttributeListAttributeCallback>(callback);
         }
     }
 
@@ -5906,7 +6071,7 @@ class CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPWindowCoveringAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5915,20 +6080,20 @@ class CHIPOtaSoftwareUpdateRequestorAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPOccupancySensingGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPOccupancySensingClusterGeneratedCommandListAttributeCallbackType>
+class CHIPBarrierControlGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPBarrierControlClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPOccupancySensingGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPBarrierControlGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPOccupancySensingGeneratedCommandListAttributeCallback();
+    ~CHIPBarrierControlGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPOccupancySensingGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPBarrierControlGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPOccupancySensingGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPBarrierControlGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -5936,7 +6101,7 @@ class CHIPOccupancySensingGeneratedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPOccupancySensingGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPBarrierControlGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5945,20 +6110,20 @@ class CHIPOccupancySensingGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPOccupancySensingAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPOccupancySensingClusterAcceptedCommandListAttributeCallbackType>
+class CHIPBarrierControlAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPBarrierControlClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPOccupancySensingAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPBarrierControlAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPOccupancySensingAcceptedCommandListAttributeCallback();
+    ~CHIPBarrierControlAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPOccupancySensingAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPBarrierControlAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPOccupancySensingAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPBarrierControlAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -5966,7 +6131,7 @@ class CHIPOccupancySensingAcceptedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPOccupancySensingAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPBarrierControlAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -5975,20 +6140,20 @@ class CHIPOccupancySensingAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPOccupancySensingAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPOccupancySensingClusterAttributeListAttributeCallbackType>
+class CHIPBarrierControlAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPBarrierControlClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPOccupancySensingAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPBarrierControlAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPOccupancySensingAttributeListAttributeCallback();
+    ~CHIPBarrierControlAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPOccupancySensingAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPBarrierControlAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPOccupancySensingAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPBarrierControlAttributeListAttributeCallback>(callback);
         }
     }
 
@@ -5996,7 +6161,7 @@ class CHIPOccupancySensingAttributeListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPOccupancySensingAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPBarrierControlAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6005,28 +6170,28 @@ class CHIPOccupancySensingAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPOnOffStartUpOnOffAttributeCallback : public chip::Callback::Callback<CHIPOnOffClusterStartUpOnOffAttributeCallbackType>
+class CHIPPumpConfigurationAndControlMaxPressureAttributeCallback
+    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxPressureAttributeCallbackType>
 {
 public:
-    CHIPOnOffStartUpOnOffAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPumpConfigurationAndControlMaxPressureAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPOnOffStartUpOnOffAttributeCallback();
+    ~CHIPPumpConfigurationAndControlMaxPressureAttributeCallback();
 
-    static void maybeDestroy(CHIPOnOffStartUpOnOffAttributeCallback * callback)
+    static void maybeDestroy(CHIPPumpConfigurationAndControlMaxPressureAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPOnOffStartUpOnOffAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPumpConfigurationAndControlMaxPressureAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context,
-                           const chip::app::DataModel::Nullable<chip::app::Clusters::OnOff::OnOffStartUpOnOff> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPOnOffStartUpOnOffAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPumpConfigurationAndControlMaxPressureAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6035,28 +6200,28 @@ class CHIPOnOffStartUpOnOffAttributeCallback : public chip::Callback::Callback<C
     bool keepAlive;
 };
 
-class CHIPOnOffGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPOnOffClusterGeneratedCommandListAttributeCallbackType>
+class CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback
+    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxSpeedAttributeCallbackType>
 {
 public:
-    CHIPOnOffGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPOnOffGeneratedCommandListAttributeCallback();
+    ~CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback();
 
-    static void maybeDestroy(CHIPOnOffGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPOnOffGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPOnOffGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6065,28 +6230,28 @@ class CHIPOnOffGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPOnOffAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPOnOffClusterAcceptedCommandListAttributeCallbackType>
+class CHIPPumpConfigurationAndControlMaxFlowAttributeCallback
+    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxFlowAttributeCallbackType>
 {
 public:
-    CHIPOnOffAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPumpConfigurationAndControlMaxFlowAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPOnOffAcceptedCommandListAttributeCallback();
+    ~CHIPPumpConfigurationAndControlMaxFlowAttributeCallback();
 
-    static void maybeDestroy(CHIPOnOffAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPPumpConfigurationAndControlMaxFlowAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPOnOffAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPumpConfigurationAndControlMaxFlowAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPOnOffAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPumpConfigurationAndControlMaxFlowAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6095,27 +6260,28 @@ class CHIPOnOffAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPOnOffAttributeListAttributeCallback : public chip::Callback::Callback<CHIPOnOffClusterAttributeListAttributeCallbackType>
+class CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback
+    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMinConstPressureAttributeCallbackType>
 {
 public:
-    CHIPOnOffAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPOnOffAttributeListAttributeCallback();
+    ~CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback();
 
-    static void maybeDestroy(CHIPOnOffAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPOnOffAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPOnOffAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6124,28 +6290,28 @@ class CHIPOnOffAttributeListAttributeCallback : public chip::Callback::Callback<
     bool keepAlive;
 };
 
-class CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPOnOffSwitchConfigurationClusterGeneratedCommandListAttributeCallbackType>
+class CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback
+    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxConstPressureAttributeCallbackType>
 {
 public:
-    CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback();
+    ~CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback();
 
-    static void maybeDestroy(CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6154,28 +6320,28 @@ class CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPOnOffSwitchConfigurationClusterAcceptedCommandListAttributeCallbackType>
+class CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback
+    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMinCompPressureAttributeCallbackType>
 {
 public:
-    CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback();
+    ~CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback();
 
-    static void maybeDestroy(CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6184,28 +6350,28 @@ class CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPOnOffSwitchConfigurationAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPOnOffSwitchConfigurationClusterAttributeListAttributeCallbackType>
+class CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback
+    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxCompPressureAttributeCallbackType>
 {
 public:
-    CHIPOnOffSwitchConfigurationAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPOnOffSwitchConfigurationAttributeListAttributeCallback();
+    ~CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback();
 
-    static void maybeDestroy(CHIPOnOffSwitchConfigurationAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPOnOffSwitchConfigurationAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPOnOffSwitchConfigurationAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6214,31 +6380,28 @@ class CHIPOnOffSwitchConfigurationAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPOperationalCredentialsNOCsAttributeCallback
-    : public chip::Callback::Callback<CHIPOperationalCredentialsClusterNOCsAttributeCallbackType>
+class CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback
+    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMinConstSpeedAttributeCallbackType>
 {
 public:
-    CHIPOperationalCredentialsNOCsAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPOperationalCredentialsNOCsAttributeCallback();
+    ~CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback();
 
-    static void maybeDestroy(CHIPOperationalCredentialsNOCsAttributeCallback * callback)
+    static void maybeDestroy(CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPOperationalCredentialsNOCsAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::DecodableType> &
-            list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPOperationalCredentialsNOCsAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6247,30 +6410,28 @@ class CHIPOperationalCredentialsNOCsAttributeCallback
     bool keepAlive;
 };
 
-class CHIPOperationalCredentialsFabricsAttributeCallback
-    : public chip::Callback::Callback<CHIPOperationalCredentialsClusterFabricsAttributeCallbackType>
+class CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback
+    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxConstSpeedAttributeCallbackType>
 {
 public:
-    CHIPOperationalCredentialsFabricsAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPOperationalCredentialsFabricsAttributeCallback();
+    ~CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback();
 
-    static void maybeDestroy(CHIPOperationalCredentialsFabricsAttributeCallback * callback)
+    static void maybeDestroy(CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPOperationalCredentialsFabricsAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context,
-                           const chip::app::DataModel::DecodableList<
-                               chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPOperationalCredentialsFabricsAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6279,28 +6440,28 @@ class CHIPOperationalCredentialsFabricsAttributeCallback
     bool keepAlive;
 };
 
-class CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback
-    : public chip::Callback::Callback<CHIPOperationalCredentialsClusterTrustedRootCertificatesAttributeCallbackType>
+class CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback
+    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMinConstFlowAttributeCallbackType>
 {
 public:
-    CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback();
+    ~CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback();
 
-    static void maybeDestroy(CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback * callback)
+    static void maybeDestroy(CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6309,28 +6470,28 @@ class CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback
     bool keepAlive;
 };
 
-class CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback
-    : public chip::Callback::Callback<CHIPOperationalCredentialsClusterCurrentFabricIndexAttributeCallbackType>
+class CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback
+    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxConstFlowAttributeCallbackType>
 {
 public:
-    CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback();
+    ~CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback();
 
-    static void maybeDestroy(CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback * callback)
+    static void maybeDestroy(CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, chip::FabricIndex value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6339,28 +6500,28 @@ class CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback
     bool keepAlive;
 };
 
-class CHIPOperationalCredentialsGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPOperationalCredentialsClusterGeneratedCommandListAttributeCallbackType>
+class CHIPPumpConfigurationAndControlMinConstTempAttributeCallback
+    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMinConstTempAttributeCallbackType>
 {
 public:
-    CHIPOperationalCredentialsGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPumpConfigurationAndControlMinConstTempAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPOperationalCredentialsGeneratedCommandListAttributeCallback();
+    ~CHIPPumpConfigurationAndControlMinConstTempAttributeCallback();
 
-    static void maybeDestroy(CHIPOperationalCredentialsGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPPumpConfigurationAndControlMinConstTempAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPOperationalCredentialsGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPumpConfigurationAndControlMinConstTempAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPOperationalCredentialsGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPumpConfigurationAndControlMinConstTempAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6369,28 +6530,28 @@ class CHIPOperationalCredentialsGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPOperationalCredentialsAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPOperationalCredentialsClusterAcceptedCommandListAttributeCallbackType>
+class CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback
+    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxConstTempAttributeCallbackType>
 {
 public:
-    CHIPOperationalCredentialsAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPOperationalCredentialsAcceptedCommandListAttributeCallback();
+    ~CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback();
 
-    static void maybeDestroy(CHIPOperationalCredentialsAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPOperationalCredentialsAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPOperationalCredentialsAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6399,28 +6560,28 @@ class CHIPOperationalCredentialsAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPOperationalCredentialsAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPOperationalCredentialsClusterAttributeListAttributeCallbackType>
+class CHIPPumpConfigurationAndControlCapacityAttributeCallback
+    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterCapacityAttributeCallbackType>
 {
 public:
-    CHIPOperationalCredentialsAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPumpConfigurationAndControlCapacityAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPOperationalCredentialsAttributeListAttributeCallback();
+    ~CHIPPumpConfigurationAndControlCapacityAttributeCallback();
 
-    static void maybeDestroy(CHIPOperationalCredentialsAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPPumpConfigurationAndControlCapacityAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPOperationalCredentialsAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPumpConfigurationAndControlCapacityAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPOperationalCredentialsAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPumpConfigurationAndControlCapacityAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6429,28 +6590,28 @@ class CHIPOperationalCredentialsAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPowerSourceActiveWiredFaultsAttributeCallback
-    : public chip::Callback::Callback<CHIPPowerSourceClusterActiveWiredFaultsAttributeCallbackType>
+class CHIPPumpConfigurationAndControlSpeedAttributeCallback
+    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterSpeedAttributeCallbackType>
 {
 public:
-    CHIPPowerSourceActiveWiredFaultsAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPumpConfigurationAndControlSpeedAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPowerSourceActiveWiredFaultsAttributeCallback();
+    ~CHIPPumpConfigurationAndControlSpeedAttributeCallback();
 
-    static void maybeDestroy(CHIPPowerSourceActiveWiredFaultsAttributeCallback * callback)
+    static void maybeDestroy(CHIPPumpConfigurationAndControlSpeedAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPowerSourceActiveWiredFaultsAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPumpConfigurationAndControlSpeedAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPowerSourceActiveWiredFaultsAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPumpConfigurationAndControlSpeedAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6459,28 +6620,28 @@ class CHIPPowerSourceActiveWiredFaultsAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPowerSourceActiveBatteryFaultsAttributeCallback
-    : public chip::Callback::Callback<CHIPPowerSourceClusterActiveBatteryFaultsAttributeCallbackType>
+class CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback
+    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterLifetimeRunningHoursAttributeCallbackType>
 {
 public:
-    CHIPPowerSourceActiveBatteryFaultsAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPowerSourceActiveBatteryFaultsAttributeCallback();
+    ~CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback();
 
-    static void maybeDestroy(CHIPPowerSourceActiveBatteryFaultsAttributeCallback * callback)
+    static void maybeDestroy(CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPowerSourceActiveBatteryFaultsAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint32_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPowerSourceActiveBatteryFaultsAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6489,28 +6650,28 @@ class CHIPPowerSourceActiveBatteryFaultsAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback
-    : public chip::Callback::Callback<CHIPPowerSourceClusterActiveBatteryChargeFaultsAttributeCallbackType>
+class CHIPPumpConfigurationAndControlPowerAttributeCallback
+    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterPowerAttributeCallbackType>
 {
 public:
-    CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPumpConfigurationAndControlPowerAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback();
+    ~CHIPPumpConfigurationAndControlPowerAttributeCallback();
 
-    static void maybeDestroy(CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback * callback)
+    static void maybeDestroy(CHIPPumpConfigurationAndControlPowerAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPumpConfigurationAndControlPowerAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint32_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPumpConfigurationAndControlPowerAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6519,28 +6680,28 @@ class CHIPPowerSourceActiveBatteryChargeFaultsAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPowerSourceGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPPowerSourceClusterGeneratedCommandListAttributeCallbackType>
+class CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback
+    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterLifetimeEnergyConsumedAttributeCallbackType>
 {
 public:
-    CHIPPowerSourceGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPowerSourceGeneratedCommandListAttributeCallback();
+    ~CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback();
 
-    static void maybeDestroy(CHIPPowerSourceGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPowerSourceGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint32_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPowerSourceGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6549,20 +6710,20 @@ class CHIPPowerSourceGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPowerSourceAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPPowerSourceClusterAcceptedCommandListAttributeCallbackType>
+class CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPPowerSourceAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPowerSourceAcceptedCommandListAttributeCallback();
+    ~CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPPowerSourceAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPowerSourceAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -6570,7 +6731,7 @@ class CHIPPowerSourceAcceptedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPowerSourceAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6579,28 +6740,28 @@ class CHIPPowerSourceAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPowerSourceAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPPowerSourceClusterAttributeListAttributeCallbackType>
+class CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPPowerSourceAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPowerSourceAttributeListAttributeCallback();
+    ~CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPPowerSourceAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPowerSourceAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPowerSourceAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6609,28 +6770,28 @@ class CHIPPowerSourceAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPowerSourceConfigurationSourcesAttributeCallback
-    : public chip::Callback::Callback<CHIPPowerSourceConfigurationClusterSourcesAttributeCallbackType>
+class CHIPPumpConfigurationAndControlAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPPowerSourceConfigurationSourcesAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPumpConfigurationAndControlAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPowerSourceConfigurationSourcesAttributeCallback();
+    ~CHIPPumpConfigurationAndControlAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPPowerSourceConfigurationSourcesAttributeCallback * callback)
+    static void maybeDestroy(CHIPPumpConfigurationAndControlAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPowerSourceConfigurationSourcesAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPumpConfigurationAndControlAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPowerSourceConfigurationSourcesAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPumpConfigurationAndControlAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6639,28 +6800,28 @@ class CHIPPowerSourceConfigurationSourcesAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPPowerSourceConfigurationClusterGeneratedCommandListAttributeCallbackType>
+class CHIPThermostatLocalTemperatureAttributeCallback
+    : public chip::Callback::Callback<CHIPThermostatClusterLocalTemperatureAttributeCallbackType>
 {
 public:
-    CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThermostatLocalTemperatureAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback();
+    ~CHIPThermostatLocalTemperatureAttributeCallback();
 
-    static void maybeDestroy(CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPThermostatLocalTemperatureAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThermostatLocalTemperatureAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThermostatLocalTemperatureAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6669,28 +6830,28 @@ class CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPPowerSourceConfigurationClusterAcceptedCommandListAttributeCallbackType>
+class CHIPThermostatAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPThermostatClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThermostatAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback();
+    ~CHIPThermostatAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPThermostatAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThermostatAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThermostatAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6699,28 +6860,28 @@ class CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPowerSourceConfigurationAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPPowerSourceConfigurationClusterAttributeListAttributeCallbackType>
+class CHIPFanControlPercentSettingAttributeCallback
+    : public chip::Callback::Callback<CHIPFanControlClusterPercentSettingAttributeCallbackType>
 {
 public:
-    CHIPPowerSourceConfigurationAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPFanControlPercentSettingAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPowerSourceConfigurationAttributeListAttributeCallback();
+    ~CHIPFanControlPercentSettingAttributeCallback();
 
-    static void maybeDestroy(CHIPPowerSourceConfigurationAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPFanControlPercentSettingAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPowerSourceConfigurationAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPFanControlPercentSettingAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPowerSourceConfigurationAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPFanControlPercentSettingAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6729,28 +6890,28 @@ class CHIPPowerSourceConfigurationAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPressureMeasurementMeasuredValueAttributeCallback
-    : public chip::Callback::Callback<CHIPPressureMeasurementClusterMeasuredValueAttributeCallbackType>
+class CHIPFanControlSpeedSettingAttributeCallback
+    : public chip::Callback::Callback<CHIPFanControlClusterSpeedSettingAttributeCallbackType>
 {
 public:
-    CHIPPressureMeasurementMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPFanControlSpeedSettingAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPressureMeasurementMeasuredValueAttributeCallback();
+    ~CHIPFanControlSpeedSettingAttributeCallback();
 
-    static void maybeDestroy(CHIPPressureMeasurementMeasuredValueAttributeCallback * callback)
+    static void maybeDestroy(CHIPFanControlSpeedSettingAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPressureMeasurementMeasuredValueAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPFanControlSpeedSettingAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPressureMeasurementMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPFanControlSpeedSettingAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6759,28 +6920,28 @@ class CHIPPressureMeasurementMeasuredValueAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPressureMeasurementMinMeasuredValueAttributeCallback
-    : public chip::Callback::Callback<CHIPPressureMeasurementClusterMinMeasuredValueAttributeCallbackType>
+class CHIPFanControlGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPFanControlClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPPressureMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPFanControlGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPressureMeasurementMinMeasuredValueAttributeCallback();
+    ~CHIPFanControlGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPPressureMeasurementMinMeasuredValueAttributeCallback * callback)
+    static void maybeDestroy(CHIPFanControlGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPressureMeasurementMinMeasuredValueAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPFanControlGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPressureMeasurementMinMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPFanControlGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6789,28 +6950,28 @@ class CHIPPressureMeasurementMinMeasuredValueAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPressureMeasurementMaxMeasuredValueAttributeCallback
-    : public chip::Callback::Callback<CHIPPressureMeasurementClusterMaxMeasuredValueAttributeCallbackType>
+class CHIPFanControlAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPFanControlClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPPressureMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPFanControlAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPressureMeasurementMaxMeasuredValueAttributeCallback();
+    ~CHIPFanControlAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPPressureMeasurementMaxMeasuredValueAttributeCallback * callback)
+    static void maybeDestroy(CHIPFanControlAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPressureMeasurementMaxMeasuredValueAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPFanControlAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPressureMeasurementMaxMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPFanControlAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6819,28 +6980,28 @@ class CHIPPressureMeasurementMaxMeasuredValueAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPressureMeasurementScaledValueAttributeCallback
-    : public chip::Callback::Callback<CHIPPressureMeasurementClusterScaledValueAttributeCallbackType>
+class CHIPFanControlAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPFanControlClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPPressureMeasurementScaledValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPFanControlAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPressureMeasurementScaledValueAttributeCallback();
+    ~CHIPFanControlAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPPressureMeasurementScaledValueAttributeCallback * callback)
+    static void maybeDestroy(CHIPFanControlAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPressureMeasurementScaledValueAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPFanControlAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPressureMeasurementScaledValueAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPFanControlAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6849,28 +7010,29 @@ class CHIPPressureMeasurementScaledValueAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPressureMeasurementMinScaledValueAttributeCallback
-    : public chip::Callback::Callback<CHIPPressureMeasurementClusterMinScaledValueAttributeCallbackType>
+class CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPThermostatUserInterfaceConfigurationClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPPressureMeasurementMinScaledValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPressureMeasurementMinScaledValueAttributeCallback();
+    ~CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPPressureMeasurementMinScaledValueAttributeCallback * callback)
+    static void maybeDestroy(CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPressureMeasurementMinScaledValueAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPressureMeasurementMinScaledValueAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback *>(context)
+                ->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6879,28 +7041,29 @@ class CHIPPressureMeasurementMinScaledValueAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPressureMeasurementMaxScaledValueAttributeCallback
-    : public chip::Callback::Callback<CHIPPressureMeasurementClusterMaxScaledValueAttributeCallbackType>
+class CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPThermostatUserInterfaceConfigurationClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPPressureMeasurementMaxScaledValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPressureMeasurementMaxScaledValueAttributeCallback();
+    ~CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPPressureMeasurementMaxScaledValueAttributeCallback * callback)
+    static void maybeDestroy(CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPressureMeasurementMaxScaledValueAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPressureMeasurementMaxScaledValueAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback *>(context)
+                ->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6909,20 +7072,20 @@ class CHIPPressureMeasurementMaxScaledValueAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPressureMeasurementAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPPressureMeasurementClusterAttributeListAttributeCallbackType>
+class CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPThermostatUserInterfaceConfigurationClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPPressureMeasurementAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPressureMeasurementAttributeListAttributeCallback();
+    ~CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPPressureMeasurementAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPressureMeasurementAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback>(callback);
         }
     }
 
@@ -6930,7 +7093,7 @@ class CHIPPressureMeasurementAttributeListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPressureMeasurementAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6939,28 +7102,28 @@ class CHIPPressureMeasurementAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPumpConfigurationAndControlMaxPressureAttributeCallback
-    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxPressureAttributeCallbackType>
+class CHIPColorControlNumberOfPrimariesAttributeCallback
+    : public chip::Callback::Callback<CHIPColorControlClusterNumberOfPrimariesAttributeCallbackType>
 {
 public:
-    CHIPPumpConfigurationAndControlMaxPressureAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPColorControlNumberOfPrimariesAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPumpConfigurationAndControlMaxPressureAttributeCallback();
+    ~CHIPColorControlNumberOfPrimariesAttributeCallback();
 
-    static void maybeDestroy(CHIPPumpConfigurationAndControlMaxPressureAttributeCallback * callback)
+    static void maybeDestroy(CHIPColorControlNumberOfPrimariesAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPumpConfigurationAndControlMaxPressureAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPColorControlNumberOfPrimariesAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPumpConfigurationAndControlMaxPressureAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPColorControlNumberOfPrimariesAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6969,28 +7132,28 @@ class CHIPPumpConfigurationAndControlMaxPressureAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback
-    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxSpeedAttributeCallbackType>
+class CHIPColorControlPrimary1IntensityAttributeCallback
+    : public chip::Callback::Callback<CHIPColorControlClusterPrimary1IntensityAttributeCallbackType>
 {
 public:
-    CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPColorControlPrimary1IntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback();
+    ~CHIPColorControlPrimary1IntensityAttributeCallback();
 
-    static void maybeDestroy(CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback * callback)
+    static void maybeDestroy(CHIPColorControlPrimary1IntensityAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPColorControlPrimary1IntensityAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPColorControlPrimary1IntensityAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -6999,28 +7162,28 @@ class CHIPPumpConfigurationAndControlMaxSpeedAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPumpConfigurationAndControlMaxFlowAttributeCallback
-    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxFlowAttributeCallbackType>
+class CHIPColorControlPrimary2IntensityAttributeCallback
+    : public chip::Callback::Callback<CHIPColorControlClusterPrimary2IntensityAttributeCallbackType>
 {
 public:
-    CHIPPumpConfigurationAndControlMaxFlowAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPColorControlPrimary2IntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPumpConfigurationAndControlMaxFlowAttributeCallback();
+    ~CHIPColorControlPrimary2IntensityAttributeCallback();
 
-    static void maybeDestroy(CHIPPumpConfigurationAndControlMaxFlowAttributeCallback * callback)
+    static void maybeDestroy(CHIPColorControlPrimary2IntensityAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPumpConfigurationAndControlMaxFlowAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPColorControlPrimary2IntensityAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPumpConfigurationAndControlMaxFlowAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPColorControlPrimary2IntensityAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7029,28 +7192,28 @@ class CHIPPumpConfigurationAndControlMaxFlowAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback
-    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMinConstPressureAttributeCallbackType>
+class CHIPColorControlPrimary3IntensityAttributeCallback
+    : public chip::Callback::Callback<CHIPColorControlClusterPrimary3IntensityAttributeCallbackType>
 {
 public:
-    CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPColorControlPrimary3IntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback();
+    ~CHIPColorControlPrimary3IntensityAttributeCallback();
 
-    static void maybeDestroy(CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback * callback)
+    static void maybeDestroy(CHIPColorControlPrimary3IntensityAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPColorControlPrimary3IntensityAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPColorControlPrimary3IntensityAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7059,28 +7222,28 @@ class CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback
-    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxConstPressureAttributeCallbackType>
+class CHIPColorControlPrimary4IntensityAttributeCallback
+    : public chip::Callback::Callback<CHIPColorControlClusterPrimary4IntensityAttributeCallbackType>
 {
 public:
-    CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPColorControlPrimary4IntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback();
+    ~CHIPColorControlPrimary4IntensityAttributeCallback();
 
-    static void maybeDestroy(CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback * callback)
+    static void maybeDestroy(CHIPColorControlPrimary4IntensityAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPColorControlPrimary4IntensityAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPColorControlPrimary4IntensityAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7089,28 +7252,28 @@ class CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback
-    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMinCompPressureAttributeCallbackType>
+class CHIPColorControlPrimary5IntensityAttributeCallback
+    : public chip::Callback::Callback<CHIPColorControlClusterPrimary5IntensityAttributeCallbackType>
 {
 public:
-    CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPColorControlPrimary5IntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback();
+    ~CHIPColorControlPrimary5IntensityAttributeCallback();
 
-    static void maybeDestroy(CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback * callback)
+    static void maybeDestroy(CHIPColorControlPrimary5IntensityAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPColorControlPrimary5IntensityAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPColorControlPrimary5IntensityAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7119,28 +7282,28 @@ class CHIPPumpConfigurationAndControlMinCompPressureAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback
-    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxCompPressureAttributeCallbackType>
+class CHIPColorControlPrimary6IntensityAttributeCallback
+    : public chip::Callback::Callback<CHIPColorControlClusterPrimary6IntensityAttributeCallbackType>
 {
 public:
-    CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPColorControlPrimary6IntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback();
+    ~CHIPColorControlPrimary6IntensityAttributeCallback();
 
-    static void maybeDestroy(CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback * callback)
+    static void maybeDestroy(CHIPColorControlPrimary6IntensityAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPColorControlPrimary6IntensityAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPColorControlPrimary6IntensityAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7149,28 +7312,28 @@ class CHIPPumpConfigurationAndControlMaxCompPressureAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback
-    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMinConstSpeedAttributeCallbackType>
+class CHIPColorControlColorPointRIntensityAttributeCallback
+    : public chip::Callback::Callback<CHIPColorControlClusterColorPointRIntensityAttributeCallbackType>
 {
 public:
-    CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPColorControlColorPointRIntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback();
+    ~CHIPColorControlColorPointRIntensityAttributeCallback();
 
-    static void maybeDestroy(CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback * callback)
+    static void maybeDestroy(CHIPColorControlColorPointRIntensityAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPColorControlColorPointRIntensityAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPColorControlColorPointRIntensityAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7179,28 +7342,28 @@ class CHIPPumpConfigurationAndControlMinConstSpeedAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback
-    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxConstSpeedAttributeCallbackType>
+class CHIPColorControlColorPointGIntensityAttributeCallback
+    : public chip::Callback::Callback<CHIPColorControlClusterColorPointGIntensityAttributeCallbackType>
 {
 public:
-    CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPColorControlColorPointGIntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback();
+    ~CHIPColorControlColorPointGIntensityAttributeCallback();
 
-    static void maybeDestroy(CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback * callback)
+    static void maybeDestroy(CHIPColorControlColorPointGIntensityAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPColorControlColorPointGIntensityAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPColorControlColorPointGIntensityAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7209,28 +7372,28 @@ class CHIPPumpConfigurationAndControlMaxConstSpeedAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback
-    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMinConstFlowAttributeCallbackType>
+class CHIPColorControlColorPointBIntensityAttributeCallback
+    : public chip::Callback::Callback<CHIPColorControlClusterColorPointBIntensityAttributeCallbackType>
 {
 public:
-    CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPColorControlColorPointBIntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback();
+    ~CHIPColorControlColorPointBIntensityAttributeCallback();
 
-    static void maybeDestroy(CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback * callback)
+    static void maybeDestroy(CHIPColorControlColorPointBIntensityAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPColorControlColorPointBIntensityAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPColorControlColorPointBIntensityAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7239,28 +7402,28 @@ class CHIPPumpConfigurationAndControlMinConstFlowAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback
-    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxConstFlowAttributeCallbackType>
+class CHIPColorControlGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPColorControlClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPColorControlGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback();
+    ~CHIPColorControlGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback * callback)
+    static void maybeDestroy(CHIPColorControlGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPColorControlGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPColorControlGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7269,28 +7432,28 @@ class CHIPPumpConfigurationAndControlMaxConstFlowAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPumpConfigurationAndControlMinConstTempAttributeCallback
-    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMinConstTempAttributeCallbackType>
+class CHIPColorControlAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPColorControlClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPPumpConfigurationAndControlMinConstTempAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPColorControlAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPumpConfigurationAndControlMinConstTempAttributeCallback();
+    ~CHIPColorControlAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPPumpConfigurationAndControlMinConstTempAttributeCallback * callback)
+    static void maybeDestroy(CHIPColorControlAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPumpConfigurationAndControlMinConstTempAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPColorControlAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPumpConfigurationAndControlMinConstTempAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPColorControlAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7299,28 +7462,28 @@ class CHIPPumpConfigurationAndControlMinConstTempAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback
-    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterMaxConstTempAttributeCallbackType>
+class CHIPColorControlAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPColorControlClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPColorControlAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback();
+    ~CHIPColorControlAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback * callback)
+    static void maybeDestroy(CHIPColorControlAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPColorControlAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPColorControlAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7329,28 +7492,28 @@ class CHIPPumpConfigurationAndControlMaxConstTempAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPumpConfigurationAndControlCapacityAttributeCallback
-    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterCapacityAttributeCallbackType>
+class CHIPIlluminanceMeasurementMeasuredValueAttributeCallback
+    : public chip::Callback::Callback<CHIPIlluminanceMeasurementClusterMeasuredValueAttributeCallbackType>
 {
 public:
-    CHIPPumpConfigurationAndControlCapacityAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPIlluminanceMeasurementMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPumpConfigurationAndControlCapacityAttributeCallback();
+    ~CHIPIlluminanceMeasurementMeasuredValueAttributeCallback();
 
-    static void maybeDestroy(CHIPPumpConfigurationAndControlCapacityAttributeCallback * callback)
+    static void maybeDestroy(CHIPIlluminanceMeasurementMeasuredValueAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPumpConfigurationAndControlCapacityAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPIlluminanceMeasurementMeasuredValueAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPumpConfigurationAndControlCapacityAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPIlluminanceMeasurementMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7359,20 +7522,20 @@ class CHIPPumpConfigurationAndControlCapacityAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPumpConfigurationAndControlSpeedAttributeCallback
-    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterSpeedAttributeCallbackType>
+class CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback
+    : public chip::Callback::Callback<CHIPIlluminanceMeasurementClusterMinMeasuredValueAttributeCallbackType>
 {
 public:
-    CHIPPumpConfigurationAndControlSpeedAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPumpConfigurationAndControlSpeedAttributeCallback();
+    ~CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback();
 
-    static void maybeDestroy(CHIPPumpConfigurationAndControlSpeedAttributeCallback * callback)
+    static void maybeDestroy(CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPumpConfigurationAndControlSpeedAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback>(callback);
         }
     }
 
@@ -7380,7 +7543,7 @@ class CHIPPumpConfigurationAndControlSpeedAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPumpConfigurationAndControlSpeedAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPIlluminanceMeasurementMinMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7389,28 +7552,28 @@ class CHIPPumpConfigurationAndControlSpeedAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback
-    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterLifetimeRunningHoursAttributeCallbackType>
+class CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback
+    : public chip::Callback::Callback<CHIPIlluminanceMeasurementClusterMaxMeasuredValueAttributeCallbackType>
 {
 public:
-    CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback();
+    ~CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback();
 
-    static void maybeDestroy(CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback * callback)
+    static void maybeDestroy(CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint32_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7419,28 +7582,28 @@ class CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPumpConfigurationAndControlPowerAttributeCallback
-    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterPowerAttributeCallbackType>
+class CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback
+    : public chip::Callback::Callback<CHIPIlluminanceMeasurementClusterLightSensorTypeAttributeCallbackType>
 {
 public:
-    CHIPPumpConfigurationAndControlPowerAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPumpConfigurationAndControlPowerAttributeCallback();
+    ~CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback();
 
-    static void maybeDestroy(CHIPPumpConfigurationAndControlPowerAttributeCallback * callback)
+    static void maybeDestroy(CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPumpConfigurationAndControlPowerAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint32_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPumpConfigurationAndControlPowerAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7449,28 +7612,28 @@ class CHIPPumpConfigurationAndControlPowerAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback
-    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterLifetimeEnergyConsumedAttributeCallbackType>
+class CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPIlluminanceMeasurementClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback();
+    ~CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback * callback)
+    static void maybeDestroy(CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint32_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPIlluminanceMeasurementGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7479,20 +7642,20 @@ class CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterGeneratedCommandListAttributeCallbackType>
+class CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPIlluminanceMeasurementClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback();
+    ~CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -7500,7 +7663,7 @@ class CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPIlluminanceMeasurementAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7509,28 +7672,28 @@ class CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterAcceptedCommandListAttributeCallbackType>
+class CHIPIlluminanceMeasurementAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPIlluminanceMeasurementClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPIlluminanceMeasurementAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback();
+    ~CHIPIlluminanceMeasurementAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPIlluminanceMeasurementAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPIlluminanceMeasurementAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPIlluminanceMeasurementAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7539,28 +7702,28 @@ class CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPPumpConfigurationAndControlAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterAttributeListAttributeCallbackType>
+class CHIPTemperatureMeasurementMeasuredValueAttributeCallback
+    : public chip::Callback::Callback<CHIPTemperatureMeasurementClusterMeasuredValueAttributeCallbackType>
 {
 public:
-    CHIPPumpConfigurationAndControlAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTemperatureMeasurementMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPPumpConfigurationAndControlAttributeListAttributeCallback();
+    ~CHIPTemperatureMeasurementMeasuredValueAttributeCallback();
 
-    static void maybeDestroy(CHIPPumpConfigurationAndControlAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPTemperatureMeasurementMeasuredValueAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPPumpConfigurationAndControlAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTemperatureMeasurementMeasuredValueAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPPumpConfigurationAndControlAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTemperatureMeasurementMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7569,28 +7732,28 @@ class CHIPPumpConfigurationAndControlAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback
-    : public chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterMeasuredValueAttributeCallbackType>
+class CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback
+    : public chip::Callback::Callback<CHIPTemperatureMeasurementClusterMinMeasuredValueAttributeCallbackType>
 {
 public:
-    CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback();
+    ~CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback();
 
-    static void maybeDestroy(CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback * callback)
+    static void maybeDestroy(CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7599,28 +7762,28 @@ class CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback
     bool keepAlive;
 };
 
-class CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback
-    : public chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterMinMeasuredValueAttributeCallbackType>
+class CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback
+    : public chip::Callback::Callback<CHIPTemperatureMeasurementClusterMaxMeasuredValueAttributeCallbackType>
 {
 public:
-    CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback();
+    ~CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback();
 
-    static void maybeDestroy(CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback * callback)
+    static void maybeDestroy(CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7629,28 +7792,28 @@ class CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback
     bool keepAlive;
 };
 
-class CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback
-    : public chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterMaxMeasuredValueAttributeCallbackType>
+class CHIPTemperatureMeasurementAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPTemperatureMeasurementClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTemperatureMeasurementAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback();
+    ~CHIPTemperatureMeasurementAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback * callback)
+    static void maybeDestroy(CHIPTemperatureMeasurementAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTemperatureMeasurementAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTemperatureMeasurementAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7659,28 +7822,28 @@ class CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback
     bool keepAlive;
 };
 
-class CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterGeneratedCommandListAttributeCallbackType>
+class CHIPPressureMeasurementMeasuredValueAttributeCallback
+    : public chip::Callback::Callback<CHIPPressureMeasurementClusterMeasuredValueAttributeCallbackType>
 {
 public:
-    CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPressureMeasurementMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback();
+    ~CHIPPressureMeasurementMeasuredValueAttributeCallback();
 
-    static void maybeDestroy(CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPPressureMeasurementMeasuredValueAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPressureMeasurementMeasuredValueAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPressureMeasurementMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7689,28 +7852,28 @@ class CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterAcceptedCommandListAttributeCallbackType>
+class CHIPPressureMeasurementMinMeasuredValueAttributeCallback
+    : public chip::Callback::Callback<CHIPPressureMeasurementClusterMinMeasuredValueAttributeCallbackType>
 {
 public:
-    CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPressureMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback();
+    ~CHIPPressureMeasurementMinMeasuredValueAttributeCallback();
 
-    static void maybeDestroy(CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPPressureMeasurementMinMeasuredValueAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPressureMeasurementMinMeasuredValueAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPressureMeasurementMinMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7719,28 +7882,28 @@ class CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPRelativeHumidityMeasurementAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterAttributeListAttributeCallbackType>
-{
+class CHIPPressureMeasurementMaxMeasuredValueAttributeCallback
+    : public chip::Callback::Callback<CHIPPressureMeasurementClusterMaxMeasuredValueAttributeCallbackType>
+{
 public:
-    CHIPRelativeHumidityMeasurementAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPressureMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPRelativeHumidityMeasurementAttributeListAttributeCallback();
+    ~CHIPPressureMeasurementMaxMeasuredValueAttributeCallback();
 
-    static void maybeDestroy(CHIPRelativeHumidityMeasurementAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPPressureMeasurementMaxMeasuredValueAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPRelativeHumidityMeasurementAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPressureMeasurementMaxMeasuredValueAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPRelativeHumidityMeasurementAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPressureMeasurementMaxMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7749,27 +7912,28 @@ class CHIPRelativeHumidityMeasurementAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPScenesCurrentGroupAttributeCallback : public chip::Callback::Callback<CHIPScenesClusterCurrentGroupAttributeCallbackType>
+class CHIPPressureMeasurementScaledValueAttributeCallback
+    : public chip::Callback::Callback<CHIPPressureMeasurementClusterScaledValueAttributeCallbackType>
 {
 public:
-    CHIPScenesCurrentGroupAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPressureMeasurementScaledValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPScenesCurrentGroupAttributeCallback();
+    ~CHIPPressureMeasurementScaledValueAttributeCallback();
 
-    static void maybeDestroy(CHIPScenesCurrentGroupAttributeCallback * callback)
+    static void maybeDestroy(CHIPPressureMeasurementScaledValueAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPScenesCurrentGroupAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPressureMeasurementScaledValueAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, chip::GroupId value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPScenesCurrentGroupAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPressureMeasurementScaledValueAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7778,28 +7942,28 @@ class CHIPScenesCurrentGroupAttributeCallback : public chip::Callback::Callback<
     bool keepAlive;
 };
 
-class CHIPScenesGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPScenesClusterGeneratedCommandListAttributeCallbackType>
+class CHIPPressureMeasurementMinScaledValueAttributeCallback
+    : public chip::Callback::Callback<CHIPPressureMeasurementClusterMinScaledValueAttributeCallbackType>
 {
 public:
-    CHIPScenesGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPressureMeasurementMinScaledValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPScenesGeneratedCommandListAttributeCallback();
+    ~CHIPPressureMeasurementMinScaledValueAttributeCallback();
 
-    static void maybeDestroy(CHIPScenesGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPPressureMeasurementMinScaledValueAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPScenesGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPressureMeasurementMinScaledValueAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPScenesGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPressureMeasurementMinScaledValueAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7808,28 +7972,28 @@ class CHIPScenesGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPScenesAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPScenesClusterAcceptedCommandListAttributeCallbackType>
+class CHIPPressureMeasurementMaxScaledValueAttributeCallback
+    : public chip::Callback::Callback<CHIPPressureMeasurementClusterMaxScaledValueAttributeCallbackType>
 {
 public:
-    CHIPScenesAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPressureMeasurementMaxScaledValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPScenesAcceptedCommandListAttributeCallback();
+    ~CHIPPressureMeasurementMaxScaledValueAttributeCallback();
 
-    static void maybeDestroy(CHIPScenesAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPPressureMeasurementMaxScaledValueAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPScenesAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPressureMeasurementMaxScaledValueAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPScenesAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPressureMeasurementMaxScaledValueAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7838,20 +8002,20 @@ class CHIPScenesAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPScenesAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPScenesClusterAttributeListAttributeCallbackType>
+class CHIPPressureMeasurementAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPPressureMeasurementClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPScenesAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPPressureMeasurementAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPScenesAttributeListAttributeCallback();
+    ~CHIPPressureMeasurementAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPScenesAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPPressureMeasurementAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPScenesAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPPressureMeasurementAttributeListAttributeCallback>(callback);
         }
     }
 
@@ -7859,7 +8023,7 @@ class CHIPScenesAttributeListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPScenesAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPPressureMeasurementAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7868,31 +8032,28 @@ class CHIPScenesAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback
-    : public chip::Callback::Callback<CHIPSoftwareDiagnosticsClusterThreadMetricsAttributeCallbackType>
+class CHIPFlowMeasurementMeasuredValueAttributeCallback
+    : public chip::Callback::Callback<CHIPFlowMeasurementClusterMeasuredValueAttributeCallbackType>
 {
 public:
-    CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPFlowMeasurementMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback();
+    ~CHIPFlowMeasurementMeasuredValueAttributeCallback();
 
-    static void maybeDestroy(CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback * callback)
+    static void maybeDestroy(CHIPFlowMeasurementMeasuredValueAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPFlowMeasurementMeasuredValueAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType> &
-            list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPFlowMeasurementMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7901,28 +8062,28 @@ class CHIPSoftwareDiagnosticsThreadMetricsAttributeCallback
     bool keepAlive;
 };
 
-class CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPSoftwareDiagnosticsClusterGeneratedCommandListAttributeCallbackType>
+class CHIPFlowMeasurementMinMeasuredValueAttributeCallback
+    : public chip::Callback::Callback<CHIPFlowMeasurementClusterMinMeasuredValueAttributeCallbackType>
 {
 public:
-    CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPFlowMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback();
+    ~CHIPFlowMeasurementMinMeasuredValueAttributeCallback();
 
-    static void maybeDestroy(CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPFlowMeasurementMinMeasuredValueAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPFlowMeasurementMinMeasuredValueAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPFlowMeasurementMinMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7931,28 +8092,28 @@ class CHIPSoftwareDiagnosticsGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPSoftwareDiagnosticsClusterAcceptedCommandListAttributeCallbackType>
+class CHIPFlowMeasurementMaxMeasuredValueAttributeCallback
+    : public chip::Callback::Callback<CHIPFlowMeasurementClusterMaxMeasuredValueAttributeCallbackType>
 {
 public:
-    CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPFlowMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback();
+    ~CHIPFlowMeasurementMaxMeasuredValueAttributeCallback();
 
-    static void maybeDestroy(CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPFlowMeasurementMaxMeasuredValueAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPFlowMeasurementMaxMeasuredValueAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPFlowMeasurementMaxMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7961,28 +8122,28 @@ class CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPSoftwareDiagnosticsAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPSoftwareDiagnosticsClusterAttributeListAttributeCallbackType>
+class CHIPFlowMeasurementGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPFlowMeasurementClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPSoftwareDiagnosticsAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPFlowMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPSoftwareDiagnosticsAttributeListAttributeCallback();
+    ~CHIPFlowMeasurementGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPSoftwareDiagnosticsAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPFlowMeasurementGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPSoftwareDiagnosticsAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPFlowMeasurementGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPSoftwareDiagnosticsAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPFlowMeasurementGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -7991,20 +8152,20 @@ class CHIPSoftwareDiagnosticsAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPSwitchGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPSwitchClusterGeneratedCommandListAttributeCallbackType>
+class CHIPFlowMeasurementAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPFlowMeasurementClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPSwitchGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPFlowMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPSwitchGeneratedCommandListAttributeCallback();
+    ~CHIPFlowMeasurementAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPSwitchGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPFlowMeasurementAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPSwitchGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPFlowMeasurementAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -8012,7 +8173,7 @@ class CHIPSwitchGeneratedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPSwitchGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPFlowMeasurementAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8021,28 +8182,28 @@ class CHIPSwitchGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPSwitchAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPSwitchClusterAcceptedCommandListAttributeCallbackType>
+class CHIPFlowMeasurementAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPFlowMeasurementClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPSwitchAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPFlowMeasurementAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPSwitchAcceptedCommandListAttributeCallback();
+    ~CHIPFlowMeasurementAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPSwitchAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPFlowMeasurementAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPSwitchAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPFlowMeasurementAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPSwitchAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPFlowMeasurementAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8051,28 +8212,28 @@ class CHIPSwitchAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPSwitchAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPSwitchClusterAttributeListAttributeCallbackType>
+class CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback
+    : public chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterMeasuredValueAttributeCallbackType>
 {
 public:
-    CHIPSwitchAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPSwitchAttributeListAttributeCallback();
+    ~CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback();
 
-    static void maybeDestroy(CHIPSwitchAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPSwitchAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPSwitchAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPRelativeHumidityMeasurementMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8081,30 +8242,28 @@ class CHIPSwitchAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTargetNavigatorTargetListAttributeCallback
-    : public chip::Callback::Callback<CHIPTargetNavigatorClusterTargetListAttributeCallbackType>
+class CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback
+    : public chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterMinMeasuredValueAttributeCallbackType>
 {
 public:
-    CHIPTargetNavigatorTargetListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTargetNavigatorTargetListAttributeCallback();
+    ~CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback();
 
-    static void maybeDestroy(CHIPTargetNavigatorTargetListAttributeCallback * callback)
+    static void maybeDestroy(CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTargetNavigatorTargetListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTargetNavigatorTargetListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8113,28 +8272,28 @@ class CHIPTargetNavigatorTargetListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTargetNavigatorGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPTargetNavigatorClusterGeneratedCommandListAttributeCallbackType>
+class CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback
+    : public chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterMaxMeasuredValueAttributeCallbackType>
 {
 public:
-    CHIPTargetNavigatorGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTargetNavigatorGeneratedCommandListAttributeCallback();
+    ~CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback();
 
-    static void maybeDestroy(CHIPTargetNavigatorGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTargetNavigatorGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTargetNavigatorGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8143,20 +8302,20 @@ class CHIPTargetNavigatorGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTargetNavigatorAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPTargetNavigatorClusterAcceptedCommandListAttributeCallbackType>
+class CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPTargetNavigatorAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTargetNavigatorAcceptedCommandListAttributeCallback();
+    ~CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPTargetNavigatorAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTargetNavigatorAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -8164,7 +8323,7 @@ class CHIPTargetNavigatorAcceptedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTargetNavigatorAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8173,28 +8332,28 @@ class CHIPTargetNavigatorAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTargetNavigatorAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPTargetNavigatorClusterAttributeListAttributeCallbackType>
+class CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPTargetNavigatorAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTargetNavigatorAttributeListAttributeCallback();
+    ~CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPTargetNavigatorAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTargetNavigatorAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTargetNavigatorAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8203,110 +8362,20 @@ class CHIPTargetNavigatorAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTemperatureMeasurementMeasuredValueAttributeCallback
-    : public chip::Callback::Callback<CHIPTemperatureMeasurementClusterMeasuredValueAttributeCallbackType>
-{
-public:
-    CHIPTemperatureMeasurementMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
-
-    ~CHIPTemperatureMeasurementMeasuredValueAttributeCallback();
-
-    static void maybeDestroy(CHIPTemperatureMeasurementMeasuredValueAttributeCallback * callback)
-    {
-        if (!callback->keepAlive)
-        {
-            callback->Cancel();
-            chip::Platform::Delete<CHIPTemperatureMeasurementMeasuredValueAttributeCallback>(callback);
-        }
-    }
-
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
-    static void OnSubscriptionEstablished(void * context)
-    {
-        CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTemperatureMeasurementMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
-    };
-
-private:
-    jobject javaCallbackRef;
-    bool keepAlive;
-};
-
-class CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback
-    : public chip::Callback::Callback<CHIPTemperatureMeasurementClusterMinMeasuredValueAttributeCallbackType>
-{
-public:
-    CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
-
-    ~CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback();
-
-    static void maybeDestroy(CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback * callback)
-    {
-        if (!callback->keepAlive)
-        {
-            callback->Cancel();
-            chip::Platform::Delete<CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback>(callback);
-        }
-    }
-
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
-    static void OnSubscriptionEstablished(void * context)
-    {
-        CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTemperatureMeasurementMinMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
-    };
-
-private:
-    jobject javaCallbackRef;
-    bool keepAlive;
-};
-
-class CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback
-    : public chip::Callback::Callback<CHIPTemperatureMeasurementClusterMaxMeasuredValueAttributeCallbackType>
-{
-public:
-    CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive = false);
-
-    ~CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback();
-
-    static void maybeDestroy(CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback * callback)
-    {
-        if (!callback->keepAlive)
-        {
-            callback->Cancel();
-            chip::Platform::Delete<CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback>(callback);
-        }
-    }
-
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
-    static void OnSubscriptionEstablished(void * context)
-    {
-        CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTemperatureMeasurementMaxMeasuredValueAttributeCallback *>(context)->javaCallbackRef);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
-    };
-
-private:
-    jobject javaCallbackRef;
-    bool keepAlive;
-};
-
-class CHIPTemperatureMeasurementAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPTemperatureMeasurementClusterAttributeListAttributeCallbackType>
+class CHIPRelativeHumidityMeasurementAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPTemperatureMeasurementAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPRelativeHumidityMeasurementAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTemperatureMeasurementAttributeListAttributeCallback();
+    ~CHIPRelativeHumidityMeasurementAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPTemperatureMeasurementAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPRelativeHumidityMeasurementAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTemperatureMeasurementAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPRelativeHumidityMeasurementAttributeListAttributeCallback>(callback);
         }
     }
 
@@ -8314,67 +8383,7 @@ class CHIPTemperatureMeasurementAttributeListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTemperatureMeasurementAttributeListAttributeCallback *>(context)->javaCallbackRef);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
-    };
-
-private:
-    jobject javaCallbackRef;
-    bool keepAlive;
-};
-
-class CHIPTestClusterListInt8uAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterListInt8uAttributeCallbackType>
-{
-public:
-    CHIPTestClusterListInt8uAttributeCallback(jobject javaCallback, bool keepAlive = false);
-
-    ~CHIPTestClusterListInt8uAttributeCallback();
-
-    static void maybeDestroy(CHIPTestClusterListInt8uAttributeCallback * callback)
-    {
-        if (!callback->keepAlive)
-        {
-            callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterListInt8uAttributeCallback>(callback);
-        }
-    }
-
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list);
-    static void OnSubscriptionEstablished(void * context)
-    {
-        CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterListInt8uAttributeCallback *>(context)->javaCallbackRef);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
-    };
-
-private:
-    jobject javaCallbackRef;
-    bool keepAlive;
-};
-
-class CHIPTestClusterListOctetStringAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterListOctetStringAttributeCallbackType>
-{
-public:
-    CHIPTestClusterListOctetStringAttributeCallback(jobject javaCallback, bool keepAlive = false);
-
-    ~CHIPTestClusterListOctetStringAttributeCallback();
-
-    static void maybeDestroy(CHIPTestClusterListOctetStringAttributeCallback * callback)
-    {
-        if (!callback->keepAlive)
-        {
-            callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterListOctetStringAttributeCallback>(callback);
-        }
-    }
-
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & list);
-    static void OnSubscriptionEstablished(void * context)
-    {
-        CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterListOctetStringAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPRelativeHumidityMeasurementAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8383,31 +8392,28 @@ class CHIPTestClusterListOctetStringAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterListStructOctetStringAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterListStructOctetStringAttributeCallbackType>
+class CHIPOccupancySensingGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPOccupancySensingClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterListStructOctetStringAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPOccupancySensingGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterListStructOctetStringAttributeCallback();
+    ~CHIPOccupancySensingGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterListStructOctetStringAttributeCallback * callback)
+    static void maybeDestroy(CHIPOccupancySensingGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterListStructOctetStringAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPOccupancySensingGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType> &
-            list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterListStructOctetStringAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPOccupancySensingGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8416,28 +8422,28 @@ class CHIPTestClusterListStructOctetStringAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterVendorIdAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterVendorIdAttributeCallbackType>
+class CHIPOccupancySensingAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPOccupancySensingClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterVendorIdAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPOccupancySensingAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterVendorIdAttributeCallback();
+    ~CHIPOccupancySensingAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterVendorIdAttributeCallback * callback)
+    static void maybeDestroy(CHIPOccupancySensingAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterVendorIdAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPOccupancySensingAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, chip::VendorId value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterVendorIdAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPOccupancySensingAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8446,30 +8452,28 @@ class CHIPTestClusterVendorIdAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterListNullablesAndOptionalsStructAttributeCallbackType>
+class CHIPOccupancySensingAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPOccupancySensingClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPOccupancySensingAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback();
+    ~CHIPOccupancySensingAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback * callback)
+    static void maybeDestroy(CHIPOccupancySensingAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPOccupancySensingAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context,
-                           const chip::app::DataModel::DecodableList<
-                               chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::DecodableType> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPOccupancySensingAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8478,28 +8482,28 @@ class CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterListLongOctetStringAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterListLongOctetStringAttributeCallbackType>
+class CHIPWakeOnLanGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPWakeOnLanClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterListLongOctetStringAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPWakeOnLanGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterListLongOctetStringAttributeCallback();
+    ~CHIPWakeOnLanGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterListLongOctetStringAttributeCallback * callback)
+    static void maybeDestroy(CHIPWakeOnLanGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterListLongOctetStringAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPWakeOnLanGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterListLongOctetStringAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPWakeOnLanGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8508,31 +8512,28 @@ class CHIPTestClusterListLongOctetStringAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterListFabricScopedAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterListFabricScopedAttributeCallbackType>
+class CHIPWakeOnLanAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPWakeOnLanClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterListFabricScopedAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPWakeOnLanAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterListFabricScopedAttributeCallback();
+    ~CHIPWakeOnLanAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterListFabricScopedAttributeCallback * callback)
+    static void maybeDestroy(CHIPWakeOnLanAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterListFabricScopedAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPWakeOnLanAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestFabricScoped::DecodableType> &
-            list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterListFabricScopedAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPWakeOnLanAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8541,28 +8542,28 @@ class CHIPTestClusterListFabricScopedAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableBooleanAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableBooleanAttributeCallbackType>
+class CHIPWakeOnLanAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPWakeOnLanClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableBooleanAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPWakeOnLanAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableBooleanAttributeCallback();
+    ~CHIPWakeOnLanAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableBooleanAttributeCallback * callback)
+    static void maybeDestroy(CHIPWakeOnLanAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableBooleanAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPWakeOnLanAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<bool> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableBooleanAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPWakeOnLanAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8571,30 +8572,29 @@ class CHIPTestClusterNullableBooleanAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableBitmap8AttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableBitmap8AttributeCallbackType>
+class CHIPChannelChannelListAttributeCallback : public chip::Callback::Callback<CHIPChannelClusterChannelListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableBitmap8AttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPChannelChannelListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableBitmap8AttributeCallback();
+    ~CHIPChannelChannelListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableBitmap8AttributeCallback * callback)
+    static void maybeDestroy(CHIPChannelChannelListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableBitmap8AttributeCallback>(callback);
+            chip::Platform::Delete<CHIPChannelChannelListAttributeCallback>(callback);
         }
     }
 
     static void
     CallbackFn(void * context,
-               const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> & value);
+               const chip::app::DataModel::DecodableList<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableBitmap8AttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPChannelChannelListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8603,30 +8603,28 @@ class CHIPTestClusterNullableBitmap8AttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableBitmap16AttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableBitmap16AttributeCallbackType>
+class CHIPChannelGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPChannelClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableBitmap16AttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPChannelGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableBitmap16AttributeCallback();
+    ~CHIPChannelGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableBitmap16AttributeCallback * callback)
+    static void maybeDestroy(CHIPChannelGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableBitmap16AttributeCallback>(callback);
+            chip::Platform::Delete<CHIPChannelGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void
-    CallbackFn(void * context,
-               const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableBitmap16AttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPChannelGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8635,30 +8633,28 @@ class CHIPTestClusterNullableBitmap16AttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableBitmap32AttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableBitmap32AttributeCallbackType>
+class CHIPChannelAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPChannelClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableBitmap32AttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPChannelAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableBitmap32AttributeCallback();
+    ~CHIPChannelAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableBitmap32AttributeCallback * callback)
+    static void maybeDestroy(CHIPChannelAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableBitmap32AttributeCallback>(callback);
+            chip::Platform::Delete<CHIPChannelAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void
-    CallbackFn(void * context,
-               const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableBitmap32AttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPChannelAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8667,30 +8663,28 @@ class CHIPTestClusterNullableBitmap32AttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableBitmap64AttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableBitmap64AttributeCallbackType>
+class CHIPChannelAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPChannelClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableBitmap64AttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPChannelAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableBitmap64AttributeCallback();
+    ~CHIPChannelAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableBitmap64AttributeCallback * callback)
+    static void maybeDestroy(CHIPChannelAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableBitmap64AttributeCallback>(callback);
+            chip::Platform::Delete<CHIPChannelAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void
-    CallbackFn(void * context,
-               const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableBitmap64AttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPChannelAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8699,28 +8693,30 @@ class CHIPTestClusterNullableBitmap64AttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableInt8uAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt8uAttributeCallbackType>
+class CHIPTargetNavigatorTargetListAttributeCallback
+    : public chip::Callback::Callback<CHIPTargetNavigatorClusterTargetListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableInt8uAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTargetNavigatorTargetListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableInt8uAttributeCallback();
+    ~CHIPTargetNavigatorTargetListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableInt8uAttributeCallback * callback)
+    static void maybeDestroy(CHIPTargetNavigatorTargetListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableInt8uAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTargetNavigatorTargetListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void CallbackFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableInt8uAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTargetNavigatorTargetListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8729,28 +8725,28 @@ class CHIPTestClusterNullableInt8uAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableInt16uAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt16uAttributeCallbackType>
+class CHIPTargetNavigatorGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPTargetNavigatorClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableInt16uAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTargetNavigatorGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableInt16uAttributeCallback();
+    ~CHIPTargetNavigatorGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableInt16uAttributeCallback * callback)
+    static void maybeDestroy(CHIPTargetNavigatorGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableInt16uAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTargetNavigatorGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableInt16uAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTargetNavigatorGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8759,28 +8755,28 @@ class CHIPTestClusterNullableInt16uAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableInt24uAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt24uAttributeCallbackType>
+class CHIPTargetNavigatorAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPTargetNavigatorClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableInt24uAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTargetNavigatorAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableInt24uAttributeCallback();
+    ~CHIPTargetNavigatorAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableInt24uAttributeCallback * callback)
+    static void maybeDestroy(CHIPTargetNavigatorAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableInt24uAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTargetNavigatorAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint32_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableInt24uAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTargetNavigatorAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8789,28 +8785,28 @@ class CHIPTestClusterNullableInt24uAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableInt32uAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt32uAttributeCallbackType>
+class CHIPTargetNavigatorAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPTargetNavigatorClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableInt32uAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTargetNavigatorAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableInt32uAttributeCallback();
+    ~CHIPTargetNavigatorAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableInt32uAttributeCallback * callback)
+    static void maybeDestroy(CHIPTargetNavigatorAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableInt32uAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTargetNavigatorAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint32_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableInt32uAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTargetNavigatorAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8819,20 +8815,20 @@ class CHIPTestClusterNullableInt32uAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableInt40uAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt40uAttributeCallbackType>
+class CHIPMediaPlaybackStartTimeAttributeCallback
+    : public chip::Callback::Callback<CHIPMediaPlaybackClusterStartTimeAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableInt40uAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPMediaPlaybackStartTimeAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableInt40uAttributeCallback();
+    ~CHIPMediaPlaybackStartTimeAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableInt40uAttributeCallback * callback)
+    static void maybeDestroy(CHIPMediaPlaybackStartTimeAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableInt40uAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPMediaPlaybackStartTimeAttributeCallback>(callback);
         }
     }
 
@@ -8840,7 +8836,7 @@ class CHIPTestClusterNullableInt40uAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableInt40uAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPMediaPlaybackStartTimeAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8849,20 +8845,20 @@ class CHIPTestClusterNullableInt40uAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableInt48uAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt48uAttributeCallbackType>
+class CHIPMediaPlaybackDurationAttributeCallback
+    : public chip::Callback::Callback<CHIPMediaPlaybackClusterDurationAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableInt48uAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPMediaPlaybackDurationAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableInt48uAttributeCallback();
+    ~CHIPMediaPlaybackDurationAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableInt48uAttributeCallback * callback)
+    static void maybeDestroy(CHIPMediaPlaybackDurationAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableInt48uAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPMediaPlaybackDurationAttributeCallback>(callback);
         }
     }
 
@@ -8870,7 +8866,7 @@ class CHIPTestClusterNullableInt48uAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableInt48uAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPMediaPlaybackDurationAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8879,20 +8875,20 @@ class CHIPTestClusterNullableInt48uAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableInt56uAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt56uAttributeCallbackType>
+class CHIPMediaPlaybackSeekRangeEndAttributeCallback
+    : public chip::Callback::Callback<CHIPMediaPlaybackClusterSeekRangeEndAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableInt56uAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPMediaPlaybackSeekRangeEndAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableInt56uAttributeCallback();
+    ~CHIPMediaPlaybackSeekRangeEndAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableInt56uAttributeCallback * callback)
+    static void maybeDestroy(CHIPMediaPlaybackSeekRangeEndAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableInt56uAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPMediaPlaybackSeekRangeEndAttributeCallback>(callback);
         }
     }
 
@@ -8900,7 +8896,7 @@ class CHIPTestClusterNullableInt56uAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableInt56uAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPMediaPlaybackSeekRangeEndAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8909,20 +8905,20 @@ class CHIPTestClusterNullableInt56uAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableInt64uAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt64uAttributeCallbackType>
+class CHIPMediaPlaybackSeekRangeStartAttributeCallback
+    : public chip::Callback::Callback<CHIPMediaPlaybackClusterSeekRangeStartAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableInt64uAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPMediaPlaybackSeekRangeStartAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableInt64uAttributeCallback();
+    ~CHIPMediaPlaybackSeekRangeStartAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableInt64uAttributeCallback * callback)
+    static void maybeDestroy(CHIPMediaPlaybackSeekRangeStartAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableInt64uAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPMediaPlaybackSeekRangeStartAttributeCallback>(callback);
         }
     }
 
@@ -8930,7 +8926,7 @@ class CHIPTestClusterNullableInt64uAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableInt64uAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPMediaPlaybackSeekRangeStartAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8939,28 +8935,28 @@ class CHIPTestClusterNullableInt64uAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableInt8sAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt8sAttributeCallbackType>
+class CHIPMediaPlaybackGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPMediaPlaybackClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableInt8sAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPMediaPlaybackGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableInt8sAttributeCallback();
+    ~CHIPMediaPlaybackGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableInt8sAttributeCallback * callback)
+    static void maybeDestroy(CHIPMediaPlaybackGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableInt8sAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPMediaPlaybackGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int8_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableInt8sAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPMediaPlaybackGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8969,28 +8965,28 @@ class CHIPTestClusterNullableInt8sAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableInt16sAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt16sAttributeCallbackType>
+class CHIPMediaPlaybackAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPMediaPlaybackClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableInt16sAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPMediaPlaybackAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableInt16sAttributeCallback();
+    ~CHIPMediaPlaybackAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableInt16sAttributeCallback * callback)
+    static void maybeDestroy(CHIPMediaPlaybackAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableInt16sAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPMediaPlaybackAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableInt16sAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPMediaPlaybackAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -8999,28 +8995,28 @@ class CHIPTestClusterNullableInt16sAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableInt24sAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt24sAttributeCallbackType>
+class CHIPMediaPlaybackAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPMediaPlaybackClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableInt24sAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPMediaPlaybackAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableInt24sAttributeCallback();
+    ~CHIPMediaPlaybackAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableInt24sAttributeCallback * callback)
+    static void maybeDestroy(CHIPMediaPlaybackAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableInt24sAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPMediaPlaybackAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int32_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableInt24sAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPMediaPlaybackAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9029,28 +9025,30 @@ class CHIPTestClusterNullableInt24sAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableInt32sAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt32sAttributeCallbackType>
+class CHIPMediaInputInputListAttributeCallback
+    : public chip::Callback::Callback<CHIPMediaInputClusterInputListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableInt32sAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPMediaInputInputListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableInt32sAttributeCallback();
+    ~CHIPMediaInputInputListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableInt32sAttributeCallback * callback)
+    static void maybeDestroy(CHIPMediaInputInputListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableInt32sAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPMediaInputInputListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int32_t> & value);
+    static void CallbackFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::InputInfo::DecodableType> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableInt32sAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPMediaInputInputListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9059,28 +9057,28 @@ class CHIPTestClusterNullableInt32sAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableInt40sAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt40sAttributeCallbackType>
+class CHIPMediaInputGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPMediaInputClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableInt40sAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPMediaInputGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableInt40sAttributeCallback();
+    ~CHIPMediaInputGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableInt40sAttributeCallback * callback)
+    static void maybeDestroy(CHIPMediaInputGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableInt40sAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPMediaInputGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int64_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableInt40sAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPMediaInputGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9089,28 +9087,28 @@ class CHIPTestClusterNullableInt40sAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableInt48sAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt48sAttributeCallbackType>
+class CHIPMediaInputAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPMediaInputClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableInt48sAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPMediaInputAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableInt48sAttributeCallback();
+    ~CHIPMediaInputAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableInt48sAttributeCallback * callback)
+    static void maybeDestroy(CHIPMediaInputAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableInt48sAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPMediaInputAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int64_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableInt48sAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPMediaInputAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9119,28 +9117,28 @@ class CHIPTestClusterNullableInt48sAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableInt56sAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt56sAttributeCallbackType>
+class CHIPMediaInputAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPMediaInputClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableInt56sAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPMediaInputAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableInt56sAttributeCallback();
+    ~CHIPMediaInputAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableInt56sAttributeCallback * callback)
+    static void maybeDestroy(CHIPMediaInputAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableInt56sAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPMediaInputAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int64_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableInt56sAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPMediaInputAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9149,28 +9147,28 @@ class CHIPTestClusterNullableInt56sAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableInt64sAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt64sAttributeCallbackType>
+class CHIPLowPowerGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPLowPowerClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableInt64sAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPLowPowerGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableInt64sAttributeCallback();
+    ~CHIPLowPowerGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableInt64sAttributeCallback * callback)
+    static void maybeDestroy(CHIPLowPowerGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableInt64sAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPLowPowerGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int64_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableInt64sAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPLowPowerGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9179,28 +9177,28 @@ class CHIPTestClusterNullableInt64sAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableEnum8AttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableEnum8AttributeCallbackType>
+class CHIPLowPowerAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPLowPowerClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableEnum8AttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPLowPowerAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableEnum8AttributeCallback();
+    ~CHIPLowPowerAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableEnum8AttributeCallback * callback)
+    static void maybeDestroy(CHIPLowPowerAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableEnum8AttributeCallback>(callback);
+            chip::Platform::Delete<CHIPLowPowerAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableEnum8AttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPLowPowerAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9209,28 +9207,28 @@ class CHIPTestClusterNullableEnum8AttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableEnum16AttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableEnum16AttributeCallbackType>
+class CHIPLowPowerAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPLowPowerClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableEnum16AttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPLowPowerAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableEnum16AttributeCallback();
+    ~CHIPLowPowerAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableEnum16AttributeCallback * callback)
+    static void maybeDestroy(CHIPLowPowerAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableEnum16AttributeCallback>(callback);
+            chip::Platform::Delete<CHIPLowPowerAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableEnum16AttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPLowPowerAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9239,28 +9237,28 @@ class CHIPTestClusterNullableEnum16AttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableFloatSingleAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableFloatSingleAttributeCallbackType>
+class CHIPKeypadInputGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPKeypadInputClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableFloatSingleAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPKeypadInputGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableFloatSingleAttributeCallback();
+    ~CHIPKeypadInputGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableFloatSingleAttributeCallback * callback)
+    static void maybeDestroy(CHIPKeypadInputGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableFloatSingleAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPKeypadInputGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<float> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableFloatSingleAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPKeypadInputGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9269,28 +9267,28 @@ class CHIPTestClusterNullableFloatSingleAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableFloatDoubleAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableFloatDoubleAttributeCallbackType>
+class CHIPKeypadInputAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPKeypadInputClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableFloatDoubleAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPKeypadInputAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableFloatDoubleAttributeCallback();
+    ~CHIPKeypadInputAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableFloatDoubleAttributeCallback * callback)
+    static void maybeDestroy(CHIPKeypadInputAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableFloatDoubleAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPKeypadInputAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<double> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableFloatDoubleAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPKeypadInputAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9299,28 +9297,28 @@ class CHIPTestClusterNullableFloatDoubleAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableOctetStringAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableOctetStringAttributeCallbackType>
+class CHIPKeypadInputAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPKeypadInputClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableOctetStringAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPKeypadInputAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableOctetStringAttributeCallback();
+    ~CHIPKeypadInputAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableOctetStringAttributeCallback * callback)
+    static void maybeDestroy(CHIPKeypadInputAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableOctetStringAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPKeypadInputAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::ByteSpan> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableOctetStringAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPKeypadInputAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9329,28 +9327,28 @@ class CHIPTestClusterNullableOctetStringAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableCharStringAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableCharStringAttributeCallbackType>
+class CHIPContentLauncherAcceptHeaderAttributeCallback
+    : public chip::Callback::Callback<CHIPContentLauncherClusterAcceptHeaderAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableCharStringAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPContentLauncherAcceptHeaderAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableCharStringAttributeCallback();
+    ~CHIPContentLauncherAcceptHeaderAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableCharStringAttributeCallback * callback)
+    static void maybeDestroy(CHIPContentLauncherAcceptHeaderAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableCharStringAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPContentLauncherAcceptHeaderAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::CharSpan> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CharSpan> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableCharStringAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPContentLauncherAcceptHeaderAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9359,29 +9357,28 @@ class CHIPTestClusterNullableCharStringAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableEnumAttrAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableEnumAttrAttributeCallbackType>
+class CHIPContentLauncherGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPContentLauncherClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableEnumAttrAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPContentLauncherGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableEnumAttrAttributeCallback();
+    ~CHIPContentLauncherGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableEnumAttrAttributeCallback * callback)
+    static void maybeDestroy(CHIPContentLauncherGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableEnumAttrAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPContentLauncherGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context,
-                           const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableEnumAttrAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPContentLauncherGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9390,28 +9387,28 @@ class CHIPTestClusterNullableEnumAttrAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableRangeRestrictedInt8uAttributeCallbackType>
+class CHIPContentLauncherAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPContentLauncherClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPContentLauncherAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback();
+    ~CHIPContentLauncherAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback * callback)
+    static void maybeDestroy(CHIPContentLauncherAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPContentLauncherAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPContentLauncherAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9420,28 +9417,28 @@ class CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableRangeRestrictedInt8sAttributeCallbackType>
+class CHIPContentLauncherAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPContentLauncherClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPContentLauncherAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback();
+    ~CHIPContentLauncherAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback * callback)
+    static void maybeDestroy(CHIPContentLauncherAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPContentLauncherAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int8_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPContentLauncherAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9450,28 +9447,30 @@ class CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableRangeRestrictedInt16uAttributeCallbackType>
+class CHIPAudioOutputOutputListAttributeCallback
+    : public chip::Callback::Callback<CHIPAudioOutputClusterOutputListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPAudioOutputOutputListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback();
+    ~CHIPAudioOutputOutputListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback * callback)
+    static void maybeDestroy(CHIPAudioOutputOutputListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPAudioOutputOutputListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::OutputInfo::DecodableType> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPAudioOutputOutputListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9480,28 +9479,28 @@ class CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterNullableRangeRestrictedInt16sAttributeCallbackType>
+class CHIPAudioOutputGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPAudioOutputClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPAudioOutputGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback();
+    ~CHIPAudioOutputGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback * callback)
+    static void maybeDestroy(CHIPAudioOutputGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPAudioOutputGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPAudioOutputGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9510,20 +9509,20 @@ class CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterGeneratedCommandListAttributeCallbackType>
+class CHIPAudioOutputAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPAudioOutputClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPAudioOutputAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterGeneratedCommandListAttributeCallback();
+    ~CHIPAudioOutputAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPAudioOutputAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPAudioOutputAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -9531,7 +9530,7 @@ class CHIPTestClusterGeneratedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPAudioOutputAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9540,28 +9539,28 @@ class CHIPTestClusterGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterAcceptedCommandListAttributeCallbackType>
+class CHIPAudioOutputAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPAudioOutputClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPAudioOutputAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterAcceptedCommandListAttributeCallback();
+    ~CHIPAudioOutputAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPAudioOutputAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPAudioOutputAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPAudioOutputAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9570,28 +9569,28 @@ class CHIPTestClusterAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTestClusterAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPTestClusterClusterAttributeListAttributeCallbackType>
+class CHIPApplicationLauncherCatalogListAttributeCallback
+    : public chip::Callback::Callback<CHIPApplicationLauncherClusterCatalogListAttributeCallbackType>
 {
 public:
-    CHIPTestClusterAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPApplicationLauncherCatalogListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTestClusterAttributeListAttributeCallback();
+    ~CHIPApplicationLauncherCatalogListAttributeCallback();
 
-    static void maybeDestroy(CHIPTestClusterAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPApplicationLauncherCatalogListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTestClusterAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPApplicationLauncherCatalogListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint16_t> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTestClusterAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPApplicationLauncherCatalogListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9600,28 +9599,28 @@ class CHIPTestClusterAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThermostatLocalTemperatureAttributeCallback
-    : public chip::Callback::Callback<CHIPThermostatClusterLocalTemperatureAttributeCallbackType>
+class CHIPApplicationLauncherGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPApplicationLauncherClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPThermostatLocalTemperatureAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPApplicationLauncherGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThermostatLocalTemperatureAttributeCallback();
+    ~CHIPApplicationLauncherGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPThermostatLocalTemperatureAttributeCallback * callback)
+    static void maybeDestroy(CHIPApplicationLauncherGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThermostatLocalTemperatureAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPApplicationLauncherGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThermostatLocalTemperatureAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPApplicationLauncherGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9630,28 +9629,28 @@ class CHIPThermostatLocalTemperatureAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThermostatAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPThermostatClusterAttributeListAttributeCallbackType>
+class CHIPApplicationLauncherAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPApplicationLauncherClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPThermostatAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPApplicationLauncherAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThermostatAttributeListAttributeCallback();
+    ~CHIPApplicationLauncherAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPThermostatAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPApplicationLauncherAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThermostatAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPApplicationLauncherAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThermostatAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPApplicationLauncherAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9660,29 +9659,28 @@ class CHIPThermostatAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPThermostatUserInterfaceConfigurationClusterGeneratedCommandListAttributeCallbackType>
+class CHIPApplicationLauncherAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPApplicationLauncherClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPApplicationLauncherAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback();
+    ~CHIPApplicationLauncherAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPApplicationLauncherAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPApplicationLauncherAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback *>(context)
-                ->javaCallbackRef);
+            reinterpret_cast<CHIPApplicationLauncherAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9691,29 +9689,28 @@ class CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallb
     bool keepAlive;
 };
 
-class CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPThermostatUserInterfaceConfigurationClusterAcceptedCommandListAttributeCallbackType>
+class CHIPApplicationBasicAllowedVendorListAttributeCallback
+    : public chip::Callback::Callback<CHIPApplicationBasicClusterAllowedVendorListAttributeCallbackType>
 {
 public:
-    CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPApplicationBasicAllowedVendorListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback();
+    ~CHIPApplicationBasicAllowedVendorListAttributeCallback();
 
-    static void maybeDestroy(CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPApplicationBasicAllowedVendorListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPApplicationBasicAllowedVendorListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::VendorId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback *>(context)
-                ->javaCallbackRef);
+            reinterpret_cast<CHIPApplicationBasicAllowedVendorListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9722,28 +9719,28 @@ class CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallba
     bool keepAlive;
 };
 
-class CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPThermostatUserInterfaceConfigurationClusterAttributeListAttributeCallbackType>
+class CHIPApplicationBasicGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPApplicationBasicClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPApplicationBasicGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback();
+    ~CHIPApplicationBasicGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPApplicationBasicGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPApplicationBasicGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPApplicationBasicGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9752,28 +9749,28 @@ class CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThreadNetworkDiagnosticsChannelAttributeCallback
-    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterChannelAttributeCallbackType>
+class CHIPApplicationBasicAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPApplicationBasicClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPThreadNetworkDiagnosticsChannelAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPApplicationBasicAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThreadNetworkDiagnosticsChannelAttributeCallback();
+    ~CHIPApplicationBasicAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPThreadNetworkDiagnosticsChannelAttributeCallback * callback)
+    static void maybeDestroy(CHIPApplicationBasicAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsChannelAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPApplicationBasicAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsChannelAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPApplicationBasicAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9782,30 +9779,28 @@ class CHIPThreadNetworkDiagnosticsChannelAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback
-    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackType>
+class CHIPApplicationBasicAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPApplicationBasicClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPApplicationBasicAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback();
+    ~CHIPApplicationBasicAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback * callback)
+    static void maybeDestroy(CHIPApplicationBasicAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPApplicationBasicAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void
-    CallbackFn(void * context,
-               const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPApplicationBasicAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9814,28 +9809,28 @@ class CHIPThreadNetworkDiagnosticsRoutingRoleAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback
-    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterNetworkNameAttributeCallbackType>
+class CHIPAccountLoginGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPAccountLoginClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPAccountLoginGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback();
+    ~CHIPAccountLoginGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback * callback)
+    static void maybeDestroy(CHIPAccountLoginGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPAccountLoginGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::CharSpan> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPAccountLoginGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9844,28 +9839,28 @@ class CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThreadNetworkDiagnosticsPanIdAttributeCallback
-    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterPanIdAttributeCallbackType>
+class CHIPAccountLoginAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPAccountLoginClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPThreadNetworkDiagnosticsPanIdAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPAccountLoginAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThreadNetworkDiagnosticsPanIdAttributeCallback();
+    ~CHIPAccountLoginAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPThreadNetworkDiagnosticsPanIdAttributeCallback * callback)
+    static void maybeDestroy(CHIPAccountLoginAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsPanIdAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPAccountLoginAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsPanIdAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPAccountLoginAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9874,28 +9869,28 @@ class CHIPThreadNetworkDiagnosticsPanIdAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback
-    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterExtendedPanIdAttributeCallbackType>
+class CHIPAccountLoginAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPAccountLoginClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPAccountLoginAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback();
+    ~CHIPAccountLoginAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback * callback)
+    static void maybeDestroy(CHIPAccountLoginAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPAccountLoginAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint64_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPAccountLoginAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9904,28 +9899,28 @@ class CHIPThreadNetworkDiagnosticsExtendedPanIdAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback
-    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterMeshLocalPrefixAttributeCallbackType>
+class CHIPElectricalMeasurementGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPElectricalMeasurementClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPElectricalMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback();
+    ~CHIPElectricalMeasurementGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback * callback)
+    static void maybeDestroy(CHIPElectricalMeasurementGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPElectricalMeasurementGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::ByteSpan> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPElectricalMeasurementGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9934,30 +9929,28 @@ class CHIPThreadNetworkDiagnosticsMeshLocalPrefixAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback
-    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterNeighborTableListAttributeCallbackType>
+class CHIPElectricalMeasurementAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPElectricalMeasurementClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPElectricalMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback();
+    ~CHIPElectricalMeasurementAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback * callback)
+    static void maybeDestroy(CHIPElectricalMeasurementAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPElectricalMeasurementAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context,
-                           const chip::app::DataModel::DecodableList<
-                               chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPElectricalMeasurementAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9966,30 +9959,28 @@ class CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback
-    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterRouteTableListAttributeCallbackType>
+class CHIPElectricalMeasurementAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPElectricalMeasurementClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPElectricalMeasurementAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback();
+    ~CHIPElectricalMeasurementAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback * callback)
+    static void maybeDestroy(CHIPElectricalMeasurementAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPElectricalMeasurementAttributeListAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context,
-                           const chip::app::DataModel::DecodableList<
-                               chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPElectricalMeasurementAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -9998,28 +9989,28 @@ class CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback
-    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterPartitionIdAttributeCallbackType>
+class CHIPTestClusterListInt8uAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterListInt8uAttributeCallbackType>
 {
 public:
-    CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterListInt8uAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback();
+    ~CHIPTestClusterListInt8uAttributeCallback();
 
-    static void maybeDestroy(CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterListInt8uAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterListInt8uAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint32_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterListInt8uAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10028,28 +10019,28 @@ class CHIPThreadNetworkDiagnosticsPartitionIdAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThreadNetworkDiagnosticsWeightingAttributeCallback
-    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterWeightingAttributeCallbackType>
+class CHIPTestClusterListOctetStringAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterListOctetStringAttributeCallbackType>
 {
 public:
-    CHIPThreadNetworkDiagnosticsWeightingAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterListOctetStringAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThreadNetworkDiagnosticsWeightingAttributeCallback();
+    ~CHIPTestClusterListOctetStringAttributeCallback();
 
-    static void maybeDestroy(CHIPThreadNetworkDiagnosticsWeightingAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterListOctetStringAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsWeightingAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterListOctetStringAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsWeightingAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterListOctetStringAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10058,28 +10049,31 @@ class CHIPThreadNetworkDiagnosticsWeightingAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback
-    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterDataVersionAttributeCallbackType>
+class CHIPTestClusterListStructOctetStringAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterListStructOctetStringAttributeCallbackType>
 {
 public:
-    CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterListStructOctetStringAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback();
+    ~CHIPTestClusterListStructOctetStringAttributeCallback();
 
-    static void maybeDestroy(CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterListStructOctetStringAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterListStructOctetStringAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void CallbackFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType> &
+            list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterListStructOctetStringAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10088,28 +10082,28 @@ class CHIPThreadNetworkDiagnosticsDataVersionAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback
-    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterStableDataVersionAttributeCallbackType>
+class CHIPTestClusterVendorIdAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterVendorIdAttributeCallbackType>
 {
 public:
-    CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterVendorIdAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback();
+    ~CHIPTestClusterVendorIdAttributeCallback();
 
-    static void maybeDestroy(CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterVendorIdAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterVendorIdAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void CallbackFn(void * context, chip::VendorId value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterVendorIdAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10118,28 +10112,30 @@ class CHIPThreadNetworkDiagnosticsStableDataVersionAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback
-    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterLeaderRouterIdAttributeCallbackType>
+class CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterListNullablesAndOptionalsStructAttributeCallbackType>
 {
 public:
-    CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback();
+    ~CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback();
 
-    static void maybeDestroy(CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
+    static void CallbackFn(void * context,
+                           const chip::app::DataModel::DecodableList<
+                               chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::DecodableType> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterListNullablesAndOptionalsStructAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10148,28 +10144,28 @@ class CHIPThreadNetworkDiagnosticsLeaderRouterIdAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback
-    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterActiveTimestampAttributeCallbackType>
+class CHIPTestClusterListLongOctetStringAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterListLongOctetStringAttributeCallbackType>
 {
 public:
-    CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterListLongOctetStringAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback();
+    ~CHIPTestClusterListLongOctetStringAttributeCallback();
 
-    static void maybeDestroy(CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterListLongOctetStringAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterListLongOctetStringAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint64_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterListLongOctetStringAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10178,28 +10174,31 @@ class CHIPThreadNetworkDiagnosticsActiveTimestampAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback
-    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterPendingTimestampAttributeCallbackType>
+class CHIPTestClusterListFabricScopedAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterListFabricScopedAttributeCallbackType>
 {
 public:
-    CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterListFabricScopedAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback();
+    ~CHIPTestClusterListFabricScopedAttributeCallback();
 
-    static void maybeDestroy(CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterListFabricScopedAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterListFabricScopedAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint64_t> & value);
+    static void CallbackFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestFabricScoped::DecodableType> &
+            list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterListFabricScopedAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10208,28 +10207,28 @@ class CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThreadNetworkDiagnosticsDelayAttributeCallback
-    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterDelayAttributeCallbackType>
+class CHIPTestClusterNullableBooleanAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableBooleanAttributeCallbackType>
 {
 public:
-    CHIPThreadNetworkDiagnosticsDelayAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableBooleanAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThreadNetworkDiagnosticsDelayAttributeCallback();
+    ~CHIPTestClusterNullableBooleanAttributeCallback();
 
-    static void maybeDestroy(CHIPThreadNetworkDiagnosticsDelayAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableBooleanAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsDelayAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableBooleanAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint32_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<bool> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsDelayAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableBooleanAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10238,28 +10237,30 @@ class CHIPThreadNetworkDiagnosticsDelayAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback
-    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterChannelMaskAttributeCallbackType>
+class CHIPTestClusterNullableBitmap8AttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableBitmap8AttributeCallbackType>
 {
 public:
-    CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableBitmap8AttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback();
+    ~CHIPTestClusterNullableBitmap8AttributeCallback();
 
-    static void maybeDestroy(CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableBitmap8AttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableBitmap8AttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::ByteSpan> & value);
+    static void
+    CallbackFn(void * context,
+               const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableBitmap8AttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10268,30 +10269,30 @@ class CHIPThreadNetworkDiagnosticsChannelMaskAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback
-    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterActiveNetworkFaultsListAttributeCallbackType>
+class CHIPTestClusterNullableBitmap16AttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableBitmap16AttributeCallbackType>
 {
 public:
-    CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableBitmap16AttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback();
+    ~CHIPTestClusterNullableBitmap16AttributeCallback();
 
-    static void maybeDestroy(CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableBitmap16AttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableBitmap16AttributeCallback>(callback);
         }
     }
 
     static void
     CallbackFn(void * context,
-               const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & list);
+               const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableBitmap16AttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10300,28 +10301,30 @@ class CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterGeneratedCommandListAttributeCallbackType>
+class CHIPTestClusterNullableBitmap32AttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableBitmap32AttributeCallbackType>
 {
 public:
-    CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableBitmap32AttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback();
+    ~CHIPTestClusterNullableBitmap32AttributeCallback();
 
-    static void maybeDestroy(CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableBitmap32AttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableBitmap32AttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void
+    CallbackFn(void * context,
+               const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableBitmap32AttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10330,28 +10333,30 @@ class CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterAcceptedCommandListAttributeCallbackType>
+class CHIPTestClusterNullableBitmap64AttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableBitmap64AttributeCallbackType>
 {
 public:
-    CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableBitmap64AttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback();
+    ~CHIPTestClusterNullableBitmap64AttributeCallback();
 
-    static void maybeDestroy(CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableBitmap64AttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableBitmap64AttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void
+    CallbackFn(void * context,
+               const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableBitmap64AttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10360,28 +10365,28 @@ class CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterAttributeListAttributeCallbackType>
+class CHIPTestClusterNullableInt8uAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt8uAttributeCallbackType>
 {
 public:
-    CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableInt8uAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback();
+    ~CHIPTestClusterNullableInt8uAttributeCallback();
 
-    static void maybeDestroy(CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableInt8uAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableInt8uAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableInt8uAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10390,30 +10395,28 @@ class CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback
-    : public chip::Callback::Callback<CHIPTimeFormatLocalizationClusterSupportedCalendarTypesAttributeCallbackType>
+class CHIPTestClusterNullableInt16uAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt16uAttributeCallbackType>
 {
 public:
-    CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableInt16uAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback();
+    ~CHIPTestClusterNullableInt16uAttributeCallback();
 
-    static void maybeDestroy(CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableInt16uAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableInt16uAttributeCallback>(callback);
         }
     }
 
-    static void
-    CallbackFn(void * context,
-               const chip::app::DataModel::DecodableList<chip::app::Clusters::TimeFormatLocalization::CalendarType> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableInt16uAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10422,28 +10425,28 @@ class CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPTimeFormatLocalizationClusterGeneratedCommandListAttributeCallbackType>
+class CHIPTestClusterNullableInt24uAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt24uAttributeCallbackType>
 {
 public:
-    CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableInt24uAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback();
+    ~CHIPTestClusterNullableInt24uAttributeCallback();
 
-    static void maybeDestroy(CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableInt24uAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableInt24uAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint32_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableInt24uAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10452,28 +10455,28 @@ class CHIPTimeFormatLocalizationGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPTimeFormatLocalizationClusterAcceptedCommandListAttributeCallbackType>
+class CHIPTestClusterNullableInt32uAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt32uAttributeCallbackType>
 {
 public:
-    CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableInt32uAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback();
+    ~CHIPTestClusterNullableInt32uAttributeCallback();
 
-    static void maybeDestroy(CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableInt32uAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableInt32uAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint32_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableInt32uAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10482,28 +10485,28 @@ class CHIPTimeFormatLocalizationAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPUnitLocalizationAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPUnitLocalizationClusterAttributeListAttributeCallbackType>
+class CHIPTestClusterNullableInt40uAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt40uAttributeCallbackType>
 {
 public:
-    CHIPUnitLocalizationAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableInt40uAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPUnitLocalizationAttributeListAttributeCallback();
+    ~CHIPTestClusterNullableInt40uAttributeCallback();
 
-    static void maybeDestroy(CHIPUnitLocalizationAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableInt40uAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPUnitLocalizationAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableInt40uAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint64_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPUnitLocalizationAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableInt40uAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10512,29 +10515,28 @@ class CHIPUnitLocalizationAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPUserLabelLabelListAttributeCallback : public chip::Callback::Callback<CHIPUserLabelClusterLabelListAttributeCallbackType>
+class CHIPTestClusterNullableInt48uAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt48uAttributeCallbackType>
 {
 public:
-    CHIPUserLabelLabelListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableInt48uAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPUserLabelLabelListAttributeCallback();
+    ~CHIPTestClusterNullableInt48uAttributeCallback();
 
-    static void maybeDestroy(CHIPUserLabelLabelListAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableInt48uAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPUserLabelLabelListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableInt48uAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::UserLabel::Structs::LabelStruct::DecodableType> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint64_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPUserLabelLabelListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableInt48uAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10543,28 +10545,28 @@ class CHIPUserLabelLabelListAttributeCallback : public chip::Callback::Callback<
     bool keepAlive;
 };
 
-class CHIPUserLabelGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPUserLabelClusterGeneratedCommandListAttributeCallbackType>
+class CHIPTestClusterNullableInt56uAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt56uAttributeCallbackType>
 {
 public:
-    CHIPUserLabelGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableInt56uAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPUserLabelGeneratedCommandListAttributeCallback();
+    ~CHIPTestClusterNullableInt56uAttributeCallback();
 
-    static void maybeDestroy(CHIPUserLabelGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableInt56uAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPUserLabelGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableInt56uAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint64_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPUserLabelGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableInt56uAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10573,28 +10575,28 @@ class CHIPUserLabelGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPUserLabelAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPUserLabelClusterAcceptedCommandListAttributeCallbackType>
+class CHIPTestClusterNullableInt64uAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt64uAttributeCallbackType>
 {
 public:
-    CHIPUserLabelAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableInt64uAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPUserLabelAcceptedCommandListAttributeCallback();
+    ~CHIPTestClusterNullableInt64uAttributeCallback();
 
-    static void maybeDestroy(CHIPUserLabelAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableInt64uAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPUserLabelAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableInt64uAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint64_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPUserLabelAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableInt64uAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10603,28 +10605,28 @@ class CHIPUserLabelAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPWakeOnLanGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPWakeOnLanClusterGeneratedCommandListAttributeCallbackType>
+class CHIPTestClusterNullableInt8sAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt8sAttributeCallbackType>
 {
 public:
-    CHIPWakeOnLanGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableInt8sAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPWakeOnLanGeneratedCommandListAttributeCallback();
+    ~CHIPTestClusterNullableInt8sAttributeCallback();
 
-    static void maybeDestroy(CHIPWakeOnLanGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableInt8sAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPWakeOnLanGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableInt8sAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPWakeOnLanGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableInt8sAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10633,28 +10635,28 @@ class CHIPWakeOnLanGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPWakeOnLanAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPWakeOnLanClusterAcceptedCommandListAttributeCallbackType>
+class CHIPTestClusterNullableInt16sAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt16sAttributeCallbackType>
 {
 public:
-    CHIPWakeOnLanAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableInt16sAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPWakeOnLanAcceptedCommandListAttributeCallback();
+    ~CHIPTestClusterNullableInt16sAttributeCallback();
 
-    static void maybeDestroy(CHIPWakeOnLanAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableInt16sAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPWakeOnLanAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableInt16sAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPWakeOnLanAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableInt16sAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10663,28 +10665,28 @@ class CHIPWakeOnLanAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPWakeOnLanAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPWakeOnLanClusterAttributeListAttributeCallbackType>
+class CHIPTestClusterNullableInt24sAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt24sAttributeCallbackType>
 {
 public:
-    CHIPWakeOnLanAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableInt24sAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPWakeOnLanAttributeListAttributeCallback();
+    ~CHIPTestClusterNullableInt24sAttributeCallback();
 
-    static void maybeDestroy(CHIPWakeOnLanAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableInt24sAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPWakeOnLanAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableInt24sAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int32_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPWakeOnLanAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableInt24sAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10693,28 +10695,28 @@ class CHIPWakeOnLanAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPWiFiNetworkDiagnosticsBssidAttributeCallback
-    : public chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterBssidAttributeCallbackType>
+class CHIPTestClusterNullableInt32sAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt32sAttributeCallbackType>
 {
 public:
-    CHIPWiFiNetworkDiagnosticsBssidAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableInt32sAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPWiFiNetworkDiagnosticsBssidAttributeCallback();
+    ~CHIPTestClusterNullableInt32sAttributeCallback();
 
-    static void maybeDestroy(CHIPWiFiNetworkDiagnosticsBssidAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableInt32sAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPWiFiNetworkDiagnosticsBssidAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableInt32sAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::ByteSpan> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int32_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPWiFiNetworkDiagnosticsBssidAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableInt32sAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10723,29 +10725,28 @@ class CHIPWiFiNetworkDiagnosticsBssidAttributeCallback
     bool keepAlive;
 };
 
-class CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback
-    : public chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterSecurityTypeAttributeCallbackType>
+class CHIPTestClusterNullableInt40sAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt40sAttributeCallbackType>
 {
 public:
-    CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableInt40sAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback();
+    ~CHIPTestClusterNullableInt40sAttributeCallback();
 
-    static void maybeDestroy(CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableInt40sAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableInt40sAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context,
-                           const chip::app::DataModel::Nullable<chip::app::Clusters::WiFiNetworkDiagnostics::SecurityType> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int64_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableInt40sAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10754,30 +10755,28 @@ class CHIPWiFiNetworkDiagnosticsSecurityTypeAttributeCallback
     bool keepAlive;
 };
 
-class CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback
-    : public chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterWiFiVersionAttributeCallbackType>
+class CHIPTestClusterNullableInt48sAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt48sAttributeCallbackType>
 {
 public:
-    CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableInt48sAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback();
+    ~CHIPTestClusterNullableInt48sAttributeCallback();
 
-    static void maybeDestroy(CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableInt48sAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableInt48sAttributeCallback>(callback);
         }
-    }
-
-    static void
-    CallbackFn(void * context,
-               const chip::app::DataModel::Nullable<chip::app::Clusters::WiFiNetworkDiagnostics::WiFiVersionType> & value);
+    }
+
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int64_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableInt48sAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10786,28 +10785,28 @@ class CHIPWiFiNetworkDiagnosticsWiFiVersionAttributeCallback
     bool keepAlive;
 };
 
-class CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback
-    : public chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterChannelNumberAttributeCallbackType>
+class CHIPTestClusterNullableInt56sAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt56sAttributeCallbackType>
 {
 public:
-    CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableInt56sAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback();
+    ~CHIPTestClusterNullableInt56sAttributeCallback();
 
-    static void maybeDestroy(CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableInt56sAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableInt56sAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int64_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableInt56sAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10816,28 +10815,28 @@ class CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback
     bool keepAlive;
 };
 
-class CHIPWiFiNetworkDiagnosticsRssiAttributeCallback
-    : public chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterRssiAttributeCallbackType>
+class CHIPTestClusterNullableInt64sAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableInt64sAttributeCallbackType>
 {
 public:
-    CHIPWiFiNetworkDiagnosticsRssiAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableInt64sAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPWiFiNetworkDiagnosticsRssiAttributeCallback();
+    ~CHIPTestClusterNullableInt64sAttributeCallback();
 
-    static void maybeDestroy(CHIPWiFiNetworkDiagnosticsRssiAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableInt64sAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPWiFiNetworkDiagnosticsRssiAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableInt64sAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int8_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int64_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPWiFiNetworkDiagnosticsRssiAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableInt64sAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10846,28 +10845,28 @@ class CHIPWiFiNetworkDiagnosticsRssiAttributeCallback
     bool keepAlive;
 };
 
-class CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterGeneratedCommandListAttributeCallbackType>
+class CHIPTestClusterNullableEnum8AttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableEnum8AttributeCallbackType>
 {
 public:
-    CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableEnum8AttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback();
+    ~CHIPTestClusterNullableEnum8AttributeCallback();
 
-    static void maybeDestroy(CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableEnum8AttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableEnum8AttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableEnum8AttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10876,28 +10875,28 @@ class CHIPWiFiNetworkDiagnosticsGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterAcceptedCommandListAttributeCallbackType>
+class CHIPTestClusterNullableEnum16AttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableEnum16AttributeCallbackType>
 {
 public:
-    CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableEnum16AttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback();
+    ~CHIPTestClusterNullableEnum16AttributeCallback();
 
-    static void maybeDestroy(CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableEnum16AttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableEnum16AttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableEnum16AttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10906,28 +10905,28 @@ class CHIPWiFiNetworkDiagnosticsAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterAttributeListAttributeCallbackType>
+class CHIPTestClusterNullableFloatSingleAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableFloatSingleAttributeCallbackType>
 {
 public:
-    CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableFloatSingleAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback();
+    ~CHIPTestClusterNullableFloatSingleAttributeCallback();
 
-    static void maybeDestroy(CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableFloatSingleAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableFloatSingleAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<float> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableFloatSingleAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10936,28 +10935,28 @@ class CHIPWiFiNetworkDiagnosticsAttributeListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPWindowCoveringCurrentPositionLiftAttributeCallback
-    : public chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionLiftAttributeCallbackType>
+class CHIPTestClusterNullableFloatDoubleAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableFloatDoubleAttributeCallbackType>
 {
 public:
-    CHIPWindowCoveringCurrentPositionLiftAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableFloatDoubleAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPWindowCoveringCurrentPositionLiftAttributeCallback();
+    ~CHIPTestClusterNullableFloatDoubleAttributeCallback();
 
-    static void maybeDestroy(CHIPWindowCoveringCurrentPositionLiftAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableFloatDoubleAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPWindowCoveringCurrentPositionLiftAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableFloatDoubleAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<double> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPWindowCoveringCurrentPositionLiftAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableFloatDoubleAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10966,28 +10965,28 @@ class CHIPWindowCoveringCurrentPositionLiftAttributeCallback
     bool keepAlive;
 };
 
-class CHIPWindowCoveringCurrentPositionTiltAttributeCallback
-    : public chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionTiltAttributeCallbackType>
+class CHIPTestClusterNullableOctetStringAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableOctetStringAttributeCallbackType>
 {
 public:
-    CHIPWindowCoveringCurrentPositionTiltAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableOctetStringAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPWindowCoveringCurrentPositionTiltAttributeCallback();
+    ~CHIPTestClusterNullableOctetStringAttributeCallback();
 
-    static void maybeDestroy(CHIPWindowCoveringCurrentPositionTiltAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableOctetStringAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPWindowCoveringCurrentPositionTiltAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableOctetStringAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::ByteSpan> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPWindowCoveringCurrentPositionTiltAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableOctetStringAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -10996,28 +10995,28 @@ class CHIPWindowCoveringCurrentPositionTiltAttributeCallback
     bool keepAlive;
 };
 
-class CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback
-    : public chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionLiftPercentageAttributeCallbackType>
+class CHIPTestClusterNullableCharStringAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableCharStringAttributeCallbackType>
 {
 public:
-    CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableCharStringAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback();
+    ~CHIPTestClusterNullableCharStringAttributeCallback();
 
-    static void maybeDestroy(CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableCharStringAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableCharStringAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::Percent> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::CharSpan> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableCharStringAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -11026,28 +11025,29 @@ class CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback
     bool keepAlive;
 };
 
-class CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback
-    : public chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionTiltPercentageAttributeCallbackType>
+class CHIPTestClusterNullableEnumAttrAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableEnumAttrAttributeCallbackType>
 {
 public:
-    CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableEnumAttrAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback();
+    ~CHIPTestClusterNullableEnumAttrAttributeCallback();
 
-    static void maybeDestroy(CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableEnumAttrAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableEnumAttrAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::Percent> & value);
+    static void CallbackFn(void * context,
+                           const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableEnumAttrAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -11056,28 +11056,28 @@ class CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback
     bool keepAlive;
 };
 
-class CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback
-    : public chip::Callback::Callback<CHIPWindowCoveringClusterTargetPositionLiftPercent100thsAttributeCallbackType>
+class CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableRangeRestrictedInt8uAttributeCallbackType>
 {
 public:
-    CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback();
+    ~CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback();
 
-    static void maybeDestroy(CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::Percent100ths> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -11086,28 +11086,28 @@ class CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback
     bool keepAlive;
 };
 
-class CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback
-    : public chip::Callback::Callback<CHIPWindowCoveringClusterTargetPositionTiltPercent100thsAttributeCallbackType>
+class CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableRangeRestrictedInt8sAttributeCallbackType>
 {
 public:
-    CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback();
+    ~CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback();
 
-    static void maybeDestroy(CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::Percent100ths> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int8_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -11116,28 +11116,28 @@ class CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback
     bool keepAlive;
 };
 
-class CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback
-    : public chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionLiftPercent100thsAttributeCallbackType>
+class CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableRangeRestrictedInt16uAttributeCallbackType>
 {
 public:
-    CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback();
+    ~CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback();
 
-    static void maybeDestroy(CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::Percent100ths> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<uint16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableRangeRestrictedInt16uAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -11146,28 +11146,28 @@ class CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback
     bool keepAlive;
 };
 
-class CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback
-    : public chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionTiltPercent100thsAttributeCallbackType>
+class CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterNullableRangeRestrictedInt16sAttributeCallbackType>
 {
 public:
-    CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback();
+    ~CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback();
 
-    static void maybeDestroy(CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback>(callback);
         }
     }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<chip::Percent100ths> & value);
+    static void CallbackFn(void * context, const chip::app::DataModel::Nullable<int16_t> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterNullableRangeRestrictedInt16sAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -11176,20 +11176,20 @@ class CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback
     bool keepAlive;
 };
 
-class CHIPWindowCoveringGeneratedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPWindowCoveringClusterGeneratedCommandListAttributeCallbackType>
+class CHIPTestClusterGeneratedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterGeneratedCommandListAttributeCallbackType>
 {
 public:
-    CHIPWindowCoveringGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPWindowCoveringGeneratedCommandListAttributeCallback();
+    ~CHIPTestClusterGeneratedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPWindowCoveringGeneratedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterGeneratedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPWindowCoveringGeneratedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterGeneratedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -11197,7 +11197,7 @@ class CHIPWindowCoveringGeneratedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPWindowCoveringGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -11206,20 +11206,20 @@ class CHIPWindowCoveringGeneratedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPWindowCoveringAcceptedCommandListAttributeCallback
-    : public chip::Callback::Callback<CHIPWindowCoveringClusterAcceptedCommandListAttributeCallbackType>
+class CHIPTestClusterAcceptedCommandListAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterAcceptedCommandListAttributeCallbackType>
 {
 public:
-    CHIPWindowCoveringAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPWindowCoveringAcceptedCommandListAttributeCallback();
+    ~CHIPTestClusterAcceptedCommandListAttributeCallback();
 
-    static void maybeDestroy(CHIPWindowCoveringAcceptedCommandListAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterAcceptedCommandListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPWindowCoveringAcceptedCommandListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterAcceptedCommandListAttributeCallback>(callback);
         }
     }
 
@@ -11227,7 +11227,7 @@ class CHIPWindowCoveringAcceptedCommandListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPWindowCoveringAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
@@ -11236,20 +11236,20 @@ class CHIPWindowCoveringAcceptedCommandListAttributeCallback
     bool keepAlive;
 };
 
-class CHIPWindowCoveringAttributeListAttributeCallback
-    : public chip::Callback::Callback<CHIPWindowCoveringClusterAttributeListAttributeCallbackType>
+class CHIPTestClusterAttributeListAttributeCallback
+    : public chip::Callback::Callback<CHIPTestClusterClusterAttributeListAttributeCallbackType>
 {
 public:
-    CHIPWindowCoveringAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+    CHIPTestClusterAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
 
-    ~CHIPWindowCoveringAttributeListAttributeCallback();
+    ~CHIPTestClusterAttributeListAttributeCallback();
 
-    static void maybeDestroy(CHIPWindowCoveringAttributeListAttributeCallback * callback)
+    static void maybeDestroy(CHIPTestClusterAttributeListAttributeCallback * callback)
     {
         if (!callback->keepAlive)
         {
             callback->Cancel();
-            chip::Platform::Delete<CHIPWindowCoveringAttributeListAttributeCallback>(callback);
+            chip::Platform::Delete<CHIPTestClusterAttributeListAttributeCallback>(callback);
         }
     }
 
@@ -11257,7 +11257,7 @@ class CHIPWindowCoveringAttributeListAttributeCallback
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
-            reinterpret_cast<CHIPWindowCoveringAttributeListAttributeCallback *>(context)->javaCallbackRef);
+            reinterpret_cast<CHIPTestClusterAttributeListAttributeCallback *>(context)->javaCallbackRef);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
     };
 
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
index a4c0f48b018e3c..a1a12e45759c3c 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
@@ -112,31 +112,51 @@ protected void finalize() throws Throwable {
     }
   }
 
-  public static class AccessControlCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 31L;
+  public static class IdentifyCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 3L;
 
-    public AccessControlCluster(long devicePtr, int endpointId) {
+    public IdentifyCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public interface AclAttributeCallback {
-      void onSuccess(List<ChipStructs.AccessControlClusterAccessControlEntry> valueList);
+    public void identify(DefaultClusterCallback callback, Integer identifyTime) {
+      identify(chipClusterPtr, callback, identifyTime, null);
+    }
 
-      void onError(Exception ex);
+    public void identify(
+        DefaultClusterCallback callback, Integer identifyTime, int timedInvokeTimeoutMs) {
+      identify(chipClusterPtr, callback, identifyTime, timedInvokeTimeoutMs);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void triggerEffect(
+        DefaultClusterCallback callback, Integer effectIdentifier, Integer effectVariant) {
+      triggerEffect(chipClusterPtr, callback, effectIdentifier, effectVariant, null);
     }
 
-    public interface ExtensionAttributeCallback {
-      void onSuccess(List<ChipStructs.AccessControlClusterExtensionEntry> valueList);
+    public void triggerEffect(
+        DefaultClusterCallback callback,
+        Integer effectIdentifier,
+        Integer effectVariant,
+        int timedInvokeTimeoutMs) {
+      triggerEffect(
+          chipClusterPtr, callback, effectIdentifier, effectVariant, timedInvokeTimeoutMs);
+    }
 
-      void onError(Exception ex);
+    private native void identify(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer identifyTime,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void triggerEffect(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer effectIdentifier,
+        Integer effectVariant,
+        @Nullable Integer timedInvokeTimeoutMs);
 
     public interface GeneratedCommandListAttributeCallback {
       void onSuccess(List<Long> valueList);
@@ -162,78 +182,31 @@ public interface AttributeListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public void readAclAttribute(AclAttributeCallback callback) {
-      readAclAttribute(chipClusterPtr, callback);
-    }
-
-    public void writeAclAttribute(
-        DefaultClusterCallback callback,
-        ArrayList<ChipStructs.AccessControlClusterAccessControlEntry> value) {
-      writeAclAttribute(chipClusterPtr, callback, value, null);
-    }
-
-    public void writeAclAttribute(
-        DefaultClusterCallback callback,
-        ArrayList<ChipStructs.AccessControlClusterAccessControlEntry> value,
-        int timedWriteTimeoutMs) {
-      writeAclAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
-
-    public void subscribeAclAttribute(
-        AclAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAclAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readExtensionAttribute(ExtensionAttributeCallback callback) {
-      readExtensionAttribute(chipClusterPtr, callback);
-    }
-
-    public void writeExtensionAttribute(
-        DefaultClusterCallback callback,
-        ArrayList<ChipStructs.AccessControlClusterExtensionEntry> value) {
-      writeExtensionAttribute(chipClusterPtr, callback, value, null);
-    }
-
-    public void writeExtensionAttribute(
-        DefaultClusterCallback callback,
-        ArrayList<ChipStructs.AccessControlClusterExtensionEntry> value,
-        int timedWriteTimeoutMs) {
-      writeExtensionAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
-
-    public void subscribeExtensionAttribute(
-        ExtensionAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeExtensionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readSubjectsPerAccessControlEntryAttribute(IntegerAttributeCallback callback) {
-      readSubjectsPerAccessControlEntryAttribute(chipClusterPtr, callback);
+    public void readIdentifyTimeAttribute(IntegerAttributeCallback callback) {
+      readIdentifyTimeAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeSubjectsPerAccessControlEntryAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSubjectsPerAccessControlEntryAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeIdentifyTimeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeIdentifyTimeAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readTargetsPerAccessControlEntryAttribute(IntegerAttributeCallback callback) {
-      readTargetsPerAccessControlEntryAttribute(chipClusterPtr, callback);
+    public void writeIdentifyTimeAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeIdentifyTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeTargetsPerAccessControlEntryAttribute(
+    public void subscribeIdentifyTimeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTargetsPerAccessControlEntryAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeIdentifyTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readAccessControlEntriesPerFabricAttribute(IntegerAttributeCallback callback) {
-      readAccessControlEntriesPerFabricAttribute(chipClusterPtr, callback);
+    public void readIdentifyTypeAttribute(IntegerAttributeCallback callback) {
+      readIdentifyTypeAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeAccessControlEntriesPerFabricAttribute(
+    public void subscribeIdentifyTypeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAccessControlEntriesPerFabricAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeIdentifyTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -281,45 +254,22 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readAclAttribute(long chipClusterPtr, AclAttributeCallback callback);
-
-    private native void writeAclAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        ArrayList<ChipStructs.AccessControlClusterAccessControlEntry> value,
-        @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeAclAttribute(
-        long chipClusterPtr, AclAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readExtensionAttribute(
-        long chipClusterPtr, ExtensionAttributeCallback callback);
+    private native void readIdentifyTimeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeExtensionAttribute(
+    private native void writeIdentifyTimeAttribute(
         long chipClusterPtr,
         DefaultClusterCallback callback,
-        ArrayList<ChipStructs.AccessControlClusterExtensionEntry> value,
+        Integer value,
         @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeExtensionAttribute(
-        long chipClusterPtr, ExtensionAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSubjectsPerAccessControlEntryAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeSubjectsPerAccessControlEntryAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readTargetsPerAccessControlEntryAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeTargetsPerAccessControlEntryAttribute(
+    private native void subscribeIdentifyTimeAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readAccessControlEntriesPerFabricAttribute(
+    private native void readIdentifyTypeAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeAccessControlEntriesPerFabricAttribute(
+    private native void subscribeIdentifyTypeAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
     private native void readGeneratedCommandListAttribute(
@@ -362,236 +312,139 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class AccountLoginCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1294L;
+  public static class GroupsCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 4L;
 
-    public AccountLoginCluster(long devicePtr, int endpointId) {
+    public GroupsCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void getSetupPIN(
-        GetSetupPINResponseCallback callback,
-        String tempAccountIdentifier,
-        int timedInvokeTimeoutMs) {
-      getSetupPIN(chipClusterPtr, callback, tempAccountIdentifier, timedInvokeTimeoutMs);
+    public void addGroup(AddGroupResponseCallback callback, Integer groupId, String groupName) {
+      addGroup(chipClusterPtr, callback, groupId, groupName, null);
     }
 
-    public void login(
-        DefaultClusterCallback callback,
-        String tempAccountIdentifier,
-        String setupPIN,
+    public void addGroup(
+        AddGroupResponseCallback callback,
+        Integer groupId,
+        String groupName,
         int timedInvokeTimeoutMs) {
-      login(chipClusterPtr, callback, tempAccountIdentifier, setupPIN, timedInvokeTimeoutMs);
+      addGroup(chipClusterPtr, callback, groupId, groupName, timedInvokeTimeoutMs);
     }
 
-    public void logout(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-
-      logout(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public void viewGroup(ViewGroupResponseCallback callback, Integer groupId) {
+      viewGroup(chipClusterPtr, callback, groupId, null);
     }
 
-    private native void getSetupPIN(
-        long chipClusterPtr,
-        GetSetupPINResponseCallback Callback,
-        String tempAccountIdentifier,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void login(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        String tempAccountIdentifier,
-        String setupPIN,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void logout(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface GetSetupPINResponseCallback {
-      void onSuccess(String setupPIN);
-
-      void onError(Exception error);
+    public void viewGroup(
+        ViewGroupResponseCallback callback, Integer groupId, int timedInvokeTimeoutMs) {
+      viewGroup(chipClusterPtr, callback, groupId, timedInvokeTimeoutMs);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void getGroupMembership(
+        GetGroupMembershipResponseCallback callback, ArrayList<Integer> groupList) {
+      getGroupMembership(chipClusterPtr, callback, groupList, null);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void getGroupMembership(
+        GetGroupMembershipResponseCallback callback,
+        ArrayList<Integer> groupList,
+        int timedInvokeTimeoutMs) {
+      getGroupMembership(chipClusterPtr, callback, groupList, timedInvokeTimeoutMs);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void removeGroup(RemoveGroupResponseCallback callback, Integer groupId) {
+      removeGroup(chipClusterPtr, callback, groupId, null);
     }
 
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    public void removeGroup(
+        RemoveGroupResponseCallback callback, Integer groupId, int timedInvokeTimeoutMs) {
+      removeGroup(chipClusterPtr, callback, groupId, timedInvokeTimeoutMs);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void removeAllGroups(DefaultClusterCallback callback) {
+      removeAllGroups(chipClusterPtr, callback, null);
     }
 
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    public void removeAllGroups(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+
+      removeAllGroups(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void addGroupIfIdentifying(
+        DefaultClusterCallback callback, Integer groupId, String groupName) {
+      addGroupIfIdentifying(chipClusterPtr, callback, groupId, groupName, null);
     }
 
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void addGroupIfIdentifying(
+        DefaultClusterCallback callback,
+        Integer groupId,
+        String groupName,
+        int timedInvokeTimeoutMs) {
+      addGroupIfIdentifying(chipClusterPtr, callback, groupId, groupName, timedInvokeTimeoutMs);
     }
 
-    private native void readGeneratedCommandListAttribute(
-        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(
+    private native void addGroup(
         long chipClusterPtr,
-        GeneratedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(
-        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+        AddGroupResponseCallback Callback,
+        Integer groupId,
+        String groupName,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void subscribeAcceptedCommandListAttribute(
+    private native void viewGroup(
         long chipClusterPtr,
-        AcceptedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readAttributeListAttribute(
-        long chipClusterPtr, AttributeListAttributeCallback callback);
+        ViewGroupResponseCallback Callback,
+        Integer groupId,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void subscribeAttributeListAttribute(
+    private native void getGroupMembership(
         long chipClusterPtr,
-        AttributeListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
-
-  public static class AdministratorCommissioningCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 60L;
-
-    public AdministratorCommissioningCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
-
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
-    public void openBasicCommissioningWindow(
-        DefaultClusterCallback callback, Integer commissioningTimeout, int timedInvokeTimeoutMs) {
-      openBasicCommissioningWindow(
-          chipClusterPtr, callback, commissioningTimeout, timedInvokeTimeoutMs);
-    }
-
-    public void openCommissioningWindow(
-        DefaultClusterCallback callback,
-        Integer commissioningTimeout,
-        byte[] PAKEVerifier,
-        Integer discriminator,
-        Long iterations,
-        byte[] salt,
-        int timedInvokeTimeoutMs) {
-      openCommissioningWindow(
-          chipClusterPtr,
-          callback,
-          commissioningTimeout,
-          PAKEVerifier,
-          discriminator,
-          iterations,
-          salt,
-          timedInvokeTimeoutMs);
-    }
-
-    public void revokeCommissioning(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-
-      revokeCommissioning(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+        GetGroupMembershipResponseCallback Callback,
+        ArrayList<Integer> groupList,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void openBasicCommissioningWindow(
+    private native void removeGroup(
         long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer commissioningTimeout,
+        RemoveGroupResponseCallback Callback,
+        Integer groupId,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void openCommissioningWindow(
+    private native void removeAllGroups(
         long chipClusterPtr,
         DefaultClusterCallback Callback,
-        Integer commissioningTimeout,
-        byte[] PAKEVerifier,
-        Integer discriminator,
-        Long iterations,
-        byte[] salt,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void revokeCommissioning(
+    private native void addGroupIfIdentifying(
         long chipClusterPtr,
         DefaultClusterCallback Callback,
+        Integer groupId,
+        String groupName,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    public interface AdminFabricIndexAttributeCallback {
-      void onSuccess(Integer value);
+    public interface AddGroupResponseCallback {
+      void onSuccess(Integer status, Integer groupId);
 
-      void onError(Exception ex);
+      void onError(Exception error);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public interface ViewGroupResponseCallback {
+      void onSuccess(Integer status, Integer groupId, String groupName);
+
+      void onError(Exception error);
+    }
+
+    public interface GetGroupMembershipResponseCallback {
+      void onSuccess(@Nullable Integer capacity, ArrayList<Integer> groupList);
+
+      void onError(Exception error);
+    }
+
+    public interface RemoveGroupResponseCallback {
+      void onSuccess(Integer status, Integer groupId);
+
+      void onError(Exception error);
     }
 
     public interface GeneratedCommandListAttributeCallback {
@@ -618,31 +471,13 @@ public interface AttributeListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public void readWindowStatusAttribute(IntegerAttributeCallback callback) {
-      readWindowStatusAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeWindowStatusAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeWindowStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readAdminFabricIndexAttribute(AdminFabricIndexAttributeCallback callback) {
-      readAdminFabricIndexAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeAdminFabricIndexAttribute(
-        AdminFabricIndexAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAdminFabricIndexAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readAdminVendorIdAttribute(IntegerAttributeCallback callback) {
-      readAdminVendorIdAttribute(chipClusterPtr, callback);
+    public void readNameSupportAttribute(IntegerAttributeCallback callback) {
+      readNameSupportAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeAdminVendorIdAttribute(
+    public void subscribeNameSupportAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAdminVendorIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeNameSupportAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -690,25 +525,10 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readWindowStatusAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeWindowStatusAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAdminFabricIndexAttribute(
-        long chipClusterPtr, AdminFabricIndexAttributeCallback callback);
-
-    private native void subscribeAdminFabricIndexAttribute(
-        long chipClusterPtr,
-        AdminFabricIndexAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readAdminVendorIdAttribute(
+    private native void readNameSupportAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeAdminVendorIdAttribute(
+    private native void subscribeNameSupportAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
     private native void readGeneratedCommandListAttribute(
@@ -751,41 +571,231 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class ApplicationBasicCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1293L;
+  public static class ScenesCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 5L;
 
-    public ApplicationBasicCluster(long devicePtr, int endpointId) {
+    public ScenesCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public interface AllowedVendorListAttributeCallback {
-      void onSuccess(List<Integer> valueList);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void addScene(
+        AddSceneResponseCallback callback,
+        Integer groupId,
+        Integer sceneId,
+        Integer transitionTime,
+        String sceneName,
+        ArrayList<ChipStructs.ScenesClusterExtensionFieldSet> extensionFieldSets) {
+      addScene(
+          chipClusterPtr,
+          callback,
+          groupId,
+          sceneId,
+          transitionTime,
+          sceneName,
+          extensionFieldSets,
+          null);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void addScene(
+        AddSceneResponseCallback callback,
+        Integer groupId,
+        Integer sceneId,
+        Integer transitionTime,
+        String sceneName,
+        ArrayList<ChipStructs.ScenesClusterExtensionFieldSet> extensionFieldSets,
+        int timedInvokeTimeoutMs) {
+      addScene(
+          chipClusterPtr,
+          callback,
+          groupId,
+          sceneId,
+          transitionTime,
+          sceneName,
+          extensionFieldSets,
+          timedInvokeTimeoutMs);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void viewScene(ViewSceneResponseCallback callback, Integer groupId, Integer sceneId) {
+      viewScene(chipClusterPtr, callback, groupId, sceneId, null);
+    }
+
+    public void viewScene(
+        ViewSceneResponseCallback callback,
+        Integer groupId,
+        Integer sceneId,
+        int timedInvokeTimeoutMs) {
+      viewScene(chipClusterPtr, callback, groupId, sceneId, timedInvokeTimeoutMs);
+    }
+
+    public void removeScene(
+        RemoveSceneResponseCallback callback, Integer groupId, Integer sceneId) {
+      removeScene(chipClusterPtr, callback, groupId, sceneId, null);
+    }
+
+    public void removeScene(
+        RemoveSceneResponseCallback callback,
+        Integer groupId,
+        Integer sceneId,
+        int timedInvokeTimeoutMs) {
+      removeScene(chipClusterPtr, callback, groupId, sceneId, timedInvokeTimeoutMs);
+    }
+
+    public void removeAllScenes(RemoveAllScenesResponseCallback callback, Integer groupId) {
+      removeAllScenes(chipClusterPtr, callback, groupId, null);
+    }
+
+    public void removeAllScenes(
+        RemoveAllScenesResponseCallback callback, Integer groupId, int timedInvokeTimeoutMs) {
+      removeAllScenes(chipClusterPtr, callback, groupId, timedInvokeTimeoutMs);
+    }
+
+    public void storeScene(StoreSceneResponseCallback callback, Integer groupId, Integer sceneId) {
+      storeScene(chipClusterPtr, callback, groupId, sceneId, null);
+    }
+
+    public void storeScene(
+        StoreSceneResponseCallback callback,
+        Integer groupId,
+        Integer sceneId,
+        int timedInvokeTimeoutMs) {
+      storeScene(chipClusterPtr, callback, groupId, sceneId, timedInvokeTimeoutMs);
+    }
+
+    public void recallScene(
+        DefaultClusterCallback callback,
+        Integer groupId,
+        Integer sceneId,
+        @Nullable Optional<Integer> transitionTime) {
+      recallScene(chipClusterPtr, callback, groupId, sceneId, transitionTime, null);
+    }
+
+    public void recallScene(
+        DefaultClusterCallback callback,
+        Integer groupId,
+        Integer sceneId,
+        @Nullable Optional<Integer> transitionTime,
+        int timedInvokeTimeoutMs) {
+      recallScene(chipClusterPtr, callback, groupId, sceneId, transitionTime, timedInvokeTimeoutMs);
+    }
+
+    public void getSceneMembership(GetSceneMembershipResponseCallback callback, Integer groupId) {
+      getSceneMembership(chipClusterPtr, callback, groupId, null);
+    }
+
+    public void getSceneMembership(
+        GetSceneMembershipResponseCallback callback, Integer groupId, int timedInvokeTimeoutMs) {
+      getSceneMembership(chipClusterPtr, callback, groupId, timedInvokeTimeoutMs);
+    }
+
+    private native void addScene(
+        long chipClusterPtr,
+        AddSceneResponseCallback Callback,
+        Integer groupId,
+        Integer sceneId,
+        Integer transitionTime,
+        String sceneName,
+        ArrayList<ChipStructs.ScenesClusterExtensionFieldSet> extensionFieldSets,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void viewScene(
+        long chipClusterPtr,
+        ViewSceneResponseCallback Callback,
+        Integer groupId,
+        Integer sceneId,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void removeScene(
+        long chipClusterPtr,
+        RemoveSceneResponseCallback Callback,
+        Integer groupId,
+        Integer sceneId,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void removeAllScenes(
+        long chipClusterPtr,
+        RemoveAllScenesResponseCallback Callback,
+        Integer groupId,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void storeScene(
+        long chipClusterPtr,
+        StoreSceneResponseCallback Callback,
+        Integer groupId,
+        Integer sceneId,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void recallScene(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer groupId,
+        Integer sceneId,
+        @Nullable Optional<Integer> transitionTime,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void getSceneMembership(
+        long chipClusterPtr,
+        GetSceneMembershipResponseCallback Callback,
+        Integer groupId,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    public interface AddSceneResponseCallback {
+      void onSuccess(Integer status, Integer groupId, Integer sceneId);
+
+      void onError(Exception error);
+    }
+
+    public interface ViewSceneResponseCallback {
+      void onSuccess(
+          Integer status,
+          Integer groupId,
+          Integer sceneId,
+          Optional<Integer> transitionTime,
+          Optional<String> sceneName,
+          Optional<ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>> extensionFieldSets);
+
+      void onError(Exception error);
+    }
+
+    public interface RemoveSceneResponseCallback {
+      void onSuccess(Integer status, Integer groupId, Integer sceneId);
+
+      void onError(Exception error);
+    }
+
+    public interface RemoveAllScenesResponseCallback {
+      void onSuccess(Integer status, Integer groupId);
+
+      void onError(Exception error);
+    }
+
+    public interface StoreSceneResponseCallback {
+      void onSuccess(Integer status, Integer groupId, Integer sceneId);
+
+      void onError(Exception error);
+    }
+
+    public interface GetSceneMembershipResponseCallback {
+      void onSuccess(
+          Integer status,
+          @Nullable Integer capacity,
+          Integer groupId,
+          Optional<ArrayList<Integer>> sceneList);
+
+      void onError(Exception error);
+    }
+
+    public interface CurrentGroupAttributeCallback {
+      void onSuccess(Integer value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback {
       void onSuccess(List<Long> valueList);
 
       void onError(Exception ex);
@@ -793,67 +803,65 @@ public interface AttributeListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public void readVendorNameAttribute(CharStringAttributeCallback callback) {
-      readVendorNameAttribute(chipClusterPtr, callback);
-    }
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void subscribeVendorNameAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeVendorNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readVendorIDAttribute(IntegerAttributeCallback callback) {
-      readVendorIDAttribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeVendorIDAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeVendorIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readApplicationNameAttribute(CharStringAttributeCallback callback) {
-      readApplicationNameAttribute(chipClusterPtr, callback);
+    public void readSceneCountAttribute(IntegerAttributeCallback callback) {
+      readSceneCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeApplicationNameAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeApplicationNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeSceneCountAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSceneCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readProductIDAttribute(IntegerAttributeCallback callback) {
-      readProductIDAttribute(chipClusterPtr, callback);
+    public void readCurrentSceneAttribute(IntegerAttributeCallback callback) {
+      readCurrentSceneAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeProductIDAttribute(
+    public void subscribeCurrentSceneAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeProductIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeCurrentSceneAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readStatusAttribute(IntegerAttributeCallback callback) {
-      readStatusAttribute(chipClusterPtr, callback);
+    public void readCurrentGroupAttribute(CurrentGroupAttributeCallback callback) {
+      readCurrentGroupAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeStatusAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCurrentGroupAttribute(
+        CurrentGroupAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentGroupAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readApplicationVersionAttribute(CharStringAttributeCallback callback) {
-      readApplicationVersionAttribute(chipClusterPtr, callback);
+    public void readSceneValidAttribute(BooleanAttributeCallback callback) {
+      readSceneValidAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeApplicationVersionAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeApplicationVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeSceneValidAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSceneValidAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readAllowedVendorListAttribute(AllowedVendorListAttributeCallback callback) {
-      readAllowedVendorListAttribute(chipClusterPtr, callback);
+    public void readNameSupportAttribute(IntegerAttributeCallback callback) {
+      readNameSupportAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeAllowedVendorListAttribute(
-        AllowedVendorListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAllowedVendorListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeNameSupportAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNameSupportAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -901,58 +909,38 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readVendorNameAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeVendorNameAttribute(
-        long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readVendorIDAttribute(
+    private native void readSceneCountAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeVendorIDAttribute(
+    private native void subscribeSceneCountAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readApplicationNameAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeApplicationNameAttribute(
-        long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readProductIDAttribute(
+    private native void readCurrentSceneAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeProductIDAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeStatusAttribute(
+    private native void subscribeCurrentSceneAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readApplicationVersionAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
+    private native void readCurrentGroupAttribute(
+        long chipClusterPtr, CurrentGroupAttributeCallback callback);
 
-    private native void subscribeApplicationVersionAttribute(
+    private native void subscribeCurrentGroupAttribute(
         long chipClusterPtr,
-        CharStringAttributeCallback callback,
+        CurrentGroupAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readAllowedVendorListAttribute(
-        long chipClusterPtr, AllowedVendorListAttributeCallback callback);
+    private native void readSceneValidAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
 
-    private native void subscribeAllowedVendorListAttribute(
-        long chipClusterPtr,
-        AllowedVendorListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeSceneValidAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readNameSupportAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeNameSupportAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
     private native void readGeneratedCommandListAttribute(
         long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
@@ -994,84 +982,120 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class ApplicationLauncherCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1292L;
+  public static class OnOffCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 6L;
 
-    public ApplicationLauncherCluster(long devicePtr, int endpointId) {
+    public OnOffCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void hideApp(
-        LauncherResponseCallback callback,
-        ChipStructs.ApplicationLauncherClusterApplication application) {
-      hideApp(chipClusterPtr, callback, application, null);
+    public void off(DefaultClusterCallback callback) {
+      off(chipClusterPtr, callback, null);
     }
 
-    public void hideApp(
-        LauncherResponseCallback callback,
-        ChipStructs.ApplicationLauncherClusterApplication application,
-        int timedInvokeTimeoutMs) {
-      hideApp(chipClusterPtr, callback, application, timedInvokeTimeoutMs);
+    public void off(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+
+      off(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public void launchApp(
-        LauncherResponseCallback callback,
-        ChipStructs.ApplicationLauncherClusterApplication application,
-        Optional<byte[]> data) {
-      launchApp(chipClusterPtr, callback, application, data, null);
+    public void on(DefaultClusterCallback callback) {
+      on(chipClusterPtr, callback, null);
     }
 
-    public void launchApp(
-        LauncherResponseCallback callback,
-        ChipStructs.ApplicationLauncherClusterApplication application,
-        Optional<byte[]> data,
+    public void on(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+
+      on(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void toggle(DefaultClusterCallback callback) {
+      toggle(chipClusterPtr, callback, null);
+    }
+
+    public void toggle(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+
+      toggle(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void offWithEffect(
+        DefaultClusterCallback callback, Integer effectId, Integer effectVariant) {
+      offWithEffect(chipClusterPtr, callback, effectId, effectVariant, null);
+    }
+
+    public void offWithEffect(
+        DefaultClusterCallback callback,
+        Integer effectId,
+        Integer effectVariant,
         int timedInvokeTimeoutMs) {
-      launchApp(chipClusterPtr, callback, application, data, timedInvokeTimeoutMs);
+      offWithEffect(chipClusterPtr, callback, effectId, effectVariant, timedInvokeTimeoutMs);
     }
 
-    public void stopApp(
-        LauncherResponseCallback callback,
-        ChipStructs.ApplicationLauncherClusterApplication application) {
-      stopApp(chipClusterPtr, callback, application, null);
+    public void onWithRecallGlobalScene(DefaultClusterCallback callback) {
+      onWithRecallGlobalScene(chipClusterPtr, callback, null);
     }
 
-    public void stopApp(
-        LauncherResponseCallback callback,
-        ChipStructs.ApplicationLauncherClusterApplication application,
+    public void onWithRecallGlobalScene(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+
+      onWithRecallGlobalScene(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    }
+
+    public void onWithTimedOff(
+        DefaultClusterCallback callback,
+        Integer onOffControl,
+        Integer onTime,
+        Integer offWaitTime) {
+      onWithTimedOff(chipClusterPtr, callback, onOffControl, onTime, offWaitTime, null);
+    }
+
+    public void onWithTimedOff(
+        DefaultClusterCallback callback,
+        Integer onOffControl,
+        Integer onTime,
+        Integer offWaitTime,
         int timedInvokeTimeoutMs) {
-      stopApp(chipClusterPtr, callback, application, timedInvokeTimeoutMs);
+      onWithTimedOff(
+          chipClusterPtr, callback, onOffControl, onTime, offWaitTime, timedInvokeTimeoutMs);
     }
 
-    private native void hideApp(
+    private native void off(
         long chipClusterPtr,
-        LauncherResponseCallback Callback,
-        ChipStructs.ApplicationLauncherClusterApplication application,
+        DefaultClusterCallback Callback,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void launchApp(
+    private native void on(
         long chipClusterPtr,
-        LauncherResponseCallback Callback,
-        ChipStructs.ApplicationLauncherClusterApplication application,
-        Optional<byte[]> data,
+        DefaultClusterCallback Callback,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void stopApp(
+    private native void toggle(
         long chipClusterPtr,
-        LauncherResponseCallback Callback,
-        ChipStructs.ApplicationLauncherClusterApplication application,
+        DefaultClusterCallback Callback,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    public interface LauncherResponseCallback {
-      void onSuccess(Integer status, byte[] data);
+    private native void offWithEffect(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer effectId,
+        Integer effectVariant,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-      void onError(Exception error);
-    }
+    private native void onWithRecallGlobalScene(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public interface CatalogListAttributeCallback {
-      void onSuccess(List<Integer> valueList);
+    private native void onWithTimedOff(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer onOffControl,
+        Integer onTime,
+        Integer offWaitTime,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    public interface StartUpOnOffAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
 
@@ -1102,13 +1126,76 @@ public interface AttributeListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public void readCatalogListAttribute(CatalogListAttributeCallback callback) {
-      readCatalogListAttribute(chipClusterPtr, callback);
+    public void readOnOffAttribute(BooleanAttributeCallback callback) {
+      readOnOffAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCatalogListAttribute(
-        CatalogListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCatalogListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeOnOffAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeOnOffAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGlobalSceneControlAttribute(BooleanAttributeCallback callback) {
+      readGlobalSceneControlAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeGlobalSceneControlAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGlobalSceneControlAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOnTimeAttribute(IntegerAttributeCallback callback) {
+      readOnTimeAttribute(chipClusterPtr, callback);
+    }
+
+    public void writeOnTimeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOnTimeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOnTimeAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOnTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+
+    public void subscribeOnTimeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeOnTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOffWaitTimeAttribute(IntegerAttributeCallback callback) {
+      readOffWaitTimeAttribute(chipClusterPtr, callback);
+    }
+
+    public void writeOffWaitTimeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOffWaitTimeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOffWaitTimeAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOffWaitTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+
+    public void subscribeOffWaitTimeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeOffWaitTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readStartUpOnOffAttribute(StartUpOnOffAttributeCallback callback) {
+      readStartUpOnOffAttribute(chipClusterPtr, callback);
+    }
+
+    public void writeStartUpOnOffAttribute(DefaultClusterCallback callback, Integer value) {
+      writeStartUpOnOffAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeStartUpOnOffAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeStartUpOnOffAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+
+    public void subscribeStartUpOnOffAttribute(
+        StartUpOnOffAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeStartUpOnOffAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -1156,16 +1243,56 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readCatalogListAttribute(
-        long chipClusterPtr, CatalogListAttributeCallback callback);
+    private native void readOnOffAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
 
-    private native void subscribeCatalogListAttribute(
-        long chipClusterPtr,
-        CatalogListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeOnOffAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readGeneratedCommandListAttribute(
+    private native void readGlobalSceneControlAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
+
+    private native void subscribeGlobalSceneControlAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readOnTimeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeOnTimeAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeOnTimeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readOffWaitTimeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeOffWaitTimeAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeOffWaitTimeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readStartUpOnOffAttribute(
+        long chipClusterPtr, StartUpOnOffAttributeCallback callback);
+
+    private native void writeStartUpOnOffAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeStartUpOnOffAttribute(
+        long chipClusterPtr,
+        StartUpOnOffAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(
         long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
     private native void subscribeGeneratedCommandListAttribute(
@@ -1205,55 +1332,16 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class AudioOutputCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1291L;
+  public static class OnOffSwitchConfigurationCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 7L;
 
-    public AudioOutputCluster(long devicePtr, int endpointId) {
+    public OnOffSwitchConfigurationCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void renameOutput(DefaultClusterCallback callback, Integer index, String name) {
-      renameOutput(chipClusterPtr, callback, index, name, null);
-    }
-
-    public void renameOutput(
-        DefaultClusterCallback callback, Integer index, String name, int timedInvokeTimeoutMs) {
-      renameOutput(chipClusterPtr, callback, index, name, timedInvokeTimeoutMs);
-    }
-
-    public void selectOutput(DefaultClusterCallback callback, Integer index) {
-      selectOutput(chipClusterPtr, callback, index, null);
-    }
-
-    public void selectOutput(
-        DefaultClusterCallback callback, Integer index, int timedInvokeTimeoutMs) {
-      selectOutput(chipClusterPtr, callback, index, timedInvokeTimeoutMs);
-    }
-
-    private native void renameOutput(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer index,
-        String name,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void selectOutput(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer index,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface OutputListAttributeCallback {
-      void onSuccess(List<ChipStructs.AudioOutputClusterOutputInfo> valueList);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
     public interface GeneratedCommandListAttributeCallback {
       void onSuccess(List<Long> valueList);
 
@@ -1278,22 +1366,31 @@ public interface AttributeListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public void readOutputListAttribute(OutputListAttributeCallback callback) {
-      readOutputListAttribute(chipClusterPtr, callback);
+    public void readSwitchTypeAttribute(IntegerAttributeCallback callback) {
+      readSwitchTypeAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeOutputListAttribute(
-        OutputListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeOutputListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeSwitchTypeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSwitchTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readCurrentOutputAttribute(IntegerAttributeCallback callback) {
-      readCurrentOutputAttribute(chipClusterPtr, callback);
+    public void readSwitchActionsAttribute(IntegerAttributeCallback callback) {
+      readSwitchActionsAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentOutputAttribute(
+    public void writeSwitchActionsAttribute(DefaultClusterCallback callback, Integer value) {
+      writeSwitchActionsAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeSwitchActionsAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeSwitchActionsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+
+    public void subscribeSwitchActionsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentOutputAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeSwitchActionsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -1341,19 +1438,22 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readOutputListAttribute(
-        long chipClusterPtr, OutputListAttributeCallback callback);
+    private native void readSwitchTypeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeOutputListAttribute(
-        long chipClusterPtr,
-        OutputListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeSwitchTypeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readCurrentOutputAttribute(
+    private native void readSwitchActionsAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeCurrentOutputAttribute(
+    private native void writeSwitchActionsAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeSwitchActionsAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
     private native void readGeneratedCommandListAttribute(
@@ -1396,226 +1496,263 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class BarrierControlCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 259L;
+  public static class LevelControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 8L;
 
-    public BarrierControlCluster(long devicePtr, int endpointId) {
+    public LevelControlCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void barrierControlGoToPercent(DefaultClusterCallback callback, Integer percentOpen) {
-      barrierControlGoToPercent(chipClusterPtr, callback, percentOpen, null);
+    public void moveToLevel(
+        DefaultClusterCallback callback,
+        Integer level,
+        Integer transitionTime,
+        Integer optionMask,
+        Integer optionOverride) {
+      moveToLevel(
+          chipClusterPtr, callback, level, transitionTime, optionMask, optionOverride, null);
     }
 
-    public void barrierControlGoToPercent(
-        DefaultClusterCallback callback, Integer percentOpen, int timedInvokeTimeoutMs) {
-      barrierControlGoToPercent(chipClusterPtr, callback, percentOpen, timedInvokeTimeoutMs);
+    public void moveToLevel(
+        DefaultClusterCallback callback,
+        Integer level,
+        Integer transitionTime,
+        Integer optionMask,
+        Integer optionOverride,
+        int timedInvokeTimeoutMs) {
+      moveToLevel(
+          chipClusterPtr,
+          callback,
+          level,
+          transitionTime,
+          optionMask,
+          optionOverride,
+          timedInvokeTimeoutMs);
     }
 
-    public void barrierControlStop(DefaultClusterCallback callback) {
-      barrierControlStop(chipClusterPtr, callback, null);
+    public void move(
+        DefaultClusterCallback callback,
+        Integer moveMode,
+        Integer rate,
+        Integer optionMask,
+        Integer optionOverride) {
+      move(chipClusterPtr, callback, moveMode, rate, optionMask, optionOverride, null);
     }
 
-    public void barrierControlStop(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-
-      barrierControlStop(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public void move(
+        DefaultClusterCallback callback,
+        Integer moveMode,
+        Integer rate,
+        Integer optionMask,
+        Integer optionOverride,
+        int timedInvokeTimeoutMs) {
+      move(
+          chipClusterPtr,
+          callback,
+          moveMode,
+          rate,
+          optionMask,
+          optionOverride,
+          timedInvokeTimeoutMs);
     }
 
-    private native void barrierControlGoToPercent(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer percentOpen,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void barrierControlStop(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void step(
+        DefaultClusterCallback callback,
+        Integer stepMode,
+        Integer stepSize,
+        Integer transitionTime,
+        Integer optionMask,
+        Integer optionOverride) {
+      step(
+          chipClusterPtr,
+          callback,
+          stepMode,
+          stepSize,
+          transitionTime,
+          optionMask,
+          optionOverride,
+          null);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void step(
+        DefaultClusterCallback callback,
+        Integer stepMode,
+        Integer stepSize,
+        Integer transitionTime,
+        Integer optionMask,
+        Integer optionOverride,
+        int timedInvokeTimeoutMs) {
+      step(
+          chipClusterPtr,
+          callback,
+          stepMode,
+          stepSize,
+          transitionTime,
+          optionMask,
+          optionOverride,
+          timedInvokeTimeoutMs);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public void readBarrierMovingStateAttribute(IntegerAttributeCallback callback) {
-      readBarrierMovingStateAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeBarrierMovingStateAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBarrierMovingStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readBarrierSafetyStatusAttribute(IntegerAttributeCallback callback) {
-      readBarrierSafetyStatusAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeBarrierSafetyStatusAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBarrierSafetyStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readBarrierCapabilitiesAttribute(IntegerAttributeCallback callback) {
-      readBarrierCapabilitiesAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeBarrierCapabilitiesAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBarrierCapabilitiesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readBarrierPositionAttribute(IntegerAttributeCallback callback) {
-      readBarrierPositionAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeBarrierPositionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBarrierPositionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void stop(DefaultClusterCallback callback, Integer optionMask, Integer optionOverride) {
+      stop(chipClusterPtr, callback, optionMask, optionOverride, null);
     }
 
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    public void stop(
+        DefaultClusterCallback callback,
+        Integer optionMask,
+        Integer optionOverride,
+        int timedInvokeTimeoutMs) {
+      stop(chipClusterPtr, callback, optionMask, optionOverride, timedInvokeTimeoutMs);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void moveToLevelWithOnOff(
+        DefaultClusterCallback callback, Integer level, Integer transitionTime) {
+      moveToLevelWithOnOff(chipClusterPtr, callback, level, transitionTime, null);
     }
 
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    public void moveToLevelWithOnOff(
+        DefaultClusterCallback callback,
+        Integer level,
+        Integer transitionTime,
+        int timedInvokeTimeoutMs) {
+      moveToLevelWithOnOff(chipClusterPtr, callback, level, transitionTime, timedInvokeTimeoutMs);
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void moveWithOnOff(DefaultClusterCallback callback, Integer moveMode, Integer rate) {
+      moveWithOnOff(chipClusterPtr, callback, moveMode, rate, null);
     }
 
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
+    public void moveWithOnOff(
+        DefaultClusterCallback callback, Integer moveMode, Integer rate, int timedInvokeTimeoutMs) {
+      moveWithOnOff(chipClusterPtr, callback, moveMode, rate, timedInvokeTimeoutMs);
     }
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void stepWithOnOff(
+        DefaultClusterCallback callback,
+        Integer stepMode,
+        Integer stepSize,
+        Integer transitionTime) {
+      stepWithOnOff(chipClusterPtr, callback, stepMode, stepSize, transitionTime, null);
     }
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
+    public void stepWithOnOff(
+        DefaultClusterCallback callback,
+        Integer stepMode,
+        Integer stepSize,
+        Integer transitionTime,
+        int timedInvokeTimeoutMs) {
+      stepWithOnOff(
+          chipClusterPtr, callback, stepMode, stepSize, transitionTime, timedInvokeTimeoutMs);
     }
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void stopWithOnOff(DefaultClusterCallback callback) {
+      stopWithOnOff(chipClusterPtr, callback, null);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
+    public void stopWithOnOff(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      stopWithOnOff(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    private native void readBarrierMovingStateAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void moveToLevel(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer level,
+        Integer transitionTime,
+        Integer optionMask,
+        Integer optionOverride,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void subscribeBarrierMovingStateAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void move(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer moveMode,
+        Integer rate,
+        Integer optionMask,
+        Integer optionOverride,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void readBarrierSafetyStatusAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void step(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer stepMode,
+        Integer stepSize,
+        Integer transitionTime,
+        Integer optionMask,
+        Integer optionOverride,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void subscribeBarrierSafetyStatusAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void stop(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer optionMask,
+        Integer optionOverride,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void readBarrierCapabilitiesAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void moveToLevelWithOnOff(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer level,
+        Integer transitionTime,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void subscribeBarrierCapabilitiesAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void moveWithOnOff(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer moveMode,
+        Integer rate,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void readBarrierPositionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void stepWithOnOff(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer stepMode,
+        Integer stepSize,
+        Integer transitionTime,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void subscribeBarrierPositionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void stopWithOnOff(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void readGeneratedCommandListAttribute(
-        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public interface OnLevelAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    private native void subscribeGeneratedCommandListAttribute(
-        long chipClusterPtr,
-        GeneratedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+      void onError(Exception ex);
 
-    private native void readAcceptedCommandListAttribute(
-        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeAcceptedCommandListAttribute(
-        long chipClusterPtr,
-        AcceptedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public interface OnTransitionTimeAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    private native void readAttributeListAttribute(
-        long chipClusterPtr, AttributeListAttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void subscribeAttributeListAttribute(
-        long chipClusterPtr,
-        AttributeListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public interface OffTransitionTimeAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    private native void subscribeFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public interface DefaultMoveRateAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-  public static class BasicCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 40L;
+      void onError(Exception ex);
 
-    public BasicCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      default void onSubscriptionEstablished() {}
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
-    public interface VendorIDAttributeCallback {
-      void onSuccess(Integer value);
+    public interface StartUpCurrentLevelAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
 
@@ -1646,202 +1783,193 @@ public interface AttributeListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public void readDataModelRevisionAttribute(IntegerAttributeCallback callback) {
-      readDataModelRevisionAttribute(chipClusterPtr, callback);
+    public void readCurrentLevelAttribute(IntegerAttributeCallback callback) {
+      readCurrentLevelAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeDataModelRevisionAttribute(
+    public void subscribeCurrentLevelAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeDataModelRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeCurrentLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readVendorNameAttribute(CharStringAttributeCallback callback) {
-      readVendorNameAttribute(chipClusterPtr, callback);
+    public void readRemainingTimeAttribute(IntegerAttributeCallback callback) {
+      readRemainingTimeAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeVendorNameAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeVendorNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeRemainingTimeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRemainingTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readVendorIDAttribute(VendorIDAttributeCallback callback) {
-      readVendorIDAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeVendorIDAttribute(
-        VendorIDAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeVendorIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readProductNameAttribute(CharStringAttributeCallback callback) {
-      readProductNameAttribute(chipClusterPtr, callback);
+    public void readMinLevelAttribute(IntegerAttributeCallback callback) {
+      readMinLevelAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeProductNameAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeProductNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeMinLevelAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMinLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readProductIDAttribute(IntegerAttributeCallback callback) {
-      readProductIDAttribute(chipClusterPtr, callback);
+    public void readMaxLevelAttribute(IntegerAttributeCallback callback) {
+      readMaxLevelAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeProductIDAttribute(
+    public void subscribeMaxLevelAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeProductIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeMaxLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readNodeLabelAttribute(CharStringAttributeCallback callback) {
-      readNodeLabelAttribute(chipClusterPtr, callback);
+    public void readCurrentFrequencyAttribute(IntegerAttributeCallback callback) {
+      readCurrentFrequencyAttribute(chipClusterPtr, callback);
     }
 
-    public void writeNodeLabelAttribute(DefaultClusterCallback callback, String value) {
-      writeNodeLabelAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeCurrentFrequencyAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentFrequencyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeNodeLabelAttribute(
-        DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
-      writeNodeLabelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readMinFrequencyAttribute(IntegerAttributeCallback callback) {
+      readMinFrequencyAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeNodeLabelAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNodeLabelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeMinFrequencyAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMinFrequencyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readLocationAttribute(CharStringAttributeCallback callback) {
-      readLocationAttribute(chipClusterPtr, callback);
+    public void readMaxFrequencyAttribute(IntegerAttributeCallback callback) {
+      readMaxFrequencyAttribute(chipClusterPtr, callback);
     }
 
-    public void writeLocationAttribute(DefaultClusterCallback callback, String value) {
-      writeLocationAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeMaxFrequencyAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMaxFrequencyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeLocationAttribute(
-        DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
-      writeLocationAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readOptionsAttribute(IntegerAttributeCallback callback) {
+      readOptionsAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeLocationAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeLocationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeOptionsAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOptionsAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readHardwareVersionAttribute(IntegerAttributeCallback callback) {
-      readHardwareVersionAttribute(chipClusterPtr, callback);
+    public void writeOptionsAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOptionsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeHardwareVersionAttribute(
+    public void subscribeOptionsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeHardwareVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeOptionsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readHardwareVersionStringAttribute(CharStringAttributeCallback callback) {
-      readHardwareVersionStringAttribute(chipClusterPtr, callback);
+    public void readOnOffTransitionTimeAttribute(IntegerAttributeCallback callback) {
+      readOnOffTransitionTimeAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeHardwareVersionStringAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeHardwareVersionStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeOnOffTransitionTimeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOnOffTransitionTimeAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readSoftwareVersionAttribute(LongAttributeCallback callback) {
-      readSoftwareVersionAttribute(chipClusterPtr, callback);
+    public void writeOnOffTransitionTimeAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOnOffTransitionTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeSoftwareVersionAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSoftwareVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeOnOffTransitionTimeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeOnOffTransitionTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readSoftwareVersionStringAttribute(CharStringAttributeCallback callback) {
-      readSoftwareVersionStringAttribute(chipClusterPtr, callback);
+    public void readOnLevelAttribute(OnLevelAttributeCallback callback) {
+      readOnLevelAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeSoftwareVersionStringAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSoftwareVersionStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeOnLevelAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOnLevelAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readManufacturingDateAttribute(CharStringAttributeCallback callback) {
-      readManufacturingDateAttribute(chipClusterPtr, callback);
+    public void writeOnLevelAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOnLevelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeManufacturingDateAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeManufacturingDateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeOnLevelAttribute(
+        OnLevelAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeOnLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readPartNumberAttribute(CharStringAttributeCallback callback) {
-      readPartNumberAttribute(chipClusterPtr, callback);
+    public void readOnTransitionTimeAttribute(OnTransitionTimeAttributeCallback callback) {
+      readOnTransitionTimeAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribePartNumberAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePartNumberAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeOnTransitionTimeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOnTransitionTimeAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readProductURLAttribute(CharStringAttributeCallback callback) {
-      readProductURLAttribute(chipClusterPtr, callback);
+    public void writeOnTransitionTimeAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOnTransitionTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeProductURLAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeProductURLAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeOnTransitionTimeAttribute(
+        OnTransitionTimeAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeOnTransitionTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readProductLabelAttribute(CharStringAttributeCallback callback) {
-      readProductLabelAttribute(chipClusterPtr, callback);
+    public void readOffTransitionTimeAttribute(OffTransitionTimeAttributeCallback callback) {
+      readOffTransitionTimeAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeProductLabelAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeProductLabelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeOffTransitionTimeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOffTransitionTimeAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readSerialNumberAttribute(CharStringAttributeCallback callback) {
-      readSerialNumberAttribute(chipClusterPtr, callback);
+    public void writeOffTransitionTimeAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOffTransitionTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeSerialNumberAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSerialNumberAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeOffTransitionTimeAttribute(
+        OffTransitionTimeAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeOffTransitionTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readLocalConfigDisabledAttribute(BooleanAttributeCallback callback) {
-      readLocalConfigDisabledAttribute(chipClusterPtr, callback);
+    public void readDefaultMoveRateAttribute(DefaultMoveRateAttributeCallback callback) {
+      readDefaultMoveRateAttribute(chipClusterPtr, callback);
     }
 
-    public void writeLocalConfigDisabledAttribute(DefaultClusterCallback callback, Boolean value) {
-      writeLocalConfigDisabledAttribute(chipClusterPtr, callback, value, null);
+    public void writeDefaultMoveRateAttribute(DefaultClusterCallback callback, Integer value) {
+      writeDefaultMoveRateAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void writeLocalConfigDisabledAttribute(
-        DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-      writeLocalConfigDisabledAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeDefaultMoveRateAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeDefaultMoveRateAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeLocalConfigDisabledAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeLocalConfigDisabledAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeDefaultMoveRateAttribute(
+        DefaultMoveRateAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeDefaultMoveRateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readReachableAttribute(BooleanAttributeCallback callback) {
-      readReachableAttribute(chipClusterPtr, callback);
+    public void readStartUpCurrentLevelAttribute(StartUpCurrentLevelAttributeCallback callback) {
+      readStartUpCurrentLevelAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeReachableAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeReachableAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeStartUpCurrentLevelAttribute(DefaultClusterCallback callback, Integer value) {
+      writeStartUpCurrentLevelAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readUniqueIDAttribute(CharStringAttributeCallback callback) {
-      readUniqueIDAttribute(chipClusterPtr, callback);
+    public void writeStartUpCurrentLevelAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeStartUpCurrentLevelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeUniqueIDAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeUniqueIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeStartUpCurrentLevelAttribute(
+        StartUpCurrentLevelAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeStartUpCurrentLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -1889,171 +2017,141 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readDataModelRevisionAttribute(
+    private native void readCurrentLevelAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeDataModelRevisionAttribute(
+    private native void subscribeCurrentLevelAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readVendorNameAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
+    private native void readRemainingTimeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeVendorNameAttribute(
-        long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeRemainingTimeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readVendorIDAttribute(
-        long chipClusterPtr, VendorIDAttributeCallback callback);
+    private native void readMinLevelAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeVendorIDAttribute(
-        long chipClusterPtr, VendorIDAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeMinLevelAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readProductNameAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
+    private native void readMaxLevelAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeProductNameAttribute(
-        long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeMaxLevelAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readProductIDAttribute(
+    private native void readCurrentFrequencyAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeProductIDAttribute(
+    private native void subscribeCurrentFrequencyAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readNodeLabelAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
+    private native void readMinFrequencyAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeNodeLabelAttribute(
+    private native void subscribeMinFrequencyAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readMaxFrequencyAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeMaxFrequencyAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readOptionsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeOptionsAttribute(
         long chipClusterPtr,
         DefaultClusterCallback callback,
-        String value,
+        Integer value,
         @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeNodeLabelAttribute(
-        long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeOptionsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readLocationAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
+    private native void readOnOffTransitionTimeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeLocationAttribute(
+    private native void writeOnOffTransitionTimeAttribute(
         long chipClusterPtr,
         DefaultClusterCallback callback,
-        String value,
+        Integer value,
         @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeLocationAttribute(
-        long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readHardwareVersionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeHardwareVersionAttribute(
+    private native void subscribeOnOffTransitionTimeAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readHardwareVersionStringAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
+    private native void readOnLevelAttribute(
+        long chipClusterPtr, OnLevelAttributeCallback callback);
 
-    private native void subscribeHardwareVersionStringAttribute(
+    private native void writeOnLevelAttribute(
         long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readSoftwareVersionAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeSoftwareVersionAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeOnLevelAttribute(
+        long chipClusterPtr, OnLevelAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readSoftwareVersionStringAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
+    private native void readOnTransitionTimeAttribute(
+        long chipClusterPtr, OnTransitionTimeAttributeCallback callback);
 
-    private native void subscribeSoftwareVersionStringAttribute(
+    private native void writeOnTransitionTimeAttribute(
         long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readManufacturingDateAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeManufacturingDateAttribute(
+    private native void subscribeOnTransitionTimeAttribute(
         long chipClusterPtr,
-        CharStringAttributeCallback callback,
+        OnTransitionTimeAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readPartNumberAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
+    private native void readOffTransitionTimeAttribute(
+        long chipClusterPtr, OffTransitionTimeAttributeCallback callback);
 
-    private native void subscribePartNumberAttribute(
+    private native void writeOffTransitionTimeAttribute(
         long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readProductURLAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeProductURLAttribute(
+    private native void subscribeOffTransitionTimeAttribute(
         long chipClusterPtr,
-        CharStringAttributeCallback callback,
+        OffTransitionTimeAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readProductLabelAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
+    private native void readDefaultMoveRateAttribute(
+        long chipClusterPtr, DefaultMoveRateAttributeCallback callback);
 
-    private native void subscribeProductLabelAttribute(
+    private native void writeDefaultMoveRateAttribute(
         long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readSerialNumberAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeSerialNumberAttribute(
+    private native void subscribeDefaultMoveRateAttribute(
         long chipClusterPtr,
-        CharStringAttributeCallback callback,
+        DefaultMoveRateAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readLocalConfigDisabledAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
+    private native void readStartUpCurrentLevelAttribute(
+        long chipClusterPtr, StartUpCurrentLevelAttributeCallback callback);
 
-    private native void writeLocalConfigDisabledAttribute(
+    private native void writeStartUpCurrentLevelAttribute(
         long chipClusterPtr,
         DefaultClusterCallback callback,
-        Boolean value,
+        Integer value,
         @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeLocalConfigDisabledAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readReachableAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void subscribeReachableAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readUniqueIDAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeUniqueIDAttribute(
+    private native void subscribeStartUpCurrentLevelAttribute(
         long chipClusterPtr,
-        CharStringAttributeCallback callback,
+        StartUpCurrentLevelAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
@@ -2291,18 +2389,42 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class BindingCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 30L;
+  public static class DescriptorCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 29L;
 
-    public BindingCluster(long devicePtr, int endpointId) {
+    public DescriptorCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public interface BindingAttributeCallback {
-      void onSuccess(List<ChipStructs.BindingClusterTargetStruct> valueList);
+    public interface DeviceListAttributeCallback {
+      void onSuccess(List<ChipStructs.DescriptorClusterDeviceType> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
+    }
+
+    public interface ServerListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
+    }
+
+    public interface ClientListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
+    }
+
+    public interface PartsListAttributeCallback {
+      void onSuccess(List<Integer> valueList);
 
       void onError(Exception ex);
 
@@ -2333,25 +2455,40 @@ public interface AttributeListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public void readBindingAttribute(BindingAttributeCallback callback) {
-      readBindingAttribute(chipClusterPtr, callback);
+    public void readDeviceListAttribute(DeviceListAttributeCallback callback) {
+      readDeviceListAttribute(chipClusterPtr, callback);
     }
 
-    public void writeBindingAttribute(
-        DefaultClusterCallback callback, ArrayList<ChipStructs.BindingClusterTargetStruct> value) {
-      writeBindingAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeDeviceListAttribute(
+        DeviceListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeDeviceListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeBindingAttribute(
-        DefaultClusterCallback callback,
-        ArrayList<ChipStructs.BindingClusterTargetStruct> value,
-        int timedWriteTimeoutMs) {
-      writeBindingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readServerListAttribute(ServerListAttributeCallback callback) {
+      readServerListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeBindingAttribute(
-        BindingAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBindingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeServerListAttribute(
+        ServerListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeServerListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClientListAttribute(ClientListAttributeCallback callback) {
+      readClientListAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeClientListAttribute(
+        ClientListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClientListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPartsListAttribute(PartsListAttributeCallback callback) {
+      readPartsListAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribePartsListAttribute(
+        PartsListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePartsListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -2399,17 +2536,38 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readBindingAttribute(
-        long chipClusterPtr, BindingAttributeCallback callback);
+    private native void readDeviceListAttribute(
+        long chipClusterPtr, DeviceListAttributeCallback callback);
 
-    private native void writeBindingAttribute(
+    private native void subscribeDeviceListAttribute(
         long chipClusterPtr,
-        DefaultClusterCallback callback,
-        ArrayList<ChipStructs.BindingClusterTargetStruct> value,
-        @Nullable Integer timedWriteTimeoutMs);
+        DeviceListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void subscribeBindingAttribute(
-        long chipClusterPtr, BindingAttributeCallback callback, int minInterval, int maxInterval);
+    private native void readServerListAttribute(
+        long chipClusterPtr, ServerListAttributeCallback callback);
+
+    private native void subscribeServerListAttribute(
+        long chipClusterPtr,
+        ServerListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readClientListAttribute(
+        long chipClusterPtr, ClientListAttributeCallback callback);
+
+    private native void subscribeClientListAttribute(
+        long chipClusterPtr,
+        ClientListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readPartsListAttribute(
+        long chipClusterPtr, PartsListAttributeCallback callback);
+
+    private native void subscribePartsListAttribute(
+        long chipClusterPtr, PartsListAttributeCallback callback, int minInterval, int maxInterval);
 
     private native void readGeneratedCommandListAttribute(
         long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
@@ -2451,16 +2609,24 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class BooleanStateCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 69L;
+  public static class BindingCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 30L;
 
-    public BooleanStateCluster(long devicePtr, int endpointId) {
+    public BindingCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
+    public interface BindingAttributeCallback {
+      void onSuccess(List<ChipStructs.BindingClusterTargetStruct> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
+    }
+
     public interface GeneratedCommandListAttributeCallback {
       void onSuccess(List<Long> valueList);
 
@@ -2485,14 +2651,26 @@ public interface AttributeListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public void readStateValueAttribute(BooleanAttributeCallback callback) {
-      readStateValueAttribute(chipClusterPtr, callback);
+    public void readBindingAttribute(BindingAttributeCallback callback) {
+      readBindingAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeStateValueAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeStateValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void writeBindingAttribute(
+        DefaultClusterCallback callback, ArrayList<ChipStructs.BindingClusterTargetStruct> value) {
+      writeBindingAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeBindingAttribute(
+        DefaultClusterCallback callback,
+        ArrayList<ChipStructs.BindingClusterTargetStruct> value,
+        int timedWriteTimeoutMs) {
+      writeBindingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+
+    public void subscribeBindingAttribute(
+        BindingAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBindingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
       readGeneratedCommandListAttribute(chipClusterPtr, callback);
@@ -2539,11 +2717,17 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readStateValueAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
+    private native void readBindingAttribute(
+        long chipClusterPtr, BindingAttributeCallback callback);
 
-    private native void subscribeStateValueAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+    private native void writeBindingAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        ArrayList<ChipStructs.BindingClusterTargetStruct> value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeBindingAttribute(
+        long chipClusterPtr, BindingAttributeCallback callback, int minInterval, int maxInterval);
 
     private native void readGeneratedCommandListAttribute(
         long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
@@ -2585,368 +2769,156 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class BridgedActionsCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 37L;
+  public static class AccessControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 31L;
 
-    public BridgedActionsCluster(long devicePtr, int endpointId) {
+    public AccessControlCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void disableAction(
-        DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID) {
-      disableAction(chipClusterPtr, callback, actionID, invokeID, null);
+    public interface AclAttributeCallback {
+      void onSuccess(List<ChipStructs.AccessControlClusterAccessControlEntry> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void disableAction(
-        DefaultClusterCallback callback,
-        Integer actionID,
-        Optional<Long> invokeID,
-        int timedInvokeTimeoutMs) {
-      disableAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
+    public interface ExtensionAttributeCallback {
+      void onSuccess(List<ChipStructs.AccessControlClusterExtensionEntry> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void disableActionWithDuration(
-        DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, Long duration) {
-      disableActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration, null);
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void disableActionWithDuration(
-        DefaultClusterCallback callback,
-        Integer actionID,
-        Optional<Long> invokeID,
-        Long duration,
-        int timedInvokeTimeoutMs) {
-      disableActionWithDuration(
-          chipClusterPtr, callback, actionID, invokeID, duration, timedInvokeTimeoutMs);
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void enableAction(
-        DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID) {
-      enableAction(chipClusterPtr, callback, actionID, invokeID, null);
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void enableAction(
-        DefaultClusterCallback callback,
-        Integer actionID,
-        Optional<Long> invokeID,
-        int timedInvokeTimeoutMs) {
-      enableAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
+    public void readAclAttribute(AclAttributeCallback callback) {
+      readAclAttribute(chipClusterPtr, callback);
     }
 
-    public void enableActionWithDuration(
-        DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, Long duration) {
-      enableActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration, null);
+    public void writeAclAttribute(
+        DefaultClusterCallback callback,
+        ArrayList<ChipStructs.AccessControlClusterAccessControlEntry> value) {
+      writeAclAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void enableActionWithDuration(
+    public void writeAclAttribute(
         DefaultClusterCallback callback,
-        Integer actionID,
-        Optional<Long> invokeID,
-        Long duration,
-        int timedInvokeTimeoutMs) {
-      enableActionWithDuration(
-          chipClusterPtr, callback, actionID, invokeID, duration, timedInvokeTimeoutMs);
+        ArrayList<ChipStructs.AccessControlClusterAccessControlEntry> value,
+        int timedWriteTimeoutMs) {
+      writeAclAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void instantAction(
-        DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID) {
-      instantAction(chipClusterPtr, callback, actionID, invokeID, null);
+    public void subscribeAclAttribute(
+        AclAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAclAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void instantAction(
-        DefaultClusterCallback callback,
-        Integer actionID,
-        Optional<Long> invokeID,
-        int timedInvokeTimeoutMs) {
-      instantAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
+    public void readExtensionAttribute(ExtensionAttributeCallback callback) {
+      readExtensionAttribute(chipClusterPtr, callback);
     }
 
-    public void instantActionWithTransition(
+    public void writeExtensionAttribute(
         DefaultClusterCallback callback,
-        Integer actionID,
-        Optional<Long> invokeID,
-        Integer transitionTime) {
-      instantActionWithTransition(
-          chipClusterPtr, callback, actionID, invokeID, transitionTime, null);
+        ArrayList<ChipStructs.AccessControlClusterExtensionEntry> value) {
+      writeExtensionAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void instantActionWithTransition(
+    public void writeExtensionAttribute(
         DefaultClusterCallback callback,
-        Integer actionID,
-        Optional<Long> invokeID,
-        Integer transitionTime,
-        int timedInvokeTimeoutMs) {
-      instantActionWithTransition(
-          chipClusterPtr, callback, actionID, invokeID, transitionTime, timedInvokeTimeoutMs);
+        ArrayList<ChipStructs.AccessControlClusterExtensionEntry> value,
+        int timedWriteTimeoutMs) {
+      writeExtensionAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void pauseAction(
-        DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID) {
-      pauseAction(chipClusterPtr, callback, actionID, invokeID, null);
+    public void subscribeExtensionAttribute(
+        ExtensionAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeExtensionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void pauseAction(
-        DefaultClusterCallback callback,
-        Integer actionID,
-        Optional<Long> invokeID,
-        int timedInvokeTimeoutMs) {
-      pauseAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
+    public void readSubjectsPerAccessControlEntryAttribute(IntegerAttributeCallback callback) {
+      readSubjectsPerAccessControlEntryAttribute(chipClusterPtr, callback);
     }
 
-    public void pauseActionWithDuration(
-        DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, Long duration) {
-      pauseActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration, null);
+    public void subscribeSubjectsPerAccessControlEntryAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSubjectsPerAccessControlEntryAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void pauseActionWithDuration(
-        DefaultClusterCallback callback,
-        Integer actionID,
-        Optional<Long> invokeID,
-        Long duration,
-        int timedInvokeTimeoutMs) {
-      pauseActionWithDuration(
-          chipClusterPtr, callback, actionID, invokeID, duration, timedInvokeTimeoutMs);
+    public void readTargetsPerAccessControlEntryAttribute(IntegerAttributeCallback callback) {
+      readTargetsPerAccessControlEntryAttribute(chipClusterPtr, callback);
     }
 
-    public void resumeAction(
-        DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID) {
-      resumeAction(chipClusterPtr, callback, actionID, invokeID, null);
+    public void subscribeTargetsPerAccessControlEntryAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTargetsPerAccessControlEntryAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void resumeAction(
-        DefaultClusterCallback callback,
-        Integer actionID,
-        Optional<Long> invokeID,
-        int timedInvokeTimeoutMs) {
-      resumeAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
+    public void readAccessControlEntriesPerFabricAttribute(IntegerAttributeCallback callback) {
+      readAccessControlEntriesPerFabricAttribute(chipClusterPtr, callback);
     }
 
-    public void startAction(
-        DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID) {
-      startAction(chipClusterPtr, callback, actionID, invokeID, null);
+    public void subscribeAccessControlEntriesPerFabricAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAccessControlEntriesPerFabricAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void startAction(
-        DefaultClusterCallback callback,
-        Integer actionID,
-        Optional<Long> invokeID,
-        int timedInvokeTimeoutMs) {
-      startAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void startActionWithDuration(
-        DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, Long duration) {
-      startActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration, null);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void startActionWithDuration(
-        DefaultClusterCallback callback,
-        Integer actionID,
-        Optional<Long> invokeID,
-        Long duration,
-        int timedInvokeTimeoutMs) {
-      startActionWithDuration(
-          chipClusterPtr, callback, actionID, invokeID, duration, timedInvokeTimeoutMs);
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void stopAction(
-        DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID) {
-      stopAction(chipClusterPtr, callback, actionID, invokeID, null);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void stopAction(
-        DefaultClusterCallback callback,
-        Integer actionID,
-        Optional<Long> invokeID,
-        int timedInvokeTimeoutMs) {
-      stopAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
     }
 
-    private native void disableAction(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer actionID,
-        Optional<Long> invokeID,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void disableActionWithDuration(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer actionID,
-        Optional<Long> invokeID,
-        Long duration,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void enableAction(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer actionID,
-        Optional<Long> invokeID,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void enableActionWithDuration(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer actionID,
-        Optional<Long> invokeID,
-        Long duration,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void instantAction(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer actionID,
-        Optional<Long> invokeID,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void instantActionWithTransition(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer actionID,
-        Optional<Long> invokeID,
-        Integer transitionTime,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void pauseAction(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer actionID,
-        Optional<Long> invokeID,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void pauseActionWithDuration(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer actionID,
-        Optional<Long> invokeID,
-        Long duration,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void resumeAction(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer actionID,
-        Optional<Long> invokeID,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void startAction(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer actionID,
-        Optional<Long> invokeID,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void startActionWithDuration(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer actionID,
-        Optional<Long> invokeID,
-        Long duration,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void stopAction(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer actionID,
-        Optional<Long> invokeID,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface ActionListAttributeCallback {
-      void onSuccess(List<ChipStructs.BridgedActionsClusterActionStruct> valueList);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public interface EndpointListAttributeCallback {
-      void onSuccess(List<ChipStructs.BridgedActionsClusterEndpointListStruct> valueList);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public void readActionListAttribute(ActionListAttributeCallback callback) {
-      readActionListAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeActionListAttribute(
-        ActionListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeActionListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readEndpointListAttribute(EndpointListAttributeCallback callback) {
-      readEndpointListAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeEndpointListAttribute(
-        EndpointListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeEndpointListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readSetupUrlAttribute(CharStringAttributeCallback callback) {
-      readSetupUrlAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeSetupUrlAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSetupUrlAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
     public void readFeatureMapAttribute(LongAttributeCallback callback) {
       readFeatureMapAttribute(chipClusterPtr, callback);
@@ -2966,32 +2938,46 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readActionListAttribute(
-        long chipClusterPtr, ActionListAttributeCallback callback);
+    private native void readAclAttribute(long chipClusterPtr, AclAttributeCallback callback);
 
-    private native void subscribeActionListAttribute(
+    private native void writeAclAttribute(
         long chipClusterPtr,
-        ActionListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+        DefaultClusterCallback callback,
+        ArrayList<ChipStructs.AccessControlClusterAccessControlEntry> value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readEndpointListAttribute(
-        long chipClusterPtr, EndpointListAttributeCallback callback);
+    private native void subscribeAclAttribute(
+        long chipClusterPtr, AclAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeEndpointListAttribute(
+    private native void readExtensionAttribute(
+        long chipClusterPtr, ExtensionAttributeCallback callback);
+
+    private native void writeExtensionAttribute(
         long chipClusterPtr,
-        EndpointListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+        DefaultClusterCallback callback,
+        ArrayList<ChipStructs.AccessControlClusterExtensionEntry> value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readSetupUrlAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
+    private native void subscribeExtensionAttribute(
+        long chipClusterPtr, ExtensionAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeSetupUrlAttribute(
-        long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void readSubjectsPerAccessControlEntryAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeSubjectsPerAccessControlEntryAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readTargetsPerAccessControlEntryAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeTargetsPerAccessControlEntryAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readAccessControlEntriesPerFabricAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeAccessControlEntriesPerFabricAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
     private native void readGeneratedCommandListAttribute(
         long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
@@ -3033,190 +3019,340 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class BridgedDeviceBasicCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 57L;
+  public static class BridgedActionsCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 37L;
 
-    public BridgedDeviceBasicCluster(long devicePtr, int endpointId) {
+    public BridgedActionsCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public interface VendorIDAttributeCallback {
-      void onSuccess(Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void instantAction(
+        DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID) {
+      instantAction(chipClusterPtr, callback, actionID, invokeID, null);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
-
-      void onError(Exception ex);
+    public void instantAction(
+        DefaultClusterCallback callback,
+        Integer actionID,
+        Optional<Long> invokeID,
+        int timedInvokeTimeoutMs) {
+      instantAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void instantActionWithTransition(
+        DefaultClusterCallback callback,
+        Integer actionID,
+        Optional<Long> invokeID,
+        Integer transitionTime) {
+      instantActionWithTransition(
+          chipClusterPtr, callback, actionID, invokeID, transitionTime, null);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void instantActionWithTransition(
+        DefaultClusterCallback callback,
+        Integer actionID,
+        Optional<Long> invokeID,
+        Integer transitionTime,
+        int timedInvokeTimeoutMs) {
+      instantActionWithTransition(
+          chipClusterPtr, callback, actionID, invokeID, transitionTime, timedInvokeTimeoutMs);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void startAction(
+        DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID) {
+      startAction(chipClusterPtr, callback, actionID, invokeID, null);
     }
 
-    public void readVendorNameAttribute(CharStringAttributeCallback callback) {
-      readVendorNameAttribute(chipClusterPtr, callback);
+    public void startAction(
+        DefaultClusterCallback callback,
+        Integer actionID,
+        Optional<Long> invokeID,
+        int timedInvokeTimeoutMs) {
+      startAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
     }
 
-    public void subscribeVendorNameAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeVendorNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void startActionWithDuration(
+        DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, Long duration) {
+      startActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration, null);
     }
 
-    public void readVendorIDAttribute(VendorIDAttributeCallback callback) {
-      readVendorIDAttribute(chipClusterPtr, callback);
+    public void startActionWithDuration(
+        DefaultClusterCallback callback,
+        Integer actionID,
+        Optional<Long> invokeID,
+        Long duration,
+        int timedInvokeTimeoutMs) {
+      startActionWithDuration(
+          chipClusterPtr, callback, actionID, invokeID, duration, timedInvokeTimeoutMs);
     }
 
-    public void subscribeVendorIDAttribute(
-        VendorIDAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeVendorIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void stopAction(
+        DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID) {
+      stopAction(chipClusterPtr, callback, actionID, invokeID, null);
     }
 
-    public void readProductNameAttribute(CharStringAttributeCallback callback) {
-      readProductNameAttribute(chipClusterPtr, callback);
+    public void stopAction(
+        DefaultClusterCallback callback,
+        Integer actionID,
+        Optional<Long> invokeID,
+        int timedInvokeTimeoutMs) {
+      stopAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
     }
 
-    public void subscribeProductNameAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeProductNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void pauseAction(
+        DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID) {
+      pauseAction(chipClusterPtr, callback, actionID, invokeID, null);
     }
 
-    public void readNodeLabelAttribute(CharStringAttributeCallback callback) {
-      readNodeLabelAttribute(chipClusterPtr, callback);
+    public void pauseAction(
+        DefaultClusterCallback callback,
+        Integer actionID,
+        Optional<Long> invokeID,
+        int timedInvokeTimeoutMs) {
+      pauseAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
     }
 
-    public void writeNodeLabelAttribute(DefaultClusterCallback callback, String value) {
-      writeNodeLabelAttribute(chipClusterPtr, callback, value, null);
+    public void pauseActionWithDuration(
+        DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, Long duration) {
+      pauseActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration, null);
     }
 
-    public void writeNodeLabelAttribute(
-        DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
-      writeNodeLabelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void pauseActionWithDuration(
+        DefaultClusterCallback callback,
+        Integer actionID,
+        Optional<Long> invokeID,
+        Long duration,
+        int timedInvokeTimeoutMs) {
+      pauseActionWithDuration(
+          chipClusterPtr, callback, actionID, invokeID, duration, timedInvokeTimeoutMs);
     }
 
-    public void subscribeNodeLabelAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNodeLabelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void resumeAction(
+        DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID) {
+      resumeAction(chipClusterPtr, callback, actionID, invokeID, null);
     }
 
-    public void readHardwareVersionAttribute(IntegerAttributeCallback callback) {
-      readHardwareVersionAttribute(chipClusterPtr, callback);
+    public void resumeAction(
+        DefaultClusterCallback callback,
+        Integer actionID,
+        Optional<Long> invokeID,
+        int timedInvokeTimeoutMs) {
+      resumeAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
     }
 
-    public void subscribeHardwareVersionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeHardwareVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void enableAction(
+        DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID) {
+      enableAction(chipClusterPtr, callback, actionID, invokeID, null);
     }
 
-    public void readHardwareVersionStringAttribute(CharStringAttributeCallback callback) {
-      readHardwareVersionStringAttribute(chipClusterPtr, callback);
+    public void enableAction(
+        DefaultClusterCallback callback,
+        Integer actionID,
+        Optional<Long> invokeID,
+        int timedInvokeTimeoutMs) {
+      enableAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
     }
 
-    public void subscribeHardwareVersionStringAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeHardwareVersionStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void enableActionWithDuration(
+        DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, Long duration) {
+      enableActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration, null);
     }
 
-    public void readSoftwareVersionAttribute(LongAttributeCallback callback) {
-      readSoftwareVersionAttribute(chipClusterPtr, callback);
+    public void enableActionWithDuration(
+        DefaultClusterCallback callback,
+        Integer actionID,
+        Optional<Long> invokeID,
+        Long duration,
+        int timedInvokeTimeoutMs) {
+      enableActionWithDuration(
+          chipClusterPtr, callback, actionID, invokeID, duration, timedInvokeTimeoutMs);
     }
 
-    public void subscribeSoftwareVersionAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSoftwareVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void disableAction(
+        DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID) {
+      disableAction(chipClusterPtr, callback, actionID, invokeID, null);
     }
 
-    public void readSoftwareVersionStringAttribute(CharStringAttributeCallback callback) {
-      readSoftwareVersionStringAttribute(chipClusterPtr, callback);
+    public void disableAction(
+        DefaultClusterCallback callback,
+        Integer actionID,
+        Optional<Long> invokeID,
+        int timedInvokeTimeoutMs) {
+      disableAction(chipClusterPtr, callback, actionID, invokeID, timedInvokeTimeoutMs);
     }
 
-    public void subscribeSoftwareVersionStringAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSoftwareVersionStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void disableActionWithDuration(
+        DefaultClusterCallback callback, Integer actionID, Optional<Long> invokeID, Long duration) {
+      disableActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration, null);
     }
 
-    public void readManufacturingDateAttribute(CharStringAttributeCallback callback) {
-      readManufacturingDateAttribute(chipClusterPtr, callback);
+    public void disableActionWithDuration(
+        DefaultClusterCallback callback,
+        Integer actionID,
+        Optional<Long> invokeID,
+        Long duration,
+        int timedInvokeTimeoutMs) {
+      disableActionWithDuration(
+          chipClusterPtr, callback, actionID, invokeID, duration, timedInvokeTimeoutMs);
     }
 
-    public void subscribeManufacturingDateAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeManufacturingDateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void instantAction(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer actionID,
+        Optional<Long> invokeID,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void readPartNumberAttribute(CharStringAttributeCallback callback) {
-      readPartNumberAttribute(chipClusterPtr, callback);
-    }
+    private native void instantActionWithTransition(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer actionID,
+        Optional<Long> invokeID,
+        Integer transitionTime,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void subscribePartNumberAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePartNumberAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void startAction(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer actionID,
+        Optional<Long> invokeID,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void readProductURLAttribute(CharStringAttributeCallback callback) {
-      readProductURLAttribute(chipClusterPtr, callback);
-    }
+    private native void startActionWithDuration(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer actionID,
+        Optional<Long> invokeID,
+        Long duration,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void subscribeProductURLAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeProductURLAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void stopAction(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer actionID,
+        Optional<Long> invokeID,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void readProductLabelAttribute(CharStringAttributeCallback callback) {
-      readProductLabelAttribute(chipClusterPtr, callback);
-    }
+    private native void pauseAction(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer actionID,
+        Optional<Long> invokeID,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void subscribeProductLabelAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeProductLabelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void pauseActionWithDuration(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer actionID,
+        Optional<Long> invokeID,
+        Long duration,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void readSerialNumberAttribute(CharStringAttributeCallback callback) {
-      readSerialNumberAttribute(chipClusterPtr, callback);
-    }
+    private native void resumeAction(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer actionID,
+        Optional<Long> invokeID,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void subscribeSerialNumberAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSerialNumberAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void enableAction(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer actionID,
+        Optional<Long> invokeID,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void readReachableAttribute(BooleanAttributeCallback callback) {
-      readReachableAttribute(chipClusterPtr, callback);
+    private native void enableActionWithDuration(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer actionID,
+        Optional<Long> invokeID,
+        Long duration,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void disableAction(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer actionID,
+        Optional<Long> invokeID,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void disableActionWithDuration(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer actionID,
+        Optional<Long> invokeID,
+        Long duration,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    public interface ActionListAttributeCallback {
+      void onSuccess(List<ChipStructs.BridgedActionsClusterActionStruct> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeReachableAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeReachableAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface EndpointListAttributeCallback {
+      void onSuccess(List<ChipStructs.BridgedActionsClusterEndpointListStruct> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readUniqueIDAttribute(CharStringAttributeCallback callback) {
-      readUniqueIDAttribute(chipClusterPtr, callback);
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeUniqueIDAttribute(
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
+    }
+
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
+    }
+
+    public void readActionListAttribute(ActionListAttributeCallback callback) {
+      readActionListAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeActionListAttribute(
+        ActionListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeActionListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readEndpointListAttribute(EndpointListAttributeCallback callback) {
+      readEndpointListAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeEndpointListAttribute(
+        EndpointListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeEndpointListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSetupUrlAttribute(CharStringAttributeCallback callback) {
+      readSetupUrlAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeSetupUrlAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeUniqueIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeSetupUrlAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -3264,130 +3400,28 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readVendorNameAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeVendorNameAttribute(
-        long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readVendorIDAttribute(
-        long chipClusterPtr, VendorIDAttributeCallback callback);
-
-    private native void subscribeVendorIDAttribute(
-        long chipClusterPtr, VendorIDAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readProductNameAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeProductNameAttribute(
-        long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readNodeLabelAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void writeNodeLabelAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        String value,
-        @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeNodeLabelAttribute(
-        long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readHardwareVersionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeHardwareVersionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readHardwareVersionStringAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeHardwareVersionStringAttribute(
-        long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readSoftwareVersionAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeSoftwareVersionAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSoftwareVersionStringAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeSoftwareVersionStringAttribute(
-        long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readManufacturingDateAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeManufacturingDateAttribute(
-        long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readPartNumberAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribePartNumberAttribute(
-        long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readProductURLAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void subscribeProductURLAttribute(
-        long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readProductLabelAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
+    private native void readActionListAttribute(
+        long chipClusterPtr, ActionListAttributeCallback callback);
 
-    private native void subscribeProductLabelAttribute(
+    private native void subscribeActionListAttribute(
         long chipClusterPtr,
-        CharStringAttributeCallback callback,
+        ActionListAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readSerialNumberAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
+    private native void readEndpointListAttribute(
+        long chipClusterPtr, EndpointListAttributeCallback callback);
 
-    private native void subscribeSerialNumberAttribute(
+    private native void subscribeEndpointListAttribute(
         long chipClusterPtr,
-        CharStringAttributeCallback callback,
+        EndpointListAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readReachableAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void subscribeReachableAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readUniqueIDAttribute(
+    private native void readSetupUrlAttribute(
         long chipClusterPtr, CharStringAttributeCallback callback);
 
-    private native void subscribeUniqueIDAttribute(
+    private native void subscribeSetupUrlAttribute(
         long chipClusterPtr,
         CharStringAttributeCallback callback,
         int minInterval,
@@ -3433,112 +3467,244 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class ChannelCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1284L;
+  public static class BasicCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 40L;
 
-    public ChannelCluster(long devicePtr, int endpointId) {
+    public BasicCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void changeChannel(ChangeChannelResponseCallback callback, String match) {
-      changeChannel(chipClusterPtr, callback, match, null);
-    }
+    public interface VendorIDAttributeCallback {
+      void onSuccess(Integer value);
 
-    public void changeChannel(
-        ChangeChannelResponseCallback callback, String match, int timedInvokeTimeoutMs) {
-      changeChannel(chipClusterPtr, callback, match, timedInvokeTimeoutMs);
-    }
+      void onError(Exception ex);
 
-    public void changeChannelByNumber(
-        DefaultClusterCallback callback, Integer majorNumber, Integer minorNumber) {
-      changeChannelByNumber(chipClusterPtr, callback, majorNumber, minorNumber, null);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void changeChannelByNumber(
-        DefaultClusterCallback callback,
-        Integer majorNumber,
-        Integer minorNumber,
-        int timedInvokeTimeoutMs) {
-      changeChannelByNumber(
-          chipClusterPtr, callback, majorNumber, minorNumber, timedInvokeTimeoutMs);
-    }
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void skipChannel(DefaultClusterCallback callback, Integer count) {
-      skipChannel(chipClusterPtr, callback, count, null);
-    }
+      void onError(Exception ex);
 
-    public void skipChannel(
-        DefaultClusterCallback callback, Integer count, int timedInvokeTimeoutMs) {
-      skipChannel(chipClusterPtr, callback, count, timedInvokeTimeoutMs);
+      default void onSubscriptionEstablished() {}
     }
 
-    private native void changeChannel(
-        long chipClusterPtr,
-        ChangeChannelResponseCallback Callback,
-        String match,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void changeChannelByNumber(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer majorNumber,
-        Integer minorNumber,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void skipChannel(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer count,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface ChangeChannelResponseCallback {
-      void onSuccess(Integer status, Optional<String> data);
+      void onError(Exception ex);
 
-      void onError(Exception error);
+      default void onSubscriptionEstablished() {}
     }
 
-    public interface ChannelListAttributeCallback {
-      void onSuccess(List<ChipStructs.ChannelClusterChannelInfo> valueList);
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void readDataModelRevisionAttribute(IntegerAttributeCallback callback) {
+      readDataModelRevisionAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void subscribeDataModelRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeDataModelRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readVendorNameAttribute(CharStringAttributeCallback callback) {
+      readVendorNameAttribute(chipClusterPtr, callback);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void subscribeVendorNameAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeVendorNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readVendorIDAttribute(VendorIDAttributeCallback callback) {
+      readVendorIDAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeVendorIDAttribute(
+        VendorIDAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeVendorIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void readProductNameAttribute(CharStringAttributeCallback callback) {
+      readProductNameAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void subscribeProductNameAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeProductNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readProductIDAttribute(IntegerAttributeCallback callback) {
+      readProductIDAttribute(chipClusterPtr, callback);
     }
 
-    public void readChannelListAttribute(ChannelListAttributeCallback callback) {
-      readChannelListAttribute(chipClusterPtr, callback);
+    public void subscribeProductIDAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeProductIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void subscribeChannelListAttribute(
-        ChannelListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeChannelListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readNodeLabelAttribute(CharStringAttributeCallback callback) {
+      readNodeLabelAttribute(chipClusterPtr, callback);
+    }
+
+    public void writeNodeLabelAttribute(DefaultClusterCallback callback, String value) {
+      writeNodeLabelAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNodeLabelAttribute(
+        DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      writeNodeLabelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+
+    public void subscribeNodeLabelAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNodeLabelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLocationAttribute(CharStringAttributeCallback callback) {
+      readLocationAttribute(chipClusterPtr, callback);
+    }
+
+    public void writeLocationAttribute(DefaultClusterCallback callback, String value) {
+      writeLocationAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeLocationAttribute(
+        DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      writeLocationAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+
+    public void subscribeLocationAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeLocationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readHardwareVersionAttribute(IntegerAttributeCallback callback) {
+      readHardwareVersionAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeHardwareVersionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeHardwareVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readHardwareVersionStringAttribute(CharStringAttributeCallback callback) {
+      readHardwareVersionStringAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeHardwareVersionStringAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeHardwareVersionStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSoftwareVersionAttribute(LongAttributeCallback callback) {
+      readSoftwareVersionAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeSoftwareVersionAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSoftwareVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSoftwareVersionStringAttribute(CharStringAttributeCallback callback) {
+      readSoftwareVersionStringAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeSoftwareVersionStringAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSoftwareVersionStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readManufacturingDateAttribute(CharStringAttributeCallback callback) {
+      readManufacturingDateAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeManufacturingDateAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeManufacturingDateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPartNumberAttribute(CharStringAttributeCallback callback) {
+      readPartNumberAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribePartNumberAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePartNumberAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readProductURLAttribute(CharStringAttributeCallback callback) {
+      readProductURLAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeProductURLAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeProductURLAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readProductLabelAttribute(CharStringAttributeCallback callback) {
+      readProductLabelAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeProductLabelAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeProductLabelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSerialNumberAttribute(CharStringAttributeCallback callback) {
+      readSerialNumberAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeSerialNumberAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSerialNumberAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLocalConfigDisabledAttribute(BooleanAttributeCallback callback) {
+      readLocalConfigDisabledAttribute(chipClusterPtr, callback);
+    }
+
+    public void writeLocalConfigDisabledAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeLocalConfigDisabledAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeLocalConfigDisabledAttribute(
+        DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeLocalConfigDisabledAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+
+    public void subscribeLocalConfigDisabledAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeLocalConfigDisabledAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readReachableAttribute(BooleanAttributeCallback callback) {
+      readReachableAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeReachableAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeReachableAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUniqueIDAttribute(CharStringAttributeCallback callback) {
+      readUniqueIDAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeUniqueIDAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeUniqueIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -3586,36 +3752,195 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readChannelListAttribute(
-        long chipClusterPtr, ChannelListAttributeCallback callback);
+    private native void readDataModelRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeChannelListAttribute(
-        long chipClusterPtr,
-        ChannelListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeDataModelRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readGeneratedCommandListAttribute(
-        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    private native void readVendorNameAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
 
-    private native void subscribeGeneratedCommandListAttribute(
+    private native void subscribeVendorNameAttribute(
         long chipClusterPtr,
-        GeneratedCommandListAttributeCallback callback,
+        CharStringAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readAcceptedCommandListAttribute(
-        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    private native void readVendorIDAttribute(
+        long chipClusterPtr, VendorIDAttributeCallback callback);
 
-    private native void subscribeAcceptedCommandListAttribute(
+    private native void subscribeVendorIDAttribute(
+        long chipClusterPtr, VendorIDAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readProductNameAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void subscribeProductNameAttribute(
         long chipClusterPtr,
-        AcceptedCommandListAttributeCallback callback,
+        CharStringAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readAttributeListAttribute(
-        long chipClusterPtr, AttributeListAttributeCallback callback);
-
+    private native void readProductIDAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeProductIDAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readNodeLabelAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void writeNodeLabelAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        String value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeNodeLabelAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readLocationAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void writeLocationAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        String value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeLocationAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readHardwareVersionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeHardwareVersionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readHardwareVersionStringAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void subscribeHardwareVersionStringAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readSoftwareVersionAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void subscribeSoftwareVersionAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readSoftwareVersionStringAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void subscribeSoftwareVersionStringAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readManufacturingDateAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void subscribeManufacturingDateAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readPartNumberAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void subscribePartNumberAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readProductURLAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void subscribeProductURLAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readProductLabelAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void subscribeProductLabelAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readSerialNumberAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void subscribeSerialNumberAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readLocalConfigDisabledAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
+
+    private native void writeLocalConfigDisabledAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Boolean value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeLocalConfigDisabledAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readReachableAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
+
+    private native void subscribeReachableAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readUniqueIDAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void subscribeUniqueIDAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(
+        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+
+    private native void subscribeGeneratedCommandListAttribute(
+        long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(
+        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+
+    private native void subscribeAcceptedCommandListAttribute(
+        long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readAttributeListAttribute(
+        long chipClusterPtr, AttributeListAttributeCallback callback);
+
     private native void subscribeAttributeListAttribute(
         long chipClusterPtr,
         AttributeListAttributeCallback callback,
@@ -3635,1538 +3960,470 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class ColorControlCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 768L;
+  public static class OtaSoftwareUpdateProviderCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 41L;
 
-    public ColorControlCluster(long devicePtr, int endpointId) {
+    public OtaSoftwareUpdateProviderCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void colorLoopSet(
-        DefaultClusterCallback callback,
-        Integer updateFlags,
-        Integer action,
-        Integer direction,
-        Integer time,
-        Integer startHue,
-        Integer optionsMask,
-        Integer optionsOverride) {
-      colorLoopSet(
+    public void queryImage(
+        QueryImageResponseCallback callback,
+        Integer vendorId,
+        Integer productId,
+        Long softwareVersion,
+        ArrayList<Integer> protocolsSupported,
+        Optional<Integer> hardwareVersion,
+        Optional<String> location,
+        Optional<Boolean> requestorCanConsent,
+        Optional<byte[]> metadataForProvider) {
+      queryImage(
           chipClusterPtr,
           callback,
-          updateFlags,
-          action,
-          direction,
-          time,
-          startHue,
-          optionsMask,
-          optionsOverride,
+          vendorId,
+          productId,
+          softwareVersion,
+          protocolsSupported,
+          hardwareVersion,
+          location,
+          requestorCanConsent,
+          metadataForProvider,
           null);
     }
 
-    public void colorLoopSet(
-        DefaultClusterCallback callback,
-        Integer updateFlags,
-        Integer action,
-        Integer direction,
-        Integer time,
-        Integer startHue,
-        Integer optionsMask,
-        Integer optionsOverride,
+    public void queryImage(
+        QueryImageResponseCallback callback,
+        Integer vendorId,
+        Integer productId,
+        Long softwareVersion,
+        ArrayList<Integer> protocolsSupported,
+        Optional<Integer> hardwareVersion,
+        Optional<String> location,
+        Optional<Boolean> requestorCanConsent,
+        Optional<byte[]> metadataForProvider,
         int timedInvokeTimeoutMs) {
-      colorLoopSet(
+      queryImage(
           chipClusterPtr,
           callback,
-          updateFlags,
-          action,
-          direction,
-          time,
-          startHue,
-          optionsMask,
-          optionsOverride,
+          vendorId,
+          productId,
+          softwareVersion,
+          protocolsSupported,
+          hardwareVersion,
+          location,
+          requestorCanConsent,
+          metadataForProvider,
           timedInvokeTimeoutMs);
     }
 
-    public void enhancedMoveHue(
-        DefaultClusterCallback callback,
-        Integer moveMode,
-        Integer rate,
-        Integer optionsMask,
-        Integer optionsOverride) {
-      enhancedMoveHue(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, null);
+    public void applyUpdateRequest(
+        ApplyUpdateResponseCallback callback, byte[] updateToken, Long newVersion) {
+      applyUpdateRequest(chipClusterPtr, callback, updateToken, newVersion, null);
     }
 
-    public void enhancedMoveHue(
-        DefaultClusterCallback callback,
-        Integer moveMode,
-        Integer rate,
-        Integer optionsMask,
-        Integer optionsOverride,
-        int timedInvokeTimeoutMs) {
-      enhancedMoveHue(
-          chipClusterPtr,
-          callback,
-          moveMode,
-          rate,
-          optionsMask,
-          optionsOverride,
-          timedInvokeTimeoutMs);
-    }
-
-    public void enhancedMoveToHue(
-        DefaultClusterCallback callback,
-        Integer enhancedHue,
-        Integer direction,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride) {
-      enhancedMoveToHue(
-          chipClusterPtr,
-          callback,
-          enhancedHue,
-          direction,
-          transitionTime,
-          optionsMask,
-          optionsOverride,
-          null);
-    }
-
-    public void enhancedMoveToHue(
-        DefaultClusterCallback callback,
-        Integer enhancedHue,
-        Integer direction,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride,
-        int timedInvokeTimeoutMs) {
-      enhancedMoveToHue(
-          chipClusterPtr,
-          callback,
-          enhancedHue,
-          direction,
-          transitionTime,
-          optionsMask,
-          optionsOverride,
-          timedInvokeTimeoutMs);
-    }
-
-    public void enhancedMoveToHueAndSaturation(
-        DefaultClusterCallback callback,
-        Integer enhancedHue,
-        Integer saturation,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride) {
-      enhancedMoveToHueAndSaturation(
-          chipClusterPtr,
-          callback,
-          enhancedHue,
-          saturation,
-          transitionTime,
-          optionsMask,
-          optionsOverride,
-          null);
-    }
-
-    public void enhancedMoveToHueAndSaturation(
-        DefaultClusterCallback callback,
-        Integer enhancedHue,
-        Integer saturation,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride,
-        int timedInvokeTimeoutMs) {
-      enhancedMoveToHueAndSaturation(
-          chipClusterPtr,
-          callback,
-          enhancedHue,
-          saturation,
-          transitionTime,
-          optionsMask,
-          optionsOverride,
-          timedInvokeTimeoutMs);
-    }
-
-    public void enhancedStepHue(
-        DefaultClusterCallback callback,
-        Integer stepMode,
-        Integer stepSize,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride) {
-      enhancedStepHue(
-          chipClusterPtr,
-          callback,
-          stepMode,
-          stepSize,
-          transitionTime,
-          optionsMask,
-          optionsOverride,
-          null);
-    }
-
-    public void enhancedStepHue(
-        DefaultClusterCallback callback,
-        Integer stepMode,
-        Integer stepSize,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride,
-        int timedInvokeTimeoutMs) {
-      enhancedStepHue(
-          chipClusterPtr,
-          callback,
-          stepMode,
-          stepSize,
-          transitionTime,
-          optionsMask,
-          optionsOverride,
-          timedInvokeTimeoutMs);
-    }
-
-    public void moveColor(
-        DefaultClusterCallback callback,
-        Integer rateX,
-        Integer rateY,
-        Integer optionsMask,
-        Integer optionsOverride) {
-      moveColor(chipClusterPtr, callback, rateX, rateY, optionsMask, optionsOverride, null);
-    }
-
-    public void moveColor(
-        DefaultClusterCallback callback,
-        Integer rateX,
-        Integer rateY,
-        Integer optionsMask,
-        Integer optionsOverride,
-        int timedInvokeTimeoutMs) {
-      moveColor(
-          chipClusterPtr,
-          callback,
-          rateX,
-          rateY,
-          optionsMask,
-          optionsOverride,
-          timedInvokeTimeoutMs);
-    }
-
-    public void moveColorTemperature(
-        DefaultClusterCallback callback,
-        Integer moveMode,
-        Integer rate,
-        Integer colorTemperatureMinimumMireds,
-        Integer colorTemperatureMaximumMireds,
-        Integer optionsMask,
-        Integer optionsOverride) {
-      moveColorTemperature(
-          chipClusterPtr,
-          callback,
-          moveMode,
-          rate,
-          colorTemperatureMinimumMireds,
-          colorTemperatureMaximumMireds,
-          optionsMask,
-          optionsOverride,
-          null);
-    }
-
-    public void moveColorTemperature(
-        DefaultClusterCallback callback,
-        Integer moveMode,
-        Integer rate,
-        Integer colorTemperatureMinimumMireds,
-        Integer colorTemperatureMaximumMireds,
-        Integer optionsMask,
-        Integer optionsOverride,
-        int timedInvokeTimeoutMs) {
-      moveColorTemperature(
-          chipClusterPtr,
-          callback,
-          moveMode,
-          rate,
-          colorTemperatureMinimumMireds,
-          colorTemperatureMaximumMireds,
-          optionsMask,
-          optionsOverride,
-          timedInvokeTimeoutMs);
-    }
-
-    public void moveHue(
-        DefaultClusterCallback callback,
-        Integer moveMode,
-        Integer rate,
-        Integer optionsMask,
-        Integer optionsOverride) {
-      moveHue(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, null);
-    }
-
-    public void moveHue(
-        DefaultClusterCallback callback,
-        Integer moveMode,
-        Integer rate,
-        Integer optionsMask,
-        Integer optionsOverride,
-        int timedInvokeTimeoutMs) {
-      moveHue(
-          chipClusterPtr,
-          callback,
-          moveMode,
-          rate,
-          optionsMask,
-          optionsOverride,
-          timedInvokeTimeoutMs);
-    }
-
-    public void moveSaturation(
-        DefaultClusterCallback callback,
-        Integer moveMode,
-        Integer rate,
-        Integer optionsMask,
-        Integer optionsOverride) {
-      moveSaturation(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, null);
-    }
-
-    public void moveSaturation(
-        DefaultClusterCallback callback,
-        Integer moveMode,
-        Integer rate,
-        Integer optionsMask,
-        Integer optionsOverride,
-        int timedInvokeTimeoutMs) {
-      moveSaturation(
-          chipClusterPtr,
-          callback,
-          moveMode,
-          rate,
-          optionsMask,
-          optionsOverride,
-          timedInvokeTimeoutMs);
-    }
-
-    public void moveToColor(
-        DefaultClusterCallback callback,
-        Integer colorX,
-        Integer colorY,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride) {
-      moveToColor(
-          chipClusterPtr,
-          callback,
-          colorX,
-          colorY,
-          transitionTime,
-          optionsMask,
-          optionsOverride,
-          null);
-    }
-
-    public void moveToColor(
-        DefaultClusterCallback callback,
-        Integer colorX,
-        Integer colorY,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride,
-        int timedInvokeTimeoutMs) {
-      moveToColor(
-          chipClusterPtr,
-          callback,
-          colorX,
-          colorY,
-          transitionTime,
-          optionsMask,
-          optionsOverride,
-          timedInvokeTimeoutMs);
-    }
-
-    public void moveToColorTemperature(
-        DefaultClusterCallback callback,
-        Integer colorTemperature,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride) {
-      moveToColorTemperature(
-          chipClusterPtr,
-          callback,
-          colorTemperature,
-          transitionTime,
-          optionsMask,
-          optionsOverride,
-          null);
-    }
-
-    public void moveToColorTemperature(
-        DefaultClusterCallback callback,
-        Integer colorTemperature,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride,
-        int timedInvokeTimeoutMs) {
-      moveToColorTemperature(
-          chipClusterPtr,
-          callback,
-          colorTemperature,
-          transitionTime,
-          optionsMask,
-          optionsOverride,
-          timedInvokeTimeoutMs);
-    }
-
-    public void moveToHue(
-        DefaultClusterCallback callback,
-        Integer hue,
-        Integer direction,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride) {
-      moveToHue(
-          chipClusterPtr,
-          callback,
-          hue,
-          direction,
-          transitionTime,
-          optionsMask,
-          optionsOverride,
-          null);
-    }
-
-    public void moveToHue(
-        DefaultClusterCallback callback,
-        Integer hue,
-        Integer direction,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride,
-        int timedInvokeTimeoutMs) {
-      moveToHue(
-          chipClusterPtr,
-          callback,
-          hue,
-          direction,
-          transitionTime,
-          optionsMask,
-          optionsOverride,
-          timedInvokeTimeoutMs);
-    }
-
-    public void moveToHueAndSaturation(
-        DefaultClusterCallback callback,
-        Integer hue,
-        Integer saturation,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride) {
-      moveToHueAndSaturation(
-          chipClusterPtr,
-          callback,
-          hue,
-          saturation,
-          transitionTime,
-          optionsMask,
-          optionsOverride,
-          null);
-    }
-
-    public void moveToHueAndSaturation(
-        DefaultClusterCallback callback,
-        Integer hue,
-        Integer saturation,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride,
-        int timedInvokeTimeoutMs) {
-      moveToHueAndSaturation(
-          chipClusterPtr,
-          callback,
-          hue,
-          saturation,
-          transitionTime,
-          optionsMask,
-          optionsOverride,
-          timedInvokeTimeoutMs);
-    }
-
-    public void moveToSaturation(
-        DefaultClusterCallback callback,
-        Integer saturation,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride) {
-      moveToSaturation(
-          chipClusterPtr, callback, saturation, transitionTime, optionsMask, optionsOverride, null);
-    }
-
-    public void moveToSaturation(
-        DefaultClusterCallback callback,
-        Integer saturation,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride,
-        int timedInvokeTimeoutMs) {
-      moveToSaturation(
-          chipClusterPtr,
-          callback,
-          saturation,
-          transitionTime,
-          optionsMask,
-          optionsOverride,
-          timedInvokeTimeoutMs);
-    }
-
-    public void stepColor(
-        DefaultClusterCallback callback,
-        Integer stepX,
-        Integer stepY,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride) {
-      stepColor(
-          chipClusterPtr,
-          callback,
-          stepX,
-          stepY,
-          transitionTime,
-          optionsMask,
-          optionsOverride,
-          null);
-    }
-
-    public void stepColor(
-        DefaultClusterCallback callback,
-        Integer stepX,
-        Integer stepY,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride,
-        int timedInvokeTimeoutMs) {
-      stepColor(
-          chipClusterPtr,
-          callback,
-          stepX,
-          stepY,
-          transitionTime,
-          optionsMask,
-          optionsOverride,
-          timedInvokeTimeoutMs);
-    }
-
-    public void stepColorTemperature(
-        DefaultClusterCallback callback,
-        Integer stepMode,
-        Integer stepSize,
-        Integer transitionTime,
-        Integer colorTemperatureMinimumMireds,
-        Integer colorTemperatureMaximumMireds,
-        Integer optionsMask,
-        Integer optionsOverride) {
-      stepColorTemperature(
-          chipClusterPtr,
-          callback,
-          stepMode,
-          stepSize,
-          transitionTime,
-          colorTemperatureMinimumMireds,
-          colorTemperatureMaximumMireds,
-          optionsMask,
-          optionsOverride,
-          null);
-    }
-
-    public void stepColorTemperature(
-        DefaultClusterCallback callback,
-        Integer stepMode,
-        Integer stepSize,
-        Integer transitionTime,
-        Integer colorTemperatureMinimumMireds,
-        Integer colorTemperatureMaximumMireds,
-        Integer optionsMask,
-        Integer optionsOverride,
-        int timedInvokeTimeoutMs) {
-      stepColorTemperature(
-          chipClusterPtr,
-          callback,
-          stepMode,
-          stepSize,
-          transitionTime,
-          colorTemperatureMinimumMireds,
-          colorTemperatureMaximumMireds,
-          optionsMask,
-          optionsOverride,
-          timedInvokeTimeoutMs);
-    }
-
-    public void stepHue(
-        DefaultClusterCallback callback,
-        Integer stepMode,
-        Integer stepSize,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride) {
-      stepHue(
-          chipClusterPtr,
-          callback,
-          stepMode,
-          stepSize,
-          transitionTime,
-          optionsMask,
-          optionsOverride,
-          null);
-    }
-
-    public void stepHue(
-        DefaultClusterCallback callback,
-        Integer stepMode,
-        Integer stepSize,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride,
-        int timedInvokeTimeoutMs) {
-      stepHue(
-          chipClusterPtr,
-          callback,
-          stepMode,
-          stepSize,
-          transitionTime,
-          optionsMask,
-          optionsOverride,
-          timedInvokeTimeoutMs);
-    }
-
-    public void stepSaturation(
-        DefaultClusterCallback callback,
-        Integer stepMode,
-        Integer stepSize,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride) {
-      stepSaturation(
-          chipClusterPtr,
-          callback,
-          stepMode,
-          stepSize,
-          transitionTime,
-          optionsMask,
-          optionsOverride,
-          null);
-    }
-
-    public void stepSaturation(
-        DefaultClusterCallback callback,
-        Integer stepMode,
-        Integer stepSize,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride,
-        int timedInvokeTimeoutMs) {
-      stepSaturation(
-          chipClusterPtr,
-          callback,
-          stepMode,
-          stepSize,
-          transitionTime,
-          optionsMask,
-          optionsOverride,
-          timedInvokeTimeoutMs);
-    }
-
-    public void stopMoveStep(
-        DefaultClusterCallback callback, Integer optionsMask, Integer optionsOverride) {
-      stopMoveStep(chipClusterPtr, callback, optionsMask, optionsOverride, null);
-    }
-
-    public void stopMoveStep(
-        DefaultClusterCallback callback,
-        Integer optionsMask,
-        Integer optionsOverride,
-        int timedInvokeTimeoutMs) {
-      stopMoveStep(chipClusterPtr, callback, optionsMask, optionsOverride, timedInvokeTimeoutMs);
-    }
-
-    private native void colorLoopSet(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer updateFlags,
-        Integer action,
-        Integer direction,
-        Integer time,
-        Integer startHue,
-        Integer optionsMask,
-        Integer optionsOverride,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void enhancedMoveHue(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer moveMode,
-        Integer rate,
-        Integer optionsMask,
-        Integer optionsOverride,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void enhancedMoveToHue(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer enhancedHue,
-        Integer direction,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void enhancedMoveToHueAndSaturation(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer enhancedHue,
-        Integer saturation,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void enhancedStepHue(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer stepMode,
-        Integer stepSize,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void moveColor(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer rateX,
-        Integer rateY,
-        Integer optionsMask,
-        Integer optionsOverride,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void moveColorTemperature(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer moveMode,
-        Integer rate,
-        Integer colorTemperatureMinimumMireds,
-        Integer colorTemperatureMaximumMireds,
-        Integer optionsMask,
-        Integer optionsOverride,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void moveHue(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer moveMode,
-        Integer rate,
-        Integer optionsMask,
-        Integer optionsOverride,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void moveSaturation(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer moveMode,
-        Integer rate,
-        Integer optionsMask,
-        Integer optionsOverride,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void moveToColor(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer colorX,
-        Integer colorY,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void moveToColorTemperature(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer colorTemperature,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void moveToHue(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer hue,
-        Integer direction,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void moveToHueAndSaturation(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer hue,
-        Integer saturation,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void moveToSaturation(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer saturation,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void stepColor(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer stepX,
-        Integer stepY,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void stepColorTemperature(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer stepMode,
-        Integer stepSize,
-        Integer transitionTime,
-        Integer colorTemperatureMinimumMireds,
-        Integer colorTemperatureMaximumMireds,
-        Integer optionsMask,
-        Integer optionsOverride,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void stepHue(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer stepMode,
-        Integer stepSize,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void stepSaturation(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer stepMode,
-        Integer stepSize,
-        Integer transitionTime,
-        Integer optionsMask,
-        Integer optionsOverride,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void stopMoveStep(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer optionsMask,
-        Integer optionsOverride,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface NumberOfPrimariesAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public interface Primary1IntensityAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public interface Primary2IntensityAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public interface Primary3IntensityAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public interface Primary4IntensityAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public interface Primary5IntensityAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public interface Primary6IntensityAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public interface ColorPointRIntensityAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public interface ColorPointGIntensityAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public interface ColorPointBIntensityAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public void readCurrentHueAttribute(IntegerAttributeCallback callback) {
-      readCurrentHueAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeCurrentHueAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentHueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readCurrentSaturationAttribute(IntegerAttributeCallback callback) {
-      readCurrentSaturationAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeCurrentSaturationAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentSaturationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readRemainingTimeAttribute(IntegerAttributeCallback callback) {
-      readRemainingTimeAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeRemainingTimeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRemainingTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readCurrentXAttribute(IntegerAttributeCallback callback) {
-      readCurrentXAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeCurrentXAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readCurrentYAttribute(IntegerAttributeCallback callback) {
-      readCurrentYAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeCurrentYAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readDriftCompensationAttribute(IntegerAttributeCallback callback) {
-      readDriftCompensationAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeDriftCompensationAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeDriftCompensationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readCompensationTextAttribute(CharStringAttributeCallback callback) {
-      readCompensationTextAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeCompensationTextAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCompensationTextAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readColorTemperatureAttribute(IntegerAttributeCallback callback) {
-      readColorTemperatureAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeColorTemperatureAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeColorTemperatureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readColorModeAttribute(IntegerAttributeCallback callback) {
-      readColorModeAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeColorModeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeColorModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readOptionsAttribute(IntegerAttributeCallback callback) {
-      readOptionsAttribute(chipClusterPtr, callback);
-    }
-
-    public void writeOptionsAttribute(DefaultClusterCallback callback, Integer value) {
-      writeOptionsAttribute(chipClusterPtr, callback, value, null);
-    }
-
-    public void writeOptionsAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeOptionsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
-
-    public void subscribeOptionsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeOptionsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readNumberOfPrimariesAttribute(NumberOfPrimariesAttributeCallback callback) {
-      readNumberOfPrimariesAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeNumberOfPrimariesAttribute(
-        NumberOfPrimariesAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNumberOfPrimariesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readPrimary1XAttribute(IntegerAttributeCallback callback) {
-      readPrimary1XAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribePrimary1XAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePrimary1XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readPrimary1YAttribute(IntegerAttributeCallback callback) {
-      readPrimary1YAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribePrimary1YAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePrimary1YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readPrimary1IntensityAttribute(Primary1IntensityAttributeCallback callback) {
-      readPrimary1IntensityAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribePrimary1IntensityAttribute(
-        Primary1IntensityAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePrimary1IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readPrimary2XAttribute(IntegerAttributeCallback callback) {
-      readPrimary2XAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribePrimary2XAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePrimary2XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readPrimary2YAttribute(IntegerAttributeCallback callback) {
-      readPrimary2YAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribePrimary2YAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePrimary2YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readPrimary2IntensityAttribute(Primary2IntensityAttributeCallback callback) {
-      readPrimary2IntensityAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribePrimary2IntensityAttribute(
-        Primary2IntensityAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePrimary2IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readPrimary3XAttribute(IntegerAttributeCallback callback) {
-      readPrimary3XAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribePrimary3XAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePrimary3XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readPrimary3YAttribute(IntegerAttributeCallback callback) {
-      readPrimary3YAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribePrimary3YAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePrimary3YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void applyUpdateRequest(
+        ApplyUpdateResponseCallback callback,
+        byte[] updateToken,
+        Long newVersion,
+        int timedInvokeTimeoutMs) {
+      applyUpdateRequest(chipClusterPtr, callback, updateToken, newVersion, timedInvokeTimeoutMs);
     }
 
-    public void readPrimary3IntensityAttribute(Primary3IntensityAttributeCallback callback) {
-      readPrimary3IntensityAttribute(chipClusterPtr, callback);
+    public void notifyUpdateApplied(
+        DefaultClusterCallback callback, byte[] updateToken, Long softwareVersion) {
+      notifyUpdateApplied(chipClusterPtr, callback, updateToken, softwareVersion, null);
     }
 
-    public void subscribePrimary3IntensityAttribute(
-        Primary3IntensityAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePrimary3IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void notifyUpdateApplied(
+        DefaultClusterCallback callback,
+        byte[] updateToken,
+        Long softwareVersion,
+        int timedInvokeTimeoutMs) {
+      notifyUpdateApplied(
+          chipClusterPtr, callback, updateToken, softwareVersion, timedInvokeTimeoutMs);
     }
 
-    public void readPrimary4XAttribute(IntegerAttributeCallback callback) {
-      readPrimary4XAttribute(chipClusterPtr, callback);
-    }
+    private native void queryImage(
+        long chipClusterPtr,
+        QueryImageResponseCallback Callback,
+        Integer vendorId,
+        Integer productId,
+        Long softwareVersion,
+        ArrayList<Integer> protocolsSupported,
+        Optional<Integer> hardwareVersion,
+        Optional<String> location,
+        Optional<Boolean> requestorCanConsent,
+        Optional<byte[]> metadataForProvider,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void subscribePrimary4XAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePrimary4XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void applyUpdateRequest(
+        long chipClusterPtr,
+        ApplyUpdateResponseCallback Callback,
+        byte[] updateToken,
+        Long newVersion,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void readPrimary4YAttribute(IntegerAttributeCallback callback) {
-      readPrimary4YAttribute(chipClusterPtr, callback);
-    }
+    private native void notifyUpdateApplied(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        byte[] updateToken,
+        Long softwareVersion,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void subscribePrimary4YAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePrimary4YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface QueryImageResponseCallback {
+      void onSuccess(
+          Integer status,
+          Optional<Long> delayedActionTime,
+          Optional<String> imageURI,
+          Optional<Long> softwareVersion,
+          Optional<String> softwareVersionString,
+          Optional<byte[]> updateToken,
+          Optional<Boolean> userConsentNeeded,
+          Optional<byte[]> metadataForRequestor);
 
-    public void readPrimary4IntensityAttribute(Primary4IntensityAttributeCallback callback) {
-      readPrimary4IntensityAttribute(chipClusterPtr, callback);
+      void onError(Exception error);
     }
 
-    public void subscribePrimary4IntensityAttribute(
-        Primary4IntensityAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePrimary4IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface ApplyUpdateResponseCallback {
+      void onSuccess(Integer action, Long delayedActionTime);
 
-    public void readPrimary5XAttribute(IntegerAttributeCallback callback) {
-      readPrimary5XAttribute(chipClusterPtr, callback);
+      void onError(Exception error);
     }
 
-    public void subscribePrimary5XAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePrimary5XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void readPrimary5YAttribute(IntegerAttributeCallback callback) {
-      readPrimary5YAttribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void subscribePrimary5YAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePrimary5YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readPrimary5IntensityAttribute(Primary5IntensityAttributeCallback callback) {
-      readPrimary5IntensityAttribute(chipClusterPtr, callback);
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribePrimary5IntensityAttribute(
-        Primary5IntensityAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePrimary5IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readPrimary6XAttribute(IntegerAttributeCallback callback) {
-      readPrimary6XAttribute(chipClusterPtr, callback);
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribePrimary6XAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePrimary6XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readPrimary6YAttribute(IntegerAttributeCallback callback) {
-      readPrimary6YAttribute(chipClusterPtr, callback);
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribePrimary6YAttribute(
+    public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePrimary6YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readPrimary6IntensityAttribute(Primary6IntensityAttributeCallback callback) {
-      readPrimary6IntensityAttribute(chipClusterPtr, callback);
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void subscribePrimary6IntensityAttribute(
-        Primary6IntensityAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePrimary6IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readAttributeListAttribute(
+        long chipClusterPtr, AttributeListAttributeCallback callback);
 
-    public void readWhitePointXAttribute(IntegerAttributeCallback callback) {
-      readWhitePointXAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeAttributeListAttribute(
+        long chipClusterPtr,
+        AttributeListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void writeWhitePointXAttribute(DefaultClusterCallback callback, Integer value) {
-      writeWhitePointXAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void writeWhitePointXAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeWhitePointXAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void subscribeFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void subscribeWhitePointXAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeWhitePointXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void readWhitePointYAttribute(IntegerAttributeCallback callback) {
-      readWhitePointYAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
 
-    public void writeWhitePointYAttribute(DefaultClusterCallback callback, Integer value) {
-      writeWhitePointYAttribute(chipClusterPtr, callback, value, null);
-    }
+  public static class OtaSoftwareUpdateRequestorCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 42L;
 
-    public void writeWhitePointYAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeWhitePointYAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public OtaSoftwareUpdateRequestorCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
     }
 
-    public void subscribeWhitePointYAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeWhitePointYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void readColorPointRXAttribute(IntegerAttributeCallback callback) {
-      readColorPointRXAttribute(chipClusterPtr, callback);
+    public void announceOtaProvider(
+        DefaultClusterCallback callback,
+        Long providerNodeId,
+        Integer vendorId,
+        Integer announcementReason,
+        Optional<byte[]> metadataForNode,
+        Integer endpoint) {
+      announceOtaProvider(
+          chipClusterPtr,
+          callback,
+          providerNodeId,
+          vendorId,
+          announcementReason,
+          metadataForNode,
+          endpoint,
+          null);
     }
 
-    public void writeColorPointRXAttribute(DefaultClusterCallback callback, Integer value) {
-      writeColorPointRXAttribute(chipClusterPtr, callback, value, null);
+    public void announceOtaProvider(
+        DefaultClusterCallback callback,
+        Long providerNodeId,
+        Integer vendorId,
+        Integer announcementReason,
+        Optional<byte[]> metadataForNode,
+        Integer endpoint,
+        int timedInvokeTimeoutMs) {
+      announceOtaProvider(
+          chipClusterPtr,
+          callback,
+          providerNodeId,
+          vendorId,
+          announcementReason,
+          metadataForNode,
+          endpoint,
+          timedInvokeTimeoutMs);
     }
 
-    public void writeColorPointRXAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeColorPointRXAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void announceOtaProvider(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Long providerNodeId,
+        Integer vendorId,
+        Integer announcementReason,
+        Optional<byte[]> metadataForNode,
+        Integer endpoint,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void subscribeColorPointRXAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeColorPointRXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface DefaultOtaProvidersAttributeCallback {
+      void onSuccess(List<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation> valueList);
 
-    public void readColorPointRYAttribute(IntegerAttributeCallback callback) {
-      readColorPointRYAttribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void writeColorPointRYAttribute(DefaultClusterCallback callback, Integer value) {
-      writeColorPointRYAttribute(chipClusterPtr, callback, value, null);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeColorPointRYAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeColorPointRYAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public interface UpdateStateProgressAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    public void subscribeColorPointRYAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeColorPointRYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readColorPointRIntensityAttribute(ColorPointRIntensityAttributeCallback callback) {
-      readColorPointRIntensityAttribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeColorPointRIntensityAttribute(DefaultClusterCallback callback, Integer value) {
-      writeColorPointRIntensityAttribute(chipClusterPtr, callback, value, null);
-    }
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void writeColorPointRIntensityAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeColorPointRIntensityAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+      void onError(Exception ex);
 
-    public void subscribeColorPointRIntensityAttribute(
-        ColorPointRIntensityAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeColorPointRIntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readColorPointGXAttribute(IntegerAttributeCallback callback) {
-      readColorPointGXAttribute(chipClusterPtr, callback);
+    public void readDefaultOtaProvidersAttribute(DefaultOtaProvidersAttributeCallback callback) {
+      readDefaultOtaProvidersAttribute(chipClusterPtr, callback);
     }
 
-    public void writeColorPointGXAttribute(DefaultClusterCallback callback, Integer value) {
-      writeColorPointGXAttribute(chipClusterPtr, callback, value, null);
+    public void writeDefaultOtaProvidersAttribute(
+        DefaultClusterCallback callback,
+        ArrayList<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation> value) {
+      writeDefaultOtaProvidersAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void writeColorPointGXAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeColorPointGXAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeDefaultOtaProvidersAttribute(
+        DefaultClusterCallback callback,
+        ArrayList<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation> value,
+        int timedWriteTimeoutMs) {
+      writeDefaultOtaProvidersAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeColorPointGXAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeColorPointGXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeDefaultOtaProvidersAttribute(
+        DefaultOtaProvidersAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeDefaultOtaProvidersAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readColorPointGYAttribute(IntegerAttributeCallback callback) {
-      readColorPointGYAttribute(chipClusterPtr, callback);
+    public void readUpdatePossibleAttribute(BooleanAttributeCallback callback) {
+      readUpdatePossibleAttribute(chipClusterPtr, callback);
     }
 
-    public void writeColorPointGYAttribute(DefaultClusterCallback callback, Integer value) {
-      writeColorPointGYAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeUpdatePossibleAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeUpdatePossibleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeColorPointGYAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeColorPointGYAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readUpdateStateAttribute(IntegerAttributeCallback callback) {
+      readUpdateStateAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeColorPointGYAttribute(
+    public void subscribeUpdateStateAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeColorPointGYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeUpdateStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readColorPointGIntensityAttribute(ColorPointGIntensityAttributeCallback callback) {
-      readColorPointGIntensityAttribute(chipClusterPtr, callback);
+    public void readUpdateStateProgressAttribute(UpdateStateProgressAttributeCallback callback) {
+      readUpdateStateProgressAttribute(chipClusterPtr, callback);
     }
 
-    public void writeColorPointGIntensityAttribute(DefaultClusterCallback callback, Integer value) {
-      writeColorPointGIntensityAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeUpdateStateProgressAttribute(
+        UpdateStateProgressAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeUpdateStateProgressAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeColorPointGIntensityAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeColorPointGIntensityAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeColorPointGIntensityAttribute(
-        ColorPointGIntensityAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeColorPointGIntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readColorPointBXAttribute(IntegerAttributeCallback callback) {
-      readColorPointBXAttribute(chipClusterPtr, callback);
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public void writeColorPointBXAttribute(DefaultClusterCallback callback, Integer value) {
-      writeColorPointBXAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeColorPointBXAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeColorPointBXAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeColorPointBXAttribute(
+    public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeColorPointBXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readColorPointBYAttribute(IntegerAttributeCallback callback) {
-      readColorPointBYAttribute(chipClusterPtr, callback);
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeColorPointBYAttribute(DefaultClusterCallback callback, Integer value) {
-      writeColorPointBYAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void readDefaultOtaProvidersAttribute(
+        long chipClusterPtr, DefaultOtaProvidersAttributeCallback callback);
 
-    public void writeColorPointBYAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeColorPointBYAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void writeDefaultOtaProvidersAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        ArrayList<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation> value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void subscribeColorPointBYAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeColorPointBYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeDefaultOtaProvidersAttribute(
+        long chipClusterPtr,
+        DefaultOtaProvidersAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void readColorPointBIntensityAttribute(ColorPointBIntensityAttributeCallback callback) {
-      readColorPointBIntensityAttribute(chipClusterPtr, callback);
-    }
+    private native void readUpdatePossibleAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
 
-    public void writeColorPointBIntensityAttribute(DefaultClusterCallback callback, Integer value) {
-      writeColorPointBIntensityAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void subscribeUpdatePossibleAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void writeColorPointBIntensityAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeColorPointBIntensityAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void readUpdateStateAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeColorPointBIntensityAttribute(
-        ColorPointBIntensityAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeColorPointBIntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeUpdateStateAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readEnhancedCurrentHueAttribute(IntegerAttributeCallback callback) {
-      readEnhancedCurrentHueAttribute(chipClusterPtr, callback);
-    }
+    private native void readUpdateStateProgressAttribute(
+        long chipClusterPtr, UpdateStateProgressAttributeCallback callback);
 
-    public void subscribeEnhancedCurrentHueAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeEnhancedCurrentHueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeUpdateStateProgressAttribute(
+        long chipClusterPtr,
+        UpdateStateProgressAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void readEnhancedColorModeAttribute(IntegerAttributeCallback callback) {
-      readEnhancedColorModeAttribute(chipClusterPtr, callback);
-    }
+    private native void readAttributeListAttribute(
+        long chipClusterPtr, AttributeListAttributeCallback callback);
 
-    public void subscribeEnhancedColorModeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeEnhancedColorModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeAttributeListAttribute(
+        long chipClusterPtr,
+        AttributeListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void readColorLoopActiveAttribute(IntegerAttributeCallback callback) {
-      readColorLoopActiveAttribute(chipClusterPtr, callback);
-    }
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void subscribeColorLoopActiveAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeColorLoopActiveAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readColorLoopDirectionAttribute(IntegerAttributeCallback callback) {
-      readColorLoopDirectionAttribute(chipClusterPtr, callback);
-    }
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeColorLoopDirectionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeColorLoopDirectionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
 
-    public void readColorLoopTimeAttribute(IntegerAttributeCallback callback) {
-      readColorLoopTimeAttribute(chipClusterPtr, callback);
-    }
+  public static class LocalizationConfigurationCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 43L;
 
-    public void subscribeColorLoopTimeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeColorLoopTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public LocalizationConfigurationCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
     }
 
-    public void readColorLoopStartEnhancedHueAttribute(IntegerAttributeCallback callback) {
-      readColorLoopStartEnhancedHueAttribute(chipClusterPtr, callback);
-    }
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void subscribeColorLoopStartEnhancedHueAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeColorLoopStartEnhancedHueAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface SupportedLocalesAttributeCallback {
+      void onSuccess(List<String> valueList);
 
-    public void readColorLoopStoredEnhancedHueAttribute(IntegerAttributeCallback callback) {
-      readColorLoopStoredEnhancedHueAttribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void subscribeColorLoopStoredEnhancedHueAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeColorLoopStoredEnhancedHueAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readColorCapabilitiesAttribute(IntegerAttributeCallback callback) {
-      readColorCapabilitiesAttribute(chipClusterPtr, callback);
-    }
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void subscribeColorCapabilitiesAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeColorCapabilitiesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readColorTempPhysicalMinMiredsAttribute(IntegerAttributeCallback callback) {
-      readColorTempPhysicalMinMiredsAttribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeColorTempPhysicalMinMiredsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeColorTempPhysicalMinMiredsAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void readColorTempPhysicalMaxMiredsAttribute(IntegerAttributeCallback callback) {
-      readColorTempPhysicalMaxMiredsAttribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void subscribeColorTempPhysicalMaxMiredsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeColorTempPhysicalMaxMiredsAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readCoupleColorTempToLevelMinMiredsAttribute(IntegerAttributeCallback callback) {
-      readCoupleColorTempToLevelMinMiredsAttribute(chipClusterPtr, callback);
+    public void readActiveLocaleAttribute(CharStringAttributeCallback callback) {
+      readActiveLocaleAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCoupleColorTempToLevelMinMiredsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCoupleColorTempToLevelMinMiredsAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeActiveLocaleAttribute(DefaultClusterCallback callback, String value) {
+      writeActiveLocaleAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readStartUpColorTemperatureMiredsAttribute(IntegerAttributeCallback callback) {
-      readStartUpColorTemperatureMiredsAttribute(chipClusterPtr, callback);
+    public void writeActiveLocaleAttribute(
+        DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      writeActiveLocaleAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void writeStartUpColorTemperatureMiredsAttribute(
-        DefaultClusterCallback callback, Integer value) {
-      writeStartUpColorTemperatureMiredsAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeActiveLocaleAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeActiveLocaleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeStartUpColorTemperatureMiredsAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeStartUpColorTemperatureMiredsAttribute(
-          chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readSupportedLocalesAttribute(SupportedLocalesAttributeCallback callback) {
+      readSupportedLocalesAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeStartUpColorTemperatureMiredsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeStartUpColorTemperatureMiredsAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeSupportedLocalesAttribute(
+        SupportedLocalesAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSupportedLocalesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -5187,15 +4444,6 @@ public void subscribeAcceptedCommandListAttribute(
       subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
     public void readFeatureMapAttribute(LongAttributeCallback callback) {
       readFeatureMapAttribute(chipClusterPtr, callback);
     }
@@ -5214,428 +4462,439 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readCurrentHueAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeCurrentHueAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readCurrentSaturationAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeCurrentSaturationAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRemainingTimeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeRemainingTimeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readCurrentXAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeCurrentXAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readCurrentYAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeCurrentYAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readDriftCompensationAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeDriftCompensationAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readCompensationTextAttribute(
+    private native void readActiveLocaleAttribute(
         long chipClusterPtr, CharStringAttributeCallback callback);
 
-    private native void subscribeCompensationTextAttribute(
+    private native void writeActiveLocaleAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        String value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeActiveLocaleAttribute(
         long chipClusterPtr,
         CharStringAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readColorTemperatureAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeColorTemperatureAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readColorModeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeColorModeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readOptionsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readSupportedLocalesAttribute(
+        long chipClusterPtr, SupportedLocalesAttributeCallback callback);
 
-    private native void writeOptionsAttribute(
+    private native void subscribeSupportedLocalesAttribute(
         long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeOptionsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+        SupportedLocalesAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void readNumberOfPrimariesAttribute(
-        long chipClusterPtr, NumberOfPrimariesAttributeCallback callback);
+    private native void readGeneratedCommandListAttribute(
+        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
-    private native void subscribeNumberOfPrimariesAttribute(
+    private native void subscribeGeneratedCommandListAttribute(
         long chipClusterPtr,
-        NumberOfPrimariesAttributeCallback callback,
+        GeneratedCommandListAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readPrimary1XAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribePrimary1XAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPrimary1YAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribePrimary1YAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPrimary1IntensityAttribute(
-        long chipClusterPtr, Primary1IntensityAttributeCallback callback);
+    private native void readAcceptedCommandListAttribute(
+        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
 
-    private native void subscribePrimary1IntensityAttribute(
+    private native void subscribeAcceptedCommandListAttribute(
         long chipClusterPtr,
-        Primary1IntensityAttributeCallback callback,
+        AcceptedCommandListAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readPrimary2XAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribePrimary2XAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readPrimary2YAttribute(
+    private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribePrimary2YAttribute(
+    private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
 
-    private native void readPrimary2IntensityAttribute(
-        long chipClusterPtr, Primary2IntensityAttributeCallback callback);
-
-    private native void subscribePrimary2IntensityAttribute(
-        long chipClusterPtr,
-        Primary2IntensityAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readPrimary3XAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  public static class TimeFormatLocalizationCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 44L;
 
-    private native void subscribePrimary3XAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public TimeFormatLocalizationCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
 
-    private native void readPrimary3YAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
 
-    private native void subscribePrimary3YAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface SupportedCalendarTypesAttributeCallback {
+      void onSuccess(List<Integer> valueList);
 
-    private native void readPrimary3IntensityAttribute(
-        long chipClusterPtr, Primary3IntensityAttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void subscribePrimary3IntensityAttribute(
-        long chipClusterPtr,
-        Primary3IntensityAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readPrimary4XAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void subscribePrimary4XAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
 
-    private native void readPrimary4YAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribePrimary4YAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void readPrimary4IntensityAttribute(
-        long chipClusterPtr, Primary4IntensityAttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void subscribePrimary4IntensityAttribute(
-        long chipClusterPtr,
-        Primary4IntensityAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readPrimary5XAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readHourFormatAttribute(IntegerAttributeCallback callback) {
+      readHourFormatAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribePrimary5XAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeHourFormatAttribute(DefaultClusterCallback callback, Integer value) {
+      writeHourFormatAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readPrimary5YAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeHourFormatAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeHourFormatAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribePrimary5YAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeHourFormatAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeHourFormatAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readPrimary5IntensityAttribute(
-        long chipClusterPtr, Primary5IntensityAttributeCallback callback);
+    public void readActiveCalendarTypeAttribute(IntegerAttributeCallback callback) {
+      readActiveCalendarTypeAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribePrimary5IntensityAttribute(
-        long chipClusterPtr,
-        Primary5IntensityAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void writeActiveCalendarTypeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeActiveCalendarTypeAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readPrimary6XAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeActiveCalendarTypeAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeActiveCalendarTypeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribePrimary6XAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeActiveCalendarTypeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeActiveCalendarTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readPrimary6YAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readSupportedCalendarTypesAttribute(
+        SupportedCalendarTypesAttributeCallback callback) {
+      readSupportedCalendarTypesAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribePrimary6YAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeSupportedCalendarTypesAttribute(
+        SupportedCalendarTypesAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSupportedCalendarTypesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readPrimary6IntensityAttribute(
-        long chipClusterPtr, Primary6IntensityAttributeCallback callback);
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribePrimary6IntensityAttribute(
-        long chipClusterPtr,
-        Primary6IntensityAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readWhitePointXAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void writeWhitePointXAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeWhitePointXAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readWhitePointYAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void writeWhitePointYAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeWhitePointYAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readColorPointRXAttribute(
+    private native void readHourFormatAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeColorPointRXAttribute(
+    private native void writeHourFormatAttribute(
         long chipClusterPtr,
         DefaultClusterCallback callback,
         Integer value,
         @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeColorPointRXAttribute(
+    private native void subscribeHourFormatAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readColorPointRYAttribute(
+    private native void readActiveCalendarTypeAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeColorPointRYAttribute(
+    private native void writeActiveCalendarTypeAttribute(
         long chipClusterPtr,
         DefaultClusterCallback callback,
         Integer value,
         @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeColorPointRYAttribute(
+    private native void subscribeActiveCalendarTypeAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readColorPointRIntensityAttribute(
-        long chipClusterPtr, ColorPointRIntensityAttributeCallback callback);
+    private native void readSupportedCalendarTypesAttribute(
+        long chipClusterPtr, SupportedCalendarTypesAttributeCallback callback);
 
-    private native void writeColorPointRIntensityAttribute(
+    private native void subscribeSupportedCalendarTypesAttribute(
         long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+        SupportedCalendarTypesAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void subscribeColorPointRIntensityAttribute(
+    private native void readGeneratedCommandListAttribute(
+        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+
+    private native void subscribeGeneratedCommandListAttribute(
         long chipClusterPtr,
-        ColorPointRIntensityAttributeCallback callback,
+        GeneratedCommandListAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readColorPointGXAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readAcceptedCommandListAttribute(
+        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
 
-    private native void writeColorPointGXAttribute(
+    private native void subscribeAcceptedCommandListAttribute(
         long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+        AcceptedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void subscribeColorPointGXAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void readColorPointGYAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void writeColorPointGYAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeColorPointGYAttribute(
+    private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
 
-    private native void readColorPointGIntensityAttribute(
-        long chipClusterPtr, ColorPointGIntensityAttributeCallback callback);
+  public static class UnitLocalizationCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 45L;
 
-    private native void writeColorPointGIntensityAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public UnitLocalizationCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
 
-    private native void subscribeColorPointGIntensityAttribute(
-        long chipClusterPtr,
-        ColorPointGIntensityAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
 
-    private native void readColorPointBXAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void writeColorPointBXAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+      void onError(Exception ex);
 
-    private native void subscribeColorPointBXAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readColorPointBYAttribute(
+    public void readTemperatureUnitAttribute(IntegerAttributeCallback callback) {
+      readTemperatureUnitAttribute(chipClusterPtr, callback);
+    }
+
+    public void writeTemperatureUnitAttribute(DefaultClusterCallback callback, Integer value) {
+      writeTemperatureUnitAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeTemperatureUnitAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeTemperatureUnitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+
+    public void subscribeTemperatureUnitAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTemperatureUnitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readTemperatureUnitAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeColorPointBYAttribute(
+    private native void writeTemperatureUnitAttribute(
         long chipClusterPtr,
         DefaultClusterCallback callback,
         Integer value,
         @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeColorPointBYAttribute(
+    private native void subscribeTemperatureUnitAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readColorPointBIntensityAttribute(
-        long chipClusterPtr, ColorPointBIntensityAttributeCallback callback);
-
-    private native void writeColorPointBIntensityAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void readAttributeListAttribute(
+        long chipClusterPtr, AttributeListAttributeCallback callback);
 
-    private native void subscribeColorPointBIntensityAttribute(
+    private native void subscribeAttributeListAttribute(
         long chipClusterPtr,
-        ColorPointBIntensityAttributeCallback callback,
+        AttributeListAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readEnhancedCurrentHueAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeEnhancedCurrentHueAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readEnhancedColorModeAttribute(
+    private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeEnhancedColorModeAttribute(
+    private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
 
-    private native void readColorLoopActiveAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  public static class PowerSourceConfigurationCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 46L;
 
-    private native void subscribeColorLoopActiveAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public PowerSourceConfigurationCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
 
-    private native void readColorLoopDirectionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
 
-    private native void subscribeColorLoopDirectionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface SourcesAttributeCallback {
+      void onSuccess(List<Integer> valueList);
 
-    private native void readColorLoopTimeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void subscribeColorLoopTimeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readColorLoopStartEnhancedHueAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void subscribeColorLoopStartEnhancedHueAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
 
-    private native void readColorLoopStoredEnhancedHueAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeColorLoopStoredEnhancedHueAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void readColorCapabilitiesAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void subscribeColorCapabilitiesAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readColorTempPhysicalMinMiredsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void subscribeColorTempPhysicalMinMiredsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
 
-    private native void readColorTempPhysicalMaxMiredsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeColorTempPhysicalMaxMiredsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readSourcesAttribute(SourcesAttributeCallback callback) {
+      readSourcesAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readCoupleColorTempToLevelMinMiredsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeSourcesAttribute(
+        SourcesAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSourcesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeCoupleColorTempToLevelMinMiredsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readStartUpColorTemperatureMiredsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void writeStartUpColorTemperatureMiredsAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeStartUpColorTemperatureMiredsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readSourcesAttribute(
+        long chipClusterPtr, SourcesAttributeCallback callback);
+
+    private native void subscribeSourcesAttribute(
+        long chipClusterPtr, SourcesAttributeCallback callback, int minInterval, int maxInterval);
 
     private native void readGeneratedCommandListAttribute(
         long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
@@ -5677,80 +4936,34 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class ContentLauncherCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1290L;
+  public static class PowerSourceCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 47L;
 
-    public ContentLauncherCluster(long devicePtr, int endpointId) {
+    public PowerSourceCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void launchContent(
-        LaunchResponseCallback callback,
-        ChipStructs.ContentLauncherClusterContentSearch search,
-        Boolean autoPlay,
-        Optional<String> data) {
-      launchContent(chipClusterPtr, callback, search, autoPlay, data, null);
-    }
-
-    public void launchContent(
-        LaunchResponseCallback callback,
-        ChipStructs.ContentLauncherClusterContentSearch search,
-        Boolean autoPlay,
-        Optional<String> data,
-        int timedInvokeTimeoutMs) {
-      launchContent(chipClusterPtr, callback, search, autoPlay, data, timedInvokeTimeoutMs);
-    }
+    public interface ActiveWiredFaultsAttributeCallback {
+      void onSuccess(List<Integer> valueList);
 
-    public void launchURL(
-        LaunchResponseCallback callback,
-        String contentURL,
-        Optional<String> displayString,
-        Optional<ChipStructs.ContentLauncherClusterBrandingInformation> brandingInformation) {
-      launchURL(chipClusterPtr, callback, contentURL, displayString, brandingInformation, null);
-    }
+      void onError(Exception ex);
 
-    public void launchURL(
-        LaunchResponseCallback callback,
-        String contentURL,
-        Optional<String> displayString,
-        Optional<ChipStructs.ContentLauncherClusterBrandingInformation> brandingInformation,
-        int timedInvokeTimeoutMs) {
-      launchURL(
-          chipClusterPtr,
-          callback,
-          contentURL,
-          displayString,
-          brandingInformation,
-          timedInvokeTimeoutMs);
+      default void onSubscriptionEstablished() {}
     }
 
-    private native void launchContent(
-        long chipClusterPtr,
-        LaunchResponseCallback Callback,
-        ChipStructs.ContentLauncherClusterContentSearch search,
-        Boolean autoPlay,
-        Optional<String> data,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void launchURL(
-        long chipClusterPtr,
-        LaunchResponseCallback Callback,
-        String contentURL,
-        Optional<String> displayString,
-        Optional<ChipStructs.ContentLauncherClusterBrandingInformation> brandingInformation,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public interface ActiveBatteryFaultsAttributeCallback {
+      void onSuccess(List<Integer> valueList);
 
-    public interface LaunchResponseCallback {
-      void onSuccess(Integer status, Optional<String> data);
+      void onError(Exception ex);
 
-      void onError(Exception error);
+      default void onSubscriptionEstablished() {}
     }
 
-    public interface AcceptHeaderAttributeCallback {
-      void onSuccess(List<String> valueList);
+    public interface ActiveBatteryChargeFaultsAttributeCallback {
+      void onSuccess(List<Integer> valueList);
 
       void onError(Exception ex);
 
@@ -5781,242 +4994,292 @@ public interface AttributeListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public void readAcceptHeaderAttribute(AcceptHeaderAttributeCallback callback) {
-      readAcceptHeaderAttribute(chipClusterPtr, callback);
+    public void readStatusAttribute(IntegerAttributeCallback callback) {
+      readStatusAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeAcceptHeaderAttribute(
-        AcceptHeaderAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptHeaderAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeStatusAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readSupportedStreamingProtocolsAttribute(LongAttributeCallback callback) {
-      readSupportedStreamingProtocolsAttribute(chipClusterPtr, callback);
+    public void readOrderAttribute(IntegerAttributeCallback callback) {
+      readOrderAttribute(chipClusterPtr, callback);
     }
 
-    public void writeSupportedStreamingProtocolsAttribute(
-        DefaultClusterCallback callback, Long value) {
-      writeSupportedStreamingProtocolsAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeOrderAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeOrderAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDescriptionAttribute(CharStringAttributeCallback callback) {
+      readDescriptionAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeDescriptionAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeDescriptionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeSupportedStreamingProtocolsAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeSupportedStreamingProtocolsAttribute(
-          chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readWiredAssessedInputVoltageAttribute(LongAttributeCallback callback) {
+      readWiredAssessedInputVoltageAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeSupportedStreamingProtocolsAttribute(
+    public void subscribeWiredAssessedInputVoltageAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSupportedStreamingProtocolsAttribute(
+      subscribeWiredAssessedInputVoltageAttribute(
           chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    public void readWiredAssessedInputFrequencyAttribute(IntegerAttributeCallback callback) {
+      readWiredAssessedInputFrequencyAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeWiredAssessedInputFrequencyAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeWiredAssessedInputFrequencyAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    public void readWiredCurrentTypeAttribute(IntegerAttributeCallback callback) {
+      readWiredCurrentTypeAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeWiredCurrentTypeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeWiredCurrentTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
+    public void readWiredAssessedCurrentAttribute(LongAttributeCallback callback) {
+      readWiredAssessedCurrentAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeWiredAssessedCurrentAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeWiredAssessedCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
+    public void readWiredNominalVoltageAttribute(LongAttributeCallback callback) {
+      readWiredNominalVoltageAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeFeatureMapAttribute(
+    public void subscribeWiredNominalVoltageAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeWiredNominalVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
+    public void readWiredMaximumCurrentAttribute(LongAttributeCallback callback) {
+      readWiredMaximumCurrentAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeWiredMaximumCurrentAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeWiredMaximumCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readAcceptHeaderAttribute(
-        long chipClusterPtr, AcceptHeaderAttributeCallback callback);
-
-    private native void subscribeAcceptHeaderAttribute(
-        long chipClusterPtr,
-        AcceptHeaderAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readSupportedStreamingProtocolsAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void writeSupportedStreamingProtocolsAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void readWiredPresentAttribute(BooleanAttributeCallback callback) {
+      readWiredPresentAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeSupportedStreamingProtocolsAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeWiredPresentAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeWiredPresentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readGeneratedCommandListAttribute(
-        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void readActiveWiredFaultsAttribute(ActiveWiredFaultsAttributeCallback callback) {
+      readActiveWiredFaultsAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeGeneratedCommandListAttribute(
-        long chipClusterPtr,
-        GeneratedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void subscribeActiveWiredFaultsAttribute(
+        ActiveWiredFaultsAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeActiveWiredFaultsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readAcceptedCommandListAttribute(
-        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void readBatteryVoltageAttribute(LongAttributeCallback callback) {
+      readBatteryVoltageAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeAcceptedCommandListAttribute(
-        long chipClusterPtr,
-        AcceptedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void subscribeBatteryVoltageAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBatteryVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readAttributeListAttribute(
-        long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void readBatteryPercentRemainingAttribute(IntegerAttributeCallback callback) {
+      readBatteryPercentRemainingAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeAttributeListAttribute(
-        long chipClusterPtr,
-        AttributeListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void subscribeBatteryPercentRemainingAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBatteryPercentRemainingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void readBatteryTimeRemainingAttribute(LongAttributeCallback callback) {
+      readBatteryTimeRemainingAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeBatteryTimeRemainingAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBatteryTimeRemainingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readBatteryChargeLevelAttribute(IntegerAttributeCallback callback) {
+      readBatteryChargeLevelAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public void subscribeBatteryChargeLevelAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBatteryChargeLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-  public static class DescriptorCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 29L;
+    public void readBatteryReplacementNeededAttribute(BooleanAttributeCallback callback) {
+      readBatteryReplacementNeededAttribute(chipClusterPtr, callback);
+    }
 
-    public DescriptorCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    public void subscribeBatteryReplacementNeededAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBatteryReplacementNeededAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void readBatteryReplaceabilityAttribute(IntegerAttributeCallback callback) {
+      readBatteryReplaceabilityAttribute(chipClusterPtr, callback);
+    }
 
-    public interface DeviceListAttributeCallback {
-      void onSuccess(List<ChipStructs.DescriptorClusterDeviceType> valueList);
+    public void subscribeBatteryReplaceabilityAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBatteryReplaceabilityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readBatteryPresentAttribute(BooleanAttributeCallback callback) {
+      readBatteryPresentAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeBatteryPresentAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBatteryPresentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface ServerListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void readActiveBatteryFaultsAttribute(ActiveBatteryFaultsAttributeCallback callback) {
+      readActiveBatteryFaultsAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void subscribeActiveBatteryFaultsAttribute(
+        ActiveBatteryFaultsAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeActiveBatteryFaultsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readBatteryReplacementDescriptionAttribute(CharStringAttributeCallback callback) {
+      readBatteryReplacementDescriptionAttribute(chipClusterPtr, callback);
     }
 
-    public interface ClientListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void subscribeBatteryReplacementDescriptionAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBatteryReplacementDescriptionAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readBatteryCommonDesignationAttribute(LongAttributeCallback callback) {
+      readBatteryCommonDesignationAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeBatteryCommonDesignationAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBatteryCommonDesignationAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface PartsListAttributeCallback {
-      void onSuccess(List<Integer> valueList);
+    public void readBatteryANSIDesignationAttribute(CharStringAttributeCallback callback) {
+      readBatteryANSIDesignationAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void subscribeBatteryANSIDesignationAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBatteryANSIDesignationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readBatteryIECDesignationAttribute(CharStringAttributeCallback callback) {
+      readBatteryIECDesignationAttribute(chipClusterPtr, callback);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void subscribeBatteryIECDesignationAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBatteryIECDesignationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readBatteryApprovedChemistryAttribute(LongAttributeCallback callback) {
+      readBatteryApprovedChemistryAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeBatteryApprovedChemistryAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBatteryApprovedChemistryAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void readBatteryCapacityAttribute(LongAttributeCallback callback) {
+      readBatteryCapacityAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void subscribeBatteryCapacityAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBatteryCapacityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readBatteryQuantityAttribute(IntegerAttributeCallback callback) {
+      readBatteryQuantityAttribute(chipClusterPtr, callback);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void subscribeBatteryQuantityAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBatteryQuantityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readBatteryChargeStateAttribute(IntegerAttributeCallback callback) {
+      readBatteryChargeStateAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeBatteryChargeStateAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBatteryChargeStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readDeviceListAttribute(DeviceListAttributeCallback callback) {
-      readDeviceListAttribute(chipClusterPtr, callback);
+    public void readBatteryTimeToFullChargeAttribute(LongAttributeCallback callback) {
+      readBatteryTimeToFullChargeAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeDeviceListAttribute(
-        DeviceListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeDeviceListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeBatteryTimeToFullChargeAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBatteryTimeToFullChargeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readServerListAttribute(ServerListAttributeCallback callback) {
-      readServerListAttribute(chipClusterPtr, callback);
+    public void readBatteryFunctionalWhileChargingAttribute(BooleanAttributeCallback callback) {
+      readBatteryFunctionalWhileChargingAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeServerListAttribute(
-        ServerListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeServerListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeBatteryFunctionalWhileChargingAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBatteryFunctionalWhileChargingAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readClientListAttribute(ClientListAttributeCallback callback) {
-      readClientListAttribute(chipClusterPtr, callback);
+    public void readBatteryChargingCurrentAttribute(LongAttributeCallback callback) {
+      readBatteryChargingCurrentAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeClientListAttribute(
-        ClientListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClientListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeBatteryChargingCurrentAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBatteryChargingCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readPartsListAttribute(PartsListAttributeCallback callback) {
-      readPartsListAttribute(chipClusterPtr, callback);
+    public void readActiveBatteryChargeFaultsAttribute(
+        ActiveBatteryChargeFaultsAttributeCallback callback) {
+      readActiveBatteryChargeFaultsAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribePartsListAttribute(
-        PartsListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePartsListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeActiveBatteryChargeFaultsAttribute(
+        ActiveBatteryChargeFaultsAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeActiveBatteryChargeFaultsAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -6064,195 +5327,210 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readDeviceListAttribute(
-        long chipClusterPtr, DeviceListAttributeCallback callback);
+    private native void readStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeDeviceListAttribute(
-        long chipClusterPtr,
-        DeviceListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeStatusAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readServerListAttribute(
-        long chipClusterPtr, ServerListAttributeCallback callback);
+    private native void readOrderAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeServerListAttribute(
-        long chipClusterPtr,
-        ServerListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeOrderAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readClientListAttribute(
-        long chipClusterPtr, ClientListAttributeCallback callback);
+    private native void readDescriptionAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
 
-    private native void subscribeClientListAttribute(
+    private native void subscribeDescriptionAttribute(
         long chipClusterPtr,
-        ClientListAttributeCallback callback,
+        CharStringAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readPartsListAttribute(
-        long chipClusterPtr, PartsListAttributeCallback callback);
+    private native void readWiredAssessedInputVoltageAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribePartsListAttribute(
-        long chipClusterPtr, PartsListAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeWiredAssessedInputVoltageAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readGeneratedCommandListAttribute(
-        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    private native void readWiredAssessedInputFrequencyAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeGeneratedCommandListAttribute(
-        long chipClusterPtr,
-        GeneratedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeWiredAssessedInputFrequencyAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readAcceptedCommandListAttribute(
-        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    private native void readWiredCurrentTypeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeAcceptedCommandListAttribute(
-        long chipClusterPtr,
-        AcceptedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeWiredCurrentTypeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readAttributeListAttribute(
-        long chipClusterPtr, AttributeListAttributeCallback callback);
+    private native void readWiredAssessedCurrentAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeAttributeListAttribute(
+    private native void subscribeWiredAssessedCurrentAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readWiredNominalVoltageAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void subscribeWiredNominalVoltageAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readWiredMaximumCurrentAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void subscribeWiredMaximumCurrentAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readWiredPresentAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
+
+    private native void subscribeWiredPresentAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readActiveWiredFaultsAttribute(
+        long chipClusterPtr, ActiveWiredFaultsAttributeCallback callback);
+
+    private native void subscribeActiveWiredFaultsAttribute(
         long chipClusterPtr,
-        AttributeListAttributeCallback callback,
+        ActiveWiredFaultsAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readFeatureMapAttribute(
+    private native void readBatteryVoltageAttribute(
         long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeFeatureMapAttribute(
+    private native void subscribeBatteryVoltageAttribute(
         long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readClusterRevisionAttribute(
+    private native void readBatteryPercentRemainingAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeClusterRevisionAttribute(
+    private native void subscribeBatteryPercentRemainingAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
 
-  public static class DiagnosticLogsCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 50L;
+    private native void readBatteryTimeRemainingAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public DiagnosticLogsCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
+    private native void subscribeBatteryTimeRemainingAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    private native void readBatteryChargeLevelAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void retrieveLogsRequest(
-        RetrieveLogsResponseCallback callback,
-        Integer intent,
-        Integer requestedProtocol,
-        byte[] transferFileDesignator) {
-      retrieveLogsRequest(
-          chipClusterPtr, callback, intent, requestedProtocol, transferFileDesignator, null);
-    }
+    private native void subscribeBatteryChargeLevelAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void retrieveLogsRequest(
-        RetrieveLogsResponseCallback callback,
-        Integer intent,
-        Integer requestedProtocol,
-        byte[] transferFileDesignator,
-        int timedInvokeTimeoutMs) {
-      retrieveLogsRequest(
-          chipClusterPtr,
-          callback,
-          intent,
-          requestedProtocol,
-          transferFileDesignator,
-          timedInvokeTimeoutMs);
-    }
+    private native void readBatteryReplacementNeededAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
 
-    private native void retrieveLogsRequest(
+    private native void subscribeBatteryReplacementNeededAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readBatteryReplaceabilityAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeBatteryReplaceabilityAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readBatteryPresentAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
+
+    private native void subscribeBatteryPresentAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readActiveBatteryFaultsAttribute(
+        long chipClusterPtr, ActiveBatteryFaultsAttributeCallback callback);
+
+    private native void subscribeActiveBatteryFaultsAttribute(
         long chipClusterPtr,
-        RetrieveLogsResponseCallback Callback,
-        Integer intent,
-        Integer requestedProtocol,
-        byte[] transferFileDesignator,
-        @Nullable Integer timedInvokeTimeoutMs);
+        ActiveBatteryFaultsAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public interface RetrieveLogsResponseCallback {
-      void onSuccess(Integer status, byte[] content, Long timeStamp, Long timeSinceBoot);
+    private native void readBatteryReplacementDescriptionAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
 
-      void onError(Exception error);
-    }
+    private native void subscribeBatteryReplacementDescriptionAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void readBatteryCommonDesignationAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void subscribeBatteryCommonDesignationAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void readBatteryANSIDesignationAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void subscribeBatteryANSIDesignationAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readBatteryIECDesignationAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void subscribeBatteryIECDesignationAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readBatteryApprovedChemistryAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void subscribeBatteryApprovedChemistryAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void readBatteryCapacityAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void subscribeBatteryCapacityAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-      void onError(Exception ex);
+    private native void readBatteryQuantityAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeBatteryQuantityAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
-    }
+    private native void readBatteryChargeStateAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeBatteryChargeStateAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
-    }
+    private native void readBatteryTimeToFullChargeAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeBatteryTimeToFullChargeAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
-    }
+    private native void readBatteryFunctionalWhileChargingAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeBatteryFunctionalWhileChargingAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
-    }
+    private native void readBatteryChargingCurrentAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeBatteryChargingCurrentAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
+    private native void readActiveBatteryChargeFaultsAttribute(
+        long chipClusterPtr, ActiveBatteryChargeFaultsAttributeCallback callback);
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeActiveBatteryChargeFaultsAttribute(
+        long chipClusterPtr,
+        ActiveBatteryChargeFaultsAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
     private native void readGeneratedCommandListAttribute(
         long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
@@ -6294,505 +5572,468 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class DoorLockCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 257L;
+  public static class GeneralCommissioningCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 48L;
 
-    public DoorLockCluster(long devicePtr, int endpointId) {
+    public GeneralCommissioningCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void clearCredential(
-        DefaultClusterCallback callback,
-        @Nullable ChipStructs.DoorLockClusterDlCredential credential,
+    public void armFailSafe(
+        ArmFailSafeResponseCallback callback, Integer expiryLengthSeconds, Long breadcrumb) {
+      armFailSafe(chipClusterPtr, callback, expiryLengthSeconds, breadcrumb, null);
+    }
+
+    public void armFailSafe(
+        ArmFailSafeResponseCallback callback,
+        Integer expiryLengthSeconds,
+        Long breadcrumb,
         int timedInvokeTimeoutMs) {
-      clearCredential(chipClusterPtr, callback, credential, timedInvokeTimeoutMs);
+      armFailSafe(chipClusterPtr, callback, expiryLengthSeconds, breadcrumb, timedInvokeTimeoutMs);
     }
 
-    public void clearHolidaySchedule(DefaultClusterCallback callback, Integer holidayIndex) {
-      clearHolidaySchedule(chipClusterPtr, callback, holidayIndex, null);
+    public void setRegulatoryConfig(
+        SetRegulatoryConfigResponseCallback callback,
+        Integer newRegulatoryConfig,
+        String countryCode,
+        Long breadcrumb) {
+      setRegulatoryConfig(
+          chipClusterPtr, callback, newRegulatoryConfig, countryCode, breadcrumb, null);
     }
 
-    public void clearHolidaySchedule(
-        DefaultClusterCallback callback, Integer holidayIndex, int timedInvokeTimeoutMs) {
-      clearHolidaySchedule(chipClusterPtr, callback, holidayIndex, timedInvokeTimeoutMs);
+    public void setRegulatoryConfig(
+        SetRegulatoryConfigResponseCallback callback,
+        Integer newRegulatoryConfig,
+        String countryCode,
+        Long breadcrumb,
+        int timedInvokeTimeoutMs) {
+      setRegulatoryConfig(
+          chipClusterPtr,
+          callback,
+          newRegulatoryConfig,
+          countryCode,
+          breadcrumb,
+          timedInvokeTimeoutMs);
     }
 
-    public void clearUser(
-        DefaultClusterCallback callback, Integer userIndex, int timedInvokeTimeoutMs) {
-      clearUser(chipClusterPtr, callback, userIndex, timedInvokeTimeoutMs);
+    public void commissioningComplete(CommissioningCompleteResponseCallback callback) {
+      commissioningComplete(chipClusterPtr, callback, null);
     }
 
-    public void clearWeekDaySchedule(
-        DefaultClusterCallback callback, Integer weekDayIndex, Integer userIndex) {
-      clearWeekDaySchedule(chipClusterPtr, callback, weekDayIndex, userIndex, null);
+    public void commissioningComplete(
+        CommissioningCompleteResponseCallback callback, int timedInvokeTimeoutMs) {
+
+      commissioningComplete(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public void clearWeekDaySchedule(
-        DefaultClusterCallback callback,
-        Integer weekDayIndex,
-        Integer userIndex,
-        int timedInvokeTimeoutMs) {
-      clearWeekDaySchedule(chipClusterPtr, callback, weekDayIndex, userIndex, timedInvokeTimeoutMs);
+    private native void armFailSafe(
+        long chipClusterPtr,
+        ArmFailSafeResponseCallback Callback,
+        Integer expiryLengthSeconds,
+        Long breadcrumb,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void setRegulatoryConfig(
+        long chipClusterPtr,
+        SetRegulatoryConfigResponseCallback Callback,
+        Integer newRegulatoryConfig,
+        String countryCode,
+        Long breadcrumb,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void commissioningComplete(
+        long chipClusterPtr,
+        CommissioningCompleteResponseCallback Callback,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    public interface ArmFailSafeResponseCallback {
+      void onSuccess(Integer errorCode, String debugText);
+
+      void onError(Exception error);
     }
 
-    public void clearYearDaySchedule(
-        DefaultClusterCallback callback, Integer yearDayIndex, Integer userIndex) {
-      clearYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex, null);
+    public interface SetRegulatoryConfigResponseCallback {
+      void onSuccess(Integer errorCode, String debugText);
+
+      void onError(Exception error);
     }
 
-    public void clearYearDaySchedule(
-        DefaultClusterCallback callback,
-        Integer yearDayIndex,
-        Integer userIndex,
-        int timedInvokeTimeoutMs) {
-      clearYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex, timedInvokeTimeoutMs);
+    public interface CommissioningCompleteResponseCallback {
+      void onSuccess(Integer errorCode, String debugText);
+
+      void onError(Exception error);
     }
 
-    public void getCredentialStatus(
-        GetCredentialStatusResponseCallback callback,
-        ChipStructs.DoorLockClusterDlCredential credential) {
-      getCredentialStatus(chipClusterPtr, callback, credential, null);
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void getCredentialStatus(
-        GetCredentialStatusResponseCallback callback,
-        ChipStructs.DoorLockClusterDlCredential credential,
-        int timedInvokeTimeoutMs) {
-      getCredentialStatus(chipClusterPtr, callback, credential, timedInvokeTimeoutMs);
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void getHolidaySchedule(
-        GetHolidayScheduleResponseCallback callback, Integer holidayIndex) {
-      getHolidaySchedule(chipClusterPtr, callback, holidayIndex, null);
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void getHolidaySchedule(
-        GetHolidayScheduleResponseCallback callback,
-        Integer holidayIndex,
-        int timedInvokeTimeoutMs) {
-      getHolidaySchedule(chipClusterPtr, callback, holidayIndex, timedInvokeTimeoutMs);
+    public void readBreadcrumbAttribute(LongAttributeCallback callback) {
+      readBreadcrumbAttribute(chipClusterPtr, callback);
     }
 
-    public void getUser(GetUserResponseCallback callback, Integer userIndex) {
-      getUser(chipClusterPtr, callback, userIndex, null);
+    public void writeBreadcrumbAttribute(DefaultClusterCallback callback, Long value) {
+      writeBreadcrumbAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void getUser(
-        GetUserResponseCallback callback, Integer userIndex, int timedInvokeTimeoutMs) {
-      getUser(chipClusterPtr, callback, userIndex, timedInvokeTimeoutMs);
+    public void writeBreadcrumbAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeBreadcrumbAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+
+    public void subscribeBreadcrumbAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBreadcrumbAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRegulatoryConfigAttribute(IntegerAttributeCallback callback) {
+      readRegulatoryConfigAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeRegulatoryConfigAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRegulatoryConfigAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLocationCapabilityAttribute(IntegerAttributeCallback callback) {
+      readLocationCapabilityAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeLocationCapabilityAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeLocationCapabilityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSupportsConcurrentConnectionAttribute(BooleanAttributeCallback callback) {
+      readSupportsConcurrentConnectionAttribute(chipClusterPtr, callback);
     }
 
-    public void getWeekDaySchedule(
-        GetWeekDayScheduleResponseCallback callback, Integer weekDayIndex, Integer userIndex) {
-      getWeekDaySchedule(chipClusterPtr, callback, weekDayIndex, userIndex, null);
+    public void subscribeSupportsConcurrentConnectionAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSupportsConcurrentConnectionAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void getWeekDaySchedule(
-        GetWeekDayScheduleResponseCallback callback,
-        Integer weekDayIndex,
-        Integer userIndex,
-        int timedInvokeTimeoutMs) {
-      getWeekDaySchedule(chipClusterPtr, callback, weekDayIndex, userIndex, timedInvokeTimeoutMs);
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void getYearDaySchedule(
-        GetYearDayScheduleResponseCallback callback, Integer yearDayIndex, Integer userIndex) {
-      getYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex, null);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void getYearDaySchedule(
-        GetYearDayScheduleResponseCallback callback,
-        Integer yearDayIndex,
-        Integer userIndex,
-        int timedInvokeTimeoutMs) {
-      getYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex, timedInvokeTimeoutMs);
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void lockDoor(
-        DefaultClusterCallback callback, Optional<byte[]> pinCode, int timedInvokeTimeoutMs) {
-      lockDoor(chipClusterPtr, callback, pinCode, timedInvokeTimeoutMs);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void setCredential(
-        SetCredentialResponseCallback callback,
-        Integer operationType,
-        ChipStructs.DoorLockClusterDlCredential credential,
-        byte[] credentialData,
-        @Nullable Integer userIndex,
-        @Nullable Integer userStatus,
-        @Nullable Integer userType,
-        int timedInvokeTimeoutMs) {
-      setCredential(
-          chipClusterPtr,
-          callback,
-          operationType,
-          credential,
-          credentialData,
-          userIndex,
-          userStatus,
-          userType,
-          timedInvokeTimeoutMs);
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
     }
 
-    public void setHolidaySchedule(
-        DefaultClusterCallback callback,
-        Integer holidayIndex,
-        Long localStartTime,
-        Long localEndTime,
-        Integer operatingMode) {
-      setHolidaySchedule(
-          chipClusterPtr,
-          callback,
-          holidayIndex,
-          localStartTime,
-          localEndTime,
-          operatingMode,
-          null);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void setHolidaySchedule(
-        DefaultClusterCallback callback,
-        Integer holidayIndex,
-        Long localStartTime,
-        Long localEndTime,
-        Integer operatingMode,
-        int timedInvokeTimeoutMs) {
-      setHolidaySchedule(
-          chipClusterPtr,
-          callback,
-          holidayIndex,
-          localStartTime,
-          localEndTime,
-          operatingMode,
-          timedInvokeTimeoutMs);
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public void setUser(
-        DefaultClusterCallback callback,
-        Integer operationType,
-        Integer userIndex,
-        @Nullable String userName,
-        @Nullable Long userUniqueId,
-        @Nullable Integer userStatus,
-        @Nullable Integer userType,
-        @Nullable Integer credentialRule,
-        int timedInvokeTimeoutMs) {
-      setUser(
-          chipClusterPtr,
-          callback,
-          operationType,
-          userIndex,
-          userName,
-          userUniqueId,
-          userStatus,
-          userType,
-          credentialRule,
-          timedInvokeTimeoutMs);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void setWeekDaySchedule(
-        DefaultClusterCallback callback,
-        Integer weekDayIndex,
-        Integer userIndex,
-        Integer daysMask,
-        Integer startHour,
-        Integer startMinute,
-        Integer endHour,
-        Integer endMinute) {
-      setWeekDaySchedule(
-          chipClusterPtr,
-          callback,
-          weekDayIndex,
-          userIndex,
-          daysMask,
-          startHour,
-          startMinute,
-          endHour,
-          endMinute,
-          null);
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
     }
 
-    public void setWeekDaySchedule(
-        DefaultClusterCallback callback,
-        Integer weekDayIndex,
-        Integer userIndex,
-        Integer daysMask,
-        Integer startHour,
-        Integer startMinute,
-        Integer endHour,
-        Integer endMinute,
-        int timedInvokeTimeoutMs) {
-      setWeekDaySchedule(
-          chipClusterPtr,
-          callback,
-          weekDayIndex,
-          userIndex,
-          daysMask,
-          startHour,
-          startMinute,
-          endHour,
-          endMinute,
-          timedInvokeTimeoutMs);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void setYearDaySchedule(
-        DefaultClusterCallback callback,
-        Integer yearDayIndex,
-        Integer userIndex,
-        Long localStartTime,
-        Long localEndTime) {
-      setYearDaySchedule(
-          chipClusterPtr, callback, yearDayIndex, userIndex, localStartTime, localEndTime, null);
-    }
+    private native void readBreadcrumbAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void setYearDaySchedule(
+    private native void writeBreadcrumbAttribute(
+        long chipClusterPtr,
         DefaultClusterCallback callback,
-        Integer yearDayIndex,
-        Integer userIndex,
-        Long localStartTime,
-        Long localEndTime,
-        int timedInvokeTimeoutMs) {
-      setYearDaySchedule(
-          chipClusterPtr,
-          callback,
-          yearDayIndex,
-          userIndex,
-          localStartTime,
-          localEndTime,
-          timedInvokeTimeoutMs);
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeBreadcrumbAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readRegulatoryConfigAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeRegulatoryConfigAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readLocationCapabilityAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeLocationCapabilityAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readSupportsConcurrentConnectionAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
+
+    private native void subscribeSupportsConcurrentConnectionAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(
+        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+
+    private native void subscribeGeneratedCommandListAttribute(
+        long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(
+        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+
+    private native void subscribeAcceptedCommandListAttribute(
+        long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readAttributeListAttribute(
+        long chipClusterPtr, AttributeListAttributeCallback callback);
+
+    private native void subscribeAttributeListAttribute(
+        long chipClusterPtr,
+        AttributeListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void subscribeFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
+
+  public static class NetworkCommissioningCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 49L;
+
+    public NetworkCommissioningCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
     }
 
-    public void unlockDoor(
-        DefaultClusterCallback callback, Optional<byte[]> pinCode, int timedInvokeTimeoutMs) {
-      unlockDoor(chipClusterPtr, callback, pinCode, timedInvokeTimeoutMs);
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void scanNetworks(
+        ScanNetworksResponseCallback callback,
+        @Nullable Optional<byte[]> ssid,
+        Optional<Long> breadcrumb) {
+      scanNetworks(chipClusterPtr, callback, ssid, breadcrumb, null);
     }
 
-    public void unlockWithTimeout(
-        DefaultClusterCallback callback,
-        Integer timeout,
-        Optional<byte[]> pinCode,
+    public void scanNetworks(
+        ScanNetworksResponseCallback callback,
+        @Nullable Optional<byte[]> ssid,
+        Optional<Long> breadcrumb,
         int timedInvokeTimeoutMs) {
-      unlockWithTimeout(chipClusterPtr, callback, timeout, pinCode, timedInvokeTimeoutMs);
+      scanNetworks(chipClusterPtr, callback, ssid, breadcrumb, timedInvokeTimeoutMs);
     }
 
-    private native void clearCredential(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        @Nullable ChipStructs.DoorLockClusterDlCredential credential,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void clearHolidaySchedule(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer holidayIndex,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void clearUser(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer userIndex,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void clearWeekDaySchedule(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer weekDayIndex,
-        Integer userIndex,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void addOrUpdateWiFiNetwork(
+        NetworkConfigResponseCallback callback,
+        byte[] ssid,
+        byte[] credentials,
+        Optional<Long> breadcrumb) {
+      addOrUpdateWiFiNetwork(chipClusterPtr, callback, ssid, credentials, breadcrumb, null);
+    }
 
-    private native void clearYearDaySchedule(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer yearDayIndex,
-        Integer userIndex,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void addOrUpdateWiFiNetwork(
+        NetworkConfigResponseCallback callback,
+        byte[] ssid,
+        byte[] credentials,
+        Optional<Long> breadcrumb,
+        int timedInvokeTimeoutMs) {
+      addOrUpdateWiFiNetwork(
+          chipClusterPtr, callback, ssid, credentials, breadcrumb, timedInvokeTimeoutMs);
+    }
 
-    private native void getCredentialStatus(
-        long chipClusterPtr,
-        GetCredentialStatusResponseCallback Callback,
-        ChipStructs.DoorLockClusterDlCredential credential,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void addOrUpdateThreadNetwork(
+        NetworkConfigResponseCallback callback,
+        byte[] operationalDataset,
+        Optional<Long> breadcrumb) {
+      addOrUpdateThreadNetwork(chipClusterPtr, callback, operationalDataset, breadcrumb, null);
+    }
 
-    private native void getHolidaySchedule(
-        long chipClusterPtr,
-        GetHolidayScheduleResponseCallback Callback,
-        Integer holidayIndex,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void addOrUpdateThreadNetwork(
+        NetworkConfigResponseCallback callback,
+        byte[] operationalDataset,
+        Optional<Long> breadcrumb,
+        int timedInvokeTimeoutMs) {
+      addOrUpdateThreadNetwork(
+          chipClusterPtr, callback, operationalDataset, breadcrumb, timedInvokeTimeoutMs);
+    }
 
-    private native void getUser(
-        long chipClusterPtr,
-        GetUserResponseCallback Callback,
-        Integer userIndex,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void removeNetwork(
+        NetworkConfigResponseCallback callback, byte[] networkID, Optional<Long> breadcrumb) {
+      removeNetwork(chipClusterPtr, callback, networkID, breadcrumb, null);
+    }
 
-    private native void getWeekDaySchedule(
-        long chipClusterPtr,
-        GetWeekDayScheduleResponseCallback Callback,
-        Integer weekDayIndex,
-        Integer userIndex,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void removeNetwork(
+        NetworkConfigResponseCallback callback,
+        byte[] networkID,
+        Optional<Long> breadcrumb,
+        int timedInvokeTimeoutMs) {
+      removeNetwork(chipClusterPtr, callback, networkID, breadcrumb, timedInvokeTimeoutMs);
+    }
 
-    private native void getYearDaySchedule(
-        long chipClusterPtr,
-        GetYearDayScheduleResponseCallback Callback,
-        Integer yearDayIndex,
-        Integer userIndex,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void connectNetwork(
+        ConnectNetworkResponseCallback callback, byte[] networkID, Optional<Long> breadcrumb) {
+      connectNetwork(chipClusterPtr, callback, networkID, breadcrumb, null);
+    }
 
-    private native void lockDoor(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Optional<byte[]> pinCode,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void connectNetwork(
+        ConnectNetworkResponseCallback callback,
+        byte[] networkID,
+        Optional<Long> breadcrumb,
+        int timedInvokeTimeoutMs) {
+      connectNetwork(chipClusterPtr, callback, networkID, breadcrumb, timedInvokeTimeoutMs);
+    }
 
-    private native void setCredential(
-        long chipClusterPtr,
-        SetCredentialResponseCallback Callback,
-        Integer operationType,
-        ChipStructs.DoorLockClusterDlCredential credential,
-        byte[] credentialData,
-        @Nullable Integer userIndex,
-        @Nullable Integer userStatus,
-        @Nullable Integer userType,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void reorderNetwork(
+        NetworkConfigResponseCallback callback,
+        byte[] networkID,
+        Integer networkIndex,
+        Optional<Long> breadcrumb) {
+      reorderNetwork(chipClusterPtr, callback, networkID, networkIndex, breadcrumb, null);
+    }
 
-    private native void setHolidaySchedule(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer holidayIndex,
-        Long localStartTime,
-        Long localEndTime,
-        Integer operatingMode,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void reorderNetwork(
+        NetworkConfigResponseCallback callback,
+        byte[] networkID,
+        Integer networkIndex,
+        Optional<Long> breadcrumb,
+        int timedInvokeTimeoutMs) {
+      reorderNetwork(
+          chipClusterPtr, callback, networkID, networkIndex, breadcrumb, timedInvokeTimeoutMs);
+    }
 
-    private native void setUser(
+    private native void scanNetworks(
         long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer operationType,
-        Integer userIndex,
-        @Nullable String userName,
-        @Nullable Long userUniqueId,
-        @Nullable Integer userStatus,
-        @Nullable Integer userType,
-        @Nullable Integer credentialRule,
+        ScanNetworksResponseCallback Callback,
+        @Nullable Optional<byte[]> ssid,
+        Optional<Long> breadcrumb,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void setWeekDaySchedule(
+    private native void addOrUpdateWiFiNetwork(
         long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer weekDayIndex,
-        Integer userIndex,
-        Integer daysMask,
-        Integer startHour,
-        Integer startMinute,
-        Integer endHour,
-        Integer endMinute,
+        NetworkConfigResponseCallback Callback,
+        byte[] ssid,
+        byte[] credentials,
+        Optional<Long> breadcrumb,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void setYearDaySchedule(
+    private native void addOrUpdateThreadNetwork(
         long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer yearDayIndex,
-        Integer userIndex,
-        Long localStartTime,
-        Long localEndTime,
+        NetworkConfigResponseCallback Callback,
+        byte[] operationalDataset,
+        Optional<Long> breadcrumb,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void unlockDoor(
+    private native void removeNetwork(
         long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Optional<byte[]> pinCode,
+        NetworkConfigResponseCallback Callback,
+        byte[] networkID,
+        Optional<Long> breadcrumb,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void unlockWithTimeout(
+    private native void connectNetwork(
         long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer timeout,
-        Optional<byte[]> pinCode,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface GetCredentialStatusResponseCallback {
-      void onSuccess(
-          Boolean credentialExists,
-          @Nullable Integer userIndex,
-          @Nullable Integer creatorFabricIndex,
-          @Nullable Integer lastModifiedFabricIndex,
-          @Nullable Integer nextCredentialIndex);
-
-      void onError(Exception error);
-    }
-
-    public interface GetHolidayScheduleResponseCallback {
-      void onSuccess(
-          Integer holidayIndex,
-          Integer status,
-          Optional<Long> localStartTime,
-          Optional<Long> localEndTime,
-          Optional<Integer> operatingMode);
-
-      void onError(Exception error);
-    }
-
-    public interface GetUserResponseCallback {
-      void onSuccess(
-          Integer userIndex,
-          @Nullable String userName,
-          @Nullable Long userUniqueId,
-          @Nullable Integer userStatus,
-          @Nullable Integer userType,
-          @Nullable Integer credentialRule,
-          @Nullable ArrayList<ChipStructs.DoorLockClusterDlCredential> credentials,
-          @Nullable Integer creatorFabricIndex,
-          @Nullable Integer lastModifiedFabricIndex,
-          @Nullable Integer nextUserIndex);
+        ConnectNetworkResponseCallback Callback,
+        byte[] networkID,
+        Optional<Long> breadcrumb,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-      void onError(Exception error);
-    }
+    private native void reorderNetwork(
+        long chipClusterPtr,
+        NetworkConfigResponseCallback Callback,
+        byte[] networkID,
+        Integer networkIndex,
+        Optional<Long> breadcrumb,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public interface GetWeekDayScheduleResponseCallback {
+    public interface ScanNetworksResponseCallback {
       void onSuccess(
-          Integer weekDayIndex,
-          Integer userIndex,
-          Integer status,
-          Optional<Integer> daysMask,
-          Optional<Integer> startHour,
-          Optional<Integer> startMinute,
-          Optional<Integer> endHour,
-          Optional<Integer> endMinute);
+          Integer networkingStatus,
+          Optional<String> debugText,
+          Optional<ArrayList<ChipStructs.NetworkCommissioningClusterWiFiInterfaceScanResult>>
+              wiFiScanResults,
+          Optional<ArrayList<ChipStructs.NetworkCommissioningClusterThreadInterfaceScanResult>>
+              threadScanResults);
 
       void onError(Exception error);
     }
 
-    public interface GetYearDayScheduleResponseCallback {
+    public interface NetworkConfigResponseCallback {
       void onSuccess(
-          Integer yearDayIndex,
-          Integer userIndex,
-          Integer status,
-          Optional<Long> localStartTime,
-          Optional<Long> localEndTime);
+          Integer networkingStatus, Optional<String> debugText, Optional<Integer> networkIndex);
 
       void onError(Exception error);
     }
 
-    public interface SetCredentialResponseCallback {
+    public interface ConnectNetworkResponseCallback {
       void onSuccess(
-          Integer status, @Nullable Integer userIndex, @Nullable Integer nextCredentialIndex);
+          Integer networkingStatus, Optional<String> debugText, @Nullable Long errorValue);
 
       void onError(Exception error);
     }
 
-    public interface LockStateAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public interface NetworksAttributeCallback {
+      void onSuccess(List<ChipStructs.NetworkCommissioningClusterNetworkInfo> valueList);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface DoorStateAttributeCallback {
+    public interface LastNetworkingStatusAttributeCallback {
       void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
@@ -6800,23 +6041,23 @@ public interface DoorStateAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public interface LastNetworkIDAttributeCallback {
+      void onSuccess(@Nullable byte[] value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public interface LastConnectErrorValueAttributeCallback {
+      void onSuccess(@Nullable Long value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback {
       void onSuccess(List<Long> valueList);
 
       void onError(Exception ex);
@@ -6824,322 +6065,296 @@ public interface AttributeListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public void readLockStateAttribute(LockStateAttributeCallback callback) {
-      readLockStateAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeLockStateAttribute(
-        LockStateAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeLockStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readLockTypeAttribute(IntegerAttributeCallback callback) {
-      readLockTypeAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeLockTypeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeLockTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readActuatorEnabledAttribute(BooleanAttributeCallback callback) {
-      readActuatorEnabledAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeActuatorEnabledAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeActuatorEnabledAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readDoorStateAttribute(DoorStateAttributeCallback callback) {
-      readDoorStateAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeDoorStateAttribute(
-        DoorStateAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeDoorStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readNumberOfTotalUsersSupportedAttribute(IntegerAttributeCallback callback) {
-      readNumberOfTotalUsersSupportedAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeNumberOfTotalUsersSupportedAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNumberOfTotalUsersSupportedAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readNumberOfPINUsersSupportedAttribute(IntegerAttributeCallback callback) {
-      readNumberOfPINUsersSupportedAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeNumberOfPINUsersSupportedAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNumberOfPINUsersSupportedAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readNumberOfRFIDUsersSupportedAttribute(IntegerAttributeCallback callback) {
-      readNumberOfRFIDUsersSupportedAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeNumberOfRFIDUsersSupportedAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNumberOfRFIDUsersSupportedAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readNumberOfWeekDaySchedulesSupportedPerUserAttribute(
-        IntegerAttributeCallback callback) {
-      readNumberOfWeekDaySchedulesSupportedPerUserAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeNumberOfWeekDaySchedulesSupportedPerUserAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNumberOfWeekDaySchedulesSupportedPerUserAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readNumberOfYearDaySchedulesSupportedPerUserAttribute(
-        IntegerAttributeCallback callback) {
-      readNumberOfYearDaySchedulesSupportedPerUserAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeNumberOfYearDaySchedulesSupportedPerUserAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNumberOfYearDaySchedulesSupportedPerUserAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readNumberOfHolidaySchedulesSupportedAttribute(IntegerAttributeCallback callback) {
-      readNumberOfHolidaySchedulesSupportedAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeNumberOfHolidaySchedulesSupportedAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNumberOfHolidaySchedulesSupportedAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readMaxPINCodeLengthAttribute(IntegerAttributeCallback callback) {
-      readMaxPINCodeLengthAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeMaxPINCodeLengthAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMaxPINCodeLengthAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void readMinPINCodeLengthAttribute(IntegerAttributeCallback callback) {
-      readMinPINCodeLengthAttribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void subscribeMinPINCodeLengthAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMinPINCodeLengthAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readMaxRFIDCodeLengthAttribute(IntegerAttributeCallback callback) {
-      readMaxRFIDCodeLengthAttribute(chipClusterPtr, callback);
+    public void readMaxNetworksAttribute(IntegerAttributeCallback callback) {
+      readMaxNetworksAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeMaxRFIDCodeLengthAttribute(
+    public void subscribeMaxNetworksAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMaxRFIDCodeLengthAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeMaxNetworksAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readMinRFIDCodeLengthAttribute(IntegerAttributeCallback callback) {
-      readMinRFIDCodeLengthAttribute(chipClusterPtr, callback);
+    public void readNetworksAttribute(NetworksAttributeCallback callback) {
+      readNetworksAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeMinRFIDCodeLengthAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMinRFIDCodeLengthAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeNetworksAttribute(
+        NetworksAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNetworksAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readNumberOfCredentialsSupportedPerUserAttribute(
-        IntegerAttributeCallback callback) {
-      readNumberOfCredentialsSupportedPerUserAttribute(chipClusterPtr, callback);
+    public void readScanMaxTimeSecondsAttribute(IntegerAttributeCallback callback) {
+      readScanMaxTimeSecondsAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeNumberOfCredentialsSupportedPerUserAttribute(
+    public void subscribeScanMaxTimeSecondsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNumberOfCredentialsSupportedPerUserAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readLanguageAttribute(CharStringAttributeCallback callback) {
-      readLanguageAttribute(chipClusterPtr, callback);
-    }
-
-    public void writeLanguageAttribute(DefaultClusterCallback callback, String value) {
-      writeLanguageAttribute(chipClusterPtr, callback, value, null);
-    }
-
-    public void writeLanguageAttribute(
-        DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
-      writeLanguageAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
-
-    public void subscribeLanguageAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeLanguageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readAutoRelockTimeAttribute(LongAttributeCallback callback) {
-      readAutoRelockTimeAttribute(chipClusterPtr, callback);
-    }
-
-    public void writeAutoRelockTimeAttribute(DefaultClusterCallback callback, Long value) {
-      writeAutoRelockTimeAttribute(chipClusterPtr, callback, value, null);
-    }
-
-    public void writeAutoRelockTimeAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeAutoRelockTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
-
-    public void subscribeAutoRelockTimeAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAutoRelockTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readSoundVolumeAttribute(IntegerAttributeCallback callback) {
-      readSoundVolumeAttribute(chipClusterPtr, callback);
-    }
-
-    public void writeSoundVolumeAttribute(DefaultClusterCallback callback, Integer value) {
-      writeSoundVolumeAttribute(chipClusterPtr, callback, value, null);
+      subscribeScanMaxTimeSecondsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeSoundVolumeAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeSoundVolumeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readConnectMaxTimeSecondsAttribute(IntegerAttributeCallback callback) {
+      readConnectMaxTimeSecondsAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeSoundVolumeAttribute(
+    public void subscribeConnectMaxTimeSecondsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSoundVolumeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeConnectMaxTimeSecondsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readOperatingModeAttribute(IntegerAttributeCallback callback) {
-      readOperatingModeAttribute(chipClusterPtr, callback);
+    public void readInterfaceEnabledAttribute(BooleanAttributeCallback callback) {
+      readInterfaceEnabledAttribute(chipClusterPtr, callback);
     }
 
-    public void writeOperatingModeAttribute(DefaultClusterCallback callback, Integer value) {
-      writeOperatingModeAttribute(chipClusterPtr, callback, value, null);
+    public void writeInterfaceEnabledAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeInterfaceEnabledAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void writeOperatingModeAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeOperatingModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeInterfaceEnabledAttribute(
+        DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeInterfaceEnabledAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeOperatingModeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeOperatingModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeInterfaceEnabledAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeInterfaceEnabledAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readSupportedOperatingModesAttribute(IntegerAttributeCallback callback) {
-      readSupportedOperatingModesAttribute(chipClusterPtr, callback);
+    public void readLastNetworkingStatusAttribute(LastNetworkingStatusAttributeCallback callback) {
+      readLastNetworkingStatusAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeSupportedOperatingModesAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSupportedOperatingModesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeLastNetworkingStatusAttribute(
+        LastNetworkingStatusAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeLastNetworkingStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readEnableOneTouchLockingAttribute(BooleanAttributeCallback callback) {
-      readEnableOneTouchLockingAttribute(chipClusterPtr, callback);
+    public void readLastNetworkIDAttribute(LastNetworkIDAttributeCallback callback) {
+      readLastNetworkIDAttribute(chipClusterPtr, callback);
     }
 
-    public void writeEnableOneTouchLockingAttribute(
-        DefaultClusterCallback callback, Boolean value) {
-      writeEnableOneTouchLockingAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeLastNetworkIDAttribute(
+        LastNetworkIDAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeLastNetworkIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeEnableOneTouchLockingAttribute(
-        DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-      writeEnableOneTouchLockingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readLastConnectErrorValueAttribute(
+        LastConnectErrorValueAttributeCallback callback) {
+      readLastConnectErrorValueAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeEnableOneTouchLockingAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeEnableOneTouchLockingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeLastConnectErrorValueAttribute(
+        LastConnectErrorValueAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeLastConnectErrorValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readEnablePrivacyModeButtonAttribute(BooleanAttributeCallback callback) {
-      readEnablePrivacyModeButtonAttribute(chipClusterPtr, callback);
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void writeEnablePrivacyModeButtonAttribute(
-        DefaultClusterCallback callback, Boolean value) {
-      writeEnablePrivacyModeButtonAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeEnablePrivacyModeButtonAttribute(
-        DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-      writeEnablePrivacyModeButtonAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeEnablePrivacyModeButtonAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeEnablePrivacyModeButtonAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readWrongCodeEntryLimitAttribute(IntegerAttributeCallback callback) {
-      readWrongCodeEntryLimitAttribute(chipClusterPtr, callback);
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public void writeWrongCodeEntryLimitAttribute(DefaultClusterCallback callback, Integer value) {
-      writeWrongCodeEntryLimitAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeWrongCodeEntryLimitAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeWrongCodeEntryLimitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeWrongCodeEntryLimitAttribute(
+    public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeWrongCodeEntryLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readUserCodeTemporaryDisableTimeAttribute(IntegerAttributeCallback callback) {
-      readUserCodeTemporaryDisableTimeAttribute(chipClusterPtr, callback);
+    private native void readMaxNetworksAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeMaxNetworksAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readNetworksAttribute(
+        long chipClusterPtr, NetworksAttributeCallback callback);
+
+    private native void subscribeNetworksAttribute(
+        long chipClusterPtr, NetworksAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readScanMaxTimeSecondsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeScanMaxTimeSecondsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readConnectMaxTimeSecondsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeConnectMaxTimeSecondsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readInterfaceEnabledAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
+
+    private native void writeInterfaceEnabledAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Boolean value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeInterfaceEnabledAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readLastNetworkingStatusAttribute(
+        long chipClusterPtr, LastNetworkingStatusAttributeCallback callback);
+
+    private native void subscribeLastNetworkingStatusAttribute(
+        long chipClusterPtr,
+        LastNetworkingStatusAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readLastNetworkIDAttribute(
+        long chipClusterPtr, LastNetworkIDAttributeCallback callback);
+
+    private native void subscribeLastNetworkIDAttribute(
+        long chipClusterPtr,
+        LastNetworkIDAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readLastConnectErrorValueAttribute(
+        long chipClusterPtr, LastConnectErrorValueAttributeCallback callback);
+
+    private native void subscribeLastConnectErrorValueAttribute(
+        long chipClusterPtr,
+        LastConnectErrorValueAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(
+        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+
+    private native void subscribeGeneratedCommandListAttribute(
+        long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(
+        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+
+    private native void subscribeAcceptedCommandListAttribute(
+        long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void subscribeFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
+
+  public static class DiagnosticLogsCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 50L;
+
+    public DiagnosticLogsCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
     }
 
-    public void writeUserCodeTemporaryDisableTimeAttribute(
-        DefaultClusterCallback callback, Integer value) {
-      writeUserCodeTemporaryDisableTimeAttribute(chipClusterPtr, callback, value, null);
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void retrieveLogsRequest(
+        RetrieveLogsResponseCallback callback,
+        Integer intent,
+        Integer requestedProtocol,
+        byte[] transferFileDesignator) {
+      retrieveLogsRequest(
+          chipClusterPtr, callback, intent, requestedProtocol, transferFileDesignator, null);
     }
 
-    public void writeUserCodeTemporaryDisableTimeAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeUserCodeTemporaryDisableTimeAttribute(
-          chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void retrieveLogsRequest(
+        RetrieveLogsResponseCallback callback,
+        Integer intent,
+        Integer requestedProtocol,
+        byte[] transferFileDesignator,
+        int timedInvokeTimeoutMs) {
+      retrieveLogsRequest(
+          chipClusterPtr,
+          callback,
+          intent,
+          requestedProtocol,
+          transferFileDesignator,
+          timedInvokeTimeoutMs);
     }
 
-    public void subscribeUserCodeTemporaryDisableTimeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeUserCodeTemporaryDisableTimeAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+    private native void retrieveLogsRequest(
+        long chipClusterPtr,
+        RetrieveLogsResponseCallback Callback,
+        Integer intent,
+        Integer requestedProtocol,
+        byte[] transferFileDesignator,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    public interface RetrieveLogsResponseCallback {
+      void onSuccess(Integer status, byte[] content, Long timeStamp, Long timeSinceBoot);
+
+      void onError(Exception error);
     }
 
-    public void readRequirePINforRemoteOperationAttribute(BooleanAttributeCallback callback) {
-      readRequirePINforRemoteOperationAttribute(chipClusterPtr, callback);
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeRequirePINforRemoteOperationAttribute(
-        DefaultClusterCallback callback, Boolean value) {
-      writeRequirePINforRemoteOperationAttribute(chipClusterPtr, callback, value, null);
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeRequirePINforRemoteOperationAttribute(
-        DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-      writeRequirePINforRemoteOperationAttribute(
-          chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -7187,209 +6402,323 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readLockStateAttribute(
-        long chipClusterPtr, LockStateAttributeCallback callback);
+    private native void readGeneratedCommandListAttribute(
+        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
-    private native void subscribeLockStateAttribute(
-        long chipClusterPtr, LockStateAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeGeneratedCommandListAttribute(
+        long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void readLockTypeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readAcceptedCommandListAttribute(
+        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
 
-    private native void subscribeLockTypeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeAcceptedCommandListAttribute(
+        long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void readActuatorEnabledAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
+    private native void readAttributeListAttribute(
+        long chipClusterPtr, AttributeListAttributeCallback callback);
 
-    private native void subscribeActuatorEnabledAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeAttributeListAttribute(
+        long chipClusterPtr,
+        AttributeListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void readDoorStateAttribute(
-        long chipClusterPtr, DoorStateAttributeCallback callback);
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeDoorStateAttribute(
-        long chipClusterPtr, DoorStateAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readNumberOfTotalUsersSupportedAttribute(
+    private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeNumberOfTotalUsersSupportedAttribute(
+    private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
 
-    private native void readNumberOfPINUsersSupportedAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  public static class GeneralDiagnosticsCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 51L;
 
-    private native void subscribeNumberOfPINUsersSupportedAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public GeneralDiagnosticsCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
 
-    private native void readNumberOfRFIDUsersSupportedAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
 
-    private native void subscribeNumberOfRFIDUsersSupportedAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void testEventTrigger(
+        DefaultClusterCallback callback, byte[] enableKey, Long eventTrigger) {
+      testEventTrigger(chipClusterPtr, callback, enableKey, eventTrigger, null);
+    }
 
-    private native void readNumberOfWeekDaySchedulesSupportedPerUserAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void testEventTrigger(
+        DefaultClusterCallback callback,
+        byte[] enableKey,
+        Long eventTrigger,
+        int timedInvokeTimeoutMs) {
+      testEventTrigger(chipClusterPtr, callback, enableKey, eventTrigger, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeNumberOfWeekDaySchedulesSupportedPerUserAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void testEventTrigger(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        byte[] enableKey,
+        Long eventTrigger,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void readNumberOfYearDaySchedulesSupportedPerUserAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface NetworkInterfacesAttributeCallback {
+      void onSuccess(List<ChipStructs.GeneralDiagnosticsClusterNetworkInterfaceType> valueList);
 
-    private native void subscribeNumberOfYearDaySchedulesSupportedPerUserAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
 
-    private native void readNumberOfHolidaySchedulesSupportedAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeNumberOfHolidaySchedulesSupportedAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface ActiveHardwareFaultsAttributeCallback {
+      void onSuccess(List<Integer> valueList);
 
-    private native void readMaxPINCodeLengthAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void subscribeMaxPINCodeLengthAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readMinPINCodeLengthAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface ActiveRadioFaultsAttributeCallback {
+      void onSuccess(List<Integer> valueList);
 
-    private native void subscribeMinPINCodeLengthAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
 
-    private native void readMaxRFIDCodeLengthAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeMaxRFIDCodeLengthAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface ActiveNetworkFaultsAttributeCallback {
+      void onSuccess(List<Integer> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
+    }
+
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
+    }
+
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
+    }
+
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
+    }
+
+    public void readNetworkInterfacesAttribute(NetworkInterfacesAttributeCallback callback) {
+      readNetworkInterfacesAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeNetworkInterfacesAttribute(
+        NetworkInterfacesAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNetworkInterfacesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRebootCountAttribute(IntegerAttributeCallback callback) {
+      readRebootCountAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeRebootCountAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRebootCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUpTimeAttribute(LongAttributeCallback callback) {
+      readUpTimeAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeUpTimeAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeUpTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTotalOperationalHoursAttribute(LongAttributeCallback callback) {
+      readTotalOperationalHoursAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeTotalOperationalHoursAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTotalOperationalHoursAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBootReasonsAttribute(IntegerAttributeCallback callback) {
+      readBootReasonsAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeBootReasonsAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBootReasonsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActiveHardwareFaultsAttribute(ActiveHardwareFaultsAttributeCallback callback) {
+      readActiveHardwareFaultsAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeActiveHardwareFaultsAttribute(
+        ActiveHardwareFaultsAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeActiveHardwareFaultsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActiveRadioFaultsAttribute(ActiveRadioFaultsAttributeCallback callback) {
+      readActiveRadioFaultsAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeActiveRadioFaultsAttribute(
+        ActiveRadioFaultsAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeActiveRadioFaultsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActiveNetworkFaultsAttribute(ActiveNetworkFaultsAttributeCallback callback) {
+      readActiveNetworkFaultsAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeActiveNetworkFaultsAttribute(
+        ActiveNetworkFaultsAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeActiveNetworkFaultsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTestEventTriggersEnabledAttribute(BooleanAttributeCallback callback) {
+      readTestEventTriggersEnabledAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeTestEventTriggersEnabledAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTestEventTriggersEnabledAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readMinRFIDCodeLengthAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeMinRFIDCodeLengthAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readNumberOfCredentialsSupportedPerUserAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeNumberOfCredentialsSupportedPerUserAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readLanguageAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void writeLanguageAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        String value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void readNetworkInterfacesAttribute(
+        long chipClusterPtr, NetworkInterfacesAttributeCallback callback);
 
-    private native void subscribeLanguageAttribute(
+    private native void subscribeNetworkInterfacesAttribute(
         long chipClusterPtr,
-        CharStringAttributeCallback callback,
+        NetworkInterfacesAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readAutoRelockTimeAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void writeAutoRelockTimeAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeAutoRelockTimeAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSoundVolumeAttribute(
+    private native void readRebootCountAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeSoundVolumeAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeSoundVolumeAttribute(
+    private native void subscribeRebootCountAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readOperatingModeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readUpTimeAttribute(long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void writeOperatingModeAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeUpTimeAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeOperatingModeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void readTotalOperationalHoursAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void readSupportedOperatingModesAttribute(
+    private native void subscribeTotalOperationalHoursAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readBootReasonsAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeSupportedOperatingModesAttribute(
+    private native void subscribeBootReasonsAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readEnableOneTouchLockingAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void writeEnableOneTouchLockingAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Boolean value,
-        @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeEnableOneTouchLockingAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readEnablePrivacyModeButtonAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
+    private native void readActiveHardwareFaultsAttribute(
+        long chipClusterPtr, ActiveHardwareFaultsAttributeCallback callback);
 
-    private native void writeEnablePrivacyModeButtonAttribute(
+    private native void subscribeActiveHardwareFaultsAttribute(
         long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Boolean value,
-        @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeEnablePrivacyModeButtonAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+        ActiveHardwareFaultsAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void readWrongCodeEntryLimitAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readActiveRadioFaultsAttribute(
+        long chipClusterPtr, ActiveRadioFaultsAttributeCallback callback);
 
-    private native void writeWrongCodeEntryLimitAttribute(
+    private native void subscribeActiveRadioFaultsAttribute(
         long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeWrongCodeEntryLimitAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+        ActiveRadioFaultsAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void readUserCodeTemporaryDisableTimeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readActiveNetworkFaultsAttribute(
+        long chipClusterPtr, ActiveNetworkFaultsAttributeCallback callback);
 
-    private native void writeUserCodeTemporaryDisableTimeAttribute(
+    private native void subscribeActiveNetworkFaultsAttribute(
         long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeUserCodeTemporaryDisableTimeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+        ActiveNetworkFaultsAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void readRequirePINforRemoteOperationAttribute(
+    private native void readTestEventTriggersEnabledAttribute(
         long chipClusterPtr, BooleanAttributeCallback callback);
 
-    private native void writeRequirePINforRemoteOperationAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Boolean value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeTestEventTriggersEnabledAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
 
     private native void readGeneratedCommandListAttribute(
         long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
@@ -7431,33 +6760,39 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class ElectricalMeasurementCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 2820L;
+  public static class SoftwareDiagnosticsCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 52L;
 
-    public ElectricalMeasurementCluster(long devicePtr, int endpointId) {
+    public SoftwareDiagnosticsCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void resetWatermarks(DefaultClusterCallback callback) {
+      resetWatermarks(chipClusterPtr, callback, null);
+    }
 
-      void onError(Exception ex);
+    public void resetWatermarks(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
 
-      default void onSubscriptionEstablished() {}
+      resetWatermarks(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void resetWatermarks(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    public interface ThreadMetricsAttributeCallback {
+      void onSuccess(List<ChipStructs.SoftwareDiagnosticsClusterThreadMetrics> valueList);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback {
       void onSuccess(List<Long> valueList);
 
       void onError(Exception ex);
@@ -7465,103 +6800,57 @@ public interface AttributeListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public void readMeasurementTypeAttribute(LongAttributeCallback callback) {
-      readMeasurementTypeAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeMeasurementTypeAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMeasurementTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readTotalActivePowerAttribute(LongAttributeCallback callback) {
-      readTotalActivePowerAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeTotalActivePowerAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTotalActivePowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readRmsVoltageAttribute(IntegerAttributeCallback callback) {
-      readRmsVoltageAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeRmsVoltageAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRmsVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readRmsVoltageMinAttribute(IntegerAttributeCallback callback) {
-      readRmsVoltageMinAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeRmsVoltageMinAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRmsVoltageMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readRmsVoltageMaxAttribute(IntegerAttributeCallback callback) {
-      readRmsVoltageMaxAttribute(chipClusterPtr, callback);
-    }
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void subscribeRmsVoltageMaxAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRmsVoltageMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readRmsCurrentAttribute(IntegerAttributeCallback callback) {
-      readRmsCurrentAttribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeRmsCurrentAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRmsCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void readRmsCurrentMinAttribute(IntegerAttributeCallback callback) {
-      readRmsCurrentMinAttribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void subscribeRmsCurrentMinAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRmsCurrentMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readRmsCurrentMaxAttribute(IntegerAttributeCallback callback) {
-      readRmsCurrentMaxAttribute(chipClusterPtr, callback);
+    public void readThreadMetricsAttribute(ThreadMetricsAttributeCallback callback) {
+      readThreadMetricsAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeRmsCurrentMaxAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRmsCurrentMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeThreadMetricsAttribute(
+        ThreadMetricsAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeThreadMetricsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readActivePowerAttribute(IntegerAttributeCallback callback) {
-      readActivePowerAttribute(chipClusterPtr, callback);
+    public void readCurrentHeapFreeAttribute(LongAttributeCallback callback) {
+      readCurrentHeapFreeAttribute(chipClusterPtr, callback);
     }
-
-    public void subscribeActivePowerAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeActivePowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+
+    public void subscribeCurrentHeapFreeAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentHeapFreeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readActivePowerMinAttribute(IntegerAttributeCallback callback) {
-      readActivePowerMinAttribute(chipClusterPtr, callback);
+    public void readCurrentHeapUsedAttribute(LongAttributeCallback callback) {
+      readCurrentHeapUsedAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeActivePowerMinAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeActivePowerMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCurrentHeapUsedAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentHeapUsedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readActivePowerMaxAttribute(IntegerAttributeCallback callback) {
-      readActivePowerMaxAttribute(chipClusterPtr, callback);
+    public void readCurrentHeapHighWatermarkAttribute(LongAttributeCallback callback) {
+      readCurrentHeapHighWatermarkAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeActivePowerMaxAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeActivePowerMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCurrentHeapHighWatermarkAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentHeapHighWatermarkAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -7609,71 +6898,32 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readMeasurementTypeAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    private native void readThreadMetricsAttribute(
+        long chipClusterPtr, ThreadMetricsAttributeCallback callback);
 
-    private native void subscribeMeasurementTypeAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeThreadMetricsAttribute(
+        long chipClusterPtr,
+        ThreadMetricsAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void readTotalActivePowerAttribute(
+    private native void readCurrentHeapFreeAttribute(
         long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeTotalActivePowerAttribute(
+    private native void subscribeCurrentHeapFreeAttribute(
         long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readRmsVoltageAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeRmsVoltageAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRmsVoltageMinAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeRmsVoltageMinAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRmsVoltageMaxAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeRmsVoltageMaxAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRmsCurrentAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeRmsCurrentAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRmsCurrentMinAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeRmsCurrentMinAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRmsCurrentMaxAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeRmsCurrentMaxAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readActivePowerAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeActivePowerAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readActivePowerMinAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readCurrentHeapUsedAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeActivePowerMinAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeCurrentHeapUsedAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readActivePowerMaxAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readCurrentHeapHighWatermarkAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeActivePowerMaxAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeCurrentHeapHighWatermarkAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
     private native void readGeneratedCommandListAttribute(
         long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
@@ -7715,10 +6965,10 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class EthernetNetworkDiagnosticsCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 55L;
+  public static class ThreadNetworkDiagnosticsCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 53L;
 
-    public EthernetNetworkDiagnosticsCluster(long devicePtr, int endpointId) {
+    public ThreadNetworkDiagnosticsCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
@@ -7739,7 +6989,7 @@ private native void resetCounts(
         DefaultClusterCallback Callback,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    public interface PHYRateAttributeCallback {
+    public interface ChannelAttributeCallback {
       void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
@@ -7747,292 +6997,136 @@ public interface PHYRateAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public interface FullDuplexAttributeCallback {
-      void onSuccess(@Nullable Boolean value);
+    public interface RoutingRoleAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface CarrierDetectAttributeCallback {
-      void onSuccess(@Nullable Boolean value);
+    public interface NetworkNameAttributeCallback {
+      void onSuccess(@Nullable String value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public interface PanIdAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public interface ExtendedPanIdAttributeCallback {
+      void onSuccess(@Nullable Long value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public interface MeshLocalPrefixAttributeCallback {
+      void onSuccess(@Nullable byte[] value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public void readPHYRateAttribute(PHYRateAttributeCallback callback) {
-      readPHYRateAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribePHYRateAttribute(
-        PHYRateAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePHYRateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readFullDuplexAttribute(FullDuplexAttributeCallback callback) {
-      readFullDuplexAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeFullDuplexAttribute(
-        FullDuplexAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFullDuplexAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readPacketRxCountAttribute(LongAttributeCallback callback) {
-      readPacketRxCountAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribePacketRxCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePacketRxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readPacketTxCountAttribute(LongAttributeCallback callback) {
-      readPacketTxCountAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribePacketTxCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePacketTxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readTxErrCountAttribute(LongAttributeCallback callback) {
-      readTxErrCountAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeTxErrCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTxErrCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readCollisionCountAttribute(LongAttributeCallback callback) {
-      readCollisionCountAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeCollisionCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCollisionCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readOverrunCountAttribute(LongAttributeCallback callback) {
-      readOverrunCountAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeOverrunCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeOverrunCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readCarrierDetectAttribute(CarrierDetectAttributeCallback callback) {
-      readCarrierDetectAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeCarrierDetectAttribute(
-        CarrierDetectAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCarrierDetectAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readTimeSinceResetAttribute(LongAttributeCallback callback) {
-      readTimeSinceResetAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeTimeSinceResetAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTimeSinceResetAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readPHYRateAttribute(
-        long chipClusterPtr, PHYRateAttributeCallback callback);
+    public interface NeighborTableListAttributeCallback {
+      void onSuccess(List<ChipStructs.ThreadNetworkDiagnosticsClusterNeighborTable> valueList);
 
-    private native void subscribePHYRateAttribute(
-        long chipClusterPtr, PHYRateAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
 
-    private native void readFullDuplexAttribute(
-        long chipClusterPtr, FullDuplexAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeFullDuplexAttribute(
-        long chipClusterPtr,
-        FullDuplexAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public interface RouteTableListAttributeCallback {
+      void onSuccess(List<ChipStructs.ThreadNetworkDiagnosticsClusterRouteTable> valueList);
 
-    private native void readPacketRxCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void subscribePacketRxCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readPacketTxCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public interface PartitionIdAttributeCallback {
+      void onSuccess(@Nullable Long value);
 
-    private native void subscribePacketTxCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
 
-    private native void readTxErrCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeTxErrCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public interface WeightingAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    private native void readCollisionCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void subscribeCollisionCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readOverrunCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public interface DataVersionAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    private native void subscribeOverrunCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
 
-    private native void readCarrierDetectAttribute(
-        long chipClusterPtr, CarrierDetectAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeCarrierDetectAttribute(
-        long chipClusterPtr,
-        CarrierDetectAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public interface StableDataVersionAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    private native void readTimeSinceResetAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void subscribeTimeSinceResetAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readGeneratedCommandListAttribute(
-        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public interface LeaderRouterIdAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    private native void subscribeGeneratedCommandListAttribute(
-        long chipClusterPtr,
-        GeneratedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+      void onError(Exception ex);
 
-    private native void readAcceptedCommandListAttribute(
-        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeAcceptedCommandListAttribute(
-        long chipClusterPtr,
-        AcceptedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public interface ActiveTimestampAttributeCallback {
+      void onSuccess(@Nullable Long value);
 
-    private native void readAttributeListAttribute(
-        long chipClusterPtr, AttributeListAttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void subscribeAttributeListAttribute(
-        long chipClusterPtr,
-        AttributeListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public interface PendingTimestampAttributeCallback {
+      void onSuccess(@Nullable Long value);
 
-    private native void subscribeFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public interface DelayAttributeCallback {
+      void onSuccess(@Nullable Long value);
 
-  public static class FanControlCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 514L;
+      void onError(Exception ex);
 
-    public FanControlCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      default void onSubscriptionEstablished() {}
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
-    public interface PercentSettingAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public interface ChannelMaskAttributeCallback {
+      void onSuccess(@Nullable byte[] value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface SpeedSettingAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public interface ActiveNetworkFaultsListAttributeCallback {
+      void onSuccess(List<Integer> valueList);
 
       void onError(Exception ex);
 
@@ -8060,404 +7154,562 @@ public interface AttributeListAttributeCallback {
 
       void onError(Exception ex);
 
-      default void onSubscriptionEstablished() {}
+      default void onSubscriptionEstablished() {}
+    }
+
+    public void readChannelAttribute(ChannelAttributeCallback callback) {
+      readChannelAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeChannelAttribute(
+        ChannelAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeChannelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRoutingRoleAttribute(RoutingRoleAttributeCallback callback) {
+      readRoutingRoleAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeRoutingRoleAttribute(
+        RoutingRoleAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRoutingRoleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNetworkNameAttribute(NetworkNameAttributeCallback callback) {
+      readNetworkNameAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeNetworkNameAttribute(
+        NetworkNameAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNetworkNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPanIdAttribute(PanIdAttributeCallback callback) {
+      readPanIdAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribePanIdAttribute(
+        PanIdAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePanIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readExtendedPanIdAttribute(ExtendedPanIdAttributeCallback callback) {
+      readExtendedPanIdAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeExtendedPanIdAttribute(
+        ExtendedPanIdAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeExtendedPanIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMeshLocalPrefixAttribute(MeshLocalPrefixAttributeCallback callback) {
+      readMeshLocalPrefixAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMeshLocalPrefixAttribute(
+        MeshLocalPrefixAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMeshLocalPrefixAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOverrunCountAttribute(LongAttributeCallback callback) {
+      readOverrunCountAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeOverrunCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeOverrunCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readNeighborTableListAttribute(NeighborTableListAttributeCallback callback) {
+      readNeighborTableListAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeNeighborTableListAttribute(
+        NeighborTableListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNeighborTableListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRouteTableListAttribute(RouteTableListAttributeCallback callback) {
+      readRouteTableListAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeRouteTableListAttribute(
+        RouteTableListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRouteTableListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPartitionIdAttribute(PartitionIdAttributeCallback callback) {
+      readPartitionIdAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribePartitionIdAttribute(
+        PartitionIdAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePartitionIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readWeightingAttribute(WeightingAttributeCallback callback) {
+      readWeightingAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeWeightingAttribute(
+        WeightingAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeWeightingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readDataVersionAttribute(DataVersionAttributeCallback callback) {
+      readDataVersionAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeDataVersionAttribute(
+        DataVersionAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeDataVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readStableDataVersionAttribute(StableDataVersionAttributeCallback callback) {
+      readStableDataVersionAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeStableDataVersionAttribute(
+        StableDataVersionAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeStableDataVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLeaderRouterIdAttribute(LeaderRouterIdAttributeCallback callback) {
+      readLeaderRouterIdAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeLeaderRouterIdAttribute(
+        LeaderRouterIdAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeLeaderRouterIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readFanModeAttribute(IntegerAttributeCallback callback) {
-      readFanModeAttribute(chipClusterPtr, callback);
+    public void readDetachedRoleCountAttribute(IntegerAttributeCallback callback) {
+      readDetachedRoleCountAttribute(chipClusterPtr, callback);
     }
 
-    public void writeFanModeAttribute(DefaultClusterCallback callback, Integer value) {
-      writeFanModeAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeDetachedRoleCountAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeDetachedRoleCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeFanModeAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeFanModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readChildRoleCountAttribute(IntegerAttributeCallback callback) {
+      readChildRoleCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeFanModeAttribute(
+    public void subscribeChildRoleCountAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFanModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeChildRoleCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readFanModeSequenceAttribute(IntegerAttributeCallback callback) {
-      readFanModeSequenceAttribute(chipClusterPtr, callback);
+    public void readRouterRoleCountAttribute(IntegerAttributeCallback callback) {
+      readRouterRoleCountAttribute(chipClusterPtr, callback);
     }
 
-    public void writeFanModeSequenceAttribute(DefaultClusterCallback callback, Integer value) {
-      writeFanModeSequenceAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeRouterRoleCountAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRouterRoleCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeFanModeSequenceAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeFanModeSequenceAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readLeaderRoleCountAttribute(IntegerAttributeCallback callback) {
+      readLeaderRoleCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeFanModeSequenceAttribute(
+    public void subscribeLeaderRoleCountAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFanModeSequenceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeLeaderRoleCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readPercentSettingAttribute(PercentSettingAttributeCallback callback) {
-      readPercentSettingAttribute(chipClusterPtr, callback);
+    public void readAttachAttemptCountAttribute(IntegerAttributeCallback callback) {
+      readAttachAttemptCountAttribute(chipClusterPtr, callback);
     }
 
-    public void writePercentSettingAttribute(DefaultClusterCallback callback, Integer value) {
-      writePercentSettingAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeAttachAttemptCountAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttachAttemptCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writePercentSettingAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writePercentSettingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readPartitionIdChangeCountAttribute(IntegerAttributeCallback callback) {
+      readPartitionIdChangeCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribePercentSettingAttribute(
-        PercentSettingAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePercentSettingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribePartitionIdChangeCountAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePartitionIdChangeCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readPercentCurrentAttribute(IntegerAttributeCallback callback) {
-      readPercentCurrentAttribute(chipClusterPtr, callback);
+    public void readBetterPartitionAttachAttemptCountAttribute(IntegerAttributeCallback callback) {
+      readBetterPartitionAttachAttemptCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribePercentCurrentAttribute(
+    public void subscribeBetterPartitionAttachAttemptCountAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePercentCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeBetterPartitionAttachAttemptCountAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readSpeedMaxAttribute(IntegerAttributeCallback callback) {
-      readSpeedMaxAttribute(chipClusterPtr, callback);
+    public void readParentChangeCountAttribute(IntegerAttributeCallback callback) {
+      readParentChangeCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeSpeedMaxAttribute(
+    public void subscribeParentChangeCountAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSpeedMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeParentChangeCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readSpeedSettingAttribute(SpeedSettingAttributeCallback callback) {
-      readSpeedSettingAttribute(chipClusterPtr, callback);
+    public void readTxTotalCountAttribute(LongAttributeCallback callback) {
+      readTxTotalCountAttribute(chipClusterPtr, callback);
     }
 
-    public void writeSpeedSettingAttribute(DefaultClusterCallback callback, Integer value) {
-      writeSpeedSettingAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeTxTotalCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTxTotalCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeSpeedSettingAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeSpeedSettingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readTxUnicastCountAttribute(LongAttributeCallback callback) {
+      readTxUnicastCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeSpeedSettingAttribute(
-        SpeedSettingAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSpeedSettingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeTxUnicastCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTxUnicastCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readSpeedCurrentAttribute(IntegerAttributeCallback callback) {
-      readSpeedCurrentAttribute(chipClusterPtr, callback);
+    public void readTxBroadcastCountAttribute(LongAttributeCallback callback) {
+      readTxBroadcastCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeSpeedCurrentAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSpeedCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeTxBroadcastCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTxBroadcastCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readRockSupportAttribute(IntegerAttributeCallback callback) {
-      readRockSupportAttribute(chipClusterPtr, callback);
+    public void readTxAckRequestedCountAttribute(LongAttributeCallback callback) {
+      readTxAckRequestedCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeRockSupportAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRockSupportAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeTxAckRequestedCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTxAckRequestedCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readRockSettingAttribute(IntegerAttributeCallback callback) {
-      readRockSettingAttribute(chipClusterPtr, callback);
+    public void readTxAckedCountAttribute(LongAttributeCallback callback) {
+      readTxAckedCountAttribute(chipClusterPtr, callback);
     }
 
-    public void writeRockSettingAttribute(DefaultClusterCallback callback, Integer value) {
-      writeRockSettingAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeTxAckedCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTxAckedCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeRockSettingAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeRockSettingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readTxNoAckRequestedCountAttribute(LongAttributeCallback callback) {
+      readTxNoAckRequestedCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeRockSettingAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRockSettingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeTxNoAckRequestedCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTxNoAckRequestedCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readWindSupportAttribute(IntegerAttributeCallback callback) {
-      readWindSupportAttribute(chipClusterPtr, callback);
+    public void readTxDataCountAttribute(LongAttributeCallback callback) {
+      readTxDataCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeWindSupportAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeWindSupportAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeTxDataCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTxDataCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readWindSettingAttribute(IntegerAttributeCallback callback) {
-      readWindSettingAttribute(chipClusterPtr, callback);
+    public void readTxDataPollCountAttribute(LongAttributeCallback callback) {
+      readTxDataPollCountAttribute(chipClusterPtr, callback);
     }
 
-    public void writeWindSettingAttribute(DefaultClusterCallback callback, Integer value) {
-      writeWindSettingAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeTxDataPollCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTxDataPollCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeWindSettingAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeWindSettingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readTxBeaconCountAttribute(LongAttributeCallback callback) {
+      readTxBeaconCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeWindSettingAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeWindSettingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeTxBeaconCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTxBeaconCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    public void readTxBeaconRequestCountAttribute(LongAttributeCallback callback) {
+      readTxBeaconRequestCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeTxBeaconRequestCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTxBeaconRequestCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    public void readTxOtherCountAttribute(LongAttributeCallback callback) {
+      readTxOtherCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeTxOtherCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTxOtherCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
+    public void readTxRetryCountAttribute(LongAttributeCallback callback) {
+      readTxRetryCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeTxRetryCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTxRetryCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
+    public void readTxDirectMaxRetryExpiryCountAttribute(LongAttributeCallback callback) {
+      readTxDirectMaxRetryExpiryCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeFeatureMapAttribute(
+    public void subscribeTxDirectMaxRetryExpiryCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeTxDirectMaxRetryExpiryCountAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
+    public void readTxIndirectMaxRetryExpiryCountAttribute(LongAttributeCallback callback) {
+      readTxIndirectMaxRetryExpiryCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeTxIndirectMaxRetryExpiryCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTxIndirectMaxRetryExpiryCountAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readFanModeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeFanModeAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeFanModeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readFanModeSequenceAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeFanModeSequenceAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeFanModeSequenceAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readTxErrCcaCountAttribute(LongAttributeCallback callback) {
+      readTxErrCcaCountAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readPercentSettingAttribute(
-        long chipClusterPtr, PercentSettingAttributeCallback callback);
+    public void subscribeTxErrCcaCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTxErrCcaCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void writePercentSettingAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void readTxErrAbortCountAttribute(LongAttributeCallback callback) {
+      readTxErrAbortCountAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribePercentSettingAttribute(
-        long chipClusterPtr,
-        PercentSettingAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void subscribeTxErrAbortCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTxErrAbortCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readPercentCurrentAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readTxErrBusyChannelCountAttribute(LongAttributeCallback callback) {
+      readTxErrBusyChannelCountAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribePercentCurrentAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeTxErrBusyChannelCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTxErrBusyChannelCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readSpeedMaxAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readRxTotalCountAttribute(LongAttributeCallback callback) {
+      readRxTotalCountAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeSpeedMaxAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeRxTotalCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRxTotalCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readSpeedSettingAttribute(
-        long chipClusterPtr, SpeedSettingAttributeCallback callback);
+    public void readRxUnicastCountAttribute(LongAttributeCallback callback) {
+      readRxUnicastCountAttribute(chipClusterPtr, callback);
+    }
 
-    private native void writeSpeedSettingAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeRxUnicastCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRxUnicastCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeSpeedSettingAttribute(
-        long chipClusterPtr,
-        SpeedSettingAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void readRxBroadcastCountAttribute(LongAttributeCallback callback) {
+      readRxBroadcastCountAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readSpeedCurrentAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeRxBroadcastCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRxBroadcastCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeSpeedCurrentAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readRxDataCountAttribute(LongAttributeCallback callback) {
+      readRxDataCountAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readRockSupportAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeRxDataCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRxDataCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeRockSupportAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readRxDataPollCountAttribute(LongAttributeCallback callback) {
+      readRxDataPollCountAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readRockSettingAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeRxDataPollCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRxDataPollCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void writeRockSettingAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void readRxBeaconCountAttribute(LongAttributeCallback callback) {
+      readRxBeaconCountAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeRockSettingAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeRxBeaconCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRxBeaconCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readWindSupportAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readRxBeaconRequestCountAttribute(LongAttributeCallback callback) {
+      readRxBeaconRequestCountAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeWindSupportAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeRxBeaconRequestCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRxBeaconRequestCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readWindSettingAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readRxOtherCountAttribute(LongAttributeCallback callback) {
+      readRxOtherCountAttribute(chipClusterPtr, callback);
+    }
 
-    private native void writeWindSettingAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeRxOtherCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRxOtherCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeWindSettingAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readRxAddressFilteredCountAttribute(LongAttributeCallback callback) {
+      readRxAddressFilteredCountAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readGeneratedCommandListAttribute(
-        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void subscribeRxAddressFilteredCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRxAddressFilteredCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeGeneratedCommandListAttribute(
-        long chipClusterPtr,
-        GeneratedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void readRxDestAddrFilteredCountAttribute(LongAttributeCallback callback) {
+      readRxDestAddrFilteredCountAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readAcceptedCommandListAttribute(
-        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void subscribeRxDestAddrFilteredCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRxDestAddrFilteredCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeAcceptedCommandListAttribute(
-        long chipClusterPtr,
-        AcceptedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void readRxDuplicatedCountAttribute(LongAttributeCallback callback) {
+      readRxDuplicatedCountAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readAttributeListAttribute(
-        long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void subscribeRxDuplicatedCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRxDuplicatedCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeAttributeListAttribute(
-        long chipClusterPtr,
-        AttributeListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void readRxErrNoFrameCountAttribute(LongAttributeCallback callback) {
+      readRxErrNoFrameCountAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void subscribeRxErrNoFrameCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRxErrNoFrameCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void readRxErrUnknownNeighborCountAttribute(LongAttributeCallback callback) {
+      readRxErrUnknownNeighborCountAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeRxErrUnknownNeighborCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRxErrUnknownNeighborCountAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public void readRxErrInvalidSrcAddrCountAttribute(LongAttributeCallback callback) {
+      readRxErrInvalidSrcAddrCountAttribute(chipClusterPtr, callback);
+    }
 
-  public static class FixedLabelCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 64L;
+    public void subscribeRxErrInvalidSrcAddrCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRxErrInvalidSrcAddrCountAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    public FixedLabelCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    public void readRxErrSecCountAttribute(LongAttributeCallback callback) {
+      readRxErrSecCountAttribute(chipClusterPtr, callback);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void subscribeRxErrSecCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRxErrSecCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    public interface LabelListAttributeCallback {
-      void onSuccess(List<ChipStructs.FixedLabelClusterLabelStruct> valueList);
+    public void readRxErrFcsCountAttribute(LongAttributeCallback callback) {
+      readRxErrFcsCountAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void subscribeRxErrFcsCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRxErrFcsCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readRxErrOtherCountAttribute(LongAttributeCallback callback) {
+      readRxErrOtherCountAttribute(chipClusterPtr, callback);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void subscribeRxErrOtherCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRxErrOtherCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readActiveTimestampAttribute(ActiveTimestampAttributeCallback callback) {
+      readActiveTimestampAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeActiveTimestampAttribute(
+        ActiveTimestampAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeActiveTimestampAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void readPendingTimestampAttribute(PendingTimestampAttributeCallback callback) {
+      readPendingTimestampAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void subscribePendingTimestampAttribute(
+        PendingTimestampAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePendingTimestampAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readDelayAttribute(DelayAttributeCallback callback) {
+      readDelayAttribute(chipClusterPtr, callback);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void subscribeDelayAttribute(
+        DelayAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeDelayAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readChannelMaskAttribute(ChannelMaskAttributeCallback callback) {
+      readChannelMaskAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeChannelMaskAttribute(
+        ChannelMaskAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeChannelMaskAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readLabelListAttribute(LabelListAttributeCallback callback) {
-      readLabelListAttribute(chipClusterPtr, callback);
+    public void readActiveNetworkFaultsListAttribute(
+        ActiveNetworkFaultsListAttributeCallback callback) {
+      readActiveNetworkFaultsListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeLabelListAttribute(
-        LabelListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeLabelListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeActiveNetworkFaultsListAttribute(
+        ActiveNetworkFaultsListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeActiveNetworkFaultsListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -8505,503 +7757,411 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readLabelListAttribute(
-        long chipClusterPtr, LabelListAttributeCallback callback);
+    private native void readChannelAttribute(
+        long chipClusterPtr, ChannelAttributeCallback callback);
 
-    private native void subscribeLabelListAttribute(
-        long chipClusterPtr, LabelListAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeChannelAttribute(
+        long chipClusterPtr, ChannelAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readGeneratedCommandListAttribute(
-        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    private native void readRoutingRoleAttribute(
+        long chipClusterPtr, RoutingRoleAttributeCallback callback);
 
-    private native void subscribeGeneratedCommandListAttribute(
+    private native void subscribeRoutingRoleAttribute(
         long chipClusterPtr,
-        GeneratedCommandListAttributeCallback callback,
+        RoutingRoleAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readAcceptedCommandListAttribute(
-        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    private native void readNetworkNameAttribute(
+        long chipClusterPtr, NetworkNameAttributeCallback callback);
 
-    private native void subscribeAcceptedCommandListAttribute(
+    private native void subscribeNetworkNameAttribute(
         long chipClusterPtr,
-        AcceptedCommandListAttributeCallback callback,
+        NetworkNameAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readAttributeListAttribute(
-        long chipClusterPtr, AttributeListAttributeCallback callback);
+    private native void readPanIdAttribute(long chipClusterPtr, PanIdAttributeCallback callback);
 
-    private native void subscribeAttributeListAttribute(
+    private native void subscribePanIdAttribute(
+        long chipClusterPtr, PanIdAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readExtendedPanIdAttribute(
+        long chipClusterPtr, ExtendedPanIdAttributeCallback callback);
+
+    private native void subscribeExtendedPanIdAttribute(
         long chipClusterPtr,
-        AttributeListAttributeCallback callback,
+        ExtendedPanIdAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
-
-  public static class FlowMeasurementCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1028L;
-
-    public FlowMeasurementCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
-
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
-    public interface MeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
+    private native void readMeshLocalPrefixAttribute(
+        long chipClusterPtr, MeshLocalPrefixAttributeCallback callback);
 
-    public interface MinMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    private native void subscribeMeshLocalPrefixAttribute(
+        long chipClusterPtr,
+        MeshLocalPrefixAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-      void onError(Exception ex);
+    private native void readOverrunCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeOverrunCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public interface MaxMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    private native void readNeighborTableListAttribute(
+        long chipClusterPtr, NeighborTableListAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void subscribeNeighborTableListAttribute(
+        long chipClusterPtr,
+        NeighborTableListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void readRouteTableListAttribute(
+        long chipClusterPtr, RouteTableListAttributeCallback callback);
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void subscribeRouteTableListAttribute(
+        long chipClusterPtr,
+        RouteTableListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-      void onError(Exception ex);
+    private native void readPartitionIdAttribute(
+        long chipClusterPtr, PartitionIdAttributeCallback callback);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribePartitionIdAttribute(
+        long chipClusterPtr,
+        PartitionIdAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void readWeightingAttribute(
+        long chipClusterPtr, WeightingAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void subscribeWeightingAttribute(
+        long chipClusterPtr, WeightingAttributeCallback callback, int minInterval, int maxInterval);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void readDataVersionAttribute(
+        long chipClusterPtr, DataVersionAttributeCallback callback);
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void subscribeDataVersionAttribute(
+        long chipClusterPtr,
+        DataVersionAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-      void onError(Exception ex);
+    private native void readStableDataVersionAttribute(
+        long chipClusterPtr, StableDataVersionAttributeCallback callback);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeStableDataVersionAttribute(
+        long chipClusterPtr,
+        StableDataVersionAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void readMeasuredValueAttribute(MeasuredValueAttributeCallback callback) {
-      readMeasuredValueAttribute(chipClusterPtr, callback);
-    }
+    private native void readLeaderRouterIdAttribute(
+        long chipClusterPtr, LeaderRouterIdAttributeCallback callback);
 
-    public void subscribeMeasuredValueAttribute(
-        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeLeaderRouterIdAttribute(
+        long chipClusterPtr,
+        LeaderRouterIdAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void readMinMeasuredValueAttribute(MinMeasuredValueAttributeCallback callback) {
-      readMinMeasuredValueAttribute(chipClusterPtr, callback);
-    }
+    private native void readDetachedRoleCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeMinMeasuredValueAttribute(
-        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeDetachedRoleCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readMaxMeasuredValueAttribute(MaxMeasuredValueAttributeCallback callback) {
-      readMaxMeasuredValueAttribute(chipClusterPtr, callback);
-    }
+    private native void readChildRoleCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeMaxMeasuredValueAttribute(
-        MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeChildRoleCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readToleranceAttribute(IntegerAttributeCallback callback) {
-      readToleranceAttribute(chipClusterPtr, callback);
-    }
+    private native void readRouterRoleCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeToleranceAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeToleranceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeRouterRoleCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
-    }
+    private native void readLeaderRoleCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeLeaderRoleCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
-    }
+    private native void readAttachAttemptCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeAttachAttemptCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
-    }
+    private native void readPartitionIdChangeCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribePartitionIdChangeCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
-    }
+    private native void readBetterPartitionAttachAttemptCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeBetterPartitionAttachAttemptCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
+    private native void readParentChangeCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeParentChangeCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readMeasuredValueAttribute(
-        long chipClusterPtr, MeasuredValueAttributeCallback callback);
+    private native void readTxTotalCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeMeasuredValueAttribute(
-        long chipClusterPtr,
-        MeasuredValueAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeTxTotalCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readMinMeasuredValueAttribute(
-        long chipClusterPtr, MinMeasuredValueAttributeCallback callback);
+    private native void readTxUnicastCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeMinMeasuredValueAttribute(
-        long chipClusterPtr,
-        MinMeasuredValueAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeTxUnicastCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readMaxMeasuredValueAttribute(
-        long chipClusterPtr, MaxMeasuredValueAttributeCallback callback);
+    private native void readTxBroadcastCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeMaxMeasuredValueAttribute(
-        long chipClusterPtr,
-        MaxMeasuredValueAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeTxBroadcastCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readToleranceAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readTxAckRequestedCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeToleranceAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeTxAckRequestedCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readGeneratedCommandListAttribute(
-        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    private native void readTxAckedCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeGeneratedCommandListAttribute(
-        long chipClusterPtr,
-        GeneratedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeTxAckedCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readAcceptedCommandListAttribute(
-        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    private native void readTxNoAckRequestedCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeAcceptedCommandListAttribute(
-        long chipClusterPtr,
-        AcceptedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeTxNoAckRequestedCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readAttributeListAttribute(
-        long chipClusterPtr, AttributeListAttributeCallback callback);
+    private native void readTxDataCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeAttributeListAttribute(
-        long chipClusterPtr,
-        AttributeListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeTxDataCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readFeatureMapAttribute(
+    private native void readTxDataPollCountAttribute(
         long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeFeatureMapAttribute(
+    private native void subscribeTxDataPollCountAttribute(
         long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readTxBeaconCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    private native void subscribeTxBeaconCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-  public static class GeneralCommissioningCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 48L;
+    private native void readTxBeaconRequestCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public GeneralCommissioningCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
+    private native void subscribeTxBeaconRequestCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    private native void readTxOtherCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void armFailSafe(
-        ArmFailSafeResponseCallback callback, Integer expiryLengthSeconds, Long breadcrumb) {
-      armFailSafe(chipClusterPtr, callback, expiryLengthSeconds, breadcrumb, null);
-    }
+    private native void subscribeTxOtherCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void armFailSafe(
-        ArmFailSafeResponseCallback callback,
-        Integer expiryLengthSeconds,
-        Long breadcrumb,
-        int timedInvokeTimeoutMs) {
-      armFailSafe(chipClusterPtr, callback, expiryLengthSeconds, breadcrumb, timedInvokeTimeoutMs);
-    }
+    private native void readTxRetryCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void commissioningComplete(CommissioningCompleteResponseCallback callback) {
-      commissioningComplete(chipClusterPtr, callback, null);
-    }
+    private native void subscribeTxRetryCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void commissioningComplete(
-        CommissioningCompleteResponseCallback callback, int timedInvokeTimeoutMs) {
+    private native void readTxDirectMaxRetryExpiryCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-      commissioningComplete(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+    private native void subscribeTxDirectMaxRetryExpiryCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void setRegulatoryConfig(
-        SetRegulatoryConfigResponseCallback callback,
-        Integer newRegulatoryConfig,
-        String countryCode,
-        Long breadcrumb) {
-      setRegulatoryConfig(
-          chipClusterPtr, callback, newRegulatoryConfig, countryCode, breadcrumb, null);
-    }
+    private native void readTxIndirectMaxRetryExpiryCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void setRegulatoryConfig(
-        SetRegulatoryConfigResponseCallback callback,
-        Integer newRegulatoryConfig,
-        String countryCode,
-        Long breadcrumb,
-        int timedInvokeTimeoutMs) {
-      setRegulatoryConfig(
-          chipClusterPtr,
-          callback,
-          newRegulatoryConfig,
-          countryCode,
-          breadcrumb,
-          timedInvokeTimeoutMs);
-    }
+    private native void subscribeTxIndirectMaxRetryExpiryCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void armFailSafe(
-        long chipClusterPtr,
-        ArmFailSafeResponseCallback Callback,
-        Integer expiryLengthSeconds,
-        Long breadcrumb,
-        @Nullable Integer timedInvokeTimeoutMs);
+    private native void readTxErrCcaCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void commissioningComplete(
-        long chipClusterPtr,
-        CommissioningCompleteResponseCallback Callback,
-        @Nullable Integer timedInvokeTimeoutMs);
+    private native void subscribeTxErrCcaCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void setRegulatoryConfig(
-        long chipClusterPtr,
-        SetRegulatoryConfigResponseCallback Callback,
-        Integer newRegulatoryConfig,
-        String countryCode,
-        Long breadcrumb,
-        @Nullable Integer timedInvokeTimeoutMs);
+    private native void readTxErrAbortCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public interface ArmFailSafeResponseCallback {
-      void onSuccess(Integer errorCode, String debugText);
+    private native void subscribeTxErrAbortCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-      void onError(Exception error);
-    }
+    private native void readTxErrBusyChannelCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public interface CommissioningCompleteResponseCallback {
-      void onSuccess(Integer errorCode, String debugText);
+    private native void subscribeTxErrBusyChannelCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-      void onError(Exception error);
-    }
+    private native void readRxTotalCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public interface SetRegulatoryConfigResponseCallback {
-      void onSuccess(Integer errorCode, String debugText);
+    private native void subscribeRxTotalCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-      void onError(Exception error);
-    }
+    private native void readRxUnicastCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void subscribeRxUnicastCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-      void onError(Exception ex);
+    private native void readRxBroadcastCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeRxBroadcastCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void readRxDataCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void subscribeRxDataCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void readRxDataPollCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void subscribeRxDataPollCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-      void onError(Exception ex);
+    private native void readRxBeaconCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeRxBeaconCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readBreadcrumbAttribute(LongAttributeCallback callback) {
-      readBreadcrumbAttribute(chipClusterPtr, callback);
-    }
+    private native void readRxBeaconRequestCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void writeBreadcrumbAttribute(DefaultClusterCallback callback, Long value) {
-      writeBreadcrumbAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void subscribeRxBeaconRequestCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void writeBreadcrumbAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeBreadcrumbAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void readRxOtherCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void subscribeBreadcrumbAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBreadcrumbAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeRxOtherCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readRegulatoryConfigAttribute(IntegerAttributeCallback callback) {
-      readRegulatoryConfigAttribute(chipClusterPtr, callback);
-    }
+    private native void readRxAddressFilteredCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void subscribeRegulatoryConfigAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRegulatoryConfigAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeRxAddressFilteredCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readLocationCapabilityAttribute(IntegerAttributeCallback callback) {
-      readLocationCapabilityAttribute(chipClusterPtr, callback);
-    }
+    private native void readRxDestAddrFilteredCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void subscribeLocationCapabilityAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeLocationCapabilityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeRxDestAddrFilteredCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readSupportsConcurrentConnectionAttribute(BooleanAttributeCallback callback) {
-      readSupportsConcurrentConnectionAttribute(chipClusterPtr, callback);
-    }
+    private native void readRxDuplicatedCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void subscribeSupportsConcurrentConnectionAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSupportsConcurrentConnectionAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeRxDuplicatedCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
-    }
+    private native void readRxErrNoFrameCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeRxErrNoFrameCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
-    }
+    private native void readRxErrUnknownNeighborCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeRxErrUnknownNeighborCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
-    }
+    private native void readRxErrInvalidSrcAddrCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeRxErrInvalidSrcAddrCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
-    }
+    private native void readRxErrSecCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeRxErrSecCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
+    private native void readRxErrFcsCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeRxErrFcsCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readBreadcrumbAttribute(
+    private native void readRxErrOtherCountAttribute(
         long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void writeBreadcrumbAttribute(
+    private native void subscribeRxErrOtherCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readActiveTimestampAttribute(
+        long chipClusterPtr, ActiveTimestampAttributeCallback callback);
+
+    private native void subscribeActiveTimestampAttribute(
         long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+        ActiveTimestampAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void subscribeBreadcrumbAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    private native void readPendingTimestampAttribute(
+        long chipClusterPtr, PendingTimestampAttributeCallback callback);
 
-    private native void readRegulatoryConfigAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribePendingTimestampAttribute(
+        long chipClusterPtr,
+        PendingTimestampAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void subscribeRegulatoryConfigAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void readDelayAttribute(long chipClusterPtr, DelayAttributeCallback callback);
 
-    private native void readLocationCapabilityAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeDelayAttribute(
+        long chipClusterPtr, DelayAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeLocationCapabilityAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void readChannelMaskAttribute(
+        long chipClusterPtr, ChannelMaskAttributeCallback callback);
 
-    private native void readSupportsConcurrentConnectionAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
+    private native void subscribeChannelMaskAttribute(
+        long chipClusterPtr,
+        ChannelMaskAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void subscribeSupportsConcurrentConnectionAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+    private native void readActiveNetworkFaultsListAttribute(
+        long chipClusterPtr, ActiveNetworkFaultsListAttributeCallback callback);
+
+    private native void subscribeActiveNetworkFaultsListAttribute(
+        long chipClusterPtr,
+        ActiveNetworkFaultsListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
     private native void readGeneratedCommandListAttribute(
         long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
@@ -9043,62 +8203,64 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class GeneralDiagnosticsCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 51L;
+  public static class WiFiNetworkDiagnosticsCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 54L;
 
-    public GeneralDiagnosticsCluster(long devicePtr, int endpointId) {
+    public WiFiNetworkDiagnosticsCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void testEventTrigger(
-        DefaultClusterCallback callback, byte[] enableKey, Long eventTrigger) {
-      testEventTrigger(chipClusterPtr, callback, enableKey, eventTrigger, null);
+    public void resetCounts(DefaultClusterCallback callback) {
+      resetCounts(chipClusterPtr, callback, null);
     }
 
-    public void testEventTrigger(
-        DefaultClusterCallback callback,
-        byte[] enableKey,
-        Long eventTrigger,
-        int timedInvokeTimeoutMs) {
-      testEventTrigger(chipClusterPtr, callback, enableKey, eventTrigger, timedInvokeTimeoutMs);
+    public void resetCounts(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+
+      resetCounts(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    private native void testEventTrigger(
+    private native void resetCounts(
         long chipClusterPtr,
         DefaultClusterCallback Callback,
-        byte[] enableKey,
-        Long eventTrigger,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    public interface NetworkInterfacesAttributeCallback {
-      void onSuccess(List<ChipStructs.GeneralDiagnosticsClusterNetworkInterfaceType> valueList);
+    public interface BssidAttributeCallback {
+      void onSuccess(@Nullable byte[] value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface ActiveHardwareFaultsAttributeCallback {
-      void onSuccess(List<Integer> valueList);
+    public interface SecurityTypeAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface ActiveRadioFaultsAttributeCallback {
-      void onSuccess(List<Integer> valueList);
+    public interface WiFiVersionAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface ActiveNetworkFaultsAttributeCallback {
-      void onSuccess(List<Integer> valueList);
+    public interface ChannelNumberAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
+    }
+
+    public interface RssiAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
 
@@ -9129,86 +8291,121 @@ public interface AttributeListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public void readNetworkInterfacesAttribute(NetworkInterfacesAttributeCallback callback) {
-      readNetworkInterfacesAttribute(chipClusterPtr, callback);
+    public void readBssidAttribute(BssidAttributeCallback callback) {
+      readBssidAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeNetworkInterfacesAttribute(
-        NetworkInterfacesAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNetworkInterfacesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeBssidAttribute(
+        BssidAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBssidAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readRebootCountAttribute(IntegerAttributeCallback callback) {
-      readRebootCountAttribute(chipClusterPtr, callback);
+    public void readSecurityTypeAttribute(SecurityTypeAttributeCallback callback) {
+      readSecurityTypeAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeRebootCountAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRebootCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeSecurityTypeAttribute(
+        SecurityTypeAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSecurityTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readUpTimeAttribute(LongAttributeCallback callback) {
-      readUpTimeAttribute(chipClusterPtr, callback);
+    public void readWiFiVersionAttribute(WiFiVersionAttributeCallback callback) {
+      readWiFiVersionAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeWiFiVersionAttribute(
+        WiFiVersionAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeWiFiVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readChannelNumberAttribute(ChannelNumberAttributeCallback callback) {
+      readChannelNumberAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeChannelNumberAttribute(
+        ChannelNumberAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeChannelNumberAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readRssiAttribute(RssiAttributeCallback callback) {
+      readRssiAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeRssiAttribute(
+        RssiAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRssiAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBeaconLostCountAttribute(LongAttributeCallback callback) {
+      readBeaconLostCountAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeBeaconLostCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBeaconLostCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readBeaconRxCountAttribute(LongAttributeCallback callback) {
+      readBeaconRxCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeUpTimeAttribute(
+    public void subscribeBeaconRxCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeUpTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeBeaconRxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readTotalOperationalHoursAttribute(LongAttributeCallback callback) {
-      readTotalOperationalHoursAttribute(chipClusterPtr, callback);
+    public void readPacketMulticastRxCountAttribute(LongAttributeCallback callback) {
+      readPacketMulticastRxCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeTotalOperationalHoursAttribute(
+    public void subscribePacketMulticastRxCountAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTotalOperationalHoursAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribePacketMulticastRxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readBootReasonsAttribute(IntegerAttributeCallback callback) {
-      readBootReasonsAttribute(chipClusterPtr, callback);
+    public void readPacketMulticastTxCountAttribute(LongAttributeCallback callback) {
+      readPacketMulticastTxCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeBootReasonsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBootReasonsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribePacketMulticastTxCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePacketMulticastTxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readActiveHardwareFaultsAttribute(ActiveHardwareFaultsAttributeCallback callback) {
-      readActiveHardwareFaultsAttribute(chipClusterPtr, callback);
+    public void readPacketUnicastRxCountAttribute(LongAttributeCallback callback) {
+      readPacketUnicastRxCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeActiveHardwareFaultsAttribute(
-        ActiveHardwareFaultsAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeActiveHardwareFaultsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribePacketUnicastRxCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePacketUnicastRxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readActiveRadioFaultsAttribute(ActiveRadioFaultsAttributeCallback callback) {
-      readActiveRadioFaultsAttribute(chipClusterPtr, callback);
+    public void readPacketUnicastTxCountAttribute(LongAttributeCallback callback) {
+      readPacketUnicastTxCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeActiveRadioFaultsAttribute(
-        ActiveRadioFaultsAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeActiveRadioFaultsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribePacketUnicastTxCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePacketUnicastTxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readActiveNetworkFaultsAttribute(ActiveNetworkFaultsAttributeCallback callback) {
-      readActiveNetworkFaultsAttribute(chipClusterPtr, callback);
+    public void readCurrentMaxRateAttribute(LongAttributeCallback callback) {
+      readCurrentMaxRateAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeActiveNetworkFaultsAttribute(
-        ActiveNetworkFaultsAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeActiveNetworkFaultsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCurrentMaxRateAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentMaxRateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readTestEventTriggersEnabledAttribute(BooleanAttributeCallback callback) {
-      readTestEventTriggersEnabledAttribute(chipClusterPtr, callback);
+    public void readOverrunCountAttribute(LongAttributeCallback callback) {
+      readOverrunCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeTestEventTriggersEnabledAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTestEventTriggersEnabledAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeOverrunCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeOverrunCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -9256,70 +8453,90 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readNetworkInterfacesAttribute(
-        long chipClusterPtr, NetworkInterfacesAttributeCallback callback);
+    private native void readBssidAttribute(long chipClusterPtr, BssidAttributeCallback callback);
 
-    private native void subscribeNetworkInterfacesAttribute(
+    private native void subscribeBssidAttribute(
+        long chipClusterPtr, BssidAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readSecurityTypeAttribute(
+        long chipClusterPtr, SecurityTypeAttributeCallback callback);
+
+    private native void subscribeSecurityTypeAttribute(
         long chipClusterPtr,
-        NetworkInterfacesAttributeCallback callback,
+        SecurityTypeAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readRebootCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readWiFiVersionAttribute(
+        long chipClusterPtr, WiFiVersionAttributeCallback callback);
 
-    private native void subscribeRebootCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeWiFiVersionAttribute(
+        long chipClusterPtr,
+        WiFiVersionAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void readUpTimeAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    private native void readChannelNumberAttribute(
+        long chipClusterPtr, ChannelNumberAttributeCallback callback);
 
-    private native void subscribeUpTimeAttribute(
+    private native void subscribeChannelNumberAttribute(
+        long chipClusterPtr,
+        ChannelNumberAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readRssiAttribute(long chipClusterPtr, RssiAttributeCallback callback);
+
+    private native void subscribeRssiAttribute(
+        long chipClusterPtr, RssiAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readBeaconLostCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void subscribeBeaconLostCountAttribute(
         long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readTotalOperationalHoursAttribute(
+    private native void readBeaconRxCountAttribute(
         long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeTotalOperationalHoursAttribute(
+    private native void subscribeBeaconRxCountAttribute(
         long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readBootReasonsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readPacketMulticastRxCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeBootReasonsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribePacketMulticastRxCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readActiveHardwareFaultsAttribute(
-        long chipClusterPtr, ActiveHardwareFaultsAttributeCallback callback);
+    private native void readPacketMulticastTxCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeActiveHardwareFaultsAttribute(
-        long chipClusterPtr,
-        ActiveHardwareFaultsAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribePacketMulticastTxCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readActiveRadioFaultsAttribute(
-        long chipClusterPtr, ActiveRadioFaultsAttributeCallback callback);
+    private native void readPacketUnicastRxCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeActiveRadioFaultsAttribute(
-        long chipClusterPtr,
-        ActiveRadioFaultsAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribePacketUnicastRxCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readActiveNetworkFaultsAttribute(
-        long chipClusterPtr, ActiveNetworkFaultsAttributeCallback callback);
+    private native void readPacketUnicastTxCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeActiveNetworkFaultsAttribute(
-        long chipClusterPtr,
-        ActiveNetworkFaultsAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribePacketUnicastTxCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readTestEventTriggersEnabledAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
+    private native void readCurrentMaxRateAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeTestEventTriggersEnabledAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeCurrentMaxRateAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readOverrunCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void subscribeOverrunCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
     private native void readGeneratedCommandListAttribute(
         long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
@@ -9361,105 +8578,48 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class GroupKeyManagementCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 63L;
+  public static class EthernetNetworkDiagnosticsCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 55L;
 
-    public GroupKeyManagementCluster(long devicePtr, int endpointId) {
+    public EthernetNetworkDiagnosticsCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void keySetRead(KeySetReadResponseCallback callback, Integer groupKeySetID) {
-      keySetRead(chipClusterPtr, callback, groupKeySetID, null);
-    }
-
-    public void keySetRead(
-        KeySetReadResponseCallback callback, Integer groupKeySetID, int timedInvokeTimeoutMs) {
-      keySetRead(chipClusterPtr, callback, groupKeySetID, timedInvokeTimeoutMs);
-    }
-
-    public void keySetReadAllIndices(
-        KeySetReadAllIndicesResponseCallback callback, ArrayList<Integer> groupKeySetIDs) {
-      keySetReadAllIndices(chipClusterPtr, callback, groupKeySetIDs, null);
-    }
-
-    public void keySetReadAllIndices(
-        KeySetReadAllIndicesResponseCallback callback,
-        ArrayList<Integer> groupKeySetIDs,
-        int timedInvokeTimeoutMs) {
-      keySetReadAllIndices(chipClusterPtr, callback, groupKeySetIDs, timedInvokeTimeoutMs);
-    }
-
-    public void keySetRemove(DefaultClusterCallback callback, Integer groupKeySetID) {
-      keySetRemove(chipClusterPtr, callback, groupKeySetID, null);
-    }
-
-    public void keySetRemove(
-        DefaultClusterCallback callback, Integer groupKeySetID, int timedInvokeTimeoutMs) {
-      keySetRemove(chipClusterPtr, callback, groupKeySetID, timedInvokeTimeoutMs);
+    public void resetCounts(DefaultClusterCallback callback) {
+      resetCounts(chipClusterPtr, callback, null);
     }
 
-    public void keySetWrite(
-        DefaultClusterCallback callback,
-        ChipStructs.GroupKeyManagementClusterGroupKeySetStruct groupKeySet) {
-      keySetWrite(chipClusterPtr, callback, groupKeySet, null);
-    }
+    public void resetCounts(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
 
-    public void keySetWrite(
-        DefaultClusterCallback callback,
-        ChipStructs.GroupKeyManagementClusterGroupKeySetStruct groupKeySet,
-        int timedInvokeTimeoutMs) {
-      keySetWrite(chipClusterPtr, callback, groupKeySet, timedInvokeTimeoutMs);
+      resetCounts(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    private native void keySetRead(
-        long chipClusterPtr,
-        KeySetReadResponseCallback Callback,
-        Integer groupKeySetID,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void keySetReadAllIndices(
-        long chipClusterPtr,
-        KeySetReadAllIndicesResponseCallback Callback,
-        ArrayList<Integer> groupKeySetIDs,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void keySetRemove(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer groupKeySetID,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void keySetWrite(
+    private native void resetCounts(
         long chipClusterPtr,
         DefaultClusterCallback Callback,
-        ChipStructs.GroupKeyManagementClusterGroupKeySetStruct groupKeySet,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    public interface KeySetReadAllIndicesResponseCallback {
-      void onSuccess(ArrayList<Integer> groupKeySetIDs);
-
-      void onError(Exception error);
-    }
+    public interface PHYRateAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    public interface KeySetReadResponseCallback {
-      void onSuccess(ChipStructs.GroupKeyManagementClusterGroupKeySetStruct groupKeySet);
+      void onError(Exception ex);
 
-      void onError(Exception error);
+      default void onSubscriptionEstablished() {}
     }
 
-    public interface GroupKeyMapAttributeCallback {
-      void onSuccess(List<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct> valueList);
+    public interface FullDuplexAttributeCallback {
+      void onSuccess(@Nullable Boolean value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface GroupTableAttributeCallback {
-      void onSuccess(List<ChipStructs.GroupKeyManagementClusterGroupInfoMapStruct> valueList);
+    public interface CarrierDetectAttributeCallback {
+      void onSuccess(@Nullable Boolean value);
 
       void onError(Exception ex);
 
@@ -9490,53 +8650,85 @@ public interface AttributeListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public void readGroupKeyMapAttribute(GroupKeyMapAttributeCallback callback) {
-      readGroupKeyMapAttribute(chipClusterPtr, callback);
+    public void readPHYRateAttribute(PHYRateAttributeCallback callback) {
+      readPHYRateAttribute(chipClusterPtr, callback);
     }
 
-    public void writeGroupKeyMapAttribute(
-        DefaultClusterCallback callback,
-        ArrayList<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct> value) {
-      writeGroupKeyMapAttribute(chipClusterPtr, callback, value, null);
+    public void subscribePHYRateAttribute(
+        PHYRateAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePHYRateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeGroupKeyMapAttribute(
-        DefaultClusterCallback callback,
-        ArrayList<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct> value,
-        int timedWriteTimeoutMs) {
-      writeGroupKeyMapAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readFullDuplexAttribute(FullDuplexAttributeCallback callback) {
+      readFullDuplexAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeGroupKeyMapAttribute(
-        GroupKeyMapAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGroupKeyMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeFullDuplexAttribute(
+        FullDuplexAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFullDuplexAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readGroupTableAttribute(GroupTableAttributeCallback callback) {
-      readGroupTableAttribute(chipClusterPtr, callback);
+    public void readPacketRxCountAttribute(LongAttributeCallback callback) {
+      readPacketRxCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeGroupTableAttribute(
-        GroupTableAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGroupTableAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribePacketRxCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePacketRxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readMaxGroupsPerFabricAttribute(IntegerAttributeCallback callback) {
-      readMaxGroupsPerFabricAttribute(chipClusterPtr, callback);
+    public void readPacketTxCountAttribute(LongAttributeCallback callback) {
+      readPacketTxCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeMaxGroupsPerFabricAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMaxGroupsPerFabricAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribePacketTxCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePacketTxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readMaxGroupKeysPerFabricAttribute(IntegerAttributeCallback callback) {
-      readMaxGroupKeysPerFabricAttribute(chipClusterPtr, callback);
+    public void readTxErrCountAttribute(LongAttributeCallback callback) {
+      readTxErrCountAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeMaxGroupKeysPerFabricAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMaxGroupKeysPerFabricAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeTxErrCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTxErrCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCollisionCountAttribute(LongAttributeCallback callback) {
+      readCollisionCountAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeCollisionCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCollisionCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOverrunCountAttribute(LongAttributeCallback callback) {
+      readOverrunCountAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeOverrunCountAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeOverrunCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCarrierDetectAttribute(CarrierDetectAttributeCallback callback) {
+      readCarrierDetectAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeCarrierDetectAttribute(
+        CarrierDetectAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCarrierDetectAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readTimeSinceResetAttribute(LongAttributeCallback callback) {
+      readTimeSinceResetAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeTimeSinceResetAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTimeSinceResetAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -9584,41 +8776,65 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readGroupKeyMapAttribute(
-        long chipClusterPtr, GroupKeyMapAttributeCallback callback);
+    private native void readPHYRateAttribute(
+        long chipClusterPtr, PHYRateAttributeCallback callback);
 
-    private native void writeGroupKeyMapAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        ArrayList<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct> value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribePHYRateAttribute(
+        long chipClusterPtr, PHYRateAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeGroupKeyMapAttribute(
+    private native void readFullDuplexAttribute(
+        long chipClusterPtr, FullDuplexAttributeCallback callback);
+
+    private native void subscribeFullDuplexAttribute(
         long chipClusterPtr,
-        GroupKeyMapAttributeCallback callback,
+        FullDuplexAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readGroupTableAttribute(
-        long chipClusterPtr, GroupTableAttributeCallback callback);
+    private native void readPacketRxCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeGroupTableAttribute(
+    private native void subscribePacketRxCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readPacketTxCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void subscribePacketTxCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readTxErrCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void subscribeTxErrCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readCollisionCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void subscribeCollisionCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readOverrunCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void subscribeOverrunCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readCarrierDetectAttribute(
+        long chipClusterPtr, CarrierDetectAttributeCallback callback);
+
+    private native void subscribeCarrierDetectAttribute(
         long chipClusterPtr,
-        GroupTableAttributeCallback callback,
+        CarrierDetectAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readMaxGroupsPerFabricAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeMaxGroupsPerFabricAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMaxGroupKeysPerFabricAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readTimeSinceResetAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeMaxGroupKeysPerFabricAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeTimeSinceResetAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
     private native void readGeneratedCommandListAttribute(
         long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
@@ -9660,172 +8876,190 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class GroupsCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 4L;
+  public static class BridgedDeviceBasicCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 57L;
 
-    public GroupsCluster(long devicePtr, int endpointId) {
+    public BridgedDeviceBasicCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void addGroup(AddGroupResponseCallback callback, Integer groupId, String groupName) {
-      addGroup(chipClusterPtr, callback, groupId, groupName, null);
+    public interface VendorIDAttributeCallback {
+      void onSuccess(Integer value);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void addGroup(
-        AddGroupResponseCallback callback,
-        Integer groupId,
-        String groupName,
-        int timedInvokeTimeoutMs) {
-      addGroup(chipClusterPtr, callback, groupId, groupName, timedInvokeTimeoutMs);
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void addGroupIfIdentifying(
-        DefaultClusterCallback callback, Integer groupId, String groupName) {
-      addGroupIfIdentifying(chipClusterPtr, callback, groupId, groupName, null);
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void addGroupIfIdentifying(
-        DefaultClusterCallback callback,
-        Integer groupId,
-        String groupName,
-        int timedInvokeTimeoutMs) {
-      addGroupIfIdentifying(chipClusterPtr, callback, groupId, groupName, timedInvokeTimeoutMs);
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void getGroupMembership(
-        GetGroupMembershipResponseCallback callback, ArrayList<Integer> groupList) {
-      getGroupMembership(chipClusterPtr, callback, groupList, null);
+    public void readVendorNameAttribute(CharStringAttributeCallback callback) {
+      readVendorNameAttribute(chipClusterPtr, callback);
     }
 
-    public void getGroupMembership(
-        GetGroupMembershipResponseCallback callback,
-        ArrayList<Integer> groupList,
-        int timedInvokeTimeoutMs) {
-      getGroupMembership(chipClusterPtr, callback, groupList, timedInvokeTimeoutMs);
+    public void subscribeVendorNameAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeVendorNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void removeAllGroups(DefaultClusterCallback callback) {
-      removeAllGroups(chipClusterPtr, callback, null);
+    public void readVendorIDAttribute(VendorIDAttributeCallback callback) {
+      readVendorIDAttribute(chipClusterPtr, callback);
     }
 
-    public void removeAllGroups(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+    public void subscribeVendorIDAttribute(
+        VendorIDAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeVendorIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      removeAllGroups(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public void readProductNameAttribute(CharStringAttributeCallback callback) {
+      readProductNameAttribute(chipClusterPtr, callback);
     }
 
-    public void removeGroup(RemoveGroupResponseCallback callback, Integer groupId) {
-      removeGroup(chipClusterPtr, callback, groupId, null);
+    public void subscribeProductNameAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeProductNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void removeGroup(
-        RemoveGroupResponseCallback callback, Integer groupId, int timedInvokeTimeoutMs) {
-      removeGroup(chipClusterPtr, callback, groupId, timedInvokeTimeoutMs);
+    public void readNodeLabelAttribute(CharStringAttributeCallback callback) {
+      readNodeLabelAttribute(chipClusterPtr, callback);
+    }
+
+    public void writeNodeLabelAttribute(DefaultClusterCallback callback, String value) {
+      writeNodeLabelAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNodeLabelAttribute(
+        DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      writeNodeLabelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+
+    public void subscribeNodeLabelAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNodeLabelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void viewGroup(ViewGroupResponseCallback callback, Integer groupId) {
-      viewGroup(chipClusterPtr, callback, groupId, null);
+    public void readHardwareVersionAttribute(IntegerAttributeCallback callback) {
+      readHardwareVersionAttribute(chipClusterPtr, callback);
     }
 
-    public void viewGroup(
-        ViewGroupResponseCallback callback, Integer groupId, int timedInvokeTimeoutMs) {
-      viewGroup(chipClusterPtr, callback, groupId, timedInvokeTimeoutMs);
+    public void subscribeHardwareVersionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeHardwareVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void addGroup(
-        long chipClusterPtr,
-        AddGroupResponseCallback Callback,
-        Integer groupId,
-        String groupName,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void addGroupIfIdentifying(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer groupId,
-        String groupName,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void getGroupMembership(
-        long chipClusterPtr,
-        GetGroupMembershipResponseCallback Callback,
-        ArrayList<Integer> groupList,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void removeAllGroups(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void removeGroup(
-        long chipClusterPtr,
-        RemoveGroupResponseCallback Callback,
-        Integer groupId,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void viewGroup(
-        long chipClusterPtr,
-        ViewGroupResponseCallback Callback,
-        Integer groupId,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void readHardwareVersionStringAttribute(CharStringAttributeCallback callback) {
+      readHardwareVersionStringAttribute(chipClusterPtr, callback);
+    }
 
-    public interface AddGroupResponseCallback {
-      void onSuccess(Integer status, Integer groupId);
+    public void subscribeHardwareVersionStringAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeHardwareVersionStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception error);
+    public void readSoftwareVersionAttribute(LongAttributeCallback callback) {
+      readSoftwareVersionAttribute(chipClusterPtr, callback);
     }
 
-    public interface GetGroupMembershipResponseCallback {
-      void onSuccess(@Nullable Integer capacity, ArrayList<Integer> groupList);
+    public void subscribeSoftwareVersionAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSoftwareVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception error);
+    public void readSoftwareVersionStringAttribute(CharStringAttributeCallback callback) {
+      readSoftwareVersionStringAttribute(chipClusterPtr, callback);
     }
 
-    public interface RemoveGroupResponseCallback {
-      void onSuccess(Integer status, Integer groupId);
+    public void subscribeSoftwareVersionStringAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSoftwareVersionStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception error);
+    public void readManufacturingDateAttribute(CharStringAttributeCallback callback) {
+      readManufacturingDateAttribute(chipClusterPtr, callback);
     }
 
-    public interface ViewGroupResponseCallback {
-      void onSuccess(Integer status, Integer groupId, String groupName);
+    public void subscribeManufacturingDateAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeManufacturingDateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception error);
+    public void readPartNumberAttribute(CharStringAttributeCallback callback) {
+      readPartNumberAttribute(chipClusterPtr, callback);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void subscribePartNumberAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePartNumberAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readProductURLAttribute(CharStringAttributeCallback callback) {
+      readProductURLAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeProductURLAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeProductURLAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void readProductLabelAttribute(CharStringAttributeCallback callback) {
+      readProductLabelAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void subscribeProductLabelAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeProductLabelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readSerialNumberAttribute(CharStringAttributeCallback callback) {
+      readSerialNumberAttribute(chipClusterPtr, callback);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void subscribeSerialNumberAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSerialNumberAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readReachableAttribute(BooleanAttributeCallback callback) {
+      readReachableAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeReachableAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeReachableAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readNameSupportAttribute(IntegerAttributeCallback callback) {
-      readNameSupportAttribute(chipClusterPtr, callback);
+    public void readUniqueIDAttribute(CharStringAttributeCallback callback) {
+      readUniqueIDAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeNameSupportAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNameSupportAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeUniqueIDAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeUniqueIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -9864,20 +9098,143 @@ public void subscribeFeatureMapAttribute(
       subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readVendorNameAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void subscribeVendorNameAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readVendorIDAttribute(
+        long chipClusterPtr, VendorIDAttributeCallback callback);
+
+    private native void subscribeVendorIDAttribute(
+        long chipClusterPtr, VendorIDAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readProductNameAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void subscribeProductNameAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readNodeLabelAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void writeNodeLabelAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        String value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeNodeLabelAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readHardwareVersionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeHardwareVersionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readHardwareVersionStringAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void subscribeHardwareVersionStringAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readSoftwareVersionAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void subscribeSoftwareVersionAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readSoftwareVersionStringAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void subscribeSoftwareVersionStringAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readManufacturingDateAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void subscribeManufacturingDateAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readPartNumberAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void subscribePartNumberAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readProductURLAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void subscribeProductURLAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readProductLabelAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void subscribeProductLabelAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readSerialNumberAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void subscribeSerialNumberAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readReachableAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeReachableAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readNameSupportAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readUniqueIDAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
 
-    private native void subscribeNameSupportAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeUniqueIDAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
     private native void readGeneratedCommandListAttribute(
         long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
@@ -9919,52 +9276,16 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class IdentifyCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 3L;
+  public static class SwitchCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 59L;
 
-    public IdentifyCluster(long devicePtr, int endpointId) {
+    public SwitchCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void identify(DefaultClusterCallback callback, Integer identifyTime) {
-      identify(chipClusterPtr, callback, identifyTime, null);
-    }
-
-    public void identify(
-        DefaultClusterCallback callback, Integer identifyTime, int timedInvokeTimeoutMs) {
-      identify(chipClusterPtr, callback, identifyTime, timedInvokeTimeoutMs);
-    }
-
-    public void triggerEffect(
-        DefaultClusterCallback callback, Integer effectIdentifier, Integer effectVariant) {
-      triggerEffect(chipClusterPtr, callback, effectIdentifier, effectVariant, null);
-    }
-
-    public void triggerEffect(
-        DefaultClusterCallback callback,
-        Integer effectIdentifier,
-        Integer effectVariant,
-        int timedInvokeTimeoutMs) {
-      triggerEffect(
-          chipClusterPtr, callback, effectIdentifier, effectVariant, timedInvokeTimeoutMs);
-    }
-
-    private native void identify(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer identifyTime,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void triggerEffect(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer effectIdentifier,
-        Integer effectVariant,
-        @Nullable Integer timedInvokeTimeoutMs);
-
     public interface GeneratedCommandListAttributeCallback {
       void onSuccess(List<Long> valueList);
 
@@ -9989,31 +9310,31 @@ public interface AttributeListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public void readIdentifyTimeAttribute(IntegerAttributeCallback callback) {
-      readIdentifyTimeAttribute(chipClusterPtr, callback);
+    public void readNumberOfPositionsAttribute(IntegerAttributeCallback callback) {
+      readNumberOfPositionsAttribute(chipClusterPtr, callback);
     }
 
-    public void writeIdentifyTimeAttribute(DefaultClusterCallback callback, Integer value) {
-      writeIdentifyTimeAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeNumberOfPositionsAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNumberOfPositionsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeIdentifyTimeAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeIdentifyTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readCurrentPositionAttribute(IntegerAttributeCallback callback) {
+      readCurrentPositionAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeIdentifyTimeAttribute(
+    public void subscribeCurrentPositionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeIdentifyTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeCurrentPositionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readIdentifyTypeAttribute(IntegerAttributeCallback callback) {
-      readIdentifyTypeAttribute(chipClusterPtr, callback);
+    public void readMultiPressMaxAttribute(IntegerAttributeCallback callback) {
+      readMultiPressMaxAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeIdentifyTypeAttribute(
+    public void subscribeMultiPressMaxAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeIdentifyTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeMultiPressMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -10061,22 +9382,22 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readIdentifyTimeAttribute(
+    private native void readNumberOfPositionsAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeIdentifyTimeAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeNumberOfPositionsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeIdentifyTimeAttribute(
+    private native void readCurrentPositionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeCurrentPositionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readIdentifyTypeAttribute(
+    private native void readMultiPressMaxAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeIdentifyTypeAttribute(
+    private native void subscribeMultiPressMaxAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
     private native void readGeneratedCommandListAttribute(
@@ -10119,42 +9440,69 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class IlluminanceMeasurementCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1024L;
+  public static class AdministratorCommissioningCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 60L;
 
-    public IlluminanceMeasurementCluster(long devicePtr, int endpointId) {
+    public AdministratorCommissioningCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public interface MeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void openCommissioningWindow(
+        DefaultClusterCallback callback,
+        Integer commissioningTimeout,
+        byte[] PAKEVerifier,
+        Integer discriminator,
+        Long iterations,
+        byte[] salt,
+        int timedInvokeTimeoutMs) {
+      openCommissioningWindow(
+          chipClusterPtr,
+          callback,
+          commissioningTimeout,
+          PAKEVerifier,
+          discriminator,
+          iterations,
+          salt,
+          timedInvokeTimeoutMs);
     }
 
-    public interface MinMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public void openBasicCommissioningWindow(
+        DefaultClusterCallback callback, Integer commissioningTimeout, int timedInvokeTimeoutMs) {
+      openBasicCommissioningWindow(
+          chipClusterPtr, callback, commissioningTimeout, timedInvokeTimeoutMs);
+    }
 
-      void onError(Exception ex);
+    public void revokeCommissioning(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
 
-      default void onSubscriptionEstablished() {}
+      revokeCommissioning(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public interface MaxMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    private native void openCommissioningWindow(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer commissioningTimeout,
+        byte[] PAKEVerifier,
+        Integer discriminator,
+        Long iterations,
+        byte[] salt,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-      void onError(Exception ex);
+    private native void openBasicCommissioningWindow(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer commissioningTimeout,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void revokeCommissioning(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public interface LightSensorTypeAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public interface AdminFabricIndexAttributeCallback {
+      void onSuccess(Integer value);
 
       void onError(Exception ex);
 
@@ -10185,49 +9533,31 @@ public interface AttributeListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public void readMeasuredValueAttribute(MeasuredValueAttributeCallback callback) {
-      readMeasuredValueAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeMeasuredValueAttribute(
-        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readMinMeasuredValueAttribute(MinMeasuredValueAttributeCallback callback) {
-      readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    public void readWindowStatusAttribute(IntegerAttributeCallback callback) {
+      readWindowStatusAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeMinMeasuredValueAttribute(
-        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeWindowStatusAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeWindowStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readMaxMeasuredValueAttribute(MaxMeasuredValueAttributeCallback callback) {
-      readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    public void readAdminFabricIndexAttribute(AdminFabricIndexAttributeCallback callback) {
+      readAdminFabricIndexAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeMaxMeasuredValueAttribute(
-        MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAdminFabricIndexAttribute(
+        AdminFabricIndexAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAdminFabricIndexAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readToleranceAttribute(IntegerAttributeCallback callback) {
-      readToleranceAttribute(chipClusterPtr, callback);
+    public void readAdminVendorIdAttribute(IntegerAttributeCallback callback) {
+      readAdminVendorIdAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeToleranceAttribute(
+    public void subscribeAdminVendorIdAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeToleranceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readLightSensorTypeAttribute(LightSensorTypeAttributeCallback callback) {
-      readLightSensorTypeAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeLightSensorTypeAttribute(
-        LightSensorTypeAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeLightSensorTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAdminVendorIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -10270,53 +9600,32 @@ public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readMeasuredValueAttribute(
-        long chipClusterPtr, MeasuredValueAttributeCallback callback);
-
-    private native void subscribeMeasuredValueAttribute(
-        long chipClusterPtr,
-        MeasuredValueAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readMinMeasuredValueAttribute(
-        long chipClusterPtr, MinMeasuredValueAttributeCallback callback);
-
-    private native void subscribeMinMeasuredValueAttribute(
-        long chipClusterPtr,
-        MinMeasuredValueAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readMaxMeasuredValueAttribute(
-        long chipClusterPtr, MaxMeasuredValueAttributeCallback callback);
-
-    private native void subscribeMaxMeasuredValueAttribute(
-        long chipClusterPtr,
-        MaxMeasuredValueAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readToleranceAttribute(
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    private native void readWindowStatusAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeToleranceAttribute(
+    private native void subscribeWindowStatusAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readLightSensorTypeAttribute(
-        long chipClusterPtr, LightSensorTypeAttributeCallback callback);
+    private native void readAdminFabricIndexAttribute(
+        long chipClusterPtr, AdminFabricIndexAttributeCallback callback);
 
-    private native void subscribeLightSensorTypeAttribute(
+    private native void subscribeAdminFabricIndexAttribute(
         long chipClusterPtr,
-        LightSensorTypeAttributeCallback callback,
+        AdminFabricIndexAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
+    private native void readAdminVendorIdAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeAdminVendorIdAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
     private native void readGeneratedCommandListAttribute(
         long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
@@ -10357,620 +9666,618 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class KeypadInputCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1289L;
+  public static class OperationalCredentialsCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 62L;
 
-    public KeypadInputCluster(long devicePtr, int endpointId) {
+    public OperationalCredentialsCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void sendKey(SendKeyResponseCallback callback, Integer keyCode) {
-      sendKey(chipClusterPtr, callback, keyCode, null);
+    public void attestationRequest(AttestationResponseCallback callback, byte[] attestationNonce) {
+      attestationRequest(chipClusterPtr, callback, attestationNonce, null);
     }
 
-    public void sendKey(
-        SendKeyResponseCallback callback, Integer keyCode, int timedInvokeTimeoutMs) {
-      sendKey(chipClusterPtr, callback, keyCode, timedInvokeTimeoutMs);
+    public void attestationRequest(
+        AttestationResponseCallback callback, byte[] attestationNonce, int timedInvokeTimeoutMs) {
+      attestationRequest(chipClusterPtr, callback, attestationNonce, timedInvokeTimeoutMs);
     }
 
-    private native void sendKey(
-        long chipClusterPtr,
-        SendKeyResponseCallback Callback,
-        Integer keyCode,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface SendKeyResponseCallback {
-      void onSuccess(Integer status);
-
-      void onError(Exception error);
+    public void certificateChainRequest(
+        CertificateChainResponseCallback callback, Integer certificateType) {
+      certificateChainRequest(chipClusterPtr, callback, certificateType, null);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void certificateChainRequest(
+        CertificateChainResponseCallback callback,
+        Integer certificateType,
+        int timedInvokeTimeoutMs) {
+      certificateChainRequest(chipClusterPtr, callback, certificateType, timedInvokeTimeoutMs);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void CSRRequest(
+        CSRResponseCallback callback, byte[] CSRNonce, Optional<Boolean> isForUpdateNOC) {
+      CSRRequest(chipClusterPtr, callback, CSRNonce, isForUpdateNOC, null);
+    }
 
-      void onError(Exception ex);
+    public void CSRRequest(
+        CSRResponseCallback callback,
+        byte[] CSRNonce,
+        Optional<Boolean> isForUpdateNOC,
+        int timedInvokeTimeoutMs) {
+      CSRRequest(chipClusterPtr, callback, CSRNonce, isForUpdateNOC, timedInvokeTimeoutMs);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void addNOC(
+        NOCResponseCallback callback,
+        byte[] NOCValue,
+        Optional<byte[]> ICACValue,
+        byte[] IPKValue,
+        Long caseAdminSubject,
+        Integer adminVendorId) {
+      addNOC(
+          chipClusterPtr,
+          callback,
+          NOCValue,
+          ICACValue,
+          IPKValue,
+          caseAdminSubject,
+          adminVendorId,
+          null);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void addNOC(
+        NOCResponseCallback callback,
+        byte[] NOCValue,
+        Optional<byte[]> ICACValue,
+        byte[] IPKValue,
+        Long caseAdminSubject,
+        Integer adminVendorId,
+        int timedInvokeTimeoutMs) {
+      addNOC(
+          chipClusterPtr,
+          callback,
+          NOCValue,
+          ICACValue,
+          IPKValue,
+          caseAdminSubject,
+          adminVendorId,
+          timedInvokeTimeoutMs);
+    }
 
-      void onError(Exception ex);
+    public void updateNOC(
+        NOCResponseCallback callback, byte[] NOCValue, Optional<byte[]> ICACValue) {
+      updateNOC(chipClusterPtr, callback, NOCValue, ICACValue, null);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void updateNOC(
+        NOCResponseCallback callback,
+        byte[] NOCValue,
+        Optional<byte[]> ICACValue,
+        int timedInvokeTimeoutMs) {
+      updateNOC(chipClusterPtr, callback, NOCValue, ICACValue, timedInvokeTimeoutMs);
     }
 
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    public void updateFabricLabel(NOCResponseCallback callback, String label) {
+      updateFabricLabel(chipClusterPtr, callback, label, null);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void updateFabricLabel(
+        NOCResponseCallback callback, String label, int timedInvokeTimeoutMs) {
+      updateFabricLabel(chipClusterPtr, callback, label, timedInvokeTimeoutMs);
     }
 
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    public void removeFabric(NOCResponseCallback callback, Integer fabricIndex) {
+      removeFabric(chipClusterPtr, callback, fabricIndex, null);
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void removeFabric(
+        NOCResponseCallback callback, Integer fabricIndex, int timedInvokeTimeoutMs) {
+      removeFabric(chipClusterPtr, callback, fabricIndex, timedInvokeTimeoutMs);
     }
 
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
+    public void addTrustedRootCertificate(DefaultClusterCallback callback, byte[] rootCertificate) {
+      addTrustedRootCertificate(chipClusterPtr, callback, rootCertificate, null);
     }
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void addTrustedRootCertificate(
+        DefaultClusterCallback callback, byte[] rootCertificate, int timedInvokeTimeoutMs) {
+      addTrustedRootCertificate(chipClusterPtr, callback, rootCertificate, timedInvokeTimeoutMs);
     }
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
+    private native void attestationRequest(
+        long chipClusterPtr,
+        AttestationResponseCallback Callback,
+        byte[] attestationNonce,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void certificateChainRequest(
+        long chipClusterPtr,
+        CertificateChainResponseCallback Callback,
+        Integer certificateType,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void CSRRequest(
+        long chipClusterPtr,
+        CSRResponseCallback Callback,
+        byte[] CSRNonce,
+        Optional<Boolean> isForUpdateNOC,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void addNOC(
+        long chipClusterPtr,
+        NOCResponseCallback Callback,
+        byte[] NOCValue,
+        Optional<byte[]> ICACValue,
+        byte[] IPKValue,
+        Long caseAdminSubject,
+        Integer adminVendorId,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void updateNOC(
+        long chipClusterPtr,
+        NOCResponseCallback Callback,
+        byte[] NOCValue,
+        Optional<byte[]> ICACValue,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void updateFabricLabel(
+        long chipClusterPtr,
+        NOCResponseCallback Callback,
+        String label,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void removeFabric(
+        long chipClusterPtr,
+        NOCResponseCallback Callback,
+        Integer fabricIndex,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void addTrustedRootCertificate(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        byte[] rootCertificate,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    public interface AttestationResponseCallback {
+      void onSuccess(byte[] attestationElements, byte[] signature);
+
+      void onError(Exception error);
     }
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface CertificateChainResponseCallback {
+      void onSuccess(byte[] certificate);
+
+      void onError(Exception error);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
+    public interface CSRResponseCallback {
+      void onSuccess(byte[] NOCSRElements, byte[] attestationSignature);
+
+      void onError(Exception error);
     }
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface NOCResponseCallback {
+      void onSuccess(Integer statusCode, Optional<Integer> fabricIndex, Optional<String> debugText);
+
+      void onError(Exception error);
     }
 
-    private native void readGeneratedCommandListAttribute(
-        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public interface NOCsAttributeCallback {
+      void onSuccess(List<ChipStructs.OperationalCredentialsClusterNOCStruct> valueList);
 
-    private native void subscribeGeneratedCommandListAttribute(
-        long chipClusterPtr,
-        GeneratedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+      void onError(Exception ex);
 
-    private native void readAcceptedCommandListAttribute(
-        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeAcceptedCommandListAttribute(
-        long chipClusterPtr,
-        AcceptedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public interface FabricsAttributeCallback {
+      void onSuccess(List<ChipStructs.OperationalCredentialsClusterFabricDescriptor> valueList);
 
-    private native void readAttributeListAttribute(
-        long chipClusterPtr, AttributeListAttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void subscribeAttributeListAttribute(
-        long chipClusterPtr,
-        AttributeListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public interface TrustedRootCertificatesAttributeCallback {
+      void onSuccess(List<byte[]> valueList);
 
-    private native void subscribeFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public interface CurrentFabricIndexAttributeCallback {
+      void onSuccess(Integer value);
 
-  public static class LevelControlCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 8L;
+      void onError(Exception ex);
 
-    public LevelControlCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      default void onSubscriptionEstablished() {}
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void move(
-        DefaultClusterCallback callback,
-        Integer moveMode,
-        Integer rate,
-        Integer optionMask,
-        Integer optionOverride) {
-      move(chipClusterPtr, callback, moveMode, rate, optionMask, optionOverride, null);
-    }
+      void onError(Exception ex);
 
-    public void move(
-        DefaultClusterCallback callback,
-        Integer moveMode,
-        Integer rate,
-        Integer optionMask,
-        Integer optionOverride,
-        int timedInvokeTimeoutMs) {
-      move(
-          chipClusterPtr,
-          callback,
-          moveMode,
-          rate,
-          optionMask,
-          optionOverride,
-          timedInvokeTimeoutMs);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void moveToLevel(
-        DefaultClusterCallback callback,
-        Integer level,
-        Integer transitionTime,
-        Integer optionMask,
-        Integer optionOverride) {
-      moveToLevel(
-          chipClusterPtr, callback, level, transitionTime, optionMask, optionOverride, null);
-    }
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void moveToLevel(
-        DefaultClusterCallback callback,
-        Integer level,
-        Integer transitionTime,
-        Integer optionMask,
-        Integer optionOverride,
-        int timedInvokeTimeoutMs) {
-      moveToLevel(
-          chipClusterPtr,
-          callback,
-          level,
-          transitionTime,
-          optionMask,
-          optionOverride,
-          timedInvokeTimeoutMs);
-    }
+      void onError(Exception ex);
 
-    public void moveToLevelWithOnOff(
-        DefaultClusterCallback callback, Integer level, Integer transitionTime) {
-      moveToLevelWithOnOff(chipClusterPtr, callback, level, transitionTime, null);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void moveToLevelWithOnOff(
-        DefaultClusterCallback callback,
-        Integer level,
-        Integer transitionTime,
-        int timedInvokeTimeoutMs) {
-      moveToLevelWithOnOff(chipClusterPtr, callback, level, transitionTime, timedInvokeTimeoutMs);
-    }
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void moveWithOnOff(DefaultClusterCallback callback, Integer moveMode, Integer rate) {
-      moveWithOnOff(chipClusterPtr, callback, moveMode, rate, null);
-    }
+      void onError(Exception ex);
 
-    public void moveWithOnOff(
-        DefaultClusterCallback callback, Integer moveMode, Integer rate, int timedInvokeTimeoutMs) {
-      moveWithOnOff(chipClusterPtr, callback, moveMode, rate, timedInvokeTimeoutMs);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void step(
-        DefaultClusterCallback callback,
-        Integer stepMode,
-        Integer stepSize,
-        Integer transitionTime,
-        Integer optionMask,
-        Integer optionOverride) {
-      step(
-          chipClusterPtr,
-          callback,
-          stepMode,
-          stepSize,
-          transitionTime,
-          optionMask,
-          optionOverride,
-          null);
+    public void readNOCsAttribute(NOCsAttributeCallback callback) {
+      readNOCsAttribute(chipClusterPtr, callback);
     }
 
-    public void step(
-        DefaultClusterCallback callback,
-        Integer stepMode,
-        Integer stepSize,
-        Integer transitionTime,
-        Integer optionMask,
-        Integer optionOverride,
-        int timedInvokeTimeoutMs) {
-      step(
-          chipClusterPtr,
-          callback,
-          stepMode,
-          stepSize,
-          transitionTime,
-          optionMask,
-          optionOverride,
-          timedInvokeTimeoutMs);
+    public void subscribeNOCsAttribute(
+        NOCsAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNOCsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void stepWithOnOff(
-        DefaultClusterCallback callback,
-        Integer stepMode,
-        Integer stepSize,
-        Integer transitionTime) {
-      stepWithOnOff(chipClusterPtr, callback, stepMode, stepSize, transitionTime, null);
+    public void readFabricsAttribute(FabricsAttributeCallback callback) {
+      readFabricsAttribute(chipClusterPtr, callback);
     }
 
-    public void stepWithOnOff(
-        DefaultClusterCallback callback,
-        Integer stepMode,
-        Integer stepSize,
-        Integer transitionTime,
-        int timedInvokeTimeoutMs) {
-      stepWithOnOff(
-          chipClusterPtr, callback, stepMode, stepSize, transitionTime, timedInvokeTimeoutMs);
+    public void subscribeFabricsAttribute(
+        FabricsAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFabricsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void stop(DefaultClusterCallback callback, Integer optionMask, Integer optionOverride) {
-      stop(chipClusterPtr, callback, optionMask, optionOverride, null);
+    public void readSupportedFabricsAttribute(IntegerAttributeCallback callback) {
+      readSupportedFabricsAttribute(chipClusterPtr, callback);
     }
 
-    public void stop(
-        DefaultClusterCallback callback,
-        Integer optionMask,
-        Integer optionOverride,
-        int timedInvokeTimeoutMs) {
-      stop(chipClusterPtr, callback, optionMask, optionOverride, timedInvokeTimeoutMs);
+    public void subscribeSupportedFabricsAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSupportedFabricsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void stopWithOnOff(DefaultClusterCallback callback) {
-      stopWithOnOff(chipClusterPtr, callback, null);
+    public void readCommissionedFabricsAttribute(IntegerAttributeCallback callback) {
+      readCommissionedFabricsAttribute(chipClusterPtr, callback);
     }
 
-    public void stopWithOnOff(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-
-      stopWithOnOff(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public void subscribeCommissionedFabricsAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCommissionedFabricsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void move(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer moveMode,
-        Integer rate,
-        Integer optionMask,
-        Integer optionOverride,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void moveToLevel(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer level,
-        Integer transitionTime,
-        Integer optionMask,
-        Integer optionOverride,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void moveToLevelWithOnOff(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer level,
-        Integer transitionTime,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void moveWithOnOff(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer moveMode,
-        Integer rate,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void readTrustedRootCertificatesAttribute(
+        TrustedRootCertificatesAttributeCallback callback) {
+      readTrustedRootCertificatesAttribute(chipClusterPtr, callback);
+    }
 
-    private native void step(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer stepMode,
-        Integer stepSize,
-        Integer transitionTime,
-        Integer optionMask,
-        Integer optionOverride,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeTrustedRootCertificatesAttribute(
+        TrustedRootCertificatesAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTrustedRootCertificatesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void stepWithOnOff(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer stepMode,
-        Integer stepSize,
-        Integer transitionTime,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void readCurrentFabricIndexAttribute(CurrentFabricIndexAttributeCallback callback) {
+      readCurrentFabricIndexAttribute(chipClusterPtr, callback);
+    }
 
-    private native void stop(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer optionMask,
-        Integer optionOverride,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeCurrentFabricIndexAttribute(
+        CurrentFabricIndexAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentFabricIndexAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void stopWithOnOff(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
 
-    public interface OnLevelAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface OnTransitionTimeAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public interface OffTransitionTimeAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface DefaultMoveRateAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    private native void readNOCsAttribute(long chipClusterPtr, NOCsAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void subscribeNOCsAttribute(
+        long chipClusterPtr, NOCsAttributeCallback callback, int minInterval, int maxInterval);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void readFabricsAttribute(
+        long chipClusterPtr, FabricsAttributeCallback callback);
 
-    public interface StartUpCurrentLevelAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    private native void subscribeFabricsAttribute(
+        long chipClusterPtr, FabricsAttributeCallback callback, int minInterval, int maxInterval);
 
-      void onError(Exception ex);
+    private native void readSupportedFabricsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeSupportedFabricsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void readCommissionedFabricsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void subscribeCommissionedFabricsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void readTrustedRootCertificatesAttribute(
+        long chipClusterPtr, TrustedRootCertificatesAttributeCallback callback);
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void subscribeTrustedRootCertificatesAttribute(
+        long chipClusterPtr,
+        TrustedRootCertificatesAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-      void onError(Exception ex);
+    private native void readCurrentFabricIndexAttribute(
+        long chipClusterPtr, CurrentFabricIndexAttributeCallback callback);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeCurrentFabricIndexAttribute(
+        long chipClusterPtr,
+        CurrentFabricIndexAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void readGeneratedCommandListAttribute(
+        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void subscribeGeneratedCommandListAttribute(
+        long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void readAcceptedCommandListAttribute(
+        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
 
-    public void readCurrentLevelAttribute(IntegerAttributeCallback callback) {
-      readCurrentLevelAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeAcceptedCommandListAttribute(
+        long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void subscribeCurrentLevelAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readAttributeListAttribute(
+        long chipClusterPtr, AttributeListAttributeCallback callback);
 
-    public void readRemainingTimeAttribute(IntegerAttributeCallback callback) {
-      readRemainingTimeAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeAttributeListAttribute(
+        long chipClusterPtr,
+        AttributeListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void subscribeRemainingTimeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRemainingTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void readMinLevelAttribute(IntegerAttributeCallback callback) {
-      readMinLevelAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void subscribeMinLevelAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMinLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void readMaxLevelAttribute(IntegerAttributeCallback callback) {
-      readMaxLevelAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
 
-    public void subscribeMaxLevelAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMaxLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+  public static class GroupKeyManagementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 63L;
 
-    public void readCurrentFrequencyAttribute(IntegerAttributeCallback callback) {
-      readCurrentFrequencyAttribute(chipClusterPtr, callback);
+    public GroupKeyManagementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
     }
 
-    public void subscribeCurrentFrequencyAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentFrequencyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void keySetWrite(
+        DefaultClusterCallback callback,
+        ChipStructs.GroupKeyManagementClusterGroupKeySetStruct groupKeySet) {
+      keySetWrite(chipClusterPtr, callback, groupKeySet, null);
     }
 
-    public void readMinFrequencyAttribute(IntegerAttributeCallback callback) {
-      readMinFrequencyAttribute(chipClusterPtr, callback);
+    public void keySetWrite(
+        DefaultClusterCallback callback,
+        ChipStructs.GroupKeyManagementClusterGroupKeySetStruct groupKeySet,
+        int timedInvokeTimeoutMs) {
+      keySetWrite(chipClusterPtr, callback, groupKeySet, timedInvokeTimeoutMs);
     }
 
-    public void subscribeMinFrequencyAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMinFrequencyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void keySetRead(KeySetReadResponseCallback callback, Integer groupKeySetID) {
+      keySetRead(chipClusterPtr, callback, groupKeySetID, null);
     }
 
-    public void readMaxFrequencyAttribute(IntegerAttributeCallback callback) {
-      readMaxFrequencyAttribute(chipClusterPtr, callback);
+    public void keySetRead(
+        KeySetReadResponseCallback callback, Integer groupKeySetID, int timedInvokeTimeoutMs) {
+      keySetRead(chipClusterPtr, callback, groupKeySetID, timedInvokeTimeoutMs);
     }
 
-    public void subscribeMaxFrequencyAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMaxFrequencyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void keySetRemove(DefaultClusterCallback callback, Integer groupKeySetID) {
+      keySetRemove(chipClusterPtr, callback, groupKeySetID, null);
     }
 
-    public void readOptionsAttribute(IntegerAttributeCallback callback) {
-      readOptionsAttribute(chipClusterPtr, callback);
+    public void keySetRemove(
+        DefaultClusterCallback callback, Integer groupKeySetID, int timedInvokeTimeoutMs) {
+      keySetRemove(chipClusterPtr, callback, groupKeySetID, timedInvokeTimeoutMs);
     }
 
-    public void writeOptionsAttribute(DefaultClusterCallback callback, Integer value) {
-      writeOptionsAttribute(chipClusterPtr, callback, value, null);
+    public void keySetReadAllIndices(
+        KeySetReadAllIndicesResponseCallback callback, ArrayList<Integer> groupKeySetIDs) {
+      keySetReadAllIndices(chipClusterPtr, callback, groupKeySetIDs, null);
     }
 
-    public void writeOptionsAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeOptionsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void keySetReadAllIndices(
+        KeySetReadAllIndicesResponseCallback callback,
+        ArrayList<Integer> groupKeySetIDs,
+        int timedInvokeTimeoutMs) {
+      keySetReadAllIndices(chipClusterPtr, callback, groupKeySetIDs, timedInvokeTimeoutMs);
     }
 
-    public void subscribeOptionsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeOptionsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    private native void keySetWrite(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        ChipStructs.GroupKeyManagementClusterGroupKeySetStruct groupKeySet,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void keySetRead(
+        long chipClusterPtr,
+        KeySetReadResponseCallback Callback,
+        Integer groupKeySetID,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void keySetRemove(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer groupKeySetID,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void keySetReadAllIndices(
+        long chipClusterPtr,
+        KeySetReadAllIndicesResponseCallback Callback,
+        ArrayList<Integer> groupKeySetIDs,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    public interface KeySetReadResponseCallback {
+      void onSuccess(ChipStructs.GroupKeyManagementClusterGroupKeySetStruct groupKeySet);
+
+      void onError(Exception error);
     }
 
-    public void readOnOffTransitionTimeAttribute(IntegerAttributeCallback callback) {
-      readOnOffTransitionTimeAttribute(chipClusterPtr, callback);
+    public interface KeySetReadAllIndicesResponseCallback {
+      void onSuccess(ArrayList<Integer> groupKeySetIDs);
+
+      void onError(Exception error);
     }
 
-    public void writeOnOffTransitionTimeAttribute(DefaultClusterCallback callback, Integer value) {
-      writeOnOffTransitionTimeAttribute(chipClusterPtr, callback, value, null);
-    }
+    public interface GroupKeyMapAttributeCallback {
+      void onSuccess(List<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct> valueList);
 
-    public void writeOnOffTransitionTimeAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeOnOffTransitionTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+      void onError(Exception ex);
 
-    public void subscribeOnOffTransitionTimeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeOnOffTransitionTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readOnLevelAttribute(OnLevelAttributeCallback callback) {
-      readOnLevelAttribute(chipClusterPtr, callback);
-    }
+    public interface GroupTableAttributeCallback {
+      void onSuccess(List<ChipStructs.GroupKeyManagementClusterGroupInfoMapStruct> valueList);
 
-    public void writeOnLevelAttribute(DefaultClusterCallback callback, Integer value) {
-      writeOnLevelAttribute(chipClusterPtr, callback, value, null);
-    }
+      void onError(Exception ex);
 
-    public void writeOnLevelAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeOnLevelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeOnLevelAttribute(
-        OnLevelAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeOnLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void readOnTransitionTimeAttribute(OnTransitionTimeAttributeCallback callback) {
-      readOnTransitionTimeAttribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void writeOnTransitionTimeAttribute(DefaultClusterCallback callback, Integer value) {
-      writeOnTransitionTimeAttribute(chipClusterPtr, callback, value, null);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeOnTransitionTimeAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeOnTransitionTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void subscribeOnTransitionTimeAttribute(
-        OnTransitionTimeAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeOnTransitionTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readOffTransitionTimeAttribute(OffTransitionTimeAttributeCallback callback) {
-      readOffTransitionTimeAttribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeOffTransitionTimeAttribute(DefaultClusterCallback callback, Integer value) {
-      writeOffTransitionTimeAttribute(chipClusterPtr, callback, value, null);
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeOffTransitionTimeAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeOffTransitionTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readGroupKeyMapAttribute(GroupKeyMapAttributeCallback callback) {
+      readGroupKeyMapAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeOffTransitionTimeAttribute(
-        OffTransitionTimeAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeOffTransitionTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeGroupKeyMapAttribute(
+        DefaultClusterCallback callback,
+        ArrayList<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct> value) {
+      writeGroupKeyMapAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readDefaultMoveRateAttribute(DefaultMoveRateAttributeCallback callback) {
-      readDefaultMoveRateAttribute(chipClusterPtr, callback);
+    public void writeGroupKeyMapAttribute(
+        DefaultClusterCallback callback,
+        ArrayList<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct> value,
+        int timedWriteTimeoutMs) {
+      writeGroupKeyMapAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void writeDefaultMoveRateAttribute(DefaultClusterCallback callback, Integer value) {
-      writeDefaultMoveRateAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeGroupKeyMapAttribute(
+        GroupKeyMapAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGroupKeyMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeDefaultMoveRateAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeDefaultMoveRateAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readGroupTableAttribute(GroupTableAttributeCallback callback) {
+      readGroupTableAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeDefaultMoveRateAttribute(
-        DefaultMoveRateAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeDefaultMoveRateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeGroupTableAttribute(
+        GroupTableAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGroupTableAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readStartUpCurrentLevelAttribute(StartUpCurrentLevelAttributeCallback callback) {
-      readStartUpCurrentLevelAttribute(chipClusterPtr, callback);
+    public void readMaxGroupsPerFabricAttribute(IntegerAttributeCallback callback) {
+      readMaxGroupsPerFabricAttribute(chipClusterPtr, callback);
     }
 
-    public void writeStartUpCurrentLevelAttribute(DefaultClusterCallback callback, Integer value) {
-      writeStartUpCurrentLevelAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeMaxGroupsPerFabricAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMaxGroupsPerFabricAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeStartUpCurrentLevelAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeStartUpCurrentLevelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readMaxGroupKeysPerFabricAttribute(IntegerAttributeCallback callback) {
+      readMaxGroupKeysPerFabricAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeStartUpCurrentLevelAttribute(
-        StartUpCurrentLevelAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeStartUpCurrentLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeMaxGroupKeysPerFabricAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMaxGroupKeysPerFabricAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -11018,143 +10325,183 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readCurrentLevelAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readGroupKeyMapAttribute(
+        long chipClusterPtr, GroupKeyMapAttributeCallback callback);
 
-    private native void subscribeCurrentLevelAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void writeGroupKeyMapAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        ArrayList<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct> value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readRemainingTimeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeGroupKeyMapAttribute(
+        long chipClusterPtr,
+        GroupKeyMapAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void subscribeRemainingTimeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void readGroupTableAttribute(
+        long chipClusterPtr, GroupTableAttributeCallback callback);
 
-    private native void readMinLevelAttribute(
+    private native void subscribeGroupTableAttribute(
+        long chipClusterPtr,
+        GroupTableAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readMaxGroupsPerFabricAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeMinLevelAttribute(
+    private native void subscribeMaxGroupsPerFabricAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readMaxLevelAttribute(
+    private native void readMaxGroupKeysPerFabricAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeMaxLevelAttribute(
+    private native void subscribeMaxGroupKeysPerFabricAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readCurrentFrequencyAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readGeneratedCommandListAttribute(
+        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
-    private native void subscribeCurrentFrequencyAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeGeneratedCommandListAttribute(
+        long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void readMinFrequencyAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readAcceptedCommandListAttribute(
+        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
 
-    private native void subscribeMinFrequencyAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeAcceptedCommandListAttribute(
+        long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void readMaxFrequencyAttribute(
+    private native void readAttributeListAttribute(
+        long chipClusterPtr, AttributeListAttributeCallback callback);
+
+    private native void subscribeAttributeListAttribute(
+        long chipClusterPtr,
+        AttributeListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void subscribeFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeMaxFrequencyAttribute(
+    private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
 
-    private native void readOptionsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  public static class FixedLabelCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 64L;
 
-    private native void writeOptionsAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public FixedLabelCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
 
-    private native void subscribeOptionsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
 
-    private native void readOnOffTransitionTimeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface LabelListAttributeCallback {
+      void onSuccess(List<ChipStructs.FixedLabelClusterLabelStruct> valueList);
 
-    private native void writeOnOffTransitionTimeAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+      void onError(Exception ex);
 
-    private native void subscribeOnOffTransitionTimeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readOnLevelAttribute(
-        long chipClusterPtr, OnLevelAttributeCallback callback);
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void writeOnLevelAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
+    }
+
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
+    }
+
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
+    }
+
+    public void readLabelListAttribute(LabelListAttributeCallback callback) {
+      readLabelListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeOnLevelAttribute(
-        long chipClusterPtr, OnLevelAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeLabelListAttribute(
+        LabelListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeLabelListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readOnTransitionTimeAttribute(
-        long chipClusterPtr, OnTransitionTimeAttributeCallback callback);
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void writeOnTransitionTimeAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeOnTransitionTimeAttribute(
-        long chipClusterPtr,
-        OnTransitionTimeAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readOffTransitionTimeAttribute(
-        long chipClusterPtr, OffTransitionTimeAttributeCallback callback);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void writeOffTransitionTimeAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeOffTransitionTimeAttribute(
-        long chipClusterPtr,
-        OffTransitionTimeAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readDefaultMoveRateAttribute(
-        long chipClusterPtr, DefaultMoveRateAttributeCallback callback);
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
 
-    private native void writeDefaultMoveRateAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeDefaultMoveRateAttribute(
-        long chipClusterPtr,
-        DefaultMoveRateAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readStartUpCurrentLevelAttribute(
-        long chipClusterPtr, StartUpCurrentLevelAttributeCallback callback);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void writeStartUpCurrentLevelAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void readLabelListAttribute(
+        long chipClusterPtr, LabelListAttributeCallback callback);
 
-    private native void subscribeStartUpCurrentLevelAttribute(
-        long chipClusterPtr,
-        StartUpCurrentLevelAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeLabelListAttribute(
+        long chipClusterPtr, LabelListAttributeCallback callback, int minInterval, int maxInterval);
 
     private native void readGeneratedCommandListAttribute(
         long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
@@ -11196,18 +10543,18 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class LocalizationConfigurationCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 43L;
+  public static class UserLabelCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 65L;
 
-    public LocalizationConfigurationCluster(long devicePtr, int endpointId) {
+    public UserLabelCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public interface SupportedLocalesAttributeCallback {
-      void onSuccess(List<String> valueList);
+    public interface LabelListAttributeCallback {
+      void onSuccess(List<ChipStructs.UserLabelClusterLabelStruct> valueList);
 
       void onError(Exception ex);
 
@@ -11230,31 +10577,25 @@ public interface AcceptedCommandListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public void readActiveLocaleAttribute(CharStringAttributeCallback callback) {
-      readActiveLocaleAttribute(chipClusterPtr, callback);
-    }
-
-    public void writeActiveLocaleAttribute(DefaultClusterCallback callback, String value) {
-      writeActiveLocaleAttribute(chipClusterPtr, callback, value, null);
-    }
-
-    public void writeActiveLocaleAttribute(
-        DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
-      writeActiveLocaleAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readLabelListAttribute(LabelListAttributeCallback callback) {
+      readLabelListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeActiveLocaleAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeActiveLocaleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeLabelListAttribute(
+        DefaultClusterCallback callback, ArrayList<ChipStructs.UserLabelClusterLabelStruct> value) {
+      writeLabelListAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readSupportedLocalesAttribute(SupportedLocalesAttributeCallback callback) {
-      readSupportedLocalesAttribute(chipClusterPtr, callback);
+    public void writeLabelListAttribute(
+        DefaultClusterCallback callback,
+        ArrayList<ChipStructs.UserLabelClusterLabelStruct> value,
+        int timedWriteTimeoutMs) {
+      writeLabelListAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeSupportedLocalesAttribute(
-        SupportedLocalesAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSupportedLocalesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeLabelListAttribute(
+        LabelListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeLabelListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -11293,29 +10634,17 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readActiveLocaleAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
+    private native void readLabelListAttribute(
+        long chipClusterPtr, LabelListAttributeCallback callback);
 
-    private native void writeActiveLocaleAttribute(
+    private native void writeLabelListAttribute(
         long chipClusterPtr,
         DefaultClusterCallback callback,
-        String value,
+        ArrayList<ChipStructs.UserLabelClusterLabelStruct> value,
         @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeActiveLocaleAttribute(
-        long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readSupportedLocalesAttribute(
-        long chipClusterPtr, SupportedLocalesAttributeCallback callback);
-
-    private native void subscribeSupportedLocalesAttribute(
-        long chipClusterPtr,
-        SupportedLocalesAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeLabelListAttribute(
+        long chipClusterPtr, LabelListAttributeCallback callback, int minInterval, int maxInterval);
 
     private native void readGeneratedCommandListAttribute(
         long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
@@ -11348,30 +10677,16 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class LowPowerCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1288L;
+  public static class BooleanStateCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 69L;
 
-    public LowPowerCluster(long devicePtr, int endpointId) {
+    public BooleanStateCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void sleep(DefaultClusterCallback callback) {
-      sleep(chipClusterPtr, callback, null);
-    }
-
-    public void sleep(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-
-      sleep(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
-
-    private native void sleep(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        @Nullable Integer timedInvokeTimeoutMs);
-
     public interface GeneratedCommandListAttributeCallback {
       void onSuccess(List<Long> valueList);
 
@@ -11396,6 +10711,15 @@ public interface AttributeListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
+    public void readStateValueAttribute(BooleanAttributeCallback callback) {
+      readStateValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeStateValueAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeStateValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
       readGeneratedCommandListAttribute(chipClusterPtr, callback);
     }
@@ -11441,6 +10765,12 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
+    private native void readStateValueAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
+
+    private native void subscribeStateValueAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+
     private native void readGeneratedCommandListAttribute(
         long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
@@ -11481,77 +10811,57 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class MediaInputCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1287L;
+  public static class ModeSelectCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 80L;
 
-    public MediaInputCluster(long devicePtr, int endpointId) {
+    public ModeSelectCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void hideInputStatus(DefaultClusterCallback callback) {
-      hideInputStatus(chipClusterPtr, callback, null);
-    }
-
-    public void hideInputStatus(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-
-      hideInputStatus(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
-
-    public void renameInput(DefaultClusterCallback callback, Integer index, String name) {
-      renameInput(chipClusterPtr, callback, index, name, null);
-    }
-
-    public void renameInput(
-        DefaultClusterCallback callback, Integer index, String name, int timedInvokeTimeoutMs) {
-      renameInput(chipClusterPtr, callback, index, name, timedInvokeTimeoutMs);
+    public void changeToMode(DefaultClusterCallback callback, Integer newMode) {
+      changeToMode(chipClusterPtr, callback, newMode, null);
     }
 
-    public void selectInput(DefaultClusterCallback callback, Integer index) {
-      selectInput(chipClusterPtr, callback, index, null);
+    public void changeToMode(
+        DefaultClusterCallback callback, Integer newMode, int timedInvokeTimeoutMs) {
+      changeToMode(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs);
     }
 
-    public void selectInput(
-        DefaultClusterCallback callback, Integer index, int timedInvokeTimeoutMs) {
-      selectInput(chipClusterPtr, callback, index, timedInvokeTimeoutMs);
-    }
+    private native void changeToMode(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer newMode,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void showInputStatus(DefaultClusterCallback callback) {
-      showInputStatus(chipClusterPtr, callback, null);
-    }
+    public interface StandardNamespaceAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    public void showInputStatus(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      void onError(Exception ex);
 
-      showInputStatus(chipClusterPtr, callback, timedInvokeTimeoutMs);
+      default void onSubscriptionEstablished() {}
     }
 
-    private native void hideInputStatus(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public interface SupportedModesAttributeCallback {
+      void onSuccess(List<ChipStructs.ModeSelectClusterModeOptionStruct> valueList);
 
-    private native void renameInput(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer index,
-        String name,
-        @Nullable Integer timedInvokeTimeoutMs);
+      void onError(Exception ex);
 
-    private native void selectInput(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer index,
-        @Nullable Integer timedInvokeTimeoutMs);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void showInputStatus(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public interface StartUpModeAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    public interface InputListAttributeCallback {
-      void onSuccess(List<ChipStructs.MediaInputClusterInputInfo> valueList);
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
+    }
+
+    public interface OnModeAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
 
@@ -11582,22 +10892,76 @@ public interface AttributeListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public void readInputListAttribute(InputListAttributeCallback callback) {
-      readInputListAttribute(chipClusterPtr, callback);
+    public void readDescriptionAttribute(CharStringAttributeCallback callback) {
+      readDescriptionAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeInputListAttribute(
-        InputListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeInputListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeDescriptionAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeDescriptionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readCurrentInputAttribute(IntegerAttributeCallback callback) {
-      readCurrentInputAttribute(chipClusterPtr, callback);
+    public void readStandardNamespaceAttribute(StandardNamespaceAttributeCallback callback) {
+      readStandardNamespaceAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentInputAttribute(
+    public void subscribeStandardNamespaceAttribute(
+        StandardNamespaceAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeStandardNamespaceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSupportedModesAttribute(SupportedModesAttributeCallback callback) {
+      readSupportedModesAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeSupportedModesAttribute(
+        SupportedModesAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSupportedModesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentModeAttribute(IntegerAttributeCallback callback) {
+      readCurrentModeAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeCurrentModeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentInputAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeCurrentModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readStartUpModeAttribute(StartUpModeAttributeCallback callback) {
+      readStartUpModeAttribute(chipClusterPtr, callback);
+    }
+
+    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeStartUpModeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeStartUpModeAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeStartUpModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+
+    public void subscribeStartUpModeAttribute(
+        StartUpModeAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeStartUpModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readOnModeAttribute(OnModeAttributeCallback callback) {
+      readOnModeAttribute(chipClusterPtr, callback);
+    }
+
+    public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOnModeAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeOnModeAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOnModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+
+    public void subscribeOnModeAttribute(
+        OnModeAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeOnModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -11645,18 +11009,65 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readInputListAttribute(
-        long chipClusterPtr, InputListAttributeCallback callback);
+    private native void readDescriptionAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
 
-    private native void subscribeInputListAttribute(
-        long chipClusterPtr, InputListAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeDescriptionAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void readCurrentInputAttribute(
+    private native void readStandardNamespaceAttribute(
+        long chipClusterPtr, StandardNamespaceAttributeCallback callback);
+
+    private native void subscribeStandardNamespaceAttribute(
+        long chipClusterPtr,
+        StandardNamespaceAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readSupportedModesAttribute(
+        long chipClusterPtr, SupportedModesAttributeCallback callback);
+
+    private native void subscribeSupportedModesAttribute(
+        long chipClusterPtr,
+        SupportedModesAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readCurrentModeAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeCurrentInputAttribute(
+    private native void subscribeCurrentModeAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
+    private native void readStartUpModeAttribute(
+        long chipClusterPtr, StartUpModeAttributeCallback callback);
+
+    private native void writeStartUpModeAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeStartUpModeAttribute(
+        long chipClusterPtr,
+        StartUpModeAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readOnModeAttribute(long chipClusterPtr, OnModeAttributeCallback callback);
+
+    private native void writeOnModeAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeOnModeAttribute(
+        long chipClusterPtr, OnModeAttributeCallback callback, int minInterval, int maxInterval);
+
     private native void readGeneratedCommandListAttribute(
         long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
@@ -11697,208 +11108,506 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class MediaPlaybackCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1286L;
+  public static class DoorLockCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 257L;
 
-    public MediaPlaybackCluster(long devicePtr, int endpointId) {
+    public DoorLockCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void fastForward(PlaybackResponseCallback callback) {
-      fastForward(chipClusterPtr, callback, null);
+    public void lockDoor(
+        DefaultClusterCallback callback, Optional<byte[]> pinCode, int timedInvokeTimeoutMs) {
+      lockDoor(chipClusterPtr, callback, pinCode, timedInvokeTimeoutMs);
     }
 
-    public void fastForward(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
+    public void unlockDoor(
+        DefaultClusterCallback callback, Optional<byte[]> pinCode, int timedInvokeTimeoutMs) {
+      unlockDoor(chipClusterPtr, callback, pinCode, timedInvokeTimeoutMs);
+    }
 
-      fastForward(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public void unlockWithTimeout(
+        DefaultClusterCallback callback,
+        Integer timeout,
+        Optional<byte[]> pinCode,
+        int timedInvokeTimeoutMs) {
+      unlockWithTimeout(chipClusterPtr, callback, timeout, pinCode, timedInvokeTimeoutMs);
+    }
+
+    public void setWeekDaySchedule(
+        DefaultClusterCallback callback,
+        Integer weekDayIndex,
+        Integer userIndex,
+        Integer daysMask,
+        Integer startHour,
+        Integer startMinute,
+        Integer endHour,
+        Integer endMinute) {
+      setWeekDaySchedule(
+          chipClusterPtr,
+          callback,
+          weekDayIndex,
+          userIndex,
+          daysMask,
+          startHour,
+          startMinute,
+          endHour,
+          endMinute,
+          null);
+    }
+
+    public void setWeekDaySchedule(
+        DefaultClusterCallback callback,
+        Integer weekDayIndex,
+        Integer userIndex,
+        Integer daysMask,
+        Integer startHour,
+        Integer startMinute,
+        Integer endHour,
+        Integer endMinute,
+        int timedInvokeTimeoutMs) {
+      setWeekDaySchedule(
+          chipClusterPtr,
+          callback,
+          weekDayIndex,
+          userIndex,
+          daysMask,
+          startHour,
+          startMinute,
+          endHour,
+          endMinute,
+          timedInvokeTimeoutMs);
+    }
+
+    public void getWeekDaySchedule(
+        GetWeekDayScheduleResponseCallback callback, Integer weekDayIndex, Integer userIndex) {
+      getWeekDaySchedule(chipClusterPtr, callback, weekDayIndex, userIndex, null);
+    }
+
+    public void getWeekDaySchedule(
+        GetWeekDayScheduleResponseCallback callback,
+        Integer weekDayIndex,
+        Integer userIndex,
+        int timedInvokeTimeoutMs) {
+      getWeekDaySchedule(chipClusterPtr, callback, weekDayIndex, userIndex, timedInvokeTimeoutMs);
+    }
+
+    public void clearWeekDaySchedule(
+        DefaultClusterCallback callback, Integer weekDayIndex, Integer userIndex) {
+      clearWeekDaySchedule(chipClusterPtr, callback, weekDayIndex, userIndex, null);
+    }
+
+    public void clearWeekDaySchedule(
+        DefaultClusterCallback callback,
+        Integer weekDayIndex,
+        Integer userIndex,
+        int timedInvokeTimeoutMs) {
+      clearWeekDaySchedule(chipClusterPtr, callback, weekDayIndex, userIndex, timedInvokeTimeoutMs);
+    }
+
+    public void setYearDaySchedule(
+        DefaultClusterCallback callback,
+        Integer yearDayIndex,
+        Integer userIndex,
+        Long localStartTime,
+        Long localEndTime) {
+      setYearDaySchedule(
+          chipClusterPtr, callback, yearDayIndex, userIndex, localStartTime, localEndTime, null);
     }
 
-    public void next(PlaybackResponseCallback callback) {
-      next(chipClusterPtr, callback, null);
+    public void setYearDaySchedule(
+        DefaultClusterCallback callback,
+        Integer yearDayIndex,
+        Integer userIndex,
+        Long localStartTime,
+        Long localEndTime,
+        int timedInvokeTimeoutMs) {
+      setYearDaySchedule(
+          chipClusterPtr,
+          callback,
+          yearDayIndex,
+          userIndex,
+          localStartTime,
+          localEndTime,
+          timedInvokeTimeoutMs);
     }
 
-    public void next(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
-
-      next(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public void getYearDaySchedule(
+        GetYearDayScheduleResponseCallback callback, Integer yearDayIndex, Integer userIndex) {
+      getYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex, null);
     }
 
-    public void pause(PlaybackResponseCallback callback) {
-      pause(chipClusterPtr, callback, null);
+    public void getYearDaySchedule(
+        GetYearDayScheduleResponseCallback callback,
+        Integer yearDayIndex,
+        Integer userIndex,
+        int timedInvokeTimeoutMs) {
+      getYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex, timedInvokeTimeoutMs);
     }
 
-    public void pause(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
-
-      pause(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public void clearYearDaySchedule(
+        DefaultClusterCallback callback, Integer yearDayIndex, Integer userIndex) {
+      clearYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex, null);
     }
 
-    public void play(PlaybackResponseCallback callback) {
-      play(chipClusterPtr, callback, null);
+    public void clearYearDaySchedule(
+        DefaultClusterCallback callback,
+        Integer yearDayIndex,
+        Integer userIndex,
+        int timedInvokeTimeoutMs) {
+      clearYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex, timedInvokeTimeoutMs);
     }
 
-    public void play(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
-
-      play(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public void setHolidaySchedule(
+        DefaultClusterCallback callback,
+        Integer holidayIndex,
+        Long localStartTime,
+        Long localEndTime,
+        Integer operatingMode) {
+      setHolidaySchedule(
+          chipClusterPtr,
+          callback,
+          holidayIndex,
+          localStartTime,
+          localEndTime,
+          operatingMode,
+          null);
     }
 
-    public void previous(PlaybackResponseCallback callback) {
-      previous(chipClusterPtr, callback, null);
+    public void setHolidaySchedule(
+        DefaultClusterCallback callback,
+        Integer holidayIndex,
+        Long localStartTime,
+        Long localEndTime,
+        Integer operatingMode,
+        int timedInvokeTimeoutMs) {
+      setHolidaySchedule(
+          chipClusterPtr,
+          callback,
+          holidayIndex,
+          localStartTime,
+          localEndTime,
+          operatingMode,
+          timedInvokeTimeoutMs);
     }
 
-    public void previous(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
+    public void getHolidaySchedule(
+        GetHolidayScheduleResponseCallback callback, Integer holidayIndex) {
+      getHolidaySchedule(chipClusterPtr, callback, holidayIndex, null);
+    }
 
-      previous(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public void getHolidaySchedule(
+        GetHolidayScheduleResponseCallback callback,
+        Integer holidayIndex,
+        int timedInvokeTimeoutMs) {
+      getHolidaySchedule(chipClusterPtr, callback, holidayIndex, timedInvokeTimeoutMs);
     }
 
-    public void rewind(PlaybackResponseCallback callback) {
-      rewind(chipClusterPtr, callback, null);
+    public void clearHolidaySchedule(DefaultClusterCallback callback, Integer holidayIndex) {
+      clearHolidaySchedule(chipClusterPtr, callback, holidayIndex, null);
     }
 
-    public void rewind(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
+    public void clearHolidaySchedule(
+        DefaultClusterCallback callback, Integer holidayIndex, int timedInvokeTimeoutMs) {
+      clearHolidaySchedule(chipClusterPtr, callback, holidayIndex, timedInvokeTimeoutMs);
+    }
 
-      rewind(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public void setUser(
+        DefaultClusterCallback callback,
+        Integer operationType,
+        Integer userIndex,
+        @Nullable String userName,
+        @Nullable Long userUniqueId,
+        @Nullable Integer userStatus,
+        @Nullable Integer userType,
+        @Nullable Integer credentialRule,
+        int timedInvokeTimeoutMs) {
+      setUser(
+          chipClusterPtr,
+          callback,
+          operationType,
+          userIndex,
+          userName,
+          userUniqueId,
+          userStatus,
+          userType,
+          credentialRule,
+          timedInvokeTimeoutMs);
     }
 
-    public void seek(PlaybackResponseCallback callback, Long position) {
-      seek(chipClusterPtr, callback, position, null);
+    public void getUser(GetUserResponseCallback callback, Integer userIndex) {
+      getUser(chipClusterPtr, callback, userIndex, null);
     }
 
-    public void seek(PlaybackResponseCallback callback, Long position, int timedInvokeTimeoutMs) {
-      seek(chipClusterPtr, callback, position, timedInvokeTimeoutMs);
+    public void getUser(
+        GetUserResponseCallback callback, Integer userIndex, int timedInvokeTimeoutMs) {
+      getUser(chipClusterPtr, callback, userIndex, timedInvokeTimeoutMs);
     }
 
-    public void skipBackward(PlaybackResponseCallback callback, Long deltaPositionMilliseconds) {
-      skipBackward(chipClusterPtr, callback, deltaPositionMilliseconds, null);
+    public void clearUser(
+        DefaultClusterCallback callback, Integer userIndex, int timedInvokeTimeoutMs) {
+      clearUser(chipClusterPtr, callback, userIndex, timedInvokeTimeoutMs);
     }
 
-    public void skipBackward(
-        PlaybackResponseCallback callback,
-        Long deltaPositionMilliseconds,
+    public void setCredential(
+        SetCredentialResponseCallback callback,
+        Integer operationType,
+        ChipStructs.DoorLockClusterDlCredential credential,
+        byte[] credentialData,
+        @Nullable Integer userIndex,
+        @Nullable Integer userStatus,
+        @Nullable Integer userType,
         int timedInvokeTimeoutMs) {
-      skipBackward(chipClusterPtr, callback, deltaPositionMilliseconds, timedInvokeTimeoutMs);
+      setCredential(
+          chipClusterPtr,
+          callback,
+          operationType,
+          credential,
+          credentialData,
+          userIndex,
+          userStatus,
+          userType,
+          timedInvokeTimeoutMs);
     }
 
-    public void skipForward(PlaybackResponseCallback callback, Long deltaPositionMilliseconds) {
-      skipForward(chipClusterPtr, callback, deltaPositionMilliseconds, null);
+    public void getCredentialStatus(
+        GetCredentialStatusResponseCallback callback,
+        ChipStructs.DoorLockClusterDlCredential credential) {
+      getCredentialStatus(chipClusterPtr, callback, credential, null);
     }
 
-    public void skipForward(
-        PlaybackResponseCallback callback,
-        Long deltaPositionMilliseconds,
+    public void getCredentialStatus(
+        GetCredentialStatusResponseCallback callback,
+        ChipStructs.DoorLockClusterDlCredential credential,
         int timedInvokeTimeoutMs) {
-      skipForward(chipClusterPtr, callback, deltaPositionMilliseconds, timedInvokeTimeoutMs);
+      getCredentialStatus(chipClusterPtr, callback, credential, timedInvokeTimeoutMs);
     }
 
-    public void startOver(PlaybackResponseCallback callback) {
-      startOver(chipClusterPtr, callback, null);
+    public void clearCredential(
+        DefaultClusterCallback callback,
+        @Nullable ChipStructs.DoorLockClusterDlCredential credential,
+        int timedInvokeTimeoutMs) {
+      clearCredential(chipClusterPtr, callback, credential, timedInvokeTimeoutMs);
     }
 
-    public void startOver(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
+    private native void lockDoor(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Optional<byte[]> pinCode,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-      startOver(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+    private native void unlockDoor(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Optional<byte[]> pinCode,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void stopPlayback(PlaybackResponseCallback callback) {
-      stopPlayback(chipClusterPtr, callback, null);
-    }
+    private native void unlockWithTimeout(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer timeout,
+        Optional<byte[]> pinCode,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void stopPlayback(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
+    private native void setWeekDaySchedule(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer weekDayIndex,
+        Integer userIndex,
+        Integer daysMask,
+        Integer startHour,
+        Integer startMinute,
+        Integer endHour,
+        Integer endMinute,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-      stopPlayback(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+    private native void getWeekDaySchedule(
+        long chipClusterPtr,
+        GetWeekDayScheduleResponseCallback Callback,
+        Integer weekDayIndex,
+        Integer userIndex,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void fastForward(
+    private native void clearWeekDaySchedule(
         long chipClusterPtr,
-        PlaybackResponseCallback Callback,
+        DefaultClusterCallback Callback,
+        Integer weekDayIndex,
+        Integer userIndex,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void next(
+    private native void setYearDaySchedule(
         long chipClusterPtr,
-        PlaybackResponseCallback Callback,
+        DefaultClusterCallback Callback,
+        Integer yearDayIndex,
+        Integer userIndex,
+        Long localStartTime,
+        Long localEndTime,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void getYearDaySchedule(
+        long chipClusterPtr,
+        GetYearDayScheduleResponseCallback Callback,
+        Integer yearDayIndex,
+        Integer userIndex,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void clearYearDaySchedule(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer yearDayIndex,
+        Integer userIndex,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void setHolidaySchedule(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer holidayIndex,
+        Long localStartTime,
+        Long localEndTime,
+        Integer operatingMode,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void pause(
+    private native void getHolidaySchedule(
         long chipClusterPtr,
-        PlaybackResponseCallback Callback,
+        GetHolidayScheduleResponseCallback Callback,
+        Integer holidayIndex,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void play(
+    private native void clearHolidaySchedule(
         long chipClusterPtr,
-        PlaybackResponseCallback Callback,
+        DefaultClusterCallback Callback,
+        Integer holidayIndex,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void previous(
+    private native void setUser(
         long chipClusterPtr,
-        PlaybackResponseCallback Callback,
+        DefaultClusterCallback Callback,
+        Integer operationType,
+        Integer userIndex,
+        @Nullable String userName,
+        @Nullable Long userUniqueId,
+        @Nullable Integer userStatus,
+        @Nullable Integer userType,
+        @Nullable Integer credentialRule,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void rewind(
+    private native void getUser(
         long chipClusterPtr,
-        PlaybackResponseCallback Callback,
+        GetUserResponseCallback Callback,
+        Integer userIndex,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void seek(
+    private native void clearUser(
         long chipClusterPtr,
-        PlaybackResponseCallback Callback,
-        Long position,
+        DefaultClusterCallback Callback,
+        Integer userIndex,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void skipBackward(
+    private native void setCredential(
         long chipClusterPtr,
-        PlaybackResponseCallback Callback,
-        Long deltaPositionMilliseconds,
+        SetCredentialResponseCallback Callback,
+        Integer operationType,
+        ChipStructs.DoorLockClusterDlCredential credential,
+        byte[] credentialData,
+        @Nullable Integer userIndex,
+        @Nullable Integer userStatus,
+        @Nullable Integer userType,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void skipForward(
+    private native void getCredentialStatus(
         long chipClusterPtr,
-        PlaybackResponseCallback Callback,
-        Long deltaPositionMilliseconds,
+        GetCredentialStatusResponseCallback Callback,
+        ChipStructs.DoorLockClusterDlCredential credential,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void startOver(
+    private native void clearCredential(
         long chipClusterPtr,
-        PlaybackResponseCallback Callback,
+        DefaultClusterCallback Callback,
+        @Nullable ChipStructs.DoorLockClusterDlCredential credential,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void stopPlayback(
-        long chipClusterPtr,
-        PlaybackResponseCallback Callback,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public interface GetWeekDayScheduleResponseCallback {
+      void onSuccess(
+          Integer weekDayIndex,
+          Integer userIndex,
+          Integer status,
+          Optional<Integer> daysMask,
+          Optional<Integer> startHour,
+          Optional<Integer> startMinute,
+          Optional<Integer> endHour,
+          Optional<Integer> endMinute);
 
-    public interface PlaybackResponseCallback {
-      void onSuccess(Integer status, Optional<String> data);
+      void onError(Exception error);
+    }
+
+    public interface GetYearDayScheduleResponseCallback {
+      void onSuccess(
+          Integer yearDayIndex,
+          Integer userIndex,
+          Integer status,
+          Optional<Long> localStartTime,
+          Optional<Long> localEndTime);
 
       void onError(Exception error);
     }
 
-    public interface StartTimeAttributeCallback {
-      void onSuccess(@Nullable Long value);
+    public interface GetHolidayScheduleResponseCallback {
+      void onSuccess(
+          Integer holidayIndex,
+          Integer status,
+          Optional<Long> localStartTime,
+          Optional<Long> localEndTime,
+          Optional<Integer> operatingMode);
 
-      void onError(Exception ex);
+      void onError(Exception error);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public interface GetUserResponseCallback {
+      void onSuccess(
+          Integer userIndex,
+          @Nullable String userName,
+          @Nullable Long userUniqueId,
+          @Nullable Integer userStatus,
+          @Nullable Integer userType,
+          @Nullable Integer credentialRule,
+          @Nullable ArrayList<ChipStructs.DoorLockClusterDlCredential> credentials,
+          @Nullable Integer creatorFabricIndex,
+          @Nullable Integer lastModifiedFabricIndex,
+          @Nullable Integer nextUserIndex);
+
+      void onError(Exception error);
     }
 
-    public interface DurationAttributeCallback {
-      void onSuccess(@Nullable Long value);
+    public interface SetCredentialResponseCallback {
+      void onSuccess(
+          Integer status, @Nullable Integer userIndex, @Nullable Integer nextCredentialIndex);
 
-      void onError(Exception ex);
+      void onError(Exception error);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public interface GetCredentialStatusResponseCallback {
+      void onSuccess(
+          Boolean credentialExists,
+          @Nullable Integer userIndex,
+          @Nullable Integer creatorFabricIndex,
+          @Nullable Integer lastModifiedFabricIndex,
+          @Nullable Integer nextCredentialIndex);
+
+      void onError(Exception error);
     }
 
-    public interface SeekRangeEndAttributeCallback {
-      void onSuccess(@Nullable Long value);
+    public interface LockStateAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface SeekRangeStartAttributeCallback {
-      void onSuccess(@Nullable Long value);
+    public interface DoorStateAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
 
@@ -11929,338 +11638,322 @@ public interface AttributeListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public void readCurrentStateAttribute(IntegerAttributeCallback callback) {
-      readCurrentStateAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeCurrentStateAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readStartTimeAttribute(StartTimeAttributeCallback callback) {
-      readStartTimeAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeStartTimeAttribute(
-        StartTimeAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeStartTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readDurationAttribute(DurationAttributeCallback callback) {
-      readDurationAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeDurationAttribute(
-        DurationAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeDurationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readPlaybackSpeedAttribute(FloatAttributeCallback callback) {
-      readPlaybackSpeedAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribePlaybackSpeedAttribute(
-        FloatAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePlaybackSpeedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readSeekRangeEndAttribute(SeekRangeEndAttributeCallback callback) {
-      readSeekRangeEndAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeSeekRangeEndAttribute(
-        SeekRangeEndAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSeekRangeEndAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readSeekRangeStartAttribute(SeekRangeStartAttributeCallback callback) {
-      readSeekRangeStartAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeSeekRangeStartAttribute(
-        SeekRangeStartAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSeekRangeStartAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    public void readLockStateAttribute(LockStateAttributeCallback callback) {
+      readLockStateAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeLockStateAttribute(
+        LockStateAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeLockStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
+    public void readLockTypeAttribute(IntegerAttributeCallback callback) {
+      readLockTypeAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeLockTypeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeLockTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
+    public void readActuatorEnabledAttribute(BooleanAttributeCallback callback) {
+      readActuatorEnabledAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeActuatorEnabledAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeActuatorEnabledAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
+    public void readDoorStateAttribute(DoorStateAttributeCallback callback) {
+      readDoorStateAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeDoorStateAttribute(
+        DoorStateAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeDoorStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readCurrentStateAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeCurrentStateAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readStartTimeAttribute(
-        long chipClusterPtr, StartTimeAttributeCallback callback);
-
-    private native void subscribeStartTimeAttribute(
-        long chipClusterPtr, StartTimeAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readDurationAttribute(
-        long chipClusterPtr, DurationAttributeCallback callback);
-
-    private native void subscribeDurationAttribute(
-        long chipClusterPtr, DurationAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPlaybackSpeedAttribute(
-        long chipClusterPtr, FloatAttributeCallback callback);
+    public void readNumberOfTotalUsersSupportedAttribute(IntegerAttributeCallback callback) {
+      readNumberOfTotalUsersSupportedAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribePlaybackSpeedAttribute(
-        long chipClusterPtr, FloatAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeNumberOfTotalUsersSupportedAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNumberOfTotalUsersSupportedAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readSeekRangeEndAttribute(
-        long chipClusterPtr, SeekRangeEndAttributeCallback callback);
+    public void readNumberOfPINUsersSupportedAttribute(IntegerAttributeCallback callback) {
+      readNumberOfPINUsersSupportedAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeSeekRangeEndAttribute(
-        long chipClusterPtr,
-        SeekRangeEndAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void subscribeNumberOfPINUsersSupportedAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNumberOfPINUsersSupportedAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readSeekRangeStartAttribute(
-        long chipClusterPtr, SeekRangeStartAttributeCallback callback);
+    public void readNumberOfRFIDUsersSupportedAttribute(IntegerAttributeCallback callback) {
+      readNumberOfRFIDUsersSupportedAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeSeekRangeStartAttribute(
-        long chipClusterPtr,
-        SeekRangeStartAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void subscribeNumberOfRFIDUsersSupportedAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNumberOfRFIDUsersSupportedAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readGeneratedCommandListAttribute(
-        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void readNumberOfWeekDaySchedulesSupportedPerUserAttribute(
+        IntegerAttributeCallback callback) {
+      readNumberOfWeekDaySchedulesSupportedPerUserAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeGeneratedCommandListAttribute(
-        long chipClusterPtr,
-        GeneratedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void subscribeNumberOfWeekDaySchedulesSupportedPerUserAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNumberOfWeekDaySchedulesSupportedPerUserAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readAcceptedCommandListAttribute(
-        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void readNumberOfYearDaySchedulesSupportedPerUserAttribute(
+        IntegerAttributeCallback callback) {
+      readNumberOfYearDaySchedulesSupportedPerUserAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeAcceptedCommandListAttribute(
-        long chipClusterPtr,
-        AcceptedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void subscribeNumberOfYearDaySchedulesSupportedPerUserAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNumberOfYearDaySchedulesSupportedPerUserAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readAttributeListAttribute(
-        long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void readNumberOfHolidaySchedulesSupportedAttribute(IntegerAttributeCallback callback) {
+      readNumberOfHolidaySchedulesSupportedAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeAttributeListAttribute(
-        long chipClusterPtr,
-        AttributeListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void subscribeNumberOfHolidaySchedulesSupportedAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNumberOfHolidaySchedulesSupportedAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void readMaxPINCodeLengthAttribute(IntegerAttributeCallback callback) {
+      readMaxPINCodeLengthAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeMaxPINCodeLengthAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMaxPINCodeLengthAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readMinPINCodeLengthAttribute(IntegerAttributeCallback callback) {
+      readMinPINCodeLengthAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public void subscribeMinPINCodeLengthAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMinPINCodeLengthAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-  public static class ModeSelectCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 80L;
+    public void readMaxRFIDCodeLengthAttribute(IntegerAttributeCallback callback) {
+      readMaxRFIDCodeLengthAttribute(chipClusterPtr, callback);
+    }
 
-    public ModeSelectCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    public void subscribeMaxRFIDCodeLengthAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMaxRFIDCodeLengthAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void readMinRFIDCodeLengthAttribute(IntegerAttributeCallback callback) {
+      readMinRFIDCodeLengthAttribute(chipClusterPtr, callback);
+    }
 
-    public void changeToMode(DefaultClusterCallback callback, Integer newMode) {
-      changeToMode(chipClusterPtr, callback, newMode, null);
+    public void subscribeMinRFIDCodeLengthAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMinRFIDCodeLengthAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void changeToMode(
-        DefaultClusterCallback callback, Integer newMode, int timedInvokeTimeoutMs) {
-      changeToMode(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs);
+    public void readNumberOfCredentialsSupportedPerUserAttribute(
+        IntegerAttributeCallback callback) {
+      readNumberOfCredentialsSupportedPerUserAttribute(chipClusterPtr, callback);
     }
 
-    private native void changeToMode(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer newMode,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeNumberOfCredentialsSupportedPerUserAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNumberOfCredentialsSupportedPerUserAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    public interface StandardNamespaceAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public void readLanguageAttribute(CharStringAttributeCallback callback) {
+      readLanguageAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void writeLanguageAttribute(DefaultClusterCallback callback, String value) {
+      writeLanguageAttribute(chipClusterPtr, callback, value, null);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void writeLanguageAttribute(
+        DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      writeLanguageAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public interface SupportedModesAttributeCallback {
-      void onSuccess(List<ChipStructs.ModeSelectClusterModeOptionStruct> valueList);
+    public void subscribeLanguageAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeLanguageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readAutoRelockTimeAttribute(LongAttributeCallback callback) {
+      readAutoRelockTimeAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void writeAutoRelockTimeAttribute(DefaultClusterCallback callback, Long value) {
+      writeAutoRelockTimeAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public interface StartUpModeAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public void writeAutoRelockTimeAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeAutoRelockTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-      void onError(Exception ex);
+    public void subscribeAutoRelockTimeAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAutoRelockTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readSoundVolumeAttribute(IntegerAttributeCallback callback) {
+      readSoundVolumeAttribute(chipClusterPtr, callback);
     }
 
-    public interface OnModeAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public void writeSoundVolumeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeSoundVolumeAttribute(chipClusterPtr, callback, value, null);
+    }
 
-      void onError(Exception ex);
+    public void writeSoundVolumeAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeSoundVolumeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeSoundVolumeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSoundVolumeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void readOperatingModeAttribute(IntegerAttributeCallback callback) {
+      readOperatingModeAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void writeOperatingModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOperatingModeAttribute(chipClusterPtr, callback, value, null);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void writeOperatingModeAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOperatingModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void subscribeOperatingModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeOperatingModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readSupportedOperatingModesAttribute(IntegerAttributeCallback callback) {
+      readSupportedOperatingModesAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeSupportedOperatingModesAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSupportedOperatingModesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void readEnableOneTouchLockingAttribute(BooleanAttributeCallback callback) {
+      readEnableOneTouchLockingAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void writeEnableOneTouchLockingAttribute(
+        DefaultClusterCallback callback, Boolean value) {
+      writeEnableOneTouchLockingAttribute(chipClusterPtr, callback, value, null);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void writeEnableOneTouchLockingAttribute(
+        DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeEnableOneTouchLockingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void readDescriptionAttribute(CharStringAttributeCallback callback) {
-      readDescriptionAttribute(chipClusterPtr, callback);
+    public void subscribeEnableOneTouchLockingAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeEnableOneTouchLockingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void subscribeDescriptionAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeDescriptionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readEnablePrivacyModeButtonAttribute(BooleanAttributeCallback callback) {
+      readEnablePrivacyModeButtonAttribute(chipClusterPtr, callback);
+    }
+
+    public void writeEnablePrivacyModeButtonAttribute(
+        DefaultClusterCallback callback, Boolean value) {
+      writeEnablePrivacyModeButtonAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readStandardNamespaceAttribute(StandardNamespaceAttributeCallback callback) {
-      readStandardNamespaceAttribute(chipClusterPtr, callback);
+    public void writeEnablePrivacyModeButtonAttribute(
+        DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeEnablePrivacyModeButtonAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeStandardNamespaceAttribute(
-        StandardNamespaceAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeStandardNamespaceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeEnablePrivacyModeButtonAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeEnablePrivacyModeButtonAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readSupportedModesAttribute(SupportedModesAttributeCallback callback) {
-      readSupportedModesAttribute(chipClusterPtr, callback);
+    public void readWrongCodeEntryLimitAttribute(IntegerAttributeCallback callback) {
+      readWrongCodeEntryLimitAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeSupportedModesAttribute(
-        SupportedModesAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSupportedModesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeWrongCodeEntryLimitAttribute(DefaultClusterCallback callback, Integer value) {
+      writeWrongCodeEntryLimitAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readCurrentModeAttribute(IntegerAttributeCallback callback) {
-      readCurrentModeAttribute(chipClusterPtr, callback);
+    public void writeWrongCodeEntryLimitAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeWrongCodeEntryLimitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeCurrentModeAttribute(
+    public void subscribeWrongCodeEntryLimitAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeWrongCodeEntryLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readStartUpModeAttribute(StartUpModeAttributeCallback callback) {
-      readStartUpModeAttribute(chipClusterPtr, callback);
+    public void readUserCodeTemporaryDisableTimeAttribute(IntegerAttributeCallback callback) {
+      readUserCodeTemporaryDisableTimeAttribute(chipClusterPtr, callback);
     }
 
-    public void writeStartUpModeAttribute(DefaultClusterCallback callback, Integer value) {
-      writeStartUpModeAttribute(chipClusterPtr, callback, value, null);
+    public void writeUserCodeTemporaryDisableTimeAttribute(
+        DefaultClusterCallback callback, Integer value) {
+      writeUserCodeTemporaryDisableTimeAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void writeStartUpModeAttribute(
+    public void writeUserCodeTemporaryDisableTimeAttribute(
         DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeStartUpModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
-
-    public void subscribeStartUpModeAttribute(
-        StartUpModeAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeStartUpModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      writeUserCodeTemporaryDisableTimeAttribute(
+          chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void readOnModeAttribute(OnModeAttributeCallback callback) {
-      readOnModeAttribute(chipClusterPtr, callback);
+    public void subscribeUserCodeTemporaryDisableTimeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeUserCodeTemporaryDisableTimeAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeOnModeAttribute(DefaultClusterCallback callback, Integer value) {
-      writeOnModeAttribute(chipClusterPtr, callback, value, null);
+    public void readRequirePINforRemoteOperationAttribute(BooleanAttributeCallback callback) {
+      readRequirePINforRemoteOperationAttribute(chipClusterPtr, callback);
     }
 
-    public void writeOnModeAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeOnModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void writeRequirePINforRemoteOperationAttribute(
+        DefaultClusterCallback callback, Boolean value) {
+      writeRequirePINforRemoteOperationAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void subscribeOnModeAttribute(
-        OnModeAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeOnModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeRequirePINforRemoteOperationAttribute(
+        DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeRequirePINforRemoteOperationAttribute(
+          chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -12308,65 +12001,210 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readDescriptionAttribute(
+    private native void readLockStateAttribute(
+        long chipClusterPtr, LockStateAttributeCallback callback);
+
+    private native void subscribeLockStateAttribute(
+        long chipClusterPtr, LockStateAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readLockTypeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeLockTypeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readActuatorEnabledAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
+
+    private native void subscribeActuatorEnabledAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readDoorStateAttribute(
+        long chipClusterPtr, DoorStateAttributeCallback callback);
+
+    private native void subscribeDoorStateAttribute(
+        long chipClusterPtr, DoorStateAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readNumberOfTotalUsersSupportedAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeNumberOfTotalUsersSupportedAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readNumberOfPINUsersSupportedAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeNumberOfPINUsersSupportedAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readNumberOfRFIDUsersSupportedAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeNumberOfRFIDUsersSupportedAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readNumberOfWeekDaySchedulesSupportedPerUserAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeNumberOfWeekDaySchedulesSupportedPerUserAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readNumberOfYearDaySchedulesSupportedPerUserAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeNumberOfYearDaySchedulesSupportedPerUserAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readNumberOfHolidaySchedulesSupportedAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeNumberOfHolidaySchedulesSupportedAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readMaxPINCodeLengthAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeMaxPINCodeLengthAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readMinPINCodeLengthAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeMinPINCodeLengthAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readMaxRFIDCodeLengthAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeMaxRFIDCodeLengthAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readMinRFIDCodeLengthAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeMinRFIDCodeLengthAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readNumberOfCredentialsSupportedPerUserAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeNumberOfCredentialsSupportedPerUserAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readLanguageAttribute(
         long chipClusterPtr, CharStringAttributeCallback callback);
 
-    private native void subscribeDescriptionAttribute(
+    private native void writeLanguageAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        String value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeLanguageAttribute(
         long chipClusterPtr,
         CharStringAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readStandardNamespaceAttribute(
-        long chipClusterPtr, StandardNamespaceAttributeCallback callback);
+    private native void readAutoRelockTimeAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeStandardNamespaceAttribute(
+    private native void writeAutoRelockTimeAttribute(
         long chipClusterPtr,
-        StandardNamespaceAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readSupportedModesAttribute(
-        long chipClusterPtr, SupportedModesAttributeCallback callback);
+    private native void subscribeAutoRelockTimeAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeSupportedModesAttribute(
+    private native void readSoundVolumeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeSoundVolumeAttribute(
         long chipClusterPtr,
-        SupportedModesAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readCurrentModeAttribute(
+    private native void subscribeSoundVolumeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readOperatingModeAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeCurrentModeAttribute(
+    private native void writeOperatingModeAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeOperatingModeAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readStartUpModeAttribute(
-        long chipClusterPtr, StartUpModeAttributeCallback callback);
+    private native void readSupportedOperatingModesAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeSupportedOperatingModesAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readEnableOneTouchLockingAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
+
+    private native void writeEnableOneTouchLockingAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Boolean value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeEnableOneTouchLockingAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readEnablePrivacyModeButtonAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
+
+    private native void writeEnablePrivacyModeButtonAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Boolean value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeEnablePrivacyModeButtonAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readWrongCodeEntryLimitAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeWrongCodeEntryLimitAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeWrongCodeEntryLimitAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void writeStartUpModeAttribute(
+    private native void readUserCodeTemporaryDisableTimeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeUserCodeTemporaryDisableTimeAttribute(
         long chipClusterPtr,
         DefaultClusterCallback callback,
         Integer value,
         @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeStartUpModeAttribute(
-        long chipClusterPtr,
-        StartUpModeAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeUserCodeTemporaryDisableTimeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readOnModeAttribute(long chipClusterPtr, OnModeAttributeCallback callback);
+    private native void readRequirePINforRemoteOperationAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
 
-    private native void writeOnModeAttribute(
+    private native void writeRequirePINforRemoteOperationAttribute(
         long chipClusterPtr,
         DefaultClusterCallback callback,
-        Integer value,
+        Boolean value,
         @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeOnModeAttribute(
-        long chipClusterPtr, OnModeAttributeCallback callback, int minInterval, int maxInterval);
-
     private native void readGeneratedCommandListAttribute(
         long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
@@ -12407,757 +12245,453 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class NetworkCommissioningCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 49L;
+  public static class WindowCoveringCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 258L;
 
-    public NetworkCommissioningCluster(long devicePtr, int endpointId) {
+    public WindowCoveringCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void addOrUpdateThreadNetwork(
-        NetworkConfigResponseCallback callback,
-        byte[] operationalDataset,
-        Optional<Long> breadcrumb) {
-      addOrUpdateThreadNetwork(chipClusterPtr, callback, operationalDataset, breadcrumb, null);
-    }
-
-    public void addOrUpdateThreadNetwork(
-        NetworkConfigResponseCallback callback,
-        byte[] operationalDataset,
-        Optional<Long> breadcrumb,
-        int timedInvokeTimeoutMs) {
-      addOrUpdateThreadNetwork(
-          chipClusterPtr, callback, operationalDataset, breadcrumb, timedInvokeTimeoutMs);
-    }
-
-    public void addOrUpdateWiFiNetwork(
-        NetworkConfigResponseCallback callback,
-        byte[] ssid,
-        byte[] credentials,
-        Optional<Long> breadcrumb) {
-      addOrUpdateWiFiNetwork(chipClusterPtr, callback, ssid, credentials, breadcrumb, null);
-    }
-
-    public void addOrUpdateWiFiNetwork(
-        NetworkConfigResponseCallback callback,
-        byte[] ssid,
-        byte[] credentials,
-        Optional<Long> breadcrumb,
-        int timedInvokeTimeoutMs) {
-      addOrUpdateWiFiNetwork(
-          chipClusterPtr, callback, ssid, credentials, breadcrumb, timedInvokeTimeoutMs);
-    }
-
-    public void connectNetwork(
-        ConnectNetworkResponseCallback callback, byte[] networkID, Optional<Long> breadcrumb) {
-      connectNetwork(chipClusterPtr, callback, networkID, breadcrumb, null);
-    }
-
-    public void connectNetwork(
-        ConnectNetworkResponseCallback callback,
-        byte[] networkID,
-        Optional<Long> breadcrumb,
-        int timedInvokeTimeoutMs) {
-      connectNetwork(chipClusterPtr, callback, networkID, breadcrumb, timedInvokeTimeoutMs);
-    }
-
-    public void removeNetwork(
-        NetworkConfigResponseCallback callback, byte[] networkID, Optional<Long> breadcrumb) {
-      removeNetwork(chipClusterPtr, callback, networkID, breadcrumb, null);
-    }
-
-    public void removeNetwork(
-        NetworkConfigResponseCallback callback,
-        byte[] networkID,
-        Optional<Long> breadcrumb,
-        int timedInvokeTimeoutMs) {
-      removeNetwork(chipClusterPtr, callback, networkID, breadcrumb, timedInvokeTimeoutMs);
-    }
-
-    public void reorderNetwork(
-        NetworkConfigResponseCallback callback,
-        byte[] networkID,
-        Integer networkIndex,
-        Optional<Long> breadcrumb) {
-      reorderNetwork(chipClusterPtr, callback, networkID, networkIndex, breadcrumb, null);
-    }
-
-    public void reorderNetwork(
-        NetworkConfigResponseCallback callback,
-        byte[] networkID,
-        Integer networkIndex,
-        Optional<Long> breadcrumb,
-        int timedInvokeTimeoutMs) {
-      reorderNetwork(
-          chipClusterPtr, callback, networkID, networkIndex, breadcrumb, timedInvokeTimeoutMs);
-    }
-
-    public void scanNetworks(
-        ScanNetworksResponseCallback callback,
-        @Nullable Optional<byte[]> ssid,
-        Optional<Long> breadcrumb) {
-      scanNetworks(chipClusterPtr, callback, ssid, breadcrumb, null);
-    }
-
-    public void scanNetworks(
-        ScanNetworksResponseCallback callback,
-        @Nullable Optional<byte[]> ssid,
-        Optional<Long> breadcrumb,
-        int timedInvokeTimeoutMs) {
-      scanNetworks(chipClusterPtr, callback, ssid, breadcrumb, timedInvokeTimeoutMs);
-    }
-
-    private native void addOrUpdateThreadNetwork(
-        long chipClusterPtr,
-        NetworkConfigResponseCallback Callback,
-        byte[] operationalDataset,
-        Optional<Long> breadcrumb,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void addOrUpdateWiFiNetwork(
-        long chipClusterPtr,
-        NetworkConfigResponseCallback Callback,
-        byte[] ssid,
-        byte[] credentials,
-        Optional<Long> breadcrumb,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void connectNetwork(
-        long chipClusterPtr,
-        ConnectNetworkResponseCallback Callback,
-        byte[] networkID,
-        Optional<Long> breadcrumb,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void removeNetwork(
-        long chipClusterPtr,
-        NetworkConfigResponseCallback Callback,
-        byte[] networkID,
-        Optional<Long> breadcrumb,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void reorderNetwork(
-        long chipClusterPtr,
-        NetworkConfigResponseCallback Callback,
-        byte[] networkID,
-        Integer networkIndex,
-        Optional<Long> breadcrumb,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void scanNetworks(
-        long chipClusterPtr,
-        ScanNetworksResponseCallback Callback,
-        @Nullable Optional<byte[]> ssid,
-        Optional<Long> breadcrumb,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface ConnectNetworkResponseCallback {
-      void onSuccess(
-          Integer networkingStatus, Optional<String> debugText, @Nullable Long errorValue);
-
-      void onError(Exception error);
-    }
-
-    public interface NetworkConfigResponseCallback {
-      void onSuccess(
-          Integer networkingStatus, Optional<String> debugText, Optional<Integer> networkIndex);
-
-      void onError(Exception error);
-    }
-
-    public interface ScanNetworksResponseCallback {
-      void onSuccess(
-          Integer networkingStatus,
-          Optional<String> debugText,
-          Optional<ArrayList<ChipStructs.NetworkCommissioningClusterWiFiInterfaceScanResult>>
-              wiFiScanResults,
-          Optional<ArrayList<ChipStructs.NetworkCommissioningClusterThreadInterfaceScanResult>>
-              threadScanResults);
-
-      void onError(Exception error);
-    }
-
-    public interface NetworksAttributeCallback {
-      void onSuccess(List<ChipStructs.NetworkCommissioningClusterNetworkInfo> valueList);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public interface LastNetworkingStatusAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public interface LastNetworkIDAttributeCallback {
-      void onSuccess(@Nullable byte[] value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public interface LastConnectErrorValueAttributeCallback {
-      void onSuccess(@Nullable Long value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public void readMaxNetworksAttribute(IntegerAttributeCallback callback) {
-      readMaxNetworksAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeMaxNetworksAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMaxNetworksAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readNetworksAttribute(NetworksAttributeCallback callback) {
-      readNetworksAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeNetworksAttribute(
-        NetworksAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNetworksAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void upOrOpen(DefaultClusterCallback callback) {
+      upOrOpen(chipClusterPtr, callback, null);
     }
 
-    public void readScanMaxTimeSecondsAttribute(IntegerAttributeCallback callback) {
-      readScanMaxTimeSecondsAttribute(chipClusterPtr, callback);
-    }
+    public void upOrOpen(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
 
-    public void subscribeScanMaxTimeSecondsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeScanMaxTimeSecondsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      upOrOpen(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public void readConnectMaxTimeSecondsAttribute(IntegerAttributeCallback callback) {
-      readConnectMaxTimeSecondsAttribute(chipClusterPtr, callback);
+    public void downOrClose(DefaultClusterCallback callback) {
+      downOrClose(chipClusterPtr, callback, null);
     }
 
-    public void subscribeConnectMaxTimeSecondsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeConnectMaxTimeSecondsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void downOrClose(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
 
-    public void readInterfaceEnabledAttribute(BooleanAttributeCallback callback) {
-      readInterfaceEnabledAttribute(chipClusterPtr, callback);
+      downOrClose(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public void writeInterfaceEnabledAttribute(DefaultClusterCallback callback, Boolean value) {
-      writeInterfaceEnabledAttribute(chipClusterPtr, callback, value, null);
+    public void stopMotion(DefaultClusterCallback callback) {
+      stopMotion(chipClusterPtr, callback, null);
     }
 
-    public void writeInterfaceEnabledAttribute(
-        DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-      writeInterfaceEnabledAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void stopMotion(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
 
-    public void subscribeInterfaceEnabledAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeInterfaceEnabledAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      stopMotion(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public void readLastNetworkingStatusAttribute(LastNetworkingStatusAttributeCallback callback) {
-      readLastNetworkingStatusAttribute(chipClusterPtr, callback);
+    public void goToLiftValue(DefaultClusterCallback callback, Integer liftValue) {
+      goToLiftValue(chipClusterPtr, callback, liftValue, null);
     }
 
-    public void subscribeLastNetworkingStatusAttribute(
-        LastNetworkingStatusAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeLastNetworkingStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void goToLiftValue(
+        DefaultClusterCallback callback, Integer liftValue, int timedInvokeTimeoutMs) {
+      goToLiftValue(chipClusterPtr, callback, liftValue, timedInvokeTimeoutMs);
     }
 
-    public void readLastNetworkIDAttribute(LastNetworkIDAttributeCallback callback) {
-      readLastNetworkIDAttribute(chipClusterPtr, callback);
+    public void goToLiftPercentage(
+        DefaultClusterCallback callback, Integer liftPercent100thsValue) {
+      goToLiftPercentage(chipClusterPtr, callback, liftPercent100thsValue, null);
     }
 
-    public void subscribeLastNetworkIDAttribute(
-        LastNetworkIDAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeLastNetworkIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void goToLiftPercentage(
+        DefaultClusterCallback callback, Integer liftPercent100thsValue, int timedInvokeTimeoutMs) {
+      goToLiftPercentage(chipClusterPtr, callback, liftPercent100thsValue, timedInvokeTimeoutMs);
     }
 
-    public void readLastConnectErrorValueAttribute(
-        LastConnectErrorValueAttributeCallback callback) {
-      readLastConnectErrorValueAttribute(chipClusterPtr, callback);
+    public void goToTiltValue(DefaultClusterCallback callback, Integer tiltValue) {
+      goToTiltValue(chipClusterPtr, callback, tiltValue, null);
     }
 
-    public void subscribeLastConnectErrorValueAttribute(
-        LastConnectErrorValueAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeLastConnectErrorValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void goToTiltValue(
+        DefaultClusterCallback callback, Integer tiltValue, int timedInvokeTimeoutMs) {
+      goToTiltValue(chipClusterPtr, callback, tiltValue, timedInvokeTimeoutMs);
     }
 
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    public void goToTiltPercentage(
+        DefaultClusterCallback callback, Integer tiltPercent100thsValue) {
+      goToTiltPercentage(chipClusterPtr, callback, tiltPercent100thsValue, null);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void goToTiltPercentage(
+        DefaultClusterCallback callback, Integer tiltPercent100thsValue, int timedInvokeTimeoutMs) {
+      goToTiltPercentage(chipClusterPtr, callback, tiltPercent100thsValue, timedInvokeTimeoutMs);
     }
 
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
-    }
+    private native void upOrOpen(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void downOrClose(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
-    }
+    private native void stopMotion(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void goToLiftValue(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer liftValue,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
+    private native void goToLiftPercentage(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer liftPercent100thsValue,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void goToTiltValue(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer tiltValue,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void goToTiltPercentage(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer tiltPercent100thsValue,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    public interface CurrentPositionLiftAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface CurrentPositionTiltAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    private native void readMaxNetworksAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface CurrentPositionLiftPercentageAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    private native void subscribeMaxNetworksAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
 
-    private native void readNetworksAttribute(
-        long chipClusterPtr, NetworksAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeNetworksAttribute(
-        long chipClusterPtr, NetworksAttributeCallback callback, int minInterval, int maxInterval);
+    public interface CurrentPositionTiltPercentageAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    private native void readScanMaxTimeSecondsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void subscribeScanMaxTimeSecondsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readConnectMaxTimeSecondsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface TargetPositionLiftPercent100thsAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    private native void subscribeConnectMaxTimeSecondsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
 
-    private native void readInterfaceEnabledAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void writeInterfaceEnabledAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Boolean value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public interface TargetPositionTiltPercent100thsAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    private native void subscribeInterfaceEnabledAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
 
-    private native void readLastNetworkingStatusAttribute(
-        long chipClusterPtr, LastNetworkingStatusAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeLastNetworkingStatusAttribute(
-        long chipClusterPtr,
-        LastNetworkingStatusAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public interface CurrentPositionLiftPercent100thsAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    private native void readLastNetworkIDAttribute(
-        long chipClusterPtr, LastNetworkIDAttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void subscribeLastNetworkIDAttribute(
-        long chipClusterPtr,
-        LastNetworkIDAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readLastConnectErrorValueAttribute(
-        long chipClusterPtr, LastConnectErrorValueAttributeCallback callback);
+    public interface CurrentPositionTiltPercent100thsAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    private native void subscribeLastConnectErrorValueAttribute(
-        long chipClusterPtr,
-        LastConnectErrorValueAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+      void onError(Exception ex);
 
-    private native void readGeneratedCommandListAttribute(
-        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeGeneratedCommandListAttribute(
-        long chipClusterPtr,
-        GeneratedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void readAcceptedCommandListAttribute(
-        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void subscribeAcceptedCommandListAttribute(
-        long chipClusterPtr,
-        AcceptedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void subscribeFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-  public static class OtaSoftwareUpdateProviderCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 41L;
+      void onError(Exception ex);
 
-    public OtaSoftwareUpdateProviderCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      default void onSubscriptionEstablished() {}
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
-    public void applyUpdateRequest(
-        ApplyUpdateResponseCallback callback, byte[] updateToken, Long newVersion) {
-      applyUpdateRequest(chipClusterPtr, callback, updateToken, newVersion, null);
+    public void readTypeAttribute(IntegerAttributeCallback callback) {
+      readTypeAttribute(chipClusterPtr, callback);
     }
 
-    public void applyUpdateRequest(
-        ApplyUpdateResponseCallback callback,
-        byte[] updateToken,
-        Long newVersion,
-        int timedInvokeTimeoutMs) {
-      applyUpdateRequest(chipClusterPtr, callback, updateToken, newVersion, timedInvokeTimeoutMs);
+    public void subscribeTypeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void notifyUpdateApplied(
-        DefaultClusterCallback callback, byte[] updateToken, Long softwareVersion) {
-      notifyUpdateApplied(chipClusterPtr, callback, updateToken, softwareVersion, null);
+    public void readPhysicalClosedLimitLiftAttribute(IntegerAttributeCallback callback) {
+      readPhysicalClosedLimitLiftAttribute(chipClusterPtr, callback);
     }
 
-    public void notifyUpdateApplied(
-        DefaultClusterCallback callback,
-        byte[] updateToken,
-        Long softwareVersion,
-        int timedInvokeTimeoutMs) {
-      notifyUpdateApplied(
-          chipClusterPtr, callback, updateToken, softwareVersion, timedInvokeTimeoutMs);
+    public void subscribePhysicalClosedLimitLiftAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePhysicalClosedLimitLiftAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void queryImage(
-        QueryImageResponseCallback callback,
-        Integer vendorId,
-        Integer productId,
-        Long softwareVersion,
-        ArrayList<Integer> protocolsSupported,
-        Optional<Integer> hardwareVersion,
-        Optional<String> location,
-        Optional<Boolean> requestorCanConsent,
-        Optional<byte[]> metadataForProvider) {
-      queryImage(
-          chipClusterPtr,
-          callback,
-          vendorId,
-          productId,
-          softwareVersion,
-          protocolsSupported,
-          hardwareVersion,
-          location,
-          requestorCanConsent,
-          metadataForProvider,
-          null);
+    public void readPhysicalClosedLimitTiltAttribute(IntegerAttributeCallback callback) {
+      readPhysicalClosedLimitTiltAttribute(chipClusterPtr, callback);
     }
 
-    public void queryImage(
-        QueryImageResponseCallback callback,
-        Integer vendorId,
-        Integer productId,
-        Long softwareVersion,
-        ArrayList<Integer> protocolsSupported,
-        Optional<Integer> hardwareVersion,
-        Optional<String> location,
-        Optional<Boolean> requestorCanConsent,
-        Optional<byte[]> metadataForProvider,
-        int timedInvokeTimeoutMs) {
-      queryImage(
-          chipClusterPtr,
-          callback,
-          vendorId,
-          productId,
-          softwareVersion,
-          protocolsSupported,
-          hardwareVersion,
-          location,
-          requestorCanConsent,
-          metadataForProvider,
-          timedInvokeTimeoutMs);
+    public void subscribePhysicalClosedLimitTiltAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePhysicalClosedLimitTiltAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void applyUpdateRequest(
-        long chipClusterPtr,
-        ApplyUpdateResponseCallback Callback,
-        byte[] updateToken,
-        Long newVersion,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void readCurrentPositionLiftAttribute(CurrentPositionLiftAttributeCallback callback) {
+      readCurrentPositionLiftAttribute(chipClusterPtr, callback);
+    }
 
-    private native void notifyUpdateApplied(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        byte[] updateToken,
-        Long softwareVersion,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeCurrentPositionLiftAttribute(
+        CurrentPositionLiftAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentPositionLiftAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void queryImage(
-        long chipClusterPtr,
-        QueryImageResponseCallback Callback,
-        Integer vendorId,
-        Integer productId,
-        Long softwareVersion,
-        ArrayList<Integer> protocolsSupported,
-        Optional<Integer> hardwareVersion,
-        Optional<String> location,
-        Optional<Boolean> requestorCanConsent,
-        Optional<byte[]> metadataForProvider,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void readCurrentPositionTiltAttribute(CurrentPositionTiltAttributeCallback callback) {
+      readCurrentPositionTiltAttribute(chipClusterPtr, callback);
+    }
 
-    public interface ApplyUpdateResponseCallback {
-      void onSuccess(Integer action, Long delayedActionTime);
+    public void subscribeCurrentPositionTiltAttribute(
+        CurrentPositionTiltAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentPositionTiltAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception error);
+    public void readNumberOfActuationsLiftAttribute(IntegerAttributeCallback callback) {
+      readNumberOfActuationsLiftAttribute(chipClusterPtr, callback);
     }
 
-    public interface QueryImageResponseCallback {
-      void onSuccess(
-          Integer status,
-          Optional<Long> delayedActionTime,
-          Optional<String> imageURI,
-          Optional<Long> softwareVersion,
-          Optional<String> softwareVersionString,
-          Optional<byte[]> updateToken,
-          Optional<Boolean> userConsentNeeded,
-          Optional<byte[]> metadataForRequestor);
+    public void subscribeNumberOfActuationsLiftAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNumberOfActuationsLiftAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception error);
+    public void readNumberOfActuationsTiltAttribute(IntegerAttributeCallback callback) {
+      readNumberOfActuationsTiltAttribute(chipClusterPtr, callback);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void subscribeNumberOfActuationsTiltAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNumberOfActuationsTiltAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readConfigStatusAttribute(IntegerAttributeCallback callback) {
+      readConfigStatusAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeConfigStatusAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeConfigStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
+    public void readCurrentPositionLiftPercentageAttribute(
+        CurrentPositionLiftPercentageAttributeCallback callback) {
+      readCurrentPositionLiftPercentageAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCurrentPositionLiftPercentageAttribute(
+        CurrentPositionLiftPercentageAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentPositionLiftPercentageAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
+    public void readCurrentPositionTiltPercentageAttribute(
+        CurrentPositionTiltPercentageAttributeCallback callback) {
+      readCurrentPositionTiltPercentageAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCurrentPositionTiltPercentageAttribute(
+        CurrentPositionTiltPercentageAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentPositionTiltPercentageAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
+    public void readOperationalStatusAttribute(IntegerAttributeCallback callback) {
+      readOperationalStatusAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeClusterRevisionAttribute(
+    public void subscribeOperationalStatusAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeOperationalStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readAttributeListAttribute(
-        long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void readTargetPositionLiftPercent100thsAttribute(
+        TargetPositionLiftPercent100thsAttributeCallback callback) {
+      readTargetPositionLiftPercent100thsAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeAttributeListAttribute(
-        long chipClusterPtr,
-        AttributeListAttributeCallback callback,
+    public void subscribeTargetPositionLiftPercent100thsAttribute(
+        TargetPositionLiftPercent100thsAttributeCallback callback,
         int minInterval,
-        int maxInterval);
-
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
-
-  public static class OtaSoftwareUpdateRequestorCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 42L;
+        int maxInterval) {
+      subscribeTargetPositionLiftPercent100thsAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    public OtaSoftwareUpdateRequestorCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    public void readTargetPositionTiltPercent100thsAttribute(
+        TargetPositionTiltPercent100thsAttributeCallback callback) {
+      readTargetPositionTiltPercent100thsAttribute(chipClusterPtr, callback);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void subscribeTargetPositionTiltPercent100thsAttribute(
+        TargetPositionTiltPercent100thsAttributeCallback callback,
+        int minInterval,
+        int maxInterval) {
+      subscribeTargetPositionTiltPercent100thsAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    public void announceOtaProvider(
-        DefaultClusterCallback callback,
-        Long providerNodeId,
-        Integer vendorId,
-        Integer announcementReason,
-        Optional<byte[]> metadataForNode,
-        Integer endpoint) {
-      announceOtaProvider(
-          chipClusterPtr,
-          callback,
-          providerNodeId,
-          vendorId,
-          announcementReason,
-          metadataForNode,
-          endpoint,
-          null);
+    public void readEndProductTypeAttribute(IntegerAttributeCallback callback) {
+      readEndProductTypeAttribute(chipClusterPtr, callback);
     }
 
-    public void announceOtaProvider(
-        DefaultClusterCallback callback,
-        Long providerNodeId,
-        Integer vendorId,
-        Integer announcementReason,
-        Optional<byte[]> metadataForNode,
-        Integer endpoint,
-        int timedInvokeTimeoutMs) {
-      announceOtaProvider(
-          chipClusterPtr,
-          callback,
-          providerNodeId,
-          vendorId,
-          announcementReason,
-          metadataForNode,
-          endpoint,
-          timedInvokeTimeoutMs);
+    public void subscribeEndProductTypeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeEndProductTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void announceOtaProvider(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Long providerNodeId,
-        Integer vendorId,
-        Integer announcementReason,
-        Optional<byte[]> metadataForNode,
-        Integer endpoint,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void readCurrentPositionLiftPercent100thsAttribute(
+        CurrentPositionLiftPercent100thsAttributeCallback callback) {
+      readCurrentPositionLiftPercent100thsAttribute(chipClusterPtr, callback);
+    }
 
-    public interface DefaultOtaProvidersAttributeCallback {
-      void onSuccess(List<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation> valueList);
+    public void subscribeCurrentPositionLiftPercent100thsAttribute(
+        CurrentPositionLiftPercent100thsAttributeCallback callback,
+        int minInterval,
+        int maxInterval) {
+      subscribeCurrentPositionLiftPercent100thsAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readCurrentPositionTiltPercent100thsAttribute(
+        CurrentPositionTiltPercent100thsAttributeCallback callback) {
+      readCurrentPositionTiltPercent100thsAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeCurrentPositionTiltPercent100thsAttribute(
+        CurrentPositionTiltPercent100thsAttributeCallback callback,
+        int minInterval,
+        int maxInterval) {
+      subscribeCurrentPositionTiltPercent100thsAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface UpdateStateProgressAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public void readInstalledOpenLimitLiftAttribute(IntegerAttributeCallback callback) {
+      readInstalledOpenLimitLiftAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void subscribeInstalledOpenLimitLiftAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeInstalledOpenLimitLiftAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readInstalledClosedLimitLiftAttribute(IntegerAttributeCallback callback) {
+      readInstalledClosedLimitLiftAttribute(chipClusterPtr, callback);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void subscribeInstalledClosedLimitLiftAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeInstalledClosedLimitLiftAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readInstalledOpenLimitTiltAttribute(IntegerAttributeCallback callback) {
+      readInstalledOpenLimitTiltAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeInstalledOpenLimitTiltAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeInstalledOpenLimitTiltAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readDefaultOtaProvidersAttribute(DefaultOtaProvidersAttributeCallback callback) {
-      readDefaultOtaProvidersAttribute(chipClusterPtr, callback);
+    public void readInstalledClosedLimitTiltAttribute(IntegerAttributeCallback callback) {
+      readInstalledClosedLimitTiltAttribute(chipClusterPtr, callback);
     }
 
-    public void writeDefaultOtaProvidersAttribute(
-        DefaultClusterCallback callback,
-        ArrayList<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation> value) {
-      writeDefaultOtaProvidersAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeInstalledClosedLimitTiltAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeInstalledClosedLimitTiltAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeDefaultOtaProvidersAttribute(
-        DefaultClusterCallback callback,
-        ArrayList<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation> value,
-        int timedWriteTimeoutMs) {
-      writeDefaultOtaProvidersAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readModeAttribute(IntegerAttributeCallback callback) {
+      readModeAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeDefaultOtaProvidersAttribute(
-        DefaultOtaProvidersAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeDefaultOtaProvidersAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeModeAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readUpdatePossibleAttribute(BooleanAttributeCallback callback) {
-      readUpdatePossibleAttribute(chipClusterPtr, callback);
+    public void writeModeAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeUpdatePossibleAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeUpdatePossibleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readUpdateStateAttribute(IntegerAttributeCallback callback) {
-      readUpdateStateAttribute(chipClusterPtr, callback);
+    public void readSafetyStatusAttribute(IntegerAttributeCallback callback) {
+      readSafetyStatusAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeUpdateStateAttribute(
+    public void subscribeSafetyStatusAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeUpdateStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeSafetyStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readUpdateStateProgressAttribute(UpdateStateProgressAttributeCallback callback) {
-      readUpdateStateProgressAttribute(chipClusterPtr, callback);
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeUpdateStateProgressAttribute(
-        UpdateStateProgressAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeUpdateStateProgressAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
@@ -13187,187 +12721,164 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readDefaultOtaProvidersAttribute(
-        long chipClusterPtr, DefaultOtaProvidersAttributeCallback callback);
-
-    private native void writeDefaultOtaProvidersAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        ArrayList<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation> value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void readTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeDefaultOtaProvidersAttribute(
-        long chipClusterPtr,
-        DefaultOtaProvidersAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeTypeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readUpdatePossibleAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
+    private native void readPhysicalClosedLimitLiftAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeUpdatePossibleAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribePhysicalClosedLimitLiftAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readUpdateStateAttribute(
+    private native void readPhysicalClosedLimitTiltAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeUpdateStateAttribute(
+    private native void subscribePhysicalClosedLimitTiltAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readUpdateStateProgressAttribute(
-        long chipClusterPtr, UpdateStateProgressAttributeCallback callback);
+    private native void readCurrentPositionLiftAttribute(
+        long chipClusterPtr, CurrentPositionLiftAttributeCallback callback);
 
-    private native void subscribeUpdateStateProgressAttribute(
+    private native void subscribeCurrentPositionLiftAttribute(
         long chipClusterPtr,
-        UpdateStateProgressAttributeCallback callback,
+        CurrentPositionLiftAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readAttributeListAttribute(
-        long chipClusterPtr, AttributeListAttributeCallback callback);
+    private native void readCurrentPositionTiltAttribute(
+        long chipClusterPtr, CurrentPositionTiltAttributeCallback callback);
 
-    private native void subscribeAttributeListAttribute(
+    private native void subscribeCurrentPositionTiltAttribute(
         long chipClusterPtr,
-        AttributeListAttributeCallback callback,
+        CurrentPositionTiltAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(
+    private native void readNumberOfActuationsLiftAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeClusterRevisionAttribute(
+    private native void subscribeNumberOfActuationsLiftAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
-
-  public static class OccupancySensingCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1030L;
-
-    public OccupancySensingCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
-
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
 
-      void onError(Exception ex);
+    private native void readNumberOfActuationsTiltAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeNumberOfActuationsTiltAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void readConfigStatusAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void subscribeConfigStatusAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void readCurrentPositionLiftPercentageAttribute(
+        long chipClusterPtr, CurrentPositionLiftPercentageAttributeCallback callback);
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void subscribeCurrentPositionLiftPercentageAttribute(
+        long chipClusterPtr,
+        CurrentPositionLiftPercentageAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-      void onError(Exception ex);
+    private native void readCurrentPositionTiltPercentageAttribute(
+        long chipClusterPtr, CurrentPositionTiltPercentageAttributeCallback callback);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeCurrentPositionTiltPercentageAttribute(
+        long chipClusterPtr,
+        CurrentPositionTiltPercentageAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void readOccupancyAttribute(IntegerAttributeCallback callback) {
-      readOccupancyAttribute(chipClusterPtr, callback);
-    }
+    private native void readOperationalStatusAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeOccupancyAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeOccupancyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeOperationalStatusAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readOccupancySensorTypeAttribute(IntegerAttributeCallback callback) {
-      readOccupancySensorTypeAttribute(chipClusterPtr, callback);
-    }
+    private native void readTargetPositionLiftPercent100thsAttribute(
+        long chipClusterPtr, TargetPositionLiftPercent100thsAttributeCallback callback);
 
-    public void subscribeOccupancySensorTypeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeOccupancySensorTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeTargetPositionLiftPercent100thsAttribute(
+        long chipClusterPtr,
+        TargetPositionLiftPercent100thsAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void readOccupancySensorTypeBitmapAttribute(IntegerAttributeCallback callback) {
-      readOccupancySensorTypeBitmapAttribute(chipClusterPtr, callback);
-    }
+    private native void readTargetPositionTiltPercent100thsAttribute(
+        long chipClusterPtr, TargetPositionTiltPercent100thsAttributeCallback callback);
 
-    public void subscribeOccupancySensorTypeBitmapAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeOccupancySensorTypeBitmapAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeTargetPositionTiltPercent100thsAttribute(
+        long chipClusterPtr,
+        TargetPositionTiltPercent100thsAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
-    }
+    private native void readEndProductTypeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeEndProductTypeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
-    }
+    private native void readCurrentPositionLiftPercent100thsAttribute(
+        long chipClusterPtr, CurrentPositionLiftPercent100thsAttributeCallback callback);
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeCurrentPositionLiftPercent100thsAttribute(
+        long chipClusterPtr,
+        CurrentPositionLiftPercent100thsAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
-    }
+    private native void readCurrentPositionTiltPercent100thsAttribute(
+        long chipClusterPtr, CurrentPositionTiltPercent100thsAttributeCallback callback);
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeCurrentPositionTiltPercent100thsAttribute(
+        long chipClusterPtr,
+        CurrentPositionTiltPercent100thsAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
-    }
+    private native void readInstalledOpenLimitLiftAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeInstalledOpenLimitLiftAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
+    private native void readInstalledClosedLimitLiftAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeInstalledClosedLimitLiftAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readOccupancyAttribute(
+    private native void readInstalledOpenLimitTiltAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeOccupancyAttribute(
+    private native void subscribeInstalledOpenLimitTiltAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readOccupancySensorTypeAttribute(
+    private native void readInstalledClosedLimitTiltAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeOccupancySensorTypeAttribute(
+    private native void subscribeInstalledClosedLimitTiltAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readOccupancySensorTypeBitmapAttribute(
+    private native void readModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeModeAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeModeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readSafetyStatusAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeOccupancySensorTypeBitmapAttribute(
+    private native void subscribeSafetyStatusAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
     private native void readGeneratedCommandListAttribute(
@@ -13410,126 +12921,45 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class OnOffCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 6L;
+  public static class BarrierControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 259L;
 
-    public OnOffCluster(long devicePtr, int endpointId) {
+    public BarrierControlCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void off(DefaultClusterCallback callback) {
-      off(chipClusterPtr, callback, null);
-    }
-
-    public void off(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-
-      off(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
-
-    public void offWithEffect(
-        DefaultClusterCallback callback, Integer effectId, Integer effectVariant) {
-      offWithEffect(chipClusterPtr, callback, effectId, effectVariant, null);
-    }
-
-    public void offWithEffect(
-        DefaultClusterCallback callback,
-        Integer effectId,
-        Integer effectVariant,
-        int timedInvokeTimeoutMs) {
-      offWithEffect(chipClusterPtr, callback, effectId, effectVariant, timedInvokeTimeoutMs);
-    }
-
-    public void on(DefaultClusterCallback callback) {
-      on(chipClusterPtr, callback, null);
-    }
-
-    public void on(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-
-      on(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
-
-    public void onWithRecallGlobalScene(DefaultClusterCallback callback) {
-      onWithRecallGlobalScene(chipClusterPtr, callback, null);
-    }
-
-    public void onWithRecallGlobalScene(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-
-      onWithRecallGlobalScene(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
-
-    public void onWithTimedOff(
-        DefaultClusterCallback callback,
-        Integer onOffControl,
-        Integer onTime,
-        Integer offWaitTime) {
-      onWithTimedOff(chipClusterPtr, callback, onOffControl, onTime, offWaitTime, null);
+    public void barrierControlGoToPercent(DefaultClusterCallback callback, Integer percentOpen) {
+      barrierControlGoToPercent(chipClusterPtr, callback, percentOpen, null);
     }
 
-    public void onWithTimedOff(
-        DefaultClusterCallback callback,
-        Integer onOffControl,
-        Integer onTime,
-        Integer offWaitTime,
-        int timedInvokeTimeoutMs) {
-      onWithTimedOff(
-          chipClusterPtr, callback, onOffControl, onTime, offWaitTime, timedInvokeTimeoutMs);
+    public void barrierControlGoToPercent(
+        DefaultClusterCallback callback, Integer percentOpen, int timedInvokeTimeoutMs) {
+      barrierControlGoToPercent(chipClusterPtr, callback, percentOpen, timedInvokeTimeoutMs);
     }
 
-    public void toggle(DefaultClusterCallback callback) {
-      toggle(chipClusterPtr, callback, null);
+    public void barrierControlStop(DefaultClusterCallback callback) {
+      barrierControlStop(chipClusterPtr, callback, null);
     }
 
-    public void toggle(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+    public void barrierControlStop(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
 
-      toggle(chipClusterPtr, callback, timedInvokeTimeoutMs);
+      barrierControlStop(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    private native void off(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void offWithEffect(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer effectId,
-        Integer effectVariant,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void on(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void onWithRecallGlobalScene(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void onWithTimedOff(
+    private native void barrierControlGoToPercent(
         long chipClusterPtr,
         DefaultClusterCallback Callback,
-        Integer onOffControl,
-        Integer onTime,
-        Integer offWaitTime,
+        Integer percentOpen,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void toggle(
+    private native void barrierControlStop(
         long chipClusterPtr,
         DefaultClusterCallback Callback,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    public interface StartUpOnOffAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
     public interface GeneratedCommandListAttributeCallback {
       void onSuccess(List<Long> valueList);
 
@@ -13541,89 +12971,53 @@ default void onSubscriptionEstablished() {}
     public interface AcceptedCommandListAttributeCallback {
       void onSuccess(List<Long> valueList);
 
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public void readOnOffAttribute(BooleanAttributeCallback callback) {
-      readOnOffAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeOnOffAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeOnOffAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readGlobalSceneControlAttribute(BooleanAttributeCallback callback) {
-      readGlobalSceneControlAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeGlobalSceneControlAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGlobalSceneControlAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readOnTimeAttribute(IntegerAttributeCallback callback) {
-      readOnTimeAttribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeOnTimeAttribute(DefaultClusterCallback callback, Integer value) {
-      writeOnTimeAttribute(chipClusterPtr, callback, value, null);
-    }
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void writeOnTimeAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeOnTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+      void onError(Exception ex);
 
-    public void subscribeOnTimeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeOnTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readOffWaitTimeAttribute(IntegerAttributeCallback callback) {
-      readOffWaitTimeAttribute(chipClusterPtr, callback);
+    public void readBarrierMovingStateAttribute(IntegerAttributeCallback callback) {
+      readBarrierMovingStateAttribute(chipClusterPtr, callback);
     }
 
-    public void writeOffWaitTimeAttribute(DefaultClusterCallback callback, Integer value) {
-      writeOffWaitTimeAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeBarrierMovingStateAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBarrierMovingStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeOffWaitTimeAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeOffWaitTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readBarrierSafetyStatusAttribute(IntegerAttributeCallback callback) {
+      readBarrierSafetyStatusAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeOffWaitTimeAttribute(
+    public void subscribeBarrierSafetyStatusAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeOffWaitTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeBarrierSafetyStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readStartUpOnOffAttribute(StartUpOnOffAttributeCallback callback) {
-      readStartUpOnOffAttribute(chipClusterPtr, callback);
+    public void readBarrierCapabilitiesAttribute(IntegerAttributeCallback callback) {
+      readBarrierCapabilitiesAttribute(chipClusterPtr, callback);
     }
 
-    public void writeStartUpOnOffAttribute(DefaultClusterCallback callback, Integer value) {
-      writeStartUpOnOffAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeBarrierCapabilitiesAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBarrierCapabilitiesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeStartUpOnOffAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeStartUpOnOffAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readBarrierPositionAttribute(IntegerAttributeCallback callback) {
+      readBarrierPositionAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeStartUpOnOffAttribute(
-        StartUpOnOffAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeStartUpOnOffAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeBarrierPositionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBarrierPositionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -13671,54 +13065,29 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readOnOffAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void subscribeOnOffAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGlobalSceneControlAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void subscribeGlobalSceneControlAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+    private native void readBarrierMovingStateAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void readOnTimeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeBarrierMovingStateAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void writeOnTimeAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void readBarrierSafetyStatusAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeOnTimeAttribute(
+    private native void subscribeBarrierSafetyStatusAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readOffWaitTimeAttribute(
+    private native void readBarrierCapabilitiesAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeOffWaitTimeAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeOffWaitTimeAttribute(
+    private native void subscribeBarrierCapabilitiesAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readStartUpOnOffAttribute(
-        long chipClusterPtr, StartUpOnOffAttributeCallback callback);
-
-    private native void writeStartUpOnOffAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void readBarrierPositionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeStartUpOnOffAttribute(
-        long chipClusterPtr,
-        StartUpOnOffAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeBarrierPositionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
     private native void readGeneratedCommandListAttribute(
         long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
@@ -13760,566 +13129,672 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class OnOffSwitchConfigurationCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 7L;
+  public static class PumpConfigurationAndControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 512L;
 
-    public OnOffSwitchConfigurationCluster(long devicePtr, int endpointId) {
+    public PumpConfigurationAndControlCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public interface MaxPressureAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public interface MaxSpeedAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public interface MaxFlowAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public void readSwitchTypeAttribute(IntegerAttributeCallback callback) {
-      readSwitchTypeAttribute(chipClusterPtr, callback);
-    }
+    public interface MinConstPressureAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    public void subscribeSwitchTypeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSwitchTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readSwitchActionsAttribute(IntegerAttributeCallback callback) {
-      readSwitchActionsAttribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeSwitchActionsAttribute(DefaultClusterCallback callback, Integer value) {
-      writeSwitchActionsAttribute(chipClusterPtr, callback, value, null);
-    }
+    public interface MaxConstPressureAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    public void writeSwitchActionsAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeSwitchActionsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+      void onError(Exception ex);
 
-    public void subscribeSwitchActionsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSwitchActionsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
-    }
+    public interface MinCompPressureAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface MaxCompPressureAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
+    public interface MinConstSpeedAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface MaxConstSpeedAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
+    public interface MinConstFlowAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface MaxConstFlowAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
+    public interface MinConstTempAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface MaxConstTempAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    private native void readSwitchTypeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface CapacityAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    private native void subscribeSwitchTypeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
 
-    private native void readSwitchActionsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void writeSwitchActionsAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public interface SpeedAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    private native void subscribeSwitchActionsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
 
-    private native void readGeneratedCommandListAttribute(
-        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeGeneratedCommandListAttribute(
-        long chipClusterPtr,
-        GeneratedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public interface LifetimeRunningHoursAttributeCallback {
+      void onSuccess(@Nullable Long value);
 
-    private native void readAcceptedCommandListAttribute(
-        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void subscribeAcceptedCommandListAttribute(
-        long chipClusterPtr,
-        AcceptedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readAttributeListAttribute(
-        long chipClusterPtr, AttributeListAttributeCallback callback);
+    public interface PowerAttributeCallback {
+      void onSuccess(@Nullable Long value);
 
-    private native void subscribeAttributeListAttribute(
-        long chipClusterPtr,
-        AttributeListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+      void onError(Exception ex);
 
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public interface LifetimeEnergyConsumedAttributeCallback {
+      void onSuccess(@Nullable Long value);
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void subscribeClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+      default void onSubscriptionEstablished() {}
+    }
 
-  public static class OperationalCredentialsCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 62L;
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public OperationalCredentialsCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void addNOC(
-        NOCResponseCallback callback,
-        byte[] NOCValue,
-        Optional<byte[]> ICACValue,
-        byte[] IPKValue,
-        Long caseAdminSubject,
-        Integer adminVendorId) {
-      addNOC(
-          chipClusterPtr,
-          callback,
-          NOCValue,
-          ICACValue,
-          IPKValue,
-          caseAdminSubject,
-          adminVendorId,
-          null);
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void addNOC(
-        NOCResponseCallback callback,
-        byte[] NOCValue,
-        Optional<byte[]> ICACValue,
-        byte[] IPKValue,
-        Long caseAdminSubject,
-        Integer adminVendorId,
-        int timedInvokeTimeoutMs) {
-      addNOC(
-          chipClusterPtr,
-          callback,
-          NOCValue,
-          ICACValue,
-          IPKValue,
-          caseAdminSubject,
-          adminVendorId,
-          timedInvokeTimeoutMs);
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void addTrustedRootCertificate(DefaultClusterCallback callback, byte[] rootCertificate) {
-      addTrustedRootCertificate(chipClusterPtr, callback, rootCertificate, null);
+    public void readMaxPressureAttribute(MaxPressureAttributeCallback callback) {
+      readMaxPressureAttribute(chipClusterPtr, callback);
     }
 
-    public void addTrustedRootCertificate(
-        DefaultClusterCallback callback, byte[] rootCertificate, int timedInvokeTimeoutMs) {
-      addTrustedRootCertificate(chipClusterPtr, callback, rootCertificate, timedInvokeTimeoutMs);
+    public void subscribeMaxPressureAttribute(
+        MaxPressureAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMaxPressureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void attestationRequest(AttestationResponseCallback callback, byte[] attestationNonce) {
-      attestationRequest(chipClusterPtr, callback, attestationNonce, null);
+    public void readMaxSpeedAttribute(MaxSpeedAttributeCallback callback) {
+      readMaxSpeedAttribute(chipClusterPtr, callback);
     }
 
-    public void attestationRequest(
-        AttestationResponseCallback callback, byte[] attestationNonce, int timedInvokeTimeoutMs) {
-      attestationRequest(chipClusterPtr, callback, attestationNonce, timedInvokeTimeoutMs);
+    public void subscribeMaxSpeedAttribute(
+        MaxSpeedAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMaxSpeedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void CSRRequest(
-        CSRResponseCallback callback, byte[] CSRNonce, Optional<Boolean> isForUpdateNOC) {
-      CSRRequest(chipClusterPtr, callback, CSRNonce, isForUpdateNOC, null);
+    public void readMaxFlowAttribute(MaxFlowAttributeCallback callback) {
+      readMaxFlowAttribute(chipClusterPtr, callback);
     }
 
-    public void CSRRequest(
-        CSRResponseCallback callback,
-        byte[] CSRNonce,
-        Optional<Boolean> isForUpdateNOC,
-        int timedInvokeTimeoutMs) {
-      CSRRequest(chipClusterPtr, callback, CSRNonce, isForUpdateNOC, timedInvokeTimeoutMs);
+    public void subscribeMaxFlowAttribute(
+        MaxFlowAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMaxFlowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void certificateChainRequest(
-        CertificateChainResponseCallback callback, Integer certificateType) {
-      certificateChainRequest(chipClusterPtr, callback, certificateType, null);
+    public void readMinConstPressureAttribute(MinConstPressureAttributeCallback callback) {
+      readMinConstPressureAttribute(chipClusterPtr, callback);
     }
 
-    public void certificateChainRequest(
-        CertificateChainResponseCallback callback,
-        Integer certificateType,
-        int timedInvokeTimeoutMs) {
-      certificateChainRequest(chipClusterPtr, callback, certificateType, timedInvokeTimeoutMs);
+    public void subscribeMinConstPressureAttribute(
+        MinConstPressureAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMinConstPressureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void removeFabric(NOCResponseCallback callback, Integer fabricIndex) {
-      removeFabric(chipClusterPtr, callback, fabricIndex, null);
+    public void readMaxConstPressureAttribute(MaxConstPressureAttributeCallback callback) {
+      readMaxConstPressureAttribute(chipClusterPtr, callback);
     }
 
-    public void removeFabric(
-        NOCResponseCallback callback, Integer fabricIndex, int timedInvokeTimeoutMs) {
-      removeFabric(chipClusterPtr, callback, fabricIndex, timedInvokeTimeoutMs);
+    public void subscribeMaxConstPressureAttribute(
+        MaxConstPressureAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMaxConstPressureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void updateFabricLabel(NOCResponseCallback callback, String label) {
-      updateFabricLabel(chipClusterPtr, callback, label, null);
+    public void readMinCompPressureAttribute(MinCompPressureAttributeCallback callback) {
+      readMinCompPressureAttribute(chipClusterPtr, callback);
     }
 
-    public void updateFabricLabel(
-        NOCResponseCallback callback, String label, int timedInvokeTimeoutMs) {
-      updateFabricLabel(chipClusterPtr, callback, label, timedInvokeTimeoutMs);
+    public void subscribeMinCompPressureAttribute(
+        MinCompPressureAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMinCompPressureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void updateNOC(
-        NOCResponseCallback callback, byte[] NOCValue, Optional<byte[]> ICACValue) {
-      updateNOC(chipClusterPtr, callback, NOCValue, ICACValue, null);
+    public void readMaxCompPressureAttribute(MaxCompPressureAttributeCallback callback) {
+      readMaxCompPressureAttribute(chipClusterPtr, callback);
     }
 
-    public void updateNOC(
-        NOCResponseCallback callback,
-        byte[] NOCValue,
-        Optional<byte[]> ICACValue,
-        int timedInvokeTimeoutMs) {
-      updateNOC(chipClusterPtr, callback, NOCValue, ICACValue, timedInvokeTimeoutMs);
+    public void subscribeMaxCompPressureAttribute(
+        MaxCompPressureAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMaxCompPressureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void addNOC(
-        long chipClusterPtr,
-        NOCResponseCallback Callback,
-        byte[] NOCValue,
-        Optional<byte[]> ICACValue,
-        byte[] IPKValue,
-        Long caseAdminSubject,
-        Integer adminVendorId,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void readMinConstSpeedAttribute(MinConstSpeedAttributeCallback callback) {
+      readMinConstSpeedAttribute(chipClusterPtr, callback);
+    }
 
-    private native void addTrustedRootCertificate(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        byte[] rootCertificate,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeMinConstSpeedAttribute(
+        MinConstSpeedAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMinConstSpeedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void attestationRequest(
-        long chipClusterPtr,
-        AttestationResponseCallback Callback,
-        byte[] attestationNonce,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void readMaxConstSpeedAttribute(MaxConstSpeedAttributeCallback callback) {
+      readMaxConstSpeedAttribute(chipClusterPtr, callback);
+    }
 
-    private native void CSRRequest(
-        long chipClusterPtr,
-        CSRResponseCallback Callback,
-        byte[] CSRNonce,
-        Optional<Boolean> isForUpdateNOC,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeMaxConstSpeedAttribute(
+        MaxConstSpeedAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMaxConstSpeedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void certificateChainRequest(
-        long chipClusterPtr,
-        CertificateChainResponseCallback Callback,
-        Integer certificateType,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void readMinConstFlowAttribute(MinConstFlowAttributeCallback callback) {
+      readMinConstFlowAttribute(chipClusterPtr, callback);
+    }
 
-    private native void removeFabric(
-        long chipClusterPtr,
-        NOCResponseCallback Callback,
-        Integer fabricIndex,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeMinConstFlowAttribute(
+        MinConstFlowAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMinConstFlowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void updateFabricLabel(
-        long chipClusterPtr,
-        NOCResponseCallback Callback,
-        String label,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void readMaxConstFlowAttribute(MaxConstFlowAttributeCallback callback) {
+      readMaxConstFlowAttribute(chipClusterPtr, callback);
+    }
 
-    private native void updateNOC(
-        long chipClusterPtr,
-        NOCResponseCallback Callback,
-        byte[] NOCValue,
-        Optional<byte[]> ICACValue,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeMaxConstFlowAttribute(
+        MaxConstFlowAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMaxConstFlowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    public interface AttestationResponseCallback {
-      void onSuccess(byte[] attestationElements, byte[] signature);
+    public void readMinConstTempAttribute(MinConstTempAttributeCallback callback) {
+      readMinConstTempAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception error);
+    public void subscribeMinConstTempAttribute(
+        MinConstTempAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMinConstTempAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface CSRResponseCallback {
-      void onSuccess(byte[] NOCSRElements, byte[] attestationSignature);
-
-      void onError(Exception error);
+    public void readMaxConstTempAttribute(MaxConstTempAttributeCallback callback) {
+      readMaxConstTempAttribute(chipClusterPtr, callback);
     }
 
-    public interface CertificateChainResponseCallback {
-      void onSuccess(byte[] certificate);
+    public void subscribeMaxConstTempAttribute(
+        MaxConstTempAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMaxConstTempAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception error);
+    public void readPumpStatusAttribute(IntegerAttributeCallback callback) {
+      readPumpStatusAttribute(chipClusterPtr, callback);
     }
 
-    public interface NOCResponseCallback {
-      void onSuccess(Integer statusCode, Optional<Integer> fabricIndex, Optional<String> debugText);
+    public void subscribePumpStatusAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePumpStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception error);
+    public void readEffectiveOperationModeAttribute(IntegerAttributeCallback callback) {
+      readEffectiveOperationModeAttribute(chipClusterPtr, callback);
     }
 
-    public interface NOCsAttributeCallback {
-      void onSuccess(List<ChipStructs.OperationalCredentialsClusterNOCStruct> valueList);
+    public void subscribeEffectiveOperationModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeEffectiveOperationModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readEffectiveControlModeAttribute(IntegerAttributeCallback callback) {
+      readEffectiveControlModeAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeEffectiveControlModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeEffectiveControlModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface FabricsAttributeCallback {
-      void onSuccess(List<ChipStructs.OperationalCredentialsClusterFabricDescriptor> valueList);
+    public void readCapacityAttribute(CapacityAttributeCallback callback) {
+      readCapacityAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void subscribeCapacityAttribute(
+        CapacityAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCapacityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readSpeedAttribute(SpeedAttributeCallback callback) {
+      readSpeedAttribute(chipClusterPtr, callback);
     }
 
-    public interface TrustedRootCertificatesAttributeCallback {
-      void onSuccess(List<byte[]> valueList);
+    public void subscribeSpeedAttribute(
+        SpeedAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSpeedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readLifetimeRunningHoursAttribute(LifetimeRunningHoursAttributeCallback callback) {
+      readLifetimeRunningHoursAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void writeLifetimeRunningHoursAttribute(DefaultClusterCallback callback, Long value) {
+      writeLifetimeRunningHoursAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public interface CurrentFabricIndexAttributeCallback {
-      void onSuccess(Integer value);
+    public void writeLifetimeRunningHoursAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeLifetimeRunningHoursAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-      void onError(Exception ex);
+    public void subscribeLifetimeRunningHoursAttribute(
+        LifetimeRunningHoursAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeLifetimeRunningHoursAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readPowerAttribute(PowerAttributeCallback callback) {
+      readPowerAttribute(chipClusterPtr, callback);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void subscribePowerAttribute(
+        PowerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readLifetimeEnergyConsumedAttribute(
+        LifetimeEnergyConsumedAttributeCallback callback) {
+      readLifetimeEnergyConsumedAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void writeLifetimeEnergyConsumedAttribute(DefaultClusterCallback callback, Long value) {
+      writeLifetimeEnergyConsumedAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void writeLifetimeEnergyConsumedAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeLifetimeEnergyConsumedAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-      void onError(Exception ex);
+    public void subscribeLifetimeEnergyConsumedAttribute(
+        LifetimeEnergyConsumedAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeLifetimeEnergyConsumedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readOperationModeAttribute(IntegerAttributeCallback callback) {
+      readOperationModeAttribute(chipClusterPtr, callback);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void writeOperationModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOperationModeAttribute(chipClusterPtr, callback, value, null);
+    }
 
-      void onError(Exception ex);
+    public void writeOperationModeAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOperationModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeOperationModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeOperationModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readNOCsAttribute(NOCsAttributeCallback callback) {
-      readNOCsAttribute(chipClusterPtr, callback);
+    public void readControlModeAttribute(IntegerAttributeCallback callback) {
+      readControlModeAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeNOCsAttribute(
-        NOCsAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNOCsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeControlModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeControlModeAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readFabricsAttribute(FabricsAttributeCallback callback) {
-      readFabricsAttribute(chipClusterPtr, callback);
+    public void writeControlModeAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeControlModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeFabricsAttribute(
-        FabricsAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFabricsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeControlModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeControlModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readSupportedFabricsAttribute(IntegerAttributeCallback callback) {
-      readSupportedFabricsAttribute(chipClusterPtr, callback);
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeSupportedFabricsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSupportedFabricsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readCommissionedFabricsAttribute(IntegerAttributeCallback callback) {
-      readCommissionedFabricsAttribute(chipClusterPtr, callback);
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCommissionedFabricsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCommissionedFabricsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readTrustedRootCertificatesAttribute(
-        TrustedRootCertificatesAttributeCallback callback) {
-      readTrustedRootCertificatesAttribute(chipClusterPtr, callback);
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeTrustedRootCertificatesAttribute(
-        TrustedRootCertificatesAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTrustedRootCertificatesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readCurrentFabricIndexAttribute(CurrentFabricIndexAttributeCallback callback) {
-      readCurrentFabricIndexAttribute(chipClusterPtr, callback);
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentFabricIndexAttribute(
-        CurrentFabricIndexAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentFabricIndexAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
-    }
+    private native void readMaxPressureAttribute(
+        long chipClusterPtr, MaxPressureAttributeCallback callback);
+
+    private native void subscribeMaxPressureAttribute(
+        long chipClusterPtr,
+        MaxPressureAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readMaxSpeedAttribute(
+        long chipClusterPtr, MaxSpeedAttributeCallback callback);
+
+    private native void subscribeMaxSpeedAttribute(
+        long chipClusterPtr, MaxSpeedAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readMaxFlowAttribute(
+        long chipClusterPtr, MaxFlowAttributeCallback callback);
+
+    private native void subscribeMaxFlowAttribute(
+        long chipClusterPtr, MaxFlowAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readMinConstPressureAttribute(
+        long chipClusterPtr, MinConstPressureAttributeCallback callback);
+
+    private native void subscribeMinConstPressureAttribute(
+        long chipClusterPtr,
+        MinConstPressureAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readMaxConstPressureAttribute(
+        long chipClusterPtr, MaxConstPressureAttributeCallback callback);
+
+    private native void subscribeMaxConstPressureAttribute(
+        long chipClusterPtr,
+        MaxConstPressureAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readMinCompPressureAttribute(
+        long chipClusterPtr, MinCompPressureAttributeCallback callback);
+
+    private native void subscribeMinCompPressureAttribute(
+        long chipClusterPtr,
+        MinCompPressureAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readMaxCompPressureAttribute(
+        long chipClusterPtr, MaxCompPressureAttributeCallback callback);
+
+    private native void subscribeMaxCompPressureAttribute(
+        long chipClusterPtr,
+        MaxCompPressureAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readMinConstSpeedAttribute(
+        long chipClusterPtr, MinConstSpeedAttributeCallback callback);
+
+    private native void subscribeMinConstSpeedAttribute(
+        long chipClusterPtr,
+        MinConstSpeedAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readMaxConstSpeedAttribute(
+        long chipClusterPtr, MaxConstSpeedAttributeCallback callback);
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeMaxConstSpeedAttribute(
+        long chipClusterPtr,
+        MaxConstSpeedAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
-    }
+    private native void readMinConstFlowAttribute(
+        long chipClusterPtr, MinConstFlowAttributeCallback callback);
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeMinConstFlowAttribute(
+        long chipClusterPtr,
+        MinConstFlowAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
-    }
+    private native void readMaxConstFlowAttribute(
+        long chipClusterPtr, MaxConstFlowAttributeCallback callback);
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeMaxConstFlowAttribute(
+        long chipClusterPtr,
+        MaxConstFlowAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
+    private native void readMinConstTempAttribute(
+        long chipClusterPtr, MinConstTempAttributeCallback callback);
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeMinConstTempAttribute(
+        long chipClusterPtr,
+        MinConstTempAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void readNOCsAttribute(long chipClusterPtr, NOCsAttributeCallback callback);
+    private native void readMaxConstTempAttribute(
+        long chipClusterPtr, MaxConstTempAttributeCallback callback);
 
-    private native void subscribeNOCsAttribute(
-        long chipClusterPtr, NOCsAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeMaxConstTempAttribute(
+        long chipClusterPtr,
+        MaxConstTempAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void readFabricsAttribute(
-        long chipClusterPtr, FabricsAttributeCallback callback);
+    private native void readPumpStatusAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeFabricsAttribute(
-        long chipClusterPtr, FabricsAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribePumpStatusAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readSupportedFabricsAttribute(
+    private native void readEffectiveOperationModeAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeSupportedFabricsAttribute(
+    private native void subscribeEffectiveOperationModeAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readCommissionedFabricsAttribute(
+    private native void readEffectiveControlModeAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeCommissionedFabricsAttribute(
+    private native void subscribeEffectiveControlModeAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readTrustedRootCertificatesAttribute(
-        long chipClusterPtr, TrustedRootCertificatesAttributeCallback callback);
+    private native void readCapacityAttribute(
+        long chipClusterPtr, CapacityAttributeCallback callback);
 
-    private native void subscribeTrustedRootCertificatesAttribute(
+    private native void subscribeCapacityAttribute(
+        long chipClusterPtr, CapacityAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readSpeedAttribute(long chipClusterPtr, SpeedAttributeCallback callback);
+
+    private native void subscribeSpeedAttribute(
+        long chipClusterPtr, SpeedAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readLifetimeRunningHoursAttribute(
+        long chipClusterPtr, LifetimeRunningHoursAttributeCallback callback);
+
+    private native void writeLifetimeRunningHoursAttribute(
         long chipClusterPtr,
-        TrustedRootCertificatesAttributeCallback callback,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeLifetimeRunningHoursAttribute(
+        long chipClusterPtr,
+        LifetimeRunningHoursAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readCurrentFabricIndexAttribute(
-        long chipClusterPtr, CurrentFabricIndexAttributeCallback callback);
+    private native void readPowerAttribute(long chipClusterPtr, PowerAttributeCallback callback);
 
-    private native void subscribeCurrentFabricIndexAttribute(
+    private native void subscribePowerAttribute(
+        long chipClusterPtr, PowerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readLifetimeEnergyConsumedAttribute(
+        long chipClusterPtr, LifetimeEnergyConsumedAttributeCallback callback);
+
+    private native void writeLifetimeEnergyConsumedAttribute(
         long chipClusterPtr,
-        CurrentFabricIndexAttributeCallback callback,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeLifetimeEnergyConsumedAttribute(
+        long chipClusterPtr,
+        LifetimeEnergyConsumedAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
+    private native void readOperationModeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeOperationModeAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeOperationModeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readControlModeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeControlModeAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeControlModeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
     private native void readGeneratedCommandListAttribute(
         long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
@@ -14360,50 +13835,120 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class PowerSourceCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 47L;
+  public static class ThermostatCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 513L;
 
-    public PowerSourceCluster(long devicePtr, int endpointId) {
+    public ThermostatCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public interface ActiveWiredFaultsAttributeCallback {
-      void onSuccess(List<Integer> valueList);
+    public void setpointRaiseLower(DefaultClusterCallback callback, Integer mode, Integer amount) {
+      setpointRaiseLower(chipClusterPtr, callback, mode, amount, null);
+    }
 
-      void onError(Exception ex);
+    public void setpointRaiseLower(
+        DefaultClusterCallback callback, Integer mode, Integer amount, int timedInvokeTimeoutMs) {
+      setpointRaiseLower(chipClusterPtr, callback, mode, amount, timedInvokeTimeoutMs);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void setWeeklySchedule(
+        DefaultClusterCallback callback,
+        Integer numberOfTransitionsForSequence,
+        Integer dayOfWeekForSequence,
+        Integer modeForSequence,
+        ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions) {
+      setWeeklySchedule(
+          chipClusterPtr,
+          callback,
+          numberOfTransitionsForSequence,
+          dayOfWeekForSequence,
+          modeForSequence,
+          transitions,
+          null);
     }
 
-    public interface ActiveBatteryFaultsAttributeCallback {
-      void onSuccess(List<Integer> valueList);
+    public void setWeeklySchedule(
+        DefaultClusterCallback callback,
+        Integer numberOfTransitionsForSequence,
+        Integer dayOfWeekForSequence,
+        Integer modeForSequence,
+        ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions,
+        int timedInvokeTimeoutMs) {
+      setWeeklySchedule(
+          chipClusterPtr,
+          callback,
+          numberOfTransitionsForSequence,
+          dayOfWeekForSequence,
+          modeForSequence,
+          transitions,
+          timedInvokeTimeoutMs);
+    }
 
-      void onError(Exception ex);
+    public void getWeeklySchedule(
+        GetWeeklyScheduleResponseCallback callback, Integer daysToReturn, Integer modeToReturn) {
+      getWeeklySchedule(chipClusterPtr, callback, daysToReturn, modeToReturn, null);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void getWeeklySchedule(
+        GetWeeklyScheduleResponseCallback callback,
+        Integer daysToReturn,
+        Integer modeToReturn,
+        int timedInvokeTimeoutMs) {
+      getWeeklySchedule(chipClusterPtr, callback, daysToReturn, modeToReturn, timedInvokeTimeoutMs);
     }
 
-    public interface ActiveBatteryChargeFaultsAttributeCallback {
-      void onSuccess(List<Integer> valueList);
+    public void clearWeeklySchedule(DefaultClusterCallback callback) {
+      clearWeeklySchedule(chipClusterPtr, callback, null);
+    }
 
-      void onError(Exception ex);
+    public void clearWeeklySchedule(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
 
-      default void onSubscriptionEstablished() {}
+      clearWeeklySchedule(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void setpointRaiseLower(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer mode,
+        Integer amount,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-      void onError(Exception ex);
+    private native void setWeeklySchedule(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer numberOfTransitionsForSequence,
+        Integer dayOfWeekForSequence,
+        Integer modeForSequence,
+        ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void getWeeklySchedule(
+        long chipClusterPtr,
+        GetWeeklyScheduleResponseCallback Callback,
+        Integer daysToReturn,
+        Integer modeToReturn,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void clearWeeklySchedule(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    public interface GetWeeklyScheduleResponseCallback {
+      void onSuccess(
+          Integer numberOfTransitionsForSequence,
+          Integer dayOfWeekForSequence,
+          Integer modeForSequence,
+          ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions);
 
-      default void onSubscriptionEstablished() {}
+      void onError(Exception error);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public interface LocalTemperatureAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
 
@@ -14418,310 +13963,245 @@ public interface AttributeListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public void readStatusAttribute(IntegerAttributeCallback callback) {
-      readStatusAttribute(chipClusterPtr, callback);
+    public void readLocalTemperatureAttribute(LocalTemperatureAttributeCallback callback) {
+      readLocalTemperatureAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeStatusAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeLocalTemperatureAttribute(
+        LocalTemperatureAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeLocalTemperatureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readOrderAttribute(IntegerAttributeCallback callback) {
-      readOrderAttribute(chipClusterPtr, callback);
+    public void readAbsMinHeatSetpointLimitAttribute(IntegerAttributeCallback callback) {
+      readAbsMinHeatSetpointLimitAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeOrderAttribute(
+    public void subscribeAbsMinHeatSetpointLimitAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeOrderAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readDescriptionAttribute(CharStringAttributeCallback callback) {
-      readDescriptionAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeDescriptionAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeDescriptionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readWiredAssessedInputVoltageAttribute(LongAttributeCallback callback) {
-      readWiredAssessedInputVoltageAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeWiredAssessedInputVoltageAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeWiredAssessedInputVoltageAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAbsMinHeatSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readWiredAssessedInputFrequencyAttribute(IntegerAttributeCallback callback) {
-      readWiredAssessedInputFrequencyAttribute(chipClusterPtr, callback);
+    public void readAbsMaxHeatSetpointLimitAttribute(IntegerAttributeCallback callback) {
+      readAbsMaxHeatSetpointLimitAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeWiredAssessedInputFrequencyAttribute(
+    public void subscribeAbsMaxHeatSetpointLimitAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeWiredAssessedInputFrequencyAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAbsMaxHeatSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readWiredCurrentTypeAttribute(IntegerAttributeCallback callback) {
-      readWiredCurrentTypeAttribute(chipClusterPtr, callback);
+    public void readAbsMinCoolSetpointLimitAttribute(IntegerAttributeCallback callback) {
+      readAbsMinCoolSetpointLimitAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeWiredCurrentTypeAttribute(
+    public void subscribeAbsMinCoolSetpointLimitAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeWiredCurrentTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readWiredAssessedCurrentAttribute(LongAttributeCallback callback) {
-      readWiredAssessedCurrentAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeWiredAssessedCurrentAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeWiredAssessedCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readWiredNominalVoltageAttribute(LongAttributeCallback callback) {
-      readWiredNominalVoltageAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeWiredNominalVoltageAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeWiredNominalVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readWiredMaximumCurrentAttribute(LongAttributeCallback callback) {
-      readWiredMaximumCurrentAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeWiredMaximumCurrentAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeWiredMaximumCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readWiredPresentAttribute(BooleanAttributeCallback callback) {
-      readWiredPresentAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeWiredPresentAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeWiredPresentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAbsMinCoolSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readActiveWiredFaultsAttribute(ActiveWiredFaultsAttributeCallback callback) {
-      readActiveWiredFaultsAttribute(chipClusterPtr, callback);
+    public void readAbsMaxCoolSetpointLimitAttribute(IntegerAttributeCallback callback) {
+      readAbsMaxCoolSetpointLimitAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeActiveWiredFaultsAttribute(
-        ActiveWiredFaultsAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeActiveWiredFaultsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAbsMaxCoolSetpointLimitAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAbsMaxCoolSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readBatteryVoltageAttribute(LongAttributeCallback callback) {
-      readBatteryVoltageAttribute(chipClusterPtr, callback);
+    public void readOccupiedCoolingSetpointAttribute(IntegerAttributeCallback callback) {
+      readOccupiedCoolingSetpointAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeBatteryVoltageAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBatteryVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeOccupiedCoolingSetpointAttribute(
+        DefaultClusterCallback callback, Integer value) {
+      writeOccupiedCoolingSetpointAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readBatteryPercentRemainingAttribute(IntegerAttributeCallback callback) {
-      readBatteryPercentRemainingAttribute(chipClusterPtr, callback);
+    public void writeOccupiedCoolingSetpointAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOccupiedCoolingSetpointAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeBatteryPercentRemainingAttribute(
+    public void subscribeOccupiedCoolingSetpointAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBatteryPercentRemainingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeOccupiedCoolingSetpointAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readBatteryTimeRemainingAttribute(LongAttributeCallback callback) {
-      readBatteryTimeRemainingAttribute(chipClusterPtr, callback);
+    public void readOccupiedHeatingSetpointAttribute(IntegerAttributeCallback callback) {
+      readOccupiedHeatingSetpointAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeBatteryTimeRemainingAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBatteryTimeRemainingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeOccupiedHeatingSetpointAttribute(
+        DefaultClusterCallback callback, Integer value) {
+      writeOccupiedHeatingSetpointAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readBatteryChargeLevelAttribute(IntegerAttributeCallback callback) {
-      readBatteryChargeLevelAttribute(chipClusterPtr, callback);
+    public void writeOccupiedHeatingSetpointAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOccupiedHeatingSetpointAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeBatteryChargeLevelAttribute(
+    public void subscribeOccupiedHeatingSetpointAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBatteryChargeLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeOccupiedHeatingSetpointAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readBatteryReplacementNeededAttribute(BooleanAttributeCallback callback) {
-      readBatteryReplacementNeededAttribute(chipClusterPtr, callback);
+    public void readMinHeatSetpointLimitAttribute(IntegerAttributeCallback callback) {
+      readMinHeatSetpointLimitAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeBatteryReplacementNeededAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBatteryReplacementNeededAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeMinHeatSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
+      writeMinHeatSetpointLimitAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readBatteryReplaceabilityAttribute(IntegerAttributeCallback callback) {
-      readBatteryReplaceabilityAttribute(chipClusterPtr, callback);
+    public void writeMinHeatSetpointLimitAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeMinHeatSetpointLimitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeBatteryReplaceabilityAttribute(
+    public void subscribeMinHeatSetpointLimitAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBatteryReplaceabilityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readBatteryPresentAttribute(BooleanAttributeCallback callback) {
-      readBatteryPresentAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeBatteryPresentAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBatteryPresentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeMinHeatSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readActiveBatteryFaultsAttribute(ActiveBatteryFaultsAttributeCallback callback) {
-      readActiveBatteryFaultsAttribute(chipClusterPtr, callback);
+    public void readMaxHeatSetpointLimitAttribute(IntegerAttributeCallback callback) {
+      readMaxHeatSetpointLimitAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeActiveBatteryFaultsAttribute(
-        ActiveBatteryFaultsAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeActiveBatteryFaultsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeMaxHeatSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
+      writeMaxHeatSetpointLimitAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readBatteryReplacementDescriptionAttribute(CharStringAttributeCallback callback) {
-      readBatteryReplacementDescriptionAttribute(chipClusterPtr, callback);
+    public void writeMaxHeatSetpointLimitAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeMaxHeatSetpointLimitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeBatteryReplacementDescriptionAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBatteryReplacementDescriptionAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeMaxHeatSetpointLimitAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMaxHeatSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readBatteryCommonDesignationAttribute(LongAttributeCallback callback) {
-      readBatteryCommonDesignationAttribute(chipClusterPtr, callback);
+    public void readMinCoolSetpointLimitAttribute(IntegerAttributeCallback callback) {
+      readMinCoolSetpointLimitAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeBatteryCommonDesignationAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBatteryCommonDesignationAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeMinCoolSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
+      writeMinCoolSetpointLimitAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readBatteryANSIDesignationAttribute(CharStringAttributeCallback callback) {
-      readBatteryANSIDesignationAttribute(chipClusterPtr, callback);
+    public void writeMinCoolSetpointLimitAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeMinCoolSetpointLimitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeBatteryANSIDesignationAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBatteryANSIDesignationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeMinCoolSetpointLimitAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMinCoolSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readBatteryIECDesignationAttribute(CharStringAttributeCallback callback) {
-      readBatteryIECDesignationAttribute(chipClusterPtr, callback);
+    public void readMaxCoolSetpointLimitAttribute(IntegerAttributeCallback callback) {
+      readMaxCoolSetpointLimitAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeBatteryIECDesignationAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBatteryIECDesignationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeMaxCoolSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
+      writeMaxCoolSetpointLimitAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readBatteryApprovedChemistryAttribute(LongAttributeCallback callback) {
-      readBatteryApprovedChemistryAttribute(chipClusterPtr, callback);
+    public void writeMaxCoolSetpointLimitAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeMaxCoolSetpointLimitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeBatteryApprovedChemistryAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBatteryApprovedChemistryAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeMaxCoolSetpointLimitAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMaxCoolSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readBatteryCapacityAttribute(LongAttributeCallback callback) {
-      readBatteryCapacityAttribute(chipClusterPtr, callback);
+    public void readMinSetpointDeadBandAttribute(IntegerAttributeCallback callback) {
+      readMinSetpointDeadBandAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeBatteryCapacityAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBatteryCapacityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeMinSetpointDeadBandAttribute(DefaultClusterCallback callback, Integer value) {
+      writeMinSetpointDeadBandAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readBatteryQuantityAttribute(IntegerAttributeCallback callback) {
-      readBatteryQuantityAttribute(chipClusterPtr, callback);
+    public void writeMinSetpointDeadBandAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeMinSetpointDeadBandAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeBatteryQuantityAttribute(
+    public void subscribeMinSetpointDeadBandAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBatteryQuantityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeMinSetpointDeadBandAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readBatteryChargeStateAttribute(IntegerAttributeCallback callback) {
-      readBatteryChargeStateAttribute(chipClusterPtr, callback);
+    public void readControlSequenceOfOperationAttribute(IntegerAttributeCallback callback) {
+      readControlSequenceOfOperationAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeBatteryChargeStateAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBatteryChargeStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeControlSequenceOfOperationAttribute(
+        DefaultClusterCallback callback, Integer value) {
+      writeControlSequenceOfOperationAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readBatteryTimeToFullChargeAttribute(LongAttributeCallback callback) {
-      readBatteryTimeToFullChargeAttribute(chipClusterPtr, callback);
+    public void writeControlSequenceOfOperationAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeControlSequenceOfOperationAttribute(
+          chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeBatteryTimeToFullChargeAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBatteryTimeToFullChargeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeControlSequenceOfOperationAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeControlSequenceOfOperationAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readBatteryFunctionalWhileChargingAttribute(BooleanAttributeCallback callback) {
-      readBatteryFunctionalWhileChargingAttribute(chipClusterPtr, callback);
+    public void readSystemModeAttribute(IntegerAttributeCallback callback) {
+      readSystemModeAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeBatteryFunctionalWhileChargingAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBatteryFunctionalWhileChargingAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeSystemModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeSystemModeAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readBatteryChargingCurrentAttribute(LongAttributeCallback callback) {
-      readBatteryChargingCurrentAttribute(chipClusterPtr, callback);
+    public void writeSystemModeAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeSystemModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeBatteryChargingCurrentAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBatteryChargingCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeSystemModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSystemModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readActiveBatteryChargeFaultsAttribute(
-        ActiveBatteryChargeFaultsAttributeCallback callback) {
-      readActiveBatteryChargeFaultsAttribute(chipClusterPtr, callback);
+    public void readStartOfWeekAttribute(IntegerAttributeCallback callback) {
+      readStartOfWeekAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeActiveBatteryChargeFaultsAttribute(
-        ActiveBatteryChargeFaultsAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeActiveBatteryChargeFaultsAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeStartOfWeekAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeStartOfWeekAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    public void readNumberOfWeeklyTransitionsAttribute(IntegerAttributeCallback callback) {
+      readNumberOfWeeklyTransitionsAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeNumberOfWeeklyTransitionsAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNumberOfWeeklyTransitionsAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    public void readNumberOfDailyTransitionsAttribute(IntegerAttributeCallback callback) {
+      readNumberOfDailyTransitionsAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeNumberOfDailyTransitionsAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNumberOfDailyTransitionsAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
@@ -14751,228 +14231,164 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeStatusAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readOrderAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeOrderAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readDescriptionAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
+    private native void readLocalTemperatureAttribute(
+        long chipClusterPtr, LocalTemperatureAttributeCallback callback);
 
-    private native void subscribeDescriptionAttribute(
+    private native void subscribeLocalTemperatureAttribute(
         long chipClusterPtr,
-        CharStringAttributeCallback callback,
+        LocalTemperatureAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readWiredAssessedInputVoltageAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeWiredAssessedInputVoltageAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readWiredAssessedInputFrequencyAttribute(
+    private native void readAbsMinHeatSetpointLimitAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeWiredAssessedInputFrequencyAttribute(
+    private native void subscribeAbsMinHeatSetpointLimitAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readWiredCurrentTypeAttribute(
+    private native void readAbsMaxHeatSetpointLimitAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeWiredCurrentTypeAttribute(
+    private native void subscribeAbsMaxHeatSetpointLimitAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readWiredAssessedCurrentAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeWiredAssessedCurrentAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readWiredNominalVoltageAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeWiredNominalVoltageAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readWiredMaximumCurrentAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeWiredMaximumCurrentAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readWiredPresentAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void subscribeWiredPresentAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readActiveWiredFaultsAttribute(
-        long chipClusterPtr, ActiveWiredFaultsAttributeCallback callback);
-
-    private native void subscribeActiveWiredFaultsAttribute(
-        long chipClusterPtr,
-        ActiveWiredFaultsAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readBatteryVoltageAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeBatteryVoltageAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBatteryPercentRemainingAttribute(
+    private native void readAbsMinCoolSetpointLimitAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeBatteryPercentRemainingAttribute(
+    private native void subscribeAbsMinCoolSetpointLimitAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readBatteryTimeRemainingAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeBatteryTimeRemainingAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBatteryChargeLevelAttribute(
+    private native void readAbsMaxCoolSetpointLimitAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeBatteryChargeLevelAttribute(
+    private native void subscribeAbsMaxCoolSetpointLimitAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readBatteryReplacementNeededAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void subscribeBatteryReplacementNeededAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBatteryReplaceabilityAttribute(
+    private native void readOccupiedCoolingSetpointAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeBatteryReplaceabilityAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readBatteryPresentAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void subscribeBatteryPresentAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readActiveBatteryFaultsAttribute(
-        long chipClusterPtr, ActiveBatteryFaultsAttributeCallback callback);
-
-    private native void subscribeActiveBatteryFaultsAttribute(
+    private native void writeOccupiedCoolingSetpointAttribute(
         long chipClusterPtr,
-        ActiveBatteryFaultsAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readBatteryReplacementDescriptionAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
+    private native void subscribeOccupiedCoolingSetpointAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeBatteryReplacementDescriptionAttribute(
-        long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void readOccupiedHeatingSetpointAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void readBatteryCommonDesignationAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    private native void writeOccupiedHeatingSetpointAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeBatteryCommonDesignationAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeOccupiedHeatingSetpointAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readBatteryANSIDesignationAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
+    private native void readMinHeatSetpointLimitAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeBatteryANSIDesignationAttribute(
+    private native void writeMinHeatSetpointLimitAttribute(
         long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readBatteryIECDesignationAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
+    private native void subscribeMinHeatSetpointLimitAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeBatteryIECDesignationAttribute(
-        long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void readMaxHeatSetpointLimitAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void readBatteryApprovedChemistryAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    private native void writeMaxHeatSetpointLimitAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeBatteryApprovedChemistryAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeMaxHeatSetpointLimitAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readBatteryCapacityAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    private native void readMinCoolSetpointLimitAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeBatteryCapacityAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    private native void writeMinCoolSetpointLimitAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readBatteryQuantityAttribute(
+    private native void subscribeMinCoolSetpointLimitAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readMaxCoolSetpointLimitAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeBatteryQuantityAttribute(
+    private native void writeMaxCoolSetpointLimitAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeMaxCoolSetpointLimitAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readBatteryChargeStateAttribute(
+    private native void readMinSetpointDeadBandAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeBatteryChargeStateAttribute(
+    private native void writeMinSetpointDeadBandAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeMinSetpointDeadBandAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readBatteryTimeToFullChargeAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    private native void readControlSequenceOfOperationAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeBatteryTimeToFullChargeAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    private native void writeControlSequenceOfOperationAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readBatteryFunctionalWhileChargingAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
+    private native void subscribeControlSequenceOfOperationAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeBatteryFunctionalWhileChargingAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+    private native void readSystemModeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void readBatteryChargingCurrentAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    private native void writeSystemModeAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeBatteryChargingCurrentAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeSystemModeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readActiveBatteryChargeFaultsAttribute(
-        long chipClusterPtr, ActiveBatteryChargeFaultsAttributeCallback callback);
+    private native void readStartOfWeekAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeActiveBatteryChargeFaultsAttribute(
-        long chipClusterPtr,
-        ActiveBatteryChargeFaultsAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeStartOfWeekAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readGeneratedCommandListAttribute(
-        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    private native void readNumberOfWeeklyTransitionsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeGeneratedCommandListAttribute(
-        long chipClusterPtr,
-        GeneratedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeNumberOfWeeklyTransitionsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readAcceptedCommandListAttribute(
-        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    private native void readNumberOfDailyTransitionsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeAcceptedCommandListAttribute(
-        long chipClusterPtr,
-        AcceptedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeNumberOfDailyTransitionsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
     private native void readAttributeListAttribute(
         long chipClusterPtr, AttributeListAttributeCallback callback);
@@ -14996,33 +14412,33 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class PowerSourceConfigurationCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 46L;
+  public static class FanControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 514L;
 
-    public PowerSourceConfigurationCluster(long devicePtr, int endpointId) {
+    public FanControlCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public interface SourcesAttributeCallback {
-      void onSuccess(List<Integer> valueList);
+    public interface PercentSettingAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public interface SpeedSettingAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
+    public interface GeneratedCommandListAttributeCallback {
       void onSuccess(List<Long> valueList);
 
       void onError(Exception ex);
@@ -15030,7 +14446,7 @@ public interface AcceptedCommandListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public interface AttributeListAttributeCallback {
+    public interface AcceptedCommandListAttributeCallback {
       void onSuccess(List<Long> valueList);
 
       void onError(Exception ex);
@@ -15038,251 +14454,183 @@ public interface AttributeListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public void readSourcesAttribute(SourcesAttributeCallback callback) {
-      readSourcesAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeSourcesAttribute(
-        SourcesAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSourcesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    public void readFanModeAttribute(IntegerAttributeCallback callback) {
+      readFanModeAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeFanModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeFanModeAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
+    public void writeFanModeAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeFanModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeFanModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFanModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
+    public void readFanModeSequenceAttribute(IntegerAttributeCallback callback) {
+      readFanModeSequenceAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeFanModeSequenceAttribute(DefaultClusterCallback callback, Integer value) {
+      writeFanModeSequenceAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
+    public void writeFanModeSequenceAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeFanModeSequenceAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeClusterRevisionAttribute(
+    public void subscribeFanModeSequenceAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readSourcesAttribute(
-        long chipClusterPtr, SourcesAttributeCallback callback);
-
-    private native void subscribeSourcesAttribute(
-        long chipClusterPtr, SourcesAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(
-        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(
-        long chipClusterPtr,
-        GeneratedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(
-        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(
-        long chipClusterPtr,
-        AcceptedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readAttributeListAttribute(
-        long chipClusterPtr, AttributeListAttributeCallback callback);
-
-    private native void subscribeAttributeListAttribute(
-        long chipClusterPtr,
-        AttributeListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
-
-  public static class PressureMeasurementCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1027L;
-
-    public PressureMeasurementCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      subscribeFanModeSequenceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
-    public interface MeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void readPercentSettingAttribute(PercentSettingAttributeCallback callback) {
+      readPercentSettingAttribute(chipClusterPtr, callback);
     }
 
-    public interface MinMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void writePercentSettingAttribute(DefaultClusterCallback callback, Integer value) {
+      writePercentSettingAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public interface MaxMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void writePercentSettingAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writePercentSettingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public interface ScaledValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void subscribePercentSettingAttribute(
+        PercentSettingAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePercentSettingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface MinScaledValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
+    public void readPercentCurrentAttribute(IntegerAttributeCallback callback) {
+      readPercentCurrentAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribePercentCurrentAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePercentCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface MaxScaledValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public void readSpeedMaxAttribute(IntegerAttributeCallback callback) {
+      readSpeedMaxAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void subscribeSpeedMaxAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSpeedMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readSpeedSettingAttribute(SpeedSettingAttributeCallback callback) {
+      readSpeedSettingAttribute(chipClusterPtr, callback);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void writeSpeedSettingAttribute(DefaultClusterCallback callback, Integer value) {
+      writeSpeedSettingAttribute(chipClusterPtr, callback, value, null);
+    }
 
-      void onError(Exception ex);
+    public void writeSpeedSettingAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeSpeedSettingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeSpeedSettingAttribute(
+        SpeedSettingAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSpeedSettingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readMeasuredValueAttribute(MeasuredValueAttributeCallback callback) {
-      readMeasuredValueAttribute(chipClusterPtr, callback);
+    public void readSpeedCurrentAttribute(IntegerAttributeCallback callback) {
+      readSpeedCurrentAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeMeasuredValueAttribute(
-        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeSpeedCurrentAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSpeedCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readMinMeasuredValueAttribute(MinMeasuredValueAttributeCallback callback) {
-      readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    public void readRockSupportAttribute(IntegerAttributeCallback callback) {
+      readRockSupportAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeMinMeasuredValueAttribute(
-        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeRockSupportAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRockSupportAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readMaxMeasuredValueAttribute(MaxMeasuredValueAttributeCallback callback) {
-      readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    public void readRockSettingAttribute(IntegerAttributeCallback callback) {
+      readRockSettingAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeMaxMeasuredValueAttribute(
-        MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeRockSettingAttribute(DefaultClusterCallback callback, Integer value) {
+      writeRockSettingAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readToleranceAttribute(IntegerAttributeCallback callback) {
-      readToleranceAttribute(chipClusterPtr, callback);
+    public void writeRockSettingAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeRockSettingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeToleranceAttribute(
+    public void subscribeRockSettingAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeToleranceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeRockSettingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readScaledValueAttribute(ScaledValueAttributeCallback callback) {
-      readScaledValueAttribute(chipClusterPtr, callback);
+    public void readWindSupportAttribute(IntegerAttributeCallback callback) {
+      readWindSupportAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeScaledValueAttribute(
-        ScaledValueAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeScaledValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeWindSupportAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeWindSupportAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readMinScaledValueAttribute(MinScaledValueAttributeCallback callback) {
-      readMinScaledValueAttribute(chipClusterPtr, callback);
+    public void readWindSettingAttribute(IntegerAttributeCallback callback) {
+      readWindSettingAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeMinScaledValueAttribute(
-        MinScaledValueAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMinScaledValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeWindSettingAttribute(DefaultClusterCallback callback, Integer value) {
+      writeWindSettingAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readMaxScaledValueAttribute(MaxScaledValueAttributeCallback callback) {
-      readMaxScaledValueAttribute(chipClusterPtr, callback);
+    public void writeWindSettingAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeWindSettingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeMaxScaledValueAttribute(
-        MaxScaledValueAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMaxScaledValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeWindSettingAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeWindSettingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readScaledToleranceAttribute(IntegerAttributeCallback callback) {
-      readScaledToleranceAttribute(chipClusterPtr, callback);
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeScaledToleranceAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeScaledToleranceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readScaleAttribute(IntegerAttributeCallback callback) {
-      readScaleAttribute(chipClusterPtr, callback);
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeScaleAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeScaleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
@@ -15312,77 +14660,132 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readMeasuredValueAttribute(
-        long chipClusterPtr, MeasuredValueAttributeCallback callback);
+    private native void readFanModeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeMeasuredValueAttribute(
+    private native void writeFanModeAttribute(
         long chipClusterPtr,
-        MeasuredValueAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readMinMeasuredValueAttribute(
-        long chipClusterPtr, MinMeasuredValueAttributeCallback callback);
+    private native void subscribeFanModeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeMinMeasuredValueAttribute(
+    private native void readFanModeSequenceAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeFanModeSequenceAttribute(
         long chipClusterPtr,
-        MinMeasuredValueAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readMaxMeasuredValueAttribute(
-        long chipClusterPtr, MaxMeasuredValueAttributeCallback callback);
+    private native void subscribeFanModeSequenceAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeMaxMeasuredValueAttribute(
+    private native void readPercentSettingAttribute(
+        long chipClusterPtr, PercentSettingAttributeCallback callback);
+
+    private native void writePercentSettingAttribute(
         long chipClusterPtr,
-        MaxMeasuredValueAttributeCallback callback,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribePercentSettingAttribute(
+        long chipClusterPtr,
+        PercentSettingAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readToleranceAttribute(
+    private native void readPercentCurrentAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeToleranceAttribute(
+    private native void subscribePercentCurrentAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readScaledValueAttribute(
-        long chipClusterPtr, ScaledValueAttributeCallback callback);
+    private native void readSpeedMaxAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeScaledValueAttribute(
-        long chipClusterPtr,
-        ScaledValueAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeSpeedMaxAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readMinScaledValueAttribute(
-        long chipClusterPtr, MinScaledValueAttributeCallback callback);
+    private native void readSpeedSettingAttribute(
+        long chipClusterPtr, SpeedSettingAttributeCallback callback);
 
-    private native void subscribeMinScaledValueAttribute(
+    private native void writeSpeedSettingAttribute(
         long chipClusterPtr,
-        MinScaledValueAttributeCallback callback,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeSpeedSettingAttribute(
+        long chipClusterPtr,
+        SpeedSettingAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readMaxScaledValueAttribute(
-        long chipClusterPtr, MaxScaledValueAttributeCallback callback);
+    private native void readSpeedCurrentAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeMaxScaledValueAttribute(
+    private native void subscribeSpeedCurrentAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readRockSupportAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeRockSupportAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readRockSettingAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeRockSettingAttribute(
         long chipClusterPtr,
-        MaxScaledValueAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readScaledToleranceAttribute(
+    private native void subscribeRockSettingAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readWindSupportAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeScaledToleranceAttribute(
+    private native void subscribeWindSupportAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readScaleAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readWindSettingAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeScaleAttribute(
+    private native void writeWindSettingAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeWindSettingAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
+    private native void readGeneratedCommandListAttribute(
+        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+
+    private native void subscribeGeneratedCommandListAttribute(
+        long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(
+        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+
+    private native void subscribeAcceptedCommandListAttribute(
+        long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
     private native void readAttributeListAttribute(
         long chipClusterPtr, AttributeListAttributeCallback callback);
 
@@ -15405,1215 +14808,1751 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class PumpConfigurationAndControlCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 512L;
+  public static class ThermostatUserInterfaceConfigurationCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 516L;
 
-    public PumpConfigurationAndControlCluster(long devicePtr, int endpointId) {
+    public ThermostatUserInterfaceConfigurationCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public interface MaxPressureAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface MaxSpeedAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface MaxFlowAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface MinConstPressureAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void readTemperatureDisplayModeAttribute(IntegerAttributeCallback callback) {
+      readTemperatureDisplayModeAttribute(chipClusterPtr, callback);
     }
 
-    public interface MaxConstPressureAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void writeTemperatureDisplayModeAttribute(
+        DefaultClusterCallback callback, Integer value) {
+      writeTemperatureDisplayModeAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public interface MinCompPressureAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void writeTemperatureDisplayModeAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeTemperatureDisplayModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public interface MaxCompPressureAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void subscribeTemperatureDisplayModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTemperatureDisplayModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface MinConstSpeedAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void readKeypadLockoutAttribute(IntegerAttributeCallback callback) {
+      readKeypadLockoutAttribute(chipClusterPtr, callback);
     }
 
-    public interface MaxConstSpeedAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void writeKeypadLockoutAttribute(DefaultClusterCallback callback, Integer value) {
+      writeKeypadLockoutAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public interface MinConstFlowAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void writeKeypadLockoutAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeKeypadLockoutAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public interface MaxConstFlowAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void subscribeKeypadLockoutAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeKeypadLockoutAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface MinConstTempAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void readScheduleProgrammingVisibilityAttribute(IntegerAttributeCallback callback) {
+      readScheduleProgrammingVisibilityAttribute(chipClusterPtr, callback);
     }
 
-    public interface MaxConstTempAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void writeScheduleProgrammingVisibilityAttribute(
+        DefaultClusterCallback callback, Integer value) {
+      writeScheduleProgrammingVisibilityAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public interface CapacityAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void writeScheduleProgrammingVisibilityAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeScheduleProgrammingVisibilityAttribute(
+          chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public interface SpeedAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
+    public void subscribeScheduleProgrammingVisibilityAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeScheduleProgrammingVisibilityAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public interface LifetimeRunningHoursAttributeCallback {
-      void onSuccess(@Nullable Long value);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface PowerAttributeCallback {
-      void onSuccess(@Nullable Long value);
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public interface LifetimeEnergyConsumedAttributeCallback {
-      void onSuccess(@Nullable Long value);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void readTemperatureDisplayModeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void writeTemperatureDisplayModeAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeTemperatureDisplayModeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void readKeypadLockoutAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void writeKeypadLockoutAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeKeypadLockoutAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void readScheduleProgrammingVisibilityAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void writeScheduleProgrammingVisibilityAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeScheduleProgrammingVisibilityAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readMaxPressureAttribute(MaxPressureAttributeCallback callback) {
-      readMaxPressureAttribute(chipClusterPtr, callback);
-    }
+    private native void readGeneratedCommandListAttribute(
+        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
-    public void subscribeMaxPressureAttribute(
-        MaxPressureAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMaxPressureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeGeneratedCommandListAttribute(
+        long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void readMaxSpeedAttribute(MaxSpeedAttributeCallback callback) {
-      readMaxSpeedAttribute(chipClusterPtr, callback);
-    }
+    private native void readAcceptedCommandListAttribute(
+        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
 
-    public void subscribeMaxSpeedAttribute(
-        MaxSpeedAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMaxSpeedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeAcceptedCommandListAttribute(
+        long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void readMaxFlowAttribute(MaxFlowAttributeCallback callback) {
-      readMaxFlowAttribute(chipClusterPtr, callback);
-    }
+    private native void readAttributeListAttribute(
+        long chipClusterPtr, AttributeListAttributeCallback callback);
 
-    public void subscribeMaxFlowAttribute(
-        MaxFlowAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMaxFlowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeAttributeListAttribute(
+        long chipClusterPtr,
+        AttributeListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void readMinConstPressureAttribute(MinConstPressureAttributeCallback callback) {
-      readMinConstPressureAttribute(chipClusterPtr, callback);
-    }
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void subscribeFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void subscribeMinConstPressureAttribute(
-        MinConstPressureAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMinConstPressureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void readMaxConstPressureAttribute(MaxConstPressureAttributeCallback callback) {
-      readMaxConstPressureAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
 
-    public void subscribeMaxConstPressureAttribute(
-        MaxConstPressureAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMaxConstPressureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+  public static class ColorControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 768L;
 
-    public void readMinCompPressureAttribute(MinCompPressureAttributeCallback callback) {
-      readMinCompPressureAttribute(chipClusterPtr, callback);
+    public ColorControlCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
     }
 
-    public void subscribeMinCompPressureAttribute(
-        MinCompPressureAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMinCompPressureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void moveToHue(
+        DefaultClusterCallback callback,
+        Integer hue,
+        Integer direction,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride) {
+      moveToHue(
+          chipClusterPtr,
+          callback,
+          hue,
+          direction,
+          transitionTime,
+          optionsMask,
+          optionsOverride,
+          null);
     }
 
-    public void readMaxCompPressureAttribute(MaxCompPressureAttributeCallback callback) {
-      readMaxCompPressureAttribute(chipClusterPtr, callback);
+    public void moveToHue(
+        DefaultClusterCallback callback,
+        Integer hue,
+        Integer direction,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride,
+        int timedInvokeTimeoutMs) {
+      moveToHue(
+          chipClusterPtr,
+          callback,
+          hue,
+          direction,
+          transitionTime,
+          optionsMask,
+          optionsOverride,
+          timedInvokeTimeoutMs);
     }
 
-    public void subscribeMaxCompPressureAttribute(
-        MaxCompPressureAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMaxCompPressureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void moveHue(
+        DefaultClusterCallback callback,
+        Integer moveMode,
+        Integer rate,
+        Integer optionsMask,
+        Integer optionsOverride) {
+      moveHue(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, null);
     }
 
-    public void readMinConstSpeedAttribute(MinConstSpeedAttributeCallback callback) {
-      readMinConstSpeedAttribute(chipClusterPtr, callback);
+    public void moveHue(
+        DefaultClusterCallback callback,
+        Integer moveMode,
+        Integer rate,
+        Integer optionsMask,
+        Integer optionsOverride,
+        int timedInvokeTimeoutMs) {
+      moveHue(
+          chipClusterPtr,
+          callback,
+          moveMode,
+          rate,
+          optionsMask,
+          optionsOverride,
+          timedInvokeTimeoutMs);
     }
 
-    public void subscribeMinConstSpeedAttribute(
-        MinConstSpeedAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMinConstSpeedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void stepHue(
+        DefaultClusterCallback callback,
+        Integer stepMode,
+        Integer stepSize,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride) {
+      stepHue(
+          chipClusterPtr,
+          callback,
+          stepMode,
+          stepSize,
+          transitionTime,
+          optionsMask,
+          optionsOverride,
+          null);
     }
 
-    public void readMaxConstSpeedAttribute(MaxConstSpeedAttributeCallback callback) {
-      readMaxConstSpeedAttribute(chipClusterPtr, callback);
+    public void stepHue(
+        DefaultClusterCallback callback,
+        Integer stepMode,
+        Integer stepSize,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride,
+        int timedInvokeTimeoutMs) {
+      stepHue(
+          chipClusterPtr,
+          callback,
+          stepMode,
+          stepSize,
+          transitionTime,
+          optionsMask,
+          optionsOverride,
+          timedInvokeTimeoutMs);
     }
 
-    public void subscribeMaxConstSpeedAttribute(
-        MaxConstSpeedAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMaxConstSpeedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void moveToSaturation(
+        DefaultClusterCallback callback,
+        Integer saturation,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride) {
+      moveToSaturation(
+          chipClusterPtr, callback, saturation, transitionTime, optionsMask, optionsOverride, null);
     }
 
-    public void readMinConstFlowAttribute(MinConstFlowAttributeCallback callback) {
-      readMinConstFlowAttribute(chipClusterPtr, callback);
+    public void moveToSaturation(
+        DefaultClusterCallback callback,
+        Integer saturation,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride,
+        int timedInvokeTimeoutMs) {
+      moveToSaturation(
+          chipClusterPtr,
+          callback,
+          saturation,
+          transitionTime,
+          optionsMask,
+          optionsOverride,
+          timedInvokeTimeoutMs);
     }
 
-    public void subscribeMinConstFlowAttribute(
-        MinConstFlowAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMinConstFlowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void moveSaturation(
+        DefaultClusterCallback callback,
+        Integer moveMode,
+        Integer rate,
+        Integer optionsMask,
+        Integer optionsOverride) {
+      moveSaturation(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, null);
     }
 
-    public void readMaxConstFlowAttribute(MaxConstFlowAttributeCallback callback) {
-      readMaxConstFlowAttribute(chipClusterPtr, callback);
+    public void moveSaturation(
+        DefaultClusterCallback callback,
+        Integer moveMode,
+        Integer rate,
+        Integer optionsMask,
+        Integer optionsOverride,
+        int timedInvokeTimeoutMs) {
+      moveSaturation(
+          chipClusterPtr,
+          callback,
+          moveMode,
+          rate,
+          optionsMask,
+          optionsOverride,
+          timedInvokeTimeoutMs);
     }
 
-    public void subscribeMaxConstFlowAttribute(
-        MaxConstFlowAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMaxConstFlowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void stepSaturation(
+        DefaultClusterCallback callback,
+        Integer stepMode,
+        Integer stepSize,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride) {
+      stepSaturation(
+          chipClusterPtr,
+          callback,
+          stepMode,
+          stepSize,
+          transitionTime,
+          optionsMask,
+          optionsOverride,
+          null);
     }
 
-    public void readMinConstTempAttribute(MinConstTempAttributeCallback callback) {
-      readMinConstTempAttribute(chipClusterPtr, callback);
+    public void stepSaturation(
+        DefaultClusterCallback callback,
+        Integer stepMode,
+        Integer stepSize,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride,
+        int timedInvokeTimeoutMs) {
+      stepSaturation(
+          chipClusterPtr,
+          callback,
+          stepMode,
+          stepSize,
+          transitionTime,
+          optionsMask,
+          optionsOverride,
+          timedInvokeTimeoutMs);
     }
 
-    public void subscribeMinConstTempAttribute(
-        MinConstTempAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMinConstTempAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void moveToHueAndSaturation(
+        DefaultClusterCallback callback,
+        Integer hue,
+        Integer saturation,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride) {
+      moveToHueAndSaturation(
+          chipClusterPtr,
+          callback,
+          hue,
+          saturation,
+          transitionTime,
+          optionsMask,
+          optionsOverride,
+          null);
     }
 
-    public void readMaxConstTempAttribute(MaxConstTempAttributeCallback callback) {
-      readMaxConstTempAttribute(chipClusterPtr, callback);
+    public void moveToHueAndSaturation(
+        DefaultClusterCallback callback,
+        Integer hue,
+        Integer saturation,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride,
+        int timedInvokeTimeoutMs) {
+      moveToHueAndSaturation(
+          chipClusterPtr,
+          callback,
+          hue,
+          saturation,
+          transitionTime,
+          optionsMask,
+          optionsOverride,
+          timedInvokeTimeoutMs);
     }
 
-    public void subscribeMaxConstTempAttribute(
-        MaxConstTempAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMaxConstTempAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void moveToColor(
+        DefaultClusterCallback callback,
+        Integer colorX,
+        Integer colorY,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride) {
+      moveToColor(
+          chipClusterPtr,
+          callback,
+          colorX,
+          colorY,
+          transitionTime,
+          optionsMask,
+          optionsOverride,
+          null);
     }
 
-    public void readPumpStatusAttribute(IntegerAttributeCallback callback) {
-      readPumpStatusAttribute(chipClusterPtr, callback);
+    public void moveToColor(
+        DefaultClusterCallback callback,
+        Integer colorX,
+        Integer colorY,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride,
+        int timedInvokeTimeoutMs) {
+      moveToColor(
+          chipClusterPtr,
+          callback,
+          colorX,
+          colorY,
+          transitionTime,
+          optionsMask,
+          optionsOverride,
+          timedInvokeTimeoutMs);
     }
 
-    public void subscribePumpStatusAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePumpStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void moveColor(
+        DefaultClusterCallback callback,
+        Integer rateX,
+        Integer rateY,
+        Integer optionsMask,
+        Integer optionsOverride) {
+      moveColor(chipClusterPtr, callback, rateX, rateY, optionsMask, optionsOverride, null);
     }
 
-    public void readEffectiveOperationModeAttribute(IntegerAttributeCallback callback) {
-      readEffectiveOperationModeAttribute(chipClusterPtr, callback);
+    public void moveColor(
+        DefaultClusterCallback callback,
+        Integer rateX,
+        Integer rateY,
+        Integer optionsMask,
+        Integer optionsOverride,
+        int timedInvokeTimeoutMs) {
+      moveColor(
+          chipClusterPtr,
+          callback,
+          rateX,
+          rateY,
+          optionsMask,
+          optionsOverride,
+          timedInvokeTimeoutMs);
     }
 
-    public void subscribeEffectiveOperationModeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeEffectiveOperationModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void stepColor(
+        DefaultClusterCallback callback,
+        Integer stepX,
+        Integer stepY,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride) {
+      stepColor(
+          chipClusterPtr,
+          callback,
+          stepX,
+          stepY,
+          transitionTime,
+          optionsMask,
+          optionsOverride,
+          null);
     }
 
-    public void readEffectiveControlModeAttribute(IntegerAttributeCallback callback) {
-      readEffectiveControlModeAttribute(chipClusterPtr, callback);
+    public void stepColor(
+        DefaultClusterCallback callback,
+        Integer stepX,
+        Integer stepY,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride,
+        int timedInvokeTimeoutMs) {
+      stepColor(
+          chipClusterPtr,
+          callback,
+          stepX,
+          stepY,
+          transitionTime,
+          optionsMask,
+          optionsOverride,
+          timedInvokeTimeoutMs);
     }
 
-    public void subscribeEffectiveControlModeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeEffectiveControlModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void moveToColorTemperature(
+        DefaultClusterCallback callback,
+        Integer colorTemperature,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride) {
+      moveToColorTemperature(
+          chipClusterPtr,
+          callback,
+          colorTemperature,
+          transitionTime,
+          optionsMask,
+          optionsOverride,
+          null);
     }
 
-    public void readCapacityAttribute(CapacityAttributeCallback callback) {
-      readCapacityAttribute(chipClusterPtr, callback);
+    public void moveToColorTemperature(
+        DefaultClusterCallback callback,
+        Integer colorTemperature,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride,
+        int timedInvokeTimeoutMs) {
+      moveToColorTemperature(
+          chipClusterPtr,
+          callback,
+          colorTemperature,
+          transitionTime,
+          optionsMask,
+          optionsOverride,
+          timedInvokeTimeoutMs);
     }
 
-    public void subscribeCapacityAttribute(
-        CapacityAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCapacityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void enhancedMoveToHue(
+        DefaultClusterCallback callback,
+        Integer enhancedHue,
+        Integer direction,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride) {
+      enhancedMoveToHue(
+          chipClusterPtr,
+          callback,
+          enhancedHue,
+          direction,
+          transitionTime,
+          optionsMask,
+          optionsOverride,
+          null);
     }
 
-    public void readSpeedAttribute(SpeedAttributeCallback callback) {
-      readSpeedAttribute(chipClusterPtr, callback);
+    public void enhancedMoveToHue(
+        DefaultClusterCallback callback,
+        Integer enhancedHue,
+        Integer direction,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride,
+        int timedInvokeTimeoutMs) {
+      enhancedMoveToHue(
+          chipClusterPtr,
+          callback,
+          enhancedHue,
+          direction,
+          transitionTime,
+          optionsMask,
+          optionsOverride,
+          timedInvokeTimeoutMs);
     }
 
-    public void subscribeSpeedAttribute(
-        SpeedAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSpeedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void enhancedMoveHue(
+        DefaultClusterCallback callback,
+        Integer moveMode,
+        Integer rate,
+        Integer optionsMask,
+        Integer optionsOverride) {
+      enhancedMoveHue(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, null);
     }
 
-    public void readLifetimeRunningHoursAttribute(LifetimeRunningHoursAttributeCallback callback) {
-      readLifetimeRunningHoursAttribute(chipClusterPtr, callback);
+    public void enhancedMoveHue(
+        DefaultClusterCallback callback,
+        Integer moveMode,
+        Integer rate,
+        Integer optionsMask,
+        Integer optionsOverride,
+        int timedInvokeTimeoutMs) {
+      enhancedMoveHue(
+          chipClusterPtr,
+          callback,
+          moveMode,
+          rate,
+          optionsMask,
+          optionsOverride,
+          timedInvokeTimeoutMs);
     }
 
-    public void writeLifetimeRunningHoursAttribute(DefaultClusterCallback callback, Long value) {
-      writeLifetimeRunningHoursAttribute(chipClusterPtr, callback, value, null);
+    public void enhancedStepHue(
+        DefaultClusterCallback callback,
+        Integer stepMode,
+        Integer stepSize,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride) {
+      enhancedStepHue(
+          chipClusterPtr,
+          callback,
+          stepMode,
+          stepSize,
+          transitionTime,
+          optionsMask,
+          optionsOverride,
+          null);
     }
 
-    public void writeLifetimeRunningHoursAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeLifetimeRunningHoursAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void enhancedStepHue(
+        DefaultClusterCallback callback,
+        Integer stepMode,
+        Integer stepSize,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride,
+        int timedInvokeTimeoutMs) {
+      enhancedStepHue(
+          chipClusterPtr,
+          callback,
+          stepMode,
+          stepSize,
+          transitionTime,
+          optionsMask,
+          optionsOverride,
+          timedInvokeTimeoutMs);
     }
 
-    public void subscribeLifetimeRunningHoursAttribute(
-        LifetimeRunningHoursAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeLifetimeRunningHoursAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void enhancedMoveToHueAndSaturation(
+        DefaultClusterCallback callback,
+        Integer enhancedHue,
+        Integer saturation,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride) {
+      enhancedMoveToHueAndSaturation(
+          chipClusterPtr,
+          callback,
+          enhancedHue,
+          saturation,
+          transitionTime,
+          optionsMask,
+          optionsOverride,
+          null);
     }
 
-    public void readPowerAttribute(PowerAttributeCallback callback) {
-      readPowerAttribute(chipClusterPtr, callback);
+    public void enhancedMoveToHueAndSaturation(
+        DefaultClusterCallback callback,
+        Integer enhancedHue,
+        Integer saturation,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride,
+        int timedInvokeTimeoutMs) {
+      enhancedMoveToHueAndSaturation(
+          chipClusterPtr,
+          callback,
+          enhancedHue,
+          saturation,
+          transitionTime,
+          optionsMask,
+          optionsOverride,
+          timedInvokeTimeoutMs);
     }
 
-    public void subscribePowerAttribute(
-        PowerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void colorLoopSet(
+        DefaultClusterCallback callback,
+        Integer updateFlags,
+        Integer action,
+        Integer direction,
+        Integer time,
+        Integer startHue,
+        Integer optionsMask,
+        Integer optionsOverride) {
+      colorLoopSet(
+          chipClusterPtr,
+          callback,
+          updateFlags,
+          action,
+          direction,
+          time,
+          startHue,
+          optionsMask,
+          optionsOverride,
+          null);
     }
 
-    public void readLifetimeEnergyConsumedAttribute(
-        LifetimeEnergyConsumedAttributeCallback callback) {
-      readLifetimeEnergyConsumedAttribute(chipClusterPtr, callback);
+    public void colorLoopSet(
+        DefaultClusterCallback callback,
+        Integer updateFlags,
+        Integer action,
+        Integer direction,
+        Integer time,
+        Integer startHue,
+        Integer optionsMask,
+        Integer optionsOverride,
+        int timedInvokeTimeoutMs) {
+      colorLoopSet(
+          chipClusterPtr,
+          callback,
+          updateFlags,
+          action,
+          direction,
+          time,
+          startHue,
+          optionsMask,
+          optionsOverride,
+          timedInvokeTimeoutMs);
     }
 
-    public void writeLifetimeEnergyConsumedAttribute(DefaultClusterCallback callback, Long value) {
-      writeLifetimeEnergyConsumedAttribute(chipClusterPtr, callback, value, null);
+    public void stopMoveStep(
+        DefaultClusterCallback callback, Integer optionsMask, Integer optionsOverride) {
+      stopMoveStep(chipClusterPtr, callback, optionsMask, optionsOverride, null);
     }
 
-    public void writeLifetimeEnergyConsumedAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeLifetimeEnergyConsumedAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void stopMoveStep(
+        DefaultClusterCallback callback,
+        Integer optionsMask,
+        Integer optionsOverride,
+        int timedInvokeTimeoutMs) {
+      stopMoveStep(chipClusterPtr, callback, optionsMask, optionsOverride, timedInvokeTimeoutMs);
     }
 
-    public void subscribeLifetimeEnergyConsumedAttribute(
-        LifetimeEnergyConsumedAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeLifetimeEnergyConsumedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void moveColorTemperature(
+        DefaultClusterCallback callback,
+        Integer moveMode,
+        Integer rate,
+        Integer colorTemperatureMinimumMireds,
+        Integer colorTemperatureMaximumMireds,
+        Integer optionsMask,
+        Integer optionsOverride) {
+      moveColorTemperature(
+          chipClusterPtr,
+          callback,
+          moveMode,
+          rate,
+          colorTemperatureMinimumMireds,
+          colorTemperatureMaximumMireds,
+          optionsMask,
+          optionsOverride,
+          null);
     }
 
-    public void readOperationModeAttribute(IntegerAttributeCallback callback) {
-      readOperationModeAttribute(chipClusterPtr, callback);
+    public void moveColorTemperature(
+        DefaultClusterCallback callback,
+        Integer moveMode,
+        Integer rate,
+        Integer colorTemperatureMinimumMireds,
+        Integer colorTemperatureMaximumMireds,
+        Integer optionsMask,
+        Integer optionsOverride,
+        int timedInvokeTimeoutMs) {
+      moveColorTemperature(
+          chipClusterPtr,
+          callback,
+          moveMode,
+          rate,
+          colorTemperatureMinimumMireds,
+          colorTemperatureMaximumMireds,
+          optionsMask,
+          optionsOverride,
+          timedInvokeTimeoutMs);
     }
 
-    public void writeOperationModeAttribute(DefaultClusterCallback callback, Integer value) {
-      writeOperationModeAttribute(chipClusterPtr, callback, value, null);
+    public void stepColorTemperature(
+        DefaultClusterCallback callback,
+        Integer stepMode,
+        Integer stepSize,
+        Integer transitionTime,
+        Integer colorTemperatureMinimumMireds,
+        Integer colorTemperatureMaximumMireds,
+        Integer optionsMask,
+        Integer optionsOverride) {
+      stepColorTemperature(
+          chipClusterPtr,
+          callback,
+          stepMode,
+          stepSize,
+          transitionTime,
+          colorTemperatureMinimumMireds,
+          colorTemperatureMaximumMireds,
+          optionsMask,
+          optionsOverride,
+          null);
     }
 
-    public void writeOperationModeAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeOperationModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void stepColorTemperature(
+        DefaultClusterCallback callback,
+        Integer stepMode,
+        Integer stepSize,
+        Integer transitionTime,
+        Integer colorTemperatureMinimumMireds,
+        Integer colorTemperatureMaximumMireds,
+        Integer optionsMask,
+        Integer optionsOverride,
+        int timedInvokeTimeoutMs) {
+      stepColorTemperature(
+          chipClusterPtr,
+          callback,
+          stepMode,
+          stepSize,
+          transitionTime,
+          colorTemperatureMinimumMireds,
+          colorTemperatureMaximumMireds,
+          optionsMask,
+          optionsOverride,
+          timedInvokeTimeoutMs);
     }
 
-    public void subscribeOperationModeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeOperationModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void moveToHue(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer hue,
+        Integer direction,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void readControlModeAttribute(IntegerAttributeCallback callback) {
-      readControlModeAttribute(chipClusterPtr, callback);
-    }
+    private native void moveHue(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer moveMode,
+        Integer rate,
+        Integer optionsMask,
+        Integer optionsOverride,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void writeControlModeAttribute(DefaultClusterCallback callback, Integer value) {
-      writeControlModeAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void stepHue(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer stepMode,
+        Integer stepSize,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void writeControlModeAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeControlModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void moveToSaturation(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer saturation,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void subscribeControlModeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeControlModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void moveSaturation(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer moveMode,
+        Integer rate,
+        Integer optionsMask,
+        Integer optionsOverride,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
-    }
+    private native void stepSaturation(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer stepMode,
+        Integer stepSize,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void moveToHueAndSaturation(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer hue,
+        Integer saturation,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
-    }
+    private native void moveToColor(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer colorX,
+        Integer colorY,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void moveColor(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer rateX,
+        Integer rateY,
+        Integer optionsMask,
+        Integer optionsOverride,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
-    }
+    private native void stepColor(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer stepX,
+        Integer stepY,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void moveToColorTemperature(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer colorTemperature,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
-    }
+    private native void enhancedMoveToHue(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer enhancedHue,
+        Integer direction,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void enhancedMoveHue(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer moveMode,
+        Integer rate,
+        Integer optionsMask,
+        Integer optionsOverride,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
+    private native void enhancedStepHue(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer stepMode,
+        Integer stepSize,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void enhancedMoveToHueAndSaturation(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer enhancedHue,
+        Integer saturation,
+        Integer transitionTime,
+        Integer optionsMask,
+        Integer optionsOverride,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void readMaxPressureAttribute(
-        long chipClusterPtr, MaxPressureAttributeCallback callback);
+    private native void colorLoopSet(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer updateFlags,
+        Integer action,
+        Integer direction,
+        Integer time,
+        Integer startHue,
+        Integer optionsMask,
+        Integer optionsOverride,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void subscribeMaxPressureAttribute(
+    private native void stopMoveStep(
         long chipClusterPtr,
-        MaxPressureAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+        DefaultClusterCallback Callback,
+        Integer optionsMask,
+        Integer optionsOverride,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void readMaxSpeedAttribute(
-        long chipClusterPtr, MaxSpeedAttributeCallback callback);
+    private native void moveColorTemperature(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer moveMode,
+        Integer rate,
+        Integer colorTemperatureMinimumMireds,
+        Integer colorTemperatureMaximumMireds,
+        Integer optionsMask,
+        Integer optionsOverride,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void subscribeMaxSpeedAttribute(
-        long chipClusterPtr, MaxSpeedAttributeCallback callback, int minInterval, int maxInterval);
+    private native void stepColorTemperature(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer stepMode,
+        Integer stepSize,
+        Integer transitionTime,
+        Integer colorTemperatureMinimumMireds,
+        Integer colorTemperatureMaximumMireds,
+        Integer optionsMask,
+        Integer optionsOverride,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void readMaxFlowAttribute(
-        long chipClusterPtr, MaxFlowAttributeCallback callback);
+    public interface NumberOfPrimariesAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    private native void subscribeMaxFlowAttribute(
-        long chipClusterPtr, MaxFlowAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
 
-    private native void readMinConstPressureAttribute(
-        long chipClusterPtr, MinConstPressureAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeMinConstPressureAttribute(
-        long chipClusterPtr,
-        MinConstPressureAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public interface Primary1IntensityAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    private native void readMaxConstPressureAttribute(
-        long chipClusterPtr, MaxConstPressureAttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void subscribeMaxConstPressureAttribute(
-        long chipClusterPtr,
-        MaxConstPressureAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readMinCompPressureAttribute(
-        long chipClusterPtr, MinCompPressureAttributeCallback callback);
+    public interface Primary2IntensityAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    private native void subscribeMinCompPressureAttribute(
-        long chipClusterPtr,
-        MinCompPressureAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+      void onError(Exception ex);
 
-    private native void readMaxCompPressureAttribute(
-        long chipClusterPtr, MaxCompPressureAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeMaxCompPressureAttribute(
-        long chipClusterPtr,
-        MaxCompPressureAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public interface Primary3IntensityAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    private native void readMinConstSpeedAttribute(
-        long chipClusterPtr, MinConstSpeedAttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void subscribeMinConstSpeedAttribute(
-        long chipClusterPtr,
-        MinConstSpeedAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readMaxConstSpeedAttribute(
-        long chipClusterPtr, MaxConstSpeedAttributeCallback callback);
+    public interface Primary4IntensityAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    private native void subscribeMaxConstSpeedAttribute(
-        long chipClusterPtr,
-        MaxConstSpeedAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+      void onError(Exception ex);
 
-    private native void readMinConstFlowAttribute(
-        long chipClusterPtr, MinConstFlowAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeMinConstFlowAttribute(
-        long chipClusterPtr,
-        MinConstFlowAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public interface Primary5IntensityAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    private native void readMaxConstFlowAttribute(
-        long chipClusterPtr, MaxConstFlowAttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void subscribeMaxConstFlowAttribute(
-        long chipClusterPtr,
-        MaxConstFlowAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readMinConstTempAttribute(
-        long chipClusterPtr, MinConstTempAttributeCallback callback);
+    public interface Primary6IntensityAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    private native void subscribeMinConstTempAttribute(
-        long chipClusterPtr,
-        MinConstTempAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+      void onError(Exception ex);
 
-    private native void readMaxConstTempAttribute(
-        long chipClusterPtr, MaxConstTempAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeMaxConstTempAttribute(
-        long chipClusterPtr,
-        MaxConstTempAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public interface ColorPointRIntensityAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    private native void readPumpStatusAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void subscribePumpStatusAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readEffectiveOperationModeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface ColorPointGIntensityAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    private native void subscribeEffectiveOperationModeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
 
-    private native void readEffectiveControlModeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeEffectiveControlModeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface ColorPointBIntensityAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    private native void readCapacityAttribute(
-        long chipClusterPtr, CapacityAttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void subscribeCapacityAttribute(
-        long chipClusterPtr, CapacityAttributeCallback callback, int minInterval, int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readSpeedAttribute(long chipClusterPtr, SpeedAttributeCallback callback);
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void subscribeSpeedAttribute(
-        long chipClusterPtr, SpeedAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
 
-    private native void readLifetimeRunningHoursAttribute(
-        long chipClusterPtr, LifetimeRunningHoursAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void writeLifetimeRunningHoursAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void subscribeLifetimeRunningHoursAttribute(
-        long chipClusterPtr,
-        LifetimeRunningHoursAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+      void onError(Exception ex);
 
-    private native void readPowerAttribute(long chipClusterPtr, PowerAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribePowerAttribute(
-        long chipClusterPtr, PowerAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void readLifetimeEnergyConsumedAttribute(
-        long chipClusterPtr, LifetimeEnergyConsumedAttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void writeLifetimeEnergyConsumedAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeLifetimeEnergyConsumedAttribute(
-        long chipClusterPtr,
-        LifetimeEnergyConsumedAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void readCurrentHueAttribute(IntegerAttributeCallback callback) {
+      readCurrentHueAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readOperationModeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeCurrentHueAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentHueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void writeOperationModeAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void readCurrentSaturationAttribute(IntegerAttributeCallback callback) {
+      readCurrentSaturationAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeOperationModeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeCurrentSaturationAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentSaturationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readControlModeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readRemainingTimeAttribute(IntegerAttributeCallback callback) {
+      readRemainingTimeAttribute(chipClusterPtr, callback);
+    }
 
-    private native void writeControlModeAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeRemainingTimeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRemainingTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeControlModeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readCurrentXAttribute(IntegerAttributeCallback callback) {
+      readCurrentXAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readGeneratedCommandListAttribute(
-        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void subscribeCurrentXAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeGeneratedCommandListAttribute(
-        long chipClusterPtr,
-        GeneratedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void readCurrentYAttribute(IntegerAttributeCallback callback) {
+      readCurrentYAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readAcceptedCommandListAttribute(
-        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void subscribeCurrentYAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeAcceptedCommandListAttribute(
-        long chipClusterPtr,
-        AcceptedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void readDriftCompensationAttribute(IntegerAttributeCallback callback) {
+      readDriftCompensationAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readAttributeListAttribute(
-        long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void subscribeDriftCompensationAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeDriftCompensationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeAttributeListAttribute(
-        long chipClusterPtr,
-        AttributeListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void readCompensationTextAttribute(CharStringAttributeCallback callback) {
+      readCompensationTextAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void subscribeCompensationTextAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCompensationTextAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void readColorTemperatureAttribute(IntegerAttributeCallback callback) {
+      readColorTemperatureAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeColorTemperatureAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeColorTemperatureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public void readColorModeAttribute(IntegerAttributeCallback callback) {
+      readColorModeAttribute(chipClusterPtr, callback);
+    }
 
-  public static class RelativeHumidityMeasurementCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1029L;
+    public void subscribeColorModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeColorModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    public RelativeHumidityMeasurementCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    public void readOptionsAttribute(IntegerAttributeCallback callback) {
+      readOptionsAttribute(chipClusterPtr, callback);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void writeOptionsAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOptionsAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    public interface MeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public void writeOptionsAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeOptionsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-      void onError(Exception ex);
+    public void subscribeOptionsAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeOptionsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readNumberOfPrimariesAttribute(NumberOfPrimariesAttributeCallback callback) {
+      readNumberOfPrimariesAttribute(chipClusterPtr, callback);
     }
 
-    public interface MinMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public void subscribeNumberOfPrimariesAttribute(
+        NumberOfPrimariesAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNumberOfPrimariesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readPrimary1XAttribute(IntegerAttributeCallback callback) {
+      readPrimary1XAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribePrimary1XAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePrimary1XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface MaxMeasuredValueAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public void readPrimary1YAttribute(IntegerAttributeCallback callback) {
+      readPrimary1YAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void subscribePrimary1YAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePrimary1YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readPrimary1IntensityAttribute(Primary1IntensityAttributeCallback callback) {
+      readPrimary1IntensityAttribute(chipClusterPtr, callback);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void subscribePrimary1IntensityAttribute(
+        Primary1IntensityAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePrimary1IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readPrimary2XAttribute(IntegerAttributeCallback callback) {
+      readPrimary2XAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribePrimary2XAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePrimary2XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPrimary2YAttribute(IntegerAttributeCallback callback) {
+      readPrimary2YAttribute(chipClusterPtr, callback);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
-
-      void onError(Exception ex);
+    public void subscribePrimary2YAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePrimary2YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readPrimary2IntensityAttribute(Primary2IntensityAttributeCallback callback) {
+      readPrimary2IntensityAttribute(chipClusterPtr, callback);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void subscribePrimary2IntensityAttribute(
+        Primary2IntensityAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePrimary2IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readPrimary3XAttribute(IntegerAttributeCallback callback) {
+      readPrimary3XAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribePrimary3XAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePrimary3XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readMeasuredValueAttribute(MeasuredValueAttributeCallback callback) {
-      readMeasuredValueAttribute(chipClusterPtr, callback);
+    public void readPrimary3YAttribute(IntegerAttributeCallback callback) {
+      readPrimary3YAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeMeasuredValueAttribute(
-        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribePrimary3YAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePrimary3YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readMinMeasuredValueAttribute(MinMeasuredValueAttributeCallback callback) {
-      readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    public void readPrimary3IntensityAttribute(Primary3IntensityAttributeCallback callback) {
+      readPrimary3IntensityAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeMinMeasuredValueAttribute(
-        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribePrimary3IntensityAttribute(
+        Primary3IntensityAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePrimary3IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readMaxMeasuredValueAttribute(MaxMeasuredValueAttributeCallback callback) {
-      readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    public void readPrimary4XAttribute(IntegerAttributeCallback callback) {
+      readPrimary4XAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeMaxMeasuredValueAttribute(
-        MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribePrimary4XAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePrimary4XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readToleranceAttribute(IntegerAttributeCallback callback) {
-      readToleranceAttribute(chipClusterPtr, callback);
+    public void readPrimary4YAttribute(IntegerAttributeCallback callback) {
+      readPrimary4YAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeToleranceAttribute(
+    public void subscribePrimary4YAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeToleranceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribePrimary4YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    public void readPrimary4IntensityAttribute(Primary4IntensityAttributeCallback callback) {
+      readPrimary4IntensityAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribePrimary4IntensityAttribute(
+        Primary4IntensityAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePrimary4IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    public void readPrimary5XAttribute(IntegerAttributeCallback callback) {
+      readPrimary5XAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribePrimary5XAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePrimary5XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
+    public void readPrimary5YAttribute(IntegerAttributeCallback callback) {
+      readPrimary5YAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribePrimary5YAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePrimary5YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
+    public void readPrimary5IntensityAttribute(Primary5IntensityAttributeCallback callback) {
+      readPrimary5IntensityAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribePrimary5IntensityAttribute(
+        Primary5IntensityAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePrimary5IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
+    public void readPrimary6XAttribute(IntegerAttributeCallback callback) {
+      readPrimary6XAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeClusterRevisionAttribute(
+    public void subscribePrimary6XAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribePrimary6XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readMeasuredValueAttribute(
-        long chipClusterPtr, MeasuredValueAttributeCallback callback);
-
-    private native void subscribeMeasuredValueAttribute(
-        long chipClusterPtr,
-        MeasuredValueAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readMinMeasuredValueAttribute(
-        long chipClusterPtr, MinMeasuredValueAttributeCallback callback);
-
-    private native void subscribeMinMeasuredValueAttribute(
-        long chipClusterPtr,
-        MinMeasuredValueAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void readPrimary6YAttribute(IntegerAttributeCallback callback) {
+      readPrimary6YAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readMaxMeasuredValueAttribute(
-        long chipClusterPtr, MaxMeasuredValueAttributeCallback callback);
+    public void subscribePrimary6YAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePrimary6YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeMaxMeasuredValueAttribute(
-        long chipClusterPtr,
-        MaxMeasuredValueAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void readPrimary6IntensityAttribute(Primary6IntensityAttributeCallback callback) {
+      readPrimary6IntensityAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readToleranceAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribePrimary6IntensityAttribute(
+        Primary6IntensityAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePrimary6IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeToleranceAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readWhitePointXAttribute(IntegerAttributeCallback callback) {
+      readWhitePointXAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readGeneratedCommandListAttribute(
-        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void writeWhitePointXAttribute(DefaultClusterCallback callback, Integer value) {
+      writeWhitePointXAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void subscribeGeneratedCommandListAttribute(
-        long chipClusterPtr,
-        GeneratedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void writeWhitePointXAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeWhitePointXAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void readAcceptedCommandListAttribute(
-        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void subscribeWhitePointXAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeWhitePointXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeAcceptedCommandListAttribute(
-        long chipClusterPtr,
-        AcceptedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void readWhitePointYAttribute(IntegerAttributeCallback callback) {
+      readWhitePointYAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readAttributeListAttribute(
-        long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void writeWhitePointYAttribute(DefaultClusterCallback callback, Integer value) {
+      writeWhitePointYAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void subscribeAttributeListAttribute(
-        long chipClusterPtr,
-        AttributeListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void writeWhitePointYAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeWhitePointYAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void subscribeWhitePointYAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeWhitePointYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void readColorPointRXAttribute(IntegerAttributeCallback callback) {
+      readColorPointRXAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeColorPointRXAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointRXAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void subscribeClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public void writeColorPointRXAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeColorPointRXAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-  public static class ScenesCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 5L;
+    public void subscribeColorPointRXAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeColorPointRXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    public ScenesCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    public void readColorPointRYAttribute(IntegerAttributeCallback callback) {
+      readColorPointRYAttribute(chipClusterPtr, callback);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void writeColorPointRYAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointRYAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    public void addScene(
-        AddSceneResponseCallback callback,
-        Integer groupId,
-        Integer sceneId,
-        Integer transitionTime,
-        String sceneName,
-        ArrayList<ChipStructs.ScenesClusterExtensionFieldSet> extensionFieldSets) {
-      addScene(
-          chipClusterPtr,
-          callback,
-          groupId,
-          sceneId,
-          transitionTime,
-          sceneName,
-          extensionFieldSets,
-          null);
+    public void writeColorPointRYAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeColorPointRYAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void addScene(
-        AddSceneResponseCallback callback,
-        Integer groupId,
-        Integer sceneId,
-        Integer transitionTime,
-        String sceneName,
-        ArrayList<ChipStructs.ScenesClusterExtensionFieldSet> extensionFieldSets,
-        int timedInvokeTimeoutMs) {
-      addScene(
-          chipClusterPtr,
-          callback,
-          groupId,
-          sceneId,
-          transitionTime,
-          sceneName,
-          extensionFieldSets,
-          timedInvokeTimeoutMs);
+    public void subscribeColorPointRYAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeColorPointRYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void getSceneMembership(GetSceneMembershipResponseCallback callback, Integer groupId) {
-      getSceneMembership(chipClusterPtr, callback, groupId, null);
+    public void readColorPointRIntensityAttribute(ColorPointRIntensityAttributeCallback callback) {
+      readColorPointRIntensityAttribute(chipClusterPtr, callback);
     }
 
-    public void getSceneMembership(
-        GetSceneMembershipResponseCallback callback, Integer groupId, int timedInvokeTimeoutMs) {
-      getSceneMembership(chipClusterPtr, callback, groupId, timedInvokeTimeoutMs);
+    public void writeColorPointRIntensityAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointRIntensityAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void recallScene(
-        DefaultClusterCallback callback,
-        Integer groupId,
-        Integer sceneId,
-        @Nullable Optional<Integer> transitionTime) {
-      recallScene(chipClusterPtr, callback, groupId, sceneId, transitionTime, null);
+    public void writeColorPointRIntensityAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeColorPointRIntensityAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void recallScene(
-        DefaultClusterCallback callback,
-        Integer groupId,
-        Integer sceneId,
-        @Nullable Optional<Integer> transitionTime,
-        int timedInvokeTimeoutMs) {
-      recallScene(chipClusterPtr, callback, groupId, sceneId, transitionTime, timedInvokeTimeoutMs);
+    public void subscribeColorPointRIntensityAttribute(
+        ColorPointRIntensityAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeColorPointRIntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void removeAllScenes(RemoveAllScenesResponseCallback callback, Integer groupId) {
-      removeAllScenes(chipClusterPtr, callback, groupId, null);
+    public void readColorPointGXAttribute(IntegerAttributeCallback callback) {
+      readColorPointGXAttribute(chipClusterPtr, callback);
     }
 
-    public void removeAllScenes(
-        RemoveAllScenesResponseCallback callback, Integer groupId, int timedInvokeTimeoutMs) {
-      removeAllScenes(chipClusterPtr, callback, groupId, timedInvokeTimeoutMs);
+    public void writeColorPointGXAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointGXAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void removeScene(
-        RemoveSceneResponseCallback callback, Integer groupId, Integer sceneId) {
-      removeScene(chipClusterPtr, callback, groupId, sceneId, null);
+    public void writeColorPointGXAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeColorPointGXAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void removeScene(
-        RemoveSceneResponseCallback callback,
-        Integer groupId,
-        Integer sceneId,
-        int timedInvokeTimeoutMs) {
-      removeScene(chipClusterPtr, callback, groupId, sceneId, timedInvokeTimeoutMs);
+    public void subscribeColorPointGXAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeColorPointGXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void storeScene(StoreSceneResponseCallback callback, Integer groupId, Integer sceneId) {
-      storeScene(chipClusterPtr, callback, groupId, sceneId, null);
+    public void readColorPointGYAttribute(IntegerAttributeCallback callback) {
+      readColorPointGYAttribute(chipClusterPtr, callback);
     }
 
-    public void storeScene(
-        StoreSceneResponseCallback callback,
-        Integer groupId,
-        Integer sceneId,
-        int timedInvokeTimeoutMs) {
-      storeScene(chipClusterPtr, callback, groupId, sceneId, timedInvokeTimeoutMs);
+    public void writeColorPointGYAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointGYAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void viewScene(ViewSceneResponseCallback callback, Integer groupId, Integer sceneId) {
-      viewScene(chipClusterPtr, callback, groupId, sceneId, null);
+    public void writeColorPointGYAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeColorPointGYAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void viewScene(
-        ViewSceneResponseCallback callback,
-        Integer groupId,
-        Integer sceneId,
-        int timedInvokeTimeoutMs) {
-      viewScene(chipClusterPtr, callback, groupId, sceneId, timedInvokeTimeoutMs);
+    public void subscribeColorPointGYAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeColorPointGYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void addScene(
-        long chipClusterPtr,
-        AddSceneResponseCallback Callback,
-        Integer groupId,
-        Integer sceneId,
-        Integer transitionTime,
-        String sceneName,
-        ArrayList<ChipStructs.ScenesClusterExtensionFieldSet> extensionFieldSets,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void readColorPointGIntensityAttribute(ColorPointGIntensityAttributeCallback callback) {
+      readColorPointGIntensityAttribute(chipClusterPtr, callback);
+    }
 
-    private native void getSceneMembership(
-        long chipClusterPtr,
-        GetSceneMembershipResponseCallback Callback,
-        Integer groupId,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void writeColorPointGIntensityAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointGIntensityAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void recallScene(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer groupId,
-        Integer sceneId,
-        @Nullable Optional<Integer> transitionTime,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void writeColorPointGIntensityAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeColorPointGIntensityAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void removeAllScenes(
-        long chipClusterPtr,
-        RemoveAllScenesResponseCallback Callback,
-        Integer groupId,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeColorPointGIntensityAttribute(
+        ColorPointGIntensityAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeColorPointGIntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void removeScene(
-        long chipClusterPtr,
-        RemoveSceneResponseCallback Callback,
-        Integer groupId,
-        Integer sceneId,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void readColorPointBXAttribute(IntegerAttributeCallback callback) {
+      readColorPointBXAttribute(chipClusterPtr, callback);
+    }
 
-    private native void storeScene(
-        long chipClusterPtr,
-        StoreSceneResponseCallback Callback,
-        Integer groupId,
-        Integer sceneId,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void writeColorPointBXAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointBXAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void viewScene(
-        long chipClusterPtr,
-        ViewSceneResponseCallback Callback,
-        Integer groupId,
-        Integer sceneId,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void writeColorPointBXAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeColorPointBXAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    public interface AddSceneResponseCallback {
-      void onSuccess(Integer status, Integer groupId, Integer sceneId);
+    public void subscribeColorPointBXAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeColorPointBXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception error);
+    public void readColorPointBYAttribute(IntegerAttributeCallback callback) {
+      readColorPointBYAttribute(chipClusterPtr, callback);
     }
 
-    public interface GetSceneMembershipResponseCallback {
-      void onSuccess(
-          Integer status,
-          @Nullable Integer capacity,
-          Integer groupId,
-          Optional<ArrayList<Integer>> sceneList);
+    public void writeColorPointBYAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointBYAttribute(chipClusterPtr, callback, value, null);
+    }
 
-      void onError(Exception error);
+    public void writeColorPointBYAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeColorPointBYAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public interface RemoveAllScenesResponseCallback {
-      void onSuccess(Integer status, Integer groupId);
+    public void subscribeColorPointBYAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeColorPointBYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception error);
+    public void readColorPointBIntensityAttribute(ColorPointBIntensityAttributeCallback callback) {
+      readColorPointBIntensityAttribute(chipClusterPtr, callback);
     }
 
-    public interface RemoveSceneResponseCallback {
-      void onSuccess(Integer status, Integer groupId, Integer sceneId);
+    public void writeColorPointBIntensityAttribute(DefaultClusterCallback callback, Integer value) {
+      writeColorPointBIntensityAttribute(chipClusterPtr, callback, value, null);
+    }
 
-      void onError(Exception error);
+    public void writeColorPointBIntensityAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeColorPointBIntensityAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public interface StoreSceneResponseCallback {
-      void onSuccess(Integer status, Integer groupId, Integer sceneId);
+    public void subscribeColorPointBIntensityAttribute(
+        ColorPointBIntensityAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeColorPointBIntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception error);
+    public void readEnhancedCurrentHueAttribute(IntegerAttributeCallback callback) {
+      readEnhancedCurrentHueAttribute(chipClusterPtr, callback);
     }
 
-    public interface ViewSceneResponseCallback {
-      void onSuccess(
-          Integer status,
-          Integer groupId,
-          Integer sceneId,
-          Optional<Integer> transitionTime,
-          Optional<String> sceneName,
-          Optional<ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>> extensionFieldSets);
+    public void subscribeEnhancedCurrentHueAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeEnhancedCurrentHueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception error);
+    public void readEnhancedColorModeAttribute(IntegerAttributeCallback callback) {
+      readEnhancedColorModeAttribute(chipClusterPtr, callback);
     }
 
-    public interface CurrentGroupAttributeCallback {
-      void onSuccess(Integer value);
+    public void subscribeEnhancedColorModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeEnhancedColorModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readColorLoopActiveAttribute(IntegerAttributeCallback callback) {
+      readColorLoopActiveAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeColorLoopActiveAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeColorLoopActiveAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void readColorLoopDirectionAttribute(IntegerAttributeCallback callback) {
+      readColorLoopDirectionAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void subscribeColorLoopDirectionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeColorLoopDirectionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readColorLoopTimeAttribute(IntegerAttributeCallback callback) {
+      readColorLoopTimeAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeColorLoopTimeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeColorLoopTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void readColorLoopStartEnhancedHueAttribute(IntegerAttributeCallback callback) {
+      readColorLoopStartEnhancedHueAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void subscribeColorLoopStartEnhancedHueAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeColorLoopStartEnhancedHueAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readColorLoopStoredEnhancedHueAttribute(IntegerAttributeCallback callback) {
+      readColorLoopStoredEnhancedHueAttribute(chipClusterPtr, callback);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void subscribeColorLoopStoredEnhancedHueAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeColorLoopStoredEnhancedHueAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readColorCapabilitiesAttribute(IntegerAttributeCallback callback) {
+      readColorCapabilitiesAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeColorCapabilitiesAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeColorCapabilitiesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readSceneCountAttribute(IntegerAttributeCallback callback) {
-      readSceneCountAttribute(chipClusterPtr, callback);
+    public void readColorTempPhysicalMinMiredsAttribute(IntegerAttributeCallback callback) {
+      readColorTempPhysicalMinMiredsAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeSceneCountAttribute(
+    public void subscribeColorTempPhysicalMinMiredsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSceneCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeColorTempPhysicalMinMiredsAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readCurrentSceneAttribute(IntegerAttributeCallback callback) {
-      readCurrentSceneAttribute(chipClusterPtr, callback);
+    public void readColorTempPhysicalMaxMiredsAttribute(IntegerAttributeCallback callback) {
+      readColorTempPhysicalMaxMiredsAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentSceneAttribute(
+    public void subscribeColorTempPhysicalMaxMiredsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentSceneAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeColorTempPhysicalMaxMiredsAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readCurrentGroupAttribute(CurrentGroupAttributeCallback callback) {
-      readCurrentGroupAttribute(chipClusterPtr, callback);
+    public void readCoupleColorTempToLevelMinMiredsAttribute(IntegerAttributeCallback callback) {
+      readCoupleColorTempToLevelMinMiredsAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentGroupAttribute(
-        CurrentGroupAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentGroupAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCoupleColorTempToLevelMinMiredsAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCoupleColorTempToLevelMinMiredsAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readSceneValidAttribute(BooleanAttributeCallback callback) {
-      readSceneValidAttribute(chipClusterPtr, callback);
+    public void readStartUpColorTemperatureMiredsAttribute(IntegerAttributeCallback callback) {
+      readStartUpColorTemperatureMiredsAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeSceneValidAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSceneValidAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeStartUpColorTemperatureMiredsAttribute(
+        DefaultClusterCallback callback, Integer value) {
+      writeStartUpColorTemperatureMiredsAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readNameSupportAttribute(IntegerAttributeCallback callback) {
-      readNameSupportAttribute(chipClusterPtr, callback);
+    public void writeStartUpColorTemperatureMiredsAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeStartUpColorTemperatureMiredsAttribute(
+          chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeNameSupportAttribute(
+    public void subscribeStartUpColorTemperatureMiredsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNameSupportAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeStartUpColorTemperatureMiredsAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -16661,406 +16600,427 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readSceneCountAttribute(
+    private native void readCurrentHueAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeSceneCountAttribute(
+    private native void subscribeCurrentHueAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readCurrentSceneAttribute(
+    private native void readCurrentSaturationAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeCurrentSceneAttribute(
+    private native void subscribeCurrentSaturationAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readCurrentGroupAttribute(
-        long chipClusterPtr, CurrentGroupAttributeCallback callback);
-
-    private native void subscribeCurrentGroupAttribute(
-        long chipClusterPtr,
-        CurrentGroupAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readSceneValidAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
+    private native void readRemainingTimeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeSceneValidAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeRemainingTimeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readNameSupportAttribute(
+    private native void readCurrentXAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeNameSupportAttribute(
+    private native void subscribeCurrentXAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readGeneratedCommandListAttribute(
-        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    private native void readCurrentYAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeGeneratedCommandListAttribute(
-        long chipClusterPtr,
-        GeneratedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeCurrentYAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readAcceptedCommandListAttribute(
-        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    private native void readDriftCompensationAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeAcceptedCommandListAttribute(
-        long chipClusterPtr,
-        AcceptedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void subscribeDriftCompensationAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readAttributeListAttribute(
-        long chipClusterPtr, AttributeListAttributeCallback callback);
+    private native void readCompensationTextAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
 
-    private native void subscribeAttributeListAttribute(
+    private native void subscribeCompensationTextAttribute(
         long chipClusterPtr,
-        AttributeListAttributeCallback callback,
+        CharStringAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    private native void readColorTemperatureAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeColorTemperatureAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readClusterRevisionAttribute(
+    private native void readColorModeAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeClusterRevisionAttribute(
+    private native void subscribeColorModeAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
 
-  public static class SoftwareDiagnosticsCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 52L;
+    private native void readOptionsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public SoftwareDiagnosticsCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
+    private native void writeOptionsAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    private native void subscribeOptionsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void resetWatermarks(DefaultClusterCallback callback) {
-      resetWatermarks(chipClusterPtr, callback, null);
-    }
+    private native void readNumberOfPrimariesAttribute(
+        long chipClusterPtr, NumberOfPrimariesAttributeCallback callback);
 
-    public void resetWatermarks(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+    private native void subscribeNumberOfPrimariesAttribute(
+        long chipClusterPtr,
+        NumberOfPrimariesAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-      resetWatermarks(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+    private native void readPrimary1XAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void resetWatermarks(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        @Nullable Integer timedInvokeTimeoutMs);
+    private native void subscribePrimary1XAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public interface ThreadMetricsAttributeCallback {
-      void onSuccess(List<ChipStructs.SoftwareDiagnosticsClusterThreadMetrics> valueList);
+    private native void readPrimary1YAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void subscribePrimary1YAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void readPrimary1IntensityAttribute(
+        long chipClusterPtr, Primary1IntensityAttributeCallback callback);
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void subscribePrimary1IntensityAttribute(
+        long chipClusterPtr,
+        Primary1IntensityAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-      void onError(Exception ex);
+    private native void readPrimary2XAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribePrimary2XAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void readPrimary2YAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void subscribePrimary2YAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void readPrimary2IntensityAttribute(
+        long chipClusterPtr, Primary2IntensityAttributeCallback callback);
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void subscribePrimary2IntensityAttribute(
+        long chipClusterPtr,
+        Primary2IntensityAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-      void onError(Exception ex);
+    private native void readPrimary3XAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribePrimary3XAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readThreadMetricsAttribute(ThreadMetricsAttributeCallback callback) {
-      readThreadMetricsAttribute(chipClusterPtr, callback);
-    }
+    private native void readPrimary3YAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeThreadMetricsAttribute(
-        ThreadMetricsAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeThreadMetricsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribePrimary3YAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readPrimary3IntensityAttribute(
+        long chipClusterPtr, Primary3IntensityAttributeCallback callback);
 
-    public void readCurrentHeapFreeAttribute(LongAttributeCallback callback) {
-      readCurrentHeapFreeAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribePrimary3IntensityAttribute(
+        long chipClusterPtr,
+        Primary3IntensityAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void subscribeCurrentHeapFreeAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentHeapFreeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readPrimary4XAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void readCurrentHeapUsedAttribute(LongAttributeCallback callback) {
-      readCurrentHeapUsedAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribePrimary4XAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void subscribeCurrentHeapUsedAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentHeapUsedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readPrimary4YAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void readCurrentHeapHighWatermarkAttribute(LongAttributeCallback callback) {
-      readCurrentHeapHighWatermarkAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribePrimary4YAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void subscribeCurrentHeapHighWatermarkAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentHeapHighWatermarkAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readPrimary4IntensityAttribute(
+        long chipClusterPtr, Primary4IntensityAttributeCallback callback);
 
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribePrimary4IntensityAttribute(
+        long chipClusterPtr,
+        Primary4IntensityAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readPrimary5XAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribePrimary5XAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readPrimary5YAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribePrimary5YAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readPrimary5IntensityAttribute(
+        long chipClusterPtr, Primary5IntensityAttributeCallback callback);
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribePrimary5IntensityAttribute(
+        long chipClusterPtr,
+        Primary5IntensityAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readPrimary6XAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribePrimary6XAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readPrimary6YAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void readThreadMetricsAttribute(
-        long chipClusterPtr, ThreadMetricsAttributeCallback callback);
+    private native void subscribePrimary6YAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeThreadMetricsAttribute(
+    private native void readPrimary6IntensityAttribute(
+        long chipClusterPtr, Primary6IntensityAttributeCallback callback);
+
+    private native void subscribePrimary6IntensityAttribute(
         long chipClusterPtr,
-        ThreadMetricsAttributeCallback callback,
+        Primary6IntensityAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readCurrentHeapFreeAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    private native void readWhitePointXAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeCurrentHeapFreeAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    private native void writeWhitePointXAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readCurrentHeapUsedAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    private native void subscribeWhitePointXAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeCurrentHeapUsedAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    private native void readWhitePointYAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void readCurrentHeapHighWatermarkAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    private native void writeWhitePointYAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeCurrentHeapHighWatermarkAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeWhitePointYAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readGeneratedCommandListAttribute(
-        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    private native void readColorPointRXAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeGeneratedCommandListAttribute(
+    private native void writeColorPointRXAttribute(
         long chipClusterPtr,
-        GeneratedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readAcceptedCommandListAttribute(
-        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    private native void subscribeColorPointRXAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeAcceptedCommandListAttribute(
+    private native void readColorPointRYAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeColorPointRYAttribute(
         long chipClusterPtr,
-        AcceptedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readAttributeListAttribute(
-        long chipClusterPtr, AttributeListAttributeCallback callback);
+    private native void subscribeColorPointRYAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeAttributeListAttribute(
+    private native void readColorPointRIntensityAttribute(
+        long chipClusterPtr, ColorPointRIntensityAttributeCallback callback);
+
+    private native void writeColorPointRIntensityAttribute(
         long chipClusterPtr,
-        AttributeListAttributeCallback callback,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeColorPointRIntensityAttribute(
+        long chipClusterPtr,
+        ColorPointRIntensityAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    private native void readColorPointGXAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    private native void writeColorPointGXAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readClusterRevisionAttribute(
+    private native void subscribeColorPointGXAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readColorPointGYAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeClusterRevisionAttribute(
+    private native void writeColorPointGYAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeColorPointGYAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
 
-  public static class SwitchCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 59L;
+    private native void readColorPointGIntensityAttribute(
+        long chipClusterPtr, ColorPointGIntensityAttributeCallback callback);
 
-    public SwitchCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
+    private native void writeColorPointGIntensityAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    private native void subscribeColorPointGIntensityAttribute(
+        long chipClusterPtr,
+        ColorPointGIntensityAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void readColorPointBXAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void writeColorPointBXAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeColorPointBXAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void readColorPointBYAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeColorPointBYAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeColorPointBYAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-      void onError(Exception ex);
+    private native void readColorPointBIntensityAttribute(
+        long chipClusterPtr, ColorPointBIntensityAttributeCallback callback);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void writeColorPointBIntensityAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void subscribeColorPointBIntensityAttribute(
+        long chipClusterPtr,
+        ColorPointBIntensityAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-      void onError(Exception ex);
+    private native void readEnhancedCurrentHueAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeEnhancedCurrentHueAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readNumberOfPositionsAttribute(IntegerAttributeCallback callback) {
-      readNumberOfPositionsAttribute(chipClusterPtr, callback);
-    }
+    private native void readEnhancedColorModeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeNumberOfPositionsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNumberOfPositionsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeEnhancedColorModeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readCurrentPositionAttribute(IntegerAttributeCallback callback) {
-      readCurrentPositionAttribute(chipClusterPtr, callback);
-    }
+    private native void readColorLoopActiveAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeCurrentPositionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentPositionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeColorLoopActiveAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readMultiPressMaxAttribute(IntegerAttributeCallback callback) {
-      readMultiPressMaxAttribute(chipClusterPtr, callback);
-    }
+    private native void readColorLoopDirectionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeMultiPressMaxAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMultiPressMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeColorLoopDirectionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
-    }
+    private native void readColorLoopTimeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeColorLoopTimeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
-    }
+    private native void readColorLoopStartEnhancedHueAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeColorLoopStartEnhancedHueAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
-    }
+    private native void readColorLoopStoredEnhancedHueAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeColorLoopStoredEnhancedHueAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
-    }
+    private native void readColorCapabilitiesAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeColorCapabilitiesAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
+    private native void readColorTempPhysicalMinMiredsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeColorTempPhysicalMinMiredsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readNumberOfPositionsAttribute(
+    private native void readColorTempPhysicalMaxMiredsAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeNumberOfPositionsAttribute(
+    private native void subscribeColorTempPhysicalMaxMiredsAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readCurrentPositionAttribute(
+    private native void readCoupleColorTempToLevelMinMiredsAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeCurrentPositionAttribute(
+    private native void subscribeCoupleColorTempToLevelMinMiredsAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readMultiPressMaxAttribute(
+    private native void readStartUpColorTemperatureMiredsAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeMultiPressMaxAttribute(
+    private native void writeStartUpColorTemperatureMiredsAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeStartUpColorTemperatureMiredsAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
     private native void readGeneratedCommandListAttribute(
@@ -17103,44 +17063,42 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class TargetNavigatorCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1285L;
+  public static class IlluminanceMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1024L;
 
-    public TargetNavigatorCluster(long devicePtr, int endpointId) {
+    public IlluminanceMeasurementCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void navigateTarget(
-        NavigateTargetResponseCallback callback, Integer target, Optional<String> data) {
-      navigateTarget(chipClusterPtr, callback, target, data, null);
+    public interface MeasuredValueAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void navigateTarget(
-        NavigateTargetResponseCallback callback,
-        Integer target,
-        Optional<String> data,
-        int timedInvokeTimeoutMs) {
-      navigateTarget(chipClusterPtr, callback, target, data, timedInvokeTimeoutMs);
+    public interface MinMeasuredValueAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    private native void navigateTarget(
-        long chipClusterPtr,
-        NavigateTargetResponseCallback Callback,
-        Integer target,
-        Optional<String> data,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public interface MaxMeasuredValueAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    public interface NavigateTargetResponseCallback {
-      void onSuccess(Integer status, Optional<String> data);
+      void onError(Exception ex);
 
-      void onError(Exception error);
+      default void onSubscriptionEstablished() {}
     }
 
-    public interface TargetListAttributeCallback {
-      void onSuccess(List<ChipStructs.TargetNavigatorClusterTargetInfo> valueList);
+    public interface LightSensorTypeAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
 
@@ -17171,22 +17129,49 @@ public interface AttributeListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public void readTargetListAttribute(TargetListAttributeCallback callback) {
-      readTargetListAttribute(chipClusterPtr, callback);
+    public void readMeasuredValueAttribute(MeasuredValueAttributeCallback callback) {
+      readMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeTargetListAttribute(
-        TargetListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTargetListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readCurrentTargetAttribute(IntegerAttributeCallback callback) {
-      readCurrentTargetAttribute(chipClusterPtr, callback);
+    public void readMinMeasuredValueAttribute(MinMeasuredValueAttributeCallback callback) {
+      readMinMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentTargetAttribute(
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMaxMeasuredValueAttribute(MaxMeasuredValueAttributeCallback callback) {
+      readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readToleranceAttribute(IntegerAttributeCallback callback) {
+      readToleranceAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeToleranceAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentTargetAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeToleranceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLightSensorTypeAttribute(LightSensorTypeAttributeCallback callback) {
+      readLightSensorTypeAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeLightSensorTypeAttribute(
+        LightSensorTypeAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeLightSensorTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -17234,21 +17219,48 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readTargetListAttribute(
-        long chipClusterPtr, TargetListAttributeCallback callback);
+    private native void readMeasuredValueAttribute(
+        long chipClusterPtr, MeasuredValueAttributeCallback callback);
+
+    private native void subscribeMeasuredValueAttribute(
+        long chipClusterPtr,
+        MeasuredValueAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readMinMeasuredValueAttribute(
+        long chipClusterPtr, MinMeasuredValueAttributeCallback callback);
+
+    private native void subscribeMinMeasuredValueAttribute(
+        long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readMaxMeasuredValueAttribute(
+        long chipClusterPtr, MaxMeasuredValueAttributeCallback callback);
+
+    private native void subscribeMaxMeasuredValueAttribute(
+        long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readToleranceAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeToleranceAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readLightSensorTypeAttribute(
+        long chipClusterPtr, LightSensorTypeAttributeCallback callback);
 
-    private native void subscribeTargetListAttribute(
+    private native void subscribeLightSensorTypeAttribute(
         long chipClusterPtr,
-        TargetListAttributeCallback callback,
+        LightSensorTypeAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readCurrentTargetAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeCurrentTargetAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
     private native void readGeneratedCommandListAttribute(
         long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
@@ -17449,531 +17461,496 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class TestClusterCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 4294048773L;
+  public static class PressureMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1027L;
 
-    public TestClusterCluster(long devicePtr, int endpointId) {
+    public PressureMeasurementCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void simpleStructEchoRequest(
-        SimpleStructResponseCallback callback, ChipStructs.TestClusterClusterSimpleStruct arg1) {
-      simpleStructEchoRequest(chipClusterPtr, callback, arg1, null);
-    }
+    public interface MeasuredValueAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    public void simpleStructEchoRequest(
-        SimpleStructResponseCallback callback,
-        ChipStructs.TestClusterClusterSimpleStruct arg1,
-        int timedInvokeTimeoutMs) {
-      simpleStructEchoRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
-    }
+      void onError(Exception ex);
 
-    public void test(DefaultClusterCallback callback) {
-      test(chipClusterPtr, callback, null);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void test(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+    public interface MinMeasuredValueAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-      test(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+      void onError(Exception ex);
 
-    public void testAddArguments(
-        TestAddArgumentsResponseCallback callback, Integer arg1, Integer arg2) {
-      testAddArguments(chipClusterPtr, callback, arg1, arg2, null);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void testAddArguments(
-        TestAddArgumentsResponseCallback callback,
-        Integer arg1,
-        Integer arg2,
-        int timedInvokeTimeoutMs) {
-      testAddArguments(chipClusterPtr, callback, arg1, arg2, timedInvokeTimeoutMs);
-    }
+    public interface MaxMeasuredValueAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    public void testEmitTestEventRequest(
-        TestEmitTestEventResponseCallback callback, Integer arg1, Integer arg2, Boolean arg3) {
-      testEmitTestEventRequest(chipClusterPtr, callback, arg1, arg2, arg3, null);
-    }
+      void onError(Exception ex);
 
-    public void testEmitTestEventRequest(
-        TestEmitTestEventResponseCallback callback,
-        Integer arg1,
-        Integer arg2,
-        Boolean arg3,
-        int timedInvokeTimeoutMs) {
-      testEmitTestEventRequest(chipClusterPtr, callback, arg1, arg2, arg3, timedInvokeTimeoutMs);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void testEnumsRequest(TestEnumsResponseCallback callback, Integer arg1, Integer arg2) {
-      testEnumsRequest(chipClusterPtr, callback, arg1, arg2, null);
-    }
+    public interface ScaledValueAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    public void testEnumsRequest(
-        TestEnumsResponseCallback callback, Integer arg1, Integer arg2, int timedInvokeTimeoutMs) {
-      testEnumsRequest(chipClusterPtr, callback, arg1, arg2, timedInvokeTimeoutMs);
-    }
+      void onError(Exception ex);
 
-    public void testListInt8UArgumentRequest(
-        BooleanResponseCallback callback, ArrayList<Integer> arg1) {
-      testListInt8UArgumentRequest(chipClusterPtr, callback, arg1, null);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void testListInt8UArgumentRequest(
-        BooleanResponseCallback callback, ArrayList<Integer> arg1, int timedInvokeTimeoutMs) {
-      testListInt8UArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
-    }
+    public interface MinScaledValueAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    public void testListInt8UReverseRequest(
-        TestListInt8UReverseResponseCallback callback, ArrayList<Integer> arg1) {
-      testListInt8UReverseRequest(chipClusterPtr, callback, arg1, null);
-    }
+      void onError(Exception ex);
 
-    public void testListInt8UReverseRequest(
-        TestListInt8UReverseResponseCallback callback,
-        ArrayList<Integer> arg1,
-        int timedInvokeTimeoutMs) {
-      testListInt8UReverseRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void testListNestedStructListArgumentRequest(
-        BooleanResponseCallback callback,
-        ArrayList<ChipStructs.TestClusterClusterNestedStructList> arg1) {
-      testListNestedStructListArgumentRequest(chipClusterPtr, callback, arg1, null);
-    }
+    public interface MaxScaledValueAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    public void testListNestedStructListArgumentRequest(
-        BooleanResponseCallback callback,
-        ArrayList<ChipStructs.TestClusterClusterNestedStructList> arg1,
-        int timedInvokeTimeoutMs) {
-      testListNestedStructListArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
-    }
+      void onError(Exception ex);
 
-    public void testListStructArgumentRequest(
-        BooleanResponseCallback callback,
-        ArrayList<ChipStructs.TestClusterClusterSimpleStruct> arg1) {
-      testListStructArgumentRequest(chipClusterPtr, callback, arg1, null);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void testListStructArgumentRequest(
-        BooleanResponseCallback callback,
-        ArrayList<ChipStructs.TestClusterClusterSimpleStruct> arg1,
-        int timedInvokeTimeoutMs) {
-      testListStructArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
-    }
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void testNestedStructArgumentRequest(
-        BooleanResponseCallback callback, ChipStructs.TestClusterClusterNestedStruct arg1) {
-      testNestedStructArgumentRequest(chipClusterPtr, callback, arg1, null);
-    }
+      void onError(Exception ex);
 
-    public void testNestedStructArgumentRequest(
-        BooleanResponseCallback callback,
-        ChipStructs.TestClusterClusterNestedStruct arg1,
-        int timedInvokeTimeoutMs) {
-      testNestedStructArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void testNestedStructListArgumentRequest(
-        BooleanResponseCallback callback, ChipStructs.TestClusterClusterNestedStructList arg1) {
-      testNestedStructListArgumentRequest(chipClusterPtr, callback, arg1, null);
+    public void readMeasuredValueAttribute(MeasuredValueAttributeCallback callback) {
+      readMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void testNestedStructListArgumentRequest(
-        BooleanResponseCallback callback,
-        ChipStructs.TestClusterClusterNestedStructList arg1,
-        int timedInvokeTimeoutMs) {
-      testNestedStructListArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void testNotHandled(DefaultClusterCallback callback) {
-      testNotHandled(chipClusterPtr, callback, null);
+    public void readMinMeasuredValueAttribute(MinMeasuredValueAttributeCallback callback) {
+      readMinMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void testNotHandled(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-
-      testNotHandled(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void testNullableOptionalRequest(
-        TestNullableOptionalResponseCallback callback, @Nullable Optional<Integer> arg1) {
-      testNullableOptionalRequest(chipClusterPtr, callback, arg1, null);
+    public void readMaxMeasuredValueAttribute(MaxMeasuredValueAttributeCallback callback) {
+      readMaxMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void testNullableOptionalRequest(
-        TestNullableOptionalResponseCallback callback,
-        @Nullable Optional<Integer> arg1,
-        int timedInvokeTimeoutMs) {
-      testNullableOptionalRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void testSimpleOptionalArgumentRequest(
-        DefaultClusterCallback callback, Optional<Boolean> arg1) {
-      testSimpleOptionalArgumentRequest(chipClusterPtr, callback, arg1, null);
+    public void readToleranceAttribute(IntegerAttributeCallback callback) {
+      readToleranceAttribute(chipClusterPtr, callback);
     }
 
-    public void testSimpleOptionalArgumentRequest(
-        DefaultClusterCallback callback, Optional<Boolean> arg1, int timedInvokeTimeoutMs) {
-      testSimpleOptionalArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
+    public void subscribeToleranceAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeToleranceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void testSpecific(TestSpecificResponseCallback callback) {
-      testSpecific(chipClusterPtr, callback, null);
+    public void readScaledValueAttribute(ScaledValueAttributeCallback callback) {
+      readScaledValueAttribute(chipClusterPtr, callback);
     }
 
-    public void testSpecific(TestSpecificResponseCallback callback, int timedInvokeTimeoutMs) {
-
-      testSpecific(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public void subscribeScaledValueAttribute(
+        ScaledValueAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeScaledValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void testStructArgumentRequest(
-        BooleanResponseCallback callback, ChipStructs.TestClusterClusterSimpleStruct arg1) {
-      testStructArgumentRequest(chipClusterPtr, callback, arg1, null);
+    public void readMinScaledValueAttribute(MinScaledValueAttributeCallback callback) {
+      readMinScaledValueAttribute(chipClusterPtr, callback);
     }
 
-    public void testStructArgumentRequest(
-        BooleanResponseCallback callback,
-        ChipStructs.TestClusterClusterSimpleStruct arg1,
-        int timedInvokeTimeoutMs) {
-      testStructArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
+    public void subscribeMinScaledValueAttribute(
+        MinScaledValueAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMinScaledValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void testUnknownCommand(DefaultClusterCallback callback) {
-      testUnknownCommand(chipClusterPtr, callback, null);
+    public void readMaxScaledValueAttribute(MaxScaledValueAttributeCallback callback) {
+      readMaxScaledValueAttribute(chipClusterPtr, callback);
     }
 
-    public void testUnknownCommand(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+    public void subscribeMaxScaledValueAttribute(
+        MaxScaledValueAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMaxScaledValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      testUnknownCommand(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public void readScaledToleranceAttribute(IntegerAttributeCallback callback) {
+      readScaledToleranceAttribute(chipClusterPtr, callback);
     }
 
-    public void timedInvokeRequest(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+    public void subscribeScaledToleranceAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeScaledToleranceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      timedInvokeRequest(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public void readScaleAttribute(IntegerAttributeCallback callback) {
+      readScaleAttribute(chipClusterPtr, callback);
     }
 
-    private native void simpleStructEchoRequest(
-        long chipClusterPtr,
-        SimpleStructResponseCallback Callback,
-        ChipStructs.TestClusterClusterSimpleStruct arg1,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeScaleAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeScaleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void test(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void testAddArguments(
-        long chipClusterPtr,
-        TestAddArgumentsResponseCallback Callback,
-        Integer arg1,
-        Integer arg2,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void testEmitTestEventRequest(
-        long chipClusterPtr,
-        TestEmitTestEventResponseCallback Callback,
-        Integer arg1,
-        Integer arg2,
-        Boolean arg3,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
 
-    private native void testEnumsRequest(
-        long chipClusterPtr,
-        TestEnumsResponseCallback Callback,
-        Integer arg1,
-        Integer arg2,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void testListInt8UArgumentRequest(
-        long chipClusterPtr,
-        BooleanResponseCallback Callback,
-        ArrayList<Integer> arg1,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
 
-    private native void testListInt8UReverseRequest(
-        long chipClusterPtr,
-        TestListInt8UReverseResponseCallback Callback,
-        ArrayList<Integer> arg1,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void testListNestedStructListArgumentRequest(
-        long chipClusterPtr,
-        BooleanResponseCallback Callback,
-        ArrayList<ChipStructs.TestClusterClusterNestedStructList> arg1,
-        @Nullable Integer timedInvokeTimeoutMs);
+    private native void readMeasuredValueAttribute(
+        long chipClusterPtr, MeasuredValueAttributeCallback callback);
 
-    private native void testListStructArgumentRequest(
+    private native void subscribeMeasuredValueAttribute(
         long chipClusterPtr,
-        BooleanResponseCallback Callback,
-        ArrayList<ChipStructs.TestClusterClusterSimpleStruct> arg1,
-        @Nullable Integer timedInvokeTimeoutMs);
+        MeasuredValueAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void testNestedStructArgumentRequest(
-        long chipClusterPtr,
-        BooleanResponseCallback Callback,
-        ChipStructs.TestClusterClusterNestedStruct arg1,
-        @Nullable Integer timedInvokeTimeoutMs);
+    private native void readMinMeasuredValueAttribute(
+        long chipClusterPtr, MinMeasuredValueAttributeCallback callback);
 
-    private native void testNestedStructListArgumentRequest(
+    private native void subscribeMinMeasuredValueAttribute(
         long chipClusterPtr,
-        BooleanResponseCallback Callback,
-        ChipStructs.TestClusterClusterNestedStructList arg1,
-        @Nullable Integer timedInvokeTimeoutMs);
+        MinMeasuredValueAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void testNotHandled(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        @Nullable Integer timedInvokeTimeoutMs);
+    private native void readMaxMeasuredValueAttribute(
+        long chipClusterPtr, MaxMeasuredValueAttributeCallback callback);
 
-    private native void testNullableOptionalRequest(
+    private native void subscribeMaxMeasuredValueAttribute(
         long chipClusterPtr,
-        TestNullableOptionalResponseCallback Callback,
-        @Nullable Optional<Integer> arg1,
-        @Nullable Integer timedInvokeTimeoutMs);
+        MaxMeasuredValueAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void testSimpleOptionalArgumentRequest(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Optional<Boolean> arg1,
-        @Nullable Integer timedInvokeTimeoutMs);
+    private native void readToleranceAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void testSpecific(
-        long chipClusterPtr,
-        TestSpecificResponseCallback Callback,
-        @Nullable Integer timedInvokeTimeoutMs);
+    private native void subscribeToleranceAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void testStructArgumentRequest(
-        long chipClusterPtr,
-        BooleanResponseCallback Callback,
-        ChipStructs.TestClusterClusterSimpleStruct arg1,
-        @Nullable Integer timedInvokeTimeoutMs);
+    private native void readScaledValueAttribute(
+        long chipClusterPtr, ScaledValueAttributeCallback callback);
 
-    private native void testUnknownCommand(
+    private native void subscribeScaledValueAttribute(
         long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        @Nullable Integer timedInvokeTimeoutMs);
+        ScaledValueAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void timedInvokeRequest(
+    private native void readMinScaledValueAttribute(
+        long chipClusterPtr, MinScaledValueAttributeCallback callback);
+
+    private native void subscribeMinScaledValueAttribute(
         long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        @Nullable Integer timedInvokeTimeoutMs);
+        MinScaledValueAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public interface BooleanResponseCallback {
-      void onSuccess(Boolean value);
+    private native void readMaxScaledValueAttribute(
+        long chipClusterPtr, MaxScaledValueAttributeCallback callback);
 
-      void onError(Exception error);
-    }
+    private native void subscribeMaxScaledValueAttribute(
+        long chipClusterPtr,
+        MaxScaledValueAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public interface SimpleStructResponseCallback {
-      void onSuccess(ChipStructs.TestClusterClusterSimpleStruct arg1);
+    private native void readScaledToleranceAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-      void onError(Exception error);
-    }
+    private native void subscribeScaledToleranceAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public interface TestAddArgumentsResponseCallback {
-      void onSuccess(Integer returnValue);
+    private native void readScaleAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
 
-      void onError(Exception error);
-    }
+    private native void subscribeScaleAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public interface TestEmitTestEventResponseCallback {
-      void onSuccess(Long value);
+    private native void readAttributeListAttribute(
+        long chipClusterPtr, AttributeListAttributeCallback callback);
 
-      void onError(Exception error);
-    }
+    private native void subscribeAttributeListAttribute(
+        long chipClusterPtr,
+        AttributeListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public interface TestEnumsResponseCallback {
-      void onSuccess(Integer arg1, Integer arg2);
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-      void onError(Exception error);
-    }
+    private native void subscribeFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public interface TestListInt8UReverseResponseCallback {
-      void onSuccess(ArrayList<Integer> arg1);
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-      void onError(Exception error);
-    }
+    private native void subscribeClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
 
-    public interface TestNullableOptionalResponseCallback {
-      void onSuccess(
-          Boolean wasPresent,
-          Optional<Boolean> wasNull,
-          Optional<Integer> value,
-          @Nullable Optional<Integer> originalValue);
+  public static class FlowMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1028L;
 
-      void onError(Exception error);
+    public FlowMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
     }
 
-    public interface TestSpecificResponseCallback {
-      void onSuccess(Integer returnValue);
-
-      void onError(Exception error);
-    }
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
 
-    public interface ListInt8uAttributeCallback {
-      void onSuccess(List<Integer> valueList);
+    public interface MeasuredValueAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface ListOctetStringAttributeCallback {
-      void onSuccess(List<byte[]> valueList);
+    public interface MinMeasuredValueAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface ListStructOctetStringAttributeCallback {
-      void onSuccess(List<ChipStructs.TestClusterClusterTestListStructOctet> valueList);
+    public interface MaxMeasuredValueAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface VendorIdAttributeCallback {
-      void onSuccess(Integer value);
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface ListNullablesAndOptionalsStructAttributeCallback {
-      void onSuccess(List<ChipStructs.TestClusterClusterNullablesAndOptionalsStruct> valueList);
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface ListLongOctetStringAttributeCallback {
-      void onSuccess(List<byte[]> valueList);
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface ListFabricScopedAttributeCallback {
-      void onSuccess(List<ChipStructs.TestClusterClusterTestFabricScoped> valueList);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void readMeasuredValueAttribute(MeasuredValueAttributeCallback callback) {
+      readMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public interface NullableBooleanAttributeCallback {
-      void onSuccess(@Nullable Boolean value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface NullableBitmap8AttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
+    public void readMinMeasuredValueAttribute(MinMeasuredValueAttributeCallback callback) {
+      readMinMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public interface NullableBitmap16AttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readMaxMeasuredValueAttribute(MaxMeasuredValueAttributeCallback callback) {
+      readMaxMeasuredValueAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface NullableBitmap32AttributeCallback {
-      void onSuccess(@Nullable Long value);
+    public void readToleranceAttribute(IntegerAttributeCallback callback) {
+      readToleranceAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void subscribeToleranceAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeToleranceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public interface NullableBitmap64AttributeCallback {
-      void onSuccess(@Nullable Long value);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface NullableInt8uAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public interface NullableInt16uAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface NullableInt24uAttributeCallback {
-      void onSuccess(@Nullable Long value);
+    private native void readMeasuredValueAttribute(
+        long chipClusterPtr, MeasuredValueAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void subscribeMeasuredValueAttribute(
+        long chipClusterPtr,
+        MeasuredValueAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void readMinMeasuredValueAttribute(
+        long chipClusterPtr, MinMeasuredValueAttributeCallback callback);
 
-    public interface NullableInt32uAttributeCallback {
-      void onSuccess(@Nullable Long value);
+    private native void subscribeMinMeasuredValueAttribute(
+        long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-      void onError(Exception ex);
+    private native void readMaxMeasuredValueAttribute(
+        long chipClusterPtr, MaxMeasuredValueAttributeCallback callback);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeMaxMeasuredValueAttribute(
+        long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public interface NullableInt40uAttributeCallback {
-      void onSuccess(@Nullable Long value);
+    private native void readToleranceAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void subscribeToleranceAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void readGeneratedCommandListAttribute(
+        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
-    public interface NullableInt48uAttributeCallback {
-      void onSuccess(@Nullable Long value);
+    private native void subscribeGeneratedCommandListAttribute(
+        long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-      void onError(Exception ex);
+    private native void readAcceptedCommandListAttribute(
+        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeAcceptedCommandListAttribute(
+        long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public interface NullableInt56uAttributeCallback {
-      void onSuccess(@Nullable Long value);
+    private native void readAttributeListAttribute(
+        long chipClusterPtr, AttributeListAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void subscribeAttributeListAttribute(
+        long chipClusterPtr,
+        AttributeListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public interface NullableInt64uAttributeCallback {
-      void onSuccess(@Nullable Long value);
+    private native void subscribeFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-      void onError(Exception ex);
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-      default void onSubscriptionEstablished() {}
+    private native void subscribeClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
+
+  public static class RelativeHumidityMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1029L;
+
+    public RelativeHumidityMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
     }
 
-    public interface NullableInt8sAttributeCallback {
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public interface MeasuredValueAttributeCallback {
       void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
@@ -17981,7 +17958,7 @@ public interface NullableInt8sAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public interface NullableInt16sAttributeCallback {
+    public interface MinMeasuredValueAttributeCallback {
       void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
@@ -17989,142 +17966,202 @@ public interface NullableInt16sAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public interface NullableInt24sAttributeCallback {
-      void onSuccess(@Nullable Long value);
+    public interface MaxMeasuredValueAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface NullableInt32sAttributeCallback {
-      void onSuccess(@Nullable Long value);
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface NullableInt40sAttributeCallback {
-      void onSuccess(@Nullable Long value);
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface NullableInt48sAttributeCallback {
-      void onSuccess(@Nullable Long value);
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface NullableInt56sAttributeCallback {
-      void onSuccess(@Nullable Long value);
-
-      void onError(Exception ex);
+    public void readMeasuredValueAttribute(MeasuredValueAttributeCallback callback) {
+      readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface NullableInt64sAttributeCallback {
-      void onSuccess(@Nullable Long value);
+    public void readMinMeasuredValueAttribute(MinMeasuredValueAttributeCallback callback) {
+      readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readMaxMeasuredValueAttribute(MaxMeasuredValueAttributeCallback callback) {
+      readMaxMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public interface NullableEnum8AttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public void subscribeMaxMeasuredValueAttribute(
+        MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMaxMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readToleranceAttribute(IntegerAttributeCallback callback) {
+      readToleranceAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeToleranceAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeToleranceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface NullableEnum16AttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public interface NullableFloatSingleAttributeCallback {
-      void onSuccess(@Nullable Float value);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface NullableFloatDoubleAttributeCallback {
-      void onSuccess(@Nullable Double value);
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
     }
 
-    public interface NullableOctetStringAttributeCallback {
-      void onSuccess(@Nullable byte[] value);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    private native void readMeasuredValueAttribute(
+        long chipClusterPtr, MeasuredValueAttributeCallback callback);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeMeasuredValueAttribute(
+        long chipClusterPtr,
+        MeasuredValueAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public interface NullableCharStringAttributeCallback {
-      void onSuccess(@Nullable String value);
+    private native void readMinMeasuredValueAttribute(
+        long chipClusterPtr, MinMeasuredValueAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void subscribeMinMeasuredValueAttribute(
+        long chipClusterPtr,
+        MinMeasuredValueAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void readMaxMeasuredValueAttribute(
+        long chipClusterPtr, MaxMeasuredValueAttributeCallback callback);
 
-    public interface NullableEnumAttrAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    private native void subscribeMaxMeasuredValueAttribute(
+        long chipClusterPtr,
+        MaxMeasuredValueAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-      void onError(Exception ex);
+    private native void readToleranceAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeToleranceAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public interface NullableRangeRestrictedInt8uAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    private native void readGeneratedCommandListAttribute(
+        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void subscribeGeneratedCommandListAttribute(
+        long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void readAcceptedCommandListAttribute(
+        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
 
-    public interface NullableRangeRestrictedInt8sAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    private native void subscribeAcceptedCommandListAttribute(
+        long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-      void onError(Exception ex);
+    private native void readAttributeListAttribute(
+        long chipClusterPtr, AttributeListAttributeCallback callback);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeAttributeListAttribute(
+        long chipClusterPtr,
+        AttributeListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public interface NullableRangeRestrictedInt16uAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void subscribeFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public interface NullableRangeRestrictedInt16sAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    private native void subscribeClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
 
-      void onError(Exception ex);
+  public static class OccupancySensingCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1030L;
 
-      default void onSubscriptionEstablished() {}
+    public OccupancySensingCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
     }
 
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
     public interface GeneratedCommandListAttributeCallback {
       void onSuccess(List<Long> valueList);
 
@@ -18149,1460 +18186,1337 @@ public interface AttributeListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public void readBooleanAttribute(BooleanAttributeCallback callback) {
-      readBooleanAttribute(chipClusterPtr, callback);
-    }
-
-    public void writeBooleanAttribute(DefaultClusterCallback callback, Boolean value) {
-      writeBooleanAttribute(chipClusterPtr, callback, value, null);
-    }
-
-    public void writeBooleanAttribute(
-        DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-      writeBooleanAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readOccupancyAttribute(IntegerAttributeCallback callback) {
+      readOccupancyAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeBooleanAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBooleanAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeOccupancyAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeOccupancyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readBitmap8Attribute(IntegerAttributeCallback callback) {
-      readBitmap8Attribute(chipClusterPtr, callback);
+    public void readOccupancySensorTypeAttribute(IntegerAttributeCallback callback) {
+      readOccupancySensorTypeAttribute(chipClusterPtr, callback);
     }
 
-    public void writeBitmap8Attribute(DefaultClusterCallback callback, Integer value) {
-      writeBitmap8Attribute(chipClusterPtr, callback, value, null);
+    public void subscribeOccupancySensorTypeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeOccupancySensorTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeBitmap8Attribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeBitmap8Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readOccupancySensorTypeBitmapAttribute(IntegerAttributeCallback callback) {
+      readOccupancySensorTypeBitmapAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeBitmap8Attribute(
+    public void subscribeOccupancySensorTypeBitmapAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBitmap8Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeOccupancySensorTypeBitmapAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readBitmap16Attribute(IntegerAttributeCallback callback) {
-      readBitmap16Attribute(chipClusterPtr, callback);
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void writeBitmap16Attribute(DefaultClusterCallback callback, Integer value) {
-      writeBitmap16Attribute(chipClusterPtr, callback, value, null);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeBitmap16Attribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeBitmap16Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeBitmap16Attribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBitmap16Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readBitmap32Attribute(LongAttributeCallback callback) {
-      readBitmap32Attribute(chipClusterPtr, callback);
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
     }
 
-    public void writeBitmap32Attribute(DefaultClusterCallback callback, Long value) {
-      writeBitmap32Attribute(chipClusterPtr, callback, value, null);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeBitmap32Attribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeBitmap32Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeBitmap32Attribute(
+    public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBitmap32Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readBitmap64Attribute(LongAttributeCallback callback) {
-      readBitmap64Attribute(chipClusterPtr, callback);
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
     }
 
-    public void writeBitmap64Attribute(DefaultClusterCallback callback, Long value) {
-      writeBitmap64Attribute(chipClusterPtr, callback, value, null);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeBitmap64Attribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeBitmap64Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void readOccupancyAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeBitmap64Attribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBitmap64Attribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeOccupancyAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readInt8uAttribute(IntegerAttributeCallback callback) {
-      readInt8uAttribute(chipClusterPtr, callback);
-    }
+    private native void readOccupancySensorTypeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void writeInt8uAttribute(DefaultClusterCallback callback, Integer value) {
-      writeInt8uAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void subscribeOccupancySensorTypeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void writeInt8uAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeInt8uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void readOccupancySensorTypeBitmapAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeInt8uAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeInt8uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeOccupancySensorTypeBitmapAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readInt16uAttribute(IntegerAttributeCallback callback) {
-      readInt16uAttribute(chipClusterPtr, callback);
-    }
+    private native void readGeneratedCommandListAttribute(
+        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
-    public void writeInt16uAttribute(DefaultClusterCallback callback, Integer value) {
-      writeInt16uAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void subscribeGeneratedCommandListAttribute(
+        long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void writeInt16uAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeInt16uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void readAcceptedCommandListAttribute(
+        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
 
-    public void subscribeInt16uAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeInt16uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeAcceptedCommandListAttribute(
+        long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void readInt24uAttribute(LongAttributeCallback callback) {
-      readInt24uAttribute(chipClusterPtr, callback);
-    }
+    private native void readAttributeListAttribute(
+        long chipClusterPtr, AttributeListAttributeCallback callback);
 
-    public void writeInt24uAttribute(DefaultClusterCallback callback, Long value) {
-      writeInt24uAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void subscribeAttributeListAttribute(
+        long chipClusterPtr,
+        AttributeListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void writeInt24uAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeInt24uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void subscribeInt24uAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeInt24uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
 
-    public void readInt32uAttribute(LongAttributeCallback callback) {
-      readInt32uAttribute(chipClusterPtr, callback);
-    }
+  public static class WakeOnLanCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1283L;
 
-    public void writeInt32uAttribute(DefaultClusterCallback callback, Long value) {
-      writeInt32uAttribute(chipClusterPtr, callback, value, null);
+    public WakeOnLanCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
     }
 
-    public void writeInt32uAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeInt32uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void subscribeInt32uAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeInt32uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void readInt40uAttribute(LongAttributeCallback callback) {
-      readInt40uAttribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void writeInt40uAttribute(DefaultClusterCallback callback, Long value) {
-      writeInt40uAttribute(chipClusterPtr, callback, value, null);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeInt40uAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeInt40uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void subscribeInt40uAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeInt40uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readInt48uAttribute(LongAttributeCallback callback) {
-      readInt48uAttribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeInt48uAttribute(DefaultClusterCallback callback, Long value) {
-      writeInt48uAttribute(chipClusterPtr, callback, value, null);
-    }
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void writeInt48uAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeInt48uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+      void onError(Exception ex);
 
-    public void subscribeInt48uAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeInt48uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readInt56uAttribute(LongAttributeCallback callback) {
-      readInt56uAttribute(chipClusterPtr, callback);
+    public void readMACAddressAttribute(CharStringAttributeCallback callback) {
+      readMACAddressAttribute(chipClusterPtr, callback);
     }
 
-    public void writeInt56uAttribute(DefaultClusterCallback callback, Long value) {
-      writeInt56uAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeMACAddressAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMACAddressAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeInt56uAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeInt56uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeInt56uAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeInt56uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readInt64uAttribute(LongAttributeCallback callback) {
-      readInt64uAttribute(chipClusterPtr, callback);
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void writeInt64uAttribute(DefaultClusterCallback callback, Long value) {
-      writeInt64uAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeInt64uAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeInt64uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeInt64uAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeInt64uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readInt8sAttribute(IntegerAttributeCallback callback) {
-      readInt8sAttribute(chipClusterPtr, callback);
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public void writeInt8sAttribute(DefaultClusterCallback callback, Integer value) {
-      writeInt8sAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeInt8sAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeInt8sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeInt8sAttribute(
+    public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeInt8sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readInt16sAttribute(IntegerAttributeCallback callback) {
-      readInt16sAttribute(chipClusterPtr, callback);
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeInt16sAttribute(DefaultClusterCallback callback, Integer value) {
-      writeInt16sAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void readMACAddressAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
 
-    public void writeInt16sAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeInt16sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void subscribeMACAddressAttribute(
+        long chipClusterPtr,
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void subscribeInt16sAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeInt16sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readGeneratedCommandListAttribute(
+        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
-    public void readInt24sAttribute(LongAttributeCallback callback) {
-      readInt24sAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeGeneratedCommandListAttribute(
+        long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void writeInt24sAttribute(DefaultClusterCallback callback, Long value) {
-      writeInt24sAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void readAcceptedCommandListAttribute(
+        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
 
-    public void writeInt24sAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeInt24sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void subscribeAcceptedCommandListAttribute(
+        long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void subscribeInt24sAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeInt24sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readAttributeListAttribute(
+        long chipClusterPtr, AttributeListAttributeCallback callback);
 
-    public void readInt32sAttribute(LongAttributeCallback callback) {
-      readInt32sAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeAttributeListAttribute(
+        long chipClusterPtr,
+        AttributeListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void writeInt32sAttribute(DefaultClusterCallback callback, Long value) {
-      writeInt32sAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void writeInt32sAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeInt32sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void subscribeFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void subscribeInt32sAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeInt32sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void readInt40sAttribute(LongAttributeCallback callback) {
-      readInt40sAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
 
-    public void writeInt40sAttribute(DefaultClusterCallback callback, Long value) {
-      writeInt40sAttribute(chipClusterPtr, callback, value, null);
-    }
+  public static class ChannelCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1284L;
 
-    public void writeInt40sAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeInt40sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public ChannelCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
     }
 
-    public void subscribeInt40sAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeInt40sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void readInt48sAttribute(LongAttributeCallback callback) {
-      readInt48sAttribute(chipClusterPtr, callback);
+    public void changeChannel(ChangeChannelResponseCallback callback, String match) {
+      changeChannel(chipClusterPtr, callback, match, null);
     }
 
-    public void writeInt48sAttribute(DefaultClusterCallback callback, Long value) {
-      writeInt48sAttribute(chipClusterPtr, callback, value, null);
+    public void changeChannel(
+        ChangeChannelResponseCallback callback, String match, int timedInvokeTimeoutMs) {
+      changeChannel(chipClusterPtr, callback, match, timedInvokeTimeoutMs);
     }
 
-    public void writeInt48sAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeInt48sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void changeChannelByNumber(
+        DefaultClusterCallback callback, Integer majorNumber, Integer minorNumber) {
+      changeChannelByNumber(chipClusterPtr, callback, majorNumber, minorNumber, null);
     }
 
-    public void subscribeInt48sAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeInt48sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void changeChannelByNumber(
+        DefaultClusterCallback callback,
+        Integer majorNumber,
+        Integer minorNumber,
+        int timedInvokeTimeoutMs) {
+      changeChannelByNumber(
+          chipClusterPtr, callback, majorNumber, minorNumber, timedInvokeTimeoutMs);
     }
 
-    public void readInt56sAttribute(LongAttributeCallback callback) {
-      readInt56sAttribute(chipClusterPtr, callback);
+    public void skipChannel(DefaultClusterCallback callback, Integer count) {
+      skipChannel(chipClusterPtr, callback, count, null);
     }
 
-    public void writeInt56sAttribute(DefaultClusterCallback callback, Long value) {
-      writeInt56sAttribute(chipClusterPtr, callback, value, null);
+    public void skipChannel(
+        DefaultClusterCallback callback, Integer count, int timedInvokeTimeoutMs) {
+      skipChannel(chipClusterPtr, callback, count, timedInvokeTimeoutMs);
     }
 
-    public void writeInt56sAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeInt56sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void changeChannel(
+        long chipClusterPtr,
+        ChangeChannelResponseCallback Callback,
+        String match,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void subscribeInt56sAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeInt56sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void changeChannelByNumber(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer majorNumber,
+        Integer minorNumber,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void readInt64sAttribute(LongAttributeCallback callback) {
-      readInt64sAttribute(chipClusterPtr, callback);
-    }
+    private native void skipChannel(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer count,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void writeInt64sAttribute(DefaultClusterCallback callback, Long value) {
-      writeInt64sAttribute(chipClusterPtr, callback, value, null);
-    }
+    public interface ChangeChannelResponseCallback {
+      void onSuccess(Integer status, Optional<String> data);
 
-    public void writeInt64sAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeInt64sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      void onError(Exception error);
     }
 
-    public void subscribeInt64sAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeInt64sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface ChannelListAttributeCallback {
+      void onSuccess(List<ChipStructs.ChannelClusterChannelInfo> valueList);
 
-    public void readEnum8Attribute(IntegerAttributeCallback callback) {
-      readEnum8Attribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void writeEnum8Attribute(DefaultClusterCallback callback, Integer value) {
-      writeEnum8Attribute(chipClusterPtr, callback, value, null);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeEnum8Attribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeEnum8Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void subscribeEnum8Attribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeEnum8Attribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readEnum16Attribute(IntegerAttributeCallback callback) {
-      readEnum16Attribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeEnum16Attribute(DefaultClusterCallback callback, Integer value) {
-      writeEnum16Attribute(chipClusterPtr, callback, value, null);
-    }
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void writeEnum16Attribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeEnum16Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+      void onError(Exception ex);
 
-    public void subscribeEnum16Attribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeEnum16Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readFloatSingleAttribute(FloatAttributeCallback callback) {
-      readFloatSingleAttribute(chipClusterPtr, callback);
-    }
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void writeFloatSingleAttribute(DefaultClusterCallback callback, Float value) {
-      writeFloatSingleAttribute(chipClusterPtr, callback, value, null);
-    }
+      void onError(Exception ex);
 
-    public void writeFloatSingleAttribute(
-        DefaultClusterCallback callback, Float value, int timedWriteTimeoutMs) {
-      writeFloatSingleAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeFloatSingleAttribute(
-        FloatAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFloatSingleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readChannelListAttribute(ChannelListAttributeCallback callback) {
+      readChannelListAttribute(chipClusterPtr, callback);
     }
 
-    public void readFloatDoubleAttribute(DoubleAttributeCallback callback) {
-      readFloatDoubleAttribute(chipClusterPtr, callback);
+    public void subscribeChannelListAttribute(
+        ChannelListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeChannelListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeFloatDoubleAttribute(DefaultClusterCallback callback, Double value) {
-      writeFloatDoubleAttribute(chipClusterPtr, callback, value, null);
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void writeFloatDoubleAttribute(
-        DefaultClusterCallback callback, Double value, int timedWriteTimeoutMs) {
-      writeFloatDoubleAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void subscribeFloatDoubleAttribute(
-        DoubleAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFloatDoubleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void readOctetStringAttribute(OctetStringAttributeCallback callback) {
-      readOctetStringAttribute(chipClusterPtr, callback);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeOctetStringAttribute(DefaultClusterCallback callback, byte[] value) {
-      writeOctetStringAttribute(chipClusterPtr, callback, value, null);
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
     }
 
-    public void writeOctetStringAttribute(
-        DefaultClusterCallback callback, byte[] value, int timedWriteTimeoutMs) {
-      writeOctetStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void subscribeOctetStringAttribute(
-        OctetStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeOctetStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public void readListInt8uAttribute(ListInt8uAttributeCallback callback) {
-      readListInt8uAttribute(chipClusterPtr, callback);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeListInt8uAttribute(DefaultClusterCallback callback, ArrayList<Integer> value) {
-      writeListInt8uAttribute(chipClusterPtr, callback, value, null);
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
     }
 
-    public void writeListInt8uAttribute(
-        DefaultClusterCallback callback, ArrayList<Integer> value, int timedWriteTimeoutMs) {
-      writeListInt8uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void subscribeListInt8uAttribute(
-        ListInt8uAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeListInt8uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readChannelListAttribute(
+        long chipClusterPtr, ChannelListAttributeCallback callback);
 
-    public void readListOctetStringAttribute(ListOctetStringAttributeCallback callback) {
-      readListOctetStringAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeChannelListAttribute(
+        long chipClusterPtr,
+        ChannelListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void writeListOctetStringAttribute(
-        DefaultClusterCallback callback, ArrayList<byte[]> value) {
-      writeListOctetStringAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void readGeneratedCommandListAttribute(
+        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
-    public void writeListOctetStringAttribute(
-        DefaultClusterCallback callback, ArrayList<byte[]> value, int timedWriteTimeoutMs) {
-      writeListOctetStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void subscribeGeneratedCommandListAttribute(
+        long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void subscribeListOctetStringAttribute(
-        ListOctetStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeListOctetStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readAcceptedCommandListAttribute(
+        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
 
-    public void readListStructOctetStringAttribute(
-        ListStructOctetStringAttributeCallback callback) {
-      readListStructOctetStringAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeAcceptedCommandListAttribute(
+        long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void writeListStructOctetStringAttribute(
-        DefaultClusterCallback callback,
-        ArrayList<ChipStructs.TestClusterClusterTestListStructOctet> value) {
-      writeListStructOctetStringAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void readAttributeListAttribute(
+        long chipClusterPtr, AttributeListAttributeCallback callback);
 
-    public void writeListStructOctetStringAttribute(
-        DefaultClusterCallback callback,
-        ArrayList<ChipStructs.TestClusterClusterTestListStructOctet> value,
-        int timedWriteTimeoutMs) {
-      writeListStructOctetStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void subscribeAttributeListAttribute(
+        long chipClusterPtr,
+        AttributeListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void subscribeListStructOctetStringAttribute(
-        ListStructOctetStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeListStructOctetStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void readLongOctetStringAttribute(OctetStringAttributeCallback callback) {
-      readLongOctetStringAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void writeLongOctetStringAttribute(DefaultClusterCallback callback, byte[] value) {
-      writeLongOctetStringAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void writeLongOctetStringAttribute(
-        DefaultClusterCallback callback, byte[] value, int timedWriteTimeoutMs) {
-      writeLongOctetStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void subscribeClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
 
-    public void subscribeLongOctetStringAttribute(
-        OctetStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeLongOctetStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+  public static class TargetNavigatorCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1285L;
 
-    public void readCharStringAttribute(CharStringAttributeCallback callback) {
-      readCharStringAttribute(chipClusterPtr, callback);
+    public TargetNavigatorCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
     }
 
-    public void writeCharStringAttribute(DefaultClusterCallback callback, String value) {
-      writeCharStringAttribute(chipClusterPtr, callback, value, null);
-    }
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void writeCharStringAttribute(
-        DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
-      writeCharStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void navigateTarget(
+        NavigateTargetResponseCallback callback, Integer target, Optional<String> data) {
+      navigateTarget(chipClusterPtr, callback, target, data, null);
     }
 
-    public void subscribeCharStringAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCharStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void navigateTarget(
+        NavigateTargetResponseCallback callback,
+        Integer target,
+        Optional<String> data,
+        int timedInvokeTimeoutMs) {
+      navigateTarget(chipClusterPtr, callback, target, data, timedInvokeTimeoutMs);
     }
 
-    public void readLongCharStringAttribute(CharStringAttributeCallback callback) {
-      readLongCharStringAttribute(chipClusterPtr, callback);
-    }
+    private native void navigateTarget(
+        long chipClusterPtr,
+        NavigateTargetResponseCallback Callback,
+        Integer target,
+        Optional<String> data,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void writeLongCharStringAttribute(DefaultClusterCallback callback, String value) {
-      writeLongCharStringAttribute(chipClusterPtr, callback, value, null);
-    }
+    public interface NavigateTargetResponseCallback {
+      void onSuccess(Integer status, Optional<String> data);
 
-    public void writeLongCharStringAttribute(
-        DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
-      writeLongCharStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      void onError(Exception error);
     }
 
-    public void subscribeLongCharStringAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeLongCharStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface TargetListAttributeCallback {
+      void onSuccess(List<ChipStructs.TargetNavigatorClusterTargetInfo> valueList);
 
-    public void readEpochUsAttribute(LongAttributeCallback callback) {
-      readEpochUsAttribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void writeEpochUsAttribute(DefaultClusterCallback callback, Long value) {
-      writeEpochUsAttribute(chipClusterPtr, callback, value, null);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeEpochUsAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeEpochUsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void subscribeEpochUsAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeEpochUsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readEpochSAttribute(LongAttributeCallback callback) {
-      readEpochSAttribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeEpochSAttribute(DefaultClusterCallback callback, Long value) {
-      writeEpochSAttribute(chipClusterPtr, callback, value, null);
-    }
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void writeEpochSAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeEpochSAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+      void onError(Exception ex);
 
-    public void subscribeEpochSAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeEpochSAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readVendorIdAttribute(VendorIdAttributeCallback callback) {
-      readVendorIdAttribute(chipClusterPtr, callback);
-    }
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void writeVendorIdAttribute(DefaultClusterCallback callback, Integer value) {
-      writeVendorIdAttribute(chipClusterPtr, callback, value, null);
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeVendorIdAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeVendorIdAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readTargetListAttribute(TargetListAttributeCallback callback) {
+      readTargetListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeVendorIdAttribute(
-        VendorIdAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeVendorIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeTargetListAttribute(
+        TargetListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTargetListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readListNullablesAndOptionalsStructAttribute(
-        ListNullablesAndOptionalsStructAttributeCallback callback) {
-      readListNullablesAndOptionalsStructAttribute(chipClusterPtr, callback);
+    public void readCurrentTargetAttribute(IntegerAttributeCallback callback) {
+      readCurrentTargetAttribute(chipClusterPtr, callback);
     }
 
-    public void writeListNullablesAndOptionalsStructAttribute(
-        DefaultClusterCallback callback,
-        ArrayList<ChipStructs.TestClusterClusterNullablesAndOptionalsStruct> value) {
-      writeListNullablesAndOptionalsStructAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeCurrentTargetAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentTargetAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeListNullablesAndOptionalsStructAttribute(
-        DefaultClusterCallback callback,
-        ArrayList<ChipStructs.TestClusterClusterNullablesAndOptionalsStruct> value,
-        int timedWriteTimeoutMs) {
-      writeListNullablesAndOptionalsStructAttribute(
-          chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeListNullablesAndOptionalsStructAttribute(
-        ListNullablesAndOptionalsStructAttributeCallback callback,
-        int minInterval,
-        int maxInterval) {
-      subscribeListNullablesAndOptionalsStructAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readEnumAttrAttribute(IntegerAttributeCallback callback) {
-      readEnumAttrAttribute(chipClusterPtr, callback);
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void writeEnumAttrAttribute(DefaultClusterCallback callback, Integer value) {
-      writeEnumAttrAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeEnumAttrAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeEnumAttrAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeEnumAttrAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeEnumAttrAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readRangeRestrictedInt8uAttribute(IntegerAttributeCallback callback) {
-      readRangeRestrictedInt8uAttribute(chipClusterPtr, callback);
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public void writeRangeRestrictedInt8uAttribute(DefaultClusterCallback callback, Integer value) {
-      writeRangeRestrictedInt8uAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeRangeRestrictedInt8uAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeRangeRestrictedInt8uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeRangeRestrictedInt8uAttribute(
+    public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRangeRestrictedInt8uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readRangeRestrictedInt8sAttribute(IntegerAttributeCallback callback) {
-      readRangeRestrictedInt8sAttribute(chipClusterPtr, callback);
-    }
+    private native void readTargetListAttribute(
+        long chipClusterPtr, TargetListAttributeCallback callback);
 
-    public void writeRangeRestrictedInt8sAttribute(DefaultClusterCallback callback, Integer value) {
-      writeRangeRestrictedInt8sAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void subscribeTargetListAttribute(
+        long chipClusterPtr,
+        TargetListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void writeRangeRestrictedInt8sAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeRangeRestrictedInt8sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void readCurrentTargetAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeRangeRestrictedInt8sAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRangeRestrictedInt8sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeCurrentTargetAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readRangeRestrictedInt16uAttribute(IntegerAttributeCallback callback) {
-      readRangeRestrictedInt16uAttribute(chipClusterPtr, callback);
-    }
+    private native void readGeneratedCommandListAttribute(
+        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
-    public void writeRangeRestrictedInt16uAttribute(
-        DefaultClusterCallback callback, Integer value) {
-      writeRangeRestrictedInt16uAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void subscribeGeneratedCommandListAttribute(
+        long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void writeRangeRestrictedInt16uAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeRangeRestrictedInt16uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void readAcceptedCommandListAttribute(
+        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
 
-    public void subscribeRangeRestrictedInt16uAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRangeRestrictedInt16uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeAcceptedCommandListAttribute(
+        long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void readRangeRestrictedInt16sAttribute(IntegerAttributeCallback callback) {
-      readRangeRestrictedInt16sAttribute(chipClusterPtr, callback);
-    }
+    private native void readAttributeListAttribute(
+        long chipClusterPtr, AttributeListAttributeCallback callback);
 
-    public void writeRangeRestrictedInt16sAttribute(
-        DefaultClusterCallback callback, Integer value) {
-      writeRangeRestrictedInt16sAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void subscribeAttributeListAttribute(
+        long chipClusterPtr,
+        AttributeListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void writeRangeRestrictedInt16sAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeRangeRestrictedInt16sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void subscribeRangeRestrictedInt16sAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRangeRestrictedInt16sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readListLongOctetStringAttribute(ListLongOctetStringAttributeCallback callback) {
-      readListLongOctetStringAttribute(chipClusterPtr, callback);
-    }
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void writeListLongOctetStringAttribute(
-        DefaultClusterCallback callback, ArrayList<byte[]> value) {
-      writeListLongOctetStringAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void subscribeClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
 
-    public void writeListLongOctetStringAttribute(
-        DefaultClusterCallback callback, ArrayList<byte[]> value, int timedWriteTimeoutMs) {
-      writeListLongOctetStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+  public static class MediaPlaybackCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1286L;
+
+    public MediaPlaybackCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
     }
 
-    public void subscribeListLongOctetStringAttribute(
-        ListLongOctetStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeListLongOctetStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void play(PlaybackResponseCallback callback) {
+      play(chipClusterPtr, callback, null);
     }
 
-    public void readListFabricScopedAttribute(ListFabricScopedAttributeCallback callback) {
-      readListFabricScopedAttribute(chipClusterPtr, callback);
-    }
+    public void play(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
 
-    public void writeListFabricScopedAttribute(
-        DefaultClusterCallback callback,
-        ArrayList<ChipStructs.TestClusterClusterTestFabricScoped> value) {
-      writeListFabricScopedAttribute(chipClusterPtr, callback, value, null);
+      play(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public void writeListFabricScopedAttribute(
-        DefaultClusterCallback callback,
-        ArrayList<ChipStructs.TestClusterClusterTestFabricScoped> value,
-        int timedWriteTimeoutMs) {
-      writeListFabricScopedAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void pause(PlaybackResponseCallback callback) {
+      pause(chipClusterPtr, callback, null);
     }
 
-    public void subscribeListFabricScopedAttribute(
-        ListFabricScopedAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeListFabricScopedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void pause(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
 
-    public void readTimedWriteBooleanAttribute(BooleanAttributeCallback callback) {
-      readTimedWriteBooleanAttribute(chipClusterPtr, callback);
+      pause(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public void writeTimedWriteBooleanAttribute(
-        DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-      writeTimedWriteBooleanAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void stopPlayback(PlaybackResponseCallback callback) {
+      stopPlayback(chipClusterPtr, callback, null);
     }
 
-    public void subscribeTimedWriteBooleanAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTimedWriteBooleanAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void stopPlayback(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
 
-    public void readGeneralErrorBooleanAttribute(BooleanAttributeCallback callback) {
-      readGeneralErrorBooleanAttribute(chipClusterPtr, callback);
+      stopPlayback(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public void writeGeneralErrorBooleanAttribute(DefaultClusterCallback callback, Boolean value) {
-      writeGeneralErrorBooleanAttribute(chipClusterPtr, callback, value, null);
+    public void startOver(PlaybackResponseCallback callback) {
+      startOver(chipClusterPtr, callback, null);
     }
 
-    public void writeGeneralErrorBooleanAttribute(
-        DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-      writeGeneralErrorBooleanAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void startOver(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
 
-    public void subscribeGeneralErrorBooleanAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneralErrorBooleanAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      startOver(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public void readClusterErrorBooleanAttribute(BooleanAttributeCallback callback) {
-      readClusterErrorBooleanAttribute(chipClusterPtr, callback);
+    public void previous(PlaybackResponseCallback callback) {
+      previous(chipClusterPtr, callback, null);
     }
 
-    public void writeClusterErrorBooleanAttribute(DefaultClusterCallback callback, Boolean value) {
-      writeClusterErrorBooleanAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void previous(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
 
-    public void writeClusterErrorBooleanAttribute(
-        DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-      writeClusterErrorBooleanAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      previous(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public void subscribeClusterErrorBooleanAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterErrorBooleanAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void next(PlaybackResponseCallback callback) {
+      next(chipClusterPtr, callback, null);
     }
 
-    public void readUnsupportedAttribute(BooleanAttributeCallback callback) {
-      readUnsupportedAttribute(chipClusterPtr, callback);
-    }
+    public void next(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
 
-    public void writeUnsupportedAttribute(DefaultClusterCallback callback, Boolean value) {
-      writeUnsupportedAttribute(chipClusterPtr, callback, value, null);
+      next(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public void writeUnsupportedAttribute(
-        DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-      writeUnsupportedAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void rewind(PlaybackResponseCallback callback) {
+      rewind(chipClusterPtr, callback, null);
     }
 
-    public void subscribeUnsupportedAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeUnsupportedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void rewind(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
 
-    public void readNullableBooleanAttribute(NullableBooleanAttributeCallback callback) {
-      readNullableBooleanAttribute(chipClusterPtr, callback);
+      rewind(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public void writeNullableBooleanAttribute(DefaultClusterCallback callback, Boolean value) {
-      writeNullableBooleanAttribute(chipClusterPtr, callback, value, null);
+    public void fastForward(PlaybackResponseCallback callback) {
+      fastForward(chipClusterPtr, callback, null);
     }
 
-    public void writeNullableBooleanAttribute(
-        DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-      writeNullableBooleanAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void fastForward(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
 
-    public void subscribeNullableBooleanAttribute(
-        NullableBooleanAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableBooleanAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      fastForward(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public void readNullableBitmap8Attribute(NullableBitmap8AttributeCallback callback) {
-      readNullableBitmap8Attribute(chipClusterPtr, callback);
+    public void skipForward(PlaybackResponseCallback callback, Long deltaPositionMilliseconds) {
+      skipForward(chipClusterPtr, callback, deltaPositionMilliseconds, null);
     }
 
-    public void writeNullableBitmap8Attribute(DefaultClusterCallback callback, Integer value) {
-      writeNullableBitmap8Attribute(chipClusterPtr, callback, value, null);
+    public void skipForward(
+        PlaybackResponseCallback callback,
+        Long deltaPositionMilliseconds,
+        int timedInvokeTimeoutMs) {
+      skipForward(chipClusterPtr, callback, deltaPositionMilliseconds, timedInvokeTimeoutMs);
     }
 
-    public void writeNullableBitmap8Attribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeNullableBitmap8Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void skipBackward(PlaybackResponseCallback callback, Long deltaPositionMilliseconds) {
+      skipBackward(chipClusterPtr, callback, deltaPositionMilliseconds, null);
     }
 
-    public void subscribeNullableBitmap8Attribute(
-        NullableBitmap8AttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableBitmap8Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void skipBackward(
+        PlaybackResponseCallback callback,
+        Long deltaPositionMilliseconds,
+        int timedInvokeTimeoutMs) {
+      skipBackward(chipClusterPtr, callback, deltaPositionMilliseconds, timedInvokeTimeoutMs);
     }
 
-    public void readNullableBitmap16Attribute(NullableBitmap16AttributeCallback callback) {
-      readNullableBitmap16Attribute(chipClusterPtr, callback);
+    public void seek(PlaybackResponseCallback callback, Long position) {
+      seek(chipClusterPtr, callback, position, null);
     }
 
-    public void writeNullableBitmap16Attribute(DefaultClusterCallback callback, Integer value) {
-      writeNullableBitmap16Attribute(chipClusterPtr, callback, value, null);
+    public void seek(PlaybackResponseCallback callback, Long position, int timedInvokeTimeoutMs) {
+      seek(chipClusterPtr, callback, position, timedInvokeTimeoutMs);
     }
 
-    public void writeNullableBitmap16Attribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeNullableBitmap16Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void play(
+        long chipClusterPtr,
+        PlaybackResponseCallback Callback,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void subscribeNullableBitmap16Attribute(
-        NullableBitmap16AttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableBitmap16Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    private native void pause(
+        long chipClusterPtr,
+        PlaybackResponseCallback Callback,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void stopPlayback(
+        long chipClusterPtr,
+        PlaybackResponseCallback Callback,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void startOver(
+        long chipClusterPtr,
+        PlaybackResponseCallback Callback,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void previous(
+        long chipClusterPtr,
+        PlaybackResponseCallback Callback,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void next(
+        long chipClusterPtr,
+        PlaybackResponseCallback Callback,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void rewind(
+        long chipClusterPtr,
+        PlaybackResponseCallback Callback,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void fastForward(
+        long chipClusterPtr,
+        PlaybackResponseCallback Callback,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void skipForward(
+        long chipClusterPtr,
+        PlaybackResponseCallback Callback,
+        Long deltaPositionMilliseconds,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void skipBackward(
+        long chipClusterPtr,
+        PlaybackResponseCallback Callback,
+        Long deltaPositionMilliseconds,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    private native void seek(
+        long chipClusterPtr,
+        PlaybackResponseCallback Callback,
+        Long position,
+        @Nullable Integer timedInvokeTimeoutMs);
+
+    public interface PlaybackResponseCallback {
+      void onSuccess(Integer status, Optional<String> data);
+
+      void onError(Exception error);
     }
 
-    public void readNullableBitmap32Attribute(NullableBitmap32AttributeCallback callback) {
-      readNullableBitmap32Attribute(chipClusterPtr, callback);
+    public interface StartTimeAttributeCallback {
+      void onSuccess(@Nullable Long value);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeNullableBitmap32Attribute(DefaultClusterCallback callback, Long value) {
-      writeNullableBitmap32Attribute(chipClusterPtr, callback, value, null);
+    public interface DurationAttributeCallback {
+      void onSuccess(@Nullable Long value);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeNullableBitmap32Attribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeNullableBitmap32Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public interface SeekRangeEndAttributeCallback {
+      void onSuccess(@Nullable Long value);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeNullableBitmap32Attribute(
-        NullableBitmap32AttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableBitmap32Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface SeekRangeStartAttributeCallback {
+      void onSuccess(@Nullable Long value);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readNullableBitmap64Attribute(NullableBitmap64AttributeCallback callback) {
-      readNullableBitmap64Attribute(chipClusterPtr, callback);
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeNullableBitmap64Attribute(DefaultClusterCallback callback, Long value) {
-      writeNullableBitmap64Attribute(chipClusterPtr, callback, value, null);
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeNullableBitmap64Attribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeNullableBitmap64Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeNullableBitmap64Attribute(
-        NullableBitmap64AttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableBitmap64Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readCurrentStateAttribute(IntegerAttributeCallback callback) {
+      readCurrentStateAttribute(chipClusterPtr, callback);
     }
 
-    public void readNullableInt8uAttribute(NullableInt8uAttributeCallback callback) {
-      readNullableInt8uAttribute(chipClusterPtr, callback);
+    public void subscribeCurrentStateAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeNullableInt8uAttribute(DefaultClusterCallback callback, Integer value) {
-      writeNullableInt8uAttribute(chipClusterPtr, callback, value, null);
+    public void readStartTimeAttribute(StartTimeAttributeCallback callback) {
+      readStartTimeAttribute(chipClusterPtr, callback);
     }
 
-    public void writeNullableInt8uAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeNullableInt8uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void subscribeStartTimeAttribute(
+        StartTimeAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeStartTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void subscribeNullableInt8uAttribute(
-        NullableInt8uAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableInt8uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readDurationAttribute(DurationAttributeCallback callback) {
+      readDurationAttribute(chipClusterPtr, callback);
     }
 
-    public void readNullableInt16uAttribute(NullableInt16uAttributeCallback callback) {
-      readNullableInt16uAttribute(chipClusterPtr, callback);
+    public void subscribeDurationAttribute(
+        DurationAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeDurationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeNullableInt16uAttribute(DefaultClusterCallback callback, Integer value) {
-      writeNullableInt16uAttribute(chipClusterPtr, callback, value, null);
+    public void readPlaybackSpeedAttribute(FloatAttributeCallback callback) {
+      readPlaybackSpeedAttribute(chipClusterPtr, callback);
     }
 
-    public void writeNullableInt16uAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeNullableInt16uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void subscribePlaybackSpeedAttribute(
+        FloatAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribePlaybackSpeedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void subscribeNullableInt16uAttribute(
-        NullableInt16uAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableInt16uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readSeekRangeEndAttribute(SeekRangeEndAttributeCallback callback) {
+      readSeekRangeEndAttribute(chipClusterPtr, callback);
     }
 
-    public void readNullableInt24uAttribute(NullableInt24uAttributeCallback callback) {
-      readNullableInt24uAttribute(chipClusterPtr, callback);
+    public void subscribeSeekRangeEndAttribute(
+        SeekRangeEndAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSeekRangeEndAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeNullableInt24uAttribute(DefaultClusterCallback callback, Long value) {
-      writeNullableInt24uAttribute(chipClusterPtr, callback, value, null);
+    public void readSeekRangeStartAttribute(SeekRangeStartAttributeCallback callback) {
+      readSeekRangeStartAttribute(chipClusterPtr, callback);
     }
 
-    public void writeNullableInt24uAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeNullableInt24uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void subscribeSeekRangeStartAttribute(
+        SeekRangeStartAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSeekRangeStartAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void subscribeNullableInt24uAttribute(
-        NullableInt24uAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableInt24uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void readNullableInt32uAttribute(NullableInt32uAttributeCallback callback) {
-      readNullableInt32uAttribute(chipClusterPtr, callback);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeNullableInt32uAttribute(DefaultClusterCallback callback, Long value) {
-      writeNullableInt32uAttribute(chipClusterPtr, callback, value, null);
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void writeNullableInt32uAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeNullableInt32uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void subscribeNullableInt32uAttribute(
-        NullableInt32uAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableInt32uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
     }
 
-    public void readNullableInt40uAttribute(NullableInt40uAttributeCallback callback) {
-      readNullableInt40uAttribute(chipClusterPtr, callback);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeNullableInt40uAttribute(DefaultClusterCallback callback, Long value) {
-      writeNullableInt40uAttribute(chipClusterPtr, callback, value, null);
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public void writeNullableInt40uAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeNullableInt40uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void subscribeNullableInt40uAttribute(
-        NullableInt40uAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableInt40uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
     }
 
-    public void readNullableInt48uAttribute(NullableInt48uAttributeCallback callback) {
-      readNullableInt48uAttribute(chipClusterPtr, callback);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeNullableInt48uAttribute(DefaultClusterCallback callback, Long value) {
-      writeNullableInt48uAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void readCurrentStateAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void writeNullableInt48uAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeNullableInt48uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void subscribeCurrentStateAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void subscribeNullableInt48uAttribute(
-        NullableInt48uAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableInt48uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readStartTimeAttribute(
+        long chipClusterPtr, StartTimeAttributeCallback callback);
 
-    public void readNullableInt56uAttribute(NullableInt56uAttributeCallback callback) {
-      readNullableInt56uAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeStartTimeAttribute(
+        long chipClusterPtr, StartTimeAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void writeNullableInt56uAttribute(DefaultClusterCallback callback, Long value) {
-      writeNullableInt56uAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void readDurationAttribute(
+        long chipClusterPtr, DurationAttributeCallback callback);
 
-    public void writeNullableInt56uAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeNullableInt56uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void subscribeDurationAttribute(
+        long chipClusterPtr, DurationAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void subscribeNullableInt56uAttribute(
-        NullableInt56uAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableInt56uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readPlaybackSpeedAttribute(
+        long chipClusterPtr, FloatAttributeCallback callback);
 
-    public void readNullableInt64uAttribute(NullableInt64uAttributeCallback callback) {
-      readNullableInt64uAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribePlaybackSpeedAttribute(
+        long chipClusterPtr, FloatAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void writeNullableInt64uAttribute(DefaultClusterCallback callback, Long value) {
-      writeNullableInt64uAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void readSeekRangeEndAttribute(
+        long chipClusterPtr, SeekRangeEndAttributeCallback callback);
 
-    public void writeNullableInt64uAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeNullableInt64uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void subscribeSeekRangeEndAttribute(
+        long chipClusterPtr,
+        SeekRangeEndAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void subscribeNullableInt64uAttribute(
-        NullableInt64uAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableInt64uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readSeekRangeStartAttribute(
+        long chipClusterPtr, SeekRangeStartAttributeCallback callback);
 
-    public void readNullableInt8sAttribute(NullableInt8sAttributeCallback callback) {
-      readNullableInt8sAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeSeekRangeStartAttribute(
+        long chipClusterPtr,
+        SeekRangeStartAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void writeNullableInt8sAttribute(DefaultClusterCallback callback, Integer value) {
-      writeNullableInt8sAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void readGeneratedCommandListAttribute(
+        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
-    public void writeNullableInt8sAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeNullableInt8sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void subscribeGeneratedCommandListAttribute(
+        long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void subscribeNullableInt8sAttribute(
-        NullableInt8sAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableInt8sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readAcceptedCommandListAttribute(
+        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
 
-    public void readNullableInt16sAttribute(NullableInt16sAttributeCallback callback) {
-      readNullableInt16sAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeAcceptedCommandListAttribute(
+        long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void writeNullableInt16sAttribute(DefaultClusterCallback callback, Integer value) {
-      writeNullableInt16sAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void readAttributeListAttribute(
+        long chipClusterPtr, AttributeListAttributeCallback callback);
 
-    public void writeNullableInt16sAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeNullableInt16sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void subscribeAttributeListAttribute(
+        long chipClusterPtr,
+        AttributeListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void subscribeNullableInt16sAttribute(
-        NullableInt16sAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableInt16sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void subscribeFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
+
+  public static class MediaInputCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1287L;
+
+    public MediaInputCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
     }
 
-    public void readNullableInt24sAttribute(NullableInt24sAttributeCallback callback) {
-      readNullableInt24sAttribute(chipClusterPtr, callback);
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void selectInput(DefaultClusterCallback callback, Integer index) {
+      selectInput(chipClusterPtr, callback, index, null);
     }
 
-    public void writeNullableInt24sAttribute(DefaultClusterCallback callback, Long value) {
-      writeNullableInt24sAttribute(chipClusterPtr, callback, value, null);
+    public void selectInput(
+        DefaultClusterCallback callback, Integer index, int timedInvokeTimeoutMs) {
+      selectInput(chipClusterPtr, callback, index, timedInvokeTimeoutMs);
     }
 
-    public void writeNullableInt24sAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeNullableInt24sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void showInputStatus(DefaultClusterCallback callback) {
+      showInputStatus(chipClusterPtr, callback, null);
     }
 
-    public void subscribeNullableInt24sAttribute(
-        NullableInt24sAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableInt24sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void showInputStatus(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
 
-    public void readNullableInt32sAttribute(NullableInt32sAttributeCallback callback) {
-      readNullableInt32sAttribute(chipClusterPtr, callback);
+      showInputStatus(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public void writeNullableInt32sAttribute(DefaultClusterCallback callback, Long value) {
-      writeNullableInt32sAttribute(chipClusterPtr, callback, value, null);
+    public void hideInputStatus(DefaultClusterCallback callback) {
+      hideInputStatus(chipClusterPtr, callback, null);
     }
 
-    public void writeNullableInt32sAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeNullableInt32sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void hideInputStatus(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
 
-    public void subscribeNullableInt32sAttribute(
-        NullableInt32sAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableInt32sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      hideInputStatus(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public void readNullableInt40sAttribute(NullableInt40sAttributeCallback callback) {
-      readNullableInt40sAttribute(chipClusterPtr, callback);
+    public void renameInput(DefaultClusterCallback callback, Integer index, String name) {
+      renameInput(chipClusterPtr, callback, index, name, null);
     }
 
-    public void writeNullableInt40sAttribute(DefaultClusterCallback callback, Long value) {
-      writeNullableInt40sAttribute(chipClusterPtr, callback, value, null);
+    public void renameInput(
+        DefaultClusterCallback callback, Integer index, String name, int timedInvokeTimeoutMs) {
+      renameInput(chipClusterPtr, callback, index, name, timedInvokeTimeoutMs);
     }
 
-    public void writeNullableInt40sAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeNullableInt40sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void selectInput(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer index,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void subscribeNullableInt40sAttribute(
-        NullableInt40sAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableInt40sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void showInputStatus(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void readNullableInt48sAttribute(NullableInt48sAttributeCallback callback) {
-      readNullableInt48sAttribute(chipClusterPtr, callback);
-    }
+    private native void hideInputStatus(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void writeNullableInt48sAttribute(DefaultClusterCallback callback, Long value) {
-      writeNullableInt48sAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void renameInput(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Integer index,
+        String name,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void writeNullableInt48sAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeNullableInt48sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public interface InputListAttributeCallback {
+      void onSuccess(List<ChipStructs.MediaInputClusterInputInfo> valueList);
 
-    public void subscribeNullableInt48sAttribute(
-        NullableInt48sAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableInt48sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readNullableInt56sAttribute(NullableInt56sAttributeCallback callback) {
-      readNullableInt56sAttribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeNullableInt56sAttribute(DefaultClusterCallback callback, Long value) {
-      writeNullableInt56sAttribute(chipClusterPtr, callback, value, null);
-    }
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void writeNullableInt56sAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeNullableInt56sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+      void onError(Exception ex);
 
-    public void subscribeNullableInt56sAttribute(
-        NullableInt56sAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableInt56sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readNullableInt64sAttribute(NullableInt64sAttributeCallback callback) {
-      readNullableInt64sAttribute(chipClusterPtr, callback);
-    }
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void writeNullableInt64sAttribute(DefaultClusterCallback callback, Long value) {
-      writeNullableInt64sAttribute(chipClusterPtr, callback, value, null);
-    }
+      void onError(Exception ex);
 
-    public void writeNullableInt64sAttribute(
-        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-      writeNullableInt64sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeNullableInt64sAttribute(
-        NullableInt64sAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableInt64sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void readNullableEnum8Attribute(NullableEnum8AttributeCallback callback) {
-      readNullableEnum8Attribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void writeNullableEnum8Attribute(DefaultClusterCallback callback, Integer value) {
-      writeNullableEnum8Attribute(chipClusterPtr, callback, value, null);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeNullableEnum8Attribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeNullableEnum8Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readInputListAttribute(InputListAttributeCallback callback) {
+      readInputListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeNullableEnum8Attribute(
-        NullableEnum8AttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableEnum8Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeInputListAttribute(
+        InputListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeInputListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readNullableEnum16Attribute(NullableEnum16AttributeCallback callback) {
-      readNullableEnum16Attribute(chipClusterPtr, callback);
+    public void readCurrentInputAttribute(IntegerAttributeCallback callback) {
+      readCurrentInputAttribute(chipClusterPtr, callback);
     }
 
-    public void writeNullableEnum16Attribute(DefaultClusterCallback callback, Integer value) {
-      writeNullableEnum16Attribute(chipClusterPtr, callback, value, null);
+    public void subscribeCurrentInputAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentInputAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeNullableEnum16Attribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeNullableEnum16Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeNullableEnum16Attribute(
-        NullableEnum16AttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableEnum16Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readNullableFloatSingleAttribute(NullableFloatSingleAttributeCallback callback) {
-      readNullableFloatSingleAttribute(chipClusterPtr, callback);
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void writeNullableFloatSingleAttribute(DefaultClusterCallback callback, Float value) {
-      writeNullableFloatSingleAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeNullableFloatSingleAttribute(
-        DefaultClusterCallback callback, Float value, int timedWriteTimeoutMs) {
-      writeNullableFloatSingleAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeNullableFloatSingleAttribute(
-        NullableFloatSingleAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableFloatSingleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readNullableFloatDoubleAttribute(NullableFloatDoubleAttributeCallback callback) {
-      readNullableFloatDoubleAttribute(chipClusterPtr, callback);
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public void writeNullableFloatDoubleAttribute(DefaultClusterCallback callback, Double value) {
-      writeNullableFloatDoubleAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeNullableFloatDoubleAttribute(
-        DefaultClusterCallback callback, Double value, int timedWriteTimeoutMs) {
-      writeNullableFloatDoubleAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeNullableFloatDoubleAttribute(
-        NullableFloatDoubleAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableFloatDoubleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readNullableOctetStringAttribute(NullableOctetStringAttributeCallback callback) {
-      readNullableOctetStringAttribute(chipClusterPtr, callback);
-    }
+    private native void readInputListAttribute(
+        long chipClusterPtr, InputListAttributeCallback callback);
 
-    public void writeNullableOctetStringAttribute(DefaultClusterCallback callback, byte[] value) {
-      writeNullableOctetStringAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void subscribeInputListAttribute(
+        long chipClusterPtr, InputListAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void writeNullableOctetStringAttribute(
-        DefaultClusterCallback callback, byte[] value, int timedWriteTimeoutMs) {
-      writeNullableOctetStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void readCurrentInputAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeNullableOctetStringAttribute(
-        NullableOctetStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableOctetStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeCurrentInputAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readNullableCharStringAttribute(NullableCharStringAttributeCallback callback) {
-      readNullableCharStringAttribute(chipClusterPtr, callback);
-    }
+    private native void readGeneratedCommandListAttribute(
+        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
-    public void writeNullableCharStringAttribute(DefaultClusterCallback callback, String value) {
-      writeNullableCharStringAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void subscribeGeneratedCommandListAttribute(
+        long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void writeNullableCharStringAttribute(
-        DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
-      writeNullableCharStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void readAcceptedCommandListAttribute(
+        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
 
-    public void subscribeNullableCharStringAttribute(
-        NullableCharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableCharStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeAcceptedCommandListAttribute(
+        long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readAttributeListAttribute(
+        long chipClusterPtr, AttributeListAttributeCallback callback);
+
+    private native void subscribeAttributeListAttribute(
+        long chipClusterPtr,
+        AttributeListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void readNullableEnumAttrAttribute(NullableEnumAttrAttributeCallback callback) {
-      readNullableEnumAttrAttribute(chipClusterPtr, callback);
-    }
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void writeNullableEnumAttrAttribute(DefaultClusterCallback callback, Integer value) {
-      writeNullableEnumAttrAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void subscribeFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void writeNullableEnumAttrAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeNullableEnumAttrAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeNullableEnumAttrAttribute(
-        NullableEnumAttrAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableEnumAttrAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
 
-    public void readNullableRangeRestrictedInt8uAttribute(
-        NullableRangeRestrictedInt8uAttributeCallback callback) {
-      readNullableRangeRestrictedInt8uAttribute(chipClusterPtr, callback);
-    }
+  public static class LowPowerCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1288L;
 
-    public void writeNullableRangeRestrictedInt8uAttribute(
-        DefaultClusterCallback callback, Integer value) {
-      writeNullableRangeRestrictedInt8uAttribute(chipClusterPtr, callback, value, null);
+    public LowPowerCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
     }
 
-    public void writeNullableRangeRestrictedInt8uAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeNullableRangeRestrictedInt8uAttribute(
-          chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void subscribeNullableRangeRestrictedInt8uAttribute(
-        NullableRangeRestrictedInt8uAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableRangeRestrictedInt8uAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+    public void sleep(DefaultClusterCallback callback) {
+      sleep(chipClusterPtr, callback, null);
     }
 
-    public void readNullableRangeRestrictedInt8sAttribute(
-        NullableRangeRestrictedInt8sAttributeCallback callback) {
-      readNullableRangeRestrictedInt8sAttribute(chipClusterPtr, callback);
-    }
+    public void sleep(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
 
-    public void writeNullableRangeRestrictedInt8sAttribute(
-        DefaultClusterCallback callback, Integer value) {
-      writeNullableRangeRestrictedInt8sAttribute(chipClusterPtr, callback, value, null);
+      sleep(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public void writeNullableRangeRestrictedInt8sAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeNullableRangeRestrictedInt8sAttribute(
-          chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void sleep(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    public void subscribeNullableRangeRestrictedInt8sAttribute(
-        NullableRangeRestrictedInt8sAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableRangeRestrictedInt8sAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void readNullableRangeRestrictedInt16uAttribute(
-        NullableRangeRestrictedInt16uAttributeCallback callback) {
-      readNullableRangeRestrictedInt16uAttribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void writeNullableRangeRestrictedInt16uAttribute(
-        DefaultClusterCallback callback, Integer value) {
-      writeNullableRangeRestrictedInt16uAttribute(chipClusterPtr, callback, value, null);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeNullableRangeRestrictedInt16uAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeNullableRangeRestrictedInt16uAttribute(
-          chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void subscribeNullableRangeRestrictedInt16uAttribute(
-        NullableRangeRestrictedInt16uAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableRangeRestrictedInt16uAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readNullableRangeRestrictedInt16sAttribute(
-        NullableRangeRestrictedInt16sAttributeCallback callback) {
-      readNullableRangeRestrictedInt16sAttribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeNullableRangeRestrictedInt16sAttribute(
-        DefaultClusterCallback callback, Integer value) {
-      writeNullableRangeRestrictedInt16sAttribute(chipClusterPtr, callback, value, null);
-    }
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void writeNullableRangeRestrictedInt16sAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeNullableRangeRestrictedInt16sAttribute(
-          chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+      void onError(Exception ex);
 
-    public void subscribeNullableRangeRestrictedInt16sAttribute(
-        NullableRangeRestrictedInt16sAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNullableRangeRestrictedInt16sAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
     public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -19650,1052 +19564,1028 @@ public void subscribeClusterRevisionAttribute(
       subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readBooleanAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
+    private native void readGeneratedCommandListAttribute(
+        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
-    private native void writeBooleanAttribute(
+    private native void subscribeGeneratedCommandListAttribute(
         long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Boolean value,
-        @Nullable Integer timedWriteTimeoutMs);
+        GeneratedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void subscribeBooleanAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+    private native void readAcceptedCommandListAttribute(
+        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
 
-    private native void readBitmap8Attribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeAcceptedCommandListAttribute(
+        long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void writeBitmap8Attribute(
+    private native void readAttributeListAttribute(
+        long chipClusterPtr, AttributeListAttributeCallback callback);
+
+    private native void subscribeAttributeListAttribute(
         long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+        AttributeListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void subscribeBitmap8Attribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void readBitmap16Attribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void writeBitmap16Attribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeBitmap16Attribute(
+    private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
 
-    private native void readBitmap32Attribute(long chipClusterPtr, LongAttributeCallback callback);
+  public static class KeypadInputCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1289L;
 
-    private native void writeBitmap32Attribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public KeypadInputCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
 
-    private native void subscribeBitmap32Attribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
 
-    private native void readBitmap64Attribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void sendKey(SendKeyResponseCallback callback, Integer keyCode) {
+      sendKey(chipClusterPtr, callback, keyCode, null);
+    }
 
-    private native void writeBitmap64Attribute(
+    public void sendKey(
+        SendKeyResponseCallback callback, Integer keyCode, int timedInvokeTimeoutMs) {
+      sendKey(chipClusterPtr, callback, keyCode, timedInvokeTimeoutMs);
+    }
+
+    private native void sendKey(
         long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+        SendKeyResponseCallback Callback,
+        Integer keyCode,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void subscribeBitmap64Attribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public interface SendKeyResponseCallback {
+      void onSuccess(Integer status);
 
-    private native void readInt8uAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      void onError(Exception error);
+    }
 
-    private native void writeInt8uAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void subscribeInt8uAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
 
-    private native void readInt16uAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void writeInt16uAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void subscribeInt16uAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
+    }
+
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
+    }
+
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readInt24uAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void writeInt24uAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeInt24uAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readInt32uAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void writeInt32uAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeInt32uAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readInt40uAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    private native void readGeneratedCommandListAttribute(
+        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
-    private native void writeInt40uAttribute(
+    private native void subscribeGeneratedCommandListAttribute(
         long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeInt40uAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+        GeneratedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void readInt48uAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    private native void readAcceptedCommandListAttribute(
+        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
 
-    private native void writeInt48uAttribute(
+    private native void subscribeAcceptedCommandListAttribute(
         long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeInt48uAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+        AcceptedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void readInt56uAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    private native void readAttributeListAttribute(
+        long chipClusterPtr, AttributeListAttributeCallback callback);
 
-    private native void writeInt56uAttribute(
+    private native void subscribeAttributeListAttribute(
         long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+        AttributeListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void subscribeInt56uAttribute(
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void subscribeFeatureMapAttribute(
         long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readInt64uAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeInt64uAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
 
-    private native void subscribeInt64uAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+  public static class ContentLauncherCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1290L;
 
-    private native void readInt8sAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public ContentLauncherCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
 
-    private native void writeInt8sAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
 
-    private native void subscribeInt8sAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void launchContent(
+        LaunchResponseCallback callback,
+        ChipStructs.ContentLauncherClusterContentSearch search,
+        Boolean autoPlay,
+        Optional<String> data) {
+      launchContent(chipClusterPtr, callback, search, autoPlay, data, null);
+    }
 
-    private native void readInt16sAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void launchContent(
+        LaunchResponseCallback callback,
+        ChipStructs.ContentLauncherClusterContentSearch search,
+        Boolean autoPlay,
+        Optional<String> data,
+        int timedInvokeTimeoutMs) {
+      launchContent(chipClusterPtr, callback, search, autoPlay, data, timedInvokeTimeoutMs);
+    }
 
-    private native void writeInt16sAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void launchURL(
+        LaunchResponseCallback callback,
+        String contentURL,
+        Optional<String> displayString,
+        Optional<ChipStructs.ContentLauncherClusterBrandingInformation> brandingInformation) {
+      launchURL(chipClusterPtr, callback, contentURL, displayString, brandingInformation, null);
+    }
 
-    private native void subscribeInt16sAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void launchURL(
+        LaunchResponseCallback callback,
+        String contentURL,
+        Optional<String> displayString,
+        Optional<ChipStructs.ContentLauncherClusterBrandingInformation> brandingInformation,
+        int timedInvokeTimeoutMs) {
+      launchURL(
+          chipClusterPtr,
+          callback,
+          contentURL,
+          displayString,
+          brandingInformation,
+          timedInvokeTimeoutMs);
+    }
 
-    private native void readInt24sAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    private native void launchContent(
+        long chipClusterPtr,
+        LaunchResponseCallback Callback,
+        ChipStructs.ContentLauncherClusterContentSearch search,
+        Boolean autoPlay,
+        Optional<String> data,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void writeInt24sAttribute(
+    private native void launchURL(
         long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+        LaunchResponseCallback Callback,
+        String contentURL,
+        Optional<String> displayString,
+        Optional<ChipStructs.ContentLauncherClusterBrandingInformation> brandingInformation,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void subscribeInt24sAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public interface LaunchResponseCallback {
+      void onSuccess(Integer status, Optional<String> data);
 
-    private native void readInt32sAttribute(long chipClusterPtr, LongAttributeCallback callback);
+      void onError(Exception error);
+    }
 
-    private native void writeInt32sAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public interface AcceptHeaderAttributeCallback {
+      void onSuccess(List<String> valueList);
 
-    private native void subscribeInt32sAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
 
-    private native void readInt40sAttribute(long chipClusterPtr, LongAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void writeInt40sAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void subscribeInt40sAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
 
-    private native void readInt48sAttribute(long chipClusterPtr, LongAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void writeInt48sAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void subscribeInt48sAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
 
-    private native void readInt56sAttribute(long chipClusterPtr, LongAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void writeInt56sAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void subscribeInt56sAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      void onError(Exception ex);
 
-    private native void readInt64sAttribute(long chipClusterPtr, LongAttributeCallback callback);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void writeInt64sAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void readAcceptHeaderAttribute(AcceptHeaderAttributeCallback callback) {
+      readAcceptHeaderAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeInt64sAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeAcceptHeaderAttribute(
+        AcceptHeaderAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptHeaderAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readEnum8Attribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readSupportedStreamingProtocolsAttribute(LongAttributeCallback callback) {
+      readSupportedStreamingProtocolsAttribute(chipClusterPtr, callback);
+    }
+
+    public void writeSupportedStreamingProtocolsAttribute(
+        DefaultClusterCallback callback, Long value) {
+      writeSupportedStreamingProtocolsAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void writeEnum8Attribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void writeSupportedStreamingProtocolsAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeSupportedStreamingProtocolsAttribute(
+          chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeEnum8Attribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeSupportedStreamingProtocolsAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeSupportedStreamingProtocolsAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readEnum16Attribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void writeEnum16Attribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeEnum16Attribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readFloatSingleAttribute(
-        long chipClusterPtr, FloatAttributeCallback callback);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void writeFloatSingleAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Float value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeFloatSingleAttribute(
-        long chipClusterPtr, FloatAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readFloatDoubleAttribute(
-        long chipClusterPtr, DoubleAttributeCallback callback);
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
 
-    private native void writeFloatDoubleAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Double value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeFloatDoubleAttribute(
-        long chipClusterPtr, DoubleAttributeCallback callback, int minInterval, int maxInterval);
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readOctetStringAttribute(
-        long chipClusterPtr, OctetStringAttributeCallback callback);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void writeOctetStringAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        byte[] value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void readAcceptHeaderAttribute(
+        long chipClusterPtr, AcceptHeaderAttributeCallback callback);
 
-    private native void subscribeOctetStringAttribute(
+    private native void subscribeAcceptHeaderAttribute(
         long chipClusterPtr,
-        OctetStringAttributeCallback callback,
+        AcceptHeaderAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readListInt8uAttribute(
-        long chipClusterPtr, ListInt8uAttributeCallback callback);
+    private native void readSupportedStreamingProtocolsAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void writeListInt8uAttribute(
+    private native void writeSupportedStreamingProtocolsAttribute(
         long chipClusterPtr,
         DefaultClusterCallback callback,
-        ArrayList<Integer> value,
+        Long value,
         @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeListInt8uAttribute(
-        long chipClusterPtr, ListInt8uAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readListOctetStringAttribute(
-        long chipClusterPtr, ListOctetStringAttributeCallback callback);
+    private native void subscribeSupportedStreamingProtocolsAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void writeListOctetStringAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        ArrayList<byte[]> value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void readGeneratedCommandListAttribute(
+        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
-    private native void subscribeListOctetStringAttribute(
+    private native void subscribeGeneratedCommandListAttribute(
         long chipClusterPtr,
-        ListOctetStringAttributeCallback callback,
+        GeneratedCommandListAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readListStructOctetStringAttribute(
-        long chipClusterPtr, ListStructOctetStringAttributeCallback callback);
-
-    private native void writeListStructOctetStringAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        ArrayList<ChipStructs.TestClusterClusterTestListStructOctet> value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void readAcceptedCommandListAttribute(
+        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
 
-    private native void subscribeListStructOctetStringAttribute(
+    private native void subscribeAcceptedCommandListAttribute(
         long chipClusterPtr,
-        ListStructOctetStringAttributeCallback callback,
+        AcceptedCommandListAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readLongOctetStringAttribute(
-        long chipClusterPtr, OctetStringAttributeCallback callback);
-
-    private native void writeLongOctetStringAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        byte[] value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void readAttributeListAttribute(
+        long chipClusterPtr, AttributeListAttributeCallback callback);
 
-    private native void subscribeLongOctetStringAttribute(
+    private native void subscribeAttributeListAttribute(
         long chipClusterPtr,
-        OctetStringAttributeCallback callback,
+        AttributeListAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readCharStringAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void writeCharStringAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        String value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeCharStringAttribute(
-        long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void readLongCharStringAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
+    private native void subscribeClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
 
-    private native void writeLongCharStringAttribute(
+  public static class AudioOutputCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1291L;
+
+    public AudioOutputCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void selectOutput(DefaultClusterCallback callback, Integer index) {
+      selectOutput(chipClusterPtr, callback, index, null);
+    }
+
+    public void selectOutput(
+        DefaultClusterCallback callback, Integer index, int timedInvokeTimeoutMs) {
+      selectOutput(chipClusterPtr, callback, index, timedInvokeTimeoutMs);
+    }
+
+    public void renameOutput(DefaultClusterCallback callback, Integer index, String name) {
+      renameOutput(chipClusterPtr, callback, index, name, null);
+    }
+
+    public void renameOutput(
+        DefaultClusterCallback callback, Integer index, String name, int timedInvokeTimeoutMs) {
+      renameOutput(chipClusterPtr, callback, index, name, timedInvokeTimeoutMs);
+    }
+
+    private native void selectOutput(
         long chipClusterPtr,
-        DefaultClusterCallback callback,
-        String value,
-        @Nullable Integer timedWriteTimeoutMs);
+        DefaultClusterCallback Callback,
+        Integer index,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void subscribeLongCharStringAttribute(
+    private native void renameOutput(
         long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+        DefaultClusterCallback Callback,
+        Integer index,
+        String name,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void readEpochUsAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public interface OutputListAttributeCallback {
+      void onSuccess(List<ChipStructs.AudioOutputClusterOutputInfo> valueList);
 
-    private native void writeEpochUsAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+      void onError(Exception ex);
 
-    private native void subscribeEpochUsAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readEpochSAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void writeEpochSAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+      void onError(Exception ex);
 
-    private native void subscribeEpochSAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readVendorIdAttribute(
-        long chipClusterPtr, VendorIdAttributeCallback callback);
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void writeVendorIdAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+      void onError(Exception ex);
 
-    private native void subscribeVendorIdAttribute(
-        long chipClusterPtr, VendorIdAttributeCallback callback, int minInterval, int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
+
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void readListNullablesAndOptionalsStructAttribute(
-        long chipClusterPtr, ListNullablesAndOptionalsStructAttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void writeListNullablesAndOptionalsStructAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        ArrayList<ChipStructs.TestClusterClusterNullablesAndOptionalsStruct> value,
-        @Nullable Integer timedWriteTimeoutMs);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeListNullablesAndOptionalsStructAttribute(
-        long chipClusterPtr,
-        ListNullablesAndOptionalsStructAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void readOutputListAttribute(OutputListAttributeCallback callback) {
+      readOutputListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readEnumAttrAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeOutputListAttribute(
+        OutputListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeOutputListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void writeEnumAttrAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void readCurrentOutputAttribute(IntegerAttributeCallback callback) {
+      readCurrentOutputAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeEnumAttrAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeCurrentOutputAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentOutputAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readRangeRestrictedInt8uAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void writeRangeRestrictedInt8uAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeRangeRestrictedInt8uAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readRangeRestrictedInt8sAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void writeRangeRestrictedInt8sAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeRangeRestrictedInt8sAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readRangeRestrictedInt16uAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
 
-    private native void writeRangeRestrictedInt16uAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeRangeRestrictedInt16uAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readRangeRestrictedInt16sAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void writeRangeRestrictedInt16sAttribute(
+    private native void readOutputListAttribute(
+        long chipClusterPtr, OutputListAttributeCallback callback);
+
+    private native void subscribeOutputListAttribute(
         long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+        OutputListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void subscribeRangeRestrictedInt16sAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void readCurrentOutputAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void readListLongOctetStringAttribute(
-        long chipClusterPtr, ListLongOctetStringAttributeCallback callback);
+    private native void subscribeCurrentOutputAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void writeListLongOctetStringAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        ArrayList<byte[]> value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void readGeneratedCommandListAttribute(
+        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
-    private native void subscribeListLongOctetStringAttribute(
+    private native void subscribeGeneratedCommandListAttribute(
         long chipClusterPtr,
-        ListLongOctetStringAttributeCallback callback,
+        GeneratedCommandListAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readListFabricScopedAttribute(
-        long chipClusterPtr, ListFabricScopedAttributeCallback callback);
-
-    private native void writeListFabricScopedAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        ArrayList<ChipStructs.TestClusterClusterTestFabricScoped> value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void readAcceptedCommandListAttribute(
+        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
 
-    private native void subscribeListFabricScopedAttribute(
+    private native void subscribeAcceptedCommandListAttribute(
         long chipClusterPtr,
-        ListFabricScopedAttributeCallback callback,
+        AcceptedCommandListAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readTimedWriteBooleanAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
+    private native void readAttributeListAttribute(
+        long chipClusterPtr, AttributeListAttributeCallback callback);
 
-    private native void writeTimedWriteBooleanAttribute(
+    private native void subscribeAttributeListAttribute(
         long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Boolean value,
-        @Nullable Integer timedWriteTimeoutMs);
+        AttributeListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void subscribeTimedWriteBooleanAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void readGeneralErrorBooleanAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
+    private native void subscribeFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void writeGeneralErrorBooleanAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Boolean value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeGeneralErrorBooleanAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
 
-    private native void readClusterErrorBooleanAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
+  public static class ApplicationLauncherCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1292L;
 
-    private native void writeClusterErrorBooleanAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Boolean value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public ApplicationLauncherCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
 
-    private native void subscribeClusterErrorBooleanAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
 
-    private native void readUnsupportedAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
+    public void launchApp(
+        LauncherResponseCallback callback,
+        ChipStructs.ApplicationLauncherClusterApplication application,
+        Optional<byte[]> data) {
+      launchApp(chipClusterPtr, callback, application, data, null);
+    }
 
-    private native void writeUnsupportedAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Boolean value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void launchApp(
+        LauncherResponseCallback callback,
+        ChipStructs.ApplicationLauncherClusterApplication application,
+        Optional<byte[]> data,
+        int timedInvokeTimeoutMs) {
+      launchApp(chipClusterPtr, callback, application, data, timedInvokeTimeoutMs);
+    }
 
-    private native void subscribeUnsupportedAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+    public void stopApp(
+        LauncherResponseCallback callback,
+        ChipStructs.ApplicationLauncherClusterApplication application) {
+      stopApp(chipClusterPtr, callback, application, null);
+    }
 
-    private native void readNullableBooleanAttribute(
-        long chipClusterPtr, NullableBooleanAttributeCallback callback);
+    public void stopApp(
+        LauncherResponseCallback callback,
+        ChipStructs.ApplicationLauncherClusterApplication application,
+        int timedInvokeTimeoutMs) {
+      stopApp(chipClusterPtr, callback, application, timedInvokeTimeoutMs);
+    }
 
-    private native void writeNullableBooleanAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Boolean value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void hideApp(
+        LauncherResponseCallback callback,
+        ChipStructs.ApplicationLauncherClusterApplication application) {
+      hideApp(chipClusterPtr, callback, application, null);
+    }
 
-    private native void subscribeNullableBooleanAttribute(
-        long chipClusterPtr,
-        NullableBooleanAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void hideApp(
+        LauncherResponseCallback callback,
+        ChipStructs.ApplicationLauncherClusterApplication application,
+        int timedInvokeTimeoutMs) {
+      hideApp(chipClusterPtr, callback, application, timedInvokeTimeoutMs);
+    }
 
-    private native void readNullableBitmap8Attribute(
-        long chipClusterPtr, NullableBitmap8AttributeCallback callback);
+    private native void launchApp(
+        long chipClusterPtr,
+        LauncherResponseCallback Callback,
+        ChipStructs.ApplicationLauncherClusterApplication application,
+        Optional<byte[]> data,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void writeNullableBitmap8Attribute(
+    private native void stopApp(
         long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+        LauncherResponseCallback Callback,
+        ChipStructs.ApplicationLauncherClusterApplication application,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void subscribeNullableBitmap8Attribute(
+    private native void hideApp(
         long chipClusterPtr,
-        NullableBitmap8AttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+        LauncherResponseCallback Callback,
+        ChipStructs.ApplicationLauncherClusterApplication application,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void readNullableBitmap16Attribute(
-        long chipClusterPtr, NullableBitmap16AttributeCallback callback);
+    public interface LauncherResponseCallback {
+      void onSuccess(Integer status, byte[] data);
 
-    private native void writeNullableBitmap16Attribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+      void onError(Exception error);
+    }
 
-    private native void subscribeNullableBitmap16Attribute(
-        long chipClusterPtr,
-        NullableBitmap16AttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public interface CatalogListAttributeCallback {
+      void onSuccess(List<Integer> valueList);
 
-    private native void readNullableBitmap32Attribute(
-        long chipClusterPtr, NullableBitmap32AttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void writeNullableBitmap32Attribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeNullableBitmap32Attribute(
-        long chipClusterPtr,
-        NullableBitmap32AttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void readNullableBitmap64Attribute(
-        long chipClusterPtr, NullableBitmap64AttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void writeNullableBitmap64Attribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeNullableBitmap64Attribute(
-        long chipClusterPtr,
-        NullableBitmap64AttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void readNullableInt8uAttribute(
-        long chipClusterPtr, NullableInt8uAttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void writeNullableInt8uAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeNullableInt8uAttribute(
-        long chipClusterPtr,
-        NullableInt8uAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void readNullableInt16uAttribute(
-        long chipClusterPtr, NullableInt16uAttributeCallback callback);
+      void onError(Exception ex);
 
-    private native void writeNullableInt16uAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void subscribeNullableInt16uAttribute(
-        long chipClusterPtr,
-        NullableInt16uAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void readCatalogListAttribute(CatalogListAttributeCallback callback) {
+      readCatalogListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readNullableInt24uAttribute(
-        long chipClusterPtr, NullableInt24uAttributeCallback callback);
+    public void subscribeCatalogListAttribute(
+        CatalogListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCatalogListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void writeNullableInt24uAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeNullableInt24uAttribute(
-        long chipClusterPtr,
-        NullableInt24uAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readNullableInt32uAttribute(
-        long chipClusterPtr, NullableInt32uAttributeCallback callback);
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void writeNullableInt32uAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeNullableInt32uAttribute(
-        long chipClusterPtr,
-        NullableInt32uAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readNullableInt40uAttribute(
-        long chipClusterPtr, NullableInt40uAttributeCallback callback);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void writeNullableInt40uAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeNullableInt40uAttribute(
-        long chipClusterPtr,
-        NullableInt40uAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readNullableInt48uAttribute(
-        long chipClusterPtr, NullableInt48uAttributeCallback callback);
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
 
-    private native void writeNullableInt48uAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeNullableInt48uAttribute(
+    private native void readCatalogListAttribute(
+        long chipClusterPtr, CatalogListAttributeCallback callback);
+
+    private native void subscribeCatalogListAttribute(
         long chipClusterPtr,
-        NullableInt48uAttributeCallback callback,
+        CatalogListAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readNullableInt56uAttribute(
-        long chipClusterPtr, NullableInt56uAttributeCallback callback);
-
-    private native void writeNullableInt56uAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void readGeneratedCommandListAttribute(
+        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
-    private native void subscribeNullableInt56uAttribute(
+    private native void subscribeGeneratedCommandListAttribute(
         long chipClusterPtr,
-        NullableInt56uAttributeCallback callback,
+        GeneratedCommandListAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readNullableInt64uAttribute(
-        long chipClusterPtr, NullableInt64uAttributeCallback callback);
-
-    private native void writeNullableInt64uAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void readAcceptedCommandListAttribute(
+        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
 
-    private native void subscribeNullableInt64uAttribute(
+    private native void subscribeAcceptedCommandListAttribute(
         long chipClusterPtr,
-        NullableInt64uAttributeCallback callback,
+        AcceptedCommandListAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readNullableInt8sAttribute(
-        long chipClusterPtr, NullableInt8sAttributeCallback callback);
-
-    private native void writeNullableInt8sAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void readAttributeListAttribute(
+        long chipClusterPtr, AttributeListAttributeCallback callback);
 
-    private native void subscribeNullableInt8sAttribute(
+    private native void subscribeAttributeListAttribute(
         long chipClusterPtr,
-        NullableInt8sAttributeCallback callback,
+        AttributeListAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readNullableInt16sAttribute(
-        long chipClusterPtr, NullableInt16sAttributeCallback callback);
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void writeNullableInt16sAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeNullableInt16sAttribute(
-        long chipClusterPtr,
-        NullableInt16sAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
 
-    private native void readNullableInt24sAttribute(
-        long chipClusterPtr, NullableInt24sAttributeCallback callback);
+  public static class ApplicationBasicCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1293L;
 
-    private native void writeNullableInt24sAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public ApplicationBasicCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
 
-    private native void subscribeNullableInt24sAttribute(
-        long chipClusterPtr,
-        NullableInt24sAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
 
-    private native void readNullableInt32sAttribute(
-        long chipClusterPtr, NullableInt32sAttributeCallback callback);
+    public interface AllowedVendorListAttributeCallback {
+      void onSuccess(List<Integer> valueList);
 
-    private native void writeNullableInt32sAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+      void onError(Exception ex);
 
-    private native void subscribeNullableInt32sAttribute(
-        long chipClusterPtr,
-        NullableInt32sAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readNullableInt40sAttribute(
-        long chipClusterPtr, NullableInt40sAttributeCallback callback);
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void writeNullableInt40sAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+      void onError(Exception ex);
 
-    private native void subscribeNullableInt40sAttribute(
-        long chipClusterPtr,
-        NullableInt40sAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readNullableInt48sAttribute(
-        long chipClusterPtr, NullableInt48sAttributeCallback callback);
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void writeNullableInt48sAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+      void onError(Exception ex);
 
-    private native void subscribeNullableInt48sAttribute(
-        long chipClusterPtr,
-        NullableInt48sAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readNullableInt56sAttribute(
-        long chipClusterPtr, NullableInt56sAttributeCallback callback);
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    private native void writeNullableInt56sAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+      void onError(Exception ex);
 
-    private native void subscribeNullableInt56sAttribute(
-        long chipClusterPtr,
-        NullableInt56sAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+      default void onSubscriptionEstablished() {}
+    }
 
-    private native void readNullableInt64sAttribute(
-        long chipClusterPtr, NullableInt64sAttributeCallback callback);
+    public void readVendorNameAttribute(CharStringAttributeCallback callback) {
+      readVendorNameAttribute(chipClusterPtr, callback);
+    }
 
-    private native void writeNullableInt64sAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Long value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeVendorNameAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeVendorNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeNullableInt64sAttribute(
-        long chipClusterPtr,
-        NullableInt64sAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void readVendorIDAttribute(IntegerAttributeCallback callback) {
+      readVendorIDAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readNullableEnum8Attribute(
-        long chipClusterPtr, NullableEnum8AttributeCallback callback);
+    public void subscribeVendorIDAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeVendorIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void writeNullableEnum8Attribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void readApplicationNameAttribute(CharStringAttributeCallback callback) {
+      readApplicationNameAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeNullableEnum8Attribute(
-        long chipClusterPtr,
-        NullableEnum8AttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void subscribeApplicationNameAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeApplicationNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readNullableEnum16Attribute(
-        long chipClusterPtr, NullableEnum16AttributeCallback callback);
+    public void readProductIDAttribute(IntegerAttributeCallback callback) {
+      readProductIDAttribute(chipClusterPtr, callback);
+    }
 
-    private native void writeNullableEnum16Attribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeProductIDAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeProductIDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeNullableEnum16Attribute(
-        long chipClusterPtr,
-        NullableEnum16AttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void readStatusAttribute(IntegerAttributeCallback callback) {
+      readStatusAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readNullableFloatSingleAttribute(
-        long chipClusterPtr, NullableFloatSingleAttributeCallback callback);
+    public void subscribeStatusAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void writeNullableFloatSingleAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Float value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void readApplicationVersionAttribute(CharStringAttributeCallback callback) {
+      readApplicationVersionAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeNullableFloatSingleAttribute(
-        long chipClusterPtr,
-        NullableFloatSingleAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void subscribeApplicationVersionAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeApplicationVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readNullableFloatDoubleAttribute(
-        long chipClusterPtr, NullableFloatDoubleAttributeCallback callback);
+    public void readAllowedVendorListAttribute(AllowedVendorListAttributeCallback callback) {
+      readAllowedVendorListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void writeNullableFloatDoubleAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Double value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeAllowedVendorListAttribute(
+        AllowedVendorListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAllowedVendorListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeNullableFloatDoubleAttribute(
-        long chipClusterPtr,
-        NullableFloatDoubleAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readNullableOctetStringAttribute(
-        long chipClusterPtr, NullableOctetStringAttributeCallback callback);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void writeNullableOctetStringAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        byte[] value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeNullableOctetStringAttribute(
-        long chipClusterPtr,
-        NullableOctetStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readNullableCharStringAttribute(
-        long chipClusterPtr, NullableCharStringAttributeCallback callback);
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void writeNullableCharStringAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        String value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeNullableCharStringAttribute(
-        long chipClusterPtr,
-        NullableCharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readNullableEnumAttrAttribute(
-        long chipClusterPtr, NullableEnumAttrAttributeCallback callback);
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
 
-    private native void writeNullableEnumAttrAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeNullableEnumAttrAttribute(
+    private native void readVendorNameAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void subscribeVendorNameAttribute(
         long chipClusterPtr,
-        NullableEnumAttrAttributeCallback callback,
+        CharStringAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readNullableRangeRestrictedInt8uAttribute(
-        long chipClusterPtr, NullableRangeRestrictedInt8uAttributeCallback callback);
+    private native void readVendorIDAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeNullableRangeRestrictedInt8uAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeVendorIDAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeNullableRangeRestrictedInt8uAttribute(
+    private native void readApplicationNameAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void subscribeApplicationNameAttribute(
         long chipClusterPtr,
-        NullableRangeRestrictedInt8uAttributeCallback callback,
+        CharStringAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readNullableRangeRestrictedInt8sAttribute(
-        long chipClusterPtr, NullableRangeRestrictedInt8sAttributeCallback callback);
+    private native void readProductIDAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeNullableRangeRestrictedInt8sAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void subscribeProductIDAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeNullableRangeRestrictedInt8sAttribute(
-        long chipClusterPtr,
-        NullableRangeRestrictedInt8sAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    private native void readStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void readNullableRangeRestrictedInt16uAttribute(
-        long chipClusterPtr, NullableRangeRestrictedInt16uAttributeCallback callback);
+    private native void subscribeStatusAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void writeNullableRangeRestrictedInt16uAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void readApplicationVersionAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
 
-    private native void subscribeNullableRangeRestrictedInt16uAttribute(
+    private native void subscribeApplicationVersionAttribute(
         long chipClusterPtr,
-        NullableRangeRestrictedInt16uAttributeCallback callback,
+        CharStringAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readNullableRangeRestrictedInt16sAttribute(
-        long chipClusterPtr, NullableRangeRestrictedInt16sAttributeCallback callback);
-
-    private native void writeNullableRangeRestrictedInt16sAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void readAllowedVendorListAttribute(
+        long chipClusterPtr, AllowedVendorListAttributeCallback callback);
 
-    private native void subscribeNullableRangeRestrictedInt16sAttribute(
+    private native void subscribeAllowedVendorListAttribute(
         long chipClusterPtr,
-        NullableRangeRestrictedInt16sAttributeCallback callback,
+        AllowedVendorListAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
@@ -20739,120 +20629,70 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class ThermostatCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 513L;
+  public static class AccountLoginCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1294L;
 
-    public ThermostatCluster(long devicePtr, int endpointId) {
+    public AccountLoginCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void clearWeeklySchedule(DefaultClusterCallback callback) {
-      clearWeeklySchedule(chipClusterPtr, callback, null);
-    }
-
-    public void clearWeeklySchedule(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-
-      clearWeeklySchedule(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
-
-    public void getWeeklySchedule(
-        GetWeeklyScheduleResponseCallback callback, Integer daysToReturn, Integer modeToReturn) {
-      getWeeklySchedule(chipClusterPtr, callback, daysToReturn, modeToReturn, null);
-    }
-
-    public void getWeeklySchedule(
-        GetWeeklyScheduleResponseCallback callback,
-        Integer daysToReturn,
-        Integer modeToReturn,
+    public void getSetupPIN(
+        GetSetupPINResponseCallback callback,
+        String tempAccountIdentifier,
         int timedInvokeTimeoutMs) {
-      getWeeklySchedule(chipClusterPtr, callback, daysToReturn, modeToReturn, timedInvokeTimeoutMs);
-    }
-
-    public void setWeeklySchedule(
-        DefaultClusterCallback callback,
-        Integer numberOfTransitionsForSequence,
-        Integer dayOfWeekForSequence,
-        Integer modeForSequence,
-        ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions) {
-      setWeeklySchedule(
-          chipClusterPtr,
-          callback,
-          numberOfTransitionsForSequence,
-          dayOfWeekForSequence,
-          modeForSequence,
-          transitions,
-          null);
+      getSetupPIN(chipClusterPtr, callback, tempAccountIdentifier, timedInvokeTimeoutMs);
     }
 
-    public void setWeeklySchedule(
+    public void login(
         DefaultClusterCallback callback,
-        Integer numberOfTransitionsForSequence,
-        Integer dayOfWeekForSequence,
-        Integer modeForSequence,
-        ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions,
+        String tempAccountIdentifier,
+        String setupPIN,
         int timedInvokeTimeoutMs) {
-      setWeeklySchedule(
-          chipClusterPtr,
-          callback,
-          numberOfTransitionsForSequence,
-          dayOfWeekForSequence,
-          modeForSequence,
-          transitions,
-          timedInvokeTimeoutMs);
+      login(chipClusterPtr, callback, tempAccountIdentifier, setupPIN, timedInvokeTimeoutMs);
     }
 
-    public void setpointRaiseLower(DefaultClusterCallback callback, Integer mode, Integer amount) {
-      setpointRaiseLower(chipClusterPtr, callback, mode, amount, null);
-    }
+    public void logout(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
 
-    public void setpointRaiseLower(
-        DefaultClusterCallback callback, Integer mode, Integer amount, int timedInvokeTimeoutMs) {
-      setpointRaiseLower(chipClusterPtr, callback, mode, amount, timedInvokeTimeoutMs);
+      logout(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    private native void clearWeeklySchedule(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void getWeeklySchedule(
+    private native void getSetupPIN(
         long chipClusterPtr,
-        GetWeeklyScheduleResponseCallback Callback,
-        Integer daysToReturn,
-        Integer modeToReturn,
+        GetSetupPINResponseCallback Callback,
+        String tempAccountIdentifier,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void setWeeklySchedule(
+    private native void login(
         long chipClusterPtr,
         DefaultClusterCallback Callback,
-        Integer numberOfTransitionsForSequence,
-        Integer dayOfWeekForSequence,
-        Integer modeForSequence,
-        ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions,
+        String tempAccountIdentifier,
+        String setupPIN,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void setpointRaiseLower(
+    private native void logout(
         long chipClusterPtr,
         DefaultClusterCallback Callback,
-        Integer mode,
-        Integer amount,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    public interface GetWeeklyScheduleResponseCallback {
-      void onSuccess(
-          Integer numberOfTransitionsForSequence,
-          Integer dayOfWeekForSequence,
-          Integer modeForSequence,
-          ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions);
+    public interface GetSetupPINResponseCallback {
+      void onSuccess(String setupPIN);
 
       void onError(Exception error);
     }
 
-    public interface LocalTemperatureAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
+    }
+
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
       void onError(Exception ex);
 
@@ -20867,245 +20707,240 @@ public interface AttributeListAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public void readLocalTemperatureAttribute(LocalTemperatureAttributeCallback callback) {
-      readLocalTemperatureAttribute(chipClusterPtr, callback);
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeLocalTemperatureAttribute(
-        LocalTemperatureAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeLocalTemperatureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readAbsMinHeatSetpointLimitAttribute(IntegerAttributeCallback callback) {
-      readAbsMinHeatSetpointLimitAttribute(chipClusterPtr, callback);
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeAbsMinHeatSetpointLimitAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAbsMinHeatSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readAbsMaxHeatSetpointLimitAttribute(IntegerAttributeCallback callback) {
-      readAbsMaxHeatSetpointLimitAttribute(chipClusterPtr, callback);
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeAbsMaxHeatSetpointLimitAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAbsMaxHeatSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readAbsMinCoolSetpointLimitAttribute(IntegerAttributeCallback callback) {
-      readAbsMinCoolSetpointLimitAttribute(chipClusterPtr, callback);
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeAbsMinCoolSetpointLimitAttribute(
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAbsMinCoolSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readAbsMaxCoolSetpointLimitAttribute(IntegerAttributeCallback callback) {
-      readAbsMaxCoolSetpointLimitAttribute(chipClusterPtr, callback);
-    }
+    private native void readGeneratedCommandListAttribute(
+        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+
+    private native void subscribeGeneratedCommandListAttribute(
+        long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(
+        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+
+    private native void subscribeAcceptedCommandListAttribute(
+        long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
+
+    private native void readAttributeListAttribute(
+        long chipClusterPtr, AttributeListAttributeCallback callback);
 
-    public void subscribeAbsMaxCoolSetpointLimitAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAbsMaxCoolSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeAttributeListAttribute(
+        long chipClusterPtr,
+        AttributeListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void readOccupiedCoolingSetpointAttribute(IntegerAttributeCallback callback) {
-      readOccupiedCoolingSetpointAttribute(chipClusterPtr, callback);
-    }
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void writeOccupiedCoolingSetpointAttribute(
-        DefaultClusterCallback callback, Integer value) {
-      writeOccupiedCoolingSetpointAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void subscribeFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void writeOccupiedCoolingSetpointAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeOccupiedCoolingSetpointAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void subscribeOccupiedCoolingSetpointAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeOccupiedCoolingSetpointAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
 
-    public void readOccupiedHeatingSetpointAttribute(IntegerAttributeCallback callback) {
-      readOccupiedHeatingSetpointAttribute(chipClusterPtr, callback);
-    }
+  public static class ElectricalMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 2820L;
 
-    public void writeOccupiedHeatingSetpointAttribute(
-        DefaultClusterCallback callback, Integer value) {
-      writeOccupiedHeatingSetpointAttribute(chipClusterPtr, callback, value, null);
+    public ElectricalMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
     }
 
-    public void writeOccupiedHeatingSetpointAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeOccupiedHeatingSetpointAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void subscribeOccupiedHeatingSetpointAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeOccupiedHeatingSetpointAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void readMinHeatSetpointLimitAttribute(IntegerAttributeCallback callback) {
-      readMinHeatSetpointLimitAttribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void writeMinHeatSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
-      writeMinHeatSetpointLimitAttribute(chipClusterPtr, callback, value, null);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeMinHeatSetpointLimitAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeMinHeatSetpointLimitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void subscribeMinHeatSetpointLimitAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMinHeatSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readMaxHeatSetpointLimitAttribute(IntegerAttributeCallback callback) {
-      readMaxHeatSetpointLimitAttribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void writeMaxHeatSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
-      writeMaxHeatSetpointLimitAttribute(chipClusterPtr, callback, value, null);
-    }
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void writeMaxHeatSetpointLimitAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeMaxHeatSetpointLimitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+      void onError(Exception ex);
 
-    public void subscribeMaxHeatSetpointLimitAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMaxHeatSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readMinCoolSetpointLimitAttribute(IntegerAttributeCallback callback) {
-      readMinCoolSetpointLimitAttribute(chipClusterPtr, callback);
+    public void readMeasurementTypeAttribute(LongAttributeCallback callback) {
+      readMeasurementTypeAttribute(chipClusterPtr, callback);
     }
 
-    public void writeMinCoolSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
-      writeMinCoolSetpointLimitAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeMeasurementTypeAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeMeasurementTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeMinCoolSetpointLimitAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeMinCoolSetpointLimitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readTotalActivePowerAttribute(LongAttributeCallback callback) {
+      readTotalActivePowerAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeMinCoolSetpointLimitAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMinCoolSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeTotalActivePowerAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTotalActivePowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readMaxCoolSetpointLimitAttribute(IntegerAttributeCallback callback) {
-      readMaxCoolSetpointLimitAttribute(chipClusterPtr, callback);
+    public void readRmsVoltageAttribute(IntegerAttributeCallback callback) {
+      readRmsVoltageAttribute(chipClusterPtr, callback);
     }
 
-    public void writeMaxCoolSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
-      writeMaxCoolSetpointLimitAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeRmsVoltageAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRmsVoltageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeMaxCoolSetpointLimitAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeMaxCoolSetpointLimitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readRmsVoltageMinAttribute(IntegerAttributeCallback callback) {
+      readRmsVoltageMinAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeMaxCoolSetpointLimitAttribute(
+    public void subscribeRmsVoltageMinAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMaxCoolSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeRmsVoltageMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readMinSetpointDeadBandAttribute(IntegerAttributeCallback callback) {
-      readMinSetpointDeadBandAttribute(chipClusterPtr, callback);
+    public void readRmsVoltageMaxAttribute(IntegerAttributeCallback callback) {
+      readRmsVoltageMaxAttribute(chipClusterPtr, callback);
     }
 
-    public void writeMinSetpointDeadBandAttribute(DefaultClusterCallback callback, Integer value) {
-      writeMinSetpointDeadBandAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeRmsVoltageMaxAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRmsVoltageMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeMinSetpointDeadBandAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeMinSetpointDeadBandAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readRmsCurrentAttribute(IntegerAttributeCallback callback) {
+      readRmsCurrentAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeMinSetpointDeadBandAttribute(
+    public void subscribeRmsCurrentAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMinSetpointDeadBandAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeRmsCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readControlSequenceOfOperationAttribute(IntegerAttributeCallback callback) {
-      readControlSequenceOfOperationAttribute(chipClusterPtr, callback);
+    public void readRmsCurrentMinAttribute(IntegerAttributeCallback callback) {
+      readRmsCurrentMinAttribute(chipClusterPtr, callback);
     }
 
-    public void writeControlSequenceOfOperationAttribute(
-        DefaultClusterCallback callback, Integer value) {
-      writeControlSequenceOfOperationAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeRmsCurrentMinAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRmsCurrentMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeControlSequenceOfOperationAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeControlSequenceOfOperationAttribute(
-          chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readRmsCurrentMaxAttribute(IntegerAttributeCallback callback) {
+      readRmsCurrentMaxAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeControlSequenceOfOperationAttribute(
+    public void subscribeRmsCurrentMaxAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeControlSequenceOfOperationAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeRmsCurrentMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readSystemModeAttribute(IntegerAttributeCallback callback) {
-      readSystemModeAttribute(chipClusterPtr, callback);
+    public void readActivePowerAttribute(IntegerAttributeCallback callback) {
+      readActivePowerAttribute(chipClusterPtr, callback);
     }
 
-    public void writeSystemModeAttribute(DefaultClusterCallback callback, Integer value) {
-      writeSystemModeAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeActivePowerAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeActivePowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeSystemModeAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeSystemModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readActivePowerMinAttribute(IntegerAttributeCallback callback) {
+      readActivePowerMinAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeSystemModeAttribute(
+    public void subscribeActivePowerMinAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSystemModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeActivePowerMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readStartOfWeekAttribute(IntegerAttributeCallback callback) {
-      readStartOfWeekAttribute(chipClusterPtr, callback);
+    public void readActivePowerMaxAttribute(IntegerAttributeCallback callback) {
+      readActivePowerMaxAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeStartOfWeekAttribute(
+    public void subscribeActivePowerMaxAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeStartOfWeekAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeActivePowerMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readNumberOfWeeklyTransitionsAttribute(IntegerAttributeCallback callback) {
-      readNumberOfWeeklyTransitionsAttribute(chipClusterPtr, callback);
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeNumberOfWeeklyTransitionsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNumberOfWeeklyTransitionsAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readNumberOfDailyTransitionsAttribute(IntegerAttributeCallback callback) {
-      readNumberOfDailyTransitionsAttribute(chipClusterPtr, callback);
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeNumberOfDailyTransitionsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNumberOfDailyTransitionsAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
@@ -21128,171 +20963,96 @@ public void subscribeFeatureMapAttribute(
 
     public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    private native void readLocalTemperatureAttribute(
-        long chipClusterPtr, LocalTemperatureAttributeCallback callback);
-
-    private native void subscribeLocalTemperatureAttribute(
-        long chipClusterPtr,
-        LocalTemperatureAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readAbsMinHeatSetpointLimitAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeAbsMinHeatSetpointLimitAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAbsMaxHeatSetpointLimitAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeAbsMaxHeatSetpointLimitAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readAbsMinCoolSetpointLimitAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeAbsMinCoolSetpointLimitAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    }
 
-    private native void readAbsMaxCoolSetpointLimitAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeAbsMaxCoolSetpointLimitAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void readMeasurementTypeAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void readOccupiedCoolingSetpointAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeMeasurementTypeAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void writeOccupiedCoolingSetpointAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    private native void readTotalActivePowerAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeOccupiedCoolingSetpointAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeTotalActivePowerAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readOccupiedHeatingSetpointAttribute(
+    private native void readRmsVoltageAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeOccupiedHeatingSetpointAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeOccupiedHeatingSetpointAttribute(
+    private native void subscribeRmsVoltageAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readMinHeatSetpointLimitAttribute(
+    private native void readRmsVoltageMinAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeMinHeatSetpointLimitAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeMinHeatSetpointLimitAttribute(
+    private native void subscribeRmsVoltageMinAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readMaxHeatSetpointLimitAttribute(
+    private native void readRmsVoltageMaxAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeMaxHeatSetpointLimitAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeMaxHeatSetpointLimitAttribute(
+    private native void subscribeRmsVoltageMaxAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readMinCoolSetpointLimitAttribute(
+    private native void readRmsCurrentAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeMinCoolSetpointLimitAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeMinCoolSetpointLimitAttribute(
+    private native void subscribeRmsCurrentAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readMaxCoolSetpointLimitAttribute(
+    private native void readRmsCurrentMinAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeMaxCoolSetpointLimitAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeMaxCoolSetpointLimitAttribute(
+    private native void subscribeRmsCurrentMinAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readMinSetpointDeadBandAttribute(
+    private native void readRmsCurrentMaxAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeMinSetpointDeadBandAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeMinSetpointDeadBandAttribute(
+    private native void subscribeRmsCurrentMaxAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readControlSequenceOfOperationAttribute(
+    private native void readActivePowerAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeControlSequenceOfOperationAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeControlSequenceOfOperationAttribute(
+    private native void subscribeActivePowerAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readSystemModeAttribute(
+    private native void readActivePowerMinAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeSystemModeAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeSystemModeAttribute(
+    private native void subscribeActivePowerMinAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readStartOfWeekAttribute(
+    private native void readActivePowerMaxAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeStartOfWeekAttribute(
+    private native void subscribeActivePowerMaxAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readNumberOfWeeklyTransitionsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readGeneratedCommandListAttribute(
+        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
 
-    private native void subscribeNumberOfWeeklyTransitionsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeGeneratedCommandListAttribute(
+        long chipClusterPtr,
+        GeneratedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void readNumberOfDailyTransitionsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readAcceptedCommandListAttribute(
+        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
 
-    private native void subscribeNumberOfDailyTransitionsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeAcceptedCommandListAttribute(
+        long chipClusterPtr,
+        AcceptedCommandListAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
     private native void readAttributeListAttribute(
         long chipClusterPtr, AttributeListAttributeCallback callback);
@@ -21316,340 +21076,435 @@ private native void subscribeClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
   }
 
-  public static class ThermostatUserInterfaceConfigurationCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 516L;
+  public static class TestClusterCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 4294048773L;
 
-    public ThermostatUserInterfaceConfigurationCluster(long devicePtr, int endpointId) {
+    public TestClusterCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void test(DefaultClusterCallback callback) {
+      test(chipClusterPtr, callback, null);
+    }
 
-      void onError(Exception ex);
+    public void test(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
 
-      default void onSubscriptionEstablished() {}
+      test(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void testNotHandled(DefaultClusterCallback callback) {
+      testNotHandled(chipClusterPtr, callback, null);
+    }
 
-      void onError(Exception ex);
+    public void testNotHandled(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
 
-      default void onSubscriptionEstablished() {}
+      testNotHandled(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void testSpecific(TestSpecificResponseCallback callback) {
+      testSpecific(chipClusterPtr, callback, null);
+    }
 
-      void onError(Exception ex);
+    public void testSpecific(TestSpecificResponseCallback callback, int timedInvokeTimeoutMs) {
 
-      default void onSubscriptionEstablished() {}
+      testSpecific(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public void readTemperatureDisplayModeAttribute(IntegerAttributeCallback callback) {
-      readTemperatureDisplayModeAttribute(chipClusterPtr, callback);
+    public void testUnknownCommand(DefaultClusterCallback callback) {
+      testUnknownCommand(chipClusterPtr, callback, null);
     }
 
-    public void writeTemperatureDisplayModeAttribute(
-        DefaultClusterCallback callback, Integer value) {
-      writeTemperatureDisplayModeAttribute(chipClusterPtr, callback, value, null);
+    public void testUnknownCommand(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+
+      testUnknownCommand(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public void writeTemperatureDisplayModeAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeTemperatureDisplayModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void testAddArguments(
+        TestAddArgumentsResponseCallback callback, Integer arg1, Integer arg2) {
+      testAddArguments(chipClusterPtr, callback, arg1, arg2, null);
     }
 
-    public void subscribeTemperatureDisplayModeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTemperatureDisplayModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void testAddArguments(
+        TestAddArgumentsResponseCallback callback,
+        Integer arg1,
+        Integer arg2,
+        int timedInvokeTimeoutMs) {
+      testAddArguments(chipClusterPtr, callback, arg1, arg2, timedInvokeTimeoutMs);
     }
 
-    public void readKeypadLockoutAttribute(IntegerAttributeCallback callback) {
-      readKeypadLockoutAttribute(chipClusterPtr, callback);
+    public void testStructArgumentRequest(
+        BooleanResponseCallback callback, ChipStructs.TestClusterClusterSimpleStruct arg1) {
+      testStructArgumentRequest(chipClusterPtr, callback, arg1, null);
     }
 
-    public void writeKeypadLockoutAttribute(DefaultClusterCallback callback, Integer value) {
-      writeKeypadLockoutAttribute(chipClusterPtr, callback, value, null);
+    public void testStructArgumentRequest(
+        BooleanResponseCallback callback,
+        ChipStructs.TestClusterClusterSimpleStruct arg1,
+        int timedInvokeTimeoutMs) {
+      testStructArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
     }
 
-    public void writeKeypadLockoutAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeKeypadLockoutAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void testNestedStructArgumentRequest(
+        BooleanResponseCallback callback, ChipStructs.TestClusterClusterNestedStruct arg1) {
+      testNestedStructArgumentRequest(chipClusterPtr, callback, arg1, null);
     }
 
-    public void subscribeKeypadLockoutAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeKeypadLockoutAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void testNestedStructArgumentRequest(
+        BooleanResponseCallback callback,
+        ChipStructs.TestClusterClusterNestedStruct arg1,
+        int timedInvokeTimeoutMs) {
+      testNestedStructArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
+    }
+
+    public void testListStructArgumentRequest(
+        BooleanResponseCallback callback,
+        ArrayList<ChipStructs.TestClusterClusterSimpleStruct> arg1) {
+      testListStructArgumentRequest(chipClusterPtr, callback, arg1, null);
+    }
+
+    public void testListStructArgumentRequest(
+        BooleanResponseCallback callback,
+        ArrayList<ChipStructs.TestClusterClusterSimpleStruct> arg1,
+        int timedInvokeTimeoutMs) {
+      testListStructArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
+    }
+
+    public void testListInt8UArgumentRequest(
+        BooleanResponseCallback callback, ArrayList<Integer> arg1) {
+      testListInt8UArgumentRequest(chipClusterPtr, callback, arg1, null);
+    }
+
+    public void testListInt8UArgumentRequest(
+        BooleanResponseCallback callback, ArrayList<Integer> arg1, int timedInvokeTimeoutMs) {
+      testListInt8UArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
+    }
+
+    public void testNestedStructListArgumentRequest(
+        BooleanResponseCallback callback, ChipStructs.TestClusterClusterNestedStructList arg1) {
+      testNestedStructListArgumentRequest(chipClusterPtr, callback, arg1, null);
+    }
+
+    public void testNestedStructListArgumentRequest(
+        BooleanResponseCallback callback,
+        ChipStructs.TestClusterClusterNestedStructList arg1,
+        int timedInvokeTimeoutMs) {
+      testNestedStructListArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
+    }
+
+    public void testListNestedStructListArgumentRequest(
+        BooleanResponseCallback callback,
+        ArrayList<ChipStructs.TestClusterClusterNestedStructList> arg1) {
+      testListNestedStructListArgumentRequest(chipClusterPtr, callback, arg1, null);
     }
 
-    public void readScheduleProgrammingVisibilityAttribute(IntegerAttributeCallback callback) {
-      readScheduleProgrammingVisibilityAttribute(chipClusterPtr, callback);
+    public void testListNestedStructListArgumentRequest(
+        BooleanResponseCallback callback,
+        ArrayList<ChipStructs.TestClusterClusterNestedStructList> arg1,
+        int timedInvokeTimeoutMs) {
+      testListNestedStructListArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
     }
 
-    public void writeScheduleProgrammingVisibilityAttribute(
-        DefaultClusterCallback callback, Integer value) {
-      writeScheduleProgrammingVisibilityAttribute(chipClusterPtr, callback, value, null);
+    public void testListInt8UReverseRequest(
+        TestListInt8UReverseResponseCallback callback, ArrayList<Integer> arg1) {
+      testListInt8UReverseRequest(chipClusterPtr, callback, arg1, null);
     }
 
-    public void writeScheduleProgrammingVisibilityAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeScheduleProgrammingVisibilityAttribute(
-          chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void testListInt8UReverseRequest(
+        TestListInt8UReverseResponseCallback callback,
+        ArrayList<Integer> arg1,
+        int timedInvokeTimeoutMs) {
+      testListInt8UReverseRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
     }
 
-    public void subscribeScheduleProgrammingVisibilityAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeScheduleProgrammingVisibilityAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+    public void testEnumsRequest(TestEnumsResponseCallback callback, Integer arg1, Integer arg2) {
+      testEnumsRequest(chipClusterPtr, callback, arg1, arg2, null);
     }
 
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    public void testEnumsRequest(
+        TestEnumsResponseCallback callback, Integer arg1, Integer arg2, int timedInvokeTimeoutMs) {
+      testEnumsRequest(chipClusterPtr, callback, arg1, arg2, timedInvokeTimeoutMs);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void testNullableOptionalRequest(
+        TestNullableOptionalResponseCallback callback, @Nullable Optional<Integer> arg1) {
+      testNullableOptionalRequest(chipClusterPtr, callback, arg1, null);
     }
 
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    public void testNullableOptionalRequest(
+        TestNullableOptionalResponseCallback callback,
+        @Nullable Optional<Integer> arg1,
+        int timedInvokeTimeoutMs) {
+      testNullableOptionalRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void simpleStructEchoRequest(
+        SimpleStructResponseCallback callback, ChipStructs.TestClusterClusterSimpleStruct arg1) {
+      simpleStructEchoRequest(chipClusterPtr, callback, arg1, null);
     }
 
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
+    public void simpleStructEchoRequest(
+        SimpleStructResponseCallback callback,
+        ChipStructs.TestClusterClusterSimpleStruct arg1,
+        int timedInvokeTimeoutMs) {
+      simpleStructEchoRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
     }
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void timedInvokeRequest(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
+      timedInvokeRequest(chipClusterPtr, callback, timedInvokeTimeoutMs);
     }
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void testSimpleOptionalArgumentRequest(
+        DefaultClusterCallback callback, Optional<Boolean> arg1) {
+      testSimpleOptionalArgumentRequest(chipClusterPtr, callback, arg1, null);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
+    public void testSimpleOptionalArgumentRequest(
+        DefaultClusterCallback callback, Optional<Boolean> arg1, int timedInvokeTimeoutMs) {
+      testSimpleOptionalArgumentRequest(chipClusterPtr, callback, arg1, timedInvokeTimeoutMs);
     }
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void testEmitTestEventRequest(
+        TestEmitTestEventResponseCallback callback, Integer arg1, Integer arg2, Boolean arg3) {
+      testEmitTestEventRequest(chipClusterPtr, callback, arg1, arg2, arg3, null);
     }
 
-    private native void readTemperatureDisplayModeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void testEmitTestEventRequest(
+        TestEmitTestEventResponseCallback callback,
+        Integer arg1,
+        Integer arg2,
+        Boolean arg3,
+        int timedInvokeTimeoutMs) {
+      testEmitTestEventRequest(chipClusterPtr, callback, arg1, arg2, arg3, timedInvokeTimeoutMs);
+    }
 
-    private native void writeTemperatureDisplayModeAttribute(
+    private native void test(
         long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+        DefaultClusterCallback Callback,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void subscribeTemperatureDisplayModeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void testNotHandled(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void readKeypadLockoutAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void testSpecific(
+        long chipClusterPtr,
+        TestSpecificResponseCallback Callback,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void writeKeypadLockoutAttribute(
+    private native void testUnknownCommand(
         long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+        DefaultClusterCallback Callback,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void subscribeKeypadLockoutAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void testAddArguments(
+        long chipClusterPtr,
+        TestAddArgumentsResponseCallback Callback,
+        Integer arg1,
+        Integer arg2,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void readScheduleProgrammingVisibilityAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void testStructArgumentRequest(
+        long chipClusterPtr,
+        BooleanResponseCallback Callback,
+        ChipStructs.TestClusterClusterSimpleStruct arg1,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void writeScheduleProgrammingVisibilityAttribute(
+    private native void testNestedStructArgumentRequest(
         long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+        BooleanResponseCallback Callback,
+        ChipStructs.TestClusterClusterNestedStruct arg1,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void subscribeScheduleProgrammingVisibilityAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void testListStructArgumentRequest(
+        long chipClusterPtr,
+        BooleanResponseCallback Callback,
+        ArrayList<ChipStructs.TestClusterClusterSimpleStruct> arg1,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void readGeneratedCommandListAttribute(
-        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    private native void testListInt8UArgumentRequest(
+        long chipClusterPtr,
+        BooleanResponseCallback Callback,
+        ArrayList<Integer> arg1,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void subscribeGeneratedCommandListAttribute(
+    private native void testNestedStructListArgumentRequest(
         long chipClusterPtr,
-        GeneratedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+        BooleanResponseCallback Callback,
+        ChipStructs.TestClusterClusterNestedStructList arg1,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void readAcceptedCommandListAttribute(
-        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    private native void testListNestedStructListArgumentRequest(
+        long chipClusterPtr,
+        BooleanResponseCallback Callback,
+        ArrayList<ChipStructs.TestClusterClusterNestedStructList> arg1,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void subscribeAcceptedCommandListAttribute(
+    private native void testListInt8UReverseRequest(
         long chipClusterPtr,
-        AcceptedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+        TestListInt8UReverseResponseCallback Callback,
+        ArrayList<Integer> arg1,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void readAttributeListAttribute(
-        long chipClusterPtr, AttributeListAttributeCallback callback);
+    private native void testEnumsRequest(
+        long chipClusterPtr,
+        TestEnumsResponseCallback Callback,
+        Integer arg1,
+        Integer arg2,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void subscribeAttributeListAttribute(
+    private native void testNullableOptionalRequest(
         long chipClusterPtr,
-        AttributeListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+        TestNullableOptionalResponseCallback Callback,
+        @Nullable Optional<Integer> arg1,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    private native void simpleStructEchoRequest(
+        long chipClusterPtr,
+        SimpleStructResponseCallback Callback,
+        ChipStructs.TestClusterClusterSimpleStruct arg1,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void subscribeFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    private native void timedInvokeRequest(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void testSimpleOptionalArgumentRequest(
+        long chipClusterPtr,
+        DefaultClusterCallback Callback,
+        Optional<Boolean> arg1,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-    private native void subscribeClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    private native void testEmitTestEventRequest(
+        long chipClusterPtr,
+        TestEmitTestEventResponseCallback Callback,
+        Integer arg1,
+        Integer arg2,
+        Boolean arg3,
+        @Nullable Integer timedInvokeTimeoutMs);
 
-  public static class ThreadNetworkDiagnosticsCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 53L;
+    public interface TestSpecificResponseCallback {
+      void onSuccess(Integer returnValue);
 
-    public ThreadNetworkDiagnosticsCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      void onError(Exception error);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public interface TestAddArgumentsResponseCallback {
+      void onSuccess(Integer returnValue);
 
-    public void resetCounts(DefaultClusterCallback callback) {
-      resetCounts(chipClusterPtr, callback, null);
+      void onError(Exception error);
     }
 
-    public void resetCounts(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+    public interface TestListInt8UReverseResponseCallback {
+      void onSuccess(ArrayList<Integer> arg1);
 
-      resetCounts(chipClusterPtr, callback, timedInvokeTimeoutMs);
+      void onError(Exception error);
     }
 
-    private native void resetCounts(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public interface TestEnumsResponseCallback {
+      void onSuccess(Integer arg1, Integer arg2);
 
-    public interface ChannelAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+      void onError(Exception error);
+    }
 
-      void onError(Exception ex);
+    public interface TestNullableOptionalResponseCallback {
+      void onSuccess(
+          Boolean wasPresent,
+          Optional<Boolean> wasNull,
+          Optional<Integer> value,
+          @Nullable Optional<Integer> originalValue);
 
-      default void onSubscriptionEstablished() {}
+      void onError(Exception error);
     }
 
-    public interface RoutingRoleAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
+    public interface BooleanResponseCallback {
+      void onSuccess(Boolean value);
 
-      default void onSubscriptionEstablished() {}
+      void onError(Exception error);
     }
 
-    public interface NetworkNameAttributeCallback {
-      void onSuccess(@Nullable String value);
-
-      void onError(Exception ex);
+    public interface SimpleStructResponseCallback {
+      void onSuccess(ChipStructs.TestClusterClusterSimpleStruct arg1);
 
-      default void onSubscriptionEstablished() {}
+      void onError(Exception error);
     }
 
-    public interface PanIdAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-
-      void onError(Exception ex);
+    public interface TestEmitTestEventResponseCallback {
+      void onSuccess(Long value);
 
-      default void onSubscriptionEstablished() {}
+      void onError(Exception error);
     }
 
-    public interface ExtendedPanIdAttributeCallback {
-      void onSuccess(@Nullable Long value);
+    public interface ListInt8uAttributeCallback {
+      void onSuccess(List<Integer> valueList);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface MeshLocalPrefixAttributeCallback {
-      void onSuccess(@Nullable byte[] value);
+    public interface ListOctetStringAttributeCallback {
+      void onSuccess(List<byte[]> valueList);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface NeighborTableListAttributeCallback {
-      void onSuccess(List<ChipStructs.ThreadNetworkDiagnosticsClusterNeighborTable> valueList);
+    public interface ListStructOctetStringAttributeCallback {
+      void onSuccess(List<ChipStructs.TestClusterClusterTestListStructOctet> valueList);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface RouteTableListAttributeCallback {
-      void onSuccess(List<ChipStructs.ThreadNetworkDiagnosticsClusterRouteTable> valueList);
+    public interface VendorIdAttributeCallback {
+      void onSuccess(Integer value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface PartitionIdAttributeCallback {
-      void onSuccess(@Nullable Long value);
+    public interface ListNullablesAndOptionalsStructAttributeCallback {
+      void onSuccess(List<ChipStructs.TestClusterClusterNullablesAndOptionalsStruct> valueList);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface WeightingAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public interface ListLongOctetStringAttributeCallback {
+      void onSuccess(List<byte[]> valueList);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface DataVersionAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public interface ListFabricScopedAttributeCallback {
+      void onSuccess(List<ChipStructs.TestClusterClusterTestFabricScoped> valueList);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface StableDataVersionAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public interface NullableBooleanAttributeCallback {
+      void onSuccess(@Nullable Boolean value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface LeaderRouterIdAttributeCallback {
+    public interface NullableBitmap8AttributeCallback {
       void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
@@ -21657,15 +21512,15 @@ public interface LeaderRouterIdAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public interface ActiveTimestampAttributeCallback {
-      void onSuccess(@Nullable Long value);
+    public interface NullableBitmap16AttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface PendingTimestampAttributeCallback {
+    public interface NullableBitmap32AttributeCallback {
       void onSuccess(@Nullable Long value);
 
       void onError(Exception ex);
@@ -21673,7 +21528,7 @@ public interface PendingTimestampAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public interface DelayAttributeCallback {
+    public interface NullableBitmap64AttributeCallback {
       void onSuccess(@Nullable Long value);
 
       void onError(Exception ex);
@@ -21681,2650 +21536,2795 @@ public interface DelayAttributeCallback {
       default void onSubscriptionEstablished() {}
     }
 
-    public interface ChannelMaskAttributeCallback {
-      void onSuccess(@Nullable byte[] value);
-
-      void onError(Exception ex);
-
-      default void onSubscriptionEstablished() {}
-    }
-
-    public interface ActiveNetworkFaultsListAttributeCallback {
-      void onSuccess(List<Integer> valueList);
+    public interface NullableInt8uAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public interface NullableInt16uAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public interface NullableInt24uAttributeCallback {
+      void onSuccess(@Nullable Long value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public interface NullableInt32uAttributeCallback {
+      void onSuccess(@Nullable Long value);
 
       void onError(Exception ex);
 
       default void onSubscriptionEstablished() {}
     }
 
-    public void readChannelAttribute(ChannelAttributeCallback callback) {
-      readChannelAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeChannelAttribute(
-        ChannelAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeChannelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readRoutingRoleAttribute(RoutingRoleAttributeCallback callback) {
-      readRoutingRoleAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeRoutingRoleAttribute(
-        RoutingRoleAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRoutingRoleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readNetworkNameAttribute(NetworkNameAttributeCallback callback) {
-      readNetworkNameAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeNetworkNameAttribute(
-        NetworkNameAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNetworkNameAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readPanIdAttribute(PanIdAttributeCallback callback) {
-      readPanIdAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribePanIdAttribute(
-        PanIdAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePanIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readExtendedPanIdAttribute(ExtendedPanIdAttributeCallback callback) {
-      readExtendedPanIdAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeExtendedPanIdAttribute(
-        ExtendedPanIdAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeExtendedPanIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readMeshLocalPrefixAttribute(MeshLocalPrefixAttributeCallback callback) {
-      readMeshLocalPrefixAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeMeshLocalPrefixAttribute(
-        MeshLocalPrefixAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMeshLocalPrefixAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readOverrunCountAttribute(LongAttributeCallback callback) {
-      readOverrunCountAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeOverrunCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeOverrunCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readNeighborTableListAttribute(NeighborTableListAttributeCallback callback) {
-      readNeighborTableListAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeNeighborTableListAttribute(
-        NeighborTableListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNeighborTableListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readRouteTableListAttribute(RouteTableListAttributeCallback callback) {
-      readRouteTableListAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeRouteTableListAttribute(
-        RouteTableListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRouteTableListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readPartitionIdAttribute(PartitionIdAttributeCallback callback) {
-      readPartitionIdAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribePartitionIdAttribute(
-        PartitionIdAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePartitionIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readWeightingAttribute(WeightingAttributeCallback callback) {
-      readWeightingAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeWeightingAttribute(
-        WeightingAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeWeightingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readDataVersionAttribute(DataVersionAttributeCallback callback) {
-      readDataVersionAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeDataVersionAttribute(
-        DataVersionAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeDataVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readStableDataVersionAttribute(StableDataVersionAttributeCallback callback) {
-      readStableDataVersionAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeStableDataVersionAttribute(
-        StableDataVersionAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeStableDataVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readLeaderRouterIdAttribute(LeaderRouterIdAttributeCallback callback) {
-      readLeaderRouterIdAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeLeaderRouterIdAttribute(
-        LeaderRouterIdAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeLeaderRouterIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readDetachedRoleCountAttribute(IntegerAttributeCallback callback) {
-      readDetachedRoleCountAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeDetachedRoleCountAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeDetachedRoleCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readChildRoleCountAttribute(IntegerAttributeCallback callback) {
-      readChildRoleCountAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeChildRoleCountAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeChildRoleCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readRouterRoleCountAttribute(IntegerAttributeCallback callback) {
-      readRouterRoleCountAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeRouterRoleCountAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRouterRoleCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readLeaderRoleCountAttribute(IntegerAttributeCallback callback) {
-      readLeaderRoleCountAttribute(chipClusterPtr, callback);
-    }
-
-    public void subscribeLeaderRoleCountAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeLeaderRoleCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface NullableInt40uAttributeCallback {
+      void onSuccess(@Nullable Long value);
 
-    public void readAttachAttemptCountAttribute(IntegerAttributeCallback callback) {
-      readAttachAttemptCountAttribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void subscribeAttachAttemptCountAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttachAttemptCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readPartitionIdChangeCountAttribute(IntegerAttributeCallback callback) {
-      readPartitionIdChangeCountAttribute(chipClusterPtr, callback);
-    }
+    public interface NullableInt48uAttributeCallback {
+      void onSuccess(@Nullable Long value);
 
-    public void subscribePartitionIdChangeCountAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePartitionIdChangeCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readBetterPartitionAttachAttemptCountAttribute(IntegerAttributeCallback callback) {
-      readBetterPartitionAttachAttemptCountAttribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeBetterPartitionAttachAttemptCountAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBetterPartitionAttachAttemptCountAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface NullableInt56uAttributeCallback {
+      void onSuccess(@Nullable Long value);
 
-    public void readParentChangeCountAttribute(IntegerAttributeCallback callback) {
-      readParentChangeCountAttribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void subscribeParentChangeCountAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeParentChangeCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readTxTotalCountAttribute(LongAttributeCallback callback) {
-      readTxTotalCountAttribute(chipClusterPtr, callback);
-    }
+    public interface NullableInt64uAttributeCallback {
+      void onSuccess(@Nullable Long value);
 
-    public void subscribeTxTotalCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTxTotalCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readTxUnicastCountAttribute(LongAttributeCallback callback) {
-      readTxUnicastCountAttribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeTxUnicastCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTxUnicastCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface NullableInt8sAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    public void readTxBroadcastCountAttribute(LongAttributeCallback callback) {
-      readTxBroadcastCountAttribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void subscribeTxBroadcastCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTxBroadcastCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readTxAckRequestedCountAttribute(LongAttributeCallback callback) {
-      readTxAckRequestedCountAttribute(chipClusterPtr, callback);
-    }
+    public interface NullableInt16sAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    public void subscribeTxAckRequestedCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTxAckRequestedCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readTxAckedCountAttribute(LongAttributeCallback callback) {
-      readTxAckedCountAttribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeTxAckedCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTxAckedCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface NullableInt24sAttributeCallback {
+      void onSuccess(@Nullable Long value);
 
-    public void readTxNoAckRequestedCountAttribute(LongAttributeCallback callback) {
-      readTxNoAckRequestedCountAttribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void subscribeTxNoAckRequestedCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTxNoAckRequestedCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readTxDataCountAttribute(LongAttributeCallback callback) {
-      readTxDataCountAttribute(chipClusterPtr, callback);
-    }
+    public interface NullableInt32sAttributeCallback {
+      void onSuccess(@Nullable Long value);
 
-    public void subscribeTxDataCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTxDataCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readTxDataPollCountAttribute(LongAttributeCallback callback) {
-      readTxDataPollCountAttribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeTxDataPollCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTxDataPollCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface NullableInt40sAttributeCallback {
+      void onSuccess(@Nullable Long value);
 
-    public void readTxBeaconCountAttribute(LongAttributeCallback callback) {
-      readTxBeaconCountAttribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void subscribeTxBeaconCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTxBeaconCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readTxBeaconRequestCountAttribute(LongAttributeCallback callback) {
-      readTxBeaconRequestCountAttribute(chipClusterPtr, callback);
-    }
+    public interface NullableInt48sAttributeCallback {
+      void onSuccess(@Nullable Long value);
 
-    public void subscribeTxBeaconRequestCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTxBeaconRequestCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readTxOtherCountAttribute(LongAttributeCallback callback) {
-      readTxOtherCountAttribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeTxOtherCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTxOtherCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface NullableInt56sAttributeCallback {
+      void onSuccess(@Nullable Long value);
 
-    public void readTxRetryCountAttribute(LongAttributeCallback callback) {
-      readTxRetryCountAttribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void subscribeTxRetryCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTxRetryCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readTxDirectMaxRetryExpiryCountAttribute(LongAttributeCallback callback) {
-      readTxDirectMaxRetryExpiryCountAttribute(chipClusterPtr, callback);
-    }
+    public interface NullableInt64sAttributeCallback {
+      void onSuccess(@Nullable Long value);
 
-    public void subscribeTxDirectMaxRetryExpiryCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTxDirectMaxRetryExpiryCountAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readTxIndirectMaxRetryExpiryCountAttribute(LongAttributeCallback callback) {
-      readTxIndirectMaxRetryExpiryCountAttribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeTxIndirectMaxRetryExpiryCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTxIndirectMaxRetryExpiryCountAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface NullableEnum8AttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    public void readTxErrCcaCountAttribute(LongAttributeCallback callback) {
-      readTxErrCcaCountAttribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void subscribeTxErrCcaCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTxErrCcaCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readTxErrAbortCountAttribute(LongAttributeCallback callback) {
-      readTxErrAbortCountAttribute(chipClusterPtr, callback);
-    }
+    public interface NullableEnum16AttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    public void subscribeTxErrAbortCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTxErrAbortCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readTxErrBusyChannelCountAttribute(LongAttributeCallback callback) {
-      readTxErrBusyChannelCountAttribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeTxErrBusyChannelCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTxErrBusyChannelCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface NullableFloatSingleAttributeCallback {
+      void onSuccess(@Nullable Float value);
 
-    public void readRxTotalCountAttribute(LongAttributeCallback callback) {
-      readRxTotalCountAttribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void subscribeRxTotalCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRxTotalCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readRxUnicastCountAttribute(LongAttributeCallback callback) {
-      readRxUnicastCountAttribute(chipClusterPtr, callback);
-    }
+    public interface NullableFloatDoubleAttributeCallback {
+      void onSuccess(@Nullable Double value);
 
-    public void subscribeRxUnicastCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRxUnicastCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readRxBroadcastCountAttribute(LongAttributeCallback callback) {
-      readRxBroadcastCountAttribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeRxBroadcastCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRxBroadcastCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface NullableOctetStringAttributeCallback {
+      void onSuccess(@Nullable byte[] value);
 
-    public void readRxDataCountAttribute(LongAttributeCallback callback) {
-      readRxDataCountAttribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void subscribeRxDataCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRxDataCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readRxDataPollCountAttribute(LongAttributeCallback callback) {
-      readRxDataPollCountAttribute(chipClusterPtr, callback);
-    }
+    public interface NullableCharStringAttributeCallback {
+      void onSuccess(@Nullable String value);
 
-    public void subscribeRxDataPollCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRxDataPollCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readRxBeaconCountAttribute(LongAttributeCallback callback) {
-      readRxBeaconCountAttribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeRxBeaconCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRxBeaconCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface NullableEnumAttrAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    public void readRxBeaconRequestCountAttribute(LongAttributeCallback callback) {
-      readRxBeaconRequestCountAttribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void subscribeRxBeaconRequestCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRxBeaconRequestCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readRxOtherCountAttribute(LongAttributeCallback callback) {
-      readRxOtherCountAttribute(chipClusterPtr, callback);
-    }
+    public interface NullableRangeRestrictedInt8uAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    public void subscribeRxOtherCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRxOtherCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readRxAddressFilteredCountAttribute(LongAttributeCallback callback) {
-      readRxAddressFilteredCountAttribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeRxAddressFilteredCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRxAddressFilteredCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface NullableRangeRestrictedInt8sAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    public void readRxDestAddrFilteredCountAttribute(LongAttributeCallback callback) {
-      readRxDestAddrFilteredCountAttribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void subscribeRxDestAddrFilteredCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRxDestAddrFilteredCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readRxDuplicatedCountAttribute(LongAttributeCallback callback) {
-      readRxDuplicatedCountAttribute(chipClusterPtr, callback);
-    }
+    public interface NullableRangeRestrictedInt16uAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    public void subscribeRxDuplicatedCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRxDuplicatedCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readRxErrNoFrameCountAttribute(LongAttributeCallback callback) {
-      readRxErrNoFrameCountAttribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeRxErrNoFrameCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRxErrNoFrameCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface NullableRangeRestrictedInt16sAttributeCallback {
+      void onSuccess(@Nullable Integer value);
 
-    public void readRxErrUnknownNeighborCountAttribute(LongAttributeCallback callback) {
-      readRxErrUnknownNeighborCountAttribute(chipClusterPtr, callback);
-    }
+      void onError(Exception ex);
 
-    public void subscribeRxErrUnknownNeighborCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRxErrUnknownNeighborCountAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readRxErrInvalidSrcAddrCountAttribute(LongAttributeCallback callback) {
-      readRxErrInvalidSrcAddrCountAttribute(chipClusterPtr, callback);
-    }
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void subscribeRxErrInvalidSrcAddrCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRxErrInvalidSrcAddrCountAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      void onError(Exception ex);
 
-    public void readRxErrSecCountAttribute(LongAttributeCallback callback) {
-      readRxErrSecCountAttribute(chipClusterPtr, callback);
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeRxErrSecCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRxErrSecCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> valueList);
 
-    public void readRxErrFcsCountAttribute(LongAttributeCallback callback) {
-      readRxErrFcsCountAttribute(chipClusterPtr, callback);
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void subscribeRxErrFcsCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRxErrFcsCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> valueList);
+
+      void onError(Exception ex);
+
+      default void onSubscriptionEstablished() {}
     }
 
-    public void readRxErrOtherCountAttribute(LongAttributeCallback callback) {
-      readRxErrOtherCountAttribute(chipClusterPtr, callback);
+    public void readBooleanAttribute(BooleanAttributeCallback callback) {
+      readBooleanAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeRxErrOtherCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRxErrOtherCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeBooleanAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeBooleanAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readActiveTimestampAttribute(ActiveTimestampAttributeCallback callback) {
-      readActiveTimestampAttribute(chipClusterPtr, callback);
+    public void writeBooleanAttribute(
+        DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeBooleanAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeActiveTimestampAttribute(
-        ActiveTimestampAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeActiveTimestampAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeBooleanAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBooleanAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readPendingTimestampAttribute(PendingTimestampAttributeCallback callback) {
-      readPendingTimestampAttribute(chipClusterPtr, callback);
+    public void readBitmap8Attribute(IntegerAttributeCallback callback) {
+      readBitmap8Attribute(chipClusterPtr, callback);
     }
 
-    public void subscribePendingTimestampAttribute(
-        PendingTimestampAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePendingTimestampAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeBitmap8Attribute(DefaultClusterCallback callback, Integer value) {
+      writeBitmap8Attribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readDelayAttribute(DelayAttributeCallback callback) {
-      readDelayAttribute(chipClusterPtr, callback);
+    public void writeBitmap8Attribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeBitmap8Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeDelayAttribute(
-        DelayAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeDelayAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeBitmap8Attribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBitmap8Attribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readChannelMaskAttribute(ChannelMaskAttributeCallback callback) {
-      readChannelMaskAttribute(chipClusterPtr, callback);
+    public void readBitmap16Attribute(IntegerAttributeCallback callback) {
+      readBitmap16Attribute(chipClusterPtr, callback);
     }
 
-    public void subscribeChannelMaskAttribute(
-        ChannelMaskAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeChannelMaskAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeBitmap16Attribute(DefaultClusterCallback callback, Integer value) {
+      writeBitmap16Attribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readActiveNetworkFaultsListAttribute(
-        ActiveNetworkFaultsListAttributeCallback callback) {
-      readActiveNetworkFaultsListAttribute(chipClusterPtr, callback);
+    public void writeBitmap16Attribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeBitmap16Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeActiveNetworkFaultsListAttribute(
-        ActiveNetworkFaultsListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeActiveNetworkFaultsListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeBitmap16Attribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBitmap16Attribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    public void readBitmap32Attribute(LongAttributeCallback callback) {
+      readBitmap32Attribute(chipClusterPtr, callback);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeBitmap32Attribute(DefaultClusterCallback callback, Long value) {
+      writeBitmap32Attribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    public void writeBitmap32Attribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeBitmap32Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeBitmap32Attribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeBitmap32Attribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
+    public void readBitmap64Attribute(LongAttributeCallback callback) {
+      readBitmap64Attribute(chipClusterPtr, callback);
     }
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeBitmap64Attribute(DefaultClusterCallback callback, Long value) {
+      writeBitmap64Attribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
+    public void writeBitmap64Attribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeBitmap64Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeFeatureMapAttribute(
+    public void subscribeBitmap64Attribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeBitmap64Attribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
+    public void readInt8uAttribute(IntegerAttributeCallback callback) {
+      readInt8uAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeInt8uAttribute(DefaultClusterCallback callback, Integer value) {
+      writeInt8uAttribute(chipClusterPtr, callback, value, null);
     }
 
-    private native void readChannelAttribute(
-        long chipClusterPtr, ChannelAttributeCallback callback);
-
-    private native void subscribeChannelAttribute(
-        long chipClusterPtr, ChannelAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readRoutingRoleAttribute(
-        long chipClusterPtr, RoutingRoleAttributeCallback callback);
-
-    private native void subscribeRoutingRoleAttribute(
-        long chipClusterPtr,
-        RoutingRoleAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readNetworkNameAttribute(
-        long chipClusterPtr, NetworkNameAttributeCallback callback);
-
-    private native void subscribeNetworkNameAttribute(
-        long chipClusterPtr,
-        NetworkNameAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readPanIdAttribute(long chipClusterPtr, PanIdAttributeCallback callback);
-
-    private native void subscribePanIdAttribute(
-        long chipClusterPtr, PanIdAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readExtendedPanIdAttribute(
-        long chipClusterPtr, ExtendedPanIdAttributeCallback callback);
-
-    private native void subscribeExtendedPanIdAttribute(
-        long chipClusterPtr,
-        ExtendedPanIdAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readMeshLocalPrefixAttribute(
-        long chipClusterPtr, MeshLocalPrefixAttributeCallback callback);
-
-    private native void subscribeMeshLocalPrefixAttribute(
-        long chipClusterPtr,
-        MeshLocalPrefixAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readOverrunCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeOverrunCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readNeighborTableListAttribute(
-        long chipClusterPtr, NeighborTableListAttributeCallback callback);
+    public void writeInt8uAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeInt8uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeNeighborTableListAttribute(
-        long chipClusterPtr,
-        NeighborTableListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void subscribeInt8uAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeInt8uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readRouteTableListAttribute(
-        long chipClusterPtr, RouteTableListAttributeCallback callback);
+    public void readInt16uAttribute(IntegerAttributeCallback callback) {
+      readInt16uAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeRouteTableListAttribute(
-        long chipClusterPtr,
-        RouteTableListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void writeInt16uAttribute(DefaultClusterCallback callback, Integer value) {
+      writeInt16uAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readPartitionIdAttribute(
-        long chipClusterPtr, PartitionIdAttributeCallback callback);
+    public void writeInt16uAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeInt16uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribePartitionIdAttribute(
-        long chipClusterPtr,
-        PartitionIdAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void subscribeInt16uAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeInt16uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readWeightingAttribute(
-        long chipClusterPtr, WeightingAttributeCallback callback);
+    public void readInt24uAttribute(LongAttributeCallback callback) {
+      readInt24uAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeWeightingAttribute(
-        long chipClusterPtr, WeightingAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeInt24uAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt24uAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readDataVersionAttribute(
-        long chipClusterPtr, DataVersionAttributeCallback callback);
+    public void writeInt24uAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeInt24uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeDataVersionAttribute(
-        long chipClusterPtr,
-        DataVersionAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void subscribeInt24uAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeInt24uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readStableDataVersionAttribute(
-        long chipClusterPtr, StableDataVersionAttributeCallback callback);
+    public void readInt32uAttribute(LongAttributeCallback callback) {
+      readInt32uAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeStableDataVersionAttribute(
-        long chipClusterPtr,
-        StableDataVersionAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void writeInt32uAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt32uAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readLeaderRouterIdAttribute(
-        long chipClusterPtr, LeaderRouterIdAttributeCallback callback);
+    public void writeInt32uAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeInt32uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeLeaderRouterIdAttribute(
-        long chipClusterPtr,
-        LeaderRouterIdAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void subscribeInt32uAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeInt32uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readDetachedRoleCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readInt40uAttribute(LongAttributeCallback callback) {
+      readInt40uAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeDetachedRoleCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeInt40uAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt40uAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readChildRoleCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeInt40uAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeInt40uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeChildRoleCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeInt40uAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeInt40uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readRouterRoleCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readInt48uAttribute(LongAttributeCallback callback) {
+      readInt48uAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeRouterRoleCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeInt48uAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt48uAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readLeaderRoleCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeInt48uAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeInt48uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeLeaderRoleCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeInt48uAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeInt48uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readAttachAttemptCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readInt56uAttribute(LongAttributeCallback callback) {
+      readInt56uAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeAttachAttemptCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeInt56uAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt56uAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readPartitionIdChangeCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeInt56uAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeInt56uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribePartitionIdChangeCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeInt56uAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeInt56uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readBetterPartitionAttachAttemptCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readInt64uAttribute(LongAttributeCallback callback) {
+      readInt64uAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeBetterPartitionAttachAttemptCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeInt64uAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt64uAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readParentChangeCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeInt64uAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeInt64uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeParentChangeCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeInt64uAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeInt64uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readTxTotalCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void readInt8sAttribute(IntegerAttributeCallback callback) {
+      readInt8sAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeTxTotalCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeInt8sAttribute(DefaultClusterCallback callback, Integer value) {
+      writeInt8sAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readTxUnicastCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void writeInt8sAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeInt8sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeTxUnicastCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeInt8sAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeInt8sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readTxBroadcastCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void readInt16sAttribute(IntegerAttributeCallback callback) {
+      readInt16sAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeTxBroadcastCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeInt16sAttribute(DefaultClusterCallback callback, Integer value) {
+      writeInt16sAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readTxAckRequestedCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void writeInt16sAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeInt16sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeTxAckRequestedCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeInt16sAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeInt16sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readTxAckedCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void readInt24sAttribute(LongAttributeCallback callback) {
+      readInt24sAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeTxAckedCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeInt24sAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt24sAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readTxNoAckRequestedCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void writeInt24sAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeInt24sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeTxNoAckRequestedCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeInt24sAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeInt24sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readTxDataCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void readInt32sAttribute(LongAttributeCallback callback) {
+      readInt32sAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeTxDataCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeInt32sAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt32sAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readTxDataPollCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void writeInt32sAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeInt32sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeTxDataPollCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeInt32sAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeInt32sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readTxBeaconCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void readInt40sAttribute(LongAttributeCallback callback) {
+      readInt40sAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeTxBeaconCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeInt40sAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt40sAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readTxBeaconRequestCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void writeInt40sAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeInt40sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeTxBeaconRequestCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeInt40sAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeInt40sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readTxOtherCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void readInt48sAttribute(LongAttributeCallback callback) {
+      readInt48sAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeTxOtherCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeInt48sAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt48sAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readTxRetryCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void writeInt48sAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeInt48sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeTxRetryCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeInt48sAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeInt48sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readTxDirectMaxRetryExpiryCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void readInt56sAttribute(LongAttributeCallback callback) {
+      readInt56sAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeTxDirectMaxRetryExpiryCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeInt56sAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt56sAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readTxIndirectMaxRetryExpiryCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void writeInt56sAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeInt56sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeTxIndirectMaxRetryExpiryCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeInt56sAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeInt56sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readTxErrCcaCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void readInt64sAttribute(LongAttributeCallback callback) {
+      readInt64sAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeTxErrCcaCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeInt64sAttribute(DefaultClusterCallback callback, Long value) {
+      writeInt64sAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readTxErrAbortCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void writeInt64sAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeInt64sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeTxErrAbortCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeInt64sAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeInt64sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readTxErrBusyChannelCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void readEnum8Attribute(IntegerAttributeCallback callback) {
+      readEnum8Attribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeTxErrBusyChannelCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeEnum8Attribute(DefaultClusterCallback callback, Integer value) {
+      writeEnum8Attribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readRxTotalCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void writeEnum8Attribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeEnum8Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeRxTotalCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeEnum8Attribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeEnum8Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readRxUnicastCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void readEnum16Attribute(IntegerAttributeCallback callback) {
+      readEnum16Attribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeRxUnicastCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeEnum16Attribute(DefaultClusterCallback callback, Integer value) {
+      writeEnum16Attribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readRxBroadcastCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void writeEnum16Attribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeEnum16Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeRxBroadcastCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeEnum16Attribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeEnum16Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readRxDataCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void readFloatSingleAttribute(FloatAttributeCallback callback) {
+      readFloatSingleAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeRxDataCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeFloatSingleAttribute(DefaultClusterCallback callback, Float value) {
+      writeFloatSingleAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readRxDataPollCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void writeFloatSingleAttribute(
+        DefaultClusterCallback callback, Float value, int timedWriteTimeoutMs) {
+      writeFloatSingleAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeRxDataPollCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeFloatSingleAttribute(
+        FloatAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFloatSingleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readRxBeaconCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void readFloatDoubleAttribute(DoubleAttributeCallback callback) {
+      readFloatDoubleAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeRxBeaconCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeFloatDoubleAttribute(DefaultClusterCallback callback, Double value) {
+      writeFloatDoubleAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readRxBeaconRequestCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void writeFloatDoubleAttribute(
+        DefaultClusterCallback callback, Double value, int timedWriteTimeoutMs) {
+      writeFloatDoubleAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeRxBeaconRequestCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeFloatDoubleAttribute(
+        DoubleAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeFloatDoubleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readRxOtherCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void readOctetStringAttribute(OctetStringAttributeCallback callback) {
+      readOctetStringAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeRxOtherCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeOctetStringAttribute(DefaultClusterCallback callback, byte[] value) {
+      writeOctetStringAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readRxAddressFilteredCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void writeOctetStringAttribute(
+        DefaultClusterCallback callback, byte[] value, int timedWriteTimeoutMs) {
+      writeOctetStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeRxAddressFilteredCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeOctetStringAttribute(
+        OctetStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeOctetStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readRxDestAddrFilteredCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void readListInt8uAttribute(ListInt8uAttributeCallback callback) {
+      readListInt8uAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeRxDestAddrFilteredCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeListInt8uAttribute(DefaultClusterCallback callback, ArrayList<Integer> value) {
+      writeListInt8uAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readRxDuplicatedCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void writeListInt8uAttribute(
+        DefaultClusterCallback callback, ArrayList<Integer> value, int timedWriteTimeoutMs) {
+      writeListInt8uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeRxDuplicatedCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeListInt8uAttribute(
+        ListInt8uAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeListInt8uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readRxErrNoFrameCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void readListOctetStringAttribute(ListOctetStringAttributeCallback callback) {
+      readListOctetStringAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeRxErrNoFrameCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeListOctetStringAttribute(
+        DefaultClusterCallback callback, ArrayList<byte[]> value) {
+      writeListOctetStringAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readRxErrUnknownNeighborCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void writeListOctetStringAttribute(
+        DefaultClusterCallback callback, ArrayList<byte[]> value, int timedWriteTimeoutMs) {
+      writeListOctetStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeRxErrUnknownNeighborCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeListOctetStringAttribute(
+        ListOctetStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeListOctetStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readRxErrInvalidSrcAddrCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void readListStructOctetStringAttribute(
+        ListStructOctetStringAttributeCallback callback) {
+      readListStructOctetStringAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeRxErrInvalidSrcAddrCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeListStructOctetStringAttribute(
+        DefaultClusterCallback callback,
+        ArrayList<ChipStructs.TestClusterClusterTestListStructOctet> value) {
+      writeListStructOctetStringAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readRxErrSecCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void writeListStructOctetStringAttribute(
+        DefaultClusterCallback callback,
+        ArrayList<ChipStructs.TestClusterClusterTestListStructOctet> value,
+        int timedWriteTimeoutMs) {
+      writeListStructOctetStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeRxErrSecCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeListStructOctetStringAttribute(
+        ListStructOctetStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeListStructOctetStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readRxErrFcsCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void readLongOctetStringAttribute(OctetStringAttributeCallback callback) {
+      readLongOctetStringAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeRxErrFcsCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeLongOctetStringAttribute(DefaultClusterCallback callback, byte[] value) {
+      writeLongOctetStringAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readRxErrOtherCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void writeLongOctetStringAttribute(
+        DefaultClusterCallback callback, byte[] value, int timedWriteTimeoutMs) {
+      writeLongOctetStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeRxErrOtherCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeLongOctetStringAttribute(
+        OctetStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeLongOctetStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readActiveTimestampAttribute(
-        long chipClusterPtr, ActiveTimestampAttributeCallback callback);
+    public void readCharStringAttribute(CharStringAttributeCallback callback) {
+      readCharStringAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeActiveTimestampAttribute(
-        long chipClusterPtr,
-        ActiveTimestampAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void writeCharStringAttribute(DefaultClusterCallback callback, String value) {
+      writeCharStringAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readPendingTimestampAttribute(
-        long chipClusterPtr, PendingTimestampAttributeCallback callback);
+    public void writeCharStringAttribute(
+        DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      writeCharStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribePendingTimestampAttribute(
-        long chipClusterPtr,
-        PendingTimestampAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void subscribeCharStringAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeCharStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readDelayAttribute(long chipClusterPtr, DelayAttributeCallback callback);
+    public void readLongCharStringAttribute(CharStringAttributeCallback callback) {
+      readLongCharStringAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeDelayAttribute(
-        long chipClusterPtr, DelayAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeLongCharStringAttribute(DefaultClusterCallback callback, String value) {
+      writeLongCharStringAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readChannelMaskAttribute(
-        long chipClusterPtr, ChannelMaskAttributeCallback callback);
+    public void writeLongCharStringAttribute(
+        DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      writeLongCharStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeChannelMaskAttribute(
-        long chipClusterPtr,
-        ChannelMaskAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void subscribeLongCharStringAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeLongCharStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readActiveNetworkFaultsListAttribute(
-        long chipClusterPtr, ActiveNetworkFaultsListAttributeCallback callback);
+    public void readEpochUsAttribute(LongAttributeCallback callback) {
+      readEpochUsAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeActiveNetworkFaultsListAttribute(
-        long chipClusterPtr,
-        ActiveNetworkFaultsListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void writeEpochUsAttribute(DefaultClusterCallback callback, Long value) {
+      writeEpochUsAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readGeneratedCommandListAttribute(
-        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void writeEpochUsAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeEpochUsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeGeneratedCommandListAttribute(
-        long chipClusterPtr,
-        GeneratedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void subscribeEpochUsAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeEpochUsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readAcceptedCommandListAttribute(
-        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void readEpochSAttribute(LongAttributeCallback callback) {
+      readEpochSAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeAcceptedCommandListAttribute(
-        long chipClusterPtr,
-        AcceptedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void writeEpochSAttribute(DefaultClusterCallback callback, Long value) {
+      writeEpochSAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readAttributeListAttribute(
-        long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void writeEpochSAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeEpochSAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeAttributeListAttribute(
-        long chipClusterPtr,
-        AttributeListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void subscribeEpochSAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeEpochSAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void readVendorIdAttribute(VendorIdAttributeCallback callback) {
+      readVendorIdAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeVendorIdAttribute(DefaultClusterCallback callback, Integer value) {
+      writeVendorIdAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeVendorIdAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeVendorIdAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public void subscribeVendorIdAttribute(
+        VendorIdAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeVendorIdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-  public static class TimeFormatLocalizationCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 44L;
+    public void readListNullablesAndOptionalsStructAttribute(
+        ListNullablesAndOptionalsStructAttributeCallback callback) {
+      readListNullablesAndOptionalsStructAttribute(chipClusterPtr, callback);
+    }
 
-    public TimeFormatLocalizationCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    public void writeListNullablesAndOptionalsStructAttribute(
+        DefaultClusterCallback callback,
+        ArrayList<ChipStructs.TestClusterClusterNullablesAndOptionalsStruct> value) {
+      writeListNullablesAndOptionalsStructAttribute(chipClusterPtr, callback, value, null);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void writeListNullablesAndOptionalsStructAttribute(
+        DefaultClusterCallback callback,
+        ArrayList<ChipStructs.TestClusterClusterNullablesAndOptionalsStruct> value,
+        int timedWriteTimeoutMs) {
+      writeListNullablesAndOptionalsStructAttribute(
+          chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    public interface SupportedCalendarTypesAttributeCallback {
-      void onSuccess(List<Integer> valueList);
+    public void subscribeListNullablesAndOptionalsStructAttribute(
+        ListNullablesAndOptionalsStructAttributeCallback callback,
+        int minInterval,
+        int maxInterval) {
+      subscribeListNullablesAndOptionalsStructAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readEnumAttrAttribute(IntegerAttributeCallback callback) {
+      readEnumAttrAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void writeEnumAttrAttribute(DefaultClusterCallback callback, Integer value) {
+      writeEnumAttrAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void writeEnumAttrAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeEnumAttrAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-      void onError(Exception ex);
+    public void subscribeEnumAttrAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeEnumAttrAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readRangeRestrictedInt8uAttribute(IntegerAttributeCallback callback) {
+      readRangeRestrictedInt8uAttribute(chipClusterPtr, callback);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void writeRangeRestrictedInt8uAttribute(DefaultClusterCallback callback, Integer value) {
+      writeRangeRestrictedInt8uAttribute(chipClusterPtr, callback, value, null);
+    }
 
-      void onError(Exception ex);
+    public void writeRangeRestrictedInt8uAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeRangeRestrictedInt8uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeRangeRestrictedInt8uAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRangeRestrictedInt8uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readHourFormatAttribute(IntegerAttributeCallback callback) {
-      readHourFormatAttribute(chipClusterPtr, callback);
+    public void readRangeRestrictedInt8sAttribute(IntegerAttributeCallback callback) {
+      readRangeRestrictedInt8sAttribute(chipClusterPtr, callback);
     }
 
-    public void writeHourFormatAttribute(DefaultClusterCallback callback, Integer value) {
-      writeHourFormatAttribute(chipClusterPtr, callback, value, null);
+    public void writeRangeRestrictedInt8sAttribute(DefaultClusterCallback callback, Integer value) {
+      writeRangeRestrictedInt8sAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void writeHourFormatAttribute(
+    public void writeRangeRestrictedInt8sAttribute(
         DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeHourFormatAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      writeRangeRestrictedInt8sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeHourFormatAttribute(
+    public void subscribeRangeRestrictedInt8sAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeHourFormatAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeRangeRestrictedInt8sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readActiveCalendarTypeAttribute(IntegerAttributeCallback callback) {
-      readActiveCalendarTypeAttribute(chipClusterPtr, callback);
+    public void readRangeRestrictedInt16uAttribute(IntegerAttributeCallback callback) {
+      readRangeRestrictedInt16uAttribute(chipClusterPtr, callback);
     }
 
-    public void writeActiveCalendarTypeAttribute(DefaultClusterCallback callback, Integer value) {
-      writeActiveCalendarTypeAttribute(chipClusterPtr, callback, value, null);
+    public void writeRangeRestrictedInt16uAttribute(
+        DefaultClusterCallback callback, Integer value) {
+      writeRangeRestrictedInt16uAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void writeActiveCalendarTypeAttribute(
+    public void writeRangeRestrictedInt16uAttribute(
         DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeActiveCalendarTypeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      writeRangeRestrictedInt16uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeActiveCalendarTypeAttribute(
+    public void subscribeRangeRestrictedInt16uAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeActiveCalendarTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readSupportedCalendarTypesAttribute(
-        SupportedCalendarTypesAttributeCallback callback) {
-      readSupportedCalendarTypesAttribute(chipClusterPtr, callback);
+      subscribeRangeRestrictedInt16uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void subscribeSupportedCalendarTypesAttribute(
-        SupportedCalendarTypesAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSupportedCalendarTypesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readRangeRestrictedInt16sAttribute(IntegerAttributeCallback callback) {
+      readRangeRestrictedInt16sAttribute(chipClusterPtr, callback);
     }
 
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    public void writeRangeRestrictedInt16sAttribute(
+        DefaultClusterCallback callback, Integer value) {
+      writeRangeRestrictedInt16sAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeRangeRestrictedInt16sAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeRangeRestrictedInt16sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    public void subscribeRangeRestrictedInt16sAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeRangeRestrictedInt16sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readListLongOctetStringAttribute(ListLongOctetStringAttributeCallback callback) {
+      readListLongOctetStringAttribute(chipClusterPtr, callback);
     }
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
+    public void writeListLongOctetStringAttribute(
+        DefaultClusterCallback callback, ArrayList<byte[]> value) {
+      writeListLongOctetStringAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeListLongOctetStringAttribute(
+        DefaultClusterCallback callback, ArrayList<byte[]> value, int timedWriteTimeoutMs) {
+      writeListLongOctetStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
+    public void subscribeListLongOctetStringAttribute(
+        ListLongOctetStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeListLongOctetStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readListFabricScopedAttribute(ListFabricScopedAttributeCallback callback) {
+      readListFabricScopedAttribute(chipClusterPtr, callback);
     }
 
-    private native void readHourFormatAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeHourFormatAttribute(
-        long chipClusterPtr,
+    public void writeListFabricScopedAttribute(
         DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeHourFormatAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readActiveCalendarTypeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+        ArrayList<ChipStructs.TestClusterClusterTestFabricScoped> value) {
+      writeListFabricScopedAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void writeActiveCalendarTypeAttribute(
-        long chipClusterPtr,
+    public void writeListFabricScopedAttribute(
         DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
-
-    private native void subscribeActiveCalendarTypeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readSupportedCalendarTypesAttribute(
-        long chipClusterPtr, SupportedCalendarTypesAttributeCallback callback);
-
-    private native void subscribeSupportedCalendarTypesAttribute(
-        long chipClusterPtr,
-        SupportedCalendarTypesAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readGeneratedCommandListAttribute(
-        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
-
-    private native void subscribeGeneratedCommandListAttribute(
-        long chipClusterPtr,
-        GeneratedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readAcceptedCommandListAttribute(
-        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
-
-    private native void subscribeAcceptedCommandListAttribute(
-        long chipClusterPtr,
-        AcceptedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
-
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+        ArrayList<ChipStructs.TestClusterClusterTestFabricScoped> value,
+        int timedWriteTimeoutMs) {
+      writeListFabricScopedAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-  public static class UnitLocalizationCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 45L;
+    public void subscribeListFabricScopedAttribute(
+        ListFabricScopedAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeListFabricScopedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    public UnitLocalizationCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    public void readTimedWriteBooleanAttribute(BooleanAttributeCallback callback) {
+      readTimedWriteBooleanAttribute(chipClusterPtr, callback);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void writeTimedWriteBooleanAttribute(
+        DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeTimedWriteBooleanAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void subscribeTimedWriteBooleanAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeTimedWriteBooleanAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readGeneralErrorBooleanAttribute(BooleanAttributeCallback callback) {
+      readGeneralErrorBooleanAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void writeGeneralErrorBooleanAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeGeneralErrorBooleanAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readTemperatureUnitAttribute(IntegerAttributeCallback callback) {
-      readTemperatureUnitAttribute(chipClusterPtr, callback);
+    public void writeGeneralErrorBooleanAttribute(
+        DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeGeneralErrorBooleanAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void writeTemperatureUnitAttribute(DefaultClusterCallback callback, Integer value) {
-      writeTemperatureUnitAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeGeneralErrorBooleanAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneralErrorBooleanAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void writeTemperatureUnitAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeTemperatureUnitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readClusterErrorBooleanAttribute(BooleanAttributeCallback callback) {
+      readClusterErrorBooleanAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeTemperatureUnitAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTemperatureUnitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeClusterErrorBooleanAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeClusterErrorBooleanAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
+    public void writeClusterErrorBooleanAttribute(
+        DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeClusterErrorBooleanAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeClusterErrorBooleanAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterErrorBooleanAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
+    public void readUnsupportedAttribute(BooleanAttributeCallback callback) {
+      readUnsupportedAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeUnsupportedAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeUnsupportedAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
+    public void writeUnsupportedAttribute(
+        DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeUnsupportedAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeUnsupportedAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeUnsupportedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    private native void readTemperatureUnitAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readNullableBooleanAttribute(NullableBooleanAttributeCallback callback) {
+      readNullableBooleanAttribute(chipClusterPtr, callback);
+    }
 
-    private native void writeTemperatureUnitAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        Integer value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void writeNullableBooleanAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeNullableBooleanAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void subscribeTemperatureUnitAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableBooleanAttribute(
+        DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
+      writeNullableBooleanAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void readAttributeListAttribute(
-        long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void subscribeNullableBooleanAttribute(
+        NullableBooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableBooleanAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeAttributeListAttribute(
-        long chipClusterPtr,
-        AttributeListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void readNullableBitmap8Attribute(NullableBitmap8AttributeCallback callback) {
+      readNullableBitmap8Attribute(chipClusterPtr, callback);
+    }
 
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void writeNullableBitmap8Attribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableBitmap8Attribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void subscribeFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableBitmap8Attribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableBitmap8Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeNullableBitmap8Attribute(
+        NullableBitmap8AttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableBitmap8Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public void readNullableBitmap16Attribute(NullableBitmap16AttributeCallback callback) {
+      readNullableBitmap16Attribute(chipClusterPtr, callback);
+    }
 
-  public static class UserLabelCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 65L;
+    public void writeNullableBitmap16Attribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableBitmap16Attribute(chipClusterPtr, callback, value, null);
+    }
 
-    public UserLabelCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    public void writeNullableBitmap16Attribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableBitmap16Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void subscribeNullableBitmap16Attribute(
+        NullableBitmap16AttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableBitmap16Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    public interface LabelListAttributeCallback {
-      void onSuccess(List<ChipStructs.UserLabelClusterLabelStruct> valueList);
+    public void readNullableBitmap32Attribute(NullableBitmap32AttributeCallback callback) {
+      readNullableBitmap32Attribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void writeNullableBitmap32Attribute(DefaultClusterCallback callback, Long value) {
+      writeNullableBitmap32Attribute(chipClusterPtr, callback, value, null);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void writeNullableBitmap32Attribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableBitmap32Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void subscribeNullableBitmap32Attribute(
+        NullableBitmap32AttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableBitmap32Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readNullableBitmap64Attribute(NullableBitmap64AttributeCallback callback) {
+      readNullableBitmap64Attribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void writeNullableBitmap64Attribute(DefaultClusterCallback callback, Long value) {
+      writeNullableBitmap64Attribute(chipClusterPtr, callback, value, null);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void writeNullableBitmap64Attribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableBitmap64Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-      void onError(Exception ex);
+    public void subscribeNullableBitmap64Attribute(
+        NullableBitmap64AttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableBitmap64Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readNullableInt8uAttribute(NullableInt8uAttributeCallback callback) {
+      readNullableInt8uAttribute(chipClusterPtr, callback);
     }
 
-    public void readLabelListAttribute(LabelListAttributeCallback callback) {
-      readLabelListAttribute(chipClusterPtr, callback);
+    public void writeNullableInt8uAttribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableInt8uAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void writeLabelListAttribute(
-        DefaultClusterCallback callback, ArrayList<ChipStructs.UserLabelClusterLabelStruct> value) {
-      writeLabelListAttribute(chipClusterPtr, callback, value, null);
+    public void writeNullableInt8uAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableInt8uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void writeLabelListAttribute(
-        DefaultClusterCallback callback,
-        ArrayList<ChipStructs.UserLabelClusterLabelStruct> value,
-        int timedWriteTimeoutMs) {
-      writeLabelListAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void subscribeNullableInt8uAttribute(
+        NullableInt8uAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableInt8uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void subscribeLabelListAttribute(
-        LabelListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeLabelListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readNullableInt16uAttribute(NullableInt16uAttributeCallback callback) {
+      readNullableInt16uAttribute(chipClusterPtr, callback);
     }
 
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    public void writeNullableInt16uAttribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableInt16uAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeNullableInt16uAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableInt16uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    public void subscribeNullableInt16uAttribute(
+        NullableInt16uAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableInt16uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readNullableInt24uAttribute(NullableInt24uAttributeCallback callback) {
+      readNullableInt24uAttribute(chipClusterPtr, callback);
     }
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
+    public void writeNullableInt24uAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt24uAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeNullableInt24uAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableInt24uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
+    public void subscribeNullableInt24uAttribute(
+        NullableInt24uAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableInt24uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readNullableInt32uAttribute(NullableInt32uAttributeCallback callback) {
+      readNullableInt32uAttribute(chipClusterPtr, callback);
     }
 
-    private native void readLabelListAttribute(
-        long chipClusterPtr, LabelListAttributeCallback callback);
+    public void writeNullableInt32uAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt32uAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void writeLabelListAttribute(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        ArrayList<ChipStructs.UserLabelClusterLabelStruct> value,
-        @Nullable Integer timedWriteTimeoutMs);
+    public void writeNullableInt32uAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableInt32uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeLabelListAttribute(
-        long chipClusterPtr, LabelListAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeNullableInt32uAttribute(
+        NullableInt32uAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableInt32uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readGeneratedCommandListAttribute(
-        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void readNullableInt40uAttribute(NullableInt40uAttributeCallback callback) {
+      readNullableInt40uAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeGeneratedCommandListAttribute(
-        long chipClusterPtr,
-        GeneratedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void writeNullableInt40uAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt40uAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readAcceptedCommandListAttribute(
-        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void writeNullableInt40uAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableInt40uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeAcceptedCommandListAttribute(
-        long chipClusterPtr,
-        AcceptedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void subscribeNullableInt40uAttribute(
+        NullableInt40uAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableInt40uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void readNullableInt48uAttribute(NullableInt48uAttributeCallback callback) {
+      readNullableInt48uAttribute(chipClusterPtr, callback);
+    }
 
-    private native void subscribeFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeNullableInt48uAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt48uAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeNullableInt48uAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableInt48uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public void subscribeNullableInt48uAttribute(
+        NullableInt48uAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableInt48uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-  public static class WakeOnLanCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1283L;
+    public void readNullableInt56uAttribute(NullableInt56uAttributeCallback callback) {
+      readNullableInt56uAttribute(chipClusterPtr, callback);
+    }
 
-    public WakeOnLanCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    public void writeNullableInt56uAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt56uAttribute(chipClusterPtr, callback, value, null);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void writeNullableInt56uAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableInt56uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void subscribeNullableInt56uAttribute(
+        NullableInt56uAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableInt56uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readNullableInt64uAttribute(NullableInt64uAttributeCallback callback) {
+      readNullableInt64uAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void writeNullableInt64uAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt64uAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void writeNullableInt64uAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableInt64uAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-      void onError(Exception ex);
+    public void subscribeNullableInt64uAttribute(
+        NullableInt64uAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableInt64uAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readNullableInt8sAttribute(NullableInt8sAttributeCallback callback) {
+      readNullableInt8sAttribute(chipClusterPtr, callback);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
-
-      void onError(Exception ex);
+    public void writeNullableInt8sAttribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableInt8sAttribute(chipClusterPtr, callback, value, null);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void writeNullableInt8sAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableInt8sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void readMACAddressAttribute(CharStringAttributeCallback callback) {
-      readMACAddressAttribute(chipClusterPtr, callback);
+    public void subscribeNullableInt8sAttribute(
+        NullableInt8sAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableInt8sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void subscribeMACAddressAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeMACAddressAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readNullableInt16sAttribute(NullableInt16sAttributeCallback callback) {
+      readNullableInt16sAttribute(chipClusterPtr, callback);
     }
 
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    public void writeNullableInt16sAttribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableInt16sAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeNullableInt16sAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableInt16sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    public void subscribeNullableInt16sAttribute(
+        NullableInt16sAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableInt16sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readNullableInt24sAttribute(NullableInt24sAttributeCallback callback) {
+      readNullableInt24sAttribute(chipClusterPtr, callback);
     }
 
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
+    public void writeNullableInt24sAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt24sAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeNullableInt24sAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableInt24sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
+    public void subscribeNullableInt24sAttribute(
+        NullableInt24sAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableInt24sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void readNullableInt32sAttribute(NullableInt32sAttributeCallback callback) {
+      readNullableInt32sAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
+    public void writeNullableInt32sAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt32sAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeNullableInt32sAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableInt32sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    private native void readMACAddressAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
+    public void subscribeNullableInt32sAttribute(
+        NullableInt32sAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableInt32sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeMACAddressAttribute(
-        long chipClusterPtr,
-        CharStringAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void readNullableInt40sAttribute(NullableInt40sAttributeCallback callback) {
+      readNullableInt40sAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readGeneratedCommandListAttribute(
-        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void writeNullableInt40sAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt40sAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void subscribeGeneratedCommandListAttribute(
-        long chipClusterPtr,
-        GeneratedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void writeNullableInt40sAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableInt40sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void readAcceptedCommandListAttribute(
-        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void subscribeNullableInt40sAttribute(
+        NullableInt40sAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableInt40sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeAcceptedCommandListAttribute(
-        long chipClusterPtr,
-        AcceptedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void readNullableInt48sAttribute(NullableInt48sAttributeCallback callback) {
+      readNullableInt48sAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readAttributeListAttribute(
-        long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void writeNullableInt48sAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt48sAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void subscribeAttributeListAttribute(
-        long chipClusterPtr,
-        AttributeListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+    public void writeNullableInt48sAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableInt48sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    public void subscribeNullableInt48sAttribute(
+        NullableInt48sAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableInt48sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    private native void subscribeFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void readNullableInt56sAttribute(NullableInt56sAttributeCallback callback) {
+      readNullableInt56sAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeNullableInt56sAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt56sAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    private native void subscribeClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public void writeNullableInt56sAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableInt56sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-  public static class WiFiNetworkDiagnosticsCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 54L;
+    public void subscribeNullableInt56sAttribute(
+        NullableInt56sAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableInt56sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-    public WiFiNetworkDiagnosticsCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    public void readNullableInt64sAttribute(NullableInt64sAttributeCallback callback) {
+      readNullableInt64sAttribute(chipClusterPtr, callback);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void writeNullableInt64sAttribute(DefaultClusterCallback callback, Long value) {
+      writeNullableInt64sAttribute(chipClusterPtr, callback, value, null);
+    }
 
-    public void resetCounts(DefaultClusterCallback callback) {
-      resetCounts(chipClusterPtr, callback, null);
+    public void writeNullableInt64sAttribute(
+        DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
+      writeNullableInt64sAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void resetCounts(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+    public void subscribeNullableInt64sAttribute(
+        NullableInt64sAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableInt64sAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      resetCounts(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public void readNullableEnum8Attribute(NullableEnum8AttributeCallback callback) {
+      readNullableEnum8Attribute(chipClusterPtr, callback);
     }
 
-    private native void resetCounts(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        @Nullable Integer timedInvokeTimeoutMs);
+    public void writeNullableEnum8Attribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableEnum8Attribute(chipClusterPtr, callback, value, null);
+    }
 
-    public interface BssidAttributeCallback {
-      void onSuccess(@Nullable byte[] value);
+    public void writeNullableEnum8Attribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableEnum8Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-      void onError(Exception ex);
+    public void subscribeNullableEnum8Attribute(
+        NullableEnum8AttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableEnum8Attribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readNullableEnum16Attribute(NullableEnum16AttributeCallback callback) {
+      readNullableEnum16Attribute(chipClusterPtr, callback);
     }
 
-    public interface SecurityTypeAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public void writeNullableEnum16Attribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableEnum16Attribute(chipClusterPtr, callback, value, null);
+    }
 
-      void onError(Exception ex);
+    public void writeNullableEnum16Attribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableEnum16Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeNullableEnum16Attribute(
+        NullableEnum16AttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableEnum16Attribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface WiFiVersionAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public void readNullableFloatSingleAttribute(NullableFloatSingleAttributeCallback callback) {
+      readNullableFloatSingleAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void writeNullableFloatSingleAttribute(DefaultClusterCallback callback, Float value) {
+      writeNullableFloatSingleAttribute(chipClusterPtr, callback, value, null);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void writeNullableFloatSingleAttribute(
+        DefaultClusterCallback callback, Float value, int timedWriteTimeoutMs) {
+      writeNullableFloatSingleAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public interface ChannelNumberAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public void subscribeNullableFloatSingleAttribute(
+        NullableFloatSingleAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableFloatSingleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readNullableFloatDoubleAttribute(NullableFloatDoubleAttributeCallback callback) {
+      readNullableFloatDoubleAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void writeNullableFloatDoubleAttribute(DefaultClusterCallback callback, Double value) {
+      writeNullableFloatDoubleAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public interface RssiAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    public void writeNullableFloatDoubleAttribute(
+        DefaultClusterCallback callback, Double value, int timedWriteTimeoutMs) {
+      writeNullableFloatDoubleAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-      void onError(Exception ex);
+    public void subscribeNullableFloatDoubleAttribute(
+        NullableFloatDoubleAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableFloatDoubleAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void readNullableOctetStringAttribute(NullableOctetStringAttributeCallback callback) {
+      readNullableOctetStringAttribute(chipClusterPtr, callback);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void writeNullableOctetStringAttribute(DefaultClusterCallback callback, byte[] value) {
+      writeNullableOctetStringAttribute(chipClusterPtr, callback, value, null);
+    }
 
-      void onError(Exception ex);
+    public void writeNullableOctetStringAttribute(
+        DefaultClusterCallback callback, byte[] value, int timedWriteTimeoutMs) {
+      writeNullableOctetStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void subscribeNullableOctetStringAttribute(
+        NullableOctetStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableOctetStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void readNullableCharStringAttribute(NullableCharStringAttributeCallback callback) {
+      readNullableCharStringAttribute(chipClusterPtr, callback);
+    }
 
-      void onError(Exception ex);
+    public void writeNullableCharStringAttribute(DefaultClusterCallback callback, String value) {
+      writeNullableCharStringAttribute(chipClusterPtr, callback, value, null);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void writeNullableCharStringAttribute(
+        DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
+      writeNullableCharStringAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    public void subscribeNullableCharStringAttribute(
+        NullableCharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableCharStringAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
 
-      void onError(Exception ex);
+    public void readNullableEnumAttrAttribute(NullableEnumAttrAttributeCallback callback) {
+      readNullableEnumAttrAttribute(chipClusterPtr, callback);
+    }
 
-      default void onSubscriptionEstablished() {}
+    public void writeNullableEnumAttrAttribute(DefaultClusterCallback callback, Integer value) {
+      writeNullableEnumAttrAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readBssidAttribute(BssidAttributeCallback callback) {
-      readBssidAttribute(chipClusterPtr, callback);
+    public void writeNullableEnumAttrAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableEnumAttrAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeBssidAttribute(
-        BssidAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBssidAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeNullableEnumAttrAttribute(
+        NullableEnumAttrAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableEnumAttrAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readSecurityTypeAttribute(SecurityTypeAttributeCallback callback) {
-      readSecurityTypeAttribute(chipClusterPtr, callback);
+    public void readNullableRangeRestrictedInt8uAttribute(
+        NullableRangeRestrictedInt8uAttributeCallback callback) {
+      readNullableRangeRestrictedInt8uAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeSecurityTypeAttribute(
-        SecurityTypeAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSecurityTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeNullableRangeRestrictedInt8uAttribute(
+        DefaultClusterCallback callback, Integer value) {
+      writeNullableRangeRestrictedInt8uAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readWiFiVersionAttribute(WiFiVersionAttributeCallback callback) {
-      readWiFiVersionAttribute(chipClusterPtr, callback);
+    public void writeNullableRangeRestrictedInt8uAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableRangeRestrictedInt8uAttribute(
+          chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeWiFiVersionAttribute(
-        WiFiVersionAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeWiFiVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeNullableRangeRestrictedInt8uAttribute(
+        NullableRangeRestrictedInt8uAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableRangeRestrictedInt8uAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readChannelNumberAttribute(ChannelNumberAttributeCallback callback) {
-      readChannelNumberAttribute(chipClusterPtr, callback);
+    public void readNullableRangeRestrictedInt8sAttribute(
+        NullableRangeRestrictedInt8sAttributeCallback callback) {
+      readNullableRangeRestrictedInt8sAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeChannelNumberAttribute(
-        ChannelNumberAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeChannelNumberAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeNullableRangeRestrictedInt8sAttribute(
+        DefaultClusterCallback callback, Integer value) {
+      writeNullableRangeRestrictedInt8sAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readRssiAttribute(RssiAttributeCallback callback) {
-      readRssiAttribute(chipClusterPtr, callback);
+    public void writeNullableRangeRestrictedInt8sAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableRangeRestrictedInt8sAttribute(
+          chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeRssiAttribute(
-        RssiAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeRssiAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeNullableRangeRestrictedInt8sAttribute(
+        NullableRangeRestrictedInt8sAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableRangeRestrictedInt8sAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readBeaconLostCountAttribute(LongAttributeCallback callback) {
-      readBeaconLostCountAttribute(chipClusterPtr, callback);
+    public void readNullableRangeRestrictedInt16uAttribute(
+        NullableRangeRestrictedInt16uAttributeCallback callback) {
+      readNullableRangeRestrictedInt16uAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeBeaconLostCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBeaconLostCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeNullableRangeRestrictedInt16uAttribute(
+        DefaultClusterCallback callback, Integer value) {
+      writeNullableRangeRestrictedInt16uAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readBeaconRxCountAttribute(LongAttributeCallback callback) {
-      readBeaconRxCountAttribute(chipClusterPtr, callback);
+    public void writeNullableRangeRestrictedInt16uAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableRangeRestrictedInt16uAttribute(
+          chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribeBeaconRxCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeBeaconRxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeNullableRangeRestrictedInt16uAttribute(
+        NullableRangeRestrictedInt16uAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableRangeRestrictedInt16uAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readPacketMulticastRxCountAttribute(LongAttributeCallback callback) {
-      readPacketMulticastRxCountAttribute(chipClusterPtr, callback);
+    public void readNullableRangeRestrictedInt16sAttribute(
+        NullableRangeRestrictedInt16sAttributeCallback callback) {
+      readNullableRangeRestrictedInt16sAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribePacketMulticastRxCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePacketMulticastRxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeNullableRangeRestrictedInt16sAttribute(
+        DefaultClusterCallback callback, Integer value) {
+      writeNullableRangeRestrictedInt16sAttribute(chipClusterPtr, callback, value, null);
     }
 
-    public void readPacketMulticastTxCountAttribute(LongAttributeCallback callback) {
-      readPacketMulticastTxCountAttribute(chipClusterPtr, callback);
+    public void writeNullableRangeRestrictedInt16sAttribute(
+        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      writeNullableRangeRestrictedInt16sAttribute(
+          chipClusterPtr, callback, value, timedWriteTimeoutMs);
     }
 
-    public void subscribePacketMulticastTxCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePacketMulticastTxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeNullableRangeRestrictedInt16sAttribute(
+        NullableRangeRestrictedInt16sAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeNullableRangeRestrictedInt16sAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readPacketUnicastRxCountAttribute(LongAttributeCallback callback) {
-      readPacketUnicastRxCountAttribute(chipClusterPtr, callback);
+    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
+      readGeneratedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribePacketUnicastRxCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePacketUnicastRxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readPacketUnicastTxCountAttribute(LongAttributeCallback callback) {
-      readPacketUnicastTxCountAttribute(chipClusterPtr, callback);
+    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
+      readAcceptedCommandListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribePacketUnicastTxCountAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePacketUnicastTxCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readCurrentMaxRateAttribute(LongAttributeCallback callback) {
-      readCurrentMaxRateAttribute(chipClusterPtr, callback);
+    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
+      readAttributeListAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentMaxRateAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentMaxRateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readOverrunCountAttribute(LongAttributeCallback callback) {
-      readOverrunCountAttribute(chipClusterPtr, callback);
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+      readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeOverrunCountAttribute(
+    public void subscribeFeatureMapAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeOverrunCountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
-    }
+    private native void readBooleanAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
+
+    private native void writeBooleanAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Boolean value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeBooleanAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readBitmap8Attribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeBitmap8Attribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeBitmap8Attribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readBitmap16Attribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeBitmap16Attribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeBitmap16Attribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readBitmap32Attribute(long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void writeBitmap32Attribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeBitmap32Attribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readBitmap64Attribute(long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void writeBitmap64Attribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeBitmap64Attribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readInt8uAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeInt8uAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeInt8uAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readInt16uAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
-    }
+    private native void writeInt16uAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeInt16uAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
-    }
+    private native void readInt24uAttribute(long chipClusterPtr, LongAttributeCallback callback);
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void writeInt24uAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeInt24uAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readInt32uAttribute(long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void readBssidAttribute(long chipClusterPtr, BssidAttributeCallback callback);
+    private native void writeInt32uAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeBssidAttribute(
-        long chipClusterPtr, BssidAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeInt32uAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readSecurityTypeAttribute(
-        long chipClusterPtr, SecurityTypeAttributeCallback callback);
+    private native void readInt40uAttribute(long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeSecurityTypeAttribute(
+    private native void writeInt40uAttribute(
         long chipClusterPtr,
-        SecurityTypeAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readWiFiVersionAttribute(
-        long chipClusterPtr, WiFiVersionAttributeCallback callback);
+    private native void subscribeInt40uAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeWiFiVersionAttribute(
+    private native void readInt48uAttribute(long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void writeInt48uAttribute(
         long chipClusterPtr,
-        WiFiVersionAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readChannelNumberAttribute(
-        long chipClusterPtr, ChannelNumberAttributeCallback callback);
+    private native void subscribeInt48uAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeChannelNumberAttribute(
+    private native void readInt56uAttribute(long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void writeInt56uAttribute(
         long chipClusterPtr,
-        ChannelNumberAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readRssiAttribute(long chipClusterPtr, RssiAttributeCallback callback);
+    private native void subscribeInt56uAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeRssiAttribute(
-        long chipClusterPtr, RssiAttributeCallback callback, int minInterval, int maxInterval);
+    private native void readInt64uAttribute(long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void readBeaconLostCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    private native void writeInt64uAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeBeaconLostCountAttribute(
+    private native void subscribeInt64uAttribute(
         long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readBeaconRxCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    private native void readInt8sAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeBeaconRxCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    private native void writeInt8sAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readPacketMulticastRxCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    private native void subscribeInt8sAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribePacketMulticastRxCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    private native void readInt16sAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void readPacketMulticastTxCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    private native void writeInt16sAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribePacketMulticastTxCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeInt16sAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readPacketUnicastRxCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    private native void readInt24sAttribute(long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribePacketUnicastRxCountAttribute(
+    private native void writeInt24sAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeInt24sAttribute(
         long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readPacketUnicastTxCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    private native void readInt32sAttribute(long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribePacketUnicastTxCountAttribute(
+    private native void writeInt32sAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeInt32sAttribute(
         long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readCurrentMaxRateAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    private native void readInt40sAttribute(long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeCurrentMaxRateAttribute(
+    private native void writeInt40sAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeInt40sAttribute(
         long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readOverrunCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    private native void readInt48sAttribute(long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeOverrunCountAttribute(
+    private native void writeInt48sAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeInt48sAttribute(
         long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readGeneratedCommandListAttribute(
-        long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    private native void readInt56sAttribute(long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void subscribeGeneratedCommandListAttribute(
+    private native void writeInt56sAttribute(
         long chipClusterPtr,
-        GeneratedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readAcceptedCommandListAttribute(
-        long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    private native void subscribeInt56sAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeAcceptedCommandListAttribute(
+    private native void readInt64sAttribute(long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void writeInt64sAttribute(
         long chipClusterPtr,
-        AcceptedCommandListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readAttributeListAttribute(
-        long chipClusterPtr, AttributeListAttributeCallback callback);
+    private native void subscribeInt64sAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeAttributeListAttribute(
+    private native void readEnum8Attribute(long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeEnum8Attribute(
         long chipClusterPtr,
-        AttributeListAttributeCallback callback,
-        int minInterval,
-        int maxInterval);
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    private native void subscribeEnum8Attribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    private native void readEnum16Attribute(long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeEnum16Attribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeClusterRevisionAttribute(
+    private native void subscribeEnum16Attribute(
         long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
-
-  public static class WindowCoveringCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 258L;
 
-    public WindowCoveringCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
+    private native void readFloatSingleAttribute(
+        long chipClusterPtr, FloatAttributeCallback callback);
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    private native void writeFloatSingleAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Float value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void downOrClose(DefaultClusterCallback callback) {
-      downOrClose(chipClusterPtr, callback, null);
-    }
+    private native void subscribeFloatSingleAttribute(
+        long chipClusterPtr, FloatAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void downOrClose(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+    private native void readFloatDoubleAttribute(
+        long chipClusterPtr, DoubleAttributeCallback callback);
 
-      downOrClose(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+    private native void writeFloatDoubleAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Double value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void goToLiftPercentage(
-        DefaultClusterCallback callback, Integer liftPercent100thsValue) {
-      goToLiftPercentage(chipClusterPtr, callback, liftPercent100thsValue, null);
-    }
+    private native void subscribeFloatDoubleAttribute(
+        long chipClusterPtr, DoubleAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void goToLiftPercentage(
-        DefaultClusterCallback callback, Integer liftPercent100thsValue, int timedInvokeTimeoutMs) {
-      goToLiftPercentage(chipClusterPtr, callback, liftPercent100thsValue, timedInvokeTimeoutMs);
-    }
+    private native void readOctetStringAttribute(
+        long chipClusterPtr, OctetStringAttributeCallback callback);
 
-    public void goToLiftValue(DefaultClusterCallback callback, Integer liftValue) {
-      goToLiftValue(chipClusterPtr, callback, liftValue, null);
-    }
+    private native void writeOctetStringAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        byte[] value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void goToLiftValue(
-        DefaultClusterCallback callback, Integer liftValue, int timedInvokeTimeoutMs) {
-      goToLiftValue(chipClusterPtr, callback, liftValue, timedInvokeTimeoutMs);
-    }
+    private native void subscribeOctetStringAttribute(
+        long chipClusterPtr,
+        OctetStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void goToTiltPercentage(
-        DefaultClusterCallback callback, Integer tiltPercent100thsValue) {
-      goToTiltPercentage(chipClusterPtr, callback, tiltPercent100thsValue, null);
-    }
+    private native void readListInt8uAttribute(
+        long chipClusterPtr, ListInt8uAttributeCallback callback);
 
-    public void goToTiltPercentage(
-        DefaultClusterCallback callback, Integer tiltPercent100thsValue, int timedInvokeTimeoutMs) {
-      goToTiltPercentage(chipClusterPtr, callback, tiltPercent100thsValue, timedInvokeTimeoutMs);
-    }
+    private native void writeListInt8uAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        ArrayList<Integer> value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void goToTiltValue(DefaultClusterCallback callback, Integer tiltValue) {
-      goToTiltValue(chipClusterPtr, callback, tiltValue, null);
-    }
+    private native void subscribeListInt8uAttribute(
+        long chipClusterPtr, ListInt8uAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void goToTiltValue(
-        DefaultClusterCallback callback, Integer tiltValue, int timedInvokeTimeoutMs) {
-      goToTiltValue(chipClusterPtr, callback, tiltValue, timedInvokeTimeoutMs);
-    }
+    private native void readListOctetStringAttribute(
+        long chipClusterPtr, ListOctetStringAttributeCallback callback);
 
-    public void stopMotion(DefaultClusterCallback callback) {
-      stopMotion(chipClusterPtr, callback, null);
-    }
+    private native void writeListOctetStringAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        ArrayList<byte[]> value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void stopMotion(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+    private native void subscribeListOctetStringAttribute(
+        long chipClusterPtr,
+        ListOctetStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-      stopMotion(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+    private native void readListStructOctetStringAttribute(
+        long chipClusterPtr, ListStructOctetStringAttributeCallback callback);
 
-    public void upOrOpen(DefaultClusterCallback callback) {
-      upOrOpen(chipClusterPtr, callback, null);
-    }
+    private native void writeListStructOctetStringAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        ArrayList<ChipStructs.TestClusterClusterTestListStructOctet> value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void upOrOpen(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+    private native void subscribeListStructOctetStringAttribute(
+        long chipClusterPtr,
+        ListStructOctetStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-      upOrOpen(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+    private native void readLongOctetStringAttribute(
+        long chipClusterPtr, OctetStringAttributeCallback callback);
 
-    private native void downOrClose(
+    private native void writeLongOctetStringAttribute(
         long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        @Nullable Integer timedInvokeTimeoutMs);
+        DefaultClusterCallback callback,
+        byte[] value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void goToLiftPercentage(
+    private native void subscribeLongOctetStringAttribute(
         long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer liftPercent100thsValue,
-        @Nullable Integer timedInvokeTimeoutMs);
+        OctetStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void goToLiftValue(
-        long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer liftValue,
-        @Nullable Integer timedInvokeTimeoutMs);
+    private native void readCharStringAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
 
-    private native void goToTiltPercentage(
+    private native void writeCharStringAttribute(
         long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer tiltPercent100thsValue,
-        @Nullable Integer timedInvokeTimeoutMs);
+        DefaultClusterCallback callback,
+        String value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void goToTiltValue(
+    private native void subscribeCharStringAttribute(
         long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        Integer tiltValue,
-        @Nullable Integer timedInvokeTimeoutMs);
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void stopMotion(
+    private native void readLongCharStringAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void writeLongCharStringAttribute(
         long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        @Nullable Integer timedInvokeTimeoutMs);
+        DefaultClusterCallback callback,
+        String value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void upOrOpen(
+    private native void subscribeLongCharStringAttribute(
         long chipClusterPtr,
-        DefaultClusterCallback Callback,
-        @Nullable Integer timedInvokeTimeoutMs);
+        CharStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public interface CurrentPositionLiftAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    private native void readEpochUsAttribute(long chipClusterPtr, LongAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void writeEpochUsAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeEpochUsAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public interface CurrentPositionTiltAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    private native void readEpochSAttribute(long chipClusterPtr, LongAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void writeEpochSAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeEpochSAttribute(
+        long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
 
-    public interface CurrentPositionLiftPercentageAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    private native void readVendorIdAttribute(
+        long chipClusterPtr, VendorIdAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void writeVendorIdAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeVendorIdAttribute(
+        long chipClusterPtr, VendorIdAttributeCallback callback, int minInterval, int maxInterval);
 
-    public interface CurrentPositionTiltPercentageAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    private native void readListNullablesAndOptionalsStructAttribute(
+        long chipClusterPtr, ListNullablesAndOptionalsStructAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void writeListNullablesAndOptionalsStructAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        ArrayList<ChipStructs.TestClusterClusterNullablesAndOptionalsStruct> value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeListNullablesAndOptionalsStructAttribute(
+        long chipClusterPtr,
+        ListNullablesAndOptionalsStructAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public interface TargetPositionLiftPercent100thsAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    private native void readEnumAttrAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void writeEnumAttrAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeEnumAttrAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public interface TargetPositionTiltPercent100thsAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    private native void readRangeRestrictedInt8uAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void writeRangeRestrictedInt8uAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeRangeRestrictedInt8uAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public interface CurrentPositionLiftPercent100thsAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    private native void readRangeRestrictedInt8sAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void writeRangeRestrictedInt8sAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeRangeRestrictedInt8sAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public interface CurrentPositionTiltPercent100thsAttributeCallback {
-      void onSuccess(@Nullable Integer value);
+    private native void readRangeRestrictedInt16uAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void writeRangeRestrictedInt16uAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeRangeRestrictedInt16uAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void readRangeRestrictedInt16sAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void writeRangeRestrictedInt16sAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeRangeRestrictedInt16sAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void readListLongOctetStringAttribute(
+        long chipClusterPtr, ListLongOctetStringAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void writeListLongOctetStringAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        ArrayList<byte[]> value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeListLongOctetStringAttribute(
+        long chipClusterPtr,
+        ListLongOctetStringAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> valueList);
+    private native void readListFabricScopedAttribute(
+        long chipClusterPtr, ListFabricScopedAttributeCallback callback);
 
-      void onError(Exception ex);
+    private native void writeListFabricScopedAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        ArrayList<ChipStructs.TestClusterClusterTestFabricScoped> value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-      default void onSubscriptionEstablished() {}
-    }
+    private native void subscribeListFabricScopedAttribute(
+        long chipClusterPtr,
+        ListFabricScopedAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void readTypeAttribute(IntegerAttributeCallback callback) {
-      readTypeAttribute(chipClusterPtr, callback);
-    }
+    private native void readTimedWriteBooleanAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
 
-    public void subscribeTypeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void writeTimedWriteBooleanAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Boolean value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void readPhysicalClosedLimitLiftAttribute(IntegerAttributeCallback callback) {
-      readPhysicalClosedLimitLiftAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeTimedWriteBooleanAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void subscribePhysicalClosedLimitLiftAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePhysicalClosedLimitLiftAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readGeneralErrorBooleanAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
 
-    public void readPhysicalClosedLimitTiltAttribute(IntegerAttributeCallback callback) {
-      readPhysicalClosedLimitTiltAttribute(chipClusterPtr, callback);
-    }
+    private native void writeGeneralErrorBooleanAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Boolean value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void subscribePhysicalClosedLimitTiltAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribePhysicalClosedLimitTiltAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeGeneralErrorBooleanAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readCurrentPositionLiftAttribute(CurrentPositionLiftAttributeCallback callback) {
-      readCurrentPositionLiftAttribute(chipClusterPtr, callback);
-    }
+    private native void readClusterErrorBooleanAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
 
-    public void subscribeCurrentPositionLiftAttribute(
-        CurrentPositionLiftAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentPositionLiftAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void writeClusterErrorBooleanAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Boolean value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void readCurrentPositionTiltAttribute(CurrentPositionTiltAttributeCallback callback) {
-      readCurrentPositionTiltAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeClusterErrorBooleanAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void subscribeCurrentPositionTiltAttribute(
-        CurrentPositionTiltAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentPositionTiltAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readUnsupportedAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
 
-    public void readNumberOfActuationsLiftAttribute(IntegerAttributeCallback callback) {
-      readNumberOfActuationsLiftAttribute(chipClusterPtr, callback);
-    }
+    private native void writeUnsupportedAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Boolean value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void subscribeNumberOfActuationsLiftAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNumberOfActuationsLiftAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeUnsupportedAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
 
-    public void readNumberOfActuationsTiltAttribute(IntegerAttributeCallback callback) {
-      readNumberOfActuationsTiltAttribute(chipClusterPtr, callback);
-    }
+    private native void readNullableBooleanAttribute(
+        long chipClusterPtr, NullableBooleanAttributeCallback callback);
 
-    public void subscribeNumberOfActuationsTiltAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeNumberOfActuationsTiltAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void writeNullableBooleanAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Boolean value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void readConfigStatusAttribute(IntegerAttributeCallback callback) {
-      readConfigStatusAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeNullableBooleanAttribute(
+        long chipClusterPtr,
+        NullableBooleanAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void subscribeConfigStatusAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeConfigStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readNullableBitmap8Attribute(
+        long chipClusterPtr, NullableBitmap8AttributeCallback callback);
 
-    public void readCurrentPositionLiftPercentageAttribute(
-        CurrentPositionLiftPercentageAttributeCallback callback) {
-      readCurrentPositionLiftPercentageAttribute(chipClusterPtr, callback);
-    }
+    private native void writeNullableBitmap8Attribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void subscribeCurrentPositionLiftPercentageAttribute(
-        CurrentPositionLiftPercentageAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentPositionLiftPercentageAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeNullableBitmap8Attribute(
+        long chipClusterPtr,
+        NullableBitmap8AttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void readCurrentPositionTiltPercentageAttribute(
-        CurrentPositionTiltPercentageAttributeCallback callback) {
-      readCurrentPositionTiltPercentageAttribute(chipClusterPtr, callback);
-    }
+    private native void readNullableBitmap16Attribute(
+        long chipClusterPtr, NullableBitmap16AttributeCallback callback);
 
-    public void subscribeCurrentPositionTiltPercentageAttribute(
-        CurrentPositionTiltPercentageAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentPositionTiltPercentageAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void writeNullableBitmap16Attribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void readOperationalStatusAttribute(IntegerAttributeCallback callback) {
-      readOperationalStatusAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeNullableBitmap16Attribute(
+        long chipClusterPtr,
+        NullableBitmap16AttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void subscribeOperationalStatusAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeOperationalStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readNullableBitmap32Attribute(
+        long chipClusterPtr, NullableBitmap32AttributeCallback callback);
 
-    public void readTargetPositionLiftPercent100thsAttribute(
-        TargetPositionLiftPercent100thsAttributeCallback callback) {
-      readTargetPositionLiftPercent100thsAttribute(chipClusterPtr, callback);
-    }
+    private native void writeNullableBitmap32Attribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void subscribeTargetPositionLiftPercent100thsAttribute(
-        TargetPositionLiftPercent100thsAttributeCallback callback,
+    private native void subscribeNullableBitmap32Attribute(
+        long chipClusterPtr,
+        NullableBitmap32AttributeCallback callback,
         int minInterval,
-        int maxInterval) {
-      subscribeTargetPositionLiftPercent100thsAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
+        int maxInterval);
 
-    public void readTargetPositionTiltPercent100thsAttribute(
-        TargetPositionTiltPercent100thsAttributeCallback callback) {
-      readTargetPositionTiltPercent100thsAttribute(chipClusterPtr, callback);
-    }
+    private native void readNullableBitmap64Attribute(
+        long chipClusterPtr, NullableBitmap64AttributeCallback callback);
 
-    public void subscribeTargetPositionTiltPercent100thsAttribute(
-        TargetPositionTiltPercent100thsAttributeCallback callback,
-        int minInterval,
-        int maxInterval) {
-      subscribeTargetPositionTiltPercent100thsAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void writeNullableBitmap64Attribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void readEndProductTypeAttribute(IntegerAttributeCallback callback) {
-      readEndProductTypeAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeNullableBitmap64Attribute(
+        long chipClusterPtr,
+        NullableBitmap64AttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void subscribeEndProductTypeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeEndProductTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readNullableInt8uAttribute(
+        long chipClusterPtr, NullableInt8uAttributeCallback callback);
 
-    public void readCurrentPositionLiftPercent100thsAttribute(
-        CurrentPositionLiftPercent100thsAttributeCallback callback) {
-      readCurrentPositionLiftPercent100thsAttribute(chipClusterPtr, callback);
-    }
+    private native void writeNullableInt8uAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void subscribeCurrentPositionLiftPercent100thsAttribute(
-        CurrentPositionLiftPercent100thsAttributeCallback callback,
+    private native void subscribeNullableInt8uAttribute(
+        long chipClusterPtr,
+        NullableInt8uAttributeCallback callback,
         int minInterval,
-        int maxInterval) {
-      subscribeCurrentPositionLiftPercent100thsAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
+        int maxInterval);
 
-    public void readCurrentPositionTiltPercent100thsAttribute(
-        CurrentPositionTiltPercent100thsAttributeCallback callback) {
-      readCurrentPositionTiltPercent100thsAttribute(chipClusterPtr, callback);
-    }
+    private native void readNullableInt16uAttribute(
+        long chipClusterPtr, NullableInt16uAttributeCallback callback);
 
-    public void subscribeCurrentPositionTiltPercent100thsAttribute(
-        CurrentPositionTiltPercent100thsAttributeCallback callback,
+    private native void writeNullableInt16uAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeNullableInt16uAttribute(
+        long chipClusterPtr,
+        NullableInt16uAttributeCallback callback,
         int minInterval,
-        int maxInterval) {
-      subscribeCurrentPositionTiltPercent100thsAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
+        int maxInterval);
 
-    public void readInstalledOpenLimitLiftAttribute(IntegerAttributeCallback callback) {
-      readInstalledOpenLimitLiftAttribute(chipClusterPtr, callback);
-    }
+    private native void readNullableInt24uAttribute(
+        long chipClusterPtr, NullableInt24uAttributeCallback callback);
 
-    public void subscribeInstalledOpenLimitLiftAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeInstalledOpenLimitLiftAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void writeNullableInt24uAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void readInstalledClosedLimitLiftAttribute(IntegerAttributeCallback callback) {
-      readInstalledClosedLimitLiftAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeNullableInt24uAttribute(
+        long chipClusterPtr,
+        NullableInt24uAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void subscribeInstalledClosedLimitLiftAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeInstalledClosedLimitLiftAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readNullableInt32uAttribute(
+        long chipClusterPtr, NullableInt32uAttributeCallback callback);
 
-    public void readInstalledOpenLimitTiltAttribute(IntegerAttributeCallback callback) {
-      readInstalledOpenLimitTiltAttribute(chipClusterPtr, callback);
-    }
+    private native void writeNullableInt32uAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void subscribeInstalledOpenLimitTiltAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeInstalledOpenLimitTiltAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeNullableInt32uAttribute(
+        long chipClusterPtr,
+        NullableInt32uAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void readInstalledClosedLimitTiltAttribute(IntegerAttributeCallback callback) {
-      readInstalledClosedLimitTiltAttribute(chipClusterPtr, callback);
-    }
+    private native void readNullableInt40uAttribute(
+        long chipClusterPtr, NullableInt40uAttributeCallback callback);
 
-    public void subscribeInstalledClosedLimitTiltAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeInstalledClosedLimitTiltAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void writeNullableInt40uAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void readModeAttribute(IntegerAttributeCallback callback) {
-      readModeAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeNullableInt40uAttribute(
+        long chipClusterPtr,
+        NullableInt40uAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void writeModeAttribute(DefaultClusterCallback callback, Integer value) {
-      writeModeAttribute(chipClusterPtr, callback, value, null);
-    }
+    private native void readNullableInt48uAttribute(
+        long chipClusterPtr, NullableInt48uAttributeCallback callback);
 
-    public void writeModeAttribute(
-        DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-      writeModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    private native void writeNullableInt48uAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void subscribeModeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeNullableInt48uAttribute(
+        long chipClusterPtr,
+        NullableInt48uAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void readSafetyStatusAttribute(IntegerAttributeCallback callback) {
-      readSafetyStatusAttribute(chipClusterPtr, callback);
-    }
+    private native void readNullableInt56uAttribute(
+        long chipClusterPtr, NullableInt56uAttributeCallback callback);
 
-    public void subscribeSafetyStatusAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeSafetyStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void writeNullableInt56uAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
-      readGeneratedCommandListAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeNullableInt56uAttribute(
+        long chipClusterPtr,
+        NullableInt56uAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readNullableInt64uAttribute(
+        long chipClusterPtr, NullableInt64uAttributeCallback callback);
 
-    public void readAcceptedCommandListAttribute(AcceptedCommandListAttributeCallback callback) {
-      readAcceptedCommandListAttribute(chipClusterPtr, callback);
-    }
+    private native void writeNullableInt64uAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeNullableInt64uAttribute(
+        long chipClusterPtr,
+        NullableInt64uAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void readAttributeListAttribute(AttributeListAttributeCallback callback) {
-      readAttributeListAttribute(chipClusterPtr, callback);
-    }
+    private native void readNullableInt8sAttribute(
+        long chipClusterPtr, NullableInt8sAttributeCallback callback);
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void writeNullableInt8sAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
-      readFeatureMapAttribute(chipClusterPtr, callback);
-    }
+    private native void subscribeNullableInt8sAttribute(
+        long chipClusterPtr,
+        NullableInt8sAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    public void subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void readNullableInt16sAttribute(
+        long chipClusterPtr, NullableInt16sAttributeCallback callback);
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
+    private native void writeNullableInt16sAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    public void subscribeClusterRevisionAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    private native void subscribeNullableInt16sAttribute(
+        long chipClusterPtr,
+        NullableInt16sAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void readTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readNullableInt24sAttribute(
+        long chipClusterPtr, NullableInt24sAttributeCallback callback);
 
-    private native void subscribeTypeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void writeNullableInt24sAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readPhysicalClosedLimitLiftAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeNullableInt24sAttribute(
+        long chipClusterPtr,
+        NullableInt24sAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void subscribePhysicalClosedLimitLiftAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void readNullableInt32sAttribute(
+        long chipClusterPtr, NullableInt32sAttributeCallback callback);
 
-    private native void readPhysicalClosedLimitTiltAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeNullableInt32sAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribePhysicalClosedLimitTiltAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeNullableInt32sAttribute(
+        long chipClusterPtr,
+        NullableInt32sAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void readCurrentPositionLiftAttribute(
-        long chipClusterPtr, CurrentPositionLiftAttributeCallback callback);
+    private native void readNullableInt40sAttribute(
+        long chipClusterPtr, NullableInt40sAttributeCallback callback);
 
-    private native void subscribeCurrentPositionLiftAttribute(
+    private native void writeNullableInt40sAttribute(
         long chipClusterPtr,
-        CurrentPositionLiftAttributeCallback callback,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeNullableInt40sAttribute(
+        long chipClusterPtr,
+        NullableInt40sAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readCurrentPositionTiltAttribute(
-        long chipClusterPtr, CurrentPositionTiltAttributeCallback callback);
+    private native void readNullableInt48sAttribute(
+        long chipClusterPtr, NullableInt48sAttributeCallback callback);
 
-    private native void subscribeCurrentPositionTiltAttribute(
+    private native void writeNullableInt48sAttribute(
         long chipClusterPtr,
-        CurrentPositionTiltAttributeCallback callback,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeNullableInt48sAttribute(
+        long chipClusterPtr,
+        NullableInt48sAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readNumberOfActuationsLiftAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readNullableInt56sAttribute(
+        long chipClusterPtr, NullableInt56sAttributeCallback callback);
 
-    private native void subscribeNumberOfActuationsLiftAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void writeNullableInt56sAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readNumberOfActuationsTiltAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeNullableInt56sAttribute(
+        long chipClusterPtr,
+        NullableInt56sAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void subscribeNumberOfActuationsTiltAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void readNullableInt64sAttribute(
+        long chipClusterPtr, NullableInt64sAttributeCallback callback);
 
-    private native void readConfigStatusAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeNullableInt64sAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Long value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeConfigStatusAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeNullableInt64sAttribute(
+        long chipClusterPtr,
+        NullableInt64sAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void readCurrentPositionLiftPercentageAttribute(
-        long chipClusterPtr, CurrentPositionLiftPercentageAttributeCallback callback);
+    private native void readNullableEnum8Attribute(
+        long chipClusterPtr, NullableEnum8AttributeCallback callback);
 
-    private native void subscribeCurrentPositionLiftPercentageAttribute(
+    private native void writeNullableEnum8Attribute(
         long chipClusterPtr,
-        CurrentPositionLiftPercentageAttributeCallback callback,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeNullableEnum8Attribute(
+        long chipClusterPtr,
+        NullableEnum8AttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readCurrentPositionTiltPercentageAttribute(
-        long chipClusterPtr, CurrentPositionTiltPercentageAttributeCallback callback);
+    private native void readNullableEnum16Attribute(
+        long chipClusterPtr, NullableEnum16AttributeCallback callback);
 
-    private native void subscribeCurrentPositionTiltPercentageAttribute(
+    private native void writeNullableEnum16Attribute(
         long chipClusterPtr,
-        CurrentPositionTiltPercentageAttributeCallback callback,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeNullableEnum16Attribute(
+        long chipClusterPtr,
+        NullableEnum16AttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readOperationalStatusAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeOperationalStatusAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void readNullableFloatSingleAttribute(
+        long chipClusterPtr, NullableFloatSingleAttributeCallback callback);
 
-    private native void readTargetPositionLiftPercent100thsAttribute(
-        long chipClusterPtr, TargetPositionLiftPercent100thsAttributeCallback callback);
+    private native void writeNullableFloatSingleAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Float value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeTargetPositionLiftPercent100thsAttribute(
+    private native void subscribeNullableFloatSingleAttribute(
         long chipClusterPtr,
-        TargetPositionLiftPercent100thsAttributeCallback callback,
+        NullableFloatSingleAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readTargetPositionTiltPercent100thsAttribute(
-        long chipClusterPtr, TargetPositionTiltPercent100thsAttributeCallback callback);
+    private native void readNullableFloatDoubleAttribute(
+        long chipClusterPtr, NullableFloatDoubleAttributeCallback callback);
 
-    private native void subscribeTargetPositionTiltPercent100thsAttribute(
+    private native void writeNullableFloatDoubleAttribute(
         long chipClusterPtr,
-        TargetPositionTiltPercent100thsAttributeCallback callback,
+        DefaultClusterCallback callback,
+        Double value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeNullableFloatDoubleAttribute(
+        long chipClusterPtr,
+        NullableFloatDoubleAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readEndProductTypeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeEndProductTypeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void readNullableOctetStringAttribute(
+        long chipClusterPtr, NullableOctetStringAttributeCallback callback);
 
-    private native void readCurrentPositionLiftPercent100thsAttribute(
-        long chipClusterPtr, CurrentPositionLiftPercent100thsAttributeCallback callback);
+    private native void writeNullableOctetStringAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        byte[] value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeCurrentPositionLiftPercent100thsAttribute(
+    private native void subscribeNullableOctetStringAttribute(
         long chipClusterPtr,
-        CurrentPositionLiftPercent100thsAttributeCallback callback,
+        NullableOctetStringAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readCurrentPositionTiltPercent100thsAttribute(
-        long chipClusterPtr, CurrentPositionTiltPercent100thsAttributeCallback callback);
+    private native void readNullableCharStringAttribute(
+        long chipClusterPtr, NullableCharStringAttributeCallback callback);
 
-    private native void subscribeCurrentPositionTiltPercent100thsAttribute(
+    private native void writeNullableCharStringAttribute(
         long chipClusterPtr,
-        CurrentPositionTiltPercent100thsAttributeCallback callback,
+        DefaultClusterCallback callback,
+        String value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeNullableCharStringAttribute(
+        long chipClusterPtr,
+        NullableCharStringAttributeCallback callback,
         int minInterval,
         int maxInterval);
 
-    private native void readInstalledOpenLimitLiftAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readNullableEnumAttrAttribute(
+        long chipClusterPtr, NullableEnumAttrAttributeCallback callback);
 
-    private native void subscribeInstalledOpenLimitLiftAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void writeNullableEnumAttrAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readInstalledClosedLimitLiftAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeNullableEnumAttrAttribute(
+        long chipClusterPtr,
+        NullableEnumAttrAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void subscribeInstalledClosedLimitLiftAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void readNullableRangeRestrictedInt8uAttribute(
+        long chipClusterPtr, NullableRangeRestrictedInt8uAttributeCallback callback);
 
-    private native void readInstalledOpenLimitTiltAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeNullableRangeRestrictedInt8uAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeInstalledOpenLimitTiltAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeNullableRangeRestrictedInt8uAttribute(
+        long chipClusterPtr,
+        NullableRangeRestrictedInt8uAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void readInstalledClosedLimitTiltAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readNullableRangeRestrictedInt8sAttribute(
+        long chipClusterPtr, NullableRangeRestrictedInt8sAttributeCallback callback);
 
-    private native void subscribeInstalledClosedLimitTiltAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void writeNullableRangeRestrictedInt8sAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
 
-    private native void readModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeNullableRangeRestrictedInt8sAttribute(
+        long chipClusterPtr,
+        NullableRangeRestrictedInt8sAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void writeModeAttribute(
+    private native void readNullableRangeRestrictedInt16uAttribute(
+        long chipClusterPtr, NullableRangeRestrictedInt16uAttributeCallback callback);
+
+    private native void writeNullableRangeRestrictedInt16uAttribute(
         long chipClusterPtr,
         DefaultClusterCallback callback,
         Integer value,
         @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeModeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribeNullableRangeRestrictedInt16uAttribute(
+        long chipClusterPtr,
+        NullableRangeRestrictedInt16uAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
-    private native void readSafetyStatusAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readNullableRangeRestrictedInt16sAttribute(
+        long chipClusterPtr, NullableRangeRestrictedInt16sAttributeCallback callback);
 
-    private native void subscribeSafetyStatusAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void writeNullableRangeRestrictedInt16sAttribute(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        Integer value,
+        @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeNullableRangeRestrictedInt16sAttribute(
+        long chipClusterPtr,
+        NullableRangeRestrictedInt16sAttributeCallback callback,
+        int minInterval,
+        int maxInterval);
 
     private native void readGeneratedCommandListAttribute(
         long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java
index 284573aecb22b9..811d6f4ebcf382 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java
@@ -25,197 +25,197 @@ public final class ChipIdLookup {
    * returns an empty string.
    */
   public static String clusterIdToName(long clusterId) {
-    if (clusterId == 31L) {
-      return "AccessControl";
-    }
-    if (clusterId == 1294L) {
-      return "AccountLogin";
-    }
-    if (clusterId == 60L) {
-      return "AdministratorCommissioning";
+    if (clusterId == 3L) {
+      return "Identify";
     }
-    if (clusterId == 1293L) {
-      return "ApplicationBasic";
+    if (clusterId == 4L) {
+      return "Groups";
     }
-    if (clusterId == 1292L) {
-      return "ApplicationLauncher";
+    if (clusterId == 5L) {
+      return "Scenes";
     }
-    if (clusterId == 1291L) {
-      return "AudioOutput";
+    if (clusterId == 6L) {
+      return "OnOff";
     }
-    if (clusterId == 259L) {
-      return "BarrierControl";
+    if (clusterId == 7L) {
+      return "OnOffSwitchConfiguration";
     }
-    if (clusterId == 40L) {
-      return "Basic";
+    if (clusterId == 8L) {
+      return "LevelControl";
     }
     if (clusterId == 15L) {
       return "BinaryInputBasic";
     }
+    if (clusterId == 29L) {
+      return "Descriptor";
+    }
     if (clusterId == 30L) {
       return "Binding";
     }
-    if (clusterId == 69L) {
-      return "BooleanState";
+    if (clusterId == 31L) {
+      return "AccessControl";
     }
     if (clusterId == 37L) {
       return "BridgedActions";
     }
-    if (clusterId == 57L) {
-      return "BridgedDeviceBasic";
-    }
-    if (clusterId == 1284L) {
-      return "Channel";
-    }
-    if (clusterId == 768L) {
-      return "ColorControl";
-    }
-    if (clusterId == 1290L) {
-      return "ContentLauncher";
-    }
-    if (clusterId == 29L) {
-      return "Descriptor";
+    if (clusterId == 40L) {
+      return "Basic";
     }
-    if (clusterId == 50L) {
-      return "DiagnosticLogs";
+    if (clusterId == 41L) {
+      return "OtaSoftwareUpdateProvider";
     }
-    if (clusterId == 257L) {
-      return "DoorLock";
+    if (clusterId == 42L) {
+      return "OtaSoftwareUpdateRequestor";
     }
-    if (clusterId == 2820L) {
-      return "ElectricalMeasurement";
+    if (clusterId == 43L) {
+      return "LocalizationConfiguration";
     }
-    if (clusterId == 55L) {
-      return "EthernetNetworkDiagnostics";
+    if (clusterId == 44L) {
+      return "TimeFormatLocalization";
     }
-    if (clusterId == 514L) {
-      return "FanControl";
+    if (clusterId == 45L) {
+      return "UnitLocalization";
     }
-    if (clusterId == 64L) {
-      return "FixedLabel";
+    if (clusterId == 46L) {
+      return "PowerSourceConfiguration";
     }
-    if (clusterId == 1028L) {
-      return "FlowMeasurement";
+    if (clusterId == 47L) {
+      return "PowerSource";
     }
     if (clusterId == 48L) {
       return "GeneralCommissioning";
     }
+    if (clusterId == 49L) {
+      return "NetworkCommissioning";
+    }
+    if (clusterId == 50L) {
+      return "DiagnosticLogs";
+    }
     if (clusterId == 51L) {
       return "GeneralDiagnostics";
     }
-    if (clusterId == 63L) {
-      return "GroupKeyManagement";
+    if (clusterId == 52L) {
+      return "SoftwareDiagnostics";
     }
-    if (clusterId == 4L) {
-      return "Groups";
+    if (clusterId == 53L) {
+      return "ThreadNetworkDiagnostics";
     }
-    if (clusterId == 3L) {
-      return "Identify";
+    if (clusterId == 54L) {
+      return "WiFiNetworkDiagnostics";
     }
-    if (clusterId == 1024L) {
-      return "IlluminanceMeasurement";
+    if (clusterId == 55L) {
+      return "EthernetNetworkDiagnostics";
     }
-    if (clusterId == 1289L) {
-      return "KeypadInput";
+    if (clusterId == 57L) {
+      return "BridgedDeviceBasic";
     }
-    if (clusterId == 8L) {
-      return "LevelControl";
+    if (clusterId == 59L) {
+      return "Switch";
     }
-    if (clusterId == 43L) {
-      return "LocalizationConfiguration";
+    if (clusterId == 60L) {
+      return "AdministratorCommissioning";
     }
-    if (clusterId == 1288L) {
-      return "LowPower";
+    if (clusterId == 62L) {
+      return "OperationalCredentials";
     }
-    if (clusterId == 1287L) {
-      return "MediaInput";
+    if (clusterId == 63L) {
+      return "GroupKeyManagement";
     }
-    if (clusterId == 1286L) {
-      return "MediaPlayback";
+    if (clusterId == 64L) {
+      return "FixedLabel";
+    }
+    if (clusterId == 65L) {
+      return "UserLabel";
+    }
+    if (clusterId == 69L) {
+      return "BooleanState";
     }
     if (clusterId == 80L) {
       return "ModeSelect";
     }
-    if (clusterId == 49L) {
-      return "NetworkCommissioning";
+    if (clusterId == 257L) {
+      return "DoorLock";
     }
-    if (clusterId == 41L) {
-      return "OtaSoftwareUpdateProvider";
+    if (clusterId == 258L) {
+      return "WindowCovering";
     }
-    if (clusterId == 42L) {
-      return "OtaSoftwareUpdateRequestor";
+    if (clusterId == 259L) {
+      return "BarrierControl";
     }
-    if (clusterId == 1030L) {
-      return "OccupancySensing";
+    if (clusterId == 512L) {
+      return "PumpConfigurationAndControl";
     }
-    if (clusterId == 6L) {
-      return "OnOff";
+    if (clusterId == 513L) {
+      return "Thermostat";
     }
-    if (clusterId == 7L) {
-      return "OnOffSwitchConfiguration";
+    if (clusterId == 514L) {
+      return "FanControl";
     }
-    if (clusterId == 62L) {
-      return "OperationalCredentials";
+    if (clusterId == 516L) {
+      return "ThermostatUserInterfaceConfiguration";
     }
-    if (clusterId == 47L) {
-      return "PowerSource";
+    if (clusterId == 768L) {
+      return "ColorControl";
     }
-    if (clusterId == 46L) {
-      return "PowerSourceConfiguration";
+    if (clusterId == 1024L) {
+      return "IlluminanceMeasurement";
+    }
+    if (clusterId == 1026L) {
+      return "TemperatureMeasurement";
     }
     if (clusterId == 1027L) {
       return "PressureMeasurement";
     }
-    if (clusterId == 512L) {
-      return "PumpConfigurationAndControl";
+    if (clusterId == 1028L) {
+      return "FlowMeasurement";
     }
     if (clusterId == 1029L) {
       return "RelativeHumidityMeasurement";
     }
-    if (clusterId == 5L) {
-      return "Scenes";
+    if (clusterId == 1030L) {
+      return "OccupancySensing";
     }
-    if (clusterId == 52L) {
-      return "SoftwareDiagnostics";
+    if (clusterId == 1283L) {
+      return "WakeOnLan";
     }
-    if (clusterId == 59L) {
-      return "Switch";
+    if (clusterId == 1284L) {
+      return "Channel";
     }
     if (clusterId == 1285L) {
       return "TargetNavigator";
     }
-    if (clusterId == 1026L) {
-      return "TemperatureMeasurement";
+    if (clusterId == 1286L) {
+      return "MediaPlayback";
     }
-    if (clusterId == 4294048773L) {
-      return "TestCluster";
+    if (clusterId == 1287L) {
+      return "MediaInput";
     }
-    if (clusterId == 513L) {
-      return "Thermostat";
+    if (clusterId == 1288L) {
+      return "LowPower";
     }
-    if (clusterId == 516L) {
-      return "ThermostatUserInterfaceConfiguration";
+    if (clusterId == 1289L) {
+      return "KeypadInput";
     }
-    if (clusterId == 53L) {
-      return "ThreadNetworkDiagnostics";
+    if (clusterId == 1290L) {
+      return "ContentLauncher";
     }
-    if (clusterId == 44L) {
-      return "TimeFormatLocalization";
+    if (clusterId == 1291L) {
+      return "AudioOutput";
     }
-    if (clusterId == 45L) {
-      return "UnitLocalization";
+    if (clusterId == 1292L) {
+      return "ApplicationLauncher";
     }
-    if (clusterId == 65L) {
-      return "UserLabel";
+    if (clusterId == 1293L) {
+      return "ApplicationBasic";
     }
-    if (clusterId == 1283L) {
-      return "WakeOnLan";
+    if (clusterId == 1294L) {
+      return "AccountLogin";
     }
-    if (clusterId == 54L) {
-      return "WiFiNetworkDiagnostics";
+    if (clusterId == 2820L) {
+      return "ElectricalMeasurement";
     }
-    if (clusterId == 258L) {
-      return "WindowCovering";
+    if (clusterId == 4294048773L) {
+      return "TestCluster";
     }
     return "";
   }
@@ -225,21 +225,12 @@ public static String clusterIdToName(long clusterId) {
    * IDs are found, returns an empty string.
    */
   public static String attributeIdToName(long clusterId, long attributeId) {
-    if (clusterId == 31L) {
+    if (clusterId == 3L) {
       if (attributeId == 0L) {
-        return "Acl";
+        return "IdentifyTime";
       }
       if (attributeId == 1L) {
-        return "Extension";
-      }
-      if (attributeId == 2L) {
-        return "SubjectsPerAccessControlEntry";
-      }
-      if (attributeId == 3L) {
-        return "TargetsPerAccessControlEntry";
-      }
-      if (attributeId == 4L) {
-        return "AccessControlEntriesPerFabric";
+        return "IdentifyType";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -258,7 +249,10 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 1294L) {
+    if (clusterId == 4L) {
+      if (attributeId == 0L) {
+        return "NameSupport";
+      }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
       }
@@ -276,57 +270,21 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 60L) {
+    if (clusterId == 5L) {
       if (attributeId == 0L) {
-        return "WindowStatus";
+        return "SceneCount";
       }
       if (attributeId == 1L) {
-        return "AdminFabricIndex";
-      }
-      if (attributeId == 2L) {
-        return "AdminVendorId";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 1293L) {
-      if (attributeId == 0L) {
-        return "VendorName";
-      }
-      if (attributeId == 1L) {
-        return "VendorID";
+        return "CurrentScene";
       }
       if (attributeId == 2L) {
-        return "ApplicationName";
+        return "CurrentGroup";
       }
       if (attributeId == 3L) {
-        return "ProductID";
+        return "SceneValid";
       }
       if (attributeId == 4L) {
-        return "Application";
-      }
-      if (attributeId == 5L) {
-        return "Status";
-      }
-      if (attributeId == 6L) {
-        return "ApplicationVersion";
-      }
-      if (attributeId == 7L) {
-        return "AllowedVendorList";
+        return "NameSupport";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -345,36 +303,21 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 1292L) {
+    if (clusterId == 6L) {
       if (attributeId == 0L) {
-        return "CatalogList";
-      }
-      if (attributeId == 1L) {
-        return "CurrentApp";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
+        return "OnOff";
       }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
+      if (attributeId == 16384L) {
+        return "GlobalSceneControl";
       }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
+      if (attributeId == 16385L) {
+        return "OnTime";
       }
-      return "";
-    }
-    if (clusterId == 1291L) {
-      if (attributeId == 0L) {
-        return "OutputList";
+      if (attributeId == 16386L) {
+        return "OffWaitTime";
       }
-      if (attributeId == 1L) {
-        return "CurrentOutput";
+      if (attributeId == 16387L) {
+        return "StartUpOnOff";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -393,18 +336,12 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 259L) {
-      if (attributeId == 1L) {
-        return "BarrierMovingState";
-      }
-      if (attributeId == 2L) {
-        return "BarrierSafetyStatus";
-      }
-      if (attributeId == 3L) {
-        return "BarrierCapabilities";
+    if (clusterId == 7L) {
+      if (attributeId == 0L) {
+        return "SwitchType";
       }
-      if (attributeId == 10L) {
-        return "BarrierPosition";
+      if (attributeId == 16L) {
+        return "SwitchActions";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -423,66 +360,48 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 40L) {
+    if (clusterId == 8L) {
       if (attributeId == 0L) {
-        return "DataModelRevision";
+        return "CurrentLevel";
       }
       if (attributeId == 1L) {
-        return "VendorName";
+        return "RemainingTime";
       }
       if (attributeId == 2L) {
-        return "VendorID";
+        return "MinLevel";
       }
       if (attributeId == 3L) {
-        return "ProductName";
+        return "MaxLevel";
       }
       if (attributeId == 4L) {
-        return "ProductID";
+        return "CurrentFrequency";
       }
       if (attributeId == 5L) {
-        return "NodeLabel";
+        return "MinFrequency";
       }
       if (attributeId == 6L) {
-        return "Location";
-      }
-      if (attributeId == 7L) {
-        return "HardwareVersion";
-      }
-      if (attributeId == 8L) {
-        return "HardwareVersionString";
-      }
-      if (attributeId == 9L) {
-        return "SoftwareVersion";
-      }
-      if (attributeId == 10L) {
-        return "SoftwareVersionString";
-      }
-      if (attributeId == 11L) {
-        return "ManufacturingDate";
-      }
-      if (attributeId == 12L) {
-        return "PartNumber";
-      }
-      if (attributeId == 13L) {
-        return "ProductURL";
-      }
-      if (attributeId == 14L) {
-        return "ProductLabel";
+        return "MaxFrequency";
       }
       if (attributeId == 15L) {
-        return "SerialNumber";
+        return "Options";
       }
       if (attributeId == 16L) {
-        return "LocalConfigDisabled";
+        return "OnOffTransitionTime";
       }
       if (attributeId == 17L) {
-        return "Reachable";
+        return "OnLevel";
       }
       if (attributeId == 18L) {
-        return "UniqueID";
+        return "OnTransitionTime";
       }
       if (attributeId == 19L) {
-        return "CapabilityMinima";
+        return "OffTransitionTime";
+      }
+      if (attributeId == 20L) {
+        return "DefaultMoveRate";
+      }
+      if (attributeId == 16384L) {
+        return "StartUpCurrentLevel";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -528,6 +447,36 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
+    if (clusterId == 29L) {
+      if (attributeId == 0L) {
+        return "DeviceList";
+      }
+      if (attributeId == 1L) {
+        return "ServerList";
+      }
+      if (attributeId == 2L) {
+        return "ClientList";
+      }
+      if (attributeId == 3L) {
+        return "PartsList";
+      }
+      if (attributeId == 65528L) {
+        return "GeneratedCommandList";
+      }
+      if (attributeId == 65529L) {
+        return "AcceptedCommandList";
+      }
+      if (attributeId == 65531L) {
+        return "AttributeList";
+      }
+      if (attributeId == 65532L) {
+        return "FeatureMap";
+      }
+      if (attributeId == 65533L) {
+        return "ClusterRevision";
+      }
+      return "";
+    }
     if (clusterId == 30L) {
       if (attributeId == 0L) {
         return "Binding";
@@ -549,9 +498,21 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 69L) {
+    if (clusterId == 31L) {
       if (attributeId == 0L) {
-        return "StateValue";
+        return "Acl";
+      }
+      if (attributeId == 1L) {
+        return "Extension";
+      }
+      if (attributeId == 2L) {
+        return "SubjectsPerAccessControlEntry";
+      }
+      if (attributeId == 3L) {
+        return "TargetsPerAccessControlEntry";
+      }
+      if (attributeId == 4L) {
+        return "AccessControlEntriesPerFabric";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -597,7 +558,10 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 57L) {
+    if (clusterId == 40L) {
+      if (attributeId == 0L) {
+        return "DataModelRevision";
+      }
       if (attributeId == 1L) {
         return "VendorName";
       }
@@ -607,9 +571,15 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       if (attributeId == 3L) {
         return "ProductName";
       }
+      if (attributeId == 4L) {
+        return "ProductID";
+      }
       if (attributeId == 5L) {
         return "NodeLabel";
       }
+      if (attributeId == 6L) {
+        return "Location";
+      }
       if (attributeId == 7L) {
         return "HardwareVersion";
       }
@@ -637,12 +607,18 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       if (attributeId == 15L) {
         return "SerialNumber";
       }
+      if (attributeId == 16L) {
+        return "LocalConfigDisabled";
+      }
       if (attributeId == 17L) {
         return "Reachable";
       }
       if (attributeId == 18L) {
         return "UniqueID";
       }
+      if (attributeId == 19L) {
+        return "CapabilityMinima";
+      }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
       }
@@ -660,21 +636,30 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 1284L) {
+    if (clusterId == 41L) {
+      if (attributeId == 65531L) {
+        return "AttributeList";
+      }
+      if (attributeId == 65532L) {
+        return "FeatureMap";
+      }
+      if (attributeId == 65533L) {
+        return "ClusterRevision";
+      }
+      return "";
+    }
+    if (clusterId == 42L) {
       if (attributeId == 0L) {
-        return "ChannelList";
+        return "DefaultOtaProviders";
       }
       if (attributeId == 1L) {
-        return "Lineup";
+        return "UpdatePossible";
       }
       if (attributeId == 2L) {
-        return "CurrentChannel";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
+        return "UpdateState";
       }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
+      if (attributeId == 3L) {
+        return "UpdateStateProgress";
       }
       if (attributeId == 65531L) {
         return "AttributeList";
@@ -687,162 +672,180 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 768L) {
+    if (clusterId == 43L) {
       if (attributeId == 0L) {
-        return "CurrentHue";
+        return "ActiveLocale";
       }
       if (attributeId == 1L) {
-        return "CurrentSaturation";
+        return "SupportedLocales";
       }
-      if (attributeId == 2L) {
-        return "RemainingTime";
+      if (attributeId == 65528L) {
+        return "GeneratedCommandList";
       }
-      if (attributeId == 3L) {
-        return "CurrentX";
+      if (attributeId == 65529L) {
+        return "AcceptedCommandList";
       }
-      if (attributeId == 4L) {
-        return "CurrentY";
+      if (attributeId == 65532L) {
+        return "FeatureMap";
       }
-      if (attributeId == 5L) {
-        return "DriftCompensation";
+      if (attributeId == 65533L) {
+        return "ClusterRevision";
       }
-      if (attributeId == 6L) {
-        return "CompensationText";
+      return "";
+    }
+    if (clusterId == 44L) {
+      if (attributeId == 0L) {
+        return "HourFormat";
       }
-      if (attributeId == 7L) {
-        return "ColorTemperature";
+      if (attributeId == 1L) {
+        return "ActiveCalendarType";
       }
-      if (attributeId == 8L) {
-        return "ColorMode";
+      if (attributeId == 2L) {
+        return "SupportedCalendarTypes";
       }
-      if (attributeId == 15L) {
-        return "Options";
+      if (attributeId == 65528L) {
+        return "GeneratedCommandList";
       }
-      if (attributeId == 16L) {
-        return "NumberOfPrimaries";
+      if (attributeId == 65529L) {
+        return "AcceptedCommandList";
       }
-      if (attributeId == 17L) {
-        return "Primary1X";
+      if (attributeId == 65532L) {
+        return "FeatureMap";
       }
-      if (attributeId == 18L) {
-        return "Primary1Y";
+      if (attributeId == 65533L) {
+        return "ClusterRevision";
       }
-      if (attributeId == 19L) {
-        return "Primary1Intensity";
+      return "";
+    }
+    if (clusterId == 45L) {
+      if (attributeId == 0L) {
+        return "TemperatureUnit";
       }
-      if (attributeId == 21L) {
-        return "Primary2X";
+      if (attributeId == 65531L) {
+        return "AttributeList";
       }
-      if (attributeId == 22L) {
-        return "Primary2Y";
+      if (attributeId == 65532L) {
+        return "FeatureMap";
       }
-      if (attributeId == 23L) {
-        return "Primary2Intensity";
+      if (attributeId == 65533L) {
+        return "ClusterRevision";
       }
-      if (attributeId == 25L) {
-        return "Primary3X";
+      return "";
+    }
+    if (clusterId == 46L) {
+      if (attributeId == 0L) {
+        return "Sources";
       }
-      if (attributeId == 26L) {
-        return "Primary3Y";
+      if (attributeId == 65528L) {
+        return "GeneratedCommandList";
       }
-      if (attributeId == 27L) {
-        return "Primary3Intensity";
+      if (attributeId == 65529L) {
+        return "AcceptedCommandList";
       }
-      if (attributeId == 32L) {
-        return "Primary4X";
+      if (attributeId == 65531L) {
+        return "AttributeList";
       }
-      if (attributeId == 33L) {
-        return "Primary4Y";
+      if (attributeId == 65532L) {
+        return "FeatureMap";
       }
-      if (attributeId == 34L) {
-        return "Primary4Intensity";
+      if (attributeId == 65533L) {
+        return "ClusterRevision";
       }
-      if (attributeId == 36L) {
-        return "Primary5X";
+      return "";
+    }
+    if (clusterId == 47L) {
+      if (attributeId == 0L) {
+        return "Status";
       }
-      if (attributeId == 37L) {
-        return "Primary5Y";
+      if (attributeId == 1L) {
+        return "Order";
       }
-      if (attributeId == 38L) {
-        return "Primary5Intensity";
+      if (attributeId == 2L) {
+        return "Description";
       }
-      if (attributeId == 40L) {
-        return "Primary6X";
+      if (attributeId == 3L) {
+        return "WiredAssessedInputVoltage";
       }
-      if (attributeId == 41L) {
-        return "Primary6Y";
+      if (attributeId == 4L) {
+        return "WiredAssessedInputFrequency";
       }
-      if (attributeId == 42L) {
-        return "Primary6Intensity";
+      if (attributeId == 5L) {
+        return "WiredCurrentType";
       }
-      if (attributeId == 48L) {
-        return "WhitePointX";
+      if (attributeId == 6L) {
+        return "WiredAssessedCurrent";
       }
-      if (attributeId == 49L) {
-        return "WhitePointY";
+      if (attributeId == 7L) {
+        return "WiredNominalVoltage";
       }
-      if (attributeId == 50L) {
-        return "ColorPointRX";
+      if (attributeId == 8L) {
+        return "WiredMaximumCurrent";
       }
-      if (attributeId == 51L) {
-        return "ColorPointRY";
+      if (attributeId == 9L) {
+        return "WiredPresent";
       }
-      if (attributeId == 52L) {
-        return "ColorPointRIntensity";
+      if (attributeId == 10L) {
+        return "ActiveWiredFaults";
       }
-      if (attributeId == 54L) {
-        return "ColorPointGX";
+      if (attributeId == 11L) {
+        return "BatteryVoltage";
       }
-      if (attributeId == 55L) {
-        return "ColorPointGY";
+      if (attributeId == 12L) {
+        return "BatteryPercentRemaining";
       }
-      if (attributeId == 56L) {
-        return "ColorPointGIntensity";
+      if (attributeId == 13L) {
+        return "BatteryTimeRemaining";
       }
-      if (attributeId == 58L) {
-        return "ColorPointBX";
+      if (attributeId == 14L) {
+        return "BatteryChargeLevel";
       }
-      if (attributeId == 59L) {
-        return "ColorPointBY";
+      if (attributeId == 15L) {
+        return "BatteryReplacementNeeded";
       }
-      if (attributeId == 60L) {
-        return "ColorPointBIntensity";
+      if (attributeId == 16L) {
+        return "BatteryReplaceability";
       }
-      if (attributeId == 16384L) {
-        return "EnhancedCurrentHue";
+      if (attributeId == 17L) {
+        return "BatteryPresent";
       }
-      if (attributeId == 16385L) {
-        return "EnhancedColorMode";
+      if (attributeId == 18L) {
+        return "ActiveBatteryFaults";
       }
-      if (attributeId == 16386L) {
-        return "ColorLoopActive";
+      if (attributeId == 19L) {
+        return "BatteryReplacementDescription";
       }
-      if (attributeId == 16387L) {
-        return "ColorLoopDirection";
+      if (attributeId == 20L) {
+        return "BatteryCommonDesignation";
       }
-      if (attributeId == 16388L) {
-        return "ColorLoopTime";
+      if (attributeId == 21L) {
+        return "BatteryANSIDesignation";
       }
-      if (attributeId == 16389L) {
-        return "ColorLoopStartEnhancedHue";
+      if (attributeId == 22L) {
+        return "BatteryIECDesignation";
       }
-      if (attributeId == 16390L) {
-        return "ColorLoopStoredEnhancedHue";
+      if (attributeId == 23L) {
+        return "BatteryApprovedChemistry";
       }
-      if (attributeId == 16394L) {
-        return "ColorCapabilities";
+      if (attributeId == 24L) {
+        return "BatteryCapacity";
       }
-      if (attributeId == 16395L) {
-        return "ColorTempPhysicalMinMireds";
+      if (attributeId == 25L) {
+        return "BatteryQuantity";
       }
-      if (attributeId == 16396L) {
-        return "ColorTempPhysicalMaxMireds";
+      if (attributeId == 26L) {
+        return "BatteryChargeState";
       }
-      if (attributeId == 16397L) {
-        return "CoupleColorTempToLevelMinMireds";
+      if (attributeId == 27L) {
+        return "BatteryTimeToFullCharge";
       }
-      if (attributeId == 16400L) {
-        return "StartUpColorTemperatureMireds";
+      if (attributeId == 28L) {
+        return "BatteryFunctionalWhileCharging";
+      }
+      if (attributeId == 29L) {
+        return "BatteryChargingCurrent";
+      }
+      if (attributeId == 30L) {
+        return "ActiveBatteryChargeFaults";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -861,12 +864,21 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 1290L) {
+    if (clusterId == 48L) {
       if (attributeId == 0L) {
-        return "AcceptHeader";
+        return "Breadcrumb";
       }
       if (attributeId == 1L) {
-        return "SupportedStreamingProtocols";
+        return "BasicCommissioningInfo";
+      }
+      if (attributeId == 2L) {
+        return "RegulatoryConfig";
+      }
+      if (attributeId == 3L) {
+        return "LocationCapability";
+      }
+      if (attributeId == 4L) {
+        return "SupportsConcurrentConnection";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -885,18 +897,30 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 29L) {
+    if (clusterId == 49L) {
       if (attributeId == 0L) {
-        return "DeviceList";
+        return "MaxNetworks";
       }
       if (attributeId == 1L) {
-        return "ServerList";
+        return "Networks";
       }
       if (attributeId == 2L) {
-        return "ClientList";
+        return "ScanMaxTimeSeconds";
       }
       if (attributeId == 3L) {
-        return "PartsList";
+        return "ConnectMaxTimeSeconds";
+      }
+      if (attributeId == 4L) {
+        return "InterfaceEnabled";
+      }
+      if (attributeId == 5L) {
+        return "LastNetworkingStatus";
+      }
+      if (attributeId == 6L) {
+        return "LastNetworkID";
+      }
+      if (attributeId == 7L) {
+        return "LastConnectErrorValue";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -904,9 +928,6 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       if (attributeId == 65529L) {
         return "AcceptedCommandList";
       }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
       if (attributeId == 65532L) {
         return "FeatureMap";
       }
@@ -933,81 +954,33 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 257L) {
+    if (clusterId == 51L) {
       if (attributeId == 0L) {
-        return "LockState";
+        return "NetworkInterfaces";
       }
       if (attributeId == 1L) {
-        return "LockType";
+        return "RebootCount";
       }
       if (attributeId == 2L) {
-        return "ActuatorEnabled";
+        return "UpTime";
       }
       if (attributeId == 3L) {
-        return "DoorState";
-      }
-      if (attributeId == 17L) {
-        return "NumberOfTotalUsersSupported";
-      }
-      if (attributeId == 18L) {
-        return "NumberOfPINUsersSupported";
-      }
-      if (attributeId == 19L) {
-        return "NumberOfRFIDUsersSupported";
-      }
-      if (attributeId == 20L) {
-        return "NumberOfWeekDaySchedulesSupportedPerUser";
-      }
-      if (attributeId == 21L) {
-        return "NumberOfYearDaySchedulesSupportedPerUser";
-      }
-      if (attributeId == 22L) {
-        return "NumberOfHolidaySchedulesSupported";
-      }
-      if (attributeId == 23L) {
-        return "MaxPINCodeLength";
-      }
-      if (attributeId == 24L) {
-        return "MinPINCodeLength";
-      }
-      if (attributeId == 25L) {
-        return "MaxRFIDCodeLength";
-      }
-      if (attributeId == 26L) {
-        return "MinRFIDCodeLength";
-      }
-      if (attributeId == 28L) {
-        return "NumberOfCredentialsSupportedPerUser";
-      }
-      if (attributeId == 33L) {
-        return "Language";
-      }
-      if (attributeId == 35L) {
-        return "AutoRelockTime";
-      }
-      if (attributeId == 36L) {
-        return "SoundVolume";
-      }
-      if (attributeId == 37L) {
-        return "OperatingMode";
-      }
-      if (attributeId == 38L) {
-        return "SupportedOperatingModes";
+        return "TotalOperationalHours";
       }
-      if (attributeId == 41L) {
-        return "EnableOneTouchLocking";
+      if (attributeId == 4L) {
+        return "BootReasons";
       }
-      if (attributeId == 43L) {
-        return "EnablePrivacyModeButton";
+      if (attributeId == 5L) {
+        return "ActiveHardwareFaults";
       }
-      if (attributeId == 48L) {
-        return "WrongCodeEntryLimit";
+      if (attributeId == 6L) {
+        return "ActiveRadioFaults";
       }
-      if (attributeId == 49L) {
-        return "UserCodeTemporaryDisableTime";
+      if (attributeId == 7L) {
+        return "ActiveNetworkFaults";
       }
-      if (attributeId == 51L) {
-        return "RequirePINforRemoteOperation";
+      if (attributeId == 8L) {
+        return "TestEventTriggersEnabled";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -1026,39 +999,18 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 2820L) {
+    if (clusterId == 52L) {
       if (attributeId == 0L) {
-        return "MeasurementType";
-      }
-      if (attributeId == 772L) {
-        return "TotalActivePower";
-      }
-      if (attributeId == 1285L) {
-        return "RmsVoltage";
-      }
-      if (attributeId == 1286L) {
-        return "RmsVoltageMin";
-      }
-      if (attributeId == 1287L) {
-        return "RmsVoltageMax";
-      }
-      if (attributeId == 1288L) {
-        return "RmsCurrent";
-      }
-      if (attributeId == 1289L) {
-        return "RmsCurrentMin";
-      }
-      if (attributeId == 1290L) {
-        return "RmsCurrentMax";
+        return "ThreadMetrics";
       }
-      if (attributeId == 1291L) {
-        return "ActivePower";
+      if (attributeId == 1L) {
+        return "CurrentHeapFree";
       }
-      if (attributeId == 1292L) {
-        return "ActivePowerMin";
+      if (attributeId == 2L) {
+        return "CurrentHeapUsed";
       }
-      if (attributeId == 1293L) {
-        return "ActivePowerMax";
+      if (attributeId == 3L) {
+        return "CurrentHeapHighWatermark";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -1077,135 +1029,195 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 55L) {
+    if (clusterId == 53L) {
       if (attributeId == 0L) {
-        return "PHYRate";
+        return "Channel";
       }
       if (attributeId == 1L) {
-        return "FullDuplex";
+        return "RoutingRole";
       }
       if (attributeId == 2L) {
-        return "PacketRxCount";
+        return "NetworkName";
       }
       if (attributeId == 3L) {
-        return "PacketTxCount";
+        return "PanId";
       }
       if (attributeId == 4L) {
-        return "TxErrCount";
+        return "ExtendedPanId";
       }
       if (attributeId == 5L) {
-        return "CollisionCount";
+        return "MeshLocalPrefix";
       }
       if (attributeId == 6L) {
         return "OverrunCount";
       }
       if (attributeId == 7L) {
-        return "CarrierDetect";
+        return "NeighborTableList";
       }
       if (attributeId == 8L) {
-        return "TimeSinceReset";
+        return "RouteTableList";
       }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
+      if (attributeId == 9L) {
+        return "PartitionId";
       }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
+      if (attributeId == 10L) {
+        return "Weighting";
       }
-      if (attributeId == 65531L) {
-        return "AttributeList";
+      if (attributeId == 11L) {
+        return "DataVersion";
       }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
+      if (attributeId == 12L) {
+        return "StableDataVersion";
       }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
+      if (attributeId == 13L) {
+        return "LeaderRouterId";
       }
-      return "";
-    }
-    if (clusterId == 514L) {
-      if (attributeId == 0L) {
-        return "FanMode";
+      if (attributeId == 14L) {
+        return "DetachedRoleCount";
       }
-      if (attributeId == 1L) {
-        return "FanModeSequence";
+      if (attributeId == 15L) {
+        return "ChildRoleCount";
       }
-      if (attributeId == 2L) {
-        return "PercentSetting";
+      if (attributeId == 16L) {
+        return "RouterRoleCount";
       }
-      if (attributeId == 3L) {
-        return "PercentCurrent";
+      if (attributeId == 17L) {
+        return "LeaderRoleCount";
       }
-      if (attributeId == 4L) {
-        return "SpeedMax";
+      if (attributeId == 18L) {
+        return "AttachAttemptCount";
       }
-      if (attributeId == 5L) {
-        return "SpeedSetting";
+      if (attributeId == 19L) {
+        return "PartitionIdChangeCount";
       }
-      if (attributeId == 6L) {
-        return "SpeedCurrent";
+      if (attributeId == 20L) {
+        return "BetterPartitionAttachAttemptCount";
       }
-      if (attributeId == 7L) {
-        return "RockSupport";
+      if (attributeId == 21L) {
+        return "ParentChangeCount";
       }
-      if (attributeId == 8L) {
-        return "RockSetting";
+      if (attributeId == 22L) {
+        return "TxTotalCount";
       }
-      if (attributeId == 9L) {
-        return "WindSupport";
+      if (attributeId == 23L) {
+        return "TxUnicastCount";
       }
-      if (attributeId == 10L) {
-        return "WindSetting";
+      if (attributeId == 24L) {
+        return "TxBroadcastCount";
       }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
+      if (attributeId == 25L) {
+        return "TxAckRequestedCount";
       }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
+      if (attributeId == 26L) {
+        return "TxAckedCount";
       }
-      if (attributeId == 65531L) {
-        return "AttributeList";
+      if (attributeId == 27L) {
+        return "TxNoAckRequestedCount";
       }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
+      if (attributeId == 28L) {
+        return "TxDataCount";
       }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
+      if (attributeId == 29L) {
+        return "TxDataPollCount";
       }
-      return "";
-    }
-    if (clusterId == 64L) {
-      if (attributeId == 0L) {
-        return "LabelList";
+      if (attributeId == 30L) {
+        return "TxBeaconCount";
       }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
+      if (attributeId == 31L) {
+        return "TxBeaconRequestCount";
       }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
+      if (attributeId == 32L) {
+        return "TxOtherCount";
       }
-      if (attributeId == 65531L) {
-        return "AttributeList";
+      if (attributeId == 33L) {
+        return "TxRetryCount";
       }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
+      if (attributeId == 34L) {
+        return "TxDirectMaxRetryExpiryCount";
       }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
+      if (attributeId == 35L) {
+        return "TxIndirectMaxRetryExpiryCount";
       }
-      return "";
-    }
-    if (clusterId == 1028L) {
-      if (attributeId == 0L) {
-        return "MeasuredValue";
+      if (attributeId == 36L) {
+        return "TxErrCcaCount";
       }
-      if (attributeId == 1L) {
-        return "MinMeasuredValue";
+      if (attributeId == 37L) {
+        return "TxErrAbortCount";
       }
-      if (attributeId == 2L) {
-        return "MaxMeasuredValue";
+      if (attributeId == 38L) {
+        return "TxErrBusyChannelCount";
       }
-      if (attributeId == 3L) {
-        return "Tolerance";
+      if (attributeId == 39L) {
+        return "RxTotalCount";
+      }
+      if (attributeId == 40L) {
+        return "RxUnicastCount";
+      }
+      if (attributeId == 41L) {
+        return "RxBroadcastCount";
+      }
+      if (attributeId == 42L) {
+        return "RxDataCount";
+      }
+      if (attributeId == 43L) {
+        return "RxDataPollCount";
+      }
+      if (attributeId == 44L) {
+        return "RxBeaconCount";
+      }
+      if (attributeId == 45L) {
+        return "RxBeaconRequestCount";
+      }
+      if (attributeId == 46L) {
+        return "RxOtherCount";
+      }
+      if (attributeId == 47L) {
+        return "RxAddressFilteredCount";
+      }
+      if (attributeId == 48L) {
+        return "RxDestAddrFilteredCount";
+      }
+      if (attributeId == 49L) {
+        return "RxDuplicatedCount";
+      }
+      if (attributeId == 50L) {
+        return "RxErrNoFrameCount";
+      }
+      if (attributeId == 51L) {
+        return "RxErrUnknownNeighborCount";
+      }
+      if (attributeId == 52L) {
+        return "RxErrInvalidSrcAddrCount";
+      }
+      if (attributeId == 53L) {
+        return "RxErrSecCount";
+      }
+      if (attributeId == 54L) {
+        return "RxErrFcsCount";
+      }
+      if (attributeId == 55L) {
+        return "RxErrOtherCount";
+      }
+      if (attributeId == 56L) {
+        return "ActiveTimestamp";
+      }
+      if (attributeId == 57L) {
+        return "PendingTimestamp";
+      }
+      if (attributeId == 58L) {
+        return "Delay";
+      }
+      if (attributeId == 59L) {
+        return "SecurityPolicy";
+      }
+      if (attributeId == 60L) {
+        return "ChannelMask";
+      }
+      if (attributeId == 61L) {
+        return "OperationalDatasetComponents";
+      }
+      if (attributeId == 62L) {
+        return "ActiveNetworkFaultsList";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -1224,21 +1236,45 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 48L) {
+    if (clusterId == 54L) {
       if (attributeId == 0L) {
-        return "Breadcrumb";
+        return "Bssid";
       }
       if (attributeId == 1L) {
-        return "BasicCommissioningInfo";
+        return "SecurityType";
       }
       if (attributeId == 2L) {
-        return "RegulatoryConfig";
+        return "WiFiVersion";
       }
       if (attributeId == 3L) {
-        return "LocationCapability";
+        return "ChannelNumber";
       }
       if (attributeId == 4L) {
-        return "SupportsConcurrentConnection";
+        return "Rssi";
+      }
+      if (attributeId == 5L) {
+        return "BeaconLostCount";
+      }
+      if (attributeId == 6L) {
+        return "BeaconRxCount";
+      }
+      if (attributeId == 7L) {
+        return "PacketMulticastRxCount";
+      }
+      if (attributeId == 8L) {
+        return "PacketMulticastTxCount";
+      }
+      if (attributeId == 9L) {
+        return "PacketUnicastRxCount";
+      }
+      if (attributeId == 10L) {
+        return "PacketUnicastTxCount";
+      }
+      if (attributeId == 11L) {
+        return "CurrentMaxRate";
+      }
+      if (attributeId == 12L) {
+        return "OverrunCount";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -1257,33 +1293,33 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 51L) {
+    if (clusterId == 55L) {
       if (attributeId == 0L) {
-        return "NetworkInterfaces";
+        return "PHYRate";
       }
       if (attributeId == 1L) {
-        return "RebootCount";
+        return "FullDuplex";
       }
       if (attributeId == 2L) {
-        return "UpTime";
+        return "PacketRxCount";
       }
       if (attributeId == 3L) {
-        return "TotalOperationalHours";
+        return "PacketTxCount";
       }
       if (attributeId == 4L) {
-        return "BootReasons";
+        return "TxErrCount";
       }
       if (attributeId == 5L) {
-        return "ActiveHardwareFaults";
+        return "CollisionCount";
       }
       if (attributeId == 6L) {
-        return "ActiveRadioFaults";
+        return "OverrunCount";
       }
       if (attributeId == 7L) {
-        return "ActiveNetworkFaults";
+        return "CarrierDetect";
       }
       if (attributeId == 8L) {
-        return "TestEventTriggersEnabled";
+        return "TimeSinceReset";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -1302,18 +1338,51 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 63L) {
-      if (attributeId == 0L) {
-        return "GroupKeyMap";
-      }
+    if (clusterId == 57L) {
       if (attributeId == 1L) {
-        return "GroupTable";
+        return "VendorName";
       }
       if (attributeId == 2L) {
-        return "MaxGroupsPerFabric";
+        return "VendorID";
       }
       if (attributeId == 3L) {
-        return "MaxGroupKeysPerFabric";
+        return "ProductName";
+      }
+      if (attributeId == 5L) {
+        return "NodeLabel";
+      }
+      if (attributeId == 7L) {
+        return "HardwareVersion";
+      }
+      if (attributeId == 8L) {
+        return "HardwareVersionString";
+      }
+      if (attributeId == 9L) {
+        return "SoftwareVersion";
+      }
+      if (attributeId == 10L) {
+        return "SoftwareVersionString";
+      }
+      if (attributeId == 11L) {
+        return "ManufacturingDate";
+      }
+      if (attributeId == 12L) {
+        return "PartNumber";
+      }
+      if (attributeId == 13L) {
+        return "ProductURL";
+      }
+      if (attributeId == 14L) {
+        return "ProductLabel";
+      }
+      if (attributeId == 15L) {
+        return "SerialNumber";
+      }
+      if (attributeId == 17L) {
+        return "Reachable";
+      }
+      if (attributeId == 18L) {
+        return "UniqueID";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -1332,9 +1401,15 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 4L) {
+    if (clusterId == 59L) {
       if (attributeId == 0L) {
-        return "NameSupport";
+        return "NumberOfPositions";
+      }
+      if (attributeId == 1L) {
+        return "CurrentPosition";
+      }
+      if (attributeId == 2L) {
+        return "MultiPressMax";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -1353,12 +1428,15 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 3L) {
+    if (clusterId == 60L) {
       if (attributeId == 0L) {
-        return "IdentifyTime";
+        return "WindowStatus";
       }
       if (attributeId == 1L) {
-        return "IdentifyType";
+        return "AdminFabricIndex";
+      }
+      if (attributeId == 2L) {
+        return "AdminVendorId";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -1377,21 +1455,24 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 1024L) {
+    if (clusterId == 62L) {
       if (attributeId == 0L) {
-        return "MeasuredValue";
+        return "NOCs";
       }
       if (attributeId == 1L) {
-        return "MinMeasuredValue";
+        return "Fabrics";
       }
       if (attributeId == 2L) {
-        return "MaxMeasuredValue";
+        return "SupportedFabrics";
       }
       if (attributeId == 3L) {
-        return "Tolerance";
+        return "CommissionedFabrics";
       }
       if (attributeId == 4L) {
-        return "LightSensorType";
+        return "TrustedRootCertificates";
+      }
+      if (attributeId == 5L) {
+        return "CurrentFabricIndex";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -1410,7 +1491,19 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 1289L) {
+    if (clusterId == 63L) {
+      if (attributeId == 0L) {
+        return "GroupKeyMap";
+      }
+      if (attributeId == 1L) {
+        return "GroupTable";
+      }
+      if (attributeId == 2L) {
+        return "MaxGroupsPerFabric";
+      }
+      if (attributeId == 3L) {
+        return "MaxGroupKeysPerFabric";
+      }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
       }
@@ -1428,48 +1521,30 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 8L) {
+    if (clusterId == 64L) {
       if (attributeId == 0L) {
-        return "CurrentLevel";
+        return "LabelList";
       }
-      if (attributeId == 1L) {
-        return "RemainingTime";
+      if (attributeId == 65528L) {
+        return "GeneratedCommandList";
       }
-      if (attributeId == 2L) {
-        return "MinLevel";
+      if (attributeId == 65529L) {
+        return "AcceptedCommandList";
       }
-      if (attributeId == 3L) {
-        return "MaxLevel";
+      if (attributeId == 65531L) {
+        return "AttributeList";
       }
-      if (attributeId == 4L) {
-        return "CurrentFrequency";
+      if (attributeId == 65532L) {
+        return "FeatureMap";
       }
-      if (attributeId == 5L) {
-        return "MinFrequency";
+      if (attributeId == 65533L) {
+        return "ClusterRevision";
       }
-      if (attributeId == 6L) {
-        return "MaxFrequency";
-      }
-      if (attributeId == 15L) {
-        return "Options";
-      }
-      if (attributeId == 16L) {
-        return "OnOffTransitionTime";
-      }
-      if (attributeId == 17L) {
-        return "OnLevel";
-      }
-      if (attributeId == 18L) {
-        return "OnTransitionTime";
-      }
-      if (attributeId == 19L) {
-        return "OffTransitionTime";
-      }
-      if (attributeId == 20L) {
-        return "DefaultMoveRate";
-      }
-      if (attributeId == 16384L) {
-        return "StartUpCurrentLevel";
+      return "";
+    }
+    if (clusterId == 65L) {
+      if (attributeId == 0L) {
+        return "LabelList";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -1477,9 +1552,6 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       if (attributeId == 65529L) {
         return "AcceptedCommandList";
       }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
       if (attributeId == 65532L) {
         return "FeatureMap";
       }
@@ -1488,28 +1560,10 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 43L) {
+    if (clusterId == 69L) {
       if (attributeId == 0L) {
-        return "ActiveLocale";
-      }
-      if (attributeId == 1L) {
-        return "SupportedLocales";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
+        return "StateValue";
       }
-      return "";
-    }
-    if (clusterId == 1288L) {
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
       }
@@ -1527,12 +1581,24 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 1287L) {
+    if (clusterId == 80L) {
       if (attributeId == 0L) {
-        return "InputList";
+        return "Description";
       }
       if (attributeId == 1L) {
-        return "CurrentInput";
+        return "StandardNamespace";
+      }
+      if (attributeId == 2L) {
+        return "SupportedModes";
+      }
+      if (attributeId == 3L) {
+        return "CurrentMode";
+      }
+      if (attributeId == 4L) {
+        return "StartUpMode";
+      }
+      if (attributeId == 5L) {
+        return "OnMode";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -1551,63 +1617,81 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 1286L) {
+    if (clusterId == 257L) {
       if (attributeId == 0L) {
-        return "CurrentState";
+        return "LockState";
       }
       if (attributeId == 1L) {
-        return "StartTime";
+        return "LockType";
       }
       if (attributeId == 2L) {
-        return "Duration";
+        return "ActuatorEnabled";
       }
       if (attributeId == 3L) {
-        return "SampledPosition";
+        return "DoorState";
       }
-      if (attributeId == 4L) {
-        return "PlaybackSpeed";
+      if (attributeId == 17L) {
+        return "NumberOfTotalUsersSupported";
       }
-      if (attributeId == 5L) {
-        return "SeekRangeEnd";
+      if (attributeId == 18L) {
+        return "NumberOfPINUsersSupported";
       }
-      if (attributeId == 6L) {
-        return "SeekRangeStart";
+      if (attributeId == 19L) {
+        return "NumberOfRFIDUsersSupported";
       }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
+      if (attributeId == 20L) {
+        return "NumberOfWeekDaySchedulesSupportedPerUser";
       }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
+      if (attributeId == 21L) {
+        return "NumberOfYearDaySchedulesSupportedPerUser";
       }
-      if (attributeId == 65531L) {
-        return "AttributeList";
+      if (attributeId == 22L) {
+        return "NumberOfHolidaySchedulesSupported";
       }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
+      if (attributeId == 23L) {
+        return "MaxPINCodeLength";
       }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
+      if (attributeId == 24L) {
+        return "MinPINCodeLength";
       }
-      return "";
-    }
-    if (clusterId == 80L) {
-      if (attributeId == 0L) {
-        return "Description";
+      if (attributeId == 25L) {
+        return "MaxRFIDCodeLength";
       }
-      if (attributeId == 1L) {
-        return "StandardNamespace";
+      if (attributeId == 26L) {
+        return "MinRFIDCodeLength";
       }
-      if (attributeId == 2L) {
-        return "SupportedModes";
+      if (attributeId == 28L) {
+        return "NumberOfCredentialsSupportedPerUser";
       }
-      if (attributeId == 3L) {
-        return "CurrentMode";
+      if (attributeId == 33L) {
+        return "Language";
       }
-      if (attributeId == 4L) {
-        return "StartUpMode";
+      if (attributeId == 35L) {
+        return "AutoRelockTime";
       }
-      if (attributeId == 5L) {
-        return "OnMode";
+      if (attributeId == 36L) {
+        return "SoundVolume";
+      }
+      if (attributeId == 37L) {
+        return "OperatingMode";
+      }
+      if (attributeId == 38L) {
+        return "SupportedOperatingModes";
+      }
+      if (attributeId == 41L) {
+        return "EnableOneTouchLocking";
+      }
+      if (attributeId == 43L) {
+        return "EnablePrivacyModeButton";
+      }
+      if (attributeId == 48L) {
+        return "WrongCodeEntryLimit";
+      }
+      if (attributeId == 49L) {
+        return "UserCodeTemporaryDisableTime";
+      }
+      if (attributeId == 51L) {
+        return "RequirePINforRemoteOperation";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -1626,69 +1710,78 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 49L) {
+    if (clusterId == 258L) {
       if (attributeId == 0L) {
-        return "MaxNetworks";
+        return "Type";
       }
       if (attributeId == 1L) {
-        return "Networks";
+        return "PhysicalClosedLimitLift";
       }
       if (attributeId == 2L) {
-        return "ScanMaxTimeSeconds";
+        return "PhysicalClosedLimitTilt";
       }
       if (attributeId == 3L) {
-        return "ConnectMaxTimeSeconds";
+        return "CurrentPositionLift";
       }
       if (attributeId == 4L) {
-        return "InterfaceEnabled";
+        return "CurrentPositionTilt";
       }
       if (attributeId == 5L) {
-        return "LastNetworkingStatus";
+        return "NumberOfActuationsLift";
       }
       if (attributeId == 6L) {
-        return "LastNetworkID";
+        return "NumberOfActuationsTilt";
       }
       if (attributeId == 7L) {
-        return "LastConnectErrorValue";
+        return "ConfigStatus";
       }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
+      if (attributeId == 8L) {
+        return "CurrentPositionLiftPercentage";
       }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
+      if (attributeId == 9L) {
+        return "CurrentPositionTiltPercentage";
       }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
+      if (attributeId == 10L) {
+        return "OperationalStatus";
       }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
+      if (attributeId == 11L) {
+        return "TargetPositionLiftPercent100ths";
       }
-      return "";
-    }
-    if (clusterId == 41L) {
-      if (attributeId == 65531L) {
-        return "AttributeList";
+      if (attributeId == 12L) {
+        return "TargetPositionTiltPercent100ths";
       }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
+      if (attributeId == 13L) {
+        return "EndProductType";
       }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
+      if (attributeId == 14L) {
+        return "CurrentPositionLiftPercent100ths";
       }
-      return "";
-    }
-    if (clusterId == 42L) {
-      if (attributeId == 0L) {
-        return "DefaultOtaProviders";
+      if (attributeId == 15L) {
+        return "CurrentPositionTiltPercent100ths";
       }
-      if (attributeId == 1L) {
-        return "UpdatePossible";
+      if (attributeId == 16L) {
+        return "InstalledOpenLimitLift";
       }
-      if (attributeId == 2L) {
-        return "UpdateState";
+      if (attributeId == 17L) {
+        return "InstalledClosedLimitLift";
       }
-      if (attributeId == 3L) {
-        return "UpdateStateProgress";
+      if (attributeId == 18L) {
+        return "InstalledOpenLimitTilt";
+      }
+      if (attributeId == 19L) {
+        return "InstalledClosedLimitTilt";
+      }
+      if (attributeId == 23L) {
+        return "Mode";
+      }
+      if (attributeId == 26L) {
+        return "SafetyStatus";
+      }
+      if (attributeId == 65528L) {
+        return "GeneratedCommandList";
+      }
+      if (attributeId == 65529L) {
+        return "AcceptedCommandList";
       }
       if (attributeId == 65531L) {
         return "AttributeList";
@@ -1701,15 +1794,18 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 1030L) {
-      if (attributeId == 0L) {
-        return "Occupancy";
-      }
+    if (clusterId == 259L) {
       if (attributeId == 1L) {
-        return "OccupancySensorType";
+        return "BarrierMovingState";
       }
       if (attributeId == 2L) {
-        return "OccupancySensorTypeBitmap";
+        return "BarrierSafetyStatus";
+      }
+      if (attributeId == 3L) {
+        return "BarrierCapabilities";
+      }
+      if (attributeId == 10L) {
+        return "BarrierPosition";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -1728,81 +1824,75 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 6L) {
+    if (clusterId == 512L) {
       if (attributeId == 0L) {
-        return "OnOff";
+        return "MaxPressure";
       }
-      if (attributeId == 16384L) {
-        return "GlobalSceneControl";
+      if (attributeId == 1L) {
+        return "MaxSpeed";
       }
-      if (attributeId == 16385L) {
-        return "OnTime";
+      if (attributeId == 2L) {
+        return "MaxFlow";
       }
-      if (attributeId == 16386L) {
-        return "OffWaitTime";
+      if (attributeId == 3L) {
+        return "MinConstPressure";
       }
-      if (attributeId == 16387L) {
-        return "StartUpOnOff";
+      if (attributeId == 4L) {
+        return "MaxConstPressure";
       }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
+      if (attributeId == 5L) {
+        return "MinCompPressure";
       }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
+      if (attributeId == 6L) {
+        return "MaxCompPressure";
       }
-      if (attributeId == 65531L) {
-        return "AttributeList";
+      if (attributeId == 7L) {
+        return "MinConstSpeed";
       }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
+      if (attributeId == 8L) {
+        return "MaxConstSpeed";
       }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
+      if (attributeId == 9L) {
+        return "MinConstFlow";
       }
-      return "";
-    }
-    if (clusterId == 7L) {
-      if (attributeId == 0L) {
-        return "SwitchType";
+      if (attributeId == 10L) {
+        return "MaxConstFlow";
       }
-      if (attributeId == 16L) {
-        return "SwitchActions";
+      if (attributeId == 11L) {
+        return "MinConstTemp";
       }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
+      if (attributeId == 12L) {
+        return "MaxConstTemp";
       }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
+      if (attributeId == 16L) {
+        return "PumpStatus";
       }
-      if (attributeId == 65531L) {
-        return "AttributeList";
+      if (attributeId == 17L) {
+        return "EffectiveOperationMode";
       }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
+      if (attributeId == 18L) {
+        return "EffectiveControlMode";
       }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
+      if (attributeId == 19L) {
+        return "Capacity";
       }
-      return "";
-    }
-    if (clusterId == 62L) {
-      if (attributeId == 0L) {
-        return "NOCs";
+      if (attributeId == 20L) {
+        return "Speed";
       }
-      if (attributeId == 1L) {
-        return "Fabrics";
+      if (attributeId == 21L) {
+        return "LifetimeRunningHours";
       }
-      if (attributeId == 2L) {
-        return "SupportedFabrics";
+      if (attributeId == 22L) {
+        return "Power";
       }
-      if (attributeId == 3L) {
-        return "CommissionedFabrics";
+      if (attributeId == 23L) {
+        return "LifetimeEnergyConsumed";
       }
-      if (attributeId == 4L) {
-        return "TrustedRootCertificates";
+      if (attributeId == 32L) {
+        return "OperationMode";
       }
-      if (attributeId == 5L) {
-        return "CurrentFabricIndex";
+      if (attributeId == 33L) {
+        return "ControlMode";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -1821,105 +1911,57 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 47L) {
+    if (clusterId == 513L) {
       if (attributeId == 0L) {
-        return "Status";
-      }
-      if (attributeId == 1L) {
-        return "Order";
-      }
-      if (attributeId == 2L) {
-        return "Description";
+        return "LocalTemperature";
       }
       if (attributeId == 3L) {
-        return "WiredAssessedInputVoltage";
+        return "AbsMinHeatSetpointLimit";
       }
       if (attributeId == 4L) {
-        return "WiredAssessedInputFrequency";
+        return "AbsMaxHeatSetpointLimit";
       }
       if (attributeId == 5L) {
-        return "WiredCurrentType";
+        return "AbsMinCoolSetpointLimit";
       }
       if (attributeId == 6L) {
-        return "WiredAssessedCurrent";
-      }
-      if (attributeId == 7L) {
-        return "WiredNominalVoltage";
-      }
-      if (attributeId == 8L) {
-        return "WiredMaximumCurrent";
-      }
-      if (attributeId == 9L) {
-        return "WiredPresent";
-      }
-      if (attributeId == 10L) {
-        return "ActiveWiredFaults";
-      }
-      if (attributeId == 11L) {
-        return "BatteryVoltage";
-      }
-      if (attributeId == 12L) {
-        return "BatteryPercentRemaining";
-      }
-      if (attributeId == 13L) {
-        return "BatteryTimeRemaining";
-      }
-      if (attributeId == 14L) {
-        return "BatteryChargeLevel";
-      }
-      if (attributeId == 15L) {
-        return "BatteryReplacementNeeded";
-      }
-      if (attributeId == 16L) {
-        return "BatteryReplaceability";
+        return "AbsMaxCoolSetpointLimit";
       }
       if (attributeId == 17L) {
-        return "BatteryPresent";
+        return "OccupiedCoolingSetpoint";
       }
       if (attributeId == 18L) {
-        return "ActiveBatteryFaults";
-      }
-      if (attributeId == 19L) {
-        return "BatteryReplacementDescription";
-      }
-      if (attributeId == 20L) {
-        return "BatteryCommonDesignation";
+        return "OccupiedHeatingSetpoint";
       }
       if (attributeId == 21L) {
-        return "BatteryANSIDesignation";
+        return "MinHeatSetpointLimit";
       }
       if (attributeId == 22L) {
-        return "BatteryIECDesignation";
+        return "MaxHeatSetpointLimit";
       }
       if (attributeId == 23L) {
-        return "BatteryApprovedChemistry";
+        return "MinCoolSetpointLimit";
       }
       if (attributeId == 24L) {
-        return "BatteryCapacity";
+        return "MaxCoolSetpointLimit";
       }
       if (attributeId == 25L) {
-        return "BatteryQuantity";
-      }
-      if (attributeId == 26L) {
-        return "BatteryChargeState";
+        return "MinSetpointDeadBand";
       }
       if (attributeId == 27L) {
-        return "BatteryTimeToFullCharge";
+        return "ControlSequenceOfOperation";
       }
       if (attributeId == 28L) {
-        return "BatteryFunctionalWhileCharging";
-      }
-      if (attributeId == 29L) {
-        return "BatteryChargingCurrent";
+        return "SystemMode";
       }
-      if (attributeId == 30L) {
-        return "ActiveBatteryChargeFaults";
+      if (attributeId == 32L) {
+        return "StartOfWeek";
       }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
+      if (attributeId == 33L) {
+        return "NumberOfWeeklyTransitions";
       }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
+      if (attributeId == 34L) {
+        return "NumberOfDailyTransitions";
       }
       if (attributeId == 65531L) {
         return "AttributeList";
@@ -1932,9 +1974,39 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 46L) {
+    if (clusterId == 514L) {
       if (attributeId == 0L) {
-        return "Sources";
+        return "FanMode";
+      }
+      if (attributeId == 1L) {
+        return "FanModeSequence";
+      }
+      if (attributeId == 2L) {
+        return "PercentSetting";
+      }
+      if (attributeId == 3L) {
+        return "PercentCurrent";
+      }
+      if (attributeId == 4L) {
+        return "SpeedMax";
+      }
+      if (attributeId == 5L) {
+        return "SpeedSetting";
+      }
+      if (attributeId == 6L) {
+        return "SpeedCurrent";
+      }
+      if (attributeId == 7L) {
+        return "RockSupport";
+      }
+      if (attributeId == 8L) {
+        return "RockSetting";
+      }
+      if (attributeId == 9L) {
+        return "WindSupport";
+      }
+      if (attributeId == 10L) {
+        return "WindSetting";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -1953,33 +2025,21 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 1027L) {
+    if (clusterId == 516L) {
       if (attributeId == 0L) {
-        return "MeasuredValue";
+        return "TemperatureDisplayMode";
       }
       if (attributeId == 1L) {
-        return "MinMeasuredValue";
+        return "KeypadLockout";
       }
       if (attributeId == 2L) {
-        return "MaxMeasuredValue";
-      }
-      if (attributeId == 3L) {
-        return "Tolerance";
-      }
-      if (attributeId == 16L) {
-        return "ScaledValue";
-      }
-      if (attributeId == 17L) {
-        return "MinScaledValue";
-      }
-      if (attributeId == 18L) {
-        return "MaxScaledValue";
+        return "ScheduleProgrammingVisibility";
       }
-      if (attributeId == 19L) {
-        return "ScaledTolerance";
+      if (attributeId == 65528L) {
+        return "GeneratedCommandList";
       }
-      if (attributeId == 20L) {
-        return "Scale";
+      if (attributeId == 65529L) {
+        return "AcceptedCommandList";
       }
       if (attributeId == 65531L) {
         return "AttributeList";
@@ -1992,75 +2052,162 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 512L) {
+    if (clusterId == 768L) {
       if (attributeId == 0L) {
-        return "MaxPressure";
+        return "CurrentHue";
       }
       if (attributeId == 1L) {
-        return "MaxSpeed";
+        return "CurrentSaturation";
       }
       if (attributeId == 2L) {
-        return "MaxFlow";
+        return "RemainingTime";
       }
       if (attributeId == 3L) {
-        return "MinConstPressure";
+        return "CurrentX";
       }
       if (attributeId == 4L) {
-        return "MaxConstPressure";
+        return "CurrentY";
       }
       if (attributeId == 5L) {
-        return "MinCompPressure";
+        return "DriftCompensation";
       }
       if (attributeId == 6L) {
-        return "MaxCompPressure";
+        return "CompensationText";
       }
       if (attributeId == 7L) {
-        return "MinConstSpeed";
+        return "ColorTemperature";
       }
       if (attributeId == 8L) {
-        return "MaxConstSpeed";
-      }
-      if (attributeId == 9L) {
-        return "MinConstFlow";
-      }
-      if (attributeId == 10L) {
-        return "MaxConstFlow";
-      }
-      if (attributeId == 11L) {
-        return "MinConstTemp";
+        return "ColorMode";
       }
-      if (attributeId == 12L) {
-        return "MaxConstTemp";
+      if (attributeId == 15L) {
+        return "Options";
       }
       if (attributeId == 16L) {
-        return "PumpStatus";
+        return "NumberOfPrimaries";
       }
       if (attributeId == 17L) {
-        return "EffectiveOperationMode";
+        return "Primary1X";
       }
       if (attributeId == 18L) {
-        return "EffectiveControlMode";
+        return "Primary1Y";
       }
       if (attributeId == 19L) {
-        return "Capacity";
-      }
-      if (attributeId == 20L) {
-        return "Speed";
+        return "Primary1Intensity";
       }
       if (attributeId == 21L) {
-        return "LifetimeRunningHours";
+        return "Primary2X";
       }
       if (attributeId == 22L) {
-        return "Power";
+        return "Primary2Y";
       }
       if (attributeId == 23L) {
-        return "LifetimeEnergyConsumed";
+        return "Primary2Intensity";
+      }
+      if (attributeId == 25L) {
+        return "Primary3X";
+      }
+      if (attributeId == 26L) {
+        return "Primary3Y";
+      }
+      if (attributeId == 27L) {
+        return "Primary3Intensity";
       }
       if (attributeId == 32L) {
-        return "OperationMode";
+        return "Primary4X";
       }
       if (attributeId == 33L) {
-        return "ControlMode";
+        return "Primary4Y";
+      }
+      if (attributeId == 34L) {
+        return "Primary4Intensity";
+      }
+      if (attributeId == 36L) {
+        return "Primary5X";
+      }
+      if (attributeId == 37L) {
+        return "Primary5Y";
+      }
+      if (attributeId == 38L) {
+        return "Primary5Intensity";
+      }
+      if (attributeId == 40L) {
+        return "Primary6X";
+      }
+      if (attributeId == 41L) {
+        return "Primary6Y";
+      }
+      if (attributeId == 42L) {
+        return "Primary6Intensity";
+      }
+      if (attributeId == 48L) {
+        return "WhitePointX";
+      }
+      if (attributeId == 49L) {
+        return "WhitePointY";
+      }
+      if (attributeId == 50L) {
+        return "ColorPointRX";
+      }
+      if (attributeId == 51L) {
+        return "ColorPointRY";
+      }
+      if (attributeId == 52L) {
+        return "ColorPointRIntensity";
+      }
+      if (attributeId == 54L) {
+        return "ColorPointGX";
+      }
+      if (attributeId == 55L) {
+        return "ColorPointGY";
+      }
+      if (attributeId == 56L) {
+        return "ColorPointGIntensity";
+      }
+      if (attributeId == 58L) {
+        return "ColorPointBX";
+      }
+      if (attributeId == 59L) {
+        return "ColorPointBY";
+      }
+      if (attributeId == 60L) {
+        return "ColorPointBIntensity";
+      }
+      if (attributeId == 16384L) {
+        return "EnhancedCurrentHue";
+      }
+      if (attributeId == 16385L) {
+        return "EnhancedColorMode";
+      }
+      if (attributeId == 16386L) {
+        return "ColorLoopActive";
+      }
+      if (attributeId == 16387L) {
+        return "ColorLoopDirection";
+      }
+      if (attributeId == 16388L) {
+        return "ColorLoopTime";
+      }
+      if (attributeId == 16389L) {
+        return "ColorLoopStartEnhancedHue";
+      }
+      if (attributeId == 16390L) {
+        return "ColorLoopStoredEnhancedHue";
+      }
+      if (attributeId == 16394L) {
+        return "ColorCapabilities";
+      }
+      if (attributeId == 16395L) {
+        return "ColorTempPhysicalMinMireds";
+      }
+      if (attributeId == 16396L) {
+        return "ColorTempPhysicalMaxMireds";
+      }
+      if (attributeId == 16397L) {
+        return "CoupleColorTempToLevelMinMireds";
+      }
+      if (attributeId == 16400L) {
+        return "StartUpColorTemperatureMireds";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -2079,7 +2226,7 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 1029L) {
+    if (clusterId == 1024L) {
       if (attributeId == 0L) {
         return "MeasuredValue";
       }
@@ -2092,6 +2239,9 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       if (attributeId == 3L) {
         return "Tolerance";
       }
+      if (attributeId == 4L) {
+        return "LightSensorType";
+      }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
       }
@@ -2109,27 +2259,57 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 5L) {
+    if (clusterId == 1026L) {
       if (attributeId == 0L) {
-        return "SceneCount";
+        return "MeasuredValue";
       }
       if (attributeId == 1L) {
-        return "CurrentScene";
+        return "MinMeasuredValue";
       }
       if (attributeId == 2L) {
-        return "CurrentGroup";
+        return "MaxMeasuredValue";
       }
       if (attributeId == 3L) {
-        return "SceneValid";
+        return "Tolerance";
       }
-      if (attributeId == 4L) {
-        return "NameSupport";
+      if (attributeId == 65531L) {
+        return "AttributeList";
       }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
+      if (attributeId == 65532L) {
+        return "FeatureMap";
       }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
+      if (attributeId == 65533L) {
+        return "ClusterRevision";
+      }
+      return "";
+    }
+    if (clusterId == 1027L) {
+      if (attributeId == 0L) {
+        return "MeasuredValue";
+      }
+      if (attributeId == 1L) {
+        return "MinMeasuredValue";
+      }
+      if (attributeId == 2L) {
+        return "MaxMeasuredValue";
+      }
+      if (attributeId == 3L) {
+        return "Tolerance";
+      }
+      if (attributeId == 16L) {
+        return "ScaledValue";
+      }
+      if (attributeId == 17L) {
+        return "MinScaledValue";
+      }
+      if (attributeId == 18L) {
+        return "MaxScaledValue";
+      }
+      if (attributeId == 19L) {
+        return "ScaledTolerance";
+      }
+      if (attributeId == 20L) {
+        return "Scale";
       }
       if (attributeId == 65531L) {
         return "AttributeList";
@@ -2142,18 +2322,18 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 52L) {
+    if (clusterId == 1028L) {
       if (attributeId == 0L) {
-        return "ThreadMetrics";
+        return "MeasuredValue";
       }
       if (attributeId == 1L) {
-        return "CurrentHeapFree";
+        return "MinMeasuredValue";
       }
       if (attributeId == 2L) {
-        return "CurrentHeapUsed";
+        return "MaxMeasuredValue";
       }
       if (attributeId == 3L) {
-        return "CurrentHeapHighWatermark";
+        return "Tolerance";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -2172,15 +2352,18 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 59L) {
+    if (clusterId == 1029L) {
       if (attributeId == 0L) {
-        return "NumberOfPositions";
+        return "MeasuredValue";
       }
       if (attributeId == 1L) {
-        return "CurrentPosition";
+        return "MinMeasuredValue";
       }
       if (attributeId == 2L) {
-        return "MultiPressMax";
+        return "MaxMeasuredValue";
+      }
+      if (attributeId == 3L) {
+        return "Tolerance";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -2199,12 +2382,15 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 1285L) {
+    if (clusterId == 1030L) {
       if (attributeId == 0L) {
-        return "TargetList";
+        return "Occupancy";
       }
       if (attributeId == 1L) {
-        return "CurrentTarget";
+        return "OccupancySensorType";
+      }
+      if (attributeId == 2L) {
+        return "OccupancySensorTypeBitmap";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -2223,18 +2409,15 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 1026L) {
+    if (clusterId == 1283L) {
       if (attributeId == 0L) {
-        return "MeasuredValue";
-      }
-      if (attributeId == 1L) {
-        return "MinMeasuredValue";
+        return "MACAddress";
       }
-      if (attributeId == 2L) {
-        return "MaxMeasuredValue";
+      if (attributeId == 65528L) {
+        return "GeneratedCommandList";
       }
-      if (attributeId == 3L) {
-        return "Tolerance";
+      if (attributeId == 65529L) {
+        return "AcceptedCommandList";
       }
       if (attributeId == 65531L) {
         return "AttributeList";
@@ -2247,546 +2430,162 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 4294048773L) {
+    if (clusterId == 1284L) {
       if (attributeId == 0L) {
-        return "Boolean";
+        return "ChannelList";
       }
       if (attributeId == 1L) {
-        return "Bitmap8";
+        return "Lineup";
       }
       if (attributeId == 2L) {
-        return "Bitmap16";
+        return "CurrentChannel";
       }
-      if (attributeId == 3L) {
-        return "Bitmap32";
-      }
-      if (attributeId == 4L) {
-        return "Bitmap64";
-      }
-      if (attributeId == 5L) {
-        return "Int8u";
-      }
-      if (attributeId == 6L) {
-        return "Int16u";
-      }
-      if (attributeId == 7L) {
-        return "Int24u";
-      }
-      if (attributeId == 8L) {
-        return "Int32u";
-      }
-      if (attributeId == 9L) {
-        return "Int40u";
-      }
-      if (attributeId == 10L) {
-        return "Int48u";
-      }
-      if (attributeId == 11L) {
-        return "Int56u";
-      }
-      if (attributeId == 12L) {
-        return "Int64u";
-      }
-      if (attributeId == 13L) {
-        return "Int8s";
-      }
-      if (attributeId == 14L) {
-        return "Int16s";
-      }
-      if (attributeId == 15L) {
-        return "Int24s";
-      }
-      if (attributeId == 16L) {
-        return "Int32s";
-      }
-      if (attributeId == 17L) {
-        return "Int40s";
-      }
-      if (attributeId == 18L) {
-        return "Int48s";
-      }
-      if (attributeId == 19L) {
-        return "Int56s";
-      }
-      if (attributeId == 20L) {
-        return "Int64s";
-      }
-      if (attributeId == 21L) {
-        return "Enum8";
-      }
-      if (attributeId == 22L) {
-        return "Enum16";
-      }
-      if (attributeId == 23L) {
-        return "FloatSingle";
-      }
-      if (attributeId == 24L) {
-        return "FloatDouble";
-      }
-      if (attributeId == 25L) {
-        return "OctetString";
-      }
-      if (attributeId == 26L) {
-        return "ListInt8u";
-      }
-      if (attributeId == 27L) {
-        return "ListOctetString";
-      }
-      if (attributeId == 28L) {
-        return "ListStructOctetString";
-      }
-      if (attributeId == 29L) {
-        return "LongOctetString";
-      }
-      if (attributeId == 30L) {
-        return "CharString";
-      }
-      if (attributeId == 31L) {
-        return "LongCharString";
-      }
-      if (attributeId == 32L) {
-        return "EpochUs";
-      }
-      if (attributeId == 33L) {
-        return "EpochS";
-      }
-      if (attributeId == 34L) {
-        return "VendorId";
-      }
-      if (attributeId == 35L) {
-        return "ListNullablesAndOptionalsStruct";
-      }
-      if (attributeId == 36L) {
-        return "EnumAttr";
-      }
-      if (attributeId == 37L) {
-        return "StructAttr";
-      }
-      if (attributeId == 38L) {
-        return "RangeRestrictedInt8u";
-      }
-      if (attributeId == 39L) {
-        return "RangeRestrictedInt8s";
-      }
-      if (attributeId == 40L) {
-        return "RangeRestrictedInt16u";
-      }
-      if (attributeId == 41L) {
-        return "RangeRestrictedInt16s";
-      }
-      if (attributeId == 42L) {
-        return "ListLongOctetString";
-      }
-      if (attributeId == 43L) {
-        return "ListFabricScoped";
-      }
-      if (attributeId == 48L) {
-        return "TimedWriteBoolean";
-      }
-      if (attributeId == 49L) {
-        return "GeneralErrorBoolean";
-      }
-      if (attributeId == 50L) {
-        return "ClusterErrorBoolean";
-      }
-      if (attributeId == 255L) {
-        return "Unsupported";
-      }
-      if (attributeId == 16384L) {
-        return "NullableBoolean";
-      }
-      if (attributeId == 16385L) {
-        return "NullableBitmap8";
-      }
-      if (attributeId == 16386L) {
-        return "NullableBitmap16";
-      }
-      if (attributeId == 16387L) {
-        return "NullableBitmap32";
-      }
-      if (attributeId == 16388L) {
-        return "NullableBitmap64";
-      }
-      if (attributeId == 16389L) {
-        return "NullableInt8u";
-      }
-      if (attributeId == 16390L) {
-        return "NullableInt16u";
-      }
-      if (attributeId == 16391L) {
-        return "NullableInt24u";
-      }
-      if (attributeId == 16392L) {
-        return "NullableInt32u";
-      }
-      if (attributeId == 16393L) {
-        return "NullableInt40u";
-      }
-      if (attributeId == 16394L) {
-        return "NullableInt48u";
-      }
-      if (attributeId == 16395L) {
-        return "NullableInt56u";
-      }
-      if (attributeId == 16396L) {
-        return "NullableInt64u";
-      }
-      if (attributeId == 16397L) {
-        return "NullableInt8s";
-      }
-      if (attributeId == 16398L) {
-        return "NullableInt16s";
-      }
-      if (attributeId == 16399L) {
-        return "NullableInt24s";
-      }
-      if (attributeId == 16400L) {
-        return "NullableInt32s";
-      }
-      if (attributeId == 16401L) {
-        return "NullableInt40s";
-      }
-      if (attributeId == 16402L) {
-        return "NullableInt48s";
-      }
-      if (attributeId == 16403L) {
-        return "NullableInt56s";
-      }
-      if (attributeId == 16404L) {
-        return "NullableInt64s";
-      }
-      if (attributeId == 16405L) {
-        return "NullableEnum8";
-      }
-      if (attributeId == 16406L) {
-        return "NullableEnum16";
-      }
-      if (attributeId == 16407L) {
-        return "NullableFloatSingle";
-      }
-      if (attributeId == 16408L) {
-        return "NullableFloatDouble";
-      }
-      if (attributeId == 16409L) {
-        return "NullableOctetString";
-      }
-      if (attributeId == 16414L) {
-        return "NullableCharString";
-      }
-      if (attributeId == 16420L) {
-        return "NullableEnumAttr";
-      }
-      if (attributeId == 16421L) {
-        return "NullableStruct";
-      }
-      if (attributeId == 16422L) {
-        return "NullableRangeRestrictedInt8u";
-      }
-      if (attributeId == 16423L) {
-        return "NullableRangeRestrictedInt8s";
-      }
-      if (attributeId == 16424L) {
-        return "NullableRangeRestrictedInt16u";
-      }
-      if (attributeId == 16425L) {
-        return "NullableRangeRestrictedInt16s";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 513L) {
-      if (attributeId == 0L) {
-        return "LocalTemperature";
-      }
-      if (attributeId == 3L) {
-        return "AbsMinHeatSetpointLimit";
-      }
-      if (attributeId == 4L) {
-        return "AbsMaxHeatSetpointLimit";
-      }
-      if (attributeId == 5L) {
-        return "AbsMinCoolSetpointLimit";
-      }
-      if (attributeId == 6L) {
-        return "AbsMaxCoolSetpointLimit";
-      }
-      if (attributeId == 17L) {
-        return "OccupiedCoolingSetpoint";
-      }
-      if (attributeId == 18L) {
-        return "OccupiedHeatingSetpoint";
-      }
-      if (attributeId == 21L) {
-        return "MinHeatSetpointLimit";
-      }
-      if (attributeId == 22L) {
-        return "MaxHeatSetpointLimit";
-      }
-      if (attributeId == 23L) {
-        return "MinCoolSetpointLimit";
-      }
-      if (attributeId == 24L) {
-        return "MaxCoolSetpointLimit";
-      }
-      if (attributeId == 25L) {
-        return "MinSetpointDeadBand";
-      }
-      if (attributeId == 27L) {
-        return "ControlSequenceOfOperation";
-      }
-      if (attributeId == 28L) {
-        return "SystemMode";
-      }
-      if (attributeId == 32L) {
-        return "StartOfWeek";
-      }
-      if (attributeId == 33L) {
-        return "NumberOfWeeklyTransitions";
-      }
-      if (attributeId == 34L) {
-        return "NumberOfDailyTransitions";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 516L) {
-      if (attributeId == 0L) {
-        return "TemperatureDisplayMode";
-      }
-      if (attributeId == 1L) {
-        return "KeypadLockout";
-      }
-      if (attributeId == 2L) {
-        return "ScheduleProgrammingVisibility";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
+      if (attributeId == 65528L) {
+        return "GeneratedCommandList";
       }
       if (attributeId == 65529L) {
         return "AcceptedCommandList";
       }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 53L) {
-      if (attributeId == 0L) {
-        return "Channel";
-      }
-      if (attributeId == 1L) {
-        return "RoutingRole";
-      }
-      if (attributeId == 2L) {
-        return "NetworkName";
-      }
-      if (attributeId == 3L) {
-        return "PanId";
-      }
-      if (attributeId == 4L) {
-        return "ExtendedPanId";
-      }
-      if (attributeId == 5L) {
-        return "MeshLocalPrefix";
-      }
-      if (attributeId == 6L) {
-        return "OverrunCount";
-      }
-      if (attributeId == 7L) {
-        return "NeighborTableList";
-      }
-      if (attributeId == 8L) {
-        return "RouteTableList";
-      }
-      if (attributeId == 9L) {
-        return "PartitionId";
-      }
-      if (attributeId == 10L) {
-        return "Weighting";
-      }
-      if (attributeId == 11L) {
-        return "DataVersion";
-      }
-      if (attributeId == 12L) {
-        return "StableDataVersion";
-      }
-      if (attributeId == 13L) {
-        return "LeaderRouterId";
-      }
-      if (attributeId == 14L) {
-        return "DetachedRoleCount";
-      }
-      if (attributeId == 15L) {
-        return "ChildRoleCount";
-      }
-      if (attributeId == 16L) {
-        return "RouterRoleCount";
-      }
-      if (attributeId == 17L) {
-        return "LeaderRoleCount";
-      }
-      if (attributeId == 18L) {
-        return "AttachAttemptCount";
-      }
-      if (attributeId == 19L) {
-        return "PartitionIdChangeCount";
-      }
-      if (attributeId == 20L) {
-        return "BetterPartitionAttachAttemptCount";
-      }
-      if (attributeId == 21L) {
-        return "ParentChangeCount";
-      }
-      if (attributeId == 22L) {
-        return "TxTotalCount";
-      }
-      if (attributeId == 23L) {
-        return "TxUnicastCount";
+      if (attributeId == 65531L) {
+        return "AttributeList";
       }
-      if (attributeId == 24L) {
-        return "TxBroadcastCount";
+      if (attributeId == 65532L) {
+        return "FeatureMap";
       }
-      if (attributeId == 25L) {
-        return "TxAckRequestedCount";
+      if (attributeId == 65533L) {
+        return "ClusterRevision";
       }
-      if (attributeId == 26L) {
-        return "TxAckedCount";
+      return "";
+    }
+    if (clusterId == 1285L) {
+      if (attributeId == 0L) {
+        return "TargetList";
       }
-      if (attributeId == 27L) {
-        return "TxNoAckRequestedCount";
+      if (attributeId == 1L) {
+        return "CurrentTarget";
       }
-      if (attributeId == 28L) {
-        return "TxDataCount";
+      if (attributeId == 65528L) {
+        return "GeneratedCommandList";
       }
-      if (attributeId == 29L) {
-        return "TxDataPollCount";
+      if (attributeId == 65529L) {
+        return "AcceptedCommandList";
       }
-      if (attributeId == 30L) {
-        return "TxBeaconCount";
+      if (attributeId == 65531L) {
+        return "AttributeList";
       }
-      if (attributeId == 31L) {
-        return "TxBeaconRequestCount";
+      if (attributeId == 65532L) {
+        return "FeatureMap";
       }
-      if (attributeId == 32L) {
-        return "TxOtherCount";
+      if (attributeId == 65533L) {
+        return "ClusterRevision";
       }
-      if (attributeId == 33L) {
-        return "TxRetryCount";
+      return "";
+    }
+    if (clusterId == 1286L) {
+      if (attributeId == 0L) {
+        return "CurrentState";
       }
-      if (attributeId == 34L) {
-        return "TxDirectMaxRetryExpiryCount";
+      if (attributeId == 1L) {
+        return "StartTime";
       }
-      if (attributeId == 35L) {
-        return "TxIndirectMaxRetryExpiryCount";
+      if (attributeId == 2L) {
+        return "Duration";
       }
-      if (attributeId == 36L) {
-        return "TxErrCcaCount";
+      if (attributeId == 3L) {
+        return "SampledPosition";
       }
-      if (attributeId == 37L) {
-        return "TxErrAbortCount";
+      if (attributeId == 4L) {
+        return "PlaybackSpeed";
       }
-      if (attributeId == 38L) {
-        return "TxErrBusyChannelCount";
+      if (attributeId == 5L) {
+        return "SeekRangeEnd";
       }
-      if (attributeId == 39L) {
-        return "RxTotalCount";
+      if (attributeId == 6L) {
+        return "SeekRangeStart";
       }
-      if (attributeId == 40L) {
-        return "RxUnicastCount";
+      if (attributeId == 65528L) {
+        return "GeneratedCommandList";
       }
-      if (attributeId == 41L) {
-        return "RxBroadcastCount";
+      if (attributeId == 65529L) {
+        return "AcceptedCommandList";
       }
-      if (attributeId == 42L) {
-        return "RxDataCount";
+      if (attributeId == 65531L) {
+        return "AttributeList";
       }
-      if (attributeId == 43L) {
-        return "RxDataPollCount";
+      if (attributeId == 65532L) {
+        return "FeatureMap";
       }
-      if (attributeId == 44L) {
-        return "RxBeaconCount";
+      if (attributeId == 65533L) {
+        return "ClusterRevision";
       }
-      if (attributeId == 45L) {
-        return "RxBeaconRequestCount";
+      return "";
+    }
+    if (clusterId == 1287L) {
+      if (attributeId == 0L) {
+        return "InputList";
       }
-      if (attributeId == 46L) {
-        return "RxOtherCount";
+      if (attributeId == 1L) {
+        return "CurrentInput";
       }
-      if (attributeId == 47L) {
-        return "RxAddressFilteredCount";
+      if (attributeId == 65528L) {
+        return "GeneratedCommandList";
       }
-      if (attributeId == 48L) {
-        return "RxDestAddrFilteredCount";
+      if (attributeId == 65529L) {
+        return "AcceptedCommandList";
       }
-      if (attributeId == 49L) {
-        return "RxDuplicatedCount";
+      if (attributeId == 65531L) {
+        return "AttributeList";
       }
-      if (attributeId == 50L) {
-        return "RxErrNoFrameCount";
+      if (attributeId == 65532L) {
+        return "FeatureMap";
       }
-      if (attributeId == 51L) {
-        return "RxErrUnknownNeighborCount";
+      if (attributeId == 65533L) {
+        return "ClusterRevision";
       }
-      if (attributeId == 52L) {
-        return "RxErrInvalidSrcAddrCount";
+      return "";
+    }
+    if (clusterId == 1288L) {
+      if (attributeId == 65528L) {
+        return "GeneratedCommandList";
       }
-      if (attributeId == 53L) {
-        return "RxErrSecCount";
+      if (attributeId == 65529L) {
+        return "AcceptedCommandList";
       }
-      if (attributeId == 54L) {
-        return "RxErrFcsCount";
+      if (attributeId == 65531L) {
+        return "AttributeList";
       }
-      if (attributeId == 55L) {
-        return "RxErrOtherCount";
+      if (attributeId == 65532L) {
+        return "FeatureMap";
       }
-      if (attributeId == 56L) {
-        return "ActiveTimestamp";
+      if (attributeId == 65533L) {
+        return "ClusterRevision";
       }
-      if (attributeId == 57L) {
-        return "PendingTimestamp";
+      return "";
+    }
+    if (clusterId == 1289L) {
+      if (attributeId == 65528L) {
+        return "GeneratedCommandList";
       }
-      if (attributeId == 58L) {
-        return "Delay";
+      if (attributeId == 65529L) {
+        return "AcceptedCommandList";
       }
-      if (attributeId == 59L) {
-        return "SecurityPolicy";
+      if (attributeId == 65531L) {
+        return "AttributeList";
       }
-      if (attributeId == 60L) {
-        return "ChannelMask";
+      if (attributeId == 65532L) {
+        return "FeatureMap";
       }
-      if (attributeId == 61L) {
-        return "OperationalDatasetComponents";
+      if (attributeId == 65533L) {
+        return "ClusterRevision";
       }
-      if (attributeId == 62L) {
-        return "ActiveNetworkFaultsList";
+      return "";
+    }
+    if (clusterId == 1290L) {
+      if (attributeId == 0L) {
+        return "AcceptHeader";
+      }
+      if (attributeId == 1L) {
+        return "SupportedStreamingProtocols";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -2805,15 +2604,12 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 44L) {
+    if (clusterId == 1291L) {
       if (attributeId == 0L) {
-        return "HourFormat";
+        return "OutputList";
       }
       if (attributeId == 1L) {
-        return "ActiveCalendarType";
-      }
-      if (attributeId == 2L) {
-        return "SupportedCalendarTypes";
+        return "CurrentOutput";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -2821,6 +2617,9 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       if (attributeId == 65529L) {
         return "AcceptedCommandList";
       }
+      if (attributeId == 65531L) {
+        return "AttributeList";
+      }
       if (attributeId == 65532L) {
         return "FeatureMap";
       }
@@ -2829,9 +2628,18 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 45L) {
+    if (clusterId == 1292L) {
       if (attributeId == 0L) {
-        return "TemperatureUnit";
+        return "CatalogList";
+      }
+      if (attributeId == 1L) {
+        return "CurrentApp";
+      }
+      if (attributeId == 65528L) {
+        return "GeneratedCommandList";
+      }
+      if (attributeId == 65529L) {
+        return "AcceptedCommandList";
       }
       if (attributeId == 65531L) {
         return "AttributeList";
@@ -2844,9 +2652,30 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 65L) {
+    if (clusterId == 1293L) {
       if (attributeId == 0L) {
-        return "LabelList";
+        return "VendorName";
+      }
+      if (attributeId == 1L) {
+        return "VendorID";
+      }
+      if (attributeId == 2L) {
+        return "ApplicationName";
+      }
+      if (attributeId == 3L) {
+        return "ProductID";
+      }
+      if (attributeId == 4L) {
+        return "Application";
+      }
+      if (attributeId == 5L) {
+        return "Status";
+      }
+      if (attributeId == 6L) {
+        return "ApplicationVersion";
+      }
+      if (attributeId == 7L) {
+        return "AllowedVendorList";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -2854,6 +2683,9 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       if (attributeId == 65529L) {
         return "AcceptedCommandList";
       }
+      if (attributeId == 65531L) {
+        return "AttributeList";
+      }
       if (attributeId == 65532L) {
         return "FeatureMap";
       }
@@ -2862,10 +2694,7 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 1283L) {
-      if (attributeId == 0L) {
-        return "MACAddress";
-      }
+    if (clusterId == 1294L) {
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
       }
@@ -2883,45 +2712,39 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 54L) {
+    if (clusterId == 2820L) {
       if (attributeId == 0L) {
-        return "Bssid";
-      }
-      if (attributeId == 1L) {
-        return "SecurityType";
-      }
-      if (attributeId == 2L) {
-        return "WiFiVersion";
+        return "MeasurementType";
       }
-      if (attributeId == 3L) {
-        return "ChannelNumber";
+      if (attributeId == 772L) {
+        return "TotalActivePower";
       }
-      if (attributeId == 4L) {
-        return "Rssi";
+      if (attributeId == 1285L) {
+        return "RmsVoltage";
       }
-      if (attributeId == 5L) {
-        return "BeaconLostCount";
+      if (attributeId == 1286L) {
+        return "RmsVoltageMin";
       }
-      if (attributeId == 6L) {
-        return "BeaconRxCount";
+      if (attributeId == 1287L) {
+        return "RmsVoltageMax";
       }
-      if (attributeId == 7L) {
-        return "PacketMulticastRxCount";
+      if (attributeId == 1288L) {
+        return "RmsCurrent";
       }
-      if (attributeId == 8L) {
-        return "PacketMulticastTxCount";
+      if (attributeId == 1289L) {
+        return "RmsCurrentMin";
       }
-      if (attributeId == 9L) {
-        return "PacketUnicastRxCount";
+      if (attributeId == 1290L) {
+        return "RmsCurrentMax";
       }
-      if (attributeId == 10L) {
-        return "PacketUnicastTxCount";
+      if (attributeId == 1291L) {
+        return "ActivePower";
       }
-      if (attributeId == 11L) {
-        return "CurrentMaxRate";
+      if (attributeId == 1292L) {
+        return "ActivePowerMin";
       }
-      if (attributeId == 12L) {
-        return "OverrunCount";
+      if (attributeId == 1293L) {
+        return "ActivePowerMax";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
@@ -2940,72 +2763,249 @@ public static String attributeIdToName(long clusterId, long attributeId) {
       }
       return "";
     }
-    if (clusterId == 258L) {
+    if (clusterId == 4294048773L) {
       if (attributeId == 0L) {
-        return "Type";
+        return "Boolean";
       }
       if (attributeId == 1L) {
-        return "PhysicalClosedLimitLift";
+        return "Bitmap8";
       }
       if (attributeId == 2L) {
-        return "PhysicalClosedLimitTilt";
+        return "Bitmap16";
       }
       if (attributeId == 3L) {
-        return "CurrentPositionLift";
+        return "Bitmap32";
       }
       if (attributeId == 4L) {
-        return "CurrentPositionTilt";
+        return "Bitmap64";
       }
       if (attributeId == 5L) {
-        return "NumberOfActuationsLift";
+        return "Int8u";
       }
       if (attributeId == 6L) {
-        return "NumberOfActuationsTilt";
+        return "Int16u";
       }
       if (attributeId == 7L) {
-        return "ConfigStatus";
+        return "Int24u";
       }
       if (attributeId == 8L) {
-        return "CurrentPositionLiftPercentage";
+        return "Int32u";
       }
       if (attributeId == 9L) {
-        return "CurrentPositionTiltPercentage";
+        return "Int40u";
       }
       if (attributeId == 10L) {
-        return "OperationalStatus";
+        return "Int48u";
       }
       if (attributeId == 11L) {
-        return "TargetPositionLiftPercent100ths";
+        return "Int56u";
       }
       if (attributeId == 12L) {
-        return "TargetPositionTiltPercent100ths";
+        return "Int64u";
       }
       if (attributeId == 13L) {
-        return "EndProductType";
+        return "Int8s";
       }
       if (attributeId == 14L) {
-        return "CurrentPositionLiftPercent100ths";
+        return "Int16s";
       }
       if (attributeId == 15L) {
-        return "CurrentPositionTiltPercent100ths";
+        return "Int24s";
       }
       if (attributeId == 16L) {
-        return "InstalledOpenLimitLift";
+        return "Int32s";
       }
       if (attributeId == 17L) {
-        return "InstalledClosedLimitLift";
+        return "Int40s";
       }
       if (attributeId == 18L) {
-        return "InstalledOpenLimitTilt";
+        return "Int48s";
       }
       if (attributeId == 19L) {
-        return "InstalledClosedLimitTilt";
+        return "Int56s";
+      }
+      if (attributeId == 20L) {
+        return "Int64s";
+      }
+      if (attributeId == 21L) {
+        return "Enum8";
+      }
+      if (attributeId == 22L) {
+        return "Enum16";
       }
       if (attributeId == 23L) {
-        return "Mode";
+        return "FloatSingle";
+      }
+      if (attributeId == 24L) {
+        return "FloatDouble";
+      }
+      if (attributeId == 25L) {
+        return "OctetString";
       }
       if (attributeId == 26L) {
-        return "SafetyStatus";
+        return "ListInt8u";
+      }
+      if (attributeId == 27L) {
+        return "ListOctetString";
+      }
+      if (attributeId == 28L) {
+        return "ListStructOctetString";
+      }
+      if (attributeId == 29L) {
+        return "LongOctetString";
+      }
+      if (attributeId == 30L) {
+        return "CharString";
+      }
+      if (attributeId == 31L) {
+        return "LongCharString";
+      }
+      if (attributeId == 32L) {
+        return "EpochUs";
+      }
+      if (attributeId == 33L) {
+        return "EpochS";
+      }
+      if (attributeId == 34L) {
+        return "VendorId";
+      }
+      if (attributeId == 35L) {
+        return "ListNullablesAndOptionalsStruct";
+      }
+      if (attributeId == 36L) {
+        return "EnumAttr";
+      }
+      if (attributeId == 37L) {
+        return "StructAttr";
+      }
+      if (attributeId == 38L) {
+        return "RangeRestrictedInt8u";
+      }
+      if (attributeId == 39L) {
+        return "RangeRestrictedInt8s";
+      }
+      if (attributeId == 40L) {
+        return "RangeRestrictedInt16u";
+      }
+      if (attributeId == 41L) {
+        return "RangeRestrictedInt16s";
+      }
+      if (attributeId == 42L) {
+        return "ListLongOctetString";
+      }
+      if (attributeId == 43L) {
+        return "ListFabricScoped";
+      }
+      if (attributeId == 48L) {
+        return "TimedWriteBoolean";
+      }
+      if (attributeId == 49L) {
+        return "GeneralErrorBoolean";
+      }
+      if (attributeId == 50L) {
+        return "ClusterErrorBoolean";
+      }
+      if (attributeId == 255L) {
+        return "Unsupported";
+      }
+      if (attributeId == 16384L) {
+        return "NullableBoolean";
+      }
+      if (attributeId == 16385L) {
+        return "NullableBitmap8";
+      }
+      if (attributeId == 16386L) {
+        return "NullableBitmap16";
+      }
+      if (attributeId == 16387L) {
+        return "NullableBitmap32";
+      }
+      if (attributeId == 16388L) {
+        return "NullableBitmap64";
+      }
+      if (attributeId == 16389L) {
+        return "NullableInt8u";
+      }
+      if (attributeId == 16390L) {
+        return "NullableInt16u";
+      }
+      if (attributeId == 16391L) {
+        return "NullableInt24u";
+      }
+      if (attributeId == 16392L) {
+        return "NullableInt32u";
+      }
+      if (attributeId == 16393L) {
+        return "NullableInt40u";
+      }
+      if (attributeId == 16394L) {
+        return "NullableInt48u";
+      }
+      if (attributeId == 16395L) {
+        return "NullableInt56u";
+      }
+      if (attributeId == 16396L) {
+        return "NullableInt64u";
+      }
+      if (attributeId == 16397L) {
+        return "NullableInt8s";
+      }
+      if (attributeId == 16398L) {
+        return "NullableInt16s";
+      }
+      if (attributeId == 16399L) {
+        return "NullableInt24s";
+      }
+      if (attributeId == 16400L) {
+        return "NullableInt32s";
+      }
+      if (attributeId == 16401L) {
+        return "NullableInt40s";
+      }
+      if (attributeId == 16402L) {
+        return "NullableInt48s";
+      }
+      if (attributeId == 16403L) {
+        return "NullableInt56s";
+      }
+      if (attributeId == 16404L) {
+        return "NullableInt64s";
+      }
+      if (attributeId == 16405L) {
+        return "NullableEnum8";
+      }
+      if (attributeId == 16406L) {
+        return "NullableEnum16";
+      }
+      if (attributeId == 16407L) {
+        return "NullableFloatSingle";
+      }
+      if (attributeId == 16408L) {
+        return "NullableFloatDouble";
+      }
+      if (attributeId == 16409L) {
+        return "NullableOctetString";
+      }
+      if (attributeId == 16414L) {
+        return "NullableCharString";
+      }
+      if (attributeId == 16420L) {
+        return "NullableEnumAttr";
+      }
+      if (attributeId == 16421L) {
+        return "NullableStruct";
+      }
+      if (attributeId == 16422L) {
+        return "NullableRangeRestrictedInt8u";
+      }
+      if (attributeId == 16423L) {
+        return "NullableRangeRestrictedInt8s";
+      }
+      if (attributeId == 16424L) {
+        return "NullableRangeRestrictedInt16u";
+      }
+      if (attributeId == 16425L) {
+        return "NullableRangeRestrictedInt16s";
       }
       if (attributeId == 65528L) {
         return "GeneratedCommandList";
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
index 9d8a6817b40d2e..fa3bdde77a6d9c 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
@@ -24,6 +24,124 @@
 import java.util.Optional;
 
 public class ChipStructs {
+  public static class ScenesClusterAttributeValuePair {
+    public Optional<Long> attributeId;
+    public ArrayList<Object> attributeValue;
+
+    public ScenesClusterAttributeValuePair(
+        Optional<Long> attributeId, ArrayList<Object> attributeValue) {
+      this.attributeId = attributeId;
+      this.attributeValue = attributeValue;
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder output = new StringBuilder();
+      output.append("ScenesClusterAttributeValuePair {\n");
+      output.append("\tattributeId: ");
+      output.append(attributeId);
+      output.append("\n");
+      output.append("\tattributeValue: ");
+      output.append(attributeValue);
+      output.append("\n");
+      output.append("}\n");
+      return output.toString();
+    }
+  }
+
+  public static class ScenesClusterExtensionFieldSet {
+    public Long clusterId;
+    public ArrayList<ChipStructs.ScenesClusterAttributeValuePair> attributeValueList;
+
+    public ScenesClusterExtensionFieldSet(
+        Long clusterId, ArrayList<ChipStructs.ScenesClusterAttributeValuePair> attributeValueList) {
+      this.clusterId = clusterId;
+      this.attributeValueList = attributeValueList;
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder output = new StringBuilder();
+      output.append("ScenesClusterExtensionFieldSet {\n");
+      output.append("\tclusterId: ");
+      output.append(clusterId);
+      output.append("\n");
+      output.append("\tattributeValueList: ");
+      output.append(attributeValueList);
+      output.append("\n");
+      output.append("}\n");
+      return output.toString();
+    }
+  }
+
+  public static class DescriptorClusterDeviceType {
+    public Long type;
+    public Integer revision;
+
+    public DescriptorClusterDeviceType(Long type, Integer revision) {
+      this.type = type;
+      this.revision = revision;
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder output = new StringBuilder();
+      output.append("DescriptorClusterDeviceType {\n");
+      output.append("\ttype: ");
+      output.append(type);
+      output.append("\n");
+      output.append("\trevision: ");
+      output.append(revision);
+      output.append("\n");
+      output.append("}\n");
+      return output.toString();
+    }
+  }
+
+  public static class BindingClusterTargetStruct {
+    public Optional<Long> node;
+    public Optional<Integer> group;
+    public Optional<Integer> endpoint;
+    public Optional<Long> cluster;
+    public Integer fabricIndex;
+
+    public BindingClusterTargetStruct(
+        Optional<Long> node,
+        Optional<Integer> group,
+        Optional<Integer> endpoint,
+        Optional<Long> cluster,
+        Integer fabricIndex) {
+      this.node = node;
+      this.group = group;
+      this.endpoint = endpoint;
+      this.cluster = cluster;
+      this.fabricIndex = fabricIndex;
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder output = new StringBuilder();
+      output.append("BindingClusterTargetStruct {\n");
+      output.append("\tnode: ");
+      output.append(node);
+      output.append("\n");
+      output.append("\tgroup: ");
+      output.append(group);
+      output.append("\n");
+      output.append("\tendpoint: ");
+      output.append(endpoint);
+      output.append("\n");
+      output.append("\tcluster: ");
+      output.append(cluster);
+      output.append("\n");
+      output.append("\tfabricIndex: ");
+      output.append(fabricIndex);
+      output.append("\n");
+      output.append("}\n");
+      return output.toString();
+    }
+  }
+
   public static class AccessControlClusterTarget {
     public @Nullable Long cluster;
     public @Nullable Integer endpoint;
@@ -122,104 +240,86 @@ public String toString() {
     }
   }
 
-  public static class ApplicationBasicClusterApplicationBasicApplication {
-    public Integer catalogVendorId;
-    public String applicationId;
+  public static class BridgedActionsClusterActionStruct {
+    public Integer actionID;
+    public String name;
+    public Integer type;
+    public Integer endpointListID;
+    public Integer supportedCommands;
+    public Integer status;
 
-    public ApplicationBasicClusterApplicationBasicApplication(
-        Integer catalogVendorId, String applicationId) {
-      this.catalogVendorId = catalogVendorId;
-      this.applicationId = applicationId;
+    public BridgedActionsClusterActionStruct(
+        Integer actionID,
+        String name,
+        Integer type,
+        Integer endpointListID,
+        Integer supportedCommands,
+        Integer status) {
+      this.actionID = actionID;
+      this.name = name;
+      this.type = type;
+      this.endpointListID = endpointListID;
+      this.supportedCommands = supportedCommands;
+      this.status = status;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("ApplicationBasicClusterApplicationBasicApplication {\n");
-      output.append("\tcatalogVendorId: ");
-      output.append(catalogVendorId);
+      output.append("BridgedActionsClusterActionStruct {\n");
+      output.append("\tactionID: ");
+      output.append(actionID);
       output.append("\n");
-      output.append("\tapplicationId: ");
-      output.append(applicationId);
+      output.append("\tname: ");
+      output.append(name);
       output.append("\n");
-      output.append("}\n");
-      return output.toString();
-    }
-  }
-
-  public static class ApplicationLauncherClusterApplication {
-    public Integer catalogVendorId;
-    public String applicationId;
-
-    public ApplicationLauncherClusterApplication(Integer catalogVendorId, String applicationId) {
-      this.catalogVendorId = catalogVendorId;
-      this.applicationId = applicationId;
-    }
-
-    @Override
-    public String toString() {
-      StringBuilder output = new StringBuilder();
-      output.append("ApplicationLauncherClusterApplication {\n");
-      output.append("\tcatalogVendorId: ");
-      output.append(catalogVendorId);
+      output.append("\ttype: ");
+      output.append(type);
       output.append("\n");
-      output.append("\tapplicationId: ");
-      output.append(applicationId);
+      output.append("\tendpointListID: ");
+      output.append(endpointListID);
       output.append("\n");
-      output.append("}\n");
-      return output.toString();
-    }
-  }
-
-  public static class ApplicationLauncherClusterApplicationEP {
-    public ChipStructs.ApplicationLauncherClusterApplication application;
-    public Optional<Integer> endpoint;
-
-    public ApplicationLauncherClusterApplicationEP(
-        ChipStructs.ApplicationLauncherClusterApplication application, Optional<Integer> endpoint) {
-      this.application = application;
-      this.endpoint = endpoint;
-    }
-
-    @Override
-    public String toString() {
-      StringBuilder output = new StringBuilder();
-      output.append("ApplicationLauncherClusterApplicationEP {\n");
-      output.append("\tapplication: ");
-      output.append(application);
+      output.append("\tsupportedCommands: ");
+      output.append(supportedCommands);
       output.append("\n");
-      output.append("\tendpoint: ");
-      output.append(endpoint);
+      output.append("\tstatus: ");
+      output.append(status);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class AudioOutputClusterOutputInfo {
-    public Integer index;
-    public Integer outputType;
+  public static class BridgedActionsClusterEndpointListStruct {
+    public Integer endpointListID;
     public String name;
+    public Integer type;
+    public ArrayList<Object> endpoints;
 
-    public AudioOutputClusterOutputInfo(Integer index, Integer outputType, String name) {
-      this.index = index;
-      this.outputType = outputType;
+    public BridgedActionsClusterEndpointListStruct(
+        Integer endpointListID, String name, Integer type, ArrayList<Object> endpoints) {
+      this.endpointListID = endpointListID;
       this.name = name;
+      this.type = type;
+      this.endpoints = endpoints;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("AudioOutputClusterOutputInfo {\n");
-      output.append("\tindex: ");
-      output.append(index);
-      output.append("\n");
-      output.append("\toutputType: ");
-      output.append(outputType);
+      output.append("BridgedActionsClusterEndpointListStruct {\n");
+      output.append("\tendpointListID: ");
+      output.append(endpointListID);
       output.append("\n");
       output.append("\tname: ");
       output.append(name);
       output.append("\n");
+      output.append("\ttype: ");
+      output.append(type);
+      output.append("\n");
+      output.append("\tendpoints: ");
+      output.append(endpoints);
+      output.append("\n");
       output.append("}\n");
       return output.toString();
     }
@@ -250,42 +350,28 @@ public String toString() {
     }
   }
 
-  public static class BindingClusterTargetStruct {
-    public Optional<Long> node;
-    public Optional<Integer> group;
-    public Optional<Integer> endpoint;
-    public Optional<Long> cluster;
+  public static class OtaSoftwareUpdateRequestorClusterProviderLocation {
+    public Long providerNodeID;
+    public Integer endpoint;
     public Integer fabricIndex;
 
-    public BindingClusterTargetStruct(
-        Optional<Long> node,
-        Optional<Integer> group,
-        Optional<Integer> endpoint,
-        Optional<Long> cluster,
-        Integer fabricIndex) {
-      this.node = node;
-      this.group = group;
-      this.endpoint = endpoint;
-      this.cluster = cluster;
+    public OtaSoftwareUpdateRequestorClusterProviderLocation(
+        Long providerNodeID, Integer endpoint, Integer fabricIndex) {
+      this.providerNodeID = providerNodeID;
+      this.endpoint = endpoint;
       this.fabricIndex = fabricIndex;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("BindingClusterTargetStruct {\n");
-      output.append("\tnode: ");
-      output.append(node);
-      output.append("\n");
-      output.append("\tgroup: ");
-      output.append(group);
+      output.append("OtaSoftwareUpdateRequestorClusterProviderLocation {\n");
+      output.append("\tproviderNodeID: ");
+      output.append(providerNodeID);
       output.append("\n");
       output.append("\tendpoint: ");
       output.append(endpoint);
       output.append("\n");
-      output.append("\tcluster: ");
-      output.append(cluster);
-      output.append("\n");
       output.append("\tfabricIndex: ");
       output.append(fabricIndex);
       output.append("\n");
@@ -294,451 +380,236 @@ public String toString() {
     }
   }
 
-  public static class BridgedActionsClusterActionStruct {
-    public Integer actionID;
-    public String name;
-    public Integer type;
-    public Integer endpointListID;
-    public Integer supportedCommands;
-    public Integer status;
+  public static class PowerSourceClusterBatChargeFaultChangeType {
+    public ArrayList<Object> current;
+    public ArrayList<Object> previous;
 
-    public BridgedActionsClusterActionStruct(
-        Integer actionID,
-        String name,
-        Integer type,
-        Integer endpointListID,
-        Integer supportedCommands,
-        Integer status) {
-      this.actionID = actionID;
-      this.name = name;
-      this.type = type;
-      this.endpointListID = endpointListID;
-      this.supportedCommands = supportedCommands;
-      this.status = status;
+    public PowerSourceClusterBatChargeFaultChangeType(
+        ArrayList<Object> current, ArrayList<Object> previous) {
+      this.current = current;
+      this.previous = previous;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("BridgedActionsClusterActionStruct {\n");
-      output.append("\tactionID: ");
-      output.append(actionID);
-      output.append("\n");
-      output.append("\tname: ");
-      output.append(name);
-      output.append("\n");
-      output.append("\ttype: ");
-      output.append(type);
-      output.append("\n");
-      output.append("\tendpointListID: ");
-      output.append(endpointListID);
-      output.append("\n");
-      output.append("\tsupportedCommands: ");
-      output.append(supportedCommands);
+      output.append("PowerSourceClusterBatChargeFaultChangeType {\n");
+      output.append("\tcurrent: ");
+      output.append(current);
       output.append("\n");
-      output.append("\tstatus: ");
-      output.append(status);
+      output.append("\tprevious: ");
+      output.append(previous);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class BridgedActionsClusterEndpointListStruct {
-    public Integer endpointListID;
-    public String name;
-    public Integer type;
-    public ArrayList<Object> endpoints;
+  public static class PowerSourceClusterBatFaultChangeType {
+    public ArrayList<Object> current;
+    public ArrayList<Object> previous;
 
-    public BridgedActionsClusterEndpointListStruct(
-        Integer endpointListID, String name, Integer type, ArrayList<Object> endpoints) {
-      this.endpointListID = endpointListID;
-      this.name = name;
-      this.type = type;
-      this.endpoints = endpoints;
+    public PowerSourceClusterBatFaultChangeType(
+        ArrayList<Object> current, ArrayList<Object> previous) {
+      this.current = current;
+      this.previous = previous;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("BridgedActionsClusterEndpointListStruct {\n");
-      output.append("\tendpointListID: ");
-      output.append(endpointListID);
-      output.append("\n");
-      output.append("\tname: ");
-      output.append(name);
-      output.append("\n");
-      output.append("\ttype: ");
-      output.append(type);
+      output.append("PowerSourceClusterBatFaultChangeType {\n");
+      output.append("\tcurrent: ");
+      output.append(current);
       output.append("\n");
-      output.append("\tendpoints: ");
-      output.append(endpoints);
+      output.append("\tprevious: ");
+      output.append(previous);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class ChannelClusterChannelInfo {
-    public Integer majorNumber;
-    public Integer minorNumber;
-    public Optional<String> name;
-    public Optional<String> callSign;
-    public Optional<String> affiliateCallSign;
+  public static class PowerSourceClusterWiredFaultChangeType {
+    public ArrayList<Object> current;
+    public ArrayList<Object> previous;
 
-    public ChannelClusterChannelInfo(
-        Integer majorNumber,
-        Integer minorNumber,
-        Optional<String> name,
-        Optional<String> callSign,
-        Optional<String> affiliateCallSign) {
-      this.majorNumber = majorNumber;
-      this.minorNumber = minorNumber;
-      this.name = name;
-      this.callSign = callSign;
-      this.affiliateCallSign = affiliateCallSign;
+    public PowerSourceClusterWiredFaultChangeType(
+        ArrayList<Object> current, ArrayList<Object> previous) {
+      this.current = current;
+      this.previous = previous;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("ChannelClusterChannelInfo {\n");
-      output.append("\tmajorNumber: ");
-      output.append(majorNumber);
-      output.append("\n");
-      output.append("\tminorNumber: ");
-      output.append(minorNumber);
-      output.append("\n");
-      output.append("\tname: ");
-      output.append(name);
-      output.append("\n");
-      output.append("\tcallSign: ");
-      output.append(callSign);
+      output.append("PowerSourceClusterWiredFaultChangeType {\n");
+      output.append("\tcurrent: ");
+      output.append(current);
       output.append("\n");
-      output.append("\taffiliateCallSign: ");
-      output.append(affiliateCallSign);
+      output.append("\tprevious: ");
+      output.append(previous);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class ChannelClusterLineupInfo {
-    public String operatorName;
-    public Optional<String> lineupName;
-    public Optional<String> postalCode;
-    public Integer lineupInfoType;
+  public static class GeneralCommissioningClusterBasicCommissioningInfo {
+    public Integer failSafeExpiryLengthSeconds;
+    public Integer maxCumulativeFailsafeSeconds;
 
-    public ChannelClusterLineupInfo(
-        String operatorName,
-        Optional<String> lineupName,
-        Optional<String> postalCode,
-        Integer lineupInfoType) {
-      this.operatorName = operatorName;
-      this.lineupName = lineupName;
-      this.postalCode = postalCode;
-      this.lineupInfoType = lineupInfoType;
+    public GeneralCommissioningClusterBasicCommissioningInfo(
+        Integer failSafeExpiryLengthSeconds, Integer maxCumulativeFailsafeSeconds) {
+      this.failSafeExpiryLengthSeconds = failSafeExpiryLengthSeconds;
+      this.maxCumulativeFailsafeSeconds = maxCumulativeFailsafeSeconds;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("ChannelClusterLineupInfo {\n");
-      output.append("\toperatorName: ");
-      output.append(operatorName);
-      output.append("\n");
-      output.append("\tlineupName: ");
-      output.append(lineupName);
-      output.append("\n");
-      output.append("\tpostalCode: ");
-      output.append(postalCode);
+      output.append("GeneralCommissioningClusterBasicCommissioningInfo {\n");
+      output.append("\tfailSafeExpiryLengthSeconds: ");
+      output.append(failSafeExpiryLengthSeconds);
       output.append("\n");
-      output.append("\tlineupInfoType: ");
-      output.append(lineupInfoType);
+      output.append("\tmaxCumulativeFailsafeSeconds: ");
+      output.append(maxCumulativeFailsafeSeconds);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class ContentLauncherClusterDimension {
-    public Double width;
-    public Double height;
-    public Integer metric;
+  public static class NetworkCommissioningClusterNetworkInfo {
+    public byte[] networkID;
+    public Boolean connected;
 
-    public ContentLauncherClusterDimension(Double width, Double height, Integer metric) {
-      this.width = width;
-      this.height = height;
-      this.metric = metric;
+    public NetworkCommissioningClusterNetworkInfo(byte[] networkID, Boolean connected) {
+      this.networkID = networkID;
+      this.connected = connected;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("ContentLauncherClusterDimension {\n");
-      output.append("\twidth: ");
-      output.append(width);
-      output.append("\n");
-      output.append("\theight: ");
-      output.append(height);
+      output.append("NetworkCommissioningClusterNetworkInfo {\n");
+      output.append("\tnetworkID: ");
+      output.append(Arrays.toString(networkID));
       output.append("\n");
-      output.append("\tmetric: ");
-      output.append(metric);
+      output.append("\tconnected: ");
+      output.append(connected);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class ContentLauncherClusterAdditionalInfo {
-    public String name;
-    public String value;
+  public static class NetworkCommissioningClusterThreadInterfaceScanResult {
+    public Integer panId;
+    public Long extendedPanId;
+    public String networkName;
+    public Integer channel;
+    public Integer version;
+    public byte[] extendedAddress;
+    public Integer rssi;
+    public Integer lqi;
 
-    public ContentLauncherClusterAdditionalInfo(String name, String value) {
-      this.name = name;
-      this.value = value;
+    public NetworkCommissioningClusterThreadInterfaceScanResult(
+        Integer panId,
+        Long extendedPanId,
+        String networkName,
+        Integer channel,
+        Integer version,
+        byte[] extendedAddress,
+        Integer rssi,
+        Integer lqi) {
+      this.panId = panId;
+      this.extendedPanId = extendedPanId;
+      this.networkName = networkName;
+      this.channel = channel;
+      this.version = version;
+      this.extendedAddress = extendedAddress;
+      this.rssi = rssi;
+      this.lqi = lqi;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("ContentLauncherClusterAdditionalInfo {\n");
-      output.append("\tname: ");
-      output.append(name);
+      output.append("NetworkCommissioningClusterThreadInterfaceScanResult {\n");
+      output.append("\tpanId: ");
+      output.append(panId);
       output.append("\n");
-      output.append("\tvalue: ");
-      output.append(value);
+      output.append("\textendedPanId: ");
+      output.append(extendedPanId);
       output.append("\n");
-      output.append("}\n");
-      return output.toString();
-    }
-  }
-
-  public static class ContentLauncherClusterParameter {
-    public Integer type;
-    public String value;
-    public Optional<ArrayList<ChipStructs.ContentLauncherClusterAdditionalInfo>> externalIDList;
-
-    public ContentLauncherClusterParameter(
-        Integer type,
-        String value,
-        Optional<ArrayList<ChipStructs.ContentLauncherClusterAdditionalInfo>> externalIDList) {
-      this.type = type;
-      this.value = value;
-      this.externalIDList = externalIDList;
-    }
-
-    @Override
-    public String toString() {
-      StringBuilder output = new StringBuilder();
-      output.append("ContentLauncherClusterParameter {\n");
-      output.append("\ttype: ");
-      output.append(type);
-      output.append("\n");
-      output.append("\tvalue: ");
-      output.append(value);
-      output.append("\n");
-      output.append("\texternalIDList: ");
-      output.append(externalIDList);
-      output.append("\n");
-      output.append("}\n");
-      return output.toString();
-    }
-  }
-
-  public static class ContentLauncherClusterContentSearch {
-    public ArrayList<ChipStructs.ContentLauncherClusterParameter> parameterList;
-
-    public ContentLauncherClusterContentSearch(
-        ArrayList<ChipStructs.ContentLauncherClusterParameter> parameterList) {
-      this.parameterList = parameterList;
-    }
-
-    @Override
-    public String toString() {
-      StringBuilder output = new StringBuilder();
-      output.append("ContentLauncherClusterContentSearch {\n");
-      output.append("\tparameterList: ");
-      output.append(parameterList);
-      output.append("\n");
-      output.append("}\n");
-      return output.toString();
-    }
-  }
-
-  public static class ContentLauncherClusterStyleInformation {
-    public Optional<String> imageUrl;
-    public Optional<String> color;
-    public Optional<ChipStructs.ContentLauncherClusterDimension> size;
-
-    public ContentLauncherClusterStyleInformation(
-        Optional<String> imageUrl,
-        Optional<String> color,
-        Optional<ChipStructs.ContentLauncherClusterDimension> size) {
-      this.imageUrl = imageUrl;
-      this.color = color;
-      this.size = size;
-    }
-
-    @Override
-    public String toString() {
-      StringBuilder output = new StringBuilder();
-      output.append("ContentLauncherClusterStyleInformation {\n");
-      output.append("\timageUrl: ");
-      output.append(imageUrl);
-      output.append("\n");
-      output.append("\tcolor: ");
-      output.append(color);
-      output.append("\n");
-      output.append("\tsize: ");
-      output.append(size);
-      output.append("\n");
-      output.append("}\n");
-      return output.toString();
-    }
-  }
-
-  public static class ContentLauncherClusterBrandingInformation {
-    public String providerName;
-    public Optional<ChipStructs.ContentLauncherClusterStyleInformation> background;
-    public Optional<ChipStructs.ContentLauncherClusterStyleInformation> logo;
-    public Optional<ChipStructs.ContentLauncherClusterStyleInformation> progressBar;
-    public Optional<ChipStructs.ContentLauncherClusterStyleInformation> splash;
-    public Optional<ChipStructs.ContentLauncherClusterStyleInformation> waterMark;
-
-    public ContentLauncherClusterBrandingInformation(
-        String providerName,
-        Optional<ChipStructs.ContentLauncherClusterStyleInformation> background,
-        Optional<ChipStructs.ContentLauncherClusterStyleInformation> logo,
-        Optional<ChipStructs.ContentLauncherClusterStyleInformation> progressBar,
-        Optional<ChipStructs.ContentLauncherClusterStyleInformation> splash,
-        Optional<ChipStructs.ContentLauncherClusterStyleInformation> waterMark) {
-      this.providerName = providerName;
-      this.background = background;
-      this.logo = logo;
-      this.progressBar = progressBar;
-      this.splash = splash;
-      this.waterMark = waterMark;
-    }
-
-    @Override
-    public String toString() {
-      StringBuilder output = new StringBuilder();
-      output.append("ContentLauncherClusterBrandingInformation {\n");
-      output.append("\tproviderName: ");
-      output.append(providerName);
-      output.append("\n");
-      output.append("\tbackground: ");
-      output.append(background);
-      output.append("\n");
-      output.append("\tlogo: ");
-      output.append(logo);
+      output.append("\tnetworkName: ");
+      output.append(networkName);
       output.append("\n");
-      output.append("\tprogressBar: ");
-      output.append(progressBar);
+      output.append("\tchannel: ");
+      output.append(channel);
       output.append("\n");
-      output.append("\tsplash: ");
-      output.append(splash);
+      output.append("\tversion: ");
+      output.append(version);
       output.append("\n");
-      output.append("\twaterMark: ");
-      output.append(waterMark);
+      output.append("\textendedAddress: ");
+      output.append(Arrays.toString(extendedAddress));
       output.append("\n");
-      output.append("}\n");
-      return output.toString();
-    }
-  }
-
-  public static class DescriptorClusterDeviceType {
-    public Long type;
-    public Integer revision;
-
-    public DescriptorClusterDeviceType(Long type, Integer revision) {
-      this.type = type;
-      this.revision = revision;
-    }
-
-    @Override
-    public String toString() {
-      StringBuilder output = new StringBuilder();
-      output.append("DescriptorClusterDeviceType {\n");
-      output.append("\ttype: ");
-      output.append(type);
+      output.append("\trssi: ");
+      output.append(rssi);
       output.append("\n");
-      output.append("\trevision: ");
-      output.append(revision);
+      output.append("\tlqi: ");
+      output.append(lqi);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class DoorLockClusterDlCredential {
-    public Integer credentialType;
-    public Integer credentialIndex;
+  public static class NetworkCommissioningClusterWiFiInterfaceScanResult {
+    public Integer security;
+    public byte[] ssid;
+    public byte[] bssid;
+    public Integer channel;
+    public Integer wiFiBand;
+    public Integer rssi;
 
-    public DoorLockClusterDlCredential(Integer credentialType, Integer credentialIndex) {
-      this.credentialType = credentialType;
-      this.credentialIndex = credentialIndex;
+    public NetworkCommissioningClusterWiFiInterfaceScanResult(
+        Integer security,
+        byte[] ssid,
+        byte[] bssid,
+        Integer channel,
+        Integer wiFiBand,
+        Integer rssi) {
+      this.security = security;
+      this.ssid = ssid;
+      this.bssid = bssid;
+      this.channel = channel;
+      this.wiFiBand = wiFiBand;
+      this.rssi = rssi;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("DoorLockClusterDlCredential {\n");
-      output.append("\tcredentialType: ");
-      output.append(credentialType);
+      output.append("NetworkCommissioningClusterWiFiInterfaceScanResult {\n");
+      output.append("\tsecurity: ");
+      output.append(security);
       output.append("\n");
-      output.append("\tcredentialIndex: ");
-      output.append(credentialIndex);
+      output.append("\tssid: ");
+      output.append(Arrays.toString(ssid));
       output.append("\n");
-      output.append("}\n");
-      return output.toString();
-    }
-  }
-
-  public static class FixedLabelClusterLabelStruct {
-    public String label;
-    public String value;
-
-    public FixedLabelClusterLabelStruct(String label, String value) {
-      this.label = label;
-      this.value = value;
-    }
-
-    @Override
-    public String toString() {
-      StringBuilder output = new StringBuilder();
-      output.append("FixedLabelClusterLabelStruct {\n");
-      output.append("\tlabel: ");
-      output.append(label);
+      output.append("\tbssid: ");
+      output.append(Arrays.toString(bssid));
       output.append("\n");
-      output.append("\tvalue: ");
-      output.append(value);
+      output.append("\tchannel: ");
+      output.append(channel);
       output.append("\n");
-      output.append("}\n");
-      return output.toString();
-    }
-  }
-
-  public static class GeneralCommissioningClusterBasicCommissioningInfo {
-    public Integer failSafeExpiryLengthSeconds;
-    public Integer maxCumulativeFailsafeSeconds;
-
-    public GeneralCommissioningClusterBasicCommissioningInfo(
-        Integer failSafeExpiryLengthSeconds, Integer maxCumulativeFailsafeSeconds) {
-      this.failSafeExpiryLengthSeconds = failSafeExpiryLengthSeconds;
-      this.maxCumulativeFailsafeSeconds = maxCumulativeFailsafeSeconds;
-    }
-
-    @Override
-    public String toString() {
-      StringBuilder output = new StringBuilder();
-      output.append("GeneralCommissioningClusterBasicCommissioningInfo {\n");
-      output.append("\tfailSafeExpiryLengthSeconds: ");
-      output.append(failSafeExpiryLengthSeconds);
+      output.append("\twiFiBand: ");
+      output.append(wiFiBand);
       output.append("\n");
-      output.append("\tmaxCumulativeFailsafeSeconds: ");
-      output.append(maxCumulativeFailsafeSeconds);
+      output.append("\trssi: ");
+      output.append(rssi);
       output.append("\n");
       output.append("}\n");
       return output.toString();
@@ -807,14 +678,450 @@ public String toString() {
     }
   }
 
-  public static class GroupKeyManagementClusterGroupInfoMapStruct {
-    public Integer groupId;
-    public ArrayList<Object> endpoints;
-    public Optional<String> groupName;
-    public Integer fabricIndex;
+  public static class SoftwareDiagnosticsClusterSoftwareFaultStruct {
+    public Long id;
+    public String name;
+    public byte[] faultRecording;
 
-    public GroupKeyManagementClusterGroupInfoMapStruct(
-        Integer groupId,
+    public SoftwareDiagnosticsClusterSoftwareFaultStruct(
+        Long id, String name, byte[] faultRecording) {
+      this.id = id;
+      this.name = name;
+      this.faultRecording = faultRecording;
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder output = new StringBuilder();
+      output.append("SoftwareDiagnosticsClusterSoftwareFaultStruct {\n");
+      output.append("\tid: ");
+      output.append(id);
+      output.append("\n");
+      output.append("\tname: ");
+      output.append(name);
+      output.append("\n");
+      output.append("\tfaultRecording: ");
+      output.append(Arrays.toString(faultRecording));
+      output.append("\n");
+      output.append("}\n");
+      return output.toString();
+    }
+  }
+
+  public static class SoftwareDiagnosticsClusterThreadMetrics {
+    public Long id;
+    public Optional<String> name;
+    public Optional<Long> stackFreeCurrent;
+    public Optional<Long> stackFreeMinimum;
+    public Optional<Long> stackSize;
+
+    public SoftwareDiagnosticsClusterThreadMetrics(
+        Long id,
+        Optional<String> name,
+        Optional<Long> stackFreeCurrent,
+        Optional<Long> stackFreeMinimum,
+        Optional<Long> stackSize) {
+      this.id = id;
+      this.name = name;
+      this.stackFreeCurrent = stackFreeCurrent;
+      this.stackFreeMinimum = stackFreeMinimum;
+      this.stackSize = stackSize;
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder output = new StringBuilder();
+      output.append("SoftwareDiagnosticsClusterThreadMetrics {\n");
+      output.append("\tid: ");
+      output.append(id);
+      output.append("\n");
+      output.append("\tname: ");
+      output.append(name);
+      output.append("\n");
+      output.append("\tstackFreeCurrent: ");
+      output.append(stackFreeCurrent);
+      output.append("\n");
+      output.append("\tstackFreeMinimum: ");
+      output.append(stackFreeMinimum);
+      output.append("\n");
+      output.append("\tstackSize: ");
+      output.append(stackSize);
+      output.append("\n");
+      output.append("}\n");
+      return output.toString();
+    }
+  }
+
+  public static class ThreadNetworkDiagnosticsClusterNeighborTable {
+    public Long extAddress;
+    public Long age;
+    public Integer rloc16;
+    public Long linkFrameCounter;
+    public Long mleFrameCounter;
+    public Integer lqi;
+    public @Nullable Integer averageRssi;
+    public @Nullable Integer lastRssi;
+    public Integer frameErrorRate;
+    public Integer messageErrorRate;
+    public Boolean rxOnWhenIdle;
+    public Boolean fullThreadDevice;
+    public Boolean fullNetworkData;
+    public Boolean isChild;
+
+    public ThreadNetworkDiagnosticsClusterNeighborTable(
+        Long extAddress,
+        Long age,
+        Integer rloc16,
+        Long linkFrameCounter,
+        Long mleFrameCounter,
+        Integer lqi,
+        @Nullable Integer averageRssi,
+        @Nullable Integer lastRssi,
+        Integer frameErrorRate,
+        Integer messageErrorRate,
+        Boolean rxOnWhenIdle,
+        Boolean fullThreadDevice,
+        Boolean fullNetworkData,
+        Boolean isChild) {
+      this.extAddress = extAddress;
+      this.age = age;
+      this.rloc16 = rloc16;
+      this.linkFrameCounter = linkFrameCounter;
+      this.mleFrameCounter = mleFrameCounter;
+      this.lqi = lqi;
+      this.averageRssi = averageRssi;
+      this.lastRssi = lastRssi;
+      this.frameErrorRate = frameErrorRate;
+      this.messageErrorRate = messageErrorRate;
+      this.rxOnWhenIdle = rxOnWhenIdle;
+      this.fullThreadDevice = fullThreadDevice;
+      this.fullNetworkData = fullNetworkData;
+      this.isChild = isChild;
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder output = new StringBuilder();
+      output.append("ThreadNetworkDiagnosticsClusterNeighborTable {\n");
+      output.append("\textAddress: ");
+      output.append(extAddress);
+      output.append("\n");
+      output.append("\tage: ");
+      output.append(age);
+      output.append("\n");
+      output.append("\trloc16: ");
+      output.append(rloc16);
+      output.append("\n");
+      output.append("\tlinkFrameCounter: ");
+      output.append(linkFrameCounter);
+      output.append("\n");
+      output.append("\tmleFrameCounter: ");
+      output.append(mleFrameCounter);
+      output.append("\n");
+      output.append("\tlqi: ");
+      output.append(lqi);
+      output.append("\n");
+      output.append("\taverageRssi: ");
+      output.append(averageRssi);
+      output.append("\n");
+      output.append("\tlastRssi: ");
+      output.append(lastRssi);
+      output.append("\n");
+      output.append("\tframeErrorRate: ");
+      output.append(frameErrorRate);
+      output.append("\n");
+      output.append("\tmessageErrorRate: ");
+      output.append(messageErrorRate);
+      output.append("\n");
+      output.append("\trxOnWhenIdle: ");
+      output.append(rxOnWhenIdle);
+      output.append("\n");
+      output.append("\tfullThreadDevice: ");
+      output.append(fullThreadDevice);
+      output.append("\n");
+      output.append("\tfullNetworkData: ");
+      output.append(fullNetworkData);
+      output.append("\n");
+      output.append("\tisChild: ");
+      output.append(isChild);
+      output.append("\n");
+      output.append("}\n");
+      return output.toString();
+    }
+  }
+
+  public static class ThreadNetworkDiagnosticsClusterOperationalDatasetComponents {
+    public Boolean activeTimestampPresent;
+    public Boolean pendingTimestampPresent;
+    public Boolean masterKeyPresent;
+    public Boolean networkNamePresent;
+    public Boolean extendedPanIdPresent;
+    public Boolean meshLocalPrefixPresent;
+    public Boolean delayPresent;
+    public Boolean panIdPresent;
+    public Boolean channelPresent;
+    public Boolean pskcPresent;
+    public Boolean securityPolicyPresent;
+    public Boolean channelMaskPresent;
+
+    public ThreadNetworkDiagnosticsClusterOperationalDatasetComponents(
+        Boolean activeTimestampPresent,
+        Boolean pendingTimestampPresent,
+        Boolean masterKeyPresent,
+        Boolean networkNamePresent,
+        Boolean extendedPanIdPresent,
+        Boolean meshLocalPrefixPresent,
+        Boolean delayPresent,
+        Boolean panIdPresent,
+        Boolean channelPresent,
+        Boolean pskcPresent,
+        Boolean securityPolicyPresent,
+        Boolean channelMaskPresent) {
+      this.activeTimestampPresent = activeTimestampPresent;
+      this.pendingTimestampPresent = pendingTimestampPresent;
+      this.masterKeyPresent = masterKeyPresent;
+      this.networkNamePresent = networkNamePresent;
+      this.extendedPanIdPresent = extendedPanIdPresent;
+      this.meshLocalPrefixPresent = meshLocalPrefixPresent;
+      this.delayPresent = delayPresent;
+      this.panIdPresent = panIdPresent;
+      this.channelPresent = channelPresent;
+      this.pskcPresent = pskcPresent;
+      this.securityPolicyPresent = securityPolicyPresent;
+      this.channelMaskPresent = channelMaskPresent;
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder output = new StringBuilder();
+      output.append("ThreadNetworkDiagnosticsClusterOperationalDatasetComponents {\n");
+      output.append("\tactiveTimestampPresent: ");
+      output.append(activeTimestampPresent);
+      output.append("\n");
+      output.append("\tpendingTimestampPresent: ");
+      output.append(pendingTimestampPresent);
+      output.append("\n");
+      output.append("\tmasterKeyPresent: ");
+      output.append(masterKeyPresent);
+      output.append("\n");
+      output.append("\tnetworkNamePresent: ");
+      output.append(networkNamePresent);
+      output.append("\n");
+      output.append("\textendedPanIdPresent: ");
+      output.append(extendedPanIdPresent);
+      output.append("\n");
+      output.append("\tmeshLocalPrefixPresent: ");
+      output.append(meshLocalPrefixPresent);
+      output.append("\n");
+      output.append("\tdelayPresent: ");
+      output.append(delayPresent);
+      output.append("\n");
+      output.append("\tpanIdPresent: ");
+      output.append(panIdPresent);
+      output.append("\n");
+      output.append("\tchannelPresent: ");
+      output.append(channelPresent);
+      output.append("\n");
+      output.append("\tpskcPresent: ");
+      output.append(pskcPresent);
+      output.append("\n");
+      output.append("\tsecurityPolicyPresent: ");
+      output.append(securityPolicyPresent);
+      output.append("\n");
+      output.append("\tchannelMaskPresent: ");
+      output.append(channelMaskPresent);
+      output.append("\n");
+      output.append("}\n");
+      return output.toString();
+    }
+  }
+
+  public static class ThreadNetworkDiagnosticsClusterRouteTable {
+    public Long extAddress;
+    public Integer rloc16;
+    public Integer routerId;
+    public Integer nextHop;
+    public Integer pathCost;
+    public Integer LQIIn;
+    public Integer LQIOut;
+    public Integer age;
+    public Boolean allocated;
+    public Boolean linkEstablished;
+
+    public ThreadNetworkDiagnosticsClusterRouteTable(
+        Long extAddress,
+        Integer rloc16,
+        Integer routerId,
+        Integer nextHop,
+        Integer pathCost,
+        Integer LQIIn,
+        Integer LQIOut,
+        Integer age,
+        Boolean allocated,
+        Boolean linkEstablished) {
+      this.extAddress = extAddress;
+      this.rloc16 = rloc16;
+      this.routerId = routerId;
+      this.nextHop = nextHop;
+      this.pathCost = pathCost;
+      this.LQIIn = LQIIn;
+      this.LQIOut = LQIOut;
+      this.age = age;
+      this.allocated = allocated;
+      this.linkEstablished = linkEstablished;
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder output = new StringBuilder();
+      output.append("ThreadNetworkDiagnosticsClusterRouteTable {\n");
+      output.append("\textAddress: ");
+      output.append(extAddress);
+      output.append("\n");
+      output.append("\trloc16: ");
+      output.append(rloc16);
+      output.append("\n");
+      output.append("\trouterId: ");
+      output.append(routerId);
+      output.append("\n");
+      output.append("\tnextHop: ");
+      output.append(nextHop);
+      output.append("\n");
+      output.append("\tpathCost: ");
+      output.append(pathCost);
+      output.append("\n");
+      output.append("\tLQIIn: ");
+      output.append(LQIIn);
+      output.append("\n");
+      output.append("\tLQIOut: ");
+      output.append(LQIOut);
+      output.append("\n");
+      output.append("\tage: ");
+      output.append(age);
+      output.append("\n");
+      output.append("\tallocated: ");
+      output.append(allocated);
+      output.append("\n");
+      output.append("\tlinkEstablished: ");
+      output.append(linkEstablished);
+      output.append("\n");
+      output.append("}\n");
+      return output.toString();
+    }
+  }
+
+  public static class ThreadNetworkDiagnosticsClusterSecurityPolicy {
+    public Integer rotationTime;
+    public Integer flags;
+
+    public ThreadNetworkDiagnosticsClusterSecurityPolicy(Integer rotationTime, Integer flags) {
+      this.rotationTime = rotationTime;
+      this.flags = flags;
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder output = new StringBuilder();
+      output.append("ThreadNetworkDiagnosticsClusterSecurityPolicy {\n");
+      output.append("\trotationTime: ");
+      output.append(rotationTime);
+      output.append("\n");
+      output.append("\tflags: ");
+      output.append(flags);
+      output.append("\n");
+      output.append("}\n");
+      return output.toString();
+    }
+  }
+
+  public static class OperationalCredentialsClusterFabricDescriptor {
+    public byte[] rootPublicKey;
+    public Integer vendorId;
+    public Long fabricId;
+    public Long nodeId;
+    public String label;
+    public Integer fabricIndex;
+
+    public OperationalCredentialsClusterFabricDescriptor(
+        byte[] rootPublicKey,
+        Integer vendorId,
+        Long fabricId,
+        Long nodeId,
+        String label,
+        Integer fabricIndex) {
+      this.rootPublicKey = rootPublicKey;
+      this.vendorId = vendorId;
+      this.fabricId = fabricId;
+      this.nodeId = nodeId;
+      this.label = label;
+      this.fabricIndex = fabricIndex;
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder output = new StringBuilder();
+      output.append("OperationalCredentialsClusterFabricDescriptor {\n");
+      output.append("\trootPublicKey: ");
+      output.append(Arrays.toString(rootPublicKey));
+      output.append("\n");
+      output.append("\tvendorId: ");
+      output.append(vendorId);
+      output.append("\n");
+      output.append("\tfabricId: ");
+      output.append(fabricId);
+      output.append("\n");
+      output.append("\tnodeId: ");
+      output.append(nodeId);
+      output.append("\n");
+      output.append("\tlabel: ");
+      output.append(label);
+      output.append("\n");
+      output.append("\tfabricIndex: ");
+      output.append(fabricIndex);
+      output.append("\n");
+      output.append("}\n");
+      return output.toString();
+    }
+  }
+
+  public static class OperationalCredentialsClusterNOCStruct {
+    public byte[] noc;
+    public @Nullable byte[] icac;
+    public Integer fabricIndex;
+
+    public OperationalCredentialsClusterNOCStruct(
+        byte[] noc, @Nullable byte[] icac, Integer fabricIndex) {
+      this.noc = noc;
+      this.icac = icac;
+      this.fabricIndex = fabricIndex;
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder output = new StringBuilder();
+      output.append("OperationalCredentialsClusterNOCStruct {\n");
+      output.append("\tnoc: ");
+      output.append(Arrays.toString(noc));
+      output.append("\n");
+      output.append("\ticac: ");
+      output.append(Arrays.toString(icac));
+      output.append("\n");
+      output.append("\tfabricIndex: ");
+      output.append(fabricIndex);
+      output.append("\n");
+      output.append("}\n");
+      return output.toString();
+    }
+  }
+
+  public static class GroupKeyManagementClusterGroupInfoMapStruct {
+    public Integer groupId;
+    public ArrayList<Object> endpoints;
+    public Optional<String> groupName;
+    public Integer fabricIndex;
+
+    public GroupKeyManagementClusterGroupInfoMapStruct(
+        Integer groupId,
         ArrayList<Object> endpoints,
         Optional<String> groupName,
         Integer fabricIndex) {
@@ -937,59 +1244,48 @@ public String toString() {
     }
   }
 
-  public static class MediaInputClusterInputInfo {
-    public Integer index;
-    public Integer inputType;
-    public String name;
-    public String description;
+  public static class FixedLabelClusterLabelStruct {
+    public String label;
+    public String value;
 
-    public MediaInputClusterInputInfo(
-        Integer index, Integer inputType, String name, String description) {
-      this.index = index;
-      this.inputType = inputType;
-      this.name = name;
-      this.description = description;
+    public FixedLabelClusterLabelStruct(String label, String value) {
+      this.label = label;
+      this.value = value;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("MediaInputClusterInputInfo {\n");
-      output.append("\tindex: ");
-      output.append(index);
-      output.append("\n");
-      output.append("\tinputType: ");
-      output.append(inputType);
-      output.append("\n");
-      output.append("\tname: ");
-      output.append(name);
+      output.append("FixedLabelClusterLabelStruct {\n");
+      output.append("\tlabel: ");
+      output.append(label);
       output.append("\n");
-      output.append("\tdescription: ");
-      output.append(description);
+      output.append("\tvalue: ");
+      output.append(value);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class MediaPlaybackClusterPlaybackPosition {
-    public Long updatedAt;
-    public @Nullable Long position;
+  public static class UserLabelClusterLabelStruct {
+    public String label;
+    public String value;
 
-    public MediaPlaybackClusterPlaybackPosition(Long updatedAt, @Nullable Long position) {
-      this.updatedAt = updatedAt;
-      this.position = position;
+    public UserLabelClusterLabelStruct(String label, String value) {
+      this.label = label;
+      this.value = value;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("MediaPlaybackClusterPlaybackPosition {\n");
-      output.append("\tupdatedAt: ");
-      output.append(updatedAt);
+      output.append("UserLabelClusterLabelStruct {\n");
+      output.append("\tlabel: ");
+      output.append(label);
       output.append("\n");
-      output.append("\tposition: ");
-      output.append(position);
+      output.append("\tvalue: ");
+      output.append(value);
       output.append("\n");
       output.append("}\n");
       return output.toString();
@@ -1052,466 +1348,432 @@ public String toString() {
     }
   }
 
-  public static class NetworkCommissioningClusterNetworkInfo {
-    public byte[] networkID;
-    public Boolean connected;
+  public static class DoorLockClusterDlCredential {
+    public Integer credentialType;
+    public Integer credentialIndex;
 
-    public NetworkCommissioningClusterNetworkInfo(byte[] networkID, Boolean connected) {
-      this.networkID = networkID;
-      this.connected = connected;
+    public DoorLockClusterDlCredential(Integer credentialType, Integer credentialIndex) {
+      this.credentialType = credentialType;
+      this.credentialIndex = credentialIndex;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("NetworkCommissioningClusterNetworkInfo {\n");
-      output.append("\tnetworkID: ");
-      output.append(Arrays.toString(networkID));
+      output.append("DoorLockClusterDlCredential {\n");
+      output.append("\tcredentialType: ");
+      output.append(credentialType);
       output.append("\n");
-      output.append("\tconnected: ");
-      output.append(connected);
+      output.append("\tcredentialIndex: ");
+      output.append(credentialIndex);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class NetworkCommissioningClusterThreadInterfaceScanResult {
-    public Integer panId;
-    public Long extendedPanId;
-    public String networkName;
-    public Integer channel;
-    public Integer version;
-    public byte[] extendedAddress;
-    public Integer rssi;
-    public Integer lqi;
+  public static class ThermostatClusterThermostatScheduleTransition {
+    public Integer transitionTime;
+    public @Nullable Integer heatSetpoint;
+    public @Nullable Integer coolSetpoint;
 
-    public NetworkCommissioningClusterThreadInterfaceScanResult(
-        Integer panId,
-        Long extendedPanId,
-        String networkName,
-        Integer channel,
-        Integer version,
-        byte[] extendedAddress,
-        Integer rssi,
-        Integer lqi) {
-      this.panId = panId;
-      this.extendedPanId = extendedPanId;
-      this.networkName = networkName;
-      this.channel = channel;
-      this.version = version;
-      this.extendedAddress = extendedAddress;
-      this.rssi = rssi;
-      this.lqi = lqi;
+    public ThermostatClusterThermostatScheduleTransition(
+        Integer transitionTime, @Nullable Integer heatSetpoint, @Nullable Integer coolSetpoint) {
+      this.transitionTime = transitionTime;
+      this.heatSetpoint = heatSetpoint;
+      this.coolSetpoint = coolSetpoint;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("NetworkCommissioningClusterThreadInterfaceScanResult {\n");
-      output.append("\tpanId: ");
-      output.append(panId);
-      output.append("\n");
-      output.append("\textendedPanId: ");
-      output.append(extendedPanId);
-      output.append("\n");
-      output.append("\tnetworkName: ");
-      output.append(networkName);
-      output.append("\n");
-      output.append("\tchannel: ");
-      output.append(channel);
-      output.append("\n");
-      output.append("\tversion: ");
-      output.append(version);
-      output.append("\n");
-      output.append("\textendedAddress: ");
-      output.append(Arrays.toString(extendedAddress));
+      output.append("ThermostatClusterThermostatScheduleTransition {\n");
+      output.append("\ttransitionTime: ");
+      output.append(transitionTime);
       output.append("\n");
-      output.append("\trssi: ");
-      output.append(rssi);
+      output.append("\theatSetpoint: ");
+      output.append(heatSetpoint);
       output.append("\n");
-      output.append("\tlqi: ");
-      output.append(lqi);
+      output.append("\tcoolSetpoint: ");
+      output.append(coolSetpoint);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class NetworkCommissioningClusterWiFiInterfaceScanResult {
-    public Integer security;
-    public byte[] ssid;
-    public byte[] bssid;
-    public Integer channel;
-    public Integer wiFiBand;
-    public Integer rssi;
+  public static class ChannelClusterChannelInfo {
+    public Integer majorNumber;
+    public Integer minorNumber;
+    public Optional<String> name;
+    public Optional<String> callSign;
+    public Optional<String> affiliateCallSign;
 
-    public NetworkCommissioningClusterWiFiInterfaceScanResult(
-        Integer security,
-        byte[] ssid,
-        byte[] bssid,
-        Integer channel,
-        Integer wiFiBand,
-        Integer rssi) {
-      this.security = security;
-      this.ssid = ssid;
-      this.bssid = bssid;
-      this.channel = channel;
-      this.wiFiBand = wiFiBand;
-      this.rssi = rssi;
+    public ChannelClusterChannelInfo(
+        Integer majorNumber,
+        Integer minorNumber,
+        Optional<String> name,
+        Optional<String> callSign,
+        Optional<String> affiliateCallSign) {
+      this.majorNumber = majorNumber;
+      this.minorNumber = minorNumber;
+      this.name = name;
+      this.callSign = callSign;
+      this.affiliateCallSign = affiliateCallSign;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("NetworkCommissioningClusterWiFiInterfaceScanResult {\n");
-      output.append("\tsecurity: ");
-      output.append(security);
-      output.append("\n");
-      output.append("\tssid: ");
-      output.append(Arrays.toString(ssid));
+      output.append("ChannelClusterChannelInfo {\n");
+      output.append("\tmajorNumber: ");
+      output.append(majorNumber);
       output.append("\n");
-      output.append("\tbssid: ");
-      output.append(Arrays.toString(bssid));
+      output.append("\tminorNumber: ");
+      output.append(minorNumber);
       output.append("\n");
-      output.append("\tchannel: ");
-      output.append(channel);
+      output.append("\tname: ");
+      output.append(name);
       output.append("\n");
-      output.append("\twiFiBand: ");
-      output.append(wiFiBand);
+      output.append("\tcallSign: ");
+      output.append(callSign);
       output.append("\n");
-      output.append("\trssi: ");
-      output.append(rssi);
+      output.append("\taffiliateCallSign: ");
+      output.append(affiliateCallSign);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class OtaSoftwareUpdateRequestorClusterProviderLocation {
-    public Long providerNodeID;
-    public Integer endpoint;
-    public Integer fabricIndex;
+  public static class ChannelClusterLineupInfo {
+    public String operatorName;
+    public Optional<String> lineupName;
+    public Optional<String> postalCode;
+    public Integer lineupInfoType;
 
-    public OtaSoftwareUpdateRequestorClusterProviderLocation(
-        Long providerNodeID, Integer endpoint, Integer fabricIndex) {
-      this.providerNodeID = providerNodeID;
-      this.endpoint = endpoint;
-      this.fabricIndex = fabricIndex;
+    public ChannelClusterLineupInfo(
+        String operatorName,
+        Optional<String> lineupName,
+        Optional<String> postalCode,
+        Integer lineupInfoType) {
+      this.operatorName = operatorName;
+      this.lineupName = lineupName;
+      this.postalCode = postalCode;
+      this.lineupInfoType = lineupInfoType;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("OtaSoftwareUpdateRequestorClusterProviderLocation {\n");
-      output.append("\tproviderNodeID: ");
-      output.append(providerNodeID);
+      output.append("ChannelClusterLineupInfo {\n");
+      output.append("\toperatorName: ");
+      output.append(operatorName);
       output.append("\n");
-      output.append("\tendpoint: ");
-      output.append(endpoint);
+      output.append("\tlineupName: ");
+      output.append(lineupName);
       output.append("\n");
-      output.append("\tfabricIndex: ");
-      output.append(fabricIndex);
+      output.append("\tpostalCode: ");
+      output.append(postalCode);
+      output.append("\n");
+      output.append("\tlineupInfoType: ");
+      output.append(lineupInfoType);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
-
-  public static class OperationalCredentialsClusterFabricDescriptor {
-    public byte[] rootPublicKey;
-    public Integer vendorId;
-    public Long fabricId;
-    public Long nodeId;
-    public String label;
-    public Integer fabricIndex;
-
-    public OperationalCredentialsClusterFabricDescriptor(
-        byte[] rootPublicKey,
-        Integer vendorId,
-        Long fabricId,
-        Long nodeId,
-        String label,
-        Integer fabricIndex) {
-      this.rootPublicKey = rootPublicKey;
-      this.vendorId = vendorId;
-      this.fabricId = fabricId;
-      this.nodeId = nodeId;
-      this.label = label;
-      this.fabricIndex = fabricIndex;
-    }
-
-    @Override
-    public String toString() {
-      StringBuilder output = new StringBuilder();
-      output.append("OperationalCredentialsClusterFabricDescriptor {\n");
-      output.append("\trootPublicKey: ");
-      output.append(Arrays.toString(rootPublicKey));
-      output.append("\n");
-      output.append("\tvendorId: ");
-      output.append(vendorId);
-      output.append("\n");
-      output.append("\tfabricId: ");
-      output.append(fabricId);
-      output.append("\n");
-      output.append("\tnodeId: ");
-      output.append(nodeId);
-      output.append("\n");
-      output.append("\tlabel: ");
-      output.append(label);
+
+  public static class TargetNavigatorClusterTargetInfo {
+    public Integer identifier;
+    public String name;
+
+    public TargetNavigatorClusterTargetInfo(Integer identifier, String name) {
+      this.identifier = identifier;
+      this.name = name;
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder output = new StringBuilder();
+      output.append("TargetNavigatorClusterTargetInfo {\n");
+      output.append("\tidentifier: ");
+      output.append(identifier);
       output.append("\n");
-      output.append("\tfabricIndex: ");
-      output.append(fabricIndex);
+      output.append("\tname: ");
+      output.append(name);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class OperationalCredentialsClusterNOCStruct {
-    public byte[] noc;
-    public @Nullable byte[] icac;
-    public Integer fabricIndex;
+  public static class MediaPlaybackClusterPlaybackPosition {
+    public Long updatedAt;
+    public @Nullable Long position;
 
-    public OperationalCredentialsClusterNOCStruct(
-        byte[] noc, @Nullable byte[] icac, Integer fabricIndex) {
-      this.noc = noc;
-      this.icac = icac;
-      this.fabricIndex = fabricIndex;
+    public MediaPlaybackClusterPlaybackPosition(Long updatedAt, @Nullable Long position) {
+      this.updatedAt = updatedAt;
+      this.position = position;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("OperationalCredentialsClusterNOCStruct {\n");
-      output.append("\tnoc: ");
-      output.append(Arrays.toString(noc));
-      output.append("\n");
-      output.append("\ticac: ");
-      output.append(Arrays.toString(icac));
+      output.append("MediaPlaybackClusterPlaybackPosition {\n");
+      output.append("\tupdatedAt: ");
+      output.append(updatedAt);
       output.append("\n");
-      output.append("\tfabricIndex: ");
-      output.append(fabricIndex);
+      output.append("\tposition: ");
+      output.append(position);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class PowerSourceClusterBatChargeFaultChangeType {
-    public ArrayList<Object> current;
-    public ArrayList<Object> previous;
+  public static class MediaInputClusterInputInfo {
+    public Integer index;
+    public Integer inputType;
+    public String name;
+    public String description;
 
-    public PowerSourceClusterBatChargeFaultChangeType(
-        ArrayList<Object> current, ArrayList<Object> previous) {
-      this.current = current;
-      this.previous = previous;
+    public MediaInputClusterInputInfo(
+        Integer index, Integer inputType, String name, String description) {
+      this.index = index;
+      this.inputType = inputType;
+      this.name = name;
+      this.description = description;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("PowerSourceClusterBatChargeFaultChangeType {\n");
-      output.append("\tcurrent: ");
-      output.append(current);
+      output.append("MediaInputClusterInputInfo {\n");
+      output.append("\tindex: ");
+      output.append(index);
       output.append("\n");
-      output.append("\tprevious: ");
-      output.append(previous);
+      output.append("\tinputType: ");
+      output.append(inputType);
+      output.append("\n");
+      output.append("\tname: ");
+      output.append(name);
+      output.append("\n");
+      output.append("\tdescription: ");
+      output.append(description);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class PowerSourceClusterBatFaultChangeType {
-    public ArrayList<Object> current;
-    public ArrayList<Object> previous;
+  public static class ContentLauncherClusterDimension {
+    public Double width;
+    public Double height;
+    public Integer metric;
 
-    public PowerSourceClusterBatFaultChangeType(
-        ArrayList<Object> current, ArrayList<Object> previous) {
-      this.current = current;
-      this.previous = previous;
+    public ContentLauncherClusterDimension(Double width, Double height, Integer metric) {
+      this.width = width;
+      this.height = height;
+      this.metric = metric;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("PowerSourceClusterBatFaultChangeType {\n");
-      output.append("\tcurrent: ");
-      output.append(current);
+      output.append("ContentLauncherClusterDimension {\n");
+      output.append("\twidth: ");
+      output.append(width);
       output.append("\n");
-      output.append("\tprevious: ");
-      output.append(previous);
+      output.append("\theight: ");
+      output.append(height);
+      output.append("\n");
+      output.append("\tmetric: ");
+      output.append(metric);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class PowerSourceClusterWiredFaultChangeType {
-    public ArrayList<Object> current;
-    public ArrayList<Object> previous;
+  public static class ContentLauncherClusterAdditionalInfo {
+    public String name;
+    public String value;
 
-    public PowerSourceClusterWiredFaultChangeType(
-        ArrayList<Object> current, ArrayList<Object> previous) {
-      this.current = current;
-      this.previous = previous;
+    public ContentLauncherClusterAdditionalInfo(String name, String value) {
+      this.name = name;
+      this.value = value;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("PowerSourceClusterWiredFaultChangeType {\n");
-      output.append("\tcurrent: ");
-      output.append(current);
+      output.append("ContentLauncherClusterAdditionalInfo {\n");
+      output.append("\tname: ");
+      output.append(name);
       output.append("\n");
-      output.append("\tprevious: ");
-      output.append(previous);
+      output.append("\tvalue: ");
+      output.append(value);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class ScenesClusterAttributeValuePair {
-    public Optional<Long> attributeId;
-    public ArrayList<Object> attributeValue;
+  public static class ContentLauncherClusterParameter {
+    public Integer type;
+    public String value;
+    public Optional<ArrayList<ChipStructs.ContentLauncherClusterAdditionalInfo>> externalIDList;
 
-    public ScenesClusterAttributeValuePair(
-        Optional<Long> attributeId, ArrayList<Object> attributeValue) {
-      this.attributeId = attributeId;
-      this.attributeValue = attributeValue;
+    public ContentLauncherClusterParameter(
+        Integer type,
+        String value,
+        Optional<ArrayList<ChipStructs.ContentLauncherClusterAdditionalInfo>> externalIDList) {
+      this.type = type;
+      this.value = value;
+      this.externalIDList = externalIDList;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("ScenesClusterAttributeValuePair {\n");
-      output.append("\tattributeId: ");
-      output.append(attributeId);
+      output.append("ContentLauncherClusterParameter {\n");
+      output.append("\ttype: ");
+      output.append(type);
       output.append("\n");
-      output.append("\tattributeValue: ");
-      output.append(attributeValue);
+      output.append("\tvalue: ");
+      output.append(value);
+      output.append("\n");
+      output.append("\texternalIDList: ");
+      output.append(externalIDList);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class ScenesClusterExtensionFieldSet {
-    public Long clusterId;
-    public ArrayList<ChipStructs.ScenesClusterAttributeValuePair> attributeValueList;
+  public static class ContentLauncherClusterContentSearch {
+    public ArrayList<ChipStructs.ContentLauncherClusterParameter> parameterList;
 
-    public ScenesClusterExtensionFieldSet(
-        Long clusterId, ArrayList<ChipStructs.ScenesClusterAttributeValuePair> attributeValueList) {
-      this.clusterId = clusterId;
-      this.attributeValueList = attributeValueList;
+    public ContentLauncherClusterContentSearch(
+        ArrayList<ChipStructs.ContentLauncherClusterParameter> parameterList) {
+      this.parameterList = parameterList;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("ScenesClusterExtensionFieldSet {\n");
-      output.append("\tclusterId: ");
-      output.append(clusterId);
-      output.append("\n");
-      output.append("\tattributeValueList: ");
-      output.append(attributeValueList);
+      output.append("ContentLauncherClusterContentSearch {\n");
+      output.append("\tparameterList: ");
+      output.append(parameterList);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class SoftwareDiagnosticsClusterSoftwareFaultStruct {
-    public Long id;
-    public String name;
-    public byte[] faultRecording;
+  public static class ContentLauncherClusterStyleInformation {
+    public Optional<String> imageUrl;
+    public Optional<String> color;
+    public Optional<ChipStructs.ContentLauncherClusterDimension> size;
 
-    public SoftwareDiagnosticsClusterSoftwareFaultStruct(
-        Long id, String name, byte[] faultRecording) {
-      this.id = id;
-      this.name = name;
-      this.faultRecording = faultRecording;
+    public ContentLauncherClusterStyleInformation(
+        Optional<String> imageUrl,
+        Optional<String> color,
+        Optional<ChipStructs.ContentLauncherClusterDimension> size) {
+      this.imageUrl = imageUrl;
+      this.color = color;
+      this.size = size;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("SoftwareDiagnosticsClusterSoftwareFaultStruct {\n");
-      output.append("\tid: ");
-      output.append(id);
+      output.append("ContentLauncherClusterStyleInformation {\n");
+      output.append("\timageUrl: ");
+      output.append(imageUrl);
       output.append("\n");
-      output.append("\tname: ");
-      output.append(name);
+      output.append("\tcolor: ");
+      output.append(color);
       output.append("\n");
-      output.append("\tfaultRecording: ");
-      output.append(Arrays.toString(faultRecording));
+      output.append("\tsize: ");
+      output.append(size);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class SoftwareDiagnosticsClusterThreadMetrics {
-    public Long id;
-    public Optional<String> name;
-    public Optional<Long> stackFreeCurrent;
-    public Optional<Long> stackFreeMinimum;
-    public Optional<Long> stackSize;
+  public static class ContentLauncherClusterBrandingInformation {
+    public String providerName;
+    public Optional<ChipStructs.ContentLauncherClusterStyleInformation> background;
+    public Optional<ChipStructs.ContentLauncherClusterStyleInformation> logo;
+    public Optional<ChipStructs.ContentLauncherClusterStyleInformation> progressBar;
+    public Optional<ChipStructs.ContentLauncherClusterStyleInformation> splash;
+    public Optional<ChipStructs.ContentLauncherClusterStyleInformation> waterMark;
 
-    public SoftwareDiagnosticsClusterThreadMetrics(
-        Long id,
-        Optional<String> name,
-        Optional<Long> stackFreeCurrent,
-        Optional<Long> stackFreeMinimum,
-        Optional<Long> stackSize) {
-      this.id = id;
-      this.name = name;
-      this.stackFreeCurrent = stackFreeCurrent;
-      this.stackFreeMinimum = stackFreeMinimum;
-      this.stackSize = stackSize;
+    public ContentLauncherClusterBrandingInformation(
+        String providerName,
+        Optional<ChipStructs.ContentLauncherClusterStyleInformation> background,
+        Optional<ChipStructs.ContentLauncherClusterStyleInformation> logo,
+        Optional<ChipStructs.ContentLauncherClusterStyleInformation> progressBar,
+        Optional<ChipStructs.ContentLauncherClusterStyleInformation> splash,
+        Optional<ChipStructs.ContentLauncherClusterStyleInformation> waterMark) {
+      this.providerName = providerName;
+      this.background = background;
+      this.logo = logo;
+      this.progressBar = progressBar;
+      this.splash = splash;
+      this.waterMark = waterMark;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("SoftwareDiagnosticsClusterThreadMetrics {\n");
-      output.append("\tid: ");
-      output.append(id);
+      output.append("ContentLauncherClusterBrandingInformation {\n");
+      output.append("\tproviderName: ");
+      output.append(providerName);
       output.append("\n");
-      output.append("\tname: ");
-      output.append(name);
+      output.append("\tbackground: ");
+      output.append(background);
       output.append("\n");
-      output.append("\tstackFreeCurrent: ");
-      output.append(stackFreeCurrent);
+      output.append("\tlogo: ");
+      output.append(logo);
       output.append("\n");
-      output.append("\tstackFreeMinimum: ");
-      output.append(stackFreeMinimum);
+      output.append("\tprogressBar: ");
+      output.append(progressBar);
       output.append("\n");
-      output.append("\tstackSize: ");
-      output.append(stackSize);
+      output.append("\tsplash: ");
+      output.append(splash);
+      output.append("\n");
+      output.append("\twaterMark: ");
+      output.append(waterMark);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class TargetNavigatorClusterTargetInfo {
-    public Integer identifier;
+  public static class AudioOutputClusterOutputInfo {
+    public Integer index;
+    public Integer outputType;
     public String name;
 
-    public TargetNavigatorClusterTargetInfo(Integer identifier, String name) {
-      this.identifier = identifier;
+    public AudioOutputClusterOutputInfo(Integer index, Integer outputType, String name) {
+      this.index = index;
+      this.outputType = outputType;
       this.name = name;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("TargetNavigatorClusterTargetInfo {\n");
-      output.append("\tidentifier: ");
-      output.append(identifier);
+      output.append("AudioOutputClusterOutputInfo {\n");
+      output.append("\tindex: ");
+      output.append(index);
+      output.append("\n");
+      output.append("\toutputType: ");
+      output.append(outputType);
       output.append("\n");
       output.append("\tname: ");
       output.append(name);
@@ -1521,256 +1783,92 @@ public String toString() {
     }
   }
 
-  public static class TestClusterClusterSimpleStruct {
-    public Integer a;
-    public Boolean b;
-    public Integer c;
-    public byte[] d;
-    public String e;
-    public Integer f;
-    public Float g;
-    public Double h;
-
-    public TestClusterClusterSimpleStruct(
-        Integer a, Boolean b, Integer c, byte[] d, String e, Integer f, Float g, Double h) {
-      this.a = a;
-      this.b = b;
-      this.c = c;
-      this.d = d;
-      this.e = e;
-      this.f = f;
-      this.g = g;
-      this.h = h;
-    }
-
-    @Override
-    public String toString() {
-      StringBuilder output = new StringBuilder();
-      output.append("TestClusterClusterSimpleStruct {\n");
-      output.append("\ta: ");
-      output.append(a);
-      output.append("\n");
-      output.append("\tb: ");
-      output.append(b);
-      output.append("\n");
-      output.append("\tc: ");
-      output.append(c);
-      output.append("\n");
-      output.append("\td: ");
-      output.append(Arrays.toString(d));
-      output.append("\n");
-      output.append("\te: ");
-      output.append(e);
-      output.append("\n");
-      output.append("\tf: ");
-      output.append(f);
-      output.append("\n");
-      output.append("\tg: ");
-      output.append(g);
-      output.append("\n");
-      output.append("\th: ");
-      output.append(h);
-      output.append("\n");
-      output.append("}\n");
-      return output.toString();
-    }
-  }
-
-  public static class TestClusterClusterTestFabricScoped {
-    public Integer fabricSensitiveInt8u;
-    public Optional<Integer> optionalFabricSensitiveInt8u;
-    public @Nullable Integer nullableFabricSensitiveInt8u;
-    public @Nullable Optional<Integer> nullableOptionalFabricSensitiveInt8u;
-    public String fabricSensitiveCharString;
-    public ChipStructs.TestClusterClusterSimpleStruct fabricSensitiveStruct;
-    public ArrayList<Object> fabricSensitiveInt8uList;
-    public Integer fabricIndex;
+  public static class ApplicationLauncherClusterApplication {
+    public Integer catalogVendorId;
+    public String applicationId;
 
-    public TestClusterClusterTestFabricScoped(
-        Integer fabricSensitiveInt8u,
-        Optional<Integer> optionalFabricSensitiveInt8u,
-        @Nullable Integer nullableFabricSensitiveInt8u,
-        @Nullable Optional<Integer> nullableOptionalFabricSensitiveInt8u,
-        String fabricSensitiveCharString,
-        ChipStructs.TestClusterClusterSimpleStruct fabricSensitiveStruct,
-        ArrayList<Object> fabricSensitiveInt8uList,
-        Integer fabricIndex) {
-      this.fabricSensitiveInt8u = fabricSensitiveInt8u;
-      this.optionalFabricSensitiveInt8u = optionalFabricSensitiveInt8u;
-      this.nullableFabricSensitiveInt8u = nullableFabricSensitiveInt8u;
-      this.nullableOptionalFabricSensitiveInt8u = nullableOptionalFabricSensitiveInt8u;
-      this.fabricSensitiveCharString = fabricSensitiveCharString;
-      this.fabricSensitiveStruct = fabricSensitiveStruct;
-      this.fabricSensitiveInt8uList = fabricSensitiveInt8uList;
-      this.fabricIndex = fabricIndex;
+    public ApplicationLauncherClusterApplication(Integer catalogVendorId, String applicationId) {
+      this.catalogVendorId = catalogVendorId;
+      this.applicationId = applicationId;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("TestClusterClusterTestFabricScoped {\n");
-      output.append("\tfabricSensitiveInt8u: ");
-      output.append(fabricSensitiveInt8u);
-      output.append("\n");
-      output.append("\toptionalFabricSensitiveInt8u: ");
-      output.append(optionalFabricSensitiveInt8u);
-      output.append("\n");
-      output.append("\tnullableFabricSensitiveInt8u: ");
-      output.append(nullableFabricSensitiveInt8u);
-      output.append("\n");
-      output.append("\tnullableOptionalFabricSensitiveInt8u: ");
-      output.append(nullableOptionalFabricSensitiveInt8u);
-      output.append("\n");
-      output.append("\tfabricSensitiveCharString: ");
-      output.append(fabricSensitiveCharString);
-      output.append("\n");
-      output.append("\tfabricSensitiveStruct: ");
-      output.append(fabricSensitiveStruct);
-      output.append("\n");
-      output.append("\tfabricSensitiveInt8uList: ");
-      output.append(fabricSensitiveInt8uList);
+      output.append("ApplicationLauncherClusterApplication {\n");
+      output.append("\tcatalogVendorId: ");
+      output.append(catalogVendorId);
       output.append("\n");
-      output.append("\tfabricIndex: ");
-      output.append(fabricIndex);
+      output.append("\tapplicationId: ");
+      output.append(applicationId);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class TestClusterClusterNullablesAndOptionalsStruct {
-    public @Nullable Integer nullableInt;
-    public Optional<Integer> optionalInt;
-    public @Nullable Optional<Integer> nullableOptionalInt;
-    public @Nullable String nullableString;
-    public Optional<String> optionalString;
-    public @Nullable Optional<String> nullableOptionalString;
-    public @Nullable ChipStructs.TestClusterClusterSimpleStruct nullableStruct;
-    public Optional<ChipStructs.TestClusterClusterSimpleStruct> optionalStruct;
-    public @Nullable Optional<ChipStructs.TestClusterClusterSimpleStruct> nullableOptionalStruct;
-    public @Nullable ArrayList<Object> nullableList;
-    public Optional<ArrayList<Object>> optionalList;
-    public @Nullable Optional<ArrayList<Object>> nullableOptionalList;
+  public static class ApplicationLauncherClusterApplicationEP {
+    public ChipStructs.ApplicationLauncherClusterApplication application;
+    public Optional<Integer> endpoint;
 
-    public TestClusterClusterNullablesAndOptionalsStruct(
-        @Nullable Integer nullableInt,
-        Optional<Integer> optionalInt,
-        @Nullable Optional<Integer> nullableOptionalInt,
-        @Nullable String nullableString,
-        Optional<String> optionalString,
-        @Nullable Optional<String> nullableOptionalString,
-        @Nullable ChipStructs.TestClusterClusterSimpleStruct nullableStruct,
-        Optional<ChipStructs.TestClusterClusterSimpleStruct> optionalStruct,
-        @Nullable Optional<ChipStructs.TestClusterClusterSimpleStruct> nullableOptionalStruct,
-        @Nullable ArrayList<Object> nullableList,
-        Optional<ArrayList<Object>> optionalList,
-        @Nullable Optional<ArrayList<Object>> nullableOptionalList) {
-      this.nullableInt = nullableInt;
-      this.optionalInt = optionalInt;
-      this.nullableOptionalInt = nullableOptionalInt;
-      this.nullableString = nullableString;
-      this.optionalString = optionalString;
-      this.nullableOptionalString = nullableOptionalString;
-      this.nullableStruct = nullableStruct;
-      this.optionalStruct = optionalStruct;
-      this.nullableOptionalStruct = nullableOptionalStruct;
-      this.nullableList = nullableList;
-      this.optionalList = optionalList;
-      this.nullableOptionalList = nullableOptionalList;
+    public ApplicationLauncherClusterApplicationEP(
+        ChipStructs.ApplicationLauncherClusterApplication application, Optional<Integer> endpoint) {
+      this.application = application;
+      this.endpoint = endpoint;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("TestClusterClusterNullablesAndOptionalsStruct {\n");
-      output.append("\tnullableInt: ");
-      output.append(nullableInt);
-      output.append("\n");
-      output.append("\toptionalInt: ");
-      output.append(optionalInt);
-      output.append("\n");
-      output.append("\tnullableOptionalInt: ");
-      output.append(nullableOptionalInt);
-      output.append("\n");
-      output.append("\tnullableString: ");
-      output.append(nullableString);
-      output.append("\n");
-      output.append("\toptionalString: ");
-      output.append(optionalString);
-      output.append("\n");
-      output.append("\tnullableOptionalString: ");
-      output.append(nullableOptionalString);
-      output.append("\n");
-      output.append("\tnullableStruct: ");
-      output.append(nullableStruct);
-      output.append("\n");
-      output.append("\toptionalStruct: ");
-      output.append(optionalStruct);
-      output.append("\n");
-      output.append("\tnullableOptionalStruct: ");
-      output.append(nullableOptionalStruct);
-      output.append("\n");
-      output.append("\tnullableList: ");
-      output.append(nullableList);
-      output.append("\n");
-      output.append("\toptionalList: ");
-      output.append(optionalList);
+      output.append("ApplicationLauncherClusterApplicationEP {\n");
+      output.append("\tapplication: ");
+      output.append(application);
       output.append("\n");
-      output.append("\tnullableOptionalList: ");
-      output.append(nullableOptionalList);
+      output.append("\tendpoint: ");
+      output.append(endpoint);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class TestClusterClusterNestedStruct {
-    public Integer a;
-    public Boolean b;
-    public ChipStructs.TestClusterClusterSimpleStruct c;
+  public static class ApplicationBasicClusterApplicationBasicApplication {
+    public Integer catalogVendorId;
+    public String applicationId;
 
-    public TestClusterClusterNestedStruct(
-        Integer a, Boolean b, ChipStructs.TestClusterClusterSimpleStruct c) {
-      this.a = a;
-      this.b = b;
-      this.c = c;
+    public ApplicationBasicClusterApplicationBasicApplication(
+        Integer catalogVendorId, String applicationId) {
+      this.catalogVendorId = catalogVendorId;
+      this.applicationId = applicationId;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("TestClusterClusterNestedStruct {\n");
-      output.append("\ta: ");
-      output.append(a);
-      output.append("\n");
-      output.append("\tb: ");
-      output.append(b);
+      output.append("ApplicationBasicClusterApplicationBasicApplication {\n");
+      output.append("\tcatalogVendorId: ");
+      output.append(catalogVendorId);
       output.append("\n");
-      output.append("\tc: ");
-      output.append(c);
+      output.append("\tapplicationId: ");
+      output.append(applicationId);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class TestClusterClusterNestedStructList {
+  public static class TestClusterClusterSimpleStruct {
     public Integer a;
     public Boolean b;
-    public ChipStructs.TestClusterClusterSimpleStruct c;
-    public ArrayList<ChipStructs.TestClusterClusterSimpleStruct> d;
-    public ArrayList<Object> e;
-    public ArrayList<byte[]> f;
-    public ArrayList<Object> g;
+    public Integer c;
+    public byte[] d;
+    public String e;
+    public Integer f;
+    public Float g;
+    public Double h;
 
-    public TestClusterClusterNestedStructList(
-        Integer a,
-        Boolean b,
-        ChipStructs.TestClusterClusterSimpleStruct c,
-        ArrayList<ChipStructs.TestClusterClusterSimpleStruct> d,
-        ArrayList<Object> e,
-        ArrayList<byte[]> f,
-        ArrayList<Object> g) {
+    public TestClusterClusterSimpleStruct(
+        Integer a, Boolean b, Integer c, byte[] d, String e, Integer f, Float g, Double h) {
       this.a = a;
       this.b = b;
       this.c = c;
@@ -1778,12 +1876,13 @@ public TestClusterClusterNestedStructList(
       this.e = e;
       this.f = f;
       this.g = g;
+      this.h = h;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("TestClusterClusterNestedStructList {\n");
+      output.append("TestClusterClusterSimpleStruct {\n");
       output.append("\ta: ");
       output.append(a);
       output.append("\n");
@@ -1794,7 +1893,7 @@ public String toString() {
       output.append(c);
       output.append("\n");
       output.append("\td: ");
-      output.append(d);
+      output.append(Arrays.toString(d));
       output.append("\n");
       output.append("\te: ");
       output.append(e);
@@ -1805,385 +1904,286 @@ public String toString() {
       output.append("\tg: ");
       output.append(g);
       output.append("\n");
-      output.append("}\n");
-      return output.toString();
-    }
-  }
-
-  public static class TestClusterClusterDoubleNestedStructList {
-    public ArrayList<ChipStructs.TestClusterClusterNestedStructList> a;
-
-    public TestClusterClusterDoubleNestedStructList(
-        ArrayList<ChipStructs.TestClusterClusterNestedStructList> a) {
-      this.a = a;
-    }
-
-    @Override
-    public String toString() {
-      StringBuilder output = new StringBuilder();
-      output.append("TestClusterClusterDoubleNestedStructList {\n");
-      output.append("\ta: ");
-      output.append(a);
+      output.append("\th: ");
+      output.append(h);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class TestClusterClusterTestListStructOctet {
-    public Long member1;
-    public byte[] member2;
+  public static class TestClusterClusterTestFabricScoped {
+    public Integer fabricSensitiveInt8u;
+    public Optional<Integer> optionalFabricSensitiveInt8u;
+    public @Nullable Integer nullableFabricSensitiveInt8u;
+    public @Nullable Optional<Integer> nullableOptionalFabricSensitiveInt8u;
+    public String fabricSensitiveCharString;
+    public ChipStructs.TestClusterClusterSimpleStruct fabricSensitiveStruct;
+    public ArrayList<Object> fabricSensitiveInt8uList;
+    public Integer fabricIndex;
 
-    public TestClusterClusterTestListStructOctet(Long member1, byte[] member2) {
-      this.member1 = member1;
-      this.member2 = member2;
+    public TestClusterClusterTestFabricScoped(
+        Integer fabricSensitiveInt8u,
+        Optional<Integer> optionalFabricSensitiveInt8u,
+        @Nullable Integer nullableFabricSensitiveInt8u,
+        @Nullable Optional<Integer> nullableOptionalFabricSensitiveInt8u,
+        String fabricSensitiveCharString,
+        ChipStructs.TestClusterClusterSimpleStruct fabricSensitiveStruct,
+        ArrayList<Object> fabricSensitiveInt8uList,
+        Integer fabricIndex) {
+      this.fabricSensitiveInt8u = fabricSensitiveInt8u;
+      this.optionalFabricSensitiveInt8u = optionalFabricSensitiveInt8u;
+      this.nullableFabricSensitiveInt8u = nullableFabricSensitiveInt8u;
+      this.nullableOptionalFabricSensitiveInt8u = nullableOptionalFabricSensitiveInt8u;
+      this.fabricSensitiveCharString = fabricSensitiveCharString;
+      this.fabricSensitiveStruct = fabricSensitiveStruct;
+      this.fabricSensitiveInt8uList = fabricSensitiveInt8uList;
+      this.fabricIndex = fabricIndex;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("TestClusterClusterTestListStructOctet {\n");
-      output.append("\tmember1: ");
-      output.append(member1);
+      output.append("TestClusterClusterTestFabricScoped {\n");
+      output.append("\tfabricSensitiveInt8u: ");
+      output.append(fabricSensitiveInt8u);
       output.append("\n");
-      output.append("\tmember2: ");
-      output.append(Arrays.toString(member2));
+      output.append("\toptionalFabricSensitiveInt8u: ");
+      output.append(optionalFabricSensitiveInt8u);
       output.append("\n");
-      output.append("}\n");
-      return output.toString();
-    }
-  }
-
-  public static class ThermostatClusterThermostatScheduleTransition {
-    public Integer transitionTime;
-    public @Nullable Integer heatSetpoint;
-    public @Nullable Integer coolSetpoint;
-
-    public ThermostatClusterThermostatScheduleTransition(
-        Integer transitionTime, @Nullable Integer heatSetpoint, @Nullable Integer coolSetpoint) {
-      this.transitionTime = transitionTime;
-      this.heatSetpoint = heatSetpoint;
-      this.coolSetpoint = coolSetpoint;
-    }
-
-    @Override
-    public String toString() {
-      StringBuilder output = new StringBuilder();
-      output.append("ThermostatClusterThermostatScheduleTransition {\n");
-      output.append("\ttransitionTime: ");
-      output.append(transitionTime);
+      output.append("\tnullableFabricSensitiveInt8u: ");
+      output.append(nullableFabricSensitiveInt8u);
       output.append("\n");
-      output.append("\theatSetpoint: ");
-      output.append(heatSetpoint);
+      output.append("\tnullableOptionalFabricSensitiveInt8u: ");
+      output.append(nullableOptionalFabricSensitiveInt8u);
       output.append("\n");
-      output.append("\tcoolSetpoint: ");
-      output.append(coolSetpoint);
+      output.append("\tfabricSensitiveCharString: ");
+      output.append(fabricSensitiveCharString);
+      output.append("\n");
+      output.append("\tfabricSensitiveStruct: ");
+      output.append(fabricSensitiveStruct);
+      output.append("\n");
+      output.append("\tfabricSensitiveInt8uList: ");
+      output.append(fabricSensitiveInt8uList);
+      output.append("\n");
+      output.append("\tfabricIndex: ");
+      output.append(fabricIndex);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class ThreadNetworkDiagnosticsClusterNeighborTable {
-    public Long extAddress;
-    public Long age;
-    public Integer rloc16;
-    public Long linkFrameCounter;
-    public Long mleFrameCounter;
-    public Integer lqi;
-    public @Nullable Integer averageRssi;
-    public @Nullable Integer lastRssi;
-    public Integer frameErrorRate;
-    public Integer messageErrorRate;
-    public Boolean rxOnWhenIdle;
-    public Boolean fullThreadDevice;
-    public Boolean fullNetworkData;
-    public Boolean isChild;
+  public static class TestClusterClusterNullablesAndOptionalsStruct {
+    public @Nullable Integer nullableInt;
+    public Optional<Integer> optionalInt;
+    public @Nullable Optional<Integer> nullableOptionalInt;
+    public @Nullable String nullableString;
+    public Optional<String> optionalString;
+    public @Nullable Optional<String> nullableOptionalString;
+    public @Nullable ChipStructs.TestClusterClusterSimpleStruct nullableStruct;
+    public Optional<ChipStructs.TestClusterClusterSimpleStruct> optionalStruct;
+    public @Nullable Optional<ChipStructs.TestClusterClusterSimpleStruct> nullableOptionalStruct;
+    public @Nullable ArrayList<Object> nullableList;
+    public Optional<ArrayList<Object>> optionalList;
+    public @Nullable Optional<ArrayList<Object>> nullableOptionalList;
 
-    public ThreadNetworkDiagnosticsClusterNeighborTable(
-        Long extAddress,
-        Long age,
-        Integer rloc16,
-        Long linkFrameCounter,
-        Long mleFrameCounter,
-        Integer lqi,
-        @Nullable Integer averageRssi,
-        @Nullable Integer lastRssi,
-        Integer frameErrorRate,
-        Integer messageErrorRate,
-        Boolean rxOnWhenIdle,
-        Boolean fullThreadDevice,
-        Boolean fullNetworkData,
-        Boolean isChild) {
-      this.extAddress = extAddress;
-      this.age = age;
-      this.rloc16 = rloc16;
-      this.linkFrameCounter = linkFrameCounter;
-      this.mleFrameCounter = mleFrameCounter;
-      this.lqi = lqi;
-      this.averageRssi = averageRssi;
-      this.lastRssi = lastRssi;
-      this.frameErrorRate = frameErrorRate;
-      this.messageErrorRate = messageErrorRate;
-      this.rxOnWhenIdle = rxOnWhenIdle;
-      this.fullThreadDevice = fullThreadDevice;
-      this.fullNetworkData = fullNetworkData;
-      this.isChild = isChild;
+    public TestClusterClusterNullablesAndOptionalsStruct(
+        @Nullable Integer nullableInt,
+        Optional<Integer> optionalInt,
+        @Nullable Optional<Integer> nullableOptionalInt,
+        @Nullable String nullableString,
+        Optional<String> optionalString,
+        @Nullable Optional<String> nullableOptionalString,
+        @Nullable ChipStructs.TestClusterClusterSimpleStruct nullableStruct,
+        Optional<ChipStructs.TestClusterClusterSimpleStruct> optionalStruct,
+        @Nullable Optional<ChipStructs.TestClusterClusterSimpleStruct> nullableOptionalStruct,
+        @Nullable ArrayList<Object> nullableList,
+        Optional<ArrayList<Object>> optionalList,
+        @Nullable Optional<ArrayList<Object>> nullableOptionalList) {
+      this.nullableInt = nullableInt;
+      this.optionalInt = optionalInt;
+      this.nullableOptionalInt = nullableOptionalInt;
+      this.nullableString = nullableString;
+      this.optionalString = optionalString;
+      this.nullableOptionalString = nullableOptionalString;
+      this.nullableStruct = nullableStruct;
+      this.optionalStruct = optionalStruct;
+      this.nullableOptionalStruct = nullableOptionalStruct;
+      this.nullableList = nullableList;
+      this.optionalList = optionalList;
+      this.nullableOptionalList = nullableOptionalList;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("ThreadNetworkDiagnosticsClusterNeighborTable {\n");
-      output.append("\textAddress: ");
-      output.append(extAddress);
-      output.append("\n");
-      output.append("\tage: ");
-      output.append(age);
-      output.append("\n");
-      output.append("\trloc16: ");
-      output.append(rloc16);
+      output.append("TestClusterClusterNullablesAndOptionalsStruct {\n");
+      output.append("\tnullableInt: ");
+      output.append(nullableInt);
       output.append("\n");
-      output.append("\tlinkFrameCounter: ");
-      output.append(linkFrameCounter);
+      output.append("\toptionalInt: ");
+      output.append(optionalInt);
       output.append("\n");
-      output.append("\tmleFrameCounter: ");
-      output.append(mleFrameCounter);
+      output.append("\tnullableOptionalInt: ");
+      output.append(nullableOptionalInt);
       output.append("\n");
-      output.append("\tlqi: ");
-      output.append(lqi);
+      output.append("\tnullableString: ");
+      output.append(nullableString);
       output.append("\n");
-      output.append("\taverageRssi: ");
-      output.append(averageRssi);
+      output.append("\toptionalString: ");
+      output.append(optionalString);
       output.append("\n");
-      output.append("\tlastRssi: ");
-      output.append(lastRssi);
+      output.append("\tnullableOptionalString: ");
+      output.append(nullableOptionalString);
       output.append("\n");
-      output.append("\tframeErrorRate: ");
-      output.append(frameErrorRate);
+      output.append("\tnullableStruct: ");
+      output.append(nullableStruct);
       output.append("\n");
-      output.append("\tmessageErrorRate: ");
-      output.append(messageErrorRate);
+      output.append("\toptionalStruct: ");
+      output.append(optionalStruct);
       output.append("\n");
-      output.append("\trxOnWhenIdle: ");
-      output.append(rxOnWhenIdle);
+      output.append("\tnullableOptionalStruct: ");
+      output.append(nullableOptionalStruct);
       output.append("\n");
-      output.append("\tfullThreadDevice: ");
-      output.append(fullThreadDevice);
+      output.append("\tnullableList: ");
+      output.append(nullableList);
       output.append("\n");
-      output.append("\tfullNetworkData: ");
-      output.append(fullNetworkData);
+      output.append("\toptionalList: ");
+      output.append(optionalList);
       output.append("\n");
-      output.append("\tisChild: ");
-      output.append(isChild);
+      output.append("\tnullableOptionalList: ");
+      output.append(nullableOptionalList);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class ThreadNetworkDiagnosticsClusterOperationalDatasetComponents {
-    public Boolean activeTimestampPresent;
-    public Boolean pendingTimestampPresent;
-    public Boolean masterKeyPresent;
-    public Boolean networkNamePresent;
-    public Boolean extendedPanIdPresent;
-    public Boolean meshLocalPrefixPresent;
-    public Boolean delayPresent;
-    public Boolean panIdPresent;
-    public Boolean channelPresent;
-    public Boolean pskcPresent;
-    public Boolean securityPolicyPresent;
-    public Boolean channelMaskPresent;
+  public static class TestClusterClusterNestedStruct {
+    public Integer a;
+    public Boolean b;
+    public ChipStructs.TestClusterClusterSimpleStruct c;
 
-    public ThreadNetworkDiagnosticsClusterOperationalDatasetComponents(
-        Boolean activeTimestampPresent,
-        Boolean pendingTimestampPresent,
-        Boolean masterKeyPresent,
-        Boolean networkNamePresent,
-        Boolean extendedPanIdPresent,
-        Boolean meshLocalPrefixPresent,
-        Boolean delayPresent,
-        Boolean panIdPresent,
-        Boolean channelPresent,
-        Boolean pskcPresent,
-        Boolean securityPolicyPresent,
-        Boolean channelMaskPresent) {
-      this.activeTimestampPresent = activeTimestampPresent;
-      this.pendingTimestampPresent = pendingTimestampPresent;
-      this.masterKeyPresent = masterKeyPresent;
-      this.networkNamePresent = networkNamePresent;
-      this.extendedPanIdPresent = extendedPanIdPresent;
-      this.meshLocalPrefixPresent = meshLocalPrefixPresent;
-      this.delayPresent = delayPresent;
-      this.panIdPresent = panIdPresent;
-      this.channelPresent = channelPresent;
-      this.pskcPresent = pskcPresent;
-      this.securityPolicyPresent = securityPolicyPresent;
-      this.channelMaskPresent = channelMaskPresent;
+    public TestClusterClusterNestedStruct(
+        Integer a, Boolean b, ChipStructs.TestClusterClusterSimpleStruct c) {
+      this.a = a;
+      this.b = b;
+      this.c = c;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("ThreadNetworkDiagnosticsClusterOperationalDatasetComponents {\n");
-      output.append("\tactiveTimestampPresent: ");
-      output.append(activeTimestampPresent);
-      output.append("\n");
-      output.append("\tpendingTimestampPresent: ");
-      output.append(pendingTimestampPresent);
-      output.append("\n");
-      output.append("\tmasterKeyPresent: ");
-      output.append(masterKeyPresent);
-      output.append("\n");
-      output.append("\tnetworkNamePresent: ");
-      output.append(networkNamePresent);
-      output.append("\n");
-      output.append("\textendedPanIdPresent: ");
-      output.append(extendedPanIdPresent);
-      output.append("\n");
-      output.append("\tmeshLocalPrefixPresent: ");
-      output.append(meshLocalPrefixPresent);
-      output.append("\n");
-      output.append("\tdelayPresent: ");
-      output.append(delayPresent);
-      output.append("\n");
-      output.append("\tpanIdPresent: ");
-      output.append(panIdPresent);
-      output.append("\n");
-      output.append("\tchannelPresent: ");
-      output.append(channelPresent);
-      output.append("\n");
-      output.append("\tpskcPresent: ");
-      output.append(pskcPresent);
+      output.append("TestClusterClusterNestedStruct {\n");
+      output.append("\ta: ");
+      output.append(a);
       output.append("\n");
-      output.append("\tsecurityPolicyPresent: ");
-      output.append(securityPolicyPresent);
+      output.append("\tb: ");
+      output.append(b);
       output.append("\n");
-      output.append("\tchannelMaskPresent: ");
-      output.append(channelMaskPresent);
+      output.append("\tc: ");
+      output.append(c);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class ThreadNetworkDiagnosticsClusterRouteTable {
-    public Long extAddress;
-    public Integer rloc16;
-    public Integer routerId;
-    public Integer nextHop;
-    public Integer pathCost;
-    public Integer LQIIn;
-    public Integer LQIOut;
-    public Integer age;
-    public Boolean allocated;
-    public Boolean linkEstablished;
+  public static class TestClusterClusterNestedStructList {
+    public Integer a;
+    public Boolean b;
+    public ChipStructs.TestClusterClusterSimpleStruct c;
+    public ArrayList<ChipStructs.TestClusterClusterSimpleStruct> d;
+    public ArrayList<Object> e;
+    public ArrayList<byte[]> f;
+    public ArrayList<Object> g;
 
-    public ThreadNetworkDiagnosticsClusterRouteTable(
-        Long extAddress,
-        Integer rloc16,
-        Integer routerId,
-        Integer nextHop,
-        Integer pathCost,
-        Integer LQIIn,
-        Integer LQIOut,
-        Integer age,
-        Boolean allocated,
-        Boolean linkEstablished) {
-      this.extAddress = extAddress;
-      this.rloc16 = rloc16;
-      this.routerId = routerId;
-      this.nextHop = nextHop;
-      this.pathCost = pathCost;
-      this.LQIIn = LQIIn;
-      this.LQIOut = LQIOut;
-      this.age = age;
-      this.allocated = allocated;
-      this.linkEstablished = linkEstablished;
+    public TestClusterClusterNestedStructList(
+        Integer a,
+        Boolean b,
+        ChipStructs.TestClusterClusterSimpleStruct c,
+        ArrayList<ChipStructs.TestClusterClusterSimpleStruct> d,
+        ArrayList<Object> e,
+        ArrayList<byte[]> f,
+        ArrayList<Object> g) {
+      this.a = a;
+      this.b = b;
+      this.c = c;
+      this.d = d;
+      this.e = e;
+      this.f = f;
+      this.g = g;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("ThreadNetworkDiagnosticsClusterRouteTable {\n");
-      output.append("\textAddress: ");
-      output.append(extAddress);
-      output.append("\n");
-      output.append("\trloc16: ");
-      output.append(rloc16);
-      output.append("\n");
-      output.append("\trouterId: ");
-      output.append(routerId);
-      output.append("\n");
-      output.append("\tnextHop: ");
-      output.append(nextHop);
+      output.append("TestClusterClusterNestedStructList {\n");
+      output.append("\ta: ");
+      output.append(a);
       output.append("\n");
-      output.append("\tpathCost: ");
-      output.append(pathCost);
+      output.append("\tb: ");
+      output.append(b);
       output.append("\n");
-      output.append("\tLQIIn: ");
-      output.append(LQIIn);
+      output.append("\tc: ");
+      output.append(c);
       output.append("\n");
-      output.append("\tLQIOut: ");
-      output.append(LQIOut);
+      output.append("\td: ");
+      output.append(d);
       output.append("\n");
-      output.append("\tage: ");
-      output.append(age);
+      output.append("\te: ");
+      output.append(e);
       output.append("\n");
-      output.append("\tallocated: ");
-      output.append(allocated);
+      output.append("\tf: ");
+      output.append(f);
       output.append("\n");
-      output.append("\tlinkEstablished: ");
-      output.append(linkEstablished);
+      output.append("\tg: ");
+      output.append(g);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class ThreadNetworkDiagnosticsClusterSecurityPolicy {
-    public Integer rotationTime;
-    public Integer flags;
+  public static class TestClusterClusterDoubleNestedStructList {
+    public ArrayList<ChipStructs.TestClusterClusterNestedStructList> a;
 
-    public ThreadNetworkDiagnosticsClusterSecurityPolicy(Integer rotationTime, Integer flags) {
-      this.rotationTime = rotationTime;
-      this.flags = flags;
+    public TestClusterClusterDoubleNestedStructList(
+        ArrayList<ChipStructs.TestClusterClusterNestedStructList> a) {
+      this.a = a;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("ThreadNetworkDiagnosticsClusterSecurityPolicy {\n");
-      output.append("\trotationTime: ");
-      output.append(rotationTime);
-      output.append("\n");
-      output.append("\tflags: ");
-      output.append(flags);
+      output.append("TestClusterClusterDoubleNestedStructList {\n");
+      output.append("\ta: ");
+      output.append(a);
       output.append("\n");
       output.append("}\n");
       return output.toString();
     }
   }
 
-  public static class UserLabelClusterLabelStruct {
-    public String label;
-    public String value;
+  public static class TestClusterClusterTestListStructOctet {
+    public Long member1;
+    public byte[] member2;
 
-    public UserLabelClusterLabelStruct(String label, String value) {
-      this.label = label;
-      this.value = value;
+    public TestClusterClusterTestListStructOctet(Long member1, byte[] member2) {
+      this.member1 = member1;
+      this.member2 = member2;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("UserLabelClusterLabelStruct {\n");
-      output.append("\tlabel: ");
-      output.append(label);
+      output.append("TestClusterClusterTestListStructOctet {\n");
+      output.append("\tmember1: ");
+      output.append(member1);
       output.append("\n");
-      output.append("\tvalue: ");
-      output.append(value);
+      output.append("\tmember2: ");
+      output.append(Arrays.toString(member2));
       output.append("\n");
       output.append("}\n");
       return output.toString();
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index 1ebc4db7f06805..95d98652258667 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -222,8 +222,9 @@ public void onError(Exception e) {
     }
   }
 
-  public static class DelegatedAccessControlClusterAclAttributeCallback
-      implements ChipClusters.AccessControlCluster.AclAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedIdentifyClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.IdentifyCluster.GeneratedCommandListAttributeCallback,
+          DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
     @Override
@@ -232,11 +233,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.AccessControlClusterAccessControlEntry> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo(
-              "valueList", "List<ChipStructs.AccessControlClusterAccessControlEntry>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -247,8 +246,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedAccessControlClusterExtensionAttributeCallback
-      implements ChipClusters.AccessControlCluster.ExtensionAttributeCallback,
+  public static class DelegatedIdentifyClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.IdentifyCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -258,11 +257,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.AccessControlClusterExtensionEntry> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo(
-              "valueList", "List<ChipStructs.AccessControlClusterExtensionEntry>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -273,8 +270,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedAccessControlClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.AccessControlCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedIdentifyClusterAttributeListAttributeCallback
+      implements ChipClusters.IdentifyCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -297,9 +294,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedAccessControlClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.AccessControlCluster.AcceptedCommandListAttributeCallback,
-          DelegatedClusterCallback {
+  public static class DelegatedAddGroupResponseCallback
+      implements ChipClusters.GroupsCluster.AddGroupResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
     @Override
@@ -308,22 +304,23 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(Integer status, Integer groupId) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo groupIdResponseValue = new CommandResponseInfo("groupId", "Integer");
+      responseValues.put(groupIdResponseValue, groupId);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedAccessControlClusterAttributeListAttributeCallback
-      implements ChipClusters.AccessControlCluster.AttributeListAttributeCallback,
-          DelegatedClusterCallback {
+  public static class DelegatedViewGroupResponseCallback
+      implements ChipClusters.GroupsCluster.ViewGroupResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
     @Override
@@ -332,21 +329,25 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(Integer status, Integer groupId, String groupName) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo groupIdResponseValue = new CommandResponseInfo("groupId", "Integer");
+      responseValues.put(groupIdResponseValue, groupId);
+      CommandResponseInfo groupNameResponseValue = new CommandResponseInfo("groupName", "String");
+      responseValues.put(groupNameResponseValue, groupName);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedGetSetupPINResponseCallback
-      implements ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback,
+  public static class DelegatedGetGroupMembershipResponseCallback
+      implements ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -356,10 +357,12 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(String setupPIN) {
+    public void onSuccess(@Nullable Integer capacity, ArrayList<Integer> groupList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("setupPIN", "String");
-      responseValues.put(setupPINResponseValue, setupPIN);
+      CommandResponseInfo capacityResponseValue = new CommandResponseInfo("capacity", "Integer");
+      responseValues.put(capacityResponseValue, capacity);
+      // groupList: /* TYPE WARNING: array array defaults to */ uint8_t *
+      // Conversion from this type to Java is not properly implemented yet
       callback.onSuccess(responseValues);
     }
 
@@ -369,9 +372,8 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedAccountLoginClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.AccountLoginCluster.GeneratedCommandListAttributeCallback,
-          DelegatedClusterCallback {
+  public static class DelegatedRemoveGroupResponseCallback
+      implements ChipClusters.GroupsCluster.RemoveGroupResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
     @Override
@@ -380,21 +382,23 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(Integer status, Integer groupId) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo groupIdResponseValue = new CommandResponseInfo("groupId", "Integer");
+      responseValues.put(groupIdResponseValue, groupId);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedAccountLoginClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.AccountLoginCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedGroupsClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.GroupsCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -417,8 +421,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedAccountLoginClusterAttributeListAttributeCallback
-      implements ChipClusters.AccountLoginCluster.AttributeListAttributeCallback,
+  public static class DelegatedGroupsClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.GroupsCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -441,10 +445,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static
-  class DelegatedAdministratorCommissioningClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.AdministratorCommissioningCluster
-              .GeneratedCommandListAttributeCallback,
+  public static class DelegatedGroupsClusterAttributeListAttributeCallback
+      implements ChipClusters.GroupsCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -467,10 +469,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedAdministratorCommissioningClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.AdministratorCommissioningCluster
-              .AcceptedCommandListAttributeCallback,
-          DelegatedClusterCallback {
+  public static class DelegatedAddSceneResponseCallback
+      implements ChipClusters.ScenesCluster.AddSceneResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
     @Override
@@ -479,22 +479,25 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(Integer Status, Integer GroupId, Integer SceneId) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
+      responseValues.put(StatusResponseValue, Status);
+      CommandResponseInfo GroupIdResponseValue = new CommandResponseInfo("GroupId", "Integer");
+      responseValues.put(GroupIdResponseValue, GroupId);
+      CommandResponseInfo SceneIdResponseValue = new CommandResponseInfo("SceneId", "Integer");
+      responseValues.put(SceneIdResponseValue, SceneId);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedAdministratorCommissioningClusterAttributeListAttributeCallback
-      implements ChipClusters.AdministratorCommissioningCluster.AttributeListAttributeCallback,
-          DelegatedClusterCallback {
+  public static class DelegatedViewSceneResponseCallback
+      implements ChipClusters.ScenesCluster.ViewSceneResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
     @Override
@@ -503,22 +506,39 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(
+        Integer Status,
+        Integer GroupId,
+        Integer SceneId,
+        Optional<Integer> TransitionTime,
+        Optional<String> SceneName,
+        Optional<ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>> ExtensionFieldSets) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
+      responseValues.put(StatusResponseValue, Status);
+      CommandResponseInfo GroupIdResponseValue = new CommandResponseInfo("GroupId", "Integer");
+      responseValues.put(GroupIdResponseValue, GroupId);
+      CommandResponseInfo SceneIdResponseValue = new CommandResponseInfo("SceneId", "Integer");
+      responseValues.put(SceneIdResponseValue, SceneId);
+      CommandResponseInfo TransitionTimeResponseValue =
+          new CommandResponseInfo("TransitionTime", "Optional<Integer>");
+      responseValues.put(TransitionTimeResponseValue, TransitionTime);
+      CommandResponseInfo SceneNameResponseValue =
+          new CommandResponseInfo("SceneName", "Optional<String>");
+      responseValues.put(SceneNameResponseValue, SceneName);
+      // ExtensionFieldSets: /* TYPE WARNING: array array defaults to */ uint8_t *
+      // Conversion from this type to Java is not properly implemented yet
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedApplicationBasicClusterAllowedVendorListAttributeCallback
-      implements ChipClusters.ApplicationBasicCluster.AllowedVendorListAttributeCallback,
-          DelegatedClusterCallback {
+  public static class DelegatedRemoveSceneResponseCallback
+      implements ChipClusters.ScenesCluster.RemoveSceneResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
     @Override
@@ -527,22 +547,25 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Integer> valueList) {
+    public void onSuccess(Integer Status, Integer GroupId, Integer SceneId) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo("valueList", "List<Integer>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
+      responseValues.put(StatusResponseValue, Status);
+      CommandResponseInfo GroupIdResponseValue = new CommandResponseInfo("GroupId", "Integer");
+      responseValues.put(GroupIdResponseValue, GroupId);
+      CommandResponseInfo SceneIdResponseValue = new CommandResponseInfo("SceneId", "Integer");
+      responseValues.put(SceneIdResponseValue, SceneId);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedApplicationBasicClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.ApplicationBasicCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedRemoveAllScenesResponseCallback
+      implements ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -552,22 +575,23 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(Integer Status, Integer GroupId) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
+      responseValues.put(StatusResponseValue, Status);
+      CommandResponseInfo GroupIdResponseValue = new CommandResponseInfo("GroupId", "Integer");
+      responseValues.put(GroupIdResponseValue, GroupId);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedApplicationBasicClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.ApplicationBasicCluster.AcceptedCommandListAttributeCallback,
-          DelegatedClusterCallback {
+  public static class DelegatedStoreSceneResponseCallback
+      implements ChipClusters.ScenesCluster.StoreSceneResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
     @Override
@@ -576,21 +600,25 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(Integer Status, Integer GroupId, Integer SceneId) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
+      responseValues.put(StatusResponseValue, Status);
+      CommandResponseInfo GroupIdResponseValue = new CommandResponseInfo("GroupId", "Integer");
+      responseValues.put(GroupIdResponseValue, GroupId);
+      CommandResponseInfo SceneIdResponseValue = new CommandResponseInfo("SceneId", "Integer");
+      responseValues.put(SceneIdResponseValue, SceneId);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedApplicationBasicClusterAttributeListAttributeCallback
-      implements ChipClusters.ApplicationBasicCluster.AttributeListAttributeCallback,
+  public static class DelegatedGetSceneMembershipResponseCallback
+      implements ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -600,21 +628,31 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(
+        Integer Status,
+        @Nullable Integer Capacity,
+        Integer GroupId,
+        Optional<ArrayList<Integer>> SceneList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
+      responseValues.put(StatusResponseValue, Status);
+      CommandResponseInfo CapacityResponseValue = new CommandResponseInfo("Capacity", "Integer");
+      responseValues.put(CapacityResponseValue, Capacity);
+      CommandResponseInfo GroupIdResponseValue = new CommandResponseInfo("GroupId", "Integer");
+      responseValues.put(GroupIdResponseValue, GroupId);
+      // SceneList: /* TYPE WARNING: array array defaults to */ uint8_t *
+      // Conversion from this type to Java is not properly implemented yet
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedLauncherResponseCallback
-      implements ChipClusters.ApplicationLauncherCluster.LauncherResponseCallback,
+  public static class DelegatedScenesClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.ScenesCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -624,23 +662,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Integer status, byte[] data) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
-      responseValues.put(statusResponseValue, status);
-      CommandResponseInfo dataResponseValue = new CommandResponseInfo("data", "byte[]");
-      responseValues.put(dataResponseValue, data);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedApplicationLauncherClusterCatalogListAttributeCallback
-      implements ChipClusters.ApplicationLauncherCluster.CatalogListAttributeCallback,
+  public static class DelegatedScenesClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.ScenesCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -650,10 +686,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Integer> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo("valueList", "List<Integer>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -664,8 +699,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedApplicationLauncherClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.ApplicationLauncherCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedScenesClusterAttributeListAttributeCallback
+      implements ChipClusters.ScenesCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -688,8 +723,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedApplicationLauncherClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.ApplicationLauncherCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedOnOffClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.OnOffCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -712,8 +747,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedApplicationLauncherClusterAttributeListAttributeCallback
-      implements ChipClusters.ApplicationLauncherCluster.AttributeListAttributeCallback,
+  public static class DelegatedOnOffClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.OnOffCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -736,8 +771,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedAudioOutputClusterOutputListAttributeCallback
-      implements ChipClusters.AudioOutputCluster.OutputListAttributeCallback,
+  public static class DelegatedOnOffClusterAttributeListAttributeCallback
+      implements ChipClusters.OnOffCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -747,10 +782,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.AudioOutputClusterOutputInfo> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo("valueList", "List<ChipStructs.AudioOutputClusterOutputInfo>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -761,8 +795,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedAudioOutputClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.AudioOutputCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedOnOffSwitchConfigurationClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.OnOffSwitchConfigurationCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -785,8 +819,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedAudioOutputClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.AudioOutputCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedOnOffSwitchConfigurationClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.OnOffSwitchConfigurationCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -809,8 +843,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedAudioOutputClusterAttributeListAttributeCallback
-      implements ChipClusters.AudioOutputCluster.AttributeListAttributeCallback,
+  public static class DelegatedOnOffSwitchConfigurationClusterAttributeListAttributeCallback
+      implements ChipClusters.OnOffSwitchConfigurationCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -833,8 +867,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedBarrierControlClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.BarrierControlCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedLevelControlClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.LevelControlCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -857,8 +891,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedBarrierControlClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.BarrierControlCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedLevelControlClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.LevelControlCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -881,8 +915,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedBarrierControlClusterAttributeListAttributeCallback
-      implements ChipClusters.BarrierControlCluster.AttributeListAttributeCallback,
+  public static class DelegatedLevelControlClusterAttributeListAttributeCallback
+      implements ChipClusters.LevelControlCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -905,8 +939,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedBasicClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.BasicCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedBinaryInputBasicClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.BinaryInputBasicCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -929,8 +963,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedBasicClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.BasicCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedBinaryInputBasicClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.BinaryInputBasicCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -953,8 +987,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedBasicClusterAttributeListAttributeCallback
-      implements ChipClusters.BasicCluster.AttributeListAttributeCallback,
+  public static class DelegatedBinaryInputBasicClusterAttributeListAttributeCallback
+      implements ChipClusters.BinaryInputBasicCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -977,8 +1011,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedBinaryInputBasicClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.BinaryInputBasicCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedDescriptorClusterDeviceListAttributeCallback
+      implements ChipClusters.DescriptorCluster.DeviceListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -988,9 +1022,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<ChipStructs.DescriptorClusterDeviceType> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo("valueList", "List<ChipStructs.DescriptorClusterDeviceType>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -1001,8 +1036,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedBinaryInputBasicClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.BinaryInputBasicCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedDescriptorClusterServerListAttributeCallback
+      implements ChipClusters.DescriptorCluster.ServerListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1025,8 +1060,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedBinaryInputBasicClusterAttributeListAttributeCallback
-      implements ChipClusters.BinaryInputBasicCluster.AttributeListAttributeCallback,
+  public static class DelegatedDescriptorClusterClientListAttributeCallback
+      implements ChipClusters.DescriptorCluster.ClientListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1049,8 +1084,9 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedBindingClusterBindingAttributeCallback
-      implements ChipClusters.BindingCluster.BindingAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedDescriptorClusterPartsListAttributeCallback
+      implements ChipClusters.DescriptorCluster.PartsListAttributeCallback,
+          DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
     @Override
@@ -1059,10 +1095,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.BindingClusterTargetStruct> valueList) {
+    public void onSuccess(List<Integer> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
       CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo("valueList", "List<ChipStructs.BindingClusterTargetStruct>");
+          new CommandResponseInfo("valueList", "List<Integer>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -1073,8 +1109,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedBindingClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.BindingCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedDescriptorClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.DescriptorCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1097,8 +1133,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedBindingClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.BindingCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedDescriptorClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.DescriptorCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1121,8 +1157,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedBindingClusterAttributeListAttributeCallback
-      implements ChipClusters.BindingCluster.AttributeListAttributeCallback,
+  public static class DelegatedDescriptorClusterAttributeListAttributeCallback
+      implements ChipClusters.DescriptorCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1145,9 +1181,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedBooleanStateClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.BooleanStateCluster.GeneratedCommandListAttributeCallback,
-          DelegatedClusterCallback {
+  public static class DelegatedBindingClusterBindingAttributeCallback
+      implements ChipClusters.BindingCluster.BindingAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
     @Override
@@ -1156,9 +1191,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<ChipStructs.BindingClusterTargetStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo("valueList", "List<ChipStructs.BindingClusterTargetStruct>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -1169,8 +1205,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedBooleanStateClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.BooleanStateCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedBindingClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.BindingCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1193,8 +1229,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedBooleanStateClusterAttributeListAttributeCallback
-      implements ChipClusters.BooleanStateCluster.AttributeListAttributeCallback,
+  public static class DelegatedBindingClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.BindingCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1217,8 +1253,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedBridgedActionsClusterActionListAttributeCallback
-      implements ChipClusters.BridgedActionsCluster.ActionListAttributeCallback,
+  public static class DelegatedBindingClusterAttributeListAttributeCallback
+      implements ChipClusters.BindingCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1228,11 +1264,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.BridgedActionsClusterActionStruct> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo(
-              "valueList", "List<ChipStructs.BridgedActionsClusterActionStruct>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -1243,9 +1277,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedBridgedActionsClusterEndpointListAttributeCallback
-      implements ChipClusters.BridgedActionsCluster.EndpointListAttributeCallback,
-          DelegatedClusterCallback {
+  public static class DelegatedAccessControlClusterAclAttributeCallback
+      implements ChipClusters.AccessControlCluster.AclAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
     @Override
@@ -1254,35 +1287,11 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.BridgedActionsClusterEndpointListStruct> valueList) {
+    public void onSuccess(List<ChipStructs.AccessControlClusterAccessControlEntry> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
       CommandResponseInfo commandResponseInfo =
           new CommandResponseInfo(
-              "valueList", "List<ChipStructs.BridgedActionsClusterEndpointListStruct>");
-      responseValues.put(commandResponseInfo, valueList);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
-    }
-  }
-
-  public static class DelegatedBridgedActionsClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.BridgedActionsCluster.GeneratedCommandListAttributeCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(List<Long> valueList) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+              "valueList", "List<ChipStructs.AccessControlClusterAccessControlEntry>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -1293,8 +1302,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedBridgedActionsClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.BridgedActionsCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedAccessControlClusterExtensionAttributeCallback
+      implements ChipClusters.AccessControlCluster.ExtensionAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1304,9 +1313,11 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<ChipStructs.AccessControlClusterExtensionEntry> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo(
+              "valueList", "List<ChipStructs.AccessControlClusterExtensionEntry>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -1317,8 +1328,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedBridgedActionsClusterAttributeListAttributeCallback
-      implements ChipClusters.BridgedActionsCluster.AttributeListAttributeCallback,
+  public static class DelegatedAccessControlClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.AccessControlCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1341,8 +1352,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedBridgedDeviceBasicClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.BridgedDeviceBasicCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedAccessControlClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.AccessControlCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1365,8 +1376,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedBridgedDeviceBasicClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.BridgedDeviceBasicCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedAccessControlClusterAttributeListAttributeCallback
+      implements ChipClusters.AccessControlCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1389,8 +1400,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedBridgedDeviceBasicClusterAttributeListAttributeCallback
-      implements ChipClusters.BridgedDeviceBasicCluster.AttributeListAttributeCallback,
+  public static class DelegatedBridgedActionsClusterActionListAttributeCallback
+      implements ChipClusters.BridgedActionsCluster.ActionListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1400,9 +1411,11 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<ChipStructs.BridgedActionsClusterActionStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo(
+              "valueList", "List<ChipStructs.BridgedActionsClusterActionStruct>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -1413,34 +1426,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedChangeChannelResponseCallback
-      implements ChipClusters.ChannelCluster.ChangeChannelResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(Integer status, Optional<String> data) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
-      responseValues.put(statusResponseValue, status);
-      CommandResponseInfo dataResponseValue = new CommandResponseInfo("data", "Optional<String>");
-      responseValues.put(dataResponseValue, data);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public static class DelegatedChannelClusterChannelListAttributeCallback
-      implements ChipClusters.ChannelCluster.ChannelListAttributeCallback,
+  public static class DelegatedBridgedActionsClusterEndpointListAttributeCallback
+      implements ChipClusters.BridgedActionsCluster.EndpointListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1450,10 +1437,11 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.ChannelClusterChannelInfo> valueList) {
+    public void onSuccess(List<ChipStructs.BridgedActionsClusterEndpointListStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
       CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo("valueList", "List<ChipStructs.ChannelClusterChannelInfo>");
+          new CommandResponseInfo(
+              "valueList", "List<ChipStructs.BridgedActionsClusterEndpointListStruct>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -1464,8 +1452,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedChannelClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.ChannelCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedBridgedActionsClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.BridgedActionsCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1488,8 +1476,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedChannelClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.ChannelCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedBridgedActionsClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.BridgedActionsCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1512,8 +1500,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedChannelClusterAttributeListAttributeCallback
-      implements ChipClusters.ChannelCluster.AttributeListAttributeCallback,
+  public static class DelegatedBridgedActionsClusterAttributeListAttributeCallback
+      implements ChipClusters.BridgedActionsCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1536,8 +1524,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedColorControlClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.ColorControlCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedBasicClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.BasicCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1560,8 +1548,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedColorControlClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.ColorControlCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedBasicClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.BasicCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1584,8 +1572,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedColorControlClusterAttributeListAttributeCallback
-      implements ChipClusters.ColorControlCluster.AttributeListAttributeCallback,
+  public static class DelegatedBasicClusterAttributeListAttributeCallback
+      implements ChipClusters.BasicCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1608,8 +1596,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaunchResponseCallback
-      implements ChipClusters.ContentLauncherCluster.LaunchResponseCallback,
+  public static class DelegatedQueryImageResponseCallback
+      implements ChipClusters.OtaSoftwareUpdateProviderCluster.QueryImageResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1619,12 +1607,39 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Integer status, Optional<String> data) {
+    public void onSuccess(
+        Integer status,
+        Optional<Long> delayedActionTime,
+        Optional<String> imageURI,
+        Optional<Long> softwareVersion,
+        Optional<String> softwareVersionString,
+        Optional<byte[]> updateToken,
+        Optional<Boolean> userConsentNeeded,
+        Optional<byte[]> metadataForRequestor) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
       CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
       responseValues.put(statusResponseValue, status);
-      CommandResponseInfo dataResponseValue = new CommandResponseInfo("data", "Optional<String>");
-      responseValues.put(dataResponseValue, data);
+      CommandResponseInfo delayedActionTimeResponseValue =
+          new CommandResponseInfo("delayedActionTime", "Optional<Long>");
+      responseValues.put(delayedActionTimeResponseValue, delayedActionTime);
+      CommandResponseInfo imageURIResponseValue =
+          new CommandResponseInfo("imageURI", "Optional<String>");
+      responseValues.put(imageURIResponseValue, imageURI);
+      CommandResponseInfo softwareVersionResponseValue =
+          new CommandResponseInfo("softwareVersion", "Optional<Long>");
+      responseValues.put(softwareVersionResponseValue, softwareVersion);
+      CommandResponseInfo softwareVersionStringResponseValue =
+          new CommandResponseInfo("softwareVersionString", "Optional<String>");
+      responseValues.put(softwareVersionStringResponseValue, softwareVersionString);
+      CommandResponseInfo updateTokenResponseValue =
+          new CommandResponseInfo("updateToken", "Optional<byte[]>");
+      responseValues.put(updateTokenResponseValue, updateToken);
+      CommandResponseInfo userConsentNeededResponseValue =
+          new CommandResponseInfo("userConsentNeeded", "Optional<Boolean>");
+      responseValues.put(userConsentNeededResponseValue, userConsentNeeded);
+      CommandResponseInfo metadataForRequestorResponseValue =
+          new CommandResponseInfo("metadataForRequestor", "Optional<byte[]>");
+      responseValues.put(metadataForRequestorResponseValue, metadataForRequestor);
       callback.onSuccess(responseValues);
     }
 
@@ -1634,8 +1649,8 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedContentLauncherClusterAcceptHeaderAttributeCallback
-      implements ChipClusters.ContentLauncherCluster.AcceptHeaderAttributeCallback,
+  public static class DelegatedApplyUpdateResponseCallback
+      implements ChipClusters.OtaSoftwareUpdateProviderCluster.ApplyUpdateResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1645,22 +1660,24 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<String> valueList) {
+    public void onSuccess(Integer action, Long delayedActionTime) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo("valueList", "List<String>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo actionResponseValue = new CommandResponseInfo("action", "Integer");
+      responseValues.put(actionResponseValue, action);
+      CommandResponseInfo delayedActionTimeResponseValue =
+          new CommandResponseInfo("delayedActionTime", "Long");
+      responseValues.put(delayedActionTimeResponseValue, delayedActionTime);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedContentLauncherClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.ContentLauncherCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedOtaSoftwareUpdateProviderClusterAttributeListAttributeCallback
+      implements ChipClusters.OtaSoftwareUpdateProviderCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1683,8 +1700,9 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedContentLauncherClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.ContentLauncherCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedOtaSoftwareUpdateRequestorClusterDefaultOtaProvidersAttributeCallback
+      implements ChipClusters.OtaSoftwareUpdateRequestorCluster
+              .DefaultOtaProvidersAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1694,9 +1712,12 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(
+        List<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo(
+              "valueList", "List<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -1707,8 +1728,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedContentLauncherClusterAttributeListAttributeCallback
-      implements ChipClusters.ContentLauncherCluster.AttributeListAttributeCallback,
+  public static class DelegatedOtaSoftwareUpdateRequestorClusterAttributeListAttributeCallback
+      implements ChipClusters.OtaSoftwareUpdateRequestorCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1731,8 +1752,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDescriptorClusterDeviceListAttributeCallback
-      implements ChipClusters.DescriptorCluster.DeviceListAttributeCallback,
+  public static class DelegatedLocalizationConfigurationClusterSupportedLocalesAttributeCallback
+      implements ChipClusters.LocalizationConfigurationCluster.SupportedLocalesAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1742,10 +1763,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.DescriptorClusterDeviceType> valueList) {
+    public void onSuccess(List<String> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
       CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo("valueList", "List<ChipStructs.DescriptorClusterDeviceType>");
+          new CommandResponseInfo("valueList", "List<String>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -1756,8 +1777,9 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDescriptorClusterServerListAttributeCallback
-      implements ChipClusters.DescriptorCluster.ServerListAttributeCallback,
+  public static class DelegatedLocalizationConfigurationClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.LocalizationConfigurationCluster
+              .GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1780,8 +1802,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDescriptorClusterClientListAttributeCallback
-      implements ChipClusters.DescriptorCluster.ClientListAttributeCallback,
+  public static class DelegatedLocalizationConfigurationClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.LocalizationConfigurationCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1804,8 +1826,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDescriptorClusterPartsListAttributeCallback
-      implements ChipClusters.DescriptorCluster.PartsListAttributeCallback,
+  public static class DelegatedTimeFormatLocalizationClusterSupportedCalendarTypesAttributeCallback
+      implements ChipClusters.TimeFormatLocalizationCluster.SupportedCalendarTypesAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1829,8 +1851,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDescriptorClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.DescriptorCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedTimeFormatLocalizationClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.TimeFormatLocalizationCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1853,8 +1875,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDescriptorClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.DescriptorCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedTimeFormatLocalizationClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.TimeFormatLocalizationCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1877,8 +1899,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDescriptorClusterAttributeListAttributeCallback
-      implements ChipClusters.DescriptorCluster.AttributeListAttributeCallback,
+  public static class DelegatedUnitLocalizationClusterAttributeListAttributeCallback
+      implements ChipClusters.UnitLocalizationCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1901,8 +1923,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRetrieveLogsResponseCallback
-      implements ChipClusters.DiagnosticLogsCluster.RetrieveLogsResponseCallback,
+  public static class DelegatedPowerSourceConfigurationClusterSourcesAttributeCallback
+      implements ChipClusters.PowerSourceConfigurationCluster.SourcesAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1912,28 +1934,22 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Integer status, byte[] content, Long timeStamp, Long timeSinceBoot) {
+    public void onSuccess(List<Integer> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
-      responseValues.put(statusResponseValue, status);
-      CommandResponseInfo contentResponseValue = new CommandResponseInfo("content", "byte[]");
-      responseValues.put(contentResponseValue, content);
-      CommandResponseInfo timeStampResponseValue = new CommandResponseInfo("timeStamp", "Long");
-      responseValues.put(timeStampResponseValue, timeStamp);
-      CommandResponseInfo timeSinceBootResponseValue =
-          new CommandResponseInfo("timeSinceBoot", "Long");
-      responseValues.put(timeSinceBootResponseValue, timeSinceBoot);
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo("valueList", "List<Integer>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedDiagnosticLogsClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.DiagnosticLogsCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedPowerSourceConfigurationClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.PowerSourceConfigurationCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1956,8 +1972,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDiagnosticLogsClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.DiagnosticLogsCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedPowerSourceConfigurationClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.PowerSourceConfigurationCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -1980,8 +1996,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDiagnosticLogsClusterAttributeListAttributeCallback
-      implements ChipClusters.DiagnosticLogsCluster.AttributeListAttributeCallback,
+  public static class DelegatedPowerSourceConfigurationClusterAttributeListAttributeCallback
+      implements ChipClusters.PowerSourceConfigurationCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2004,8 +2020,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedGetCredentialStatusResponseCallback
-      implements ChipClusters.DoorLockCluster.GetCredentialStatusResponseCallback,
+  public static class DelegatedPowerSourceClusterActiveWiredFaultsAttributeCallback
+      implements ChipClusters.PowerSourceCluster.ActiveWiredFaultsAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2015,38 +2031,22 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(
-        Boolean credentialExists,
-        @Nullable Integer userIndex,
-        @Nullable Integer creatorFabricIndex,
-        @Nullable Integer lastModifiedFabricIndex,
-        @Nullable Integer nextCredentialIndex) {
+    public void onSuccess(List<Integer> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo credentialExistsResponseValue =
-          new CommandResponseInfo("credentialExists", "Boolean");
-      responseValues.put(credentialExistsResponseValue, credentialExists);
-      CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "Integer");
-      responseValues.put(userIndexResponseValue, userIndex);
-      CommandResponseInfo creatorFabricIndexResponseValue =
-          new CommandResponseInfo("creatorFabricIndex", "Integer");
-      responseValues.put(creatorFabricIndexResponseValue, creatorFabricIndex);
-      CommandResponseInfo lastModifiedFabricIndexResponseValue =
-          new CommandResponseInfo("lastModifiedFabricIndex", "Integer");
-      responseValues.put(lastModifiedFabricIndexResponseValue, lastModifiedFabricIndex);
-      CommandResponseInfo nextCredentialIndexResponseValue =
-          new CommandResponseInfo("nextCredentialIndex", "Integer");
-      responseValues.put(nextCredentialIndexResponseValue, nextCredentialIndex);
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo("valueList", "List<Integer>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedGetHolidayScheduleResponseCallback
-      implements ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback,
+  public static class DelegatedPowerSourceClusterActiveBatteryFaultsAttributeCallback
+      implements ChipClusters.PowerSourceCluster.ActiveBatteryFaultsAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2056,38 +2056,23 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(
-        Integer holidayIndex,
-        Integer status,
-        Optional<Long> localStartTime,
-        Optional<Long> localEndTime,
-        Optional<Integer> operatingMode) {
+    public void onSuccess(List<Integer> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo holidayIndexResponseValue =
-          new CommandResponseInfo("holidayIndex", "Integer");
-      responseValues.put(holidayIndexResponseValue, holidayIndex);
-      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
-      responseValues.put(statusResponseValue, status);
-      CommandResponseInfo localStartTimeResponseValue =
-          new CommandResponseInfo("localStartTime", "Optional<Long>");
-      responseValues.put(localStartTimeResponseValue, localStartTime);
-      CommandResponseInfo localEndTimeResponseValue =
-          new CommandResponseInfo("localEndTime", "Optional<Long>");
-      responseValues.put(localEndTimeResponseValue, localEndTime);
-      CommandResponseInfo operatingModeResponseValue =
-          new CommandResponseInfo("operatingMode", "Optional<Integer>");
-      responseValues.put(operatingModeResponseValue, operatingMode);
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo("valueList", "List<Integer>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedGetUserResponseCallback
-      implements ChipClusters.DoorLockCluster.GetUserResponseCallback, DelegatedClusterCallback {
+  public static class DelegatedPowerSourceClusterActiveBatteryChargeFaultsAttributeCallback
+      implements ChipClusters.PowerSourceCluster.ActiveBatteryChargeFaultsAttributeCallback,
+          DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
     @Override
@@ -2096,55 +2081,22 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(
-        Integer userIndex,
-        @Nullable String userName,
-        @Nullable Long userUniqueId,
-        @Nullable Integer userStatus,
-        @Nullable Integer userType,
-        @Nullable Integer credentialRule,
-        @Nullable ArrayList<ChipStructs.DoorLockClusterDlCredential> credentials,
-        @Nullable Integer creatorFabricIndex,
-        @Nullable Integer lastModifiedFabricIndex,
-        @Nullable Integer nextUserIndex) {
+    public void onSuccess(List<Integer> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "Integer");
-      responseValues.put(userIndexResponseValue, userIndex);
-      CommandResponseInfo userNameResponseValue = new CommandResponseInfo("userName", "String");
-      responseValues.put(userNameResponseValue, userName);
-      CommandResponseInfo userUniqueIdResponseValue =
-          new CommandResponseInfo("userUniqueId", "Long");
-      responseValues.put(userUniqueIdResponseValue, userUniqueId);
-      CommandResponseInfo userStatusResponseValue =
-          new CommandResponseInfo("userStatus", "Integer");
-      responseValues.put(userStatusResponseValue, userStatus);
-      CommandResponseInfo userTypeResponseValue = new CommandResponseInfo("userType", "Integer");
-      responseValues.put(userTypeResponseValue, userType);
-      CommandResponseInfo credentialRuleResponseValue =
-          new CommandResponseInfo("credentialRule", "Integer");
-      responseValues.put(credentialRuleResponseValue, credentialRule);
-      // credentials: /* TYPE WARNING: array array defaults to */ uint8_t *
-      // Conversion from this type to Java is not properly implemented yet
-      CommandResponseInfo creatorFabricIndexResponseValue =
-          new CommandResponseInfo("creatorFabricIndex", "Integer");
-      responseValues.put(creatorFabricIndexResponseValue, creatorFabricIndex);
-      CommandResponseInfo lastModifiedFabricIndexResponseValue =
-          new CommandResponseInfo("lastModifiedFabricIndex", "Integer");
-      responseValues.put(lastModifiedFabricIndexResponseValue, lastModifiedFabricIndex);
-      CommandResponseInfo nextUserIndexResponseValue =
-          new CommandResponseInfo("nextUserIndex", "Integer");
-      responseValues.put(nextUserIndexResponseValue, nextUserIndex);
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo("valueList", "List<Integer>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedGetWeekDayScheduleResponseCallback
-      implements ChipClusters.DoorLockCluster.GetWeekDayScheduleResponseCallback,
+  public static class DelegatedPowerSourceClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.PowerSourceCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2154,49 +2106,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(
-        Integer weekDayIndex,
-        Integer userIndex,
-        Integer status,
-        Optional<Integer> daysMask,
-        Optional<Integer> startHour,
-        Optional<Integer> startMinute,
-        Optional<Integer> endHour,
-        Optional<Integer> endMinute) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo weekDayIndexResponseValue =
-          new CommandResponseInfo("weekDayIndex", "Integer");
-      responseValues.put(weekDayIndexResponseValue, weekDayIndex);
-      CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "Integer");
-      responseValues.put(userIndexResponseValue, userIndex);
-      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
-      responseValues.put(statusResponseValue, status);
-      CommandResponseInfo daysMaskResponseValue =
-          new CommandResponseInfo("daysMask", "Optional<Integer>");
-      responseValues.put(daysMaskResponseValue, daysMask);
-      CommandResponseInfo startHourResponseValue =
-          new CommandResponseInfo("startHour", "Optional<Integer>");
-      responseValues.put(startHourResponseValue, startHour);
-      CommandResponseInfo startMinuteResponseValue =
-          new CommandResponseInfo("startMinute", "Optional<Integer>");
-      responseValues.put(startMinuteResponseValue, startMinute);
-      CommandResponseInfo endHourResponseValue =
-          new CommandResponseInfo("endHour", "Optional<Integer>");
-      responseValues.put(endHourResponseValue, endHour);
-      CommandResponseInfo endMinuteResponseValue =
-          new CommandResponseInfo("endMinute", "Optional<Integer>");
-      responseValues.put(endMinuteResponseValue, endMinute);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedGetYearDayScheduleResponseCallback
-      implements ChipClusters.DoorLockCluster.GetYearDayScheduleResponseCallback,
+  public static class DelegatedPowerSourceClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.PowerSourceCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2206,37 +2130,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(
-        Integer yearDayIndex,
-        Integer userIndex,
-        Integer status,
-        Optional<Long> localStartTime,
-        Optional<Long> localEndTime) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo yearDayIndexResponseValue =
-          new CommandResponseInfo("yearDayIndex", "Integer");
-      responseValues.put(yearDayIndexResponseValue, yearDayIndex);
-      CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "Integer");
-      responseValues.put(userIndexResponseValue, userIndex);
-      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
-      responseValues.put(statusResponseValue, status);
-      CommandResponseInfo localStartTimeResponseValue =
-          new CommandResponseInfo("localStartTime", "Optional<Long>");
-      responseValues.put(localStartTimeResponseValue, localStartTime);
-      CommandResponseInfo localEndTimeResponseValue =
-          new CommandResponseInfo("localEndTime", "Optional<Long>");
-      responseValues.put(localEndTimeResponseValue, localEndTime);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedSetCredentialResponseCallback
-      implements ChipClusters.DoorLockCluster.SetCredentialResponseCallback,
+  public static class DelegatedPowerSourceClusterAttributeListAttributeCallback
+      implements ChipClusters.PowerSourceCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2246,27 +2154,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(
-        Integer status, @Nullable Integer userIndex, @Nullable Integer nextCredentialIndex) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
-      responseValues.put(statusResponseValue, status);
-      CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "Integer");
-      responseValues.put(userIndexResponseValue, userIndex);
-      CommandResponseInfo nextCredentialIndexResponseValue =
-          new CommandResponseInfo("nextCredentialIndex", "Integer");
-      responseValues.put(nextCredentialIndexResponseValue, nextCredentialIndex);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedDoorLockClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.DoorLockCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedArmFailSafeResponseCallback
+      implements ChipClusters.GeneralCommissioningCluster.ArmFailSafeResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2276,21 +2178,23 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(Integer errorCode, String debugText) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo errorCodeResponseValue = new CommandResponseInfo("errorCode", "Integer");
+      responseValues.put(errorCodeResponseValue, errorCode);
+      CommandResponseInfo debugTextResponseValue = new CommandResponseInfo("debugText", "String");
+      responseValues.put(debugTextResponseValue, debugText);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedDoorLockClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.DoorLockCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedSetRegulatoryConfigResponseCallback
+      implements ChipClusters.GeneralCommissioningCluster.SetRegulatoryConfigResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2300,21 +2204,23 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(Integer errorCode, String debugText) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo errorCodeResponseValue = new CommandResponseInfo("errorCode", "Integer");
+      responseValues.put(errorCodeResponseValue, errorCode);
+      CommandResponseInfo debugTextResponseValue = new CommandResponseInfo("debugText", "String");
+      responseValues.put(debugTextResponseValue, debugText);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedDoorLockClusterAttributeListAttributeCallback
-      implements ChipClusters.DoorLockCluster.AttributeListAttributeCallback,
+  public static class DelegatedCommissioningCompleteResponseCallback
+      implements ChipClusters.GeneralCommissioningCluster.CommissioningCompleteResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2324,21 +2230,23 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(Integer errorCode, String debugText) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo errorCodeResponseValue = new CommandResponseInfo("errorCode", "Integer");
+      responseValues.put(errorCodeResponseValue, errorCode);
+      CommandResponseInfo debugTextResponseValue = new CommandResponseInfo("debugText", "String");
+      responseValues.put(debugTextResponseValue, debugText);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedElectricalMeasurementClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.ElectricalMeasurementCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedGeneralCommissioningClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.GeneralCommissioningCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2361,8 +2269,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedElectricalMeasurementClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.ElectricalMeasurementCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedGeneralCommissioningClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.GeneralCommissioningCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2385,8 +2293,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedElectricalMeasurementClusterAttributeListAttributeCallback
-      implements ChipClusters.ElectricalMeasurementCluster.AttributeListAttributeCallback,
+  public static class DelegatedGeneralCommissioningClusterAttributeListAttributeCallback
+      implements ChipClusters.GeneralCommissioningCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2409,10 +2317,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static
-  class DelegatedEthernetNetworkDiagnosticsClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.EthernetNetworkDiagnosticsCluster
-              .GeneratedCommandListAttributeCallback,
+  public static class DelegatedScanNetworksResponseCallback
+      implements ChipClusters.NetworkCommissioningCluster.ScanNetworksResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2422,22 +2328,35 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(
+        Integer NetworkingStatus,
+        Optional<String> DebugText,
+        Optional<ArrayList<ChipStructs.NetworkCommissioningClusterWiFiInterfaceScanResult>>
+            WiFiScanResults,
+        Optional<ArrayList<ChipStructs.NetworkCommissioningClusterThreadInterfaceScanResult>>
+            ThreadScanResults) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo NetworkingStatusResponseValue =
+          new CommandResponseInfo("NetworkingStatus", "Integer");
+      responseValues.put(NetworkingStatusResponseValue, NetworkingStatus);
+      CommandResponseInfo DebugTextResponseValue =
+          new CommandResponseInfo("DebugText", "Optional<String>");
+      responseValues.put(DebugTextResponseValue, DebugText);
+      // WiFiScanResults: /* TYPE WARNING: array array defaults to */ uint8_t *
+      // Conversion from this type to Java is not properly implemented yet
+      // ThreadScanResults: /* TYPE WARNING: array array defaults to */ uint8_t *
+      // Conversion from this type to Java is not properly implemented yet
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedEthernetNetworkDiagnosticsClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.EthernetNetworkDiagnosticsCluster
-              .AcceptedCommandListAttributeCallback,
+  public static class DelegatedNetworkConfigResponseCallback
+      implements ChipClusters.NetworkCommissioningCluster.NetworkConfigResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2447,21 +2366,29 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(
+        Integer NetworkingStatus, Optional<String> DebugText, Optional<Integer> NetworkIndex) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo NetworkingStatusResponseValue =
+          new CommandResponseInfo("NetworkingStatus", "Integer");
+      responseValues.put(NetworkingStatusResponseValue, NetworkingStatus);
+      CommandResponseInfo DebugTextResponseValue =
+          new CommandResponseInfo("DebugText", "Optional<String>");
+      responseValues.put(DebugTextResponseValue, DebugText);
+      CommandResponseInfo NetworkIndexResponseValue =
+          new CommandResponseInfo("NetworkIndex", "Optional<Integer>");
+      responseValues.put(NetworkIndexResponseValue, NetworkIndex);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedEthernetNetworkDiagnosticsClusterAttributeListAttributeCallback
-      implements ChipClusters.EthernetNetworkDiagnosticsCluster.AttributeListAttributeCallback,
+  public static class DelegatedConnectNetworkResponseCallback
+      implements ChipClusters.NetworkCommissioningCluster.ConnectNetworkResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2471,21 +2398,28 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(
+        Integer NetworkingStatus, Optional<String> DebugText, @Nullable Long ErrorValue) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo NetworkingStatusResponseValue =
+          new CommandResponseInfo("NetworkingStatus", "Integer");
+      responseValues.put(NetworkingStatusResponseValue, NetworkingStatus);
+      CommandResponseInfo DebugTextResponseValue =
+          new CommandResponseInfo("DebugText", "Optional<String>");
+      responseValues.put(DebugTextResponseValue, DebugText);
+      CommandResponseInfo ErrorValueResponseValue = new CommandResponseInfo("ErrorValue", "Long");
+      responseValues.put(ErrorValueResponseValue, ErrorValue);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedFanControlClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.FanControlCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedNetworkCommissioningClusterNetworksAttributeCallback
+      implements ChipClusters.NetworkCommissioningCluster.NetworksAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2495,9 +2429,11 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<ChipStructs.NetworkCommissioningClusterNetworkInfo> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo(
+              "valueList", "List<ChipStructs.NetworkCommissioningClusterNetworkInfo>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -2508,8 +2444,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedFanControlClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.FanControlCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedNetworkCommissioningClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.NetworkCommissioningCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2532,8 +2468,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedFanControlClusterAttributeListAttributeCallback
-      implements ChipClusters.FanControlCluster.AttributeListAttributeCallback,
+  public static class DelegatedNetworkCommissioningClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.NetworkCommissioningCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2556,8 +2492,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedFixedLabelClusterLabelListAttributeCallback
-      implements ChipClusters.FixedLabelCluster.LabelListAttributeCallback,
+  public static class DelegatedRetrieveLogsResponseCallback
+      implements ChipClusters.DiagnosticLogsCluster.RetrieveLogsResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2567,22 +2503,28 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.FixedLabelClusterLabelStruct> valueList) {
+    public void onSuccess(Integer status, byte[] content, Long timeStamp, Long timeSinceBoot) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo("valueList", "List<ChipStructs.FixedLabelClusterLabelStruct>");
-      responseValues.put(commandResponseInfo, valueList);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
-    }
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo contentResponseValue = new CommandResponseInfo("content", "byte[]");
+      responseValues.put(contentResponseValue, content);
+      CommandResponseInfo timeStampResponseValue = new CommandResponseInfo("timeStamp", "Long");
+      responseValues.put(timeStampResponseValue, timeStamp);
+      CommandResponseInfo timeSinceBootResponseValue =
+          new CommandResponseInfo("timeSinceBoot", "Long");
+      responseValues.put(timeSinceBootResponseValue, timeSinceBoot);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
   }
 
-  public static class DelegatedFixedLabelClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.FixedLabelCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedDiagnosticLogsClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.DiagnosticLogsCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2605,8 +2547,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedFixedLabelClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.FixedLabelCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedDiagnosticLogsClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.DiagnosticLogsCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2629,8 +2571,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedFixedLabelClusterAttributeListAttributeCallback
-      implements ChipClusters.FixedLabelCluster.AttributeListAttributeCallback,
+  public static class DelegatedDiagnosticLogsClusterAttributeListAttributeCallback
+      implements ChipClusters.DiagnosticLogsCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2653,8 +2595,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedFlowMeasurementClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.FlowMeasurementCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedGeneralDiagnosticsClusterNetworkInterfacesAttributeCallback
+      implements ChipClusters.GeneralDiagnosticsCluster.NetworkInterfacesAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2664,9 +2606,12 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(
+        List<ChipStructs.GeneralDiagnosticsClusterNetworkInterfaceType> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo(
+              "valueList", "List<ChipStructs.GeneralDiagnosticsClusterNetworkInterfaceType>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -2677,8 +2622,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedFlowMeasurementClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.FlowMeasurementCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedGeneralDiagnosticsClusterActiveHardwareFaultsAttributeCallback
+      implements ChipClusters.GeneralDiagnosticsCluster.ActiveHardwareFaultsAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2688,9 +2633,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<Integer> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo("valueList", "List<Integer>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -2701,8 +2647,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedFlowMeasurementClusterAttributeListAttributeCallback
-      implements ChipClusters.FlowMeasurementCluster.AttributeListAttributeCallback,
+  public static class DelegatedGeneralDiagnosticsClusterActiveRadioFaultsAttributeCallback
+      implements ChipClusters.GeneralDiagnosticsCluster.ActiveRadioFaultsAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2712,9 +2658,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<Integer> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo("valueList", "List<Integer>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -2725,8 +2672,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedArmFailSafeResponseCallback
-      implements ChipClusters.GeneralCommissioningCluster.ArmFailSafeResponseCallback,
+  public static class DelegatedGeneralDiagnosticsClusterActiveNetworkFaultsAttributeCallback
+      implements ChipClusters.GeneralDiagnosticsCluster.ActiveNetworkFaultsAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2736,23 +2683,22 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Integer errorCode, String debugText) {
+    public void onSuccess(List<Integer> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo errorCodeResponseValue = new CommandResponseInfo("errorCode", "Integer");
-      responseValues.put(errorCodeResponseValue, errorCode);
-      CommandResponseInfo debugTextResponseValue = new CommandResponseInfo("debugText", "String");
-      responseValues.put(debugTextResponseValue, debugText);
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo("valueList", "List<Integer>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedCommissioningCompleteResponseCallback
-      implements ChipClusters.GeneralCommissioningCluster.CommissioningCompleteResponseCallback,
+  public static class DelegatedGeneralDiagnosticsClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.GeneralDiagnosticsCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2762,23 +2708,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Integer errorCode, String debugText) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo errorCodeResponseValue = new CommandResponseInfo("errorCode", "Integer");
-      responseValues.put(errorCodeResponseValue, errorCode);
-      CommandResponseInfo debugTextResponseValue = new CommandResponseInfo("debugText", "String");
-      responseValues.put(debugTextResponseValue, debugText);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedSetRegulatoryConfigResponseCallback
-      implements ChipClusters.GeneralCommissioningCluster.SetRegulatoryConfigResponseCallback,
+  public static class DelegatedGeneralDiagnosticsClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.GeneralDiagnosticsCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2788,23 +2732,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Integer errorCode, String debugText) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo errorCodeResponseValue = new CommandResponseInfo("errorCode", "Integer");
-      responseValues.put(errorCodeResponseValue, errorCode);
-      CommandResponseInfo debugTextResponseValue = new CommandResponseInfo("debugText", "String");
-      responseValues.put(debugTextResponseValue, debugText);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedGeneralCommissioningClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.GeneralCommissioningCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedGeneralDiagnosticsClusterAttributeListAttributeCallback
+      implements ChipClusters.GeneralDiagnosticsCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2827,8 +2769,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedGeneralCommissioningClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.GeneralCommissioningCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedSoftwareDiagnosticsClusterThreadMetricsAttributeCallback
+      implements ChipClusters.SoftwareDiagnosticsCluster.ThreadMetricsAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2838,9 +2780,11 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<ChipStructs.SoftwareDiagnosticsClusterThreadMetrics> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo(
+              "valueList", "List<ChipStructs.SoftwareDiagnosticsClusterThreadMetrics>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -2851,8 +2795,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedGeneralCommissioningClusterAttributeListAttributeCallback
-      implements ChipClusters.GeneralCommissioningCluster.AttributeListAttributeCallback,
+  public static class DelegatedSoftwareDiagnosticsClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.SoftwareDiagnosticsCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2875,8 +2819,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedGeneralDiagnosticsClusterNetworkInterfacesAttributeCallback
-      implements ChipClusters.GeneralDiagnosticsCluster.NetworkInterfacesAttributeCallback,
+  public static class DelegatedSoftwareDiagnosticsClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.SoftwareDiagnosticsCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2886,12 +2830,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(
-        List<ChipStructs.GeneralDiagnosticsClusterNetworkInterfaceType> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo(
-              "valueList", "List<ChipStructs.GeneralDiagnosticsClusterNetworkInterfaceType>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -2902,8 +2843,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedGeneralDiagnosticsClusterActiveHardwareFaultsAttributeCallback
-      implements ChipClusters.GeneralDiagnosticsCluster.ActiveHardwareFaultsAttributeCallback,
+  public static class DelegatedSoftwareDiagnosticsClusterAttributeListAttributeCallback
+      implements ChipClusters.SoftwareDiagnosticsCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2913,10 +2854,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Integer> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo("valueList", "List<Integer>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -2927,8 +2867,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedGeneralDiagnosticsClusterActiveRadioFaultsAttributeCallback
-      implements ChipClusters.GeneralDiagnosticsCluster.ActiveRadioFaultsAttributeCallback,
+  public static class DelegatedThreadNetworkDiagnosticsClusterNeighborTableListAttributeCallback
+      implements ChipClusters.ThreadNetworkDiagnosticsCluster.NeighborTableListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2938,10 +2878,12 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Integer> valueList) {
+    public void onSuccess(
+        List<ChipStructs.ThreadNetworkDiagnosticsClusterNeighborTable> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
       CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo("valueList", "List<Integer>");
+          new CommandResponseInfo(
+              "valueList", "List<ChipStructs.ThreadNetworkDiagnosticsClusterNeighborTable>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -2952,8 +2894,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedGeneralDiagnosticsClusterActiveNetworkFaultsAttributeCallback
-      implements ChipClusters.GeneralDiagnosticsCluster.ActiveNetworkFaultsAttributeCallback,
+  public static class DelegatedThreadNetworkDiagnosticsClusterRouteTableListAttributeCallback
+      implements ChipClusters.ThreadNetworkDiagnosticsCluster.RouteTableListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2963,10 +2905,11 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Integer> valueList) {
+    public void onSuccess(List<ChipStructs.ThreadNetworkDiagnosticsClusterRouteTable> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
       CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo("valueList", "List<Integer>");
+          new CommandResponseInfo(
+              "valueList", "List<ChipStructs.ThreadNetworkDiagnosticsClusterRouteTable>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -2977,8 +2920,10 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedGeneralDiagnosticsClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.GeneralDiagnosticsCluster.GeneratedCommandListAttributeCallback,
+  public static
+  class DelegatedThreadNetworkDiagnosticsClusterActiveNetworkFaultsListAttributeCallback
+      implements ChipClusters.ThreadNetworkDiagnosticsCluster
+              .ActiveNetworkFaultsListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -2988,9 +2933,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<Integer> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo("valueList", "List<Integer>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -3001,8 +2947,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedGeneralDiagnosticsClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.GeneralDiagnosticsCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedThreadNetworkDiagnosticsClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.ThreadNetworkDiagnosticsCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3025,8 +2971,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedGeneralDiagnosticsClusterAttributeListAttributeCallback
-      implements ChipClusters.GeneralDiagnosticsCluster.AttributeListAttributeCallback,
+  public static class DelegatedThreadNetworkDiagnosticsClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.ThreadNetworkDiagnosticsCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3049,8 +2995,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedKeySetReadAllIndicesResponseCallback
-      implements ChipClusters.GroupKeyManagementCluster.KeySetReadAllIndicesResponseCallback,
+  public static class DelegatedThreadNetworkDiagnosticsClusterAttributeListAttributeCallback
+      implements ChipClusters.ThreadNetworkDiagnosticsCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3060,21 +3006,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(ArrayList<Integer> GroupKeySetIDs) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      // GroupKeySetIDs: /* TYPE WARNING: array array defaults to */ uint8_t *
-      // Conversion from this type to Java is not properly implemented yet
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedKeySetReadResponseCallback
-      implements ChipClusters.GroupKeyManagementCluster.KeySetReadResponseCallback,
+  public static class DelegatedWiFiNetworkDiagnosticsClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.WiFiNetworkDiagnosticsCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3084,21 +3030,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(ChipStructs.GroupKeyManagementClusterGroupKeySetStruct GroupKeySet) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      // GroupKeySet: Struct GroupKeySetStruct
-      // Conversion from this type to Java is not properly implemented yet
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedGroupKeyManagementClusterGroupKeyMapAttributeCallback
-      implements ChipClusters.GroupKeyManagementCluster.GroupKeyMapAttributeCallback,
+  public static class DelegatedWiFiNetworkDiagnosticsClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.WiFiNetworkDiagnosticsCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3108,11 +3054,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo(
-              "valueList", "List<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -3123,8 +3067,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedGroupKeyManagementClusterGroupTableAttributeCallback
-      implements ChipClusters.GroupKeyManagementCluster.GroupTableAttributeCallback,
+  public static class DelegatedWiFiNetworkDiagnosticsClusterAttributeListAttributeCallback
+      implements ChipClusters.WiFiNetworkDiagnosticsCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3134,11 +3078,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.GroupKeyManagementClusterGroupInfoMapStruct> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo(
-              "valueList", "List<ChipStructs.GroupKeyManagementClusterGroupInfoMapStruct>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -3149,8 +3091,10 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedGroupKeyManagementClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.GroupKeyManagementCluster.GeneratedCommandListAttributeCallback,
+  public static
+  class DelegatedEthernetNetworkDiagnosticsClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.EthernetNetworkDiagnosticsCluster
+              .GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3173,8 +3117,9 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedGroupKeyManagementClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.GroupKeyManagementCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedEthernetNetworkDiagnosticsClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.EthernetNetworkDiagnosticsCluster
+              .AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3197,8 +3142,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedGroupKeyManagementClusterAttributeListAttributeCallback
-      implements ChipClusters.GroupKeyManagementCluster.AttributeListAttributeCallback,
+  public static class DelegatedEthernetNetworkDiagnosticsClusterAttributeListAttributeCallback
+      implements ChipClusters.EthernetNetworkDiagnosticsCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3221,8 +3166,9 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedAddGroupResponseCallback
-      implements ChipClusters.GroupsCluster.AddGroupResponseCallback, DelegatedClusterCallback {
+  public static class DelegatedBridgedDeviceBasicClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.BridgedDeviceBasicCluster.GeneratedCommandListAttributeCallback,
+          DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
     @Override
@@ -3231,23 +3177,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Integer status, Integer groupId) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
-      responseValues.put(statusResponseValue, status);
-      CommandResponseInfo groupIdResponseValue = new CommandResponseInfo("groupId", "Integer");
-      responseValues.put(groupIdResponseValue, groupId);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedGetGroupMembershipResponseCallback
-      implements ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback,
+  public static class DelegatedBridgedDeviceBasicClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.BridgedDeviceBasicCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3257,48 +3201,22 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(@Nullable Integer capacity, ArrayList<Integer> groupList) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo capacityResponseValue = new CommandResponseInfo("capacity", "Integer");
-      responseValues.put(capacityResponseValue, capacity);
-      // groupList: /* TYPE WARNING: array array defaults to */ uint8_t *
-      // Conversion from this type to Java is not properly implemented yet
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public static class DelegatedRemoveGroupResponseCallback
-      implements ChipClusters.GroupsCluster.RemoveGroupResponseCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(Integer status, Integer groupId) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
-      responseValues.put(statusResponseValue, status);
-      CommandResponseInfo groupIdResponseValue = new CommandResponseInfo("groupId", "Integer");
-      responseValues.put(groupIdResponseValue, groupId);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedViewGroupResponseCallback
-      implements ChipClusters.GroupsCluster.ViewGroupResponseCallback, DelegatedClusterCallback {
+  public static class DelegatedBridgedDeviceBasicClusterAttributeListAttributeCallback
+      implements ChipClusters.BridgedDeviceBasicCluster.AttributeListAttributeCallback,
+          DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
     @Override
@@ -3307,25 +3225,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Integer status, Integer groupId, String groupName) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
-      responseValues.put(statusResponseValue, status);
-      CommandResponseInfo groupIdResponseValue = new CommandResponseInfo("groupId", "Integer");
-      responseValues.put(groupIdResponseValue, groupId);
-      CommandResponseInfo groupNameResponseValue = new CommandResponseInfo("groupName", "String");
-      responseValues.put(groupNameResponseValue, groupName);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedGroupsClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.GroupsCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedSwitchClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.SwitchCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3348,8 +3262,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedGroupsClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.GroupsCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedSwitchClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.SwitchCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3372,8 +3286,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedGroupsClusterAttributeListAttributeCallback
-      implements ChipClusters.GroupsCluster.AttributeListAttributeCallback,
+  public static class DelegatedSwitchClusterAttributeListAttributeCallback
+      implements ChipClusters.SwitchCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3396,8 +3310,10 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedIdentifyClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.IdentifyCluster.GeneratedCommandListAttributeCallback,
+  public static
+  class DelegatedAdministratorCommissioningClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.AdministratorCommissioningCluster
+              .GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3420,8 +3336,9 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedIdentifyClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.IdentifyCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedAdministratorCommissioningClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.AdministratorCommissioningCluster
+              .AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3444,8 +3361,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedIdentifyClusterAttributeListAttributeCallback
-      implements ChipClusters.IdentifyCluster.AttributeListAttributeCallback,
+  public static class DelegatedAdministratorCommissioningClusterAttributeListAttributeCallback
+      implements ChipClusters.AdministratorCommissioningCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3468,8 +3385,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedIlluminanceMeasurementClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.IlluminanceMeasurementCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedAttestationResponseCallback
+      implements ChipClusters.OperationalCredentialsCluster.AttestationResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3479,21 +3396,24 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(byte[] AttestationElements, byte[] Signature) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo AttestationElementsResponseValue =
+          new CommandResponseInfo("AttestationElements", "byte[]");
+      responseValues.put(AttestationElementsResponseValue, AttestationElements);
+      CommandResponseInfo SignatureResponseValue = new CommandResponseInfo("Signature", "byte[]");
+      responseValues.put(SignatureResponseValue, Signature);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedIlluminanceMeasurementClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.IlluminanceMeasurementCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedCertificateChainResponseCallback
+      implements ChipClusters.OperationalCredentialsCluster.CertificateChainResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3503,21 +3423,22 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(byte[] Certificate) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo CertificateResponseValue =
+          new CommandResponseInfo("Certificate", "byte[]");
+      responseValues.put(CertificateResponseValue, Certificate);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedIlluminanceMeasurementClusterAttributeListAttributeCallback
-      implements ChipClusters.IlluminanceMeasurementCluster.AttributeListAttributeCallback,
+  public static class DelegatedCSRResponseCallback
+      implements ChipClusters.OperationalCredentialsCluster.CSRResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3527,21 +3448,26 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(byte[] NOCSRElements, byte[] AttestationSignature) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo NOCSRElementsResponseValue =
+          new CommandResponseInfo("NOCSRElements", "byte[]");
+      responseValues.put(NOCSRElementsResponseValue, NOCSRElements);
+      CommandResponseInfo AttestationSignatureResponseValue =
+          new CommandResponseInfo("AttestationSignature", "byte[]");
+      responseValues.put(AttestationSignatureResponseValue, AttestationSignature);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedSendKeyResponseCallback
-      implements ChipClusters.KeypadInputCluster.SendKeyResponseCallback, DelegatedClusterCallback {
+  public static class DelegatedNOCResponseCallback
+      implements ChipClusters.OperationalCredentialsCluster.NOCResponseCallback,
+          DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
     @Override
@@ -3550,10 +3476,18 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Integer status) {
+    public void onSuccess(
+        Integer StatusCode, Optional<Integer> FabricIndex, Optional<String> DebugText) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
-      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo StatusCodeResponseValue =
+          new CommandResponseInfo("StatusCode", "Integer");
+      responseValues.put(StatusCodeResponseValue, StatusCode);
+      CommandResponseInfo FabricIndexResponseValue =
+          new CommandResponseInfo("FabricIndex", "Optional<Integer>");
+      responseValues.put(FabricIndexResponseValue, FabricIndex);
+      CommandResponseInfo DebugTextResponseValue =
+          new CommandResponseInfo("DebugText", "Optional<String>");
+      responseValues.put(DebugTextResponseValue, DebugText);
       callback.onSuccess(responseValues);
     }
 
@@ -3563,8 +3497,8 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedKeypadInputClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.KeypadInputCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedOperationalCredentialsClusterNOCsAttributeCallback
+      implements ChipClusters.OperationalCredentialsCluster.NOCsAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3574,9 +3508,11 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<ChipStructs.OperationalCredentialsClusterNOCStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo(
+              "valueList", "List<ChipStructs.OperationalCredentialsClusterNOCStruct>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -3587,8 +3523,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedKeypadInputClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.KeypadInputCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedOperationalCredentialsClusterFabricsAttributeCallback
+      implements ChipClusters.OperationalCredentialsCluster.FabricsAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3598,9 +3534,12 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(
+        List<ChipStructs.OperationalCredentialsClusterFabricDescriptor> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo(
+              "valueList", "List<ChipStructs.OperationalCredentialsClusterFabricDescriptor>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -3611,8 +3550,9 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedKeypadInputClusterAttributeListAttributeCallback
-      implements ChipClusters.KeypadInputCluster.AttributeListAttributeCallback,
+  public static class DelegatedOperationalCredentialsClusterTrustedRootCertificatesAttributeCallback
+      implements ChipClusters.OperationalCredentialsCluster
+              .TrustedRootCertificatesAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3622,9 +3562,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<byte[]> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo("valueList", "List<byte[]>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -3635,8 +3576,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLevelControlClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.LevelControlCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedOperationalCredentialsClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.OperationalCredentialsCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3659,8 +3600,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLevelControlClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.LevelControlCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedOperationalCredentialsClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.OperationalCredentialsCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3683,8 +3624,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLevelControlClusterAttributeListAttributeCallback
-      implements ChipClusters.LevelControlCluster.AttributeListAttributeCallback,
+  public static class DelegatedOperationalCredentialsClusterAttributeListAttributeCallback
+      implements ChipClusters.OperationalCredentialsCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3707,8 +3648,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLocalizationConfigurationClusterSupportedLocalesAttributeCallback
-      implements ChipClusters.LocalizationConfigurationCluster.SupportedLocalesAttributeCallback,
+  public static class DelegatedKeySetReadResponseCallback
+      implements ChipClusters.GroupKeyManagementCluster.KeySetReadResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3718,23 +3659,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<String> valueList) {
+    public void onSuccess(ChipStructs.GroupKeyManagementClusterGroupKeySetStruct GroupKeySet) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo("valueList", "List<String>");
-      responseValues.put(commandResponseInfo, valueList);
+      // GroupKeySet: Struct GroupKeySetStruct
+      // Conversion from this type to Java is not properly implemented yet
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedLocalizationConfigurationClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.LocalizationConfigurationCluster
-              .GeneratedCommandListAttributeCallback,
+  public static class DelegatedKeySetReadAllIndicesResponseCallback
+      implements ChipClusters.GroupKeyManagementCluster.KeySetReadAllIndicesResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3744,21 +3683,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(ArrayList<Integer> GroupKeySetIDs) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      // GroupKeySetIDs: /* TYPE WARNING: array array defaults to */ uint8_t *
+      // Conversion from this type to Java is not properly implemented yet
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedLocalizationConfigurationClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.LocalizationConfigurationCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedGroupKeyManagementClusterGroupKeyMapAttributeCallback
+      implements ChipClusters.GroupKeyManagementCluster.GroupKeyMapAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3768,9 +3707,11 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo(
+              "valueList", "List<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -3781,8 +3722,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLowPowerClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.LowPowerCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedGroupKeyManagementClusterGroupTableAttributeCallback
+      implements ChipClusters.GroupKeyManagementCluster.GroupTableAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3792,9 +3733,11 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<ChipStructs.GroupKeyManagementClusterGroupInfoMapStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo(
+              "valueList", "List<ChipStructs.GroupKeyManagementClusterGroupInfoMapStruct>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -3805,8 +3748,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLowPowerClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.LowPowerCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedGroupKeyManagementClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.GroupKeyManagementCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3829,8 +3772,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLowPowerClusterAttributeListAttributeCallback
-      implements ChipClusters.LowPowerCluster.AttributeListAttributeCallback,
+  public static class DelegatedGroupKeyManagementClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.GroupKeyManagementCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3853,8 +3796,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedMediaInputClusterInputListAttributeCallback
-      implements ChipClusters.MediaInputCluster.InputListAttributeCallback,
+  public static class DelegatedGroupKeyManagementClusterAttributeListAttributeCallback
+      implements ChipClusters.GroupKeyManagementCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3864,10 +3807,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.MediaInputClusterInputInfo> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo("valueList", "List<ChipStructs.MediaInputClusterInputInfo>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -3878,8 +3820,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedMediaInputClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.MediaInputCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedFixedLabelClusterLabelListAttributeCallback
+      implements ChipClusters.FixedLabelCluster.LabelListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3889,9 +3831,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<ChipStructs.FixedLabelClusterLabelStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo("valueList", "List<ChipStructs.FixedLabelClusterLabelStruct>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -3902,8 +3845,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedMediaInputClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.MediaInputCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedFixedLabelClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.FixedLabelCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3926,8 +3869,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedMediaInputClusterAttributeListAttributeCallback
-      implements ChipClusters.MediaInputCluster.AttributeListAttributeCallback,
+  public static class DelegatedFixedLabelClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.FixedLabelCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -3950,34 +3893,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedPlaybackResponseCallback
-      implements ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(Integer status, Optional<String> data) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
-      responseValues.put(statusResponseValue, status);
-      CommandResponseInfo dataResponseValue = new CommandResponseInfo("data", "Optional<String>");
-      responseValues.put(dataResponseValue, data);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public static class DelegatedMediaPlaybackClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.MediaPlaybackCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedFixedLabelClusterAttributeListAttributeCallback
+      implements ChipClusters.FixedLabelCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4000,8 +3917,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedMediaPlaybackClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.MediaPlaybackCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedUserLabelClusterLabelListAttributeCallback
+      implements ChipClusters.UserLabelCluster.LabelListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4011,9 +3928,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<ChipStructs.UserLabelClusterLabelStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo("valueList", "List<ChipStructs.UserLabelClusterLabelStruct>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -4024,8 +3942,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedMediaPlaybackClusterAttributeListAttributeCallback
-      implements ChipClusters.MediaPlaybackCluster.AttributeListAttributeCallback,
+  public static class DelegatedUserLabelClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.UserLabelCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4048,8 +3966,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedModeSelectClusterSupportedModesAttributeCallback
-      implements ChipClusters.ModeSelectCluster.SupportedModesAttributeCallback,
+  public static class DelegatedUserLabelClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.UserLabelCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4059,11 +3977,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.ModeSelectClusterModeOptionStruct> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo(
-              "valueList", "List<ChipStructs.ModeSelectClusterModeOptionStruct>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -4074,8 +3990,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedModeSelectClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.ModeSelectCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedBooleanStateClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.BooleanStateCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4098,8 +4014,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedModeSelectClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.ModeSelectCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedBooleanStateClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.BooleanStateCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4122,8 +4038,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedModeSelectClusterAttributeListAttributeCallback
-      implements ChipClusters.ModeSelectCluster.AttributeListAttributeCallback,
+  public static class DelegatedBooleanStateClusterAttributeListAttributeCallback
+      implements ChipClusters.BooleanStateCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4146,71 +4062,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedConnectNetworkResponseCallback
-      implements ChipClusters.NetworkCommissioningCluster.ConnectNetworkResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(
-        Integer NetworkingStatus, Optional<String> DebugText, @Nullable Long ErrorValue) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo NetworkingStatusResponseValue =
-          new CommandResponseInfo("NetworkingStatus", "Integer");
-      responseValues.put(NetworkingStatusResponseValue, NetworkingStatus);
-      CommandResponseInfo DebugTextResponseValue =
-          new CommandResponseInfo("DebugText", "Optional<String>");
-      responseValues.put(DebugTextResponseValue, DebugText);
-      CommandResponseInfo ErrorValueResponseValue = new CommandResponseInfo("ErrorValue", "Long");
-      responseValues.put(ErrorValueResponseValue, ErrorValue);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public static class DelegatedNetworkConfigResponseCallback
-      implements ChipClusters.NetworkCommissioningCluster.NetworkConfigResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(
-        Integer NetworkingStatus, Optional<String> DebugText, Optional<Integer> NetworkIndex) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo NetworkingStatusResponseValue =
-          new CommandResponseInfo("NetworkingStatus", "Integer");
-      responseValues.put(NetworkingStatusResponseValue, NetworkingStatus);
-      CommandResponseInfo DebugTextResponseValue =
-          new CommandResponseInfo("DebugText", "Optional<String>");
-      responseValues.put(DebugTextResponseValue, DebugText);
-      CommandResponseInfo NetworkIndexResponseValue =
-          new CommandResponseInfo("NetworkIndex", "Optional<Integer>");
-      responseValues.put(NetworkIndexResponseValue, NetworkIndex);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public static class DelegatedScanNetworksResponseCallback
-      implements ChipClusters.NetworkCommissioningCluster.ScanNetworksResponseCallback,
+  public static class DelegatedModeSelectClusterSupportedModesAttributeCallback
+      implements ChipClusters.ModeSelectCluster.SupportedModesAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4220,35 +4073,23 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(
-        Integer NetworkingStatus,
-        Optional<String> DebugText,
-        Optional<ArrayList<ChipStructs.NetworkCommissioningClusterWiFiInterfaceScanResult>>
-            WiFiScanResults,
-        Optional<ArrayList<ChipStructs.NetworkCommissioningClusterThreadInterfaceScanResult>>
-            ThreadScanResults) {
+    public void onSuccess(List<ChipStructs.ModeSelectClusterModeOptionStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo NetworkingStatusResponseValue =
-          new CommandResponseInfo("NetworkingStatus", "Integer");
-      responseValues.put(NetworkingStatusResponseValue, NetworkingStatus);
-      CommandResponseInfo DebugTextResponseValue =
-          new CommandResponseInfo("DebugText", "Optional<String>");
-      responseValues.put(DebugTextResponseValue, DebugText);
-      // WiFiScanResults: /* TYPE WARNING: array array defaults to */ uint8_t *
-      // Conversion from this type to Java is not properly implemented yet
-      // ThreadScanResults: /* TYPE WARNING: array array defaults to */ uint8_t *
-      // Conversion from this type to Java is not properly implemented yet
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo(
+              "valueList", "List<ChipStructs.ModeSelectClusterModeOptionStruct>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedNetworkCommissioningClusterNetworksAttributeCallback
-      implements ChipClusters.NetworkCommissioningCluster.NetworksAttributeCallback,
+  public static class DelegatedModeSelectClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.ModeSelectCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4258,11 +4099,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.NetworkCommissioningClusterNetworkInfo> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo(
-              "valueList", "List<ChipStructs.NetworkCommissioningClusterNetworkInfo>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -4273,8 +4112,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedNetworkCommissioningClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.NetworkCommissioningCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedModeSelectClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.ModeSelectCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4297,8 +4136,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedNetworkCommissioningClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.NetworkCommissioningCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedModeSelectClusterAttributeListAttributeCallback
+      implements ChipClusters.ModeSelectCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4321,8 +4160,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedApplyUpdateResponseCallback
-      implements ChipClusters.OtaSoftwareUpdateProviderCluster.ApplyUpdateResponseCallback,
+  public static class DelegatedGetWeekDayScheduleResponseCallback
+      implements ChipClusters.DoorLockCluster.GetWeekDayScheduleResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4332,13 +4171,38 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Integer action, Long delayedActionTime) {
+    public void onSuccess(
+        Integer weekDayIndex,
+        Integer userIndex,
+        Integer status,
+        Optional<Integer> daysMask,
+        Optional<Integer> startHour,
+        Optional<Integer> startMinute,
+        Optional<Integer> endHour,
+        Optional<Integer> endMinute) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo actionResponseValue = new CommandResponseInfo("action", "Integer");
-      responseValues.put(actionResponseValue, action);
-      CommandResponseInfo delayedActionTimeResponseValue =
-          new CommandResponseInfo("delayedActionTime", "Long");
-      responseValues.put(delayedActionTimeResponseValue, delayedActionTime);
+      CommandResponseInfo weekDayIndexResponseValue =
+          new CommandResponseInfo("weekDayIndex", "Integer");
+      responseValues.put(weekDayIndexResponseValue, weekDayIndex);
+      CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "Integer");
+      responseValues.put(userIndexResponseValue, userIndex);
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo daysMaskResponseValue =
+          new CommandResponseInfo("daysMask", "Optional<Integer>");
+      responseValues.put(daysMaskResponseValue, daysMask);
+      CommandResponseInfo startHourResponseValue =
+          new CommandResponseInfo("startHour", "Optional<Integer>");
+      responseValues.put(startHourResponseValue, startHour);
+      CommandResponseInfo startMinuteResponseValue =
+          new CommandResponseInfo("startMinute", "Optional<Integer>");
+      responseValues.put(startMinuteResponseValue, startMinute);
+      CommandResponseInfo endHourResponseValue =
+          new CommandResponseInfo("endHour", "Optional<Integer>");
+      responseValues.put(endHourResponseValue, endHour);
+      CommandResponseInfo endMinuteResponseValue =
+          new CommandResponseInfo("endMinute", "Optional<Integer>");
+      responseValues.put(endMinuteResponseValue, endMinute);
       callback.onSuccess(responseValues);
     }
 
@@ -4348,8 +4212,8 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedQueryImageResponseCallback
-      implements ChipClusters.OtaSoftwareUpdateProviderCluster.QueryImageResponseCallback,
+  public static class DelegatedGetYearDayScheduleResponseCallback
+      implements ChipClusters.DoorLockCluster.GetYearDayScheduleResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4360,38 +4224,25 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
 
     @Override
     public void onSuccess(
+        Integer yearDayIndex,
+        Integer userIndex,
         Integer status,
-        Optional<Long> delayedActionTime,
-        Optional<String> imageURI,
-        Optional<Long> softwareVersion,
-        Optional<String> softwareVersionString,
-        Optional<byte[]> updateToken,
-        Optional<Boolean> userConsentNeeded,
-        Optional<byte[]> metadataForRequestor) {
+        Optional<Long> localStartTime,
+        Optional<Long> localEndTime) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo yearDayIndexResponseValue =
+          new CommandResponseInfo("yearDayIndex", "Integer");
+      responseValues.put(yearDayIndexResponseValue, yearDayIndex);
+      CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "Integer");
+      responseValues.put(userIndexResponseValue, userIndex);
       CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
       responseValues.put(statusResponseValue, status);
-      CommandResponseInfo delayedActionTimeResponseValue =
-          new CommandResponseInfo("delayedActionTime", "Optional<Long>");
-      responseValues.put(delayedActionTimeResponseValue, delayedActionTime);
-      CommandResponseInfo imageURIResponseValue =
-          new CommandResponseInfo("imageURI", "Optional<String>");
-      responseValues.put(imageURIResponseValue, imageURI);
-      CommandResponseInfo softwareVersionResponseValue =
-          new CommandResponseInfo("softwareVersion", "Optional<Long>");
-      responseValues.put(softwareVersionResponseValue, softwareVersion);
-      CommandResponseInfo softwareVersionStringResponseValue =
-          new CommandResponseInfo("softwareVersionString", "Optional<String>");
-      responseValues.put(softwareVersionStringResponseValue, softwareVersionString);
-      CommandResponseInfo updateTokenResponseValue =
-          new CommandResponseInfo("updateToken", "Optional<byte[]>");
-      responseValues.put(updateTokenResponseValue, updateToken);
-      CommandResponseInfo userConsentNeededResponseValue =
-          new CommandResponseInfo("userConsentNeeded", "Optional<Boolean>");
-      responseValues.put(userConsentNeededResponseValue, userConsentNeeded);
-      CommandResponseInfo metadataForRequestorResponseValue =
-          new CommandResponseInfo("metadataForRequestor", "Optional<byte[]>");
-      responseValues.put(metadataForRequestorResponseValue, metadataForRequestor);
+      CommandResponseInfo localStartTimeResponseValue =
+          new CommandResponseInfo("localStartTime", "Optional<Long>");
+      responseValues.put(localStartTimeResponseValue, localStartTime);
+      CommandResponseInfo localEndTimeResponseValue =
+          new CommandResponseInfo("localEndTime", "Optional<Long>");
+      responseValues.put(localEndTimeResponseValue, localEndTime);
       callback.onSuccess(responseValues);
     }
 
@@ -4401,8 +4252,8 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedOtaSoftwareUpdateProviderClusterAttributeListAttributeCallback
-      implements ChipClusters.OtaSoftwareUpdateProviderCluster.AttributeListAttributeCallback,
+  public static class DelegatedGetHolidayScheduleResponseCallback
+      implements ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4412,23 +4263,38 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(
+        Integer holidayIndex,
+        Integer status,
+        Optional<Long> localStartTime,
+        Optional<Long> localEndTime,
+        Optional<Integer> operatingMode) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo holidayIndexResponseValue =
+          new CommandResponseInfo("holidayIndex", "Integer");
+      responseValues.put(holidayIndexResponseValue, holidayIndex);
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo localStartTimeResponseValue =
+          new CommandResponseInfo("localStartTime", "Optional<Long>");
+      responseValues.put(localStartTimeResponseValue, localStartTime);
+      CommandResponseInfo localEndTimeResponseValue =
+          new CommandResponseInfo("localEndTime", "Optional<Long>");
+      responseValues.put(localEndTimeResponseValue, localEndTime);
+      CommandResponseInfo operatingModeResponseValue =
+          new CommandResponseInfo("operatingMode", "Optional<Integer>");
+      responseValues.put(operatingModeResponseValue, operatingMode);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedOtaSoftwareUpdateRequestorClusterDefaultOtaProvidersAttributeCallback
-      implements ChipClusters.OtaSoftwareUpdateRequestorCluster
-              .DefaultOtaProvidersAttributeCallback,
-          DelegatedClusterCallback {
+  public static class DelegatedGetUserResponseCallback
+      implements ChipClusters.DoorLockCluster.GetUserResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
     @Override
@@ -4438,23 +4304,54 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
 
     @Override
     public void onSuccess(
-        List<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation> valueList) {
+        Integer userIndex,
+        @Nullable String userName,
+        @Nullable Long userUniqueId,
+        @Nullable Integer userStatus,
+        @Nullable Integer userType,
+        @Nullable Integer credentialRule,
+        @Nullable ArrayList<ChipStructs.DoorLockClusterDlCredential> credentials,
+        @Nullable Integer creatorFabricIndex,
+        @Nullable Integer lastModifiedFabricIndex,
+        @Nullable Integer nextUserIndex) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo(
-              "valueList", "List<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "Integer");
+      responseValues.put(userIndexResponseValue, userIndex);
+      CommandResponseInfo userNameResponseValue = new CommandResponseInfo("userName", "String");
+      responseValues.put(userNameResponseValue, userName);
+      CommandResponseInfo userUniqueIdResponseValue =
+          new CommandResponseInfo("userUniqueId", "Long");
+      responseValues.put(userUniqueIdResponseValue, userUniqueId);
+      CommandResponseInfo userStatusResponseValue =
+          new CommandResponseInfo("userStatus", "Integer");
+      responseValues.put(userStatusResponseValue, userStatus);
+      CommandResponseInfo userTypeResponseValue = new CommandResponseInfo("userType", "Integer");
+      responseValues.put(userTypeResponseValue, userType);
+      CommandResponseInfo credentialRuleResponseValue =
+          new CommandResponseInfo("credentialRule", "Integer");
+      responseValues.put(credentialRuleResponseValue, credentialRule);
+      // credentials: /* TYPE WARNING: array array defaults to */ uint8_t *
+      // Conversion from this type to Java is not properly implemented yet
+      CommandResponseInfo creatorFabricIndexResponseValue =
+          new CommandResponseInfo("creatorFabricIndex", "Integer");
+      responseValues.put(creatorFabricIndexResponseValue, creatorFabricIndex);
+      CommandResponseInfo lastModifiedFabricIndexResponseValue =
+          new CommandResponseInfo("lastModifiedFabricIndex", "Integer");
+      responseValues.put(lastModifiedFabricIndexResponseValue, lastModifiedFabricIndex);
+      CommandResponseInfo nextUserIndexResponseValue =
+          new CommandResponseInfo("nextUserIndex", "Integer");
+      responseValues.put(nextUserIndexResponseValue, nextUserIndex);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedOtaSoftwareUpdateRequestorClusterAttributeListAttributeCallback
-      implements ChipClusters.OtaSoftwareUpdateRequestorCluster.AttributeListAttributeCallback,
+  public static class DelegatedSetCredentialResponseCallback
+      implements ChipClusters.DoorLockCluster.SetCredentialResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4464,21 +4361,27 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(
+        Integer status, @Nullable Integer userIndex, @Nullable Integer nextCredentialIndex) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "Integer");
+      responseValues.put(userIndexResponseValue, userIndex);
+      CommandResponseInfo nextCredentialIndexResponseValue =
+          new CommandResponseInfo("nextCredentialIndex", "Integer");
+      responseValues.put(nextCredentialIndexResponseValue, nextCredentialIndex);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedOccupancySensingClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.OccupancySensingCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedGetCredentialStatusResponseCallback
+      implements ChipClusters.DoorLockCluster.GetCredentialStatusResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4488,21 +4391,38 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(
+        Boolean credentialExists,
+        @Nullable Integer userIndex,
+        @Nullable Integer creatorFabricIndex,
+        @Nullable Integer lastModifiedFabricIndex,
+        @Nullable Integer nextCredentialIndex) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo credentialExistsResponseValue =
+          new CommandResponseInfo("credentialExists", "Boolean");
+      responseValues.put(credentialExistsResponseValue, credentialExists);
+      CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "Integer");
+      responseValues.put(userIndexResponseValue, userIndex);
+      CommandResponseInfo creatorFabricIndexResponseValue =
+          new CommandResponseInfo("creatorFabricIndex", "Integer");
+      responseValues.put(creatorFabricIndexResponseValue, creatorFabricIndex);
+      CommandResponseInfo lastModifiedFabricIndexResponseValue =
+          new CommandResponseInfo("lastModifiedFabricIndex", "Integer");
+      responseValues.put(lastModifiedFabricIndexResponseValue, lastModifiedFabricIndex);
+      CommandResponseInfo nextCredentialIndexResponseValue =
+          new CommandResponseInfo("nextCredentialIndex", "Integer");
+      responseValues.put(nextCredentialIndexResponseValue, nextCredentialIndex);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedOccupancySensingClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.OccupancySensingCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedDoorLockClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.DoorLockCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4525,8 +4445,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOccupancySensingClusterAttributeListAttributeCallback
-      implements ChipClusters.OccupancySensingCluster.AttributeListAttributeCallback,
+  public static class DelegatedDoorLockClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.DoorLockCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4549,8 +4469,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOnOffClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.OnOffCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedDoorLockClusterAttributeListAttributeCallback
+      implements ChipClusters.DoorLockCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4573,8 +4493,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOnOffClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.OnOffCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedWindowCoveringClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.WindowCoveringCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4597,8 +4517,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOnOffClusterAttributeListAttributeCallback
-      implements ChipClusters.OnOffCluster.AttributeListAttributeCallback,
+  public static class DelegatedWindowCoveringClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.WindowCoveringCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4621,8 +4541,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOnOffSwitchConfigurationClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.OnOffSwitchConfigurationCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedWindowCoveringClusterAttributeListAttributeCallback
+      implements ChipClusters.WindowCoveringCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4645,8 +4565,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOnOffSwitchConfigurationClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.OnOffSwitchConfigurationCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedBarrierControlClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.BarrierControlCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4669,8 +4589,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOnOffSwitchConfigurationClusterAttributeListAttributeCallback
-      implements ChipClusters.OnOffSwitchConfigurationCluster.AttributeListAttributeCallback,
+  public static class DelegatedBarrierControlClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.BarrierControlCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4693,8 +4613,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedAttestationResponseCallback
-      implements ChipClusters.OperationalCredentialsCluster.AttestationResponseCallback,
+  public static class DelegatedBarrierControlClusterAttributeListAttributeCallback
+      implements ChipClusters.BarrierControlCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4704,24 +4624,23 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(byte[] AttestationElements, byte[] Signature) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo AttestationElementsResponseValue =
-          new CommandResponseInfo("AttestationElements", "byte[]");
-      responseValues.put(AttestationElementsResponseValue, AttestationElements);
-      CommandResponseInfo SignatureResponseValue = new CommandResponseInfo("Signature", "byte[]");
-      responseValues.put(SignatureResponseValue, Signature);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedCSRResponseCallback
-      implements ChipClusters.OperationalCredentialsCluster.CSRResponseCallback,
+  public static
+  class DelegatedPumpConfigurationAndControlClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.PumpConfigurationAndControlCluster
+              .GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4731,25 +4650,23 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(byte[] NOCSRElements, byte[] AttestationSignature) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo NOCSRElementsResponseValue =
-          new CommandResponseInfo("NOCSRElements", "byte[]");
-      responseValues.put(NOCSRElementsResponseValue, NOCSRElements);
-      CommandResponseInfo AttestationSignatureResponseValue =
-          new CommandResponseInfo("AttestationSignature", "byte[]");
-      responseValues.put(AttestationSignatureResponseValue, AttestationSignature);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedCertificateChainResponseCallback
-      implements ChipClusters.OperationalCredentialsCluster.CertificateChainResponseCallback,
+  public static
+  class DelegatedPumpConfigurationAndControlClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.PumpConfigurationAndControlCluster
+              .AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4759,22 +4676,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(byte[] Certificate) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo CertificateResponseValue =
-          new CommandResponseInfo("Certificate", "byte[]");
-      responseValues.put(CertificateResponseValue, Certificate);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedNOCResponseCallback
-      implements ChipClusters.OperationalCredentialsCluster.NOCResponseCallback,
+  public static class DelegatedPumpConfigurationAndControlClusterAttributeListAttributeCallback
+      implements ChipClusters.PumpConfigurationAndControlCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4784,29 +4700,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(
-        Integer StatusCode, Optional<Integer> FabricIndex, Optional<String> DebugText) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo StatusCodeResponseValue =
-          new CommandResponseInfo("StatusCode", "Integer");
-      responseValues.put(StatusCodeResponseValue, StatusCode);
-      CommandResponseInfo FabricIndexResponseValue =
-          new CommandResponseInfo("FabricIndex", "Optional<Integer>");
-      responseValues.put(FabricIndexResponseValue, FabricIndex);
-      CommandResponseInfo DebugTextResponseValue =
-          new CommandResponseInfo("DebugText", "Optional<String>");
-      responseValues.put(DebugTextResponseValue, DebugText);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedOperationalCredentialsClusterNOCsAttributeCallback
-      implements ChipClusters.OperationalCredentialsCluster.NOCsAttributeCallback,
+  public static class DelegatedGetWeeklyScheduleResponseCallback
+      implements ChipClusters.ThermostatCluster.GetWeeklyScheduleResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4816,23 +4724,35 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.OperationalCredentialsClusterNOCStruct> valueList) {
+    public void onSuccess(
+        Integer NumberOfTransitionsForSequence,
+        Integer DayOfWeekForSequence,
+        Integer ModeForSequence,
+        ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> Transitions) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo(
-              "valueList", "List<ChipStructs.OperationalCredentialsClusterNOCStruct>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo NumberOfTransitionsForSequenceResponseValue =
+          new CommandResponseInfo("NumberOfTransitionsForSequence", "Integer");
+      responseValues.put(
+          NumberOfTransitionsForSequenceResponseValue, NumberOfTransitionsForSequence);
+      CommandResponseInfo DayOfWeekForSequenceResponseValue =
+          new CommandResponseInfo("DayOfWeekForSequence", "Integer");
+      responseValues.put(DayOfWeekForSequenceResponseValue, DayOfWeekForSequence);
+      CommandResponseInfo ModeForSequenceResponseValue =
+          new CommandResponseInfo("ModeForSequence", "Integer");
+      responseValues.put(ModeForSequenceResponseValue, ModeForSequence);
+      // Transitions: /* TYPE WARNING: array array defaults to */ uint8_t *
+      // Conversion from this type to Java is not properly implemented yet
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedOperationalCredentialsClusterFabricsAttributeCallback
-      implements ChipClusters.OperationalCredentialsCluster.FabricsAttributeCallback,
+  public static class DelegatedThermostatClusterAttributeListAttributeCallback
+      implements ChipClusters.ThermostatCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4842,12 +4762,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(
-        List<ChipStructs.OperationalCredentialsClusterFabricDescriptor> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo(
-              "valueList", "List<ChipStructs.OperationalCredentialsClusterFabricDescriptor>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -4858,9 +4775,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOperationalCredentialsClusterTrustedRootCertificatesAttributeCallback
-      implements ChipClusters.OperationalCredentialsCluster
-              .TrustedRootCertificatesAttributeCallback,
+  public static class DelegatedFanControlClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.FanControlCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4870,10 +4786,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<byte[]> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo("valueList", "List<byte[]>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -4884,8 +4799,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOperationalCredentialsClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.OperationalCredentialsCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedFanControlClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.FanControlCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4908,8 +4823,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOperationalCredentialsClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.OperationalCredentialsCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedFanControlClusterAttributeListAttributeCallback
+      implements ChipClusters.FanControlCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4932,8 +4847,10 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOperationalCredentialsClusterAttributeListAttributeCallback
-      implements ChipClusters.OperationalCredentialsCluster.AttributeListAttributeCallback,
+  public static
+  class DelegatedThermostatUserInterfaceConfigurationClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.ThermostatUserInterfaceConfigurationCluster
+              .GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4956,8 +4873,10 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedPowerSourceClusterActiveWiredFaultsAttributeCallback
-      implements ChipClusters.PowerSourceCluster.ActiveWiredFaultsAttributeCallback,
+  public static
+  class DelegatedThermostatUserInterfaceConfigurationClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.ThermostatUserInterfaceConfigurationCluster
+              .AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4967,10 +4886,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Integer> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo("valueList", "List<Integer>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -4981,8 +4899,10 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedPowerSourceClusterActiveBatteryFaultsAttributeCallback
-      implements ChipClusters.PowerSourceCluster.ActiveBatteryFaultsAttributeCallback,
+  public static
+  class DelegatedThermostatUserInterfaceConfigurationClusterAttributeListAttributeCallback
+      implements ChipClusters.ThermostatUserInterfaceConfigurationCluster
+              .AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4992,10 +4912,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Integer> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo("valueList", "List<Integer>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -5006,8 +4925,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedPowerSourceClusterActiveBatteryChargeFaultsAttributeCallback
-      implements ChipClusters.PowerSourceCluster.ActiveBatteryChargeFaultsAttributeCallback,
+  public static class DelegatedColorControlClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.ColorControlCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5017,10 +4936,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Integer> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo("valueList", "List<Integer>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -5031,8 +4949,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedPowerSourceClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.PowerSourceCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedColorControlClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.ColorControlCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5055,8 +4973,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedPowerSourceClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.PowerSourceCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedColorControlClusterAttributeListAttributeCallback
+      implements ChipClusters.ColorControlCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5079,8 +4997,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedPowerSourceClusterAttributeListAttributeCallback
-      implements ChipClusters.PowerSourceCluster.AttributeListAttributeCallback,
+  public static class DelegatedIlluminanceMeasurementClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.IlluminanceMeasurementCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5103,8 +5021,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedPowerSourceConfigurationClusterSourcesAttributeCallback
-      implements ChipClusters.PowerSourceConfigurationCluster.SourcesAttributeCallback,
+  public static class DelegatedIlluminanceMeasurementClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.IlluminanceMeasurementCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5114,10 +5032,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Integer> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo("valueList", "List<Integer>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -5128,8 +5045,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedPowerSourceConfigurationClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.PowerSourceConfigurationCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedIlluminanceMeasurementClusterAttributeListAttributeCallback
+      implements ChipClusters.IlluminanceMeasurementCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5152,8 +5069,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedPowerSourceConfigurationClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.PowerSourceConfigurationCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedTemperatureMeasurementClusterAttributeListAttributeCallback
+      implements ChipClusters.TemperatureMeasurementCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5176,8 +5093,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedPowerSourceConfigurationClusterAttributeListAttributeCallback
-      implements ChipClusters.PowerSourceConfigurationCluster.AttributeListAttributeCallback,
+  public static class DelegatedPressureMeasurementClusterAttributeListAttributeCallback
+      implements ChipClusters.PressureMeasurementCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5200,8 +5117,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedPressureMeasurementClusterAttributeListAttributeCallback
-      implements ChipClusters.PressureMeasurementCluster.AttributeListAttributeCallback,
+  public static class DelegatedFlowMeasurementClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.FlowMeasurementCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5224,10 +5141,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static
-  class DelegatedPumpConfigurationAndControlClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.PumpConfigurationAndControlCluster
-              .GeneratedCommandListAttributeCallback,
+  public static class DelegatedFlowMeasurementClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.FlowMeasurementCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5250,10 +5165,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static
-  class DelegatedPumpConfigurationAndControlClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.PumpConfigurationAndControlCluster
-              .AcceptedCommandListAttributeCallback,
+  public static class DelegatedFlowMeasurementClusterAttributeListAttributeCallback
+      implements ChipClusters.FlowMeasurementCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5276,8 +5189,10 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedPumpConfigurationAndControlClusterAttributeListAttributeCallback
-      implements ChipClusters.PumpConfigurationAndControlCluster.AttributeListAttributeCallback,
+  public static
+  class DelegatedRelativeHumidityMeasurementClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.RelativeHumidityMeasurementCluster
+              .GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5301,9 +5216,9 @@ public void onError(Exception ex) {
   }
 
   public static
-  class DelegatedRelativeHumidityMeasurementClusterGeneratedCommandListAttributeCallback
+  class DelegatedRelativeHumidityMeasurementClusterAcceptedCommandListAttributeCallback
       implements ChipClusters.RelativeHumidityMeasurementCluster
-              .GeneratedCommandListAttributeCallback,
+              .AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5326,10 +5241,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static
-  class DelegatedRelativeHumidityMeasurementClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.RelativeHumidityMeasurementCluster
-              .AcceptedCommandListAttributeCallback,
+  public static class DelegatedRelativeHumidityMeasurementClusterAttributeListAttributeCallback
+      implements ChipClusters.RelativeHumidityMeasurementCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5352,8 +5265,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRelativeHumidityMeasurementClusterAttributeListAttributeCallback
-      implements ChipClusters.RelativeHumidityMeasurementCluster.AttributeListAttributeCallback,
+  public static class DelegatedOccupancySensingClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.OccupancySensingCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5376,8 +5289,9 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedAddSceneResponseCallback
-      implements ChipClusters.ScenesCluster.AddSceneResponseCallback, DelegatedClusterCallback {
+  public static class DelegatedOccupancySensingClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.OccupancySensingCluster.AcceptedCommandListAttributeCallback,
+          DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
     @Override
@@ -5386,25 +5300,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Integer Status, Integer GroupId, Integer SceneId) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-      responseValues.put(StatusResponseValue, Status);
-      CommandResponseInfo GroupIdResponseValue = new CommandResponseInfo("GroupId", "Integer");
-      responseValues.put(GroupIdResponseValue, GroupId);
-      CommandResponseInfo SceneIdResponseValue = new CommandResponseInfo("SceneId", "Integer");
-      responseValues.put(SceneIdResponseValue, SceneId);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedGetSceneMembershipResponseCallback
-      implements ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback,
+  public static class DelegatedOccupancySensingClusterAttributeListAttributeCallback
+      implements ChipClusters.OccupancySensingCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5414,31 +5324,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(
-        Integer Status,
-        @Nullable Integer Capacity,
-        Integer GroupId,
-        Optional<ArrayList<Integer>> SceneList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-      responseValues.put(StatusResponseValue, Status);
-      CommandResponseInfo CapacityResponseValue = new CommandResponseInfo("Capacity", "Integer");
-      responseValues.put(CapacityResponseValue, Capacity);
-      CommandResponseInfo GroupIdResponseValue = new CommandResponseInfo("GroupId", "Integer");
-      responseValues.put(GroupIdResponseValue, GroupId);
-      // SceneList: /* TYPE WARNING: array array defaults to */ uint8_t *
-      // Conversion from this type to Java is not properly implemented yet
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedRemoveAllScenesResponseCallback
-      implements ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback,
+  public static class DelegatedWakeOnLanClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.WakeOnLanCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5448,23 +5348,22 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Integer Status, Integer GroupId) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-      responseValues.put(StatusResponseValue, Status);
-      CommandResponseInfo GroupIdResponseValue = new CommandResponseInfo("GroupId", "Integer");
-      responseValues.put(GroupIdResponseValue, GroupId);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedRemoveSceneResponseCallback
-      implements ChipClusters.ScenesCluster.RemoveSceneResponseCallback, DelegatedClusterCallback {
+  public static class DelegatedWakeOnLanClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.WakeOnLanCluster.AcceptedCommandListAttributeCallback,
+          DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
     @Override
@@ -5473,25 +5372,22 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Integer Status, Integer GroupId, Integer SceneId) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-      responseValues.put(StatusResponseValue, Status);
-      CommandResponseInfo GroupIdResponseValue = new CommandResponseInfo("GroupId", "Integer");
-      responseValues.put(GroupIdResponseValue, GroupId);
-      CommandResponseInfo SceneIdResponseValue = new CommandResponseInfo("SceneId", "Integer");
-      responseValues.put(SceneIdResponseValue, SceneId);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedStoreSceneResponseCallback
-      implements ChipClusters.ScenesCluster.StoreSceneResponseCallback, DelegatedClusterCallback {
+  public static class DelegatedWakeOnLanClusterAttributeListAttributeCallback
+      implements ChipClusters.WakeOnLanCluster.AttributeListAttributeCallback,
+          DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
     @Override
@@ -5500,25 +5396,22 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Integer Status, Integer GroupId, Integer SceneId) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-      responseValues.put(StatusResponseValue, Status);
-      CommandResponseInfo GroupIdResponseValue = new CommandResponseInfo("GroupId", "Integer");
-      responseValues.put(GroupIdResponseValue, GroupId);
-      CommandResponseInfo SceneIdResponseValue = new CommandResponseInfo("SceneId", "Integer");
-      responseValues.put(SceneIdResponseValue, SceneId);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedViewSceneResponseCallback
-      implements ChipClusters.ScenesCluster.ViewSceneResponseCallback, DelegatedClusterCallback {
+  public static class DelegatedChangeChannelResponseCallback
+      implements ChipClusters.ChannelCluster.ChangeChannelResponseCallback,
+          DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
     @Override
@@ -5527,28 +5420,12 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(
-        Integer Status,
-        Integer GroupId,
-        Integer SceneId,
-        Optional<Integer> TransitionTime,
-        Optional<String> SceneName,
-        Optional<ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>> ExtensionFieldSets) {
+    public void onSuccess(Integer status, Optional<String> data) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-      responseValues.put(StatusResponseValue, Status);
-      CommandResponseInfo GroupIdResponseValue = new CommandResponseInfo("GroupId", "Integer");
-      responseValues.put(GroupIdResponseValue, GroupId);
-      CommandResponseInfo SceneIdResponseValue = new CommandResponseInfo("SceneId", "Integer");
-      responseValues.put(SceneIdResponseValue, SceneId);
-      CommandResponseInfo TransitionTimeResponseValue =
-          new CommandResponseInfo("TransitionTime", "Optional<Integer>");
-      responseValues.put(TransitionTimeResponseValue, TransitionTime);
-      CommandResponseInfo SceneNameResponseValue =
-          new CommandResponseInfo("SceneName", "Optional<String>");
-      responseValues.put(SceneNameResponseValue, SceneName);
-      // ExtensionFieldSets: /* TYPE WARNING: array array defaults to */ uint8_t *
-      // Conversion from this type to Java is not properly implemented yet
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo dataResponseValue = new CommandResponseInfo("data", "Optional<String>");
+      responseValues.put(dataResponseValue, data);
       callback.onSuccess(responseValues);
     }
 
@@ -5558,8 +5435,8 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedScenesClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.ScenesCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedChannelClusterChannelListAttributeCallback
+      implements ChipClusters.ChannelCluster.ChannelListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5569,9 +5446,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<ChipStructs.ChannelClusterChannelInfo> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo("valueList", "List<ChipStructs.ChannelClusterChannelInfo>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -5582,8 +5460,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedScenesClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.ScenesCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedChannelClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.ChannelCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5606,8 +5484,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedScenesClusterAttributeListAttributeCallback
-      implements ChipClusters.ScenesCluster.AttributeListAttributeCallback,
+  public static class DelegatedChannelClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.ChannelCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5630,8 +5508,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedSoftwareDiagnosticsClusterThreadMetricsAttributeCallback
-      implements ChipClusters.SoftwareDiagnosticsCluster.ThreadMetricsAttributeCallback,
+  public static class DelegatedChannelClusterAttributeListAttributeCallback
+      implements ChipClusters.ChannelCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5641,11 +5519,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.SoftwareDiagnosticsClusterThreadMetrics> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo(
-              "valueList", "List<ChipStructs.SoftwareDiagnosticsClusterThreadMetrics>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -5656,8 +5532,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedSoftwareDiagnosticsClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.SoftwareDiagnosticsCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedNavigateTargetResponseCallback
+      implements ChipClusters.TargetNavigatorCluster.NavigateTargetResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5667,21 +5543,23 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(Integer status, Optional<String> data) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo dataResponseValue = new CommandResponseInfo("data", "Optional<String>");
+      responseValues.put(dataResponseValue, data);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedSoftwareDiagnosticsClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.SoftwareDiagnosticsCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedTargetNavigatorClusterTargetListAttributeCallback
+      implements ChipClusters.TargetNavigatorCluster.TargetListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5691,9 +5569,11 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<ChipStructs.TargetNavigatorClusterTargetInfo> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo(
+              "valueList", "List<ChipStructs.TargetNavigatorClusterTargetInfo>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -5704,8 +5584,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedSoftwareDiagnosticsClusterAttributeListAttributeCallback
-      implements ChipClusters.SoftwareDiagnosticsCluster.AttributeListAttributeCallback,
+  public static class DelegatedTargetNavigatorClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.TargetNavigatorCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5728,8 +5608,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedSwitchClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.SwitchCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedTargetNavigatorClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.TargetNavigatorCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5752,8 +5632,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedSwitchClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.SwitchCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedTargetNavigatorClusterAttributeListAttributeCallback
+      implements ChipClusters.TargetNavigatorCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5776,8 +5656,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedSwitchClusterAttributeListAttributeCallback
-      implements ChipClusters.SwitchCluster.AttributeListAttributeCallback,
+  public static class DelegatedPlaybackResponseCallback
+      implements ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5787,21 +5667,23 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(Integer status, Optional<String> data) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo dataResponseValue = new CommandResponseInfo("data", "Optional<String>");
+      responseValues.put(dataResponseValue, data);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedNavigateTargetResponseCallback
-      implements ChipClusters.TargetNavigatorCluster.NavigateTargetResponseCallback,
+  public static class DelegatedMediaPlaybackClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.MediaPlaybackCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5811,23 +5693,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Integer status, Optional<String> data) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
-      responseValues.put(statusResponseValue, status);
-      CommandResponseInfo dataResponseValue = new CommandResponseInfo("data", "Optional<String>");
-      responseValues.put(dataResponseValue, data);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedTargetNavigatorClusterTargetListAttributeCallback
-      implements ChipClusters.TargetNavigatorCluster.TargetListAttributeCallback,
+  public static class DelegatedMediaPlaybackClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.MediaPlaybackCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5837,11 +5717,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.TargetNavigatorClusterTargetInfo> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo(
-              "valueList", "List<ChipStructs.TargetNavigatorClusterTargetInfo>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -5852,8 +5730,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedTargetNavigatorClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.TargetNavigatorCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedMediaPlaybackClusterAttributeListAttributeCallback
+      implements ChipClusters.MediaPlaybackCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5876,8 +5754,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedTargetNavigatorClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.TargetNavigatorCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedMediaInputClusterInputListAttributeCallback
+      implements ChipClusters.MediaInputCluster.InputListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5887,9 +5765,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<ChipStructs.MediaInputClusterInputInfo> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo("valueList", "List<ChipStructs.MediaInputClusterInputInfo>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -5900,8 +5779,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedTargetNavigatorClusterAttributeListAttributeCallback
-      implements ChipClusters.TargetNavigatorCluster.AttributeListAttributeCallback,
+  public static class DelegatedMediaInputClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.MediaInputCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5924,8 +5803,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedTemperatureMeasurementClusterAttributeListAttributeCallback
-      implements ChipClusters.TemperatureMeasurementCluster.AttributeListAttributeCallback,
+  public static class DelegatedMediaInputClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.MediaInputCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5948,8 +5827,9 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedBooleanResponseCallback
-      implements ChipClusters.TestClusterCluster.BooleanResponseCallback, DelegatedClusterCallback {
+  public static class DelegatedMediaInputClusterAttributeListAttributeCallback
+      implements ChipClusters.MediaInputCluster.AttributeListAttributeCallback,
+          DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
     @Override
@@ -5958,21 +5838,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Boolean value) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo valueResponseValue = new CommandResponseInfo("value", "Boolean");
-      responseValues.put(valueResponseValue, value);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedSimpleStructResponseCallback
-      implements ChipClusters.TestClusterCluster.SimpleStructResponseCallback,
+  public static class DelegatedLowPowerClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.LowPowerCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -5982,21 +5862,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(ChipStructs.TestClusterClusterSimpleStruct arg1) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      // arg1: Struct SimpleStruct
-      // Conversion from this type to Java is not properly implemented yet
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedTestAddArgumentsResponseCallback
-      implements ChipClusters.TestClusterCluster.TestAddArgumentsResponseCallback,
+  public static class DelegatedLowPowerClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.LowPowerCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6006,22 +5886,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Integer returnValue) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo returnValueResponseValue =
-          new CommandResponseInfo("returnValue", "Integer");
-      responseValues.put(returnValueResponseValue, returnValue);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedTestEmitTestEventResponseCallback
-      implements ChipClusters.TestClusterCluster.TestEmitTestEventResponseCallback,
+  public static class DelegatedLowPowerClusterAttributeListAttributeCallback
+      implements ChipClusters.LowPowerCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6031,22 +5910,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Long value) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo valueResponseValue = new CommandResponseInfo("value", "Long");
-      responseValues.put(valueResponseValue, value);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedTestEnumsResponseCallback
-      implements ChipClusters.TestClusterCluster.TestEnumsResponseCallback,
-          DelegatedClusterCallback {
+  public static class DelegatedSendKeyResponseCallback
+      implements ChipClusters.KeypadInputCluster.SendKeyResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
     @Override
@@ -6055,12 +5933,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Integer arg1, Integer arg2) {
+    public void onSuccess(Integer status) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo arg1ResponseValue = new CommandResponseInfo("arg1", "Integer");
-      responseValues.put(arg1ResponseValue, arg1);
-      CommandResponseInfo arg2ResponseValue = new CommandResponseInfo("arg2", "Integer");
-      responseValues.put(arg2ResponseValue, arg2);
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
       callback.onSuccess(responseValues);
     }
 
@@ -6070,8 +5946,8 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedTestListInt8UReverseResponseCallback
-      implements ChipClusters.TestClusterCluster.TestListInt8UReverseResponseCallback,
+  public static class DelegatedKeypadInputClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.KeypadInputCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6081,21 +5957,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(ArrayList<Integer> arg1) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      // arg1: /* TYPE WARNING: array array defaults to */ uint8_t *
-      // Conversion from this type to Java is not properly implemented yet
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedTestNullableOptionalResponseCallback
-      implements ChipClusters.TestClusterCluster.TestNullableOptionalResponseCallback,
+  public static class DelegatedKeypadInputClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.KeypadInputCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6105,35 +5981,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(
-        Boolean wasPresent,
-        Optional<Boolean> wasNull,
-        Optional<Integer> value,
-        @Nullable Optional<Integer> originalValue) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo wasPresentResponseValue =
-          new CommandResponseInfo("wasPresent", "Boolean");
-      responseValues.put(wasPresentResponseValue, wasPresent);
-      CommandResponseInfo wasNullResponseValue =
-          new CommandResponseInfo("wasNull", "Optional<Boolean>");
-      responseValues.put(wasNullResponseValue, wasNull);
-      CommandResponseInfo valueResponseValue =
-          new CommandResponseInfo("value", "Optional<Integer>");
-      responseValues.put(valueResponseValue, value);
-      CommandResponseInfo originalValueResponseValue =
-          new CommandResponseInfo("originalValue", "Optional<Integer>");
-      responseValues.put(originalValueResponseValue, originalValue);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedTestSpecificResponseCallback
-      implements ChipClusters.TestClusterCluster.TestSpecificResponseCallback,
+  public static class DelegatedKeypadInputClusterAttributeListAttributeCallback
+      implements ChipClusters.KeypadInputCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6143,22 +6005,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Integer returnValue) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo returnValueResponseValue =
-          new CommandResponseInfo("returnValue", "Integer");
-      responseValues.put(returnValueResponseValue, returnValue);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
     }
   }
 
-  public static class DelegatedTestClusterClusterListInt8uAttributeCallback
-      implements ChipClusters.TestClusterCluster.ListInt8uAttributeCallback,
+  public static class DelegatedLaunchResponseCallback
+      implements ChipClusters.ContentLauncherCluster.LaunchResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6168,22 +6029,23 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Integer> valueList) {
+    public void onSuccess(Integer status, Optional<String> data) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo("valueList", "List<Integer>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo dataResponseValue = new CommandResponseInfo("data", "Optional<String>");
+      responseValues.put(dataResponseValue, data);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedTestClusterClusterListOctetStringAttributeCallback
-      implements ChipClusters.TestClusterCluster.ListOctetStringAttributeCallback,
+  public static class DelegatedContentLauncherClusterAcceptHeaderAttributeCallback
+      implements ChipClusters.ContentLauncherCluster.AcceptHeaderAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6193,10 +6055,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<byte[]> valueList) {
+    public void onSuccess(List<String> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
       CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo("valueList", "List<byte[]>");
+          new CommandResponseInfo("valueList", "List<String>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -6207,8 +6069,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedTestClusterClusterListStructOctetStringAttributeCallback
-      implements ChipClusters.TestClusterCluster.ListStructOctetStringAttributeCallback,
+  public static class DelegatedContentLauncherClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.ContentLauncherCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6218,11 +6080,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.TestClusterClusterTestListStructOctet> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo(
-              "valueList", "List<ChipStructs.TestClusterClusterTestListStructOctet>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -6233,8 +6093,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedTestClusterClusterListNullablesAndOptionalsStructAttributeCallback
-      implements ChipClusters.TestClusterCluster.ListNullablesAndOptionalsStructAttributeCallback,
+  public static class DelegatedContentLauncherClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.ContentLauncherCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6244,12 +6104,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(
-        List<ChipStructs.TestClusterClusterNullablesAndOptionalsStruct> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo(
-              "valueList", "List<ChipStructs.TestClusterClusterNullablesAndOptionalsStruct>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -6260,8 +6117,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedTestClusterClusterListLongOctetStringAttributeCallback
-      implements ChipClusters.TestClusterCluster.ListLongOctetStringAttributeCallback,
+  public static class DelegatedContentLauncherClusterAttributeListAttributeCallback
+      implements ChipClusters.ContentLauncherCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6271,10 +6128,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<byte[]> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo("valueList", "List<byte[]>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -6285,8 +6141,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedTestClusterClusterListFabricScopedAttributeCallback
-      implements ChipClusters.TestClusterCluster.ListFabricScopedAttributeCallback,
+  public static class DelegatedAudioOutputClusterOutputListAttributeCallback
+      implements ChipClusters.AudioOutputCluster.OutputListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6296,11 +6152,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.TestClusterClusterTestFabricScoped> valueList) {
+    public void onSuccess(List<ChipStructs.AudioOutputClusterOutputInfo> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
       CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo(
-              "valueList", "List<ChipStructs.TestClusterClusterTestFabricScoped>");
+          new CommandResponseInfo("valueList", "List<ChipStructs.AudioOutputClusterOutputInfo>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -6311,8 +6166,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedTestClusterClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.TestClusterCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedAudioOutputClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.AudioOutputCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6335,8 +6190,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedTestClusterClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.TestClusterCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedAudioOutputClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.AudioOutputCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6359,8 +6214,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedTestClusterClusterAttributeListAttributeCallback
-      implements ChipClusters.TestClusterCluster.AttributeListAttributeCallback,
+  public static class DelegatedAudioOutputClusterAttributeListAttributeCallback
+      implements ChipClusters.AudioOutputCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6383,8 +6238,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedGetWeeklyScheduleResponseCallback
-      implements ChipClusters.ThermostatCluster.GetWeeklyScheduleResponseCallback,
+  public static class DelegatedLauncherResponseCallback
+      implements ChipClusters.ApplicationLauncherCluster.LauncherResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6394,24 +6249,12 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(
-        Integer NumberOfTransitionsForSequence,
-        Integer DayOfWeekForSequence,
-        Integer ModeForSequence,
-        ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> Transitions) {
+    public void onSuccess(Integer status, byte[] data) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo NumberOfTransitionsForSequenceResponseValue =
-          new CommandResponseInfo("NumberOfTransitionsForSequence", "Integer");
-      responseValues.put(
-          NumberOfTransitionsForSequenceResponseValue, NumberOfTransitionsForSequence);
-      CommandResponseInfo DayOfWeekForSequenceResponseValue =
-          new CommandResponseInfo("DayOfWeekForSequence", "Integer");
-      responseValues.put(DayOfWeekForSequenceResponseValue, DayOfWeekForSequence);
-      CommandResponseInfo ModeForSequenceResponseValue =
-          new CommandResponseInfo("ModeForSequence", "Integer");
-      responseValues.put(ModeForSequenceResponseValue, ModeForSequence);
-      // Transitions: /* TYPE WARNING: array array defaults to */ uint8_t *
-      // Conversion from this type to Java is not properly implemented yet
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo dataResponseValue = new CommandResponseInfo("data", "byte[]");
+      responseValues.put(dataResponseValue, data);
       callback.onSuccess(responseValues);
     }
 
@@ -6421,8 +6264,8 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedThermostatClusterAttributeListAttributeCallback
-      implements ChipClusters.ThermostatCluster.AttributeListAttributeCallback,
+  public static class DelegatedApplicationLauncherClusterCatalogListAttributeCallback
+      implements ChipClusters.ApplicationLauncherCluster.CatalogListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6432,9 +6275,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<Integer> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo("valueList", "List<Integer>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -6445,10 +6289,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static
-  class DelegatedThermostatUserInterfaceConfigurationClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.ThermostatUserInterfaceConfigurationCluster
-              .GeneratedCommandListAttributeCallback,
+  public static class DelegatedApplicationLauncherClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.ApplicationLauncherCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6471,10 +6313,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static
-  class DelegatedThermostatUserInterfaceConfigurationClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.ThermostatUserInterfaceConfigurationCluster
-              .AcceptedCommandListAttributeCallback,
+  public static class DelegatedApplicationLauncherClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.ApplicationLauncherCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6497,10 +6337,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static
-  class DelegatedThermostatUserInterfaceConfigurationClusterAttributeListAttributeCallback
-      implements ChipClusters.ThermostatUserInterfaceConfigurationCluster
-              .AttributeListAttributeCallback,
+  public static class DelegatedApplicationLauncherClusterAttributeListAttributeCallback
+      implements ChipClusters.ApplicationLauncherCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6523,8 +6361,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedThreadNetworkDiagnosticsClusterNeighborTableListAttributeCallback
-      implements ChipClusters.ThreadNetworkDiagnosticsCluster.NeighborTableListAttributeCallback,
+  public static class DelegatedApplicationBasicClusterAllowedVendorListAttributeCallback
+      implements ChipClusters.ApplicationBasicCluster.AllowedVendorListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6534,12 +6372,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(
-        List<ChipStructs.ThreadNetworkDiagnosticsClusterNeighborTable> valueList) {
+    public void onSuccess(List<Integer> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
       CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo(
-              "valueList", "List<ChipStructs.ThreadNetworkDiagnosticsClusterNeighborTable>");
+          new CommandResponseInfo("valueList", "List<Integer>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -6550,8 +6386,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedThreadNetworkDiagnosticsClusterRouteTableListAttributeCallback
-      implements ChipClusters.ThreadNetworkDiagnosticsCluster.RouteTableListAttributeCallback,
+  public static class DelegatedApplicationBasicClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.ApplicationBasicCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6561,11 +6397,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.ThreadNetworkDiagnosticsClusterRouteTable> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo(
-              "valueList", "List<ChipStructs.ThreadNetworkDiagnosticsClusterRouteTable>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -6576,10 +6410,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static
-  class DelegatedThreadNetworkDiagnosticsClusterActiveNetworkFaultsListAttributeCallback
-      implements ChipClusters.ThreadNetworkDiagnosticsCluster
-              .ActiveNetworkFaultsListAttributeCallback,
+  public static class DelegatedApplicationBasicClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.ApplicationBasicCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6589,10 +6421,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Integer> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo("valueList", "List<Integer>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -6603,8 +6434,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedThreadNetworkDiagnosticsClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.ThreadNetworkDiagnosticsCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedApplicationBasicClusterAttributeListAttributeCallback
+      implements ChipClusters.ApplicationBasicCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6627,8 +6458,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedThreadNetworkDiagnosticsClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.ThreadNetworkDiagnosticsCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedGetSetupPINResponseCallback
+      implements ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6638,21 +6469,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(String setupPIN) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("setupPIN", "String");
+      responseValues.put(setupPINResponseValue, setupPIN);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedThreadNetworkDiagnosticsClusterAttributeListAttributeCallback
-      implements ChipClusters.ThreadNetworkDiagnosticsCluster.AttributeListAttributeCallback,
+  public static class DelegatedAccountLoginClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.AccountLoginCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6675,8 +6506,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedTimeFormatLocalizationClusterSupportedCalendarTypesAttributeCallback
-      implements ChipClusters.TimeFormatLocalizationCluster.SupportedCalendarTypesAttributeCallback,
+  public static class DelegatedAccountLoginClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.AccountLoginCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6686,10 +6517,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Integer> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo("valueList", "List<Integer>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -6700,8 +6530,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedTimeFormatLocalizationClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.TimeFormatLocalizationCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedAccountLoginClusterAttributeListAttributeCallback
+      implements ChipClusters.AccountLoginCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6724,8 +6554,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedTimeFormatLocalizationClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.TimeFormatLocalizationCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedElectricalMeasurementClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.ElectricalMeasurementCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6748,8 +6578,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedUnitLocalizationClusterAttributeListAttributeCallback
-      implements ChipClusters.UnitLocalizationCluster.AttributeListAttributeCallback,
+  public static class DelegatedElectricalMeasurementClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.ElectricalMeasurementCluster.AcceptedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6772,8 +6602,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedUserLabelClusterLabelListAttributeCallback
-      implements ChipClusters.UserLabelCluster.LabelListAttributeCallback,
+  public static class DelegatedElectricalMeasurementClusterAttributeListAttributeCallback
+      implements ChipClusters.ElectricalMeasurementCluster.AttributeListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6783,10 +6613,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.UserLabelClusterLabelStruct> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo =
-          new CommandResponseInfo("valueList", "List<ChipStructs.UserLabelClusterLabelStruct>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -6797,8 +6626,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedUserLabelClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.UserLabelCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedTestSpecificResponseCallback
+      implements ChipClusters.TestClusterCluster.TestSpecificResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6808,21 +6637,22 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(Integer returnValue) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo returnValueResponseValue =
+          new CommandResponseInfo("returnValue", "Integer");
+      responseValues.put(returnValueResponseValue, returnValue);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedUserLabelClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.UserLabelCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedTestAddArgumentsResponseCallback
+      implements ChipClusters.TestClusterCluster.TestAddArgumentsResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6832,21 +6662,22 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(Integer returnValue) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo returnValueResponseValue =
+          new CommandResponseInfo("returnValue", "Integer");
+      responseValues.put(returnValueResponseValue, returnValue);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedWakeOnLanClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.WakeOnLanCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedTestListInt8UReverseResponseCallback
+      implements ChipClusters.TestClusterCluster.TestListInt8UReverseResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6856,21 +6687,21 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(ArrayList<Integer> arg1) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      // arg1: /* TYPE WARNING: array array defaults to */ uint8_t *
+      // Conversion from this type to Java is not properly implemented yet
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedWakeOnLanClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.WakeOnLanCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedTestEnumsResponseCallback
+      implements ChipClusters.TestClusterCluster.TestEnumsResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6880,21 +6711,23 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(Integer arg1, Integer arg2) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo arg1ResponseValue = new CommandResponseInfo("arg1", "Integer");
+      responseValues.put(arg1ResponseValue, arg1);
+      CommandResponseInfo arg2ResponseValue = new CommandResponseInfo("arg2", "Integer");
+      responseValues.put(arg2ResponseValue, arg2);
       callback.onSuccess(responseValues);
     }
 
     @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
 
-  public static class DelegatedWakeOnLanClusterAttributeListAttributeCallback
-      implements ChipClusters.WakeOnLanCluster.AttributeListAttributeCallback,
+  public static class DelegatedTestNullableOptionalResponseCallback
+      implements ChipClusters.TestClusterCluster.TestNullableOptionalResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6904,9 +6737,119 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(
+        Boolean wasPresent,
+        Optional<Boolean> wasNull,
+        Optional<Integer> value,
+        @Nullable Optional<Integer> originalValue) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo wasPresentResponseValue =
+          new CommandResponseInfo("wasPresent", "Boolean");
+      responseValues.put(wasPresentResponseValue, wasPresent);
+      CommandResponseInfo wasNullResponseValue =
+          new CommandResponseInfo("wasNull", "Optional<Boolean>");
+      responseValues.put(wasNullResponseValue, wasNull);
+      CommandResponseInfo valueResponseValue =
+          new CommandResponseInfo("value", "Optional<Integer>");
+      responseValues.put(valueResponseValue, value);
+      CommandResponseInfo originalValueResponseValue =
+          new CommandResponseInfo("originalValue", "Optional<Integer>");
+      responseValues.put(originalValueResponseValue, originalValue);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedBooleanResponseCallback
+      implements ChipClusters.TestClusterCluster.BooleanResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Boolean value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo valueResponseValue = new CommandResponseInfo("value", "Boolean");
+      responseValues.put(valueResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedSimpleStructResponseCallback
+      implements ChipClusters.TestClusterCluster.SimpleStructResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(ChipStructs.TestClusterClusterSimpleStruct arg1) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      // arg1: Struct SimpleStruct
+      // Conversion from this type to Java is not properly implemented yet
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedTestEmitTestEventResponseCallback
+      implements ChipClusters.TestClusterCluster.TestEmitTestEventResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Long value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo valueResponseValue = new CommandResponseInfo("value", "Long");
+      responseValues.put(valueResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedTestClusterClusterListInt8uAttributeCallback
+      implements ChipClusters.TestClusterCluster.ListInt8uAttributeCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Integer> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo("valueList", "List<Integer>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -6917,8 +6860,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedWiFiNetworkDiagnosticsClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.WiFiNetworkDiagnosticsCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedTestClusterClusterListOctetStringAttributeCallback
+      implements ChipClusters.TestClusterCluster.ListOctetStringAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6928,9 +6871,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<byte[]> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo("valueList", "List<byte[]>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -6941,8 +6885,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedWiFiNetworkDiagnosticsClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.WiFiNetworkDiagnosticsCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedTestClusterClusterListStructOctetStringAttributeCallback
+      implements ChipClusters.TestClusterCluster.ListStructOctetStringAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6952,9 +6896,11 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<ChipStructs.TestClusterClusterTestListStructOctet> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo(
+              "valueList", "List<ChipStructs.TestClusterClusterTestListStructOctet>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -6965,8 +6911,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedWiFiNetworkDiagnosticsClusterAttributeListAttributeCallback
-      implements ChipClusters.WiFiNetworkDiagnosticsCluster.AttributeListAttributeCallback,
+  public static class DelegatedTestClusterClusterListNullablesAndOptionalsStructAttributeCallback
+      implements ChipClusters.TestClusterCluster.ListNullablesAndOptionalsStructAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6976,9 +6922,12 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(
+        List<ChipStructs.TestClusterClusterNullablesAndOptionalsStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo(
+              "valueList", "List<ChipStructs.TestClusterClusterNullablesAndOptionalsStruct>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -6989,8 +6938,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedWindowCoveringClusterGeneratedCommandListAttributeCallback
-      implements ChipClusters.WindowCoveringCluster.GeneratedCommandListAttributeCallback,
+  public static class DelegatedTestClusterClusterListLongOctetStringAttributeCallback
+      implements ChipClusters.TestClusterCluster.ListLongOctetStringAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -7000,9 +6949,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<byte[]> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo("valueList", "List<byte[]>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -7013,8 +6963,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedWindowCoveringClusterAcceptedCommandListAttributeCallback
-      implements ChipClusters.WindowCoveringCluster.AcceptedCommandListAttributeCallback,
+  public static class DelegatedTestClusterClusterListFabricScopedAttributeCallback
+      implements ChipClusters.TestClusterCluster.ListFabricScopedAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -7024,9 +6974,11 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<ChipStructs.TestClusterClusterTestFabricScoped> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo =
+          new CommandResponseInfo(
+              "valueList", "List<ChipStructs.TestClusterClusterTestFabricScoped>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -7037,8 +6989,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedWindowCoveringClusterAttributeListAttributeCallback
-      implements ChipClusters.WindowCoveringCluster.AttributeListAttributeCallback,
+  public static class DelegatedTestClusterClusterGeneratedCommandListAttributeCallback
+      implements ChipClusters.TestClusterCluster.GeneratedCommandListAttributeCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -7061,12 +7013,60 @@ public void onError(Exception ex) {
     }
   }
 
-  public Map<String, ClusterInfo> getClusterMap() {
-    Map<String, ClusterInfo> clusterMap = initializeClusterMap();
-    Map<String, Map<String, InteractionInfo>> commandMap = getCommandMap();
-    combineCommand(clusterMap, commandMap);
-    Map<String, Map<String, InteractionInfo>> readAttributeMap =
-        new ClusterReadMapping().getReadAttributeMap();
+  public static class DelegatedTestClusterClusterAcceptedCommandListAttributeCallback
+      implements ChipClusters.TestClusterCluster.AcceptedCommandListAttributeCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedTestClusterClusterAttributeListAttributeCallback
+      implements ChipClusters.TestClusterCluster.AttributeListAttributeCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public Map<String, ClusterInfo> getClusterMap() {
+    Map<String, ClusterInfo> clusterMap = initializeClusterMap();
+    Map<String, Map<String, InteractionInfo>> commandMap = getCommandMap();
+    combineCommand(clusterMap, commandMap);
+    Map<String, Map<String, InteractionInfo>> readAttributeMap =
+        new ClusterReadMapping().getReadAttributeMap();
     combineCommand(clusterMap, readAttributeMap);
     Map<String, Map<String, InteractionInfo>> writeAttributeMap =
         new ClusterWriteMapping().getWriteAttributeMap();
@@ -7076,2629 +7076,2302 @@ public Map<String, ClusterInfo> getClusterMap() {
 
   public Map<String, ClusterInfo> initializeClusterMap() {
     Map<String, ClusterInfo> clusterMap = new HashMap<>();
-    ClusterInfo accessControlClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.AccessControlCluster(ptr, endpointId),
-            new HashMap<>());
-    clusterMap.put("accessControl", accessControlClusterInfo);
-    ClusterInfo accountLoginClusterInfo =
+    ClusterInfo identifyClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.AccountLoginCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.IdentifyCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("accountLogin", accountLoginClusterInfo);
-    ClusterInfo administratorCommissioningClusterInfo =
+    clusterMap.put("identify", identifyClusterInfo);
+    ClusterInfo groupsClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) ->
-                new ChipClusters.AdministratorCommissioningCluster(ptr, endpointId),
-            new HashMap<>());
-    clusterMap.put("administratorCommissioning", administratorCommissioningClusterInfo);
-    ClusterInfo applicationBasicClusterInfo =
+            (ptr, endpointId) -> new ChipClusters.GroupsCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("groups", groupsClusterInfo);
+    ClusterInfo scenesClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.ApplicationBasicCluster(ptr, endpointId),
-            new HashMap<>());
-    clusterMap.put("applicationBasic", applicationBasicClusterInfo);
-    ClusterInfo applicationLauncherClusterInfo =
+            (ptr, endpointId) -> new ChipClusters.ScenesCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("scenes", scenesClusterInfo);
+    ClusterInfo onOffClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.ApplicationLauncherCluster(ptr, endpointId),
-            new HashMap<>());
-    clusterMap.put("applicationLauncher", applicationLauncherClusterInfo);
-    ClusterInfo audioOutputClusterInfo =
+            (ptr, endpointId) -> new ChipClusters.OnOffCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("onOff", onOffClusterInfo);
+    ClusterInfo onOffSwitchConfigurationClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.AudioOutputCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.OnOffSwitchConfigurationCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("audioOutput", audioOutputClusterInfo);
-    ClusterInfo barrierControlClusterInfo =
+    clusterMap.put("onOffSwitchConfiguration", onOffSwitchConfigurationClusterInfo);
+    ClusterInfo levelControlClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.BarrierControlCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.LevelControlCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("barrierControl", barrierControlClusterInfo);
-    ClusterInfo basicClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.BasicCluster(ptr, endpointId), new HashMap<>());
-    clusterMap.put("basic", basicClusterInfo);
+    clusterMap.put("levelControl", levelControlClusterInfo);
     ClusterInfo binaryInputBasicClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.BinaryInputBasicCluster(ptr, endpointId),
             new HashMap<>());
     clusterMap.put("binaryInputBasic", binaryInputBasicClusterInfo);
+    ClusterInfo descriptorClusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.DescriptorCluster(ptr, endpointId),
+            new HashMap<>());
+    clusterMap.put("descriptor", descriptorClusterInfo);
     ClusterInfo bindingClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.BindingCluster(ptr, endpointId), new HashMap<>());
     clusterMap.put("binding", bindingClusterInfo);
-    ClusterInfo booleanStateClusterInfo =
+    ClusterInfo accessControlClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.BooleanStateCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.AccessControlCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("booleanState", booleanStateClusterInfo);
+    clusterMap.put("accessControl", accessControlClusterInfo);
     ClusterInfo bridgedActionsClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.BridgedActionsCluster(ptr, endpointId),
             new HashMap<>());
     clusterMap.put("bridgedActions", bridgedActionsClusterInfo);
-    ClusterInfo bridgedDeviceBasicClusterInfo =
+    ClusterInfo basicClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.BridgedDeviceBasicCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.BasicCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("basic", basicClusterInfo);
+    ClusterInfo otaSoftwareUpdateProviderClusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.OtaSoftwareUpdateProviderCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("bridgedDeviceBasic", bridgedDeviceBasicClusterInfo);
-    ClusterInfo channelClusterInfo =
+    clusterMap.put("otaSoftwareUpdateProvider", otaSoftwareUpdateProviderClusterInfo);
+    ClusterInfo otaSoftwareUpdateRequestorClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.ChannelCluster(ptr, endpointId), new HashMap<>());
-    clusterMap.put("channel", channelClusterInfo);
-    ClusterInfo colorControlClusterInfo =
+            (ptr, endpointId) ->
+                new ChipClusters.OtaSoftwareUpdateRequestorCluster(ptr, endpointId),
+            new HashMap<>());
+    clusterMap.put("otaSoftwareUpdateRequestor", otaSoftwareUpdateRequestorClusterInfo);
+    ClusterInfo localizationConfigurationClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.ColorControlCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.LocalizationConfigurationCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("colorControl", colorControlClusterInfo);
-    ClusterInfo contentLauncherClusterInfo =
+    clusterMap.put("localizationConfiguration", localizationConfigurationClusterInfo);
+    ClusterInfo timeFormatLocalizationClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.ContentLauncherCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.TimeFormatLocalizationCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("contentLauncher", contentLauncherClusterInfo);
-    ClusterInfo descriptorClusterInfo =
+    clusterMap.put("timeFormatLocalization", timeFormatLocalizationClusterInfo);
+    ClusterInfo unitLocalizationClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.DescriptorCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.UnitLocalizationCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("descriptor", descriptorClusterInfo);
+    clusterMap.put("unitLocalization", unitLocalizationClusterInfo);
+    ClusterInfo powerSourceConfigurationClusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.PowerSourceConfigurationCluster(ptr, endpointId),
+            new HashMap<>());
+    clusterMap.put("powerSourceConfiguration", powerSourceConfigurationClusterInfo);
+    ClusterInfo powerSourceClusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.PowerSourceCluster(ptr, endpointId),
+            new HashMap<>());
+    clusterMap.put("powerSource", powerSourceClusterInfo);
+    ClusterInfo generalCommissioningClusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.GeneralCommissioningCluster(ptr, endpointId),
+            new HashMap<>());
+    clusterMap.put("generalCommissioning", generalCommissioningClusterInfo);
+    ClusterInfo networkCommissioningClusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.NetworkCommissioningCluster(ptr, endpointId),
+            new HashMap<>());
+    clusterMap.put("networkCommissioning", networkCommissioningClusterInfo);
     ClusterInfo diagnosticLogsClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.DiagnosticLogsCluster(ptr, endpointId),
             new HashMap<>());
     clusterMap.put("diagnosticLogs", diagnosticLogsClusterInfo);
-    ClusterInfo doorLockClusterInfo =
+    ClusterInfo generalDiagnosticsClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.DoorLockCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.GeneralDiagnosticsCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("doorLock", doorLockClusterInfo);
-    ClusterInfo electricalMeasurementClusterInfo =
+    clusterMap.put("generalDiagnostics", generalDiagnosticsClusterInfo);
+    ClusterInfo softwareDiagnosticsClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.ElectricalMeasurementCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.SoftwareDiagnosticsCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("electricalMeasurement", electricalMeasurementClusterInfo);
+    clusterMap.put("softwareDiagnostics", softwareDiagnosticsClusterInfo);
+    ClusterInfo threadNetworkDiagnosticsClusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.ThreadNetworkDiagnosticsCluster(ptr, endpointId),
+            new HashMap<>());
+    clusterMap.put("threadNetworkDiagnostics", threadNetworkDiagnosticsClusterInfo);
+    ClusterInfo wiFiNetworkDiagnosticsClusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.WiFiNetworkDiagnosticsCluster(ptr, endpointId),
+            new HashMap<>());
+    clusterMap.put("wiFiNetworkDiagnostics", wiFiNetworkDiagnosticsClusterInfo);
     ClusterInfo ethernetNetworkDiagnosticsClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) ->
                 new ChipClusters.EthernetNetworkDiagnosticsCluster(ptr, endpointId),
             new HashMap<>());
     clusterMap.put("ethernetNetworkDiagnostics", ethernetNetworkDiagnosticsClusterInfo);
-    ClusterInfo fanControlClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.FanControlCluster(ptr, endpointId),
-            new HashMap<>());
-    clusterMap.put("fanControl", fanControlClusterInfo);
-    ClusterInfo fixedLabelClusterInfo =
+    ClusterInfo bridgedDeviceBasicClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.FixedLabelCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.BridgedDeviceBasicCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("fixedLabel", fixedLabelClusterInfo);
-    ClusterInfo flowMeasurementClusterInfo =
+    clusterMap.put("bridgedDeviceBasic", bridgedDeviceBasicClusterInfo);
+    ClusterInfo switchClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.FlowMeasurementCluster(ptr, endpointId),
-            new HashMap<>());
-    clusterMap.put("flowMeasurement", flowMeasurementClusterInfo);
-    ClusterInfo generalCommissioningClusterInfo =
+            (ptr, endpointId) -> new ChipClusters.SwitchCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("switch", switchClusterInfo);
+    ClusterInfo administratorCommissioningClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.GeneralCommissioningCluster(ptr, endpointId),
+            (ptr, endpointId) ->
+                new ChipClusters.AdministratorCommissioningCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("generalCommissioning", generalCommissioningClusterInfo);
-    ClusterInfo generalDiagnosticsClusterInfo =
+    clusterMap.put("administratorCommissioning", administratorCommissioningClusterInfo);
+    ClusterInfo operationalCredentialsClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.GeneralDiagnosticsCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.OperationalCredentialsCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("generalDiagnostics", generalDiagnosticsClusterInfo);
+    clusterMap.put("operationalCredentials", operationalCredentialsClusterInfo);
     ClusterInfo groupKeyManagementClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.GroupKeyManagementCluster(ptr, endpointId),
             new HashMap<>());
     clusterMap.put("groupKeyManagement", groupKeyManagementClusterInfo);
-    ClusterInfo groupsClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.GroupsCluster(ptr, endpointId), new HashMap<>());
-    clusterMap.put("groups", groupsClusterInfo);
-    ClusterInfo identifyClusterInfo =
+    ClusterInfo fixedLabelClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.IdentifyCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.FixedLabelCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("identify", identifyClusterInfo);
-    ClusterInfo illuminanceMeasurementClusterInfo =
+    clusterMap.put("fixedLabel", fixedLabelClusterInfo);
+    ClusterInfo userLabelClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.IlluminanceMeasurementCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.UserLabelCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("illuminanceMeasurement", illuminanceMeasurementClusterInfo);
-    ClusterInfo keypadInputClusterInfo =
+    clusterMap.put("userLabel", userLabelClusterInfo);
+    ClusterInfo booleanStateClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.KeypadInputCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.BooleanStateCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("keypadInput", keypadInputClusterInfo);
-    ClusterInfo levelControlClusterInfo =
+    clusterMap.put("booleanState", booleanStateClusterInfo);
+    ClusterInfo modeSelectClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.LevelControlCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.ModeSelectCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("levelControl", levelControlClusterInfo);
-    ClusterInfo localizationConfigurationClusterInfo =
+    clusterMap.put("modeSelect", modeSelectClusterInfo);
+    ClusterInfo doorLockClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.LocalizationConfigurationCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.DoorLockCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("localizationConfiguration", localizationConfigurationClusterInfo);
-    ClusterInfo lowPowerClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.LowPowerCluster(ptr, endpointId),
-            new HashMap<>());
-    clusterMap.put("lowPower", lowPowerClusterInfo);
-    ClusterInfo mediaInputClusterInfo =
+    clusterMap.put("doorLock", doorLockClusterInfo);
+    ClusterInfo windowCoveringClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.MediaInputCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.WindowCoveringCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("mediaInput", mediaInputClusterInfo);
-    ClusterInfo mediaPlaybackClusterInfo =
+    clusterMap.put("windowCovering", windowCoveringClusterInfo);
+    ClusterInfo barrierControlClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.MediaPlaybackCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.BarrierControlCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("mediaPlayback", mediaPlaybackClusterInfo);
-    ClusterInfo modeSelectClusterInfo =
+    clusterMap.put("barrierControl", barrierControlClusterInfo);
+    ClusterInfo pumpConfigurationAndControlClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.ModeSelectCluster(ptr, endpointId),
+            (ptr, endpointId) ->
+                new ChipClusters.PumpConfigurationAndControlCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("modeSelect", modeSelectClusterInfo);
-    ClusterInfo networkCommissioningClusterInfo =
+    clusterMap.put("pumpConfigurationAndControl", pumpConfigurationAndControlClusterInfo);
+    ClusterInfo thermostatClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.NetworkCommissioningCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.ThermostatCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("networkCommissioning", networkCommissioningClusterInfo);
-    ClusterInfo otaSoftwareUpdateProviderClusterInfo =
+    clusterMap.put("thermostat", thermostatClusterInfo);
+    ClusterInfo fanControlClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.OtaSoftwareUpdateProviderCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.FanControlCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("otaSoftwareUpdateProvider", otaSoftwareUpdateProviderClusterInfo);
-    ClusterInfo otaSoftwareUpdateRequestorClusterInfo =
+    clusterMap.put("fanControl", fanControlClusterInfo);
+    ClusterInfo thermostatUserInterfaceConfigurationClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) ->
-                new ChipClusters.OtaSoftwareUpdateRequestorCluster(ptr, endpointId),
-            new HashMap<>());
-    clusterMap.put("otaSoftwareUpdateRequestor", otaSoftwareUpdateRequestorClusterInfo);
-    ClusterInfo occupancySensingClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.OccupancySensingCluster(ptr, endpointId),
-            new HashMap<>());
-    clusterMap.put("occupancySensing", occupancySensingClusterInfo);
-    ClusterInfo onOffClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.OnOffCluster(ptr, endpointId), new HashMap<>());
-    clusterMap.put("onOff", onOffClusterInfo);
-    ClusterInfo onOffSwitchConfigurationClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.OnOffSwitchConfigurationCluster(ptr, endpointId),
+                new ChipClusters.ThermostatUserInterfaceConfigurationCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("onOffSwitchConfiguration", onOffSwitchConfigurationClusterInfo);
-    ClusterInfo operationalCredentialsClusterInfo =
+    clusterMap.put(
+        "thermostatUserInterfaceConfiguration", thermostatUserInterfaceConfigurationClusterInfo);
+    ClusterInfo colorControlClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.OperationalCredentialsCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.ColorControlCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("operationalCredentials", operationalCredentialsClusterInfo);
-    ClusterInfo powerSourceClusterInfo =
+    clusterMap.put("colorControl", colorControlClusterInfo);
+    ClusterInfo illuminanceMeasurementClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.PowerSourceCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.IlluminanceMeasurementCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("powerSource", powerSourceClusterInfo);
-    ClusterInfo powerSourceConfigurationClusterInfo =
+    clusterMap.put("illuminanceMeasurement", illuminanceMeasurementClusterInfo);
+    ClusterInfo temperatureMeasurementClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.PowerSourceConfigurationCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.TemperatureMeasurementCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("powerSourceConfiguration", powerSourceConfigurationClusterInfo);
+    clusterMap.put("temperatureMeasurement", temperatureMeasurementClusterInfo);
     ClusterInfo pressureMeasurementClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.PressureMeasurementCluster(ptr, endpointId),
             new HashMap<>());
     clusterMap.put("pressureMeasurement", pressureMeasurementClusterInfo);
-    ClusterInfo pumpConfigurationAndControlClusterInfo =
+    ClusterInfo flowMeasurementClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) ->
-                new ChipClusters.PumpConfigurationAndControlCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.FlowMeasurementCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("pumpConfigurationAndControl", pumpConfigurationAndControlClusterInfo);
+    clusterMap.put("flowMeasurement", flowMeasurementClusterInfo);
     ClusterInfo relativeHumidityMeasurementClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) ->
                 new ChipClusters.RelativeHumidityMeasurementCluster(ptr, endpointId),
             new HashMap<>());
     clusterMap.put("relativeHumidityMeasurement", relativeHumidityMeasurementClusterInfo);
-    ClusterInfo scenesClusterInfo =
+    ClusterInfo occupancySensingClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.ScenesCluster(ptr, endpointId), new HashMap<>());
-    clusterMap.put("scenes", scenesClusterInfo);
-    ClusterInfo softwareDiagnosticsClusterInfo =
+            (ptr, endpointId) -> new ChipClusters.OccupancySensingCluster(ptr, endpointId),
+            new HashMap<>());
+    clusterMap.put("occupancySensing", occupancySensingClusterInfo);
+    ClusterInfo wakeOnLanClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.SoftwareDiagnosticsCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.WakeOnLanCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("softwareDiagnostics", softwareDiagnosticsClusterInfo);
-    ClusterInfo switchClusterInfo =
+    clusterMap.put("wakeOnLan", wakeOnLanClusterInfo);
+    ClusterInfo channelClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.SwitchCluster(ptr, endpointId), new HashMap<>());
-    clusterMap.put("switch", switchClusterInfo);
+            (ptr, endpointId) -> new ChipClusters.ChannelCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("channel", channelClusterInfo);
     ClusterInfo targetNavigatorClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.TargetNavigatorCluster(ptr, endpointId),
             new HashMap<>());
     clusterMap.put("targetNavigator", targetNavigatorClusterInfo);
-    ClusterInfo temperatureMeasurementClusterInfo =
+    ClusterInfo mediaPlaybackClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.TemperatureMeasurementCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.MediaPlaybackCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("temperatureMeasurement", temperatureMeasurementClusterInfo);
-    ClusterInfo testClusterClusterInfo =
+    clusterMap.put("mediaPlayback", mediaPlaybackClusterInfo);
+    ClusterInfo mediaInputClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.TestClusterCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.MediaInputCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("testCluster", testClusterClusterInfo);
-    ClusterInfo thermostatClusterInfo =
+    clusterMap.put("mediaInput", mediaInputClusterInfo);
+    ClusterInfo lowPowerClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.ThermostatCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.LowPowerCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("thermostat", thermostatClusterInfo);
-    ClusterInfo thermostatUserInterfaceConfigurationClusterInfo =
+    clusterMap.put("lowPower", lowPowerClusterInfo);
+    ClusterInfo keypadInputClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) ->
-                new ChipClusters.ThermostatUserInterfaceConfigurationCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.KeypadInputCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put(
-        "thermostatUserInterfaceConfiguration", thermostatUserInterfaceConfigurationClusterInfo);
-    ClusterInfo threadNetworkDiagnosticsClusterInfo =
+    clusterMap.put("keypadInput", keypadInputClusterInfo);
+    ClusterInfo contentLauncherClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.ThreadNetworkDiagnosticsCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.ContentLauncherCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("threadNetworkDiagnostics", threadNetworkDiagnosticsClusterInfo);
-    ClusterInfo timeFormatLocalizationClusterInfo =
+    clusterMap.put("contentLauncher", contentLauncherClusterInfo);
+    ClusterInfo audioOutputClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.TimeFormatLocalizationCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.AudioOutputCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("timeFormatLocalization", timeFormatLocalizationClusterInfo);
-    ClusterInfo unitLocalizationClusterInfo =
+    clusterMap.put("audioOutput", audioOutputClusterInfo);
+    ClusterInfo applicationLauncherClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.UnitLocalizationCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.ApplicationLauncherCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("unitLocalization", unitLocalizationClusterInfo);
-    ClusterInfo userLabelClusterInfo =
+    clusterMap.put("applicationLauncher", applicationLauncherClusterInfo);
+    ClusterInfo applicationBasicClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.UserLabelCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.ApplicationBasicCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("userLabel", userLabelClusterInfo);
-    ClusterInfo wakeOnLanClusterInfo =
+    clusterMap.put("applicationBasic", applicationBasicClusterInfo);
+    ClusterInfo accountLoginClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.WakeOnLanCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.AccountLoginCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("wakeOnLan", wakeOnLanClusterInfo);
-    ClusterInfo wiFiNetworkDiagnosticsClusterInfo =
+    clusterMap.put("accountLogin", accountLoginClusterInfo);
+    ClusterInfo electricalMeasurementClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.WiFiNetworkDiagnosticsCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.ElectricalMeasurementCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("wiFiNetworkDiagnostics", wiFiNetworkDiagnosticsClusterInfo);
-    ClusterInfo windowCoveringClusterInfo =
+    clusterMap.put("electricalMeasurement", electricalMeasurementClusterInfo);
+    ClusterInfo testClusterClusterInfo =
         new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.WindowCoveringCluster(ptr, endpointId),
+            (ptr, endpointId) -> new ChipClusters.TestClusterCluster(ptr, endpointId),
             new HashMap<>());
-    clusterMap.put("windowCovering", windowCoveringClusterInfo);
+    clusterMap.put("testCluster", testClusterClusterInfo);
     return clusterMap;
   }
 
   public void combineCommand(
       Map<String, ClusterInfo> destination, Map<String, Map<String, InteractionInfo>> source) {
-    destination.get("accessControl").combineCommands(source.get("accessControl"));
-    destination.get("accountLogin").combineCommands(source.get("accountLogin"));
+    destination.get("identify").combineCommands(source.get("identify"));
+    destination.get("groups").combineCommands(source.get("groups"));
+    destination.get("scenes").combineCommands(source.get("scenes"));
+    destination.get("onOff").combineCommands(source.get("onOff"));
     destination
-        .get("administratorCommissioning")
-        .combineCommands(source.get("administratorCommissioning"));
-    destination.get("applicationBasic").combineCommands(source.get("applicationBasic"));
-    destination.get("applicationLauncher").combineCommands(source.get("applicationLauncher"));
-    destination.get("audioOutput").combineCommands(source.get("audioOutput"));
-    destination.get("barrierControl").combineCommands(source.get("barrierControl"));
-    destination.get("basic").combineCommands(source.get("basic"));
+        .get("onOffSwitchConfiguration")
+        .combineCommands(source.get("onOffSwitchConfiguration"));
+    destination.get("levelControl").combineCommands(source.get("levelControl"));
     destination.get("binaryInputBasic").combineCommands(source.get("binaryInputBasic"));
+    destination.get("descriptor").combineCommands(source.get("descriptor"));
     destination.get("binding").combineCommands(source.get("binding"));
-    destination.get("booleanState").combineCommands(source.get("booleanState"));
+    destination.get("accessControl").combineCommands(source.get("accessControl"));
     destination.get("bridgedActions").combineCommands(source.get("bridgedActions"));
-    destination.get("bridgedDeviceBasic").combineCommands(source.get("bridgedDeviceBasic"));
-    destination.get("channel").combineCommands(source.get("channel"));
-    destination.get("colorControl").combineCommands(source.get("colorControl"));
-    destination.get("contentLauncher").combineCommands(source.get("contentLauncher"));
-    destination.get("descriptor").combineCommands(source.get("descriptor"));
-    destination.get("diagnosticLogs").combineCommands(source.get("diagnosticLogs"));
-    destination.get("doorLock").combineCommands(source.get("doorLock"));
-    destination.get("electricalMeasurement").combineCommands(source.get("electricalMeasurement"));
-    destination
-        .get("ethernetNetworkDiagnostics")
-        .combineCommands(source.get("ethernetNetworkDiagnostics"));
-    destination.get("fanControl").combineCommands(source.get("fanControl"));
-    destination.get("fixedLabel").combineCommands(source.get("fixedLabel"));
-    destination.get("flowMeasurement").combineCommands(source.get("flowMeasurement"));
-    destination.get("generalCommissioning").combineCommands(source.get("generalCommissioning"));
-    destination.get("generalDiagnostics").combineCommands(source.get("generalDiagnostics"));
-    destination.get("groupKeyManagement").combineCommands(source.get("groupKeyManagement"));
-    destination.get("groups").combineCommands(source.get("groups"));
-    destination.get("identify").combineCommands(source.get("identify"));
-    destination.get("illuminanceMeasurement").combineCommands(source.get("illuminanceMeasurement"));
-    destination.get("keypadInput").combineCommands(source.get("keypadInput"));
-    destination.get("levelControl").combineCommands(source.get("levelControl"));
-    destination
-        .get("localizationConfiguration")
-        .combineCommands(source.get("localizationConfiguration"));
-    destination.get("lowPower").combineCommands(source.get("lowPower"));
-    destination.get("mediaInput").combineCommands(source.get("mediaInput"));
-    destination.get("mediaPlayback").combineCommands(source.get("mediaPlayback"));
-    destination.get("modeSelect").combineCommands(source.get("modeSelect"));
-    destination.get("networkCommissioning").combineCommands(source.get("networkCommissioning"));
+    destination.get("basic").combineCommands(source.get("basic"));
     destination
         .get("otaSoftwareUpdateProvider")
         .combineCommands(source.get("otaSoftwareUpdateProvider"));
     destination
         .get("otaSoftwareUpdateRequestor")
         .combineCommands(source.get("otaSoftwareUpdateRequestor"));
-    destination.get("occupancySensing").combineCommands(source.get("occupancySensing"));
-    destination.get("onOff").combineCommands(source.get("onOff"));
     destination
-        .get("onOffSwitchConfiguration")
-        .combineCommands(source.get("onOffSwitchConfiguration"));
-    destination.get("operationalCredentials").combineCommands(source.get("operationalCredentials"));
-    destination.get("powerSource").combineCommands(source.get("powerSource"));
+        .get("localizationConfiguration")
+        .combineCommands(source.get("localizationConfiguration"));
+    destination.get("timeFormatLocalization").combineCommands(source.get("timeFormatLocalization"));
+    destination.get("unitLocalization").combineCommands(source.get("unitLocalization"));
     destination
         .get("powerSourceConfiguration")
         .combineCommands(source.get("powerSourceConfiguration"));
-    destination.get("pressureMeasurement").combineCommands(source.get("pressureMeasurement"));
-    destination
-        .get("pumpConfigurationAndControl")
-        .combineCommands(source.get("pumpConfigurationAndControl"));
-    destination
-        .get("relativeHumidityMeasurement")
-        .combineCommands(source.get("relativeHumidityMeasurement"));
-    destination.get("scenes").combineCommands(source.get("scenes"));
+    destination.get("powerSource").combineCommands(source.get("powerSource"));
+    destination.get("generalCommissioning").combineCommands(source.get("generalCommissioning"));
+    destination.get("networkCommissioning").combineCommands(source.get("networkCommissioning"));
+    destination.get("diagnosticLogs").combineCommands(source.get("diagnosticLogs"));
+    destination.get("generalDiagnostics").combineCommands(source.get("generalDiagnostics"));
     destination.get("softwareDiagnostics").combineCommands(source.get("softwareDiagnostics"));
-    destination.get("switch").combineCommands(source.get("switch"));
-    destination.get("targetNavigator").combineCommands(source.get("targetNavigator"));
-    destination.get("temperatureMeasurement").combineCommands(source.get("temperatureMeasurement"));
-    destination.get("testCluster").combineCommands(source.get("testCluster"));
-    destination.get("thermostat").combineCommands(source.get("thermostat"));
-    destination
-        .get("thermostatUserInterfaceConfiguration")
-        .combineCommands(source.get("thermostatUserInterfaceConfiguration"));
     destination
         .get("threadNetworkDiagnostics")
         .combineCommands(source.get("threadNetworkDiagnostics"));
-    destination.get("timeFormatLocalization").combineCommands(source.get("timeFormatLocalization"));
-    destination.get("unitLocalization").combineCommands(source.get("unitLocalization"));
-    destination.get("userLabel").combineCommands(source.get("userLabel"));
-    destination.get("wakeOnLan").combineCommands(source.get("wakeOnLan"));
     destination.get("wiFiNetworkDiagnostics").combineCommands(source.get("wiFiNetworkDiagnostics"));
-    destination.get("windowCovering").combineCommands(source.get("windowCovering"));
+    destination
+        .get("ethernetNetworkDiagnostics")
+        .combineCommands(source.get("ethernetNetworkDiagnostics"));
+    destination.get("bridgedDeviceBasic").combineCommands(source.get("bridgedDeviceBasic"));
+    destination.get("switch").combineCommands(source.get("switch"));
+    destination
+        .get("administratorCommissioning")
+        .combineCommands(source.get("administratorCommissioning"));
+    destination.get("operationalCredentials").combineCommands(source.get("operationalCredentials"));
+    destination.get("groupKeyManagement").combineCommands(source.get("groupKeyManagement"));
+    destination.get("fixedLabel").combineCommands(source.get("fixedLabel"));
+    destination.get("userLabel").combineCommands(source.get("userLabel"));
+    destination.get("booleanState").combineCommands(source.get("booleanState"));
+    destination.get("modeSelect").combineCommands(source.get("modeSelect"));
+    destination.get("doorLock").combineCommands(source.get("doorLock"));
+    destination.get("windowCovering").combineCommands(source.get("windowCovering"));
+    destination.get("barrierControl").combineCommands(source.get("barrierControl"));
+    destination
+        .get("pumpConfigurationAndControl")
+        .combineCommands(source.get("pumpConfigurationAndControl"));
+    destination.get("thermostat").combineCommands(source.get("thermostat"));
+    destination.get("fanControl").combineCommands(source.get("fanControl"));
+    destination
+        .get("thermostatUserInterfaceConfiguration")
+        .combineCommands(source.get("thermostatUserInterfaceConfiguration"));
+    destination.get("colorControl").combineCommands(source.get("colorControl"));
+    destination.get("illuminanceMeasurement").combineCommands(source.get("illuminanceMeasurement"));
+    destination.get("temperatureMeasurement").combineCommands(source.get("temperatureMeasurement"));
+    destination.get("pressureMeasurement").combineCommands(source.get("pressureMeasurement"));
+    destination.get("flowMeasurement").combineCommands(source.get("flowMeasurement"));
+    destination
+        .get("relativeHumidityMeasurement")
+        .combineCommands(source.get("relativeHumidityMeasurement"));
+    destination.get("occupancySensing").combineCommands(source.get("occupancySensing"));
+    destination.get("wakeOnLan").combineCommands(source.get("wakeOnLan"));
+    destination.get("channel").combineCommands(source.get("channel"));
+    destination.get("targetNavigator").combineCommands(source.get("targetNavigator"));
+    destination.get("mediaPlayback").combineCommands(source.get("mediaPlayback"));
+    destination.get("mediaInput").combineCommands(source.get("mediaInput"));
+    destination.get("lowPower").combineCommands(source.get("lowPower"));
+    destination.get("keypadInput").combineCommands(source.get("keypadInput"));
+    destination.get("contentLauncher").combineCommands(source.get("contentLauncher"));
+    destination.get("audioOutput").combineCommands(source.get("audioOutput"));
+    destination.get("applicationLauncher").combineCommands(source.get("applicationLauncher"));
+    destination.get("applicationBasic").combineCommands(source.get("applicationBasic"));
+    destination.get("accountLogin").combineCommands(source.get("accountLogin"));
+    destination.get("electricalMeasurement").combineCommands(source.get("electricalMeasurement"));
+    destination.get("testCluster").combineCommands(source.get("testCluster"));
   }
 
   @SuppressWarnings("unchecked")
   public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, Map<String, InteractionInfo>> commandMap = new HashMap<>();
-    Map<String, InteractionInfo> accessControlClusterInteractionInfoMap = new LinkedHashMap<>();
-    commandMap.put("accessControl", accessControlClusterInteractionInfoMap);
-    Map<String, InteractionInfo> accountLoginClusterInteractionInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> accountLogingetSetupPINCommandParams =
+    Map<String, InteractionInfo> identifyClusterInteractionInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> identifyidentifyCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo accountLogingetSetupPINtempAccountIdentifierCommandParameterInfo =
-        new CommandParameterInfo("tempAccountIdentifier", String.class, String.class);
-    accountLogingetSetupPINCommandParams.put(
-        "tempAccountIdentifier", accountLogingetSetupPINtempAccountIdentifierCommandParameterInfo);
+    CommandParameterInfo identifyidentifyidentifyTimeCommandParameterInfo =
+        new CommandParameterInfo("identifyTime", Integer.class, Integer.class);
+    identifyidentifyCommandParams.put(
+        "identifyTime", identifyidentifyidentifyTimeCommandParameterInfo);
 
-    InteractionInfo accountLogingetSetupPINInteractionInfo =
+    InteractionInfo identifyidentifyInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AccountLoginCluster) cluster)
-                  .getSetupPIN(
-                      (ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback) callback,
-                      (String) commandArguments.get("tempAccountIdentifier"),
-                      10000);
+              ((ChipClusters.IdentifyCluster) cluster)
+                  .identify(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("identifyTime"));
             },
-            () -> new DelegatedGetSetupPINResponseCallback(),
-            accountLogingetSetupPINCommandParams);
-    accountLoginClusterInteractionInfoMap.put(
-        "getSetupPIN", accountLogingetSetupPINInteractionInfo);
-    Map<String, CommandParameterInfo> accountLoginloginCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            identifyidentifyCommandParams);
+    identifyClusterInteractionInfoMap.put("identify", identifyidentifyInteractionInfo);
+    Map<String, CommandParameterInfo> identifytriggerEffectCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo accountLoginlogintempAccountIdentifierCommandParameterInfo =
-        new CommandParameterInfo("tempAccountIdentifier", String.class, String.class);
-    accountLoginloginCommandParams.put(
-        "tempAccountIdentifier", accountLoginlogintempAccountIdentifierCommandParameterInfo);
+    CommandParameterInfo identifytriggerEffecteffectIdentifierCommandParameterInfo =
+        new CommandParameterInfo("effectIdentifier", Integer.class, Integer.class);
+    identifytriggerEffectCommandParams.put(
+        "effectIdentifier", identifytriggerEffecteffectIdentifierCommandParameterInfo);
 
-    CommandParameterInfo accountLoginloginsetupPINCommandParameterInfo =
-        new CommandParameterInfo("setupPIN", String.class, String.class);
-    accountLoginloginCommandParams.put("setupPIN", accountLoginloginsetupPINCommandParameterInfo);
+    CommandParameterInfo identifytriggerEffecteffectVariantCommandParameterInfo =
+        new CommandParameterInfo("effectVariant", Integer.class, Integer.class);
+    identifytriggerEffectCommandParams.put(
+        "effectVariant", identifytriggerEffecteffectVariantCommandParameterInfo);
 
-    InteractionInfo accountLoginloginInteractionInfo =
+    InteractionInfo identifytriggerEffectInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AccountLoginCluster) cluster)
-                  .login(
+              ((ChipClusters.IdentifyCluster) cluster)
+                  .triggerEffect(
                       (DefaultClusterCallback) callback,
-                      (String) commandArguments.get("tempAccountIdentifier"),
-                      (String) commandArguments.get("setupPIN"),
-                      10000);
+                      (Integer) commandArguments.get("effectIdentifier"),
+                      (Integer) commandArguments.get("effectVariant"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            accountLoginloginCommandParams);
-    accountLoginClusterInteractionInfoMap.put("login", accountLoginloginInteractionInfo);
-    Map<String, CommandParameterInfo> accountLoginlogoutCommandParams =
+            identifytriggerEffectCommandParams);
+    identifyClusterInteractionInfoMap.put("triggerEffect", identifytriggerEffectInteractionInfo);
+    commandMap.put("identify", identifyClusterInteractionInfoMap);
+    Map<String, InteractionInfo> groupsClusterInteractionInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> groupsaddGroupCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo accountLoginlogoutInteractionInfo =
+    CommandParameterInfo groupsaddGroupgroupIdCommandParameterInfo =
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
+    groupsaddGroupCommandParams.put("groupId", groupsaddGroupgroupIdCommandParameterInfo);
+
+    CommandParameterInfo groupsaddGroupgroupNameCommandParameterInfo =
+        new CommandParameterInfo("groupName", String.class, String.class);
+    groupsaddGroupCommandParams.put("groupName", groupsaddGroupgroupNameCommandParameterInfo);
+
+    InteractionInfo groupsaddGroupInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AccountLoginCluster) cluster)
-                  .logout((DefaultClusterCallback) callback, 10000);
+              ((ChipClusters.GroupsCluster) cluster)
+                  .addGroup(
+                      (ChipClusters.GroupsCluster.AddGroupResponseCallback) callback,
+                      (Integer) commandArguments.get("groupId"),
+                      (String) commandArguments.get("groupName"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            accountLoginlogoutCommandParams);
-    accountLoginClusterInteractionInfoMap.put("logout", accountLoginlogoutInteractionInfo);
-    commandMap.put("accountLogin", accountLoginClusterInteractionInfoMap);
-    Map<String, InteractionInfo> administratorCommissioningClusterInteractionInfoMap =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo>
-        administratorCommissioningopenBasicCommissioningWindowCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo
-        administratorCommissioningopenBasicCommissioningWindowcommissioningTimeoutCommandParameterInfo =
-            new CommandParameterInfo("commissioningTimeout", Integer.class, Integer.class);
-    administratorCommissioningopenBasicCommissioningWindowCommandParams.put(
-        "commissioningTimeout",
-        administratorCommissioningopenBasicCommissioningWindowcommissioningTimeoutCommandParameterInfo);
+            () -> new DelegatedAddGroupResponseCallback(),
+            groupsaddGroupCommandParams);
+    groupsClusterInteractionInfoMap.put("addGroup", groupsaddGroupInteractionInfo);
+    Map<String, CommandParameterInfo> groupsviewGroupCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo groupsviewGroupgroupIdCommandParameterInfo =
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
+    groupsviewGroupCommandParams.put("groupId", groupsviewGroupgroupIdCommandParameterInfo);
 
-    InteractionInfo administratorCommissioningopenBasicCommissioningWindowInteractionInfo =
+    InteractionInfo groupsviewGroupInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AdministratorCommissioningCluster) cluster)
-                  .openBasicCommissioningWindow(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("commissioningTimeout"),
-                      10000);
+              ((ChipClusters.GroupsCluster) cluster)
+                  .viewGroup(
+                      (ChipClusters.GroupsCluster.ViewGroupResponseCallback) callback,
+                      (Integer) commandArguments.get("groupId"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            administratorCommissioningopenBasicCommissioningWindowCommandParams);
-    administratorCommissioningClusterInteractionInfoMap.put(
-        "openBasicCommissioningWindow",
-        administratorCommissioningopenBasicCommissioningWindowInteractionInfo);
-    Map<String, CommandParameterInfo>
-        administratorCommissioningopenCommissioningWindowCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo
-        administratorCommissioningopenCommissioningWindowcommissioningTimeoutCommandParameterInfo =
-            new CommandParameterInfo("commissioningTimeout", Integer.class, Integer.class);
-    administratorCommissioningopenCommissioningWindowCommandParams.put(
-        "commissioningTimeout",
-        administratorCommissioningopenCommissioningWindowcommissioningTimeoutCommandParameterInfo);
-
-    CommandParameterInfo
-        administratorCommissioningopenCommissioningWindowPAKEVerifierCommandParameterInfo =
-            new CommandParameterInfo("PAKEVerifier", byte[].class, byte[].class);
-    administratorCommissioningopenCommissioningWindowCommandParams.put(
-        "PAKEVerifier",
-        administratorCommissioningopenCommissioningWindowPAKEVerifierCommandParameterInfo);
-
-    CommandParameterInfo
-        administratorCommissioningopenCommissioningWindowdiscriminatorCommandParameterInfo =
-            new CommandParameterInfo("discriminator", Integer.class, Integer.class);
-    administratorCommissioningopenCommissioningWindowCommandParams.put(
-        "discriminator",
-        administratorCommissioningopenCommissioningWindowdiscriminatorCommandParameterInfo);
-
-    CommandParameterInfo
-        administratorCommissioningopenCommissioningWindowiterationsCommandParameterInfo =
-            new CommandParameterInfo("iterations", Long.class, Long.class);
-    administratorCommissioningopenCommissioningWindowCommandParams.put(
-        "iterations",
-        administratorCommissioningopenCommissioningWindowiterationsCommandParameterInfo);
-
-    CommandParameterInfo administratorCommissioningopenCommissioningWindowsaltCommandParameterInfo =
-        new CommandParameterInfo("salt", byte[].class, byte[].class);
-    administratorCommissioningopenCommissioningWindowCommandParams.put(
-        "salt", administratorCommissioningopenCommissioningWindowsaltCommandParameterInfo);
+            () -> new DelegatedViewGroupResponseCallback(),
+            groupsviewGroupCommandParams);
+    groupsClusterInteractionInfoMap.put("viewGroup", groupsviewGroupInteractionInfo);
+    Map<String, CommandParameterInfo> groupsgetGroupMembershipCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo groupsgetGroupMembershipgroupListCommandParameterInfo =
+        new CommandParameterInfo("groupList", ArrayList.class, Object.class);
+    groupsgetGroupMembershipCommandParams.put(
+        "groupList", groupsgetGroupMembershipgroupListCommandParameterInfo);
 
-    InteractionInfo administratorCommissioningopenCommissioningWindowInteractionInfo =
+    InteractionInfo groupsgetGroupMembershipInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AdministratorCommissioningCluster) cluster)
-                  .openCommissioningWindow(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("commissioningTimeout"),
-                      (byte[]) commandArguments.get("PAKEVerifier"),
-                      (Integer) commandArguments.get("discriminator"),
-                      (Long) commandArguments.get("iterations"),
-                      (byte[]) commandArguments.get("salt"),
-                      10000);
+              ((ChipClusters.GroupsCluster) cluster)
+                  .getGroupMembership(
+                      (ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback) callback,
+                      (ArrayList<Integer>) commandArguments.get("groupList"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            administratorCommissioningopenCommissioningWindowCommandParams);
-    administratorCommissioningClusterInteractionInfoMap.put(
-        "openCommissioningWindow",
-        administratorCommissioningopenCommissioningWindowInteractionInfo);
-    Map<String, CommandParameterInfo> administratorCommissioningrevokeCommissioningCommandParams =
+            () -> new DelegatedGetGroupMembershipResponseCallback(),
+            groupsgetGroupMembershipCommandParams);
+    groupsClusterInteractionInfoMap.put(
+        "getGroupMembership", groupsgetGroupMembershipInteractionInfo);
+    Map<String, CommandParameterInfo> groupsremoveGroupCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo administratorCommissioningrevokeCommissioningInteractionInfo =
+    CommandParameterInfo groupsremoveGroupgroupIdCommandParameterInfo =
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
+    groupsremoveGroupCommandParams.put("groupId", groupsremoveGroupgroupIdCommandParameterInfo);
+
+    InteractionInfo groupsremoveGroupInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AdministratorCommissioningCluster) cluster)
-                  .revokeCommissioning((DefaultClusterCallback) callback, 10000);
+              ((ChipClusters.GroupsCluster) cluster)
+                  .removeGroup(
+                      (ChipClusters.GroupsCluster.RemoveGroupResponseCallback) callback,
+                      (Integer) commandArguments.get("groupId"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            administratorCommissioningrevokeCommissioningCommandParams);
-    administratorCommissioningClusterInteractionInfoMap.put(
-        "revokeCommissioning", administratorCommissioningrevokeCommissioningInteractionInfo);
-    commandMap.put(
-        "administratorCommissioning", administratorCommissioningClusterInteractionInfoMap);
-    Map<String, InteractionInfo> applicationBasicClusterInteractionInfoMap = new LinkedHashMap<>();
-    commandMap.put("applicationBasic", applicationBasicClusterInteractionInfoMap);
-    Map<String, InteractionInfo> applicationLauncherClusterInteractionInfoMap =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> applicationLauncherhideAppCommandParams =
+            () -> new DelegatedRemoveGroupResponseCallback(),
+            groupsremoveGroupCommandParams);
+    groupsClusterInteractionInfoMap.put("removeGroup", groupsremoveGroupInteractionInfo);
+    Map<String, CommandParameterInfo> groupsremoveAllGroupsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo applicationLauncherhideAppInteractionInfo =
+    InteractionInfo groupsremoveAllGroupsInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ApplicationLauncherCluster) cluster)
-                  .hideApp(
-                      (ChipClusters.ApplicationLauncherCluster.LauncherResponseCallback) callback,
-                      (ChipStructs.ApplicationLauncherClusterApplication)
-                          commandArguments.get("application"));
+              ((ChipClusters.GroupsCluster) cluster)
+                  .removeAllGroups((DefaultClusterCallback) callback);
             },
-            () -> new DelegatedLauncherResponseCallback(),
-            applicationLauncherhideAppCommandParams);
-    applicationLauncherClusterInteractionInfoMap.put(
-        "hideApp", applicationLauncherhideAppInteractionInfo);
-    Map<String, CommandParameterInfo> applicationLauncherlaunchAppCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            groupsremoveAllGroupsCommandParams);
+    groupsClusterInteractionInfoMap.put("removeAllGroups", groupsremoveAllGroupsInteractionInfo);
+    Map<String, CommandParameterInfo> groupsaddGroupIfIdentifyingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo applicationLauncherlaunchAppdataCommandParameterInfo =
-        new CommandParameterInfo("data", Optional.class, byte[].class);
-    applicationLauncherlaunchAppCommandParams.put(
-        "data", applicationLauncherlaunchAppdataCommandParameterInfo);
+    CommandParameterInfo groupsaddGroupIfIdentifyinggroupIdCommandParameterInfo =
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
+    groupsaddGroupIfIdentifyingCommandParams.put(
+        "groupId", groupsaddGroupIfIdentifyinggroupIdCommandParameterInfo);
 
-    InteractionInfo applicationLauncherlaunchAppInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ApplicationLauncherCluster) cluster)
-                  .launchApp(
-                      (ChipClusters.ApplicationLauncherCluster.LauncherResponseCallback) callback,
-                      (ChipStructs.ApplicationLauncherClusterApplication)
-                          commandArguments.get("application"),
-                      (Optional<byte[]>) commandArguments.get("data"));
-            },
-            () -> new DelegatedLauncherResponseCallback(),
-            applicationLauncherlaunchAppCommandParams);
-    applicationLauncherClusterInteractionInfoMap.put(
-        "launchApp", applicationLauncherlaunchAppInteractionInfo);
-    Map<String, CommandParameterInfo> applicationLauncherstopAppCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo applicationLauncherstopAppInteractionInfo =
+    CommandParameterInfo groupsaddGroupIfIdentifyinggroupNameCommandParameterInfo =
+        new CommandParameterInfo("groupName", String.class, String.class);
+    groupsaddGroupIfIdentifyingCommandParams.put(
+        "groupName", groupsaddGroupIfIdentifyinggroupNameCommandParameterInfo);
+
+    InteractionInfo groupsaddGroupIfIdentifyingInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ApplicationLauncherCluster) cluster)
-                  .stopApp(
-                      (ChipClusters.ApplicationLauncherCluster.LauncherResponseCallback) callback,
-                      (ChipStructs.ApplicationLauncherClusterApplication)
-                          commandArguments.get("application"));
+              ((ChipClusters.GroupsCluster) cluster)
+                  .addGroupIfIdentifying(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("groupId"),
+                      (String) commandArguments.get("groupName"));
             },
-            () -> new DelegatedLauncherResponseCallback(),
-            applicationLauncherstopAppCommandParams);
-    applicationLauncherClusterInteractionInfoMap.put(
-        "stopApp", applicationLauncherstopAppInteractionInfo);
-    commandMap.put("applicationLauncher", applicationLauncherClusterInteractionInfoMap);
-    Map<String, InteractionInfo> audioOutputClusterInteractionInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> audioOutputrenameOutputCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            groupsaddGroupIfIdentifyingCommandParams);
+    groupsClusterInteractionInfoMap.put(
+        "addGroupIfIdentifying", groupsaddGroupIfIdentifyingInteractionInfo);
+    commandMap.put("groups", groupsClusterInteractionInfoMap);
+    Map<String, InteractionInfo> scenesClusterInteractionInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> scenesaddSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo audioOutputrenameOutputindexCommandParameterInfo =
-        new CommandParameterInfo("index", Integer.class, Integer.class);
-    audioOutputrenameOutputCommandParams.put(
-        "index", audioOutputrenameOutputindexCommandParameterInfo);
+    CommandParameterInfo scenesaddScenegroupIdCommandParameterInfo =
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
+    scenesaddSceneCommandParams.put("groupId", scenesaddScenegroupIdCommandParameterInfo);
 
-    CommandParameterInfo audioOutputrenameOutputnameCommandParameterInfo =
-        new CommandParameterInfo("name", String.class, String.class);
-    audioOutputrenameOutputCommandParams.put(
-        "name", audioOutputrenameOutputnameCommandParameterInfo);
+    CommandParameterInfo scenesaddScenesceneIdCommandParameterInfo =
+        new CommandParameterInfo("sceneId", Integer.class, Integer.class);
+    scenesaddSceneCommandParams.put("sceneId", scenesaddScenesceneIdCommandParameterInfo);
 
-    InteractionInfo audioOutputrenameOutputInteractionInfo =
+    CommandParameterInfo scenesaddScenetransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    scenesaddSceneCommandParams.put(
+        "transitionTime", scenesaddScenetransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo scenesaddScenesceneNameCommandParameterInfo =
+        new CommandParameterInfo("sceneName", String.class, String.class);
+    scenesaddSceneCommandParams.put("sceneName", scenesaddScenesceneNameCommandParameterInfo);
+
+    InteractionInfo scenesaddSceneInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AudioOutputCluster) cluster)
-                  .renameOutput(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("index"),
-                      (String) commandArguments.get("name"));
+              ((ChipClusters.ScenesCluster) cluster)
+                  .addScene(
+                      (ChipClusters.ScenesCluster.AddSceneResponseCallback) callback,
+                      (Integer) commandArguments.get("groupId"),
+                      (Integer) commandArguments.get("sceneId"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (String) commandArguments.get("sceneName"),
+                      (ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>)
+                          commandArguments.get("extensionFieldSets"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            audioOutputrenameOutputCommandParams);
-    audioOutputClusterInteractionInfoMap.put(
-        "renameOutput", audioOutputrenameOutputInteractionInfo);
-    Map<String, CommandParameterInfo> audioOutputselectOutputCommandParams =
+            () -> new DelegatedAddSceneResponseCallback(),
+            scenesaddSceneCommandParams);
+    scenesClusterInteractionInfoMap.put("addScene", scenesaddSceneInteractionInfo);
+    Map<String, CommandParameterInfo> scenesviewSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo audioOutputselectOutputindexCommandParameterInfo =
-        new CommandParameterInfo("index", Integer.class, Integer.class);
-    audioOutputselectOutputCommandParams.put(
-        "index", audioOutputselectOutputindexCommandParameterInfo);
+    CommandParameterInfo scenesviewScenegroupIdCommandParameterInfo =
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
+    scenesviewSceneCommandParams.put("groupId", scenesviewScenegroupIdCommandParameterInfo);
 
-    InteractionInfo audioOutputselectOutputInteractionInfo =
+    CommandParameterInfo scenesviewScenesceneIdCommandParameterInfo =
+        new CommandParameterInfo("sceneId", Integer.class, Integer.class);
+    scenesviewSceneCommandParams.put("sceneId", scenesviewScenesceneIdCommandParameterInfo);
+
+    InteractionInfo scenesviewSceneInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AudioOutputCluster) cluster)
-                  .selectOutput(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("index"));
+              ((ChipClusters.ScenesCluster) cluster)
+                  .viewScene(
+                      (ChipClusters.ScenesCluster.ViewSceneResponseCallback) callback,
+                      (Integer) commandArguments.get("groupId"),
+                      (Integer) commandArguments.get("sceneId"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            audioOutputselectOutputCommandParams);
-    audioOutputClusterInteractionInfoMap.put(
-        "selectOutput", audioOutputselectOutputInteractionInfo);
-    commandMap.put("audioOutput", audioOutputClusterInteractionInfoMap);
-    Map<String, InteractionInfo> barrierControlClusterInteractionInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> barrierControlbarrierControlGoToPercentCommandParams =
+            () -> new DelegatedViewSceneResponseCallback(),
+            scenesviewSceneCommandParams);
+    scenesClusterInteractionInfoMap.put("viewScene", scenesviewSceneInteractionInfo);
+    Map<String, CommandParameterInfo> scenesremoveSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo barrierControlbarrierControlGoToPercentpercentOpenCommandParameterInfo =
-        new CommandParameterInfo("percentOpen", Integer.class, Integer.class);
-    barrierControlbarrierControlGoToPercentCommandParams.put(
-        "percentOpen", barrierControlbarrierControlGoToPercentpercentOpenCommandParameterInfo);
+    CommandParameterInfo scenesremoveScenegroupIdCommandParameterInfo =
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
+    scenesremoveSceneCommandParams.put("groupId", scenesremoveScenegroupIdCommandParameterInfo);
 
-    InteractionInfo barrierControlbarrierControlGoToPercentInteractionInfo =
+    CommandParameterInfo scenesremoveScenesceneIdCommandParameterInfo =
+        new CommandParameterInfo("sceneId", Integer.class, Integer.class);
+    scenesremoveSceneCommandParams.put("sceneId", scenesremoveScenesceneIdCommandParameterInfo);
+
+    InteractionInfo scenesremoveSceneInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BarrierControlCluster) cluster)
-                  .barrierControlGoToPercent(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("percentOpen"));
+              ((ChipClusters.ScenesCluster) cluster)
+                  .removeScene(
+                      (ChipClusters.ScenesCluster.RemoveSceneResponseCallback) callback,
+                      (Integer) commandArguments.get("groupId"),
+                      (Integer) commandArguments.get("sceneId"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            barrierControlbarrierControlGoToPercentCommandParams);
-    barrierControlClusterInteractionInfoMap.put(
-        "barrierControlGoToPercent", barrierControlbarrierControlGoToPercentInteractionInfo);
-    Map<String, CommandParameterInfo> barrierControlbarrierControlStopCommandParams =
+            () -> new DelegatedRemoveSceneResponseCallback(),
+            scenesremoveSceneCommandParams);
+    scenesClusterInteractionInfoMap.put("removeScene", scenesremoveSceneInteractionInfo);
+    Map<String, CommandParameterInfo> scenesremoveAllScenesCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo barrierControlbarrierControlStopInteractionInfo =
+    CommandParameterInfo scenesremoveAllScenesgroupIdCommandParameterInfo =
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
+    scenesremoveAllScenesCommandParams.put(
+        "groupId", scenesremoveAllScenesgroupIdCommandParameterInfo);
+
+    InteractionInfo scenesremoveAllScenesInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BarrierControlCluster) cluster)
-                  .barrierControlStop((DefaultClusterCallback) callback);
+              ((ChipClusters.ScenesCluster) cluster)
+                  .removeAllScenes(
+                      (ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback) callback,
+                      (Integer) commandArguments.get("groupId"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            barrierControlbarrierControlStopCommandParams);
-    barrierControlClusterInteractionInfoMap.put(
-        "barrierControlStop", barrierControlbarrierControlStopInteractionInfo);
-    commandMap.put("barrierControl", barrierControlClusterInteractionInfoMap);
-    Map<String, InteractionInfo> basicClusterInteractionInfoMap = new LinkedHashMap<>();
-    commandMap.put("basic", basicClusterInteractionInfoMap);
-    Map<String, InteractionInfo> binaryInputBasicClusterInteractionInfoMap = new LinkedHashMap<>();
-    commandMap.put("binaryInputBasic", binaryInputBasicClusterInteractionInfoMap);
-    Map<String, InteractionInfo> bindingClusterInteractionInfoMap = new LinkedHashMap<>();
-    commandMap.put("binding", bindingClusterInteractionInfoMap);
-    Map<String, InteractionInfo> booleanStateClusterInteractionInfoMap = new LinkedHashMap<>();
-    commandMap.put("booleanState", booleanStateClusterInteractionInfoMap);
-    Map<String, InteractionInfo> bridgedActionsClusterInteractionInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> bridgedActionsdisableActionCommandParams =
+            () -> new DelegatedRemoveAllScenesResponseCallback(),
+            scenesremoveAllScenesCommandParams);
+    scenesClusterInteractionInfoMap.put("removeAllScenes", scenesremoveAllScenesInteractionInfo);
+    Map<String, CommandParameterInfo> scenesstoreSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo bridgedActionsdisableActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class, Integer.class);
-    bridgedActionsdisableActionCommandParams.put(
-        "actionID", bridgedActionsdisableActionactionIDCommandParameterInfo);
+    CommandParameterInfo scenesstoreScenegroupIdCommandParameterInfo =
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
+    scenesstoreSceneCommandParams.put("groupId", scenesstoreScenegroupIdCommandParameterInfo);
 
-    CommandParameterInfo bridgedActionsdisableActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class, Long.class);
-    bridgedActionsdisableActionCommandParams.put(
-        "invokeID", bridgedActionsdisableActioninvokeIDCommandParameterInfo);
+    CommandParameterInfo scenesstoreScenesceneIdCommandParameterInfo =
+        new CommandParameterInfo("sceneId", Integer.class, Integer.class);
+    scenesstoreSceneCommandParams.put("sceneId", scenesstoreScenesceneIdCommandParameterInfo);
 
-    InteractionInfo bridgedActionsdisableActionInteractionInfo =
+    InteractionInfo scenesstoreSceneInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedActionsCluster) cluster)
-                  .disableAction(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("actionID"),
-                      (Optional<Long>) commandArguments.get("invokeID"));
+              ((ChipClusters.ScenesCluster) cluster)
+                  .storeScene(
+                      (ChipClusters.ScenesCluster.StoreSceneResponseCallback) callback,
+                      (Integer) commandArguments.get("groupId"),
+                      (Integer) commandArguments.get("sceneId"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            bridgedActionsdisableActionCommandParams);
-    bridgedActionsClusterInteractionInfoMap.put(
-        "disableAction", bridgedActionsdisableActionInteractionInfo);
-    Map<String, CommandParameterInfo> bridgedActionsdisableActionWithDurationCommandParams =
+            () -> new DelegatedStoreSceneResponseCallback(),
+            scenesstoreSceneCommandParams);
+    scenesClusterInteractionInfoMap.put("storeScene", scenesstoreSceneInteractionInfo);
+    Map<String, CommandParameterInfo> scenesrecallSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo bridgedActionsdisableActionWithDurationactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class, Integer.class);
-    bridgedActionsdisableActionWithDurationCommandParams.put(
-        "actionID", bridgedActionsdisableActionWithDurationactionIDCommandParameterInfo);
+    CommandParameterInfo scenesrecallScenegroupIdCommandParameterInfo =
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
+    scenesrecallSceneCommandParams.put("groupId", scenesrecallScenegroupIdCommandParameterInfo);
 
-    CommandParameterInfo bridgedActionsdisableActionWithDurationinvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class, Long.class);
-    bridgedActionsdisableActionWithDurationCommandParams.put(
-        "invokeID", bridgedActionsdisableActionWithDurationinvokeIDCommandParameterInfo);
+    CommandParameterInfo scenesrecallScenesceneIdCommandParameterInfo =
+        new CommandParameterInfo("sceneId", Integer.class, Integer.class);
+    scenesrecallSceneCommandParams.put("sceneId", scenesrecallScenesceneIdCommandParameterInfo);
 
-    CommandParameterInfo bridgedActionsdisableActionWithDurationdurationCommandParameterInfo =
-        new CommandParameterInfo("duration", Long.class, Long.class);
-    bridgedActionsdisableActionWithDurationCommandParams.put(
-        "duration", bridgedActionsdisableActionWithDurationdurationCommandParameterInfo);
+    CommandParameterInfo scenesrecallScenetransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", Optional.class, Integer.class);
+    scenesrecallSceneCommandParams.put(
+        "transitionTime", scenesrecallScenetransitionTimeCommandParameterInfo);
 
-    InteractionInfo bridgedActionsdisableActionWithDurationInteractionInfo =
+    InteractionInfo scenesrecallSceneInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedActionsCluster) cluster)
-                  .disableActionWithDuration(
+              ((ChipClusters.ScenesCluster) cluster)
+                  .recallScene(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("actionID"),
-                      (Optional<Long>) commandArguments.get("invokeID"),
-                      (Long) commandArguments.get("duration"));
+                      (Integer) commandArguments.get("groupId"),
+                      (Integer) commandArguments.get("sceneId"),
+                      (Optional<Integer>) commandArguments.get("transitionTime"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            bridgedActionsdisableActionWithDurationCommandParams);
-    bridgedActionsClusterInteractionInfoMap.put(
-        "disableActionWithDuration", bridgedActionsdisableActionWithDurationInteractionInfo);
-    Map<String, CommandParameterInfo> bridgedActionsenableActionCommandParams =
+            scenesrecallSceneCommandParams);
+    scenesClusterInteractionInfoMap.put("recallScene", scenesrecallSceneInteractionInfo);
+    Map<String, CommandParameterInfo> scenesgetSceneMembershipCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo bridgedActionsenableActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class, Integer.class);
-    bridgedActionsenableActionCommandParams.put(
-        "actionID", bridgedActionsenableActionactionIDCommandParameterInfo);
-
-    CommandParameterInfo bridgedActionsenableActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class, Long.class);
-    bridgedActionsenableActionCommandParams.put(
-        "invokeID", bridgedActionsenableActioninvokeIDCommandParameterInfo);
+    CommandParameterInfo scenesgetSceneMembershipgroupIdCommandParameterInfo =
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
+    scenesgetSceneMembershipCommandParams.put(
+        "groupId", scenesgetSceneMembershipgroupIdCommandParameterInfo);
 
-    InteractionInfo bridgedActionsenableActionInteractionInfo =
+    InteractionInfo scenesgetSceneMembershipInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedActionsCluster) cluster)
-                  .enableAction(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("actionID"),
-                      (Optional<Long>) commandArguments.get("invokeID"));
+              ((ChipClusters.ScenesCluster) cluster)
+                  .getSceneMembership(
+                      (ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback) callback,
+                      (Integer) commandArguments.get("groupId"));
+            },
+            () -> new DelegatedGetSceneMembershipResponseCallback(),
+            scenesgetSceneMembershipCommandParams);
+    scenesClusterInteractionInfoMap.put(
+        "getSceneMembership", scenesgetSceneMembershipInteractionInfo);
+    commandMap.put("scenes", scenesClusterInteractionInfoMap);
+    Map<String, InteractionInfo> onOffClusterInteractionInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> onOffoffCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo onOffoffInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.OnOffCluster) cluster).off((DefaultClusterCallback) callback);
             },
             () -> new DelegatedDefaultClusterCallback(),
-            bridgedActionsenableActionCommandParams);
-    bridgedActionsClusterInteractionInfoMap.put(
-        "enableAction", bridgedActionsenableActionInteractionInfo);
-    Map<String, CommandParameterInfo> bridgedActionsenableActionWithDurationCommandParams =
+            onOffoffCommandParams);
+    onOffClusterInteractionInfoMap.put("off", onOffoffInteractionInfo);
+    Map<String, CommandParameterInfo> onOffonCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo bridgedActionsenableActionWithDurationactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class, Integer.class);
-    bridgedActionsenableActionWithDurationCommandParams.put(
-        "actionID", bridgedActionsenableActionWithDurationactionIDCommandParameterInfo);
-
-    CommandParameterInfo bridgedActionsenableActionWithDurationinvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class, Long.class);
-    bridgedActionsenableActionWithDurationCommandParams.put(
-        "invokeID", bridgedActionsenableActionWithDurationinvokeIDCommandParameterInfo);
-
-    CommandParameterInfo bridgedActionsenableActionWithDurationdurationCommandParameterInfo =
-        new CommandParameterInfo("duration", Long.class, Long.class);
-    bridgedActionsenableActionWithDurationCommandParams.put(
-        "duration", bridgedActionsenableActionWithDurationdurationCommandParameterInfo);
-
-    InteractionInfo bridgedActionsenableActionWithDurationInteractionInfo =
+    InteractionInfo onOffonInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedActionsCluster) cluster)
-                  .enableActionWithDuration(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("actionID"),
-                      (Optional<Long>) commandArguments.get("invokeID"),
-                      (Long) commandArguments.get("duration"));
+              ((ChipClusters.OnOffCluster) cluster).on((DefaultClusterCallback) callback);
             },
             () -> new DelegatedDefaultClusterCallback(),
-            bridgedActionsenableActionWithDurationCommandParams);
-    bridgedActionsClusterInteractionInfoMap.put(
-        "enableActionWithDuration", bridgedActionsenableActionWithDurationInteractionInfo);
-    Map<String, CommandParameterInfo> bridgedActionsinstantActionCommandParams =
+            onOffonCommandParams);
+    onOffClusterInteractionInfoMap.put("on", onOffonInteractionInfo);
+    Map<String, CommandParameterInfo> onOfftoggleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo bridgedActionsinstantActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class, Integer.class);
-    bridgedActionsinstantActionCommandParams.put(
-        "actionID", bridgedActionsinstantActionactionIDCommandParameterInfo);
-
-    CommandParameterInfo bridgedActionsinstantActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class, Long.class);
-    bridgedActionsinstantActionCommandParams.put(
-        "invokeID", bridgedActionsinstantActioninvokeIDCommandParameterInfo);
-
-    InteractionInfo bridgedActionsinstantActionInteractionInfo =
+    InteractionInfo onOfftoggleInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedActionsCluster) cluster)
-                  .instantAction(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("actionID"),
-                      (Optional<Long>) commandArguments.get("invokeID"));
+              ((ChipClusters.OnOffCluster) cluster).toggle((DefaultClusterCallback) callback);
             },
             () -> new DelegatedDefaultClusterCallback(),
-            bridgedActionsinstantActionCommandParams);
-    bridgedActionsClusterInteractionInfoMap.put(
-        "instantAction", bridgedActionsinstantActionInteractionInfo);
-    Map<String, CommandParameterInfo> bridgedActionsinstantActionWithTransitionCommandParams =
+            onOfftoggleCommandParams);
+    onOffClusterInteractionInfoMap.put("toggle", onOfftoggleInteractionInfo);
+    Map<String, CommandParameterInfo> onOffoffWithEffectCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo bridgedActionsinstantActionWithTransitionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class, Integer.class);
-    bridgedActionsinstantActionWithTransitionCommandParams.put(
-        "actionID", bridgedActionsinstantActionWithTransitionactionIDCommandParameterInfo);
-
-    CommandParameterInfo bridgedActionsinstantActionWithTransitioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class, Long.class);
-    bridgedActionsinstantActionWithTransitionCommandParams.put(
-        "invokeID", bridgedActionsinstantActionWithTransitioninvokeIDCommandParameterInfo);
+    CommandParameterInfo onOffoffWithEffecteffectIdCommandParameterInfo =
+        new CommandParameterInfo("effectId", Integer.class, Integer.class);
+    onOffoffWithEffectCommandParams.put("effectId", onOffoffWithEffecteffectIdCommandParameterInfo);
 
-    CommandParameterInfo
-        bridgedActionsinstantActionWithTransitiontransitionTimeCommandParameterInfo =
-            new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-    bridgedActionsinstantActionWithTransitionCommandParams.put(
-        "transitionTime",
-        bridgedActionsinstantActionWithTransitiontransitionTimeCommandParameterInfo);
+    CommandParameterInfo onOffoffWithEffecteffectVariantCommandParameterInfo =
+        new CommandParameterInfo("effectVariant", Integer.class, Integer.class);
+    onOffoffWithEffectCommandParams.put(
+        "effectVariant", onOffoffWithEffecteffectVariantCommandParameterInfo);
 
-    InteractionInfo bridgedActionsinstantActionWithTransitionInteractionInfo =
+    InteractionInfo onOffoffWithEffectInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedActionsCluster) cluster)
-                  .instantActionWithTransition(
+              ((ChipClusters.OnOffCluster) cluster)
+                  .offWithEffect(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("actionID"),
-                      (Optional<Long>) commandArguments.get("invokeID"),
-                      (Integer) commandArguments.get("transitionTime"));
+                      (Integer) commandArguments.get("effectId"),
+                      (Integer) commandArguments.get("effectVariant"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            bridgedActionsinstantActionWithTransitionCommandParams);
-    bridgedActionsClusterInteractionInfoMap.put(
-        "instantActionWithTransition", bridgedActionsinstantActionWithTransitionInteractionInfo);
-    Map<String, CommandParameterInfo> bridgedActionspauseActionCommandParams =
+            onOffoffWithEffectCommandParams);
+    onOffClusterInteractionInfoMap.put("offWithEffect", onOffoffWithEffectInteractionInfo);
+    Map<String, CommandParameterInfo> onOffonWithRecallGlobalSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo bridgedActionspauseActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class, Integer.class);
-    bridgedActionspauseActionCommandParams.put(
-        "actionID", bridgedActionspauseActionactionIDCommandParameterInfo);
-
-    CommandParameterInfo bridgedActionspauseActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class, Long.class);
-    bridgedActionspauseActionCommandParams.put(
-        "invokeID", bridgedActionspauseActioninvokeIDCommandParameterInfo);
-
-    InteractionInfo bridgedActionspauseActionInteractionInfo =
+    InteractionInfo onOffonWithRecallGlobalSceneInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedActionsCluster) cluster)
-                  .pauseAction(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("actionID"),
-                      (Optional<Long>) commandArguments.get("invokeID"));
+              ((ChipClusters.OnOffCluster) cluster)
+                  .onWithRecallGlobalScene((DefaultClusterCallback) callback);
             },
             () -> new DelegatedDefaultClusterCallback(),
-            bridgedActionspauseActionCommandParams);
-    bridgedActionsClusterInteractionInfoMap.put(
-        "pauseAction", bridgedActionspauseActionInteractionInfo);
-    Map<String, CommandParameterInfo> bridgedActionspauseActionWithDurationCommandParams =
+            onOffonWithRecallGlobalSceneCommandParams);
+    onOffClusterInteractionInfoMap.put(
+        "onWithRecallGlobalScene", onOffonWithRecallGlobalSceneInteractionInfo);
+    Map<String, CommandParameterInfo> onOffonWithTimedOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo bridgedActionspauseActionWithDurationactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class, Integer.class);
-    bridgedActionspauseActionWithDurationCommandParams.put(
-        "actionID", bridgedActionspauseActionWithDurationactionIDCommandParameterInfo);
+    CommandParameterInfo onOffonWithTimedOffonOffControlCommandParameterInfo =
+        new CommandParameterInfo("onOffControl", Integer.class, Integer.class);
+    onOffonWithTimedOffCommandParams.put(
+        "onOffControl", onOffonWithTimedOffonOffControlCommandParameterInfo);
 
-    CommandParameterInfo bridgedActionspauseActionWithDurationinvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class, Long.class);
-    bridgedActionspauseActionWithDurationCommandParams.put(
-        "invokeID", bridgedActionspauseActionWithDurationinvokeIDCommandParameterInfo);
+    CommandParameterInfo onOffonWithTimedOffonTimeCommandParameterInfo =
+        new CommandParameterInfo("onTime", Integer.class, Integer.class);
+    onOffonWithTimedOffCommandParams.put("onTime", onOffonWithTimedOffonTimeCommandParameterInfo);
 
-    CommandParameterInfo bridgedActionspauseActionWithDurationdurationCommandParameterInfo =
-        new CommandParameterInfo("duration", Long.class, Long.class);
-    bridgedActionspauseActionWithDurationCommandParams.put(
-        "duration", bridgedActionspauseActionWithDurationdurationCommandParameterInfo);
+    CommandParameterInfo onOffonWithTimedOffoffWaitTimeCommandParameterInfo =
+        new CommandParameterInfo("offWaitTime", Integer.class, Integer.class);
+    onOffonWithTimedOffCommandParams.put(
+        "offWaitTime", onOffonWithTimedOffoffWaitTimeCommandParameterInfo);
 
-    InteractionInfo bridgedActionspauseActionWithDurationInteractionInfo =
+    InteractionInfo onOffonWithTimedOffInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedActionsCluster) cluster)
-                  .pauseActionWithDuration(
+              ((ChipClusters.OnOffCluster) cluster)
+                  .onWithTimedOff(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("actionID"),
-                      (Optional<Long>) commandArguments.get("invokeID"),
-                      (Long) commandArguments.get("duration"));
+                      (Integer) commandArguments.get("onOffControl"),
+                      (Integer) commandArguments.get("onTime"),
+                      (Integer) commandArguments.get("offWaitTime"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            bridgedActionspauseActionWithDurationCommandParams);
-    bridgedActionsClusterInteractionInfoMap.put(
-        "pauseActionWithDuration", bridgedActionspauseActionWithDurationInteractionInfo);
-    Map<String, CommandParameterInfo> bridgedActionsresumeActionCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo bridgedActionsresumeActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class, Integer.class);
-    bridgedActionsresumeActionCommandParams.put(
-        "actionID", bridgedActionsresumeActionactionIDCommandParameterInfo);
+            onOffonWithTimedOffCommandParams);
+    onOffClusterInteractionInfoMap.put("onWithTimedOff", onOffonWithTimedOffInteractionInfo);
+    commandMap.put("onOff", onOffClusterInteractionInfoMap);
+    Map<String, InteractionInfo> onOffSwitchConfigurationClusterInteractionInfoMap =
+        new LinkedHashMap<>();
+    commandMap.put("onOffSwitchConfiguration", onOffSwitchConfigurationClusterInteractionInfoMap);
+    Map<String, InteractionInfo> levelControlClusterInteractionInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> levelControlmoveToLevelCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo levelControlmoveToLevellevelCommandParameterInfo =
+        new CommandParameterInfo("level", Integer.class, Integer.class);
+    levelControlmoveToLevelCommandParams.put(
+        "level", levelControlmoveToLevellevelCommandParameterInfo);
 
-    CommandParameterInfo bridgedActionsresumeActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class, Long.class);
-    bridgedActionsresumeActionCommandParams.put(
-        "invokeID", bridgedActionsresumeActioninvokeIDCommandParameterInfo);
+    CommandParameterInfo levelControlmoveToLeveltransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    levelControlmoveToLevelCommandParams.put(
+        "transitionTime", levelControlmoveToLeveltransitionTimeCommandParameterInfo);
 
-    InteractionInfo bridgedActionsresumeActionInteractionInfo =
+    CommandParameterInfo levelControlmoveToLeveloptionMaskCommandParameterInfo =
+        new CommandParameterInfo("optionMask", Integer.class, Integer.class);
+    levelControlmoveToLevelCommandParams.put(
+        "optionMask", levelControlmoveToLeveloptionMaskCommandParameterInfo);
+
+    CommandParameterInfo levelControlmoveToLeveloptionOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionOverride", Integer.class, Integer.class);
+    levelControlmoveToLevelCommandParams.put(
+        "optionOverride", levelControlmoveToLeveloptionOverrideCommandParameterInfo);
+
+    InteractionInfo levelControlmoveToLevelInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedActionsCluster) cluster)
-                  .resumeAction(
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .moveToLevel(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("actionID"),
-                      (Optional<Long>) commandArguments.get("invokeID"));
+                      (Integer) commandArguments.get("level"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionMask"),
+                      (Integer) commandArguments.get("optionOverride"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            bridgedActionsresumeActionCommandParams);
-    bridgedActionsClusterInteractionInfoMap.put(
-        "resumeAction", bridgedActionsresumeActionInteractionInfo);
-    Map<String, CommandParameterInfo> bridgedActionsstartActionCommandParams =
+            levelControlmoveToLevelCommandParams);
+    levelControlClusterInteractionInfoMap.put(
+        "moveToLevel", levelControlmoveToLevelInteractionInfo);
+    Map<String, CommandParameterInfo> levelControlmoveCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo bridgedActionsstartActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class, Integer.class);
-    bridgedActionsstartActionCommandParams.put(
-        "actionID", bridgedActionsstartActionactionIDCommandParameterInfo);
+    CommandParameterInfo levelControlmovemoveModeCommandParameterInfo =
+        new CommandParameterInfo("moveMode", Integer.class, Integer.class);
+    levelControlmoveCommandParams.put("moveMode", levelControlmovemoveModeCommandParameterInfo);
 
-    CommandParameterInfo bridgedActionsstartActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class, Long.class);
-    bridgedActionsstartActionCommandParams.put(
-        "invokeID", bridgedActionsstartActioninvokeIDCommandParameterInfo);
+    CommandParameterInfo levelControlmoverateCommandParameterInfo =
+        new CommandParameterInfo("rate", Integer.class, Integer.class);
+    levelControlmoveCommandParams.put("rate", levelControlmoverateCommandParameterInfo);
 
-    InteractionInfo bridgedActionsstartActionInteractionInfo =
+    CommandParameterInfo levelControlmoveoptionMaskCommandParameterInfo =
+        new CommandParameterInfo("optionMask", Integer.class, Integer.class);
+    levelControlmoveCommandParams.put("optionMask", levelControlmoveoptionMaskCommandParameterInfo);
+
+    CommandParameterInfo levelControlmoveoptionOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionOverride", Integer.class, Integer.class);
+    levelControlmoveCommandParams.put(
+        "optionOverride", levelControlmoveoptionOverrideCommandParameterInfo);
+
+    InteractionInfo levelControlmoveInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedActionsCluster) cluster)
-                  .startAction(
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .move(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("actionID"),
-                      (Optional<Long>) commandArguments.get("invokeID"));
+                      (Integer) commandArguments.get("moveMode"),
+                      (Integer) commandArguments.get("rate"),
+                      (Integer) commandArguments.get("optionMask"),
+                      (Integer) commandArguments.get("optionOverride"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            bridgedActionsstartActionCommandParams);
-    bridgedActionsClusterInteractionInfoMap.put(
-        "startAction", bridgedActionsstartActionInteractionInfo);
-    Map<String, CommandParameterInfo> bridgedActionsstartActionWithDurationCommandParams =
+            levelControlmoveCommandParams);
+    levelControlClusterInteractionInfoMap.put("move", levelControlmoveInteractionInfo);
+    Map<String, CommandParameterInfo> levelControlstepCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo bridgedActionsstartActionWithDurationactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class, Integer.class);
-    bridgedActionsstartActionWithDurationCommandParams.put(
-        "actionID", bridgedActionsstartActionWithDurationactionIDCommandParameterInfo);
+    CommandParameterInfo levelControlstepstepModeCommandParameterInfo =
+        new CommandParameterInfo("stepMode", Integer.class, Integer.class);
+    levelControlstepCommandParams.put("stepMode", levelControlstepstepModeCommandParameterInfo);
 
-    CommandParameterInfo bridgedActionsstartActionWithDurationinvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class, Long.class);
-    bridgedActionsstartActionWithDurationCommandParams.put(
-        "invokeID", bridgedActionsstartActionWithDurationinvokeIDCommandParameterInfo);
+    CommandParameterInfo levelControlstepstepSizeCommandParameterInfo =
+        new CommandParameterInfo("stepSize", Integer.class, Integer.class);
+    levelControlstepCommandParams.put("stepSize", levelControlstepstepSizeCommandParameterInfo);
 
-    CommandParameterInfo bridgedActionsstartActionWithDurationdurationCommandParameterInfo =
-        new CommandParameterInfo("duration", Long.class, Long.class);
-    bridgedActionsstartActionWithDurationCommandParams.put(
-        "duration", bridgedActionsstartActionWithDurationdurationCommandParameterInfo);
+    CommandParameterInfo levelControlsteptransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    levelControlstepCommandParams.put(
+        "transitionTime", levelControlsteptransitionTimeCommandParameterInfo);
 
-    InteractionInfo bridgedActionsstartActionWithDurationInteractionInfo =
+    CommandParameterInfo levelControlstepoptionMaskCommandParameterInfo =
+        new CommandParameterInfo("optionMask", Integer.class, Integer.class);
+    levelControlstepCommandParams.put("optionMask", levelControlstepoptionMaskCommandParameterInfo);
+
+    CommandParameterInfo levelControlstepoptionOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionOverride", Integer.class, Integer.class);
+    levelControlstepCommandParams.put(
+        "optionOverride", levelControlstepoptionOverrideCommandParameterInfo);
+
+    InteractionInfo levelControlstepInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedActionsCluster) cluster)
-                  .startActionWithDuration(
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .step(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("actionID"),
-                      (Optional<Long>) commandArguments.get("invokeID"),
-                      (Long) commandArguments.get("duration"));
+                      (Integer) commandArguments.get("stepMode"),
+                      (Integer) commandArguments.get("stepSize"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionMask"),
+                      (Integer) commandArguments.get("optionOverride"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            bridgedActionsstartActionWithDurationCommandParams);
-    bridgedActionsClusterInteractionInfoMap.put(
-        "startActionWithDuration", bridgedActionsstartActionWithDurationInteractionInfo);
-    Map<String, CommandParameterInfo> bridgedActionsstopActionCommandParams =
+            levelControlstepCommandParams);
+    levelControlClusterInteractionInfoMap.put("step", levelControlstepInteractionInfo);
+    Map<String, CommandParameterInfo> levelControlstopCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo bridgedActionsstopActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class, Integer.class);
-    bridgedActionsstopActionCommandParams.put(
-        "actionID", bridgedActionsstopActionactionIDCommandParameterInfo);
+    CommandParameterInfo levelControlstopoptionMaskCommandParameterInfo =
+        new CommandParameterInfo("optionMask", Integer.class, Integer.class);
+    levelControlstopCommandParams.put("optionMask", levelControlstopoptionMaskCommandParameterInfo);
 
-    CommandParameterInfo bridgedActionsstopActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class, Long.class);
-    bridgedActionsstopActionCommandParams.put(
-        "invokeID", bridgedActionsstopActioninvokeIDCommandParameterInfo);
+    CommandParameterInfo levelControlstopoptionOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionOverride", Integer.class, Integer.class);
+    levelControlstopCommandParams.put(
+        "optionOverride", levelControlstopoptionOverrideCommandParameterInfo);
 
-    InteractionInfo bridgedActionsstopActionInteractionInfo =
+    InteractionInfo levelControlstopInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedActionsCluster) cluster)
-                  .stopAction(
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .stop(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("actionID"),
-                      (Optional<Long>) commandArguments.get("invokeID"));
+                      (Integer) commandArguments.get("optionMask"),
+                      (Integer) commandArguments.get("optionOverride"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            bridgedActionsstopActionCommandParams);
-    bridgedActionsClusterInteractionInfoMap.put(
-        "stopAction", bridgedActionsstopActionInteractionInfo);
-    commandMap.put("bridgedActions", bridgedActionsClusterInteractionInfoMap);
-    Map<String, InteractionInfo> bridgedDeviceBasicClusterInteractionInfoMap =
-        new LinkedHashMap<>();
-    commandMap.put("bridgedDeviceBasic", bridgedDeviceBasicClusterInteractionInfoMap);
-    Map<String, InteractionInfo> channelClusterInteractionInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> channelchangeChannelCommandParams =
+            levelControlstopCommandParams);
+    levelControlClusterInteractionInfoMap.put("stop", levelControlstopInteractionInfo);
+    Map<String, CommandParameterInfo> levelControlmoveToLevelWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo channelchangeChannelmatchCommandParameterInfo =
-        new CommandParameterInfo("match", String.class, String.class);
-    channelchangeChannelCommandParams.put("match", channelchangeChannelmatchCommandParameterInfo);
+    CommandParameterInfo levelControlmoveToLevelWithOnOfflevelCommandParameterInfo =
+        new CommandParameterInfo("level", Integer.class, Integer.class);
+    levelControlmoveToLevelWithOnOffCommandParams.put(
+        "level", levelControlmoveToLevelWithOnOfflevelCommandParameterInfo);
 
-    InteractionInfo channelchangeChannelInteractionInfo =
+    CommandParameterInfo levelControlmoveToLevelWithOnOfftransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    levelControlmoveToLevelWithOnOffCommandParams.put(
+        "transitionTime", levelControlmoveToLevelWithOnOfftransitionTimeCommandParameterInfo);
+
+    InteractionInfo levelControlmoveToLevelWithOnOffInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ChannelCluster) cluster)
-                  .changeChannel(
-                      (ChipClusters.ChannelCluster.ChangeChannelResponseCallback) callback,
-                      (String) commandArguments.get("match"));
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .moveToLevelWithOnOff(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("level"),
+                      (Integer) commandArguments.get("transitionTime"));
             },
-            () -> new DelegatedChangeChannelResponseCallback(),
-            channelchangeChannelCommandParams);
-    channelClusterInteractionInfoMap.put("changeChannel", channelchangeChannelInteractionInfo);
-    Map<String, CommandParameterInfo> channelchangeChannelByNumberCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            levelControlmoveToLevelWithOnOffCommandParams);
+    levelControlClusterInteractionInfoMap.put(
+        "moveToLevelWithOnOff", levelControlmoveToLevelWithOnOffInteractionInfo);
+    Map<String, CommandParameterInfo> levelControlmoveWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo channelchangeChannelByNumbermajorNumberCommandParameterInfo =
-        new CommandParameterInfo("majorNumber", Integer.class, Integer.class);
-    channelchangeChannelByNumberCommandParams.put(
-        "majorNumber", channelchangeChannelByNumbermajorNumberCommandParameterInfo);
+    CommandParameterInfo levelControlmoveWithOnOffmoveModeCommandParameterInfo =
+        new CommandParameterInfo("moveMode", Integer.class, Integer.class);
+    levelControlmoveWithOnOffCommandParams.put(
+        "moveMode", levelControlmoveWithOnOffmoveModeCommandParameterInfo);
 
-    CommandParameterInfo channelchangeChannelByNumberminorNumberCommandParameterInfo =
-        new CommandParameterInfo("minorNumber", Integer.class, Integer.class);
-    channelchangeChannelByNumberCommandParams.put(
-        "minorNumber", channelchangeChannelByNumberminorNumberCommandParameterInfo);
+    CommandParameterInfo levelControlmoveWithOnOffrateCommandParameterInfo =
+        new CommandParameterInfo("rate", Integer.class, Integer.class);
+    levelControlmoveWithOnOffCommandParams.put(
+        "rate", levelControlmoveWithOnOffrateCommandParameterInfo);
 
-    InteractionInfo channelchangeChannelByNumberInteractionInfo =
+    InteractionInfo levelControlmoveWithOnOffInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ChannelCluster) cluster)
-                  .changeChannelByNumber(
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .moveWithOnOff(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("majorNumber"),
-                      (Integer) commandArguments.get("minorNumber"));
+                      (Integer) commandArguments.get("moveMode"),
+                      (Integer) commandArguments.get("rate"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            channelchangeChannelByNumberCommandParams);
-    channelClusterInteractionInfoMap.put(
-        "changeChannelByNumber", channelchangeChannelByNumberInteractionInfo);
-    Map<String, CommandParameterInfo> channelskipChannelCommandParams =
+            levelControlmoveWithOnOffCommandParams);
+    levelControlClusterInteractionInfoMap.put(
+        "moveWithOnOff", levelControlmoveWithOnOffInteractionInfo);
+    Map<String, CommandParameterInfo> levelControlstepWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo channelskipChannelcountCommandParameterInfo =
-        new CommandParameterInfo("count", Integer.class, Integer.class);
-    channelskipChannelCommandParams.put("count", channelskipChannelcountCommandParameterInfo);
-
-    InteractionInfo channelskipChannelInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ChannelCluster) cluster)
-                  .skipChannel(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("count"));
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            channelskipChannelCommandParams);
-    channelClusterInteractionInfoMap.put("skipChannel", channelskipChannelInteractionInfo);
-    commandMap.put("channel", channelClusterInteractionInfoMap);
-    Map<String, InteractionInfo> colorControlClusterInteractionInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> colorControlcolorLoopSetCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlcolorLoopSetupdateFlagsCommandParameterInfo =
-        new CommandParameterInfo("updateFlags", Integer.class, Integer.class);
-    colorControlcolorLoopSetCommandParams.put(
-        "updateFlags", colorControlcolorLoopSetupdateFlagsCommandParameterInfo);
-
-    CommandParameterInfo colorControlcolorLoopSetactionCommandParameterInfo =
-        new CommandParameterInfo("action", Integer.class, Integer.class);
-    colorControlcolorLoopSetCommandParams.put(
-        "action", colorControlcolorLoopSetactionCommandParameterInfo);
-
-    CommandParameterInfo colorControlcolorLoopSetdirectionCommandParameterInfo =
-        new CommandParameterInfo("direction", Integer.class, Integer.class);
-    colorControlcolorLoopSetCommandParams.put(
-        "direction", colorControlcolorLoopSetdirectionCommandParameterInfo);
-
-    CommandParameterInfo colorControlcolorLoopSettimeCommandParameterInfo =
-        new CommandParameterInfo("time", Integer.class, Integer.class);
-    colorControlcolorLoopSetCommandParams.put(
-        "time", colorControlcolorLoopSettimeCommandParameterInfo);
-
-    CommandParameterInfo colorControlcolorLoopSetstartHueCommandParameterInfo =
-        new CommandParameterInfo("startHue", Integer.class, Integer.class);
-    colorControlcolorLoopSetCommandParams.put(
-        "startHue", colorControlcolorLoopSetstartHueCommandParameterInfo);
+    CommandParameterInfo levelControlstepWithOnOffstepModeCommandParameterInfo =
+        new CommandParameterInfo("stepMode", Integer.class, Integer.class);
+    levelControlstepWithOnOffCommandParams.put(
+        "stepMode", levelControlstepWithOnOffstepModeCommandParameterInfo);
 
-    CommandParameterInfo colorControlcolorLoopSetoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-    colorControlcolorLoopSetCommandParams.put(
-        "optionsMask", colorControlcolorLoopSetoptionsMaskCommandParameterInfo);
+    CommandParameterInfo levelControlstepWithOnOffstepSizeCommandParameterInfo =
+        new CommandParameterInfo("stepSize", Integer.class, Integer.class);
+    levelControlstepWithOnOffCommandParams.put(
+        "stepSize", levelControlstepWithOnOffstepSizeCommandParameterInfo);
 
-    CommandParameterInfo colorControlcolorLoopSetoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-    colorControlcolorLoopSetCommandParams.put(
-        "optionsOverride", colorControlcolorLoopSetoptionsOverrideCommandParameterInfo);
+    CommandParameterInfo levelControlstepWithOnOfftransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    levelControlstepWithOnOffCommandParams.put(
+        "transitionTime", levelControlstepWithOnOfftransitionTimeCommandParameterInfo);
 
-    InteractionInfo colorControlcolorLoopSetInteractionInfo =
+    InteractionInfo levelControlstepWithOnOffInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .colorLoopSet(
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .stepWithOnOff(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("updateFlags"),
-                      (Integer) commandArguments.get("action"),
-                      (Integer) commandArguments.get("direction"),
-                      (Integer) commandArguments.get("time"),
-                      (Integer) commandArguments.get("startHue"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
+                      (Integer) commandArguments.get("stepMode"),
+                      (Integer) commandArguments.get("stepSize"),
+                      (Integer) commandArguments.get("transitionTime"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            colorControlcolorLoopSetCommandParams);
-    colorControlClusterInteractionInfoMap.put(
-        "colorLoopSet", colorControlcolorLoopSetInteractionInfo);
-    Map<String, CommandParameterInfo> colorControlenhancedMoveHueCommandParams =
+            levelControlstepWithOnOffCommandParams);
+    levelControlClusterInteractionInfoMap.put(
+        "stepWithOnOff", levelControlstepWithOnOffInteractionInfo);
+    Map<String, CommandParameterInfo> levelControlstopWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlenhancedMoveHuemoveModeCommandParameterInfo =
-        new CommandParameterInfo("moveMode", Integer.class, Integer.class);
-    colorControlenhancedMoveHueCommandParams.put(
-        "moveMode", colorControlenhancedMoveHuemoveModeCommandParameterInfo);
-
-    CommandParameterInfo colorControlenhancedMoveHuerateCommandParameterInfo =
-        new CommandParameterInfo("rate", Integer.class, Integer.class);
-    colorControlenhancedMoveHueCommandParams.put(
-        "rate", colorControlenhancedMoveHuerateCommandParameterInfo);
-
-    CommandParameterInfo colorControlenhancedMoveHueoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-    colorControlenhancedMoveHueCommandParams.put(
-        "optionsMask", colorControlenhancedMoveHueoptionsMaskCommandParameterInfo);
-
-    CommandParameterInfo colorControlenhancedMoveHueoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-    colorControlenhancedMoveHueCommandParams.put(
-        "optionsOverride", colorControlenhancedMoveHueoptionsOverrideCommandParameterInfo);
-
-    InteractionInfo colorControlenhancedMoveHueInteractionInfo =
+    InteractionInfo levelControlstopWithOnOffInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .enhancedMoveHue(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("moveMode"),
-                      (Integer) commandArguments.get("rate"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .stopWithOnOff((DefaultClusterCallback) callback);
             },
             () -> new DelegatedDefaultClusterCallback(),
-            colorControlenhancedMoveHueCommandParams);
-    colorControlClusterInteractionInfoMap.put(
-        "enhancedMoveHue", colorControlenhancedMoveHueInteractionInfo);
-    Map<String, CommandParameterInfo> colorControlenhancedMoveToHueCommandParams =
+            levelControlstopWithOnOffCommandParams);
+    levelControlClusterInteractionInfoMap.put(
+        "stopWithOnOff", levelControlstopWithOnOffInteractionInfo);
+    commandMap.put("levelControl", levelControlClusterInteractionInfoMap);
+    Map<String, InteractionInfo> binaryInputBasicClusterInteractionInfoMap = new LinkedHashMap<>();
+    commandMap.put("binaryInputBasic", binaryInputBasicClusterInteractionInfoMap);
+    Map<String, InteractionInfo> descriptorClusterInteractionInfoMap = new LinkedHashMap<>();
+    commandMap.put("descriptor", descriptorClusterInteractionInfoMap);
+    Map<String, InteractionInfo> bindingClusterInteractionInfoMap = new LinkedHashMap<>();
+    commandMap.put("binding", bindingClusterInteractionInfoMap);
+    Map<String, InteractionInfo> accessControlClusterInteractionInfoMap = new LinkedHashMap<>();
+    commandMap.put("accessControl", accessControlClusterInteractionInfoMap);
+    Map<String, InteractionInfo> bridgedActionsClusterInteractionInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> bridgedActionsinstantActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlenhancedMoveToHueenhancedHueCommandParameterInfo =
-        new CommandParameterInfo("enhancedHue", Integer.class, Integer.class);
-    colorControlenhancedMoveToHueCommandParams.put(
-        "enhancedHue", colorControlenhancedMoveToHueenhancedHueCommandParameterInfo);
-
-    CommandParameterInfo colorControlenhancedMoveToHuedirectionCommandParameterInfo =
-        new CommandParameterInfo("direction", Integer.class, Integer.class);
-    colorControlenhancedMoveToHueCommandParams.put(
-        "direction", colorControlenhancedMoveToHuedirectionCommandParameterInfo);
-
-    CommandParameterInfo colorControlenhancedMoveToHuetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-    colorControlenhancedMoveToHueCommandParams.put(
-        "transitionTime", colorControlenhancedMoveToHuetransitionTimeCommandParameterInfo);
-
-    CommandParameterInfo colorControlenhancedMoveToHueoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-    colorControlenhancedMoveToHueCommandParams.put(
-        "optionsMask", colorControlenhancedMoveToHueoptionsMaskCommandParameterInfo);
+    CommandParameterInfo bridgedActionsinstantActionactionIDCommandParameterInfo =
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
+    bridgedActionsinstantActionCommandParams.put(
+        "actionID", bridgedActionsinstantActionactionIDCommandParameterInfo);
 
-    CommandParameterInfo colorControlenhancedMoveToHueoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-    colorControlenhancedMoveToHueCommandParams.put(
-        "optionsOverride", colorControlenhancedMoveToHueoptionsOverrideCommandParameterInfo);
+    CommandParameterInfo bridgedActionsinstantActioninvokeIDCommandParameterInfo =
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
+    bridgedActionsinstantActionCommandParams.put(
+        "invokeID", bridgedActionsinstantActioninvokeIDCommandParameterInfo);
 
-    InteractionInfo colorControlenhancedMoveToHueInteractionInfo =
+    InteractionInfo bridgedActionsinstantActionInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .enhancedMoveToHue(
+              ((ChipClusters.BridgedActionsCluster) cluster)
+                  .instantAction(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("enhancedHue"),
-                      (Integer) commandArguments.get("direction"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
+                      (Integer) commandArguments.get("actionID"),
+                      (Optional<Long>) commandArguments.get("invokeID"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            colorControlenhancedMoveToHueCommandParams);
-    colorControlClusterInteractionInfoMap.put(
-        "enhancedMoveToHue", colorControlenhancedMoveToHueInteractionInfo);
-    Map<String, CommandParameterInfo> colorControlenhancedMoveToHueAndSaturationCommandParams =
+            bridgedActionsinstantActionCommandParams);
+    bridgedActionsClusterInteractionInfoMap.put(
+        "instantAction", bridgedActionsinstantActionInteractionInfo);
+    Map<String, CommandParameterInfo> bridgedActionsinstantActionWithTransitionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlenhancedMoveToHueAndSaturationenhancedHueCommandParameterInfo =
-        new CommandParameterInfo("enhancedHue", Integer.class, Integer.class);
-    colorControlenhancedMoveToHueAndSaturationCommandParams.put(
-        "enhancedHue", colorControlenhancedMoveToHueAndSaturationenhancedHueCommandParameterInfo);
+    CommandParameterInfo bridgedActionsinstantActionWithTransitionactionIDCommandParameterInfo =
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
+    bridgedActionsinstantActionWithTransitionCommandParams.put(
+        "actionID", bridgedActionsinstantActionWithTransitionactionIDCommandParameterInfo);
 
-    CommandParameterInfo colorControlenhancedMoveToHueAndSaturationsaturationCommandParameterInfo =
-        new CommandParameterInfo("saturation", Integer.class, Integer.class);
-    colorControlenhancedMoveToHueAndSaturationCommandParams.put(
-        "saturation", colorControlenhancedMoveToHueAndSaturationsaturationCommandParameterInfo);
+    CommandParameterInfo bridgedActionsinstantActionWithTransitioninvokeIDCommandParameterInfo =
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
+    bridgedActionsinstantActionWithTransitionCommandParams.put(
+        "invokeID", bridgedActionsinstantActionWithTransitioninvokeIDCommandParameterInfo);
 
     CommandParameterInfo
-        colorControlenhancedMoveToHueAndSaturationtransitionTimeCommandParameterInfo =
+        bridgedActionsinstantActionWithTransitiontransitionTimeCommandParameterInfo =
             new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-    colorControlenhancedMoveToHueAndSaturationCommandParams.put(
+    bridgedActionsinstantActionWithTransitionCommandParams.put(
         "transitionTime",
-        colorControlenhancedMoveToHueAndSaturationtransitionTimeCommandParameterInfo);
-
-    CommandParameterInfo colorControlenhancedMoveToHueAndSaturationoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-    colorControlenhancedMoveToHueAndSaturationCommandParams.put(
-        "optionsMask", colorControlenhancedMoveToHueAndSaturationoptionsMaskCommandParameterInfo);
-
-    CommandParameterInfo
-        colorControlenhancedMoveToHueAndSaturationoptionsOverrideCommandParameterInfo =
-            new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-    colorControlenhancedMoveToHueAndSaturationCommandParams.put(
-        "optionsOverride",
-        colorControlenhancedMoveToHueAndSaturationoptionsOverrideCommandParameterInfo);
+        bridgedActionsinstantActionWithTransitiontransitionTimeCommandParameterInfo);
 
-    InteractionInfo colorControlenhancedMoveToHueAndSaturationInteractionInfo =
+    InteractionInfo bridgedActionsinstantActionWithTransitionInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .enhancedMoveToHueAndSaturation(
+              ((ChipClusters.BridgedActionsCluster) cluster)
+                  .instantActionWithTransition(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("enhancedHue"),
-                      (Integer) commandArguments.get("saturation"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
+                      (Integer) commandArguments.get("actionID"),
+                      (Optional<Long>) commandArguments.get("invokeID"),
+                      (Integer) commandArguments.get("transitionTime"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            colorControlenhancedMoveToHueAndSaturationCommandParams);
-    colorControlClusterInteractionInfoMap.put(
-        "enhancedMoveToHueAndSaturation",
-        colorControlenhancedMoveToHueAndSaturationInteractionInfo);
-    Map<String, CommandParameterInfo> colorControlenhancedStepHueCommandParams =
+            bridgedActionsinstantActionWithTransitionCommandParams);
+    bridgedActionsClusterInteractionInfoMap.put(
+        "instantActionWithTransition", bridgedActionsinstantActionWithTransitionInteractionInfo);
+    Map<String, CommandParameterInfo> bridgedActionsstartActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlenhancedStepHuestepModeCommandParameterInfo =
-        new CommandParameterInfo("stepMode", Integer.class, Integer.class);
-    colorControlenhancedStepHueCommandParams.put(
-        "stepMode", colorControlenhancedStepHuestepModeCommandParameterInfo);
+    CommandParameterInfo bridgedActionsstartActionactionIDCommandParameterInfo =
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
+    bridgedActionsstartActionCommandParams.put(
+        "actionID", bridgedActionsstartActionactionIDCommandParameterInfo);
 
-    CommandParameterInfo colorControlenhancedStepHuestepSizeCommandParameterInfo =
-        new CommandParameterInfo("stepSize", Integer.class, Integer.class);
-    colorControlenhancedStepHueCommandParams.put(
-        "stepSize", colorControlenhancedStepHuestepSizeCommandParameterInfo);
+    CommandParameterInfo bridgedActionsstartActioninvokeIDCommandParameterInfo =
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
+    bridgedActionsstartActionCommandParams.put(
+        "invokeID", bridgedActionsstartActioninvokeIDCommandParameterInfo);
 
-    CommandParameterInfo colorControlenhancedStepHuetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-    colorControlenhancedStepHueCommandParams.put(
-        "transitionTime", colorControlenhancedStepHuetransitionTimeCommandParameterInfo);
-
-    CommandParameterInfo colorControlenhancedStepHueoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-    colorControlenhancedStepHueCommandParams.put(
-        "optionsMask", colorControlenhancedStepHueoptionsMaskCommandParameterInfo);
-
-    CommandParameterInfo colorControlenhancedStepHueoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-    colorControlenhancedStepHueCommandParams.put(
-        "optionsOverride", colorControlenhancedStepHueoptionsOverrideCommandParameterInfo);
-
-    InteractionInfo colorControlenhancedStepHueInteractionInfo =
+    InteractionInfo bridgedActionsstartActionInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .enhancedStepHue(
+              ((ChipClusters.BridgedActionsCluster) cluster)
+                  .startAction(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("stepMode"),
-                      (Integer) commandArguments.get("stepSize"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
+                      (Integer) commandArguments.get("actionID"),
+                      (Optional<Long>) commandArguments.get("invokeID"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            colorControlenhancedStepHueCommandParams);
-    colorControlClusterInteractionInfoMap.put(
-        "enhancedStepHue", colorControlenhancedStepHueInteractionInfo);
-    Map<String, CommandParameterInfo> colorControlmoveColorCommandParams =
+            bridgedActionsstartActionCommandParams);
+    bridgedActionsClusterInteractionInfoMap.put(
+        "startAction", bridgedActionsstartActionInteractionInfo);
+    Map<String, CommandParameterInfo> bridgedActionsstartActionWithDurationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlmoveColorrateXCommandParameterInfo =
-        new CommandParameterInfo("rateX", Integer.class, Integer.class);
-    colorControlmoveColorCommandParams.put("rateX", colorControlmoveColorrateXCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveColorrateYCommandParameterInfo =
-        new CommandParameterInfo("rateY", Integer.class, Integer.class);
-    colorControlmoveColorCommandParams.put("rateY", colorControlmoveColorrateYCommandParameterInfo);
+    CommandParameterInfo bridgedActionsstartActionWithDurationactionIDCommandParameterInfo =
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
+    bridgedActionsstartActionWithDurationCommandParams.put(
+        "actionID", bridgedActionsstartActionWithDurationactionIDCommandParameterInfo);
 
-    CommandParameterInfo colorControlmoveColoroptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-    colorControlmoveColorCommandParams.put(
-        "optionsMask", colorControlmoveColoroptionsMaskCommandParameterInfo);
+    CommandParameterInfo bridgedActionsstartActionWithDurationinvokeIDCommandParameterInfo =
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
+    bridgedActionsstartActionWithDurationCommandParams.put(
+        "invokeID", bridgedActionsstartActionWithDurationinvokeIDCommandParameterInfo);
 
-    CommandParameterInfo colorControlmoveColoroptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-    colorControlmoveColorCommandParams.put(
-        "optionsOverride", colorControlmoveColoroptionsOverrideCommandParameterInfo);
+    CommandParameterInfo bridgedActionsstartActionWithDurationdurationCommandParameterInfo =
+        new CommandParameterInfo("duration", Long.class, Long.class);
+    bridgedActionsstartActionWithDurationCommandParams.put(
+        "duration", bridgedActionsstartActionWithDurationdurationCommandParameterInfo);
 
-    InteractionInfo colorControlmoveColorInteractionInfo =
+    InteractionInfo bridgedActionsstartActionWithDurationInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .moveColor(
+              ((ChipClusters.BridgedActionsCluster) cluster)
+                  .startActionWithDuration(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("rateX"),
-                      (Integer) commandArguments.get("rateY"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
+                      (Integer) commandArguments.get("actionID"),
+                      (Optional<Long>) commandArguments.get("invokeID"),
+                      (Long) commandArguments.get("duration"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            colorControlmoveColorCommandParams);
-    colorControlClusterInteractionInfoMap.put("moveColor", colorControlmoveColorInteractionInfo);
-    Map<String, CommandParameterInfo> colorControlmoveColorTemperatureCommandParams =
+            bridgedActionsstartActionWithDurationCommandParams);
+    bridgedActionsClusterInteractionInfoMap.put(
+        "startActionWithDuration", bridgedActionsstartActionWithDurationInteractionInfo);
+    Map<String, CommandParameterInfo> bridgedActionsstopActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlmoveColorTemperaturemoveModeCommandParameterInfo =
-        new CommandParameterInfo("moveMode", Integer.class, Integer.class);
-    colorControlmoveColorTemperatureCommandParams.put(
-        "moveMode", colorControlmoveColorTemperaturemoveModeCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveColorTemperaturerateCommandParameterInfo =
-        new CommandParameterInfo("rate", Integer.class, Integer.class);
-    colorControlmoveColorTemperatureCommandParams.put(
-        "rate", colorControlmoveColorTemperaturerateCommandParameterInfo);
-
-    CommandParameterInfo
-        colorControlmoveColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo =
-            new CommandParameterInfo("colorTemperatureMinimumMireds", Integer.class, Integer.class);
-    colorControlmoveColorTemperatureCommandParams.put(
-        "colorTemperatureMinimumMireds",
-        colorControlmoveColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo);
-
-    CommandParameterInfo
-        colorControlmoveColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo =
-            new CommandParameterInfo("colorTemperatureMaximumMireds", Integer.class, Integer.class);
-    colorControlmoveColorTemperatureCommandParams.put(
-        "colorTemperatureMaximumMireds",
-        colorControlmoveColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveColorTemperatureoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-    colorControlmoveColorTemperatureCommandParams.put(
-        "optionsMask", colorControlmoveColorTemperatureoptionsMaskCommandParameterInfo);
+    CommandParameterInfo bridgedActionsstopActionactionIDCommandParameterInfo =
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
+    bridgedActionsstopActionCommandParams.put(
+        "actionID", bridgedActionsstopActionactionIDCommandParameterInfo);
 
-    CommandParameterInfo colorControlmoveColorTemperatureoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-    colorControlmoveColorTemperatureCommandParams.put(
-        "optionsOverride", colorControlmoveColorTemperatureoptionsOverrideCommandParameterInfo);
+    CommandParameterInfo bridgedActionsstopActioninvokeIDCommandParameterInfo =
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
+    bridgedActionsstopActionCommandParams.put(
+        "invokeID", bridgedActionsstopActioninvokeIDCommandParameterInfo);
 
-    InteractionInfo colorControlmoveColorTemperatureInteractionInfo =
+    InteractionInfo bridgedActionsstopActionInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .moveColorTemperature(
+              ((ChipClusters.BridgedActionsCluster) cluster)
+                  .stopAction(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("moveMode"),
-                      (Integer) commandArguments.get("rate"),
-                      (Integer) commandArguments.get("colorTemperatureMinimumMireds"),
-                      (Integer) commandArguments.get("colorTemperatureMaximumMireds"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
+                      (Integer) commandArguments.get("actionID"),
+                      (Optional<Long>) commandArguments.get("invokeID"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            colorControlmoveColorTemperatureCommandParams);
-    colorControlClusterInteractionInfoMap.put(
-        "moveColorTemperature", colorControlmoveColorTemperatureInteractionInfo);
-    Map<String, CommandParameterInfo> colorControlmoveHueCommandParams =
+            bridgedActionsstopActionCommandParams);
+    bridgedActionsClusterInteractionInfoMap.put(
+        "stopAction", bridgedActionsstopActionInteractionInfo);
+    Map<String, CommandParameterInfo> bridgedActionspauseActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlmoveHuemoveModeCommandParameterInfo =
-        new CommandParameterInfo("moveMode", Integer.class, Integer.class);
-    colorControlmoveHueCommandParams.put(
-        "moveMode", colorControlmoveHuemoveModeCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveHuerateCommandParameterInfo =
-        new CommandParameterInfo("rate", Integer.class, Integer.class);
-    colorControlmoveHueCommandParams.put("rate", colorControlmoveHuerateCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveHueoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-    colorControlmoveHueCommandParams.put(
-        "optionsMask", colorControlmoveHueoptionsMaskCommandParameterInfo);
+    CommandParameterInfo bridgedActionspauseActionactionIDCommandParameterInfo =
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
+    bridgedActionspauseActionCommandParams.put(
+        "actionID", bridgedActionspauseActionactionIDCommandParameterInfo);
 
-    CommandParameterInfo colorControlmoveHueoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-    colorControlmoveHueCommandParams.put(
-        "optionsOverride", colorControlmoveHueoptionsOverrideCommandParameterInfo);
+    CommandParameterInfo bridgedActionspauseActioninvokeIDCommandParameterInfo =
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
+    bridgedActionspauseActionCommandParams.put(
+        "invokeID", bridgedActionspauseActioninvokeIDCommandParameterInfo);
 
-    InteractionInfo colorControlmoveHueInteractionInfo =
+    InteractionInfo bridgedActionspauseActionInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .moveHue(
+              ((ChipClusters.BridgedActionsCluster) cluster)
+                  .pauseAction(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("moveMode"),
-                      (Integer) commandArguments.get("rate"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
+                      (Integer) commandArguments.get("actionID"),
+                      (Optional<Long>) commandArguments.get("invokeID"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            colorControlmoveHueCommandParams);
-    colorControlClusterInteractionInfoMap.put("moveHue", colorControlmoveHueInteractionInfo);
-    Map<String, CommandParameterInfo> colorControlmoveSaturationCommandParams =
+            bridgedActionspauseActionCommandParams);
+    bridgedActionsClusterInteractionInfoMap.put(
+        "pauseAction", bridgedActionspauseActionInteractionInfo);
+    Map<String, CommandParameterInfo> bridgedActionspauseActionWithDurationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlmoveSaturationmoveModeCommandParameterInfo =
-        new CommandParameterInfo("moveMode", Integer.class, Integer.class);
-    colorControlmoveSaturationCommandParams.put(
-        "moveMode", colorControlmoveSaturationmoveModeCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveSaturationrateCommandParameterInfo =
-        new CommandParameterInfo("rate", Integer.class, Integer.class);
-    colorControlmoveSaturationCommandParams.put(
-        "rate", colorControlmoveSaturationrateCommandParameterInfo);
+    CommandParameterInfo bridgedActionspauseActionWithDurationactionIDCommandParameterInfo =
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
+    bridgedActionspauseActionWithDurationCommandParams.put(
+        "actionID", bridgedActionspauseActionWithDurationactionIDCommandParameterInfo);
 
-    CommandParameterInfo colorControlmoveSaturationoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-    colorControlmoveSaturationCommandParams.put(
-        "optionsMask", colorControlmoveSaturationoptionsMaskCommandParameterInfo);
+    CommandParameterInfo bridgedActionspauseActionWithDurationinvokeIDCommandParameterInfo =
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
+    bridgedActionspauseActionWithDurationCommandParams.put(
+        "invokeID", bridgedActionspauseActionWithDurationinvokeIDCommandParameterInfo);
 
-    CommandParameterInfo colorControlmoveSaturationoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-    colorControlmoveSaturationCommandParams.put(
-        "optionsOverride", colorControlmoveSaturationoptionsOverrideCommandParameterInfo);
+    CommandParameterInfo bridgedActionspauseActionWithDurationdurationCommandParameterInfo =
+        new CommandParameterInfo("duration", Long.class, Long.class);
+    bridgedActionspauseActionWithDurationCommandParams.put(
+        "duration", bridgedActionspauseActionWithDurationdurationCommandParameterInfo);
 
-    InteractionInfo colorControlmoveSaturationInteractionInfo =
+    InteractionInfo bridgedActionspauseActionWithDurationInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .moveSaturation(
+              ((ChipClusters.BridgedActionsCluster) cluster)
+                  .pauseActionWithDuration(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("moveMode"),
-                      (Integer) commandArguments.get("rate"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
+                      (Integer) commandArguments.get("actionID"),
+                      (Optional<Long>) commandArguments.get("invokeID"),
+                      (Long) commandArguments.get("duration"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            colorControlmoveSaturationCommandParams);
-    colorControlClusterInteractionInfoMap.put(
-        "moveSaturation", colorControlmoveSaturationInteractionInfo);
-    Map<String, CommandParameterInfo> colorControlmoveToColorCommandParams =
+            bridgedActionspauseActionWithDurationCommandParams);
+    bridgedActionsClusterInteractionInfoMap.put(
+        "pauseActionWithDuration", bridgedActionspauseActionWithDurationInteractionInfo);
+    Map<String, CommandParameterInfo> bridgedActionsresumeActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlmoveToColorcolorXCommandParameterInfo =
-        new CommandParameterInfo("colorX", Integer.class, Integer.class);
-    colorControlmoveToColorCommandParams.put(
-        "colorX", colorControlmoveToColorcolorXCommandParameterInfo);
+    CommandParameterInfo bridgedActionsresumeActionactionIDCommandParameterInfo =
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
+    bridgedActionsresumeActionCommandParams.put(
+        "actionID", bridgedActionsresumeActionactionIDCommandParameterInfo);
 
-    CommandParameterInfo colorControlmoveToColorcolorYCommandParameterInfo =
-        new CommandParameterInfo("colorY", Integer.class, Integer.class);
-    colorControlmoveToColorCommandParams.put(
-        "colorY", colorControlmoveToColorcolorYCommandParameterInfo);
+    CommandParameterInfo bridgedActionsresumeActioninvokeIDCommandParameterInfo =
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
+    bridgedActionsresumeActionCommandParams.put(
+        "invokeID", bridgedActionsresumeActioninvokeIDCommandParameterInfo);
 
-    CommandParameterInfo colorControlmoveToColortransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-    colorControlmoveToColorCommandParams.put(
-        "transitionTime", colorControlmoveToColortransitionTimeCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveToColoroptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-    colorControlmoveToColorCommandParams.put(
-        "optionsMask", colorControlmoveToColoroptionsMaskCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveToColoroptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-    colorControlmoveToColorCommandParams.put(
-        "optionsOverride", colorControlmoveToColoroptionsOverrideCommandParameterInfo);
-
-    InteractionInfo colorControlmoveToColorInteractionInfo =
+    InteractionInfo bridgedActionsresumeActionInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .moveToColor(
+              ((ChipClusters.BridgedActionsCluster) cluster)
+                  .resumeAction(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("colorX"),
-                      (Integer) commandArguments.get("colorY"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
+                      (Integer) commandArguments.get("actionID"),
+                      (Optional<Long>) commandArguments.get("invokeID"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            colorControlmoveToColorCommandParams);
-    colorControlClusterInteractionInfoMap.put(
-        "moveToColor", colorControlmoveToColorInteractionInfo);
-    Map<String, CommandParameterInfo> colorControlmoveToColorTemperatureCommandParams =
+            bridgedActionsresumeActionCommandParams);
+    bridgedActionsClusterInteractionInfoMap.put(
+        "resumeAction", bridgedActionsresumeActionInteractionInfo);
+    Map<String, CommandParameterInfo> bridgedActionsenableActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlmoveToColorTemperaturecolorTemperatureCommandParameterInfo =
-        new CommandParameterInfo("colorTemperature", Integer.class, Integer.class);
-    colorControlmoveToColorTemperatureCommandParams.put(
-        "colorTemperature", colorControlmoveToColorTemperaturecolorTemperatureCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveToColorTemperaturetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-    colorControlmoveToColorTemperatureCommandParams.put(
-        "transitionTime", colorControlmoveToColorTemperaturetransitionTimeCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveToColorTemperatureoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-    colorControlmoveToColorTemperatureCommandParams.put(
-        "optionsMask", colorControlmoveToColorTemperatureoptionsMaskCommandParameterInfo);
+    CommandParameterInfo bridgedActionsenableActionactionIDCommandParameterInfo =
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
+    bridgedActionsenableActionCommandParams.put(
+        "actionID", bridgedActionsenableActionactionIDCommandParameterInfo);
 
-    CommandParameterInfo colorControlmoveToColorTemperatureoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-    colorControlmoveToColorTemperatureCommandParams.put(
-        "optionsOverride", colorControlmoveToColorTemperatureoptionsOverrideCommandParameterInfo);
+    CommandParameterInfo bridgedActionsenableActioninvokeIDCommandParameterInfo =
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
+    bridgedActionsenableActionCommandParams.put(
+        "invokeID", bridgedActionsenableActioninvokeIDCommandParameterInfo);
 
-    InteractionInfo colorControlmoveToColorTemperatureInteractionInfo =
+    InteractionInfo bridgedActionsenableActionInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .moveToColorTemperature(
+              ((ChipClusters.BridgedActionsCluster) cluster)
+                  .enableAction(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("colorTemperature"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
+                      (Integer) commandArguments.get("actionID"),
+                      (Optional<Long>) commandArguments.get("invokeID"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            colorControlmoveToColorTemperatureCommandParams);
-    colorControlClusterInteractionInfoMap.put(
-        "moveToColorTemperature", colorControlmoveToColorTemperatureInteractionInfo);
-    Map<String, CommandParameterInfo> colorControlmoveToHueCommandParams =
+            bridgedActionsenableActionCommandParams);
+    bridgedActionsClusterInteractionInfoMap.put(
+        "enableAction", bridgedActionsenableActionInteractionInfo);
+    Map<String, CommandParameterInfo> bridgedActionsenableActionWithDurationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlmoveToHuehueCommandParameterInfo =
-        new CommandParameterInfo("hue", Integer.class, Integer.class);
-    colorControlmoveToHueCommandParams.put("hue", colorControlmoveToHuehueCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveToHuedirectionCommandParameterInfo =
-        new CommandParameterInfo("direction", Integer.class, Integer.class);
-    colorControlmoveToHueCommandParams.put(
-        "direction", colorControlmoveToHuedirectionCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveToHuetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-    colorControlmoveToHueCommandParams.put(
-        "transitionTime", colorControlmoveToHuetransitionTimeCommandParameterInfo);
+    CommandParameterInfo bridgedActionsenableActionWithDurationactionIDCommandParameterInfo =
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
+    bridgedActionsenableActionWithDurationCommandParams.put(
+        "actionID", bridgedActionsenableActionWithDurationactionIDCommandParameterInfo);
 
-    CommandParameterInfo colorControlmoveToHueoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-    colorControlmoveToHueCommandParams.put(
-        "optionsMask", colorControlmoveToHueoptionsMaskCommandParameterInfo);
+    CommandParameterInfo bridgedActionsenableActionWithDurationinvokeIDCommandParameterInfo =
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
+    bridgedActionsenableActionWithDurationCommandParams.put(
+        "invokeID", bridgedActionsenableActionWithDurationinvokeIDCommandParameterInfo);
 
-    CommandParameterInfo colorControlmoveToHueoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-    colorControlmoveToHueCommandParams.put(
-        "optionsOverride", colorControlmoveToHueoptionsOverrideCommandParameterInfo);
+    CommandParameterInfo bridgedActionsenableActionWithDurationdurationCommandParameterInfo =
+        new CommandParameterInfo("duration", Long.class, Long.class);
+    bridgedActionsenableActionWithDurationCommandParams.put(
+        "duration", bridgedActionsenableActionWithDurationdurationCommandParameterInfo);
 
-    InteractionInfo colorControlmoveToHueInteractionInfo =
+    InteractionInfo bridgedActionsenableActionWithDurationInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .moveToHue(
+              ((ChipClusters.BridgedActionsCluster) cluster)
+                  .enableActionWithDuration(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("hue"),
-                      (Integer) commandArguments.get("direction"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
+                      (Integer) commandArguments.get("actionID"),
+                      (Optional<Long>) commandArguments.get("invokeID"),
+                      (Long) commandArguments.get("duration"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            colorControlmoveToHueCommandParams);
-    colorControlClusterInteractionInfoMap.put("moveToHue", colorControlmoveToHueInteractionInfo);
-    Map<String, CommandParameterInfo> colorControlmoveToHueAndSaturationCommandParams =
+            bridgedActionsenableActionWithDurationCommandParams);
+    bridgedActionsClusterInteractionInfoMap.put(
+        "enableActionWithDuration", bridgedActionsenableActionWithDurationInteractionInfo);
+    Map<String, CommandParameterInfo> bridgedActionsdisableActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlmoveToHueAndSaturationhueCommandParameterInfo =
-        new CommandParameterInfo("hue", Integer.class, Integer.class);
-    colorControlmoveToHueAndSaturationCommandParams.put(
-        "hue", colorControlmoveToHueAndSaturationhueCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveToHueAndSaturationsaturationCommandParameterInfo =
-        new CommandParameterInfo("saturation", Integer.class, Integer.class);
-    colorControlmoveToHueAndSaturationCommandParams.put(
-        "saturation", colorControlmoveToHueAndSaturationsaturationCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveToHueAndSaturationtransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-    colorControlmoveToHueAndSaturationCommandParams.put(
-        "transitionTime", colorControlmoveToHueAndSaturationtransitionTimeCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveToHueAndSaturationoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-    colorControlmoveToHueAndSaturationCommandParams.put(
-        "optionsMask", colorControlmoveToHueAndSaturationoptionsMaskCommandParameterInfo);
+    CommandParameterInfo bridgedActionsdisableActionactionIDCommandParameterInfo =
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
+    bridgedActionsdisableActionCommandParams.put(
+        "actionID", bridgedActionsdisableActionactionIDCommandParameterInfo);
 
-    CommandParameterInfo colorControlmoveToHueAndSaturationoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-    colorControlmoveToHueAndSaturationCommandParams.put(
-        "optionsOverride", colorControlmoveToHueAndSaturationoptionsOverrideCommandParameterInfo);
+    CommandParameterInfo bridgedActionsdisableActioninvokeIDCommandParameterInfo =
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
+    bridgedActionsdisableActionCommandParams.put(
+        "invokeID", bridgedActionsdisableActioninvokeIDCommandParameterInfo);
 
-    InteractionInfo colorControlmoveToHueAndSaturationInteractionInfo =
+    InteractionInfo bridgedActionsdisableActionInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .moveToHueAndSaturation(
+              ((ChipClusters.BridgedActionsCluster) cluster)
+                  .disableAction(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("hue"),
-                      (Integer) commandArguments.get("saturation"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
+                      (Integer) commandArguments.get("actionID"),
+                      (Optional<Long>) commandArguments.get("invokeID"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            colorControlmoveToHueAndSaturationCommandParams);
-    colorControlClusterInteractionInfoMap.put(
-        "moveToHueAndSaturation", colorControlmoveToHueAndSaturationInteractionInfo);
-    Map<String, CommandParameterInfo> colorControlmoveToSaturationCommandParams =
+            bridgedActionsdisableActionCommandParams);
+    bridgedActionsClusterInteractionInfoMap.put(
+        "disableAction", bridgedActionsdisableActionInteractionInfo);
+    Map<String, CommandParameterInfo> bridgedActionsdisableActionWithDurationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlmoveToSaturationsaturationCommandParameterInfo =
-        new CommandParameterInfo("saturation", Integer.class, Integer.class);
-    colorControlmoveToSaturationCommandParams.put(
-        "saturation", colorControlmoveToSaturationsaturationCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveToSaturationtransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-    colorControlmoveToSaturationCommandParams.put(
-        "transitionTime", colorControlmoveToSaturationtransitionTimeCommandParameterInfo);
+    CommandParameterInfo bridgedActionsdisableActionWithDurationactionIDCommandParameterInfo =
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
+    bridgedActionsdisableActionWithDurationCommandParams.put(
+        "actionID", bridgedActionsdisableActionWithDurationactionIDCommandParameterInfo);
 
-    CommandParameterInfo colorControlmoveToSaturationoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-    colorControlmoveToSaturationCommandParams.put(
-        "optionsMask", colorControlmoveToSaturationoptionsMaskCommandParameterInfo);
+    CommandParameterInfo bridgedActionsdisableActionWithDurationinvokeIDCommandParameterInfo =
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
+    bridgedActionsdisableActionWithDurationCommandParams.put(
+        "invokeID", bridgedActionsdisableActionWithDurationinvokeIDCommandParameterInfo);
 
-    CommandParameterInfo colorControlmoveToSaturationoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-    colorControlmoveToSaturationCommandParams.put(
-        "optionsOverride", colorControlmoveToSaturationoptionsOverrideCommandParameterInfo);
+    CommandParameterInfo bridgedActionsdisableActionWithDurationdurationCommandParameterInfo =
+        new CommandParameterInfo("duration", Long.class, Long.class);
+    bridgedActionsdisableActionWithDurationCommandParams.put(
+        "duration", bridgedActionsdisableActionWithDurationdurationCommandParameterInfo);
 
-    InteractionInfo colorControlmoveToSaturationInteractionInfo =
+    InteractionInfo bridgedActionsdisableActionWithDurationInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .moveToSaturation(
+              ((ChipClusters.BridgedActionsCluster) cluster)
+                  .disableActionWithDuration(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("saturation"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
+                      (Integer) commandArguments.get("actionID"),
+                      (Optional<Long>) commandArguments.get("invokeID"),
+                      (Long) commandArguments.get("duration"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            colorControlmoveToSaturationCommandParams);
-    colorControlClusterInteractionInfoMap.put(
-        "moveToSaturation", colorControlmoveToSaturationInteractionInfo);
-    Map<String, CommandParameterInfo> colorControlstepColorCommandParams =
+            bridgedActionsdisableActionWithDurationCommandParams);
+    bridgedActionsClusterInteractionInfoMap.put(
+        "disableActionWithDuration", bridgedActionsdisableActionWithDurationInteractionInfo);
+    commandMap.put("bridgedActions", bridgedActionsClusterInteractionInfoMap);
+    Map<String, InteractionInfo> basicClusterInteractionInfoMap = new LinkedHashMap<>();
+    commandMap.put("basic", basicClusterInteractionInfoMap);
+    Map<String, InteractionInfo> otaSoftwareUpdateProviderClusterInteractionInfoMap =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> otaSoftwareUpdateProviderqueryImageCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlstepColorstepXCommandParameterInfo =
-        new CommandParameterInfo("stepX", Integer.class, Integer.class);
-    colorControlstepColorCommandParams.put("stepX", colorControlstepColorstepXCommandParameterInfo);
+    CommandParameterInfo otaSoftwareUpdateProviderqueryImagevendorIdCommandParameterInfo =
+        new CommandParameterInfo("vendorId", Integer.class, Integer.class);
+    otaSoftwareUpdateProviderqueryImageCommandParams.put(
+        "vendorId", otaSoftwareUpdateProviderqueryImagevendorIdCommandParameterInfo);
 
-    CommandParameterInfo colorControlstepColorstepYCommandParameterInfo =
-        new CommandParameterInfo("stepY", Integer.class, Integer.class);
-    colorControlstepColorCommandParams.put("stepY", colorControlstepColorstepYCommandParameterInfo);
+    CommandParameterInfo otaSoftwareUpdateProviderqueryImageproductIdCommandParameterInfo =
+        new CommandParameterInfo("productId", Integer.class, Integer.class);
+    otaSoftwareUpdateProviderqueryImageCommandParams.put(
+        "productId", otaSoftwareUpdateProviderqueryImageproductIdCommandParameterInfo);
 
-    CommandParameterInfo colorControlstepColortransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-    colorControlstepColorCommandParams.put(
-        "transitionTime", colorControlstepColortransitionTimeCommandParameterInfo);
-
-    CommandParameterInfo colorControlstepColoroptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-    colorControlstepColorCommandParams.put(
-        "optionsMask", colorControlstepColoroptionsMaskCommandParameterInfo);
-
-    CommandParameterInfo colorControlstepColoroptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-    colorControlstepColorCommandParams.put(
-        "optionsOverride", colorControlstepColoroptionsOverrideCommandParameterInfo);
+    CommandParameterInfo otaSoftwareUpdateProviderqueryImagesoftwareVersionCommandParameterInfo =
+        new CommandParameterInfo("softwareVersion", Long.class, Long.class);
+    otaSoftwareUpdateProviderqueryImageCommandParams.put(
+        "softwareVersion", otaSoftwareUpdateProviderqueryImagesoftwareVersionCommandParameterInfo);
 
-    InteractionInfo colorControlstepColorInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .stepColor(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("stepX"),
-                      (Integer) commandArguments.get("stepY"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            colorControlstepColorCommandParams);
-    colorControlClusterInteractionInfoMap.put("stepColor", colorControlstepColorInteractionInfo);
-    Map<String, CommandParameterInfo> colorControlstepColorTemperatureCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlstepColorTemperaturestepModeCommandParameterInfo =
-        new CommandParameterInfo("stepMode", Integer.class, Integer.class);
-    colorControlstepColorTemperatureCommandParams.put(
-        "stepMode", colorControlstepColorTemperaturestepModeCommandParameterInfo);
+    CommandParameterInfo otaSoftwareUpdateProviderqueryImageprotocolsSupportedCommandParameterInfo =
+        new CommandParameterInfo("protocolsSupported", ArrayList.class, Object.class);
+    otaSoftwareUpdateProviderqueryImageCommandParams.put(
+        "protocolsSupported",
+        otaSoftwareUpdateProviderqueryImageprotocolsSupportedCommandParameterInfo);
 
-    CommandParameterInfo colorControlstepColorTemperaturestepSizeCommandParameterInfo =
-        new CommandParameterInfo("stepSize", Integer.class, Integer.class);
-    colorControlstepColorTemperatureCommandParams.put(
-        "stepSize", colorControlstepColorTemperaturestepSizeCommandParameterInfo);
+    CommandParameterInfo otaSoftwareUpdateProviderqueryImagehardwareVersionCommandParameterInfo =
+        new CommandParameterInfo("hardwareVersion", Optional.class, Integer.class);
+    otaSoftwareUpdateProviderqueryImageCommandParams.put(
+        "hardwareVersion", otaSoftwareUpdateProviderqueryImagehardwareVersionCommandParameterInfo);
 
-    CommandParameterInfo colorControlstepColorTemperaturetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-    colorControlstepColorTemperatureCommandParams.put(
-        "transitionTime", colorControlstepColorTemperaturetransitionTimeCommandParameterInfo);
+    CommandParameterInfo otaSoftwareUpdateProviderqueryImagelocationCommandParameterInfo =
+        new CommandParameterInfo("location", Optional.class, String.class);
+    otaSoftwareUpdateProviderqueryImageCommandParams.put(
+        "location", otaSoftwareUpdateProviderqueryImagelocationCommandParameterInfo);
 
     CommandParameterInfo
-        colorControlstepColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo =
-            new CommandParameterInfo("colorTemperatureMinimumMireds", Integer.class, Integer.class);
-    colorControlstepColorTemperatureCommandParams.put(
-        "colorTemperatureMinimumMireds",
-        colorControlstepColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo);
+        otaSoftwareUpdateProviderqueryImagerequestorCanConsentCommandParameterInfo =
+            new CommandParameterInfo("requestorCanConsent", Optional.class, Boolean.class);
+    otaSoftwareUpdateProviderqueryImageCommandParams.put(
+        "requestorCanConsent",
+        otaSoftwareUpdateProviderqueryImagerequestorCanConsentCommandParameterInfo);
 
     CommandParameterInfo
-        colorControlstepColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo =
-            new CommandParameterInfo("colorTemperatureMaximumMireds", Integer.class, Integer.class);
-    colorControlstepColorTemperatureCommandParams.put(
-        "colorTemperatureMaximumMireds",
-        colorControlstepColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo);
-
-    CommandParameterInfo colorControlstepColorTemperatureoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-    colorControlstepColorTemperatureCommandParams.put(
-        "optionsMask", colorControlstepColorTemperatureoptionsMaskCommandParameterInfo);
-
-    CommandParameterInfo colorControlstepColorTemperatureoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-    colorControlstepColorTemperatureCommandParams.put(
-        "optionsOverride", colorControlstepColorTemperatureoptionsOverrideCommandParameterInfo);
+        otaSoftwareUpdateProviderqueryImagemetadataForProviderCommandParameterInfo =
+            new CommandParameterInfo("metadataForProvider", Optional.class, byte[].class);
+    otaSoftwareUpdateProviderqueryImageCommandParams.put(
+        "metadataForProvider",
+        otaSoftwareUpdateProviderqueryImagemetadataForProviderCommandParameterInfo);
 
-    InteractionInfo colorControlstepColorTemperatureInteractionInfo =
+    InteractionInfo otaSoftwareUpdateProviderqueryImageInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .stepColorTemperature(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("stepMode"),
-                      (Integer) commandArguments.get("stepSize"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("colorTemperatureMinimumMireds"),
-                      (Integer) commandArguments.get("colorTemperatureMaximumMireds"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
+              ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
+                  .queryImage(
+                      (ChipClusters.OtaSoftwareUpdateProviderCluster.QueryImageResponseCallback)
+                          callback,
+                      (Integer) commandArguments.get("vendorId"),
+                      (Integer) commandArguments.get("productId"),
+                      (Long) commandArguments.get("softwareVersion"),
+                      (ArrayList<Integer>) commandArguments.get("protocolsSupported"),
+                      (Optional<Integer>) commandArguments.get("hardwareVersion"),
+                      (Optional<String>) commandArguments.get("location"),
+                      (Optional<Boolean>) commandArguments.get("requestorCanConsent"),
+                      (Optional<byte[]>) commandArguments.get("metadataForProvider"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            colorControlstepColorTemperatureCommandParams);
-    colorControlClusterInteractionInfoMap.put(
-        "stepColorTemperature", colorControlstepColorTemperatureInteractionInfo);
-    Map<String, CommandParameterInfo> colorControlstepHueCommandParams =
+            () -> new DelegatedQueryImageResponseCallback(),
+            otaSoftwareUpdateProviderqueryImageCommandParams);
+    otaSoftwareUpdateProviderClusterInteractionInfoMap.put(
+        "queryImage", otaSoftwareUpdateProviderqueryImageInteractionInfo);
+    Map<String, CommandParameterInfo> otaSoftwareUpdateProviderapplyUpdateRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlstepHuestepModeCommandParameterInfo =
-        new CommandParameterInfo("stepMode", Integer.class, Integer.class);
-    colorControlstepHueCommandParams.put(
-        "stepMode", colorControlstepHuestepModeCommandParameterInfo);
-
-    CommandParameterInfo colorControlstepHuestepSizeCommandParameterInfo =
-        new CommandParameterInfo("stepSize", Integer.class, Integer.class);
-    colorControlstepHueCommandParams.put(
-        "stepSize", colorControlstepHuestepSizeCommandParameterInfo);
+    CommandParameterInfo
+        otaSoftwareUpdateProviderapplyUpdateRequestupdateTokenCommandParameterInfo =
+            new CommandParameterInfo("updateToken", byte[].class, byte[].class);
+    otaSoftwareUpdateProviderapplyUpdateRequestCommandParams.put(
+        "updateToken", otaSoftwareUpdateProviderapplyUpdateRequestupdateTokenCommandParameterInfo);
 
-    CommandParameterInfo colorControlstepHuetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-    colorControlstepHueCommandParams.put(
-        "transitionTime", colorControlstepHuetransitionTimeCommandParameterInfo);
+    CommandParameterInfo otaSoftwareUpdateProviderapplyUpdateRequestnewVersionCommandParameterInfo =
+        new CommandParameterInfo("newVersion", Long.class, Long.class);
+    otaSoftwareUpdateProviderapplyUpdateRequestCommandParams.put(
+        "newVersion", otaSoftwareUpdateProviderapplyUpdateRequestnewVersionCommandParameterInfo);
 
-    CommandParameterInfo colorControlstepHueoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-    colorControlstepHueCommandParams.put(
-        "optionsMask", colorControlstepHueoptionsMaskCommandParameterInfo);
+    InteractionInfo otaSoftwareUpdateProviderapplyUpdateRequestInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
+                  .applyUpdateRequest(
+                      (ChipClusters.OtaSoftwareUpdateProviderCluster.ApplyUpdateResponseCallback)
+                          callback,
+                      (byte[]) commandArguments.get("updateToken"),
+                      (Long) commandArguments.get("newVersion"));
+            },
+            () -> new DelegatedApplyUpdateResponseCallback(),
+            otaSoftwareUpdateProviderapplyUpdateRequestCommandParams);
+    otaSoftwareUpdateProviderClusterInteractionInfoMap.put(
+        "applyUpdateRequest", otaSoftwareUpdateProviderapplyUpdateRequestInteractionInfo);
+    Map<String, CommandParameterInfo> otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo
+        otaSoftwareUpdateProvidernotifyUpdateAppliedupdateTokenCommandParameterInfo =
+            new CommandParameterInfo("updateToken", byte[].class, byte[].class);
+    otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams.put(
+        "updateToken", otaSoftwareUpdateProvidernotifyUpdateAppliedupdateTokenCommandParameterInfo);
 
-    CommandParameterInfo colorControlstepHueoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-    colorControlstepHueCommandParams.put(
-        "optionsOverride", colorControlstepHueoptionsOverrideCommandParameterInfo);
+    CommandParameterInfo
+        otaSoftwareUpdateProvidernotifyUpdateAppliedsoftwareVersionCommandParameterInfo =
+            new CommandParameterInfo("softwareVersion", Long.class, Long.class);
+    otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams.put(
+        "softwareVersion",
+        otaSoftwareUpdateProvidernotifyUpdateAppliedsoftwareVersionCommandParameterInfo);
 
-    InteractionInfo colorControlstepHueInteractionInfo =
+    InteractionInfo otaSoftwareUpdateProvidernotifyUpdateAppliedInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .stepHue(
+              ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
+                  .notifyUpdateApplied(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("stepMode"),
-                      (Integer) commandArguments.get("stepSize"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
+                      (byte[]) commandArguments.get("updateToken"),
+                      (Long) commandArguments.get("softwareVersion"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            colorControlstepHueCommandParams);
-    colorControlClusterInteractionInfoMap.put("stepHue", colorControlstepHueInteractionInfo);
-    Map<String, CommandParameterInfo> colorControlstepSaturationCommandParams =
+            otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams);
+    otaSoftwareUpdateProviderClusterInteractionInfoMap.put(
+        "notifyUpdateApplied", otaSoftwareUpdateProvidernotifyUpdateAppliedInteractionInfo);
+    commandMap.put("otaSoftwareUpdateProvider", otaSoftwareUpdateProviderClusterInteractionInfoMap);
+    Map<String, InteractionInfo> otaSoftwareUpdateRequestorClusterInteractionInfoMap =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> otaSoftwareUpdateRequestorannounceOtaProviderCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlstepSaturationstepModeCommandParameterInfo =
-        new CommandParameterInfo("stepMode", Integer.class, Integer.class);
-    colorControlstepSaturationCommandParams.put(
-        "stepMode", colorControlstepSaturationstepModeCommandParameterInfo);
+    CommandParameterInfo
+        otaSoftwareUpdateRequestorannounceOtaProviderproviderNodeIdCommandParameterInfo =
+            new CommandParameterInfo("providerNodeId", Long.class, Long.class);
+    otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
+        "providerNodeId",
+        otaSoftwareUpdateRequestorannounceOtaProviderproviderNodeIdCommandParameterInfo);
 
-    CommandParameterInfo colorControlstepSaturationstepSizeCommandParameterInfo =
-        new CommandParameterInfo("stepSize", Integer.class, Integer.class);
-    colorControlstepSaturationCommandParams.put(
-        "stepSize", colorControlstepSaturationstepSizeCommandParameterInfo);
+    CommandParameterInfo otaSoftwareUpdateRequestorannounceOtaProvidervendorIdCommandParameterInfo =
+        new CommandParameterInfo("vendorId", Integer.class, Integer.class);
+    otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
+        "vendorId", otaSoftwareUpdateRequestorannounceOtaProvidervendorIdCommandParameterInfo);
 
-    CommandParameterInfo colorControlstepSaturationtransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-    colorControlstepSaturationCommandParams.put(
-        "transitionTime", colorControlstepSaturationtransitionTimeCommandParameterInfo);
+    CommandParameterInfo
+        otaSoftwareUpdateRequestorannounceOtaProviderannouncementReasonCommandParameterInfo =
+            new CommandParameterInfo("announcementReason", Integer.class, Integer.class);
+    otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
+        "announcementReason",
+        otaSoftwareUpdateRequestorannounceOtaProviderannouncementReasonCommandParameterInfo);
 
-    CommandParameterInfo colorControlstepSaturationoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-    colorControlstepSaturationCommandParams.put(
-        "optionsMask", colorControlstepSaturationoptionsMaskCommandParameterInfo);
+    CommandParameterInfo
+        otaSoftwareUpdateRequestorannounceOtaProvidermetadataForNodeCommandParameterInfo =
+            new CommandParameterInfo("metadataForNode", Optional.class, byte[].class);
+    otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
+        "metadataForNode",
+        otaSoftwareUpdateRequestorannounceOtaProvidermetadataForNodeCommandParameterInfo);
 
-    CommandParameterInfo colorControlstepSaturationoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-    colorControlstepSaturationCommandParams.put(
-        "optionsOverride", colorControlstepSaturationoptionsOverrideCommandParameterInfo);
+    CommandParameterInfo otaSoftwareUpdateRequestorannounceOtaProviderendpointCommandParameterInfo =
+        new CommandParameterInfo("endpoint", Integer.class, Integer.class);
+    otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
+        "endpoint", otaSoftwareUpdateRequestorannounceOtaProviderendpointCommandParameterInfo);
 
-    InteractionInfo colorControlstepSaturationInteractionInfo =
+    InteractionInfo otaSoftwareUpdateRequestorannounceOtaProviderInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .stepSaturation(
+              ((ChipClusters.OtaSoftwareUpdateRequestorCluster) cluster)
+                  .announceOtaProvider(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("stepMode"),
-                      (Integer) commandArguments.get("stepSize"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
+                      (Long) commandArguments.get("providerNodeId"),
+                      (Integer) commandArguments.get("vendorId"),
+                      (Integer) commandArguments.get("announcementReason"),
+                      (Optional<byte[]>) commandArguments.get("metadataForNode"),
+                      (Integer) commandArguments.get("endpoint"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            colorControlstepSaturationCommandParams);
-    colorControlClusterInteractionInfoMap.put(
-        "stepSaturation", colorControlstepSaturationInteractionInfo);
-    Map<String, CommandParameterInfo> colorControlstopMoveStepCommandParams =
+            otaSoftwareUpdateRequestorannounceOtaProviderCommandParams);
+    otaSoftwareUpdateRequestorClusterInteractionInfoMap.put(
+        "announceOtaProvider", otaSoftwareUpdateRequestorannounceOtaProviderInteractionInfo);
+    commandMap.put(
+        "otaSoftwareUpdateRequestor", otaSoftwareUpdateRequestorClusterInteractionInfoMap);
+    Map<String, InteractionInfo> localizationConfigurationClusterInteractionInfoMap =
+        new LinkedHashMap<>();
+    commandMap.put("localizationConfiguration", localizationConfigurationClusterInteractionInfoMap);
+    Map<String, InteractionInfo> timeFormatLocalizationClusterInteractionInfoMap =
+        new LinkedHashMap<>();
+    commandMap.put("timeFormatLocalization", timeFormatLocalizationClusterInteractionInfoMap);
+    Map<String, InteractionInfo> unitLocalizationClusterInteractionInfoMap = new LinkedHashMap<>();
+    commandMap.put("unitLocalization", unitLocalizationClusterInteractionInfoMap);
+    Map<String, InteractionInfo> powerSourceConfigurationClusterInteractionInfoMap =
+        new LinkedHashMap<>();
+    commandMap.put("powerSourceConfiguration", powerSourceConfigurationClusterInteractionInfoMap);
+    Map<String, InteractionInfo> powerSourceClusterInteractionInfoMap = new LinkedHashMap<>();
+    commandMap.put("powerSource", powerSourceClusterInteractionInfoMap);
+    Map<String, InteractionInfo> generalCommissioningClusterInteractionInfoMap =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> generalCommissioningarmFailSafeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlstopMoveStepoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-    colorControlstopMoveStepCommandParams.put(
-        "optionsMask", colorControlstopMoveStepoptionsMaskCommandParameterInfo);
+    CommandParameterInfo generalCommissioningarmFailSafeexpiryLengthSecondsCommandParameterInfo =
+        new CommandParameterInfo("expiryLengthSeconds", Integer.class, Integer.class);
+    generalCommissioningarmFailSafeCommandParams.put(
+        "expiryLengthSeconds",
+        generalCommissioningarmFailSafeexpiryLengthSecondsCommandParameterInfo);
 
-    CommandParameterInfo colorControlstopMoveStepoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-    colorControlstopMoveStepCommandParams.put(
-        "optionsOverride", colorControlstopMoveStepoptionsOverrideCommandParameterInfo);
+    CommandParameterInfo generalCommissioningarmFailSafebreadcrumbCommandParameterInfo =
+        new CommandParameterInfo("breadcrumb", Long.class, Long.class);
+    generalCommissioningarmFailSafeCommandParams.put(
+        "breadcrumb", generalCommissioningarmFailSafebreadcrumbCommandParameterInfo);
 
-    InteractionInfo colorControlstopMoveStepInteractionInfo =
+    InteractionInfo generalCommissioningarmFailSafeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .stopMoveStep(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
+              ((ChipClusters.GeneralCommissioningCluster) cluster)
+                  .armFailSafe(
+                      (ChipClusters.GeneralCommissioningCluster.ArmFailSafeResponseCallback)
+                          callback,
+                      (Integer) commandArguments.get("expiryLengthSeconds"),
+                      (Long) commandArguments.get("breadcrumb"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            colorControlstopMoveStepCommandParams);
-    colorControlClusterInteractionInfoMap.put(
-        "stopMoveStep", colorControlstopMoveStepInteractionInfo);
-    commandMap.put("colorControl", colorControlClusterInteractionInfoMap);
-    Map<String, InteractionInfo> contentLauncherClusterInteractionInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> contentLauncherlaunchContentCommandParams =
+            () -> new DelegatedArmFailSafeResponseCallback(),
+            generalCommissioningarmFailSafeCommandParams);
+    generalCommissioningClusterInteractionInfoMap.put(
+        "armFailSafe", generalCommissioningarmFailSafeInteractionInfo);
+    Map<String, CommandParameterInfo> generalCommissioningsetRegulatoryConfigCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo contentLauncherlaunchContentautoPlayCommandParameterInfo =
-        new CommandParameterInfo("autoPlay", Boolean.class, Boolean.class);
-    contentLauncherlaunchContentCommandParams.put(
-        "autoPlay", contentLauncherlaunchContentautoPlayCommandParameterInfo);
+    CommandParameterInfo
+        generalCommissioningsetRegulatoryConfignewRegulatoryConfigCommandParameterInfo =
+            new CommandParameterInfo("newRegulatoryConfig", Integer.class, Integer.class);
+    generalCommissioningsetRegulatoryConfigCommandParams.put(
+        "newRegulatoryConfig",
+        generalCommissioningsetRegulatoryConfignewRegulatoryConfigCommandParameterInfo);
 
-    CommandParameterInfo contentLauncherlaunchContentdataCommandParameterInfo =
-        new CommandParameterInfo("data", Optional.class, String.class);
-    contentLauncherlaunchContentCommandParams.put(
-        "data", contentLauncherlaunchContentdataCommandParameterInfo);
+    CommandParameterInfo generalCommissioningsetRegulatoryConfigcountryCodeCommandParameterInfo =
+        new CommandParameterInfo("countryCode", String.class, String.class);
+    generalCommissioningsetRegulatoryConfigCommandParams.put(
+        "countryCode", generalCommissioningsetRegulatoryConfigcountryCodeCommandParameterInfo);
 
-    InteractionInfo contentLauncherlaunchContentInteractionInfo =
+    CommandParameterInfo generalCommissioningsetRegulatoryConfigbreadcrumbCommandParameterInfo =
+        new CommandParameterInfo("breadcrumb", Long.class, Long.class);
+    generalCommissioningsetRegulatoryConfigCommandParams.put(
+        "breadcrumb", generalCommissioningsetRegulatoryConfigbreadcrumbCommandParameterInfo);
+
+    InteractionInfo generalCommissioningsetRegulatoryConfigInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ContentLauncherCluster) cluster)
-                  .launchContent(
-                      (ChipClusters.ContentLauncherCluster.LaunchResponseCallback) callback,
-                      (ChipStructs.ContentLauncherClusterContentSearch)
-                          commandArguments.get("search"),
-                      (Boolean) commandArguments.get("autoPlay"),
-                      (Optional<String>) commandArguments.get("data"));
+              ((ChipClusters.GeneralCommissioningCluster) cluster)
+                  .setRegulatoryConfig(
+                      (ChipClusters.GeneralCommissioningCluster.SetRegulatoryConfigResponseCallback)
+                          callback,
+                      (Integer) commandArguments.get("newRegulatoryConfig"),
+                      (String) commandArguments.get("countryCode"),
+                      (Long) commandArguments.get("breadcrumb"));
             },
-            () -> new DelegatedLaunchResponseCallback(),
-            contentLauncherlaunchContentCommandParams);
-    contentLauncherClusterInteractionInfoMap.put(
-        "launchContent", contentLauncherlaunchContentInteractionInfo);
-    Map<String, CommandParameterInfo> contentLauncherlaunchURLCommandParams =
+            () -> new DelegatedSetRegulatoryConfigResponseCallback(),
+            generalCommissioningsetRegulatoryConfigCommandParams);
+    generalCommissioningClusterInteractionInfoMap.put(
+        "setRegulatoryConfig", generalCommissioningsetRegulatoryConfigInteractionInfo);
+    Map<String, CommandParameterInfo> generalCommissioningcommissioningCompleteCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo contentLauncherlaunchURLcontentURLCommandParameterInfo =
-        new CommandParameterInfo("contentURL", String.class, String.class);
-    contentLauncherlaunchURLCommandParams.put(
-        "contentURL", contentLauncherlaunchURLcontentURLCommandParameterInfo);
-
-    CommandParameterInfo contentLauncherlaunchURLdisplayStringCommandParameterInfo =
-        new CommandParameterInfo("displayString", Optional.class, String.class);
-    contentLauncherlaunchURLCommandParams.put(
-        "displayString", contentLauncherlaunchURLdisplayStringCommandParameterInfo);
-
-    InteractionInfo contentLauncherlaunchURLInteractionInfo =
+    InteractionInfo generalCommissioningcommissioningCompleteInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ContentLauncherCluster) cluster)
-                  .launchURL(
-                      (ChipClusters.ContentLauncherCluster.LaunchResponseCallback) callback,
-                      (String) commandArguments.get("contentURL"),
-                      (Optional<String>) commandArguments.get("displayString"),
-                      (Optional<ChipStructs.ContentLauncherClusterBrandingInformation>)
-                          commandArguments.get("brandingInformation"));
+              ((ChipClusters.GeneralCommissioningCluster) cluster)
+                  .commissioningComplete(
+                      (ChipClusters.GeneralCommissioningCluster
+                              .CommissioningCompleteResponseCallback)
+                          callback);
             },
-            () -> new DelegatedLaunchResponseCallback(),
-            contentLauncherlaunchURLCommandParams);
-    contentLauncherClusterInteractionInfoMap.put(
-        "launchURL", contentLauncherlaunchURLInteractionInfo);
-    commandMap.put("contentLauncher", contentLauncherClusterInteractionInfoMap);
-    Map<String, InteractionInfo> descriptorClusterInteractionInfoMap = new LinkedHashMap<>();
-    commandMap.put("descriptor", descriptorClusterInteractionInfoMap);
-    Map<String, InteractionInfo> diagnosticLogsClusterInteractionInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> diagnosticLogsretrieveLogsRequestCommandParams =
+            () -> new DelegatedCommissioningCompleteResponseCallback(),
+            generalCommissioningcommissioningCompleteCommandParams);
+    generalCommissioningClusterInteractionInfoMap.put(
+        "commissioningComplete", generalCommissioningcommissioningCompleteInteractionInfo);
+    commandMap.put("generalCommissioning", generalCommissioningClusterInteractionInfoMap);
+    Map<String, InteractionInfo> networkCommissioningClusterInteractionInfoMap =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> networkCommissioningscanNetworksCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo diagnosticLogsretrieveLogsRequestintentCommandParameterInfo =
-        new CommandParameterInfo("intent", Integer.class, Integer.class);
-    diagnosticLogsretrieveLogsRequestCommandParams.put(
-        "intent", diagnosticLogsretrieveLogsRequestintentCommandParameterInfo);
-
-    CommandParameterInfo diagnosticLogsretrieveLogsRequestrequestedProtocolCommandParameterInfo =
-        new CommandParameterInfo("requestedProtocol", Integer.class, Integer.class);
-    diagnosticLogsretrieveLogsRequestCommandParams.put(
-        "requestedProtocol",
-        diagnosticLogsretrieveLogsRequestrequestedProtocolCommandParameterInfo);
+    CommandParameterInfo networkCommissioningscanNetworksssidCommandParameterInfo =
+        new CommandParameterInfo("ssid", Optional.class, byte[].class);
+    networkCommissioningscanNetworksCommandParams.put(
+        "ssid", networkCommissioningscanNetworksssidCommandParameterInfo);
 
-    CommandParameterInfo
-        diagnosticLogsretrieveLogsRequesttransferFileDesignatorCommandParameterInfo =
-            new CommandParameterInfo("transferFileDesignator", byte[].class, byte[].class);
-    diagnosticLogsretrieveLogsRequestCommandParams.put(
-        "transferFileDesignator",
-        diagnosticLogsretrieveLogsRequesttransferFileDesignatorCommandParameterInfo);
+    CommandParameterInfo networkCommissioningscanNetworksbreadcrumbCommandParameterInfo =
+        new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
+    networkCommissioningscanNetworksCommandParams.put(
+        "breadcrumb", networkCommissioningscanNetworksbreadcrumbCommandParameterInfo);
 
-    InteractionInfo diagnosticLogsretrieveLogsRequestInteractionInfo =
+    InteractionInfo networkCommissioningscanNetworksInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DiagnosticLogsCluster) cluster)
-                  .retrieveLogsRequest(
-                      (ChipClusters.DiagnosticLogsCluster.RetrieveLogsResponseCallback) callback,
-                      (Integer) commandArguments.get("intent"),
-                      (Integer) commandArguments.get("requestedProtocol"),
-                      (byte[]) commandArguments.get("transferFileDesignator"));
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .scanNetworks(
+                      (ChipClusters.NetworkCommissioningCluster.ScanNetworksResponseCallback)
+                          callback,
+                      (Optional<byte[]>) commandArguments.get("ssid"),
+                      (Optional<Long>) commandArguments.get("breadcrumb"));
             },
-            () -> new DelegatedRetrieveLogsResponseCallback(),
-            diagnosticLogsretrieveLogsRequestCommandParams);
-    diagnosticLogsClusterInteractionInfoMap.put(
-        "retrieveLogsRequest", diagnosticLogsretrieveLogsRequestInteractionInfo);
-    commandMap.put("diagnosticLogs", diagnosticLogsClusterInteractionInfoMap);
-    Map<String, InteractionInfo> doorLockClusterInteractionInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> doorLockclearCredentialCommandParams =
+            () -> new DelegatedScanNetworksResponseCallback(),
+            networkCommissioningscanNetworksCommandParams);
+    networkCommissioningClusterInteractionInfoMap.put(
+        "scanNetworks", networkCommissioningscanNetworksInteractionInfo);
+    Map<String, CommandParameterInfo> networkCommissioningaddOrUpdateWiFiNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo doorLockclearCredentialInteractionInfo =
+    CommandParameterInfo networkCommissioningaddOrUpdateWiFiNetworkssidCommandParameterInfo =
+        new CommandParameterInfo("ssid", byte[].class, byte[].class);
+    networkCommissioningaddOrUpdateWiFiNetworkCommandParams.put(
+        "ssid", networkCommissioningaddOrUpdateWiFiNetworkssidCommandParameterInfo);
+
+    CommandParameterInfo networkCommissioningaddOrUpdateWiFiNetworkcredentialsCommandParameterInfo =
+        new CommandParameterInfo("credentials", byte[].class, byte[].class);
+    networkCommissioningaddOrUpdateWiFiNetworkCommandParams.put(
+        "credentials", networkCommissioningaddOrUpdateWiFiNetworkcredentialsCommandParameterInfo);
+
+    CommandParameterInfo networkCommissioningaddOrUpdateWiFiNetworkbreadcrumbCommandParameterInfo =
+        new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
+    networkCommissioningaddOrUpdateWiFiNetworkCommandParams.put(
+        "breadcrumb", networkCommissioningaddOrUpdateWiFiNetworkbreadcrumbCommandParameterInfo);
+
+    InteractionInfo networkCommissioningaddOrUpdateWiFiNetworkInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .clearCredential(
-                      (DefaultClusterCallback) callback,
-                      (ChipStructs.DoorLockClusterDlCredential) commandArguments.get("credential"),
-                      10000);
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .addOrUpdateWiFiNetwork(
+                      (ChipClusters.NetworkCommissioningCluster.NetworkConfigResponseCallback)
+                          callback,
+                      (byte[]) commandArguments.get("ssid"),
+                      (byte[]) commandArguments.get("credentials"),
+                      (Optional<Long>) commandArguments.get("breadcrumb"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLockclearCredentialCommandParams);
-    doorLockClusterInteractionInfoMap.put(
-        "clearCredential", doorLockclearCredentialInteractionInfo);
-    Map<String, CommandParameterInfo> doorLockclearHolidayScheduleCommandParams =
+            () -> new DelegatedNetworkConfigResponseCallback(),
+            networkCommissioningaddOrUpdateWiFiNetworkCommandParams);
+    networkCommissioningClusterInteractionInfoMap.put(
+        "addOrUpdateWiFiNetwork", networkCommissioningaddOrUpdateWiFiNetworkInteractionInfo);
+    Map<String, CommandParameterInfo> networkCommissioningaddOrUpdateThreadNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo doorLockclearHolidayScheduleholidayIndexCommandParameterInfo =
-        new CommandParameterInfo("holidayIndex", Integer.class, Integer.class);
-    doorLockclearHolidayScheduleCommandParams.put(
-        "holidayIndex", doorLockclearHolidayScheduleholidayIndexCommandParameterInfo);
+    CommandParameterInfo
+        networkCommissioningaddOrUpdateThreadNetworkoperationalDatasetCommandParameterInfo =
+            new CommandParameterInfo("operationalDataset", byte[].class, byte[].class);
+    networkCommissioningaddOrUpdateThreadNetworkCommandParams.put(
+        "operationalDataset",
+        networkCommissioningaddOrUpdateThreadNetworkoperationalDatasetCommandParameterInfo);
 
-    InteractionInfo doorLockclearHolidayScheduleInteractionInfo =
+    CommandParameterInfo
+        networkCommissioningaddOrUpdateThreadNetworkbreadcrumbCommandParameterInfo =
+            new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
+    networkCommissioningaddOrUpdateThreadNetworkCommandParams.put(
+        "breadcrumb", networkCommissioningaddOrUpdateThreadNetworkbreadcrumbCommandParameterInfo);
+
+    InteractionInfo networkCommissioningaddOrUpdateThreadNetworkInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .clearHolidaySchedule(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("holidayIndex"));
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .addOrUpdateThreadNetwork(
+                      (ChipClusters.NetworkCommissioningCluster.NetworkConfigResponseCallback)
+                          callback,
+                      (byte[]) commandArguments.get("operationalDataset"),
+                      (Optional<Long>) commandArguments.get("breadcrumb"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLockclearHolidayScheduleCommandParams);
-    doorLockClusterInteractionInfoMap.put(
-        "clearHolidaySchedule", doorLockclearHolidayScheduleInteractionInfo);
-    Map<String, CommandParameterInfo> doorLockclearUserCommandParams =
+            () -> new DelegatedNetworkConfigResponseCallback(),
+            networkCommissioningaddOrUpdateThreadNetworkCommandParams);
+    networkCommissioningClusterInteractionInfoMap.put(
+        "addOrUpdateThreadNetwork", networkCommissioningaddOrUpdateThreadNetworkInteractionInfo);
+    Map<String, CommandParameterInfo> networkCommissioningremoveNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo doorLockclearUseruserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
-    doorLockclearUserCommandParams.put("userIndex", doorLockclearUseruserIndexCommandParameterInfo);
+    CommandParameterInfo networkCommissioningremoveNetworknetworkIDCommandParameterInfo =
+        new CommandParameterInfo("networkID", byte[].class, byte[].class);
+    networkCommissioningremoveNetworkCommandParams.put(
+        "networkID", networkCommissioningremoveNetworknetworkIDCommandParameterInfo);
 
-    InteractionInfo doorLockclearUserInteractionInfo =
+    CommandParameterInfo networkCommissioningremoveNetworkbreadcrumbCommandParameterInfo =
+        new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
+    networkCommissioningremoveNetworkCommandParams.put(
+        "breadcrumb", networkCommissioningremoveNetworkbreadcrumbCommandParameterInfo);
+
+    InteractionInfo networkCommissioningremoveNetworkInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .clearUser(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("userIndex"),
-                      10000);
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .removeNetwork(
+                      (ChipClusters.NetworkCommissioningCluster.NetworkConfigResponseCallback)
+                          callback,
+                      (byte[]) commandArguments.get("networkID"),
+                      (Optional<Long>) commandArguments.get("breadcrumb"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLockclearUserCommandParams);
-    doorLockClusterInteractionInfoMap.put("clearUser", doorLockclearUserInteractionInfo);
-    Map<String, CommandParameterInfo> doorLockclearWeekDayScheduleCommandParams =
+            () -> new DelegatedNetworkConfigResponseCallback(),
+            networkCommissioningremoveNetworkCommandParams);
+    networkCommissioningClusterInteractionInfoMap.put(
+        "removeNetwork", networkCommissioningremoveNetworkInteractionInfo);
+    Map<String, CommandParameterInfo> networkCommissioningconnectNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo doorLockclearWeekDayScheduleweekDayIndexCommandParameterInfo =
-        new CommandParameterInfo("weekDayIndex", Integer.class, Integer.class);
-    doorLockclearWeekDayScheduleCommandParams.put(
-        "weekDayIndex", doorLockclearWeekDayScheduleweekDayIndexCommandParameterInfo);
+    CommandParameterInfo networkCommissioningconnectNetworknetworkIDCommandParameterInfo =
+        new CommandParameterInfo("networkID", byte[].class, byte[].class);
+    networkCommissioningconnectNetworkCommandParams.put(
+        "networkID", networkCommissioningconnectNetworknetworkIDCommandParameterInfo);
 
-    CommandParameterInfo doorLockclearWeekDayScheduleuserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
-    doorLockclearWeekDayScheduleCommandParams.put(
-        "userIndex", doorLockclearWeekDayScheduleuserIndexCommandParameterInfo);
+    CommandParameterInfo networkCommissioningconnectNetworkbreadcrumbCommandParameterInfo =
+        new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
+    networkCommissioningconnectNetworkCommandParams.put(
+        "breadcrumb", networkCommissioningconnectNetworkbreadcrumbCommandParameterInfo);
 
-    InteractionInfo doorLockclearWeekDayScheduleInteractionInfo =
+    InteractionInfo networkCommissioningconnectNetworkInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .clearWeekDaySchedule(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("weekDayIndex"),
-                      (Integer) commandArguments.get("userIndex"));
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .connectNetwork(
+                      (ChipClusters.NetworkCommissioningCluster.ConnectNetworkResponseCallback)
+                          callback,
+                      (byte[]) commandArguments.get("networkID"),
+                      (Optional<Long>) commandArguments.get("breadcrumb"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLockclearWeekDayScheduleCommandParams);
-    doorLockClusterInteractionInfoMap.put(
-        "clearWeekDaySchedule", doorLockclearWeekDayScheduleInteractionInfo);
-    Map<String, CommandParameterInfo> doorLockclearYearDayScheduleCommandParams =
+            () -> new DelegatedConnectNetworkResponseCallback(),
+            networkCommissioningconnectNetworkCommandParams);
+    networkCommissioningClusterInteractionInfoMap.put(
+        "connectNetwork", networkCommissioningconnectNetworkInteractionInfo);
+    Map<String, CommandParameterInfo> networkCommissioningreorderNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo doorLockclearYearDayScheduleyearDayIndexCommandParameterInfo =
-        new CommandParameterInfo("yearDayIndex", Integer.class, Integer.class);
-    doorLockclearYearDayScheduleCommandParams.put(
-        "yearDayIndex", doorLockclearYearDayScheduleyearDayIndexCommandParameterInfo);
+    CommandParameterInfo networkCommissioningreorderNetworknetworkIDCommandParameterInfo =
+        new CommandParameterInfo("networkID", byte[].class, byte[].class);
+    networkCommissioningreorderNetworkCommandParams.put(
+        "networkID", networkCommissioningreorderNetworknetworkIDCommandParameterInfo);
 
-    CommandParameterInfo doorLockclearYearDayScheduleuserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
-    doorLockclearYearDayScheduleCommandParams.put(
-        "userIndex", doorLockclearYearDayScheduleuserIndexCommandParameterInfo);
+    CommandParameterInfo networkCommissioningreorderNetworknetworkIndexCommandParameterInfo =
+        new CommandParameterInfo("networkIndex", Integer.class, Integer.class);
+    networkCommissioningreorderNetworkCommandParams.put(
+        "networkIndex", networkCommissioningreorderNetworknetworkIndexCommandParameterInfo);
 
-    InteractionInfo doorLockclearYearDayScheduleInteractionInfo =
+    CommandParameterInfo networkCommissioningreorderNetworkbreadcrumbCommandParameterInfo =
+        new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
+    networkCommissioningreorderNetworkCommandParams.put(
+        "breadcrumb", networkCommissioningreorderNetworkbreadcrumbCommandParameterInfo);
+
+    InteractionInfo networkCommissioningreorderNetworkInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .clearYearDaySchedule(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("yearDayIndex"),
-                      (Integer) commandArguments.get("userIndex"));
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .reorderNetwork(
+                      (ChipClusters.NetworkCommissioningCluster.NetworkConfigResponseCallback)
+                          callback,
+                      (byte[]) commandArguments.get("networkID"),
+                      (Integer) commandArguments.get("networkIndex"),
+                      (Optional<Long>) commandArguments.get("breadcrumb"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLockclearYearDayScheduleCommandParams);
-    doorLockClusterInteractionInfoMap.put(
-        "clearYearDaySchedule", doorLockclearYearDayScheduleInteractionInfo);
-    Map<String, CommandParameterInfo> doorLockgetCredentialStatusCommandParams =
+            () -> new DelegatedNetworkConfigResponseCallback(),
+            networkCommissioningreorderNetworkCommandParams);
+    networkCommissioningClusterInteractionInfoMap.put(
+        "reorderNetwork", networkCommissioningreorderNetworkInteractionInfo);
+    commandMap.put("networkCommissioning", networkCommissioningClusterInteractionInfoMap);
+    Map<String, InteractionInfo> diagnosticLogsClusterInteractionInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> diagnosticLogsretrieveLogsRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo doorLockgetCredentialStatusInteractionInfo =
+    CommandParameterInfo diagnosticLogsretrieveLogsRequestintentCommandParameterInfo =
+        new CommandParameterInfo("intent", Integer.class, Integer.class);
+    diagnosticLogsretrieveLogsRequestCommandParams.put(
+        "intent", diagnosticLogsretrieveLogsRequestintentCommandParameterInfo);
+
+    CommandParameterInfo diagnosticLogsretrieveLogsRequestrequestedProtocolCommandParameterInfo =
+        new CommandParameterInfo("requestedProtocol", Integer.class, Integer.class);
+    diagnosticLogsretrieveLogsRequestCommandParams.put(
+        "requestedProtocol",
+        diagnosticLogsretrieveLogsRequestrequestedProtocolCommandParameterInfo);
+
+    CommandParameterInfo
+        diagnosticLogsretrieveLogsRequesttransferFileDesignatorCommandParameterInfo =
+            new CommandParameterInfo("transferFileDesignator", byte[].class, byte[].class);
+    diagnosticLogsretrieveLogsRequestCommandParams.put(
+        "transferFileDesignator",
+        diagnosticLogsretrieveLogsRequesttransferFileDesignatorCommandParameterInfo);
+
+    InteractionInfo diagnosticLogsretrieveLogsRequestInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .getCredentialStatus(
-                      (ChipClusters.DoorLockCluster.GetCredentialStatusResponseCallback) callback,
-                      (ChipStructs.DoorLockClusterDlCredential) commandArguments.get("credential"));
+              ((ChipClusters.DiagnosticLogsCluster) cluster)
+                  .retrieveLogsRequest(
+                      (ChipClusters.DiagnosticLogsCluster.RetrieveLogsResponseCallback) callback,
+                      (Integer) commandArguments.get("intent"),
+                      (Integer) commandArguments.get("requestedProtocol"),
+                      (byte[]) commandArguments.get("transferFileDesignator"));
             },
-            () -> new DelegatedGetCredentialStatusResponseCallback(),
-            doorLockgetCredentialStatusCommandParams);
-    doorLockClusterInteractionInfoMap.put(
-        "getCredentialStatus", doorLockgetCredentialStatusInteractionInfo);
-    Map<String, CommandParameterInfo> doorLockgetHolidayScheduleCommandParams =
+            () -> new DelegatedRetrieveLogsResponseCallback(),
+            diagnosticLogsretrieveLogsRequestCommandParams);
+    diagnosticLogsClusterInteractionInfoMap.put(
+        "retrieveLogsRequest", diagnosticLogsretrieveLogsRequestInteractionInfo);
+    commandMap.put("diagnosticLogs", diagnosticLogsClusterInteractionInfoMap);
+    Map<String, InteractionInfo> generalDiagnosticsClusterInteractionInfoMap =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> generalDiagnosticstestEventTriggerCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo doorLockgetHolidayScheduleholidayIndexCommandParameterInfo =
-        new CommandParameterInfo("holidayIndex", Integer.class, Integer.class);
-    doorLockgetHolidayScheduleCommandParams.put(
-        "holidayIndex", doorLockgetHolidayScheduleholidayIndexCommandParameterInfo);
+    CommandParameterInfo generalDiagnosticstestEventTriggerenableKeyCommandParameterInfo =
+        new CommandParameterInfo("enableKey", byte[].class, byte[].class);
+    generalDiagnosticstestEventTriggerCommandParams.put(
+        "enableKey", generalDiagnosticstestEventTriggerenableKeyCommandParameterInfo);
 
-    InteractionInfo doorLockgetHolidayScheduleInteractionInfo =
+    CommandParameterInfo generalDiagnosticstestEventTriggereventTriggerCommandParameterInfo =
+        new CommandParameterInfo("eventTrigger", Long.class, Long.class);
+    generalDiagnosticstestEventTriggerCommandParams.put(
+        "eventTrigger", generalDiagnosticstestEventTriggereventTriggerCommandParameterInfo);
+
+    InteractionInfo generalDiagnosticstestEventTriggerInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .getHolidaySchedule(
-                      (ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback) callback,
-                      (Integer) commandArguments.get("holidayIndex"));
+              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
+                  .testEventTrigger(
+                      (DefaultClusterCallback) callback,
+                      (byte[]) commandArguments.get("enableKey"),
+                      (Long) commandArguments.get("eventTrigger"));
             },
-            () -> new DelegatedGetHolidayScheduleResponseCallback(),
-            doorLockgetHolidayScheduleCommandParams);
-    doorLockClusterInteractionInfoMap.put(
-        "getHolidaySchedule", doorLockgetHolidayScheduleInteractionInfo);
-    Map<String, CommandParameterInfo> doorLockgetUserCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            generalDiagnosticstestEventTriggerCommandParams);
+    generalDiagnosticsClusterInteractionInfoMap.put(
+        "testEventTrigger", generalDiagnosticstestEventTriggerInteractionInfo);
+    commandMap.put("generalDiagnostics", generalDiagnosticsClusterInteractionInfoMap);
+    Map<String, InteractionInfo> softwareDiagnosticsClusterInteractionInfoMap =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> softwareDiagnosticsresetWatermarksCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo doorLockgetUseruserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
-    doorLockgetUserCommandParams.put("userIndex", doorLockgetUseruserIndexCommandParameterInfo);
-
-    InteractionInfo doorLockgetUserInteractionInfo =
+    InteractionInfo softwareDiagnosticsresetWatermarksInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .getUser(
-                      (ChipClusters.DoorLockCluster.GetUserResponseCallback) callback,
-                      (Integer) commandArguments.get("userIndex"));
+              ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
+                  .resetWatermarks((DefaultClusterCallback) callback);
             },
-            () -> new DelegatedGetUserResponseCallback(),
-            doorLockgetUserCommandParams);
-    doorLockClusterInteractionInfoMap.put("getUser", doorLockgetUserInteractionInfo);
-    Map<String, CommandParameterInfo> doorLockgetWeekDayScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo doorLockgetWeekDayScheduleweekDayIndexCommandParameterInfo =
-        new CommandParameterInfo("weekDayIndex", Integer.class, Integer.class);
-    doorLockgetWeekDayScheduleCommandParams.put(
-        "weekDayIndex", doorLockgetWeekDayScheduleweekDayIndexCommandParameterInfo);
-
-    CommandParameterInfo doorLockgetWeekDayScheduleuserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
-    doorLockgetWeekDayScheduleCommandParams.put(
-        "userIndex", doorLockgetWeekDayScheduleuserIndexCommandParameterInfo);
-
-    InteractionInfo doorLockgetWeekDayScheduleInteractionInfo =
+            () -> new DelegatedDefaultClusterCallback(),
+            softwareDiagnosticsresetWatermarksCommandParams);
+    softwareDiagnosticsClusterInteractionInfoMap.put(
+        "resetWatermarks", softwareDiagnosticsresetWatermarksInteractionInfo);
+    commandMap.put("softwareDiagnostics", softwareDiagnosticsClusterInteractionInfoMap);
+    Map<String, InteractionInfo> threadNetworkDiagnosticsClusterInteractionInfoMap =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> threadNetworkDiagnosticsresetCountsCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo threadNetworkDiagnosticsresetCountsInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .getWeekDaySchedule(
-                      (ChipClusters.DoorLockCluster.GetWeekDayScheduleResponseCallback) callback,
-                      (Integer) commandArguments.get("weekDayIndex"),
-                      (Integer) commandArguments.get("userIndex"));
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .resetCounts((DefaultClusterCallback) callback);
             },
-            () -> new DelegatedGetWeekDayScheduleResponseCallback(),
-            doorLockgetWeekDayScheduleCommandParams);
-    doorLockClusterInteractionInfoMap.put(
-        "getWeekDaySchedule", doorLockgetWeekDayScheduleInteractionInfo);
-    Map<String, CommandParameterInfo> doorLockgetYearDayScheduleCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            threadNetworkDiagnosticsresetCountsCommandParams);
+    threadNetworkDiagnosticsClusterInteractionInfoMap.put(
+        "resetCounts", threadNetworkDiagnosticsresetCountsInteractionInfo);
+    commandMap.put("threadNetworkDiagnostics", threadNetworkDiagnosticsClusterInteractionInfoMap);
+    Map<String, InteractionInfo> wiFiNetworkDiagnosticsClusterInteractionInfoMap =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> wiFiNetworkDiagnosticsresetCountsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo doorLockgetYearDayScheduleyearDayIndexCommandParameterInfo =
-        new CommandParameterInfo("yearDayIndex", Integer.class, Integer.class);
-    doorLockgetYearDayScheduleCommandParams.put(
-        "yearDayIndex", doorLockgetYearDayScheduleyearDayIndexCommandParameterInfo);
-
-    CommandParameterInfo doorLockgetYearDayScheduleuserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
-    doorLockgetYearDayScheduleCommandParams.put(
-        "userIndex", doorLockgetYearDayScheduleuserIndexCommandParameterInfo);
-
-    InteractionInfo doorLockgetYearDayScheduleInteractionInfo =
+    InteractionInfo wiFiNetworkDiagnosticsresetCountsInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .getYearDaySchedule(
-                      (ChipClusters.DoorLockCluster.GetYearDayScheduleResponseCallback) callback,
-                      (Integer) commandArguments.get("yearDayIndex"),
-                      (Integer) commandArguments.get("userIndex"));
+              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
+                  .resetCounts((DefaultClusterCallback) callback);
             },
-            () -> new DelegatedGetYearDayScheduleResponseCallback(),
-            doorLockgetYearDayScheduleCommandParams);
-    doorLockClusterInteractionInfoMap.put(
-        "getYearDaySchedule", doorLockgetYearDayScheduleInteractionInfo);
-    Map<String, CommandParameterInfo> doorLocklockDoorCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            wiFiNetworkDiagnosticsresetCountsCommandParams);
+    wiFiNetworkDiagnosticsClusterInteractionInfoMap.put(
+        "resetCounts", wiFiNetworkDiagnosticsresetCountsInteractionInfo);
+    commandMap.put("wiFiNetworkDiagnostics", wiFiNetworkDiagnosticsClusterInteractionInfoMap);
+    Map<String, InteractionInfo> ethernetNetworkDiagnosticsClusterInteractionInfoMap =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> ethernetNetworkDiagnosticsresetCountsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo doorLocklockDoorpinCodeCommandParameterInfo =
-        new CommandParameterInfo("pinCode", Optional.class, byte[].class);
-    doorLocklockDoorCommandParams.put("pinCode", doorLocklockDoorpinCodeCommandParameterInfo);
-
-    InteractionInfo doorLocklockDoorInteractionInfo =
+    InteractionInfo ethernetNetworkDiagnosticsresetCountsInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .lockDoor(
-                      (DefaultClusterCallback) callback,
-                      (Optional<byte[]>) commandArguments.get("pinCode"),
-                      10000);
+              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
+                  .resetCounts((DefaultClusterCallback) callback);
             },
             () -> new DelegatedDefaultClusterCallback(),
-            doorLocklockDoorCommandParams);
-    doorLockClusterInteractionInfoMap.put("lockDoor", doorLocklockDoorInteractionInfo);
-    Map<String, CommandParameterInfo> doorLocksetCredentialCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo doorLocksetCredentialoperationTypeCommandParameterInfo =
-        new CommandParameterInfo("operationType", Integer.class, Integer.class);
-    doorLocksetCredentialCommandParams.put(
-        "operationType", doorLocksetCredentialoperationTypeCommandParameterInfo);
+            ethernetNetworkDiagnosticsresetCountsCommandParams);
+    ethernetNetworkDiagnosticsClusterInteractionInfoMap.put(
+        "resetCounts", ethernetNetworkDiagnosticsresetCountsInteractionInfo);
+    commandMap.put(
+        "ethernetNetworkDiagnostics", ethernetNetworkDiagnosticsClusterInteractionInfoMap);
+    Map<String, InteractionInfo> bridgedDeviceBasicClusterInteractionInfoMap =
+        new LinkedHashMap<>();
+    commandMap.put("bridgedDeviceBasic", bridgedDeviceBasicClusterInteractionInfoMap);
+    Map<String, InteractionInfo> switchClusterInteractionInfoMap = new LinkedHashMap<>();
+    commandMap.put("switch", switchClusterInteractionInfoMap);
+    Map<String, InteractionInfo> administratorCommissioningClusterInteractionInfoMap =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo>
+        administratorCommissioningopenCommissioningWindowCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo
+        administratorCommissioningopenCommissioningWindowcommissioningTimeoutCommandParameterInfo =
+            new CommandParameterInfo("commissioningTimeout", Integer.class, Integer.class);
+    administratorCommissioningopenCommissioningWindowCommandParams.put(
+        "commissioningTimeout",
+        administratorCommissioningopenCommissioningWindowcommissioningTimeoutCommandParameterInfo);
 
-    CommandParameterInfo doorLocksetCredentialcredentialDataCommandParameterInfo =
-        new CommandParameterInfo("credentialData", byte[].class, byte[].class);
-    doorLocksetCredentialCommandParams.put(
-        "credentialData", doorLocksetCredentialcredentialDataCommandParameterInfo);
+    CommandParameterInfo
+        administratorCommissioningopenCommissioningWindowPAKEVerifierCommandParameterInfo =
+            new CommandParameterInfo("PAKEVerifier", byte[].class, byte[].class);
+    administratorCommissioningopenCommissioningWindowCommandParams.put(
+        "PAKEVerifier",
+        administratorCommissioningopenCommissioningWindowPAKEVerifierCommandParameterInfo);
 
-    CommandParameterInfo doorLocksetCredentialuserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
-    doorLocksetCredentialCommandParams.put(
-        "userIndex", doorLocksetCredentialuserIndexCommandParameterInfo);
+    CommandParameterInfo
+        administratorCommissioningopenCommissioningWindowdiscriminatorCommandParameterInfo =
+            new CommandParameterInfo("discriminator", Integer.class, Integer.class);
+    administratorCommissioningopenCommissioningWindowCommandParams.put(
+        "discriminator",
+        administratorCommissioningopenCommissioningWindowdiscriminatorCommandParameterInfo);
 
-    CommandParameterInfo doorLocksetCredentialuserStatusCommandParameterInfo =
-        new CommandParameterInfo("userStatus", Integer.class, Integer.class);
-    doorLocksetCredentialCommandParams.put(
-        "userStatus", doorLocksetCredentialuserStatusCommandParameterInfo);
+    CommandParameterInfo
+        administratorCommissioningopenCommissioningWindowiterationsCommandParameterInfo =
+            new CommandParameterInfo("iterations", Long.class, Long.class);
+    administratorCommissioningopenCommissioningWindowCommandParams.put(
+        "iterations",
+        administratorCommissioningopenCommissioningWindowiterationsCommandParameterInfo);
 
-    CommandParameterInfo doorLocksetCredentialuserTypeCommandParameterInfo =
-        new CommandParameterInfo("userType", Integer.class, Integer.class);
-    doorLocksetCredentialCommandParams.put(
-        "userType", doorLocksetCredentialuserTypeCommandParameterInfo);
+    CommandParameterInfo administratorCommissioningopenCommissioningWindowsaltCommandParameterInfo =
+        new CommandParameterInfo("salt", byte[].class, byte[].class);
+    administratorCommissioningopenCommissioningWindowCommandParams.put(
+        "salt", administratorCommissioningopenCommissioningWindowsaltCommandParameterInfo);
 
-    InteractionInfo doorLocksetCredentialInteractionInfo =
+    InteractionInfo administratorCommissioningopenCommissioningWindowInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .setCredential(
-                      (ChipClusters.DoorLockCluster.SetCredentialResponseCallback) callback,
-                      (Integer) commandArguments.get("operationType"),
-                      (ChipStructs.DoorLockClusterDlCredential) commandArguments.get("credential"),
-                      (byte[]) commandArguments.get("credentialData"),
-                      (Integer) commandArguments.get("userIndex"),
-                      (Integer) commandArguments.get("userStatus"),
-                      (Integer) commandArguments.get("userType"),
+              ((ChipClusters.AdministratorCommissioningCluster) cluster)
+                  .openCommissioningWindow(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("commissioningTimeout"),
+                      (byte[]) commandArguments.get("PAKEVerifier"),
+                      (Integer) commandArguments.get("discriminator"),
+                      (Long) commandArguments.get("iterations"),
+                      (byte[]) commandArguments.get("salt"),
                       10000);
             },
-            () -> new DelegatedSetCredentialResponseCallback(),
-            doorLocksetCredentialCommandParams);
-    doorLockClusterInteractionInfoMap.put("setCredential", doorLocksetCredentialInteractionInfo);
-    Map<String, CommandParameterInfo> doorLocksetHolidayScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo doorLocksetHolidayScheduleholidayIndexCommandParameterInfo =
-        new CommandParameterInfo("holidayIndex", Integer.class, Integer.class);
-    doorLocksetHolidayScheduleCommandParams.put(
-        "holidayIndex", doorLocksetHolidayScheduleholidayIndexCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetHolidaySchedulelocalStartTimeCommandParameterInfo =
-        new CommandParameterInfo("localStartTime", Long.class, Long.class);
-    doorLocksetHolidayScheduleCommandParams.put(
-        "localStartTime", doorLocksetHolidaySchedulelocalStartTimeCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetHolidaySchedulelocalEndTimeCommandParameterInfo =
-        new CommandParameterInfo("localEndTime", Long.class, Long.class);
-    doorLocksetHolidayScheduleCommandParams.put(
-        "localEndTime", doorLocksetHolidaySchedulelocalEndTimeCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetHolidayScheduleoperatingModeCommandParameterInfo =
-        new CommandParameterInfo("operatingMode", Integer.class, Integer.class);
-    doorLocksetHolidayScheduleCommandParams.put(
-        "operatingMode", doorLocksetHolidayScheduleoperatingModeCommandParameterInfo);
+            () -> new DelegatedDefaultClusterCallback(),
+            administratorCommissioningopenCommissioningWindowCommandParams);
+    administratorCommissioningClusterInteractionInfoMap.put(
+        "openCommissioningWindow",
+        administratorCommissioningopenCommissioningWindowInteractionInfo);
+    Map<String, CommandParameterInfo>
+        administratorCommissioningopenBasicCommissioningWindowCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo
+        administratorCommissioningopenBasicCommissioningWindowcommissioningTimeoutCommandParameterInfo =
+            new CommandParameterInfo("commissioningTimeout", Integer.class, Integer.class);
+    administratorCommissioningopenBasicCommissioningWindowCommandParams.put(
+        "commissioningTimeout",
+        administratorCommissioningopenBasicCommissioningWindowcommissioningTimeoutCommandParameterInfo);
 
-    InteractionInfo doorLocksetHolidayScheduleInteractionInfo =
+    InteractionInfo administratorCommissioningopenBasicCommissioningWindowInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .setHolidaySchedule(
+              ((ChipClusters.AdministratorCommissioningCluster) cluster)
+                  .openBasicCommissioningWindow(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("holidayIndex"),
-                      (Long) commandArguments.get("localStartTime"),
-                      (Long) commandArguments.get("localEndTime"),
-                      (Integer) commandArguments.get("operatingMode"));
+                      (Integer) commandArguments.get("commissioningTimeout"),
+                      10000);
             },
             () -> new DelegatedDefaultClusterCallback(),
-            doorLocksetHolidayScheduleCommandParams);
-    doorLockClusterInteractionInfoMap.put(
-        "setHolidaySchedule", doorLocksetHolidayScheduleInteractionInfo);
-    Map<String, CommandParameterInfo> doorLocksetUserCommandParams =
+            administratorCommissioningopenBasicCommissioningWindowCommandParams);
+    administratorCommissioningClusterInteractionInfoMap.put(
+        "openBasicCommissioningWindow",
+        administratorCommissioningopenBasicCommissioningWindowInteractionInfo);
+    Map<String, CommandParameterInfo> administratorCommissioningrevokeCommissioningCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo doorLocksetUseroperationTypeCommandParameterInfo =
-        new CommandParameterInfo("operationType", Integer.class, Integer.class);
-    doorLocksetUserCommandParams.put(
-        "operationType", doorLocksetUseroperationTypeCommandParameterInfo);
+    InteractionInfo administratorCommissioningrevokeCommissioningInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.AdministratorCommissioningCluster) cluster)
+                  .revokeCommissioning((DefaultClusterCallback) callback, 10000);
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            administratorCommissioningrevokeCommissioningCommandParams);
+    administratorCommissioningClusterInteractionInfoMap.put(
+        "revokeCommissioning", administratorCommissioningrevokeCommissioningInteractionInfo);
+    commandMap.put(
+        "administratorCommissioning", administratorCommissioningClusterInteractionInfoMap);
+    Map<String, InteractionInfo> operationalCredentialsClusterInteractionInfoMap =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> operationalCredentialsattestationRequestCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo
+        operationalCredentialsattestationRequestattestationNonceCommandParameterInfo =
+            new CommandParameterInfo("attestationNonce", byte[].class, byte[].class);
+    operationalCredentialsattestationRequestCommandParams.put(
+        "attestationNonce",
+        operationalCredentialsattestationRequestattestationNonceCommandParameterInfo);
 
-    CommandParameterInfo doorLocksetUseruserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
-    doorLocksetUserCommandParams.put("userIndex", doorLocksetUseruserIndexCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetUseruserNameCommandParameterInfo =
-        new CommandParameterInfo("userName", String.class, String.class);
-    doorLocksetUserCommandParams.put("userName", doorLocksetUseruserNameCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetUseruserUniqueIdCommandParameterInfo =
-        new CommandParameterInfo("userUniqueId", Long.class, Long.class);
-    doorLocksetUserCommandParams.put(
-        "userUniqueId", doorLocksetUseruserUniqueIdCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetUseruserStatusCommandParameterInfo =
-        new CommandParameterInfo("userStatus", Integer.class, Integer.class);
-    doorLocksetUserCommandParams.put("userStatus", doorLocksetUseruserStatusCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetUseruserTypeCommandParameterInfo =
-        new CommandParameterInfo("userType", Integer.class, Integer.class);
-    doorLocksetUserCommandParams.put("userType", doorLocksetUseruserTypeCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetUsercredentialRuleCommandParameterInfo =
-        new CommandParameterInfo("credentialRule", Integer.class, Integer.class);
-    doorLocksetUserCommandParams.put(
-        "credentialRule", doorLocksetUsercredentialRuleCommandParameterInfo);
-
-    InteractionInfo doorLocksetUserInteractionInfo =
+    InteractionInfo operationalCredentialsattestationRequestInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .setUser(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("operationType"),
-                      (Integer) commandArguments.get("userIndex"),
-                      (String) commandArguments.get("userName"),
-                      (Long) commandArguments.get("userUniqueId"),
-                      (Integer) commandArguments.get("userStatus"),
-                      (Integer) commandArguments.get("userType"),
-                      (Integer) commandArguments.get("credentialRule"),
-                      10000);
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
+                  .attestationRequest(
+                      (ChipClusters.OperationalCredentialsCluster.AttestationResponseCallback)
+                          callback,
+                      (byte[]) commandArguments.get("attestationNonce"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLocksetUserCommandParams);
-    doorLockClusterInteractionInfoMap.put("setUser", doorLocksetUserInteractionInfo);
-    Map<String, CommandParameterInfo> doorLocksetWeekDayScheduleCommandParams =
+            () -> new DelegatedAttestationResponseCallback(),
+            operationalCredentialsattestationRequestCommandParams);
+    operationalCredentialsClusterInteractionInfoMap.put(
+        "attestationRequest", operationalCredentialsattestationRequestInteractionInfo);
+    Map<String, CommandParameterInfo> operationalCredentialscertificateChainRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo doorLocksetWeekDayScheduleweekDayIndexCommandParameterInfo =
-        new CommandParameterInfo("weekDayIndex", Integer.class, Integer.class);
-    doorLocksetWeekDayScheduleCommandParams.put(
-        "weekDayIndex", doorLocksetWeekDayScheduleweekDayIndexCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetWeekDayScheduleuserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
-    doorLocksetWeekDayScheduleCommandParams.put(
-        "userIndex", doorLocksetWeekDayScheduleuserIndexCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetWeekDayScheduledaysMaskCommandParameterInfo =
-        new CommandParameterInfo("daysMask", Integer.class, Integer.class);
-    doorLocksetWeekDayScheduleCommandParams.put(
-        "daysMask", doorLocksetWeekDayScheduledaysMaskCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetWeekDaySchedulestartHourCommandParameterInfo =
-        new CommandParameterInfo("startHour", Integer.class, Integer.class);
-    doorLocksetWeekDayScheduleCommandParams.put(
-        "startHour", doorLocksetWeekDaySchedulestartHourCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetWeekDaySchedulestartMinuteCommandParameterInfo =
-        new CommandParameterInfo("startMinute", Integer.class, Integer.class);
-    doorLocksetWeekDayScheduleCommandParams.put(
-        "startMinute", doorLocksetWeekDaySchedulestartMinuteCommandParameterInfo);
+    CommandParameterInfo
+        operationalCredentialscertificateChainRequestcertificateTypeCommandParameterInfo =
+            new CommandParameterInfo("certificateType", Integer.class, Integer.class);
+    operationalCredentialscertificateChainRequestCommandParams.put(
+        "certificateType",
+        operationalCredentialscertificateChainRequestcertificateTypeCommandParameterInfo);
 
-    CommandParameterInfo doorLocksetWeekDayScheduleendHourCommandParameterInfo =
-        new CommandParameterInfo("endHour", Integer.class, Integer.class);
-    doorLocksetWeekDayScheduleCommandParams.put(
-        "endHour", doorLocksetWeekDayScheduleendHourCommandParameterInfo);
+    InteractionInfo operationalCredentialscertificateChainRequestInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
+                  .certificateChainRequest(
+                      (ChipClusters.OperationalCredentialsCluster.CertificateChainResponseCallback)
+                          callback,
+                      (Integer) commandArguments.get("certificateType"));
+            },
+            () -> new DelegatedCertificateChainResponseCallback(),
+            operationalCredentialscertificateChainRequestCommandParams);
+    operationalCredentialsClusterInteractionInfoMap.put(
+        "certificateChainRequest", operationalCredentialscertificateChainRequestInteractionInfo);
+    Map<String, CommandParameterInfo> operationalCredentialsCSRRequestCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo operationalCredentialsCSRRequestCSRNonceCommandParameterInfo =
+        new CommandParameterInfo("CSRNonce", byte[].class, byte[].class);
+    operationalCredentialsCSRRequestCommandParams.put(
+        "CSRNonce", operationalCredentialsCSRRequestCSRNonceCommandParameterInfo);
 
-    CommandParameterInfo doorLocksetWeekDayScheduleendMinuteCommandParameterInfo =
-        new CommandParameterInfo("endMinute", Integer.class, Integer.class);
-    doorLocksetWeekDayScheduleCommandParams.put(
-        "endMinute", doorLocksetWeekDayScheduleendMinuteCommandParameterInfo);
+    CommandParameterInfo operationalCredentialsCSRRequestisForUpdateNOCCommandParameterInfo =
+        new CommandParameterInfo("isForUpdateNOC", Optional.class, Boolean.class);
+    operationalCredentialsCSRRequestCommandParams.put(
+        "isForUpdateNOC", operationalCredentialsCSRRequestisForUpdateNOCCommandParameterInfo);
 
-    InteractionInfo doorLocksetWeekDayScheduleInteractionInfo =
+    InteractionInfo operationalCredentialsCSRRequestInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .setWeekDaySchedule(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("weekDayIndex"),
-                      (Integer) commandArguments.get("userIndex"),
-                      (Integer) commandArguments.get("daysMask"),
-                      (Integer) commandArguments.get("startHour"),
-                      (Integer) commandArguments.get("startMinute"),
-                      (Integer) commandArguments.get("endHour"),
-                      (Integer) commandArguments.get("endMinute"));
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
+                  .CSRRequest(
+                      (ChipClusters.OperationalCredentialsCluster.CSRResponseCallback) callback,
+                      (byte[]) commandArguments.get("CSRNonce"),
+                      (Optional<Boolean>) commandArguments.get("isForUpdateNOC"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLocksetWeekDayScheduleCommandParams);
-    doorLockClusterInteractionInfoMap.put(
-        "setWeekDaySchedule", doorLocksetWeekDayScheduleInteractionInfo);
-    Map<String, CommandParameterInfo> doorLocksetYearDayScheduleCommandParams =
+            () -> new DelegatedCSRResponseCallback(),
+            operationalCredentialsCSRRequestCommandParams);
+    operationalCredentialsClusterInteractionInfoMap.put(
+        "CSRRequest", operationalCredentialsCSRRequestInteractionInfo);
+    Map<String, CommandParameterInfo> operationalCredentialsaddNOCCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo doorLocksetYearDayScheduleyearDayIndexCommandParameterInfo =
-        new CommandParameterInfo("yearDayIndex", Integer.class, Integer.class);
-    doorLocksetYearDayScheduleCommandParams.put(
-        "yearDayIndex", doorLocksetYearDayScheduleyearDayIndexCommandParameterInfo);
+    CommandParameterInfo operationalCredentialsaddNOCNOCValueCommandParameterInfo =
+        new CommandParameterInfo("NOCValue", byte[].class, byte[].class);
+    operationalCredentialsaddNOCCommandParams.put(
+        "NOCValue", operationalCredentialsaddNOCNOCValueCommandParameterInfo);
 
-    CommandParameterInfo doorLocksetYearDayScheduleuserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
-    doorLocksetYearDayScheduleCommandParams.put(
-        "userIndex", doorLocksetYearDayScheduleuserIndexCommandParameterInfo);
+    CommandParameterInfo operationalCredentialsaddNOCICACValueCommandParameterInfo =
+        new CommandParameterInfo("ICACValue", Optional.class, byte[].class);
+    operationalCredentialsaddNOCCommandParams.put(
+        "ICACValue", operationalCredentialsaddNOCICACValueCommandParameterInfo);
 
-    CommandParameterInfo doorLocksetYearDaySchedulelocalStartTimeCommandParameterInfo =
-        new CommandParameterInfo("localStartTime", Long.class, Long.class);
-    doorLocksetYearDayScheduleCommandParams.put(
-        "localStartTime", doorLocksetYearDaySchedulelocalStartTimeCommandParameterInfo);
+    CommandParameterInfo operationalCredentialsaddNOCIPKValueCommandParameterInfo =
+        new CommandParameterInfo("IPKValue", byte[].class, byte[].class);
+    operationalCredentialsaddNOCCommandParams.put(
+        "IPKValue", operationalCredentialsaddNOCIPKValueCommandParameterInfo);
 
-    CommandParameterInfo doorLocksetYearDaySchedulelocalEndTimeCommandParameterInfo =
-        new CommandParameterInfo("localEndTime", Long.class, Long.class);
-    doorLocksetYearDayScheduleCommandParams.put(
-        "localEndTime", doorLocksetYearDaySchedulelocalEndTimeCommandParameterInfo);
+    CommandParameterInfo operationalCredentialsaddNOCcaseAdminSubjectCommandParameterInfo =
+        new CommandParameterInfo("caseAdminSubject", Long.class, Long.class);
+    operationalCredentialsaddNOCCommandParams.put(
+        "caseAdminSubject", operationalCredentialsaddNOCcaseAdminSubjectCommandParameterInfo);
 
-    InteractionInfo doorLocksetYearDayScheduleInteractionInfo =
+    CommandParameterInfo operationalCredentialsaddNOCadminVendorIdCommandParameterInfo =
+        new CommandParameterInfo("adminVendorId", Integer.class, Integer.class);
+    operationalCredentialsaddNOCCommandParams.put(
+        "adminVendorId", operationalCredentialsaddNOCadminVendorIdCommandParameterInfo);
+
+    InteractionInfo operationalCredentialsaddNOCInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .setYearDaySchedule(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("yearDayIndex"),
-                      (Integer) commandArguments.get("userIndex"),
-                      (Long) commandArguments.get("localStartTime"),
-                      (Long) commandArguments.get("localEndTime"));
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
+                  .addNOC(
+                      (ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback,
+                      (byte[]) commandArguments.get("NOCValue"),
+                      (Optional<byte[]>) commandArguments.get("ICACValue"),
+                      (byte[]) commandArguments.get("IPKValue"),
+                      (Long) commandArguments.get("caseAdminSubject"),
+                      (Integer) commandArguments.get("adminVendorId"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLocksetYearDayScheduleCommandParams);
-    doorLockClusterInteractionInfoMap.put(
-        "setYearDaySchedule", doorLocksetYearDayScheduleInteractionInfo);
-    Map<String, CommandParameterInfo> doorLockunlockDoorCommandParams =
+            () -> new DelegatedNOCResponseCallback(),
+            operationalCredentialsaddNOCCommandParams);
+    operationalCredentialsClusterInteractionInfoMap.put(
+        "addNOC", operationalCredentialsaddNOCInteractionInfo);
+    Map<String, CommandParameterInfo> operationalCredentialsupdateNOCCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo doorLockunlockDoorpinCodeCommandParameterInfo =
-        new CommandParameterInfo("pinCode", Optional.class, byte[].class);
-    doorLockunlockDoorCommandParams.put("pinCode", doorLockunlockDoorpinCodeCommandParameterInfo);
+    CommandParameterInfo operationalCredentialsupdateNOCNOCValueCommandParameterInfo =
+        new CommandParameterInfo("NOCValue", byte[].class, byte[].class);
+    operationalCredentialsupdateNOCCommandParams.put(
+        "NOCValue", operationalCredentialsupdateNOCNOCValueCommandParameterInfo);
 
-    InteractionInfo doorLockunlockDoorInteractionInfo =
+    CommandParameterInfo operationalCredentialsupdateNOCICACValueCommandParameterInfo =
+        new CommandParameterInfo("ICACValue", Optional.class, byte[].class);
+    operationalCredentialsupdateNOCCommandParams.put(
+        "ICACValue", operationalCredentialsupdateNOCICACValueCommandParameterInfo);
+
+    InteractionInfo operationalCredentialsupdateNOCInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .unlockDoor(
-                      (DefaultClusterCallback) callback,
-                      (Optional<byte[]>) commandArguments.get("pinCode"),
-                      10000);
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
+                  .updateNOC(
+                      (ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback,
+                      (byte[]) commandArguments.get("NOCValue"),
+                      (Optional<byte[]>) commandArguments.get("ICACValue"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLockunlockDoorCommandParams);
-    doorLockClusterInteractionInfoMap.put("unlockDoor", doorLockunlockDoorInteractionInfo);
-    Map<String, CommandParameterInfo> doorLockunlockWithTimeoutCommandParams =
+            () -> new DelegatedNOCResponseCallback(),
+            operationalCredentialsupdateNOCCommandParams);
+    operationalCredentialsClusterInteractionInfoMap.put(
+        "updateNOC", operationalCredentialsupdateNOCInteractionInfo);
+    Map<String, CommandParameterInfo> operationalCredentialsupdateFabricLabelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo doorLockunlockWithTimeouttimeoutCommandParameterInfo =
-        new CommandParameterInfo("timeout", Integer.class, Integer.class);
-    doorLockunlockWithTimeoutCommandParams.put(
-        "timeout", doorLockunlockWithTimeouttimeoutCommandParameterInfo);
-
-    CommandParameterInfo doorLockunlockWithTimeoutpinCodeCommandParameterInfo =
-        new CommandParameterInfo("pinCode", Optional.class, byte[].class);
-    doorLockunlockWithTimeoutCommandParams.put(
-        "pinCode", doorLockunlockWithTimeoutpinCodeCommandParameterInfo);
+    CommandParameterInfo operationalCredentialsupdateFabricLabellabelCommandParameterInfo =
+        new CommandParameterInfo("label", String.class, String.class);
+    operationalCredentialsupdateFabricLabelCommandParams.put(
+        "label", operationalCredentialsupdateFabricLabellabelCommandParameterInfo);
 
-    InteractionInfo doorLockunlockWithTimeoutInteractionInfo =
+    InteractionInfo operationalCredentialsupdateFabricLabelInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .unlockWithTimeout(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("timeout"),
-                      (Optional<byte[]>) commandArguments.get("pinCode"),
-                      10000);
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLockunlockWithTimeoutCommandParams);
-    doorLockClusterInteractionInfoMap.put(
-        "unlockWithTimeout", doorLockunlockWithTimeoutInteractionInfo);
-    commandMap.put("doorLock", doorLockClusterInteractionInfoMap);
-    Map<String, InteractionInfo> electricalMeasurementClusterInteractionInfoMap =
-        new LinkedHashMap<>();
-    commandMap.put("electricalMeasurement", electricalMeasurementClusterInteractionInfoMap);
-    Map<String, InteractionInfo> ethernetNetworkDiagnosticsClusterInteractionInfoMap =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> ethernetNetworkDiagnosticsresetCountsCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo ethernetNetworkDiagnosticsresetCountsInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
-                  .resetCounts((DefaultClusterCallback) callback);
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
+                  .updateFabricLabel(
+                      (ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback,
+                      (String) commandArguments.get("label"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            ethernetNetworkDiagnosticsresetCountsCommandParams);
-    ethernetNetworkDiagnosticsClusterInteractionInfoMap.put(
-        "resetCounts", ethernetNetworkDiagnosticsresetCountsInteractionInfo);
-    commandMap.put(
-        "ethernetNetworkDiagnostics", ethernetNetworkDiagnosticsClusterInteractionInfoMap);
-    Map<String, InteractionInfo> fanControlClusterInteractionInfoMap = new LinkedHashMap<>();
-    commandMap.put("fanControl", fanControlClusterInteractionInfoMap);
-    Map<String, InteractionInfo> fixedLabelClusterInteractionInfoMap = new LinkedHashMap<>();
-    commandMap.put("fixedLabel", fixedLabelClusterInteractionInfoMap);
-    Map<String, InteractionInfo> flowMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
-    commandMap.put("flowMeasurement", flowMeasurementClusterInteractionInfoMap);
-    Map<String, InteractionInfo> generalCommissioningClusterInteractionInfoMap =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> generalCommissioningarmFailSafeCommandParams =
+            () -> new DelegatedNOCResponseCallback(),
+            operationalCredentialsupdateFabricLabelCommandParams);
+    operationalCredentialsClusterInteractionInfoMap.put(
+        "updateFabricLabel", operationalCredentialsupdateFabricLabelInteractionInfo);
+    Map<String, CommandParameterInfo> operationalCredentialsremoveFabricCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo generalCommissioningarmFailSafeexpiryLengthSecondsCommandParameterInfo =
-        new CommandParameterInfo("expiryLengthSeconds", Integer.class, Integer.class);
-    generalCommissioningarmFailSafeCommandParams.put(
-        "expiryLengthSeconds",
-        generalCommissioningarmFailSafeexpiryLengthSecondsCommandParameterInfo);
-
-    CommandParameterInfo generalCommissioningarmFailSafebreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", Long.class, Long.class);
-    generalCommissioningarmFailSafeCommandParams.put(
-        "breadcrumb", generalCommissioningarmFailSafebreadcrumbCommandParameterInfo);
+    CommandParameterInfo operationalCredentialsremoveFabricfabricIndexCommandParameterInfo =
+        new CommandParameterInfo("fabricIndex", Integer.class, Integer.class);
+    operationalCredentialsremoveFabricCommandParams.put(
+        "fabricIndex", operationalCredentialsremoveFabricfabricIndexCommandParameterInfo);
 
-    InteractionInfo generalCommissioningarmFailSafeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralCommissioningCluster) cluster)
-                  .armFailSafe(
-                      (ChipClusters.GeneralCommissioningCluster.ArmFailSafeResponseCallback)
-                          callback,
-                      (Integer) commandArguments.get("expiryLengthSeconds"),
-                      (Long) commandArguments.get("breadcrumb"));
-            },
-            () -> new DelegatedArmFailSafeResponseCallback(),
-            generalCommissioningarmFailSafeCommandParams);
-    generalCommissioningClusterInteractionInfoMap.put(
-        "armFailSafe", generalCommissioningarmFailSafeInteractionInfo);
-    Map<String, CommandParameterInfo> generalCommissioningcommissioningCompleteCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo generalCommissioningcommissioningCompleteInteractionInfo =
+    InteractionInfo operationalCredentialsremoveFabricInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralCommissioningCluster) cluster)
-                  .commissioningComplete(
-                      (ChipClusters.GeneralCommissioningCluster
-                              .CommissioningCompleteResponseCallback)
-                          callback);
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
+                  .removeFabric(
+                      (ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback,
+                      (Integer) commandArguments.get("fabricIndex"));
             },
-            () -> new DelegatedCommissioningCompleteResponseCallback(),
-            generalCommissioningcommissioningCompleteCommandParams);
-    generalCommissioningClusterInteractionInfoMap.put(
-        "commissioningComplete", generalCommissioningcommissioningCompleteInteractionInfo);
-    Map<String, CommandParameterInfo> generalCommissioningsetRegulatoryConfigCommandParams =
+            () -> new DelegatedNOCResponseCallback(),
+            operationalCredentialsremoveFabricCommandParams);
+    operationalCredentialsClusterInteractionInfoMap.put(
+        "removeFabric", operationalCredentialsremoveFabricInteractionInfo);
+    Map<String, CommandParameterInfo> operationalCredentialsaddTrustedRootCertificateCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
-        generalCommissioningsetRegulatoryConfignewRegulatoryConfigCommandParameterInfo =
-            new CommandParameterInfo("newRegulatoryConfig", Integer.class, Integer.class);
-    generalCommissioningsetRegulatoryConfigCommandParams.put(
-        "newRegulatoryConfig",
-        generalCommissioningsetRegulatoryConfignewRegulatoryConfigCommandParameterInfo);
-
-    CommandParameterInfo generalCommissioningsetRegulatoryConfigcountryCodeCommandParameterInfo =
-        new CommandParameterInfo("countryCode", String.class, String.class);
-    generalCommissioningsetRegulatoryConfigCommandParams.put(
-        "countryCode", generalCommissioningsetRegulatoryConfigcountryCodeCommandParameterInfo);
-
-    CommandParameterInfo generalCommissioningsetRegulatoryConfigbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", Long.class, Long.class);
-    generalCommissioningsetRegulatoryConfigCommandParams.put(
-        "breadcrumb", generalCommissioningsetRegulatoryConfigbreadcrumbCommandParameterInfo);
+        operationalCredentialsaddTrustedRootCertificaterootCertificateCommandParameterInfo =
+            new CommandParameterInfo("rootCertificate", byte[].class, byte[].class);
+    operationalCredentialsaddTrustedRootCertificateCommandParams.put(
+        "rootCertificate",
+        operationalCredentialsaddTrustedRootCertificaterootCertificateCommandParameterInfo);
 
-    InteractionInfo generalCommissioningsetRegulatoryConfigInteractionInfo =
+    InteractionInfo operationalCredentialsaddTrustedRootCertificateInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralCommissioningCluster) cluster)
-                  .setRegulatoryConfig(
-                      (ChipClusters.GeneralCommissioningCluster.SetRegulatoryConfigResponseCallback)
-                          callback,
-                      (Integer) commandArguments.get("newRegulatoryConfig"),
-                      (String) commandArguments.get("countryCode"),
-                      (Long) commandArguments.get("breadcrumb"));
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
+                  .addTrustedRootCertificate(
+                      (DefaultClusterCallback) callback,
+                      (byte[]) commandArguments.get("rootCertificate"));
             },
-            () -> new DelegatedSetRegulatoryConfigResponseCallback(),
-            generalCommissioningsetRegulatoryConfigCommandParams);
-    generalCommissioningClusterInteractionInfoMap.put(
-        "setRegulatoryConfig", generalCommissioningsetRegulatoryConfigInteractionInfo);
-    commandMap.put("generalCommissioning", generalCommissioningClusterInteractionInfoMap);
-    Map<String, InteractionInfo> generalDiagnosticsClusterInteractionInfoMap =
+            () -> new DelegatedDefaultClusterCallback(),
+            operationalCredentialsaddTrustedRootCertificateCommandParams);
+    operationalCredentialsClusterInteractionInfoMap.put(
+        "addTrustedRootCertificate",
+        operationalCredentialsaddTrustedRootCertificateInteractionInfo);
+    commandMap.put("operationalCredentials", operationalCredentialsClusterInteractionInfoMap);
+    Map<String, InteractionInfo> groupKeyManagementClusterInteractionInfoMap =
         new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> generalDiagnosticstestEventTriggerCommandParams =
+    Map<String, CommandParameterInfo> groupKeyManagementkeySetWriteCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo generalDiagnosticstestEventTriggerenableKeyCommandParameterInfo =
-        new CommandParameterInfo("enableKey", byte[].class, byte[].class);
-    generalDiagnosticstestEventTriggerCommandParams.put(
-        "enableKey", generalDiagnosticstestEventTriggerenableKeyCommandParameterInfo);
-
-    CommandParameterInfo generalDiagnosticstestEventTriggereventTriggerCommandParameterInfo =
-        new CommandParameterInfo("eventTrigger", Long.class, Long.class);
-    generalDiagnosticstestEventTriggerCommandParams.put(
-        "eventTrigger", generalDiagnosticstestEventTriggereventTriggerCommandParameterInfo);
-
-    InteractionInfo generalDiagnosticstestEventTriggerInteractionInfo =
+    InteractionInfo groupKeyManagementkeySetWriteInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
-                  .testEventTrigger(
+              ((ChipClusters.GroupKeyManagementCluster) cluster)
+                  .keySetWrite(
                       (DefaultClusterCallback) callback,
-                      (byte[]) commandArguments.get("enableKey"),
-                      (Long) commandArguments.get("eventTrigger"));
+                      (ChipStructs.GroupKeyManagementClusterGroupKeySetStruct)
+                          commandArguments.get("groupKeySet"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            generalDiagnosticstestEventTriggerCommandParams);
-    generalDiagnosticsClusterInteractionInfoMap.put(
-        "testEventTrigger", generalDiagnosticstestEventTriggerInteractionInfo);
-    commandMap.put("generalDiagnostics", generalDiagnosticsClusterInteractionInfoMap);
-    Map<String, InteractionInfo> groupKeyManagementClusterInteractionInfoMap =
-        new LinkedHashMap<>();
+            groupKeyManagementkeySetWriteCommandParams);
+    groupKeyManagementClusterInteractionInfoMap.put(
+        "keySetWrite", groupKeyManagementkeySetWriteInteractionInfo);
     Map<String, CommandParameterInfo> groupKeyManagementkeySetReadCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo groupKeyManagementkeySetReadgroupKeySetIDCommandParameterInfo =
@@ -9718,6 +9391,25 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
             groupKeyManagementkeySetReadCommandParams);
     groupKeyManagementClusterInteractionInfoMap.put(
         "keySetRead", groupKeyManagementkeySetReadInteractionInfo);
+    Map<String, CommandParameterInfo> groupKeyManagementkeySetRemoveCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo groupKeyManagementkeySetRemovegroupKeySetIDCommandParameterInfo =
+        new CommandParameterInfo("groupKeySetID", Integer.class, Integer.class);
+    groupKeyManagementkeySetRemoveCommandParams.put(
+        "groupKeySetID", groupKeyManagementkeySetRemovegroupKeySetIDCommandParameterInfo);
+
+    InteractionInfo groupKeyManagementkeySetRemoveInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.GroupKeyManagementCluster) cluster)
+                  .keySetRemove(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("groupKeySetID"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            groupKeyManagementkeySetRemoveCommandParams);
+    groupKeyManagementClusterInteractionInfoMap.put(
+        "keySetRemove", groupKeyManagementkeySetRemoveInteractionInfo);
     Map<String, CommandParameterInfo> groupKeyManagementkeySetReadAllIndicesCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo groupKeyManagementkeySetReadAllIndicesgroupKeySetIDsCommandParameterInfo =
@@ -9738,1788 +9430,2161 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
             groupKeyManagementkeySetReadAllIndicesCommandParams);
     groupKeyManagementClusterInteractionInfoMap.put(
         "keySetReadAllIndices", groupKeyManagementkeySetReadAllIndicesInteractionInfo);
-    Map<String, CommandParameterInfo> groupKeyManagementkeySetRemoveCommandParams =
+    commandMap.put("groupKeyManagement", groupKeyManagementClusterInteractionInfoMap);
+    Map<String, InteractionInfo> fixedLabelClusterInteractionInfoMap = new LinkedHashMap<>();
+    commandMap.put("fixedLabel", fixedLabelClusterInteractionInfoMap);
+    Map<String, InteractionInfo> userLabelClusterInteractionInfoMap = new LinkedHashMap<>();
+    commandMap.put("userLabel", userLabelClusterInteractionInfoMap);
+    Map<String, InteractionInfo> booleanStateClusterInteractionInfoMap = new LinkedHashMap<>();
+    commandMap.put("booleanState", booleanStateClusterInteractionInfoMap);
+    Map<String, InteractionInfo> modeSelectClusterInteractionInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> modeSelectchangeToModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo groupKeyManagementkeySetRemovegroupKeySetIDCommandParameterInfo =
-        new CommandParameterInfo("groupKeySetID", Integer.class, Integer.class);
-    groupKeyManagementkeySetRemoveCommandParams.put(
-        "groupKeySetID", groupKeyManagementkeySetRemovegroupKeySetIDCommandParameterInfo);
+    CommandParameterInfo modeSelectchangeToModenewModeCommandParameterInfo =
+        new CommandParameterInfo("newMode", Integer.class, Integer.class);
+    modeSelectchangeToModeCommandParams.put(
+        "newMode", modeSelectchangeToModenewModeCommandParameterInfo);
 
-    InteractionInfo groupKeyManagementkeySetRemoveInteractionInfo =
+    InteractionInfo modeSelectchangeToModeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GroupKeyManagementCluster) cluster)
-                  .keySetRemove(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("groupKeySetID"));
+              ((ChipClusters.ModeSelectCluster) cluster)
+                  .changeToMode(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("newMode"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            groupKeyManagementkeySetRemoveCommandParams);
-    groupKeyManagementClusterInteractionInfoMap.put(
-        "keySetRemove", groupKeyManagementkeySetRemoveInteractionInfo);
-    Map<String, CommandParameterInfo> groupKeyManagementkeySetWriteCommandParams =
+            modeSelectchangeToModeCommandParams);
+    modeSelectClusterInteractionInfoMap.put("changeToMode", modeSelectchangeToModeInteractionInfo);
+    commandMap.put("modeSelect", modeSelectClusterInteractionInfoMap);
+    Map<String, InteractionInfo> doorLockClusterInteractionInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> doorLocklockDoorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo groupKeyManagementkeySetWriteInteractionInfo =
+    CommandParameterInfo doorLocklockDoorpinCodeCommandParameterInfo =
+        new CommandParameterInfo("pinCode", Optional.class, byte[].class);
+    doorLocklockDoorCommandParams.put("pinCode", doorLocklockDoorpinCodeCommandParameterInfo);
+
+    InteractionInfo doorLocklockDoorInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GroupKeyManagementCluster) cluster)
-                  .keySetWrite(
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .lockDoor(
                       (DefaultClusterCallback) callback,
-                      (ChipStructs.GroupKeyManagementClusterGroupKeySetStruct)
-                          commandArguments.get("groupKeySet"));
+                      (Optional<byte[]>) commandArguments.get("pinCode"),
+                      10000);
             },
             () -> new DelegatedDefaultClusterCallback(),
-            groupKeyManagementkeySetWriteCommandParams);
-    groupKeyManagementClusterInteractionInfoMap.put(
-        "keySetWrite", groupKeyManagementkeySetWriteInteractionInfo);
-    commandMap.put("groupKeyManagement", groupKeyManagementClusterInteractionInfoMap);
-    Map<String, InteractionInfo> groupsClusterInteractionInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> groupsaddGroupCommandParams =
+            doorLocklockDoorCommandParams);
+    doorLockClusterInteractionInfoMap.put("lockDoor", doorLocklockDoorInteractionInfo);
+    Map<String, CommandParameterInfo> doorLockunlockDoorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo groupsaddGroupgroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class, Integer.class);
-    groupsaddGroupCommandParams.put("groupId", groupsaddGroupgroupIdCommandParameterInfo);
-
-    CommandParameterInfo groupsaddGroupgroupNameCommandParameterInfo =
-        new CommandParameterInfo("groupName", String.class, String.class);
-    groupsaddGroupCommandParams.put("groupName", groupsaddGroupgroupNameCommandParameterInfo);
+    CommandParameterInfo doorLockunlockDoorpinCodeCommandParameterInfo =
+        new CommandParameterInfo("pinCode", Optional.class, byte[].class);
+    doorLockunlockDoorCommandParams.put("pinCode", doorLockunlockDoorpinCodeCommandParameterInfo);
 
-    InteractionInfo groupsaddGroupInteractionInfo =
+    InteractionInfo doorLockunlockDoorInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GroupsCluster) cluster)
-                  .addGroup(
-                      (ChipClusters.GroupsCluster.AddGroupResponseCallback) callback,
-                      (Integer) commandArguments.get("groupId"),
-                      (String) commandArguments.get("groupName"));
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .unlockDoor(
+                      (DefaultClusterCallback) callback,
+                      (Optional<byte[]>) commandArguments.get("pinCode"),
+                      10000);
             },
-            () -> new DelegatedAddGroupResponseCallback(),
-            groupsaddGroupCommandParams);
-    groupsClusterInteractionInfoMap.put("addGroup", groupsaddGroupInteractionInfo);
-    Map<String, CommandParameterInfo> groupsaddGroupIfIdentifyingCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            doorLockunlockDoorCommandParams);
+    doorLockClusterInteractionInfoMap.put("unlockDoor", doorLockunlockDoorInteractionInfo);
+    Map<String, CommandParameterInfo> doorLockunlockWithTimeoutCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo groupsaddGroupIfIdentifyinggroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class, Integer.class);
-    groupsaddGroupIfIdentifyingCommandParams.put(
-        "groupId", groupsaddGroupIfIdentifyinggroupIdCommandParameterInfo);
+    CommandParameterInfo doorLockunlockWithTimeouttimeoutCommandParameterInfo =
+        new CommandParameterInfo("timeout", Integer.class, Integer.class);
+    doorLockunlockWithTimeoutCommandParams.put(
+        "timeout", doorLockunlockWithTimeouttimeoutCommandParameterInfo);
 
-    CommandParameterInfo groupsaddGroupIfIdentifyinggroupNameCommandParameterInfo =
-        new CommandParameterInfo("groupName", String.class, String.class);
-    groupsaddGroupIfIdentifyingCommandParams.put(
-        "groupName", groupsaddGroupIfIdentifyinggroupNameCommandParameterInfo);
+    CommandParameterInfo doorLockunlockWithTimeoutpinCodeCommandParameterInfo =
+        new CommandParameterInfo("pinCode", Optional.class, byte[].class);
+    doorLockunlockWithTimeoutCommandParams.put(
+        "pinCode", doorLockunlockWithTimeoutpinCodeCommandParameterInfo);
 
-    InteractionInfo groupsaddGroupIfIdentifyingInteractionInfo =
+    InteractionInfo doorLockunlockWithTimeoutInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GroupsCluster) cluster)
-                  .addGroupIfIdentifying(
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .unlockWithTimeout(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("groupId"),
-                      (String) commandArguments.get("groupName"));
+                      (Integer) commandArguments.get("timeout"),
+                      (Optional<byte[]>) commandArguments.get("pinCode"),
+                      10000);
             },
             () -> new DelegatedDefaultClusterCallback(),
-            groupsaddGroupIfIdentifyingCommandParams);
-    groupsClusterInteractionInfoMap.put(
-        "addGroupIfIdentifying", groupsaddGroupIfIdentifyingInteractionInfo);
-    Map<String, CommandParameterInfo> groupsgetGroupMembershipCommandParams =
+            doorLockunlockWithTimeoutCommandParams);
+    doorLockClusterInteractionInfoMap.put(
+        "unlockWithTimeout", doorLockunlockWithTimeoutInteractionInfo);
+    Map<String, CommandParameterInfo> doorLocksetWeekDayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo groupsgetGroupMembershipgroupListCommandParameterInfo =
-        new CommandParameterInfo("groupList", ArrayList.class, Object.class);
-    groupsgetGroupMembershipCommandParams.put(
-        "groupList", groupsgetGroupMembershipgroupListCommandParameterInfo);
+    CommandParameterInfo doorLocksetWeekDayScheduleweekDayIndexCommandParameterInfo =
+        new CommandParameterInfo("weekDayIndex", Integer.class, Integer.class);
+    doorLocksetWeekDayScheduleCommandParams.put(
+        "weekDayIndex", doorLocksetWeekDayScheduleweekDayIndexCommandParameterInfo);
 
-    InteractionInfo groupsgetGroupMembershipInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GroupsCluster) cluster)
-                  .getGroupMembership(
-                      (ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback) callback,
-                      (ArrayList<Integer>) commandArguments.get("groupList"));
-            },
-            () -> new DelegatedGetGroupMembershipResponseCallback(),
-            groupsgetGroupMembershipCommandParams);
-    groupsClusterInteractionInfoMap.put(
-        "getGroupMembership", groupsgetGroupMembershipInteractionInfo);
-    Map<String, CommandParameterInfo> groupsremoveAllGroupsCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo groupsremoveAllGroupsInteractionInfo =
+    CommandParameterInfo doorLocksetWeekDayScheduleuserIndexCommandParameterInfo =
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
+    doorLocksetWeekDayScheduleCommandParams.put(
+        "userIndex", doorLocksetWeekDayScheduleuserIndexCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetWeekDayScheduledaysMaskCommandParameterInfo =
+        new CommandParameterInfo("daysMask", Integer.class, Integer.class);
+    doorLocksetWeekDayScheduleCommandParams.put(
+        "daysMask", doorLocksetWeekDayScheduledaysMaskCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetWeekDaySchedulestartHourCommandParameterInfo =
+        new CommandParameterInfo("startHour", Integer.class, Integer.class);
+    doorLocksetWeekDayScheduleCommandParams.put(
+        "startHour", doorLocksetWeekDaySchedulestartHourCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetWeekDaySchedulestartMinuteCommandParameterInfo =
+        new CommandParameterInfo("startMinute", Integer.class, Integer.class);
+    doorLocksetWeekDayScheduleCommandParams.put(
+        "startMinute", doorLocksetWeekDaySchedulestartMinuteCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetWeekDayScheduleendHourCommandParameterInfo =
+        new CommandParameterInfo("endHour", Integer.class, Integer.class);
+    doorLocksetWeekDayScheduleCommandParams.put(
+        "endHour", doorLocksetWeekDayScheduleendHourCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetWeekDayScheduleendMinuteCommandParameterInfo =
+        new CommandParameterInfo("endMinute", Integer.class, Integer.class);
+    doorLocksetWeekDayScheduleCommandParams.put(
+        "endMinute", doorLocksetWeekDayScheduleendMinuteCommandParameterInfo);
+
+    InteractionInfo doorLocksetWeekDayScheduleInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GroupsCluster) cluster)
-                  .removeAllGroups((DefaultClusterCallback) callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .setWeekDaySchedule(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("weekDayIndex"),
+                      (Integer) commandArguments.get("userIndex"),
+                      (Integer) commandArguments.get("daysMask"),
+                      (Integer) commandArguments.get("startHour"),
+                      (Integer) commandArguments.get("startMinute"),
+                      (Integer) commandArguments.get("endHour"),
+                      (Integer) commandArguments.get("endMinute"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            groupsremoveAllGroupsCommandParams);
-    groupsClusterInteractionInfoMap.put("removeAllGroups", groupsremoveAllGroupsInteractionInfo);
-    Map<String, CommandParameterInfo> groupsremoveGroupCommandParams =
+            doorLocksetWeekDayScheduleCommandParams);
+    doorLockClusterInteractionInfoMap.put(
+        "setWeekDaySchedule", doorLocksetWeekDayScheduleInteractionInfo);
+    Map<String, CommandParameterInfo> doorLockgetWeekDayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo groupsremoveGroupgroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class, Integer.class);
-    groupsremoveGroupCommandParams.put("groupId", groupsremoveGroupgroupIdCommandParameterInfo);
+    CommandParameterInfo doorLockgetWeekDayScheduleweekDayIndexCommandParameterInfo =
+        new CommandParameterInfo("weekDayIndex", Integer.class, Integer.class);
+    doorLockgetWeekDayScheduleCommandParams.put(
+        "weekDayIndex", doorLockgetWeekDayScheduleweekDayIndexCommandParameterInfo);
 
-    InteractionInfo groupsremoveGroupInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GroupsCluster) cluster)
-                  .removeGroup(
-                      (ChipClusters.GroupsCluster.RemoveGroupResponseCallback) callback,
-                      (Integer) commandArguments.get("groupId"));
-            },
-            () -> new DelegatedRemoveGroupResponseCallback(),
-            groupsremoveGroupCommandParams);
-    groupsClusterInteractionInfoMap.put("removeGroup", groupsremoveGroupInteractionInfo);
-    Map<String, CommandParameterInfo> groupsviewGroupCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo groupsviewGroupgroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class, Integer.class);
-    groupsviewGroupCommandParams.put("groupId", groupsviewGroupgroupIdCommandParameterInfo);
+    CommandParameterInfo doorLockgetWeekDayScheduleuserIndexCommandParameterInfo =
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
+    doorLockgetWeekDayScheduleCommandParams.put(
+        "userIndex", doorLockgetWeekDayScheduleuserIndexCommandParameterInfo);
 
-    InteractionInfo groupsviewGroupInteractionInfo =
+    InteractionInfo doorLockgetWeekDayScheduleInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GroupsCluster) cluster)
-                  .viewGroup(
-                      (ChipClusters.GroupsCluster.ViewGroupResponseCallback) callback,
-                      (Integer) commandArguments.get("groupId"));
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .getWeekDaySchedule(
+                      (ChipClusters.DoorLockCluster.GetWeekDayScheduleResponseCallback) callback,
+                      (Integer) commandArguments.get("weekDayIndex"),
+                      (Integer) commandArguments.get("userIndex"));
             },
-            () -> new DelegatedViewGroupResponseCallback(),
-            groupsviewGroupCommandParams);
-    groupsClusterInteractionInfoMap.put("viewGroup", groupsviewGroupInteractionInfo);
-    commandMap.put("groups", groupsClusterInteractionInfoMap);
-    Map<String, InteractionInfo> identifyClusterInteractionInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> identifyidentifyCommandParams =
+            () -> new DelegatedGetWeekDayScheduleResponseCallback(),
+            doorLockgetWeekDayScheduleCommandParams);
+    doorLockClusterInteractionInfoMap.put(
+        "getWeekDaySchedule", doorLockgetWeekDayScheduleInteractionInfo);
+    Map<String, CommandParameterInfo> doorLockclearWeekDayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo identifyidentifyidentifyTimeCommandParameterInfo =
-        new CommandParameterInfo("identifyTime", Integer.class, Integer.class);
-    identifyidentifyCommandParams.put(
-        "identifyTime", identifyidentifyidentifyTimeCommandParameterInfo);
+    CommandParameterInfo doorLockclearWeekDayScheduleweekDayIndexCommandParameterInfo =
+        new CommandParameterInfo("weekDayIndex", Integer.class, Integer.class);
+    doorLockclearWeekDayScheduleCommandParams.put(
+        "weekDayIndex", doorLockclearWeekDayScheduleweekDayIndexCommandParameterInfo);
 
-    InteractionInfo identifyidentifyInteractionInfo =
+    CommandParameterInfo doorLockclearWeekDayScheduleuserIndexCommandParameterInfo =
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
+    doorLockclearWeekDayScheduleCommandParams.put(
+        "userIndex", doorLockclearWeekDayScheduleuserIndexCommandParameterInfo);
+
+    InteractionInfo doorLockclearWeekDayScheduleInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.IdentifyCluster) cluster)
-                  .identify(
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .clearWeekDaySchedule(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("identifyTime"));
+                      (Integer) commandArguments.get("weekDayIndex"),
+                      (Integer) commandArguments.get("userIndex"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            identifyidentifyCommandParams);
-    identifyClusterInteractionInfoMap.put("identify", identifyidentifyInteractionInfo);
-    Map<String, CommandParameterInfo> identifytriggerEffectCommandParams =
+            doorLockclearWeekDayScheduleCommandParams);
+    doorLockClusterInteractionInfoMap.put(
+        "clearWeekDaySchedule", doorLockclearWeekDayScheduleInteractionInfo);
+    Map<String, CommandParameterInfo> doorLocksetYearDayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo identifytriggerEffecteffectIdentifierCommandParameterInfo =
-        new CommandParameterInfo("effectIdentifier", Integer.class, Integer.class);
-    identifytriggerEffectCommandParams.put(
-        "effectIdentifier", identifytriggerEffecteffectIdentifierCommandParameterInfo);
+    CommandParameterInfo doorLocksetYearDayScheduleyearDayIndexCommandParameterInfo =
+        new CommandParameterInfo("yearDayIndex", Integer.class, Integer.class);
+    doorLocksetYearDayScheduleCommandParams.put(
+        "yearDayIndex", doorLocksetYearDayScheduleyearDayIndexCommandParameterInfo);
 
-    CommandParameterInfo identifytriggerEffecteffectVariantCommandParameterInfo =
-        new CommandParameterInfo("effectVariant", Integer.class, Integer.class);
-    identifytriggerEffectCommandParams.put(
-        "effectVariant", identifytriggerEffecteffectVariantCommandParameterInfo);
+    CommandParameterInfo doorLocksetYearDayScheduleuserIndexCommandParameterInfo =
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
+    doorLocksetYearDayScheduleCommandParams.put(
+        "userIndex", doorLocksetYearDayScheduleuserIndexCommandParameterInfo);
 
-    InteractionInfo identifytriggerEffectInteractionInfo =
+    CommandParameterInfo doorLocksetYearDaySchedulelocalStartTimeCommandParameterInfo =
+        new CommandParameterInfo("localStartTime", Long.class, Long.class);
+    doorLocksetYearDayScheduleCommandParams.put(
+        "localStartTime", doorLocksetYearDaySchedulelocalStartTimeCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetYearDaySchedulelocalEndTimeCommandParameterInfo =
+        new CommandParameterInfo("localEndTime", Long.class, Long.class);
+    doorLocksetYearDayScheduleCommandParams.put(
+        "localEndTime", doorLocksetYearDaySchedulelocalEndTimeCommandParameterInfo);
+
+    InteractionInfo doorLocksetYearDayScheduleInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.IdentifyCluster) cluster)
-                  .triggerEffect(
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .setYearDaySchedule(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("effectIdentifier"),
-                      (Integer) commandArguments.get("effectVariant"));
+                      (Integer) commandArguments.get("yearDayIndex"),
+                      (Integer) commandArguments.get("userIndex"),
+                      (Long) commandArguments.get("localStartTime"),
+                      (Long) commandArguments.get("localEndTime"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            identifytriggerEffectCommandParams);
-    identifyClusterInteractionInfoMap.put("triggerEffect", identifytriggerEffectInteractionInfo);
-    commandMap.put("identify", identifyClusterInteractionInfoMap);
-    Map<String, InteractionInfo> illuminanceMeasurementClusterInteractionInfoMap =
-        new LinkedHashMap<>();
-    commandMap.put("illuminanceMeasurement", illuminanceMeasurementClusterInteractionInfoMap);
-    Map<String, InteractionInfo> keypadInputClusterInteractionInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> keypadInputsendKeyCommandParams =
+            doorLocksetYearDayScheduleCommandParams);
+    doorLockClusterInteractionInfoMap.put(
+        "setYearDaySchedule", doorLocksetYearDayScheduleInteractionInfo);
+    Map<String, CommandParameterInfo> doorLockgetYearDayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo keypadInputsendKeykeyCodeCommandParameterInfo =
-        new CommandParameterInfo("keyCode", Integer.class, Integer.class);
-    keypadInputsendKeyCommandParams.put("keyCode", keypadInputsendKeykeyCodeCommandParameterInfo);
+    CommandParameterInfo doorLockgetYearDayScheduleyearDayIndexCommandParameterInfo =
+        new CommandParameterInfo("yearDayIndex", Integer.class, Integer.class);
+    doorLockgetYearDayScheduleCommandParams.put(
+        "yearDayIndex", doorLockgetYearDayScheduleyearDayIndexCommandParameterInfo);
 
-    InteractionInfo keypadInputsendKeyInteractionInfo =
+    CommandParameterInfo doorLockgetYearDayScheduleuserIndexCommandParameterInfo =
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
+    doorLockgetYearDayScheduleCommandParams.put(
+        "userIndex", doorLockgetYearDayScheduleuserIndexCommandParameterInfo);
+
+    InteractionInfo doorLockgetYearDayScheduleInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.KeypadInputCluster) cluster)
-                  .sendKey(
-                      (ChipClusters.KeypadInputCluster.SendKeyResponseCallback) callback,
-                      (Integer) commandArguments.get("keyCode"));
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .getYearDaySchedule(
+                      (ChipClusters.DoorLockCluster.GetYearDayScheduleResponseCallback) callback,
+                      (Integer) commandArguments.get("yearDayIndex"),
+                      (Integer) commandArguments.get("userIndex"));
             },
-            () -> new DelegatedSendKeyResponseCallback(),
-            keypadInputsendKeyCommandParams);
-    keypadInputClusterInteractionInfoMap.put("sendKey", keypadInputsendKeyInteractionInfo);
-    commandMap.put("keypadInput", keypadInputClusterInteractionInfoMap);
-    Map<String, InteractionInfo> levelControlClusterInteractionInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> levelControlmoveCommandParams =
+            () -> new DelegatedGetYearDayScheduleResponseCallback(),
+            doorLockgetYearDayScheduleCommandParams);
+    doorLockClusterInteractionInfoMap.put(
+        "getYearDaySchedule", doorLockgetYearDayScheduleInteractionInfo);
+    Map<String, CommandParameterInfo> doorLockclearYearDayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo levelControlmovemoveModeCommandParameterInfo =
-        new CommandParameterInfo("moveMode", Integer.class, Integer.class);
-    levelControlmoveCommandParams.put("moveMode", levelControlmovemoveModeCommandParameterInfo);
-
-    CommandParameterInfo levelControlmoverateCommandParameterInfo =
-        new CommandParameterInfo("rate", Integer.class, Integer.class);
-    levelControlmoveCommandParams.put("rate", levelControlmoverateCommandParameterInfo);
-
-    CommandParameterInfo levelControlmoveoptionMaskCommandParameterInfo =
-        new CommandParameterInfo("optionMask", Integer.class, Integer.class);
-    levelControlmoveCommandParams.put("optionMask", levelControlmoveoptionMaskCommandParameterInfo);
+    CommandParameterInfo doorLockclearYearDayScheduleyearDayIndexCommandParameterInfo =
+        new CommandParameterInfo("yearDayIndex", Integer.class, Integer.class);
+    doorLockclearYearDayScheduleCommandParams.put(
+        "yearDayIndex", doorLockclearYearDayScheduleyearDayIndexCommandParameterInfo);
 
-    CommandParameterInfo levelControlmoveoptionOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionOverride", Integer.class, Integer.class);
-    levelControlmoveCommandParams.put(
-        "optionOverride", levelControlmoveoptionOverrideCommandParameterInfo);
+    CommandParameterInfo doorLockclearYearDayScheduleuserIndexCommandParameterInfo =
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
+    doorLockclearYearDayScheduleCommandParams.put(
+        "userIndex", doorLockclearYearDayScheduleuserIndexCommandParameterInfo);
 
-    InteractionInfo levelControlmoveInteractionInfo =
+    InteractionInfo doorLockclearYearDayScheduleInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .move(
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .clearYearDaySchedule(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("moveMode"),
-                      (Integer) commandArguments.get("rate"),
-                      (Integer) commandArguments.get("optionMask"),
-                      (Integer) commandArguments.get("optionOverride"));
+                      (Integer) commandArguments.get("yearDayIndex"),
+                      (Integer) commandArguments.get("userIndex"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            levelControlmoveCommandParams);
-    levelControlClusterInteractionInfoMap.put("move", levelControlmoveInteractionInfo);
-    Map<String, CommandParameterInfo> levelControlmoveToLevelCommandParams =
+            doorLockclearYearDayScheduleCommandParams);
+    doorLockClusterInteractionInfoMap.put(
+        "clearYearDaySchedule", doorLockclearYearDayScheduleInteractionInfo);
+    Map<String, CommandParameterInfo> doorLocksetHolidayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo levelControlmoveToLevellevelCommandParameterInfo =
-        new CommandParameterInfo("level", Integer.class, Integer.class);
-    levelControlmoveToLevelCommandParams.put(
-        "level", levelControlmoveToLevellevelCommandParameterInfo);
+    CommandParameterInfo doorLocksetHolidayScheduleholidayIndexCommandParameterInfo =
+        new CommandParameterInfo("holidayIndex", Integer.class, Integer.class);
+    doorLocksetHolidayScheduleCommandParams.put(
+        "holidayIndex", doorLocksetHolidayScheduleholidayIndexCommandParameterInfo);
 
-    CommandParameterInfo levelControlmoveToLeveltransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-    levelControlmoveToLevelCommandParams.put(
-        "transitionTime", levelControlmoveToLeveltransitionTimeCommandParameterInfo);
+    CommandParameterInfo doorLocksetHolidaySchedulelocalStartTimeCommandParameterInfo =
+        new CommandParameterInfo("localStartTime", Long.class, Long.class);
+    doorLocksetHolidayScheduleCommandParams.put(
+        "localStartTime", doorLocksetHolidaySchedulelocalStartTimeCommandParameterInfo);
 
-    CommandParameterInfo levelControlmoveToLeveloptionMaskCommandParameterInfo =
-        new CommandParameterInfo("optionMask", Integer.class, Integer.class);
-    levelControlmoveToLevelCommandParams.put(
-        "optionMask", levelControlmoveToLeveloptionMaskCommandParameterInfo);
+    CommandParameterInfo doorLocksetHolidaySchedulelocalEndTimeCommandParameterInfo =
+        new CommandParameterInfo("localEndTime", Long.class, Long.class);
+    doorLocksetHolidayScheduleCommandParams.put(
+        "localEndTime", doorLocksetHolidaySchedulelocalEndTimeCommandParameterInfo);
 
-    CommandParameterInfo levelControlmoveToLeveloptionOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionOverride", Integer.class, Integer.class);
-    levelControlmoveToLevelCommandParams.put(
-        "optionOverride", levelControlmoveToLeveloptionOverrideCommandParameterInfo);
+    CommandParameterInfo doorLocksetHolidayScheduleoperatingModeCommandParameterInfo =
+        new CommandParameterInfo("operatingMode", Integer.class, Integer.class);
+    doorLocksetHolidayScheduleCommandParams.put(
+        "operatingMode", doorLocksetHolidayScheduleoperatingModeCommandParameterInfo);
 
-    InteractionInfo levelControlmoveToLevelInteractionInfo =
+    InteractionInfo doorLocksetHolidayScheduleInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .moveToLevel(
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .setHolidaySchedule(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("level"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionMask"),
-                      (Integer) commandArguments.get("optionOverride"));
+                      (Integer) commandArguments.get("holidayIndex"),
+                      (Long) commandArguments.get("localStartTime"),
+                      (Long) commandArguments.get("localEndTime"),
+                      (Integer) commandArguments.get("operatingMode"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            levelControlmoveToLevelCommandParams);
-    levelControlClusterInteractionInfoMap.put(
-        "moveToLevel", levelControlmoveToLevelInteractionInfo);
-    Map<String, CommandParameterInfo> levelControlmoveToLevelWithOnOffCommandParams =
+            doorLocksetHolidayScheduleCommandParams);
+    doorLockClusterInteractionInfoMap.put(
+        "setHolidaySchedule", doorLocksetHolidayScheduleInteractionInfo);
+    Map<String, CommandParameterInfo> doorLockgetHolidayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo levelControlmoveToLevelWithOnOfflevelCommandParameterInfo =
-        new CommandParameterInfo("level", Integer.class, Integer.class);
-    levelControlmoveToLevelWithOnOffCommandParams.put(
-        "level", levelControlmoveToLevelWithOnOfflevelCommandParameterInfo);
-
-    CommandParameterInfo levelControlmoveToLevelWithOnOfftransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-    levelControlmoveToLevelWithOnOffCommandParams.put(
-        "transitionTime", levelControlmoveToLevelWithOnOfftransitionTimeCommandParameterInfo);
+    CommandParameterInfo doorLockgetHolidayScheduleholidayIndexCommandParameterInfo =
+        new CommandParameterInfo("holidayIndex", Integer.class, Integer.class);
+    doorLockgetHolidayScheduleCommandParams.put(
+        "holidayIndex", doorLockgetHolidayScheduleholidayIndexCommandParameterInfo);
 
-    InteractionInfo levelControlmoveToLevelWithOnOffInteractionInfo =
+    InteractionInfo doorLockgetHolidayScheduleInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .moveToLevelWithOnOff(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("level"),
-                      (Integer) commandArguments.get("transitionTime"));
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .getHolidaySchedule(
+                      (ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback) callback,
+                      (Integer) commandArguments.get("holidayIndex"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            levelControlmoveToLevelWithOnOffCommandParams);
-    levelControlClusterInteractionInfoMap.put(
-        "moveToLevelWithOnOff", levelControlmoveToLevelWithOnOffInteractionInfo);
-    Map<String, CommandParameterInfo> levelControlmoveWithOnOffCommandParams =
+            () -> new DelegatedGetHolidayScheduleResponseCallback(),
+            doorLockgetHolidayScheduleCommandParams);
+    doorLockClusterInteractionInfoMap.put(
+        "getHolidaySchedule", doorLockgetHolidayScheduleInteractionInfo);
+    Map<String, CommandParameterInfo> doorLockclearHolidayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo levelControlmoveWithOnOffmoveModeCommandParameterInfo =
-        new CommandParameterInfo("moveMode", Integer.class, Integer.class);
-    levelControlmoveWithOnOffCommandParams.put(
-        "moveMode", levelControlmoveWithOnOffmoveModeCommandParameterInfo);
-
-    CommandParameterInfo levelControlmoveWithOnOffrateCommandParameterInfo =
-        new CommandParameterInfo("rate", Integer.class, Integer.class);
-    levelControlmoveWithOnOffCommandParams.put(
-        "rate", levelControlmoveWithOnOffrateCommandParameterInfo);
+    CommandParameterInfo doorLockclearHolidayScheduleholidayIndexCommandParameterInfo =
+        new CommandParameterInfo("holidayIndex", Integer.class, Integer.class);
+    doorLockclearHolidayScheduleCommandParams.put(
+        "holidayIndex", doorLockclearHolidayScheduleholidayIndexCommandParameterInfo);
 
-    InteractionInfo levelControlmoveWithOnOffInteractionInfo =
+    InteractionInfo doorLockclearHolidayScheduleInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .moveWithOnOff(
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .clearHolidaySchedule(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("moveMode"),
-                      (Integer) commandArguments.get("rate"));
+                      (Integer) commandArguments.get("holidayIndex"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            levelControlmoveWithOnOffCommandParams);
-    levelControlClusterInteractionInfoMap.put(
-        "moveWithOnOff", levelControlmoveWithOnOffInteractionInfo);
-    Map<String, CommandParameterInfo> levelControlstepCommandParams =
+            doorLockclearHolidayScheduleCommandParams);
+    doorLockClusterInteractionInfoMap.put(
+        "clearHolidaySchedule", doorLockclearHolidayScheduleInteractionInfo);
+    Map<String, CommandParameterInfo> doorLocksetUserCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo levelControlstepstepModeCommandParameterInfo =
-        new CommandParameterInfo("stepMode", Integer.class, Integer.class);
-    levelControlstepCommandParams.put("stepMode", levelControlstepstepModeCommandParameterInfo);
+    CommandParameterInfo doorLocksetUseroperationTypeCommandParameterInfo =
+        new CommandParameterInfo("operationType", Integer.class, Integer.class);
+    doorLocksetUserCommandParams.put(
+        "operationType", doorLocksetUseroperationTypeCommandParameterInfo);
 
-    CommandParameterInfo levelControlstepstepSizeCommandParameterInfo =
-        new CommandParameterInfo("stepSize", Integer.class, Integer.class);
-    levelControlstepCommandParams.put("stepSize", levelControlstepstepSizeCommandParameterInfo);
+    CommandParameterInfo doorLocksetUseruserIndexCommandParameterInfo =
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
+    doorLocksetUserCommandParams.put("userIndex", doorLocksetUseruserIndexCommandParameterInfo);
 
-    CommandParameterInfo levelControlsteptransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-    levelControlstepCommandParams.put(
-        "transitionTime", levelControlsteptransitionTimeCommandParameterInfo);
+    CommandParameterInfo doorLocksetUseruserNameCommandParameterInfo =
+        new CommandParameterInfo("userName", String.class, String.class);
+    doorLocksetUserCommandParams.put("userName", doorLocksetUseruserNameCommandParameterInfo);
 
-    CommandParameterInfo levelControlstepoptionMaskCommandParameterInfo =
-        new CommandParameterInfo("optionMask", Integer.class, Integer.class);
-    levelControlstepCommandParams.put("optionMask", levelControlstepoptionMaskCommandParameterInfo);
+    CommandParameterInfo doorLocksetUseruserUniqueIdCommandParameterInfo =
+        new CommandParameterInfo("userUniqueId", Long.class, Long.class);
+    doorLocksetUserCommandParams.put(
+        "userUniqueId", doorLocksetUseruserUniqueIdCommandParameterInfo);
 
-    CommandParameterInfo levelControlstepoptionOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionOverride", Integer.class, Integer.class);
-    levelControlstepCommandParams.put(
-        "optionOverride", levelControlstepoptionOverrideCommandParameterInfo);
+    CommandParameterInfo doorLocksetUseruserStatusCommandParameterInfo =
+        new CommandParameterInfo("userStatus", Integer.class, Integer.class);
+    doorLocksetUserCommandParams.put("userStatus", doorLocksetUseruserStatusCommandParameterInfo);
 
-    InteractionInfo levelControlstepInteractionInfo =
+    CommandParameterInfo doorLocksetUseruserTypeCommandParameterInfo =
+        new CommandParameterInfo("userType", Integer.class, Integer.class);
+    doorLocksetUserCommandParams.put("userType", doorLocksetUseruserTypeCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetUsercredentialRuleCommandParameterInfo =
+        new CommandParameterInfo("credentialRule", Integer.class, Integer.class);
+    doorLocksetUserCommandParams.put(
+        "credentialRule", doorLocksetUsercredentialRuleCommandParameterInfo);
+
+    InteractionInfo doorLocksetUserInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .step(
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .setUser(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("stepMode"),
-                      (Integer) commandArguments.get("stepSize"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionMask"),
-                      (Integer) commandArguments.get("optionOverride"));
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            levelControlstepCommandParams);
-    levelControlClusterInteractionInfoMap.put("step", levelControlstepInteractionInfo);
-    Map<String, CommandParameterInfo> levelControlstepWithOnOffCommandParams =
+                      (Integer) commandArguments.get("operationType"),
+                      (Integer) commandArguments.get("userIndex"),
+                      (String) commandArguments.get("userName"),
+                      (Long) commandArguments.get("userUniqueId"),
+                      (Integer) commandArguments.get("userStatus"),
+                      (Integer) commandArguments.get("userType"),
+                      (Integer) commandArguments.get("credentialRule"),
+                      10000);
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            doorLocksetUserCommandParams);
+    doorLockClusterInteractionInfoMap.put("setUser", doorLocksetUserInteractionInfo);
+    Map<String, CommandParameterInfo> doorLockgetUserCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo levelControlstepWithOnOffstepModeCommandParameterInfo =
-        new CommandParameterInfo("stepMode", Integer.class, Integer.class);
-    levelControlstepWithOnOffCommandParams.put(
-        "stepMode", levelControlstepWithOnOffstepModeCommandParameterInfo);
-
-    CommandParameterInfo levelControlstepWithOnOffstepSizeCommandParameterInfo =
-        new CommandParameterInfo("stepSize", Integer.class, Integer.class);
-    levelControlstepWithOnOffCommandParams.put(
-        "stepSize", levelControlstepWithOnOffstepSizeCommandParameterInfo);
+    CommandParameterInfo doorLockgetUseruserIndexCommandParameterInfo =
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
+    doorLockgetUserCommandParams.put("userIndex", doorLockgetUseruserIndexCommandParameterInfo);
 
-    CommandParameterInfo levelControlstepWithOnOfftransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-    levelControlstepWithOnOffCommandParams.put(
-        "transitionTime", levelControlstepWithOnOfftransitionTimeCommandParameterInfo);
+    InteractionInfo doorLockgetUserInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .getUser(
+                      (ChipClusters.DoorLockCluster.GetUserResponseCallback) callback,
+                      (Integer) commandArguments.get("userIndex"));
+            },
+            () -> new DelegatedGetUserResponseCallback(),
+            doorLockgetUserCommandParams);
+    doorLockClusterInteractionInfoMap.put("getUser", doorLockgetUserInteractionInfo);
+    Map<String, CommandParameterInfo> doorLockclearUserCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo doorLockclearUseruserIndexCommandParameterInfo =
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
+    doorLockclearUserCommandParams.put("userIndex", doorLockclearUseruserIndexCommandParameterInfo);
 
-    InteractionInfo levelControlstepWithOnOffInteractionInfo =
+    InteractionInfo doorLockclearUserInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .stepWithOnOff(
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .clearUser(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("stepMode"),
-                      (Integer) commandArguments.get("stepSize"),
-                      (Integer) commandArguments.get("transitionTime"));
+                      (Integer) commandArguments.get("userIndex"),
+                      10000);
             },
             () -> new DelegatedDefaultClusterCallback(),
-            levelControlstepWithOnOffCommandParams);
-    levelControlClusterInteractionInfoMap.put(
-        "stepWithOnOff", levelControlstepWithOnOffInteractionInfo);
-    Map<String, CommandParameterInfo> levelControlstopCommandParams =
+            doorLockclearUserCommandParams);
+    doorLockClusterInteractionInfoMap.put("clearUser", doorLockclearUserInteractionInfo);
+    Map<String, CommandParameterInfo> doorLocksetCredentialCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo levelControlstopoptionMaskCommandParameterInfo =
-        new CommandParameterInfo("optionMask", Integer.class, Integer.class);
-    levelControlstopCommandParams.put("optionMask", levelControlstopoptionMaskCommandParameterInfo);
+    CommandParameterInfo doorLocksetCredentialoperationTypeCommandParameterInfo =
+        new CommandParameterInfo("operationType", Integer.class, Integer.class);
+    doorLocksetCredentialCommandParams.put(
+        "operationType", doorLocksetCredentialoperationTypeCommandParameterInfo);
 
-    CommandParameterInfo levelControlstopoptionOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionOverride", Integer.class, Integer.class);
-    levelControlstopCommandParams.put(
-        "optionOverride", levelControlstopoptionOverrideCommandParameterInfo);
+    CommandParameterInfo doorLocksetCredentialcredentialDataCommandParameterInfo =
+        new CommandParameterInfo("credentialData", byte[].class, byte[].class);
+    doorLocksetCredentialCommandParams.put(
+        "credentialData", doorLocksetCredentialcredentialDataCommandParameterInfo);
 
-    InteractionInfo levelControlstopInteractionInfo =
+    CommandParameterInfo doorLocksetCredentialuserIndexCommandParameterInfo =
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
+    doorLocksetCredentialCommandParams.put(
+        "userIndex", doorLocksetCredentialuserIndexCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetCredentialuserStatusCommandParameterInfo =
+        new CommandParameterInfo("userStatus", Integer.class, Integer.class);
+    doorLocksetCredentialCommandParams.put(
+        "userStatus", doorLocksetCredentialuserStatusCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetCredentialuserTypeCommandParameterInfo =
+        new CommandParameterInfo("userType", Integer.class, Integer.class);
+    doorLocksetCredentialCommandParams.put(
+        "userType", doorLocksetCredentialuserTypeCommandParameterInfo);
+
+    InteractionInfo doorLocksetCredentialInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .stop(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("optionMask"),
-                      (Integer) commandArguments.get("optionOverride"));
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .setCredential(
+                      (ChipClusters.DoorLockCluster.SetCredentialResponseCallback) callback,
+                      (Integer) commandArguments.get("operationType"),
+                      (ChipStructs.DoorLockClusterDlCredential) commandArguments.get("credential"),
+                      (byte[]) commandArguments.get("credentialData"),
+                      (Integer) commandArguments.get("userIndex"),
+                      (Integer) commandArguments.get("userStatus"),
+                      (Integer) commandArguments.get("userType"),
+                      10000);
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            levelControlstopCommandParams);
-    levelControlClusterInteractionInfoMap.put("stop", levelControlstopInteractionInfo);
-    Map<String, CommandParameterInfo> levelControlstopWithOnOffCommandParams =
+            () -> new DelegatedSetCredentialResponseCallback(),
+            doorLocksetCredentialCommandParams);
+    doorLockClusterInteractionInfoMap.put("setCredential", doorLocksetCredentialInteractionInfo);
+    Map<String, CommandParameterInfo> doorLockgetCredentialStatusCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo levelControlstopWithOnOffInteractionInfo =
+    InteractionInfo doorLockgetCredentialStatusInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .stopWithOnOff((DefaultClusterCallback) callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .getCredentialStatus(
+                      (ChipClusters.DoorLockCluster.GetCredentialStatusResponseCallback) callback,
+                      (ChipStructs.DoorLockClusterDlCredential) commandArguments.get("credential"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            levelControlstopWithOnOffCommandParams);
-    levelControlClusterInteractionInfoMap.put(
-        "stopWithOnOff", levelControlstopWithOnOffInteractionInfo);
-    commandMap.put("levelControl", levelControlClusterInteractionInfoMap);
-    Map<String, InteractionInfo> localizationConfigurationClusterInteractionInfoMap =
-        new LinkedHashMap<>();
-    commandMap.put("localizationConfiguration", localizationConfigurationClusterInteractionInfoMap);
-    Map<String, InteractionInfo> lowPowerClusterInteractionInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> lowPowersleepCommandParams =
+            () -> new DelegatedGetCredentialStatusResponseCallback(),
+            doorLockgetCredentialStatusCommandParams);
+    doorLockClusterInteractionInfoMap.put(
+        "getCredentialStatus", doorLockgetCredentialStatusInteractionInfo);
+    Map<String, CommandParameterInfo> doorLockclearCredentialCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo lowPowersleepInteractionInfo =
+    InteractionInfo doorLockclearCredentialInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LowPowerCluster) cluster).sleep((DefaultClusterCallback) callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .clearCredential(
+                      (DefaultClusterCallback) callback,
+                      (ChipStructs.DoorLockClusterDlCredential) commandArguments.get("credential"),
+                      10000);
             },
             () -> new DelegatedDefaultClusterCallback(),
-            lowPowersleepCommandParams);
-    lowPowerClusterInteractionInfoMap.put("sleep", lowPowersleepInteractionInfo);
-    commandMap.put("lowPower", lowPowerClusterInteractionInfoMap);
-    Map<String, InteractionInfo> mediaInputClusterInteractionInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> mediaInputhideInputStatusCommandParams =
+            doorLockclearCredentialCommandParams);
+    doorLockClusterInteractionInfoMap.put(
+        "clearCredential", doorLockclearCredentialInteractionInfo);
+    commandMap.put("doorLock", doorLockClusterInteractionInfoMap);
+    Map<String, InteractionInfo> windowCoveringClusterInteractionInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> windowCoveringupOrOpenCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo mediaInputhideInputStatusInteractionInfo =
+    InteractionInfo windowCoveringupOrOpenInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaInputCluster) cluster)
-                  .hideInputStatus((DefaultClusterCallback) callback);
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .upOrOpen((DefaultClusterCallback) callback);
             },
             () -> new DelegatedDefaultClusterCallback(),
-            mediaInputhideInputStatusCommandParams);
-    mediaInputClusterInteractionInfoMap.put(
-        "hideInputStatus", mediaInputhideInputStatusInteractionInfo);
-    Map<String, CommandParameterInfo> mediaInputrenameInputCommandParams =
+            windowCoveringupOrOpenCommandParams);
+    windowCoveringClusterInteractionInfoMap.put("upOrOpen", windowCoveringupOrOpenInteractionInfo);
+    Map<String, CommandParameterInfo> windowCoveringdownOrCloseCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo mediaInputrenameInputindexCommandParameterInfo =
-        new CommandParameterInfo("index", Integer.class, Integer.class);
-    mediaInputrenameInputCommandParams.put("index", mediaInputrenameInputindexCommandParameterInfo);
-
-    CommandParameterInfo mediaInputrenameInputnameCommandParameterInfo =
-        new CommandParameterInfo("name", String.class, String.class);
-    mediaInputrenameInputCommandParams.put("name", mediaInputrenameInputnameCommandParameterInfo);
-
-    InteractionInfo mediaInputrenameInputInteractionInfo =
+    InteractionInfo windowCoveringdownOrCloseInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaInputCluster) cluster)
-                  .renameInput(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("index"),
-                      (String) commandArguments.get("name"));
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .downOrClose((DefaultClusterCallback) callback);
             },
             () -> new DelegatedDefaultClusterCallback(),
-            mediaInputrenameInputCommandParams);
-    mediaInputClusterInteractionInfoMap.put("renameInput", mediaInputrenameInputInteractionInfo);
-    Map<String, CommandParameterInfo> mediaInputselectInputCommandParams =
+            windowCoveringdownOrCloseCommandParams);
+    windowCoveringClusterInteractionInfoMap.put(
+        "downOrClose", windowCoveringdownOrCloseInteractionInfo);
+    Map<String, CommandParameterInfo> windowCoveringstopMotionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo mediaInputselectInputindexCommandParameterInfo =
-        new CommandParameterInfo("index", Integer.class, Integer.class);
-    mediaInputselectInputCommandParams.put("index", mediaInputselectInputindexCommandParameterInfo);
-
-    InteractionInfo mediaInputselectInputInteractionInfo =
+    InteractionInfo windowCoveringstopMotionInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaInputCluster) cluster)
-                  .selectInput(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("index"));
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .stopMotion((DefaultClusterCallback) callback);
             },
             () -> new DelegatedDefaultClusterCallback(),
-            mediaInputselectInputCommandParams);
-    mediaInputClusterInteractionInfoMap.put("selectInput", mediaInputselectInputInteractionInfo);
-    Map<String, CommandParameterInfo> mediaInputshowInputStatusCommandParams =
+            windowCoveringstopMotionCommandParams);
+    windowCoveringClusterInteractionInfoMap.put(
+        "stopMotion", windowCoveringstopMotionInteractionInfo);
+    Map<String, CommandParameterInfo> windowCoveringgoToLiftValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo mediaInputshowInputStatusInteractionInfo =
+    CommandParameterInfo windowCoveringgoToLiftValueliftValueCommandParameterInfo =
+        new CommandParameterInfo("liftValue", Integer.class, Integer.class);
+    windowCoveringgoToLiftValueCommandParams.put(
+        "liftValue", windowCoveringgoToLiftValueliftValueCommandParameterInfo);
+
+    InteractionInfo windowCoveringgoToLiftValueInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaInputCluster) cluster)
-                  .showInputStatus((DefaultClusterCallback) callback);
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .goToLiftValue(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("liftValue"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            mediaInputshowInputStatusCommandParams);
-    mediaInputClusterInteractionInfoMap.put(
-        "showInputStatus", mediaInputshowInputStatusInteractionInfo);
-    commandMap.put("mediaInput", mediaInputClusterInteractionInfoMap);
-    Map<String, InteractionInfo> mediaPlaybackClusterInteractionInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> mediaPlaybackfastForwardCommandParams =
+            windowCoveringgoToLiftValueCommandParams);
+    windowCoveringClusterInteractionInfoMap.put(
+        "goToLiftValue", windowCoveringgoToLiftValueInteractionInfo);
+    Map<String, CommandParameterInfo> windowCoveringgoToLiftPercentageCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo mediaPlaybackfastForwardInteractionInfo =
+    CommandParameterInfo
+        windowCoveringgoToLiftPercentageliftPercent100thsValueCommandParameterInfo =
+            new CommandParameterInfo("liftPercent100thsValue", Integer.class, Integer.class);
+    windowCoveringgoToLiftPercentageCommandParams.put(
+        "liftPercent100thsValue",
+        windowCoveringgoToLiftPercentageliftPercent100thsValueCommandParameterInfo);
+
+    InteractionInfo windowCoveringgoToLiftPercentageInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .fastForward(
-                      (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback);
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .goToLiftPercentage(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("liftPercent100thsValue"));
             },
-            () -> new DelegatedPlaybackResponseCallback(),
-            mediaPlaybackfastForwardCommandParams);
-    mediaPlaybackClusterInteractionInfoMap.put(
-        "fastForward", mediaPlaybackfastForwardInteractionInfo);
-    Map<String, CommandParameterInfo> mediaPlaybacknextCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo mediaPlaybacknextInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .next((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback);
-            },
-            () -> new DelegatedPlaybackResponseCallback(),
-            mediaPlaybacknextCommandParams);
-    mediaPlaybackClusterInteractionInfoMap.put("next", mediaPlaybacknextInteractionInfo);
-    Map<String, CommandParameterInfo> mediaPlaybackpauseCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            windowCoveringgoToLiftPercentageCommandParams);
+    windowCoveringClusterInteractionInfoMap.put(
+        "goToLiftPercentage", windowCoveringgoToLiftPercentageInteractionInfo);
+    Map<String, CommandParameterInfo> windowCoveringgoToTiltValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo mediaPlaybackpauseInteractionInfo =
+    CommandParameterInfo windowCoveringgoToTiltValuetiltValueCommandParameterInfo =
+        new CommandParameterInfo("tiltValue", Integer.class, Integer.class);
+    windowCoveringgoToTiltValueCommandParams.put(
+        "tiltValue", windowCoveringgoToTiltValuetiltValueCommandParameterInfo);
+
+    InteractionInfo windowCoveringgoToTiltValueInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .pause((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback);
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .goToTiltValue(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("tiltValue"));
             },
-            () -> new DelegatedPlaybackResponseCallback(),
-            mediaPlaybackpauseCommandParams);
-    mediaPlaybackClusterInteractionInfoMap.put("pause", mediaPlaybackpauseInteractionInfo);
-    Map<String, CommandParameterInfo> mediaPlaybackplayCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            windowCoveringgoToTiltValueCommandParams);
+    windowCoveringClusterInteractionInfoMap.put(
+        "goToTiltValue", windowCoveringgoToTiltValueInteractionInfo);
+    Map<String, CommandParameterInfo> windowCoveringgoToTiltPercentageCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo mediaPlaybackplayInteractionInfo =
+    CommandParameterInfo
+        windowCoveringgoToTiltPercentagetiltPercent100thsValueCommandParameterInfo =
+            new CommandParameterInfo("tiltPercent100thsValue", Integer.class, Integer.class);
+    windowCoveringgoToTiltPercentageCommandParams.put(
+        "tiltPercent100thsValue",
+        windowCoveringgoToTiltPercentagetiltPercent100thsValueCommandParameterInfo);
+
+    InteractionInfo windowCoveringgoToTiltPercentageInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .play((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback);
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .goToTiltPercentage(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("tiltPercent100thsValue"));
             },
-            () -> new DelegatedPlaybackResponseCallback(),
-            mediaPlaybackplayCommandParams);
-    mediaPlaybackClusterInteractionInfoMap.put("play", mediaPlaybackplayInteractionInfo);
-    Map<String, CommandParameterInfo> mediaPlaybackpreviousCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            windowCoveringgoToTiltPercentageCommandParams);
+    windowCoveringClusterInteractionInfoMap.put(
+        "goToTiltPercentage", windowCoveringgoToTiltPercentageInteractionInfo);
+    commandMap.put("windowCovering", windowCoveringClusterInteractionInfoMap);
+    Map<String, InteractionInfo> barrierControlClusterInteractionInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> barrierControlbarrierControlGoToPercentCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo mediaPlaybackpreviousInteractionInfo =
+    CommandParameterInfo barrierControlbarrierControlGoToPercentpercentOpenCommandParameterInfo =
+        new CommandParameterInfo("percentOpen", Integer.class, Integer.class);
+    barrierControlbarrierControlGoToPercentCommandParams.put(
+        "percentOpen", barrierControlbarrierControlGoToPercentpercentOpenCommandParameterInfo);
+
+    InteractionInfo barrierControlbarrierControlGoToPercentInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .previous((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback);
+              ((ChipClusters.BarrierControlCluster) cluster)
+                  .barrierControlGoToPercent(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("percentOpen"));
             },
-            () -> new DelegatedPlaybackResponseCallback(),
-            mediaPlaybackpreviousCommandParams);
-    mediaPlaybackClusterInteractionInfoMap.put("previous", mediaPlaybackpreviousInteractionInfo);
-    Map<String, CommandParameterInfo> mediaPlaybackrewindCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            barrierControlbarrierControlGoToPercentCommandParams);
+    barrierControlClusterInteractionInfoMap.put(
+        "barrierControlGoToPercent", barrierControlbarrierControlGoToPercentInteractionInfo);
+    Map<String, CommandParameterInfo> barrierControlbarrierControlStopCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo mediaPlaybackrewindInteractionInfo =
+    InteractionInfo barrierControlbarrierControlStopInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .rewind((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback);
+              ((ChipClusters.BarrierControlCluster) cluster)
+                  .barrierControlStop((DefaultClusterCallback) callback);
             },
-            () -> new DelegatedPlaybackResponseCallback(),
-            mediaPlaybackrewindCommandParams);
-    mediaPlaybackClusterInteractionInfoMap.put("rewind", mediaPlaybackrewindInteractionInfo);
-    Map<String, CommandParameterInfo> mediaPlaybackseekCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            barrierControlbarrierControlStopCommandParams);
+    barrierControlClusterInteractionInfoMap.put(
+        "barrierControlStop", barrierControlbarrierControlStopInteractionInfo);
+    commandMap.put("barrierControl", barrierControlClusterInteractionInfoMap);
+    Map<String, InteractionInfo> pumpConfigurationAndControlClusterInteractionInfoMap =
+        new LinkedHashMap<>();
+    commandMap.put(
+        "pumpConfigurationAndControl", pumpConfigurationAndControlClusterInteractionInfoMap);
+    Map<String, InteractionInfo> thermostatClusterInteractionInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> thermostatsetpointRaiseLowerCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo mediaPlaybackseekpositionCommandParameterInfo =
-        new CommandParameterInfo("position", Long.class, Long.class);
-    mediaPlaybackseekCommandParams.put("position", mediaPlaybackseekpositionCommandParameterInfo);
+    CommandParameterInfo thermostatsetpointRaiseLowermodeCommandParameterInfo =
+        new CommandParameterInfo("mode", Integer.class, Integer.class);
+    thermostatsetpointRaiseLowerCommandParams.put(
+        "mode", thermostatsetpointRaiseLowermodeCommandParameterInfo);
 
-    InteractionInfo mediaPlaybackseekInteractionInfo =
+    CommandParameterInfo thermostatsetpointRaiseLoweramountCommandParameterInfo =
+        new CommandParameterInfo("amount", Integer.class, Integer.class);
+    thermostatsetpointRaiseLowerCommandParams.put(
+        "amount", thermostatsetpointRaiseLoweramountCommandParameterInfo);
+
+    InteractionInfo thermostatsetpointRaiseLowerInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .seek(
-                      (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback,
-                      (Long) commandArguments.get("position"));
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .setpointRaiseLower(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("mode"),
+                      (Integer) commandArguments.get("amount"));
             },
-            () -> new DelegatedPlaybackResponseCallback(),
-            mediaPlaybackseekCommandParams);
-    mediaPlaybackClusterInteractionInfoMap.put("seek", mediaPlaybackseekInteractionInfo);
-    Map<String, CommandParameterInfo> mediaPlaybackskipBackwardCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            thermostatsetpointRaiseLowerCommandParams);
+    thermostatClusterInteractionInfoMap.put(
+        "setpointRaiseLower", thermostatsetpointRaiseLowerInteractionInfo);
+    Map<String, CommandParameterInfo> thermostatsetWeeklyScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo mediaPlaybackskipBackwarddeltaPositionMillisecondsCommandParameterInfo =
-        new CommandParameterInfo("deltaPositionMilliseconds", Long.class, Long.class);
-    mediaPlaybackskipBackwardCommandParams.put(
-        "deltaPositionMilliseconds",
-        mediaPlaybackskipBackwarddeltaPositionMillisecondsCommandParameterInfo);
+    CommandParameterInfo
+        thermostatsetWeeklySchedulenumberOfTransitionsForSequenceCommandParameterInfo =
+            new CommandParameterInfo(
+                "numberOfTransitionsForSequence", Integer.class, Integer.class);
+    thermostatsetWeeklyScheduleCommandParams.put(
+        "numberOfTransitionsForSequence",
+        thermostatsetWeeklySchedulenumberOfTransitionsForSequenceCommandParameterInfo);
 
-    InteractionInfo mediaPlaybackskipBackwardInteractionInfo =
+    CommandParameterInfo thermostatsetWeeklyScheduledayOfWeekForSequenceCommandParameterInfo =
+        new CommandParameterInfo("dayOfWeekForSequence", Integer.class, Integer.class);
+    thermostatsetWeeklyScheduleCommandParams.put(
+        "dayOfWeekForSequence",
+        thermostatsetWeeklyScheduledayOfWeekForSequenceCommandParameterInfo);
+
+    CommandParameterInfo thermostatsetWeeklySchedulemodeForSequenceCommandParameterInfo =
+        new CommandParameterInfo("modeForSequence", Integer.class, Integer.class);
+    thermostatsetWeeklyScheduleCommandParams.put(
+        "modeForSequence", thermostatsetWeeklySchedulemodeForSequenceCommandParameterInfo);
+
+    InteractionInfo thermostatsetWeeklyScheduleInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .skipBackward(
-                      (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback,
-                      (Long) commandArguments.get("deltaPositionMilliseconds"));
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .setWeeklySchedule(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("numberOfTransitionsForSequence"),
+                      (Integer) commandArguments.get("dayOfWeekForSequence"),
+                      (Integer) commandArguments.get("modeForSequence"),
+                      (ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition>)
+                          commandArguments.get("transitions"));
             },
-            () -> new DelegatedPlaybackResponseCallback(),
-            mediaPlaybackskipBackwardCommandParams);
-    mediaPlaybackClusterInteractionInfoMap.put(
-        "skipBackward", mediaPlaybackskipBackwardInteractionInfo);
-    Map<String, CommandParameterInfo> mediaPlaybackskipForwardCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            thermostatsetWeeklyScheduleCommandParams);
+    thermostatClusterInteractionInfoMap.put(
+        "setWeeklySchedule", thermostatsetWeeklyScheduleInteractionInfo);
+    Map<String, CommandParameterInfo> thermostatgetWeeklyScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo mediaPlaybackskipForwarddeltaPositionMillisecondsCommandParameterInfo =
-        new CommandParameterInfo("deltaPositionMilliseconds", Long.class, Long.class);
-    mediaPlaybackskipForwardCommandParams.put(
-        "deltaPositionMilliseconds",
-        mediaPlaybackskipForwarddeltaPositionMillisecondsCommandParameterInfo);
+    CommandParameterInfo thermostatgetWeeklyScheduledaysToReturnCommandParameterInfo =
+        new CommandParameterInfo("daysToReturn", Integer.class, Integer.class);
+    thermostatgetWeeklyScheduleCommandParams.put(
+        "daysToReturn", thermostatgetWeeklyScheduledaysToReturnCommandParameterInfo);
 
-    InteractionInfo mediaPlaybackskipForwardInteractionInfo =
+    CommandParameterInfo thermostatgetWeeklySchedulemodeToReturnCommandParameterInfo =
+        new CommandParameterInfo("modeToReturn", Integer.class, Integer.class);
+    thermostatgetWeeklyScheduleCommandParams.put(
+        "modeToReturn", thermostatgetWeeklySchedulemodeToReturnCommandParameterInfo);
+
+    InteractionInfo thermostatgetWeeklyScheduleInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .skipForward(
-                      (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback,
-                      (Long) commandArguments.get("deltaPositionMilliseconds"));
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .getWeeklySchedule(
+                      (ChipClusters.ThermostatCluster.GetWeeklyScheduleResponseCallback) callback,
+                      (Integer) commandArguments.get("daysToReturn"),
+                      (Integer) commandArguments.get("modeToReturn"));
             },
-            () -> new DelegatedPlaybackResponseCallback(),
-            mediaPlaybackskipForwardCommandParams);
-    mediaPlaybackClusterInteractionInfoMap.put(
-        "skipForward", mediaPlaybackskipForwardInteractionInfo);
-    Map<String, CommandParameterInfo> mediaPlaybackstartOverCommandParams =
+            () -> new DelegatedGetWeeklyScheduleResponseCallback(),
+            thermostatgetWeeklyScheduleCommandParams);
+    thermostatClusterInteractionInfoMap.put(
+        "getWeeklySchedule", thermostatgetWeeklyScheduleInteractionInfo);
+    Map<String, CommandParameterInfo> thermostatclearWeeklyScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo mediaPlaybackstartOverInteractionInfo =
+    InteractionInfo thermostatclearWeeklyScheduleInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .startOver((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback);
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .clearWeeklySchedule((DefaultClusterCallback) callback);
             },
-            () -> new DelegatedPlaybackResponseCallback(),
-            mediaPlaybackstartOverCommandParams);
-    mediaPlaybackClusterInteractionInfoMap.put("startOver", mediaPlaybackstartOverInteractionInfo);
-    Map<String, CommandParameterInfo> mediaPlaybackstopPlaybackCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            thermostatclearWeeklyScheduleCommandParams);
+    thermostatClusterInteractionInfoMap.put(
+        "clearWeeklySchedule", thermostatclearWeeklyScheduleInteractionInfo);
+    commandMap.put("thermostat", thermostatClusterInteractionInfoMap);
+    Map<String, InteractionInfo> fanControlClusterInteractionInfoMap = new LinkedHashMap<>();
+    commandMap.put("fanControl", fanControlClusterInteractionInfoMap);
+    Map<String, InteractionInfo> thermostatUserInterfaceConfigurationClusterInteractionInfoMap =
+        new LinkedHashMap<>();
+    commandMap.put(
+        "thermostatUserInterfaceConfiguration",
+        thermostatUserInterfaceConfigurationClusterInteractionInfoMap);
+    Map<String, InteractionInfo> colorControlClusterInteractionInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> colorControlmoveToHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo mediaPlaybackstopPlaybackInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .stopPlayback(
-                      (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback);
+    CommandParameterInfo colorControlmoveToHuehueCommandParameterInfo =
+        new CommandParameterInfo("hue", Integer.class, Integer.class);
+    colorControlmoveToHueCommandParams.put("hue", colorControlmoveToHuehueCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToHuedirectionCommandParameterInfo =
+        new CommandParameterInfo("direction", Integer.class, Integer.class);
+    colorControlmoveToHueCommandParams.put(
+        "direction", colorControlmoveToHuedirectionCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToHuetransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    colorControlmoveToHueCommandParams.put(
+        "transitionTime", colorControlmoveToHuetransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToHueoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlmoveToHueCommandParams.put(
+        "optionsMask", colorControlmoveToHueoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToHueoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlmoveToHueCommandParams.put(
+        "optionsOverride", colorControlmoveToHueoptionsOverrideCommandParameterInfo);
+
+    InteractionInfo colorControlmoveToHueInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .moveToHue(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("hue"),
+                      (Integer) commandArguments.get("direction"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
             },
-            () -> new DelegatedPlaybackResponseCallback(),
-            mediaPlaybackstopPlaybackCommandParams);
-    mediaPlaybackClusterInteractionInfoMap.put(
-        "stopPlayback", mediaPlaybackstopPlaybackInteractionInfo);
-    commandMap.put("mediaPlayback", mediaPlaybackClusterInteractionInfoMap);
-    Map<String, InteractionInfo> modeSelectClusterInteractionInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> modeSelectchangeToModeCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControlmoveToHueCommandParams);
+    colorControlClusterInteractionInfoMap.put("moveToHue", colorControlmoveToHueInteractionInfo);
+    Map<String, CommandParameterInfo> colorControlmoveHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo modeSelectchangeToModenewModeCommandParameterInfo =
-        new CommandParameterInfo("newMode", Integer.class, Integer.class);
-    modeSelectchangeToModeCommandParams.put(
-        "newMode", modeSelectchangeToModenewModeCommandParameterInfo);
+    CommandParameterInfo colorControlmoveHuemoveModeCommandParameterInfo =
+        new CommandParameterInfo("moveMode", Integer.class, Integer.class);
+    colorControlmoveHueCommandParams.put(
+        "moveMode", colorControlmoveHuemoveModeCommandParameterInfo);
 
-    InteractionInfo modeSelectchangeToModeInteractionInfo =
+    CommandParameterInfo colorControlmoveHuerateCommandParameterInfo =
+        new CommandParameterInfo("rate", Integer.class, Integer.class);
+    colorControlmoveHueCommandParams.put("rate", colorControlmoveHuerateCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveHueoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlmoveHueCommandParams.put(
+        "optionsMask", colorControlmoveHueoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveHueoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlmoveHueCommandParams.put(
+        "optionsOverride", colorControlmoveHueoptionsOverrideCommandParameterInfo);
+
+    InteractionInfo colorControlmoveHueInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ModeSelectCluster) cluster)
-                  .changeToMode(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("newMode"));
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .moveHue(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("moveMode"),
+                      (Integer) commandArguments.get("rate"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            modeSelectchangeToModeCommandParams);
-    modeSelectClusterInteractionInfoMap.put("changeToMode", modeSelectchangeToModeInteractionInfo);
-    commandMap.put("modeSelect", modeSelectClusterInteractionInfoMap);
-    Map<String, InteractionInfo> networkCommissioningClusterInteractionInfoMap =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> networkCommissioningaddOrUpdateThreadNetworkCommandParams =
+            colorControlmoveHueCommandParams);
+    colorControlClusterInteractionInfoMap.put("moveHue", colorControlmoveHueInteractionInfo);
+    Map<String, CommandParameterInfo> colorControlstepHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo
-        networkCommissioningaddOrUpdateThreadNetworkoperationalDatasetCommandParameterInfo =
-            new CommandParameterInfo("operationalDataset", byte[].class, byte[].class);
-    networkCommissioningaddOrUpdateThreadNetworkCommandParams.put(
-        "operationalDataset",
-        networkCommissioningaddOrUpdateThreadNetworkoperationalDatasetCommandParameterInfo);
+    CommandParameterInfo colorControlstepHuestepModeCommandParameterInfo =
+        new CommandParameterInfo("stepMode", Integer.class, Integer.class);
+    colorControlstepHueCommandParams.put(
+        "stepMode", colorControlstepHuestepModeCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepHuestepSizeCommandParameterInfo =
+        new CommandParameterInfo("stepSize", Integer.class, Integer.class);
+    colorControlstepHueCommandParams.put(
+        "stepSize", colorControlstepHuestepSizeCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepHuetransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    colorControlstepHueCommandParams.put(
+        "transitionTime", colorControlstepHuetransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepHueoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlstepHueCommandParams.put(
+        "optionsMask", colorControlstepHueoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepHueoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlstepHueCommandParams.put(
+        "optionsOverride", colorControlstepHueoptionsOverrideCommandParameterInfo);
+
+    InteractionInfo colorControlstepHueInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .stepHue(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("stepMode"),
+                      (Integer) commandArguments.get("stepSize"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControlstepHueCommandParams);
+    colorControlClusterInteractionInfoMap.put("stepHue", colorControlstepHueInteractionInfo);
+    Map<String, CommandParameterInfo> colorControlmoveToSaturationCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo colorControlmoveToSaturationsaturationCommandParameterInfo =
+        new CommandParameterInfo("saturation", Integer.class, Integer.class);
+    colorControlmoveToSaturationCommandParams.put(
+        "saturation", colorControlmoveToSaturationsaturationCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToSaturationtransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    colorControlmoveToSaturationCommandParams.put(
+        "transitionTime", colorControlmoveToSaturationtransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToSaturationoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlmoveToSaturationCommandParams.put(
+        "optionsMask", colorControlmoveToSaturationoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToSaturationoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlmoveToSaturationCommandParams.put(
+        "optionsOverride", colorControlmoveToSaturationoptionsOverrideCommandParameterInfo);
+
+    InteractionInfo colorControlmoveToSaturationInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .moveToSaturation(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("saturation"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControlmoveToSaturationCommandParams);
+    colorControlClusterInteractionInfoMap.put(
+        "moveToSaturation", colorControlmoveToSaturationInteractionInfo);
+    Map<String, CommandParameterInfo> colorControlmoveSaturationCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo colorControlmoveSaturationmoveModeCommandParameterInfo =
+        new CommandParameterInfo("moveMode", Integer.class, Integer.class);
+    colorControlmoveSaturationCommandParams.put(
+        "moveMode", colorControlmoveSaturationmoveModeCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveSaturationrateCommandParameterInfo =
+        new CommandParameterInfo("rate", Integer.class, Integer.class);
+    colorControlmoveSaturationCommandParams.put(
+        "rate", colorControlmoveSaturationrateCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveSaturationoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlmoveSaturationCommandParams.put(
+        "optionsMask", colorControlmoveSaturationoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveSaturationoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlmoveSaturationCommandParams.put(
+        "optionsOverride", colorControlmoveSaturationoptionsOverrideCommandParameterInfo);
+
+    InteractionInfo colorControlmoveSaturationInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .moveSaturation(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("moveMode"),
+                      (Integer) commandArguments.get("rate"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControlmoveSaturationCommandParams);
+    colorControlClusterInteractionInfoMap.put(
+        "moveSaturation", colorControlmoveSaturationInteractionInfo);
+    Map<String, CommandParameterInfo> colorControlstepSaturationCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo colorControlstepSaturationstepModeCommandParameterInfo =
+        new CommandParameterInfo("stepMode", Integer.class, Integer.class);
+    colorControlstepSaturationCommandParams.put(
+        "stepMode", colorControlstepSaturationstepModeCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepSaturationstepSizeCommandParameterInfo =
+        new CommandParameterInfo("stepSize", Integer.class, Integer.class);
+    colorControlstepSaturationCommandParams.put(
+        "stepSize", colorControlstepSaturationstepSizeCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepSaturationtransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    colorControlstepSaturationCommandParams.put(
+        "transitionTime", colorControlstepSaturationtransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepSaturationoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlstepSaturationCommandParams.put(
+        "optionsMask", colorControlstepSaturationoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepSaturationoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlstepSaturationCommandParams.put(
+        "optionsOverride", colorControlstepSaturationoptionsOverrideCommandParameterInfo);
+
+    InteractionInfo colorControlstepSaturationInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .stepSaturation(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("stepMode"),
+                      (Integer) commandArguments.get("stepSize"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControlstepSaturationCommandParams);
+    colorControlClusterInteractionInfoMap.put(
+        "stepSaturation", colorControlstepSaturationInteractionInfo);
+    Map<String, CommandParameterInfo> colorControlmoveToHueAndSaturationCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo colorControlmoveToHueAndSaturationhueCommandParameterInfo =
+        new CommandParameterInfo("hue", Integer.class, Integer.class);
+    colorControlmoveToHueAndSaturationCommandParams.put(
+        "hue", colorControlmoveToHueAndSaturationhueCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToHueAndSaturationsaturationCommandParameterInfo =
+        new CommandParameterInfo("saturation", Integer.class, Integer.class);
+    colorControlmoveToHueAndSaturationCommandParams.put(
+        "saturation", colorControlmoveToHueAndSaturationsaturationCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToHueAndSaturationtransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    colorControlmoveToHueAndSaturationCommandParams.put(
+        "transitionTime", colorControlmoveToHueAndSaturationtransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToHueAndSaturationoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlmoveToHueAndSaturationCommandParams.put(
+        "optionsMask", colorControlmoveToHueAndSaturationoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToHueAndSaturationoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlmoveToHueAndSaturationCommandParams.put(
+        "optionsOverride", colorControlmoveToHueAndSaturationoptionsOverrideCommandParameterInfo);
+
+    InteractionInfo colorControlmoveToHueAndSaturationInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .moveToHueAndSaturation(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("hue"),
+                      (Integer) commandArguments.get("saturation"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControlmoveToHueAndSaturationCommandParams);
+    colorControlClusterInteractionInfoMap.put(
+        "moveToHueAndSaturation", colorControlmoveToHueAndSaturationInteractionInfo);
+    Map<String, CommandParameterInfo> colorControlmoveToColorCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo colorControlmoveToColorcolorXCommandParameterInfo =
+        new CommandParameterInfo("colorX", Integer.class, Integer.class);
+    colorControlmoveToColorCommandParams.put(
+        "colorX", colorControlmoveToColorcolorXCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToColorcolorYCommandParameterInfo =
+        new CommandParameterInfo("colorY", Integer.class, Integer.class);
+    colorControlmoveToColorCommandParams.put(
+        "colorY", colorControlmoveToColorcolorYCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToColortransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    colorControlmoveToColorCommandParams.put(
+        "transitionTime", colorControlmoveToColortransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToColoroptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlmoveToColorCommandParams.put(
+        "optionsMask", colorControlmoveToColoroptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToColoroptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlmoveToColorCommandParams.put(
+        "optionsOverride", colorControlmoveToColoroptionsOverrideCommandParameterInfo);
+
+    InteractionInfo colorControlmoveToColorInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .moveToColor(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("colorX"),
+                      (Integer) commandArguments.get("colorY"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControlmoveToColorCommandParams);
+    colorControlClusterInteractionInfoMap.put(
+        "moveToColor", colorControlmoveToColorInteractionInfo);
+    Map<String, CommandParameterInfo> colorControlmoveColorCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo colorControlmoveColorrateXCommandParameterInfo =
+        new CommandParameterInfo("rateX", Integer.class, Integer.class);
+    colorControlmoveColorCommandParams.put("rateX", colorControlmoveColorrateXCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveColorrateYCommandParameterInfo =
+        new CommandParameterInfo("rateY", Integer.class, Integer.class);
+    colorControlmoveColorCommandParams.put("rateY", colorControlmoveColorrateYCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveColoroptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlmoveColorCommandParams.put(
+        "optionsMask", colorControlmoveColoroptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveColoroptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlmoveColorCommandParams.put(
+        "optionsOverride", colorControlmoveColoroptionsOverrideCommandParameterInfo);
+
+    InteractionInfo colorControlmoveColorInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .moveColor(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("rateX"),
+                      (Integer) commandArguments.get("rateY"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControlmoveColorCommandParams);
+    colorControlClusterInteractionInfoMap.put("moveColor", colorControlmoveColorInteractionInfo);
+    Map<String, CommandParameterInfo> colorControlstepColorCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo colorControlstepColorstepXCommandParameterInfo =
+        new CommandParameterInfo("stepX", Integer.class, Integer.class);
+    colorControlstepColorCommandParams.put("stepX", colorControlstepColorstepXCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepColorstepYCommandParameterInfo =
+        new CommandParameterInfo("stepY", Integer.class, Integer.class);
+    colorControlstepColorCommandParams.put("stepY", colorControlstepColorstepYCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepColortransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    colorControlstepColorCommandParams.put(
+        "transitionTime", colorControlstepColortransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepColoroptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlstepColorCommandParams.put(
+        "optionsMask", colorControlstepColoroptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepColoroptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlstepColorCommandParams.put(
+        "optionsOverride", colorControlstepColoroptionsOverrideCommandParameterInfo);
+
+    InteractionInfo colorControlstepColorInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .stepColor(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("stepX"),
+                      (Integer) commandArguments.get("stepY"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControlstepColorCommandParams);
+    colorControlClusterInteractionInfoMap.put("stepColor", colorControlstepColorInteractionInfo);
+    Map<String, CommandParameterInfo> colorControlmoveToColorTemperatureCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo colorControlmoveToColorTemperaturecolorTemperatureCommandParameterInfo =
+        new CommandParameterInfo("colorTemperature", Integer.class, Integer.class);
+    colorControlmoveToColorTemperatureCommandParams.put(
+        "colorTemperature", colorControlmoveToColorTemperaturecolorTemperatureCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToColorTemperaturetransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    colorControlmoveToColorTemperatureCommandParams.put(
+        "transitionTime", colorControlmoveToColorTemperaturetransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToColorTemperatureoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlmoveToColorTemperatureCommandParams.put(
+        "optionsMask", colorControlmoveToColorTemperatureoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToColorTemperatureoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlmoveToColorTemperatureCommandParams.put(
+        "optionsOverride", colorControlmoveToColorTemperatureoptionsOverrideCommandParameterInfo);
+
+    InteractionInfo colorControlmoveToColorTemperatureInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .moveToColorTemperature(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("colorTemperature"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControlmoveToColorTemperatureCommandParams);
+    colorControlClusterInteractionInfoMap.put(
+        "moveToColorTemperature", colorControlmoveToColorTemperatureInteractionInfo);
+    Map<String, CommandParameterInfo> colorControlenhancedMoveToHueCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo colorControlenhancedMoveToHueenhancedHueCommandParameterInfo =
+        new CommandParameterInfo("enhancedHue", Integer.class, Integer.class);
+    colorControlenhancedMoveToHueCommandParams.put(
+        "enhancedHue", colorControlenhancedMoveToHueenhancedHueCommandParameterInfo);
+
+    CommandParameterInfo colorControlenhancedMoveToHuedirectionCommandParameterInfo =
+        new CommandParameterInfo("direction", Integer.class, Integer.class);
+    colorControlenhancedMoveToHueCommandParams.put(
+        "direction", colorControlenhancedMoveToHuedirectionCommandParameterInfo);
+
+    CommandParameterInfo colorControlenhancedMoveToHuetransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    colorControlenhancedMoveToHueCommandParams.put(
+        "transitionTime", colorControlenhancedMoveToHuetransitionTimeCommandParameterInfo);
 
-    CommandParameterInfo
-        networkCommissioningaddOrUpdateThreadNetworkbreadcrumbCommandParameterInfo =
-            new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
-    networkCommissioningaddOrUpdateThreadNetworkCommandParams.put(
-        "breadcrumb", networkCommissioningaddOrUpdateThreadNetworkbreadcrumbCommandParameterInfo);
+    CommandParameterInfo colorControlenhancedMoveToHueoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlenhancedMoveToHueCommandParams.put(
+        "optionsMask", colorControlenhancedMoveToHueoptionsMaskCommandParameterInfo);
 
-    InteractionInfo networkCommissioningaddOrUpdateThreadNetworkInteractionInfo =
+    CommandParameterInfo colorControlenhancedMoveToHueoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlenhancedMoveToHueCommandParams.put(
+        "optionsOverride", colorControlenhancedMoveToHueoptionsOverrideCommandParameterInfo);
+
+    InteractionInfo colorControlenhancedMoveToHueInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .addOrUpdateThreadNetwork(
-                      (ChipClusters.NetworkCommissioningCluster.NetworkConfigResponseCallback)
-                          callback,
-                      (byte[]) commandArguments.get("operationalDataset"),
-                      (Optional<Long>) commandArguments.get("breadcrumb"));
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .enhancedMoveToHue(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("enhancedHue"),
+                      (Integer) commandArguments.get("direction"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
             },
-            () -> new DelegatedNetworkConfigResponseCallback(),
-            networkCommissioningaddOrUpdateThreadNetworkCommandParams);
-    networkCommissioningClusterInteractionInfoMap.put(
-        "addOrUpdateThreadNetwork", networkCommissioningaddOrUpdateThreadNetworkInteractionInfo);
-    Map<String, CommandParameterInfo> networkCommissioningaddOrUpdateWiFiNetworkCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControlenhancedMoveToHueCommandParams);
+    colorControlClusterInteractionInfoMap.put(
+        "enhancedMoveToHue", colorControlenhancedMoveToHueInteractionInfo);
+    Map<String, CommandParameterInfo> colorControlenhancedMoveHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo networkCommissioningaddOrUpdateWiFiNetworkssidCommandParameterInfo =
-        new CommandParameterInfo("ssid", byte[].class, byte[].class);
-    networkCommissioningaddOrUpdateWiFiNetworkCommandParams.put(
-        "ssid", networkCommissioningaddOrUpdateWiFiNetworkssidCommandParameterInfo);
+    CommandParameterInfo colorControlenhancedMoveHuemoveModeCommandParameterInfo =
+        new CommandParameterInfo("moveMode", Integer.class, Integer.class);
+    colorControlenhancedMoveHueCommandParams.put(
+        "moveMode", colorControlenhancedMoveHuemoveModeCommandParameterInfo);
 
-    CommandParameterInfo networkCommissioningaddOrUpdateWiFiNetworkcredentialsCommandParameterInfo =
-        new CommandParameterInfo("credentials", byte[].class, byte[].class);
-    networkCommissioningaddOrUpdateWiFiNetworkCommandParams.put(
-        "credentials", networkCommissioningaddOrUpdateWiFiNetworkcredentialsCommandParameterInfo);
+    CommandParameterInfo colorControlenhancedMoveHuerateCommandParameterInfo =
+        new CommandParameterInfo("rate", Integer.class, Integer.class);
+    colorControlenhancedMoveHueCommandParams.put(
+        "rate", colorControlenhancedMoveHuerateCommandParameterInfo);
 
-    CommandParameterInfo networkCommissioningaddOrUpdateWiFiNetworkbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
-    networkCommissioningaddOrUpdateWiFiNetworkCommandParams.put(
-        "breadcrumb", networkCommissioningaddOrUpdateWiFiNetworkbreadcrumbCommandParameterInfo);
+    CommandParameterInfo colorControlenhancedMoveHueoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlenhancedMoveHueCommandParams.put(
+        "optionsMask", colorControlenhancedMoveHueoptionsMaskCommandParameterInfo);
 
-    InteractionInfo networkCommissioningaddOrUpdateWiFiNetworkInteractionInfo =
+    CommandParameterInfo colorControlenhancedMoveHueoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlenhancedMoveHueCommandParams.put(
+        "optionsOverride", colorControlenhancedMoveHueoptionsOverrideCommandParameterInfo);
+
+    InteractionInfo colorControlenhancedMoveHueInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .addOrUpdateWiFiNetwork(
-                      (ChipClusters.NetworkCommissioningCluster.NetworkConfigResponseCallback)
-                          callback,
-                      (byte[]) commandArguments.get("ssid"),
-                      (byte[]) commandArguments.get("credentials"),
-                      (Optional<Long>) commandArguments.get("breadcrumb"));
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .enhancedMoveHue(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("moveMode"),
+                      (Integer) commandArguments.get("rate"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
             },
-            () -> new DelegatedNetworkConfigResponseCallback(),
-            networkCommissioningaddOrUpdateWiFiNetworkCommandParams);
-    networkCommissioningClusterInteractionInfoMap.put(
-        "addOrUpdateWiFiNetwork", networkCommissioningaddOrUpdateWiFiNetworkInteractionInfo);
-    Map<String, CommandParameterInfo> networkCommissioningconnectNetworkCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControlenhancedMoveHueCommandParams);
+    colorControlClusterInteractionInfoMap.put(
+        "enhancedMoveHue", colorControlenhancedMoveHueInteractionInfo);
+    Map<String, CommandParameterInfo> colorControlenhancedStepHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo networkCommissioningconnectNetworknetworkIDCommandParameterInfo =
-        new CommandParameterInfo("networkID", byte[].class, byte[].class);
-    networkCommissioningconnectNetworkCommandParams.put(
-        "networkID", networkCommissioningconnectNetworknetworkIDCommandParameterInfo);
+    CommandParameterInfo colorControlenhancedStepHuestepModeCommandParameterInfo =
+        new CommandParameterInfo("stepMode", Integer.class, Integer.class);
+    colorControlenhancedStepHueCommandParams.put(
+        "stepMode", colorControlenhancedStepHuestepModeCommandParameterInfo);
 
-    CommandParameterInfo networkCommissioningconnectNetworkbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
-    networkCommissioningconnectNetworkCommandParams.put(
-        "breadcrumb", networkCommissioningconnectNetworkbreadcrumbCommandParameterInfo);
+    CommandParameterInfo colorControlenhancedStepHuestepSizeCommandParameterInfo =
+        new CommandParameterInfo("stepSize", Integer.class, Integer.class);
+    colorControlenhancedStepHueCommandParams.put(
+        "stepSize", colorControlenhancedStepHuestepSizeCommandParameterInfo);
 
-    InteractionInfo networkCommissioningconnectNetworkInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .connectNetwork(
-                      (ChipClusters.NetworkCommissioningCluster.ConnectNetworkResponseCallback)
-                          callback,
-                      (byte[]) commandArguments.get("networkID"),
-                      (Optional<Long>) commandArguments.get("breadcrumb"));
-            },
-            () -> new DelegatedConnectNetworkResponseCallback(),
-            networkCommissioningconnectNetworkCommandParams);
-    networkCommissioningClusterInteractionInfoMap.put(
-        "connectNetwork", networkCommissioningconnectNetworkInteractionInfo);
-    Map<String, CommandParameterInfo> networkCommissioningremoveNetworkCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo networkCommissioningremoveNetworknetworkIDCommandParameterInfo =
-        new CommandParameterInfo("networkID", byte[].class, byte[].class);
-    networkCommissioningremoveNetworkCommandParams.put(
-        "networkID", networkCommissioningremoveNetworknetworkIDCommandParameterInfo);
+    CommandParameterInfo colorControlenhancedStepHuetransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    colorControlenhancedStepHueCommandParams.put(
+        "transitionTime", colorControlenhancedStepHuetransitionTimeCommandParameterInfo);
 
-    CommandParameterInfo networkCommissioningremoveNetworkbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
-    networkCommissioningremoveNetworkCommandParams.put(
-        "breadcrumb", networkCommissioningremoveNetworkbreadcrumbCommandParameterInfo);
+    CommandParameterInfo colorControlenhancedStepHueoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlenhancedStepHueCommandParams.put(
+        "optionsMask", colorControlenhancedStepHueoptionsMaskCommandParameterInfo);
 
-    InteractionInfo networkCommissioningremoveNetworkInteractionInfo =
+    CommandParameterInfo colorControlenhancedStepHueoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlenhancedStepHueCommandParams.put(
+        "optionsOverride", colorControlenhancedStepHueoptionsOverrideCommandParameterInfo);
+
+    InteractionInfo colorControlenhancedStepHueInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .removeNetwork(
-                      (ChipClusters.NetworkCommissioningCluster.NetworkConfigResponseCallback)
-                          callback,
-                      (byte[]) commandArguments.get("networkID"),
-                      (Optional<Long>) commandArguments.get("breadcrumb"));
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .enhancedStepHue(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("stepMode"),
+                      (Integer) commandArguments.get("stepSize"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
             },
-            () -> new DelegatedNetworkConfigResponseCallback(),
-            networkCommissioningremoveNetworkCommandParams);
-    networkCommissioningClusterInteractionInfoMap.put(
-        "removeNetwork", networkCommissioningremoveNetworkInteractionInfo);
-    Map<String, CommandParameterInfo> networkCommissioningreorderNetworkCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControlenhancedStepHueCommandParams);
+    colorControlClusterInteractionInfoMap.put(
+        "enhancedStepHue", colorControlenhancedStepHueInteractionInfo);
+    Map<String, CommandParameterInfo> colorControlenhancedMoveToHueAndSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo networkCommissioningreorderNetworknetworkIDCommandParameterInfo =
-        new CommandParameterInfo("networkID", byte[].class, byte[].class);
-    networkCommissioningreorderNetworkCommandParams.put(
-        "networkID", networkCommissioningreorderNetworknetworkIDCommandParameterInfo);
+    CommandParameterInfo colorControlenhancedMoveToHueAndSaturationenhancedHueCommandParameterInfo =
+        new CommandParameterInfo("enhancedHue", Integer.class, Integer.class);
+    colorControlenhancedMoveToHueAndSaturationCommandParams.put(
+        "enhancedHue", colorControlenhancedMoveToHueAndSaturationenhancedHueCommandParameterInfo);
 
-    CommandParameterInfo networkCommissioningreorderNetworknetworkIndexCommandParameterInfo =
-        new CommandParameterInfo("networkIndex", Integer.class, Integer.class);
-    networkCommissioningreorderNetworkCommandParams.put(
-        "networkIndex", networkCommissioningreorderNetworknetworkIndexCommandParameterInfo);
+    CommandParameterInfo colorControlenhancedMoveToHueAndSaturationsaturationCommandParameterInfo =
+        new CommandParameterInfo("saturation", Integer.class, Integer.class);
+    colorControlenhancedMoveToHueAndSaturationCommandParams.put(
+        "saturation", colorControlenhancedMoveToHueAndSaturationsaturationCommandParameterInfo);
 
-    CommandParameterInfo networkCommissioningreorderNetworkbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
-    networkCommissioningreorderNetworkCommandParams.put(
-        "breadcrumb", networkCommissioningreorderNetworkbreadcrumbCommandParameterInfo);
+    CommandParameterInfo
+        colorControlenhancedMoveToHueAndSaturationtransitionTimeCommandParameterInfo =
+            new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    colorControlenhancedMoveToHueAndSaturationCommandParams.put(
+        "transitionTime",
+        colorControlenhancedMoveToHueAndSaturationtransitionTimeCommandParameterInfo);
 
-    InteractionInfo networkCommissioningreorderNetworkInteractionInfo =
+    CommandParameterInfo colorControlenhancedMoveToHueAndSaturationoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlenhancedMoveToHueAndSaturationCommandParams.put(
+        "optionsMask", colorControlenhancedMoveToHueAndSaturationoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo
+        colorControlenhancedMoveToHueAndSaturationoptionsOverrideCommandParameterInfo =
+            new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlenhancedMoveToHueAndSaturationCommandParams.put(
+        "optionsOverride",
+        colorControlenhancedMoveToHueAndSaturationoptionsOverrideCommandParameterInfo);
+
+    InteractionInfo colorControlenhancedMoveToHueAndSaturationInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .reorderNetwork(
-                      (ChipClusters.NetworkCommissioningCluster.NetworkConfigResponseCallback)
-                          callback,
-                      (byte[]) commandArguments.get("networkID"),
-                      (Integer) commandArguments.get("networkIndex"),
-                      (Optional<Long>) commandArguments.get("breadcrumb"));
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .enhancedMoveToHueAndSaturation(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("enhancedHue"),
+                      (Integer) commandArguments.get("saturation"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
             },
-            () -> new DelegatedNetworkConfigResponseCallback(),
-            networkCommissioningreorderNetworkCommandParams);
-    networkCommissioningClusterInteractionInfoMap.put(
-        "reorderNetwork", networkCommissioningreorderNetworkInteractionInfo);
-    Map<String, CommandParameterInfo> networkCommissioningscanNetworksCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControlenhancedMoveToHueAndSaturationCommandParams);
+    colorControlClusterInteractionInfoMap.put(
+        "enhancedMoveToHueAndSaturation",
+        colorControlenhancedMoveToHueAndSaturationInteractionInfo);
+    Map<String, CommandParameterInfo> colorControlcolorLoopSetCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo networkCommissioningscanNetworksssidCommandParameterInfo =
-        new CommandParameterInfo("ssid", Optional.class, byte[].class);
-    networkCommissioningscanNetworksCommandParams.put(
-        "ssid", networkCommissioningscanNetworksssidCommandParameterInfo);
+    CommandParameterInfo colorControlcolorLoopSetupdateFlagsCommandParameterInfo =
+        new CommandParameterInfo("updateFlags", Integer.class, Integer.class);
+    colorControlcolorLoopSetCommandParams.put(
+        "updateFlags", colorControlcolorLoopSetupdateFlagsCommandParameterInfo);
+
+    CommandParameterInfo colorControlcolorLoopSetactionCommandParameterInfo =
+        new CommandParameterInfo("action", Integer.class, Integer.class);
+    colorControlcolorLoopSetCommandParams.put(
+        "action", colorControlcolorLoopSetactionCommandParameterInfo);
+
+    CommandParameterInfo colorControlcolorLoopSetdirectionCommandParameterInfo =
+        new CommandParameterInfo("direction", Integer.class, Integer.class);
+    colorControlcolorLoopSetCommandParams.put(
+        "direction", colorControlcolorLoopSetdirectionCommandParameterInfo);
 
-    CommandParameterInfo networkCommissioningscanNetworksbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
-    networkCommissioningscanNetworksCommandParams.put(
-        "breadcrumb", networkCommissioningscanNetworksbreadcrumbCommandParameterInfo);
+    CommandParameterInfo colorControlcolorLoopSettimeCommandParameterInfo =
+        new CommandParameterInfo("time", Integer.class, Integer.class);
+    colorControlcolorLoopSetCommandParams.put(
+        "time", colorControlcolorLoopSettimeCommandParameterInfo);
 
-    InteractionInfo networkCommissioningscanNetworksInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .scanNetworks(
-                      (ChipClusters.NetworkCommissioningCluster.ScanNetworksResponseCallback)
-                          callback,
-                      (Optional<byte[]>) commandArguments.get("ssid"),
-                      (Optional<Long>) commandArguments.get("breadcrumb"));
-            },
-            () -> new DelegatedScanNetworksResponseCallback(),
-            networkCommissioningscanNetworksCommandParams);
-    networkCommissioningClusterInteractionInfoMap.put(
-        "scanNetworks", networkCommissioningscanNetworksInteractionInfo);
-    commandMap.put("networkCommissioning", networkCommissioningClusterInteractionInfoMap);
-    Map<String, InteractionInfo> otaSoftwareUpdateProviderClusterInteractionInfoMap =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> otaSoftwareUpdateProviderapplyUpdateRequestCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo
-        otaSoftwareUpdateProviderapplyUpdateRequestupdateTokenCommandParameterInfo =
-            new CommandParameterInfo("updateToken", byte[].class, byte[].class);
-    otaSoftwareUpdateProviderapplyUpdateRequestCommandParams.put(
-        "updateToken", otaSoftwareUpdateProviderapplyUpdateRequestupdateTokenCommandParameterInfo);
+    CommandParameterInfo colorControlcolorLoopSetstartHueCommandParameterInfo =
+        new CommandParameterInfo("startHue", Integer.class, Integer.class);
+    colorControlcolorLoopSetCommandParams.put(
+        "startHue", colorControlcolorLoopSetstartHueCommandParameterInfo);
 
-    CommandParameterInfo otaSoftwareUpdateProviderapplyUpdateRequestnewVersionCommandParameterInfo =
-        new CommandParameterInfo("newVersion", Long.class, Long.class);
-    otaSoftwareUpdateProviderapplyUpdateRequestCommandParams.put(
-        "newVersion", otaSoftwareUpdateProviderapplyUpdateRequestnewVersionCommandParameterInfo);
+    CommandParameterInfo colorControlcolorLoopSetoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlcolorLoopSetCommandParams.put(
+        "optionsMask", colorControlcolorLoopSetoptionsMaskCommandParameterInfo);
 
-    InteractionInfo otaSoftwareUpdateProviderapplyUpdateRequestInteractionInfo =
+    CommandParameterInfo colorControlcolorLoopSetoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlcolorLoopSetCommandParams.put(
+        "optionsOverride", colorControlcolorLoopSetoptionsOverrideCommandParameterInfo);
+
+    InteractionInfo colorControlcolorLoopSetInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
-                  .applyUpdateRequest(
-                      (ChipClusters.OtaSoftwareUpdateProviderCluster.ApplyUpdateResponseCallback)
-                          callback,
-                      (byte[]) commandArguments.get("updateToken"),
-                      (Long) commandArguments.get("newVersion"));
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .colorLoopSet(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("updateFlags"),
+                      (Integer) commandArguments.get("action"),
+                      (Integer) commandArguments.get("direction"),
+                      (Integer) commandArguments.get("time"),
+                      (Integer) commandArguments.get("startHue"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
             },
-            () -> new DelegatedApplyUpdateResponseCallback(),
-            otaSoftwareUpdateProviderapplyUpdateRequestCommandParams);
-    otaSoftwareUpdateProviderClusterInteractionInfoMap.put(
-        "applyUpdateRequest", otaSoftwareUpdateProviderapplyUpdateRequestInteractionInfo);
-    Map<String, CommandParameterInfo> otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControlcolorLoopSetCommandParams);
+    colorControlClusterInteractionInfoMap.put(
+        "colorLoopSet", colorControlcolorLoopSetInteractionInfo);
+    Map<String, CommandParameterInfo> colorControlstopMoveStepCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo
-        otaSoftwareUpdateProvidernotifyUpdateAppliedupdateTokenCommandParameterInfo =
-            new CommandParameterInfo("updateToken", byte[].class, byte[].class);
-    otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams.put(
-        "updateToken", otaSoftwareUpdateProvidernotifyUpdateAppliedupdateTokenCommandParameterInfo);
+    CommandParameterInfo colorControlstopMoveStepoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlstopMoveStepCommandParams.put(
+        "optionsMask", colorControlstopMoveStepoptionsMaskCommandParameterInfo);
 
-    CommandParameterInfo
-        otaSoftwareUpdateProvidernotifyUpdateAppliedsoftwareVersionCommandParameterInfo =
-            new CommandParameterInfo("softwareVersion", Long.class, Long.class);
-    otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams.put(
-        "softwareVersion",
-        otaSoftwareUpdateProvidernotifyUpdateAppliedsoftwareVersionCommandParameterInfo);
+    CommandParameterInfo colorControlstopMoveStepoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlstopMoveStepCommandParams.put(
+        "optionsOverride", colorControlstopMoveStepoptionsOverrideCommandParameterInfo);
 
-    InteractionInfo otaSoftwareUpdateProvidernotifyUpdateAppliedInteractionInfo =
+    InteractionInfo colorControlstopMoveStepInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
-                  .notifyUpdateApplied(
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .stopMoveStep(
                       (DefaultClusterCallback) callback,
-                      (byte[]) commandArguments.get("updateToken"),
-                      (Long) commandArguments.get("softwareVersion"));
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams);
-    otaSoftwareUpdateProviderClusterInteractionInfoMap.put(
-        "notifyUpdateApplied", otaSoftwareUpdateProvidernotifyUpdateAppliedInteractionInfo);
-    Map<String, CommandParameterInfo> otaSoftwareUpdateProviderqueryImageCommandParams =
+            colorControlstopMoveStepCommandParams);
+    colorControlClusterInteractionInfoMap.put(
+        "stopMoveStep", colorControlstopMoveStepInteractionInfo);
+    Map<String, CommandParameterInfo> colorControlmoveColorTemperatureCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo otaSoftwareUpdateProviderqueryImagevendorIdCommandParameterInfo =
-        new CommandParameterInfo("vendorId", Integer.class, Integer.class);
-    otaSoftwareUpdateProviderqueryImageCommandParams.put(
-        "vendorId", otaSoftwareUpdateProviderqueryImagevendorIdCommandParameterInfo);
-
-    CommandParameterInfo otaSoftwareUpdateProviderqueryImageproductIdCommandParameterInfo =
-        new CommandParameterInfo("productId", Integer.class, Integer.class);
-    otaSoftwareUpdateProviderqueryImageCommandParams.put(
-        "productId", otaSoftwareUpdateProviderqueryImageproductIdCommandParameterInfo);
-
-    CommandParameterInfo otaSoftwareUpdateProviderqueryImagesoftwareVersionCommandParameterInfo =
-        new CommandParameterInfo("softwareVersion", Long.class, Long.class);
-    otaSoftwareUpdateProviderqueryImageCommandParams.put(
-        "softwareVersion", otaSoftwareUpdateProviderqueryImagesoftwareVersionCommandParameterInfo);
-
-    CommandParameterInfo otaSoftwareUpdateProviderqueryImageprotocolsSupportedCommandParameterInfo =
-        new CommandParameterInfo("protocolsSupported", ArrayList.class, Object.class);
-    otaSoftwareUpdateProviderqueryImageCommandParams.put(
-        "protocolsSupported",
-        otaSoftwareUpdateProviderqueryImageprotocolsSupportedCommandParameterInfo);
-
-    CommandParameterInfo otaSoftwareUpdateProviderqueryImagehardwareVersionCommandParameterInfo =
-        new CommandParameterInfo("hardwareVersion", Optional.class, Integer.class);
-    otaSoftwareUpdateProviderqueryImageCommandParams.put(
-        "hardwareVersion", otaSoftwareUpdateProviderqueryImagehardwareVersionCommandParameterInfo);
+    CommandParameterInfo colorControlmoveColorTemperaturemoveModeCommandParameterInfo =
+        new CommandParameterInfo("moveMode", Integer.class, Integer.class);
+    colorControlmoveColorTemperatureCommandParams.put(
+        "moveMode", colorControlmoveColorTemperaturemoveModeCommandParameterInfo);
 
-    CommandParameterInfo otaSoftwareUpdateProviderqueryImagelocationCommandParameterInfo =
-        new CommandParameterInfo("location", Optional.class, String.class);
-    otaSoftwareUpdateProviderqueryImageCommandParams.put(
-        "location", otaSoftwareUpdateProviderqueryImagelocationCommandParameterInfo);
+    CommandParameterInfo colorControlmoveColorTemperaturerateCommandParameterInfo =
+        new CommandParameterInfo("rate", Integer.class, Integer.class);
+    colorControlmoveColorTemperatureCommandParams.put(
+        "rate", colorControlmoveColorTemperaturerateCommandParameterInfo);
 
     CommandParameterInfo
-        otaSoftwareUpdateProviderqueryImagerequestorCanConsentCommandParameterInfo =
-            new CommandParameterInfo("requestorCanConsent", Optional.class, Boolean.class);
-    otaSoftwareUpdateProviderqueryImageCommandParams.put(
-        "requestorCanConsent",
-        otaSoftwareUpdateProviderqueryImagerequestorCanConsentCommandParameterInfo);
+        colorControlmoveColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo =
+            new CommandParameterInfo("colorTemperatureMinimumMireds", Integer.class, Integer.class);
+    colorControlmoveColorTemperatureCommandParams.put(
+        "colorTemperatureMinimumMireds",
+        colorControlmoveColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo);
 
     CommandParameterInfo
-        otaSoftwareUpdateProviderqueryImagemetadataForProviderCommandParameterInfo =
-            new CommandParameterInfo("metadataForProvider", Optional.class, byte[].class);
-    otaSoftwareUpdateProviderqueryImageCommandParams.put(
-        "metadataForProvider",
-        otaSoftwareUpdateProviderqueryImagemetadataForProviderCommandParameterInfo);
+        colorControlmoveColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo =
+            new CommandParameterInfo("colorTemperatureMaximumMireds", Integer.class, Integer.class);
+    colorControlmoveColorTemperatureCommandParams.put(
+        "colorTemperatureMaximumMireds",
+        colorControlmoveColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo);
 
-    InteractionInfo otaSoftwareUpdateProviderqueryImageInteractionInfo =
+    CommandParameterInfo colorControlmoveColorTemperatureoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlmoveColorTemperatureCommandParams.put(
+        "optionsMask", colorControlmoveColorTemperatureoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveColorTemperatureoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlmoveColorTemperatureCommandParams.put(
+        "optionsOverride", colorControlmoveColorTemperatureoptionsOverrideCommandParameterInfo);
+
+    InteractionInfo colorControlmoveColorTemperatureInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
-                  .queryImage(
-                      (ChipClusters.OtaSoftwareUpdateProviderCluster.QueryImageResponseCallback)
-                          callback,
-                      (Integer) commandArguments.get("vendorId"),
-                      (Integer) commandArguments.get("productId"),
-                      (Long) commandArguments.get("softwareVersion"),
-                      (ArrayList<Integer>) commandArguments.get("protocolsSupported"),
-                      (Optional<Integer>) commandArguments.get("hardwareVersion"),
-                      (Optional<String>) commandArguments.get("location"),
-                      (Optional<Boolean>) commandArguments.get("requestorCanConsent"),
-                      (Optional<byte[]>) commandArguments.get("metadataForProvider"));
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .moveColorTemperature(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("moveMode"),
+                      (Integer) commandArguments.get("rate"),
+                      (Integer) commandArguments.get("colorTemperatureMinimumMireds"),
+                      (Integer) commandArguments.get("colorTemperatureMaximumMireds"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
             },
-            () -> new DelegatedQueryImageResponseCallback(),
-            otaSoftwareUpdateProviderqueryImageCommandParams);
-    otaSoftwareUpdateProviderClusterInteractionInfoMap.put(
-        "queryImage", otaSoftwareUpdateProviderqueryImageInteractionInfo);
-    commandMap.put("otaSoftwareUpdateProvider", otaSoftwareUpdateProviderClusterInteractionInfoMap);
-    Map<String, InteractionInfo> otaSoftwareUpdateRequestorClusterInteractionInfoMap =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> otaSoftwareUpdateRequestorannounceOtaProviderCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControlmoveColorTemperatureCommandParams);
+    colorControlClusterInteractionInfoMap.put(
+        "moveColorTemperature", colorControlmoveColorTemperatureInteractionInfo);
+    Map<String, CommandParameterInfo> colorControlstepColorTemperatureCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo
-        otaSoftwareUpdateRequestorannounceOtaProviderproviderNodeIdCommandParameterInfo =
-            new CommandParameterInfo("providerNodeId", Long.class, Long.class);
-    otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
-        "providerNodeId",
-        otaSoftwareUpdateRequestorannounceOtaProviderproviderNodeIdCommandParameterInfo);
+    CommandParameterInfo colorControlstepColorTemperaturestepModeCommandParameterInfo =
+        new CommandParameterInfo("stepMode", Integer.class, Integer.class);
+    colorControlstepColorTemperatureCommandParams.put(
+        "stepMode", colorControlstepColorTemperaturestepModeCommandParameterInfo);
 
-    CommandParameterInfo otaSoftwareUpdateRequestorannounceOtaProvidervendorIdCommandParameterInfo =
-        new CommandParameterInfo("vendorId", Integer.class, Integer.class);
-    otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
-        "vendorId", otaSoftwareUpdateRequestorannounceOtaProvidervendorIdCommandParameterInfo);
+    CommandParameterInfo colorControlstepColorTemperaturestepSizeCommandParameterInfo =
+        new CommandParameterInfo("stepSize", Integer.class, Integer.class);
+    colorControlstepColorTemperatureCommandParams.put(
+        "stepSize", colorControlstepColorTemperaturestepSizeCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepColorTemperaturetransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    colorControlstepColorTemperatureCommandParams.put(
+        "transitionTime", colorControlstepColorTemperaturetransitionTimeCommandParameterInfo);
 
     CommandParameterInfo
-        otaSoftwareUpdateRequestorannounceOtaProviderannouncementReasonCommandParameterInfo =
-            new CommandParameterInfo("announcementReason", Integer.class, Integer.class);
-    otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
-        "announcementReason",
-        otaSoftwareUpdateRequestorannounceOtaProviderannouncementReasonCommandParameterInfo);
+        colorControlstepColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo =
+            new CommandParameterInfo("colorTemperatureMinimumMireds", Integer.class, Integer.class);
+    colorControlstepColorTemperatureCommandParams.put(
+        "colorTemperatureMinimumMireds",
+        colorControlstepColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo);
+
+    CommandParameterInfo
+        colorControlstepColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo =
+            new CommandParameterInfo("colorTemperatureMaximumMireds", Integer.class, Integer.class);
+    colorControlstepColorTemperatureCommandParams.put(
+        "colorTemperatureMaximumMireds",
+        colorControlstepColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo);
 
-    CommandParameterInfo
-        otaSoftwareUpdateRequestorannounceOtaProvidermetadataForNodeCommandParameterInfo =
-            new CommandParameterInfo("metadataForNode", Optional.class, byte[].class);
-    otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
-        "metadataForNode",
-        otaSoftwareUpdateRequestorannounceOtaProvidermetadataForNodeCommandParameterInfo);
+    CommandParameterInfo colorControlstepColorTemperatureoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlstepColorTemperatureCommandParams.put(
+        "optionsMask", colorControlstepColorTemperatureoptionsMaskCommandParameterInfo);
 
-    CommandParameterInfo otaSoftwareUpdateRequestorannounceOtaProviderendpointCommandParameterInfo =
-        new CommandParameterInfo("endpoint", Integer.class, Integer.class);
-    otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
-        "endpoint", otaSoftwareUpdateRequestorannounceOtaProviderendpointCommandParameterInfo);
+    CommandParameterInfo colorControlstepColorTemperatureoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlstepColorTemperatureCommandParams.put(
+        "optionsOverride", colorControlstepColorTemperatureoptionsOverrideCommandParameterInfo);
 
-    InteractionInfo otaSoftwareUpdateRequestorannounceOtaProviderInteractionInfo =
+    InteractionInfo colorControlstepColorTemperatureInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OtaSoftwareUpdateRequestorCluster) cluster)
-                  .announceOtaProvider(
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .stepColorTemperature(
                       (DefaultClusterCallback) callback,
-                      (Long) commandArguments.get("providerNodeId"),
-                      (Integer) commandArguments.get("vendorId"),
-                      (Integer) commandArguments.get("announcementReason"),
-                      (Optional<byte[]>) commandArguments.get("metadataForNode"),
-                      (Integer) commandArguments.get("endpoint"));
+                      (Integer) commandArguments.get("stepMode"),
+                      (Integer) commandArguments.get("stepSize"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("colorTemperatureMinimumMireds"),
+                      (Integer) commandArguments.get("colorTemperatureMaximumMireds"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            otaSoftwareUpdateRequestorannounceOtaProviderCommandParams);
-    otaSoftwareUpdateRequestorClusterInteractionInfoMap.put(
-        "announceOtaProvider", otaSoftwareUpdateRequestorannounceOtaProviderInteractionInfo);
+            colorControlstepColorTemperatureCommandParams);
+    colorControlClusterInteractionInfoMap.put(
+        "stepColorTemperature", colorControlstepColorTemperatureInteractionInfo);
+    commandMap.put("colorControl", colorControlClusterInteractionInfoMap);
+    Map<String, InteractionInfo> illuminanceMeasurementClusterInteractionInfoMap =
+        new LinkedHashMap<>();
+    commandMap.put("illuminanceMeasurement", illuminanceMeasurementClusterInteractionInfoMap);
+    Map<String, InteractionInfo> temperatureMeasurementClusterInteractionInfoMap =
+        new LinkedHashMap<>();
+    commandMap.put("temperatureMeasurement", temperatureMeasurementClusterInteractionInfoMap);
+    Map<String, InteractionInfo> pressureMeasurementClusterInteractionInfoMap =
+        new LinkedHashMap<>();
+    commandMap.put("pressureMeasurement", pressureMeasurementClusterInteractionInfoMap);
+    Map<String, InteractionInfo> flowMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
+    commandMap.put("flowMeasurement", flowMeasurementClusterInteractionInfoMap);
+    Map<String, InteractionInfo> relativeHumidityMeasurementClusterInteractionInfoMap =
+        new LinkedHashMap<>();
     commandMap.put(
-        "otaSoftwareUpdateRequestor", otaSoftwareUpdateRequestorClusterInteractionInfoMap);
+        "relativeHumidityMeasurement", relativeHumidityMeasurementClusterInteractionInfoMap);
     Map<String, InteractionInfo> occupancySensingClusterInteractionInfoMap = new LinkedHashMap<>();
     commandMap.put("occupancySensing", occupancySensingClusterInteractionInfoMap);
-    Map<String, InteractionInfo> onOffClusterInteractionInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> onOffoffCommandParams =
+    Map<String, InteractionInfo> wakeOnLanClusterInteractionInfoMap = new LinkedHashMap<>();
+    commandMap.put("wakeOnLan", wakeOnLanClusterInteractionInfoMap);
+    Map<String, InteractionInfo> channelClusterInteractionInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> channelchangeChannelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo onOffoffInteractionInfo =
+    CommandParameterInfo channelchangeChannelmatchCommandParameterInfo =
+        new CommandParameterInfo("match", String.class, String.class);
+    channelchangeChannelCommandParams.put("match", channelchangeChannelmatchCommandParameterInfo);
+
+    InteractionInfo channelchangeChannelInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffCluster) cluster).off((DefaultClusterCallback) callback);
+              ((ChipClusters.ChannelCluster) cluster)
+                  .changeChannel(
+                      (ChipClusters.ChannelCluster.ChangeChannelResponseCallback) callback,
+                      (String) commandArguments.get("match"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            onOffoffCommandParams);
-    onOffClusterInteractionInfoMap.put("off", onOffoffInteractionInfo);
-    Map<String, CommandParameterInfo> onOffoffWithEffectCommandParams =
+            () -> new DelegatedChangeChannelResponseCallback(),
+            channelchangeChannelCommandParams);
+    channelClusterInteractionInfoMap.put("changeChannel", channelchangeChannelInteractionInfo);
+    Map<String, CommandParameterInfo> channelchangeChannelByNumberCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo onOffoffWithEffecteffectIdCommandParameterInfo =
-        new CommandParameterInfo("effectId", Integer.class, Integer.class);
-    onOffoffWithEffectCommandParams.put("effectId", onOffoffWithEffecteffectIdCommandParameterInfo);
+    CommandParameterInfo channelchangeChannelByNumbermajorNumberCommandParameterInfo =
+        new CommandParameterInfo("majorNumber", Integer.class, Integer.class);
+    channelchangeChannelByNumberCommandParams.put(
+        "majorNumber", channelchangeChannelByNumbermajorNumberCommandParameterInfo);
 
-    CommandParameterInfo onOffoffWithEffecteffectVariantCommandParameterInfo =
-        new CommandParameterInfo("effectVariant", Integer.class, Integer.class);
-    onOffoffWithEffectCommandParams.put(
-        "effectVariant", onOffoffWithEffecteffectVariantCommandParameterInfo);
+    CommandParameterInfo channelchangeChannelByNumberminorNumberCommandParameterInfo =
+        new CommandParameterInfo("minorNumber", Integer.class, Integer.class);
+    channelchangeChannelByNumberCommandParams.put(
+        "minorNumber", channelchangeChannelByNumberminorNumberCommandParameterInfo);
 
-    InteractionInfo onOffoffWithEffectInteractionInfo =
+    InteractionInfo channelchangeChannelByNumberInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffCluster) cluster)
-                  .offWithEffect(
+              ((ChipClusters.ChannelCluster) cluster)
+                  .changeChannelByNumber(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("effectId"),
-                      (Integer) commandArguments.get("effectVariant"));
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            onOffoffWithEffectCommandParams);
-    onOffClusterInteractionInfoMap.put("offWithEffect", onOffoffWithEffectInteractionInfo);
-    Map<String, CommandParameterInfo> onOffonCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo onOffonInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffCluster) cluster).on((DefaultClusterCallback) callback);
+                      (Integer) commandArguments.get("majorNumber"),
+                      (Integer) commandArguments.get("minorNumber"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            onOffonCommandParams);
-    onOffClusterInteractionInfoMap.put("on", onOffonInteractionInfo);
-    Map<String, CommandParameterInfo> onOffonWithRecallGlobalSceneCommandParams =
+            channelchangeChannelByNumberCommandParams);
+    channelClusterInteractionInfoMap.put(
+        "changeChannelByNumber", channelchangeChannelByNumberInteractionInfo);
+    Map<String, CommandParameterInfo> channelskipChannelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo onOffonWithRecallGlobalSceneInteractionInfo =
+    CommandParameterInfo channelskipChannelcountCommandParameterInfo =
+        new CommandParameterInfo("count", Integer.class, Integer.class);
+    channelskipChannelCommandParams.put("count", channelskipChannelcountCommandParameterInfo);
+
+    InteractionInfo channelskipChannelInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffCluster) cluster)
-                  .onWithRecallGlobalScene((DefaultClusterCallback) callback);
+              ((ChipClusters.ChannelCluster) cluster)
+                  .skipChannel(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("count"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            onOffonWithRecallGlobalSceneCommandParams);
-    onOffClusterInteractionInfoMap.put(
-        "onWithRecallGlobalScene", onOffonWithRecallGlobalSceneInteractionInfo);
-    Map<String, CommandParameterInfo> onOffonWithTimedOffCommandParams =
+            channelskipChannelCommandParams);
+    channelClusterInteractionInfoMap.put("skipChannel", channelskipChannelInteractionInfo);
+    commandMap.put("channel", channelClusterInteractionInfoMap);
+    Map<String, InteractionInfo> targetNavigatorClusterInteractionInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> targetNavigatornavigateTargetCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo onOffonWithTimedOffonOffControlCommandParameterInfo =
-        new CommandParameterInfo("onOffControl", Integer.class, Integer.class);
-    onOffonWithTimedOffCommandParams.put(
-        "onOffControl", onOffonWithTimedOffonOffControlCommandParameterInfo);
-
-    CommandParameterInfo onOffonWithTimedOffonTimeCommandParameterInfo =
-        new CommandParameterInfo("onTime", Integer.class, Integer.class);
-    onOffonWithTimedOffCommandParams.put("onTime", onOffonWithTimedOffonTimeCommandParameterInfo);
+    CommandParameterInfo targetNavigatornavigateTargettargetCommandParameterInfo =
+        new CommandParameterInfo("target", Integer.class, Integer.class);
+    targetNavigatornavigateTargetCommandParams.put(
+        "target", targetNavigatornavigateTargettargetCommandParameterInfo);
 
-    CommandParameterInfo onOffonWithTimedOffoffWaitTimeCommandParameterInfo =
-        new CommandParameterInfo("offWaitTime", Integer.class, Integer.class);
-    onOffonWithTimedOffCommandParams.put(
-        "offWaitTime", onOffonWithTimedOffoffWaitTimeCommandParameterInfo);
+    CommandParameterInfo targetNavigatornavigateTargetdataCommandParameterInfo =
+        new CommandParameterInfo("data", Optional.class, String.class);
+    targetNavigatornavigateTargetCommandParams.put(
+        "data", targetNavigatornavigateTargetdataCommandParameterInfo);
 
-    InteractionInfo onOffonWithTimedOffInteractionInfo =
+    InteractionInfo targetNavigatornavigateTargetInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffCluster) cluster)
-                  .onWithTimedOff(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("onOffControl"),
-                      (Integer) commandArguments.get("onTime"),
-                      (Integer) commandArguments.get("offWaitTime"));
+              ((ChipClusters.TargetNavigatorCluster) cluster)
+                  .navigateTarget(
+                      (ChipClusters.TargetNavigatorCluster.NavigateTargetResponseCallback) callback,
+                      (Integer) commandArguments.get("target"),
+                      (Optional<String>) commandArguments.get("data"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            onOffonWithTimedOffCommandParams);
-    onOffClusterInteractionInfoMap.put("onWithTimedOff", onOffonWithTimedOffInteractionInfo);
-    Map<String, CommandParameterInfo> onOfftoggleCommandParams =
+            () -> new DelegatedNavigateTargetResponseCallback(),
+            targetNavigatornavigateTargetCommandParams);
+    targetNavigatorClusterInteractionInfoMap.put(
+        "navigateTarget", targetNavigatornavigateTargetInteractionInfo);
+    commandMap.put("targetNavigator", targetNavigatorClusterInteractionInfoMap);
+    Map<String, InteractionInfo> mediaPlaybackClusterInteractionInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> mediaPlaybackplayCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo onOfftoggleInteractionInfo =
+    InteractionInfo mediaPlaybackplayInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffCluster) cluster).toggle((DefaultClusterCallback) callback);
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .play((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback);
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            onOfftoggleCommandParams);
-    onOffClusterInteractionInfoMap.put("toggle", onOfftoggleInteractionInfo);
-    commandMap.put("onOff", onOffClusterInteractionInfoMap);
-    Map<String, InteractionInfo> onOffSwitchConfigurationClusterInteractionInfoMap =
-        new LinkedHashMap<>();
-    commandMap.put("onOffSwitchConfiguration", onOffSwitchConfigurationClusterInteractionInfoMap);
-    Map<String, InteractionInfo> operationalCredentialsClusterInteractionInfoMap =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> operationalCredentialsaddNOCCommandParams =
+            () -> new DelegatedPlaybackResponseCallback(),
+            mediaPlaybackplayCommandParams);
+    mediaPlaybackClusterInteractionInfoMap.put("play", mediaPlaybackplayInteractionInfo);
+    Map<String, CommandParameterInfo> mediaPlaybackpauseCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo operationalCredentialsaddNOCNOCValueCommandParameterInfo =
-        new CommandParameterInfo("NOCValue", byte[].class, byte[].class);
-    operationalCredentialsaddNOCCommandParams.put(
-        "NOCValue", operationalCredentialsaddNOCNOCValueCommandParameterInfo);
-
-    CommandParameterInfo operationalCredentialsaddNOCICACValueCommandParameterInfo =
-        new CommandParameterInfo("ICACValue", Optional.class, byte[].class);
-    operationalCredentialsaddNOCCommandParams.put(
-        "ICACValue", operationalCredentialsaddNOCICACValueCommandParameterInfo);
-
-    CommandParameterInfo operationalCredentialsaddNOCIPKValueCommandParameterInfo =
-        new CommandParameterInfo("IPKValue", byte[].class, byte[].class);
-    operationalCredentialsaddNOCCommandParams.put(
-        "IPKValue", operationalCredentialsaddNOCIPKValueCommandParameterInfo);
-
-    CommandParameterInfo operationalCredentialsaddNOCcaseAdminSubjectCommandParameterInfo =
-        new CommandParameterInfo("caseAdminSubject", Long.class, Long.class);
-    operationalCredentialsaddNOCCommandParams.put(
-        "caseAdminSubject", operationalCredentialsaddNOCcaseAdminSubjectCommandParameterInfo);
-
-    CommandParameterInfo operationalCredentialsaddNOCadminVendorIdCommandParameterInfo =
-        new CommandParameterInfo("adminVendorId", Integer.class, Integer.class);
-    operationalCredentialsaddNOCCommandParams.put(
-        "adminVendorId", operationalCredentialsaddNOCadminVendorIdCommandParameterInfo);
-
-    InteractionInfo operationalCredentialsaddNOCInteractionInfo =
+    InteractionInfo mediaPlaybackpauseInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
-                  .addNOC(
-                      (ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback,
-                      (byte[]) commandArguments.get("NOCValue"),
-                      (Optional<byte[]>) commandArguments.get("ICACValue"),
-                      (byte[]) commandArguments.get("IPKValue"),
-                      (Long) commandArguments.get("caseAdminSubject"),
-                      (Integer) commandArguments.get("adminVendorId"));
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .pause((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback);
             },
-            () -> new DelegatedNOCResponseCallback(),
-            operationalCredentialsaddNOCCommandParams);
-    operationalCredentialsClusterInteractionInfoMap.put(
-        "addNOC", operationalCredentialsaddNOCInteractionInfo);
-    Map<String, CommandParameterInfo> operationalCredentialsaddTrustedRootCertificateCommandParams =
+            () -> new DelegatedPlaybackResponseCallback(),
+            mediaPlaybackpauseCommandParams);
+    mediaPlaybackClusterInteractionInfoMap.put("pause", mediaPlaybackpauseInteractionInfo);
+    Map<String, CommandParameterInfo> mediaPlaybackstopPlaybackCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo
-        operationalCredentialsaddTrustedRootCertificaterootCertificateCommandParameterInfo =
-            new CommandParameterInfo("rootCertificate", byte[].class, byte[].class);
-    operationalCredentialsaddTrustedRootCertificateCommandParams.put(
-        "rootCertificate",
-        operationalCredentialsaddTrustedRootCertificaterootCertificateCommandParameterInfo);
-
-    InteractionInfo operationalCredentialsaddTrustedRootCertificateInteractionInfo =
+    InteractionInfo mediaPlaybackstopPlaybackInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
-                  .addTrustedRootCertificate(
-                      (DefaultClusterCallback) callback,
-                      (byte[]) commandArguments.get("rootCertificate"));
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .stopPlayback(
+                      (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback);
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            operationalCredentialsaddTrustedRootCertificateCommandParams);
-    operationalCredentialsClusterInteractionInfoMap.put(
-        "addTrustedRootCertificate",
-        operationalCredentialsaddTrustedRootCertificateInteractionInfo);
-    Map<String, CommandParameterInfo> operationalCredentialsattestationRequestCommandParams =
+            () -> new DelegatedPlaybackResponseCallback(),
+            mediaPlaybackstopPlaybackCommandParams);
+    mediaPlaybackClusterInteractionInfoMap.put(
+        "stopPlayback", mediaPlaybackstopPlaybackInteractionInfo);
+    Map<String, CommandParameterInfo> mediaPlaybackstartOverCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo
-        operationalCredentialsattestationRequestattestationNonceCommandParameterInfo =
-            new CommandParameterInfo("attestationNonce", byte[].class, byte[].class);
-    operationalCredentialsattestationRequestCommandParams.put(
-        "attestationNonce",
-        operationalCredentialsattestationRequestattestationNonceCommandParameterInfo);
-
-    InteractionInfo operationalCredentialsattestationRequestInteractionInfo =
+    InteractionInfo mediaPlaybackstartOverInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
-                  .attestationRequest(
-                      (ChipClusters.OperationalCredentialsCluster.AttestationResponseCallback)
-                          callback,
-                      (byte[]) commandArguments.get("attestationNonce"));
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .startOver((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback);
             },
-            () -> new DelegatedAttestationResponseCallback(),
-            operationalCredentialsattestationRequestCommandParams);
-    operationalCredentialsClusterInteractionInfoMap.put(
-        "attestationRequest", operationalCredentialsattestationRequestInteractionInfo);
-    Map<String, CommandParameterInfo> operationalCredentialsCSRRequestCommandParams =
+            () -> new DelegatedPlaybackResponseCallback(),
+            mediaPlaybackstartOverCommandParams);
+    mediaPlaybackClusterInteractionInfoMap.put("startOver", mediaPlaybackstartOverInteractionInfo);
+    Map<String, CommandParameterInfo> mediaPlaybackpreviousCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo operationalCredentialsCSRRequestCSRNonceCommandParameterInfo =
-        new CommandParameterInfo("CSRNonce", byte[].class, byte[].class);
-    operationalCredentialsCSRRequestCommandParams.put(
-        "CSRNonce", operationalCredentialsCSRRequestCSRNonceCommandParameterInfo);
-
-    CommandParameterInfo operationalCredentialsCSRRequestisForUpdateNOCCommandParameterInfo =
-        new CommandParameterInfo("isForUpdateNOC", Optional.class, Boolean.class);
-    operationalCredentialsCSRRequestCommandParams.put(
-        "isForUpdateNOC", operationalCredentialsCSRRequestisForUpdateNOCCommandParameterInfo);
-
-    InteractionInfo operationalCredentialsCSRRequestInteractionInfo =
+    InteractionInfo mediaPlaybackpreviousInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
-                  .CSRRequest(
-                      (ChipClusters.OperationalCredentialsCluster.CSRResponseCallback) callback,
-                      (byte[]) commandArguments.get("CSRNonce"),
-                      (Optional<Boolean>) commandArguments.get("isForUpdateNOC"));
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .previous((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback);
             },
-            () -> new DelegatedCSRResponseCallback(),
-            operationalCredentialsCSRRequestCommandParams);
-    operationalCredentialsClusterInteractionInfoMap.put(
-        "CSRRequest", operationalCredentialsCSRRequestInteractionInfo);
-    Map<String, CommandParameterInfo> operationalCredentialscertificateChainRequestCommandParams =
+            () -> new DelegatedPlaybackResponseCallback(),
+            mediaPlaybackpreviousCommandParams);
+    mediaPlaybackClusterInteractionInfoMap.put("previous", mediaPlaybackpreviousInteractionInfo);
+    Map<String, CommandParameterInfo> mediaPlaybacknextCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo
-        operationalCredentialscertificateChainRequestcertificateTypeCommandParameterInfo =
-            new CommandParameterInfo("certificateType", Integer.class, Integer.class);
-    operationalCredentialscertificateChainRequestCommandParams.put(
-        "certificateType",
-        operationalCredentialscertificateChainRequestcertificateTypeCommandParameterInfo);
-
-    InteractionInfo operationalCredentialscertificateChainRequestInteractionInfo =
+    InteractionInfo mediaPlaybacknextInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
-                  .certificateChainRequest(
-                      (ChipClusters.OperationalCredentialsCluster.CertificateChainResponseCallback)
-                          callback,
-                      (Integer) commandArguments.get("certificateType"));
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .next((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback);
             },
-            () -> new DelegatedCertificateChainResponseCallback(),
-            operationalCredentialscertificateChainRequestCommandParams);
-    operationalCredentialsClusterInteractionInfoMap.put(
-        "certificateChainRequest", operationalCredentialscertificateChainRequestInteractionInfo);
-    Map<String, CommandParameterInfo> operationalCredentialsremoveFabricCommandParams =
+            () -> new DelegatedPlaybackResponseCallback(),
+            mediaPlaybacknextCommandParams);
+    mediaPlaybackClusterInteractionInfoMap.put("next", mediaPlaybacknextInteractionInfo);
+    Map<String, CommandParameterInfo> mediaPlaybackrewindCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo operationalCredentialsremoveFabricfabricIndexCommandParameterInfo =
-        new CommandParameterInfo("fabricIndex", Integer.class, Integer.class);
-    operationalCredentialsremoveFabricCommandParams.put(
-        "fabricIndex", operationalCredentialsremoveFabricfabricIndexCommandParameterInfo);
-
-    InteractionInfo operationalCredentialsremoveFabricInteractionInfo =
+    InteractionInfo mediaPlaybackrewindInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
-                  .removeFabric(
-                      (ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback,
-                      (Integer) commandArguments.get("fabricIndex"));
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .rewind((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback);
             },
-            () -> new DelegatedNOCResponseCallback(),
-            operationalCredentialsremoveFabricCommandParams);
-    operationalCredentialsClusterInteractionInfoMap.put(
-        "removeFabric", operationalCredentialsremoveFabricInteractionInfo);
-    Map<String, CommandParameterInfo> operationalCredentialsupdateFabricLabelCommandParams =
+            () -> new DelegatedPlaybackResponseCallback(),
+            mediaPlaybackrewindCommandParams);
+    mediaPlaybackClusterInteractionInfoMap.put("rewind", mediaPlaybackrewindInteractionInfo);
+    Map<String, CommandParameterInfo> mediaPlaybackfastForwardCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo operationalCredentialsupdateFabricLabellabelCommandParameterInfo =
-        new CommandParameterInfo("label", String.class, String.class);
-    operationalCredentialsupdateFabricLabelCommandParams.put(
-        "label", operationalCredentialsupdateFabricLabellabelCommandParameterInfo);
-
-    InteractionInfo operationalCredentialsupdateFabricLabelInteractionInfo =
+    InteractionInfo mediaPlaybackfastForwardInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
-                  .updateFabricLabel(
-                      (ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback,
-                      (String) commandArguments.get("label"));
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .fastForward(
+                      (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback);
             },
-            () -> new DelegatedNOCResponseCallback(),
-            operationalCredentialsupdateFabricLabelCommandParams);
-    operationalCredentialsClusterInteractionInfoMap.put(
-        "updateFabricLabel", operationalCredentialsupdateFabricLabelInteractionInfo);
-    Map<String, CommandParameterInfo> operationalCredentialsupdateNOCCommandParams =
+            () -> new DelegatedPlaybackResponseCallback(),
+            mediaPlaybackfastForwardCommandParams);
+    mediaPlaybackClusterInteractionInfoMap.put(
+        "fastForward", mediaPlaybackfastForwardInteractionInfo);
+    Map<String, CommandParameterInfo> mediaPlaybackskipForwardCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo operationalCredentialsupdateNOCNOCValueCommandParameterInfo =
-        new CommandParameterInfo("NOCValue", byte[].class, byte[].class);
-    operationalCredentialsupdateNOCCommandParams.put(
-        "NOCValue", operationalCredentialsupdateNOCNOCValueCommandParameterInfo);
-
-    CommandParameterInfo operationalCredentialsupdateNOCICACValueCommandParameterInfo =
-        new CommandParameterInfo("ICACValue", Optional.class, byte[].class);
-    operationalCredentialsupdateNOCCommandParams.put(
-        "ICACValue", operationalCredentialsupdateNOCICACValueCommandParameterInfo);
+    CommandParameterInfo mediaPlaybackskipForwarddeltaPositionMillisecondsCommandParameterInfo =
+        new CommandParameterInfo("deltaPositionMilliseconds", Long.class, Long.class);
+    mediaPlaybackskipForwardCommandParams.put(
+        "deltaPositionMilliseconds",
+        mediaPlaybackskipForwarddeltaPositionMillisecondsCommandParameterInfo);
 
-    InteractionInfo operationalCredentialsupdateNOCInteractionInfo =
+    InteractionInfo mediaPlaybackskipForwardInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
-                  .updateNOC(
-                      (ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback,
-                      (byte[]) commandArguments.get("NOCValue"),
-                      (Optional<byte[]>) commandArguments.get("ICACValue"));
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .skipForward(
+                      (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback,
+                      (Long) commandArguments.get("deltaPositionMilliseconds"));
             },
-            () -> new DelegatedNOCResponseCallback(),
-            operationalCredentialsupdateNOCCommandParams);
-    operationalCredentialsClusterInteractionInfoMap.put(
-        "updateNOC", operationalCredentialsupdateNOCInteractionInfo);
-    commandMap.put("operationalCredentials", operationalCredentialsClusterInteractionInfoMap);
-    Map<String, InteractionInfo> powerSourceClusterInteractionInfoMap = new LinkedHashMap<>();
-    commandMap.put("powerSource", powerSourceClusterInteractionInfoMap);
-    Map<String, InteractionInfo> powerSourceConfigurationClusterInteractionInfoMap =
-        new LinkedHashMap<>();
-    commandMap.put("powerSourceConfiguration", powerSourceConfigurationClusterInteractionInfoMap);
-    Map<String, InteractionInfo> pressureMeasurementClusterInteractionInfoMap =
-        new LinkedHashMap<>();
-    commandMap.put("pressureMeasurement", pressureMeasurementClusterInteractionInfoMap);
-    Map<String, InteractionInfo> pumpConfigurationAndControlClusterInteractionInfoMap =
-        new LinkedHashMap<>();
-    commandMap.put(
-        "pumpConfigurationAndControl", pumpConfigurationAndControlClusterInteractionInfoMap);
-    Map<String, InteractionInfo> relativeHumidityMeasurementClusterInteractionInfoMap =
-        new LinkedHashMap<>();
-    commandMap.put(
-        "relativeHumidityMeasurement", relativeHumidityMeasurementClusterInteractionInfoMap);
-    Map<String, InteractionInfo> scenesClusterInteractionInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> scenesaddSceneCommandParams =
+            () -> new DelegatedPlaybackResponseCallback(),
+            mediaPlaybackskipForwardCommandParams);
+    mediaPlaybackClusterInteractionInfoMap.put(
+        "skipForward", mediaPlaybackskipForwardInteractionInfo);
+    Map<String, CommandParameterInfo> mediaPlaybackskipBackwardCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo scenesaddScenegroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class, Integer.class);
-    scenesaddSceneCommandParams.put("groupId", scenesaddScenegroupIdCommandParameterInfo);
-
-    CommandParameterInfo scenesaddScenesceneIdCommandParameterInfo =
-        new CommandParameterInfo("sceneId", Integer.class, Integer.class);
-    scenesaddSceneCommandParams.put("sceneId", scenesaddScenesceneIdCommandParameterInfo);
-
-    CommandParameterInfo scenesaddScenetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-    scenesaddSceneCommandParams.put(
-        "transitionTime", scenesaddScenetransitionTimeCommandParameterInfo);
-
-    CommandParameterInfo scenesaddScenesceneNameCommandParameterInfo =
-        new CommandParameterInfo("sceneName", String.class, String.class);
-    scenesaddSceneCommandParams.put("sceneName", scenesaddScenesceneNameCommandParameterInfo);
+    CommandParameterInfo mediaPlaybackskipBackwarddeltaPositionMillisecondsCommandParameterInfo =
+        new CommandParameterInfo("deltaPositionMilliseconds", Long.class, Long.class);
+    mediaPlaybackskipBackwardCommandParams.put(
+        "deltaPositionMilliseconds",
+        mediaPlaybackskipBackwarddeltaPositionMillisecondsCommandParameterInfo);
 
-    InteractionInfo scenesaddSceneInteractionInfo =
+    InteractionInfo mediaPlaybackskipBackwardInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ScenesCluster) cluster)
-                  .addScene(
-                      (ChipClusters.ScenesCluster.AddSceneResponseCallback) callback,
-                      (Integer) commandArguments.get("groupId"),
-                      (Integer) commandArguments.get("sceneId"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (String) commandArguments.get("sceneName"),
-                      (ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>)
-                          commandArguments.get("extensionFieldSets"));
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .skipBackward(
+                      (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback,
+                      (Long) commandArguments.get("deltaPositionMilliseconds"));
             },
-            () -> new DelegatedAddSceneResponseCallback(),
-            scenesaddSceneCommandParams);
-    scenesClusterInteractionInfoMap.put("addScene", scenesaddSceneInteractionInfo);
-    Map<String, CommandParameterInfo> scenesgetSceneMembershipCommandParams =
+            () -> new DelegatedPlaybackResponseCallback(),
+            mediaPlaybackskipBackwardCommandParams);
+    mediaPlaybackClusterInteractionInfoMap.put(
+        "skipBackward", mediaPlaybackskipBackwardInteractionInfo);
+    Map<String, CommandParameterInfo> mediaPlaybackseekCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo scenesgetSceneMembershipgroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class, Integer.class);
-    scenesgetSceneMembershipCommandParams.put(
-        "groupId", scenesgetSceneMembershipgroupIdCommandParameterInfo);
+    CommandParameterInfo mediaPlaybackseekpositionCommandParameterInfo =
+        new CommandParameterInfo("position", Long.class, Long.class);
+    mediaPlaybackseekCommandParams.put("position", mediaPlaybackseekpositionCommandParameterInfo);
 
-    InteractionInfo scenesgetSceneMembershipInteractionInfo =
+    InteractionInfo mediaPlaybackseekInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ScenesCluster) cluster)
-                  .getSceneMembership(
-                      (ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback) callback,
-                      (Integer) commandArguments.get("groupId"));
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .seek(
+                      (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback,
+                      (Long) commandArguments.get("position"));
             },
-            () -> new DelegatedGetSceneMembershipResponseCallback(),
-            scenesgetSceneMembershipCommandParams);
-    scenesClusterInteractionInfoMap.put(
-        "getSceneMembership", scenesgetSceneMembershipInteractionInfo);
-    Map<String, CommandParameterInfo> scenesrecallSceneCommandParams =
+            () -> new DelegatedPlaybackResponseCallback(),
+            mediaPlaybackseekCommandParams);
+    mediaPlaybackClusterInteractionInfoMap.put("seek", mediaPlaybackseekInteractionInfo);
+    commandMap.put("mediaPlayback", mediaPlaybackClusterInteractionInfoMap);
+    Map<String, InteractionInfo> mediaInputClusterInteractionInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> mediaInputselectInputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo scenesrecallScenegroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class, Integer.class);
-    scenesrecallSceneCommandParams.put("groupId", scenesrecallScenegroupIdCommandParameterInfo);
-
-    CommandParameterInfo scenesrecallScenesceneIdCommandParameterInfo =
-        new CommandParameterInfo("sceneId", Integer.class, Integer.class);
-    scenesrecallSceneCommandParams.put("sceneId", scenesrecallScenesceneIdCommandParameterInfo);
-
-    CommandParameterInfo scenesrecallScenetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Optional.class, Integer.class);
-    scenesrecallSceneCommandParams.put(
-        "transitionTime", scenesrecallScenetransitionTimeCommandParameterInfo);
+    CommandParameterInfo mediaInputselectInputindexCommandParameterInfo =
+        new CommandParameterInfo("index", Integer.class, Integer.class);
+    mediaInputselectInputCommandParams.put("index", mediaInputselectInputindexCommandParameterInfo);
 
-    InteractionInfo scenesrecallSceneInteractionInfo =
+    InteractionInfo mediaInputselectInputInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ScenesCluster) cluster)
-                  .recallScene(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("groupId"),
-                      (Integer) commandArguments.get("sceneId"),
-                      (Optional<Integer>) commandArguments.get("transitionTime"));
+              ((ChipClusters.MediaInputCluster) cluster)
+                  .selectInput(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("index"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            scenesrecallSceneCommandParams);
-    scenesClusterInteractionInfoMap.put("recallScene", scenesrecallSceneInteractionInfo);
-    Map<String, CommandParameterInfo> scenesremoveAllScenesCommandParams =
+            mediaInputselectInputCommandParams);
+    mediaInputClusterInteractionInfoMap.put("selectInput", mediaInputselectInputInteractionInfo);
+    Map<String, CommandParameterInfo> mediaInputshowInputStatusCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo scenesremoveAllScenesgroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class, Integer.class);
-    scenesremoveAllScenesCommandParams.put(
-        "groupId", scenesremoveAllScenesgroupIdCommandParameterInfo);
-
-    InteractionInfo scenesremoveAllScenesInteractionInfo =
+    InteractionInfo mediaInputshowInputStatusInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ScenesCluster) cluster)
-                  .removeAllScenes(
-                      (ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback) callback,
-                      (Integer) commandArguments.get("groupId"));
+              ((ChipClusters.MediaInputCluster) cluster)
+                  .showInputStatus((DefaultClusterCallback) callback);
             },
-            () -> new DelegatedRemoveAllScenesResponseCallback(),
-            scenesremoveAllScenesCommandParams);
-    scenesClusterInteractionInfoMap.put("removeAllScenes", scenesremoveAllScenesInteractionInfo);
-    Map<String, CommandParameterInfo> scenesremoveSceneCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            mediaInputshowInputStatusCommandParams);
+    mediaInputClusterInteractionInfoMap.put(
+        "showInputStatus", mediaInputshowInputStatusInteractionInfo);
+    Map<String, CommandParameterInfo> mediaInputhideInputStatusCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo scenesremoveScenegroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class, Integer.class);
-    scenesremoveSceneCommandParams.put("groupId", scenesremoveScenegroupIdCommandParameterInfo);
-
-    CommandParameterInfo scenesremoveScenesceneIdCommandParameterInfo =
-        new CommandParameterInfo("sceneId", Integer.class, Integer.class);
-    scenesremoveSceneCommandParams.put("sceneId", scenesremoveScenesceneIdCommandParameterInfo);
-
-    InteractionInfo scenesremoveSceneInteractionInfo =
+    InteractionInfo mediaInputhideInputStatusInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ScenesCluster) cluster)
-                  .removeScene(
-                      (ChipClusters.ScenesCluster.RemoveSceneResponseCallback) callback,
-                      (Integer) commandArguments.get("groupId"),
-                      (Integer) commandArguments.get("sceneId"));
+              ((ChipClusters.MediaInputCluster) cluster)
+                  .hideInputStatus((DefaultClusterCallback) callback);
             },
-            () -> new DelegatedRemoveSceneResponseCallback(),
-            scenesremoveSceneCommandParams);
-    scenesClusterInteractionInfoMap.put("removeScene", scenesremoveSceneInteractionInfo);
-    Map<String, CommandParameterInfo> scenesstoreSceneCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            mediaInputhideInputStatusCommandParams);
+    mediaInputClusterInteractionInfoMap.put(
+        "hideInputStatus", mediaInputhideInputStatusInteractionInfo);
+    Map<String, CommandParameterInfo> mediaInputrenameInputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo scenesstoreScenegroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class, Integer.class);
-    scenesstoreSceneCommandParams.put("groupId", scenesstoreScenegroupIdCommandParameterInfo);
+    CommandParameterInfo mediaInputrenameInputindexCommandParameterInfo =
+        new CommandParameterInfo("index", Integer.class, Integer.class);
+    mediaInputrenameInputCommandParams.put("index", mediaInputrenameInputindexCommandParameterInfo);
 
-    CommandParameterInfo scenesstoreScenesceneIdCommandParameterInfo =
-        new CommandParameterInfo("sceneId", Integer.class, Integer.class);
-    scenesstoreSceneCommandParams.put("sceneId", scenesstoreScenesceneIdCommandParameterInfo);
+    CommandParameterInfo mediaInputrenameInputnameCommandParameterInfo =
+        new CommandParameterInfo("name", String.class, String.class);
+    mediaInputrenameInputCommandParams.put("name", mediaInputrenameInputnameCommandParameterInfo);
 
-    InteractionInfo scenesstoreSceneInteractionInfo =
+    InteractionInfo mediaInputrenameInputInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ScenesCluster) cluster)
-                  .storeScene(
-                      (ChipClusters.ScenesCluster.StoreSceneResponseCallback) callback,
-                      (Integer) commandArguments.get("groupId"),
-                      (Integer) commandArguments.get("sceneId"));
+              ((ChipClusters.MediaInputCluster) cluster)
+                  .renameInput(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("index"),
+                      (String) commandArguments.get("name"));
             },
-            () -> new DelegatedStoreSceneResponseCallback(),
-            scenesstoreSceneCommandParams);
-    scenesClusterInteractionInfoMap.put("storeScene", scenesstoreSceneInteractionInfo);
-    Map<String, CommandParameterInfo> scenesviewSceneCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            mediaInputrenameInputCommandParams);
+    mediaInputClusterInteractionInfoMap.put("renameInput", mediaInputrenameInputInteractionInfo);
+    commandMap.put("mediaInput", mediaInputClusterInteractionInfoMap);
+    Map<String, InteractionInfo> lowPowerClusterInteractionInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> lowPowersleepCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo scenesviewScenegroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class, Integer.class);
-    scenesviewSceneCommandParams.put("groupId", scenesviewScenegroupIdCommandParameterInfo);
-
-    CommandParameterInfo scenesviewScenesceneIdCommandParameterInfo =
-        new CommandParameterInfo("sceneId", Integer.class, Integer.class);
-    scenesviewSceneCommandParams.put("sceneId", scenesviewScenesceneIdCommandParameterInfo);
-
-    InteractionInfo scenesviewSceneInteractionInfo =
+    InteractionInfo lowPowersleepInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ScenesCluster) cluster)
-                  .viewScene(
-                      (ChipClusters.ScenesCluster.ViewSceneResponseCallback) callback,
-                      (Integer) commandArguments.get("groupId"),
-                      (Integer) commandArguments.get("sceneId"));
+              ((ChipClusters.LowPowerCluster) cluster).sleep((DefaultClusterCallback) callback);
             },
-            () -> new DelegatedViewSceneResponseCallback(),
-            scenesviewSceneCommandParams);
-    scenesClusterInteractionInfoMap.put("viewScene", scenesviewSceneInteractionInfo);
-    commandMap.put("scenes", scenesClusterInteractionInfoMap);
-    Map<String, InteractionInfo> softwareDiagnosticsClusterInteractionInfoMap =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> softwareDiagnosticsresetWatermarksCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            lowPowersleepCommandParams);
+    lowPowerClusterInteractionInfoMap.put("sleep", lowPowersleepInteractionInfo);
+    commandMap.put("lowPower", lowPowerClusterInteractionInfoMap);
+    Map<String, InteractionInfo> keypadInputClusterInteractionInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> keypadInputsendKeyCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo softwareDiagnosticsresetWatermarksInteractionInfo =
+    CommandParameterInfo keypadInputsendKeykeyCodeCommandParameterInfo =
+        new CommandParameterInfo("keyCode", Integer.class, Integer.class);
+    keypadInputsendKeyCommandParams.put("keyCode", keypadInputsendKeykeyCodeCommandParameterInfo);
+
+    InteractionInfo keypadInputsendKeyInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
-                  .resetWatermarks((DefaultClusterCallback) callback);
+              ((ChipClusters.KeypadInputCluster) cluster)
+                  .sendKey(
+                      (ChipClusters.KeypadInputCluster.SendKeyResponseCallback) callback,
+                      (Integer) commandArguments.get("keyCode"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            softwareDiagnosticsresetWatermarksCommandParams);
-    softwareDiagnosticsClusterInteractionInfoMap.put(
-        "resetWatermarks", softwareDiagnosticsresetWatermarksInteractionInfo);
-    commandMap.put("softwareDiagnostics", softwareDiagnosticsClusterInteractionInfoMap);
-    Map<String, InteractionInfo> switchClusterInteractionInfoMap = new LinkedHashMap<>();
-    commandMap.put("switch", switchClusterInteractionInfoMap);
-    Map<String, InteractionInfo> targetNavigatorClusterInteractionInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> targetNavigatornavigateTargetCommandParams =
+            () -> new DelegatedSendKeyResponseCallback(),
+            keypadInputsendKeyCommandParams);
+    keypadInputClusterInteractionInfoMap.put("sendKey", keypadInputsendKeyInteractionInfo);
+    commandMap.put("keypadInput", keypadInputClusterInteractionInfoMap);
+    Map<String, InteractionInfo> contentLauncherClusterInteractionInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> contentLauncherlaunchContentCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo targetNavigatornavigateTargettargetCommandParameterInfo =
-        new CommandParameterInfo("target", Integer.class, Integer.class);
-    targetNavigatornavigateTargetCommandParams.put(
-        "target", targetNavigatornavigateTargettargetCommandParameterInfo);
+    CommandParameterInfo contentLauncherlaunchContentautoPlayCommandParameterInfo =
+        new CommandParameterInfo("autoPlay", Boolean.class, Boolean.class);
+    contentLauncherlaunchContentCommandParams.put(
+        "autoPlay", contentLauncherlaunchContentautoPlayCommandParameterInfo);
 
-    CommandParameterInfo targetNavigatornavigateTargetdataCommandParameterInfo =
+    CommandParameterInfo contentLauncherlaunchContentdataCommandParameterInfo =
         new CommandParameterInfo("data", Optional.class, String.class);
-    targetNavigatornavigateTargetCommandParams.put(
-        "data", targetNavigatornavigateTargetdataCommandParameterInfo);
+    contentLauncherlaunchContentCommandParams.put(
+        "data", contentLauncherlaunchContentdataCommandParameterInfo);
 
-    InteractionInfo targetNavigatornavigateTargetInteractionInfo =
+    InteractionInfo contentLauncherlaunchContentInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TargetNavigatorCluster) cluster)
-                  .navigateTarget(
-                      (ChipClusters.TargetNavigatorCluster.NavigateTargetResponseCallback) callback,
-                      (Integer) commandArguments.get("target"),
+              ((ChipClusters.ContentLauncherCluster) cluster)
+                  .launchContent(
+                      (ChipClusters.ContentLauncherCluster.LaunchResponseCallback) callback,
+                      (ChipStructs.ContentLauncherClusterContentSearch)
+                          commandArguments.get("search"),
+                      (Boolean) commandArguments.get("autoPlay"),
                       (Optional<String>) commandArguments.get("data"));
             },
-            () -> new DelegatedNavigateTargetResponseCallback(),
-            targetNavigatornavigateTargetCommandParams);
-    targetNavigatorClusterInteractionInfoMap.put(
-        "navigateTarget", targetNavigatornavigateTargetInteractionInfo);
-    commandMap.put("targetNavigator", targetNavigatorClusterInteractionInfoMap);
-    Map<String, InteractionInfo> temperatureMeasurementClusterInteractionInfoMap =
-        new LinkedHashMap<>();
-    commandMap.put("temperatureMeasurement", temperatureMeasurementClusterInteractionInfoMap);
-    Map<String, InteractionInfo> testClusterClusterInteractionInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> testClustersimpleStructEchoRequestCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo testClustersimpleStructEchoRequestInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .simpleStructEchoRequest(
-                      (ChipClusters.TestClusterCluster.SimpleStructResponseCallback) callback,
-                      (ChipStructs.TestClusterClusterSimpleStruct) commandArguments.get("arg1"));
-            },
-            () -> new DelegatedSimpleStructResponseCallback(),
-            testClustersimpleStructEchoRequestCommandParams);
-    testClusterClusterInteractionInfoMap.put(
-        "simpleStructEchoRequest", testClustersimpleStructEchoRequestInteractionInfo);
-    Map<String, CommandParameterInfo> testClustertestCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo testClustertestInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster).test((DefaultClusterCallback) callback);
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            testClustertestCommandParams);
-    testClusterClusterInteractionInfoMap.put("test", testClustertestInteractionInfo);
-    Map<String, CommandParameterInfo> testClustertestAddArgumentsCommandParams =
+            () -> new DelegatedLaunchResponseCallback(),
+            contentLauncherlaunchContentCommandParams);
+    contentLauncherClusterInteractionInfoMap.put(
+        "launchContent", contentLauncherlaunchContentInteractionInfo);
+    Map<String, CommandParameterInfo> contentLauncherlaunchURLCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo testClustertestAddArgumentsarg1CommandParameterInfo =
-        new CommandParameterInfo("arg1", Integer.class, Integer.class);
-    testClustertestAddArgumentsCommandParams.put(
-        "arg1", testClustertestAddArgumentsarg1CommandParameterInfo);
+    CommandParameterInfo contentLauncherlaunchURLcontentURLCommandParameterInfo =
+        new CommandParameterInfo("contentURL", String.class, String.class);
+    contentLauncherlaunchURLCommandParams.put(
+        "contentURL", contentLauncherlaunchURLcontentURLCommandParameterInfo);
 
-    CommandParameterInfo testClustertestAddArgumentsarg2CommandParameterInfo =
-        new CommandParameterInfo("arg2", Integer.class, Integer.class);
-    testClustertestAddArgumentsCommandParams.put(
-        "arg2", testClustertestAddArgumentsarg2CommandParameterInfo);
+    CommandParameterInfo contentLauncherlaunchURLdisplayStringCommandParameterInfo =
+        new CommandParameterInfo("displayString", Optional.class, String.class);
+    contentLauncherlaunchURLCommandParams.put(
+        "displayString", contentLauncherlaunchURLdisplayStringCommandParameterInfo);
 
-    InteractionInfo testClustertestAddArgumentsInteractionInfo =
+    InteractionInfo contentLauncherlaunchURLInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .testAddArguments(
-                      (ChipClusters.TestClusterCluster.TestAddArgumentsResponseCallback) callback,
-                      (Integer) commandArguments.get("arg1"),
-                      (Integer) commandArguments.get("arg2"));
+              ((ChipClusters.ContentLauncherCluster) cluster)
+                  .launchURL(
+                      (ChipClusters.ContentLauncherCluster.LaunchResponseCallback) callback,
+                      (String) commandArguments.get("contentURL"),
+                      (Optional<String>) commandArguments.get("displayString"),
+                      (Optional<ChipStructs.ContentLauncherClusterBrandingInformation>)
+                          commandArguments.get("brandingInformation"));
             },
-            () -> new DelegatedTestAddArgumentsResponseCallback(),
-            testClustertestAddArgumentsCommandParams);
-    testClusterClusterInteractionInfoMap.put(
-        "testAddArguments", testClustertestAddArgumentsInteractionInfo);
-    Map<String, CommandParameterInfo> testClustertestEmitTestEventRequestCommandParams =
+            () -> new DelegatedLaunchResponseCallback(),
+            contentLauncherlaunchURLCommandParams);
+    contentLauncherClusterInteractionInfoMap.put(
+        "launchURL", contentLauncherlaunchURLInteractionInfo);
+    commandMap.put("contentLauncher", contentLauncherClusterInteractionInfoMap);
+    Map<String, InteractionInfo> audioOutputClusterInteractionInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> audioOutputselectOutputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo testClustertestEmitTestEventRequestarg1CommandParameterInfo =
-        new CommandParameterInfo("arg1", Integer.class, Integer.class);
-    testClustertestEmitTestEventRequestCommandParams.put(
-        "arg1", testClustertestEmitTestEventRequestarg1CommandParameterInfo);
-
-    CommandParameterInfo testClustertestEmitTestEventRequestarg2CommandParameterInfo =
-        new CommandParameterInfo("arg2", Integer.class, Integer.class);
-    testClustertestEmitTestEventRequestCommandParams.put(
-        "arg2", testClustertestEmitTestEventRequestarg2CommandParameterInfo);
-
-    CommandParameterInfo testClustertestEmitTestEventRequestarg3CommandParameterInfo =
-        new CommandParameterInfo("arg3", Boolean.class, Boolean.class);
-    testClustertestEmitTestEventRequestCommandParams.put(
-        "arg3", testClustertestEmitTestEventRequestarg3CommandParameterInfo);
+    CommandParameterInfo audioOutputselectOutputindexCommandParameterInfo =
+        new CommandParameterInfo("index", Integer.class, Integer.class);
+    audioOutputselectOutputCommandParams.put(
+        "index", audioOutputselectOutputindexCommandParameterInfo);
 
-    InteractionInfo testClustertestEmitTestEventRequestInteractionInfo =
+    InteractionInfo audioOutputselectOutputInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .testEmitTestEventRequest(
-                      (ChipClusters.TestClusterCluster.TestEmitTestEventResponseCallback) callback,
-                      (Integer) commandArguments.get("arg1"),
-                      (Integer) commandArguments.get("arg2"),
-                      (Boolean) commandArguments.get("arg3"));
+              ((ChipClusters.AudioOutputCluster) cluster)
+                  .selectOutput(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("index"));
             },
-            () -> new DelegatedTestEmitTestEventResponseCallback(),
-            testClustertestEmitTestEventRequestCommandParams);
-    testClusterClusterInteractionInfoMap.put(
-        "testEmitTestEventRequest", testClustertestEmitTestEventRequestInteractionInfo);
-    Map<String, CommandParameterInfo> testClustertestEnumsRequestCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            audioOutputselectOutputCommandParams);
+    audioOutputClusterInteractionInfoMap.put(
+        "selectOutput", audioOutputselectOutputInteractionInfo);
+    Map<String, CommandParameterInfo> audioOutputrenameOutputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo testClustertestEnumsRequestarg1CommandParameterInfo =
-        new CommandParameterInfo("arg1", Integer.class, Integer.class);
-    testClustertestEnumsRequestCommandParams.put(
-        "arg1", testClustertestEnumsRequestarg1CommandParameterInfo);
+    CommandParameterInfo audioOutputrenameOutputindexCommandParameterInfo =
+        new CommandParameterInfo("index", Integer.class, Integer.class);
+    audioOutputrenameOutputCommandParams.put(
+        "index", audioOutputrenameOutputindexCommandParameterInfo);
 
-    CommandParameterInfo testClustertestEnumsRequestarg2CommandParameterInfo =
-        new CommandParameterInfo("arg2", Integer.class, Integer.class);
-    testClustertestEnumsRequestCommandParams.put(
-        "arg2", testClustertestEnumsRequestarg2CommandParameterInfo);
+    CommandParameterInfo audioOutputrenameOutputnameCommandParameterInfo =
+        new CommandParameterInfo("name", String.class, String.class);
+    audioOutputrenameOutputCommandParams.put(
+        "name", audioOutputrenameOutputnameCommandParameterInfo);
 
-    InteractionInfo testClustertestEnumsRequestInteractionInfo =
+    InteractionInfo audioOutputrenameOutputInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .testEnumsRequest(
-                      (ChipClusters.TestClusterCluster.TestEnumsResponseCallback) callback,
-                      (Integer) commandArguments.get("arg1"),
-                      (Integer) commandArguments.get("arg2"));
+              ((ChipClusters.AudioOutputCluster) cluster)
+                  .renameOutput(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("index"),
+                      (String) commandArguments.get("name"));
             },
-            () -> new DelegatedTestEnumsResponseCallback(),
-            testClustertestEnumsRequestCommandParams);
-    testClusterClusterInteractionInfoMap.put(
-        "testEnumsRequest", testClustertestEnumsRequestInteractionInfo);
-    Map<String, CommandParameterInfo> testClustertestListInt8UArgumentRequestCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            audioOutputrenameOutputCommandParams);
+    audioOutputClusterInteractionInfoMap.put(
+        "renameOutput", audioOutputrenameOutputInteractionInfo);
+    commandMap.put("audioOutput", audioOutputClusterInteractionInfoMap);
+    Map<String, InteractionInfo> applicationLauncherClusterInteractionInfoMap =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> applicationLauncherlaunchAppCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo testClustertestListInt8UArgumentRequestarg1CommandParameterInfo =
-        new CommandParameterInfo("arg1", ArrayList.class, Object.class);
-    testClustertestListInt8UArgumentRequestCommandParams.put(
-        "arg1", testClustertestListInt8UArgumentRequestarg1CommandParameterInfo);
+    CommandParameterInfo applicationLauncherlaunchAppdataCommandParameterInfo =
+        new CommandParameterInfo("data", Optional.class, byte[].class);
+    applicationLauncherlaunchAppCommandParams.put(
+        "data", applicationLauncherlaunchAppdataCommandParameterInfo);
 
-    InteractionInfo testClustertestListInt8UArgumentRequestInteractionInfo =
+    InteractionInfo applicationLauncherlaunchAppInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .testListInt8UArgumentRequest(
-                      (ChipClusters.TestClusterCluster.BooleanResponseCallback) callback,
-                      (ArrayList<Integer>) commandArguments.get("arg1"));
+              ((ChipClusters.ApplicationLauncherCluster) cluster)
+                  .launchApp(
+                      (ChipClusters.ApplicationLauncherCluster.LauncherResponseCallback) callback,
+                      (ChipStructs.ApplicationLauncherClusterApplication)
+                          commandArguments.get("application"),
+                      (Optional<byte[]>) commandArguments.get("data"));
             },
-            () -> new DelegatedBooleanResponseCallback(),
-            testClustertestListInt8UArgumentRequestCommandParams);
-    testClusterClusterInteractionInfoMap.put(
-        "testListInt8UArgumentRequest", testClustertestListInt8UArgumentRequestInteractionInfo);
-    Map<String, CommandParameterInfo> testClustertestListInt8UReverseRequestCommandParams =
+            () -> new DelegatedLauncherResponseCallback(),
+            applicationLauncherlaunchAppCommandParams);
+    applicationLauncherClusterInteractionInfoMap.put(
+        "launchApp", applicationLauncherlaunchAppInteractionInfo);
+    Map<String, CommandParameterInfo> applicationLauncherstopAppCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo testClustertestListInt8UReverseRequestarg1CommandParameterInfo =
-        new CommandParameterInfo("arg1", ArrayList.class, Object.class);
-    testClustertestListInt8UReverseRequestCommandParams.put(
-        "arg1", testClustertestListInt8UReverseRequestarg1CommandParameterInfo);
-
-    InteractionInfo testClustertestListInt8UReverseRequestInteractionInfo =
+    InteractionInfo applicationLauncherstopAppInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .testListInt8UReverseRequest(
-                      (ChipClusters.TestClusterCluster.TestListInt8UReverseResponseCallback)
-                          callback,
-                      (ArrayList<Integer>) commandArguments.get("arg1"));
+              ((ChipClusters.ApplicationLauncherCluster) cluster)
+                  .stopApp(
+                      (ChipClusters.ApplicationLauncherCluster.LauncherResponseCallback) callback,
+                      (ChipStructs.ApplicationLauncherClusterApplication)
+                          commandArguments.get("application"));
             },
-            () -> new DelegatedTestListInt8UReverseResponseCallback(),
-            testClustertestListInt8UReverseRequestCommandParams);
-    testClusterClusterInteractionInfoMap.put(
-        "testListInt8UReverseRequest", testClustertestListInt8UReverseRequestInteractionInfo);
-    Map<String, CommandParameterInfo>
-        testClustertestListNestedStructListArgumentRequestCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo testClustertestListNestedStructListArgumentRequestInteractionInfo =
+            () -> new DelegatedLauncherResponseCallback(),
+            applicationLauncherstopAppCommandParams);
+    applicationLauncherClusterInteractionInfoMap.put(
+        "stopApp", applicationLauncherstopAppInteractionInfo);
+    Map<String, CommandParameterInfo> applicationLauncherhideAppCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo applicationLauncherhideAppInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .testListNestedStructListArgumentRequest(
-                      (ChipClusters.TestClusterCluster.BooleanResponseCallback) callback,
-                      (ArrayList<ChipStructs.TestClusterClusterNestedStructList>)
-                          commandArguments.get("arg1"));
+              ((ChipClusters.ApplicationLauncherCluster) cluster)
+                  .hideApp(
+                      (ChipClusters.ApplicationLauncherCluster.LauncherResponseCallback) callback,
+                      (ChipStructs.ApplicationLauncherClusterApplication)
+                          commandArguments.get("application"));
             },
-            () -> new DelegatedBooleanResponseCallback(),
-            testClustertestListNestedStructListArgumentRequestCommandParams);
-    testClusterClusterInteractionInfoMap.put(
-        "testListNestedStructListArgumentRequest",
-        testClustertestListNestedStructListArgumentRequestInteractionInfo);
-    Map<String, CommandParameterInfo> testClustertestListStructArgumentRequestCommandParams =
+            () -> new DelegatedLauncherResponseCallback(),
+            applicationLauncherhideAppCommandParams);
+    applicationLauncherClusterInteractionInfoMap.put(
+        "hideApp", applicationLauncherhideAppInteractionInfo);
+    commandMap.put("applicationLauncher", applicationLauncherClusterInteractionInfoMap);
+    Map<String, InteractionInfo> applicationBasicClusterInteractionInfoMap = new LinkedHashMap<>();
+    commandMap.put("applicationBasic", applicationBasicClusterInteractionInfoMap);
+    Map<String, InteractionInfo> accountLoginClusterInteractionInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> accountLogingetSetupPINCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo testClustertestListStructArgumentRequestInteractionInfo =
+    CommandParameterInfo accountLogingetSetupPINtempAccountIdentifierCommandParameterInfo =
+        new CommandParameterInfo("tempAccountIdentifier", String.class, String.class);
+    accountLogingetSetupPINCommandParams.put(
+        "tempAccountIdentifier", accountLogingetSetupPINtempAccountIdentifierCommandParameterInfo);
+
+    InteractionInfo accountLogingetSetupPINInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .testListStructArgumentRequest(
-                      (ChipClusters.TestClusterCluster.BooleanResponseCallback) callback,
-                      (ArrayList<ChipStructs.TestClusterClusterSimpleStruct>)
-                          commandArguments.get("arg1"));
+              ((ChipClusters.AccountLoginCluster) cluster)
+                  .getSetupPIN(
+                      (ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback) callback,
+                      (String) commandArguments.get("tempAccountIdentifier"),
+                      10000);
             },
-            () -> new DelegatedBooleanResponseCallback(),
-            testClustertestListStructArgumentRequestCommandParams);
-    testClusterClusterInteractionInfoMap.put(
-        "testListStructArgumentRequest", testClustertestListStructArgumentRequestInteractionInfo);
-    Map<String, CommandParameterInfo> testClustertestNestedStructArgumentRequestCommandParams =
+            () -> new DelegatedGetSetupPINResponseCallback(),
+            accountLogingetSetupPINCommandParams);
+    accountLoginClusterInteractionInfoMap.put(
+        "getSetupPIN", accountLogingetSetupPINInteractionInfo);
+    Map<String, CommandParameterInfo> accountLoginloginCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo accountLoginlogintempAccountIdentifierCommandParameterInfo =
+        new CommandParameterInfo("tempAccountIdentifier", String.class, String.class);
+    accountLoginloginCommandParams.put(
+        "tempAccountIdentifier", accountLoginlogintempAccountIdentifierCommandParameterInfo);
+
+    CommandParameterInfo accountLoginloginsetupPINCommandParameterInfo =
+        new CommandParameterInfo("setupPIN", String.class, String.class);
+    accountLoginloginCommandParams.put("setupPIN", accountLoginloginsetupPINCommandParameterInfo);
+
+    InteractionInfo accountLoginloginInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.AccountLoginCluster) cluster)
+                  .login(
+                      (DefaultClusterCallback) callback,
+                      (String) commandArguments.get("tempAccountIdentifier"),
+                      (String) commandArguments.get("setupPIN"),
+                      10000);
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            accountLoginloginCommandParams);
+    accountLoginClusterInteractionInfoMap.put("login", accountLoginloginInteractionInfo);
+    Map<String, CommandParameterInfo> accountLoginlogoutCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo testClustertestNestedStructArgumentRequestInteractionInfo =
+    InteractionInfo accountLoginlogoutInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .testNestedStructArgumentRequest(
-                      (ChipClusters.TestClusterCluster.BooleanResponseCallback) callback,
-                      (ChipStructs.TestClusterClusterNestedStruct) commandArguments.get("arg1"));
+              ((ChipClusters.AccountLoginCluster) cluster)
+                  .logout((DefaultClusterCallback) callback, 10000);
             },
-            () -> new DelegatedBooleanResponseCallback(),
-            testClustertestNestedStructArgumentRequestCommandParams);
-    testClusterClusterInteractionInfoMap.put(
-        "testNestedStructArgumentRequest",
-        testClustertestNestedStructArgumentRequestInteractionInfo);
-    Map<String, CommandParameterInfo> testClustertestNestedStructListArgumentRequestCommandParams =
+            () -> new DelegatedDefaultClusterCallback(),
+            accountLoginlogoutCommandParams);
+    accountLoginClusterInteractionInfoMap.put("logout", accountLoginlogoutInteractionInfo);
+    commandMap.put("accountLogin", accountLoginClusterInteractionInfoMap);
+    Map<String, InteractionInfo> electricalMeasurementClusterInteractionInfoMap =
+        new LinkedHashMap<>();
+    commandMap.put("electricalMeasurement", electricalMeasurementClusterInteractionInfoMap);
+    Map<String, InteractionInfo> testClusterClusterInteractionInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> testClustertestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo testClustertestNestedStructListArgumentRequestInteractionInfo =
+    InteractionInfo testClustertestInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .testNestedStructListArgumentRequest(
-                      (ChipClusters.TestClusterCluster.BooleanResponseCallback) callback,
-                      (ChipStructs.TestClusterClusterNestedStructList)
-                          commandArguments.get("arg1"));
+              ((ChipClusters.TestClusterCluster) cluster).test((DefaultClusterCallback) callback);
             },
-            () -> new DelegatedBooleanResponseCallback(),
-            testClustertestNestedStructListArgumentRequestCommandParams);
-    testClusterClusterInteractionInfoMap.put(
-        "testNestedStructListArgumentRequest",
-        testClustertestNestedStructListArgumentRequestInteractionInfo);
+            () -> new DelegatedDefaultClusterCallback(),
+            testClustertestCommandParams);
+    testClusterClusterInteractionInfoMap.put("test", testClustertestInteractionInfo);
     Map<String, CommandParameterInfo> testClustertestNotHandledCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     InteractionInfo testClustertestNotHandledInteractionInfo =
@@ -11532,59 +11597,56 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
             testClustertestNotHandledCommandParams);
     testClusterClusterInteractionInfoMap.put(
         "testNotHandled", testClustertestNotHandledInteractionInfo);
-    Map<String, CommandParameterInfo> testClustertestNullableOptionalRequestCommandParams =
+    Map<String, CommandParameterInfo> testClustertestSpecificCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo testClustertestNullableOptionalRequestarg1CommandParameterInfo =
-        new CommandParameterInfo("arg1", Optional.class, Integer.class);
-    testClustertestNullableOptionalRequestCommandParams.put(
-        "arg1", testClustertestNullableOptionalRequestarg1CommandParameterInfo);
-
-    InteractionInfo testClustertestNullableOptionalRequestInteractionInfo =
+    InteractionInfo testClustertestSpecificInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
               ((ChipClusters.TestClusterCluster) cluster)
-                  .testNullableOptionalRequest(
-                      (ChipClusters.TestClusterCluster.TestNullableOptionalResponseCallback)
-                          callback,
-                      (Optional<Integer>) commandArguments.get("arg1"));
+                  .testSpecific(
+                      (ChipClusters.TestClusterCluster.TestSpecificResponseCallback) callback);
             },
-            () -> new DelegatedTestNullableOptionalResponseCallback(),
-            testClustertestNullableOptionalRequestCommandParams);
+            () -> new DelegatedTestSpecificResponseCallback(),
+            testClustertestSpecificCommandParams);
     testClusterClusterInteractionInfoMap.put(
-        "testNullableOptionalRequest", testClustertestNullableOptionalRequestInteractionInfo);
-    Map<String, CommandParameterInfo> testClustertestSimpleOptionalArgumentRequestCommandParams =
+        "testSpecific", testClustertestSpecificInteractionInfo);
+    Map<String, CommandParameterInfo> testClustertestUnknownCommandCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo testClustertestSimpleOptionalArgumentRequestarg1CommandParameterInfo =
-        new CommandParameterInfo("arg1", Optional.class, Boolean.class);
-    testClustertestSimpleOptionalArgumentRequestCommandParams.put(
-        "arg1", testClustertestSimpleOptionalArgumentRequestarg1CommandParameterInfo);
-
-    InteractionInfo testClustertestSimpleOptionalArgumentRequestInteractionInfo =
+    InteractionInfo testClustertestUnknownCommandInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
               ((ChipClusters.TestClusterCluster) cluster)
-                  .testSimpleOptionalArgumentRequest(
-                      (DefaultClusterCallback) callback,
-                      (Optional<Boolean>) commandArguments.get("arg1"));
+                  .testUnknownCommand((DefaultClusterCallback) callback);
             },
             () -> new DelegatedDefaultClusterCallback(),
-            testClustertestSimpleOptionalArgumentRequestCommandParams);
+            testClustertestUnknownCommandCommandParams);
     testClusterClusterInteractionInfoMap.put(
-        "testSimpleOptionalArgumentRequest",
-        testClustertestSimpleOptionalArgumentRequestInteractionInfo);
-    Map<String, CommandParameterInfo> testClustertestSpecificCommandParams =
+        "testUnknownCommand", testClustertestUnknownCommandInteractionInfo);
+    Map<String, CommandParameterInfo> testClustertestAddArgumentsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo testClustertestSpecificInteractionInfo =
+    CommandParameterInfo testClustertestAddArgumentsarg1CommandParameterInfo =
+        new CommandParameterInfo("arg1", Integer.class, Integer.class);
+    testClustertestAddArgumentsCommandParams.put(
+        "arg1", testClustertestAddArgumentsarg1CommandParameterInfo);
+
+    CommandParameterInfo testClustertestAddArgumentsarg2CommandParameterInfo =
+        new CommandParameterInfo("arg2", Integer.class, Integer.class);
+    testClustertestAddArgumentsCommandParams.put(
+        "arg2", testClustertestAddArgumentsarg2CommandParameterInfo);
+
+    InteractionInfo testClustertestAddArgumentsInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
               ((ChipClusters.TestClusterCluster) cluster)
-                  .testSpecific(
-                      (ChipClusters.TestClusterCluster.TestSpecificResponseCallback) callback);
+                  .testAddArguments(
+                      (ChipClusters.TestClusterCluster.TestAddArgumentsResponseCallback) callback,
+                      (Integer) commandArguments.get("arg1"),
+                      (Integer) commandArguments.get("arg2"));
             },
-            () -> new DelegatedTestSpecificResponseCallback(),
-            testClustertestSpecificCommandParams);
+            () -> new DelegatedTestAddArgumentsResponseCallback(),
+            testClustertestAddArgumentsCommandParams);
     testClusterClusterInteractionInfoMap.put(
-        "testSpecific", testClustertestSpecificInteractionInfo);
+        "testAddArguments", testClustertestAddArgumentsInteractionInfo);
     Map<String, CommandParameterInfo> testClustertestStructArgumentRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     InteractionInfo testClustertestStructArgumentRequestInteractionInfo =
@@ -11599,293 +11661,231 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
             testClustertestStructArgumentRequestCommandParams);
     testClusterClusterInteractionInfoMap.put(
         "testStructArgumentRequest", testClustertestStructArgumentRequestInteractionInfo);
-    Map<String, CommandParameterInfo> testClustertestUnknownCommandCommandParams =
+    Map<String, CommandParameterInfo> testClustertestNestedStructArgumentRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo testClustertestUnknownCommandInteractionInfo =
+    InteractionInfo testClustertestNestedStructArgumentRequestInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
               ((ChipClusters.TestClusterCluster) cluster)
-                  .testUnknownCommand((DefaultClusterCallback) callback);
+                  .testNestedStructArgumentRequest(
+                      (ChipClusters.TestClusterCluster.BooleanResponseCallback) callback,
+                      (ChipStructs.TestClusterClusterNestedStruct) commandArguments.get("arg1"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            testClustertestUnknownCommandCommandParams);
+            () -> new DelegatedBooleanResponseCallback(),
+            testClustertestNestedStructArgumentRequestCommandParams);
     testClusterClusterInteractionInfoMap.put(
-        "testUnknownCommand", testClustertestUnknownCommandInteractionInfo);
-    Map<String, CommandParameterInfo> testClustertimedInvokeRequestCommandParams =
+        "testNestedStructArgumentRequest",
+        testClustertestNestedStructArgumentRequestInteractionInfo);
+    Map<String, CommandParameterInfo> testClustertestListStructArgumentRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo testClustertimedInvokeRequestInteractionInfo =
+    InteractionInfo testClustertestListStructArgumentRequestInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
               ((ChipClusters.TestClusterCluster) cluster)
-                  .timedInvokeRequest((DefaultClusterCallback) callback, 10000);
+                  .testListStructArgumentRequest(
+                      (ChipClusters.TestClusterCluster.BooleanResponseCallback) callback,
+                      (ArrayList<ChipStructs.TestClusterClusterSimpleStruct>)
+                          commandArguments.get("arg1"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            testClustertimedInvokeRequestCommandParams);
+            () -> new DelegatedBooleanResponseCallback(),
+            testClustertestListStructArgumentRequestCommandParams);
     testClusterClusterInteractionInfoMap.put(
-        "timedInvokeRequest", testClustertimedInvokeRequestInteractionInfo);
-    commandMap.put("testCluster", testClusterClusterInteractionInfoMap);
-    Map<String, InteractionInfo> thermostatClusterInteractionInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> thermostatclearWeeklyScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo thermostatclearWeeklyScheduleInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .clearWeeklySchedule((DefaultClusterCallback) callback);
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            thermostatclearWeeklyScheduleCommandParams);
-    thermostatClusterInteractionInfoMap.put(
-        "clearWeeklySchedule", thermostatclearWeeklyScheduleInteractionInfo);
-    Map<String, CommandParameterInfo> thermostatgetWeeklyScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo thermostatgetWeeklyScheduledaysToReturnCommandParameterInfo =
-        new CommandParameterInfo("daysToReturn", Integer.class, Integer.class);
-    thermostatgetWeeklyScheduleCommandParams.put(
-        "daysToReturn", thermostatgetWeeklyScheduledaysToReturnCommandParameterInfo);
-
-    CommandParameterInfo thermostatgetWeeklySchedulemodeToReturnCommandParameterInfo =
-        new CommandParameterInfo("modeToReturn", Integer.class, Integer.class);
-    thermostatgetWeeklyScheduleCommandParams.put(
-        "modeToReturn", thermostatgetWeeklySchedulemodeToReturnCommandParameterInfo);
-
-    InteractionInfo thermostatgetWeeklyScheduleInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .getWeeklySchedule(
-                      (ChipClusters.ThermostatCluster.GetWeeklyScheduleResponseCallback) callback,
-                      (Integer) commandArguments.get("daysToReturn"),
-                      (Integer) commandArguments.get("modeToReturn"));
-            },
-            () -> new DelegatedGetWeeklyScheduleResponseCallback(),
-            thermostatgetWeeklyScheduleCommandParams);
-    thermostatClusterInteractionInfoMap.put(
-        "getWeeklySchedule", thermostatgetWeeklyScheduleInteractionInfo);
-    Map<String, CommandParameterInfo> thermostatsetWeeklyScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo
-        thermostatsetWeeklySchedulenumberOfTransitionsForSequenceCommandParameterInfo =
-            new CommandParameterInfo(
-                "numberOfTransitionsForSequence", Integer.class, Integer.class);
-    thermostatsetWeeklyScheduleCommandParams.put(
-        "numberOfTransitionsForSequence",
-        thermostatsetWeeklySchedulenumberOfTransitionsForSequenceCommandParameterInfo);
-
-    CommandParameterInfo thermostatsetWeeklyScheduledayOfWeekForSequenceCommandParameterInfo =
-        new CommandParameterInfo("dayOfWeekForSequence", Integer.class, Integer.class);
-    thermostatsetWeeklyScheduleCommandParams.put(
-        "dayOfWeekForSequence",
-        thermostatsetWeeklyScheduledayOfWeekForSequenceCommandParameterInfo);
-
-    CommandParameterInfo thermostatsetWeeklySchedulemodeForSequenceCommandParameterInfo =
-        new CommandParameterInfo("modeForSequence", Integer.class, Integer.class);
-    thermostatsetWeeklyScheduleCommandParams.put(
-        "modeForSequence", thermostatsetWeeklySchedulemodeForSequenceCommandParameterInfo);
-
-    InteractionInfo thermostatsetWeeklyScheduleInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .setWeeklySchedule(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("numberOfTransitionsForSequence"),
-                      (Integer) commandArguments.get("dayOfWeekForSequence"),
-                      (Integer) commandArguments.get("modeForSequence"),
-                      (ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition>)
-                          commandArguments.get("transitions"));
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            thermostatsetWeeklyScheduleCommandParams);
-    thermostatClusterInteractionInfoMap.put(
-        "setWeeklySchedule", thermostatsetWeeklyScheduleInteractionInfo);
-    Map<String, CommandParameterInfo> thermostatsetpointRaiseLowerCommandParams =
+        "testListStructArgumentRequest", testClustertestListStructArgumentRequestInteractionInfo);
+    Map<String, CommandParameterInfo> testClustertestListInt8UArgumentRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo thermostatsetpointRaiseLowermodeCommandParameterInfo =
-        new CommandParameterInfo("mode", Integer.class, Integer.class);
-    thermostatsetpointRaiseLowerCommandParams.put(
-        "mode", thermostatsetpointRaiseLowermodeCommandParameterInfo);
-
-    CommandParameterInfo thermostatsetpointRaiseLoweramountCommandParameterInfo =
-        new CommandParameterInfo("amount", Integer.class, Integer.class);
-    thermostatsetpointRaiseLowerCommandParams.put(
-        "amount", thermostatsetpointRaiseLoweramountCommandParameterInfo);
+    CommandParameterInfo testClustertestListInt8UArgumentRequestarg1CommandParameterInfo =
+        new CommandParameterInfo("arg1", ArrayList.class, Object.class);
+    testClustertestListInt8UArgumentRequestCommandParams.put(
+        "arg1", testClustertestListInt8UArgumentRequestarg1CommandParameterInfo);
 
-    InteractionInfo thermostatsetpointRaiseLowerInteractionInfo =
+    InteractionInfo testClustertestListInt8UArgumentRequestInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .setpointRaiseLower(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("mode"),
-                      (Integer) commandArguments.get("amount"));
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            thermostatsetpointRaiseLowerCommandParams);
-    thermostatClusterInteractionInfoMap.put(
-        "setpointRaiseLower", thermostatsetpointRaiseLowerInteractionInfo);
-    commandMap.put("thermostat", thermostatClusterInteractionInfoMap);
-    Map<String, InteractionInfo> thermostatUserInterfaceConfigurationClusterInteractionInfoMap =
-        new LinkedHashMap<>();
-    commandMap.put(
-        "thermostatUserInterfaceConfiguration",
-        thermostatUserInterfaceConfigurationClusterInteractionInfoMap);
-    Map<String, InteractionInfo> threadNetworkDiagnosticsClusterInteractionInfoMap =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> threadNetworkDiagnosticsresetCountsCommandParams =
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .testListInt8UArgumentRequest(
+                      (ChipClusters.TestClusterCluster.BooleanResponseCallback) callback,
+                      (ArrayList<Integer>) commandArguments.get("arg1"));
+            },
+            () -> new DelegatedBooleanResponseCallback(),
+            testClustertestListInt8UArgumentRequestCommandParams);
+    testClusterClusterInteractionInfoMap.put(
+        "testListInt8UArgumentRequest", testClustertestListInt8UArgumentRequestInteractionInfo);
+    Map<String, CommandParameterInfo> testClustertestNestedStructListArgumentRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo threadNetworkDiagnosticsresetCountsInteractionInfo =
+    InteractionInfo testClustertestNestedStructListArgumentRequestInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .resetCounts((DefaultClusterCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .testNestedStructListArgumentRequest(
+                      (ChipClusters.TestClusterCluster.BooleanResponseCallback) callback,
+                      (ChipStructs.TestClusterClusterNestedStructList)
+                          commandArguments.get("arg1"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            threadNetworkDiagnosticsresetCountsCommandParams);
-    threadNetworkDiagnosticsClusterInteractionInfoMap.put(
-        "resetCounts", threadNetworkDiagnosticsresetCountsInteractionInfo);
-    commandMap.put("threadNetworkDiagnostics", threadNetworkDiagnosticsClusterInteractionInfoMap);
-    Map<String, InteractionInfo> timeFormatLocalizationClusterInteractionInfoMap =
-        new LinkedHashMap<>();
-    commandMap.put("timeFormatLocalization", timeFormatLocalizationClusterInteractionInfoMap);
-    Map<String, InteractionInfo> unitLocalizationClusterInteractionInfoMap = new LinkedHashMap<>();
-    commandMap.put("unitLocalization", unitLocalizationClusterInteractionInfoMap);
-    Map<String, InteractionInfo> userLabelClusterInteractionInfoMap = new LinkedHashMap<>();
-    commandMap.put("userLabel", userLabelClusterInteractionInfoMap);
-    Map<String, InteractionInfo> wakeOnLanClusterInteractionInfoMap = new LinkedHashMap<>();
-    commandMap.put("wakeOnLan", wakeOnLanClusterInteractionInfoMap);
-    Map<String, InteractionInfo> wiFiNetworkDiagnosticsClusterInteractionInfoMap =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> wiFiNetworkDiagnosticsresetCountsCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo wiFiNetworkDiagnosticsresetCountsInteractionInfo =
+            () -> new DelegatedBooleanResponseCallback(),
+            testClustertestNestedStructListArgumentRequestCommandParams);
+    testClusterClusterInteractionInfoMap.put(
+        "testNestedStructListArgumentRequest",
+        testClustertestNestedStructListArgumentRequestInteractionInfo);
+    Map<String, CommandParameterInfo>
+        testClustertestListNestedStructListArgumentRequestCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo testClustertestListNestedStructListArgumentRequestInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
-                  .resetCounts((DefaultClusterCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .testListNestedStructListArgumentRequest(
+                      (ChipClusters.TestClusterCluster.BooleanResponseCallback) callback,
+                      (ArrayList<ChipStructs.TestClusterClusterNestedStructList>)
+                          commandArguments.get("arg1"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            wiFiNetworkDiagnosticsresetCountsCommandParams);
-    wiFiNetworkDiagnosticsClusterInteractionInfoMap.put(
-        "resetCounts", wiFiNetworkDiagnosticsresetCountsInteractionInfo);
-    commandMap.put("wiFiNetworkDiagnostics", wiFiNetworkDiagnosticsClusterInteractionInfoMap);
-    Map<String, InteractionInfo> windowCoveringClusterInteractionInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> windowCoveringdownOrCloseCommandParams =
+            () -> new DelegatedBooleanResponseCallback(),
+            testClustertestListNestedStructListArgumentRequestCommandParams);
+    testClusterClusterInteractionInfoMap.put(
+        "testListNestedStructListArgumentRequest",
+        testClustertestListNestedStructListArgumentRequestInteractionInfo);
+    Map<String, CommandParameterInfo> testClustertestListInt8UReverseRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo windowCoveringdownOrCloseInteractionInfo =
+    CommandParameterInfo testClustertestListInt8UReverseRequestarg1CommandParameterInfo =
+        new CommandParameterInfo("arg1", ArrayList.class, Object.class);
+    testClustertestListInt8UReverseRequestCommandParams.put(
+        "arg1", testClustertestListInt8UReverseRequestarg1CommandParameterInfo);
+
+    InteractionInfo testClustertestListInt8UReverseRequestInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .downOrClose((DefaultClusterCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .testListInt8UReverseRequest(
+                      (ChipClusters.TestClusterCluster.TestListInt8UReverseResponseCallback)
+                          callback,
+                      (ArrayList<Integer>) commandArguments.get("arg1"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            windowCoveringdownOrCloseCommandParams);
-    windowCoveringClusterInteractionInfoMap.put(
-        "downOrClose", windowCoveringdownOrCloseInteractionInfo);
-    Map<String, CommandParameterInfo> windowCoveringgoToLiftPercentageCommandParams =
+            () -> new DelegatedTestListInt8UReverseResponseCallback(),
+            testClustertestListInt8UReverseRequestCommandParams);
+    testClusterClusterInteractionInfoMap.put(
+        "testListInt8UReverseRequest", testClustertestListInt8UReverseRequestInteractionInfo);
+    Map<String, CommandParameterInfo> testClustertestEnumsRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo
-        windowCoveringgoToLiftPercentageliftPercent100thsValueCommandParameterInfo =
-            new CommandParameterInfo("liftPercent100thsValue", Integer.class, Integer.class);
-    windowCoveringgoToLiftPercentageCommandParams.put(
-        "liftPercent100thsValue",
-        windowCoveringgoToLiftPercentageliftPercent100thsValueCommandParameterInfo);
+    CommandParameterInfo testClustertestEnumsRequestarg1CommandParameterInfo =
+        new CommandParameterInfo("arg1", Integer.class, Integer.class);
+    testClustertestEnumsRequestCommandParams.put(
+        "arg1", testClustertestEnumsRequestarg1CommandParameterInfo);
 
-    InteractionInfo windowCoveringgoToLiftPercentageInteractionInfo =
+    CommandParameterInfo testClustertestEnumsRequestarg2CommandParameterInfo =
+        new CommandParameterInfo("arg2", Integer.class, Integer.class);
+    testClustertestEnumsRequestCommandParams.put(
+        "arg2", testClustertestEnumsRequestarg2CommandParameterInfo);
+
+    InteractionInfo testClustertestEnumsRequestInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .goToLiftPercentage(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("liftPercent100thsValue"));
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .testEnumsRequest(
+                      (ChipClusters.TestClusterCluster.TestEnumsResponseCallback) callback,
+                      (Integer) commandArguments.get("arg1"),
+                      (Integer) commandArguments.get("arg2"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            windowCoveringgoToLiftPercentageCommandParams);
-    windowCoveringClusterInteractionInfoMap.put(
-        "goToLiftPercentage", windowCoveringgoToLiftPercentageInteractionInfo);
-    Map<String, CommandParameterInfo> windowCoveringgoToLiftValueCommandParams =
+            () -> new DelegatedTestEnumsResponseCallback(),
+            testClustertestEnumsRequestCommandParams);
+    testClusterClusterInteractionInfoMap.put(
+        "testEnumsRequest", testClustertestEnumsRequestInteractionInfo);
+    Map<String, CommandParameterInfo> testClustertestNullableOptionalRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo windowCoveringgoToLiftValueliftValueCommandParameterInfo =
-        new CommandParameterInfo("liftValue", Integer.class, Integer.class);
-    windowCoveringgoToLiftValueCommandParams.put(
-        "liftValue", windowCoveringgoToLiftValueliftValueCommandParameterInfo);
+    CommandParameterInfo testClustertestNullableOptionalRequestarg1CommandParameterInfo =
+        new CommandParameterInfo("arg1", Optional.class, Integer.class);
+    testClustertestNullableOptionalRequestCommandParams.put(
+        "arg1", testClustertestNullableOptionalRequestarg1CommandParameterInfo);
 
-    InteractionInfo windowCoveringgoToLiftValueInteractionInfo =
+    InteractionInfo testClustertestNullableOptionalRequestInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .goToLiftValue(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("liftValue"));
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .testNullableOptionalRequest(
+                      (ChipClusters.TestClusterCluster.TestNullableOptionalResponseCallback)
+                          callback,
+                      (Optional<Integer>) commandArguments.get("arg1"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            windowCoveringgoToLiftValueCommandParams);
-    windowCoveringClusterInteractionInfoMap.put(
-        "goToLiftValue", windowCoveringgoToLiftValueInteractionInfo);
-    Map<String, CommandParameterInfo> windowCoveringgoToTiltPercentageCommandParams =
+            () -> new DelegatedTestNullableOptionalResponseCallback(),
+            testClustertestNullableOptionalRequestCommandParams);
+    testClusterClusterInteractionInfoMap.put(
+        "testNullableOptionalRequest", testClustertestNullableOptionalRequestInteractionInfo);
+    Map<String, CommandParameterInfo> testClustersimpleStructEchoRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo
-        windowCoveringgoToTiltPercentagetiltPercent100thsValueCommandParameterInfo =
-            new CommandParameterInfo("tiltPercent100thsValue", Integer.class, Integer.class);
-    windowCoveringgoToTiltPercentageCommandParams.put(
-        "tiltPercent100thsValue",
-        windowCoveringgoToTiltPercentagetiltPercent100thsValueCommandParameterInfo);
-
-    InteractionInfo windowCoveringgoToTiltPercentageInteractionInfo =
+    InteractionInfo testClustersimpleStructEchoRequestInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .goToTiltPercentage(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("tiltPercent100thsValue"));
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .simpleStructEchoRequest(
+                      (ChipClusters.TestClusterCluster.SimpleStructResponseCallback) callback,
+                      (ChipStructs.TestClusterClusterSimpleStruct) commandArguments.get("arg1"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            windowCoveringgoToTiltPercentageCommandParams);
-    windowCoveringClusterInteractionInfoMap.put(
-        "goToTiltPercentage", windowCoveringgoToTiltPercentageInteractionInfo);
-    Map<String, CommandParameterInfo> windowCoveringgoToTiltValueCommandParams =
+            () -> new DelegatedSimpleStructResponseCallback(),
+            testClustersimpleStructEchoRequestCommandParams);
+    testClusterClusterInteractionInfoMap.put(
+        "simpleStructEchoRequest", testClustersimpleStructEchoRequestInteractionInfo);
+    Map<String, CommandParameterInfo> testClustertimedInvokeRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo windowCoveringgoToTiltValuetiltValueCommandParameterInfo =
-        new CommandParameterInfo("tiltValue", Integer.class, Integer.class);
-    windowCoveringgoToTiltValueCommandParams.put(
-        "tiltValue", windowCoveringgoToTiltValuetiltValueCommandParameterInfo);
-
-    InteractionInfo windowCoveringgoToTiltValueInteractionInfo =
+    InteractionInfo testClustertimedInvokeRequestInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .goToTiltValue(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("tiltValue"));
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .timedInvokeRequest((DefaultClusterCallback) callback, 10000);
             },
             () -> new DelegatedDefaultClusterCallback(),
-            windowCoveringgoToTiltValueCommandParams);
-    windowCoveringClusterInteractionInfoMap.put(
-        "goToTiltValue", windowCoveringgoToTiltValueInteractionInfo);
-    Map<String, CommandParameterInfo> windowCoveringstopMotionCommandParams =
+            testClustertimedInvokeRequestCommandParams);
+    testClusterClusterInteractionInfoMap.put(
+        "timedInvokeRequest", testClustertimedInvokeRequestInteractionInfo);
+    Map<String, CommandParameterInfo> testClustertestSimpleOptionalArgumentRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo windowCoveringstopMotionInteractionInfo =
+    CommandParameterInfo testClustertestSimpleOptionalArgumentRequestarg1CommandParameterInfo =
+        new CommandParameterInfo("arg1", Optional.class, Boolean.class);
+    testClustertestSimpleOptionalArgumentRequestCommandParams.put(
+        "arg1", testClustertestSimpleOptionalArgumentRequestarg1CommandParameterInfo);
+
+    InteractionInfo testClustertestSimpleOptionalArgumentRequestInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .stopMotion((DefaultClusterCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .testSimpleOptionalArgumentRequest(
+                      (DefaultClusterCallback) callback,
+                      (Optional<Boolean>) commandArguments.get("arg1"));
             },
             () -> new DelegatedDefaultClusterCallback(),
-            windowCoveringstopMotionCommandParams);
-    windowCoveringClusterInteractionInfoMap.put(
-        "stopMotion", windowCoveringstopMotionInteractionInfo);
-    Map<String, CommandParameterInfo> windowCoveringupOrOpenCommandParams =
+            testClustertestSimpleOptionalArgumentRequestCommandParams);
+    testClusterClusterInteractionInfoMap.put(
+        "testSimpleOptionalArgumentRequest",
+        testClustertestSimpleOptionalArgumentRequestInteractionInfo);
+    Map<String, CommandParameterInfo> testClustertestEmitTestEventRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo windowCoveringupOrOpenInteractionInfo =
+    CommandParameterInfo testClustertestEmitTestEventRequestarg1CommandParameterInfo =
+        new CommandParameterInfo("arg1", Integer.class, Integer.class);
+    testClustertestEmitTestEventRequestCommandParams.put(
+        "arg1", testClustertestEmitTestEventRequestarg1CommandParameterInfo);
+
+    CommandParameterInfo testClustertestEmitTestEventRequestarg2CommandParameterInfo =
+        new CommandParameterInfo("arg2", Integer.class, Integer.class);
+    testClustertestEmitTestEventRequestCommandParams.put(
+        "arg2", testClustertestEmitTestEventRequestarg2CommandParameterInfo);
+
+    CommandParameterInfo testClustertestEmitTestEventRequestarg3CommandParameterInfo =
+        new CommandParameterInfo("arg3", Boolean.class, Boolean.class);
+    testClustertestEmitTestEventRequestCommandParams.put(
+        "arg3", testClustertestEmitTestEventRequestarg3CommandParameterInfo);
+
+    InteractionInfo testClustertestEmitTestEventRequestInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .upOrOpen((DefaultClusterCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .testEmitTestEventRequest(
+                      (ChipClusters.TestClusterCluster.TestEmitTestEventResponseCallback) callback,
+                      (Integer) commandArguments.get("arg1"),
+                      (Integer) commandArguments.get("arg2"),
+                      (Boolean) commandArguments.get("arg3"));
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            windowCoveringupOrOpenCommandParams);
-    windowCoveringClusterInteractionInfoMap.put("upOrOpen", windowCoveringupOrOpenInteractionInfo);
-    commandMap.put("windowCovering", windowCoveringClusterInteractionInfoMap);
+            () -> new DelegatedTestEmitTestEventResponseCallback(),
+            testClustertestEmitTestEventRequestCommandParams);
+    testClusterClusterInteractionInfoMap.put(
+        "testEmitTestEventRequest", testClustertestEmitTestEventRequestInteractionInfo);
+    commandMap.put("testCluster", testClusterClusterInteractionInfoMap);
     return commandMap;
   }
 }
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java
index cec82839d68ac5..ffb791af707d9b 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java
@@ -29,1258 +29,1039 @@ public class ClusterReadMapping {
 
   public Map<String, Map<String, InteractionInfo>> getReadAttributeMap() {
     Map<String, Map<String, InteractionInfo>> readAttributeMap = new HashMap<>();
-    Map<String, InteractionInfo> readAccessControlInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readAccessControlAclCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAccessControlAclAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AccessControlCluster) cluster)
-                  .readAclAttribute(
-                      (ChipClusters.AccessControlCluster.AclAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedAccessControlClusterAclAttributeCallback(),
-            readAccessControlAclCommandParams);
-    readAccessControlInteractionInfo.put(
-        "readAclAttribute", readAccessControlAclAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readAccessControlExtensionCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAccessControlExtensionAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AccessControlCluster) cluster)
-                  .readExtensionAttribute(
-                      (ChipClusters.AccessControlCluster.ExtensionAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedAccessControlClusterExtensionAttributeCallback(),
-            readAccessControlExtensionCommandParams);
-    readAccessControlInteractionInfo.put(
-        "readExtensionAttribute", readAccessControlExtensionAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readAccessControlSubjectsPerAccessControlEntryCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAccessControlSubjectsPerAccessControlEntryAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AccessControlCluster) cluster)
-                  .readSubjectsPerAccessControlEntryAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readAccessControlSubjectsPerAccessControlEntryCommandParams);
-    readAccessControlInteractionInfo.put(
-        "readSubjectsPerAccessControlEntryAttribute",
-        readAccessControlSubjectsPerAccessControlEntryAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readAccessControlTargetsPerAccessControlEntryCommandParams =
+    Map<String, InteractionInfo> readIdentifyInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readIdentifyIdentifyTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAccessControlTargetsPerAccessControlEntryAttributeInteractionInfo =
+    InteractionInfo readIdentifyIdentifyTimeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AccessControlCluster) cluster)
-                  .readTargetsPerAccessControlEntryAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.IdentifyCluster) cluster)
+                  .readIdentifyTimeAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readAccessControlTargetsPerAccessControlEntryCommandParams);
-    readAccessControlInteractionInfo.put(
-        "readTargetsPerAccessControlEntryAttribute",
-        readAccessControlTargetsPerAccessControlEntryAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readAccessControlAccessControlEntriesPerFabricCommandParams =
+            readIdentifyIdentifyTimeCommandParams);
+    readIdentifyInteractionInfo.put(
+        "readIdentifyTimeAttribute", readIdentifyIdentifyTimeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readIdentifyIdentifyTypeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAccessControlAccessControlEntriesPerFabricAttributeInteractionInfo =
+    InteractionInfo readIdentifyIdentifyTypeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AccessControlCluster) cluster)
-                  .readAccessControlEntriesPerFabricAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.IdentifyCluster) cluster)
+                  .readIdentifyTypeAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readAccessControlAccessControlEntriesPerFabricCommandParams);
-    readAccessControlInteractionInfo.put(
-        "readAccessControlEntriesPerFabricAttribute",
-        readAccessControlAccessControlEntriesPerFabricAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readAccessControlGeneratedCommandListCommandParams =
+            readIdentifyIdentifyTypeCommandParams);
+    readIdentifyInteractionInfo.put(
+        "readIdentifyTypeAttribute", readIdentifyIdentifyTypeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readIdentifyGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAccessControlGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readIdentifyGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AccessControlCluster) cluster)
+              ((ChipClusters.IdentifyCluster) cluster)
                   .readGeneratedCommandListAttribute(
-                      (ChipClusters.AccessControlCluster.GeneratedCommandListAttributeCallback)
+                      (ChipClusters.IdentifyCluster.GeneratedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedAccessControlClusterGeneratedCommandListAttributeCallback(),
-            readAccessControlGeneratedCommandListCommandParams);
-    readAccessControlInteractionInfo.put(
+                    .DelegatedIdentifyClusterGeneratedCommandListAttributeCallback(),
+            readIdentifyGeneratedCommandListCommandParams);
+    readIdentifyInteractionInfo.put(
         "readGeneratedCommandListAttribute",
-        readAccessControlGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readAccessControlAcceptedCommandListCommandParams =
+        readIdentifyGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readIdentifyAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAccessControlAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readIdentifyAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AccessControlCluster) cluster)
+              ((ChipClusters.IdentifyCluster) cluster)
                   .readAcceptedCommandListAttribute(
-                      (ChipClusters.AccessControlCluster.AcceptedCommandListAttributeCallback)
-                          callback);
+                      (ChipClusters.IdentifyCluster.AcceptedCommandListAttributeCallback) callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedAccessControlClusterAcceptedCommandListAttributeCallback(),
-            readAccessControlAcceptedCommandListCommandParams);
-    readAccessControlInteractionInfo.put(
+                    .DelegatedIdentifyClusterAcceptedCommandListAttributeCallback(),
+            readIdentifyAcceptedCommandListCommandParams);
+    readIdentifyInteractionInfo.put(
         "readAcceptedCommandListAttribute",
-        readAccessControlAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readAccessControlAttributeListCommandParams =
+        readIdentifyAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readIdentifyAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAccessControlAttributeListAttributeInteractionInfo =
+    InteractionInfo readIdentifyAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AccessControlCluster) cluster)
+              ((ChipClusters.IdentifyCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.AccessControlCluster.AttributeListAttributeCallback) callback);
+                      (ChipClusters.IdentifyCluster.AttributeListAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedAccessControlClusterAttributeListAttributeCallback(),
-            readAccessControlAttributeListCommandParams);
-    readAccessControlInteractionInfo.put(
-        "readAttributeListAttribute", readAccessControlAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readAccessControlFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIdentifyClusterAttributeListAttributeCallback(),
+            readIdentifyAttributeListCommandParams);
+    readIdentifyInteractionInfo.put(
+        "readAttributeListAttribute", readIdentifyAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readIdentifyFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAccessControlFeatureMapAttributeInteractionInfo =
+    InteractionInfo readIdentifyFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AccessControlCluster) cluster)
+              ((ChipClusters.IdentifyCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readAccessControlFeatureMapCommandParams);
-    readAccessControlInteractionInfo.put(
-        "readFeatureMapAttribute", readAccessControlFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readAccessControlClusterRevisionCommandParams =
+            readIdentifyFeatureMapCommandParams);
+    readIdentifyInteractionInfo.put(
+        "readFeatureMapAttribute", readIdentifyFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readIdentifyClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAccessControlClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readIdentifyClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AccessControlCluster) cluster)
+              ((ChipClusters.IdentifyCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readAccessControlClusterRevisionCommandParams);
-    readAccessControlInteractionInfo.put(
-        "readClusterRevisionAttribute", readAccessControlClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("accessControl", readAccessControlInteractionInfo);
-    Map<String, InteractionInfo> readAccountLoginInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readAccountLoginGeneratedCommandListCommandParams =
+            readIdentifyClusterRevisionCommandParams);
+    readIdentifyInteractionInfo.put(
+        "readClusterRevisionAttribute", readIdentifyClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("identify", readIdentifyInteractionInfo);
+    Map<String, InteractionInfo> readGroupsInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readGroupsNameSupportCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAccountLoginGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readGroupsNameSupportAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AccountLoginCluster) cluster)
+              ((ChipClusters.GroupsCluster) cluster)
+                  .readNameSupportAttribute((ChipClusters.IntegerAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readGroupsNameSupportCommandParams);
+    readGroupsInteractionInfo.put(
+        "readNameSupportAttribute", readGroupsNameSupportAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGroupsGeneratedCommandListCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readGroupsGeneratedCommandListAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.GroupsCluster) cluster)
                   .readGeneratedCommandListAttribute(
-                      (ChipClusters.AccountLoginCluster.GeneratedCommandListAttributeCallback)
-                          callback);
+                      (ChipClusters.GroupsCluster.GeneratedCommandListAttributeCallback) callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedAccountLoginClusterGeneratedCommandListAttributeCallback(),
-            readAccountLoginGeneratedCommandListCommandParams);
-    readAccountLoginInteractionInfo.put(
+                    .DelegatedGroupsClusterGeneratedCommandListAttributeCallback(),
+            readGroupsGeneratedCommandListCommandParams);
+    readGroupsInteractionInfo.put(
         "readGeneratedCommandListAttribute",
-        readAccountLoginGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readAccountLoginAcceptedCommandListCommandParams =
+        readGroupsGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGroupsAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAccountLoginAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readGroupsAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AccountLoginCluster) cluster)
+              ((ChipClusters.GroupsCluster) cluster)
                   .readAcceptedCommandListAttribute(
-                      (ChipClusters.AccountLoginCluster.AcceptedCommandListAttributeCallback)
-                          callback);
+                      (ChipClusters.GroupsCluster.AcceptedCommandListAttributeCallback) callback);
             },
             () ->
-                new ClusterInfoMapping
-                    .DelegatedAccountLoginClusterAcceptedCommandListAttributeCallback(),
-            readAccountLoginAcceptedCommandListCommandParams);
-    readAccountLoginInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readAccountLoginAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readAccountLoginAttributeListCommandParams =
+                new ClusterInfoMapping.DelegatedGroupsClusterAcceptedCommandListAttributeCallback(),
+            readGroupsAcceptedCommandListCommandParams);
+    readGroupsInteractionInfo.put(
+        "readAcceptedCommandListAttribute", readGroupsAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGroupsAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAccountLoginAttributeListAttributeInteractionInfo =
+    InteractionInfo readGroupsAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AccountLoginCluster) cluster)
+              ((ChipClusters.GroupsCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.AccountLoginCluster.AttributeListAttributeCallback) callback);
+                      (ChipClusters.GroupsCluster.AttributeListAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping.DelegatedAccountLoginClusterAttributeListAttributeCallback(),
-            readAccountLoginAttributeListCommandParams);
-    readAccountLoginInteractionInfo.put(
-        "readAttributeListAttribute", readAccountLoginAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readAccountLoginFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedGroupsClusterAttributeListAttributeCallback(),
+            readGroupsAttributeListCommandParams);
+    readGroupsInteractionInfo.put(
+        "readAttributeListAttribute", readGroupsAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGroupsFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAccountLoginFeatureMapAttributeInteractionInfo =
+    InteractionInfo readGroupsFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AccountLoginCluster) cluster)
+              ((ChipClusters.GroupsCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readAccountLoginFeatureMapCommandParams);
-    readAccountLoginInteractionInfo.put(
-        "readFeatureMapAttribute", readAccountLoginFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readAccountLoginClusterRevisionCommandParams =
+            readGroupsFeatureMapCommandParams);
+    readGroupsInteractionInfo.put(
+        "readFeatureMapAttribute", readGroupsFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGroupsClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAccountLoginClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readGroupsClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AccountLoginCluster) cluster)
+              ((ChipClusters.GroupsCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readAccountLoginClusterRevisionCommandParams);
-    readAccountLoginInteractionInfo.put(
-        "readClusterRevisionAttribute", readAccountLoginClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("accountLogin", readAccountLoginInteractionInfo);
-    Map<String, InteractionInfo> readAdministratorCommissioningInteractionInfo =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readAdministratorCommissioningWindowStatusCommandParams =
+            readGroupsClusterRevisionCommandParams);
+    readGroupsInteractionInfo.put(
+        "readClusterRevisionAttribute", readGroupsClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("groups", readGroupsInteractionInfo);
+    Map<String, InteractionInfo> readScenesInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readScenesSceneCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAdministratorCommissioningWindowStatusAttributeInteractionInfo =
+    InteractionInfo readScenesSceneCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AdministratorCommissioningCluster) cluster)
-                  .readWindowStatusAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ScenesCluster) cluster)
+                  .readSceneCountAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readAdministratorCommissioningWindowStatusCommandParams);
-    readAdministratorCommissioningInteractionInfo.put(
-        "readWindowStatusAttribute",
-        readAdministratorCommissioningWindowStatusAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readAdministratorCommissioningAdminFabricIndexCommandParams =
+            readScenesSceneCountCommandParams);
+    readScenesInteractionInfo.put(
+        "readSceneCountAttribute", readScenesSceneCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readScenesCurrentSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAdministratorCommissioningAdminFabricIndexAttributeInteractionInfo =
+    InteractionInfo readScenesCurrentSceneAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AdministratorCommissioningCluster) cluster)
-                  .readAdminFabricIndexAttribute(
-                      (ChipClusters.AdministratorCommissioningCluster
-                              .AdminFabricIndexAttributeCallback)
-                          callback);
+              ((ChipClusters.ScenesCluster) cluster)
+                  .readCurrentSceneAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readAdministratorCommissioningAdminFabricIndexCommandParams);
-    readAdministratorCommissioningInteractionInfo.put(
-        "readAdminFabricIndexAttribute",
-        readAdministratorCommissioningAdminFabricIndexAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readAdministratorCommissioningAdminVendorIdCommandParams =
+            readScenesCurrentSceneCommandParams);
+    readScenesInteractionInfo.put(
+        "readCurrentSceneAttribute", readScenesCurrentSceneAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readScenesCurrentGroupCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAdministratorCommissioningAdminVendorIdAttributeInteractionInfo =
+    InteractionInfo readScenesCurrentGroupAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AdministratorCommissioningCluster) cluster)
-                  .readAdminVendorIdAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ScenesCluster) cluster)
+                  .readCurrentGroupAttribute(
+                      (ChipClusters.ScenesCluster.CurrentGroupAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readAdministratorCommissioningAdminVendorIdCommandParams);
-    readAdministratorCommissioningInteractionInfo.put(
-        "readAdminVendorIdAttribute",
-        readAdministratorCommissioningAdminVendorIdAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readAdministratorCommissioningGeneratedCommandListCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAdministratorCommissioningGeneratedCommandListAttributeInteractionInfo =
+            readScenesCurrentGroupCommandParams);
+    readScenesInteractionInfo.put(
+        "readCurrentGroupAttribute", readScenesCurrentGroupAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readScenesSceneValidCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readScenesSceneValidAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AdministratorCommissioningCluster) cluster)
+              ((ChipClusters.ScenesCluster) cluster)
+                  .readSceneValidAttribute((ChipClusters.BooleanAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readScenesSceneValidCommandParams);
+    readScenesInteractionInfo.put(
+        "readSceneValidAttribute", readScenesSceneValidAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readScenesNameSupportCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readScenesNameSupportAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ScenesCluster) cluster)
+                  .readNameSupportAttribute((ChipClusters.IntegerAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readScenesNameSupportCommandParams);
+    readScenesInteractionInfo.put(
+        "readNameSupportAttribute", readScenesNameSupportAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readScenesGeneratedCommandListCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readScenesGeneratedCommandListAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ScenesCluster) cluster)
                   .readGeneratedCommandListAttribute(
-                      (ChipClusters.AdministratorCommissioningCluster
-                              .GeneratedCommandListAttributeCallback)
-                          callback);
+                      (ChipClusters.ScenesCluster.GeneratedCommandListAttributeCallback) callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedAdministratorCommissioningClusterGeneratedCommandListAttributeCallback(),
-            readAdministratorCommissioningGeneratedCommandListCommandParams);
-    readAdministratorCommissioningInteractionInfo.put(
+                    .DelegatedScenesClusterGeneratedCommandListAttributeCallback(),
+            readScenesGeneratedCommandListCommandParams);
+    readScenesInteractionInfo.put(
         "readGeneratedCommandListAttribute",
-        readAdministratorCommissioningGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readAdministratorCommissioningAcceptedCommandListCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAdministratorCommissioningAcceptedCommandListAttributeInteractionInfo =
+        readScenesGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readScenesAcceptedCommandListCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readScenesAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AdministratorCommissioningCluster) cluster)
+              ((ChipClusters.ScenesCluster) cluster)
                   .readAcceptedCommandListAttribute(
-                      (ChipClusters.AdministratorCommissioningCluster
-                              .AcceptedCommandListAttributeCallback)
-                          callback);
+                      (ChipClusters.ScenesCluster.AcceptedCommandListAttributeCallback) callback);
             },
             () ->
-                new ClusterInfoMapping
-                    .DelegatedAdministratorCommissioningClusterAcceptedCommandListAttributeCallback(),
-            readAdministratorCommissioningAcceptedCommandListCommandParams);
-    readAdministratorCommissioningInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readAdministratorCommissioningAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readAdministratorCommissioningAttributeListCommandParams =
+                new ClusterInfoMapping.DelegatedScenesClusterAcceptedCommandListAttributeCallback(),
+            readScenesAcceptedCommandListCommandParams);
+    readScenesInteractionInfo.put(
+        "readAcceptedCommandListAttribute", readScenesAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readScenesAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAdministratorCommissioningAttributeListAttributeInteractionInfo =
+    InteractionInfo readScenesAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AdministratorCommissioningCluster) cluster)
+              ((ChipClusters.ScenesCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.AdministratorCommissioningCluster
-                              .AttributeListAttributeCallback)
-                          callback);
+                      (ChipClusters.ScenesCluster.AttributeListAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedAdministratorCommissioningClusterAttributeListAttributeCallback(),
-            readAdministratorCommissioningAttributeListCommandParams);
-    readAdministratorCommissioningInteractionInfo.put(
-        "readAttributeListAttribute",
-        readAdministratorCommissioningAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readAdministratorCommissioningFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedScenesClusterAttributeListAttributeCallback(),
+            readScenesAttributeListCommandParams);
+    readScenesInteractionInfo.put(
+        "readAttributeListAttribute", readScenesAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readScenesFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAdministratorCommissioningFeatureMapAttributeInteractionInfo =
+    InteractionInfo readScenesFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AdministratorCommissioningCluster) cluster)
+              ((ChipClusters.ScenesCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readAdministratorCommissioningFeatureMapCommandParams);
-    readAdministratorCommissioningInteractionInfo.put(
-        "readFeatureMapAttribute",
-        readAdministratorCommissioningFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readAdministratorCommissioningClusterRevisionCommandParams =
+            readScenesFeatureMapCommandParams);
+    readScenesInteractionInfo.put(
+        "readFeatureMapAttribute", readScenesFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readScenesClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAdministratorCommissioningClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readScenesClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AdministratorCommissioningCluster) cluster)
+              ((ChipClusters.ScenesCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readAdministratorCommissioningClusterRevisionCommandParams);
-    readAdministratorCommissioningInteractionInfo.put(
-        "readClusterRevisionAttribute",
-        readAdministratorCommissioningClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put(
-        "administratorCommissioning", readAdministratorCommissioningInteractionInfo);
-    Map<String, InteractionInfo> readApplicationBasicInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readApplicationBasicVendorNameCommandParams =
+            readScenesClusterRevisionCommandParams);
+    readScenesInteractionInfo.put(
+        "readClusterRevisionAttribute", readScenesClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("scenes", readScenesInteractionInfo);
+    Map<String, InteractionInfo> readOnOffInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readOnOffOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readApplicationBasicVendorNameAttributeInteractionInfo =
+    InteractionInfo readOnOffOnOffAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ApplicationBasicCluster) cluster)
-                  .readVendorNameAttribute((ChipClusters.CharStringAttributeCallback) callback);
+              ((ChipClusters.OnOffCluster) cluster)
+                  .readOnOffAttribute((ChipClusters.BooleanAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readApplicationBasicVendorNameCommandParams);
-    readApplicationBasicInteractionInfo.put(
-        "readVendorNameAttribute", readApplicationBasicVendorNameAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readApplicationBasicVendorIDCommandParams =
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readOnOffOnOffCommandParams);
+    readOnOffInteractionInfo.put("readOnOffAttribute", readOnOffOnOffAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOnOffGlobalSceneControlCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readApplicationBasicVendorIDAttributeInteractionInfo =
+    InteractionInfo readOnOffGlobalSceneControlAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ApplicationBasicCluster) cluster)
-                  .readVendorIDAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.OnOffCluster) cluster)
+                  .readGlobalSceneControlAttribute(
+                      (ChipClusters.BooleanAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readApplicationBasicVendorIDCommandParams);
-    readApplicationBasicInteractionInfo.put(
-        "readVendorIDAttribute", readApplicationBasicVendorIDAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readApplicationBasicApplicationNameCommandParams =
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readOnOffGlobalSceneControlCommandParams);
+    readOnOffInteractionInfo.put(
+        "readGlobalSceneControlAttribute", readOnOffGlobalSceneControlAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOnOffOnTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readApplicationBasicApplicationNameAttributeInteractionInfo =
+    InteractionInfo readOnOffOnTimeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ApplicationBasicCluster) cluster)
-                  .readApplicationNameAttribute(
-                      (ChipClusters.CharStringAttributeCallback) callback);
+              ((ChipClusters.OnOffCluster) cluster)
+                  .readOnTimeAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readApplicationBasicApplicationNameCommandParams);
-    readApplicationBasicInteractionInfo.put(
-        "readApplicationNameAttribute",
-        readApplicationBasicApplicationNameAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readApplicationBasicProductIDCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readOnOffOnTimeCommandParams);
+    readOnOffInteractionInfo.put("readOnTimeAttribute", readOnOffOnTimeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOnOffOffWaitTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readApplicationBasicProductIDAttributeInteractionInfo =
+    InteractionInfo readOnOffOffWaitTimeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ApplicationBasicCluster) cluster)
-                  .readProductIDAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.OnOffCluster) cluster)
+                  .readOffWaitTimeAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readApplicationBasicProductIDCommandParams);
-    readApplicationBasicInteractionInfo.put(
-        "readProductIDAttribute", readApplicationBasicProductIDAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readApplicationBasicStatusCommandParams =
+            readOnOffOffWaitTimeCommandParams);
+    readOnOffInteractionInfo.put(
+        "readOffWaitTimeAttribute", readOnOffOffWaitTimeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOnOffStartUpOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readApplicationBasicStatusAttributeInteractionInfo =
+    InteractionInfo readOnOffStartUpOnOffAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ApplicationBasicCluster) cluster)
-                  .readStatusAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.OnOffCluster) cluster)
+                  .readStartUpOnOffAttribute(
+                      (ChipClusters.OnOffCluster.StartUpOnOffAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readApplicationBasicStatusCommandParams);
-    readApplicationBasicInteractionInfo.put(
-        "readStatusAttribute", readApplicationBasicStatusAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readApplicationBasicApplicationVersionCommandParams =
+            readOnOffStartUpOnOffCommandParams);
+    readOnOffInteractionInfo.put(
+        "readStartUpOnOffAttribute", readOnOffStartUpOnOffAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOnOffGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readApplicationBasicApplicationVersionAttributeInteractionInfo =
+    InteractionInfo readOnOffGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ApplicationBasicCluster) cluster)
-                  .readApplicationVersionAttribute(
-                      (ChipClusters.CharStringAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readApplicationBasicApplicationVersionCommandParams);
-    readApplicationBasicInteractionInfo.put(
-        "readApplicationVersionAttribute",
-        readApplicationBasicApplicationVersionAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readApplicationBasicAllowedVendorListCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readApplicationBasicAllowedVendorListAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ApplicationBasicCluster) cluster)
-                  .readAllowedVendorListAttribute(
-                      (ChipClusters.ApplicationBasicCluster.AllowedVendorListAttributeCallback)
-                          callback);
-            },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedApplicationBasicClusterAllowedVendorListAttributeCallback(),
-            readApplicationBasicAllowedVendorListCommandParams);
-    readApplicationBasicInteractionInfo.put(
-        "readAllowedVendorListAttribute",
-        readApplicationBasicAllowedVendorListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readApplicationBasicGeneratedCommandListCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readApplicationBasicGeneratedCommandListAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ApplicationBasicCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.ApplicationBasicCluster.GeneratedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.OnOffCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.OnOffCluster.GeneratedCommandListAttributeCallback) callback);
             },
             () ->
-                new ClusterInfoMapping
-                    .DelegatedApplicationBasicClusterGeneratedCommandListAttributeCallback(),
-            readApplicationBasicGeneratedCommandListCommandParams);
-    readApplicationBasicInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readApplicationBasicGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readApplicationBasicAcceptedCommandListCommandParams =
+                new ClusterInfoMapping.DelegatedOnOffClusterGeneratedCommandListAttributeCallback(),
+            readOnOffGeneratedCommandListCommandParams);
+    readOnOffInteractionInfo.put(
+        "readGeneratedCommandListAttribute", readOnOffGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOnOffAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readApplicationBasicAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readOnOffAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ApplicationBasicCluster) cluster)
+              ((ChipClusters.OnOffCluster) cluster)
                   .readAcceptedCommandListAttribute(
-                      (ChipClusters.ApplicationBasicCluster.AcceptedCommandListAttributeCallback)
-                          callback);
+                      (ChipClusters.OnOffCluster.AcceptedCommandListAttributeCallback) callback);
             },
             () ->
-                new ClusterInfoMapping
-                    .DelegatedApplicationBasicClusterAcceptedCommandListAttributeCallback(),
-            readApplicationBasicAcceptedCommandListCommandParams);
-    readApplicationBasicInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readApplicationBasicAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readApplicationBasicAttributeListCommandParams =
+                new ClusterInfoMapping.DelegatedOnOffClusterAcceptedCommandListAttributeCallback(),
+            readOnOffAcceptedCommandListCommandParams);
+    readOnOffInteractionInfo.put(
+        "readAcceptedCommandListAttribute", readOnOffAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOnOffAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readApplicationBasicAttributeListAttributeInteractionInfo =
+    InteractionInfo readOnOffAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ApplicationBasicCluster) cluster)
+              ((ChipClusters.OnOffCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.ApplicationBasicCluster.AttributeListAttributeCallback)
-                          callback);
+                      (ChipClusters.OnOffCluster.AttributeListAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedApplicationBasicClusterAttributeListAttributeCallback(),
-            readApplicationBasicAttributeListCommandParams);
-    readApplicationBasicInteractionInfo.put(
-        "readAttributeListAttribute", readApplicationBasicAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readApplicationBasicFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedOnOffClusterAttributeListAttributeCallback(),
+            readOnOffAttributeListCommandParams);
+    readOnOffInteractionInfo.put(
+        "readAttributeListAttribute", readOnOffAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOnOffFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readApplicationBasicFeatureMapAttributeInteractionInfo =
+    InteractionInfo readOnOffFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ApplicationBasicCluster) cluster)
+              ((ChipClusters.OnOffCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readApplicationBasicFeatureMapCommandParams);
-    readApplicationBasicInteractionInfo.put(
-        "readFeatureMapAttribute", readApplicationBasicFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readApplicationBasicClusterRevisionCommandParams =
+            readOnOffFeatureMapCommandParams);
+    readOnOffInteractionInfo.put(
+        "readFeatureMapAttribute", readOnOffFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOnOffClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readApplicationBasicClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readOnOffClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ApplicationBasicCluster) cluster)
+              ((ChipClusters.OnOffCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readApplicationBasicClusterRevisionCommandParams);
-    readApplicationBasicInteractionInfo.put(
-        "readClusterRevisionAttribute",
-        readApplicationBasicClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("applicationBasic", readApplicationBasicInteractionInfo);
-    Map<String, InteractionInfo> readApplicationLauncherInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readApplicationLauncherCatalogListCommandParams =
+            readOnOffClusterRevisionCommandParams);
+    readOnOffInteractionInfo.put(
+        "readClusterRevisionAttribute", readOnOffClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("onOff", readOnOffInteractionInfo);
+    Map<String, InteractionInfo> readOnOffSwitchConfigurationInteractionInfo =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readOnOffSwitchConfigurationSwitchTypeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readApplicationLauncherCatalogListAttributeInteractionInfo =
+    InteractionInfo readOnOffSwitchConfigurationSwitchTypeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ApplicationLauncherCluster) cluster)
-                  .readCatalogListAttribute(
-                      (ChipClusters.ApplicationLauncherCluster.CatalogListAttributeCallback)
-                          callback);
+              ((ChipClusters.OnOffSwitchConfigurationCluster) cluster)
+                  .readSwitchTypeAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedApplicationLauncherClusterCatalogListAttributeCallback(),
-            readApplicationLauncherCatalogListCommandParams);
-    readApplicationLauncherInteractionInfo.put(
-        "readCatalogListAttribute", readApplicationLauncherCatalogListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readApplicationLauncherGeneratedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readOnOffSwitchConfigurationSwitchTypeCommandParams);
+    readOnOffSwitchConfigurationInteractionInfo.put(
+        "readSwitchTypeAttribute", readOnOffSwitchConfigurationSwitchTypeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOnOffSwitchConfigurationSwitchActionsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readApplicationLauncherGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readOnOffSwitchConfigurationSwitchActionsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ApplicationLauncherCluster) cluster)
+              ((ChipClusters.OnOffSwitchConfigurationCluster) cluster)
+                  .readSwitchActionsAttribute((ChipClusters.IntegerAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readOnOffSwitchConfigurationSwitchActionsCommandParams);
+    readOnOffSwitchConfigurationInteractionInfo.put(
+        "readSwitchActionsAttribute",
+        readOnOffSwitchConfigurationSwitchActionsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readOnOffSwitchConfigurationGeneratedCommandListCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readOnOffSwitchConfigurationGeneratedCommandListAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.OnOffSwitchConfigurationCluster) cluster)
                   .readGeneratedCommandListAttribute(
-                      (ChipClusters.ApplicationLauncherCluster
+                      (ChipClusters.OnOffSwitchConfigurationCluster
                               .GeneratedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedApplicationLauncherClusterGeneratedCommandListAttributeCallback(),
-            readApplicationLauncherGeneratedCommandListCommandParams);
-    readApplicationLauncherInteractionInfo.put(
+                    .DelegatedOnOffSwitchConfigurationClusterGeneratedCommandListAttributeCallback(),
+            readOnOffSwitchConfigurationGeneratedCommandListCommandParams);
+    readOnOffSwitchConfigurationInteractionInfo.put(
         "readGeneratedCommandListAttribute",
-        readApplicationLauncherGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readApplicationLauncherAcceptedCommandListCommandParams =
+        readOnOffSwitchConfigurationGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOnOffSwitchConfigurationAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readApplicationLauncherAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readOnOffSwitchConfigurationAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ApplicationLauncherCluster) cluster)
+              ((ChipClusters.OnOffSwitchConfigurationCluster) cluster)
                   .readAcceptedCommandListAttribute(
-                      (ChipClusters.ApplicationLauncherCluster.AcceptedCommandListAttributeCallback)
+                      (ChipClusters.OnOffSwitchConfigurationCluster
+                              .AcceptedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedApplicationLauncherClusterAcceptedCommandListAttributeCallback(),
-            readApplicationLauncherAcceptedCommandListCommandParams);
-    readApplicationLauncherInteractionInfo.put(
+                    .DelegatedOnOffSwitchConfigurationClusterAcceptedCommandListAttributeCallback(),
+            readOnOffSwitchConfigurationAcceptedCommandListCommandParams);
+    readOnOffSwitchConfigurationInteractionInfo.put(
         "readAcceptedCommandListAttribute",
-        readApplicationLauncherAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readApplicationLauncherAttributeListCommandParams =
+        readOnOffSwitchConfigurationAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOnOffSwitchConfigurationAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readApplicationLauncherAttributeListAttributeInteractionInfo =
+    InteractionInfo readOnOffSwitchConfigurationAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ApplicationLauncherCluster) cluster)
+              ((ChipClusters.OnOffSwitchConfigurationCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.ApplicationLauncherCluster.AttributeListAttributeCallback)
+                      (ChipClusters.OnOffSwitchConfigurationCluster.AttributeListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedApplicationLauncherClusterAttributeListAttributeCallback(),
-            readApplicationLauncherAttributeListCommandParams);
-    readApplicationLauncherInteractionInfo.put(
-        "readAttributeListAttribute", readApplicationLauncherAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readApplicationLauncherFeatureMapCommandParams =
+                    .DelegatedOnOffSwitchConfigurationClusterAttributeListAttributeCallback(),
+            readOnOffSwitchConfigurationAttributeListCommandParams);
+    readOnOffSwitchConfigurationInteractionInfo.put(
+        "readAttributeListAttribute",
+        readOnOffSwitchConfigurationAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOnOffSwitchConfigurationFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readApplicationLauncherFeatureMapAttributeInteractionInfo =
+    InteractionInfo readOnOffSwitchConfigurationFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ApplicationLauncherCluster) cluster)
+              ((ChipClusters.OnOffSwitchConfigurationCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readApplicationLauncherFeatureMapCommandParams);
-    readApplicationLauncherInteractionInfo.put(
-        "readFeatureMapAttribute", readApplicationLauncherFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readApplicationLauncherClusterRevisionCommandParams =
+            readOnOffSwitchConfigurationFeatureMapCommandParams);
+    readOnOffSwitchConfigurationInteractionInfo.put(
+        "readFeatureMapAttribute", readOnOffSwitchConfigurationFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOnOffSwitchConfigurationClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readApplicationLauncherClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readOnOffSwitchConfigurationClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ApplicationLauncherCluster) cluster)
+              ((ChipClusters.OnOffSwitchConfigurationCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readApplicationLauncherClusterRevisionCommandParams);
-    readApplicationLauncherInteractionInfo.put(
+            readOnOffSwitchConfigurationClusterRevisionCommandParams);
+    readOnOffSwitchConfigurationInteractionInfo.put(
         "readClusterRevisionAttribute",
-        readApplicationLauncherClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("applicationLauncher", readApplicationLauncherInteractionInfo);
-    Map<String, InteractionInfo> readAudioOutputInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readAudioOutputOutputListCommandParams =
+        readOnOffSwitchConfigurationClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("onOffSwitchConfiguration", readOnOffSwitchConfigurationInteractionInfo);
+    Map<String, InteractionInfo> readLevelControlInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readLevelControlCurrentLevelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAudioOutputOutputListAttributeInteractionInfo =
+    InteractionInfo readLevelControlCurrentLevelAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AudioOutputCluster) cluster)
-                  .readOutputListAttribute(
-                      (ChipClusters.AudioOutputCluster.OutputListAttributeCallback) callback);
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .readCurrentLevelAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedAudioOutputClusterOutputListAttributeCallback(),
-            readAudioOutputOutputListCommandParams);
-    readAudioOutputInteractionInfo.put(
-        "readOutputListAttribute", readAudioOutputOutputListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readAudioOutputCurrentOutputCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readLevelControlCurrentLevelCommandParams);
+    readLevelControlInteractionInfo.put(
+        "readCurrentLevelAttribute", readLevelControlCurrentLevelAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readLevelControlRemainingTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAudioOutputCurrentOutputAttributeInteractionInfo =
+    InteractionInfo readLevelControlRemainingTimeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AudioOutputCluster) cluster)
-                  .readCurrentOutputAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .readRemainingTimeAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readAudioOutputCurrentOutputCommandParams);
-    readAudioOutputInteractionInfo.put(
-        "readCurrentOutputAttribute", readAudioOutputCurrentOutputAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readAudioOutputGeneratedCommandListCommandParams =
+            readLevelControlRemainingTimeCommandParams);
+    readLevelControlInteractionInfo.put(
+        "readRemainingTimeAttribute", readLevelControlRemainingTimeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readLevelControlMinLevelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAudioOutputGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readLevelControlMinLevelAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AudioOutputCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.AudioOutputCluster.GeneratedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .readMinLevelAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedAudioOutputClusterGeneratedCommandListAttributeCallback(),
-            readAudioOutputGeneratedCommandListCommandParams);
-    readAudioOutputInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readAudioOutputGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readAudioOutputAcceptedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readLevelControlMinLevelCommandParams);
+    readLevelControlInteractionInfo.put(
+        "readMinLevelAttribute", readLevelControlMinLevelAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readLevelControlMaxLevelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAudioOutputAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readLevelControlMaxLevelAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AudioOutputCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.AudioOutputCluster.AcceptedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .readMaxLevelAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedAudioOutputClusterAcceptedCommandListAttributeCallback(),
-            readAudioOutputAcceptedCommandListCommandParams);
-    readAudioOutputInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readAudioOutputAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readAudioOutputAttributeListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readLevelControlMaxLevelCommandParams);
+    readLevelControlInteractionInfo.put(
+        "readMaxLevelAttribute", readLevelControlMaxLevelAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readLevelControlCurrentFrequencyCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAudioOutputAttributeListAttributeInteractionInfo =
+    InteractionInfo readLevelControlCurrentFrequencyAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AudioOutputCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.AudioOutputCluster.AttributeListAttributeCallback) callback);
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .readCurrentFrequencyAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping.DelegatedAudioOutputClusterAttributeListAttributeCallback(),
-            readAudioOutputAttributeListCommandParams);
-    readAudioOutputInteractionInfo.put(
-        "readAttributeListAttribute", readAudioOutputAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readAudioOutputFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readLevelControlCurrentFrequencyCommandParams);
+    readLevelControlInteractionInfo.put(
+        "readCurrentFrequencyAttribute", readLevelControlCurrentFrequencyAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readLevelControlMinFrequencyCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAudioOutputFeatureMapAttributeInteractionInfo =
+    InteractionInfo readLevelControlMinFrequencyAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AudioOutputCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .readMinFrequencyAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readAudioOutputFeatureMapCommandParams);
-    readAudioOutputInteractionInfo.put(
-        "readFeatureMapAttribute", readAudioOutputFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readAudioOutputClusterRevisionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readLevelControlMinFrequencyCommandParams);
+    readLevelControlInteractionInfo.put(
+        "readMinFrequencyAttribute", readLevelControlMinFrequencyAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readLevelControlMaxFrequencyCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readAudioOutputClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readLevelControlMaxFrequencyAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.AudioOutputCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .readMaxFrequencyAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readAudioOutputClusterRevisionCommandParams);
-    readAudioOutputInteractionInfo.put(
-        "readClusterRevisionAttribute", readAudioOutputClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("audioOutput", readAudioOutputInteractionInfo);
-    Map<String, InteractionInfo> readBarrierControlInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readBarrierControlBarrierMovingStateCommandParams =
+            readLevelControlMaxFrequencyCommandParams);
+    readLevelControlInteractionInfo.put(
+        "readMaxFrequencyAttribute", readLevelControlMaxFrequencyAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readLevelControlOptionsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBarrierControlBarrierMovingStateAttributeInteractionInfo =
+    InteractionInfo readLevelControlOptionsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BarrierControlCluster) cluster)
-                  .readBarrierMovingStateAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .readOptionsAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readBarrierControlBarrierMovingStateCommandParams);
-    readBarrierControlInteractionInfo.put(
-        "readBarrierMovingStateAttribute",
-        readBarrierControlBarrierMovingStateAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBarrierControlBarrierSafetyStatusCommandParams =
+            readLevelControlOptionsCommandParams);
+    readLevelControlInteractionInfo.put(
+        "readOptionsAttribute", readLevelControlOptionsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readLevelControlOnOffTransitionTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBarrierControlBarrierSafetyStatusAttributeInteractionInfo =
+    InteractionInfo readLevelControlOnOffTransitionTimeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BarrierControlCluster) cluster)
-                  .readBarrierSafetyStatusAttribute(
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .readOnOffTransitionTimeAttribute(
                       (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readBarrierControlBarrierSafetyStatusCommandParams);
-    readBarrierControlInteractionInfo.put(
-        "readBarrierSafetyStatusAttribute",
-        readBarrierControlBarrierSafetyStatusAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBarrierControlBarrierCapabilitiesCommandParams =
+            readLevelControlOnOffTransitionTimeCommandParams);
+    readLevelControlInteractionInfo.put(
+        "readOnOffTransitionTimeAttribute",
+        readLevelControlOnOffTransitionTimeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readLevelControlOnLevelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBarrierControlBarrierCapabilitiesAttributeInteractionInfo =
+    InteractionInfo readLevelControlOnLevelAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BarrierControlCluster) cluster)
-                  .readBarrierCapabilitiesAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .readOnLevelAttribute(
+                      (ChipClusters.LevelControlCluster.OnLevelAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readBarrierControlBarrierCapabilitiesCommandParams);
-    readBarrierControlInteractionInfo.put(
-        "readBarrierCapabilitiesAttribute",
-        readBarrierControlBarrierCapabilitiesAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBarrierControlBarrierPositionCommandParams =
+            readLevelControlOnLevelCommandParams);
+    readLevelControlInteractionInfo.put(
+        "readOnLevelAttribute", readLevelControlOnLevelAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readLevelControlOnTransitionTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBarrierControlBarrierPositionAttributeInteractionInfo =
+    InteractionInfo readLevelControlOnTransitionTimeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BarrierControlCluster) cluster)
-                  .readBarrierPositionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .readOnTransitionTimeAttribute(
+                      (ChipClusters.LevelControlCluster.OnTransitionTimeAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readBarrierControlBarrierPositionCommandParams);
-    readBarrierControlInteractionInfo.put(
-        "readBarrierPositionAttribute", readBarrierControlBarrierPositionAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBarrierControlGeneratedCommandListCommandParams =
+            readLevelControlOnTransitionTimeCommandParams);
+    readLevelControlInteractionInfo.put(
+        "readOnTransitionTimeAttribute", readLevelControlOnTransitionTimeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readLevelControlOffTransitionTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBarrierControlGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readLevelControlOffTransitionTimeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BarrierControlCluster) cluster)
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .readOffTransitionTimeAttribute(
+                      (ChipClusters.LevelControlCluster.OffTransitionTimeAttributeCallback)
+                          callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readLevelControlOffTransitionTimeCommandParams);
+    readLevelControlInteractionInfo.put(
+        "readOffTransitionTimeAttribute",
+        readLevelControlOffTransitionTimeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readLevelControlDefaultMoveRateCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readLevelControlDefaultMoveRateAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .readDefaultMoveRateAttribute(
+                      (ChipClusters.LevelControlCluster.DefaultMoveRateAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readLevelControlDefaultMoveRateCommandParams);
+    readLevelControlInteractionInfo.put(
+        "readDefaultMoveRateAttribute", readLevelControlDefaultMoveRateAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readLevelControlStartUpCurrentLevelCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readLevelControlStartUpCurrentLevelAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .readStartUpCurrentLevelAttribute(
+                      (ChipClusters.LevelControlCluster.StartUpCurrentLevelAttributeCallback)
+                          callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readLevelControlStartUpCurrentLevelCommandParams);
+    readLevelControlInteractionInfo.put(
+        "readStartUpCurrentLevelAttribute",
+        readLevelControlStartUpCurrentLevelAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readLevelControlGeneratedCommandListCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readLevelControlGeneratedCommandListAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.LevelControlCluster) cluster)
                   .readGeneratedCommandListAttribute(
-                      (ChipClusters.BarrierControlCluster.GeneratedCommandListAttributeCallback)
+                      (ChipClusters.LevelControlCluster.GeneratedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedBarrierControlClusterGeneratedCommandListAttributeCallback(),
-            readBarrierControlGeneratedCommandListCommandParams);
-    readBarrierControlInteractionInfo.put(
+                    .DelegatedLevelControlClusterGeneratedCommandListAttributeCallback(),
+            readLevelControlGeneratedCommandListCommandParams);
+    readLevelControlInteractionInfo.put(
         "readGeneratedCommandListAttribute",
-        readBarrierControlGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBarrierControlAcceptedCommandListCommandParams =
+        readLevelControlGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readLevelControlAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBarrierControlAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readLevelControlAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BarrierControlCluster) cluster)
+              ((ChipClusters.LevelControlCluster) cluster)
                   .readAcceptedCommandListAttribute(
-                      (ChipClusters.BarrierControlCluster.AcceptedCommandListAttributeCallback)
+                      (ChipClusters.LevelControlCluster.AcceptedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedBarrierControlClusterAcceptedCommandListAttributeCallback(),
-            readBarrierControlAcceptedCommandListCommandParams);
-    readBarrierControlInteractionInfo.put(
+                    .DelegatedLevelControlClusterAcceptedCommandListAttributeCallback(),
+            readLevelControlAcceptedCommandListCommandParams);
+    readLevelControlInteractionInfo.put(
         "readAcceptedCommandListAttribute",
-        readBarrierControlAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBarrierControlAttributeListCommandParams =
+        readLevelControlAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readLevelControlAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBarrierControlAttributeListAttributeInteractionInfo =
+    InteractionInfo readLevelControlAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BarrierControlCluster) cluster)
+              ((ChipClusters.LevelControlCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.BarrierControlCluster.AttributeListAttributeCallback) callback);
+                      (ChipClusters.LevelControlCluster.AttributeListAttributeCallback) callback);
             },
             () ->
-                new ClusterInfoMapping
-                    .DelegatedBarrierControlClusterAttributeListAttributeCallback(),
-            readBarrierControlAttributeListCommandParams);
-    readBarrierControlInteractionInfo.put(
-        "readAttributeListAttribute", readBarrierControlAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBarrierControlFeatureMapCommandParams =
+                new ClusterInfoMapping.DelegatedLevelControlClusterAttributeListAttributeCallback(),
+            readLevelControlAttributeListCommandParams);
+    readLevelControlInteractionInfo.put(
+        "readAttributeListAttribute", readLevelControlAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readLevelControlFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBarrierControlFeatureMapAttributeInteractionInfo =
+    InteractionInfo readLevelControlFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BarrierControlCluster) cluster)
+              ((ChipClusters.LevelControlCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readBarrierControlFeatureMapCommandParams);
-    readBarrierControlInteractionInfo.put(
-        "readFeatureMapAttribute", readBarrierControlFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBarrierControlClusterRevisionCommandParams =
+            readLevelControlFeatureMapCommandParams);
+    readLevelControlInteractionInfo.put(
+        "readFeatureMapAttribute", readLevelControlFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readLevelControlClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBarrierControlClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readLevelControlClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BarrierControlCluster) cluster)
+              ((ChipClusters.LevelControlCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readBarrierControlClusterRevisionCommandParams);
-    readBarrierControlInteractionInfo.put(
-        "readClusterRevisionAttribute", readBarrierControlClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("barrierControl", readBarrierControlInteractionInfo);
-    Map<String, InteractionInfo> readBasicInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readBasicDataModelRevisionCommandParams =
+            readLevelControlClusterRevisionCommandParams);
+    readLevelControlInteractionInfo.put(
+        "readClusterRevisionAttribute", readLevelControlClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("levelControl", readLevelControlInteractionInfo);
+    Map<String, InteractionInfo> readBinaryInputBasicInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readBinaryInputBasicOutOfServiceCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBasicDataModelRevisionAttributeInteractionInfo =
+    InteractionInfo readBinaryInputBasicOutOfServiceAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .readDataModelRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.BinaryInputBasicCluster) cluster)
+                  .readOutOfServiceAttribute((ChipClusters.BooleanAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readBasicDataModelRevisionCommandParams);
-    readBasicInteractionInfo.put(
-        "readDataModelRevisionAttribute", readBasicDataModelRevisionAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBasicVendorNameCommandParams =
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readBinaryInputBasicOutOfServiceCommandParams);
+    readBinaryInputBasicInteractionInfo.put(
+        "readOutOfServiceAttribute", readBinaryInputBasicOutOfServiceAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBinaryInputBasicPresentValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBasicVendorNameAttributeInteractionInfo =
+    InteractionInfo readBinaryInputBasicPresentValueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .readVendorNameAttribute((ChipClusters.CharStringAttributeCallback) callback);
+              ((ChipClusters.BinaryInputBasicCluster) cluster)
+                  .readPresentValueAttribute((ChipClusters.BooleanAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readBasicVendorNameCommandParams);
-    readBasicInteractionInfo.put(
-        "readVendorNameAttribute", readBasicVendorNameAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBasicVendorIDCommandParams =
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readBinaryInputBasicPresentValueCommandParams);
+    readBinaryInputBasicInteractionInfo.put(
+        "readPresentValueAttribute", readBinaryInputBasicPresentValueAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBinaryInputBasicStatusFlagsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBasicVendorIDAttributeInteractionInfo =
+    InteractionInfo readBinaryInputBasicStatusFlagsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .readVendorIDAttribute(
-                      (ChipClusters.BasicCluster.VendorIDAttributeCallback) callback);
+              ((ChipClusters.BinaryInputBasicCluster) cluster)
+                  .readStatusFlagsAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readBasicVendorIDCommandParams);
-    readBasicInteractionInfo.put(
-        "readVendorIDAttribute", readBasicVendorIDAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBasicProductNameCommandParams =
+            readBinaryInputBasicStatusFlagsCommandParams);
+    readBinaryInputBasicInteractionInfo.put(
+        "readStatusFlagsAttribute", readBinaryInputBasicStatusFlagsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBinaryInputBasicGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBasicProductNameAttributeInteractionInfo =
+    InteractionInfo readBinaryInputBasicGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .readProductNameAttribute((ChipClusters.CharStringAttributeCallback) callback);
+              ((ChipClusters.BinaryInputBasicCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.BinaryInputBasicCluster.GeneratedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readBasicProductNameCommandParams);
-    readBasicInteractionInfo.put(
-        "readProductNameAttribute", readBasicProductNameAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBasicProductIDCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedBinaryInputBasicClusterGeneratedCommandListAttributeCallback(),
+            readBinaryInputBasicGeneratedCommandListCommandParams);
+    readBinaryInputBasicInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readBinaryInputBasicGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBinaryInputBasicAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBasicProductIDAttributeInteractionInfo =
+    InteractionInfo readBinaryInputBasicAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .readProductIDAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.BinaryInputBasicCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.BinaryInputBasicCluster.AcceptedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readBasicProductIDCommandParams);
-    readBasicInteractionInfo.put(
-        "readProductIDAttribute", readBasicProductIDAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBasicNodeLabelCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedBinaryInputBasicClusterAcceptedCommandListAttributeCallback(),
+            readBinaryInputBasicAcceptedCommandListCommandParams);
+    readBinaryInputBasicInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readBinaryInputBasicAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBinaryInputBasicAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBasicNodeLabelAttributeInteractionInfo =
+    InteractionInfo readBinaryInputBasicAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .readNodeLabelAttribute((ChipClusters.CharStringAttributeCallback) callback);
+              ((ChipClusters.BinaryInputBasicCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.BinaryInputBasicCluster.AttributeListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readBasicNodeLabelCommandParams);
-    readBasicInteractionInfo.put(
-        "readNodeLabelAttribute", readBasicNodeLabelAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBasicLocationCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedBinaryInputBasicClusterAttributeListAttributeCallback(),
+            readBinaryInputBasicAttributeListCommandParams);
+    readBinaryInputBasicInteractionInfo.put(
+        "readAttributeListAttribute", readBinaryInputBasicAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBinaryInputBasicFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBasicLocationAttributeInteractionInfo =
+    InteractionInfo readBinaryInputBasicFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .readLocationAttribute((ChipClusters.CharStringAttributeCallback) callback);
+              ((ChipClusters.BinaryInputBasicCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readBasicLocationCommandParams);
-    readBasicInteractionInfo.put(
-        "readLocationAttribute", readBasicLocationAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBasicHardwareVersionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readBinaryInputBasicFeatureMapCommandParams);
+    readBinaryInputBasicInteractionInfo.put(
+        "readFeatureMapAttribute", readBinaryInputBasicFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBinaryInputBasicClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBasicHardwareVersionAttributeInteractionInfo =
+    InteractionInfo readBinaryInputBasicClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .readHardwareVersionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.BinaryInputBasicCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readBasicHardwareVersionCommandParams);
-    readBasicInteractionInfo.put(
-        "readHardwareVersionAttribute", readBasicHardwareVersionAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBasicHardwareVersionStringCommandParams =
+            readBinaryInputBasicClusterRevisionCommandParams);
+    readBinaryInputBasicInteractionInfo.put(
+        "readClusterRevisionAttribute",
+        readBinaryInputBasicClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("binaryInputBasic", readBinaryInputBasicInteractionInfo);
+    Map<String, InteractionInfo> readDescriptorInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readDescriptorDeviceListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBasicHardwareVersionStringAttributeInteractionInfo =
+    InteractionInfo readDescriptorDeviceListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .readHardwareVersionStringAttribute(
-                      (ChipClusters.CharStringAttributeCallback) callback);
+              ((ChipClusters.DescriptorCluster) cluster)
+                  .readDeviceListAttribute(
+                      (ChipClusters.DescriptorCluster.DeviceListAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readBasicHardwareVersionStringCommandParams);
-    readBasicInteractionInfo.put(
-        "readHardwareVersionStringAttribute",
-        readBasicHardwareVersionStringAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBasicSoftwareVersionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedDescriptorClusterDeviceListAttributeCallback(),
+            readDescriptorDeviceListCommandParams);
+    readDescriptorInteractionInfo.put(
+        "readDeviceListAttribute", readDescriptorDeviceListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDescriptorServerListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBasicSoftwareVersionAttributeInteractionInfo =
+    InteractionInfo readDescriptorServerListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .readSoftwareVersionAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.DescriptorCluster) cluster)
+                  .readServerListAttribute(
+                      (ChipClusters.DescriptorCluster.ServerListAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readBasicSoftwareVersionCommandParams);
-    readBasicInteractionInfo.put(
-        "readSoftwareVersionAttribute", readBasicSoftwareVersionAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBasicSoftwareVersionStringCommandParams =
+            () -> new ClusterInfoMapping.DelegatedDescriptorClusterServerListAttributeCallback(),
+            readDescriptorServerListCommandParams);
+    readDescriptorInteractionInfo.put(
+        "readServerListAttribute", readDescriptorServerListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDescriptorClientListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBasicSoftwareVersionStringAttributeInteractionInfo =
+    InteractionInfo readDescriptorClientListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .readSoftwareVersionStringAttribute(
-                      (ChipClusters.CharStringAttributeCallback) callback);
+              ((ChipClusters.DescriptorCluster) cluster)
+                  .readClientListAttribute(
+                      (ChipClusters.DescriptorCluster.ClientListAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readBasicSoftwareVersionStringCommandParams);
-    readBasicInteractionInfo.put(
-        "readSoftwareVersionStringAttribute",
-        readBasicSoftwareVersionStringAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBasicManufacturingDateCommandParams =
+            () -> new ClusterInfoMapping.DelegatedDescriptorClusterClientListAttributeCallback(),
+            readDescriptorClientListCommandParams);
+    readDescriptorInteractionInfo.put(
+        "readClientListAttribute", readDescriptorClientListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDescriptorPartsListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBasicManufacturingDateAttributeInteractionInfo =
+    InteractionInfo readDescriptorPartsListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .readManufacturingDateAttribute(
-                      (ChipClusters.CharStringAttributeCallback) callback);
+              ((ChipClusters.DescriptorCluster) cluster)
+                  .readPartsListAttribute(
+                      (ChipClusters.DescriptorCluster.PartsListAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readBasicManufacturingDateCommandParams);
-    readBasicInteractionInfo.put(
-        "readManufacturingDateAttribute", readBasicManufacturingDateAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBasicPartNumberCommandParams =
+            () -> new ClusterInfoMapping.DelegatedDescriptorClusterPartsListAttributeCallback(),
+            readDescriptorPartsListCommandParams);
+    readDescriptorInteractionInfo.put(
+        "readPartsListAttribute", readDescriptorPartsListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDescriptorGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBasicPartNumberAttributeInteractionInfo =
+    InteractionInfo readDescriptorGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .readPartNumberAttribute((ChipClusters.CharStringAttributeCallback) callback);
+              ((ChipClusters.DescriptorCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.DescriptorCluster.GeneratedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readBasicPartNumberCommandParams);
-    readBasicInteractionInfo.put(
-        "readPartNumberAttribute", readBasicPartNumberAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBasicProductURLCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedDescriptorClusterGeneratedCommandListAttributeCallback(),
+            readDescriptorGeneratedCommandListCommandParams);
+    readDescriptorInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readDescriptorGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDescriptorAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBasicProductURLAttributeInteractionInfo =
+    InteractionInfo readDescriptorAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .readProductURLAttribute((ChipClusters.CharStringAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readBasicProductURLCommandParams);
-    readBasicInteractionInfo.put(
-        "readProductURLAttribute", readBasicProductURLAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBasicProductLabelCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBasicProductLabelAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .readProductLabelAttribute((ChipClusters.CharStringAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readBasicProductLabelCommandParams);
-    readBasicInteractionInfo.put(
-        "readProductLabelAttribute", readBasicProductLabelAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBasicSerialNumberCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBasicSerialNumberAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .readSerialNumberAttribute((ChipClusters.CharStringAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readBasicSerialNumberCommandParams);
-    readBasicInteractionInfo.put(
-        "readSerialNumberAttribute", readBasicSerialNumberAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBasicLocalConfigDisabledCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBasicLocalConfigDisabledAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .readLocalConfigDisabledAttribute(
-                      (ChipClusters.BooleanAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readBasicLocalConfigDisabledCommandParams);
-    readBasicInteractionInfo.put(
-        "readLocalConfigDisabledAttribute", readBasicLocalConfigDisabledAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBasicReachableCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBasicReachableAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .readReachableAttribute((ChipClusters.BooleanAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readBasicReachableCommandParams);
-    readBasicInteractionInfo.put(
-        "readReachableAttribute", readBasicReachableAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBasicUniqueIDCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBasicUniqueIDAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .readUniqueIDAttribute((ChipClusters.CharStringAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readBasicUniqueIDCommandParams);
-    readBasicInteractionInfo.put(
-        "readUniqueIDAttribute", readBasicUniqueIDAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBasicGeneratedCommandListCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBasicGeneratedCommandListAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.BasicCluster.GeneratedCommandListAttributeCallback) callback);
-            },
-            () ->
-                new ClusterInfoMapping.DelegatedBasicClusterGeneratedCommandListAttributeCallback(),
-            readBasicGeneratedCommandListCommandParams);
-    readBasicInteractionInfo.put(
-        "readGeneratedCommandListAttribute", readBasicGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBasicAcceptedCommandListCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBasicAcceptedCommandListAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.BasicCluster.AcceptedCommandListAttributeCallback) callback);
-            },
-            () ->
-                new ClusterInfoMapping.DelegatedBasicClusterAcceptedCommandListAttributeCallback(),
-            readBasicAcceptedCommandListCommandParams);
-    readBasicInteractionInfo.put(
-        "readAcceptedCommandListAttribute", readBasicAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBasicAttributeListCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBasicAttributeListAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.BasicCluster.AttributeListAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedBasicClusterAttributeListAttributeCallback(),
-            readBasicAttributeListCommandParams);
-    readBasicInteractionInfo.put(
-        "readAttributeListAttribute", readBasicAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBasicFeatureMapCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBasicFeatureMapAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readBasicFeatureMapCommandParams);
-    readBasicInteractionInfo.put(
-        "readFeatureMapAttribute", readBasicFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBasicClusterRevisionCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBasicClusterRevisionAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readBasicClusterRevisionCommandParams);
-    readBasicInteractionInfo.put(
-        "readClusterRevisionAttribute", readBasicClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("basic", readBasicInteractionInfo);
-    Map<String, InteractionInfo> readBinaryInputBasicInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readBinaryInputBasicOutOfServiceCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBinaryInputBasicOutOfServiceAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BinaryInputBasicCluster) cluster)
-                  .readOutOfServiceAttribute((ChipClusters.BooleanAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readBinaryInputBasicOutOfServiceCommandParams);
-    readBinaryInputBasicInteractionInfo.put(
-        "readOutOfServiceAttribute", readBinaryInputBasicOutOfServiceAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBinaryInputBasicPresentValueCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBinaryInputBasicPresentValueAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BinaryInputBasicCluster) cluster)
-                  .readPresentValueAttribute((ChipClusters.BooleanAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readBinaryInputBasicPresentValueCommandParams);
-    readBinaryInputBasicInteractionInfo.put(
-        "readPresentValueAttribute", readBinaryInputBasicPresentValueAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBinaryInputBasicStatusFlagsCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBinaryInputBasicStatusFlagsAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BinaryInputBasicCluster) cluster)
-                  .readStatusFlagsAttribute((ChipClusters.IntegerAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readBinaryInputBasicStatusFlagsCommandParams);
-    readBinaryInputBasicInteractionInfo.put(
-        "readStatusFlagsAttribute", readBinaryInputBasicStatusFlagsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBinaryInputBasicGeneratedCommandListCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBinaryInputBasicGeneratedCommandListAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BinaryInputBasicCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.BinaryInputBasicCluster.GeneratedCommandListAttributeCallback)
-                          callback);
-            },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedBinaryInputBasicClusterGeneratedCommandListAttributeCallback(),
-            readBinaryInputBasicGeneratedCommandListCommandParams);
-    readBinaryInputBasicInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readBinaryInputBasicGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBinaryInputBasicAcceptedCommandListCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBinaryInputBasicAcceptedCommandListAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BinaryInputBasicCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.BinaryInputBasicCluster.AcceptedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.DescriptorCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.DescriptorCluster.AcceptedCommandListAttributeCallback)
+                          callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedBinaryInputBasicClusterAcceptedCommandListAttributeCallback(),
-            readBinaryInputBasicAcceptedCommandListCommandParams);
-    readBinaryInputBasicInteractionInfo.put(
+                    .DelegatedDescriptorClusterAcceptedCommandListAttributeCallback(),
+            readDescriptorAcceptedCommandListCommandParams);
+    readDescriptorInteractionInfo.put(
         "readAcceptedCommandListAttribute",
-        readBinaryInputBasicAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBinaryInputBasicAttributeListCommandParams =
+        readDescriptorAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDescriptorAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBinaryInputBasicAttributeListAttributeInteractionInfo =
+    InteractionInfo readDescriptorAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BinaryInputBasicCluster) cluster)
+              ((ChipClusters.DescriptorCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.BinaryInputBasicCluster.AttributeListAttributeCallback)
-                          callback);
+                      (ChipClusters.DescriptorCluster.AttributeListAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedBinaryInputBasicClusterAttributeListAttributeCallback(),
-            readBinaryInputBasicAttributeListCommandParams);
-    readBinaryInputBasicInteractionInfo.put(
-        "readAttributeListAttribute", readBinaryInputBasicAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBinaryInputBasicFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedDescriptorClusterAttributeListAttributeCallback(),
+            readDescriptorAttributeListCommandParams);
+    readDescriptorInteractionInfo.put(
+        "readAttributeListAttribute", readDescriptorAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDescriptorFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBinaryInputBasicFeatureMapAttributeInteractionInfo =
+    InteractionInfo readDescriptorFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BinaryInputBasicCluster) cluster)
+              ((ChipClusters.DescriptorCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readBinaryInputBasicFeatureMapCommandParams);
-    readBinaryInputBasicInteractionInfo.put(
-        "readFeatureMapAttribute", readBinaryInputBasicFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBinaryInputBasicClusterRevisionCommandParams =
+            readDescriptorFeatureMapCommandParams);
+    readDescriptorInteractionInfo.put(
+        "readFeatureMapAttribute", readDescriptorFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDescriptorClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBinaryInputBasicClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readDescriptorClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BinaryInputBasicCluster) cluster)
+              ((ChipClusters.DescriptorCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readBinaryInputBasicClusterRevisionCommandParams);
-    readBinaryInputBasicInteractionInfo.put(
-        "readClusterRevisionAttribute",
-        readBinaryInputBasicClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("binaryInputBasic", readBinaryInputBasicInteractionInfo);
+            readDescriptorClusterRevisionCommandParams);
+    readDescriptorInteractionInfo.put(
+        "readClusterRevisionAttribute", readDescriptorClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("descriptor", readDescriptorInteractionInfo);
     Map<String, InteractionInfo> readBindingInteractionInfo = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> readBindingBindingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
@@ -1364,92 +1145,149 @@ public Map<String, Map<String, InteractionInfo>> getReadAttributeMap() {
     readBindingInteractionInfo.put(
         "readClusterRevisionAttribute", readBindingClusterRevisionAttributeInteractionInfo);
     readAttributeMap.put("binding", readBindingInteractionInfo);
-    Map<String, InteractionInfo> readBooleanStateInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readBooleanStateStateValueCommandParams =
+    Map<String, InteractionInfo> readAccessControlInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readAccessControlAclCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBooleanStateStateValueAttributeInteractionInfo =
+    InteractionInfo readAccessControlAclAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BooleanStateCluster) cluster)
-                  .readStateValueAttribute((ChipClusters.BooleanAttributeCallback) callback);
+              ((ChipClusters.AccessControlCluster) cluster)
+                  .readAclAttribute(
+                      (ChipClusters.AccessControlCluster.AclAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readBooleanStateStateValueCommandParams);
-    readBooleanStateInteractionInfo.put(
-        "readStateValueAttribute", readBooleanStateStateValueAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBooleanStateGeneratedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedAccessControlClusterAclAttributeCallback(),
+            readAccessControlAclCommandParams);
+    readAccessControlInteractionInfo.put(
+        "readAclAttribute", readAccessControlAclAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readAccessControlExtensionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBooleanStateGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readAccessControlExtensionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BooleanStateCluster) cluster)
+              ((ChipClusters.AccessControlCluster) cluster)
+                  .readExtensionAttribute(
+                      (ChipClusters.AccessControlCluster.ExtensionAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedAccessControlClusterExtensionAttributeCallback(),
+            readAccessControlExtensionCommandParams);
+    readAccessControlInteractionInfo.put(
+        "readExtensionAttribute", readAccessControlExtensionAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readAccessControlSubjectsPerAccessControlEntryCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readAccessControlSubjectsPerAccessControlEntryAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.AccessControlCluster) cluster)
+                  .readSubjectsPerAccessControlEntryAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readAccessControlSubjectsPerAccessControlEntryCommandParams);
+    readAccessControlInteractionInfo.put(
+        "readSubjectsPerAccessControlEntryAttribute",
+        readAccessControlSubjectsPerAccessControlEntryAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readAccessControlTargetsPerAccessControlEntryCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readAccessControlTargetsPerAccessControlEntryAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.AccessControlCluster) cluster)
+                  .readTargetsPerAccessControlEntryAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readAccessControlTargetsPerAccessControlEntryCommandParams);
+    readAccessControlInteractionInfo.put(
+        "readTargetsPerAccessControlEntryAttribute",
+        readAccessControlTargetsPerAccessControlEntryAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readAccessControlAccessControlEntriesPerFabricCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readAccessControlAccessControlEntriesPerFabricAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.AccessControlCluster) cluster)
+                  .readAccessControlEntriesPerFabricAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readAccessControlAccessControlEntriesPerFabricCommandParams);
+    readAccessControlInteractionInfo.put(
+        "readAccessControlEntriesPerFabricAttribute",
+        readAccessControlAccessControlEntriesPerFabricAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readAccessControlGeneratedCommandListCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readAccessControlGeneratedCommandListAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.AccessControlCluster) cluster)
                   .readGeneratedCommandListAttribute(
-                      (ChipClusters.BooleanStateCluster.GeneratedCommandListAttributeCallback)
+                      (ChipClusters.AccessControlCluster.GeneratedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedBooleanStateClusterGeneratedCommandListAttributeCallback(),
-            readBooleanStateGeneratedCommandListCommandParams);
-    readBooleanStateInteractionInfo.put(
+                    .DelegatedAccessControlClusterGeneratedCommandListAttributeCallback(),
+            readAccessControlGeneratedCommandListCommandParams);
+    readAccessControlInteractionInfo.put(
         "readGeneratedCommandListAttribute",
-        readBooleanStateGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBooleanStateAcceptedCommandListCommandParams =
+        readAccessControlGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readAccessControlAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBooleanStateAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readAccessControlAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BooleanStateCluster) cluster)
+              ((ChipClusters.AccessControlCluster) cluster)
                   .readAcceptedCommandListAttribute(
-                      (ChipClusters.BooleanStateCluster.AcceptedCommandListAttributeCallback)
+                      (ChipClusters.AccessControlCluster.AcceptedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedBooleanStateClusterAcceptedCommandListAttributeCallback(),
-            readBooleanStateAcceptedCommandListCommandParams);
-    readBooleanStateInteractionInfo.put(
+                    .DelegatedAccessControlClusterAcceptedCommandListAttributeCallback(),
+            readAccessControlAcceptedCommandListCommandParams);
+    readAccessControlInteractionInfo.put(
         "readAcceptedCommandListAttribute",
-        readBooleanStateAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBooleanStateAttributeListCommandParams =
+        readAccessControlAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readAccessControlAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBooleanStateAttributeListAttributeInteractionInfo =
+    InteractionInfo readAccessControlAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BooleanStateCluster) cluster)
+              ((ChipClusters.AccessControlCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.BooleanStateCluster.AttributeListAttributeCallback) callback);
+                      (ChipClusters.AccessControlCluster.AttributeListAttributeCallback) callback);
             },
             () ->
-                new ClusterInfoMapping.DelegatedBooleanStateClusterAttributeListAttributeCallback(),
-            readBooleanStateAttributeListCommandParams);
-    readBooleanStateInteractionInfo.put(
-        "readAttributeListAttribute", readBooleanStateAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBooleanStateFeatureMapCommandParams =
+                new ClusterInfoMapping
+                    .DelegatedAccessControlClusterAttributeListAttributeCallback(),
+            readAccessControlAttributeListCommandParams);
+    readAccessControlInteractionInfo.put(
+        "readAttributeListAttribute", readAccessControlAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readAccessControlFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBooleanStateFeatureMapAttributeInteractionInfo =
+    InteractionInfo readAccessControlFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BooleanStateCluster) cluster)
+              ((ChipClusters.AccessControlCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readBooleanStateFeatureMapCommandParams);
-    readBooleanStateInteractionInfo.put(
-        "readFeatureMapAttribute", readBooleanStateFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBooleanStateClusterRevisionCommandParams =
+            readAccessControlFeatureMapCommandParams);
+    readAccessControlInteractionInfo.put(
+        "readFeatureMapAttribute", readAccessControlFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readAccessControlClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBooleanStateClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readAccessControlClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BooleanStateCluster) cluster)
+              ((ChipClusters.AccessControlCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readBooleanStateClusterRevisionCommandParams);
-    readBooleanStateInteractionInfo.put(
-        "readClusterRevisionAttribute", readBooleanStateClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("booleanState", readBooleanStateInteractionInfo);
+            readAccessControlClusterRevisionCommandParams);
+    readAccessControlInteractionInfo.put(
+        "readClusterRevisionAttribute", readAccessControlClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("accessControl", readAccessControlInteractionInfo);
     Map<String, InteractionInfo> readBridgedActionsInteractionInfo = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> readBridgedActionsActionListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
@@ -1566,4220 +1404,4514 @@ public Map<String, Map<String, InteractionInfo>> getReadAttributeMap() {
     readBridgedActionsInteractionInfo.put(
         "readClusterRevisionAttribute", readBridgedActionsClusterRevisionAttributeInteractionInfo);
     readAttributeMap.put("bridgedActions", readBridgedActionsInteractionInfo);
-    Map<String, InteractionInfo> readBridgedDeviceBasicInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readBridgedDeviceBasicVendorNameCommandParams =
+    Map<String, InteractionInfo> readBasicInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readBasicDataModelRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBridgedDeviceBasicVendorNameAttributeInteractionInfo =
+    InteractionInfo readBasicDataModelRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+              ((ChipClusters.BasicCluster) cluster)
+                  .readDataModelRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readBasicDataModelRevisionCommandParams);
+    readBasicInteractionInfo.put(
+        "readDataModelRevisionAttribute", readBasicDataModelRevisionAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBasicVendorNameCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readBasicVendorNameAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.BasicCluster) cluster)
                   .readVendorNameAttribute((ChipClusters.CharStringAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readBridgedDeviceBasicVendorNameCommandParams);
-    readBridgedDeviceBasicInteractionInfo.put(
-        "readVendorNameAttribute", readBridgedDeviceBasicVendorNameAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBridgedDeviceBasicVendorIDCommandParams =
+            readBasicVendorNameCommandParams);
+    readBasicInteractionInfo.put(
+        "readVendorNameAttribute", readBasicVendorNameAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBasicVendorIDCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBridgedDeviceBasicVendorIDAttributeInteractionInfo =
+    InteractionInfo readBasicVendorIDAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+              ((ChipClusters.BasicCluster) cluster)
                   .readVendorIDAttribute(
-                      (ChipClusters.BridgedDeviceBasicCluster.VendorIDAttributeCallback) callback);
+                      (ChipClusters.BasicCluster.VendorIDAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readBridgedDeviceBasicVendorIDCommandParams);
-    readBridgedDeviceBasicInteractionInfo.put(
-        "readVendorIDAttribute", readBridgedDeviceBasicVendorIDAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBridgedDeviceBasicProductNameCommandParams =
+            readBasicVendorIDCommandParams);
+    readBasicInteractionInfo.put(
+        "readVendorIDAttribute", readBasicVendorIDAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBasicProductNameCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBridgedDeviceBasicProductNameAttributeInteractionInfo =
+    InteractionInfo readBasicProductNameAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+              ((ChipClusters.BasicCluster) cluster)
                   .readProductNameAttribute((ChipClusters.CharStringAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readBridgedDeviceBasicProductNameCommandParams);
-    readBridgedDeviceBasicInteractionInfo.put(
-        "readProductNameAttribute", readBridgedDeviceBasicProductNameAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBridgedDeviceBasicNodeLabelCommandParams =
+            readBasicProductNameCommandParams);
+    readBasicInteractionInfo.put(
+        "readProductNameAttribute", readBasicProductNameAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBasicProductIDCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBridgedDeviceBasicNodeLabelAttributeInteractionInfo =
+    InteractionInfo readBasicProductIDAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+              ((ChipClusters.BasicCluster) cluster)
+                  .readProductIDAttribute((ChipClusters.IntegerAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readBasicProductIDCommandParams);
+    readBasicInteractionInfo.put(
+        "readProductIDAttribute", readBasicProductIDAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBasicNodeLabelCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readBasicNodeLabelAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.BasicCluster) cluster)
                   .readNodeLabelAttribute((ChipClusters.CharStringAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readBridgedDeviceBasicNodeLabelCommandParams);
-    readBridgedDeviceBasicInteractionInfo.put(
-        "readNodeLabelAttribute", readBridgedDeviceBasicNodeLabelAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBridgedDeviceBasicHardwareVersionCommandParams =
+            readBasicNodeLabelCommandParams);
+    readBasicInteractionInfo.put(
+        "readNodeLabelAttribute", readBasicNodeLabelAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBasicLocationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBridgedDeviceBasicHardwareVersionAttributeInteractionInfo =
+    InteractionInfo readBasicLocationAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+              ((ChipClusters.BasicCluster) cluster)
+                  .readLocationAttribute((ChipClusters.CharStringAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readBasicLocationCommandParams);
+    readBasicInteractionInfo.put(
+        "readLocationAttribute", readBasicLocationAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBasicHardwareVersionCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readBasicHardwareVersionAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.BasicCluster) cluster)
                   .readHardwareVersionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readBridgedDeviceBasicHardwareVersionCommandParams);
-    readBridgedDeviceBasicInteractionInfo.put(
-        "readHardwareVersionAttribute",
-        readBridgedDeviceBasicHardwareVersionAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBridgedDeviceBasicHardwareVersionStringCommandParams =
+            readBasicHardwareVersionCommandParams);
+    readBasicInteractionInfo.put(
+        "readHardwareVersionAttribute", readBasicHardwareVersionAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBasicHardwareVersionStringCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBridgedDeviceBasicHardwareVersionStringAttributeInteractionInfo =
+    InteractionInfo readBasicHardwareVersionStringAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+              ((ChipClusters.BasicCluster) cluster)
                   .readHardwareVersionStringAttribute(
                       (ChipClusters.CharStringAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readBridgedDeviceBasicHardwareVersionStringCommandParams);
-    readBridgedDeviceBasicInteractionInfo.put(
+            readBasicHardwareVersionStringCommandParams);
+    readBasicInteractionInfo.put(
         "readHardwareVersionStringAttribute",
-        readBridgedDeviceBasicHardwareVersionStringAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBridgedDeviceBasicSoftwareVersionCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBridgedDeviceBasicSoftwareVersionAttributeInteractionInfo =
+        readBasicHardwareVersionStringAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBasicSoftwareVersionCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readBasicSoftwareVersionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+              ((ChipClusters.BasicCluster) cluster)
                   .readSoftwareVersionAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readBridgedDeviceBasicSoftwareVersionCommandParams);
-    readBridgedDeviceBasicInteractionInfo.put(
-        "readSoftwareVersionAttribute",
-        readBridgedDeviceBasicSoftwareVersionAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBridgedDeviceBasicSoftwareVersionStringCommandParams =
+            readBasicSoftwareVersionCommandParams);
+    readBasicInteractionInfo.put(
+        "readSoftwareVersionAttribute", readBasicSoftwareVersionAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBasicSoftwareVersionStringCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBridgedDeviceBasicSoftwareVersionStringAttributeInteractionInfo =
+    InteractionInfo readBasicSoftwareVersionStringAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+              ((ChipClusters.BasicCluster) cluster)
                   .readSoftwareVersionStringAttribute(
                       (ChipClusters.CharStringAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readBridgedDeviceBasicSoftwareVersionStringCommandParams);
-    readBridgedDeviceBasicInteractionInfo.put(
+            readBasicSoftwareVersionStringCommandParams);
+    readBasicInteractionInfo.put(
         "readSoftwareVersionStringAttribute",
-        readBridgedDeviceBasicSoftwareVersionStringAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBridgedDeviceBasicManufacturingDateCommandParams =
+        readBasicSoftwareVersionStringAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBasicManufacturingDateCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBridgedDeviceBasicManufacturingDateAttributeInteractionInfo =
+    InteractionInfo readBasicManufacturingDateAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+              ((ChipClusters.BasicCluster) cluster)
                   .readManufacturingDateAttribute(
                       (ChipClusters.CharStringAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readBridgedDeviceBasicManufacturingDateCommandParams);
-    readBridgedDeviceBasicInteractionInfo.put(
-        "readManufacturingDateAttribute",
-        readBridgedDeviceBasicManufacturingDateAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBridgedDeviceBasicPartNumberCommandParams =
+            readBasicManufacturingDateCommandParams);
+    readBasicInteractionInfo.put(
+        "readManufacturingDateAttribute", readBasicManufacturingDateAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBasicPartNumberCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBridgedDeviceBasicPartNumberAttributeInteractionInfo =
+    InteractionInfo readBasicPartNumberAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+              ((ChipClusters.BasicCluster) cluster)
                   .readPartNumberAttribute((ChipClusters.CharStringAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readBridgedDeviceBasicPartNumberCommandParams);
-    readBridgedDeviceBasicInteractionInfo.put(
-        "readPartNumberAttribute", readBridgedDeviceBasicPartNumberAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBridgedDeviceBasicProductURLCommandParams =
+            readBasicPartNumberCommandParams);
+    readBasicInteractionInfo.put(
+        "readPartNumberAttribute", readBasicPartNumberAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBasicProductURLCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBridgedDeviceBasicProductURLAttributeInteractionInfo =
+    InteractionInfo readBasicProductURLAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+              ((ChipClusters.BasicCluster) cluster)
                   .readProductURLAttribute((ChipClusters.CharStringAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readBridgedDeviceBasicProductURLCommandParams);
-    readBridgedDeviceBasicInteractionInfo.put(
-        "readProductURLAttribute", readBridgedDeviceBasicProductURLAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBridgedDeviceBasicProductLabelCommandParams =
+            readBasicProductURLCommandParams);
+    readBasicInteractionInfo.put(
+        "readProductURLAttribute", readBasicProductURLAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBasicProductLabelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBridgedDeviceBasicProductLabelAttributeInteractionInfo =
+    InteractionInfo readBasicProductLabelAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+              ((ChipClusters.BasicCluster) cluster)
                   .readProductLabelAttribute((ChipClusters.CharStringAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readBridgedDeviceBasicProductLabelCommandParams);
-    readBridgedDeviceBasicInteractionInfo.put(
-        "readProductLabelAttribute", readBridgedDeviceBasicProductLabelAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBridgedDeviceBasicSerialNumberCommandParams =
+            readBasicProductLabelCommandParams);
+    readBasicInteractionInfo.put(
+        "readProductLabelAttribute", readBasicProductLabelAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBasicSerialNumberCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBridgedDeviceBasicSerialNumberAttributeInteractionInfo =
+    InteractionInfo readBasicSerialNumberAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+              ((ChipClusters.BasicCluster) cluster)
                   .readSerialNumberAttribute((ChipClusters.CharStringAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readBridgedDeviceBasicSerialNumberCommandParams);
-    readBridgedDeviceBasicInteractionInfo.put(
-        "readSerialNumberAttribute", readBridgedDeviceBasicSerialNumberAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBridgedDeviceBasicReachableCommandParams =
+            readBasicSerialNumberCommandParams);
+    readBasicInteractionInfo.put(
+        "readSerialNumberAttribute", readBasicSerialNumberAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBasicLocalConfigDisabledCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBridgedDeviceBasicReachableAttributeInteractionInfo =
+    InteractionInfo readBasicLocalConfigDisabledAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+              ((ChipClusters.BasicCluster) cluster)
+                  .readLocalConfigDisabledAttribute(
+                      (ChipClusters.BooleanAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readBasicLocalConfigDisabledCommandParams);
+    readBasicInteractionInfo.put(
+        "readLocalConfigDisabledAttribute", readBasicLocalConfigDisabledAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBasicReachableCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readBasicReachableAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.BasicCluster) cluster)
                   .readReachableAttribute((ChipClusters.BooleanAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readBridgedDeviceBasicReachableCommandParams);
-    readBridgedDeviceBasicInteractionInfo.put(
-        "readReachableAttribute", readBridgedDeviceBasicReachableAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBridgedDeviceBasicUniqueIDCommandParams =
+            readBasicReachableCommandParams);
+    readBasicInteractionInfo.put(
+        "readReachableAttribute", readBasicReachableAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBasicUniqueIDCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBridgedDeviceBasicUniqueIDAttributeInteractionInfo =
+    InteractionInfo readBasicUniqueIDAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+              ((ChipClusters.BasicCluster) cluster)
                   .readUniqueIDAttribute((ChipClusters.CharStringAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readBridgedDeviceBasicUniqueIDCommandParams);
-    readBridgedDeviceBasicInteractionInfo.put(
-        "readUniqueIDAttribute", readBridgedDeviceBasicUniqueIDAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBridgedDeviceBasicGeneratedCommandListCommandParams =
+            readBasicUniqueIDCommandParams);
+    readBasicInteractionInfo.put(
+        "readUniqueIDAttribute", readBasicUniqueIDAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBasicGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBridgedDeviceBasicGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readBasicGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+              ((ChipClusters.BasicCluster) cluster)
                   .readGeneratedCommandListAttribute(
-                      (ChipClusters.BridgedDeviceBasicCluster.GeneratedCommandListAttributeCallback)
-                          callback);
+                      (ChipClusters.BasicCluster.GeneratedCommandListAttributeCallback) callback);
             },
             () ->
-                new ClusterInfoMapping
-                    .DelegatedBridgedDeviceBasicClusterGeneratedCommandListAttributeCallback(),
-            readBridgedDeviceBasicGeneratedCommandListCommandParams);
-    readBridgedDeviceBasicInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readBridgedDeviceBasicGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBridgedDeviceBasicAcceptedCommandListCommandParams =
+                new ClusterInfoMapping.DelegatedBasicClusterGeneratedCommandListAttributeCallback(),
+            readBasicGeneratedCommandListCommandParams);
+    readBasicInteractionInfo.put(
+        "readGeneratedCommandListAttribute", readBasicGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBasicAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBridgedDeviceBasicAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readBasicAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+              ((ChipClusters.BasicCluster) cluster)
                   .readAcceptedCommandListAttribute(
-                      (ChipClusters.BridgedDeviceBasicCluster.AcceptedCommandListAttributeCallback)
-                          callback);
+                      (ChipClusters.BasicCluster.AcceptedCommandListAttributeCallback) callback);
             },
             () ->
-                new ClusterInfoMapping
-                    .DelegatedBridgedDeviceBasicClusterAcceptedCommandListAttributeCallback(),
-            readBridgedDeviceBasicAcceptedCommandListCommandParams);
-    readBridgedDeviceBasicInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readBridgedDeviceBasicAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBridgedDeviceBasicAttributeListCommandParams =
+                new ClusterInfoMapping.DelegatedBasicClusterAcceptedCommandListAttributeCallback(),
+            readBasicAcceptedCommandListCommandParams);
+    readBasicInteractionInfo.put(
+        "readAcceptedCommandListAttribute", readBasicAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBasicAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBridgedDeviceBasicAttributeListAttributeInteractionInfo =
+    InteractionInfo readBasicAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+              ((ChipClusters.BasicCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.BridgedDeviceBasicCluster.AttributeListAttributeCallback)
-                          callback);
+                      (ChipClusters.BasicCluster.AttributeListAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedBridgedDeviceBasicClusterAttributeListAttributeCallback(),
-            readBridgedDeviceBasicAttributeListCommandParams);
-    readBridgedDeviceBasicInteractionInfo.put(
-        "readAttributeListAttribute", readBridgedDeviceBasicAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBridgedDeviceBasicFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedBasicClusterAttributeListAttributeCallback(),
+            readBasicAttributeListCommandParams);
+    readBasicInteractionInfo.put(
+        "readAttributeListAttribute", readBasicAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBasicFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBridgedDeviceBasicFeatureMapAttributeInteractionInfo =
+    InteractionInfo readBasicFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+              ((ChipClusters.BasicCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readBridgedDeviceBasicFeatureMapCommandParams);
-    readBridgedDeviceBasicInteractionInfo.put(
-        "readFeatureMapAttribute", readBridgedDeviceBasicFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readBridgedDeviceBasicClusterRevisionCommandParams =
+            readBasicFeatureMapCommandParams);
+    readBasicInteractionInfo.put(
+        "readFeatureMapAttribute", readBasicFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBasicClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readBridgedDeviceBasicClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readBasicClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+              ((ChipClusters.BasicCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readBridgedDeviceBasicClusterRevisionCommandParams);
-    readBridgedDeviceBasicInteractionInfo.put(
-        "readClusterRevisionAttribute",
-        readBridgedDeviceBasicClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("bridgedDeviceBasic", readBridgedDeviceBasicInteractionInfo);
-    Map<String, InteractionInfo> readChannelInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readChannelChannelListCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readChannelChannelListAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ChannelCluster) cluster)
-                  .readChannelListAttribute(
-                      (ChipClusters.ChannelCluster.ChannelListAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedChannelClusterChannelListAttributeCallback(),
-            readChannelChannelListCommandParams);
-    readChannelInteractionInfo.put(
-        "readChannelListAttribute", readChannelChannelListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readChannelGeneratedCommandListCommandParams =
+            readBasicClusterRevisionCommandParams);
+    readBasicInteractionInfo.put(
+        "readClusterRevisionAttribute", readBasicClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("basic", readBasicInteractionInfo);
+    Map<String, InteractionInfo> readOtaSoftwareUpdateProviderInteractionInfo =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readOtaSoftwareUpdateProviderAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readChannelGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readOtaSoftwareUpdateProviderAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ChannelCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.ChannelCluster.GeneratedCommandListAttributeCallback) callback);
+              ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.OtaSoftwareUpdateProviderCluster.AttributeListAttributeCallback)
+                          callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedChannelClusterGeneratedCommandListAttributeCallback(),
-            readChannelGeneratedCommandListCommandParams);
-    readChannelInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readChannelGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readChannelAcceptedCommandListCommandParams =
+                    .DelegatedOtaSoftwareUpdateProviderClusterAttributeListAttributeCallback(),
+            readOtaSoftwareUpdateProviderAttributeListCommandParams);
+    readOtaSoftwareUpdateProviderInteractionInfo.put(
+        "readAttributeListAttribute",
+        readOtaSoftwareUpdateProviderAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOtaSoftwareUpdateProviderFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readChannelAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readOtaSoftwareUpdateProviderFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ChannelCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.ChannelCluster.AcceptedCommandListAttributeCallback) callback);
-            },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedChannelClusterAcceptedCommandListAttributeCallback(),
-            readChannelAcceptedCommandListCommandParams);
-    readChannelInteractionInfo.put(
-        "readAcceptedCommandListAttribute", readChannelAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readChannelAttributeListCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readChannelAttributeListAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ChannelCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.ChannelCluster.AttributeListAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedChannelClusterAttributeListAttributeCallback(),
-            readChannelAttributeListCommandParams);
-    readChannelInteractionInfo.put(
-        "readAttributeListAttribute", readChannelAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readChannelFeatureMapCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readChannelFeatureMapAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ChannelCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readChannelFeatureMapCommandParams);
-    readChannelInteractionInfo.put(
-        "readFeatureMapAttribute", readChannelFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readChannelClusterRevisionCommandParams =
+            readOtaSoftwareUpdateProviderFeatureMapCommandParams);
+    readOtaSoftwareUpdateProviderInteractionInfo.put(
+        "readFeatureMapAttribute", readOtaSoftwareUpdateProviderFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOtaSoftwareUpdateProviderClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readChannelClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readOtaSoftwareUpdateProviderClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ChannelCluster) cluster)
+              ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readChannelClusterRevisionCommandParams);
-    readChannelInteractionInfo.put(
-        "readClusterRevisionAttribute", readChannelClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("channel", readChannelInteractionInfo);
-    Map<String, InteractionInfo> readColorControlInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readColorControlCurrentHueCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlCurrentHueAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readCurrentHueAttribute((ChipClusters.IntegerAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlCurrentHueCommandParams);
-    readColorControlInteractionInfo.put(
-        "readCurrentHueAttribute", readColorControlCurrentHueAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlCurrentSaturationCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlCurrentSaturationAttributeInteractionInfo =
+            readOtaSoftwareUpdateProviderClusterRevisionCommandParams);
+    readOtaSoftwareUpdateProviderInteractionInfo.put(
+        "readClusterRevisionAttribute",
+        readOtaSoftwareUpdateProviderClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("otaSoftwareUpdateProvider", readOtaSoftwareUpdateProviderInteractionInfo);
+    Map<String, InteractionInfo> readOtaSoftwareUpdateRequestorInteractionInfo =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo>
+        readOtaSoftwareUpdateRequestorDefaultOtaProvidersCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readCurrentSaturationAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.OtaSoftwareUpdateRequestorCluster) cluster)
+                  .readDefaultOtaProvidersAttribute(
+                      (ChipClusters.OtaSoftwareUpdateRequestorCluster
+                              .DefaultOtaProvidersAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlCurrentSaturationCommandParams);
-    readColorControlInteractionInfo.put(
-        "readCurrentSaturationAttribute",
-        readColorControlCurrentSaturationAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlRemainingTimeCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedOtaSoftwareUpdateRequestorClusterDefaultOtaProvidersAttributeCallback(),
+            readOtaSoftwareUpdateRequestorDefaultOtaProvidersCommandParams);
+    readOtaSoftwareUpdateRequestorInteractionInfo.put(
+        "readDefaultOtaProvidersAttribute",
+        readOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOtaSoftwareUpdateRequestorUpdatePossibleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlRemainingTimeAttributeInteractionInfo =
+    InteractionInfo readOtaSoftwareUpdateRequestorUpdatePossibleAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readRemainingTimeAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.OtaSoftwareUpdateRequestorCluster) cluster)
+                  .readUpdatePossibleAttribute((ChipClusters.BooleanAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlRemainingTimeCommandParams);
-    readColorControlInteractionInfo.put(
-        "readRemainingTimeAttribute", readColorControlRemainingTimeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlCurrentXCommandParams =
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readOtaSoftwareUpdateRequestorUpdatePossibleCommandParams);
+    readOtaSoftwareUpdateRequestorInteractionInfo.put(
+        "readUpdatePossibleAttribute",
+        readOtaSoftwareUpdateRequestorUpdatePossibleAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOtaSoftwareUpdateRequestorUpdateStateCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlCurrentXAttributeInteractionInfo =
+    InteractionInfo readOtaSoftwareUpdateRequestorUpdateStateAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readCurrentXAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.OtaSoftwareUpdateRequestorCluster) cluster)
+                  .readUpdateStateAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlCurrentXCommandParams);
-    readColorControlInteractionInfo.put(
-        "readCurrentXAttribute", readColorControlCurrentXAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlCurrentYCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlCurrentYAttributeInteractionInfo =
+            readOtaSoftwareUpdateRequestorUpdateStateCommandParams);
+    readOtaSoftwareUpdateRequestorInteractionInfo.put(
+        "readUpdateStateAttribute",
+        readOtaSoftwareUpdateRequestorUpdateStateAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readOtaSoftwareUpdateRequestorUpdateStateProgressCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readOtaSoftwareUpdateRequestorUpdateStateProgressAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readCurrentYAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.OtaSoftwareUpdateRequestorCluster) cluster)
+                  .readUpdateStateProgressAttribute(
+                      (ChipClusters.OtaSoftwareUpdateRequestorCluster
+                              .UpdateStateProgressAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlCurrentYCommandParams);
-    readColorControlInteractionInfo.put(
-        "readCurrentYAttribute", readColorControlCurrentYAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlDriftCompensationCommandParams =
+            readOtaSoftwareUpdateRequestorUpdateStateProgressCommandParams);
+    readOtaSoftwareUpdateRequestorInteractionInfo.put(
+        "readUpdateStateProgressAttribute",
+        readOtaSoftwareUpdateRequestorUpdateStateProgressAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOtaSoftwareUpdateRequestorAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlDriftCompensationAttributeInteractionInfo =
+    InteractionInfo readOtaSoftwareUpdateRequestorAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readDriftCompensationAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.OtaSoftwareUpdateRequestorCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.OtaSoftwareUpdateRequestorCluster
+                              .AttributeListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlDriftCompensationCommandParams);
-    readColorControlInteractionInfo.put(
-        "readDriftCompensationAttribute",
-        readColorControlDriftCompensationAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlCompensationTextCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedOtaSoftwareUpdateRequestorClusterAttributeListAttributeCallback(),
+            readOtaSoftwareUpdateRequestorAttributeListCommandParams);
+    readOtaSoftwareUpdateRequestorInteractionInfo.put(
+        "readAttributeListAttribute",
+        readOtaSoftwareUpdateRequestorAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOtaSoftwareUpdateRequestorFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlCompensationTextAttributeInteractionInfo =
+    InteractionInfo readOtaSoftwareUpdateRequestorFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readCompensationTextAttribute(
-                      (ChipClusters.CharStringAttributeCallback) callback);
+              ((ChipClusters.OtaSoftwareUpdateRequestorCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readColorControlCompensationTextCommandParams);
-    readColorControlInteractionInfo.put(
-        "readCompensationTextAttribute", readColorControlCompensationTextAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlColorTemperatureCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readOtaSoftwareUpdateRequestorFeatureMapCommandParams);
+    readOtaSoftwareUpdateRequestorInteractionInfo.put(
+        "readFeatureMapAttribute",
+        readOtaSoftwareUpdateRequestorFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOtaSoftwareUpdateRequestorClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlColorTemperatureAttributeInteractionInfo =
+    InteractionInfo readOtaSoftwareUpdateRequestorClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readColorTemperatureAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.OtaSoftwareUpdateRequestorCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlColorTemperatureCommandParams);
-    readColorControlInteractionInfo.put(
-        "readColorTemperatureAttribute", readColorControlColorTemperatureAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlColorModeCommandParams =
+            readOtaSoftwareUpdateRequestorClusterRevisionCommandParams);
+    readOtaSoftwareUpdateRequestorInteractionInfo.put(
+        "readClusterRevisionAttribute",
+        readOtaSoftwareUpdateRequestorClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put(
+        "otaSoftwareUpdateRequestor", readOtaSoftwareUpdateRequestorInteractionInfo);
+    Map<String, InteractionInfo> readLocalizationConfigurationInteractionInfo =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readLocalizationConfigurationActiveLocaleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlColorModeAttributeInteractionInfo =
+    InteractionInfo readLocalizationConfigurationActiveLocaleAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readColorModeAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.LocalizationConfigurationCluster) cluster)
+                  .readActiveLocaleAttribute((ChipClusters.CharStringAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlColorModeCommandParams);
-    readColorControlInteractionInfo.put(
-        "readColorModeAttribute", readColorControlColorModeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlOptionsCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readLocalizationConfigurationActiveLocaleCommandParams);
+    readLocalizationConfigurationInteractionInfo.put(
+        "readActiveLocaleAttribute",
+        readLocalizationConfigurationActiveLocaleAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readLocalizationConfigurationSupportedLocalesCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlOptionsAttributeInteractionInfo =
+    InteractionInfo readLocalizationConfigurationSupportedLocalesAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readOptionsAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.LocalizationConfigurationCluster) cluster)
+                  .readSupportedLocalesAttribute(
+                      (ChipClusters.LocalizationConfigurationCluster
+                              .SupportedLocalesAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlOptionsCommandParams);
-    readColorControlInteractionInfo.put(
-        "readOptionsAttribute", readColorControlOptionsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlNumberOfPrimariesCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlNumberOfPrimariesAttributeInteractionInfo =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedLocalizationConfigurationClusterSupportedLocalesAttributeCallback(),
+            readLocalizationConfigurationSupportedLocalesCommandParams);
+    readLocalizationConfigurationInteractionInfo.put(
+        "readSupportedLocalesAttribute",
+        readLocalizationConfigurationSupportedLocalesAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readLocalizationConfigurationGeneratedCommandListCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readLocalizationConfigurationGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readNumberOfPrimariesAttribute(
-                      (ChipClusters.ColorControlCluster.NumberOfPrimariesAttributeCallback)
+              ((ChipClusters.LocalizationConfigurationCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.LocalizationConfigurationCluster
+                              .GeneratedCommandListAttributeCallback)
                           callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlNumberOfPrimariesCommandParams);
-    readColorControlInteractionInfo.put(
-        "readNumberOfPrimariesAttribute",
-        readColorControlNumberOfPrimariesAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlPrimary1XCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlPrimary1XAttributeInteractionInfo =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedLocalizationConfigurationClusterGeneratedCommandListAttributeCallback(),
+            readLocalizationConfigurationGeneratedCommandListCommandParams);
+    readLocalizationConfigurationInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readLocalizationConfigurationGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readLocalizationConfigurationAcceptedCommandListCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readLocalizationConfigurationAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readPrimary1XAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.LocalizationConfigurationCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.LocalizationConfigurationCluster
+                              .AcceptedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlPrimary1XCommandParams);
-    readColorControlInteractionInfo.put(
-        "readPrimary1XAttribute", readColorControlPrimary1XAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlPrimary1YCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedLocalizationConfigurationClusterAcceptedCommandListAttributeCallback(),
+            readLocalizationConfigurationAcceptedCommandListCommandParams);
+    readLocalizationConfigurationInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readLocalizationConfigurationAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readLocalizationConfigurationFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlPrimary1YAttributeInteractionInfo =
+    InteractionInfo readLocalizationConfigurationFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readPrimary1YAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.LocalizationConfigurationCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlPrimary1YCommandParams);
-    readColorControlInteractionInfo.put(
-        "readPrimary1YAttribute", readColorControlPrimary1YAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlPrimary1IntensityCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readLocalizationConfigurationFeatureMapCommandParams);
+    readLocalizationConfigurationInteractionInfo.put(
+        "readFeatureMapAttribute", readLocalizationConfigurationFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readLocalizationConfigurationClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlPrimary1IntensityAttributeInteractionInfo =
+    InteractionInfo readLocalizationConfigurationClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readPrimary1IntensityAttribute(
-                      (ChipClusters.ColorControlCluster.Primary1IntensityAttributeCallback)
-                          callback);
+              ((ChipClusters.LocalizationConfigurationCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlPrimary1IntensityCommandParams);
-    readColorControlInteractionInfo.put(
-        "readPrimary1IntensityAttribute",
-        readColorControlPrimary1IntensityAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlPrimary2XCommandParams =
+            readLocalizationConfigurationClusterRevisionCommandParams);
+    readLocalizationConfigurationInteractionInfo.put(
+        "readClusterRevisionAttribute",
+        readLocalizationConfigurationClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("localizationConfiguration", readLocalizationConfigurationInteractionInfo);
+    Map<String, InteractionInfo> readTimeFormatLocalizationInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readTimeFormatLocalizationHourFormatCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlPrimary2XAttributeInteractionInfo =
+    InteractionInfo readTimeFormatLocalizationHourFormatAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readPrimary2XAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TimeFormatLocalizationCluster) cluster)
+                  .readHourFormatAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlPrimary2XCommandParams);
-    readColorControlInteractionInfo.put(
-        "readPrimary2XAttribute", readColorControlPrimary2XAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlPrimary2YCommandParams =
+            readTimeFormatLocalizationHourFormatCommandParams);
+    readTimeFormatLocalizationInteractionInfo.put(
+        "readHourFormatAttribute", readTimeFormatLocalizationHourFormatAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTimeFormatLocalizationActiveCalendarTypeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlPrimary2YAttributeInteractionInfo =
+    InteractionInfo readTimeFormatLocalizationActiveCalendarTypeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readPrimary2YAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TimeFormatLocalizationCluster) cluster)
+                  .readActiveCalendarTypeAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlPrimary2YCommandParams);
-    readColorControlInteractionInfo.put(
-        "readPrimary2YAttribute", readColorControlPrimary2YAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlPrimary2IntensityCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlPrimary2IntensityAttributeInteractionInfo =
+            readTimeFormatLocalizationActiveCalendarTypeCommandParams);
+    readTimeFormatLocalizationInteractionInfo.put(
+        "readActiveCalendarTypeAttribute",
+        readTimeFormatLocalizationActiveCalendarTypeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readTimeFormatLocalizationSupportedCalendarTypesCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readTimeFormatLocalizationSupportedCalendarTypesAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readPrimary2IntensityAttribute(
-                      (ChipClusters.ColorControlCluster.Primary2IntensityAttributeCallback)
+              ((ChipClusters.TimeFormatLocalizationCluster) cluster)
+                  .readSupportedCalendarTypesAttribute(
+                      (ChipClusters.TimeFormatLocalizationCluster
+                              .SupportedCalendarTypesAttributeCallback)
                           callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlPrimary2IntensityCommandParams);
-    readColorControlInteractionInfo.put(
-        "readPrimary2IntensityAttribute",
-        readColorControlPrimary2IntensityAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlPrimary3XCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedTimeFormatLocalizationClusterSupportedCalendarTypesAttributeCallback(),
+            readTimeFormatLocalizationSupportedCalendarTypesCommandParams);
+    readTimeFormatLocalizationInteractionInfo.put(
+        "readSupportedCalendarTypesAttribute",
+        readTimeFormatLocalizationSupportedCalendarTypesAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTimeFormatLocalizationGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlPrimary3XAttributeInteractionInfo =
+    InteractionInfo readTimeFormatLocalizationGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readPrimary3XAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TimeFormatLocalizationCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.TimeFormatLocalizationCluster
+                              .GeneratedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlPrimary3XCommandParams);
-    readColorControlInteractionInfo.put(
-        "readPrimary3XAttribute", readColorControlPrimary3XAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlPrimary3YCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedTimeFormatLocalizationClusterGeneratedCommandListAttributeCallback(),
+            readTimeFormatLocalizationGeneratedCommandListCommandParams);
+    readTimeFormatLocalizationInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readTimeFormatLocalizationGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTimeFormatLocalizationAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlPrimary3YAttributeInteractionInfo =
+    InteractionInfo readTimeFormatLocalizationAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readPrimary3YAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TimeFormatLocalizationCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.TimeFormatLocalizationCluster
+                              .AcceptedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlPrimary3YCommandParams);
-    readColorControlInteractionInfo.put(
-        "readPrimary3YAttribute", readColorControlPrimary3YAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlPrimary3IntensityCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedTimeFormatLocalizationClusterAcceptedCommandListAttributeCallback(),
+            readTimeFormatLocalizationAcceptedCommandListCommandParams);
+    readTimeFormatLocalizationInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readTimeFormatLocalizationAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTimeFormatLocalizationFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlPrimary3IntensityAttributeInteractionInfo =
+    InteractionInfo readTimeFormatLocalizationFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readPrimary3IntensityAttribute(
-                      (ChipClusters.ColorControlCluster.Primary3IntensityAttributeCallback)
-                          callback);
+              ((ChipClusters.TimeFormatLocalizationCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlPrimary3IntensityCommandParams);
-    readColorControlInteractionInfo.put(
-        "readPrimary3IntensityAttribute",
-        readColorControlPrimary3IntensityAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlPrimary4XCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readTimeFormatLocalizationFeatureMapCommandParams);
+    readTimeFormatLocalizationInteractionInfo.put(
+        "readFeatureMapAttribute", readTimeFormatLocalizationFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTimeFormatLocalizationClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlPrimary4XAttributeInteractionInfo =
+    InteractionInfo readTimeFormatLocalizationClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readPrimary4XAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TimeFormatLocalizationCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlPrimary4XCommandParams);
-    readColorControlInteractionInfo.put(
-        "readPrimary4XAttribute", readColorControlPrimary4XAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlPrimary4YCommandParams =
+            readTimeFormatLocalizationClusterRevisionCommandParams);
+    readTimeFormatLocalizationInteractionInfo.put(
+        "readClusterRevisionAttribute",
+        readTimeFormatLocalizationClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("timeFormatLocalization", readTimeFormatLocalizationInteractionInfo);
+    Map<String, InteractionInfo> readUnitLocalizationInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readUnitLocalizationTemperatureUnitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlPrimary4YAttributeInteractionInfo =
+    InteractionInfo readUnitLocalizationTemperatureUnitAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readPrimary4YAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.UnitLocalizationCluster) cluster)
+                  .readTemperatureUnitAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlPrimary4YCommandParams);
-    readColorControlInteractionInfo.put(
-        "readPrimary4YAttribute", readColorControlPrimary4YAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlPrimary4IntensityCommandParams =
+            readUnitLocalizationTemperatureUnitCommandParams);
+    readUnitLocalizationInteractionInfo.put(
+        "readTemperatureUnitAttribute",
+        readUnitLocalizationTemperatureUnitAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readUnitLocalizationAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlPrimary4IntensityAttributeInteractionInfo =
+    InteractionInfo readUnitLocalizationAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readPrimary4IntensityAttribute(
-                      (ChipClusters.ColorControlCluster.Primary4IntensityAttributeCallback)
+              ((ChipClusters.UnitLocalizationCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.UnitLocalizationCluster.AttributeListAttributeCallback)
                           callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlPrimary4IntensityCommandParams);
-    readColorControlInteractionInfo.put(
-        "readPrimary4IntensityAttribute",
-        readColorControlPrimary4IntensityAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlPrimary5XCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedUnitLocalizationClusterAttributeListAttributeCallback(),
+            readUnitLocalizationAttributeListCommandParams);
+    readUnitLocalizationInteractionInfo.put(
+        "readAttributeListAttribute", readUnitLocalizationAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readUnitLocalizationFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlPrimary5XAttributeInteractionInfo =
+    InteractionInfo readUnitLocalizationFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readPrimary5XAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.UnitLocalizationCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlPrimary5XCommandParams);
-    readColorControlInteractionInfo.put(
-        "readPrimary5XAttribute", readColorControlPrimary5XAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlPrimary5YCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlPrimary5YAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readUnitLocalizationFeatureMapCommandParams);
+    readUnitLocalizationInteractionInfo.put(
+        "readFeatureMapAttribute", readUnitLocalizationFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readUnitLocalizationClusterRevisionCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readUnitLocalizationClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readPrimary5YAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.UnitLocalizationCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlPrimary5YCommandParams);
-    readColorControlInteractionInfo.put(
-        "readPrimary5YAttribute", readColorControlPrimary5YAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlPrimary5IntensityCommandParams =
+            readUnitLocalizationClusterRevisionCommandParams);
+    readUnitLocalizationInteractionInfo.put(
+        "readClusterRevisionAttribute",
+        readUnitLocalizationClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("unitLocalization", readUnitLocalizationInteractionInfo);
+    Map<String, InteractionInfo> readPowerSourceConfigurationInteractionInfo =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readPowerSourceConfigurationSourcesCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlPrimary5IntensityAttributeInteractionInfo =
+    InteractionInfo readPowerSourceConfigurationSourcesAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readPrimary5IntensityAttribute(
-                      (ChipClusters.ColorControlCluster.Primary5IntensityAttributeCallback)
+              ((ChipClusters.PowerSourceConfigurationCluster) cluster)
+                  .readSourcesAttribute(
+                      (ChipClusters.PowerSourceConfigurationCluster.SourcesAttributeCallback)
                           callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlPrimary5IntensityCommandParams);
-    readColorControlInteractionInfo.put(
-        "readPrimary5IntensityAttribute",
-        readColorControlPrimary5IntensityAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlPrimary6XCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlPrimary6XAttributeInteractionInfo =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedPowerSourceConfigurationClusterSourcesAttributeCallback(),
+            readPowerSourceConfigurationSourcesCommandParams);
+    readPowerSourceConfigurationInteractionInfo.put(
+        "readSourcesAttribute", readPowerSourceConfigurationSourcesAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readPowerSourceConfigurationGeneratedCommandListCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readPowerSourceConfigurationGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readPrimary6XAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PowerSourceConfigurationCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.PowerSourceConfigurationCluster
+                              .GeneratedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlPrimary6XCommandParams);
-    readColorControlInteractionInfo.put(
-        "readPrimary6XAttribute", readColorControlPrimary6XAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlPrimary6YCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedPowerSourceConfigurationClusterGeneratedCommandListAttributeCallback(),
+            readPowerSourceConfigurationGeneratedCommandListCommandParams);
+    readPowerSourceConfigurationInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readPowerSourceConfigurationGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceConfigurationAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlPrimary6YAttributeInteractionInfo =
+    InteractionInfo readPowerSourceConfigurationAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readPrimary6YAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PowerSourceConfigurationCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.PowerSourceConfigurationCluster
+                              .AcceptedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlPrimary6YCommandParams);
-    readColorControlInteractionInfo.put(
-        "readPrimary6YAttribute", readColorControlPrimary6YAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlPrimary6IntensityCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedPowerSourceConfigurationClusterAcceptedCommandListAttributeCallback(),
+            readPowerSourceConfigurationAcceptedCommandListCommandParams);
+    readPowerSourceConfigurationInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readPowerSourceConfigurationAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceConfigurationAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlPrimary6IntensityAttributeInteractionInfo =
+    InteractionInfo readPowerSourceConfigurationAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readPrimary6IntensityAttribute(
-                      (ChipClusters.ColorControlCluster.Primary6IntensityAttributeCallback)
+              ((ChipClusters.PowerSourceConfigurationCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.PowerSourceConfigurationCluster.AttributeListAttributeCallback)
                           callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlPrimary6IntensityCommandParams);
-    readColorControlInteractionInfo.put(
-        "readPrimary6IntensityAttribute",
-        readColorControlPrimary6IntensityAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlWhitePointXCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedPowerSourceConfigurationClusterAttributeListAttributeCallback(),
+            readPowerSourceConfigurationAttributeListCommandParams);
+    readPowerSourceConfigurationInteractionInfo.put(
+        "readAttributeListAttribute",
+        readPowerSourceConfigurationAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceConfigurationFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlWhitePointXAttributeInteractionInfo =
+    InteractionInfo readPowerSourceConfigurationFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readWhitePointXAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PowerSourceConfigurationCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlWhitePointXCommandParams);
-    readColorControlInteractionInfo.put(
-        "readWhitePointXAttribute", readColorControlWhitePointXAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlWhitePointYCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readPowerSourceConfigurationFeatureMapCommandParams);
+    readPowerSourceConfigurationInteractionInfo.put(
+        "readFeatureMapAttribute", readPowerSourceConfigurationFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceConfigurationClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlWhitePointYAttributeInteractionInfo =
+    InteractionInfo readPowerSourceConfigurationClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readWhitePointYAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PowerSourceConfigurationCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlWhitePointYCommandParams);
-    readColorControlInteractionInfo.put(
-        "readWhitePointYAttribute", readColorControlWhitePointYAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlColorPointRXCommandParams =
+            readPowerSourceConfigurationClusterRevisionCommandParams);
+    readPowerSourceConfigurationInteractionInfo.put(
+        "readClusterRevisionAttribute",
+        readPowerSourceConfigurationClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("powerSourceConfiguration", readPowerSourceConfigurationInteractionInfo);
+    Map<String, InteractionInfo> readPowerSourceInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readPowerSourceStatusCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlColorPointRXAttributeInteractionInfo =
+    InteractionInfo readPowerSourceStatusAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readColorPointRXAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readStatusAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlColorPointRXCommandParams);
-    readColorControlInteractionInfo.put(
-        "readColorPointRXAttribute", readColorControlColorPointRXAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlColorPointRYCommandParams =
+            readPowerSourceStatusCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readStatusAttribute", readPowerSourceStatusAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceOrderCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlColorPointRYAttributeInteractionInfo =
+    InteractionInfo readPowerSourceOrderAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readColorPointRYAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readOrderAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlColorPointRYCommandParams);
-    readColorControlInteractionInfo.put(
-        "readColorPointRYAttribute", readColorControlColorPointRYAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlColorPointRIntensityCommandParams =
+            readPowerSourceOrderCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readOrderAttribute", readPowerSourceOrderAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceDescriptionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlColorPointRIntensityAttributeInteractionInfo =
+    InteractionInfo readPowerSourceDescriptionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readColorPointRIntensityAttribute(
-                      (ChipClusters.ColorControlCluster.ColorPointRIntensityAttributeCallback)
-                          callback);
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readDescriptionAttribute((ChipClusters.CharStringAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlColorPointRIntensityCommandParams);
-    readColorControlInteractionInfo.put(
-        "readColorPointRIntensityAttribute",
-        readColorControlColorPointRIntensityAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlColorPointGXCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readPowerSourceDescriptionCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readDescriptionAttribute", readPowerSourceDescriptionAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceWiredAssessedInputVoltageCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlColorPointGXAttributeInteractionInfo =
+    InteractionInfo readPowerSourceWiredAssessedInputVoltageAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readColorPointGXAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readWiredAssessedInputVoltageAttribute(
+                      (ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlColorPointGXCommandParams);
-    readColorControlInteractionInfo.put(
-        "readColorPointGXAttribute", readColorControlColorPointGXAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlColorPointGYCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readPowerSourceWiredAssessedInputVoltageCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readWiredAssessedInputVoltageAttribute",
+        readPowerSourceWiredAssessedInputVoltageAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceWiredAssessedInputFrequencyCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlColorPointGYAttributeInteractionInfo =
+    InteractionInfo readPowerSourceWiredAssessedInputFrequencyAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readColorPointGYAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readWiredAssessedInputFrequencyAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlColorPointGYCommandParams);
-    readColorControlInteractionInfo.put(
-        "readColorPointGYAttribute", readColorControlColorPointGYAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlColorPointGIntensityCommandParams =
+            readPowerSourceWiredAssessedInputFrequencyCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readWiredAssessedInputFrequencyAttribute",
+        readPowerSourceWiredAssessedInputFrequencyAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceWiredCurrentTypeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlColorPointGIntensityAttributeInteractionInfo =
+    InteractionInfo readPowerSourceWiredCurrentTypeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readColorPointGIntensityAttribute(
-                      (ChipClusters.ColorControlCluster.ColorPointGIntensityAttributeCallback)
-                          callback);
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readWiredCurrentTypeAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlColorPointGIntensityCommandParams);
-    readColorControlInteractionInfo.put(
-        "readColorPointGIntensityAttribute",
-        readColorControlColorPointGIntensityAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlColorPointBXCommandParams =
+            readPowerSourceWiredCurrentTypeCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readWiredCurrentTypeAttribute", readPowerSourceWiredCurrentTypeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceWiredAssessedCurrentCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlColorPointBXAttributeInteractionInfo =
+    InteractionInfo readPowerSourceWiredAssessedCurrentAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readColorPointBXAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readWiredAssessedCurrentAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlColorPointBXCommandParams);
-    readColorControlInteractionInfo.put(
-        "readColorPointBXAttribute", readColorControlColorPointBXAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlColorPointBYCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readPowerSourceWiredAssessedCurrentCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readWiredAssessedCurrentAttribute",
+        readPowerSourceWiredAssessedCurrentAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceWiredNominalVoltageCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlColorPointBYAttributeInteractionInfo =
+    InteractionInfo readPowerSourceWiredNominalVoltageAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readColorPointBYAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readWiredNominalVoltageAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlColorPointBYCommandParams);
-    readColorControlInteractionInfo.put(
-        "readColorPointBYAttribute", readColorControlColorPointBYAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlColorPointBIntensityCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readPowerSourceWiredNominalVoltageCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readWiredNominalVoltageAttribute",
+        readPowerSourceWiredNominalVoltageAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceWiredMaximumCurrentCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlColorPointBIntensityAttributeInteractionInfo =
+    InteractionInfo readPowerSourceWiredMaximumCurrentAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readColorPointBIntensityAttribute(
-                      (ChipClusters.ColorControlCluster.ColorPointBIntensityAttributeCallback)
-                          callback);
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readWiredMaximumCurrentAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlColorPointBIntensityCommandParams);
-    readColorControlInteractionInfo.put(
-        "readColorPointBIntensityAttribute",
-        readColorControlColorPointBIntensityAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlEnhancedCurrentHueCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readPowerSourceWiredMaximumCurrentCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readWiredMaximumCurrentAttribute",
+        readPowerSourceWiredMaximumCurrentAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceWiredPresentCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlEnhancedCurrentHueAttributeInteractionInfo =
+    InteractionInfo readPowerSourceWiredPresentAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readEnhancedCurrentHueAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readWiredPresentAttribute((ChipClusters.BooleanAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlEnhancedCurrentHueCommandParams);
-    readColorControlInteractionInfo.put(
-        "readEnhancedCurrentHueAttribute",
-        readColorControlEnhancedCurrentHueAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlEnhancedColorModeCommandParams =
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readPowerSourceWiredPresentCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readWiredPresentAttribute", readPowerSourceWiredPresentAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceActiveWiredFaultsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlEnhancedColorModeAttributeInteractionInfo =
+    InteractionInfo readPowerSourceActiveWiredFaultsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readEnhancedColorModeAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readActiveWiredFaultsAttribute(
+                      (ChipClusters.PowerSourceCluster.ActiveWiredFaultsAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlEnhancedColorModeCommandParams);
-    readColorControlInteractionInfo.put(
-        "readEnhancedColorModeAttribute",
-        readColorControlEnhancedColorModeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlColorLoopActiveCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedPowerSourceClusterActiveWiredFaultsAttributeCallback(),
+            readPowerSourceActiveWiredFaultsCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readActiveWiredFaultsAttribute", readPowerSourceActiveWiredFaultsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceBatteryVoltageCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlColorLoopActiveAttributeInteractionInfo =
+    InteractionInfo readPowerSourceBatteryVoltageAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readColorLoopActiveAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readBatteryVoltageAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlColorLoopActiveCommandParams);
-    readColorControlInteractionInfo.put(
-        "readColorLoopActiveAttribute", readColorControlColorLoopActiveAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlColorLoopDirectionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readPowerSourceBatteryVoltageCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readBatteryVoltageAttribute", readPowerSourceBatteryVoltageAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceBatteryPercentRemainingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlColorLoopDirectionAttributeInteractionInfo =
+    InteractionInfo readPowerSourceBatteryPercentRemainingAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readColorLoopDirectionAttribute(
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readBatteryPercentRemainingAttribute(
                       (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlColorLoopDirectionCommandParams);
-    readColorControlInteractionInfo.put(
-        "readColorLoopDirectionAttribute",
-        readColorControlColorLoopDirectionAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlColorLoopTimeCommandParams =
+            readPowerSourceBatteryPercentRemainingCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readBatteryPercentRemainingAttribute",
+        readPowerSourceBatteryPercentRemainingAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceBatteryTimeRemainingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlColorLoopTimeAttributeInteractionInfo =
+    InteractionInfo readPowerSourceBatteryTimeRemainingAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readColorLoopTimeAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readBatteryTimeRemainingAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlColorLoopTimeCommandParams);
-    readColorControlInteractionInfo.put(
-        "readColorLoopTimeAttribute", readColorControlColorLoopTimeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlColorLoopStartEnhancedHueCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readPowerSourceBatteryTimeRemainingCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readBatteryTimeRemainingAttribute",
+        readPowerSourceBatteryTimeRemainingAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceBatteryChargeLevelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlColorLoopStartEnhancedHueAttributeInteractionInfo =
+    InteractionInfo readPowerSourceBatteryChargeLevelAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readColorLoopStartEnhancedHueAttribute(
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readBatteryChargeLevelAttribute(
                       (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlColorLoopStartEnhancedHueCommandParams);
-    readColorControlInteractionInfo.put(
-        "readColorLoopStartEnhancedHueAttribute",
-        readColorControlColorLoopStartEnhancedHueAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlColorLoopStoredEnhancedHueCommandParams =
+            readPowerSourceBatteryChargeLevelCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readBatteryChargeLevelAttribute",
+        readPowerSourceBatteryChargeLevelAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceBatteryReplacementNeededCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlColorLoopStoredEnhancedHueAttributeInteractionInfo =
+    InteractionInfo readPowerSourceBatteryReplacementNeededAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readColorLoopStoredEnhancedHueAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readBatteryReplacementNeededAttribute(
+                      (ChipClusters.BooleanAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlColorLoopStoredEnhancedHueCommandParams);
-    readColorControlInteractionInfo.put(
-        "readColorLoopStoredEnhancedHueAttribute",
-        readColorControlColorLoopStoredEnhancedHueAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlColorCapabilitiesCommandParams =
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readPowerSourceBatteryReplacementNeededCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readBatteryReplacementNeededAttribute",
+        readPowerSourceBatteryReplacementNeededAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceBatteryReplaceabilityCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlColorCapabilitiesAttributeInteractionInfo =
+    InteractionInfo readPowerSourceBatteryReplaceabilityAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readColorCapabilitiesAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readBatteryReplaceabilityAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlColorCapabilitiesCommandParams);
-    readColorControlInteractionInfo.put(
-        "readColorCapabilitiesAttribute",
-        readColorControlColorCapabilitiesAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlColorTempPhysicalMinMiredsCommandParams =
+            readPowerSourceBatteryReplaceabilityCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readBatteryReplaceabilityAttribute",
+        readPowerSourceBatteryReplaceabilityAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceBatteryPresentCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlColorTempPhysicalMinMiredsAttributeInteractionInfo =
+    InteractionInfo readPowerSourceBatteryPresentAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readColorTempPhysicalMinMiredsAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readBatteryPresentAttribute((ChipClusters.BooleanAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlColorTempPhysicalMinMiredsCommandParams);
-    readColorControlInteractionInfo.put(
-        "readColorTempPhysicalMinMiredsAttribute",
-        readColorControlColorTempPhysicalMinMiredsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlColorTempPhysicalMaxMiredsCommandParams =
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readPowerSourceBatteryPresentCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readBatteryPresentAttribute", readPowerSourceBatteryPresentAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceActiveBatteryFaultsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlColorTempPhysicalMaxMiredsAttributeInteractionInfo =
+    InteractionInfo readPowerSourceActiveBatteryFaultsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readColorTempPhysicalMaxMiredsAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readActiveBatteryFaultsAttribute(
+                      (ChipClusters.PowerSourceCluster.ActiveBatteryFaultsAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlColorTempPhysicalMaxMiredsCommandParams);
-    readColorControlInteractionInfo.put(
-        "readColorTempPhysicalMaxMiredsAttribute",
-        readColorControlColorTempPhysicalMaxMiredsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlCoupleColorTempToLevelMinMiredsCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedPowerSourceClusterActiveBatteryFaultsAttributeCallback(),
+            readPowerSourceActiveBatteryFaultsCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readActiveBatteryFaultsAttribute",
+        readPowerSourceActiveBatteryFaultsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceBatteryReplacementDescriptionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlCoupleColorTempToLevelMinMiredsAttributeInteractionInfo =
+    InteractionInfo readPowerSourceBatteryReplacementDescriptionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readCoupleColorTempToLevelMinMiredsAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readBatteryReplacementDescriptionAttribute(
+                      (ChipClusters.CharStringAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlCoupleColorTempToLevelMinMiredsCommandParams);
-    readColorControlInteractionInfo.put(
-        "readCoupleColorTempToLevelMinMiredsAttribute",
-        readColorControlCoupleColorTempToLevelMinMiredsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlStartUpColorTemperatureMiredsCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readPowerSourceBatteryReplacementDescriptionCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readBatteryReplacementDescriptionAttribute",
+        readPowerSourceBatteryReplacementDescriptionAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceBatteryCommonDesignationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlStartUpColorTemperatureMiredsAttributeInteractionInfo =
+    InteractionInfo readPowerSourceBatteryCommonDesignationAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readStartUpColorTemperatureMiredsAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readBatteryCommonDesignationAttribute(
+                      (ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlStartUpColorTemperatureMiredsCommandParams);
-    readColorControlInteractionInfo.put(
-        "readStartUpColorTemperatureMiredsAttribute",
-        readColorControlStartUpColorTemperatureMiredsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlGeneratedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readPowerSourceBatteryCommonDesignationCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readBatteryCommonDesignationAttribute",
+        readPowerSourceBatteryCommonDesignationAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceBatteryANSIDesignationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readPowerSourceBatteryANSIDesignationAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.ColorControlCluster.GeneratedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readBatteryANSIDesignationAttribute(
+                      (ChipClusters.CharStringAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedColorControlClusterGeneratedCommandListAttributeCallback(),
-            readColorControlGeneratedCommandListCommandParams);
-    readColorControlInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readColorControlGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlAcceptedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readPowerSourceBatteryANSIDesignationCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readBatteryANSIDesignationAttribute",
+        readPowerSourceBatteryANSIDesignationAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceBatteryIECDesignationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readPowerSourceBatteryIECDesignationAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.ColorControlCluster.AcceptedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readBatteryIECDesignationAttribute(
+                      (ChipClusters.CharStringAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedColorControlClusterAcceptedCommandListAttributeCallback(),
-            readColorControlAcceptedCommandListCommandParams);
-    readColorControlInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readColorControlAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlAttributeListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readPowerSourceBatteryIECDesignationCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readBatteryIECDesignationAttribute",
+        readPowerSourceBatteryIECDesignationAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceBatteryApprovedChemistryCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlAttributeListAttributeInteractionInfo =
+    InteractionInfo readPowerSourceBatteryApprovedChemistryAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.ColorControlCluster.AttributeListAttributeCallback) callback);
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readBatteryApprovedChemistryAttribute(
+                      (ChipClusters.LongAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping.DelegatedColorControlClusterAttributeListAttributeCallback(),
-            readColorControlAttributeListCommandParams);
-    readColorControlInteractionInfo.put(
-        "readAttributeListAttribute", readColorControlAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readPowerSourceBatteryApprovedChemistryCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readBatteryApprovedChemistryAttribute",
+        readPowerSourceBatteryApprovedChemistryAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceBatteryCapacityCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlFeatureMapAttributeInteractionInfo =
+    InteractionInfo readPowerSourceBatteryCapacityAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readBatteryCapacityAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readColorControlFeatureMapCommandParams);
-    readColorControlInteractionInfo.put(
-        "readFeatureMapAttribute", readColorControlFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readColorControlClusterRevisionCommandParams =
+            readPowerSourceBatteryCapacityCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readBatteryCapacityAttribute", readPowerSourceBatteryCapacityAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceBatteryQuantityCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readColorControlClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readPowerSourceBatteryQuantityAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readBatteryQuantityAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readColorControlClusterRevisionCommandParams);
-    readColorControlInteractionInfo.put(
-        "readClusterRevisionAttribute", readColorControlClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("colorControl", readColorControlInteractionInfo);
-    Map<String, InteractionInfo> readContentLauncherInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readContentLauncherAcceptHeaderCommandParams =
+            readPowerSourceBatteryQuantityCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readBatteryQuantityAttribute", readPowerSourceBatteryQuantityAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceBatteryChargeStateCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readContentLauncherAcceptHeaderAttributeInteractionInfo =
+    InteractionInfo readPowerSourceBatteryChargeStateAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ContentLauncherCluster) cluster)
-                  .readAcceptHeaderAttribute(
-                      (ChipClusters.ContentLauncherCluster.AcceptHeaderAttributeCallback) callback);
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readBatteryChargeStateAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedContentLauncherClusterAcceptHeaderAttributeCallback(),
-            readContentLauncherAcceptHeaderCommandParams);
-    readContentLauncherInteractionInfo.put(
-        "readAcceptHeaderAttribute", readContentLauncherAcceptHeaderAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readContentLauncherSupportedStreamingProtocolsCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readPowerSourceBatteryChargeStateCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readBatteryChargeStateAttribute",
+        readPowerSourceBatteryChargeStateAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceBatteryTimeToFullChargeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readContentLauncherSupportedStreamingProtocolsAttributeInteractionInfo =
+    InteractionInfo readPowerSourceBatteryTimeToFullChargeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ContentLauncherCluster) cluster)
-                  .readSupportedStreamingProtocolsAttribute(
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readBatteryTimeToFullChargeAttribute(
                       (ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readContentLauncherSupportedStreamingProtocolsCommandParams);
-    readContentLauncherInteractionInfo.put(
-        "readSupportedStreamingProtocolsAttribute",
-        readContentLauncherSupportedStreamingProtocolsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readContentLauncherGeneratedCommandListCommandParams =
+            readPowerSourceBatteryTimeToFullChargeCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readBatteryTimeToFullChargeAttribute",
+        readPowerSourceBatteryTimeToFullChargeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceBatteryFunctionalWhileChargingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readContentLauncherGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readPowerSourceBatteryFunctionalWhileChargingAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ContentLauncherCluster) cluster)
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readBatteryFunctionalWhileChargingAttribute(
+                      (ChipClusters.BooleanAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readPowerSourceBatteryFunctionalWhileChargingCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readBatteryFunctionalWhileChargingAttribute",
+        readPowerSourceBatteryFunctionalWhileChargingAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceBatteryChargingCurrentCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readPowerSourceBatteryChargingCurrentAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readBatteryChargingCurrentAttribute(
+                      (ChipClusters.LongAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readPowerSourceBatteryChargingCurrentCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readBatteryChargingCurrentAttribute",
+        readPowerSourceBatteryChargingCurrentAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceActiveBatteryChargeFaultsCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readPowerSourceActiveBatteryChargeFaultsAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.PowerSourceCluster) cluster)
+                  .readActiveBatteryChargeFaultsAttribute(
+                      (ChipClusters.PowerSourceCluster.ActiveBatteryChargeFaultsAttributeCallback)
+                          callback);
+            },
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedPowerSourceClusterActiveBatteryChargeFaultsAttributeCallback(),
+            readPowerSourceActiveBatteryChargeFaultsCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readActiveBatteryChargeFaultsAttribute",
+        readPowerSourceActiveBatteryChargeFaultsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceGeneratedCommandListCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readPowerSourceGeneratedCommandListAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.PowerSourceCluster) cluster)
                   .readGeneratedCommandListAttribute(
-                      (ChipClusters.ContentLauncherCluster.GeneratedCommandListAttributeCallback)
+                      (ChipClusters.PowerSourceCluster.GeneratedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedContentLauncherClusterGeneratedCommandListAttributeCallback(),
-            readContentLauncherGeneratedCommandListCommandParams);
-    readContentLauncherInteractionInfo.put(
+                    .DelegatedPowerSourceClusterGeneratedCommandListAttributeCallback(),
+            readPowerSourceGeneratedCommandListCommandParams);
+    readPowerSourceInteractionInfo.put(
         "readGeneratedCommandListAttribute",
-        readContentLauncherGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readContentLauncherAcceptedCommandListCommandParams =
+        readPowerSourceGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readContentLauncherAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readPowerSourceAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ContentLauncherCluster) cluster)
+              ((ChipClusters.PowerSourceCluster) cluster)
                   .readAcceptedCommandListAttribute(
-                      (ChipClusters.ContentLauncherCluster.AcceptedCommandListAttributeCallback)
+                      (ChipClusters.PowerSourceCluster.AcceptedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedContentLauncherClusterAcceptedCommandListAttributeCallback(),
-            readContentLauncherAcceptedCommandListCommandParams);
-    readContentLauncherInteractionInfo.put(
+                    .DelegatedPowerSourceClusterAcceptedCommandListAttributeCallback(),
+            readPowerSourceAcceptedCommandListCommandParams);
+    readPowerSourceInteractionInfo.put(
         "readAcceptedCommandListAttribute",
-        readContentLauncherAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readContentLauncherAttributeListCommandParams =
+        readPowerSourceAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readContentLauncherAttributeListAttributeInteractionInfo =
+    InteractionInfo readPowerSourceAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ContentLauncherCluster) cluster)
+              ((ChipClusters.PowerSourceCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.ContentLauncherCluster.AttributeListAttributeCallback)
-                          callback);
+                      (ChipClusters.PowerSourceCluster.AttributeListAttributeCallback) callback);
             },
             () ->
-                new ClusterInfoMapping
-                    .DelegatedContentLauncherClusterAttributeListAttributeCallback(),
-            readContentLauncherAttributeListCommandParams);
-    readContentLauncherInteractionInfo.put(
-        "readAttributeListAttribute", readContentLauncherAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readContentLauncherFeatureMapCommandParams =
+                new ClusterInfoMapping.DelegatedPowerSourceClusterAttributeListAttributeCallback(),
+            readPowerSourceAttributeListCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readAttributeListAttribute", readPowerSourceAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readContentLauncherFeatureMapAttributeInteractionInfo =
+    InteractionInfo readPowerSourceFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ContentLauncherCluster) cluster)
+              ((ChipClusters.PowerSourceCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readContentLauncherFeatureMapCommandParams);
-    readContentLauncherInteractionInfo.put(
-        "readFeatureMapAttribute", readContentLauncherFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readContentLauncherClusterRevisionCommandParams =
+            readPowerSourceFeatureMapCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readFeatureMapAttribute", readPowerSourceFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPowerSourceClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readContentLauncherClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readPowerSourceClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ContentLauncherCluster) cluster)
+              ((ChipClusters.PowerSourceCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readContentLauncherClusterRevisionCommandParams);
-    readContentLauncherInteractionInfo.put(
-        "readClusterRevisionAttribute", readContentLauncherClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("contentLauncher", readContentLauncherInteractionInfo);
-    Map<String, InteractionInfo> readDescriptorInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readDescriptorDeviceListCommandParams =
+            readPowerSourceClusterRevisionCommandParams);
+    readPowerSourceInteractionInfo.put(
+        "readClusterRevisionAttribute", readPowerSourceClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("powerSource", readPowerSourceInteractionInfo);
+    Map<String, InteractionInfo> readGeneralCommissioningInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readGeneralCommissioningBreadcrumbCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDescriptorDeviceListAttributeInteractionInfo =
+    InteractionInfo readGeneralCommissioningBreadcrumbAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DescriptorCluster) cluster)
-                  .readDeviceListAttribute(
-                      (ChipClusters.DescriptorCluster.DeviceListAttributeCallback) callback);
+              ((ChipClusters.GeneralCommissioningCluster) cluster)
+                  .readBreadcrumbAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedDescriptorClusterDeviceListAttributeCallback(),
-            readDescriptorDeviceListCommandParams);
-    readDescriptorInteractionInfo.put(
-        "readDeviceListAttribute", readDescriptorDeviceListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDescriptorServerListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readGeneralCommissioningBreadcrumbCommandParams);
+    readGeneralCommissioningInteractionInfo.put(
+        "readBreadcrumbAttribute", readGeneralCommissioningBreadcrumbAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGeneralCommissioningRegulatoryConfigCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDescriptorServerListAttributeInteractionInfo =
+    InteractionInfo readGeneralCommissioningRegulatoryConfigAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DescriptorCluster) cluster)
-                  .readServerListAttribute(
-                      (ChipClusters.DescriptorCluster.ServerListAttributeCallback) callback);
+              ((ChipClusters.GeneralCommissioningCluster) cluster)
+                  .readRegulatoryConfigAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedDescriptorClusterServerListAttributeCallback(),
-            readDescriptorServerListCommandParams);
-    readDescriptorInteractionInfo.put(
-        "readServerListAttribute", readDescriptorServerListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDescriptorClientListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readGeneralCommissioningRegulatoryConfigCommandParams);
+    readGeneralCommissioningInteractionInfo.put(
+        "readRegulatoryConfigAttribute",
+        readGeneralCommissioningRegulatoryConfigAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGeneralCommissioningLocationCapabilityCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDescriptorClientListAttributeInteractionInfo =
+    InteractionInfo readGeneralCommissioningLocationCapabilityAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DescriptorCluster) cluster)
-                  .readClientListAttribute(
-                      (ChipClusters.DescriptorCluster.ClientListAttributeCallback) callback);
+              ((ChipClusters.GeneralCommissioningCluster) cluster)
+                  .readLocationCapabilityAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedDescriptorClusterClientListAttributeCallback(),
-            readDescriptorClientListCommandParams);
-    readDescriptorInteractionInfo.put(
-        "readClientListAttribute", readDescriptorClientListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDescriptorPartsListCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDescriptorPartsListAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readGeneralCommissioningLocationCapabilityCommandParams);
+    readGeneralCommissioningInteractionInfo.put(
+        "readLocationCapabilityAttribute",
+        readGeneralCommissioningLocationCapabilityAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readGeneralCommissioningSupportsConcurrentConnectionCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readGeneralCommissioningSupportsConcurrentConnectionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DescriptorCluster) cluster)
-                  .readPartsListAttribute(
-                      (ChipClusters.DescriptorCluster.PartsListAttributeCallback) callback);
+              ((ChipClusters.GeneralCommissioningCluster) cluster)
+                  .readSupportsConcurrentConnectionAttribute(
+                      (ChipClusters.BooleanAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedDescriptorClusterPartsListAttributeCallback(),
-            readDescriptorPartsListCommandParams);
-    readDescriptorInteractionInfo.put(
-        "readPartsListAttribute", readDescriptorPartsListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDescriptorGeneratedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readGeneralCommissioningSupportsConcurrentConnectionCommandParams);
+    readGeneralCommissioningInteractionInfo.put(
+        "readSupportsConcurrentConnectionAttribute",
+        readGeneralCommissioningSupportsConcurrentConnectionAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGeneralCommissioningGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDescriptorGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readGeneralCommissioningGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DescriptorCluster) cluster)
+              ((ChipClusters.GeneralCommissioningCluster) cluster)
                   .readGeneratedCommandListAttribute(
-                      (ChipClusters.DescriptorCluster.GeneratedCommandListAttributeCallback)
+                      (ChipClusters.GeneralCommissioningCluster
+                              .GeneratedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedDescriptorClusterGeneratedCommandListAttributeCallback(),
-            readDescriptorGeneratedCommandListCommandParams);
-    readDescriptorInteractionInfo.put(
+                    .DelegatedGeneralCommissioningClusterGeneratedCommandListAttributeCallback(),
+            readGeneralCommissioningGeneratedCommandListCommandParams);
+    readGeneralCommissioningInteractionInfo.put(
         "readGeneratedCommandListAttribute",
-        readDescriptorGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDescriptorAcceptedCommandListCommandParams =
+        readGeneralCommissioningGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGeneralCommissioningAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDescriptorAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readGeneralCommissioningAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DescriptorCluster) cluster)
+              ((ChipClusters.GeneralCommissioningCluster) cluster)
                   .readAcceptedCommandListAttribute(
-                      (ChipClusters.DescriptorCluster.AcceptedCommandListAttributeCallback)
+                      (ChipClusters.GeneralCommissioningCluster
+                              .AcceptedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedDescriptorClusterAcceptedCommandListAttributeCallback(),
-            readDescriptorAcceptedCommandListCommandParams);
-    readDescriptorInteractionInfo.put(
+                    .DelegatedGeneralCommissioningClusterAcceptedCommandListAttributeCallback(),
+            readGeneralCommissioningAcceptedCommandListCommandParams);
+    readGeneralCommissioningInteractionInfo.put(
         "readAcceptedCommandListAttribute",
-        readDescriptorAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDescriptorAttributeListCommandParams =
+        readGeneralCommissioningAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGeneralCommissioningAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDescriptorAttributeListAttributeInteractionInfo =
+    InteractionInfo readGeneralCommissioningAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DescriptorCluster) cluster)
+              ((ChipClusters.GeneralCommissioningCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.DescriptorCluster.AttributeListAttributeCallback) callback);
+                      (ChipClusters.GeneralCommissioningCluster.AttributeListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedDescriptorClusterAttributeListAttributeCallback(),
-            readDescriptorAttributeListCommandParams);
-    readDescriptorInteractionInfo.put(
-        "readAttributeListAttribute", readDescriptorAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDescriptorFeatureMapCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedGeneralCommissioningClusterAttributeListAttributeCallback(),
+            readGeneralCommissioningAttributeListCommandParams);
+    readGeneralCommissioningInteractionInfo.put(
+        "readAttributeListAttribute",
+        readGeneralCommissioningAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGeneralCommissioningFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDescriptorFeatureMapAttributeInteractionInfo =
+    InteractionInfo readGeneralCommissioningFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DescriptorCluster) cluster)
+              ((ChipClusters.GeneralCommissioningCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readDescriptorFeatureMapCommandParams);
-    readDescriptorInteractionInfo.put(
-        "readFeatureMapAttribute", readDescriptorFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDescriptorClusterRevisionCommandParams =
+            readGeneralCommissioningFeatureMapCommandParams);
+    readGeneralCommissioningInteractionInfo.put(
+        "readFeatureMapAttribute", readGeneralCommissioningFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGeneralCommissioningClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDescriptorClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readGeneralCommissioningClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DescriptorCluster) cluster)
+              ((ChipClusters.GeneralCommissioningCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readDescriptorClusterRevisionCommandParams);
-    readDescriptorInteractionInfo.put(
-        "readClusterRevisionAttribute", readDescriptorClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("descriptor", readDescriptorInteractionInfo);
-    Map<String, InteractionInfo> readDiagnosticLogsInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readDiagnosticLogsGeneratedCommandListCommandParams =
+            readGeneralCommissioningClusterRevisionCommandParams);
+    readGeneralCommissioningInteractionInfo.put(
+        "readClusterRevisionAttribute",
+        readGeneralCommissioningClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("generalCommissioning", readGeneralCommissioningInteractionInfo);
+    Map<String, InteractionInfo> readNetworkCommissioningInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readNetworkCommissioningMaxNetworksCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDiagnosticLogsGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readNetworkCommissioningMaxNetworksAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DiagnosticLogsCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.DiagnosticLogsCluster.GeneratedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .readMaxNetworksAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedDiagnosticLogsClusterGeneratedCommandListAttributeCallback(),
-            readDiagnosticLogsGeneratedCommandListCommandParams);
-    readDiagnosticLogsInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readDiagnosticLogsGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDiagnosticLogsAcceptedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readNetworkCommissioningMaxNetworksCommandParams);
+    readNetworkCommissioningInteractionInfo.put(
+        "readMaxNetworksAttribute", readNetworkCommissioningMaxNetworksAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readNetworkCommissioningNetworksCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDiagnosticLogsAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readNetworkCommissioningNetworksAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DiagnosticLogsCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.DiagnosticLogsCluster.AcceptedCommandListAttributeCallback)
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .readNetworksAttribute(
+                      (ChipClusters.NetworkCommissioningCluster.NetworksAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedDiagnosticLogsClusterAcceptedCommandListAttributeCallback(),
-            readDiagnosticLogsAcceptedCommandListCommandParams);
-    readDiagnosticLogsInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readDiagnosticLogsAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDiagnosticLogsAttributeListCommandParams =
+                    .DelegatedNetworkCommissioningClusterNetworksAttributeCallback(),
+            readNetworkCommissioningNetworksCommandParams);
+    readNetworkCommissioningInteractionInfo.put(
+        "readNetworksAttribute", readNetworkCommissioningNetworksAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readNetworkCommissioningScanMaxTimeSecondsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDiagnosticLogsAttributeListAttributeInteractionInfo =
+    InteractionInfo readNetworkCommissioningScanMaxTimeSecondsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DiagnosticLogsCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.DiagnosticLogsCluster.AttributeListAttributeCallback) callback);
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .readScanMaxTimeSecondsAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedDiagnosticLogsClusterAttributeListAttributeCallback(),
-            readDiagnosticLogsAttributeListCommandParams);
-    readDiagnosticLogsInteractionInfo.put(
-        "readAttributeListAttribute", readDiagnosticLogsAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDiagnosticLogsFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readNetworkCommissioningScanMaxTimeSecondsCommandParams);
+    readNetworkCommissioningInteractionInfo.put(
+        "readScanMaxTimeSecondsAttribute",
+        readNetworkCommissioningScanMaxTimeSecondsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readNetworkCommissioningConnectMaxTimeSecondsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDiagnosticLogsFeatureMapAttributeInteractionInfo =
+    InteractionInfo readNetworkCommissioningConnectMaxTimeSecondsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DiagnosticLogsCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .readConnectMaxTimeSecondsAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readDiagnosticLogsFeatureMapCommandParams);
-    readDiagnosticLogsInteractionInfo.put(
-        "readFeatureMapAttribute", readDiagnosticLogsFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDiagnosticLogsClusterRevisionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readNetworkCommissioningConnectMaxTimeSecondsCommandParams);
+    readNetworkCommissioningInteractionInfo.put(
+        "readConnectMaxTimeSecondsAttribute",
+        readNetworkCommissioningConnectMaxTimeSecondsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readNetworkCommissioningInterfaceEnabledCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDiagnosticLogsClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readNetworkCommissioningInterfaceEnabledAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DiagnosticLogsCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .readInterfaceEnabledAttribute((ChipClusters.BooleanAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readDiagnosticLogsClusterRevisionCommandParams);
-    readDiagnosticLogsInteractionInfo.put(
-        "readClusterRevisionAttribute", readDiagnosticLogsClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("diagnosticLogs", readDiagnosticLogsInteractionInfo);
-    Map<String, InteractionInfo> readDoorLockInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readDoorLockLockStateCommandParams =
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readNetworkCommissioningInterfaceEnabledCommandParams);
+    readNetworkCommissioningInteractionInfo.put(
+        "readInterfaceEnabledAttribute",
+        readNetworkCommissioningInterfaceEnabledAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readNetworkCommissioningLastNetworkingStatusCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockLockStateAttributeInteractionInfo =
+    InteractionInfo readNetworkCommissioningLastNetworkingStatusAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .readLockStateAttribute(
-                      (ChipClusters.DoorLockCluster.LockStateAttributeCallback) callback);
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .readLastNetworkingStatusAttribute(
+                      (ChipClusters.NetworkCommissioningCluster
+                              .LastNetworkingStatusAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readDoorLockLockStateCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readLockStateAttribute", readDoorLockLockStateAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockLockTypeCommandParams =
+            readNetworkCommissioningLastNetworkingStatusCommandParams);
+    readNetworkCommissioningInteractionInfo.put(
+        "readLastNetworkingStatusAttribute",
+        readNetworkCommissioningLastNetworkingStatusAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readNetworkCommissioningLastNetworkIDCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockLockTypeAttributeInteractionInfo =
+    InteractionInfo readNetworkCommissioningLastNetworkIDAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .readLockTypeAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .readLastNetworkIDAttribute(
+                      (ChipClusters.NetworkCommissioningCluster.LastNetworkIDAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readDoorLockLockTypeCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readLockTypeAttribute", readDoorLockLockTypeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockActuatorEnabledCommandParams =
+            () -> new ClusterInfoMapping.DelegatedOctetStringAttributeCallback(),
+            readNetworkCommissioningLastNetworkIDCommandParams);
+    readNetworkCommissioningInteractionInfo.put(
+        "readLastNetworkIDAttribute",
+        readNetworkCommissioningLastNetworkIDAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readNetworkCommissioningLastConnectErrorValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockActuatorEnabledAttributeInteractionInfo =
+    InteractionInfo readNetworkCommissioningLastConnectErrorValueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .readActuatorEnabledAttribute((ChipClusters.BooleanAttributeCallback) callback);
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .readLastConnectErrorValueAttribute(
+                      (ChipClusters.NetworkCommissioningCluster
+                              .LastConnectErrorValueAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readDoorLockActuatorEnabledCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readActuatorEnabledAttribute", readDoorLockActuatorEnabledAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockDoorStateCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readNetworkCommissioningLastConnectErrorValueCommandParams);
+    readNetworkCommissioningInteractionInfo.put(
+        "readLastConnectErrorValueAttribute",
+        readNetworkCommissioningLastConnectErrorValueAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readNetworkCommissioningGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockDoorStateAttributeInteractionInfo =
+    InteractionInfo readNetworkCommissioningGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .readDoorStateAttribute(
-                      (ChipClusters.DoorLockCluster.DoorStateAttributeCallback) callback);
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.NetworkCommissioningCluster
+                              .GeneratedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readDoorLockDoorStateCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readDoorStateAttribute", readDoorLockDoorStateAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockNumberOfTotalUsersSupportedCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedNetworkCommissioningClusterGeneratedCommandListAttributeCallback(),
+            readNetworkCommissioningGeneratedCommandListCommandParams);
+    readNetworkCommissioningInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readNetworkCommissioningGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readNetworkCommissioningAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockNumberOfTotalUsersSupportedAttributeInteractionInfo =
+    InteractionInfo readNetworkCommissioningAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .readNumberOfTotalUsersSupportedAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.NetworkCommissioningCluster
+                              .AcceptedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readDoorLockNumberOfTotalUsersSupportedCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readNumberOfTotalUsersSupportedAttribute",
-        readDoorLockNumberOfTotalUsersSupportedAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockNumberOfPINUsersSupportedCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedNetworkCommissioningClusterAcceptedCommandListAttributeCallback(),
+            readNetworkCommissioningAcceptedCommandListCommandParams);
+    readNetworkCommissioningInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readNetworkCommissioningAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readNetworkCommissioningFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockNumberOfPINUsersSupportedAttributeInteractionInfo =
+    InteractionInfo readNetworkCommissioningFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .readNumberOfPINUsersSupportedAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readDoorLockNumberOfPINUsersSupportedCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readNumberOfPINUsersSupportedAttribute",
-        readDoorLockNumberOfPINUsersSupportedAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockNumberOfRFIDUsersSupportedCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readNetworkCommissioningFeatureMapCommandParams);
+    readNetworkCommissioningInteractionInfo.put(
+        "readFeatureMapAttribute", readNetworkCommissioningFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readNetworkCommissioningClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockNumberOfRFIDUsersSupportedAttributeInteractionInfo =
+    InteractionInfo readNetworkCommissioningClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .readNumberOfRFIDUsersSupportedAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readDoorLockNumberOfRFIDUsersSupportedCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readNumberOfRFIDUsersSupportedAttribute",
-        readDoorLockNumberOfRFIDUsersSupportedAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readDoorLockNumberOfWeekDaySchedulesSupportedPerUserCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockNumberOfWeekDaySchedulesSupportedPerUserAttributeInteractionInfo =
+            readNetworkCommissioningClusterRevisionCommandParams);
+    readNetworkCommissioningInteractionInfo.put(
+        "readClusterRevisionAttribute",
+        readNetworkCommissioningClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("networkCommissioning", readNetworkCommissioningInteractionInfo);
+    Map<String, InteractionInfo> readDiagnosticLogsInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readDiagnosticLogsGeneratedCommandListCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readDiagnosticLogsGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .readNumberOfWeekDaySchedulesSupportedPerUserAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.DiagnosticLogsCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.DiagnosticLogsCluster.GeneratedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readDoorLockNumberOfWeekDaySchedulesSupportedPerUserCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readNumberOfWeekDaySchedulesSupportedPerUserAttribute",
-        readDoorLockNumberOfWeekDaySchedulesSupportedPerUserAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readDoorLockNumberOfYearDaySchedulesSupportedPerUserCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockNumberOfYearDaySchedulesSupportedPerUserAttributeInteractionInfo =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedDiagnosticLogsClusterGeneratedCommandListAttributeCallback(),
+            readDiagnosticLogsGeneratedCommandListCommandParams);
+    readDiagnosticLogsInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readDiagnosticLogsGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDiagnosticLogsAcceptedCommandListCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readDiagnosticLogsAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .readNumberOfYearDaySchedulesSupportedPerUserAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.DiagnosticLogsCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.DiagnosticLogsCluster.AcceptedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readDoorLockNumberOfYearDaySchedulesSupportedPerUserCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readNumberOfYearDaySchedulesSupportedPerUserAttribute",
-        readDoorLockNumberOfYearDaySchedulesSupportedPerUserAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockNumberOfHolidaySchedulesSupportedCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedDiagnosticLogsClusterAcceptedCommandListAttributeCallback(),
+            readDiagnosticLogsAcceptedCommandListCommandParams);
+    readDiagnosticLogsInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readDiagnosticLogsAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDiagnosticLogsAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockNumberOfHolidaySchedulesSupportedAttributeInteractionInfo =
+    InteractionInfo readDiagnosticLogsAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .readNumberOfHolidaySchedulesSupportedAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.DiagnosticLogsCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.DiagnosticLogsCluster.AttributeListAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readDoorLockNumberOfHolidaySchedulesSupportedCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readNumberOfHolidaySchedulesSupportedAttribute",
-        readDoorLockNumberOfHolidaySchedulesSupportedAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockMaxPINCodeLengthCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedDiagnosticLogsClusterAttributeListAttributeCallback(),
+            readDiagnosticLogsAttributeListCommandParams);
+    readDiagnosticLogsInteractionInfo.put(
+        "readAttributeListAttribute", readDiagnosticLogsAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDiagnosticLogsFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockMaxPINCodeLengthAttributeInteractionInfo =
+    InteractionInfo readDiagnosticLogsFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .readMaxPINCodeLengthAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.DiagnosticLogsCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readDoorLockMaxPINCodeLengthCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readMaxPINCodeLengthAttribute", readDoorLockMaxPINCodeLengthAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockMinPINCodeLengthCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readDiagnosticLogsFeatureMapCommandParams);
+    readDiagnosticLogsInteractionInfo.put(
+        "readFeatureMapAttribute", readDiagnosticLogsFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDiagnosticLogsClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockMinPINCodeLengthAttributeInteractionInfo =
+    InteractionInfo readDiagnosticLogsClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .readMinPINCodeLengthAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.DiagnosticLogsCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readDoorLockMinPINCodeLengthCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readMinPINCodeLengthAttribute", readDoorLockMinPINCodeLengthAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockMaxRFIDCodeLengthCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockMaxRFIDCodeLengthAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .readMaxRFIDCodeLengthAttribute((ChipClusters.IntegerAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readDoorLockMaxRFIDCodeLengthCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readMaxRFIDCodeLengthAttribute", readDoorLockMaxRFIDCodeLengthAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockMinRFIDCodeLengthCommandParams =
+            readDiagnosticLogsClusterRevisionCommandParams);
+    readDiagnosticLogsInteractionInfo.put(
+        "readClusterRevisionAttribute", readDiagnosticLogsClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("diagnosticLogs", readDiagnosticLogsInteractionInfo);
+    Map<String, InteractionInfo> readGeneralDiagnosticsInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readGeneralDiagnosticsNetworkInterfacesCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockMinRFIDCodeLengthAttributeInteractionInfo =
+    InteractionInfo readGeneralDiagnosticsNetworkInterfacesAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .readMinRFIDCodeLengthAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
+                  .readNetworkInterfacesAttribute(
+                      (ChipClusters.GeneralDiagnosticsCluster.NetworkInterfacesAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readDoorLockMinRFIDCodeLengthCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readMinRFIDCodeLengthAttribute", readDoorLockMinRFIDCodeLengthAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockNumberOfCredentialsSupportedPerUserCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedGeneralDiagnosticsClusterNetworkInterfacesAttributeCallback(),
+            readGeneralDiagnosticsNetworkInterfacesCommandParams);
+    readGeneralDiagnosticsInteractionInfo.put(
+        "readNetworkInterfacesAttribute",
+        readGeneralDiagnosticsNetworkInterfacesAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGeneralDiagnosticsRebootCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockNumberOfCredentialsSupportedPerUserAttributeInteractionInfo =
+    InteractionInfo readGeneralDiagnosticsRebootCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .readNumberOfCredentialsSupportedPerUserAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
+                  .readRebootCountAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readDoorLockNumberOfCredentialsSupportedPerUserCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readNumberOfCredentialsSupportedPerUserAttribute",
-        readDoorLockNumberOfCredentialsSupportedPerUserAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockLanguageCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockLanguageAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .readLanguageAttribute((ChipClusters.CharStringAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readDoorLockLanguageCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readLanguageAttribute", readDoorLockLanguageAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockAutoRelockTimeCommandParams =
+            readGeneralDiagnosticsRebootCountCommandParams);
+    readGeneralDiagnosticsInteractionInfo.put(
+        "readRebootCountAttribute", readGeneralDiagnosticsRebootCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGeneralDiagnosticsUpTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockAutoRelockTimeAttributeInteractionInfo =
+    InteractionInfo readGeneralDiagnosticsUpTimeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .readAutoRelockTimeAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
+                  .readUpTimeAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readDoorLockAutoRelockTimeCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readAutoRelockTimeAttribute", readDoorLockAutoRelockTimeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockSoundVolumeCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockSoundVolumeAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .readSoundVolumeAttribute((ChipClusters.IntegerAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readDoorLockSoundVolumeCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readSoundVolumeAttribute", readDoorLockSoundVolumeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockOperatingModeCommandParams =
+            readGeneralDiagnosticsUpTimeCommandParams);
+    readGeneralDiagnosticsInteractionInfo.put(
+        "readUpTimeAttribute", readGeneralDiagnosticsUpTimeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGeneralDiagnosticsTotalOperationalHoursCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockOperatingModeAttributeInteractionInfo =
+    InteractionInfo readGeneralDiagnosticsTotalOperationalHoursAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .readOperatingModeAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
+                  .readTotalOperationalHoursAttribute(
+                      (ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readDoorLockOperatingModeCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readOperatingModeAttribute", readDoorLockOperatingModeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockSupportedOperatingModesCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readGeneralDiagnosticsTotalOperationalHoursCommandParams);
+    readGeneralDiagnosticsInteractionInfo.put(
+        "readTotalOperationalHoursAttribute",
+        readGeneralDiagnosticsTotalOperationalHoursAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGeneralDiagnosticsBootReasonsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockSupportedOperatingModesAttributeInteractionInfo =
+    InteractionInfo readGeneralDiagnosticsBootReasonsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .readSupportedOperatingModesAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
+                  .readBootReasonsAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readDoorLockSupportedOperatingModesCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readSupportedOperatingModesAttribute",
-        readDoorLockSupportedOperatingModesAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockEnableOneTouchLockingCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockEnableOneTouchLockingAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .readEnableOneTouchLockingAttribute(
-                      (ChipClusters.BooleanAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readDoorLockEnableOneTouchLockingCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readEnableOneTouchLockingAttribute",
-        readDoorLockEnableOneTouchLockingAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockEnablePrivacyModeButtonCommandParams =
+            readGeneralDiagnosticsBootReasonsCommandParams);
+    readGeneralDiagnosticsInteractionInfo.put(
+        "readBootReasonsAttribute", readGeneralDiagnosticsBootReasonsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGeneralDiagnosticsActiveHardwareFaultsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockEnablePrivacyModeButtonAttributeInteractionInfo =
+    InteractionInfo readGeneralDiagnosticsActiveHardwareFaultsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .readEnablePrivacyModeButtonAttribute(
-                      (ChipClusters.BooleanAttributeCallback) callback);
+              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
+                  .readActiveHardwareFaultsAttribute(
+                      (ChipClusters.GeneralDiagnosticsCluster.ActiveHardwareFaultsAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readDoorLockEnablePrivacyModeButtonCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readEnablePrivacyModeButtonAttribute",
-        readDoorLockEnablePrivacyModeButtonAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockWrongCodeEntryLimitCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedGeneralDiagnosticsClusterActiveHardwareFaultsAttributeCallback(),
+            readGeneralDiagnosticsActiveHardwareFaultsCommandParams);
+    readGeneralDiagnosticsInteractionInfo.put(
+        "readActiveHardwareFaultsAttribute",
+        readGeneralDiagnosticsActiveHardwareFaultsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGeneralDiagnosticsActiveRadioFaultsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockWrongCodeEntryLimitAttributeInteractionInfo =
+    InteractionInfo readGeneralDiagnosticsActiveRadioFaultsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .readWrongCodeEntryLimitAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
+                  .readActiveRadioFaultsAttribute(
+                      (ChipClusters.GeneralDiagnosticsCluster.ActiveRadioFaultsAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readDoorLockWrongCodeEntryLimitCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readWrongCodeEntryLimitAttribute",
-        readDoorLockWrongCodeEntryLimitAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockUserCodeTemporaryDisableTimeCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedGeneralDiagnosticsClusterActiveRadioFaultsAttributeCallback(),
+            readGeneralDiagnosticsActiveRadioFaultsCommandParams);
+    readGeneralDiagnosticsInteractionInfo.put(
+        "readActiveRadioFaultsAttribute",
+        readGeneralDiagnosticsActiveRadioFaultsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGeneralDiagnosticsActiveNetworkFaultsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockUserCodeTemporaryDisableTimeAttributeInteractionInfo =
+    InteractionInfo readGeneralDiagnosticsActiveNetworkFaultsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .readUserCodeTemporaryDisableTimeAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
+                  .readActiveNetworkFaultsAttribute(
+                      (ChipClusters.GeneralDiagnosticsCluster.ActiveNetworkFaultsAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readDoorLockUserCodeTemporaryDisableTimeCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readUserCodeTemporaryDisableTimeAttribute",
-        readDoorLockUserCodeTemporaryDisableTimeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockRequirePINforRemoteOperationCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedGeneralDiagnosticsClusterActiveNetworkFaultsAttributeCallback(),
+            readGeneralDiagnosticsActiveNetworkFaultsCommandParams);
+    readGeneralDiagnosticsInteractionInfo.put(
+        "readActiveNetworkFaultsAttribute",
+        readGeneralDiagnosticsActiveNetworkFaultsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGeneralDiagnosticsTestEventTriggersEnabledCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockRequirePINforRemoteOperationAttributeInteractionInfo =
+    InteractionInfo readGeneralDiagnosticsTestEventTriggersEnabledAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .readRequirePINforRemoteOperationAttribute(
+              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
+                  .readTestEventTriggersEnabledAttribute(
                       (ChipClusters.BooleanAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readDoorLockRequirePINforRemoteOperationCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readRequirePINforRemoteOperationAttribute",
-        readDoorLockRequirePINforRemoteOperationAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockGeneratedCommandListCommandParams =
+            readGeneralDiagnosticsTestEventTriggersEnabledCommandParams);
+    readGeneralDiagnosticsInteractionInfo.put(
+        "readTestEventTriggersEnabledAttribute",
+        readGeneralDiagnosticsTestEventTriggersEnabledAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGeneralDiagnosticsGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readGeneralDiagnosticsGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
+              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
                   .readGeneratedCommandListAttribute(
-                      (ChipClusters.DoorLockCluster.GeneratedCommandListAttributeCallback)
+                      (ChipClusters.GeneralDiagnosticsCluster.GeneratedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedDoorLockClusterGeneratedCommandListAttributeCallback(),
-            readDoorLockGeneratedCommandListCommandParams);
-    readDoorLockInteractionInfo.put(
+                    .DelegatedGeneralDiagnosticsClusterGeneratedCommandListAttributeCallback(),
+            readGeneralDiagnosticsGeneratedCommandListCommandParams);
+    readGeneralDiagnosticsInteractionInfo.put(
         "readGeneratedCommandListAttribute",
-        readDoorLockGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockAcceptedCommandListCommandParams =
+        readGeneralDiagnosticsGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGeneralDiagnosticsAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readGeneralDiagnosticsAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
+              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
                   .readAcceptedCommandListAttribute(
-                      (ChipClusters.DoorLockCluster.AcceptedCommandListAttributeCallback) callback);
+                      (ChipClusters.GeneralDiagnosticsCluster.AcceptedCommandListAttributeCallback)
+                          callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedDoorLockClusterAcceptedCommandListAttributeCallback(),
-            readDoorLockAcceptedCommandListCommandParams);
-    readDoorLockInteractionInfo.put(
+                    .DelegatedGeneralDiagnosticsClusterAcceptedCommandListAttributeCallback(),
+            readGeneralDiagnosticsAcceptedCommandListCommandParams);
+    readGeneralDiagnosticsInteractionInfo.put(
         "readAcceptedCommandListAttribute",
-        readDoorLockAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockAttributeListCommandParams =
+        readGeneralDiagnosticsAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGeneralDiagnosticsAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockAttributeListAttributeInteractionInfo =
+    InteractionInfo readGeneralDiagnosticsAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
+              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.DoorLockCluster.AttributeListAttributeCallback) callback);
+                      (ChipClusters.GeneralDiagnosticsCluster.AttributeListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedDoorLockClusterAttributeListAttributeCallback(),
-            readDoorLockAttributeListCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readAttributeListAttribute", readDoorLockAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockFeatureMapCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedGeneralDiagnosticsClusterAttributeListAttributeCallback(),
+            readGeneralDiagnosticsAttributeListCommandParams);
+    readGeneralDiagnosticsInteractionInfo.put(
+        "readAttributeListAttribute", readGeneralDiagnosticsAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGeneralDiagnosticsFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockFeatureMapAttributeInteractionInfo =
+    InteractionInfo readGeneralDiagnosticsFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
+              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readDoorLockFeatureMapCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readFeatureMapAttribute", readDoorLockFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readDoorLockClusterRevisionCommandParams =
+            readGeneralDiagnosticsFeatureMapCommandParams);
+    readGeneralDiagnosticsInteractionInfo.put(
+        "readFeatureMapAttribute", readGeneralDiagnosticsFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGeneralDiagnosticsClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readDoorLockClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readGeneralDiagnosticsClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.DoorLockCluster) cluster)
+              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readDoorLockClusterRevisionCommandParams);
-    readDoorLockInteractionInfo.put(
-        "readClusterRevisionAttribute", readDoorLockClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("doorLock", readDoorLockInteractionInfo);
-    Map<String, InteractionInfo> readElectricalMeasurementInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readElectricalMeasurementMeasurementTypeCommandParams =
+            readGeneralDiagnosticsClusterRevisionCommandParams);
+    readGeneralDiagnosticsInteractionInfo.put(
+        "readClusterRevisionAttribute",
+        readGeneralDiagnosticsClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("generalDiagnostics", readGeneralDiagnosticsInteractionInfo);
+    Map<String, InteractionInfo> readSoftwareDiagnosticsInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readSoftwareDiagnosticsThreadMetricsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readElectricalMeasurementMeasurementTypeAttributeInteractionInfo =
+    InteractionInfo readSoftwareDiagnosticsThreadMetricsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ElectricalMeasurementCluster) cluster)
-                  .readMeasurementTypeAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
+                  .readThreadMetricsAttribute(
+                      (ChipClusters.SoftwareDiagnosticsCluster.ThreadMetricsAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readElectricalMeasurementMeasurementTypeCommandParams);
-    readElectricalMeasurementInteractionInfo.put(
-        "readMeasurementTypeAttribute",
-        readElectricalMeasurementMeasurementTypeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readElectricalMeasurementTotalActivePowerCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedSoftwareDiagnosticsClusterThreadMetricsAttributeCallback(),
+            readSoftwareDiagnosticsThreadMetricsCommandParams);
+    readSoftwareDiagnosticsInteractionInfo.put(
+        "readThreadMetricsAttribute", readSoftwareDiagnosticsThreadMetricsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readSoftwareDiagnosticsCurrentHeapFreeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readElectricalMeasurementTotalActivePowerAttributeInteractionInfo =
+    InteractionInfo readSoftwareDiagnosticsCurrentHeapFreeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ElectricalMeasurementCluster) cluster)
-                  .readTotalActivePowerAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
+                  .readCurrentHeapFreeAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readElectricalMeasurementTotalActivePowerCommandParams);
-    readElectricalMeasurementInteractionInfo.put(
-        "readTotalActivePowerAttribute",
-        readElectricalMeasurementTotalActivePowerAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readElectricalMeasurementRmsVoltageCommandParams =
+            readSoftwareDiagnosticsCurrentHeapFreeCommandParams);
+    readSoftwareDiagnosticsInteractionInfo.put(
+        "readCurrentHeapFreeAttribute",
+        readSoftwareDiagnosticsCurrentHeapFreeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readSoftwareDiagnosticsCurrentHeapUsedCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readElectricalMeasurementRmsVoltageAttributeInteractionInfo =
+    InteractionInfo readSoftwareDiagnosticsCurrentHeapUsedAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ElectricalMeasurementCluster) cluster)
-                  .readRmsVoltageAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
+                  .readCurrentHeapUsedAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readElectricalMeasurementRmsVoltageCommandParams);
-    readElectricalMeasurementInteractionInfo.put(
-        "readRmsVoltageAttribute", readElectricalMeasurementRmsVoltageAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readElectricalMeasurementRmsVoltageMinCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readSoftwareDiagnosticsCurrentHeapUsedCommandParams);
+    readSoftwareDiagnosticsInteractionInfo.put(
+        "readCurrentHeapUsedAttribute",
+        readSoftwareDiagnosticsCurrentHeapUsedAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readSoftwareDiagnosticsCurrentHeapHighWatermarkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readElectricalMeasurementRmsVoltageMinAttributeInteractionInfo =
+    InteractionInfo readSoftwareDiagnosticsCurrentHeapHighWatermarkAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ElectricalMeasurementCluster) cluster)
-                  .readRmsVoltageMinAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
+                  .readCurrentHeapHighWatermarkAttribute(
+                      (ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readElectricalMeasurementRmsVoltageMinCommandParams);
-    readElectricalMeasurementInteractionInfo.put(
-        "readRmsVoltageMinAttribute",
-        readElectricalMeasurementRmsVoltageMinAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readElectricalMeasurementRmsVoltageMaxCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readSoftwareDiagnosticsCurrentHeapHighWatermarkCommandParams);
+    readSoftwareDiagnosticsInteractionInfo.put(
+        "readCurrentHeapHighWatermarkAttribute",
+        readSoftwareDiagnosticsCurrentHeapHighWatermarkAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readSoftwareDiagnosticsGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readElectricalMeasurementRmsVoltageMaxAttributeInteractionInfo =
+    InteractionInfo readSoftwareDiagnosticsGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ElectricalMeasurementCluster) cluster)
-                  .readRmsVoltageMaxAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.SoftwareDiagnosticsCluster
+                              .GeneratedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readElectricalMeasurementRmsVoltageMaxCommandParams);
-    readElectricalMeasurementInteractionInfo.put(
-        "readRmsVoltageMaxAttribute",
-        readElectricalMeasurementRmsVoltageMaxAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readElectricalMeasurementRmsCurrentCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedSoftwareDiagnosticsClusterGeneratedCommandListAttributeCallback(),
+            readSoftwareDiagnosticsGeneratedCommandListCommandParams);
+    readSoftwareDiagnosticsInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readSoftwareDiagnosticsGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readSoftwareDiagnosticsAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readElectricalMeasurementRmsCurrentAttributeInteractionInfo =
+    InteractionInfo readSoftwareDiagnosticsAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ElectricalMeasurementCluster) cluster)
-                  .readRmsCurrentAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.SoftwareDiagnosticsCluster.AcceptedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readElectricalMeasurementRmsCurrentCommandParams);
-    readElectricalMeasurementInteractionInfo.put(
-        "readRmsCurrentAttribute", readElectricalMeasurementRmsCurrentAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readElectricalMeasurementRmsCurrentMinCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedSoftwareDiagnosticsClusterAcceptedCommandListAttributeCallback(),
+            readSoftwareDiagnosticsAcceptedCommandListCommandParams);
+    readSoftwareDiagnosticsInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readSoftwareDiagnosticsAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readSoftwareDiagnosticsAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readElectricalMeasurementRmsCurrentMinAttributeInteractionInfo =
+    InteractionInfo readSoftwareDiagnosticsAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ElectricalMeasurementCluster) cluster)
-                  .readRmsCurrentMinAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.SoftwareDiagnosticsCluster.AttributeListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readElectricalMeasurementRmsCurrentMinCommandParams);
-    readElectricalMeasurementInteractionInfo.put(
-        "readRmsCurrentMinAttribute",
-        readElectricalMeasurementRmsCurrentMinAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readElectricalMeasurementRmsCurrentMaxCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedSoftwareDiagnosticsClusterAttributeListAttributeCallback(),
+            readSoftwareDiagnosticsAttributeListCommandParams);
+    readSoftwareDiagnosticsInteractionInfo.put(
+        "readAttributeListAttribute", readSoftwareDiagnosticsAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readSoftwareDiagnosticsFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readElectricalMeasurementRmsCurrentMaxAttributeInteractionInfo =
+    InteractionInfo readSoftwareDiagnosticsFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ElectricalMeasurementCluster) cluster)
-                  .readRmsCurrentMaxAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readElectricalMeasurementRmsCurrentMaxCommandParams);
-    readElectricalMeasurementInteractionInfo.put(
-        "readRmsCurrentMaxAttribute",
-        readElectricalMeasurementRmsCurrentMaxAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readElectricalMeasurementActivePowerCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readSoftwareDiagnosticsFeatureMapCommandParams);
+    readSoftwareDiagnosticsInteractionInfo.put(
+        "readFeatureMapAttribute", readSoftwareDiagnosticsFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readSoftwareDiagnosticsClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readElectricalMeasurementActivePowerAttributeInteractionInfo =
+    InteractionInfo readSoftwareDiagnosticsClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ElectricalMeasurementCluster) cluster)
-                  .readActivePowerAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readElectricalMeasurementActivePowerCommandParams);
-    readElectricalMeasurementInteractionInfo.put(
-        "readActivePowerAttribute", readElectricalMeasurementActivePowerAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readElectricalMeasurementActivePowerMinCommandParams =
+            readSoftwareDiagnosticsClusterRevisionCommandParams);
+    readSoftwareDiagnosticsInteractionInfo.put(
+        "readClusterRevisionAttribute",
+        readSoftwareDiagnosticsClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("softwareDiagnostics", readSoftwareDiagnosticsInteractionInfo);
+    Map<String, InteractionInfo> readThreadNetworkDiagnosticsInteractionInfo =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsChannelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readElectricalMeasurementActivePowerMinAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsChannelAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ElectricalMeasurementCluster) cluster)
-                  .readActivePowerMinAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readChannelAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster.ChannelAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readElectricalMeasurementActivePowerMinCommandParams);
-    readElectricalMeasurementInteractionInfo.put(
-        "readActivePowerMinAttribute",
-        readElectricalMeasurementActivePowerMinAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readElectricalMeasurementActivePowerMaxCommandParams =
+            readThreadNetworkDiagnosticsChannelCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readChannelAttribute", readThreadNetworkDiagnosticsChannelAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRoutingRoleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readElectricalMeasurementActivePowerMaxAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsRoutingRoleAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ElectricalMeasurementCluster) cluster)
-                  .readActivePowerMaxAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readRoutingRoleAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster.RoutingRoleAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readElectricalMeasurementActivePowerMaxCommandParams);
-    readElectricalMeasurementInteractionInfo.put(
-        "readActivePowerMaxAttribute",
-        readElectricalMeasurementActivePowerMaxAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readElectricalMeasurementGeneratedCommandListCommandParams =
+            readThreadNetworkDiagnosticsRoutingRoleCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readRoutingRoleAttribute",
+        readThreadNetworkDiagnosticsRoutingRoleAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsNetworkNameCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readElectricalMeasurementGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsNetworkNameAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ElectricalMeasurementCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.ElectricalMeasurementCluster
-                              .GeneratedCommandListAttributeCallback)
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readNetworkNameAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster.NetworkNameAttributeCallback)
                           callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedElectricalMeasurementClusterGeneratedCommandListAttributeCallback(),
-            readElectricalMeasurementGeneratedCommandListCommandParams);
-    readElectricalMeasurementInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readElectricalMeasurementGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readElectricalMeasurementAcceptedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readThreadNetworkDiagnosticsNetworkNameCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readNetworkNameAttribute",
+        readThreadNetworkDiagnosticsNetworkNameAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsPanIdCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readElectricalMeasurementAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsPanIdAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ElectricalMeasurementCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.ElectricalMeasurementCluster
-                              .AcceptedCommandListAttributeCallback)
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readPanIdAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster.PanIdAttributeCallback)
                           callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedElectricalMeasurementClusterAcceptedCommandListAttributeCallback(),
-            readElectricalMeasurementAcceptedCommandListCommandParams);
-    readElectricalMeasurementInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readElectricalMeasurementAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readElectricalMeasurementAttributeListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readThreadNetworkDiagnosticsPanIdCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readPanIdAttribute", readThreadNetworkDiagnosticsPanIdAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsExtendedPanIdCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readElectricalMeasurementAttributeListAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsExtendedPanIdAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ElectricalMeasurementCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.ElectricalMeasurementCluster.AttributeListAttributeCallback)
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readExtendedPanIdAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster.ExtendedPanIdAttributeCallback)
                           callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedElectricalMeasurementClusterAttributeListAttributeCallback(),
-            readElectricalMeasurementAttributeListCommandParams);
-    readElectricalMeasurementInteractionInfo.put(
-        "readAttributeListAttribute",
-        readElectricalMeasurementAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readElectricalMeasurementFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsExtendedPanIdCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readExtendedPanIdAttribute",
+        readThreadNetworkDiagnosticsExtendedPanIdAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsMeshLocalPrefixCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readElectricalMeasurementFeatureMapAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsMeshLocalPrefixAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ElectricalMeasurementCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readMeshLocalPrefixAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster
+                              .MeshLocalPrefixAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readElectricalMeasurementFeatureMapCommandParams);
-    readElectricalMeasurementInteractionInfo.put(
-        "readFeatureMapAttribute", readElectricalMeasurementFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readElectricalMeasurementClusterRevisionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedOctetStringAttributeCallback(),
+            readThreadNetworkDiagnosticsMeshLocalPrefixCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readMeshLocalPrefixAttribute",
+        readThreadNetworkDiagnosticsMeshLocalPrefixAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsOverrunCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readElectricalMeasurementClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsOverrunCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ElectricalMeasurementCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readOverrunCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readElectricalMeasurementClusterRevisionCommandParams);
-    readElectricalMeasurementInteractionInfo.put(
-        "readClusterRevisionAttribute",
-        readElectricalMeasurementClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("electricalMeasurement", readElectricalMeasurementInteractionInfo);
-    Map<String, InteractionInfo> readEthernetNetworkDiagnosticsInteractionInfo =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readEthernetNetworkDiagnosticsPHYRateCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsOverrunCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readOverrunCountAttribute",
+        readThreadNetworkDiagnosticsOverrunCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsNeighborTableListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readEthernetNetworkDiagnosticsPHYRateAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsNeighborTableListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
-                  .readPHYRateAttribute(
-                      (ChipClusters.EthernetNetworkDiagnosticsCluster.PHYRateAttributeCallback)
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readNeighborTableListAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster
+                              .NeighborTableListAttributeCallback)
                           callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readEthernetNetworkDiagnosticsPHYRateCommandParams);
-    readEthernetNetworkDiagnosticsInteractionInfo.put(
-        "readPHYRateAttribute", readEthernetNetworkDiagnosticsPHYRateAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readEthernetNetworkDiagnosticsFullDuplexCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedThreadNetworkDiagnosticsClusterNeighborTableListAttributeCallback(),
+            readThreadNetworkDiagnosticsNeighborTableListCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readNeighborTableListAttribute",
+        readThreadNetworkDiagnosticsNeighborTableListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRouteTableListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readEthernetNetworkDiagnosticsFullDuplexAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsRouteTableListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
-                  .readFullDuplexAttribute(
-                      (ChipClusters.EthernetNetworkDiagnosticsCluster.FullDuplexAttributeCallback)
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readRouteTableListAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster.RouteTableListAttributeCallback)
                           callback);
             },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readEthernetNetworkDiagnosticsFullDuplexCommandParams);
-    readEthernetNetworkDiagnosticsInteractionInfo.put(
-        "readFullDuplexAttribute",
-        readEthernetNetworkDiagnosticsFullDuplexAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readEthernetNetworkDiagnosticsPacketRxCountCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedThreadNetworkDiagnosticsClusterRouteTableListAttributeCallback(),
+            readThreadNetworkDiagnosticsRouteTableListCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readRouteTableListAttribute",
+        readThreadNetworkDiagnosticsRouteTableListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsPartitionIdCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readEthernetNetworkDiagnosticsPacketRxCountAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsPartitionIdAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
-                  .readPacketRxCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readPartitionIdAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster.PartitionIdAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readEthernetNetworkDiagnosticsPacketRxCountCommandParams);
-    readEthernetNetworkDiagnosticsInteractionInfo.put(
-        "readPacketRxCountAttribute",
-        readEthernetNetworkDiagnosticsPacketRxCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readEthernetNetworkDiagnosticsPacketTxCountCommandParams =
+            readThreadNetworkDiagnosticsPartitionIdCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readPartitionIdAttribute",
+        readThreadNetworkDiagnosticsPartitionIdAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsWeightingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readEthernetNetworkDiagnosticsPacketTxCountAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsWeightingAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
-                  .readPacketTxCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readWeightingAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster.WeightingAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readEthernetNetworkDiagnosticsPacketTxCountCommandParams);
-    readEthernetNetworkDiagnosticsInteractionInfo.put(
-        "readPacketTxCountAttribute",
-        readEthernetNetworkDiagnosticsPacketTxCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readEthernetNetworkDiagnosticsTxErrCountCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readThreadNetworkDiagnosticsWeightingCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readWeightingAttribute", readThreadNetworkDiagnosticsWeightingAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsDataVersionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readEthernetNetworkDiagnosticsTxErrCountAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsDataVersionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
-                  .readTxErrCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readDataVersionAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster.DataVersionAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readEthernetNetworkDiagnosticsTxErrCountCommandParams);
-    readEthernetNetworkDiagnosticsInteractionInfo.put(
-        "readTxErrCountAttribute",
-        readEthernetNetworkDiagnosticsTxErrCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readEthernetNetworkDiagnosticsCollisionCountCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readThreadNetworkDiagnosticsDataVersionCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readDataVersionAttribute",
+        readThreadNetworkDiagnosticsDataVersionAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsStableDataVersionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readEthernetNetworkDiagnosticsCollisionCountAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsStableDataVersionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
-                  .readCollisionCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readStableDataVersionAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster
+                              .StableDataVersionAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readEthernetNetworkDiagnosticsCollisionCountCommandParams);
-    readEthernetNetworkDiagnosticsInteractionInfo.put(
-        "readCollisionCountAttribute",
-        readEthernetNetworkDiagnosticsCollisionCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readEthernetNetworkDiagnosticsOverrunCountCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readThreadNetworkDiagnosticsStableDataVersionCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readStableDataVersionAttribute",
+        readThreadNetworkDiagnosticsStableDataVersionAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsLeaderRouterIdCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readEthernetNetworkDiagnosticsOverrunCountAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsLeaderRouterIdAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
-                  .readOverrunCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readLeaderRouterIdAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster.LeaderRouterIdAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readEthernetNetworkDiagnosticsOverrunCountCommandParams);
-    readEthernetNetworkDiagnosticsInteractionInfo.put(
-        "readOverrunCountAttribute",
-        readEthernetNetworkDiagnosticsOverrunCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readEthernetNetworkDiagnosticsCarrierDetectCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readThreadNetworkDiagnosticsLeaderRouterIdCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readLeaderRouterIdAttribute",
+        readThreadNetworkDiagnosticsLeaderRouterIdAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsDetachedRoleCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readEthernetNetworkDiagnosticsCarrierDetectAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsDetachedRoleCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
-                  .readCarrierDetectAttribute(
-                      (ChipClusters.EthernetNetworkDiagnosticsCluster
-                              .CarrierDetectAttributeCallback)
-                          callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readEthernetNetworkDiagnosticsCarrierDetectCommandParams);
-    readEthernetNetworkDiagnosticsInteractionInfo.put(
-        "readCarrierDetectAttribute",
-        readEthernetNetworkDiagnosticsCarrierDetectAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readEthernetNetworkDiagnosticsTimeSinceResetCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readEthernetNetworkDiagnosticsTimeSinceResetAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
-                  .readTimeSinceResetAttribute((ChipClusters.LongAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readEthernetNetworkDiagnosticsTimeSinceResetCommandParams);
-    readEthernetNetworkDiagnosticsInteractionInfo.put(
-        "readTimeSinceResetAttribute",
-        readEthernetNetworkDiagnosticsTimeSinceResetAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readEthernetNetworkDiagnosticsGeneratedCommandListCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readEthernetNetworkDiagnosticsGeneratedCommandListAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.EthernetNetworkDiagnosticsCluster
-                              .GeneratedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readDetachedRoleCountAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedEthernetNetworkDiagnosticsClusterGeneratedCommandListAttributeCallback(),
-            readEthernetNetworkDiagnosticsGeneratedCommandListCommandParams);
-    readEthernetNetworkDiagnosticsInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readEthernetNetworkDiagnosticsGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readEthernetNetworkDiagnosticsAcceptedCommandListCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readEthernetNetworkDiagnosticsAcceptedCommandListAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readThreadNetworkDiagnosticsDetachedRoleCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readDetachedRoleCountAttribute",
+        readThreadNetworkDiagnosticsDetachedRoleCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsChildRoleCountCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readThreadNetworkDiagnosticsChildRoleCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.EthernetNetworkDiagnosticsCluster
-                              .AcceptedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readChildRoleCountAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedEthernetNetworkDiagnosticsClusterAcceptedCommandListAttributeCallback(),
-            readEthernetNetworkDiagnosticsAcceptedCommandListCommandParams);
-    readEthernetNetworkDiagnosticsInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readEthernetNetworkDiagnosticsAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readEthernetNetworkDiagnosticsAttributeListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readThreadNetworkDiagnosticsChildRoleCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readChildRoleCountAttribute",
+        readThreadNetworkDiagnosticsChildRoleCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRouterRoleCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readEthernetNetworkDiagnosticsAttributeListAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsRouterRoleCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.EthernetNetworkDiagnosticsCluster
-                              .AttributeListAttributeCallback)
-                          callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readRouterRoleCountAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedEthernetNetworkDiagnosticsClusterAttributeListAttributeCallback(),
-            readEthernetNetworkDiagnosticsAttributeListCommandParams);
-    readEthernetNetworkDiagnosticsInteractionInfo.put(
-        "readAttributeListAttribute",
-        readEthernetNetworkDiagnosticsAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readEthernetNetworkDiagnosticsFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readThreadNetworkDiagnosticsRouterRoleCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readRouterRoleCountAttribute",
+        readThreadNetworkDiagnosticsRouterRoleCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsLeaderRoleCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readEthernetNetworkDiagnosticsFeatureMapAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsLeaderRoleCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readLeaderRoleCountAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readEthernetNetworkDiagnosticsFeatureMapCommandParams);
-    readEthernetNetworkDiagnosticsInteractionInfo.put(
-        "readFeatureMapAttribute",
-        readEthernetNetworkDiagnosticsFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readEthernetNetworkDiagnosticsClusterRevisionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readThreadNetworkDiagnosticsLeaderRoleCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readLeaderRoleCountAttribute",
+        readThreadNetworkDiagnosticsLeaderRoleCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsAttachAttemptCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readEthernetNetworkDiagnosticsClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsAttachAttemptCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readAttachAttemptCountAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readEthernetNetworkDiagnosticsClusterRevisionCommandParams);
-    readEthernetNetworkDiagnosticsInteractionInfo.put(
-        "readClusterRevisionAttribute",
-        readEthernetNetworkDiagnosticsClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put(
-        "ethernetNetworkDiagnostics", readEthernetNetworkDiagnosticsInteractionInfo);
-    Map<String, InteractionInfo> readFanControlInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readFanControlFanModeCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFanControlFanModeAttributeInteractionInfo =
+            readThreadNetworkDiagnosticsAttachAttemptCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readAttachAttemptCountAttribute",
+        readThreadNetworkDiagnosticsAttachAttemptCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readThreadNetworkDiagnosticsPartitionIdChangeCountCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readThreadNetworkDiagnosticsPartitionIdChangeCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FanControlCluster) cluster)
-                  .readFanModeAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readPartitionIdChangeCountAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readFanControlFanModeCommandParams);
-    readFanControlInteractionInfo.put(
-        "readFanModeAttribute", readFanControlFanModeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFanControlFanModeSequenceCommandParams =
+            readThreadNetworkDiagnosticsPartitionIdChangeCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readPartitionIdChangeCountAttribute",
+        readThreadNetworkDiagnosticsPartitionIdChangeCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readThreadNetworkDiagnosticsBetterPartitionAttachAttemptCountCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo
+        readThreadNetworkDiagnosticsBetterPartitionAttachAttemptCountAttributeInteractionInfo =
+            new InteractionInfo(
+                (cluster, callback, commandArguments) -> {
+                  ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                      .readBetterPartitionAttachAttemptCountAttribute(
+                          (ChipClusters.IntegerAttributeCallback) callback);
+                },
+                () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+                readThreadNetworkDiagnosticsBetterPartitionAttachAttemptCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readBetterPartitionAttachAttemptCountAttribute",
+        readThreadNetworkDiagnosticsBetterPartitionAttachAttemptCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsParentChangeCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFanControlFanModeSequenceAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsParentChangeCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FanControlCluster) cluster)
-                  .readFanModeSequenceAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readParentChangeCountAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readFanControlFanModeSequenceCommandParams);
-    readFanControlInteractionInfo.put(
-        "readFanModeSequenceAttribute", readFanControlFanModeSequenceAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFanControlPercentSettingCommandParams =
+            readThreadNetworkDiagnosticsParentChangeCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readParentChangeCountAttribute",
+        readThreadNetworkDiagnosticsParentChangeCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsTxTotalCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFanControlPercentSettingAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsTxTotalCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FanControlCluster) cluster)
-                  .readPercentSettingAttribute(
-                      (ChipClusters.FanControlCluster.PercentSettingAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readTxTotalCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readFanControlPercentSettingCommandParams);
-    readFanControlInteractionInfo.put(
-        "readPercentSettingAttribute", readFanControlPercentSettingAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFanControlPercentCurrentCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsTxTotalCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readTxTotalCountAttribute",
+        readThreadNetworkDiagnosticsTxTotalCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsTxUnicastCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFanControlPercentCurrentAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsTxUnicastCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FanControlCluster) cluster)
-                  .readPercentCurrentAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readTxUnicastCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readFanControlPercentCurrentCommandParams);
-    readFanControlInteractionInfo.put(
-        "readPercentCurrentAttribute", readFanControlPercentCurrentAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFanControlSpeedMaxCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsTxUnicastCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readTxUnicastCountAttribute",
+        readThreadNetworkDiagnosticsTxUnicastCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsTxBroadcastCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFanControlSpeedMaxAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsTxBroadcastCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FanControlCluster) cluster)
-                  .readSpeedMaxAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readTxBroadcastCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readFanControlSpeedMaxCommandParams);
-    readFanControlInteractionInfo.put(
-        "readSpeedMaxAttribute", readFanControlSpeedMaxAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFanControlSpeedSettingCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsTxBroadcastCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readTxBroadcastCountAttribute",
+        readThreadNetworkDiagnosticsTxBroadcastCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsTxAckRequestedCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFanControlSpeedSettingAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsTxAckRequestedCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FanControlCluster) cluster)
-                  .readSpeedSettingAttribute(
-                      (ChipClusters.FanControlCluster.SpeedSettingAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readTxAckRequestedCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readFanControlSpeedSettingCommandParams);
-    readFanControlInteractionInfo.put(
-        "readSpeedSettingAttribute", readFanControlSpeedSettingAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFanControlSpeedCurrentCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsTxAckRequestedCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readTxAckRequestedCountAttribute",
+        readThreadNetworkDiagnosticsTxAckRequestedCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsTxAckedCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFanControlSpeedCurrentAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsTxAckedCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FanControlCluster) cluster)
-                  .readSpeedCurrentAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readTxAckedCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readFanControlSpeedCurrentCommandParams);
-    readFanControlInteractionInfo.put(
-        "readSpeedCurrentAttribute", readFanControlSpeedCurrentAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFanControlRockSupportCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFanControlRockSupportAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsTxAckedCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readTxAckedCountAttribute",
+        readThreadNetworkDiagnosticsTxAckedCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readThreadNetworkDiagnosticsTxNoAckRequestedCountCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readThreadNetworkDiagnosticsTxNoAckRequestedCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FanControlCluster) cluster)
-                  .readRockSupportAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readTxNoAckRequestedCountAttribute(
+                      (ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readFanControlRockSupportCommandParams);
-    readFanControlInteractionInfo.put(
-        "readRockSupportAttribute", readFanControlRockSupportAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFanControlRockSettingCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsTxNoAckRequestedCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readTxNoAckRequestedCountAttribute",
+        readThreadNetworkDiagnosticsTxNoAckRequestedCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsTxDataCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFanControlRockSettingAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsTxDataCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FanControlCluster) cluster)
-                  .readRockSettingAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readTxDataCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readFanControlRockSettingCommandParams);
-    readFanControlInteractionInfo.put(
-        "readRockSettingAttribute", readFanControlRockSettingAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFanControlWindSupportCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsTxDataCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readTxDataCountAttribute",
+        readThreadNetworkDiagnosticsTxDataCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsTxDataPollCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFanControlWindSupportAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsTxDataPollCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FanControlCluster) cluster)
-                  .readWindSupportAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readTxDataPollCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readFanControlWindSupportCommandParams);
-    readFanControlInteractionInfo.put(
-        "readWindSupportAttribute", readFanControlWindSupportAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFanControlWindSettingCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsTxDataPollCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readTxDataPollCountAttribute",
+        readThreadNetworkDiagnosticsTxDataPollCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsTxBeaconCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFanControlWindSettingAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsTxBeaconCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FanControlCluster) cluster)
-                  .readWindSettingAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readTxBeaconCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readFanControlWindSettingCommandParams);
-    readFanControlInteractionInfo.put(
-        "readWindSettingAttribute", readFanControlWindSettingAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFanControlGeneratedCommandListCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFanControlGeneratedCommandListAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsTxBeaconCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readTxBeaconCountAttribute",
+        readThreadNetworkDiagnosticsTxBeaconCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readThreadNetworkDiagnosticsTxBeaconRequestCountCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readThreadNetworkDiagnosticsTxBeaconRequestCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FanControlCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.FanControlCluster.GeneratedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readTxBeaconRequestCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedFanControlClusterGeneratedCommandListAttributeCallback(),
-            readFanControlGeneratedCommandListCommandParams);
-    readFanControlInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readFanControlGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFanControlAcceptedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsTxBeaconRequestCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readTxBeaconRequestCountAttribute",
+        readThreadNetworkDiagnosticsTxBeaconRequestCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsTxOtherCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFanControlAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsTxOtherCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FanControlCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.FanControlCluster.AcceptedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readTxOtherCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedFanControlClusterAcceptedCommandListAttributeCallback(),
-            readFanControlAcceptedCommandListCommandParams);
-    readFanControlInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readFanControlAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFanControlAttributeListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsTxOtherCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readTxOtherCountAttribute",
+        readThreadNetworkDiagnosticsTxOtherCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsTxRetryCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFanControlAttributeListAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsTxRetryCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FanControlCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.FanControlCluster.AttributeListAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readTxRetryCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedFanControlClusterAttributeListAttributeCallback(),
-            readFanControlAttributeListCommandParams);
-    readFanControlInteractionInfo.put(
-        "readAttributeListAttribute", readFanControlAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFanControlFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsTxRetryCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readTxRetryCountAttribute",
+        readThreadNetworkDiagnosticsTxRetryCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCountCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo
+        readThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCountAttributeInteractionInfo =
+            new InteractionInfo(
+                (cluster, callback, commandArguments) -> {
+                  ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                      .readTxDirectMaxRetryExpiryCountAttribute(
+                          (ChipClusters.LongAttributeCallback) callback);
+                },
+                () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+                readThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readTxDirectMaxRetryExpiryCountAttribute",
+        readThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCountCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo
+        readThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCountAttributeInteractionInfo =
+            new InteractionInfo(
+                (cluster, callback, commandArguments) -> {
+                  ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                      .readTxIndirectMaxRetryExpiryCountAttribute(
+                          (ChipClusters.LongAttributeCallback) callback);
+                },
+                () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+                readThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readTxIndirectMaxRetryExpiryCountAttribute",
+        readThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsTxErrCcaCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFanControlFeatureMapAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsTxErrCcaCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FanControlCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readTxErrCcaCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readFanControlFeatureMapCommandParams);
-    readFanControlInteractionInfo.put(
-        "readFeatureMapAttribute", readFanControlFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFanControlClusterRevisionCommandParams =
+            readThreadNetworkDiagnosticsTxErrCcaCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readTxErrCcaCountAttribute",
+        readThreadNetworkDiagnosticsTxErrCcaCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsTxErrAbortCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFanControlClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsTxErrAbortCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FanControlCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readTxErrAbortCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readFanControlClusterRevisionCommandParams);
-    readFanControlInteractionInfo.put(
-        "readClusterRevisionAttribute", readFanControlClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("fanControl", readFanControlInteractionInfo);
-    Map<String, InteractionInfo> readFixedLabelInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readFixedLabelLabelListCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFixedLabelLabelListAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsTxErrAbortCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readTxErrAbortCountAttribute",
+        readThreadNetworkDiagnosticsTxErrAbortCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readThreadNetworkDiagnosticsTxErrBusyChannelCountCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readThreadNetworkDiagnosticsTxErrBusyChannelCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FixedLabelCluster) cluster)
-                  .readLabelListAttribute(
-                      (ChipClusters.FixedLabelCluster.LabelListAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readTxErrBusyChannelCountAttribute(
+                      (ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedFixedLabelClusterLabelListAttributeCallback(),
-            readFixedLabelLabelListCommandParams);
-    readFixedLabelInteractionInfo.put(
-        "readLabelListAttribute", readFixedLabelLabelListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFixedLabelGeneratedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsTxErrBusyChannelCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readTxErrBusyChannelCountAttribute",
+        readThreadNetworkDiagnosticsTxErrBusyChannelCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRxTotalCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFixedLabelGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsRxTotalCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FixedLabelCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.FixedLabelCluster.GeneratedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readRxTotalCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedFixedLabelClusterGeneratedCommandListAttributeCallback(),
-            readFixedLabelGeneratedCommandListCommandParams);
-    readFixedLabelInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readFixedLabelGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFixedLabelAcceptedCommandListCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFixedLabelAcceptedCommandListAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsRxTotalCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readRxTotalCountAttribute",
+        readThreadNetworkDiagnosticsRxTotalCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRxUnicastCountCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readThreadNetworkDiagnosticsRxUnicastCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FixedLabelCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.FixedLabelCluster.AcceptedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readRxUnicastCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedFixedLabelClusterAcceptedCommandListAttributeCallback(),
-            readFixedLabelAcceptedCommandListCommandParams);
-    readFixedLabelInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readFixedLabelAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFixedLabelAttributeListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsRxUnicastCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readRxUnicastCountAttribute",
+        readThreadNetworkDiagnosticsRxUnicastCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRxBroadcastCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFixedLabelAttributeListAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsRxBroadcastCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FixedLabelCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.FixedLabelCluster.AttributeListAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readRxBroadcastCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedFixedLabelClusterAttributeListAttributeCallback(),
-            readFixedLabelAttributeListCommandParams);
-    readFixedLabelInteractionInfo.put(
-        "readAttributeListAttribute", readFixedLabelAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFixedLabelFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsRxBroadcastCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readRxBroadcastCountAttribute",
+        readThreadNetworkDiagnosticsRxBroadcastCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRxDataCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFixedLabelFeatureMapAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsRxDataCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FixedLabelCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readRxDataCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readFixedLabelFeatureMapCommandParams);
-    readFixedLabelInteractionInfo.put(
-        "readFeatureMapAttribute", readFixedLabelFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFixedLabelClusterRevisionCommandParams =
+            readThreadNetworkDiagnosticsRxDataCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readRxDataCountAttribute",
+        readThreadNetworkDiagnosticsRxDataCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRxDataPollCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFixedLabelClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsRxDataPollCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FixedLabelCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readRxDataPollCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readFixedLabelClusterRevisionCommandParams);
-    readFixedLabelInteractionInfo.put(
-        "readClusterRevisionAttribute", readFixedLabelClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("fixedLabel", readFixedLabelInteractionInfo);
-    Map<String, InteractionInfo> readFlowMeasurementInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readFlowMeasurementMeasuredValueCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsRxDataPollCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readRxDataPollCountAttribute",
+        readThreadNetworkDiagnosticsRxDataPollCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRxBeaconCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFlowMeasurementMeasuredValueAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsRxBeaconCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FlowMeasurementCluster) cluster)
-                  .readMeasuredValueAttribute(
-                      (ChipClusters.FlowMeasurementCluster.MeasuredValueAttributeCallback)
-                          callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readRxBeaconCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readFlowMeasurementMeasuredValueCommandParams);
-    readFlowMeasurementInteractionInfo.put(
-        "readMeasuredValueAttribute", readFlowMeasurementMeasuredValueAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFlowMeasurementMinMeasuredValueCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFlowMeasurementMinMeasuredValueAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsRxBeaconCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readRxBeaconCountAttribute",
+        readThreadNetworkDiagnosticsRxBeaconCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readThreadNetworkDiagnosticsRxBeaconRequestCountCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readThreadNetworkDiagnosticsRxBeaconRequestCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FlowMeasurementCluster) cluster)
-                  .readMinMeasuredValueAttribute(
-                      (ChipClusters.FlowMeasurementCluster.MinMeasuredValueAttributeCallback)
-                          callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readRxBeaconRequestCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readFlowMeasurementMinMeasuredValueCommandParams);
-    readFlowMeasurementInteractionInfo.put(
-        "readMinMeasuredValueAttribute",
-        readFlowMeasurementMinMeasuredValueAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFlowMeasurementMaxMeasuredValueCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsRxBeaconRequestCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readRxBeaconRequestCountAttribute",
+        readThreadNetworkDiagnosticsRxBeaconRequestCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRxOtherCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFlowMeasurementMaxMeasuredValueAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsRxOtherCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FlowMeasurementCluster) cluster)
-                  .readMaxMeasuredValueAttribute(
-                      (ChipClusters.FlowMeasurementCluster.MaxMeasuredValueAttributeCallback)
-                          callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readRxOtherCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readFlowMeasurementMaxMeasuredValueCommandParams);
-    readFlowMeasurementInteractionInfo.put(
-        "readMaxMeasuredValueAttribute",
-        readFlowMeasurementMaxMeasuredValueAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFlowMeasurementToleranceCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFlowMeasurementToleranceAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsRxOtherCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readRxOtherCountAttribute",
+        readThreadNetworkDiagnosticsRxOtherCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readThreadNetworkDiagnosticsRxAddressFilteredCountCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readThreadNetworkDiagnosticsRxAddressFilteredCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FlowMeasurementCluster) cluster)
-                  .readToleranceAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readRxAddressFilteredCountAttribute(
+                      (ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readFlowMeasurementToleranceCommandParams);
-    readFlowMeasurementInteractionInfo.put(
-        "readToleranceAttribute", readFlowMeasurementToleranceAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFlowMeasurementGeneratedCommandListCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFlowMeasurementGeneratedCommandListAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsRxAddressFilteredCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readRxAddressFilteredCountAttribute",
+        readThreadNetworkDiagnosticsRxAddressFilteredCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readThreadNetworkDiagnosticsRxDestAddrFilteredCountCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readThreadNetworkDiagnosticsRxDestAddrFilteredCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FlowMeasurementCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.FlowMeasurementCluster.GeneratedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readRxDestAddrFilteredCountAttribute(
+                      (ChipClusters.LongAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedFlowMeasurementClusterGeneratedCommandListAttributeCallback(),
-            readFlowMeasurementGeneratedCommandListCommandParams);
-    readFlowMeasurementInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readFlowMeasurementGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFlowMeasurementAcceptedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsRxDestAddrFilteredCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readRxDestAddrFilteredCountAttribute",
+        readThreadNetworkDiagnosticsRxDestAddrFilteredCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRxDuplicatedCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFlowMeasurementAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsRxDuplicatedCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FlowMeasurementCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.FlowMeasurementCluster.AcceptedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readRxDuplicatedCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedFlowMeasurementClusterAcceptedCommandListAttributeCallback(),
-            readFlowMeasurementAcceptedCommandListCommandParams);
-    readFlowMeasurementInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readFlowMeasurementAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFlowMeasurementAttributeListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsRxDuplicatedCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readRxDuplicatedCountAttribute",
+        readThreadNetworkDiagnosticsRxDuplicatedCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRxErrNoFrameCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFlowMeasurementAttributeListAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsRxErrNoFrameCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FlowMeasurementCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.FlowMeasurementCluster.AttributeListAttributeCallback)
-                          callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readRxErrNoFrameCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedFlowMeasurementClusterAttributeListAttributeCallback(),
-            readFlowMeasurementAttributeListCommandParams);
-    readFlowMeasurementInteractionInfo.put(
-        "readAttributeListAttribute", readFlowMeasurementAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFlowMeasurementFeatureMapCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFlowMeasurementFeatureMapAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsRxErrNoFrameCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readRxErrNoFrameCountAttribute",
+        readThreadNetworkDiagnosticsRxErrNoFrameCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readThreadNetworkDiagnosticsRxErrUnknownNeighborCountCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readThreadNetworkDiagnosticsRxErrUnknownNeighborCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FlowMeasurementCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readRxErrUnknownNeighborCountAttribute(
+                      (ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readFlowMeasurementFeatureMapCommandParams);
-    readFlowMeasurementInteractionInfo.put(
-        "readFeatureMapAttribute", readFlowMeasurementFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readFlowMeasurementClusterRevisionCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readFlowMeasurementClusterRevisionAttributeInteractionInfo =
+            readThreadNetworkDiagnosticsRxErrUnknownNeighborCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readRxErrUnknownNeighborCountAttribute",
+        readThreadNetworkDiagnosticsRxErrUnknownNeighborCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readThreadNetworkDiagnosticsRxErrInvalidSrcAddrCountCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readThreadNetworkDiagnosticsRxErrInvalidSrcAddrCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FlowMeasurementCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readRxErrInvalidSrcAddrCountAttribute(
+                      (ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readFlowMeasurementClusterRevisionCommandParams);
-    readFlowMeasurementInteractionInfo.put(
-        "readClusterRevisionAttribute", readFlowMeasurementClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("flowMeasurement", readFlowMeasurementInteractionInfo);
-    Map<String, InteractionInfo> readGeneralCommissioningInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readGeneralCommissioningBreadcrumbCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsRxErrInvalidSrcAddrCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readRxErrInvalidSrcAddrCountAttribute",
+        readThreadNetworkDiagnosticsRxErrInvalidSrcAddrCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRxErrSecCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGeneralCommissioningBreadcrumbAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsRxErrSecCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralCommissioningCluster) cluster)
-                  .readBreadcrumbAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readRxErrSecCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readGeneralCommissioningBreadcrumbCommandParams);
-    readGeneralCommissioningInteractionInfo.put(
-        "readBreadcrumbAttribute", readGeneralCommissioningBreadcrumbAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGeneralCommissioningRegulatoryConfigCommandParams =
+            readThreadNetworkDiagnosticsRxErrSecCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readRxErrSecCountAttribute",
+        readThreadNetworkDiagnosticsRxErrSecCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRxErrFcsCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGeneralCommissioningRegulatoryConfigAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsRxErrFcsCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralCommissioningCluster) cluster)
-                  .readRegulatoryConfigAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readRxErrFcsCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readGeneralCommissioningRegulatoryConfigCommandParams);
-    readGeneralCommissioningInteractionInfo.put(
-        "readRegulatoryConfigAttribute",
-        readGeneralCommissioningRegulatoryConfigAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGeneralCommissioningLocationCapabilityCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsRxErrFcsCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readRxErrFcsCountAttribute",
+        readThreadNetworkDiagnosticsRxErrFcsCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRxErrOtherCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGeneralCommissioningLocationCapabilityAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsRxErrOtherCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralCommissioningCluster) cluster)
-                  .readLocationCapabilityAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readRxErrOtherCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readGeneralCommissioningLocationCapabilityCommandParams);
-    readGeneralCommissioningInteractionInfo.put(
-        "readLocationCapabilityAttribute",
-        readGeneralCommissioningLocationCapabilityAttributeInteractionInfo);
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsRxErrOtherCountCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readRxErrOtherCountAttribute",
+        readThreadNetworkDiagnosticsRxErrOtherCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsActiveTimestampCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readThreadNetworkDiagnosticsActiveTimestampAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readActiveTimestampAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster
+                              .ActiveTimestampAttributeCallback)
+                          callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsActiveTimestampCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readActiveTimestampAttribute",
+        readThreadNetworkDiagnosticsActiveTimestampAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsPendingTimestampCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readThreadNetworkDiagnosticsPendingTimestampAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readPendingTimestampAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster
+                              .PendingTimestampAttributeCallback)
+                          callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsPendingTimestampCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readPendingTimestampAttribute",
+        readThreadNetworkDiagnosticsPendingTimestampAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsDelayCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readThreadNetworkDiagnosticsDelayAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readDelayAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster.DelayAttributeCallback)
+                          callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThreadNetworkDiagnosticsDelayCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readDelayAttribute", readThreadNetworkDiagnosticsDelayAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsChannelMaskCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readThreadNetworkDiagnosticsChannelMaskAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readChannelMaskAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster.ChannelMaskAttributeCallback)
+                          callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedOctetStringAttributeCallback(),
+            readThreadNetworkDiagnosticsChannelMaskCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readChannelMaskAttribute",
+        readThreadNetworkDiagnosticsChannelMaskAttributeInteractionInfo);
     Map<String, CommandParameterInfo>
-        readGeneralCommissioningSupportsConcurrentConnectionCommandParams =
+        readThreadNetworkDiagnosticsActiveNetworkFaultsListCommandParams =
             new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGeneralCommissioningSupportsConcurrentConnectionAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralCommissioningCluster) cluster)
-                  .readSupportsConcurrentConnectionAttribute(
-                      (ChipClusters.BooleanAttributeCallback) callback);
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .readActiveNetworkFaultsListAttribute(
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster
+                              .ActiveNetworkFaultsListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readGeneralCommissioningSupportsConcurrentConnectionCommandParams);
-    readGeneralCommissioningInteractionInfo.put(
-        "readSupportsConcurrentConnectionAttribute",
-        readGeneralCommissioningSupportsConcurrentConnectionAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGeneralCommissioningGeneratedCommandListCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGeneralCommissioningGeneratedCommandListAttributeInteractionInfo =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedThreadNetworkDiagnosticsClusterActiveNetworkFaultsListAttributeCallback(),
+            readThreadNetworkDiagnosticsActiveNetworkFaultsListCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readActiveNetworkFaultsListAttribute",
+        readThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readThreadNetworkDiagnosticsGeneratedCommandListCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readThreadNetworkDiagnosticsGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralCommissioningCluster) cluster)
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
                   .readGeneratedCommandListAttribute(
-                      (ChipClusters.GeneralCommissioningCluster
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster
                               .GeneratedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedGeneralCommissioningClusterGeneratedCommandListAttributeCallback(),
-            readGeneralCommissioningGeneratedCommandListCommandParams);
-    readGeneralCommissioningInteractionInfo.put(
+                    .DelegatedThreadNetworkDiagnosticsClusterGeneratedCommandListAttributeCallback(),
+            readThreadNetworkDiagnosticsGeneratedCommandListCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
         "readGeneratedCommandListAttribute",
-        readGeneralCommissioningGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGeneralCommissioningAcceptedCommandListCommandParams =
+        readThreadNetworkDiagnosticsGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGeneralCommissioningAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralCommissioningCluster) cluster)
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
                   .readAcceptedCommandListAttribute(
-                      (ChipClusters.GeneralCommissioningCluster
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster
                               .AcceptedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedGeneralCommissioningClusterAcceptedCommandListAttributeCallback(),
-            readGeneralCommissioningAcceptedCommandListCommandParams);
-    readGeneralCommissioningInteractionInfo.put(
+                    .DelegatedThreadNetworkDiagnosticsClusterAcceptedCommandListAttributeCallback(),
+            readThreadNetworkDiagnosticsAcceptedCommandListCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
         "readAcceptedCommandListAttribute",
-        readGeneralCommissioningAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGeneralCommissioningAttributeListCommandParams =
+        readThreadNetworkDiagnosticsAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGeneralCommissioningAttributeListAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralCommissioningCluster) cluster)
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.GeneralCommissioningCluster.AttributeListAttributeCallback)
+                      (ChipClusters.ThreadNetworkDiagnosticsCluster.AttributeListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedGeneralCommissioningClusterAttributeListAttributeCallback(),
-            readGeneralCommissioningAttributeListCommandParams);
-    readGeneralCommissioningInteractionInfo.put(
+                    .DelegatedThreadNetworkDiagnosticsClusterAttributeListAttributeCallback(),
+            readThreadNetworkDiagnosticsAttributeListCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
         "readAttributeListAttribute",
-        readGeneralCommissioningAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGeneralCommissioningFeatureMapCommandParams =
+        readThreadNetworkDiagnosticsAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGeneralCommissioningFeatureMapAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralCommissioningCluster) cluster)
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readGeneralCommissioningFeatureMapCommandParams);
-    readGeneralCommissioningInteractionInfo.put(
-        "readFeatureMapAttribute", readGeneralCommissioningFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGeneralCommissioningClusterRevisionCommandParams =
+            readThreadNetworkDiagnosticsFeatureMapCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
+        "readFeatureMapAttribute", readThreadNetworkDiagnosticsFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGeneralCommissioningClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readThreadNetworkDiagnosticsClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralCommissioningCluster) cluster)
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readGeneralCommissioningClusterRevisionCommandParams);
-    readGeneralCommissioningInteractionInfo.put(
+            readThreadNetworkDiagnosticsClusterRevisionCommandParams);
+    readThreadNetworkDiagnosticsInteractionInfo.put(
         "readClusterRevisionAttribute",
-        readGeneralCommissioningClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("generalCommissioning", readGeneralCommissioningInteractionInfo);
-    Map<String, InteractionInfo> readGeneralDiagnosticsInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readGeneralDiagnosticsNetworkInterfacesCommandParams =
+        readThreadNetworkDiagnosticsClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("threadNetworkDiagnostics", readThreadNetworkDiagnosticsInteractionInfo);
+    Map<String, InteractionInfo> readWiFiNetworkDiagnosticsInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsBssidCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGeneralDiagnosticsNetworkInterfacesAttributeInteractionInfo =
+    InteractionInfo readWiFiNetworkDiagnosticsBssidAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
-                  .readNetworkInterfacesAttribute(
-                      (ChipClusters.GeneralDiagnosticsCluster.NetworkInterfacesAttributeCallback)
-                          callback);
+              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
+                  .readBssidAttribute(
+                      (ChipClusters.WiFiNetworkDiagnosticsCluster.BssidAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedGeneralDiagnosticsClusterNetworkInterfacesAttributeCallback(),
-            readGeneralDiagnosticsNetworkInterfacesCommandParams);
-    readGeneralDiagnosticsInteractionInfo.put(
-        "readNetworkInterfacesAttribute",
-        readGeneralDiagnosticsNetworkInterfacesAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGeneralDiagnosticsRebootCountCommandParams =
+            () -> new ClusterInfoMapping.DelegatedOctetStringAttributeCallback(),
+            readWiFiNetworkDiagnosticsBssidCommandParams);
+    readWiFiNetworkDiagnosticsInteractionInfo.put(
+        "readBssidAttribute", readWiFiNetworkDiagnosticsBssidAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsSecurityTypeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGeneralDiagnosticsRebootCountAttributeInteractionInfo =
+    InteractionInfo readWiFiNetworkDiagnosticsSecurityTypeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
-                  .readRebootCountAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
+                  .readSecurityTypeAttribute(
+                      (ChipClusters.WiFiNetworkDiagnosticsCluster.SecurityTypeAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readGeneralDiagnosticsRebootCountCommandParams);
-    readGeneralDiagnosticsInteractionInfo.put(
-        "readRebootCountAttribute", readGeneralDiagnosticsRebootCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGeneralDiagnosticsUpTimeCommandParams =
+            readWiFiNetworkDiagnosticsSecurityTypeCommandParams);
+    readWiFiNetworkDiagnosticsInteractionInfo.put(
+        "readSecurityTypeAttribute",
+        readWiFiNetworkDiagnosticsSecurityTypeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsWiFiVersionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGeneralDiagnosticsUpTimeAttributeInteractionInfo =
+    InteractionInfo readWiFiNetworkDiagnosticsWiFiVersionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
-                  .readUpTimeAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
+                  .readWiFiVersionAttribute(
+                      (ChipClusters.WiFiNetworkDiagnosticsCluster.WiFiVersionAttributeCallback)
+                          callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readWiFiNetworkDiagnosticsWiFiVersionCommandParams);
+    readWiFiNetworkDiagnosticsInteractionInfo.put(
+        "readWiFiVersionAttribute", readWiFiNetworkDiagnosticsWiFiVersionAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsChannelNumberCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readWiFiNetworkDiagnosticsChannelNumberAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
+                  .readChannelNumberAttribute(
+                      (ChipClusters.WiFiNetworkDiagnosticsCluster.ChannelNumberAttributeCallback)
+                          callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readWiFiNetworkDiagnosticsChannelNumberCommandParams);
+    readWiFiNetworkDiagnosticsInteractionInfo.put(
+        "readChannelNumberAttribute",
+        readWiFiNetworkDiagnosticsChannelNumberAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsRssiCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readWiFiNetworkDiagnosticsRssiAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
+                  .readRssiAttribute(
+                      (ChipClusters.WiFiNetworkDiagnosticsCluster.RssiAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readWiFiNetworkDiagnosticsRssiCommandParams);
+    readWiFiNetworkDiagnosticsInteractionInfo.put(
+        "readRssiAttribute", readWiFiNetworkDiagnosticsRssiAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsBeaconLostCountCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readWiFiNetworkDiagnosticsBeaconLostCountAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
+                  .readBeaconLostCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readGeneralDiagnosticsUpTimeCommandParams);
-    readGeneralDiagnosticsInteractionInfo.put(
-        "readUpTimeAttribute", readGeneralDiagnosticsUpTimeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGeneralDiagnosticsTotalOperationalHoursCommandParams =
+            readWiFiNetworkDiagnosticsBeaconLostCountCommandParams);
+    readWiFiNetworkDiagnosticsInteractionInfo.put(
+        "readBeaconLostCountAttribute",
+        readWiFiNetworkDiagnosticsBeaconLostCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsBeaconRxCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGeneralDiagnosticsTotalOperationalHoursAttributeInteractionInfo =
+    InteractionInfo readWiFiNetworkDiagnosticsBeaconRxCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
-                  .readTotalOperationalHoursAttribute(
+              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
+                  .readBeaconRxCountAttribute((ChipClusters.LongAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readWiFiNetworkDiagnosticsBeaconRxCountCommandParams);
+    readWiFiNetworkDiagnosticsInteractionInfo.put(
+        "readBeaconRxCountAttribute",
+        readWiFiNetworkDiagnosticsBeaconRxCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readWiFiNetworkDiagnosticsPacketMulticastRxCountCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readWiFiNetworkDiagnosticsPacketMulticastRxCountAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
+                  .readPacketMulticastRxCountAttribute(
                       (ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readGeneralDiagnosticsTotalOperationalHoursCommandParams);
-    readGeneralDiagnosticsInteractionInfo.put(
-        "readTotalOperationalHoursAttribute",
-        readGeneralDiagnosticsTotalOperationalHoursAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGeneralDiagnosticsBootReasonsCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGeneralDiagnosticsBootReasonsAttributeInteractionInfo =
+            readWiFiNetworkDiagnosticsPacketMulticastRxCountCommandParams);
+    readWiFiNetworkDiagnosticsInteractionInfo.put(
+        "readPacketMulticastRxCountAttribute",
+        readWiFiNetworkDiagnosticsPacketMulticastRxCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readWiFiNetworkDiagnosticsPacketMulticastTxCountCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readWiFiNetworkDiagnosticsPacketMulticastTxCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
-                  .readBootReasonsAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
+                  .readPacketMulticastTxCountAttribute(
+                      (ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readGeneralDiagnosticsBootReasonsCommandParams);
-    readGeneralDiagnosticsInteractionInfo.put(
-        "readBootReasonsAttribute", readGeneralDiagnosticsBootReasonsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGeneralDiagnosticsActiveHardwareFaultsCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readWiFiNetworkDiagnosticsPacketMulticastTxCountCommandParams);
+    readWiFiNetworkDiagnosticsInteractionInfo.put(
+        "readPacketMulticastTxCountAttribute",
+        readWiFiNetworkDiagnosticsPacketMulticastTxCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsPacketUnicastRxCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGeneralDiagnosticsActiveHardwareFaultsAttributeInteractionInfo =
+    InteractionInfo readWiFiNetworkDiagnosticsPacketUnicastRxCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
-                  .readActiveHardwareFaultsAttribute(
-                      (ChipClusters.GeneralDiagnosticsCluster.ActiveHardwareFaultsAttributeCallback)
-                          callback);
+              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
+                  .readPacketUnicastRxCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedGeneralDiagnosticsClusterActiveHardwareFaultsAttributeCallback(),
-            readGeneralDiagnosticsActiveHardwareFaultsCommandParams);
-    readGeneralDiagnosticsInteractionInfo.put(
-        "readActiveHardwareFaultsAttribute",
-        readGeneralDiagnosticsActiveHardwareFaultsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGeneralDiagnosticsActiveRadioFaultsCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readWiFiNetworkDiagnosticsPacketUnicastRxCountCommandParams);
+    readWiFiNetworkDiagnosticsInteractionInfo.put(
+        "readPacketUnicastRxCountAttribute",
+        readWiFiNetworkDiagnosticsPacketUnicastRxCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsPacketUnicastTxCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGeneralDiagnosticsActiveRadioFaultsAttributeInteractionInfo =
+    InteractionInfo readWiFiNetworkDiagnosticsPacketUnicastTxCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
-                  .readActiveRadioFaultsAttribute(
-                      (ChipClusters.GeneralDiagnosticsCluster.ActiveRadioFaultsAttributeCallback)
-                          callback);
+              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
+                  .readPacketUnicastTxCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedGeneralDiagnosticsClusterActiveRadioFaultsAttributeCallback(),
-            readGeneralDiagnosticsActiveRadioFaultsCommandParams);
-    readGeneralDiagnosticsInteractionInfo.put(
-        "readActiveRadioFaultsAttribute",
-        readGeneralDiagnosticsActiveRadioFaultsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGeneralDiagnosticsActiveNetworkFaultsCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readWiFiNetworkDiagnosticsPacketUnicastTxCountCommandParams);
+    readWiFiNetworkDiagnosticsInteractionInfo.put(
+        "readPacketUnicastTxCountAttribute",
+        readWiFiNetworkDiagnosticsPacketUnicastTxCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsCurrentMaxRateCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGeneralDiagnosticsActiveNetworkFaultsAttributeInteractionInfo =
+    InteractionInfo readWiFiNetworkDiagnosticsCurrentMaxRateAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
-                  .readActiveNetworkFaultsAttribute(
-                      (ChipClusters.GeneralDiagnosticsCluster.ActiveNetworkFaultsAttributeCallback)
-                          callback);
+              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
+                  .readCurrentMaxRateAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedGeneralDiagnosticsClusterActiveNetworkFaultsAttributeCallback(),
-            readGeneralDiagnosticsActiveNetworkFaultsCommandParams);
-    readGeneralDiagnosticsInteractionInfo.put(
-        "readActiveNetworkFaultsAttribute",
-        readGeneralDiagnosticsActiveNetworkFaultsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGeneralDiagnosticsTestEventTriggersEnabledCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readWiFiNetworkDiagnosticsCurrentMaxRateCommandParams);
+    readWiFiNetworkDiagnosticsInteractionInfo.put(
+        "readCurrentMaxRateAttribute",
+        readWiFiNetworkDiagnosticsCurrentMaxRateAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsOverrunCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGeneralDiagnosticsTestEventTriggersEnabledAttributeInteractionInfo =
+    InteractionInfo readWiFiNetworkDiagnosticsOverrunCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
-                  .readTestEventTriggersEnabledAttribute(
-                      (ChipClusters.BooleanAttributeCallback) callback);
+              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
+                  .readOverrunCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readGeneralDiagnosticsTestEventTriggersEnabledCommandParams);
-    readGeneralDiagnosticsInteractionInfo.put(
-        "readTestEventTriggersEnabledAttribute",
-        readGeneralDiagnosticsTestEventTriggersEnabledAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGeneralDiagnosticsGeneratedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readWiFiNetworkDiagnosticsOverrunCountCommandParams);
+    readWiFiNetworkDiagnosticsInteractionInfo.put(
+        "readOverrunCountAttribute",
+        readWiFiNetworkDiagnosticsOverrunCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGeneralDiagnosticsGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readWiFiNetworkDiagnosticsGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
+              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
                   .readGeneratedCommandListAttribute(
-                      (ChipClusters.GeneralDiagnosticsCluster.GeneratedCommandListAttributeCallback)
+                      (ChipClusters.WiFiNetworkDiagnosticsCluster
+                              .GeneratedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedGeneralDiagnosticsClusterGeneratedCommandListAttributeCallback(),
-            readGeneralDiagnosticsGeneratedCommandListCommandParams);
-    readGeneralDiagnosticsInteractionInfo.put(
+                    .DelegatedWiFiNetworkDiagnosticsClusterGeneratedCommandListAttributeCallback(),
+            readWiFiNetworkDiagnosticsGeneratedCommandListCommandParams);
+    readWiFiNetworkDiagnosticsInteractionInfo.put(
         "readGeneratedCommandListAttribute",
-        readGeneralDiagnosticsGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGeneralDiagnosticsAcceptedCommandListCommandParams =
+        readWiFiNetworkDiagnosticsGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGeneralDiagnosticsAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readWiFiNetworkDiagnosticsAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
+              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
                   .readAcceptedCommandListAttribute(
-                      (ChipClusters.GeneralDiagnosticsCluster.AcceptedCommandListAttributeCallback)
+                      (ChipClusters.WiFiNetworkDiagnosticsCluster
+                              .AcceptedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedGeneralDiagnosticsClusterAcceptedCommandListAttributeCallback(),
-            readGeneralDiagnosticsAcceptedCommandListCommandParams);
-    readGeneralDiagnosticsInteractionInfo.put(
+                    .DelegatedWiFiNetworkDiagnosticsClusterAcceptedCommandListAttributeCallback(),
+            readWiFiNetworkDiagnosticsAcceptedCommandListCommandParams);
+    readWiFiNetworkDiagnosticsInteractionInfo.put(
         "readAcceptedCommandListAttribute",
-        readGeneralDiagnosticsAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGeneralDiagnosticsAttributeListCommandParams =
+        readWiFiNetworkDiagnosticsAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGeneralDiagnosticsAttributeListAttributeInteractionInfo =
+    InteractionInfo readWiFiNetworkDiagnosticsAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
+              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.GeneralDiagnosticsCluster.AttributeListAttributeCallback)
+                      (ChipClusters.WiFiNetworkDiagnosticsCluster.AttributeListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedGeneralDiagnosticsClusterAttributeListAttributeCallback(),
-            readGeneralDiagnosticsAttributeListCommandParams);
-    readGeneralDiagnosticsInteractionInfo.put(
-        "readAttributeListAttribute", readGeneralDiagnosticsAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGeneralDiagnosticsFeatureMapCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGeneralDiagnosticsFeatureMapAttributeInteractionInfo =
+                    .DelegatedWiFiNetworkDiagnosticsClusterAttributeListAttributeCallback(),
+            readWiFiNetworkDiagnosticsAttributeListCommandParams);
+    readWiFiNetworkDiagnosticsInteractionInfo.put(
+        "readAttributeListAttribute",
+        readWiFiNetworkDiagnosticsAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsFeatureMapCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readWiFiNetworkDiagnosticsFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
+              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readGeneralDiagnosticsFeatureMapCommandParams);
-    readGeneralDiagnosticsInteractionInfo.put(
-        "readFeatureMapAttribute", readGeneralDiagnosticsFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGeneralDiagnosticsClusterRevisionCommandParams =
+            readWiFiNetworkDiagnosticsFeatureMapCommandParams);
+    readWiFiNetworkDiagnosticsInteractionInfo.put(
+        "readFeatureMapAttribute", readWiFiNetworkDiagnosticsFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGeneralDiagnosticsClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readWiFiNetworkDiagnosticsClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralDiagnosticsCluster) cluster)
+              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readGeneralDiagnosticsClusterRevisionCommandParams);
-    readGeneralDiagnosticsInteractionInfo.put(
+            readWiFiNetworkDiagnosticsClusterRevisionCommandParams);
+    readWiFiNetworkDiagnosticsInteractionInfo.put(
         "readClusterRevisionAttribute",
-        readGeneralDiagnosticsClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("generalDiagnostics", readGeneralDiagnosticsInteractionInfo);
-    Map<String, InteractionInfo> readGroupKeyManagementInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readGroupKeyManagementGroupKeyMapCommandParams =
+        readWiFiNetworkDiagnosticsClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("wiFiNetworkDiagnostics", readWiFiNetworkDiagnosticsInteractionInfo);
+    Map<String, InteractionInfo> readEthernetNetworkDiagnosticsInteractionInfo =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readEthernetNetworkDiagnosticsPHYRateCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGroupKeyManagementGroupKeyMapAttributeInteractionInfo =
+    InteractionInfo readEthernetNetworkDiagnosticsPHYRateAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GroupKeyManagementCluster) cluster)
-                  .readGroupKeyMapAttribute(
-                      (ChipClusters.GroupKeyManagementCluster.GroupKeyMapAttributeCallback)
+              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
+                  .readPHYRateAttribute(
+                      (ChipClusters.EthernetNetworkDiagnosticsCluster.PHYRateAttributeCallback)
                           callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedGroupKeyManagementClusterGroupKeyMapAttributeCallback(),
-            readGroupKeyManagementGroupKeyMapCommandParams);
-    readGroupKeyManagementInteractionInfo.put(
-        "readGroupKeyMapAttribute", readGroupKeyManagementGroupKeyMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGroupKeyManagementGroupTableCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readEthernetNetworkDiagnosticsPHYRateCommandParams);
+    readEthernetNetworkDiagnosticsInteractionInfo.put(
+        "readPHYRateAttribute", readEthernetNetworkDiagnosticsPHYRateAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readEthernetNetworkDiagnosticsFullDuplexCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGroupKeyManagementGroupTableAttributeInteractionInfo =
+    InteractionInfo readEthernetNetworkDiagnosticsFullDuplexAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GroupKeyManagementCluster) cluster)
-                  .readGroupTableAttribute(
-                      (ChipClusters.GroupKeyManagementCluster.GroupTableAttributeCallback)
+              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
+                  .readFullDuplexAttribute(
+                      (ChipClusters.EthernetNetworkDiagnosticsCluster.FullDuplexAttributeCallback)
                           callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedGroupKeyManagementClusterGroupTableAttributeCallback(),
-            readGroupKeyManagementGroupTableCommandParams);
-    readGroupKeyManagementInteractionInfo.put(
-        "readGroupTableAttribute", readGroupKeyManagementGroupTableAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGroupKeyManagementMaxGroupsPerFabricCommandParams =
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readEthernetNetworkDiagnosticsFullDuplexCommandParams);
+    readEthernetNetworkDiagnosticsInteractionInfo.put(
+        "readFullDuplexAttribute",
+        readEthernetNetworkDiagnosticsFullDuplexAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readEthernetNetworkDiagnosticsPacketRxCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGroupKeyManagementMaxGroupsPerFabricAttributeInteractionInfo =
+    InteractionInfo readEthernetNetworkDiagnosticsPacketRxCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GroupKeyManagementCluster) cluster)
-                  .readMaxGroupsPerFabricAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
+                  .readPacketRxCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readGroupKeyManagementMaxGroupsPerFabricCommandParams);
-    readGroupKeyManagementInteractionInfo.put(
-        "readMaxGroupsPerFabricAttribute",
-        readGroupKeyManagementMaxGroupsPerFabricAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGroupKeyManagementMaxGroupKeysPerFabricCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readEthernetNetworkDiagnosticsPacketRxCountCommandParams);
+    readEthernetNetworkDiagnosticsInteractionInfo.put(
+        "readPacketRxCountAttribute",
+        readEthernetNetworkDiagnosticsPacketRxCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readEthernetNetworkDiagnosticsPacketTxCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGroupKeyManagementMaxGroupKeysPerFabricAttributeInteractionInfo =
+    InteractionInfo readEthernetNetworkDiagnosticsPacketTxCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GroupKeyManagementCluster) cluster)
-                  .readMaxGroupKeysPerFabricAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
+                  .readPacketTxCountAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readGroupKeyManagementMaxGroupKeysPerFabricCommandParams);
-    readGroupKeyManagementInteractionInfo.put(
-        "readMaxGroupKeysPerFabricAttribute",
-        readGroupKeyManagementMaxGroupKeysPerFabricAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGroupKeyManagementGeneratedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readEthernetNetworkDiagnosticsPacketTxCountCommandParams);
+    readEthernetNetworkDiagnosticsInteractionInfo.put(
+        "readPacketTxCountAttribute",
+        readEthernetNetworkDiagnosticsPacketTxCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readEthernetNetworkDiagnosticsTxErrCountCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGroupKeyManagementGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readEthernetNetworkDiagnosticsTxErrCountAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GroupKeyManagementCluster) cluster)
+              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
+                  .readTxErrCountAttribute((ChipClusters.LongAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readEthernetNetworkDiagnosticsTxErrCountCommandParams);
+    readEthernetNetworkDiagnosticsInteractionInfo.put(
+        "readTxErrCountAttribute",
+        readEthernetNetworkDiagnosticsTxErrCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readEthernetNetworkDiagnosticsCollisionCountCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readEthernetNetworkDiagnosticsCollisionCountAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
+                  .readCollisionCountAttribute((ChipClusters.LongAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readEthernetNetworkDiagnosticsCollisionCountCommandParams);
+    readEthernetNetworkDiagnosticsInteractionInfo.put(
+        "readCollisionCountAttribute",
+        readEthernetNetworkDiagnosticsCollisionCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readEthernetNetworkDiagnosticsOverrunCountCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readEthernetNetworkDiagnosticsOverrunCountAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
+                  .readOverrunCountAttribute((ChipClusters.LongAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readEthernetNetworkDiagnosticsOverrunCountCommandParams);
+    readEthernetNetworkDiagnosticsInteractionInfo.put(
+        "readOverrunCountAttribute",
+        readEthernetNetworkDiagnosticsOverrunCountAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readEthernetNetworkDiagnosticsCarrierDetectCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readEthernetNetworkDiagnosticsCarrierDetectAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
+                  .readCarrierDetectAttribute(
+                      (ChipClusters.EthernetNetworkDiagnosticsCluster
+                              .CarrierDetectAttributeCallback)
+                          callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readEthernetNetworkDiagnosticsCarrierDetectCommandParams);
+    readEthernetNetworkDiagnosticsInteractionInfo.put(
+        "readCarrierDetectAttribute",
+        readEthernetNetworkDiagnosticsCarrierDetectAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readEthernetNetworkDiagnosticsTimeSinceResetCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readEthernetNetworkDiagnosticsTimeSinceResetAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
+                  .readTimeSinceResetAttribute((ChipClusters.LongAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readEthernetNetworkDiagnosticsTimeSinceResetCommandParams);
+    readEthernetNetworkDiagnosticsInteractionInfo.put(
+        "readTimeSinceResetAttribute",
+        readEthernetNetworkDiagnosticsTimeSinceResetAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readEthernetNetworkDiagnosticsGeneratedCommandListCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readEthernetNetworkDiagnosticsGeneratedCommandListAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
                   .readGeneratedCommandListAttribute(
-                      (ChipClusters.GroupKeyManagementCluster.GeneratedCommandListAttributeCallback)
+                      (ChipClusters.EthernetNetworkDiagnosticsCluster
+                              .GeneratedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedGroupKeyManagementClusterGeneratedCommandListAttributeCallback(),
-            readGroupKeyManagementGeneratedCommandListCommandParams);
-    readGroupKeyManagementInteractionInfo.put(
+                    .DelegatedEthernetNetworkDiagnosticsClusterGeneratedCommandListAttributeCallback(),
+            readEthernetNetworkDiagnosticsGeneratedCommandListCommandParams);
+    readEthernetNetworkDiagnosticsInteractionInfo.put(
         "readGeneratedCommandListAttribute",
-        readGroupKeyManagementGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGroupKeyManagementAcceptedCommandListCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGroupKeyManagementAcceptedCommandListAttributeInteractionInfo =
+        readEthernetNetworkDiagnosticsGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readEthernetNetworkDiagnosticsAcceptedCommandListCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readEthernetNetworkDiagnosticsAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GroupKeyManagementCluster) cluster)
+              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
                   .readAcceptedCommandListAttribute(
-                      (ChipClusters.GroupKeyManagementCluster.AcceptedCommandListAttributeCallback)
+                      (ChipClusters.EthernetNetworkDiagnosticsCluster
+                              .AcceptedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedGroupKeyManagementClusterAcceptedCommandListAttributeCallback(),
-            readGroupKeyManagementAcceptedCommandListCommandParams);
-    readGroupKeyManagementInteractionInfo.put(
+                    .DelegatedEthernetNetworkDiagnosticsClusterAcceptedCommandListAttributeCallback(),
+            readEthernetNetworkDiagnosticsAcceptedCommandListCommandParams);
+    readEthernetNetworkDiagnosticsInteractionInfo.put(
         "readAcceptedCommandListAttribute",
-        readGroupKeyManagementAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGroupKeyManagementAttributeListCommandParams =
+        readEthernetNetworkDiagnosticsAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readEthernetNetworkDiagnosticsAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGroupKeyManagementAttributeListAttributeInteractionInfo =
+    InteractionInfo readEthernetNetworkDiagnosticsAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GroupKeyManagementCluster) cluster)
+              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.GroupKeyManagementCluster.AttributeListAttributeCallback)
+                      (ChipClusters.EthernetNetworkDiagnosticsCluster
+                              .AttributeListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedGroupKeyManagementClusterAttributeListAttributeCallback(),
-            readGroupKeyManagementAttributeListCommandParams);
-    readGroupKeyManagementInteractionInfo.put(
-        "readAttributeListAttribute", readGroupKeyManagementAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGroupKeyManagementFeatureMapCommandParams =
+                    .DelegatedEthernetNetworkDiagnosticsClusterAttributeListAttributeCallback(),
+            readEthernetNetworkDiagnosticsAttributeListCommandParams);
+    readEthernetNetworkDiagnosticsInteractionInfo.put(
+        "readAttributeListAttribute",
+        readEthernetNetworkDiagnosticsAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readEthernetNetworkDiagnosticsFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGroupKeyManagementFeatureMapAttributeInteractionInfo =
+    InteractionInfo readEthernetNetworkDiagnosticsFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GroupKeyManagementCluster) cluster)
+              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readGroupKeyManagementFeatureMapCommandParams);
-    readGroupKeyManagementInteractionInfo.put(
-        "readFeatureMapAttribute", readGroupKeyManagementFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGroupKeyManagementClusterRevisionCommandParams =
+            readEthernetNetworkDiagnosticsFeatureMapCommandParams);
+    readEthernetNetworkDiagnosticsInteractionInfo.put(
+        "readFeatureMapAttribute",
+        readEthernetNetworkDiagnosticsFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readEthernetNetworkDiagnosticsClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGroupKeyManagementClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readEthernetNetworkDiagnosticsClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GroupKeyManagementCluster) cluster)
+              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readGroupKeyManagementClusterRevisionCommandParams);
-    readGroupKeyManagementInteractionInfo.put(
+            readEthernetNetworkDiagnosticsClusterRevisionCommandParams);
+    readEthernetNetworkDiagnosticsInteractionInfo.put(
         "readClusterRevisionAttribute",
-        readGroupKeyManagementClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("groupKeyManagement", readGroupKeyManagementInteractionInfo);
-    Map<String, InteractionInfo> readGroupsInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readGroupsNameSupportCommandParams =
+        readEthernetNetworkDiagnosticsClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put(
+        "ethernetNetworkDiagnostics", readEthernetNetworkDiagnosticsInteractionInfo);
+    Map<String, InteractionInfo> readBridgedDeviceBasicInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readBridgedDeviceBasicVendorNameCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGroupsNameSupportAttributeInteractionInfo =
+    InteractionInfo readBridgedDeviceBasicVendorNameAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GroupsCluster) cluster)
-                  .readNameSupportAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+                  .readVendorNameAttribute((ChipClusters.CharStringAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readGroupsNameSupportCommandParams);
-    readGroupsInteractionInfo.put(
-        "readNameSupportAttribute", readGroupsNameSupportAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGroupsGeneratedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readBridgedDeviceBasicVendorNameCommandParams);
+    readBridgedDeviceBasicInteractionInfo.put(
+        "readVendorNameAttribute", readBridgedDeviceBasicVendorNameAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBridgedDeviceBasicVendorIDCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGroupsGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readBridgedDeviceBasicVendorIDAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GroupsCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.GroupsCluster.GeneratedCommandListAttributeCallback) callback);
+              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+                  .readVendorIDAttribute(
+                      (ChipClusters.BridgedDeviceBasicCluster.VendorIDAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedGroupsClusterGeneratedCommandListAttributeCallback(),
-            readGroupsGeneratedCommandListCommandParams);
-    readGroupsInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readGroupsGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGroupsAcceptedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readBridgedDeviceBasicVendorIDCommandParams);
+    readBridgedDeviceBasicInteractionInfo.put(
+        "readVendorIDAttribute", readBridgedDeviceBasicVendorIDAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBridgedDeviceBasicProductNameCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGroupsAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readBridgedDeviceBasicProductNameAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GroupsCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.GroupsCluster.AcceptedCommandListAttributeCallback) callback);
+              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+                  .readProductNameAttribute((ChipClusters.CharStringAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping.DelegatedGroupsClusterAcceptedCommandListAttributeCallback(),
-            readGroupsAcceptedCommandListCommandParams);
-    readGroupsInteractionInfo.put(
-        "readAcceptedCommandListAttribute", readGroupsAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGroupsAttributeListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readBridgedDeviceBasicProductNameCommandParams);
+    readBridgedDeviceBasicInteractionInfo.put(
+        "readProductNameAttribute", readBridgedDeviceBasicProductNameAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBridgedDeviceBasicNodeLabelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGroupsAttributeListAttributeInteractionInfo =
+    InteractionInfo readBridgedDeviceBasicNodeLabelAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GroupsCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.GroupsCluster.AttributeListAttributeCallback) callback);
+              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+                  .readNodeLabelAttribute((ChipClusters.CharStringAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedGroupsClusterAttributeListAttributeCallback(),
-            readGroupsAttributeListCommandParams);
-    readGroupsInteractionInfo.put(
-        "readAttributeListAttribute", readGroupsAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGroupsFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readBridgedDeviceBasicNodeLabelCommandParams);
+    readBridgedDeviceBasicInteractionInfo.put(
+        "readNodeLabelAttribute", readBridgedDeviceBasicNodeLabelAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBridgedDeviceBasicHardwareVersionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGroupsFeatureMapAttributeInteractionInfo =
+    InteractionInfo readBridgedDeviceBasicHardwareVersionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GroupsCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+                  .readHardwareVersionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readGroupsFeatureMapCommandParams);
-    readGroupsInteractionInfo.put(
-        "readFeatureMapAttribute", readGroupsFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readGroupsClusterRevisionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readBridgedDeviceBasicHardwareVersionCommandParams);
+    readBridgedDeviceBasicInteractionInfo.put(
+        "readHardwareVersionAttribute",
+        readBridgedDeviceBasicHardwareVersionAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBridgedDeviceBasicHardwareVersionStringCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readGroupsClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readBridgedDeviceBasicHardwareVersionStringAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GroupsCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+                  .readHardwareVersionStringAttribute(
+                      (ChipClusters.CharStringAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readGroupsClusterRevisionCommandParams);
-    readGroupsInteractionInfo.put(
-        "readClusterRevisionAttribute", readGroupsClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("groups", readGroupsInteractionInfo);
-    Map<String, InteractionInfo> readIdentifyInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readIdentifyIdentifyTimeCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readBridgedDeviceBasicHardwareVersionStringCommandParams);
+    readBridgedDeviceBasicInteractionInfo.put(
+        "readHardwareVersionStringAttribute",
+        readBridgedDeviceBasicHardwareVersionStringAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBridgedDeviceBasicSoftwareVersionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readIdentifyIdentifyTimeAttributeInteractionInfo =
+    InteractionInfo readBridgedDeviceBasicSoftwareVersionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.IdentifyCluster) cluster)
-                  .readIdentifyTimeAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+                  .readSoftwareVersionAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readIdentifyIdentifyTimeCommandParams);
-    readIdentifyInteractionInfo.put(
-        "readIdentifyTimeAttribute", readIdentifyIdentifyTimeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readIdentifyIdentifyTypeCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readBridgedDeviceBasicSoftwareVersionCommandParams);
+    readBridgedDeviceBasicInteractionInfo.put(
+        "readSoftwareVersionAttribute",
+        readBridgedDeviceBasicSoftwareVersionAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBridgedDeviceBasicSoftwareVersionStringCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readIdentifyIdentifyTypeAttributeInteractionInfo =
+    InteractionInfo readBridgedDeviceBasicSoftwareVersionStringAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.IdentifyCluster) cluster)
-                  .readIdentifyTypeAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+                  .readSoftwareVersionStringAttribute(
+                      (ChipClusters.CharStringAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readIdentifyIdentifyTypeCommandParams);
-    readIdentifyInteractionInfo.put(
-        "readIdentifyTypeAttribute", readIdentifyIdentifyTypeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readIdentifyGeneratedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readBridgedDeviceBasicSoftwareVersionStringCommandParams);
+    readBridgedDeviceBasicInteractionInfo.put(
+        "readSoftwareVersionStringAttribute",
+        readBridgedDeviceBasicSoftwareVersionStringAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBridgedDeviceBasicManufacturingDateCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readIdentifyGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readBridgedDeviceBasicManufacturingDateAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.IdentifyCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.IdentifyCluster.GeneratedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+                  .readManufacturingDateAttribute(
+                      (ChipClusters.CharStringAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedIdentifyClusterGeneratedCommandListAttributeCallback(),
-            readIdentifyGeneratedCommandListCommandParams);
-    readIdentifyInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readIdentifyGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readIdentifyAcceptedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readBridgedDeviceBasicManufacturingDateCommandParams);
+    readBridgedDeviceBasicInteractionInfo.put(
+        "readManufacturingDateAttribute",
+        readBridgedDeviceBasicManufacturingDateAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBridgedDeviceBasicPartNumberCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readIdentifyAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readBridgedDeviceBasicPartNumberAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.IdentifyCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.IdentifyCluster.AcceptedCommandListAttributeCallback) callback);
+              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+                  .readPartNumberAttribute((ChipClusters.CharStringAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedIdentifyClusterAcceptedCommandListAttributeCallback(),
-            readIdentifyAcceptedCommandListCommandParams);
-    readIdentifyInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readIdentifyAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readIdentifyAttributeListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readBridgedDeviceBasicPartNumberCommandParams);
+    readBridgedDeviceBasicInteractionInfo.put(
+        "readPartNumberAttribute", readBridgedDeviceBasicPartNumberAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBridgedDeviceBasicProductURLCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readIdentifyAttributeListAttributeInteractionInfo =
+    InteractionInfo readBridgedDeviceBasicProductURLAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.IdentifyCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.IdentifyCluster.AttributeListAttributeCallback) callback);
+              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+                  .readProductURLAttribute((ChipClusters.CharStringAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIdentifyClusterAttributeListAttributeCallback(),
-            readIdentifyAttributeListCommandParams);
-    readIdentifyInteractionInfo.put(
-        "readAttributeListAttribute", readIdentifyAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readIdentifyFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readBridgedDeviceBasicProductURLCommandParams);
+    readBridgedDeviceBasicInteractionInfo.put(
+        "readProductURLAttribute", readBridgedDeviceBasicProductURLAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBridgedDeviceBasicProductLabelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readIdentifyFeatureMapAttributeInteractionInfo =
+    InteractionInfo readBridgedDeviceBasicProductLabelAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.IdentifyCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+                  .readProductLabelAttribute((ChipClusters.CharStringAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readIdentifyFeatureMapCommandParams);
-    readIdentifyInteractionInfo.put(
-        "readFeatureMapAttribute", readIdentifyFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readIdentifyClusterRevisionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readBridgedDeviceBasicProductLabelCommandParams);
+    readBridgedDeviceBasicInteractionInfo.put(
+        "readProductLabelAttribute", readBridgedDeviceBasicProductLabelAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBridgedDeviceBasicSerialNumberCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readIdentifyClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readBridgedDeviceBasicSerialNumberAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.IdentifyCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+                  .readSerialNumberAttribute((ChipClusters.CharStringAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readIdentifyClusterRevisionCommandParams);
-    readIdentifyInteractionInfo.put(
-        "readClusterRevisionAttribute", readIdentifyClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("identify", readIdentifyInteractionInfo);
-    Map<String, InteractionInfo> readIlluminanceMeasurementInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readIlluminanceMeasurementMeasuredValueCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readBridgedDeviceBasicSerialNumberCommandParams);
+    readBridgedDeviceBasicInteractionInfo.put(
+        "readSerialNumberAttribute", readBridgedDeviceBasicSerialNumberAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBridgedDeviceBasicReachableCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readIlluminanceMeasurementMeasuredValueAttributeInteractionInfo =
+    InteractionInfo readBridgedDeviceBasicReachableAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.IlluminanceMeasurementCluster) cluster)
-                  .readMeasuredValueAttribute(
-                      (ChipClusters.IlluminanceMeasurementCluster.MeasuredValueAttributeCallback)
-                          callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readIlluminanceMeasurementMeasuredValueCommandParams);
-    readIlluminanceMeasurementInteractionInfo.put(
-        "readMeasuredValueAttribute",
-        readIlluminanceMeasurementMeasuredValueAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readIlluminanceMeasurementMinMeasuredValueCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readIlluminanceMeasurementMinMeasuredValueAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.IlluminanceMeasurementCluster) cluster)
-                  .readMinMeasuredValueAttribute(
-                      (ChipClusters.IlluminanceMeasurementCluster.MinMeasuredValueAttributeCallback)
-                          callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readIlluminanceMeasurementMinMeasuredValueCommandParams);
-    readIlluminanceMeasurementInteractionInfo.put(
-        "readMinMeasuredValueAttribute",
-        readIlluminanceMeasurementMinMeasuredValueAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readIlluminanceMeasurementMaxMeasuredValueCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readIlluminanceMeasurementMaxMeasuredValueAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.IlluminanceMeasurementCluster) cluster)
-                  .readMaxMeasuredValueAttribute(
-                      (ChipClusters.IlluminanceMeasurementCluster.MaxMeasuredValueAttributeCallback)
-                          callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readIlluminanceMeasurementMaxMeasuredValueCommandParams);
-    readIlluminanceMeasurementInteractionInfo.put(
-        "readMaxMeasuredValueAttribute",
-        readIlluminanceMeasurementMaxMeasuredValueAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readIlluminanceMeasurementToleranceCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readIlluminanceMeasurementToleranceAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.IlluminanceMeasurementCluster) cluster)
-                  .readToleranceAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+                  .readReachableAttribute((ChipClusters.BooleanAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readIlluminanceMeasurementToleranceCommandParams);
-    readIlluminanceMeasurementInteractionInfo.put(
-        "readToleranceAttribute", readIlluminanceMeasurementToleranceAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readIlluminanceMeasurementLightSensorTypeCommandParams =
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readBridgedDeviceBasicReachableCommandParams);
+    readBridgedDeviceBasicInteractionInfo.put(
+        "readReachableAttribute", readBridgedDeviceBasicReachableAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBridgedDeviceBasicUniqueIDCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readIlluminanceMeasurementLightSensorTypeAttributeInteractionInfo =
+    InteractionInfo readBridgedDeviceBasicUniqueIDAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.IlluminanceMeasurementCluster) cluster)
-                  .readLightSensorTypeAttribute(
-                      (ChipClusters.IlluminanceMeasurementCluster.LightSensorTypeAttributeCallback)
-                          callback);
+              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+                  .readUniqueIDAttribute((ChipClusters.CharStringAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readIlluminanceMeasurementLightSensorTypeCommandParams);
-    readIlluminanceMeasurementInteractionInfo.put(
-        "readLightSensorTypeAttribute",
-        readIlluminanceMeasurementLightSensorTypeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readIlluminanceMeasurementGeneratedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readBridgedDeviceBasicUniqueIDCommandParams);
+    readBridgedDeviceBasicInteractionInfo.put(
+        "readUniqueIDAttribute", readBridgedDeviceBasicUniqueIDAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBridgedDeviceBasicGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readIlluminanceMeasurementGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readBridgedDeviceBasicGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.IlluminanceMeasurementCluster) cluster)
+              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
                   .readGeneratedCommandListAttribute(
-                      (ChipClusters.IlluminanceMeasurementCluster
-                              .GeneratedCommandListAttributeCallback)
+                      (ChipClusters.BridgedDeviceBasicCluster.GeneratedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedIlluminanceMeasurementClusterGeneratedCommandListAttributeCallback(),
-            readIlluminanceMeasurementGeneratedCommandListCommandParams);
-    readIlluminanceMeasurementInteractionInfo.put(
+                    .DelegatedBridgedDeviceBasicClusterGeneratedCommandListAttributeCallback(),
+            readBridgedDeviceBasicGeneratedCommandListCommandParams);
+    readBridgedDeviceBasicInteractionInfo.put(
         "readGeneratedCommandListAttribute",
-        readIlluminanceMeasurementGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readIlluminanceMeasurementAcceptedCommandListCommandParams =
+        readBridgedDeviceBasicGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBridgedDeviceBasicAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readIlluminanceMeasurementAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readBridgedDeviceBasicAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.IlluminanceMeasurementCluster) cluster)
+              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
                   .readAcceptedCommandListAttribute(
-                      (ChipClusters.IlluminanceMeasurementCluster
-                              .AcceptedCommandListAttributeCallback)
+                      (ChipClusters.BridgedDeviceBasicCluster.AcceptedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedIlluminanceMeasurementClusterAcceptedCommandListAttributeCallback(),
-            readIlluminanceMeasurementAcceptedCommandListCommandParams);
-    readIlluminanceMeasurementInteractionInfo.put(
+                    .DelegatedBridgedDeviceBasicClusterAcceptedCommandListAttributeCallback(),
+            readBridgedDeviceBasicAcceptedCommandListCommandParams);
+    readBridgedDeviceBasicInteractionInfo.put(
         "readAcceptedCommandListAttribute",
-        readIlluminanceMeasurementAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readIlluminanceMeasurementAttributeListCommandParams =
+        readBridgedDeviceBasicAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBridgedDeviceBasicAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readIlluminanceMeasurementAttributeListAttributeInteractionInfo =
+    InteractionInfo readBridgedDeviceBasicAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.IlluminanceMeasurementCluster) cluster)
+              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.IlluminanceMeasurementCluster.AttributeListAttributeCallback)
+                      (ChipClusters.BridgedDeviceBasicCluster.AttributeListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedIlluminanceMeasurementClusterAttributeListAttributeCallback(),
-            readIlluminanceMeasurementAttributeListCommandParams);
-    readIlluminanceMeasurementInteractionInfo.put(
-        "readAttributeListAttribute",
-        readIlluminanceMeasurementAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readIlluminanceMeasurementFeatureMapCommandParams =
+                    .DelegatedBridgedDeviceBasicClusterAttributeListAttributeCallback(),
+            readBridgedDeviceBasicAttributeListCommandParams);
+    readBridgedDeviceBasicInteractionInfo.put(
+        "readAttributeListAttribute", readBridgedDeviceBasicAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBridgedDeviceBasicFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readIlluminanceMeasurementFeatureMapAttributeInteractionInfo =
+    InteractionInfo readBridgedDeviceBasicFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.IlluminanceMeasurementCluster) cluster)
+              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readIlluminanceMeasurementFeatureMapCommandParams);
-    readIlluminanceMeasurementInteractionInfo.put(
-        "readFeatureMapAttribute", readIlluminanceMeasurementFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readIlluminanceMeasurementClusterRevisionCommandParams =
+            readBridgedDeviceBasicFeatureMapCommandParams);
+    readBridgedDeviceBasicInteractionInfo.put(
+        "readFeatureMapAttribute", readBridgedDeviceBasicFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBridgedDeviceBasicClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readIlluminanceMeasurementClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readBridgedDeviceBasicClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.IlluminanceMeasurementCluster) cluster)
+              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readIlluminanceMeasurementClusterRevisionCommandParams);
-    readIlluminanceMeasurementInteractionInfo.put(
+            readBridgedDeviceBasicClusterRevisionCommandParams);
+    readBridgedDeviceBasicInteractionInfo.put(
         "readClusterRevisionAttribute",
-        readIlluminanceMeasurementClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("illuminanceMeasurement", readIlluminanceMeasurementInteractionInfo);
-    Map<String, InteractionInfo> readKeypadInputInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readKeypadInputGeneratedCommandListCommandParams =
+        readBridgedDeviceBasicClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("bridgedDeviceBasic", readBridgedDeviceBasicInteractionInfo);
+    Map<String, InteractionInfo> readSwitchInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readSwitchNumberOfPositionsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readKeypadInputGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readSwitchNumberOfPositionsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.KeypadInputCluster) cluster)
+              ((ChipClusters.SwitchCluster) cluster)
+                  .readNumberOfPositionsAttribute((ChipClusters.IntegerAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readSwitchNumberOfPositionsCommandParams);
+    readSwitchInteractionInfo.put(
+        "readNumberOfPositionsAttribute", readSwitchNumberOfPositionsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readSwitchCurrentPositionCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readSwitchCurrentPositionAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.SwitchCluster) cluster)
+                  .readCurrentPositionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readSwitchCurrentPositionCommandParams);
+    readSwitchInteractionInfo.put(
+        "readCurrentPositionAttribute", readSwitchCurrentPositionAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readSwitchMultiPressMaxCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readSwitchMultiPressMaxAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.SwitchCluster) cluster)
+                  .readMultiPressMaxAttribute((ChipClusters.IntegerAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readSwitchMultiPressMaxCommandParams);
+    readSwitchInteractionInfo.put(
+        "readMultiPressMaxAttribute", readSwitchMultiPressMaxAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readSwitchGeneratedCommandListCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readSwitchGeneratedCommandListAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.SwitchCluster) cluster)
                   .readGeneratedCommandListAttribute(
-                      (ChipClusters.KeypadInputCluster.GeneratedCommandListAttributeCallback)
-                          callback);
+                      (ChipClusters.SwitchCluster.GeneratedCommandListAttributeCallback) callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedKeypadInputClusterGeneratedCommandListAttributeCallback(),
-            readKeypadInputGeneratedCommandListCommandParams);
-    readKeypadInputInteractionInfo.put(
+                    .DelegatedSwitchClusterGeneratedCommandListAttributeCallback(),
+            readSwitchGeneratedCommandListCommandParams);
+    readSwitchInteractionInfo.put(
         "readGeneratedCommandListAttribute",
-        readKeypadInputGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readKeypadInputAcceptedCommandListCommandParams =
+        readSwitchGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readSwitchAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readKeypadInputAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readSwitchAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.KeypadInputCluster) cluster)
+              ((ChipClusters.SwitchCluster) cluster)
                   .readAcceptedCommandListAttribute(
-                      (ChipClusters.KeypadInputCluster.AcceptedCommandListAttributeCallback)
-                          callback);
+                      (ChipClusters.SwitchCluster.AcceptedCommandListAttributeCallback) callback);
             },
             () ->
-                new ClusterInfoMapping
-                    .DelegatedKeypadInputClusterAcceptedCommandListAttributeCallback(),
-            readKeypadInputAcceptedCommandListCommandParams);
-    readKeypadInputInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readKeypadInputAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readKeypadInputAttributeListCommandParams =
+                new ClusterInfoMapping.DelegatedSwitchClusterAcceptedCommandListAttributeCallback(),
+            readSwitchAcceptedCommandListCommandParams);
+    readSwitchInteractionInfo.put(
+        "readAcceptedCommandListAttribute", readSwitchAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readSwitchAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readKeypadInputAttributeListAttributeInteractionInfo =
+    InteractionInfo readSwitchAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.KeypadInputCluster) cluster)
+              ((ChipClusters.SwitchCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.KeypadInputCluster.AttributeListAttributeCallback) callback);
+                      (ChipClusters.SwitchCluster.AttributeListAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping.DelegatedKeypadInputClusterAttributeListAttributeCallback(),
-            readKeypadInputAttributeListCommandParams);
-    readKeypadInputInteractionInfo.put(
-        "readAttributeListAttribute", readKeypadInputAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readKeypadInputFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedSwitchClusterAttributeListAttributeCallback(),
+            readSwitchAttributeListCommandParams);
+    readSwitchInteractionInfo.put(
+        "readAttributeListAttribute", readSwitchAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readSwitchFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readKeypadInputFeatureMapAttributeInteractionInfo =
+    InteractionInfo readSwitchFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.KeypadInputCluster) cluster)
+              ((ChipClusters.SwitchCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readKeypadInputFeatureMapCommandParams);
-    readKeypadInputInteractionInfo.put(
-        "readFeatureMapAttribute", readKeypadInputFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readKeypadInputClusterRevisionCommandParams =
+            readSwitchFeatureMapCommandParams);
+    readSwitchInteractionInfo.put(
+        "readFeatureMapAttribute", readSwitchFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readSwitchClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readKeypadInputClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readSwitchClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.KeypadInputCluster) cluster)
+              ((ChipClusters.SwitchCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readKeypadInputClusterRevisionCommandParams);
-    readKeypadInputInteractionInfo.put(
-        "readClusterRevisionAttribute", readKeypadInputClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("keypadInput", readKeypadInputInteractionInfo);
-    Map<String, InteractionInfo> readLevelControlInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readLevelControlCurrentLevelCommandParams =
+            readSwitchClusterRevisionCommandParams);
+    readSwitchInteractionInfo.put(
+        "readClusterRevisionAttribute", readSwitchClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("switch", readSwitchInteractionInfo);
+    Map<String, InteractionInfo> readAdministratorCommissioningInteractionInfo =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readAdministratorCommissioningWindowStatusCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLevelControlCurrentLevelAttributeInteractionInfo =
+    InteractionInfo readAdministratorCommissioningWindowStatusAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .readCurrentLevelAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.AdministratorCommissioningCluster) cluster)
+                  .readWindowStatusAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readLevelControlCurrentLevelCommandParams);
-    readLevelControlInteractionInfo.put(
-        "readCurrentLevelAttribute", readLevelControlCurrentLevelAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readLevelControlRemainingTimeCommandParams =
+            readAdministratorCommissioningWindowStatusCommandParams);
+    readAdministratorCommissioningInteractionInfo.put(
+        "readWindowStatusAttribute",
+        readAdministratorCommissioningWindowStatusAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readAdministratorCommissioningAdminFabricIndexCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLevelControlRemainingTimeAttributeInteractionInfo =
+    InteractionInfo readAdministratorCommissioningAdminFabricIndexAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .readRemainingTimeAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.AdministratorCommissioningCluster) cluster)
+                  .readAdminFabricIndexAttribute(
+                      (ChipClusters.AdministratorCommissioningCluster
+                              .AdminFabricIndexAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readLevelControlRemainingTimeCommandParams);
-    readLevelControlInteractionInfo.put(
-        "readRemainingTimeAttribute", readLevelControlRemainingTimeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readLevelControlMinLevelCommandParams =
+            readAdministratorCommissioningAdminFabricIndexCommandParams);
+    readAdministratorCommissioningInteractionInfo.put(
+        "readAdminFabricIndexAttribute",
+        readAdministratorCommissioningAdminFabricIndexAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readAdministratorCommissioningAdminVendorIdCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLevelControlMinLevelAttributeInteractionInfo =
+    InteractionInfo readAdministratorCommissioningAdminVendorIdAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .readMinLevelAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.AdministratorCommissioningCluster) cluster)
+                  .readAdminVendorIdAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readLevelControlMinLevelCommandParams);
-    readLevelControlInteractionInfo.put(
-        "readMinLevelAttribute", readLevelControlMinLevelAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readLevelControlMaxLevelCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLevelControlMaxLevelAttributeInteractionInfo =
+            readAdministratorCommissioningAdminVendorIdCommandParams);
+    readAdministratorCommissioningInteractionInfo.put(
+        "readAdminVendorIdAttribute",
+        readAdministratorCommissioningAdminVendorIdAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readAdministratorCommissioningGeneratedCommandListCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readAdministratorCommissioningGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .readMaxLevelAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.AdministratorCommissioningCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.AdministratorCommissioningCluster
+                              .GeneratedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readLevelControlMaxLevelCommandParams);
-    readLevelControlInteractionInfo.put(
-        "readMaxLevelAttribute", readLevelControlMaxLevelAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readLevelControlCurrentFrequencyCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLevelControlCurrentFrequencyAttributeInteractionInfo =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedAdministratorCommissioningClusterGeneratedCommandListAttributeCallback(),
+            readAdministratorCommissioningGeneratedCommandListCommandParams);
+    readAdministratorCommissioningInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readAdministratorCommissioningGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readAdministratorCommissioningAcceptedCommandListCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readAdministratorCommissioningAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .readCurrentFrequencyAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.AdministratorCommissioningCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.AdministratorCommissioningCluster
+                              .AcceptedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readLevelControlCurrentFrequencyCommandParams);
-    readLevelControlInteractionInfo.put(
-        "readCurrentFrequencyAttribute", readLevelControlCurrentFrequencyAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readLevelControlMinFrequencyCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedAdministratorCommissioningClusterAcceptedCommandListAttributeCallback(),
+            readAdministratorCommissioningAcceptedCommandListCommandParams);
+    readAdministratorCommissioningInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readAdministratorCommissioningAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readAdministratorCommissioningAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLevelControlMinFrequencyAttributeInteractionInfo =
+    InteractionInfo readAdministratorCommissioningAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .readMinFrequencyAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.AdministratorCommissioningCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.AdministratorCommissioningCluster
+                              .AttributeListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readLevelControlMinFrequencyCommandParams);
-    readLevelControlInteractionInfo.put(
-        "readMinFrequencyAttribute", readLevelControlMinFrequencyAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readLevelControlMaxFrequencyCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedAdministratorCommissioningClusterAttributeListAttributeCallback(),
+            readAdministratorCommissioningAttributeListCommandParams);
+    readAdministratorCommissioningInteractionInfo.put(
+        "readAttributeListAttribute",
+        readAdministratorCommissioningAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readAdministratorCommissioningFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLevelControlMaxFrequencyAttributeInteractionInfo =
+    InteractionInfo readAdministratorCommissioningFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .readMaxFrequencyAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.AdministratorCommissioningCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readLevelControlMaxFrequencyCommandParams);
-    readLevelControlInteractionInfo.put(
-        "readMaxFrequencyAttribute", readLevelControlMaxFrequencyAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readLevelControlOptionsCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readAdministratorCommissioningFeatureMapCommandParams);
+    readAdministratorCommissioningInteractionInfo.put(
+        "readFeatureMapAttribute",
+        readAdministratorCommissioningFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readAdministratorCommissioningClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLevelControlOptionsAttributeInteractionInfo =
+    InteractionInfo readAdministratorCommissioningClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .readOptionsAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.AdministratorCommissioningCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readLevelControlOptionsCommandParams);
-    readLevelControlInteractionInfo.put(
-        "readOptionsAttribute", readLevelControlOptionsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readLevelControlOnOffTransitionTimeCommandParams =
+            readAdministratorCommissioningClusterRevisionCommandParams);
+    readAdministratorCommissioningInteractionInfo.put(
+        "readClusterRevisionAttribute",
+        readAdministratorCommissioningClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put(
+        "administratorCommissioning", readAdministratorCommissioningInteractionInfo);
+    Map<String, InteractionInfo> readOperationalCredentialsInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readOperationalCredentialsNOCsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLevelControlOnOffTransitionTimeAttributeInteractionInfo =
+    InteractionInfo readOperationalCredentialsNOCsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .readOnOffTransitionTimeAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
+                  .readNOCsAttribute(
+                      (ChipClusters.OperationalCredentialsCluster.NOCsAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readLevelControlOnOffTransitionTimeCommandParams);
-    readLevelControlInteractionInfo.put(
-        "readOnOffTransitionTimeAttribute",
-        readLevelControlOnOffTransitionTimeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readLevelControlOnLevelCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedOperationalCredentialsClusterNOCsAttributeCallback(),
+            readOperationalCredentialsNOCsCommandParams);
+    readOperationalCredentialsInteractionInfo.put(
+        "readNOCsAttribute", readOperationalCredentialsNOCsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOperationalCredentialsFabricsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLevelControlOnLevelAttributeInteractionInfo =
+    InteractionInfo readOperationalCredentialsFabricsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .readOnLevelAttribute(
-                      (ChipClusters.LevelControlCluster.OnLevelAttributeCallback) callback);
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
+                  .readFabricsAttribute(
+                      (ChipClusters.OperationalCredentialsCluster.FabricsAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readLevelControlOnLevelCommandParams);
-    readLevelControlInteractionInfo.put(
-        "readOnLevelAttribute", readLevelControlOnLevelAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readLevelControlOnTransitionTimeCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedOperationalCredentialsClusterFabricsAttributeCallback(),
+            readOperationalCredentialsFabricsCommandParams);
+    readOperationalCredentialsInteractionInfo.put(
+        "readFabricsAttribute", readOperationalCredentialsFabricsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOperationalCredentialsSupportedFabricsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLevelControlOnTransitionTimeAttributeInteractionInfo =
+    InteractionInfo readOperationalCredentialsSupportedFabricsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .readOnTransitionTimeAttribute(
-                      (ChipClusters.LevelControlCluster.OnTransitionTimeAttributeCallback)
-                          callback);
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
+                  .readSupportedFabricsAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readLevelControlOnTransitionTimeCommandParams);
-    readLevelControlInteractionInfo.put(
-        "readOnTransitionTimeAttribute", readLevelControlOnTransitionTimeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readLevelControlOffTransitionTimeCommandParams =
+            readOperationalCredentialsSupportedFabricsCommandParams);
+    readOperationalCredentialsInteractionInfo.put(
+        "readSupportedFabricsAttribute",
+        readOperationalCredentialsSupportedFabricsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOperationalCredentialsCommissionedFabricsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLevelControlOffTransitionTimeAttributeInteractionInfo =
+    InteractionInfo readOperationalCredentialsCommissionedFabricsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .readOffTransitionTimeAttribute(
-                      (ChipClusters.LevelControlCluster.OffTransitionTimeAttributeCallback)
-                          callback);
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
+                  .readCommissionedFabricsAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readLevelControlOffTransitionTimeCommandParams);
-    readLevelControlInteractionInfo.put(
-        "readOffTransitionTimeAttribute",
-        readLevelControlOffTransitionTimeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readLevelControlDefaultMoveRateCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLevelControlDefaultMoveRateAttributeInteractionInfo =
+            readOperationalCredentialsCommissionedFabricsCommandParams);
+    readOperationalCredentialsInteractionInfo.put(
+        "readCommissionedFabricsAttribute",
+        readOperationalCredentialsCommissionedFabricsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readOperationalCredentialsTrustedRootCertificatesCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readOperationalCredentialsTrustedRootCertificatesAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .readDefaultMoveRateAttribute(
-                      (ChipClusters.LevelControlCluster.DefaultMoveRateAttributeCallback) callback);
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
+                  .readTrustedRootCertificatesAttribute(
+                      (ChipClusters.OperationalCredentialsCluster
+                              .TrustedRootCertificatesAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readLevelControlDefaultMoveRateCommandParams);
-    readLevelControlInteractionInfo.put(
-        "readDefaultMoveRateAttribute", readLevelControlDefaultMoveRateAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readLevelControlStartUpCurrentLevelCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedOperationalCredentialsClusterTrustedRootCertificatesAttributeCallback(),
+            readOperationalCredentialsTrustedRootCertificatesCommandParams);
+    readOperationalCredentialsInteractionInfo.put(
+        "readTrustedRootCertificatesAttribute",
+        readOperationalCredentialsTrustedRootCertificatesAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOperationalCredentialsCurrentFabricIndexCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLevelControlStartUpCurrentLevelAttributeInteractionInfo =
+    InteractionInfo readOperationalCredentialsCurrentFabricIndexAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .readStartUpCurrentLevelAttribute(
-                      (ChipClusters.LevelControlCluster.StartUpCurrentLevelAttributeCallback)
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
+                  .readCurrentFabricIndexAttribute(
+                      (ChipClusters.OperationalCredentialsCluster
+                              .CurrentFabricIndexAttributeCallback)
                           callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readLevelControlStartUpCurrentLevelCommandParams);
-    readLevelControlInteractionInfo.put(
-        "readStartUpCurrentLevelAttribute",
-        readLevelControlStartUpCurrentLevelAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readLevelControlGeneratedCommandListCommandParams =
+            readOperationalCredentialsCurrentFabricIndexCommandParams);
+    readOperationalCredentialsInteractionInfo.put(
+        "readCurrentFabricIndexAttribute",
+        readOperationalCredentialsCurrentFabricIndexAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOperationalCredentialsGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLevelControlGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readOperationalCredentialsGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
                   .readGeneratedCommandListAttribute(
-                      (ChipClusters.LevelControlCluster.GeneratedCommandListAttributeCallback)
+                      (ChipClusters.OperationalCredentialsCluster
+                              .GeneratedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedLevelControlClusterGeneratedCommandListAttributeCallback(),
-            readLevelControlGeneratedCommandListCommandParams);
-    readLevelControlInteractionInfo.put(
+                    .DelegatedOperationalCredentialsClusterGeneratedCommandListAttributeCallback(),
+            readOperationalCredentialsGeneratedCommandListCommandParams);
+    readOperationalCredentialsInteractionInfo.put(
         "readGeneratedCommandListAttribute",
-        readLevelControlGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readLevelControlAcceptedCommandListCommandParams =
+        readOperationalCredentialsGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOperationalCredentialsAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLevelControlAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readOperationalCredentialsAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
                   .readAcceptedCommandListAttribute(
-                      (ChipClusters.LevelControlCluster.AcceptedCommandListAttributeCallback)
+                      (ChipClusters.OperationalCredentialsCluster
+                              .AcceptedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedLevelControlClusterAcceptedCommandListAttributeCallback(),
-            readLevelControlAcceptedCommandListCommandParams);
-    readLevelControlInteractionInfo.put(
+                    .DelegatedOperationalCredentialsClusterAcceptedCommandListAttributeCallback(),
+            readOperationalCredentialsAcceptedCommandListCommandParams);
+    readOperationalCredentialsInteractionInfo.put(
         "readAcceptedCommandListAttribute",
-        readLevelControlAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readLevelControlAttributeListCommandParams =
+        readOperationalCredentialsAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOperationalCredentialsAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLevelControlAttributeListAttributeInteractionInfo =
+    InteractionInfo readOperationalCredentialsAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.LevelControlCluster.AttributeListAttributeCallback) callback);
+                      (ChipClusters.OperationalCredentialsCluster.AttributeListAttributeCallback)
+                          callback);
             },
             () ->
-                new ClusterInfoMapping.DelegatedLevelControlClusterAttributeListAttributeCallback(),
-            readLevelControlAttributeListCommandParams);
-    readLevelControlInteractionInfo.put(
-        "readAttributeListAttribute", readLevelControlAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readLevelControlFeatureMapCommandParams =
+                new ClusterInfoMapping
+                    .DelegatedOperationalCredentialsClusterAttributeListAttributeCallback(),
+            readOperationalCredentialsAttributeListCommandParams);
+    readOperationalCredentialsInteractionInfo.put(
+        "readAttributeListAttribute",
+        readOperationalCredentialsAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOperationalCredentialsFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLevelControlFeatureMapAttributeInteractionInfo =
+    InteractionInfo readOperationalCredentialsFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readLevelControlFeatureMapCommandParams);
-    readLevelControlInteractionInfo.put(
-        "readFeatureMapAttribute", readLevelControlFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readLevelControlClusterRevisionCommandParams =
+            readOperationalCredentialsFeatureMapCommandParams);
+    readOperationalCredentialsInteractionInfo.put(
+        "readFeatureMapAttribute", readOperationalCredentialsFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOperationalCredentialsClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLevelControlClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readOperationalCredentialsClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readLevelControlClusterRevisionCommandParams);
-    readLevelControlInteractionInfo.put(
-        "readClusterRevisionAttribute", readLevelControlClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("levelControl", readLevelControlInteractionInfo);
-    Map<String, InteractionInfo> readLocalizationConfigurationInteractionInfo =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readLocalizationConfigurationActiveLocaleCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLocalizationConfigurationActiveLocaleAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LocalizationConfigurationCluster) cluster)
-                  .readActiveLocaleAttribute((ChipClusters.CharStringAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readLocalizationConfigurationActiveLocaleCommandParams);
-    readLocalizationConfigurationInteractionInfo.put(
-        "readActiveLocaleAttribute",
-        readLocalizationConfigurationActiveLocaleAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readLocalizationConfigurationSupportedLocalesCommandParams =
+            readOperationalCredentialsClusterRevisionCommandParams);
+    readOperationalCredentialsInteractionInfo.put(
+        "readClusterRevisionAttribute",
+        readOperationalCredentialsClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("operationalCredentials", readOperationalCredentialsInteractionInfo);
+    Map<String, InteractionInfo> readGroupKeyManagementInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readGroupKeyManagementGroupKeyMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLocalizationConfigurationSupportedLocalesAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LocalizationConfigurationCluster) cluster)
-                  .readSupportedLocalesAttribute(
-                      (ChipClusters.LocalizationConfigurationCluster
-                              .SupportedLocalesAttributeCallback)
-                          callback);
-            },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedLocalizationConfigurationClusterSupportedLocalesAttributeCallback(),
-            readLocalizationConfigurationSupportedLocalesCommandParams);
-    readLocalizationConfigurationInteractionInfo.put(
-        "readSupportedLocalesAttribute",
-        readLocalizationConfigurationSupportedLocalesAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readLocalizationConfigurationGeneratedCommandListCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLocalizationConfigurationGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readGroupKeyManagementGroupKeyMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LocalizationConfigurationCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.LocalizationConfigurationCluster
-                              .GeneratedCommandListAttributeCallback)
+              ((ChipClusters.GroupKeyManagementCluster) cluster)
+                  .readGroupKeyMapAttribute(
+                      (ChipClusters.GroupKeyManagementCluster.GroupKeyMapAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedLocalizationConfigurationClusterGeneratedCommandListAttributeCallback(),
-            readLocalizationConfigurationGeneratedCommandListCommandParams);
-    readLocalizationConfigurationInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readLocalizationConfigurationGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readLocalizationConfigurationAcceptedCommandListCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLocalizationConfigurationAcceptedCommandListAttributeInteractionInfo =
+                    .DelegatedGroupKeyManagementClusterGroupKeyMapAttributeCallback(),
+            readGroupKeyManagementGroupKeyMapCommandParams);
+    readGroupKeyManagementInteractionInfo.put(
+        "readGroupKeyMapAttribute", readGroupKeyManagementGroupKeyMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGroupKeyManagementGroupTableCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readGroupKeyManagementGroupTableAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LocalizationConfigurationCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.LocalizationConfigurationCluster
-                              .AcceptedCommandListAttributeCallback)
+              ((ChipClusters.GroupKeyManagementCluster) cluster)
+                  .readGroupTableAttribute(
+                      (ChipClusters.GroupKeyManagementCluster.GroupTableAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedLocalizationConfigurationClusterAcceptedCommandListAttributeCallback(),
-            readLocalizationConfigurationAcceptedCommandListCommandParams);
-    readLocalizationConfigurationInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readLocalizationConfigurationAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readLocalizationConfigurationFeatureMapCommandParams =
+                    .DelegatedGroupKeyManagementClusterGroupTableAttributeCallback(),
+            readGroupKeyManagementGroupTableCommandParams);
+    readGroupKeyManagementInteractionInfo.put(
+        "readGroupTableAttribute", readGroupKeyManagementGroupTableAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGroupKeyManagementMaxGroupsPerFabricCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLocalizationConfigurationFeatureMapAttributeInteractionInfo =
+    InteractionInfo readGroupKeyManagementMaxGroupsPerFabricAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LocalizationConfigurationCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.GroupKeyManagementCluster) cluster)
+                  .readMaxGroupsPerFabricAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readLocalizationConfigurationFeatureMapCommandParams);
-    readLocalizationConfigurationInteractionInfo.put(
-        "readFeatureMapAttribute", readLocalizationConfigurationFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readLocalizationConfigurationClusterRevisionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readGroupKeyManagementMaxGroupsPerFabricCommandParams);
+    readGroupKeyManagementInteractionInfo.put(
+        "readMaxGroupsPerFabricAttribute",
+        readGroupKeyManagementMaxGroupsPerFabricAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGroupKeyManagementMaxGroupKeysPerFabricCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLocalizationConfigurationClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readGroupKeyManagementMaxGroupKeysPerFabricAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LocalizationConfigurationCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.GroupKeyManagementCluster) cluster)
+                  .readMaxGroupKeysPerFabricAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readLocalizationConfigurationClusterRevisionCommandParams);
-    readLocalizationConfigurationInteractionInfo.put(
-        "readClusterRevisionAttribute",
-        readLocalizationConfigurationClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("localizationConfiguration", readLocalizationConfigurationInteractionInfo);
-    Map<String, InteractionInfo> readLowPowerInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readLowPowerGeneratedCommandListCommandParams =
+            readGroupKeyManagementMaxGroupKeysPerFabricCommandParams);
+    readGroupKeyManagementInteractionInfo.put(
+        "readMaxGroupKeysPerFabricAttribute",
+        readGroupKeyManagementMaxGroupKeysPerFabricAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGroupKeyManagementGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLowPowerGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readGroupKeyManagementGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LowPowerCluster) cluster)
+              ((ChipClusters.GroupKeyManagementCluster) cluster)
                   .readGeneratedCommandListAttribute(
-                      (ChipClusters.LowPowerCluster.GeneratedCommandListAttributeCallback)
+                      (ChipClusters.GroupKeyManagementCluster.GeneratedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedLowPowerClusterGeneratedCommandListAttributeCallback(),
-            readLowPowerGeneratedCommandListCommandParams);
-    readLowPowerInteractionInfo.put(
+                    .DelegatedGroupKeyManagementClusterGeneratedCommandListAttributeCallback(),
+            readGroupKeyManagementGeneratedCommandListCommandParams);
+    readGroupKeyManagementInteractionInfo.put(
         "readGeneratedCommandListAttribute",
-        readLowPowerGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readLowPowerAcceptedCommandListCommandParams =
+        readGroupKeyManagementGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGroupKeyManagementAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLowPowerAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readGroupKeyManagementAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LowPowerCluster) cluster)
+              ((ChipClusters.GroupKeyManagementCluster) cluster)
                   .readAcceptedCommandListAttribute(
-                      (ChipClusters.LowPowerCluster.AcceptedCommandListAttributeCallback) callback);
+                      (ChipClusters.GroupKeyManagementCluster.AcceptedCommandListAttributeCallback)
+                          callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedLowPowerClusterAcceptedCommandListAttributeCallback(),
-            readLowPowerAcceptedCommandListCommandParams);
-    readLowPowerInteractionInfo.put(
+                    .DelegatedGroupKeyManagementClusterAcceptedCommandListAttributeCallback(),
+            readGroupKeyManagementAcceptedCommandListCommandParams);
+    readGroupKeyManagementInteractionInfo.put(
         "readAcceptedCommandListAttribute",
-        readLowPowerAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readLowPowerAttributeListCommandParams =
+        readGroupKeyManagementAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGroupKeyManagementAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLowPowerAttributeListAttributeInteractionInfo =
+    InteractionInfo readGroupKeyManagementAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LowPowerCluster) cluster)
+              ((ChipClusters.GroupKeyManagementCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.LowPowerCluster.AttributeListAttributeCallback) callback);
+                      (ChipClusters.GroupKeyManagementCluster.AttributeListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLowPowerClusterAttributeListAttributeCallback(),
-            readLowPowerAttributeListCommandParams);
-    readLowPowerInteractionInfo.put(
-        "readAttributeListAttribute", readLowPowerAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readLowPowerFeatureMapCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedGroupKeyManagementClusterAttributeListAttributeCallback(),
+            readGroupKeyManagementAttributeListCommandParams);
+    readGroupKeyManagementInteractionInfo.put(
+        "readAttributeListAttribute", readGroupKeyManagementAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGroupKeyManagementFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLowPowerFeatureMapAttributeInteractionInfo =
+    InteractionInfo readGroupKeyManagementFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LowPowerCluster) cluster)
+              ((ChipClusters.GroupKeyManagementCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readLowPowerFeatureMapCommandParams);
-    readLowPowerInteractionInfo.put(
-        "readFeatureMapAttribute", readLowPowerFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readLowPowerClusterRevisionCommandParams =
+            readGroupKeyManagementFeatureMapCommandParams);
+    readGroupKeyManagementInteractionInfo.put(
+        "readFeatureMapAttribute", readGroupKeyManagementFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readGroupKeyManagementClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readLowPowerClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readGroupKeyManagementClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LowPowerCluster) cluster)
+              ((ChipClusters.GroupKeyManagementCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readLowPowerClusterRevisionCommandParams);
-    readLowPowerInteractionInfo.put(
-        "readClusterRevisionAttribute", readLowPowerClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("lowPower", readLowPowerInteractionInfo);
-    Map<String, InteractionInfo> readMediaInputInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readMediaInputInputListCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readMediaInputInputListAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaInputCluster) cluster)
-                  .readInputListAttribute(
-                      (ChipClusters.MediaInputCluster.InputListAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedMediaInputClusterInputListAttributeCallback(),
-            readMediaInputInputListCommandParams);
-    readMediaInputInteractionInfo.put(
-        "readInputListAttribute", readMediaInputInputListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readMediaInputCurrentInputCommandParams =
+            readGroupKeyManagementClusterRevisionCommandParams);
+    readGroupKeyManagementInteractionInfo.put(
+        "readClusterRevisionAttribute",
+        readGroupKeyManagementClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("groupKeyManagement", readGroupKeyManagementInteractionInfo);
+    Map<String, InteractionInfo> readFixedLabelInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readFixedLabelLabelListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readMediaInputCurrentInputAttributeInteractionInfo =
+    InteractionInfo readFixedLabelLabelListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaInputCluster) cluster)
-                  .readCurrentInputAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.FixedLabelCluster) cluster)
+                  .readLabelListAttribute(
+                      (ChipClusters.FixedLabelCluster.LabelListAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readMediaInputCurrentInputCommandParams);
-    readMediaInputInteractionInfo.put(
-        "readCurrentInputAttribute", readMediaInputCurrentInputAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readMediaInputGeneratedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedFixedLabelClusterLabelListAttributeCallback(),
+            readFixedLabelLabelListCommandParams);
+    readFixedLabelInteractionInfo.put(
+        "readLabelListAttribute", readFixedLabelLabelListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFixedLabelGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readMediaInputGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readFixedLabelGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaInputCluster) cluster)
+              ((ChipClusters.FixedLabelCluster) cluster)
                   .readGeneratedCommandListAttribute(
-                      (ChipClusters.MediaInputCluster.GeneratedCommandListAttributeCallback)
+                      (ChipClusters.FixedLabelCluster.GeneratedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedMediaInputClusterGeneratedCommandListAttributeCallback(),
-            readMediaInputGeneratedCommandListCommandParams);
-    readMediaInputInteractionInfo.put(
+                    .DelegatedFixedLabelClusterGeneratedCommandListAttributeCallback(),
+            readFixedLabelGeneratedCommandListCommandParams);
+    readFixedLabelInteractionInfo.put(
         "readGeneratedCommandListAttribute",
-        readMediaInputGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readMediaInputAcceptedCommandListCommandParams =
+        readFixedLabelGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFixedLabelAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readMediaInputAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readFixedLabelAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaInputCluster) cluster)
+              ((ChipClusters.FixedLabelCluster) cluster)
                   .readAcceptedCommandListAttribute(
-                      (ChipClusters.MediaInputCluster.AcceptedCommandListAttributeCallback)
+                      (ChipClusters.FixedLabelCluster.AcceptedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedMediaInputClusterAcceptedCommandListAttributeCallback(),
-            readMediaInputAcceptedCommandListCommandParams);
-    readMediaInputInteractionInfo.put(
+                    .DelegatedFixedLabelClusterAcceptedCommandListAttributeCallback(),
+            readFixedLabelAcceptedCommandListCommandParams);
+    readFixedLabelInteractionInfo.put(
         "readAcceptedCommandListAttribute",
-        readMediaInputAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readMediaInputAttributeListCommandParams =
+        readFixedLabelAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFixedLabelAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readMediaInputAttributeListAttributeInteractionInfo =
+    InteractionInfo readFixedLabelAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaInputCluster) cluster)
+              ((ChipClusters.FixedLabelCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.MediaInputCluster.AttributeListAttributeCallback) callback);
+                      (ChipClusters.FixedLabelCluster.AttributeListAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedMediaInputClusterAttributeListAttributeCallback(),
-            readMediaInputAttributeListCommandParams);
-    readMediaInputInteractionInfo.put(
-        "readAttributeListAttribute", readMediaInputAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readMediaInputFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedFixedLabelClusterAttributeListAttributeCallback(),
+            readFixedLabelAttributeListCommandParams);
+    readFixedLabelInteractionInfo.put(
+        "readAttributeListAttribute", readFixedLabelAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFixedLabelFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readMediaInputFeatureMapAttributeInteractionInfo =
+    InteractionInfo readFixedLabelFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaInputCluster) cluster)
+              ((ChipClusters.FixedLabelCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readMediaInputFeatureMapCommandParams);
-    readMediaInputInteractionInfo.put(
-        "readFeatureMapAttribute", readMediaInputFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readMediaInputClusterRevisionCommandParams =
+            readFixedLabelFeatureMapCommandParams);
+    readFixedLabelInteractionInfo.put(
+        "readFeatureMapAttribute", readFixedLabelFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFixedLabelClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readMediaInputClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readFixedLabelClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaInputCluster) cluster)
+              ((ChipClusters.FixedLabelCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readMediaInputClusterRevisionCommandParams);
-    readMediaInputInteractionInfo.put(
-        "readClusterRevisionAttribute", readMediaInputClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("mediaInput", readMediaInputInteractionInfo);
-    Map<String, InteractionInfo> readMediaPlaybackInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readMediaPlaybackCurrentStateCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readMediaPlaybackCurrentStateAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .readCurrentStateAttribute((ChipClusters.IntegerAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readMediaPlaybackCurrentStateCommandParams);
-    readMediaPlaybackInteractionInfo.put(
-        "readCurrentStateAttribute", readMediaPlaybackCurrentStateAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readMediaPlaybackStartTimeCommandParams =
+            readFixedLabelClusterRevisionCommandParams);
+    readFixedLabelInteractionInfo.put(
+        "readClusterRevisionAttribute", readFixedLabelClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("fixedLabel", readFixedLabelInteractionInfo);
+    Map<String, InteractionInfo> readUserLabelInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readUserLabelLabelListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readMediaPlaybackStartTimeAttributeInteractionInfo =
+    InteractionInfo readUserLabelLabelListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .readStartTimeAttribute(
-                      (ChipClusters.MediaPlaybackCluster.StartTimeAttributeCallback) callback);
+              ((ChipClusters.UserLabelCluster) cluster)
+                  .readLabelListAttribute(
+                      (ChipClusters.UserLabelCluster.LabelListAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readMediaPlaybackStartTimeCommandParams);
-    readMediaPlaybackInteractionInfo.put(
-        "readStartTimeAttribute", readMediaPlaybackStartTimeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readMediaPlaybackDurationCommandParams =
+            () -> new ClusterInfoMapping.DelegatedUserLabelClusterLabelListAttributeCallback(),
+            readUserLabelLabelListCommandParams);
+    readUserLabelInteractionInfo.put(
+        "readLabelListAttribute", readUserLabelLabelListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readUserLabelGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readMediaPlaybackDurationAttributeInteractionInfo =
+    InteractionInfo readUserLabelGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .readDurationAttribute(
-                      (ChipClusters.MediaPlaybackCluster.DurationAttributeCallback) callback);
+              ((ChipClusters.UserLabelCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.UserLabelCluster.GeneratedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readMediaPlaybackDurationCommandParams);
-    readMediaPlaybackInteractionInfo.put(
-        "readDurationAttribute", readMediaPlaybackDurationAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readMediaPlaybackPlaybackSpeedCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedUserLabelClusterGeneratedCommandListAttributeCallback(),
+            readUserLabelGeneratedCommandListCommandParams);
+    readUserLabelInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readUserLabelGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readUserLabelAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readMediaPlaybackPlaybackSpeedAttributeInteractionInfo =
+    InteractionInfo readUserLabelAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .readPlaybackSpeedAttribute((ChipClusters.FloatAttributeCallback) callback);
+              ((ChipClusters.UserLabelCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.UserLabelCluster.AcceptedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedFloatAttributeCallback(),
-            readMediaPlaybackPlaybackSpeedCommandParams);
-    readMediaPlaybackInteractionInfo.put(
-        "readPlaybackSpeedAttribute", readMediaPlaybackPlaybackSpeedAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readMediaPlaybackSeekRangeEndCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedUserLabelClusterAcceptedCommandListAttributeCallback(),
+            readUserLabelAcceptedCommandListCommandParams);
+    readUserLabelInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readUserLabelAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readUserLabelFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readMediaPlaybackSeekRangeEndAttributeInteractionInfo =
+    InteractionInfo readUserLabelFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .readSeekRangeEndAttribute(
-                      (ChipClusters.MediaPlaybackCluster.SeekRangeEndAttributeCallback) callback);
+              ((ChipClusters.UserLabelCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readMediaPlaybackSeekRangeEndCommandParams);
-    readMediaPlaybackInteractionInfo.put(
-        "readSeekRangeEndAttribute", readMediaPlaybackSeekRangeEndAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readMediaPlaybackSeekRangeStartCommandParams =
+            readUserLabelFeatureMapCommandParams);
+    readUserLabelInteractionInfo.put(
+        "readFeatureMapAttribute", readUserLabelFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readUserLabelClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readMediaPlaybackSeekRangeStartAttributeInteractionInfo =
+    InteractionInfo readUserLabelClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .readSeekRangeStartAttribute(
-                      (ChipClusters.MediaPlaybackCluster.SeekRangeStartAttributeCallback) callback);
+              ((ChipClusters.UserLabelCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readMediaPlaybackSeekRangeStartCommandParams);
-    readMediaPlaybackInteractionInfo.put(
-        "readSeekRangeStartAttribute", readMediaPlaybackSeekRangeStartAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readMediaPlaybackGeneratedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readUserLabelClusterRevisionCommandParams);
+    readUserLabelInteractionInfo.put(
+        "readClusterRevisionAttribute", readUserLabelClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("userLabel", readUserLabelInteractionInfo);
+    Map<String, InteractionInfo> readBooleanStateInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readBooleanStateStateValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readMediaPlaybackGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readBooleanStateStateValueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaPlaybackCluster) cluster)
+              ((ChipClusters.BooleanStateCluster) cluster)
+                  .readStateValueAttribute((ChipClusters.BooleanAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readBooleanStateStateValueCommandParams);
+    readBooleanStateInteractionInfo.put(
+        "readStateValueAttribute", readBooleanStateStateValueAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBooleanStateGeneratedCommandListCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readBooleanStateGeneratedCommandListAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.BooleanStateCluster) cluster)
                   .readGeneratedCommandListAttribute(
-                      (ChipClusters.MediaPlaybackCluster.GeneratedCommandListAttributeCallback)
+                      (ChipClusters.BooleanStateCluster.GeneratedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedMediaPlaybackClusterGeneratedCommandListAttributeCallback(),
-            readMediaPlaybackGeneratedCommandListCommandParams);
-    readMediaPlaybackInteractionInfo.put(
+                    .DelegatedBooleanStateClusterGeneratedCommandListAttributeCallback(),
+            readBooleanStateGeneratedCommandListCommandParams);
+    readBooleanStateInteractionInfo.put(
         "readGeneratedCommandListAttribute",
-        readMediaPlaybackGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readMediaPlaybackAcceptedCommandListCommandParams =
+        readBooleanStateGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBooleanStateAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readMediaPlaybackAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readBooleanStateAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaPlaybackCluster) cluster)
+              ((ChipClusters.BooleanStateCluster) cluster)
                   .readAcceptedCommandListAttribute(
-                      (ChipClusters.MediaPlaybackCluster.AcceptedCommandListAttributeCallback)
+                      (ChipClusters.BooleanStateCluster.AcceptedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedMediaPlaybackClusterAcceptedCommandListAttributeCallback(),
-            readMediaPlaybackAcceptedCommandListCommandParams);
-    readMediaPlaybackInteractionInfo.put(
+                    .DelegatedBooleanStateClusterAcceptedCommandListAttributeCallback(),
+            readBooleanStateAcceptedCommandListCommandParams);
+    readBooleanStateInteractionInfo.put(
         "readAcceptedCommandListAttribute",
-        readMediaPlaybackAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readMediaPlaybackAttributeListCommandParams =
+        readBooleanStateAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBooleanStateAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readMediaPlaybackAttributeListAttributeInteractionInfo =
+    InteractionInfo readBooleanStateAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaPlaybackCluster) cluster)
+              ((ChipClusters.BooleanStateCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.MediaPlaybackCluster.AttributeListAttributeCallback) callback);
+                      (ChipClusters.BooleanStateCluster.AttributeListAttributeCallback) callback);
             },
             () ->
-                new ClusterInfoMapping
-                    .DelegatedMediaPlaybackClusterAttributeListAttributeCallback(),
-            readMediaPlaybackAttributeListCommandParams);
-    readMediaPlaybackInteractionInfo.put(
-        "readAttributeListAttribute", readMediaPlaybackAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readMediaPlaybackFeatureMapCommandParams =
+                new ClusterInfoMapping.DelegatedBooleanStateClusterAttributeListAttributeCallback(),
+            readBooleanStateAttributeListCommandParams);
+    readBooleanStateInteractionInfo.put(
+        "readAttributeListAttribute", readBooleanStateAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBooleanStateFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readMediaPlaybackFeatureMapAttributeInteractionInfo =
+    InteractionInfo readBooleanStateFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaPlaybackCluster) cluster)
+              ((ChipClusters.BooleanStateCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readMediaPlaybackFeatureMapCommandParams);
-    readMediaPlaybackInteractionInfo.put(
-        "readFeatureMapAttribute", readMediaPlaybackFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readMediaPlaybackClusterRevisionCommandParams =
+            readBooleanStateFeatureMapCommandParams);
+    readBooleanStateInteractionInfo.put(
+        "readFeatureMapAttribute", readBooleanStateFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBooleanStateClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readMediaPlaybackClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readBooleanStateClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.MediaPlaybackCluster) cluster)
+              ((ChipClusters.BooleanStateCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readMediaPlaybackClusterRevisionCommandParams);
-    readMediaPlaybackInteractionInfo.put(
-        "readClusterRevisionAttribute", readMediaPlaybackClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("mediaPlayback", readMediaPlaybackInteractionInfo);
+            readBooleanStateClusterRevisionCommandParams);
+    readBooleanStateInteractionInfo.put(
+        "readClusterRevisionAttribute", readBooleanStateClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("booleanState", readBooleanStateInteractionInfo);
     Map<String, InteractionInfo> readModeSelectInteractionInfo = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> readModeSelectDescriptionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
@@ -5930,6215 +6062,6083 @@ public Map<String, Map<String, InteractionInfo>> getReadAttributeMap() {
     readModeSelectInteractionInfo.put(
         "readClusterRevisionAttribute", readModeSelectClusterRevisionAttributeInteractionInfo);
     readAttributeMap.put("modeSelect", readModeSelectInteractionInfo);
-    Map<String, InteractionInfo> readNetworkCommissioningInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readNetworkCommissioningMaxNetworksCommandParams =
+    Map<String, InteractionInfo> readDoorLockInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readDoorLockLockStateCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readNetworkCommissioningMaxNetworksAttributeInteractionInfo =
+    InteractionInfo readDoorLockLockStateAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .readMaxNetworksAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .readLockStateAttribute(
+                      (ChipClusters.DoorLockCluster.LockStateAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readNetworkCommissioningMaxNetworksCommandParams);
-    readNetworkCommissioningInteractionInfo.put(
-        "readMaxNetworksAttribute", readNetworkCommissioningMaxNetworksAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readNetworkCommissioningNetworksCommandParams =
+            readDoorLockLockStateCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readLockStateAttribute", readDoorLockLockStateAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockLockTypeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readNetworkCommissioningNetworksAttributeInteractionInfo =
+    InteractionInfo readDoorLockLockTypeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .readNetworksAttribute(
-                      (ChipClusters.NetworkCommissioningCluster.NetworksAttributeCallback)
-                          callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .readLockTypeAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedNetworkCommissioningClusterNetworksAttributeCallback(),
-            readNetworkCommissioningNetworksCommandParams);
-    readNetworkCommissioningInteractionInfo.put(
-        "readNetworksAttribute", readNetworkCommissioningNetworksAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readNetworkCommissioningScanMaxTimeSecondsCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readDoorLockLockTypeCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readLockTypeAttribute", readDoorLockLockTypeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockActuatorEnabledCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readNetworkCommissioningScanMaxTimeSecondsAttributeInteractionInfo =
+    InteractionInfo readDoorLockActuatorEnabledAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .readScanMaxTimeSecondsAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .readActuatorEnabledAttribute((ChipClusters.BooleanAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readNetworkCommissioningScanMaxTimeSecondsCommandParams);
-    readNetworkCommissioningInteractionInfo.put(
-        "readScanMaxTimeSecondsAttribute",
-        readNetworkCommissioningScanMaxTimeSecondsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readNetworkCommissioningConnectMaxTimeSecondsCommandParams =
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readDoorLockActuatorEnabledCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readActuatorEnabledAttribute", readDoorLockActuatorEnabledAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockDoorStateCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readNetworkCommissioningConnectMaxTimeSecondsAttributeInteractionInfo =
+    InteractionInfo readDoorLockDoorStateAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .readConnectMaxTimeSecondsAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .readDoorStateAttribute(
+                      (ChipClusters.DoorLockCluster.DoorStateAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readNetworkCommissioningConnectMaxTimeSecondsCommandParams);
-    readNetworkCommissioningInteractionInfo.put(
-        "readConnectMaxTimeSecondsAttribute",
-        readNetworkCommissioningConnectMaxTimeSecondsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readNetworkCommissioningInterfaceEnabledCommandParams =
+            readDoorLockDoorStateCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readDoorStateAttribute", readDoorLockDoorStateAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockNumberOfTotalUsersSupportedCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readNetworkCommissioningInterfaceEnabledAttributeInteractionInfo =
+    InteractionInfo readDoorLockNumberOfTotalUsersSupportedAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .readInterfaceEnabledAttribute((ChipClusters.BooleanAttributeCallback) callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .readNumberOfTotalUsersSupportedAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readNetworkCommissioningInterfaceEnabledCommandParams);
-    readNetworkCommissioningInteractionInfo.put(
-        "readInterfaceEnabledAttribute",
-        readNetworkCommissioningInterfaceEnabledAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readNetworkCommissioningLastNetworkingStatusCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readDoorLockNumberOfTotalUsersSupportedCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readNumberOfTotalUsersSupportedAttribute",
+        readDoorLockNumberOfTotalUsersSupportedAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockNumberOfPINUsersSupportedCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readNetworkCommissioningLastNetworkingStatusAttributeInteractionInfo =
+    InteractionInfo readDoorLockNumberOfPINUsersSupportedAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .readLastNetworkingStatusAttribute(
-                      (ChipClusters.NetworkCommissioningCluster
-                              .LastNetworkingStatusAttributeCallback)
-                          callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .readNumberOfPINUsersSupportedAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readNetworkCommissioningLastNetworkingStatusCommandParams);
-    readNetworkCommissioningInteractionInfo.put(
-        "readLastNetworkingStatusAttribute",
-        readNetworkCommissioningLastNetworkingStatusAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readNetworkCommissioningLastNetworkIDCommandParams =
+            readDoorLockNumberOfPINUsersSupportedCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readNumberOfPINUsersSupportedAttribute",
+        readDoorLockNumberOfPINUsersSupportedAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockNumberOfRFIDUsersSupportedCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readNetworkCommissioningLastNetworkIDAttributeInteractionInfo =
+    InteractionInfo readDoorLockNumberOfRFIDUsersSupportedAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .readLastNetworkIDAttribute(
-                      (ChipClusters.NetworkCommissioningCluster.LastNetworkIDAttributeCallback)
-                          callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .readNumberOfRFIDUsersSupportedAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedOctetStringAttributeCallback(),
-            readNetworkCommissioningLastNetworkIDCommandParams);
-    readNetworkCommissioningInteractionInfo.put(
-        "readLastNetworkIDAttribute",
-        readNetworkCommissioningLastNetworkIDAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readNetworkCommissioningLastConnectErrorValueCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readNetworkCommissioningLastConnectErrorValueAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readDoorLockNumberOfRFIDUsersSupportedCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readNumberOfRFIDUsersSupportedAttribute",
+        readDoorLockNumberOfRFIDUsersSupportedAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readDoorLockNumberOfWeekDaySchedulesSupportedPerUserCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readDoorLockNumberOfWeekDaySchedulesSupportedPerUserAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .readLastConnectErrorValueAttribute(
-                      (ChipClusters.NetworkCommissioningCluster
-                              .LastConnectErrorValueAttributeCallback)
-                          callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .readNumberOfWeekDaySchedulesSupportedPerUserAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readNetworkCommissioningLastConnectErrorValueCommandParams);
-    readNetworkCommissioningInteractionInfo.put(
-        "readLastConnectErrorValueAttribute",
-        readNetworkCommissioningLastConnectErrorValueAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readNetworkCommissioningGeneratedCommandListCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readNetworkCommissioningGeneratedCommandListAttributeInteractionInfo =
-        new InteractionInfo(
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readDoorLockNumberOfWeekDaySchedulesSupportedPerUserCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readNumberOfWeekDaySchedulesSupportedPerUserAttribute",
+        readDoorLockNumberOfWeekDaySchedulesSupportedPerUserAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readDoorLockNumberOfYearDaySchedulesSupportedPerUserCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readDoorLockNumberOfYearDaySchedulesSupportedPerUserAttributeInteractionInfo =
+        new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.NetworkCommissioningCluster
-                              .GeneratedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .readNumberOfYearDaySchedulesSupportedPerUserAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedNetworkCommissioningClusterGeneratedCommandListAttributeCallback(),
-            readNetworkCommissioningGeneratedCommandListCommandParams);
-    readNetworkCommissioningInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readNetworkCommissioningGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readNetworkCommissioningAcceptedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readDoorLockNumberOfYearDaySchedulesSupportedPerUserCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readNumberOfYearDaySchedulesSupportedPerUserAttribute",
+        readDoorLockNumberOfYearDaySchedulesSupportedPerUserAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockNumberOfHolidaySchedulesSupportedCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readNetworkCommissioningAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readDoorLockNumberOfHolidaySchedulesSupportedAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.NetworkCommissioningCluster
-                              .AcceptedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .readNumberOfHolidaySchedulesSupportedAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedNetworkCommissioningClusterAcceptedCommandListAttributeCallback(),
-            readNetworkCommissioningAcceptedCommandListCommandParams);
-    readNetworkCommissioningInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readNetworkCommissioningAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readNetworkCommissioningFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readDoorLockNumberOfHolidaySchedulesSupportedCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readNumberOfHolidaySchedulesSupportedAttribute",
+        readDoorLockNumberOfHolidaySchedulesSupportedAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockMaxPINCodeLengthCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readNetworkCommissioningFeatureMapAttributeInteractionInfo =
+    InteractionInfo readDoorLockMaxPINCodeLengthAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .readMaxPINCodeLengthAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readNetworkCommissioningFeatureMapCommandParams);
-    readNetworkCommissioningInteractionInfo.put(
-        "readFeatureMapAttribute", readNetworkCommissioningFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readNetworkCommissioningClusterRevisionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readDoorLockMaxPINCodeLengthCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readMaxPINCodeLengthAttribute", readDoorLockMaxPINCodeLengthAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockMinPINCodeLengthCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readNetworkCommissioningClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readDoorLockMinPINCodeLengthAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .readMinPINCodeLengthAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readNetworkCommissioningClusterRevisionCommandParams);
-    readNetworkCommissioningInteractionInfo.put(
-        "readClusterRevisionAttribute",
-        readNetworkCommissioningClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("networkCommissioning", readNetworkCommissioningInteractionInfo);
-    Map<String, InteractionInfo> readOtaSoftwareUpdateProviderInteractionInfo =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readOtaSoftwareUpdateProviderAttributeListCommandParams =
+            readDoorLockMinPINCodeLengthCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readMinPINCodeLengthAttribute", readDoorLockMinPINCodeLengthAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockMaxRFIDCodeLengthCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOtaSoftwareUpdateProviderAttributeListAttributeInteractionInfo =
+    InteractionInfo readDoorLockMaxRFIDCodeLengthAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.OtaSoftwareUpdateProviderCluster.AttributeListAttributeCallback)
-                          callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .readMaxRFIDCodeLengthAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedOtaSoftwareUpdateProviderClusterAttributeListAttributeCallback(),
-            readOtaSoftwareUpdateProviderAttributeListCommandParams);
-    readOtaSoftwareUpdateProviderInteractionInfo.put(
-        "readAttributeListAttribute",
-        readOtaSoftwareUpdateProviderAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOtaSoftwareUpdateProviderFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readDoorLockMaxRFIDCodeLengthCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readMaxRFIDCodeLengthAttribute", readDoorLockMaxRFIDCodeLengthAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockMinRFIDCodeLengthCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOtaSoftwareUpdateProviderFeatureMapAttributeInteractionInfo =
+    InteractionInfo readDoorLockMinRFIDCodeLengthAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .readMinRFIDCodeLengthAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readOtaSoftwareUpdateProviderFeatureMapCommandParams);
-    readOtaSoftwareUpdateProviderInteractionInfo.put(
-        "readFeatureMapAttribute", readOtaSoftwareUpdateProviderFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOtaSoftwareUpdateProviderClusterRevisionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readDoorLockMinRFIDCodeLengthCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readMinRFIDCodeLengthAttribute", readDoorLockMinRFIDCodeLengthAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockNumberOfCredentialsSupportedPerUserCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOtaSoftwareUpdateProviderClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readDoorLockNumberOfCredentialsSupportedPerUserAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .readNumberOfCredentialsSupportedPerUserAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readOtaSoftwareUpdateProviderClusterRevisionCommandParams);
-    readOtaSoftwareUpdateProviderInteractionInfo.put(
-        "readClusterRevisionAttribute",
-        readOtaSoftwareUpdateProviderClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("otaSoftwareUpdateProvider", readOtaSoftwareUpdateProviderInteractionInfo);
-    Map<String, InteractionInfo> readOtaSoftwareUpdateRequestorInteractionInfo =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo>
-        readOtaSoftwareUpdateRequestorDefaultOtaProvidersCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeInteractionInfo =
+            readDoorLockNumberOfCredentialsSupportedPerUserCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readNumberOfCredentialsSupportedPerUserAttribute",
+        readDoorLockNumberOfCredentialsSupportedPerUserAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockLanguageCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readDoorLockLanguageAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OtaSoftwareUpdateRequestorCluster) cluster)
-                  .readDefaultOtaProvidersAttribute(
-                      (ChipClusters.OtaSoftwareUpdateRequestorCluster
-                              .DefaultOtaProvidersAttributeCallback)
-                          callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .readLanguageAttribute((ChipClusters.CharStringAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedOtaSoftwareUpdateRequestorClusterDefaultOtaProvidersAttributeCallback(),
-            readOtaSoftwareUpdateRequestorDefaultOtaProvidersCommandParams);
-    readOtaSoftwareUpdateRequestorInteractionInfo.put(
-        "readDefaultOtaProvidersAttribute",
-        readOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOtaSoftwareUpdateRequestorUpdatePossibleCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readDoorLockLanguageCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readLanguageAttribute", readDoorLockLanguageAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockAutoRelockTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOtaSoftwareUpdateRequestorUpdatePossibleAttributeInteractionInfo =
+    InteractionInfo readDoorLockAutoRelockTimeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OtaSoftwareUpdateRequestorCluster) cluster)
-                  .readUpdatePossibleAttribute((ChipClusters.BooleanAttributeCallback) callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .readAutoRelockTimeAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readOtaSoftwareUpdateRequestorUpdatePossibleCommandParams);
-    readOtaSoftwareUpdateRequestorInteractionInfo.put(
-        "readUpdatePossibleAttribute",
-        readOtaSoftwareUpdateRequestorUpdatePossibleAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOtaSoftwareUpdateRequestorUpdateStateCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readDoorLockAutoRelockTimeCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readAutoRelockTimeAttribute", readDoorLockAutoRelockTimeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockSoundVolumeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOtaSoftwareUpdateRequestorUpdateStateAttributeInteractionInfo =
+    InteractionInfo readDoorLockSoundVolumeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OtaSoftwareUpdateRequestorCluster) cluster)
-                  .readUpdateStateAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .readSoundVolumeAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readOtaSoftwareUpdateRequestorUpdateStateCommandParams);
-    readOtaSoftwareUpdateRequestorInteractionInfo.put(
-        "readUpdateStateAttribute",
-        readOtaSoftwareUpdateRequestorUpdateStateAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readOtaSoftwareUpdateRequestorUpdateStateProgressCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOtaSoftwareUpdateRequestorUpdateStateProgressAttributeInteractionInfo =
+            readDoorLockSoundVolumeCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readSoundVolumeAttribute", readDoorLockSoundVolumeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockOperatingModeCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readDoorLockOperatingModeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OtaSoftwareUpdateRequestorCluster) cluster)
-                  .readUpdateStateProgressAttribute(
-                      (ChipClusters.OtaSoftwareUpdateRequestorCluster
-                              .UpdateStateProgressAttributeCallback)
-                          callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .readOperatingModeAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readOtaSoftwareUpdateRequestorUpdateStateProgressCommandParams);
-    readOtaSoftwareUpdateRequestorInteractionInfo.put(
-        "readUpdateStateProgressAttribute",
-        readOtaSoftwareUpdateRequestorUpdateStateProgressAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOtaSoftwareUpdateRequestorAttributeListCommandParams =
+            readDoorLockOperatingModeCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readOperatingModeAttribute", readDoorLockOperatingModeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockSupportedOperatingModesCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOtaSoftwareUpdateRequestorAttributeListAttributeInteractionInfo =
+    InteractionInfo readDoorLockSupportedOperatingModesAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OtaSoftwareUpdateRequestorCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.OtaSoftwareUpdateRequestorCluster
-                              .AttributeListAttributeCallback)
-                          callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .readSupportedOperatingModesAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedOtaSoftwareUpdateRequestorClusterAttributeListAttributeCallback(),
-            readOtaSoftwareUpdateRequestorAttributeListCommandParams);
-    readOtaSoftwareUpdateRequestorInteractionInfo.put(
-        "readAttributeListAttribute",
-        readOtaSoftwareUpdateRequestorAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOtaSoftwareUpdateRequestorFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readDoorLockSupportedOperatingModesCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readSupportedOperatingModesAttribute",
+        readDoorLockSupportedOperatingModesAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockEnableOneTouchLockingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOtaSoftwareUpdateRequestorFeatureMapAttributeInteractionInfo =
+    InteractionInfo readDoorLockEnableOneTouchLockingAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OtaSoftwareUpdateRequestorCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .readEnableOneTouchLockingAttribute(
+                      (ChipClusters.BooleanAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readOtaSoftwareUpdateRequestorFeatureMapCommandParams);
-    readOtaSoftwareUpdateRequestorInteractionInfo.put(
-        "readFeatureMapAttribute",
-        readOtaSoftwareUpdateRequestorFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOtaSoftwareUpdateRequestorClusterRevisionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readDoorLockEnableOneTouchLockingCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readEnableOneTouchLockingAttribute",
+        readDoorLockEnableOneTouchLockingAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockEnablePrivacyModeButtonCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOtaSoftwareUpdateRequestorClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readDoorLockEnablePrivacyModeButtonAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OtaSoftwareUpdateRequestorCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .readEnablePrivacyModeButtonAttribute(
+                      (ChipClusters.BooleanAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readOtaSoftwareUpdateRequestorClusterRevisionCommandParams);
-    readOtaSoftwareUpdateRequestorInteractionInfo.put(
-        "readClusterRevisionAttribute",
-        readOtaSoftwareUpdateRequestorClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put(
-        "otaSoftwareUpdateRequestor", readOtaSoftwareUpdateRequestorInteractionInfo);
-    Map<String, InteractionInfo> readOccupancySensingInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readOccupancySensingOccupancyCommandParams =
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readDoorLockEnablePrivacyModeButtonCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readEnablePrivacyModeButtonAttribute",
+        readDoorLockEnablePrivacyModeButtonAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockWrongCodeEntryLimitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOccupancySensingOccupancyAttributeInteractionInfo =
+    InteractionInfo readDoorLockWrongCodeEntryLimitAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OccupancySensingCluster) cluster)
-                  .readOccupancyAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .readWrongCodeEntryLimitAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readOccupancySensingOccupancyCommandParams);
-    readOccupancySensingInteractionInfo.put(
-        "readOccupancyAttribute", readOccupancySensingOccupancyAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOccupancySensingOccupancySensorTypeCommandParams =
+            readDoorLockWrongCodeEntryLimitCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readWrongCodeEntryLimitAttribute",
+        readDoorLockWrongCodeEntryLimitAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockUserCodeTemporaryDisableTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOccupancySensingOccupancySensorTypeAttributeInteractionInfo =
+    InteractionInfo readDoorLockUserCodeTemporaryDisableTimeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OccupancySensingCluster) cluster)
-                  .readOccupancySensorTypeAttribute(
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .readUserCodeTemporaryDisableTimeAttribute(
                       (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readOccupancySensingOccupancySensorTypeCommandParams);
-    readOccupancySensingInteractionInfo.put(
-        "readOccupancySensorTypeAttribute",
-        readOccupancySensingOccupancySensorTypeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOccupancySensingOccupancySensorTypeBitmapCommandParams =
+            readDoorLockUserCodeTemporaryDisableTimeCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readUserCodeTemporaryDisableTimeAttribute",
+        readDoorLockUserCodeTemporaryDisableTimeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockRequirePINforRemoteOperationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOccupancySensingOccupancySensorTypeBitmapAttributeInteractionInfo =
+    InteractionInfo readDoorLockRequirePINforRemoteOperationAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OccupancySensingCluster) cluster)
-                  .readOccupancySensorTypeBitmapAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .readRequirePINforRemoteOperationAttribute(
+                      (ChipClusters.BooleanAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readOccupancySensingOccupancySensorTypeBitmapCommandParams);
-    readOccupancySensingInteractionInfo.put(
-        "readOccupancySensorTypeBitmapAttribute",
-        readOccupancySensingOccupancySensorTypeBitmapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOccupancySensingGeneratedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readDoorLockRequirePINforRemoteOperationCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readRequirePINforRemoteOperationAttribute",
+        readDoorLockRequirePINforRemoteOperationAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOccupancySensingGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readDoorLockGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OccupancySensingCluster) cluster)
+              ((ChipClusters.DoorLockCluster) cluster)
                   .readGeneratedCommandListAttribute(
-                      (ChipClusters.OccupancySensingCluster.GeneratedCommandListAttributeCallback)
+                      (ChipClusters.DoorLockCluster.GeneratedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedOccupancySensingClusterGeneratedCommandListAttributeCallback(),
-            readOccupancySensingGeneratedCommandListCommandParams);
-    readOccupancySensingInteractionInfo.put(
+                    .DelegatedDoorLockClusterGeneratedCommandListAttributeCallback(),
+            readDoorLockGeneratedCommandListCommandParams);
+    readDoorLockInteractionInfo.put(
         "readGeneratedCommandListAttribute",
-        readOccupancySensingGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOccupancySensingAcceptedCommandListCommandParams =
+        readDoorLockGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOccupancySensingAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readDoorLockAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OccupancySensingCluster) cluster)
+              ((ChipClusters.DoorLockCluster) cluster)
                   .readAcceptedCommandListAttribute(
-                      (ChipClusters.OccupancySensingCluster.AcceptedCommandListAttributeCallback)
-                          callback);
+                      (ChipClusters.DoorLockCluster.AcceptedCommandListAttributeCallback) callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedOccupancySensingClusterAcceptedCommandListAttributeCallback(),
-            readOccupancySensingAcceptedCommandListCommandParams);
-    readOccupancySensingInteractionInfo.put(
+                    .DelegatedDoorLockClusterAcceptedCommandListAttributeCallback(),
+            readDoorLockAcceptedCommandListCommandParams);
+    readDoorLockInteractionInfo.put(
         "readAcceptedCommandListAttribute",
-        readOccupancySensingAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOccupancySensingAttributeListCommandParams =
+        readDoorLockAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOccupancySensingAttributeListAttributeInteractionInfo =
+    InteractionInfo readDoorLockAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OccupancySensingCluster) cluster)
+              ((ChipClusters.DoorLockCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.OccupancySensingCluster.AttributeListAttributeCallback)
-                          callback);
+                      (ChipClusters.DoorLockCluster.AttributeListAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedOccupancySensingClusterAttributeListAttributeCallback(),
-            readOccupancySensingAttributeListCommandParams);
-    readOccupancySensingInteractionInfo.put(
-        "readAttributeListAttribute", readOccupancySensingAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOccupancySensingFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedDoorLockClusterAttributeListAttributeCallback(),
+            readDoorLockAttributeListCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readAttributeListAttribute", readDoorLockAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOccupancySensingFeatureMapAttributeInteractionInfo =
+    InteractionInfo readDoorLockFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OccupancySensingCluster) cluster)
+              ((ChipClusters.DoorLockCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readOccupancySensingFeatureMapCommandParams);
-    readOccupancySensingInteractionInfo.put(
-        "readFeatureMapAttribute", readOccupancySensingFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOccupancySensingClusterRevisionCommandParams =
+            readDoorLockFeatureMapCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readFeatureMapAttribute", readDoorLockFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readDoorLockClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOccupancySensingClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readDoorLockClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OccupancySensingCluster) cluster)
+              ((ChipClusters.DoorLockCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readOccupancySensingClusterRevisionCommandParams);
-    readOccupancySensingInteractionInfo.put(
-        "readClusterRevisionAttribute",
-        readOccupancySensingClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("occupancySensing", readOccupancySensingInteractionInfo);
-    Map<String, InteractionInfo> readOnOffInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readOnOffOnOffCommandParams =
+            readDoorLockClusterRevisionCommandParams);
+    readDoorLockInteractionInfo.put(
+        "readClusterRevisionAttribute", readDoorLockClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("doorLock", readDoorLockInteractionInfo);
+    Map<String, InteractionInfo> readWindowCoveringInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readWindowCoveringTypeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOnOffOnOffAttributeInteractionInfo =
+    InteractionInfo readWindowCoveringTypeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffCluster) cluster)
-                  .readOnOffAttribute((ChipClusters.BooleanAttributeCallback) callback);
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readTypeAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readOnOffOnOffCommandParams);
-    readOnOffInteractionInfo.put("readOnOffAttribute", readOnOffOnOffAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOnOffGlobalSceneControlCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readWindowCoveringTypeCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readTypeAttribute", readWindowCoveringTypeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringPhysicalClosedLimitLiftCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOnOffGlobalSceneControlAttributeInteractionInfo =
+    InteractionInfo readWindowCoveringPhysicalClosedLimitLiftAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffCluster) cluster)
-                  .readGlobalSceneControlAttribute(
-                      (ChipClusters.BooleanAttributeCallback) callback);
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readPhysicalClosedLimitLiftAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readOnOffGlobalSceneControlCommandParams);
-    readOnOffInteractionInfo.put(
-        "readGlobalSceneControlAttribute", readOnOffGlobalSceneControlAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOnOffOnTimeCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readWindowCoveringPhysicalClosedLimitLiftCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readPhysicalClosedLimitLiftAttribute",
+        readWindowCoveringPhysicalClosedLimitLiftAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringPhysicalClosedLimitTiltCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOnOffOnTimeAttributeInteractionInfo =
+    InteractionInfo readWindowCoveringPhysicalClosedLimitTiltAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffCluster) cluster)
-                  .readOnTimeAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readPhysicalClosedLimitTiltAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readOnOffOnTimeCommandParams);
-    readOnOffInteractionInfo.put("readOnTimeAttribute", readOnOffOnTimeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOnOffOffWaitTimeCommandParams =
+            readWindowCoveringPhysicalClosedLimitTiltCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readPhysicalClosedLimitTiltAttribute",
+        readWindowCoveringPhysicalClosedLimitTiltAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringCurrentPositionLiftCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOnOffOffWaitTimeAttributeInteractionInfo =
+    InteractionInfo readWindowCoveringCurrentPositionLiftAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffCluster) cluster)
-                  .readOffWaitTimeAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readCurrentPositionLiftAttribute(
+                      (ChipClusters.WindowCoveringCluster.CurrentPositionLiftAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readOnOffOffWaitTimeCommandParams);
-    readOnOffInteractionInfo.put(
-        "readOffWaitTimeAttribute", readOnOffOffWaitTimeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOnOffStartUpOnOffCommandParams =
+            readWindowCoveringCurrentPositionLiftCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readCurrentPositionLiftAttribute",
+        readWindowCoveringCurrentPositionLiftAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringCurrentPositionTiltCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOnOffStartUpOnOffAttributeInteractionInfo =
+    InteractionInfo readWindowCoveringCurrentPositionTiltAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffCluster) cluster)
-                  .readStartUpOnOffAttribute(
-                      (ChipClusters.OnOffCluster.StartUpOnOffAttributeCallback) callback);
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readCurrentPositionTiltAttribute(
+                      (ChipClusters.WindowCoveringCluster.CurrentPositionTiltAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readOnOffStartUpOnOffCommandParams);
-    readOnOffInteractionInfo.put(
-        "readStartUpOnOffAttribute", readOnOffStartUpOnOffAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOnOffGeneratedCommandListCommandParams =
+            readWindowCoveringCurrentPositionTiltCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readCurrentPositionTiltAttribute",
+        readWindowCoveringCurrentPositionTiltAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringNumberOfActuationsLiftCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOnOffGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readWindowCoveringNumberOfActuationsLiftAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.OnOffCluster.GeneratedCommandListAttributeCallback) callback);
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readNumberOfActuationsLiftAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping.DelegatedOnOffClusterGeneratedCommandListAttributeCallback(),
-            readOnOffGeneratedCommandListCommandParams);
-    readOnOffInteractionInfo.put(
-        "readGeneratedCommandListAttribute", readOnOffGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOnOffAcceptedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readWindowCoveringNumberOfActuationsLiftCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readNumberOfActuationsLiftAttribute",
+        readWindowCoveringNumberOfActuationsLiftAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringNumberOfActuationsTiltCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOnOffAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readWindowCoveringNumberOfActuationsTiltAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.OnOffCluster.AcceptedCommandListAttributeCallback) callback);
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readNumberOfActuationsTiltAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping.DelegatedOnOffClusterAcceptedCommandListAttributeCallback(),
-            readOnOffAcceptedCommandListCommandParams);
-    readOnOffInteractionInfo.put(
-        "readAcceptedCommandListAttribute", readOnOffAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOnOffAttributeListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readWindowCoveringNumberOfActuationsTiltCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readNumberOfActuationsTiltAttribute",
+        readWindowCoveringNumberOfActuationsTiltAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringConfigStatusCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOnOffAttributeListAttributeInteractionInfo =
+    InteractionInfo readWindowCoveringConfigStatusAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.OnOffCluster.AttributeListAttributeCallback) callback);
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readConfigStatusAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedOnOffClusterAttributeListAttributeCallback(),
-            readOnOffAttributeListCommandParams);
-    readOnOffInteractionInfo.put(
-        "readAttributeListAttribute", readOnOffAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOnOffFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readWindowCoveringConfigStatusCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readConfigStatusAttribute", readWindowCoveringConfigStatusAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringCurrentPositionLiftPercentageCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOnOffFeatureMapAttributeInteractionInfo =
+    InteractionInfo readWindowCoveringCurrentPositionLiftPercentageAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readCurrentPositionLiftPercentageAttribute(
+                      (ChipClusters.WindowCoveringCluster
+                              .CurrentPositionLiftPercentageAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readOnOffFeatureMapCommandParams);
-    readOnOffInteractionInfo.put(
-        "readFeatureMapAttribute", readOnOffFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOnOffClusterRevisionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readWindowCoveringCurrentPositionLiftPercentageCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readCurrentPositionLiftPercentageAttribute",
+        readWindowCoveringCurrentPositionLiftPercentageAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringCurrentPositionTiltPercentageCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOnOffClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readWindowCoveringCurrentPositionTiltPercentageAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readCurrentPositionTiltPercentageAttribute(
+                      (ChipClusters.WindowCoveringCluster
+                              .CurrentPositionTiltPercentageAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readOnOffClusterRevisionCommandParams);
-    readOnOffInteractionInfo.put(
-        "readClusterRevisionAttribute", readOnOffClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("onOff", readOnOffInteractionInfo);
-    Map<String, InteractionInfo> readOnOffSwitchConfigurationInteractionInfo =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readOnOffSwitchConfigurationSwitchTypeCommandParams =
+            readWindowCoveringCurrentPositionTiltPercentageCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readCurrentPositionTiltPercentageAttribute",
+        readWindowCoveringCurrentPositionTiltPercentageAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringOperationalStatusCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOnOffSwitchConfigurationSwitchTypeAttributeInteractionInfo =
+    InteractionInfo readWindowCoveringOperationalStatusAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffSwitchConfigurationCluster) cluster)
-                  .readSwitchTypeAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readOperationalStatusAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readOnOffSwitchConfigurationSwitchTypeCommandParams);
-    readOnOffSwitchConfigurationInteractionInfo.put(
-        "readSwitchTypeAttribute", readOnOffSwitchConfigurationSwitchTypeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOnOffSwitchConfigurationSwitchActionsCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOnOffSwitchConfigurationSwitchActionsAttributeInteractionInfo =
+            readWindowCoveringOperationalStatusCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readOperationalStatusAttribute",
+        readWindowCoveringOperationalStatusAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readWindowCoveringTargetPositionLiftPercent100thsCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readWindowCoveringTargetPositionLiftPercent100thsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffSwitchConfigurationCluster) cluster)
-                  .readSwitchActionsAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readTargetPositionLiftPercent100thsAttribute(
+                      (ChipClusters.WindowCoveringCluster
+                              .TargetPositionLiftPercent100thsAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readOnOffSwitchConfigurationSwitchActionsCommandParams);
-    readOnOffSwitchConfigurationInteractionInfo.put(
-        "readSwitchActionsAttribute",
-        readOnOffSwitchConfigurationSwitchActionsAttributeInteractionInfo);
+            readWindowCoveringTargetPositionLiftPercent100thsCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readTargetPositionLiftPercent100thsAttribute",
+        readWindowCoveringTargetPositionLiftPercent100thsAttributeInteractionInfo);
     Map<String, CommandParameterInfo>
-        readOnOffSwitchConfigurationGeneratedCommandListCommandParams =
+        readWindowCoveringTargetPositionTiltPercent100thsCommandParams =
             new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOnOffSwitchConfigurationGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readWindowCoveringTargetPositionTiltPercent100thsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffSwitchConfigurationCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.OnOffSwitchConfigurationCluster
-                              .GeneratedCommandListAttributeCallback)
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readTargetPositionTiltPercent100thsAttribute(
+                      (ChipClusters.WindowCoveringCluster
+                              .TargetPositionTiltPercent100thsAttributeCallback)
                           callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedOnOffSwitchConfigurationClusterGeneratedCommandListAttributeCallback(),
-            readOnOffSwitchConfigurationGeneratedCommandListCommandParams);
-    readOnOffSwitchConfigurationInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readOnOffSwitchConfigurationGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOnOffSwitchConfigurationAcceptedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readWindowCoveringTargetPositionTiltPercent100thsCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readTargetPositionTiltPercent100thsAttribute",
+        readWindowCoveringTargetPositionTiltPercent100thsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringEndProductTypeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOnOffSwitchConfigurationAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readWindowCoveringEndProductTypeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffSwitchConfigurationCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.OnOffSwitchConfigurationCluster
-                              .AcceptedCommandListAttributeCallback)
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readEndProductTypeAttribute((ChipClusters.IntegerAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readWindowCoveringEndProductTypeCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readEndProductTypeAttribute", readWindowCoveringEndProductTypeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readWindowCoveringCurrentPositionLiftPercent100thsCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readWindowCoveringCurrentPositionLiftPercent100thsAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readCurrentPositionLiftPercent100thsAttribute(
+                      (ChipClusters.WindowCoveringCluster
+                              .CurrentPositionLiftPercent100thsAttributeCallback)
                           callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedOnOffSwitchConfigurationClusterAcceptedCommandListAttributeCallback(),
-            readOnOffSwitchConfigurationAcceptedCommandListCommandParams);
-    readOnOffSwitchConfigurationInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readOnOffSwitchConfigurationAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOnOffSwitchConfigurationAttributeListCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOnOffSwitchConfigurationAttributeListAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readWindowCoveringCurrentPositionLiftPercent100thsCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readCurrentPositionLiftPercent100thsAttribute",
+        readWindowCoveringCurrentPositionLiftPercent100thsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readWindowCoveringCurrentPositionTiltPercent100thsCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readWindowCoveringCurrentPositionTiltPercent100thsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffSwitchConfigurationCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.OnOffSwitchConfigurationCluster.AttributeListAttributeCallback)
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readCurrentPositionTiltPercent100thsAttribute(
+                      (ChipClusters.WindowCoveringCluster
+                              .CurrentPositionTiltPercent100thsAttributeCallback)
                           callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedOnOffSwitchConfigurationClusterAttributeListAttributeCallback(),
-            readOnOffSwitchConfigurationAttributeListCommandParams);
-    readOnOffSwitchConfigurationInteractionInfo.put(
-        "readAttributeListAttribute",
-        readOnOffSwitchConfigurationAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOnOffSwitchConfigurationFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readWindowCoveringCurrentPositionTiltPercent100thsCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readCurrentPositionTiltPercent100thsAttribute",
+        readWindowCoveringCurrentPositionTiltPercent100thsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringInstalledOpenLimitLiftCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOnOffSwitchConfigurationFeatureMapAttributeInteractionInfo =
+    InteractionInfo readWindowCoveringInstalledOpenLimitLiftAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffSwitchConfigurationCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readInstalledOpenLimitLiftAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readOnOffSwitchConfigurationFeatureMapCommandParams);
-    readOnOffSwitchConfigurationInteractionInfo.put(
-        "readFeatureMapAttribute", readOnOffSwitchConfigurationFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOnOffSwitchConfigurationClusterRevisionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readWindowCoveringInstalledOpenLimitLiftCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readInstalledOpenLimitLiftAttribute",
+        readWindowCoveringInstalledOpenLimitLiftAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringInstalledClosedLimitLiftCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOnOffSwitchConfigurationClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readWindowCoveringInstalledClosedLimitLiftAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffSwitchConfigurationCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readInstalledClosedLimitLiftAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readOnOffSwitchConfigurationClusterRevisionCommandParams);
-    readOnOffSwitchConfigurationInteractionInfo.put(
-        "readClusterRevisionAttribute",
-        readOnOffSwitchConfigurationClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("onOffSwitchConfiguration", readOnOffSwitchConfigurationInteractionInfo);
-    Map<String, InteractionInfo> readOperationalCredentialsInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readOperationalCredentialsNOCsCommandParams =
+            readWindowCoveringInstalledClosedLimitLiftCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readInstalledClosedLimitLiftAttribute",
+        readWindowCoveringInstalledClosedLimitLiftAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringInstalledOpenLimitTiltCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOperationalCredentialsNOCsAttributeInteractionInfo =
+    InteractionInfo readWindowCoveringInstalledOpenLimitTiltAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
-                  .readNOCsAttribute(
-                      (ChipClusters.OperationalCredentialsCluster.NOCsAttributeCallback) callback);
-            },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedOperationalCredentialsClusterNOCsAttributeCallback(),
-            readOperationalCredentialsNOCsCommandParams);
-    readOperationalCredentialsInteractionInfo.put(
-        "readNOCsAttribute", readOperationalCredentialsNOCsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOperationalCredentialsFabricsCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOperationalCredentialsFabricsAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
-                  .readFabricsAttribute(
-                      (ChipClusters.OperationalCredentialsCluster.FabricsAttributeCallback)
-                          callback);
-            },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedOperationalCredentialsClusterFabricsAttributeCallback(),
-            readOperationalCredentialsFabricsCommandParams);
-    readOperationalCredentialsInteractionInfo.put(
-        "readFabricsAttribute", readOperationalCredentialsFabricsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOperationalCredentialsSupportedFabricsCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOperationalCredentialsSupportedFabricsAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
-                  .readSupportedFabricsAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readInstalledOpenLimitTiltAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readOperationalCredentialsSupportedFabricsCommandParams);
-    readOperationalCredentialsInteractionInfo.put(
-        "readSupportedFabricsAttribute",
-        readOperationalCredentialsSupportedFabricsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOperationalCredentialsCommissionedFabricsCommandParams =
+            readWindowCoveringInstalledOpenLimitTiltCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readInstalledOpenLimitTiltAttribute",
+        readWindowCoveringInstalledOpenLimitTiltAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringInstalledClosedLimitTiltCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOperationalCredentialsCommissionedFabricsAttributeInteractionInfo =
+    InteractionInfo readWindowCoveringInstalledClosedLimitTiltAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
-                  .readCommissionedFabricsAttribute(
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readInstalledClosedLimitTiltAttribute(
                       (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readOperationalCredentialsCommissionedFabricsCommandParams);
-    readOperationalCredentialsInteractionInfo.put(
-        "readCommissionedFabricsAttribute",
-        readOperationalCredentialsCommissionedFabricsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readOperationalCredentialsTrustedRootCertificatesCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOperationalCredentialsTrustedRootCertificatesAttributeInteractionInfo =
+            readWindowCoveringInstalledClosedLimitTiltCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readInstalledClosedLimitTiltAttribute",
+        readWindowCoveringInstalledClosedLimitTiltAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringModeCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readWindowCoveringModeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
-                  .readTrustedRootCertificatesAttribute(
-                      (ChipClusters.OperationalCredentialsCluster
-                              .TrustedRootCertificatesAttributeCallback)
-                          callback);
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readModeAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedOperationalCredentialsClusterTrustedRootCertificatesAttributeCallback(),
-            readOperationalCredentialsTrustedRootCertificatesCommandParams);
-    readOperationalCredentialsInteractionInfo.put(
-        "readTrustedRootCertificatesAttribute",
-        readOperationalCredentialsTrustedRootCertificatesAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOperationalCredentialsCurrentFabricIndexCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readWindowCoveringModeCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readModeAttribute", readWindowCoveringModeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringSafetyStatusCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOperationalCredentialsCurrentFabricIndexAttributeInteractionInfo =
+    InteractionInfo readWindowCoveringSafetyStatusAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
-                  .readCurrentFabricIndexAttribute(
-                      (ChipClusters.OperationalCredentialsCluster
-                              .CurrentFabricIndexAttributeCallback)
-                          callback);
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .readSafetyStatusAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readOperationalCredentialsCurrentFabricIndexCommandParams);
-    readOperationalCredentialsInteractionInfo.put(
-        "readCurrentFabricIndexAttribute",
-        readOperationalCredentialsCurrentFabricIndexAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOperationalCredentialsGeneratedCommandListCommandParams =
+            readWindowCoveringSafetyStatusCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readSafetyStatusAttribute", readWindowCoveringSafetyStatusAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOperationalCredentialsGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readWindowCoveringGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
+              ((ChipClusters.WindowCoveringCluster) cluster)
                   .readGeneratedCommandListAttribute(
-                      (ChipClusters.OperationalCredentialsCluster
-                              .GeneratedCommandListAttributeCallback)
+                      (ChipClusters.WindowCoveringCluster.GeneratedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedOperationalCredentialsClusterGeneratedCommandListAttributeCallback(),
-            readOperationalCredentialsGeneratedCommandListCommandParams);
-    readOperationalCredentialsInteractionInfo.put(
+                    .DelegatedWindowCoveringClusterGeneratedCommandListAttributeCallback(),
+            readWindowCoveringGeneratedCommandListCommandParams);
+    readWindowCoveringInteractionInfo.put(
         "readGeneratedCommandListAttribute",
-        readOperationalCredentialsGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOperationalCredentialsAcceptedCommandListCommandParams =
+        readWindowCoveringGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOperationalCredentialsAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readWindowCoveringAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
+              ((ChipClusters.WindowCoveringCluster) cluster)
                   .readAcceptedCommandListAttribute(
-                      (ChipClusters.OperationalCredentialsCluster
-                              .AcceptedCommandListAttributeCallback)
+                      (ChipClusters.WindowCoveringCluster.AcceptedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedOperationalCredentialsClusterAcceptedCommandListAttributeCallback(),
-            readOperationalCredentialsAcceptedCommandListCommandParams);
-    readOperationalCredentialsInteractionInfo.put(
+                    .DelegatedWindowCoveringClusterAcceptedCommandListAttributeCallback(),
+            readWindowCoveringAcceptedCommandListCommandParams);
+    readWindowCoveringInteractionInfo.put(
         "readAcceptedCommandListAttribute",
-        readOperationalCredentialsAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOperationalCredentialsAttributeListCommandParams =
+        readWindowCoveringAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOperationalCredentialsAttributeListAttributeInteractionInfo =
+    InteractionInfo readWindowCoveringAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
+              ((ChipClusters.WindowCoveringCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.OperationalCredentialsCluster.AttributeListAttributeCallback)
-                          callback);
+                      (ChipClusters.WindowCoveringCluster.AttributeListAttributeCallback) callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedOperationalCredentialsClusterAttributeListAttributeCallback(),
-            readOperationalCredentialsAttributeListCommandParams);
-    readOperationalCredentialsInteractionInfo.put(
-        "readAttributeListAttribute",
-        readOperationalCredentialsAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOperationalCredentialsFeatureMapCommandParams =
+                    .DelegatedWindowCoveringClusterAttributeListAttributeCallback(),
+            readWindowCoveringAttributeListCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readAttributeListAttribute", readWindowCoveringAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOperationalCredentialsFeatureMapAttributeInteractionInfo =
+    InteractionInfo readWindowCoveringFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
+              ((ChipClusters.WindowCoveringCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readOperationalCredentialsFeatureMapCommandParams);
-    readOperationalCredentialsInteractionInfo.put(
-        "readFeatureMapAttribute", readOperationalCredentialsFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readOperationalCredentialsClusterRevisionCommandParams =
+            readWindowCoveringFeatureMapCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readFeatureMapAttribute", readWindowCoveringFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWindowCoveringClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readOperationalCredentialsClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readWindowCoveringClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
+              ((ChipClusters.WindowCoveringCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readOperationalCredentialsClusterRevisionCommandParams);
-    readOperationalCredentialsInteractionInfo.put(
-        "readClusterRevisionAttribute",
-        readOperationalCredentialsClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("operationalCredentials", readOperationalCredentialsInteractionInfo);
-    Map<String, InteractionInfo> readPowerSourceInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readPowerSourceStatusCommandParams =
+            readWindowCoveringClusterRevisionCommandParams);
+    readWindowCoveringInteractionInfo.put(
+        "readClusterRevisionAttribute", readWindowCoveringClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("windowCovering", readWindowCoveringInteractionInfo);
+    Map<String, InteractionInfo> readBarrierControlInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readBarrierControlBarrierMovingStateCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceStatusAttributeInteractionInfo =
+    InteractionInfo readBarrierControlBarrierMovingStateAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readStatusAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.BarrierControlCluster) cluster)
+                  .readBarrierMovingStateAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPowerSourceStatusCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readStatusAttribute", readPowerSourceStatusAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceOrderCommandParams =
+            readBarrierControlBarrierMovingStateCommandParams);
+    readBarrierControlInteractionInfo.put(
+        "readBarrierMovingStateAttribute",
+        readBarrierControlBarrierMovingStateAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBarrierControlBarrierSafetyStatusCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceOrderAttributeInteractionInfo =
+    InteractionInfo readBarrierControlBarrierSafetyStatusAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readOrderAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.BarrierControlCluster) cluster)
+                  .readBarrierSafetyStatusAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPowerSourceOrderCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readOrderAttribute", readPowerSourceOrderAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceDescriptionCommandParams =
+            readBarrierControlBarrierSafetyStatusCommandParams);
+    readBarrierControlInteractionInfo.put(
+        "readBarrierSafetyStatusAttribute",
+        readBarrierControlBarrierSafetyStatusAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBarrierControlBarrierCapabilitiesCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceDescriptionAttributeInteractionInfo =
+    InteractionInfo readBarrierControlBarrierCapabilitiesAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readDescriptionAttribute((ChipClusters.CharStringAttributeCallback) callback);
+              ((ChipClusters.BarrierControlCluster) cluster)
+                  .readBarrierCapabilitiesAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readPowerSourceDescriptionCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readDescriptionAttribute", readPowerSourceDescriptionAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceWiredAssessedInputVoltageCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readBarrierControlBarrierCapabilitiesCommandParams);
+    readBarrierControlInteractionInfo.put(
+        "readBarrierCapabilitiesAttribute",
+        readBarrierControlBarrierCapabilitiesAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBarrierControlBarrierPositionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceWiredAssessedInputVoltageAttributeInteractionInfo =
+    InteractionInfo readBarrierControlBarrierPositionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readWiredAssessedInputVoltageAttribute(
-                      (ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.BarrierControlCluster) cluster)
+                  .readBarrierPositionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readPowerSourceWiredAssessedInputVoltageCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readWiredAssessedInputVoltageAttribute",
-        readPowerSourceWiredAssessedInputVoltageAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceWiredAssessedInputFrequencyCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readBarrierControlBarrierPositionCommandParams);
+    readBarrierControlInteractionInfo.put(
+        "readBarrierPositionAttribute", readBarrierControlBarrierPositionAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBarrierControlGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceWiredAssessedInputFrequencyAttributeInteractionInfo =
+    InteractionInfo readBarrierControlGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readWiredAssessedInputFrequencyAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.BarrierControlCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.BarrierControlCluster.GeneratedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPowerSourceWiredAssessedInputFrequencyCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readWiredAssessedInputFrequencyAttribute",
-        readPowerSourceWiredAssessedInputFrequencyAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceWiredCurrentTypeCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedBarrierControlClusterGeneratedCommandListAttributeCallback(),
+            readBarrierControlGeneratedCommandListCommandParams);
+    readBarrierControlInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readBarrierControlGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBarrierControlAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceWiredCurrentTypeAttributeInteractionInfo =
+    InteractionInfo readBarrierControlAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readWiredCurrentTypeAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.BarrierControlCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.BarrierControlCluster.AcceptedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPowerSourceWiredCurrentTypeCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readWiredCurrentTypeAttribute", readPowerSourceWiredCurrentTypeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceWiredAssessedCurrentCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedBarrierControlClusterAcceptedCommandListAttributeCallback(),
+            readBarrierControlAcceptedCommandListCommandParams);
+    readBarrierControlInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readBarrierControlAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBarrierControlAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceWiredAssessedCurrentAttributeInteractionInfo =
+    InteractionInfo readBarrierControlAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readWiredAssessedCurrentAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.BarrierControlCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.BarrierControlCluster.AttributeListAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readPowerSourceWiredAssessedCurrentCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readWiredAssessedCurrentAttribute",
-        readPowerSourceWiredAssessedCurrentAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceWiredNominalVoltageCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedBarrierControlClusterAttributeListAttributeCallback(),
+            readBarrierControlAttributeListCommandParams);
+    readBarrierControlInteractionInfo.put(
+        "readAttributeListAttribute", readBarrierControlAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBarrierControlFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceWiredNominalVoltageAttributeInteractionInfo =
+    InteractionInfo readBarrierControlFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readWiredNominalVoltageAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.BarrierControlCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readPowerSourceWiredNominalVoltageCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readWiredNominalVoltageAttribute",
-        readPowerSourceWiredNominalVoltageAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceWiredMaximumCurrentCommandParams =
+            readBarrierControlFeatureMapCommandParams);
+    readBarrierControlInteractionInfo.put(
+        "readFeatureMapAttribute", readBarrierControlFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readBarrierControlClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceWiredMaximumCurrentAttributeInteractionInfo =
+    InteractionInfo readBarrierControlClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readWiredMaximumCurrentAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.BarrierControlCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readPowerSourceWiredMaximumCurrentCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readWiredMaximumCurrentAttribute",
-        readPowerSourceWiredMaximumCurrentAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceWiredPresentCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readBarrierControlClusterRevisionCommandParams);
+    readBarrierControlInteractionInfo.put(
+        "readClusterRevisionAttribute", readBarrierControlClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("barrierControl", readBarrierControlInteractionInfo);
+    Map<String, InteractionInfo> readPumpConfigurationAndControlInteractionInfo =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMaxPressureCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceWiredPresentAttributeInteractionInfo =
+    InteractionInfo readPumpConfigurationAndControlMaxPressureAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readWiredPresentAttribute((ChipClusters.BooleanAttributeCallback) callback);
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .readMaxPressureAttribute(
+                      (ChipClusters.PumpConfigurationAndControlCluster.MaxPressureAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readPowerSourceWiredPresentCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readWiredPresentAttribute", readPowerSourceWiredPresentAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceActiveWiredFaultsCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readPumpConfigurationAndControlMaxPressureCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
+        "readMaxPressureAttribute",
+        readPumpConfigurationAndControlMaxPressureAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMaxSpeedCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceActiveWiredFaultsAttributeInteractionInfo =
+    InteractionInfo readPumpConfigurationAndControlMaxSpeedAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readActiveWiredFaultsAttribute(
-                      (ChipClusters.PowerSourceCluster.ActiveWiredFaultsAttributeCallback)
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .readMaxSpeedAttribute(
+                      (ChipClusters.PumpConfigurationAndControlCluster.MaxSpeedAttributeCallback)
                           callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedPowerSourceClusterActiveWiredFaultsAttributeCallback(),
-            readPowerSourceActiveWiredFaultsCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readActiveWiredFaultsAttribute", readPowerSourceActiveWiredFaultsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceBatteryVoltageCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readPumpConfigurationAndControlMaxSpeedCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
+        "readMaxSpeedAttribute", readPumpConfigurationAndControlMaxSpeedAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMaxFlowCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceBatteryVoltageAttributeInteractionInfo =
+    InteractionInfo readPumpConfigurationAndControlMaxFlowAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readBatteryVoltageAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .readMaxFlowAttribute(
+                      (ChipClusters.PumpConfigurationAndControlCluster.MaxFlowAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readPowerSourceBatteryVoltageCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readBatteryVoltageAttribute", readPowerSourceBatteryVoltageAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceBatteryPercentRemainingCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readPumpConfigurationAndControlMaxFlowCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
+        "readMaxFlowAttribute", readPumpConfigurationAndControlMaxFlowAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMinConstPressureCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceBatteryPercentRemainingAttributeInteractionInfo =
+    InteractionInfo readPumpConfigurationAndControlMinConstPressureAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readBatteryPercentRemainingAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .readMinConstPressureAttribute(
+                      (ChipClusters.PumpConfigurationAndControlCluster
+                              .MinConstPressureAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPowerSourceBatteryPercentRemainingCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readBatteryPercentRemainingAttribute",
-        readPowerSourceBatteryPercentRemainingAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceBatteryTimeRemainingCommandParams =
+            readPumpConfigurationAndControlMinConstPressureCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
+        "readMinConstPressureAttribute",
+        readPumpConfigurationAndControlMinConstPressureAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMaxConstPressureCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceBatteryTimeRemainingAttributeInteractionInfo =
+    InteractionInfo readPumpConfigurationAndControlMaxConstPressureAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readBatteryTimeRemainingAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .readMaxConstPressureAttribute(
+                      (ChipClusters.PumpConfigurationAndControlCluster
+                              .MaxConstPressureAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readPowerSourceBatteryTimeRemainingCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readBatteryTimeRemainingAttribute",
-        readPowerSourceBatteryTimeRemainingAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceBatteryChargeLevelCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readPumpConfigurationAndControlMaxConstPressureCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
+        "readMaxConstPressureAttribute",
+        readPumpConfigurationAndControlMaxConstPressureAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMinCompPressureCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceBatteryChargeLevelAttributeInteractionInfo =
+    InteractionInfo readPumpConfigurationAndControlMinCompPressureAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readBatteryChargeLevelAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .readMinCompPressureAttribute(
+                      (ChipClusters.PumpConfigurationAndControlCluster
+                              .MinCompPressureAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPowerSourceBatteryChargeLevelCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readBatteryChargeLevelAttribute",
-        readPowerSourceBatteryChargeLevelAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceBatteryReplacementNeededCommandParams =
+            readPumpConfigurationAndControlMinCompPressureCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
+        "readMinCompPressureAttribute",
+        readPumpConfigurationAndControlMinCompPressureAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMaxCompPressureCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceBatteryReplacementNeededAttributeInteractionInfo =
+    InteractionInfo readPumpConfigurationAndControlMaxCompPressureAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readBatteryReplacementNeededAttribute(
-                      (ChipClusters.BooleanAttributeCallback) callback);
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .readMaxCompPressureAttribute(
+                      (ChipClusters.PumpConfigurationAndControlCluster
+                              .MaxCompPressureAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readPowerSourceBatteryReplacementNeededCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readBatteryReplacementNeededAttribute",
-        readPowerSourceBatteryReplacementNeededAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceBatteryReplaceabilityCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readPumpConfigurationAndControlMaxCompPressureCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
+        "readMaxCompPressureAttribute",
+        readPumpConfigurationAndControlMaxCompPressureAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMinConstSpeedCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceBatteryReplaceabilityAttributeInteractionInfo =
+    InteractionInfo readPumpConfigurationAndControlMinConstSpeedAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readBatteryReplaceabilityAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .readMinConstSpeedAttribute(
+                      (ChipClusters.PumpConfigurationAndControlCluster
+                              .MinConstSpeedAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPowerSourceBatteryReplaceabilityCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readBatteryReplaceabilityAttribute",
-        readPowerSourceBatteryReplaceabilityAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceBatteryPresentCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceBatteryPresentAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readBatteryPresentAttribute((ChipClusters.BooleanAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readPowerSourceBatteryPresentCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readBatteryPresentAttribute", readPowerSourceBatteryPresentAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceActiveBatteryFaultsCommandParams =
+            readPumpConfigurationAndControlMinConstSpeedCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
+        "readMinConstSpeedAttribute",
+        readPumpConfigurationAndControlMinConstSpeedAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMaxConstSpeedCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceActiveBatteryFaultsAttributeInteractionInfo =
+    InteractionInfo readPumpConfigurationAndControlMaxConstSpeedAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readActiveBatteryFaultsAttribute(
-                      (ChipClusters.PowerSourceCluster.ActiveBatteryFaultsAttributeCallback)
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .readMaxConstSpeedAttribute(
+                      (ChipClusters.PumpConfigurationAndControlCluster
+                              .MaxConstSpeedAttributeCallback)
                           callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedPowerSourceClusterActiveBatteryFaultsAttributeCallback(),
-            readPowerSourceActiveBatteryFaultsCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readActiveBatteryFaultsAttribute",
-        readPowerSourceActiveBatteryFaultsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceBatteryReplacementDescriptionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readPumpConfigurationAndControlMaxConstSpeedCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
+        "readMaxConstSpeedAttribute",
+        readPumpConfigurationAndControlMaxConstSpeedAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMinConstFlowCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceBatteryReplacementDescriptionAttributeInteractionInfo =
+    InteractionInfo readPumpConfigurationAndControlMinConstFlowAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readBatteryReplacementDescriptionAttribute(
-                      (ChipClusters.CharStringAttributeCallback) callback);
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .readMinConstFlowAttribute(
+                      (ChipClusters.PumpConfigurationAndControlCluster
+                              .MinConstFlowAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readPowerSourceBatteryReplacementDescriptionCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readBatteryReplacementDescriptionAttribute",
-        readPowerSourceBatteryReplacementDescriptionAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceBatteryCommonDesignationCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readPumpConfigurationAndControlMinConstFlowCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
+        "readMinConstFlowAttribute",
+        readPumpConfigurationAndControlMinConstFlowAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMaxConstFlowCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceBatteryCommonDesignationAttributeInteractionInfo =
+    InteractionInfo readPumpConfigurationAndControlMaxConstFlowAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readBatteryCommonDesignationAttribute(
-                      (ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .readMaxConstFlowAttribute(
+                      (ChipClusters.PumpConfigurationAndControlCluster
+                              .MaxConstFlowAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readPowerSourceBatteryCommonDesignationCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readBatteryCommonDesignationAttribute",
-        readPowerSourceBatteryCommonDesignationAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceBatteryANSIDesignationCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readPumpConfigurationAndControlMaxConstFlowCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
+        "readMaxConstFlowAttribute",
+        readPumpConfigurationAndControlMaxConstFlowAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMinConstTempCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceBatteryANSIDesignationAttributeInteractionInfo =
+    InteractionInfo readPumpConfigurationAndControlMinConstTempAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readBatteryANSIDesignationAttribute(
-                      (ChipClusters.CharStringAttributeCallback) callback);
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .readMinConstTempAttribute(
+                      (ChipClusters.PumpConfigurationAndControlCluster
+                              .MinConstTempAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readPowerSourceBatteryANSIDesignationCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readBatteryANSIDesignationAttribute",
-        readPowerSourceBatteryANSIDesignationAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceBatteryIECDesignationCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readPumpConfigurationAndControlMinConstTempCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
+        "readMinConstTempAttribute",
+        readPumpConfigurationAndControlMinConstTempAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMaxConstTempCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceBatteryIECDesignationAttributeInteractionInfo =
+    InteractionInfo readPumpConfigurationAndControlMaxConstTempAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readBatteryIECDesignationAttribute(
-                      (ChipClusters.CharStringAttributeCallback) callback);
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .readMaxConstTempAttribute(
+                      (ChipClusters.PumpConfigurationAndControlCluster
+                              .MaxConstTempAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readPowerSourceBatteryIECDesignationCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readBatteryIECDesignationAttribute",
-        readPowerSourceBatteryIECDesignationAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceBatteryApprovedChemistryCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readPumpConfigurationAndControlMaxConstTempCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
+        "readMaxConstTempAttribute",
+        readPumpConfigurationAndControlMaxConstTempAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPumpConfigurationAndControlPumpStatusCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceBatteryApprovedChemistryAttributeInteractionInfo =
+    InteractionInfo readPumpConfigurationAndControlPumpStatusAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readBatteryApprovedChemistryAttribute(
-                      (ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .readPumpStatusAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readPowerSourceBatteryApprovedChemistryCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readBatteryApprovedChemistryAttribute",
-        readPowerSourceBatteryApprovedChemistryAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceBatteryCapacityCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceBatteryCapacityAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readPumpConfigurationAndControlPumpStatusCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
+        "readPumpStatusAttribute",
+        readPumpConfigurationAndControlPumpStatusAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readPumpConfigurationAndControlEffectiveOperationModeCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readPumpConfigurationAndControlEffectiveOperationModeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readBatteryCapacityAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .readEffectiveOperationModeAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readPowerSourceBatteryCapacityCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readBatteryCapacityAttribute", readPowerSourceBatteryCapacityAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceBatteryQuantityCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceBatteryQuantityAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readPumpConfigurationAndControlEffectiveOperationModeCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
+        "readEffectiveOperationModeAttribute",
+        readPumpConfigurationAndControlEffectiveOperationModeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readPumpConfigurationAndControlEffectiveControlModeCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readPumpConfigurationAndControlEffectiveControlModeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readBatteryQuantityAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .readEffectiveControlModeAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPowerSourceBatteryQuantityCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readBatteryQuantityAttribute", readPowerSourceBatteryQuantityAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceBatteryChargeStateCommandParams =
+            readPumpConfigurationAndControlEffectiveControlModeCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
+        "readEffectiveControlModeAttribute",
+        readPumpConfigurationAndControlEffectiveControlModeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPumpConfigurationAndControlCapacityCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceBatteryChargeStateAttributeInteractionInfo =
+    InteractionInfo readPumpConfigurationAndControlCapacityAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readBatteryChargeStateAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .readCapacityAttribute(
+                      (ChipClusters.PumpConfigurationAndControlCluster.CapacityAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPowerSourceBatteryChargeStateCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readBatteryChargeStateAttribute",
-        readPowerSourceBatteryChargeStateAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceBatteryTimeToFullChargeCommandParams =
+            readPumpConfigurationAndControlCapacityCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
+        "readCapacityAttribute", readPumpConfigurationAndControlCapacityAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPumpConfigurationAndControlSpeedCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceBatteryTimeToFullChargeAttributeInteractionInfo =
+    InteractionInfo readPumpConfigurationAndControlSpeedAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readBatteryTimeToFullChargeAttribute(
-                      (ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .readSpeedAttribute(
+                      (ChipClusters.PumpConfigurationAndControlCluster.SpeedAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readPowerSourceBatteryTimeToFullChargeCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readBatteryTimeToFullChargeAttribute",
-        readPowerSourceBatteryTimeToFullChargeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceBatteryFunctionalWhileChargingCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceBatteryFunctionalWhileChargingAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readPumpConfigurationAndControlSpeedCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
+        "readSpeedAttribute", readPumpConfigurationAndControlSpeedAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readPumpConfigurationAndControlLifetimeRunningHoursCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readPumpConfigurationAndControlLifetimeRunningHoursAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readBatteryFunctionalWhileChargingAttribute(
-                      (ChipClusters.BooleanAttributeCallback) callback);
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .readLifetimeRunningHoursAttribute(
+                      (ChipClusters.PumpConfigurationAndControlCluster
+                              .LifetimeRunningHoursAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readPowerSourceBatteryFunctionalWhileChargingCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readBatteryFunctionalWhileChargingAttribute",
-        readPowerSourceBatteryFunctionalWhileChargingAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceBatteryChargingCurrentCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readPumpConfigurationAndControlLifetimeRunningHoursCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
+        "readLifetimeRunningHoursAttribute",
+        readPumpConfigurationAndControlLifetimeRunningHoursAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPumpConfigurationAndControlPowerCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceBatteryChargingCurrentAttributeInteractionInfo =
+    InteractionInfo readPumpConfigurationAndControlPowerAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readBatteryChargingCurrentAttribute(
-                      (ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .readPowerAttribute(
+                      (ChipClusters.PumpConfigurationAndControlCluster.PowerAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readPowerSourceBatteryChargingCurrentCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readBatteryChargingCurrentAttribute",
-        readPowerSourceBatteryChargingCurrentAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceActiveBatteryChargeFaultsCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceActiveBatteryChargeFaultsAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readActiveBatteryChargeFaultsAttribute(
-                      (ChipClusters.PowerSourceCluster.ActiveBatteryChargeFaultsAttributeCallback)
-                          callback);
-            },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedPowerSourceClusterActiveBatteryChargeFaultsAttributeCallback(),
-            readPowerSourceActiveBatteryChargeFaultsCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readActiveBatteryChargeFaultsAttribute",
-        readPowerSourceActiveBatteryChargeFaultsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceGeneratedCommandListCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceGeneratedCommandListAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.PowerSourceCluster.GeneratedCommandListAttributeCallback)
-                          callback);
-            },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedPowerSourceClusterGeneratedCommandListAttributeCallback(),
-            readPowerSourceGeneratedCommandListCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readPowerSourceGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceAcceptedCommandListCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceAcceptedCommandListAttributeInteractionInfo =
+            readPumpConfigurationAndControlPowerCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
+        "readPowerAttribute", readPumpConfigurationAndControlPowerAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readPumpConfigurationAndControlLifetimeEnergyConsumedCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readPumpConfigurationAndControlLifetimeEnergyConsumedAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.PowerSourceCluster.AcceptedCommandListAttributeCallback)
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .readLifetimeEnergyConsumedAttribute(
+                      (ChipClusters.PumpConfigurationAndControlCluster
+                              .LifetimeEnergyConsumedAttributeCallback)
                           callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedPowerSourceClusterAcceptedCommandListAttributeCallback(),
-            readPowerSourceAcceptedCommandListCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readPowerSourceAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceAttributeListCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceAttributeListAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.PowerSourceCluster.AttributeListAttributeCallback) callback);
-            },
-            () ->
-                new ClusterInfoMapping.DelegatedPowerSourceClusterAttributeListAttributeCallback(),
-            readPowerSourceAttributeListCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readAttributeListAttribute", readPowerSourceAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceFeatureMapCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceFeatureMapAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
-            },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readPowerSourceFeatureMapCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readFeatureMapAttribute", readPowerSourceFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceClusterRevisionCommandParams =
+            readPumpConfigurationAndControlLifetimeEnergyConsumedCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
+        "readLifetimeEnergyConsumedAttribute",
+        readPumpConfigurationAndControlLifetimeEnergyConsumedAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPumpConfigurationAndControlOperationModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readPumpConfigurationAndControlOperationModeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .readOperationModeAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPowerSourceClusterRevisionCommandParams);
-    readPowerSourceInteractionInfo.put(
-        "readClusterRevisionAttribute", readPowerSourceClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("powerSource", readPowerSourceInteractionInfo);
-    Map<String, InteractionInfo> readPowerSourceConfigurationInteractionInfo =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readPowerSourceConfigurationSourcesCommandParams =
+            readPumpConfigurationAndControlOperationModeCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
+        "readOperationModeAttribute",
+        readPumpConfigurationAndControlOperationModeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPumpConfigurationAndControlControlModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceConfigurationSourcesAttributeInteractionInfo =
+    InteractionInfo readPumpConfigurationAndControlControlModeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceConfigurationCluster) cluster)
-                  .readSourcesAttribute(
-                      (ChipClusters.PowerSourceConfigurationCluster.SourcesAttributeCallback)
-                          callback);
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .readControlModeAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedPowerSourceConfigurationClusterSourcesAttributeCallback(),
-            readPowerSourceConfigurationSourcesCommandParams);
-    readPowerSourceConfigurationInteractionInfo.put(
-        "readSourcesAttribute", readPowerSourceConfigurationSourcesAttributeInteractionInfo);
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readPumpConfigurationAndControlControlModeCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
+        "readControlModeAttribute",
+        readPumpConfigurationAndControlControlModeAttributeInteractionInfo);
     Map<String, CommandParameterInfo>
-        readPowerSourceConfigurationGeneratedCommandListCommandParams =
+        readPumpConfigurationAndControlGeneratedCommandListCommandParams =
             new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceConfigurationGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readPumpConfigurationAndControlGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceConfigurationCluster) cluster)
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
                   .readGeneratedCommandListAttribute(
-                      (ChipClusters.PowerSourceConfigurationCluster
+                      (ChipClusters.PumpConfigurationAndControlCluster
                               .GeneratedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedPowerSourceConfigurationClusterGeneratedCommandListAttributeCallback(),
-            readPowerSourceConfigurationGeneratedCommandListCommandParams);
-    readPowerSourceConfigurationInteractionInfo.put(
+                    .DelegatedPumpConfigurationAndControlClusterGeneratedCommandListAttributeCallback(),
+            readPumpConfigurationAndControlGeneratedCommandListCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
         "readGeneratedCommandListAttribute",
-        readPowerSourceConfigurationGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceConfigurationAcceptedCommandListCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceConfigurationAcceptedCommandListAttributeInteractionInfo =
+        readPumpConfigurationAndControlGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readPumpConfigurationAndControlAcceptedCommandListCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readPumpConfigurationAndControlAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceConfigurationCluster) cluster)
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
                   .readAcceptedCommandListAttribute(
-                      (ChipClusters.PowerSourceConfigurationCluster
+                      (ChipClusters.PumpConfigurationAndControlCluster
                               .AcceptedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedPowerSourceConfigurationClusterAcceptedCommandListAttributeCallback(),
-            readPowerSourceConfigurationAcceptedCommandListCommandParams);
-    readPowerSourceConfigurationInteractionInfo.put(
+                    .DelegatedPumpConfigurationAndControlClusterAcceptedCommandListAttributeCallback(),
+            readPumpConfigurationAndControlAcceptedCommandListCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
         "readAcceptedCommandListAttribute",
-        readPowerSourceConfigurationAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceConfigurationAttributeListCommandParams =
+        readPumpConfigurationAndControlAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPumpConfigurationAndControlAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceConfigurationAttributeListAttributeInteractionInfo =
+    InteractionInfo readPumpConfigurationAndControlAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceConfigurationCluster) cluster)
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.PowerSourceConfigurationCluster.AttributeListAttributeCallback)
+                      (ChipClusters.PumpConfigurationAndControlCluster
+                              .AttributeListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedPowerSourceConfigurationClusterAttributeListAttributeCallback(),
-            readPowerSourceConfigurationAttributeListCommandParams);
-    readPowerSourceConfigurationInteractionInfo.put(
+                    .DelegatedPumpConfigurationAndControlClusterAttributeListAttributeCallback(),
+            readPumpConfigurationAndControlAttributeListCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
         "readAttributeListAttribute",
-        readPowerSourceConfigurationAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceConfigurationFeatureMapCommandParams =
+        readPumpConfigurationAndControlAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPumpConfigurationAndControlFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceConfigurationFeatureMapAttributeInteractionInfo =
+    InteractionInfo readPumpConfigurationAndControlFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceConfigurationCluster) cluster)
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readPowerSourceConfigurationFeatureMapCommandParams);
-    readPowerSourceConfigurationInteractionInfo.put(
-        "readFeatureMapAttribute", readPowerSourceConfigurationFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPowerSourceConfigurationClusterRevisionCommandParams =
+            readPumpConfigurationAndControlFeatureMapCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
+        "readFeatureMapAttribute",
+        readPumpConfigurationAndControlFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPumpConfigurationAndControlClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPowerSourceConfigurationClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readPumpConfigurationAndControlClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PowerSourceConfigurationCluster) cluster)
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPowerSourceConfigurationClusterRevisionCommandParams);
-    readPowerSourceConfigurationInteractionInfo.put(
+            readPumpConfigurationAndControlClusterRevisionCommandParams);
+    readPumpConfigurationAndControlInteractionInfo.put(
         "readClusterRevisionAttribute",
-        readPowerSourceConfigurationClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("powerSourceConfiguration", readPowerSourceConfigurationInteractionInfo);
-    Map<String, InteractionInfo> readPressureMeasurementInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readPressureMeasurementMeasuredValueCommandParams =
+        readPumpConfigurationAndControlClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put(
+        "pumpConfigurationAndControl", readPumpConfigurationAndControlInteractionInfo);
+    Map<String, InteractionInfo> readThermostatInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readThermostatLocalTemperatureCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPressureMeasurementMeasuredValueAttributeInteractionInfo =
+    InteractionInfo readThermostatLocalTemperatureAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PressureMeasurementCluster) cluster)
-                  .readMeasuredValueAttribute(
-                      (ChipClusters.PressureMeasurementCluster.MeasuredValueAttributeCallback)
-                          callback);
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .readLocalTemperatureAttribute(
+                      (ChipClusters.ThermostatCluster.LocalTemperatureAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPressureMeasurementMeasuredValueCommandParams);
-    readPressureMeasurementInteractionInfo.put(
-        "readMeasuredValueAttribute", readPressureMeasurementMeasuredValueAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPressureMeasurementMinMeasuredValueCommandParams =
+            readThermostatLocalTemperatureCommandParams);
+    readThermostatInteractionInfo.put(
+        "readLocalTemperatureAttribute", readThermostatLocalTemperatureAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThermostatAbsMinHeatSetpointLimitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPressureMeasurementMinMeasuredValueAttributeInteractionInfo =
+    InteractionInfo readThermostatAbsMinHeatSetpointLimitAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PressureMeasurementCluster) cluster)
-                  .readMinMeasuredValueAttribute(
-                      (ChipClusters.PressureMeasurementCluster.MinMeasuredValueAttributeCallback)
-                          callback);
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .readAbsMinHeatSetpointLimitAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPressureMeasurementMinMeasuredValueCommandParams);
-    readPressureMeasurementInteractionInfo.put(
-        "readMinMeasuredValueAttribute",
-        readPressureMeasurementMinMeasuredValueAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPressureMeasurementMaxMeasuredValueCommandParams =
+            readThermostatAbsMinHeatSetpointLimitCommandParams);
+    readThermostatInteractionInfo.put(
+        "readAbsMinHeatSetpointLimitAttribute",
+        readThermostatAbsMinHeatSetpointLimitAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThermostatAbsMaxHeatSetpointLimitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPressureMeasurementMaxMeasuredValueAttributeInteractionInfo =
+    InteractionInfo readThermostatAbsMaxHeatSetpointLimitAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PressureMeasurementCluster) cluster)
-                  .readMaxMeasuredValueAttribute(
-                      (ChipClusters.PressureMeasurementCluster.MaxMeasuredValueAttributeCallback)
-                          callback);
-            },
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .readAbsMaxHeatSetpointLimitAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
+            },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPressureMeasurementMaxMeasuredValueCommandParams);
-    readPressureMeasurementInteractionInfo.put(
-        "readMaxMeasuredValueAttribute",
-        readPressureMeasurementMaxMeasuredValueAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPressureMeasurementToleranceCommandParams =
+            readThermostatAbsMaxHeatSetpointLimitCommandParams);
+    readThermostatInteractionInfo.put(
+        "readAbsMaxHeatSetpointLimitAttribute",
+        readThermostatAbsMaxHeatSetpointLimitAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThermostatAbsMinCoolSetpointLimitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPressureMeasurementToleranceAttributeInteractionInfo =
+    InteractionInfo readThermostatAbsMinCoolSetpointLimitAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PressureMeasurementCluster) cluster)
-                  .readToleranceAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .readAbsMinCoolSetpointLimitAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPressureMeasurementToleranceCommandParams);
-    readPressureMeasurementInteractionInfo.put(
-        "readToleranceAttribute", readPressureMeasurementToleranceAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPressureMeasurementScaledValueCommandParams =
+            readThermostatAbsMinCoolSetpointLimitCommandParams);
+    readThermostatInteractionInfo.put(
+        "readAbsMinCoolSetpointLimitAttribute",
+        readThermostatAbsMinCoolSetpointLimitAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThermostatAbsMaxCoolSetpointLimitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPressureMeasurementScaledValueAttributeInteractionInfo =
+    InteractionInfo readThermostatAbsMaxCoolSetpointLimitAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PressureMeasurementCluster) cluster)
-                  .readScaledValueAttribute(
-                      (ChipClusters.PressureMeasurementCluster.ScaledValueAttributeCallback)
-                          callback);
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .readAbsMaxCoolSetpointLimitAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPressureMeasurementScaledValueCommandParams);
-    readPressureMeasurementInteractionInfo.put(
-        "readScaledValueAttribute", readPressureMeasurementScaledValueAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPressureMeasurementMinScaledValueCommandParams =
+            readThermostatAbsMaxCoolSetpointLimitCommandParams);
+    readThermostatInteractionInfo.put(
+        "readAbsMaxCoolSetpointLimitAttribute",
+        readThermostatAbsMaxCoolSetpointLimitAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThermostatOccupiedCoolingSetpointCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPressureMeasurementMinScaledValueAttributeInteractionInfo =
+    InteractionInfo readThermostatOccupiedCoolingSetpointAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PressureMeasurementCluster) cluster)
-                  .readMinScaledValueAttribute(
-                      (ChipClusters.PressureMeasurementCluster.MinScaledValueAttributeCallback)
-                          callback);
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .readOccupiedCoolingSetpointAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPressureMeasurementMinScaledValueCommandParams);
-    readPressureMeasurementInteractionInfo.put(
-        "readMinScaledValueAttribute",
-        readPressureMeasurementMinScaledValueAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPressureMeasurementMaxScaledValueCommandParams =
+            readThermostatOccupiedCoolingSetpointCommandParams);
+    readThermostatInteractionInfo.put(
+        "readOccupiedCoolingSetpointAttribute",
+        readThermostatOccupiedCoolingSetpointAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThermostatOccupiedHeatingSetpointCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPressureMeasurementMaxScaledValueAttributeInteractionInfo =
+    InteractionInfo readThermostatOccupiedHeatingSetpointAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PressureMeasurementCluster) cluster)
-                  .readMaxScaledValueAttribute(
-                      (ChipClusters.PressureMeasurementCluster.MaxScaledValueAttributeCallback)
-                          callback);
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .readOccupiedHeatingSetpointAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPressureMeasurementMaxScaledValueCommandParams);
-    readPressureMeasurementInteractionInfo.put(
-        "readMaxScaledValueAttribute",
-        readPressureMeasurementMaxScaledValueAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPressureMeasurementScaledToleranceCommandParams =
+            readThermostatOccupiedHeatingSetpointCommandParams);
+    readThermostatInteractionInfo.put(
+        "readOccupiedHeatingSetpointAttribute",
+        readThermostatOccupiedHeatingSetpointAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThermostatMinHeatSetpointLimitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPressureMeasurementScaledToleranceAttributeInteractionInfo =
+    InteractionInfo readThermostatMinHeatSetpointLimitAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PressureMeasurementCluster) cluster)
-                  .readScaledToleranceAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .readMinHeatSetpointLimitAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPressureMeasurementScaledToleranceCommandParams);
-    readPressureMeasurementInteractionInfo.put(
-        "readScaledToleranceAttribute",
-        readPressureMeasurementScaledToleranceAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPressureMeasurementScaleCommandParams =
+            readThermostatMinHeatSetpointLimitCommandParams);
+    readThermostatInteractionInfo.put(
+        "readMinHeatSetpointLimitAttribute",
+        readThermostatMinHeatSetpointLimitAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThermostatMaxHeatSetpointLimitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPressureMeasurementScaleAttributeInteractionInfo =
+    InteractionInfo readThermostatMaxHeatSetpointLimitAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PressureMeasurementCluster) cluster)
-                  .readScaleAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .readMaxHeatSetpointLimitAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPressureMeasurementScaleCommandParams);
-    readPressureMeasurementInteractionInfo.put(
-        "readScaleAttribute", readPressureMeasurementScaleAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPressureMeasurementAttributeListCommandParams =
+            readThermostatMaxHeatSetpointLimitCommandParams);
+    readThermostatInteractionInfo.put(
+        "readMaxHeatSetpointLimitAttribute",
+        readThermostatMaxHeatSetpointLimitAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThermostatMinCoolSetpointLimitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPressureMeasurementAttributeListAttributeInteractionInfo =
+    InteractionInfo readThermostatMinCoolSetpointLimitAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PressureMeasurementCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.PressureMeasurementCluster.AttributeListAttributeCallback)
-                          callback);
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .readMinCoolSetpointLimitAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedPressureMeasurementClusterAttributeListAttributeCallback(),
-            readPressureMeasurementAttributeListCommandParams);
-    readPressureMeasurementInteractionInfo.put(
-        "readAttributeListAttribute", readPressureMeasurementAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPressureMeasurementFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readThermostatMinCoolSetpointLimitCommandParams);
+    readThermostatInteractionInfo.put(
+        "readMinCoolSetpointLimitAttribute",
+        readThermostatMinCoolSetpointLimitAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThermostatMaxCoolSetpointLimitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPressureMeasurementFeatureMapAttributeInteractionInfo =
+    InteractionInfo readThermostatMaxCoolSetpointLimitAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PressureMeasurementCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .readMaxCoolSetpointLimitAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readPressureMeasurementFeatureMapCommandParams);
-    readPressureMeasurementInteractionInfo.put(
-        "readFeatureMapAttribute", readPressureMeasurementFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPressureMeasurementClusterRevisionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readThermostatMaxCoolSetpointLimitCommandParams);
+    readThermostatInteractionInfo.put(
+        "readMaxCoolSetpointLimitAttribute",
+        readThermostatMaxCoolSetpointLimitAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThermostatMinSetpointDeadBandCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPressureMeasurementClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readThermostatMinSetpointDeadBandAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PressureMeasurementCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .readMinSetpointDeadBandAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPressureMeasurementClusterRevisionCommandParams);
-    readPressureMeasurementInteractionInfo.put(
-        "readClusterRevisionAttribute",
-        readPressureMeasurementClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("pressureMeasurement", readPressureMeasurementInteractionInfo);
-    Map<String, InteractionInfo> readPumpConfigurationAndControlInteractionInfo =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMaxPressureCommandParams =
+            readThermostatMinSetpointDeadBandCommandParams);
+    readThermostatInteractionInfo.put(
+        "readMinSetpointDeadBandAttribute",
+        readThermostatMinSetpointDeadBandAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThermostatControlSequenceOfOperationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlMaxPressureAttributeInteractionInfo =
+    InteractionInfo readThermostatControlSequenceOfOperationAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readMaxPressureAttribute(
-                      (ChipClusters.PumpConfigurationAndControlCluster.MaxPressureAttributeCallback)
-                          callback);
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .readControlSequenceOfOperationAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPumpConfigurationAndControlMaxPressureCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
-        "readMaxPressureAttribute",
-        readPumpConfigurationAndControlMaxPressureAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMaxSpeedCommandParams =
+            readThermostatControlSequenceOfOperationCommandParams);
+    readThermostatInteractionInfo.put(
+        "readControlSequenceOfOperationAttribute",
+        readThermostatControlSequenceOfOperationAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThermostatSystemModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlMaxSpeedAttributeInteractionInfo =
+    InteractionInfo readThermostatSystemModeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readMaxSpeedAttribute(
-                      (ChipClusters.PumpConfigurationAndControlCluster.MaxSpeedAttributeCallback)
-                          callback);
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .readSystemModeAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPumpConfigurationAndControlMaxSpeedCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
-        "readMaxSpeedAttribute", readPumpConfigurationAndControlMaxSpeedAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMaxFlowCommandParams =
+            readThermostatSystemModeCommandParams);
+    readThermostatInteractionInfo.put(
+        "readSystemModeAttribute", readThermostatSystemModeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThermostatStartOfWeekCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlMaxFlowAttributeInteractionInfo =
+    InteractionInfo readThermostatStartOfWeekAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readMaxFlowAttribute(
-                      (ChipClusters.PumpConfigurationAndControlCluster.MaxFlowAttributeCallback)
-                          callback);
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .readStartOfWeekAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPumpConfigurationAndControlMaxFlowCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
-        "readMaxFlowAttribute", readPumpConfigurationAndControlMaxFlowAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMinConstPressureCommandParams =
+            readThermostatStartOfWeekCommandParams);
+    readThermostatInteractionInfo.put(
+        "readStartOfWeekAttribute", readThermostatStartOfWeekAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThermostatNumberOfWeeklyTransitionsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlMinConstPressureAttributeInteractionInfo =
+    InteractionInfo readThermostatNumberOfWeeklyTransitionsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readMinConstPressureAttribute(
-                      (ChipClusters.PumpConfigurationAndControlCluster
-                              .MinConstPressureAttributeCallback)
-                          callback);
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .readNumberOfWeeklyTransitionsAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPumpConfigurationAndControlMinConstPressureCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
-        "readMinConstPressureAttribute",
-        readPumpConfigurationAndControlMinConstPressureAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMaxConstPressureCommandParams =
+            readThermostatNumberOfWeeklyTransitionsCommandParams);
+    readThermostatInteractionInfo.put(
+        "readNumberOfWeeklyTransitionsAttribute",
+        readThermostatNumberOfWeeklyTransitionsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThermostatNumberOfDailyTransitionsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlMaxConstPressureAttributeInteractionInfo =
+    InteractionInfo readThermostatNumberOfDailyTransitionsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readMaxConstPressureAttribute(
-                      (ChipClusters.PumpConfigurationAndControlCluster
-                              .MaxConstPressureAttributeCallback)
-                          callback);
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .readNumberOfDailyTransitionsAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPumpConfigurationAndControlMaxConstPressureCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
-        "readMaxConstPressureAttribute",
-        readPumpConfigurationAndControlMaxConstPressureAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMinCompPressureCommandParams =
+            readThermostatNumberOfDailyTransitionsCommandParams);
+    readThermostatInteractionInfo.put(
+        "readNumberOfDailyTransitionsAttribute",
+        readThermostatNumberOfDailyTransitionsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThermostatAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlMinCompPressureAttributeInteractionInfo =
+    InteractionInfo readThermostatAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readMinCompPressureAttribute(
-                      (ChipClusters.PumpConfigurationAndControlCluster
-                              .MinCompPressureAttributeCallback)
-                          callback);
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.ThermostatCluster.AttributeListAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPumpConfigurationAndControlMinCompPressureCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
-        "readMinCompPressureAttribute",
-        readPumpConfigurationAndControlMinCompPressureAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMaxCompPressureCommandParams =
+            () -> new ClusterInfoMapping.DelegatedThermostatClusterAttributeListAttributeCallback(),
+            readThermostatAttributeListCommandParams);
+    readThermostatInteractionInfo.put(
+        "readAttributeListAttribute", readThermostatAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThermostatFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlMaxCompPressureAttributeInteractionInfo =
+    InteractionInfo readThermostatFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readMaxCompPressureAttribute(
-                      (ChipClusters.PumpConfigurationAndControlCluster
-                              .MaxCompPressureAttributeCallback)
-                          callback);
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readThermostatFeatureMapCommandParams);
+    readThermostatInteractionInfo.put(
+        "readFeatureMapAttribute", readThermostatFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readThermostatClusterRevisionCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readThermostatClusterRevisionAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPumpConfigurationAndControlMaxCompPressureCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
-        "readMaxCompPressureAttribute",
-        readPumpConfigurationAndControlMaxCompPressureAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMinConstSpeedCommandParams =
+            readThermostatClusterRevisionCommandParams);
+    readThermostatInteractionInfo.put(
+        "readClusterRevisionAttribute", readThermostatClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("thermostat", readThermostatInteractionInfo);
+    Map<String, InteractionInfo> readFanControlInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readFanControlFanModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlMinConstSpeedAttributeInteractionInfo =
+    InteractionInfo readFanControlFanModeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readMinConstSpeedAttribute(
-                      (ChipClusters.PumpConfigurationAndControlCluster
-                              .MinConstSpeedAttributeCallback)
-                          callback);
+              ((ChipClusters.FanControlCluster) cluster)
+                  .readFanModeAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPumpConfigurationAndControlMinConstSpeedCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
-        "readMinConstSpeedAttribute",
-        readPumpConfigurationAndControlMinConstSpeedAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMaxConstSpeedCommandParams =
+            readFanControlFanModeCommandParams);
+    readFanControlInteractionInfo.put(
+        "readFanModeAttribute", readFanControlFanModeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFanControlFanModeSequenceCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlMaxConstSpeedAttributeInteractionInfo =
+    InteractionInfo readFanControlFanModeSequenceAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readMaxConstSpeedAttribute(
-                      (ChipClusters.PumpConfigurationAndControlCluster
-                              .MaxConstSpeedAttributeCallback)
-                          callback);
+              ((ChipClusters.FanControlCluster) cluster)
+                  .readFanModeSequenceAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPumpConfigurationAndControlMaxConstSpeedCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
-        "readMaxConstSpeedAttribute",
-        readPumpConfigurationAndControlMaxConstSpeedAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMinConstFlowCommandParams =
+            readFanControlFanModeSequenceCommandParams);
+    readFanControlInteractionInfo.put(
+        "readFanModeSequenceAttribute", readFanControlFanModeSequenceAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFanControlPercentSettingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlMinConstFlowAttributeInteractionInfo =
+    InteractionInfo readFanControlPercentSettingAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readMinConstFlowAttribute(
-                      (ChipClusters.PumpConfigurationAndControlCluster
-                              .MinConstFlowAttributeCallback)
-                          callback);
+              ((ChipClusters.FanControlCluster) cluster)
+                  .readPercentSettingAttribute(
+                      (ChipClusters.FanControlCluster.PercentSettingAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPumpConfigurationAndControlMinConstFlowCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
-        "readMinConstFlowAttribute",
-        readPumpConfigurationAndControlMinConstFlowAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMaxConstFlowCommandParams =
+            readFanControlPercentSettingCommandParams);
+    readFanControlInteractionInfo.put(
+        "readPercentSettingAttribute", readFanControlPercentSettingAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFanControlPercentCurrentCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlMaxConstFlowAttributeInteractionInfo =
+    InteractionInfo readFanControlPercentCurrentAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readMaxConstFlowAttribute(
-                      (ChipClusters.PumpConfigurationAndControlCluster
-                              .MaxConstFlowAttributeCallback)
-                          callback);
+              ((ChipClusters.FanControlCluster) cluster)
+                  .readPercentCurrentAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPumpConfigurationAndControlMaxConstFlowCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
-        "readMaxConstFlowAttribute",
-        readPumpConfigurationAndControlMaxConstFlowAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMinConstTempCommandParams =
+            readFanControlPercentCurrentCommandParams);
+    readFanControlInteractionInfo.put(
+        "readPercentCurrentAttribute", readFanControlPercentCurrentAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFanControlSpeedMaxCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlMinConstTempAttributeInteractionInfo =
+    InteractionInfo readFanControlSpeedMaxAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readMinConstTempAttribute(
-                      (ChipClusters.PumpConfigurationAndControlCluster
-                              .MinConstTempAttributeCallback)
-                          callback);
+              ((ChipClusters.FanControlCluster) cluster)
+                  .readSpeedMaxAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPumpConfigurationAndControlMinConstTempCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
-        "readMinConstTempAttribute",
-        readPumpConfigurationAndControlMinConstTempAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPumpConfigurationAndControlMaxConstTempCommandParams =
+            readFanControlSpeedMaxCommandParams);
+    readFanControlInteractionInfo.put(
+        "readSpeedMaxAttribute", readFanControlSpeedMaxAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFanControlSpeedSettingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlMaxConstTempAttributeInteractionInfo =
+    InteractionInfo readFanControlSpeedSettingAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readMaxConstTempAttribute(
-                      (ChipClusters.PumpConfigurationAndControlCluster
-                              .MaxConstTempAttributeCallback)
-                          callback);
+              ((ChipClusters.FanControlCluster) cluster)
+                  .readSpeedSettingAttribute(
+                      (ChipClusters.FanControlCluster.SpeedSettingAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPumpConfigurationAndControlMaxConstTempCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
-        "readMaxConstTempAttribute",
-        readPumpConfigurationAndControlMaxConstTempAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPumpConfigurationAndControlPumpStatusCommandParams =
+            readFanControlSpeedSettingCommandParams);
+    readFanControlInteractionInfo.put(
+        "readSpeedSettingAttribute", readFanControlSpeedSettingAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFanControlSpeedCurrentCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlPumpStatusAttributeInteractionInfo =
+    InteractionInfo readFanControlSpeedCurrentAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readPumpStatusAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.FanControlCluster) cluster)
+                  .readSpeedCurrentAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPumpConfigurationAndControlPumpStatusCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
-        "readPumpStatusAttribute",
-        readPumpConfigurationAndControlPumpStatusAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readPumpConfigurationAndControlEffectiveOperationModeCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlEffectiveOperationModeAttributeInteractionInfo =
+            readFanControlSpeedCurrentCommandParams);
+    readFanControlInteractionInfo.put(
+        "readSpeedCurrentAttribute", readFanControlSpeedCurrentAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFanControlRockSupportCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readFanControlRockSupportAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readEffectiveOperationModeAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.FanControlCluster) cluster)
+                  .readRockSupportAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPumpConfigurationAndControlEffectiveOperationModeCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
-        "readEffectiveOperationModeAttribute",
-        readPumpConfigurationAndControlEffectiveOperationModeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readPumpConfigurationAndControlEffectiveControlModeCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlEffectiveControlModeAttributeInteractionInfo =
+            readFanControlRockSupportCommandParams);
+    readFanControlInteractionInfo.put(
+        "readRockSupportAttribute", readFanControlRockSupportAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFanControlRockSettingCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readFanControlRockSettingAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readEffectiveControlModeAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.FanControlCluster) cluster)
+                  .readRockSettingAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPumpConfigurationAndControlEffectiveControlModeCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
-        "readEffectiveControlModeAttribute",
-        readPumpConfigurationAndControlEffectiveControlModeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPumpConfigurationAndControlCapacityCommandParams =
+            readFanControlRockSettingCommandParams);
+    readFanControlInteractionInfo.put(
+        "readRockSettingAttribute", readFanControlRockSettingAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFanControlWindSupportCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlCapacityAttributeInteractionInfo =
+    InteractionInfo readFanControlWindSupportAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readCapacityAttribute(
-                      (ChipClusters.PumpConfigurationAndControlCluster.CapacityAttributeCallback)
-                          callback);
+              ((ChipClusters.FanControlCluster) cluster)
+                  .readWindSupportAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPumpConfigurationAndControlCapacityCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
-        "readCapacityAttribute", readPumpConfigurationAndControlCapacityAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPumpConfigurationAndControlSpeedCommandParams =
+            readFanControlWindSupportCommandParams);
+    readFanControlInteractionInfo.put(
+        "readWindSupportAttribute", readFanControlWindSupportAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFanControlWindSettingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlSpeedAttributeInteractionInfo =
+    InteractionInfo readFanControlWindSettingAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readSpeedAttribute(
-                      (ChipClusters.PumpConfigurationAndControlCluster.SpeedAttributeCallback)
-                          callback);
+              ((ChipClusters.FanControlCluster) cluster)
+                  .readWindSettingAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPumpConfigurationAndControlSpeedCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
-        "readSpeedAttribute", readPumpConfigurationAndControlSpeedAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readPumpConfigurationAndControlLifetimeRunningHoursCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlLifetimeRunningHoursAttributeInteractionInfo =
+            readFanControlWindSettingCommandParams);
+    readFanControlInteractionInfo.put(
+        "readWindSettingAttribute", readFanControlWindSettingAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFanControlGeneratedCommandListCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readFanControlGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readLifetimeRunningHoursAttribute(
-                      (ChipClusters.PumpConfigurationAndControlCluster
-                              .LifetimeRunningHoursAttributeCallback)
+              ((ChipClusters.FanControlCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.FanControlCluster.GeneratedCommandListAttributeCallback)
                           callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readPumpConfigurationAndControlLifetimeRunningHoursCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
-        "readLifetimeRunningHoursAttribute",
-        readPumpConfigurationAndControlLifetimeRunningHoursAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPumpConfigurationAndControlPowerCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedFanControlClusterGeneratedCommandListAttributeCallback(),
+            readFanControlGeneratedCommandListCommandParams);
+    readFanControlInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readFanControlGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFanControlAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlPowerAttributeInteractionInfo =
+    InteractionInfo readFanControlAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readPowerAttribute(
-                      (ChipClusters.PumpConfigurationAndControlCluster.PowerAttributeCallback)
+              ((ChipClusters.FanControlCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.FanControlCluster.AcceptedCommandListAttributeCallback)
                           callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readPumpConfigurationAndControlPowerCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
-        "readPowerAttribute", readPumpConfigurationAndControlPowerAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readPumpConfigurationAndControlLifetimeEnergyConsumedCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlLifetimeEnergyConsumedAttributeInteractionInfo =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedFanControlClusterAcceptedCommandListAttributeCallback(),
+            readFanControlAcceptedCommandListCommandParams);
+    readFanControlInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readFanControlAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFanControlAttributeListCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readFanControlAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readLifetimeEnergyConsumedAttribute(
-                      (ChipClusters.PumpConfigurationAndControlCluster
-                              .LifetimeEnergyConsumedAttributeCallback)
-                          callback);
+              ((ChipClusters.FanControlCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.FanControlCluster.AttributeListAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readPumpConfigurationAndControlLifetimeEnergyConsumedCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
-        "readLifetimeEnergyConsumedAttribute",
-        readPumpConfigurationAndControlLifetimeEnergyConsumedAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPumpConfigurationAndControlOperationModeCommandParams =
+            () -> new ClusterInfoMapping.DelegatedFanControlClusterAttributeListAttributeCallback(),
+            readFanControlAttributeListCommandParams);
+    readFanControlInteractionInfo.put(
+        "readAttributeListAttribute", readFanControlAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFanControlFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlOperationModeAttributeInteractionInfo =
+    InteractionInfo readFanControlFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readOperationModeAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.FanControlCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPumpConfigurationAndControlOperationModeCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
-        "readOperationModeAttribute",
-        readPumpConfigurationAndControlOperationModeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPumpConfigurationAndControlControlModeCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readFanControlFeatureMapCommandParams);
+    readFanControlInteractionInfo.put(
+        "readFeatureMapAttribute", readFanControlFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFanControlClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlControlModeAttributeInteractionInfo =
+    InteractionInfo readFanControlClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readControlModeAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.FanControlCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPumpConfigurationAndControlControlModeCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
-        "readControlModeAttribute",
-        readPumpConfigurationAndControlControlModeAttributeInteractionInfo);
+            readFanControlClusterRevisionCommandParams);
+    readFanControlInteractionInfo.put(
+        "readClusterRevisionAttribute", readFanControlClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("fanControl", readFanControlInteractionInfo);
+    Map<String, InteractionInfo> readThermostatUserInterfaceConfigurationInteractionInfo =
+        new LinkedHashMap<>();
     Map<String, CommandParameterInfo>
-        readPumpConfigurationAndControlGeneratedCommandListCommandParams =
+        readThermostatUserInterfaceConfigurationTemperatureDisplayModeCommandParams =
             new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo
+        readThermostatUserInterfaceConfigurationTemperatureDisplayModeAttributeInteractionInfo =
+            new InteractionInfo(
+                (cluster, callback, commandArguments) -> {
+                  ((ChipClusters.ThermostatUserInterfaceConfigurationCluster) cluster)
+                      .readTemperatureDisplayModeAttribute(
+                          (ChipClusters.IntegerAttributeCallback) callback);
+                },
+                () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+                readThermostatUserInterfaceConfigurationTemperatureDisplayModeCommandParams);
+    readThermostatUserInterfaceConfigurationInteractionInfo.put(
+        "readTemperatureDisplayModeAttribute",
+        readThermostatUserInterfaceConfigurationTemperatureDisplayModeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readThermostatUserInterfaceConfigurationKeypadLockoutCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readThermostatUserInterfaceConfigurationKeypadLockoutAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.PumpConfigurationAndControlCluster
-                              .GeneratedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.ThermostatUserInterfaceConfigurationCluster) cluster)
+                  .readKeypadLockoutAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedPumpConfigurationAndControlClusterGeneratedCommandListAttributeCallback(),
-            readPumpConfigurationAndControlGeneratedCommandListCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readThermostatUserInterfaceConfigurationKeypadLockoutCommandParams);
+    readThermostatUserInterfaceConfigurationInteractionInfo.put(
+        "readKeypadLockoutAttribute",
+        readThermostatUserInterfaceConfigurationKeypadLockoutAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo
+        readThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityAttributeInteractionInfo =
+            new InteractionInfo(
+                (cluster, callback, commandArguments) -> {
+                  ((ChipClusters.ThermostatUserInterfaceConfigurationCluster) cluster)
+                      .readScheduleProgrammingVisibilityAttribute(
+                          (ChipClusters.IntegerAttributeCallback) callback);
+                },
+                () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+                readThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityCommandParams);
+    readThermostatUserInterfaceConfigurationInteractionInfo.put(
+        "readScheduleProgrammingVisibilityAttribute",
+        readThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readThermostatUserInterfaceConfigurationGeneratedCommandListCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo
+        readThermostatUserInterfaceConfigurationGeneratedCommandListAttributeInteractionInfo =
+            new InteractionInfo(
+                (cluster, callback, commandArguments) -> {
+                  ((ChipClusters.ThermostatUserInterfaceConfigurationCluster) cluster)
+                      .readGeneratedCommandListAttribute(
+                          (ChipClusters.ThermostatUserInterfaceConfigurationCluster
+                                  .GeneratedCommandListAttributeCallback)
+                              callback);
+                },
+                () ->
+                    new ClusterInfoMapping
+                        .DelegatedThermostatUserInterfaceConfigurationClusterGeneratedCommandListAttributeCallback(),
+                readThermostatUserInterfaceConfigurationGeneratedCommandListCommandParams);
+    readThermostatUserInterfaceConfigurationInteractionInfo.put(
         "readGeneratedCommandListAttribute",
-        readPumpConfigurationAndControlGeneratedCommandListAttributeInteractionInfo);
+        readThermostatUserInterfaceConfigurationGeneratedCommandListAttributeInteractionInfo);
     Map<String, CommandParameterInfo>
-        readPumpConfigurationAndControlAcceptedCommandListCommandParams =
+        readThermostatUserInterfaceConfigurationAcceptedCommandListCommandParams =
             new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlAcceptedCommandListAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.PumpConfigurationAndControlCluster
-                              .AcceptedCommandListAttributeCallback)
-                          callback);
-            },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedPumpConfigurationAndControlClusterAcceptedCommandListAttributeCallback(),
-            readPumpConfigurationAndControlAcceptedCommandListCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
+    InteractionInfo
+        readThermostatUserInterfaceConfigurationAcceptedCommandListAttributeInteractionInfo =
+            new InteractionInfo(
+                (cluster, callback, commandArguments) -> {
+                  ((ChipClusters.ThermostatUserInterfaceConfigurationCluster) cluster)
+                      .readAcceptedCommandListAttribute(
+                          (ChipClusters.ThermostatUserInterfaceConfigurationCluster
+                                  .AcceptedCommandListAttributeCallback)
+                              callback);
+                },
+                () ->
+                    new ClusterInfoMapping
+                        .DelegatedThermostatUserInterfaceConfigurationClusterAcceptedCommandListAttributeCallback(),
+                readThermostatUserInterfaceConfigurationAcceptedCommandListCommandParams);
+    readThermostatUserInterfaceConfigurationInteractionInfo.put(
         "readAcceptedCommandListAttribute",
-        readPumpConfigurationAndControlAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPumpConfigurationAndControlAttributeListCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlAttributeListAttributeInteractionInfo =
+        readThermostatUserInterfaceConfigurationAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readThermostatUserInterfaceConfigurationAttributeListCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readThermostatUserInterfaceConfigurationAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+              ((ChipClusters.ThermostatUserInterfaceConfigurationCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.PumpConfigurationAndControlCluster
+                      (ChipClusters.ThermostatUserInterfaceConfigurationCluster
                               .AttributeListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedPumpConfigurationAndControlClusterAttributeListAttributeCallback(),
-            readPumpConfigurationAndControlAttributeListCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
+                    .DelegatedThermostatUserInterfaceConfigurationClusterAttributeListAttributeCallback(),
+            readThermostatUserInterfaceConfigurationAttributeListCommandParams);
+    readThermostatUserInterfaceConfigurationInteractionInfo.put(
         "readAttributeListAttribute",
-        readPumpConfigurationAndControlAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPumpConfigurationAndControlFeatureMapCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlFeatureMapAttributeInteractionInfo =
+        readThermostatUserInterfaceConfigurationAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readThermostatUserInterfaceConfigurationFeatureMapCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readThermostatUserInterfaceConfigurationFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+              ((ChipClusters.ThermostatUserInterfaceConfigurationCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readPumpConfigurationAndControlFeatureMapCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
+            readThermostatUserInterfaceConfigurationFeatureMapCommandParams);
+    readThermostatUserInterfaceConfigurationInteractionInfo.put(
         "readFeatureMapAttribute",
-        readPumpConfigurationAndControlFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readPumpConfigurationAndControlClusterRevisionCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readPumpConfigurationAndControlClusterRevisionAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readPumpConfigurationAndControlClusterRevisionCommandParams);
-    readPumpConfigurationAndControlInteractionInfo.put(
+        readThermostatUserInterfaceConfigurationFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readThermostatUserInterfaceConfigurationClusterRevisionCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo
+        readThermostatUserInterfaceConfigurationClusterRevisionAttributeInteractionInfo =
+            new InteractionInfo(
+                (cluster, callback, commandArguments) -> {
+                  ((ChipClusters.ThermostatUserInterfaceConfigurationCluster) cluster)
+                      .readClusterRevisionAttribute(
+                          (ChipClusters.IntegerAttributeCallback) callback);
+                },
+                () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+                readThermostatUserInterfaceConfigurationClusterRevisionCommandParams);
+    readThermostatUserInterfaceConfigurationInteractionInfo.put(
         "readClusterRevisionAttribute",
-        readPumpConfigurationAndControlClusterRevisionAttributeInteractionInfo);
+        readThermostatUserInterfaceConfigurationClusterRevisionAttributeInteractionInfo);
     readAttributeMap.put(
-        "pumpConfigurationAndControl", readPumpConfigurationAndControlInteractionInfo);
-    Map<String, InteractionInfo> readRelativeHumidityMeasurementInteractionInfo =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readRelativeHumidityMeasurementMeasuredValueCommandParams =
+        "thermostatUserInterfaceConfiguration",
+        readThermostatUserInterfaceConfigurationInteractionInfo);
+    Map<String, InteractionInfo> readColorControlInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readColorControlCurrentHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readRelativeHumidityMeasurementMeasuredValueAttributeInteractionInfo =
+    InteractionInfo readColorControlCurrentHueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.RelativeHumidityMeasurementCluster) cluster)
-                  .readMeasuredValueAttribute(
-                      (ChipClusters.RelativeHumidityMeasurementCluster
-                              .MeasuredValueAttributeCallback)
-                          callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readCurrentHueAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readRelativeHumidityMeasurementMeasuredValueCommandParams);
-    readRelativeHumidityMeasurementInteractionInfo.put(
-        "readMeasuredValueAttribute",
-        readRelativeHumidityMeasurementMeasuredValueAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readRelativeHumidityMeasurementMinMeasuredValueCommandParams =
+            readColorControlCurrentHueCommandParams);
+    readColorControlInteractionInfo.put(
+        "readCurrentHueAttribute", readColorControlCurrentHueAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlCurrentSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readRelativeHumidityMeasurementMinMeasuredValueAttributeInteractionInfo =
+    InteractionInfo readColorControlCurrentSaturationAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.RelativeHumidityMeasurementCluster) cluster)
-                  .readMinMeasuredValueAttribute(
-                      (ChipClusters.RelativeHumidityMeasurementCluster
-                              .MinMeasuredValueAttributeCallback)
-                          callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readCurrentSaturationAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readRelativeHumidityMeasurementMinMeasuredValueCommandParams);
-    readRelativeHumidityMeasurementInteractionInfo.put(
-        "readMinMeasuredValueAttribute",
-        readRelativeHumidityMeasurementMinMeasuredValueAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readRelativeHumidityMeasurementMaxMeasuredValueCommandParams =
+            readColorControlCurrentSaturationCommandParams);
+    readColorControlInteractionInfo.put(
+        "readCurrentSaturationAttribute",
+        readColorControlCurrentSaturationAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlRemainingTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readRelativeHumidityMeasurementMaxMeasuredValueAttributeInteractionInfo =
+    InteractionInfo readColorControlRemainingTimeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.RelativeHumidityMeasurementCluster) cluster)
-                  .readMaxMeasuredValueAttribute(
-                      (ChipClusters.RelativeHumidityMeasurementCluster
-                              .MaxMeasuredValueAttributeCallback)
-                          callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readRemainingTimeAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readRelativeHumidityMeasurementMaxMeasuredValueCommandParams);
-    readRelativeHumidityMeasurementInteractionInfo.put(
-        "readMaxMeasuredValueAttribute",
-        readRelativeHumidityMeasurementMaxMeasuredValueAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readRelativeHumidityMeasurementToleranceCommandParams =
+            readColorControlRemainingTimeCommandParams);
+    readColorControlInteractionInfo.put(
+        "readRemainingTimeAttribute", readColorControlRemainingTimeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlCurrentXCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readRelativeHumidityMeasurementToleranceAttributeInteractionInfo =
+    InteractionInfo readColorControlCurrentXAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.RelativeHumidityMeasurementCluster) cluster)
-                  .readToleranceAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readCurrentXAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readRelativeHumidityMeasurementToleranceCommandParams);
-    readRelativeHumidityMeasurementInteractionInfo.put(
-        "readToleranceAttribute", readRelativeHumidityMeasurementToleranceAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readRelativeHumidityMeasurementGeneratedCommandListCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readRelativeHumidityMeasurementGeneratedCommandListAttributeInteractionInfo =
+            readColorControlCurrentXCommandParams);
+    readColorControlInteractionInfo.put(
+        "readCurrentXAttribute", readColorControlCurrentXAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlCurrentYCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readColorControlCurrentYAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.RelativeHumidityMeasurementCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.RelativeHumidityMeasurementCluster
-                              .GeneratedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readCurrentYAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedRelativeHumidityMeasurementClusterGeneratedCommandListAttributeCallback(),
-            readRelativeHumidityMeasurementGeneratedCommandListCommandParams);
-    readRelativeHumidityMeasurementInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readRelativeHumidityMeasurementGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readRelativeHumidityMeasurementAcceptedCommandListCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readRelativeHumidityMeasurementAcceptedCommandListAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlCurrentYCommandParams);
+    readColorControlInteractionInfo.put(
+        "readCurrentYAttribute", readColorControlCurrentYAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlDriftCompensationCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readColorControlDriftCompensationAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.RelativeHumidityMeasurementCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.RelativeHumidityMeasurementCluster
-                              .AcceptedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readDriftCompensationAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedRelativeHumidityMeasurementClusterAcceptedCommandListAttributeCallback(),
-            readRelativeHumidityMeasurementAcceptedCommandListCommandParams);
-    readRelativeHumidityMeasurementInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readRelativeHumidityMeasurementAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readRelativeHumidityMeasurementAttributeListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlDriftCompensationCommandParams);
+    readColorControlInteractionInfo.put(
+        "readDriftCompensationAttribute",
+        readColorControlDriftCompensationAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlCompensationTextCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readRelativeHumidityMeasurementAttributeListAttributeInteractionInfo =
+    InteractionInfo readColorControlCompensationTextAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.RelativeHumidityMeasurementCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.RelativeHumidityMeasurementCluster
-                              .AttributeListAttributeCallback)
-                          callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readCompensationTextAttribute(
+                      (ChipClusters.CharStringAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedRelativeHumidityMeasurementClusterAttributeListAttributeCallback(),
-            readRelativeHumidityMeasurementAttributeListCommandParams);
-    readRelativeHumidityMeasurementInteractionInfo.put(
-        "readAttributeListAttribute",
-        readRelativeHumidityMeasurementAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readRelativeHumidityMeasurementFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readColorControlCompensationTextCommandParams);
+    readColorControlInteractionInfo.put(
+        "readCompensationTextAttribute", readColorControlCompensationTextAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlColorTemperatureCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readRelativeHumidityMeasurementFeatureMapAttributeInteractionInfo =
+    InteractionInfo readColorControlColorTemperatureAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.RelativeHumidityMeasurementCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readColorTemperatureAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readRelativeHumidityMeasurementFeatureMapCommandParams);
-    readRelativeHumidityMeasurementInteractionInfo.put(
-        "readFeatureMapAttribute",
-        readRelativeHumidityMeasurementFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readRelativeHumidityMeasurementClusterRevisionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlColorTemperatureCommandParams);
+    readColorControlInteractionInfo.put(
+        "readColorTemperatureAttribute", readColorControlColorTemperatureAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlColorModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readRelativeHumidityMeasurementClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readColorControlColorModeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.RelativeHumidityMeasurementCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readColorModeAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readRelativeHumidityMeasurementClusterRevisionCommandParams);
-    readRelativeHumidityMeasurementInteractionInfo.put(
-        "readClusterRevisionAttribute",
-        readRelativeHumidityMeasurementClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put(
-        "relativeHumidityMeasurement", readRelativeHumidityMeasurementInteractionInfo);
-    Map<String, InteractionInfo> readScenesInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readScenesSceneCountCommandParams =
+            readColorControlColorModeCommandParams);
+    readColorControlInteractionInfo.put(
+        "readColorModeAttribute", readColorControlColorModeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlOptionsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readScenesSceneCountAttributeInteractionInfo =
+    InteractionInfo readColorControlOptionsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ScenesCluster) cluster)
-                  .readSceneCountAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readOptionsAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readScenesSceneCountCommandParams);
-    readScenesInteractionInfo.put(
-        "readSceneCountAttribute", readScenesSceneCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readScenesCurrentSceneCommandParams =
+            readColorControlOptionsCommandParams);
+    readColorControlInteractionInfo.put(
+        "readOptionsAttribute", readColorControlOptionsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlNumberOfPrimariesCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readScenesCurrentSceneAttributeInteractionInfo =
+    InteractionInfo readColorControlNumberOfPrimariesAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ScenesCluster) cluster)
-                  .readCurrentSceneAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readNumberOfPrimariesAttribute(
+                      (ChipClusters.ColorControlCluster.NumberOfPrimariesAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readScenesCurrentSceneCommandParams);
-    readScenesInteractionInfo.put(
-        "readCurrentSceneAttribute", readScenesCurrentSceneAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readScenesCurrentGroupCommandParams =
+            readColorControlNumberOfPrimariesCommandParams);
+    readColorControlInteractionInfo.put(
+        "readNumberOfPrimariesAttribute",
+        readColorControlNumberOfPrimariesAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlPrimary1XCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readScenesCurrentGroupAttributeInteractionInfo =
+    InteractionInfo readColorControlPrimary1XAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ScenesCluster) cluster)
-                  .readCurrentGroupAttribute(
-                      (ChipClusters.ScenesCluster.CurrentGroupAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readPrimary1XAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readScenesCurrentGroupCommandParams);
-    readScenesInteractionInfo.put(
-        "readCurrentGroupAttribute", readScenesCurrentGroupAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readScenesSceneValidCommandParams =
+            readColorControlPrimary1XCommandParams);
+    readColorControlInteractionInfo.put(
+        "readPrimary1XAttribute", readColorControlPrimary1XAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlPrimary1YCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readScenesSceneValidAttributeInteractionInfo =
+    InteractionInfo readColorControlPrimary1YAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ScenesCluster) cluster)
-                  .readSceneValidAttribute((ChipClusters.BooleanAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readPrimary1YAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readScenesSceneValidCommandParams);
-    readScenesInteractionInfo.put(
-        "readSceneValidAttribute", readScenesSceneValidAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readScenesNameSupportCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlPrimary1YCommandParams);
+    readColorControlInteractionInfo.put(
+        "readPrimary1YAttribute", readColorControlPrimary1YAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlPrimary1IntensityCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readScenesNameSupportAttributeInteractionInfo =
+    InteractionInfo readColorControlPrimary1IntensityAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ScenesCluster) cluster)
-                  .readNameSupportAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readPrimary1IntensityAttribute(
+                      (ChipClusters.ColorControlCluster.Primary1IntensityAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readScenesNameSupportCommandParams);
-    readScenesInteractionInfo.put(
-        "readNameSupportAttribute", readScenesNameSupportAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readScenesGeneratedCommandListCommandParams =
+            readColorControlPrimary1IntensityCommandParams);
+    readColorControlInteractionInfo.put(
+        "readPrimary1IntensityAttribute",
+        readColorControlPrimary1IntensityAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlPrimary2XCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readScenesGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readColorControlPrimary2XAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ScenesCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.ScenesCluster.GeneratedCommandListAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readPrimary2XAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedScenesClusterGeneratedCommandListAttributeCallback(),
-            readScenesGeneratedCommandListCommandParams);
-    readScenesInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readScenesGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readScenesAcceptedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlPrimary2XCommandParams);
+    readColorControlInteractionInfo.put(
+        "readPrimary2XAttribute", readColorControlPrimary2XAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlPrimary2YCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readScenesAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readColorControlPrimary2YAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ScenesCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.ScenesCluster.AcceptedCommandListAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readPrimary2YAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping.DelegatedScenesClusterAcceptedCommandListAttributeCallback(),
-            readScenesAcceptedCommandListCommandParams);
-    readScenesInteractionInfo.put(
-        "readAcceptedCommandListAttribute", readScenesAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readScenesAttributeListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlPrimary2YCommandParams);
+    readColorControlInteractionInfo.put(
+        "readPrimary2YAttribute", readColorControlPrimary2YAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlPrimary2IntensityCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readScenesAttributeListAttributeInteractionInfo =
+    InteractionInfo readColorControlPrimary2IntensityAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ScenesCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.ScenesCluster.AttributeListAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readPrimary2IntensityAttribute(
+                      (ChipClusters.ColorControlCluster.Primary2IntensityAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedScenesClusterAttributeListAttributeCallback(),
-            readScenesAttributeListCommandParams);
-    readScenesInteractionInfo.put(
-        "readAttributeListAttribute", readScenesAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readScenesFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlPrimary2IntensityCommandParams);
+    readColorControlInteractionInfo.put(
+        "readPrimary2IntensityAttribute",
+        readColorControlPrimary2IntensityAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlPrimary3XCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readScenesFeatureMapAttributeInteractionInfo =
+    InteractionInfo readColorControlPrimary3XAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ScenesCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readPrimary3XAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readScenesFeatureMapCommandParams);
-    readScenesInteractionInfo.put(
-        "readFeatureMapAttribute", readScenesFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readScenesClusterRevisionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlPrimary3XCommandParams);
+    readColorControlInteractionInfo.put(
+        "readPrimary3XAttribute", readColorControlPrimary3XAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlPrimary3YCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readScenesClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readColorControlPrimary3YAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ScenesCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readPrimary3YAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readScenesClusterRevisionCommandParams);
-    readScenesInteractionInfo.put(
-        "readClusterRevisionAttribute", readScenesClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("scenes", readScenesInteractionInfo);
-    Map<String, InteractionInfo> readSoftwareDiagnosticsInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readSoftwareDiagnosticsThreadMetricsCommandParams =
+            readColorControlPrimary3YCommandParams);
+    readColorControlInteractionInfo.put(
+        "readPrimary3YAttribute", readColorControlPrimary3YAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlPrimary3IntensityCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readSoftwareDiagnosticsThreadMetricsAttributeInteractionInfo =
+    InteractionInfo readColorControlPrimary3IntensityAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
-                  .readThreadMetricsAttribute(
-                      (ChipClusters.SoftwareDiagnosticsCluster.ThreadMetricsAttributeCallback)
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readPrimary3IntensityAttribute(
+                      (ChipClusters.ColorControlCluster.Primary3IntensityAttributeCallback)
                           callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedSoftwareDiagnosticsClusterThreadMetricsAttributeCallback(),
-            readSoftwareDiagnosticsThreadMetricsCommandParams);
-    readSoftwareDiagnosticsInteractionInfo.put(
-        "readThreadMetricsAttribute", readSoftwareDiagnosticsThreadMetricsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readSoftwareDiagnosticsCurrentHeapFreeCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlPrimary3IntensityCommandParams);
+    readColorControlInteractionInfo.put(
+        "readPrimary3IntensityAttribute",
+        readColorControlPrimary3IntensityAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlPrimary4XCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readSoftwareDiagnosticsCurrentHeapFreeAttributeInteractionInfo =
+    InteractionInfo readColorControlPrimary4XAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
-                  .readCurrentHeapFreeAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readPrimary4XAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readSoftwareDiagnosticsCurrentHeapFreeCommandParams);
-    readSoftwareDiagnosticsInteractionInfo.put(
-        "readCurrentHeapFreeAttribute",
-        readSoftwareDiagnosticsCurrentHeapFreeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readSoftwareDiagnosticsCurrentHeapUsedCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlPrimary4XCommandParams);
+    readColorControlInteractionInfo.put(
+        "readPrimary4XAttribute", readColorControlPrimary4XAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlPrimary4YCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readSoftwareDiagnosticsCurrentHeapUsedAttributeInteractionInfo =
+    InteractionInfo readColorControlPrimary4YAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
-                  .readCurrentHeapUsedAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readPrimary4YAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readSoftwareDiagnosticsCurrentHeapUsedCommandParams);
-    readSoftwareDiagnosticsInteractionInfo.put(
-        "readCurrentHeapUsedAttribute",
-        readSoftwareDiagnosticsCurrentHeapUsedAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readSoftwareDiagnosticsCurrentHeapHighWatermarkCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlPrimary4YCommandParams);
+    readColorControlInteractionInfo.put(
+        "readPrimary4YAttribute", readColorControlPrimary4YAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlPrimary4IntensityCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readSoftwareDiagnosticsCurrentHeapHighWatermarkAttributeInteractionInfo =
+    InteractionInfo readColorControlPrimary4IntensityAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
-                  .readCurrentHeapHighWatermarkAttribute(
-                      (ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readPrimary4IntensityAttribute(
+                      (ChipClusters.ColorControlCluster.Primary4IntensityAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readSoftwareDiagnosticsCurrentHeapHighWatermarkCommandParams);
-    readSoftwareDiagnosticsInteractionInfo.put(
-        "readCurrentHeapHighWatermarkAttribute",
-        readSoftwareDiagnosticsCurrentHeapHighWatermarkAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readSoftwareDiagnosticsGeneratedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlPrimary4IntensityCommandParams);
+    readColorControlInteractionInfo.put(
+        "readPrimary4IntensityAttribute",
+        readColorControlPrimary4IntensityAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlPrimary5XCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readSoftwareDiagnosticsGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readColorControlPrimary5XAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.SoftwareDiagnosticsCluster
-                              .GeneratedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readPrimary5XAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedSoftwareDiagnosticsClusterGeneratedCommandListAttributeCallback(),
-            readSoftwareDiagnosticsGeneratedCommandListCommandParams);
-    readSoftwareDiagnosticsInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readSoftwareDiagnosticsGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readSoftwareDiagnosticsAcceptedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlPrimary5XCommandParams);
+    readColorControlInteractionInfo.put(
+        "readPrimary5XAttribute", readColorControlPrimary5XAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlPrimary5YCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readSoftwareDiagnosticsAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readColorControlPrimary5YAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.SoftwareDiagnosticsCluster.AcceptedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readPrimary5YAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedSoftwareDiagnosticsClusterAcceptedCommandListAttributeCallback(),
-            readSoftwareDiagnosticsAcceptedCommandListCommandParams);
-    readSoftwareDiagnosticsInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readSoftwareDiagnosticsAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readSoftwareDiagnosticsAttributeListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlPrimary5YCommandParams);
+    readColorControlInteractionInfo.put(
+        "readPrimary5YAttribute", readColorControlPrimary5YAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlPrimary5IntensityCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readSoftwareDiagnosticsAttributeListAttributeInteractionInfo =
+    InteractionInfo readColorControlPrimary5IntensityAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.SoftwareDiagnosticsCluster.AttributeListAttributeCallback)
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readPrimary5IntensityAttribute(
+                      (ChipClusters.ColorControlCluster.Primary5IntensityAttributeCallback)
                           callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedSoftwareDiagnosticsClusterAttributeListAttributeCallback(),
-            readSoftwareDiagnosticsAttributeListCommandParams);
-    readSoftwareDiagnosticsInteractionInfo.put(
-        "readAttributeListAttribute", readSoftwareDiagnosticsAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readSoftwareDiagnosticsFeatureMapCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readSoftwareDiagnosticsFeatureMapAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlPrimary5IntensityCommandParams);
+    readColorControlInteractionInfo.put(
+        "readPrimary5IntensityAttribute",
+        readColorControlPrimary5IntensityAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlPrimary6XCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readColorControlPrimary6XAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readPrimary6XAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readSoftwareDiagnosticsFeatureMapCommandParams);
-    readSoftwareDiagnosticsInteractionInfo.put(
-        "readFeatureMapAttribute", readSoftwareDiagnosticsFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readSoftwareDiagnosticsClusterRevisionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlPrimary6XCommandParams);
+    readColorControlInteractionInfo.put(
+        "readPrimary6XAttribute", readColorControlPrimary6XAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlPrimary6YCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readSoftwareDiagnosticsClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readColorControlPrimary6YAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readPrimary6YAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readSoftwareDiagnosticsClusterRevisionCommandParams);
-    readSoftwareDiagnosticsInteractionInfo.put(
-        "readClusterRevisionAttribute",
-        readSoftwareDiagnosticsClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("softwareDiagnostics", readSoftwareDiagnosticsInteractionInfo);
-    Map<String, InteractionInfo> readSwitchInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readSwitchNumberOfPositionsCommandParams =
+            readColorControlPrimary6YCommandParams);
+    readColorControlInteractionInfo.put(
+        "readPrimary6YAttribute", readColorControlPrimary6YAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlPrimary6IntensityCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readSwitchNumberOfPositionsAttributeInteractionInfo =
+    InteractionInfo readColorControlPrimary6IntensityAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.SwitchCluster) cluster)
-                  .readNumberOfPositionsAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readPrimary6IntensityAttribute(
+                      (ChipClusters.ColorControlCluster.Primary6IntensityAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readSwitchNumberOfPositionsCommandParams);
-    readSwitchInteractionInfo.put(
-        "readNumberOfPositionsAttribute", readSwitchNumberOfPositionsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readSwitchCurrentPositionCommandParams =
+            readColorControlPrimary6IntensityCommandParams);
+    readColorControlInteractionInfo.put(
+        "readPrimary6IntensityAttribute",
+        readColorControlPrimary6IntensityAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlWhitePointXCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readSwitchCurrentPositionAttributeInteractionInfo =
+    InteractionInfo readColorControlWhitePointXAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.SwitchCluster) cluster)
-                  .readCurrentPositionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readWhitePointXAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readSwitchCurrentPositionCommandParams);
-    readSwitchInteractionInfo.put(
-        "readCurrentPositionAttribute", readSwitchCurrentPositionAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readSwitchMultiPressMaxCommandParams =
+            readColorControlWhitePointXCommandParams);
+    readColorControlInteractionInfo.put(
+        "readWhitePointXAttribute", readColorControlWhitePointXAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlWhitePointYCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readSwitchMultiPressMaxAttributeInteractionInfo =
+    InteractionInfo readColorControlWhitePointYAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.SwitchCluster) cluster)
-                  .readMultiPressMaxAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readWhitePointYAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readSwitchMultiPressMaxCommandParams);
-    readSwitchInteractionInfo.put(
-        "readMultiPressMaxAttribute", readSwitchMultiPressMaxAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readSwitchGeneratedCommandListCommandParams =
+            readColorControlWhitePointYCommandParams);
+    readColorControlInteractionInfo.put(
+        "readWhitePointYAttribute", readColorControlWhitePointYAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlColorPointRXCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readSwitchGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readColorControlColorPointRXAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.SwitchCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.SwitchCluster.GeneratedCommandListAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readColorPointRXAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedSwitchClusterGeneratedCommandListAttributeCallback(),
-            readSwitchGeneratedCommandListCommandParams);
-    readSwitchInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readSwitchGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readSwitchAcceptedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlColorPointRXCommandParams);
+    readColorControlInteractionInfo.put(
+        "readColorPointRXAttribute", readColorControlColorPointRXAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlColorPointRYCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readSwitchAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readColorControlColorPointRYAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.SwitchCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.SwitchCluster.AcceptedCommandListAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readColorPointRYAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping.DelegatedSwitchClusterAcceptedCommandListAttributeCallback(),
-            readSwitchAcceptedCommandListCommandParams);
-    readSwitchInteractionInfo.put(
-        "readAcceptedCommandListAttribute", readSwitchAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readSwitchAttributeListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlColorPointRYCommandParams);
+    readColorControlInteractionInfo.put(
+        "readColorPointRYAttribute", readColorControlColorPointRYAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlColorPointRIntensityCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readSwitchAttributeListAttributeInteractionInfo =
+    InteractionInfo readColorControlColorPointRIntensityAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.SwitchCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.SwitchCluster.AttributeListAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readColorPointRIntensityAttribute(
+                      (ChipClusters.ColorControlCluster.ColorPointRIntensityAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedSwitchClusterAttributeListAttributeCallback(),
-            readSwitchAttributeListCommandParams);
-    readSwitchInteractionInfo.put(
-        "readAttributeListAttribute", readSwitchAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readSwitchFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlColorPointRIntensityCommandParams);
+    readColorControlInteractionInfo.put(
+        "readColorPointRIntensityAttribute",
+        readColorControlColorPointRIntensityAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlColorPointGXCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readSwitchFeatureMapAttributeInteractionInfo =
+    InteractionInfo readColorControlColorPointGXAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.SwitchCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readColorPointGXAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readSwitchFeatureMapCommandParams);
-    readSwitchInteractionInfo.put(
-        "readFeatureMapAttribute", readSwitchFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readSwitchClusterRevisionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlColorPointGXCommandParams);
+    readColorControlInteractionInfo.put(
+        "readColorPointGXAttribute", readColorControlColorPointGXAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlColorPointGYCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readSwitchClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readColorControlColorPointGYAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.SwitchCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readColorPointGYAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readSwitchClusterRevisionCommandParams);
-    readSwitchInteractionInfo.put(
-        "readClusterRevisionAttribute", readSwitchClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("switch", readSwitchInteractionInfo);
-    Map<String, InteractionInfo> readTargetNavigatorInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readTargetNavigatorTargetListCommandParams =
+            readColorControlColorPointGYCommandParams);
+    readColorControlInteractionInfo.put(
+        "readColorPointGYAttribute", readColorControlColorPointGYAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlColorPointGIntensityCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTargetNavigatorTargetListAttributeInteractionInfo =
+    InteractionInfo readColorControlColorPointGIntensityAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TargetNavigatorCluster) cluster)
-                  .readTargetListAttribute(
-                      (ChipClusters.TargetNavigatorCluster.TargetListAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readColorPointGIntensityAttribute(
+                      (ChipClusters.ColorControlCluster.ColorPointGIntensityAttributeCallback)
+                          callback);
             },
-            () ->
-                new ClusterInfoMapping.DelegatedTargetNavigatorClusterTargetListAttributeCallback(),
-            readTargetNavigatorTargetListCommandParams);
-    readTargetNavigatorInteractionInfo.put(
-        "readTargetListAttribute", readTargetNavigatorTargetListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTargetNavigatorCurrentTargetCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlColorPointGIntensityCommandParams);
+    readColorControlInteractionInfo.put(
+        "readColorPointGIntensityAttribute",
+        readColorControlColorPointGIntensityAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlColorPointBXCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTargetNavigatorCurrentTargetAttributeInteractionInfo =
+    InteractionInfo readColorControlColorPointBXAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TargetNavigatorCluster) cluster)
-                  .readCurrentTargetAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readColorPointBXAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTargetNavigatorCurrentTargetCommandParams);
-    readTargetNavigatorInteractionInfo.put(
-        "readCurrentTargetAttribute", readTargetNavigatorCurrentTargetAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTargetNavigatorGeneratedCommandListCommandParams =
+            readColorControlColorPointBXCommandParams);
+    readColorControlInteractionInfo.put(
+        "readColorPointBXAttribute", readColorControlColorPointBXAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlColorPointBYCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTargetNavigatorGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readColorControlColorPointBYAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TargetNavigatorCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.TargetNavigatorCluster.GeneratedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readColorPointBYAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedTargetNavigatorClusterGeneratedCommandListAttributeCallback(),
-            readTargetNavigatorGeneratedCommandListCommandParams);
-    readTargetNavigatorInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readTargetNavigatorGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTargetNavigatorAcceptedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlColorPointBYCommandParams);
+    readColorControlInteractionInfo.put(
+        "readColorPointBYAttribute", readColorControlColorPointBYAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlColorPointBIntensityCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTargetNavigatorAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readColorControlColorPointBIntensityAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TargetNavigatorCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.TargetNavigatorCluster.AcceptedCommandListAttributeCallback)
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readColorPointBIntensityAttribute(
+                      (ChipClusters.ColorControlCluster.ColorPointBIntensityAttributeCallback)
                           callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedTargetNavigatorClusterAcceptedCommandListAttributeCallback(),
-            readTargetNavigatorAcceptedCommandListCommandParams);
-    readTargetNavigatorInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readTargetNavigatorAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTargetNavigatorAttributeListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlColorPointBIntensityCommandParams);
+    readColorControlInteractionInfo.put(
+        "readColorPointBIntensityAttribute",
+        readColorControlColorPointBIntensityAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlEnhancedCurrentHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTargetNavigatorAttributeListAttributeInteractionInfo =
+    InteractionInfo readColorControlEnhancedCurrentHueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TargetNavigatorCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.TargetNavigatorCluster.AttributeListAttributeCallback)
-                          callback);
-            },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedTargetNavigatorClusterAttributeListAttributeCallback(),
-            readTargetNavigatorAttributeListCommandParams);
-    readTargetNavigatorInteractionInfo.put(
-        "readAttributeListAttribute", readTargetNavigatorAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTargetNavigatorFeatureMapCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTargetNavigatorFeatureMapAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TargetNavigatorCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readEnhancedCurrentHueAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTargetNavigatorFeatureMapCommandParams);
-    readTargetNavigatorInteractionInfo.put(
-        "readFeatureMapAttribute", readTargetNavigatorFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTargetNavigatorClusterRevisionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlEnhancedCurrentHueCommandParams);
+    readColorControlInteractionInfo.put(
+        "readEnhancedCurrentHueAttribute",
+        readColorControlEnhancedCurrentHueAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlEnhancedColorModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTargetNavigatorClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readColorControlEnhancedColorModeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TargetNavigatorCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readEnhancedColorModeAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTargetNavigatorClusterRevisionCommandParams);
-    readTargetNavigatorInteractionInfo.put(
-        "readClusterRevisionAttribute", readTargetNavigatorClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("targetNavigator", readTargetNavigatorInteractionInfo);
-    Map<String, InteractionInfo> readTemperatureMeasurementInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readTemperatureMeasurementMeasuredValueCommandParams =
+            readColorControlEnhancedColorModeCommandParams);
+    readColorControlInteractionInfo.put(
+        "readEnhancedColorModeAttribute",
+        readColorControlEnhancedColorModeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlColorLoopActiveCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTemperatureMeasurementMeasuredValueAttributeInteractionInfo =
+    InteractionInfo readColorControlColorLoopActiveAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TemperatureMeasurementCluster) cluster)
-                  .readMeasuredValueAttribute(
-                      (ChipClusters.TemperatureMeasurementCluster.MeasuredValueAttributeCallback)
-                          callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readColorLoopActiveAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTemperatureMeasurementMeasuredValueCommandParams);
-    readTemperatureMeasurementInteractionInfo.put(
-        "readMeasuredValueAttribute",
-        readTemperatureMeasurementMeasuredValueAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTemperatureMeasurementMinMeasuredValueCommandParams =
+            readColorControlColorLoopActiveCommandParams);
+    readColorControlInteractionInfo.put(
+        "readColorLoopActiveAttribute", readColorControlColorLoopActiveAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlColorLoopDirectionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTemperatureMeasurementMinMeasuredValueAttributeInteractionInfo =
+    InteractionInfo readColorControlColorLoopDirectionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TemperatureMeasurementCluster) cluster)
-                  .readMinMeasuredValueAttribute(
-                      (ChipClusters.TemperatureMeasurementCluster.MinMeasuredValueAttributeCallback)
-                          callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readColorLoopDirectionAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTemperatureMeasurementMinMeasuredValueCommandParams);
-    readTemperatureMeasurementInteractionInfo.put(
-        "readMinMeasuredValueAttribute",
-        readTemperatureMeasurementMinMeasuredValueAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTemperatureMeasurementMaxMeasuredValueCommandParams =
+            readColorControlColorLoopDirectionCommandParams);
+    readColorControlInteractionInfo.put(
+        "readColorLoopDirectionAttribute",
+        readColorControlColorLoopDirectionAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlColorLoopTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTemperatureMeasurementMaxMeasuredValueAttributeInteractionInfo =
+    InteractionInfo readColorControlColorLoopTimeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TemperatureMeasurementCluster) cluster)
-                  .readMaxMeasuredValueAttribute(
-                      (ChipClusters.TemperatureMeasurementCluster.MaxMeasuredValueAttributeCallback)
-                          callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readColorLoopTimeAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTemperatureMeasurementMaxMeasuredValueCommandParams);
-    readTemperatureMeasurementInteractionInfo.put(
-        "readMaxMeasuredValueAttribute",
-        readTemperatureMeasurementMaxMeasuredValueAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTemperatureMeasurementToleranceCommandParams =
+            readColorControlColorLoopTimeCommandParams);
+    readColorControlInteractionInfo.put(
+        "readColorLoopTimeAttribute", readColorControlColorLoopTimeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlColorLoopStartEnhancedHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTemperatureMeasurementToleranceAttributeInteractionInfo =
+    InteractionInfo readColorControlColorLoopStartEnhancedHueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TemperatureMeasurementCluster) cluster)
-                  .readToleranceAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readColorLoopStartEnhancedHueAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTemperatureMeasurementToleranceCommandParams);
-    readTemperatureMeasurementInteractionInfo.put(
-        "readToleranceAttribute", readTemperatureMeasurementToleranceAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTemperatureMeasurementAttributeListCommandParams =
+            readColorControlColorLoopStartEnhancedHueCommandParams);
+    readColorControlInteractionInfo.put(
+        "readColorLoopStartEnhancedHueAttribute",
+        readColorControlColorLoopStartEnhancedHueAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlColorLoopStoredEnhancedHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTemperatureMeasurementAttributeListAttributeInteractionInfo =
+    InteractionInfo readColorControlColorLoopStoredEnhancedHueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TemperatureMeasurementCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.TemperatureMeasurementCluster.AttributeListAttributeCallback)
-                          callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readColorLoopStoredEnhancedHueAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedTemperatureMeasurementClusterAttributeListAttributeCallback(),
-            readTemperatureMeasurementAttributeListCommandParams);
-    readTemperatureMeasurementInteractionInfo.put(
-        "readAttributeListAttribute",
-        readTemperatureMeasurementAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTemperatureMeasurementFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlColorLoopStoredEnhancedHueCommandParams);
+    readColorControlInteractionInfo.put(
+        "readColorLoopStoredEnhancedHueAttribute",
+        readColorControlColorLoopStoredEnhancedHueAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlColorCapabilitiesCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTemperatureMeasurementFeatureMapAttributeInteractionInfo =
+    InteractionInfo readColorControlColorCapabilitiesAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TemperatureMeasurementCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readColorCapabilitiesAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTemperatureMeasurementFeatureMapCommandParams);
-    readTemperatureMeasurementInteractionInfo.put(
-        "readFeatureMapAttribute", readTemperatureMeasurementFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTemperatureMeasurementClusterRevisionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlColorCapabilitiesCommandParams);
+    readColorControlInteractionInfo.put(
+        "readColorCapabilitiesAttribute",
+        readColorControlColorCapabilitiesAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlColorTempPhysicalMinMiredsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTemperatureMeasurementClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readColorControlColorTempPhysicalMinMiredsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TemperatureMeasurementCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readColorTempPhysicalMinMiredsAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTemperatureMeasurementClusterRevisionCommandParams);
-    readTemperatureMeasurementInteractionInfo.put(
-        "readClusterRevisionAttribute",
-        readTemperatureMeasurementClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("temperatureMeasurement", readTemperatureMeasurementInteractionInfo);
-    Map<String, InteractionInfo> readTestClusterInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readTestClusterBooleanCommandParams =
+            readColorControlColorTempPhysicalMinMiredsCommandParams);
+    readColorControlInteractionInfo.put(
+        "readColorTempPhysicalMinMiredsAttribute",
+        readColorControlColorTempPhysicalMinMiredsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlColorTempPhysicalMaxMiredsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterBooleanAttributeInteractionInfo =
+    InteractionInfo readColorControlColorTempPhysicalMaxMiredsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readBooleanAttribute((ChipClusters.BooleanAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readColorTempPhysicalMaxMiredsAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readTestClusterBooleanCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readBooleanAttribute", readTestClusterBooleanAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterBitmap8CommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlColorTempPhysicalMaxMiredsCommandParams);
+    readColorControlInteractionInfo.put(
+        "readColorTempPhysicalMaxMiredsAttribute",
+        readColorControlColorTempPhysicalMaxMiredsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlCoupleColorTempToLevelMinMiredsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterBitmap8AttributeInteractionInfo =
+    InteractionInfo readColorControlCoupleColorTempToLevelMinMiredsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readBitmap8Attribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readCoupleColorTempToLevelMinMiredsAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterBitmap8CommandParams);
-    readTestClusterInteractionInfo.put(
-        "readBitmap8Attribute", readTestClusterBitmap8AttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterBitmap16CommandParams =
+            readColorControlCoupleColorTempToLevelMinMiredsCommandParams);
+    readColorControlInteractionInfo.put(
+        "readCoupleColorTempToLevelMinMiredsAttribute",
+        readColorControlCoupleColorTempToLevelMinMiredsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlStartUpColorTemperatureMiredsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterBitmap16AttributeInteractionInfo =
+    InteractionInfo readColorControlStartUpColorTemperatureMiredsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readBitmap16Attribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readStartUpColorTemperatureMiredsAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterBitmap16CommandParams);
-    readTestClusterInteractionInfo.put(
-        "readBitmap16Attribute", readTestClusterBitmap16AttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterBitmap32CommandParams =
+            readColorControlStartUpColorTemperatureMiredsCommandParams);
+    readColorControlInteractionInfo.put(
+        "readStartUpColorTemperatureMiredsAttribute",
+        readColorControlStartUpColorTemperatureMiredsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterBitmap32AttributeInteractionInfo =
+    InteractionInfo readColorControlGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readBitmap32Attribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.ColorControlCluster.GeneratedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterBitmap32CommandParams);
-    readTestClusterInteractionInfo.put(
-        "readBitmap32Attribute", readTestClusterBitmap32AttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterBitmap64CommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedColorControlClusterGeneratedCommandListAttributeCallback(),
+            readColorControlGeneratedCommandListCommandParams);
+    readColorControlInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readColorControlGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterBitmap64AttributeInteractionInfo =
+    InteractionInfo readColorControlAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readBitmap64Attribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.ColorControlCluster.AcceptedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterBitmap64CommandParams);
-    readTestClusterInteractionInfo.put(
-        "readBitmap64Attribute", readTestClusterBitmap64AttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterInt8uCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedColorControlClusterAcceptedCommandListAttributeCallback(),
+            readColorControlAcceptedCommandListCommandParams);
+    readColorControlInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readColorControlAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterInt8uAttributeInteractionInfo =
+    InteractionInfo readColorControlAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readInt8uAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.ColorControlCluster.AttributeListAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterInt8uCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readInt8uAttribute", readTestClusterInt8uAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterInt16uCommandParams =
+            () ->
+                new ClusterInfoMapping.DelegatedColorControlClusterAttributeListAttributeCallback(),
+            readColorControlAttributeListCommandParams);
+    readColorControlInteractionInfo.put(
+        "readAttributeListAttribute", readColorControlAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterInt16uAttributeInteractionInfo =
+    InteractionInfo readColorControlFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readInt16uAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterInt16uCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readInt16uAttribute", readTestClusterInt16uAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterInt24uCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readColorControlFeatureMapCommandParams);
+    readColorControlInteractionInfo.put(
+        "readFeatureMapAttribute", readColorControlFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readColorControlClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterInt24uAttributeInteractionInfo =
+    InteractionInfo readColorControlClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readInt24uAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterInt24uCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readInt24uAttribute", readTestClusterInt24uAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterInt32uCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readColorControlClusterRevisionCommandParams);
+    readColorControlInteractionInfo.put(
+        "readClusterRevisionAttribute", readColorControlClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("colorControl", readColorControlInteractionInfo);
+    Map<String, InteractionInfo> readIlluminanceMeasurementInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readIlluminanceMeasurementMeasuredValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterInt32uAttributeInteractionInfo =
+    InteractionInfo readIlluminanceMeasurementMeasuredValueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readInt32uAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.IlluminanceMeasurementCluster) cluster)
+                  .readMeasuredValueAttribute(
+                      (ChipClusters.IlluminanceMeasurementCluster.MeasuredValueAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterInt32uCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readInt32uAttribute", readTestClusterInt32uAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterInt40uCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readIlluminanceMeasurementMeasuredValueCommandParams);
+    readIlluminanceMeasurementInteractionInfo.put(
+        "readMeasuredValueAttribute",
+        readIlluminanceMeasurementMeasuredValueAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readIlluminanceMeasurementMinMeasuredValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterInt40uAttributeInteractionInfo =
+    InteractionInfo readIlluminanceMeasurementMinMeasuredValueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readInt40uAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.IlluminanceMeasurementCluster) cluster)
+                  .readMinMeasuredValueAttribute(
+                      (ChipClusters.IlluminanceMeasurementCluster.MinMeasuredValueAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterInt40uCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readInt40uAttribute", readTestClusterInt40uAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterInt48uCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readIlluminanceMeasurementMinMeasuredValueCommandParams);
+    readIlluminanceMeasurementInteractionInfo.put(
+        "readMinMeasuredValueAttribute",
+        readIlluminanceMeasurementMinMeasuredValueAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readIlluminanceMeasurementMaxMeasuredValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterInt48uAttributeInteractionInfo =
+    InteractionInfo readIlluminanceMeasurementMaxMeasuredValueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readInt48uAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.IlluminanceMeasurementCluster) cluster)
+                  .readMaxMeasuredValueAttribute(
+                      (ChipClusters.IlluminanceMeasurementCluster.MaxMeasuredValueAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterInt48uCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readInt48uAttribute", readTestClusterInt48uAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterInt56uCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readIlluminanceMeasurementMaxMeasuredValueCommandParams);
+    readIlluminanceMeasurementInteractionInfo.put(
+        "readMaxMeasuredValueAttribute",
+        readIlluminanceMeasurementMaxMeasuredValueAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readIlluminanceMeasurementToleranceCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterInt56uAttributeInteractionInfo =
+    InteractionInfo readIlluminanceMeasurementToleranceAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readInt56uAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.IlluminanceMeasurementCluster) cluster)
+                  .readToleranceAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterInt56uCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readInt56uAttribute", readTestClusterInt56uAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterInt64uCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readIlluminanceMeasurementToleranceCommandParams);
+    readIlluminanceMeasurementInteractionInfo.put(
+        "readToleranceAttribute", readIlluminanceMeasurementToleranceAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readIlluminanceMeasurementLightSensorTypeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterInt64uAttributeInteractionInfo =
+    InteractionInfo readIlluminanceMeasurementLightSensorTypeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readInt64uAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.IlluminanceMeasurementCluster) cluster)
+                  .readLightSensorTypeAttribute(
+                      (ChipClusters.IlluminanceMeasurementCluster.LightSensorTypeAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterInt64uCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readInt64uAttribute", readTestClusterInt64uAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterInt8sCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readIlluminanceMeasurementLightSensorTypeCommandParams);
+    readIlluminanceMeasurementInteractionInfo.put(
+        "readLightSensorTypeAttribute",
+        readIlluminanceMeasurementLightSensorTypeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readIlluminanceMeasurementGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterInt8sAttributeInteractionInfo =
+    InteractionInfo readIlluminanceMeasurementGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readInt8sAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.IlluminanceMeasurementCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.IlluminanceMeasurementCluster
+                              .GeneratedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterInt8sCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readInt8sAttribute", readTestClusterInt8sAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterInt16sCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedIlluminanceMeasurementClusterGeneratedCommandListAttributeCallback(),
+            readIlluminanceMeasurementGeneratedCommandListCommandParams);
+    readIlluminanceMeasurementInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readIlluminanceMeasurementGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readIlluminanceMeasurementAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterInt16sAttributeInteractionInfo =
+    InteractionInfo readIlluminanceMeasurementAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readInt16sAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.IlluminanceMeasurementCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.IlluminanceMeasurementCluster
+                              .AcceptedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterInt16sCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readInt16sAttribute", readTestClusterInt16sAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterInt24sCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedIlluminanceMeasurementClusterAcceptedCommandListAttributeCallback(),
+            readIlluminanceMeasurementAcceptedCommandListCommandParams);
+    readIlluminanceMeasurementInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readIlluminanceMeasurementAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readIlluminanceMeasurementAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterInt24sAttributeInteractionInfo =
+    InteractionInfo readIlluminanceMeasurementAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readInt24sAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.IlluminanceMeasurementCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.IlluminanceMeasurementCluster.AttributeListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterInt24sCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readInt24sAttribute", readTestClusterInt24sAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterInt32sCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedIlluminanceMeasurementClusterAttributeListAttributeCallback(),
+            readIlluminanceMeasurementAttributeListCommandParams);
+    readIlluminanceMeasurementInteractionInfo.put(
+        "readAttributeListAttribute",
+        readIlluminanceMeasurementAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readIlluminanceMeasurementFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterInt32sAttributeInteractionInfo =
+    InteractionInfo readIlluminanceMeasurementFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readInt32sAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.IlluminanceMeasurementCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterInt32sCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readInt32sAttribute", readTestClusterInt32sAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterInt40sCommandParams =
+            readIlluminanceMeasurementFeatureMapCommandParams);
+    readIlluminanceMeasurementInteractionInfo.put(
+        "readFeatureMapAttribute", readIlluminanceMeasurementFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readIlluminanceMeasurementClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterInt40sAttributeInteractionInfo =
+    InteractionInfo readIlluminanceMeasurementClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readInt40sAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.IlluminanceMeasurementCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterInt40sCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readInt40sAttribute", readTestClusterInt40sAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterInt48sCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readIlluminanceMeasurementClusterRevisionCommandParams);
+    readIlluminanceMeasurementInteractionInfo.put(
+        "readClusterRevisionAttribute",
+        readIlluminanceMeasurementClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("illuminanceMeasurement", readIlluminanceMeasurementInteractionInfo);
+    Map<String, InteractionInfo> readTemperatureMeasurementInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readTemperatureMeasurementMeasuredValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterInt48sAttributeInteractionInfo =
+    InteractionInfo readTemperatureMeasurementMeasuredValueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readInt48sAttribute((ChipClusters.LongAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterInt48sCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readInt48sAttribute", readTestClusterInt48sAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterInt56sCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterInt56sAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readInt56sAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.TemperatureMeasurementCluster) cluster)
+                  .readMeasuredValueAttribute(
+                      (ChipClusters.TemperatureMeasurementCluster.MeasuredValueAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterInt56sCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readInt56sAttribute", readTestClusterInt56sAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterInt64sCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readTemperatureMeasurementMeasuredValueCommandParams);
+    readTemperatureMeasurementInteractionInfo.put(
+        "readMeasuredValueAttribute",
+        readTemperatureMeasurementMeasuredValueAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTemperatureMeasurementMinMeasuredValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterInt64sAttributeInteractionInfo =
+    InteractionInfo readTemperatureMeasurementMinMeasuredValueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readInt64sAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.TemperatureMeasurementCluster) cluster)
+                  .readMinMeasuredValueAttribute(
+                      (ChipClusters.TemperatureMeasurementCluster.MinMeasuredValueAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterInt64sCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readInt64sAttribute", readTestClusterInt64sAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterEnum8CommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readTemperatureMeasurementMinMeasuredValueCommandParams);
+    readTemperatureMeasurementInteractionInfo.put(
+        "readMinMeasuredValueAttribute",
+        readTemperatureMeasurementMinMeasuredValueAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTemperatureMeasurementMaxMeasuredValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterEnum8AttributeInteractionInfo =
+    InteractionInfo readTemperatureMeasurementMaxMeasuredValueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readEnum8Attribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TemperatureMeasurementCluster) cluster)
+                  .readMaxMeasuredValueAttribute(
+                      (ChipClusters.TemperatureMeasurementCluster.MaxMeasuredValueAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterEnum8CommandParams);
-    readTestClusterInteractionInfo.put(
-        "readEnum8Attribute", readTestClusterEnum8AttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterEnum16CommandParams =
+            readTemperatureMeasurementMaxMeasuredValueCommandParams);
+    readTemperatureMeasurementInteractionInfo.put(
+        "readMaxMeasuredValueAttribute",
+        readTemperatureMeasurementMaxMeasuredValueAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTemperatureMeasurementToleranceCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterEnum16AttributeInteractionInfo =
+    InteractionInfo readTemperatureMeasurementToleranceAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readEnum16Attribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TemperatureMeasurementCluster) cluster)
+                  .readToleranceAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterEnum16CommandParams);
-    readTestClusterInteractionInfo.put(
-        "readEnum16Attribute", readTestClusterEnum16AttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterFloatSingleCommandParams =
+            readTemperatureMeasurementToleranceCommandParams);
+    readTemperatureMeasurementInteractionInfo.put(
+        "readToleranceAttribute", readTemperatureMeasurementToleranceAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTemperatureMeasurementAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterFloatSingleAttributeInteractionInfo =
+    InteractionInfo readTemperatureMeasurementAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readFloatSingleAttribute((ChipClusters.FloatAttributeCallback) callback);
+              ((ChipClusters.TemperatureMeasurementCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.TemperatureMeasurementCluster.AttributeListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedFloatAttributeCallback(),
-            readTestClusterFloatSingleCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readFloatSingleAttribute", readTestClusterFloatSingleAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterFloatDoubleCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedTemperatureMeasurementClusterAttributeListAttributeCallback(),
+            readTemperatureMeasurementAttributeListCommandParams);
+    readTemperatureMeasurementInteractionInfo.put(
+        "readAttributeListAttribute",
+        readTemperatureMeasurementAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTemperatureMeasurementFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterFloatDoubleAttributeInteractionInfo =
+    InteractionInfo readTemperatureMeasurementFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readFloatDoubleAttribute((ChipClusters.DoubleAttributeCallback) callback);
+              ((ChipClusters.TemperatureMeasurementCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedDoubleAttributeCallback(),
-            readTestClusterFloatDoubleCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readFloatDoubleAttribute", readTestClusterFloatDoubleAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterOctetStringCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readTemperatureMeasurementFeatureMapCommandParams);
+    readTemperatureMeasurementInteractionInfo.put(
+        "readFeatureMapAttribute", readTemperatureMeasurementFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTemperatureMeasurementClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterOctetStringAttributeInteractionInfo =
+    InteractionInfo readTemperatureMeasurementClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readOctetStringAttribute((ChipClusters.OctetStringAttributeCallback) callback);
+              ((ChipClusters.TemperatureMeasurementCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedOctetStringAttributeCallback(),
-            readTestClusterOctetStringCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readOctetStringAttribute", readTestClusterOctetStringAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterListInt8uCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readTemperatureMeasurementClusterRevisionCommandParams);
+    readTemperatureMeasurementInteractionInfo.put(
+        "readClusterRevisionAttribute",
+        readTemperatureMeasurementClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("temperatureMeasurement", readTemperatureMeasurementInteractionInfo);
+    Map<String, InteractionInfo> readPressureMeasurementInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readPressureMeasurementMeasuredValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterListInt8uAttributeInteractionInfo =
+    InteractionInfo readPressureMeasurementMeasuredValueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readListInt8uAttribute(
-                      (ChipClusters.TestClusterCluster.ListInt8uAttributeCallback) callback);
+              ((ChipClusters.PressureMeasurementCluster) cluster)
+                  .readMeasuredValueAttribute(
+                      (ChipClusters.PressureMeasurementCluster.MeasuredValueAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedTestClusterClusterListInt8uAttributeCallback(),
-            readTestClusterListInt8uCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readListInt8uAttribute", readTestClusterListInt8uAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterListOctetStringCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readPressureMeasurementMeasuredValueCommandParams);
+    readPressureMeasurementInteractionInfo.put(
+        "readMeasuredValueAttribute", readPressureMeasurementMeasuredValueAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPressureMeasurementMinMeasuredValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterListOctetStringAttributeInteractionInfo =
+    InteractionInfo readPressureMeasurementMinMeasuredValueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readListOctetStringAttribute(
-                      (ChipClusters.TestClusterCluster.ListOctetStringAttributeCallback) callback);
+              ((ChipClusters.PressureMeasurementCluster) cluster)
+                  .readMinMeasuredValueAttribute(
+                      (ChipClusters.PressureMeasurementCluster.MinMeasuredValueAttributeCallback)
+                          callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedTestClusterClusterListOctetStringAttributeCallback(),
-            readTestClusterListOctetStringCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readListOctetStringAttribute", readTestClusterListOctetStringAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterListStructOctetStringCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readPressureMeasurementMinMeasuredValueCommandParams);
+    readPressureMeasurementInteractionInfo.put(
+        "readMinMeasuredValueAttribute",
+        readPressureMeasurementMinMeasuredValueAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPressureMeasurementMaxMeasuredValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterListStructOctetStringAttributeInteractionInfo =
+    InteractionInfo readPressureMeasurementMaxMeasuredValueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readListStructOctetStringAttribute(
-                      (ChipClusters.TestClusterCluster.ListStructOctetStringAttributeCallback)
+              ((ChipClusters.PressureMeasurementCluster) cluster)
+                  .readMaxMeasuredValueAttribute(
+                      (ChipClusters.PressureMeasurementCluster.MaxMeasuredValueAttributeCallback)
                           callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedTestClusterClusterListStructOctetStringAttributeCallback(),
-            readTestClusterListStructOctetStringCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readListStructOctetStringAttribute",
-        readTestClusterListStructOctetStringAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterLongOctetStringCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readPressureMeasurementMaxMeasuredValueCommandParams);
+    readPressureMeasurementInteractionInfo.put(
+        "readMaxMeasuredValueAttribute",
+        readPressureMeasurementMaxMeasuredValueAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPressureMeasurementToleranceCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterLongOctetStringAttributeInteractionInfo =
+    InteractionInfo readPressureMeasurementToleranceAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readLongOctetStringAttribute(
-                      (ChipClusters.OctetStringAttributeCallback) callback);
+              ((ChipClusters.PressureMeasurementCluster) cluster)
+                  .readToleranceAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedOctetStringAttributeCallback(),
-            readTestClusterLongOctetStringCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readLongOctetStringAttribute", readTestClusterLongOctetStringAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterCharStringCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readPressureMeasurementToleranceCommandParams);
+    readPressureMeasurementInteractionInfo.put(
+        "readToleranceAttribute", readPressureMeasurementToleranceAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPressureMeasurementScaledValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterCharStringAttributeInteractionInfo =
+    InteractionInfo readPressureMeasurementScaledValueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readCharStringAttribute((ChipClusters.CharStringAttributeCallback) callback);
+              ((ChipClusters.PressureMeasurementCluster) cluster)
+                  .readScaledValueAttribute(
+                      (ChipClusters.PressureMeasurementCluster.ScaledValueAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readTestClusterCharStringCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readCharStringAttribute", readTestClusterCharStringAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterLongCharStringCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readPressureMeasurementScaledValueCommandParams);
+    readPressureMeasurementInteractionInfo.put(
+        "readScaledValueAttribute", readPressureMeasurementScaledValueAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPressureMeasurementMinScaledValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterLongCharStringAttributeInteractionInfo =
+    InteractionInfo readPressureMeasurementMinScaledValueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readLongCharStringAttribute((ChipClusters.CharStringAttributeCallback) callback);
+              ((ChipClusters.PressureMeasurementCluster) cluster)
+                  .readMinScaledValueAttribute(
+                      (ChipClusters.PressureMeasurementCluster.MinScaledValueAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readTestClusterLongCharStringCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readLongCharStringAttribute", readTestClusterLongCharStringAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterEpochUsCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readPressureMeasurementMinScaledValueCommandParams);
+    readPressureMeasurementInteractionInfo.put(
+        "readMinScaledValueAttribute",
+        readPressureMeasurementMinScaledValueAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPressureMeasurementMaxScaledValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterEpochUsAttributeInteractionInfo =
+    InteractionInfo readPressureMeasurementMaxScaledValueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readEpochUsAttribute((ChipClusters.LongAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterEpochUsCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readEpochUsAttribute", readTestClusterEpochUsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterEpochSCommandParams =
+              ((ChipClusters.PressureMeasurementCluster) cluster)
+                  .readMaxScaledValueAttribute(
+                      (ChipClusters.PressureMeasurementCluster.MaxScaledValueAttributeCallback)
+                          callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readPressureMeasurementMaxScaledValueCommandParams);
+    readPressureMeasurementInteractionInfo.put(
+        "readMaxScaledValueAttribute",
+        readPressureMeasurementMaxScaledValueAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPressureMeasurementScaledToleranceCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterEpochSAttributeInteractionInfo =
+    InteractionInfo readPressureMeasurementScaledToleranceAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readEpochSAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.PressureMeasurementCluster) cluster)
+                  .readScaledToleranceAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterEpochSCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readEpochSAttribute", readTestClusterEpochSAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterVendorIdCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readPressureMeasurementScaledToleranceCommandParams);
+    readPressureMeasurementInteractionInfo.put(
+        "readScaledToleranceAttribute",
+        readPressureMeasurementScaledToleranceAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPressureMeasurementScaleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterVendorIdAttributeInteractionInfo =
+    InteractionInfo readPressureMeasurementScaleAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readVendorIdAttribute(
-                      (ChipClusters.TestClusterCluster.VendorIdAttributeCallback) callback);
+              ((ChipClusters.PressureMeasurementCluster) cluster)
+                  .readScaleAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterVendorIdCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readVendorIdAttribute", readTestClusterVendorIdAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterListNullablesAndOptionalsStructCommandParams =
+            readPressureMeasurementScaleCommandParams);
+    readPressureMeasurementInteractionInfo.put(
+        "readScaleAttribute", readPressureMeasurementScaleAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPressureMeasurementAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterListNullablesAndOptionalsStructAttributeInteractionInfo =
+    InteractionInfo readPressureMeasurementAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readListNullablesAndOptionalsStructAttribute(
-                      (ChipClusters.TestClusterCluster
-                              .ListNullablesAndOptionalsStructAttributeCallback)
+              ((ChipClusters.PressureMeasurementCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.PressureMeasurementCluster.AttributeListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedTestClusterClusterListNullablesAndOptionalsStructAttributeCallback(),
-            readTestClusterListNullablesAndOptionalsStructCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readListNullablesAndOptionalsStructAttribute",
-        readTestClusterListNullablesAndOptionalsStructAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterEnumAttrCommandParams =
+                    .DelegatedPressureMeasurementClusterAttributeListAttributeCallback(),
+            readPressureMeasurementAttributeListCommandParams);
+    readPressureMeasurementInteractionInfo.put(
+        "readAttributeListAttribute", readPressureMeasurementAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPressureMeasurementFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterEnumAttrAttributeInteractionInfo =
+    InteractionInfo readPressureMeasurementFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readEnumAttrAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.PressureMeasurementCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readPressureMeasurementFeatureMapCommandParams);
+    readPressureMeasurementInteractionInfo.put(
+        "readFeatureMapAttribute", readPressureMeasurementFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readPressureMeasurementClusterRevisionCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readPressureMeasurementClusterRevisionAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.PressureMeasurementCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterEnumAttrCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readEnumAttrAttribute", readTestClusterEnumAttrAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterRangeRestrictedInt8uCommandParams =
+            readPressureMeasurementClusterRevisionCommandParams);
+    readPressureMeasurementInteractionInfo.put(
+        "readClusterRevisionAttribute",
+        readPressureMeasurementClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("pressureMeasurement", readPressureMeasurementInteractionInfo);
+    Map<String, InteractionInfo> readFlowMeasurementInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readFlowMeasurementMeasuredValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterRangeRestrictedInt8uAttributeInteractionInfo =
+    InteractionInfo readFlowMeasurementMeasuredValueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readRangeRestrictedInt8uAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.FlowMeasurementCluster) cluster)
+                  .readMeasuredValueAttribute(
+                      (ChipClusters.FlowMeasurementCluster.MeasuredValueAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterRangeRestrictedInt8uCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readRangeRestrictedInt8uAttribute",
-        readTestClusterRangeRestrictedInt8uAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterRangeRestrictedInt8sCommandParams =
+            readFlowMeasurementMeasuredValueCommandParams);
+    readFlowMeasurementInteractionInfo.put(
+        "readMeasuredValueAttribute", readFlowMeasurementMeasuredValueAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFlowMeasurementMinMeasuredValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterRangeRestrictedInt8sAttributeInteractionInfo =
+    InteractionInfo readFlowMeasurementMinMeasuredValueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readRangeRestrictedInt8sAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.FlowMeasurementCluster) cluster)
+                  .readMinMeasuredValueAttribute(
+                      (ChipClusters.FlowMeasurementCluster.MinMeasuredValueAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterRangeRestrictedInt8sCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readRangeRestrictedInt8sAttribute",
-        readTestClusterRangeRestrictedInt8sAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterRangeRestrictedInt16uCommandParams =
+            readFlowMeasurementMinMeasuredValueCommandParams);
+    readFlowMeasurementInteractionInfo.put(
+        "readMinMeasuredValueAttribute",
+        readFlowMeasurementMinMeasuredValueAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFlowMeasurementMaxMeasuredValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterRangeRestrictedInt16uAttributeInteractionInfo =
+    InteractionInfo readFlowMeasurementMaxMeasuredValueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readRangeRestrictedInt16uAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.FlowMeasurementCluster) cluster)
+                  .readMaxMeasuredValueAttribute(
+                      (ChipClusters.FlowMeasurementCluster.MaxMeasuredValueAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterRangeRestrictedInt16uCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readRangeRestrictedInt16uAttribute",
-        readTestClusterRangeRestrictedInt16uAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterRangeRestrictedInt16sCommandParams =
+            readFlowMeasurementMaxMeasuredValueCommandParams);
+    readFlowMeasurementInteractionInfo.put(
+        "readMaxMeasuredValueAttribute",
+        readFlowMeasurementMaxMeasuredValueAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFlowMeasurementToleranceCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterRangeRestrictedInt16sAttributeInteractionInfo =
+    InteractionInfo readFlowMeasurementToleranceAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readRangeRestrictedInt16sAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.FlowMeasurementCluster) cluster)
+                  .readToleranceAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterRangeRestrictedInt16sCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readRangeRestrictedInt16sAttribute",
-        readTestClusterRangeRestrictedInt16sAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterListLongOctetStringCommandParams =
+            readFlowMeasurementToleranceCommandParams);
+    readFlowMeasurementInteractionInfo.put(
+        "readToleranceAttribute", readFlowMeasurementToleranceAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFlowMeasurementGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterListLongOctetStringAttributeInteractionInfo =
+    InteractionInfo readFlowMeasurementGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readListLongOctetStringAttribute(
-                      (ChipClusters.TestClusterCluster.ListLongOctetStringAttributeCallback)
+              ((ChipClusters.FlowMeasurementCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.FlowMeasurementCluster.GeneratedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedTestClusterClusterListLongOctetStringAttributeCallback(),
-            readTestClusterListLongOctetStringCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readListLongOctetStringAttribute",
-        readTestClusterListLongOctetStringAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterListFabricScopedCommandParams =
+                    .DelegatedFlowMeasurementClusterGeneratedCommandListAttributeCallback(),
+            readFlowMeasurementGeneratedCommandListCommandParams);
+    readFlowMeasurementInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readFlowMeasurementGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFlowMeasurementAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterListFabricScopedAttributeInteractionInfo =
+    InteractionInfo readFlowMeasurementAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readListFabricScopedAttribute(
-                      (ChipClusters.TestClusterCluster.ListFabricScopedAttributeCallback) callback);
+              ((ChipClusters.FlowMeasurementCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.FlowMeasurementCluster.AcceptedCommandListAttributeCallback)
+                          callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedTestClusterClusterListFabricScopedAttributeCallback(),
-            readTestClusterListFabricScopedCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readListFabricScopedAttribute", readTestClusterListFabricScopedAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterTimedWriteBooleanCommandParams =
+                    .DelegatedFlowMeasurementClusterAcceptedCommandListAttributeCallback(),
+            readFlowMeasurementAcceptedCommandListCommandParams);
+    readFlowMeasurementInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readFlowMeasurementAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFlowMeasurementAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterTimedWriteBooleanAttributeInteractionInfo =
+    InteractionInfo readFlowMeasurementAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readTimedWriteBooleanAttribute((ChipClusters.BooleanAttributeCallback) callback);
+              ((ChipClusters.FlowMeasurementCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.FlowMeasurementCluster.AttributeListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readTestClusterTimedWriteBooleanCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readTimedWriteBooleanAttribute", readTestClusterTimedWriteBooleanAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterGeneralErrorBooleanCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedFlowMeasurementClusterAttributeListAttributeCallback(),
+            readFlowMeasurementAttributeListCommandParams);
+    readFlowMeasurementInteractionInfo.put(
+        "readAttributeListAttribute", readFlowMeasurementAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFlowMeasurementFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterGeneralErrorBooleanAttributeInteractionInfo =
+    InteractionInfo readFlowMeasurementFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readGeneralErrorBooleanAttribute(
-                      (ChipClusters.BooleanAttributeCallback) callback);
+              ((ChipClusters.FlowMeasurementCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readTestClusterGeneralErrorBooleanCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readGeneralErrorBooleanAttribute",
-        readTestClusterGeneralErrorBooleanAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterClusterErrorBooleanCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readFlowMeasurementFeatureMapCommandParams);
+    readFlowMeasurementInteractionInfo.put(
+        "readFeatureMapAttribute", readFlowMeasurementFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readFlowMeasurementClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterClusterErrorBooleanAttributeInteractionInfo =
+    InteractionInfo readFlowMeasurementClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readClusterErrorBooleanAttribute(
-                      (ChipClusters.BooleanAttributeCallback) callback);
+              ((ChipClusters.FlowMeasurementCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readTestClusterClusterErrorBooleanCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readClusterErrorBooleanAttribute",
-        readTestClusterClusterErrorBooleanAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterUnsupportedCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readFlowMeasurementClusterRevisionCommandParams);
+    readFlowMeasurementInteractionInfo.put(
+        "readClusterRevisionAttribute", readFlowMeasurementClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("flowMeasurement", readFlowMeasurementInteractionInfo);
+    Map<String, InteractionInfo> readRelativeHumidityMeasurementInteractionInfo =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readRelativeHumidityMeasurementMeasuredValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterUnsupportedAttributeInteractionInfo =
+    InteractionInfo readRelativeHumidityMeasurementMeasuredValueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readUnsupportedAttribute((ChipClusters.BooleanAttributeCallback) callback);
+              ((ChipClusters.RelativeHumidityMeasurementCluster) cluster)
+                  .readMeasuredValueAttribute(
+                      (ChipClusters.RelativeHumidityMeasurementCluster
+                              .MeasuredValueAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readTestClusterUnsupportedCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readUnsupportedAttribute", readTestClusterUnsupportedAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableBooleanCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readRelativeHumidityMeasurementMeasuredValueCommandParams);
+    readRelativeHumidityMeasurementInteractionInfo.put(
+        "readMeasuredValueAttribute",
+        readRelativeHumidityMeasurementMeasuredValueAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readRelativeHumidityMeasurementMinMeasuredValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableBooleanAttributeInteractionInfo =
+    InteractionInfo readRelativeHumidityMeasurementMinMeasuredValueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableBooleanAttribute(
-                      (ChipClusters.TestClusterCluster.NullableBooleanAttributeCallback) callback);
+              ((ChipClusters.RelativeHumidityMeasurementCluster) cluster)
+                  .readMinMeasuredValueAttribute(
+                      (ChipClusters.RelativeHumidityMeasurementCluster
+                              .MinMeasuredValueAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
-            readTestClusterNullableBooleanCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableBooleanAttribute", readTestClusterNullableBooleanAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableBitmap8CommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readRelativeHumidityMeasurementMinMeasuredValueCommandParams);
+    readRelativeHumidityMeasurementInteractionInfo.put(
+        "readMinMeasuredValueAttribute",
+        readRelativeHumidityMeasurementMinMeasuredValueAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readRelativeHumidityMeasurementMaxMeasuredValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableBitmap8AttributeInteractionInfo =
+    InteractionInfo readRelativeHumidityMeasurementMaxMeasuredValueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableBitmap8Attribute(
-                      (ChipClusters.TestClusterCluster.NullableBitmap8AttributeCallback) callback);
+              ((ChipClusters.RelativeHumidityMeasurementCluster) cluster)
+                  .readMaxMeasuredValueAttribute(
+                      (ChipClusters.RelativeHumidityMeasurementCluster
+                              .MaxMeasuredValueAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterNullableBitmap8CommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableBitmap8Attribute", readTestClusterNullableBitmap8AttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableBitmap16CommandParams =
+            readRelativeHumidityMeasurementMaxMeasuredValueCommandParams);
+    readRelativeHumidityMeasurementInteractionInfo.put(
+        "readMaxMeasuredValueAttribute",
+        readRelativeHumidityMeasurementMaxMeasuredValueAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readRelativeHumidityMeasurementToleranceCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableBitmap16AttributeInteractionInfo =
+    InteractionInfo readRelativeHumidityMeasurementToleranceAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableBitmap16Attribute(
-                      (ChipClusters.TestClusterCluster.NullableBitmap16AttributeCallback) callback);
+              ((ChipClusters.RelativeHumidityMeasurementCluster) cluster)
+                  .readToleranceAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterNullableBitmap16CommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableBitmap16Attribute", readTestClusterNullableBitmap16AttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableBitmap32CommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableBitmap32AttributeInteractionInfo =
+            readRelativeHumidityMeasurementToleranceCommandParams);
+    readRelativeHumidityMeasurementInteractionInfo.put(
+        "readToleranceAttribute", readRelativeHumidityMeasurementToleranceAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readRelativeHumidityMeasurementGeneratedCommandListCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readRelativeHumidityMeasurementGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableBitmap32Attribute(
-                      (ChipClusters.TestClusterCluster.NullableBitmap32AttributeCallback) callback);
+              ((ChipClusters.RelativeHumidityMeasurementCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.RelativeHumidityMeasurementCluster
+                              .GeneratedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterNullableBitmap32CommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableBitmap32Attribute", readTestClusterNullableBitmap32AttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableBitmap64CommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedRelativeHumidityMeasurementClusterGeneratedCommandListAttributeCallback(),
+            readRelativeHumidityMeasurementGeneratedCommandListCommandParams);
+    readRelativeHumidityMeasurementInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readRelativeHumidityMeasurementGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        readRelativeHumidityMeasurementAcceptedCommandListCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readRelativeHumidityMeasurementAcceptedCommandListAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.RelativeHumidityMeasurementCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.RelativeHumidityMeasurementCluster
+                              .AcceptedCommandListAttributeCallback)
+                          callback);
+            },
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedRelativeHumidityMeasurementClusterAcceptedCommandListAttributeCallback(),
+            readRelativeHumidityMeasurementAcceptedCommandListCommandParams);
+    readRelativeHumidityMeasurementInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readRelativeHumidityMeasurementAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readRelativeHumidityMeasurementAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableBitmap64AttributeInteractionInfo =
+    InteractionInfo readRelativeHumidityMeasurementAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableBitmap64Attribute(
-                      (ChipClusters.TestClusterCluster.NullableBitmap64AttributeCallback) callback);
+              ((ChipClusters.RelativeHumidityMeasurementCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.RelativeHumidityMeasurementCluster
+                              .AttributeListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterNullableBitmap64CommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableBitmap64Attribute", readTestClusterNullableBitmap64AttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableInt8uCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedRelativeHumidityMeasurementClusterAttributeListAttributeCallback(),
+            readRelativeHumidityMeasurementAttributeListCommandParams);
+    readRelativeHumidityMeasurementInteractionInfo.put(
+        "readAttributeListAttribute",
+        readRelativeHumidityMeasurementAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readRelativeHumidityMeasurementFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableInt8uAttributeInteractionInfo =
+    InteractionInfo readRelativeHumidityMeasurementFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableInt8uAttribute(
-                      (ChipClusters.TestClusterCluster.NullableInt8uAttributeCallback) callback);
+              ((ChipClusters.RelativeHumidityMeasurementCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterNullableInt8uCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableInt8uAttribute", readTestClusterNullableInt8uAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableInt16uCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readRelativeHumidityMeasurementFeatureMapCommandParams);
+    readRelativeHumidityMeasurementInteractionInfo.put(
+        "readFeatureMapAttribute",
+        readRelativeHumidityMeasurementFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readRelativeHumidityMeasurementClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableInt16uAttributeInteractionInfo =
+    InteractionInfo readRelativeHumidityMeasurementClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableInt16uAttribute(
-                      (ChipClusters.TestClusterCluster.NullableInt16uAttributeCallback) callback);
+              ((ChipClusters.RelativeHumidityMeasurementCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterNullableInt16uCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableInt16uAttribute", readTestClusterNullableInt16uAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableInt24uCommandParams =
+            readRelativeHumidityMeasurementClusterRevisionCommandParams);
+    readRelativeHumidityMeasurementInteractionInfo.put(
+        "readClusterRevisionAttribute",
+        readRelativeHumidityMeasurementClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put(
+        "relativeHumidityMeasurement", readRelativeHumidityMeasurementInteractionInfo);
+    Map<String, InteractionInfo> readOccupancySensingInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readOccupancySensingOccupancyCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableInt24uAttributeInteractionInfo =
+    InteractionInfo readOccupancySensingOccupancyAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableInt24uAttribute(
-                      (ChipClusters.TestClusterCluster.NullableInt24uAttributeCallback) callback);
+              ((ChipClusters.OccupancySensingCluster) cluster)
+                  .readOccupancyAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterNullableInt24uCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableInt24uAttribute", readTestClusterNullableInt24uAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableInt32uCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readOccupancySensingOccupancyCommandParams);
+    readOccupancySensingInteractionInfo.put(
+        "readOccupancyAttribute", readOccupancySensingOccupancyAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOccupancySensingOccupancySensorTypeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableInt32uAttributeInteractionInfo =
+    InteractionInfo readOccupancySensingOccupancySensorTypeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableInt32uAttribute(
-                      (ChipClusters.TestClusterCluster.NullableInt32uAttributeCallback) callback);
+              ((ChipClusters.OccupancySensingCluster) cluster)
+                  .readOccupancySensorTypeAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterNullableInt32uCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableInt32uAttribute", readTestClusterNullableInt32uAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableInt40uCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readOccupancySensingOccupancySensorTypeCommandParams);
+    readOccupancySensingInteractionInfo.put(
+        "readOccupancySensorTypeAttribute",
+        readOccupancySensingOccupancySensorTypeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOccupancySensingOccupancySensorTypeBitmapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableInt40uAttributeInteractionInfo =
+    InteractionInfo readOccupancySensingOccupancySensorTypeBitmapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableInt40uAttribute(
-                      (ChipClusters.TestClusterCluster.NullableInt40uAttributeCallback) callback);
+              ((ChipClusters.OccupancySensingCluster) cluster)
+                  .readOccupancySensorTypeBitmapAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterNullableInt40uCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableInt40uAttribute", readTestClusterNullableInt40uAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableInt48uCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readOccupancySensingOccupancySensorTypeBitmapCommandParams);
+    readOccupancySensingInteractionInfo.put(
+        "readOccupancySensorTypeBitmapAttribute",
+        readOccupancySensingOccupancySensorTypeBitmapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOccupancySensingGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableInt48uAttributeInteractionInfo =
+    InteractionInfo readOccupancySensingGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableInt48uAttribute(
-                      (ChipClusters.TestClusterCluster.NullableInt48uAttributeCallback) callback);
+              ((ChipClusters.OccupancySensingCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.OccupancySensingCluster.GeneratedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterNullableInt48uCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableInt48uAttribute", readTestClusterNullableInt48uAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableInt56uCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedOccupancySensingClusterGeneratedCommandListAttributeCallback(),
+            readOccupancySensingGeneratedCommandListCommandParams);
+    readOccupancySensingInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readOccupancySensingGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOccupancySensingAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableInt56uAttributeInteractionInfo =
+    InteractionInfo readOccupancySensingAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableInt56uAttribute(
-                      (ChipClusters.TestClusterCluster.NullableInt56uAttributeCallback) callback);
+              ((ChipClusters.OccupancySensingCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.OccupancySensingCluster.AcceptedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterNullableInt56uCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableInt56uAttribute", readTestClusterNullableInt56uAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableInt64uCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedOccupancySensingClusterAcceptedCommandListAttributeCallback(),
+            readOccupancySensingAcceptedCommandListCommandParams);
+    readOccupancySensingInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readOccupancySensingAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOccupancySensingAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableInt64uAttributeInteractionInfo =
+    InteractionInfo readOccupancySensingAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableInt64uAttribute(
-                      (ChipClusters.TestClusterCluster.NullableInt64uAttributeCallback) callback);
+              ((ChipClusters.OccupancySensingCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.OccupancySensingCluster.AttributeListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterNullableInt64uCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableInt64uAttribute", readTestClusterNullableInt64uAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableInt8sCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedOccupancySensingClusterAttributeListAttributeCallback(),
+            readOccupancySensingAttributeListCommandParams);
+    readOccupancySensingInteractionInfo.put(
+        "readAttributeListAttribute", readOccupancySensingAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOccupancySensingFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableInt8sAttributeInteractionInfo =
+    InteractionInfo readOccupancySensingFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableInt8sAttribute(
-                      (ChipClusters.TestClusterCluster.NullableInt8sAttributeCallback) callback);
+              ((ChipClusters.OccupancySensingCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterNullableInt8sCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableInt8sAttribute", readTestClusterNullableInt8sAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableInt16sCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readOccupancySensingFeatureMapCommandParams);
+    readOccupancySensingInteractionInfo.put(
+        "readFeatureMapAttribute", readOccupancySensingFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readOccupancySensingClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableInt16sAttributeInteractionInfo =
+    InteractionInfo readOccupancySensingClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableInt16sAttribute(
-                      (ChipClusters.TestClusterCluster.NullableInt16sAttributeCallback) callback);
+              ((ChipClusters.OccupancySensingCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterNullableInt16sCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableInt16sAttribute", readTestClusterNullableInt16sAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableInt24sCommandParams =
+            readOccupancySensingClusterRevisionCommandParams);
+    readOccupancySensingInteractionInfo.put(
+        "readClusterRevisionAttribute",
+        readOccupancySensingClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("occupancySensing", readOccupancySensingInteractionInfo);
+    Map<String, InteractionInfo> readWakeOnLanInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readWakeOnLanMACAddressCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableInt24sAttributeInteractionInfo =
+    InteractionInfo readWakeOnLanMACAddressAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableInt24sAttribute(
-                      (ChipClusters.TestClusterCluster.NullableInt24sAttributeCallback) callback);
+              ((ChipClusters.WakeOnLanCluster) cluster)
+                  .readMACAddressAttribute((ChipClusters.CharStringAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterNullableInt24sCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableInt24sAttribute", readTestClusterNullableInt24sAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableInt32sCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readWakeOnLanMACAddressCommandParams);
+    readWakeOnLanInteractionInfo.put(
+        "readMACAddressAttribute", readWakeOnLanMACAddressAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWakeOnLanGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableInt32sAttributeInteractionInfo =
+    InteractionInfo readWakeOnLanGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableInt32sAttribute(
-                      (ChipClusters.TestClusterCluster.NullableInt32sAttributeCallback) callback);
+              ((ChipClusters.WakeOnLanCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.WakeOnLanCluster.GeneratedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterNullableInt32sCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableInt32sAttribute", readTestClusterNullableInt32sAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableInt40sCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedWakeOnLanClusterGeneratedCommandListAttributeCallback(),
+            readWakeOnLanGeneratedCommandListCommandParams);
+    readWakeOnLanInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readWakeOnLanGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWakeOnLanAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableInt40sAttributeInteractionInfo =
+    InteractionInfo readWakeOnLanAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableInt40sAttribute(
-                      (ChipClusters.TestClusterCluster.NullableInt40sAttributeCallback) callback);
+              ((ChipClusters.WakeOnLanCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.WakeOnLanCluster.AcceptedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterNullableInt40sCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableInt40sAttribute", readTestClusterNullableInt40sAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableInt48sCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedWakeOnLanClusterAcceptedCommandListAttributeCallback(),
+            readWakeOnLanAcceptedCommandListCommandParams);
+    readWakeOnLanInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readWakeOnLanAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWakeOnLanAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableInt48sAttributeInteractionInfo =
+    InteractionInfo readWakeOnLanAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableInt48sAttribute(
-                      (ChipClusters.TestClusterCluster.NullableInt48sAttributeCallback) callback);
+              ((ChipClusters.WakeOnLanCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.WakeOnLanCluster.AttributeListAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterNullableInt48sCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableInt48sAttribute", readTestClusterNullableInt48sAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableInt56sCommandParams =
+            () -> new ClusterInfoMapping.DelegatedWakeOnLanClusterAttributeListAttributeCallback(),
+            readWakeOnLanAttributeListCommandParams);
+    readWakeOnLanInteractionInfo.put(
+        "readAttributeListAttribute", readWakeOnLanAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWakeOnLanFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableInt56sAttributeInteractionInfo =
+    InteractionInfo readWakeOnLanFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableInt56sAttribute(
-                      (ChipClusters.TestClusterCluster.NullableInt56sAttributeCallback) callback);
+              ((ChipClusters.WakeOnLanCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterNullableInt56sCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableInt56sAttribute", readTestClusterNullableInt56sAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableInt64sCommandParams =
+            readWakeOnLanFeatureMapCommandParams);
+    readWakeOnLanInteractionInfo.put(
+        "readFeatureMapAttribute", readWakeOnLanFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readWakeOnLanClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableInt64sAttributeInteractionInfo =
+    InteractionInfo readWakeOnLanClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableInt64sAttribute(
-                      (ChipClusters.TestClusterCluster.NullableInt64sAttributeCallback) callback);
+              ((ChipClusters.WakeOnLanCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterNullableInt64sCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableInt64sAttribute", readTestClusterNullableInt64sAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableEnum8CommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readWakeOnLanClusterRevisionCommandParams);
+    readWakeOnLanInteractionInfo.put(
+        "readClusterRevisionAttribute", readWakeOnLanClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("wakeOnLan", readWakeOnLanInteractionInfo);
+    Map<String, InteractionInfo> readChannelInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readChannelChannelListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableEnum8AttributeInteractionInfo =
+    InteractionInfo readChannelChannelListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableEnum8Attribute(
-                      (ChipClusters.TestClusterCluster.NullableEnum8AttributeCallback) callback);
+              ((ChipClusters.ChannelCluster) cluster)
+                  .readChannelListAttribute(
+                      (ChipClusters.ChannelCluster.ChannelListAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterNullableEnum8CommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableEnum8Attribute", readTestClusterNullableEnum8AttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableEnum16CommandParams =
+            () -> new ClusterInfoMapping.DelegatedChannelClusterChannelListAttributeCallback(),
+            readChannelChannelListCommandParams);
+    readChannelInteractionInfo.put(
+        "readChannelListAttribute", readChannelChannelListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readChannelGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableEnum16AttributeInteractionInfo =
+    InteractionInfo readChannelGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableEnum16Attribute(
-                      (ChipClusters.TestClusterCluster.NullableEnum16AttributeCallback) callback);
+              ((ChipClusters.ChannelCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.ChannelCluster.GeneratedCommandListAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterNullableEnum16CommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableEnum16Attribute", readTestClusterNullableEnum16AttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableFloatSingleCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedChannelClusterGeneratedCommandListAttributeCallback(),
+            readChannelGeneratedCommandListCommandParams);
+    readChannelInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readChannelGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readChannelAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableFloatSingleAttributeInteractionInfo =
+    InteractionInfo readChannelAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableFloatSingleAttribute(
-                      (ChipClusters.TestClusterCluster.NullableFloatSingleAttributeCallback)
-                          callback);
+              ((ChipClusters.ChannelCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.ChannelCluster.AcceptedCommandListAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedFloatAttributeCallback(),
-            readTestClusterNullableFloatSingleCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableFloatSingleAttribute",
-        readTestClusterNullableFloatSingleAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableFloatDoubleCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableFloatDoubleAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableFloatDoubleAttribute(
-                      (ChipClusters.TestClusterCluster.NullableFloatDoubleAttributeCallback)
-                          callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedDoubleAttributeCallback(),
-            readTestClusterNullableFloatDoubleCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableFloatDoubleAttribute",
-        readTestClusterNullableFloatDoubleAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableOctetStringCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableOctetStringAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableOctetStringAttribute(
-                      (ChipClusters.TestClusterCluster.NullableOctetStringAttributeCallback)
-                          callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedOctetStringAttributeCallback(),
-            readTestClusterNullableOctetStringCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableOctetStringAttribute",
-        readTestClusterNullableOctetStringAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableCharStringCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableCharStringAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableCharStringAttribute(
-                      (ChipClusters.TestClusterCluster.NullableCharStringAttributeCallback)
-                          callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readTestClusterNullableCharStringCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableCharStringAttribute",
-        readTestClusterNullableCharStringAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableEnumAttrCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedChannelClusterAcceptedCommandListAttributeCallback(),
+            readChannelAcceptedCommandListCommandParams);
+    readChannelInteractionInfo.put(
+        "readAcceptedCommandListAttribute", readChannelAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readChannelAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableEnumAttrAttributeInteractionInfo =
+    InteractionInfo readChannelAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableEnumAttrAttribute(
-                      (ChipClusters.TestClusterCluster.NullableEnumAttrAttributeCallback) callback);
+              ((ChipClusters.ChannelCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.ChannelCluster.AttributeListAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterNullableEnumAttrCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableEnumAttrAttribute", readTestClusterNullableEnumAttrAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableRangeRestrictedInt8uCommandParams =
+            () -> new ClusterInfoMapping.DelegatedChannelClusterAttributeListAttributeCallback(),
+            readChannelAttributeListCommandParams);
+    readChannelInteractionInfo.put(
+        "readAttributeListAttribute", readChannelAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readChannelFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableRangeRestrictedInt8uAttributeInteractionInfo =
+    InteractionInfo readChannelFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableRangeRestrictedInt8uAttribute(
-                      (ChipClusters.TestClusterCluster
-                              .NullableRangeRestrictedInt8uAttributeCallback)
-                          callback);
+              ((ChipClusters.ChannelCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterNullableRangeRestrictedInt8uCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableRangeRestrictedInt8uAttribute",
-        readTestClusterNullableRangeRestrictedInt8uAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableRangeRestrictedInt8sCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readChannelFeatureMapCommandParams);
+    readChannelInteractionInfo.put(
+        "readFeatureMapAttribute", readChannelFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readChannelClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableRangeRestrictedInt8sAttributeInteractionInfo =
+    InteractionInfo readChannelClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableRangeRestrictedInt8sAttribute(
-                      (ChipClusters.TestClusterCluster
-                              .NullableRangeRestrictedInt8sAttributeCallback)
-                          callback);
+              ((ChipClusters.ChannelCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterNullableRangeRestrictedInt8sCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableRangeRestrictedInt8sAttribute",
-        readTestClusterNullableRangeRestrictedInt8sAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableRangeRestrictedInt16uCommandParams =
+            readChannelClusterRevisionCommandParams);
+    readChannelInteractionInfo.put(
+        "readClusterRevisionAttribute", readChannelClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("channel", readChannelInteractionInfo);
+    Map<String, InteractionInfo> readTargetNavigatorInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readTargetNavigatorTargetListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableRangeRestrictedInt16uAttributeInteractionInfo =
+    InteractionInfo readTargetNavigatorTargetListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableRangeRestrictedInt16uAttribute(
-                      (ChipClusters.TestClusterCluster
-                              .NullableRangeRestrictedInt16uAttributeCallback)
-                          callback);
+              ((ChipClusters.TargetNavigatorCluster) cluster)
+                  .readTargetListAttribute(
+                      (ChipClusters.TargetNavigatorCluster.TargetListAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterNullableRangeRestrictedInt16uCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableRangeRestrictedInt16uAttribute",
-        readTestClusterNullableRangeRestrictedInt16uAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterNullableRangeRestrictedInt16sCommandParams =
+            () ->
+                new ClusterInfoMapping.DelegatedTargetNavigatorClusterTargetListAttributeCallback(),
+            readTargetNavigatorTargetListCommandParams);
+    readTargetNavigatorInteractionInfo.put(
+        "readTargetListAttribute", readTargetNavigatorTargetListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTargetNavigatorCurrentTargetCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterNullableRangeRestrictedInt16sAttributeInteractionInfo =
+    InteractionInfo readTargetNavigatorCurrentTargetAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .readNullableRangeRestrictedInt16sAttribute(
-                      (ChipClusters.TestClusterCluster
-                              .NullableRangeRestrictedInt16sAttributeCallback)
-                          callback);
+              ((ChipClusters.TargetNavigatorCluster) cluster)
+                  .readCurrentTargetAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterNullableRangeRestrictedInt16sCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readNullableRangeRestrictedInt16sAttribute",
-        readTestClusterNullableRangeRestrictedInt16sAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterGeneratedCommandListCommandParams =
+            readTargetNavigatorCurrentTargetCommandParams);
+    readTargetNavigatorInteractionInfo.put(
+        "readCurrentTargetAttribute", readTargetNavigatorCurrentTargetAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTargetNavigatorGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readTargetNavigatorGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
+              ((ChipClusters.TargetNavigatorCluster) cluster)
                   .readGeneratedCommandListAttribute(
-                      (ChipClusters.TestClusterCluster.GeneratedCommandListAttributeCallback)
+                      (ChipClusters.TargetNavigatorCluster.GeneratedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedTestClusterClusterGeneratedCommandListAttributeCallback(),
-            readTestClusterGeneratedCommandListCommandParams);
-    readTestClusterInteractionInfo.put(
+                    .DelegatedTargetNavigatorClusterGeneratedCommandListAttributeCallback(),
+            readTargetNavigatorGeneratedCommandListCommandParams);
+    readTargetNavigatorInteractionInfo.put(
         "readGeneratedCommandListAttribute",
-        readTestClusterGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterAcceptedCommandListCommandParams =
+        readTargetNavigatorGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTargetNavigatorAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readTargetNavigatorAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
+              ((ChipClusters.TargetNavigatorCluster) cluster)
                   .readAcceptedCommandListAttribute(
-                      (ChipClusters.TestClusterCluster.AcceptedCommandListAttributeCallback)
+                      (ChipClusters.TargetNavigatorCluster.AcceptedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedTestClusterClusterAcceptedCommandListAttributeCallback(),
-            readTestClusterAcceptedCommandListCommandParams);
-    readTestClusterInteractionInfo.put(
+                    .DelegatedTargetNavigatorClusterAcceptedCommandListAttributeCallback(),
+            readTargetNavigatorAcceptedCommandListCommandParams);
+    readTargetNavigatorInteractionInfo.put(
         "readAcceptedCommandListAttribute",
-        readTestClusterAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterAttributeListCommandParams =
+        readTargetNavigatorAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTargetNavigatorAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterAttributeListAttributeInteractionInfo =
+    InteractionInfo readTargetNavigatorAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
+              ((ChipClusters.TargetNavigatorCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.TestClusterCluster.AttributeListAttributeCallback) callback);
+                      (ChipClusters.TargetNavigatorCluster.AttributeListAttributeCallback)
+                          callback);
             },
             () ->
-                new ClusterInfoMapping.DelegatedTestClusterClusterAttributeListAttributeCallback(),
-            readTestClusterAttributeListCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readAttributeListAttribute", readTestClusterAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterFeatureMapCommandParams =
+                new ClusterInfoMapping
+                    .DelegatedTargetNavigatorClusterAttributeListAttributeCallback(),
+            readTargetNavigatorAttributeListCommandParams);
+    readTargetNavigatorInteractionInfo.put(
+        "readAttributeListAttribute", readTargetNavigatorAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTargetNavigatorFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterFeatureMapAttributeInteractionInfo =
+    InteractionInfo readTargetNavigatorFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
+              ((ChipClusters.TargetNavigatorCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTestClusterFeatureMapCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readFeatureMapAttribute", readTestClusterFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTestClusterClusterRevisionCommandParams =
+            readTargetNavigatorFeatureMapCommandParams);
+    readTargetNavigatorInteractionInfo.put(
+        "readFeatureMapAttribute", readTargetNavigatorFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTargetNavigatorClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTestClusterClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readTargetNavigatorClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
+              ((ChipClusters.TargetNavigatorCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTestClusterClusterRevisionCommandParams);
-    readTestClusterInteractionInfo.put(
-        "readClusterRevisionAttribute", readTestClusterClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("testCluster", readTestClusterInteractionInfo);
-    Map<String, InteractionInfo> readThermostatInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readThermostatLocalTemperatureCommandParams =
+            readTargetNavigatorClusterRevisionCommandParams);
+    readTargetNavigatorInteractionInfo.put(
+        "readClusterRevisionAttribute", readTargetNavigatorClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("targetNavigator", readTargetNavigatorInteractionInfo);
+    Map<String, InteractionInfo> readMediaPlaybackInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readMediaPlaybackCurrentStateCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThermostatLocalTemperatureAttributeInteractionInfo =
+    InteractionInfo readMediaPlaybackCurrentStateAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .readLocalTemperatureAttribute(
-                      (ChipClusters.ThermostatCluster.LocalTemperatureAttributeCallback) callback);
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .readCurrentStateAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThermostatLocalTemperatureCommandParams);
-    readThermostatInteractionInfo.put(
-        "readLocalTemperatureAttribute", readThermostatLocalTemperatureAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThermostatAbsMinHeatSetpointLimitCommandParams =
+            readMediaPlaybackCurrentStateCommandParams);
+    readMediaPlaybackInteractionInfo.put(
+        "readCurrentStateAttribute", readMediaPlaybackCurrentStateAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readMediaPlaybackStartTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThermostatAbsMinHeatSetpointLimitAttributeInteractionInfo =
+    InteractionInfo readMediaPlaybackStartTimeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .readAbsMinHeatSetpointLimitAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .readStartTimeAttribute(
+                      (ChipClusters.MediaPlaybackCluster.StartTimeAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThermostatAbsMinHeatSetpointLimitCommandParams);
-    readThermostatInteractionInfo.put(
-        "readAbsMinHeatSetpointLimitAttribute",
-        readThermostatAbsMinHeatSetpointLimitAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThermostatAbsMaxHeatSetpointLimitCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readMediaPlaybackStartTimeCommandParams);
+    readMediaPlaybackInteractionInfo.put(
+        "readStartTimeAttribute", readMediaPlaybackStartTimeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readMediaPlaybackDurationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThermostatAbsMaxHeatSetpointLimitAttributeInteractionInfo =
+    InteractionInfo readMediaPlaybackDurationAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .readAbsMaxHeatSetpointLimitAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .readDurationAttribute(
+                      (ChipClusters.MediaPlaybackCluster.DurationAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThermostatAbsMaxHeatSetpointLimitCommandParams);
-    readThermostatInteractionInfo.put(
-        "readAbsMaxHeatSetpointLimitAttribute",
-        readThermostatAbsMaxHeatSetpointLimitAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThermostatAbsMinCoolSetpointLimitCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readMediaPlaybackDurationCommandParams);
+    readMediaPlaybackInteractionInfo.put(
+        "readDurationAttribute", readMediaPlaybackDurationAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readMediaPlaybackPlaybackSpeedCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThermostatAbsMinCoolSetpointLimitAttributeInteractionInfo =
+    InteractionInfo readMediaPlaybackPlaybackSpeedAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .readAbsMinCoolSetpointLimitAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .readPlaybackSpeedAttribute((ChipClusters.FloatAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThermostatAbsMinCoolSetpointLimitCommandParams);
-    readThermostatInteractionInfo.put(
-        "readAbsMinCoolSetpointLimitAttribute",
-        readThermostatAbsMinCoolSetpointLimitAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThermostatAbsMaxCoolSetpointLimitCommandParams =
+            () -> new ClusterInfoMapping.DelegatedFloatAttributeCallback(),
+            readMediaPlaybackPlaybackSpeedCommandParams);
+    readMediaPlaybackInteractionInfo.put(
+        "readPlaybackSpeedAttribute", readMediaPlaybackPlaybackSpeedAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readMediaPlaybackSeekRangeEndCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThermostatAbsMaxCoolSetpointLimitAttributeInteractionInfo =
+    InteractionInfo readMediaPlaybackSeekRangeEndAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .readAbsMaxCoolSetpointLimitAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .readSeekRangeEndAttribute(
+                      (ChipClusters.MediaPlaybackCluster.SeekRangeEndAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThermostatAbsMaxCoolSetpointLimitCommandParams);
-    readThermostatInteractionInfo.put(
-        "readAbsMaxCoolSetpointLimitAttribute",
-        readThermostatAbsMaxCoolSetpointLimitAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThermostatOccupiedCoolingSetpointCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readMediaPlaybackSeekRangeEndCommandParams);
+    readMediaPlaybackInteractionInfo.put(
+        "readSeekRangeEndAttribute", readMediaPlaybackSeekRangeEndAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readMediaPlaybackSeekRangeStartCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThermostatOccupiedCoolingSetpointAttributeInteractionInfo =
+    InteractionInfo readMediaPlaybackSeekRangeStartAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .readOccupiedCoolingSetpointAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .readSeekRangeStartAttribute(
+                      (ChipClusters.MediaPlaybackCluster.SeekRangeStartAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThermostatOccupiedCoolingSetpointCommandParams);
-    readThermostatInteractionInfo.put(
-        "readOccupiedCoolingSetpointAttribute",
-        readThermostatOccupiedCoolingSetpointAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThermostatOccupiedHeatingSetpointCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readMediaPlaybackSeekRangeStartCommandParams);
+    readMediaPlaybackInteractionInfo.put(
+        "readSeekRangeStartAttribute", readMediaPlaybackSeekRangeStartAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readMediaPlaybackGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThermostatOccupiedHeatingSetpointAttributeInteractionInfo =
+    InteractionInfo readMediaPlaybackGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .readOccupiedHeatingSetpointAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.MediaPlaybackCluster.GeneratedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThermostatOccupiedHeatingSetpointCommandParams);
-    readThermostatInteractionInfo.put(
-        "readOccupiedHeatingSetpointAttribute",
-        readThermostatOccupiedHeatingSetpointAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThermostatMinHeatSetpointLimitCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedMediaPlaybackClusterGeneratedCommandListAttributeCallback(),
+            readMediaPlaybackGeneratedCommandListCommandParams);
+    readMediaPlaybackInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readMediaPlaybackGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readMediaPlaybackAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThermostatMinHeatSetpointLimitAttributeInteractionInfo =
+    InteractionInfo readMediaPlaybackAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .readMinHeatSetpointLimitAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.MediaPlaybackCluster.AcceptedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThermostatMinHeatSetpointLimitCommandParams);
-    readThermostatInteractionInfo.put(
-        "readMinHeatSetpointLimitAttribute",
-        readThermostatMinHeatSetpointLimitAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThermostatMaxHeatSetpointLimitCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedMediaPlaybackClusterAcceptedCommandListAttributeCallback(),
+            readMediaPlaybackAcceptedCommandListCommandParams);
+    readMediaPlaybackInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readMediaPlaybackAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readMediaPlaybackAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThermostatMaxHeatSetpointLimitAttributeInteractionInfo =
+    InteractionInfo readMediaPlaybackAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .readMaxHeatSetpointLimitAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.MediaPlaybackCluster.AttributeListAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThermostatMaxHeatSetpointLimitCommandParams);
-    readThermostatInteractionInfo.put(
-        "readMaxHeatSetpointLimitAttribute",
-        readThermostatMaxHeatSetpointLimitAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThermostatMinCoolSetpointLimitCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedMediaPlaybackClusterAttributeListAttributeCallback(),
+            readMediaPlaybackAttributeListCommandParams);
+    readMediaPlaybackInteractionInfo.put(
+        "readAttributeListAttribute", readMediaPlaybackAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readMediaPlaybackFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThermostatMinCoolSetpointLimitAttributeInteractionInfo =
+    InteractionInfo readMediaPlaybackFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .readMinCoolSetpointLimitAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThermostatMinCoolSetpointLimitCommandParams);
-    readThermostatInteractionInfo.put(
-        "readMinCoolSetpointLimitAttribute",
-        readThermostatMinCoolSetpointLimitAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThermostatMaxCoolSetpointLimitCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readMediaPlaybackFeatureMapCommandParams);
+    readMediaPlaybackInteractionInfo.put(
+        "readFeatureMapAttribute", readMediaPlaybackFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readMediaPlaybackClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThermostatMaxCoolSetpointLimitAttributeInteractionInfo =
+    InteractionInfo readMediaPlaybackClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .readMaxCoolSetpointLimitAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThermostatMaxCoolSetpointLimitCommandParams);
-    readThermostatInteractionInfo.put(
-        "readMaxCoolSetpointLimitAttribute",
-        readThermostatMaxCoolSetpointLimitAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThermostatMinSetpointDeadBandCommandParams =
+            readMediaPlaybackClusterRevisionCommandParams);
+    readMediaPlaybackInteractionInfo.put(
+        "readClusterRevisionAttribute", readMediaPlaybackClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("mediaPlayback", readMediaPlaybackInteractionInfo);
+    Map<String, InteractionInfo> readMediaInputInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readMediaInputInputListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThermostatMinSetpointDeadBandAttributeInteractionInfo =
+    InteractionInfo readMediaInputInputListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .readMinSetpointDeadBandAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.MediaInputCluster) cluster)
+                  .readInputListAttribute(
+                      (ChipClusters.MediaInputCluster.InputListAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThermostatMinSetpointDeadBandCommandParams);
-    readThermostatInteractionInfo.put(
-        "readMinSetpointDeadBandAttribute",
-        readThermostatMinSetpointDeadBandAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThermostatControlSequenceOfOperationCommandParams =
+            () -> new ClusterInfoMapping.DelegatedMediaInputClusterInputListAttributeCallback(),
+            readMediaInputInputListCommandParams);
+    readMediaInputInteractionInfo.put(
+        "readInputListAttribute", readMediaInputInputListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readMediaInputCurrentInputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThermostatControlSequenceOfOperationAttributeInteractionInfo =
+    InteractionInfo readMediaInputCurrentInputAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .readControlSequenceOfOperationAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.MediaInputCluster) cluster)
+                  .readCurrentInputAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThermostatControlSequenceOfOperationCommandParams);
-    readThermostatInteractionInfo.put(
-        "readControlSequenceOfOperationAttribute",
-        readThermostatControlSequenceOfOperationAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThermostatSystemModeCommandParams =
+            readMediaInputCurrentInputCommandParams);
+    readMediaInputInteractionInfo.put(
+        "readCurrentInputAttribute", readMediaInputCurrentInputAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readMediaInputGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThermostatSystemModeAttributeInteractionInfo =
+    InteractionInfo readMediaInputGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .readSystemModeAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.MediaInputCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.MediaInputCluster.GeneratedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThermostatSystemModeCommandParams);
-    readThermostatInteractionInfo.put(
-        "readSystemModeAttribute", readThermostatSystemModeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThermostatStartOfWeekCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedMediaInputClusterGeneratedCommandListAttributeCallback(),
+            readMediaInputGeneratedCommandListCommandParams);
+    readMediaInputInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readMediaInputGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readMediaInputAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThermostatStartOfWeekAttributeInteractionInfo =
+    InteractionInfo readMediaInputAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .readStartOfWeekAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.MediaInputCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.MediaInputCluster.AcceptedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThermostatStartOfWeekCommandParams);
-    readThermostatInteractionInfo.put(
-        "readStartOfWeekAttribute", readThermostatStartOfWeekAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThermostatNumberOfWeeklyTransitionsCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThermostatNumberOfWeeklyTransitionsAttributeInteractionInfo =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedMediaInputClusterAcceptedCommandListAttributeCallback(),
+            readMediaInputAcceptedCommandListCommandParams);
+    readMediaInputInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readMediaInputAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readMediaInputAttributeListCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readMediaInputAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .readNumberOfWeeklyTransitionsAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.MediaInputCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.MediaInputCluster.AttributeListAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThermostatNumberOfWeeklyTransitionsCommandParams);
-    readThermostatInteractionInfo.put(
-        "readNumberOfWeeklyTransitionsAttribute",
-        readThermostatNumberOfWeeklyTransitionsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThermostatNumberOfDailyTransitionsCommandParams =
+            () -> new ClusterInfoMapping.DelegatedMediaInputClusterAttributeListAttributeCallback(),
+            readMediaInputAttributeListCommandParams);
+    readMediaInputInteractionInfo.put(
+        "readAttributeListAttribute", readMediaInputAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readMediaInputFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThermostatNumberOfDailyTransitionsAttributeInteractionInfo =
+    InteractionInfo readMediaInputFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .readNumberOfDailyTransitionsAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.MediaInputCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readMediaInputFeatureMapCommandParams);
+    readMediaInputInteractionInfo.put(
+        "readFeatureMapAttribute", readMediaInputFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readMediaInputClusterRevisionCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readMediaInputClusterRevisionAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.MediaInputCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThermostatNumberOfDailyTransitionsCommandParams);
-    readThermostatInteractionInfo.put(
-        "readNumberOfDailyTransitionsAttribute",
-        readThermostatNumberOfDailyTransitionsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThermostatAttributeListCommandParams =
+            readMediaInputClusterRevisionCommandParams);
+    readMediaInputInteractionInfo.put(
+        "readClusterRevisionAttribute", readMediaInputClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("mediaInput", readMediaInputInteractionInfo);
+    Map<String, InteractionInfo> readLowPowerInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readLowPowerGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThermostatAttributeListAttributeInteractionInfo =
+    InteractionInfo readLowPowerGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
+              ((ChipClusters.LowPowerCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.LowPowerCluster.GeneratedCommandListAttributeCallback)
+                          callback);
+            },
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedLowPowerClusterGeneratedCommandListAttributeCallback(),
+            readLowPowerGeneratedCommandListCommandParams);
+    readLowPowerInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readLowPowerGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readLowPowerAcceptedCommandListCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readLowPowerAcceptedCommandListAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.LowPowerCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.LowPowerCluster.AcceptedCommandListAttributeCallback) callback);
+            },
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedLowPowerClusterAcceptedCommandListAttributeCallback(),
+            readLowPowerAcceptedCommandListCommandParams);
+    readLowPowerInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readLowPowerAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readLowPowerAttributeListCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readLowPowerAttributeListAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.LowPowerCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.ThermostatCluster.AttributeListAttributeCallback) callback);
+                      (ChipClusters.LowPowerCluster.AttributeListAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedThermostatClusterAttributeListAttributeCallback(),
-            readThermostatAttributeListCommandParams);
-    readThermostatInteractionInfo.put(
-        "readAttributeListAttribute", readThermostatAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThermostatFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLowPowerClusterAttributeListAttributeCallback(),
+            readLowPowerAttributeListCommandParams);
+    readLowPowerInteractionInfo.put(
+        "readAttributeListAttribute", readLowPowerAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readLowPowerFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThermostatFeatureMapAttributeInteractionInfo =
+    InteractionInfo readLowPowerFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
+              ((ChipClusters.LowPowerCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThermostatFeatureMapCommandParams);
-    readThermostatInteractionInfo.put(
-        "readFeatureMapAttribute", readThermostatFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThermostatClusterRevisionCommandParams =
+            readLowPowerFeatureMapCommandParams);
+    readLowPowerInteractionInfo.put(
+        "readFeatureMapAttribute", readLowPowerFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readLowPowerClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThermostatClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readLowPowerClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
+              ((ChipClusters.LowPowerCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThermostatClusterRevisionCommandParams);
-    readThermostatInteractionInfo.put(
-        "readClusterRevisionAttribute", readThermostatClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("thermostat", readThermostatInteractionInfo);
-    Map<String, InteractionInfo> readThermostatUserInterfaceConfigurationInteractionInfo =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo>
-        readThermostatUserInterfaceConfigurationTemperatureDisplayModeCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo
-        readThermostatUserInterfaceConfigurationTemperatureDisplayModeAttributeInteractionInfo =
-            new InteractionInfo(
-                (cluster, callback, commandArguments) -> {
-                  ((ChipClusters.ThermostatUserInterfaceConfigurationCluster) cluster)
-                      .readTemperatureDisplayModeAttribute(
-                          (ChipClusters.IntegerAttributeCallback) callback);
-                },
-                () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-                readThermostatUserInterfaceConfigurationTemperatureDisplayModeCommandParams);
-    readThermostatUserInterfaceConfigurationInteractionInfo.put(
-        "readTemperatureDisplayModeAttribute",
-        readThermostatUserInterfaceConfigurationTemperatureDisplayModeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readThermostatUserInterfaceConfigurationKeypadLockoutCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThermostatUserInterfaceConfigurationKeypadLockoutAttributeInteractionInfo =
+            readLowPowerClusterRevisionCommandParams);
+    readLowPowerInteractionInfo.put(
+        "readClusterRevisionAttribute", readLowPowerClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("lowPower", readLowPowerInteractionInfo);
+    Map<String, InteractionInfo> readKeypadInputInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readKeypadInputGeneratedCommandListCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readKeypadInputGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatUserInterfaceConfigurationCluster) cluster)
-                  .readKeypadLockoutAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.KeypadInputCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.KeypadInputCluster.GeneratedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThermostatUserInterfaceConfigurationKeypadLockoutCommandParams);
-    readThermostatUserInterfaceConfigurationInteractionInfo.put(
-        "readKeypadLockoutAttribute",
-        readThermostatUserInterfaceConfigurationKeypadLockoutAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo
-        readThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityAttributeInteractionInfo =
-            new InteractionInfo(
-                (cluster, callback, commandArguments) -> {
-                  ((ChipClusters.ThermostatUserInterfaceConfigurationCluster) cluster)
-                      .readScheduleProgrammingVisibilityAttribute(
-                          (ChipClusters.IntegerAttributeCallback) callback);
-                },
-                () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-                readThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityCommandParams);
-    readThermostatUserInterfaceConfigurationInteractionInfo.put(
-        "readScheduleProgrammingVisibilityAttribute",
-        readThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readThermostatUserInterfaceConfigurationGeneratedCommandListCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo
-        readThermostatUserInterfaceConfigurationGeneratedCommandListAttributeInteractionInfo =
-            new InteractionInfo(
-                (cluster, callback, commandArguments) -> {
-                  ((ChipClusters.ThermostatUserInterfaceConfigurationCluster) cluster)
-                      .readGeneratedCommandListAttribute(
-                          (ChipClusters.ThermostatUserInterfaceConfigurationCluster
-                                  .GeneratedCommandListAttributeCallback)
-                              callback);
-                },
-                () ->
-                    new ClusterInfoMapping
-                        .DelegatedThermostatUserInterfaceConfigurationClusterGeneratedCommandListAttributeCallback(),
-                readThermostatUserInterfaceConfigurationGeneratedCommandListCommandParams);
-    readThermostatUserInterfaceConfigurationInteractionInfo.put(
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedKeypadInputClusterGeneratedCommandListAttributeCallback(),
+            readKeypadInputGeneratedCommandListCommandParams);
+    readKeypadInputInteractionInfo.put(
         "readGeneratedCommandListAttribute",
-        readThermostatUserInterfaceConfigurationGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readThermostatUserInterfaceConfigurationAcceptedCommandListCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo
-        readThermostatUserInterfaceConfigurationAcceptedCommandListAttributeInteractionInfo =
-            new InteractionInfo(
-                (cluster, callback, commandArguments) -> {
-                  ((ChipClusters.ThermostatUserInterfaceConfigurationCluster) cluster)
-                      .readAcceptedCommandListAttribute(
-                          (ChipClusters.ThermostatUserInterfaceConfigurationCluster
-                                  .AcceptedCommandListAttributeCallback)
-                              callback);
-                },
-                () ->
-                    new ClusterInfoMapping
-                        .DelegatedThermostatUserInterfaceConfigurationClusterAcceptedCommandListAttributeCallback(),
-                readThermostatUserInterfaceConfigurationAcceptedCommandListCommandParams);
-    readThermostatUserInterfaceConfigurationInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readThermostatUserInterfaceConfigurationAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readThermostatUserInterfaceConfigurationAttributeListCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThermostatUserInterfaceConfigurationAttributeListAttributeInteractionInfo =
+        readKeypadInputGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readKeypadInputAcceptedCommandListCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readKeypadInputAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatUserInterfaceConfigurationCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.ThermostatUserInterfaceConfigurationCluster
-                              .AttributeListAttributeCallback)
+              ((ChipClusters.KeypadInputCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.KeypadInputCluster.AcceptedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedThermostatUserInterfaceConfigurationClusterAttributeListAttributeCallback(),
-            readThermostatUserInterfaceConfigurationAttributeListCommandParams);
-    readThermostatUserInterfaceConfigurationInteractionInfo.put(
-        "readAttributeListAttribute",
-        readThermostatUserInterfaceConfigurationAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readThermostatUserInterfaceConfigurationFeatureMapCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThermostatUserInterfaceConfigurationFeatureMapAttributeInteractionInfo =
+                    .DelegatedKeypadInputClusterAcceptedCommandListAttributeCallback(),
+            readKeypadInputAcceptedCommandListCommandParams);
+    readKeypadInputInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readKeypadInputAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readKeypadInputAttributeListCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readKeypadInputAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatUserInterfaceConfigurationCluster) cluster)
+              ((ChipClusters.KeypadInputCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.KeypadInputCluster.AttributeListAttributeCallback) callback);
+            },
+            () ->
+                new ClusterInfoMapping.DelegatedKeypadInputClusterAttributeListAttributeCallback(),
+            readKeypadInputAttributeListCommandParams);
+    readKeypadInputInteractionInfo.put(
+        "readAttributeListAttribute", readKeypadInputAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readKeypadInputFeatureMapCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readKeypadInputFeatureMapAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.KeypadInputCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThermostatUserInterfaceConfigurationFeatureMapCommandParams);
-    readThermostatUserInterfaceConfigurationInteractionInfo.put(
-        "readFeatureMapAttribute",
-        readThermostatUserInterfaceConfigurationFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readThermostatUserInterfaceConfigurationClusterRevisionCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo
-        readThermostatUserInterfaceConfigurationClusterRevisionAttributeInteractionInfo =
-            new InteractionInfo(
-                (cluster, callback, commandArguments) -> {
-                  ((ChipClusters.ThermostatUserInterfaceConfigurationCluster) cluster)
-                      .readClusterRevisionAttribute(
-                          (ChipClusters.IntegerAttributeCallback) callback);
-                },
-                () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-                readThermostatUserInterfaceConfigurationClusterRevisionCommandParams);
-    readThermostatUserInterfaceConfigurationInteractionInfo.put(
-        "readClusterRevisionAttribute",
-        readThermostatUserInterfaceConfigurationClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put(
-        "thermostatUserInterfaceConfiguration",
-        readThermostatUserInterfaceConfigurationInteractionInfo);
-    Map<String, InteractionInfo> readThreadNetworkDiagnosticsInteractionInfo =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsChannelCommandParams =
+            readKeypadInputFeatureMapCommandParams);
+    readKeypadInputInteractionInfo.put(
+        "readFeatureMapAttribute", readKeypadInputFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readKeypadInputClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsChannelAttributeInteractionInfo =
+    InteractionInfo readKeypadInputClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readChannelAttribute(
-                      (ChipClusters.ThreadNetworkDiagnosticsCluster.ChannelAttributeCallback)
-                          callback);
+              ((ChipClusters.KeypadInputCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThreadNetworkDiagnosticsChannelCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readChannelAttribute", readThreadNetworkDiagnosticsChannelAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRoutingRoleCommandParams =
+            readKeypadInputClusterRevisionCommandParams);
+    readKeypadInputInteractionInfo.put(
+        "readClusterRevisionAttribute", readKeypadInputClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("keypadInput", readKeypadInputInteractionInfo);
+    Map<String, InteractionInfo> readContentLauncherInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readContentLauncherAcceptHeaderCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsRoutingRoleAttributeInteractionInfo =
+    InteractionInfo readContentLauncherAcceptHeaderAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readRoutingRoleAttribute(
-                      (ChipClusters.ThreadNetworkDiagnosticsCluster.RoutingRoleAttributeCallback)
+              ((ChipClusters.ContentLauncherCluster) cluster)
+                  .readAcceptHeaderAttribute(
+                      (ChipClusters.ContentLauncherCluster.AcceptHeaderAttributeCallback) callback);
+            },
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedContentLauncherClusterAcceptHeaderAttributeCallback(),
+            readContentLauncherAcceptHeaderCommandParams);
+    readContentLauncherInteractionInfo.put(
+        "readAcceptHeaderAttribute", readContentLauncherAcceptHeaderAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readContentLauncherSupportedStreamingProtocolsCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readContentLauncherSupportedStreamingProtocolsAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ContentLauncherCluster) cluster)
+                  .readSupportedStreamingProtocolsAttribute(
+                      (ChipClusters.LongAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readContentLauncherSupportedStreamingProtocolsCommandParams);
+    readContentLauncherInteractionInfo.put(
+        "readSupportedStreamingProtocolsAttribute",
+        readContentLauncherSupportedStreamingProtocolsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readContentLauncherGeneratedCommandListCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readContentLauncherGeneratedCommandListAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ContentLauncherCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.ContentLauncherCluster.GeneratedCommandListAttributeCallback)
+                          callback);
+            },
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedContentLauncherClusterGeneratedCommandListAttributeCallback(),
+            readContentLauncherGeneratedCommandListCommandParams);
+    readContentLauncherInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readContentLauncherGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readContentLauncherAcceptedCommandListCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readContentLauncherAcceptedCommandListAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ContentLauncherCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.ContentLauncherCluster.AcceptedCommandListAttributeCallback)
+                          callback);
+            },
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedContentLauncherClusterAcceptedCommandListAttributeCallback(),
+            readContentLauncherAcceptedCommandListCommandParams);
+    readContentLauncherInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readContentLauncherAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readContentLauncherAttributeListCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readContentLauncherAttributeListAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ContentLauncherCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.ContentLauncherCluster.AttributeListAttributeCallback)
                           callback);
             },
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedContentLauncherClusterAttributeListAttributeCallback(),
+            readContentLauncherAttributeListCommandParams);
+    readContentLauncherInteractionInfo.put(
+        "readAttributeListAttribute", readContentLauncherAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readContentLauncherFeatureMapCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readContentLauncherFeatureMapAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ContentLauncherCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readContentLauncherFeatureMapCommandParams);
+    readContentLauncherInteractionInfo.put(
+        "readFeatureMapAttribute", readContentLauncherFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readContentLauncherClusterRevisionCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readContentLauncherClusterRevisionAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ContentLauncherCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+            },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThreadNetworkDiagnosticsRoutingRoleCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readRoutingRoleAttribute",
-        readThreadNetworkDiagnosticsRoutingRoleAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsNetworkNameCommandParams =
+            readContentLauncherClusterRevisionCommandParams);
+    readContentLauncherInteractionInfo.put(
+        "readClusterRevisionAttribute", readContentLauncherClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("contentLauncher", readContentLauncherInteractionInfo);
+    Map<String, InteractionInfo> readAudioOutputInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readAudioOutputOutputListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsNetworkNameAttributeInteractionInfo =
+    InteractionInfo readAudioOutputOutputListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readNetworkNameAttribute(
-                      (ChipClusters.ThreadNetworkDiagnosticsCluster.NetworkNameAttributeCallback)
-                          callback);
+              ((ChipClusters.AudioOutputCluster) cluster)
+                  .readOutputListAttribute(
+                      (ChipClusters.AudioOutputCluster.OutputListAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readThreadNetworkDiagnosticsNetworkNameCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readNetworkNameAttribute",
-        readThreadNetworkDiagnosticsNetworkNameAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsPanIdCommandParams =
+            () -> new ClusterInfoMapping.DelegatedAudioOutputClusterOutputListAttributeCallback(),
+            readAudioOutputOutputListCommandParams);
+    readAudioOutputInteractionInfo.put(
+        "readOutputListAttribute", readAudioOutputOutputListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readAudioOutputCurrentOutputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsPanIdAttributeInteractionInfo =
+    InteractionInfo readAudioOutputCurrentOutputAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readPanIdAttribute(
-                      (ChipClusters.ThreadNetworkDiagnosticsCluster.PanIdAttributeCallback)
-                          callback);
+              ((ChipClusters.AudioOutputCluster) cluster)
+                  .readCurrentOutputAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThreadNetworkDiagnosticsPanIdCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readPanIdAttribute", readThreadNetworkDiagnosticsPanIdAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsExtendedPanIdCommandParams =
+            readAudioOutputCurrentOutputCommandParams);
+    readAudioOutputInteractionInfo.put(
+        "readCurrentOutputAttribute", readAudioOutputCurrentOutputAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readAudioOutputGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsExtendedPanIdAttributeInteractionInfo =
+    InteractionInfo readAudioOutputGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readExtendedPanIdAttribute(
-                      (ChipClusters.ThreadNetworkDiagnosticsCluster.ExtendedPanIdAttributeCallback)
+              ((ChipClusters.AudioOutputCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.AudioOutputCluster.GeneratedCommandListAttributeCallback)
                           callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsExtendedPanIdCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readExtendedPanIdAttribute",
-        readThreadNetworkDiagnosticsExtendedPanIdAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsMeshLocalPrefixCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedAudioOutputClusterGeneratedCommandListAttributeCallback(),
+            readAudioOutputGeneratedCommandListCommandParams);
+    readAudioOutputInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readAudioOutputGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readAudioOutputAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsMeshLocalPrefixAttributeInteractionInfo =
+    InteractionInfo readAudioOutputAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readMeshLocalPrefixAttribute(
-                      (ChipClusters.ThreadNetworkDiagnosticsCluster
-                              .MeshLocalPrefixAttributeCallback)
+              ((ChipClusters.AudioOutputCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.AudioOutputCluster.AcceptedCommandListAttributeCallback)
                           callback);
             },
-            () -> new ClusterInfoMapping.DelegatedOctetStringAttributeCallback(),
-            readThreadNetworkDiagnosticsMeshLocalPrefixCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readMeshLocalPrefixAttribute",
-        readThreadNetworkDiagnosticsMeshLocalPrefixAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsOverrunCountCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedAudioOutputClusterAcceptedCommandListAttributeCallback(),
+            readAudioOutputAcceptedCommandListCommandParams);
+    readAudioOutputInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readAudioOutputAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readAudioOutputAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsOverrunCountAttributeInteractionInfo =
+    InteractionInfo readAudioOutputAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readOverrunCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.AudioOutputCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.AudioOutputCluster.AttributeListAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsOverrunCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readOverrunCountAttribute",
-        readThreadNetworkDiagnosticsOverrunCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsNeighborTableListCommandParams =
+            () ->
+                new ClusterInfoMapping.DelegatedAudioOutputClusterAttributeListAttributeCallback(),
+            readAudioOutputAttributeListCommandParams);
+    readAudioOutputInteractionInfo.put(
+        "readAttributeListAttribute", readAudioOutputAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readAudioOutputFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsNeighborTableListAttributeInteractionInfo =
+    InteractionInfo readAudioOutputFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readNeighborTableListAttribute(
-                      (ChipClusters.ThreadNetworkDiagnosticsCluster
-                              .NeighborTableListAttributeCallback)
-                          callback);
+              ((ChipClusters.AudioOutputCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedThreadNetworkDiagnosticsClusterNeighborTableListAttributeCallback(),
-            readThreadNetworkDiagnosticsNeighborTableListCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readNeighborTableListAttribute",
-        readThreadNetworkDiagnosticsNeighborTableListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRouteTableListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readAudioOutputFeatureMapCommandParams);
+    readAudioOutputInteractionInfo.put(
+        "readFeatureMapAttribute", readAudioOutputFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readAudioOutputClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsRouteTableListAttributeInteractionInfo =
+    InteractionInfo readAudioOutputClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readRouteTableListAttribute(
-                      (ChipClusters.ThreadNetworkDiagnosticsCluster.RouteTableListAttributeCallback)
-                          callback);
+              ((ChipClusters.AudioOutputCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedThreadNetworkDiagnosticsClusterRouteTableListAttributeCallback(),
-            readThreadNetworkDiagnosticsRouteTableListCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readRouteTableListAttribute",
-        readThreadNetworkDiagnosticsRouteTableListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsPartitionIdCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readAudioOutputClusterRevisionCommandParams);
+    readAudioOutputInteractionInfo.put(
+        "readClusterRevisionAttribute", readAudioOutputClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("audioOutput", readAudioOutputInteractionInfo);
+    Map<String, InteractionInfo> readApplicationLauncherInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readApplicationLauncherCatalogListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsPartitionIdAttributeInteractionInfo =
+    InteractionInfo readApplicationLauncherCatalogListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readPartitionIdAttribute(
-                      (ChipClusters.ThreadNetworkDiagnosticsCluster.PartitionIdAttributeCallback)
+              ((ChipClusters.ApplicationLauncherCluster) cluster)
+                  .readCatalogListAttribute(
+                      (ChipClusters.ApplicationLauncherCluster.CatalogListAttributeCallback)
                           callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsPartitionIdCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readPartitionIdAttribute",
-        readThreadNetworkDiagnosticsPartitionIdAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsWeightingCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedApplicationLauncherClusterCatalogListAttributeCallback(),
+            readApplicationLauncherCatalogListCommandParams);
+    readApplicationLauncherInteractionInfo.put(
+        "readCatalogListAttribute", readApplicationLauncherCatalogListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readApplicationLauncherGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsWeightingAttributeInteractionInfo =
+    InteractionInfo readApplicationLauncherGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readWeightingAttribute(
-                      (ChipClusters.ThreadNetworkDiagnosticsCluster.WeightingAttributeCallback)
+              ((ChipClusters.ApplicationLauncherCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.ApplicationLauncherCluster
+                              .GeneratedCommandListAttributeCallback)
                           callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThreadNetworkDiagnosticsWeightingCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readWeightingAttribute", readThreadNetworkDiagnosticsWeightingAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsDataVersionCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedApplicationLauncherClusterGeneratedCommandListAttributeCallback(),
+            readApplicationLauncherGeneratedCommandListCommandParams);
+    readApplicationLauncherInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readApplicationLauncherGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readApplicationLauncherAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsDataVersionAttributeInteractionInfo =
+    InteractionInfo readApplicationLauncherAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readDataVersionAttribute(
-                      (ChipClusters.ThreadNetworkDiagnosticsCluster.DataVersionAttributeCallback)
+              ((ChipClusters.ApplicationLauncherCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.ApplicationLauncherCluster.AcceptedCommandListAttributeCallback)
                           callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThreadNetworkDiagnosticsDataVersionCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readDataVersionAttribute",
-        readThreadNetworkDiagnosticsDataVersionAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsStableDataVersionCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedApplicationLauncherClusterAcceptedCommandListAttributeCallback(),
+            readApplicationLauncherAcceptedCommandListCommandParams);
+    readApplicationLauncherInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readApplicationLauncherAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readApplicationLauncherAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsStableDataVersionAttributeInteractionInfo =
+    InteractionInfo readApplicationLauncherAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readStableDataVersionAttribute(
-                      (ChipClusters.ThreadNetworkDiagnosticsCluster
-                              .StableDataVersionAttributeCallback)
+              ((ChipClusters.ApplicationLauncherCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.ApplicationLauncherCluster.AttributeListAttributeCallback)
                           callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThreadNetworkDiagnosticsStableDataVersionCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readStableDataVersionAttribute",
-        readThreadNetworkDiagnosticsStableDataVersionAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsLeaderRouterIdCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedApplicationLauncherClusterAttributeListAttributeCallback(),
+            readApplicationLauncherAttributeListCommandParams);
+    readApplicationLauncherInteractionInfo.put(
+        "readAttributeListAttribute", readApplicationLauncherAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readApplicationLauncherFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsLeaderRouterIdAttributeInteractionInfo =
+    InteractionInfo readApplicationLauncherFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readLeaderRouterIdAttribute(
-                      (ChipClusters.ThreadNetworkDiagnosticsCluster.LeaderRouterIdAttributeCallback)
-                          callback);
+              ((ChipClusters.ApplicationLauncherCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThreadNetworkDiagnosticsLeaderRouterIdCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readLeaderRouterIdAttribute",
-        readThreadNetworkDiagnosticsLeaderRouterIdAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsDetachedRoleCountCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readApplicationLauncherFeatureMapCommandParams);
+    readApplicationLauncherInteractionInfo.put(
+        "readFeatureMapAttribute", readApplicationLauncherFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readApplicationLauncherClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsDetachedRoleCountAttributeInteractionInfo =
+    InteractionInfo readApplicationLauncherClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readDetachedRoleCountAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ApplicationLauncherCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThreadNetworkDiagnosticsDetachedRoleCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readDetachedRoleCountAttribute",
-        readThreadNetworkDiagnosticsDetachedRoleCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsChildRoleCountCommandParams =
+            readApplicationLauncherClusterRevisionCommandParams);
+    readApplicationLauncherInteractionInfo.put(
+        "readClusterRevisionAttribute",
+        readApplicationLauncherClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("applicationLauncher", readApplicationLauncherInteractionInfo);
+    Map<String, InteractionInfo> readApplicationBasicInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readApplicationBasicVendorNameCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsChildRoleCountAttributeInteractionInfo =
+    InteractionInfo readApplicationBasicVendorNameAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readChildRoleCountAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ApplicationBasicCluster) cluster)
+                  .readVendorNameAttribute((ChipClusters.CharStringAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThreadNetworkDiagnosticsChildRoleCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readChildRoleCountAttribute",
-        readThreadNetworkDiagnosticsChildRoleCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRouterRoleCountCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readApplicationBasicVendorNameCommandParams);
+    readApplicationBasicInteractionInfo.put(
+        "readVendorNameAttribute", readApplicationBasicVendorNameAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readApplicationBasicVendorIDCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsRouterRoleCountAttributeInteractionInfo =
+    InteractionInfo readApplicationBasicVendorIDAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readRouterRoleCountAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ApplicationBasicCluster) cluster)
+                  .readVendorIDAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThreadNetworkDiagnosticsRouterRoleCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readRouterRoleCountAttribute",
-        readThreadNetworkDiagnosticsRouterRoleCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsLeaderRoleCountCommandParams =
+            readApplicationBasicVendorIDCommandParams);
+    readApplicationBasicInteractionInfo.put(
+        "readVendorIDAttribute", readApplicationBasicVendorIDAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readApplicationBasicApplicationNameCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsLeaderRoleCountAttributeInteractionInfo =
+    InteractionInfo readApplicationBasicApplicationNameAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readLeaderRoleCountAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ApplicationBasicCluster) cluster)
+                  .readApplicationNameAttribute(
+                      (ChipClusters.CharStringAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThreadNetworkDiagnosticsLeaderRoleCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readLeaderRoleCountAttribute",
-        readThreadNetworkDiagnosticsLeaderRoleCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsAttachAttemptCountCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readApplicationBasicApplicationNameCommandParams);
+    readApplicationBasicInteractionInfo.put(
+        "readApplicationNameAttribute",
+        readApplicationBasicApplicationNameAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readApplicationBasicProductIDCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsAttachAttemptCountAttributeInteractionInfo =
+    InteractionInfo readApplicationBasicProductIDAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readAttachAttemptCountAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ApplicationBasicCluster) cluster)
+                  .readProductIDAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThreadNetworkDiagnosticsAttachAttemptCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readAttachAttemptCountAttribute",
-        readThreadNetworkDiagnosticsAttachAttemptCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readThreadNetworkDiagnosticsPartitionIdChangeCountCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsPartitionIdChangeCountAttributeInteractionInfo =
+            readApplicationBasicProductIDCommandParams);
+    readApplicationBasicInteractionInfo.put(
+        "readProductIDAttribute", readApplicationBasicProductIDAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readApplicationBasicStatusCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readApplicationBasicStatusAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readPartitionIdChangeCountAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ApplicationBasicCluster) cluster)
+                  .readStatusAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThreadNetworkDiagnosticsPartitionIdChangeCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readPartitionIdChangeCountAttribute",
-        readThreadNetworkDiagnosticsPartitionIdChangeCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readThreadNetworkDiagnosticsBetterPartitionAttachAttemptCountCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo
-        readThreadNetworkDiagnosticsBetterPartitionAttachAttemptCountAttributeInteractionInfo =
-            new InteractionInfo(
-                (cluster, callback, commandArguments) -> {
-                  ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                      .readBetterPartitionAttachAttemptCountAttribute(
-                          (ChipClusters.IntegerAttributeCallback) callback);
-                },
-                () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-                readThreadNetworkDiagnosticsBetterPartitionAttachAttemptCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readBetterPartitionAttachAttemptCountAttribute",
-        readThreadNetworkDiagnosticsBetterPartitionAttachAttemptCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsParentChangeCountCommandParams =
+            readApplicationBasicStatusCommandParams);
+    readApplicationBasicInteractionInfo.put(
+        "readStatusAttribute", readApplicationBasicStatusAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readApplicationBasicApplicationVersionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsParentChangeCountAttributeInteractionInfo =
+    InteractionInfo readApplicationBasicApplicationVersionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readParentChangeCountAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.ApplicationBasicCluster) cluster)
+                  .readApplicationVersionAttribute(
+                      (ChipClusters.CharStringAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThreadNetworkDiagnosticsParentChangeCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readParentChangeCountAttribute",
-        readThreadNetworkDiagnosticsParentChangeCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsTxTotalCountCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readApplicationBasicApplicationVersionCommandParams);
+    readApplicationBasicInteractionInfo.put(
+        "readApplicationVersionAttribute",
+        readApplicationBasicApplicationVersionAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readApplicationBasicAllowedVendorListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsTxTotalCountAttributeInteractionInfo =
+    InteractionInfo readApplicationBasicAllowedVendorListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readTxTotalCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ApplicationBasicCluster) cluster)
+                  .readAllowedVendorListAttribute(
+                      (ChipClusters.ApplicationBasicCluster.AllowedVendorListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsTxTotalCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readTxTotalCountAttribute",
-        readThreadNetworkDiagnosticsTxTotalCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsTxUnicastCountCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedApplicationBasicClusterAllowedVendorListAttributeCallback(),
+            readApplicationBasicAllowedVendorListCommandParams);
+    readApplicationBasicInteractionInfo.put(
+        "readAllowedVendorListAttribute",
+        readApplicationBasicAllowedVendorListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readApplicationBasicGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsTxUnicastCountAttributeInteractionInfo =
+    InteractionInfo readApplicationBasicGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readTxUnicastCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ApplicationBasicCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.ApplicationBasicCluster.GeneratedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsTxUnicastCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readTxUnicastCountAttribute",
-        readThreadNetworkDiagnosticsTxUnicastCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsTxBroadcastCountCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedApplicationBasicClusterGeneratedCommandListAttributeCallback(),
+            readApplicationBasicGeneratedCommandListCommandParams);
+    readApplicationBasicInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readApplicationBasicGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readApplicationBasicAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsTxBroadcastCountAttributeInteractionInfo =
+    InteractionInfo readApplicationBasicAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readTxBroadcastCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ApplicationBasicCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.ApplicationBasicCluster.AcceptedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsTxBroadcastCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readTxBroadcastCountAttribute",
-        readThreadNetworkDiagnosticsTxBroadcastCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsTxAckRequestedCountCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedApplicationBasicClusterAcceptedCommandListAttributeCallback(),
+            readApplicationBasicAcceptedCommandListCommandParams);
+    readApplicationBasicInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readApplicationBasicAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readApplicationBasicAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsTxAckRequestedCountAttributeInteractionInfo =
+    InteractionInfo readApplicationBasicAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readTxAckRequestedCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ApplicationBasicCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.ApplicationBasicCluster.AttributeListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsTxAckRequestedCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readTxAckRequestedCountAttribute",
-        readThreadNetworkDiagnosticsTxAckRequestedCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsTxAckedCountCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedApplicationBasicClusterAttributeListAttributeCallback(),
+            readApplicationBasicAttributeListCommandParams);
+    readApplicationBasicInteractionInfo.put(
+        "readAttributeListAttribute", readApplicationBasicAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readApplicationBasicFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsTxAckedCountAttributeInteractionInfo =
+    InteractionInfo readApplicationBasicFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readTxAckedCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ApplicationBasicCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsTxAckedCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readTxAckedCountAttribute",
-        readThreadNetworkDiagnosticsTxAckedCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readThreadNetworkDiagnosticsTxNoAckRequestedCountCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsTxNoAckRequestedCountAttributeInteractionInfo =
+            readApplicationBasicFeatureMapCommandParams);
+    readApplicationBasicInteractionInfo.put(
+        "readFeatureMapAttribute", readApplicationBasicFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readApplicationBasicClusterRevisionCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readApplicationBasicClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readTxNoAckRequestedCountAttribute(
-                      (ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ApplicationBasicCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsTxNoAckRequestedCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readTxNoAckRequestedCountAttribute",
-        readThreadNetworkDiagnosticsTxNoAckRequestedCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsTxDataCountCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readApplicationBasicClusterRevisionCommandParams);
+    readApplicationBasicInteractionInfo.put(
+        "readClusterRevisionAttribute",
+        readApplicationBasicClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("applicationBasic", readApplicationBasicInteractionInfo);
+    Map<String, InteractionInfo> readAccountLoginInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readAccountLoginGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsTxDataCountAttributeInteractionInfo =
+    InteractionInfo readAccountLoginGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readTxDataCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.AccountLoginCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.AccountLoginCluster.GeneratedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsTxDataCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readTxDataCountAttribute",
-        readThreadNetworkDiagnosticsTxDataCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsTxDataPollCountCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedAccountLoginClusterGeneratedCommandListAttributeCallback(),
+            readAccountLoginGeneratedCommandListCommandParams);
+    readAccountLoginInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readAccountLoginGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readAccountLoginAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsTxDataPollCountAttributeInteractionInfo =
+    InteractionInfo readAccountLoginAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readTxDataPollCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.AccountLoginCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.AccountLoginCluster.AcceptedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsTxDataPollCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readTxDataPollCountAttribute",
-        readThreadNetworkDiagnosticsTxDataPollCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsTxBeaconCountCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedAccountLoginClusterAcceptedCommandListAttributeCallback(),
+            readAccountLoginAcceptedCommandListCommandParams);
+    readAccountLoginInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readAccountLoginAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readAccountLoginAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsTxBeaconCountAttributeInteractionInfo =
+    InteractionInfo readAccountLoginAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readTxBeaconCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.AccountLoginCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.AccountLoginCluster.AttributeListAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsTxBeaconCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readTxBeaconCountAttribute",
-        readThreadNetworkDiagnosticsTxBeaconCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readThreadNetworkDiagnosticsTxBeaconRequestCountCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsTxBeaconRequestCountAttributeInteractionInfo =
+            () ->
+                new ClusterInfoMapping.DelegatedAccountLoginClusterAttributeListAttributeCallback(),
+            readAccountLoginAttributeListCommandParams);
+    readAccountLoginInteractionInfo.put(
+        "readAttributeListAttribute", readAccountLoginAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readAccountLoginFeatureMapCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readAccountLoginFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readTxBeaconRequestCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.AccountLoginCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsTxBeaconRequestCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readTxBeaconRequestCountAttribute",
-        readThreadNetworkDiagnosticsTxBeaconRequestCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsTxOtherCountCommandParams =
+            readAccountLoginFeatureMapCommandParams);
+    readAccountLoginInteractionInfo.put(
+        "readFeatureMapAttribute", readAccountLoginFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readAccountLoginClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsTxOtherCountAttributeInteractionInfo =
+    InteractionInfo readAccountLoginClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readTxOtherCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.AccountLoginCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsTxOtherCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readTxOtherCountAttribute",
-        readThreadNetworkDiagnosticsTxOtherCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsTxRetryCountCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readAccountLoginClusterRevisionCommandParams);
+    readAccountLoginInteractionInfo.put(
+        "readClusterRevisionAttribute", readAccountLoginClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("accountLogin", readAccountLoginInteractionInfo);
+    Map<String, InteractionInfo> readElectricalMeasurementInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readElectricalMeasurementMeasurementTypeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsTxRetryCountAttributeInteractionInfo =
+    InteractionInfo readElectricalMeasurementMeasurementTypeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readTxRetryCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ElectricalMeasurementCluster) cluster)
+                  .readMeasurementTypeAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsTxRetryCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readTxRetryCountAttribute",
-        readThreadNetworkDiagnosticsTxRetryCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCountCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo
-        readThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCountAttributeInteractionInfo =
-            new InteractionInfo(
-                (cluster, callback, commandArguments) -> {
-                  ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                      .readTxDirectMaxRetryExpiryCountAttribute(
-                          (ChipClusters.LongAttributeCallback) callback);
-                },
-                () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-                readThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readTxDirectMaxRetryExpiryCountAttribute",
-        readThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCountCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo
-        readThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCountAttributeInteractionInfo =
-            new InteractionInfo(
-                (cluster, callback, commandArguments) -> {
-                  ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                      .readTxIndirectMaxRetryExpiryCountAttribute(
-                          (ChipClusters.LongAttributeCallback) callback);
-                },
-                () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-                readThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readTxIndirectMaxRetryExpiryCountAttribute",
-        readThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsTxErrCcaCountCommandParams =
+            readElectricalMeasurementMeasurementTypeCommandParams);
+    readElectricalMeasurementInteractionInfo.put(
+        "readMeasurementTypeAttribute",
+        readElectricalMeasurementMeasurementTypeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readElectricalMeasurementTotalActivePowerCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsTxErrCcaCountAttributeInteractionInfo =
+    InteractionInfo readElectricalMeasurementTotalActivePowerAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readTxErrCcaCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ElectricalMeasurementCluster) cluster)
+                  .readTotalActivePowerAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsTxErrCcaCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readTxErrCcaCountAttribute",
-        readThreadNetworkDiagnosticsTxErrCcaCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsTxErrAbortCountCommandParams =
+            readElectricalMeasurementTotalActivePowerCommandParams);
+    readElectricalMeasurementInteractionInfo.put(
+        "readTotalActivePowerAttribute",
+        readElectricalMeasurementTotalActivePowerAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readElectricalMeasurementRmsVoltageCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsTxErrAbortCountAttributeInteractionInfo =
+    InteractionInfo readElectricalMeasurementRmsVoltageAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readTxErrAbortCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ElectricalMeasurementCluster) cluster)
+                  .readRmsVoltageAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsTxErrAbortCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readTxErrAbortCountAttribute",
-        readThreadNetworkDiagnosticsTxErrAbortCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readThreadNetworkDiagnosticsTxErrBusyChannelCountCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsTxErrBusyChannelCountAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readElectricalMeasurementRmsVoltageCommandParams);
+    readElectricalMeasurementInteractionInfo.put(
+        "readRmsVoltageAttribute", readElectricalMeasurementRmsVoltageAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readElectricalMeasurementRmsVoltageMinCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readElectricalMeasurementRmsVoltageMinAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readTxErrBusyChannelCountAttribute(
-                      (ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ElectricalMeasurementCluster) cluster)
+                  .readRmsVoltageMinAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsTxErrBusyChannelCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readTxErrBusyChannelCountAttribute",
-        readThreadNetworkDiagnosticsTxErrBusyChannelCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRxTotalCountCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readElectricalMeasurementRmsVoltageMinCommandParams);
+    readElectricalMeasurementInteractionInfo.put(
+        "readRmsVoltageMinAttribute",
+        readElectricalMeasurementRmsVoltageMinAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readElectricalMeasurementRmsVoltageMaxCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsRxTotalCountAttributeInteractionInfo =
+    InteractionInfo readElectricalMeasurementRmsVoltageMaxAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readRxTotalCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ElectricalMeasurementCluster) cluster)
+                  .readRmsVoltageMaxAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsRxTotalCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readRxTotalCountAttribute",
-        readThreadNetworkDiagnosticsRxTotalCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRxUnicastCountCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readElectricalMeasurementRmsVoltageMaxCommandParams);
+    readElectricalMeasurementInteractionInfo.put(
+        "readRmsVoltageMaxAttribute",
+        readElectricalMeasurementRmsVoltageMaxAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readElectricalMeasurementRmsCurrentCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsRxUnicastCountAttributeInteractionInfo =
+    InteractionInfo readElectricalMeasurementRmsCurrentAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readRxUnicastCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ElectricalMeasurementCluster) cluster)
+                  .readRmsCurrentAttribute((ChipClusters.IntegerAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readElectricalMeasurementRmsCurrentCommandParams);
+    readElectricalMeasurementInteractionInfo.put(
+        "readRmsCurrentAttribute", readElectricalMeasurementRmsCurrentAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readElectricalMeasurementRmsCurrentMinCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readElectricalMeasurementRmsCurrentMinAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ElectricalMeasurementCluster) cluster)
+                  .readRmsCurrentMinAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsRxUnicastCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readRxUnicastCountAttribute",
-        readThreadNetworkDiagnosticsRxUnicastCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRxBroadcastCountCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readElectricalMeasurementRmsCurrentMinCommandParams);
+    readElectricalMeasurementInteractionInfo.put(
+        "readRmsCurrentMinAttribute",
+        readElectricalMeasurementRmsCurrentMinAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readElectricalMeasurementRmsCurrentMaxCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsRxBroadcastCountAttributeInteractionInfo =
+    InteractionInfo readElectricalMeasurementRmsCurrentMaxAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readRxBroadcastCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ElectricalMeasurementCluster) cluster)
+                  .readRmsCurrentMaxAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsRxBroadcastCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readRxBroadcastCountAttribute",
-        readThreadNetworkDiagnosticsRxBroadcastCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRxDataCountCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readElectricalMeasurementRmsCurrentMaxCommandParams);
+    readElectricalMeasurementInteractionInfo.put(
+        "readRmsCurrentMaxAttribute",
+        readElectricalMeasurementRmsCurrentMaxAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readElectricalMeasurementActivePowerCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsRxDataCountAttributeInteractionInfo =
+    InteractionInfo readElectricalMeasurementActivePowerAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readRxDataCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ElectricalMeasurementCluster) cluster)
+                  .readActivePowerAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsRxDataCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readRxDataCountAttribute",
-        readThreadNetworkDiagnosticsRxDataCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRxDataPollCountCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readElectricalMeasurementActivePowerCommandParams);
+    readElectricalMeasurementInteractionInfo.put(
+        "readActivePowerAttribute", readElectricalMeasurementActivePowerAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readElectricalMeasurementActivePowerMinCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsRxDataPollCountAttributeInteractionInfo =
+    InteractionInfo readElectricalMeasurementActivePowerMinAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readRxDataPollCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ElectricalMeasurementCluster) cluster)
+                  .readActivePowerMinAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsRxDataPollCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readRxDataPollCountAttribute",
-        readThreadNetworkDiagnosticsRxDataPollCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRxBeaconCountCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readElectricalMeasurementActivePowerMinCommandParams);
+    readElectricalMeasurementInteractionInfo.put(
+        "readActivePowerMinAttribute",
+        readElectricalMeasurementActivePowerMinAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readElectricalMeasurementActivePowerMaxCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsRxBeaconCountAttributeInteractionInfo =
+    InteractionInfo readElectricalMeasurementActivePowerMaxAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readRxBeaconCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ElectricalMeasurementCluster) cluster)
+                  .readActivePowerMaxAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsRxBeaconCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readRxBeaconCountAttribute",
-        readThreadNetworkDiagnosticsRxBeaconCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readThreadNetworkDiagnosticsRxBeaconRequestCountCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsRxBeaconRequestCountAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readElectricalMeasurementActivePowerMaxCommandParams);
+    readElectricalMeasurementInteractionInfo.put(
+        "readActivePowerMaxAttribute",
+        readElectricalMeasurementActivePowerMaxAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readElectricalMeasurementGeneratedCommandListCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readElectricalMeasurementGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readRxBeaconRequestCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ElectricalMeasurementCluster) cluster)
+                  .readGeneratedCommandListAttribute(
+                      (ChipClusters.ElectricalMeasurementCluster
+                              .GeneratedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsRxBeaconRequestCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readRxBeaconRequestCountAttribute",
-        readThreadNetworkDiagnosticsRxBeaconRequestCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRxOtherCountCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedElectricalMeasurementClusterGeneratedCommandListAttributeCallback(),
+            readElectricalMeasurementGeneratedCommandListCommandParams);
+    readElectricalMeasurementInteractionInfo.put(
+        "readGeneratedCommandListAttribute",
+        readElectricalMeasurementGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readElectricalMeasurementAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsRxOtherCountAttributeInteractionInfo =
+    InteractionInfo readElectricalMeasurementAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readRxOtherCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ElectricalMeasurementCluster) cluster)
+                  .readAcceptedCommandListAttribute(
+                      (ChipClusters.ElectricalMeasurementCluster
+                              .AcceptedCommandListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsRxOtherCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readRxOtherCountAttribute",
-        readThreadNetworkDiagnosticsRxOtherCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readThreadNetworkDiagnosticsRxAddressFilteredCountCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsRxAddressFilteredCountAttributeInteractionInfo =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedElectricalMeasurementClusterAcceptedCommandListAttributeCallback(),
+            readElectricalMeasurementAcceptedCommandListCommandParams);
+    readElectricalMeasurementInteractionInfo.put(
+        "readAcceptedCommandListAttribute",
+        readElectricalMeasurementAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readElectricalMeasurementAttributeListCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readElectricalMeasurementAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readRxAddressFilteredCountAttribute(
-                      (ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ElectricalMeasurementCluster) cluster)
+                  .readAttributeListAttribute(
+                      (ChipClusters.ElectricalMeasurementCluster.AttributeListAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsRxAddressFilteredCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readRxAddressFilteredCountAttribute",
-        readThreadNetworkDiagnosticsRxAddressFilteredCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readThreadNetworkDiagnosticsRxDestAddrFilteredCountCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsRxDestAddrFilteredCountAttributeInteractionInfo =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedElectricalMeasurementClusterAttributeListAttributeCallback(),
+            readElectricalMeasurementAttributeListCommandParams);
+    readElectricalMeasurementInteractionInfo.put(
+        "readAttributeListAttribute",
+        readElectricalMeasurementAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readElectricalMeasurementFeatureMapCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readElectricalMeasurementFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readRxDestAddrFilteredCountAttribute(
-                      (ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ElectricalMeasurementCluster) cluster)
+                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsRxDestAddrFilteredCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readRxDestAddrFilteredCountAttribute",
-        readThreadNetworkDiagnosticsRxDestAddrFilteredCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRxDuplicatedCountCommandParams =
+            readElectricalMeasurementFeatureMapCommandParams);
+    readElectricalMeasurementInteractionInfo.put(
+        "readFeatureMapAttribute", readElectricalMeasurementFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readElectricalMeasurementClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsRxDuplicatedCountAttributeInteractionInfo =
+    InteractionInfo readElectricalMeasurementClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readRxDuplicatedCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.ElectricalMeasurementCluster) cluster)
+                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsRxDuplicatedCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readRxDuplicatedCountAttribute",
-        readThreadNetworkDiagnosticsRxDuplicatedCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRxErrNoFrameCountCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readElectricalMeasurementClusterRevisionCommandParams);
+    readElectricalMeasurementInteractionInfo.put(
+        "readClusterRevisionAttribute",
+        readElectricalMeasurementClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("electricalMeasurement", readElectricalMeasurementInteractionInfo);
+    Map<String, InteractionInfo> readTestClusterInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> readTestClusterBooleanCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsRxErrNoFrameCountAttributeInteractionInfo =
+    InteractionInfo readTestClusterBooleanAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readRxErrNoFrameCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readBooleanAttribute((ChipClusters.BooleanAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsRxErrNoFrameCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readRxErrNoFrameCountAttribute",
-        readThreadNetworkDiagnosticsRxErrNoFrameCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readThreadNetworkDiagnosticsRxErrUnknownNeighborCountCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsRxErrUnknownNeighborCountAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readTestClusterBooleanCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readBooleanAttribute", readTestClusterBooleanAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterBitmap8CommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readTestClusterBitmap8AttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readRxErrUnknownNeighborCountAttribute(
-                      (ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readBitmap8Attribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsRxErrUnknownNeighborCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readRxErrUnknownNeighborCountAttribute",
-        readThreadNetworkDiagnosticsRxErrUnknownNeighborCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readThreadNetworkDiagnosticsRxErrInvalidSrcAddrCountCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsRxErrInvalidSrcAddrCountAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readTestClusterBitmap8CommandParams);
+    readTestClusterInteractionInfo.put(
+        "readBitmap8Attribute", readTestClusterBitmap8AttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterBitmap16CommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readTestClusterBitmap16AttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readRxErrInvalidSrcAddrCountAttribute(
-                      (ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readBitmap16Attribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsRxErrInvalidSrcAddrCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readRxErrInvalidSrcAddrCountAttribute",
-        readThreadNetworkDiagnosticsRxErrInvalidSrcAddrCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRxErrSecCountCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readTestClusterBitmap16CommandParams);
+    readTestClusterInteractionInfo.put(
+        "readBitmap16Attribute", readTestClusterBitmap16AttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterBitmap32CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsRxErrSecCountAttributeInteractionInfo =
+    InteractionInfo readTestClusterBitmap32AttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readRxErrSecCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readBitmap32Attribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsRxErrSecCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readRxErrSecCountAttribute",
-        readThreadNetworkDiagnosticsRxErrSecCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRxErrFcsCountCommandParams =
+            readTestClusterBitmap32CommandParams);
+    readTestClusterInteractionInfo.put(
+        "readBitmap32Attribute", readTestClusterBitmap32AttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterBitmap64CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsRxErrFcsCountAttributeInteractionInfo =
+    InteractionInfo readTestClusterBitmap64AttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readRxErrFcsCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readBitmap64Attribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsRxErrFcsCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readRxErrFcsCountAttribute",
-        readThreadNetworkDiagnosticsRxErrFcsCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsRxErrOtherCountCommandParams =
+            readTestClusterBitmap64CommandParams);
+    readTestClusterInteractionInfo.put(
+        "readBitmap64Attribute", readTestClusterBitmap64AttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterInt8uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsRxErrOtherCountAttributeInteractionInfo =
+    InteractionInfo readTestClusterInt8uAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readRxErrOtherCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readInt8uAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsRxErrOtherCountCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readRxErrOtherCountAttribute",
-        readThreadNetworkDiagnosticsRxErrOtherCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsActiveTimestampCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readTestClusterInt8uCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readInt8uAttribute", readTestClusterInt8uAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterInt16uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsActiveTimestampAttributeInteractionInfo =
+    InteractionInfo readTestClusterInt16uAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readActiveTimestampAttribute(
-                      (ChipClusters.ThreadNetworkDiagnosticsCluster
-                              .ActiveTimestampAttributeCallback)
-                          callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readInt16uAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsActiveTimestampCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readActiveTimestampAttribute",
-        readThreadNetworkDiagnosticsActiveTimestampAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsPendingTimestampCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readTestClusterInt16uCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readInt16uAttribute", readTestClusterInt16uAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterInt24uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsPendingTimestampAttributeInteractionInfo =
+    InteractionInfo readTestClusterInt24uAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readPendingTimestampAttribute(
-                      (ChipClusters.ThreadNetworkDiagnosticsCluster
-                              .PendingTimestampAttributeCallback)
-                          callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readInt24uAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsPendingTimestampCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readPendingTimestampAttribute",
-        readThreadNetworkDiagnosticsPendingTimestampAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsDelayCommandParams =
+            readTestClusterInt24uCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readInt24uAttribute", readTestClusterInt24uAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterInt32uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsDelayAttributeInteractionInfo =
+    InteractionInfo readTestClusterInt32uAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readDelayAttribute(
-                      (ChipClusters.ThreadNetworkDiagnosticsCluster.DelayAttributeCallback)
-                          callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readInt32uAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsDelayCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readDelayAttribute", readThreadNetworkDiagnosticsDelayAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsChannelMaskCommandParams =
+            readTestClusterInt32uCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readInt32uAttribute", readTestClusterInt32uAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterInt40uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsChannelMaskAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readChannelMaskAttribute(
-                      (ChipClusters.ThreadNetworkDiagnosticsCluster.ChannelMaskAttributeCallback)
-                          callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedOctetStringAttributeCallback(),
-            readThreadNetworkDiagnosticsChannelMaskCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readChannelMaskAttribute",
-        readThreadNetworkDiagnosticsChannelMaskAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readThreadNetworkDiagnosticsActiveNetworkFaultsListCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeInteractionInfo =
+    InteractionInfo readTestClusterInt40uAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readActiveNetworkFaultsListAttribute(
-                      (ChipClusters.ThreadNetworkDiagnosticsCluster
-                              .ActiveNetworkFaultsListAttributeCallback)
-                          callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readInt40uAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedThreadNetworkDiagnosticsClusterActiveNetworkFaultsListAttributeCallback(),
-            readThreadNetworkDiagnosticsActiveNetworkFaultsListCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readActiveNetworkFaultsListAttribute",
-        readThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readThreadNetworkDiagnosticsGeneratedCommandListCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsGeneratedCommandListAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readTestClusterInt40uCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readInt40uAttribute", readTestClusterInt40uAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterInt48uCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readTestClusterInt48uAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.ThreadNetworkDiagnosticsCluster
-                              .GeneratedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readInt48uAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedThreadNetworkDiagnosticsClusterGeneratedCommandListAttributeCallback(),
-            readThreadNetworkDiagnosticsGeneratedCommandListCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readThreadNetworkDiagnosticsGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsAcceptedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readTestClusterInt48uCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readInt48uAttribute", readTestClusterInt48uAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterInt56uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readTestClusterInt56uAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.ThreadNetworkDiagnosticsCluster
-                              .AcceptedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readInt56uAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedThreadNetworkDiagnosticsClusterAcceptedCommandListAttributeCallback(),
-            readThreadNetworkDiagnosticsAcceptedCommandListCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readThreadNetworkDiagnosticsAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsAttributeListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readTestClusterInt56uCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readInt56uAttribute", readTestClusterInt56uAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterInt64uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsAttributeListAttributeInteractionInfo =
+    InteractionInfo readTestClusterInt64uAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.ThreadNetworkDiagnosticsCluster.AttributeListAttributeCallback)
-                          callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readInt64uAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedThreadNetworkDiagnosticsClusterAttributeListAttributeCallback(),
-            readThreadNetworkDiagnosticsAttributeListCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readAttributeListAttribute",
-        readThreadNetworkDiagnosticsAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readTestClusterInt64uCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readInt64uAttribute", readTestClusterInt64uAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterInt8sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsFeatureMapAttributeInteractionInfo =
+    InteractionInfo readTestClusterInt8sAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readInt8sAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readThreadNetworkDiagnosticsFeatureMapCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readFeatureMapAttribute", readThreadNetworkDiagnosticsFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readThreadNetworkDiagnosticsClusterRevisionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readTestClusterInt8sCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readInt8sAttribute", readTestClusterInt8sAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterInt16sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readThreadNetworkDiagnosticsClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readTestClusterInt16sAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readInt16sAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readThreadNetworkDiagnosticsClusterRevisionCommandParams);
-    readThreadNetworkDiagnosticsInteractionInfo.put(
-        "readClusterRevisionAttribute",
-        readThreadNetworkDiagnosticsClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("threadNetworkDiagnostics", readThreadNetworkDiagnosticsInteractionInfo);
-    Map<String, InteractionInfo> readTimeFormatLocalizationInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readTimeFormatLocalizationHourFormatCommandParams =
+            readTestClusterInt16sCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readInt16sAttribute", readTestClusterInt16sAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterInt24sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTimeFormatLocalizationHourFormatAttributeInteractionInfo =
+    InteractionInfo readTestClusterInt24sAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TimeFormatLocalizationCluster) cluster)
-                  .readHourFormatAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readInt24sAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTimeFormatLocalizationHourFormatCommandParams);
-    readTimeFormatLocalizationInteractionInfo.put(
-        "readHourFormatAttribute", readTimeFormatLocalizationHourFormatAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTimeFormatLocalizationActiveCalendarTypeCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readTestClusterInt24sCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readInt24sAttribute", readTestClusterInt24sAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterInt32sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTimeFormatLocalizationActiveCalendarTypeAttributeInteractionInfo =
+    InteractionInfo readTestClusterInt32sAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TimeFormatLocalizationCluster) cluster)
-                  .readActiveCalendarTypeAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readInt32sAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTimeFormatLocalizationActiveCalendarTypeCommandParams);
-    readTimeFormatLocalizationInteractionInfo.put(
-        "readActiveCalendarTypeAttribute",
-        readTimeFormatLocalizationActiveCalendarTypeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readTimeFormatLocalizationSupportedCalendarTypesCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTimeFormatLocalizationSupportedCalendarTypesAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readTestClusterInt32sCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readInt32sAttribute", readTestClusterInt32sAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterInt40sCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readTestClusterInt40sAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TimeFormatLocalizationCluster) cluster)
-                  .readSupportedCalendarTypesAttribute(
-                      (ChipClusters.TimeFormatLocalizationCluster
-                              .SupportedCalendarTypesAttributeCallback)
-                          callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readInt40sAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedTimeFormatLocalizationClusterSupportedCalendarTypesAttributeCallback(),
-            readTimeFormatLocalizationSupportedCalendarTypesCommandParams);
-    readTimeFormatLocalizationInteractionInfo.put(
-        "readSupportedCalendarTypesAttribute",
-        readTimeFormatLocalizationSupportedCalendarTypesAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTimeFormatLocalizationGeneratedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readTestClusterInt40sCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readInt40sAttribute", readTestClusterInt40sAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterInt48sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTimeFormatLocalizationGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readTestClusterInt48sAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TimeFormatLocalizationCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.TimeFormatLocalizationCluster
-                              .GeneratedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readInt48sAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedTimeFormatLocalizationClusterGeneratedCommandListAttributeCallback(),
-            readTimeFormatLocalizationGeneratedCommandListCommandParams);
-    readTimeFormatLocalizationInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readTimeFormatLocalizationGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTimeFormatLocalizationAcceptedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readTestClusterInt48sCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readInt48sAttribute", readTestClusterInt48sAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterInt56sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTimeFormatLocalizationAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readTestClusterInt56sAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TimeFormatLocalizationCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.TimeFormatLocalizationCluster
-                              .AcceptedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readInt56sAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedTimeFormatLocalizationClusterAcceptedCommandListAttributeCallback(),
-            readTimeFormatLocalizationAcceptedCommandListCommandParams);
-    readTimeFormatLocalizationInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readTimeFormatLocalizationAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTimeFormatLocalizationFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readTestClusterInt56sCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readInt56sAttribute", readTestClusterInt56sAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterInt64sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTimeFormatLocalizationFeatureMapAttributeInteractionInfo =
+    InteractionInfo readTestClusterInt64sAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TimeFormatLocalizationCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readInt64sAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readTimeFormatLocalizationFeatureMapCommandParams);
-    readTimeFormatLocalizationInteractionInfo.put(
-        "readFeatureMapAttribute", readTimeFormatLocalizationFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readTimeFormatLocalizationClusterRevisionCommandParams =
+            readTestClusterInt64sCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readInt64sAttribute", readTestClusterInt64sAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterEnum8CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readTimeFormatLocalizationClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readTestClusterEnum8AttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TimeFormatLocalizationCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readEnum8Attribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readTimeFormatLocalizationClusterRevisionCommandParams);
-    readTimeFormatLocalizationInteractionInfo.put(
-        "readClusterRevisionAttribute",
-        readTimeFormatLocalizationClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("timeFormatLocalization", readTimeFormatLocalizationInteractionInfo);
-    Map<String, InteractionInfo> readUnitLocalizationInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readUnitLocalizationTemperatureUnitCommandParams =
+            readTestClusterEnum8CommandParams);
+    readTestClusterInteractionInfo.put(
+        "readEnum8Attribute", readTestClusterEnum8AttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterEnum16CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readUnitLocalizationTemperatureUnitAttributeInteractionInfo =
+    InteractionInfo readTestClusterEnum16AttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.UnitLocalizationCluster) cluster)
-                  .readTemperatureUnitAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readEnum16Attribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readUnitLocalizationTemperatureUnitCommandParams);
-    readUnitLocalizationInteractionInfo.put(
-        "readTemperatureUnitAttribute",
-        readUnitLocalizationTemperatureUnitAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readUnitLocalizationAttributeListCommandParams =
+            readTestClusterEnum16CommandParams);
+    readTestClusterInteractionInfo.put(
+        "readEnum16Attribute", readTestClusterEnum16AttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterFloatSingleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readUnitLocalizationAttributeListAttributeInteractionInfo =
+    InteractionInfo readTestClusterFloatSingleAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.UnitLocalizationCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.UnitLocalizationCluster.AttributeListAttributeCallback)
-                          callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readFloatSingleAttribute((ChipClusters.FloatAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedUnitLocalizationClusterAttributeListAttributeCallback(),
-            readUnitLocalizationAttributeListCommandParams);
-    readUnitLocalizationInteractionInfo.put(
-        "readAttributeListAttribute", readUnitLocalizationAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readUnitLocalizationFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedFloatAttributeCallback(),
+            readTestClusterFloatSingleCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readFloatSingleAttribute", readTestClusterFloatSingleAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterFloatDoubleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readUnitLocalizationFeatureMapAttributeInteractionInfo =
+    InteractionInfo readTestClusterFloatDoubleAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.UnitLocalizationCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readFloatDoubleAttribute((ChipClusters.DoubleAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readUnitLocalizationFeatureMapCommandParams);
-    readUnitLocalizationInteractionInfo.put(
-        "readFeatureMapAttribute", readUnitLocalizationFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readUnitLocalizationClusterRevisionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedDoubleAttributeCallback(),
+            readTestClusterFloatDoubleCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readFloatDoubleAttribute", readTestClusterFloatDoubleAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterOctetStringCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readUnitLocalizationClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readTestClusterOctetStringAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.UnitLocalizationCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readOctetStringAttribute((ChipClusters.OctetStringAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readUnitLocalizationClusterRevisionCommandParams);
-    readUnitLocalizationInteractionInfo.put(
-        "readClusterRevisionAttribute",
-        readUnitLocalizationClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("unitLocalization", readUnitLocalizationInteractionInfo);
-    Map<String, InteractionInfo> readUserLabelInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readUserLabelLabelListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedOctetStringAttributeCallback(),
+            readTestClusterOctetStringCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readOctetStringAttribute", readTestClusterOctetStringAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterListInt8uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readUserLabelLabelListAttributeInteractionInfo =
+    InteractionInfo readTestClusterListInt8uAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.UserLabelCluster) cluster)
-                  .readLabelListAttribute(
-                      (ChipClusters.UserLabelCluster.LabelListAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readListInt8uAttribute(
+                      (ChipClusters.TestClusterCluster.ListInt8uAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedUserLabelClusterLabelListAttributeCallback(),
-            readUserLabelLabelListCommandParams);
-    readUserLabelInteractionInfo.put(
-        "readLabelListAttribute", readUserLabelLabelListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readUserLabelGeneratedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedTestClusterClusterListInt8uAttributeCallback(),
+            readTestClusterListInt8uCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readListInt8uAttribute", readTestClusterListInt8uAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterListOctetStringCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readUserLabelGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readTestClusterListOctetStringAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.UserLabelCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.UserLabelCluster.GeneratedCommandListAttributeCallback)
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readListOctetStringAttribute(
+                      (ChipClusters.TestClusterCluster.ListOctetStringAttributeCallback) callback);
+            },
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedTestClusterClusterListOctetStringAttributeCallback(),
+            readTestClusterListOctetStringCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readListOctetStringAttribute", readTestClusterListOctetStringAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterListStructOctetStringCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readTestClusterListStructOctetStringAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readListStructOctetStringAttribute(
+                      (ChipClusters.TestClusterCluster.ListStructOctetStringAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedUserLabelClusterGeneratedCommandListAttributeCallback(),
-            readUserLabelGeneratedCommandListCommandParams);
-    readUserLabelInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readUserLabelGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readUserLabelAcceptedCommandListCommandParams =
+                    .DelegatedTestClusterClusterListStructOctetStringAttributeCallback(),
+            readTestClusterListStructOctetStringCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readListStructOctetStringAttribute",
+        readTestClusterListStructOctetStringAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterLongOctetStringCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readTestClusterLongOctetStringAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readLongOctetStringAttribute(
+                      (ChipClusters.OctetStringAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedOctetStringAttributeCallback(),
+            readTestClusterLongOctetStringCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readLongOctetStringAttribute", readTestClusterLongOctetStringAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterCharStringCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readUserLabelAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readTestClusterCharStringAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.UserLabelCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.UserLabelCluster.AcceptedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readCharStringAttribute((ChipClusters.CharStringAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedUserLabelClusterAcceptedCommandListAttributeCallback(),
-            readUserLabelAcceptedCommandListCommandParams);
-    readUserLabelInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readUserLabelAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readUserLabelFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readTestClusterCharStringCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readCharStringAttribute", readTestClusterCharStringAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterLongCharStringCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readUserLabelFeatureMapAttributeInteractionInfo =
+    InteractionInfo readTestClusterLongCharStringAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.UserLabelCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readLongCharStringAttribute((ChipClusters.CharStringAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readUserLabelFeatureMapCommandParams);
-    readUserLabelInteractionInfo.put(
-        "readFeatureMapAttribute", readUserLabelFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readUserLabelClusterRevisionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readTestClusterLongCharStringCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readLongCharStringAttribute", readTestClusterLongCharStringAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterEpochUsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readUserLabelClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readTestClusterEpochUsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.UserLabelCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readEpochUsAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readUserLabelClusterRevisionCommandParams);
-    readUserLabelInteractionInfo.put(
-        "readClusterRevisionAttribute", readUserLabelClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("userLabel", readUserLabelInteractionInfo);
-    Map<String, InteractionInfo> readWakeOnLanInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readWakeOnLanMACAddressCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readTestClusterEpochUsCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readEpochUsAttribute", readTestClusterEpochUsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterEpochSCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWakeOnLanMACAddressAttributeInteractionInfo =
+    InteractionInfo readTestClusterEpochSAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WakeOnLanCluster) cluster)
-                  .readMACAddressAttribute((ChipClusters.CharStringAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readEpochSAttribute((ChipClusters.LongAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
-            readWakeOnLanMACAddressCommandParams);
-    readWakeOnLanInteractionInfo.put(
-        "readMACAddressAttribute", readWakeOnLanMACAddressAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWakeOnLanGeneratedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readTestClusterEpochSCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readEpochSAttribute", readTestClusterEpochSAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterVendorIdCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWakeOnLanGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readTestClusterVendorIdAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WakeOnLanCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.WakeOnLanCluster.GeneratedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readVendorIdAttribute(
+                      (ChipClusters.TestClusterCluster.VendorIdAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedWakeOnLanClusterGeneratedCommandListAttributeCallback(),
-            readWakeOnLanGeneratedCommandListCommandParams);
-    readWakeOnLanInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readWakeOnLanGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWakeOnLanAcceptedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readTestClusterVendorIdCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readVendorIdAttribute", readTestClusterVendorIdAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterListNullablesAndOptionalsStructCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWakeOnLanAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readTestClusterListNullablesAndOptionalsStructAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WakeOnLanCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.WakeOnLanCluster.AcceptedCommandListAttributeCallback)
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readListNullablesAndOptionalsStructAttribute(
+                      (ChipClusters.TestClusterCluster
+                              .ListNullablesAndOptionalsStructAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedWakeOnLanClusterAcceptedCommandListAttributeCallback(),
-            readWakeOnLanAcceptedCommandListCommandParams);
-    readWakeOnLanInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readWakeOnLanAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWakeOnLanAttributeListCommandParams =
+                    .DelegatedTestClusterClusterListNullablesAndOptionalsStructAttributeCallback(),
+            readTestClusterListNullablesAndOptionalsStructCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readListNullablesAndOptionalsStructAttribute",
+        readTestClusterListNullablesAndOptionalsStructAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterEnumAttrCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWakeOnLanAttributeListAttributeInteractionInfo =
+    InteractionInfo readTestClusterEnumAttrAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WakeOnLanCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.WakeOnLanCluster.AttributeListAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readEnumAttrAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedWakeOnLanClusterAttributeListAttributeCallback(),
-            readWakeOnLanAttributeListCommandParams);
-    readWakeOnLanInteractionInfo.put(
-        "readAttributeListAttribute", readWakeOnLanAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWakeOnLanFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readTestClusterEnumAttrCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readEnumAttrAttribute", readTestClusterEnumAttrAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterRangeRestrictedInt8uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWakeOnLanFeatureMapAttributeInteractionInfo =
+    InteractionInfo readTestClusterRangeRestrictedInt8uAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WakeOnLanCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readRangeRestrictedInt8uAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readWakeOnLanFeatureMapCommandParams);
-    readWakeOnLanInteractionInfo.put(
-        "readFeatureMapAttribute", readWakeOnLanFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWakeOnLanClusterRevisionCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readTestClusterRangeRestrictedInt8uCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readRangeRestrictedInt8uAttribute",
+        readTestClusterRangeRestrictedInt8uAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterRangeRestrictedInt8sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWakeOnLanClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readTestClusterRangeRestrictedInt8sAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WakeOnLanCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readRangeRestrictedInt8sAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWakeOnLanClusterRevisionCommandParams);
-    readWakeOnLanInteractionInfo.put(
-        "readClusterRevisionAttribute", readWakeOnLanClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("wakeOnLan", readWakeOnLanInteractionInfo);
-    Map<String, InteractionInfo> readWiFiNetworkDiagnosticsInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsBssidCommandParams =
+            readTestClusterRangeRestrictedInt8sCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readRangeRestrictedInt8sAttribute",
+        readTestClusterRangeRestrictedInt8sAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterRangeRestrictedInt16uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWiFiNetworkDiagnosticsBssidAttributeInteractionInfo =
+    InteractionInfo readTestClusterRangeRestrictedInt16uAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
-                  .readBssidAttribute(
-                      (ChipClusters.WiFiNetworkDiagnosticsCluster.BssidAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readRangeRestrictedInt16uAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedOctetStringAttributeCallback(),
-            readWiFiNetworkDiagnosticsBssidCommandParams);
-    readWiFiNetworkDiagnosticsInteractionInfo.put(
-        "readBssidAttribute", readWiFiNetworkDiagnosticsBssidAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsSecurityTypeCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readTestClusterRangeRestrictedInt16uCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readRangeRestrictedInt16uAttribute",
+        readTestClusterRangeRestrictedInt16uAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterRangeRestrictedInt16sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWiFiNetworkDiagnosticsSecurityTypeAttributeInteractionInfo =
+    InteractionInfo readTestClusterRangeRestrictedInt16sAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
-                  .readSecurityTypeAttribute(
-                      (ChipClusters.WiFiNetworkDiagnosticsCluster.SecurityTypeAttributeCallback)
-                          callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readRangeRestrictedInt16sAttribute(
+                      (ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWiFiNetworkDiagnosticsSecurityTypeCommandParams);
-    readWiFiNetworkDiagnosticsInteractionInfo.put(
-        "readSecurityTypeAttribute",
-        readWiFiNetworkDiagnosticsSecurityTypeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsWiFiVersionCommandParams =
+            readTestClusterRangeRestrictedInt16sCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readRangeRestrictedInt16sAttribute",
+        readTestClusterRangeRestrictedInt16sAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterListLongOctetStringCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWiFiNetworkDiagnosticsWiFiVersionAttributeInteractionInfo =
+    InteractionInfo readTestClusterListLongOctetStringAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
-                  .readWiFiVersionAttribute(
-                      (ChipClusters.WiFiNetworkDiagnosticsCluster.WiFiVersionAttributeCallback)
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readListLongOctetStringAttribute(
+                      (ChipClusters.TestClusterCluster.ListLongOctetStringAttributeCallback)
                           callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWiFiNetworkDiagnosticsWiFiVersionCommandParams);
-    readWiFiNetworkDiagnosticsInteractionInfo.put(
-        "readWiFiVersionAttribute", readWiFiNetworkDiagnosticsWiFiVersionAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsChannelNumberCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedTestClusterClusterListLongOctetStringAttributeCallback(),
+            readTestClusterListLongOctetStringCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readListLongOctetStringAttribute",
+        readTestClusterListLongOctetStringAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterListFabricScopedCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWiFiNetworkDiagnosticsChannelNumberAttributeInteractionInfo =
+    InteractionInfo readTestClusterListFabricScopedAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
-                  .readChannelNumberAttribute(
-                      (ChipClusters.WiFiNetworkDiagnosticsCluster.ChannelNumberAttributeCallback)
-                          callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readListFabricScopedAttribute(
+                      (ChipClusters.TestClusterCluster.ListFabricScopedAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWiFiNetworkDiagnosticsChannelNumberCommandParams);
-    readWiFiNetworkDiagnosticsInteractionInfo.put(
-        "readChannelNumberAttribute",
-        readWiFiNetworkDiagnosticsChannelNumberAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsRssiCommandParams =
+            () ->
+                new ClusterInfoMapping
+                    .DelegatedTestClusterClusterListFabricScopedAttributeCallback(),
+            readTestClusterListFabricScopedCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readListFabricScopedAttribute", readTestClusterListFabricScopedAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterTimedWriteBooleanCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWiFiNetworkDiagnosticsRssiAttributeInteractionInfo =
+    InteractionInfo readTestClusterTimedWriteBooleanAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
-                  .readRssiAttribute(
-                      (ChipClusters.WiFiNetworkDiagnosticsCluster.RssiAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readTimedWriteBooleanAttribute((ChipClusters.BooleanAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWiFiNetworkDiagnosticsRssiCommandParams);
-    readWiFiNetworkDiagnosticsInteractionInfo.put(
-        "readRssiAttribute", readWiFiNetworkDiagnosticsRssiAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsBeaconLostCountCommandParams =
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readTestClusterTimedWriteBooleanCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readTimedWriteBooleanAttribute", readTestClusterTimedWriteBooleanAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterGeneralErrorBooleanCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWiFiNetworkDiagnosticsBeaconLostCountAttributeInteractionInfo =
+    InteractionInfo readTestClusterGeneralErrorBooleanAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
-                  .readBeaconLostCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readGeneralErrorBooleanAttribute(
+                      (ChipClusters.BooleanAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readWiFiNetworkDiagnosticsBeaconLostCountCommandParams);
-    readWiFiNetworkDiagnosticsInteractionInfo.put(
-        "readBeaconLostCountAttribute",
-        readWiFiNetworkDiagnosticsBeaconLostCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsBeaconRxCountCommandParams =
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readTestClusterGeneralErrorBooleanCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readGeneralErrorBooleanAttribute",
+        readTestClusterGeneralErrorBooleanAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterClusterErrorBooleanCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWiFiNetworkDiagnosticsBeaconRxCountAttributeInteractionInfo =
+    InteractionInfo readTestClusterClusterErrorBooleanAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
-                  .readBeaconRxCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readClusterErrorBooleanAttribute(
+                      (ChipClusters.BooleanAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readWiFiNetworkDiagnosticsBeaconRxCountCommandParams);
-    readWiFiNetworkDiagnosticsInteractionInfo.put(
-        "readBeaconRxCountAttribute",
-        readWiFiNetworkDiagnosticsBeaconRxCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readWiFiNetworkDiagnosticsPacketMulticastRxCountCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWiFiNetworkDiagnosticsPacketMulticastRxCountAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readTestClusterClusterErrorBooleanCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readClusterErrorBooleanAttribute",
+        readTestClusterClusterErrorBooleanAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterUnsupportedCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readTestClusterUnsupportedAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
-                  .readPacketMulticastRxCountAttribute(
-                      (ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readUnsupportedAttribute((ChipClusters.BooleanAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readWiFiNetworkDiagnosticsPacketMulticastRxCountCommandParams);
-    readWiFiNetworkDiagnosticsInteractionInfo.put(
-        "readPacketMulticastRxCountAttribute",
-        readWiFiNetworkDiagnosticsPacketMulticastRxCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readWiFiNetworkDiagnosticsPacketMulticastTxCountCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWiFiNetworkDiagnosticsPacketMulticastTxCountAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readTestClusterUnsupportedCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readUnsupportedAttribute", readTestClusterUnsupportedAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableBooleanCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readTestClusterNullableBooleanAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
-                  .readPacketMulticastTxCountAttribute(
-                      (ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableBooleanAttribute(
+                      (ChipClusters.TestClusterCluster.NullableBooleanAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readWiFiNetworkDiagnosticsPacketMulticastTxCountCommandParams);
-    readWiFiNetworkDiagnosticsInteractionInfo.put(
-        "readPacketMulticastTxCountAttribute",
-        readWiFiNetworkDiagnosticsPacketMulticastTxCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsPacketUnicastRxCountCommandParams =
+            () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(),
+            readTestClusterNullableBooleanCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableBooleanAttribute", readTestClusterNullableBooleanAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableBitmap8CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWiFiNetworkDiagnosticsPacketUnicastRxCountAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableBitmap8AttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
-                  .readPacketUnicastRxCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableBitmap8Attribute(
+                      (ChipClusters.TestClusterCluster.NullableBitmap8AttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readWiFiNetworkDiagnosticsPacketUnicastRxCountCommandParams);
-    readWiFiNetworkDiagnosticsInteractionInfo.put(
-        "readPacketUnicastRxCountAttribute",
-        readWiFiNetworkDiagnosticsPacketUnicastRxCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsPacketUnicastTxCountCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readTestClusterNullableBitmap8CommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableBitmap8Attribute", readTestClusterNullableBitmap8AttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableBitmap16CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWiFiNetworkDiagnosticsPacketUnicastTxCountAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableBitmap16AttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
-                  .readPacketUnicastTxCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableBitmap16Attribute(
+                      (ChipClusters.TestClusterCluster.NullableBitmap16AttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readWiFiNetworkDiagnosticsPacketUnicastTxCountCommandParams);
-    readWiFiNetworkDiagnosticsInteractionInfo.put(
-        "readPacketUnicastTxCountAttribute",
-        readWiFiNetworkDiagnosticsPacketUnicastTxCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsCurrentMaxRateCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readTestClusterNullableBitmap16CommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableBitmap16Attribute", readTestClusterNullableBitmap16AttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableBitmap32CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWiFiNetworkDiagnosticsCurrentMaxRateAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableBitmap32AttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
-                  .readCurrentMaxRateAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableBitmap32Attribute(
+                      (ChipClusters.TestClusterCluster.NullableBitmap32AttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readWiFiNetworkDiagnosticsCurrentMaxRateCommandParams);
-    readWiFiNetworkDiagnosticsInteractionInfo.put(
-        "readCurrentMaxRateAttribute",
-        readWiFiNetworkDiagnosticsCurrentMaxRateAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsOverrunCountCommandParams =
+            readTestClusterNullableBitmap32CommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableBitmap32Attribute", readTestClusterNullableBitmap32AttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableBitmap64CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWiFiNetworkDiagnosticsOverrunCountAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableBitmap64AttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
-                  .readOverrunCountAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableBitmap64Attribute(
+                      (ChipClusters.TestClusterCluster.NullableBitmap64AttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readWiFiNetworkDiagnosticsOverrunCountCommandParams);
-    readWiFiNetworkDiagnosticsInteractionInfo.put(
-        "readOverrunCountAttribute",
-        readWiFiNetworkDiagnosticsOverrunCountAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsGeneratedCommandListCommandParams =
+            readTestClusterNullableBitmap64CommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableBitmap64Attribute", readTestClusterNullableBitmap64AttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableInt8uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWiFiNetworkDiagnosticsGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableInt8uAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
-                  .readGeneratedCommandListAttribute(
-                      (ChipClusters.WiFiNetworkDiagnosticsCluster
-                              .GeneratedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableInt8uAttribute(
+                      (ChipClusters.TestClusterCluster.NullableInt8uAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedWiFiNetworkDiagnosticsClusterGeneratedCommandListAttributeCallback(),
-            readWiFiNetworkDiagnosticsGeneratedCommandListCommandParams);
-    readWiFiNetworkDiagnosticsInteractionInfo.put(
-        "readGeneratedCommandListAttribute",
-        readWiFiNetworkDiagnosticsGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsAcceptedCommandListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readTestClusterNullableInt8uCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableInt8uAttribute", readTestClusterNullableInt8uAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableInt16uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWiFiNetworkDiagnosticsAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableInt16uAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
-                  .readAcceptedCommandListAttribute(
-                      (ChipClusters.WiFiNetworkDiagnosticsCluster
-                              .AcceptedCommandListAttributeCallback)
-                          callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableInt16uAttribute(
+                      (ChipClusters.TestClusterCluster.NullableInt16uAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedWiFiNetworkDiagnosticsClusterAcceptedCommandListAttributeCallback(),
-            readWiFiNetworkDiagnosticsAcceptedCommandListCommandParams);
-    readWiFiNetworkDiagnosticsInteractionInfo.put(
-        "readAcceptedCommandListAttribute",
-        readWiFiNetworkDiagnosticsAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsAttributeListCommandParams =
+            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+            readTestClusterNullableInt16uCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableInt16uAttribute", readTestClusterNullableInt16uAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableInt24uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWiFiNetworkDiagnosticsAttributeListAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableInt24uAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
-                  .readAttributeListAttribute(
-                      (ChipClusters.WiFiNetworkDiagnosticsCluster.AttributeListAttributeCallback)
-                          callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableInt24uAttribute(
+                      (ChipClusters.TestClusterCluster.NullableInt24uAttributeCallback) callback);
             },
-            () ->
-                new ClusterInfoMapping
-                    .DelegatedWiFiNetworkDiagnosticsClusterAttributeListAttributeCallback(),
-            readWiFiNetworkDiagnosticsAttributeListCommandParams);
-    readWiFiNetworkDiagnosticsInteractionInfo.put(
-        "readAttributeListAttribute",
-        readWiFiNetworkDiagnosticsAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsFeatureMapCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readTestClusterNullableInt24uCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableInt24uAttribute", readTestClusterNullableInt24uAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableInt32uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWiFiNetworkDiagnosticsFeatureMapAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableInt32uAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
-                  .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableInt32uAttribute(
+                      (ChipClusters.TestClusterCluster.NullableInt32uAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readWiFiNetworkDiagnosticsFeatureMapCommandParams);
-    readWiFiNetworkDiagnosticsInteractionInfo.put(
-        "readFeatureMapAttribute", readWiFiNetworkDiagnosticsFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWiFiNetworkDiagnosticsClusterRevisionCommandParams =
+            readTestClusterNullableInt32uCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableInt32uAttribute", readTestClusterNullableInt32uAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableInt40uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWiFiNetworkDiagnosticsClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableInt40uAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
-                  .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
-            },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWiFiNetworkDiagnosticsClusterRevisionCommandParams);
-    readWiFiNetworkDiagnosticsInteractionInfo.put(
-        "readClusterRevisionAttribute",
-        readWiFiNetworkDiagnosticsClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("wiFiNetworkDiagnostics", readWiFiNetworkDiagnosticsInteractionInfo);
-    Map<String, InteractionInfo> readWindowCoveringInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> readWindowCoveringTypeCommandParams =
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableInt40uAttribute(
+                      (ChipClusters.TestClusterCluster.NullableInt40uAttributeCallback) callback);
+            },
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readTestClusterNullableInt40uCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableInt40uAttribute", readTestClusterNullableInt40uAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableInt48uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringTypeAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableInt48uAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .readTypeAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableInt48uAttribute(
+                      (ChipClusters.TestClusterCluster.NullableInt48uAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWindowCoveringTypeCommandParams);
-    readWindowCoveringInteractionInfo.put(
-        "readTypeAttribute", readWindowCoveringTypeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWindowCoveringPhysicalClosedLimitLiftCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readTestClusterNullableInt48uCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableInt48uAttribute", readTestClusterNullableInt48uAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableInt56uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringPhysicalClosedLimitLiftAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableInt56uAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .readPhysicalClosedLimitLiftAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableInt56uAttribute(
+                      (ChipClusters.TestClusterCluster.NullableInt56uAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWindowCoveringPhysicalClosedLimitLiftCommandParams);
-    readWindowCoveringInteractionInfo.put(
-        "readPhysicalClosedLimitLiftAttribute",
-        readWindowCoveringPhysicalClosedLimitLiftAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWindowCoveringPhysicalClosedLimitTiltCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readTestClusterNullableInt56uCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableInt56uAttribute", readTestClusterNullableInt56uAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableInt64uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringPhysicalClosedLimitTiltAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableInt64uAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .readPhysicalClosedLimitTiltAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableInt64uAttribute(
+                      (ChipClusters.TestClusterCluster.NullableInt64uAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWindowCoveringPhysicalClosedLimitTiltCommandParams);
-    readWindowCoveringInteractionInfo.put(
-        "readPhysicalClosedLimitTiltAttribute",
-        readWindowCoveringPhysicalClosedLimitTiltAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWindowCoveringCurrentPositionLiftCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readTestClusterNullableInt64uCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableInt64uAttribute", readTestClusterNullableInt64uAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableInt8sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringCurrentPositionLiftAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableInt8sAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .readCurrentPositionLiftAttribute(
-                      (ChipClusters.WindowCoveringCluster.CurrentPositionLiftAttributeCallback)
-                          callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableInt8sAttribute(
+                      (ChipClusters.TestClusterCluster.NullableInt8sAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWindowCoveringCurrentPositionLiftCommandParams);
-    readWindowCoveringInteractionInfo.put(
-        "readCurrentPositionLiftAttribute",
-        readWindowCoveringCurrentPositionLiftAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWindowCoveringCurrentPositionTiltCommandParams =
+            readTestClusterNullableInt8sCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableInt8sAttribute", readTestClusterNullableInt8sAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableInt16sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringCurrentPositionTiltAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableInt16sAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .readCurrentPositionTiltAttribute(
-                      (ChipClusters.WindowCoveringCluster.CurrentPositionTiltAttributeCallback)
-                          callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableInt16sAttribute(
+                      (ChipClusters.TestClusterCluster.NullableInt16sAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWindowCoveringCurrentPositionTiltCommandParams);
-    readWindowCoveringInteractionInfo.put(
-        "readCurrentPositionTiltAttribute",
-        readWindowCoveringCurrentPositionTiltAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWindowCoveringNumberOfActuationsLiftCommandParams =
+            readTestClusterNullableInt16sCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableInt16sAttribute", readTestClusterNullableInt16sAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableInt24sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringNumberOfActuationsLiftAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableInt24sAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .readNumberOfActuationsLiftAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableInt24sAttribute(
+                      (ChipClusters.TestClusterCluster.NullableInt24sAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWindowCoveringNumberOfActuationsLiftCommandParams);
-    readWindowCoveringInteractionInfo.put(
-        "readNumberOfActuationsLiftAttribute",
-        readWindowCoveringNumberOfActuationsLiftAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWindowCoveringNumberOfActuationsTiltCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readTestClusterNullableInt24sCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableInt24sAttribute", readTestClusterNullableInt24sAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableInt32sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringNumberOfActuationsTiltAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableInt32sAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .readNumberOfActuationsTiltAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableInt32sAttribute(
+                      (ChipClusters.TestClusterCluster.NullableInt32sAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWindowCoveringNumberOfActuationsTiltCommandParams);
-    readWindowCoveringInteractionInfo.put(
-        "readNumberOfActuationsTiltAttribute",
-        readWindowCoveringNumberOfActuationsTiltAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWindowCoveringConfigStatusCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readTestClusterNullableInt32sCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableInt32sAttribute", readTestClusterNullableInt32sAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableInt40sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringConfigStatusAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableInt40sAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .readConfigStatusAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableInt40sAttribute(
+                      (ChipClusters.TestClusterCluster.NullableInt40sAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWindowCoveringConfigStatusCommandParams);
-    readWindowCoveringInteractionInfo.put(
-        "readConfigStatusAttribute", readWindowCoveringConfigStatusAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWindowCoveringCurrentPositionLiftPercentageCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readTestClusterNullableInt40sCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableInt40sAttribute", readTestClusterNullableInt40sAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableInt48sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringCurrentPositionLiftPercentageAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableInt48sAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .readCurrentPositionLiftPercentageAttribute(
-                      (ChipClusters.WindowCoveringCluster
-                              .CurrentPositionLiftPercentageAttributeCallback)
-                          callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableInt48sAttribute(
+                      (ChipClusters.TestClusterCluster.NullableInt48sAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWindowCoveringCurrentPositionLiftPercentageCommandParams);
-    readWindowCoveringInteractionInfo.put(
-        "readCurrentPositionLiftPercentageAttribute",
-        readWindowCoveringCurrentPositionLiftPercentageAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWindowCoveringCurrentPositionTiltPercentageCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readTestClusterNullableInt48sCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableInt48sAttribute", readTestClusterNullableInt48sAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableInt56sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringCurrentPositionTiltPercentageAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableInt56sAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .readCurrentPositionTiltPercentageAttribute(
-                      (ChipClusters.WindowCoveringCluster
-                              .CurrentPositionTiltPercentageAttributeCallback)
-                          callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableInt56sAttribute(
+                      (ChipClusters.TestClusterCluster.NullableInt56sAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWindowCoveringCurrentPositionTiltPercentageCommandParams);
-    readWindowCoveringInteractionInfo.put(
-        "readCurrentPositionTiltPercentageAttribute",
-        readWindowCoveringCurrentPositionTiltPercentageAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWindowCoveringOperationalStatusCommandParams =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readTestClusterNullableInt56sCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableInt56sAttribute", readTestClusterNullableInt56sAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableInt64sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringOperationalStatusAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableInt64sAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .readOperationalStatusAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableInt64sAttribute(
+                      (ChipClusters.TestClusterCluster.NullableInt64sAttributeCallback) callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWindowCoveringOperationalStatusCommandParams);
-    readWindowCoveringInteractionInfo.put(
-        "readOperationalStatusAttribute",
-        readWindowCoveringOperationalStatusAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readWindowCoveringTargetPositionLiftPercent100thsCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringTargetPositionLiftPercent100thsAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+            readTestClusterNullableInt64sCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableInt64sAttribute", readTestClusterNullableInt64sAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableEnum8CommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readTestClusterNullableEnum8AttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .readTargetPositionLiftPercent100thsAttribute(
-                      (ChipClusters.WindowCoveringCluster
-                              .TargetPositionLiftPercent100thsAttributeCallback)
-                          callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableEnum8Attribute(
+                      (ChipClusters.TestClusterCluster.NullableEnum8AttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWindowCoveringTargetPositionLiftPercent100thsCommandParams);
-    readWindowCoveringInteractionInfo.put(
-        "readTargetPositionLiftPercent100thsAttribute",
-        readWindowCoveringTargetPositionLiftPercent100thsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readWindowCoveringTargetPositionTiltPercent100thsCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringTargetPositionTiltPercent100thsAttributeInteractionInfo =
+            readTestClusterNullableEnum8CommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableEnum8Attribute", readTestClusterNullableEnum8AttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableEnum16CommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readTestClusterNullableEnum16AttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .readTargetPositionTiltPercent100thsAttribute(
-                      (ChipClusters.WindowCoveringCluster
-                              .TargetPositionTiltPercent100thsAttributeCallback)
-                          callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableEnum16Attribute(
+                      (ChipClusters.TestClusterCluster.NullableEnum16AttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWindowCoveringTargetPositionTiltPercent100thsCommandParams);
-    readWindowCoveringInteractionInfo.put(
-        "readTargetPositionTiltPercent100thsAttribute",
-        readWindowCoveringTargetPositionTiltPercent100thsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWindowCoveringEndProductTypeCommandParams =
+            readTestClusterNullableEnum16CommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableEnum16Attribute", readTestClusterNullableEnum16AttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableFloatSingleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringEndProductTypeAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableFloatSingleAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .readEndProductTypeAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableFloatSingleAttribute(
+                      (ChipClusters.TestClusterCluster.NullableFloatSingleAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWindowCoveringEndProductTypeCommandParams);
-    readWindowCoveringInteractionInfo.put(
-        "readEndProductTypeAttribute", readWindowCoveringEndProductTypeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readWindowCoveringCurrentPositionLiftPercent100thsCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringCurrentPositionLiftPercent100thsAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedFloatAttributeCallback(),
+            readTestClusterNullableFloatSingleCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableFloatSingleAttribute",
+        readTestClusterNullableFloatSingleAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableFloatDoubleCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readTestClusterNullableFloatDoubleAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .readCurrentPositionLiftPercent100thsAttribute(
-                      (ChipClusters.WindowCoveringCluster
-                              .CurrentPositionLiftPercent100thsAttributeCallback)
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableFloatDoubleAttribute(
+                      (ChipClusters.TestClusterCluster.NullableFloatDoubleAttributeCallback)
                           callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWindowCoveringCurrentPositionLiftPercent100thsCommandParams);
-    readWindowCoveringInteractionInfo.put(
-        "readCurrentPositionLiftPercent100thsAttribute",
-        readWindowCoveringCurrentPositionLiftPercent100thsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        readWindowCoveringCurrentPositionTiltPercent100thsCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringCurrentPositionTiltPercent100thsAttributeInteractionInfo =
+            () -> new ClusterInfoMapping.DelegatedDoubleAttributeCallback(),
+            readTestClusterNullableFloatDoubleCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableFloatDoubleAttribute",
+        readTestClusterNullableFloatDoubleAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableOctetStringCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo readTestClusterNullableOctetStringAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .readCurrentPositionTiltPercent100thsAttribute(
-                      (ChipClusters.WindowCoveringCluster
-                              .CurrentPositionTiltPercent100thsAttributeCallback)
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableOctetStringAttribute(
+                      (ChipClusters.TestClusterCluster.NullableOctetStringAttributeCallback)
                           callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWindowCoveringCurrentPositionTiltPercent100thsCommandParams);
-    readWindowCoveringInteractionInfo.put(
-        "readCurrentPositionTiltPercent100thsAttribute",
-        readWindowCoveringCurrentPositionTiltPercent100thsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWindowCoveringInstalledOpenLimitLiftCommandParams =
+            () -> new ClusterInfoMapping.DelegatedOctetStringAttributeCallback(),
+            readTestClusterNullableOctetStringCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableOctetStringAttribute",
+        readTestClusterNullableOctetStringAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableCharStringCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringInstalledOpenLimitLiftAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableCharStringAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .readInstalledOpenLimitLiftAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableCharStringAttribute(
+                      (ChipClusters.TestClusterCluster.NullableCharStringAttributeCallback)
+                          callback);
             },
-            () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWindowCoveringInstalledOpenLimitLiftCommandParams);
-    readWindowCoveringInteractionInfo.put(
-        "readInstalledOpenLimitLiftAttribute",
-        readWindowCoveringInstalledOpenLimitLiftAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWindowCoveringInstalledClosedLimitLiftCommandParams =
+            () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+            readTestClusterNullableCharStringCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableCharStringAttribute",
+        readTestClusterNullableCharStringAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableEnumAttrCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringInstalledClosedLimitLiftAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableEnumAttrAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .readInstalledClosedLimitLiftAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableEnumAttrAttribute(
+                      (ChipClusters.TestClusterCluster.NullableEnumAttrAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWindowCoveringInstalledClosedLimitLiftCommandParams);
-    readWindowCoveringInteractionInfo.put(
-        "readInstalledClosedLimitLiftAttribute",
-        readWindowCoveringInstalledClosedLimitLiftAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWindowCoveringInstalledOpenLimitTiltCommandParams =
+            readTestClusterNullableEnumAttrCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableEnumAttrAttribute", readTestClusterNullableEnumAttrAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableRangeRestrictedInt8uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringInstalledOpenLimitTiltAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableRangeRestrictedInt8uAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .readInstalledOpenLimitTiltAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableRangeRestrictedInt8uAttribute(
+                      (ChipClusters.TestClusterCluster
+                              .NullableRangeRestrictedInt8uAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWindowCoveringInstalledOpenLimitTiltCommandParams);
-    readWindowCoveringInteractionInfo.put(
-        "readInstalledOpenLimitTiltAttribute",
-        readWindowCoveringInstalledOpenLimitTiltAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWindowCoveringInstalledClosedLimitTiltCommandParams =
+            readTestClusterNullableRangeRestrictedInt8uCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableRangeRestrictedInt8uAttribute",
+        readTestClusterNullableRangeRestrictedInt8uAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableRangeRestrictedInt8sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringInstalledClosedLimitTiltAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableRangeRestrictedInt8sAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .readInstalledClosedLimitTiltAttribute(
-                      (ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableRangeRestrictedInt8sAttribute(
+                      (ChipClusters.TestClusterCluster
+                              .NullableRangeRestrictedInt8sAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWindowCoveringInstalledClosedLimitTiltCommandParams);
-    readWindowCoveringInteractionInfo.put(
-        "readInstalledClosedLimitTiltAttribute",
-        readWindowCoveringInstalledClosedLimitTiltAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWindowCoveringModeCommandParams =
+            readTestClusterNullableRangeRestrictedInt8sCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableRangeRestrictedInt8sAttribute",
+        readTestClusterNullableRangeRestrictedInt8sAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableRangeRestrictedInt16uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringModeAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableRangeRestrictedInt16uAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .readModeAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableRangeRestrictedInt16uAttribute(
+                      (ChipClusters.TestClusterCluster
+                              .NullableRangeRestrictedInt16uAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWindowCoveringModeCommandParams);
-    readWindowCoveringInteractionInfo.put(
-        "readModeAttribute", readWindowCoveringModeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWindowCoveringSafetyStatusCommandParams =
+            readTestClusterNullableRangeRestrictedInt16uCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableRangeRestrictedInt16uAttribute",
+        readTestClusterNullableRangeRestrictedInt16uAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterNullableRangeRestrictedInt16sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringSafetyStatusAttributeInteractionInfo =
+    InteractionInfo readTestClusterNullableRangeRestrictedInt16sAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .readSafetyStatusAttribute((ChipClusters.IntegerAttributeCallback) callback);
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .readNullableRangeRestrictedInt16sAttribute(
+                      (ChipClusters.TestClusterCluster
+                              .NullableRangeRestrictedInt16sAttributeCallback)
+                          callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWindowCoveringSafetyStatusCommandParams);
-    readWindowCoveringInteractionInfo.put(
-        "readSafetyStatusAttribute", readWindowCoveringSafetyStatusAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWindowCoveringGeneratedCommandListCommandParams =
+            readTestClusterNullableRangeRestrictedInt16sCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readNullableRangeRestrictedInt16sAttribute",
+        readTestClusterNullableRangeRestrictedInt16sAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterGeneratedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringGeneratedCommandListAttributeInteractionInfo =
+    InteractionInfo readTestClusterGeneratedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
+              ((ChipClusters.TestClusterCluster) cluster)
                   .readGeneratedCommandListAttribute(
-                      (ChipClusters.WindowCoveringCluster.GeneratedCommandListAttributeCallback)
+                      (ChipClusters.TestClusterCluster.GeneratedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedWindowCoveringClusterGeneratedCommandListAttributeCallback(),
-            readWindowCoveringGeneratedCommandListCommandParams);
-    readWindowCoveringInteractionInfo.put(
+                    .DelegatedTestClusterClusterGeneratedCommandListAttributeCallback(),
+            readTestClusterGeneratedCommandListCommandParams);
+    readTestClusterInteractionInfo.put(
         "readGeneratedCommandListAttribute",
-        readWindowCoveringGeneratedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWindowCoveringAcceptedCommandListCommandParams =
+        readTestClusterGeneratedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterAcceptedCommandListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringAcceptedCommandListAttributeInteractionInfo =
+    InteractionInfo readTestClusterAcceptedCommandListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
+              ((ChipClusters.TestClusterCluster) cluster)
                   .readAcceptedCommandListAttribute(
-                      (ChipClusters.WindowCoveringCluster.AcceptedCommandListAttributeCallback)
+                      (ChipClusters.TestClusterCluster.AcceptedCommandListAttributeCallback)
                           callback);
             },
             () ->
                 new ClusterInfoMapping
-                    .DelegatedWindowCoveringClusterAcceptedCommandListAttributeCallback(),
-            readWindowCoveringAcceptedCommandListCommandParams);
-    readWindowCoveringInteractionInfo.put(
+                    .DelegatedTestClusterClusterAcceptedCommandListAttributeCallback(),
+            readTestClusterAcceptedCommandListCommandParams);
+    readTestClusterInteractionInfo.put(
         "readAcceptedCommandListAttribute",
-        readWindowCoveringAcceptedCommandListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWindowCoveringAttributeListCommandParams =
+        readTestClusterAcceptedCommandListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterAttributeListCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringAttributeListAttributeInteractionInfo =
+    InteractionInfo readTestClusterAttributeListAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
+              ((ChipClusters.TestClusterCluster) cluster)
                   .readAttributeListAttribute(
-                      (ChipClusters.WindowCoveringCluster.AttributeListAttributeCallback) callback);
+                      (ChipClusters.TestClusterCluster.AttributeListAttributeCallback) callback);
             },
             () ->
-                new ClusterInfoMapping
-                    .DelegatedWindowCoveringClusterAttributeListAttributeCallback(),
-            readWindowCoveringAttributeListCommandParams);
-    readWindowCoveringInteractionInfo.put(
-        "readAttributeListAttribute", readWindowCoveringAttributeListAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWindowCoveringFeatureMapCommandParams =
+                new ClusterInfoMapping.DelegatedTestClusterClusterAttributeListAttributeCallback(),
+            readTestClusterAttributeListCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readAttributeListAttribute", readTestClusterAttributeListAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterFeatureMapCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringFeatureMapAttributeInteractionInfo =
+    InteractionInfo readTestClusterFeatureMapAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
+              ((ChipClusters.TestClusterCluster) cluster)
                   .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-            readWindowCoveringFeatureMapCommandParams);
-    readWindowCoveringInteractionInfo.put(
-        "readFeatureMapAttribute", readWindowCoveringFeatureMapAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> readWindowCoveringClusterRevisionCommandParams =
+            readTestClusterFeatureMapCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readFeatureMapAttribute", readTestClusterFeatureMapAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> readTestClusterClusterRevisionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    InteractionInfo readWindowCoveringClusterRevisionAttributeInteractionInfo =
+    InteractionInfo readTestClusterClusterRevisionAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
+              ((ChipClusters.TestClusterCluster) cluster)
                   .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
             },
             () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-            readWindowCoveringClusterRevisionCommandParams);
-    readWindowCoveringInteractionInfo.put(
-        "readClusterRevisionAttribute", readWindowCoveringClusterRevisionAttributeInteractionInfo);
-    readAttributeMap.put("windowCovering", readWindowCoveringInteractionInfo);
+            readTestClusterClusterRevisionCommandParams);
+    readTestClusterInteractionInfo.put(
+        "readClusterRevisionAttribute", readTestClusterClusterRevisionAttributeInteractionInfo);
+    readAttributeMap.put("testCluster", readTestClusterInteractionInfo);
     return readAttributeMap;
   }
 }
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java
index 40c7cfecb1aee0..36d9b225034c92 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java
@@ -29,386 +29,531 @@
 public class ClusterWriteMapping {
   public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, Map<String, InteractionInfo>> writeAttributeMap = new HashMap<>();
-    Map<String, InteractionInfo> writeAccessControlInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("accessControl", writeAccessControlInteractionInfo);
-    Map<String, InteractionInfo> writeAccountLoginInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("accountLogin", writeAccountLoginInteractionInfo);
-    Map<String, InteractionInfo> writeAdministratorCommissioningInteractionInfo =
-        new LinkedHashMap<>();
-    writeAttributeMap.put(
-        "administratorCommissioning", writeAdministratorCommissioningInteractionInfo);
-    Map<String, InteractionInfo> writeApplicationBasicInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("applicationBasic", writeApplicationBasicInteractionInfo);
-    Map<String, InteractionInfo> writeApplicationLauncherInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("applicationLauncher", writeApplicationLauncherInteractionInfo);
-    Map<String, InteractionInfo> writeAudioOutputInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("audioOutput", writeAudioOutputInteractionInfo);
-    Map<String, InteractionInfo> writeBarrierControlInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("barrierControl", writeBarrierControlInteractionInfo);
-    Map<String, InteractionInfo> writeBasicInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> writeBasicNodeLabelCommandParams =
+    Map<String, InteractionInfo> writeIdentifyInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> writeIdentifyIdentifyTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo basicnodeLabelCommandParameterInfo =
-        new CommandParameterInfo("value", String.class, String.class);
-    writeBasicNodeLabelCommandParams.put("value", basicnodeLabelCommandParameterInfo);
-    InteractionInfo writeBasicNodeLabelAttributeInteractionInfo =
+    CommandParameterInfo identifyidentifyTimeCommandParameterInfo =
+        new CommandParameterInfo("value", Integer.class, Integer.class);
+    writeIdentifyIdentifyTimeCommandParams.put("value", identifyidentifyTimeCommandParameterInfo);
+    InteractionInfo writeIdentifyIdentifyTimeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .writeNodeLabelAttribute(
-                      (DefaultClusterCallback) callback, (String) commandArguments.get("value"));
+              ((ChipClusters.IdentifyCluster) cluster)
+                  .writeIdentifyTimeAttribute(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeBasicNodeLabelCommandParams);
-    writeBasicInteractionInfo.put(
-        "writeNodeLabelAttribute", writeBasicNodeLabelAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeBasicLocationCommandParams =
+            writeIdentifyIdentifyTimeCommandParams);
+    writeIdentifyInteractionInfo.put(
+        "writeIdentifyTimeAttribute", writeIdentifyIdentifyTimeAttributeInteractionInfo);
+    writeAttributeMap.put("identify", writeIdentifyInteractionInfo);
+    Map<String, InteractionInfo> writeGroupsInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("groups", writeGroupsInteractionInfo);
+    Map<String, InteractionInfo> writeScenesInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("scenes", writeScenesInteractionInfo);
+    Map<String, InteractionInfo> writeOnOffInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> writeOnOffOnTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo basiclocationCommandParameterInfo =
-        new CommandParameterInfo("value", String.class, String.class);
-    writeBasicLocationCommandParams.put("value", basiclocationCommandParameterInfo);
-    InteractionInfo writeBasicLocationAttributeInteractionInfo =
+    CommandParameterInfo onOffonTimeCommandParameterInfo =
+        new CommandParameterInfo("value", Integer.class, Integer.class);
+    writeOnOffOnTimeCommandParams.put("value", onOffonTimeCommandParameterInfo);
+    InteractionInfo writeOnOffOnTimeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .writeLocationAttribute(
-                      (DefaultClusterCallback) callback, (String) commandArguments.get("value"));
+              ((ChipClusters.OnOffCluster) cluster)
+                  .writeOnTimeAttribute(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeBasicLocationCommandParams);
-    writeBasicInteractionInfo.put(
-        "writeLocationAttribute", writeBasicLocationAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeBasicLocalConfigDisabledCommandParams =
+            writeOnOffOnTimeCommandParams);
+    writeOnOffInteractionInfo.put("writeOnTimeAttribute", writeOnOffOnTimeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeOnOffOffWaitTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo basiclocalConfigDisabledCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class, Boolean.class);
-    writeBasicLocalConfigDisabledCommandParams.put(
-        "value", basiclocalConfigDisabledCommandParameterInfo);
-    InteractionInfo writeBasicLocalConfigDisabledAttributeInteractionInfo =
+    CommandParameterInfo onOffoffWaitTimeCommandParameterInfo =
+        new CommandParameterInfo("value", Integer.class, Integer.class);
+    writeOnOffOffWaitTimeCommandParams.put("value", onOffoffWaitTimeCommandParameterInfo);
+    InteractionInfo writeOnOffOffWaitTimeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BasicCluster) cluster)
-                  .writeLocalConfigDisabledAttribute(
-                      (DefaultClusterCallback) callback, (Boolean) commandArguments.get("value"));
+              ((ChipClusters.OnOffCluster) cluster)
+                  .writeOffWaitTimeAttribute(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeBasicLocalConfigDisabledCommandParams);
-    writeBasicInteractionInfo.put(
-        "writeLocalConfigDisabledAttribute", writeBasicLocalConfigDisabledAttributeInteractionInfo);
-    writeAttributeMap.put("basic", writeBasicInteractionInfo);
-    Map<String, InteractionInfo> writeBinaryInputBasicInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> writeBinaryInputBasicOutOfServiceCommandParams =
+            writeOnOffOffWaitTimeCommandParams);
+    writeOnOffInteractionInfo.put(
+        "writeOffWaitTimeAttribute", writeOnOffOffWaitTimeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeOnOffStartUpOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo binaryInputBasicoutOfServiceCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class, Boolean.class);
-    writeBinaryInputBasicOutOfServiceCommandParams.put(
-        "value", binaryInputBasicoutOfServiceCommandParameterInfo);
-    InteractionInfo writeBinaryInputBasicOutOfServiceAttributeInteractionInfo =
+    CommandParameterInfo onOffstartUpOnOffCommandParameterInfo =
+        new CommandParameterInfo("value", Integer.class, Integer.class);
+    writeOnOffStartUpOnOffCommandParams.put("value", onOffstartUpOnOffCommandParameterInfo);
+    InteractionInfo writeOnOffStartUpOnOffAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BinaryInputBasicCluster) cluster)
-                  .writeOutOfServiceAttribute(
-                      (DefaultClusterCallback) callback, (Boolean) commandArguments.get("value"));
+              ((ChipClusters.OnOffCluster) cluster)
+                  .writeStartUpOnOffAttribute(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeBinaryInputBasicOutOfServiceCommandParams);
-    writeBinaryInputBasicInteractionInfo.put(
-        "writeOutOfServiceAttribute", writeBinaryInputBasicOutOfServiceAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeBinaryInputBasicPresentValueCommandParams =
+            writeOnOffStartUpOnOffCommandParams);
+    writeOnOffInteractionInfo.put(
+        "writeStartUpOnOffAttribute", writeOnOffStartUpOnOffAttributeInteractionInfo);
+    writeAttributeMap.put("onOff", writeOnOffInteractionInfo);
+    Map<String, InteractionInfo> writeOnOffSwitchConfigurationInteractionInfo =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> writeOnOffSwitchConfigurationSwitchActionsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo binaryInputBasicpresentValueCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class, Boolean.class);
-    writeBinaryInputBasicPresentValueCommandParams.put(
-        "value", binaryInputBasicpresentValueCommandParameterInfo);
-    InteractionInfo writeBinaryInputBasicPresentValueAttributeInteractionInfo =
+    CommandParameterInfo onOffSwitchConfigurationswitchActionsCommandParameterInfo =
+        new CommandParameterInfo("value", Integer.class, Integer.class);
+    writeOnOffSwitchConfigurationSwitchActionsCommandParams.put(
+        "value", onOffSwitchConfigurationswitchActionsCommandParameterInfo);
+    InteractionInfo writeOnOffSwitchConfigurationSwitchActionsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BinaryInputBasicCluster) cluster)
-                  .writePresentValueAttribute(
-                      (DefaultClusterCallback) callback, (Boolean) commandArguments.get("value"));
+              ((ChipClusters.OnOffSwitchConfigurationCluster) cluster)
+                  .writeSwitchActionsAttribute(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeBinaryInputBasicPresentValueCommandParams);
-    writeBinaryInputBasicInteractionInfo.put(
-        "writePresentValueAttribute", writeBinaryInputBasicPresentValueAttributeInteractionInfo);
-    writeAttributeMap.put("binaryInputBasic", writeBinaryInputBasicInteractionInfo);
-    Map<String, InteractionInfo> writeBindingInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("binding", writeBindingInteractionInfo);
-    Map<String, InteractionInfo> writeBooleanStateInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("booleanState", writeBooleanStateInteractionInfo);
-    Map<String, InteractionInfo> writeBridgedActionsInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("bridgedActions", writeBridgedActionsInteractionInfo);
-    Map<String, InteractionInfo> writeBridgedDeviceBasicInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> writeBridgedDeviceBasicNodeLabelCommandParams =
+            writeOnOffSwitchConfigurationSwitchActionsCommandParams);
+    writeOnOffSwitchConfigurationInteractionInfo.put(
+        "writeSwitchActionsAttribute",
+        writeOnOffSwitchConfigurationSwitchActionsAttributeInteractionInfo);
+    writeAttributeMap.put("onOffSwitchConfiguration", writeOnOffSwitchConfigurationInteractionInfo);
+    Map<String, InteractionInfo> writeLevelControlInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> writeLevelControlOptionsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo bridgedDeviceBasicnodeLabelCommandParameterInfo =
-        new CommandParameterInfo("value", String.class, String.class);
-    writeBridgedDeviceBasicNodeLabelCommandParams.put(
-        "value", bridgedDeviceBasicnodeLabelCommandParameterInfo);
-    InteractionInfo writeBridgedDeviceBasicNodeLabelAttributeInteractionInfo =
+    CommandParameterInfo levelControloptionsCommandParameterInfo =
+        new CommandParameterInfo("value", Integer.class, Integer.class);
+    writeLevelControlOptionsCommandParams.put("value", levelControloptionsCommandParameterInfo);
+    InteractionInfo writeLevelControlOptionsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
-                  .writeNodeLabelAttribute(
-                      (DefaultClusterCallback) callback, (String) commandArguments.get("value"));
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .writeOptionsAttribute(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeBridgedDeviceBasicNodeLabelCommandParams);
-    writeBridgedDeviceBasicInteractionInfo.put(
-        "writeNodeLabelAttribute", writeBridgedDeviceBasicNodeLabelAttributeInteractionInfo);
-    writeAttributeMap.put("bridgedDeviceBasic", writeBridgedDeviceBasicInteractionInfo);
-    Map<String, InteractionInfo> writeChannelInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("channel", writeChannelInteractionInfo);
-    Map<String, InteractionInfo> writeColorControlInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> writeColorControlOptionsCommandParams =
+            writeLevelControlOptionsCommandParams);
+    writeLevelControlInteractionInfo.put(
+        "writeOptionsAttribute", writeLevelControlOptionsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeLevelControlOnOffTransitionTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControloptionsCommandParameterInfo =
+    CommandParameterInfo levelControlonOffTransitionTimeCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeColorControlOptionsCommandParams.put("value", colorControloptionsCommandParameterInfo);
-    InteractionInfo writeColorControlOptionsAttributeInteractionInfo =
+    writeLevelControlOnOffTransitionTimeCommandParams.put(
+        "value", levelControlonOffTransitionTimeCommandParameterInfo);
+    InteractionInfo writeLevelControlOnOffTransitionTimeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .writeOptionsAttribute(
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .writeOnOffTransitionTimeAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeColorControlOptionsCommandParams);
-    writeColorControlInteractionInfo.put(
-        "writeOptionsAttribute", writeColorControlOptionsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeColorControlWhitePointXCommandParams =
+            writeLevelControlOnOffTransitionTimeCommandParams);
+    writeLevelControlInteractionInfo.put(
+        "writeOnOffTransitionTimeAttribute",
+        writeLevelControlOnOffTransitionTimeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeLevelControlOnLevelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlwhitePointXCommandParameterInfo =
+    CommandParameterInfo levelControlonLevelCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeColorControlWhitePointXCommandParams.put(
-        "value", colorControlwhitePointXCommandParameterInfo);
-    InteractionInfo writeColorControlWhitePointXAttributeInteractionInfo =
+    writeLevelControlOnLevelCommandParams.put("value", levelControlonLevelCommandParameterInfo);
+    InteractionInfo writeLevelControlOnLevelAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .writeWhitePointXAttribute(
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .writeOnLevelAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeColorControlWhitePointXCommandParams);
-    writeColorControlInteractionInfo.put(
-        "writeWhitePointXAttribute", writeColorControlWhitePointXAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeColorControlWhitePointYCommandParams =
+            writeLevelControlOnLevelCommandParams);
+    writeLevelControlInteractionInfo.put(
+        "writeOnLevelAttribute", writeLevelControlOnLevelAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeLevelControlOnTransitionTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlwhitePointYCommandParameterInfo =
+    CommandParameterInfo levelControlonTransitionTimeCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeColorControlWhitePointYCommandParams.put(
-        "value", colorControlwhitePointYCommandParameterInfo);
-    InteractionInfo writeColorControlWhitePointYAttributeInteractionInfo =
+    writeLevelControlOnTransitionTimeCommandParams.put(
+        "value", levelControlonTransitionTimeCommandParameterInfo);
+    InteractionInfo writeLevelControlOnTransitionTimeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .writeWhitePointYAttribute(
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .writeOnTransitionTimeAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeColorControlWhitePointYCommandParams);
-    writeColorControlInteractionInfo.put(
-        "writeWhitePointYAttribute", writeColorControlWhitePointYAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeColorControlColorPointRXCommandParams =
+            writeLevelControlOnTransitionTimeCommandParams);
+    writeLevelControlInteractionInfo.put(
+        "writeOnTransitionTimeAttribute",
+        writeLevelControlOnTransitionTimeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeLevelControlOffTransitionTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlcolorPointRXCommandParameterInfo =
+    CommandParameterInfo levelControloffTransitionTimeCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeColorControlColorPointRXCommandParams.put(
-        "value", colorControlcolorPointRXCommandParameterInfo);
-    InteractionInfo writeColorControlColorPointRXAttributeInteractionInfo =
+    writeLevelControlOffTransitionTimeCommandParams.put(
+        "value", levelControloffTransitionTimeCommandParameterInfo);
+    InteractionInfo writeLevelControlOffTransitionTimeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .writeColorPointRXAttribute(
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .writeOffTransitionTimeAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeColorControlColorPointRXCommandParams);
-    writeColorControlInteractionInfo.put(
-        "writeColorPointRXAttribute", writeColorControlColorPointRXAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeColorControlColorPointRYCommandParams =
+            writeLevelControlOffTransitionTimeCommandParams);
+    writeLevelControlInteractionInfo.put(
+        "writeOffTransitionTimeAttribute",
+        writeLevelControlOffTransitionTimeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeLevelControlDefaultMoveRateCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlcolorPointRYCommandParameterInfo =
+    CommandParameterInfo levelControldefaultMoveRateCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeColorControlColorPointRYCommandParams.put(
-        "value", colorControlcolorPointRYCommandParameterInfo);
-    InteractionInfo writeColorControlColorPointRYAttributeInteractionInfo =
+    writeLevelControlDefaultMoveRateCommandParams.put(
+        "value", levelControldefaultMoveRateCommandParameterInfo);
+    InteractionInfo writeLevelControlDefaultMoveRateAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .writeColorPointRYAttribute(
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .writeDefaultMoveRateAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeColorControlColorPointRYCommandParams);
-    writeColorControlInteractionInfo.put(
-        "writeColorPointRYAttribute", writeColorControlColorPointRYAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeColorControlColorPointRIntensityCommandParams =
+            writeLevelControlDefaultMoveRateCommandParams);
+    writeLevelControlInteractionInfo.put(
+        "writeDefaultMoveRateAttribute", writeLevelControlDefaultMoveRateAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeLevelControlStartUpCurrentLevelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlcolorPointRIntensityCommandParameterInfo =
+    CommandParameterInfo levelControlstartUpCurrentLevelCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeColorControlColorPointRIntensityCommandParams.put(
-        "value", colorControlcolorPointRIntensityCommandParameterInfo);
-    InteractionInfo writeColorControlColorPointRIntensityAttributeInteractionInfo =
+    writeLevelControlStartUpCurrentLevelCommandParams.put(
+        "value", levelControlstartUpCurrentLevelCommandParameterInfo);
+    InteractionInfo writeLevelControlStartUpCurrentLevelAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .writeColorPointRIntensityAttribute(
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .writeStartUpCurrentLevelAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeColorControlColorPointRIntensityCommandParams);
-    writeColorControlInteractionInfo.put(
-        "writeColorPointRIntensityAttribute",
-        writeColorControlColorPointRIntensityAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeColorControlColorPointGXCommandParams =
+            writeLevelControlStartUpCurrentLevelCommandParams);
+    writeLevelControlInteractionInfo.put(
+        "writeStartUpCurrentLevelAttribute",
+        writeLevelControlStartUpCurrentLevelAttributeInteractionInfo);
+    writeAttributeMap.put("levelControl", writeLevelControlInteractionInfo);
+    Map<String, InteractionInfo> writeBinaryInputBasicInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> writeBinaryInputBasicOutOfServiceCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlcolorPointGXCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeColorControlColorPointGXCommandParams.put(
-        "value", colorControlcolorPointGXCommandParameterInfo);
-    InteractionInfo writeColorControlColorPointGXAttributeInteractionInfo =
+    CommandParameterInfo binaryInputBasicoutOfServiceCommandParameterInfo =
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
+    writeBinaryInputBasicOutOfServiceCommandParams.put(
+        "value", binaryInputBasicoutOfServiceCommandParameterInfo);
+    InteractionInfo writeBinaryInputBasicOutOfServiceAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .writeColorPointGXAttribute(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
+              ((ChipClusters.BinaryInputBasicCluster) cluster)
+                  .writeOutOfServiceAttribute(
+                      (DefaultClusterCallback) callback, (Boolean) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeColorControlColorPointGXCommandParams);
-    writeColorControlInteractionInfo.put(
-        "writeColorPointGXAttribute", writeColorControlColorPointGXAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeColorControlColorPointGYCommandParams =
+            writeBinaryInputBasicOutOfServiceCommandParams);
+    writeBinaryInputBasicInteractionInfo.put(
+        "writeOutOfServiceAttribute", writeBinaryInputBasicOutOfServiceAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeBinaryInputBasicPresentValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlcolorPointGYCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeColorControlColorPointGYCommandParams.put(
-        "value", colorControlcolorPointGYCommandParameterInfo);
-    InteractionInfo writeColorControlColorPointGYAttributeInteractionInfo =
+    CommandParameterInfo binaryInputBasicpresentValueCommandParameterInfo =
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
+    writeBinaryInputBasicPresentValueCommandParams.put(
+        "value", binaryInputBasicpresentValueCommandParameterInfo);
+    InteractionInfo writeBinaryInputBasicPresentValueAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .writeColorPointGYAttribute(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
+              ((ChipClusters.BinaryInputBasicCluster) cluster)
+                  .writePresentValueAttribute(
+                      (DefaultClusterCallback) callback, (Boolean) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeColorControlColorPointGYCommandParams);
-    writeColorControlInteractionInfo.put(
-        "writeColorPointGYAttribute", writeColorControlColorPointGYAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeColorControlColorPointGIntensityCommandParams =
+            writeBinaryInputBasicPresentValueCommandParams);
+    writeBinaryInputBasicInteractionInfo.put(
+        "writePresentValueAttribute", writeBinaryInputBasicPresentValueAttributeInteractionInfo);
+    writeAttributeMap.put("binaryInputBasic", writeBinaryInputBasicInteractionInfo);
+    Map<String, InteractionInfo> writeDescriptorInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("descriptor", writeDescriptorInteractionInfo);
+    Map<String, InteractionInfo> writeBindingInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("binding", writeBindingInteractionInfo);
+    Map<String, InteractionInfo> writeAccessControlInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("accessControl", writeAccessControlInteractionInfo);
+    Map<String, InteractionInfo> writeBridgedActionsInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("bridgedActions", writeBridgedActionsInteractionInfo);
+    Map<String, InteractionInfo> writeBasicInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> writeBasicNodeLabelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlcolorPointGIntensityCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeColorControlColorPointGIntensityCommandParams.put(
-        "value", colorControlcolorPointGIntensityCommandParameterInfo);
-    InteractionInfo writeColorControlColorPointGIntensityAttributeInteractionInfo =
+    CommandParameterInfo basicnodeLabelCommandParameterInfo =
+        new CommandParameterInfo("value", String.class, String.class);
+    writeBasicNodeLabelCommandParams.put("value", basicnodeLabelCommandParameterInfo);
+    InteractionInfo writeBasicNodeLabelAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .writeColorPointGIntensityAttribute(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
+              ((ChipClusters.BasicCluster) cluster)
+                  .writeNodeLabelAttribute(
+                      (DefaultClusterCallback) callback, (String) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeColorControlColorPointGIntensityCommandParams);
-    writeColorControlInteractionInfo.put(
-        "writeColorPointGIntensityAttribute",
-        writeColorControlColorPointGIntensityAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeColorControlColorPointBXCommandParams =
+            writeBasicNodeLabelCommandParams);
+    writeBasicInteractionInfo.put(
+        "writeNodeLabelAttribute", writeBasicNodeLabelAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeBasicLocationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlcolorPointBXCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeColorControlColorPointBXCommandParams.put(
-        "value", colorControlcolorPointBXCommandParameterInfo);
-    InteractionInfo writeColorControlColorPointBXAttributeInteractionInfo =
+    CommandParameterInfo basiclocationCommandParameterInfo =
+        new CommandParameterInfo("value", String.class, String.class);
+    writeBasicLocationCommandParams.put("value", basiclocationCommandParameterInfo);
+    InteractionInfo writeBasicLocationAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .writeColorPointBXAttribute(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
+              ((ChipClusters.BasicCluster) cluster)
+                  .writeLocationAttribute(
+                      (DefaultClusterCallback) callback, (String) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeColorControlColorPointBXCommandParams);
-    writeColorControlInteractionInfo.put(
-        "writeColorPointBXAttribute", writeColorControlColorPointBXAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeColorControlColorPointBYCommandParams =
+            writeBasicLocationCommandParams);
+    writeBasicInteractionInfo.put(
+        "writeLocationAttribute", writeBasicLocationAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeBasicLocalConfigDisabledCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlcolorPointBYCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeColorControlColorPointBYCommandParams.put(
-        "value", colorControlcolorPointBYCommandParameterInfo);
-    InteractionInfo writeColorControlColorPointBYAttributeInteractionInfo =
+    CommandParameterInfo basiclocalConfigDisabledCommandParameterInfo =
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
+    writeBasicLocalConfigDisabledCommandParams.put(
+        "value", basiclocalConfigDisabledCommandParameterInfo);
+    InteractionInfo writeBasicLocalConfigDisabledAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .writeColorPointBYAttribute(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
+              ((ChipClusters.BasicCluster) cluster)
+                  .writeLocalConfigDisabledAttribute(
+                      (DefaultClusterCallback) callback, (Boolean) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeColorControlColorPointBYCommandParams);
-    writeColorControlInteractionInfo.put(
-        "writeColorPointBYAttribute", writeColorControlColorPointBYAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeColorControlColorPointBIntensityCommandParams =
+            writeBasicLocalConfigDisabledCommandParams);
+    writeBasicInteractionInfo.put(
+        "writeLocalConfigDisabledAttribute", writeBasicLocalConfigDisabledAttributeInteractionInfo);
+    writeAttributeMap.put("basic", writeBasicInteractionInfo);
+    Map<String, InteractionInfo> writeOtaSoftwareUpdateProviderInteractionInfo =
+        new LinkedHashMap<>();
+    writeAttributeMap.put(
+        "otaSoftwareUpdateProvider", writeOtaSoftwareUpdateProviderInteractionInfo);
+    Map<String, InteractionInfo> writeOtaSoftwareUpdateRequestorInteractionInfo =
+        new LinkedHashMap<>();
+    writeAttributeMap.put(
+        "otaSoftwareUpdateRequestor", writeOtaSoftwareUpdateRequestorInteractionInfo);
+    Map<String, InteractionInfo> writeLocalizationConfigurationInteractionInfo =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> writeLocalizationConfigurationActiveLocaleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlcolorPointBIntensityCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeColorControlColorPointBIntensityCommandParams.put(
-        "value", colorControlcolorPointBIntensityCommandParameterInfo);
-    InteractionInfo writeColorControlColorPointBIntensityAttributeInteractionInfo =
+    CommandParameterInfo localizationConfigurationactiveLocaleCommandParameterInfo =
+        new CommandParameterInfo("value", String.class, String.class);
+    writeLocalizationConfigurationActiveLocaleCommandParams.put(
+        "value", localizationConfigurationactiveLocaleCommandParameterInfo);
+    InteractionInfo writeLocalizationConfigurationActiveLocaleAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .writeColorPointBIntensityAttribute(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
+              ((ChipClusters.LocalizationConfigurationCluster) cluster)
+                  .writeActiveLocaleAttribute(
+                      (DefaultClusterCallback) callback, (String) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeColorControlColorPointBIntensityCommandParams);
-    writeColorControlInteractionInfo.put(
-        "writeColorPointBIntensityAttribute",
-        writeColorControlColorPointBIntensityAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeColorControlStartUpColorTemperatureMiredsCommandParams =
+            writeLocalizationConfigurationActiveLocaleCommandParams);
+    writeLocalizationConfigurationInteractionInfo.put(
+        "writeActiveLocaleAttribute",
+        writeLocalizationConfigurationActiveLocaleAttributeInteractionInfo);
+    writeAttributeMap.put(
+        "localizationConfiguration", writeLocalizationConfigurationInteractionInfo);
+    Map<String, InteractionInfo> writeTimeFormatLocalizationInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> writeTimeFormatLocalizationHourFormatCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlstartUpColorTemperatureMiredsCommandParameterInfo =
+    CommandParameterInfo timeFormatLocalizationhourFormatCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeColorControlStartUpColorTemperatureMiredsCommandParams.put(
-        "value", colorControlstartUpColorTemperatureMiredsCommandParameterInfo);
-    InteractionInfo writeColorControlStartUpColorTemperatureMiredsAttributeInteractionInfo =
+    writeTimeFormatLocalizationHourFormatCommandParams.put(
+        "value", timeFormatLocalizationhourFormatCommandParameterInfo);
+    InteractionInfo writeTimeFormatLocalizationHourFormatAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .writeStartUpColorTemperatureMiredsAttribute(
+              ((ChipClusters.TimeFormatLocalizationCluster) cluster)
+                  .writeHourFormatAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeColorControlStartUpColorTemperatureMiredsCommandParams);
-    writeColorControlInteractionInfo.put(
-        "writeStartUpColorTemperatureMiredsAttribute",
-        writeColorControlStartUpColorTemperatureMiredsAttributeInteractionInfo);
-    writeAttributeMap.put("colorControl", writeColorControlInteractionInfo);
-    Map<String, InteractionInfo> writeContentLauncherInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> writeContentLauncherSupportedStreamingProtocolsCommandParams =
+            writeTimeFormatLocalizationHourFormatCommandParams);
+    writeTimeFormatLocalizationInteractionInfo.put(
+        "writeHourFormatAttribute", writeTimeFormatLocalizationHourFormatAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeTimeFormatLocalizationActiveCalendarTypeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo contentLaunchersupportedStreamingProtocolsCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class, Long.class);
-    writeContentLauncherSupportedStreamingProtocolsCommandParams.put(
-        "value", contentLaunchersupportedStreamingProtocolsCommandParameterInfo);
-    InteractionInfo writeContentLauncherSupportedStreamingProtocolsAttributeInteractionInfo =
+    CommandParameterInfo timeFormatLocalizationactiveCalendarTypeCommandParameterInfo =
+        new CommandParameterInfo("value", Integer.class, Integer.class);
+    writeTimeFormatLocalizationActiveCalendarTypeCommandParams.put(
+        "value", timeFormatLocalizationactiveCalendarTypeCommandParameterInfo);
+    InteractionInfo writeTimeFormatLocalizationActiveCalendarTypeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ContentLauncherCluster) cluster)
-                  .writeSupportedStreamingProtocolsAttribute(
-                      (DefaultClusterCallback) callback, (Long) commandArguments.get("value"));
+              ((ChipClusters.TimeFormatLocalizationCluster) cluster)
+                  .writeActiveCalendarTypeAttribute(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeContentLauncherSupportedStreamingProtocolsCommandParams);
-    writeContentLauncherInteractionInfo.put(
-        "writeSupportedStreamingProtocolsAttribute",
-        writeContentLauncherSupportedStreamingProtocolsAttributeInteractionInfo);
-    writeAttributeMap.put("contentLauncher", writeContentLauncherInteractionInfo);
-    Map<String, InteractionInfo> writeDescriptorInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("descriptor", writeDescriptorInteractionInfo);
+            writeTimeFormatLocalizationActiveCalendarTypeCommandParams);
+    writeTimeFormatLocalizationInteractionInfo.put(
+        "writeActiveCalendarTypeAttribute",
+        writeTimeFormatLocalizationActiveCalendarTypeAttributeInteractionInfo);
+    writeAttributeMap.put("timeFormatLocalization", writeTimeFormatLocalizationInteractionInfo);
+    Map<String, InteractionInfo> writeUnitLocalizationInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> writeUnitLocalizationTemperatureUnitCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo unitLocalizationtemperatureUnitCommandParameterInfo =
+        new CommandParameterInfo("value", Integer.class, Integer.class);
+    writeUnitLocalizationTemperatureUnitCommandParams.put(
+        "value", unitLocalizationtemperatureUnitCommandParameterInfo);
+    InteractionInfo writeUnitLocalizationTemperatureUnitAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.UnitLocalizationCluster) cluster)
+                  .writeTemperatureUnitAttribute(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
+            },
+            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+            writeUnitLocalizationTemperatureUnitCommandParams);
+    writeUnitLocalizationInteractionInfo.put(
+        "writeTemperatureUnitAttribute",
+        writeUnitLocalizationTemperatureUnitAttributeInteractionInfo);
+    writeAttributeMap.put("unitLocalization", writeUnitLocalizationInteractionInfo);
+    Map<String, InteractionInfo> writePowerSourceConfigurationInteractionInfo =
+        new LinkedHashMap<>();
+    writeAttributeMap.put("powerSourceConfiguration", writePowerSourceConfigurationInteractionInfo);
+    Map<String, InteractionInfo> writePowerSourceInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("powerSource", writePowerSourceInteractionInfo);
+    Map<String, InteractionInfo> writeGeneralCommissioningInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> writeGeneralCommissioningBreadcrumbCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo generalCommissioningbreadcrumbCommandParameterInfo =
+        new CommandParameterInfo("value", Long.class, Long.class);
+    writeGeneralCommissioningBreadcrumbCommandParams.put(
+        "value", generalCommissioningbreadcrumbCommandParameterInfo);
+    InteractionInfo writeGeneralCommissioningBreadcrumbAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.GeneralCommissioningCluster) cluster)
+                  .writeBreadcrumbAttribute(
+                      (DefaultClusterCallback) callback, (Long) commandArguments.get("value"));
+            },
+            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+            writeGeneralCommissioningBreadcrumbCommandParams);
+    writeGeneralCommissioningInteractionInfo.put(
+        "writeBreadcrumbAttribute", writeGeneralCommissioningBreadcrumbAttributeInteractionInfo);
+    writeAttributeMap.put("generalCommissioning", writeGeneralCommissioningInteractionInfo);
+    Map<String, InteractionInfo> writeNetworkCommissioningInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> writeNetworkCommissioningInterfaceEnabledCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo networkCommissioninginterfaceEnabledCommandParameterInfo =
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
+    writeNetworkCommissioningInterfaceEnabledCommandParams.put(
+        "value", networkCommissioninginterfaceEnabledCommandParameterInfo);
+    InteractionInfo writeNetworkCommissioningInterfaceEnabledAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .writeInterfaceEnabledAttribute(
+                      (DefaultClusterCallback) callback, (Boolean) commandArguments.get("value"));
+            },
+            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+            writeNetworkCommissioningInterfaceEnabledCommandParams);
+    writeNetworkCommissioningInteractionInfo.put(
+        "writeInterfaceEnabledAttribute",
+        writeNetworkCommissioningInterfaceEnabledAttributeInteractionInfo);
+    writeAttributeMap.put("networkCommissioning", writeNetworkCommissioningInteractionInfo);
     Map<String, InteractionInfo> writeDiagnosticLogsInteractionInfo = new LinkedHashMap<>();
     writeAttributeMap.put("diagnosticLogs", writeDiagnosticLogsInteractionInfo);
+    Map<String, InteractionInfo> writeGeneralDiagnosticsInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("generalDiagnostics", writeGeneralDiagnosticsInteractionInfo);
+    Map<String, InteractionInfo> writeSoftwareDiagnosticsInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("softwareDiagnostics", writeSoftwareDiagnosticsInteractionInfo);
+    Map<String, InteractionInfo> writeThreadNetworkDiagnosticsInteractionInfo =
+        new LinkedHashMap<>();
+    writeAttributeMap.put("threadNetworkDiagnostics", writeThreadNetworkDiagnosticsInteractionInfo);
+    Map<String, InteractionInfo> writeWiFiNetworkDiagnosticsInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("wiFiNetworkDiagnostics", writeWiFiNetworkDiagnosticsInteractionInfo);
+    Map<String, InteractionInfo> writeEthernetNetworkDiagnosticsInteractionInfo =
+        new LinkedHashMap<>();
+    writeAttributeMap.put(
+        "ethernetNetworkDiagnostics", writeEthernetNetworkDiagnosticsInteractionInfo);
+    Map<String, InteractionInfo> writeBridgedDeviceBasicInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> writeBridgedDeviceBasicNodeLabelCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo bridgedDeviceBasicnodeLabelCommandParameterInfo =
+        new CommandParameterInfo("value", String.class, String.class);
+    writeBridgedDeviceBasicNodeLabelCommandParams.put(
+        "value", bridgedDeviceBasicnodeLabelCommandParameterInfo);
+    InteractionInfo writeBridgedDeviceBasicNodeLabelAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.BridgedDeviceBasicCluster) cluster)
+                  .writeNodeLabelAttribute(
+                      (DefaultClusterCallback) callback, (String) commandArguments.get("value"));
+            },
+            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+            writeBridgedDeviceBasicNodeLabelCommandParams);
+    writeBridgedDeviceBasicInteractionInfo.put(
+        "writeNodeLabelAttribute", writeBridgedDeviceBasicNodeLabelAttributeInteractionInfo);
+    writeAttributeMap.put("bridgedDeviceBasic", writeBridgedDeviceBasicInteractionInfo);
+    Map<String, InteractionInfo> writeSwitchInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("switch", writeSwitchInteractionInfo);
+    Map<String, InteractionInfo> writeAdministratorCommissioningInteractionInfo =
+        new LinkedHashMap<>();
+    writeAttributeMap.put(
+        "administratorCommissioning", writeAdministratorCommissioningInteractionInfo);
+    Map<String, InteractionInfo> writeOperationalCredentialsInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("operationalCredentials", writeOperationalCredentialsInteractionInfo);
+    Map<String, InteractionInfo> writeGroupKeyManagementInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("groupKeyManagement", writeGroupKeyManagementInteractionInfo);
+    Map<String, InteractionInfo> writeFixedLabelInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("fixedLabel", writeFixedLabelInteractionInfo);
+    Map<String, InteractionInfo> writeUserLabelInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("userLabel", writeUserLabelInteractionInfo);
+    Map<String, InteractionInfo> writeBooleanStateInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("booleanState", writeBooleanStateInteractionInfo);
+    Map<String, InteractionInfo> writeModeSelectInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> writeModeSelectStartUpModeCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo modeSelectstartUpModeCommandParameterInfo =
+        new CommandParameterInfo("value", Integer.class, Integer.class);
+    writeModeSelectStartUpModeCommandParams.put("value", modeSelectstartUpModeCommandParameterInfo);
+    InteractionInfo writeModeSelectStartUpModeAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ModeSelectCluster) cluster)
+                  .writeStartUpModeAttribute(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
+            },
+            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+            writeModeSelectStartUpModeCommandParams);
+    writeModeSelectInteractionInfo.put(
+        "writeStartUpModeAttribute", writeModeSelectStartUpModeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeModeSelectOnModeCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo modeSelectonModeCommandParameterInfo =
+        new CommandParameterInfo("value", Integer.class, Integer.class);
+    writeModeSelectOnModeCommandParams.put("value", modeSelectonModeCommandParameterInfo);
+    InteractionInfo writeModeSelectOnModeAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ModeSelectCluster) cluster)
+                  .writeOnModeAttribute(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
+            },
+            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+            writeModeSelectOnModeCommandParams);
+    writeModeSelectInteractionInfo.put(
+        "writeOnModeAttribute", writeModeSelectOnModeAttributeInteractionInfo);
+    writeAttributeMap.put("modeSelect", writeModeSelectInteractionInfo);
     Map<String, InteractionInfo> writeDoorLockInteractionInfo = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> writeDoorLockLanguageCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
@@ -566,646 +711,816 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
         "writeRequirePINforRemoteOperationAttribute",
         writeDoorLockRequirePINforRemoteOperationAttributeInteractionInfo);
     writeAttributeMap.put("doorLock", writeDoorLockInteractionInfo);
-    Map<String, InteractionInfo> writeElectricalMeasurementInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("electricalMeasurement", writeElectricalMeasurementInteractionInfo);
-    Map<String, InteractionInfo> writeEthernetNetworkDiagnosticsInteractionInfo =
-        new LinkedHashMap<>();
-    writeAttributeMap.put(
-        "ethernetNetworkDiagnostics", writeEthernetNetworkDiagnosticsInteractionInfo);
-    Map<String, InteractionInfo> writeFanControlInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> writeFanControlFanModeCommandParams =
+    Map<String, InteractionInfo> writeWindowCoveringInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> writeWindowCoveringModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo fanControlfanModeCommandParameterInfo =
+    CommandParameterInfo windowCoveringmodeCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeFanControlFanModeCommandParams.put("value", fanControlfanModeCommandParameterInfo);
-    InteractionInfo writeFanControlFanModeAttributeInteractionInfo =
+    writeWindowCoveringModeCommandParams.put("value", windowCoveringmodeCommandParameterInfo);
+    InteractionInfo writeWindowCoveringModeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FanControlCluster) cluster)
-                  .writeFanModeAttribute(
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .writeModeAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeFanControlFanModeCommandParams);
-    writeFanControlInteractionInfo.put(
-        "writeFanModeAttribute", writeFanControlFanModeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeFanControlFanModeSequenceCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo fanControlfanModeSequenceCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeFanControlFanModeSequenceCommandParams.put(
-        "value", fanControlfanModeSequenceCommandParameterInfo);
-    InteractionInfo writeFanControlFanModeSequenceAttributeInteractionInfo =
+            writeWindowCoveringModeCommandParams);
+    writeWindowCoveringInteractionInfo.put(
+        "writeModeAttribute", writeWindowCoveringModeAttributeInteractionInfo);
+    writeAttributeMap.put("windowCovering", writeWindowCoveringInteractionInfo);
+    Map<String, InteractionInfo> writeBarrierControlInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("barrierControl", writeBarrierControlInteractionInfo);
+    Map<String, InteractionInfo> writePumpConfigurationAndControlInteractionInfo =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo>
+        writePumpConfigurationAndControlLifetimeRunningHoursCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo pumpConfigurationAndControllifetimeRunningHoursCommandParameterInfo =
+        new CommandParameterInfo("value", Long.class, Long.class);
+    writePumpConfigurationAndControlLifetimeRunningHoursCommandParams.put(
+        "value", pumpConfigurationAndControllifetimeRunningHoursCommandParameterInfo);
+    InteractionInfo writePumpConfigurationAndControlLifetimeRunningHoursAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FanControlCluster) cluster)
-                  .writeFanModeSequenceAttribute(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .writeLifetimeRunningHoursAttribute(
+                      (DefaultClusterCallback) callback, (Long) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeFanControlFanModeSequenceCommandParams);
-    writeFanControlInteractionInfo.put(
-        "writeFanModeSequenceAttribute", writeFanControlFanModeSequenceAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeFanControlPercentSettingCommandParams =
+            writePumpConfigurationAndControlLifetimeRunningHoursCommandParams);
+    writePumpConfigurationAndControlInteractionInfo.put(
+        "writeLifetimeRunningHoursAttribute",
+        writePumpConfigurationAndControlLifetimeRunningHoursAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        writePumpConfigurationAndControlLifetimeEnergyConsumedCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo pumpConfigurationAndControllifetimeEnergyConsumedCommandParameterInfo =
+        new CommandParameterInfo("value", Long.class, Long.class);
+    writePumpConfigurationAndControlLifetimeEnergyConsumedCommandParams.put(
+        "value", pumpConfigurationAndControllifetimeEnergyConsumedCommandParameterInfo);
+    InteractionInfo writePumpConfigurationAndControlLifetimeEnergyConsumedAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .writeLifetimeEnergyConsumedAttribute(
+                      (DefaultClusterCallback) callback, (Long) commandArguments.get("value"));
+            },
+            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+            writePumpConfigurationAndControlLifetimeEnergyConsumedCommandParams);
+    writePumpConfigurationAndControlInteractionInfo.put(
+        "writeLifetimeEnergyConsumedAttribute",
+        writePumpConfigurationAndControlLifetimeEnergyConsumedAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writePumpConfigurationAndControlOperationModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo fanControlpercentSettingCommandParameterInfo =
+    CommandParameterInfo pumpConfigurationAndControloperationModeCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeFanControlPercentSettingCommandParams.put(
-        "value", fanControlpercentSettingCommandParameterInfo);
-    InteractionInfo writeFanControlPercentSettingAttributeInteractionInfo =
+    writePumpConfigurationAndControlOperationModeCommandParams.put(
+        "value", pumpConfigurationAndControloperationModeCommandParameterInfo);
+    InteractionInfo writePumpConfigurationAndControlOperationModeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FanControlCluster) cluster)
-                  .writePercentSettingAttribute(
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .writeOperationModeAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeFanControlPercentSettingCommandParams);
-    writeFanControlInteractionInfo.put(
-        "writePercentSettingAttribute", writeFanControlPercentSettingAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeFanControlSpeedSettingCommandParams =
+            writePumpConfigurationAndControlOperationModeCommandParams);
+    writePumpConfigurationAndControlInteractionInfo.put(
+        "writeOperationModeAttribute",
+        writePumpConfigurationAndControlOperationModeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writePumpConfigurationAndControlControlModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo fanControlspeedSettingCommandParameterInfo =
+    CommandParameterInfo pumpConfigurationAndControlcontrolModeCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeFanControlSpeedSettingCommandParams.put(
-        "value", fanControlspeedSettingCommandParameterInfo);
-    InteractionInfo writeFanControlSpeedSettingAttributeInteractionInfo =
+    writePumpConfigurationAndControlControlModeCommandParams.put(
+        "value", pumpConfigurationAndControlcontrolModeCommandParameterInfo);
+    InteractionInfo writePumpConfigurationAndControlControlModeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FanControlCluster) cluster)
-                  .writeSpeedSettingAttribute(
+              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
+                  .writeControlModeAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeFanControlSpeedSettingCommandParams);
-    writeFanControlInteractionInfo.put(
-        "writeSpeedSettingAttribute", writeFanControlSpeedSettingAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeFanControlRockSettingCommandParams =
+            writePumpConfigurationAndControlControlModeCommandParams);
+    writePumpConfigurationAndControlInteractionInfo.put(
+        "writeControlModeAttribute",
+        writePumpConfigurationAndControlControlModeAttributeInteractionInfo);
+    writeAttributeMap.put(
+        "pumpConfigurationAndControl", writePumpConfigurationAndControlInteractionInfo);
+    Map<String, InteractionInfo> writeThermostatInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> writeThermostatOccupiedCoolingSetpointCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo fanControlrockSettingCommandParameterInfo =
+    CommandParameterInfo thermostatoccupiedCoolingSetpointCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeFanControlRockSettingCommandParams.put("value", fanControlrockSettingCommandParameterInfo);
-    InteractionInfo writeFanControlRockSettingAttributeInteractionInfo =
+    writeThermostatOccupiedCoolingSetpointCommandParams.put(
+        "value", thermostatoccupiedCoolingSetpointCommandParameterInfo);
+    InteractionInfo writeThermostatOccupiedCoolingSetpointAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FanControlCluster) cluster)
-                  .writeRockSettingAttribute(
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .writeOccupiedCoolingSetpointAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeFanControlRockSettingCommandParams);
-    writeFanControlInteractionInfo.put(
-        "writeRockSettingAttribute", writeFanControlRockSettingAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeFanControlWindSettingCommandParams =
+            writeThermostatOccupiedCoolingSetpointCommandParams);
+    writeThermostatInteractionInfo.put(
+        "writeOccupiedCoolingSetpointAttribute",
+        writeThermostatOccupiedCoolingSetpointAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeThermostatOccupiedHeatingSetpointCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo fanControlwindSettingCommandParameterInfo =
+    CommandParameterInfo thermostatoccupiedHeatingSetpointCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeFanControlWindSettingCommandParams.put("value", fanControlwindSettingCommandParameterInfo);
-    InteractionInfo writeFanControlWindSettingAttributeInteractionInfo =
+    writeThermostatOccupiedHeatingSetpointCommandParams.put(
+        "value", thermostatoccupiedHeatingSetpointCommandParameterInfo);
+    InteractionInfo writeThermostatOccupiedHeatingSetpointAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.FanControlCluster) cluster)
-                  .writeWindSettingAttribute(
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .writeOccupiedHeatingSetpointAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeFanControlWindSettingCommandParams);
-    writeFanControlInteractionInfo.put(
-        "writeWindSettingAttribute", writeFanControlWindSettingAttributeInteractionInfo);
-    writeAttributeMap.put("fanControl", writeFanControlInteractionInfo);
-    Map<String, InteractionInfo> writeFixedLabelInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("fixedLabel", writeFixedLabelInteractionInfo);
-    Map<String, InteractionInfo> writeFlowMeasurementInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("flowMeasurement", writeFlowMeasurementInteractionInfo);
-    Map<String, InteractionInfo> writeGeneralCommissioningInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> writeGeneralCommissioningBreadcrumbCommandParams =
+            writeThermostatOccupiedHeatingSetpointCommandParams);
+    writeThermostatInteractionInfo.put(
+        "writeOccupiedHeatingSetpointAttribute",
+        writeThermostatOccupiedHeatingSetpointAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeThermostatMinHeatSetpointLimitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo generalCommissioningbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class, Long.class);
-    writeGeneralCommissioningBreadcrumbCommandParams.put(
-        "value", generalCommissioningbreadcrumbCommandParameterInfo);
-    InteractionInfo writeGeneralCommissioningBreadcrumbAttributeInteractionInfo =
+    CommandParameterInfo thermostatminHeatSetpointLimitCommandParameterInfo =
+        new CommandParameterInfo("value", Integer.class, Integer.class);
+    writeThermostatMinHeatSetpointLimitCommandParams.put(
+        "value", thermostatminHeatSetpointLimitCommandParameterInfo);
+    InteractionInfo writeThermostatMinHeatSetpointLimitAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.GeneralCommissioningCluster) cluster)
-                  .writeBreadcrumbAttribute(
-                      (DefaultClusterCallback) callback, (Long) commandArguments.get("value"));
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .writeMinHeatSetpointLimitAttribute(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeGeneralCommissioningBreadcrumbCommandParams);
-    writeGeneralCommissioningInteractionInfo.put(
-        "writeBreadcrumbAttribute", writeGeneralCommissioningBreadcrumbAttributeInteractionInfo);
-    writeAttributeMap.put("generalCommissioning", writeGeneralCommissioningInteractionInfo);
-    Map<String, InteractionInfo> writeGeneralDiagnosticsInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("generalDiagnostics", writeGeneralDiagnosticsInteractionInfo);
-    Map<String, InteractionInfo> writeGroupKeyManagementInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("groupKeyManagement", writeGroupKeyManagementInteractionInfo);
-    Map<String, InteractionInfo> writeGroupsInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("groups", writeGroupsInteractionInfo);
-    Map<String, InteractionInfo> writeIdentifyInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> writeIdentifyIdentifyTimeCommandParams =
+            writeThermostatMinHeatSetpointLimitCommandParams);
+    writeThermostatInteractionInfo.put(
+        "writeMinHeatSetpointLimitAttribute",
+        writeThermostatMinHeatSetpointLimitAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeThermostatMaxHeatSetpointLimitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo identifyidentifyTimeCommandParameterInfo =
+    CommandParameterInfo thermostatmaxHeatSetpointLimitCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeIdentifyIdentifyTimeCommandParams.put("value", identifyidentifyTimeCommandParameterInfo);
-    InteractionInfo writeIdentifyIdentifyTimeAttributeInteractionInfo =
+    writeThermostatMaxHeatSetpointLimitCommandParams.put(
+        "value", thermostatmaxHeatSetpointLimitCommandParameterInfo);
+    InteractionInfo writeThermostatMaxHeatSetpointLimitAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.IdentifyCluster) cluster)
-                  .writeIdentifyTimeAttribute(
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .writeMaxHeatSetpointLimitAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeIdentifyIdentifyTimeCommandParams);
-    writeIdentifyInteractionInfo.put(
-        "writeIdentifyTimeAttribute", writeIdentifyIdentifyTimeAttributeInteractionInfo);
-    writeAttributeMap.put("identify", writeIdentifyInteractionInfo);
-    Map<String, InteractionInfo> writeIlluminanceMeasurementInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("illuminanceMeasurement", writeIlluminanceMeasurementInteractionInfo);
-    Map<String, InteractionInfo> writeKeypadInputInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("keypadInput", writeKeypadInputInteractionInfo);
-    Map<String, InteractionInfo> writeLevelControlInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> writeLevelControlOptionsCommandParams =
+            writeThermostatMaxHeatSetpointLimitCommandParams);
+    writeThermostatInteractionInfo.put(
+        "writeMaxHeatSetpointLimitAttribute",
+        writeThermostatMaxHeatSetpointLimitAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeThermostatMinCoolSetpointLimitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo levelControloptionsCommandParameterInfo =
+    CommandParameterInfo thermostatminCoolSetpointLimitCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeLevelControlOptionsCommandParams.put("value", levelControloptionsCommandParameterInfo);
-    InteractionInfo writeLevelControlOptionsAttributeInteractionInfo =
+    writeThermostatMinCoolSetpointLimitCommandParams.put(
+        "value", thermostatminCoolSetpointLimitCommandParameterInfo);
+    InteractionInfo writeThermostatMinCoolSetpointLimitAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .writeOptionsAttribute(
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .writeMinCoolSetpointLimitAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeLevelControlOptionsCommandParams);
-    writeLevelControlInteractionInfo.put(
-        "writeOptionsAttribute", writeLevelControlOptionsAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeLevelControlOnOffTransitionTimeCommandParams =
+            writeThermostatMinCoolSetpointLimitCommandParams);
+    writeThermostatInteractionInfo.put(
+        "writeMinCoolSetpointLimitAttribute",
+        writeThermostatMinCoolSetpointLimitAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeThermostatMaxCoolSetpointLimitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo levelControlonOffTransitionTimeCommandParameterInfo =
+    CommandParameterInfo thermostatmaxCoolSetpointLimitCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeLevelControlOnOffTransitionTimeCommandParams.put(
-        "value", levelControlonOffTransitionTimeCommandParameterInfo);
-    InteractionInfo writeLevelControlOnOffTransitionTimeAttributeInteractionInfo =
+    writeThermostatMaxCoolSetpointLimitCommandParams.put(
+        "value", thermostatmaxCoolSetpointLimitCommandParameterInfo);
+    InteractionInfo writeThermostatMaxCoolSetpointLimitAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .writeOnOffTransitionTimeAttribute(
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .writeMaxCoolSetpointLimitAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeLevelControlOnOffTransitionTimeCommandParams);
-    writeLevelControlInteractionInfo.put(
-        "writeOnOffTransitionTimeAttribute",
-        writeLevelControlOnOffTransitionTimeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeLevelControlOnLevelCommandParams =
+            writeThermostatMaxCoolSetpointLimitCommandParams);
+    writeThermostatInteractionInfo.put(
+        "writeMaxCoolSetpointLimitAttribute",
+        writeThermostatMaxCoolSetpointLimitAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeThermostatMinSetpointDeadBandCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo levelControlonLevelCommandParameterInfo =
+    CommandParameterInfo thermostatminSetpointDeadBandCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeLevelControlOnLevelCommandParams.put("value", levelControlonLevelCommandParameterInfo);
-    InteractionInfo writeLevelControlOnLevelAttributeInteractionInfo =
+    writeThermostatMinSetpointDeadBandCommandParams.put(
+        "value", thermostatminSetpointDeadBandCommandParameterInfo);
+    InteractionInfo writeThermostatMinSetpointDeadBandAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .writeOnLevelAttribute(
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .writeMinSetpointDeadBandAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeLevelControlOnLevelCommandParams);
-    writeLevelControlInteractionInfo.put(
-        "writeOnLevelAttribute", writeLevelControlOnLevelAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeLevelControlOnTransitionTimeCommandParams =
+            writeThermostatMinSetpointDeadBandCommandParams);
+    writeThermostatInteractionInfo.put(
+        "writeMinSetpointDeadBandAttribute",
+        writeThermostatMinSetpointDeadBandAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeThermostatControlSequenceOfOperationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo levelControlonTransitionTimeCommandParameterInfo =
+    CommandParameterInfo thermostatcontrolSequenceOfOperationCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeLevelControlOnTransitionTimeCommandParams.put(
-        "value", levelControlonTransitionTimeCommandParameterInfo);
-    InteractionInfo writeLevelControlOnTransitionTimeAttributeInteractionInfo =
+    writeThermostatControlSequenceOfOperationCommandParams.put(
+        "value", thermostatcontrolSequenceOfOperationCommandParameterInfo);
+    InteractionInfo writeThermostatControlSequenceOfOperationAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .writeOnTransitionTimeAttribute(
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .writeControlSequenceOfOperationAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeLevelControlOnTransitionTimeCommandParams);
-    writeLevelControlInteractionInfo.put(
-        "writeOnTransitionTimeAttribute",
-        writeLevelControlOnTransitionTimeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeLevelControlOffTransitionTimeCommandParams =
+            writeThermostatControlSequenceOfOperationCommandParams);
+    writeThermostatInteractionInfo.put(
+        "writeControlSequenceOfOperationAttribute",
+        writeThermostatControlSequenceOfOperationAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeThermostatSystemModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo levelControloffTransitionTimeCommandParameterInfo =
+    CommandParameterInfo thermostatsystemModeCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeLevelControlOffTransitionTimeCommandParams.put(
-        "value", levelControloffTransitionTimeCommandParameterInfo);
-    InteractionInfo writeLevelControlOffTransitionTimeAttributeInteractionInfo =
+    writeThermostatSystemModeCommandParams.put("value", thermostatsystemModeCommandParameterInfo);
+    InteractionInfo writeThermostatSystemModeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .writeOffTransitionTimeAttribute(
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .writeSystemModeAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeLevelControlOffTransitionTimeCommandParams);
-    writeLevelControlInteractionInfo.put(
-        "writeOffTransitionTimeAttribute",
-        writeLevelControlOffTransitionTimeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeLevelControlDefaultMoveRateCommandParams =
+            writeThermostatSystemModeCommandParams);
+    writeThermostatInteractionInfo.put(
+        "writeSystemModeAttribute", writeThermostatSystemModeAttributeInteractionInfo);
+    writeAttributeMap.put("thermostat", writeThermostatInteractionInfo);
+    Map<String, InteractionInfo> writeFanControlInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> writeFanControlFanModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo levelControldefaultMoveRateCommandParameterInfo =
+    CommandParameterInfo fanControlfanModeCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeLevelControlDefaultMoveRateCommandParams.put(
-        "value", levelControldefaultMoveRateCommandParameterInfo);
-    InteractionInfo writeLevelControlDefaultMoveRateAttributeInteractionInfo =
+    writeFanControlFanModeCommandParams.put("value", fanControlfanModeCommandParameterInfo);
+    InteractionInfo writeFanControlFanModeAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .writeDefaultMoveRateAttribute(
+              ((ChipClusters.FanControlCluster) cluster)
+                  .writeFanModeAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeLevelControlDefaultMoveRateCommandParams);
-    writeLevelControlInteractionInfo.put(
-        "writeDefaultMoveRateAttribute", writeLevelControlDefaultMoveRateAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeLevelControlStartUpCurrentLevelCommandParams =
+            writeFanControlFanModeCommandParams);
+    writeFanControlInteractionInfo.put(
+        "writeFanModeAttribute", writeFanControlFanModeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeFanControlFanModeSequenceCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo levelControlstartUpCurrentLevelCommandParameterInfo =
+    CommandParameterInfo fanControlfanModeSequenceCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeLevelControlStartUpCurrentLevelCommandParams.put(
-        "value", levelControlstartUpCurrentLevelCommandParameterInfo);
-    InteractionInfo writeLevelControlStartUpCurrentLevelAttributeInteractionInfo =
+    writeFanControlFanModeSequenceCommandParams.put(
+        "value", fanControlfanModeSequenceCommandParameterInfo);
+    InteractionInfo writeFanControlFanModeSequenceAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .writeStartUpCurrentLevelAttribute(
+              ((ChipClusters.FanControlCluster) cluster)
+                  .writeFanModeSequenceAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeLevelControlStartUpCurrentLevelCommandParams);
-    writeLevelControlInteractionInfo.put(
-        "writeStartUpCurrentLevelAttribute",
-        writeLevelControlStartUpCurrentLevelAttributeInteractionInfo);
-    writeAttributeMap.put("levelControl", writeLevelControlInteractionInfo);
-    Map<String, InteractionInfo> writeLocalizationConfigurationInteractionInfo =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> writeLocalizationConfigurationActiveLocaleCommandParams =
+            writeFanControlFanModeSequenceCommandParams);
+    writeFanControlInteractionInfo.put(
+        "writeFanModeSequenceAttribute", writeFanControlFanModeSequenceAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeFanControlPercentSettingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo localizationConfigurationactiveLocaleCommandParameterInfo =
-        new CommandParameterInfo("value", String.class, String.class);
-    writeLocalizationConfigurationActiveLocaleCommandParams.put(
-        "value", localizationConfigurationactiveLocaleCommandParameterInfo);
-    InteractionInfo writeLocalizationConfigurationActiveLocaleAttributeInteractionInfo =
+    CommandParameterInfo fanControlpercentSettingCommandParameterInfo =
+        new CommandParameterInfo("value", Integer.class, Integer.class);
+    writeFanControlPercentSettingCommandParams.put(
+        "value", fanControlpercentSettingCommandParameterInfo);
+    InteractionInfo writeFanControlPercentSettingAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.LocalizationConfigurationCluster) cluster)
-                  .writeActiveLocaleAttribute(
-                      (DefaultClusterCallback) callback, (String) commandArguments.get("value"));
+              ((ChipClusters.FanControlCluster) cluster)
+                  .writePercentSettingAttribute(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeLocalizationConfigurationActiveLocaleCommandParams);
-    writeLocalizationConfigurationInteractionInfo.put(
-        "writeActiveLocaleAttribute",
-        writeLocalizationConfigurationActiveLocaleAttributeInteractionInfo);
-    writeAttributeMap.put(
-        "localizationConfiguration", writeLocalizationConfigurationInteractionInfo);
-    Map<String, InteractionInfo> writeLowPowerInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("lowPower", writeLowPowerInteractionInfo);
-    Map<String, InteractionInfo> writeMediaInputInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("mediaInput", writeMediaInputInteractionInfo);
-    Map<String, InteractionInfo> writeMediaPlaybackInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("mediaPlayback", writeMediaPlaybackInteractionInfo);
-    Map<String, InteractionInfo> writeModeSelectInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> writeModeSelectStartUpModeCommandParams =
+            writeFanControlPercentSettingCommandParams);
+    writeFanControlInteractionInfo.put(
+        "writePercentSettingAttribute", writeFanControlPercentSettingAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeFanControlSpeedSettingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo modeSelectstartUpModeCommandParameterInfo =
+    CommandParameterInfo fanControlspeedSettingCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeModeSelectStartUpModeCommandParams.put("value", modeSelectstartUpModeCommandParameterInfo);
-    InteractionInfo writeModeSelectStartUpModeAttributeInteractionInfo =
+    writeFanControlSpeedSettingCommandParams.put(
+        "value", fanControlspeedSettingCommandParameterInfo);
+    InteractionInfo writeFanControlSpeedSettingAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ModeSelectCluster) cluster)
-                  .writeStartUpModeAttribute(
+              ((ChipClusters.FanControlCluster) cluster)
+                  .writeSpeedSettingAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeModeSelectStartUpModeCommandParams);
-    writeModeSelectInteractionInfo.put(
-        "writeStartUpModeAttribute", writeModeSelectStartUpModeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeModeSelectOnModeCommandParams =
+            writeFanControlSpeedSettingCommandParams);
+    writeFanControlInteractionInfo.put(
+        "writeSpeedSettingAttribute", writeFanControlSpeedSettingAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeFanControlRockSettingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo modeSelectonModeCommandParameterInfo =
+    CommandParameterInfo fanControlrockSettingCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeModeSelectOnModeCommandParams.put("value", modeSelectonModeCommandParameterInfo);
-    InteractionInfo writeModeSelectOnModeAttributeInteractionInfo =
+    writeFanControlRockSettingCommandParams.put("value", fanControlrockSettingCommandParameterInfo);
+    InteractionInfo writeFanControlRockSettingAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ModeSelectCluster) cluster)
-                  .writeOnModeAttribute(
+              ((ChipClusters.FanControlCluster) cluster)
+                  .writeRockSettingAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeModeSelectOnModeCommandParams);
-    writeModeSelectInteractionInfo.put(
-        "writeOnModeAttribute", writeModeSelectOnModeAttributeInteractionInfo);
-    writeAttributeMap.put("modeSelect", writeModeSelectInteractionInfo);
-    Map<String, InteractionInfo> writeNetworkCommissioningInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> writeNetworkCommissioningInterfaceEnabledCommandParams =
+            writeFanControlRockSettingCommandParams);
+    writeFanControlInteractionInfo.put(
+        "writeRockSettingAttribute", writeFanControlRockSettingAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeFanControlWindSettingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo networkCommissioninginterfaceEnabledCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class, Boolean.class);
-    writeNetworkCommissioningInterfaceEnabledCommandParams.put(
-        "value", networkCommissioninginterfaceEnabledCommandParameterInfo);
-    InteractionInfo writeNetworkCommissioningInterfaceEnabledAttributeInteractionInfo =
+    CommandParameterInfo fanControlwindSettingCommandParameterInfo =
+        new CommandParameterInfo("value", Integer.class, Integer.class);
+    writeFanControlWindSettingCommandParams.put("value", fanControlwindSettingCommandParameterInfo);
+    InteractionInfo writeFanControlWindSettingAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .writeInterfaceEnabledAttribute(
-                      (DefaultClusterCallback) callback, (Boolean) commandArguments.get("value"));
+              ((ChipClusters.FanControlCluster) cluster)
+                  .writeWindSettingAttribute(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeNetworkCommissioningInterfaceEnabledCommandParams);
-    writeNetworkCommissioningInteractionInfo.put(
-        "writeInterfaceEnabledAttribute",
-        writeNetworkCommissioningInterfaceEnabledAttributeInteractionInfo);
-    writeAttributeMap.put("networkCommissioning", writeNetworkCommissioningInteractionInfo);
-    Map<String, InteractionInfo> writeOtaSoftwareUpdateProviderInteractionInfo =
-        new LinkedHashMap<>();
-    writeAttributeMap.put(
-        "otaSoftwareUpdateProvider", writeOtaSoftwareUpdateProviderInteractionInfo);
-    Map<String, InteractionInfo> writeOtaSoftwareUpdateRequestorInteractionInfo =
+            writeFanControlWindSettingCommandParams);
+    writeFanControlInteractionInfo.put(
+        "writeWindSettingAttribute", writeFanControlWindSettingAttributeInteractionInfo);
+    writeAttributeMap.put("fanControl", writeFanControlInteractionInfo);
+    Map<String, InteractionInfo> writeThermostatUserInterfaceConfigurationInteractionInfo =
         new LinkedHashMap<>();
-    writeAttributeMap.put(
-        "otaSoftwareUpdateRequestor", writeOtaSoftwareUpdateRequestorInteractionInfo);
-    Map<String, InteractionInfo> writeOccupancySensingInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("occupancySensing", writeOccupancySensingInteractionInfo);
-    Map<String, InteractionInfo> writeOnOffInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> writeOnOffOnTimeCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo onOffonTimeCommandParameterInfo =
+    Map<String, CommandParameterInfo>
+        writeThermostatUserInterfaceConfigurationTemperatureDisplayModeCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo
+        thermostatUserInterfaceConfigurationtemperatureDisplayModeCommandParameterInfo =
+            new CommandParameterInfo("value", Integer.class, Integer.class);
+    writeThermostatUserInterfaceConfigurationTemperatureDisplayModeCommandParams.put(
+        "value", thermostatUserInterfaceConfigurationtemperatureDisplayModeCommandParameterInfo);
+    InteractionInfo
+        writeThermostatUserInterfaceConfigurationTemperatureDisplayModeAttributeInteractionInfo =
+            new InteractionInfo(
+                (cluster, callback, commandArguments) -> {
+                  ((ChipClusters.ThermostatUserInterfaceConfigurationCluster) cluster)
+                      .writeTemperatureDisplayModeAttribute(
+                          (DefaultClusterCallback) callback,
+                          (Integer) commandArguments.get("value"));
+                },
+                () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+                writeThermostatUserInterfaceConfigurationTemperatureDisplayModeCommandParams);
+    writeThermostatUserInterfaceConfigurationInteractionInfo.put(
+        "writeTemperatureDisplayModeAttribute",
+        writeThermostatUserInterfaceConfigurationTemperatureDisplayModeAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        writeThermostatUserInterfaceConfigurationKeypadLockoutCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo thermostatUserInterfaceConfigurationkeypadLockoutCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeOnOffOnTimeCommandParams.put("value", onOffonTimeCommandParameterInfo);
-    InteractionInfo writeOnOffOnTimeAttributeInteractionInfo =
+    writeThermostatUserInterfaceConfigurationKeypadLockoutCommandParams.put(
+        "value", thermostatUserInterfaceConfigurationkeypadLockoutCommandParameterInfo);
+    InteractionInfo writeThermostatUserInterfaceConfigurationKeypadLockoutAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffCluster) cluster)
-                  .writeOnTimeAttribute(
+              ((ChipClusters.ThermostatUserInterfaceConfigurationCluster) cluster)
+                  .writeKeypadLockoutAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeOnOffOnTimeCommandParams);
-    writeOnOffInteractionInfo.put("writeOnTimeAttribute", writeOnOffOnTimeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeOnOffOffWaitTimeCommandParams =
+            writeThermostatUserInterfaceConfigurationKeypadLockoutCommandParams);
+    writeThermostatUserInterfaceConfigurationInteractionInfo.put(
+        "writeKeypadLockoutAttribute",
+        writeThermostatUserInterfaceConfigurationKeypadLockoutAttributeInteractionInfo);
+    Map<String, CommandParameterInfo>
+        writeThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo
+        thermostatUserInterfaceConfigurationscheduleProgrammingVisibilityCommandParameterInfo =
+            new CommandParameterInfo("value", Integer.class, Integer.class);
+    writeThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityCommandParams.put(
+        "value",
+        thermostatUserInterfaceConfigurationscheduleProgrammingVisibilityCommandParameterInfo);
+    InteractionInfo
+        writeThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityAttributeInteractionInfo =
+            new InteractionInfo(
+                (cluster, callback, commandArguments) -> {
+                  ((ChipClusters.ThermostatUserInterfaceConfigurationCluster) cluster)
+                      .writeScheduleProgrammingVisibilityAttribute(
+                          (DefaultClusterCallback) callback,
+                          (Integer) commandArguments.get("value"));
+                },
+                () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+                writeThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityCommandParams);
+    writeThermostatUserInterfaceConfigurationInteractionInfo.put(
+        "writeScheduleProgrammingVisibilityAttribute",
+        writeThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityAttributeInteractionInfo);
+    writeAttributeMap.put(
+        "thermostatUserInterfaceConfiguration",
+        writeThermostatUserInterfaceConfigurationInteractionInfo);
+    Map<String, InteractionInfo> writeColorControlInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> writeColorControlOptionsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo onOffoffWaitTimeCommandParameterInfo =
+    CommandParameterInfo colorControloptionsCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeOnOffOffWaitTimeCommandParams.put("value", onOffoffWaitTimeCommandParameterInfo);
-    InteractionInfo writeOnOffOffWaitTimeAttributeInteractionInfo =
+    writeColorControlOptionsCommandParams.put("value", colorControloptionsCommandParameterInfo);
+    InteractionInfo writeColorControlOptionsAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffCluster) cluster)
-                  .writeOffWaitTimeAttribute(
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .writeOptionsAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeOnOffOffWaitTimeCommandParams);
-    writeOnOffInteractionInfo.put(
-        "writeOffWaitTimeAttribute", writeOnOffOffWaitTimeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeOnOffStartUpOnOffCommandParams =
+            writeColorControlOptionsCommandParams);
+    writeColorControlInteractionInfo.put(
+        "writeOptionsAttribute", writeColorControlOptionsAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeColorControlWhitePointXCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo onOffstartUpOnOffCommandParameterInfo =
+    CommandParameterInfo colorControlwhitePointXCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeOnOffStartUpOnOffCommandParams.put("value", onOffstartUpOnOffCommandParameterInfo);
-    InteractionInfo writeOnOffStartUpOnOffAttributeInteractionInfo =
+    writeColorControlWhitePointXCommandParams.put(
+        "value", colorControlwhitePointXCommandParameterInfo);
+    InteractionInfo writeColorControlWhitePointXAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffCluster) cluster)
-                  .writeStartUpOnOffAttribute(
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .writeWhitePointXAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeOnOffStartUpOnOffCommandParams);
-    writeOnOffInteractionInfo.put(
-        "writeStartUpOnOffAttribute", writeOnOffStartUpOnOffAttributeInteractionInfo);
-    writeAttributeMap.put("onOff", writeOnOffInteractionInfo);
-    Map<String, InteractionInfo> writeOnOffSwitchConfigurationInteractionInfo =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> writeOnOffSwitchConfigurationSwitchActionsCommandParams =
+            writeColorControlWhitePointXCommandParams);
+    writeColorControlInteractionInfo.put(
+        "writeWhitePointXAttribute", writeColorControlWhitePointXAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeColorControlWhitePointYCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo onOffSwitchConfigurationswitchActionsCommandParameterInfo =
+    CommandParameterInfo colorControlwhitePointYCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeOnOffSwitchConfigurationSwitchActionsCommandParams.put(
-        "value", onOffSwitchConfigurationswitchActionsCommandParameterInfo);
-    InteractionInfo writeOnOffSwitchConfigurationSwitchActionsAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.OnOffSwitchConfigurationCluster) cluster)
-                  .writeSwitchActionsAttribute(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
-            },
-            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeOnOffSwitchConfigurationSwitchActionsCommandParams);
-    writeOnOffSwitchConfigurationInteractionInfo.put(
-        "writeSwitchActionsAttribute",
-        writeOnOffSwitchConfigurationSwitchActionsAttributeInteractionInfo);
-    writeAttributeMap.put("onOffSwitchConfiguration", writeOnOffSwitchConfigurationInteractionInfo);
-    Map<String, InteractionInfo> writeOperationalCredentialsInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("operationalCredentials", writeOperationalCredentialsInteractionInfo);
-    Map<String, InteractionInfo> writePowerSourceInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("powerSource", writePowerSourceInteractionInfo);
-    Map<String, InteractionInfo> writePowerSourceConfigurationInteractionInfo =
-        new LinkedHashMap<>();
-    writeAttributeMap.put("powerSourceConfiguration", writePowerSourceConfigurationInteractionInfo);
-    Map<String, InteractionInfo> writePressureMeasurementInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("pressureMeasurement", writePressureMeasurementInteractionInfo);
-    Map<String, InteractionInfo> writePumpConfigurationAndControlInteractionInfo =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo>
-        writePumpConfigurationAndControlLifetimeRunningHoursCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo pumpConfigurationAndControllifetimeRunningHoursCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class, Long.class);
-    writePumpConfigurationAndControlLifetimeRunningHoursCommandParams.put(
-        "value", pumpConfigurationAndControllifetimeRunningHoursCommandParameterInfo);
-    InteractionInfo writePumpConfigurationAndControlLifetimeRunningHoursAttributeInteractionInfo =
+    writeColorControlWhitePointYCommandParams.put(
+        "value", colorControlwhitePointYCommandParameterInfo);
+    InteractionInfo writeColorControlWhitePointYAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .writeLifetimeRunningHoursAttribute(
-                      (DefaultClusterCallback) callback, (Long) commandArguments.get("value"));
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .writeWhitePointYAttribute(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writePumpConfigurationAndControlLifetimeRunningHoursCommandParams);
-    writePumpConfigurationAndControlInteractionInfo.put(
-        "writeLifetimeRunningHoursAttribute",
-        writePumpConfigurationAndControlLifetimeRunningHoursAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        writePumpConfigurationAndControlLifetimeEnergyConsumedCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo pumpConfigurationAndControllifetimeEnergyConsumedCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class, Long.class);
-    writePumpConfigurationAndControlLifetimeEnergyConsumedCommandParams.put(
-        "value", pumpConfigurationAndControllifetimeEnergyConsumedCommandParameterInfo);
-    InteractionInfo writePumpConfigurationAndControlLifetimeEnergyConsumedAttributeInteractionInfo =
+            writeColorControlWhitePointYCommandParams);
+    writeColorControlInteractionInfo.put(
+        "writeWhitePointYAttribute", writeColorControlWhitePointYAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeColorControlColorPointRXCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo colorControlcolorPointRXCommandParameterInfo =
+        new CommandParameterInfo("value", Integer.class, Integer.class);
+    writeColorControlColorPointRXCommandParams.put(
+        "value", colorControlcolorPointRXCommandParameterInfo);
+    InteractionInfo writeColorControlColorPointRXAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .writeLifetimeEnergyConsumedAttribute(
-                      (DefaultClusterCallback) callback, (Long) commandArguments.get("value"));
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .writeColorPointRXAttribute(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writePumpConfigurationAndControlLifetimeEnergyConsumedCommandParams);
-    writePumpConfigurationAndControlInteractionInfo.put(
-        "writeLifetimeEnergyConsumedAttribute",
-        writePumpConfigurationAndControlLifetimeEnergyConsumedAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writePumpConfigurationAndControlOperationModeCommandParams =
+            writeColorControlColorPointRXCommandParams);
+    writeColorControlInteractionInfo.put(
+        "writeColorPointRXAttribute", writeColorControlColorPointRXAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeColorControlColorPointRYCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo pumpConfigurationAndControloperationModeCommandParameterInfo =
+    CommandParameterInfo colorControlcolorPointRYCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writePumpConfigurationAndControlOperationModeCommandParams.put(
-        "value", pumpConfigurationAndControloperationModeCommandParameterInfo);
-    InteractionInfo writePumpConfigurationAndControlOperationModeAttributeInteractionInfo =
+    writeColorControlColorPointRYCommandParams.put(
+        "value", colorControlcolorPointRYCommandParameterInfo);
+    InteractionInfo writeColorControlColorPointRYAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .writeOperationModeAttribute(
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .writeColorPointRYAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writePumpConfigurationAndControlOperationModeCommandParams);
-    writePumpConfigurationAndControlInteractionInfo.put(
-        "writeOperationModeAttribute",
-        writePumpConfigurationAndControlOperationModeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writePumpConfigurationAndControlControlModeCommandParams =
+            writeColorControlColorPointRYCommandParams);
+    writeColorControlInteractionInfo.put(
+        "writeColorPointRYAttribute", writeColorControlColorPointRYAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeColorControlColorPointRIntensityCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo pumpConfigurationAndControlcontrolModeCommandParameterInfo =
+    CommandParameterInfo colorControlcolorPointRIntensityCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writePumpConfigurationAndControlControlModeCommandParams.put(
-        "value", pumpConfigurationAndControlcontrolModeCommandParameterInfo);
-    InteractionInfo writePumpConfigurationAndControlControlModeAttributeInteractionInfo =
+    writeColorControlColorPointRIntensityCommandParams.put(
+        "value", colorControlcolorPointRIntensityCommandParameterInfo);
+    InteractionInfo writeColorControlColorPointRIntensityAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.PumpConfigurationAndControlCluster) cluster)
-                  .writeControlModeAttribute(
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .writeColorPointRIntensityAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writePumpConfigurationAndControlControlModeCommandParams);
-    writePumpConfigurationAndControlInteractionInfo.put(
-        "writeControlModeAttribute",
-        writePumpConfigurationAndControlControlModeAttributeInteractionInfo);
-    writeAttributeMap.put(
-        "pumpConfigurationAndControl", writePumpConfigurationAndControlInteractionInfo);
-    Map<String, InteractionInfo> writeRelativeHumidityMeasurementInteractionInfo =
-        new LinkedHashMap<>();
-    writeAttributeMap.put(
-        "relativeHumidityMeasurement", writeRelativeHumidityMeasurementInteractionInfo);
-    Map<String, InteractionInfo> writeScenesInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("scenes", writeScenesInteractionInfo);
-    Map<String, InteractionInfo> writeSoftwareDiagnosticsInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("softwareDiagnostics", writeSoftwareDiagnosticsInteractionInfo);
-    Map<String, InteractionInfo> writeSwitchInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("switch", writeSwitchInteractionInfo);
-    Map<String, InteractionInfo> writeTargetNavigatorInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("targetNavigator", writeTargetNavigatorInteractionInfo);
-    Map<String, InteractionInfo> writeTemperatureMeasurementInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("temperatureMeasurement", writeTemperatureMeasurementInteractionInfo);
-    Map<String, InteractionInfo> writeTestClusterInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> writeTestClusterBooleanCommandParams =
+            writeColorControlColorPointRIntensityCommandParams);
+    writeColorControlInteractionInfo.put(
+        "writeColorPointRIntensityAttribute",
+        writeColorControlColorPointRIntensityAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeColorControlColorPointGXCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo testClusterbooleanCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class, Boolean.class);
-    writeTestClusterBooleanCommandParams.put("value", testClusterbooleanCommandParameterInfo);
-    InteractionInfo writeTestClusterBooleanAttributeInteractionInfo =
+    CommandParameterInfo colorControlcolorPointGXCommandParameterInfo =
+        new CommandParameterInfo("value", Integer.class, Integer.class);
+    writeColorControlColorPointGXCommandParams.put(
+        "value", colorControlcolorPointGXCommandParameterInfo);
+    InteractionInfo writeColorControlColorPointGXAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .writeBooleanAttribute(
-                      (DefaultClusterCallback) callback, (Boolean) commandArguments.get("value"));
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .writeColorPointGXAttribute(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeTestClusterBooleanCommandParams);
-    writeTestClusterInteractionInfo.put(
-        "writeBooleanAttribute", writeTestClusterBooleanAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeTestClusterBitmap8CommandParams =
+            writeColorControlColorPointGXCommandParams);
+    writeColorControlInteractionInfo.put(
+        "writeColorPointGXAttribute", writeColorControlColorPointGXAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeColorControlColorPointGYCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo testClusterbitmap8CommandParameterInfo =
+    CommandParameterInfo colorControlcolorPointGYCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeTestClusterBitmap8CommandParams.put("value", testClusterbitmap8CommandParameterInfo);
-    InteractionInfo writeTestClusterBitmap8AttributeInteractionInfo =
+    writeColorControlColorPointGYCommandParams.put(
+        "value", colorControlcolorPointGYCommandParameterInfo);
+    InteractionInfo writeColorControlColorPointGYAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .writeBitmap8Attribute(
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .writeColorPointGYAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeTestClusterBitmap8CommandParams);
-    writeTestClusterInteractionInfo.put(
-        "writeBitmap8Attribute", writeTestClusterBitmap8AttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeTestClusterBitmap16CommandParams =
+            writeColorControlColorPointGYCommandParams);
+    writeColorControlInteractionInfo.put(
+        "writeColorPointGYAttribute", writeColorControlColorPointGYAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeColorControlColorPointGIntensityCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo testClusterbitmap16CommandParameterInfo =
+    CommandParameterInfo colorControlcolorPointGIntensityCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeTestClusterBitmap16CommandParams.put("value", testClusterbitmap16CommandParameterInfo);
-    InteractionInfo writeTestClusterBitmap16AttributeInteractionInfo =
+    writeColorControlColorPointGIntensityCommandParams.put(
+        "value", colorControlcolorPointGIntensityCommandParameterInfo);
+    InteractionInfo writeColorControlColorPointGIntensityAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .writeBitmap16Attribute(
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .writeColorPointGIntensityAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeTestClusterBitmap16CommandParams);
-    writeTestClusterInteractionInfo.put(
-        "writeBitmap16Attribute", writeTestClusterBitmap16AttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeTestClusterBitmap32CommandParams =
+            writeColorControlColorPointGIntensityCommandParams);
+    writeColorControlInteractionInfo.put(
+        "writeColorPointGIntensityAttribute",
+        writeColorControlColorPointGIntensityAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeColorControlColorPointBXCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo testClusterbitmap32CommandParameterInfo =
-        new CommandParameterInfo("value", Long.class, Long.class);
-    writeTestClusterBitmap32CommandParams.put("value", testClusterbitmap32CommandParameterInfo);
-    InteractionInfo writeTestClusterBitmap32AttributeInteractionInfo =
+    CommandParameterInfo colorControlcolorPointBXCommandParameterInfo =
+        new CommandParameterInfo("value", Integer.class, Integer.class);
+    writeColorControlColorPointBXCommandParams.put(
+        "value", colorControlcolorPointBXCommandParameterInfo);
+    InteractionInfo writeColorControlColorPointBXAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .writeBitmap32Attribute(
-                      (DefaultClusterCallback) callback, (Long) commandArguments.get("value"));
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .writeColorPointBXAttribute(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeTestClusterBitmap32CommandParams);
-    writeTestClusterInteractionInfo.put(
-        "writeBitmap32Attribute", writeTestClusterBitmap32AttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeTestClusterBitmap64CommandParams =
+            writeColorControlColorPointBXCommandParams);
+    writeColorControlInteractionInfo.put(
+        "writeColorPointBXAttribute", writeColorControlColorPointBXAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeColorControlColorPointBYCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo testClusterbitmap64CommandParameterInfo =
-        new CommandParameterInfo("value", Long.class, Long.class);
-    writeTestClusterBitmap64CommandParams.put("value", testClusterbitmap64CommandParameterInfo);
-    InteractionInfo writeTestClusterBitmap64AttributeInteractionInfo =
+    CommandParameterInfo colorControlcolorPointBYCommandParameterInfo =
+        new CommandParameterInfo("value", Integer.class, Integer.class);
+    writeColorControlColorPointBYCommandParams.put(
+        "value", colorControlcolorPointBYCommandParameterInfo);
+    InteractionInfo writeColorControlColorPointBYAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .writeBitmap64Attribute(
-                      (DefaultClusterCallback) callback, (Long) commandArguments.get("value"));
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .writeColorPointBYAttribute(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeTestClusterBitmap64CommandParams);
-    writeTestClusterInteractionInfo.put(
-        "writeBitmap64Attribute", writeTestClusterBitmap64AttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeTestClusterInt8uCommandParams =
+            writeColorControlColorPointBYCommandParams);
+    writeColorControlInteractionInfo.put(
+        "writeColorPointBYAttribute", writeColorControlColorPointBYAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeColorControlColorPointBIntensityCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo testClusterint8uCommandParameterInfo =
+    CommandParameterInfo colorControlcolorPointBIntensityCommandParameterInfo =
         new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeTestClusterInt8uCommandParams.put("value", testClusterint8uCommandParameterInfo);
-    InteractionInfo writeTestClusterInt8uAttributeInteractionInfo =
+    writeColorControlColorPointBIntensityCommandParams.put(
+        "value", colorControlcolorPointBIntensityCommandParameterInfo);
+    InteractionInfo writeColorControlColorPointBIntensityAttributeInteractionInfo =
         new InteractionInfo(
             (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .writeInt8uAttribute(
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .writeColorPointBIntensityAttribute(
                       (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
             },
             () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeTestClusterInt8uCommandParams);
-    writeTestClusterInteractionInfo.put(
+            writeColorControlColorPointBIntensityCommandParams);
+    writeColorControlInteractionInfo.put(
+        "writeColorPointBIntensityAttribute",
+        writeColorControlColorPointBIntensityAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeColorControlStartUpColorTemperatureMiredsCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo colorControlstartUpColorTemperatureMiredsCommandParameterInfo =
+        new CommandParameterInfo("value", Integer.class, Integer.class);
+    writeColorControlStartUpColorTemperatureMiredsCommandParams.put(
+        "value", colorControlstartUpColorTemperatureMiredsCommandParameterInfo);
+    InteractionInfo writeColorControlStartUpColorTemperatureMiredsAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .writeStartUpColorTemperatureMiredsAttribute(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
+            },
+            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+            writeColorControlStartUpColorTemperatureMiredsCommandParams);
+    writeColorControlInteractionInfo.put(
+        "writeStartUpColorTemperatureMiredsAttribute",
+        writeColorControlStartUpColorTemperatureMiredsAttributeInteractionInfo);
+    writeAttributeMap.put("colorControl", writeColorControlInteractionInfo);
+    Map<String, InteractionInfo> writeIlluminanceMeasurementInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("illuminanceMeasurement", writeIlluminanceMeasurementInteractionInfo);
+    Map<String, InteractionInfo> writeTemperatureMeasurementInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("temperatureMeasurement", writeTemperatureMeasurementInteractionInfo);
+    Map<String, InteractionInfo> writePressureMeasurementInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("pressureMeasurement", writePressureMeasurementInteractionInfo);
+    Map<String, InteractionInfo> writeFlowMeasurementInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("flowMeasurement", writeFlowMeasurementInteractionInfo);
+    Map<String, InteractionInfo> writeRelativeHumidityMeasurementInteractionInfo =
+        new LinkedHashMap<>();
+    writeAttributeMap.put(
+        "relativeHumidityMeasurement", writeRelativeHumidityMeasurementInteractionInfo);
+    Map<String, InteractionInfo> writeOccupancySensingInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("occupancySensing", writeOccupancySensingInteractionInfo);
+    Map<String, InteractionInfo> writeWakeOnLanInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("wakeOnLan", writeWakeOnLanInteractionInfo);
+    Map<String, InteractionInfo> writeChannelInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("channel", writeChannelInteractionInfo);
+    Map<String, InteractionInfo> writeTargetNavigatorInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("targetNavigator", writeTargetNavigatorInteractionInfo);
+    Map<String, InteractionInfo> writeMediaPlaybackInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("mediaPlayback", writeMediaPlaybackInteractionInfo);
+    Map<String, InteractionInfo> writeMediaInputInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("mediaInput", writeMediaInputInteractionInfo);
+    Map<String, InteractionInfo> writeLowPowerInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("lowPower", writeLowPowerInteractionInfo);
+    Map<String, InteractionInfo> writeKeypadInputInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("keypadInput", writeKeypadInputInteractionInfo);
+    Map<String, InteractionInfo> writeContentLauncherInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> writeContentLauncherSupportedStreamingProtocolsCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo contentLaunchersupportedStreamingProtocolsCommandParameterInfo =
+        new CommandParameterInfo("value", Long.class, Long.class);
+    writeContentLauncherSupportedStreamingProtocolsCommandParams.put(
+        "value", contentLaunchersupportedStreamingProtocolsCommandParameterInfo);
+    InteractionInfo writeContentLauncherSupportedStreamingProtocolsAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.ContentLauncherCluster) cluster)
+                  .writeSupportedStreamingProtocolsAttribute(
+                      (DefaultClusterCallback) callback, (Long) commandArguments.get("value"));
+            },
+            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+            writeContentLauncherSupportedStreamingProtocolsCommandParams);
+    writeContentLauncherInteractionInfo.put(
+        "writeSupportedStreamingProtocolsAttribute",
+        writeContentLauncherSupportedStreamingProtocolsAttributeInteractionInfo);
+    writeAttributeMap.put("contentLauncher", writeContentLauncherInteractionInfo);
+    Map<String, InteractionInfo> writeAudioOutputInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("audioOutput", writeAudioOutputInteractionInfo);
+    Map<String, InteractionInfo> writeApplicationLauncherInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("applicationLauncher", writeApplicationLauncherInteractionInfo);
+    Map<String, InteractionInfo> writeApplicationBasicInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("applicationBasic", writeApplicationBasicInteractionInfo);
+    Map<String, InteractionInfo> writeAccountLoginInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("accountLogin", writeAccountLoginInteractionInfo);
+    Map<String, InteractionInfo> writeElectricalMeasurementInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("electricalMeasurement", writeElectricalMeasurementInteractionInfo);
+    Map<String, InteractionInfo> writeTestClusterInteractionInfo = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> writeTestClusterBooleanCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo testClusterbooleanCommandParameterInfo =
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
+    writeTestClusterBooleanCommandParams.put("value", testClusterbooleanCommandParameterInfo);
+    InteractionInfo writeTestClusterBooleanAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .writeBooleanAttribute(
+                      (DefaultClusterCallback) callback, (Boolean) commandArguments.get("value"));
+            },
+            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+            writeTestClusterBooleanCommandParams);
+    writeTestClusterInteractionInfo.put(
+        "writeBooleanAttribute", writeTestClusterBooleanAttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeTestClusterBitmap8CommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo testClusterbitmap8CommandParameterInfo =
+        new CommandParameterInfo("value", Integer.class, Integer.class);
+    writeTestClusterBitmap8CommandParams.put("value", testClusterbitmap8CommandParameterInfo);
+    InteractionInfo writeTestClusterBitmap8AttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .writeBitmap8Attribute(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
+            },
+            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+            writeTestClusterBitmap8CommandParams);
+    writeTestClusterInteractionInfo.put(
+        "writeBitmap8Attribute", writeTestClusterBitmap8AttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeTestClusterBitmap16CommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo testClusterbitmap16CommandParameterInfo =
+        new CommandParameterInfo("value", Integer.class, Integer.class);
+    writeTestClusterBitmap16CommandParams.put("value", testClusterbitmap16CommandParameterInfo);
+    InteractionInfo writeTestClusterBitmap16AttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .writeBitmap16Attribute(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
+            },
+            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+            writeTestClusterBitmap16CommandParams);
+    writeTestClusterInteractionInfo.put(
+        "writeBitmap16Attribute", writeTestClusterBitmap16AttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeTestClusterBitmap32CommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo testClusterbitmap32CommandParameterInfo =
+        new CommandParameterInfo("value", Long.class, Long.class);
+    writeTestClusterBitmap32CommandParams.put("value", testClusterbitmap32CommandParameterInfo);
+    InteractionInfo writeTestClusterBitmap32AttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .writeBitmap32Attribute(
+                      (DefaultClusterCallback) callback, (Long) commandArguments.get("value"));
+            },
+            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+            writeTestClusterBitmap32CommandParams);
+    writeTestClusterInteractionInfo.put(
+        "writeBitmap32Attribute", writeTestClusterBitmap32AttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeTestClusterBitmap64CommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo testClusterbitmap64CommandParameterInfo =
+        new CommandParameterInfo("value", Long.class, Long.class);
+    writeTestClusterBitmap64CommandParams.put("value", testClusterbitmap64CommandParameterInfo);
+    InteractionInfo writeTestClusterBitmap64AttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .writeBitmap64Attribute(
+                      (DefaultClusterCallback) callback, (Long) commandArguments.get("value"));
+            },
+            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+            writeTestClusterBitmap64CommandParams);
+    writeTestClusterInteractionInfo.put(
+        "writeBitmap64Attribute", writeTestClusterBitmap64AttributeInteractionInfo);
+    Map<String, CommandParameterInfo> writeTestClusterInt8uCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    CommandParameterInfo testClusterint8uCommandParameterInfo =
+        new CommandParameterInfo("value", Integer.class, Integer.class);
+    writeTestClusterInt8uCommandParams.put("value", testClusterint8uCommandParameterInfo);
+    InteractionInfo writeTestClusterInt8uAttributeInteractionInfo =
+        new InteractionInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .writeInt8uAttribute(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
+            },
+            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
+            writeTestClusterInt8uCommandParams);
+    writeTestClusterInteractionInfo.put(
         "writeInt8uAttribute", writeTestClusterInt8uAttributeInteractionInfo);
     Map<String, CommandParameterInfo> writeTestClusterInt16uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
@@ -2342,321 +2657,6 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
         "writeNullableRangeRestrictedInt16sAttribute",
         writeTestClusterNullableRangeRestrictedInt16sAttributeInteractionInfo);
     writeAttributeMap.put("testCluster", writeTestClusterInteractionInfo);
-    Map<String, InteractionInfo> writeThermostatInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> writeThermostatOccupiedCoolingSetpointCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo thermostatoccupiedCoolingSetpointCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeThermostatOccupiedCoolingSetpointCommandParams.put(
-        "value", thermostatoccupiedCoolingSetpointCommandParameterInfo);
-    InteractionInfo writeThermostatOccupiedCoolingSetpointAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .writeOccupiedCoolingSetpointAttribute(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
-            },
-            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeThermostatOccupiedCoolingSetpointCommandParams);
-    writeThermostatInteractionInfo.put(
-        "writeOccupiedCoolingSetpointAttribute",
-        writeThermostatOccupiedCoolingSetpointAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeThermostatOccupiedHeatingSetpointCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo thermostatoccupiedHeatingSetpointCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeThermostatOccupiedHeatingSetpointCommandParams.put(
-        "value", thermostatoccupiedHeatingSetpointCommandParameterInfo);
-    InteractionInfo writeThermostatOccupiedHeatingSetpointAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .writeOccupiedHeatingSetpointAttribute(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
-            },
-            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeThermostatOccupiedHeatingSetpointCommandParams);
-    writeThermostatInteractionInfo.put(
-        "writeOccupiedHeatingSetpointAttribute",
-        writeThermostatOccupiedHeatingSetpointAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeThermostatMinHeatSetpointLimitCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo thermostatminHeatSetpointLimitCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeThermostatMinHeatSetpointLimitCommandParams.put(
-        "value", thermostatminHeatSetpointLimitCommandParameterInfo);
-    InteractionInfo writeThermostatMinHeatSetpointLimitAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .writeMinHeatSetpointLimitAttribute(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
-            },
-            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeThermostatMinHeatSetpointLimitCommandParams);
-    writeThermostatInteractionInfo.put(
-        "writeMinHeatSetpointLimitAttribute",
-        writeThermostatMinHeatSetpointLimitAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeThermostatMaxHeatSetpointLimitCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo thermostatmaxHeatSetpointLimitCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeThermostatMaxHeatSetpointLimitCommandParams.put(
-        "value", thermostatmaxHeatSetpointLimitCommandParameterInfo);
-    InteractionInfo writeThermostatMaxHeatSetpointLimitAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .writeMaxHeatSetpointLimitAttribute(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
-            },
-            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeThermostatMaxHeatSetpointLimitCommandParams);
-    writeThermostatInteractionInfo.put(
-        "writeMaxHeatSetpointLimitAttribute",
-        writeThermostatMaxHeatSetpointLimitAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeThermostatMinCoolSetpointLimitCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo thermostatminCoolSetpointLimitCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeThermostatMinCoolSetpointLimitCommandParams.put(
-        "value", thermostatminCoolSetpointLimitCommandParameterInfo);
-    InteractionInfo writeThermostatMinCoolSetpointLimitAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .writeMinCoolSetpointLimitAttribute(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
-            },
-            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeThermostatMinCoolSetpointLimitCommandParams);
-    writeThermostatInteractionInfo.put(
-        "writeMinCoolSetpointLimitAttribute",
-        writeThermostatMinCoolSetpointLimitAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeThermostatMaxCoolSetpointLimitCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo thermostatmaxCoolSetpointLimitCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeThermostatMaxCoolSetpointLimitCommandParams.put(
-        "value", thermostatmaxCoolSetpointLimitCommandParameterInfo);
-    InteractionInfo writeThermostatMaxCoolSetpointLimitAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .writeMaxCoolSetpointLimitAttribute(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
-            },
-            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeThermostatMaxCoolSetpointLimitCommandParams);
-    writeThermostatInteractionInfo.put(
-        "writeMaxCoolSetpointLimitAttribute",
-        writeThermostatMaxCoolSetpointLimitAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeThermostatMinSetpointDeadBandCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo thermostatminSetpointDeadBandCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeThermostatMinSetpointDeadBandCommandParams.put(
-        "value", thermostatminSetpointDeadBandCommandParameterInfo);
-    InteractionInfo writeThermostatMinSetpointDeadBandAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .writeMinSetpointDeadBandAttribute(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
-            },
-            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeThermostatMinSetpointDeadBandCommandParams);
-    writeThermostatInteractionInfo.put(
-        "writeMinSetpointDeadBandAttribute",
-        writeThermostatMinSetpointDeadBandAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeThermostatControlSequenceOfOperationCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo thermostatcontrolSequenceOfOperationCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeThermostatControlSequenceOfOperationCommandParams.put(
-        "value", thermostatcontrolSequenceOfOperationCommandParameterInfo);
-    InteractionInfo writeThermostatControlSequenceOfOperationAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .writeControlSequenceOfOperationAttribute(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
-            },
-            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeThermostatControlSequenceOfOperationCommandParams);
-    writeThermostatInteractionInfo.put(
-        "writeControlSequenceOfOperationAttribute",
-        writeThermostatControlSequenceOfOperationAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeThermostatSystemModeCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo thermostatsystemModeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeThermostatSystemModeCommandParams.put("value", thermostatsystemModeCommandParameterInfo);
-    InteractionInfo writeThermostatSystemModeAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .writeSystemModeAttribute(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
-            },
-            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeThermostatSystemModeCommandParams);
-    writeThermostatInteractionInfo.put(
-        "writeSystemModeAttribute", writeThermostatSystemModeAttributeInteractionInfo);
-    writeAttributeMap.put("thermostat", writeThermostatInteractionInfo);
-    Map<String, InteractionInfo> writeThermostatUserInterfaceConfigurationInteractionInfo =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo>
-        writeThermostatUserInterfaceConfigurationTemperatureDisplayModeCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo
-        thermostatUserInterfaceConfigurationtemperatureDisplayModeCommandParameterInfo =
-            new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeThermostatUserInterfaceConfigurationTemperatureDisplayModeCommandParams.put(
-        "value", thermostatUserInterfaceConfigurationtemperatureDisplayModeCommandParameterInfo);
-    InteractionInfo
-        writeThermostatUserInterfaceConfigurationTemperatureDisplayModeAttributeInteractionInfo =
-            new InteractionInfo(
-                (cluster, callback, commandArguments) -> {
-                  ((ChipClusters.ThermostatUserInterfaceConfigurationCluster) cluster)
-                      .writeTemperatureDisplayModeAttribute(
-                          (DefaultClusterCallback) callback,
-                          (Integer) commandArguments.get("value"));
-                },
-                () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-                writeThermostatUserInterfaceConfigurationTemperatureDisplayModeCommandParams);
-    writeThermostatUserInterfaceConfigurationInteractionInfo.put(
-        "writeTemperatureDisplayModeAttribute",
-        writeThermostatUserInterfaceConfigurationTemperatureDisplayModeAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        writeThermostatUserInterfaceConfigurationKeypadLockoutCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo thermostatUserInterfaceConfigurationkeypadLockoutCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeThermostatUserInterfaceConfigurationKeypadLockoutCommandParams.put(
-        "value", thermostatUserInterfaceConfigurationkeypadLockoutCommandParameterInfo);
-    InteractionInfo writeThermostatUserInterfaceConfigurationKeypadLockoutAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.ThermostatUserInterfaceConfigurationCluster) cluster)
-                  .writeKeypadLockoutAttribute(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
-            },
-            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeThermostatUserInterfaceConfigurationKeypadLockoutCommandParams);
-    writeThermostatUserInterfaceConfigurationInteractionInfo.put(
-        "writeKeypadLockoutAttribute",
-        writeThermostatUserInterfaceConfigurationKeypadLockoutAttributeInteractionInfo);
-    Map<String, CommandParameterInfo>
-        writeThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo
-        thermostatUserInterfaceConfigurationscheduleProgrammingVisibilityCommandParameterInfo =
-            new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityCommandParams.put(
-        "value",
-        thermostatUserInterfaceConfigurationscheduleProgrammingVisibilityCommandParameterInfo);
-    InteractionInfo
-        writeThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityAttributeInteractionInfo =
-            new InteractionInfo(
-                (cluster, callback, commandArguments) -> {
-                  ((ChipClusters.ThermostatUserInterfaceConfigurationCluster) cluster)
-                      .writeScheduleProgrammingVisibilityAttribute(
-                          (DefaultClusterCallback) callback,
-                          (Integer) commandArguments.get("value"));
-                },
-                () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-                writeThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityCommandParams);
-    writeThermostatUserInterfaceConfigurationInteractionInfo.put(
-        "writeScheduleProgrammingVisibilityAttribute",
-        writeThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityAttributeInteractionInfo);
-    writeAttributeMap.put(
-        "thermostatUserInterfaceConfiguration",
-        writeThermostatUserInterfaceConfigurationInteractionInfo);
-    Map<String, InteractionInfo> writeThreadNetworkDiagnosticsInteractionInfo =
-        new LinkedHashMap<>();
-    writeAttributeMap.put("threadNetworkDiagnostics", writeThreadNetworkDiagnosticsInteractionInfo);
-    Map<String, InteractionInfo> writeTimeFormatLocalizationInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> writeTimeFormatLocalizationHourFormatCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo timeFormatLocalizationhourFormatCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeTimeFormatLocalizationHourFormatCommandParams.put(
-        "value", timeFormatLocalizationhourFormatCommandParameterInfo);
-    InteractionInfo writeTimeFormatLocalizationHourFormatAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TimeFormatLocalizationCluster) cluster)
-                  .writeHourFormatAttribute(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
-            },
-            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeTimeFormatLocalizationHourFormatCommandParams);
-    writeTimeFormatLocalizationInteractionInfo.put(
-        "writeHourFormatAttribute", writeTimeFormatLocalizationHourFormatAttributeInteractionInfo);
-    Map<String, CommandParameterInfo> writeTimeFormatLocalizationActiveCalendarTypeCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo timeFormatLocalizationactiveCalendarTypeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeTimeFormatLocalizationActiveCalendarTypeCommandParams.put(
-        "value", timeFormatLocalizationactiveCalendarTypeCommandParameterInfo);
-    InteractionInfo writeTimeFormatLocalizationActiveCalendarTypeAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TimeFormatLocalizationCluster) cluster)
-                  .writeActiveCalendarTypeAttribute(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
-            },
-            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeTimeFormatLocalizationActiveCalendarTypeCommandParams);
-    writeTimeFormatLocalizationInteractionInfo.put(
-        "writeActiveCalendarTypeAttribute",
-        writeTimeFormatLocalizationActiveCalendarTypeAttributeInteractionInfo);
-    writeAttributeMap.put("timeFormatLocalization", writeTimeFormatLocalizationInteractionInfo);
-    Map<String, InteractionInfo> writeUnitLocalizationInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> writeUnitLocalizationTemperatureUnitCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo unitLocalizationtemperatureUnitCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeUnitLocalizationTemperatureUnitCommandParams.put(
-        "value", unitLocalizationtemperatureUnitCommandParameterInfo);
-    InteractionInfo writeUnitLocalizationTemperatureUnitAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.UnitLocalizationCluster) cluster)
-                  .writeTemperatureUnitAttribute(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
-            },
-            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeUnitLocalizationTemperatureUnitCommandParams);
-    writeUnitLocalizationInteractionInfo.put(
-        "writeTemperatureUnitAttribute",
-        writeUnitLocalizationTemperatureUnitAttributeInteractionInfo);
-    writeAttributeMap.put("unitLocalization", writeUnitLocalizationInteractionInfo);
-    Map<String, InteractionInfo> writeUserLabelInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("userLabel", writeUserLabelInteractionInfo);
-    Map<String, InteractionInfo> writeWakeOnLanInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("wakeOnLan", writeWakeOnLanInteractionInfo);
-    Map<String, InteractionInfo> writeWiFiNetworkDiagnosticsInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("wiFiNetworkDiagnostics", writeWiFiNetworkDiagnosticsInteractionInfo);
-    Map<String, InteractionInfo> writeWindowCoveringInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> writeWindowCoveringModeCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo windowCoveringmodeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class, Integer.class);
-    writeWindowCoveringModeCommandParams.put("value", windowCoveringmodeCommandParameterInfo);
-    InteractionInfo writeWindowCoveringModeAttributeInteractionInfo =
-        new InteractionInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .writeModeAttribute(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
-            },
-            () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-            writeWindowCoveringModeCommandParams);
-    writeWindowCoveringInteractionInfo.put(
-        "writeModeAttribute", writeWindowCoveringModeAttributeInteractionInfo);
-    writeAttributeMap.put("windowCovering", writeWindowCoveringInteractionInfo);
     return writeAttributeMap;
   }
 }
diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py
index 58383a62c4bbb0..566638027adda0 100644
--- a/src/controller/python/chip/clusters/CHIPClusters.py
+++ b/src/controller/python/chip/clusters/CHIPClusters.py
@@ -29,41 +29,37 @@ class ChipClusters:
     SUCCESS_DELEGATE = ctypes.CFUNCTYPE(None)
     FAILURE_DELEGATE = ctypes.CFUNCTYPE(None, ctypes.c_uint8)
 
-    _ACCESS_CONTROL_CLUSTER_INFO = {
-            "clusterName": "AccessControl",
-            "clusterId": 0x0000001F,
+    _IDENTIFY_CLUSTER_INFO = {
+            "clusterName": "Identify",
+            "clusterId": 0x00000003,
             "commands": {
+            0x00000000: {
+                    "commandId": 0x00000000,
+                    "commandName": "Identify",
+                    "args": {
+                        "identifyTime": "int",
+                    },
+                },
+            0x00000040: {
+                    "commandId": 0x00000040,
+                    "commandName": "TriggerEffect",
+                    "args": {
+                        "effectIdentifier": "int",
+                        "effectVariant": "int",
+                    },
+                },
             },
             "attributes": {
                 0x00000000: {
-                    "attributeName": "Acl",
+                    "attributeName": "IdentifyTime",
                     "attributeId": 0x00000000,
-                    "type": "",
+                    "type": "int",
                     "reportable": True,
                     "writable": True,
                 },
                 0x00000001: {
-                    "attributeName": "Extension",
+                    "attributeName": "IdentifyType",
                     "attributeId": 0x00000001,
-                    "type": "",
-                    "reportable": True,
-                    "writable": True,
-                },
-                0x00000002: {
-                    "attributeName": "SubjectsPerAccessControlEntry",
-                    "attributeId": 0x00000002,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000003: {
-                    "attributeName": "TargetsPerAccessControlEntry",
-                    "attributeId": 0x00000003,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000004: {
-                    "attributeName": "AccessControlEntriesPerFabric",
-                    "attributeId": 0x00000004,
                     "type": "int",
                     "reportable": True,
                 },
@@ -99,33 +95,61 @@ class ChipClusters:
                 },
             },
     }
-    _ACCOUNT_LOGIN_CLUSTER_INFO = {
-            "clusterName": "AccountLogin",
-            "clusterId": 0x0000050E,
+    _GROUPS_CLUSTER_INFO = {
+            "clusterName": "Groups",
+            "clusterId": 0x00000004,
             "commands": {
             0x00000000: {
                     "commandId": 0x00000000,
-                    "commandName": "GetSetupPIN",
+                    "commandName": "AddGroup",
                     "args": {
-                        "tempAccountIdentifier": "str",
+                        "groupId": "int",
+                        "groupName": "str",
+                    },
+                },
+            0x00000001: {
+                    "commandId": 0x00000001,
+                    "commandName": "ViewGroup",
+                    "args": {
+                        "groupId": "int",
                     },
                 },
             0x00000002: {
                     "commandId": 0x00000002,
-                    "commandName": "Login",
+                    "commandName": "GetGroupMembership",
                     "args": {
-                        "tempAccountIdentifier": "str",
-                        "setupPIN": "str",
+                        "groupList": "int",
                     },
                 },
             0x00000003: {
                     "commandId": 0x00000003,
-                    "commandName": "Logout",
+                    "commandName": "RemoveGroup",
+                    "args": {
+                        "groupId": "int",
+                    },
+                },
+            0x00000004: {
+                    "commandId": 0x00000004,
+                    "commandName": "RemoveAllGroups",
+                    "args": {
+                    },
+                },
+            0x00000005: {
+                    "commandId": 0x00000005,
+                    "commandName": "AddGroupIfIdentifying",
                     "args": {
+                        "groupId": "int",
+                        "groupName": "str",
                     },
                 },
             },
             "attributes": {
+                0x00000000: {
+                    "attributeName": "NameSupport",
+                    "attributeId": 0x00000000,
+                    "type": "int",
+                    "reportable": True,
+                },
                 0x0000FFF8: {
                     "attributeName": "GeneratedCommandList",
                     "attributeId": 0x0000FFF8,
@@ -158,137 +182,98 @@ class ChipClusters:
                 },
             },
     }
-    _ADMINISTRATOR_COMMISSIONING_CLUSTER_INFO = {
-            "clusterName": "AdministratorCommissioning",
-            "clusterId": 0x0000003C,
+    _SCENES_CLUSTER_INFO = {
+            "clusterName": "Scenes",
+            "clusterId": 0x00000005,
             "commands": {
-            0x00000001: {
-                    "commandId": 0x00000001,
-                    "commandName": "OpenBasicCommissioningWindow",
+            0x00000000: {
+                    "commandId": 0x00000000,
+                    "commandName": "AddScene",
                     "args": {
-                        "commissioningTimeout": "int",
+                        "groupId": "int",
+                        "sceneId": "int",
+                        "transitionTime": "int",
+                        "sceneName": "str",
+                        "clusterId": "int",
+                        "attributeValueList": "",
                     },
                 },
-            0x00000000: {
-                    "commandId": 0x00000000,
-                    "commandName": "OpenCommissioningWindow",
+            0x00000001: {
+                    "commandId": 0x00000001,
+                    "commandName": "ViewScene",
                     "args": {
-                        "commissioningTimeout": "int",
-                        "PAKEVerifier": "bytes",
-                        "discriminator": "int",
-                        "iterations": "int",
-                        "salt": "bytes",
+                        "groupId": "int",
+                        "sceneId": "int",
                     },
                 },
             0x00000002: {
                     "commandId": 0x00000002,
-                    "commandName": "RevokeCommissioning",
+                    "commandName": "RemoveScene",
                     "args": {
+                        "groupId": "int",
+                        "sceneId": "int",
                     },
                 },
-            },
-            "attributes": {
-                0x00000000: {
-                    "attributeName": "WindowStatus",
-                    "attributeId": 0x00000000,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000001: {
-                    "attributeName": "AdminFabricIndex",
-                    "attributeId": 0x00000001,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000002: {
-                    "attributeName": "AdminVendorId",
-                    "attributeId": 0x00000002,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x0000FFF8: {
-                    "attributeName": "GeneratedCommandList",
-                    "attributeId": 0x0000FFF8,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x0000FFF9: {
-                    "attributeName": "AcceptedCommandList",
-                    "attributeId": 0x0000FFF9,
-                    "type": "int",
-                    "reportable": True,
+            0x00000003: {
+                    "commandId": 0x00000003,
+                    "commandName": "RemoveAllScenes",
+                    "args": {
+                        "groupId": "int",
+                    },
                 },
-                0x0000FFFB: {
-                    "attributeName": "AttributeList",
-                    "attributeId": 0x0000FFFB,
-                    "type": "int",
-                    "reportable": True,
+            0x00000004: {
+                    "commandId": 0x00000004,
+                    "commandName": "StoreScene",
+                    "args": {
+                        "groupId": "int",
+                        "sceneId": "int",
+                    },
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
-                    "type": "int",
-                    "reportable": True,
+            0x00000005: {
+                    "commandId": 0x00000005,
+                    "commandName": "RecallScene",
+                    "args": {
+                        "groupId": "int",
+                        "sceneId": "int",
+                        "transitionTime": "int",
+                    },
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
-                    "type": "int",
-                    "reportable": True,
+            0x00000006: {
+                    "commandId": 0x00000006,
+                    "commandName": "GetSceneMembership",
+                    "args": {
+                        "groupId": "int",
+                    },
                 },
             },
-    }
-    _APPLICATION_BASIC_CLUSTER_INFO = {
-            "clusterName": "ApplicationBasic",
-            "clusterId": 0x0000050D,
-            "commands": {
-            },
             "attributes": {
                 0x00000000: {
-                    "attributeName": "VendorName",
+                    "attributeName": "SceneCount",
                     "attributeId": 0x00000000,
-                    "type": "str",
+                    "type": "int",
                     "reportable": True,
                 },
                 0x00000001: {
-                    "attributeName": "VendorID",
+                    "attributeName": "CurrentScene",
                     "attributeId": 0x00000001,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000002: {
-                    "attributeName": "ApplicationName",
+                    "attributeName": "CurrentGroup",
                     "attributeId": 0x00000002,
-                    "type": "str",
+                    "type": "int",
                     "reportable": True,
                 },
                 0x00000003: {
-                    "attributeName": "ProductID",
+                    "attributeName": "SceneValid",
                     "attributeId": 0x00000003,
-                    "type": "int",
+                    "type": "bool",
                     "reportable": True,
                 },
                 0x00000004: {
-                    "attributeName": "Application",
+                    "attributeName": "NameSupport",
                     "attributeId": 0x00000004,
-                    "type": "",
-                    "reportable": True,
-                },
-                0x00000005: {
-                    "attributeName": "Status",
-                    "attributeId": 0x00000005,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000006: {
-                    "attributeName": "ApplicationVersion",
-                    "attributeId": 0x00000006,
-                    "type": "str",
-                    "reportable": True,
-                },
-                0x00000007: {
-                    "attributeName": "AllowedVendorList",
-                    "attributeId": 0x00000007,
                     "type": "int",
                     "reportable": True,
                 },
@@ -324,47 +309,83 @@ class ChipClusters:
                 },
             },
     }
-    _APPLICATION_LAUNCHER_CLUSTER_INFO = {
-            "clusterName": "ApplicationLauncher",
-            "clusterId": 0x0000050C,
+    _ON_OFF_CLUSTER_INFO = {
+            "clusterName": "OnOff",
+            "clusterId": 0x00000006,
             "commands": {
-            0x00000002: {
-                    "commandId": 0x00000002,
-                    "commandName": "HideApp",
+            0x00000000: {
+                    "commandId": 0x00000000,
+                    "commandName": "Off",
                     "args": {
-                        "catalogVendorId": "int",
-                        "applicationId": "str",
                     },
                 },
-            0x00000000: {
-                    "commandId": 0x00000000,
-                    "commandName": "LaunchApp",
+            0x00000001: {
+                    "commandId": 0x00000001,
+                    "commandName": "On",
                     "args": {
-                        "catalogVendorId": "int",
-                        "applicationId": "str",
-                        "data": "bytes",
                     },
                 },
-            0x00000001: {
-                    "commandId": 0x00000001,
-                    "commandName": "StopApp",
+            0x00000002: {
+                    "commandId": 0x00000002,
+                    "commandName": "Toggle",
                     "args": {
-                        "catalogVendorId": "int",
-                        "applicationId": "str",
+                    },
+                },
+            0x00000040: {
+                    "commandId": 0x00000040,
+                    "commandName": "OffWithEffect",
+                    "args": {
+                        "effectId": "int",
+                        "effectVariant": "int",
+                    },
+                },
+            0x00000041: {
+                    "commandId": 0x00000041,
+                    "commandName": "OnWithRecallGlobalScene",
+                    "args": {
+                    },
+                },
+            0x00000042: {
+                    "commandId": 0x00000042,
+                    "commandName": "OnWithTimedOff",
+                    "args": {
+                        "onOffControl": "int",
+                        "onTime": "int",
+                        "offWaitTime": "int",
                     },
                 },
             },
             "attributes": {
                 0x00000000: {
-                    "attributeName": "CatalogList",
+                    "attributeName": "OnOff",
                     "attributeId": 0x00000000,
+                    "type": "bool",
+                    "reportable": True,
+                },
+                0x00004000: {
+                    "attributeName": "GlobalSceneControl",
+                    "attributeId": 0x00004000,
+                    "type": "bool",
+                    "reportable": True,
+                },
+                0x00004001: {
+                    "attributeName": "OnTime",
+                    "attributeId": 0x00004001,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000001: {
-                    "attributeName": "CurrentApp",
-                    "attributeId": 0x00000001,
-                    "type": "",
+                0x00004002: {
+                    "attributeName": "OffWaitTime",
+                    "attributeId": 0x00004002,
+                    "type": "int",
+                    "reportable": True,
+                    "writable": True,
+                },
+                0x00004003: {
+                    "attributeName": "StartUpOnOff",
+                    "attributeId": 0x00004003,
+                    "type": "int",
                     "reportable": True,
                     "writable": True,
                 },
@@ -400,38 +421,24 @@ class ChipClusters:
                 },
             },
     }
-    _AUDIO_OUTPUT_CLUSTER_INFO = {
-            "clusterName": "AudioOutput",
-            "clusterId": 0x0000050B,
+    _ON_OFF_SWITCH_CONFIGURATION_CLUSTER_INFO = {
+            "clusterName": "OnOffSwitchConfiguration",
+            "clusterId": 0x00000007,
             "commands": {
-            0x00000001: {
-                    "commandId": 0x00000001,
-                    "commandName": "RenameOutput",
-                    "args": {
-                        "index": "int",
-                        "name": "str",
-                    },
-                },
-            0x00000000: {
-                    "commandId": 0x00000000,
-                    "commandName": "SelectOutput",
-                    "args": {
-                        "index": "int",
-                    },
-                },
             },
             "attributes": {
                 0x00000000: {
-                    "attributeName": "OutputList",
+                    "attributeName": "SwitchType",
                     "attributeId": 0x00000000,
-                    "type": "",
+                    "type": "int",
                     "reportable": True,
                 },
-                0x00000001: {
-                    "attributeName": "CurrentOutput",
-                    "attributeId": 0x00000001,
+                0x00000010: {
+                    "attributeName": "SwitchActions",
+                    "attributeId": 0x00000010,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
                 0x0000FFF8: {
                     "attributeName": "GeneratedCommandList",
@@ -465,48 +472,172 @@ class ChipClusters:
                 },
             },
     }
-    _BARRIER_CONTROL_CLUSTER_INFO = {
-            "clusterName": "BarrierControl",
-            "clusterId": 0x00000103,
+    _LEVEL_CONTROL_CLUSTER_INFO = {
+            "clusterName": "LevelControl",
+            "clusterId": 0x00000008,
             "commands": {
             0x00000000: {
                     "commandId": 0x00000000,
-                    "commandName": "BarrierControlGoToPercent",
+                    "commandName": "MoveToLevel",
                     "args": {
-                        "percentOpen": "int",
+                        "level": "int",
+                        "transitionTime": "int",
+                        "optionMask": "int",
+                        "optionOverride": "int",
                     },
                 },
             0x00000001: {
                     "commandId": 0x00000001,
-                    "commandName": "BarrierControlStop",
+                    "commandName": "Move",
+                    "args": {
+                        "moveMode": "int",
+                        "rate": "int",
+                        "optionMask": "int",
+                        "optionOverride": "int",
+                    },
+                },
+            0x00000002: {
+                    "commandId": 0x00000002,
+                    "commandName": "Step",
+                    "args": {
+                        "stepMode": "int",
+                        "stepSize": "int",
+                        "transitionTime": "int",
+                        "optionMask": "int",
+                        "optionOverride": "int",
+                    },
+                },
+            0x00000003: {
+                    "commandId": 0x00000003,
+                    "commandName": "Stop",
+                    "args": {
+                        "optionMask": "int",
+                        "optionOverride": "int",
+                    },
+                },
+            0x00000004: {
+                    "commandId": 0x00000004,
+                    "commandName": "MoveToLevelWithOnOff",
+                    "args": {
+                        "level": "int",
+                        "transitionTime": "int",
+                    },
+                },
+            0x00000005: {
+                    "commandId": 0x00000005,
+                    "commandName": "MoveWithOnOff",
+                    "args": {
+                        "moveMode": "int",
+                        "rate": "int",
+                    },
+                },
+            0x00000006: {
+                    "commandId": 0x00000006,
+                    "commandName": "StepWithOnOff",
+                    "args": {
+                        "stepMode": "int",
+                        "stepSize": "int",
+                        "transitionTime": "int",
+                    },
+                },
+            0x00000007: {
+                    "commandId": 0x00000007,
+                    "commandName": "StopWithOnOff",
                     "args": {
                     },
                 },
             },
             "attributes": {
+                0x00000000: {
+                    "attributeName": "CurrentLevel",
+                    "attributeId": 0x00000000,
+                    "type": "int",
+                    "reportable": True,
+                },
                 0x00000001: {
-                    "attributeName": "BarrierMovingState",
+                    "attributeName": "RemainingTime",
                     "attributeId": 0x00000001,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000002: {
-                    "attributeName": "BarrierSafetyStatus",
+                    "attributeName": "MinLevel",
                     "attributeId": 0x00000002,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000003: {
-                    "attributeName": "BarrierCapabilities",
+                    "attributeName": "MaxLevel",
                     "attributeId": 0x00000003,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000000A: {
-                    "attributeName": "BarrierPosition",
-                    "attributeId": 0x0000000A,
+                0x00000004: {
+                    "attributeName": "CurrentFrequency",
+                    "attributeId": 0x00000004,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000005: {
+                    "attributeName": "MinFrequency",
+                    "attributeId": 0x00000005,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000006: {
+                    "attributeName": "MaxFrequency",
+                    "attributeId": 0x00000006,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000000F: {
+                    "attributeName": "Options",
+                    "attributeId": 0x0000000F,
+                    "type": "int",
+                    "reportable": True,
+                    "writable": True,
+                },
+                0x00000010: {
+                    "attributeName": "OnOffTransitionTime",
+                    "attributeId": 0x00000010,
+                    "type": "int",
+                    "reportable": True,
+                    "writable": True,
+                },
+                0x00000011: {
+                    "attributeName": "OnLevel",
+                    "attributeId": 0x00000011,
+                    "type": "int",
+                    "reportable": True,
+                    "writable": True,
+                },
+                0x00000012: {
+                    "attributeName": "OnTransitionTime",
+                    "attributeId": 0x00000012,
+                    "type": "int",
+                    "reportable": True,
+                    "writable": True,
+                },
+                0x00000013: {
+                    "attributeName": "OffTransitionTime",
+                    "attributeId": 0x00000013,
+                    "type": "int",
+                    "reportable": True,
+                    "writable": True,
+                },
+                0x00000014: {
+                    "attributeName": "DefaultMoveRate",
+                    "attributeId": 0x00000014,
+                    "type": "int",
+                    "reportable": True,
+                    "writable": True,
+                },
+                0x00004000: {
+                    "attributeName": "StartUpCurrentLevel",
+                    "attributeId": 0x00004000,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
                 0x0000FFF8: {
                     "attributeName": "GeneratedCommandList",
@@ -540,133 +671,30 @@ class ChipClusters:
                 },
             },
     }
-    _BASIC_CLUSTER_INFO = {
-            "clusterName": "Basic",
-            "clusterId": 0x00000028,
+    _BINARY_INPUT_BASIC_CLUSTER_INFO = {
+            "clusterName": "BinaryInputBasic",
+            "clusterId": 0x0000000F,
             "commands": {
             },
             "attributes": {
-                0x00000000: {
-                    "attributeName": "DataModelRevision",
-                    "attributeId": 0x00000000,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000001: {
-                    "attributeName": "VendorName",
-                    "attributeId": 0x00000001,
-                    "type": "str",
-                    "reportable": True,
-                },
-                0x00000002: {
-                    "attributeName": "VendorID",
-                    "attributeId": 0x00000002,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000003: {
-                    "attributeName": "ProductName",
-                    "attributeId": 0x00000003,
-                    "type": "str",
-                    "reportable": True,
-                },
-                0x00000004: {
-                    "attributeName": "ProductID",
-                    "attributeId": 0x00000004,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000005: {
-                    "attributeName": "NodeLabel",
-                    "attributeId": 0x00000005,
-                    "type": "str",
-                    "reportable": True,
-                    "writable": True,
-                },
-                0x00000006: {
-                    "attributeName": "Location",
-                    "attributeId": 0x00000006,
-                    "type": "str",
-                    "reportable": True,
-                    "writable": True,
-                },
-                0x00000007: {
-                    "attributeName": "HardwareVersion",
-                    "attributeId": 0x00000007,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000008: {
-                    "attributeName": "HardwareVersionString",
-                    "attributeId": 0x00000008,
-                    "type": "str",
-                    "reportable": True,
-                },
-                0x00000009: {
-                    "attributeName": "SoftwareVersion",
-                    "attributeId": 0x00000009,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x0000000A: {
-                    "attributeName": "SoftwareVersionString",
-                    "attributeId": 0x0000000A,
-                    "type": "str",
-                    "reportable": True,
-                },
-                0x0000000B: {
-                    "attributeName": "ManufacturingDate",
-                    "attributeId": 0x0000000B,
-                    "type": "str",
-                    "reportable": True,
-                },
-                0x0000000C: {
-                    "attributeName": "PartNumber",
-                    "attributeId": 0x0000000C,
-                    "type": "str",
-                    "reportable": True,
-                },
-                0x0000000D: {
-                    "attributeName": "ProductURL",
-                    "attributeId": 0x0000000D,
-                    "type": "str",
-                    "reportable": True,
-                },
-                0x0000000E: {
-                    "attributeName": "ProductLabel",
-                    "attributeId": 0x0000000E,
-                    "type": "str",
-                    "reportable": True,
-                },
-                0x0000000F: {
-                    "attributeName": "SerialNumber",
-                    "attributeId": 0x0000000F,
-                    "type": "str",
-                    "reportable": True,
-                },
-                0x00000010: {
-                    "attributeName": "LocalConfigDisabled",
-                    "attributeId": 0x00000010,
+                0x00000051: {
+                    "attributeName": "OutOfService",
+                    "attributeId": 0x00000051,
                     "type": "bool",
                     "reportable": True,
                     "writable": True,
                 },
-                0x00000011: {
-                    "attributeName": "Reachable",
-                    "attributeId": 0x00000011,
+                0x00000055: {
+                    "attributeName": "PresentValue",
+                    "attributeId": 0x00000055,
                     "type": "bool",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000012: {
-                    "attributeName": "UniqueID",
-                    "attributeId": 0x00000012,
-                    "type": "str",
-                    "reportable": True,
-                },
-                0x00000013: {
-                    "attributeName": "CapabilityMinima",
-                    "attributeId": 0x00000013,
-                    "type": "",
+                0x0000006F: {
+                    "attributeName": "StatusFlags",
+                    "attributeId": 0x0000006F,
+                    "type": "int",
                     "reportable": True,
                 },
                 0x0000FFF8: {
@@ -701,29 +729,33 @@ class ChipClusters:
                 },
             },
     }
-    _BINARY_INPUT_BASIC_CLUSTER_INFO = {
-            "clusterName": "BinaryInputBasic",
-            "clusterId": 0x0000000F,
+    _DESCRIPTOR_CLUSTER_INFO = {
+            "clusterName": "Descriptor",
+            "clusterId": 0x0000001D,
             "commands": {
             },
             "attributes": {
-                0x00000051: {
-                    "attributeName": "OutOfService",
-                    "attributeId": 0x00000051,
-                    "type": "bool",
+                0x00000000: {
+                    "attributeName": "DeviceList",
+                    "attributeId": 0x00000000,
+                    "type": "",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000055: {
-                    "attributeName": "PresentValue",
-                    "attributeId": 0x00000055,
-                    "type": "bool",
+                0x00000001: {
+                    "attributeName": "ServerList",
+                    "attributeId": 0x00000001,
+                    "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000006F: {
-                    "attributeName": "StatusFlags",
-                    "attributeId": 0x0000006F,
+                0x00000002: {
+                    "attributeName": "ClientList",
+                    "attributeId": 0x00000002,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000003: {
+                    "attributeName": "PartsList",
+                    "attributeId": 0x00000003,
                     "type": "int",
                     "reportable": True,
                 },
@@ -804,16 +836,42 @@ class ChipClusters:
                 },
             },
     }
-    _BOOLEAN_STATE_CLUSTER_INFO = {
-            "clusterName": "BooleanState",
-            "clusterId": 0x00000045,
+    _ACCESS_CONTROL_CLUSTER_INFO = {
+            "clusterName": "AccessControl",
+            "clusterId": 0x0000001F,
             "commands": {
             },
             "attributes": {
                 0x00000000: {
-                    "attributeName": "StateValue",
+                    "attributeName": "Acl",
                     "attributeId": 0x00000000,
-                    "type": "bool",
+                    "type": "",
+                    "reportable": True,
+                    "writable": True,
+                },
+                0x00000001: {
+                    "attributeName": "Extension",
+                    "attributeId": 0x00000001,
+                    "type": "",
+                    "reportable": True,
+                    "writable": True,
+                },
+                0x00000002: {
+                    "attributeName": "SubjectsPerAccessControlEntry",
+                    "attributeId": 0x00000002,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000003: {
+                    "attributeName": "TargetsPerAccessControlEntry",
+                    "attributeId": 0x00000003,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000004: {
+                    "attributeName": "AccessControlEntriesPerFabric",
+                    "attributeId": 0x00000004,
+                    "type": "int",
                     "reportable": True,
                 },
                 0x0000FFF8: {
@@ -852,55 +910,46 @@ class ChipClusters:
             "clusterName": "BridgedActions",
             "clusterId": 0x00000025,
             "commands": {
-            0x0000000A: {
-                    "commandId": 0x0000000A,
-                    "commandName": "DisableAction",
+            0x00000000: {
+                    "commandId": 0x00000000,
+                    "commandName": "InstantAction",
                     "args": {
                         "actionID": "int",
                         "invokeID": "int",
                     },
                 },
-            0x0000000B: {
-                    "commandId": 0x0000000B,
-                    "commandName": "DisableActionWithDuration",
+            0x00000001: {
+                    "commandId": 0x00000001,
+                    "commandName": "InstantActionWithTransition",
                     "args": {
                         "actionID": "int",
                         "invokeID": "int",
-                        "duration": "int",
+                        "transitionTime": "int",
                     },
                 },
-            0x00000008: {
-                    "commandId": 0x00000008,
-                    "commandName": "EnableAction",
+            0x00000002: {
+                    "commandId": 0x00000002,
+                    "commandName": "StartAction",
                     "args": {
                         "actionID": "int",
                         "invokeID": "int",
                     },
                 },
-            0x00000009: {
-                    "commandId": 0x00000009,
-                    "commandName": "EnableActionWithDuration",
+            0x00000003: {
+                    "commandId": 0x00000003,
+                    "commandName": "StartActionWithDuration",
                     "args": {
                         "actionID": "int",
                         "invokeID": "int",
                         "duration": "int",
                     },
                 },
-            0x00000000: {
-                    "commandId": 0x00000000,
-                    "commandName": "InstantAction",
-                    "args": {
-                        "actionID": "int",
-                        "invokeID": "int",
-                    },
-                },
-            0x00000001: {
-                    "commandId": 0x00000001,
-                    "commandName": "InstantActionWithTransition",
+            0x00000004: {
+                    "commandId": 0x00000004,
+                    "commandName": "StopAction",
                     "args": {
                         "actionID": "int",
                         "invokeID": "int",
-                        "transitionTime": "int",
                     },
                 },
             0x00000005: {
@@ -928,32 +977,41 @@ class ChipClusters:
                         "invokeID": "int",
                     },
                 },
-            0x00000002: {
-                    "commandId": 0x00000002,
-                    "commandName": "StartAction",
+            0x00000008: {
+                    "commandId": 0x00000008,
+                    "commandName": "EnableAction",
                     "args": {
                         "actionID": "int",
                         "invokeID": "int",
                     },
                 },
-            0x00000003: {
-                    "commandId": 0x00000003,
-                    "commandName": "StartActionWithDuration",
+            0x00000009: {
+                    "commandId": 0x00000009,
+                    "commandName": "EnableActionWithDuration",
                     "args": {
                         "actionID": "int",
                         "invokeID": "int",
                         "duration": "int",
                     },
                 },
-            0x00000004: {
-                    "commandId": 0x00000004,
-                    "commandName": "StopAction",
+            0x0000000A: {
+                    "commandId": 0x0000000A,
+                    "commandName": "DisableAction",
                     "args": {
                         "actionID": "int",
                         "invokeID": "int",
                     },
                 },
-            },
+            0x0000000B: {
+                    "commandId": 0x0000000B,
+                    "commandName": "DisableActionWithDuration",
+                    "args": {
+                        "actionID": "int",
+                        "invokeID": "int",
+                        "duration": "int",
+                    },
+                },
+            },
             "attributes": {
                 0x00000000: {
                     "attributeName": "ActionList",
@@ -1005,12 +1063,18 @@ class ChipClusters:
                 },
             },
     }
-    _BRIDGED_DEVICE_BASIC_CLUSTER_INFO = {
-            "clusterName": "BridgedDeviceBasic",
-            "clusterId": 0x00000039,
+    _BASIC_CLUSTER_INFO = {
+            "clusterName": "Basic",
+            "clusterId": 0x00000028,
             "commands": {
             },
             "attributes": {
+                0x00000000: {
+                    "attributeName": "DataModelRevision",
+                    "attributeId": 0x00000000,
+                    "type": "int",
+                    "reportable": True,
+                },
                 0x00000001: {
                     "attributeName": "VendorName",
                     "attributeId": 0x00000001,
@@ -1029,6 +1093,12 @@ class ChipClusters:
                     "type": "str",
                     "reportable": True,
                 },
+                0x00000004: {
+                    "attributeName": "ProductID",
+                    "attributeId": 0x00000004,
+                    "type": "int",
+                    "reportable": True,
+                },
                 0x00000005: {
                     "attributeName": "NodeLabel",
                     "attributeId": 0x00000005,
@@ -1036,6 +1106,13 @@ class ChipClusters:
                     "reportable": True,
                     "writable": True,
                 },
+                0x00000006: {
+                    "attributeName": "Location",
+                    "attributeId": 0x00000006,
+                    "type": "str",
+                    "reportable": True,
+                    "writable": True,
+                },
                 0x00000007: {
                     "attributeName": "HardwareVersion",
                     "attributeId": 0x00000007,
@@ -1090,6 +1167,13 @@ class ChipClusters:
                     "type": "str",
                     "reportable": True,
                 },
+                0x00000010: {
+                    "attributeName": "LocalConfigDisabled",
+                    "attributeId": 0x00000010,
+                    "type": "bool",
+                    "reportable": True,
+                    "writable": True,
+                },
                 0x00000011: {
                     "attributeName": "Reachable",
                     "attributeId": 0x00000011,
@@ -1102,6 +1186,12 @@ class ChipClusters:
                     "type": "str",
                     "reportable": True,
                 },
+                0x00000013: {
+                    "attributeName": "CapabilityMinima",
+                    "attributeId": 0x00000013,
+                    "type": "",
+                    "reportable": True,
+                },
                 0x0000FFF8: {
                     "attributeName": "GeneratedCommandList",
                     "attributeId": 0x0000FFF8,
@@ -1134,50 +1224,193 @@ class ChipClusters:
                 },
             },
     }
-    _CHANNEL_CLUSTER_INFO = {
-            "clusterName": "Channel",
-            "clusterId": 0x00000504,
+    _OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_INFO = {
+            "clusterName": "OtaSoftwareUpdateProvider",
+            "clusterId": 0x00000029,
             "commands": {
             0x00000000: {
                     "commandId": 0x00000000,
-                    "commandName": "ChangeChannel",
+                    "commandName": "QueryImage",
                     "args": {
-                        "match": "str",
+                        "vendorId": "int",
+                        "productId": "int",
+                        "softwareVersion": "int",
+                        "protocolsSupported": "int",
+                        "hardwareVersion": "int",
+                        "location": "str",
+                        "requestorCanConsent": "bool",
+                        "metadataForProvider": "bytes",
                     },
                 },
             0x00000002: {
                     "commandId": 0x00000002,
-                    "commandName": "ChangeChannelByNumber",
+                    "commandName": "ApplyUpdateRequest",
                     "args": {
-                        "majorNumber": "int",
-                        "minorNumber": "int",
+                        "updateToken": "bytes",
+                        "newVersion": "int",
                     },
                 },
-            0x00000003: {
-                    "commandId": 0x00000003,
-                    "commandName": "SkipChannel",
+            0x00000004: {
+                    "commandId": 0x00000004,
+                    "commandName": "NotifyUpdateApplied",
                     "args": {
-                        "count": "int",
+                        "updateToken": "bytes",
+                        "softwareVersion": "int",
+                    },
+                },
+            },
+            "attributes": {
+                0x0000FFFB: {
+                    "attributeName": "AttributeList",
+                    "attributeId": 0x0000FFFB,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
+                    "type": "int",
+                    "reportable": True,
+                },
+            },
+    }
+    _OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_INFO = {
+            "clusterName": "OtaSoftwareUpdateRequestor",
+            "clusterId": 0x0000002A,
+            "commands": {
+            0x00000000: {
+                    "commandId": 0x00000000,
+                    "commandName": "AnnounceOtaProvider",
+                    "args": {
+                        "providerNodeId": "int",
+                        "vendorId": "int",
+                        "announcementReason": "int",
+                        "metadataForNode": "bytes",
+                        "endpoint": "int",
                     },
                 },
             },
             "attributes": {
                 0x00000000: {
-                    "attributeName": "ChannelList",
+                    "attributeName": "DefaultOtaProviders",
                     "attributeId": 0x00000000,
                     "type": "",
                     "reportable": True,
+                    "writable": True,
                 },
                 0x00000001: {
-                    "attributeName": "Lineup",
+                    "attributeName": "UpdatePossible",
                     "attributeId": 0x00000001,
-                    "type": "",
+                    "type": "bool",
                     "reportable": True,
                 },
                 0x00000002: {
-                    "attributeName": "CurrentChannel",
+                    "attributeName": "UpdateState",
                     "attributeId": 0x00000002,
-                    "type": "",
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000003: {
+                    "attributeName": "UpdateStateProgress",
+                    "attributeId": 0x00000003,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000FFFB: {
+                    "attributeName": "AttributeList",
+                    "attributeId": 0x0000FFFB,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
+                    "type": "int",
+                    "reportable": True,
+                },
+            },
+    }
+    _LOCALIZATION_CONFIGURATION_CLUSTER_INFO = {
+            "clusterName": "LocalizationConfiguration",
+            "clusterId": 0x0000002B,
+            "commands": {
+            },
+            "attributes": {
+                0x00000000: {
+                    "attributeName": "ActiveLocale",
+                    "attributeId": 0x00000000,
+                    "type": "str",
+                    "reportable": True,
+                    "writable": True,
+                },
+                0x00000001: {
+                    "attributeName": "SupportedLocales",
+                    "attributeId": 0x00000001,
+                    "type": "str",
+                    "reportable": True,
+                },
+                0x0000FFF8: {
+                    "attributeName": "GeneratedCommandList",
+                    "attributeId": 0x0000FFF8,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000FFF9: {
+                    "attributeName": "AcceptedCommandList",
+                    "attributeId": 0x0000FFF9,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
+                    "type": "int",
+                    "reportable": True,
+                },
+            },
+    }
+    _TIME_FORMAT_LOCALIZATION_CLUSTER_INFO = {
+            "clusterName": "TimeFormatLocalization",
+            "clusterId": 0x0000002C,
+            "commands": {
+            },
+            "attributes": {
+                0x00000000: {
+                    "attributeName": "HourFormat",
+                    "attributeId": 0x00000000,
+                    "type": "int",
+                    "reportable": True,
+                    "writable": True,
+                },
+                0x00000001: {
+                    "attributeName": "ActiveCalendarType",
+                    "attributeId": 0x00000001,
+                    "type": "int",
+                    "reportable": True,
+                    "writable": True,
+                },
+                0x00000002: {
+                    "attributeName": "SupportedCalendarTypes",
+                    "attributeId": 0x00000002,
+                    "type": "int",
                     "reportable": True,
                 },
                 0x0000FFF8: {
@@ -1192,6 +1425,33 @@ class ChipClusters:
                     "type": "int",
                     "reportable": True,
                 },
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
+                    "type": "int",
+                    "reportable": True,
+                },
+            },
+    }
+    _UNIT_LOCALIZATION_CLUSTER_INFO = {
+            "clusterName": "UnitLocalization",
+            "clusterId": 0x0000002D,
+            "commands": {
+            },
+            "attributes": {
+                0x00000000: {
+                    "attributeName": "TemperatureUnit",
+                    "attributeId": 0x00000000,
+                    "type": "int",
+                    "reportable": True,
+                    "writable": True,
+                },
                 0x0000FFFB: {
                     "attributeName": "AttributeList",
                     "attributeId": 0x0000FFFB,
@@ -1212,675 +1472,239 @@ class ChipClusters:
                 },
             },
     }
-    _COLOR_CONTROL_CLUSTER_INFO = {
-            "clusterName": "ColorControl",
-            "clusterId": 0x00000300,
-            "commands": {
-            0x00000044: {
-                    "commandId": 0x00000044,
-                    "commandName": "ColorLoopSet",
-                    "args": {
-                        "updateFlags": "int",
-                        "action": "int",
-                        "direction": "int",
-                        "time": "int",
-                        "startHue": "int",
-                        "optionsMask": "int",
-                        "optionsOverride": "int",
-                    },
-                },
-            0x00000041: {
-                    "commandId": 0x00000041,
-                    "commandName": "EnhancedMoveHue",
-                    "args": {
-                        "moveMode": "int",
-                        "rate": "int",
-                        "optionsMask": "int",
-                        "optionsOverride": "int",
-                    },
-                },
-            0x00000040: {
-                    "commandId": 0x00000040,
-                    "commandName": "EnhancedMoveToHue",
-                    "args": {
-                        "enhancedHue": "int",
-                        "direction": "int",
-                        "transitionTime": "int",
-                        "optionsMask": "int",
-                        "optionsOverride": "int",
-                    },
-                },
-            0x00000043: {
-                    "commandId": 0x00000043,
-                    "commandName": "EnhancedMoveToHueAndSaturation",
-                    "args": {
-                        "enhancedHue": "int",
-                        "saturation": "int",
-                        "transitionTime": "int",
-                        "optionsMask": "int",
-                        "optionsOverride": "int",
-                    },
-                },
-            0x00000042: {
-                    "commandId": 0x00000042,
-                    "commandName": "EnhancedStepHue",
-                    "args": {
-                        "stepMode": "int",
-                        "stepSize": "int",
-                        "transitionTime": "int",
-                        "optionsMask": "int",
-                        "optionsOverride": "int",
-                    },
-                },
-            0x00000008: {
-                    "commandId": 0x00000008,
-                    "commandName": "MoveColor",
-                    "args": {
-                        "rateX": "int",
-                        "rateY": "int",
-                        "optionsMask": "int",
-                        "optionsOverride": "int",
-                    },
-                },
-            0x0000004B: {
-                    "commandId": 0x0000004B,
-                    "commandName": "MoveColorTemperature",
-                    "args": {
-                        "moveMode": "int",
-                        "rate": "int",
-                        "colorTemperatureMinimumMireds": "int",
-                        "colorTemperatureMaximumMireds": "int",
-                        "optionsMask": "int",
-                        "optionsOverride": "int",
-                    },
-                },
-            0x00000001: {
-                    "commandId": 0x00000001,
-                    "commandName": "MoveHue",
-                    "args": {
-                        "moveMode": "int",
-                        "rate": "int",
-                        "optionsMask": "int",
-                        "optionsOverride": "int",
-                    },
-                },
-            0x00000004: {
-                    "commandId": 0x00000004,
-                    "commandName": "MoveSaturation",
-                    "args": {
-                        "moveMode": "int",
-                        "rate": "int",
-                        "optionsMask": "int",
-                        "optionsOverride": "int",
-                    },
-                },
-            0x00000007: {
-                    "commandId": 0x00000007,
-                    "commandName": "MoveToColor",
-                    "args": {
-                        "colorX": "int",
-                        "colorY": "int",
-                        "transitionTime": "int",
-                        "optionsMask": "int",
-                        "optionsOverride": "int",
-                    },
-                },
-            0x0000000A: {
-                    "commandId": 0x0000000A,
-                    "commandName": "MoveToColorTemperature",
-                    "args": {
-                        "colorTemperature": "int",
-                        "transitionTime": "int",
-                        "optionsMask": "int",
-                        "optionsOverride": "int",
-                    },
-                },
-            0x00000000: {
-                    "commandId": 0x00000000,
-                    "commandName": "MoveToHue",
-                    "args": {
-                        "hue": "int",
-                        "direction": "int",
-                        "transitionTime": "int",
-                        "optionsMask": "int",
-                        "optionsOverride": "int",
-                    },
-                },
-            0x00000006: {
-                    "commandId": 0x00000006,
-                    "commandName": "MoveToHueAndSaturation",
-                    "args": {
-                        "hue": "int",
-                        "saturation": "int",
-                        "transitionTime": "int",
-                        "optionsMask": "int",
-                        "optionsOverride": "int",
-                    },
-                },
-            0x00000003: {
-                    "commandId": 0x00000003,
-                    "commandName": "MoveToSaturation",
-                    "args": {
-                        "saturation": "int",
-                        "transitionTime": "int",
-                        "optionsMask": "int",
-                        "optionsOverride": "int",
-                    },
-                },
-            0x00000009: {
-                    "commandId": 0x00000009,
-                    "commandName": "StepColor",
-                    "args": {
-                        "stepX": "int",
-                        "stepY": "int",
-                        "transitionTime": "int",
-                        "optionsMask": "int",
-                        "optionsOverride": "int",
-                    },
-                },
-            0x0000004C: {
-                    "commandId": 0x0000004C,
-                    "commandName": "StepColorTemperature",
-                    "args": {
-                        "stepMode": "int",
-                        "stepSize": "int",
-                        "transitionTime": "int",
-                        "colorTemperatureMinimumMireds": "int",
-                        "colorTemperatureMaximumMireds": "int",
-                        "optionsMask": "int",
-                        "optionsOverride": "int",
-                    },
-                },
-            0x00000002: {
-                    "commandId": 0x00000002,
-                    "commandName": "StepHue",
-                    "args": {
-                        "stepMode": "int",
-                        "stepSize": "int",
-                        "transitionTime": "int",
-                        "optionsMask": "int",
-                        "optionsOverride": "int",
-                    },
-                },
-            0x00000005: {
-                    "commandId": 0x00000005,
-                    "commandName": "StepSaturation",
-                    "args": {
-                        "stepMode": "int",
-                        "stepSize": "int",
-                        "transitionTime": "int",
-                        "optionsMask": "int",
-                        "optionsOverride": "int",
-                    },
-                },
-            0x00000047: {
-                    "commandId": 0x00000047,
-                    "commandName": "StopMoveStep",
-                    "args": {
-                        "optionsMask": "int",
-                        "optionsOverride": "int",
-                    },
-                },
-            },
-            "attributes": {
-                0x00000000: {
-                    "attributeName": "CurrentHue",
-                    "attributeId": 0x00000000,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000001: {
-                    "attributeName": "CurrentSaturation",
-                    "attributeId": 0x00000001,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000002: {
-                    "attributeName": "RemainingTime",
-                    "attributeId": 0x00000002,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000003: {
-                    "attributeName": "CurrentX",
-                    "attributeId": 0x00000003,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000004: {
-                    "attributeName": "CurrentY",
-                    "attributeId": 0x00000004,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000005: {
-                    "attributeName": "DriftCompensation",
-                    "attributeId": 0x00000005,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000006: {
-                    "attributeName": "CompensationText",
-                    "attributeId": 0x00000006,
-                    "type": "str",
-                    "reportable": True,
-                },
-                0x00000007: {
-                    "attributeName": "ColorTemperature",
-                    "attributeId": 0x00000007,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000008: {
-                    "attributeName": "ColorMode",
-                    "attributeId": 0x00000008,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x0000000F: {
-                    "attributeName": "Options",
-                    "attributeId": 0x0000000F,
-                    "type": "int",
-                    "reportable": True,
-                    "writable": True,
-                },
-                0x00000010: {
-                    "attributeName": "NumberOfPrimaries",
-                    "attributeId": 0x00000010,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000011: {
-                    "attributeName": "Primary1X",
-                    "attributeId": 0x00000011,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000012: {
-                    "attributeName": "Primary1Y",
-                    "attributeId": 0x00000012,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000013: {
-                    "attributeName": "Primary1Intensity",
-                    "attributeId": 0x00000013,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000015: {
-                    "attributeName": "Primary2X",
-                    "attributeId": 0x00000015,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000016: {
-                    "attributeName": "Primary2Y",
-                    "attributeId": 0x00000016,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000017: {
-                    "attributeName": "Primary2Intensity",
-                    "attributeId": 0x00000017,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000019: {
-                    "attributeName": "Primary3X",
-                    "attributeId": 0x00000019,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x0000001A: {
-                    "attributeName": "Primary3Y",
-                    "attributeId": 0x0000001A,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x0000001B: {
-                    "attributeName": "Primary3Intensity",
-                    "attributeId": 0x0000001B,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000020: {
-                    "attributeName": "Primary4X",
-                    "attributeId": 0x00000020,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000021: {
-                    "attributeName": "Primary4Y",
-                    "attributeId": 0x00000021,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000022: {
-                    "attributeName": "Primary4Intensity",
-                    "attributeId": 0x00000022,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000024: {
-                    "attributeName": "Primary5X",
-                    "attributeId": 0x00000024,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000025: {
-                    "attributeName": "Primary5Y",
-                    "attributeId": 0x00000025,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000026: {
-                    "attributeName": "Primary5Intensity",
-                    "attributeId": 0x00000026,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000028: {
-                    "attributeName": "Primary6X",
-                    "attributeId": 0x00000028,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000029: {
-                    "attributeName": "Primary6Y",
-                    "attributeId": 0x00000029,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x0000002A: {
-                    "attributeName": "Primary6Intensity",
-                    "attributeId": 0x0000002A,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000030: {
-                    "attributeName": "WhitePointX",
-                    "attributeId": 0x00000030,
-                    "type": "int",
-                    "reportable": True,
-                    "writable": True,
-                },
-                0x00000031: {
-                    "attributeName": "WhitePointY",
-                    "attributeId": 0x00000031,
-                    "type": "int",
-                    "reportable": True,
-                    "writable": True,
-                },
-                0x00000032: {
-                    "attributeName": "ColorPointRX",
-                    "attributeId": 0x00000032,
-                    "type": "int",
-                    "reportable": True,
-                    "writable": True,
-                },
-                0x00000033: {
-                    "attributeName": "ColorPointRY",
-                    "attributeId": 0x00000033,
+    _POWER_SOURCE_CONFIGURATION_CLUSTER_INFO = {
+            "clusterName": "PowerSourceConfiguration",
+            "clusterId": 0x0000002E,
+            "commands": {
+            },
+            "attributes": {
+                0x00000000: {
+                    "attributeName": "Sources",
+                    "attributeId": 0x00000000,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000034: {
-                    "attributeName": "ColorPointRIntensity",
-                    "attributeId": 0x00000034,
+                0x0000FFF8: {
+                    "attributeName": "GeneratedCommandList",
+                    "attributeId": 0x0000FFF8,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000036: {
-                    "attributeName": "ColorPointGX",
-                    "attributeId": 0x00000036,
+                0x0000FFF9: {
+                    "attributeName": "AcceptedCommandList",
+                    "attributeId": 0x0000FFF9,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000037: {
-                    "attributeName": "ColorPointGY",
-                    "attributeId": 0x00000037,
+                0x0000FFFB: {
+                    "attributeName": "AttributeList",
+                    "attributeId": 0x0000FFFB,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000038: {
-                    "attributeName": "ColorPointGIntensity",
-                    "attributeId": 0x00000038,
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000003A: {
-                    "attributeName": "ColorPointBX",
-                    "attributeId": 0x0000003A,
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000003B: {
-                    "attributeName": "ColorPointBY",
-                    "attributeId": 0x0000003B,
+            },
+    }
+    _POWER_SOURCE_CLUSTER_INFO = {
+            "clusterName": "PowerSource",
+            "clusterId": 0x0000002F,
+            "commands": {
+            },
+            "attributes": {
+                0x00000000: {
+                    "attributeName": "Status",
+                    "attributeId": 0x00000000,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000003C: {
-                    "attributeName": "ColorPointBIntensity",
-                    "attributeId": 0x0000003C,
+                0x00000001: {
+                    "attributeName": "Order",
+                    "attributeId": 0x00000001,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004000: {
-                    "attributeName": "EnhancedCurrentHue",
-                    "attributeId": 0x00004000,
-                    "type": "int",
+                0x00000002: {
+                    "attributeName": "Description",
+                    "attributeId": 0x00000002,
+                    "type": "str",
                     "reportable": True,
                 },
-                0x00004001: {
-                    "attributeName": "EnhancedColorMode",
-                    "attributeId": 0x00004001,
+                0x00000003: {
+                    "attributeName": "WiredAssessedInputVoltage",
+                    "attributeId": 0x00000003,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00004002: {
-                    "attributeName": "ColorLoopActive",
-                    "attributeId": 0x00004002,
+                0x00000004: {
+                    "attributeName": "WiredAssessedInputFrequency",
+                    "attributeId": 0x00000004,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00004003: {
-                    "attributeName": "ColorLoopDirection",
-                    "attributeId": 0x00004003,
+                0x00000005: {
+                    "attributeName": "WiredCurrentType",
+                    "attributeId": 0x00000005,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00004004: {
-                    "attributeName": "ColorLoopTime",
-                    "attributeId": 0x00004004,
+                0x00000006: {
+                    "attributeName": "WiredAssessedCurrent",
+                    "attributeId": 0x00000006,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00004005: {
-                    "attributeName": "ColorLoopStartEnhancedHue",
-                    "attributeId": 0x00004005,
+                0x00000007: {
+                    "attributeName": "WiredNominalVoltage",
+                    "attributeId": 0x00000007,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00004006: {
-                    "attributeName": "ColorLoopStoredEnhancedHue",
-                    "attributeId": 0x00004006,
+                0x00000008: {
+                    "attributeName": "WiredMaximumCurrent",
+                    "attributeId": 0x00000008,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000400A: {
-                    "attributeName": "ColorCapabilities",
-                    "attributeId": 0x0000400A,
-                    "type": "int",
+                0x00000009: {
+                    "attributeName": "WiredPresent",
+                    "attributeId": 0x00000009,
+                    "type": "bool",
                     "reportable": True,
                 },
-                0x0000400B: {
-                    "attributeName": "ColorTempPhysicalMinMireds",
-                    "attributeId": 0x0000400B,
+                0x0000000A: {
+                    "attributeName": "ActiveWiredFaults",
+                    "attributeId": 0x0000000A,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000400C: {
-                    "attributeName": "ColorTempPhysicalMaxMireds",
-                    "attributeId": 0x0000400C,
+                0x0000000B: {
+                    "attributeName": "BatteryVoltage",
+                    "attributeId": 0x0000000B,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000400D: {
-                    "attributeName": "CoupleColorTempToLevelMinMireds",
-                    "attributeId": 0x0000400D,
+                0x0000000C: {
+                    "attributeName": "BatteryPercentRemaining",
+                    "attributeId": 0x0000000C,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00004010: {
-                    "attributeName": "StartUpColorTemperatureMireds",
-                    "attributeId": 0x00004010,
+                0x0000000D: {
+                    "attributeName": "BatteryTimeRemaining",
+                    "attributeId": 0x0000000D,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000FFF8: {
-                    "attributeName": "GeneratedCommandList",
-                    "attributeId": 0x0000FFF8,
+                0x0000000E: {
+                    "attributeName": "BatteryChargeLevel",
+                    "attributeId": 0x0000000E,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFF9: {
-                    "attributeName": "AcceptedCommandList",
-                    "attributeId": 0x0000FFF9,
-                    "type": "int",
+                0x0000000F: {
+                    "attributeName": "BatteryReplacementNeeded",
+                    "attributeId": 0x0000000F,
+                    "type": "bool",
                     "reportable": True,
                 },
-                0x0000FFFB: {
-                    "attributeName": "AttributeList",
-                    "attributeId": 0x0000FFFB,
+                0x00000010: {
+                    "attributeName": "BatteryReplaceability",
+                    "attributeId": 0x00000010,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
-                    "type": "int",
+                0x00000011: {
+                    "attributeName": "BatteryPresent",
+                    "attributeId": 0x00000011,
+                    "type": "bool",
                     "reportable": True,
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
+                0x00000012: {
+                    "attributeName": "ActiveBatteryFaults",
+                    "attributeId": 0x00000012,
                     "type": "int",
                     "reportable": True,
                 },
-            },
-    }
-    _CONTENT_LAUNCHER_CLUSTER_INFO = {
-            "clusterName": "ContentLauncher",
-            "clusterId": 0x0000050A,
-            "commands": {
-            0x00000000: {
-                    "commandId": 0x00000000,
-                    "commandName": "LaunchContent",
-                    "args": {
-                        "parameterList": "",
-                        "autoPlay": "bool",
-                        "data": "str",
-                    },
-                },
-            0x00000001: {
-                    "commandId": 0x00000001,
-                    "commandName": "LaunchURL",
-                    "args": {
-                        "contentURL": "str",
-                        "displayString": "str",
-                        "providerName": "str",
-                        "background": "",
-                        "logo": "",
-                        "progressBar": "",
-                        "splash": "",
-                        "waterMark": "",
-                    },
-                },
-            },
-            "attributes": {
-                0x00000000: {
-                    "attributeName": "AcceptHeader",
-                    "attributeId": 0x00000000,
+                0x00000013: {
+                    "attributeName": "BatteryReplacementDescription",
+                    "attributeId": 0x00000013,
                     "type": "str",
                     "reportable": True,
                 },
-                0x00000001: {
-                    "attributeName": "SupportedStreamingProtocols",
-                    "attributeId": 0x00000001,
+                0x00000014: {
+                    "attributeName": "BatteryCommonDesignation",
+                    "attributeId": 0x00000014,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000FFF8: {
-                    "attributeName": "GeneratedCommandList",
-                    "attributeId": 0x0000FFF8,
-                    "type": "int",
+                0x00000015: {
+                    "attributeName": "BatteryANSIDesignation",
+                    "attributeId": 0x00000015,
+                    "type": "str",
                     "reportable": True,
                 },
-                0x0000FFF9: {
-                    "attributeName": "AcceptedCommandList",
-                    "attributeId": 0x0000FFF9,
-                    "type": "int",
+                0x00000016: {
+                    "attributeName": "BatteryIECDesignation",
+                    "attributeId": 0x00000016,
+                    "type": "str",
                     "reportable": True,
                 },
-                0x0000FFFB: {
-                    "attributeName": "AttributeList",
-                    "attributeId": 0x0000FFFB,
+                0x00000017: {
+                    "attributeName": "BatteryApprovedChemistry",
+                    "attributeId": 0x00000017,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
+                0x00000018: {
+                    "attributeName": "BatteryCapacity",
+                    "attributeId": 0x00000018,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
+                0x00000019: {
+                    "attributeName": "BatteryQuantity",
+                    "attributeId": 0x00000019,
                     "type": "int",
                     "reportable": True,
                 },
-            },
-    }
-    _DESCRIPTOR_CLUSTER_INFO = {
-            "clusterName": "Descriptor",
-            "clusterId": 0x0000001D,
-            "commands": {
-            },
-            "attributes": {
-                0x00000000: {
-                    "attributeName": "DeviceList",
-                    "attributeId": 0x00000000,
-                    "type": "",
+                0x0000001A: {
+                    "attributeName": "BatteryChargeState",
+                    "attributeId": 0x0000001A,
+                    "type": "int",
                     "reportable": True,
                 },
-                0x00000001: {
-                    "attributeName": "ServerList",
-                    "attributeId": 0x00000001,
+                0x0000001B: {
+                    "attributeName": "BatteryTimeToFullCharge",
+                    "attributeId": 0x0000001B,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000002: {
-                    "attributeName": "ClientList",
-                    "attributeId": 0x00000002,
+                0x0000001C: {
+                    "attributeName": "BatteryFunctionalWhileCharging",
+                    "attributeId": 0x0000001C,
+                    "type": "bool",
+                    "reportable": True,
+                },
+                0x0000001D: {
+                    "attributeName": "BatteryChargingCurrent",
+                    "attributeId": 0x0000001D,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000003: {
-                    "attributeName": "PartsList",
-                    "attributeId": 0x00000003,
+                0x0000001E: {
+                    "attributeName": "ActiveBatteryChargeFaults",
+                    "attributeId": 0x0000001E,
                     "type": "int",
                     "reportable": True,
                 },
@@ -1916,21 +1740,66 @@ class ChipClusters:
                 },
             },
     }
-    _DIAGNOSTIC_LOGS_CLUSTER_INFO = {
-            "clusterName": "DiagnosticLogs",
-            "clusterId": 0x00000032,
+    _GENERAL_COMMISSIONING_CLUSTER_INFO = {
+            "clusterName": "GeneralCommissioning",
+            "clusterId": 0x00000030,
             "commands": {
             0x00000000: {
                     "commandId": 0x00000000,
-                    "commandName": "RetrieveLogsRequest",
+                    "commandName": "ArmFailSafe",
+                    "args": {
+                        "expiryLengthSeconds": "int",
+                        "breadcrumb": "int",
+                    },
+                },
+            0x00000002: {
+                    "commandId": 0x00000002,
+                    "commandName": "SetRegulatoryConfig",
+                    "args": {
+                        "newRegulatoryConfig": "int",
+                        "countryCode": "str",
+                        "breadcrumb": "int",
+                    },
+                },
+            0x00000004: {
+                    "commandId": 0x00000004,
+                    "commandName": "CommissioningComplete",
                     "args": {
-                        "intent": "int",
-                        "requestedProtocol": "int",
-                        "transferFileDesignator": "bytes",
                     },
                 },
             },
             "attributes": {
+                0x00000000: {
+                    "attributeName": "Breadcrumb",
+                    "attributeId": 0x00000000,
+                    "type": "int",
+                    "reportable": True,
+                    "writable": True,
+                },
+                0x00000001: {
+                    "attributeName": "BasicCommissioningInfo",
+                    "attributeId": 0x00000001,
+                    "type": "",
+                    "reportable": True,
+                },
+                0x00000002: {
+                    "attributeName": "RegulatoryConfig",
+                    "attributeId": 0x00000002,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000003: {
+                    "attributeName": "LocationCapability",
+                    "attributeId": 0x00000003,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000004: {
+                    "attributeName": "SupportsConcurrentConnection",
+                    "attributeId": 0x00000004,
+                    "type": "bool",
+                    "reportable": True,
+                },
                 0x0000FFF8: {
                     "attributeName": "GeneratedCommandList",
                     "attributeId": 0x0000FFF8,
@@ -1963,326 +1832,251 @@ class ChipClusters:
                 },
             },
     }
-    _DOOR_LOCK_CLUSTER_INFO = {
-            "clusterName": "DoorLock",
-            "clusterId": 0x00000101,
+    _NETWORK_COMMISSIONING_CLUSTER_INFO = {
+            "clusterName": "NetworkCommissioning",
+            "clusterId": 0x00000031,
             "commands": {
-            0x00000026: {
-                    "commandId": 0x00000026,
-                    "commandName": "ClearCredential",
-                    "args": {
-                        "credentialType": "int",
-                        "credentialIndex": "int",
-                    },
-                },
-            0x00000013: {
-                    "commandId": 0x00000013,
-                    "commandName": "ClearHolidaySchedule",
-                    "args": {
-                        "holidayIndex": "int",
-                    },
-                },
-            0x0000001D: {
-                    "commandId": 0x0000001D,
-                    "commandName": "ClearUser",
-                    "args": {
-                        "userIndex": "int",
-                    },
-                },
-            0x0000000D: {
-                    "commandId": 0x0000000D,
-                    "commandName": "ClearWeekDaySchedule",
-                    "args": {
-                        "weekDayIndex": "int",
-                        "userIndex": "int",
-                    },
-                },
-            0x00000010: {
-                    "commandId": 0x00000010,
-                    "commandName": "ClearYearDaySchedule",
-                    "args": {
-                        "yearDayIndex": "int",
-                        "userIndex": "int",
-                    },
-                },
-            0x00000024: {
-                    "commandId": 0x00000024,
-                    "commandName": "GetCredentialStatus",
-                    "args": {
-                        "credentialType": "int",
-                        "credentialIndex": "int",
-                    },
-                },
-            0x00000012: {
-                    "commandId": 0x00000012,
-                    "commandName": "GetHolidaySchedule",
-                    "args": {
-                        "holidayIndex": "int",
-                    },
-                },
-            0x0000001B: {
-                    "commandId": 0x0000001B,
-                    "commandName": "GetUser",
-                    "args": {
-                        "userIndex": "int",
-                    },
-                },
-            0x0000000C: {
-                    "commandId": 0x0000000C,
-                    "commandName": "GetWeekDaySchedule",
-                    "args": {
-                        "weekDayIndex": "int",
-                        "userIndex": "int",
-                    },
-                },
-            0x0000000F: {
-                    "commandId": 0x0000000F,
-                    "commandName": "GetYearDaySchedule",
-                    "args": {
-                        "yearDayIndex": "int",
-                        "userIndex": "int",
-                    },
-                },
             0x00000000: {
                     "commandId": 0x00000000,
-                    "commandName": "LockDoor",
-                    "args": {
-                        "pinCode": "bytes",
-                    },
-                },
-            0x00000022: {
-                    "commandId": 0x00000022,
-                    "commandName": "SetCredential",
-                    "args": {
-                        "operationType": "int",
-                        "credentialType": "int",
-                        "credentialIndex": "int",
-                        "credentialData": "bytes",
-                        "userIndex": "int",
-                        "userStatus": "int",
-                        "userType": "int",
-                    },
-                },
-            0x00000011: {
-                    "commandId": 0x00000011,
-                    "commandName": "SetHolidaySchedule",
+                    "commandName": "ScanNetworks",
                     "args": {
-                        "holidayIndex": "int",
-                        "localStartTime": "int",
-                        "localEndTime": "int",
-                        "operatingMode": "int",
+                        "ssid": "bytes",
+                        "breadcrumb": "int",
                     },
                 },
-            0x0000001A: {
-                    "commandId": 0x0000001A,
-                    "commandName": "SetUser",
+            0x00000002: {
+                    "commandId": 0x00000002,
+                    "commandName": "AddOrUpdateWiFiNetwork",
                     "args": {
-                        "operationType": "int",
-                        "userIndex": "int",
-                        "userName": "str",
-                        "userUniqueId": "int",
-                        "userStatus": "int",
-                        "userType": "int",
-                        "credentialRule": "int",
+                        "ssid": "bytes",
+                        "credentials": "bytes",
+                        "breadcrumb": "int",
                     },
                 },
-            0x0000000B: {
-                    "commandId": 0x0000000B,
-                    "commandName": "SetWeekDaySchedule",
+            0x00000003: {
+                    "commandId": 0x00000003,
+                    "commandName": "AddOrUpdateThreadNetwork",
                     "args": {
-                        "weekDayIndex": "int",
-                        "userIndex": "int",
-                        "daysMask": "int",
-                        "startHour": "int",
-                        "startMinute": "int",
-                        "endHour": "int",
-                        "endMinute": "int",
+                        "operationalDataset": "bytes",
+                        "breadcrumb": "int",
                     },
                 },
-            0x0000000E: {
-                    "commandId": 0x0000000E,
-                    "commandName": "SetYearDaySchedule",
+            0x00000004: {
+                    "commandId": 0x00000004,
+                    "commandName": "RemoveNetwork",
                     "args": {
-                        "yearDayIndex": "int",
-                        "userIndex": "int",
-                        "localStartTime": "int",
-                        "localEndTime": "int",
+                        "networkID": "bytes",
+                        "breadcrumb": "int",
                     },
                 },
-            0x00000001: {
-                    "commandId": 0x00000001,
-                    "commandName": "UnlockDoor",
+            0x00000006: {
+                    "commandId": 0x00000006,
+                    "commandName": "ConnectNetwork",
                     "args": {
-                        "pinCode": "bytes",
+                        "networkID": "bytes",
+                        "breadcrumb": "int",
                     },
                 },
-            0x00000003: {
-                    "commandId": 0x00000003,
-                    "commandName": "UnlockWithTimeout",
+            0x00000008: {
+                    "commandId": 0x00000008,
+                    "commandName": "ReorderNetwork",
                     "args": {
-                        "timeout": "int",
-                        "pinCode": "bytes",
+                        "networkID": "bytes",
+                        "networkIndex": "int",
+                        "breadcrumb": "int",
                     },
                 },
             },
             "attributes": {
                 0x00000000: {
-                    "attributeName": "LockState",
+                    "attributeName": "MaxNetworks",
                     "attributeId": 0x00000000,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000001: {
-                    "attributeName": "LockType",
+                    "attributeName": "Networks",
                     "attributeId": 0x00000001,
-                    "type": "int",
+                    "type": "",
                     "reportable": True,
                 },
                 0x00000002: {
-                    "attributeName": "ActuatorEnabled",
+                    "attributeName": "ScanMaxTimeSeconds",
                     "attributeId": 0x00000002,
-                    "type": "bool",
+                    "type": "int",
                     "reportable": True,
                 },
                 0x00000003: {
-                    "attributeName": "DoorState",
+                    "attributeName": "ConnectMaxTimeSeconds",
                     "attributeId": 0x00000003,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000011: {
-                    "attributeName": "NumberOfTotalUsersSupported",
-                    "attributeId": 0x00000011,
-                    "type": "int",
+                0x00000004: {
+                    "attributeName": "InterfaceEnabled",
+                    "attributeId": 0x00000004,
+                    "type": "bool",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000012: {
-                    "attributeName": "NumberOfPINUsersSupported",
-                    "attributeId": 0x00000012,
+                0x00000005: {
+                    "attributeName": "LastNetworkingStatus",
+                    "attributeId": 0x00000005,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000013: {
-                    "attributeName": "NumberOfRFIDUsersSupported",
-                    "attributeId": 0x00000013,
-                    "type": "int",
+                0x00000006: {
+                    "attributeName": "LastNetworkID",
+                    "attributeId": 0x00000006,
+                    "type": "bytes",
                     "reportable": True,
                 },
-                0x00000014: {
-                    "attributeName": "NumberOfWeekDaySchedulesSupportedPerUser",
-                    "attributeId": 0x00000014,
+                0x00000007: {
+                    "attributeName": "LastConnectErrorValue",
+                    "attributeId": 0x00000007,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000015: {
-                    "attributeName": "NumberOfYearDaySchedulesSupportedPerUser",
-                    "attributeId": 0x00000015,
+                0x0000FFF8: {
+                    "attributeName": "GeneratedCommandList",
+                    "attributeId": 0x0000FFF8,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000016: {
-                    "attributeName": "NumberOfHolidaySchedulesSupported",
-                    "attributeId": 0x00000016,
+                0x0000FFF9: {
+                    "attributeName": "AcceptedCommandList",
+                    "attributeId": 0x0000FFF9,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000017: {
-                    "attributeName": "MaxPINCodeLength",
-                    "attributeId": 0x00000017,
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000018: {
-                    "attributeName": "MinPINCodeLength",
-                    "attributeId": 0x00000018,
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000019: {
-                    "attributeName": "MaxRFIDCodeLength",
-                    "attributeId": 0x00000019,
+            },
+    }
+    _DIAGNOSTIC_LOGS_CLUSTER_INFO = {
+            "clusterName": "DiagnosticLogs",
+            "clusterId": 0x00000032,
+            "commands": {
+            0x00000000: {
+                    "commandId": 0x00000000,
+                    "commandName": "RetrieveLogsRequest",
+                    "args": {
+                        "intent": "int",
+                        "requestedProtocol": "int",
+                        "transferFileDesignator": "bytes",
+                    },
+                },
+            },
+            "attributes": {
+                0x0000FFF8: {
+                    "attributeName": "GeneratedCommandList",
+                    "attributeId": 0x0000FFF8,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000001A: {
-                    "attributeName": "MinRFIDCodeLength",
-                    "attributeId": 0x0000001A,
+                0x0000FFF9: {
+                    "attributeName": "AcceptedCommandList",
+                    "attributeId": 0x0000FFF9,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000001C: {
-                    "attributeName": "NumberOfCredentialsSupportedPerUser",
-                    "attributeId": 0x0000001C,
+                0x0000FFFB: {
+                    "attributeName": "AttributeList",
+                    "attributeId": 0x0000FFFB,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000021: {
-                    "attributeName": "Language",
-                    "attributeId": 0x00000021,
-                    "type": "str",
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
+                    "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000023: {
-                    "attributeName": "AutoRelockTime",
-                    "attributeId": 0x00000023,
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000024: {
-                    "attributeName": "SoundVolume",
-                    "attributeId": 0x00000024,
+            },
+    }
+    _GENERAL_DIAGNOSTICS_CLUSTER_INFO = {
+            "clusterName": "GeneralDiagnostics",
+            "clusterId": 0x00000033,
+            "commands": {
+            0x00000000: {
+                    "commandId": 0x00000000,
+                    "commandName": "TestEventTrigger",
+                    "args": {
+                        "enableKey": "bytes",
+                        "eventTrigger": "int",
+                    },
+                },
+            },
+            "attributes": {
+                0x00000000: {
+                    "attributeName": "NetworkInterfaces",
+                    "attributeId": 0x00000000,
+                    "type": "",
+                    "reportable": True,
+                },
+                0x00000001: {
+                    "attributeName": "RebootCount",
+                    "attributeId": 0x00000001,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000025: {
-                    "attributeName": "OperatingMode",
-                    "attributeId": 0x00000025,
+                0x00000002: {
+                    "attributeName": "UpTime",
+                    "attributeId": 0x00000002,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000026: {
-                    "attributeName": "SupportedOperatingModes",
-                    "attributeId": 0x00000026,
+                0x00000003: {
+                    "attributeName": "TotalOperationalHours",
+                    "attributeId": 0x00000003,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000029: {
-                    "attributeName": "EnableOneTouchLocking",
-                    "attributeId": 0x00000029,
-                    "type": "bool",
+                0x00000004: {
+                    "attributeName": "BootReasons",
+                    "attributeId": 0x00000004,
+                    "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000002B: {
-                    "attributeName": "EnablePrivacyModeButton",
-                    "attributeId": 0x0000002B,
-                    "type": "bool",
+                0x00000005: {
+                    "attributeName": "ActiveHardwareFaults",
+                    "attributeId": 0x00000005,
+                    "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000030: {
-                    "attributeName": "WrongCodeEntryLimit",
-                    "attributeId": 0x00000030,
+                0x00000006: {
+                    "attributeName": "ActiveRadioFaults",
+                    "attributeId": 0x00000006,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000031: {
-                    "attributeName": "UserCodeTemporaryDisableTime",
-                    "attributeId": 0x00000031,
+                0x00000007: {
+                    "attributeName": "ActiveNetworkFaults",
+                    "attributeId": 0x00000007,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000033: {
-                    "attributeName": "RequirePINforRemoteOperation",
-                    "attributeId": 0x00000033,
+                0x00000008: {
+                    "attributeName": "TestEventTriggersEnabled",
+                    "attributeId": 0x00000008,
                     "type": "bool",
-                    "writable": True,
+                    "reportable": True,
                 },
                 0x0000FFF8: {
                     "attributeName": "GeneratedCommandList",
@@ -2316,75 +2110,39 @@ class ChipClusters:
                 },
             },
     }
-    _ELECTRICAL_MEASUREMENT_CLUSTER_INFO = {
-            "clusterName": "ElectricalMeasurement",
-            "clusterId": 0x00000B04,
+    _SOFTWARE_DIAGNOSTICS_CLUSTER_INFO = {
+            "clusterName": "SoftwareDiagnostics",
+            "clusterId": 0x00000034,
             "commands": {
+            0x00000000: {
+                    "commandId": 0x00000000,
+                    "commandName": "ResetWatermarks",
+                    "args": {
+                    },
+                },
             },
             "attributes": {
                 0x00000000: {
-                    "attributeName": "MeasurementType",
+                    "attributeName": "ThreadMetrics",
                     "attributeId": 0x00000000,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000304: {
-                    "attributeName": "TotalActivePower",
-                    "attributeId": 0x00000304,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000505: {
-                    "attributeName": "RmsVoltage",
-                    "attributeId": 0x00000505,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000506: {
-                    "attributeName": "RmsVoltageMin",
-                    "attributeId": 0x00000506,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000507: {
-                    "attributeName": "RmsVoltageMax",
-                    "attributeId": 0x00000507,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000508: {
-                    "attributeName": "RmsCurrent",
-                    "attributeId": 0x00000508,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000509: {
-                    "attributeName": "RmsCurrentMin",
-                    "attributeId": 0x00000509,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x0000050A: {
-                    "attributeName": "RmsCurrentMax",
-                    "attributeId": 0x0000050A,
-                    "type": "int",
+                    "type": "",
                     "reportable": True,
                 },
-                0x0000050B: {
-                    "attributeName": "ActivePower",
-                    "attributeId": 0x0000050B,
+                0x00000001: {
+                    "attributeName": "CurrentHeapFree",
+                    "attributeId": 0x00000001,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000050C: {
-                    "attributeName": "ActivePowerMin",
-                    "attributeId": 0x0000050C,
+                0x00000002: {
+                    "attributeName": "CurrentHeapUsed",
+                    "attributeId": 0x00000002,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000050D: {
-                    "attributeName": "ActivePowerMax",
-                    "attributeId": 0x0000050D,
+                0x00000003: {
+                    "attributeName": "CurrentHeapHighWatermark",
+                    "attributeId": 0x00000003,
                     "type": "int",
                     "reportable": True,
                 },
@@ -2420,9 +2178,9 @@ class ChipClusters:
                 },
             },
     }
-    _ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_INFO = {
-            "clusterName": "EthernetNetworkDiagnostics",
-            "clusterId": 0x00000037,
+    _THREAD_NETWORK_DIAGNOSTICS_CLUSTER_INFO = {
+            "clusterName": "ThreadNetworkDiagnostics",
+            "clusterId": 0x00000035,
             "commands": {
             0x00000000: {
                     "commandId": 0x00000000,
@@ -2433,39 +2191,39 @@ class ChipClusters:
             },
             "attributes": {
                 0x00000000: {
-                    "attributeName": "PHYRate",
+                    "attributeName": "Channel",
                     "attributeId": 0x00000000,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000001: {
-                    "attributeName": "FullDuplex",
+                    "attributeName": "RoutingRole",
                     "attributeId": 0x00000001,
-                    "type": "bool",
+                    "type": "int",
                     "reportable": True,
                 },
                 0x00000002: {
-                    "attributeName": "PacketRxCount",
+                    "attributeName": "NetworkName",
                     "attributeId": 0x00000002,
-                    "type": "int",
+                    "type": "str",
                     "reportable": True,
                 },
                 0x00000003: {
-                    "attributeName": "PacketTxCount",
+                    "attributeName": "PanId",
                     "attributeId": 0x00000003,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000004: {
-                    "attributeName": "TxErrCount",
+                    "attributeName": "ExtendedPanId",
                     "attributeId": 0x00000004,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000005: {
-                    "attributeName": "CollisionCount",
+                    "attributeName": "MeshLocalPrefix",
                     "attributeId": 0x00000005,
-                    "type": "int",
+                    "type": "bytes",
                     "reportable": True,
                 },
                 0x00000006: {
@@ -2475,323 +2233,339 @@ class ChipClusters:
                     "reportable": True,
                 },
                 0x00000007: {
-                    "attributeName": "CarrierDetect",
+                    "attributeName": "NeighborTableList",
                     "attributeId": 0x00000007,
-                    "type": "bool",
+                    "type": "",
                     "reportable": True,
                 },
                 0x00000008: {
-                    "attributeName": "TimeSinceReset",
+                    "attributeName": "RouteTableList",
                     "attributeId": 0x00000008,
+                    "type": "",
+                    "reportable": True,
+                },
+                0x00000009: {
+                    "attributeName": "PartitionId",
+                    "attributeId": 0x00000009,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFF8: {
-                    "attributeName": "GeneratedCommandList",
-                    "attributeId": 0x0000FFF8,
+                0x0000000A: {
+                    "attributeName": "Weighting",
+                    "attributeId": 0x0000000A,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFF9: {
-                    "attributeName": "AcceptedCommandList",
-                    "attributeId": 0x0000FFF9,
+                0x0000000B: {
+                    "attributeName": "DataVersion",
+                    "attributeId": 0x0000000B,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFB: {
-                    "attributeName": "AttributeList",
-                    "attributeId": 0x0000FFFB,
+                0x0000000C: {
+                    "attributeName": "StableDataVersion",
+                    "attributeId": 0x0000000C,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
+                0x0000000D: {
+                    "attributeName": "LeaderRouterId",
+                    "attributeId": 0x0000000D,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
+                0x0000000E: {
+                    "attributeName": "DetachedRoleCount",
+                    "attributeId": 0x0000000E,
                     "type": "int",
                     "reportable": True,
                 },
-            },
-    }
-    _FAN_CONTROL_CLUSTER_INFO = {
-            "clusterName": "FanControl",
-            "clusterId": 0x00000202,
-            "commands": {
-            },
-            "attributes": {
-                0x00000000: {
-                    "attributeName": "FanMode",
-                    "attributeId": 0x00000000,
+                0x0000000F: {
+                    "attributeName": "ChildRoleCount",
+                    "attributeId": 0x0000000F,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000001: {
-                    "attributeName": "FanModeSequence",
-                    "attributeId": 0x00000001,
+                0x00000010: {
+                    "attributeName": "RouterRoleCount",
+                    "attributeId": 0x00000010,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000002: {
-                    "attributeName": "PercentSetting",
-                    "attributeId": 0x00000002,
+                0x00000011: {
+                    "attributeName": "LeaderRoleCount",
+                    "attributeId": 0x00000011,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000003: {
-                    "attributeName": "PercentCurrent",
-                    "attributeId": 0x00000003,
+                0x00000012: {
+                    "attributeName": "AttachAttemptCount",
+                    "attributeId": 0x00000012,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000004: {
-                    "attributeName": "SpeedMax",
-                    "attributeId": 0x00000004,
+                0x00000013: {
+                    "attributeName": "PartitionIdChangeCount",
+                    "attributeId": 0x00000013,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000014: {
+                    "attributeName": "BetterPartitionAttachAttemptCount",
+                    "attributeId": 0x00000014,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000015: {
+                    "attributeName": "ParentChangeCount",
+                    "attributeId": 0x00000015,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000016: {
+                    "attributeName": "TxTotalCount",
+                    "attributeId": 0x00000016,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000017: {
+                    "attributeName": "TxUnicastCount",
+                    "attributeId": 0x00000017,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000018: {
+                    "attributeName": "TxBroadcastCount",
+                    "attributeId": 0x00000018,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000019: {
+                    "attributeName": "TxAckRequestedCount",
+                    "attributeId": 0x00000019,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000001A: {
+                    "attributeName": "TxAckedCount",
+                    "attributeId": 0x0000001A,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000001B: {
+                    "attributeName": "TxNoAckRequestedCount",
+                    "attributeId": 0x0000001B,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000001C: {
+                    "attributeName": "TxDataCount",
+                    "attributeId": 0x0000001C,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000001D: {
+                    "attributeName": "TxDataPollCount",
+                    "attributeId": 0x0000001D,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000001E: {
+                    "attributeName": "TxBeaconCount",
+                    "attributeId": 0x0000001E,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000001F: {
+                    "attributeName": "TxBeaconRequestCount",
+                    "attributeId": 0x0000001F,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000005: {
-                    "attributeName": "SpeedSetting",
-                    "attributeId": 0x00000005,
+                0x00000020: {
+                    "attributeName": "TxOtherCount",
+                    "attributeId": 0x00000020,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000006: {
-                    "attributeName": "SpeedCurrent",
-                    "attributeId": 0x00000006,
+                0x00000021: {
+                    "attributeName": "TxRetryCount",
+                    "attributeId": 0x00000021,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000007: {
-                    "attributeName": "RockSupport",
-                    "attributeId": 0x00000007,
+                0x00000022: {
+                    "attributeName": "TxDirectMaxRetryExpiryCount",
+                    "attributeId": 0x00000022,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000008: {
-                    "attributeName": "RockSetting",
-                    "attributeId": 0x00000008,
+                0x00000023: {
+                    "attributeName": "TxIndirectMaxRetryExpiryCount",
+                    "attributeId": 0x00000023,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000009: {
-                    "attributeName": "WindSupport",
-                    "attributeId": 0x00000009,
+                0x00000024: {
+                    "attributeName": "TxErrCcaCount",
+                    "attributeId": 0x00000024,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000000A: {
-                    "attributeName": "WindSetting",
-                    "attributeId": 0x0000000A,
+                0x00000025: {
+                    "attributeName": "TxErrAbortCount",
+                    "attributeId": 0x00000025,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000FFF8: {
-                    "attributeName": "GeneratedCommandList",
-                    "attributeId": 0x0000FFF8,
+                0x00000026: {
+                    "attributeName": "TxErrBusyChannelCount",
+                    "attributeId": 0x00000026,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFF9: {
-                    "attributeName": "AcceptedCommandList",
-                    "attributeId": 0x0000FFF9,
+                0x00000027: {
+                    "attributeName": "RxTotalCount",
+                    "attributeId": 0x00000027,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFB: {
-                    "attributeName": "AttributeList",
-                    "attributeId": 0x0000FFFB,
+                0x00000028: {
+                    "attributeName": "RxUnicastCount",
+                    "attributeId": 0x00000028,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
+                0x00000029: {
+                    "attributeName": "RxBroadcastCount",
+                    "attributeId": 0x00000029,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
+                0x0000002A: {
+                    "attributeName": "RxDataCount",
+                    "attributeId": 0x0000002A,
                     "type": "int",
                     "reportable": True,
                 },
-            },
-    }
-    _FIXED_LABEL_CLUSTER_INFO = {
-            "clusterName": "FixedLabel",
-            "clusterId": 0x00000040,
-            "commands": {
-            },
-            "attributes": {
-                0x00000000: {
-                    "attributeName": "LabelList",
-                    "attributeId": 0x00000000,
-                    "type": "",
+                0x0000002B: {
+                    "attributeName": "RxDataPollCount",
+                    "attributeId": 0x0000002B,
+                    "type": "int",
                     "reportable": True,
                 },
-                0x0000FFF8: {
-                    "attributeName": "GeneratedCommandList",
-                    "attributeId": 0x0000FFF8,
+                0x0000002C: {
+                    "attributeName": "RxBeaconCount",
+                    "attributeId": 0x0000002C,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFF9: {
-                    "attributeName": "AcceptedCommandList",
-                    "attributeId": 0x0000FFF9,
+                0x0000002D: {
+                    "attributeName": "RxBeaconRequestCount",
+                    "attributeId": 0x0000002D,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFB: {
-                    "attributeName": "AttributeList",
-                    "attributeId": 0x0000FFFB,
+                0x0000002E: {
+                    "attributeName": "RxOtherCount",
+                    "attributeId": 0x0000002E,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
+                0x0000002F: {
+                    "attributeName": "RxAddressFilteredCount",
+                    "attributeId": 0x0000002F,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
+                0x00000030: {
+                    "attributeName": "RxDestAddrFilteredCount",
+                    "attributeId": 0x00000030,
                     "type": "int",
                     "reportable": True,
                 },
-            },
-    }
-    _FLOW_MEASUREMENT_CLUSTER_INFO = {
-            "clusterName": "FlowMeasurement",
-            "clusterId": 0x00000404,
-            "commands": {
-            },
-            "attributes": {
-                0x00000000: {
-                    "attributeName": "MeasuredValue",
-                    "attributeId": 0x00000000,
+                0x00000031: {
+                    "attributeName": "RxDuplicatedCount",
+                    "attributeId": 0x00000031,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000001: {
-                    "attributeName": "MinMeasuredValue",
-                    "attributeId": 0x00000001,
+                0x00000032: {
+                    "attributeName": "RxErrNoFrameCount",
+                    "attributeId": 0x00000032,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000002: {
-                    "attributeName": "MaxMeasuredValue",
-                    "attributeId": 0x00000002,
+                0x00000033: {
+                    "attributeName": "RxErrUnknownNeighborCount",
+                    "attributeId": 0x00000033,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000003: {
-                    "attributeName": "Tolerance",
-                    "attributeId": 0x00000003,
+                0x00000034: {
+                    "attributeName": "RxErrInvalidSrcAddrCount",
+                    "attributeId": 0x00000034,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFF8: {
-                    "attributeName": "GeneratedCommandList",
-                    "attributeId": 0x0000FFF8,
+                0x00000035: {
+                    "attributeName": "RxErrSecCount",
+                    "attributeId": 0x00000035,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFF9: {
-                    "attributeName": "AcceptedCommandList",
-                    "attributeId": 0x0000FFF9,
+                0x00000036: {
+                    "attributeName": "RxErrFcsCount",
+                    "attributeId": 0x00000036,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFB: {
-                    "attributeName": "AttributeList",
-                    "attributeId": 0x0000FFFB,
+                0x00000037: {
+                    "attributeName": "RxErrOtherCount",
+                    "attributeId": 0x00000037,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
+                0x00000038: {
+                    "attributeName": "ActiveTimestamp",
+                    "attributeId": 0x00000038,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
+                0x00000039: {
+                    "attributeName": "PendingTimestamp",
+                    "attributeId": 0x00000039,
                     "type": "int",
                     "reportable": True,
                 },
-            },
-    }
-    _GENERAL_COMMISSIONING_CLUSTER_INFO = {
-            "clusterName": "GeneralCommissioning",
-            "clusterId": 0x00000030,
-            "commands": {
-            0x00000000: {
-                    "commandId": 0x00000000,
-                    "commandName": "ArmFailSafe",
-                    "args": {
-                        "expiryLengthSeconds": "int",
-                        "breadcrumb": "int",
-                    },
-                },
-            0x00000004: {
-                    "commandId": 0x00000004,
-                    "commandName": "CommissioningComplete",
-                    "args": {
-                    },
-                },
-            0x00000002: {
-                    "commandId": 0x00000002,
-                    "commandName": "SetRegulatoryConfig",
-                    "args": {
-                        "newRegulatoryConfig": "int",
-                        "countryCode": "str",
-                        "breadcrumb": "int",
-                    },
-                },
-            },
-            "attributes": {
-                0x00000000: {
-                    "attributeName": "Breadcrumb",
-                    "attributeId": 0x00000000,
+                0x0000003A: {
+                    "attributeName": "Delay",
+                    "attributeId": 0x0000003A,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000001: {
-                    "attributeName": "BasicCommissioningInfo",
-                    "attributeId": 0x00000001,
+                0x0000003B: {
+                    "attributeName": "SecurityPolicy",
+                    "attributeId": 0x0000003B,
                     "type": "",
                     "reportable": True,
                 },
-                0x00000002: {
-                    "attributeName": "RegulatoryConfig",
-                    "attributeId": 0x00000002,
-                    "type": "int",
+                0x0000003C: {
+                    "attributeName": "ChannelMask",
+                    "attributeId": 0x0000003C,
+                    "type": "bytes",
                     "reportable": True,
                 },
-                0x00000003: {
-                    "attributeName": "LocationCapability",
-                    "attributeId": 0x00000003,
-                    "type": "int",
+                0x0000003D: {
+                    "attributeName": "OperationalDatasetComponents",
+                    "attributeId": 0x0000003D,
+                    "type": "",
                     "reportable": True,
                 },
-                0x00000004: {
-                    "attributeName": "SupportsConcurrentConnection",
-                    "attributeId": 0x00000004,
-                    "type": "bool",
+                0x0000003E: {
+                    "attributeName": "ActiveNetworkFaultsList",
+                    "attributeId": 0x0000003E,
+                    "type": "int",
                     "reportable": True,
                 },
                 0x0000FFF8: {
@@ -2826,72 +2600,94 @@ class ChipClusters:
                 },
             },
     }
-    _GENERAL_DIAGNOSTICS_CLUSTER_INFO = {
-            "clusterName": "GeneralDiagnostics",
-            "clusterId": 0x00000033,
+    _WI_FI_NETWORK_DIAGNOSTICS_CLUSTER_INFO = {
+            "clusterName": "WiFiNetworkDiagnostics",
+            "clusterId": 0x00000036,
             "commands": {
             0x00000000: {
                     "commandId": 0x00000000,
-                    "commandName": "TestEventTrigger",
+                    "commandName": "ResetCounts",
                     "args": {
-                        "enableKey": "bytes",
-                        "eventTrigger": "int",
                     },
                 },
             },
             "attributes": {
                 0x00000000: {
-                    "attributeName": "NetworkInterfaces",
+                    "attributeName": "Bssid",
                     "attributeId": 0x00000000,
-                    "type": "",
+                    "type": "bytes",
                     "reportable": True,
                 },
                 0x00000001: {
-                    "attributeName": "RebootCount",
+                    "attributeName": "SecurityType",
                     "attributeId": 0x00000001,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000002: {
-                    "attributeName": "UpTime",
+                    "attributeName": "WiFiVersion",
                     "attributeId": 0x00000002,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000003: {
-                    "attributeName": "TotalOperationalHours",
+                    "attributeName": "ChannelNumber",
                     "attributeId": 0x00000003,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000004: {
-                    "attributeName": "BootReasons",
+                    "attributeName": "Rssi",
                     "attributeId": 0x00000004,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000005: {
-                    "attributeName": "ActiveHardwareFaults",
+                    "attributeName": "BeaconLostCount",
                     "attributeId": 0x00000005,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000006: {
-                    "attributeName": "ActiveRadioFaults",
+                    "attributeName": "BeaconRxCount",
                     "attributeId": 0x00000006,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000007: {
-                    "attributeName": "ActiveNetworkFaults",
+                    "attributeName": "PacketMulticastRxCount",
                     "attributeId": 0x00000007,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000008: {
-                    "attributeName": "TestEventTriggersEnabled",
+                    "attributeName": "PacketMulticastTxCount",
                     "attributeId": 0x00000008,
-                    "type": "bool",
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000009: {
+                    "attributeName": "PacketUnicastRxCount",
+                    "attributeId": 0x00000009,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000000A: {
+                    "attributeName": "PacketUnicastTxCount",
+                    "attributeId": 0x0000000A,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000000B: {
+                    "attributeName": "CurrentMaxRate",
+                    "attributeId": 0x0000000B,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000000C: {
+                    "attributeName": "OverrunCount",
+                    "attributeId": 0x0000000C,
+                    "type": "int",
                     "reportable": True,
                 },
                 0x0000FFF8: {
@@ -2926,72 +2722,72 @@ class ChipClusters:
                 },
             },
     }
-    _GROUP_KEY_MANAGEMENT_CLUSTER_INFO = {
-            "clusterName": "GroupKeyManagement",
-            "clusterId": 0x0000003F,
+    _ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_INFO = {
+            "clusterName": "EthernetNetworkDiagnostics",
+            "clusterId": 0x00000037,
             "commands": {
-            0x00000001: {
-                    "commandId": 0x00000001,
-                    "commandName": "KeySetRead",
-                    "args": {
-                        "groupKeySetID": "int",
-                    },
-                },
-            0x00000004: {
-                    "commandId": 0x00000004,
-                    "commandName": "KeySetReadAllIndices",
-                    "args": {
-                        "groupKeySetIDs": "int",
-                    },
-                },
-            0x00000003: {
-                    "commandId": 0x00000003,
-                    "commandName": "KeySetRemove",
-                    "args": {
-                        "groupKeySetID": "int",
-                    },
-                },
             0x00000000: {
                     "commandId": 0x00000000,
-                    "commandName": "KeySetWrite",
+                    "commandName": "ResetCounts",
                     "args": {
-                        "groupKeySetID": "int",
-                        "groupKeySecurityPolicy": "int",
-                        "epochKey0": "bytes",
-                        "epochStartTime0": "int",
-                        "epochKey1": "bytes",
-                        "epochStartTime1": "int",
-                        "epochKey2": "bytes",
-                        "epochStartTime2": "int",
                     },
                 },
             },
             "attributes": {
                 0x00000000: {
-                    "attributeName": "GroupKeyMap",
+                    "attributeName": "PHYRate",
                     "attributeId": 0x00000000,
-                    "type": "",
+                    "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
                 0x00000001: {
-                    "attributeName": "GroupTable",
+                    "attributeName": "FullDuplex",
                     "attributeId": 0x00000001,
-                    "type": "",
+                    "type": "bool",
                     "reportable": True,
                 },
                 0x00000002: {
-                    "attributeName": "MaxGroupsPerFabric",
+                    "attributeName": "PacketRxCount",
                     "attributeId": 0x00000002,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000003: {
-                    "attributeName": "MaxGroupKeysPerFabric",
+                    "attributeName": "PacketTxCount",
                     "attributeId": 0x00000003,
                     "type": "int",
                     "reportable": True,
                 },
+                0x00000004: {
+                    "attributeName": "TxErrCount",
+                    "attributeId": 0x00000004,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000005: {
+                    "attributeName": "CollisionCount",
+                    "attributeId": 0x00000005,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000006: {
+                    "attributeName": "OverrunCount",
+                    "attributeId": 0x00000006,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000007: {
+                    "attributeName": "CarrierDetect",
+                    "attributeId": 0x00000007,
+                    "type": "bool",
+                    "reportable": True,
+                },
+                0x00000008: {
+                    "attributeName": "TimeSinceReset",
+                    "attributeId": 0x00000008,
+                    "type": "int",
+                    "reportable": True,
+                },
                 0x0000FFF8: {
                     "attributeName": "GeneratedCommandList",
                     "attributeId": 0x0000FFF8,
@@ -3024,125 +2820,101 @@ class ChipClusters:
                 },
             },
     }
-    _GROUPS_CLUSTER_INFO = {
-            "clusterName": "Groups",
-            "clusterId": 0x00000004,
+    _BRIDGED_DEVICE_BASIC_CLUSTER_INFO = {
+            "clusterName": "BridgedDeviceBasic",
+            "clusterId": 0x00000039,
             "commands": {
-            0x00000000: {
-                    "commandId": 0x00000000,
-                    "commandName": "AddGroup",
-                    "args": {
-                        "groupId": "int",
-                        "groupName": "str",
-                    },
-                },
-            0x00000005: {
-                    "commandId": 0x00000005,
-                    "commandName": "AddGroupIfIdentifying",
-                    "args": {
-                        "groupId": "int",
-                        "groupName": "str",
-                    },
-                },
-            0x00000002: {
-                    "commandId": 0x00000002,
-                    "commandName": "GetGroupMembership",
-                    "args": {
-                        "groupList": "int",
-                    },
+            },
+            "attributes": {
+                0x00000001: {
+                    "attributeName": "VendorName",
+                    "attributeId": 0x00000001,
+                    "type": "str",
+                    "reportable": True,
                 },
-            0x00000004: {
-                    "commandId": 0x00000004,
-                    "commandName": "RemoveAllGroups",
-                    "args": {
-                    },
+                0x00000002: {
+                    "attributeName": "VendorID",
+                    "attributeId": 0x00000002,
+                    "type": "int",
+                    "reportable": True,
                 },
-            0x00000003: {
-                    "commandId": 0x00000003,
-                    "commandName": "RemoveGroup",
-                    "args": {
-                        "groupId": "int",
-                    },
+                0x00000003: {
+                    "attributeName": "ProductName",
+                    "attributeId": 0x00000003,
+                    "type": "str",
+                    "reportable": True,
                 },
-            0x00000001: {
-                    "commandId": 0x00000001,
-                    "commandName": "ViewGroup",
-                    "args": {
-                        "groupId": "int",
-                    },
+                0x00000005: {
+                    "attributeName": "NodeLabel",
+                    "attributeId": 0x00000005,
+                    "type": "str",
+                    "reportable": True,
+                    "writable": True,
                 },
-            },
-            "attributes": {
-                0x00000000: {
-                    "attributeName": "NameSupport",
-                    "attributeId": 0x00000000,
+                0x00000007: {
+                    "attributeName": "HardwareVersion",
+                    "attributeId": 0x00000007,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFF8: {
-                    "attributeName": "GeneratedCommandList",
-                    "attributeId": 0x0000FFF8,
-                    "type": "int",
+                0x00000008: {
+                    "attributeName": "HardwareVersionString",
+                    "attributeId": 0x00000008,
+                    "type": "str",
                     "reportable": True,
                 },
-                0x0000FFF9: {
-                    "attributeName": "AcceptedCommandList",
-                    "attributeId": 0x0000FFF9,
+                0x00000009: {
+                    "attributeName": "SoftwareVersion",
+                    "attributeId": 0x00000009,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFB: {
-                    "attributeName": "AttributeList",
-                    "attributeId": 0x0000FFFB,
-                    "type": "int",
+                0x0000000A: {
+                    "attributeName": "SoftwareVersionString",
+                    "attributeId": 0x0000000A,
+                    "type": "str",
                     "reportable": True,
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
-                    "type": "int",
+                0x0000000B: {
+                    "attributeName": "ManufacturingDate",
+                    "attributeId": 0x0000000B,
+                    "type": "str",
                     "reportable": True,
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
-                    "type": "int",
+                0x0000000C: {
+                    "attributeName": "PartNumber",
+                    "attributeId": 0x0000000C,
+                    "type": "str",
                     "reportable": True,
                 },
-            },
-    }
-    _IDENTIFY_CLUSTER_INFO = {
-            "clusterName": "Identify",
-            "clusterId": 0x00000003,
-            "commands": {
-            0x00000000: {
-                    "commandId": 0x00000000,
-                    "commandName": "Identify",
-                    "args": {
-                        "identifyTime": "int",
-                    },
+                0x0000000D: {
+                    "attributeName": "ProductURL",
+                    "attributeId": 0x0000000D,
+                    "type": "str",
+                    "reportable": True,
                 },
-            0x00000040: {
-                    "commandId": 0x00000040,
-                    "commandName": "TriggerEffect",
-                    "args": {
-                        "effectIdentifier": "int",
-                        "effectVariant": "int",
-                    },
+                0x0000000E: {
+                    "attributeName": "ProductLabel",
+                    "attributeId": 0x0000000E,
+                    "type": "str",
+                    "reportable": True,
                 },
-            },
-            "attributes": {
-                0x00000000: {
-                    "attributeName": "IdentifyTime",
-                    "attributeId": 0x00000000,
-                    "type": "int",
+                0x0000000F: {
+                    "attributeName": "SerialNumber",
+                    "attributeId": 0x0000000F,
+                    "type": "str",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000001: {
-                    "attributeName": "IdentifyType",
-                    "attributeId": 0x00000001,
-                    "type": "int",
+                0x00000011: {
+                    "attributeName": "Reachable",
+                    "attributeId": 0x00000011,
+                    "type": "bool",
+                    "reportable": True,
+                },
+                0x00000012: {
+                    "attributeName": "UniqueID",
+                    "attributeId": 0x00000012,
+                    "type": "str",
                     "reportable": True,
                 },
                 0x0000FFF8: {
@@ -3177,42 +2949,30 @@ class ChipClusters:
                 },
             },
     }
-    _ILLUMINANCE_MEASUREMENT_CLUSTER_INFO = {
-            "clusterName": "IlluminanceMeasurement",
-            "clusterId": 0x00000400,
+    _SWITCH_CLUSTER_INFO = {
+            "clusterName": "Switch",
+            "clusterId": 0x0000003B,
             "commands": {
             },
             "attributes": {
                 0x00000000: {
-                    "attributeName": "MeasuredValue",
+                    "attributeName": "NumberOfPositions",
                     "attributeId": 0x00000000,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000001: {
-                    "attributeName": "MinMeasuredValue",
+                    "attributeName": "CurrentPosition",
                     "attributeId": 0x00000001,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000002: {
-                    "attributeName": "MaxMeasuredValue",
+                    "attributeName": "MultiPressMax",
                     "attributeId": 0x00000002,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000003: {
-                    "attributeName": "Tolerance",
-                    "attributeId": 0x00000003,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000004: {
-                    "attributeName": "LightSensorType",
-                    "attributeId": 0x00000004,
-                    "type": "int",
-                    "reportable": True,
-                },
                 0x0000FFF8: {
                     "attributeName": "GeneratedCommandList",
                     "attributeId": 0x0000FFF8,
@@ -3245,217 +3005,53 @@ class ChipClusters:
                 },
             },
     }
-    _KEYPAD_INPUT_CLUSTER_INFO = {
-            "clusterName": "KeypadInput",
-            "clusterId": 0x00000509,
+    _ADMINISTRATOR_COMMISSIONING_CLUSTER_INFO = {
+            "clusterName": "AdministratorCommissioning",
+            "clusterId": 0x0000003C,
             "commands": {
             0x00000000: {
                     "commandId": 0x00000000,
-                    "commandName": "SendKey",
+                    "commandName": "OpenCommissioningWindow",
                     "args": {
-                        "keyCode": "int",
+                        "commissioningTimeout": "int",
+                        "PAKEVerifier": "bytes",
+                        "discriminator": "int",
+                        "iterations": "int",
+                        "salt": "bytes",
                     },
                 },
-            },
-            "attributes": {
-                0x0000FFF8: {
-                    "attributeName": "GeneratedCommandList",
-                    "attributeId": 0x0000FFF8,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x0000FFF9: {
-                    "attributeName": "AcceptedCommandList",
-                    "attributeId": 0x0000FFF9,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x0000FFFB: {
-                    "attributeName": "AttributeList",
-                    "attributeId": 0x0000FFFB,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
-                    "type": "int",
-                    "reportable": True,
-                },
-            },
-    }
-    _LEVEL_CONTROL_CLUSTER_INFO = {
-            "clusterName": "LevelControl",
-            "clusterId": 0x00000008,
-            "commands": {
             0x00000001: {
                     "commandId": 0x00000001,
-                    "commandName": "Move",
-                    "args": {
-                        "moveMode": "int",
-                        "rate": "int",
-                        "optionMask": "int",
-                        "optionOverride": "int",
-                    },
-                },
-            0x00000000: {
-                    "commandId": 0x00000000,
-                    "commandName": "MoveToLevel",
-                    "args": {
-                        "level": "int",
-                        "transitionTime": "int",
-                        "optionMask": "int",
-                        "optionOverride": "int",
-                    },
-                },
-            0x00000004: {
-                    "commandId": 0x00000004,
-                    "commandName": "MoveToLevelWithOnOff",
-                    "args": {
-                        "level": "int",
-                        "transitionTime": "int",
-                    },
-                },
-            0x00000005: {
-                    "commandId": 0x00000005,
-                    "commandName": "MoveWithOnOff",
+                    "commandName": "OpenBasicCommissioningWindow",
                     "args": {
-                        "moveMode": "int",
-                        "rate": "int",
+                        "commissioningTimeout": "int",
                     },
                 },
             0x00000002: {
                     "commandId": 0x00000002,
-                    "commandName": "Step",
-                    "args": {
-                        "stepMode": "int",
-                        "stepSize": "int",
-                        "transitionTime": "int",
-                        "optionMask": "int",
-                        "optionOverride": "int",
-                    },
-                },
-            0x00000006: {
-                    "commandId": 0x00000006,
-                    "commandName": "StepWithOnOff",
-                    "args": {
-                        "stepMode": "int",
-                        "stepSize": "int",
-                        "transitionTime": "int",
-                    },
-                },
-            0x00000003: {
-                    "commandId": 0x00000003,
-                    "commandName": "Stop",
-                    "args": {
-                        "optionMask": "int",
-                        "optionOverride": "int",
-                    },
-                },
-            0x00000007: {
-                    "commandId": 0x00000007,
-                    "commandName": "StopWithOnOff",
+                    "commandName": "RevokeCommissioning",
                     "args": {
                     },
                 },
             },
             "attributes": {
                 0x00000000: {
-                    "attributeName": "CurrentLevel",
+                    "attributeName": "WindowStatus",
                     "attributeId": 0x00000000,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000001: {
-                    "attributeName": "RemainingTime",
+                    "attributeName": "AdminFabricIndex",
                     "attributeId": 0x00000001,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000002: {
-                    "attributeName": "MinLevel",
-                    "attributeId": 0x00000002,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000003: {
-                    "attributeName": "MaxLevel",
-                    "attributeId": 0x00000003,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000004: {
-                    "attributeName": "CurrentFrequency",
-                    "attributeId": 0x00000004,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000005: {
-                    "attributeName": "MinFrequency",
-                    "attributeId": 0x00000005,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000006: {
-                    "attributeName": "MaxFrequency",
-                    "attributeId": 0x00000006,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x0000000F: {
-                    "attributeName": "Options",
-                    "attributeId": 0x0000000F,
-                    "type": "int",
-                    "reportable": True,
-                    "writable": True,
-                },
-                0x00000010: {
-                    "attributeName": "OnOffTransitionTime",
-                    "attributeId": 0x00000010,
-                    "type": "int",
-                    "reportable": True,
-                    "writable": True,
-                },
-                0x00000011: {
-                    "attributeName": "OnLevel",
-                    "attributeId": 0x00000011,
-                    "type": "int",
-                    "reportable": True,
-                    "writable": True,
-                },
-                0x00000012: {
-                    "attributeName": "OnTransitionTime",
-                    "attributeId": 0x00000012,
-                    "type": "int",
-                    "reportable": True,
-                    "writable": True,
-                },
-                0x00000013: {
-                    "attributeName": "OffTransitionTime",
-                    "attributeId": 0x00000013,
-                    "type": "int",
-                    "reportable": True,
-                    "writable": True,
-                },
-                0x00000014: {
-                    "attributeName": "DefaultMoveRate",
-                    "attributeId": 0x00000014,
-                    "type": "int",
-                    "reportable": True,
-                    "writable": True,
-                },
-                0x00004000: {
-                    "attributeName": "StartUpCurrentLevel",
-                    "attributeId": 0x00004000,
+                0x00000002: {
+                    "attributeName": "AdminVendorId",
+                    "attributeId": 0x00000002,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
                 0x0000FFF8: {
                     "attributeName": "GeneratedCommandList",
@@ -3489,63 +3085,110 @@ class ChipClusters:
                 },
             },
     }
-    _LOCALIZATION_CONFIGURATION_CLUSTER_INFO = {
-            "clusterName": "LocalizationConfiguration",
-            "clusterId": 0x0000002B,
+    _OPERATIONAL_CREDENTIALS_CLUSTER_INFO = {
+            "clusterName": "OperationalCredentials",
+            "clusterId": 0x0000003E,
             "commands": {
+            0x00000000: {
+                    "commandId": 0x00000000,
+                    "commandName": "AttestationRequest",
+                    "args": {
+                        "attestationNonce": "bytes",
+                    },
+                },
+            0x00000002: {
+                    "commandId": 0x00000002,
+                    "commandName": "CertificateChainRequest",
+                    "args": {
+                        "certificateType": "int",
+                    },
+                },
+            0x00000004: {
+                    "commandId": 0x00000004,
+                    "commandName": "CSRRequest",
+                    "args": {
+                        "CSRNonce": "bytes",
+                        "isForUpdateNOC": "bool",
+                    },
+                },
+            0x00000006: {
+                    "commandId": 0x00000006,
+                    "commandName": "AddNOC",
+                    "args": {
+                        "NOCValue": "bytes",
+                        "ICACValue": "bytes",
+                        "IPKValue": "bytes",
+                        "caseAdminSubject": "int",
+                        "adminVendorId": "int",
+                    },
+                },
+            0x00000007: {
+                    "commandId": 0x00000007,
+                    "commandName": "UpdateNOC",
+                    "args": {
+                        "NOCValue": "bytes",
+                        "ICACValue": "bytes",
+                    },
+                },
+            0x00000009: {
+                    "commandId": 0x00000009,
+                    "commandName": "UpdateFabricLabel",
+                    "args": {
+                        "label": "str",
+                    },
+                },
+            0x0000000A: {
+                    "commandId": 0x0000000A,
+                    "commandName": "RemoveFabric",
+                    "args": {
+                        "fabricIndex": "int",
+                    },
+                },
+            0x0000000B: {
+                    "commandId": 0x0000000B,
+                    "commandName": "AddTrustedRootCertificate",
+                    "args": {
+                        "rootCertificate": "bytes",
+                    },
+                },
             },
             "attributes": {
                 0x00000000: {
-                    "attributeName": "ActiveLocale",
+                    "attributeName": "NOCs",
                     "attributeId": 0x00000000,
-                    "type": "str",
+                    "type": "",
                     "reportable": True,
-                    "writable": True,
                 },
                 0x00000001: {
-                    "attributeName": "SupportedLocales",
+                    "attributeName": "Fabrics",
                     "attributeId": 0x00000001,
-                    "type": "str",
+                    "type": "",
                     "reportable": True,
                 },
-                0x0000FFF8: {
-                    "attributeName": "GeneratedCommandList",
-                    "attributeId": 0x0000FFF8,
+                0x00000002: {
+                    "attributeName": "SupportedFabrics",
+                    "attributeId": 0x00000002,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFF9: {
-                    "attributeName": "AcceptedCommandList",
-                    "attributeId": 0x0000FFF9,
+                0x00000003: {
+                    "attributeName": "CommissionedFabrics",
+                    "attributeId": 0x00000003,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
-                    "type": "int",
+                0x00000004: {
+                    "attributeName": "TrustedRootCertificates",
+                    "attributeId": 0x00000004,
+                    "type": "bytes",
                     "reportable": True,
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
+                0x00000005: {
+                    "attributeName": "CurrentFabricIndex",
+                    "attributeId": 0x00000005,
                     "type": "int",
                     "reportable": True,
                 },
-            },
-    }
-    _LOW_POWER_CLUSTER_INFO = {
-            "clusterName": "LowPower",
-            "clusterId": 0x00000508,
-            "commands": {
-            0x00000000: {
-                    "commandId": 0x00000000,
-                    "commandName": "Sleep",
-                    "args": {
-                    },
-                },
-            },
-            "attributes": {
                 0x0000FFF8: {
                     "attributeName": "GeneratedCommandList",
                     "attributeId": 0x0000FFF8,
@@ -3578,48 +3221,69 @@ class ChipClusters:
                 },
             },
     }
-    _MEDIA_INPUT_CLUSTER_INFO = {
-            "clusterName": "MediaInput",
-            "clusterId": 0x00000507,
+    _GROUP_KEY_MANAGEMENT_CLUSTER_INFO = {
+            "clusterName": "GroupKeyManagement",
+            "clusterId": 0x0000003F,
             "commands": {
-            0x00000002: {
-                    "commandId": 0x00000002,
-                    "commandName": "HideInputStatus",
+            0x00000000: {
+                    "commandId": 0x00000000,
+                    "commandName": "KeySetWrite",
                     "args": {
+                        "groupKeySetID": "int",
+                        "groupKeySecurityPolicy": "int",
+                        "epochKey0": "bytes",
+                        "epochStartTime0": "int",
+                        "epochKey1": "bytes",
+                        "epochStartTime1": "int",
+                        "epochKey2": "bytes",
+                        "epochStartTime2": "int",
                     },
                 },
-            0x00000003: {
-                    "commandId": 0x00000003,
-                    "commandName": "RenameInput",
+            0x00000001: {
+                    "commandId": 0x00000001,
+                    "commandName": "KeySetRead",
                     "args": {
-                        "index": "int",
-                        "name": "str",
+                        "groupKeySetID": "int",
                     },
                 },
-            0x00000000: {
-                    "commandId": 0x00000000,
-                    "commandName": "SelectInput",
+            0x00000003: {
+                    "commandId": 0x00000003,
+                    "commandName": "KeySetRemove",
                     "args": {
-                        "index": "int",
+                        "groupKeySetID": "int",
                     },
                 },
-            0x00000001: {
-                    "commandId": 0x00000001,
-                    "commandName": "ShowInputStatus",
+            0x00000004: {
+                    "commandId": 0x00000004,
+                    "commandName": "KeySetReadAllIndices",
                     "args": {
+                        "groupKeySetIDs": "int",
                     },
                 },
             },
             "attributes": {
                 0x00000000: {
-                    "attributeName": "InputList",
+                    "attributeName": "GroupKeyMap",
                     "attributeId": 0x00000000,
                     "type": "",
                     "reportable": True,
+                    "writable": True,
                 },
                 0x00000001: {
-                    "attributeName": "CurrentInput",
+                    "attributeName": "GroupTable",
                     "attributeId": 0x00000001,
+                    "type": "",
+                    "reportable": True,
+                },
+                0x00000002: {
+                    "attributeName": "MaxGroupsPerFabric",
+                    "attributeId": 0x00000002,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000003: {
+                    "attributeName": "MaxGroupKeysPerFabric",
+                    "attributeId": 0x00000003,
                     "type": "int",
                     "reportable": True,
                 },
@@ -3655,123 +3319,101 @@ class ChipClusters:
                 },
             },
     }
-    _MEDIA_PLAYBACK_CLUSTER_INFO = {
-            "clusterName": "MediaPlayback",
-            "clusterId": 0x00000506,
-            "commands": {
-            0x00000007: {
-                    "commandId": 0x00000007,
-                    "commandName": "FastForward",
-                    "args": {
-                    },
-                },
-            0x00000005: {
-                    "commandId": 0x00000005,
-                    "commandName": "Next",
-                    "args": {
-                    },
-                },
-            0x00000001: {
-                    "commandId": 0x00000001,
-                    "commandName": "Pause",
-                    "args": {
-                    },
-                },
-            0x00000000: {
-                    "commandId": 0x00000000,
-                    "commandName": "Play",
-                    "args": {
-                    },
-                },
-            0x00000004: {
-                    "commandId": 0x00000004,
-                    "commandName": "Previous",
-                    "args": {
-                    },
-                },
-            0x00000006: {
-                    "commandId": 0x00000006,
-                    "commandName": "Rewind",
-                    "args": {
-                    },
-                },
-            0x0000000B: {
-                    "commandId": 0x0000000B,
-                    "commandName": "Seek",
-                    "args": {
-                        "position": "int",
-                    },
-                },
-            0x00000009: {
-                    "commandId": 0x00000009,
-                    "commandName": "SkipBackward",
-                    "args": {
-                        "deltaPositionMilliseconds": "int",
-                    },
-                },
-            0x00000008: {
-                    "commandId": 0x00000008,
-                    "commandName": "SkipForward",
-                    "args": {
-                        "deltaPositionMilliseconds": "int",
-                    },
-                },
-            0x00000003: {
-                    "commandId": 0x00000003,
-                    "commandName": "StartOver",
-                    "args": {
-                    },
-                },
-            0x00000002: {
-                    "commandId": 0x00000002,
-                    "commandName": "StopPlayback",
-                    "args": {
-                    },
-                },
+    _FIXED_LABEL_CLUSTER_INFO = {
+            "clusterName": "FixedLabel",
+            "clusterId": 0x00000040,
+            "commands": {
             },
             "attributes": {
                 0x00000000: {
-                    "attributeName": "CurrentState",
+                    "attributeName": "LabelList",
                     "attributeId": 0x00000000,
+                    "type": "",
+                    "reportable": True,
+                },
+                0x0000FFF8: {
+                    "attributeName": "GeneratedCommandList",
+                    "attributeId": 0x0000FFF8,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000001: {
-                    "attributeName": "StartTime",
-                    "attributeId": 0x00000001,
+                0x0000FFF9: {
+                    "attributeName": "AcceptedCommandList",
+                    "attributeId": 0x0000FFF9,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000002: {
-                    "attributeName": "Duration",
-                    "attributeId": 0x00000002,
+                0x0000FFFB: {
+                    "attributeName": "AttributeList",
+                    "attributeId": 0x0000FFFB,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000003: {
-                    "attributeName": "SampledPosition",
-                    "attributeId": 0x00000003,
-                    "type": "",
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
+                    "type": "int",
                     "reportable": True,
                 },
-                0x00000004: {
-                    "attributeName": "PlaybackSpeed",
-                    "attributeId": 0x00000004,
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
+                    "type": "int",
+                    "reportable": True,
+                },
+            },
+    }
+    _USER_LABEL_CLUSTER_INFO = {
+            "clusterName": "UserLabel",
+            "clusterId": 0x00000041,
+            "commands": {
+            },
+            "attributes": {
+                0x00000000: {
+                    "attributeName": "LabelList",
+                    "attributeId": 0x00000000,
                     "type": "",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000005: {
-                    "attributeName": "SeekRangeEnd",
-                    "attributeId": 0x00000005,
+                0x0000FFF8: {
+                    "attributeName": "GeneratedCommandList",
+                    "attributeId": 0x0000FFF8,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000006: {
-                    "attributeName": "SeekRangeStart",
-                    "attributeId": 0x00000006,
+                0x0000FFF9: {
+                    "attributeName": "AcceptedCommandList",
+                    "attributeId": 0x0000FFF9,
                     "type": "int",
                     "reportable": True,
                 },
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
+                    "type": "int",
+                    "reportable": True,
+                },
+            },
+    }
+    _BOOLEAN_STATE_CLUSTER_INFO = {
+            "clusterName": "BooleanState",
+            "clusterId": 0x00000045,
+            "commands": {
+            },
+            "attributes": {
+                0x00000000: {
+                    "attributeName": "StateValue",
+                    "attributeId": 0x00000000,
+                    "type": "bool",
+                    "reportable": True,
+                },
                 0x0000FFF8: {
                     "attributeName": "GeneratedCommandList",
                     "attributeId": 0x0000FFF8,
@@ -3887,278 +3529,326 @@ class ChipClusters:
                 },
             },
     }
-    _NETWORK_COMMISSIONING_CLUSTER_INFO = {
-            "clusterName": "NetworkCommissioning",
-            "clusterId": 0x00000031,
+    _DOOR_LOCK_CLUSTER_INFO = {
+            "clusterName": "DoorLock",
+            "clusterId": 0x00000101,
             "commands": {
+            0x00000000: {
+                    "commandId": 0x00000000,
+                    "commandName": "LockDoor",
+                    "args": {
+                        "pinCode": "bytes",
+                    },
+                },
+            0x00000001: {
+                    "commandId": 0x00000001,
+                    "commandName": "UnlockDoor",
+                    "args": {
+                        "pinCode": "bytes",
+                    },
+                },
             0x00000003: {
                     "commandId": 0x00000003,
-                    "commandName": "AddOrUpdateThreadNetwork",
+                    "commandName": "UnlockWithTimeout",
                     "args": {
-                        "operationalDataset": "bytes",
-                        "breadcrumb": "int",
+                        "timeout": "int",
+                        "pinCode": "bytes",
                     },
                 },
-            0x00000002: {
-                    "commandId": 0x00000002,
-                    "commandName": "AddOrUpdateWiFiNetwork",
+            0x0000000B: {
+                    "commandId": 0x0000000B,
+                    "commandName": "SetWeekDaySchedule",
                     "args": {
-                        "ssid": "bytes",
-                        "credentials": "bytes",
-                        "breadcrumb": "int",
+                        "weekDayIndex": "int",
+                        "userIndex": "int",
+                        "daysMask": "int",
+                        "startHour": "int",
+                        "startMinute": "int",
+                        "endHour": "int",
+                        "endMinute": "int",
                     },
                 },
-            0x00000006: {
-                    "commandId": 0x00000006,
-                    "commandName": "ConnectNetwork",
+            0x0000000C: {
+                    "commandId": 0x0000000C,
+                    "commandName": "GetWeekDaySchedule",
                     "args": {
-                        "networkID": "bytes",
-                        "breadcrumb": "int",
+                        "weekDayIndex": "int",
+                        "userIndex": "int",
                     },
                 },
-            0x00000004: {
-                    "commandId": 0x00000004,
-                    "commandName": "RemoveNetwork",
+            0x0000000D: {
+                    "commandId": 0x0000000D,
+                    "commandName": "ClearWeekDaySchedule",
                     "args": {
-                        "networkID": "bytes",
-                        "breadcrumb": "int",
+                        "weekDayIndex": "int",
+                        "userIndex": "int",
                     },
                 },
-            0x00000008: {
-                    "commandId": 0x00000008,
-                    "commandName": "ReorderNetwork",
+            0x0000000E: {
+                    "commandId": 0x0000000E,
+                    "commandName": "SetYearDaySchedule",
                     "args": {
-                        "networkID": "bytes",
-                        "networkIndex": "int",
-                        "breadcrumb": "int",
+                        "yearDayIndex": "int",
+                        "userIndex": "int",
+                        "localStartTime": "int",
+                        "localEndTime": "int",
                     },
                 },
-            0x00000000: {
-                    "commandId": 0x00000000,
-                    "commandName": "ScanNetworks",
+            0x0000000F: {
+                    "commandId": 0x0000000F,
+                    "commandName": "GetYearDaySchedule",
+                    "args": {
+                        "yearDayIndex": "int",
+                        "userIndex": "int",
+                    },
+                },
+            0x00000010: {
+                    "commandId": 0x00000010,
+                    "commandName": "ClearYearDaySchedule",
+                    "args": {
+                        "yearDayIndex": "int",
+                        "userIndex": "int",
+                    },
+                },
+            0x00000011: {
+                    "commandId": 0x00000011,
+                    "commandName": "SetHolidaySchedule",
+                    "args": {
+                        "holidayIndex": "int",
+                        "localStartTime": "int",
+                        "localEndTime": "int",
+                        "operatingMode": "int",
+                    },
+                },
+            0x00000012: {
+                    "commandId": 0x00000012,
+                    "commandName": "GetHolidaySchedule",
+                    "args": {
+                        "holidayIndex": "int",
+                    },
+                },
+            0x00000013: {
+                    "commandId": 0x00000013,
+                    "commandName": "ClearHolidaySchedule",
+                    "args": {
+                        "holidayIndex": "int",
+                    },
+                },
+            0x0000001A: {
+                    "commandId": 0x0000001A,
+                    "commandName": "SetUser",
+                    "args": {
+                        "operationType": "int",
+                        "userIndex": "int",
+                        "userName": "str",
+                        "userUniqueId": "int",
+                        "userStatus": "int",
+                        "userType": "int",
+                        "credentialRule": "int",
+                    },
+                },
+            0x0000001B: {
+                    "commandId": 0x0000001B,
+                    "commandName": "GetUser",
+                    "args": {
+                        "userIndex": "int",
+                    },
+                },
+            0x0000001D: {
+                    "commandId": 0x0000001D,
+                    "commandName": "ClearUser",
+                    "args": {
+                        "userIndex": "int",
+                    },
+                },
+            0x00000022: {
+                    "commandId": 0x00000022,
+                    "commandName": "SetCredential",
+                    "args": {
+                        "operationType": "int",
+                        "credentialType": "int",
+                        "credentialIndex": "int",
+                        "credentialData": "bytes",
+                        "userIndex": "int",
+                        "userStatus": "int",
+                        "userType": "int",
+                    },
+                },
+            0x00000024: {
+                    "commandId": 0x00000024,
+                    "commandName": "GetCredentialStatus",
+                    "args": {
+                        "credentialType": "int",
+                        "credentialIndex": "int",
+                    },
+                },
+            0x00000026: {
+                    "commandId": 0x00000026,
+                    "commandName": "ClearCredential",
                     "args": {
-                        "ssid": "bytes",
-                        "breadcrumb": "int",
+                        "credentialType": "int",
+                        "credentialIndex": "int",
                     },
                 },
             },
             "attributes": {
                 0x00000000: {
-                    "attributeName": "MaxNetworks",
+                    "attributeName": "LockState",
                     "attributeId": 0x00000000,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000001: {
-                    "attributeName": "Networks",
+                    "attributeName": "LockType",
                     "attributeId": 0x00000001,
-                    "type": "",
+                    "type": "int",
                     "reportable": True,
                 },
                 0x00000002: {
-                    "attributeName": "ScanMaxTimeSeconds",
+                    "attributeName": "ActuatorEnabled",
                     "attributeId": 0x00000002,
-                    "type": "int",
+                    "type": "bool",
                     "reportable": True,
                 },
                 0x00000003: {
-                    "attributeName": "ConnectMaxTimeSeconds",
+                    "attributeName": "DoorState",
                     "attributeId": 0x00000003,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000004: {
-                    "attributeName": "InterfaceEnabled",
-                    "attributeId": 0x00000004,
-                    "type": "bool",
+                0x00000011: {
+                    "attributeName": "NumberOfTotalUsersSupported",
+                    "attributeId": 0x00000011,
+                    "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000005: {
-                    "attributeName": "LastNetworkingStatus",
-                    "attributeId": 0x00000005,
+                0x00000012: {
+                    "attributeName": "NumberOfPINUsersSupported",
+                    "attributeId": 0x00000012,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000006: {
-                    "attributeName": "LastNetworkID",
-                    "attributeId": 0x00000006,
-                    "type": "bytes",
+                0x00000013: {
+                    "attributeName": "NumberOfRFIDUsersSupported",
+                    "attributeId": 0x00000013,
+                    "type": "int",
                     "reportable": True,
                 },
-                0x00000007: {
-                    "attributeName": "LastConnectErrorValue",
-                    "attributeId": 0x00000007,
+                0x00000014: {
+                    "attributeName": "NumberOfWeekDaySchedulesSupportedPerUser",
+                    "attributeId": 0x00000014,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFF8: {
-                    "attributeName": "GeneratedCommandList",
-                    "attributeId": 0x0000FFF8,
+                0x00000015: {
+                    "attributeName": "NumberOfYearDaySchedulesSupportedPerUser",
+                    "attributeId": 0x00000015,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFF9: {
-                    "attributeName": "AcceptedCommandList",
-                    "attributeId": 0x0000FFF9,
+                0x00000016: {
+                    "attributeName": "NumberOfHolidaySchedulesSupported",
+                    "attributeId": 0x00000016,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
+                0x00000017: {
+                    "attributeName": "MaxPINCodeLength",
+                    "attributeId": 0x00000017,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
+                0x00000018: {
+                    "attributeName": "MinPINCodeLength",
+                    "attributeId": 0x00000018,
                     "type": "int",
                     "reportable": True,
                 },
-            },
-    }
-    _OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_INFO = {
-            "clusterName": "OtaSoftwareUpdateProvider",
-            "clusterId": 0x00000029,
-            "commands": {
-            0x00000002: {
-                    "commandId": 0x00000002,
-                    "commandName": "ApplyUpdateRequest",
-                    "args": {
-                        "updateToken": "bytes",
-                        "newVersion": "int",
-                    },
-                },
-            0x00000004: {
-                    "commandId": 0x00000004,
-                    "commandName": "NotifyUpdateApplied",
-                    "args": {
-                        "updateToken": "bytes",
-                        "softwareVersion": "int",
-                    },
-                },
-            0x00000000: {
-                    "commandId": 0x00000000,
-                    "commandName": "QueryImage",
-                    "args": {
-                        "vendorId": "int",
-                        "productId": "int",
-                        "softwareVersion": "int",
-                        "protocolsSupported": "int",
-                        "hardwareVersion": "int",
-                        "location": "str",
-                        "requestorCanConsent": "bool",
-                        "metadataForProvider": "bytes",
-                    },
-                },
-            },
-            "attributes": {
-                0x0000FFFB: {
-                    "attributeName": "AttributeList",
-                    "attributeId": 0x0000FFFB,
+                0x00000019: {
+                    "attributeName": "MaxRFIDCodeLength",
+                    "attributeId": 0x00000019,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
+                0x0000001A: {
+                    "attributeName": "MinRFIDCodeLength",
+                    "attributeId": 0x0000001A,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
+                0x0000001C: {
+                    "attributeName": "NumberOfCredentialsSupportedPerUser",
+                    "attributeId": 0x0000001C,
                     "type": "int",
                     "reportable": True,
                 },
-            },
-    }
-    _OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_INFO = {
-            "clusterName": "OtaSoftwareUpdateRequestor",
-            "clusterId": 0x0000002A,
-            "commands": {
-            0x00000000: {
-                    "commandId": 0x00000000,
-                    "commandName": "AnnounceOtaProvider",
-                    "args": {
-                        "providerNodeId": "int",
-                        "vendorId": "int",
-                        "announcementReason": "int",
-                        "metadataForNode": "bytes",
-                        "endpoint": "int",
-                    },
-                },
-            },
-            "attributes": {
-                0x00000000: {
-                    "attributeName": "DefaultOtaProviders",
-                    "attributeId": 0x00000000,
-                    "type": "",
+                0x00000021: {
+                    "attributeName": "Language",
+                    "attributeId": 0x00000021,
+                    "type": "str",
                     "reportable": True,
                     "writable": True,
                 },
-                0x00000001: {
-                    "attributeName": "UpdatePossible",
-                    "attributeId": 0x00000001,
-                    "type": "bool",
-                    "reportable": True,
-                },
-                0x00000002: {
-                    "attributeName": "UpdateState",
-                    "attributeId": 0x00000002,
+                0x00000023: {
+                    "attributeName": "AutoRelockTime",
+                    "attributeId": 0x00000023,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000003: {
-                    "attributeName": "UpdateStateProgress",
-                    "attributeId": 0x00000003,
+                0x00000024: {
+                    "attributeName": "SoundVolume",
+                    "attributeId": 0x00000024,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFFB: {
-                    "attributeName": "AttributeList",
-                    "attributeId": 0x0000FFFB,
+                0x00000025: {
+                    "attributeName": "OperatingMode",
+                    "attributeId": 0x00000025,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
+                0x00000026: {
+                    "attributeName": "SupportedOperatingModes",
+                    "attributeId": 0x00000026,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
-                    "type": "int",
+                0x00000029: {
+                    "attributeName": "EnableOneTouchLocking",
+                    "attributeId": 0x00000029,
+                    "type": "bool",
                     "reportable": True,
+                    "writable": True,
                 },
-            },
-    }
-    _OCCUPANCY_SENSING_CLUSTER_INFO = {
-            "clusterName": "OccupancySensing",
-            "clusterId": 0x00000406,
-            "commands": {
-            },
-            "attributes": {
-                0x00000000: {
-                    "attributeName": "Occupancy",
-                    "attributeId": 0x00000000,
-                    "type": "int",
+                0x0000002B: {
+                    "attributeName": "EnablePrivacyModeButton",
+                    "attributeId": 0x0000002B,
+                    "type": "bool",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000001: {
-                    "attributeName": "OccupancySensorType",
-                    "attributeId": 0x00000001,
+                0x00000030: {
+                    "attributeName": "WrongCodeEntryLimit",
+                    "attributeId": 0x00000030,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000002: {
-                    "attributeName": "OccupancySensorTypeBitmap",
-                    "attributeId": 0x00000002,
+                0x00000031: {
+                    "attributeName": "UserCodeTemporaryDisableTime",
+                    "attributeId": 0x00000031,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
+                },
+                0x00000033: {
+                    "attributeName": "RequirePINforRemoteOperation",
+                    "attributeId": 0x00000033,
+                    "type": "bool",
+                    "writable": True,
                 },
                 0x0000FFF8: {
                     "attributeName": "GeneratedCommandList",
@@ -4192,137 +3882,191 @@ class ChipClusters:
                 },
             },
     }
-    _ON_OFF_CLUSTER_INFO = {
-            "clusterName": "OnOff",
-            "clusterId": 0x00000006,
+    _WINDOW_COVERING_CLUSTER_INFO = {
+            "clusterName": "WindowCovering",
+            "clusterId": 0x00000102,
             "commands": {
             0x00000000: {
                     "commandId": 0x00000000,
-                    "commandName": "Off",
+                    "commandName": "UpOrOpen",
                     "args": {
                     },
                 },
-            0x00000040: {
-                    "commandId": 0x00000040,
-                    "commandName": "OffWithEffect",
+            0x00000001: {
+                    "commandId": 0x00000001,
+                    "commandName": "DownOrClose",
+                    "args": {
+                    },
+                },
+            0x00000002: {
+                    "commandId": 0x00000002,
+                    "commandName": "StopMotion",
                     "args": {
-                        "effectId": "int",
-                        "effectVariant": "int",
                     },
                 },
-            0x00000001: {
-                    "commandId": 0x00000001,
-                    "commandName": "On",
+            0x00000004: {
+                    "commandId": 0x00000004,
+                    "commandName": "GoToLiftValue",
                     "args": {
+                        "liftValue": "int",
                     },
                 },
-            0x00000041: {
-                    "commandId": 0x00000041,
-                    "commandName": "OnWithRecallGlobalScene",
+            0x00000005: {
+                    "commandId": 0x00000005,
+                    "commandName": "GoToLiftPercentage",
                     "args": {
+                        "liftPercent100thsValue": "int",
                     },
                 },
-            0x00000042: {
-                    "commandId": 0x00000042,
-                    "commandName": "OnWithTimedOff",
+            0x00000007: {
+                    "commandId": 0x00000007,
+                    "commandName": "GoToTiltValue",
                     "args": {
-                        "onOffControl": "int",
-                        "onTime": "int",
-                        "offWaitTime": "int",
+                        "tiltValue": "int",
                     },
                 },
-            0x00000002: {
-                    "commandId": 0x00000002,
-                    "commandName": "Toggle",
+            0x00000008: {
+                    "commandId": 0x00000008,
+                    "commandName": "GoToTiltPercentage",
                     "args": {
+                        "tiltPercent100thsValue": "int",
                     },
                 },
             },
             "attributes": {
                 0x00000000: {
-                    "attributeName": "OnOff",
+                    "attributeName": "Type",
                     "attributeId": 0x00000000,
-                    "type": "bool",
+                    "type": "int",
                     "reportable": True,
                 },
-                0x00004000: {
-                    "attributeName": "GlobalSceneControl",
-                    "attributeId": 0x00004000,
-                    "type": "bool",
+                0x00000001: {
+                    "attributeName": "PhysicalClosedLimitLift",
+                    "attributeId": 0x00000001,
+                    "type": "int",
                     "reportable": True,
                 },
-                0x00004001: {
-                    "attributeName": "OnTime",
-                    "attributeId": 0x00004001,
+                0x00000002: {
+                    "attributeName": "PhysicalClosedLimitTilt",
+                    "attributeId": 0x00000002,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004002: {
-                    "attributeName": "OffWaitTime",
-                    "attributeId": 0x00004002,
+                0x00000003: {
+                    "attributeName": "CurrentPositionLift",
+                    "attributeId": 0x00000003,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004003: {
-                    "attributeName": "StartUpOnOff",
-                    "attributeId": 0x00004003,
+                0x00000004: {
+                    "attributeName": "CurrentPositionTilt",
+                    "attributeId": 0x00000004,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000FFF8: {
-                    "attributeName": "GeneratedCommandList",
-                    "attributeId": 0x0000FFF8,
+                0x00000005: {
+                    "attributeName": "NumberOfActuationsLift",
+                    "attributeId": 0x00000005,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFF9: {
-                    "attributeName": "AcceptedCommandList",
-                    "attributeId": 0x0000FFF9,
+                0x00000006: {
+                    "attributeName": "NumberOfActuationsTilt",
+                    "attributeId": 0x00000006,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFB: {
-                    "attributeName": "AttributeList",
-                    "attributeId": 0x0000FFFB,
+                0x00000007: {
+                    "attributeName": "ConfigStatus",
+                    "attributeId": 0x00000007,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
+                0x00000008: {
+                    "attributeName": "CurrentPositionLiftPercentage",
+                    "attributeId": 0x00000008,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
+                0x00000009: {
+                    "attributeName": "CurrentPositionTiltPercentage",
+                    "attributeId": 0x00000009,
                     "type": "int",
                     "reportable": True,
                 },
-            },
-    }
-    _ON_OFF_SWITCH_CONFIGURATION_CLUSTER_INFO = {
-            "clusterName": "OnOffSwitchConfiguration",
-            "clusterId": 0x00000007,
-            "commands": {
-            },
-            "attributes": {
-                0x00000000: {
-                    "attributeName": "SwitchType",
-                    "attributeId": 0x00000000,
+                0x0000000A: {
+                    "attributeName": "OperationalStatus",
+                    "attributeId": 0x0000000A,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000000B: {
+                    "attributeName": "TargetPositionLiftPercent100ths",
+                    "attributeId": 0x0000000B,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000000C: {
+                    "attributeName": "TargetPositionTiltPercent100ths",
+                    "attributeId": 0x0000000C,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000000D: {
+                    "attributeName": "EndProductType",
+                    "attributeId": 0x0000000D,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000000E: {
+                    "attributeName": "CurrentPositionLiftPercent100ths",
+                    "attributeId": 0x0000000E,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000000F: {
+                    "attributeName": "CurrentPositionTiltPercent100ths",
+                    "attributeId": 0x0000000F,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000010: {
-                    "attributeName": "SwitchActions",
+                    "attributeName": "InstalledOpenLimitLift",
                     "attributeId": 0x00000010,
                     "type": "int",
                     "reportable": True,
+                },
+                0x00000011: {
+                    "attributeName": "InstalledClosedLimitLift",
+                    "attributeId": 0x00000011,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000012: {
+                    "attributeName": "InstalledOpenLimitTilt",
+                    "attributeId": 0x00000012,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000013: {
+                    "attributeName": "InstalledClosedLimitTilt",
+                    "attributeId": 0x00000013,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000017: {
+                    "attributeName": "Mode",
+                    "attributeId": 0x00000017,
+                    "type": "int",
+                    "reportable": True,
                     "writable": True,
                 },
+                0x0000001A: {
+                    "attributeName": "SafetyStatus",
+                    "attributeId": 0x0000001A,
+                    "type": "int",
+                    "reportable": True,
+                },
                 0x0000FFF8: {
                     "attributeName": "GeneratedCommandList",
                     "attributeId": 0x0000FFF8,
@@ -4355,107 +4099,46 @@ class ChipClusters:
                 },
             },
     }
-    _OPERATIONAL_CREDENTIALS_CLUSTER_INFO = {
-            "clusterName": "OperationalCredentials",
-            "clusterId": 0x0000003E,
+    _BARRIER_CONTROL_CLUSTER_INFO = {
+            "clusterName": "BarrierControl",
+            "clusterId": 0x00000103,
             "commands": {
-            0x00000006: {
-                    "commandId": 0x00000006,
-                    "commandName": "AddNOC",
-                    "args": {
-                        "NOCValue": "bytes",
-                        "ICACValue": "bytes",
-                        "IPKValue": "bytes",
-                        "caseAdminSubject": "int",
-                        "adminVendorId": "int",
-                    },
-                },
-            0x0000000B: {
-                    "commandId": 0x0000000B,
-                    "commandName": "AddTrustedRootCertificate",
-                    "args": {
-                        "rootCertificate": "bytes",
-                    },
-                },
             0x00000000: {
                     "commandId": 0x00000000,
-                    "commandName": "AttestationRequest",
-                    "args": {
-                        "attestationNonce": "bytes",
-                    },
-                },
-            0x00000004: {
-                    "commandId": 0x00000004,
-                    "commandName": "CSRRequest",
-                    "args": {
-                        "CSRNonce": "bytes",
-                        "isForUpdateNOC": "bool",
-                    },
-                },
-            0x00000002: {
-                    "commandId": 0x00000002,
-                    "commandName": "CertificateChainRequest",
-                    "args": {
-                        "certificateType": "int",
-                    },
-                },
-            0x0000000A: {
-                    "commandId": 0x0000000A,
-                    "commandName": "RemoveFabric",
-                    "args": {
-                        "fabricIndex": "int",
-                    },
-                },
-            0x00000009: {
-                    "commandId": 0x00000009,
-                    "commandName": "UpdateFabricLabel",
+                    "commandName": "BarrierControlGoToPercent",
                     "args": {
-                        "label": "str",
+                        "percentOpen": "int",
                     },
                 },
-            0x00000007: {
-                    "commandId": 0x00000007,
-                    "commandName": "UpdateNOC",
+            0x00000001: {
+                    "commandId": 0x00000001,
+                    "commandName": "BarrierControlStop",
                     "args": {
-                        "NOCValue": "bytes",
-                        "ICACValue": "bytes",
                     },
                 },
             },
             "attributes": {
-                0x00000000: {
-                    "attributeName": "NOCs",
-                    "attributeId": 0x00000000,
-                    "type": "",
-                    "reportable": True,
-                },
                 0x00000001: {
-                    "attributeName": "Fabrics",
+                    "attributeName": "BarrierMovingState",
                     "attributeId": 0x00000001,
-                    "type": "",
+                    "type": "int",
                     "reportable": True,
                 },
                 0x00000002: {
-                    "attributeName": "SupportedFabrics",
+                    "attributeName": "BarrierSafetyStatus",
                     "attributeId": 0x00000002,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000003: {
-                    "attributeName": "CommissionedFabrics",
-                    "attributeId": 0x00000003,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000004: {
-                    "attributeName": "TrustedRootCertificates",
-                    "attributeId": 0x00000004,
-                    "type": "bytes",
+                    "attributeName": "BarrierCapabilities",
+                    "attributeId": 0x00000003,
+                    "type": "int",
                     "reportable": True,
                 },
-                0x00000005: {
-                    "attributeName": "CurrentFabricIndex",
-                    "attributeId": 0x00000005,
+                0x0000000A: {
+                    "attributeName": "BarrierPosition",
+                    "attributeId": 0x0000000A,
                     "type": "int",
                     "reportable": True,
                 },
@@ -4491,197 +4174,153 @@ class ChipClusters:
                 },
             },
     }
-    _POWER_SOURCE_CLUSTER_INFO = {
-            "clusterName": "PowerSource",
-            "clusterId": 0x0000002F,
+    _PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_INFO = {
+            "clusterName": "PumpConfigurationAndControl",
+            "clusterId": 0x00000200,
             "commands": {
             },
             "attributes": {
                 0x00000000: {
-                    "attributeName": "Status",
+                    "attributeName": "MaxPressure",
                     "attributeId": 0x00000000,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000001: {
-                    "attributeName": "Order",
+                    "attributeName": "MaxSpeed",
                     "attributeId": 0x00000001,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000002: {
-                    "attributeName": "Description",
+                    "attributeName": "MaxFlow",
                     "attributeId": 0x00000002,
-                    "type": "str",
+                    "type": "int",
                     "reportable": True,
                 },
                 0x00000003: {
-                    "attributeName": "WiredAssessedInputVoltage",
+                    "attributeName": "MinConstPressure",
                     "attributeId": 0x00000003,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000004: {
-                    "attributeName": "WiredAssessedInputFrequency",
+                    "attributeName": "MaxConstPressure",
                     "attributeId": 0x00000004,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000005: {
-                    "attributeName": "WiredCurrentType",
+                    "attributeName": "MinCompPressure",
                     "attributeId": 0x00000005,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000006: {
-                    "attributeName": "WiredAssessedCurrent",
+                    "attributeName": "MaxCompPressure",
                     "attributeId": 0x00000006,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000007: {
-                    "attributeName": "WiredNominalVoltage",
+                    "attributeName": "MinConstSpeed",
                     "attributeId": 0x00000007,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000008: {
-                    "attributeName": "WiredMaximumCurrent",
+                    "attributeName": "MaxConstSpeed",
                     "attributeId": 0x00000008,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000009: {
-                    "attributeName": "WiredPresent",
+                    "attributeName": "MinConstFlow",
                     "attributeId": 0x00000009,
-                    "type": "bool",
+                    "type": "int",
                     "reportable": True,
                 },
                 0x0000000A: {
-                    "attributeName": "ActiveWiredFaults",
+                    "attributeName": "MaxConstFlow",
                     "attributeId": 0x0000000A,
                     "type": "int",
                     "reportable": True,
                 },
                 0x0000000B: {
-                    "attributeName": "BatteryVoltage",
+                    "attributeName": "MinConstTemp",
                     "attributeId": 0x0000000B,
                     "type": "int",
                     "reportable": True,
                 },
                 0x0000000C: {
-                    "attributeName": "BatteryPercentRemaining",
+                    "attributeName": "MaxConstTemp",
                     "attributeId": 0x0000000C,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000000D: {
-                    "attributeName": "BatteryTimeRemaining",
-                    "attributeId": 0x0000000D,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x0000000E: {
-                    "attributeName": "BatteryChargeLevel",
-                    "attributeId": 0x0000000E,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x0000000F: {
-                    "attributeName": "BatteryReplacementNeeded",
-                    "attributeId": 0x0000000F,
-                    "type": "bool",
-                    "reportable": True,
-                },
                 0x00000010: {
-                    "attributeName": "BatteryReplaceability",
+                    "attributeName": "PumpStatus",
                     "attributeId": 0x00000010,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000011: {
-                    "attributeName": "BatteryPresent",
+                    "attributeName": "EffectiveOperationMode",
                     "attributeId": 0x00000011,
-                    "type": "bool",
+                    "type": "int",
                     "reportable": True,
                 },
                 0x00000012: {
-                    "attributeName": "ActiveBatteryFaults",
+                    "attributeName": "EffectiveControlMode",
                     "attributeId": 0x00000012,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000013: {
-                    "attributeName": "BatteryReplacementDescription",
+                    "attributeName": "Capacity",
                     "attributeId": 0x00000013,
-                    "type": "str",
+                    "type": "int",
                     "reportable": True,
                 },
                 0x00000014: {
-                    "attributeName": "BatteryCommonDesignation",
+                    "attributeName": "Speed",
                     "attributeId": 0x00000014,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000015: {
-                    "attributeName": "BatteryANSIDesignation",
+                    "attributeName": "LifetimeRunningHours",
                     "attributeId": 0x00000015,
-                    "type": "str",
+                    "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
                 0x00000016: {
-                    "attributeName": "BatteryIECDesignation",
+                    "attributeName": "Power",
                     "attributeId": 0x00000016,
-                    "type": "str",
+                    "type": "int",
                     "reportable": True,
                 },
                 0x00000017: {
-                    "attributeName": "BatteryApprovedChemistry",
+                    "attributeName": "LifetimeEnergyConsumed",
                     "attributeId": 0x00000017,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000018: {
-                    "attributeName": "BatteryCapacity",
-                    "attributeId": 0x00000018,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x00000019: {
-                    "attributeName": "BatteryQuantity",
-                    "attributeId": 0x00000019,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x0000001A: {
-                    "attributeName": "BatteryChargeState",
-                    "attributeId": 0x0000001A,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x0000001B: {
-                    "attributeName": "BatteryTimeToFullCharge",
-                    "attributeId": 0x0000001B,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x0000001C: {
-                    "attributeName": "BatteryFunctionalWhileCharging",
-                    "attributeId": 0x0000001C,
-                    "type": "bool",
-                    "reportable": True,
-                },
-                0x0000001D: {
-                    "attributeName": "BatteryChargingCurrent",
-                    "attributeId": 0x0000001D,
+                0x00000020: {
+                    "attributeName": "OperationMode",
+                    "attributeId": 0x00000020,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000001E: {
-                    "attributeName": "ActiveBatteryChargeFaults",
-                    "attributeId": 0x0000001E,
+                0x00000021: {
+                    "attributeName": "ControlMode",
+                    "attributeId": 0x00000021,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
                 0x0000FFF8: {
                     "attributeName": "GeneratedCommandList",
@@ -4715,107 +4354,154 @@ class ChipClusters:
                 },
             },
     }
-    _POWER_SOURCE_CONFIGURATION_CLUSTER_INFO = {
-            "clusterName": "PowerSourceConfiguration",
-            "clusterId": 0x0000002E,
+    _THERMOSTAT_CLUSTER_INFO = {
+            "clusterName": "Thermostat",
+            "clusterId": 0x00000201,
             "commands": {
+            0x00000000: {
+                    "commandId": 0x00000000,
+                    "commandName": "SetpointRaiseLower",
+                    "args": {
+                        "mode": "int",
+                        "amount": "int",
+                    },
+                },
+            0x00000001: {
+                    "commandId": 0x00000001,
+                    "commandName": "SetWeeklySchedule",
+                    "args": {
+                        "numberOfTransitionsForSequence": "int",
+                        "dayOfWeekForSequence": "int",
+                        "modeForSequence": "int",
+                        "transitionTime": "int",
+                        "heatSetpoint": "int",
+                        "coolSetpoint": "int",
+                    },
+                },
+            0x00000002: {
+                    "commandId": 0x00000002,
+                    "commandName": "GetWeeklySchedule",
+                    "args": {
+                        "daysToReturn": "int",
+                        "modeToReturn": "int",
+                    },
+                },
+            0x00000003: {
+                    "commandId": 0x00000003,
+                    "commandName": "ClearWeeklySchedule",
+                    "args": {
+                    },
+                },
             },
             "attributes": {
                 0x00000000: {
-                    "attributeName": "Sources",
+                    "attributeName": "LocalTemperature",
                     "attributeId": 0x00000000,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFF8: {
-                    "attributeName": "GeneratedCommandList",
-                    "attributeId": 0x0000FFF8,
+                0x00000003: {
+                    "attributeName": "AbsMinHeatSetpointLimit",
+                    "attributeId": 0x00000003,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFF9: {
-                    "attributeName": "AcceptedCommandList",
-                    "attributeId": 0x0000FFF9,
+                0x00000004: {
+                    "attributeName": "AbsMaxHeatSetpointLimit",
+                    "attributeId": 0x00000004,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFB: {
-                    "attributeName": "AttributeList",
-                    "attributeId": 0x0000FFFB,
+                0x00000005: {
+                    "attributeName": "AbsMinCoolSetpointLimit",
+                    "attributeId": 0x00000005,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
+                0x00000006: {
+                    "attributeName": "AbsMaxCoolSetpointLimit",
+                    "attributeId": 0x00000006,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
+                0x00000011: {
+                    "attributeName": "OccupiedCoolingSetpoint",
+                    "attributeId": 0x00000011,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-            },
-    }
-    _PRESSURE_MEASUREMENT_CLUSTER_INFO = {
-            "clusterName": "PressureMeasurement",
-            "clusterId": 0x00000403,
-            "commands": {
-            },
-            "attributes": {
-                0x00000000: {
-                    "attributeName": "MeasuredValue",
-                    "attributeId": 0x00000000,
+                0x00000012: {
+                    "attributeName": "OccupiedHeatingSetpoint",
+                    "attributeId": 0x00000012,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000001: {
-                    "attributeName": "MinMeasuredValue",
-                    "attributeId": 0x00000001,
+                0x00000015: {
+                    "attributeName": "MinHeatSetpointLimit",
+                    "attributeId": 0x00000015,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000002: {
-                    "attributeName": "MaxMeasuredValue",
-                    "attributeId": 0x00000002,
+                0x00000016: {
+                    "attributeName": "MaxHeatSetpointLimit",
+                    "attributeId": 0x00000016,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000003: {
-                    "attributeName": "Tolerance",
-                    "attributeId": 0x00000003,
+                0x00000017: {
+                    "attributeName": "MinCoolSetpointLimit",
+                    "attributeId": 0x00000017,
+                    "type": "int",
+                    "reportable": True,
+                    "writable": True,
+                },
+                0x00000018: {
+                    "attributeName": "MaxCoolSetpointLimit",
+                    "attributeId": 0x00000018,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
+                },
+                0x00000019: {
+                    "attributeName": "MinSetpointDeadBand",
+                    "attributeId": 0x00000019,
+                    "type": "int",
+                    "reportable": True,
+                    "writable": True,
                 },
-                0x00000010: {
-                    "attributeName": "ScaledValue",
-                    "attributeId": 0x00000010,
+                0x0000001B: {
+                    "attributeName": "ControlSequenceOfOperation",
+                    "attributeId": 0x0000001B,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000011: {
-                    "attributeName": "MinScaledValue",
-                    "attributeId": 0x00000011,
+                0x0000001C: {
+                    "attributeName": "SystemMode",
+                    "attributeId": 0x0000001C,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000012: {
-                    "attributeName": "MaxScaledValue",
-                    "attributeId": 0x00000012,
+                0x00000020: {
+                    "attributeName": "StartOfWeek",
+                    "attributeId": 0x00000020,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000013: {
-                    "attributeName": "ScaledTolerance",
-                    "attributeId": 0x00000013,
+                0x00000021: {
+                    "attributeName": "NumberOfWeeklyTransitions",
+                    "attributeId": 0x00000021,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000014: {
-                    "attributeName": "Scale",
-                    "attributeId": 0x00000014,
+                0x00000022: {
+                    "attributeName": "NumberOfDailyTransitions",
+                    "attributeId": 0x00000022,
                     "type": "int",
                     "reportable": True,
                 },
@@ -4839,1340 +4525,1539 @@ class ChipClusters:
                 },
             },
     }
-    _PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_INFO = {
-            "clusterName": "PumpConfigurationAndControl",
-            "clusterId": 0x00000200,
+    _FAN_CONTROL_CLUSTER_INFO = {
+            "clusterName": "FanControl",
+            "clusterId": 0x00000202,
             "commands": {
             },
             "attributes": {
                 0x00000000: {
-                    "attributeName": "MaxPressure",
+                    "attributeName": "FanMode",
                     "attributeId": 0x00000000,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
                 0x00000001: {
-                    "attributeName": "MaxSpeed",
+                    "attributeName": "FanModeSequence",
                     "attributeId": 0x00000001,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
                 0x00000002: {
-                    "attributeName": "MaxFlow",
+                    "attributeName": "PercentSetting",
                     "attributeId": 0x00000002,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
                 0x00000003: {
-                    "attributeName": "MinConstPressure",
+                    "attributeName": "PercentCurrent",
                     "attributeId": 0x00000003,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000004: {
-                    "attributeName": "MaxConstPressure",
+                    "attributeName": "SpeedMax",
                     "attributeId": 0x00000004,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000005: {
-                    "attributeName": "MinCompPressure",
+                    "attributeName": "SpeedSetting",
                     "attributeId": 0x00000005,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
                 0x00000006: {
-                    "attributeName": "MaxCompPressure",
+                    "attributeName": "SpeedCurrent",
                     "attributeId": 0x00000006,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000007: {
-                    "attributeName": "MinConstSpeed",
+                    "attributeName": "RockSupport",
                     "attributeId": 0x00000007,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000008: {
-                    "attributeName": "MaxConstSpeed",
+                    "attributeName": "RockSetting",
                     "attributeId": 0x00000008,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
                 0x00000009: {
-                    "attributeName": "MinConstFlow",
+                    "attributeName": "WindSupport",
                     "attributeId": 0x00000009,
                     "type": "int",
                     "reportable": True,
                 },
                 0x0000000A: {
-                    "attributeName": "MaxConstFlow",
+                    "attributeName": "WindSetting",
                     "attributeId": 0x0000000A,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000000B: {
-                    "attributeName": "MinConstTemp",
-                    "attributeId": 0x0000000B,
+                0x0000FFF8: {
+                    "attributeName": "GeneratedCommandList",
+                    "attributeId": 0x0000FFF8,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000000C: {
-                    "attributeName": "MaxConstTemp",
-                    "attributeId": 0x0000000C,
+                0x0000FFF9: {
+                    "attributeName": "AcceptedCommandList",
+                    "attributeId": 0x0000FFF9,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000010: {
-                    "attributeName": "PumpStatus",
-                    "attributeId": 0x00000010,
+                0x0000FFFB: {
+                    "attributeName": "AttributeList",
+                    "attributeId": 0x0000FFFB,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000011: {
-                    "attributeName": "EffectiveOperationMode",
-                    "attributeId": 0x00000011,
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000012: {
-                    "attributeName": "EffectiveControlMode",
-                    "attributeId": 0x00000012,
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000013: {
-                    "attributeName": "Capacity",
-                    "attributeId": 0x00000013,
+            },
+    }
+    _THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_INFO = {
+            "clusterName": "ThermostatUserInterfaceConfiguration",
+            "clusterId": 0x00000204,
+            "commands": {
+            },
+            "attributes": {
+                0x00000000: {
+                    "attributeName": "TemperatureDisplayMode",
+                    "attributeId": 0x00000000,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000014: {
-                    "attributeName": "Speed",
-                    "attributeId": 0x00000014,
+                0x00000001: {
+                    "attributeName": "KeypadLockout",
+                    "attributeId": 0x00000001,
+                    "type": "int",
+                    "reportable": True,
+                    "writable": True,
+                },
+                0x00000002: {
+                    "attributeName": "ScheduleProgrammingVisibility",
+                    "attributeId": 0x00000002,
+                    "type": "int",
+                    "reportable": True,
+                    "writable": True,
+                },
+                0x0000FFF8: {
+                    "attributeName": "GeneratedCommandList",
+                    "attributeId": 0x0000FFF8,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000FFF9: {
+                    "attributeName": "AcceptedCommandList",
+                    "attributeId": 0x0000FFF9,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000FFFB: {
+                    "attributeName": "AttributeList",
+                    "attributeId": 0x0000FFFB,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000015: {
-                    "attributeName": "LifetimeRunningHours",
-                    "attributeId": 0x00000015,
-                    "type": "int",
-                    "reportable": True,
-                    "writable": True,
+            },
+    }
+    _COLOR_CONTROL_CLUSTER_INFO = {
+            "clusterName": "ColorControl",
+            "clusterId": 0x00000300,
+            "commands": {
+            0x00000000: {
+                    "commandId": 0x00000000,
+                    "commandName": "MoveToHue",
+                    "args": {
+                        "hue": "int",
+                        "direction": "int",
+                        "transitionTime": "int",
+                        "optionsMask": "int",
+                        "optionsOverride": "int",
+                    },
+                },
+            0x00000001: {
+                    "commandId": 0x00000001,
+                    "commandName": "MoveHue",
+                    "args": {
+                        "moveMode": "int",
+                        "rate": "int",
+                        "optionsMask": "int",
+                        "optionsOverride": "int",
+                    },
+                },
+            0x00000002: {
+                    "commandId": 0x00000002,
+                    "commandName": "StepHue",
+                    "args": {
+                        "stepMode": "int",
+                        "stepSize": "int",
+                        "transitionTime": "int",
+                        "optionsMask": "int",
+                        "optionsOverride": "int",
+                    },
+                },
+            0x00000003: {
+                    "commandId": 0x00000003,
+                    "commandName": "MoveToSaturation",
+                    "args": {
+                        "saturation": "int",
+                        "transitionTime": "int",
+                        "optionsMask": "int",
+                        "optionsOverride": "int",
+                    },
+                },
+            0x00000004: {
+                    "commandId": 0x00000004,
+                    "commandName": "MoveSaturation",
+                    "args": {
+                        "moveMode": "int",
+                        "rate": "int",
+                        "optionsMask": "int",
+                        "optionsOverride": "int",
+                    },
+                },
+            0x00000005: {
+                    "commandId": 0x00000005,
+                    "commandName": "StepSaturation",
+                    "args": {
+                        "stepMode": "int",
+                        "stepSize": "int",
+                        "transitionTime": "int",
+                        "optionsMask": "int",
+                        "optionsOverride": "int",
+                    },
+                },
+            0x00000006: {
+                    "commandId": 0x00000006,
+                    "commandName": "MoveToHueAndSaturation",
+                    "args": {
+                        "hue": "int",
+                        "saturation": "int",
+                        "transitionTime": "int",
+                        "optionsMask": "int",
+                        "optionsOverride": "int",
+                    },
+                },
+            0x00000007: {
+                    "commandId": 0x00000007,
+                    "commandName": "MoveToColor",
+                    "args": {
+                        "colorX": "int",
+                        "colorY": "int",
+                        "transitionTime": "int",
+                        "optionsMask": "int",
+                        "optionsOverride": "int",
+                    },
+                },
+            0x00000008: {
+                    "commandId": 0x00000008,
+                    "commandName": "MoveColor",
+                    "args": {
+                        "rateX": "int",
+                        "rateY": "int",
+                        "optionsMask": "int",
+                        "optionsOverride": "int",
+                    },
+                },
+            0x00000009: {
+                    "commandId": 0x00000009,
+                    "commandName": "StepColor",
+                    "args": {
+                        "stepX": "int",
+                        "stepY": "int",
+                        "transitionTime": "int",
+                        "optionsMask": "int",
+                        "optionsOverride": "int",
+                    },
                 },
-                0x00000016: {
-                    "attributeName": "Power",
-                    "attributeId": 0x00000016,
-                    "type": "int",
-                    "reportable": True,
+            0x0000000A: {
+                    "commandId": 0x0000000A,
+                    "commandName": "MoveToColorTemperature",
+                    "args": {
+                        "colorTemperature": "int",
+                        "transitionTime": "int",
+                        "optionsMask": "int",
+                        "optionsOverride": "int",
+                    },
                 },
-                0x00000017: {
-                    "attributeName": "LifetimeEnergyConsumed",
-                    "attributeId": 0x00000017,
-                    "type": "int",
-                    "reportable": True,
-                    "writable": True,
+            0x00000040: {
+                    "commandId": 0x00000040,
+                    "commandName": "EnhancedMoveToHue",
+                    "args": {
+                        "enhancedHue": "int",
+                        "direction": "int",
+                        "transitionTime": "int",
+                        "optionsMask": "int",
+                        "optionsOverride": "int",
+                    },
                 },
-                0x00000020: {
-                    "attributeName": "OperationMode",
-                    "attributeId": 0x00000020,
-                    "type": "int",
-                    "reportable": True,
-                    "writable": True,
+            0x00000041: {
+                    "commandId": 0x00000041,
+                    "commandName": "EnhancedMoveHue",
+                    "args": {
+                        "moveMode": "int",
+                        "rate": "int",
+                        "optionsMask": "int",
+                        "optionsOverride": "int",
+                    },
                 },
-                0x00000021: {
-                    "attributeName": "ControlMode",
-                    "attributeId": 0x00000021,
-                    "type": "int",
-                    "reportable": True,
-                    "writable": True,
+            0x00000042: {
+                    "commandId": 0x00000042,
+                    "commandName": "EnhancedStepHue",
+                    "args": {
+                        "stepMode": "int",
+                        "stepSize": "int",
+                        "transitionTime": "int",
+                        "optionsMask": "int",
+                        "optionsOverride": "int",
+                    },
                 },
-                0x0000FFF8: {
-                    "attributeName": "GeneratedCommandList",
-                    "attributeId": 0x0000FFF8,
-                    "type": "int",
-                    "reportable": True,
+            0x00000043: {
+                    "commandId": 0x00000043,
+                    "commandName": "EnhancedMoveToHueAndSaturation",
+                    "args": {
+                        "enhancedHue": "int",
+                        "saturation": "int",
+                        "transitionTime": "int",
+                        "optionsMask": "int",
+                        "optionsOverride": "int",
+                    },
                 },
-                0x0000FFF9: {
-                    "attributeName": "AcceptedCommandList",
-                    "attributeId": 0x0000FFF9,
-                    "type": "int",
-                    "reportable": True,
+            0x00000044: {
+                    "commandId": 0x00000044,
+                    "commandName": "ColorLoopSet",
+                    "args": {
+                        "updateFlags": "int",
+                        "action": "int",
+                        "direction": "int",
+                        "time": "int",
+                        "startHue": "int",
+                        "optionsMask": "int",
+                        "optionsOverride": "int",
+                    },
                 },
-                0x0000FFFB: {
-                    "attributeName": "AttributeList",
-                    "attributeId": 0x0000FFFB,
-                    "type": "int",
-                    "reportable": True,
+            0x00000047: {
+                    "commandId": 0x00000047,
+                    "commandName": "StopMoveStep",
+                    "args": {
+                        "optionsMask": "int",
+                        "optionsOverride": "int",
+                    },
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
-                    "type": "int",
-                    "reportable": True,
+            0x0000004B: {
+                    "commandId": 0x0000004B,
+                    "commandName": "MoveColorTemperature",
+                    "args": {
+                        "moveMode": "int",
+                        "rate": "int",
+                        "colorTemperatureMinimumMireds": "int",
+                        "colorTemperatureMaximumMireds": "int",
+                        "optionsMask": "int",
+                        "optionsOverride": "int",
+                    },
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
-                    "type": "int",
-                    "reportable": True,
+            0x0000004C: {
+                    "commandId": 0x0000004C,
+                    "commandName": "StepColorTemperature",
+                    "args": {
+                        "stepMode": "int",
+                        "stepSize": "int",
+                        "transitionTime": "int",
+                        "colorTemperatureMinimumMireds": "int",
+                        "colorTemperatureMaximumMireds": "int",
+                        "optionsMask": "int",
+                        "optionsOverride": "int",
+                    },
                 },
             },
-    }
-    _RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_INFO = {
-            "clusterName": "RelativeHumidityMeasurement",
-            "clusterId": 0x00000405,
-            "commands": {
-            },
             "attributes": {
                 0x00000000: {
-                    "attributeName": "MeasuredValue",
+                    "attributeName": "CurrentHue",
                     "attributeId": 0x00000000,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000001: {
-                    "attributeName": "MinMeasuredValue",
+                    "attributeName": "CurrentSaturation",
                     "attributeId": 0x00000001,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000002: {
-                    "attributeName": "MaxMeasuredValue",
+                    "attributeName": "RemainingTime",
                     "attributeId": 0x00000002,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000003: {
-                    "attributeName": "Tolerance",
+                    "attributeName": "CurrentX",
                     "attributeId": 0x00000003,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFF8: {
-                    "attributeName": "GeneratedCommandList",
-                    "attributeId": 0x0000FFF8,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x0000FFF9: {
-                    "attributeName": "AcceptedCommandList",
-                    "attributeId": 0x0000FFF9,
-                    "type": "int",
-                    "reportable": True,
-                },
-                0x0000FFFB: {
-                    "attributeName": "AttributeList",
-                    "attributeId": 0x0000FFFB,
+                0x00000004: {
+                    "attributeName": "CurrentY",
+                    "attributeId": 0x00000004,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
+                0x00000005: {
+                    "attributeName": "DriftCompensation",
+                    "attributeId": 0x00000005,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
-                    "type": "int",
+                0x00000006: {
+                    "attributeName": "CompensationText",
+                    "attributeId": 0x00000006,
+                    "type": "str",
                     "reportable": True,
                 },
-            },
-    }
-    _SCENES_CLUSTER_INFO = {
-            "clusterName": "Scenes",
-            "clusterId": 0x00000005,
-            "commands": {
-            0x00000000: {
-                    "commandId": 0x00000000,
-                    "commandName": "AddScene",
-                    "args": {
-                        "groupId": "int",
-                        "sceneId": "int",
-                        "transitionTime": "int",
-                        "sceneName": "str",
-                        "clusterId": "int",
-                        "attributeValueList": "",
-                    },
-                },
-            0x00000006: {
-                    "commandId": 0x00000006,
-                    "commandName": "GetSceneMembership",
-                    "args": {
-                        "groupId": "int",
-                    },
-                },
-            0x00000005: {
-                    "commandId": 0x00000005,
-                    "commandName": "RecallScene",
-                    "args": {
-                        "groupId": "int",
-                        "sceneId": "int",
-                        "transitionTime": "int",
-                    },
-                },
-            0x00000003: {
-                    "commandId": 0x00000003,
-                    "commandName": "RemoveAllScenes",
-                    "args": {
-                        "groupId": "int",
-                    },
-                },
-            0x00000002: {
-                    "commandId": 0x00000002,
-                    "commandName": "RemoveScene",
-                    "args": {
-                        "groupId": "int",
-                        "sceneId": "int",
-                    },
-                },
-            0x00000004: {
-                    "commandId": 0x00000004,
-                    "commandName": "StoreScene",
-                    "args": {
-                        "groupId": "int",
-                        "sceneId": "int",
-                    },
+                0x00000007: {
+                    "attributeName": "ColorTemperature",
+                    "attributeId": 0x00000007,
+                    "type": "int",
+                    "reportable": True,
                 },
-            0x00000001: {
-                    "commandId": 0x00000001,
-                    "commandName": "ViewScene",
-                    "args": {
-                        "groupId": "int",
-                        "sceneId": "int",
-                    },
+                0x00000008: {
+                    "attributeName": "ColorMode",
+                    "attributeId": 0x00000008,
+                    "type": "int",
+                    "reportable": True,
                 },
-            },
-            "attributes": {
-                0x00000000: {
-                    "attributeName": "SceneCount",
-                    "attributeId": 0x00000000,
+                0x0000000F: {
+                    "attributeName": "Options",
+                    "attributeId": 0x0000000F,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000001: {
-                    "attributeName": "CurrentScene",
-                    "attributeId": 0x00000001,
+                0x00000010: {
+                    "attributeName": "NumberOfPrimaries",
+                    "attributeId": 0x00000010,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000002: {
-                    "attributeName": "CurrentGroup",
-                    "attributeId": 0x00000002,
+                0x00000011: {
+                    "attributeName": "Primary1X",
+                    "attributeId": 0x00000011,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000003: {
-                    "attributeName": "SceneValid",
-                    "attributeId": 0x00000003,
-                    "type": "bool",
+                0x00000012: {
+                    "attributeName": "Primary1Y",
+                    "attributeId": 0x00000012,
+                    "type": "int",
                     "reportable": True,
                 },
-                0x00000004: {
-                    "attributeName": "NameSupport",
-                    "attributeId": 0x00000004,
+                0x00000013: {
+                    "attributeName": "Primary1Intensity",
+                    "attributeId": 0x00000013,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFF8: {
-                    "attributeName": "GeneratedCommandList",
-                    "attributeId": 0x0000FFF8,
+                0x00000015: {
+                    "attributeName": "Primary2X",
+                    "attributeId": 0x00000015,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFF9: {
-                    "attributeName": "AcceptedCommandList",
-                    "attributeId": 0x0000FFF9,
+                0x00000016: {
+                    "attributeName": "Primary2Y",
+                    "attributeId": 0x00000016,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFB: {
-                    "attributeName": "AttributeList",
-                    "attributeId": 0x0000FFFB,
+                0x00000017: {
+                    "attributeName": "Primary2Intensity",
+                    "attributeId": 0x00000017,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
+                0x00000019: {
+                    "attributeName": "Primary3X",
+                    "attributeId": 0x00000019,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
+                0x0000001A: {
+                    "attributeName": "Primary3Y",
+                    "attributeId": 0x0000001A,
                     "type": "int",
                     "reportable": True,
                 },
-            },
-    }
-    _SOFTWARE_DIAGNOSTICS_CLUSTER_INFO = {
-            "clusterName": "SoftwareDiagnostics",
-            "clusterId": 0x00000034,
-            "commands": {
-            0x00000000: {
-                    "commandId": 0x00000000,
-                    "commandName": "ResetWatermarks",
-                    "args": {
-                    },
+                0x0000001B: {
+                    "attributeName": "Primary3Intensity",
+                    "attributeId": 0x0000001B,
+                    "type": "int",
+                    "reportable": True,
                 },
-            },
-            "attributes": {
-                0x00000000: {
-                    "attributeName": "ThreadMetrics",
-                    "attributeId": 0x00000000,
-                    "type": "",
+                0x00000020: {
+                    "attributeName": "Primary4X",
+                    "attributeId": 0x00000020,
+                    "type": "int",
                     "reportable": True,
                 },
-                0x00000001: {
-                    "attributeName": "CurrentHeapFree",
-                    "attributeId": 0x00000001,
+                0x00000021: {
+                    "attributeName": "Primary4Y",
+                    "attributeId": 0x00000021,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000002: {
-                    "attributeName": "CurrentHeapUsed",
-                    "attributeId": 0x00000002,
+                0x00000022: {
+                    "attributeName": "Primary4Intensity",
+                    "attributeId": 0x00000022,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000003: {
-                    "attributeName": "CurrentHeapHighWatermark",
-                    "attributeId": 0x00000003,
+                0x00000024: {
+                    "attributeName": "Primary5X",
+                    "attributeId": 0x00000024,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFF8: {
-                    "attributeName": "GeneratedCommandList",
-                    "attributeId": 0x0000FFF8,
+                0x00000025: {
+                    "attributeName": "Primary5Y",
+                    "attributeId": 0x00000025,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFF9: {
-                    "attributeName": "AcceptedCommandList",
-                    "attributeId": 0x0000FFF9,
+                0x00000026: {
+                    "attributeName": "Primary5Intensity",
+                    "attributeId": 0x00000026,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFB: {
-                    "attributeName": "AttributeList",
-                    "attributeId": 0x0000FFFB,
+                0x00000028: {
+                    "attributeName": "Primary6X",
+                    "attributeId": 0x00000028,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
+                0x00000029: {
+                    "attributeName": "Primary6Y",
+                    "attributeId": 0x00000029,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
+                0x0000002A: {
+                    "attributeName": "Primary6Intensity",
+                    "attributeId": 0x0000002A,
                     "type": "int",
                     "reportable": True,
                 },
-            },
-    }
-    _SWITCH_CLUSTER_INFO = {
-            "clusterName": "Switch",
-            "clusterId": 0x0000003B,
-            "commands": {
-            },
-            "attributes": {
-                0x00000000: {
-                    "attributeName": "NumberOfPositions",
-                    "attributeId": 0x00000000,
+                0x00000030: {
+                    "attributeName": "WhitePointX",
+                    "attributeId": 0x00000030,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000001: {
-                    "attributeName": "CurrentPosition",
-                    "attributeId": 0x00000001,
+                0x00000031: {
+                    "attributeName": "WhitePointY",
+                    "attributeId": 0x00000031,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000002: {
-                    "attributeName": "MultiPressMax",
-                    "attributeId": 0x00000002,
+                0x00000032: {
+                    "attributeName": "ColorPointRX",
+                    "attributeId": 0x00000032,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFF8: {
-                    "attributeName": "GeneratedCommandList",
-                    "attributeId": 0x0000FFF8,
+                0x00000033: {
+                    "attributeName": "ColorPointRY",
+                    "attributeId": 0x00000033,
+                    "type": "int",
+                    "reportable": True,
+                    "writable": True,
+                },
+                0x00000034: {
+                    "attributeName": "ColorPointRIntensity",
+                    "attributeId": 0x00000034,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFF9: {
-                    "attributeName": "AcceptedCommandList",
-                    "attributeId": 0x0000FFF9,
+                0x00000036: {
+                    "attributeName": "ColorPointGX",
+                    "attributeId": 0x00000036,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFFB: {
-                    "attributeName": "AttributeList",
-                    "attributeId": 0x0000FFFB,
+                0x00000037: {
+                    "attributeName": "ColorPointGY",
+                    "attributeId": 0x00000037,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
+                0x00000038: {
+                    "attributeName": "ColorPointGIntensity",
+                    "attributeId": 0x00000038,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
+                0x0000003A: {
+                    "attributeName": "ColorPointBX",
+                    "attributeId": 0x0000003A,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-            },
-    }
-    _TARGET_NAVIGATOR_CLUSTER_INFO = {
-            "clusterName": "TargetNavigator",
-            "clusterId": 0x00000505,
-            "commands": {
-            0x00000000: {
-                    "commandId": 0x00000000,
-                    "commandName": "NavigateTarget",
-                    "args": {
-                        "target": "int",
-                        "data": "str",
-                    },
+                0x0000003B: {
+                    "attributeName": "ColorPointBY",
+                    "attributeId": 0x0000003B,
+                    "type": "int",
+                    "reportable": True,
+                    "writable": True,
                 },
-            },
-            "attributes": {
-                0x00000000: {
-                    "attributeName": "TargetList",
-                    "attributeId": 0x00000000,
-                    "type": "",
+                0x0000003C: {
+                    "attributeName": "ColorPointBIntensity",
+                    "attributeId": 0x0000003C,
+                    "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000001: {
-                    "attributeName": "CurrentTarget",
-                    "attributeId": 0x00000001,
+                0x00004000: {
+                    "attributeName": "EnhancedCurrentHue",
+                    "attributeId": 0x00004000,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFF8: {
-                    "attributeName": "GeneratedCommandList",
-                    "attributeId": 0x0000FFF8,
+                0x00004001: {
+                    "attributeName": "EnhancedColorMode",
+                    "attributeId": 0x00004001,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFF9: {
-                    "attributeName": "AcceptedCommandList",
-                    "attributeId": 0x0000FFF9,
+                0x00004002: {
+                    "attributeName": "ColorLoopActive",
+                    "attributeId": 0x00004002,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFB: {
-                    "attributeName": "AttributeList",
-                    "attributeId": 0x0000FFFB,
+                0x00004003: {
+                    "attributeName": "ColorLoopDirection",
+                    "attributeId": 0x00004003,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
+                0x00004004: {
+                    "attributeName": "ColorLoopTime",
+                    "attributeId": 0x00004004,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
+                0x00004005: {
+                    "attributeName": "ColorLoopStartEnhancedHue",
+                    "attributeId": 0x00004005,
                     "type": "int",
                     "reportable": True,
                 },
-            },
-    }
-    _TEMPERATURE_MEASUREMENT_CLUSTER_INFO = {
-            "clusterName": "TemperatureMeasurement",
-            "clusterId": 0x00000402,
-            "commands": {
-            },
-            "attributes": {
-                0x00000000: {
-                    "attributeName": "MeasuredValue",
-                    "attributeId": 0x00000000,
+                0x00004006: {
+                    "attributeName": "ColorLoopStoredEnhancedHue",
+                    "attributeId": 0x00004006,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000001: {
-                    "attributeName": "MinMeasuredValue",
-                    "attributeId": 0x00000001,
+                0x0000400A: {
+                    "attributeName": "ColorCapabilities",
+                    "attributeId": 0x0000400A,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000002: {
-                    "attributeName": "MaxMeasuredValue",
-                    "attributeId": 0x00000002,
+                0x0000400B: {
+                    "attributeName": "ColorTempPhysicalMinMireds",
+                    "attributeId": 0x0000400B,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000003: {
-                    "attributeName": "Tolerance",
-                    "attributeId": 0x00000003,
+                0x0000400C: {
+                    "attributeName": "ColorTempPhysicalMaxMireds",
+                    "attributeId": 0x0000400C,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFB: {
-                    "attributeName": "AttributeList",
-                    "attributeId": 0x0000FFFB,
+                0x0000400D: {
+                    "attributeName": "CoupleColorTempToLevelMinMireds",
+                    "attributeId": 0x0000400D,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
+                0x00004010: {
+                    "attributeName": "StartUpColorTemperatureMireds",
+                    "attributeId": 0x00004010,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
+                0x0000FFF8: {
+                    "attributeName": "GeneratedCommandList",
+                    "attributeId": 0x0000FFF8,
                     "type": "int",
                     "reportable": True,
                 },
-            },
-    }
-    _TEST_CLUSTER_CLUSTER_INFO = {
-            "clusterName": "TestCluster",
-            "clusterId": 0xFFF1FC05,
-            "commands": {
-            0x00000011: {
-                    "commandId": 0x00000011,
-                    "commandName": "SimpleStructEchoRequest",
-                    "args": {
-                        "a": "int",
-                        "b": "bool",
-                        "c": "int",
-                        "d": "bytes",
-                        "e": "str",
-                        "f": "int",
-                        "g": "",
-                        "h": "",
-                    },
-                },
-            0x00000000: {
-                    "commandId": 0x00000000,
-                    "commandName": "Test",
-                    "args": {
-                    },
-                },
-            0x00000004: {
-                    "commandId": 0x00000004,
-                    "commandName": "TestAddArguments",
-                    "args": {
-                        "arg1": "int",
-                        "arg2": "int",
-                    },
-                },
-            0x00000014: {
-                    "commandId": 0x00000014,
-                    "commandName": "TestEmitTestEventRequest",
-                    "args": {
-                        "arg1": "int",
-                        "arg2": "int",
-                        "arg3": "bool",
-                    },
-                },
-            0x0000000E: {
-                    "commandId": 0x0000000E,
-                    "commandName": "TestEnumsRequest",
-                    "args": {
-                        "arg1": "int",
-                        "arg2": "int",
-                    },
-                },
-            0x0000000A: {
-                    "commandId": 0x0000000A,
-                    "commandName": "TestListInt8UArgumentRequest",
-                    "args": {
-                        "arg1": "int",
-                    },
-                },
-            0x0000000D: {
-                    "commandId": 0x0000000D,
-                    "commandName": "TestListInt8UReverseRequest",
-                    "args": {
-                        "arg1": "int",
-                    },
-                },
-            0x0000000C: {
-                    "commandId": 0x0000000C,
-                    "commandName": "TestListNestedStructListArgumentRequest",
-                    "args": {
-                        "a": "int",
-                        "b": "bool",
-                        "c": "",
-                        "d": "",
-                        "e": "int",
-                        "f": "bytes",
-                        "g": "int",
-                    },
-                },
-            0x00000009: {
-                    "commandId": 0x00000009,
-                    "commandName": "TestListStructArgumentRequest",
-                    "args": {
-                        "a": "int",
-                        "b": "bool",
-                        "c": "int",
-                        "d": "bytes",
-                        "e": "str",
-                        "f": "int",
-                        "g": "",
-                        "h": "",
-                    },
-                },
-            0x00000008: {
-                    "commandId": 0x00000008,
-                    "commandName": "TestNestedStructArgumentRequest",
-                    "args": {
-                        "a": "int",
-                        "b": "bool",
-                        "c": "",
-                    },
-                },
-            0x0000000B: {
-                    "commandId": 0x0000000B,
-                    "commandName": "TestNestedStructListArgumentRequest",
-                    "args": {
-                        "a": "int",
-                        "b": "bool",
-                        "c": "",
-                        "d": "",
-                        "e": "int",
-                        "f": "bytes",
-                        "g": "int",
-                    },
-                },
-            0x00000001: {
-                    "commandId": 0x00000001,
-                    "commandName": "TestNotHandled",
-                    "args": {
-                    },
-                },
-            0x0000000F: {
-                    "commandId": 0x0000000F,
-                    "commandName": "TestNullableOptionalRequest",
-                    "args": {
-                        "arg1": "int",
-                    },
-                },
-            0x00000013: {
-                    "commandId": 0x00000013,
-                    "commandName": "TestSimpleOptionalArgumentRequest",
-                    "args": {
-                        "arg1": "bool",
-                    },
-                },
-            0x00000002: {
-                    "commandId": 0x00000002,
-                    "commandName": "TestSpecific",
-                    "args": {
-                    },
-                },
-            0x00000007: {
-                    "commandId": 0x00000007,
-                    "commandName": "TestStructArgumentRequest",
-                    "args": {
-                        "a": "int",
-                        "b": "bool",
-                        "c": "int",
-                        "d": "bytes",
-                        "e": "str",
-                        "f": "int",
-                        "g": "",
-                        "h": "",
-                    },
+                0x0000FFF9: {
+                    "attributeName": "AcceptedCommandList",
+                    "attributeId": 0x0000FFF9,
+                    "type": "int",
+                    "reportable": True,
                 },
-            0x00000003: {
-                    "commandId": 0x00000003,
-                    "commandName": "TestUnknownCommand",
-                    "args": {
-                    },
+                0x0000FFFB: {
+                    "attributeName": "AttributeList",
+                    "attributeId": 0x0000FFFB,
+                    "type": "int",
+                    "reportable": True,
                 },
-            0x00000012: {
-                    "commandId": 0x00000012,
-                    "commandName": "TimedInvokeRequest",
-                    "args": {
-                    },
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
+                    "type": "int",
+                    "reportable": True,
                 },
             },
+    }
+    _ILLUMINANCE_MEASUREMENT_CLUSTER_INFO = {
+            "clusterName": "IlluminanceMeasurement",
+            "clusterId": 0x00000400,
+            "commands": {
+            },
             "attributes": {
                 0x00000000: {
-                    "attributeName": "Boolean",
+                    "attributeName": "MeasuredValue",
                     "attributeId": 0x00000000,
-                    "type": "bool",
+                    "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
                 0x00000001: {
-                    "attributeName": "Bitmap8",
+                    "attributeName": "MinMeasuredValue",
                     "attributeId": 0x00000001,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
                 0x00000002: {
-                    "attributeName": "Bitmap16",
+                    "attributeName": "MaxMeasuredValue",
                     "attributeId": 0x00000002,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
                 0x00000003: {
-                    "attributeName": "Bitmap32",
+                    "attributeName": "Tolerance",
                     "attributeId": 0x00000003,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
                 0x00000004: {
-                    "attributeName": "Bitmap64",
+                    "attributeName": "LightSensorType",
                     "attributeId": 0x00000004,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000005: {
-                    "attributeName": "Int8u",
-                    "attributeId": 0x00000005,
+                0x0000FFF8: {
+                    "attributeName": "GeneratedCommandList",
+                    "attributeId": 0x0000FFF8,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000006: {
-                    "attributeName": "Int16u",
-                    "attributeId": 0x00000006,
+                0x0000FFF9: {
+                    "attributeName": "AcceptedCommandList",
+                    "attributeId": 0x0000FFF9,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000007: {
-                    "attributeName": "Int24u",
-                    "attributeId": 0x00000007,
+                0x0000FFFB: {
+                    "attributeName": "AttributeList",
+                    "attributeId": 0x0000FFFB,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000008: {
-                    "attributeName": "Int32u",
-                    "attributeId": 0x00000008,
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000009: {
-                    "attributeName": "Int40u",
-                    "attributeId": 0x00000009,
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000000A: {
-                    "attributeName": "Int48u",
-                    "attributeId": 0x0000000A,
+            },
+    }
+    _TEMPERATURE_MEASUREMENT_CLUSTER_INFO = {
+            "clusterName": "TemperatureMeasurement",
+            "clusterId": 0x00000402,
+            "commands": {
+            },
+            "attributes": {
+                0x00000000: {
+                    "attributeName": "MeasuredValue",
+                    "attributeId": 0x00000000,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000000B: {
-                    "attributeName": "Int56u",
-                    "attributeId": 0x0000000B,
+                0x00000001: {
+                    "attributeName": "MinMeasuredValue",
+                    "attributeId": 0x00000001,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000000C: {
-                    "attributeName": "Int64u",
-                    "attributeId": 0x0000000C,
+                0x00000002: {
+                    "attributeName": "MaxMeasuredValue",
+                    "attributeId": 0x00000002,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000000D: {
-                    "attributeName": "Int8s",
-                    "attributeId": 0x0000000D,
+                0x00000003: {
+                    "attributeName": "Tolerance",
+                    "attributeId": 0x00000003,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000000E: {
-                    "attributeName": "Int16s",
-                    "attributeId": 0x0000000E,
+                0x0000FFFB: {
+                    "attributeName": "AttributeList",
+                    "attributeId": 0x0000FFFB,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000000F: {
-                    "attributeName": "Int24s",
-                    "attributeId": 0x0000000F,
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
+                    "type": "int",
+                    "reportable": True,
+                },
+            },
+    }
+    _PRESSURE_MEASUREMENT_CLUSTER_INFO = {
+            "clusterName": "PressureMeasurement",
+            "clusterId": 0x00000403,
+            "commands": {
+            },
+            "attributes": {
+                0x00000000: {
+                    "attributeName": "MeasuredValue",
+                    "attributeId": 0x00000000,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000001: {
+                    "attributeName": "MinMeasuredValue",
+                    "attributeId": 0x00000001,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000002: {
+                    "attributeName": "MaxMeasuredValue",
+                    "attributeId": 0x00000002,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000003: {
+                    "attributeName": "Tolerance",
+                    "attributeId": 0x00000003,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
                 0x00000010: {
-                    "attributeName": "Int32s",
+                    "attributeName": "ScaledValue",
                     "attributeId": 0x00000010,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
                 0x00000011: {
-                    "attributeName": "Int40s",
+                    "attributeName": "MinScaledValue",
                     "attributeId": 0x00000011,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
                 0x00000012: {
-                    "attributeName": "Int48s",
+                    "attributeName": "MaxScaledValue",
                     "attributeId": 0x00000012,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000013: {
-                    "attributeName": "Int56s",
-                    "attributeId": 0x00000013,
+                0x00000013: {
+                    "attributeName": "ScaledTolerance",
+                    "attributeId": 0x00000013,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000014: {
+                    "attributeName": "Scale",
+                    "attributeId": 0x00000014,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000FFFB: {
+                    "attributeName": "AttributeList",
+                    "attributeId": 0x0000FFFB,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
+                    "type": "int",
+                    "reportable": True,
+                },
+            },
+    }
+    _FLOW_MEASUREMENT_CLUSTER_INFO = {
+            "clusterName": "FlowMeasurement",
+            "clusterId": 0x00000404,
+            "commands": {
+            },
+            "attributes": {
+                0x00000000: {
+                    "attributeName": "MeasuredValue",
+                    "attributeId": 0x00000000,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000001: {
+                    "attributeName": "MinMeasuredValue",
+                    "attributeId": 0x00000001,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000002: {
+                    "attributeName": "MaxMeasuredValue",
+                    "attributeId": 0x00000002,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x00000003: {
+                    "attributeName": "Tolerance",
+                    "attributeId": 0x00000003,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000FFF8: {
+                    "attributeName": "GeneratedCommandList",
+                    "attributeId": 0x0000FFF8,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000FFF9: {
+                    "attributeName": "AcceptedCommandList",
+                    "attributeId": 0x0000FFF9,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000FFFB: {
+                    "attributeName": "AttributeList",
+                    "attributeId": 0x0000FFFB,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
+                    "type": "int",
+                    "reportable": True,
+                },
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000014: {
-                    "attributeName": "Int64s",
-                    "attributeId": 0x00000014,
+            },
+    }
+    _RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_INFO = {
+            "clusterName": "RelativeHumidityMeasurement",
+            "clusterId": 0x00000405,
+            "commands": {
+            },
+            "attributes": {
+                0x00000000: {
+                    "attributeName": "MeasuredValue",
+                    "attributeId": 0x00000000,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000015: {
-                    "attributeName": "Enum8",
-                    "attributeId": 0x00000015,
+                0x00000001: {
+                    "attributeName": "MinMeasuredValue",
+                    "attributeId": 0x00000001,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000016: {
-                    "attributeName": "Enum16",
-                    "attributeId": 0x00000016,
+                0x00000002: {
+                    "attributeName": "MaxMeasuredValue",
+                    "attributeId": 0x00000002,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000017: {
-                    "attributeName": "FloatSingle",
-                    "attributeId": 0x00000017,
-                    "type": "",
+                0x00000003: {
+                    "attributeName": "Tolerance",
+                    "attributeId": 0x00000003,
+                    "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000018: {
-                    "attributeName": "FloatDouble",
-                    "attributeId": 0x00000018,
-                    "type": "",
+                0x0000FFF8: {
+                    "attributeName": "GeneratedCommandList",
+                    "attributeId": 0x0000FFF8,
+                    "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000019: {
-                    "attributeName": "OctetString",
-                    "attributeId": 0x00000019,
-                    "type": "bytes",
+                0x0000FFF9: {
+                    "attributeName": "AcceptedCommandList",
+                    "attributeId": 0x0000FFF9,
+                    "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000001A: {
-                    "attributeName": "ListInt8u",
-                    "attributeId": 0x0000001A,
+                0x0000FFFB: {
+                    "attributeName": "AttributeList",
+                    "attributeId": 0x0000FFFB,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000001B: {
-                    "attributeName": "ListOctetString",
-                    "attributeId": 0x0000001B,
-                    "type": "bytes",
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
+                    "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000001C: {
-                    "attributeName": "ListStructOctetString",
-                    "attributeId": 0x0000001C,
-                    "type": "",
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
+                    "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000001D: {
-                    "attributeName": "LongOctetString",
-                    "attributeId": 0x0000001D,
-                    "type": "bytes",
+            },
+    }
+    _OCCUPANCY_SENSING_CLUSTER_INFO = {
+            "clusterName": "OccupancySensing",
+            "clusterId": 0x00000406,
+            "commands": {
+            },
+            "attributes": {
+                0x00000000: {
+                    "attributeName": "Occupancy",
+                    "attributeId": 0x00000000,
+                    "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000001E: {
-                    "attributeName": "CharString",
-                    "attributeId": 0x0000001E,
-                    "type": "str",
+                0x00000001: {
+                    "attributeName": "OccupancySensorType",
+                    "attributeId": 0x00000001,
+                    "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000001F: {
-                    "attributeName": "LongCharString",
-                    "attributeId": 0x0000001F,
-                    "type": "str",
+                0x00000002: {
+                    "attributeName": "OccupancySensorTypeBitmap",
+                    "attributeId": 0x00000002,
+                    "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000020: {
-                    "attributeName": "EpochUs",
-                    "attributeId": 0x00000020,
+                0x0000FFF8: {
+                    "attributeName": "GeneratedCommandList",
+                    "attributeId": 0x0000FFF8,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000021: {
-                    "attributeName": "EpochS",
-                    "attributeId": 0x00000021,
+                0x0000FFF9: {
+                    "attributeName": "AcceptedCommandList",
+                    "attributeId": 0x0000FFF9,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000022: {
-                    "attributeName": "VendorId",
-                    "attributeId": 0x00000022,
+                0x0000FFFB: {
+                    "attributeName": "AttributeList",
+                    "attributeId": 0x0000FFFB,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000023: {
-                    "attributeName": "ListNullablesAndOptionalsStruct",
-                    "attributeId": 0x00000023,
-                    "type": "",
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
+                    "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000024: {
-                    "attributeName": "EnumAttr",
-                    "attributeId": 0x00000024,
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000025: {
-                    "attributeName": "StructAttr",
-                    "attributeId": 0x00000025,
-                    "type": "",
+            },
+    }
+    _WAKE_ON_LAN_CLUSTER_INFO = {
+            "clusterName": "WakeOnLan",
+            "clusterId": 0x00000503,
+            "commands": {
+            },
+            "attributes": {
+                0x00000000: {
+                    "attributeName": "MACAddress",
+                    "attributeId": 0x00000000,
+                    "type": "str",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000026: {
-                    "attributeName": "RangeRestrictedInt8u",
-                    "attributeId": 0x00000026,
+                0x0000FFF8: {
+                    "attributeName": "GeneratedCommandList",
+                    "attributeId": 0x0000FFF8,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000027: {
-                    "attributeName": "RangeRestrictedInt8s",
-                    "attributeId": 0x00000027,
+                0x0000FFF9: {
+                    "attributeName": "AcceptedCommandList",
+                    "attributeId": 0x0000FFF9,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000028: {
-                    "attributeName": "RangeRestrictedInt16u",
-                    "attributeId": 0x00000028,
+                0x0000FFFB: {
+                    "attributeName": "AttributeList",
+                    "attributeId": 0x0000FFFB,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000029: {
-                    "attributeName": "RangeRestrictedInt16s",
-                    "attributeId": 0x00000029,
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000002A: {
-                    "attributeName": "ListLongOctetString",
-                    "attributeId": 0x0000002A,
-                    "type": "bytes",
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
+                    "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000002B: {
-                    "attributeName": "ListFabricScoped",
-                    "attributeId": 0x0000002B,
-                    "type": "",
-                    "reportable": True,
-                    "writable": True,
+            },
+    }
+    _CHANNEL_CLUSTER_INFO = {
+            "clusterName": "Channel",
+            "clusterId": 0x00000504,
+            "commands": {
+            0x00000000: {
+                    "commandId": 0x00000000,
+                    "commandName": "ChangeChannel",
+                    "args": {
+                        "match": "str",
+                    },
                 },
-                0x00000030: {
-                    "attributeName": "TimedWriteBoolean",
-                    "attributeId": 0x00000030,
-                    "type": "bool",
+            0x00000002: {
+                    "commandId": 0x00000002,
+                    "commandName": "ChangeChannelByNumber",
+                    "args": {
+                        "majorNumber": "int",
+                        "minorNumber": "int",
+                    },
+                },
+            0x00000003: {
+                    "commandId": 0x00000003,
+                    "commandName": "SkipChannel",
+                    "args": {
+                        "count": "int",
+                    },
+                },
+            },
+            "attributes": {
+                0x00000000: {
+                    "attributeName": "ChannelList",
+                    "attributeId": 0x00000000,
+                    "type": "",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000031: {
-                    "attributeName": "GeneralErrorBoolean",
-                    "attributeId": 0x00000031,
-                    "type": "bool",
+                0x00000001: {
+                    "attributeName": "Lineup",
+                    "attributeId": 0x00000001,
+                    "type": "",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000032: {
-                    "attributeName": "ClusterErrorBoolean",
-                    "attributeId": 0x00000032,
-                    "type": "bool",
+                0x00000002: {
+                    "attributeName": "CurrentChannel",
+                    "attributeId": 0x00000002,
+                    "type": "",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x000000FF: {
-                    "attributeName": "Unsupported",
-                    "attributeId": 0x000000FF,
-                    "type": "bool",
+                0x0000FFF8: {
+                    "attributeName": "GeneratedCommandList",
+                    "attributeId": 0x0000FFF8,
+                    "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004000: {
-                    "attributeName": "NullableBoolean",
-                    "attributeId": 0x00004000,
-                    "type": "bool",
+                0x0000FFF9: {
+                    "attributeName": "AcceptedCommandList",
+                    "attributeId": 0x0000FFF9,
+                    "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004001: {
-                    "attributeName": "NullableBitmap8",
-                    "attributeId": 0x00004001,
+                0x0000FFFB: {
+                    "attributeName": "AttributeList",
+                    "attributeId": 0x0000FFFB,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004002: {
-                    "attributeName": "NullableBitmap16",
-                    "attributeId": 0x00004002,
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004003: {
-                    "attributeName": "NullableBitmap32",
-                    "attributeId": 0x00004003,
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004004: {
-                    "attributeName": "NullableBitmap64",
-                    "attributeId": 0x00004004,
-                    "type": "int",
+            },
+    }
+    _TARGET_NAVIGATOR_CLUSTER_INFO = {
+            "clusterName": "TargetNavigator",
+            "clusterId": 0x00000505,
+            "commands": {
+            0x00000000: {
+                    "commandId": 0x00000000,
+                    "commandName": "NavigateTarget",
+                    "args": {
+                        "target": "int",
+                        "data": "str",
+                    },
+                },
+            },
+            "attributes": {
+                0x00000000: {
+                    "attributeName": "TargetList",
+                    "attributeId": 0x00000000,
+                    "type": "",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004005: {
-                    "attributeName": "NullableInt8u",
-                    "attributeId": 0x00004005,
+                0x00000001: {
+                    "attributeName": "CurrentTarget",
+                    "attributeId": 0x00000001,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004006: {
-                    "attributeName": "NullableInt16u",
-                    "attributeId": 0x00004006,
+                0x0000FFF8: {
+                    "attributeName": "GeneratedCommandList",
+                    "attributeId": 0x0000FFF8,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004007: {
-                    "attributeName": "NullableInt24u",
-                    "attributeId": 0x00004007,
+                0x0000FFF9: {
+                    "attributeName": "AcceptedCommandList",
+                    "attributeId": 0x0000FFF9,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004008: {
-                    "attributeName": "NullableInt32u",
-                    "attributeId": 0x00004008,
+                0x0000FFFB: {
+                    "attributeName": "AttributeList",
+                    "attributeId": 0x0000FFFB,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004009: {
-                    "attributeName": "NullableInt40u",
-                    "attributeId": 0x00004009,
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000400A: {
-                    "attributeName": "NullableInt48u",
-                    "attributeId": 0x0000400A,
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000400B: {
-                    "attributeName": "NullableInt56u",
-                    "attributeId": 0x0000400B,
+            },
+    }
+    _MEDIA_PLAYBACK_CLUSTER_INFO = {
+            "clusterName": "MediaPlayback",
+            "clusterId": 0x00000506,
+            "commands": {
+            0x00000000: {
+                    "commandId": 0x00000000,
+                    "commandName": "Play",
+                    "args": {
+                    },
+                },
+            0x00000001: {
+                    "commandId": 0x00000001,
+                    "commandName": "Pause",
+                    "args": {
+                    },
+                },
+            0x00000002: {
+                    "commandId": 0x00000002,
+                    "commandName": "StopPlayback",
+                    "args": {
+                    },
+                },
+            0x00000003: {
+                    "commandId": 0x00000003,
+                    "commandName": "StartOver",
+                    "args": {
+                    },
+                },
+            0x00000004: {
+                    "commandId": 0x00000004,
+                    "commandName": "Previous",
+                    "args": {
+                    },
+                },
+            0x00000005: {
+                    "commandId": 0x00000005,
+                    "commandName": "Next",
+                    "args": {
+                    },
+                },
+            0x00000006: {
+                    "commandId": 0x00000006,
+                    "commandName": "Rewind",
+                    "args": {
+                    },
+                },
+            0x00000007: {
+                    "commandId": 0x00000007,
+                    "commandName": "FastForward",
+                    "args": {
+                    },
+                },
+            0x00000008: {
+                    "commandId": 0x00000008,
+                    "commandName": "SkipForward",
+                    "args": {
+                        "deltaPositionMilliseconds": "int",
+                    },
+                },
+            0x00000009: {
+                    "commandId": 0x00000009,
+                    "commandName": "SkipBackward",
+                    "args": {
+                        "deltaPositionMilliseconds": "int",
+                    },
+                },
+            0x0000000B: {
+                    "commandId": 0x0000000B,
+                    "commandName": "Seek",
+                    "args": {
+                        "position": "int",
+                    },
+                },
+            },
+            "attributes": {
+                0x00000000: {
+                    "attributeName": "CurrentState",
+                    "attributeId": 0x00000000,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000400C: {
-                    "attributeName": "NullableInt64u",
-                    "attributeId": 0x0000400C,
+                0x00000001: {
+                    "attributeName": "StartTime",
+                    "attributeId": 0x00000001,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000400D: {
-                    "attributeName": "NullableInt8s",
-                    "attributeId": 0x0000400D,
+                0x00000002: {
+                    "attributeName": "Duration",
+                    "attributeId": 0x00000002,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000400E: {
-                    "attributeName": "NullableInt16s",
-                    "attributeId": 0x0000400E,
-                    "type": "int",
+                0x00000003: {
+                    "attributeName": "SampledPosition",
+                    "attributeId": 0x00000003,
+                    "type": "",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x0000400F: {
-                    "attributeName": "NullableInt24s",
-                    "attributeId": 0x0000400F,
-                    "type": "int",
+                0x00000004: {
+                    "attributeName": "PlaybackSpeed",
+                    "attributeId": 0x00000004,
+                    "type": "",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004010: {
-                    "attributeName": "NullableInt32s",
-                    "attributeId": 0x00004010,
+                0x00000005: {
+                    "attributeName": "SeekRangeEnd",
+                    "attributeId": 0x00000005,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004011: {
-                    "attributeName": "NullableInt40s",
-                    "attributeId": 0x00004011,
+                0x00000006: {
+                    "attributeName": "SeekRangeStart",
+                    "attributeId": 0x00000006,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004012: {
-                    "attributeName": "NullableInt48s",
-                    "attributeId": 0x00004012,
+                0x0000FFF8: {
+                    "attributeName": "GeneratedCommandList",
+                    "attributeId": 0x0000FFF8,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004013: {
-                    "attributeName": "NullableInt56s",
-                    "attributeId": 0x00004013,
+                0x0000FFF9: {
+                    "attributeName": "AcceptedCommandList",
+                    "attributeId": 0x0000FFF9,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004014: {
-                    "attributeName": "NullableInt64s",
-                    "attributeId": 0x00004014,
+                0x0000FFFB: {
+                    "attributeName": "AttributeList",
+                    "attributeId": 0x0000FFFB,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004015: {
-                    "attributeName": "NullableEnum8",
-                    "attributeId": 0x00004015,
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004016: {
-                    "attributeName": "NullableEnum16",
-                    "attributeId": 0x00004016,
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004017: {
-                    "attributeName": "NullableFloatSingle",
-                    "attributeId": 0x00004017,
-                    "type": "",
-                    "reportable": True,
-                    "writable": True,
+            },
+    }
+    _MEDIA_INPUT_CLUSTER_INFO = {
+            "clusterName": "MediaInput",
+            "clusterId": 0x00000507,
+            "commands": {
+            0x00000000: {
+                    "commandId": 0x00000000,
+                    "commandName": "SelectInput",
+                    "args": {
+                        "index": "int",
+                    },
                 },
-                0x00004018: {
-                    "attributeName": "NullableFloatDouble",
-                    "attributeId": 0x00004018,
-                    "type": "",
-                    "reportable": True,
-                    "writable": True,
+            0x00000001: {
+                    "commandId": 0x00000001,
+                    "commandName": "ShowInputStatus",
+                    "args": {
+                    },
                 },
-                0x00004019: {
-                    "attributeName": "NullableOctetString",
-                    "attributeId": 0x00004019,
-                    "type": "bytes",
-                    "reportable": True,
-                    "writable": True,
+            0x00000002: {
+                    "commandId": 0x00000002,
+                    "commandName": "HideInputStatus",
+                    "args": {
+                    },
                 },
-                0x0000401E: {
-                    "attributeName": "NullableCharString",
-                    "attributeId": 0x0000401E,
-                    "type": "str",
+            0x00000003: {
+                    "commandId": 0x00000003,
+                    "commandName": "RenameInput",
+                    "args": {
+                        "index": "int",
+                        "name": "str",
+                    },
+                },
+            },
+            "attributes": {
+                0x00000000: {
+                    "attributeName": "InputList",
+                    "attributeId": 0x00000000,
+                    "type": "",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004024: {
-                    "attributeName": "NullableEnumAttr",
-                    "attributeId": 0x00004024,
+                0x00000001: {
+                    "attributeName": "CurrentInput",
+                    "attributeId": 0x00000001,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004025: {
-                    "attributeName": "NullableStruct",
-                    "attributeId": 0x00004025,
-                    "type": "",
+                0x0000FFF8: {
+                    "attributeName": "GeneratedCommandList",
+                    "attributeId": 0x0000FFF8,
+                    "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004026: {
-                    "attributeName": "NullableRangeRestrictedInt8u",
-                    "attributeId": 0x00004026,
+                0x0000FFF9: {
+                    "attributeName": "AcceptedCommandList",
+                    "attributeId": 0x0000FFF9,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004027: {
-                    "attributeName": "NullableRangeRestrictedInt8s",
-                    "attributeId": 0x00004027,
+                0x0000FFFB: {
+                    "attributeName": "AttributeList",
+                    "attributeId": 0x0000FFFB,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004028: {
-                    "attributeName": "NullableRangeRestrictedInt16u",
-                    "attributeId": 0x00004028,
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00004029: {
-                    "attributeName": "NullableRangeRestrictedInt16s",
-                    "attributeId": 0x00004029,
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
+            },
+    }
+    _LOW_POWER_CLUSTER_INFO = {
+            "clusterName": "LowPower",
+            "clusterId": 0x00000508,
+            "commands": {
+            0x00000000: {
+                    "commandId": 0x00000000,
+                    "commandName": "Sleep",
+                    "args": {
+                    },
+                },
+            },
+            "attributes": {
                 0x0000FFF8: {
                     "attributeName": "GeneratedCommandList",
                     "attributeId": 0x0000FFF8,
@@ -6205,154 +6090,167 @@ class ChipClusters:
                 },
             },
     }
-    _THERMOSTAT_CLUSTER_INFO = {
-            "clusterName": "Thermostat",
-            "clusterId": 0x00000201,
+    _KEYPAD_INPUT_CLUSTER_INFO = {
+            "clusterName": "KeypadInput",
+            "clusterId": 0x00000509,
             "commands": {
-            0x00000003: {
-                    "commandId": 0x00000003,
-                    "commandName": "ClearWeeklySchedule",
-                    "args": {
-                    },
-                },
-            0x00000002: {
-                    "commandId": 0x00000002,
-                    "commandName": "GetWeeklySchedule",
-                    "args": {
-                        "daysToReturn": "int",
-                        "modeToReturn": "int",
-                    },
-                },
-            0x00000001: {
-                    "commandId": 0x00000001,
-                    "commandName": "SetWeeklySchedule",
-                    "args": {
-                        "numberOfTransitionsForSequence": "int",
-                        "dayOfWeekForSequence": "int",
-                        "modeForSequence": "int",
-                        "transitionTime": "int",
-                        "heatSetpoint": "int",
-                        "coolSetpoint": "int",
-                    },
-                },
             0x00000000: {
                     "commandId": 0x00000000,
-                    "commandName": "SetpointRaiseLower",
+                    "commandName": "SendKey",
                     "args": {
-                        "mode": "int",
-                        "amount": "int",
+                        "keyCode": "int",
                     },
                 },
             },
             "attributes": {
-                0x00000000: {
-                    "attributeName": "LocalTemperature",
-                    "attributeId": 0x00000000,
+                0x0000FFF8: {
+                    "attributeName": "GeneratedCommandList",
+                    "attributeId": 0x0000FFF8,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000003: {
-                    "attributeName": "AbsMinHeatSetpointLimit",
-                    "attributeId": 0x00000003,
+                0x0000FFF9: {
+                    "attributeName": "AcceptedCommandList",
+                    "attributeId": 0x0000FFF9,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000004: {
-                    "attributeName": "AbsMaxHeatSetpointLimit",
-                    "attributeId": 0x00000004,
+                0x0000FFFB: {
+                    "attributeName": "AttributeList",
+                    "attributeId": 0x0000FFFB,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000005: {
-                    "attributeName": "AbsMinCoolSetpointLimit",
-                    "attributeId": 0x00000005,
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000006: {
-                    "attributeName": "AbsMaxCoolSetpointLimit",
-                    "attributeId": 0x00000006,
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000011: {
-                    "attributeName": "OccupiedCoolingSetpoint",
-                    "attributeId": 0x00000011,
+            },
+    }
+    _CONTENT_LAUNCHER_CLUSTER_INFO = {
+            "clusterName": "ContentLauncher",
+            "clusterId": 0x0000050A,
+            "commands": {
+            0x00000000: {
+                    "commandId": 0x00000000,
+                    "commandName": "LaunchContent",
+                    "args": {
+                        "parameterList": "",
+                        "autoPlay": "bool",
+                        "data": "str",
+                    },
+                },
+            0x00000001: {
+                    "commandId": 0x00000001,
+                    "commandName": "LaunchURL",
+                    "args": {
+                        "contentURL": "str",
+                        "displayString": "str",
+                        "providerName": "str",
+                        "background": "",
+                        "logo": "",
+                        "progressBar": "",
+                        "splash": "",
+                        "waterMark": "",
+                    },
+                },
+            },
+            "attributes": {
+                0x00000000: {
+                    "attributeName": "AcceptHeader",
+                    "attributeId": 0x00000000,
+                    "type": "str",
+                    "reportable": True,
+                },
+                0x00000001: {
+                    "attributeName": "SupportedStreamingProtocols",
+                    "attributeId": 0x00000001,
                     "type": "int",
                     "reportable": True,
                     "writable": True,
                 },
-                0x00000012: {
-                    "attributeName": "OccupiedHeatingSetpoint",
-                    "attributeId": 0x00000012,
+                0x0000FFF8: {
+                    "attributeName": "GeneratedCommandList",
+                    "attributeId": 0x0000FFF8,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000015: {
-                    "attributeName": "MinHeatSetpointLimit",
-                    "attributeId": 0x00000015,
+                0x0000FFF9: {
+                    "attributeName": "AcceptedCommandList",
+                    "attributeId": 0x0000FFF9,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000016: {
-                    "attributeName": "MaxHeatSetpointLimit",
-                    "attributeId": 0x00000016,
+                0x0000FFFB: {
+                    "attributeName": "AttributeList",
+                    "attributeId": 0x0000FFFB,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000017: {
-                    "attributeName": "MinCoolSetpointLimit",
-                    "attributeId": 0x00000017,
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000018: {
-                    "attributeName": "MaxCoolSetpointLimit",
-                    "attributeId": 0x00000018,
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000019: {
-                    "attributeName": "MinSetpointDeadBand",
-                    "attributeId": 0x00000019,
-                    "type": "int",
-                    "reportable": True,
-                    "writable": True,
+            },
+    }
+    _AUDIO_OUTPUT_CLUSTER_INFO = {
+            "clusterName": "AudioOutput",
+            "clusterId": 0x0000050B,
+            "commands": {
+            0x00000000: {
+                    "commandId": 0x00000000,
+                    "commandName": "SelectOutput",
+                    "args": {
+                        "index": "int",
+                    },
                 },
-                0x0000001B: {
-                    "attributeName": "ControlSequenceOfOperation",
-                    "attributeId": 0x0000001B,
-                    "type": "int",
-                    "reportable": True,
-                    "writable": True,
+            0x00000001: {
+                    "commandId": 0x00000001,
+                    "commandName": "RenameOutput",
+                    "args": {
+                        "index": "int",
+                        "name": "str",
+                    },
                 },
-                0x0000001C: {
-                    "attributeName": "SystemMode",
-                    "attributeId": 0x0000001C,
-                    "type": "int",
+            },
+            "attributes": {
+                0x00000000: {
+                    "attributeName": "OutputList",
+                    "attributeId": 0x00000000,
+                    "type": "",
                     "reportable": True,
-                    "writable": True,
                 },
-                0x00000020: {
-                    "attributeName": "StartOfWeek",
-                    "attributeId": 0x00000020,
+                0x00000001: {
+                    "attributeName": "CurrentOutput",
+                    "attributeId": 0x00000001,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000021: {
-                    "attributeName": "NumberOfWeeklyTransitions",
-                    "attributeId": 0x00000021,
+                0x0000FFF8: {
+                    "attributeName": "GeneratedCommandList",
+                    "attributeId": 0x0000FFF8,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000022: {
-                    "attributeName": "NumberOfDailyTransitions",
-                    "attributeId": 0x00000022,
+                0x0000FFF9: {
+                    "attributeName": "AcceptedCommandList",
+                    "attributeId": 0x0000FFF9,
                     "type": "int",
                     "reportable": True,
                 },
@@ -6376,30 +6274,47 @@ class ChipClusters:
                 },
             },
     }
-    _THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_INFO = {
-            "clusterName": "ThermostatUserInterfaceConfiguration",
-            "clusterId": 0x00000204,
+    _APPLICATION_LAUNCHER_CLUSTER_INFO = {
+            "clusterName": "ApplicationLauncher",
+            "clusterId": 0x0000050C,
             "commands": {
+            0x00000000: {
+                    "commandId": 0x00000000,
+                    "commandName": "LaunchApp",
+                    "args": {
+                        "catalogVendorId": "int",
+                        "applicationId": "str",
+                        "data": "bytes",
+                    },
+                },
+            0x00000001: {
+                    "commandId": 0x00000001,
+                    "commandName": "StopApp",
+                    "args": {
+                        "catalogVendorId": "int",
+                        "applicationId": "str",
+                    },
+                },
+            0x00000002: {
+                    "commandId": 0x00000002,
+                    "commandName": "HideApp",
+                    "args": {
+                        "catalogVendorId": "int",
+                        "applicationId": "str",
+                    },
+                },
             },
             "attributes": {
                 0x00000000: {
-                    "attributeName": "TemperatureDisplayMode",
+                    "attributeName": "CatalogList",
                     "attributeId": 0x00000000,
                     "type": "int",
                     "reportable": True,
-                    "writable": True,
                 },
                 0x00000001: {
-                    "attributeName": "KeypadLockout",
+                    "attributeName": "CurrentApp",
                     "attributeId": 0x00000001,
-                    "type": "int",
-                    "reportable": True,
-                    "writable": True,
-                },
-                0x00000002: {
-                    "attributeName": "ScheduleProgrammingVisibility",
-                    "attributeId": 0x00000002,
-                    "type": "int",
+                    "type": "",
                     "reportable": True,
                     "writable": True,
                 },
@@ -6435,902 +6350,987 @@ class ChipClusters:
                 },
             },
     }
-    _THREAD_NETWORK_DIAGNOSTICS_CLUSTER_INFO = {
-            "clusterName": "ThreadNetworkDiagnostics",
-            "clusterId": 0x00000035,
+    _APPLICATION_BASIC_CLUSTER_INFO = {
+            "clusterName": "ApplicationBasic",
+            "clusterId": 0x0000050D,
             "commands": {
-            0x00000000: {
-                    "commandId": 0x00000000,
-                    "commandName": "ResetCounts",
-                    "args": {
-                    },
-                },
             },
             "attributes": {
                 0x00000000: {
-                    "attributeName": "Channel",
+                    "attributeName": "VendorName",
                     "attributeId": 0x00000000,
-                    "type": "int",
+                    "type": "str",
                     "reportable": True,
                 },
                 0x00000001: {
-                    "attributeName": "RoutingRole",
+                    "attributeName": "VendorID",
                     "attributeId": 0x00000001,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000002: {
-                    "attributeName": "NetworkName",
+                    "attributeName": "ApplicationName",
                     "attributeId": 0x00000002,
                     "type": "str",
                     "reportable": True,
                 },
                 0x00000003: {
-                    "attributeName": "PanId",
+                    "attributeName": "ProductID",
                     "attributeId": 0x00000003,
                     "type": "int",
                     "reportable": True,
                 },
                 0x00000004: {
-                    "attributeName": "ExtendedPanId",
+                    "attributeName": "Application",
                     "attributeId": 0x00000004,
-                    "type": "int",
+                    "type": "",
                     "reportable": True,
                 },
                 0x00000005: {
-                    "attributeName": "MeshLocalPrefix",
+                    "attributeName": "Status",
                     "attributeId": 0x00000005,
-                    "type": "bytes",
+                    "type": "int",
                     "reportable": True,
                 },
                 0x00000006: {
-                    "attributeName": "OverrunCount",
+                    "attributeName": "ApplicationVersion",
                     "attributeId": 0x00000006,
-                    "type": "int",
+                    "type": "str",
                     "reportable": True,
                 },
                 0x00000007: {
-                    "attributeName": "NeighborTableList",
+                    "attributeName": "AllowedVendorList",
                     "attributeId": 0x00000007,
-                    "type": "",
-                    "reportable": True,
-                },
-                0x00000008: {
-                    "attributeName": "RouteTableList",
-                    "attributeId": 0x00000008,
-                    "type": "",
+                    "type": "int",
                     "reportable": True,
                 },
-                0x00000009: {
-                    "attributeName": "PartitionId",
-                    "attributeId": 0x00000009,
+                0x0000FFF8: {
+                    "attributeName": "GeneratedCommandList",
+                    "attributeId": 0x0000FFF8,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000000A: {
-                    "attributeName": "Weighting",
-                    "attributeId": 0x0000000A,
+                0x0000FFF9: {
+                    "attributeName": "AcceptedCommandList",
+                    "attributeId": 0x0000FFF9,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000000B: {
-                    "attributeName": "DataVersion",
-                    "attributeId": 0x0000000B,
+                0x0000FFFB: {
+                    "attributeName": "AttributeList",
+                    "attributeId": 0x0000FFFB,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000000C: {
-                    "attributeName": "StableDataVersion",
-                    "attributeId": 0x0000000C,
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000000D: {
-                    "attributeName": "LeaderRouterId",
-                    "attributeId": 0x0000000D,
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000000E: {
-                    "attributeName": "DetachedRoleCount",
-                    "attributeId": 0x0000000E,
+            },
+    }
+    _ACCOUNT_LOGIN_CLUSTER_INFO = {
+            "clusterName": "AccountLogin",
+            "clusterId": 0x0000050E,
+            "commands": {
+            0x00000000: {
+                    "commandId": 0x00000000,
+                    "commandName": "GetSetupPIN",
+                    "args": {
+                        "tempAccountIdentifier": "str",
+                    },
+                },
+            0x00000002: {
+                    "commandId": 0x00000002,
+                    "commandName": "Login",
+                    "args": {
+                        "tempAccountIdentifier": "str",
+                        "setupPIN": "str",
+                    },
+                },
+            0x00000003: {
+                    "commandId": 0x00000003,
+                    "commandName": "Logout",
+                    "args": {
+                    },
+                },
+            },
+            "attributes": {
+                0x0000FFF8: {
+                    "attributeName": "GeneratedCommandList",
+                    "attributeId": 0x0000FFF8,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000000F: {
-                    "attributeName": "ChildRoleCount",
-                    "attributeId": 0x0000000F,
+                0x0000FFF9: {
+                    "attributeName": "AcceptedCommandList",
+                    "attributeId": 0x0000FFF9,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000010: {
-                    "attributeName": "RouterRoleCount",
-                    "attributeId": 0x00000010,
+                0x0000FFFB: {
+                    "attributeName": "AttributeList",
+                    "attributeId": 0x0000FFFB,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000011: {
-                    "attributeName": "LeaderRoleCount",
-                    "attributeId": 0x00000011,
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000012: {
-                    "attributeName": "AttachAttemptCount",
-                    "attributeId": 0x00000012,
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000013: {
-                    "attributeName": "PartitionIdChangeCount",
-                    "attributeId": 0x00000013,
+            },
+    }
+    _ELECTRICAL_MEASUREMENT_CLUSTER_INFO = {
+            "clusterName": "ElectricalMeasurement",
+            "clusterId": 0x00000B04,
+            "commands": {
+            },
+            "attributes": {
+                0x00000000: {
+                    "attributeName": "MeasurementType",
+                    "attributeId": 0x00000000,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000014: {
-                    "attributeName": "BetterPartitionAttachAttemptCount",
-                    "attributeId": 0x00000014,
+                0x00000304: {
+                    "attributeName": "TotalActivePower",
+                    "attributeId": 0x00000304,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000015: {
-                    "attributeName": "ParentChangeCount",
-                    "attributeId": 0x00000015,
+                0x00000505: {
+                    "attributeName": "RmsVoltage",
+                    "attributeId": 0x00000505,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000016: {
-                    "attributeName": "TxTotalCount",
-                    "attributeId": 0x00000016,
+                0x00000506: {
+                    "attributeName": "RmsVoltageMin",
+                    "attributeId": 0x00000506,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000017: {
-                    "attributeName": "TxUnicastCount",
-                    "attributeId": 0x00000017,
+                0x00000507: {
+                    "attributeName": "RmsVoltageMax",
+                    "attributeId": 0x00000507,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000018: {
-                    "attributeName": "TxBroadcastCount",
-                    "attributeId": 0x00000018,
+                0x00000508: {
+                    "attributeName": "RmsCurrent",
+                    "attributeId": 0x00000508,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000019: {
-                    "attributeName": "TxAckRequestedCount",
-                    "attributeId": 0x00000019,
+                0x00000509: {
+                    "attributeName": "RmsCurrentMin",
+                    "attributeId": 0x00000509,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000001A: {
-                    "attributeName": "TxAckedCount",
-                    "attributeId": 0x0000001A,
+                0x0000050A: {
+                    "attributeName": "RmsCurrentMax",
+                    "attributeId": 0x0000050A,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000001B: {
-                    "attributeName": "TxNoAckRequestedCount",
-                    "attributeId": 0x0000001B,
+                0x0000050B: {
+                    "attributeName": "ActivePower",
+                    "attributeId": 0x0000050B,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000001C: {
-                    "attributeName": "TxDataCount",
-                    "attributeId": 0x0000001C,
+                0x0000050C: {
+                    "attributeName": "ActivePowerMin",
+                    "attributeId": 0x0000050C,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000001D: {
-                    "attributeName": "TxDataPollCount",
-                    "attributeId": 0x0000001D,
+                0x0000050D: {
+                    "attributeName": "ActivePowerMax",
+                    "attributeId": 0x0000050D,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000001E: {
-                    "attributeName": "TxBeaconCount",
-                    "attributeId": 0x0000001E,
+                0x0000FFF8: {
+                    "attributeName": "GeneratedCommandList",
+                    "attributeId": 0x0000FFF8,
                     "type": "int",
                     "reportable": True,
                 },
-                0x0000001F: {
-                    "attributeName": "TxBeaconRequestCount",
-                    "attributeId": 0x0000001F,
+                0x0000FFF9: {
+                    "attributeName": "AcceptedCommandList",
+                    "attributeId": 0x0000FFF9,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000020: {
-                    "attributeName": "TxOtherCount",
-                    "attributeId": 0x00000020,
+                0x0000FFFB: {
+                    "attributeName": "AttributeList",
+                    "attributeId": 0x0000FFFB,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000021: {
-                    "attributeName": "TxRetryCount",
-                    "attributeId": 0x00000021,
+                0x0000FFFC: {
+                    "attributeName": "FeatureMap",
+                    "attributeId": 0x0000FFFC,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000022: {
-                    "attributeName": "TxDirectMaxRetryExpiryCount",
-                    "attributeId": 0x00000022,
+                0x0000FFFD: {
+                    "attributeName": "ClusterRevision",
+                    "attributeId": 0x0000FFFD,
                     "type": "int",
                     "reportable": True,
                 },
-                0x00000023: {
-                    "attributeName": "TxIndirectMaxRetryExpiryCount",
-                    "attributeId": 0x00000023,
-                    "type": "int",
-                    "reportable": True,
+            },
+    }
+    _TEST_CLUSTER_CLUSTER_INFO = {
+            "clusterName": "TestCluster",
+            "clusterId": 0xFFF1FC05,
+            "commands": {
+            0x00000000: {
+                    "commandId": 0x00000000,
+                    "commandName": "Test",
+                    "args": {
+                    },
                 },
-                0x00000024: {
-                    "attributeName": "TxErrCcaCount",
-                    "attributeId": 0x00000024,
-                    "type": "int",
-                    "reportable": True,
+            0x00000001: {
+                    "commandId": 0x00000001,
+                    "commandName": "TestNotHandled",
+                    "args": {
+                    },
                 },
-                0x00000025: {
-                    "attributeName": "TxErrAbortCount",
-                    "attributeId": 0x00000025,
-                    "type": "int",
-                    "reportable": True,
+            0x00000002: {
+                    "commandId": 0x00000002,
+                    "commandName": "TestSpecific",
+                    "args": {
+                    },
                 },
-                0x00000026: {
-                    "attributeName": "TxErrBusyChannelCount",
-                    "attributeId": 0x00000026,
-                    "type": "int",
-                    "reportable": True,
+            0x00000003: {
+                    "commandId": 0x00000003,
+                    "commandName": "TestUnknownCommand",
+                    "args": {
+                    },
                 },
-                0x00000027: {
-                    "attributeName": "RxTotalCount",
-                    "attributeId": 0x00000027,
-                    "type": "int",
-                    "reportable": True,
+            0x00000004: {
+                    "commandId": 0x00000004,
+                    "commandName": "TestAddArguments",
+                    "args": {
+                        "arg1": "int",
+                        "arg2": "int",
+                    },
+                },
+            0x00000007: {
+                    "commandId": 0x00000007,
+                    "commandName": "TestStructArgumentRequest",
+                    "args": {
+                        "a": "int",
+                        "b": "bool",
+                        "c": "int",
+                        "d": "bytes",
+                        "e": "str",
+                        "f": "int",
+                        "g": "",
+                        "h": "",
+                    },
+                },
+            0x00000008: {
+                    "commandId": 0x00000008,
+                    "commandName": "TestNestedStructArgumentRequest",
+                    "args": {
+                        "a": "int",
+                        "b": "bool",
+                        "c": "",
+                    },
+                },
+            0x00000009: {
+                    "commandId": 0x00000009,
+                    "commandName": "TestListStructArgumentRequest",
+                    "args": {
+                        "a": "int",
+                        "b": "bool",
+                        "c": "int",
+                        "d": "bytes",
+                        "e": "str",
+                        "f": "int",
+                        "g": "",
+                        "h": "",
+                    },
+                },
+            0x0000000A: {
+                    "commandId": 0x0000000A,
+                    "commandName": "TestListInt8UArgumentRequest",
+                    "args": {
+                        "arg1": "int",
+                    },
+                },
+            0x0000000B: {
+                    "commandId": 0x0000000B,
+                    "commandName": "TestNestedStructListArgumentRequest",
+                    "args": {
+                        "a": "int",
+                        "b": "bool",
+                        "c": "",
+                        "d": "",
+                        "e": "int",
+                        "f": "bytes",
+                        "g": "int",
+                    },
+                },
+            0x0000000C: {
+                    "commandId": 0x0000000C,
+                    "commandName": "TestListNestedStructListArgumentRequest",
+                    "args": {
+                        "a": "int",
+                        "b": "bool",
+                        "c": "",
+                        "d": "",
+                        "e": "int",
+                        "f": "bytes",
+                        "g": "int",
+                    },
                 },
-                0x00000028: {
-                    "attributeName": "RxUnicastCount",
-                    "attributeId": 0x00000028,
-                    "type": "int",
-                    "reportable": True,
+            0x0000000D: {
+                    "commandId": 0x0000000D,
+                    "commandName": "TestListInt8UReverseRequest",
+                    "args": {
+                        "arg1": "int",
+                    },
                 },
-                0x00000029: {
-                    "attributeName": "RxBroadcastCount",
-                    "attributeId": 0x00000029,
-                    "type": "int",
-                    "reportable": True,
+            0x0000000E: {
+                    "commandId": 0x0000000E,
+                    "commandName": "TestEnumsRequest",
+                    "args": {
+                        "arg1": "int",
+                        "arg2": "int",
+                    },
                 },
-                0x0000002A: {
-                    "attributeName": "RxDataCount",
-                    "attributeId": 0x0000002A,
-                    "type": "int",
-                    "reportable": True,
+            0x0000000F: {
+                    "commandId": 0x0000000F,
+                    "commandName": "TestNullableOptionalRequest",
+                    "args": {
+                        "arg1": "int",
+                    },
                 },
-                0x0000002B: {
-                    "attributeName": "RxDataPollCount",
-                    "attributeId": 0x0000002B,
-                    "type": "int",
-                    "reportable": True,
+            0x00000011: {
+                    "commandId": 0x00000011,
+                    "commandName": "SimpleStructEchoRequest",
+                    "args": {
+                        "a": "int",
+                        "b": "bool",
+                        "c": "int",
+                        "d": "bytes",
+                        "e": "str",
+                        "f": "int",
+                        "g": "",
+                        "h": "",
+                    },
                 },
-                0x0000002C: {
-                    "attributeName": "RxBeaconCount",
-                    "attributeId": 0x0000002C,
-                    "type": "int",
-                    "reportable": True,
+            0x00000012: {
+                    "commandId": 0x00000012,
+                    "commandName": "TimedInvokeRequest",
+                    "args": {
+                    },
                 },
-                0x0000002D: {
-                    "attributeName": "RxBeaconRequestCount",
-                    "attributeId": 0x0000002D,
-                    "type": "int",
-                    "reportable": True,
+            0x00000013: {
+                    "commandId": 0x00000013,
+                    "commandName": "TestSimpleOptionalArgumentRequest",
+                    "args": {
+                        "arg1": "bool",
+                    },
                 },
-                0x0000002E: {
-                    "attributeName": "RxOtherCount",
-                    "attributeId": 0x0000002E,
-                    "type": "int",
-                    "reportable": True,
+            0x00000014: {
+                    "commandId": 0x00000014,
+                    "commandName": "TestEmitTestEventRequest",
+                    "args": {
+                        "arg1": "int",
+                        "arg2": "int",
+                        "arg3": "bool",
+                    },
                 },
-                0x0000002F: {
-                    "attributeName": "RxAddressFilteredCount",
-                    "attributeId": 0x0000002F,
-                    "type": "int",
+            },
+            "attributes": {
+                0x00000000: {
+                    "attributeName": "Boolean",
+                    "attributeId": 0x00000000,
+                    "type": "bool",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000030: {
-                    "attributeName": "RxDestAddrFilteredCount",
-                    "attributeId": 0x00000030,
+                0x00000001: {
+                    "attributeName": "Bitmap8",
+                    "attributeId": 0x00000001,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000031: {
-                    "attributeName": "RxDuplicatedCount",
-                    "attributeId": 0x00000031,
+                0x00000002: {
+                    "attributeName": "Bitmap16",
+                    "attributeId": 0x00000002,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000032: {
-                    "attributeName": "RxErrNoFrameCount",
-                    "attributeId": 0x00000032,
+                0x00000003: {
+                    "attributeName": "Bitmap32",
+                    "attributeId": 0x00000003,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000033: {
-                    "attributeName": "RxErrUnknownNeighborCount",
-                    "attributeId": 0x00000033,
+                0x00000004: {
+                    "attributeName": "Bitmap64",
+                    "attributeId": 0x00000004,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000034: {
-                    "attributeName": "RxErrInvalidSrcAddrCount",
-                    "attributeId": 0x00000034,
+                0x00000005: {
+                    "attributeName": "Int8u",
+                    "attributeId": 0x00000005,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000035: {
-                    "attributeName": "RxErrSecCount",
-                    "attributeId": 0x00000035,
+                0x00000006: {
+                    "attributeName": "Int16u",
+                    "attributeId": 0x00000006,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000036: {
-                    "attributeName": "RxErrFcsCount",
-                    "attributeId": 0x00000036,
+                0x00000007: {
+                    "attributeName": "Int24u",
+                    "attributeId": 0x00000007,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000037: {
-                    "attributeName": "RxErrOtherCount",
-                    "attributeId": 0x00000037,
+                0x00000008: {
+                    "attributeName": "Int32u",
+                    "attributeId": 0x00000008,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000038: {
-                    "attributeName": "ActiveTimestamp",
-                    "attributeId": 0x00000038,
+                0x00000009: {
+                    "attributeName": "Int40u",
+                    "attributeId": 0x00000009,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000039: {
-                    "attributeName": "PendingTimestamp",
-                    "attributeId": 0x00000039,
+                0x0000000A: {
+                    "attributeName": "Int48u",
+                    "attributeId": 0x0000000A,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000003A: {
-                    "attributeName": "Delay",
-                    "attributeId": 0x0000003A,
+                0x0000000B: {
+                    "attributeName": "Int56u",
+                    "attributeId": 0x0000000B,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000003B: {
-                    "attributeName": "SecurityPolicy",
-                    "attributeId": 0x0000003B,
-                    "type": "",
-                    "reportable": True,
-                },
-                0x0000003C: {
-                    "attributeName": "ChannelMask",
-                    "attributeId": 0x0000003C,
-                    "type": "bytes",
-                    "reportable": True,
-                },
-                0x0000003D: {
-                    "attributeName": "OperationalDatasetComponents",
-                    "attributeId": 0x0000003D,
-                    "type": "",
+                0x0000000C: {
+                    "attributeName": "Int64u",
+                    "attributeId": 0x0000000C,
+                    "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000003E: {
-                    "attributeName": "ActiveNetworkFaultsList",
-                    "attributeId": 0x0000003E,
+                0x0000000D: {
+                    "attributeName": "Int8s",
+                    "attributeId": 0x0000000D,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFF8: {
-                    "attributeName": "GeneratedCommandList",
-                    "attributeId": 0x0000FFF8,
+                0x0000000E: {
+                    "attributeName": "Int16s",
+                    "attributeId": 0x0000000E,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFF9: {
-                    "attributeName": "AcceptedCommandList",
-                    "attributeId": 0x0000FFF9,
+                0x0000000F: {
+                    "attributeName": "Int24s",
+                    "attributeId": 0x0000000F,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFFB: {
-                    "attributeName": "AttributeList",
-                    "attributeId": 0x0000FFFB,
+                0x00000010: {
+                    "attributeName": "Int32s",
+                    "attributeId": 0x00000010,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
+                0x00000011: {
+                    "attributeName": "Int40s",
+                    "attributeId": 0x00000011,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
+                0x00000012: {
+                    "attributeName": "Int48s",
+                    "attributeId": 0x00000012,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-            },
-    }
-    _TIME_FORMAT_LOCALIZATION_CLUSTER_INFO = {
-            "clusterName": "TimeFormatLocalization",
-            "clusterId": 0x0000002C,
-            "commands": {
-            },
-            "attributes": {
-                0x00000000: {
-                    "attributeName": "HourFormat",
-                    "attributeId": 0x00000000,
+                0x00000013: {
+                    "attributeName": "Int56s",
+                    "attributeId": 0x00000013,
                     "type": "int",
                     "reportable": True,
                     "writable": True,
                 },
-                0x00000001: {
-                    "attributeName": "ActiveCalendarType",
-                    "attributeId": 0x00000001,
+                0x00000014: {
+                    "attributeName": "Int64s",
+                    "attributeId": 0x00000014,
                     "type": "int",
                     "reportable": True,
                     "writable": True,
                 },
-                0x00000002: {
-                    "attributeName": "SupportedCalendarTypes",
-                    "attributeId": 0x00000002,
+                0x00000015: {
+                    "attributeName": "Enum8",
+                    "attributeId": 0x00000015,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFF8: {
-                    "attributeName": "GeneratedCommandList",
-                    "attributeId": 0x0000FFF8,
+                0x00000016: {
+                    "attributeName": "Enum16",
+                    "attributeId": 0x00000016,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFF9: {
-                    "attributeName": "AcceptedCommandList",
-                    "attributeId": 0x0000FFF9,
-                    "type": "int",
+                0x00000017: {
+                    "attributeName": "FloatSingle",
+                    "attributeId": 0x00000017,
+                    "type": "",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
-                    "type": "int",
+                0x00000018: {
+                    "attributeName": "FloatDouble",
+                    "attributeId": 0x00000018,
+                    "type": "",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
-                    "type": "int",
+                0x00000019: {
+                    "attributeName": "OctetString",
+                    "attributeId": 0x00000019,
+                    "type": "bytes",
                     "reportable": True,
+                    "writable": True,
                 },
-            },
-    }
-    _UNIT_LOCALIZATION_CLUSTER_INFO = {
-            "clusterName": "UnitLocalization",
-            "clusterId": 0x0000002D,
-            "commands": {
-            },
-            "attributes": {
-                0x00000000: {
-                    "attributeName": "TemperatureUnit",
-                    "attributeId": 0x00000000,
+                0x0000001A: {
+                    "attributeName": "ListInt8u",
+                    "attributeId": 0x0000001A,
                     "type": "int",
                     "reportable": True,
                     "writable": True,
                 },
-                0x0000FFFB: {
-                    "attributeName": "AttributeList",
-                    "attributeId": 0x0000FFFB,
-                    "type": "int",
+                0x0000001B: {
+                    "attributeName": "ListOctetString",
+                    "attributeId": 0x0000001B,
+                    "type": "bytes",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
-                    "type": "int",
+                0x0000001C: {
+                    "attributeName": "ListStructOctetString",
+                    "attributeId": 0x0000001C,
+                    "type": "",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
-                    "type": "int",
+                0x0000001D: {
+                    "attributeName": "LongOctetString",
+                    "attributeId": 0x0000001D,
+                    "type": "bytes",
                     "reportable": True,
+                    "writable": True,
                 },
-            },
-    }
-    _USER_LABEL_CLUSTER_INFO = {
-            "clusterName": "UserLabel",
-            "clusterId": 0x00000041,
-            "commands": {
-            },
-            "attributes": {
-                0x00000000: {
-                    "attributeName": "LabelList",
-                    "attributeId": 0x00000000,
-                    "type": "",
+                0x0000001E: {
+                    "attributeName": "CharString",
+                    "attributeId": 0x0000001E,
+                    "type": "str",
                     "reportable": True,
                     "writable": True,
                 },
-                0x0000FFF8: {
-                    "attributeName": "GeneratedCommandList",
-                    "attributeId": 0x0000FFF8,
-                    "type": "int",
+                0x0000001F: {
+                    "attributeName": "LongCharString",
+                    "attributeId": 0x0000001F,
+                    "type": "str",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFF9: {
-                    "attributeName": "AcceptedCommandList",
-                    "attributeId": 0x0000FFF9,
+                0x00000020: {
+                    "attributeName": "EpochUs",
+                    "attributeId": 0x00000020,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
+                0x00000021: {
+                    "attributeName": "EpochS",
+                    "attributeId": 0x00000021,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
+                0x00000022: {
+                    "attributeName": "VendorId",
+                    "attributeId": 0x00000022,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-            },
-    }
-    _WAKE_ON_LAN_CLUSTER_INFO = {
-            "clusterName": "WakeOnLan",
-            "clusterId": 0x00000503,
-            "commands": {
-            },
-            "attributes": {
-                0x00000000: {
-                    "attributeName": "MACAddress",
-                    "attributeId": 0x00000000,
-                    "type": "str",
+                0x00000023: {
+                    "attributeName": "ListNullablesAndOptionalsStruct",
+                    "attributeId": 0x00000023,
+                    "type": "",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFF8: {
-                    "attributeName": "GeneratedCommandList",
-                    "attributeId": 0x0000FFF8,
+                0x00000024: {
+                    "attributeName": "EnumAttr",
+                    "attributeId": 0x00000024,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFF9: {
-                    "attributeName": "AcceptedCommandList",
-                    "attributeId": 0x0000FFF9,
-                    "type": "int",
+                0x00000025: {
+                    "attributeName": "StructAttr",
+                    "attributeId": 0x00000025,
+                    "type": "",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFFB: {
-                    "attributeName": "AttributeList",
-                    "attributeId": 0x0000FFFB,
+                0x00000026: {
+                    "attributeName": "RangeRestrictedInt8u",
+                    "attributeId": 0x00000026,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
+                0x00000027: {
+                    "attributeName": "RangeRestrictedInt8s",
+                    "attributeId": 0x00000027,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
+                0x00000028: {
+                    "attributeName": "RangeRestrictedInt16u",
+                    "attributeId": 0x00000028,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-            },
-    }
-    _WI_FI_NETWORK_DIAGNOSTICS_CLUSTER_INFO = {
-            "clusterName": "WiFiNetworkDiagnostics",
-            "clusterId": 0x00000036,
-            "commands": {
-            0x00000000: {
-                    "commandId": 0x00000000,
-                    "commandName": "ResetCounts",
-                    "args": {
-                    },
-                },
-            },
-            "attributes": {
-                0x00000000: {
-                    "attributeName": "Bssid",
-                    "attributeId": 0x00000000,
-                    "type": "bytes",
+                0x00000029: {
+                    "attributeName": "RangeRestrictedInt16s",
+                    "attributeId": 0x00000029,
+                    "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000001: {
-                    "attributeName": "SecurityType",
-                    "attributeId": 0x00000001,
-                    "type": "int",
+                0x0000002A: {
+                    "attributeName": "ListLongOctetString",
+                    "attributeId": 0x0000002A,
+                    "type": "bytes",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000002: {
-                    "attributeName": "WiFiVersion",
-                    "attributeId": 0x00000002,
-                    "type": "int",
+                0x0000002B: {
+                    "attributeName": "ListFabricScoped",
+                    "attributeId": 0x0000002B,
+                    "type": "",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000003: {
-                    "attributeName": "ChannelNumber",
-                    "attributeId": 0x00000003,
-                    "type": "int",
+                0x00000030: {
+                    "attributeName": "TimedWriteBoolean",
+                    "attributeId": 0x00000030,
+                    "type": "bool",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000004: {
-                    "attributeName": "Rssi",
-                    "attributeId": 0x00000004,
-                    "type": "int",
+                0x00000031: {
+                    "attributeName": "GeneralErrorBoolean",
+                    "attributeId": 0x00000031,
+                    "type": "bool",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000005: {
-                    "attributeName": "BeaconLostCount",
-                    "attributeId": 0x00000005,
-                    "type": "int",
+                0x00000032: {
+                    "attributeName": "ClusterErrorBoolean",
+                    "attributeId": 0x00000032,
+                    "type": "bool",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000006: {
-                    "attributeName": "BeaconRxCount",
-                    "attributeId": 0x00000006,
-                    "type": "int",
+                0x000000FF: {
+                    "attributeName": "Unsupported",
+                    "attributeId": 0x000000FF,
+                    "type": "bool",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000007: {
-                    "attributeName": "PacketMulticastRxCount",
-                    "attributeId": 0x00000007,
-                    "type": "int",
+                0x00004000: {
+                    "attributeName": "NullableBoolean",
+                    "attributeId": 0x00004000,
+                    "type": "bool",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000008: {
-                    "attributeName": "PacketMulticastTxCount",
-                    "attributeId": 0x00000008,
+                0x00004001: {
+                    "attributeName": "NullableBitmap8",
+                    "attributeId": 0x00004001,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000009: {
-                    "attributeName": "PacketUnicastRxCount",
-                    "attributeId": 0x00000009,
+                0x00004002: {
+                    "attributeName": "NullableBitmap16",
+                    "attributeId": 0x00004002,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000000A: {
-                    "attributeName": "PacketUnicastTxCount",
-                    "attributeId": 0x0000000A,
+                0x00004003: {
+                    "attributeName": "NullableBitmap32",
+                    "attributeId": 0x00004003,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000000B: {
-                    "attributeName": "CurrentMaxRate",
-                    "attributeId": 0x0000000B,
+                0x00004004: {
+                    "attributeName": "NullableBitmap64",
+                    "attributeId": 0x00004004,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000000C: {
-                    "attributeName": "OverrunCount",
-                    "attributeId": 0x0000000C,
+                0x00004005: {
+                    "attributeName": "NullableInt8u",
+                    "attributeId": 0x00004005,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFF8: {
-                    "attributeName": "GeneratedCommandList",
-                    "attributeId": 0x0000FFF8,
+                0x00004006: {
+                    "attributeName": "NullableInt16u",
+                    "attributeId": 0x00004006,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFF9: {
-                    "attributeName": "AcceptedCommandList",
-                    "attributeId": 0x0000FFF9,
+                0x00004007: {
+                    "attributeName": "NullableInt24u",
+                    "attributeId": 0x00004007,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFFB: {
-                    "attributeName": "AttributeList",
-                    "attributeId": 0x0000FFFB,
+                0x00004008: {
+                    "attributeName": "NullableInt32u",
+                    "attributeId": 0x00004008,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFFC: {
-                    "attributeName": "FeatureMap",
-                    "attributeId": 0x0000FFFC,
+                0x00004009: {
+                    "attributeName": "NullableInt40u",
+                    "attributeId": 0x00004009,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000FFFD: {
-                    "attributeName": "ClusterRevision",
-                    "attributeId": 0x0000FFFD,
+                0x0000400A: {
+                    "attributeName": "NullableInt48u",
+                    "attributeId": 0x0000400A,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-            },
-    }
-    _WINDOW_COVERING_CLUSTER_INFO = {
-            "clusterName": "WindowCovering",
-            "clusterId": 0x00000102,
-            "commands": {
-            0x00000001: {
-                    "commandId": 0x00000001,
-                    "commandName": "DownOrClose",
-                    "args": {
-                    },
-                },
-            0x00000005: {
-                    "commandId": 0x00000005,
-                    "commandName": "GoToLiftPercentage",
-                    "args": {
-                        "liftPercent100thsValue": "int",
-                    },
-                },
-            0x00000004: {
-                    "commandId": 0x00000004,
-                    "commandName": "GoToLiftValue",
-                    "args": {
-                        "liftValue": "int",
-                    },
-                },
-            0x00000008: {
-                    "commandId": 0x00000008,
-                    "commandName": "GoToTiltPercentage",
-                    "args": {
-                        "tiltPercent100thsValue": "int",
-                    },
-                },
-            0x00000007: {
-                    "commandId": 0x00000007,
-                    "commandName": "GoToTiltValue",
-                    "args": {
-                        "tiltValue": "int",
-                    },
-                },
-            0x00000002: {
-                    "commandId": 0x00000002,
-                    "commandName": "StopMotion",
-                    "args": {
-                    },
-                },
-            0x00000000: {
-                    "commandId": 0x00000000,
-                    "commandName": "UpOrOpen",
-                    "args": {
-                    },
-                },
-            },
-            "attributes": {
-                0x00000000: {
-                    "attributeName": "Type",
-                    "attributeId": 0x00000000,
+                0x0000400B: {
+                    "attributeName": "NullableInt56u",
+                    "attributeId": 0x0000400B,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000001: {
-                    "attributeName": "PhysicalClosedLimitLift",
-                    "attributeId": 0x00000001,
+                0x0000400C: {
+                    "attributeName": "NullableInt64u",
+                    "attributeId": 0x0000400C,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000002: {
-                    "attributeName": "PhysicalClosedLimitTilt",
-                    "attributeId": 0x00000002,
+                0x0000400D: {
+                    "attributeName": "NullableInt8s",
+                    "attributeId": 0x0000400D,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000003: {
-                    "attributeName": "CurrentPositionLift",
-                    "attributeId": 0x00000003,
+                0x0000400E: {
+                    "attributeName": "NullableInt16s",
+                    "attributeId": 0x0000400E,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000004: {
-                    "attributeName": "CurrentPositionTilt",
-                    "attributeId": 0x00000004,
+                0x0000400F: {
+                    "attributeName": "NullableInt24s",
+                    "attributeId": 0x0000400F,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000005: {
-                    "attributeName": "NumberOfActuationsLift",
-                    "attributeId": 0x00000005,
+                0x00004010: {
+                    "attributeName": "NullableInt32s",
+                    "attributeId": 0x00004010,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000006: {
-                    "attributeName": "NumberOfActuationsTilt",
-                    "attributeId": 0x00000006,
+                0x00004011: {
+                    "attributeName": "NullableInt40s",
+                    "attributeId": 0x00004011,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000007: {
-                    "attributeName": "ConfigStatus",
-                    "attributeId": 0x00000007,
+                0x00004012: {
+                    "attributeName": "NullableInt48s",
+                    "attributeId": 0x00004012,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000008: {
-                    "attributeName": "CurrentPositionLiftPercentage",
-                    "attributeId": 0x00000008,
+                0x00004013: {
+                    "attributeName": "NullableInt56s",
+                    "attributeId": 0x00004013,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000009: {
-                    "attributeName": "CurrentPositionTiltPercentage",
-                    "attributeId": 0x00000009,
+                0x00004014: {
+                    "attributeName": "NullableInt64s",
+                    "attributeId": 0x00004014,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000000A: {
-                    "attributeName": "OperationalStatus",
-                    "attributeId": 0x0000000A,
+                0x00004015: {
+                    "attributeName": "NullableEnum8",
+                    "attributeId": 0x00004015,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000000B: {
-                    "attributeName": "TargetPositionLiftPercent100ths",
-                    "attributeId": 0x0000000B,
+                0x00004016: {
+                    "attributeName": "NullableEnum16",
+                    "attributeId": 0x00004016,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000000C: {
-                    "attributeName": "TargetPositionTiltPercent100ths",
-                    "attributeId": 0x0000000C,
-                    "type": "int",
+                0x00004017: {
+                    "attributeName": "NullableFloatSingle",
+                    "attributeId": 0x00004017,
+                    "type": "",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000000D: {
-                    "attributeName": "EndProductType",
-                    "attributeId": 0x0000000D,
-                    "type": "int",
+                0x00004018: {
+                    "attributeName": "NullableFloatDouble",
+                    "attributeId": 0x00004018,
+                    "type": "",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000000E: {
-                    "attributeName": "CurrentPositionLiftPercent100ths",
-                    "attributeId": 0x0000000E,
-                    "type": "int",
+                0x00004019: {
+                    "attributeName": "NullableOctetString",
+                    "attributeId": 0x00004019,
+                    "type": "bytes",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x0000000F: {
-                    "attributeName": "CurrentPositionTiltPercent100ths",
-                    "attributeId": 0x0000000F,
-                    "type": "int",
+                0x0000401E: {
+                    "attributeName": "NullableCharString",
+                    "attributeId": 0x0000401E,
+                    "type": "str",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000010: {
-                    "attributeName": "InstalledOpenLimitLift",
-                    "attributeId": 0x00000010,
+                0x00004024: {
+                    "attributeName": "NullableEnumAttr",
+                    "attributeId": 0x00004024,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000011: {
-                    "attributeName": "InstalledClosedLimitLift",
-                    "attributeId": 0x00000011,
-                    "type": "int",
+                0x00004025: {
+                    "attributeName": "NullableStruct",
+                    "attributeId": 0x00004025,
+                    "type": "",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000012: {
-                    "attributeName": "InstalledOpenLimitTilt",
-                    "attributeId": 0x00000012,
+                0x00004026: {
+                    "attributeName": "NullableRangeRestrictedInt8u",
+                    "attributeId": 0x00004026,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000013: {
-                    "attributeName": "InstalledClosedLimitTilt",
-                    "attributeId": 0x00000013,
+                0x00004027: {
+                    "attributeName": "NullableRangeRestrictedInt8s",
+                    "attributeId": 0x00004027,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
-                0x00000017: {
-                    "attributeName": "Mode",
-                    "attributeId": 0x00000017,
+                0x00004028: {
+                    "attributeName": "NullableRangeRestrictedInt16u",
+                    "attributeId": 0x00004028,
                     "type": "int",
                     "reportable": True,
                     "writable": True,
                 },
-                0x0000001A: {
-                    "attributeName": "SafetyStatus",
-                    "attributeId": 0x0000001A,
+                0x00004029: {
+                    "attributeName": "NullableRangeRestrictedInt16s",
+                    "attributeId": 0x00004029,
                     "type": "int",
                     "reportable": True,
+                    "writable": True,
                 },
                 0x0000FFF8: {
                     "attributeName": "GeneratedCommandList",
@@ -7366,137 +7366,137 @@ class ChipClusters:
     }
 
     _CLUSTER_ID_DICT = {
-    0x0000001F: _ACCESS_CONTROL_CLUSTER_INFO,
-    0x0000050E: _ACCOUNT_LOGIN_CLUSTER_INFO,
-    0x0000003C: _ADMINISTRATOR_COMMISSIONING_CLUSTER_INFO,
-    0x0000050D: _APPLICATION_BASIC_CLUSTER_INFO,
-    0x0000050C: _APPLICATION_LAUNCHER_CLUSTER_INFO,
-    0x0000050B: _AUDIO_OUTPUT_CLUSTER_INFO,
-    0x00000103: _BARRIER_CONTROL_CLUSTER_INFO,
-    0x00000028: _BASIC_CLUSTER_INFO,
+    0x00000003: _IDENTIFY_CLUSTER_INFO,
+    0x00000004: _GROUPS_CLUSTER_INFO,
+    0x00000005: _SCENES_CLUSTER_INFO,
+    0x00000006: _ON_OFF_CLUSTER_INFO,
+    0x00000007: _ON_OFF_SWITCH_CONFIGURATION_CLUSTER_INFO,
+    0x00000008: _LEVEL_CONTROL_CLUSTER_INFO,
     0x0000000F: _BINARY_INPUT_BASIC_CLUSTER_INFO,
+    0x0000001D: _DESCRIPTOR_CLUSTER_INFO,
     0x0000001E: _BINDING_CLUSTER_INFO,
-    0x00000045: _BOOLEAN_STATE_CLUSTER_INFO,
+    0x0000001F: _ACCESS_CONTROL_CLUSTER_INFO,
     0x00000025: _BRIDGED_ACTIONS_CLUSTER_INFO,
-    0x00000039: _BRIDGED_DEVICE_BASIC_CLUSTER_INFO,
-    0x00000504: _CHANNEL_CLUSTER_INFO,
-    0x00000300: _COLOR_CONTROL_CLUSTER_INFO,
-    0x0000050A: _CONTENT_LAUNCHER_CLUSTER_INFO,
-    0x0000001D: _DESCRIPTOR_CLUSTER_INFO,
-    0x00000032: _DIAGNOSTIC_LOGS_CLUSTER_INFO,
-    0x00000101: _DOOR_LOCK_CLUSTER_INFO,
-    0x00000B04: _ELECTRICAL_MEASUREMENT_CLUSTER_INFO,
-    0x00000037: _ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_INFO,
-    0x00000202: _FAN_CONTROL_CLUSTER_INFO,
-    0x00000040: _FIXED_LABEL_CLUSTER_INFO,
-    0x00000404: _FLOW_MEASUREMENT_CLUSTER_INFO,
-    0x00000030: _GENERAL_COMMISSIONING_CLUSTER_INFO,
-    0x00000033: _GENERAL_DIAGNOSTICS_CLUSTER_INFO,
-    0x0000003F: _GROUP_KEY_MANAGEMENT_CLUSTER_INFO,
-    0x00000004: _GROUPS_CLUSTER_INFO,
-    0x00000003: _IDENTIFY_CLUSTER_INFO,
-    0x00000400: _ILLUMINANCE_MEASUREMENT_CLUSTER_INFO,
-    0x00000509: _KEYPAD_INPUT_CLUSTER_INFO,
-    0x00000008: _LEVEL_CONTROL_CLUSTER_INFO,
-    0x0000002B: _LOCALIZATION_CONFIGURATION_CLUSTER_INFO,
-    0x00000508: _LOW_POWER_CLUSTER_INFO,
-    0x00000507: _MEDIA_INPUT_CLUSTER_INFO,
-    0x00000506: _MEDIA_PLAYBACK_CLUSTER_INFO,
-    0x00000050: _MODE_SELECT_CLUSTER_INFO,
-    0x00000031: _NETWORK_COMMISSIONING_CLUSTER_INFO,
+    0x00000028: _BASIC_CLUSTER_INFO,
     0x00000029: _OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_INFO,
     0x0000002A: _OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_INFO,
-    0x00000406: _OCCUPANCY_SENSING_CLUSTER_INFO,
-    0x00000006: _ON_OFF_CLUSTER_INFO,
-    0x00000007: _ON_OFF_SWITCH_CONFIGURATION_CLUSTER_INFO,
-    0x0000003E: _OPERATIONAL_CREDENTIALS_CLUSTER_INFO,
-    0x0000002F: _POWER_SOURCE_CLUSTER_INFO,
+    0x0000002B: _LOCALIZATION_CONFIGURATION_CLUSTER_INFO,
+    0x0000002C: _TIME_FORMAT_LOCALIZATION_CLUSTER_INFO,
+    0x0000002D: _UNIT_LOCALIZATION_CLUSTER_INFO,
     0x0000002E: _POWER_SOURCE_CONFIGURATION_CLUSTER_INFO,
-    0x00000403: _PRESSURE_MEASUREMENT_CLUSTER_INFO,
-    0x00000200: _PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_INFO,
-    0x00000405: _RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_INFO,
-    0x00000005: _SCENES_CLUSTER_INFO,
+    0x0000002F: _POWER_SOURCE_CLUSTER_INFO,
+    0x00000030: _GENERAL_COMMISSIONING_CLUSTER_INFO,
+    0x00000031: _NETWORK_COMMISSIONING_CLUSTER_INFO,
+    0x00000032: _DIAGNOSTIC_LOGS_CLUSTER_INFO,
+    0x00000033: _GENERAL_DIAGNOSTICS_CLUSTER_INFO,
     0x00000034: _SOFTWARE_DIAGNOSTICS_CLUSTER_INFO,
+    0x00000035: _THREAD_NETWORK_DIAGNOSTICS_CLUSTER_INFO,
+    0x00000036: _WI_FI_NETWORK_DIAGNOSTICS_CLUSTER_INFO,
+    0x00000037: _ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_INFO,
+    0x00000039: _BRIDGED_DEVICE_BASIC_CLUSTER_INFO,
     0x0000003B: _SWITCH_CLUSTER_INFO,
-    0x00000505: _TARGET_NAVIGATOR_CLUSTER_INFO,
-    0x00000402: _TEMPERATURE_MEASUREMENT_CLUSTER_INFO,
-    0xFFF1FC05: _TEST_CLUSTER_CLUSTER_INFO,
+    0x0000003C: _ADMINISTRATOR_COMMISSIONING_CLUSTER_INFO,
+    0x0000003E: _OPERATIONAL_CREDENTIALS_CLUSTER_INFO,
+    0x0000003F: _GROUP_KEY_MANAGEMENT_CLUSTER_INFO,
+    0x00000040: _FIXED_LABEL_CLUSTER_INFO,
+    0x00000041: _USER_LABEL_CLUSTER_INFO,
+    0x00000045: _BOOLEAN_STATE_CLUSTER_INFO,
+    0x00000050: _MODE_SELECT_CLUSTER_INFO,
+    0x00000101: _DOOR_LOCK_CLUSTER_INFO,
+    0x00000102: _WINDOW_COVERING_CLUSTER_INFO,
+    0x00000103: _BARRIER_CONTROL_CLUSTER_INFO,
+    0x00000200: _PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_INFO,
     0x00000201: _THERMOSTAT_CLUSTER_INFO,
+    0x00000202: _FAN_CONTROL_CLUSTER_INFO,
     0x00000204: _THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_INFO,
-    0x00000035: _THREAD_NETWORK_DIAGNOSTICS_CLUSTER_INFO,
-    0x0000002C: _TIME_FORMAT_LOCALIZATION_CLUSTER_INFO,
-    0x0000002D: _UNIT_LOCALIZATION_CLUSTER_INFO,
-    0x00000041: _USER_LABEL_CLUSTER_INFO,
+    0x00000300: _COLOR_CONTROL_CLUSTER_INFO,
+    0x00000400: _ILLUMINANCE_MEASUREMENT_CLUSTER_INFO,
+    0x00000402: _TEMPERATURE_MEASUREMENT_CLUSTER_INFO,
+    0x00000403: _PRESSURE_MEASUREMENT_CLUSTER_INFO,
+    0x00000404: _FLOW_MEASUREMENT_CLUSTER_INFO,
+    0x00000405: _RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_INFO,
+    0x00000406: _OCCUPANCY_SENSING_CLUSTER_INFO,
     0x00000503: _WAKE_ON_LAN_CLUSTER_INFO,
-    0x00000036: _WI_FI_NETWORK_DIAGNOSTICS_CLUSTER_INFO,
-    0x00000102: _WINDOW_COVERING_CLUSTER_INFO,
+    0x00000504: _CHANNEL_CLUSTER_INFO,
+    0x00000505: _TARGET_NAVIGATOR_CLUSTER_INFO,
+    0x00000506: _MEDIA_PLAYBACK_CLUSTER_INFO,
+    0x00000507: _MEDIA_INPUT_CLUSTER_INFO,
+    0x00000508: _LOW_POWER_CLUSTER_INFO,
+    0x00000509: _KEYPAD_INPUT_CLUSTER_INFO,
+    0x0000050A: _CONTENT_LAUNCHER_CLUSTER_INFO,
+    0x0000050B: _AUDIO_OUTPUT_CLUSTER_INFO,
+    0x0000050C: _APPLICATION_LAUNCHER_CLUSTER_INFO,
+    0x0000050D: _APPLICATION_BASIC_CLUSTER_INFO,
+    0x0000050E: _ACCOUNT_LOGIN_CLUSTER_INFO,
+    0x00000B04: _ELECTRICAL_MEASUREMENT_CLUSTER_INFO,
+    0xFFF1FC05: _TEST_CLUSTER_CLUSTER_INFO,
     }
 
     _CLUSTER_NAME_DICT = {
-        "AccessControl": _ACCESS_CONTROL_CLUSTER_INFO,
-        "AccountLogin": _ACCOUNT_LOGIN_CLUSTER_INFO,
-        "AdministratorCommissioning": _ADMINISTRATOR_COMMISSIONING_CLUSTER_INFO,
-        "ApplicationBasic": _APPLICATION_BASIC_CLUSTER_INFO,
-        "ApplicationLauncher": _APPLICATION_LAUNCHER_CLUSTER_INFO,
-        "AudioOutput": _AUDIO_OUTPUT_CLUSTER_INFO,
-        "BarrierControl": _BARRIER_CONTROL_CLUSTER_INFO,
-        "Basic": _BASIC_CLUSTER_INFO,
+        "Identify": _IDENTIFY_CLUSTER_INFO,
+        "Groups": _GROUPS_CLUSTER_INFO,
+        "Scenes": _SCENES_CLUSTER_INFO,
+        "OnOff": _ON_OFF_CLUSTER_INFO,
+        "OnOffSwitchConfiguration": _ON_OFF_SWITCH_CONFIGURATION_CLUSTER_INFO,
+        "LevelControl": _LEVEL_CONTROL_CLUSTER_INFO,
         "BinaryInputBasic": _BINARY_INPUT_BASIC_CLUSTER_INFO,
+        "Descriptor": _DESCRIPTOR_CLUSTER_INFO,
         "Binding": _BINDING_CLUSTER_INFO,
-        "BooleanState": _BOOLEAN_STATE_CLUSTER_INFO,
+        "AccessControl": _ACCESS_CONTROL_CLUSTER_INFO,
         "BridgedActions": _BRIDGED_ACTIONS_CLUSTER_INFO,
-        "BridgedDeviceBasic": _BRIDGED_DEVICE_BASIC_CLUSTER_INFO,
-        "Channel": _CHANNEL_CLUSTER_INFO,
-        "ColorControl": _COLOR_CONTROL_CLUSTER_INFO,
-        "ContentLauncher": _CONTENT_LAUNCHER_CLUSTER_INFO,
-        "Descriptor": _DESCRIPTOR_CLUSTER_INFO,
-        "DiagnosticLogs": _DIAGNOSTIC_LOGS_CLUSTER_INFO,
-        "DoorLock": _DOOR_LOCK_CLUSTER_INFO,
-        "ElectricalMeasurement": _ELECTRICAL_MEASUREMENT_CLUSTER_INFO,
-        "EthernetNetworkDiagnostics": _ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_INFO,
-        "FanControl": _FAN_CONTROL_CLUSTER_INFO,
-        "FixedLabel": _FIXED_LABEL_CLUSTER_INFO,
-        "FlowMeasurement": _FLOW_MEASUREMENT_CLUSTER_INFO,
-        "GeneralCommissioning": _GENERAL_COMMISSIONING_CLUSTER_INFO,
-        "GeneralDiagnostics": _GENERAL_DIAGNOSTICS_CLUSTER_INFO,
-        "GroupKeyManagement": _GROUP_KEY_MANAGEMENT_CLUSTER_INFO,
-        "Groups": _GROUPS_CLUSTER_INFO,
-        "Identify": _IDENTIFY_CLUSTER_INFO,
-        "IlluminanceMeasurement": _ILLUMINANCE_MEASUREMENT_CLUSTER_INFO,
-        "KeypadInput": _KEYPAD_INPUT_CLUSTER_INFO,
-        "LevelControl": _LEVEL_CONTROL_CLUSTER_INFO,
-        "LocalizationConfiguration": _LOCALIZATION_CONFIGURATION_CLUSTER_INFO,
-        "LowPower": _LOW_POWER_CLUSTER_INFO,
-        "MediaInput": _MEDIA_INPUT_CLUSTER_INFO,
-        "MediaPlayback": _MEDIA_PLAYBACK_CLUSTER_INFO,
-        "ModeSelect": _MODE_SELECT_CLUSTER_INFO,
-        "NetworkCommissioning": _NETWORK_COMMISSIONING_CLUSTER_INFO,
+        "Basic": _BASIC_CLUSTER_INFO,
         "OtaSoftwareUpdateProvider": _OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_INFO,
         "OtaSoftwareUpdateRequestor": _OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_INFO,
-        "OccupancySensing": _OCCUPANCY_SENSING_CLUSTER_INFO,
-        "OnOff": _ON_OFF_CLUSTER_INFO,
-        "OnOffSwitchConfiguration": _ON_OFF_SWITCH_CONFIGURATION_CLUSTER_INFO,
-        "OperationalCredentials": _OPERATIONAL_CREDENTIALS_CLUSTER_INFO,
-        "PowerSource": _POWER_SOURCE_CLUSTER_INFO,
+        "LocalizationConfiguration": _LOCALIZATION_CONFIGURATION_CLUSTER_INFO,
+        "TimeFormatLocalization": _TIME_FORMAT_LOCALIZATION_CLUSTER_INFO,
+        "UnitLocalization": _UNIT_LOCALIZATION_CLUSTER_INFO,
         "PowerSourceConfiguration": _POWER_SOURCE_CONFIGURATION_CLUSTER_INFO,
-        "PressureMeasurement": _PRESSURE_MEASUREMENT_CLUSTER_INFO,
-        "PumpConfigurationAndControl": _PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_INFO,
-        "RelativeHumidityMeasurement": _RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_INFO,
-        "Scenes": _SCENES_CLUSTER_INFO,
+        "PowerSource": _POWER_SOURCE_CLUSTER_INFO,
+        "GeneralCommissioning": _GENERAL_COMMISSIONING_CLUSTER_INFO,
+        "NetworkCommissioning": _NETWORK_COMMISSIONING_CLUSTER_INFO,
+        "DiagnosticLogs": _DIAGNOSTIC_LOGS_CLUSTER_INFO,
+        "GeneralDiagnostics": _GENERAL_DIAGNOSTICS_CLUSTER_INFO,
         "SoftwareDiagnostics": _SOFTWARE_DIAGNOSTICS_CLUSTER_INFO,
+        "ThreadNetworkDiagnostics": _THREAD_NETWORK_DIAGNOSTICS_CLUSTER_INFO,
+        "WiFiNetworkDiagnostics": _WI_FI_NETWORK_DIAGNOSTICS_CLUSTER_INFO,
+        "EthernetNetworkDiagnostics": _ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_INFO,
+        "BridgedDeviceBasic": _BRIDGED_DEVICE_BASIC_CLUSTER_INFO,
         "Switch": _SWITCH_CLUSTER_INFO,
-        "TargetNavigator": _TARGET_NAVIGATOR_CLUSTER_INFO,
-        "TemperatureMeasurement": _TEMPERATURE_MEASUREMENT_CLUSTER_INFO,
-        "TestCluster": _TEST_CLUSTER_CLUSTER_INFO,
+        "AdministratorCommissioning": _ADMINISTRATOR_COMMISSIONING_CLUSTER_INFO,
+        "OperationalCredentials": _OPERATIONAL_CREDENTIALS_CLUSTER_INFO,
+        "GroupKeyManagement": _GROUP_KEY_MANAGEMENT_CLUSTER_INFO,
+        "FixedLabel": _FIXED_LABEL_CLUSTER_INFO,
+        "UserLabel": _USER_LABEL_CLUSTER_INFO,
+        "BooleanState": _BOOLEAN_STATE_CLUSTER_INFO,
+        "ModeSelect": _MODE_SELECT_CLUSTER_INFO,
+        "DoorLock": _DOOR_LOCK_CLUSTER_INFO,
+        "WindowCovering": _WINDOW_COVERING_CLUSTER_INFO,
+        "BarrierControl": _BARRIER_CONTROL_CLUSTER_INFO,
+        "PumpConfigurationAndControl": _PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_INFO,
         "Thermostat": _THERMOSTAT_CLUSTER_INFO,
+        "FanControl": _FAN_CONTROL_CLUSTER_INFO,
         "ThermostatUserInterfaceConfiguration": _THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_INFO,
-        "ThreadNetworkDiagnostics": _THREAD_NETWORK_DIAGNOSTICS_CLUSTER_INFO,
-        "TimeFormatLocalization": _TIME_FORMAT_LOCALIZATION_CLUSTER_INFO,
-        "UnitLocalization": _UNIT_LOCALIZATION_CLUSTER_INFO,
-        "UserLabel": _USER_LABEL_CLUSTER_INFO,
+        "ColorControl": _COLOR_CONTROL_CLUSTER_INFO,
+        "IlluminanceMeasurement": _ILLUMINANCE_MEASUREMENT_CLUSTER_INFO,
+        "TemperatureMeasurement": _TEMPERATURE_MEASUREMENT_CLUSTER_INFO,
+        "PressureMeasurement": _PRESSURE_MEASUREMENT_CLUSTER_INFO,
+        "FlowMeasurement": _FLOW_MEASUREMENT_CLUSTER_INFO,
+        "RelativeHumidityMeasurement": _RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_INFO,
+        "OccupancySensing": _OCCUPANCY_SENSING_CLUSTER_INFO,
         "WakeOnLan": _WAKE_ON_LAN_CLUSTER_INFO,
-        "WiFiNetworkDiagnostics": _WI_FI_NETWORK_DIAGNOSTICS_CLUSTER_INFO,
-        "WindowCovering": _WINDOW_COVERING_CLUSTER_INFO,
+        "Channel": _CHANNEL_CLUSTER_INFO,
+        "TargetNavigator": _TARGET_NAVIGATOR_CLUSTER_INFO,
+        "MediaPlayback": _MEDIA_PLAYBACK_CLUSTER_INFO,
+        "MediaInput": _MEDIA_INPUT_CLUSTER_INFO,
+        "LowPower": _LOW_POWER_CLUSTER_INFO,
+        "KeypadInput": _KEYPAD_INPUT_CLUSTER_INFO,
+        "ContentLauncher": _CONTENT_LAUNCHER_CLUSTER_INFO,
+        "AudioOutput": _AUDIO_OUTPUT_CLUSTER_INFO,
+        "ApplicationLauncher": _APPLICATION_LAUNCHER_CLUSTER_INFO,
+        "ApplicationBasic": _APPLICATION_BASIC_CLUSTER_INFO,
+        "AccountLogin": _ACCOUNT_LOGIN_CLUSTER_INFO,
+        "ElectricalMeasurement": _ELECTRICAL_MEASUREMENT_CLUSTER_INFO,
+        "TestCluster": _TEST_CLUSTER_CLUSTER_INFO,
     }
 
     def __init__(self, chipstack):
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm
index 874fa3b86175ad..a35cb5821e747d 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm
@@ -34,134 +34,11 @@
 id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader & aReader, CHIP_ERROR * aError)
 {
     switch (aPath.mClusterId) {
-    case Clusters::AccessControl::Id: {
-        using namespace Clusters::AccessControl;
+    case Clusters::Identify::Id: {
+        using namespace Clusters::Identify;
         switch (aPath.mAttributeId) {
-        case Attributes::Acl::Id: {
-            using TypeInfo = Attributes::Acl::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    CHIPAccessControlClusterAccessControlEntry * newElement_0;
-                    newElement_0 = [CHIPAccessControlClusterAccessControlEntry new];
-                    newElement_0.privilege = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.privilege)];
-                    newElement_0.authMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.authMode)];
-                    if (entry_0.subjects.IsNull()) {
-                        newElement_0.subjects = nil;
-                    } else {
-                        { // Scope for our temporary variables
-                            auto * array_3 = [NSMutableArray new];
-                            auto iter_3 = entry_0.subjects.Value().begin();
-                            while (iter_3.Next()) {
-                                auto & entry_3 = iter_3.GetValue();
-                                NSNumber * newElement_3;
-                                newElement_3 = [NSNumber numberWithUnsignedLongLong:entry_3];
-                                [array_3 addObject:newElement_3];
-                            }
-                            CHIP_ERROR err = iter_3.GetStatus();
-                            if (err != CHIP_NO_ERROR) {
-                                *aError = err;
-                                return nil;
-                            }
-                            newElement_0.subjects = array_3;
-                        }
-                    }
-                    if (entry_0.targets.IsNull()) {
-                        newElement_0.targets = nil;
-                    } else {
-                        { // Scope for our temporary variables
-                            auto * array_3 = [NSMutableArray new];
-                            auto iter_3 = entry_0.targets.Value().begin();
-                            while (iter_3.Next()) {
-                                auto & entry_3 = iter_3.GetValue();
-                                CHIPAccessControlClusterTarget * newElement_3;
-                                newElement_3 = [CHIPAccessControlClusterTarget new];
-                                if (entry_3.cluster.IsNull()) {
-                                    newElement_3.cluster = nil;
-                                } else {
-                                    newElement_3.cluster = [NSNumber numberWithUnsignedInt:entry_3.cluster.Value()];
-                                }
-                                if (entry_3.endpoint.IsNull()) {
-                                    newElement_3.endpoint = nil;
-                                } else {
-                                    newElement_3.endpoint = [NSNumber numberWithUnsignedShort:entry_3.endpoint.Value()];
-                                }
-                                if (entry_3.deviceType.IsNull()) {
-                                    newElement_3.deviceType = nil;
-                                } else {
-                                    newElement_3.deviceType = [NSNumber numberWithUnsignedInt:entry_3.deviceType.Value()];
-                                }
-                                [array_3 addObject:newElement_3];
-                            }
-                            CHIP_ERROR err = iter_3.GetStatus();
-                            if (err != CHIP_NO_ERROR) {
-                                *aError = err;
-                                return nil;
-                            }
-                            newElement_0.targets = array_3;
-                        }
-                    }
-                    newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
-            return value;
-        }
-        case Attributes::Extension::Id: {
-            using TypeInfo = Attributes::Extension::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    CHIPAccessControlClusterExtensionEntry * newElement_0;
-                    newElement_0 = [CHIPAccessControlClusterExtensionEntry new];
-                    newElement_0.data = [NSData dataWithBytes:entry_0.data.data() length:entry_0.data.size()];
-                    newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
-            return value;
-        }
-        case Attributes::SubjectsPerAccessControlEntry::Id: {
-            using TypeInfo = Attributes::SubjectsPerAccessControlEntry::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
-            return value;
-        }
-        case Attributes::TargetsPerAccessControlEntry::Id: {
-            using TypeInfo = Attributes::TargetsPerAccessControlEntry::TypeInfo;
+        case Attributes::IdentifyTime::Id: {
+            using TypeInfo = Attributes::IdentifyTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -171,15 +48,15 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::AccessControlEntriesPerFabric::Id: {
-            using TypeInfo = Attributes::AccessControlEntriesPerFabric::TypeInfo;
+        case Attributes::IdentifyType::Id: {
+            using TypeInfo = Attributes::IdentifyType::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -288,9 +165,20 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::AccountLogin::Id: {
-        using namespace Clusters::AccountLogin;
+    case Clusters::Groups::Id: {
+        using namespace Clusters::Groups;
         switch (aPath.mAttributeId) {
+        case Attributes::NameSupport::Id: {
+            using TypeInfo = Attributes::NameSupport::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
+            return value;
+        }
         case Attributes::GeneratedCommandList::Id: {
             using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -397,11 +285,11 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::AdministratorCommissioning::Id: {
-        using namespace Clusters::AdministratorCommissioning;
+    case Clusters::Scenes::Id: {
+        using namespace Clusters::Scenes;
         switch (aPath.mAttributeId) {
-        case Attributes::WindowStatus::Id: {
-            using TypeInfo = Attributes::WindowStatus::TypeInfo;
+        case Attributes::SceneCount::Id: {
+            using TypeInfo = Attributes::SceneCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -411,8 +299,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::AdminFabricIndex::Id: {
-            using TypeInfo = Attributes::AdminFabricIndex::TypeInfo;
+        case Attributes::CurrentScene::Id: {
+            using TypeInfo = Attributes::CurrentScene::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -422,8 +310,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::AdminVendorId::Id: {
-            using TypeInfo = Attributes::AdminVendorId::TypeInfo;
+        case Attributes::CurrentGroup::Id: {
+            using TypeInfo = Attributes::CurrentGroup::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -433,6 +321,43 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
+        case Attributes::SceneValid::Id: {
+            using TypeInfo = Attributes::SceneValid::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithBool:cppValue];
+            return value;
+        }
+        case Attributes::NameSupport::Id: {
+            using TypeInfo = Attributes::NameSupport::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
+            return value;
+        }
+        case Attributes::LastConfiguredBy::Id: {
+            using TypeInfo = Attributes::LastConfiguredBy::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
+            }
+            return value;
+        }
         case Attributes::GeneratedCommandList::Id: {
             using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -539,44 +464,44 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::ApplicationBasic::Id: {
-        using namespace Clusters::ApplicationBasic;
+    case Clusters::OnOff::Id: {
+        using namespace Clusters::OnOff;
         switch (aPath.mAttributeId) {
-        case Attributes::VendorName::Id: {
-            using TypeInfo = Attributes::VendorName::TypeInfo;
+        case Attributes::OnOff::Id: {
+            using TypeInfo = Attributes::OnOff::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithBool:cppValue];
             return value;
         }
-        case Attributes::VendorID::Id: {
-            using TypeInfo = Attributes::VendorID::TypeInfo;
+        case Attributes::GlobalSceneControl::Id: {
+            using TypeInfo = Attributes::GlobalSceneControl::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithBool:cppValue];
             return value;
         }
-        case Attributes::ApplicationName::Id: {
-            using TypeInfo = Attributes::ApplicationName::TypeInfo;
+        case Attributes::OnTime::Id: {
+            using TypeInfo = Attributes::OnTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ProductID::Id: {
-            using TypeInfo = Attributes::ProductID::TypeInfo;
+        case Attributes::OffWaitTime::Id: {
+            using TypeInfo = Attributes::OffWaitTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -586,71 +511,23 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::Application::Id: {
-            using TypeInfo = Attributes::Application::TypeInfo;
+        case Attributes::StartUpOnOff::Id: {
+            using TypeInfo = Attributes::StartUpOnOff::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            CHIPApplicationBasicClusterApplicationBasicApplication * _Nonnull value;
-            value = [CHIPApplicationBasicClusterApplicationBasicApplication new];
-            value.catalogVendorId = [NSNumber numberWithUnsignedShort:cppValue.catalogVendorId];
-            value.applicationId = [[NSString alloc] initWithBytes:cppValue.applicationId.data()
-                                                           length:cppValue.applicationId.size()
-                                                         encoding:NSUTF8StringEncoding];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value())];
+            }
             return value;
         }
-        case Attributes::Status::Id: {
-            using TypeInfo = Attributes::Status::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
-            return value;
-        }
-        case Attributes::ApplicationVersion::Id: {
-            using TypeInfo = Attributes::ApplicationVersion::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
-            return value;
-        }
-        case Attributes::AllowedVendorList::Id: {
-            using TypeInfo = Attributes::AllowedVendorList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_0)];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
-            return value;
-        }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -755,58 +632,29 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::ApplicationLauncher::Id: {
-        using namespace Clusters::ApplicationLauncher;
+    case Clusters::OnOffSwitchConfiguration::Id: {
+        using namespace Clusters::OnOffSwitchConfiguration;
         switch (aPath.mAttributeId) {
-        case Attributes::CatalogList::Id: {
-            using TypeInfo = Attributes::CatalogList::TypeInfo;
+        case Attributes::SwitchType::Id: {
+            using TypeInfo = Attributes::SwitchType::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedShort:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::CurrentApp::Id: {
-            using TypeInfo = Attributes::CurrentApp::TypeInfo;
+        case Attributes::SwitchActions::Id: {
+            using TypeInfo = Attributes::SwitchActions::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            CHIPApplicationLauncherClusterApplicationEP * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [CHIPApplicationLauncherClusterApplicationEP new];
-                value.application = [CHIPApplicationLauncherClusterApplication new];
-                value.application.catalogVendorId = [NSNumber numberWithUnsignedShort:cppValue.Value().application.catalogVendorId];
-                value.application.applicationId = [[NSString alloc] initWithBytes:cppValue.Value().application.applicationId.data()
-                                                                           length:cppValue.Value().application.applicationId.size()
-                                                                         encoding:NSUTF8StringEncoding];
-                if (cppValue.Value().endpoint.HasValue()) {
-                    value.endpoint = [NSNumber numberWithUnsignedShort:cppValue.Value().endpoint.Value()];
-                } else {
-                    value.endpoint = nil;
-                }
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -915,142 +763,77 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::AudioOutput::Id: {
-        using namespace Clusters::AudioOutput;
+    case Clusters::LevelControl::Id: {
+        using namespace Clusters::LevelControl;
         switch (aPath.mAttributeId) {
-        case Attributes::OutputList::Id: {
-            using TypeInfo = Attributes::OutputList::TypeInfo;
+        case Attributes::CurrentLevel::Id: {
+            using TypeInfo = Attributes::CurrentLevel::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    CHIPAudioOutputClusterOutputInfo * newElement_0;
-                    newElement_0 = [CHIPAudioOutputClusterOutputInfo new];
-                    newElement_0.index = [NSNumber numberWithUnsignedChar:entry_0.index];
-                    newElement_0.outputType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.outputType)];
-                    newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data()
-                                                                 length:entry_0.name.size()
-                                                               encoding:NSUTF8StringEncoding];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::CurrentOutput::Id: {
-            using TypeInfo = Attributes::CurrentOutput::TypeInfo;
+        case Attributes::RemainingTime::Id: {
+            using TypeInfo = Attributes::RemainingTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::MinLevel::Id: {
+            using TypeInfo = Attributes::MinLevel::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::MaxLevel::Id: {
+            using TypeInfo = Attributes::MaxLevel::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::CurrentFrequency::Id: {
+            using TypeInfo = Attributes::CurrentFrequency::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::MinFrequency::Id: {
+            using TypeInfo = Attributes::MinFrequency::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::MaxFrequency::Id: {
+            using TypeInfo = Attributes::MaxFrequency::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -1060,17 +843,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::BarrierControl::Id: {
-        using namespace Clusters::BarrierControl;
-        switch (aPath.mAttributeId) {
-        case Attributes::BarrierMovingState::Id: {
-            using TypeInfo = Attributes::BarrierMovingState::TypeInfo;
+        case Attributes::Options::Id: {
+            using TypeInfo = Attributes::Options::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -1080,8 +854,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::BarrierSafetyStatus::Id: {
-            using TypeInfo = Attributes::BarrierSafetyStatus::TypeInfo;
+        case Attributes::OnOffTransitionTime::Id: {
+            using TypeInfo = Attributes::OnOffTransitionTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -1091,92 +865,79 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::BarrierCapabilities::Id: {
-            using TypeInfo = Attributes::BarrierCapabilities::TypeInfo;
+        case Attributes::OnLevel::Id: {
+            using TypeInfo = Attributes::OnLevel::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::BarrierOpenEvents::Id: {
-            using TypeInfo = Attributes::BarrierOpenEvents::TypeInfo;
+        case Attributes::OnTransitionTime::Id: {
+            using TypeInfo = Attributes::OnTransitionTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::BarrierCloseEvents::Id: {
-            using TypeInfo = Attributes::BarrierCloseEvents::TypeInfo;
+        case Attributes::OffTransitionTime::Id: {
+            using TypeInfo = Attributes::OffTransitionTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
-            return value;
-        }
-        case Attributes::BarrierCommandOpenEvents::Id: {
-            using TypeInfo = Attributes::BarrierCommandOpenEvents::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::BarrierCommandCloseEvents::Id: {
-            using TypeInfo = Attributes::BarrierCommandCloseEvents::TypeInfo;
+        case Attributes::DefaultMoveRate::Id: {
+            using TypeInfo = Attributes::DefaultMoveRate::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
-            return value;
-        }
-        case Attributes::BarrierOpenPeriod::Id: {
-            using TypeInfo = Attributes::BarrierOpenPeriod::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::BarrierClosePeriod::Id: {
-            using TypeInfo = Attributes::BarrierClosePeriod::TypeInfo;
+        case Attributes::StartUpCurrentLevel::Id: {
+            using TypeInfo = Attributes::StartUpCurrentLevel::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
-            return value;
-        }
-        case Attributes::BarrierPosition::Id: {
-            using TypeInfo = Attributes::BarrierPosition::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -1285,44 +1046,11 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::Basic::Id: {
-        using namespace Clusters::Basic;
+    case Clusters::BinaryInputBasic::Id: {
+        using namespace Clusters::BinaryInputBasic;
         switch (aPath.mAttributeId) {
-        case Attributes::DataModelRevision::Id: {
-            using TypeInfo = Attributes::DataModelRevision::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
-            return value;
-        }
-        case Attributes::VendorName::Id: {
-            using TypeInfo = Attributes::VendorName::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
-            return value;
-        }
-        case Attributes::VendorID::Id: {
-            using TypeInfo = Attributes::VendorID::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:chip::to_underlying(cppValue)];
-            return value;
-        }
-        case Attributes::ProductName::Id: {
-            using TypeInfo = Attributes::ProductName::TypeInfo;
+        case Attributes::ActiveText::Id: {
+            using TypeInfo = Attributes::ActiveText::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -1332,19 +1060,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
-        case Attributes::ProductID::Id: {
-            using TypeInfo = Attributes::ProductID::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
-            return value;
-        }
-        case Attributes::NodeLabel::Id: {
-            using TypeInfo = Attributes::NodeLabel::TypeInfo;
+        case Attributes::Description::Id: {
+            using TypeInfo = Attributes::Description::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -1354,8 +1071,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
-        case Attributes::Location::Id: {
-            using TypeInfo = Attributes::Location::TypeInfo;
+        case Attributes::InactiveText::Id: {
+            using TypeInfo = Attributes::InactiveText::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -1365,107 +1082,30 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
-        case Attributes::HardwareVersion::Id: {
-            using TypeInfo = Attributes::HardwareVersion::TypeInfo;
+        case Attributes::OutOfService::Id: {
+            using TypeInfo = Attributes::OutOfService::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
-            return value;
-        }
-        case Attributes::HardwareVersionString::Id: {
-            using TypeInfo = Attributes::HardwareVersionString::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
+            value = [NSNumber numberWithBool:cppValue];
             return value;
         }
-        case Attributes::SoftwareVersion::Id: {
-            using TypeInfo = Attributes::SoftwareVersion::TypeInfo;
+        case Attributes::Polarity::Id: {
+            using TypeInfo = Attributes::Polarity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
-            return value;
-        }
-        case Attributes::SoftwareVersionString::Id: {
-            using TypeInfo = Attributes::SoftwareVersionString::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
-            return value;
-        }
-        case Attributes::ManufacturingDate::Id: {
-            using TypeInfo = Attributes::ManufacturingDate::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
-            return value;
-        }
-        case Attributes::PartNumber::Id: {
-            using TypeInfo = Attributes::PartNumber::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
-            return value;
-        }
-        case Attributes::ProductURL::Id: {
-            using TypeInfo = Attributes::ProductURL::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
-            return value;
-        }
-        case Attributes::ProductLabel::Id: {
-            using TypeInfo = Attributes::ProductLabel::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
-            return value;
-        }
-        case Attributes::SerialNumber::Id: {
-            using TypeInfo = Attributes::SerialNumber::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::LocalConfigDisabled::Id: {
-            using TypeInfo = Attributes::LocalConfigDisabled::TypeInfo;
+        case Attributes::PresentValue::Id: {
+            using TypeInfo = Attributes::PresentValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -1475,39 +1115,37 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithBool:cppValue];
             return value;
         }
-        case Attributes::Reachable::Id: {
-            using TypeInfo = Attributes::Reachable::TypeInfo;
+        case Attributes::Reliability::Id: {
+            using TypeInfo = Attributes::Reliability::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::UniqueID::Id: {
-            using TypeInfo = Attributes::UniqueID::TypeInfo;
+        case Attributes::StatusFlags::Id: {
+            using TypeInfo = Attributes::StatusFlags::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::CapabilityMinima::Id: {
-            using TypeInfo = Attributes::CapabilityMinima::TypeInfo;
+        case Attributes::ApplicationType::Id: {
+            using TypeInfo = Attributes::ApplicationType::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            CHIPBasicClusterCapabilityMinimaStruct * _Nonnull value;
-            value = [CHIPBasicClusterCapabilityMinimaStruct new];
-            value.caseSessionsPerFabric = [NSNumber numberWithUnsignedShort:cppValue.caseSessionsPerFabric];
-            value.subscriptionsPerFabric = [NSNumber numberWithUnsignedShort:cppValue.subscriptionsPerFabric];
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -1616,106 +1254,113 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::BinaryInputBasic::Id: {
-        using namespace Clusters::BinaryInputBasic;
+    case Clusters::Descriptor::Id: {
+        using namespace Clusters::Descriptor;
         switch (aPath.mAttributeId) {
-        case Attributes::ActiveText::Id: {
-            using TypeInfo = Attributes::ActiveText::TypeInfo;
+        case Attributes::DeviceList::Id: {
+            using TypeInfo = Attributes::DeviceList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
-            return value;
-        }
-        case Attributes::Description::Id: {
-            using TypeInfo = Attributes::Description::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
-            return value;
-        }
-        case Attributes::InactiveText::Id: {
-            using TypeInfo = Attributes::InactiveText::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    CHIPDescriptorClusterDeviceType * newElement_0;
+                    newElement_0 = [CHIPDescriptorClusterDeviceType new];
+                    newElement_0.type = [NSNumber numberWithUnsignedInt:entry_0.type];
+                    newElement_0.revision = [NSNumber numberWithUnsignedShort:entry_0.revision];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
-        case Attributes::OutOfService::Id: {
-            using TypeInfo = Attributes::OutOfService::TypeInfo;
+        case Attributes::ServerList::Id: {
+            using TypeInfo = Attributes::ServerList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
-            return value;
-        }
-        case Attributes::Polarity::Id: {
-            using TypeInfo = Attributes::Polarity::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::PresentValue::Id: {
-            using TypeInfo = Attributes::PresentValue::TypeInfo;
+        case Attributes::ClientList::Id: {
+            using TypeInfo = Attributes::ClientList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
-            return value;
-        }
-        case Attributes::Reliability::Id: {
-            using TypeInfo = Attributes::Reliability::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::StatusFlags::Id: {
-            using TypeInfo = Attributes::StatusFlags::TypeInfo;
+        case Attributes::PartsList::Id: {
+            using TypeInfo = Attributes::PartsList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
-            return value;
-        }
-        case Attributes::ApplicationType::Id: {
-            using TypeInfo = Attributes::ApplicationType::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedShort:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -1980,22 +1625,11 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::BooleanState::Id: {
-        using namespace Clusters::BooleanState;
+    case Clusters::AccessControl::Id: {
+        using namespace Clusters::AccessControl;
         switch (aPath.mAttributeId) {
-        case Attributes::StateValue::Id: {
-            using TypeInfo = Attributes::StateValue::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
-            return value;
-        }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::Acl::Id: {
+            using TypeInfo = Attributes::Acl::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -2007,8 +1641,66 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
                 auto iter_0 = cppValue.begin();
                 while (iter_0.Next()) {
                     auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    CHIPAccessControlClusterAccessControlEntry * newElement_0;
+                    newElement_0 = [CHIPAccessControlClusterAccessControlEntry new];
+                    newElement_0.privilege = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.privilege)];
+                    newElement_0.authMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.authMode)];
+                    if (entry_0.subjects.IsNull()) {
+                        newElement_0.subjects = nil;
+                    } else {
+                        { // Scope for our temporary variables
+                            auto * array_3 = [NSMutableArray new];
+                            auto iter_3 = entry_0.subjects.Value().begin();
+                            while (iter_3.Next()) {
+                                auto & entry_3 = iter_3.GetValue();
+                                NSNumber * newElement_3;
+                                newElement_3 = [NSNumber numberWithUnsignedLongLong:entry_3];
+                                [array_3 addObject:newElement_3];
+                            }
+                            CHIP_ERROR err = iter_3.GetStatus();
+                            if (err != CHIP_NO_ERROR) {
+                                *aError = err;
+                                return nil;
+                            }
+                            newElement_0.subjects = array_3;
+                        }
+                    }
+                    if (entry_0.targets.IsNull()) {
+                        newElement_0.targets = nil;
+                    } else {
+                        { // Scope for our temporary variables
+                            auto * array_3 = [NSMutableArray new];
+                            auto iter_3 = entry_0.targets.Value().begin();
+                            while (iter_3.Next()) {
+                                auto & entry_3 = iter_3.GetValue();
+                                CHIPAccessControlClusterTarget * newElement_3;
+                                newElement_3 = [CHIPAccessControlClusterTarget new];
+                                if (entry_3.cluster.IsNull()) {
+                                    newElement_3.cluster = nil;
+                                } else {
+                                    newElement_3.cluster = [NSNumber numberWithUnsignedInt:entry_3.cluster.Value()];
+                                }
+                                if (entry_3.endpoint.IsNull()) {
+                                    newElement_3.endpoint = nil;
+                                } else {
+                                    newElement_3.endpoint = [NSNumber numberWithUnsignedShort:entry_3.endpoint.Value()];
+                                }
+                                if (entry_3.deviceType.IsNull()) {
+                                    newElement_3.deviceType = nil;
+                                } else {
+                                    newElement_3.deviceType = [NSNumber numberWithUnsignedInt:entry_3.deviceType.Value()];
+                                }
+                                [array_3 addObject:newElement_3];
+                            }
+                            CHIP_ERROR err = iter_3.GetStatus();
+                            if (err != CHIP_NO_ERROR) {
+                                *aError = err;
+                                return nil;
+                            }
+                            newElement_0.targets = array_3;
+                        }
+                    }
+                    newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
                     [array_0 addObject:newElement_0];
                 }
                 CHIP_ERROR err = iter_0.GetStatus();
@@ -2020,8 +1712,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::Extension::Id: {
+            using TypeInfo = Attributes::Extension::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -2033,8 +1725,10 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
                 auto iter_0 = cppValue.begin();
                 while (iter_0.Next()) {
                     auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    CHIPAccessControlClusterExtensionEntry * newElement_0;
+                    newElement_0 = [CHIPAccessControlClusterExtensionEntry new];
+                    newElement_0.data = [NSData dataWithBytes:entry_0.data.data() length:entry_0.data.size()];
+                    newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
                     [array_0 addObject:newElement_0];
                 }
                 CHIP_ERROR err = iter_0.GetStatus();
@@ -2046,45 +1740,30 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::SubjectsPerAccessControlEntry::Id: {
+            using TypeInfo = Attributes::SubjectsPerAccessControlEntry::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::TargetsPerAccessControlEntry::Id: {
+            using TypeInfo = Attributes::TargetsPerAccessControlEntry::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::AccessControlEntriesPerFabric::Id: {
+            using TypeInfo = Attributes::AccessControlEntriesPerFabric::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -2094,11 +1773,111 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
+            return value;
+        }
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
+            return value;
+        }
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
+            return value;
+        }
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedInt:cppValue];
+            return value;
+        }
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
+            return value;
+        }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
     }
     case Clusters::BridgedActions::Id: {
         using namespace Clusters::BridgedActions;
@@ -2301,9 +2080,20 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::BridgedDeviceBasic::Id: {
-        using namespace Clusters::BridgedDeviceBasic;
+    case Clusters::Basic::Id: {
+        using namespace Clusters::Basic;
         switch (aPath.mAttributeId) {
+        case Attributes::DataModelRevision::Id: {
+            using TypeInfo = Attributes::DataModelRevision::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
+            return value;
+        }
         case Attributes::VendorName::Id: {
             using TypeInfo = Attributes::VendorName::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -2337,6 +2127,17 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
+        case Attributes::ProductID::Id: {
+            using TypeInfo = Attributes::ProductID::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
+            return value;
+        }
         case Attributes::NodeLabel::Id: {
             using TypeInfo = Attributes::NodeLabel::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -2348,6 +2149,17 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
+        case Attributes::Location::Id: {
+            using TypeInfo = Attributes::Location::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
+            return value;
+        }
         case Attributes::HardwareVersion::Id: {
             using TypeInfo = Attributes::HardwareVersion::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -2447,6 +2259,17 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
+        case Attributes::LocalConfigDisabled::Id: {
+            using TypeInfo = Attributes::LocalConfigDisabled::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithBool:cppValue];
+            return value;
+        }
         case Attributes::Reachable::Id: {
             using TypeInfo = Attributes::Reachable::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -2469,6 +2292,19 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
+        case Attributes::CapabilityMinima::Id: {
+            using TypeInfo = Attributes::CapabilityMinima::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            CHIPBasicClusterCapabilityMinimaStruct * _Nonnull value;
+            value = [CHIPBasicClusterCapabilityMinimaStruct new];
+            value.caseSessionsPerFabric = [NSNumber numberWithUnsignedShort:cppValue.caseSessionsPerFabric];
+            value.subscriptionsPerFabric = [NSNumber numberWithUnsignedShort:cppValue.subscriptionsPerFabric];
+            return value;
+        }
         case Attributes::GeneratedCommandList::Id: {
             using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -2575,11 +2411,11 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::Channel::Id: {
-        using namespace Clusters::Channel;
+    case Clusters::OtaSoftwareUpdateProvider::Id: {
+        using namespace Clusters::OtaSoftwareUpdateProvider;
         switch (aPath.mAttributeId) {
-        case Attributes::ChannelList::Id: {
-            using TypeInfo = Attributes::ChannelList::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -2591,31 +2427,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
                 auto iter_0 = cppValue.begin();
                 while (iter_0.Next()) {
                     auto & entry_0 = iter_0.GetValue();
-                    CHIPChannelClusterChannelInfo * newElement_0;
-                    newElement_0 = [CHIPChannelClusterChannelInfo new];
-                    newElement_0.majorNumber = [NSNumber numberWithUnsignedShort:entry_0.majorNumber];
-                    newElement_0.minorNumber = [NSNumber numberWithUnsignedShort:entry_0.minorNumber];
-                    if (entry_0.name.HasValue()) {
-                        newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.Value().data()
-                                                                     length:entry_0.name.Value().size()
-                                                                   encoding:NSUTF8StringEncoding];
-                    } else {
-                        newElement_0.name = nil;
-                    }
-                    if (entry_0.callSign.HasValue()) {
-                        newElement_0.callSign = [[NSString alloc] initWithBytes:entry_0.callSign.Value().data()
-                                                                         length:entry_0.callSign.Value().size()
-                                                                       encoding:NSUTF8StringEncoding];
-                    } else {
-                        newElement_0.callSign = nil;
-                    }
-                    if (entry_0.affiliateCallSign.HasValue()) {
-                        newElement_0.affiliateCallSign = [[NSString alloc] initWithBytes:entry_0.affiliateCallSign.Value().data()
-                                                                                  length:entry_0.affiliateCallSign.Value().size()
-                                                                                encoding:NSUTF8StringEncoding];
-                    } else {
-                        newElement_0.affiliateCallSign = nil;
-                    }
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
                     [array_0 addObject:newElement_0];
                 }
                 CHIP_ERROR err = iter_0.GetStatus();
@@ -2627,74 +2440,152 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::Lineup::Id: {
-            using TypeInfo = Attributes::Lineup::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            CHIPChannelClusterLineupInfo * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [CHIPChannelClusterLineupInfo new];
-                value.operatorName = [[NSString alloc] initWithBytes:cppValue.Value().operatorName.data()
-                                                              length:cppValue.Value().operatorName.size()
-                                                            encoding:NSUTF8StringEncoding];
-                if (cppValue.Value().lineupName.HasValue()) {
-                    value.lineupName = [[NSString alloc] initWithBytes:cppValue.Value().lineupName.Value().data()
-                                                                length:cppValue.Value().lineupName.Value().size()
-                                                              encoding:NSUTF8StringEncoding];
-                } else {
-                    value.lineupName = nil;
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
                 }
-                if (cppValue.Value().postalCode.HasValue()) {
-                    value.postalCode = [[NSString alloc] initWithBytes:cppValue.Value().postalCode.Value().data()
-                                                                length:cppValue.Value().postalCode.Value().size()
-                                                              encoding:NSUTF8StringEncoding];
-                } else {
-                    value.postalCode = nil;
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
                 }
-                value.lineupInfoType = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value().lineupInfoType)];
+                value = array_0;
             }
             return value;
         }
-        case Attributes::CurrentChannel::Id: {
-            using TypeInfo = Attributes::CurrentChannel::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            CHIPChannelClusterChannelInfo * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [CHIPChannelClusterChannelInfo new];
-                value.majorNumber = [NSNumber numberWithUnsignedShort:cppValue.Value().majorNumber];
-                value.minorNumber = [NSNumber numberWithUnsignedShort:cppValue.Value().minorNumber];
-                if (cppValue.Value().name.HasValue()) {
-                    value.name = [[NSString alloc] initWithBytes:cppValue.Value().name.Value().data()
-                                                          length:cppValue.Value().name.Value().size()
-                                                        encoding:NSUTF8StringEncoding];
-                } else {
-                    value.name = nil;
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
                 }
-                if (cppValue.Value().callSign.HasValue()) {
-                    value.callSign = [[NSString alloc] initWithBytes:cppValue.Value().callSign.Value().data()
-                                                              length:cppValue.Value().callSign.Value().size()
-                                                            encoding:NSUTF8StringEncoding];
-                } else {
-                    value.callSign = nil;
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
                 }
-                if (cppValue.Value().affiliateCallSign.HasValue()) {
-                    value.affiliateCallSign = [[NSString alloc] initWithBytes:cppValue.Value().affiliateCallSign.Value().data()
-                                                                       length:cppValue.Value().affiliateCallSign.Value().size()
-                                                                     encoding:NSUTF8StringEncoding];
-                } else {
-                    value.affiliateCallSign = nil;
+                value = array_0;
+            }
+            return value;
+        }
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedInt:cppValue];
+            return value;
+        }
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
+            return value;
+        }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::OtaSoftwareUpdateRequestor::Id: {
+        using namespace Clusters::OtaSoftwareUpdateRequestor;
+        switch (aPath.mAttributeId) {
+        case Attributes::DefaultOtaProviders::Id: {
+            using TypeInfo = Attributes::DefaultOtaProviders::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    CHIPOtaSoftwareUpdateRequestorClusterProviderLocation * newElement_0;
+                    newElement_0 = [CHIPOtaSoftwareUpdateRequestorClusterProviderLocation new];
+                    newElement_0.providerNodeID = [NSNumber numberWithUnsignedLongLong:entry_0.providerNodeID];
+                    newElement_0.endpoint = [NSNumber numberWithUnsignedShort:entry_0.endpoint];
+                    newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
+                    [array_0 addObject:newElement_0];
                 }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
+            return value;
+        }
+        case Attributes::UpdatePossible::Id: {
+            using TypeInfo = Attributes::UpdatePossible::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithBool:cppValue];
+            return value;
+        }
+        case Attributes::UpdateState::Id: {
+            using TypeInfo = Attributes::UpdateState::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+            return value;
+        }
+        case Attributes::UpdateStateProgress::Id: {
+            using TypeInfo = Attributes::UpdateStateProgress::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
             }
             return value;
         }
@@ -2804,173 +2695,296 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::ColorControl::Id: {
-        using namespace Clusters::ColorControl;
+    case Clusters::LocalizationConfiguration::Id: {
+        using namespace Clusters::LocalizationConfiguration;
         switch (aPath.mAttributeId) {
-        case Attributes::CurrentHue::Id: {
-            using TypeInfo = Attributes::CurrentHue::TypeInfo;
+        case Attributes::ActiveLocale::Id: {
+            using TypeInfo = Attributes::ActiveLocale::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
-        case Attributes::CurrentSaturation::Id: {
-            using TypeInfo = Attributes::CurrentSaturation::TypeInfo;
+        case Attributes::SupportedLocales::Id: {
+            using TypeInfo = Attributes::SupportedLocales::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSString * newElement_0;
+                    newElement_0 = [[NSString alloc] initWithBytes:entry_0.data()
+                                                            length:entry_0.size()
+                                                          encoding:NSUTF8StringEncoding];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::RemainingTime::Id: {
-            using TypeInfo = Attributes::RemainingTime::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::CurrentX::Id: {
-            using TypeInfo = Attributes::CurrentX::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::CurrentY::Id: {
-            using TypeInfo = Attributes::CurrentY::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::DriftCompensation::Id: {
-            using TypeInfo = Attributes::DriftCompensation::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::CompensationText::Id: {
-            using TypeInfo = Attributes::CompensationText::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ColorTemperature::Id: {
-            using TypeInfo = Attributes::ColorTemperature::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::TimeFormatLocalization::Id: {
+        using namespace Clusters::TimeFormatLocalization;
+        switch (aPath.mAttributeId) {
+        case Attributes::HourFormat::Id: {
+            using TypeInfo = Attributes::HourFormat::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
             return value;
         }
-        case Attributes::ColorMode::Id: {
-            using TypeInfo = Attributes::ColorMode::TypeInfo;
+        case Attributes::ActiveCalendarType::Id: {
+            using TypeInfo = Attributes::ActiveCalendarType::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
             return value;
         }
-        case Attributes::Options::Id: {
-            using TypeInfo = Attributes::Options::TypeInfo;
+        case Attributes::SupportedCalendarTypes::Id: {
+            using TypeInfo = Attributes::SupportedCalendarTypes::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::NumberOfPrimaries::Id: {
-            using TypeInfo = Attributes::NumberOfPrimaries::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
             return value;
         }
-        case Attributes::Primary1X::Id: {
-            using TypeInfo = Attributes::Primary1X::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::Primary1Y::Id: {
-            using TypeInfo = Attributes::Primary1Y::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::Primary1Intensity::Id: {
-            using TypeInfo = Attributes::Primary1Intensity::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::Primary2X::Id: {
-            using TypeInfo = Attributes::Primary2X::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -2980,71 +2994,117 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::Primary2Y::Id: {
-            using TypeInfo = Attributes::Primary2Y::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::UnitLocalization::Id: {
+        using namespace Clusters::UnitLocalization;
+        switch (aPath.mAttributeId) {
+        case Attributes::TemperatureUnit::Id: {
+            using TypeInfo = Attributes::TemperatureUnit::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
             return value;
         }
-        case Attributes::Primary2Intensity::Id: {
-            using TypeInfo = Attributes::Primary2Intensity::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
             return value;
         }
-        case Attributes::Primary3X::Id: {
-            using TypeInfo = Attributes::Primary3X::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::Primary3Y::Id: {
-            using TypeInfo = Attributes::Primary3Y::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::Primary3Intensity::Id: {
-            using TypeInfo = Attributes::Primary3Intensity::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::Primary4X::Id: {
-            using TypeInfo = Attributes::Primary4X::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -3054,82 +3114,132 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::Primary4Y::Id: {
-            using TypeInfo = Attributes::Primary4Y::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::PowerSourceConfiguration::Id: {
+        using namespace Clusters::PowerSourceConfiguration;
+        switch (aPath.mAttributeId) {
+        case Attributes::Sources::Id: {
+            using TypeInfo = Attributes::Sources::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::Primary4Intensity::Id: {
-            using TypeInfo = Attributes::Primary4Intensity::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
             return value;
         }
-        case Attributes::Primary5X::Id: {
-            using TypeInfo = Attributes::Primary5X::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
-            return value;
-        }
-        case Attributes::Primary5Y::Id: {
-            using TypeInfo = Attributes::Primary5Y::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::Primary5Intensity::Id: {
-            using TypeInfo = Attributes::Primary5Intensity::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
             return value;
         }
-        case Attributes::Primary6X::Id: {
-            using TypeInfo = Attributes::Primary6X::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::Primary6Y::Id: {
-            using TypeInfo = Attributes::Primary6Y::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -3139,167 +3249,164 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::Primary6Intensity::Id: {
-            using TypeInfo = Attributes::Primary6Intensity::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-            }
-            return value;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
         }
-        case Attributes::WhitePointX::Id: {
-            using TypeInfo = Attributes::WhitePointX::TypeInfo;
+        break;
+    }
+    case Clusters::PowerSource::Id: {
+        using namespace Clusters::PowerSource;
+        switch (aPath.mAttributeId) {
+        case Attributes::Status::Id: {
+            using TypeInfo = Attributes::Status::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::WhitePointY::Id: {
-            using TypeInfo = Attributes::WhitePointY::TypeInfo;
+        case Attributes::Order::Id: {
+            using TypeInfo = Attributes::Order::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::ColorPointRX::Id: {
-            using TypeInfo = Attributes::ColorPointRX::TypeInfo;
+        case Attributes::Description::Id: {
+            using TypeInfo = Attributes::Description::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
-        case Attributes::ColorPointRY::Id: {
-            using TypeInfo = Attributes::ColorPointRY::TypeInfo;
+        case Attributes::WiredAssessedInputVoltage::Id: {
+            using TypeInfo = Attributes::WiredAssessedInputVoltage::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::ColorPointRIntensity::Id: {
-            using TypeInfo = Attributes::ColorPointRIntensity::TypeInfo;
+        case Attributes::WiredAssessedInputFrequency::Id: {
+            using TypeInfo = Attributes::WiredAssessedInputFrequency::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ColorPointGX::Id: {
-            using TypeInfo = Attributes::ColorPointGX::TypeInfo;
+        case Attributes::WiredCurrentType::Id: {
+            using TypeInfo = Attributes::WiredCurrentType::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::ColorPointGY::Id: {
-            using TypeInfo = Attributes::ColorPointGY::TypeInfo;
+        case Attributes::WiredAssessedCurrent::Id: {
+            using TypeInfo = Attributes::WiredAssessedCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::ColorPointGIntensity::Id: {
-            using TypeInfo = Attributes::ColorPointGIntensity::TypeInfo;
+        case Attributes::WiredNominalVoltage::Id: {
+            using TypeInfo = Attributes::WiredNominalVoltage::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::ColorPointBX::Id: {
-            using TypeInfo = Attributes::ColorPointBX::TypeInfo;
+        case Attributes::WiredMaximumCurrent::Id: {
+            using TypeInfo = Attributes::WiredMaximumCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::ColorPointBY::Id: {
-            using TypeInfo = Attributes::ColorPointBY::TypeInfo;
+        case Attributes::WiredPresent::Id: {
+            using TypeInfo = Attributes::WiredPresent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithBool:cppValue];
             return value;
         }
-        case Attributes::ColorPointBIntensity::Id: {
-            using TypeInfo = Attributes::ColorPointBIntensity::TypeInfo;
+        case Attributes::ActiveWiredFaults::Id: {
+            using TypeInfo = Attributes::ActiveWiredFaults::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
             return value;
         }
-        case Attributes::EnhancedCurrentHue::Id: {
-            using TypeInfo = Attributes::EnhancedCurrentHue::TypeInfo;
+        case Attributes::BatteryVoltage::Id: {
+            using TypeInfo = Attributes::BatteryVoltage::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::EnhancedColorMode::Id: {
-            using TypeInfo = Attributes::EnhancedColorMode::TypeInfo;
+        case Attributes::BatteryPercentRemaining::Id: {
+            using TypeInfo = Attributes::BatteryPercentRemaining::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -3309,19 +3416,19 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::ColorLoopActive::Id: {
-            using TypeInfo = Attributes::ColorLoopActive::TypeInfo;
+        case Attributes::BatteryTimeRemaining::Id: {
+            using TypeInfo = Attributes::BatteryTimeRemaining::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::ColorLoopDirection::Id: {
-            using TypeInfo = Attributes::ColorLoopDirection::TypeInfo;
+        case Attributes::BatteryChargeLevel::Id: {
+            using TypeInfo = Attributes::BatteryChargeLevel::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -3331,92 +3438,210 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::ColorLoopTime::Id: {
-            using TypeInfo = Attributes::ColorLoopTime::TypeInfo;
+        case Attributes::BatteryReplacementNeeded::Id: {
+            using TypeInfo = Attributes::BatteryReplacementNeeded::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithBool:cppValue];
             return value;
         }
-        case Attributes::ColorLoopStartEnhancedHue::Id: {
-            using TypeInfo = Attributes::ColorLoopStartEnhancedHue::TypeInfo;
+        case Attributes::BatteryReplaceability::Id: {
+            using TypeInfo = Attributes::BatteryReplaceability::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::ColorLoopStoredEnhancedHue::Id: {
-            using TypeInfo = Attributes::ColorLoopStoredEnhancedHue::TypeInfo;
+        case Attributes::BatteryPresent::Id: {
+            using TypeInfo = Attributes::BatteryPresent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithBool:cppValue];
             return value;
         }
-        case Attributes::ColorCapabilities::Id: {
-            using TypeInfo = Attributes::ColorCapabilities::TypeInfo;
+        case Attributes::ActiveBatteryFaults::Id: {
+            using TypeInfo = Attributes::ActiveBatteryFaults::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
-            return value;
-        }
-        case Attributes::ColorTempPhysicalMinMireds::Id: {
-            using TypeInfo = Attributes::ColorTempPhysicalMinMireds::TypeInfo;
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
+            return value;
+        }
+        case Attributes::BatteryReplacementDescription::Id: {
+            using TypeInfo = Attributes::BatteryReplacementDescription::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
+            return value;
+        }
+        case Attributes::BatteryCommonDesignation::Id: {
+            using TypeInfo = Attributes::BatteryCommonDesignation::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::ColorTempPhysicalMaxMireds::Id: {
-            using TypeInfo = Attributes::ColorTempPhysicalMaxMireds::TypeInfo;
+        case Attributes::BatteryANSIDesignation::Id: {
+            using TypeInfo = Attributes::BatteryANSIDesignation::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
+            return value;
+        }
+        case Attributes::BatteryIECDesignation::Id: {
+            using TypeInfo = Attributes::BatteryIECDesignation::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
+            return value;
+        }
+        case Attributes::BatteryApprovedChemistry::Id: {
+            using TypeInfo = Attributes::BatteryApprovedChemistry::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::CoupleColorTempToLevelMinMireds::Id: {
-            using TypeInfo = Attributes::CoupleColorTempToLevelMinMireds::TypeInfo;
+        case Attributes::BatteryCapacity::Id: {
+            using TypeInfo = Attributes::BatteryCapacity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::StartUpColorTemperatureMireds::Id: {
-            using TypeInfo = Attributes::StartUpColorTemperatureMireds::TypeInfo;
+        case Attributes::BatteryQuantity::Id: {
+            using TypeInfo = Attributes::BatteryQuantity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
+            return value;
+        }
+        case Attributes::BatteryChargeState::Id: {
+            using TypeInfo = Attributes::BatteryChargeState::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
+            return value;
+        }
+        case Attributes::BatteryTimeToFullCharge::Id: {
+            using TypeInfo = Attributes::BatteryTimeToFullCharge::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedInt:cppValue];
+            return value;
+        }
+        case Attributes::BatteryFunctionalWhileCharging::Id: {
+            using TypeInfo = Attributes::BatteryFunctionalWhileCharging::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithBool:cppValue];
+            return value;
+        }
+        case Attributes::BatteryChargingCurrent::Id: {
+            using TypeInfo = Attributes::BatteryChargingCurrent::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedInt:cppValue];
+            return value;
+        }
+        case Attributes::ActiveBatteryChargeFaults::Id: {
+            using TypeInfo = Attributes::ActiveBatteryChargeFaults::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -3525,46 +3750,64 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::ContentLauncher::Id: {
-        using namespace Clusters::ContentLauncher;
+    case Clusters::GeneralCommissioning::Id: {
+        using namespace Clusters::GeneralCommissioning;
         switch (aPath.mAttributeId) {
-        case Attributes::AcceptHeader::Id: {
-            using TypeInfo = Attributes::AcceptHeader::TypeInfo;
+        case Attributes::Breadcrumb::Id: {
+            using TypeInfo = Attributes::Breadcrumb::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSString * newElement_0;
-                    newElement_0 = [[NSString alloc] initWithBytes:entry_0.data()
-                                                            length:entry_0.size()
-                                                          encoding:NSUTF8StringEncoding];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedLongLong:cppValue];
+            return value;
+        }
+        case Attributes::BasicCommissioningInfo::Id: {
+            using TypeInfo = Attributes::BasicCommissioningInfo::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
             }
+            CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nonnull value;
+            value = [CHIPGeneralCommissioningClusterBasicCommissioningInfo new];
+            value.failSafeExpiryLengthSeconds = [NSNumber numberWithUnsignedShort:cppValue.failSafeExpiryLengthSeconds];
+            value.maxCumulativeFailsafeSeconds = [NSNumber numberWithUnsignedShort:cppValue.maxCumulativeFailsafeSeconds];
             return value;
         }
-        case Attributes::SupportedStreamingProtocols::Id: {
-            using TypeInfo = Attributes::SupportedStreamingProtocols::TypeInfo;
+        case Attributes::RegulatoryConfig::Id: {
+            using TypeInfo = Attributes::RegulatoryConfig::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+            return value;
+        }
+        case Attributes::LocationCapability::Id: {
+            using TypeInfo = Attributes::LocationCapability::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+            return value;
+        }
+        case Attributes::SupportsConcurrentConnection::Id: {
+            using TypeInfo = Attributes::SupportsConcurrentConnection::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithBool:cppValue];
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -3673,39 +3916,22 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::Descriptor::Id: {
-        using namespace Clusters::Descriptor;
+    case Clusters::NetworkCommissioning::Id: {
+        using namespace Clusters::NetworkCommissioning;
         switch (aPath.mAttributeId) {
-        case Attributes::DeviceList::Id: {
-            using TypeInfo = Attributes::DeviceList::TypeInfo;
+        case Attributes::MaxNetworks::Id: {
+            using TypeInfo = Attributes::MaxNetworks::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    CHIPDescriptorClusterDeviceType * newElement_0;
-                    newElement_0 = [CHIPDescriptorClusterDeviceType new];
-                    newElement_0.type = [NSNumber numberWithUnsignedInt:entry_0.type];
-                    newElement_0.revision = [NSNumber numberWithUnsignedShort:entry_0.revision];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::ServerList::Id: {
-            using TypeInfo = Attributes::ServerList::TypeInfo;
+        case Attributes::Networks::Id: {
+            using TypeInfo = Attributes::Networks::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -3717,8 +3943,10 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
                 auto iter_0 = cppValue.begin();
                 while (iter_0.Next()) {
                     auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    CHIPNetworkCommissioningClusterNetworkInfo * newElement_0;
+                    newElement_0 = [CHIPNetworkCommissioningClusterNetworkInfo new];
+                    newElement_0.networkID = [NSData dataWithBytes:entry_0.networkID.data() length:entry_0.networkID.size()];
+                    newElement_0.connected = [NSNumber numberWithBool:entry_0.connected];
                     [array_0 addObject:newElement_0];
                 }
                 CHIP_ERROR err = iter_0.GetStatus();
@@ -3730,55 +3958,81 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::ClientList::Id: {
-            using TypeInfo = Attributes::ClientList::TypeInfo;
+        case Attributes::ScanMaxTimeSeconds::Id: {
+            using TypeInfo = Attributes::ScanMaxTimeSeconds::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
+            return value;
+        }
+        case Attributes::ConnectMaxTimeSeconds::Id: {
+            using TypeInfo = Attributes::ConnectMaxTimeSeconds::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
             }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::PartsList::Id: {
-            using TypeInfo = Attributes::PartsList::TypeInfo;
+        case Attributes::InterfaceEnabled::Id: {
+            using TypeInfo = Attributes::InterfaceEnabled::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedShort:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithBool:cppValue];
+            return value;
+        }
+        case Attributes::LastNetworkingStatus::Id: {
+            using TypeInfo = Attributes::LastNetworkingStatus::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value())];
+            }
+            return value;
+        }
+        case Attributes::LastNetworkID::Id: {
+            using TypeInfo = Attributes::LastNetworkID::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSData * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSData dataWithBytes:cppValue.Value().data() length:cppValue.Value().size()];
+            }
+            return value;
+        }
+        case Attributes::LastConnectErrorValue::Id: {
+            using TypeInfo = Attributes::LastConnectErrorValue::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithInt:cppValue.Value()];
             }
             return value;
         }
@@ -3997,250 +4251,490 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::DoorLock::Id: {
-        using namespace Clusters::DoorLock;
+    case Clusters::GeneralDiagnostics::Id: {
+        using namespace Clusters::GeneralDiagnostics;
         switch (aPath.mAttributeId) {
-        case Attributes::LockState::Id: {
-            using TypeInfo = Attributes::LockState::TypeInfo;
+        case Attributes::NetworkInterfaces::Id: {
+            using TypeInfo = Attributes::NetworkInterfaces::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value())];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    CHIPGeneralDiagnosticsClusterNetworkInterfaceType * newElement_0;
+                    newElement_0 = [CHIPGeneralDiagnosticsClusterNetworkInterfaceType new];
+                    newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data()
+                                                                 length:entry_0.name.size()
+                                                               encoding:NSUTF8StringEncoding];
+                    newElement_0.isOperational = [NSNumber numberWithBool:entry_0.isOperational];
+                    if (entry_0.offPremiseServicesReachableIPv4.IsNull()) {
+                        newElement_0.offPremiseServicesReachableIPv4 = nil;
+                    } else {
+                        newElement_0.offPremiseServicesReachableIPv4 =
+                            [NSNumber numberWithBool:entry_0.offPremiseServicesReachableIPv4.Value()];
+                    }
+                    if (entry_0.offPremiseServicesReachableIPv6.IsNull()) {
+                        newElement_0.offPremiseServicesReachableIPv6 = nil;
+                    } else {
+                        newElement_0.offPremiseServicesReachableIPv6 =
+                            [NSNumber numberWithBool:entry_0.offPremiseServicesReachableIPv6.Value()];
+                    }
+                    newElement_0.hardwareAddress = [NSData dataWithBytes:entry_0.hardwareAddress.data()
+                                                                  length:entry_0.hardwareAddress.size()];
+                    { // Scope for our temporary variables
+                        auto * array_2 = [NSMutableArray new];
+                        auto iter_2 = entry_0.IPv4Addresses.begin();
+                        while (iter_2.Next()) {
+                            auto & entry_2 = iter_2.GetValue();
+                            NSData * newElement_2;
+                            newElement_2 = [NSData dataWithBytes:entry_2.data() length:entry_2.size()];
+                            [array_2 addObject:newElement_2];
+                        }
+                        CHIP_ERROR err = iter_2.GetStatus();
+                        if (err != CHIP_NO_ERROR) {
+                            *aError = err;
+                            return nil;
+                        }
+                        newElement_0.iPv4Addresses = array_2;
+                    }
+                    { // Scope for our temporary variables
+                        auto * array_2 = [NSMutableArray new];
+                        auto iter_2 = entry_0.IPv6Addresses.begin();
+                        while (iter_2.Next()) {
+                            auto & entry_2 = iter_2.GetValue();
+                            NSData * newElement_2;
+                            newElement_2 = [NSData dataWithBytes:entry_2.data() length:entry_2.size()];
+                            [array_2 addObject:newElement_2];
+                        }
+                        CHIP_ERROR err = iter_2.GetStatus();
+                        if (err != CHIP_NO_ERROR) {
+                            *aError = err;
+                            return nil;
+                        }
+                        newElement_0.iPv6Addresses = array_2;
+                    }
+                    newElement_0.type = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.type)];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
             return value;
         }
-        case Attributes::LockType::Id: {
-            using TypeInfo = Attributes::LockType::TypeInfo;
+        case Attributes::RebootCount::Id: {
+            using TypeInfo = Attributes::RebootCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ActuatorEnabled::Id: {
-            using TypeInfo = Attributes::ActuatorEnabled::TypeInfo;
+        case Attributes::UpTime::Id: {
+            using TypeInfo = Attributes::UpTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
+            value = [NSNumber numberWithUnsignedLongLong:cppValue];
             return value;
         }
-        case Attributes::DoorState::Id: {
-            using TypeInfo = Attributes::DoorState::TypeInfo;
+        case Attributes::TotalOperationalHours::Id: {
+            using TypeInfo = Attributes::TotalOperationalHours::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value())];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::DoorOpenEvents::Id: {
-            using TypeInfo = Attributes::DoorOpenEvents::TypeInfo;
+        case Attributes::BootReasons::Id: {
+            using TypeInfo = Attributes::BootReasons::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::DoorClosedEvents::Id: {
-            using TypeInfo = Attributes::DoorClosedEvents::TypeInfo;
+        case Attributes::ActiveHardwareFaults::Id: {
+            using TypeInfo = Attributes::ActiveHardwareFaults::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::OpenPeriod::Id: {
-            using TypeInfo = Attributes::OpenPeriod::TypeInfo;
+        case Attributes::ActiveRadioFaults::Id: {
+            using TypeInfo = Attributes::ActiveRadioFaults::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::NumberOfTotalUsersSupported::Id: {
-            using TypeInfo = Attributes::NumberOfTotalUsersSupported::TypeInfo;
+        case Attributes::ActiveNetworkFaults::Id: {
+            using TypeInfo = Attributes::ActiveNetworkFaults::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::NumberOfPINUsersSupported::Id: {
-            using TypeInfo = Attributes::NumberOfPINUsersSupported::TypeInfo;
+        case Attributes::TestEventTriggersEnabled::Id: {
+            using TypeInfo = Attributes::TestEventTriggersEnabled::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithBool:cppValue];
             return value;
         }
-        case Attributes::NumberOfRFIDUsersSupported::Id: {
-            using TypeInfo = Attributes::NumberOfRFIDUsersSupported::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::NumberOfWeekDaySchedulesSupportedPerUser::Id: {
-            using TypeInfo = Attributes::NumberOfWeekDaySchedulesSupportedPerUser::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::NumberOfYearDaySchedulesSupportedPerUser::Id: {
-            using TypeInfo = Attributes::NumberOfYearDaySchedulesSupportedPerUser::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::NumberOfHolidaySchedulesSupported::Id: {
-            using TypeInfo = Attributes::NumberOfHolidaySchedulesSupported::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::MaxPINCodeLength::Id: {
-            using TypeInfo = Attributes::MaxPINCodeLength::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::MinPINCodeLength::Id: {
-            using TypeInfo = Attributes::MinPINCodeLength::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::SoftwareDiagnostics::Id: {
+        using namespace Clusters::SoftwareDiagnostics;
+        switch (aPath.mAttributeId) {
+        case Attributes::ThreadMetrics::Id: {
+            using TypeInfo = Attributes::ThreadMetrics::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    CHIPSoftwareDiagnosticsClusterThreadMetrics * newElement_0;
+                    newElement_0 = [CHIPSoftwareDiagnosticsClusterThreadMetrics new];
+                    newElement_0.id = [NSNumber numberWithUnsignedLongLong:entry_0.id];
+                    if (entry_0.name.HasValue()) {
+                        newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.Value().data()
+                                                                     length:entry_0.name.Value().size()
+                                                                   encoding:NSUTF8StringEncoding];
+                    } else {
+                        newElement_0.name = nil;
+                    }
+                    if (entry_0.stackFreeCurrent.HasValue()) {
+                        newElement_0.stackFreeCurrent = [NSNumber numberWithUnsignedInt:entry_0.stackFreeCurrent.Value()];
+                    } else {
+                        newElement_0.stackFreeCurrent = nil;
+                    }
+                    if (entry_0.stackFreeMinimum.HasValue()) {
+                        newElement_0.stackFreeMinimum = [NSNumber numberWithUnsignedInt:entry_0.stackFreeMinimum.Value()];
+                    } else {
+                        newElement_0.stackFreeMinimum = nil;
+                    }
+                    if (entry_0.stackSize.HasValue()) {
+                        newElement_0.stackSize = [NSNumber numberWithUnsignedInt:entry_0.stackSize.Value()];
+                    } else {
+                        newElement_0.stackSize = nil;
+                    }
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::MaxRFIDCodeLength::Id: {
-            using TypeInfo = Attributes::MaxRFIDCodeLength::TypeInfo;
+        case Attributes::CurrentHeapFree::Id: {
+            using TypeInfo = Attributes::CurrentHeapFree::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedLongLong:cppValue];
             return value;
         }
-        case Attributes::MinRFIDCodeLength::Id: {
-            using TypeInfo = Attributes::MinRFIDCodeLength::TypeInfo;
+        case Attributes::CurrentHeapUsed::Id: {
+            using TypeInfo = Attributes::CurrentHeapUsed::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedLongLong:cppValue];
             return value;
         }
-        case Attributes::CredentialRulesSupport::Id: {
-            using TypeInfo = Attributes::CredentialRulesSupport::TypeInfo;
+        case Attributes::CurrentHeapHighWatermark::Id: {
+            using TypeInfo = Attributes::CurrentHeapHighWatermark::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue.Raw()];
+            value = [NSNumber numberWithUnsignedLongLong:cppValue];
             return value;
         }
-        case Attributes::NumberOfCredentialsSupportedPerUser::Id: {
-            using TypeInfo = Attributes::NumberOfCredentialsSupportedPerUser::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::Language::Id: {
-            using TypeInfo = Attributes::Language::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::LEDSettings::Id: {
-            using TypeInfo = Attributes::LEDSettings::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::AutoRelockTime::Id: {
-            using TypeInfo = Attributes::AutoRelockTime::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -4250,162 +4744,131 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::SoundVolume::Id: {
-            using TypeInfo = Attributes::SoundVolume::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::OperatingMode::Id: {
-            using TypeInfo = Attributes::OperatingMode::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
-            return value;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
         }
-        case Attributes::SupportedOperatingModes::Id: {
-            using TypeInfo = Attributes::SupportedOperatingModes::TypeInfo;
+        break;
+    }
+    case Clusters::ThreadNetworkDiagnostics::Id: {
+        using namespace Clusters::ThreadNetworkDiagnostics;
+        switch (aPath.mAttributeId) {
+        case Attributes::Channel::Id: {
+            using TypeInfo = Attributes::Channel::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue.Raw()];
-            return value;
-        }
-        case Attributes::DefaultConfigurationRegister::Id: {
-            using TypeInfo = Attributes::DefaultConfigurationRegister::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue.Raw()];
             return value;
         }
-        case Attributes::EnableLocalProgramming::Id: {
-            using TypeInfo = Attributes::EnableLocalProgramming::TypeInfo;
+        case Attributes::RoutingRole::Id: {
+            using TypeInfo = Attributes::RoutingRole::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
-            return value;
-        }
-        case Attributes::EnableOneTouchLocking::Id: {
-            using TypeInfo = Attributes::EnableOneTouchLocking::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value())];
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
             return value;
         }
-        case Attributes::EnableInsideStatusLED::Id: {
-            using TypeInfo = Attributes::EnableInsideStatusLED::TypeInfo;
+        case Attributes::NetworkName::Id: {
+            using TypeInfo = Attributes::NetworkName::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
-            return value;
-        }
-        case Attributes::EnablePrivacyModeButton::Id: {
-            using TypeInfo = Attributes::EnablePrivacyModeButton::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSString * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [[NSString alloc] initWithBytes:cppValue.Value().data()
+                                                 length:cppValue.Value().size()
+                                               encoding:NSUTF8StringEncoding];
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
             return value;
         }
-        case Attributes::LocalProgrammingFeatures::Id: {
-            using TypeInfo = Attributes::LocalProgrammingFeatures::TypeInfo;
+        case Attributes::PanId::Id: {
+            using TypeInfo = Attributes::PanId::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue.Raw()];
-            return value;
-        }
-        case Attributes::WrongCodeEntryLimit::Id: {
-            using TypeInfo = Attributes::WrongCodeEntryLimit::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::UserCodeTemporaryDisableTime::Id: {
-            using TypeInfo = Attributes::UserCodeTemporaryDisableTime::TypeInfo;
+        case Attributes::ExtendedPanId::Id: {
+            using TypeInfo = Attributes::ExtendedPanId::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
-            return value;
-        }
-        case Attributes::SendPINOverTheAir::Id: {
-            using TypeInfo = Attributes::SendPINOverTheAir::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
             return value;
         }
-        case Attributes::RequirePINforRemoteOperation::Id: {
-            using TypeInfo = Attributes::RequirePINforRemoteOperation::TypeInfo;
+        case Attributes::MeshLocalPrefix::Id: {
+            using TypeInfo = Attributes::MeshLocalPrefix::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
+            NSData * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSData dataWithBytes:cppValue.Value().data() length:cppValue.Value().size()];
+            }
             return value;
         }
-        case Attributes::ExpiringUserTimeout::Id: {
-            using TypeInfo = Attributes::ExpiringUserTimeout::TypeInfo;
+        case Attributes::OverrunCount::Id: {
+            using TypeInfo = Attributes::OverrunCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedLongLong:cppValue];
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::NeighborTableList::Id: {
+            using TypeInfo = Attributes::NeighborTableList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -4417,8 +4880,30 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
                 auto iter_0 = cppValue.begin();
                 while (iter_0.Next()) {
                     auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    CHIPThreadNetworkDiagnosticsClusterNeighborTable * newElement_0;
+                    newElement_0 = [CHIPThreadNetworkDiagnosticsClusterNeighborTable new];
+                    newElement_0.extAddress = [NSNumber numberWithUnsignedLongLong:entry_0.extAddress];
+                    newElement_0.age = [NSNumber numberWithUnsignedInt:entry_0.age];
+                    newElement_0.rloc16 = [NSNumber numberWithUnsignedShort:entry_0.rloc16];
+                    newElement_0.linkFrameCounter = [NSNumber numberWithUnsignedInt:entry_0.linkFrameCounter];
+                    newElement_0.mleFrameCounter = [NSNumber numberWithUnsignedInt:entry_0.mleFrameCounter];
+                    newElement_0.lqi = [NSNumber numberWithUnsignedChar:entry_0.lqi];
+                    if (entry_0.averageRssi.IsNull()) {
+                        newElement_0.averageRssi = nil;
+                    } else {
+                        newElement_0.averageRssi = [NSNumber numberWithChar:entry_0.averageRssi.Value()];
+                    }
+                    if (entry_0.lastRssi.IsNull()) {
+                        newElement_0.lastRssi = nil;
+                    } else {
+                        newElement_0.lastRssi = [NSNumber numberWithChar:entry_0.lastRssi.Value()];
+                    }
+                    newElement_0.frameErrorRate = [NSNumber numberWithUnsignedChar:entry_0.frameErrorRate];
+                    newElement_0.messageErrorRate = [NSNumber numberWithUnsignedChar:entry_0.messageErrorRate];
+                    newElement_0.rxOnWhenIdle = [NSNumber numberWithBool:entry_0.rxOnWhenIdle];
+                    newElement_0.fullThreadDevice = [NSNumber numberWithBool:entry_0.fullThreadDevice];
+                    newElement_0.fullNetworkData = [NSNumber numberWithBool:entry_0.fullNetworkData];
+                    newElement_0.isChild = [NSNumber numberWithBool:entry_0.isChild];
                     [array_0 addObject:newElement_0];
                 }
                 CHIP_ERROR err = iter_0.GetStatus();
@@ -4430,8 +4915,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::RouteTableList::Id: {
+            using TypeInfo = Attributes::RouteTableList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -4443,8 +4928,18 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
                 auto iter_0 = cppValue.begin();
                 while (iter_0.Next()) {
                     auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    CHIPThreadNetworkDiagnosticsClusterRouteTable * newElement_0;
+                    newElement_0 = [CHIPThreadNetworkDiagnosticsClusterRouteTable new];
+                    newElement_0.extAddress = [NSNumber numberWithUnsignedLongLong:entry_0.extAddress];
+                    newElement_0.rloc16 = [NSNumber numberWithUnsignedShort:entry_0.rloc16];
+                    newElement_0.routerId = [NSNumber numberWithUnsignedChar:entry_0.routerId];
+                    newElement_0.nextHop = [NSNumber numberWithUnsignedChar:entry_0.nextHop];
+                    newElement_0.pathCost = [NSNumber numberWithUnsignedChar:entry_0.pathCost];
+                    newElement_0.lqiIn = [NSNumber numberWithUnsignedChar:entry_0.LQIIn];
+                    newElement_0.lqiOut = [NSNumber numberWithUnsignedChar:entry_0.LQIOut];
+                    newElement_0.age = [NSNumber numberWithUnsignedChar:entry_0.age];
+                    newElement_0.allocated = [NSNumber numberWithBool:entry_0.allocated];
+                    newElement_0.linkEstablished = [NSNumber numberWithBool:entry_0.linkEstablished];
                     [array_0 addObject:newElement_0];
                 }
                 CHIP_ERROR err = iter_0.GetStatus();
@@ -4456,175 +4951,160 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::PartitionId::Id: {
+            using TypeInfo = Attributes::PartitionId::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::Weighting::Id: {
+            using TypeInfo = Attributes::Weighting::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::DataVersion::Id: {
+            using TypeInfo = Attributes::DataVersion::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            }
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::ElectricalMeasurement::Id: {
-        using namespace Clusters::ElectricalMeasurement;
-        switch (aPath.mAttributeId) {
-        case Attributes::MeasurementType::Id: {
-            using TypeInfo = Attributes::MeasurementType::TypeInfo;
+        case Attributes::StableDataVersion::Id: {
+            using TypeInfo = Attributes::StableDataVersion::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
-            return value;
-        }
-        case Attributes::DcVoltage::Id: {
-            using TypeInfo = Attributes::DcVoltage::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::DcVoltageMin::Id: {
-            using TypeInfo = Attributes::DcVoltageMin::TypeInfo;
+        case Attributes::LeaderRouterId::Id: {
+            using TypeInfo = Attributes::LeaderRouterId::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::DcVoltageMax::Id: {
-            using TypeInfo = Attributes::DcVoltageMax::TypeInfo;
+        case Attributes::DetachedRoleCount::Id: {
+            using TypeInfo = Attributes::DetachedRoleCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::DcCurrent::Id: {
-            using TypeInfo = Attributes::DcCurrent::TypeInfo;
+        case Attributes::ChildRoleCount::Id: {
+            using TypeInfo = Attributes::ChildRoleCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::DcCurrentMin::Id: {
-            using TypeInfo = Attributes::DcCurrentMin::TypeInfo;
+        case Attributes::RouterRoleCount::Id: {
+            using TypeInfo = Attributes::RouterRoleCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::DcCurrentMax::Id: {
-            using TypeInfo = Attributes::DcCurrentMax::TypeInfo;
+        case Attributes::LeaderRoleCount::Id: {
+            using TypeInfo = Attributes::LeaderRoleCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::DcPower::Id: {
-            using TypeInfo = Attributes::DcPower::TypeInfo;
+        case Attributes::AttachAttemptCount::Id: {
+            using TypeInfo = Attributes::AttachAttemptCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::DcPowerMin::Id: {
-            using TypeInfo = Attributes::DcPowerMin::TypeInfo;
+        case Attributes::PartitionIdChangeCount::Id: {
+            using TypeInfo = Attributes::PartitionIdChangeCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::DcPowerMax::Id: {
-            using TypeInfo = Attributes::DcPowerMax::TypeInfo;
+        case Attributes::BetterPartitionAttachAttemptCount::Id: {
+            using TypeInfo = Attributes::BetterPartitionAttachAttemptCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::DcVoltageMultiplier::Id: {
-            using TypeInfo = Attributes::DcVoltageMultiplier::TypeInfo;
+        case Attributes::ParentChangeCount::Id: {
+            using TypeInfo = Attributes::ParentChangeCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -4634,129 +5114,129 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::DcVoltageDivisor::Id: {
-            using TypeInfo = Attributes::DcVoltageDivisor::TypeInfo;
+        case Attributes::TxTotalCount::Id: {
+            using TypeInfo = Attributes::TxTotalCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::DcCurrentMultiplier::Id: {
-            using TypeInfo = Attributes::DcCurrentMultiplier::TypeInfo;
+        case Attributes::TxUnicastCount::Id: {
+            using TypeInfo = Attributes::TxUnicastCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::DcCurrentDivisor::Id: {
-            using TypeInfo = Attributes::DcCurrentDivisor::TypeInfo;
+        case Attributes::TxBroadcastCount::Id: {
+            using TypeInfo = Attributes::TxBroadcastCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::DcPowerMultiplier::Id: {
-            using TypeInfo = Attributes::DcPowerMultiplier::TypeInfo;
+        case Attributes::TxAckRequestedCount::Id: {
+            using TypeInfo = Attributes::TxAckRequestedCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::DcPowerDivisor::Id: {
-            using TypeInfo = Attributes::DcPowerDivisor::TypeInfo;
+        case Attributes::TxAckedCount::Id: {
+            using TypeInfo = Attributes::TxAckedCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::AcFrequency::Id: {
-            using TypeInfo = Attributes::AcFrequency::TypeInfo;
+        case Attributes::TxNoAckRequestedCount::Id: {
+            using TypeInfo = Attributes::TxNoAckRequestedCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::AcFrequencyMin::Id: {
-            using TypeInfo = Attributes::AcFrequencyMin::TypeInfo;
+        case Attributes::TxDataCount::Id: {
+            using TypeInfo = Attributes::TxDataCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::AcFrequencyMax::Id: {
-            using TypeInfo = Attributes::AcFrequencyMax::TypeInfo;
+        case Attributes::TxDataPollCount::Id: {
+            using TypeInfo = Attributes::TxDataPollCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::NeutralCurrent::Id: {
-            using TypeInfo = Attributes::NeutralCurrent::TypeInfo;
+        case Attributes::TxBeaconCount::Id: {
+            using TypeInfo = Attributes::TxBeaconCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::TotalActivePower::Id: {
-            using TypeInfo = Attributes::TotalActivePower::TypeInfo;
+        case Attributes::TxBeaconRequestCount::Id: {
+            using TypeInfo = Attributes::TxBeaconRequestCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithInt:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::TotalReactivePower::Id: {
-            using TypeInfo = Attributes::TotalReactivePower::TypeInfo;
+        case Attributes::TxOtherCount::Id: {
+            using TypeInfo = Attributes::TxOtherCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithInt:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::TotalApparentPower::Id: {
-            using TypeInfo = Attributes::TotalApparentPower::TypeInfo;
+        case Attributes::TxRetryCount::Id: {
+            using TypeInfo = Attributes::TxRetryCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -4766,162 +5246,162 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::Measured1stHarmonicCurrent::Id: {
-            using TypeInfo = Attributes::Measured1stHarmonicCurrent::TypeInfo;
+        case Attributes::TxDirectMaxRetryExpiryCount::Id: {
+            using TypeInfo = Attributes::TxDirectMaxRetryExpiryCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::Measured3rdHarmonicCurrent::Id: {
-            using TypeInfo = Attributes::Measured3rdHarmonicCurrent::TypeInfo;
+        case Attributes::TxIndirectMaxRetryExpiryCount::Id: {
+            using TypeInfo = Attributes::TxIndirectMaxRetryExpiryCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::Measured5thHarmonicCurrent::Id: {
-            using TypeInfo = Attributes::Measured5thHarmonicCurrent::TypeInfo;
+        case Attributes::TxErrCcaCount::Id: {
+            using TypeInfo = Attributes::TxErrCcaCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::Measured7thHarmonicCurrent::Id: {
-            using TypeInfo = Attributes::Measured7thHarmonicCurrent::TypeInfo;
+        case Attributes::TxErrAbortCount::Id: {
+            using TypeInfo = Attributes::TxErrAbortCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::Measured9thHarmonicCurrent::Id: {
-            using TypeInfo = Attributes::Measured9thHarmonicCurrent::TypeInfo;
+        case Attributes::TxErrBusyChannelCount::Id: {
+            using TypeInfo = Attributes::TxErrBusyChannelCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::Measured11thHarmonicCurrent::Id: {
-            using TypeInfo = Attributes::Measured11thHarmonicCurrent::TypeInfo;
+        case Attributes::RxTotalCount::Id: {
+            using TypeInfo = Attributes::RxTotalCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::MeasuredPhase1stHarmonicCurrent::Id: {
-            using TypeInfo = Attributes::MeasuredPhase1stHarmonicCurrent::TypeInfo;
+        case Attributes::RxUnicastCount::Id: {
+            using TypeInfo = Attributes::RxUnicastCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::MeasuredPhase3rdHarmonicCurrent::Id: {
-            using TypeInfo = Attributes::MeasuredPhase3rdHarmonicCurrent::TypeInfo;
+        case Attributes::RxBroadcastCount::Id: {
+            using TypeInfo = Attributes::RxBroadcastCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::MeasuredPhase5thHarmonicCurrent::Id: {
-            using TypeInfo = Attributes::MeasuredPhase5thHarmonicCurrent::TypeInfo;
+        case Attributes::RxDataCount::Id: {
+            using TypeInfo = Attributes::RxDataCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::MeasuredPhase7thHarmonicCurrent::Id: {
-            using TypeInfo = Attributes::MeasuredPhase7thHarmonicCurrent::TypeInfo;
+        case Attributes::RxDataPollCount::Id: {
+            using TypeInfo = Attributes::RxDataPollCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::MeasuredPhase9thHarmonicCurrent::Id: {
-            using TypeInfo = Attributes::MeasuredPhase9thHarmonicCurrent::TypeInfo;
+        case Attributes::RxBeaconCount::Id: {
+            using TypeInfo = Attributes::RxBeaconCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::MeasuredPhase11thHarmonicCurrent::Id: {
-            using TypeInfo = Attributes::MeasuredPhase11thHarmonicCurrent::TypeInfo;
+        case Attributes::RxBeaconRequestCount::Id: {
+            using TypeInfo = Attributes::RxBeaconRequestCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::AcFrequencyMultiplier::Id: {
-            using TypeInfo = Attributes::AcFrequencyMultiplier::TypeInfo;
+        case Attributes::RxOtherCount::Id: {
+            using TypeInfo = Attributes::RxOtherCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::AcFrequencyDivisor::Id: {
-            using TypeInfo = Attributes::AcFrequencyDivisor::TypeInfo;
+        case Attributes::RxAddressFilteredCount::Id: {
+            using TypeInfo = Attributes::RxAddressFilteredCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::PowerMultiplier::Id: {
-            using TypeInfo = Attributes::PowerMultiplier::TypeInfo;
+        case Attributes::RxDestAddrFilteredCount::Id: {
+            using TypeInfo = Attributes::RxDestAddrFilteredCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -4931,8 +5411,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::PowerDivisor::Id: {
-            using TypeInfo = Attributes::PowerDivisor::TypeInfo;
+        case Attributes::RxDuplicatedCount::Id: {
+            using TypeInfo = Attributes::RxDuplicatedCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -4942,195 +5422,293 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::HarmonicCurrentMultiplier::Id: {
-            using TypeInfo = Attributes::HarmonicCurrentMultiplier::TypeInfo;
+        case Attributes::RxErrNoFrameCount::Id: {
+            using TypeInfo = Attributes::RxErrNoFrameCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithChar:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::PhaseHarmonicCurrentMultiplier::Id: {
-            using TypeInfo = Attributes::PhaseHarmonicCurrentMultiplier::TypeInfo;
+        case Attributes::RxErrUnknownNeighborCount::Id: {
+            using TypeInfo = Attributes::RxErrUnknownNeighborCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithChar:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::InstantaneousVoltage::Id: {
-            using TypeInfo = Attributes::InstantaneousVoltage::TypeInfo;
+        case Attributes::RxErrInvalidSrcAddrCount::Id: {
+            using TypeInfo = Attributes::RxErrInvalidSrcAddrCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::InstantaneousLineCurrent::Id: {
-            using TypeInfo = Attributes::InstantaneousLineCurrent::TypeInfo;
+        case Attributes::RxErrSecCount::Id: {
+            using TypeInfo = Attributes::RxErrSecCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::InstantaneousActiveCurrent::Id: {
-            using TypeInfo = Attributes::InstantaneousActiveCurrent::TypeInfo;
+        case Attributes::RxErrFcsCount::Id: {
+            using TypeInfo = Attributes::RxErrFcsCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::InstantaneousReactiveCurrent::Id: {
-            using TypeInfo = Attributes::InstantaneousReactiveCurrent::TypeInfo;
+        case Attributes::RxErrOtherCount::Id: {
+            using TypeInfo = Attributes::RxErrOtherCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::InstantaneousPower::Id: {
-            using TypeInfo = Attributes::InstantaneousPower::TypeInfo;
+        case Attributes::ActiveTimestamp::Id: {
+            using TypeInfo = Attributes::ActiveTimestamp::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::RmsVoltage::Id: {
-            using TypeInfo = Attributes::RmsVoltage::TypeInfo;
+        case Attributes::PendingTimestamp::Id: {
+            using TypeInfo = Attributes::PendingTimestamp::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::RmsVoltageMin::Id: {
-            using TypeInfo = Attributes::RmsVoltageMin::TypeInfo;
+        case Attributes::Delay::Id: {
+            using TypeInfo = Attributes::Delay::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::RmsVoltageMax::Id: {
-            using TypeInfo = Attributes::RmsVoltageMax::TypeInfo;
+        case Attributes::SecurityPolicy::Id: {
+            using TypeInfo = Attributes::SecurityPolicy::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [CHIPThreadNetworkDiagnosticsClusterSecurityPolicy new];
+                value.rotationTime = [NSNumber numberWithUnsignedShort:cppValue.Value().rotationTime];
+                value.flags = [NSNumber numberWithUnsignedShort:cppValue.Value().flags];
+            }
             return value;
         }
-        case Attributes::RmsCurrent::Id: {
-            using TypeInfo = Attributes::RmsCurrent::TypeInfo;
+        case Attributes::ChannelMask::Id: {
+            using TypeInfo = Attributes::ChannelMask::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSData * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSData dataWithBytes:cppValue.Value().data() length:cppValue.Value().size()];
+            }
             return value;
         }
-        case Attributes::RmsCurrentMin::Id: {
-            using TypeInfo = Attributes::RmsCurrentMin::TypeInfo;
+        case Attributes::OperationalDatasetComponents::Id: {
+            using TypeInfo = Attributes::OperationalDatasetComponents::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents new];
+                value.activeTimestampPresent = [NSNumber numberWithBool:cppValue.Value().activeTimestampPresent];
+                value.pendingTimestampPresent = [NSNumber numberWithBool:cppValue.Value().pendingTimestampPresent];
+                value.masterKeyPresent = [NSNumber numberWithBool:cppValue.Value().masterKeyPresent];
+                value.networkNamePresent = [NSNumber numberWithBool:cppValue.Value().networkNamePresent];
+                value.extendedPanIdPresent = [NSNumber numberWithBool:cppValue.Value().extendedPanIdPresent];
+                value.meshLocalPrefixPresent = [NSNumber numberWithBool:cppValue.Value().meshLocalPrefixPresent];
+                value.delayPresent = [NSNumber numberWithBool:cppValue.Value().delayPresent];
+                value.panIdPresent = [NSNumber numberWithBool:cppValue.Value().panIdPresent];
+                value.channelPresent = [NSNumber numberWithBool:cppValue.Value().channelPresent];
+                value.pskcPresent = [NSNumber numberWithBool:cppValue.Value().pskcPresent];
+                value.securityPolicyPresent = [NSNumber numberWithBool:cppValue.Value().securityPolicyPresent];
+                value.channelMaskPresent = [NSNumber numberWithBool:cppValue.Value().channelMaskPresent];
+            }
             return value;
         }
-        case Attributes::RmsCurrentMax::Id: {
-            using TypeInfo = Attributes::RmsCurrentMax::TypeInfo;
+        case Attributes::ActiveNetworkFaultsList::Id: {
+            using TypeInfo = Attributes::ActiveNetworkFaultsList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::ActivePower::Id: {
-            using TypeInfo = Attributes::ActivePower::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::ActivePowerMin::Id: {
-            using TypeInfo = Attributes::ActivePowerMin::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::ActivePowerMax::Id: {
-            using TypeInfo = Attributes::ActivePowerMax::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::ReactivePower::Id: {
-            using TypeInfo = Attributes::ReactivePower::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::ApparentPower::Id: {
-            using TypeInfo = Attributes::ApparentPower::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -5140,349 +5718,489 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::PowerFactor::Id: {
-            using TypeInfo = Attributes::PowerFactor::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::WiFiNetworkDiagnostics::Id: {
+        using namespace Clusters::WiFiNetworkDiagnostics;
+        switch (aPath.mAttributeId) {
+        case Attributes::Bssid::Id: {
+            using TypeInfo = Attributes::Bssid::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithChar:cppValue];
+            NSData * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSData dataWithBytes:cppValue.Value().data() length:cppValue.Value().size()];
+            }
             return value;
         }
-        case Attributes::AverageRmsVoltageMeasurementPeriod::Id: {
-            using TypeInfo = Attributes::AverageRmsVoltageMeasurementPeriod::TypeInfo;
+        case Attributes::SecurityType::Id: {
+            using TypeInfo = Attributes::SecurityType::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value())];
+            }
             return value;
         }
-        case Attributes::AverageRmsUnderVoltageCounter::Id: {
-            using TypeInfo = Attributes::AverageRmsUnderVoltageCounter::TypeInfo;
+        case Attributes::WiFiVersion::Id: {
+            using TypeInfo = Attributes::WiFiVersion::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value())];
+            }
             return value;
         }
-        case Attributes::RmsExtremeOverVoltagePeriod::Id: {
-            using TypeInfo = Attributes::RmsExtremeOverVoltagePeriod::TypeInfo;
+        case Attributes::ChannelNumber::Id: {
+            using TypeInfo = Attributes::ChannelNumber::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
-            return value;
-        }
-        case Attributes::RmsExtremeUnderVoltagePeriod::Id: {
-            using TypeInfo = Attributes::RmsExtremeUnderVoltagePeriod::TypeInfo;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
+            }
+            return value;
+        }
+        case Attributes::Rssi::Id: {
+            using TypeInfo = Attributes::Rssi::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithChar:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::RmsVoltageSagPeriod::Id: {
-            using TypeInfo = Attributes::RmsVoltageSagPeriod::TypeInfo;
+        case Attributes::BeaconLostCount::Id: {
+            using TypeInfo = Attributes::BeaconLostCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::RmsVoltageSwellPeriod::Id: {
-            using TypeInfo = Attributes::RmsVoltageSwellPeriod::TypeInfo;
+        case Attributes::BeaconRxCount::Id: {
+            using TypeInfo = Attributes::BeaconRxCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::AcVoltageMultiplier::Id: {
-            using TypeInfo = Attributes::AcVoltageMultiplier::TypeInfo;
+        case Attributes::PacketMulticastRxCount::Id: {
+            using TypeInfo = Attributes::PacketMulticastRxCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::AcVoltageDivisor::Id: {
-            using TypeInfo = Attributes::AcVoltageDivisor::TypeInfo;
+        case Attributes::PacketMulticastTxCount::Id: {
+            using TypeInfo = Attributes::PacketMulticastTxCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::AcCurrentMultiplier::Id: {
-            using TypeInfo = Attributes::AcCurrentMultiplier::TypeInfo;
+        case Attributes::PacketUnicastRxCount::Id: {
+            using TypeInfo = Attributes::PacketUnicastRxCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::AcCurrentDivisor::Id: {
-            using TypeInfo = Attributes::AcCurrentDivisor::TypeInfo;
+        case Attributes::PacketUnicastTxCount::Id: {
+            using TypeInfo = Attributes::PacketUnicastTxCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::AcPowerMultiplier::Id: {
-            using TypeInfo = Attributes::AcPowerMultiplier::TypeInfo;
+        case Attributes::CurrentMaxRate::Id: {
+            using TypeInfo = Attributes::CurrentMaxRate::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedLongLong:cppValue];
             return value;
         }
-        case Attributes::AcPowerDivisor::Id: {
-            using TypeInfo = Attributes::AcPowerDivisor::TypeInfo;
+        case Attributes::OverrunCount::Id: {
+            using TypeInfo = Attributes::OverrunCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedLongLong:cppValue];
             return value;
         }
-        case Attributes::OverloadAlarmsMask::Id: {
-            using TypeInfo = Attributes::OverloadAlarmsMask::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::VoltageOverload::Id: {
-            using TypeInfo = Attributes::VoltageOverload::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::CurrentOverload::Id: {
-            using TypeInfo = Attributes::CurrentOverload::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::AcOverloadAlarmsMask::Id: {
-            using TypeInfo = Attributes::AcOverloadAlarmsMask::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::AcVoltageOverload::Id: {
-            using TypeInfo = Attributes::AcVoltageOverload::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::AcCurrentOverload::Id: {
-            using TypeInfo = Attributes::AcCurrentOverload::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::EthernetNetworkDiagnostics::Id: {
+        using namespace Clusters::EthernetNetworkDiagnostics;
+        switch (aPath.mAttributeId) {
+        case Attributes::PHYRate::Id: {
+            using TypeInfo = Attributes::PHYRate::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value())];
+            }
             return value;
         }
-        case Attributes::AcActivePowerOverload::Id: {
-            using TypeInfo = Attributes::AcActivePowerOverload::TypeInfo;
+        case Attributes::FullDuplex::Id: {
+            using TypeInfo = Attributes::FullDuplex::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithBool:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::AcReactivePowerOverload::Id: {
-            using TypeInfo = Attributes::AcReactivePowerOverload::TypeInfo;
+        case Attributes::PacketRxCount::Id: {
+            using TypeInfo = Attributes::PacketRxCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedLongLong:cppValue];
             return value;
         }
-        case Attributes::AverageRmsOverVoltage::Id: {
-            using TypeInfo = Attributes::AverageRmsOverVoltage::TypeInfo;
+        case Attributes::PacketTxCount::Id: {
+            using TypeInfo = Attributes::PacketTxCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedLongLong:cppValue];
             return value;
         }
-        case Attributes::AverageRmsUnderVoltage::Id: {
-            using TypeInfo = Attributes::AverageRmsUnderVoltage::TypeInfo;
+        case Attributes::TxErrCount::Id: {
+            using TypeInfo = Attributes::TxErrCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedLongLong:cppValue];
             return value;
         }
-        case Attributes::RmsExtremeOverVoltage::Id: {
-            using TypeInfo = Attributes::RmsExtremeOverVoltage::TypeInfo;
+        case Attributes::CollisionCount::Id: {
+            using TypeInfo = Attributes::CollisionCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedLongLong:cppValue];
             return value;
         }
-        case Attributes::RmsExtremeUnderVoltage::Id: {
-            using TypeInfo = Attributes::RmsExtremeUnderVoltage::TypeInfo;
+        case Attributes::OverrunCount::Id: {
+            using TypeInfo = Attributes::OverrunCount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedLongLong:cppValue];
             return value;
         }
-        case Attributes::RmsVoltageSag::Id: {
-            using TypeInfo = Attributes::RmsVoltageSag::TypeInfo;
+        case Attributes::CarrierDetect::Id: {
+            using TypeInfo = Attributes::CarrierDetect::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithBool:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::RmsVoltageSwell::Id: {
-            using TypeInfo = Attributes::RmsVoltageSwell::TypeInfo;
+        case Attributes::TimeSinceReset::Id: {
+            using TypeInfo = Attributes::TimeSinceReset::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedLongLong:cppValue];
             return value;
         }
-        case Attributes::LineCurrentPhaseB::Id: {
-            using TypeInfo = Attributes::LineCurrentPhaseB::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::ActiveCurrentPhaseB::Id: {
-            using TypeInfo = Attributes::ActiveCurrentPhaseB::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::ReactiveCurrentPhaseB::Id: {
-            using TypeInfo = Attributes::ReactiveCurrentPhaseB::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::RmsVoltagePhaseB::Id: {
-            using TypeInfo = Attributes::RmsVoltagePhaseB::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::RmsVoltageMinPhaseB::Id: {
-            using TypeInfo = Attributes::RmsVoltageMinPhaseB::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -5492,382 +6210,413 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::RmsVoltageMaxPhaseB::Id: {
-            using TypeInfo = Attributes::RmsVoltageMaxPhaseB::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::BridgedDeviceBasic::Id: {
+        using namespace Clusters::BridgedDeviceBasic;
+        switch (aPath.mAttributeId) {
+        case Attributes::VendorName::Id: {
+            using TypeInfo = Attributes::VendorName::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
-        case Attributes::RmsCurrentPhaseB::Id: {
-            using TypeInfo = Attributes::RmsCurrentPhaseB::TypeInfo;
+        case Attributes::VendorID::Id: {
+            using TypeInfo = Attributes::VendorID::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedShort:chip::to_underlying(cppValue)];
             return value;
         }
-        case Attributes::RmsCurrentMinPhaseB::Id: {
-            using TypeInfo = Attributes::RmsCurrentMinPhaseB::TypeInfo;
+        case Attributes::ProductName::Id: {
+            using TypeInfo = Attributes::ProductName::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
-        case Attributes::RmsCurrentMaxPhaseB::Id: {
-            using TypeInfo = Attributes::RmsCurrentMaxPhaseB::TypeInfo;
+        case Attributes::NodeLabel::Id: {
+            using TypeInfo = Attributes::NodeLabel::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
-        case Attributes::ActivePowerPhaseB::Id: {
-            using TypeInfo = Attributes::ActivePowerPhaseB::TypeInfo;
+        case Attributes::HardwareVersion::Id: {
+            using TypeInfo = Attributes::HardwareVersion::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ActivePowerMinPhaseB::Id: {
-            using TypeInfo = Attributes::ActivePowerMinPhaseB::TypeInfo;
+        case Attributes::HardwareVersionString::Id: {
+            using TypeInfo = Attributes::HardwareVersionString::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
-        case Attributes::ActivePowerMaxPhaseB::Id: {
-            using TypeInfo = Attributes::ActivePowerMaxPhaseB::TypeInfo;
+        case Attributes::SoftwareVersion::Id: {
+            using TypeInfo = Attributes::SoftwareVersion::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::ReactivePowerPhaseB::Id: {
-            using TypeInfo = Attributes::ReactivePowerPhaseB::TypeInfo;
+        case Attributes::SoftwareVersionString::Id: {
+            using TypeInfo = Attributes::SoftwareVersionString::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
-        case Attributes::ApparentPowerPhaseB::Id: {
-            using TypeInfo = Attributes::ApparentPowerPhaseB::TypeInfo;
+        case Attributes::ManufacturingDate::Id: {
+            using TypeInfo = Attributes::ManufacturingDate::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
-        case Attributes::PowerFactorPhaseB::Id: {
-            using TypeInfo = Attributes::PowerFactorPhaseB::TypeInfo;
+        case Attributes::PartNumber::Id: {
+            using TypeInfo = Attributes::PartNumber::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithChar:cppValue];
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
-        case Attributes::AverageRmsVoltageMeasurementPeriodPhaseB::Id: {
-            using TypeInfo = Attributes::AverageRmsVoltageMeasurementPeriodPhaseB::TypeInfo;
+        case Attributes::ProductURL::Id: {
+            using TypeInfo = Attributes::ProductURL::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
-        case Attributes::AverageRmsOverVoltageCounterPhaseB::Id: {
-            using TypeInfo = Attributes::AverageRmsOverVoltageCounterPhaseB::TypeInfo;
+        case Attributes::ProductLabel::Id: {
+            using TypeInfo = Attributes::ProductLabel::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
-        case Attributes::AverageRmsUnderVoltageCounterPhaseB::Id: {
-            using TypeInfo = Attributes::AverageRmsUnderVoltageCounterPhaseB::TypeInfo;
+        case Attributes::SerialNumber::Id: {
+            using TypeInfo = Attributes::SerialNumber::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
-        case Attributes::RmsExtremeOverVoltagePeriodPhaseB::Id: {
-            using TypeInfo = Attributes::RmsExtremeOverVoltagePeriodPhaseB::TypeInfo;
+        case Attributes::Reachable::Id: {
+            using TypeInfo = Attributes::Reachable::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithBool:cppValue];
             return value;
         }
-        case Attributes::RmsExtremeUnderVoltagePeriodPhaseB::Id: {
-            using TypeInfo = Attributes::RmsExtremeUnderVoltagePeriodPhaseB::TypeInfo;
+        case Attributes::UniqueID::Id: {
+            using TypeInfo = Attributes::UniqueID::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
-        case Attributes::RmsVoltageSagPeriodPhaseB::Id: {
-            using TypeInfo = Attributes::RmsVoltageSagPeriodPhaseB::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::RmsVoltageSwellPeriodPhaseB::Id: {
-            using TypeInfo = Attributes::RmsVoltageSwellPeriodPhaseB::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::LineCurrentPhaseC::Id: {
-            using TypeInfo = Attributes::LineCurrentPhaseC::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::ActiveCurrentPhaseC::Id: {
-            using TypeInfo = Attributes::ActiveCurrentPhaseC::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::ReactiveCurrentPhaseC::Id: {
-            using TypeInfo = Attributes::ReactiveCurrentPhaseC::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::RmsVoltagePhaseC::Id: {
-            using TypeInfo = Attributes::RmsVoltagePhaseC::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
-            return value;
-        }
-        case Attributes::RmsVoltageMinPhaseC::Id: {
-            using TypeInfo = Attributes::RmsVoltageMinPhaseC::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
-            return value;
-        }
-        case Attributes::RmsVoltageMaxPhaseC::Id: {
-            using TypeInfo = Attributes::RmsVoltageMaxPhaseC::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
-            return value;
-        }
-        case Attributes::RmsCurrentPhaseC::Id: {
-            using TypeInfo = Attributes::RmsCurrentPhaseC::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
-            return value;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
         }
-        case Attributes::RmsCurrentMinPhaseC::Id: {
-            using TypeInfo = Attributes::RmsCurrentMinPhaseC::TypeInfo;
+        break;
+    }
+    case Clusters::Switch::Id: {
+        using namespace Clusters::Switch;
+        switch (aPath.mAttributeId) {
+        case Attributes::NumberOfPositions::Id: {
+            using TypeInfo = Attributes::NumberOfPositions::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::RmsCurrentMaxPhaseC::Id: {
-            using TypeInfo = Attributes::RmsCurrentMaxPhaseC::TypeInfo;
+        case Attributes::CurrentPosition::Id: {
+            using TypeInfo = Attributes::CurrentPosition::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::ActivePowerPhaseC::Id: {
-            using TypeInfo = Attributes::ActivePowerPhaseC::TypeInfo;
+        case Attributes::MultiPressMax::Id: {
+            using TypeInfo = Attributes::MultiPressMax::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::ActivePowerMinPhaseC::Id: {
-            using TypeInfo = Attributes::ActivePowerMinPhaseC::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
-            return value;
-        }
-        case Attributes::ActivePowerMaxPhaseC::Id: {
-            using TypeInfo = Attributes::ActivePowerMaxPhaseC::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::ReactivePowerPhaseC::Id: {
-            using TypeInfo = Attributes::ReactivePowerPhaseC::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
-            return value;
-        }
-        case Attributes::ApparentPowerPhaseC::Id: {
-            using TypeInfo = Attributes::ApparentPowerPhaseC::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::PowerFactorPhaseC::Id: {
-            using TypeInfo = Attributes::PowerFactorPhaseC::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithChar:cppValue];
-            return value;
-        }
-        case Attributes::AverageRmsVoltageMeasurementPeriodPhaseC::Id: {
-            using TypeInfo = Attributes::AverageRmsVoltageMeasurementPeriodPhaseC::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::AverageRmsOverVoltageCounterPhaseC::Id: {
-            using TypeInfo = Attributes::AverageRmsOverVoltageCounterPhaseC::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::AverageRmsUnderVoltageCounterPhaseC::Id: {
-            using TypeInfo = Attributes::AverageRmsUnderVoltageCounterPhaseC::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -5877,41 +6626,39 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::RmsExtremeOverVoltagePeriodPhaseC::Id: {
-            using TypeInfo = Attributes::RmsExtremeOverVoltagePeriodPhaseC::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
-            return value;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
         }
-        case Attributes::RmsExtremeUnderVoltagePeriodPhaseC::Id: {
-            using TypeInfo = Attributes::RmsExtremeUnderVoltagePeriodPhaseC::TypeInfo;
+        break;
+    }
+    case Clusters::AdministratorCommissioning::Id: {
+        using namespace Clusters::AdministratorCommissioning;
+        switch (aPath.mAttributeId) {
+        case Attributes::WindowStatus::Id: {
+            using TypeInfo = Attributes::WindowStatus::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::RmsVoltageSagPeriodPhaseC::Id: {
-            using TypeInfo = Attributes::RmsVoltageSagPeriodPhaseC::TypeInfo;
+        case Attributes::AdminFabricIndex::Id: {
+            using TypeInfo = Attributes::AdminFabricIndex::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::RmsVoltageSwellPeriodPhaseC::Id: {
-            using TypeInfo = Attributes::RmsVoltageSwellPeriodPhaseC::TypeInfo;
+        case Attributes::AdminVendorId::Id: {
+            using TypeInfo = Attributes::AdminVendorId::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -6027,118 +6774,134 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::EthernetNetworkDiagnostics::Id: {
-        using namespace Clusters::EthernetNetworkDiagnostics;
+    case Clusters::OperationalCredentials::Id: {
+        using namespace Clusters::OperationalCredentials;
         switch (aPath.mAttributeId) {
-        case Attributes::PHYRate::Id: {
-            using TypeInfo = Attributes::PHYRate::TypeInfo;
+        case Attributes::NOCs::Id: {
+            using TypeInfo = Attributes::NOCs::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value())];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    CHIPOperationalCredentialsClusterNOCStruct * newElement_0;
+                    newElement_0 = [CHIPOperationalCredentialsClusterNOCStruct new];
+                    newElement_0.noc = [NSData dataWithBytes:entry_0.noc.data() length:entry_0.noc.size()];
+                    if (entry_0.icac.IsNull()) {
+                        newElement_0.icac = nil;
+                    } else {
+                        newElement_0.icac = [NSData dataWithBytes:entry_0.icac.Value().data() length:entry_0.icac.Value().size()];
+                    }
+                    newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
             return value;
         }
-        case Attributes::FullDuplex::Id: {
-            using TypeInfo = Attributes::FullDuplex::TypeInfo;
+        case Attributes::Fabrics::Id: {
+            using TypeInfo = Attributes::Fabrics::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithBool:cppValue.Value()];
-            }
-            return value;
-        }
-        case Attributes::PacketRxCount::Id: {
-            using TypeInfo = Attributes::PacketRxCount::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedLongLong:cppValue];
-            return value;
-        }
-        case Attributes::PacketTxCount::Id: {
-            using TypeInfo = Attributes::PacketTxCount::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedLongLong:cppValue];
-            return value;
-        }
-        case Attributes::TxErrCount::Id: {
-            using TypeInfo = Attributes::TxErrCount::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    CHIPOperationalCredentialsClusterFabricDescriptor * newElement_0;
+                    newElement_0 = [CHIPOperationalCredentialsClusterFabricDescriptor new];
+                    newElement_0.rootPublicKey = [NSData dataWithBytes:entry_0.rootPublicKey.data()
+                                                                length:entry_0.rootPublicKey.size()];
+                    newElement_0.vendorId = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_0.vendorId)];
+                    newElement_0.fabricId = [NSNumber numberWithUnsignedLongLong:entry_0.fabricId];
+                    newElement_0.nodeId = [NSNumber numberWithUnsignedLongLong:entry_0.nodeId];
+                    newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data()
+                                                                  length:entry_0.label.size()
+                                                                encoding:NSUTF8StringEncoding];
+                    newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedLongLong:cppValue];
             return value;
         }
-        case Attributes::CollisionCount::Id: {
-            using TypeInfo = Attributes::CollisionCount::TypeInfo;
+        case Attributes::SupportedFabrics::Id: {
+            using TypeInfo = Attributes::SupportedFabrics::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedLongLong:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::OverrunCount::Id: {
-            using TypeInfo = Attributes::OverrunCount::TypeInfo;
+        case Attributes::CommissionedFabrics::Id: {
+            using TypeInfo = Attributes::CommissionedFabrics::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedLongLong:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::CarrierDetect::Id: {
-            using TypeInfo = Attributes::CarrierDetect::TypeInfo;
+        case Attributes::TrustedRootCertificates::Id: {
+            using TypeInfo = Attributes::TrustedRootCertificates::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithBool:cppValue.Value()];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSData * newElement_0;
+                    newElement_0 = [NSData dataWithBytes:entry_0.data() length:entry_0.size()];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
             return value;
         }
-        case Attributes::TimeSinceReset::Id: {
-            using TypeInfo = Attributes::TimeSinceReset::TypeInfo;
+        case Attributes::CurrentFabricIndex::Id: {
+            using TypeInfo = Attributes::CurrentFabricIndex::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedLongLong:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -6247,136 +7010,250 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::FanControl::Id: {
-        using namespace Clusters::FanControl;
+    case Clusters::GroupKeyManagement::Id: {
+        using namespace Clusters::GroupKeyManagement;
         switch (aPath.mAttributeId) {
-        case Attributes::FanMode::Id: {
-            using TypeInfo = Attributes::FanMode::TypeInfo;
+        case Attributes::GroupKeyMap::Id: {
+            using TypeInfo = Attributes::GroupKeyMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
-            return value;
-        }
-        case Attributes::FanModeSequence::Id: {
-            using TypeInfo = Attributes::FanModeSequence::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    CHIPGroupKeyManagementClusterGroupKeyMapStruct * newElement_0;
+                    newElement_0 = [CHIPGroupKeyManagementClusterGroupKeyMapStruct new];
+                    newElement_0.groupId = [NSNumber numberWithUnsignedShort:entry_0.groupId];
+                    newElement_0.groupKeySetID = [NSNumber numberWithUnsignedShort:entry_0.groupKeySetID];
+                    newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
             return value;
         }
-        case Attributes::PercentSetting::Id: {
-            using TypeInfo = Attributes::PercentSetting::TypeInfo;
+        case Attributes::GroupTable::Id: {
+            using TypeInfo = Attributes::GroupTable::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    CHIPGroupKeyManagementClusterGroupInfoMapStruct * newElement_0;
+                    newElement_0 = [CHIPGroupKeyManagementClusterGroupInfoMapStruct new];
+                    newElement_0.groupId = [NSNumber numberWithUnsignedShort:entry_0.groupId];
+                    { // Scope for our temporary variables
+                        auto * array_2 = [NSMutableArray new];
+                        auto iter_2 = entry_0.endpoints.begin();
+                        while (iter_2.Next()) {
+                            auto & entry_2 = iter_2.GetValue();
+                            NSNumber * newElement_2;
+                            newElement_2 = [NSNumber numberWithUnsignedShort:entry_2];
+                            [array_2 addObject:newElement_2];
+                        }
+                        CHIP_ERROR err = iter_2.GetStatus();
+                        if (err != CHIP_NO_ERROR) {
+                            *aError = err;
+                            return nil;
+                        }
+                        newElement_0.endpoints = array_2;
+                    }
+                    if (entry_0.groupName.HasValue()) {
+                        newElement_0.groupName = [[NSString alloc] initWithBytes:entry_0.groupName.Value().data()
+                                                                          length:entry_0.groupName.Value().size()
+                                                                        encoding:NSUTF8StringEncoding];
+                    } else {
+                        newElement_0.groupName = nil;
+                    }
+                    newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
             return value;
         }
-        case Attributes::PercentCurrent::Id: {
-            using TypeInfo = Attributes::PercentCurrent::TypeInfo;
+        case Attributes::MaxGroupsPerFabric::Id: {
+            using TypeInfo = Attributes::MaxGroupsPerFabric::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::SpeedMax::Id: {
-            using TypeInfo = Attributes::SpeedMax::TypeInfo;
+        case Attributes::MaxGroupKeysPerFabric::Id: {
+            using TypeInfo = Attributes::MaxGroupKeysPerFabric::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::SpeedSetting::Id: {
-            using TypeInfo = Attributes::SpeedSetting::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
             return value;
         }
-        case Attributes::SpeedCurrent::Id: {
-            using TypeInfo = Attributes::SpeedCurrent::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::RockSupport::Id: {
-            using TypeInfo = Attributes::RockSupport::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
-            return value;
-        }
-        case Attributes::RockSetting::Id: {
-            using TypeInfo = Attributes::RockSetting::TypeInfo;
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
+            return value;
+        }
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::WindSupport::Id: {
-            using TypeInfo = Attributes::WindSupport::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::WindSetting::Id: {
-            using TypeInfo = Attributes::WindSetting::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::FixedLabel::Id: {
+        using namespace Clusters::FixedLabel;
+        switch (aPath.mAttributeId) {
+        case Attributes::LabelList::Id: {
+            using TypeInfo = Attributes::LabelList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    CHIPFixedLabelClusterLabelStruct * newElement_0;
+                    newElement_0 = [CHIPFixedLabelClusterLabelStruct new];
+                    newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data()
+                                                                  length:entry_0.label.size()
+                                                                encoding:NSUTF8StringEncoding];
+                    newElement_0.value = [[NSString alloc] initWithBytes:entry_0.value.data()
+                                                                  length:entry_0.value.size()
+                                                                encoding:NSUTF8StringEncoding];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -6485,8 +7362,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::FixedLabel::Id: {
-        using namespace Clusters::FixedLabel;
+    case Clusters::UserLabel::Id: {
+        using namespace Clusters::UserLabel;
         switch (aPath.mAttributeId) {
         case Attributes::LabelList::Id: {
             using TypeInfo = Attributes::LabelList::TypeInfo;
@@ -6501,8 +7378,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
                 auto iter_0 = cppValue.begin();
                 while (iter_0.Next()) {
                     auto & entry_0 = iter_0.GetValue();
-                    CHIPFixedLabelClusterLabelStruct * newElement_0;
-                    newElement_0 = [CHIPFixedLabelClusterLabelStruct new];
+                    CHIPUserLabelClusterLabelStruct * newElement_0;
+                    newElement_0 = [CHIPUserLabelClusterLabelStruct new];
                     newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data()
                                                                   length:entry_0.label.size()
                                                                 encoding:NSUTF8StringEncoding];
@@ -6626,63 +7503,18 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::FlowMeasurement::Id: {
-        using namespace Clusters::FlowMeasurement;
+    case Clusters::BooleanState::Id: {
+        using namespace Clusters::BooleanState;
         switch (aPath.mAttributeId) {
-        case Attributes::MeasuredValue::Id: {
-            using TypeInfo = Attributes::MeasuredValue::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
-            }
-            return value;
-        }
-        case Attributes::MinMeasuredValue::Id: {
-            using TypeInfo = Attributes::MinMeasuredValue::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
-            }
-            return value;
-        }
-        case Attributes::MaxMeasuredValue::Id: {
-            using TypeInfo = Attributes::MaxMeasuredValue::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
-            }
-            return value;
-        }
-        case Attributes::Tolerance::Id: {
-            using TypeInfo = Attributes::Tolerance::TypeInfo;
+        case Attributes::StateValue::Id: {
+            using TypeInfo = Attributes::StateValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithBool:cppValue];
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -6791,64 +7623,122 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::GeneralCommissioning::Id: {
-        using namespace Clusters::GeneralCommissioning;
+    case Clusters::ModeSelect::Id: {
+        using namespace Clusters::ModeSelect;
         switch (aPath.mAttributeId) {
-        case Attributes::Breadcrumb::Id: {
-            using TypeInfo = Attributes::Breadcrumb::TypeInfo;
+        case Attributes::Description::Id: {
+            using TypeInfo = Attributes::Description::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedLongLong:cppValue];
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
-        case Attributes::BasicCommissioningInfo::Id: {
-            using TypeInfo = Attributes::BasicCommissioningInfo::TypeInfo;
+        case Attributes::StandardNamespace::Id: {
+            using TypeInfo = Attributes::StandardNamespace::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nonnull value;
-            value = [CHIPGeneralCommissioningClusterBasicCommissioningInfo new];
-            value.failSafeExpiryLengthSeconds = [NSNumber numberWithUnsignedShort:cppValue.failSafeExpiryLengthSeconds];
-            value.maxCumulativeFailsafeSeconds = [NSNumber numberWithUnsignedShort:cppValue.maxCumulativeFailsafeSeconds];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::RegulatoryConfig::Id: {
-            using TypeInfo = Attributes::RegulatoryConfig::TypeInfo;
+        case Attributes::SupportedModes::Id: {
+            using TypeInfo = Attributes::SupportedModes::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    CHIPModeSelectClusterModeOptionStruct * newElement_0;
+                    newElement_0 = [CHIPModeSelectClusterModeOptionStruct new];
+                    newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data()
+                                                                  length:entry_0.label.size()
+                                                                encoding:NSUTF8StringEncoding];
+                    newElement_0.mode = [NSNumber numberWithUnsignedChar:entry_0.mode];
+                    { // Scope for our temporary variables
+                        auto * array_2 = [NSMutableArray new];
+                        auto iter_2 = entry_0.semanticTags.begin();
+                        while (iter_2.Next()) {
+                            auto & entry_2 = iter_2.GetValue();
+                            CHIPModeSelectClusterSemanticTag * newElement_2;
+                            newElement_2 = [CHIPModeSelectClusterSemanticTag new];
+                            newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:entry_2.mfgCode];
+                            newElement_2.value = [NSNumber numberWithUnsignedShort:entry_2.value];
+                            [array_2 addObject:newElement_2];
+                        }
+                        CHIP_ERROR err = iter_2.GetStatus();
+                        if (err != CHIP_NO_ERROR) {
+                            *aError = err;
+                            return nil;
+                        }
+                        newElement_0.semanticTags = array_2;
+                    }
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::LocationCapability::Id: {
-            using TypeInfo = Attributes::LocationCapability::TypeInfo;
+        case Attributes::CurrentMode::Id: {
+            using TypeInfo = Attributes::CurrentMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::SupportsConcurrentConnection::Id: {
-            using TypeInfo = Attributes::SupportsConcurrentConnection::TypeInfo;
+        case Attributes::StartUpMode::Id: {
+            using TypeInfo = Attributes::StartUpMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            }
+            return value;
+        }
+        case Attributes::OnMode::Id: {
+            using TypeInfo = Attributes::OnMode::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            }
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -6957,110 +7847,63 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::GeneralDiagnostics::Id: {
-        using namespace Clusters::GeneralDiagnostics;
+    case Clusters::DoorLock::Id: {
+        using namespace Clusters::DoorLock;
         switch (aPath.mAttributeId) {
-        case Attributes::NetworkInterfaces::Id: {
-            using TypeInfo = Attributes::NetworkInterfaces::TypeInfo;
+        case Attributes::LockState::Id: {
+            using TypeInfo = Attributes::LockState::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    CHIPGeneralDiagnosticsClusterNetworkInterfaceType * newElement_0;
-                    newElement_0 = [CHIPGeneralDiagnosticsClusterNetworkInterfaceType new];
-                    newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data()
-                                                                 length:entry_0.name.size()
-                                                               encoding:NSUTF8StringEncoding];
-                    newElement_0.isOperational = [NSNumber numberWithBool:entry_0.isOperational];
-                    if (entry_0.offPremiseServicesReachableIPv4.IsNull()) {
-                        newElement_0.offPremiseServicesReachableIPv4 = nil;
-                    } else {
-                        newElement_0.offPremiseServicesReachableIPv4 =
-                            [NSNumber numberWithBool:entry_0.offPremiseServicesReachableIPv4.Value()];
-                    }
-                    if (entry_0.offPremiseServicesReachableIPv6.IsNull()) {
-                        newElement_0.offPremiseServicesReachableIPv6 = nil;
-                    } else {
-                        newElement_0.offPremiseServicesReachableIPv6 =
-                            [NSNumber numberWithBool:entry_0.offPremiseServicesReachableIPv6.Value()];
-                    }
-                    newElement_0.hardwareAddress = [NSData dataWithBytes:entry_0.hardwareAddress.data()
-                                                                  length:entry_0.hardwareAddress.size()];
-                    { // Scope for our temporary variables
-                        auto * array_2 = [NSMutableArray new];
-                        auto iter_2 = entry_0.IPv4Addresses.begin();
-                        while (iter_2.Next()) {
-                            auto & entry_2 = iter_2.GetValue();
-                            NSData * newElement_2;
-                            newElement_2 = [NSData dataWithBytes:entry_2.data() length:entry_2.size()];
-                            [array_2 addObject:newElement_2];
-                        }
-                        CHIP_ERROR err = iter_2.GetStatus();
-                        if (err != CHIP_NO_ERROR) {
-                            *aError = err;
-                            return nil;
-                        }
-                        newElement_0.iPv4Addresses = array_2;
-                    }
-                    { // Scope for our temporary variables
-                        auto * array_2 = [NSMutableArray new];
-                        auto iter_2 = entry_0.IPv6Addresses.begin();
-                        while (iter_2.Next()) {
-                            auto & entry_2 = iter_2.GetValue();
-                            NSData * newElement_2;
-                            newElement_2 = [NSData dataWithBytes:entry_2.data() length:entry_2.size()];
-                            [array_2 addObject:newElement_2];
-                        }
-                        CHIP_ERROR err = iter_2.GetStatus();
-                        if (err != CHIP_NO_ERROR) {
-                            *aError = err;
-                            return nil;
-                        }
-                        newElement_0.iPv6Addresses = array_2;
-                    }
-                    newElement_0.type = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.type)];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value())];
             }
             return value;
         }
-        case Attributes::RebootCount::Id: {
-            using TypeInfo = Attributes::RebootCount::TypeInfo;
+        case Attributes::LockType::Id: {
+            using TypeInfo = Attributes::LockType::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
             return value;
         }
-        case Attributes::UpTime::Id: {
-            using TypeInfo = Attributes::UpTime::TypeInfo;
+        case Attributes::ActuatorEnabled::Id: {
+            using TypeInfo = Attributes::ActuatorEnabled::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedLongLong:cppValue];
+            value = [NSNumber numberWithBool:cppValue];
             return value;
         }
-        case Attributes::TotalOperationalHours::Id: {
-            using TypeInfo = Attributes::TotalOperationalHours::TypeInfo;
+        case Attributes::DoorState::Id: {
+            using TypeInfo = Attributes::DoorState::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value())];
+            }
+            return value;
+        }
+        case Attributes::DoorOpenEvents::Id: {
+            using TypeInfo = Attributes::DoorOpenEvents::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -7070,559 +7913,305 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::BootReasons::Id: {
-            using TypeInfo = Attributes::BootReasons::TypeInfo;
+        case Attributes::DoorClosedEvents::Id: {
+            using TypeInfo = Attributes::DoorClosedEvents::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::ActiveHardwareFaults::Id: {
-            using TypeInfo = Attributes::ActiveHardwareFaults::TypeInfo;
+        case Attributes::OpenPeriod::Id: {
+            using TypeInfo = Attributes::OpenPeriod::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ActiveRadioFaults::Id: {
-            using TypeInfo = Attributes::ActiveRadioFaults::TypeInfo;
+        case Attributes::NumberOfTotalUsersSupported::Id: {
+            using TypeInfo = Attributes::NumberOfTotalUsersSupported::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ActiveNetworkFaults::Id: {
-            using TypeInfo = Attributes::ActiveNetworkFaults::TypeInfo;
+        case Attributes::NumberOfPINUsersSupported::Id: {
+            using TypeInfo = Attributes::NumberOfPINUsersSupported::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::TestEventTriggersEnabled::Id: {
-            using TypeInfo = Attributes::TestEventTriggersEnabled::TypeInfo;
+        case Attributes::NumberOfRFIDUsersSupported::Id: {
+            using TypeInfo = Attributes::NumberOfRFIDUsersSupported::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::NumberOfWeekDaySchedulesSupportedPerUser::Id: {
+            using TypeInfo = Attributes::NumberOfWeekDaySchedulesSupportedPerUser::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::NumberOfYearDaySchedulesSupportedPerUser::Id: {
+            using TypeInfo = Attributes::NumberOfYearDaySchedulesSupportedPerUser::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::NumberOfHolidaySchedulesSupported::Id: {
+            using TypeInfo = Attributes::NumberOfHolidaySchedulesSupported::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::MaxPINCodeLength::Id: {
+            using TypeInfo = Attributes::MaxPINCodeLength::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::MinPINCodeLength::Id: {
+            using TypeInfo = Attributes::MinPINCodeLength::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::GroupKeyManagement::Id: {
-        using namespace Clusters::GroupKeyManagement;
-        switch (aPath.mAttributeId) {
-        case Attributes::GroupKeyMap::Id: {
-            using TypeInfo = Attributes::GroupKeyMap::TypeInfo;
+        case Attributes::MaxRFIDCodeLength::Id: {
+            using TypeInfo = Attributes::MaxRFIDCodeLength::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    CHIPGroupKeyManagementClusterGroupKeyMapStruct * newElement_0;
-                    newElement_0 = [CHIPGroupKeyManagementClusterGroupKeyMapStruct new];
-                    newElement_0.groupId = [NSNumber numberWithUnsignedShort:entry_0.groupId];
-                    newElement_0.groupKeySetID = [NSNumber numberWithUnsignedShort:entry_0.groupKeySetID];
-                    newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::GroupTable::Id: {
-            using TypeInfo = Attributes::GroupTable::TypeInfo;
+        case Attributes::MinRFIDCodeLength::Id: {
+            using TypeInfo = Attributes::MinRFIDCodeLength::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    CHIPGroupKeyManagementClusterGroupInfoMapStruct * newElement_0;
-                    newElement_0 = [CHIPGroupKeyManagementClusterGroupInfoMapStruct new];
-                    newElement_0.groupId = [NSNumber numberWithUnsignedShort:entry_0.groupId];
-                    { // Scope for our temporary variables
-                        auto * array_2 = [NSMutableArray new];
-                        auto iter_2 = entry_0.endpoints.begin();
-                        while (iter_2.Next()) {
-                            auto & entry_2 = iter_2.GetValue();
-                            NSNumber * newElement_2;
-                            newElement_2 = [NSNumber numberWithUnsignedShort:entry_2];
-                            [array_2 addObject:newElement_2];
-                        }
-                        CHIP_ERROR err = iter_2.GetStatus();
-                        if (err != CHIP_NO_ERROR) {
-                            *aError = err;
-                            return nil;
-                        }
-                        newElement_0.endpoints = array_2;
-                    }
-                    if (entry_0.groupName.HasValue()) {
-                        newElement_0.groupName = [[NSString alloc] initWithBytes:entry_0.groupName.Value().data()
-                                                                          length:entry_0.groupName.Value().size()
-                                                                        encoding:NSUTF8StringEncoding];
-                    } else {
-                        newElement_0.groupName = nil;
-                    }
-                    newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::MaxGroupsPerFabric::Id: {
-            using TypeInfo = Attributes::MaxGroupsPerFabric::TypeInfo;
+        case Attributes::CredentialRulesSupport::Id: {
+            using TypeInfo = Attributes::CredentialRulesSupport::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue.Raw()];
             return value;
         }
-        case Attributes::MaxGroupKeysPerFabric::Id: {
-            using TypeInfo = Attributes::MaxGroupKeysPerFabric::TypeInfo;
+        case Attributes::NumberOfCredentialsSupportedPerUser::Id: {
+            using TypeInfo = Attributes::NumberOfCredentialsSupportedPerUser::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::Language::Id: {
+            using TypeInfo = Attributes::Language::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::LEDSettings::Id: {
+            using TypeInfo = Attributes::LEDSettings::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::AutoRelockTime::Id: {
+            using TypeInfo = Attributes::AutoRelockTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::SoundVolume::Id: {
+            using TypeInfo = Attributes::SoundVolume::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::OperatingMode::Id: {
+            using TypeInfo = Attributes::OperatingMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::Groups::Id: {
-        using namespace Clusters::Groups;
-        switch (aPath.mAttributeId) {
-        case Attributes::NameSupport::Id: {
-            using TypeInfo = Attributes::NameSupport::TypeInfo;
+        case Attributes::SupportedOperatingModes::Id: {
+            using TypeInfo = Attributes::SupportedOperatingModes::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue.Raw()];
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::DefaultConfigurationRegister::Id: {
+            using TypeInfo = Attributes::DefaultConfigurationRegister::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue.Raw()];
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::EnableLocalProgramming::Id: {
+            using TypeInfo = Attributes::EnableLocalProgramming::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithBool:cppValue];
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::EnableOneTouchLocking::Id: {
+            using TypeInfo = Attributes::EnableOneTouchLocking::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithBool:cppValue];
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::EnableInsideStatusLED::Id: {
+            using TypeInfo = Attributes::EnableInsideStatusLED::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithBool:cppValue];
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::EnablePrivacyModeButton::Id: {
+            using TypeInfo = Attributes::EnablePrivacyModeButton::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithBool:cppValue];
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
+        case Attributes::LocalProgrammingFeatures::Id: {
+            using TypeInfo = Attributes::LocalProgrammingFeatures::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue.Raw()];
+            return value;
         }
-        break;
-    }
-    case Clusters::Identify::Id: {
-        using namespace Clusters::Identify;
-        switch (aPath.mAttributeId) {
-        case Attributes::IdentifyTime::Id: {
-            using TypeInfo = Attributes::IdentifyTime::TypeInfo;
+        case Attributes::WrongCodeEntryLimit::Id: {
+            using TypeInfo = Attributes::WrongCodeEntryLimit::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::IdentifyType::Id: {
-            using TypeInfo = Attributes::IdentifyType::TypeInfo;
+        case Attributes::UserCodeTemporaryDisableTime::Id: {
+            using TypeInfo = Attributes::UserCodeTemporaryDisableTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -7632,6 +8221,39 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
+        case Attributes::SendPINOverTheAir::Id: {
+            using TypeInfo = Attributes::SendPINOverTheAir::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithBool:cppValue];
+            return value;
+        }
+        case Attributes::RequirePINforRemoteOperation::Id: {
+            using TypeInfo = Attributes::RequirePINforRemoteOperation::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithBool:cppValue];
+            return value;
+        }
+        case Attributes::ExpiringUserTimeout::Id: {
+            using TypeInfo = Attributes::ExpiringUserTimeout::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
+            return value;
+        }
         case Attributes::GeneratedCommandList::Id: {
             using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -7738,26 +8360,44 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::IlluminanceMeasurement::Id: {
-        using namespace Clusters::IlluminanceMeasurement;
+    case Clusters::WindowCovering::Id: {
+        using namespace Clusters::WindowCovering;
         switch (aPath.mAttributeId) {
-        case Attributes::MeasuredValue::Id: {
-            using TypeInfo = Attributes::MeasuredValue::TypeInfo;
+        case Attributes::Type::Id: {
+            using TypeInfo = Attributes::Type::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+            return value;
+        }
+        case Attributes::PhysicalClosedLimitLift::Id: {
+            using TypeInfo = Attributes::PhysicalClosedLimitLift::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
+            return value;
+        }
+        case Attributes::PhysicalClosedLimitTilt::Id: {
+            using TypeInfo = Attributes::PhysicalClosedLimitTilt::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
             }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::MinMeasuredValue::Id: {
-            using TypeInfo = Attributes::MinMeasuredValue::TypeInfo;
+        case Attributes::CurrentPositionLift::Id: {
+            using TypeInfo = Attributes::CurrentPositionLift::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -7771,8 +8411,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::MaxMeasuredValue::Id: {
-            using TypeInfo = Attributes::MaxMeasuredValue::TypeInfo;
+        case Attributes::CurrentPositionTilt::Id: {
+            using TypeInfo = Attributes::CurrentPositionTilt::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -7786,8 +8426,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::Tolerance::Id: {
-            using TypeInfo = Attributes::Tolerance::TypeInfo;
+        case Attributes::NumberOfActuationsLift::Id: {
+            using TypeInfo = Attributes::NumberOfActuationsLift::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -7797,8 +8437,30 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::LightSensorType::Id: {
-            using TypeInfo = Attributes::LightSensorType::TypeInfo;
+        case Attributes::NumberOfActuationsTilt::Id: {
+            using TypeInfo = Attributes::NumberOfActuationsTilt::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
+            return value;
+        }
+        case Attributes::ConfigStatus::Id: {
+            using TypeInfo = Attributes::ConfigStatus::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue.Raw()];
+            return value;
+        }
+        case Attributes::CurrentPositionLiftPercentage::Id: {
+            using TypeInfo = Attributes::CurrentPositionLiftPercentage::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -7812,128 +8474,182 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::CurrentPositionTiltPercentage::Id: {
+            using TypeInfo = Attributes::CurrentPositionTiltPercentage::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::OperationalStatus::Id: {
+            using TypeInfo = Attributes::OperationalStatus::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue.Raw()];
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::TargetPositionLiftPercent100ths::Id: {
+            using TypeInfo = Attributes::TargetPositionLiftPercent100ths::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::TargetPositionTiltPercent100ths::Id: {
+            using TypeInfo = Attributes::TargetPositionTiltPercent100ths::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::EndProductType::Id: {
+            using TypeInfo = Attributes::EndProductType::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::KeypadInput::Id: {
-        using namespace Clusters::KeypadInput;
-        switch (aPath.mAttributeId) {
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::CurrentPositionLiftPercent100ths::Id: {
+            using TypeInfo = Attributes::CurrentPositionLiftPercent100ths::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
+            }
+            return value;
+        }
+        case Attributes::CurrentPositionTiltPercent100ths::Id: {
+            using TypeInfo = Attributes::CurrentPositionTiltPercent100ths::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
+            }
+            return value;
+        }
+        case Attributes::InstalledOpenLimitLift::Id: {
+            using TypeInfo = Attributes::InstalledOpenLimitLift::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
+            return value;
+        }
+        case Attributes::InstalledClosedLimitLift::Id: {
+            using TypeInfo = Attributes::InstalledClosedLimitLift::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
+            return value;
+        }
+        case Attributes::InstalledOpenLimitTilt::Id: {
+            using TypeInfo = Attributes::InstalledOpenLimitTilt::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
+            return value;
+        }
+        case Attributes::InstalledClosedLimitTilt::Id: {
+            using TypeInfo = Attributes::InstalledClosedLimitTilt::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
+            return value;
+        }
+        case Attributes::Mode::Id: {
+            using TypeInfo = Attributes::Mode::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue.Raw()];
+            return value;
+        }
+        case Attributes::SafetyStatus::Id: {
+            using TypeInfo = Attributes::SafetyStatus::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue.Raw()];
+            return value;
+        }
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
                     NSNumber * newElement_0;
                     newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
                     [array_0 addObject:newElement_0];
@@ -8027,11 +8743,11 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::LevelControl::Id: {
-        using namespace Clusters::LevelControl;
+    case Clusters::BarrierControl::Id: {
+        using namespace Clusters::BarrierControl;
         switch (aPath.mAttributeId) {
-        case Attributes::CurrentLevel::Id: {
-            using TypeInfo = Attributes::CurrentLevel::TypeInfo;
+        case Attributes::BarrierMovingState::Id: {
+            using TypeInfo = Attributes::BarrierMovingState::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -8041,8 +8757,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::RemainingTime::Id: {
-            using TypeInfo = Attributes::RemainingTime::TypeInfo;
+        case Attributes::BarrierSafetyStatus::Id: {
+            using TypeInfo = Attributes::BarrierSafetyStatus::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -8052,8 +8768,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::MinLevel::Id: {
-            using TypeInfo = Attributes::MinLevel::TypeInfo;
+        case Attributes::BarrierCapabilities::Id: {
+            using TypeInfo = Attributes::BarrierCapabilities::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -8063,19 +8779,19 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::MaxLevel::Id: {
-            using TypeInfo = Attributes::MaxLevel::TypeInfo;
+        case Attributes::BarrierOpenEvents::Id: {
+            using TypeInfo = Attributes::BarrierOpenEvents::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::CurrentFrequency::Id: {
-            using TypeInfo = Attributes::CurrentFrequency::TypeInfo;
+        case Attributes::BarrierCloseEvents::Id: {
+            using TypeInfo = Attributes::BarrierCloseEvents::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -8085,8 +8801,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::MinFrequency::Id: {
-            using TypeInfo = Attributes::MinFrequency::TypeInfo;
+        case Attributes::BarrierCommandOpenEvents::Id: {
+            using TypeInfo = Attributes::BarrierCommandOpenEvents::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -8096,8 +8812,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::MaxFrequency::Id: {
-            using TypeInfo = Attributes::MaxFrequency::TypeInfo;
+        case Attributes::BarrierCommandCloseEvents::Id: {
+            using TypeInfo = Attributes::BarrierCommandCloseEvents::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -8107,19 +8823,19 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::Options::Id: {
-            using TypeInfo = Attributes::Options::TypeInfo;
+        case Attributes::BarrierOpenPeriod::Id: {
+            using TypeInfo = Attributes::BarrierOpenPeriod::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::OnOffTransitionTime::Id: {
-            using TypeInfo = Attributes::OnOffTransitionTime::TypeInfo;
+        case Attributes::BarrierClosePeriod::Id: {
+            using TypeInfo = Attributes::BarrierClosePeriod::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -8129,79 +8845,15 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::OnLevel::Id: {
-            using TypeInfo = Attributes::OnLevel::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-            }
-            return value;
-        }
-        case Attributes::OnTransitionTime::Id: {
-            using TypeInfo = Attributes::OnTransitionTime::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
-            }
-            return value;
-        }
-        case Attributes::OffTransitionTime::Id: {
-            using TypeInfo = Attributes::OffTransitionTime::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
-            }
-            return value;
-        }
-        case Attributes::DefaultMoveRate::Id: {
-            using TypeInfo = Attributes::DefaultMoveRate::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-            }
-            return value;
-        }
-        case Attributes::StartUpCurrentLevel::Id: {
-            using TypeInfo = Attributes::StartUpCurrentLevel::TypeInfo;
+        case Attributes::BarrierPosition::Id: {
+            using TypeInfo = Attributes::BarrierPosition::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -8310,433 +8962,269 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::LocalizationConfiguration::Id: {
-        using namespace Clusters::LocalizationConfiguration;
+    case Clusters::PumpConfigurationAndControl::Id: {
+        using namespace Clusters::PumpConfigurationAndControl;
         switch (aPath.mAttributeId) {
-        case Attributes::ActiveLocale::Id: {
-            using TypeInfo = Attributes::ActiveLocale::TypeInfo;
+        case Attributes::MaxPressure::Id: {
+            using TypeInfo = Attributes::MaxPressure::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithShort:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::SupportedLocales::Id: {
-            using TypeInfo = Attributes::SupportedLocales::TypeInfo;
+        case Attributes::MaxSpeed::Id: {
+            using TypeInfo = Attributes::MaxSpeed::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSString * newElement_0;
-                    newElement_0 = [[NSString alloc] initWithBytes:entry_0.data()
-                                                            length:entry_0.size()
-                                                          encoding:NSUTF8StringEncoding];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::MaxFlow::Id: {
+            using TypeInfo = Attributes::MaxFlow::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::MinConstPressure::Id: {
+            using TypeInfo = Attributes::MinConstPressure::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithShort:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::MaxConstPressure::Id: {
+            using TypeInfo = Attributes::MaxConstPressure::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithShort:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::MinCompPressure::Id: {
+            using TypeInfo = Attributes::MinCompPressure::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithShort:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::MaxCompPressure::Id: {
+            using TypeInfo = Attributes::MaxCompPressure::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithShort:cppValue.Value()];
+            }
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::LowPower::Id: {
-        using namespace Clusters::LowPower;
-        switch (aPath.mAttributeId) {
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::MinConstSpeed::Id: {
+            using TypeInfo = Attributes::MinConstSpeed::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::MaxConstSpeed::Id: {
+            using TypeInfo = Attributes::MaxConstSpeed::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::MinConstFlow::Id: {
+            using TypeInfo = Attributes::MinConstFlow::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::MaxConstFlow::Id: {
+            using TypeInfo = Attributes::MaxConstFlow::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::MinConstTemp::Id: {
+            using TypeInfo = Attributes::MinConstTemp::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithShort:cppValue.Value()];
+            }
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::MediaInput::Id: {
-        using namespace Clusters::MediaInput;
-        switch (aPath.mAttributeId) {
-        case Attributes::InputList::Id: {
-            using TypeInfo = Attributes::InputList::TypeInfo;
+        case Attributes::MaxConstTemp::Id: {
+            using TypeInfo = Attributes::MaxConstTemp::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    CHIPMediaInputClusterInputInfo * newElement_0;
-                    newElement_0 = [CHIPMediaInputClusterInputInfo new];
-                    newElement_0.index = [NSNumber numberWithUnsignedChar:entry_0.index];
-                    newElement_0.inputType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.inputType)];
-                    newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data()
-                                                                 length:entry_0.name.size()
-                                                               encoding:NSUTF8StringEncoding];
-                    newElement_0.descriptionString = [[NSString alloc] initWithBytes:entry_0.description.data()
-                                                                              length:entry_0.description.size()
-                                                                            encoding:NSUTF8StringEncoding];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithShort:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::CurrentInput::Id: {
-            using TypeInfo = Attributes::CurrentInput::TypeInfo;
+        case Attributes::PumpStatus::Id: {
+            using TypeInfo = Attributes::PumpStatus::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue.Raw()];
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::EffectiveOperationMode::Id: {
+            using TypeInfo = Attributes::EffectiveOperationMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::EffectiveControlMode::Id: {
+            using TypeInfo = Attributes::EffectiveControlMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::Capacity::Id: {
+            using TypeInfo = Attributes::Capacity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
-            return value;
-        }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithShort:cppValue.Value()];
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::Speed::Id: {
+            using TypeInfo = Attributes::Speed::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
-            return value;
-        }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::MediaPlayback::Id: {
-        using namespace Clusters::MediaPlayback;
-        switch (aPath.mAttributeId) {
-        case Attributes::CurrentState::Id: {
-            using TypeInfo = Attributes::CurrentState::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
             return value;
         }
-        case Attributes::StartTime::Id: {
-            using TypeInfo = Attributes::StartTime::TypeInfo;
+        case Attributes::LifetimeRunningHours::Id: {
+            using TypeInfo = Attributes::LifetimeRunningHours::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -8746,12 +9234,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (cppValue.IsNull()) {
                 value = nil;
             } else {
-                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
+                value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::Duration::Id: {
-            using TypeInfo = Attributes::Duration::TypeInfo;
+        case Attributes::Power::Id: {
+            using TypeInfo = Attributes::Power::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -8761,70 +9249,45 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (cppValue.IsNull()) {
                 value = nil;
             } else {
-                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
+                value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::SampledPosition::Id: {
-            using TypeInfo = Attributes::SampledPosition::TypeInfo;
+        case Attributes::LifetimeEnergyConsumed::Id: {
+            using TypeInfo = Attributes::LifetimeEnergyConsumed::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value;
+            NSNumber * _Nullable value;
             if (cppValue.IsNull()) {
                 value = nil;
             } else {
-                value = [CHIPMediaPlaybackClusterPlaybackPosition new];
-                value.updatedAt = [NSNumber numberWithUnsignedLongLong:cppValue.Value().updatedAt];
-                if (cppValue.Value().position.IsNull()) {
-                    value.position = nil;
-                } else {
-                    value.position = [NSNumber numberWithUnsignedLongLong:cppValue.Value().position.Value()];
-                }
+                value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::PlaybackSpeed::Id: {
-            using TypeInfo = Attributes::PlaybackSpeed::TypeInfo;
+        case Attributes::OperationMode::Id: {
+            using TypeInfo = Attributes::OperationMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithFloat:cppValue];
-            return value;
-        }
-        case Attributes::SeekRangeEnd::Id: {
-            using TypeInfo = Attributes::SeekRangeEnd::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
-            }
+            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
             return value;
         }
-        case Attributes::SeekRangeStart::Id: {
-            using TypeInfo = Attributes::SeekRangeStart::TypeInfo;
+        case Attributes::ControlMode::Id: {
+            using TypeInfo = Attributes::ControlMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -8933,22 +9396,26 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::ModeSelect::Id: {
-        using namespace Clusters::ModeSelect;
+    case Clusters::Thermostat::Id: {
+        using namespace Clusters::Thermostat;
         switch (aPath.mAttributeId) {
-        case Attributes::Description::Id: {
-            using TypeInfo = Attributes::Description::TypeInfo;
+        case Attributes::LocalTemperature::Id: {
+            using TypeInfo = Attributes::LocalTemperature::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithShort:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::StandardNamespace::Id: {
-            using TypeInfo = Attributes::StandardNamespace::TypeInfo;
+        case Attributes::OutdoorTemperature::Id: {
+            using TypeInfo = Attributes::OutdoorTemperature::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -8958,525 +9425,324 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (cppValue.IsNull()) {
                 value = nil;
             } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
+                value = [NSNumber numberWithShort:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::SupportedModes::Id: {
-            using TypeInfo = Attributes::SupportedModes::TypeInfo;
+        case Attributes::Occupancy::Id: {
+            using TypeInfo = Attributes::Occupancy::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    CHIPModeSelectClusterModeOptionStruct * newElement_0;
-                    newElement_0 = [CHIPModeSelectClusterModeOptionStruct new];
-                    newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data()
-                                                                  length:entry_0.label.size()
-                                                                encoding:NSUTF8StringEncoding];
-                    newElement_0.mode = [NSNumber numberWithUnsignedChar:entry_0.mode];
-                    { // Scope for our temporary variables
-                        auto * array_2 = [NSMutableArray new];
-                        auto iter_2 = entry_0.semanticTags.begin();
-                        while (iter_2.Next()) {
-                            auto & entry_2 = iter_2.GetValue();
-                            CHIPModeSelectClusterSemanticTag * newElement_2;
-                            newElement_2 = [CHIPModeSelectClusterSemanticTag new];
-                            newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:entry_2.mfgCode];
-                            newElement_2.value = [NSNumber numberWithUnsignedShort:entry_2.value];
-                            [array_2 addObject:newElement_2];
-                        }
-                        CHIP_ERROR err = iter_2.GetStatus();
-                        if (err != CHIP_NO_ERROR) {
-                            *aError = err;
-                            return nil;
-                        }
-                        newElement_0.semanticTags = array_2;
-                    }
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::CurrentMode::Id: {
-            using TypeInfo = Attributes::CurrentMode::TypeInfo;
+        case Attributes::AbsMinHeatSetpointLimit::Id: {
+            using TypeInfo = Attributes::AbsMinHeatSetpointLimit::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::StartUpMode::Id: {
-            using TypeInfo = Attributes::StartUpMode::TypeInfo;
+        case Attributes::AbsMaxHeatSetpointLimit::Id: {
+            using TypeInfo = Attributes::AbsMaxHeatSetpointLimit::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::OnMode::Id: {
-            using TypeInfo = Attributes::OnMode::TypeInfo;
+        case Attributes::AbsMinCoolSetpointLimit::Id: {
+            using TypeInfo = Attributes::AbsMinCoolSetpointLimit::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::AbsMaxCoolSetpointLimit::Id: {
+            using TypeInfo = Attributes::AbsMaxCoolSetpointLimit::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::PICoolingDemand::Id: {
+            using TypeInfo = Attributes::PICoolingDemand::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::PIHeatingDemand::Id: {
+            using TypeInfo = Attributes::PIHeatingDemand::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::HVACSystemTypeConfiguration::Id: {
+            using TypeInfo = Attributes::HVACSystemTypeConfiguration::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::LocalTemperatureCalibration::Id: {
+            using TypeInfo = Attributes::LocalTemperatureCalibration::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithChar:cppValue];
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::NetworkCommissioning::Id: {
-        using namespace Clusters::NetworkCommissioning;
-        switch (aPath.mAttributeId) {
-        case Attributes::MaxNetworks::Id: {
-            using TypeInfo = Attributes::MaxNetworks::TypeInfo;
+        case Attributes::OccupiedCoolingSetpoint::Id: {
+            using TypeInfo = Attributes::OccupiedCoolingSetpoint::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::Networks::Id: {
-            using TypeInfo = Attributes::Networks::TypeInfo;
+        case Attributes::OccupiedHeatingSetpoint::Id: {
+            using TypeInfo = Attributes::OccupiedHeatingSetpoint::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    CHIPNetworkCommissioningClusterNetworkInfo * newElement_0;
-                    newElement_0 = [CHIPNetworkCommissioningClusterNetworkInfo new];
-                    newElement_0.networkID = [NSData dataWithBytes:entry_0.networkID.data() length:entry_0.networkID.size()];
-                    newElement_0.connected = [NSNumber numberWithBool:entry_0.connected];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::ScanMaxTimeSeconds::Id: {
-            using TypeInfo = Attributes::ScanMaxTimeSeconds::TypeInfo;
+        case Attributes::UnoccupiedCoolingSetpoint::Id: {
+            using TypeInfo = Attributes::UnoccupiedCoolingSetpoint::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::ConnectMaxTimeSeconds::Id: {
-            using TypeInfo = Attributes::ConnectMaxTimeSeconds::TypeInfo;
+        case Attributes::UnoccupiedHeatingSetpoint::Id: {
+            using TypeInfo = Attributes::UnoccupiedHeatingSetpoint::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::InterfaceEnabled::Id: {
-            using TypeInfo = Attributes::InterfaceEnabled::TypeInfo;
+        case Attributes::MinHeatSetpointLimit::Id: {
+            using TypeInfo = Attributes::MinHeatSetpointLimit::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::LastNetworkingStatus::Id: {
-            using TypeInfo = Attributes::LastNetworkingStatus::TypeInfo;
+        case Attributes::MaxHeatSetpointLimit::Id: {
+            using TypeInfo = Attributes::MaxHeatSetpointLimit::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value())];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::LastNetworkID::Id: {
-            using TypeInfo = Attributes::LastNetworkID::TypeInfo;
+        case Attributes::MinCoolSetpointLimit::Id: {
+            using TypeInfo = Attributes::MinCoolSetpointLimit::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSData * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSData dataWithBytes:cppValue.Value().data() length:cppValue.Value().size()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::LastConnectErrorValue::Id: {
-            using TypeInfo = Attributes::LastConnectErrorValue::TypeInfo;
+        case Attributes::MaxCoolSetpointLimit::Id: {
+            using TypeInfo = Attributes::MaxCoolSetpointLimit::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithInt:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::MinSetpointDeadBand::Id: {
+            using TypeInfo = Attributes::MinSetpointDeadBand::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithChar:cppValue];
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::RemoteSensing::Id: {
+            using TypeInfo = Attributes::RemoteSensing::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
+            return value;
+        }
+        case Attributes::ControlSequenceOfOperation::Id: {
+            using TypeInfo = Attributes::ControlSequenceOfOperation::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
             }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::SystemMode::Id: {
+            using TypeInfo = Attributes::SystemMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::ThermostatRunningMode::Id: {
+            using TypeInfo = Attributes::ThermostatRunningMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::StartOfWeek::Id: {
+            using TypeInfo = Attributes::StartOfWeek::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::OtaSoftwareUpdateProvider::Id: {
-        using namespace Clusters::OtaSoftwareUpdateProvider;
-        switch (aPath.mAttributeId) {
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::NumberOfWeeklyTransitions::Id: {
+            using TypeInfo = Attributes::NumberOfWeeklyTransitions::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::NumberOfDailyTransitions::Id: {
+            using TypeInfo = Attributes::NumberOfDailyTransitions::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
+            return value;
+        }
+        case Attributes::TemperatureSetpointHold::Id: {
+            using TypeInfo = Attributes::TemperatureSetpointHold::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
             }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::TemperatureSetpointHoldDuration::Id: {
+            using TypeInfo = Attributes::TemperatureSetpointHoldDuration::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::ThermostatProgrammingOperationMode::Id: {
+            using TypeInfo = Attributes::ThermostatProgrammingOperationMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::ThermostatRunningState::Id: {
+            using TypeInfo = Attributes::ThermostatRunningState::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -9486,68 +9752,45 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::OtaSoftwareUpdateRequestor::Id: {
-        using namespace Clusters::OtaSoftwareUpdateRequestor;
-        switch (aPath.mAttributeId) {
-        case Attributes::DefaultOtaProviders::Id: {
-            using TypeInfo = Attributes::DefaultOtaProviders::TypeInfo;
+        case Attributes::SetpointChangeSource::Id: {
+            using TypeInfo = Attributes::SetpointChangeSource::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    CHIPOtaSoftwareUpdateRequestorClusterProviderLocation * newElement_0;
-                    newElement_0 = [CHIPOtaSoftwareUpdateRequestorClusterProviderLocation new];
-                    newElement_0.providerNodeID = [NSNumber numberWithUnsignedLongLong:entry_0.providerNodeID];
-                    newElement_0.endpoint = [NSNumber numberWithUnsignedShort:entry_0.endpoint];
-                    newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::UpdatePossible::Id: {
-            using TypeInfo = Attributes::UpdatePossible::TypeInfo;
+        case Attributes::SetpointChangeAmount::Id: {
+            using TypeInfo = Attributes::SetpointChangeAmount::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithShort:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::UpdateState::Id: {
-            using TypeInfo = Attributes::UpdateState::TypeInfo;
+        case Attributes::SetpointChangeSourceTimestamp::Id: {
+            using TypeInfo = Attributes::SetpointChangeSourceTimestamp::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::UpdateStateProgress::Id: {
-            using TypeInfo = Attributes::UpdateStateProgress::TypeInfo;
+        case Attributes::OccupiedSetback::Id: {
+            using TypeInfo = Attributes::OccupiedSetback::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -9561,139 +9804,83 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::OccupiedSetbackMin::Id: {
+            using TypeInfo = Attributes::OccupiedSetbackMin::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::OccupiedSetbackMax::Id: {
+            using TypeInfo = Attributes::OccupiedSetbackMax::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::UnoccupiedSetback::Id: {
+            using TypeInfo = Attributes::UnoccupiedSetback::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::UnoccupiedSetbackMin::Id: {
+            using TypeInfo = Attributes::UnoccupiedSetbackMin::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
-            return value;
-        }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::OccupancySensing::Id: {
-        using namespace Clusters::OccupancySensing;
-        switch (aPath.mAttributeId) {
-        case Attributes::Occupancy::Id: {
-            using TypeInfo = Attributes::Occupancy::TypeInfo;
+        case Attributes::UnoccupiedSetbackMax::Id: {
+            using TypeInfo = Attributes::UnoccupiedSetbackMax::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
-            return value;
-        }
-        case Attributes::OccupancySensorType::Id: {
-            using TypeInfo = Attributes::OccupancySensorType::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::OccupancySensorTypeBitmap::Id: {
-            using TypeInfo = Attributes::OccupancySensorTypeBitmap::TypeInfo;
+        case Attributes::EmergencyHeatDelta::Id: {
+            using TypeInfo = Attributes::EmergencyHeatDelta::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -9703,19 +9890,19 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::PirOccupiedToUnoccupiedDelay::Id: {
-            using TypeInfo = Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo;
+        case Attributes::ACType::Id: {
+            using TypeInfo = Attributes::ACType::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::PirUnoccupiedToOccupiedDelay::Id: {
-            using TypeInfo = Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo;
+        case Attributes::ACCapacity::Id: {
+            using TypeInfo = Attributes::ACCapacity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -9725,8 +9912,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::PirUnoccupiedToOccupiedThreshold::Id: {
-            using TypeInfo = Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo;
+        case Attributes::ACRefrigerantType::Id: {
+            using TypeInfo = Attributes::ACRefrigerantType::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -9736,30 +9923,30 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::UltrasonicOccupiedToUnoccupiedDelay::Id: {
-            using TypeInfo = Attributes::UltrasonicOccupiedToUnoccupiedDelay::TypeInfo;
+        case Attributes::ACCompressorType::Id: {
+            using TypeInfo = Attributes::ACCompressorType::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::UltrasonicUnoccupiedToOccupiedDelay::Id: {
-            using TypeInfo = Attributes::UltrasonicUnoccupiedToOccupiedDelay::TypeInfo;
+        case Attributes::ACErrorCode::Id: {
+            using TypeInfo = Attributes::ACErrorCode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::UltrasonicUnoccupiedToOccupiedThreshold::Id: {
-            using TypeInfo = Attributes::UltrasonicUnoccupiedToOccupiedThreshold::TypeInfo;
+        case Attributes::ACLouverPosition::Id: {
+            using TypeInfo = Attributes::ACLouverPosition::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -9769,30 +9956,23 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::PhysicalContactOccupiedToUnoccupiedDelay::Id: {
-            using TypeInfo = Attributes::PhysicalContactOccupiedToUnoccupiedDelay::TypeInfo;
+        case Attributes::ACCoilTemperature::Id: {
+            using TypeInfo = Attributes::ACCoilTemperature::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
-            return value;
-        }
-        case Attributes::PhysicalContactUnoccupiedToOccupiedDelay::Id: {
-            using TypeInfo = Attributes::PhysicalContactUnoccupiedToOccupiedDelay::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithShort:cppValue.Value()];
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::Id: {
-            using TypeInfo = Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::TypeInfo;
+        case Attributes::ACCapacityformat::Id: {
+            using TypeInfo = Attributes::ACCapacityformat::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -9908,55 +10088,70 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::OnOff::Id: {
-        using namespace Clusters::OnOff;
+    case Clusters::FanControl::Id: {
+        using namespace Clusters::FanControl;
         switch (aPath.mAttributeId) {
-        case Attributes::OnOff::Id: {
-            using TypeInfo = Attributes::OnOff::TypeInfo;
+        case Attributes::FanMode::Id: {
+            using TypeInfo = Attributes::FanMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
+            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
             return value;
         }
-        case Attributes::GlobalSceneControl::Id: {
-            using TypeInfo = Attributes::GlobalSceneControl::TypeInfo;
+        case Attributes::FanModeSequence::Id: {
+            using TypeInfo = Attributes::FanModeSequence::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
+            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
             return value;
         }
-        case Attributes::OnTime::Id: {
-            using TypeInfo = Attributes::OnTime::TypeInfo;
+        case Attributes::PercentSetting::Id: {
+            using TypeInfo = Attributes::PercentSetting::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            }
+            return value;
+        }
+        case Attributes::PercentCurrent::Id: {
+            using TypeInfo = Attributes::PercentCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::OffWaitTime::Id: {
-            using TypeInfo = Attributes::OffWaitTime::TypeInfo;
+        case Attributes::SpeedMax::Id: {
+            using TypeInfo = Attributes::SpeedMax::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::StartUpOnOff::Id: {
-            using TypeInfo = Attributes::StartUpOnOff::TypeInfo;
+        case Attributes::SpeedSetting::Id: {
+            using TypeInfo = Attributes::SpeedSetting::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -9966,8 +10161,63 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (cppValue.IsNull()) {
                 value = nil;
             } else {
-                value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value())];
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            }
+            return value;
+        }
+        case Attributes::SpeedCurrent::Id: {
+            using TypeInfo = Attributes::SpeedCurrent::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
+            return value;
+        }
+        case Attributes::RockSupport::Id: {
+            using TypeInfo = Attributes::RockSupport::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
+            return value;
+        }
+        case Attributes::RockSetting::Id: {
+            using TypeInfo = Attributes::RockSetting::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
+            return value;
+        }
+        case Attributes::WindSupport::Id: {
+            using TypeInfo = Attributes::WindSupport::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
+            return value;
+        }
+        case Attributes::WindSetting::Id: {
+            using TypeInfo = Attributes::WindSetting::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
             }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -10076,11 +10326,11 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::OnOffSwitchConfiguration::Id: {
-        using namespace Clusters::OnOffSwitchConfiguration;
+    case Clusters::ThermostatUserInterfaceConfiguration::Id: {
+        using namespace Clusters::ThermostatUserInterfaceConfiguration;
         switch (aPath.mAttributeId) {
-        case Attributes::SwitchType::Id: {
-            using TypeInfo = Attributes::SwitchType::TypeInfo;
+        case Attributes::TemperatureDisplayMode::Id: {
+            using TypeInfo = Attributes::TemperatureDisplayMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -10090,8 +10340,19 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::SwitchActions::Id: {
-            using TypeInfo = Attributes::SwitchActions::TypeInfo;
+        case Attributes::KeypadLockout::Id: {
+            using TypeInfo = Attributes::KeypadLockout::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
+            return value;
+        }
+        case Attributes::ScheduleProgrammingVisibility::Id: {
+            using TypeInfo = Attributes::ScheduleProgrammingVisibility::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -10207,127 +10468,66 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::OperationalCredentials::Id: {
-        using namespace Clusters::OperationalCredentials;
+    case Clusters::ColorControl::Id: {
+        using namespace Clusters::ColorControl;
         switch (aPath.mAttributeId) {
-        case Attributes::NOCs::Id: {
-            using TypeInfo = Attributes::NOCs::TypeInfo;
+        case Attributes::CurrentHue::Id: {
+            using TypeInfo = Attributes::CurrentHue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    CHIPOperationalCredentialsClusterNOCStruct * newElement_0;
-                    newElement_0 = [CHIPOperationalCredentialsClusterNOCStruct new];
-                    newElement_0.noc = [NSData dataWithBytes:entry_0.noc.data() length:entry_0.noc.size()];
-                    if (entry_0.icac.IsNull()) {
-                        newElement_0.icac = nil;
-                    } else {
-                        newElement_0.icac = [NSData dataWithBytes:entry_0.icac.Value().data() length:entry_0.icac.Value().size()];
-                    }
-                    newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::Fabrics::Id: {
-            using TypeInfo = Attributes::Fabrics::TypeInfo;
+        case Attributes::CurrentSaturation::Id: {
+            using TypeInfo = Attributes::CurrentSaturation::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    CHIPOperationalCredentialsClusterFabricDescriptor * newElement_0;
-                    newElement_0 = [CHIPOperationalCredentialsClusterFabricDescriptor new];
-                    newElement_0.rootPublicKey = [NSData dataWithBytes:entry_0.rootPublicKey.data()
-                                                                length:entry_0.rootPublicKey.size()];
-                    newElement_0.vendorId = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_0.vendorId)];
-                    newElement_0.fabricId = [NSNumber numberWithUnsignedLongLong:entry_0.fabricId];
-                    newElement_0.nodeId = [NSNumber numberWithUnsignedLongLong:entry_0.nodeId];
-                    newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data()
-                                                                  length:entry_0.label.size()
-                                                                encoding:NSUTF8StringEncoding];
-                    newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::SupportedFabrics::Id: {
-            using TypeInfo = Attributes::SupportedFabrics::TypeInfo;
+        case Attributes::RemainingTime::Id: {
+            using TypeInfo = Attributes::RemainingTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::CommissionedFabrics::Id: {
-            using TypeInfo = Attributes::CommissionedFabrics::TypeInfo;
+        case Attributes::CurrentX::Id: {
+            using TypeInfo = Attributes::CurrentX::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::TrustedRootCertificates::Id: {
-            using TypeInfo = Attributes::TrustedRootCertificates::TypeInfo;
+        case Attributes::CurrentY::Id: {
+            using TypeInfo = Attributes::CurrentY::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSData * newElement_0;
-                    newElement_0 = [NSData dataWithBytes:entry_0.data() length:entry_0.size()];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::CurrentFabricIndex::Id: {
-            using TypeInfo = Attributes::CurrentFabricIndex::TypeInfo;
+        case Attributes::DriftCompensation::Id: {
+            using TypeInfo = Attributes::DriftCompensation::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -10337,161 +10537,115 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::CompensationText::Id: {
+            using TypeInfo = Attributes::CompensationText::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::ColorTemperature::Id: {
+            using TypeInfo = Attributes::ColorTemperature::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::ColorMode::Id: {
+            using TypeInfo = Attributes::ColorMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::Options::Id: {
+            using TypeInfo = Attributes::Options::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::NumberOfPrimaries::Id: {
+            using TypeInfo = Attributes::NumberOfPrimaries::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            }
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::PowerSource::Id: {
-        using namespace Clusters::PowerSource;
-        switch (aPath.mAttributeId) {
-        case Attributes::Status::Id: {
-            using TypeInfo = Attributes::Status::TypeInfo;
+        case Attributes::Primary1X::Id: {
+            using TypeInfo = Attributes::Primary1X::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::Order::Id: {
-            using TypeInfo = Attributes::Order::TypeInfo;
+        case Attributes::Primary1Y::Id: {
+            using TypeInfo = Attributes::Primary1Y::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::Description::Id: {
-            using TypeInfo = Attributes::Description::TypeInfo;
+        case Attributes::Primary1Intensity::Id: {
+            using TypeInfo = Attributes::Primary1Intensity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::WiredAssessedInputVoltage::Id: {
-            using TypeInfo = Attributes::WiredAssessedInputVoltage::TypeInfo;
+        case Attributes::Primary2X::Id: {
+            using TypeInfo = Attributes::Primary2X::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::WiredAssessedInputFrequency::Id: {
-            using TypeInfo = Attributes::WiredAssessedInputFrequency::TypeInfo;
+        case Attributes::Primary2Y::Id: {
+            using TypeInfo = Attributes::Primary2Y::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -10501,428 +10655,392 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::WiredCurrentType::Id: {
-            using TypeInfo = Attributes::WiredCurrentType::TypeInfo;
+        case Attributes::Primary2Intensity::Id: {
+            using TypeInfo = Attributes::Primary2Intensity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::WiredAssessedCurrent::Id: {
-            using TypeInfo = Attributes::WiredAssessedCurrent::TypeInfo;
+        case Attributes::Primary3X::Id: {
+            using TypeInfo = Attributes::Primary3X::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::WiredNominalVoltage::Id: {
-            using TypeInfo = Attributes::WiredNominalVoltage::TypeInfo;
+        case Attributes::Primary3Y::Id: {
+            using TypeInfo = Attributes::Primary3Y::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::WiredMaximumCurrent::Id: {
-            using TypeInfo = Attributes::WiredMaximumCurrent::TypeInfo;
+        case Attributes::Primary3Intensity::Id: {
+            using TypeInfo = Attributes::Primary3Intensity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::WiredPresent::Id: {
-            using TypeInfo = Attributes::WiredPresent::TypeInfo;
+        case Attributes::Primary4X::Id: {
+            using TypeInfo = Attributes::Primary4X::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ActiveWiredFaults::Id: {
-            using TypeInfo = Attributes::ActiveWiredFaults::TypeInfo;
+        case Attributes::Primary4Y::Id: {
+            using TypeInfo = Attributes::Primary4Y::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
+            return value;
+        }
+        case Attributes::Primary4Intensity::Id: {
+            using TypeInfo = Attributes::Primary4Intensity::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::BatteryVoltage::Id: {
-            using TypeInfo = Attributes::BatteryVoltage::TypeInfo;
+        case Attributes::Primary5X::Id: {
+            using TypeInfo = Attributes::Primary5X::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::BatteryPercentRemaining::Id: {
-            using TypeInfo = Attributes::BatteryPercentRemaining::TypeInfo;
+        case Attributes::Primary5Y::Id: {
+            using TypeInfo = Attributes::Primary5Y::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::BatteryTimeRemaining::Id: {
-            using TypeInfo = Attributes::BatteryTimeRemaining::TypeInfo;
+        case Attributes::Primary5Intensity::Id: {
+            using TypeInfo = Attributes::Primary5Intensity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::BatteryChargeLevel::Id: {
-            using TypeInfo = Attributes::BatteryChargeLevel::TypeInfo;
+        case Attributes::Primary6X::Id: {
+            using TypeInfo = Attributes::Primary6X::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::BatteryReplacementNeeded::Id: {
-            using TypeInfo = Attributes::BatteryReplacementNeeded::TypeInfo;
+        case Attributes::Primary6Y::Id: {
+            using TypeInfo = Attributes::Primary6Y::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::BatteryReplaceability::Id: {
-            using TypeInfo = Attributes::BatteryReplaceability::TypeInfo;
+        case Attributes::Primary6Intensity::Id: {
+            using TypeInfo = Attributes::Primary6Intensity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::BatteryPresent::Id: {
-            using TypeInfo = Attributes::BatteryPresent::TypeInfo;
+        case Attributes::WhitePointX::Id: {
+            using TypeInfo = Attributes::WhitePointX::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ActiveBatteryFaults::Id: {
-            using TypeInfo = Attributes::ActiveBatteryFaults::TypeInfo;
+        case Attributes::WhitePointY::Id: {
+            using TypeInfo = Attributes::WhitePointY::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::BatteryReplacementDescription::Id: {
-            using TypeInfo = Attributes::BatteryReplacementDescription::TypeInfo;
+        case Attributes::ColorPointRX::Id: {
+            using TypeInfo = Attributes::ColorPointRX::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::BatteryCommonDesignation::Id: {
-            using TypeInfo = Attributes::BatteryCommonDesignation::TypeInfo;
+        case Attributes::ColorPointRY::Id: {
+            using TypeInfo = Attributes::ColorPointRY::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::BatteryANSIDesignation::Id: {
-            using TypeInfo = Attributes::BatteryANSIDesignation::TypeInfo;
+        case Attributes::ColorPointRIntensity::Id: {
+            using TypeInfo = Attributes::ColorPointRIntensity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::BatteryIECDesignation::Id: {
-            using TypeInfo = Attributes::BatteryIECDesignation::TypeInfo;
+        case Attributes::ColorPointGX::Id: {
+            using TypeInfo = Attributes::ColorPointGX::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::BatteryApprovedChemistry::Id: {
-            using TypeInfo = Attributes::BatteryApprovedChemistry::TypeInfo;
+        case Attributes::ColorPointGY::Id: {
+            using TypeInfo = Attributes::ColorPointGY::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::BatteryCapacity::Id: {
-            using TypeInfo = Attributes::BatteryCapacity::TypeInfo;
+        case Attributes::ColorPointGIntensity::Id: {
+            using TypeInfo = Attributes::ColorPointGIntensity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::BatteryQuantity::Id: {
-            using TypeInfo = Attributes::BatteryQuantity::TypeInfo;
+        case Attributes::ColorPointBX::Id: {
+            using TypeInfo = Attributes::ColorPointBX::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::BatteryChargeState::Id: {
-            using TypeInfo = Attributes::BatteryChargeState::TypeInfo;
+        case Attributes::ColorPointBY::Id: {
+            using TypeInfo = Attributes::ColorPointBY::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::BatteryTimeToFullCharge::Id: {
-            using TypeInfo = Attributes::BatteryTimeToFullCharge::TypeInfo;
+        case Attributes::ColorPointBIntensity::Id: {
+            using TypeInfo = Attributes::ColorPointBIntensity::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::BatteryFunctionalWhileCharging::Id: {
-            using TypeInfo = Attributes::BatteryFunctionalWhileCharging::TypeInfo;
+        case Attributes::EnhancedCurrentHue::Id: {
+            using TypeInfo = Attributes::EnhancedCurrentHue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::BatteryChargingCurrent::Id: {
-            using TypeInfo = Attributes::BatteryChargingCurrent::TypeInfo;
+        case Attributes::EnhancedColorMode::Id: {
+            using TypeInfo = Attributes::EnhancedColorMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::ActiveBatteryChargeFaults::Id: {
-            using TypeInfo = Attributes::ActiveBatteryChargeFaults::TypeInfo;
+        case Attributes::ColorLoopActive::Id: {
+            using TypeInfo = Attributes::ColorLoopActive::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::ColorLoopDirection::Id: {
+            using TypeInfo = Attributes::ColorLoopDirection::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::ColorLoopTime::Id: {
+            using TypeInfo = Attributes::ColorLoopTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::ColorLoopStartEnhancedHue::Id: {
+            using TypeInfo = Attributes::ColorLoopStartEnhancedHue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
+            return value;
+        }
+        case Attributes::ColorLoopStoredEnhancedHue::Id: {
+            using TypeInfo = Attributes::ColorLoopStoredEnhancedHue::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
             }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::ColorCapabilities::Id: {
+            using TypeInfo = Attributes::ColorCapabilities::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::ColorTempPhysicalMinMireds::Id: {
+            using TypeInfo = Attributes::ColorTempPhysicalMinMireds::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -10932,39 +11050,37 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
+        case Attributes::ColorTempPhysicalMaxMireds::Id: {
+            using TypeInfo = Attributes::ColorTempPhysicalMaxMireds::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
+            return value;
         }
-        break;
-    }
-    case Clusters::PowerSourceConfiguration::Id: {
-        using namespace Clusters::PowerSourceConfiguration;
-        switch (aPath.mAttributeId) {
-        case Attributes::Sources::Id: {
-            using TypeInfo = Attributes::Sources::TypeInfo;
+        case Attributes::CoupleColorTempToLevelMinMireds::Id: {
+            using TypeInfo = Attributes::CoupleColorTempToLevelMinMireds::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
+            return value;
+        }
+        case Attributes::StartUpColorTemperatureMireds::Id: {
+            using TypeInfo = Attributes::StartUpColorTemperatureMireds::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
             }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -11073,8 +11189,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::PressureMeasurement::Id: {
-        using namespace Clusters::PressureMeasurement;
+    case Clusters::IlluminanceMeasurement::Id: {
+        using namespace Clusters::IlluminanceMeasurement;
         switch (aPath.mAttributeId) {
         case Attributes::MeasuredValue::Id: {
             using TypeInfo = Attributes::MeasuredValue::TypeInfo;
@@ -11087,7 +11203,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (cppValue.IsNull()) {
                 value = nil;
             } else {
-                value = [NSNumber numberWithShort:cppValue.Value()];
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
             }
             return value;
         }
@@ -11102,7 +11218,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (cppValue.IsNull()) {
                 value = nil;
             } else {
-                value = [NSNumber numberWithShort:cppValue.Value()];
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
             }
             return value;
         }
@@ -11117,7 +11233,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (cppValue.IsNull()) {
                 value = nil;
             } else {
-                value = [NSNumber numberWithShort:cppValue.Value()];
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
             }
             return value;
         }
@@ -11132,38 +11248,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ScaledValue::Id: {
-            using TypeInfo = Attributes::ScaledValue::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithShort:cppValue.Value()];
-            }
-            return value;
-        }
-        case Attributes::MinScaledValue::Id: {
-            using TypeInfo = Attributes::MinScaledValue::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithShort:cppValue.Value()];
-            }
-            return value;
-        }
-        case Attributes::MaxScaledValue::Id: {
-            using TypeInfo = Attributes::MaxScaledValue::TypeInfo;
+        case Attributes::LightSensorType::Id: {
+            using TypeInfo = Attributes::LightSensorType::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -11173,30 +11259,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (cppValue.IsNull()) {
                 value = nil;
             } else {
-                value = [NSNumber numberWithShort:cppValue.Value()];
-            }
-            return value;
-        }
-        case Attributes::ScaledTolerance::Id: {
-            using TypeInfo = Attributes::ScaledTolerance::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
-            return value;
-        }
-        case Attributes::Scale::Id: {
-            using TypeInfo = Attributes::Scale::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithChar:cppValue];
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -11305,11 +11369,11 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::PumpConfigurationAndControl::Id: {
-        using namespace Clusters::PumpConfigurationAndControl;
+    case Clusters::TemperatureMeasurement::Id: {
+        using namespace Clusters::TemperatureMeasurement;
         switch (aPath.mAttributeId) {
-        case Attributes::MaxPressure::Id: {
-            using TypeInfo = Attributes::MaxPressure::TypeInfo;
+        case Attributes::MeasuredValue::Id: {
+            using TypeInfo = Attributes::MeasuredValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -11323,23 +11387,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::MaxSpeed::Id: {
-            using TypeInfo = Attributes::MaxSpeed::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
-            }
-            return value;
-        }
-        case Attributes::MaxFlow::Id: {
-            using TypeInfo = Attributes::MaxFlow::TypeInfo;
+        case Attributes::MinMeasuredValue::Id: {
+            using TypeInfo = Attributes::MinMeasuredValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -11349,12 +11398,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (cppValue.IsNull()) {
                 value = nil;
             } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
+                value = [NSNumber numberWithShort:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::MinConstPressure::Id: {
-            using TypeInfo = Attributes::MinConstPressure::TypeInfo;
+        case Attributes::MaxMeasuredValue::Id: {
+            using TypeInfo = Attributes::MaxMeasuredValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -11368,113 +11417,128 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::MaxConstPressure::Id: {
-            using TypeInfo = Attributes::MaxConstPressure::TypeInfo;
+        case Attributes::Tolerance::Id: {
+            using TypeInfo = Attributes::Tolerance::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithShort:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::MinCompPressure::Id: {
-            using TypeInfo = Attributes::MinCompPressure::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithShort:cppValue.Value()];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
             return value;
         }
-        case Attributes::MaxCompPressure::Id: {
-            using TypeInfo = Attributes::MaxCompPressure::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithShort:cppValue.Value()];
-            }
-            return value;
-        }
-        case Attributes::MinConstSpeed::Id: {
-            using TypeInfo = Attributes::MinConstSpeed::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
             return value;
         }
-        case Attributes::MaxConstSpeed::Id: {
-            using TypeInfo = Attributes::MaxConstSpeed::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
             return value;
         }
-        case Attributes::MinConstFlow::Id: {
-            using TypeInfo = Attributes::MinConstFlow::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::MaxConstFlow::Id: {
-            using TypeInfo = Attributes::MaxConstFlow::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::MinConstTemp::Id: {
-            using TypeInfo = Attributes::MinConstTemp::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::PressureMeasurement::Id: {
+        using namespace Clusters::PressureMeasurement;
+        switch (aPath.mAttributeId) {
+        case Attributes::MeasuredValue::Id: {
+            using TypeInfo = Attributes::MeasuredValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -11488,8 +11552,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::MaxConstTemp::Id: {
-            using TypeInfo = Attributes::MaxConstTemp::TypeInfo;
+        case Attributes::MinMeasuredValue::Id: {
+            using TypeInfo = Attributes::MinMeasuredValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -11503,41 +11567,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::PumpStatus::Id: {
-            using TypeInfo = Attributes::PumpStatus::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue.Raw()];
-            return value;
-        }
-        case Attributes::EffectiveOperationMode::Id: {
-            using TypeInfo = Attributes::EffectiveOperationMode::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
-            return value;
-        }
-        case Attributes::EffectiveControlMode::Id: {
-            using TypeInfo = Attributes::EffectiveControlMode::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
-            return value;
-        }
-        case Attributes::Capacity::Id: {
-            using TypeInfo = Attributes::Capacity::TypeInfo;
+        case Attributes::MaxMeasuredValue::Id: {
+            using TypeInfo = Attributes::MaxMeasuredValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -11551,23 +11582,19 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::Speed::Id: {
-            using TypeInfo = Attributes::Speed::TypeInfo;
+        case Attributes::Tolerance::Id: {
+            using TypeInfo = Attributes::Tolerance::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::LifetimeRunningHours::Id: {
-            using TypeInfo = Attributes::LifetimeRunningHours::TypeInfo;
+        case Attributes::ScaledValue::Id: {
+            using TypeInfo = Attributes::ScaledValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -11577,12 +11604,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (cppValue.IsNull()) {
                 value = nil;
             } else {
-                value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
+                value = [NSNumber numberWithShort:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::Power::Id: {
-            using TypeInfo = Attributes::Power::TypeInfo;
+        case Attributes::MinScaledValue::Id: {
+            using TypeInfo = Attributes::MinScaledValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -11592,12 +11619,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (cppValue.IsNull()) {
                 value = nil;
             } else {
-                value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
+                value = [NSNumber numberWithShort:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::LifetimeEnergyConsumed::Id: {
-            using TypeInfo = Attributes::LifetimeEnergyConsumed::TypeInfo;
+        case Attributes::MaxScaledValue::Id: {
+            using TypeInfo = Attributes::MaxScaledValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -11607,30 +11634,30 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (cppValue.IsNull()) {
                 value = nil;
             } else {
-                value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
+                value = [NSNumber numberWithShort:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::OperationMode::Id: {
-            using TypeInfo = Attributes::OperationMode::TypeInfo;
+        case Attributes::ScaledTolerance::Id: {
+            using TypeInfo = Attributes::ScaledTolerance::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ControlMode::Id: {
-            using TypeInfo = Attributes::ControlMode::TypeInfo;
+        case Attributes::Scale::Id: {
+            using TypeInfo = Attributes::Scale::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+            value = [NSNumber numberWithChar:cppValue];
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -11739,8 +11766,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::RelativeHumidityMeasurement::Id: {
-        using namespace Clusters::RelativeHumidityMeasurement;
+    case Clusters::FlowMeasurement::Id: {
+        using namespace Clusters::FlowMeasurement;
         switch (aPath.mAttributeId) {
         case Attributes::MeasuredValue::Id: {
             using TypeInfo = Attributes::MeasuredValue::TypeInfo;
@@ -11904,77 +11931,63 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::Scenes::Id: {
-        using namespace Clusters::Scenes;
+    case Clusters::RelativeHumidityMeasurement::Id: {
+        using namespace Clusters::RelativeHumidityMeasurement;
         switch (aPath.mAttributeId) {
-        case Attributes::SceneCount::Id: {
-            using TypeInfo = Attributes::SceneCount::TypeInfo;
+        case Attributes::MeasuredValue::Id: {
+            using TypeInfo = Attributes::MeasuredValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
-            return value;
-        }
-        case Attributes::CurrentScene::Id: {
-            using TypeInfo = Attributes::CurrentScene::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::CurrentGroup::Id: {
-            using TypeInfo = Attributes::CurrentGroup::TypeInfo;
+        case Attributes::MinMeasuredValue::Id: {
+            using TypeInfo = Attributes::MinMeasuredValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
-            return value;
-        }
-        case Attributes::SceneValid::Id: {
-            using TypeInfo = Attributes::SceneValid::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
             return value;
         }
-        case Attributes::NameSupport::Id: {
-            using TypeInfo = Attributes::NameSupport::TypeInfo;
+        case Attributes::MaxMeasuredValue::Id: {
+            using TypeInfo = Attributes::MaxMeasuredValue::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::LastConfiguredBy::Id: {
-            using TypeInfo = Attributes::LastConfiguredBy::TypeInfo;
+        case Attributes::Tolerance::Id: {
+            using TypeInfo = Attributes::Tolerance::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -12083,224 +12096,132 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::SoftwareDiagnostics::Id: {
-        using namespace Clusters::SoftwareDiagnostics;
+    case Clusters::OccupancySensing::Id: {
+        using namespace Clusters::OccupancySensing;
         switch (aPath.mAttributeId) {
-        case Attributes::ThreadMetrics::Id: {
-            using TypeInfo = Attributes::ThreadMetrics::TypeInfo;
-            TypeInfo::DecodableType cppValue;
+        case Attributes::Occupancy::Id: {
+            using TypeInfo = Attributes::Occupancy::TypeInfo;
+            TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    CHIPSoftwareDiagnosticsClusterThreadMetrics * newElement_0;
-                    newElement_0 = [CHIPSoftwareDiagnosticsClusterThreadMetrics new];
-                    newElement_0.id = [NSNumber numberWithUnsignedLongLong:entry_0.id];
-                    if (entry_0.name.HasValue()) {
-                        newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.Value().data()
-                                                                     length:entry_0.name.Value().size()
-                                                                   encoding:NSUTF8StringEncoding];
-                    } else {
-                        newElement_0.name = nil;
-                    }
-                    if (entry_0.stackFreeCurrent.HasValue()) {
-                        newElement_0.stackFreeCurrent = [NSNumber numberWithUnsignedInt:entry_0.stackFreeCurrent.Value()];
-                    } else {
-                        newElement_0.stackFreeCurrent = nil;
-                    }
-                    if (entry_0.stackFreeMinimum.HasValue()) {
-                        newElement_0.stackFreeMinimum = [NSNumber numberWithUnsignedInt:entry_0.stackFreeMinimum.Value()];
-                    } else {
-                        newElement_0.stackFreeMinimum = nil;
-                    }
-                    if (entry_0.stackSize.HasValue()) {
-                        newElement_0.stackSize = [NSNumber numberWithUnsignedInt:entry_0.stackSize.Value()];
-                    } else {
-                        newElement_0.stackSize = nil;
-                    }
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::CurrentHeapFree::Id: {
-            using TypeInfo = Attributes::CurrentHeapFree::TypeInfo;
+        case Attributes::OccupancySensorType::Id: {
+            using TypeInfo = Attributes::OccupancySensorType::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedLongLong:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::CurrentHeapUsed::Id: {
-            using TypeInfo = Attributes::CurrentHeapUsed::TypeInfo;
+        case Attributes::OccupancySensorTypeBitmap::Id: {
+            using TypeInfo = Attributes::OccupancySensorTypeBitmap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedLongLong:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::CurrentHeapHighWatermark::Id: {
-            using TypeInfo = Attributes::CurrentHeapHighWatermark::TypeInfo;
+        case Attributes::PirOccupiedToUnoccupiedDelay::Id: {
+            using TypeInfo = Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedLongLong:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::PirUnoccupiedToOccupiedDelay::Id: {
+            using TypeInfo = Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::PirUnoccupiedToOccupiedThreshold::Id: {
+            using TypeInfo = Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::UltrasonicOccupiedToUnoccupiedDelay::Id: {
+            using TypeInfo = Attributes::UltrasonicOccupiedToUnoccupiedDelay::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::UltrasonicUnoccupiedToOccupiedDelay::Id: {
+            using TypeInfo = Attributes::UltrasonicUnoccupiedToOccupiedDelay::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::UltrasonicUnoccupiedToOccupiedThreshold::Id: {
+            using TypeInfo = Attributes::UltrasonicUnoccupiedToOccupiedThreshold::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::Switch::Id: {
-        using namespace Clusters::Switch;
-        switch (aPath.mAttributeId) {
-        case Attributes::NumberOfPositions::Id: {
-            using TypeInfo = Attributes::NumberOfPositions::TypeInfo;
+        case Attributes::PhysicalContactOccupiedToUnoccupiedDelay::Id: {
+            using TypeInfo = Attributes::PhysicalContactOccupiedToUnoccupiedDelay::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::CurrentPosition::Id: {
-            using TypeInfo = Attributes::CurrentPosition::TypeInfo;
+        case Attributes::PhysicalContactUnoccupiedToOccupiedDelay::Id: {
+            using TypeInfo = Attributes::PhysicalContactUnoccupiedToOccupiedDelay::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::MultiPressMax::Id: {
-            using TypeInfo = Attributes::MultiPressMax::TypeInfo;
+        case Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::Id: {
+            using TypeInfo = Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -12416,48 +12337,18 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::TargetNavigator::Id: {
-        using namespace Clusters::TargetNavigator;
+    case Clusters::WakeOnLan::Id: {
+        using namespace Clusters::WakeOnLan;
         switch (aPath.mAttributeId) {
-        case Attributes::TargetList::Id: {
-            using TypeInfo = Attributes::TargetList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    CHIPTargetNavigatorClusterTargetInfo * newElement_0;
-                    newElement_0 = [CHIPTargetNavigatorClusterTargetInfo new];
-                    newElement_0.identifier = [NSNumber numberWithUnsignedChar:entry_0.identifier];
-                    newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data()
-                                                                 length:entry_0.name.size()
-                                                               encoding:NSUTF8StringEncoding];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
-            return value;
-        }
-        case Attributes::CurrentTarget::Id: {
-            using TypeInfo = Attributes::CurrentTarget::TypeInfo;
+        case Attributes::MACAddress::Id: {
+            using TypeInfo = Attributes::MACAddress::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -12566,63 +12457,127 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::TemperatureMeasurement::Id: {
-        using namespace Clusters::TemperatureMeasurement;
+    case Clusters::Channel::Id: {
+        using namespace Clusters::Channel;
         switch (aPath.mAttributeId) {
-        case Attributes::MeasuredValue::Id: {
-            using TypeInfo = Attributes::MeasuredValue::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithShort:cppValue.Value()];
-            }
-            return value;
-        }
-        case Attributes::MinMeasuredValue::Id: {
-            using TypeInfo = Attributes::MinMeasuredValue::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithShort:cppValue.Value()];
-            }
-            return value;
-        }
-        case Attributes::MaxMeasuredValue::Id: {
-            using TypeInfo = Attributes::MaxMeasuredValue::TypeInfo;
+        case Attributes::ChannelList::Id: {
+            using TypeInfo = Attributes::ChannelList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithShort:cppValue.Value()];
-            }
-            return value;
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    CHIPChannelClusterChannelInfo * newElement_0;
+                    newElement_0 = [CHIPChannelClusterChannelInfo new];
+                    newElement_0.majorNumber = [NSNumber numberWithUnsignedShort:entry_0.majorNumber];
+                    newElement_0.minorNumber = [NSNumber numberWithUnsignedShort:entry_0.minorNumber];
+                    if (entry_0.name.HasValue()) {
+                        newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.Value().data()
+                                                                     length:entry_0.name.Value().size()
+                                                                   encoding:NSUTF8StringEncoding];
+                    } else {
+                        newElement_0.name = nil;
+                    }
+                    if (entry_0.callSign.HasValue()) {
+                        newElement_0.callSign = [[NSString alloc] initWithBytes:entry_0.callSign.Value().data()
+                                                                         length:entry_0.callSign.Value().size()
+                                                                       encoding:NSUTF8StringEncoding];
+                    } else {
+                        newElement_0.callSign = nil;
+                    }
+                    if (entry_0.affiliateCallSign.HasValue()) {
+                        newElement_0.affiliateCallSign = [[NSString alloc] initWithBytes:entry_0.affiliateCallSign.Value().data()
+                                                                                  length:entry_0.affiliateCallSign.Value().size()
+                                                                                encoding:NSUTF8StringEncoding];
+                    } else {
+                        newElement_0.affiliateCallSign = nil;
+                    }
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
+            return value;
         }
-        case Attributes::Tolerance::Id: {
-            using TypeInfo = Attributes::Tolerance::TypeInfo;
+        case Attributes::Lineup::Id: {
+            using TypeInfo = Attributes::Lineup::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            CHIPChannelClusterLineupInfo * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [CHIPChannelClusterLineupInfo new];
+                value.operatorName = [[NSString alloc] initWithBytes:cppValue.Value().operatorName.data()
+                                                              length:cppValue.Value().operatorName.size()
+                                                            encoding:NSUTF8StringEncoding];
+                if (cppValue.Value().lineupName.HasValue()) {
+                    value.lineupName = [[NSString alloc] initWithBytes:cppValue.Value().lineupName.Value().data()
+                                                                length:cppValue.Value().lineupName.Value().size()
+                                                              encoding:NSUTF8StringEncoding];
+                } else {
+                    value.lineupName = nil;
+                }
+                if (cppValue.Value().postalCode.HasValue()) {
+                    value.postalCode = [[NSString alloc] initWithBytes:cppValue.Value().postalCode.Value().data()
+                                                                length:cppValue.Value().postalCode.Value().size()
+                                                              encoding:NSUTF8StringEncoding];
+                } else {
+                    value.postalCode = nil;
+                }
+                value.lineupInfoType = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value().lineupInfoType)];
+            }
+            return value;
+        }
+        case Attributes::CurrentChannel::Id: {
+            using TypeInfo = Attributes::CurrentChannel::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            CHIPChannelClusterChannelInfo * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [CHIPChannelClusterChannelInfo new];
+                value.majorNumber = [NSNumber numberWithUnsignedShort:cppValue.Value().majorNumber];
+                value.minorNumber = [NSNumber numberWithUnsignedShort:cppValue.Value().minorNumber];
+                if (cppValue.Value().name.HasValue()) {
+                    value.name = [[NSString alloc] initWithBytes:cppValue.Value().name.Value().data()
+                                                          length:cppValue.Value().name.Value().size()
+                                                        encoding:NSUTF8StringEncoding];
+                } else {
+                    value.name = nil;
+                }
+                if (cppValue.Value().callSign.HasValue()) {
+                    value.callSign = [[NSString alloc] initWithBytes:cppValue.Value().callSign.Value().data()
+                                                              length:cppValue.Value().callSign.Value().size()
+                                                            encoding:NSUTF8StringEncoding];
+                } else {
+                    value.callSign = nil;
+                }
+                if (cppValue.Value().affiliateCallSign.HasValue()) {
+                    value.affiliateCallSign = [[NSString alloc] initWithBytes:cppValue.Value().affiliateCallSign.Value().data()
+                                                                       length:cppValue.Value().affiliateCallSign.Value().size()
+                                                                     encoding:NSUTF8StringEncoding];
+                } else {
+                    value.affiliateCallSign = nil;
+                }
+            }
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
@@ -12731,77 +12686,141 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
         }
         break;
     }
-    case Clusters::TestCluster::Id: {
-        using namespace Clusters::TestCluster;
+    case Clusters::TargetNavigator::Id: {
+        using namespace Clusters::TargetNavigator;
         switch (aPath.mAttributeId) {
-        case Attributes::Boolean::Id: {
-            using TypeInfo = Attributes::Boolean::TypeInfo;
+        case Attributes::TargetList::Id: {
+            using TypeInfo = Attributes::TargetList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    CHIPTargetNavigatorClusterTargetInfo * newElement_0;
+                    newElement_0 = [CHIPTargetNavigatorClusterTargetInfo new];
+                    newElement_0.identifier = [NSNumber numberWithUnsignedChar:entry_0.identifier];
+                    newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data()
+                                                                 length:entry_0.name.size()
+                                                               encoding:NSUTF8StringEncoding];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::Bitmap8::Id: {
-            using TypeInfo = Attributes::Bitmap8::TypeInfo;
+        case Attributes::CurrentTarget::Id: {
+            using TypeInfo = Attributes::CurrentTarget::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue.Raw()];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::Bitmap16::Id: {
-            using TypeInfo = Attributes::Bitmap16::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue.Raw()];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::Bitmap32::Id: {
-            using TypeInfo = Attributes::Bitmap32::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue.Raw()];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::Bitmap64::Id: {
-            using TypeInfo = Attributes::Bitmap64::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedLongLong:cppValue.Raw()];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::Int8u::Id: {
-            using TypeInfo = Attributes::Int8u::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::Int16u::Id: {
-            using TypeInfo = Attributes::Int16u::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -12811,173 +12830,209 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::Int24u::Id: {
-            using TypeInfo = Attributes::Int24u::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::MediaPlayback::Id: {
+        using namespace Clusters::MediaPlayback;
+        switch (aPath.mAttributeId) {
+        case Attributes::CurrentState::Id: {
+            using TypeInfo = Attributes::CurrentState::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
             return value;
         }
-        case Attributes::Int32u::Id: {
-            using TypeInfo = Attributes::Int32u::TypeInfo;
+        case Attributes::StartTime::Id: {
+            using TypeInfo = Attributes::StartTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::Int40u::Id: {
-            using TypeInfo = Attributes::Int40u::TypeInfo;
+        case Attributes::Duration::Id: {
+            using TypeInfo = Attributes::Duration::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedLongLong:cppValue];
-            return value;
-        }
-        case Attributes::Int48u::Id: {
-            using TypeInfo = Attributes::Int48u::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedLongLong:cppValue];
             return value;
         }
-        case Attributes::Int56u::Id: {
-            using TypeInfo = Attributes::Int56u::TypeInfo;
+        case Attributes::SampledPosition::Id: {
+            using TypeInfo = Attributes::SampledPosition::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedLongLong:cppValue];
-            return value;
-        }
-        case Attributes::Int64u::Id: {
-            using TypeInfo = Attributes::Int64u::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [CHIPMediaPlaybackClusterPlaybackPosition new];
+                value.updatedAt = [NSNumber numberWithUnsignedLongLong:cppValue.Value().updatedAt];
+                if (cppValue.Value().position.IsNull()) {
+                    value.position = nil;
+                } else {
+                    value.position = [NSNumber numberWithUnsignedLongLong:cppValue.Value().position.Value()];
+                }
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedLongLong:cppValue];
             return value;
         }
-        case Attributes::Int8s::Id: {
-            using TypeInfo = Attributes::Int8s::TypeInfo;
+        case Attributes::PlaybackSpeed::Id: {
+            using TypeInfo = Attributes::PlaybackSpeed::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithChar:cppValue];
+            value = [NSNumber numberWithFloat:cppValue];
             return value;
         }
-        case Attributes::Int16s::Id: {
-            using TypeInfo = Attributes::Int16s::TypeInfo;
+        case Attributes::SeekRangeEnd::Id: {
+            using TypeInfo = Attributes::SeekRangeEnd::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
-            return value;
-        }
-        case Attributes::Int24s::Id: {
-            using TypeInfo = Attributes::Int24s::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithInt:cppValue];
             return value;
         }
-        case Attributes::Int32s::Id: {
-            using TypeInfo = Attributes::Int32s::TypeInfo;
+        case Attributes::SeekRangeStart::Id: {
+            using TypeInfo = Attributes::SeekRangeStart::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithInt:cppValue];
-            return value;
-        }
-        case Attributes::Int40s::Id: {
-            using TypeInfo = Attributes::Int40s::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithLongLong:cppValue];
             return value;
         }
-        case Attributes::Int48s::Id: {
-            using TypeInfo = Attributes::Int48s::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithLongLong:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::Int56s::Id: {
-            using TypeInfo = Attributes::Int56s::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithLongLong:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::Int64s::Id: {
-            using TypeInfo = Attributes::Int64s::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithLongLong:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::Enum8::Id: {
-            using TypeInfo = Attributes::Enum8::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::Enum16::Id: {
-            using TypeInfo = Attributes::Enum16::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -12987,41 +13042,62 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::FloatSingle::Id: {
-            using TypeInfo = Attributes::FloatSingle::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithFloat:cppValue];
-            return value;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
         }
-        case Attributes::FloatDouble::Id: {
-            using TypeInfo = Attributes::FloatDouble::TypeInfo;
+        break;
+    }
+    case Clusters::MediaInput::Id: {
+        using namespace Clusters::MediaInput;
+        switch (aPath.mAttributeId) {
+        case Attributes::InputList::Id: {
+            using TypeInfo = Attributes::InputList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithDouble:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    CHIPMediaInputClusterInputInfo * newElement_0;
+                    newElement_0 = [CHIPMediaInputClusterInputInfo new];
+                    newElement_0.index = [NSNumber numberWithUnsignedChar:entry_0.index];
+                    newElement_0.inputType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.inputType)];
+                    newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data()
+                                                                 length:entry_0.name.size()
+                                                               encoding:NSUTF8StringEncoding];
+                    newElement_0.descriptionString = [[NSString alloc] initWithBytes:entry_0.description.data()
+                                                                              length:entry_0.description.size()
+                                                                            encoding:NSUTF8StringEncoding];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::OctetString::Id: {
-            using TypeInfo = Attributes::OctetString::TypeInfo;
+        case Attributes::CurrentInput::Id: {
+            using TypeInfo = Attributes::CurrentInput::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSData * _Nonnull value;
-            value = [NSData dataWithBytes:cppValue.data() length:cppValue.size()];
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::ListInt8u::Id: {
-            using TypeInfo = Attributes::ListInt8u::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -13034,7 +13110,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
                 while (iter_0.Next()) {
                     auto & entry_0 = iter_0.GetValue();
                     NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
                     [array_0 addObject:newElement_0];
                 }
                 CHIP_ERROR err = iter_0.GetStatus();
@@ -13046,8 +13122,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::ListOctetString::Id: {
-            using TypeInfo = Attributes::ListOctetString::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -13059,8 +13135,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
                 auto iter_0 = cppValue.begin();
                 while (iter_0.Next()) {
                     auto & entry_0 = iter_0.GetValue();
-                    NSData * newElement_0;
-                    newElement_0 = [NSData dataWithBytes:entry_0.data() length:entry_0.size()];
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
                     [array_0 addObject:newElement_0];
                 }
                 CHIP_ERROR err = iter_0.GetStatus();
@@ -13072,8 +13148,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::ListStructOctetString::Id: {
-            using TypeInfo = Attributes::ListStructOctetString::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -13085,10 +13161,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
                 auto iter_0 = cppValue.begin();
                 while (iter_0.Next()) {
                     auto & entry_0 = iter_0.GetValue();
-                    CHIPTestClusterClusterTestListStructOctet * newElement_0;
-                    newElement_0 = [CHIPTestClusterClusterTestListStructOctet new];
-                    newElement_0.member1 = [NSNumber numberWithUnsignedLongLong:entry_0.member1];
-                    newElement_0.member2 = [NSData dataWithBytes:entry_0.member2.data() length:entry_0.member2.size()];
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
                     [array_0 addObject:newElement_0];
                 }
                 CHIP_ERROR err = iter_0.GetStatus();
@@ -13100,52 +13174,226 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::LongOctetString::Id: {
-            using TypeInfo = Attributes::LongOctetString::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSData * _Nonnull value;
-            value = [NSData dataWithBytes:cppValue.data() length:cppValue.size()];
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::CharString::Id: {
-            using TypeInfo = Attributes::CharString::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::LongCharString::Id: {
-            using TypeInfo = Attributes::LongCharString::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::LowPower::Id: {
+        using namespace Clusters::LowPower;
+        switch (aPath.mAttributeId) {
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::EpochUs::Id: {
-            using TypeInfo = Attributes::EpochUs::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
+            return value;
+        }
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
+            return value;
+        }
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedLongLong:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::EpochS::Id: {
-            using TypeInfo = Attributes::EpochS::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
+            return value;
+        }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::KeypadInput::Id: {
+        using namespace Clusters::KeypadInput;
+        switch (aPath.mAttributeId) {
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
+            return value;
+        }
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
+            return value;
+        }
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
+            return value;
+        }
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -13155,19 +13403,28 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::VendorId::Id: {
-            using TypeInfo = Attributes::VendorId::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:chip::to_underlying(cppValue)];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ListNullablesAndOptionalsStruct::Id: {
-            using TypeInfo = Attributes::ListNullablesAndOptionalsStruct::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::ContentLauncher::Id: {
+        using namespace Clusters::ContentLauncher;
+        switch (aPath.mAttributeId) {
+        case Attributes::AcceptHeader::Id: {
+            using TypeInfo = Attributes::AcceptHeader::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -13179,180 +13436,99 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
                 auto iter_0 = cppValue.begin();
                 while (iter_0.Next()) {
                     auto & entry_0 = iter_0.GetValue();
-                    CHIPTestClusterClusterNullablesAndOptionalsStruct * newElement_0;
-                    newElement_0 = [CHIPTestClusterClusterNullablesAndOptionalsStruct new];
-                    if (entry_0.nullableInt.IsNull()) {
-                        newElement_0.nullableInt = nil;
-                    } else {
-                        newElement_0.nullableInt = [NSNumber numberWithUnsignedShort:entry_0.nullableInt.Value()];
-                    }
-                    if (entry_0.optionalInt.HasValue()) {
-                        newElement_0.optionalInt = [NSNumber numberWithUnsignedShort:entry_0.optionalInt.Value()];
-                    } else {
-                        newElement_0.optionalInt = nil;
-                    }
-                    if (entry_0.nullableOptionalInt.HasValue()) {
-                        if (entry_0.nullableOptionalInt.Value().IsNull()) {
-                            newElement_0.nullableOptionalInt = nil;
-                        } else {
-                            newElement_0.nullableOptionalInt =
-                                [NSNumber numberWithUnsignedShort:entry_0.nullableOptionalInt.Value().Value()];
-                        }
-                    } else {
-                        newElement_0.nullableOptionalInt = nil;
-                    }
-                    if (entry_0.nullableString.IsNull()) {
-                        newElement_0.nullableString = nil;
-                    } else {
-                        newElement_0.nullableString = [[NSString alloc] initWithBytes:entry_0.nullableString.Value().data()
-                                                                               length:entry_0.nullableString.Value().size()
-                                                                             encoding:NSUTF8StringEncoding];
-                    }
-                    if (entry_0.optionalString.HasValue()) {
-                        newElement_0.optionalString = [[NSString alloc] initWithBytes:entry_0.optionalString.Value().data()
-                                                                               length:entry_0.optionalString.Value().size()
-                                                                             encoding:NSUTF8StringEncoding];
-                    } else {
-                        newElement_0.optionalString = nil;
-                    }
-                    if (entry_0.nullableOptionalString.HasValue()) {
-                        if (entry_0.nullableOptionalString.Value().IsNull()) {
-                            newElement_0.nullableOptionalString = nil;
-                        } else {
-                            newElement_0.nullableOptionalString =
-                                [[NSString alloc] initWithBytes:entry_0.nullableOptionalString.Value().Value().data()
-                                                         length:entry_0.nullableOptionalString.Value().Value().size()
-                                                       encoding:NSUTF8StringEncoding];
-                        }
-                    } else {
-                        newElement_0.nullableOptionalString = nil;
-                    }
-                    if (entry_0.nullableStruct.IsNull()) {
-                        newElement_0.nullableStruct = nil;
-                    } else {
-                        newElement_0.nullableStruct = [CHIPTestClusterClusterSimpleStruct new];
-                        newElement_0.nullableStruct.a = [NSNumber numberWithUnsignedChar:entry_0.nullableStruct.Value().a];
-                        newElement_0.nullableStruct.b = [NSNumber numberWithBool:entry_0.nullableStruct.Value().b];
-                        newElement_0.nullableStruct.c =
-                            [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.nullableStruct.Value().c)];
-                        newElement_0.nullableStruct.d = [NSData dataWithBytes:entry_0.nullableStruct.Value().d.data()
-                                                                       length:entry_0.nullableStruct.Value().d.size()];
-                        newElement_0.nullableStruct.e = [[NSString alloc] initWithBytes:entry_0.nullableStruct.Value().e.data()
-                                                                                 length:entry_0.nullableStruct.Value().e.size()
-                                                                               encoding:NSUTF8StringEncoding];
-                        newElement_0.nullableStruct.f = [NSNumber numberWithUnsignedChar:entry_0.nullableStruct.Value().f.Raw()];
-                        newElement_0.nullableStruct.g = [NSNumber numberWithFloat:entry_0.nullableStruct.Value().g];
-                        newElement_0.nullableStruct.h = [NSNumber numberWithDouble:entry_0.nullableStruct.Value().h];
-                    }
-                    if (entry_0.optionalStruct.HasValue()) {
-                        newElement_0.optionalStruct = [CHIPTestClusterClusterSimpleStruct new];
-                        newElement_0.optionalStruct.a = [NSNumber numberWithUnsignedChar:entry_0.optionalStruct.Value().a];
-                        newElement_0.optionalStruct.b = [NSNumber numberWithBool:entry_0.optionalStruct.Value().b];
-                        newElement_0.optionalStruct.c =
-                            [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.optionalStruct.Value().c)];
-                        newElement_0.optionalStruct.d = [NSData dataWithBytes:entry_0.optionalStruct.Value().d.data()
-                                                                       length:entry_0.optionalStruct.Value().d.size()];
-                        newElement_0.optionalStruct.e = [[NSString alloc] initWithBytes:entry_0.optionalStruct.Value().e.data()
-                                                                                 length:entry_0.optionalStruct.Value().e.size()
-                                                                               encoding:NSUTF8StringEncoding];
-                        newElement_0.optionalStruct.f = [NSNumber numberWithUnsignedChar:entry_0.optionalStruct.Value().f.Raw()];
-                        newElement_0.optionalStruct.g = [NSNumber numberWithFloat:entry_0.optionalStruct.Value().g];
-                        newElement_0.optionalStruct.h = [NSNumber numberWithDouble:entry_0.optionalStruct.Value().h];
-                    } else {
-                        newElement_0.optionalStruct = nil;
-                    }
-                    if (entry_0.nullableOptionalStruct.HasValue()) {
-                        if (entry_0.nullableOptionalStruct.Value().IsNull()) {
-                            newElement_0.nullableOptionalStruct = nil;
-                        } else {
-                            newElement_0.nullableOptionalStruct = [CHIPTestClusterClusterSimpleStruct new];
-                            newElement_0.nullableOptionalStruct.a =
-                                [NSNumber numberWithUnsignedChar:entry_0.nullableOptionalStruct.Value().Value().a];
-                            newElement_0.nullableOptionalStruct.b =
-                                [NSNumber numberWithBool:entry_0.nullableOptionalStruct.Value().Value().b];
-                            newElement_0.nullableOptionalStruct.c = [NSNumber
-                                numberWithUnsignedChar:chip::to_underlying(entry_0.nullableOptionalStruct.Value().Value().c)];
-                            newElement_0.nullableOptionalStruct.d =
-                                [NSData dataWithBytes:entry_0.nullableOptionalStruct.Value().Value().d.data()
-                                               length:entry_0.nullableOptionalStruct.Value().Value().d.size()];
-                            newElement_0.nullableOptionalStruct.e =
-                                [[NSString alloc] initWithBytes:entry_0.nullableOptionalStruct.Value().Value().e.data()
-                                                         length:entry_0.nullableOptionalStruct.Value().Value().e.size()
-                                                       encoding:NSUTF8StringEncoding];
-                            newElement_0.nullableOptionalStruct.f =
-                                [NSNumber numberWithUnsignedChar:entry_0.nullableOptionalStruct.Value().Value().f.Raw()];
-                            newElement_0.nullableOptionalStruct.g =
-                                [NSNumber numberWithFloat:entry_0.nullableOptionalStruct.Value().Value().g];
-                            newElement_0.nullableOptionalStruct.h =
-                                [NSNumber numberWithDouble:entry_0.nullableOptionalStruct.Value().Value().h];
-                        }
-                    } else {
-                        newElement_0.nullableOptionalStruct = nil;
-                    }
-                    if (entry_0.nullableList.IsNull()) {
-                        newElement_0.nullableList = nil;
-                    } else {
-                        { // Scope for our temporary variables
-                            auto * array_3 = [NSMutableArray new];
-                            auto iter_3 = entry_0.nullableList.Value().begin();
-                            while (iter_3.Next()) {
-                                auto & entry_3 = iter_3.GetValue();
-                                NSNumber * newElement_3;
-                                newElement_3 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_3)];
-                                [array_3 addObject:newElement_3];
-                            }
-                            CHIP_ERROR err = iter_3.GetStatus();
-                            if (err != CHIP_NO_ERROR) {
-                                *aError = err;
-                                return nil;
-                            }
-                            newElement_0.nullableList = array_3;
-                        }
-                    }
-                    if (entry_0.optionalList.HasValue()) {
-                        { // Scope for our temporary variables
-                            auto * array_3 = [NSMutableArray new];
-                            auto iter_3 = entry_0.optionalList.Value().begin();
-                            while (iter_3.Next()) {
-                                auto & entry_3 = iter_3.GetValue();
-                                NSNumber * newElement_3;
-                                newElement_3 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_3)];
-                                [array_3 addObject:newElement_3];
-                            }
-                            CHIP_ERROR err = iter_3.GetStatus();
-                            if (err != CHIP_NO_ERROR) {
-                                *aError = err;
-                                return nil;
-                            }
-                            newElement_0.optionalList = array_3;
-                        }
-                    } else {
-                        newElement_0.optionalList = nil;
-                    }
-                    if (entry_0.nullableOptionalList.HasValue()) {
-                        if (entry_0.nullableOptionalList.Value().IsNull()) {
-                            newElement_0.nullableOptionalList = nil;
-                        } else {
-                            { // Scope for our temporary variables
-                                auto * array_4 = [NSMutableArray new];
-                                auto iter_4 = entry_0.nullableOptionalList.Value().Value().begin();
-                                while (iter_4.Next()) {
-                                    auto & entry_4 = iter_4.GetValue();
-                                    NSNumber * newElement_4;
-                                    newElement_4 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_4)];
-                                    [array_4 addObject:newElement_4];
-                                }
-                                CHIP_ERROR err = iter_4.GetStatus();
-                                if (err != CHIP_NO_ERROR) {
-                                    *aError = err;
-                                    return nil;
-                                }
-                                newElement_0.nullableOptionalList = array_4;
-                            }
-                        }
-                    } else {
-                        newElement_0.nullableOptionalList = nil;
-                    }
+                    NSString * newElement_0;
+                    newElement_0 = [[NSString alloc] initWithBytes:entry_0.data()
+                                                            length:entry_0.size()
+                                                          encoding:NSUTF8StringEncoding];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
+            return value;
+        }
+        case Attributes::SupportedStreamingProtocols::Id: {
+            using TypeInfo = Attributes::SupportedStreamingProtocols::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedInt:cppValue];
+            return value;
+        }
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
+            return value;
+        }
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
+            return value;
+        }
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
                     [array_0 addObject:newElement_0];
                 }
                 CHIP_ERROR err = iter_0.GetStatus();
@@ -13364,38 +13540,70 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::EnumAttr::Id: {
-            using TypeInfo = Attributes::EnumAttr::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::StructAttr::Id: {
-            using TypeInfo = Attributes::StructAttr::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            CHIPTestClusterClusterSimpleStruct * _Nonnull value;
-            value = [CHIPTestClusterClusterSimpleStruct new];
-            value.a = [NSNumber numberWithUnsignedChar:cppValue.a];
-            value.b = [NSNumber numberWithBool:cppValue.b];
-            value.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.c)];
-            value.d = [NSData dataWithBytes:cppValue.d.data() length:cppValue.d.size()];
-            value.e = [[NSString alloc] initWithBytes:cppValue.e.data() length:cppValue.e.size() encoding:NSUTF8StringEncoding];
-            value.f = [NSNumber numberWithUnsignedChar:cppValue.f.Raw()];
-            value.g = [NSNumber numberWithFloat:cppValue.g];
-            value.h = [NSNumber numberWithDouble:cppValue.h];
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::RangeRestrictedInt8u::Id: {
-            using TypeInfo = Attributes::RangeRestrictedInt8u::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::AudioOutput::Id: {
+        using namespace Clusters::AudioOutput;
+        switch (aPath.mAttributeId) {
+        case Attributes::OutputList::Id: {
+            using TypeInfo = Attributes::OutputList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    CHIPAudioOutputClusterOutputInfo * newElement_0;
+                    newElement_0 = [CHIPAudioOutputClusterOutputInfo new];
+                    newElement_0.index = [NSNumber numberWithUnsignedChar:entry_0.index];
+                    newElement_0.outputType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.outputType)];
+                    newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data()
+                                                                 length:entry_0.name.size()
+                                                               encoding:NSUTF8StringEncoding];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
+            return value;
+        }
+        case Attributes::CurrentOutput::Id: {
+            using TypeInfo = Attributes::CurrentOutput::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -13405,19 +13613,97 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::RangeRestrictedInt8s::Id: {
-            using TypeInfo = Attributes::RangeRestrictedInt8s::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
+            return value;
+        }
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
+            return value;
+        }
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
+            return value;
+        }
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithChar:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::RangeRestrictedInt16u::Id: {
-            using TypeInfo = Attributes::RangeRestrictedInt16u::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -13427,19 +13713,94 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::RangeRestrictedInt16s::Id: {
-            using TypeInfo = Attributes::RangeRestrictedInt16s::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::ApplicationLauncher::Id: {
+        using namespace Clusters::ApplicationLauncher;
+        switch (aPath.mAttributeId) {
+        case Attributes::CatalogList::Id: {
+            using TypeInfo = Attributes::CatalogList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedShort:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::ListLongOctetString::Id: {
-            using TypeInfo = Attributes::ListLongOctetString::TypeInfo;
+        case Attributes::CurrentApp::Id: {
+            using TypeInfo = Attributes::CurrentApp::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            CHIPApplicationLauncherClusterApplicationEP * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [CHIPApplicationLauncherClusterApplicationEP new];
+                value.application = [CHIPApplicationLauncherClusterApplication new];
+                value.application.catalogVendorId = [NSNumber numberWithUnsignedShort:cppValue.Value().application.catalogVendorId];
+                value.application.applicationId = [[NSString alloc] initWithBytes:cppValue.Value().application.applicationId.data()
+                                                                           length:cppValue.Value().application.applicationId.size()
+                                                                         encoding:NSUTF8StringEncoding];
+                if (cppValue.Value().endpoint.HasValue()) {
+                    value.endpoint = [NSNumber numberWithUnsignedShort:cppValue.Value().endpoint.Value()];
+                } else {
+                    value.endpoint = nil;
+                }
+            }
+            return value;
+        }
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
+            return value;
+        }
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -13451,8 +13812,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
                 auto iter_0 = cppValue.begin();
                 while (iter_0.Next()) {
                     auto & entry_0 = iter_0.GetValue();
-                    NSData * newElement_0;
-                    newElement_0 = [NSData dataWithBytes:entry_0.data() length:entry_0.size()];
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
                     [array_0 addObject:newElement_0];
                 }
                 CHIP_ERROR err = iter_0.GetStatus();
@@ -13464,8 +13825,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::ListFabricScoped::Id: {
-            using TypeInfo = Attributes::ListFabricScoped::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -13477,65 +13838,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
                 auto iter_0 = cppValue.begin();
                 while (iter_0.Next()) {
                     auto & entry_0 = iter_0.GetValue();
-                    CHIPTestClusterClusterTestFabricScoped * newElement_0;
-                    newElement_0 = [CHIPTestClusterClusterTestFabricScoped new];
-                    newElement_0.fabricSensitiveInt8u = [NSNumber numberWithUnsignedChar:entry_0.fabricSensitiveInt8u];
-                    if (entry_0.optionalFabricSensitiveInt8u.HasValue()) {
-                        newElement_0.optionalFabricSensitiveInt8u =
-                            [NSNumber numberWithUnsignedChar:entry_0.optionalFabricSensitiveInt8u.Value()];
-                    } else {
-                        newElement_0.optionalFabricSensitiveInt8u = nil;
-                    }
-                    if (entry_0.nullableFabricSensitiveInt8u.IsNull()) {
-                        newElement_0.nullableFabricSensitiveInt8u = nil;
-                    } else {
-                        newElement_0.nullableFabricSensitiveInt8u =
-                            [NSNumber numberWithUnsignedChar:entry_0.nullableFabricSensitiveInt8u.Value()];
-                    }
-                    if (entry_0.nullableOptionalFabricSensitiveInt8u.HasValue()) {
-                        if (entry_0.nullableOptionalFabricSensitiveInt8u.Value().IsNull()) {
-                            newElement_0.nullableOptionalFabricSensitiveInt8u = nil;
-                        } else {
-                            newElement_0.nullableOptionalFabricSensitiveInt8u =
-                                [NSNumber numberWithUnsignedChar:entry_0.nullableOptionalFabricSensitiveInt8u.Value().Value()];
-                        }
-                    } else {
-                        newElement_0.nullableOptionalFabricSensitiveInt8u = nil;
-                    }
-                    newElement_0.fabricSensitiveCharString =
-                        [[NSString alloc] initWithBytes:entry_0.fabricSensitiveCharString.data()
-                                                 length:entry_0.fabricSensitiveCharString.size()
-                                               encoding:NSUTF8StringEncoding];
-                    newElement_0.fabricSensitiveStruct = [CHIPTestClusterClusterSimpleStruct new];
-                    newElement_0.fabricSensitiveStruct.a = [NSNumber numberWithUnsignedChar:entry_0.fabricSensitiveStruct.a];
-                    newElement_0.fabricSensitiveStruct.b = [NSNumber numberWithBool:entry_0.fabricSensitiveStruct.b];
-                    newElement_0.fabricSensitiveStruct.c =
-                        [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.fabricSensitiveStruct.c)];
-                    newElement_0.fabricSensitiveStruct.d = [NSData dataWithBytes:entry_0.fabricSensitiveStruct.d.data()
-                                                                          length:entry_0.fabricSensitiveStruct.d.size()];
-                    newElement_0.fabricSensitiveStruct.e = [[NSString alloc] initWithBytes:entry_0.fabricSensitiveStruct.e.data()
-                                                                                    length:entry_0.fabricSensitiveStruct.e.size()
-                                                                                  encoding:NSUTF8StringEncoding];
-                    newElement_0.fabricSensitiveStruct.f = [NSNumber numberWithUnsignedChar:entry_0.fabricSensitiveStruct.f.Raw()];
-                    newElement_0.fabricSensitiveStruct.g = [NSNumber numberWithFloat:entry_0.fabricSensitiveStruct.g];
-                    newElement_0.fabricSensitiveStruct.h = [NSNumber numberWithDouble:entry_0.fabricSensitiveStruct.h];
-                    { // Scope for our temporary variables
-                        auto * array_2 = [NSMutableArray new];
-                        auto iter_2 = entry_0.fabricSensitiveInt8uList.begin();
-                        while (iter_2.Next()) {
-                            auto & entry_2 = iter_2.GetValue();
-                            NSNumber * newElement_2;
-                            newElement_2 = [NSNumber numberWithUnsignedChar:entry_2];
-                            [array_2 addObject:newElement_2];
-                        }
-                        CHIP_ERROR err = iter_2.GetStatus();
-                        if (err != CHIP_NO_ERROR) {
-                            *aError = err;
-                            return nil;
-                        }
-                        newElement_0.fabricSensitiveInt8uList = array_2;
-                    }
-                    newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
                     [array_0 addObject:newElement_0];
                 }
                 CHIP_ERROR err = iter_0.GetStatus();
@@ -13547,709 +13851,683 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::TimedWriteBoolean::Id: {
-            using TypeInfo = Attributes::TimedWriteBoolean::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::GeneralErrorBoolean::Id: {
-            using TypeInfo = Attributes::GeneralErrorBoolean::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ClusterErrorBoolean::Id: {
-            using TypeInfo = Attributes::ClusterErrorBoolean::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::ApplicationBasic::Id: {
+        using namespace Clusters::ApplicationBasic;
+        switch (aPath.mAttributeId) {
+        case Attributes::VendorName::Id: {
+            using TypeInfo = Attributes::VendorName::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
+            return value;
+        }
+        case Attributes::VendorID::Id: {
+            using TypeInfo = Attributes::VendorID::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::Unsupported::Id: {
-            using TypeInfo = Attributes::Unsupported::TypeInfo;
+        case Attributes::ApplicationName::Id: {
+            using TypeInfo = Attributes::ApplicationName::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
+            return value;
+        }
+        case Attributes::ProductID::Id: {
+            using TypeInfo = Attributes::ProductID::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithBool:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::NullableBoolean::Id: {
-            using TypeInfo = Attributes::NullableBoolean::TypeInfo;
+        case Attributes::Application::Id: {
+            using TypeInfo = Attributes::Application::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithBool:cppValue.Value()];
+            CHIPApplicationBasicClusterApplicationBasicApplication * _Nonnull value;
+            value = [CHIPApplicationBasicClusterApplicationBasicApplication new];
+            value.catalogVendorId = [NSNumber numberWithUnsignedShort:cppValue.catalogVendorId];
+            value.applicationId = [[NSString alloc] initWithBytes:cppValue.applicationId.data()
+                                                           length:cppValue.applicationId.size()
+                                                         encoding:NSUTF8StringEncoding];
+            return value;
+        }
+        case Attributes::Status::Id: {
+            using TypeInfo = Attributes::Status::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
             }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
             return value;
         }
-        case Attributes::NullableBitmap8::Id: {
-            using TypeInfo = Attributes::NullableBitmap8::TypeInfo;
+        case Attributes::ApplicationVersion::Id: {
+            using TypeInfo = Attributes::ApplicationVersion::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value().Raw()];
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
+            return value;
+        }
+        case Attributes::AllowedVendorList::Id: {
+            using TypeInfo = Attributes::AllowedVendorList::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_0)];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
             return value;
         }
-        case Attributes::NullableBitmap16::Id: {
-            using TypeInfo = Attributes::NullableBitmap16::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value().Raw()];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
             return value;
         }
-        case Attributes::NullableBitmap32::Id: {
-            using TypeInfo = Attributes::NullableBitmap32::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedInt:cppValue.Value().Raw()];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
             return value;
         }
-        case Attributes::NullableBitmap64::Id: {
-            using TypeInfo = Attributes::NullableBitmap64::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value().Raw()];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
             return value;
         }
-        case Attributes::NullableInt8u::Id: {
-            using TypeInfo = Attributes::NullableInt8u::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::NullableInt16u::Id: {
-            using TypeInfo = Attributes::NullableInt16u::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::NullableInt24u::Id: {
-            using TypeInfo = Attributes::NullableInt24u::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::AccountLogin::Id: {
+        using namespace Clusters::AccountLogin;
+        switch (aPath.mAttributeId) {
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
             return value;
         }
-        case Attributes::NullableInt32u::Id: {
-            using TypeInfo = Attributes::NullableInt32u::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
             return value;
         }
-        case Attributes::NullableInt40u::Id: {
-            using TypeInfo = Attributes::NullableInt40u::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
             }
             return value;
         }
-        case Attributes::NullableInt48u::Id: {
-            using TypeInfo = Attributes::NullableInt48u::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::NullableInt56u::Id: {
-            using TypeInfo = Attributes::NullableInt56u::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::NullableInt64u::Id: {
-            using TypeInfo = Attributes::NullableInt64u::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::ElectricalMeasurement::Id: {
+        using namespace Clusters::ElectricalMeasurement;
+        switch (aPath.mAttributeId) {
+        case Attributes::MeasurementType::Id: {
+            using TypeInfo = Attributes::MeasurementType::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::NullableInt8s::Id: {
-            using TypeInfo = Attributes::NullableInt8s::TypeInfo;
+        case Attributes::DcVoltage::Id: {
+            using TypeInfo = Attributes::DcVoltage::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithChar:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::NullableInt16s::Id: {
-            using TypeInfo = Attributes::NullableInt16s::TypeInfo;
+        case Attributes::DcVoltageMin::Id: {
+            using TypeInfo = Attributes::DcVoltageMin::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithShort:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::NullableInt24s::Id: {
-            using TypeInfo = Attributes::NullableInt24s::TypeInfo;
+        case Attributes::DcVoltageMax::Id: {
+            using TypeInfo = Attributes::DcVoltageMax::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithInt:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::NullableInt32s::Id: {
-            using TypeInfo = Attributes::NullableInt32s::TypeInfo;
+        case Attributes::DcCurrent::Id: {
+            using TypeInfo = Attributes::DcCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithInt:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::NullableInt40s::Id: {
-            using TypeInfo = Attributes::NullableInt40s::TypeInfo;
+        case Attributes::DcCurrentMin::Id: {
+            using TypeInfo = Attributes::DcCurrentMin::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithLongLong:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::NullableInt48s::Id: {
-            using TypeInfo = Attributes::NullableInt48s::TypeInfo;
+        case Attributes::DcCurrentMax::Id: {
+            using TypeInfo = Attributes::DcCurrentMax::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithLongLong:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::NullableInt56s::Id: {
-            using TypeInfo = Attributes::NullableInt56s::TypeInfo;
+        case Attributes::DcPower::Id: {
+            using TypeInfo = Attributes::DcPower::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithLongLong:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::NullableInt64s::Id: {
-            using TypeInfo = Attributes::NullableInt64s::TypeInfo;
+        case Attributes::DcPowerMin::Id: {
+            using TypeInfo = Attributes::DcPowerMin::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithLongLong:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::NullableEnum8::Id: {
-            using TypeInfo = Attributes::NullableEnum8::TypeInfo;
+        case Attributes::DcPowerMax::Id: {
+            using TypeInfo = Attributes::DcPowerMax::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::NullableEnum16::Id: {
-            using TypeInfo = Attributes::NullableEnum16::TypeInfo;
+        case Attributes::DcVoltageMultiplier::Id: {
+            using TypeInfo = Attributes::DcVoltageMultiplier::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::NullableFloatSingle::Id: {
-            using TypeInfo = Attributes::NullableFloatSingle::TypeInfo;
+        case Attributes::DcVoltageDivisor::Id: {
+            using TypeInfo = Attributes::DcVoltageDivisor::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithFloat:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::NullableFloatDouble::Id: {
-            using TypeInfo = Attributes::NullableFloatDouble::TypeInfo;
+        case Attributes::DcCurrentMultiplier::Id: {
+            using TypeInfo = Attributes::DcCurrentMultiplier::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithDouble:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::NullableOctetString::Id: {
-            using TypeInfo = Attributes::NullableOctetString::TypeInfo;
+        case Attributes::DcCurrentDivisor::Id: {
+            using TypeInfo = Attributes::DcCurrentDivisor::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSData * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSData dataWithBytes:cppValue.Value().data() length:cppValue.Value().size()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::NullableCharString::Id: {
-            using TypeInfo = Attributes::NullableCharString::TypeInfo;
+        case Attributes::DcPowerMultiplier::Id: {
+            using TypeInfo = Attributes::DcPowerMultiplier::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSString * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [[NSString alloc] initWithBytes:cppValue.Value().data()
-                                                 length:cppValue.Value().size()
-                                               encoding:NSUTF8StringEncoding];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::NullableEnumAttr::Id: {
-            using TypeInfo = Attributes::NullableEnumAttr::TypeInfo;
+        case Attributes::DcPowerDivisor::Id: {
+            using TypeInfo = Attributes::DcPowerDivisor::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value())];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::NullableStruct::Id: {
-            using TypeInfo = Attributes::NullableStruct::TypeInfo;
+        case Attributes::AcFrequency::Id: {
+            using TypeInfo = Attributes::AcFrequency::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            CHIPTestClusterClusterSimpleStruct * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [CHIPTestClusterClusterSimpleStruct new];
-                value.a = [NSNumber numberWithUnsignedChar:cppValue.Value().a];
-                value.b = [NSNumber numberWithBool:cppValue.Value().b];
-                value.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value().c)];
-                value.d = [NSData dataWithBytes:cppValue.Value().d.data() length:cppValue.Value().d.size()];
-                value.e = [[NSString alloc] initWithBytes:cppValue.Value().e.data()
-                                                   length:cppValue.Value().e.size()
-                                                 encoding:NSUTF8StringEncoding];
-                value.f = [NSNumber numberWithUnsignedChar:cppValue.Value().f.Raw()];
-                value.g = [NSNumber numberWithFloat:cppValue.Value().g];
-                value.h = [NSNumber numberWithDouble:cppValue.Value().h];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::NullableRangeRestrictedInt8u::Id: {
-            using TypeInfo = Attributes::NullableRangeRestrictedInt8u::TypeInfo;
+        case Attributes::AcFrequencyMin::Id: {
+            using TypeInfo = Attributes::AcFrequencyMin::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::NullableRangeRestrictedInt8s::Id: {
-            using TypeInfo = Attributes::NullableRangeRestrictedInt8s::TypeInfo;
+        case Attributes::AcFrequencyMax::Id: {
+            using TypeInfo = Attributes::AcFrequencyMax::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithChar:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::NullableRangeRestrictedInt16u::Id: {
-            using TypeInfo = Attributes::NullableRangeRestrictedInt16u::TypeInfo;
+        case Attributes::NeutralCurrent::Id: {
+            using TypeInfo = Attributes::NeutralCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::NullableRangeRestrictedInt16s::Id: {
-            using TypeInfo = Attributes::NullableRangeRestrictedInt16s::TypeInfo;
+        case Attributes::TotalActivePower::Id: {
+            using TypeInfo = Attributes::TotalActivePower::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithShort:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithInt:cppValue];
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::TotalReactivePower::Id: {
+            using TypeInfo = Attributes::TotalReactivePower::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithInt:cppValue];
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::TotalApparentPower::Id: {
+            using TypeInfo = Attributes::TotalApparentPower::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::Measured1stHarmonicCurrent::Id: {
+            using TypeInfo = Attributes::Measured1stHarmonicCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::Measured3rdHarmonicCurrent::Id: {
+            using TypeInfo = Attributes::Measured3rdHarmonicCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::Measured5thHarmonicCurrent::Id: {
+            using TypeInfo = Attributes::Measured5thHarmonicCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::Thermostat::Id: {
-        using namespace Clusters::Thermostat;
-        switch (aPath.mAttributeId) {
-        case Attributes::LocalTemperature::Id: {
-            using TypeInfo = Attributes::LocalTemperature::TypeInfo;
+        case Attributes::Measured7thHarmonicCurrent::Id: {
+            using TypeInfo = Attributes::Measured7thHarmonicCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithShort:cppValue.Value()];
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
             }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::OutdoorTemperature::Id: {
-            using TypeInfo = Attributes::OutdoorTemperature::TypeInfo;
+        case Attributes::Measured9thHarmonicCurrent::Id: {
+            using TypeInfo = Attributes::Measured9thHarmonicCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithShort:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::Occupancy::Id: {
-            using TypeInfo = Attributes::Occupancy::TypeInfo;
+        case Attributes::Measured11thHarmonicCurrent::Id: {
+            using TypeInfo = Attributes::Measured11thHarmonicCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::AbsMinHeatSetpointLimit::Id: {
-            using TypeInfo = Attributes::AbsMinHeatSetpointLimit::TypeInfo;
+        case Attributes::MeasuredPhase1stHarmonicCurrent::Id: {
+            using TypeInfo = Attributes::MeasuredPhase1stHarmonicCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -14259,8 +14537,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::AbsMaxHeatSetpointLimit::Id: {
-            using TypeInfo = Attributes::AbsMaxHeatSetpointLimit::TypeInfo;
+        case Attributes::MeasuredPhase3rdHarmonicCurrent::Id: {
+            using TypeInfo = Attributes::MeasuredPhase3rdHarmonicCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -14270,8 +14548,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::AbsMinCoolSetpointLimit::Id: {
-            using TypeInfo = Attributes::AbsMinCoolSetpointLimit::TypeInfo;
+        case Attributes::MeasuredPhase5thHarmonicCurrent::Id: {
+            using TypeInfo = Attributes::MeasuredPhase5thHarmonicCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -14281,8 +14559,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::AbsMaxCoolSetpointLimit::Id: {
-            using TypeInfo = Attributes::AbsMaxCoolSetpointLimit::TypeInfo;
+        case Attributes::MeasuredPhase7thHarmonicCurrent::Id: {
+            using TypeInfo = Attributes::MeasuredPhase7thHarmonicCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -14292,96 +14570,96 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::PICoolingDemand::Id: {
-            using TypeInfo = Attributes::PICoolingDemand::TypeInfo;
+        case Attributes::MeasuredPhase9thHarmonicCurrent::Id: {
+            using TypeInfo = Attributes::MeasuredPhase9thHarmonicCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::PIHeatingDemand::Id: {
-            using TypeInfo = Attributes::PIHeatingDemand::TypeInfo;
+        case Attributes::MeasuredPhase11thHarmonicCurrent::Id: {
+            using TypeInfo = Attributes::MeasuredPhase11thHarmonicCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::HVACSystemTypeConfiguration::Id: {
-            using TypeInfo = Attributes::HVACSystemTypeConfiguration::TypeInfo;
+        case Attributes::AcFrequencyMultiplier::Id: {
+            using TypeInfo = Attributes::AcFrequencyMultiplier::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::LocalTemperatureCalibration::Id: {
-            using TypeInfo = Attributes::LocalTemperatureCalibration::TypeInfo;
+        case Attributes::AcFrequencyDivisor::Id: {
+            using TypeInfo = Attributes::AcFrequencyDivisor::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::OccupiedCoolingSetpoint::Id: {
-            using TypeInfo = Attributes::OccupiedCoolingSetpoint::TypeInfo;
+        case Attributes::PowerMultiplier::Id: {
+            using TypeInfo = Attributes::PowerMultiplier::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::OccupiedHeatingSetpoint::Id: {
-            using TypeInfo = Attributes::OccupiedHeatingSetpoint::TypeInfo;
+        case Attributes::PowerDivisor::Id: {
+            using TypeInfo = Attributes::PowerDivisor::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::UnoccupiedCoolingSetpoint::Id: {
-            using TypeInfo = Attributes::UnoccupiedCoolingSetpoint::TypeInfo;
+        case Attributes::HarmonicCurrentMultiplier::Id: {
+            using TypeInfo = Attributes::HarmonicCurrentMultiplier::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithChar:cppValue];
             return value;
         }
-        case Attributes::UnoccupiedHeatingSetpoint::Id: {
-            using TypeInfo = Attributes::UnoccupiedHeatingSetpoint::TypeInfo;
+        case Attributes::PhaseHarmonicCurrentMultiplier::Id: {
+            using TypeInfo = Attributes::PhaseHarmonicCurrentMultiplier::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithChar:cppValue];
             return value;
         }
-        case Attributes::MinHeatSetpointLimit::Id: {
-            using TypeInfo = Attributes::MinHeatSetpointLimit::TypeInfo;
+        case Attributes::InstantaneousVoltage::Id: {
+            using TypeInfo = Attributes::InstantaneousVoltage::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -14391,19 +14669,19 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::MaxHeatSetpointLimit::Id: {
-            using TypeInfo = Attributes::MaxHeatSetpointLimit::TypeInfo;
+        case Attributes::InstantaneousLineCurrent::Id: {
+            using TypeInfo = Attributes::InstantaneousLineCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithShort:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::MinCoolSetpointLimit::Id: {
-            using TypeInfo = Attributes::MinCoolSetpointLimit::TypeInfo;
+        case Attributes::InstantaneousActiveCurrent::Id: {
+            using TypeInfo = Attributes::InstantaneousActiveCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -14413,8 +14691,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::MaxCoolSetpointLimit::Id: {
-            using TypeInfo = Attributes::MaxCoolSetpointLimit::TypeInfo;
+        case Attributes::InstantaneousReactiveCurrent::Id: {
+            using TypeInfo = Attributes::InstantaneousReactiveCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -14424,133 +14702,129 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::MinSetpointDeadBand::Id: {
-            using TypeInfo = Attributes::MinSetpointDeadBand::TypeInfo;
+        case Attributes::InstantaneousPower::Id: {
+            using TypeInfo = Attributes::InstantaneousPower::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithChar:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::RemoteSensing::Id: {
-            using TypeInfo = Attributes::RemoteSensing::TypeInfo;
+        case Attributes::RmsVoltage::Id: {
+            using TypeInfo = Attributes::RmsVoltage::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ControlSequenceOfOperation::Id: {
-            using TypeInfo = Attributes::ControlSequenceOfOperation::TypeInfo;
+        case Attributes::RmsVoltageMin::Id: {
+            using TypeInfo = Attributes::RmsVoltageMin::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::SystemMode::Id: {
-            using TypeInfo = Attributes::SystemMode::TypeInfo;
+        case Attributes::RmsVoltageMax::Id: {
+            using TypeInfo = Attributes::RmsVoltageMax::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ThermostatRunningMode::Id: {
-            using TypeInfo = Attributes::ThermostatRunningMode::TypeInfo;
+        case Attributes::RmsCurrent::Id: {
+            using TypeInfo = Attributes::RmsCurrent::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::StartOfWeek::Id: {
-            using TypeInfo = Attributes::StartOfWeek::TypeInfo;
+        case Attributes::RmsCurrentMin::Id: {
+            using TypeInfo = Attributes::RmsCurrentMin::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::NumberOfWeeklyTransitions::Id: {
-            using TypeInfo = Attributes::NumberOfWeeklyTransitions::TypeInfo;
+        case Attributes::RmsCurrentMax::Id: {
+            using TypeInfo = Attributes::RmsCurrentMax::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::NumberOfDailyTransitions::Id: {
-            using TypeInfo = Attributes::NumberOfDailyTransitions::TypeInfo;
+        case Attributes::ActivePower::Id: {
+            using TypeInfo = Attributes::ActivePower::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::TemperatureSetpointHold::Id: {
-            using TypeInfo = Attributes::TemperatureSetpointHold::TypeInfo;
+        case Attributes::ActivePowerMin::Id: {
+            using TypeInfo = Attributes::ActivePowerMin::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::TemperatureSetpointHoldDuration::Id: {
-            using TypeInfo = Attributes::TemperatureSetpointHoldDuration::TypeInfo;
+        case Attributes::ActivePowerMax::Id: {
+            using TypeInfo = Attributes::ActivePowerMax::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::ThermostatProgrammingOperationMode::Id: {
-            using TypeInfo = Attributes::ThermostatProgrammingOperationMode::TypeInfo;
+        case Attributes::ReactivePower::Id: {
+            using TypeInfo = Attributes::ReactivePower::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::ThermostatRunningState::Id: {
-            using TypeInfo = Attributes::ThermostatRunningState::TypeInfo;
+        case Attributes::ApparentPower::Id: {
+            using TypeInfo = Attributes::ApparentPower::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -14560,157 +14834,129 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::SetpointChangeSource::Id: {
-            using TypeInfo = Attributes::SetpointChangeSource::TypeInfo;
+        case Attributes::PowerFactor::Id: {
+            using TypeInfo = Attributes::PowerFactor::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithChar:cppValue];
             return value;
         }
-        case Attributes::SetpointChangeAmount::Id: {
-            using TypeInfo = Attributes::SetpointChangeAmount::TypeInfo;
+        case Attributes::AverageRmsVoltageMeasurementPeriod::Id: {
+            using TypeInfo = Attributes::AverageRmsVoltageMeasurementPeriod::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithShort:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::SetpointChangeSourceTimestamp::Id: {
-            using TypeInfo = Attributes::SetpointChangeSourceTimestamp::TypeInfo;
+        case Attributes::AverageRmsUnderVoltageCounter::Id: {
+            using TypeInfo = Attributes::AverageRmsUnderVoltageCounter::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::OccupiedSetback::Id: {
-            using TypeInfo = Attributes::OccupiedSetback::TypeInfo;
+        case Attributes::RmsExtremeOverVoltagePeriod::Id: {
+            using TypeInfo = Attributes::RmsExtremeOverVoltagePeriod::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::OccupiedSetbackMin::Id: {
-            using TypeInfo = Attributes::OccupiedSetbackMin::TypeInfo;
+        case Attributes::RmsExtremeUnderVoltagePeriod::Id: {
+            using TypeInfo = Attributes::RmsExtremeUnderVoltagePeriod::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::OccupiedSetbackMax::Id: {
-            using TypeInfo = Attributes::OccupiedSetbackMax::TypeInfo;
+        case Attributes::RmsVoltageSagPeriod::Id: {
+            using TypeInfo = Attributes::RmsVoltageSagPeriod::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::UnoccupiedSetback::Id: {
-            using TypeInfo = Attributes::UnoccupiedSetback::TypeInfo;
+        case Attributes::RmsVoltageSwellPeriod::Id: {
+            using TypeInfo = Attributes::RmsVoltageSwellPeriod::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::UnoccupiedSetbackMin::Id: {
-            using TypeInfo = Attributes::UnoccupiedSetbackMin::TypeInfo;
+        case Attributes::AcVoltageMultiplier::Id: {
+            using TypeInfo = Attributes::AcVoltageMultiplier::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::UnoccupiedSetbackMax::Id: {
-            using TypeInfo = Attributes::UnoccupiedSetbackMax::TypeInfo;
+        case Attributes::AcVoltageDivisor::Id: {
+            using TypeInfo = Attributes::AcVoltageDivisor::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::EmergencyHeatDelta::Id: {
-            using TypeInfo = Attributes::EmergencyHeatDelta::TypeInfo;
+        case Attributes::AcCurrentMultiplier::Id: {
+            using TypeInfo = Attributes::AcCurrentMultiplier::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ACType::Id: {
-            using TypeInfo = Attributes::ACType::TypeInfo;
+        case Attributes::AcCurrentDivisor::Id: {
+            using TypeInfo = Attributes::AcCurrentDivisor::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ACCapacity::Id: {
-            using TypeInfo = Attributes::ACCapacity::TypeInfo;
+        case Attributes::AcPowerMultiplier::Id: {
+            using TypeInfo = Attributes::AcPowerMultiplier::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -14720,19 +14966,19 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ACRefrigerantType::Id: {
-            using TypeInfo = Attributes::ACRefrigerantType::TypeInfo;
+        case Attributes::AcPowerDivisor::Id: {
+            using TypeInfo = Attributes::AcPowerDivisor::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ACCompressorType::Id: {
-            using TypeInfo = Attributes::ACCompressorType::TypeInfo;
+        case Attributes::OverloadAlarmsMask::Id: {
+            using TypeInfo = Attributes::OverloadAlarmsMask::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -14742,287 +14988,184 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::ACErrorCode::Id: {
-            using TypeInfo = Attributes::ACErrorCode::TypeInfo;
+        case Attributes::VoltageOverload::Id: {
+            using TypeInfo = Attributes::VoltageOverload::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::ACLouverPosition::Id: {
-            using TypeInfo = Attributes::ACLouverPosition::TypeInfo;
+        case Attributes::CurrentOverload::Id: {
+            using TypeInfo = Attributes::CurrentOverload::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::ACCoilTemperature::Id: {
-            using TypeInfo = Attributes::ACCoilTemperature::TypeInfo;
+        case Attributes::AcOverloadAlarmsMask::Id: {
+            using TypeInfo = Attributes::AcOverloadAlarmsMask::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithShort:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ACCapacityformat::Id: {
-            using TypeInfo = Attributes::ACCapacityformat::TypeInfo;
+        case Attributes::AcVoltageOverload::Id: {
+            using TypeInfo = Attributes::AcVoltageOverload::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::AcCurrentOverload::Id: {
+            using TypeInfo = Attributes::AcCurrentOverload::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::AcActivePowerOverload::Id: {
+            using TypeInfo = Attributes::AcActivePowerOverload::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::AcReactivePowerOverload::Id: {
+            using TypeInfo = Attributes::AcReactivePowerOverload::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::AverageRmsOverVoltage::Id: {
+            using TypeInfo = Attributes::AverageRmsOverVoltage::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::AverageRmsUnderVoltage::Id: {
+            using TypeInfo = Attributes::AverageRmsUnderVoltage::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::ThermostatUserInterfaceConfiguration::Id: {
-        using namespace Clusters::ThermostatUserInterfaceConfiguration;
-        switch (aPath.mAttributeId) {
-        case Attributes::TemperatureDisplayMode::Id: {
-            using TypeInfo = Attributes::TemperatureDisplayMode::TypeInfo;
+        case Attributes::RmsExtremeOverVoltage::Id: {
+            using TypeInfo = Attributes::RmsExtremeOverVoltage::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::KeypadLockout::Id: {
-            using TypeInfo = Attributes::KeypadLockout::TypeInfo;
+        case Attributes::RmsExtremeUnderVoltage::Id: {
+            using TypeInfo = Attributes::RmsExtremeUnderVoltage::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::ScheduleProgrammingVisibility::Id: {
-            using TypeInfo = Attributes::ScheduleProgrammingVisibility::TypeInfo;
+        case Attributes::RmsVoltageSag::Id: {
+            using TypeInfo = Attributes::RmsVoltageSag::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::RmsVoltageSwell::Id: {
+            using TypeInfo = Attributes::RmsVoltageSwell::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::LineCurrentPhaseB::Id: {
+            using TypeInfo = Attributes::LineCurrentPhaseB::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::ActiveCurrentPhaseB::Id: {
+            using TypeInfo = Attributes::ActiveCurrentPhaseB::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
-        }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        }
+        case Attributes::ReactiveCurrentPhaseB::Id: {
+            using TypeInfo = Attributes::ReactiveCurrentPhaseB::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::RmsVoltagePhaseB::Id: {
+            using TypeInfo = Attributes::RmsVoltagePhaseB::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -15032,279 +15175,162 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::ThreadNetworkDiagnostics::Id: {
-        using namespace Clusters::ThreadNetworkDiagnostics;
-        switch (aPath.mAttributeId) {
-        case Attributes::Channel::Id: {
-            using TypeInfo = Attributes::Channel::TypeInfo;
+        case Attributes::RmsVoltageMinPhaseB::Id: {
+            using TypeInfo = Attributes::RmsVoltageMinPhaseB::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::RoutingRole::Id: {
-            using TypeInfo = Attributes::RoutingRole::TypeInfo;
+        case Attributes::RmsVoltageMaxPhaseB::Id: {
+            using TypeInfo = Attributes::RmsVoltageMaxPhaseB::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value())];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::NetworkName::Id: {
-            using TypeInfo = Attributes::NetworkName::TypeInfo;
+        case Attributes::RmsCurrentPhaseB::Id: {
+            using TypeInfo = Attributes::RmsCurrentPhaseB::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSString * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [[NSString alloc] initWithBytes:cppValue.Value().data()
-                                                 length:cppValue.Value().size()
-                                               encoding:NSUTF8StringEncoding];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::PanId::Id: {
-            using TypeInfo = Attributes::PanId::TypeInfo;
+        case Attributes::RmsCurrentMinPhaseB::Id: {
+            using TypeInfo = Attributes::RmsCurrentMinPhaseB::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ExtendedPanId::Id: {
-            using TypeInfo = Attributes::ExtendedPanId::TypeInfo;
+        case Attributes::RmsCurrentMaxPhaseB::Id: {
+            using TypeInfo = Attributes::RmsCurrentMaxPhaseB::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::MeshLocalPrefix::Id: {
-            using TypeInfo = Attributes::MeshLocalPrefix::TypeInfo;
+        case Attributes::ActivePowerPhaseB::Id: {
+            using TypeInfo = Attributes::ActivePowerPhaseB::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSData * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSData dataWithBytes:cppValue.Value().data() length:cppValue.Value().size()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::OverrunCount::Id: {
-            using TypeInfo = Attributes::OverrunCount::TypeInfo;
+        case Attributes::ActivePowerMinPhaseB::Id: {
+            using TypeInfo = Attributes::ActivePowerMinPhaseB::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedLongLong:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::NeighborTableList::Id: {
-            using TypeInfo = Attributes::NeighborTableList::TypeInfo;
+        case Attributes::ActivePowerMaxPhaseB::Id: {
+            using TypeInfo = Attributes::ActivePowerMaxPhaseB::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    CHIPThreadNetworkDiagnosticsClusterNeighborTable * newElement_0;
-                    newElement_0 = [CHIPThreadNetworkDiagnosticsClusterNeighborTable new];
-                    newElement_0.extAddress = [NSNumber numberWithUnsignedLongLong:entry_0.extAddress];
-                    newElement_0.age = [NSNumber numberWithUnsignedInt:entry_0.age];
-                    newElement_0.rloc16 = [NSNumber numberWithUnsignedShort:entry_0.rloc16];
-                    newElement_0.linkFrameCounter = [NSNumber numberWithUnsignedInt:entry_0.linkFrameCounter];
-                    newElement_0.mleFrameCounter = [NSNumber numberWithUnsignedInt:entry_0.mleFrameCounter];
-                    newElement_0.lqi = [NSNumber numberWithUnsignedChar:entry_0.lqi];
-                    if (entry_0.averageRssi.IsNull()) {
-                        newElement_0.averageRssi = nil;
-                    } else {
-                        newElement_0.averageRssi = [NSNumber numberWithChar:entry_0.averageRssi.Value()];
-                    }
-                    if (entry_0.lastRssi.IsNull()) {
-                        newElement_0.lastRssi = nil;
-                    } else {
-                        newElement_0.lastRssi = [NSNumber numberWithChar:entry_0.lastRssi.Value()];
-                    }
-                    newElement_0.frameErrorRate = [NSNumber numberWithUnsignedChar:entry_0.frameErrorRate];
-                    newElement_0.messageErrorRate = [NSNumber numberWithUnsignedChar:entry_0.messageErrorRate];
-                    newElement_0.rxOnWhenIdle = [NSNumber numberWithBool:entry_0.rxOnWhenIdle];
-                    newElement_0.fullThreadDevice = [NSNumber numberWithBool:entry_0.fullThreadDevice];
-                    newElement_0.fullNetworkData = [NSNumber numberWithBool:entry_0.fullNetworkData];
-                    newElement_0.isChild = [NSNumber numberWithBool:entry_0.isChild];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::RouteTableList::Id: {
-            using TypeInfo = Attributes::RouteTableList::TypeInfo;
+        case Attributes::ReactivePowerPhaseB::Id: {
+            using TypeInfo = Attributes::ReactivePowerPhaseB::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    CHIPThreadNetworkDiagnosticsClusterRouteTable * newElement_0;
-                    newElement_0 = [CHIPThreadNetworkDiagnosticsClusterRouteTable new];
-                    newElement_0.extAddress = [NSNumber numberWithUnsignedLongLong:entry_0.extAddress];
-                    newElement_0.rloc16 = [NSNumber numberWithUnsignedShort:entry_0.rloc16];
-                    newElement_0.routerId = [NSNumber numberWithUnsignedChar:entry_0.routerId];
-                    newElement_0.nextHop = [NSNumber numberWithUnsignedChar:entry_0.nextHop];
-                    newElement_0.pathCost = [NSNumber numberWithUnsignedChar:entry_0.pathCost];
-                    newElement_0.lqiIn = [NSNumber numberWithUnsignedChar:entry_0.LQIIn];
-                    newElement_0.lqiOut = [NSNumber numberWithUnsignedChar:entry_0.LQIOut];
-                    newElement_0.age = [NSNumber numberWithUnsignedChar:entry_0.age];
-                    newElement_0.allocated = [NSNumber numberWithBool:entry_0.allocated];
-                    newElement_0.linkEstablished = [NSNumber numberWithBool:entry_0.linkEstablished];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::PartitionId::Id: {
-            using TypeInfo = Attributes::PartitionId::TypeInfo;
+        case Attributes::ApparentPowerPhaseB::Id: {
+            using TypeInfo = Attributes::ApparentPowerPhaseB::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::Weighting::Id: {
-            using TypeInfo = Attributes::Weighting::TypeInfo;
+        case Attributes::PowerFactorPhaseB::Id: {
+            using TypeInfo = Attributes::PowerFactorPhaseB::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithChar:cppValue];
             return value;
         }
-        case Attributes::DataVersion::Id: {
-            using TypeInfo = Attributes::DataVersion::TypeInfo;
+        case Attributes::AverageRmsVoltageMeasurementPeriodPhaseB::Id: {
+            using TypeInfo = Attributes::AverageRmsVoltageMeasurementPeriodPhaseB::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::StableDataVersion::Id: {
-            using TypeInfo = Attributes::StableDataVersion::TypeInfo;
+        case Attributes::AverageRmsOverVoltageCounterPhaseB::Id: {
+            using TypeInfo = Attributes::AverageRmsOverVoltageCounterPhaseB::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::LeaderRouterId::Id: {
-            using TypeInfo = Attributes::LeaderRouterId::TypeInfo;
+        case Attributes::AverageRmsUnderVoltageCounterPhaseB::Id: {
+            using TypeInfo = Attributes::AverageRmsUnderVoltageCounterPhaseB::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::DetachedRoleCount::Id: {
-            using TypeInfo = Attributes::DetachedRoleCount::TypeInfo;
+        case Attributes::RmsExtremeOverVoltagePeriodPhaseB::Id: {
+            using TypeInfo = Attributes::RmsExtremeOverVoltagePeriodPhaseB::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -15314,8 +15340,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::ChildRoleCount::Id: {
-            using TypeInfo = Attributes::ChildRoleCount::TypeInfo;
+        case Attributes::RmsExtremeUnderVoltagePeriodPhaseB::Id: {
+            using TypeInfo = Attributes::RmsExtremeUnderVoltagePeriodPhaseB::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -15325,8 +15351,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::RouterRoleCount::Id: {
-            using TypeInfo = Attributes::RouterRoleCount::TypeInfo;
+        case Attributes::RmsVoltageSagPeriodPhaseB::Id: {
+            using TypeInfo = Attributes::RmsVoltageSagPeriodPhaseB::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -15336,8 +15362,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::LeaderRoleCount::Id: {
-            using TypeInfo = Attributes::LeaderRoleCount::TypeInfo;
+        case Attributes::RmsVoltageSwellPeriodPhaseB::Id: {
+            using TypeInfo = Attributes::RmsVoltageSwellPeriodPhaseB::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -15347,8 +15373,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::AttachAttemptCount::Id: {
-            using TypeInfo = Attributes::AttachAttemptCount::TypeInfo;
+        case Attributes::LineCurrentPhaseC::Id: {
+            using TypeInfo = Attributes::LineCurrentPhaseC::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -15358,30 +15384,30 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::PartitionIdChangeCount::Id: {
-            using TypeInfo = Attributes::PartitionIdChangeCount::TypeInfo;
+        case Attributes::ActiveCurrentPhaseC::Id: {
+            using TypeInfo = Attributes::ActiveCurrentPhaseC::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::BetterPartitionAttachAttemptCount::Id: {
-            using TypeInfo = Attributes::BetterPartitionAttachAttemptCount::TypeInfo;
+        case Attributes::ReactiveCurrentPhaseC::Id: {
+            using TypeInfo = Attributes::ReactiveCurrentPhaseC::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::ParentChangeCount::Id: {
-            using TypeInfo = Attributes::ParentChangeCount::TypeInfo;
+        case Attributes::RmsVoltagePhaseC::Id: {
+            using TypeInfo = Attributes::RmsVoltagePhaseC::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -15391,239 +15417,284 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::TxTotalCount::Id: {
-            using TypeInfo = Attributes::TxTotalCount::TypeInfo;
+        case Attributes::RmsVoltageMinPhaseC::Id: {
+            using TypeInfo = Attributes::RmsVoltageMinPhaseC::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::TxUnicastCount::Id: {
-            using TypeInfo = Attributes::TxUnicastCount::TypeInfo;
+        case Attributes::RmsVoltageMaxPhaseC::Id: {
+            using TypeInfo = Attributes::RmsVoltageMaxPhaseC::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::TxBroadcastCount::Id: {
-            using TypeInfo = Attributes::TxBroadcastCount::TypeInfo;
+        case Attributes::RmsCurrentPhaseC::Id: {
+            using TypeInfo = Attributes::RmsCurrentPhaseC::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::TxAckRequestedCount::Id: {
-            using TypeInfo = Attributes::TxAckRequestedCount::TypeInfo;
+        case Attributes::RmsCurrentMinPhaseC::Id: {
+            using TypeInfo = Attributes::RmsCurrentMinPhaseC::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::TxAckedCount::Id: {
-            using TypeInfo = Attributes::TxAckedCount::TypeInfo;
+        case Attributes::RmsCurrentMaxPhaseC::Id: {
+            using TypeInfo = Attributes::RmsCurrentMaxPhaseC::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::TxNoAckRequestedCount::Id: {
-            using TypeInfo = Attributes::TxNoAckRequestedCount::TypeInfo;
+        case Attributes::ActivePowerPhaseC::Id: {
+            using TypeInfo = Attributes::ActivePowerPhaseC::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::TxDataCount::Id: {
-            using TypeInfo = Attributes::TxDataCount::TypeInfo;
+        case Attributes::ActivePowerMinPhaseC::Id: {
+            using TypeInfo = Attributes::ActivePowerMinPhaseC::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::TxDataPollCount::Id: {
-            using TypeInfo = Attributes::TxDataPollCount::TypeInfo;
+        case Attributes::ActivePowerMaxPhaseC::Id: {
+            using TypeInfo = Attributes::ActivePowerMaxPhaseC::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::TxBeaconCount::Id: {
-            using TypeInfo = Attributes::TxBeaconCount::TypeInfo;
+        case Attributes::ReactivePowerPhaseC::Id: {
+            using TypeInfo = Attributes::ReactivePowerPhaseC::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::TxBeaconRequestCount::Id: {
-            using TypeInfo = Attributes::TxBeaconRequestCount::TypeInfo;
+        case Attributes::ApparentPowerPhaseC::Id: {
+            using TypeInfo = Attributes::ApparentPowerPhaseC::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::TxOtherCount::Id: {
-            using TypeInfo = Attributes::TxOtherCount::TypeInfo;
+        case Attributes::PowerFactorPhaseC::Id: {
+            using TypeInfo = Attributes::PowerFactorPhaseC::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithChar:cppValue];
             return value;
         }
-        case Attributes::TxRetryCount::Id: {
-            using TypeInfo = Attributes::TxRetryCount::TypeInfo;
+        case Attributes::AverageRmsVoltageMeasurementPeriodPhaseC::Id: {
+            using TypeInfo = Attributes::AverageRmsVoltageMeasurementPeriodPhaseC::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::TxDirectMaxRetryExpiryCount::Id: {
-            using TypeInfo = Attributes::TxDirectMaxRetryExpiryCount::TypeInfo;
+        case Attributes::AverageRmsOverVoltageCounterPhaseC::Id: {
+            using TypeInfo = Attributes::AverageRmsOverVoltageCounterPhaseC::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::TxIndirectMaxRetryExpiryCount::Id: {
-            using TypeInfo = Attributes::TxIndirectMaxRetryExpiryCount::TypeInfo;
+        case Attributes::AverageRmsUnderVoltageCounterPhaseC::Id: {
+            using TypeInfo = Attributes::AverageRmsUnderVoltageCounterPhaseC::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::TxErrCcaCount::Id: {
-            using TypeInfo = Attributes::TxErrCcaCount::TypeInfo;
+        case Attributes::RmsExtremeOverVoltagePeriodPhaseC::Id: {
+            using TypeInfo = Attributes::RmsExtremeOverVoltagePeriodPhaseC::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::TxErrAbortCount::Id: {
-            using TypeInfo = Attributes::TxErrAbortCount::TypeInfo;
+        case Attributes::RmsExtremeUnderVoltagePeriodPhaseC::Id: {
+            using TypeInfo = Attributes::RmsExtremeUnderVoltagePeriodPhaseC::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::TxErrBusyChannelCount::Id: {
-            using TypeInfo = Attributes::TxErrBusyChannelCount::TypeInfo;
+        case Attributes::RmsVoltageSagPeriodPhaseC::Id: {
+            using TypeInfo = Attributes::RmsVoltageSagPeriodPhaseC::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::RxTotalCount::Id: {
-            using TypeInfo = Attributes::RxTotalCount::TypeInfo;
+        case Attributes::RmsVoltageSwellPeriodPhaseC::Id: {
+            using TypeInfo = Attributes::RmsVoltageSwellPeriodPhaseC::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::RxUnicastCount::Id: {
-            using TypeInfo = Attributes::RxUnicastCount::TypeInfo;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::RxBroadcastCount::Id: {
-            using TypeInfo = Attributes::RxBroadcastCount::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::RxDataCount::Id: {
-            using TypeInfo = Attributes::RxDataCount::TypeInfo;
+        case Attributes::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            NSArray * _Nonnull value;
+            { // Scope for our temporary variables
+                auto * array_0 = [NSMutableArray new];
+                auto iter_0 = cppValue.begin();
+                while (iter_0.Next()) {
+                    auto & entry_0 = iter_0.GetValue();
+                    NSNumber * newElement_0;
+                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    [array_0 addObject:newElement_0];
+                }
+                CHIP_ERROR err = iter_0.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    *aError = err;
+                    return nil;
+                }
+                value = array_0;
+            }
             return value;
         }
-        case Attributes::RxDataPollCount::Id: {
-            using TypeInfo = Attributes::RxDataPollCount::TypeInfo;
+        case Attributes::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -15633,96 +15704,105 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::RxBeaconCount::Id: {
-            using TypeInfo = Attributes::RxBeaconCount::TypeInfo;
+        case Attributes::ClusterRevision::Id: {
+            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::RxBeaconRequestCount::Id: {
-            using TypeInfo = Attributes::RxBeaconRequestCount::TypeInfo;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::TestCluster::Id: {
+        using namespace Clusters::TestCluster;
+        switch (aPath.mAttributeId) {
+        case Attributes::Boolean::Id: {
+            using TypeInfo = Attributes::Boolean::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithBool:cppValue];
             return value;
         }
-        case Attributes::RxOtherCount::Id: {
-            using TypeInfo = Attributes::RxOtherCount::TypeInfo;
+        case Attributes::Bitmap8::Id: {
+            using TypeInfo = Attributes::Bitmap8::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue.Raw()];
             return value;
         }
-        case Attributes::RxAddressFilteredCount::Id: {
-            using TypeInfo = Attributes::RxAddressFilteredCount::TypeInfo;
+        case Attributes::Bitmap16::Id: {
+            using TypeInfo = Attributes::Bitmap16::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue.Raw()];
             return value;
         }
-        case Attributes::RxDestAddrFilteredCount::Id: {
-            using TypeInfo = Attributes::RxDestAddrFilteredCount::TypeInfo;
+        case Attributes::Bitmap32::Id: {
+            using TypeInfo = Attributes::Bitmap32::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedInt:cppValue.Raw()];
             return value;
         }
-        case Attributes::RxDuplicatedCount::Id: {
-            using TypeInfo = Attributes::RxDuplicatedCount::TypeInfo;
+        case Attributes::Bitmap64::Id: {
+            using TypeInfo = Attributes::Bitmap64::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedLongLong:cppValue.Raw()];
             return value;
         }
-        case Attributes::RxErrNoFrameCount::Id: {
-            using TypeInfo = Attributes::RxErrNoFrameCount::TypeInfo;
+        case Attributes::Int8u::Id: {
+            using TypeInfo = Attributes::Int8u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::RxErrUnknownNeighborCount::Id: {
-            using TypeInfo = Attributes::RxErrUnknownNeighborCount::TypeInfo;
+        case Attributes::Int16u::Id: {
+            using TypeInfo = Attributes::Int16u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        case Attributes::RxErrInvalidSrcAddrCount::Id: {
-            using TypeInfo = Attributes::RxErrInvalidSrcAddrCount::TypeInfo;
+        case Attributes::Int24u::Id: {
+            using TypeInfo = Attributes::Int24u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -15732,8 +15812,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::RxErrSecCount::Id: {
-            using TypeInfo = Attributes::RxErrSecCount::TypeInfo;
+        case Attributes::Int32u::Id: {
+            using TypeInfo = Attributes::Int32u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -15743,249 +15823,151 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::RxErrFcsCount::Id: {
-            using TypeInfo = Attributes::RxErrFcsCount::TypeInfo;
+        case Attributes::Int40u::Id: {
+            using TypeInfo = Attributes::Int40u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedLongLong:cppValue];
             return value;
         }
-        case Attributes::RxErrOtherCount::Id: {
-            using TypeInfo = Attributes::RxErrOtherCount::TypeInfo;
+        case Attributes::Int48u::Id: {
+            using TypeInfo = Attributes::Int48u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedLongLong:cppValue];
             return value;
         }
-        case Attributes::ActiveTimestamp::Id: {
-            using TypeInfo = Attributes::ActiveTimestamp::TypeInfo;
+        case Attributes::Int56u::Id: {
+            using TypeInfo = Attributes::Int56u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedLongLong:cppValue];
             return value;
         }
-        case Attributes::PendingTimestamp::Id: {
-            using TypeInfo = Attributes::PendingTimestamp::TypeInfo;
+        case Attributes::Int64u::Id: {
+            using TypeInfo = Attributes::Int64u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedLongLong:cppValue];
             return value;
         }
-        case Attributes::Delay::Id: {
-            using TypeInfo = Attributes::Delay::TypeInfo;
+        case Attributes::Int8s::Id: {
+            using TypeInfo = Attributes::Int8s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithChar:cppValue];
             return value;
         }
-        case Attributes::SecurityPolicy::Id: {
-            using TypeInfo = Attributes::SecurityPolicy::TypeInfo;
+        case Attributes::Int16s::Id: {
+            using TypeInfo = Attributes::Int16s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [CHIPThreadNetworkDiagnosticsClusterSecurityPolicy new];
-                value.rotationTime = [NSNumber numberWithUnsignedShort:cppValue.Value().rotationTime];
-                value.flags = [NSNumber numberWithUnsignedShort:cppValue.Value().flags];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::ChannelMask::Id: {
-            using TypeInfo = Attributes::ChannelMask::TypeInfo;
+        case Attributes::Int24s::Id: {
+            using TypeInfo = Attributes::Int24s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSData * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSData dataWithBytes:cppValue.Value().data() length:cppValue.Value().size()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithInt:cppValue];
             return value;
         }
-        case Attributes::OperationalDatasetComponents::Id: {
-            using TypeInfo = Attributes::OperationalDatasetComponents::TypeInfo;
+        case Attributes::Int32s::Id: {
+            using TypeInfo = Attributes::Int32s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents new];
-                value.activeTimestampPresent = [NSNumber numberWithBool:cppValue.Value().activeTimestampPresent];
-                value.pendingTimestampPresent = [NSNumber numberWithBool:cppValue.Value().pendingTimestampPresent];
-                value.masterKeyPresent = [NSNumber numberWithBool:cppValue.Value().masterKeyPresent];
-                value.networkNamePresent = [NSNumber numberWithBool:cppValue.Value().networkNamePresent];
-                value.extendedPanIdPresent = [NSNumber numberWithBool:cppValue.Value().extendedPanIdPresent];
-                value.meshLocalPrefixPresent = [NSNumber numberWithBool:cppValue.Value().meshLocalPrefixPresent];
-                value.delayPresent = [NSNumber numberWithBool:cppValue.Value().delayPresent];
-                value.panIdPresent = [NSNumber numberWithBool:cppValue.Value().panIdPresent];
-                value.channelPresent = [NSNumber numberWithBool:cppValue.Value().channelPresent];
-                value.pskcPresent = [NSNumber numberWithBool:cppValue.Value().pskcPresent];
-                value.securityPolicyPresent = [NSNumber numberWithBool:cppValue.Value().securityPolicyPresent];
-                value.channelMaskPresent = [NSNumber numberWithBool:cppValue.Value().channelMaskPresent];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithInt:cppValue];
             return value;
         }
-        case Attributes::ActiveNetworkFaultsList::Id: {
-            using TypeInfo = Attributes::ActiveNetworkFaultsList::TypeInfo;
+        case Attributes::Int40s::Id: {
+            using TypeInfo = Attributes::Int40s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithLongLong:cppValue];
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::Int48s::Id: {
+            using TypeInfo = Attributes::Int48s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithLongLong:cppValue];
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::Int56s::Id: {
+            using TypeInfo = Attributes::Int56s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithLongLong:cppValue];
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::Int64s::Id: {
+            using TypeInfo = Attributes::Int64s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithLongLong:cppValue];
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::Enum8::Id: {
+            using TypeInfo = Attributes::Enum8::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::Enum16::Id: {
+            using TypeInfo = Attributes::Enum16::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -15995,65 +15977,41 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::TimeFormatLocalization::Id: {
-        using namespace Clusters::TimeFormatLocalization;
-        switch (aPath.mAttributeId) {
-        case Attributes::HourFormat::Id: {
-            using TypeInfo = Attributes::HourFormat::TypeInfo;
+        case Attributes::FloatSingle::Id: {
+            using TypeInfo = Attributes::FloatSingle::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+            value = [NSNumber numberWithFloat:cppValue];
             return value;
         }
-        case Attributes::ActiveCalendarType::Id: {
-            using TypeInfo = Attributes::ActiveCalendarType::TypeInfo;
+        case Attributes::FloatDouble::Id: {
+            using TypeInfo = Attributes::FloatDouble::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+            value = [NSNumber numberWithDouble:cppValue];
             return value;
         }
-        case Attributes::SupportedCalendarTypes::Id: {
-            using TypeInfo = Attributes::SupportedCalendarTypes::TypeInfo;
+        case Attributes::OctetString::Id: {
+            using TypeInfo = Attributes::OctetString::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSData * _Nonnull value;
+            value = [NSData dataWithBytes:cppValue.data() length:cppValue.size()];
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::ListInt8u::Id: {
+            using TypeInfo = Attributes::ListInt8u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -16066,7 +16024,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
                 while (iter_0.Next()) {
                     auto & entry_0 = iter_0.GetValue();
                     NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
                     [array_0 addObject:newElement_0];
                 }
                 CHIP_ERROR err = iter_0.GetStatus();
@@ -16078,8 +16036,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::ListOctetString::Id: {
+            using TypeInfo = Attributes::ListOctetString::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -16091,8 +16049,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
                 auto iter_0 = cppValue.begin();
                 while (iter_0.Next()) {
                     auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    NSData * newElement_0;
+                    newElement_0 = [NSData dataWithBytes:entry_0.data() length:entry_0.size()];
                     [array_0 addObject:newElement_0];
                 }
                 CHIP_ERROR err = iter_0.GetStatus();
@@ -16104,8 +16062,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::ListStructOctetString::Id: {
+            using TypeInfo = Attributes::ListStructOctetString::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -16117,8 +16075,10 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
                 auto iter_0 = cppValue.begin();
                 while (iter_0.Next()) {
                     auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    CHIPTestClusterClusterTestListStructOctet * newElement_0;
+                    newElement_0 = [CHIPTestClusterClusterTestListStructOctet new];
+                    newElement_0.member1 = [NSNumber numberWithUnsignedLongLong:entry_0.member1];
+                    newElement_0.member2 = [NSData dataWithBytes:entry_0.member2.data() length:entry_0.member2.size()];
                     [array_0 addObject:newElement_0];
                 }
                 CHIP_ERROR err = iter_0.GetStatus();
@@ -16130,102 +16090,74 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::LongOctetString::Id: {
+            using TypeInfo = Attributes::LongOctetString::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            NSData * _Nonnull value;
+            value = [NSData dataWithBytes:cppValue.data() length:cppValue.size()];
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::CharString::Id: {
+            using TypeInfo = Attributes::CharString::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
+        case Attributes::LongCharString::Id: {
+            using TypeInfo = Attributes::LongCharString::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+            NSString * _Nonnull value;
+            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
+            return value;
         }
-        break;
-    }
-    case Clusters::UnitLocalization::Id: {
-        using namespace Clusters::UnitLocalization;
-        switch (aPath.mAttributeId) {
-        case Attributes::TemperatureUnit::Id: {
-            using TypeInfo = Attributes::TemperatureUnit::TypeInfo;
+        case Attributes::EpochUs::Id: {
+            using TypeInfo = Attributes::EpochUs::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+            value = [NSNumber numberWithUnsignedLongLong:cppValue];
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::EpochS::Id: {
+            using TypeInfo = Attributes::EpochS::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::VendorId::Id: {
+            using TypeInfo = Attributes::VendorId::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedShort:chip::to_underlying(cppValue)];
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::ListNullablesAndOptionalsStruct::Id: {
+            using TypeInfo = Attributes::ListNullablesAndOptionalsStruct::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -16237,8 +16169,180 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
                 auto iter_0 = cppValue.begin();
                 while (iter_0.Next()) {
                     auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    CHIPTestClusterClusterNullablesAndOptionalsStruct * newElement_0;
+                    newElement_0 = [CHIPTestClusterClusterNullablesAndOptionalsStruct new];
+                    if (entry_0.nullableInt.IsNull()) {
+                        newElement_0.nullableInt = nil;
+                    } else {
+                        newElement_0.nullableInt = [NSNumber numberWithUnsignedShort:entry_0.nullableInt.Value()];
+                    }
+                    if (entry_0.optionalInt.HasValue()) {
+                        newElement_0.optionalInt = [NSNumber numberWithUnsignedShort:entry_0.optionalInt.Value()];
+                    } else {
+                        newElement_0.optionalInt = nil;
+                    }
+                    if (entry_0.nullableOptionalInt.HasValue()) {
+                        if (entry_0.nullableOptionalInt.Value().IsNull()) {
+                            newElement_0.nullableOptionalInt = nil;
+                        } else {
+                            newElement_0.nullableOptionalInt =
+                                [NSNumber numberWithUnsignedShort:entry_0.nullableOptionalInt.Value().Value()];
+                        }
+                    } else {
+                        newElement_0.nullableOptionalInt = nil;
+                    }
+                    if (entry_0.nullableString.IsNull()) {
+                        newElement_0.nullableString = nil;
+                    } else {
+                        newElement_0.nullableString = [[NSString alloc] initWithBytes:entry_0.nullableString.Value().data()
+                                                                               length:entry_0.nullableString.Value().size()
+                                                                             encoding:NSUTF8StringEncoding];
+                    }
+                    if (entry_0.optionalString.HasValue()) {
+                        newElement_0.optionalString = [[NSString alloc] initWithBytes:entry_0.optionalString.Value().data()
+                                                                               length:entry_0.optionalString.Value().size()
+                                                                             encoding:NSUTF8StringEncoding];
+                    } else {
+                        newElement_0.optionalString = nil;
+                    }
+                    if (entry_0.nullableOptionalString.HasValue()) {
+                        if (entry_0.nullableOptionalString.Value().IsNull()) {
+                            newElement_0.nullableOptionalString = nil;
+                        } else {
+                            newElement_0.nullableOptionalString =
+                                [[NSString alloc] initWithBytes:entry_0.nullableOptionalString.Value().Value().data()
+                                                         length:entry_0.nullableOptionalString.Value().Value().size()
+                                                       encoding:NSUTF8StringEncoding];
+                        }
+                    } else {
+                        newElement_0.nullableOptionalString = nil;
+                    }
+                    if (entry_0.nullableStruct.IsNull()) {
+                        newElement_0.nullableStruct = nil;
+                    } else {
+                        newElement_0.nullableStruct = [CHIPTestClusterClusterSimpleStruct new];
+                        newElement_0.nullableStruct.a = [NSNumber numberWithUnsignedChar:entry_0.nullableStruct.Value().a];
+                        newElement_0.nullableStruct.b = [NSNumber numberWithBool:entry_0.nullableStruct.Value().b];
+                        newElement_0.nullableStruct.c =
+                            [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.nullableStruct.Value().c)];
+                        newElement_0.nullableStruct.d = [NSData dataWithBytes:entry_0.nullableStruct.Value().d.data()
+                                                                       length:entry_0.nullableStruct.Value().d.size()];
+                        newElement_0.nullableStruct.e = [[NSString alloc] initWithBytes:entry_0.nullableStruct.Value().e.data()
+                                                                                 length:entry_0.nullableStruct.Value().e.size()
+                                                                               encoding:NSUTF8StringEncoding];
+                        newElement_0.nullableStruct.f = [NSNumber numberWithUnsignedChar:entry_0.nullableStruct.Value().f.Raw()];
+                        newElement_0.nullableStruct.g = [NSNumber numberWithFloat:entry_0.nullableStruct.Value().g];
+                        newElement_0.nullableStruct.h = [NSNumber numberWithDouble:entry_0.nullableStruct.Value().h];
+                    }
+                    if (entry_0.optionalStruct.HasValue()) {
+                        newElement_0.optionalStruct = [CHIPTestClusterClusterSimpleStruct new];
+                        newElement_0.optionalStruct.a = [NSNumber numberWithUnsignedChar:entry_0.optionalStruct.Value().a];
+                        newElement_0.optionalStruct.b = [NSNumber numberWithBool:entry_0.optionalStruct.Value().b];
+                        newElement_0.optionalStruct.c =
+                            [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.optionalStruct.Value().c)];
+                        newElement_0.optionalStruct.d = [NSData dataWithBytes:entry_0.optionalStruct.Value().d.data()
+                                                                       length:entry_0.optionalStruct.Value().d.size()];
+                        newElement_0.optionalStruct.e = [[NSString alloc] initWithBytes:entry_0.optionalStruct.Value().e.data()
+                                                                                 length:entry_0.optionalStruct.Value().e.size()
+                                                                               encoding:NSUTF8StringEncoding];
+                        newElement_0.optionalStruct.f = [NSNumber numberWithUnsignedChar:entry_0.optionalStruct.Value().f.Raw()];
+                        newElement_0.optionalStruct.g = [NSNumber numberWithFloat:entry_0.optionalStruct.Value().g];
+                        newElement_0.optionalStruct.h = [NSNumber numberWithDouble:entry_0.optionalStruct.Value().h];
+                    } else {
+                        newElement_0.optionalStruct = nil;
+                    }
+                    if (entry_0.nullableOptionalStruct.HasValue()) {
+                        if (entry_0.nullableOptionalStruct.Value().IsNull()) {
+                            newElement_0.nullableOptionalStruct = nil;
+                        } else {
+                            newElement_0.nullableOptionalStruct = [CHIPTestClusterClusterSimpleStruct new];
+                            newElement_0.nullableOptionalStruct.a =
+                                [NSNumber numberWithUnsignedChar:entry_0.nullableOptionalStruct.Value().Value().a];
+                            newElement_0.nullableOptionalStruct.b =
+                                [NSNumber numberWithBool:entry_0.nullableOptionalStruct.Value().Value().b];
+                            newElement_0.nullableOptionalStruct.c = [NSNumber
+                                numberWithUnsignedChar:chip::to_underlying(entry_0.nullableOptionalStruct.Value().Value().c)];
+                            newElement_0.nullableOptionalStruct.d =
+                                [NSData dataWithBytes:entry_0.nullableOptionalStruct.Value().Value().d.data()
+                                               length:entry_0.nullableOptionalStruct.Value().Value().d.size()];
+                            newElement_0.nullableOptionalStruct.e =
+                                [[NSString alloc] initWithBytes:entry_0.nullableOptionalStruct.Value().Value().e.data()
+                                                         length:entry_0.nullableOptionalStruct.Value().Value().e.size()
+                                                       encoding:NSUTF8StringEncoding];
+                            newElement_0.nullableOptionalStruct.f =
+                                [NSNumber numberWithUnsignedChar:entry_0.nullableOptionalStruct.Value().Value().f.Raw()];
+                            newElement_0.nullableOptionalStruct.g =
+                                [NSNumber numberWithFloat:entry_0.nullableOptionalStruct.Value().Value().g];
+                            newElement_0.nullableOptionalStruct.h =
+                                [NSNumber numberWithDouble:entry_0.nullableOptionalStruct.Value().Value().h];
+                        }
+                    } else {
+                        newElement_0.nullableOptionalStruct = nil;
+                    }
+                    if (entry_0.nullableList.IsNull()) {
+                        newElement_0.nullableList = nil;
+                    } else {
+                        { // Scope for our temporary variables
+                            auto * array_3 = [NSMutableArray new];
+                            auto iter_3 = entry_0.nullableList.Value().begin();
+                            while (iter_3.Next()) {
+                                auto & entry_3 = iter_3.GetValue();
+                                NSNumber * newElement_3;
+                                newElement_3 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_3)];
+                                [array_3 addObject:newElement_3];
+                            }
+                            CHIP_ERROR err = iter_3.GetStatus();
+                            if (err != CHIP_NO_ERROR) {
+                                *aError = err;
+                                return nil;
+                            }
+                            newElement_0.nullableList = array_3;
+                        }
+                    }
+                    if (entry_0.optionalList.HasValue()) {
+                        { // Scope for our temporary variables
+                            auto * array_3 = [NSMutableArray new];
+                            auto iter_3 = entry_0.optionalList.Value().begin();
+                            while (iter_3.Next()) {
+                                auto & entry_3 = iter_3.GetValue();
+                                NSNumber * newElement_3;
+                                newElement_3 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_3)];
+                                [array_3 addObject:newElement_3];
+                            }
+                            CHIP_ERROR err = iter_3.GetStatus();
+                            if (err != CHIP_NO_ERROR) {
+                                *aError = err;
+                                return nil;
+                            }
+                            newElement_0.optionalList = array_3;
+                        }
+                    } else {
+                        newElement_0.optionalList = nil;
+                    }
+                    if (entry_0.nullableOptionalList.HasValue()) {
+                        if (entry_0.nullableOptionalList.Value().IsNull()) {
+                            newElement_0.nullableOptionalList = nil;
+                        } else {
+                            { // Scope for our temporary variables
+                                auto * array_4 = [NSMutableArray new];
+                                auto iter_4 = entry_0.nullableOptionalList.Value().Value().begin();
+                                while (iter_4.Next()) {
+                                    auto & entry_4 = iter_4.GetValue();
+                                    NSNumber * newElement_4;
+                                    newElement_4 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_4)];
+                                    [array_4 addObject:newElement_4];
+                                }
+                                CHIP_ERROR err = iter_4.GetStatus();
+                                if (err != CHIP_NO_ERROR) {
+                                    *aError = err;
+                                    return nil;
+                                }
+                                newElement_0.nullableOptionalList = array_4;
+                            }
+                        }
+                    } else {
+                        newElement_0.nullableOptionalList = nil;
+                    }
                     [array_0 addObject:newElement_0];
                 }
                 CHIP_ERROR err = iter_0.GetStatus();
@@ -16250,160 +16354,60 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
-            return value;
-        }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::EnumAttr::Id: {
+            using TypeInfo = Attributes::EnumAttr::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
-            return value;
-        }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::UserLabel::Id: {
-        using namespace Clusters::UserLabel;
-        switch (aPath.mAttributeId) {
-        case Attributes::LabelList::Id: {
-            using TypeInfo = Attributes::LabelList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    CHIPUserLabelClusterLabelStruct * newElement_0;
-                    newElement_0 = [CHIPUserLabelClusterLabelStruct new];
-                    newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data()
-                                                                  length:entry_0.label.size()
-                                                                encoding:NSUTF8StringEncoding];
-                    newElement_0.value = [[NSString alloc] initWithBytes:entry_0.value.data()
-                                                                  length:entry_0.value.size()
-                                                                encoding:NSUTF8StringEncoding];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
-            return value;
-        }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::StructAttr::Id: {
+            using TypeInfo = Attributes::StructAttr::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            CHIPTestClusterClusterSimpleStruct * _Nonnull value;
+            value = [CHIPTestClusterClusterSimpleStruct new];
+            value.a = [NSNumber numberWithUnsignedChar:cppValue.a];
+            value.b = [NSNumber numberWithBool:cppValue.b];
+            value.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.c)];
+            value.d = [NSData dataWithBytes:cppValue.d.data() length:cppValue.d.size()];
+            value.e = [[NSString alloc] initWithBytes:cppValue.e.data() length:cppValue.e.size() encoding:NSUTF8StringEncoding];
+            value.f = [NSNumber numberWithUnsignedChar:cppValue.f.Raw()];
+            value.g = [NSNumber numberWithFloat:cppValue.g];
+            value.h = [NSNumber numberWithDouble:cppValue.h];
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::RangeRestrictedInt8u::Id: {
+            using TypeInfo = Attributes::RangeRestrictedInt8u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithUnsignedChar:cppValue];
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::RangeRestrictedInt8s::Id: {
+            using TypeInfo = Attributes::RangeRestrictedInt8s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithChar:cppValue];
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::RangeRestrictedInt16u::Id: {
+            using TypeInfo = Attributes::RangeRestrictedInt16u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -16413,28 +16417,19 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             value = [NSNumber numberWithUnsignedShort:cppValue];
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::WakeOnLan::Id: {
-        using namespace Clusters::WakeOnLan;
-        switch (aPath.mAttributeId) {
-        case Attributes::MACAddress::Id: {
-            using TypeInfo = Attributes::MACAddress::TypeInfo;
+        case Attributes::RangeRestrictedInt16s::Id: {
+            using TypeInfo = Attributes::RangeRestrictedInt16s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSString * _Nonnull value;
-            value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding];
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithShort:cppValue];
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::ListLongOctetString::Id: {
+            using TypeInfo = Attributes::ListLongOctetString::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -16446,8 +16441,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
                 auto iter_0 = cppValue.begin();
                 while (iter_0.Next()) {
                     auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    NSData * newElement_0;
+                    newElement_0 = [NSData dataWithBytes:entry_0.data() length:entry_0.size()];
                     [array_0 addObject:newElement_0];
                 }
                 CHIP_ERROR err = iter_0.GetStatus();
@@ -16459,8 +16454,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::ListFabricScoped::Id: {
+            using TypeInfo = Attributes::ListFabricScoped::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -16472,8 +16467,65 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
                 auto iter_0 = cppValue.begin();
                 while (iter_0.Next()) {
                     auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+                    CHIPTestClusterClusterTestFabricScoped * newElement_0;
+                    newElement_0 = [CHIPTestClusterClusterTestFabricScoped new];
+                    newElement_0.fabricSensitiveInt8u = [NSNumber numberWithUnsignedChar:entry_0.fabricSensitiveInt8u];
+                    if (entry_0.optionalFabricSensitiveInt8u.HasValue()) {
+                        newElement_0.optionalFabricSensitiveInt8u =
+                            [NSNumber numberWithUnsignedChar:entry_0.optionalFabricSensitiveInt8u.Value()];
+                    } else {
+                        newElement_0.optionalFabricSensitiveInt8u = nil;
+                    }
+                    if (entry_0.nullableFabricSensitiveInt8u.IsNull()) {
+                        newElement_0.nullableFabricSensitiveInt8u = nil;
+                    } else {
+                        newElement_0.nullableFabricSensitiveInt8u =
+                            [NSNumber numberWithUnsignedChar:entry_0.nullableFabricSensitiveInt8u.Value()];
+                    }
+                    if (entry_0.nullableOptionalFabricSensitiveInt8u.HasValue()) {
+                        if (entry_0.nullableOptionalFabricSensitiveInt8u.Value().IsNull()) {
+                            newElement_0.nullableOptionalFabricSensitiveInt8u = nil;
+                        } else {
+                            newElement_0.nullableOptionalFabricSensitiveInt8u =
+                                [NSNumber numberWithUnsignedChar:entry_0.nullableOptionalFabricSensitiveInt8u.Value().Value()];
+                        }
+                    } else {
+                        newElement_0.nullableOptionalFabricSensitiveInt8u = nil;
+                    }
+                    newElement_0.fabricSensitiveCharString =
+                        [[NSString alloc] initWithBytes:entry_0.fabricSensitiveCharString.data()
+                                                 length:entry_0.fabricSensitiveCharString.size()
+                                               encoding:NSUTF8StringEncoding];
+                    newElement_0.fabricSensitiveStruct = [CHIPTestClusterClusterSimpleStruct new];
+                    newElement_0.fabricSensitiveStruct.a = [NSNumber numberWithUnsignedChar:entry_0.fabricSensitiveStruct.a];
+                    newElement_0.fabricSensitiveStruct.b = [NSNumber numberWithBool:entry_0.fabricSensitiveStruct.b];
+                    newElement_0.fabricSensitiveStruct.c =
+                        [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.fabricSensitiveStruct.c)];
+                    newElement_0.fabricSensitiveStruct.d = [NSData dataWithBytes:entry_0.fabricSensitiveStruct.d.data()
+                                                                          length:entry_0.fabricSensitiveStruct.d.size()];
+                    newElement_0.fabricSensitiveStruct.e = [[NSString alloc] initWithBytes:entry_0.fabricSensitiveStruct.e.data()
+                                                                                    length:entry_0.fabricSensitiveStruct.e.size()
+                                                                                  encoding:NSUTF8StringEncoding];
+                    newElement_0.fabricSensitiveStruct.f = [NSNumber numberWithUnsignedChar:entry_0.fabricSensitiveStruct.f.Raw()];
+                    newElement_0.fabricSensitiveStruct.g = [NSNumber numberWithFloat:entry_0.fabricSensitiveStruct.g];
+                    newElement_0.fabricSensitiveStruct.h = [NSNumber numberWithDouble:entry_0.fabricSensitiveStruct.h];
+                    { // Scope for our temporary variables
+                        auto * array_2 = [NSMutableArray new];
+                        auto iter_2 = entry_0.fabricSensitiveInt8uList.begin();
+                        while (iter_2.Next()) {
+                            auto & entry_2 = iter_2.GetValue();
+                            NSNumber * newElement_2;
+                            newElement_2 = [NSNumber numberWithUnsignedChar:entry_2];
+                            [array_2 addObject:newElement_2];
+                        }
+                        CHIP_ERROR err = iter_2.GetStatus();
+                        if (err != CHIP_NO_ERROR) {
+                            *aError = err;
+                            return nil;
+                        }
+                        newElement_0.fabricSensitiveInt8uList = array_2;
+                    }
+                    newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
                     [array_0 addObject:newElement_0];
                 }
                 CHIP_ERROR err = iter_0.GetStatus();
@@ -16485,80 +16537,52 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::TimedWriteBoolean::Id: {
+            using TypeInfo = Attributes::TimedWriteBoolean::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithBool:cppValue];
             return value;
         }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::GeneralErrorBoolean::Id: {
+            using TypeInfo = Attributes::GeneralErrorBoolean::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
+            value = [NSNumber numberWithBool:cppValue];
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::ClusterErrorBoolean::Id: {
+            using TypeInfo = Attributes::ClusterErrorBoolean::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
             NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            value = [NSNumber numberWithBool:cppValue];
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::WiFiNetworkDiagnostics::Id: {
-        using namespace Clusters::WiFiNetworkDiagnostics;
-        switch (aPath.mAttributeId) {
-        case Attributes::Bssid::Id: {
-            using TypeInfo = Attributes::Bssid::TypeInfo;
+        case Attributes::Unsupported::Id: {
+            using TypeInfo = Attributes::Unsupported::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSData * _Nullable value;
-            if (cppValue.IsNull()) {
-                value = nil;
-            } else {
-                value = [NSData dataWithBytes:cppValue.Value().data() length:cppValue.Value().size()];
-            }
+            NSNumber * _Nonnull value;
+            value = [NSNumber numberWithBool:cppValue];
             return value;
         }
-        case Attributes::SecurityType::Id: {
-            using TypeInfo = Attributes::SecurityType::TypeInfo;
+        case Attributes::NullableBoolean::Id: {
+            using TypeInfo = Attributes::NullableBoolean::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -16568,12 +16592,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (cppValue.IsNull()) {
                 value = nil;
             } else {
-                value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value())];
+                value = [NSNumber numberWithBool:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::WiFiVersion::Id: {
-            using TypeInfo = Attributes::WiFiVersion::TypeInfo;
+        case Attributes::NullableBitmap8::Id: {
+            using TypeInfo = Attributes::NullableBitmap8::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -16583,12 +16607,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (cppValue.IsNull()) {
                 value = nil;
             } else {
-                value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value())];
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value().Raw()];
             }
             return value;
         }
-        case Attributes::ChannelNumber::Id: {
-            using TypeInfo = Attributes::ChannelNumber::TypeInfo;
+        case Attributes::NullableBitmap16::Id: {
+            using TypeInfo = Attributes::NullableBitmap16::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -16598,12 +16622,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (cppValue.IsNull()) {
                 value = nil;
             } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value().Raw()];
             }
             return value;
         }
-        case Attributes::Rssi::Id: {
-            using TypeInfo = Attributes::Rssi::TypeInfo;
+        case Attributes::NullableBitmap32::Id: {
+            using TypeInfo = Attributes::NullableBitmap32::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -16613,242 +16637,162 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (cppValue.IsNull()) {
                 value = nil;
             } else {
-                value = [NSNumber numberWithChar:cppValue.Value()];
-            }
-            return value;
-        }
-        case Attributes::BeaconLostCount::Id: {
-            using TypeInfo = Attributes::BeaconLostCount::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
-            return value;
-        }
-        case Attributes::BeaconRxCount::Id: {
-            using TypeInfo = Attributes::BeaconRxCount::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+                value = [NSNumber numberWithUnsignedInt:cppValue.Value().Raw()];
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::PacketMulticastRxCount::Id: {
-            using TypeInfo = Attributes::PacketMulticastRxCount::TypeInfo;
+        case Attributes::NullableBitmap64::Id: {
+            using TypeInfo = Attributes::NullableBitmap64::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
-            return value;
-        }
-        case Attributes::PacketMulticastTxCount::Id: {
-            using TypeInfo = Attributes::PacketMulticastTxCount::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value().Raw()];
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::PacketUnicastRxCount::Id: {
-            using TypeInfo = Attributes::PacketUnicastRxCount::TypeInfo;
+        case Attributes::NullableInt8u::Id: {
+            using TypeInfo = Attributes::NullableInt8u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
-            return value;
-        }
-        case Attributes::PacketUnicastTxCount::Id: {
-            using TypeInfo = Attributes::PacketUnicastTxCount::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::CurrentMaxRate::Id: {
-            using TypeInfo = Attributes::CurrentMaxRate::TypeInfo;
+        case Attributes::NullableInt16u::Id: {
+            using TypeInfo = Attributes::NullableInt16u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedLongLong:cppValue];
-            return value;
-        }
-        case Attributes::OverrunCount::Id: {
-            using TypeInfo = Attributes::OverrunCount::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedLongLong:cppValue];
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::NullableInt24u::Id: {
+            using TypeInfo = Attributes::NullableInt24u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::NullableInt32u::Id: {
+            using TypeInfo = Attributes::NullableInt32u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedInt:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::NullableInt40u::Id: {
+            using TypeInfo = Attributes::NullableInt40u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSArray * _Nonnull value;
-            { // Scope for our temporary variables
-                auto * array_0 = [NSMutableArray new];
-                auto iter_0 = cppValue.begin();
-                while (iter_0.Next()) {
-                    auto & entry_0 = iter_0.GetValue();
-                    NSNumber * newElement_0;
-                    newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-                    [array_0 addObject:newElement_0];
-                }
-                CHIP_ERROR err = iter_0.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    *aError = err;
-                    return nil;
-                }
-                value = array_0;
-            }
-            return value;
-        }
-        case Attributes::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedInt:cppValue];
             return value;
         }
-        case Attributes::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::NullableInt48u::Id: {
+            using TypeInfo = Attributes::NullableInt48u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
+            }
             return value;
         }
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::WindowCovering::Id: {
-        using namespace Clusters::WindowCovering;
-        switch (aPath.mAttributeId) {
-        case Attributes::Type::Id: {
-            using TypeInfo = Attributes::Type::TypeInfo;
+        case Attributes::NullableInt56u::Id: {
+            using TypeInfo = Attributes::NullableInt56u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::PhysicalClosedLimitLift::Id: {
-            using TypeInfo = Attributes::PhysicalClosedLimitLift::TypeInfo;
+        case Attributes::NullableInt64u::Id: {
+            using TypeInfo = Attributes::NullableInt64u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedLongLong:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::PhysicalClosedLimitTilt::Id: {
-            using TypeInfo = Attributes::PhysicalClosedLimitTilt::TypeInfo;
+        case Attributes::NullableInt8s::Id: {
+            using TypeInfo = Attributes::NullableInt8s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithChar:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::CurrentPositionLift::Id: {
-            using TypeInfo = Attributes::CurrentPositionLift::TypeInfo;
+        case Attributes::NullableInt16s::Id: {
+            using TypeInfo = Attributes::NullableInt16s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -16858,12 +16802,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (cppValue.IsNull()) {
                 value = nil;
             } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
+                value = [NSNumber numberWithShort:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::CurrentPositionTilt::Id: {
-            using TypeInfo = Attributes::CurrentPositionTilt::TypeInfo;
+        case Attributes::NullableInt24s::Id: {
+            using TypeInfo = Attributes::NullableInt24s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -16873,45 +16817,57 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (cppValue.IsNull()) {
                 value = nil;
             } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
+                value = [NSNumber numberWithInt:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::NumberOfActuationsLift::Id: {
-            using TypeInfo = Attributes::NumberOfActuationsLift::TypeInfo;
+        case Attributes::NullableInt32s::Id: {
+            using TypeInfo = Attributes::NullableInt32s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithInt:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::NumberOfActuationsTilt::Id: {
-            using TypeInfo = Attributes::NumberOfActuationsTilt::TypeInfo;
+        case Attributes::NullableInt40s::Id: {
+            using TypeInfo = Attributes::NullableInt40s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithLongLong:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::ConfigStatus::Id: {
-            using TypeInfo = Attributes::ConfigStatus::TypeInfo;
+        case Attributes::NullableInt48s::Id: {
+            using TypeInfo = Attributes::NullableInt48s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue.Raw()];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithLongLong:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::CurrentPositionLiftPercentage::Id: {
-            using TypeInfo = Attributes::CurrentPositionLiftPercentage::TypeInfo;
+        case Attributes::NullableInt56s::Id: {
+            using TypeInfo = Attributes::NullableInt56s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -16921,12 +16877,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (cppValue.IsNull()) {
                 value = nil;
             } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+                value = [NSNumber numberWithLongLong:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::CurrentPositionTiltPercentage::Id: {
-            using TypeInfo = Attributes::CurrentPositionTiltPercentage::TypeInfo;
+        case Attributes::NullableInt64s::Id: {
+            using TypeInfo = Attributes::NullableInt64s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -16936,23 +16892,27 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (cppValue.IsNull()) {
                 value = nil;
             } else {
-                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+                value = [NSNumber numberWithLongLong:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::OperationalStatus::Id: {
-            using TypeInfo = Attributes::OperationalStatus::TypeInfo;
+        case Attributes::NullableEnum8::Id: {
+            using TypeInfo = Attributes::NullableEnum8::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue.Raw()];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::TargetPositionLiftPercent100ths::Id: {
-            using TypeInfo = Attributes::TargetPositionLiftPercent100ths::TypeInfo;
+        case Attributes::NullableEnum16::Id: {
+            using TypeInfo = Attributes::NullableEnum16::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -16966,8 +16926,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             }
             return value;
         }
-        case Attributes::TargetPositionTiltPercent100ths::Id: {
-            using TypeInfo = Attributes::TargetPositionTiltPercent100ths::TypeInfo;
+        case Attributes::NullableFloatSingle::Id: {
+            using TypeInfo = Attributes::NullableFloatSingle::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
@@ -16977,115 +16937,155 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
             if (cppValue.IsNull()) {
                 value = nil;
             } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
+                value = [NSNumber numberWithFloat:cppValue.Value()];
             }
             return value;
         }
-        case Attributes::EndProductType::Id: {
-            using TypeInfo = Attributes::EndProductType::TypeInfo;
+        case Attributes::NullableFloatDouble::Id: {
+            using TypeInfo = Attributes::NullableFloatDouble::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithDouble:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::CurrentPositionLiftPercent100ths::Id: {
-            using TypeInfo = Attributes::CurrentPositionLiftPercent100ths::TypeInfo;
+        case Attributes::NullableOctetString::Id: {
+            using TypeInfo = Attributes::NullableOctetString::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
+            NSData * _Nullable value;
             if (cppValue.IsNull()) {
                 value = nil;
             } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
+                value = [NSData dataWithBytes:cppValue.Value().data() length:cppValue.Value().size()];
             }
             return value;
         }
-        case Attributes::CurrentPositionTiltPercent100ths::Id: {
-            using TypeInfo = Attributes::CurrentPositionTiltPercent100ths::TypeInfo;
+        case Attributes::NullableCharString::Id: {
+            using TypeInfo = Attributes::NullableCharString::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nullable value;
+            NSString * _Nullable value;
             if (cppValue.IsNull()) {
                 value = nil;
             } else {
-                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
+                value = [[NSString alloc] initWithBytes:cppValue.Value().data()
+                                                 length:cppValue.Value().size()
+                                               encoding:NSUTF8StringEncoding];
             }
             return value;
         }
-        case Attributes::InstalledOpenLimitLift::Id: {
-            using TypeInfo = Attributes::InstalledOpenLimitLift::TypeInfo;
+        case Attributes::NullableEnumAttr::Id: {
+            using TypeInfo = Attributes::NullableEnumAttr::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value())];
+            }
             return value;
         }
-        case Attributes::InstalledClosedLimitLift::Id: {
-            using TypeInfo = Attributes::InstalledClosedLimitLift::TypeInfo;
+        case Attributes::NullableStruct::Id: {
+            using TypeInfo = Attributes::NullableStruct::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            CHIPTestClusterClusterSimpleStruct * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [CHIPTestClusterClusterSimpleStruct new];
+                value.a = [NSNumber numberWithUnsignedChar:cppValue.Value().a];
+                value.b = [NSNumber numberWithBool:cppValue.Value().b];
+                value.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.Value().c)];
+                value.d = [NSData dataWithBytes:cppValue.Value().d.data() length:cppValue.Value().d.size()];
+                value.e = [[NSString alloc] initWithBytes:cppValue.Value().e.data()
+                                                   length:cppValue.Value().e.size()
+                                                 encoding:NSUTF8StringEncoding];
+                value.f = [NSNumber numberWithUnsignedChar:cppValue.Value().f.Raw()];
+                value.g = [NSNumber numberWithFloat:cppValue.Value().g];
+                value.h = [NSNumber numberWithDouble:cppValue.Value().h];
+            }
             return value;
         }
-        case Attributes::InstalledOpenLimitTilt::Id: {
-            using TypeInfo = Attributes::InstalledOpenLimitTilt::TypeInfo;
+        case Attributes::NullableRangeRestrictedInt8u::Id: {
+            using TypeInfo = Attributes::NullableRangeRestrictedInt8u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::InstalledClosedLimitTilt::Id: {
-            using TypeInfo = Attributes::InstalledClosedLimitTilt::TypeInfo;
+        case Attributes::NullableRangeRestrictedInt8s::Id: {
+            using TypeInfo = Attributes::NullableRangeRestrictedInt8s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithChar:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::Mode::Id: {
-            using TypeInfo = Attributes::Mode::TypeInfo;
+        case Attributes::NullableRangeRestrictedInt16u::Id: {
+            using TypeInfo = Attributes::NullableRangeRestrictedInt16u::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedChar:cppValue.Raw()];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
+            }
             return value;
         }
-        case Attributes::SafetyStatus::Id: {
-            using TypeInfo = Attributes::SafetyStatus::TypeInfo;
+        case Attributes::NullableRangeRestrictedInt16s::Id: {
+            using TypeInfo = Attributes::NullableRangeRestrictedInt16s::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
-            NSNumber * _Nonnull value;
-            value = [NSNumber numberWithUnsignedShort:cppValue.Raw()];
+            NSNumber * _Nullable value;
+            if (cppValue.IsNull()) {
+                value = nil;
+            } else {
+                value = [NSNumber numberWithShort:cppValue.Value()];
+            }
             return value;
         }
         case Attributes::GeneratedCommandList::Id: {
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm
index a37a04bc9a29bf..2e21b43f783636 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm
@@ -733,9 +733,8 @@
     }
 }
 
-void CHIPAccessControlAclListAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::DecodableType> &
-        value)
+void CHIPIdentifyGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -743,66 +742,8 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            CHIPAccessControlClusterAccessControlEntry * newElement_0;
-            newElement_0 = [CHIPAccessControlClusterAccessControlEntry new];
-            newElement_0.privilege = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.privilege)];
-            newElement_0.authMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.authMode)];
-            if (entry_0.subjects.IsNull()) {
-                newElement_0.subjects = nil;
-            } else {
-                { // Scope for our temporary variables
-                    auto * array_3 = [NSMutableArray new];
-                    auto iter_3 = entry_0.subjects.Value().begin();
-                    while (iter_3.Next()) {
-                        auto & entry_3 = iter_3.GetValue();
-                        NSNumber * newElement_3;
-                        newElement_3 = [NSNumber numberWithUnsignedLongLong:entry_3];
-                        [array_3 addObject:newElement_3];
-                    }
-                    CHIP_ERROR err = iter_3.GetStatus();
-                    if (err != CHIP_NO_ERROR) {
-                        OnFailureFn(context, err);
-                        return;
-                    }
-                    newElement_0.subjects = array_3;
-                }
-            }
-            if (entry_0.targets.IsNull()) {
-                newElement_0.targets = nil;
-            } else {
-                { // Scope for our temporary variables
-                    auto * array_3 = [NSMutableArray new];
-                    auto iter_3 = entry_0.targets.Value().begin();
-                    while (iter_3.Next()) {
-                        auto & entry_3 = iter_3.GetValue();
-                        CHIPAccessControlClusterTarget * newElement_3;
-                        newElement_3 = [CHIPAccessControlClusterTarget new];
-                        if (entry_3.cluster.IsNull()) {
-                            newElement_3.cluster = nil;
-                        } else {
-                            newElement_3.cluster = [NSNumber numberWithUnsignedInt:entry_3.cluster.Value()];
-                        }
-                        if (entry_3.endpoint.IsNull()) {
-                            newElement_3.endpoint = nil;
-                        } else {
-                            newElement_3.endpoint = [NSNumber numberWithUnsignedShort:entry_3.endpoint.Value()];
-                        }
-                        if (entry_3.deviceType.IsNull()) {
-                            newElement_3.deviceType = nil;
-                        } else {
-                            newElement_3.deviceType = [NSNumber numberWithUnsignedInt:entry_3.deviceType.Value()];
-                        }
-                        [array_3 addObject:newElement_3];
-                    }
-                    CHIP_ERROR err = iter_3.GetStatus();
-                    if (err != CHIP_NO_ERROR) {
-                        OnFailureFn(context, err);
-                        return;
-                    }
-                    newElement_0.targets = array_3;
-                }
-            }
-            newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -815,9 +756,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPAccessControlAclListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPIdentifyGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPAccessControlAclListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPIdentifyGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -831,8 +772,8 @@
     }
 }
 
-void CHIPAccessControlExtensionListAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::ExtensionEntry::DecodableType> & value)
+void CHIPIdentifyAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -840,10 +781,8 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            CHIPAccessControlClusterExtensionEntry * newElement_0;
-            newElement_0 = [CHIPAccessControlClusterExtensionEntry new];
-            newElement_0.data = [NSData dataWithBytes:entry_0.data.data() length:entry_0.data.size()];
-            newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -856,9 +795,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPAccessControlExtensionListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPIdentifyAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPAccessControlExtensionListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPIdentifyAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -872,7 +811,46 @@
     }
 }
 
-void CHIPAccessControlGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPIdentifyAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+{
+    NSArray * _Nonnull objCValue;
+    { // Scope for our temporary variables
+        auto * array_0 = [NSMutableArray new];
+        auto iter_0 = value.begin();
+        while (iter_0.Next()) {
+            auto & entry_0 = iter_0.GetValue();
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            [array_0 addObject:newElement_0];
+        }
+        CHIP_ERROR err = iter_0.GetStatus();
+        if (err != CHIP_NO_ERROR) {
+            OnFailureFn(context, err);
+            return;
+        }
+        objCValue = array_0;
+    }
+    DispatchSuccess(context, objCValue);
+};
+
+void CHIPIdentifyAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+{
+    auto * self = static_cast<CHIPIdentifyAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    if (!self->mQueue) {
+        return;
+    }
+
+    if (self->mEstablishedHandler != nil) {
+        dispatch_async(self->mQueue, self->mEstablishedHandler);
+        // On failure, mEstablishedHandler will be cleaned up by our destructor,
+        // but we can clean it up earlier on successful subscription
+        // establishment.
+        self->mEstablishedHandler = nil;
+    }
+}
+
+void CHIPGroupsGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -895,9 +873,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPAccessControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPGroupsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPAccessControlGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPGroupsGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -911,7 +889,7 @@
     }
 }
 
-void CHIPAccessControlAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPGroupsAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -934,9 +912,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPAccessControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPGroupsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPAccessControlAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPGroupsAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -950,7 +928,7 @@
     }
 }
 
-void CHIPAccessControlAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPGroupsAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -973,9 +951,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPAccessControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPGroupsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPAccessControlAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPGroupsAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -989,7 +967,7 @@
     }
 }
 
-void CHIPAccountLoginGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPScenesGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -1012,9 +990,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPAccountLoginGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPScenesGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPAccountLoginGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPScenesGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -1028,7 +1006,7 @@
     }
 }
 
-void CHIPAccountLoginAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPScenesAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -1051,9 +1029,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPAccountLoginAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPScenesAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPAccountLoginAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPScenesAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -1067,7 +1045,7 @@
     }
 }
 
-void CHIPAccountLoginAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPScenesAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -1090,9 +1068,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPAccountLoginAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPScenesAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPAccountLoginAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPScenesAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -1106,7 +1084,7 @@
     }
 }
 
-void CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPOnOffGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -1129,10 +1107,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPOnOffGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPOnOffGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -1146,7 +1123,7 @@
     }
 }
 
-void CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPOnOffAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -1169,10 +1146,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPOnOffAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPOnOffAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -1186,7 +1162,7 @@
     }
 }
 
-void CHIPAdministratorCommissioningAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPOnOffAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -1209,9 +1185,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPAdministratorCommissioningAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPOnOffAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPAdministratorCommissioningAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPOnOffAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -1225,21 +1201,33 @@
     }
 }
 
-void CHIPApplicationBasicApplicationStructAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::DecodableType & value)
+void CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
-    CHIPApplicationBasicClusterApplicationBasicApplication * _Nonnull objCValue;
-    objCValue = [CHIPApplicationBasicClusterApplicationBasicApplication new];
-    objCValue.catalogVendorId = [NSNumber numberWithUnsignedShort:value.catalogVendorId];
-    objCValue.applicationId = [[NSString alloc] initWithBytes:value.applicationId.data()
-                                                       length:value.applicationId.size()
-                                                     encoding:NSUTF8StringEncoding];
+    NSArray * _Nonnull objCValue;
+    { // Scope for our temporary variables
+        auto * array_0 = [NSMutableArray new];
+        auto iter_0 = value.begin();
+        while (iter_0.Next()) {
+            auto & entry_0 = iter_0.GetValue();
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            [array_0 addObject:newElement_0];
+        }
+        CHIP_ERROR err = iter_0.GetStatus();
+        if (err != CHIP_NO_ERROR) {
+            OnFailureFn(context, err);
+            return;
+        }
+        objCValue = array_0;
+    }
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPApplicationBasicApplicationStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPApplicationBasicApplicationStructAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -1253,8 +1241,8 @@
     }
 }
 
-void CHIPApplicationBasicAllowedVendorListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::VendorId> & value)
+void CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -1263,7 +1251,7 @@
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
             NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_0)];
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -1276,9 +1264,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPApplicationBasicAllowedVendorListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPApplicationBasicAllowedVendorListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -1292,8 +1281,8 @@
     }
 }
 
-void CHIPApplicationBasicGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -1315,9 +1304,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPApplicationBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPApplicationBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -1331,7 +1320,7 @@
     }
 }
 
-void CHIPApplicationBasicAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPLevelControlGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -1354,9 +1343,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPApplicationBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPLevelControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPApplicationBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPLevelControlGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -1370,8 +1359,8 @@
     }
 }
 
-void CHIPApplicationBasicAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPLevelControlAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -1393,9 +1382,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPApplicationBasicAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPLevelControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPApplicationBasicAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPLevelControlAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -1409,8 +1398,8 @@
     }
 }
 
-void CHIPApplicationLauncherCatalogListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<uint16_t> & value)
+void CHIPLevelControlAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -1419,7 +1408,7 @@
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
             NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedShort:entry_0];
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -1432,9 +1421,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPApplicationLauncherCatalogListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPLevelControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPApplicationLauncherCatalogListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPLevelControlAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -1448,45 +1437,7 @@
     }
 }
 
-void CHIPApplicationLauncherCurrentAppStructAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::DecodableType> & value)
-{
-    CHIPApplicationLauncherClusterApplicationEP * _Nullable objCValue;
-    if (value.IsNull()) {
-        objCValue = nil;
-    } else {
-        objCValue = [CHIPApplicationLauncherClusterApplicationEP new];
-        objCValue.application = [CHIPApplicationLauncherClusterApplication new];
-        objCValue.application.catalogVendorId = [NSNumber numberWithUnsignedShort:value.Value().application.catalogVendorId];
-        objCValue.application.applicationId = [[NSString alloc] initWithBytes:value.Value().application.applicationId.data()
-                                                                       length:value.Value().application.applicationId.size()
-                                                                     encoding:NSUTF8StringEncoding];
-        if (value.Value().endpoint.HasValue()) {
-            objCValue.endpoint = [NSNumber numberWithUnsignedShort:value.Value().endpoint.Value()];
-        } else {
-            objCValue.endpoint = nil;
-        }
-    }
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPApplicationLauncherCurrentAppStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPApplicationLauncherCurrentAppStructAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -1509,9 +1460,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -1525,7 +1476,7 @@
     }
 }
 
-void CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -1548,9 +1499,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -1564,7 +1515,7 @@
     }
 }
 
-void CHIPApplicationLauncherAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPBinaryInputBasicAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -1587,9 +1538,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPApplicationLauncherAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPBinaryInputBasicAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPApplicationLauncherAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPBinaryInputBasicAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -1603,8 +1554,8 @@
     }
 }
 
-void CHIPAudioOutputOutputListListAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::OutputInfo::DecodableType> & value)
+void CHIPDescriptorDeviceListListAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::DeviceType::DecodableType> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -1612,13 +1563,10 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            CHIPAudioOutputClusterOutputInfo * newElement_0;
-            newElement_0 = [CHIPAudioOutputClusterOutputInfo new];
-            newElement_0.index = [NSNumber numberWithUnsignedChar:entry_0.index];
-            newElement_0.outputType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.outputType)];
-            newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data()
-                                                         length:entry_0.name.size()
-                                                       encoding:NSUTF8StringEncoding];
+            CHIPDescriptorClusterDeviceType * newElement_0;
+            newElement_0 = [CHIPDescriptorClusterDeviceType new];
+            newElement_0.type = [NSNumber numberWithUnsignedInt:entry_0.type];
+            newElement_0.revision = [NSNumber numberWithUnsignedShort:entry_0.revision];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -1631,9 +1579,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPAudioOutputOutputListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPDescriptorDeviceListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPAudioOutputOutputListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPDescriptorDeviceListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -1647,8 +1595,8 @@
     }
 }
 
-void CHIPAudioOutputGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPDescriptorServerListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::ClusterId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -1670,9 +1618,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPAudioOutputGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPDescriptorServerListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPAudioOutputGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPDescriptorServerListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -1686,8 +1634,8 @@
     }
 }
 
-void CHIPAudioOutputAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPDescriptorClientListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::ClusterId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -1709,9 +1657,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPAudioOutputAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPDescriptorClientListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPAudioOutputAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPDescriptorClientListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -1725,8 +1673,8 @@
     }
 }
 
-void CHIPAudioOutputAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPDescriptorPartsListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::EndpointId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -1735,7 +1683,7 @@
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
             NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            newElement_0 = [NSNumber numberWithUnsignedShort:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -1748,9 +1696,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPAudioOutputAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPDescriptorPartsListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPAudioOutputAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPDescriptorPartsListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -1764,7 +1712,7 @@
     }
 }
 
-void CHIPBarrierControlGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPDescriptorGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -1787,9 +1735,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPBarrierControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPDescriptorGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPBarrierControlGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPDescriptorGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -1803,7 +1751,7 @@
     }
 }
 
-void CHIPBarrierControlAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPDescriptorAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -1826,9 +1774,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPBarrierControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPDescriptorAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPBarrierControlAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPDescriptorAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -1842,7 +1790,7 @@
     }
 }
 
-void CHIPBarrierControlAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPDescriptorAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -1865,35 +1813,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPBarrierControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPBarrierControlAttributeListListAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPBasicCapabilityMinimaStructAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::Basic::Structs::CapabilityMinimaStruct::DecodableType & value)
-{
-    CHIPBasicClusterCapabilityMinimaStruct * _Nonnull objCValue;
-    objCValue = [CHIPBasicClusterCapabilityMinimaStruct new];
-    objCValue.caseSessionsPerFabric = [NSNumber numberWithUnsignedShort:value.caseSessionsPerFabric];
-    objCValue.subscriptionsPerFabric = [NSNumber numberWithUnsignedShort:value.subscriptionsPerFabric];
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPBasicCapabilityMinimaStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPDescriptorAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPBasicCapabilityMinimaStructAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPDescriptorAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -1907,8 +1829,8 @@
     }
 }
 
-void CHIPBasicGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPBindingBindingListAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::Binding::Structs::TargetStruct::DecodableType> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -1916,8 +1838,29 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            CHIPBindingClusterTargetStruct * newElement_0;
+            newElement_0 = [CHIPBindingClusterTargetStruct new];
+            if (entry_0.node.HasValue()) {
+                newElement_0.node = [NSNumber numberWithUnsignedLongLong:entry_0.node.Value()];
+            } else {
+                newElement_0.node = nil;
+            }
+            if (entry_0.group.HasValue()) {
+                newElement_0.group = [NSNumber numberWithUnsignedShort:entry_0.group.Value()];
+            } else {
+                newElement_0.group = nil;
+            }
+            if (entry_0.endpoint.HasValue()) {
+                newElement_0.endpoint = [NSNumber numberWithUnsignedShort:entry_0.endpoint.Value()];
+            } else {
+                newElement_0.endpoint = nil;
+            }
+            if (entry_0.cluster.HasValue()) {
+                newElement_0.cluster = [NSNumber numberWithUnsignedInt:entry_0.cluster.Value()];
+            } else {
+                newElement_0.cluster = nil;
+            }
+            newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -1930,9 +1873,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPBindingBindingListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPBindingBindingListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -1946,7 +1889,7 @@
     }
 }
 
-void CHIPBasicAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPBindingGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -1969,48 +1912,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPBasicAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
-{
-    NSArray * _Nonnull objCValue;
-    { // Scope for our temporary variables
-        auto * array_0 = [NSMutableArray new];
-        auto iter_0 = value.begin();
-        while (iter_0.Next()) {
-            auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-            [array_0 addObject:newElement_0];
-        }
-        CHIP_ERROR err = iter_0.GetStatus();
-        if (err != CHIP_NO_ERROR) {
-            OnFailureFn(context, err);
-            return;
-        }
-        objCValue = array_0;
-    }
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPBasicAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPBindingGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPBasicAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPBindingGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -2024,7 +1928,7 @@
     }
 }
 
-void CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPBindingAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -2047,9 +1951,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPBindingAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPBindingAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -2063,8 +1967,8 @@
     }
 }
 
-void CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPBindingAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -2086,9 +1990,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPBindingAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPBindingAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -2102,8 +2006,9 @@
     }
 }
 
-void CHIPBinaryInputBasicAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPAccessControlAclListAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::DecodableType> &
+        value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -2111,66 +2016,64 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-            [array_0 addObject:newElement_0];
-        }
-        CHIP_ERROR err = iter_0.GetStatus();
-        if (err != CHIP_NO_ERROR) {
-            OnFailureFn(context, err);
-            return;
-        }
-        objCValue = array_0;
-    }
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPBinaryInputBasicAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPBinaryInputBasicAttributeListListAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPBindingBindingListAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::Binding::Structs::TargetStruct::DecodableType> & value)
-{
-    NSArray * _Nonnull objCValue;
-    { // Scope for our temporary variables
-        auto * array_0 = [NSMutableArray new];
-        auto iter_0 = value.begin();
-        while (iter_0.Next()) {
-            auto & entry_0 = iter_0.GetValue();
-            CHIPBindingClusterTargetStruct * newElement_0;
-            newElement_0 = [CHIPBindingClusterTargetStruct new];
-            if (entry_0.node.HasValue()) {
-                newElement_0.node = [NSNumber numberWithUnsignedLongLong:entry_0.node.Value()];
-            } else {
-                newElement_0.node = nil;
-            }
-            if (entry_0.group.HasValue()) {
-                newElement_0.group = [NSNumber numberWithUnsignedShort:entry_0.group.Value()];
-            } else {
-                newElement_0.group = nil;
-            }
-            if (entry_0.endpoint.HasValue()) {
-                newElement_0.endpoint = [NSNumber numberWithUnsignedShort:entry_0.endpoint.Value()];
+            CHIPAccessControlClusterAccessControlEntry * newElement_0;
+            newElement_0 = [CHIPAccessControlClusterAccessControlEntry new];
+            newElement_0.privilege = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.privilege)];
+            newElement_0.authMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.authMode)];
+            if (entry_0.subjects.IsNull()) {
+                newElement_0.subjects = nil;
             } else {
-                newElement_0.endpoint = nil;
+                { // Scope for our temporary variables
+                    auto * array_3 = [NSMutableArray new];
+                    auto iter_3 = entry_0.subjects.Value().begin();
+                    while (iter_3.Next()) {
+                        auto & entry_3 = iter_3.GetValue();
+                        NSNumber * newElement_3;
+                        newElement_3 = [NSNumber numberWithUnsignedLongLong:entry_3];
+                        [array_3 addObject:newElement_3];
+                    }
+                    CHIP_ERROR err = iter_3.GetStatus();
+                    if (err != CHIP_NO_ERROR) {
+                        OnFailureFn(context, err);
+                        return;
+                    }
+                    newElement_0.subjects = array_3;
+                }
             }
-            if (entry_0.cluster.HasValue()) {
-                newElement_0.cluster = [NSNumber numberWithUnsignedInt:entry_0.cluster.Value()];
+            if (entry_0.targets.IsNull()) {
+                newElement_0.targets = nil;
             } else {
-                newElement_0.cluster = nil;
+                { // Scope for our temporary variables
+                    auto * array_3 = [NSMutableArray new];
+                    auto iter_3 = entry_0.targets.Value().begin();
+                    while (iter_3.Next()) {
+                        auto & entry_3 = iter_3.GetValue();
+                        CHIPAccessControlClusterTarget * newElement_3;
+                        newElement_3 = [CHIPAccessControlClusterTarget new];
+                        if (entry_3.cluster.IsNull()) {
+                            newElement_3.cluster = nil;
+                        } else {
+                            newElement_3.cluster = [NSNumber numberWithUnsignedInt:entry_3.cluster.Value()];
+                        }
+                        if (entry_3.endpoint.IsNull()) {
+                            newElement_3.endpoint = nil;
+                        } else {
+                            newElement_3.endpoint = [NSNumber numberWithUnsignedShort:entry_3.endpoint.Value()];
+                        }
+                        if (entry_3.deviceType.IsNull()) {
+                            newElement_3.deviceType = nil;
+                        } else {
+                            newElement_3.deviceType = [NSNumber numberWithUnsignedInt:entry_3.deviceType.Value()];
+                        }
+                        [array_3 addObject:newElement_3];
+                    }
+                    CHIP_ERROR err = iter_3.GetStatus();
+                    if (err != CHIP_NO_ERROR) {
+                        OnFailureFn(context, err);
+                        return;
+                    }
+                    newElement_0.targets = array_3;
+                }
             }
             newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
             [array_0 addObject:newElement_0];
@@ -2185,87 +2088,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPBindingBindingListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPBindingBindingListAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPBindingGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
-{
-    NSArray * _Nonnull objCValue;
-    { // Scope for our temporary variables
-        auto * array_0 = [NSMutableArray new];
-        auto iter_0 = value.begin();
-        while (iter_0.Next()) {
-            auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-            [array_0 addObject:newElement_0];
-        }
-        CHIP_ERROR err = iter_0.GetStatus();
-        if (err != CHIP_NO_ERROR) {
-            OnFailureFn(context, err);
-            return;
-        }
-        objCValue = array_0;
-    }
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPBindingGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPBindingGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPBindingAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
-{
-    NSArray * _Nonnull objCValue;
-    { // Scope for our temporary variables
-        auto * array_0 = [NSMutableArray new];
-        auto iter_0 = value.begin();
-        while (iter_0.Next()) {
-            auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-            [array_0 addObject:newElement_0];
-        }
-        CHIP_ERROR err = iter_0.GetStatus();
-        if (err != CHIP_NO_ERROR) {
-            OnFailureFn(context, err);
-            return;
-        }
-        objCValue = array_0;
-    }
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPBindingAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPAccessControlAclListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPBindingAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPAccessControlAclListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -2279,8 +2104,8 @@
     }
 }
 
-void CHIPBindingAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPAccessControlExtensionListAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::ExtensionEntry::DecodableType> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -2288,8 +2113,10 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            CHIPAccessControlClusterExtensionEntry * newElement_0;
+            newElement_0 = [CHIPAccessControlClusterExtensionEntry new];
+            newElement_0.data = [NSData dataWithBytes:entry_0.data.data() length:entry_0.data.size()];
+            newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -2302,9 +2129,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPBindingAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPAccessControlExtensionListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPBindingAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPAccessControlExtensionListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -2318,7 +2145,7 @@
     }
 }
 
-void CHIPBooleanStateGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPAccessControlGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -2341,9 +2168,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPBooleanStateGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPAccessControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPBooleanStateGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPAccessControlGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -2357,7 +2184,7 @@
     }
 }
 
-void CHIPBooleanStateAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPAccessControlAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -2380,9 +2207,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPBooleanStateAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPAccessControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPBooleanStateAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPAccessControlAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -2396,7 +2223,7 @@
     }
 }
 
-void CHIPBooleanStateAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPAccessControlAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -2419,9 +2246,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPBooleanStateAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPAccessControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPBooleanStateAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPAccessControlAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -2660,7 +2487,33 @@
     }
 }
 
-void CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPBasicCapabilityMinimaStructAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::Basic::Structs::CapabilityMinimaStruct::DecodableType & value)
+{
+    CHIPBasicClusterCapabilityMinimaStruct * _Nonnull objCValue;
+    objCValue = [CHIPBasicClusterCapabilityMinimaStruct new];
+    objCValue.caseSessionsPerFabric = [NSNumber numberWithUnsignedShort:value.caseSessionsPerFabric];
+    objCValue.subscriptionsPerFabric = [NSNumber numberWithUnsignedShort:value.subscriptionsPerFabric];
+    DispatchSuccess(context, objCValue);
+};
+
+void CHIPBasicCapabilityMinimaStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+{
+    auto * self = static_cast<CHIPBasicCapabilityMinimaStructAttributeCallbackSubscriptionBridge *>(context);
+    if (!self->mQueue) {
+        return;
+    }
+
+    if (self->mEstablishedHandler != nil) {
+        dispatch_async(self->mQueue, self->mEstablishedHandler);
+        // On failure, mEstablishedHandler will be cleaned up by our destructor,
+        // but we can clean it up earlier on successful subscription
+        // establishment.
+        self->mEstablishedHandler = nil;
+    }
+}
+
+void CHIPBasicGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -2683,9 +2536,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -2699,7 +2552,7 @@
     }
 }
 
-void CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPBasicAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -2722,9 +2575,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -2738,7 +2591,7 @@
     }
 }
 
-void CHIPBridgedDeviceBasicAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPBasicAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -2761,9 +2614,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPBridgedDeviceBasicAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPBasicAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPBridgedDeviceBasicAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPBasicAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -2777,8 +2630,8 @@
     }
 }
 
-void CHIPChannelChannelListListAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> & value)
+void CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -2786,31 +2639,8 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            CHIPChannelClusterChannelInfo * newElement_0;
-            newElement_0 = [CHIPChannelClusterChannelInfo new];
-            newElement_0.majorNumber = [NSNumber numberWithUnsignedShort:entry_0.majorNumber];
-            newElement_0.minorNumber = [NSNumber numberWithUnsignedShort:entry_0.minorNumber];
-            if (entry_0.name.HasValue()) {
-                newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.Value().data()
-                                                             length:entry_0.name.Value().size()
-                                                           encoding:NSUTF8StringEncoding];
-            } else {
-                newElement_0.name = nil;
-            }
-            if (entry_0.callSign.HasValue()) {
-                newElement_0.callSign = [[NSString alloc] initWithBytes:entry_0.callSign.Value().data()
-                                                                 length:entry_0.callSign.Value().size()
-                                                               encoding:NSUTF8StringEncoding];
-            } else {
-                newElement_0.callSign = nil;
-            }
-            if (entry_0.affiliateCallSign.HasValue()) {
-                newElement_0.affiliateCallSign = [[NSString alloc] initWithBytes:entry_0.affiliateCallSign.Value().data()
-                                                                          length:entry_0.affiliateCallSign.Value().size()
-                                                                        encoding:NSUTF8StringEncoding];
-            } else {
-                newElement_0.affiliateCallSign = nil;
-            }
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -2823,106 +2653,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPChannelChannelListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPChannelChannelListListAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPChannelLineupStructAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::LineupInfo::DecodableType> & value)
-{
-    CHIPChannelClusterLineupInfo * _Nullable objCValue;
-    if (value.IsNull()) {
-        objCValue = nil;
-    } else {
-        objCValue = [CHIPChannelClusterLineupInfo new];
-        objCValue.operatorName = [[NSString alloc] initWithBytes:value.Value().operatorName.data()
-                                                          length:value.Value().operatorName.size()
-                                                        encoding:NSUTF8StringEncoding];
-        if (value.Value().lineupName.HasValue()) {
-            objCValue.lineupName = [[NSString alloc] initWithBytes:value.Value().lineupName.Value().data()
-                                                            length:value.Value().lineupName.Value().size()
-                                                          encoding:NSUTF8StringEncoding];
-        } else {
-            objCValue.lineupName = nil;
-        }
-        if (value.Value().postalCode.HasValue()) {
-            objCValue.postalCode = [[NSString alloc] initWithBytes:value.Value().postalCode.Value().data()
-                                                            length:value.Value().postalCode.Value().size()
-                                                          encoding:NSUTF8StringEncoding];
-        } else {
-            objCValue.postalCode = nil;
-        }
-        objCValue.lineupInfoType = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value().lineupInfoType)];
-    }
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPChannelLineupStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPChannelLineupStructAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPChannelCurrentChannelStructAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> & value)
-{
-    CHIPChannelClusterChannelInfo * _Nullable objCValue;
-    if (value.IsNull()) {
-        objCValue = nil;
-    } else {
-        objCValue = [CHIPChannelClusterChannelInfo new];
-        objCValue.majorNumber = [NSNumber numberWithUnsignedShort:value.Value().majorNumber];
-        objCValue.minorNumber = [NSNumber numberWithUnsignedShort:value.Value().minorNumber];
-        if (value.Value().name.HasValue()) {
-            objCValue.name = [[NSString alloc] initWithBytes:value.Value().name.Value().data()
-                                                      length:value.Value().name.Value().size()
-                                                    encoding:NSUTF8StringEncoding];
-        } else {
-            objCValue.name = nil;
-        }
-        if (value.Value().callSign.HasValue()) {
-            objCValue.callSign = [[NSString alloc] initWithBytes:value.Value().callSign.Value().data()
-                                                          length:value.Value().callSign.Value().size()
-                                                        encoding:NSUTF8StringEncoding];
-        } else {
-            objCValue.callSign = nil;
-        }
-        if (value.Value().affiliateCallSign.HasValue()) {
-            objCValue.affiliateCallSign = [[NSString alloc] initWithBytes:value.Value().affiliateCallSign.Value().data()
-                                                                   length:value.Value().affiliateCallSign.Value().size()
-                                                                 encoding:NSUTF8StringEncoding];
-        } else {
-            objCValue.affiliateCallSign = nil;
-        }
-    }
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPChannelCurrentChannelStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPChannelCurrentChannelStructAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -2936,7 +2670,7 @@
     }
 }
 
-void CHIPChannelGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -2959,9 +2693,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPChannelGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPChannelGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -2975,8 +2710,8 @@
     }
 }
 
-void CHIPChannelAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -2998,9 +2733,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPChannelAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPChannelAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3014,8 +2749,9 @@
     }
 }
 
-void CHIPChannelAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -3023,8 +2759,11 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            CHIPOtaSoftwareUpdateRequestorClusterProviderLocation * newElement_0;
+            newElement_0 = [CHIPOtaSoftwareUpdateRequestorClusterProviderLocation new];
+            newElement_0.providerNodeID = [NSNumber numberWithUnsignedLongLong:entry_0.providerNodeID];
+            newElement_0.endpoint = [NSNumber numberWithUnsignedShort:entry_0.endpoint];
+            newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -3037,9 +2776,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPChannelAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPChannelAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3053,7 +2793,7 @@
     }
 }
 
-void CHIPColorControlGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -3076,9 +2816,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPColorControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPColorControlGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3092,7 +2833,7 @@
     }
 }
 
-void CHIPColorControlAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -3115,9 +2856,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPColorControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPColorControlAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3131,7 +2873,7 @@
     }
 }
 
-void CHIPColorControlAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -3154,9 +2896,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPColorControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPColorControlAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3170,7 +2912,7 @@
     }
 }
 
-void CHIPContentLauncherAcceptHeaderListAttributeCallbackBridge::OnSuccessFn(
+void CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CharSpan> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -3193,9 +2935,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPContentLauncherAcceptHeaderListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPContentLauncherAcceptHeaderListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3209,7 +2951,7 @@
     }
 }
 
-void CHIPContentLauncherGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -3232,9 +2974,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPContentLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPContentLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3248,7 +2991,7 @@
     }
 }
 
-void CHIPContentLauncherAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -3271,9 +3014,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPContentLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPContentLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3287,7 +3031,7 @@
     }
 }
 
-void CHIPContentLauncherAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPLocalizationConfigurationAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -3310,9 +3054,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPContentLauncherAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPLocalizationConfigurationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPContentLauncherAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPLocalizationConfigurationAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3326,8 +3070,8 @@
     }
 }
 
-void CHIPDescriptorDeviceListListAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::DeviceType::DecodableType> & value)
+void CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::TimeFormatLocalization::CalendarType> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -3335,10 +3079,8 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            CHIPDescriptorClusterDeviceType * newElement_0;
-            newElement_0 = [CHIPDescriptorClusterDeviceType new];
-            newElement_0.type = [NSNumber numberWithUnsignedInt:entry_0.type];
-            newElement_0.revision = [NSNumber numberWithUnsignedShort:entry_0.revision];
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -3351,9 +3093,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPDescriptorDeviceListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPDescriptorDeviceListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3367,8 +3110,8 @@
     }
 }
 
-void CHIPDescriptorServerListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::ClusterId> & value)
+void CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -3390,9 +3133,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPDescriptorServerListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPDescriptorServerListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3406,8 +3150,8 @@
     }
 }
 
-void CHIPDescriptorClientListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::ClusterId> & value)
+void CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -3429,9 +3173,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPDescriptorClientListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPDescriptorClientListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3445,8 +3189,8 @@
     }
 }
 
-void CHIPDescriptorPartsListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::EndpointId> & value)
+void CHIPTimeFormatLocalizationAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -3455,7 +3199,7 @@
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
             NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedShort:entry_0];
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -3468,9 +3212,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPDescriptorPartsListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPTimeFormatLocalizationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPDescriptorPartsListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPTimeFormatLocalizationAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3484,7 +3228,7 @@
     }
 }
 
-void CHIPDescriptorGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -3507,9 +3251,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPDescriptorGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPDescriptorGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3523,7 +3267,7 @@
     }
 }
 
-void CHIPDescriptorAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -3546,9 +3290,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPDescriptorAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPDescriptorAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3562,7 +3306,7 @@
     }
 }
 
-void CHIPDescriptorAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPUnitLocalizationAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -3585,9 +3329,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPDescriptorAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPUnitLocalizationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPDescriptorAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPUnitLocalizationAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3601,8 +3345,8 @@
     }
 }
 
-void CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPPowerSourceConfigurationSourcesListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<uint8_t> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -3611,7 +3355,7 @@
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
             NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -3624,9 +3368,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPPowerSourceConfigurationSourcesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPPowerSourceConfigurationSourcesListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3640,7 +3384,7 @@
     }
 }
 
-void CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -3663,9 +3407,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3679,8 +3424,8 @@
     }
 }
 
-void CHIPDiagnosticLogsAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -3702,9 +3447,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPDiagnosticLogsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPDiagnosticLogsAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3718,17 +3464,32 @@
     }
 }
 
-void CHIPDoorLockCredentialRulesSupportAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask> value)
+void CHIPPowerSourceConfigurationAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedChar:value.Raw()];
+    NSArray * _Nonnull objCValue;
+    { // Scope for our temporary variables
+        auto * array_0 = [NSMutableArray new];
+        auto iter_0 = value.begin();
+        while (iter_0.Next()) {
+            auto & entry_0 = iter_0.GetValue();
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            [array_0 addObject:newElement_0];
+        }
+        CHIP_ERROR err = iter_0.GetStatus();
+        if (err != CHIP_NO_ERROR) {
+            OnFailureFn(context, err);
+            return;
+        }
+        objCValue = array_0;
+    }
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPDoorLockCredentialRulesSupportAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPPowerSourceConfigurationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPDoorLockCredentialRulesSupportAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPPowerSourceConfigurationAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3742,17 +3503,32 @@
     }
 }
 
-void CHIPDoorLockSupportedOperatingModesAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes> value)
+void CHIPPowerSourceActiveWiredFaultsListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<uint8_t> & value)
 {
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedShort:value.Raw()];
+    NSArray * _Nonnull objCValue;
+    { // Scope for our temporary variables
+        auto * array_0 = [NSMutableArray new];
+        auto iter_0 = value.begin();
+        while (iter_0.Next()) {
+            auto & entry_0 = iter_0.GetValue();
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
+            [array_0 addObject:newElement_0];
+        }
+        CHIP_ERROR err = iter_0.GetStatus();
+        if (err != CHIP_NO_ERROR) {
+            OnFailureFn(context, err);
+            return;
+        }
+        objCValue = array_0;
+    }
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPDoorLockSupportedOperatingModesAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPPowerSourceActiveWiredFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPDoorLockSupportedOperatingModesAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPPowerSourceActiveWiredFaultsListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3766,17 +3542,32 @@
     }
 }
 
-void CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister> value)
+void CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<uint8_t> & value)
 {
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedShort:value.Raw()];
+    NSArray * _Nonnull objCValue;
+    { // Scope for our temporary variables
+        auto * array_0 = [NSMutableArray new];
+        auto iter_0 = value.begin();
+        while (iter_0.Next()) {
+            auto & entry_0 = iter_0.GetValue();
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
+            [array_0 addObject:newElement_0];
+        }
+        CHIP_ERROR err = iter_0.GetStatus();
+        if (err != CHIP_NO_ERROR) {
+            OnFailureFn(context, err);
+            return;
+        }
+        objCValue = array_0;
+    }
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3790,17 +3581,32 @@
     }
 }
 
-void CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> value)
+void CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<uint8_t> & value)
 {
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedChar:value.Raw()];
+    NSArray * _Nonnull objCValue;
+    { // Scope for our temporary variables
+        auto * array_0 = [NSMutableArray new];
+        auto iter_0 = value.begin();
+        while (iter_0.Next()) {
+            auto & entry_0 = iter_0.GetValue();
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
+            [array_0 addObject:newElement_0];
+        }
+        CHIP_ERROR err = iter_0.GetStatus();
+        if (err != CHIP_NO_ERROR) {
+            OnFailureFn(context, err);
+            return;
+        }
+        objCValue = array_0;
+    }
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3814,7 +3620,7 @@
     }
 }
 
-void CHIPDoorLockGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPPowerSourceGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -3837,9 +3643,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPDoorLockGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPPowerSourceGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPDoorLockGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPPowerSourceGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3853,7 +3659,7 @@
     }
 }
 
-void CHIPDoorLockAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPPowerSourceAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -3876,9 +3682,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPDoorLockAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPPowerSourceAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPDoorLockAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPPowerSourceAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3892,7 +3698,7 @@
     }
 }
 
-void CHIPDoorLockAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPPowerSourceAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -3915,9 +3721,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPDoorLockAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPPowerSourceAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPDoorLockAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPPowerSourceAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3931,7 +3737,34 @@
     }
 }
 
-void CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::GeneralCommissioning::Structs::BasicCommissioningInfo::DecodableType & value)
+{
+    CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nonnull objCValue;
+    objCValue = [CHIPGeneralCommissioningClusterBasicCommissioningInfo new];
+    objCValue.failSafeExpiryLengthSeconds = [NSNumber numberWithUnsignedShort:value.failSafeExpiryLengthSeconds];
+    objCValue.maxCumulativeFailsafeSeconds = [NSNumber numberWithUnsignedShort:value.maxCumulativeFailsafeSeconds];
+    DispatchSuccess(context, objCValue);
+};
+
+void CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
+{
+    auto * self = static_cast<CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackSubscriptionBridge *>(context);
+    if (!self->mQueue) {
+        return;
+    }
+
+    if (self->mEstablishedHandler != nil) {
+        dispatch_async(self->mQueue, self->mEstablishedHandler);
+        // On failure, mEstablishedHandler will be cleaned up by our destructor,
+        // but we can clean it up earlier on successful subscription
+        // establishment.
+        self->mEstablishedHandler = nil;
+    }
+}
+
+void CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -3954,9 +3787,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -3970,7 +3803,7 @@
     }
 }
 
-void CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -3993,9 +3826,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -4009,7 +3842,7 @@
     }
 }
 
-void CHIPElectricalMeasurementAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPGeneralCommissioningAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -4032,9 +3865,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPElectricalMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPGeneralCommissioningAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPElectricalMeasurementAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPGeneralCommissioningAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -4048,8 +3881,9 @@
     }
 }
 
-void CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPNetworkCommissioningNetworksListAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::DecodableType> &
+        value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -4057,8 +3891,10 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            CHIPNetworkCommissioningClusterNetworkInfo * newElement_0;
+            newElement_0 = [CHIPNetworkCommissioningClusterNetworkInfo new];
+            newElement_0.networkID = [NSData dataWithBytes:entry_0.networkID.data() length:entry_0.networkID.size()];
+            newElement_0.connected = [NSNumber numberWithBool:entry_0.connected];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -4071,10 +3907,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPNetworkCommissioningNetworksListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPNetworkCommissioningNetworksListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -4088,7 +3923,7 @@
     }
 }
 
-void CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -4111,10 +3946,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -4128,8 +3962,8 @@
     }
 }
 
-void CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -4151,9 +3985,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -4167,8 +4001,8 @@
     }
 }
 
-void CHIPFanControlGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPNetworkCommissioningAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -4190,9 +4024,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPFanControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPNetworkCommissioningAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPFanControlGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPNetworkCommissioningAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -4206,7 +4040,7 @@
     }
 }
 
-void CHIPFanControlAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -4229,9 +4063,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPFanControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPFanControlAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -4245,7 +4079,46 @@
     }
 }
 
-void CHIPFanControlAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+{
+    NSArray * _Nonnull objCValue;
+    { // Scope for our temporary variables
+        auto * array_0 = [NSMutableArray new];
+        auto iter_0 = value.begin();
+        while (iter_0.Next()) {
+            auto & entry_0 = iter_0.GetValue();
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            [array_0 addObject:newElement_0];
+        }
+        CHIP_ERROR err = iter_0.GetStatus();
+        if (err != CHIP_NO_ERROR) {
+            OnFailureFn(context, err);
+            return;
+        }
+        objCValue = array_0;
+    }
+    DispatchSuccess(context, objCValue);
+};
+
+void CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+{
+    auto * self = static_cast<CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    if (!self->mQueue) {
+        return;
+    }
+
+    if (self->mEstablishedHandler != nil) {
+        dispatch_async(self->mQueue, self->mEstablishedHandler);
+        // On failure, mEstablishedHandler will be cleaned up by our destructor,
+        // but we can clean it up earlier on successful subscription
+        // establishment.
+        self->mEstablishedHandler = nil;
+    }
+}
+
+void CHIPDiagnosticLogsAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -4268,9 +4141,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPFanControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPDiagnosticLogsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPFanControlAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPDiagnosticLogsAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -4284,8 +4157,9 @@
     }
 }
 
-void CHIPFixedLabelLabelListListAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::FixedLabel::Structs::LabelStruct::DecodableType> & value)
+void CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -4293,14 +4167,59 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            CHIPFixedLabelClusterLabelStruct * newElement_0;
-            newElement_0 = [CHIPFixedLabelClusterLabelStruct new];
-            newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data()
-                                                          length:entry_0.label.size()
-                                                        encoding:NSUTF8StringEncoding];
-            newElement_0.value = [[NSString alloc] initWithBytes:entry_0.value.data()
-                                                          length:entry_0.value.size()
-                                                        encoding:NSUTF8StringEncoding];
+            CHIPGeneralDiagnosticsClusterNetworkInterfaceType * newElement_0;
+            newElement_0 = [CHIPGeneralDiagnosticsClusterNetworkInterfaceType new];
+            newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data()
+                                                         length:entry_0.name.size()
+                                                       encoding:NSUTF8StringEncoding];
+            newElement_0.isOperational = [NSNumber numberWithBool:entry_0.isOperational];
+            if (entry_0.offPremiseServicesReachableIPv4.IsNull()) {
+                newElement_0.offPremiseServicesReachableIPv4 = nil;
+            } else {
+                newElement_0.offPremiseServicesReachableIPv4 =
+                    [NSNumber numberWithBool:entry_0.offPremiseServicesReachableIPv4.Value()];
+            }
+            if (entry_0.offPremiseServicesReachableIPv6.IsNull()) {
+                newElement_0.offPremiseServicesReachableIPv6 = nil;
+            } else {
+                newElement_0.offPremiseServicesReachableIPv6 =
+                    [NSNumber numberWithBool:entry_0.offPremiseServicesReachableIPv6.Value()];
+            }
+            newElement_0.hardwareAddress = [NSData dataWithBytes:entry_0.hardwareAddress.data()
+                                                          length:entry_0.hardwareAddress.size()];
+            { // Scope for our temporary variables
+                auto * array_2 = [NSMutableArray new];
+                auto iter_2 = entry_0.IPv4Addresses.begin();
+                while (iter_2.Next()) {
+                    auto & entry_2 = iter_2.GetValue();
+                    NSData * newElement_2;
+                    newElement_2 = [NSData dataWithBytes:entry_2.data() length:entry_2.size()];
+                    [array_2 addObject:newElement_2];
+                }
+                CHIP_ERROR err = iter_2.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    OnFailureFn(context, err);
+                    return;
+                }
+                newElement_0.iPv4Addresses = array_2;
+            }
+            { // Scope for our temporary variables
+                auto * array_2 = [NSMutableArray new];
+                auto iter_2 = entry_0.IPv6Addresses.begin();
+                while (iter_2.Next()) {
+                    auto & entry_2 = iter_2.GetValue();
+                    NSData * newElement_2;
+                    newElement_2 = [NSData dataWithBytes:entry_2.data() length:entry_2.size()];
+                    [array_2 addObject:newElement_2];
+                }
+                CHIP_ERROR err = iter_2.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    OnFailureFn(context, err);
+                    return;
+                }
+                newElement_0.iPv6Addresses = array_2;
+            }
+            newElement_0.type = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.type)];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -4313,9 +4232,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPFixedLabelLabelListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPFixedLabelLabelListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -4329,8 +4248,8 @@
     }
 }
 
-void CHIPFixedLabelGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<uint8_t> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -4339,7 +4258,7 @@
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
             NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -4352,9 +4271,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPFixedLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPFixedLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -4368,8 +4287,8 @@
     }
 }
 
-void CHIPFixedLabelAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<uint8_t> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -4378,7 +4297,7 @@
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
             NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -4391,9 +4310,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPFixedLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPFixedLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -4407,8 +4326,8 @@
     }
 }
 
-void CHIPFixedLabelAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<uint8_t> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -4417,7 +4336,7 @@
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
             NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -4430,9 +4349,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPFixedLabelAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPFixedLabelAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -4446,7 +4365,7 @@
     }
 }
 
-void CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -4469,9 +4388,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -4485,7 +4404,7 @@
     }
 }
 
-void CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -4508,9 +4427,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -4524,7 +4443,7 @@
     }
 }
 
-void CHIPFlowMeasurementAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPGeneralDiagnosticsAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -4547,9 +4466,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPFlowMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPGeneralDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPFlowMeasurementAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPGeneralDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -4563,20 +4482,56 @@
     }
 }
 
-void CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::GeneralCommissioning::Structs::BasicCommissioningInfo::DecodableType & value)
+void CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType> &
+        value)
 {
-    CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nonnull objCValue;
-    objCValue = [CHIPGeneralCommissioningClusterBasicCommissioningInfo new];
-    objCValue.failSafeExpiryLengthSeconds = [NSNumber numberWithUnsignedShort:value.failSafeExpiryLengthSeconds];
-    objCValue.maxCumulativeFailsafeSeconds = [NSNumber numberWithUnsignedShort:value.maxCumulativeFailsafeSeconds];
+    NSArray * _Nonnull objCValue;
+    { // Scope for our temporary variables
+        auto * array_0 = [NSMutableArray new];
+        auto iter_0 = value.begin();
+        while (iter_0.Next()) {
+            auto & entry_0 = iter_0.GetValue();
+            CHIPSoftwareDiagnosticsClusterThreadMetrics * newElement_0;
+            newElement_0 = [CHIPSoftwareDiagnosticsClusterThreadMetrics new];
+            newElement_0.id = [NSNumber numberWithUnsignedLongLong:entry_0.id];
+            if (entry_0.name.HasValue()) {
+                newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.Value().data()
+                                                             length:entry_0.name.Value().size()
+                                                           encoding:NSUTF8StringEncoding];
+            } else {
+                newElement_0.name = nil;
+            }
+            if (entry_0.stackFreeCurrent.HasValue()) {
+                newElement_0.stackFreeCurrent = [NSNumber numberWithUnsignedInt:entry_0.stackFreeCurrent.Value()];
+            } else {
+                newElement_0.stackFreeCurrent = nil;
+            }
+            if (entry_0.stackFreeMinimum.HasValue()) {
+                newElement_0.stackFreeMinimum = [NSNumber numberWithUnsignedInt:entry_0.stackFreeMinimum.Value()];
+            } else {
+                newElement_0.stackFreeMinimum = nil;
+            }
+            if (entry_0.stackSize.HasValue()) {
+                newElement_0.stackSize = [NSNumber numberWithUnsignedInt:entry_0.stackSize.Value()];
+            } else {
+                newElement_0.stackSize = nil;
+            }
+            [array_0 addObject:newElement_0];
+        }
+        CHIP_ERROR err = iter_0.GetStatus();
+        if (err != CHIP_NO_ERROR) {
+            OnFailureFn(context, err);
+            return;
+        }
+        objCValue = array_0;
+    }
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -4590,7 +4545,7 @@
     }
 }
 
-void CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -4613,9 +4568,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -4629,7 +4584,7 @@
     }
 }
 
-void CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -4652,9 +4607,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -4668,7 +4623,7 @@
     }
 }
 
-void CHIPGeneralCommissioningAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -4691,9 +4646,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPGeneralCommissioningAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPGeneralCommissioningAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -4707,9 +4662,9 @@
     }
 }
 
-void CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackBridge::OnSuccessFn(void * context,
+void CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackBridge::OnSuccessFn(void * context,
     const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> & value)
+        chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -4717,59 +4672,30 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            CHIPGeneralDiagnosticsClusterNetworkInterfaceType * newElement_0;
-            newElement_0 = [CHIPGeneralDiagnosticsClusterNetworkInterfaceType new];
-            newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data()
-                                                         length:entry_0.name.size()
-                                                       encoding:NSUTF8StringEncoding];
-            newElement_0.isOperational = [NSNumber numberWithBool:entry_0.isOperational];
-            if (entry_0.offPremiseServicesReachableIPv4.IsNull()) {
-                newElement_0.offPremiseServicesReachableIPv4 = nil;
-            } else {
-                newElement_0.offPremiseServicesReachableIPv4 =
-                    [NSNumber numberWithBool:entry_0.offPremiseServicesReachableIPv4.Value()];
-            }
-            if (entry_0.offPremiseServicesReachableIPv6.IsNull()) {
-                newElement_0.offPremiseServicesReachableIPv6 = nil;
-            } else {
-                newElement_0.offPremiseServicesReachableIPv6 =
-                    [NSNumber numberWithBool:entry_0.offPremiseServicesReachableIPv6.Value()];
-            }
-            newElement_0.hardwareAddress = [NSData dataWithBytes:entry_0.hardwareAddress.data()
-                                                          length:entry_0.hardwareAddress.size()];
-            { // Scope for our temporary variables
-                auto * array_2 = [NSMutableArray new];
-                auto iter_2 = entry_0.IPv4Addresses.begin();
-                while (iter_2.Next()) {
-                    auto & entry_2 = iter_2.GetValue();
-                    NSData * newElement_2;
-                    newElement_2 = [NSData dataWithBytes:entry_2.data() length:entry_2.size()];
-                    [array_2 addObject:newElement_2];
-                }
-                CHIP_ERROR err = iter_2.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    OnFailureFn(context, err);
-                    return;
-                }
-                newElement_0.iPv4Addresses = array_2;
+            CHIPThreadNetworkDiagnosticsClusterNeighborTable * newElement_0;
+            newElement_0 = [CHIPThreadNetworkDiagnosticsClusterNeighborTable new];
+            newElement_0.extAddress = [NSNumber numberWithUnsignedLongLong:entry_0.extAddress];
+            newElement_0.age = [NSNumber numberWithUnsignedInt:entry_0.age];
+            newElement_0.rloc16 = [NSNumber numberWithUnsignedShort:entry_0.rloc16];
+            newElement_0.linkFrameCounter = [NSNumber numberWithUnsignedInt:entry_0.linkFrameCounter];
+            newElement_0.mleFrameCounter = [NSNumber numberWithUnsignedInt:entry_0.mleFrameCounter];
+            newElement_0.lqi = [NSNumber numberWithUnsignedChar:entry_0.lqi];
+            if (entry_0.averageRssi.IsNull()) {
+                newElement_0.averageRssi = nil;
+            } else {
+                newElement_0.averageRssi = [NSNumber numberWithChar:entry_0.averageRssi.Value()];
             }
-            { // Scope for our temporary variables
-                auto * array_2 = [NSMutableArray new];
-                auto iter_2 = entry_0.IPv6Addresses.begin();
-                while (iter_2.Next()) {
-                    auto & entry_2 = iter_2.GetValue();
-                    NSData * newElement_2;
-                    newElement_2 = [NSData dataWithBytes:entry_2.data() length:entry_2.size()];
-                    [array_2 addObject:newElement_2];
-                }
-                CHIP_ERROR err = iter_2.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    OnFailureFn(context, err);
-                    return;
-                }
-                newElement_0.iPv6Addresses = array_2;
+            if (entry_0.lastRssi.IsNull()) {
+                newElement_0.lastRssi = nil;
+            } else {
+                newElement_0.lastRssi = [NSNumber numberWithChar:entry_0.lastRssi.Value()];
             }
-            newElement_0.type = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.type)];
+            newElement_0.frameErrorRate = [NSNumber numberWithUnsignedChar:entry_0.frameErrorRate];
+            newElement_0.messageErrorRate = [NSNumber numberWithUnsignedChar:entry_0.messageErrorRate];
+            newElement_0.rxOnWhenIdle = [NSNumber numberWithBool:entry_0.rxOnWhenIdle];
+            newElement_0.fullThreadDevice = [NSNumber numberWithBool:entry_0.fullThreadDevice];
+            newElement_0.fullNetworkData = [NSNumber numberWithBool:entry_0.fullNetworkData];
+            newElement_0.isChild = [NSNumber numberWithBool:entry_0.isChild];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -4782,9 +4708,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -4798,8 +4724,9 @@
     }
 }
 
-void CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<uint8_t> & value)
+void CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> &
+        value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -4807,8 +4734,18 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
+            CHIPThreadNetworkDiagnosticsClusterRouteTable * newElement_0;
+            newElement_0 = [CHIPThreadNetworkDiagnosticsClusterRouteTable new];
+            newElement_0.extAddress = [NSNumber numberWithUnsignedLongLong:entry_0.extAddress];
+            newElement_0.rloc16 = [NSNumber numberWithUnsignedShort:entry_0.rloc16];
+            newElement_0.routerId = [NSNumber numberWithUnsignedChar:entry_0.routerId];
+            newElement_0.nextHop = [NSNumber numberWithUnsignedChar:entry_0.nextHop];
+            newElement_0.pathCost = [NSNumber numberWithUnsignedChar:entry_0.pathCost];
+            newElement_0.lqiIn = [NSNumber numberWithUnsignedChar:entry_0.LQIIn];
+            newElement_0.lqiOut = [NSNumber numberWithUnsignedChar:entry_0.LQIOut];
+            newElement_0.age = [NSNumber numberWithUnsignedChar:entry_0.age];
+            newElement_0.allocated = [NSNumber numberWithBool:entry_0.allocated];
+            newElement_0.linkEstablished = [NSNumber numberWithBool:entry_0.linkEstablished];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -4821,9 +4758,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -4837,32 +4774,24 @@
     }
 }
 
-void CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<uint8_t> & value)
+void CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> &
+        value)
 {
-    NSArray * _Nonnull objCValue;
-    { // Scope for our temporary variables
-        auto * array_0 = [NSMutableArray new];
-        auto iter_0 = value.begin();
-        while (iter_0.Next()) {
-            auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
-            [array_0 addObject:newElement_0];
-        }
-        CHIP_ERROR err = iter_0.GetStatus();
-        if (err != CHIP_NO_ERROR) {
-            OnFailureFn(context, err);
-            return;
-        }
-        objCValue = array_0;
+    CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable objCValue;
+    if (value.IsNull()) {
+        objCValue = nil;
+    } else {
+        objCValue = [CHIPThreadNetworkDiagnosticsClusterSecurityPolicy new];
+        objCValue.rotationTime = [NSNumber numberWithUnsignedShort:value.Value().rotationTime];
+        objCValue.flags = [NSNumber numberWithUnsignedShort:value.Value().flags];
     }
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -4876,8 +4805,51 @@
     }
 }
 
-void CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<uint8_t> & value)
+void CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::Nullable<
+        chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> & value)
+{
+    CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable objCValue;
+    if (value.IsNull()) {
+        objCValue = nil;
+    } else {
+        objCValue = [CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents new];
+        objCValue.activeTimestampPresent = [NSNumber numberWithBool:value.Value().activeTimestampPresent];
+        objCValue.pendingTimestampPresent = [NSNumber numberWithBool:value.Value().pendingTimestampPresent];
+        objCValue.masterKeyPresent = [NSNumber numberWithBool:value.Value().masterKeyPresent];
+        objCValue.networkNamePresent = [NSNumber numberWithBool:value.Value().networkNamePresent];
+        objCValue.extendedPanIdPresent = [NSNumber numberWithBool:value.Value().extendedPanIdPresent];
+        objCValue.meshLocalPrefixPresent = [NSNumber numberWithBool:value.Value().meshLocalPrefixPresent];
+        objCValue.delayPresent = [NSNumber numberWithBool:value.Value().delayPresent];
+        objCValue.panIdPresent = [NSNumber numberWithBool:value.Value().panIdPresent];
+        objCValue.channelPresent = [NSNumber numberWithBool:value.Value().channelPresent];
+        objCValue.pskcPresent = [NSNumber numberWithBool:value.Value().pskcPresent];
+        objCValue.securityPolicyPresent = [NSNumber numberWithBool:value.Value().securityPolicyPresent];
+        objCValue.channelMaskPresent = [NSNumber numberWithBool:value.Value().channelMaskPresent];
+    }
+    DispatchSuccess(context, objCValue);
+};
+
+void CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
+{
+    auto * self
+        = static_cast<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackSubscriptionBridge *>(context);
+    if (!self->mQueue) {
+        return;
+    }
+
+    if (self->mEstablishedHandler != nil) {
+        dispatch_async(self->mQueue, self->mEstablishedHandler);
+        // On failure, mEstablishedHandler will be cleaned up by our destructor,
+        // but we can clean it up earlier on successful subscription
+        // establishment.
+        self->mEstablishedHandler = nil;
+    }
+}
+
+void CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -4886,7 +4858,7 @@
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
             NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
+            newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -4899,9 +4871,11 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self
+        = static_cast<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -4915,7 +4889,7 @@
     }
 }
 
-void CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -4938,9 +4912,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -4954,7 +4929,7 @@
     }
 }
 
-void CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -4977,9 +4952,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -4993,7 +4969,7 @@
     }
 }
 
-void CHIPGeneralDiagnosticsAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -5016,9 +4992,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPGeneralDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPGeneralDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -5032,9 +5008,8 @@
     }
 }
 
-void CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::DecodableType> &
-        value)
+void CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -5042,11 +5017,8 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            CHIPGroupKeyManagementClusterGroupKeyMapStruct * newElement_0;
-            newElement_0 = [CHIPGroupKeyManagementClusterGroupKeyMapStruct new];
-            newElement_0.groupId = [NSNumber numberWithUnsignedShort:entry_0.groupId];
-            newElement_0.groupKeySetID = [NSNumber numberWithUnsignedShort:entry_0.groupKeySetID];
-            newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -5059,9 +5031,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -5075,9 +5048,8 @@
     }
 }
 
-void CHIPGroupKeyManagementGroupTableListAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupInfoMapStruct::DecodableType> &
-        value)
+void CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -5085,33 +5057,8 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            CHIPGroupKeyManagementClusterGroupInfoMapStruct * newElement_0;
-            newElement_0 = [CHIPGroupKeyManagementClusterGroupInfoMapStruct new];
-            newElement_0.groupId = [NSNumber numberWithUnsignedShort:entry_0.groupId];
-            { // Scope for our temporary variables
-                auto * array_2 = [NSMutableArray new];
-                auto iter_2 = entry_0.endpoints.begin();
-                while (iter_2.Next()) {
-                    auto & entry_2 = iter_2.GetValue();
-                    NSNumber * newElement_2;
-                    newElement_2 = [NSNumber numberWithUnsignedShort:entry_2];
-                    [array_2 addObject:newElement_2];
-                }
-                CHIP_ERROR err = iter_2.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    OnFailureFn(context, err);
-                    return;
-                }
-                newElement_0.endpoints = array_2;
-            }
-            if (entry_0.groupName.HasValue()) {
-                newElement_0.groupName = [[NSString alloc] initWithBytes:entry_0.groupName.Value().data()
-                                                                  length:entry_0.groupName.Value().size()
-                                                                encoding:NSUTF8StringEncoding];
-            } else {
-                newElement_0.groupName = nil;
-            }
-            newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -5124,9 +5071,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPGroupKeyManagementGroupTableListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPGroupKeyManagementGroupTableListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -5140,8 +5087,8 @@
     }
 }
 
-void CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -5163,9 +5110,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -5179,7 +5126,7 @@
     }
 }
 
-void CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -5202,9 +5149,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -5218,8 +5166,8 @@
     }
 }
 
-void CHIPGroupKeyManagementAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -5241,9 +5189,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPGroupKeyManagementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPGroupKeyManagementAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -5257,8 +5206,8 @@
     }
 }
 
-void CHIPGroupsGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -5280,9 +5229,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPGroupsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPGroupsGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -5296,7 +5245,7 @@
     }
 }
 
-void CHIPGroupsAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -5319,9 +5268,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPGroupsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPGroupsAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -5335,8 +5284,8 @@
     }
 }
 
-void CHIPGroupsAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -5358,9 +5307,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPGroupsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPGroupsAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -5374,8 +5323,8 @@
     }
 }
 
-void CHIPIdentifyGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPBridgedDeviceBasicAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -5397,9 +5346,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPIdentifyGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPBridgedDeviceBasicAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPIdentifyGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPBridgedDeviceBasicAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -5413,7 +5362,7 @@
     }
 }
 
-void CHIPIdentifyAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPSwitchGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -5436,9 +5385,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPIdentifyAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPSwitchGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPIdentifyAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPSwitchGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -5452,8 +5401,8 @@
     }
 }
 
-void CHIPIdentifyAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPSwitchAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -5475,9 +5424,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPIdentifyAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPSwitchAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPIdentifyAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPSwitchAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -5491,8 +5440,8 @@
     }
 }
 
-void CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPSwitchAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -5514,10 +5463,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPSwitchAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPSwitchAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -5531,7 +5479,7 @@
     }
 }
 
-void CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -5554,9 +5502,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -5570,8 +5519,8 @@
     }
 }
 
-void CHIPIlluminanceMeasurementAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -5593,9 +5542,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPIlluminanceMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPIlluminanceMeasurementAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -5609,8 +5559,8 @@
     }
 }
 
-void CHIPKeypadInputGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPAdministratorCommissioningAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -5632,9 +5582,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPKeypadInputGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPAdministratorCommissioningAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPKeypadInputGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPAdministratorCommissioningAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -5648,8 +5598,9 @@
     }
 }
 
-void CHIPKeypadInputAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPOperationalCredentialsNOCsListAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::DecodableType> &
+        value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -5657,8 +5608,15 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            CHIPOperationalCredentialsClusterNOCStruct * newElement_0;
+            newElement_0 = [CHIPOperationalCredentialsClusterNOCStruct new];
+            newElement_0.noc = [NSData dataWithBytes:entry_0.noc.data() length:entry_0.noc.size()];
+            if (entry_0.icac.IsNull()) {
+                newElement_0.icac = nil;
+            } else {
+                newElement_0.icac = [NSData dataWithBytes:entry_0.icac.Value().data() length:entry_0.icac.Value().size()];
+            }
+            newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -5671,9 +5629,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPKeypadInputAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPOperationalCredentialsNOCsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPKeypadInputAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPOperationalCredentialsNOCsListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -5687,8 +5645,9 @@
     }
 }
 
-void CHIPKeypadInputAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPOperationalCredentialsFabricsListAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -5696,8 +5655,16 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            CHIPOperationalCredentialsClusterFabricDescriptor * newElement_0;
+            newElement_0 = [CHIPOperationalCredentialsClusterFabricDescriptor new];
+            newElement_0.rootPublicKey = [NSData dataWithBytes:entry_0.rootPublicKey.data() length:entry_0.rootPublicKey.size()];
+            newElement_0.vendorId = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_0.vendorId)];
+            newElement_0.fabricId = [NSNumber numberWithUnsignedLongLong:entry_0.fabricId];
+            newElement_0.nodeId = [NSNumber numberWithUnsignedLongLong:entry_0.nodeId];
+            newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data()
+                                                          length:entry_0.label.size()
+                                                        encoding:NSUTF8StringEncoding];
+            newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -5710,9 +5677,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPKeypadInputAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPOperationalCredentialsFabricsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPKeypadInputAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPOperationalCredentialsFabricsListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -5726,8 +5693,8 @@
     }
 }
 
-void CHIPLevelControlGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -5735,8 +5702,8 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            NSData * newElement_0;
+            newElement_0 = [NSData dataWithBytes:entry_0.data() length:entry_0.size()];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -5749,9 +5716,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPLevelControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPLevelControlGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -5765,7 +5733,7 @@
     }
 }
 
-void CHIPLevelControlAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -5788,9 +5756,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPLevelControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPLevelControlAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -5804,8 +5773,8 @@
     }
 }
 
-void CHIPLevelControlAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -5827,9 +5796,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPLevelControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPLevelControlAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -5843,8 +5812,8 @@
     }
 }
 
-void CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CharSpan> & value)
+void CHIPOperationalCredentialsAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -5852,8 +5821,8 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            NSString * newElement_0;
-            newElement_0 = [[NSString alloc] initWithBytes:entry_0.data() length:entry_0.size() encoding:NSUTF8StringEncoding];
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -5866,9 +5835,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPOperationalCredentialsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPOperationalCredentialsAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -5882,8 +5851,9 @@
     }
 }
 
-void CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::DecodableType> &
+        value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -5891,8 +5861,11 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            CHIPGroupKeyManagementClusterGroupKeyMapStruct * newElement_0;
+            newElement_0 = [CHIPGroupKeyManagementClusterGroupKeyMapStruct new];
+            newElement_0.groupId = [NSNumber numberWithUnsignedShort:entry_0.groupId];
+            newElement_0.groupKeySetID = [NSNumber numberWithUnsignedShort:entry_0.groupKeySetID];
+            newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -5905,10 +5878,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -5922,8 +5894,9 @@
     }
 }
 
-void CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPGroupKeyManagementGroupTableListAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupInfoMapStruct::DecodableType> &
+        value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -5931,8 +5904,33 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            CHIPGroupKeyManagementClusterGroupInfoMapStruct * newElement_0;
+            newElement_0 = [CHIPGroupKeyManagementClusterGroupInfoMapStruct new];
+            newElement_0.groupId = [NSNumber numberWithUnsignedShort:entry_0.groupId];
+            { // Scope for our temporary variables
+                auto * array_2 = [NSMutableArray new];
+                auto iter_2 = entry_0.endpoints.begin();
+                while (iter_2.Next()) {
+                    auto & entry_2 = iter_2.GetValue();
+                    NSNumber * newElement_2;
+                    newElement_2 = [NSNumber numberWithUnsignedShort:entry_2];
+                    [array_2 addObject:newElement_2];
+                }
+                CHIP_ERROR err = iter_2.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    OnFailureFn(context, err);
+                    return;
+                }
+                newElement_0.endpoints = array_2;
+            }
+            if (entry_0.groupName.HasValue()) {
+                newElement_0.groupName = [[NSString alloc] initWithBytes:entry_0.groupName.Value().data()
+                                                                  length:entry_0.groupName.Value().size()
+                                                                encoding:NSUTF8StringEncoding];
+            } else {
+                newElement_0.groupName = nil;
+            }
+            newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -5945,10 +5943,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPGroupKeyManagementGroupTableListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPGroupKeyManagementGroupTableListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -5962,8 +5959,8 @@
     }
 }
 
-void CHIPLocalizationConfigurationAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -5985,9 +5982,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPLocalizationConfigurationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPLocalizationConfigurationAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -6001,7 +5998,7 @@
     }
 }
 
-void CHIPLowPowerGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -6024,9 +6021,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPLowPowerGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPLowPowerGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -6040,8 +6037,8 @@
     }
 }
 
-void CHIPLowPowerAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPGroupKeyManagementAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -6063,9 +6060,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPLowPowerAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPGroupKeyManagementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPLowPowerAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPGroupKeyManagementAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -6079,8 +6076,8 @@
     }
 }
 
-void CHIPLowPowerAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPFixedLabelLabelListListAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::FixedLabel::Structs::LabelStruct::DecodableType> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -6088,9 +6085,15 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-            [array_0 addObject:newElement_0];
+            CHIPFixedLabelClusterLabelStruct * newElement_0;
+            newElement_0 = [CHIPFixedLabelClusterLabelStruct new];
+            newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data()
+                                                          length:entry_0.label.size()
+                                                        encoding:NSUTF8StringEncoding];
+            newElement_0.value = [[NSString alloc] initWithBytes:entry_0.value.data()
+                                                          length:entry_0.value.size()
+                                                        encoding:NSUTF8StringEncoding];
+            [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
         if (err != CHIP_NO_ERROR) {
@@ -6102,9 +6105,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPLowPowerAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPFixedLabelLabelListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPLowPowerAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPFixedLabelLabelListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -6118,8 +6121,8 @@
     }
 }
 
-void CHIPMediaInputInputListListAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::InputInfo::DecodableType> & value)
+void CHIPFixedLabelGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -6127,16 +6130,8 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            CHIPMediaInputClusterInputInfo * newElement_0;
-            newElement_0 = [CHIPMediaInputClusterInputInfo new];
-            newElement_0.index = [NSNumber numberWithUnsignedChar:entry_0.index];
-            newElement_0.inputType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.inputType)];
-            newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data()
-                                                         length:entry_0.name.size()
-                                                       encoding:NSUTF8StringEncoding];
-            newElement_0.descriptionString = [[NSString alloc] initWithBytes:entry_0.description.data()
-                                                                      length:entry_0.description.size()
-                                                                    encoding:NSUTF8StringEncoding];
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -6149,9 +6144,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPMediaInputInputListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPFixedLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPMediaInputInputListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPFixedLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -6165,7 +6160,7 @@
     }
 }
 
-void CHIPMediaInputGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPFixedLabelAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -6188,9 +6183,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPMediaInputGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPFixedLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPMediaInputGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPFixedLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -6204,8 +6199,8 @@
     }
 }
 
-void CHIPMediaInputAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPFixedLabelAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -6227,9 +6222,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPMediaInputAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPFixedLabelAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPMediaInputAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPFixedLabelAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -6243,8 +6238,8 @@
     }
 }
 
-void CHIPMediaInputAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPUserLabelLabelListListAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::UserLabel::Structs::LabelStruct::DecodableType> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -6252,8 +6247,14 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            CHIPUserLabelClusterLabelStruct * newElement_0;
+            newElement_0 = [CHIPUserLabelClusterLabelStruct new];
+            newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data()
+                                                          length:entry_0.label.size()
+                                                        encoding:NSUTF8StringEncoding];
+            newElement_0.value = [[NSString alloc] initWithBytes:entry_0.value.data()
+                                                          length:entry_0.value.size()
+                                                        encoding:NSUTF8StringEncoding];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -6266,43 +6267,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPMediaInputAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPMediaInputAttributeListListAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPMediaPlaybackSampledPositionStructAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::Nullable<chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::DecodableType> & value)
-{
-    CHIPMediaPlaybackClusterPlaybackPosition * _Nullable objCValue;
-    if (value.IsNull()) {
-        objCValue = nil;
-    } else {
-        objCValue = [CHIPMediaPlaybackClusterPlaybackPosition new];
-        objCValue.updatedAt = [NSNumber numberWithUnsignedLongLong:value.Value().updatedAt];
-        if (value.Value().position.IsNull()) {
-            objCValue.position = nil;
-        } else {
-            objCValue.position = [NSNumber numberWithUnsignedLongLong:value.Value().position.Value()];
-        }
-    }
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPMediaPlaybackSampledPositionStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPUserLabelLabelListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPMediaPlaybackSampledPositionStructAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPUserLabelLabelListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -6316,7 +6283,7 @@
     }
 }
 
-void CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPUserLabelGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -6339,9 +6306,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPUserLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPUserLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -6355,7 +6322,7 @@
     }
 }
 
-void CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPUserLabelAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -6378,9 +6345,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPUserLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPUserLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -6394,7 +6361,7 @@
     }
 }
 
-void CHIPMediaPlaybackAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPUserLabelAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -6417,9 +6384,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPMediaPlaybackAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPUserLabelAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPMediaPlaybackAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPUserLabelAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -6433,8 +6400,8 @@
     }
 }
 
-void CHIPModeSelectSupportedModesListAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType> & value)
+void CHIPBooleanStateGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -6442,30 +6409,8 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            CHIPModeSelectClusterModeOptionStruct * newElement_0;
-            newElement_0 = [CHIPModeSelectClusterModeOptionStruct new];
-            newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data()
-                                                          length:entry_0.label.size()
-                                                        encoding:NSUTF8StringEncoding];
-            newElement_0.mode = [NSNumber numberWithUnsignedChar:entry_0.mode];
-            { // Scope for our temporary variables
-                auto * array_2 = [NSMutableArray new];
-                auto iter_2 = entry_0.semanticTags.begin();
-                while (iter_2.Next()) {
-                    auto & entry_2 = iter_2.GetValue();
-                    CHIPModeSelectClusterSemanticTag * newElement_2;
-                    newElement_2 = [CHIPModeSelectClusterSemanticTag new];
-                    newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:entry_2.mfgCode];
-                    newElement_2.value = [NSNumber numberWithUnsignedShort:entry_2.value];
-                    [array_2 addObject:newElement_2];
-                }
-                CHIP_ERROR err = iter_2.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    OnFailureFn(context, err);
-                    return;
-                }
-                newElement_0.semanticTags = array_2;
-            }
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -6478,9 +6423,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPModeSelectSupportedModesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPBooleanStateGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPModeSelectSupportedModesListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPBooleanStateGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -6494,7 +6439,7 @@
     }
 }
 
-void CHIPModeSelectGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPBooleanStateAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -6517,9 +6462,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPModeSelectGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPBooleanStateAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPModeSelectGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPBooleanStateAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -6533,8 +6478,8 @@
     }
 }
 
-void CHIPModeSelectAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPBooleanStateAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -6556,9 +6501,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPModeSelectAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPBooleanStateAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPModeSelectAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPBooleanStateAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -6572,8 +6517,8 @@
     }
 }
 
-void CHIPModeSelectAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPModeSelectSupportedModesListAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -6581,8 +6526,30 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            CHIPModeSelectClusterModeOptionStruct * newElement_0;
+            newElement_0 = [CHIPModeSelectClusterModeOptionStruct new];
+            newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data()
+                                                          length:entry_0.label.size()
+                                                        encoding:NSUTF8StringEncoding];
+            newElement_0.mode = [NSNumber numberWithUnsignedChar:entry_0.mode];
+            { // Scope for our temporary variables
+                auto * array_2 = [NSMutableArray new];
+                auto iter_2 = entry_0.semanticTags.begin();
+                while (iter_2.Next()) {
+                    auto & entry_2 = iter_2.GetValue();
+                    CHIPModeSelectClusterSemanticTag * newElement_2;
+                    newElement_2 = [CHIPModeSelectClusterSemanticTag new];
+                    newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:entry_2.mfgCode];
+                    newElement_2.value = [NSNumber numberWithUnsignedShort:entry_2.value];
+                    [array_2 addObject:newElement_2];
+                }
+                CHIP_ERROR err = iter_2.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    OnFailureFn(context, err);
+                    return;
+                }
+                newElement_0.semanticTags = array_2;
+            }
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -6595,9 +6562,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPModeSelectAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPModeSelectSupportedModesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPModeSelectAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPModeSelectSupportedModesListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -6611,9 +6578,8 @@
     }
 }
 
-void CHIPNetworkCommissioningNetworksListAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::DecodableType> &
-        value)
+void CHIPModeSelectGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -6621,10 +6587,8 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            CHIPNetworkCommissioningClusterNetworkInfo * newElement_0;
-            newElement_0 = [CHIPNetworkCommissioningClusterNetworkInfo new];
-            newElement_0.networkID = [NSData dataWithBytes:entry_0.networkID.data() length:entry_0.networkID.size()];
-            newElement_0.connected = [NSNumber numberWithBool:entry_0.connected];
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -6637,9 +6601,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPNetworkCommissioningNetworksListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPModeSelectGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPNetworkCommissioningNetworksListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPModeSelectGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -6653,7 +6617,7 @@
     }
 }
 
-void CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPModeSelectAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -6676,9 +6640,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPModeSelectAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPModeSelectAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -6692,8 +6656,8 @@
     }
 }
 
-void CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPModeSelectAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -6715,9 +6679,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPModeSelectAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPModeSelectAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -6731,32 +6695,17 @@
     }
 }
 
-void CHIPNetworkCommissioningAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPDoorLockCredentialRulesSupportAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask> value)
 {
-    NSArray * _Nonnull objCValue;
-    { // Scope for our temporary variables
-        auto * array_0 = [NSMutableArray new];
-        auto iter_0 = value.begin();
-        while (iter_0.Next()) {
-            auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-            [array_0 addObject:newElement_0];
-        }
-        CHIP_ERROR err = iter_0.GetStatus();
-        if (err != CHIP_NO_ERROR) {
-            OnFailureFn(context, err);
-            return;
-        }
-        objCValue = array_0;
-    }
+    NSNumber * _Nonnull objCValue;
+    objCValue = [NSNumber numberWithUnsignedChar:value.Raw()];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPNetworkCommissioningAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPDoorLockCredentialRulesSupportAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPNetworkCommissioningAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPDoorLockCredentialRulesSupportAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -6770,33 +6719,17 @@
     }
 }
 
-void CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPDoorLockSupportedOperatingModesAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes> value)
 {
-    NSArray * _Nonnull objCValue;
-    { // Scope for our temporary variables
-        auto * array_0 = [NSMutableArray new];
-        auto iter_0 = value.begin();
-        while (iter_0.Next()) {
-            auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-            [array_0 addObject:newElement_0];
-        }
-        CHIP_ERROR err = iter_0.GetStatus();
-        if (err != CHIP_NO_ERROR) {
-            OnFailureFn(context, err);
-            return;
-        }
-        objCValue = array_0;
-    }
+    NSNumber * _Nonnull objCValue;
+    objCValue = [NSNumber numberWithUnsignedShort:value.Raw()];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPDoorLockSupportedOperatingModesAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPDoorLockSupportedOperatingModesAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -6810,33 +6743,17 @@
     }
 }
 
-void CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister> value)
 {
-    NSArray * _Nonnull objCValue;
-    { // Scope for our temporary variables
-        auto * array_0 = [NSMutableArray new];
-        auto iter_0 = value.begin();
-        while (iter_0.Next()) {
-            auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-            [array_0 addObject:newElement_0];
-        }
-        CHIP_ERROR err = iter_0.GetStatus();
-        if (err != CHIP_NO_ERROR) {
-            OnFailureFn(context, err);
-            return;
-        }
-        objCValue = array_0;
-    }
+    NSNumber * _Nonnull objCValue;
+    objCValue = [NSNumber numberWithUnsignedShort:value.Raw()];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -6850,32 +6767,17 @@
     }
 }
 
-void CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> value)
 {
-    NSArray * _Nonnull objCValue;
-    { // Scope for our temporary variables
-        auto * array_0 = [NSMutableArray new];
-        auto iter_0 = value.begin();
-        while (iter_0.Next()) {
-            auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-            [array_0 addObject:newElement_0];
-        }
-        CHIP_ERROR err = iter_0.GetStatus();
-        if (err != CHIP_NO_ERROR) {
-            OnFailureFn(context, err);
-            return;
-        }
-        objCValue = array_0;
-    }
+    NSNumber * _Nonnull objCValue;
+    objCValue = [NSNumber numberWithUnsignedChar:value.Raw()];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -6889,9 +6791,8 @@
     }
 }
 
-void CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType> & value)
+void CHIPDoorLockGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -6899,11 +6800,8 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            CHIPOtaSoftwareUpdateRequestorClusterProviderLocation * newElement_0;
-            newElement_0 = [CHIPOtaSoftwareUpdateRequestorClusterProviderLocation new];
-            newElement_0.providerNodeID = [NSNumber numberWithUnsignedLongLong:entry_0.providerNodeID];
-            newElement_0.endpoint = [NSNumber numberWithUnsignedShort:entry_0.endpoint];
-            newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -6916,10 +6814,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPDoorLockGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPDoorLockGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -6933,7 +6830,7 @@
     }
 }
 
-void CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPDoorLockAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -6956,10 +6853,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPDoorLockAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPDoorLockAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -6973,8 +6869,8 @@
     }
 }
 
-void CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPDoorLockAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -6996,10 +6892,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPDoorLockAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPDoorLockAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -7013,32 +6908,17 @@
     }
 }
 
-void CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPWindowCoveringConfigStatusAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> value)
 {
-    NSArray * _Nonnull objCValue;
-    { // Scope for our temporary variables
-        auto * array_0 = [NSMutableArray new];
-        auto iter_0 = value.begin();
-        while (iter_0.Next()) {
-            auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-            [array_0 addObject:newElement_0];
-        }
-        CHIP_ERROR err = iter_0.GetStatus();
-        if (err != CHIP_NO_ERROR) {
-            OnFailureFn(context, err);
-            return;
-        }
-        objCValue = array_0;
-    }
+    NSNumber * _Nonnull objCValue;
+    objCValue = [NSNumber numberWithUnsignedChar:value.Raw()];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPWindowCoveringConfigStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPWindowCoveringConfigStatusAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -7052,32 +6932,17 @@
     }
 }
 
-void CHIPOccupancySensingGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPWindowCoveringOperationalStatusAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::BitMask<chip::app::Clusters::WindowCovering::OperationalStatus> value)
 {
-    NSArray * _Nonnull objCValue;
-    { // Scope for our temporary variables
-        auto * array_0 = [NSMutableArray new];
-        auto iter_0 = value.begin();
-        while (iter_0.Next()) {
-            auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-            [array_0 addObject:newElement_0];
-        }
-        CHIP_ERROR err = iter_0.GetStatus();
-        if (err != CHIP_NO_ERROR) {
-            OnFailureFn(context, err);
-            return;
-        }
-        objCValue = array_0;
-    }
+    NSNumber * _Nonnull objCValue;
+    objCValue = [NSNumber numberWithUnsignedChar:value.Raw()];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPOccupancySensingGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPWindowCoveringOperationalStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPOccupancySensingGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPWindowCoveringOperationalStatusAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -7091,32 +6956,17 @@
     }
 }
 
-void CHIPOccupancySensingAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPWindowCoveringModeAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::BitMask<chip::app::Clusters::WindowCovering::Mode> value)
 {
-    NSArray * _Nonnull objCValue;
-    { // Scope for our temporary variables
-        auto * array_0 = [NSMutableArray new];
-        auto iter_0 = value.begin();
-        while (iter_0.Next()) {
-            auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-            [array_0 addObject:newElement_0];
-        }
-        CHIP_ERROR err = iter_0.GetStatus();
-        if (err != CHIP_NO_ERROR) {
-            OnFailureFn(context, err);
-            return;
-        }
-        objCValue = array_0;
-    }
+    NSNumber * _Nonnull objCValue;
+    objCValue = [NSNumber numberWithUnsignedChar:value.Raw()];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPOccupancySensingAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPWindowCoveringModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPOccupancySensingAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPWindowCoveringModeAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -7130,32 +6980,17 @@
     }
 }
 
-void CHIPOccupancySensingAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPWindowCoveringSafetyStatusAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::BitMask<chip::app::Clusters::WindowCovering::SafetyStatus> value)
 {
-    NSArray * _Nonnull objCValue;
-    { // Scope for our temporary variables
-        auto * array_0 = [NSMutableArray new];
-        auto iter_0 = value.begin();
-        while (iter_0.Next()) {
-            auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-            [array_0 addObject:newElement_0];
-        }
-        CHIP_ERROR err = iter_0.GetStatus();
-        if (err != CHIP_NO_ERROR) {
-            OnFailureFn(context, err);
-            return;
-        }
-        objCValue = array_0;
-    }
+    NSNumber * _Nonnull objCValue;
+    objCValue = [NSNumber numberWithUnsignedShort:value.Raw()];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPOccupancySensingAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPWindowCoveringSafetyStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPOccupancySensingAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPWindowCoveringSafetyStatusAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -7169,7 +7004,7 @@
     }
 }
 
-void CHIPOnOffGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPWindowCoveringGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -7192,9 +7027,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPOnOffGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPWindowCoveringGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPOnOffGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPWindowCoveringGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -7208,7 +7043,7 @@
     }
 }
 
-void CHIPOnOffAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPWindowCoveringAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -7231,9 +7066,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPOnOffAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPWindowCoveringAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPOnOffAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPWindowCoveringAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -7247,7 +7082,7 @@
     }
 }
 
-void CHIPOnOffAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPWindowCoveringAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -7270,9 +7105,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPOnOffAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPWindowCoveringAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPOnOffAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPWindowCoveringAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -7286,7 +7121,7 @@
     }
 }
 
-void CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPBarrierControlGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -7309,10 +7144,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPBarrierControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPBarrierControlGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -7326,7 +7160,7 @@
     }
 }
 
-void CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPBarrierControlAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -7349,10 +7183,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPBarrierControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPBarrierControlAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -7366,7 +7199,7 @@
     }
 }
 
-void CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPBarrierControlAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -7389,9 +7222,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPBarrierControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPBarrierControlAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -7405,40 +7238,17 @@
     }
 }
 
-void CHIPOperationalCredentialsNOCsListAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::DecodableType> &
-        value)
+void CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus> value)
 {
-    NSArray * _Nonnull objCValue;
-    { // Scope for our temporary variables
-        auto * array_0 = [NSMutableArray new];
-        auto iter_0 = value.begin();
-        while (iter_0.Next()) {
-            auto & entry_0 = iter_0.GetValue();
-            CHIPOperationalCredentialsClusterNOCStruct * newElement_0;
-            newElement_0 = [CHIPOperationalCredentialsClusterNOCStruct new];
-            newElement_0.noc = [NSData dataWithBytes:entry_0.noc.data() length:entry_0.noc.size()];
-            if (entry_0.icac.IsNull()) {
-                newElement_0.icac = nil;
-            } else {
-                newElement_0.icac = [NSData dataWithBytes:entry_0.icac.Value().data() length:entry_0.icac.Value().size()];
-            }
-            newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
-            [array_0 addObject:newElement_0];
-        }
-        CHIP_ERROR err = iter_0.GetStatus();
-        if (err != CHIP_NO_ERROR) {
-            OnFailureFn(context, err);
-            return;
-        }
-        objCValue = array_0;
-    }
+    NSNumber * _Nonnull objCValue;
+    objCValue = [NSNumber numberWithUnsignedShort:value.Raw()];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPOperationalCredentialsNOCsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPOperationalCredentialsNOCsListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -7452,9 +7262,8 @@
     }
 }
 
-void CHIPOperationalCredentialsFabricsListAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & value)
+void CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -7462,16 +7271,8 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            CHIPOperationalCredentialsClusterFabricDescriptor * newElement_0;
-            newElement_0 = [CHIPOperationalCredentialsClusterFabricDescriptor new];
-            newElement_0.rootPublicKey = [NSData dataWithBytes:entry_0.rootPublicKey.data() length:entry_0.rootPublicKey.size()];
-            newElement_0.vendorId = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_0.vendorId)];
-            newElement_0.fabricId = [NSNumber numberWithUnsignedLongLong:entry_0.fabricId];
-            newElement_0.nodeId = [NSNumber numberWithUnsignedLongLong:entry_0.nodeId];
-            newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data()
-                                                          length:entry_0.label.size()
-                                                        encoding:NSUTF8StringEncoding];
-            newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -7484,9 +7285,11 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPOperationalCredentialsFabricsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPOperationalCredentialsFabricsListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self
+        = static_cast<CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -7500,8 +7303,8 @@
     }
 }
 
-void CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & value)
+void CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -7509,8 +7312,8 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            NSData * newElement_0;
-            newElement_0 = [NSData dataWithBytes:entry_0.data() length:entry_0.size()];
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -7523,10 +7326,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+void CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
     void * context)
 {
-    auto * self = static_cast<CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -7540,8 +7343,8 @@
     }
 }
 
-void CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -7563,10 +7366,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -7580,7 +7382,7 @@
     }
 }
 
-void CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPThermostatGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -7603,9 +7405,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPThermostatGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPThermostatGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -7619,8 +7421,8 @@
     }
 }
 
-void CHIPOperationalCredentialsAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPThermostatAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -7642,9 +7444,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPOperationalCredentialsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPThermostatAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPOperationalCredentialsAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPThermostatAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -7658,8 +7460,8 @@
     }
 }
 
-void CHIPPowerSourceActiveWiredFaultsListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<uint8_t> & value)
+void CHIPThermostatAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -7668,7 +7470,7 @@
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
             NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -7681,9 +7483,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPPowerSourceActiveWiredFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPThermostatAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPPowerSourceActiveWiredFaultsListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPThermostatAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -7697,8 +7499,8 @@
     }
 }
 
-void CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<uint8_t> & value)
+void CHIPFanControlGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -7707,7 +7509,7 @@
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
             NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -7720,9 +7522,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPFanControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPFanControlGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -7736,8 +7538,8 @@
     }
 }
 
-void CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<uint8_t> & value)
+void CHIPFanControlAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -7746,7 +7548,7 @@
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
             NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -7759,9 +7561,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPFanControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPFanControlAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -7775,8 +7577,8 @@
     }
 }
 
-void CHIPPowerSourceGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPFanControlAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -7798,9 +7600,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPPowerSourceGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPFanControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPPowerSourceGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPFanControlAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -7814,7 +7616,7 @@
     }
 }
 
-void CHIPPowerSourceAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -7837,9 +7639,12 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPPowerSourceAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPPowerSourceAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self
+        = static_cast<CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(
+            context);
     if (!self->mQueue) {
         return;
     }
@@ -7853,8 +7658,8 @@
     }
 }
 
-void CHIPPowerSourceAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -7876,9 +7681,11 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPPowerSourceAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPPowerSourceAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(
+        context);
     if (!self->mQueue) {
         return;
     }
@@ -7892,8 +7699,8 @@
     }
 }
 
-void CHIPPowerSourceConfigurationSourcesListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<uint8_t> & value)
+void CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -7902,7 +7709,7 @@
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
             NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -7915,9 +7722,11 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPPowerSourceConfigurationSourcesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPPowerSourceConfigurationSourcesListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self
+        = static_cast<CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -7931,7 +7740,7 @@
     }
 }
 
-void CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPColorControlGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -7954,10 +7763,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPColorControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPColorControlGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -7971,7 +7779,7 @@
     }
 }
 
-void CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPColorControlAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -7994,10 +7802,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPColorControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPColorControlAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -8011,7 +7818,7 @@
     }
 }
 
-void CHIPPowerSourceConfigurationAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPColorControlAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -8034,9 +7841,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPPowerSourceConfigurationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPColorControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPPowerSourceConfigurationAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPColorControlAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -8050,7 +7857,7 @@
     }
 }
 
-void CHIPPressureMeasurementGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -8073,9 +7880,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPPressureMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPPressureMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -8089,7 +7897,7 @@
     }
 }
 
-void CHIPPressureMeasurementAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -8112,9 +7920,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPPressureMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPPressureMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -8128,7 +7936,7 @@
     }
 }
 
-void CHIPPressureMeasurementAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPIlluminanceMeasurementAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -8151,33 +7959,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPPressureMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPPressureMeasurementAttributeListListAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus> value)
-{
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedShort:value.Raw()];
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPIlluminanceMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPIlluminanceMeasurementAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -8191,7 +7975,7 @@
     }
 }
 
-void CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -8214,11 +7998,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+void CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
     void * context)
 {
-    auto * self
-        = static_cast<CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -8232,7 +8015,7 @@
     }
 }
 
-void CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -8255,10 +8038,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -8272,7 +8054,7 @@
     }
 }
 
-void CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPTemperatureMeasurementAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -8295,9 +8077,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPTemperatureMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPTemperatureMeasurementAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -8311,7 +8093,7 @@
     }
 }
 
-void CHIPRelativeHumidityMeasurementGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPPressureMeasurementGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -8334,11 +8116,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPRelativeHumidityMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPPressureMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self
-        = static_cast<CHIPRelativeHumidityMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPPressureMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -8352,7 +8132,7 @@
     }
 }
 
-void CHIPRelativeHumidityMeasurementAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPPressureMeasurementAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -8375,10 +8155,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPRelativeHumidityMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPPressureMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPRelativeHumidityMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPPressureMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -8392,7 +8171,7 @@
     }
 }
 
-void CHIPRelativeHumidityMeasurementAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPPressureMeasurementAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -8415,9 +8194,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPRelativeHumidityMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPPressureMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPRelativeHumidityMeasurementAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPPressureMeasurementAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -8431,7 +8210,7 @@
     }
 }
 
-void CHIPScenesGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -8454,9 +8233,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPScenesGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPScenesGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -8470,7 +8249,7 @@
     }
 }
 
-void CHIPScenesAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -8493,9 +8272,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPScenesAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPScenesAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -8509,7 +8288,7 @@
     }
 }
 
-void CHIPScenesAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPFlowMeasurementAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -8532,72 +8311,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPScenesAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPScenesAttributeListListAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType> &
-        value)
-{
-    NSArray * _Nonnull objCValue;
-    { // Scope for our temporary variables
-        auto * array_0 = [NSMutableArray new];
-        auto iter_0 = value.begin();
-        while (iter_0.Next()) {
-            auto & entry_0 = iter_0.GetValue();
-            CHIPSoftwareDiagnosticsClusterThreadMetrics * newElement_0;
-            newElement_0 = [CHIPSoftwareDiagnosticsClusterThreadMetrics new];
-            newElement_0.id = [NSNumber numberWithUnsignedLongLong:entry_0.id];
-            if (entry_0.name.HasValue()) {
-                newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.Value().data()
-                                                             length:entry_0.name.Value().size()
-                                                           encoding:NSUTF8StringEncoding];
-            } else {
-                newElement_0.name = nil;
-            }
-            if (entry_0.stackFreeCurrent.HasValue()) {
-                newElement_0.stackFreeCurrent = [NSNumber numberWithUnsignedInt:entry_0.stackFreeCurrent.Value()];
-            } else {
-                newElement_0.stackFreeCurrent = nil;
-            }
-            if (entry_0.stackFreeMinimum.HasValue()) {
-                newElement_0.stackFreeMinimum = [NSNumber numberWithUnsignedInt:entry_0.stackFreeMinimum.Value()];
-            } else {
-                newElement_0.stackFreeMinimum = nil;
-            }
-            if (entry_0.stackSize.HasValue()) {
-                newElement_0.stackSize = [NSNumber numberWithUnsignedInt:entry_0.stackSize.Value()];
-            } else {
-                newElement_0.stackSize = nil;
-            }
-            [array_0 addObject:newElement_0];
-        }
-        CHIP_ERROR err = iter_0.GetStatus();
-        if (err != CHIP_NO_ERROR) {
-            OnFailureFn(context, err);
-            return;
-        }
-        objCValue = array_0;
-    }
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPFlowMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPFlowMeasurementAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -8611,7 +8327,7 @@
     }
 }
 
-void CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPRelativeHumidityMeasurementGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -8634,9 +8350,11 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPRelativeHumidityMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self
+        = static_cast<CHIPRelativeHumidityMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -8650,7 +8368,7 @@
     }
 }
 
-void CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPRelativeHumidityMeasurementAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -8673,9 +8391,10 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPRelativeHumidityMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPRelativeHumidityMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -8689,7 +8408,7 @@
     }
 }
 
-void CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPRelativeHumidityMeasurementAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -8712,9 +8431,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPRelativeHumidityMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPRelativeHumidityMeasurementAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -8728,7 +8447,7 @@
     }
 }
 
-void CHIPSwitchGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPOccupancySensingGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -8751,9 +8470,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPSwitchGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPOccupancySensingGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPSwitchGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPOccupancySensingGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -8767,7 +8486,7 @@
     }
 }
 
-void CHIPSwitchAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPOccupancySensingAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -8790,9 +8509,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPSwitchAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPOccupancySensingAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPSwitchAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPOccupancySensingAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -8806,7 +8525,7 @@
     }
 }
 
-void CHIPSwitchAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPOccupancySensingAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -8829,9 +8548,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPSwitchAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPOccupancySensingAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPSwitchAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPOccupancySensingAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -8845,8 +8564,8 @@
     }
 }
 
-void CHIPTargetNavigatorTargetListListAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType> & value)
+void CHIPWakeOnLanGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -8854,12 +8573,8 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            CHIPTargetNavigatorClusterTargetInfo * newElement_0;
-            newElement_0 = [CHIPTargetNavigatorClusterTargetInfo new];
-            newElement_0.identifier = [NSNumber numberWithUnsignedChar:entry_0.identifier];
-            newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data()
-                                                         length:entry_0.name.size()
-                                                       encoding:NSUTF8StringEncoding];
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -8872,9 +8587,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTargetNavigatorTargetListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPWakeOnLanGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTargetNavigatorTargetListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPWakeOnLanGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -8888,7 +8603,7 @@
     }
 }
 
-void CHIPTargetNavigatorGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPWakeOnLanAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -8911,9 +8626,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTargetNavigatorGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPWakeOnLanAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTargetNavigatorGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPWakeOnLanAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -8927,8 +8642,8 @@
     }
 }
 
-void CHIPTargetNavigatorAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPWakeOnLanAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -8950,9 +8665,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTargetNavigatorAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPWakeOnLanAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTargetNavigatorAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPWakeOnLanAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -8966,8 +8681,8 @@
     }
 }
 
-void CHIPTargetNavigatorAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPChannelChannelListListAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -8975,8 +8690,31 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            CHIPChannelClusterChannelInfo * newElement_0;
+            newElement_0 = [CHIPChannelClusterChannelInfo new];
+            newElement_0.majorNumber = [NSNumber numberWithUnsignedShort:entry_0.majorNumber];
+            newElement_0.minorNumber = [NSNumber numberWithUnsignedShort:entry_0.minorNumber];
+            if (entry_0.name.HasValue()) {
+                newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.Value().data()
+                                                             length:entry_0.name.Value().size()
+                                                           encoding:NSUTF8StringEncoding];
+            } else {
+                newElement_0.name = nil;
+            }
+            if (entry_0.callSign.HasValue()) {
+                newElement_0.callSign = [[NSString alloc] initWithBytes:entry_0.callSign.Value().data()
+                                                                 length:entry_0.callSign.Value().size()
+                                                               encoding:NSUTF8StringEncoding];
+            } else {
+                newElement_0.callSign = nil;
+            }
+            if (entry_0.affiliateCallSign.HasValue()) {
+                newElement_0.affiliateCallSign = [[NSString alloc] initWithBytes:entry_0.affiliateCallSign.Value().data()
+                                                                          length:entry_0.affiliateCallSign.Value().size()
+                                                                        encoding:NSUTF8StringEncoding];
+            } else {
+                newElement_0.affiliateCallSign = nil;
+            }
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -8989,9 +8727,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTargetNavigatorAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPChannelChannelListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTargetNavigatorAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPChannelChannelListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -9005,33 +8743,39 @@
     }
 }
 
-void CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPChannelLineupStructAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::LineupInfo::DecodableType> & value)
 {
-    NSArray * _Nonnull objCValue;
-    { // Scope for our temporary variables
-        auto * array_0 = [NSMutableArray new];
-        auto iter_0 = value.begin();
-        while (iter_0.Next()) {
-            auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-            [array_0 addObject:newElement_0];
+    CHIPChannelClusterLineupInfo * _Nullable objCValue;
+    if (value.IsNull()) {
+        objCValue = nil;
+    } else {
+        objCValue = [CHIPChannelClusterLineupInfo new];
+        objCValue.operatorName = [[NSString alloc] initWithBytes:value.Value().operatorName.data()
+                                                          length:value.Value().operatorName.size()
+                                                        encoding:NSUTF8StringEncoding];
+        if (value.Value().lineupName.HasValue()) {
+            objCValue.lineupName = [[NSString alloc] initWithBytes:value.Value().lineupName.Value().data()
+                                                            length:value.Value().lineupName.Value().size()
+                                                          encoding:NSUTF8StringEncoding];
+        } else {
+            objCValue.lineupName = nil;
         }
-        CHIP_ERROR err = iter_0.GetStatus();
-        if (err != CHIP_NO_ERROR) {
-            OnFailureFn(context, err);
-            return;
+        if (value.Value().postalCode.HasValue()) {
+            objCValue.postalCode = [[NSString alloc] initWithBytes:value.Value().postalCode.Value().data()
+                                                            length:value.Value().postalCode.Value().size()
+                                                          encoding:NSUTF8StringEncoding];
+        } else {
+            objCValue.postalCode = nil;
         }
-        objCValue = array_0;
+        objCValue.lineupInfoType = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value().lineupInfoType)];
     }
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPChannelLineupStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPChannelLineupStructAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -9045,32 +8789,44 @@
     }
 }
 
-void CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPChannelCurrentChannelStructAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> & value)
 {
-    NSArray * _Nonnull objCValue;
-    { // Scope for our temporary variables
-        auto * array_0 = [NSMutableArray new];
-        auto iter_0 = value.begin();
-        while (iter_0.Next()) {
-            auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-            [array_0 addObject:newElement_0];
+    CHIPChannelClusterChannelInfo * _Nullable objCValue;
+    if (value.IsNull()) {
+        objCValue = nil;
+    } else {
+        objCValue = [CHIPChannelClusterChannelInfo new];
+        objCValue.majorNumber = [NSNumber numberWithUnsignedShort:value.Value().majorNumber];
+        objCValue.minorNumber = [NSNumber numberWithUnsignedShort:value.Value().minorNumber];
+        if (value.Value().name.HasValue()) {
+            objCValue.name = [[NSString alloc] initWithBytes:value.Value().name.Value().data()
+                                                      length:value.Value().name.Value().size()
+                                                    encoding:NSUTF8StringEncoding];
+        } else {
+            objCValue.name = nil;
         }
-        CHIP_ERROR err = iter_0.GetStatus();
-        if (err != CHIP_NO_ERROR) {
-            OnFailureFn(context, err);
-            return;
+        if (value.Value().callSign.HasValue()) {
+            objCValue.callSign = [[NSString alloc] initWithBytes:value.Value().callSign.Value().data()
+                                                          length:value.Value().callSign.Value().size()
+                                                        encoding:NSUTF8StringEncoding];
+        } else {
+            objCValue.callSign = nil;
+        }
+        if (value.Value().affiliateCallSign.HasValue()) {
+            objCValue.affiliateCallSign = [[NSString alloc] initWithBytes:value.Value().affiliateCallSign.Value().data()
+                                                                   length:value.Value().affiliateCallSign.Value().size()
+                                                                 encoding:NSUTF8StringEncoding];
+        } else {
+            objCValue.affiliateCallSign = nil;
         }
-        objCValue = array_0;
     }
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPChannelCurrentChannelStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPChannelCurrentChannelStructAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -9084,8 +8840,8 @@
     }
 }
 
-void CHIPTemperatureMeasurementAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPChannelGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -9107,9 +8863,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTemperatureMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPChannelGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTemperatureMeasurementAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPChannelGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -9123,17 +8879,32 @@
     }
 }
 
-void CHIPTestClusterBitmap8AttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value)
+void CHIPChannelAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedChar:value.Raw()];
+    NSArray * _Nonnull objCValue;
+    { // Scope for our temporary variables
+        auto * array_0 = [NSMutableArray new];
+        auto iter_0 = value.begin();
+        while (iter_0.Next()) {
+            auto & entry_0 = iter_0.GetValue();
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            [array_0 addObject:newElement_0];
+        }
+        CHIP_ERROR err = iter_0.GetStatus();
+        if (err != CHIP_NO_ERROR) {
+            OnFailureFn(context, err);
+            return;
+        }
+        objCValue = array_0;
+    }
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTestClusterBitmap8AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPChannelAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTestClusterBitmap8AttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPChannelAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -9147,17 +8918,32 @@
     }
 }
 
-void CHIPTestClusterBitmap16AttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value)
+void CHIPChannelAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedShort:value.Raw()];
+    NSArray * _Nonnull objCValue;
+    { // Scope for our temporary variables
+        auto * array_0 = [NSMutableArray new];
+        auto iter_0 = value.begin();
+        while (iter_0.Next()) {
+            auto & entry_0 = iter_0.GetValue();
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            [array_0 addObject:newElement_0];
+        }
+        CHIP_ERROR err = iter_0.GetStatus();
+        if (err != CHIP_NO_ERROR) {
+            OnFailureFn(context, err);
+            return;
+        }
+        objCValue = array_0;
+    }
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTestClusterBitmap16AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPChannelAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTestClusterBitmap16AttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPChannelAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -9171,17 +8957,36 @@
     }
 }
 
-void CHIPTestClusterBitmap32AttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value)
+void CHIPTargetNavigatorTargetListListAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType> & value)
 {
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedInt:value.Raw()];
+    NSArray * _Nonnull objCValue;
+    { // Scope for our temporary variables
+        auto * array_0 = [NSMutableArray new];
+        auto iter_0 = value.begin();
+        while (iter_0.Next()) {
+            auto & entry_0 = iter_0.GetValue();
+            CHIPTargetNavigatorClusterTargetInfo * newElement_0;
+            newElement_0 = [CHIPTargetNavigatorClusterTargetInfo new];
+            newElement_0.identifier = [NSNumber numberWithUnsignedChar:entry_0.identifier];
+            newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data()
+                                                         length:entry_0.name.size()
+                                                       encoding:NSUTF8StringEncoding];
+            [array_0 addObject:newElement_0];
+        }
+        CHIP_ERROR err = iter_0.GetStatus();
+        if (err != CHIP_NO_ERROR) {
+            OnFailureFn(context, err);
+            return;
+        }
+        objCValue = array_0;
+    }
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTestClusterBitmap32AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPTargetNavigatorTargetListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTestClusterBitmap32AttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPTargetNavigatorTargetListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -9195,17 +9000,32 @@
     }
 }
 
-void CHIPTestClusterBitmap64AttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value)
+void CHIPTargetNavigatorGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedLongLong:value.Raw()];
+    NSArray * _Nonnull objCValue;
+    { // Scope for our temporary variables
+        auto * array_0 = [NSMutableArray new];
+        auto iter_0 = value.begin();
+        while (iter_0.Next()) {
+            auto & entry_0 = iter_0.GetValue();
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            [array_0 addObject:newElement_0];
+        }
+        CHIP_ERROR err = iter_0.GetStatus();
+        if (err != CHIP_NO_ERROR) {
+            OnFailureFn(context, err);
+            return;
+        }
+        objCValue = array_0;
+    }
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTestClusterBitmap64AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPTargetNavigatorGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTestClusterBitmap64AttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPTargetNavigatorGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -9219,8 +9039,8 @@
     }
 }
 
-void CHIPTestClusterListInt8uListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<uint8_t> & value)
+void CHIPTargetNavigatorAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -9229,7 +9049,7 @@
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
             NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -9242,9 +9062,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTestClusterListInt8uListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPTargetNavigatorAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTestClusterListInt8uListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPTargetNavigatorAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -9258,8 +9078,8 @@
     }
 }
 
-void CHIPTestClusterListOctetStringListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & value)
+void CHIPTargetNavigatorAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -9267,8 +9087,8 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            NSData * newElement_0;
-            newElement_0 = [NSData dataWithBytes:entry_0.data() length:entry_0.size()];
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -9281,9 +9101,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTestClusterListOctetStringListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPTargetNavigatorAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTestClusterListOctetStringListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPTargetNavigatorAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -9297,9 +9117,42 @@
     }
 }
 
-void CHIPTestClusterListStructOctetStringListAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType> &
-        value)
+void CHIPMediaPlaybackSampledPositionStructAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::Nullable<chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::DecodableType> & value)
+{
+    CHIPMediaPlaybackClusterPlaybackPosition * _Nullable objCValue;
+    if (value.IsNull()) {
+        objCValue = nil;
+    } else {
+        objCValue = [CHIPMediaPlaybackClusterPlaybackPosition new];
+        objCValue.updatedAt = [NSNumber numberWithUnsignedLongLong:value.Value().updatedAt];
+        if (value.Value().position.IsNull()) {
+            objCValue.position = nil;
+        } else {
+            objCValue.position = [NSNumber numberWithUnsignedLongLong:value.Value().position.Value()];
+        }
+    }
+    DispatchSuccess(context, objCValue);
+};
+
+void CHIPMediaPlaybackSampledPositionStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+{
+    auto * self = static_cast<CHIPMediaPlaybackSampledPositionStructAttributeCallbackSubscriptionBridge *>(context);
+    if (!self->mQueue) {
+        return;
+    }
+
+    if (self->mEstablishedHandler != nil) {
+        dispatch_async(self->mQueue, self->mEstablishedHandler);
+        // On failure, mEstablishedHandler will be cleaned up by our destructor,
+        // but we can clean it up earlier on successful subscription
+        // establishment.
+        self->mEstablishedHandler = nil;
+    }
+}
+
+void CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -9307,10 +9160,8 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            CHIPTestClusterClusterTestListStructOctet * newElement_0;
-            newElement_0 = [CHIPTestClusterClusterTestListStructOctet new];
-            newElement_0.member1 = [NSNumber numberWithUnsignedLongLong:entry_0.member1];
-            newElement_0.member2 = [NSData dataWithBytes:entry_0.member2.data() length:entry_0.member2.size()];
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -9323,9 +9174,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTestClusterListStructOctetStringListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTestClusterListStructOctetStringListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -9339,9 +9190,8 @@
     }
 }
 
-void CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::DecodableType> & value)
+void CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -9349,180 +9199,8 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            CHIPTestClusterClusterNullablesAndOptionalsStruct * newElement_0;
-            newElement_0 = [CHIPTestClusterClusterNullablesAndOptionalsStruct new];
-            if (entry_0.nullableInt.IsNull()) {
-                newElement_0.nullableInt = nil;
-            } else {
-                newElement_0.nullableInt = [NSNumber numberWithUnsignedShort:entry_0.nullableInt.Value()];
-            }
-            if (entry_0.optionalInt.HasValue()) {
-                newElement_0.optionalInt = [NSNumber numberWithUnsignedShort:entry_0.optionalInt.Value()];
-            } else {
-                newElement_0.optionalInt = nil;
-            }
-            if (entry_0.nullableOptionalInt.HasValue()) {
-                if (entry_0.nullableOptionalInt.Value().IsNull()) {
-                    newElement_0.nullableOptionalInt = nil;
-                } else {
-                    newElement_0.nullableOptionalInt =
-                        [NSNumber numberWithUnsignedShort:entry_0.nullableOptionalInt.Value().Value()];
-                }
-            } else {
-                newElement_0.nullableOptionalInt = nil;
-            }
-            if (entry_0.nullableString.IsNull()) {
-                newElement_0.nullableString = nil;
-            } else {
-                newElement_0.nullableString = [[NSString alloc] initWithBytes:entry_0.nullableString.Value().data()
-                                                                       length:entry_0.nullableString.Value().size()
-                                                                     encoding:NSUTF8StringEncoding];
-            }
-            if (entry_0.optionalString.HasValue()) {
-                newElement_0.optionalString = [[NSString alloc] initWithBytes:entry_0.optionalString.Value().data()
-                                                                       length:entry_0.optionalString.Value().size()
-                                                                     encoding:NSUTF8StringEncoding];
-            } else {
-                newElement_0.optionalString = nil;
-            }
-            if (entry_0.nullableOptionalString.HasValue()) {
-                if (entry_0.nullableOptionalString.Value().IsNull()) {
-                    newElement_0.nullableOptionalString = nil;
-                } else {
-                    newElement_0.nullableOptionalString =
-                        [[NSString alloc] initWithBytes:entry_0.nullableOptionalString.Value().Value().data()
-                                                 length:entry_0.nullableOptionalString.Value().Value().size()
-                                               encoding:NSUTF8StringEncoding];
-                }
-            } else {
-                newElement_0.nullableOptionalString = nil;
-            }
-            if (entry_0.nullableStruct.IsNull()) {
-                newElement_0.nullableStruct = nil;
-            } else {
-                newElement_0.nullableStruct = [CHIPTestClusterClusterSimpleStruct new];
-                newElement_0.nullableStruct.a = [NSNumber numberWithUnsignedChar:entry_0.nullableStruct.Value().a];
-                newElement_0.nullableStruct.b = [NSNumber numberWithBool:entry_0.nullableStruct.Value().b];
-                newElement_0.nullableStruct.c =
-                    [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.nullableStruct.Value().c)];
-                newElement_0.nullableStruct.d = [NSData dataWithBytes:entry_0.nullableStruct.Value().d.data()
-                                                               length:entry_0.nullableStruct.Value().d.size()];
-                newElement_0.nullableStruct.e = [[NSString alloc] initWithBytes:entry_0.nullableStruct.Value().e.data()
-                                                                         length:entry_0.nullableStruct.Value().e.size()
-                                                                       encoding:NSUTF8StringEncoding];
-                newElement_0.nullableStruct.f = [NSNumber numberWithUnsignedChar:entry_0.nullableStruct.Value().f.Raw()];
-                newElement_0.nullableStruct.g = [NSNumber numberWithFloat:entry_0.nullableStruct.Value().g];
-                newElement_0.nullableStruct.h = [NSNumber numberWithDouble:entry_0.nullableStruct.Value().h];
-            }
-            if (entry_0.optionalStruct.HasValue()) {
-                newElement_0.optionalStruct = [CHIPTestClusterClusterSimpleStruct new];
-                newElement_0.optionalStruct.a = [NSNumber numberWithUnsignedChar:entry_0.optionalStruct.Value().a];
-                newElement_0.optionalStruct.b = [NSNumber numberWithBool:entry_0.optionalStruct.Value().b];
-                newElement_0.optionalStruct.c =
-                    [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.optionalStruct.Value().c)];
-                newElement_0.optionalStruct.d = [NSData dataWithBytes:entry_0.optionalStruct.Value().d.data()
-                                                               length:entry_0.optionalStruct.Value().d.size()];
-                newElement_0.optionalStruct.e = [[NSString alloc] initWithBytes:entry_0.optionalStruct.Value().e.data()
-                                                                         length:entry_0.optionalStruct.Value().e.size()
-                                                                       encoding:NSUTF8StringEncoding];
-                newElement_0.optionalStruct.f = [NSNumber numberWithUnsignedChar:entry_0.optionalStruct.Value().f.Raw()];
-                newElement_0.optionalStruct.g = [NSNumber numberWithFloat:entry_0.optionalStruct.Value().g];
-                newElement_0.optionalStruct.h = [NSNumber numberWithDouble:entry_0.optionalStruct.Value().h];
-            } else {
-                newElement_0.optionalStruct = nil;
-            }
-            if (entry_0.nullableOptionalStruct.HasValue()) {
-                if (entry_0.nullableOptionalStruct.Value().IsNull()) {
-                    newElement_0.nullableOptionalStruct = nil;
-                } else {
-                    newElement_0.nullableOptionalStruct = [CHIPTestClusterClusterSimpleStruct new];
-                    newElement_0.nullableOptionalStruct.a =
-                        [NSNumber numberWithUnsignedChar:entry_0.nullableOptionalStruct.Value().Value().a];
-                    newElement_0.nullableOptionalStruct.b =
-                        [NSNumber numberWithBool:entry_0.nullableOptionalStruct.Value().Value().b];
-                    newElement_0.nullableOptionalStruct.c =
-                        [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.nullableOptionalStruct.Value().Value().c)];
-                    newElement_0.nullableOptionalStruct.d =
-                        [NSData dataWithBytes:entry_0.nullableOptionalStruct.Value().Value().d.data()
-                                       length:entry_0.nullableOptionalStruct.Value().Value().d.size()];
-                    newElement_0.nullableOptionalStruct.e =
-                        [[NSString alloc] initWithBytes:entry_0.nullableOptionalStruct.Value().Value().e.data()
-                                                 length:entry_0.nullableOptionalStruct.Value().Value().e.size()
-                                               encoding:NSUTF8StringEncoding];
-                    newElement_0.nullableOptionalStruct.f =
-                        [NSNumber numberWithUnsignedChar:entry_0.nullableOptionalStruct.Value().Value().f.Raw()];
-                    newElement_0.nullableOptionalStruct.g =
-                        [NSNumber numberWithFloat:entry_0.nullableOptionalStruct.Value().Value().g];
-                    newElement_0.nullableOptionalStruct.h =
-                        [NSNumber numberWithDouble:entry_0.nullableOptionalStruct.Value().Value().h];
-                }
-            } else {
-                newElement_0.nullableOptionalStruct = nil;
-            }
-            if (entry_0.nullableList.IsNull()) {
-                newElement_0.nullableList = nil;
-            } else {
-                { // Scope for our temporary variables
-                    auto * array_3 = [NSMutableArray new];
-                    auto iter_3 = entry_0.nullableList.Value().begin();
-                    while (iter_3.Next()) {
-                        auto & entry_3 = iter_3.GetValue();
-                        NSNumber * newElement_3;
-                        newElement_3 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_3)];
-                        [array_3 addObject:newElement_3];
-                    }
-                    CHIP_ERROR err = iter_3.GetStatus();
-                    if (err != CHIP_NO_ERROR) {
-                        OnFailureFn(context, err);
-                        return;
-                    }
-                    newElement_0.nullableList = array_3;
-                }
-            }
-            if (entry_0.optionalList.HasValue()) {
-                { // Scope for our temporary variables
-                    auto * array_3 = [NSMutableArray new];
-                    auto iter_3 = entry_0.optionalList.Value().begin();
-                    while (iter_3.Next()) {
-                        auto & entry_3 = iter_3.GetValue();
-                        NSNumber * newElement_3;
-                        newElement_3 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_3)];
-                        [array_3 addObject:newElement_3];
-                    }
-                    CHIP_ERROR err = iter_3.GetStatus();
-                    if (err != CHIP_NO_ERROR) {
-                        OnFailureFn(context, err);
-                        return;
-                    }
-                    newElement_0.optionalList = array_3;
-                }
-            } else {
-                newElement_0.optionalList = nil;
-            }
-            if (entry_0.nullableOptionalList.HasValue()) {
-                if (entry_0.nullableOptionalList.Value().IsNull()) {
-                    newElement_0.nullableOptionalList = nil;
-                } else {
-                    { // Scope for our temporary variables
-                        auto * array_4 = [NSMutableArray new];
-                        auto iter_4 = entry_0.nullableOptionalList.Value().Value().begin();
-                        while (iter_4.Next()) {
-                            auto & entry_4 = iter_4.GetValue();
-                            NSNumber * newElement_4;
-                            newElement_4 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_4)];
-                            [array_4 addObject:newElement_4];
-                        }
-                        CHIP_ERROR err = iter_4.GetStatus();
-                        if (err != CHIP_NO_ERROR) {
-                            OnFailureFn(context, err);
-                            return;
-                        }
-                        newElement_0.nullableOptionalList = array_4;
-                    }
-                }
-            } else {
-                newElement_0.nullableOptionalList = nil;
-            }
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -9535,10 +9213,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -9552,25 +9229,32 @@
     }
 }
 
-void CHIPTestClusterStructAttrStructAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType & value)
+void CHIPMediaPlaybackAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
-    CHIPTestClusterClusterSimpleStruct * _Nonnull objCValue;
-    objCValue = [CHIPTestClusterClusterSimpleStruct new];
-    objCValue.a = [NSNumber numberWithUnsignedChar:value.a];
-    objCValue.b = [NSNumber numberWithBool:value.b];
-    objCValue.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.c)];
-    objCValue.d = [NSData dataWithBytes:value.d.data() length:value.d.size()];
-    objCValue.e = [[NSString alloc] initWithBytes:value.e.data() length:value.e.size() encoding:NSUTF8StringEncoding];
-    objCValue.f = [NSNumber numberWithUnsignedChar:value.f.Raw()];
-    objCValue.g = [NSNumber numberWithFloat:value.g];
-    objCValue.h = [NSNumber numberWithDouble:value.h];
+    NSArray * _Nonnull objCValue;
+    { // Scope for our temporary variables
+        auto * array_0 = [NSMutableArray new];
+        auto iter_0 = value.begin();
+        while (iter_0.Next()) {
+            auto & entry_0 = iter_0.GetValue();
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            [array_0 addObject:newElement_0];
+        }
+        CHIP_ERROR err = iter_0.GetStatus();
+        if (err != CHIP_NO_ERROR) {
+            OnFailureFn(context, err);
+            return;
+        }
+        objCValue = array_0;
+    }
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTestClusterStructAttrStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPMediaPlaybackAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTestClusterStructAttrStructAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPMediaPlaybackAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -9584,8 +9268,8 @@
     }
 }
 
-void CHIPTestClusterListLongOctetStringListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & value)
+void CHIPMediaInputInputListListAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::InputInfo::DecodableType> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -9593,8 +9277,16 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            NSData * newElement_0;
-            newElement_0 = [NSData dataWithBytes:entry_0.data() length:entry_0.size()];
+            CHIPMediaInputClusterInputInfo * newElement_0;
+            newElement_0 = [CHIPMediaInputClusterInputInfo new];
+            newElement_0.index = [NSNumber numberWithUnsignedChar:entry_0.index];
+            newElement_0.inputType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.inputType)];
+            newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data()
+                                                         length:entry_0.name.size()
+                                                       encoding:NSUTF8StringEncoding];
+            newElement_0.descriptionString = [[NSString alloc] initWithBytes:entry_0.description.data()
+                                                                      length:entry_0.description.size()
+                                                                    encoding:NSUTF8StringEncoding];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -9607,9 +9299,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTestClusterListLongOctetStringListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPMediaInputInputListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTestClusterListLongOctetStringListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPMediaInputInputListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -9623,8 +9315,8 @@
     }
 }
 
-void CHIPTestClusterListFabricScopedListAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestFabricScoped::DecodableType> & value)
+void CHIPMediaInputGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -9632,64 +9324,8 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            CHIPTestClusterClusterTestFabricScoped * newElement_0;
-            newElement_0 = [CHIPTestClusterClusterTestFabricScoped new];
-            newElement_0.fabricSensitiveInt8u = [NSNumber numberWithUnsignedChar:entry_0.fabricSensitiveInt8u];
-            if (entry_0.optionalFabricSensitiveInt8u.HasValue()) {
-                newElement_0.optionalFabricSensitiveInt8u =
-                    [NSNumber numberWithUnsignedChar:entry_0.optionalFabricSensitiveInt8u.Value()];
-            } else {
-                newElement_0.optionalFabricSensitiveInt8u = nil;
-            }
-            if (entry_0.nullableFabricSensitiveInt8u.IsNull()) {
-                newElement_0.nullableFabricSensitiveInt8u = nil;
-            } else {
-                newElement_0.nullableFabricSensitiveInt8u =
-                    [NSNumber numberWithUnsignedChar:entry_0.nullableFabricSensitiveInt8u.Value()];
-            }
-            if (entry_0.nullableOptionalFabricSensitiveInt8u.HasValue()) {
-                if (entry_0.nullableOptionalFabricSensitiveInt8u.Value().IsNull()) {
-                    newElement_0.nullableOptionalFabricSensitiveInt8u = nil;
-                } else {
-                    newElement_0.nullableOptionalFabricSensitiveInt8u =
-                        [NSNumber numberWithUnsignedChar:entry_0.nullableOptionalFabricSensitiveInt8u.Value().Value()];
-                }
-            } else {
-                newElement_0.nullableOptionalFabricSensitiveInt8u = nil;
-            }
-            newElement_0.fabricSensitiveCharString = [[NSString alloc] initWithBytes:entry_0.fabricSensitiveCharString.data()
-                                                                              length:entry_0.fabricSensitiveCharString.size()
-                                                                            encoding:NSUTF8StringEncoding];
-            newElement_0.fabricSensitiveStruct = [CHIPTestClusterClusterSimpleStruct new];
-            newElement_0.fabricSensitiveStruct.a = [NSNumber numberWithUnsignedChar:entry_0.fabricSensitiveStruct.a];
-            newElement_0.fabricSensitiveStruct.b = [NSNumber numberWithBool:entry_0.fabricSensitiveStruct.b];
-            newElement_0.fabricSensitiveStruct.c =
-                [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.fabricSensitiveStruct.c)];
-            newElement_0.fabricSensitiveStruct.d = [NSData dataWithBytes:entry_0.fabricSensitiveStruct.d.data()
-                                                                  length:entry_0.fabricSensitiveStruct.d.size()];
-            newElement_0.fabricSensitiveStruct.e = [[NSString alloc] initWithBytes:entry_0.fabricSensitiveStruct.e.data()
-                                                                            length:entry_0.fabricSensitiveStruct.e.size()
-                                                                          encoding:NSUTF8StringEncoding];
-            newElement_0.fabricSensitiveStruct.f = [NSNumber numberWithUnsignedChar:entry_0.fabricSensitiveStruct.f.Raw()];
-            newElement_0.fabricSensitiveStruct.g = [NSNumber numberWithFloat:entry_0.fabricSensitiveStruct.g];
-            newElement_0.fabricSensitiveStruct.h = [NSNumber numberWithDouble:entry_0.fabricSensitiveStruct.h];
-            { // Scope for our temporary variables
-                auto * array_2 = [NSMutableArray new];
-                auto iter_2 = entry_0.fabricSensitiveInt8uList.begin();
-                while (iter_2.Next()) {
-                    auto & entry_2 = iter_2.GetValue();
-                    NSNumber * newElement_2;
-                    newElement_2 = [NSNumber numberWithUnsignedChar:entry_2];
-                    [array_2 addObject:newElement_2];
-                }
-                CHIP_ERROR err = iter_2.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    OnFailureFn(context, err);
-                    return;
-                }
-                newElement_0.fabricSensitiveInt8uList = array_2;
-            }
-            newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -9702,65 +9338,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTestClusterListFabricScopedListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPTestClusterListFabricScopedListAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPTestClusterNullableBitmap8AttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> & value)
-{
-    NSNumber * _Nullable objCValue;
-    if (value.IsNull()) {
-        objCValue = nil;
-    } else {
-        objCValue = [NSNumber numberWithUnsignedChar:value.Value().Raw()];
-    }
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPTestClusterNullableBitmap8AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPTestClusterNullableBitmap8AttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPTestClusterNullableBitmap16AttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> & value)
-{
-    NSNumber * _Nullable objCValue;
-    if (value.IsNull()) {
-        objCValue = nil;
-    } else {
-        objCValue = [NSNumber numberWithUnsignedShort:value.Value().Raw()];
-    }
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPTestClusterNullableBitmap16AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPMediaInputGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTestClusterNullableBitmap16AttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPMediaInputGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -9774,21 +9354,32 @@
     }
 }
 
-void CHIPTestClusterNullableBitmap32AttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> & value)
+void CHIPMediaInputAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
-    NSNumber * _Nullable objCValue;
-    if (value.IsNull()) {
-        objCValue = nil;
-    } else {
-        objCValue = [NSNumber numberWithUnsignedInt:value.Value().Raw()];
+    NSArray * _Nonnull objCValue;
+    { // Scope for our temporary variables
+        auto * array_0 = [NSMutableArray new];
+        auto iter_0 = value.begin();
+        while (iter_0.Next()) {
+            auto & entry_0 = iter_0.GetValue();
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            [array_0 addObject:newElement_0];
+        }
+        CHIP_ERROR err = iter_0.GetStatus();
+        if (err != CHIP_NO_ERROR) {
+            OnFailureFn(context, err);
+            return;
+        }
+        objCValue = array_0;
     }
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTestClusterNullableBitmap32AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPMediaInputAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTestClusterNullableBitmap32AttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPMediaInputAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -9802,21 +9393,32 @@
     }
 }
 
-void CHIPTestClusterNullableBitmap64AttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> & value)
+void CHIPMediaInputAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
-    NSNumber * _Nullable objCValue;
-    if (value.IsNull()) {
-        objCValue = nil;
-    } else {
-        objCValue = [NSNumber numberWithUnsignedLongLong:value.Value().Raw()];
+    NSArray * _Nonnull objCValue;
+    { // Scope for our temporary variables
+        auto * array_0 = [NSMutableArray new];
+        auto iter_0 = value.begin();
+        while (iter_0.Next()) {
+            auto & entry_0 = iter_0.GetValue();
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            [array_0 addObject:newElement_0];
+        }
+        CHIP_ERROR err = iter_0.GetStatus();
+        if (err != CHIP_NO_ERROR) {
+            OnFailureFn(context, err);
+            return;
+        }
+        objCValue = array_0;
     }
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTestClusterNullableBitmap64AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPMediaInputAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTestClusterNullableBitmap64AttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPMediaInputAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -9830,31 +9432,32 @@
     }
 }
 
-void CHIPTestClusterNullableStructStructAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType> & value)
+void CHIPLowPowerGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
-    CHIPTestClusterClusterSimpleStruct * _Nullable objCValue;
-    if (value.IsNull()) {
-        objCValue = nil;
-    } else {
-        objCValue = [CHIPTestClusterClusterSimpleStruct new];
-        objCValue.a = [NSNumber numberWithUnsignedChar:value.Value().a];
-        objCValue.b = [NSNumber numberWithBool:value.Value().b];
-        objCValue.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value().c)];
-        objCValue.d = [NSData dataWithBytes:value.Value().d.data() length:value.Value().d.size()];
-        objCValue.e = [[NSString alloc] initWithBytes:value.Value().e.data()
-                                               length:value.Value().e.size()
-                                             encoding:NSUTF8StringEncoding];
-        objCValue.f = [NSNumber numberWithUnsignedChar:value.Value().f.Raw()];
-        objCValue.g = [NSNumber numberWithFloat:value.Value().g];
-        objCValue.h = [NSNumber numberWithDouble:value.Value().h];
+    NSArray * _Nonnull objCValue;
+    { // Scope for our temporary variables
+        auto * array_0 = [NSMutableArray new];
+        auto iter_0 = value.begin();
+        while (iter_0.Next()) {
+            auto & entry_0 = iter_0.GetValue();
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            [array_0 addObject:newElement_0];
+        }
+        CHIP_ERROR err = iter_0.GetStatus();
+        if (err != CHIP_NO_ERROR) {
+            OnFailureFn(context, err);
+            return;
+        }
+        objCValue = array_0;
     }
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTestClusterNullableStructStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPLowPowerGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTestClusterNullableStructStructAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPLowPowerGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -9868,7 +9471,7 @@
     }
 }
 
-void CHIPTestClusterGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPLowPowerAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -9891,9 +9494,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTestClusterGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPLowPowerAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTestClusterGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPLowPowerAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -9907,8 +9510,8 @@
     }
 }
 
-void CHIPTestClusterAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPLowPowerAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -9930,9 +9533,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTestClusterAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPLowPowerAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTestClusterAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPLowPowerAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -9946,8 +9549,8 @@
     }
 }
 
-void CHIPTestClusterAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPKeypadInputGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -9969,9 +9572,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTestClusterAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPKeypadInputGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTestClusterAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPKeypadInputGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -9985,7 +9588,7 @@
     }
 }
 
-void CHIPThermostatGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPKeypadInputAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -10008,9 +9611,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPThermostatGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPKeypadInputAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPThermostatGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPKeypadInputAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -10024,8 +9627,8 @@
     }
 }
 
-void CHIPThermostatAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPKeypadInputAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -10047,9 +9650,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPThermostatAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPKeypadInputAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPThermostatAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPKeypadInputAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -10063,8 +9666,8 @@
     }
 }
 
-void CHIPThermostatAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPContentLauncherAcceptHeaderListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CharSpan> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -10072,8 +9675,8 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            NSString * newElement_0;
+            newElement_0 = [[NSString alloc] initWithBytes:entry_0.data() length:entry_0.size() encoding:NSUTF8StringEncoding];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -10086,9 +9689,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPThermostatAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPContentLauncherAcceptHeaderListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPThermostatAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPContentLauncherAcceptHeaderListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -10102,7 +9705,7 @@
     }
 }
 
-void CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPContentLauncherGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -10125,12 +9728,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPContentLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self
-        = static_cast<CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(
-            context);
+    auto * self = static_cast<CHIPContentLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -10144,7 +9744,7 @@
     }
 }
 
-void CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPContentLauncherAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -10167,11 +9767,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPContentLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(
-        context);
+    auto * self = static_cast<CHIPContentLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -10185,7 +9783,7 @@
     }
 }
 
-void CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPContentLauncherAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -10208,11 +9806,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPContentLauncherAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self
-        = static_cast<CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPContentLauncherAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -10226,9 +9822,8 @@
     }
 }
 
-void CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & value)
+void CHIPAudioOutputOutputListListAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::OutputInfo::DecodableType> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -10236,30 +9831,13 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            CHIPThreadNetworkDiagnosticsClusterNeighborTable * newElement_0;
-            newElement_0 = [CHIPThreadNetworkDiagnosticsClusterNeighborTable new];
-            newElement_0.extAddress = [NSNumber numberWithUnsignedLongLong:entry_0.extAddress];
-            newElement_0.age = [NSNumber numberWithUnsignedInt:entry_0.age];
-            newElement_0.rloc16 = [NSNumber numberWithUnsignedShort:entry_0.rloc16];
-            newElement_0.linkFrameCounter = [NSNumber numberWithUnsignedInt:entry_0.linkFrameCounter];
-            newElement_0.mleFrameCounter = [NSNumber numberWithUnsignedInt:entry_0.mleFrameCounter];
-            newElement_0.lqi = [NSNumber numberWithUnsignedChar:entry_0.lqi];
-            if (entry_0.averageRssi.IsNull()) {
-                newElement_0.averageRssi = nil;
-            } else {
-                newElement_0.averageRssi = [NSNumber numberWithChar:entry_0.averageRssi.Value()];
-            }
-            if (entry_0.lastRssi.IsNull()) {
-                newElement_0.lastRssi = nil;
-            } else {
-                newElement_0.lastRssi = [NSNumber numberWithChar:entry_0.lastRssi.Value()];
-            }
-            newElement_0.frameErrorRate = [NSNumber numberWithUnsignedChar:entry_0.frameErrorRate];
-            newElement_0.messageErrorRate = [NSNumber numberWithUnsignedChar:entry_0.messageErrorRate];
-            newElement_0.rxOnWhenIdle = [NSNumber numberWithBool:entry_0.rxOnWhenIdle];
-            newElement_0.fullThreadDevice = [NSNumber numberWithBool:entry_0.fullThreadDevice];
-            newElement_0.fullNetworkData = [NSNumber numberWithBool:entry_0.fullNetworkData];
-            newElement_0.isChild = [NSNumber numberWithBool:entry_0.isChild];
+            CHIPAudioOutputClusterOutputInfo * newElement_0;
+            newElement_0 = [CHIPAudioOutputClusterOutputInfo new];
+            newElement_0.index = [NSNumber numberWithUnsignedChar:entry_0.index];
+            newElement_0.outputType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.outputType)];
+            newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data()
+                                                         length:entry_0.name.size()
+                                                       encoding:NSUTF8StringEncoding];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -10272,9 +9850,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPAudioOutputOutputListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPAudioOutputOutputListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -10288,9 +9866,8 @@
     }
 }
 
-void CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> &
-        value)
+void CHIPAudioOutputGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -10298,18 +9875,8 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            CHIPThreadNetworkDiagnosticsClusterRouteTable * newElement_0;
-            newElement_0 = [CHIPThreadNetworkDiagnosticsClusterRouteTable new];
-            newElement_0.extAddress = [NSNumber numberWithUnsignedLongLong:entry_0.extAddress];
-            newElement_0.rloc16 = [NSNumber numberWithUnsignedShort:entry_0.rloc16];
-            newElement_0.routerId = [NSNumber numberWithUnsignedChar:entry_0.routerId];
-            newElement_0.nextHop = [NSNumber numberWithUnsignedChar:entry_0.nextHop];
-            newElement_0.pathCost = [NSNumber numberWithUnsignedChar:entry_0.pathCost];
-            newElement_0.lqiIn = [NSNumber numberWithUnsignedChar:entry_0.LQIIn];
-            newElement_0.lqiOut = [NSNumber numberWithUnsignedChar:entry_0.LQIOut];
-            newElement_0.age = [NSNumber numberWithUnsignedChar:entry_0.age];
-            newElement_0.allocated = [NSNumber numberWithBool:entry_0.allocated];
-            newElement_0.linkEstablished = [NSNumber numberWithBool:entry_0.linkEstablished];
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -10322,9 +9889,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPAudioOutputGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPAudioOutputGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -10338,24 +9905,32 @@
     }
 }
 
-void CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> &
-        value)
+void CHIPAudioOutputAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
-    CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable objCValue;
-    if (value.IsNull()) {
-        objCValue = nil;
-    } else {
-        objCValue = [CHIPThreadNetworkDiagnosticsClusterSecurityPolicy new];
-        objCValue.rotationTime = [NSNumber numberWithUnsignedShort:value.Value().rotationTime];
-        objCValue.flags = [NSNumber numberWithUnsignedShort:value.Value().flags];
+    NSArray * _Nonnull objCValue;
+    { // Scope for our temporary variables
+        auto * array_0 = [NSMutableArray new];
+        auto iter_0 = value.begin();
+        while (iter_0.Next()) {
+            auto & entry_0 = iter_0.GetValue();
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            [array_0 addObject:newElement_0];
+        }
+        CHIP_ERROR err = iter_0.GetStatus();
+        if (err != CHIP_NO_ERROR) {
+            OnFailureFn(context, err);
+            return;
+        }
+        objCValue = array_0;
     }
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPAudioOutputAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPAudioOutputAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -10369,36 +9944,32 @@
     }
 }
 
-void CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::Nullable<
-        chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> & value)
+void CHIPAudioOutputAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
-    CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable objCValue;
-    if (value.IsNull()) {
-        objCValue = nil;
-    } else {
-        objCValue = [CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents new];
-        objCValue.activeTimestampPresent = [NSNumber numberWithBool:value.Value().activeTimestampPresent];
-        objCValue.pendingTimestampPresent = [NSNumber numberWithBool:value.Value().pendingTimestampPresent];
-        objCValue.masterKeyPresent = [NSNumber numberWithBool:value.Value().masterKeyPresent];
-        objCValue.networkNamePresent = [NSNumber numberWithBool:value.Value().networkNamePresent];
-        objCValue.extendedPanIdPresent = [NSNumber numberWithBool:value.Value().extendedPanIdPresent];
-        objCValue.meshLocalPrefixPresent = [NSNumber numberWithBool:value.Value().meshLocalPrefixPresent];
-        objCValue.delayPresent = [NSNumber numberWithBool:value.Value().delayPresent];
-        objCValue.panIdPresent = [NSNumber numberWithBool:value.Value().panIdPresent];
-        objCValue.channelPresent = [NSNumber numberWithBool:value.Value().channelPresent];
-        objCValue.pskcPresent = [NSNumber numberWithBool:value.Value().pskcPresent];
-        objCValue.securityPolicyPresent = [NSNumber numberWithBool:value.Value().securityPolicyPresent];
-        objCValue.channelMaskPresent = [NSNumber numberWithBool:value.Value().channelMaskPresent];
+    NSArray * _Nonnull objCValue;
+    { // Scope for our temporary variables
+        auto * array_0 = [NSMutableArray new];
+        auto iter_0 = value.begin();
+        while (iter_0.Next()) {
+            auto & entry_0 = iter_0.GetValue();
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            [array_0 addObject:newElement_0];
+        }
+        CHIP_ERROR err = iter_0.GetStatus();
+        if (err != CHIP_NO_ERROR) {
+            OnFailureFn(context, err);
+            return;
+        }
+        objCValue = array_0;
     }
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPAudioOutputAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self
-        = static_cast<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPAudioOutputAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -10412,8 +9983,8 @@
     }
 }
 
-void CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & value)
+void CHIPApplicationLauncherCatalogListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<uint16_t> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -10422,7 +9993,7 @@
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
             NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
+            newElement_0 = [NSNumber numberWithUnsignedShort:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -10435,11 +10006,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPApplicationLauncherCatalogListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self
-        = static_cast<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPApplicationLauncherCatalogListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -10453,7 +10022,45 @@
     }
 }
 
-void CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPApplicationLauncherCurrentAppStructAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::DecodableType> & value)
+{
+    CHIPApplicationLauncherClusterApplicationEP * _Nullable objCValue;
+    if (value.IsNull()) {
+        objCValue = nil;
+    } else {
+        objCValue = [CHIPApplicationLauncherClusterApplicationEP new];
+        objCValue.application = [CHIPApplicationLauncherClusterApplication new];
+        objCValue.application.catalogVendorId = [NSNumber numberWithUnsignedShort:value.Value().application.catalogVendorId];
+        objCValue.application.applicationId = [[NSString alloc] initWithBytes:value.Value().application.applicationId.data()
+                                                                       length:value.Value().application.applicationId.size()
+                                                                     encoding:NSUTF8StringEncoding];
+        if (value.Value().endpoint.HasValue()) {
+            objCValue.endpoint = [NSNumber numberWithUnsignedShort:value.Value().endpoint.Value()];
+        } else {
+            objCValue.endpoint = nil;
+        }
+    }
+    DispatchSuccess(context, objCValue);
+};
+
+void CHIPApplicationLauncherCurrentAppStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+{
+    auto * self = static_cast<CHIPApplicationLauncherCurrentAppStructAttributeCallbackSubscriptionBridge *>(context);
+    if (!self->mQueue) {
+        return;
+    }
+
+    if (self->mEstablishedHandler != nil) {
+        dispatch_async(self->mQueue, self->mEstablishedHandler);
+        // On failure, mEstablishedHandler will be cleaned up by our destructor,
+        // but we can clean it up earlier on successful subscription
+        // establishment.
+        self->mEstablishedHandler = nil;
+    }
+}
+
+void CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -10476,10 +10083,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -10493,7 +10099,7 @@
     }
 }
 
-void CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -10516,10 +10122,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -10533,7 +10138,7 @@
     }
 }
 
-void CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPApplicationLauncherAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -10556,9 +10161,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPApplicationLauncherAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPApplicationLauncherAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -10572,33 +10177,21 @@
     }
 }
 
-void CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::TimeFormatLocalization::CalendarType> & value)
+void CHIPApplicationBasicApplicationStructAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::DecodableType & value)
 {
-    NSArray * _Nonnull objCValue;
-    { // Scope for our temporary variables
-        auto * array_0 = [NSMutableArray new];
-        auto iter_0 = value.begin();
-        while (iter_0.Next()) {
-            auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
-            [array_0 addObject:newElement_0];
-        }
-        CHIP_ERROR err = iter_0.GetStatus();
-        if (err != CHIP_NO_ERROR) {
-            OnFailureFn(context, err);
-            return;
-        }
-        objCValue = array_0;
-    }
+    CHIPApplicationBasicClusterApplicationBasicApplication * _Nonnull objCValue;
+    objCValue = [CHIPApplicationBasicClusterApplicationBasicApplication new];
+    objCValue.catalogVendorId = [NSNumber numberWithUnsignedShort:value.catalogVendorId];
+    objCValue.applicationId = [[NSString alloc] initWithBytes:value.applicationId.data()
+                                                       length:value.applicationId.size()
+                                                     encoding:NSUTF8StringEncoding];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPApplicationBasicApplicationStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPApplicationBasicApplicationStructAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -10612,8 +10205,8 @@
     }
 }
 
-void CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPApplicationBasicAllowedVendorListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::VendorId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -10622,7 +10215,7 @@
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
             NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            newElement_0 = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_0)];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -10635,10 +10228,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPApplicationBasicAllowedVendorListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPApplicationBasicAllowedVendorListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -10652,7 +10244,7 @@
     }
 }
 
-void CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPApplicationBasicGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -10675,9 +10267,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPApplicationBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPApplicationBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -10691,8 +10283,8 @@
     }
 }
 
-void CHIPTimeFormatLocalizationAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPApplicationBasicAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -10714,9 +10306,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPTimeFormatLocalizationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPApplicationBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPTimeFormatLocalizationAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPApplicationBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -10730,8 +10322,8 @@
     }
 }
 
-void CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPApplicationBasicAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -10753,9 +10345,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPApplicationBasicAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPApplicationBasicAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -10769,7 +10361,7 @@
     }
 }
 
-void CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPAccountLoginGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -10792,9 +10384,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPAccountLoginGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPAccountLoginGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -10808,8 +10400,8 @@
     }
 }
 
-void CHIPUnitLocalizationAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPAccountLoginAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -10831,9 +10423,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPUnitLocalizationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPAccountLoginAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPUnitLocalizationAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPAccountLoginAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -10847,8 +10439,8 @@
     }
 }
 
-void CHIPUserLabelLabelListListAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::UserLabel::Structs::LabelStruct::DecodableType> & value)
+void CHIPAccountLoginAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -10856,14 +10448,8 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            CHIPUserLabelClusterLabelStruct * newElement_0;
-            newElement_0 = [CHIPUserLabelClusterLabelStruct new];
-            newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data()
-                                                          length:entry_0.label.size()
-                                                        encoding:NSUTF8StringEncoding];
-            newElement_0.value = [[NSString alloc] initWithBytes:entry_0.value.data()
-                                                          length:entry_0.value.size()
-                                                        encoding:NSUTF8StringEncoding];
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -10876,9 +10462,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPUserLabelLabelListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPAccountLoginAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPUserLabelLabelListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPAccountLoginAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -10892,7 +10478,7 @@
     }
 }
 
-void CHIPUserLabelGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -10915,9 +10501,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPUserLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPUserLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -10931,7 +10517,7 @@
     }
 }
 
-void CHIPUserLabelAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -10954,9 +10540,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPUserLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPUserLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -10970,7 +10556,7 @@
     }
 }
 
-void CHIPUserLabelAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void CHIPElectricalMeasurementAttributeListListAttributeCallbackBridge::OnSuccessFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
 {
     NSArray * _Nonnull objCValue;
@@ -10993,9 +10579,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPUserLabelAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPElectricalMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPUserLabelAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPElectricalMeasurementAttributeListListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -11009,32 +10595,17 @@
     }
 }
 
-void CHIPWakeOnLanGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPTestClusterBitmap8AttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value)
 {
-    NSArray * _Nonnull objCValue;
-    { // Scope for our temporary variables
-        auto * array_0 = [NSMutableArray new];
-        auto iter_0 = value.begin();
-        while (iter_0.Next()) {
-            auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-            [array_0 addObject:newElement_0];
-        }
-        CHIP_ERROR err = iter_0.GetStatus();
-        if (err != CHIP_NO_ERROR) {
-            OnFailureFn(context, err);
-            return;
-        }
-        objCValue = array_0;
-    }
+    NSNumber * _Nonnull objCValue;
+    objCValue = [NSNumber numberWithUnsignedChar:value.Raw()];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPWakeOnLanGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPTestClusterBitmap8AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPWakeOnLanGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPTestClusterBitmap8AttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -11048,32 +10619,17 @@
     }
 }
 
-void CHIPWakeOnLanAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPTestClusterBitmap16AttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value)
 {
-    NSArray * _Nonnull objCValue;
-    { // Scope for our temporary variables
-        auto * array_0 = [NSMutableArray new];
-        auto iter_0 = value.begin();
-        while (iter_0.Next()) {
-            auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-            [array_0 addObject:newElement_0];
-        }
-        CHIP_ERROR err = iter_0.GetStatus();
-        if (err != CHIP_NO_ERROR) {
-            OnFailureFn(context, err);
-            return;
-        }
-        objCValue = array_0;
-    }
+    NSNumber * _Nonnull objCValue;
+    objCValue = [NSNumber numberWithUnsignedShort:value.Raw()];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPWakeOnLanAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPTestClusterBitmap16AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPWakeOnLanAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPTestClusterBitmap16AttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -11087,32 +10643,17 @@
     }
 }
 
-void CHIPWakeOnLanAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPTestClusterBitmap32AttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value)
 {
-    NSArray * _Nonnull objCValue;
-    { // Scope for our temporary variables
-        auto * array_0 = [NSMutableArray new];
-        auto iter_0 = value.begin();
-        while (iter_0.Next()) {
-            auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-            [array_0 addObject:newElement_0];
-        }
-        CHIP_ERROR err = iter_0.GetStatus();
-        if (err != CHIP_NO_ERROR) {
-            OnFailureFn(context, err);
-            return;
-        }
-        objCValue = array_0;
-    }
+    NSNumber * _Nonnull objCValue;
+    objCValue = [NSNumber numberWithUnsignedInt:value.Raw()];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPWakeOnLanAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPTestClusterBitmap32AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPWakeOnLanAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPTestClusterBitmap32AttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -11126,33 +10667,17 @@
     }
 }
 
-void CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPTestClusterBitmap64AttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value)
 {
-    NSArray * _Nonnull objCValue;
-    { // Scope for our temporary variables
-        auto * array_0 = [NSMutableArray new];
-        auto iter_0 = value.begin();
-        while (iter_0.Next()) {
-            auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-            [array_0 addObject:newElement_0];
-        }
-        CHIP_ERROR err = iter_0.GetStatus();
-        if (err != CHIP_NO_ERROR) {
-            OnFailureFn(context, err);
-            return;
-        }
-        objCValue = array_0;
-    }
+    NSNumber * _Nonnull objCValue;
+    objCValue = [NSNumber numberWithUnsignedLongLong:value.Raw()];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
-    void * context)
+void CHIPTestClusterBitmap64AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPTestClusterBitmap64AttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -11166,8 +10691,8 @@
     }
 }
 
-void CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPTestClusterListInt8uListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<uint8_t> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -11176,7 +10701,7 @@
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
             NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -11189,9 +10714,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPTestClusterListInt8uListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPTestClusterListInt8uListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -11205,8 +10730,8 @@
     }
 }
 
-void CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+void CHIPTestClusterListOctetStringListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -11214,8 +10739,8 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            NSData * newElement_0;
+            newElement_0 = [NSData dataWithBytes:entry_0.data() length:entry_0.size()];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -11228,9 +10753,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPTestClusterListOctetStringListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPTestClusterListOctetStringListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -11244,41 +10769,35 @@
     }
 }
 
-void CHIPWindowCoveringConfigStatusAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> value)
-{
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedChar:value.Raw()];
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPWindowCoveringConfigStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPTestClusterListStructOctetStringListAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType> &
+        value)
 {
-    auto * self = static_cast<CHIPWindowCoveringConfigStatusAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
+    NSArray * _Nonnull objCValue;
+    { // Scope for our temporary variables
+        auto * array_0 = [NSMutableArray new];
+        auto iter_0 = value.begin();
+        while (iter_0.Next()) {
+            auto & entry_0 = iter_0.GetValue();
+            CHIPTestClusterClusterTestListStructOctet * newElement_0;
+            newElement_0 = [CHIPTestClusterClusterTestListStructOctet new];
+            newElement_0.member1 = [NSNumber numberWithUnsignedLongLong:entry_0.member1];
+            newElement_0.member2 = [NSData dataWithBytes:entry_0.member2.data() length:entry_0.member2.size()];
+            [array_0 addObject:newElement_0];
+        }
+        CHIP_ERROR err = iter_0.GetStatus();
+        if (err != CHIP_NO_ERROR) {
+            OnFailureFn(context, err);
+            return;
+        }
+        objCValue = array_0;
     }
-}
-
-void CHIPWindowCoveringOperationalStatusAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitMask<chip::app::Clusters::WindowCovering::OperationalStatus> value)
-{
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedChar:value.Raw()];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPWindowCoveringOperationalStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPTestClusterListStructOctetStringListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPWindowCoveringOperationalStatusAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPTestClusterListStructOctetStringListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -11292,17 +10811,206 @@
     }
 }
 
-void CHIPWindowCoveringModeAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitMask<chip::app::Clusters::WindowCovering::Mode> value)
+void CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::DecodableType> & value)
 {
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedChar:value.Raw()];
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPWindowCoveringModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+    NSArray * _Nonnull objCValue;
+    { // Scope for our temporary variables
+        auto * array_0 = [NSMutableArray new];
+        auto iter_0 = value.begin();
+        while (iter_0.Next()) {
+            auto & entry_0 = iter_0.GetValue();
+            CHIPTestClusterClusterNullablesAndOptionalsStruct * newElement_0;
+            newElement_0 = [CHIPTestClusterClusterNullablesAndOptionalsStruct new];
+            if (entry_0.nullableInt.IsNull()) {
+                newElement_0.nullableInt = nil;
+            } else {
+                newElement_0.nullableInt = [NSNumber numberWithUnsignedShort:entry_0.nullableInt.Value()];
+            }
+            if (entry_0.optionalInt.HasValue()) {
+                newElement_0.optionalInt = [NSNumber numberWithUnsignedShort:entry_0.optionalInt.Value()];
+            } else {
+                newElement_0.optionalInt = nil;
+            }
+            if (entry_0.nullableOptionalInt.HasValue()) {
+                if (entry_0.nullableOptionalInt.Value().IsNull()) {
+                    newElement_0.nullableOptionalInt = nil;
+                } else {
+                    newElement_0.nullableOptionalInt =
+                        [NSNumber numberWithUnsignedShort:entry_0.nullableOptionalInt.Value().Value()];
+                }
+            } else {
+                newElement_0.nullableOptionalInt = nil;
+            }
+            if (entry_0.nullableString.IsNull()) {
+                newElement_0.nullableString = nil;
+            } else {
+                newElement_0.nullableString = [[NSString alloc] initWithBytes:entry_0.nullableString.Value().data()
+                                                                       length:entry_0.nullableString.Value().size()
+                                                                     encoding:NSUTF8StringEncoding];
+            }
+            if (entry_0.optionalString.HasValue()) {
+                newElement_0.optionalString = [[NSString alloc] initWithBytes:entry_0.optionalString.Value().data()
+                                                                       length:entry_0.optionalString.Value().size()
+                                                                     encoding:NSUTF8StringEncoding];
+            } else {
+                newElement_0.optionalString = nil;
+            }
+            if (entry_0.nullableOptionalString.HasValue()) {
+                if (entry_0.nullableOptionalString.Value().IsNull()) {
+                    newElement_0.nullableOptionalString = nil;
+                } else {
+                    newElement_0.nullableOptionalString =
+                        [[NSString alloc] initWithBytes:entry_0.nullableOptionalString.Value().Value().data()
+                                                 length:entry_0.nullableOptionalString.Value().Value().size()
+                                               encoding:NSUTF8StringEncoding];
+                }
+            } else {
+                newElement_0.nullableOptionalString = nil;
+            }
+            if (entry_0.nullableStruct.IsNull()) {
+                newElement_0.nullableStruct = nil;
+            } else {
+                newElement_0.nullableStruct = [CHIPTestClusterClusterSimpleStruct new];
+                newElement_0.nullableStruct.a = [NSNumber numberWithUnsignedChar:entry_0.nullableStruct.Value().a];
+                newElement_0.nullableStruct.b = [NSNumber numberWithBool:entry_0.nullableStruct.Value().b];
+                newElement_0.nullableStruct.c =
+                    [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.nullableStruct.Value().c)];
+                newElement_0.nullableStruct.d = [NSData dataWithBytes:entry_0.nullableStruct.Value().d.data()
+                                                               length:entry_0.nullableStruct.Value().d.size()];
+                newElement_0.nullableStruct.e = [[NSString alloc] initWithBytes:entry_0.nullableStruct.Value().e.data()
+                                                                         length:entry_0.nullableStruct.Value().e.size()
+                                                                       encoding:NSUTF8StringEncoding];
+                newElement_0.nullableStruct.f = [NSNumber numberWithUnsignedChar:entry_0.nullableStruct.Value().f.Raw()];
+                newElement_0.nullableStruct.g = [NSNumber numberWithFloat:entry_0.nullableStruct.Value().g];
+                newElement_0.nullableStruct.h = [NSNumber numberWithDouble:entry_0.nullableStruct.Value().h];
+            }
+            if (entry_0.optionalStruct.HasValue()) {
+                newElement_0.optionalStruct = [CHIPTestClusterClusterSimpleStruct new];
+                newElement_0.optionalStruct.a = [NSNumber numberWithUnsignedChar:entry_0.optionalStruct.Value().a];
+                newElement_0.optionalStruct.b = [NSNumber numberWithBool:entry_0.optionalStruct.Value().b];
+                newElement_0.optionalStruct.c =
+                    [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.optionalStruct.Value().c)];
+                newElement_0.optionalStruct.d = [NSData dataWithBytes:entry_0.optionalStruct.Value().d.data()
+                                                               length:entry_0.optionalStruct.Value().d.size()];
+                newElement_0.optionalStruct.e = [[NSString alloc] initWithBytes:entry_0.optionalStruct.Value().e.data()
+                                                                         length:entry_0.optionalStruct.Value().e.size()
+                                                                       encoding:NSUTF8StringEncoding];
+                newElement_0.optionalStruct.f = [NSNumber numberWithUnsignedChar:entry_0.optionalStruct.Value().f.Raw()];
+                newElement_0.optionalStruct.g = [NSNumber numberWithFloat:entry_0.optionalStruct.Value().g];
+                newElement_0.optionalStruct.h = [NSNumber numberWithDouble:entry_0.optionalStruct.Value().h];
+            } else {
+                newElement_0.optionalStruct = nil;
+            }
+            if (entry_0.nullableOptionalStruct.HasValue()) {
+                if (entry_0.nullableOptionalStruct.Value().IsNull()) {
+                    newElement_0.nullableOptionalStruct = nil;
+                } else {
+                    newElement_0.nullableOptionalStruct = [CHIPTestClusterClusterSimpleStruct new];
+                    newElement_0.nullableOptionalStruct.a =
+                        [NSNumber numberWithUnsignedChar:entry_0.nullableOptionalStruct.Value().Value().a];
+                    newElement_0.nullableOptionalStruct.b =
+                        [NSNumber numberWithBool:entry_0.nullableOptionalStruct.Value().Value().b];
+                    newElement_0.nullableOptionalStruct.c =
+                        [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.nullableOptionalStruct.Value().Value().c)];
+                    newElement_0.nullableOptionalStruct.d =
+                        [NSData dataWithBytes:entry_0.nullableOptionalStruct.Value().Value().d.data()
+                                       length:entry_0.nullableOptionalStruct.Value().Value().d.size()];
+                    newElement_0.nullableOptionalStruct.e =
+                        [[NSString alloc] initWithBytes:entry_0.nullableOptionalStruct.Value().Value().e.data()
+                                                 length:entry_0.nullableOptionalStruct.Value().Value().e.size()
+                                               encoding:NSUTF8StringEncoding];
+                    newElement_0.nullableOptionalStruct.f =
+                        [NSNumber numberWithUnsignedChar:entry_0.nullableOptionalStruct.Value().Value().f.Raw()];
+                    newElement_0.nullableOptionalStruct.g =
+                        [NSNumber numberWithFloat:entry_0.nullableOptionalStruct.Value().Value().g];
+                    newElement_0.nullableOptionalStruct.h =
+                        [NSNumber numberWithDouble:entry_0.nullableOptionalStruct.Value().Value().h];
+                }
+            } else {
+                newElement_0.nullableOptionalStruct = nil;
+            }
+            if (entry_0.nullableList.IsNull()) {
+                newElement_0.nullableList = nil;
+            } else {
+                { // Scope for our temporary variables
+                    auto * array_3 = [NSMutableArray new];
+                    auto iter_3 = entry_0.nullableList.Value().begin();
+                    while (iter_3.Next()) {
+                        auto & entry_3 = iter_3.GetValue();
+                        NSNumber * newElement_3;
+                        newElement_3 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_3)];
+                        [array_3 addObject:newElement_3];
+                    }
+                    CHIP_ERROR err = iter_3.GetStatus();
+                    if (err != CHIP_NO_ERROR) {
+                        OnFailureFn(context, err);
+                        return;
+                    }
+                    newElement_0.nullableList = array_3;
+                }
+            }
+            if (entry_0.optionalList.HasValue()) {
+                { // Scope for our temporary variables
+                    auto * array_3 = [NSMutableArray new];
+                    auto iter_3 = entry_0.optionalList.Value().begin();
+                    while (iter_3.Next()) {
+                        auto & entry_3 = iter_3.GetValue();
+                        NSNumber * newElement_3;
+                        newElement_3 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_3)];
+                        [array_3 addObject:newElement_3];
+                    }
+                    CHIP_ERROR err = iter_3.GetStatus();
+                    if (err != CHIP_NO_ERROR) {
+                        OnFailureFn(context, err);
+                        return;
+                    }
+                    newElement_0.optionalList = array_3;
+                }
+            } else {
+                newElement_0.optionalList = nil;
+            }
+            if (entry_0.nullableOptionalList.HasValue()) {
+                if (entry_0.nullableOptionalList.Value().IsNull()) {
+                    newElement_0.nullableOptionalList = nil;
+                } else {
+                    { // Scope for our temporary variables
+                        auto * array_4 = [NSMutableArray new];
+                        auto iter_4 = entry_0.nullableOptionalList.Value().Value().begin();
+                        while (iter_4.Next()) {
+                            auto & entry_4 = iter_4.GetValue();
+                            NSNumber * newElement_4;
+                            newElement_4 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_4)];
+                            [array_4 addObject:newElement_4];
+                        }
+                        CHIP_ERROR err = iter_4.GetStatus();
+                        if (err != CHIP_NO_ERROR) {
+                            OnFailureFn(context, err);
+                            return;
+                        }
+                        newElement_0.nullableOptionalList = array_4;
+                    }
+                }
+            } else {
+                newElement_0.nullableOptionalList = nil;
+            }
+            [array_0 addObject:newElement_0];
+        }
+        CHIP_ERROR err = iter_0.GetStatus();
+        if (err != CHIP_NO_ERROR) {
+            OnFailureFn(context, err);
+            return;
+        }
+        objCValue = array_0;
+    }
+    DispatchSuccess(context, objCValue);
+};
+
+void CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
+    void * context)
 {
-    auto * self = static_cast<CHIPWindowCoveringModeAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -11316,17 +11024,25 @@
     }
 }
 
-void CHIPWindowCoveringSafetyStatusAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::BitMask<chip::app::Clusters::WindowCovering::SafetyStatus> value)
+void CHIPTestClusterStructAttrStructAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType & value)
 {
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedShort:value.Raw()];
+    CHIPTestClusterClusterSimpleStruct * _Nonnull objCValue;
+    objCValue = [CHIPTestClusterClusterSimpleStruct new];
+    objCValue.a = [NSNumber numberWithUnsignedChar:value.a];
+    objCValue.b = [NSNumber numberWithBool:value.b];
+    objCValue.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.c)];
+    objCValue.d = [NSData dataWithBytes:value.d.data() length:value.d.size()];
+    objCValue.e = [[NSString alloc] initWithBytes:value.e.data() length:value.e.size() encoding:NSUTF8StringEncoding];
+    objCValue.f = [NSNumber numberWithUnsignedChar:value.f.Raw()];
+    objCValue.g = [NSNumber numberWithFloat:value.g];
+    objCValue.h = [NSNumber numberWithDouble:value.h];
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPWindowCoveringSafetyStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPTestClusterStructAttrStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPWindowCoveringSafetyStatusAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPTestClusterStructAttrStructAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -11340,8 +11056,8 @@
     }
 }
 
-void CHIPWindowCoveringGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPTestClusterListLongOctetStringListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -11349,8 +11065,8 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            NSData * newElement_0;
+            newElement_0 = [NSData dataWithBytes:entry_0.data() length:entry_0.size()];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -11363,9 +11079,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPWindowCoveringGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPTestClusterListLongOctetStringListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPWindowCoveringGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPTestClusterListLongOctetStringListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -11379,8 +11095,8 @@
     }
 }
 
-void CHIPWindowCoveringAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+void CHIPTestClusterListFabricScopedListAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestFabricScoped::DecodableType> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -11388,47 +11104,64 @@
         auto iter_0 = value.begin();
         while (iter_0.Next()) {
             auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
-            [array_0 addObject:newElement_0];
-        }
-        CHIP_ERROR err = iter_0.GetStatus();
-        if (err != CHIP_NO_ERROR) {
-            OnFailureFn(context, err);
-            return;
-        }
-        objCValue = array_0;
-    }
-    DispatchSuccess(context, objCValue);
-};
-
-void CHIPWindowCoveringAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
-{
-    auto * self = static_cast<CHIPWindowCoveringAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
-    if (!self->mQueue) {
-        return;
-    }
-
-    if (self->mEstablishedHandler != nil) {
-        dispatch_async(self->mQueue, self->mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        self->mEstablishedHandler = nil;
-    }
-}
-
-void CHIPWindowCoveringAttributeListListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
-{
-    NSArray * _Nonnull objCValue;
-    { // Scope for our temporary variables
-        auto * array_0 = [NSMutableArray new];
-        auto iter_0 = value.begin();
-        while (iter_0.Next()) {
-            auto & entry_0 = iter_0.GetValue();
-            NSNumber * newElement_0;
-            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            CHIPTestClusterClusterTestFabricScoped * newElement_0;
+            newElement_0 = [CHIPTestClusterClusterTestFabricScoped new];
+            newElement_0.fabricSensitiveInt8u = [NSNumber numberWithUnsignedChar:entry_0.fabricSensitiveInt8u];
+            if (entry_0.optionalFabricSensitiveInt8u.HasValue()) {
+                newElement_0.optionalFabricSensitiveInt8u =
+                    [NSNumber numberWithUnsignedChar:entry_0.optionalFabricSensitiveInt8u.Value()];
+            } else {
+                newElement_0.optionalFabricSensitiveInt8u = nil;
+            }
+            if (entry_0.nullableFabricSensitiveInt8u.IsNull()) {
+                newElement_0.nullableFabricSensitiveInt8u = nil;
+            } else {
+                newElement_0.nullableFabricSensitiveInt8u =
+                    [NSNumber numberWithUnsignedChar:entry_0.nullableFabricSensitiveInt8u.Value()];
+            }
+            if (entry_0.nullableOptionalFabricSensitiveInt8u.HasValue()) {
+                if (entry_0.nullableOptionalFabricSensitiveInt8u.Value().IsNull()) {
+                    newElement_0.nullableOptionalFabricSensitiveInt8u = nil;
+                } else {
+                    newElement_0.nullableOptionalFabricSensitiveInt8u =
+                        [NSNumber numberWithUnsignedChar:entry_0.nullableOptionalFabricSensitiveInt8u.Value().Value()];
+                }
+            } else {
+                newElement_0.nullableOptionalFabricSensitiveInt8u = nil;
+            }
+            newElement_0.fabricSensitiveCharString = [[NSString alloc] initWithBytes:entry_0.fabricSensitiveCharString.data()
+                                                                              length:entry_0.fabricSensitiveCharString.size()
+                                                                            encoding:NSUTF8StringEncoding];
+            newElement_0.fabricSensitiveStruct = [CHIPTestClusterClusterSimpleStruct new];
+            newElement_0.fabricSensitiveStruct.a = [NSNumber numberWithUnsignedChar:entry_0.fabricSensitiveStruct.a];
+            newElement_0.fabricSensitiveStruct.b = [NSNumber numberWithBool:entry_0.fabricSensitiveStruct.b];
+            newElement_0.fabricSensitiveStruct.c =
+                [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.fabricSensitiveStruct.c)];
+            newElement_0.fabricSensitiveStruct.d = [NSData dataWithBytes:entry_0.fabricSensitiveStruct.d.data()
+                                                                  length:entry_0.fabricSensitiveStruct.d.size()];
+            newElement_0.fabricSensitiveStruct.e = [[NSString alloc] initWithBytes:entry_0.fabricSensitiveStruct.e.data()
+                                                                            length:entry_0.fabricSensitiveStruct.e.size()
+                                                                          encoding:NSUTF8StringEncoding];
+            newElement_0.fabricSensitiveStruct.f = [NSNumber numberWithUnsignedChar:entry_0.fabricSensitiveStruct.f.Raw()];
+            newElement_0.fabricSensitiveStruct.g = [NSNumber numberWithFloat:entry_0.fabricSensitiveStruct.g];
+            newElement_0.fabricSensitiveStruct.h = [NSNumber numberWithDouble:entry_0.fabricSensitiveStruct.h];
+            { // Scope for our temporary variables
+                auto * array_2 = [NSMutableArray new];
+                auto iter_2 = entry_0.fabricSensitiveInt8uList.begin();
+                while (iter_2.Next()) {
+                    auto & entry_2 = iter_2.GetValue();
+                    NSNumber * newElement_2;
+                    newElement_2 = [NSNumber numberWithUnsignedChar:entry_2];
+                    [array_2 addObject:newElement_2];
+                }
+                CHIP_ERROR err = iter_2.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    OnFailureFn(context, err);
+                    return;
+                }
+                newElement_0.fabricSensitiveInt8uList = array_2;
+            }
+            newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
             [array_0 addObject:newElement_0];
         }
         CHIP_ERROR err = iter_0.GetStatus();
@@ -11441,9 +11174,9 @@
     DispatchSuccess(context, objCValue);
 };
 
-void CHIPWindowCoveringAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void CHIPTestClusterListFabricScopedListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * self = static_cast<CHIPWindowCoveringAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    auto * self = static_cast<CHIPTestClusterListFabricScopedListAttributeCallbackSubscriptionBridge *>(context);
     if (!self->mQueue) {
         return;
     }
@@ -11457,260 +11190,441 @@
     }
 }
 
-void CHIPAccountLoginClusterGetSetupPINResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::AccountLogin::Commands::GetSetupPINResponse::DecodableType & data)
+void CHIPTestClusterNullableBitmap8AttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> & value)
 {
-    auto * response = [CHIPAccountLoginClusterGetSetupPINResponseParams new];
-    {
-        response.setupPIN = [[NSString alloc] initWithBytes:data.setupPIN.data()
-                                                     length:data.setupPIN.size()
-                                                   encoding:NSUTF8StringEncoding];
+    NSNumber * _Nullable objCValue;
+    if (value.IsNull()) {
+        objCValue = nil;
+    } else {
+        objCValue = [NSNumber numberWithUnsignedChar:value.Value().Raw()];
     }
-    DispatchSuccess(context, response);
+    DispatchSuccess(context, objCValue);
 };
 
-void CHIPApplicationLauncherClusterLauncherResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType & data)
+void CHIPTestClusterNullableBitmap8AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * response = [CHIPApplicationLauncherClusterLauncherResponseParams new];
-    {
-        response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)];
+    auto * self = static_cast<CHIPTestClusterNullableBitmap8AttributeCallbackSubscriptionBridge *>(context);
+    if (!self->mQueue) {
+        return;
     }
-    {
-        response.data = [NSData dataWithBytes:data.data.data() length:data.data.size()];
+
+    if (self->mEstablishedHandler != nil) {
+        dispatch_async(self->mQueue, self->mEstablishedHandler);
+        // On failure, mEstablishedHandler will be cleaned up by our destructor,
+        // but we can clean it up earlier on successful subscription
+        // establishment.
+        self->mEstablishedHandler = nil;
     }
-    DispatchSuccess(context, response);
-};
+}
 
-void CHIPChannelClusterChangeChannelResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::Channel::Commands::ChangeChannelResponse::DecodableType & data)
+void CHIPTestClusterNullableBitmap16AttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> & value)
 {
-    auto * response = [CHIPChannelClusterChangeChannelResponseParams new];
-    {
-        response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)];
-    }
-    {
-        if (data.data.HasValue()) {
-            response.data = [[NSString alloc] initWithBytes:data.data.Value().data()
-                                                     length:data.data.Value().size()
-                                                   encoding:NSUTF8StringEncoding];
-        } else {
-            response.data = nil;
-        }
+    NSNumber * _Nullable objCValue;
+    if (value.IsNull()) {
+        objCValue = nil;
+    } else {
+        objCValue = [NSNumber numberWithUnsignedShort:value.Value().Raw()];
     }
-    DispatchSuccess(context, response);
+    DispatchSuccess(context, objCValue);
 };
 
-void CHIPContentLauncherClusterLaunchResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & data)
+void CHIPTestClusterNullableBitmap16AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * response = [CHIPContentLauncherClusterLaunchResponseParams new];
-    {
-        response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)];
+    auto * self = static_cast<CHIPTestClusterNullableBitmap16AttributeCallbackSubscriptionBridge *>(context);
+    if (!self->mQueue) {
+        return;
     }
-    {
-        if (data.data.HasValue()) {
-            response.data = [[NSString alloc] initWithBytes:data.data.Value().data()
-                                                     length:data.data.Value().size()
-                                                   encoding:NSUTF8StringEncoding];
-        } else {
-            response.data = nil;
-        }
+
+    if (self->mEstablishedHandler != nil) {
+        dispatch_async(self->mQueue, self->mEstablishedHandler);
+        // On failure, mEstablishedHandler will be cleaned up by our destructor,
+        // but we can clean it up earlier on successful subscription
+        // establishment.
+        self->mEstablishedHandler = nil;
     }
-    DispatchSuccess(context, response);
-};
+}
 
-void CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType & data)
+void CHIPTestClusterNullableBitmap32AttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> & value)
 {
-    auto * response = [CHIPDiagnosticLogsClusterRetrieveLogsResponseParams new];
-    {
-        response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)];
+    NSNumber * _Nullable objCValue;
+    if (value.IsNull()) {
+        objCValue = nil;
+    } else {
+        objCValue = [NSNumber numberWithUnsignedInt:value.Value().Raw()];
     }
-    {
-        response.content = [NSData dataWithBytes:data.content.data() length:data.content.size()];
+    DispatchSuccess(context, objCValue);
+};
+
+void CHIPTestClusterNullableBitmap32AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+{
+    auto * self = static_cast<CHIPTestClusterNullableBitmap32AttributeCallbackSubscriptionBridge *>(context);
+    if (!self->mQueue) {
+        return;
     }
-    {
-        response.timeStamp = [NSNumber numberWithUnsignedInt:data.timeStamp];
+
+    if (self->mEstablishedHandler != nil) {
+        dispatch_async(self->mQueue, self->mEstablishedHandler);
+        // On failure, mEstablishedHandler will be cleaned up by our destructor,
+        // but we can clean it up earlier on successful subscription
+        // establishment.
+        self->mEstablishedHandler = nil;
     }
-    {
-        response.timeSinceBoot = [NSNumber numberWithUnsignedInt:data.timeSinceBoot];
+}
+
+void CHIPTestClusterNullableBitmap64AttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> & value)
+{
+    NSNumber * _Nullable objCValue;
+    if (value.IsNull()) {
+        objCValue = nil;
+    } else {
+        objCValue = [NSNumber numberWithUnsignedLongLong:value.Value().Raw()];
     }
-    DispatchSuccess(context, response);
+    DispatchSuccess(context, objCValue);
 };
 
-void CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType & data)
+void CHIPTestClusterNullableBitmap64AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
 {
-    auto * response = [CHIPDoorLockClusterGetWeekDayScheduleResponseParams new];
-    {
-        response.weekDayIndex = [NSNumber numberWithUnsignedChar:data.weekDayIndex];
+    auto * self = static_cast<CHIPTestClusterNullableBitmap64AttributeCallbackSubscriptionBridge *>(context);
+    if (!self->mQueue) {
+        return;
     }
-    {
-        response.userIndex = [NSNumber numberWithUnsignedShort:data.userIndex];
+
+    if (self->mEstablishedHandler != nil) {
+        dispatch_async(self->mQueue, self->mEstablishedHandler);
+        // On failure, mEstablishedHandler will be cleaned up by our destructor,
+        // but we can clean it up earlier on successful subscription
+        // establishment.
+        self->mEstablishedHandler = nil;
     }
-    {
-        response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)];
+}
+
+void CHIPTestClusterNullableStructStructAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType> & value)
+{
+    CHIPTestClusterClusterSimpleStruct * _Nullable objCValue;
+    if (value.IsNull()) {
+        objCValue = nil;
+    } else {
+        objCValue = [CHIPTestClusterClusterSimpleStruct new];
+        objCValue.a = [NSNumber numberWithUnsignedChar:value.Value().a];
+        objCValue.b = [NSNumber numberWithBool:value.Value().b];
+        objCValue.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value().c)];
+        objCValue.d = [NSData dataWithBytes:value.Value().d.data() length:value.Value().d.size()];
+        objCValue.e = [[NSString alloc] initWithBytes:value.Value().e.data()
+                                               length:value.Value().e.size()
+                                             encoding:NSUTF8StringEncoding];
+        objCValue.f = [NSNumber numberWithUnsignedChar:value.Value().f.Raw()];
+        objCValue.g = [NSNumber numberWithFloat:value.Value().g];
+        objCValue.h = [NSNumber numberWithDouble:value.Value().h];
     }
-    {
-        if (data.daysMask.HasValue()) {
-            response.daysMask = [NSNumber numberWithUnsignedChar:data.daysMask.Value().Raw()];
-        } else {
-            response.daysMask = nil;
+    DispatchSuccess(context, objCValue);
+};
+
+void CHIPTestClusterNullableStructStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+{
+    auto * self = static_cast<CHIPTestClusterNullableStructStructAttributeCallbackSubscriptionBridge *>(context);
+    if (!self->mQueue) {
+        return;
+    }
+
+    if (self->mEstablishedHandler != nil) {
+        dispatch_async(self->mQueue, self->mEstablishedHandler);
+        // On failure, mEstablishedHandler will be cleaned up by our destructor,
+        // but we can clean it up earlier on successful subscription
+        // establishment.
+        self->mEstablishedHandler = nil;
+    }
+}
+
+void CHIPTestClusterGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+{
+    NSArray * _Nonnull objCValue;
+    { // Scope for our temporary variables
+        auto * array_0 = [NSMutableArray new];
+        auto iter_0 = value.begin();
+        while (iter_0.Next()) {
+            auto & entry_0 = iter_0.GetValue();
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            [array_0 addObject:newElement_0];
+        }
+        CHIP_ERROR err = iter_0.GetStatus();
+        if (err != CHIP_NO_ERROR) {
+            OnFailureFn(context, err);
+            return;
         }
+        objCValue = array_0;
     }
-    {
-        if (data.startHour.HasValue()) {
-            response.startHour = [NSNumber numberWithUnsignedChar:data.startHour.Value()];
-        } else {
-            response.startHour = nil;
+    DispatchSuccess(context, objCValue);
+};
+
+void CHIPTestClusterGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+{
+    auto * self = static_cast<CHIPTestClusterGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    if (!self->mQueue) {
+        return;
+    }
+
+    if (self->mEstablishedHandler != nil) {
+        dispatch_async(self->mQueue, self->mEstablishedHandler);
+        // On failure, mEstablishedHandler will be cleaned up by our destructor,
+        // but we can clean it up earlier on successful subscription
+        // establishment.
+        self->mEstablishedHandler = nil;
+    }
+}
+
+void CHIPTestClusterAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
+{
+    NSArray * _Nonnull objCValue;
+    { // Scope for our temporary variables
+        auto * array_0 = [NSMutableArray new];
+        auto iter_0 = value.begin();
+        while (iter_0.Next()) {
+            auto & entry_0 = iter_0.GetValue();
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            [array_0 addObject:newElement_0];
+        }
+        CHIP_ERROR err = iter_0.GetStatus();
+        if (err != CHIP_NO_ERROR) {
+            OnFailureFn(context, err);
+            return;
         }
+        objCValue = array_0;
     }
-    {
-        if (data.startMinute.HasValue()) {
-            response.startMinute = [NSNumber numberWithUnsignedChar:data.startMinute.Value()];
-        } else {
-            response.startMinute = nil;
+    DispatchSuccess(context, objCValue);
+};
+
+void CHIPTestClusterAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+{
+    auto * self = static_cast<CHIPTestClusterAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+    if (!self->mQueue) {
+        return;
+    }
+
+    if (self->mEstablishedHandler != nil) {
+        dispatch_async(self->mQueue, self->mEstablishedHandler);
+        // On failure, mEstablishedHandler will be cleaned up by our destructor,
+        // but we can clean it up earlier on successful subscription
+        // establishment.
+        self->mEstablishedHandler = nil;
+    }
+}
+
+void CHIPTestClusterAttributeListListAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
+{
+    NSArray * _Nonnull objCValue;
+    { // Scope for our temporary variables
+        auto * array_0 = [NSMutableArray new];
+        auto iter_0 = value.begin();
+        while (iter_0.Next()) {
+            auto & entry_0 = iter_0.GetValue();
+            NSNumber * newElement_0;
+            newElement_0 = [NSNumber numberWithUnsignedInt:entry_0];
+            [array_0 addObject:newElement_0];
+        }
+        CHIP_ERROR err = iter_0.GetStatus();
+        if (err != CHIP_NO_ERROR) {
+            OnFailureFn(context, err);
+            return;
         }
+        objCValue = array_0;
+    }
+    DispatchSuccess(context, objCValue);
+};
+
+void CHIPTestClusterAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+{
+    auto * self = static_cast<CHIPTestClusterAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+    if (!self->mQueue) {
+        return;
+    }
+
+    if (self->mEstablishedHandler != nil) {
+        dispatch_async(self->mQueue, self->mEstablishedHandler);
+        // On failure, mEstablishedHandler will be cleaned up by our destructor,
+        // but we can clean it up earlier on successful subscription
+        // establishment.
+        self->mEstablishedHandler = nil;
     }
+}
+
+void CHIPGroupsClusterAddGroupResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType & data)
+{
+    auto * response = [CHIPGroupsClusterAddGroupResponseParams new];
     {
-        if (data.endHour.HasValue()) {
-            response.endHour = [NSNumber numberWithUnsignedChar:data.endHour.Value()];
-        } else {
-            response.endHour = nil;
-        }
+        response.status = [NSNumber numberWithUnsignedChar:data.status];
     }
     {
-        if (data.endMinute.HasValue()) {
-            response.endMinute = [NSNumber numberWithUnsignedChar:data.endMinute.Value()];
-        } else {
-            response.endMinute = nil;
-        }
+        response.groupId = [NSNumber numberWithUnsignedShort:data.groupId];
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPDoorLockClusterGetYearDayScheduleResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType & data)
+void CHIPGroupsClusterViewGroupResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType & data)
 {
-    auto * response = [CHIPDoorLockClusterGetYearDayScheduleResponseParams new];
+    auto * response = [CHIPGroupsClusterViewGroupResponseParams new];
     {
-        response.yearDayIndex = [NSNumber numberWithUnsignedChar:data.yearDayIndex];
+        response.status = [NSNumber numberWithUnsignedChar:data.status];
     }
     {
-        response.userIndex = [NSNumber numberWithUnsignedShort:data.userIndex];
+        response.groupId = [NSNumber numberWithUnsignedShort:data.groupId];
     }
     {
-        response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)];
+        response.groupName = [[NSString alloc] initWithBytes:data.groupName.data()
+                                                      length:data.groupName.size()
+                                                    encoding:NSUTF8StringEncoding];
     }
+    DispatchSuccess(context, response);
+};
+
+void CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType & data)
+{
+    auto * response = [CHIPGroupsClusterGetGroupMembershipResponseParams new];
     {
-        if (data.localStartTime.HasValue()) {
-            response.localStartTime = [NSNumber numberWithUnsignedInt:data.localStartTime.Value()];
+        if (data.capacity.IsNull()) {
+            response.capacity = nil;
         } else {
-            response.localStartTime = nil;
+            response.capacity = [NSNumber numberWithUnsignedChar:data.capacity.Value()];
         }
     }
     {
-        if (data.localEndTime.HasValue()) {
-            response.localEndTime = [NSNumber numberWithUnsignedInt:data.localEndTime.Value()];
-        } else {
-            response.localEndTime = nil;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            auto iter_0 = data.groupList.begin();
+            while (iter_0.Next()) {
+                auto & entry_0 = iter_0.GetValue();
+                NSNumber * newElement_0;
+                newElement_0 = [NSNumber numberWithUnsignedShort:entry_0];
+                [array_0 addObject:newElement_0];
+            }
+            CHIP_ERROR err = iter_0.GetStatus();
+            if (err != CHIP_NO_ERROR) {
+                OnFailureFn(context, err);
+                return;
+            }
+            response.groupList = array_0;
         }
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType & data)
+void CHIPGroupsClusterRemoveGroupResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType & data)
 {
-    auto * response = [CHIPDoorLockClusterGetHolidayScheduleResponseParams new];
+    auto * response = [CHIPGroupsClusterRemoveGroupResponseParams new];
     {
-        response.holidayIndex = [NSNumber numberWithUnsignedChar:data.holidayIndex];
+        response.status = [NSNumber numberWithUnsignedChar:data.status];
     }
     {
-        response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)];
+        response.groupId = [NSNumber numberWithUnsignedShort:data.groupId];
     }
+    DispatchSuccess(context, response);
+};
+
+void CHIPScenesClusterAddSceneResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::Scenes::Commands::AddSceneResponse::DecodableType & data)
+{
+    auto * response = [CHIPScenesClusterAddSceneResponseParams new];
     {
-        if (data.localStartTime.HasValue()) {
-            response.localStartTime = [NSNumber numberWithUnsignedInt:data.localStartTime.Value()];
-        } else {
-            response.localStartTime = nil;
-        }
+        response.status = [NSNumber numberWithUnsignedChar:data.status];
     }
     {
-        if (data.localEndTime.HasValue()) {
-            response.localEndTime = [NSNumber numberWithUnsignedInt:data.localEndTime.Value()];
-        } else {
-            response.localEndTime = nil;
-        }
+        response.groupId = [NSNumber numberWithUnsignedShort:data.groupId];
     }
     {
-        if (data.operatingMode.HasValue()) {
-            response.operatingMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.operatingMode.Value())];
-        } else {
-            response.operatingMode = nil;
-        }
+        response.sceneId = [NSNumber numberWithUnsignedChar:data.sceneId];
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPDoorLockClusterGetUserResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType & data)
+void CHIPScenesClusterViewSceneResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::Scenes::Commands::ViewSceneResponse::DecodableType & data)
 {
-    auto * response = [CHIPDoorLockClusterGetUserResponseParams new];
+    auto * response = [CHIPScenesClusterViewSceneResponseParams new];
     {
-        response.userIndex = [NSNumber numberWithUnsignedShort:data.userIndex];
+        response.status = [NSNumber numberWithUnsignedChar:data.status];
     }
     {
-        if (data.userName.IsNull()) {
-            response.userName = nil;
-        } else {
-            response.userName = [[NSString alloc] initWithBytes:data.userName.Value().data()
-                                                         length:data.userName.Value().size()
-                                                       encoding:NSUTF8StringEncoding];
-        }
+        response.groupId = [NSNumber numberWithUnsignedShort:data.groupId];
     }
     {
-        if (data.userUniqueId.IsNull()) {
-            response.userUniqueId = nil;
-        } else {
-            response.userUniqueId = [NSNumber numberWithUnsignedInt:data.userUniqueId.Value()];
-        }
-    }
-    {
-        if (data.userStatus.IsNull()) {
-            response.userStatus = nil;
-        } else {
-            response.userStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.userStatus.Value())];
-        }
+        response.sceneId = [NSNumber numberWithUnsignedChar:data.sceneId];
     }
     {
-        if (data.userType.IsNull()) {
-            response.userType = nil;
+        if (data.transitionTime.HasValue()) {
+            response.transitionTime = [NSNumber numberWithUnsignedShort:data.transitionTime.Value()];
         } else {
-            response.userType = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.userType.Value())];
+            response.transitionTime = nil;
         }
     }
     {
-        if (data.credentialRule.IsNull()) {
-            response.credentialRule = nil;
+        if (data.sceneName.HasValue()) {
+            response.sceneName = [[NSString alloc] initWithBytes:data.sceneName.Value().data()
+                                                          length:data.sceneName.Value().size()
+                                                        encoding:NSUTF8StringEncoding];
         } else {
-            response.credentialRule = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.credentialRule.Value())];
+            response.sceneName = nil;
         }
     }
     {
-        if (data.credentials.IsNull()) {
-            response.credentials = nil;
-        } else {
+        if (data.extensionFieldSets.HasValue()) {
             { // Scope for our temporary variables
                 auto * array_1 = [NSMutableArray new];
-                auto iter_1 = data.credentials.Value().begin();
+                auto iter_1 = data.extensionFieldSets.Value().begin();
                 while (iter_1.Next()) {
                     auto & entry_1 = iter_1.GetValue();
-                    CHIPDoorLockClusterDlCredential * newElement_1;
-                    newElement_1 = [CHIPDoorLockClusterDlCredential new];
-                    newElement_1.credentialType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_1.credentialType)];
-                    newElement_1.credentialIndex = [NSNumber numberWithUnsignedShort:entry_1.credentialIndex];
+                    CHIPScenesClusterExtensionFieldSet * newElement_1;
+                    newElement_1 = [CHIPScenesClusterExtensionFieldSet new];
+                    newElement_1.clusterId = [NSNumber numberWithUnsignedInt:entry_1.clusterId];
+                    { // Scope for our temporary variables
+                        auto * array_3 = [NSMutableArray new];
+                        auto iter_3 = entry_1.attributeValueList.begin();
+                        while (iter_3.Next()) {
+                            auto & entry_3 = iter_3.GetValue();
+                            CHIPScenesClusterAttributeValuePair * newElement_3;
+                            newElement_3 = [CHIPScenesClusterAttributeValuePair new];
+                            if (entry_3.attributeId.HasValue()) {
+                                newElement_3.attributeId = [NSNumber numberWithUnsignedInt:entry_3.attributeId.Value()];
+                            } else {
+                                newElement_3.attributeId = nil;
+                            }
+                            { // Scope for our temporary variables
+                                auto * array_5 = [NSMutableArray new];
+                                auto iter_5 = entry_3.attributeValue.begin();
+                                while (iter_5.Next()) {
+                                    auto & entry_5 = iter_5.GetValue();
+                                    NSNumber * newElement_5;
+                                    newElement_5 = [NSNumber numberWithUnsignedChar:entry_5];
+                                    [array_5 addObject:newElement_5];
+                                }
+                                CHIP_ERROR err = iter_5.GetStatus();
+                                if (err != CHIP_NO_ERROR) {
+                                    OnFailureFn(context, err);
+                                    return;
+                                }
+                                newElement_3.attributeValue = array_5;
+                            }
+                            [array_3 addObject:newElement_3];
+                        }
+                        CHIP_ERROR err = iter_3.GetStatus();
+                        if (err != CHIP_NO_ERROR) {
+                            OnFailureFn(context, err);
+                            return;
+                        }
+                        newElement_1.attributeValueList = array_3;
+                    }
                     [array_1 addObject:newElement_1];
                 }
                 CHIP_ERROR err = iter_1.GetStatus();
@@ -11718,313 +11632,344 @@
                     OnFailureFn(context, err);
                     return;
                 }
-                response.credentials = array_1;
+                response.extensionFieldSets = array_1;
             }
+        } else {
+            response.extensionFieldSets = nil;
         }
     }
+    DispatchSuccess(context, response);
+};
+
+void CHIPScenesClusterRemoveSceneResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::Scenes::Commands::RemoveSceneResponse::DecodableType & data)
+{
+    auto * response = [CHIPScenesClusterRemoveSceneResponseParams new];
     {
-        if (data.creatorFabricIndex.IsNull()) {
-            response.creatorFabricIndex = nil;
-        } else {
-            response.creatorFabricIndex = [NSNumber numberWithUnsignedChar:data.creatorFabricIndex.Value()];
-        }
+        response.status = [NSNumber numberWithUnsignedChar:data.status];
     }
     {
-        if (data.lastModifiedFabricIndex.IsNull()) {
-            response.lastModifiedFabricIndex = nil;
-        } else {
-            response.lastModifiedFabricIndex = [NSNumber numberWithUnsignedChar:data.lastModifiedFabricIndex.Value()];
-        }
+        response.groupId = [NSNumber numberWithUnsignedShort:data.groupId];
     }
     {
-        if (data.nextUserIndex.IsNull()) {
-            response.nextUserIndex = nil;
-        } else {
-            response.nextUserIndex = [NSNumber numberWithUnsignedShort:data.nextUserIndex.Value()];
-        }
+        response.sceneId = [NSNumber numberWithUnsignedChar:data.sceneId];
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPDoorLockClusterSetCredentialResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType & data)
+void CHIPScenesClusterRemoveAllScenesResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::Scenes::Commands::RemoveAllScenesResponse::DecodableType & data)
 {
-    auto * response = [CHIPDoorLockClusterSetCredentialResponseParams new];
-    {
-        response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)];
-    }
+    auto * response = [CHIPScenesClusterRemoveAllScenesResponseParams new];
     {
-        if (data.userIndex.IsNull()) {
-            response.userIndex = nil;
-        } else {
-            response.userIndex = [NSNumber numberWithUnsignedShort:data.userIndex.Value()];
-        }
+        response.status = [NSNumber numberWithUnsignedChar:data.status];
     }
     {
-        if (data.nextCredentialIndex.IsNull()) {
-            response.nextCredentialIndex = nil;
-        } else {
-            response.nextCredentialIndex = [NSNumber numberWithUnsignedShort:data.nextCredentialIndex.Value()];
-        }
+        response.groupId = [NSNumber numberWithUnsignedShort:data.groupId];
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPDoorLockClusterGetCredentialStatusResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType & data)
+void CHIPScenesClusterStoreSceneResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::Scenes::Commands::StoreSceneResponse::DecodableType & data)
 {
-    auto * response = [CHIPDoorLockClusterGetCredentialStatusResponseParams new];
+    auto * response = [CHIPScenesClusterStoreSceneResponseParams new];
     {
-        response.credentialExists = [NSNumber numberWithBool:data.credentialExists];
+        response.status = [NSNumber numberWithUnsignedChar:data.status];
     }
     {
-        if (data.userIndex.IsNull()) {
-            response.userIndex = nil;
-        } else {
-            response.userIndex = [NSNumber numberWithUnsignedShort:data.userIndex.Value()];
-        }
+        response.groupId = [NSNumber numberWithUnsignedShort:data.groupId];
     }
     {
-        if (data.creatorFabricIndex.IsNull()) {
-            response.creatorFabricIndex = nil;
-        } else {
-            response.creatorFabricIndex = [NSNumber numberWithUnsignedChar:data.creatorFabricIndex.Value()];
-        }
+        response.sceneId = [NSNumber numberWithUnsignedChar:data.sceneId];
     }
+    DispatchSuccess(context, response);
+};
+
+void CHIPScenesClusterGetSceneMembershipResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::Scenes::Commands::GetSceneMembershipResponse::DecodableType & data)
+{
+    auto * response = [CHIPScenesClusterGetSceneMembershipResponseParams new];
     {
-        if (data.lastModifiedFabricIndex.IsNull()) {
-            response.lastModifiedFabricIndex = nil;
-        } else {
-            response.lastModifiedFabricIndex = [NSNumber numberWithUnsignedChar:data.lastModifiedFabricIndex.Value()];
-        }
+        response.status = [NSNumber numberWithUnsignedChar:data.status];
     }
     {
-        if (data.nextCredentialIndex.IsNull()) {
-            response.nextCredentialIndex = nil;
+        if (data.capacity.IsNull()) {
+            response.capacity = nil;
         } else {
-            response.nextCredentialIndex = [NSNumber numberWithUnsignedShort:data.nextCredentialIndex.Value()];
+            response.capacity = [NSNumber numberWithUnsignedChar:data.capacity.Value()];
         }
     }
-    DispatchSuccess(context, response);
-};
-
-void CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::GeneralCommissioning::Commands::ArmFailSafeResponse::DecodableType & data)
-{
-    auto * response = [CHIPGeneralCommissioningClusterArmFailSafeResponseParams new];
     {
-        response.errorCode = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.errorCode)];
+        response.groupId = [NSNumber numberWithUnsignedShort:data.groupId];
     }
     {
-        response.debugText = [[NSString alloc] initWithBytes:data.debugText.data()
-                                                      length:data.debugText.size()
-                                                    encoding:NSUTF8StringEncoding];
+        if (data.sceneList.HasValue()) {
+            { // Scope for our temporary variables
+                auto * array_1 = [NSMutableArray new];
+                auto iter_1 = data.sceneList.Value().begin();
+                while (iter_1.Next()) {
+                    auto & entry_1 = iter_1.GetValue();
+                    NSNumber * newElement_1;
+                    newElement_1 = [NSNumber numberWithUnsignedChar:entry_1];
+                    [array_1 addObject:newElement_1];
+                }
+                CHIP_ERROR err = iter_1.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    OnFailureFn(context, err);
+                    return;
+                }
+                response.sceneList = array_1;
+            }
+        } else {
+            response.sceneList = nil;
+        }
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::GeneralCommissioning::Commands::SetRegulatoryConfigResponse::DecodableType & data)
+void CHIPScenesClusterEnhancedAddSceneResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::Scenes::Commands::EnhancedAddSceneResponse::DecodableType & data)
 {
-    auto * response = [CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseParams new];
+    auto * response = [CHIPScenesClusterEnhancedAddSceneResponseParams new];
     {
-        response.errorCode = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.errorCode)];
+        response.status = [NSNumber numberWithUnsignedChar:data.status];
     }
     {
-        response.debugText = [[NSString alloc] initWithBytes:data.debugText.data()
-                                                      length:data.debugText.size()
-                                                    encoding:NSUTF8StringEncoding];
+        response.groupId = [NSNumber numberWithUnsignedShort:data.groupId];
+    }
+    {
+        response.sceneId = [NSNumber numberWithUnsignedChar:data.sceneId];
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::GeneralCommissioning::Commands::CommissioningCompleteResponse::DecodableType & data)
+void CHIPScenesClusterEnhancedViewSceneResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::Scenes::Commands::EnhancedViewSceneResponse::DecodableType & data)
 {
-    auto * response = [CHIPGeneralCommissioningClusterCommissioningCompleteResponseParams new];
+    auto * response = [CHIPScenesClusterEnhancedViewSceneResponseParams new];
     {
-        response.errorCode = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.errorCode)];
+        response.status = [NSNumber numberWithUnsignedChar:data.status];
     }
     {
-        response.debugText = [[NSString alloc] initWithBytes:data.debugText.data()
-                                                      length:data.debugText.size()
-                                                    encoding:NSUTF8StringEncoding];
+        response.groupId = [NSNumber numberWithUnsignedShort:data.groupId];
     }
-    DispatchSuccess(context, response);
-};
-
-void CHIPGroupKeyManagementClusterKeySetReadResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadResponse::DecodableType & data)
-{
-    auto * response = [CHIPGroupKeyManagementClusterKeySetReadResponseParams new];
     {
-        response.groupKeySet = [CHIPGroupKeyManagementClusterGroupKeySetStruct new];
-        response.groupKeySet.groupKeySetID = [NSNumber numberWithUnsignedShort:data.groupKeySet.groupKeySetID];
-        response.groupKeySet.groupKeySecurityPolicy =
-            [NSNumber numberWithUnsignedChar:chip::to_underlying(data.groupKeySet.groupKeySecurityPolicy)];
-        if (data.groupKeySet.epochKey0.IsNull()) {
-            response.groupKeySet.epochKey0 = nil;
-        } else {
-            response.groupKeySet.epochKey0 = [NSData dataWithBytes:data.groupKeySet.epochKey0.Value().data()
-                                                            length:data.groupKeySet.epochKey0.Value().size()];
-        }
-        if (data.groupKeySet.epochStartTime0.IsNull()) {
-            response.groupKeySet.epochStartTime0 = nil;
-        } else {
-            response.groupKeySet.epochStartTime0 = [NSNumber numberWithUnsignedLongLong:data.groupKeySet.epochStartTime0.Value()];
-        }
-        if (data.groupKeySet.epochKey1.IsNull()) {
-            response.groupKeySet.epochKey1 = nil;
-        } else {
-            response.groupKeySet.epochKey1 = [NSData dataWithBytes:data.groupKeySet.epochKey1.Value().data()
-                                                            length:data.groupKeySet.epochKey1.Value().size()];
-        }
-        if (data.groupKeySet.epochStartTime1.IsNull()) {
-            response.groupKeySet.epochStartTime1 = nil;
-        } else {
-            response.groupKeySet.epochStartTime1 = [NSNumber numberWithUnsignedLongLong:data.groupKeySet.epochStartTime1.Value()];
-        }
-        if (data.groupKeySet.epochKey2.IsNull()) {
-            response.groupKeySet.epochKey2 = nil;
+        response.sceneId = [NSNumber numberWithUnsignedChar:data.sceneId];
+    }
+    {
+        if (data.transitionTime.HasValue()) {
+            response.transitionTime = [NSNumber numberWithUnsignedShort:data.transitionTime.Value()];
         } else {
-            response.groupKeySet.epochKey2 = [NSData dataWithBytes:data.groupKeySet.epochKey2.Value().data()
-                                                            length:data.groupKeySet.epochKey2.Value().size()];
+            response.transitionTime = nil;
         }
-        if (data.groupKeySet.epochStartTime2.IsNull()) {
-            response.groupKeySet.epochStartTime2 = nil;
+    }
+    {
+        if (data.sceneName.HasValue()) {
+            response.sceneName = [[NSString alloc] initWithBytes:data.sceneName.Value().data()
+                                                          length:data.sceneName.Value().size()
+                                                        encoding:NSUTF8StringEncoding];
         } else {
-            response.groupKeySet.epochStartTime2 = [NSNumber numberWithUnsignedLongLong:data.groupKeySet.epochStartTime2.Value()];
+            response.sceneName = nil;
         }
     }
-    DispatchSuccess(context, response);
-};
-
-void CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::DecodableType & data)
-{
-    auto * response = [CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseParams new];
     {
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            auto iter_0 = data.groupKeySetIDs.begin();
-            while (iter_0.Next()) {
-                auto & entry_0 = iter_0.GetValue();
-                NSNumber * newElement_0;
-                newElement_0 = [NSNumber numberWithUnsignedShort:entry_0];
-                [array_0 addObject:newElement_0];
-            }
-            CHIP_ERROR err = iter_0.GetStatus();
-            if (err != CHIP_NO_ERROR) {
-                OnFailureFn(context, err);
-                return;
+        if (data.extensionFieldSets.HasValue()) {
+            { // Scope for our temporary variables
+                auto * array_1 = [NSMutableArray new];
+                auto iter_1 = data.extensionFieldSets.Value().begin();
+                while (iter_1.Next()) {
+                    auto & entry_1 = iter_1.GetValue();
+                    CHIPScenesClusterExtensionFieldSet * newElement_1;
+                    newElement_1 = [CHIPScenesClusterExtensionFieldSet new];
+                    newElement_1.clusterId = [NSNumber numberWithUnsignedInt:entry_1.clusterId];
+                    { // Scope for our temporary variables
+                        auto * array_3 = [NSMutableArray new];
+                        auto iter_3 = entry_1.attributeValueList.begin();
+                        while (iter_3.Next()) {
+                            auto & entry_3 = iter_3.GetValue();
+                            CHIPScenesClusterAttributeValuePair * newElement_3;
+                            newElement_3 = [CHIPScenesClusterAttributeValuePair new];
+                            if (entry_3.attributeId.HasValue()) {
+                                newElement_3.attributeId = [NSNumber numberWithUnsignedInt:entry_3.attributeId.Value()];
+                            } else {
+                                newElement_3.attributeId = nil;
+                            }
+                            { // Scope for our temporary variables
+                                auto * array_5 = [NSMutableArray new];
+                                auto iter_5 = entry_3.attributeValue.begin();
+                                while (iter_5.Next()) {
+                                    auto & entry_5 = iter_5.GetValue();
+                                    NSNumber * newElement_5;
+                                    newElement_5 = [NSNumber numberWithUnsignedChar:entry_5];
+                                    [array_5 addObject:newElement_5];
+                                }
+                                CHIP_ERROR err = iter_5.GetStatus();
+                                if (err != CHIP_NO_ERROR) {
+                                    OnFailureFn(context, err);
+                                    return;
+                                }
+                                newElement_3.attributeValue = array_5;
+                            }
+                            [array_3 addObject:newElement_3];
+                        }
+                        CHIP_ERROR err = iter_3.GetStatus();
+                        if (err != CHIP_NO_ERROR) {
+                            OnFailureFn(context, err);
+                            return;
+                        }
+                        newElement_1.attributeValueList = array_3;
+                    }
+                    [array_1 addObject:newElement_1];
+                }
+                CHIP_ERROR err = iter_1.GetStatus();
+                if (err != CHIP_NO_ERROR) {
+                    OnFailureFn(context, err);
+                    return;
+                }
+                response.extensionFieldSets = array_1;
             }
-            response.groupKeySetIDs = array_0;
+        } else {
+            response.extensionFieldSets = nil;
         }
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPGroupsClusterAddGroupResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType & data)
+void CHIPScenesClusterCopySceneResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::Scenes::Commands::CopySceneResponse::DecodableType & data)
 {
-    auto * response = [CHIPGroupsClusterAddGroupResponseParams new];
+    auto * response = [CHIPScenesClusterCopySceneResponseParams new];
     {
         response.status = [NSNumber numberWithUnsignedChar:data.status];
     }
     {
-        response.groupId = [NSNumber numberWithUnsignedShort:data.groupId];
+        response.groupIdFrom = [NSNumber numberWithUnsignedShort:data.groupIdFrom];
+    }
+    {
+        response.sceneIdFrom = [NSNumber numberWithUnsignedChar:data.sceneIdFrom];
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPGroupsClusterViewGroupResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType & data)
+void CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImageResponse::DecodableType & data)
 {
-    auto * response = [CHIPGroupsClusterViewGroupResponseParams new];
+    auto * response = [CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseParams new];
     {
-        response.status = [NSNumber numberWithUnsignedChar:data.status];
+        response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)];
     }
     {
-        response.groupId = [NSNumber numberWithUnsignedShort:data.groupId];
+        if (data.delayedActionTime.HasValue()) {
+            response.delayedActionTime = [NSNumber numberWithUnsignedInt:data.delayedActionTime.Value()];
+        } else {
+            response.delayedActionTime = nil;
+        }
     }
     {
-        response.groupName = [[NSString alloc] initWithBytes:data.groupName.data()
-                                                      length:data.groupName.size()
-                                                    encoding:NSUTF8StringEncoding];
+        if (data.imageURI.HasValue()) {
+            response.imageURI = [[NSString alloc] initWithBytes:data.imageURI.Value().data()
+                                                         length:data.imageURI.Value().size()
+                                                       encoding:NSUTF8StringEncoding];
+        } else {
+            response.imageURI = nil;
+        }
     }
-    DispatchSuccess(context, response);
-};
-
-void CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType & data)
-{
-    auto * response = [CHIPGroupsClusterGetGroupMembershipResponseParams new];
     {
-        if (data.capacity.IsNull()) {
-            response.capacity = nil;
+        if (data.softwareVersion.HasValue()) {
+            response.softwareVersion = [NSNumber numberWithUnsignedInt:data.softwareVersion.Value()];
         } else {
-            response.capacity = [NSNumber numberWithUnsignedChar:data.capacity.Value()];
+            response.softwareVersion = nil;
         }
     }
     {
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            auto iter_0 = data.groupList.begin();
-            while (iter_0.Next()) {
-                auto & entry_0 = iter_0.GetValue();
-                NSNumber * newElement_0;
-                newElement_0 = [NSNumber numberWithUnsignedShort:entry_0];
-                [array_0 addObject:newElement_0];
-            }
-            CHIP_ERROR err = iter_0.GetStatus();
-            if (err != CHIP_NO_ERROR) {
-                OnFailureFn(context, err);
-                return;
-            }
-            response.groupList = array_0;
+        if (data.softwareVersionString.HasValue()) {
+            response.softwareVersionString = [[NSString alloc] initWithBytes:data.softwareVersionString.Value().data()
+                                                                      length:data.softwareVersionString.Value().size()
+                                                                    encoding:NSUTF8StringEncoding];
+        } else {
+            response.softwareVersionString = nil;
+        }
+    }
+    {
+        if (data.updateToken.HasValue()) {
+            response.updateToken = [NSData dataWithBytes:data.updateToken.Value().data() length:data.updateToken.Value().size()];
+        } else {
+            response.updateToken = nil;
+        }
+    }
+    {
+        if (data.userConsentNeeded.HasValue()) {
+            response.userConsentNeeded = [NSNumber numberWithBool:data.userConsentNeeded.Value()];
+        } else {
+            response.userConsentNeeded = nil;
+        }
+    }
+    {
+        if (data.metadataForRequestor.HasValue()) {
+            response.metadataForRequestor = [NSData dataWithBytes:data.metadataForRequestor.Value().data()
+                                                           length:data.metadataForRequestor.Value().size()];
+        } else {
+            response.metadataForRequestor = nil;
         }
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPGroupsClusterRemoveGroupResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType & data)
+void CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::DecodableType & data)
+{
+    auto * response = [CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseParams new];
+    {
+        response.action = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.action)];
+    }
+    {
+        response.delayedActionTime = [NSNumber numberWithUnsignedInt:data.delayedActionTime];
+    }
+    DispatchSuccess(context, response);
+};
+
+void CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::GeneralCommissioning::Commands::ArmFailSafeResponse::DecodableType & data)
 {
-    auto * response = [CHIPGroupsClusterRemoveGroupResponseParams new];
+    auto * response = [CHIPGeneralCommissioningClusterArmFailSafeResponseParams new];
     {
-        response.status = [NSNumber numberWithUnsignedChar:data.status];
+        response.errorCode = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.errorCode)];
     }
     {
-        response.groupId = [NSNumber numberWithUnsignedShort:data.groupId];
+        response.debugText = [[NSString alloc] initWithBytes:data.debugText.data()
+                                                      length:data.debugText.size()
+                                                    encoding:NSUTF8StringEncoding];
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPKeypadInputClusterSendKeyResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType & data)
+void CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::GeneralCommissioning::Commands::SetRegulatoryConfigResponse::DecodableType & data)
 {
-    auto * response = [CHIPKeypadInputClusterSendKeyResponseParams new];
+    auto * response = [CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseParams new];
     {
-        response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)];
+        response.errorCode = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.errorCode)];
+    }
+    {
+        response.debugText = [[NSString alloc] initWithBytes:data.debugText.data()
+                                                      length:data.debugText.size()
+                                                    encoding:NSUTF8StringEncoding];
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType & data)
+void CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::GeneralCommissioning::Commands::CommissioningCompleteResponse::DecodableType & data)
 {
-    auto * response = [CHIPMediaPlaybackClusterPlaybackResponseParams new];
+    auto * response = [CHIPGeneralCommissioningClusterCommissioningCompleteResponseParams new];
     {
-        response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)];
+        response.errorCode = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.errorCode)];
     }
     {
-        if (data.data.HasValue()) {
-            response.data = [[NSString alloc] initWithBytes:data.data.Value().data()
-                                                     length:data.data.Value().size()
-                                                   encoding:NSUTF8StringEncoding];
-        } else {
-            response.data = nil;
-        }
+        response.debugText = [[NSString alloc] initWithBytes:data.debugText.data()
+                                                      length:data.debugText.size()
+                                                    encoding:NSUTF8StringEncoding];
     }
     DispatchSuccess(context, response);
 };
@@ -12161,239 +12106,332 @@
     DispatchSuccess(context, response);
 };
 
-void CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImageResponse::DecodableType & data)
+void CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType & data)
 {
-    auto * response = [CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseParams new];
+    auto * response = [CHIPDiagnosticLogsClusterRetrieveLogsResponseParams new];
     {
         response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)];
     }
     {
-        if (data.delayedActionTime.HasValue()) {
-            response.delayedActionTime = [NSNumber numberWithUnsignedInt:data.delayedActionTime.Value()];
-        } else {
-            response.delayedActionTime = nil;
-        }
+        response.content = [NSData dataWithBytes:data.content.data() length:data.content.size()];
     }
     {
-        if (data.imageURI.HasValue()) {
-            response.imageURI = [[NSString alloc] initWithBytes:data.imageURI.Value().data()
-                                                         length:data.imageURI.Value().size()
-                                                       encoding:NSUTF8StringEncoding];
-        } else {
-            response.imageURI = nil;
-        }
+        response.timeStamp = [NSNumber numberWithUnsignedInt:data.timeStamp];
     }
     {
-        if (data.softwareVersion.HasValue()) {
-            response.softwareVersion = [NSNumber numberWithUnsignedInt:data.softwareVersion.Value()];
-        } else {
-            response.softwareVersion = nil;
-        }
+        response.timeSinceBoot = [NSNumber numberWithUnsignedInt:data.timeSinceBoot];
     }
+    DispatchSuccess(context, response);
+};
+
+void CHIPOperationalCredentialsClusterAttestationResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::OperationalCredentials::Commands::AttestationResponse::DecodableType & data)
+{
+    auto * response = [CHIPOperationalCredentialsClusterAttestationResponseParams new];
     {
-        if (data.softwareVersionString.HasValue()) {
-            response.softwareVersionString = [[NSString alloc] initWithBytes:data.softwareVersionString.Value().data()
-                                                                      length:data.softwareVersionString.Value().size()
-                                                                    encoding:NSUTF8StringEncoding];
-        } else {
-            response.softwareVersionString = nil;
-        }
+        response.attestationElements = [NSData dataWithBytes:data.attestationElements.data()
+                                                      length:data.attestationElements.size()];
     }
     {
-        if (data.updateToken.HasValue()) {
-            response.updateToken = [NSData dataWithBytes:data.updateToken.Value().data() length:data.updateToken.Value().size()];
-        } else {
-            response.updateToken = nil;
-        }
+        response.signature = [NSData dataWithBytes:data.signature.data() length:data.signature.size()];
+    }
+    DispatchSuccess(context, response);
+};
+
+void CHIPOperationalCredentialsClusterCertificateChainResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::OperationalCredentials::Commands::CertificateChainResponse::DecodableType & data)
+{
+    auto * response = [CHIPOperationalCredentialsClusterCertificateChainResponseParams new];
+    {
+        response.certificate = [NSData dataWithBytes:data.certificate.data() length:data.certificate.size()];
     }
+    DispatchSuccess(context, response);
+};
+
+void CHIPOperationalCredentialsClusterCSRResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::OperationalCredentials::Commands::CSRResponse::DecodableType & data)
+{
+    auto * response = [CHIPOperationalCredentialsClusterCSRResponseParams new];
     {
-        if (data.userConsentNeeded.HasValue()) {
-            response.userConsentNeeded = [NSNumber numberWithBool:data.userConsentNeeded.Value()];
-        } else {
-            response.userConsentNeeded = nil;
-        }
+        response.nocsrElements = [NSData dataWithBytes:data.NOCSRElements.data() length:data.NOCSRElements.size()];
     }
     {
-        if (data.metadataForRequestor.HasValue()) {
-            response.metadataForRequestor = [NSData dataWithBytes:data.metadataForRequestor.Value().data()
-                                                           length:data.metadataForRequestor.Value().size()];
-        } else {
-            response.metadataForRequestor = nil;
-        }
+        response.attestationSignature = [NSData dataWithBytes:data.attestationSignature.data()
+                                                       length:data.attestationSignature.size()];
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::DecodableType & data)
+void CHIPOperationalCredentialsClusterNOCResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::DecodableType & data)
 {
-    auto * response = [CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseParams new];
+    auto * response = [CHIPOperationalCredentialsClusterNOCResponseParams new];
     {
-        response.action = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.action)];
+        response.statusCode = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.statusCode)];
     }
     {
-        response.delayedActionTime = [NSNumber numberWithUnsignedInt:data.delayedActionTime];
+        if (data.fabricIndex.HasValue()) {
+            response.fabricIndex = [NSNumber numberWithUnsignedChar:data.fabricIndex.Value()];
+        } else {
+            response.fabricIndex = nil;
+        }
+    }
+    {
+        if (data.debugText.HasValue()) {
+            response.debugText = [[NSString alloc] initWithBytes:data.debugText.Value().data()
+                                                          length:data.debugText.Value().size()
+                                                        encoding:NSUTF8StringEncoding];
+        } else {
+            response.debugText = nil;
+        }
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPOperationalCredentialsClusterAttestationResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::OperationalCredentials::Commands::AttestationResponse::DecodableType & data)
+void CHIPGroupKeyManagementClusterKeySetReadResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadResponse::DecodableType & data)
 {
-    auto * response = [CHIPOperationalCredentialsClusterAttestationResponseParams new];
+    auto * response = [CHIPGroupKeyManagementClusterKeySetReadResponseParams new];
     {
-        response.attestationElements = [NSData dataWithBytes:data.attestationElements.data()
-                                                      length:data.attestationElements.size()];
+        response.groupKeySet = [CHIPGroupKeyManagementClusterGroupKeySetStruct new];
+        response.groupKeySet.groupKeySetID = [NSNumber numberWithUnsignedShort:data.groupKeySet.groupKeySetID];
+        response.groupKeySet.groupKeySecurityPolicy =
+            [NSNumber numberWithUnsignedChar:chip::to_underlying(data.groupKeySet.groupKeySecurityPolicy)];
+        if (data.groupKeySet.epochKey0.IsNull()) {
+            response.groupKeySet.epochKey0 = nil;
+        } else {
+            response.groupKeySet.epochKey0 = [NSData dataWithBytes:data.groupKeySet.epochKey0.Value().data()
+                                                            length:data.groupKeySet.epochKey0.Value().size()];
+        }
+        if (data.groupKeySet.epochStartTime0.IsNull()) {
+            response.groupKeySet.epochStartTime0 = nil;
+        } else {
+            response.groupKeySet.epochStartTime0 = [NSNumber numberWithUnsignedLongLong:data.groupKeySet.epochStartTime0.Value()];
+        }
+        if (data.groupKeySet.epochKey1.IsNull()) {
+            response.groupKeySet.epochKey1 = nil;
+        } else {
+            response.groupKeySet.epochKey1 = [NSData dataWithBytes:data.groupKeySet.epochKey1.Value().data()
+                                                            length:data.groupKeySet.epochKey1.Value().size()];
+        }
+        if (data.groupKeySet.epochStartTime1.IsNull()) {
+            response.groupKeySet.epochStartTime1 = nil;
+        } else {
+            response.groupKeySet.epochStartTime1 = [NSNumber numberWithUnsignedLongLong:data.groupKeySet.epochStartTime1.Value()];
+        }
+        if (data.groupKeySet.epochKey2.IsNull()) {
+            response.groupKeySet.epochKey2 = nil;
+        } else {
+            response.groupKeySet.epochKey2 = [NSData dataWithBytes:data.groupKeySet.epochKey2.Value().data()
+                                                            length:data.groupKeySet.epochKey2.Value().size()];
+        }
+        if (data.groupKeySet.epochStartTime2.IsNull()) {
+            response.groupKeySet.epochStartTime2 = nil;
+        } else {
+            response.groupKeySet.epochStartTime2 = [NSNumber numberWithUnsignedLongLong:data.groupKeySet.epochStartTime2.Value()];
+        }
     }
+    DispatchSuccess(context, response);
+};
+
+void CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::DecodableType & data)
+{
+    auto * response = [CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseParams new];
     {
-        response.signature = [NSData dataWithBytes:data.signature.data() length:data.signature.size()];
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            auto iter_0 = data.groupKeySetIDs.begin();
+            while (iter_0.Next()) {
+                auto & entry_0 = iter_0.GetValue();
+                NSNumber * newElement_0;
+                newElement_0 = [NSNumber numberWithUnsignedShort:entry_0];
+                [array_0 addObject:newElement_0];
+            }
+            CHIP_ERROR err = iter_0.GetStatus();
+            if (err != CHIP_NO_ERROR) {
+                OnFailureFn(context, err);
+                return;
+            }
+            response.groupKeySetIDs = array_0;
+        }
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPOperationalCredentialsClusterCertificateChainResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::OperationalCredentials::Commands::CertificateChainResponse::DecodableType & data)
+void CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType & data)
 {
-    auto * response = [CHIPOperationalCredentialsClusterCertificateChainResponseParams new];
+    auto * response = [CHIPDoorLockClusterGetWeekDayScheduleResponseParams new];
+    {
+        response.weekDayIndex = [NSNumber numberWithUnsignedChar:data.weekDayIndex];
+    }
+    {
+        response.userIndex = [NSNumber numberWithUnsignedShort:data.userIndex];
+    }
+    {
+        response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)];
+    }
+    {
+        if (data.daysMask.HasValue()) {
+            response.daysMask = [NSNumber numberWithUnsignedChar:data.daysMask.Value().Raw()];
+        } else {
+            response.daysMask = nil;
+        }
+    }
+    {
+        if (data.startHour.HasValue()) {
+            response.startHour = [NSNumber numberWithUnsignedChar:data.startHour.Value()];
+        } else {
+            response.startHour = nil;
+        }
+    }
+    {
+        if (data.startMinute.HasValue()) {
+            response.startMinute = [NSNumber numberWithUnsignedChar:data.startMinute.Value()];
+        } else {
+            response.startMinute = nil;
+        }
+    }
+    {
+        if (data.endHour.HasValue()) {
+            response.endHour = [NSNumber numberWithUnsignedChar:data.endHour.Value()];
+        } else {
+            response.endHour = nil;
+        }
+    }
     {
-        response.certificate = [NSData dataWithBytes:data.certificate.data() length:data.certificate.size()];
+        if (data.endMinute.HasValue()) {
+            response.endMinute = [NSNumber numberWithUnsignedChar:data.endMinute.Value()];
+        } else {
+            response.endMinute = nil;
+        }
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPOperationalCredentialsClusterCSRResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::OperationalCredentials::Commands::CSRResponse::DecodableType & data)
+void CHIPDoorLockClusterGetYearDayScheduleResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType & data)
 {
-    auto * response = [CHIPOperationalCredentialsClusterCSRResponseParams new];
+    auto * response = [CHIPDoorLockClusterGetYearDayScheduleResponseParams new];
     {
-        response.nocsrElements = [NSData dataWithBytes:data.NOCSRElements.data() length:data.NOCSRElements.size()];
+        response.yearDayIndex = [NSNumber numberWithUnsignedChar:data.yearDayIndex];
     }
     {
-        response.attestationSignature = [NSData dataWithBytes:data.attestationSignature.data()
-                                                       length:data.attestationSignature.size()];
+        response.userIndex = [NSNumber numberWithUnsignedShort:data.userIndex];
     }
-    DispatchSuccess(context, response);
-};
-
-void CHIPOperationalCredentialsClusterNOCResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::DecodableType & data)
-{
-    auto * response = [CHIPOperationalCredentialsClusterNOCResponseParams new];
     {
-        response.statusCode = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.statusCode)];
+        response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)];
     }
     {
-        if (data.fabricIndex.HasValue()) {
-            response.fabricIndex = [NSNumber numberWithUnsignedChar:data.fabricIndex.Value()];
+        if (data.localStartTime.HasValue()) {
+            response.localStartTime = [NSNumber numberWithUnsignedInt:data.localStartTime.Value()];
         } else {
-            response.fabricIndex = nil;
+            response.localStartTime = nil;
         }
     }
     {
-        if (data.debugText.HasValue()) {
-            response.debugText = [[NSString alloc] initWithBytes:data.debugText.Value().data()
-                                                          length:data.debugText.Value().size()
-                                                        encoding:NSUTF8StringEncoding];
+        if (data.localEndTime.HasValue()) {
+            response.localEndTime = [NSNumber numberWithUnsignedInt:data.localEndTime.Value()];
         } else {
-            response.debugText = nil;
+            response.localEndTime = nil;
         }
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPScenesClusterAddSceneResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::Scenes::Commands::AddSceneResponse::DecodableType & data)
+void CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType & data)
 {
-    auto * response = [CHIPScenesClusterAddSceneResponseParams new];
+    auto * response = [CHIPDoorLockClusterGetHolidayScheduleResponseParams new];
     {
-        response.status = [NSNumber numberWithUnsignedChar:data.status];
+        response.holidayIndex = [NSNumber numberWithUnsignedChar:data.holidayIndex];
     }
     {
-        response.groupId = [NSNumber numberWithUnsignedShort:data.groupId];
+        response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)];
     }
     {
-        response.sceneId = [NSNumber numberWithUnsignedChar:data.sceneId];
+        if (data.localStartTime.HasValue()) {
+            response.localStartTime = [NSNumber numberWithUnsignedInt:data.localStartTime.Value()];
+        } else {
+            response.localStartTime = nil;
+        }
+    }
+    {
+        if (data.localEndTime.HasValue()) {
+            response.localEndTime = [NSNumber numberWithUnsignedInt:data.localEndTime.Value()];
+        } else {
+            response.localEndTime = nil;
+        }
+    }
+    {
+        if (data.operatingMode.HasValue()) {
+            response.operatingMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.operatingMode.Value())];
+        } else {
+            response.operatingMode = nil;
+        }
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPScenesClusterViewSceneResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::Scenes::Commands::ViewSceneResponse::DecodableType & data)
+void CHIPDoorLockClusterGetUserResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType & data)
 {
-    auto * response = [CHIPScenesClusterViewSceneResponseParams new];
+    auto * response = [CHIPDoorLockClusterGetUserResponseParams new];
     {
-        response.status = [NSNumber numberWithUnsignedChar:data.status];
+        response.userIndex = [NSNumber numberWithUnsignedShort:data.userIndex];
     }
     {
-        response.groupId = [NSNumber numberWithUnsignedShort:data.groupId];
+        if (data.userName.IsNull()) {
+            response.userName = nil;
+        } else {
+            response.userName = [[NSString alloc] initWithBytes:data.userName.Value().data()
+                                                         length:data.userName.Value().size()
+                                                       encoding:NSUTF8StringEncoding];
+        }
     }
     {
-        response.sceneId = [NSNumber numberWithUnsignedChar:data.sceneId];
+        if (data.userUniqueId.IsNull()) {
+            response.userUniqueId = nil;
+        } else {
+            response.userUniqueId = [NSNumber numberWithUnsignedInt:data.userUniqueId.Value()];
+        }
     }
     {
-        if (data.transitionTime.HasValue()) {
-            response.transitionTime = [NSNumber numberWithUnsignedShort:data.transitionTime.Value()];
+        if (data.userStatus.IsNull()) {
+            response.userStatus = nil;
         } else {
-            response.transitionTime = nil;
+            response.userStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.userStatus.Value())];
         }
     }
     {
-        if (data.sceneName.HasValue()) {
-            response.sceneName = [[NSString alloc] initWithBytes:data.sceneName.Value().data()
-                                                          length:data.sceneName.Value().size()
-                                                        encoding:NSUTF8StringEncoding];
+        if (data.userType.IsNull()) {
+            response.userType = nil;
         } else {
-            response.sceneName = nil;
+            response.userType = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.userType.Value())];
         }
     }
     {
-        if (data.extensionFieldSets.HasValue()) {
+        if (data.credentialRule.IsNull()) {
+            response.credentialRule = nil;
+        } else {
+            response.credentialRule = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.credentialRule.Value())];
+        }
+    }
+    {
+        if (data.credentials.IsNull()) {
+            response.credentials = nil;
+        } else {
             { // Scope for our temporary variables
                 auto * array_1 = [NSMutableArray new];
-                auto iter_1 = data.extensionFieldSets.Value().begin();
+                auto iter_1 = data.credentials.Value().begin();
                 while (iter_1.Next()) {
                     auto & entry_1 = iter_1.GetValue();
-                    CHIPScenesClusterExtensionFieldSet * newElement_1;
-                    newElement_1 = [CHIPScenesClusterExtensionFieldSet new];
-                    newElement_1.clusterId = [NSNumber numberWithUnsignedInt:entry_1.clusterId];
-                    { // Scope for our temporary variables
-                        auto * array_3 = [NSMutableArray new];
-                        auto iter_3 = entry_1.attributeValueList.begin();
-                        while (iter_3.Next()) {
-                            auto & entry_3 = iter_3.GetValue();
-                            CHIPScenesClusterAttributeValuePair * newElement_3;
-                            newElement_3 = [CHIPScenesClusterAttributeValuePair new];
-                            if (entry_3.attributeId.HasValue()) {
-                                newElement_3.attributeId = [NSNumber numberWithUnsignedInt:entry_3.attributeId.Value()];
-                            } else {
-                                newElement_3.attributeId = nil;
-                            }
-                            { // Scope for our temporary variables
-                                auto * array_5 = [NSMutableArray new];
-                                auto iter_5 = entry_3.attributeValue.begin();
-                                while (iter_5.Next()) {
-                                    auto & entry_5 = iter_5.GetValue();
-                                    NSNumber * newElement_5;
-                                    newElement_5 = [NSNumber numberWithUnsignedChar:entry_5];
-                                    [array_5 addObject:newElement_5];
-                                }
-                                CHIP_ERROR err = iter_5.GetStatus();
-                                if (err != CHIP_NO_ERROR) {
-                                    OnFailureFn(context, err);
-                                    return;
-                                }
-                                newElement_3.attributeValue = array_5;
-                            }
-                            [array_3 addObject:newElement_3];
-                        }
-                        CHIP_ERROR err = iter_3.GetStatus();
-                        if (err != CHIP_NO_ERROR) {
-                            OnFailureFn(context, err);
-                            return;
-                        }
-                        newElement_1.attributeValueList = array_3;
-                    }
+                    CHIPDoorLockClusterDlCredential * newElement_1;
+                    newElement_1 = [CHIPDoorLockClusterDlCredential new];
+                    newElement_1.credentialType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_1.credentialType)];
+                    newElement_1.credentialIndex = [NSNumber numberWithUnsignedShort:entry_1.credentialIndex];
                     [array_1 addObject:newElement_1];
                 }
                 CHIP_ERROR err = iter_1.GetStatus();
@@ -12401,230 +12439,212 @@
                     OnFailureFn(context, err);
                     return;
                 }
-                response.extensionFieldSets = array_1;
+                response.credentials = array_1;
             }
+        }
+    }
+    {
+        if (data.creatorFabricIndex.IsNull()) {
+            response.creatorFabricIndex = nil;
         } else {
-            response.extensionFieldSets = nil;
+            response.creatorFabricIndex = [NSNumber numberWithUnsignedChar:data.creatorFabricIndex.Value()];
+        }
+    }
+    {
+        if (data.lastModifiedFabricIndex.IsNull()) {
+            response.lastModifiedFabricIndex = nil;
+        } else {
+            response.lastModifiedFabricIndex = [NSNumber numberWithUnsignedChar:data.lastModifiedFabricIndex.Value()];
+        }
+    }
+    {
+        if (data.nextUserIndex.IsNull()) {
+            response.nextUserIndex = nil;
+        } else {
+            response.nextUserIndex = [NSNumber numberWithUnsignedShort:data.nextUserIndex.Value()];
         }
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPScenesClusterRemoveSceneResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::Scenes::Commands::RemoveSceneResponse::DecodableType & data)
+void CHIPDoorLockClusterSetCredentialResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType & data)
 {
-    auto * response = [CHIPScenesClusterRemoveSceneResponseParams new];
+    auto * response = [CHIPDoorLockClusterSetCredentialResponseParams new];
     {
-        response.status = [NSNumber numberWithUnsignedChar:data.status];
+        response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)];
     }
     {
-        response.groupId = [NSNumber numberWithUnsignedShort:data.groupId];
+        if (data.userIndex.IsNull()) {
+            response.userIndex = nil;
+        } else {
+            response.userIndex = [NSNumber numberWithUnsignedShort:data.userIndex.Value()];
+        }
     }
     {
-        response.sceneId = [NSNumber numberWithUnsignedChar:data.sceneId];
+        if (data.nextCredentialIndex.IsNull()) {
+            response.nextCredentialIndex = nil;
+        } else {
+            response.nextCredentialIndex = [NSNumber numberWithUnsignedShort:data.nextCredentialIndex.Value()];
+        }
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPScenesClusterRemoveAllScenesResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::Scenes::Commands::RemoveAllScenesResponse::DecodableType & data)
+void CHIPDoorLockClusterGetCredentialStatusResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType & data)
 {
-    auto * response = [CHIPScenesClusterRemoveAllScenesResponseParams new];
+    auto * response = [CHIPDoorLockClusterGetCredentialStatusResponseParams new];
     {
-        response.status = [NSNumber numberWithUnsignedChar:data.status];
+        response.credentialExists = [NSNumber numberWithBool:data.credentialExists];
     }
     {
-        response.groupId = [NSNumber numberWithUnsignedShort:data.groupId];
+        if (data.userIndex.IsNull()) {
+            response.userIndex = nil;
+        } else {
+            response.userIndex = [NSNumber numberWithUnsignedShort:data.userIndex.Value()];
+        }
     }
-    DispatchSuccess(context, response);
-};
-
-void CHIPScenesClusterStoreSceneResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::Scenes::Commands::StoreSceneResponse::DecodableType & data)
-{
-    auto * response = [CHIPScenesClusterStoreSceneResponseParams new];
     {
-        response.status = [NSNumber numberWithUnsignedChar:data.status];
+        if (data.creatorFabricIndex.IsNull()) {
+            response.creatorFabricIndex = nil;
+        } else {
+            response.creatorFabricIndex = [NSNumber numberWithUnsignedChar:data.creatorFabricIndex.Value()];
+        }
     }
     {
-        response.groupId = [NSNumber numberWithUnsignedShort:data.groupId];
+        if (data.lastModifiedFabricIndex.IsNull()) {
+            response.lastModifiedFabricIndex = nil;
+        } else {
+            response.lastModifiedFabricIndex = [NSNumber numberWithUnsignedChar:data.lastModifiedFabricIndex.Value()];
+        }
     }
     {
-        response.sceneId = [NSNumber numberWithUnsignedChar:data.sceneId];
+        if (data.nextCredentialIndex.IsNull()) {
+            response.nextCredentialIndex = nil;
+        } else {
+            response.nextCredentialIndex = [NSNumber numberWithUnsignedShort:data.nextCredentialIndex.Value()];
+        }
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPScenesClusterGetSceneMembershipResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::Scenes::Commands::GetSceneMembershipResponse::DecodableType & data)
+void CHIPThermostatClusterGetWeeklyScheduleResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType & data)
 {
-    auto * response = [CHIPScenesClusterGetSceneMembershipResponseParams new];
+    auto * response = [CHIPThermostatClusterGetWeeklyScheduleResponseParams new];
     {
-        response.status = [NSNumber numberWithUnsignedChar:data.status];
+        response.numberOfTransitionsForSequence = [NSNumber numberWithUnsignedChar:data.numberOfTransitionsForSequence];
     }
     {
-        if (data.capacity.IsNull()) {
-            response.capacity = nil;
-        } else {
-            response.capacity = [NSNumber numberWithUnsignedChar:data.capacity.Value()];
-        }
+        response.dayOfWeekForSequence = [NSNumber numberWithUnsignedChar:data.dayOfWeekForSequence.Raw()];
     }
     {
-        response.groupId = [NSNumber numberWithUnsignedShort:data.groupId];
+        response.modeForSequence = [NSNumber numberWithUnsignedChar:data.modeForSequence.Raw()];
     }
     {
-        if (data.sceneList.HasValue()) {
-            { // Scope for our temporary variables
-                auto * array_1 = [NSMutableArray new];
-                auto iter_1 = data.sceneList.Value().begin();
-                while (iter_1.Next()) {
-                    auto & entry_1 = iter_1.GetValue();
-                    NSNumber * newElement_1;
-                    newElement_1 = [NSNumber numberWithUnsignedChar:entry_1];
-                    [array_1 addObject:newElement_1];
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            auto iter_0 = data.transitions.begin();
+            while (iter_0.Next()) {
+                auto & entry_0 = iter_0.GetValue();
+                CHIPThermostatClusterThermostatScheduleTransition * newElement_0;
+                newElement_0 = [CHIPThermostatClusterThermostatScheduleTransition new];
+                newElement_0.transitionTime = [NSNumber numberWithUnsignedShort:entry_0.transitionTime];
+                if (entry_0.heatSetpoint.IsNull()) {
+                    newElement_0.heatSetpoint = nil;
+                } else {
+                    newElement_0.heatSetpoint = [NSNumber numberWithShort:entry_0.heatSetpoint.Value()];
                 }
-                CHIP_ERROR err = iter_1.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    OnFailureFn(context, err);
-                    return;
+                if (entry_0.coolSetpoint.IsNull()) {
+                    newElement_0.coolSetpoint = nil;
+                } else {
+                    newElement_0.coolSetpoint = [NSNumber numberWithShort:entry_0.coolSetpoint.Value()];
                 }
-                response.sceneList = array_1;
+                [array_0 addObject:newElement_0];
             }
-        } else {
-            response.sceneList = nil;
+            CHIP_ERROR err = iter_0.GetStatus();
+            if (err != CHIP_NO_ERROR) {
+                OnFailureFn(context, err);
+                return;
+            }
+            response.transitions = array_0;
         }
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPScenesClusterEnhancedAddSceneResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::Scenes::Commands::EnhancedAddSceneResponse::DecodableType & data)
+void CHIPChannelClusterChangeChannelResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::Channel::Commands::ChangeChannelResponse::DecodableType & data)
 {
-    auto * response = [CHIPScenesClusterEnhancedAddSceneResponseParams new];
-    {
-        response.status = [NSNumber numberWithUnsignedChar:data.status];
-    }
+    auto * response = [CHIPChannelClusterChangeChannelResponseParams new];
     {
-        response.groupId = [NSNumber numberWithUnsignedShort:data.groupId];
+        response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)];
     }
     {
-        response.sceneId = [NSNumber numberWithUnsignedChar:data.sceneId];
+        if (data.data.HasValue()) {
+            response.data = [[NSString alloc] initWithBytes:data.data.Value().data()
+                                                     length:data.data.Value().size()
+                                                   encoding:NSUTF8StringEncoding];
+        } else {
+            response.data = nil;
+        }
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPScenesClusterEnhancedViewSceneResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::Scenes::Commands::EnhancedViewSceneResponse::DecodableType & data)
+void CHIPTargetNavigatorClusterNavigateTargetResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::DecodableType & data)
 {
-    auto * response = [CHIPScenesClusterEnhancedViewSceneResponseParams new];
-    {
-        response.status = [NSNumber numberWithUnsignedChar:data.status];
-    }
-    {
-        response.groupId = [NSNumber numberWithUnsignedShort:data.groupId];
-    }
+    auto * response = [CHIPTargetNavigatorClusterNavigateTargetResponseParams new];
     {
-        response.sceneId = [NSNumber numberWithUnsignedChar:data.sceneId];
+        response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)];
     }
     {
-        if (data.transitionTime.HasValue()) {
-            response.transitionTime = [NSNumber numberWithUnsignedShort:data.transitionTime.Value()];
+        if (data.data.HasValue()) {
+            response.data = [[NSString alloc] initWithBytes:data.data.Value().data()
+                                                     length:data.data.Value().size()
+                                                   encoding:NSUTF8StringEncoding];
         } else {
-            response.transitionTime = nil;
+            response.data = nil;
         }
     }
+    DispatchSuccess(context, response);
+};
+
+void CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType & data)
+{
+    auto * response = [CHIPMediaPlaybackClusterPlaybackResponseParams new];
     {
-        if (data.sceneName.HasValue()) {
-            response.sceneName = [[NSString alloc] initWithBytes:data.sceneName.Value().data()
-                                                          length:data.sceneName.Value().size()
-                                                        encoding:NSUTF8StringEncoding];
-        } else {
-            response.sceneName = nil;
-        }
+        response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)];
     }
     {
-        if (data.extensionFieldSets.HasValue()) {
-            { // Scope for our temporary variables
-                auto * array_1 = [NSMutableArray new];
-                auto iter_1 = data.extensionFieldSets.Value().begin();
-                while (iter_1.Next()) {
-                    auto & entry_1 = iter_1.GetValue();
-                    CHIPScenesClusterExtensionFieldSet * newElement_1;
-                    newElement_1 = [CHIPScenesClusterExtensionFieldSet new];
-                    newElement_1.clusterId = [NSNumber numberWithUnsignedInt:entry_1.clusterId];
-                    { // Scope for our temporary variables
-                        auto * array_3 = [NSMutableArray new];
-                        auto iter_3 = entry_1.attributeValueList.begin();
-                        while (iter_3.Next()) {
-                            auto & entry_3 = iter_3.GetValue();
-                            CHIPScenesClusterAttributeValuePair * newElement_3;
-                            newElement_3 = [CHIPScenesClusterAttributeValuePair new];
-                            if (entry_3.attributeId.HasValue()) {
-                                newElement_3.attributeId = [NSNumber numberWithUnsignedInt:entry_3.attributeId.Value()];
-                            } else {
-                                newElement_3.attributeId = nil;
-                            }
-                            { // Scope for our temporary variables
-                                auto * array_5 = [NSMutableArray new];
-                                auto iter_5 = entry_3.attributeValue.begin();
-                                while (iter_5.Next()) {
-                                    auto & entry_5 = iter_5.GetValue();
-                                    NSNumber * newElement_5;
-                                    newElement_5 = [NSNumber numberWithUnsignedChar:entry_5];
-                                    [array_5 addObject:newElement_5];
-                                }
-                                CHIP_ERROR err = iter_5.GetStatus();
-                                if (err != CHIP_NO_ERROR) {
-                                    OnFailureFn(context, err);
-                                    return;
-                                }
-                                newElement_3.attributeValue = array_5;
-                            }
-                            [array_3 addObject:newElement_3];
-                        }
-                        CHIP_ERROR err = iter_3.GetStatus();
-                        if (err != CHIP_NO_ERROR) {
-                            OnFailureFn(context, err);
-                            return;
-                        }
-                        newElement_1.attributeValueList = array_3;
-                    }
-                    [array_1 addObject:newElement_1];
-                }
-                CHIP_ERROR err = iter_1.GetStatus();
-                if (err != CHIP_NO_ERROR) {
-                    OnFailureFn(context, err);
-                    return;
-                }
-                response.extensionFieldSets = array_1;
-            }
+        if (data.data.HasValue()) {
+            response.data = [[NSString alloc] initWithBytes:data.data.Value().data()
+                                                     length:data.data.Value().size()
+                                                   encoding:NSUTF8StringEncoding];
         } else {
-            response.extensionFieldSets = nil;
+            response.data = nil;
         }
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPScenesClusterCopySceneResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::Scenes::Commands::CopySceneResponse::DecodableType & data)
+void CHIPKeypadInputClusterSendKeyResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType & data)
 {
-    auto * response = [CHIPScenesClusterCopySceneResponseParams new];
-    {
-        response.status = [NSNumber numberWithUnsignedChar:data.status];
-    }
-    {
-        response.groupIdFrom = [NSNumber numberWithUnsignedShort:data.groupIdFrom];
-    }
+    auto * response = [CHIPKeypadInputClusterSendKeyResponseParams new];
     {
-        response.sceneIdFrom = [NSNumber numberWithUnsignedChar:data.sceneIdFrom];
+        response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)];
     }
     DispatchSuccess(context, response);
 };
 
-void CHIPTargetNavigatorClusterNavigateTargetResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::DecodableType & data)
+void CHIPContentLauncherClusterLaunchResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & data)
 {
-    auto * response = [CHIPTargetNavigatorClusterNavigateTargetResponseParams new];
+    auto * response = [CHIPContentLauncherClusterLaunchResponseParams new];
     {
         response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)];
     }
@@ -12640,6 +12660,31 @@
     DispatchSuccess(context, response);
 };
 
+void CHIPApplicationLauncherClusterLauncherResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType & data)
+{
+    auto * response = [CHIPApplicationLauncherClusterLauncherResponseParams new];
+    {
+        response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)];
+    }
+    {
+        response.data = [NSData dataWithBytes:data.data.data() length:data.data.size()];
+    }
+    DispatchSuccess(context, response);
+};
+
+void CHIPAccountLoginClusterGetSetupPINResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::AccountLogin::Commands::GetSetupPINResponse::DecodableType & data)
+{
+    auto * response = [CHIPAccountLoginClusterGetSetupPINResponseParams new];
+    {
+        response.setupPIN = [[NSString alloc] initWithBytes:data.setupPIN.data()
+                                                     length:data.setupPIN.size()
+                                                   encoding:NSUTF8StringEncoding];
+    }
+    DispatchSuccess(context, response);
+};
+
 void CHIPTestClusterClusterTestSpecificResponseCallbackBridge::OnSuccessFn(
     void * context, const chip::app::Clusters::TestCluster::Commands::TestSpecificResponse::DecodableType & data)
 {
@@ -13214,51 +13259,6 @@
     DispatchSuccess(context, response);
 };
 
-void CHIPThermostatClusterGetWeeklyScheduleResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType & data)
-{
-    auto * response = [CHIPThermostatClusterGetWeeklyScheduleResponseParams new];
-    {
-        response.numberOfTransitionsForSequence = [NSNumber numberWithUnsignedChar:data.numberOfTransitionsForSequence];
-    }
-    {
-        response.dayOfWeekForSequence = [NSNumber numberWithUnsignedChar:data.dayOfWeekForSequence.Raw()];
-    }
-    {
-        response.modeForSequence = [NSNumber numberWithUnsignedChar:data.modeForSequence.Raw()];
-    }
-    {
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            auto iter_0 = data.transitions.begin();
-            while (iter_0.Next()) {
-                auto & entry_0 = iter_0.GetValue();
-                CHIPThermostatClusterThermostatScheduleTransition * newElement_0;
-                newElement_0 = [CHIPThermostatClusterThermostatScheduleTransition new];
-                newElement_0.transitionTime = [NSNumber numberWithUnsignedShort:entry_0.transitionTime];
-                if (entry_0.heatSetpoint.IsNull()) {
-                    newElement_0.heatSetpoint = nil;
-                } else {
-                    newElement_0.heatSetpoint = [NSNumber numberWithShort:entry_0.heatSetpoint.Value()];
-                }
-                if (entry_0.coolSetpoint.IsNull()) {
-                    newElement_0.coolSetpoint = nil;
-                } else {
-                    newElement_0.coolSetpoint = [NSNumber numberWithShort:entry_0.coolSetpoint.Value()];
-                }
-                [array_0 addObject:newElement_0];
-            }
-            CHIP_ERROR err = iter_0.GetStatus();
-            if (err != CHIP_NO_ERROR) {
-                OnFailureFn(context, err);
-                return;
-            }
-            response.transitions = array_0;
-        }
-    }
-    DispatchSuccess(context, response);
-};
-
 void CHIPIdentifyClusterIdentifyEffectIdentifierAttributeCallbackBridge::OnSuccessFn(
     void * context, chip::app::Clusters::Identify::IdentifyEffectIdentifier value)
 {
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h
index 298be5edbc7b33..703727acaafea9 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h
@@ -31,38 +31,6 @@ typedef void (*CHIPDefaultSuccessCallbackType)(void *);
 typedef void (*VendorIdAttributeCallback)(void *, chip::VendorId);
 typedef void (*NullableVendorIdAttributeCallback)(void *, const chip::app::DataModel::Nullable<chip::VendorId> &);
 
-typedef void (*CHIPAccountLoginClusterGetSetupPINResponseCallbackType)(
-    void *, const chip::app::Clusters::AccountLogin::Commands::GetSetupPINResponse::DecodableType &);
-typedef void (*CHIPApplicationLauncherClusterLauncherResponseCallbackType)(
-    void *, const chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType &);
-typedef void (*CHIPChannelClusterChangeChannelResponseCallbackType)(
-    void *, const chip::app::Clusters::Channel::Commands::ChangeChannelResponse::DecodableType &);
-typedef void (*CHIPContentLauncherClusterLaunchResponseCallbackType)(
-    void *, const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType &);
-typedef void (*CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackType)(
-    void *, const chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType &);
-typedef void (*CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackType)(
-    void *, const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType &);
-typedef void (*CHIPDoorLockClusterGetYearDayScheduleResponseCallbackType)(
-    void *, const chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType &);
-typedef void (*CHIPDoorLockClusterGetHolidayScheduleResponseCallbackType)(
-    void *, const chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType &);
-typedef void (*CHIPDoorLockClusterGetUserResponseCallbackType)(
-    void *, const chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType &);
-typedef void (*CHIPDoorLockClusterSetCredentialResponseCallbackType)(
-    void *, const chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType &);
-typedef void (*CHIPDoorLockClusterGetCredentialStatusResponseCallbackType)(
-    void *, const chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType &);
-typedef void (*CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackType)(
-    void *, const chip::app::Clusters::GeneralCommissioning::Commands::ArmFailSafeResponse::DecodableType &);
-typedef void (*CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallbackType)(
-    void *, const chip::app::Clusters::GeneralCommissioning::Commands::SetRegulatoryConfigResponse::DecodableType &);
-typedef void (*CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackType)(
-    void *, const chip::app::Clusters::GeneralCommissioning::Commands::CommissioningCompleteResponse::DecodableType &);
-typedef void (*CHIPGroupKeyManagementClusterKeySetReadResponseCallbackType)(
-    void *, const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadResponse::DecodableType &);
-typedef void (*CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallbackType)(
-    void *, const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::DecodableType &);
 typedef void (*CHIPGroupsClusterAddGroupResponseCallbackType)(
     void *, const chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType &);
 typedef void (*CHIPGroupsClusterViewGroupResponseCallbackType)(
@@ -71,28 +39,6 @@ typedef void (*CHIPGroupsClusterGetGroupMembershipResponseCallbackType)(
     void *, const chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType &);
 typedef void (*CHIPGroupsClusterRemoveGroupResponseCallbackType)(
     void *, const chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType &);
-typedef void (*CHIPKeypadInputClusterSendKeyResponseCallbackType)(
-    void *, const chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType &);
-typedef void (*CHIPMediaPlaybackClusterPlaybackResponseCallbackType)(
-    void *, const chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType &);
-typedef void (*CHIPNetworkCommissioningClusterScanNetworksResponseCallbackType)(
-    void *, const chip::app::Clusters::NetworkCommissioning::Commands::ScanNetworksResponse::DecodableType &);
-typedef void (*CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackType)(
-    void *, const chip::app::Clusters::NetworkCommissioning::Commands::NetworkConfigResponse::DecodableType &);
-typedef void (*CHIPNetworkCommissioningClusterConnectNetworkResponseCallbackType)(
-    void *, const chip::app::Clusters::NetworkCommissioning::Commands::ConnectNetworkResponse::DecodableType &);
-typedef void (*CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallbackType)(
-    void *, const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImageResponse::DecodableType &);
-typedef void (*CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallbackType)(
-    void *, const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::DecodableType &);
-typedef void (*CHIPOperationalCredentialsClusterAttestationResponseCallbackType)(
-    void *, const chip::app::Clusters::OperationalCredentials::Commands::AttestationResponse::DecodableType &);
-typedef void (*CHIPOperationalCredentialsClusterCertificateChainResponseCallbackType)(
-    void *, const chip::app::Clusters::OperationalCredentials::Commands::CertificateChainResponse::DecodableType &);
-typedef void (*CHIPOperationalCredentialsClusterCSRResponseCallbackType)(
-    void *, const chip::app::Clusters::OperationalCredentials::Commands::CSRResponse::DecodableType &);
-typedef void (*CHIPOperationalCredentialsClusterNOCResponseCallbackType)(
-    void *, const chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::DecodableType &);
 typedef void (*CHIPScenesClusterAddSceneResponseCallbackType)(
     void *, const chip::app::Clusters::Scenes::Commands::AddSceneResponse::DecodableType &);
 typedef void (*CHIPScenesClusterViewSceneResponseCallbackType)(
@@ -111,8 +57,64 @@ typedef void (*CHIPScenesClusterEnhancedViewSceneResponseCallbackType)(
     void *, const chip::app::Clusters::Scenes::Commands::EnhancedViewSceneResponse::DecodableType &);
 typedef void (*CHIPScenesClusterCopySceneResponseCallbackType)(
     void *, const chip::app::Clusters::Scenes::Commands::CopySceneResponse::DecodableType &);
+typedef void (*CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallbackType)(
+    void *, const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImageResponse::DecodableType &);
+typedef void (*CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallbackType)(
+    void *, const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::DecodableType &);
+typedef void (*CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackType)(
+    void *, const chip::app::Clusters::GeneralCommissioning::Commands::ArmFailSafeResponse::DecodableType &);
+typedef void (*CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallbackType)(
+    void *, const chip::app::Clusters::GeneralCommissioning::Commands::SetRegulatoryConfigResponse::DecodableType &);
+typedef void (*CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackType)(
+    void *, const chip::app::Clusters::GeneralCommissioning::Commands::CommissioningCompleteResponse::DecodableType &);
+typedef void (*CHIPNetworkCommissioningClusterScanNetworksResponseCallbackType)(
+    void *, const chip::app::Clusters::NetworkCommissioning::Commands::ScanNetworksResponse::DecodableType &);
+typedef void (*CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackType)(
+    void *, const chip::app::Clusters::NetworkCommissioning::Commands::NetworkConfigResponse::DecodableType &);
+typedef void (*CHIPNetworkCommissioningClusterConnectNetworkResponseCallbackType)(
+    void *, const chip::app::Clusters::NetworkCommissioning::Commands::ConnectNetworkResponse::DecodableType &);
+typedef void (*CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackType)(
+    void *, const chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType &);
+typedef void (*CHIPOperationalCredentialsClusterAttestationResponseCallbackType)(
+    void *, const chip::app::Clusters::OperationalCredentials::Commands::AttestationResponse::DecodableType &);
+typedef void (*CHIPOperationalCredentialsClusterCertificateChainResponseCallbackType)(
+    void *, const chip::app::Clusters::OperationalCredentials::Commands::CertificateChainResponse::DecodableType &);
+typedef void (*CHIPOperationalCredentialsClusterCSRResponseCallbackType)(
+    void *, const chip::app::Clusters::OperationalCredentials::Commands::CSRResponse::DecodableType &);
+typedef void (*CHIPOperationalCredentialsClusterNOCResponseCallbackType)(
+    void *, const chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::DecodableType &);
+typedef void (*CHIPGroupKeyManagementClusterKeySetReadResponseCallbackType)(
+    void *, const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadResponse::DecodableType &);
+typedef void (*CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallbackType)(
+    void *, const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::DecodableType &);
+typedef void (*CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackType)(
+    void *, const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType &);
+typedef void (*CHIPDoorLockClusterGetYearDayScheduleResponseCallbackType)(
+    void *, const chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType &);
+typedef void (*CHIPDoorLockClusterGetHolidayScheduleResponseCallbackType)(
+    void *, const chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType &);
+typedef void (*CHIPDoorLockClusterGetUserResponseCallbackType)(
+    void *, const chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType &);
+typedef void (*CHIPDoorLockClusterSetCredentialResponseCallbackType)(
+    void *, const chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType &);
+typedef void (*CHIPDoorLockClusterGetCredentialStatusResponseCallbackType)(
+    void *, const chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType &);
+typedef void (*CHIPThermostatClusterGetWeeklyScheduleResponseCallbackType)(
+    void *, const chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType &);
+typedef void (*CHIPChannelClusterChangeChannelResponseCallbackType)(
+    void *, const chip::app::Clusters::Channel::Commands::ChangeChannelResponse::DecodableType &);
 typedef void (*CHIPTargetNavigatorClusterNavigateTargetResponseCallbackType)(
     void *, const chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::DecodableType &);
+typedef void (*CHIPMediaPlaybackClusterPlaybackResponseCallbackType)(
+    void *, const chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType &);
+typedef void (*CHIPKeypadInputClusterSendKeyResponseCallbackType)(
+    void *, const chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType &);
+typedef void (*CHIPContentLauncherClusterLaunchResponseCallbackType)(
+    void *, const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType &);
+typedef void (*CHIPApplicationLauncherClusterLauncherResponseCallbackType)(
+    void *, const chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType &);
+typedef void (*CHIPAccountLoginClusterGetSetupPINResponseCallbackType)(
+    void *, const chip::app::Clusters::AccountLogin::Commands::GetSetupPINResponse::DecodableType &);
 typedef void (*CHIPTestClusterClusterTestSpecificResponseCallbackType)(
     void *, const chip::app::Clusters::TestCluster::Commands::TestSpecificResponse::DecodableType &);
 typedef void (*CHIPTestClusterClusterTestAddArgumentsResponseCallbackType)(
@@ -137,8 +139,6 @@ typedef void (*CHIPTestClusterClusterTestEmitTestEventResponseCallbackType)(
     void *, const chip::app::Clusters::TestCluster::Commands::TestEmitTestEventResponse::DecodableType &);
 typedef void (*CHIPTestClusterClusterTestEmitTestFabricScopedEventResponseCallbackType)(
     void *, const chip::app::Clusters::TestCluster::Commands::TestEmitTestFabricScopedEventResponse::DecodableType &);
-typedef void (*CHIPThermostatClusterGetWeeklyScheduleResponseCallbackType)(
-    void *, const chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType &);
 
 typedef void (*IdentifyClusterIdentifyEffectIdentifierAttributeCallback)(void *,
                                                                          chip::app::Clusters::Identify::IdentifyEffectIdentifier);
@@ -560,81 +560,63 @@ typedef void (*TestClusterClusterSimpleEnumAttributeCallback)(void *, chip::app:
 typedef void (*NullableTestClusterClusterSimpleEnumAttributeCallback)(
     void *, const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> &);
 
-typedef void (*AccessControlAclListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::DecodableType> &
-        data);
-typedef void (*AccessControlExtensionListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::ExtensionEntry::DecodableType> & data);
-typedef void (*AccessControlGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*AccessControlAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*AccessControlAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*AccountLoginGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*AccountLoginAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*AccountLoginAttributeListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*AdministratorCommissioningGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*AdministratorCommissioningAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*AdministratorCommissioningAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ApplicationBasicApplicationStructAttributeCallback)(
-    void *, const chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::DecodableType &);
-typedef void (*ApplicationBasicAllowedVendorListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::VendorId> & data);
-typedef void (*ApplicationBasicGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ApplicationBasicAcceptedCommandListListAttributeCallback)(
+typedef void (*IdentifyGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ApplicationBasicAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ApplicationLauncherCatalogListListAttributeCallback)(void * context,
-                                                                    const chip::app::DataModel::DecodableList<uint16_t> & data);
-typedef void (*ApplicationLauncherCurrentAppStructAttributeCallback)(
-    void *,
-    const chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::DecodableType> &);
-typedef void (*ApplicationLauncherGeneratedCommandListListAttributeCallback)(
+typedef void (*IdentifyAcceptedCommandListListAttributeCallback)(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*IdentifyAttributeListListAttributeCallback)(void * context,
+                                                           const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*GroupsGeneratedCommandListListAttributeCallback)(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*GroupsAcceptedCommandListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*GroupsAttributeListListAttributeCallback)(void * context,
+                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*ScenesGeneratedCommandListListAttributeCallback)(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ScenesAcceptedCommandListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ScenesAttributeListListAttributeCallback)(void * context,
+                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*OnOffGeneratedCommandListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*OnOffAcceptedCommandListListAttributeCallback)(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*OnOffAttributeListListAttributeCallback)(void * context,
+                                                        const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*OnOffSwitchConfigurationGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ApplicationLauncherAcceptedCommandListListAttributeCallback)(
+typedef void (*OnOffSwitchConfigurationAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ApplicationLauncherAttributeListListAttributeCallback)(
+typedef void (*OnOffSwitchConfigurationAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*AudioOutputOutputListListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::OutputInfo::DecodableType> & data);
-typedef void (*AudioOutputGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*AudioOutputAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*AudioOutputAttributeListListAttributeCallback)(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*BarrierControlGeneratedCommandListListAttributeCallback)(
+typedef void (*LevelControlGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*BarrierControlAcceptedCommandListListAttributeCallback)(
+typedef void (*LevelControlAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*BarrierControlAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*BasicCapabilityMinimaStructAttributeCallback)(
-    void *, const chip::app::Clusters::Basic::Structs::CapabilityMinimaStruct::DecodableType &);
-typedef void (*BasicGeneratedCommandListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*BasicAcceptedCommandListListAttributeCallback)(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*BasicAttributeListListAttributeCallback)(void * context,
-                                                        const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*LevelControlAttributeListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*BinaryInputBasicGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*BinaryInputBasicAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*BinaryInputBasicAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*DescriptorDeviceListListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::DeviceType::DecodableType> & data);
+typedef void (*DescriptorServerListListAttributeCallback)(void * context,
+                                                          const chip::app::DataModel::DecodableList<chip::ClusterId> & data);
+typedef void (*DescriptorClientListListAttributeCallback)(void * context,
+                                                          const chip::app::DataModel::DecodableList<chip::ClusterId> & data);
+typedef void (*DescriptorPartsListListAttributeCallback)(void * context,
+                                                         const chip::app::DataModel::DecodableList<chip::EndpointId> & data);
+typedef void (*DescriptorGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*DescriptorAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*DescriptorAttributeListListAttributeCallback)(void * context,
+                                                             const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*BindingBindingListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::Binding::Structs::TargetStruct::DecodableType> & data);
@@ -644,12 +626,19 @@ typedef void (*BindingAcceptedCommandListListAttributeCallback)(void * context,
                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*BindingAttributeListListAttributeCallback)(void * context,
                                                           const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*BooleanStateGeneratedCommandListListAttributeCallback)(
+typedef void (*AccessControlAclListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::DecodableType> &
+        data);
+typedef void (*AccessControlExtensionListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::ExtensionEntry::DecodableType> & data);
+typedef void (*AccessControlGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*BooleanStateAcceptedCommandListListAttributeCallback)(
+typedef void (*AccessControlAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*BooleanStateAttributeListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*AccessControlAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*BridgedActionsActionListListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::ActionStruct::DecodableType> & data);
@@ -663,107 +652,72 @@ typedef void (*BridgedActionsAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*BridgedActionsAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*BridgedDeviceBasicGeneratedCommandListListAttributeCallback)(
+typedef void (*BasicCapabilityMinimaStructAttributeCallback)(
+    void *, const chip::app::Clusters::Basic::Structs::CapabilityMinimaStruct::DecodableType &);
+typedef void (*BasicGeneratedCommandListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*BasicAcceptedCommandListListAttributeCallback)(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*BasicAttributeListListAttributeCallback)(void * context,
+                                                        const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*OtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*BridgedDeviceBasicAcceptedCommandListListAttributeCallback)(
+typedef void (*OtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*BridgedDeviceBasicAttributeListListAttributeCallback)(
+typedef void (*OtaSoftwareUpdateProviderAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ChannelChannelListListAttributeCallback)(
+typedef void (*OtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallback)(
     void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> & data);
-typedef void (*ChannelLineupStructAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::LineupInfo::DecodableType> &);
-typedef void (*ChannelCurrentChannelStructAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> &);
-typedef void (*ChannelGeneratedCommandListListAttributeCallback)(void * context,
-                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ChannelAcceptedCommandListListAttributeCallback)(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ChannelAttributeListListAttributeCallback)(void * context,
-                                                          const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ColorControlGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ColorControlAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ColorControlAttributeListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ContentLauncherAcceptHeaderListAttributeCallback)(void * context,
-                                                                 const chip::app::DataModel::DecodableList<chip::CharSpan> & data);
-typedef void (*ContentLauncherGeneratedCommandListListAttributeCallback)(
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType> & data);
+typedef void (*OtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ContentLauncherAcceptedCommandListListAttributeCallback)(
+typedef void (*OtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ContentLauncherAttributeListListAttributeCallback)(
+typedef void (*OtaSoftwareUpdateRequestorAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*DescriptorDeviceListListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::DeviceType::DecodableType> & data);
-typedef void (*DescriptorServerListListAttributeCallback)(void * context,
-                                                          const chip::app::DataModel::DecodableList<chip::ClusterId> & data);
-typedef void (*DescriptorClientListListAttributeCallback)(void * context,
-                                                          const chip::app::DataModel::DecodableList<chip::ClusterId> & data);
-typedef void (*DescriptorPartsListListAttributeCallback)(void * context,
-                                                         const chip::app::DataModel::DecodableList<chip::EndpointId> & data);
-typedef void (*DescriptorGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*DescriptorAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*DescriptorAttributeListListAttributeCallback)(void * context,
-                                                             const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*DiagnosticLogsGeneratedCommandListListAttributeCallback)(
+typedef void (*LocalizationConfigurationSupportedLocalesListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CharSpan> & data);
+typedef void (*LocalizationConfigurationGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*DiagnosticLogsAcceptedCommandListListAttributeCallback)(
+typedef void (*LocalizationConfigurationAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*DiagnosticLogsAttributeListListAttributeCallback)(
+typedef void (*LocalizationConfigurationAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*DoorLockCredentialRulesSupportAttributeCallback)(void *,
-                                                                chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask>);
-typedef void (*DoorLockSupportedOperatingModesAttributeCallback)(
-    void *, chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes>);
-typedef void (*DoorLockDefaultConfigurationRegisterAttributeCallback)(
-    void *, chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister>);
-typedef void (*DoorLockLocalProgrammingFeaturesAttributeCallback)(
-    void *, chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures>);
-typedef void (*DoorLockGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*DoorLockAcceptedCommandListListAttributeCallback)(void * context,
-                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*DoorLockAttributeListListAttributeCallback)(void * context,
-                                                           const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ElectricalMeasurementGeneratedCommandListListAttributeCallback)(
+typedef void (*TimeFormatLocalizationSupportedCalendarTypesListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::TimeFormatLocalization::CalendarType> & data);
+typedef void (*TimeFormatLocalizationGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ElectricalMeasurementAcceptedCommandListListAttributeCallback)(
+typedef void (*TimeFormatLocalizationAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ElectricalMeasurementAttributeListListAttributeCallback)(
+typedef void (*TimeFormatLocalizationAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*EthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallback)(
+typedef void (*UnitLocalizationGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*EthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallback)(
+typedef void (*UnitLocalizationAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*EthernetNetworkDiagnosticsAttributeListListAttributeCallback)(
+typedef void (*UnitLocalizationAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*FanControlGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*FanControlAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*FanControlAttributeListListAttributeCallback)(void * context,
-                                                             const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*FixedLabelLabelListListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::FixedLabel::Structs::LabelStruct::DecodableType> & data);
-typedef void (*FixedLabelGeneratedCommandListListAttributeCallback)(
+typedef void (*PowerSourceConfigurationSourcesListAttributeCallback)(void * context,
+                                                                     const chip::app::DataModel::DecodableList<uint8_t> & data);
+typedef void (*PowerSourceConfigurationGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*FixedLabelAcceptedCommandListListAttributeCallback)(
+typedef void (*PowerSourceConfigurationAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*FixedLabelAttributeListListAttributeCallback)(void * context,
-                                                             const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*FlowMeasurementGeneratedCommandListListAttributeCallback)(
+typedef void (*PowerSourceConfigurationAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*PowerSourceActiveWiredFaultsListAttributeCallback)(void * context,
+                                                                  const chip::app::DataModel::DecodableList<uint8_t> & data);
+typedef void (*PowerSourceActiveBatteryFaultsListAttributeCallback)(void * context,
+                                                                    const chip::app::DataModel::DecodableList<uint8_t> & data);
+typedef void (*PowerSourceActiveBatteryChargeFaultsListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<uint8_t> & data);
+typedef void (*PowerSourceGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*FlowMeasurementAcceptedCommandListListAttributeCallback)(
+typedef void (*PowerSourceAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*FlowMeasurementAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*PowerSourceAttributeListListAttributeCallback)(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*GeneralCommissioningBasicCommissioningInfoStructAttributeCallback)(
     void *, const chip::app::Clusters::GeneralCommissioning::Structs::BasicCommissioningInfo::DecodableType &);
 typedef void (*GeneralCommissioningGeneratedCommandListListAttributeCallback)(
@@ -772,6 +726,22 @@ typedef void (*GeneralCommissioningAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*GeneralCommissioningAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*NetworkCommissioningNetworksListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::DecodableType> &
+        data);
+typedef void (*NetworkCommissioningGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*NetworkCommissioningAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*NetworkCommissioningAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*DiagnosticLogsGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*DiagnosticLogsAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*DiagnosticLogsAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*GeneralDiagnosticsNetworkInterfacesListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<
@@ -788,169 +758,208 @@ typedef void (*GeneralDiagnosticsAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*GeneralDiagnosticsAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*GroupKeyManagementGroupKeyMapListAttributeCallback)(
+typedef void (*SoftwareDiagnosticsThreadMetricsListAttributeCallback)(
     void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::DecodableType> &
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType> &
         data);
-typedef void (*GroupKeyManagementGroupTableListAttributeCallback)(
+typedef void (*SoftwareDiagnosticsGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*SoftwareDiagnosticsAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*SoftwareDiagnosticsAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*ThreadNetworkDiagnosticsNeighborTableListListAttributeCallback)(
     void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupInfoMapStruct::DecodableType> &
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & data);
+typedef void (*ThreadNetworkDiagnosticsRouteTableListListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> &
         data);
-typedef void (*GroupKeyManagementGeneratedCommandListListAttributeCallback)(
+typedef void (*ThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallback)(
+    void *,
+    const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> &);
+typedef void (*ThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallback)(
+    void *,
+    const chip::app::DataModel::Nullable<
+        chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> &);
+typedef void (*ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & data);
+typedef void (*ThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*GroupKeyManagementAcceptedCommandListListAttributeCallback)(
+typedef void (*ThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*GroupKeyManagementAttributeListListAttributeCallback)(
+typedef void (*ThreadNetworkDiagnosticsAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*GroupsGeneratedCommandListListAttributeCallback)(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*GroupsAcceptedCommandListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*GroupsAttributeListListAttributeCallback)(void * context,
-                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*IdentifyGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*IdentifyAcceptedCommandListListAttributeCallback)(void * context,
-                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*IdentifyAttributeListListAttributeCallback)(void * context,
-                                                           const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*IlluminanceMeasurementGeneratedCommandListListAttributeCallback)(
+typedef void (*WiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*IlluminanceMeasurementAcceptedCommandListListAttributeCallback)(
+typedef void (*WiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*IlluminanceMeasurementAttributeListListAttributeCallback)(
+typedef void (*WiFiNetworkDiagnosticsAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*KeypadInputGeneratedCommandListListAttributeCallback)(
+typedef void (*EthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*KeypadInputAcceptedCommandListListAttributeCallback)(
+typedef void (*EthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*KeypadInputAttributeListListAttributeCallback)(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*LevelControlGeneratedCommandListListAttributeCallback)(
+typedef void (*EthernetNetworkDiagnosticsAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*BridgedDeviceBasicGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*LevelControlAcceptedCommandListListAttributeCallback)(
+typedef void (*BridgedDeviceBasicAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*LevelControlAttributeListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*LocalizationConfigurationSupportedLocalesListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CharSpan> & data);
-typedef void (*LocalizationConfigurationGeneratedCommandListListAttributeCallback)(
+typedef void (*BridgedDeviceBasicAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*SwitchGeneratedCommandListListAttributeCallback)(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*SwitchAcceptedCommandListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*SwitchAttributeListListAttributeCallback)(void * context,
+                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*AdministratorCommissioningGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*LocalizationConfigurationAcceptedCommandListListAttributeCallback)(
+typedef void (*AdministratorCommissioningAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*LocalizationConfigurationAttributeListListAttributeCallback)(
+typedef void (*AdministratorCommissioningAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*LowPowerGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*LowPowerAcceptedCommandListListAttributeCallback)(void * context,
-                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*LowPowerAttributeListListAttributeCallback)(void * context,
-                                                           const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*MediaInputInputListListAttributeCallback)(
+typedef void (*OperationalCredentialsNOCsListAttributeCallback)(
     void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::InputInfo::DecodableType> & data);
-typedef void (*MediaInputGeneratedCommandListListAttributeCallback)(
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::DecodableType> &
+        data);
+typedef void (*OperationalCredentialsFabricsListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & data);
+typedef void (*OperationalCredentialsTrustedRootCertificatesListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & data);
+typedef void (*OperationalCredentialsGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*MediaInputAcceptedCommandListListAttributeCallback)(
+typedef void (*OperationalCredentialsAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*MediaInputAttributeListListAttributeCallback)(void * context,
-                                                             const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*MediaPlaybackSampledPositionStructAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::DecodableType> &);
-typedef void (*MediaPlaybackGeneratedCommandListListAttributeCallback)(
+typedef void (*OperationalCredentialsAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*GroupKeyManagementGroupKeyMapListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::DecodableType> &
+        data);
+typedef void (*GroupKeyManagementGroupTableListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupInfoMapStruct::DecodableType> &
+        data);
+typedef void (*GroupKeyManagementGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*MediaPlaybackAcceptedCommandListListAttributeCallback)(
+typedef void (*GroupKeyManagementAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*MediaPlaybackAttributeListListAttributeCallback)(
+typedef void (*GroupKeyManagementAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ModeSelectSupportedModesListAttributeCallback)(
+typedef void (*FixedLabelLabelListListAttributeCallback)(
     void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType> & data);
-typedef void (*ModeSelectGeneratedCommandListListAttributeCallback)(
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::FixedLabel::Structs::LabelStruct::DecodableType> & data);
+typedef void (*FixedLabelGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ModeSelectAcceptedCommandListListAttributeCallback)(
+typedef void (*FixedLabelAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ModeSelectAttributeListListAttributeCallback)(void * context,
+typedef void (*FixedLabelAttributeListListAttributeCallback)(void * context,
                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*NetworkCommissioningNetworksListAttributeCallback)(
+typedef void (*UserLabelLabelListListAttributeCallback)(
     void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::DecodableType> &
-        data);
-typedef void (*NetworkCommissioningGeneratedCommandListListAttributeCallback)(
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::UserLabel::Structs::LabelStruct::DecodableType> & data);
+typedef void (*UserLabelGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*NetworkCommissioningAcceptedCommandListListAttributeCallback)(
+typedef void (*UserLabelAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*NetworkCommissioningAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*OtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallback)(
+typedef void (*UserLabelAttributeListListAttributeCallback)(void * context,
+                                                            const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*BooleanStateGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*OtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallback)(
+typedef void (*BooleanStateAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*OtaSoftwareUpdateProviderAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*OtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallback)(
+typedef void (*BooleanStateAttributeListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*ModeSelectSupportedModesListAttributeCallback)(
     void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType> & data);
-typedef void (*OtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallback)(
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType> & data);
+typedef void (*ModeSelectGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*OtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallback)(
+typedef void (*ModeSelectAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*OtaSoftwareUpdateRequestorAttributeListListAttributeCallback)(
+typedef void (*ModeSelectAttributeListListAttributeCallback)(void * context,
+                                                             const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*DoorLockCredentialRulesSupportAttributeCallback)(void *,
+                                                                chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask>);
+typedef void (*DoorLockSupportedOperatingModesAttributeCallback)(
+    void *, chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes>);
+typedef void (*DoorLockDefaultConfigurationRegisterAttributeCallback)(
+    void *, chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister>);
+typedef void (*DoorLockLocalProgrammingFeaturesAttributeCallback)(
+    void *, chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures>);
+typedef void (*DoorLockGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*DoorLockAcceptedCommandListListAttributeCallback)(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*DoorLockAttributeListListAttributeCallback)(void * context,
+                                                           const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*WindowCoveringConfigStatusAttributeCallback)(void *,
+                                                            chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus>);
+typedef void (*WindowCoveringOperationalStatusAttributeCallback)(
+    void *, chip::BitMask<chip::app::Clusters::WindowCovering::OperationalStatus>);
+typedef void (*WindowCoveringModeAttributeCallback)(void *, chip::BitMask<chip::app::Clusters::WindowCovering::Mode>);
+typedef void (*WindowCoveringSafetyStatusAttributeCallback)(void *,
+                                                            chip::BitMask<chip::app::Clusters::WindowCovering::SafetyStatus>);
+typedef void (*WindowCoveringGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*WindowCoveringAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*WindowCoveringAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*OccupancySensingGeneratedCommandListListAttributeCallback)(
+typedef void (*BarrierControlGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*OccupancySensingAcceptedCommandListListAttributeCallback)(
+typedef void (*BarrierControlAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*OccupancySensingAttributeListListAttributeCallback)(
+typedef void (*BarrierControlAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*OnOffGeneratedCommandListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*OnOffAcceptedCommandListListAttributeCallback)(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*OnOffAttributeListListAttributeCallback)(void * context,
-                                                        const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*OnOffSwitchConfigurationGeneratedCommandListListAttributeCallback)(
+typedef void (*PumpConfigurationAndControlPumpStatusAttributeCallback)(
+    void *, chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus>);
+typedef void (*PumpConfigurationAndControlGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*OnOffSwitchConfigurationAcceptedCommandListListAttributeCallback)(
+typedef void (*PumpConfigurationAndControlAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*OnOffSwitchConfigurationAttributeListListAttributeCallback)(
+typedef void (*PumpConfigurationAndControlAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*OperationalCredentialsNOCsListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::DecodableType> &
-        data);
-typedef void (*OperationalCredentialsFabricsListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & data);
-typedef void (*OperationalCredentialsTrustedRootCertificatesListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & data);
-typedef void (*OperationalCredentialsGeneratedCommandListListAttributeCallback)(
+typedef void (*ThermostatGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*OperationalCredentialsAcceptedCommandListListAttributeCallback)(
+typedef void (*ThermostatAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*OperationalCredentialsAttributeListListAttributeCallback)(
+typedef void (*ThermostatAttributeListListAttributeCallback)(void * context,
+                                                             const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*FanControlGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*FanControlAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*FanControlAttributeListListAttributeCallback)(void * context,
+                                                             const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*ThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ThermostatUserInterfaceConfigurationAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*PowerSourceActiveWiredFaultsListAttributeCallback)(void * context,
-                                                                  const chip::app::DataModel::DecodableList<uint8_t> & data);
-typedef void (*PowerSourceActiveBatteryFaultsListAttributeCallback)(void * context,
-                                                                    const chip::app::DataModel::DecodableList<uint8_t> & data);
-typedef void (*PowerSourceActiveBatteryChargeFaultsListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<uint8_t> & data);
-typedef void (*PowerSourceGeneratedCommandListListAttributeCallback)(
+typedef void (*ColorControlGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*PowerSourceAcceptedCommandListListAttributeCallback)(
+typedef void (*ColorControlAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*PowerSourceAttributeListListAttributeCallback)(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*PowerSourceConfigurationSourcesListAttributeCallback)(void * context,
-                                                                     const chip::app::DataModel::DecodableList<uint8_t> & data);
-typedef void (*PowerSourceConfigurationGeneratedCommandListListAttributeCallback)(
+typedef void (*ColorControlAttributeListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*IlluminanceMeasurementGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*PowerSourceConfigurationAcceptedCommandListListAttributeCallback)(
+typedef void (*IlluminanceMeasurementAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*PowerSourceConfigurationAttributeListListAttributeCallback)(
+typedef void (*IlluminanceMeasurementAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*TemperatureMeasurementGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*TemperatureMeasurementAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*TemperatureMeasurementAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*PressureMeasurementGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
@@ -958,13 +967,11 @@ typedef void (*PressureMeasurementAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*PressureMeasurementAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*PumpConfigurationAndControlPumpStatusAttributeCallback)(
-    void *, chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus>);
-typedef void (*PumpConfigurationAndControlGeneratedCommandListListAttributeCallback)(
+typedef void (*FlowMeasurementGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*PumpConfigurationAndControlAcceptedCommandListListAttributeCallback)(
+typedef void (*FlowMeasurementAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*PumpConfigurationAndControlAttributeListListAttributeCallback)(
+typedef void (*FlowMeasurementAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*RelativeHumidityMeasurementGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
@@ -972,28 +979,31 @@ typedef void (*RelativeHumidityMeasurementAcceptedCommandListListAttributeCallba
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*RelativeHumidityMeasurementAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ScenesGeneratedCommandListListAttributeCallback)(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ScenesAcceptedCommandListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ScenesAttributeListListAttributeCallback)(void * context,
-                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*SoftwareDiagnosticsThreadMetricsListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType> &
-        data);
-typedef void (*SoftwareDiagnosticsGeneratedCommandListListAttributeCallback)(
+typedef void (*OccupancySensingGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*SoftwareDiagnosticsAcceptedCommandListListAttributeCallback)(
+typedef void (*OccupancySensingAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*SoftwareDiagnosticsAttributeListListAttributeCallback)(
+typedef void (*OccupancySensingAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*SwitchGeneratedCommandListListAttributeCallback)(void * context,
+typedef void (*WakeOnLanGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*WakeOnLanAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*WakeOnLanAttributeListListAttributeCallback)(void * context,
+                                                            const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*ChannelChannelListListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> & data);
+typedef void (*ChannelLineupStructAttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::LineupInfo::DecodableType> &);
+typedef void (*ChannelCurrentChannelStructAttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> &);
+typedef void (*ChannelGeneratedCommandListListAttributeCallback)(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ChannelAcceptedCommandListListAttributeCallback)(void * context,
                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*SwitchAcceptedCommandListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*SwitchAttributeListListAttributeCallback)(void * context,
-                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*ChannelAttributeListListAttributeCallback)(void * context,
+                                                          const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*TargetNavigatorTargetListListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType> & data);
@@ -1003,134 +1013,124 @@ typedef void (*TargetNavigatorAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*TargetNavigatorAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*TemperatureMeasurementGeneratedCommandListListAttributeCallback)(
+typedef void (*MediaPlaybackSampledPositionStructAttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::DecodableType> &);
+typedef void (*MediaPlaybackGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*TemperatureMeasurementAcceptedCommandListListAttributeCallback)(
+typedef void (*MediaPlaybackAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*TemperatureMeasurementAttributeListListAttributeCallback)(
+typedef void (*MediaPlaybackAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*TestClusterBitmap8AttributeCallback)(void *, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>);
-typedef void (*TestClusterBitmap16AttributeCallback)(void *, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>);
-typedef void (*TestClusterBitmap32AttributeCallback)(void *, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>);
-typedef void (*TestClusterBitmap64AttributeCallback)(void *, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>);
-typedef void (*TestClusterListInt8uListAttributeCallback)(void * context,
-                                                          const chip::app::DataModel::DecodableList<uint8_t> & data);
-typedef void (*TestClusterListOctetStringListAttributeCallback)(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::ByteSpan> & data);
-typedef void (*TestClusterListStructOctetStringListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType> &
-        data);
-typedef void (*TestClusterListNullablesAndOptionalsStructListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::DecodableType> & data);
-typedef void (*TestClusterStructAttrStructAttributeCallback)(
-    void *, const chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType &);
-typedef void (*TestClusterListLongOctetStringListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & data);
-typedef void (*TestClusterListFabricScopedListAttributeCallback)(
+typedef void (*MediaInputInputListListAttributeCallback)(
     void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestFabricScoped::DecodableType> & data);
-typedef void (*TestClusterNullableBitmap8AttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> &);
-typedef void (*TestClusterNullableBitmap16AttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> &);
-typedef void (*TestClusterNullableBitmap32AttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> &);
-typedef void (*TestClusterNullableBitmap64AttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> &);
-typedef void (*TestClusterNullableStructStructAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType> &);
-typedef void (*TestClusterGeneratedCommandListListAttributeCallback)(
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::InputInfo::DecodableType> & data);
+typedef void (*MediaInputGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*TestClusterAcceptedCommandListListAttributeCallback)(
+typedef void (*MediaInputAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*TestClusterAttributeListListAttributeCallback)(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ThermostatGeneratedCommandListListAttributeCallback)(
+typedef void (*MediaInputAttributeListListAttributeCallback)(void * context,
+                                                             const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*LowPowerGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ThermostatAcceptedCommandListListAttributeCallback)(
+typedef void (*LowPowerAcceptedCommandListListAttributeCallback)(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*LowPowerAttributeListListAttributeCallback)(void * context,
+                                                           const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*KeypadInputGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ThermostatAttributeListListAttributeCallback)(void * context,
-                                                             const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallback)(
+typedef void (*KeypadInputAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallback)(
+typedef void (*KeypadInputAttributeListListAttributeCallback)(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*ContentLauncherAcceptHeaderListAttributeCallback)(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::CharSpan> & data);
+typedef void (*ContentLauncherGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ThermostatUserInterfaceConfigurationAttributeListListAttributeCallback)(
+typedef void (*ContentLauncherAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ContentLauncherAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ThreadNetworkDiagnosticsNeighborTableListListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & data);
-typedef void (*ThreadNetworkDiagnosticsRouteTableListListAttributeCallback)(
+typedef void (*AudioOutputOutputListListAttributeCallback)(
     void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> &
-        data);
-typedef void (*ThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallback)(
-    void *,
-    const chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> &);
-typedef void (*ThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallback)(
-    void *,
-    const chip::app::DataModel::Nullable<
-        chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> &);
-typedef void (*ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & data);
-typedef void (*ThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallback)(
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::OutputInfo::DecodableType> & data);
+typedef void (*AudioOutputGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallback)(
+typedef void (*AudioOutputAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ThreadNetworkDiagnosticsAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*TimeFormatLocalizationSupportedCalendarTypesListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::TimeFormatLocalization::CalendarType> & data);
-typedef void (*TimeFormatLocalizationGeneratedCommandListListAttributeCallback)(
+typedef void (*AudioOutputAttributeListListAttributeCallback)(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*ApplicationLauncherCatalogListListAttributeCallback)(void * context,
+                                                                    const chip::app::DataModel::DecodableList<uint16_t> & data);
+typedef void (*ApplicationLauncherCurrentAppStructAttributeCallback)(
+    void *,
+    const chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::DecodableType> &);
+typedef void (*ApplicationLauncherGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*TimeFormatLocalizationAcceptedCommandListListAttributeCallback)(
+typedef void (*ApplicationLauncherAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*TimeFormatLocalizationAttributeListListAttributeCallback)(
+typedef void (*ApplicationLauncherAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*UnitLocalizationGeneratedCommandListListAttributeCallback)(
+typedef void (*ApplicationBasicApplicationStructAttributeCallback)(
+    void *, const chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::DecodableType &);
+typedef void (*ApplicationBasicAllowedVendorListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::VendorId> & data);
+typedef void (*ApplicationBasicGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*UnitLocalizationAcceptedCommandListListAttributeCallback)(
+typedef void (*ApplicationBasicAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*UnitLocalizationAttributeListListAttributeCallback)(
+typedef void (*ApplicationBasicAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*UserLabelLabelListListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::UserLabel::Structs::LabelStruct::DecodableType> & data);
-typedef void (*UserLabelGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*UserLabelAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*UserLabelAttributeListListAttributeCallback)(void * context,
-                                                            const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*WakeOnLanGeneratedCommandListListAttributeCallback)(
+typedef void (*AccountLoginGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*WakeOnLanAcceptedCommandListListAttributeCallback)(
+typedef void (*AccountLoginAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*WakeOnLanAttributeListListAttributeCallback)(void * context,
-                                                            const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*WiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallback)(
+typedef void (*AccountLoginAttributeListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*ElectricalMeasurementGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*WiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallback)(
+typedef void (*ElectricalMeasurementAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*WiFiNetworkDiagnosticsAttributeListListAttributeCallback)(
+typedef void (*ElectricalMeasurementAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*WindowCoveringConfigStatusAttributeCallback)(void *,
-                                                            chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus>);
-typedef void (*WindowCoveringOperationalStatusAttributeCallback)(
-    void *, chip::BitMask<chip::app::Clusters::WindowCovering::OperationalStatus>);
-typedef void (*WindowCoveringModeAttributeCallback)(void *, chip::BitMask<chip::app::Clusters::WindowCovering::Mode>);
-typedef void (*WindowCoveringSafetyStatusAttributeCallback)(void *,
-                                                            chip::BitMask<chip::app::Clusters::WindowCovering::SafetyStatus>);
-typedef void (*WindowCoveringGeneratedCommandListListAttributeCallback)(
+typedef void (*TestClusterBitmap8AttributeCallback)(void *, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>);
+typedef void (*TestClusterBitmap16AttributeCallback)(void *, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>);
+typedef void (*TestClusterBitmap32AttributeCallback)(void *, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>);
+typedef void (*TestClusterBitmap64AttributeCallback)(void *, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>);
+typedef void (*TestClusterListInt8uListAttributeCallback)(void * context,
+                                                          const chip::app::DataModel::DecodableList<uint8_t> & data);
+typedef void (*TestClusterListOctetStringListAttributeCallback)(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::ByteSpan> & data);
+typedef void (*TestClusterListStructOctetStringListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType> &
+        data);
+typedef void (*TestClusterListNullablesAndOptionalsStructListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::DecodableType> & data);
+typedef void (*TestClusterStructAttrStructAttributeCallback)(
+    void *, const chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType &);
+typedef void (*TestClusterListLongOctetStringListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & data);
+typedef void (*TestClusterListFabricScopedListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestFabricScoped::DecodableType> & data);
+typedef void (*TestClusterNullableBitmap8AttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> &);
+typedef void (*TestClusterNullableBitmap16AttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> &);
+typedef void (*TestClusterNullableBitmap32AttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> &);
+typedef void (*TestClusterNullableBitmap64AttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> &);
+typedef void (*TestClusterNullableStructStructAttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType> &);
+typedef void (*TestClusterGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*WindowCoveringAcceptedCommandListListAttributeCallback)(
+typedef void (*TestClusterAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*WindowCoveringAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*TestClusterAttributeListListAttributeCallback)(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 
 class CHIPDefaultSuccessCallbackBridge : public CHIPCallbackBridge<DefaultSuccessCallback>
 {
@@ -1854,26 +1854,25 @@ class CHIPNullableVendorIdAttributeCallbackSubscriptionBridge : public CHIPNulla
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPAccessControlAclListAttributeCallbackBridge : public CHIPCallbackBridge<AccessControlAclListAttributeCallback>
+class CHIPIdentifyGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<IdentifyGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPAccessControlAclListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                    bool keepAlive = false) :
-        CHIPCallbackBridge<AccessControlAclListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPIdentifyGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<IdentifyGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::DecodableType> &
-            value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPAccessControlAclListAttributeCallbackSubscriptionBridge : public CHIPAccessControlAclListAttributeCallbackBridge
+class CHIPIdentifyGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPIdentifyGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPAccessControlAclListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                CHIPActionBlock action,
-                                                                SubscriptionEstablishedHandler establishedHandler) :
-        CHIPAccessControlAclListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPIdentifyGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                            CHIPActionBlock action,
+                                                                            SubscriptionEstablishedHandler establishedHandler) :
+        CHIPIdentifyGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -1883,27 +1882,25 @@ class CHIPAccessControlAclListAttributeCallbackSubscriptionBridge : public CHIPA
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPAccessControlExtensionListAttributeCallbackBridge : public CHIPCallbackBridge<AccessControlExtensionListAttributeCallback>
+class CHIPIdentifyAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<IdentifyAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPAccessControlExtensionListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                          bool keepAlive = false) :
-        CHIPCallbackBridge<AccessControlExtensionListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPIdentifyAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                               CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<IdentifyAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::ExtensionEntry::DecodableType> &
-            value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPAccessControlExtensionListAttributeCallbackSubscriptionBridge
-    : public CHIPAccessControlExtensionListAttributeCallbackBridge
+class CHIPIdentifyAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPIdentifyAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPAccessControlExtensionListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                      CHIPActionBlock action,
-                                                                      SubscriptionEstablishedHandler establishedHandler) :
-        CHIPAccessControlExtensionListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPIdentifyAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                           CHIPActionBlock action,
+                                                                           SubscriptionEstablishedHandler establishedHandler) :
+        CHIPIdentifyAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -1913,26 +1910,23 @@ class CHIPAccessControlExtensionListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPAccessControlGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<AccessControlGeneratedCommandListListAttributeCallback>
+class CHIPIdentifyAttributeListListAttributeCallbackBridge : public CHIPCallbackBridge<IdentifyAttributeListListAttributeCallback>
 {
 public:
-    CHIPAccessControlGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                     CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<AccessControlGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                   keepAlive){};
+    CHIPIdentifyAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                         bool keepAlive = false) :
+        CHIPCallbackBridge<IdentifyAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPAccessControlGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPAccessControlGeneratedCommandListListAttributeCallbackBridge
+class CHIPIdentifyAttributeListListAttributeCallbackSubscriptionBridge : public CHIPIdentifyAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPAccessControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPAccessControlGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPIdentifyAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                     CHIPActionBlock action,
+                                                                     SubscriptionEstablishedHandler establishedHandler) :
+        CHIPIdentifyAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -1942,25 +1936,25 @@ class CHIPAccessControlGeneratedCommandListListAttributeCallbackSubscriptionBrid
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPAccessControlAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<AccessControlAcceptedCommandListListAttributeCallback>
+class CHIPGroupsGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<GroupsGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPAccessControlAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                    CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<AccessControlAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPGroupsGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                              CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<GroupsGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPAccessControlAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPAccessControlAcceptedCommandListListAttributeCallbackBridge
+class CHIPGroupsGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPGroupsGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPAccessControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                CHIPActionBlock action,
-                                                                                SubscriptionEstablishedHandler establishedHandler) :
-        CHIPAccessControlAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPGroupsGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                          CHIPActionBlock action,
+                                                                          SubscriptionEstablishedHandler establishedHandler) :
+        CHIPGroupsGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -1970,25 +1964,25 @@ class CHIPAccessControlAcceptedCommandListListAttributeCallbackSubscriptionBridg
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPAccessControlAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<AccessControlAttributeListListAttributeCallback>
+class CHIPGroupsAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<GroupsAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPAccessControlAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                              CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<AccessControlAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPGroupsAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                             CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<GroupsAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPAccessControlAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPAccessControlAttributeListListAttributeCallbackBridge
+class CHIPGroupsAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPGroupsAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPAccessControlAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          CHIPActionBlock action,
-                                                                          SubscriptionEstablishedHandler establishedHandler) :
-        CHIPAccessControlAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPGroupsAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                         CHIPActionBlock action,
+                                                                         SubscriptionEstablishedHandler establishedHandler) :
+        CHIPGroupsAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -1998,25 +1992,23 @@ class CHIPAccessControlAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPAccountLoginGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<AccountLoginGeneratedCommandListListAttributeCallback>
+class CHIPGroupsAttributeListListAttributeCallbackBridge : public CHIPCallbackBridge<GroupsAttributeListListAttributeCallback>
 {
 public:
-    CHIPAccountLoginGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                    CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<AccountLoginGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPGroupsAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                       bool keepAlive = false) :
+        CHIPCallbackBridge<GroupsAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPAccountLoginGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPAccountLoginGeneratedCommandListListAttributeCallbackBridge
+class CHIPGroupsAttributeListListAttributeCallbackSubscriptionBridge : public CHIPGroupsAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPAccountLoginGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                CHIPActionBlock action,
-                                                                                SubscriptionEstablishedHandler establishedHandler) :
-        CHIPAccountLoginGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPGroupsAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                   CHIPActionBlock action,
+                                                                   SubscriptionEstablishedHandler establishedHandler) :
+        CHIPGroupsAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2026,25 +2018,25 @@ class CHIPAccountLoginGeneratedCommandListListAttributeCallbackSubscriptionBridg
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPAccountLoginAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<AccountLoginAcceptedCommandListListAttributeCallback>
+class CHIPScenesGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ScenesGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPAccountLoginAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                   CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<AccountLoginAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPScenesGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                              CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ScenesGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPAccountLoginAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPAccountLoginAcceptedCommandListListAttributeCallbackBridge
+class CHIPScenesGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPScenesGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPAccountLoginAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                               CHIPActionBlock action,
-                                                                               SubscriptionEstablishedHandler establishedHandler) :
-        CHIPAccountLoginAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPScenesGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                          CHIPActionBlock action,
+                                                                          SubscriptionEstablishedHandler establishedHandler) :
+        CHIPScenesGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2054,25 +2046,25 @@ class CHIPAccountLoginAcceptedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPAccountLoginAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<AccountLoginAttributeListListAttributeCallback>
+class CHIPScenesAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ScenesAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPAccountLoginAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPScenesAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                              CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<AccountLoginAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+        CHIPCallbackBridge<ScenesAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPAccountLoginAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPAccountLoginAttributeListListAttributeCallbackBridge
+class CHIPScenesAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPScenesAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPAccountLoginAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPScenesAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                          CHIPActionBlock action,
                                                                          SubscriptionEstablishedHandler establishedHandler) :
-        CHIPAccountLoginAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPScenesAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2082,26 +2074,23 @@ class CHIPAccountLoginAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<AdministratorCommissioningGeneratedCommandListListAttributeCallback>
+class CHIPScenesAttributeListListAttributeCallbackBridge : public CHIPCallbackBridge<ScenesAttributeListListAttributeCallback>
 {
 public:
-    CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                  CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<AdministratorCommissioningGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                                keepAlive){};
+    CHIPScenesAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                       bool keepAlive = false) :
+        CHIPCallbackBridge<ScenesAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackBridge
+class CHIPScenesAttributeListListAttributeCallbackSubscriptionBridge : public CHIPScenesAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPScenesAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                   CHIPActionBlock action,
+                                                                   SubscriptionEstablishedHandler establishedHandler) :
+        CHIPScenesAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2111,26 +2100,25 @@ class CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackSub
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<AdministratorCommissioningAcceptedCommandListListAttributeCallback>
+class CHIPOnOffGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<OnOffGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<AdministratorCommissioningAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                               keepAlive){};
+    CHIPOnOffGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                             CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<OnOffGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackBridge
+class CHIPOnOffGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPOnOffGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPOnOffGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                         CHIPActionBlock action,
+                                                                         SubscriptionEstablishedHandler establishedHandler) :
+        CHIPOnOffGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2140,26 +2128,25 @@ class CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackSubs
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPAdministratorCommissioningAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<AdministratorCommissioningAttributeListListAttributeCallback>
+class CHIPOnOffAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<OnOffAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPAdministratorCommissioningAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                           CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<AdministratorCommissioningAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                         keepAlive){};
+    CHIPOnOffAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                            bool keepAlive = false) :
+        CHIPCallbackBridge<OnOffAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPAdministratorCommissioningAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPAdministratorCommissioningAttributeListListAttributeCallbackBridge
+class CHIPOnOffAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPOnOffAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPAdministratorCommissioningAttributeListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPAdministratorCommissioningAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPOnOffAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                        CHIPActionBlock action,
+                                                                        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPOnOffAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2169,27 +2156,23 @@ class CHIPAdministratorCommissioningAttributeListListAttributeCallbackSubscripti
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPApplicationBasicApplicationStructAttributeCallbackBridge
-    : public CHIPCallbackBridge<ApplicationBasicApplicationStructAttributeCallback>
+class CHIPOnOffAttributeListListAttributeCallbackBridge : public CHIPCallbackBridge<OnOffAttributeListListAttributeCallback>
 {
 public:
-    CHIPApplicationBasicApplicationStructAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ApplicationBasicApplicationStructAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPOnOffAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                      bool keepAlive = false) :
+        CHIPCallbackBridge<OnOffAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void
-    OnSuccessFn(void * context,
-                const chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::DecodableType & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPApplicationBasicApplicationStructAttributeCallbackSubscriptionBridge
-    : public CHIPApplicationBasicApplicationStructAttributeCallbackBridge
+class CHIPOnOffAttributeListListAttributeCallbackSubscriptionBridge : public CHIPOnOffAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPApplicationBasicApplicationStructAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             CHIPActionBlock action,
-                                                                             SubscriptionEstablishedHandler establishedHandler) :
-        CHIPApplicationBasicApplicationStructAttributeCallbackBridge(queue, handler, action, true),
+    CHIPOnOffAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                  CHIPActionBlock action,
+                                                                  SubscriptionEstablishedHandler establishedHandler) :
+        CHIPOnOffAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2199,26 +2182,26 @@ class CHIPApplicationBasicApplicationStructAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPApplicationBasicAllowedVendorListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ApplicationBasicAllowedVendorListListAttributeCallback>
+class CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<OnOffSwitchConfigurationGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPApplicationBasicAllowedVendorListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                     CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ApplicationBasicAllowedVendorListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                   keepAlive){};
+    CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<OnOffSwitchConfigurationGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                              keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::VendorId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPApplicationBasicAllowedVendorListListAttributeCallbackSubscriptionBridge
-    : public CHIPApplicationBasicAllowedVendorListListAttributeCallbackBridge
+class CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPApplicationBasicAllowedVendorListListAttributeCallbackSubscriptionBridge(
+    CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPApplicationBasicAllowedVendorListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2228,26 +2211,26 @@ class CHIPApplicationBasicAllowedVendorListListAttributeCallbackSubscriptionBrid
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPApplicationBasicGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ApplicationBasicGeneratedCommandListListAttributeCallback>
+class CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<OnOffSwitchConfigurationAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPApplicationBasicGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                        CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ApplicationBasicGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                      keepAlive){};
+    CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                               CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<OnOffSwitchConfigurationAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                             keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPApplicationBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPApplicationBasicGeneratedCommandListListAttributeCallbackBridge
+class CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPApplicationBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPApplicationBasicGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2257,26 +2240,26 @@ class CHIPApplicationBasicGeneratedCommandListListAttributeCallbackSubscriptionB
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPApplicationBasicAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ApplicationBasicAcceptedCommandListListAttributeCallback>
+class CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<OnOffSwitchConfigurationAttributeListListAttributeCallback>
 {
 public:
-    CHIPApplicationBasicAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ApplicationBasicAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                     keepAlive){};
+    CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                         CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<OnOffSwitchConfigurationAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                       keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPApplicationBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPApplicationBasicAcceptedCommandListListAttributeCallbackBridge
+class CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPApplicationBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPApplicationBasicAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2286,25 +2269,25 @@ class CHIPApplicationBasicAcceptedCommandListListAttributeCallbackSubscriptionBr
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPApplicationBasicAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ApplicationBasicAttributeListListAttributeCallback>
+class CHIPLevelControlGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<LevelControlGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPApplicationBasicAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ApplicationBasicAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPLevelControlGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                    CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<LevelControlGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPApplicationBasicAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPApplicationBasicAttributeListListAttributeCallbackBridge
+class CHIPLevelControlGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPLevelControlGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPApplicationBasicAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             CHIPActionBlock action,
-                                                                             SubscriptionEstablishedHandler establishedHandler) :
-        CHIPApplicationBasicAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPLevelControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                CHIPActionBlock action,
+                                                                                SubscriptionEstablishedHandler establishedHandler) :
+        CHIPLevelControlGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2314,25 +2297,25 @@ class CHIPApplicationBasicAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPApplicationLauncherCatalogListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ApplicationLauncherCatalogListListAttributeCallback>
+class CHIPLevelControlAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<LevelControlAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPApplicationLauncherCatalogListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                  CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ApplicationLauncherCatalogListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPLevelControlAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                   CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<LevelControlAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<uint16_t> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPApplicationLauncherCatalogListListAttributeCallbackSubscriptionBridge
-    : public CHIPApplicationLauncherCatalogListListAttributeCallbackBridge
+class CHIPLevelControlAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPLevelControlAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPApplicationLauncherCatalogListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                              CHIPActionBlock action,
-                                                                              SubscriptionEstablishedHandler establishedHandler) :
-        CHIPApplicationLauncherCatalogListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPLevelControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                               CHIPActionBlock action,
+                                                                               SubscriptionEstablishedHandler establishedHandler) :
+        CHIPLevelControlAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2342,28 +2325,25 @@ class CHIPApplicationLauncherCatalogListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPApplicationLauncherCurrentAppStructAttributeCallbackBridge
-    : public CHIPCallbackBridge<ApplicationLauncherCurrentAppStructAttributeCallback>
+class CHIPLevelControlAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<LevelControlAttributeListListAttributeCallback>
 {
 public:
-    CHIPApplicationLauncherCurrentAppStructAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                   CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ApplicationLauncherCurrentAppStructAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPLevelControlAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                             CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<LevelControlAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(
-        void * context,
-        const chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::DecodableType> &
-            value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPApplicationLauncherCurrentAppStructAttributeCallbackSubscriptionBridge
-    : public CHIPApplicationLauncherCurrentAppStructAttributeCallbackBridge
+class CHIPLevelControlAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPLevelControlAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPApplicationLauncherCurrentAppStructAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                               CHIPActionBlock action,
-                                                                               SubscriptionEstablishedHandler establishedHandler) :
-        CHIPApplicationLauncherCurrentAppStructAttributeCallbackBridge(queue, handler, action, true),
+    CHIPLevelControlAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                         CHIPActionBlock action,
+                                                                         SubscriptionEstablishedHandler establishedHandler) :
+        CHIPLevelControlAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2373,26 +2353,26 @@ class CHIPApplicationLauncherCurrentAppStructAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ApplicationLauncherGeneratedCommandListListAttributeCallback>
+class CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<BinaryInputBasicGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                           CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ApplicationLauncherGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                         keepAlive){};
+    CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                        CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<BinaryInputBasicGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                      keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackBridge
+class CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2402,26 +2382,26 @@ class CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackSubscripti
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ApplicationLauncherAcceptedCommandListListAttributeCallback>
+class CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<BinaryInputBasicAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ApplicationLauncherAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                        keepAlive){};
+    CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<BinaryInputBasicAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                     keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackBridge
+class CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2431,25 +2411,25 @@ class CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackSubscriptio
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPApplicationLauncherAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ApplicationLauncherAttributeListListAttributeCallback>
+class CHIPBinaryInputBasicAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<BinaryInputBasicAttributeListListAttributeCallback>
 {
 public:
-    CHIPApplicationLauncherAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                    CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ApplicationLauncherAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPBinaryInputBasicAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                 CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<BinaryInputBasicAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPApplicationLauncherAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPApplicationLauncherAttributeListListAttributeCallbackBridge
+class CHIPBinaryInputBasicAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPBinaryInputBasicAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPApplicationLauncherAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                CHIPActionBlock action,
-                                                                                SubscriptionEstablishedHandler establishedHandler) :
-        CHIPApplicationLauncherAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPBinaryInputBasicAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                             CHIPActionBlock action,
+                                                                             SubscriptionEstablishedHandler establishedHandler) :
+        CHIPBinaryInputBasicAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2459,25 +2439,25 @@ class CHIPApplicationLauncherAttributeListListAttributeCallbackSubscriptionBridg
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPAudioOutputOutputListListAttributeCallbackBridge : public CHIPCallbackBridge<AudioOutputOutputListListAttributeCallback>
+class CHIPDescriptorDeviceListListAttributeCallbackBridge : public CHIPCallbackBridge<DescriptorDeviceListListAttributeCallback>
 {
 public:
-    CHIPAudioOutputOutputListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                         bool keepAlive = false) :
-        CHIPCallbackBridge<AudioOutputOutputListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPDescriptorDeviceListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                        bool keepAlive = false) :
+        CHIPCallbackBridge<DescriptorDeviceListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(
         void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::OutputInfo::DecodableType> & value);
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::DeviceType::DecodableType> & value);
 };
 
-class CHIPAudioOutputOutputListListAttributeCallbackSubscriptionBridge : public CHIPAudioOutputOutputListListAttributeCallbackBridge
+class CHIPDescriptorDeviceListListAttributeCallbackSubscriptionBridge : public CHIPDescriptorDeviceListListAttributeCallbackBridge
 {
 public:
-    CHIPAudioOutputOutputListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                     CHIPActionBlock action,
-                                                                     SubscriptionEstablishedHandler establishedHandler) :
-        CHIPAudioOutputOutputListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPDescriptorDeviceListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                    CHIPActionBlock action,
+                                                                    SubscriptionEstablishedHandler establishedHandler) :
+        CHIPDescriptorDeviceListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2487,25 +2467,23 @@ class CHIPAudioOutputOutputListListAttributeCallbackSubscriptionBridge : public
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPAudioOutputGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<AudioOutputGeneratedCommandListListAttributeCallback>
+class CHIPDescriptorServerListListAttributeCallbackBridge : public CHIPCallbackBridge<DescriptorServerListListAttributeCallback>
 {
 public:
-    CHIPAudioOutputGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                   CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<AudioOutputGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPDescriptorServerListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                        bool keepAlive = false) :
+        CHIPCallbackBridge<DescriptorServerListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::ClusterId> & value);
 };
 
-class CHIPAudioOutputGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPAudioOutputGeneratedCommandListListAttributeCallbackBridge
+class CHIPDescriptorServerListListAttributeCallbackSubscriptionBridge : public CHIPDescriptorServerListListAttributeCallbackBridge
 {
 public:
-    CHIPAudioOutputGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                               CHIPActionBlock action,
-                                                                               SubscriptionEstablishedHandler establishedHandler) :
-        CHIPAudioOutputGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPDescriptorServerListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                    CHIPActionBlock action,
+                                                                    SubscriptionEstablishedHandler establishedHandler) :
+        CHIPDescriptorServerListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2515,25 +2493,23 @@ class CHIPAudioOutputGeneratedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPAudioOutputAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<AudioOutputAcceptedCommandListListAttributeCallback>
+class CHIPDescriptorClientListListAttributeCallbackBridge : public CHIPCallbackBridge<DescriptorClientListListAttributeCallback>
 {
 public:
-    CHIPAudioOutputAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                  CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<AudioOutputAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPDescriptorClientListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                        bool keepAlive = false) :
+        CHIPCallbackBridge<DescriptorClientListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::ClusterId> & value);
 };
 
-class CHIPAudioOutputAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPAudioOutputAcceptedCommandListListAttributeCallbackBridge
+class CHIPDescriptorClientListListAttributeCallbackSubscriptionBridge : public CHIPDescriptorClientListListAttributeCallbackBridge
 {
 public:
-    CHIPAudioOutputAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                              CHIPActionBlock action,
-                                                                              SubscriptionEstablishedHandler establishedHandler) :
-        CHIPAudioOutputAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPDescriptorClientListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                    CHIPActionBlock action,
+                                                                    SubscriptionEstablishedHandler establishedHandler) :
+        CHIPDescriptorClientListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2543,25 +2519,23 @@ class CHIPAudioOutputAcceptedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPAudioOutputAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<AudioOutputAttributeListListAttributeCallback>
+class CHIPDescriptorPartsListListAttributeCallbackBridge : public CHIPCallbackBridge<DescriptorPartsListListAttributeCallback>
 {
 public:
-    CHIPAudioOutputAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                            bool keepAlive = false) :
-        CHIPCallbackBridge<AudioOutputAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPDescriptorPartsListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                       bool keepAlive = false) :
+        CHIPCallbackBridge<DescriptorPartsListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::EndpointId> & value);
 };
 
-class CHIPAudioOutputAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPAudioOutputAttributeListListAttributeCallbackBridge
+class CHIPDescriptorPartsListListAttributeCallbackSubscriptionBridge : public CHIPDescriptorPartsListListAttributeCallbackBridge
 {
 public:
-    CHIPAudioOutputAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                        CHIPActionBlock action,
-                                                                        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPAudioOutputAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPDescriptorPartsListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                   CHIPActionBlock action,
+                                                                   SubscriptionEstablishedHandler establishedHandler) :
+        CHIPDescriptorPartsListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2571,26 +2545,25 @@ class CHIPAudioOutputAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPBarrierControlGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<BarrierControlGeneratedCommandListListAttributeCallback>
+class CHIPDescriptorGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<DescriptorGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPBarrierControlGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                      CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<BarrierControlGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                    keepAlive){};
+    CHIPDescriptorGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                  CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<DescriptorGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPBarrierControlGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPBarrierControlGeneratedCommandListListAttributeCallbackBridge
+class CHIPDescriptorGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPDescriptorGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPBarrierControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPBarrierControlGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPDescriptorGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                              CHIPActionBlock action,
+                                                                              SubscriptionEstablishedHandler establishedHandler) :
+        CHIPDescriptorGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2600,26 +2573,25 @@ class CHIPBarrierControlGeneratedCommandListListAttributeCallbackSubscriptionBri
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPBarrierControlAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<BarrierControlAcceptedCommandListListAttributeCallback>
+class CHIPDescriptorAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<DescriptorAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPBarrierControlAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                     CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<BarrierControlAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                   keepAlive){};
+    CHIPDescriptorAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                 CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<DescriptorAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPBarrierControlAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPBarrierControlAcceptedCommandListListAttributeCallbackBridge
+class CHIPDescriptorAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPDescriptorAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPBarrierControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPBarrierControlAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPDescriptorAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                             CHIPActionBlock action,
+                                                                             SubscriptionEstablishedHandler establishedHandler) :
+        CHIPDescriptorAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2629,25 +2601,25 @@ class CHIPBarrierControlAcceptedCommandListListAttributeCallbackSubscriptionBrid
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPBarrierControlAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<BarrierControlAttributeListListAttributeCallback>
+class CHIPDescriptorAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<DescriptorAttributeListListAttributeCallback>
 {
 public:
-    CHIPBarrierControlAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                               CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<BarrierControlAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPDescriptorAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                           bool keepAlive = false) :
+        CHIPCallbackBridge<DescriptorAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPBarrierControlAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPBarrierControlAttributeListListAttributeCallbackBridge
+class CHIPDescriptorAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPDescriptorAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPBarrierControlAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                           CHIPActionBlock action,
-                                                                           SubscriptionEstablishedHandler establishedHandler) :
-        CHIPBarrierControlAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPDescriptorAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       CHIPActionBlock action,
+                                                                       SubscriptionEstablishedHandler establishedHandler) :
+        CHIPDescriptorAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2657,26 +2629,25 @@ class CHIPBarrierControlAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPBasicCapabilityMinimaStructAttributeCallbackBridge
-    : public CHIPCallbackBridge<BasicCapabilityMinimaStructAttributeCallback>
+class CHIPBindingBindingListAttributeCallbackBridge : public CHIPCallbackBridge<BindingBindingListAttributeCallback>
 {
 public:
-    CHIPBasicCapabilityMinimaStructAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                           bool keepAlive = false) :
-        CHIPCallbackBridge<BasicCapabilityMinimaStructAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPBindingBindingListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                  bool keepAlive = false) :
+        CHIPCallbackBridge<BindingBindingListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::Basic::Structs::CapabilityMinimaStruct::DecodableType & value);
+    static void OnSuccessFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::Binding::Structs::TargetStruct::DecodableType> & value);
 };
 
-class CHIPBasicCapabilityMinimaStructAttributeCallbackSubscriptionBridge
-    : public CHIPBasicCapabilityMinimaStructAttributeCallbackBridge
+class CHIPBindingBindingListAttributeCallbackSubscriptionBridge : public CHIPBindingBindingListAttributeCallbackBridge
 {
 public:
-    CHIPBasicCapabilityMinimaStructAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       CHIPActionBlock action,
-                                                                       SubscriptionEstablishedHandler establishedHandler) :
-        CHIPBasicCapabilityMinimaStructAttributeCallbackBridge(queue, handler, action, true),
+    CHIPBindingBindingListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                              CHIPActionBlock action,
+                                                              SubscriptionEstablishedHandler establishedHandler) :
+        CHIPBindingBindingListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2686,25 +2657,25 @@ class CHIPBasicCapabilityMinimaStructAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPBasicGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<BasicGeneratedCommandListListAttributeCallback>
+class CHIPBindingGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<BindingGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPBasicGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                             CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<BasicGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPBindingGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                               CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<BindingGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPBasicGeneratedCommandListListAttributeCallbackBridge
+class CHIPBindingGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPBindingGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                         CHIPActionBlock action,
-                                                                         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPBasicGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPBindingGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                           CHIPActionBlock action,
+                                                                           SubscriptionEstablishedHandler establishedHandler) :
+        CHIPBindingGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2714,25 +2685,51 @@ class CHIPBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPBasicAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<BasicAcceptedCommandListListAttributeCallback>
+class CHIPBindingAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<BindingAcceptedCommandListListAttributeCallback>
+{
+public:
+    CHIPBindingAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                              CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<BindingAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+};
+
+class CHIPBindingAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPBindingAcceptedCommandListListAttributeCallbackBridge
+{
+public:
+    CHIPBindingAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                          CHIPActionBlock action,
+                                                                          SubscriptionEstablishedHandler establishedHandler) :
+        CHIPBindingAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        mEstablishedHandler(establishedHandler)
+    {}
+
+    static void OnSubscriptionEstablished(void * context);
+
+private:
+    SubscriptionEstablishedHandler mEstablishedHandler;
+};
+
+class CHIPBindingAttributeListListAttributeCallbackBridge : public CHIPCallbackBridge<BindingAttributeListListAttributeCallback>
 {
 public:
-    CHIPBasicAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                            bool keepAlive = false) :
-        CHIPCallbackBridge<BasicAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPBindingAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                        bool keepAlive = false) :
+        CHIPCallbackBridge<BindingAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPBasicAcceptedCommandListListAttributeCallbackBridge
+class CHIPBindingAttributeListListAttributeCallbackSubscriptionBridge : public CHIPBindingAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                        CHIPActionBlock action,
-                                                                        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPBasicAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPBindingAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                    CHIPActionBlock action,
+                                                                    SubscriptionEstablishedHandler establishedHandler) :
+        CHIPBindingAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2742,23 +2739,26 @@ class CHIPBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPBasicAttributeListListAttributeCallbackBridge : public CHIPCallbackBridge<BasicAttributeListListAttributeCallback>
+class CHIPAccessControlAclListAttributeCallbackBridge : public CHIPCallbackBridge<AccessControlAclListAttributeCallback>
 {
 public:
-    CHIPBasicAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                      bool keepAlive = false) :
-        CHIPCallbackBridge<BasicAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPAccessControlAclListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                    bool keepAlive = false) :
+        CHIPCallbackBridge<AccessControlAclListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::DecodableType> &
+            value);
 };
 
-class CHIPBasicAttributeListListAttributeCallbackSubscriptionBridge : public CHIPBasicAttributeListListAttributeCallbackBridge
+class CHIPAccessControlAclListAttributeCallbackSubscriptionBridge : public CHIPAccessControlAclListAttributeCallbackBridge
 {
 public:
-    CHIPBasicAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                  CHIPActionBlock action,
-                                                                  SubscriptionEstablishedHandler establishedHandler) :
-        CHIPBasicAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPAccessControlAclListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                CHIPActionBlock action,
+                                                                SubscriptionEstablishedHandler establishedHandler) :
+        CHIPAccessControlAclListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2768,26 +2768,27 @@ class CHIPBasicAttributeListListAttributeCallbackSubscriptionBridge : public CHI
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<BinaryInputBasicGeneratedCommandListListAttributeCallback>
+class CHIPAccessControlExtensionListAttributeCallbackBridge : public CHIPCallbackBridge<AccessControlExtensionListAttributeCallback>
 {
 public:
-    CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                        CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<BinaryInputBasicGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                      keepAlive){};
+    CHIPAccessControlExtensionListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                          bool keepAlive = false) :
+        CHIPCallbackBridge<AccessControlExtensionListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::ExtensionEntry::DecodableType> &
+            value);
 };
 
-class CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackBridge
+class CHIPAccessControlExtensionListAttributeCallbackSubscriptionBridge
+    : public CHIPAccessControlExtensionListAttributeCallbackBridge
 {
 public:
-    CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPAccessControlExtensionListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                      CHIPActionBlock action,
+                                                                      SubscriptionEstablishedHandler establishedHandler) :
+        CHIPAccessControlExtensionListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2797,26 +2798,26 @@ class CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackSubscriptionB
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<BinaryInputBasicAcceptedCommandListListAttributeCallback>
+class CHIPAccessControlGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<AccessControlGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<BinaryInputBasicAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                     keepAlive){};
+    CHIPAccessControlGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                     CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<AccessControlGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                   keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackBridge
+class CHIPAccessControlGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPAccessControlGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPAccessControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPAccessControlGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2826,25 +2827,25 @@ class CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackSubscriptionBr
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPBinaryInputBasicAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<BinaryInputBasicAttributeListListAttributeCallback>
+class CHIPAccessControlAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<AccessControlAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPBinaryInputBasicAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<BinaryInputBasicAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPAccessControlAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                    CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<AccessControlAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPBinaryInputBasicAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPBinaryInputBasicAttributeListListAttributeCallbackBridge
+class CHIPAccessControlAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPAccessControlAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPBinaryInputBasicAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             CHIPActionBlock action,
-                                                                             SubscriptionEstablishedHandler establishedHandler) :
-        CHIPBinaryInputBasicAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPAccessControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                CHIPActionBlock action,
+                                                                                SubscriptionEstablishedHandler establishedHandler) :
+        CHIPAccessControlAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2854,25 +2855,25 @@ class CHIPBinaryInputBasicAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPBindingBindingListAttributeCallbackBridge : public CHIPCallbackBridge<BindingBindingListAttributeCallback>
+class CHIPAccessControlAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<AccessControlAttributeListListAttributeCallback>
 {
 public:
-    CHIPBindingBindingListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                  bool keepAlive = false) :
-        CHIPCallbackBridge<BindingBindingListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPAccessControlAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                              CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<AccessControlAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::Binding::Structs::TargetStruct::DecodableType> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPBindingBindingListAttributeCallbackSubscriptionBridge : public CHIPBindingBindingListAttributeCallbackBridge
+class CHIPAccessControlAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPAccessControlAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPBindingBindingListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                              CHIPActionBlock action,
-                                                              SubscriptionEstablishedHandler establishedHandler) :
-        CHIPBindingBindingListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPAccessControlAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                          CHIPActionBlock action,
+                                                                          SubscriptionEstablishedHandler establishedHandler) :
+        CHIPAccessControlAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2882,25 +2883,28 @@ class CHIPBindingBindingListAttributeCallbackSubscriptionBridge : public CHIPBin
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPBindingGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<BindingGeneratedCommandListListAttributeCallback>
+class CHIPBridgedActionsActionListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<BridgedActionsActionListListAttributeCallback>
 {
 public:
-    CHIPBindingGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                               CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<BindingGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPBridgedActionsActionListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                            bool keepAlive = false) :
+        CHIPCallbackBridge<BridgedActionsActionListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::ActionStruct::DecodableType> &
+            value);
 };
 
-class CHIPBindingGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPBindingGeneratedCommandListListAttributeCallbackBridge
+class CHIPBridgedActionsActionListListAttributeCallbackSubscriptionBridge
+    : public CHIPBridgedActionsActionListListAttributeCallbackBridge
 {
 public:
-    CHIPBindingGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                           CHIPActionBlock action,
-                                                                           SubscriptionEstablishedHandler establishedHandler) :
-        CHIPBindingGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPBridgedActionsActionListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                        CHIPActionBlock action,
+                                                                        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPBridgedActionsActionListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2910,25 +2914,28 @@ class CHIPBindingGeneratedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPBindingAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<BindingAcceptedCommandListListAttributeCallback>
+class CHIPBridgedActionsEndpointListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<BridgedActionsEndpointListListAttributeCallback>
 {
 public:
-    CHIPBindingAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPBridgedActionsEndpointListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                               CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<BindingAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+        CHIPCallbackBridge<BridgedActionsEndpointListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::EndpointListStruct::DecodableType> &
+            value);
 };
 
-class CHIPBindingAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPBindingAcceptedCommandListListAttributeCallbackBridge
+class CHIPBridgedActionsEndpointListListAttributeCallbackSubscriptionBridge
+    : public CHIPBridgedActionsEndpointListListAttributeCallbackBridge
 {
 public:
-    CHIPBindingAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPBridgedActionsEndpointListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                           CHIPActionBlock action,
                                                                           SubscriptionEstablishedHandler establishedHandler) :
-        CHIPBindingAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPBridgedActionsEndpointListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2938,23 +2945,26 @@ class CHIPBindingAcceptedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPBindingAttributeListListAttributeCallbackBridge : public CHIPCallbackBridge<BindingAttributeListListAttributeCallback>
+class CHIPBridgedActionsGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<BridgedActionsGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPBindingAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                        bool keepAlive = false) :
-        CHIPCallbackBridge<BindingAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPBridgedActionsGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                      CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<BridgedActionsGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                    keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPBindingAttributeListListAttributeCallbackSubscriptionBridge : public CHIPBindingAttributeListListAttributeCallbackBridge
+class CHIPBridgedActionsGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPBridgedActionsGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPBindingAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                    CHIPActionBlock action,
-                                                                    SubscriptionEstablishedHandler establishedHandler) :
-        CHIPBindingAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPBridgedActionsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPBridgedActionsGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2964,25 +2974,26 @@ class CHIPBindingAttributeListListAttributeCallbackSubscriptionBridge : public C
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPBooleanStateGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<BooleanStateGeneratedCommandListListAttributeCallback>
+class CHIPBridgedActionsAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<BridgedActionsAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPBooleanStateGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                    CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<BooleanStateGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPBridgedActionsAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                     CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<BridgedActionsAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                   keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPBooleanStateGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPBooleanStateGeneratedCommandListListAttributeCallbackBridge
+class CHIPBridgedActionsAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPBridgedActionsAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPBooleanStateGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                CHIPActionBlock action,
-                                                                                SubscriptionEstablishedHandler establishedHandler) :
-        CHIPBooleanStateGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPBridgedActionsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPBridgedActionsAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -2992,25 +3003,25 @@ class CHIPBooleanStateGeneratedCommandListListAttributeCallbackSubscriptionBridg
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPBooleanStateAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<BooleanStateAcceptedCommandListListAttributeCallback>
+class CHIPBridgedActionsAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<BridgedActionsAttributeListListAttributeCallback>
 {
 public:
-    CHIPBooleanStateAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                   CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<BooleanStateAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPBridgedActionsAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                               CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<BridgedActionsAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPBooleanStateAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPBooleanStateAcceptedCommandListListAttributeCallbackBridge
+class CHIPBridgedActionsAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPBridgedActionsAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPBooleanStateAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                               CHIPActionBlock action,
-                                                                               SubscriptionEstablishedHandler establishedHandler) :
-        CHIPBooleanStateAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPBridgedActionsAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                           CHIPActionBlock action,
+                                                                           SubscriptionEstablishedHandler establishedHandler) :
+        CHIPBridgedActionsAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3020,25 +3031,26 @@ class CHIPBooleanStateAcceptedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPBooleanStateAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<BooleanStateAttributeListListAttributeCallback>
+class CHIPBasicCapabilityMinimaStructAttributeCallbackBridge
+    : public CHIPCallbackBridge<BasicCapabilityMinimaStructAttributeCallback>
 {
 public:
-    CHIPBooleanStateAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                             CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<BooleanStateAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPBasicCapabilityMinimaStructAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                           bool keepAlive = false) :
+        CHIPCallbackBridge<BasicCapabilityMinimaStructAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context,
+                            const chip::app::Clusters::Basic::Structs::CapabilityMinimaStruct::DecodableType & value);
 };
 
-class CHIPBooleanStateAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPBooleanStateAttributeListListAttributeCallbackBridge
+class CHIPBasicCapabilityMinimaStructAttributeCallbackSubscriptionBridge
+    : public CHIPBasicCapabilityMinimaStructAttributeCallbackBridge
 {
 public:
-    CHIPBooleanStateAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                         CHIPActionBlock action,
-                                                                         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPBooleanStateAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPBasicCapabilityMinimaStructAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       CHIPActionBlock action,
+                                                                       SubscriptionEstablishedHandler establishedHandler) :
+        CHIPBasicCapabilityMinimaStructAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3048,28 +3060,25 @@ class CHIPBooleanStateAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPBridgedActionsActionListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<BridgedActionsActionListListAttributeCallback>
+class CHIPBasicGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<BasicGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPBridgedActionsActionListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                            bool keepAlive = false) :
-        CHIPCallbackBridge<BridgedActionsActionListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPBasicGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                             CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<BasicGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::ActionStruct::DecodableType> &
-            value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPBridgedActionsActionListListAttributeCallbackSubscriptionBridge
-    : public CHIPBridgedActionsActionListListAttributeCallbackBridge
+class CHIPBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPBasicGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPBridgedActionsActionListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                        CHIPActionBlock action,
-                                                                        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPBridgedActionsActionListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                         CHIPActionBlock action,
+                                                                         SubscriptionEstablishedHandler establishedHandler) :
+        CHIPBasicGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3079,28 +3088,25 @@ class CHIPBridgedActionsActionListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPBridgedActionsEndpointListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<BridgedActionsEndpointListListAttributeCallback>
+class CHIPBasicAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<BasicAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPBridgedActionsEndpointListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                              CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<BridgedActionsEndpointListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPBasicAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                            bool keepAlive = false) :
+        CHIPCallbackBridge<BasicAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::EndpointListStruct::DecodableType> &
-            value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPBridgedActionsEndpointListListAttributeCallbackSubscriptionBridge
-    : public CHIPBridgedActionsEndpointListListAttributeCallbackBridge
+class CHIPBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPBasicAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPBridgedActionsEndpointListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          CHIPActionBlock action,
-                                                                          SubscriptionEstablishedHandler establishedHandler) :
-        CHIPBridgedActionsEndpointListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                        CHIPActionBlock action,
+                                                                        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPBasicAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3110,26 +3116,23 @@ class CHIPBridgedActionsEndpointListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPBridgedActionsGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<BridgedActionsGeneratedCommandListListAttributeCallback>
+class CHIPBasicAttributeListListAttributeCallbackBridge : public CHIPCallbackBridge<BasicAttributeListListAttributeCallback>
 {
 public:
-    CHIPBridgedActionsGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                      CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<BridgedActionsGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                    keepAlive){};
+    CHIPBasicAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                      bool keepAlive = false) :
+        CHIPCallbackBridge<BasicAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPBridgedActionsGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPBridgedActionsGeneratedCommandListListAttributeCallbackBridge
+class CHIPBasicAttributeListListAttributeCallbackSubscriptionBridge : public CHIPBasicAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPBridgedActionsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPBridgedActionsGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPBasicAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                  CHIPActionBlock action,
+                                                                  SubscriptionEstablishedHandler establishedHandler) :
+        CHIPBasicAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3139,26 +3142,26 @@ class CHIPBridgedActionsGeneratedCommandListListAttributeCallbackSubscriptionBri
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPBridgedActionsAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<BridgedActionsAcceptedCommandListListAttributeCallback>
+class CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<OtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPBridgedActionsAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                     CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<BridgedActionsAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                   keepAlive){};
+    CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                 CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<OtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                               keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPBridgedActionsAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPBridgedActionsAcceptedCommandListListAttributeCallbackBridge
+class CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPBridgedActionsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPBridgedActionsAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3168,25 +3171,26 @@ class CHIPBridgedActionsAcceptedCommandListListAttributeCallbackSubscriptionBrid
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPBridgedActionsAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<BridgedActionsAttributeListListAttributeCallback>
+class CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<OtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPBridgedActionsAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                               CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<BridgedActionsAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<OtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                              keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPBridgedActionsAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPBridgedActionsAttributeListListAttributeCallbackBridge
+class CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPBridgedActionsAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                           CHIPActionBlock action,
-                                                                           SubscriptionEstablishedHandler establishedHandler) :
-        CHIPBridgedActionsAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3196,26 +3200,26 @@ class CHIPBridgedActionsAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<BridgedDeviceBasicGeneratedCommandListListAttributeCallback>
+class CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<OtaSoftwareUpdateProviderAttributeListListAttributeCallback>
 {
 public:
-    CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                           CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<BridgedDeviceBasicGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+        CHIPCallbackBridge<OtaSoftwareUpdateProviderAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
                                                                                         keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackBridge
+class CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3225,26 +3229,28 @@ class CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackSubscriptio
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<BridgedDeviceBasicAcceptedCommandListListAttributeCallback>
+class CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackBridge
+    : public CHIPCallbackBridge<OtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallback>
 {
 public:
-    CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                         CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<BridgedDeviceBasicAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                       keepAlive){};
+    CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                 CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<OtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                               keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context,
+                            const chip::app::DataModel::DecodableList<
+                                chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType> & value);
 };
 
-class CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackBridge
+class CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackSubscriptionBridge
+    : public CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackBridge
 {
 public:
-    CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3254,25 +3260,26 @@ class CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackSubscription
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPBridgedDeviceBasicAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<BridgedDeviceBasicAttributeListListAttributeCallback>
+class CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<OtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPBridgedDeviceBasicAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                   CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<BridgedDeviceBasicAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                  CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<OtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                                keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPBridgedDeviceBasicAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPBridgedDeviceBasicAttributeListListAttributeCallbackBridge
+class CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPBridgedDeviceBasicAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                               CHIPActionBlock action,
-                                                                               SubscriptionEstablishedHandler establishedHandler) :
-        CHIPBridgedDeviceBasicAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3282,25 +3289,26 @@ class CHIPBridgedDeviceBasicAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPChannelChannelListListAttributeCallbackBridge : public CHIPCallbackBridge<ChannelChannelListListAttributeCallback>
+class CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<OtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPChannelChannelListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                      bool keepAlive = false) :
-        CHIPCallbackBridge<ChannelChannelListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                 CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<OtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                               keepAlive){};
 
-    static void OnSuccessFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPChannelChannelListListAttributeCallbackSubscriptionBridge : public CHIPChannelChannelListListAttributeCallbackBridge
+class CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPChannelChannelListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                  CHIPActionBlock action,
-                                                                  SubscriptionEstablishedHandler establishedHandler) :
-        CHIPChannelChannelListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3310,25 +3318,26 @@ class CHIPChannelChannelListListAttributeCallbackSubscriptionBridge : public CHI
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPChannelLineupStructAttributeCallbackBridge : public CHIPCallbackBridge<ChannelLineupStructAttributeCallback>
+class CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<OtaSoftwareUpdateRequestorAttributeListListAttributeCallback>
 {
 public:
-    CHIPChannelLineupStructAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                   bool keepAlive = false) :
-        CHIPCallbackBridge<ChannelLineupStructAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                           CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<OtaSoftwareUpdateRequestorAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                         keepAlive){};
 
-    static void
-    OnSuccessFn(void * context,
-                const chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::LineupInfo::DecodableType> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPChannelLineupStructAttributeCallbackSubscriptionBridge : public CHIPChannelLineupStructAttributeCallbackBridge
+class CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPChannelLineupStructAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                               CHIPActionBlock action,
-                                                               SubscriptionEstablishedHandler establishedHandler) :
-        CHIPChannelLineupStructAttributeCallbackBridge(queue, handler, action, true),
+    CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3338,27 +3347,26 @@ class CHIPChannelLineupStructAttributeCallbackSubscriptionBridge : public CHIPCh
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPChannelCurrentChannelStructAttributeCallbackBridge
-    : public CHIPCallbackBridge<ChannelCurrentChannelStructAttributeCallback>
+class CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackBridge
+    : public CHIPCallbackBridge<LocalizationConfigurationSupportedLocalesListAttributeCallback>
 {
 public:
-    CHIPChannelCurrentChannelStructAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                           bool keepAlive = false) :
-        CHIPCallbackBridge<ChannelCurrentChannelStructAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                             CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<LocalizationConfigurationSupportedLocalesListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                           keepAlive){};
 
-    static void
-    OnSuccessFn(void * context,
-                const chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CharSpan> & value);
 };
 
-class CHIPChannelCurrentChannelStructAttributeCallbackSubscriptionBridge
-    : public CHIPChannelCurrentChannelStructAttributeCallbackBridge
+class CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackSubscriptionBridge
+    : public CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackBridge
 {
 public:
-    CHIPChannelCurrentChannelStructAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       CHIPActionBlock action,
-                                                                       SubscriptionEstablishedHandler establishedHandler) :
-        CHIPChannelCurrentChannelStructAttributeCallbackBridge(queue, handler, action, true),
+    CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3368,25 +3376,26 @@ class CHIPChannelCurrentChannelStructAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPChannelGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ChannelGeneratedCommandListListAttributeCallback>
+class CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<LocalizationConfigurationGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPChannelGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                               CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ChannelGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                 CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<LocalizationConfigurationGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                               keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPChannelGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPChannelGeneratedCommandListListAttributeCallbackBridge
+class CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPChannelGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                           CHIPActionBlock action,
-                                                                           SubscriptionEstablishedHandler establishedHandler) :
-        CHIPChannelGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3396,25 +3405,26 @@ class CHIPChannelGeneratedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPChannelAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ChannelAcceptedCommandListListAttributeCallback>
+class CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<LocalizationConfigurationAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPChannelAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                              CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ChannelAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<LocalizationConfigurationAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                              keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPChannelAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPChannelAcceptedCommandListListAttributeCallbackBridge
+class CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPChannelAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          CHIPActionBlock action,
-                                                                          SubscriptionEstablishedHandler establishedHandler) :
-        CHIPChannelAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3424,23 +3434,26 @@ class CHIPChannelAcceptedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPChannelAttributeListListAttributeCallbackBridge : public CHIPCallbackBridge<ChannelAttributeListListAttributeCallback>
+class CHIPLocalizationConfigurationAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<LocalizationConfigurationAttributeListListAttributeCallback>
 {
 public:
-    CHIPChannelAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                        bool keepAlive = false) :
-        CHIPCallbackBridge<ChannelAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPLocalizationConfigurationAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                          CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<LocalizationConfigurationAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                        keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPChannelAttributeListListAttributeCallbackSubscriptionBridge : public CHIPChannelAttributeListListAttributeCallbackBridge
+class CHIPLocalizationConfigurationAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPLocalizationConfigurationAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPChannelAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                    CHIPActionBlock action,
-                                                                    SubscriptionEstablishedHandler establishedHandler) :
-        CHIPChannelAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPLocalizationConfigurationAttributeListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPLocalizationConfigurationAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3450,25 +3463,28 @@ class CHIPChannelAttributeListListAttributeCallbackSubscriptionBridge : public C
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPColorControlGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ColorControlGeneratedCommandListListAttributeCallback>
+class CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackBridge
+    : public CHIPCallbackBridge<TimeFormatLocalizationSupportedCalendarTypesListAttributeCallback>
 {
 public:
-    CHIPColorControlGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                    CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ColorControlGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<TimeFormatLocalizationSupportedCalendarTypesListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                              keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void
+    OnSuccessFn(void * context,
+                const chip::app::DataModel::DecodableList<chip::app::Clusters::TimeFormatLocalization::CalendarType> & value);
 };
 
-class CHIPColorControlGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPColorControlGeneratedCommandListListAttributeCallbackBridge
+class CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackSubscriptionBridge
+    : public CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackBridge
 {
 public:
-    CHIPColorControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                CHIPActionBlock action,
-                                                                                SubscriptionEstablishedHandler establishedHandler) :
-        CHIPColorControlGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3478,25 +3494,26 @@ class CHIPColorControlGeneratedCommandListListAttributeCallbackSubscriptionBridg
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPColorControlAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ColorControlAcceptedCommandListListAttributeCallback>
+class CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<TimeFormatLocalizationGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPColorControlAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                   CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ColorControlAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                              CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<TimeFormatLocalizationGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                            keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPColorControlAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPColorControlAcceptedCommandListListAttributeCallbackBridge
+class CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPColorControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                               CHIPActionBlock action,
-                                                                               SubscriptionEstablishedHandler establishedHandler) :
-        CHIPColorControlAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3506,25 +3523,26 @@ class CHIPColorControlAcceptedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPColorControlAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ColorControlAttributeListListAttributeCallback>
+class CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<TimeFormatLocalizationAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPColorControlAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                             CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ColorControlAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                             CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<TimeFormatLocalizationAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                           keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPColorControlAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPColorControlAttributeListListAttributeCallbackBridge
+class CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPColorControlAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                         CHIPActionBlock action,
-                                                                         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPColorControlAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3534,25 +3552,26 @@ class CHIPColorControlAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPContentLauncherAcceptHeaderListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ContentLauncherAcceptHeaderListAttributeCallback>
+class CHIPTimeFormatLocalizationAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<TimeFormatLocalizationAttributeListListAttributeCallback>
 {
 public:
-    CHIPContentLauncherAcceptHeaderListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                               CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ContentLauncherAcceptHeaderListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPTimeFormatLocalizationAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<TimeFormatLocalizationAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                     keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CharSpan> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPContentLauncherAcceptHeaderListAttributeCallbackSubscriptionBridge
-    : public CHIPContentLauncherAcceptHeaderListAttributeCallbackBridge
+class CHIPTimeFormatLocalizationAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPTimeFormatLocalizationAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPContentLauncherAcceptHeaderListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                           CHIPActionBlock action,
-                                                                           SubscriptionEstablishedHandler establishedHandler) :
-        CHIPContentLauncherAcceptHeaderListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPTimeFormatLocalizationAttributeListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPTimeFormatLocalizationAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3562,26 +3581,26 @@ class CHIPContentLauncherAcceptHeaderListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPContentLauncherGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ContentLauncherGeneratedCommandListListAttributeCallback>
+class CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<UnitLocalizationGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPContentLauncherGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ContentLauncherGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                     keepAlive){};
+    CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                        CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<UnitLocalizationGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                      keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPContentLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPContentLauncherGeneratedCommandListListAttributeCallbackBridge
+class CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPContentLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPContentLauncherGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3591,26 +3610,26 @@ class CHIPContentLauncherGeneratedCommandListListAttributeCallbackSubscriptionBr
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPContentLauncherAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ContentLauncherAcceptedCommandListListAttributeCallback>
+class CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<UnitLocalizationAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPContentLauncherAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                      CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ContentLauncherAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                    keepAlive){};
+    CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<UnitLocalizationAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                     keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPContentLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPContentLauncherAcceptedCommandListListAttributeCallbackBridge
+class CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPContentLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPContentLauncherAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3620,25 +3639,25 @@ class CHIPContentLauncherAcceptedCommandListListAttributeCallbackSubscriptionBri
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPContentLauncherAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ContentLauncherAttributeListListAttributeCallback>
+class CHIPUnitLocalizationAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<UnitLocalizationAttributeListListAttributeCallback>
 {
 public:
-    CHIPContentLauncherAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ContentLauncherAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPUnitLocalizationAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                 CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<UnitLocalizationAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
-
-class CHIPContentLauncherAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPContentLauncherAttributeListListAttributeCallbackBridge
+
+class CHIPUnitLocalizationAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPUnitLocalizationAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPContentLauncherAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                            CHIPActionBlock action,
-                                                                            SubscriptionEstablishedHandler establishedHandler) :
-        CHIPContentLauncherAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPUnitLocalizationAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                             CHIPActionBlock action,
+                                                                             SubscriptionEstablishedHandler establishedHandler) :
+        CHIPUnitLocalizationAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3648,25 +3667,25 @@ class CHIPContentLauncherAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPDescriptorDeviceListListAttributeCallbackBridge : public CHIPCallbackBridge<DescriptorDeviceListListAttributeCallback>
+class CHIPPowerSourceConfigurationSourcesListAttributeCallbackBridge
+    : public CHIPCallbackBridge<PowerSourceConfigurationSourcesListAttributeCallback>
 {
 public:
-    CHIPDescriptorDeviceListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                        bool keepAlive = false) :
-        CHIPCallbackBridge<DescriptorDeviceListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPPowerSourceConfigurationSourcesListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                   CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<PowerSourceConfigurationSourcesListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::DeviceType::DecodableType> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & value);
 };
 
-class CHIPDescriptorDeviceListListAttributeCallbackSubscriptionBridge : public CHIPDescriptorDeviceListListAttributeCallbackBridge
+class CHIPPowerSourceConfigurationSourcesListAttributeCallbackSubscriptionBridge
+    : public CHIPPowerSourceConfigurationSourcesListAttributeCallbackBridge
 {
 public:
-    CHIPDescriptorDeviceListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                    CHIPActionBlock action,
-                                                                    SubscriptionEstablishedHandler establishedHandler) :
-        CHIPDescriptorDeviceListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPPowerSourceConfigurationSourcesListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                               CHIPActionBlock action,
+                                                                               SubscriptionEstablishedHandler establishedHandler) :
+        CHIPPowerSourceConfigurationSourcesListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3676,23 +3695,26 @@ class CHIPDescriptorDeviceListListAttributeCallbackSubscriptionBridge : public C
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPDescriptorServerListListAttributeCallbackBridge : public CHIPCallbackBridge<DescriptorServerListListAttributeCallback>
+class CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<PowerSourceConfigurationGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPDescriptorServerListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                        bool keepAlive = false) :
-        CHIPCallbackBridge<DescriptorServerListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<PowerSourceConfigurationGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                              keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::ClusterId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPDescriptorServerListListAttributeCallbackSubscriptionBridge : public CHIPDescriptorServerListListAttributeCallbackBridge
+class CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPDescriptorServerListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                    CHIPActionBlock action,
-                                                                    SubscriptionEstablishedHandler establishedHandler) :
-        CHIPDescriptorServerListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3702,23 +3724,26 @@ class CHIPDescriptorServerListListAttributeCallbackSubscriptionBridge : public C
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPDescriptorClientListListAttributeCallbackBridge : public CHIPCallbackBridge<DescriptorClientListListAttributeCallback>
+class CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<PowerSourceConfigurationAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPDescriptorClientListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                        bool keepAlive = false) :
-        CHIPCallbackBridge<DescriptorClientListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                               CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<PowerSourceConfigurationAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                             keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::ClusterId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPDescriptorClientListListAttributeCallbackSubscriptionBridge : public CHIPDescriptorClientListListAttributeCallbackBridge
+class CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPDescriptorClientListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                    CHIPActionBlock action,
-                                                                    SubscriptionEstablishedHandler establishedHandler) :
-        CHIPDescriptorClientListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3728,23 +3753,26 @@ class CHIPDescriptorClientListListAttributeCallbackSubscriptionBridge : public C
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPDescriptorPartsListListAttributeCallbackBridge : public CHIPCallbackBridge<DescriptorPartsListListAttributeCallback>
+class CHIPPowerSourceConfigurationAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<PowerSourceConfigurationAttributeListListAttributeCallback>
 {
 public:
-    CHIPDescriptorPartsListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                       bool keepAlive = false) :
-        CHIPCallbackBridge<DescriptorPartsListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPPowerSourceConfigurationAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                         CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<PowerSourceConfigurationAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                       keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::EndpointId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPDescriptorPartsListListAttributeCallbackSubscriptionBridge : public CHIPDescriptorPartsListListAttributeCallbackBridge
+class CHIPPowerSourceConfigurationAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPPowerSourceConfigurationAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPDescriptorPartsListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                   CHIPActionBlock action,
-                                                                   SubscriptionEstablishedHandler establishedHandler) :
-        CHIPDescriptorPartsListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPPowerSourceConfigurationAttributeListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPPowerSourceConfigurationAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3754,25 +3782,25 @@ class CHIPDescriptorPartsListListAttributeCallbackSubscriptionBridge : public CH
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPDescriptorGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<DescriptorGeneratedCommandListListAttributeCallback>
+class CHIPPowerSourceActiveWiredFaultsListAttributeCallbackBridge
+    : public CHIPCallbackBridge<PowerSourceActiveWiredFaultsListAttributeCallback>
 {
 public:
-    CHIPDescriptorGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                  CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<DescriptorGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPPowerSourceActiveWiredFaultsListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<PowerSourceActiveWiredFaultsListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & value);
 };
 
-class CHIPDescriptorGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPDescriptorGeneratedCommandListListAttributeCallbackBridge
+class CHIPPowerSourceActiveWiredFaultsListAttributeCallbackSubscriptionBridge
+    : public CHIPPowerSourceActiveWiredFaultsListAttributeCallbackBridge
 {
 public:
-    CHIPDescriptorGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                              CHIPActionBlock action,
-                                                                              SubscriptionEstablishedHandler establishedHandler) :
-        CHIPDescriptorGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPPowerSourceActiveWiredFaultsListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                            CHIPActionBlock action,
+                                                                            SubscriptionEstablishedHandler establishedHandler) :
+        CHIPPowerSourceActiveWiredFaultsListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3782,25 +3810,25 @@ class CHIPDescriptorGeneratedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPDescriptorAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<DescriptorAcceptedCommandListListAttributeCallback>
+class CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackBridge
+    : public CHIPCallbackBridge<PowerSourceActiveBatteryFaultsListAttributeCallback>
 {
 public:
-    CHIPDescriptorAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<DescriptorAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                  CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<PowerSourceActiveBatteryFaultsListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & value);
 };
 
-class CHIPDescriptorAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPDescriptorAcceptedCommandListListAttributeCallbackBridge
+class CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackSubscriptionBridge
+    : public CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackBridge
 {
 public:
-    CHIPDescriptorAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             CHIPActionBlock action,
-                                                                             SubscriptionEstablishedHandler establishedHandler) :
-        CHIPDescriptorAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                              CHIPActionBlock action,
+                                                                              SubscriptionEstablishedHandler establishedHandler) :
+        CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3810,25 +3838,26 @@ class CHIPDescriptorAcceptedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPDescriptorAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<DescriptorAttributeListListAttributeCallback>
+class CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackBridge
+    : public CHIPCallbackBridge<PowerSourceActiveBatteryChargeFaultsListAttributeCallback>
 {
 public:
-    CHIPDescriptorAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                           bool keepAlive = false) :
-        CHIPCallbackBridge<DescriptorAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                        CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<PowerSourceActiveBatteryChargeFaultsListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                      keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & value);
 };
 
-class CHIPDescriptorAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPDescriptorAttributeListListAttributeCallbackBridge
+class CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackSubscriptionBridge
+    : public CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackBridge
 {
 public:
-    CHIPDescriptorAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       CHIPActionBlock action,
-                                                                       SubscriptionEstablishedHandler establishedHandler) :
-        CHIPDescriptorAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3838,26 +3867,25 @@ class CHIPDescriptorAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<DiagnosticLogsGeneratedCommandListListAttributeCallback>
+class CHIPPowerSourceGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<PowerSourceGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                      CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<DiagnosticLogsGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                    keepAlive){};
+    CHIPPowerSourceGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                   CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<PowerSourceGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackBridge
+class CHIPPowerSourceGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPPowerSourceGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPPowerSourceGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                               CHIPActionBlock action,
+                                                                               SubscriptionEstablishedHandler establishedHandler) :
+        CHIPPowerSourceGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3867,26 +3895,25 @@ class CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackSubscriptionBri
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<DiagnosticLogsAcceptedCommandListListAttributeCallback>
+class CHIPPowerSourceAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<PowerSourceAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                     CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<DiagnosticLogsAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                   keepAlive){};
+    CHIPPowerSourceAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                  CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<PowerSourceAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackBridge
+class CHIPPowerSourceAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPPowerSourceAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPPowerSourceAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                              CHIPActionBlock action,
+                                                                              SubscriptionEstablishedHandler establishedHandler) :
+        CHIPPowerSourceAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3896,25 +3923,25 @@ class CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackSubscriptionBrid
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPDiagnosticLogsAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<DiagnosticLogsAttributeListListAttributeCallback>
+class CHIPPowerSourceAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<PowerSourceAttributeListListAttributeCallback>
 {
 public:
-    CHIPDiagnosticLogsAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                               CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<DiagnosticLogsAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPPowerSourceAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                            bool keepAlive = false) :
+        CHIPCallbackBridge<PowerSourceAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPDiagnosticLogsAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPDiagnosticLogsAttributeListListAttributeCallbackBridge
+class CHIPPowerSourceAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPPowerSourceAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPDiagnosticLogsAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                           CHIPActionBlock action,
-                                                                           SubscriptionEstablishedHandler establishedHandler) :
-        CHIPDiagnosticLogsAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPPowerSourceAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                        CHIPActionBlock action,
+                                                                        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPPowerSourceAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3924,25 +3951,28 @@ class CHIPDiagnosticLogsAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPDoorLockCredentialRulesSupportAttributeCallbackBridge
-    : public CHIPCallbackBridge<DoorLockCredentialRulesSupportAttributeCallback>
+class CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackBridge
+    : public CHIPCallbackBridge<GeneralCommissioningBasicCommissioningInfoStructAttributeCallback>
 {
 public:
-    CHIPDoorLockCredentialRulesSupportAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                              CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<DoorLockCredentialRulesSupportAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<GeneralCommissioningBasicCommissioningInfoStructAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                              keepAlive){};
 
-    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask> value);
+    static void
+    OnSuccessFn(void * context,
+                const chip::app::Clusters::GeneralCommissioning::Structs::BasicCommissioningInfo::DecodableType & value);
 };
 
-class CHIPDoorLockCredentialRulesSupportAttributeCallbackSubscriptionBridge
-    : public CHIPDoorLockCredentialRulesSupportAttributeCallbackBridge
+class CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackSubscriptionBridge
+    : public CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackBridge
 {
 public:
-    CHIPDoorLockCredentialRulesSupportAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          CHIPActionBlock action,
-                                                                          SubscriptionEstablishedHandler establishedHandler) :
-        CHIPDoorLockCredentialRulesSupportAttributeCallbackBridge(queue, handler, action, true),
+    CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3952,25 +3982,26 @@ class CHIPDoorLockCredentialRulesSupportAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPDoorLockSupportedOperatingModesAttributeCallbackBridge
-    : public CHIPCallbackBridge<DoorLockSupportedOperatingModesAttributeCallback>
+class CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<GeneralCommissioningGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPDoorLockSupportedOperatingModesAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                               CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<DoorLockSupportedOperatingModesAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                            CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<GeneralCommissioningGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                          keepAlive){};
 
-    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes> value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPDoorLockSupportedOperatingModesAttributeCallbackSubscriptionBridge
-    : public CHIPDoorLockSupportedOperatingModesAttributeCallbackBridge
+class CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPDoorLockSupportedOperatingModesAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                           CHIPActionBlock action,
-                                                                           SubscriptionEstablishedHandler establishedHandler) :
-        CHIPDoorLockSupportedOperatingModesAttributeCallbackBridge(queue, handler, action, true),
+    CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -3980,25 +4011,26 @@ class CHIPDoorLockSupportedOperatingModesAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackBridge
-    : public CHIPCallbackBridge<DoorLockDefaultConfigurationRegisterAttributeCallback>
+class CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<GeneralCommissioningAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                    CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<DoorLockDefaultConfigurationRegisterAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                           CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<GeneralCommissioningAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                         keepAlive){};
 
-    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister> value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackSubscriptionBridge
-    : public CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackBridge
+class CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                CHIPActionBlock action,
-                                                                                SubscriptionEstablishedHandler establishedHandler) :
-        CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackBridge(queue, handler, action, true),
+    CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4008,25 +4040,26 @@ class CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackSubscriptionBridg
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackBridge
-    : public CHIPCallbackBridge<DoorLockLocalProgrammingFeaturesAttributeCallback>
+class CHIPGeneralCommissioningAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<GeneralCommissioningAttributeListListAttributeCallback>
 {
 public:
-    CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<DoorLockLocalProgrammingFeaturesAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPGeneralCommissioningAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                     CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<GeneralCommissioningAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                   keepAlive){};
 
-    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackSubscriptionBridge
-    : public CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackBridge
+class CHIPGeneralCommissioningAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPGeneralCommissioningAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                            CHIPActionBlock action,
-                                                                            SubscriptionEstablishedHandler establishedHandler) :
-        CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackBridge(queue, handler, action, true),
+    CHIPGeneralCommissioningAttributeListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPGeneralCommissioningAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4036,25 +4069,28 @@ class CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPDoorLockGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<DoorLockGeneratedCommandListListAttributeCallback>
+class CHIPNetworkCommissioningNetworksListAttributeCallbackBridge
+    : public CHIPCallbackBridge<NetworkCommissioningNetworksListAttributeCallback>
 {
 public:
-    CHIPDoorLockGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPNetworkCommissioningNetworksListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<DoorLockGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+        CHIPCallbackBridge<NetworkCommissioningNetworksListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::DecodableType> &
+            value);
 };
 
-class CHIPDoorLockGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPDoorLockGeneratedCommandListListAttributeCallbackBridge
+class CHIPNetworkCommissioningNetworksListAttributeCallbackSubscriptionBridge
+    : public CHIPNetworkCommissioningNetworksListAttributeCallbackBridge
 {
 public:
-    CHIPDoorLockGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPNetworkCommissioningNetworksListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                             CHIPActionBlock action,
                                                                             SubscriptionEstablishedHandler establishedHandler) :
-        CHIPDoorLockGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPNetworkCommissioningNetworksListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4064,25 +4100,26 @@ class CHIPDoorLockGeneratedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPDoorLockAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<DoorLockAcceptedCommandListListAttributeCallback>
+class CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<NetworkCommissioningGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPDoorLockAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                               CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<DoorLockAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                            CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<NetworkCommissioningGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                          keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPDoorLockAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPDoorLockAcceptedCommandListListAttributeCallbackBridge
+class CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPDoorLockAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                           CHIPActionBlock action,
-                                                                           SubscriptionEstablishedHandler establishedHandler) :
-        CHIPDoorLockAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4092,23 +4129,26 @@ class CHIPDoorLockAcceptedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPDoorLockAttributeListListAttributeCallbackBridge : public CHIPCallbackBridge<DoorLockAttributeListListAttributeCallback>
+class CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<NetworkCommissioningAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPDoorLockAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                         bool keepAlive = false) :
-        CHIPCallbackBridge<DoorLockAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                           CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<NetworkCommissioningAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                         keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPDoorLockAttributeListListAttributeCallbackSubscriptionBridge : public CHIPDoorLockAttributeListListAttributeCallbackBridge
+class CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPDoorLockAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                     CHIPActionBlock action,
-                                                                     SubscriptionEstablishedHandler establishedHandler) :
-        CHIPDoorLockAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4118,26 +4158,26 @@ class CHIPDoorLockAttributeListListAttributeCallbackSubscriptionBridge : public
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ElectricalMeasurementGeneratedCommandListListAttributeCallback>
+class CHIPNetworkCommissioningAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<NetworkCommissioningAttributeListListAttributeCallback>
 {
 public:
-    CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ElectricalMeasurementGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                           keepAlive){};
+    CHIPNetworkCommissioningAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                     CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<NetworkCommissioningAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                   keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackBridge
+class CHIPNetworkCommissioningAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPNetworkCommissioningAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPNetworkCommissioningAttributeListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPNetworkCommissioningAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4147,26 +4187,26 @@ class CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackSubscrip
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ElectricalMeasurementAcceptedCommandListListAttributeCallback>
+class CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<DiagnosticLogsGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                            CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ElectricalMeasurementAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                          keepAlive){};
+    CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                      CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<DiagnosticLogsGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                    keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackBridge
+class CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4176,26 +4216,26 @@ class CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackSubscript
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPElectricalMeasurementAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ElectricalMeasurementAttributeListListAttributeCallback>
+class CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<DiagnosticLogsAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPElectricalMeasurementAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                      CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ElectricalMeasurementAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                    keepAlive){};
+    CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                     CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<DiagnosticLogsAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                   keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPElectricalMeasurementAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPElectricalMeasurementAttributeListListAttributeCallbackBridge
+class CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPElectricalMeasurementAttributeListListAttributeCallbackSubscriptionBridge(
+    CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPElectricalMeasurementAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4205,26 +4245,25 @@ class CHIPElectricalMeasurementAttributeListListAttributeCallbackSubscriptionBri
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<EthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallback>
+class CHIPDiagnosticLogsAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<DiagnosticLogsAttributeListListAttributeCallback>
 {
 public:
-    CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                  CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<EthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                                keepAlive){};
+    CHIPDiagnosticLogsAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                               CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<DiagnosticLogsAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge
+class CHIPDiagnosticLogsAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPDiagnosticLogsAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPDiagnosticLogsAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                           CHIPActionBlock action,
+                                                                           SubscriptionEstablishedHandler establishedHandler) :
+        CHIPDiagnosticLogsAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4234,26 +4273,28 @@ class CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSub
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<EthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallback>
+class CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackBridge
+    : public CHIPCallbackBridge<GeneralDiagnosticsNetworkInterfacesListAttributeCallback>
 {
 public:
-    CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<EthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                               keepAlive){};
+    CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<GeneralDiagnosticsNetworkInterfacesListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                     keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context,
+                            const chip::app::DataModel::DecodableList<
+                                chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> & value);
 };
 
-class CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge
+class CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackSubscriptionBridge
+    : public CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackBridge
 {
 public:
-    CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4263,26 +4304,26 @@ class CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubs
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<EthernetNetworkDiagnosticsAttributeListListAttributeCallback>
+class CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackBridge
+    : public CHIPCallbackBridge<GeneralDiagnosticsActiveHardwareFaultsListAttributeCallback>
 {
 public:
-    CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                           CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<EthernetNetworkDiagnosticsAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                         keepAlive){};
+    CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                          CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<GeneralDiagnosticsActiveHardwareFaultsListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                        keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & value);
 };
 
-class CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackBridge
+class CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackSubscriptionBridge
+    : public CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackBridge
 {
 public:
-    CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge(
+    CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4292,25 +4333,26 @@ class CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackSubscripti
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPFanControlGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<FanControlGeneratedCommandListListAttributeCallback>
+class CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackBridge
+    : public CHIPCallbackBridge<GeneralDiagnosticsActiveRadioFaultsListAttributeCallback>
 {
 public:
-    CHIPFanControlGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                  CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<FanControlGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<GeneralDiagnosticsActiveRadioFaultsListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                     keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & value);
 };
 
-class CHIPFanControlGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPFanControlGeneratedCommandListListAttributeCallbackBridge
+class CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackSubscriptionBridge
+    : public CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackBridge
 {
 public:
-    CHIPFanControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                              CHIPActionBlock action,
-                                                                              SubscriptionEstablishedHandler establishedHandler) :
-        CHIPFanControlGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4320,25 +4362,26 @@ class CHIPFanControlGeneratedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPFanControlAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<FanControlAcceptedCommandListListAttributeCallback>
+class CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackBridge
+    : public CHIPCallbackBridge<GeneralDiagnosticsActiveNetworkFaultsListAttributeCallback>
 {
 public:
-    CHIPFanControlAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<FanControlAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                         CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<GeneralDiagnosticsActiveNetworkFaultsListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                       keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & value);
 };
 
-class CHIPFanControlAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPFanControlAcceptedCommandListListAttributeCallbackBridge
+class CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackSubscriptionBridge
+    : public CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackBridge
 {
 public:
-    CHIPFanControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             CHIPActionBlock action,
-                                                                             SubscriptionEstablishedHandler establishedHandler) :
-        CHIPFanControlAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4348,25 +4391,26 @@ class CHIPFanControlAcceptedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPFanControlAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<FanControlAttributeListListAttributeCallback>
+class CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<GeneralDiagnosticsGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPFanControlAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                           bool keepAlive = false) :
-        CHIPCallbackBridge<FanControlAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                          CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<GeneralDiagnosticsGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                        keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPFanControlAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPFanControlAttributeListListAttributeCallbackBridge
+class CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPFanControlAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       CHIPActionBlock action,
-                                                                       SubscriptionEstablishedHandler establishedHandler) :
-        CHIPFanControlAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4376,25 +4420,26 @@ class CHIPFanControlAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPFixedLabelLabelListListAttributeCallbackBridge : public CHIPCallbackBridge<FixedLabelLabelListListAttributeCallback>
+class CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<GeneralDiagnosticsAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPFixedLabelLabelListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                       bool keepAlive = false) :
-        CHIPCallbackBridge<FixedLabelLabelListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                         CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<GeneralDiagnosticsAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                       keepAlive){};
 
-    static void OnSuccessFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::FixedLabel::Structs::LabelStruct::DecodableType> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPFixedLabelLabelListListAttributeCallbackSubscriptionBridge : public CHIPFixedLabelLabelListListAttributeCallbackBridge
+class CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPFixedLabelLabelListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                   CHIPActionBlock action,
-                                                                   SubscriptionEstablishedHandler establishedHandler) :
-        CHIPFixedLabelLabelListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4404,25 +4449,25 @@ class CHIPFixedLabelLabelListListAttributeCallbackSubscriptionBridge : public CH
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPFixedLabelGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<FixedLabelGeneratedCommandListListAttributeCallback>
+class CHIPGeneralDiagnosticsAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<GeneralDiagnosticsAttributeListListAttributeCallback>
 {
 public:
-    CHIPFixedLabelGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                  CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<FixedLabelGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPGeneralDiagnosticsAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                   CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<GeneralDiagnosticsAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPFixedLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPFixedLabelGeneratedCommandListListAttributeCallbackBridge
+class CHIPGeneralDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPGeneralDiagnosticsAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPFixedLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                              CHIPActionBlock action,
-                                                                              SubscriptionEstablishedHandler establishedHandler) :
-        CHIPFixedLabelGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPGeneralDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                               CHIPActionBlock action,
+                                                                               SubscriptionEstablishedHandler establishedHandler) :
+        CHIPGeneralDiagnosticsAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4432,25 +4477,28 @@ class CHIPFixedLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPFixedLabelAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<FixedLabelAcceptedCommandListListAttributeCallback>
+class CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackBridge
+    : public CHIPCallbackBridge<SoftwareDiagnosticsThreadMetricsListAttributeCallback>
 {
 public:
-    CHIPFixedLabelAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<FixedLabelAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                    CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<SoftwareDiagnosticsThreadMetricsListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType> &
+            value);
 };
 
-class CHIPFixedLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPFixedLabelAcceptedCommandListListAttributeCallbackBridge
+class CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackSubscriptionBridge
+    : public CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackBridge
 {
 public:
-    CHIPFixedLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             CHIPActionBlock action,
-                                                                             SubscriptionEstablishedHandler establishedHandler) :
-        CHIPFixedLabelAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                CHIPActionBlock action,
+                                                                                SubscriptionEstablishedHandler establishedHandler) :
+        CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4460,25 +4508,26 @@ class CHIPFixedLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPFixedLabelAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<FixedLabelAttributeListListAttributeCallback>
+class CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<SoftwareDiagnosticsGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPFixedLabelAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                           bool keepAlive = false) :
-        CHIPCallbackBridge<FixedLabelAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                           CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<SoftwareDiagnosticsGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                         keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPFixedLabelAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPFixedLabelAttributeListListAttributeCallbackBridge
+class CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPFixedLabelAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       CHIPActionBlock action,
-                                                                       SubscriptionEstablishedHandler establishedHandler) :
-        CHIPFixedLabelAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4488,26 +4537,26 @@ class CHIPFixedLabelAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<FlowMeasurementGeneratedCommandListListAttributeCallback>
+class CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<SoftwareDiagnosticsAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<FlowMeasurementGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                     keepAlive){};
+    CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                          CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<SoftwareDiagnosticsAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                        keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackBridge
+class CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4517,26 +4566,25 @@ class CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBr
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<FlowMeasurementAcceptedCommandListListAttributeCallback>
+class CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<SoftwareDiagnosticsAttributeListListAttributeCallback>
 {
 public:
-    CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                      CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<FlowMeasurementAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                    keepAlive){};
+    CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                    CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<SoftwareDiagnosticsAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackBridge
-{
-public:
-    CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+class CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackBridge
+{
+public:
+    CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                CHIPActionBlock action,
+                                                                                SubscriptionEstablishedHandler establishedHandler) :
+        CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4546,25 +4594,28 @@ class CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBri
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPFlowMeasurementAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<FlowMeasurementAttributeListListAttributeCallback>
+class CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ThreadNetworkDiagnosticsNeighborTableListListAttributeCallback>
 {
 public:
-    CHIPFlowMeasurementAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<FlowMeasurementAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                             CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ThreadNetworkDiagnosticsNeighborTableListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                           keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context,
+                            const chip::app::DataModel::DecodableList<
+                                chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & value);
 };
 
-class CHIPFlowMeasurementAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPFlowMeasurementAttributeListListAttributeCallbackBridge
+class CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackSubscriptionBridge
+    : public CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackBridge
 {
 public:
-    CHIPFlowMeasurementAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                            CHIPActionBlock action,
-                                                                            SubscriptionEstablishedHandler establishedHandler) :
-        CHIPFlowMeasurementAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4574,28 +4625,28 @@ class CHIPFlowMeasurementAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackBridge
-    : public CHIPCallbackBridge<GeneralCommissioningBasicCommissioningInfoStructAttributeCallback>
+class CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ThreadNetworkDiagnosticsRouteTableListListAttributeCallback>
 {
 public:
-    CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<GeneralCommissioningBasicCommissioningInfoStructAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                              keepAlive){};
+    CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                          CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ThreadNetworkDiagnosticsRouteTableListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                        keepAlive){};
 
-    static void
-    OnSuccessFn(void * context,
-                const chip::app::Clusters::GeneralCommissioning::Structs::BasicCommissioningInfo::DecodableType & value);
+    static void OnSuccessFn(void * context,
+                            const chip::app::DataModel::DecodableList<
+                                chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> & value);
 };
 
-class CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackSubscriptionBridge
-    : public CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackBridge
+class CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackSubscriptionBridge
+    : public CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackBridge
 {
 public:
-    CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackSubscriptionBridge(
+    CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackBridge(queue, handler, action, true),
+        CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4605,26 +4656,28 @@ class CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackSubsc
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<GeneralCommissioningGeneratedCommandListListAttributeCallback>
+class CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge
+    : public CHIPCallbackBridge<ThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallback>
 {
 public:
-    CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                             CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<GeneralCommissioningGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+        CHIPCallbackBridge<ThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallback>(queue, handler, action, OnSuccessFn,
                                                                                           keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context,
+                            const chip::app::DataModel::Nullable<
+                                chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> & value);
 };
 
-class CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackBridge
+class CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackSubscriptionBridge
+    : public CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge
 {
 public:
-    CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4634,26 +4687,31 @@ class CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackSubscript
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<GeneralCommissioningAcceptedCommandListListAttributeCallback>
+class CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge
+    : public CHIPCallbackBridge<ThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallback>
 {
 public:
-    CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                           CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<GeneralCommissioningAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                         keepAlive){};
+    CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge(dispatch_queue_t queue,
+                                                                                          ResponseHandler handler,
+                                                                                          CHIPActionBlock action,
+                                                                                          bool keepAlive = false) :
+        CHIPCallbackBridge<ThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallback>(queue, handler, action,
+                                                                                                        OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void
+    OnSuccessFn(void * context,
+                const chip::app::DataModel::Nullable<
+                    chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> & value);
 };
 
-class CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackBridge
+class CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackSubscriptionBridge
+    : public CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge
 {
 public:
-    CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4663,26 +4721,28 @@ class CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackSubscripti
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPGeneralCommissioningAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<GeneralCommissioningAttributeListListAttributeCallback>
+class CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback>
 {
 public:
-    CHIPGeneralCommissioningAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                     CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<GeneralCommissioningAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                   keepAlive){};
+    CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                   CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback>(queue, handler, action,
+                                                                                                 OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void
+    OnSuccessFn(void * context,
+                const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & value);
 };
 
-class CHIPGeneralCommissioningAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPGeneralCommissioningAttributeListListAttributeCallbackBridge
+class CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackSubscriptionBridge
+    : public CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackBridge
 {
 public:
-    CHIPGeneralCommissioningAttributeListListAttributeCallbackSubscriptionBridge(
+    CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPGeneralCommissioningAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4692,28 +4752,26 @@ class CHIPGeneralCommissioningAttributeListListAttributeCallbackSubscriptionBrid
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackBridge
-    : public CHIPCallbackBridge<GeneralDiagnosticsNetworkInterfacesListAttributeCallback>
+class CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<GeneralDiagnosticsNetworkInterfacesListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                     keepAlive){};
+    CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                              keepAlive){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::DecodableList<
-                                chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackSubscriptionBridge
-    : public CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackBridge
+class CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackSubscriptionBridge(
+    CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4723,26 +4781,26 @@ class CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackSubscriptionBr
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackBridge
-    : public CHIPCallbackBridge<GeneralDiagnosticsActiveHardwareFaultsListAttributeCallback>
+class CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<GeneralDiagnosticsActiveHardwareFaultsListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                        keepAlive){};
+    CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                               CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                             keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackSubscriptionBridge
-    : public CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackBridge
+class CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackSubscriptionBridge(
+    CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4752,26 +4810,26 @@ class CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackSubscriptio
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackBridge
-    : public CHIPCallbackBridge<GeneralDiagnosticsActiveRadioFaultsListAttributeCallback>
+class CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ThreadNetworkDiagnosticsAttributeListListAttributeCallback>
 {
 public:
-    CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<GeneralDiagnosticsActiveRadioFaultsListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                     keepAlive){};
+    CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                         CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ThreadNetworkDiagnosticsAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                       keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackSubscriptionBridge
-    : public CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackBridge
+class CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackSubscriptionBridge(
+    CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4781,26 +4839,26 @@ class CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackSubscriptionBr
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackBridge
-    : public CHIPCallbackBridge<GeneralDiagnosticsActiveNetworkFaultsListAttributeCallback>
+class CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<WiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                         CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<GeneralDiagnosticsActiveNetworkFaultsListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                       keepAlive){};
+    CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                              CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<WiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                            keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackSubscriptionBridge
-    : public CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackBridge
+class CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackSubscriptionBridge(
+    CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4810,26 +4868,26 @@ class CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackSubscription
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<GeneralDiagnosticsGeneratedCommandListListAttributeCallback>
+class CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<WiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<GeneralDiagnosticsGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                        keepAlive){};
+    CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                             CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<WiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                           keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackBridge
+class CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4839,26 +4897,26 @@ class CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptio
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<GeneralDiagnosticsAcceptedCommandListListAttributeCallback>
+class CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<WiFiNetworkDiagnosticsAttributeListListAttributeCallback>
 {
 public:
-    CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                         CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<GeneralDiagnosticsAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                       keepAlive){};
+    CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<WiFiNetworkDiagnosticsAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                     keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackBridge
+class CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4868,25 +4926,26 @@ class CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackSubscription
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPGeneralDiagnosticsAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<GeneralDiagnosticsAttributeListListAttributeCallback>
+class CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<EthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPGeneralDiagnosticsAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                   CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<GeneralDiagnosticsAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                  CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<EthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                                keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPGeneralDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPGeneralDiagnosticsAttributeListListAttributeCallbackBridge
+class CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPGeneralDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                               CHIPActionBlock action,
-                                                                               SubscriptionEstablishedHandler establishedHandler) :
-        CHIPGeneralDiagnosticsAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4896,27 +4955,26 @@ class CHIPGeneralDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackBridge
-    : public CHIPCallbackBridge<GroupKeyManagementGroupKeyMapListAttributeCallback>
+class CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<EthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<GroupKeyManagementGroupKeyMapListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                 CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<EthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                               keepAlive){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::DecodableList<
-                                chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::DecodableType> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackSubscriptionBridge
-    : public CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackBridge
+class CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             CHIPActionBlock action,
-                                                                             SubscriptionEstablishedHandler establishedHandler) :
-        CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4926,27 +4984,26 @@ class CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPGroupKeyManagementGroupTableListAttributeCallbackBridge
-    : public CHIPCallbackBridge<GroupKeyManagementGroupTableListAttributeCallback>
+class CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<EthernetNetworkDiagnosticsAttributeListListAttributeCallback>
 {
 public:
-    CHIPGroupKeyManagementGroupTableListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<GroupKeyManagementGroupTableListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                           CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<EthernetNetworkDiagnosticsAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                         keepAlive){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::DecodableList<
-                                chip::app::Clusters::GroupKeyManagement::Structs::GroupInfoMapStruct::DecodableType> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPGroupKeyManagementGroupTableListAttributeCallbackSubscriptionBridge
-    : public CHIPGroupKeyManagementGroupTableListAttributeCallbackBridge
+class CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPGroupKeyManagementGroupTableListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                            CHIPActionBlock action,
-                                                                            SubscriptionEstablishedHandler establishedHandler) :
-        CHIPGroupKeyManagementGroupTableListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4956,26 +5013,26 @@ class CHIPGroupKeyManagementGroupTableListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<GroupKeyManagementGeneratedCommandListListAttributeCallback>
+class CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<BridgedDeviceBasicGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                           CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<GroupKeyManagementGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+        CHIPCallbackBridge<BridgedDeviceBasicGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
                                                                                         keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackBridge
+class CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -4985,26 +5042,26 @@ class CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackSubscriptio
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<GroupKeyManagementAcceptedCommandListListAttributeCallback>
+class CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<BridgedDeviceBasicAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                          CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<GroupKeyManagementAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+        CHIPCallbackBridge<BridgedDeviceBasicAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
                                                                                        keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackBridge
+class CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5014,25 +5071,25 @@ class CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackSubscription
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPGroupKeyManagementAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<GroupKeyManagementAttributeListListAttributeCallback>
+class CHIPBridgedDeviceBasicAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<BridgedDeviceBasicAttributeListListAttributeCallback>
 {
 public:
-    CHIPGroupKeyManagementAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPBridgedDeviceBasicAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                    CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<GroupKeyManagementAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+        CHIPCallbackBridge<BridgedDeviceBasicAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPGroupKeyManagementAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPGroupKeyManagementAttributeListListAttributeCallbackBridge
+class CHIPBridgedDeviceBasicAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPBridgedDeviceBasicAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPGroupKeyManagementAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPBridgedDeviceBasicAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                                CHIPActionBlock action,
                                                                                SubscriptionEstablishedHandler establishedHandler) :
-        CHIPGroupKeyManagementAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPBridgedDeviceBasicAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5042,25 +5099,25 @@ class CHIPGroupKeyManagementAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPGroupsGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<GroupsGeneratedCommandListListAttributeCallback>
+class CHIPSwitchGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<SwitchGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPGroupsGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPSwitchGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                               CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<GroupsGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+        CHIPCallbackBridge<SwitchGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPGroupsGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPGroupsGeneratedCommandListListAttributeCallbackBridge
+class CHIPSwitchGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPSwitchGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPGroupsGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPSwitchGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                           CHIPActionBlock action,
                                                                           SubscriptionEstablishedHandler establishedHandler) :
-        CHIPGroupsGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPSwitchGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5070,25 +5127,25 @@ class CHIPGroupsGeneratedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPGroupsAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<GroupsAcceptedCommandListListAttributeCallback>
+class CHIPSwitchAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<SwitchAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPGroupsAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPSwitchAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                              CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<GroupsAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+        CHIPCallbackBridge<SwitchAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPGroupsAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPGroupsAcceptedCommandListListAttributeCallbackBridge
+class CHIPSwitchAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPSwitchAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPGroupsAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPSwitchAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                          CHIPActionBlock action,
                                                                          SubscriptionEstablishedHandler establishedHandler) :
-        CHIPGroupsAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPSwitchAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5098,51 +5155,23 @@ class CHIPGroupsAcceptedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPGroupsAttributeListListAttributeCallbackBridge : public CHIPCallbackBridge<GroupsAttributeListListAttributeCallback>
+class CHIPSwitchAttributeListListAttributeCallbackBridge : public CHIPCallbackBridge<SwitchAttributeListListAttributeCallback>
 {
 public:
-    CHIPGroupsAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+    CHIPSwitchAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
                                                        bool keepAlive = false) :
-        CHIPCallbackBridge<GroupsAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+        CHIPCallbackBridge<SwitchAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPGroupsAttributeListListAttributeCallbackSubscriptionBridge : public CHIPGroupsAttributeListListAttributeCallbackBridge
+class CHIPSwitchAttributeListListAttributeCallbackSubscriptionBridge : public CHIPSwitchAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPGroupsAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPSwitchAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                    CHIPActionBlock action,
                                                                    SubscriptionEstablishedHandler establishedHandler) :
-        CHIPGroupsAttributeListListAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPIdentifyGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<IdentifyGeneratedCommandListListAttributeCallback>
-{
-public:
-    CHIPIdentifyGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<IdentifyGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
-};
-
-class CHIPIdentifyGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPIdentifyGeneratedCommandListListAttributeCallbackBridge
-{
-public:
-    CHIPIdentifyGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                            CHIPActionBlock action,
-                                                                            SubscriptionEstablishedHandler establishedHandler) :
-        CHIPIdentifyGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPSwitchAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5152,51 +5181,26 @@ class CHIPIdentifyGeneratedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPIdentifyAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<IdentifyAcceptedCommandListListAttributeCallback>
+class CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<AdministratorCommissioningGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPIdentifyAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                               CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<IdentifyAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                  CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<AdministratorCommissioningGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                                keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPIdentifyAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPIdentifyAcceptedCommandListListAttributeCallbackBridge
-{
-public:
-    CHIPIdentifyAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                           CHIPActionBlock action,
-                                                                           SubscriptionEstablishedHandler establishedHandler) :
-        CHIPIdentifyAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPIdentifyAttributeListListAttributeCallbackBridge : public CHIPCallbackBridge<IdentifyAttributeListListAttributeCallback>
-{
-public:
-    CHIPIdentifyAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                         bool keepAlive = false) :
-        CHIPCallbackBridge<IdentifyAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
-};
-
-class CHIPIdentifyAttributeListListAttributeCallbackSubscriptionBridge : public CHIPIdentifyAttributeListListAttributeCallbackBridge
+class CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPIdentifyAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                     CHIPActionBlock action,
-                                                                     SubscriptionEstablishedHandler establishedHandler) :
-        CHIPIdentifyAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5206,26 +5210,26 @@ class CHIPIdentifyAttributeListListAttributeCallbackSubscriptionBridge : public
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<IlluminanceMeasurementGeneratedCommandListListAttributeCallback>
+class CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<AdministratorCommissioningAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                              CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<IlluminanceMeasurementGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                            keepAlive){};
+    CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                 CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<AdministratorCommissioningAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                               keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackBridge
+class CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5235,26 +5239,26 @@ class CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackSubscri
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<IlluminanceMeasurementAcceptedCommandListListAttributeCallback>
+class CHIPAdministratorCommissioningAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<AdministratorCommissioningAttributeListListAttributeCallback>
 {
 public:
-    CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<IlluminanceMeasurementAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                           keepAlive){};
+    CHIPAdministratorCommissioningAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                           CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<AdministratorCommissioningAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                         keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackBridge
+class CHIPAdministratorCommissioningAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPAdministratorCommissioningAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPAdministratorCommissioningAttributeListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPAdministratorCommissioningAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5264,26 +5268,28 @@ class CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackSubscrip
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPIlluminanceMeasurementAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<IlluminanceMeasurementAttributeListListAttributeCallback>
+class CHIPOperationalCredentialsNOCsListAttributeCallbackBridge
+    : public CHIPCallbackBridge<OperationalCredentialsNOCsListAttributeCallback>
 {
 public:
-    CHIPIlluminanceMeasurementAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<IlluminanceMeasurementAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                     keepAlive){};
+    CHIPOperationalCredentialsNOCsListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                              CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<OperationalCredentialsNOCsListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::DecodableType> &
+            value);
 };
 
-class CHIPIlluminanceMeasurementAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPIlluminanceMeasurementAttributeListListAttributeCallbackBridge
+class CHIPOperationalCredentialsNOCsListAttributeCallbackSubscriptionBridge
+    : public CHIPOperationalCredentialsNOCsListAttributeCallbackBridge
 {
 public:
-    CHIPIlluminanceMeasurementAttributeListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPIlluminanceMeasurementAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPOperationalCredentialsNOCsListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                          CHIPActionBlock action,
+                                                                          SubscriptionEstablishedHandler establishedHandler) :
+        CHIPOperationalCredentialsNOCsListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5293,25 +5299,27 @@ class CHIPIlluminanceMeasurementAttributeListListAttributeCallbackSubscriptionBr
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPKeypadInputGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<KeypadInputGeneratedCommandListListAttributeCallback>
+class CHIPOperationalCredentialsFabricsListAttributeCallbackBridge
+    : public CHIPCallbackBridge<OperationalCredentialsFabricsListAttributeCallback>
 {
 public:
-    CHIPKeypadInputGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                   CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<KeypadInputGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPOperationalCredentialsFabricsListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                 CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<OperationalCredentialsFabricsListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context,
+                            const chip::app::DataModel::DecodableList<
+                                chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & value);
 };
 
-class CHIPKeypadInputGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPKeypadInputGeneratedCommandListListAttributeCallbackBridge
+class CHIPOperationalCredentialsFabricsListAttributeCallbackSubscriptionBridge
+    : public CHIPOperationalCredentialsFabricsListAttributeCallbackBridge
 {
 public:
-    CHIPKeypadInputGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                               CHIPActionBlock action,
-                                                                               SubscriptionEstablishedHandler establishedHandler) :
-        CHIPKeypadInputGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPOperationalCredentialsFabricsListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                             CHIPActionBlock action,
+                                                                             SubscriptionEstablishedHandler establishedHandler) :
+        CHIPOperationalCredentialsFabricsListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5321,25 +5329,26 @@ class CHIPKeypadInputGeneratedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPKeypadInputAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<KeypadInputAcceptedCommandListListAttributeCallback>
+class CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackBridge
+    : public CHIPCallbackBridge<OperationalCredentialsTrustedRootCertificatesListAttributeCallback>
 {
 public:
-    CHIPKeypadInputAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                  CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<KeypadInputAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                 CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<OperationalCredentialsTrustedRootCertificatesListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                               keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & value);
 };
 
-class CHIPKeypadInputAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPKeypadInputAcceptedCommandListListAttributeCallbackBridge
+class CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackSubscriptionBridge
+    : public CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackBridge
 {
 public:
-    CHIPKeypadInputAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                              CHIPActionBlock action,
-                                                                              SubscriptionEstablishedHandler establishedHandler) :
-        CHIPKeypadInputAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5349,25 +5358,26 @@ class CHIPKeypadInputAcceptedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPKeypadInputAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<KeypadInputAttributeListListAttributeCallback>
+class CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<OperationalCredentialsGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPKeypadInputAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                            bool keepAlive = false) :
-        CHIPCallbackBridge<KeypadInputAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                              CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<OperationalCredentialsGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                            keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPKeypadInputAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPKeypadInputAttributeListListAttributeCallbackBridge
+class CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPKeypadInputAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                        CHIPActionBlock action,
-                                                                        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPKeypadInputAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5377,25 +5387,26 @@ class CHIPKeypadInputAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPLevelControlGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<LevelControlGeneratedCommandListListAttributeCallback>
+class CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<OperationalCredentialsAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPLevelControlGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                    CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<LevelControlGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                             CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<OperationalCredentialsAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                           keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPLevelControlGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPLevelControlGeneratedCommandListListAttributeCallbackBridge
+class CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPLevelControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                CHIPActionBlock action,
-                                                                                SubscriptionEstablishedHandler establishedHandler) :
-        CHIPLevelControlGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5405,25 +5416,26 @@ class CHIPLevelControlGeneratedCommandListListAttributeCallbackSubscriptionBridg
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPLevelControlAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<LevelControlAcceptedCommandListListAttributeCallback>
+class CHIPOperationalCredentialsAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<OperationalCredentialsAttributeListListAttributeCallback>
 {
 public:
-    CHIPLevelControlAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                   CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<LevelControlAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPOperationalCredentialsAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<OperationalCredentialsAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                     keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPLevelControlAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPLevelControlAcceptedCommandListListAttributeCallbackBridge
+class CHIPOperationalCredentialsAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPOperationalCredentialsAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPLevelControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                               CHIPActionBlock action,
-                                                                               SubscriptionEstablishedHandler establishedHandler) :
-        CHIPLevelControlAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPOperationalCredentialsAttributeListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPOperationalCredentialsAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5433,25 +5445,27 @@ class CHIPLevelControlAcceptedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPLevelControlAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<LevelControlAttributeListListAttributeCallback>
+class CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackBridge
+    : public CHIPCallbackBridge<GroupKeyManagementGroupKeyMapListAttributeCallback>
 {
 public:
-    CHIPLevelControlAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                             CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<LevelControlAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                 CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<GroupKeyManagementGroupKeyMapListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context,
+                            const chip::app::DataModel::DecodableList<
+                                chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::DecodableType> & value);
 };
 
-class CHIPLevelControlAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPLevelControlAttributeListListAttributeCallbackBridge
+class CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackSubscriptionBridge
+    : public CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackBridge
 {
 public:
-    CHIPLevelControlAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                         CHIPActionBlock action,
-                                                                         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPLevelControlAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                             CHIPActionBlock action,
+                                                                             SubscriptionEstablishedHandler establishedHandler) :
+        CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5461,26 +5475,27 @@ class CHIPLevelControlAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackBridge
-    : public CHIPCallbackBridge<LocalizationConfigurationSupportedLocalesListAttributeCallback>
+class CHIPGroupKeyManagementGroupTableListAttributeCallbackBridge
+    : public CHIPCallbackBridge<GroupKeyManagementGroupTableListAttributeCallback>
 {
 public:
-    CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<LocalizationConfigurationSupportedLocalesListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                           keepAlive){};
+    CHIPGroupKeyManagementGroupTableListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<GroupKeyManagementGroupTableListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CharSpan> & value);
+    static void OnSuccessFn(void * context,
+                            const chip::app::DataModel::DecodableList<
+                                chip::app::Clusters::GroupKeyManagement::Structs::GroupInfoMapStruct::DecodableType> & value);
 };
 
-class CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackSubscriptionBridge
-    : public CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackBridge
+class CHIPGroupKeyManagementGroupTableListAttributeCallbackSubscriptionBridge
+    : public CHIPGroupKeyManagementGroupTableListAttributeCallbackBridge
 {
 public:
-    CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPGroupKeyManagementGroupTableListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                            CHIPActionBlock action,
+                                                                            SubscriptionEstablishedHandler establishedHandler) :
+        CHIPGroupKeyManagementGroupTableListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5490,26 +5505,26 @@ class CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackSubscrip
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<LocalizationConfigurationGeneratedCommandListListAttributeCallback>
+class CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<GroupKeyManagementGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<LocalizationConfigurationGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                               keepAlive){};
+    CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                          CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<GroupKeyManagementGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                        keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackBridge
+class CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5519,26 +5534,26 @@ class CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackSubs
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<LocalizationConfigurationAcceptedCommandListListAttributeCallback>
+class CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<GroupKeyManagementAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<LocalizationConfigurationAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                              keepAlive){};
+    CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                         CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<GroupKeyManagementAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                       keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackBridge
+class CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5548,26 +5563,25 @@ class CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackSubsc
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPLocalizationConfigurationAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<LocalizationConfigurationAttributeListListAttributeCallback>
+class CHIPGroupKeyManagementAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<GroupKeyManagementAttributeListListAttributeCallback>
 {
 public:
-    CHIPLocalizationConfigurationAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<LocalizationConfigurationAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                        keepAlive){};
+    CHIPGroupKeyManagementAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                   CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<GroupKeyManagementAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPLocalizationConfigurationAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPLocalizationConfigurationAttributeListListAttributeCallbackBridge
+class CHIPGroupKeyManagementAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPGroupKeyManagementAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPLocalizationConfigurationAttributeListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPLocalizationConfigurationAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPGroupKeyManagementAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                               CHIPActionBlock action,
+                                                                               SubscriptionEstablishedHandler establishedHandler) :
+        CHIPGroupKeyManagementAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5577,25 +5591,25 @@ class CHIPLocalizationConfigurationAttributeListListAttributeCallbackSubscriptio
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPLowPowerGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<LowPowerGeneratedCommandListListAttributeCallback>
+class CHIPFixedLabelLabelListListAttributeCallbackBridge : public CHIPCallbackBridge<FixedLabelLabelListListAttributeCallback>
 {
 public:
-    CHIPLowPowerGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<LowPowerGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPFixedLabelLabelListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                       bool keepAlive = false) :
+        CHIPCallbackBridge<FixedLabelLabelListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::FixedLabel::Structs::LabelStruct::DecodableType> & value);
 };
 
-class CHIPLowPowerGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPLowPowerGeneratedCommandListListAttributeCallbackBridge
+class CHIPFixedLabelLabelListListAttributeCallbackSubscriptionBridge : public CHIPFixedLabelLabelListListAttributeCallbackBridge
 {
 public:
-    CHIPLowPowerGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                            CHIPActionBlock action,
-                                                                            SubscriptionEstablishedHandler establishedHandler) :
-        CHIPLowPowerGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPFixedLabelLabelListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                   CHIPActionBlock action,
+                                                                   SubscriptionEstablishedHandler establishedHandler) :
+        CHIPFixedLabelLabelListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5605,25 +5619,25 @@ class CHIPLowPowerGeneratedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPLowPowerAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<LowPowerAcceptedCommandListListAttributeCallback>
+class CHIPFixedLabelGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<FixedLabelGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPLowPowerAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                               CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<LowPowerAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPFixedLabelGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                  CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<FixedLabelGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPLowPowerAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPLowPowerAcceptedCommandListListAttributeCallbackBridge
+class CHIPFixedLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPFixedLabelGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPLowPowerAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                           CHIPActionBlock action,
-                                                                           SubscriptionEstablishedHandler establishedHandler) :
-        CHIPLowPowerAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPFixedLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                              CHIPActionBlock action,
+                                                                              SubscriptionEstablishedHandler establishedHandler) :
+        CHIPFixedLabelGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5633,23 +5647,25 @@ class CHIPLowPowerAcceptedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPLowPowerAttributeListListAttributeCallbackBridge : public CHIPCallbackBridge<LowPowerAttributeListListAttributeCallback>
+class CHIPFixedLabelAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<FixedLabelAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPLowPowerAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                         bool keepAlive = false) :
-        CHIPCallbackBridge<LowPowerAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPFixedLabelAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                 CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<FixedLabelAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPLowPowerAttributeListListAttributeCallbackSubscriptionBridge : public CHIPLowPowerAttributeListListAttributeCallbackBridge
+class CHIPFixedLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPFixedLabelAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPLowPowerAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                     CHIPActionBlock action,
-                                                                     SubscriptionEstablishedHandler establishedHandler) :
-        CHIPLowPowerAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPFixedLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                             CHIPActionBlock action,
+                                                                             SubscriptionEstablishedHandler establishedHandler) :
+        CHIPFixedLabelAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5659,25 +5675,25 @@ class CHIPLowPowerAttributeListListAttributeCallbackSubscriptionBridge : public
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPMediaInputInputListListAttributeCallbackBridge : public CHIPCallbackBridge<MediaInputInputListListAttributeCallback>
+class CHIPFixedLabelAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<FixedLabelAttributeListListAttributeCallback>
 {
 public:
-    CHIPMediaInputInputListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                       bool keepAlive = false) :
-        CHIPCallbackBridge<MediaInputInputListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPFixedLabelAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                           bool keepAlive = false) :
+        CHIPCallbackBridge<FixedLabelAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::InputInfo::DecodableType> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPMediaInputInputListListAttributeCallbackSubscriptionBridge : public CHIPMediaInputInputListListAttributeCallbackBridge
+class CHIPFixedLabelAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPFixedLabelAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPMediaInputInputListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                   CHIPActionBlock action,
-                                                                   SubscriptionEstablishedHandler establishedHandler) :
-        CHIPMediaInputInputListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPFixedLabelAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       CHIPActionBlock action,
+                                                                       SubscriptionEstablishedHandler establishedHandler) :
+        CHIPFixedLabelAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5687,25 +5703,25 @@ class CHIPMediaInputInputListListAttributeCallbackSubscriptionBridge : public CH
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPMediaInputGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<MediaInputGeneratedCommandListListAttributeCallback>
+class CHIPUserLabelLabelListListAttributeCallbackBridge : public CHIPCallbackBridge<UserLabelLabelListListAttributeCallback>
 {
 public:
-    CHIPMediaInputGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                  CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<MediaInputGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPUserLabelLabelListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                      bool keepAlive = false) :
+        CHIPCallbackBridge<UserLabelLabelListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::UserLabel::Structs::LabelStruct::DecodableType> & value);
 };
 
-class CHIPMediaInputGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPMediaInputGeneratedCommandListListAttributeCallbackBridge
+class CHIPUserLabelLabelListListAttributeCallbackSubscriptionBridge : public CHIPUserLabelLabelListListAttributeCallbackBridge
 {
 public:
-    CHIPMediaInputGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                              CHIPActionBlock action,
-                                                                              SubscriptionEstablishedHandler establishedHandler) :
-        CHIPMediaInputGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPUserLabelLabelListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                  CHIPActionBlock action,
+                                                                  SubscriptionEstablishedHandler establishedHandler) :
+        CHIPUserLabelLabelListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5715,25 +5731,25 @@ class CHIPMediaInputGeneratedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPMediaInputAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<MediaInputAcceptedCommandListListAttributeCallback>
+class CHIPUserLabelGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<UserLabelGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPMediaInputAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPUserLabelGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                  CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<MediaInputAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+        CHIPCallbackBridge<UserLabelGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPMediaInputAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPMediaInputAcceptedCommandListListAttributeCallbackBridge
+class CHIPUserLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPUserLabelGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPMediaInputAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPUserLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                              CHIPActionBlock action,
                                                                              SubscriptionEstablishedHandler establishedHandler) :
-        CHIPMediaInputAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPUserLabelGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5743,25 +5759,25 @@ class CHIPMediaInputAcceptedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPMediaInputAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<MediaInputAttributeListListAttributeCallback>
+class CHIPUserLabelAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<UserLabelAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPMediaInputAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                           bool keepAlive = false) :
-        CHIPCallbackBridge<MediaInputAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPUserLabelAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<UserLabelAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPMediaInputAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPMediaInputAttributeListListAttributeCallbackBridge
+class CHIPUserLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPUserLabelAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPMediaInputAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       CHIPActionBlock action,
-                                                                       SubscriptionEstablishedHandler establishedHandler) :
-        CHIPMediaInputAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPUserLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                            CHIPActionBlock action,
+                                                                            SubscriptionEstablishedHandler establishedHandler) :
+        CHIPUserLabelAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5771,27 +5787,24 @@ class CHIPMediaInputAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPMediaPlaybackSampledPositionStructAttributeCallbackBridge
-    : public CHIPCallbackBridge<MediaPlaybackSampledPositionStructAttributeCallback>
+class CHIPUserLabelAttributeListListAttributeCallbackBridge : public CHIPCallbackBridge<UserLabelAttributeListListAttributeCallback>
 {
 public:
-    CHIPMediaPlaybackSampledPositionStructAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                  CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<MediaPlaybackSampledPositionStructAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPUserLabelAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                          bool keepAlive = false) :
+        CHIPCallbackBridge<UserLabelAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(
-        void * context,
-        const chip::app::DataModel::Nullable<chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::DecodableType> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPMediaPlaybackSampledPositionStructAttributeCallbackSubscriptionBridge
-    : public CHIPMediaPlaybackSampledPositionStructAttributeCallbackBridge
+class CHIPUserLabelAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPUserLabelAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPMediaPlaybackSampledPositionStructAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                              CHIPActionBlock action,
-                                                                              SubscriptionEstablishedHandler establishedHandler) :
-        CHIPMediaPlaybackSampledPositionStructAttributeCallbackBridge(queue, handler, action, true),
+    CHIPUserLabelAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                      CHIPActionBlock action,
+                                                                      SubscriptionEstablishedHandler establishedHandler) :
+        CHIPUserLabelAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5801,26 +5814,25 @@ class CHIPMediaPlaybackSampledPositionStructAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<MediaPlaybackGeneratedCommandListListAttributeCallback>
+class CHIPBooleanStateGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<BooleanStateGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                     CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<MediaPlaybackGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                   keepAlive){};
+    CHIPBooleanStateGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                    CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<BooleanStateGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackBridge
+class CHIPBooleanStateGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPBooleanStateGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPBooleanStateGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                CHIPActionBlock action,
+                                                                                SubscriptionEstablishedHandler establishedHandler) :
+        CHIPBooleanStateGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5830,25 +5842,25 @@ class CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackSubscriptionBrid
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<MediaPlaybackAcceptedCommandListListAttributeCallback>
+class CHIPBooleanStateAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<BooleanStateAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                    CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<MediaPlaybackAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPBooleanStateAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                   CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<BooleanStateAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackBridge
+class CHIPBooleanStateAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPBooleanStateAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                CHIPActionBlock action,
-                                                                                SubscriptionEstablishedHandler establishedHandler) :
-        CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPBooleanStateAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                               CHIPActionBlock action,
+                                                                               SubscriptionEstablishedHandler establishedHandler) :
+        CHIPBooleanStateAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -5858,25 +5870,25 @@ class CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackSubscriptionBridg
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPMediaPlaybackAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<MediaPlaybackAttributeListListAttributeCallback>
+class CHIPBooleanStateAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<BooleanStateAttributeListListAttributeCallback>
 {
 public:
-    CHIPMediaPlaybackAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                              CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<MediaPlaybackAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPBooleanStateAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                             CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<BooleanStateAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPMediaPlaybackAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPMediaPlaybackAttributeListListAttributeCallbackBridge
+class CHIPBooleanStateAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPBooleanStateAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPMediaPlaybackAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          CHIPActionBlock action,
-                                                                          SubscriptionEstablishedHandler establishedHandler) :
-        CHIPMediaPlaybackAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPBooleanStateAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                         CHIPActionBlock action,
+                                                                         SubscriptionEstablishedHandler establishedHandler) :
+        CHIPBooleanStateAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6001,28 +6013,109 @@ class CHIPModeSelectAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPNetworkCommissioningNetworksListAttributeCallbackBridge
-    : public CHIPCallbackBridge<NetworkCommissioningNetworksListAttributeCallback>
+class CHIPDoorLockCredentialRulesSupportAttributeCallbackBridge
+    : public CHIPCallbackBridge<DoorLockCredentialRulesSupportAttributeCallback>
 {
 public:
-    CHIPNetworkCommissioningNetworksListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPDoorLockCredentialRulesSupportAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                              CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<DoorLockCredentialRulesSupportAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+
+    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask> value);
+};
+
+class CHIPDoorLockCredentialRulesSupportAttributeCallbackSubscriptionBridge
+    : public CHIPDoorLockCredentialRulesSupportAttributeCallbackBridge
+{
+public:
+    CHIPDoorLockCredentialRulesSupportAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                          CHIPActionBlock action,
+                                                                          SubscriptionEstablishedHandler establishedHandler) :
+        CHIPDoorLockCredentialRulesSupportAttributeCallbackBridge(queue, handler, action, true),
+        mEstablishedHandler(establishedHandler)
+    {}
+
+    static void OnSubscriptionEstablished(void * context);
+
+private:
+    SubscriptionEstablishedHandler mEstablishedHandler;
+};
+
+class CHIPDoorLockSupportedOperatingModesAttributeCallbackBridge
+    : public CHIPCallbackBridge<DoorLockSupportedOperatingModesAttributeCallback>
+{
+public:
+    CHIPDoorLockSupportedOperatingModesAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                               CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<DoorLockSupportedOperatingModesAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+
+    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes> value);
+};
+
+class CHIPDoorLockSupportedOperatingModesAttributeCallbackSubscriptionBridge
+    : public CHIPDoorLockSupportedOperatingModesAttributeCallbackBridge
+{
+public:
+    CHIPDoorLockSupportedOperatingModesAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                           CHIPActionBlock action,
+                                                                           SubscriptionEstablishedHandler establishedHandler) :
+        CHIPDoorLockSupportedOperatingModesAttributeCallbackBridge(queue, handler, action, true),
+        mEstablishedHandler(establishedHandler)
+    {}
+
+    static void OnSubscriptionEstablished(void * context);
+
+private:
+    SubscriptionEstablishedHandler mEstablishedHandler;
+};
+
+class CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackBridge
+    : public CHIPCallbackBridge<DoorLockDefaultConfigurationRegisterAttributeCallback>
+{
+public:
+    CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                    CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<DoorLockDefaultConfigurationRegisterAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+
+    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister> value);
+};
+
+class CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackSubscriptionBridge
+    : public CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackBridge
+{
+public:
+    CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                CHIPActionBlock action,
+                                                                                SubscriptionEstablishedHandler establishedHandler) :
+        CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackBridge(queue, handler, action, true),
+        mEstablishedHandler(establishedHandler)
+    {}
+
+    static void OnSubscriptionEstablished(void * context);
+
+private:
+    SubscriptionEstablishedHandler mEstablishedHandler;
+};
+
+class CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackBridge
+    : public CHIPCallbackBridge<DoorLockLocalProgrammingFeaturesAttributeCallback>
+{
+public:
+    CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<NetworkCommissioningNetworksListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+        CHIPCallbackBridge<DoorLockLocalProgrammingFeaturesAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::DecodableType> &
-            value);
+    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> value);
 };
 
-class CHIPNetworkCommissioningNetworksListAttributeCallbackSubscriptionBridge
-    : public CHIPNetworkCommissioningNetworksListAttributeCallbackBridge
+class CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackSubscriptionBridge
+    : public CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackBridge
 {
 public:
-    CHIPNetworkCommissioningNetworksListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                             CHIPActionBlock action,
                                                                             SubscriptionEstablishedHandler establishedHandler) :
-        CHIPNetworkCommissioningNetworksListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6032,26 +6125,25 @@ class CHIPNetworkCommissioningNetworksListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<NetworkCommissioningGeneratedCommandListListAttributeCallback>
+class CHIPDoorLockGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<DoorLockGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                            CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<NetworkCommissioningGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                          keepAlive){};
+    CHIPDoorLockGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<DoorLockGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackBridge
+class CHIPDoorLockGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPDoorLockGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPDoorLockGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                            CHIPActionBlock action,
+                                                                            SubscriptionEstablishedHandler establishedHandler) :
+        CHIPDoorLockGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6061,26 +6153,25 @@ class CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackSubscript
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<NetworkCommissioningAcceptedCommandListListAttributeCallback>
+class CHIPDoorLockAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<DoorLockAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                           CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<NetworkCommissioningAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                         keepAlive){};
+    CHIPDoorLockAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                               CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<DoorLockAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackBridge
+class CHIPDoorLockAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPDoorLockAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPDoorLockAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                           CHIPActionBlock action,
+                                                                           SubscriptionEstablishedHandler establishedHandler) :
+        CHIPDoorLockAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6090,26 +6181,23 @@ class CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackSubscripti
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPNetworkCommissioningAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<NetworkCommissioningAttributeListListAttributeCallback>
+class CHIPDoorLockAttributeListListAttributeCallbackBridge : public CHIPCallbackBridge<DoorLockAttributeListListAttributeCallback>
 {
 public:
-    CHIPNetworkCommissioningAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                     CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<NetworkCommissioningAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                   keepAlive){};
+    CHIPDoorLockAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                         bool keepAlive = false) :
+        CHIPCallbackBridge<DoorLockAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPNetworkCommissioningAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPNetworkCommissioningAttributeListListAttributeCallbackBridge
+class CHIPDoorLockAttributeListListAttributeCallbackSubscriptionBridge : public CHIPDoorLockAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPNetworkCommissioningAttributeListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPNetworkCommissioningAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPDoorLockAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                     CHIPActionBlock action,
+                                                                     SubscriptionEstablishedHandler establishedHandler) :
+        CHIPDoorLockAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6119,26 +6207,24 @@ class CHIPNetworkCommissioningAttributeListListAttributeCallbackSubscriptionBrid
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<OtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallback>
+class CHIPWindowCoveringConfigStatusAttributeCallbackBridge : public CHIPCallbackBridge<WindowCoveringConfigStatusAttributeCallback>
 {
 public:
-    CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<OtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                               keepAlive){};
+    CHIPWindowCoveringConfigStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                          bool keepAlive = false) :
+        CHIPCallbackBridge<WindowCoveringConfigStatusAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> value);
 };
 
-class CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackBridge
+class CHIPWindowCoveringConfigStatusAttributeCallbackSubscriptionBridge
+    : public CHIPWindowCoveringConfigStatusAttributeCallbackBridge
 {
 public:
-    CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPWindowCoveringConfigStatusAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                      CHIPActionBlock action,
+                                                                      SubscriptionEstablishedHandler establishedHandler) :
+        CHIPWindowCoveringConfigStatusAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6148,26 +6234,25 @@ class CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackSubs
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<OtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallback>
+class CHIPWindowCoveringOperationalStatusAttributeCallbackBridge
+    : public CHIPCallbackBridge<WindowCoveringOperationalStatusAttributeCallback>
 {
 public:
-    CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<OtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                              keepAlive){};
+    CHIPWindowCoveringOperationalStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                               CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<WindowCoveringOperationalStatusAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::WindowCovering::OperationalStatus> value);
 };
-
-class CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackBridge
+
+class CHIPWindowCoveringOperationalStatusAttributeCallbackSubscriptionBridge
+    : public CHIPWindowCoveringOperationalStatusAttributeCallbackBridge
 {
 public:
-    CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPWindowCoveringOperationalStatusAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                           CHIPActionBlock action,
+                                                                           SubscriptionEstablishedHandler establishedHandler) :
+        CHIPWindowCoveringOperationalStatusAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6177,26 +6262,23 @@ class CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackSubsc
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<OtaSoftwareUpdateProviderAttributeListListAttributeCallback>
+class CHIPWindowCoveringModeAttributeCallbackBridge : public CHIPCallbackBridge<WindowCoveringModeAttributeCallback>
 {
 public:
-    CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<OtaSoftwareUpdateProviderAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                        keepAlive){};
+    CHIPWindowCoveringModeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                  bool keepAlive = false) :
+        CHIPCallbackBridge<WindowCoveringModeAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::WindowCovering::Mode> value);
 };
 
-class CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackBridge
+class CHIPWindowCoveringModeAttributeCallbackSubscriptionBridge : public CHIPWindowCoveringModeAttributeCallbackBridge
 {
 public:
-    CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPWindowCoveringModeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                              CHIPActionBlock action,
+                                                              SubscriptionEstablishedHandler establishedHandler) :
+        CHIPWindowCoveringModeAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6206,28 +6288,24 @@ class CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackSubscriptio
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackBridge
-    : public CHIPCallbackBridge<OtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallback>
+class CHIPWindowCoveringSafetyStatusAttributeCallbackBridge : public CHIPCallbackBridge<WindowCoveringSafetyStatusAttributeCallback>
 {
 public:
-    CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<OtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                               keepAlive){};
+    CHIPWindowCoveringSafetyStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                          bool keepAlive = false) :
+        CHIPCallbackBridge<WindowCoveringSafetyStatusAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::DecodableList<
-                                chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType> & value);
+    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::WindowCovering::SafetyStatus> value);
 };
 
-class CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackSubscriptionBridge
-    : public CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackBridge
+class CHIPWindowCoveringSafetyStatusAttributeCallbackSubscriptionBridge
+    : public CHIPWindowCoveringSafetyStatusAttributeCallbackBridge
 {
 public:
-    CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPWindowCoveringSafetyStatusAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                      CHIPActionBlock action,
+                                                                      SubscriptionEstablishedHandler establishedHandler) :
+        CHIPWindowCoveringSafetyStatusAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6237,26 +6315,26 @@ class CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackSubs
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<OtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallback>
+class CHIPWindowCoveringGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<WindowCoveringGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                  CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<OtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                                keepAlive){};
+    CHIPWindowCoveringGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                      CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<WindowCoveringGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                    keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackBridge
+class CHIPWindowCoveringGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPWindowCoveringGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPWindowCoveringGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPWindowCoveringGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6266,26 +6344,26 @@ class CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackSub
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<OtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallback>
+class CHIPWindowCoveringAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<WindowCoveringAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<OtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                               keepAlive){};
+    CHIPWindowCoveringAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                     CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<WindowCoveringAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                   keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackBridge
+class CHIPWindowCoveringAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPWindowCoveringAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPWindowCoveringAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPWindowCoveringAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6295,26 +6373,25 @@ class CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackSubs
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<OtaSoftwareUpdateRequestorAttributeListListAttributeCallback>
+class CHIPWindowCoveringAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<WindowCoveringAttributeListListAttributeCallback>
 {
 public:
-    CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                           CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<OtaSoftwareUpdateRequestorAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                         keepAlive){};
+    CHIPWindowCoveringAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                               CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<WindowCoveringAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackBridge
+class CHIPWindowCoveringAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPWindowCoveringAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPWindowCoveringAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                           CHIPActionBlock action,
+                                                                           SubscriptionEstablishedHandler establishedHandler) :
+        CHIPWindowCoveringAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6324,26 +6401,26 @@ class CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackSubscripti
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPOccupancySensingGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<OccupancySensingGeneratedCommandListListAttributeCallback>
+class CHIPBarrierControlGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<BarrierControlGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPOccupancySensingGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                        CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<OccupancySensingGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                      keepAlive){};
+    CHIPBarrierControlGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                      CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<BarrierControlGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                    keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPOccupancySensingGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPOccupancySensingGeneratedCommandListListAttributeCallbackBridge
+class CHIPBarrierControlGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPBarrierControlGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPOccupancySensingGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPBarrierControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPOccupancySensingGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPBarrierControlGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6353,26 +6430,26 @@ class CHIPOccupancySensingGeneratedCommandListListAttributeCallbackSubscriptionB
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPOccupancySensingAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<OccupancySensingAcceptedCommandListListAttributeCallback>
+class CHIPBarrierControlAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<BarrierControlAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPOccupancySensingAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<OccupancySensingAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                     keepAlive){};
+    CHIPBarrierControlAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                     CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<BarrierControlAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                   keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPOccupancySensingAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPOccupancySensingAcceptedCommandListListAttributeCallbackBridge
+class CHIPBarrierControlAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPBarrierControlAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPOccupancySensingAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPBarrierControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPOccupancySensingAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPBarrierControlAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6382,25 +6459,25 @@ class CHIPOccupancySensingAcceptedCommandListListAttributeCallbackSubscriptionBr
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPOccupancySensingAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<OccupancySensingAttributeListListAttributeCallback>
+class CHIPBarrierControlAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<BarrierControlAttributeListListAttributeCallback>
 {
 public:
-    CHIPOccupancySensingAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<OccupancySensingAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPBarrierControlAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                               CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<BarrierControlAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPOccupancySensingAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPOccupancySensingAttributeListListAttributeCallbackBridge
+class CHIPBarrierControlAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPBarrierControlAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPOccupancySensingAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             CHIPActionBlock action,
-                                                                             SubscriptionEstablishedHandler establishedHandler) :
-        CHIPOccupancySensingAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPBarrierControlAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                           CHIPActionBlock action,
+                                                                           SubscriptionEstablishedHandler establishedHandler) :
+        CHIPBarrierControlAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6410,25 +6487,26 @@ class CHIPOccupancySensingAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPOnOffGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<OnOffGeneratedCommandListListAttributeCallback>
+class CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackBridge
+    : public CHIPCallbackBridge<PumpConfigurationAndControlPumpStatusAttributeCallback>
 {
 public:
-    CHIPOnOffGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                             CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<OnOffGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                     CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<PumpConfigurationAndControlPumpStatusAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                   keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus> value);
 };
 
-class CHIPOnOffGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPOnOffGeneratedCommandListListAttributeCallbackBridge
+class CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackSubscriptionBridge
+    : public CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackBridge
 {
 public:
-    CHIPOnOffGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                         CHIPActionBlock action,
-                                                                         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPOnOffGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6438,25 +6516,26 @@ class CHIPOnOffGeneratedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPOnOffAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<OnOffAcceptedCommandListListAttributeCallback>
+class CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<PumpConfigurationAndControlGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPOnOffAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                            bool keepAlive = false) :
-        CHIPCallbackBridge<OnOffAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                   CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<PumpConfigurationAndControlGeneratedCommandListListAttributeCallback>(queue, handler, action,
+                                                                                                 OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPOnOffAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPOnOffAcceptedCommandListListAttributeCallbackBridge
+class CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPOnOffAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                        CHIPActionBlock action,
-                                                                        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPOnOffAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6466,23 +6545,26 @@ class CHIPOnOffAcceptedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPOnOffAttributeListListAttributeCallbackBridge : public CHIPCallbackBridge<OnOffAttributeListListAttributeCallback>
+class CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<PumpConfigurationAndControlAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPOnOffAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                      bool keepAlive = false) :
-        CHIPCallbackBridge<OnOffAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                  CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<PumpConfigurationAndControlAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                                keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPOnOffAttributeListListAttributeCallbackSubscriptionBridge : public CHIPOnOffAttributeListListAttributeCallbackBridge
+class CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPOnOffAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                  CHIPActionBlock action,
-                                                                  SubscriptionEstablishedHandler establishedHandler) :
-        CHIPOnOffAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6492,26 +6574,26 @@ class CHIPOnOffAttributeListListAttributeCallbackSubscriptionBridge : public CHI
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<OnOffSwitchConfigurationGeneratedCommandListListAttributeCallback>
+class CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<PumpConfigurationAndControlAttributeListListAttributeCallback>
 {
 public:
-    CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<OnOffSwitchConfigurationGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                              keepAlive){};
+    CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                            CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<PumpConfigurationAndControlAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                          keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackBridge
+class CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6521,26 +6603,25 @@ class CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackSubsc
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<OnOffSwitchConfigurationAcceptedCommandListListAttributeCallback>
+class CHIPThermostatGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ThermostatGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                               CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<OnOffSwitchConfigurationAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                             keepAlive){};
+    CHIPThermostatGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                  CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ThermostatGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackBridge
+class CHIPThermostatGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPThermostatGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPThermostatGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                              CHIPActionBlock action,
+                                                                              SubscriptionEstablishedHandler establishedHandler) :
+        CHIPThermostatGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6550,26 +6631,25 @@ class CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackSubscr
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<OnOffSwitchConfigurationAttributeListListAttributeCallback>
+class CHIPThermostatAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ThermostatAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                         CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<OnOffSwitchConfigurationAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                       keepAlive){};
+    CHIPThermostatAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                 CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ThermostatAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackBridge
+class CHIPThermostatAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPThermostatAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPThermostatAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                             CHIPActionBlock action,
+                                                                             SubscriptionEstablishedHandler establishedHandler) :
+        CHIPThermostatAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6579,28 +6659,25 @@ class CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackSubscription
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPOperationalCredentialsNOCsListAttributeCallbackBridge
-    : public CHIPCallbackBridge<OperationalCredentialsNOCsListAttributeCallback>
+class CHIPThermostatAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ThermostatAttributeListListAttributeCallback>
 {
 public:
-    CHIPOperationalCredentialsNOCsListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                              CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<OperationalCredentialsNOCsListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPThermostatAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                           bool keepAlive = false) :
+        CHIPCallbackBridge<ThermostatAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::DecodableType> &
-            value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPOperationalCredentialsNOCsListAttributeCallbackSubscriptionBridge
-    : public CHIPOperationalCredentialsNOCsListAttributeCallbackBridge
+class CHIPThermostatAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPThermostatAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPOperationalCredentialsNOCsListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          CHIPActionBlock action,
-                                                                          SubscriptionEstablishedHandler establishedHandler) :
-        CHIPOperationalCredentialsNOCsListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPThermostatAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       CHIPActionBlock action,
+                                                                       SubscriptionEstablishedHandler establishedHandler) :
+        CHIPThermostatAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6610,27 +6687,25 @@ class CHIPOperationalCredentialsNOCsListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPOperationalCredentialsFabricsListAttributeCallbackBridge
-    : public CHIPCallbackBridge<OperationalCredentialsFabricsListAttributeCallback>
+class CHIPFanControlGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<FanControlGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPOperationalCredentialsFabricsListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<OperationalCredentialsFabricsListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPFanControlGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                  CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<FanControlGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::DecodableList<
-                                chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPOperationalCredentialsFabricsListAttributeCallbackSubscriptionBridge
-    : public CHIPOperationalCredentialsFabricsListAttributeCallbackBridge
+class CHIPFanControlGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPFanControlGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPOperationalCredentialsFabricsListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             CHIPActionBlock action,
-                                                                             SubscriptionEstablishedHandler establishedHandler) :
-        CHIPOperationalCredentialsFabricsListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPFanControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                              CHIPActionBlock action,
+                                                                              SubscriptionEstablishedHandler establishedHandler) :
+        CHIPFanControlGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6640,26 +6715,25 @@ class CHIPOperationalCredentialsFabricsListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackBridge
-    : public CHIPCallbackBridge<OperationalCredentialsTrustedRootCertificatesListAttributeCallback>
+class CHIPFanControlAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<FanControlAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<OperationalCredentialsTrustedRootCertificatesListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                               keepAlive){};
+    CHIPFanControlAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                 CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<FanControlAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackSubscriptionBridge
-    : public CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackBridge
+class CHIPFanControlAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPFanControlAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPFanControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                             CHIPActionBlock action,
+                                                                             SubscriptionEstablishedHandler establishedHandler) :
+        CHIPFanControlAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6669,26 +6743,25 @@ class CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackSubs
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<OperationalCredentialsGeneratedCommandListListAttributeCallback>
+class CHIPFanControlAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<FanControlAttributeListListAttributeCallback>
 {
 public:
-    CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                              CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<OperationalCredentialsGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                            keepAlive){};
+    CHIPFanControlAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                           bool keepAlive = false) :
+        CHIPCallbackBridge<FanControlAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackBridge
+class CHIPFanControlAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPFanControlAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPFanControlAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       CHIPActionBlock action,
+                                                                       SubscriptionEstablishedHandler establishedHandler) :
+        CHIPFanControlAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6698,26 +6771,28 @@ class CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackSubscri
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<OperationalCredentialsAcceptedCommandListListAttributeCallback>
+class CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<OperationalCredentialsAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                           keepAlive){};
+    CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue,
+                                                                                            ResponseHandler handler,
+                                                                                            CHIPActionBlock action,
+                                                                                            bool keepAlive = false) :
+        CHIPCallbackBridge<ThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallback>(queue, handler, action,
+                                                                                                          OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackBridge
+class CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6727,26 +6802,28 @@ class CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackSubscrip
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPOperationalCredentialsAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<OperationalCredentialsAttributeListListAttributeCallback>
+class CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPOperationalCredentialsAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<OperationalCredentialsAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                     keepAlive){};
+    CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue,
+                                                                                           ResponseHandler handler,
+                                                                                           CHIPActionBlock action,
+                                                                                           bool keepAlive = false) :
+        CHIPCallbackBridge<ThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallback>(queue, handler, action,
+                                                                                                         OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPOperationalCredentialsAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPOperationalCredentialsAttributeListListAttributeCallbackBridge
+class CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPOperationalCredentialsAttributeListListAttributeCallbackSubscriptionBridge(
+    CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPOperationalCredentialsAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6756,25 +6833,28 @@ class CHIPOperationalCredentialsAttributeListListAttributeCallbackSubscriptionBr
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPPowerSourceActiveWiredFaultsListAttributeCallbackBridge
-    : public CHIPCallbackBridge<PowerSourceActiveWiredFaultsListAttributeCallback>
+class CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ThermostatUserInterfaceConfigurationAttributeListListAttributeCallback>
 {
 public:
-    CHIPPowerSourceActiveWiredFaultsListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<PowerSourceActiveWiredFaultsListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackBridge(dispatch_queue_t queue,
+                                                                                     ResponseHandler handler,
+                                                                                     CHIPActionBlock action,
+                                                                                     bool keepAlive = false) :
+        CHIPCallbackBridge<ThermostatUserInterfaceConfigurationAttributeListListAttributeCallback>(queue, handler, action,
+                                                                                                   OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPPowerSourceActiveWiredFaultsListAttributeCallbackSubscriptionBridge
-    : public CHIPPowerSourceActiveWiredFaultsListAttributeCallbackBridge
+class CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPPowerSourceActiveWiredFaultsListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                            CHIPActionBlock action,
-                                                                            SubscriptionEstablishedHandler establishedHandler) :
-        CHIPPowerSourceActiveWiredFaultsListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6784,25 +6864,25 @@ class CHIPPowerSourceActiveWiredFaultsListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackBridge
-    : public CHIPCallbackBridge<PowerSourceActiveBatteryFaultsListAttributeCallback>
+class CHIPColorControlGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ColorControlGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                  CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<PowerSourceActiveBatteryFaultsListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPColorControlGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                    CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ColorControlGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackSubscriptionBridge
-    : public CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackBridge
+class CHIPColorControlGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPColorControlGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                              CHIPActionBlock action,
-                                                                              SubscriptionEstablishedHandler establishedHandler) :
-        CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPColorControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                CHIPActionBlock action,
+                                                                                SubscriptionEstablishedHandler establishedHandler) :
+        CHIPColorControlGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6812,26 +6892,25 @@ class CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackBridge
-    : public CHIPCallbackBridge<PowerSourceActiveBatteryChargeFaultsListAttributeCallback>
+class CHIPColorControlAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ColorControlAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                        CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<PowerSourceActiveBatteryChargeFaultsListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                      keepAlive){};
+    CHIPColorControlAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                   CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ColorControlAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackSubscriptionBridge
-    : public CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackBridge
+class CHIPColorControlAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPColorControlAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPColorControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                               CHIPActionBlock action,
+                                                                               SubscriptionEstablishedHandler establishedHandler) :
+        CHIPColorControlAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6841,25 +6920,25 @@ class CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackSubscriptionB
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPPowerSourceGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<PowerSourceGeneratedCommandListListAttributeCallback>
+class CHIPColorControlAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ColorControlAttributeListListAttributeCallback>
 {
 public:
-    CHIPPowerSourceGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                   CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<PowerSourceGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPColorControlAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                             CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ColorControlAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPPowerSourceGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPPowerSourceGeneratedCommandListListAttributeCallbackBridge
+class CHIPColorControlAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPColorControlAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPPowerSourceGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                               CHIPActionBlock action,
-                                                                               SubscriptionEstablishedHandler establishedHandler) :
-        CHIPPowerSourceGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPColorControlAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                         CHIPActionBlock action,
+                                                                         SubscriptionEstablishedHandler establishedHandler) :
+        CHIPColorControlAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6869,25 +6948,26 @@ class CHIPPowerSourceGeneratedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPPowerSourceAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<PowerSourceAcceptedCommandListListAttributeCallback>
+class CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<IlluminanceMeasurementGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPPowerSourceAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                  CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<PowerSourceAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                              CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<IlluminanceMeasurementGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                            keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPPowerSourceAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPPowerSourceAcceptedCommandListListAttributeCallbackBridge
+class CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPPowerSourceAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                              CHIPActionBlock action,
-                                                                              SubscriptionEstablishedHandler establishedHandler) :
-        CHIPPowerSourceAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6897,25 +6977,26 @@ class CHIPPowerSourceAcceptedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPPowerSourceAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<PowerSourceAttributeListListAttributeCallback>
+class CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<IlluminanceMeasurementAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPPowerSourceAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                            bool keepAlive = false) :
-        CHIPCallbackBridge<PowerSourceAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                             CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<IlluminanceMeasurementAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                           keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPPowerSourceAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPPowerSourceAttributeListListAttributeCallbackBridge
+class CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPPowerSourceAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                        CHIPActionBlock action,
-                                                                        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPPowerSourceAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6925,25 +7006,26 @@ class CHIPPowerSourceAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPPowerSourceConfigurationSourcesListAttributeCallbackBridge
-    : public CHIPCallbackBridge<PowerSourceConfigurationSourcesListAttributeCallback>
+class CHIPIlluminanceMeasurementAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<IlluminanceMeasurementAttributeListListAttributeCallback>
 {
 public:
-    CHIPPowerSourceConfigurationSourcesListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                   CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<PowerSourceConfigurationSourcesListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPIlluminanceMeasurementAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<IlluminanceMeasurementAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                     keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPPowerSourceConfigurationSourcesListAttributeCallbackSubscriptionBridge
-    : public CHIPPowerSourceConfigurationSourcesListAttributeCallbackBridge
+class CHIPIlluminanceMeasurementAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPIlluminanceMeasurementAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPPowerSourceConfigurationSourcesListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                               CHIPActionBlock action,
-                                                                               SubscriptionEstablishedHandler establishedHandler) :
-        CHIPPowerSourceConfigurationSourcesListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPIlluminanceMeasurementAttributeListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPIlluminanceMeasurementAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6953,26 +7035,26 @@ class CHIPPowerSourceConfigurationSourcesListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<PowerSourceConfigurationGeneratedCommandListListAttributeCallback>
+class CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<TemperatureMeasurementGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<PowerSourceConfigurationGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                              keepAlive){};
+    CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                              CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<TemperatureMeasurementGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                            keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackBridge
+class CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -6982,26 +7064,26 @@ class CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackSubsc
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<PowerSourceConfigurationAcceptedCommandListListAttributeCallback>
+class CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<TemperatureMeasurementAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                               CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<PowerSourceConfigurationAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                             keepAlive){};
+    CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                             CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<TemperatureMeasurementAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                           keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackBridge
+class CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -7011,26 +7093,26 @@ class CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackSubscr
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPPowerSourceConfigurationAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<PowerSourceConfigurationAttributeListListAttributeCallback>
+class CHIPTemperatureMeasurementAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<TemperatureMeasurementAttributeListListAttributeCallback>
 {
 public:
-    CHIPPowerSourceConfigurationAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                         CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<PowerSourceConfigurationAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                       keepAlive){};
+    CHIPTemperatureMeasurementAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<TemperatureMeasurementAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                     keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPPowerSourceConfigurationAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPPowerSourceConfigurationAttributeListListAttributeCallbackBridge
+class CHIPTemperatureMeasurementAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPTemperatureMeasurementAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPPowerSourceConfigurationAttributeListListAttributeCallbackSubscriptionBridge(
+    CHIPTemperatureMeasurementAttributeListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPPowerSourceConfigurationAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPTemperatureMeasurementAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -7126,55 +7208,26 @@ class CHIPPressureMeasurementAttributeListListAttributeCallbackSubscriptionBridg
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackBridge
-    : public CHIPCallbackBridge<PumpConfigurationAndControlPumpStatusAttributeCallback>
-{
-public:
-    CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                     CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<PumpConfigurationAndControlPumpStatusAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                   keepAlive){};
-
-    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus> value);
-};
-
-class CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackSubscriptionBridge
-    : public CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackBridge
-{
-public:
-    CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<PumpConfigurationAndControlGeneratedCommandListListAttributeCallback>
+class CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<FlowMeasurementGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                   CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<PumpConfigurationAndControlGeneratedCommandListListAttributeCallback>(queue, handler, action,
-                                                                                                 OnSuccessFn, keepAlive){};
+    CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<FlowMeasurementGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                     keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackBridge
+class CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -7184,26 +7237,26 @@ class CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackSu
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<PumpConfigurationAndControlAcceptedCommandListListAttributeCallback>
+class CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<FlowMeasurementAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                  CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<PumpConfigurationAndControlAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                                keepAlive){};
+    CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                      CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<FlowMeasurementAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                    keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackBridge
+class CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -7213,26 +7266,25 @@ class CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackSub
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<PumpConfigurationAndControlAttributeListListAttributeCallback>
+class CHIPFlowMeasurementAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<FlowMeasurementAttributeListListAttributeCallback>
 {
 public:
-    CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                            CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<PumpConfigurationAndControlAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                          keepAlive){};
+    CHIPFlowMeasurementAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<FlowMeasurementAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackBridge
+class CHIPFlowMeasurementAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPFlowMeasurementAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPFlowMeasurementAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                            CHIPActionBlock action,
+                                                                            SubscriptionEstablishedHandler establishedHandler) :
+        CHIPFlowMeasurementAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -7329,25 +7381,26 @@ class CHIPRelativeHumidityMeasurementAttributeListListAttributeCallbackSubscript
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPScenesGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ScenesGeneratedCommandListListAttributeCallback>
+class CHIPOccupancySensingGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<OccupancySensingGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPScenesGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                              CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ScenesGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPOccupancySensingGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                        CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<OccupancySensingGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                      keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPScenesGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPScenesGeneratedCommandListListAttributeCallbackBridge
+class CHIPOccupancySensingGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPOccupancySensingGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPScenesGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          CHIPActionBlock action,
-                                                                          SubscriptionEstablishedHandler establishedHandler) :
-        CHIPScenesGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPOccupancySensingGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPOccupancySensingGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -7357,25 +7410,26 @@ class CHIPScenesGeneratedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPScenesAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ScenesAcceptedCommandListListAttributeCallback>
+class CHIPOccupancySensingAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<OccupancySensingAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPScenesAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                             CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ScenesAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPOccupancySensingAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<OccupancySensingAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                     keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPScenesAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPScenesAcceptedCommandListListAttributeCallbackBridge
+class CHIPOccupancySensingAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPOccupancySensingAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPScenesAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                         CHIPActionBlock action,
-                                                                         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPScenesAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPOccupancySensingAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPOccupancySensingAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -7385,23 +7439,25 @@ class CHIPScenesAcceptedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPScenesAttributeListListAttributeCallbackBridge : public CHIPCallbackBridge<ScenesAttributeListListAttributeCallback>
+class CHIPOccupancySensingAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<OccupancySensingAttributeListListAttributeCallback>
 {
 public:
-    CHIPScenesAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                       bool keepAlive = false) :
-        CHIPCallbackBridge<ScenesAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPOccupancySensingAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                 CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<OccupancySensingAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPScenesAttributeListListAttributeCallbackSubscriptionBridge : public CHIPScenesAttributeListListAttributeCallbackBridge
+class CHIPOccupancySensingAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPOccupancySensingAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPScenesAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                   CHIPActionBlock action,
-                                                                   SubscriptionEstablishedHandler establishedHandler) :
-        CHIPScenesAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPOccupancySensingAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                             CHIPActionBlock action,
+                                                                             SubscriptionEstablishedHandler establishedHandler) :
+        CHIPOccupancySensingAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -7411,28 +7467,25 @@ class CHIPScenesAttributeListListAttributeCallbackSubscriptionBridge : public CH
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackBridge
-    : public CHIPCallbackBridge<SoftwareDiagnosticsThreadMetricsListAttributeCallback>
+class CHIPWakeOnLanGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<WakeOnLanGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                    CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<SoftwareDiagnosticsThreadMetricsListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPWakeOnLanGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                 CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<WakeOnLanGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType> &
-            value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackSubscriptionBridge
-    : public CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackBridge
+class CHIPWakeOnLanGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPWakeOnLanGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                CHIPActionBlock action,
-                                                                                SubscriptionEstablishedHandler establishedHandler) :
-        CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPWakeOnLanGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                             CHIPActionBlock action,
+                                                                             SubscriptionEstablishedHandler establishedHandler) :
+        CHIPWakeOnLanGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -7442,26 +7495,25 @@ class CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackSubscriptionBridg
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<SoftwareDiagnosticsGeneratedCommandListListAttributeCallback>
+class CHIPWakeOnLanAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<WakeOnLanAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                           CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<SoftwareDiagnosticsGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                         keepAlive){};
+    CHIPWakeOnLanAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<WakeOnLanAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackBridge
+class CHIPWakeOnLanAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPWakeOnLanAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPWakeOnLanAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                            CHIPActionBlock action,
+                                                                            SubscriptionEstablishedHandler establishedHandler) :
+        CHIPWakeOnLanAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -7471,26 +7523,24 @@ class CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackSubscripti
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<SoftwareDiagnosticsAcceptedCommandListListAttributeCallback>
+class CHIPWakeOnLanAttributeListListAttributeCallbackBridge : public CHIPCallbackBridge<WakeOnLanAttributeListListAttributeCallback>
 {
 public:
-    CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<SoftwareDiagnosticsAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                        keepAlive){};
+    CHIPWakeOnLanAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                          bool keepAlive = false) :
+        CHIPCallbackBridge<WakeOnLanAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackBridge
+class CHIPWakeOnLanAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPWakeOnLanAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPWakeOnLanAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                      CHIPActionBlock action,
+                                                                      SubscriptionEstablishedHandler establishedHandler) :
+        CHIPWakeOnLanAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -7500,25 +7550,25 @@ class CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptio
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<SoftwareDiagnosticsAttributeListListAttributeCallback>
+class CHIPChannelChannelListListAttributeCallbackBridge : public CHIPCallbackBridge<ChannelChannelListListAttributeCallback>
 {
 public:
-    CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                    CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<SoftwareDiagnosticsAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPChannelChannelListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                      bool keepAlive = false) :
+        CHIPCallbackBridge<ChannelChannelListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> & value);
 };
 
-class CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackBridge
+class CHIPChannelChannelListListAttributeCallbackSubscriptionBridge : public CHIPChannelChannelListListAttributeCallbackBridge
 {
 public:
-    CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                CHIPActionBlock action,
-                                                                                SubscriptionEstablishedHandler establishedHandler) :
-        CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPChannelChannelListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                  CHIPActionBlock action,
+                                                                  SubscriptionEstablishedHandler establishedHandler) :
+        CHIPChannelChannelListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -7528,25 +7578,83 @@ class CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackSubscriptionBridg
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPSwitchGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<SwitchGeneratedCommandListListAttributeCallback>
+class CHIPChannelLineupStructAttributeCallbackBridge : public CHIPCallbackBridge<ChannelLineupStructAttributeCallback>
+{
+public:
+    CHIPChannelLineupStructAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                   bool keepAlive = false) :
+        CHIPCallbackBridge<ChannelLineupStructAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+
+    static void
+    OnSuccessFn(void * context,
+                const chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::LineupInfo::DecodableType> & value);
+};
+
+class CHIPChannelLineupStructAttributeCallbackSubscriptionBridge : public CHIPChannelLineupStructAttributeCallbackBridge
+{
+public:
+    CHIPChannelLineupStructAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                               CHIPActionBlock action,
+                                                               SubscriptionEstablishedHandler establishedHandler) :
+        CHIPChannelLineupStructAttributeCallbackBridge(queue, handler, action, true),
+        mEstablishedHandler(establishedHandler)
+    {}
+
+    static void OnSubscriptionEstablished(void * context);
+
+private:
+    SubscriptionEstablishedHandler mEstablishedHandler;
+};
+
+class CHIPChannelCurrentChannelStructAttributeCallbackBridge
+    : public CHIPCallbackBridge<ChannelCurrentChannelStructAttributeCallback>
+{
+public:
+    CHIPChannelCurrentChannelStructAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                           bool keepAlive = false) :
+        CHIPCallbackBridge<ChannelCurrentChannelStructAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+
+    static void
+    OnSuccessFn(void * context,
+                const chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> & value);
+};
+
+class CHIPChannelCurrentChannelStructAttributeCallbackSubscriptionBridge
+    : public CHIPChannelCurrentChannelStructAttributeCallbackBridge
+{
+public:
+    CHIPChannelCurrentChannelStructAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       CHIPActionBlock action,
+                                                                       SubscriptionEstablishedHandler establishedHandler) :
+        CHIPChannelCurrentChannelStructAttributeCallbackBridge(queue, handler, action, true),
+        mEstablishedHandler(establishedHandler)
+    {}
+
+    static void OnSubscriptionEstablished(void * context);
+
+private:
+    SubscriptionEstablishedHandler mEstablishedHandler;
+};
+
+class CHIPChannelGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ChannelGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPSwitchGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                              CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<SwitchGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPChannelGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                               CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ChannelGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPSwitchGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPSwitchGeneratedCommandListListAttributeCallbackBridge
+class CHIPChannelGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPChannelGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPSwitchGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          CHIPActionBlock action,
-                                                                          SubscriptionEstablishedHandler establishedHandler) :
-        CHIPSwitchGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPChannelGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                           CHIPActionBlock action,
+                                                                           SubscriptionEstablishedHandler establishedHandler) :
+        CHIPChannelGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -7556,25 +7664,25 @@ class CHIPSwitchGeneratedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPSwitchAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<SwitchAcceptedCommandListListAttributeCallback>
+class CHIPChannelAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ChannelAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPSwitchAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                             CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<SwitchAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPChannelAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                              CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ChannelAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPSwitchAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPSwitchAcceptedCommandListListAttributeCallbackBridge
+class CHIPChannelAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPChannelAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPSwitchAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                         CHIPActionBlock action,
-                                                                         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPSwitchAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPChannelAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                          CHIPActionBlock action,
+                                                                          SubscriptionEstablishedHandler establishedHandler) :
+        CHIPChannelAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -7584,23 +7692,23 @@ class CHIPSwitchAcceptedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPSwitchAttributeListListAttributeCallbackBridge : public CHIPCallbackBridge<SwitchAttributeListListAttributeCallback>
+class CHIPChannelAttributeListListAttributeCallbackBridge : public CHIPCallbackBridge<ChannelAttributeListListAttributeCallback>
 {
 public:
-    CHIPSwitchAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                       bool keepAlive = false) :
-        CHIPCallbackBridge<SwitchAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPChannelAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                        bool keepAlive = false) :
+        CHIPCallbackBridge<ChannelAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPSwitchAttributeListListAttributeCallbackSubscriptionBridge : public CHIPSwitchAttributeListListAttributeCallbackBridge
+class CHIPChannelAttributeListListAttributeCallbackSubscriptionBridge : public CHIPChannelAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPSwitchAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                   CHIPActionBlock action,
-                                                                   SubscriptionEstablishedHandler establishedHandler) :
-        CHIPSwitchAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPChannelAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                    CHIPActionBlock action,
+                                                                    SubscriptionEstablishedHandler establishedHandler) :
+        CHIPChannelAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -7727,26 +7835,27 @@ class CHIPTargetNavigatorAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<TemperatureMeasurementGeneratedCommandListListAttributeCallback>
+class CHIPMediaPlaybackSampledPositionStructAttributeCallbackBridge
+    : public CHIPCallbackBridge<MediaPlaybackSampledPositionStructAttributeCallback>
 {
 public:
-    CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                              CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<TemperatureMeasurementGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                            keepAlive){};
+    CHIPMediaPlaybackSampledPositionStructAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                  CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<MediaPlaybackSampledPositionStructAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(
+        void * context,
+        const chip::app::DataModel::Nullable<chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::DecodableType> & value);
 };
 
-class CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackBridge
+class CHIPMediaPlaybackSampledPositionStructAttributeCallbackSubscriptionBridge
+    : public CHIPMediaPlaybackSampledPositionStructAttributeCallbackBridge
 {
 public:
-    CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPMediaPlaybackSampledPositionStructAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                              CHIPActionBlock action,
+                                                                              SubscriptionEstablishedHandler establishedHandler) :
+        CHIPMediaPlaybackSampledPositionStructAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -7756,133 +7865,26 @@ class CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackSubscri
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<TemperatureMeasurementAcceptedCommandListListAttributeCallback>
+class CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<MediaPlaybackGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<TemperatureMeasurementAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                           keepAlive){};
+    CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                     CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<MediaPlaybackGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                   keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackBridge
-{
-public:
-    CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPTemperatureMeasurementAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<TemperatureMeasurementAttributeListListAttributeCallback>
-{
-public:
-    CHIPTemperatureMeasurementAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<TemperatureMeasurementAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                     keepAlive){};
-
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
-};
-
-class CHIPTemperatureMeasurementAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPTemperatureMeasurementAttributeListListAttributeCallbackBridge
+class CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPTemperatureMeasurementAttributeListListAttributeCallbackSubscriptionBridge(
+    CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTemperatureMeasurementAttributeListListAttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPTestClusterBitmap8AttributeCallbackBridge : public CHIPCallbackBridge<TestClusterBitmap8AttributeCallback>
-{
-public:
-    CHIPTestClusterBitmap8AttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                  bool keepAlive = false) :
-        CHIPCallbackBridge<TestClusterBitmap8AttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value);
-};
-
-class CHIPTestClusterBitmap8AttributeCallbackSubscriptionBridge : public CHIPTestClusterBitmap8AttributeCallbackBridge
-{
-public:
-    CHIPTestClusterBitmap8AttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                              CHIPActionBlock action,
-                                                              SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTestClusterBitmap8AttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPTestClusterBitmap16AttributeCallbackBridge : public CHIPCallbackBridge<TestClusterBitmap16AttributeCallback>
-{
-public:
-    CHIPTestClusterBitmap16AttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                   bool keepAlive = false) :
-        CHIPCallbackBridge<TestClusterBitmap16AttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value);
-};
-
-class CHIPTestClusterBitmap16AttributeCallbackSubscriptionBridge : public CHIPTestClusterBitmap16AttributeCallbackBridge
-{
-public:
-    CHIPTestClusterBitmap16AttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                               CHIPActionBlock action,
-                                                               SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTestClusterBitmap16AttributeCallbackBridge(queue, handler, action, true),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    static void OnSubscriptionEstablished(void * context);
-
-private:
-    SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class CHIPTestClusterBitmap32AttributeCallbackBridge : public CHIPCallbackBridge<TestClusterBitmap32AttributeCallback>
-{
-public:
-    CHIPTestClusterBitmap32AttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                   bool keepAlive = false) :
-        CHIPCallbackBridge<TestClusterBitmap32AttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
-    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value);
-};
-
-class CHIPTestClusterBitmap32AttributeCallbackSubscriptionBridge : public CHIPTestClusterBitmap32AttributeCallbackBridge
-{
-public:
-    CHIPTestClusterBitmap32AttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                               CHIPActionBlock action,
-                                                               SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTestClusterBitmap32AttributeCallbackBridge(queue, handler, action, true),
+        CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -7892,23 +7894,25 @@ class CHIPTestClusterBitmap32AttributeCallbackSubscriptionBridge : public CHIPTe
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPTestClusterBitmap64AttributeCallbackBridge : public CHIPCallbackBridge<TestClusterBitmap64AttributeCallback>
+class CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<MediaPlaybackAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPTestClusterBitmap64AttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                   bool keepAlive = false) :
-        CHIPCallbackBridge<TestClusterBitmap64AttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                    CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<MediaPlaybackAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPTestClusterBitmap64AttributeCallbackSubscriptionBridge : public CHIPTestClusterBitmap64AttributeCallbackBridge
+class CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPTestClusterBitmap64AttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                               CHIPActionBlock action,
-                                                               SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTestClusterBitmap64AttributeCallbackBridge(queue, handler, action, true),
+    CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                CHIPActionBlock action,
+                                                                                SubscriptionEstablishedHandler establishedHandler) :
+        CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -7918,23 +7922,25 @@ class CHIPTestClusterBitmap64AttributeCallbackSubscriptionBridge : public CHIPTe
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPTestClusterListInt8uListAttributeCallbackBridge : public CHIPCallbackBridge<TestClusterListInt8uListAttributeCallback>
+class CHIPMediaPlaybackAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<MediaPlaybackAttributeListListAttributeCallback>
 {
 public:
-    CHIPTestClusterListInt8uListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                        bool keepAlive = false) :
-        CHIPCallbackBridge<TestClusterListInt8uListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPMediaPlaybackAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                              CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<MediaPlaybackAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPTestClusterListInt8uListAttributeCallbackSubscriptionBridge : public CHIPTestClusterListInt8uListAttributeCallbackBridge
-{
-public:
-    CHIPTestClusterListInt8uListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                    CHIPActionBlock action,
-                                                                    SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTestClusterListInt8uListAttributeCallbackBridge(queue, handler, action, true),
+class CHIPMediaPlaybackAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPMediaPlaybackAttributeListListAttributeCallbackBridge
+{
+public:
+    CHIPMediaPlaybackAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                          CHIPActionBlock action,
+                                                                          SubscriptionEstablishedHandler establishedHandler) :
+        CHIPMediaPlaybackAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -7944,25 +7950,25 @@ class CHIPTestClusterListInt8uListAttributeCallbackSubscriptionBridge : public C
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPTestClusterListOctetStringListAttributeCallbackBridge
-    : public CHIPCallbackBridge<TestClusterListOctetStringListAttributeCallback>
+class CHIPMediaInputInputListListAttributeCallbackBridge : public CHIPCallbackBridge<MediaInputInputListListAttributeCallback>
 {
 public:
-    CHIPTestClusterListOctetStringListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                              CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<TestClusterListOctetStringListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPMediaInputInputListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                       bool keepAlive = false) :
+        CHIPCallbackBridge<MediaInputInputListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & value);
+    static void OnSuccessFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::InputInfo::DecodableType> & value);
 };
 
-class CHIPTestClusterListOctetStringListAttributeCallbackSubscriptionBridge
-    : public CHIPTestClusterListOctetStringListAttributeCallbackBridge
+class CHIPMediaInputInputListListAttributeCallbackSubscriptionBridge : public CHIPMediaInputInputListListAttributeCallbackBridge
 {
 public:
-    CHIPTestClusterListOctetStringListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          CHIPActionBlock action,
-                                                                          SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTestClusterListOctetStringListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPMediaInputInputListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                   CHIPActionBlock action,
+                                                                   SubscriptionEstablishedHandler establishedHandler) :
+        CHIPMediaInputInputListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -7972,28 +7978,25 @@ class CHIPTestClusterListOctetStringListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPTestClusterListStructOctetStringListAttributeCallbackBridge
-    : public CHIPCallbackBridge<TestClusterListStructOctetStringListAttributeCallback>
+class CHIPMediaInputGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<MediaInputGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPTestClusterListStructOctetStringListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                    CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<TestClusterListStructOctetStringListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPMediaInputGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                  CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<MediaInputGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType> &
-            value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPTestClusterListStructOctetStringListAttributeCallbackSubscriptionBridge
-    : public CHIPTestClusterListStructOctetStringListAttributeCallbackBridge
+class CHIPMediaInputGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPMediaInputGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPTestClusterListStructOctetStringListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                CHIPActionBlock action,
-                                                                                SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTestClusterListStructOctetStringListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPMediaInputGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                              CHIPActionBlock action,
+                                                                              SubscriptionEstablishedHandler establishedHandler) :
+        CHIPMediaInputGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8003,28 +8006,25 @@ class CHIPTestClusterListStructOctetStringListAttributeCallbackSubscriptionBridg
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackBridge
-    : public CHIPCallbackBridge<TestClusterListNullablesAndOptionalsStructListAttributeCallback>
+class CHIPMediaInputAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<MediaInputAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                              CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<TestClusterListNullablesAndOptionalsStructListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                            keepAlive){};
+    CHIPMediaInputAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                 CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<MediaInputAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::DecodableList<
-                                chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::DecodableType> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackSubscriptionBridge
-    : public CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackBridge
+class CHIPMediaInputAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPMediaInputAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPMediaInputAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                             CHIPActionBlock action,
+                                                                             SubscriptionEstablishedHandler establishedHandler) :
+        CHIPMediaInputAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8034,25 +8034,25 @@ class CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackSubscri
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPTestClusterStructAttrStructAttributeCallbackBridge
-    : public CHIPCallbackBridge<TestClusterStructAttrStructAttributeCallback>
+class CHIPMediaInputAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<MediaInputAttributeListListAttributeCallback>
 {
 public:
-    CHIPTestClusterStructAttrStructAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+    CHIPMediaInputAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
                                                            bool keepAlive = false) :
-        CHIPCallbackBridge<TestClusterStructAttrStructAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+        CHIPCallbackBridge<MediaInputAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPTestClusterStructAttrStructAttributeCallbackSubscriptionBridge
-    : public CHIPTestClusterStructAttrStructAttributeCallbackBridge
+class CHIPMediaInputAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPMediaInputAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPTestClusterStructAttrStructAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPMediaInputAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                        CHIPActionBlock action,
                                                                        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTestClusterStructAttrStructAttributeCallbackBridge(queue, handler, action, true),
+        CHIPMediaInputAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8062,25 +8062,25 @@ class CHIPTestClusterStructAttrStructAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPTestClusterListLongOctetStringListAttributeCallbackBridge
-    : public CHIPCallbackBridge<TestClusterListLongOctetStringListAttributeCallback>
+class CHIPLowPowerGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<LowPowerGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPTestClusterListLongOctetStringListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                  CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<TestClusterListLongOctetStringListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPLowPowerGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<LowPowerGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPTestClusterListLongOctetStringListAttributeCallbackSubscriptionBridge
-    : public CHIPTestClusterListLongOctetStringListAttributeCallbackBridge
+class CHIPLowPowerGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPLowPowerGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPTestClusterListLongOctetStringListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                              CHIPActionBlock action,
-                                                                              SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTestClusterListLongOctetStringListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPLowPowerGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                            CHIPActionBlock action,
+                                                                            SubscriptionEstablishedHandler establishedHandler) :
+        CHIPLowPowerGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8090,28 +8090,25 @@ class CHIPTestClusterListLongOctetStringListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPTestClusterListFabricScopedListAttributeCallbackBridge
-    : public CHIPCallbackBridge<TestClusterListFabricScopedListAttributeCallback>
+class CHIPLowPowerAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<LowPowerAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPTestClusterListFabricScopedListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPLowPowerAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<TestClusterListFabricScopedListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+        CHIPCallbackBridge<LowPowerAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestFabricScoped::DecodableType> &
-            value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPTestClusterListFabricScopedListAttributeCallbackSubscriptionBridge
-    : public CHIPTestClusterListFabricScopedListAttributeCallbackBridge
+class CHIPLowPowerAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPLowPowerAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPTestClusterListFabricScopedListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPLowPowerAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                            CHIPActionBlock action,
                                                                            SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTestClusterListFabricScopedListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPLowPowerAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8121,26 +8118,23 @@ class CHIPTestClusterListFabricScopedListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPTestClusterNullableBitmap8AttributeCallbackBridge : public CHIPCallbackBridge<TestClusterNullableBitmap8AttributeCallback>
+class CHIPLowPowerAttributeListListAttributeCallbackBridge : public CHIPCallbackBridge<LowPowerAttributeListListAttributeCallback>
 {
 public:
-    CHIPTestClusterNullableBitmap8AttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                          bool keepAlive = false) :
-        CHIPCallbackBridge<TestClusterNullableBitmap8AttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPLowPowerAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                         bool keepAlive = false) :
+        CHIPCallbackBridge<LowPowerAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void
-    OnSuccessFn(void * context,
-                const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPTestClusterNullableBitmap8AttributeCallbackSubscriptionBridge
-    : public CHIPTestClusterNullableBitmap8AttributeCallbackBridge
+class CHIPLowPowerAttributeListListAttributeCallbackSubscriptionBridge : public CHIPLowPowerAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPTestClusterNullableBitmap8AttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                      CHIPActionBlock action,
-                                                                      SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTestClusterNullableBitmap8AttributeCallbackBridge(queue, handler, action, true),
+    CHIPLowPowerAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                     CHIPActionBlock action,
+                                                                     SubscriptionEstablishedHandler establishedHandler) :
+        CHIPLowPowerAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8150,27 +8144,25 @@ class CHIPTestClusterNullableBitmap8AttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPTestClusterNullableBitmap16AttributeCallbackBridge
-    : public CHIPCallbackBridge<TestClusterNullableBitmap16AttributeCallback>
+class CHIPKeypadInputGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<KeypadInputGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPTestClusterNullableBitmap16AttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                           bool keepAlive = false) :
-        CHIPCallbackBridge<TestClusterNullableBitmap16AttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPKeypadInputGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                   CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<KeypadInputGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void
-    OnSuccessFn(void * context,
-                const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPTestClusterNullableBitmap16AttributeCallbackSubscriptionBridge
-    : public CHIPTestClusterNullableBitmap16AttributeCallbackBridge
+class CHIPKeypadInputGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPKeypadInputGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPTestClusterNullableBitmap16AttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       CHIPActionBlock action,
-                                                                       SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTestClusterNullableBitmap16AttributeCallbackBridge(queue, handler, action, true),
+    CHIPKeypadInputGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                               CHIPActionBlock action,
+                                                                               SubscriptionEstablishedHandler establishedHandler) :
+        CHIPKeypadInputGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8180,27 +8172,25 @@ class CHIPTestClusterNullableBitmap16AttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPTestClusterNullableBitmap32AttributeCallbackBridge
-    : public CHIPCallbackBridge<TestClusterNullableBitmap32AttributeCallback>
+class CHIPKeypadInputAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<KeypadInputAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPTestClusterNullableBitmap32AttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                           bool keepAlive = false) :
-        CHIPCallbackBridge<TestClusterNullableBitmap32AttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPKeypadInputAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                  CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<KeypadInputAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void
-    OnSuccessFn(void * context,
-                const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPTestClusterNullableBitmap32AttributeCallbackSubscriptionBridge
-    : public CHIPTestClusterNullableBitmap32AttributeCallbackBridge
+class CHIPKeypadInputAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPKeypadInputAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPTestClusterNullableBitmap32AttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       CHIPActionBlock action,
-                                                                       SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTestClusterNullableBitmap32AttributeCallbackBridge(queue, handler, action, true),
+    CHIPKeypadInputAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                              CHIPActionBlock action,
+                                                                              SubscriptionEstablishedHandler establishedHandler) :
+        CHIPKeypadInputAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8210,27 +8200,25 @@ class CHIPTestClusterNullableBitmap32AttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPTestClusterNullableBitmap64AttributeCallbackBridge
-    : public CHIPCallbackBridge<TestClusterNullableBitmap64AttributeCallback>
+class CHIPKeypadInputAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<KeypadInputAttributeListListAttributeCallback>
 {
 public:
-    CHIPTestClusterNullableBitmap64AttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                           bool keepAlive = false) :
-        CHIPCallbackBridge<TestClusterNullableBitmap64AttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPKeypadInputAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                            bool keepAlive = false) :
+        CHIPCallbackBridge<KeypadInputAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void
-    OnSuccessFn(void * context,
-                const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPTestClusterNullableBitmap64AttributeCallbackSubscriptionBridge
-    : public CHIPTestClusterNullableBitmap64AttributeCallbackBridge
+class CHIPKeypadInputAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPKeypadInputAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPTestClusterNullableBitmap64AttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       CHIPActionBlock action,
-                                                                       SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTestClusterNullableBitmap64AttributeCallbackBridge(queue, handler, action, true),
+    CHIPKeypadInputAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                        CHIPActionBlock action,
+                                                                        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPKeypadInputAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8240,27 +8228,25 @@ class CHIPTestClusterNullableBitmap64AttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPTestClusterNullableStructStructAttributeCallbackBridge
-    : public CHIPCallbackBridge<TestClusterNullableStructStructAttributeCallback>
+class CHIPContentLauncherAcceptHeaderListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ContentLauncherAcceptHeaderListAttributeCallback>
 {
 public:
-    CHIPTestClusterNullableStructStructAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPContentLauncherAcceptHeaderListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<TestClusterNullableStructStructAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+        CHIPCallbackBridge<ContentLauncherAcceptHeaderListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(
-        void * context,
-        const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CharSpan> & value);
 };
 
-class CHIPTestClusterNullableStructStructAttributeCallbackSubscriptionBridge
-    : public CHIPTestClusterNullableStructStructAttributeCallbackBridge
+class CHIPContentLauncherAcceptHeaderListAttributeCallbackSubscriptionBridge
+    : public CHIPContentLauncherAcceptHeaderListAttributeCallbackBridge
 {
 public:
-    CHIPTestClusterNullableStructStructAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPContentLauncherAcceptHeaderListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                            CHIPActionBlock action,
                                                                            SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTestClusterNullableStructStructAttributeCallbackBridge(queue, handler, action, true),
+        CHIPContentLauncherAcceptHeaderListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8270,25 +8256,26 @@ class CHIPTestClusterNullableStructStructAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPTestClusterGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<TestClusterGeneratedCommandListListAttributeCallback>
+class CHIPContentLauncherGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ContentLauncherGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPTestClusterGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                   CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<TestClusterGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPContentLauncherGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ContentLauncherGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                     keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPTestClusterGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPTestClusterGeneratedCommandListListAttributeCallbackBridge
+class CHIPContentLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPContentLauncherGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPTestClusterGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                               CHIPActionBlock action,
-                                                                               SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTestClusterGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPContentLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPContentLauncherGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8298,25 +8285,26 @@ class CHIPTestClusterGeneratedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPTestClusterAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<TestClusterAcceptedCommandListListAttributeCallback>
+class CHIPContentLauncherAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ContentLauncherAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPTestClusterAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                  CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<TestClusterAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPContentLauncherAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                      CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ContentLauncherAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                    keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPTestClusterAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPTestClusterAcceptedCommandListListAttributeCallbackBridge
+class CHIPContentLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPContentLauncherAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPTestClusterAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                              CHIPActionBlock action,
-                                                                              SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTestClusterAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPContentLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPContentLauncherAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8326,25 +8314,25 @@ class CHIPTestClusterAcceptedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPTestClusterAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<TestClusterAttributeListListAttributeCallback>
+class CHIPContentLauncherAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ContentLauncherAttributeListListAttributeCallback>
 {
 public:
-    CHIPTestClusterAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                            bool keepAlive = false) :
-        CHIPCallbackBridge<TestClusterAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPContentLauncherAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ContentLauncherAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPTestClusterAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPTestClusterAttributeListListAttributeCallbackBridge
+class CHIPContentLauncherAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPContentLauncherAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPTestClusterAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                        CHIPActionBlock action,
-                                                                        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTestClusterAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPContentLauncherAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                            CHIPActionBlock action,
+                                                                            SubscriptionEstablishedHandler establishedHandler) :
+        CHIPContentLauncherAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8354,25 +8342,25 @@ class CHIPTestClusterAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPThermostatGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ThermostatGeneratedCommandListListAttributeCallback>
+class CHIPAudioOutputOutputListListAttributeCallbackBridge : public CHIPCallbackBridge<AudioOutputOutputListListAttributeCallback>
 {
 public:
-    CHIPThermostatGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                  CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ThermostatGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPAudioOutputOutputListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                         bool keepAlive = false) :
+        CHIPCallbackBridge<AudioOutputOutputListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::OutputInfo::DecodableType> & value);
 };
 
-class CHIPThermostatGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPThermostatGeneratedCommandListListAttributeCallbackBridge
+class CHIPAudioOutputOutputListListAttributeCallbackSubscriptionBridge : public CHIPAudioOutputOutputListListAttributeCallbackBridge
 {
 public:
-    CHIPThermostatGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                              CHIPActionBlock action,
-                                                                              SubscriptionEstablishedHandler establishedHandler) :
-        CHIPThermostatGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPAudioOutputOutputListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                     CHIPActionBlock action,
+                                                                     SubscriptionEstablishedHandler establishedHandler) :
+        CHIPAudioOutputOutputListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8382,25 +8370,25 @@ class CHIPThermostatGeneratedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPThermostatAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ThermostatAcceptedCommandListListAttributeCallback>
+class CHIPAudioOutputGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<AudioOutputGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPThermostatAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ThermostatAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPAudioOutputGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                   CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<AudioOutputGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPThermostatAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPThermostatAcceptedCommandListListAttributeCallbackBridge
+class CHIPAudioOutputGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPAudioOutputGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPThermostatAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             CHIPActionBlock action,
-                                                                             SubscriptionEstablishedHandler establishedHandler) :
-        CHIPThermostatAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPAudioOutputGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                               CHIPActionBlock action,
+                                                                               SubscriptionEstablishedHandler establishedHandler) :
+        CHIPAudioOutputGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8410,25 +8398,25 @@ class CHIPThermostatAcceptedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPThermostatAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ThermostatAttributeListListAttributeCallback>
+class CHIPAudioOutputAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<AudioOutputAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPThermostatAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                           bool keepAlive = false) :
-        CHIPCallbackBridge<ThermostatAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPAudioOutputAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                  CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<AudioOutputAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPThermostatAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPThermostatAttributeListListAttributeCallbackBridge
+class CHIPAudioOutputAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPAudioOutputAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPThermostatAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       CHIPActionBlock action,
-                                                                       SubscriptionEstablishedHandler establishedHandler) :
-        CHIPThermostatAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPAudioOutputAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                              CHIPActionBlock action,
+                                                                              SubscriptionEstablishedHandler establishedHandler) :
+        CHIPAudioOutputAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8438,28 +8426,25 @@ class CHIPThermostatAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallback>
+class CHIPAudioOutputAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<AudioOutputAttributeListListAttributeCallback>
 {
 public:
-    CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue,
-                                                                                            ResponseHandler handler,
-                                                                                            CHIPActionBlock action,
-                                                                                            bool keepAlive = false) :
-        CHIPCallbackBridge<ThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallback>(queue, handler, action,
-                                                                                                          OnSuccessFn, keepAlive){};
+    CHIPAudioOutputAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                            bool keepAlive = false) :
+        CHIPCallbackBridge<AudioOutputAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackBridge
+class CHIPAudioOutputAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPAudioOutputAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPAudioOutputAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                        CHIPActionBlock action,
+                                                                        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPAudioOutputAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8469,28 +8454,25 @@ class CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeC
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallback>
+class CHIPApplicationLauncherCatalogListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ApplicationLauncherCatalogListListAttributeCallback>
 {
 public:
-    CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue,
-                                                                                           ResponseHandler handler,
-                                                                                           CHIPActionBlock action,
-                                                                                           bool keepAlive = false) :
-        CHIPCallbackBridge<ThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallback>(queue, handler, action,
-                                                                                                         OnSuccessFn, keepAlive){};
+    CHIPApplicationLauncherCatalogListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                  CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ApplicationLauncherCatalogListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<uint16_t> & value);
 };
 
-class CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackBridge
+class CHIPApplicationLauncherCatalogListListAttributeCallbackSubscriptionBridge
+    : public CHIPApplicationLauncherCatalogListListAttributeCallbackBridge
 {
 public:
-    CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPApplicationLauncherCatalogListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                              CHIPActionBlock action,
+                                                                              SubscriptionEstablishedHandler establishedHandler) :
+        CHIPApplicationLauncherCatalogListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8500,28 +8482,28 @@ class CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCa
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ThermostatUserInterfaceConfigurationAttributeListListAttributeCallback>
+class CHIPApplicationLauncherCurrentAppStructAttributeCallbackBridge
+    : public CHIPCallbackBridge<ApplicationLauncherCurrentAppStructAttributeCallback>
 {
 public:
-    CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackBridge(dispatch_queue_t queue,
-                                                                                     ResponseHandler handler,
-                                                                                     CHIPActionBlock action,
-                                                                                     bool keepAlive = false) :
-        CHIPCallbackBridge<ThermostatUserInterfaceConfigurationAttributeListListAttributeCallback>(queue, handler, action,
-                                                                                                   OnSuccessFn, keepAlive){};
+    CHIPApplicationLauncherCurrentAppStructAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                   CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ApplicationLauncherCurrentAppStructAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(
+        void * context,
+        const chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::DecodableType> &
+            value);
 };
 
-class CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackBridge
+class CHIPApplicationLauncherCurrentAppStructAttributeCallbackSubscriptionBridge
+    : public CHIPApplicationLauncherCurrentAppStructAttributeCallbackBridge
 {
 public:
-    CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPApplicationLauncherCurrentAppStructAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                               CHIPActionBlock action,
+                                                                               SubscriptionEstablishedHandler establishedHandler) :
+        CHIPApplicationLauncherCurrentAppStructAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8531,28 +8513,26 @@ class CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallback
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ThreadNetworkDiagnosticsNeighborTableListListAttributeCallback>
+class CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ApplicationLauncherGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ThreadNetworkDiagnosticsNeighborTableListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                           keepAlive){};
+    CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                           CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ApplicationLauncherGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                         keepAlive){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::DecodableList<
-                                chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackSubscriptionBridge
-    : public CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackBridge
+class CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackSubscriptionBridge(
+    CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8562,28 +8542,26 @@ class CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackSubscrip
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ThreadNetworkDiagnosticsRouteTableListListAttributeCallback>
+class CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ApplicationLauncherAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                           CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ThreadNetworkDiagnosticsRouteTableListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+        CHIPCallbackBridge<ApplicationLauncherAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
                                                                                         keepAlive){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::DecodableList<
-                                chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackSubscriptionBridge
-    : public CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackBridge
+class CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackSubscriptionBridge(
+    CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8593,28 +8571,25 @@ class CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackSubscriptio
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge
-    : public CHIPCallbackBridge<ThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallback>
+class CHIPApplicationLauncherAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ApplicationLauncherAttributeListListAttributeCallback>
 {
 public:
-    CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                            CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                          keepAlive){};
+    CHIPApplicationLauncherAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                    CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ApplicationLauncherAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<
-                                chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackSubscriptionBridge
-    : public CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge
+class CHIPApplicationLauncherAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPApplicationLauncherAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge(queue, handler, action, true),
+    CHIPApplicationLauncherAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                CHIPActionBlock action,
+                                                                                SubscriptionEstablishedHandler establishedHandler) :
+        CHIPApplicationLauncherAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8624,31 +8599,27 @@ class CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackSubscript
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge
-    : public CHIPCallbackBridge<ThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallback>
+class CHIPApplicationBasicApplicationStructAttributeCallbackBridge
+    : public CHIPCallbackBridge<ApplicationBasicApplicationStructAttributeCallback>
 {
 public:
-    CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge(dispatch_queue_t queue,
-                                                                                          ResponseHandler handler,
-                                                                                          CHIPActionBlock action,
-                                                                                          bool keepAlive = false) :
-        CHIPCallbackBridge<ThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallback>(queue, handler, action,
-                                                                                                        OnSuccessFn, keepAlive){};
+    CHIPApplicationBasicApplicationStructAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                 CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ApplicationBasicApplicationStructAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void
     OnSuccessFn(void * context,
-                const chip::app::DataModel::Nullable<
-                    chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> & value);
+                const chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::DecodableType & value);
 };
 
-class CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackSubscriptionBridge
-    : public CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge
+class CHIPApplicationBasicApplicationStructAttributeCallbackSubscriptionBridge
+    : public CHIPApplicationBasicApplicationStructAttributeCallbackBridge
 {
 public:
-    CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge(queue, handler, action, true),
+    CHIPApplicationBasicApplicationStructAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                             CHIPActionBlock action,
+                                                                             SubscriptionEstablishedHandler establishedHandler) :
+        CHIPApplicationBasicApplicationStructAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8658,28 +8629,26 @@ class CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCal
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback>
+class CHIPApplicationBasicAllowedVendorListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ApplicationBasicAllowedVendorListListAttributeCallback>
 {
 public:
-    CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                   CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback>(queue, handler, action,
-                                                                                                 OnSuccessFn, keepAlive){};
+    CHIPApplicationBasicAllowedVendorListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                     CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ApplicationBasicAllowedVendorListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                   keepAlive){};
 
-    static void
-    OnSuccessFn(void * context,
-                const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::VendorId> & value);
 };
 
-class CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackSubscriptionBridge
-    : public CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackBridge
+class CHIPApplicationBasicAllowedVendorListListAttributeCallbackSubscriptionBridge
+    : public CHIPApplicationBasicAllowedVendorListListAttributeCallbackBridge
 {
 public:
-    CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackSubscriptionBridge(
+    CHIPApplicationBasicAllowedVendorListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPApplicationBasicAllowedVendorListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8689,26 +8658,26 @@ class CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackSu
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallback>
+class CHIPApplicationBasicGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ApplicationBasicGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                              keepAlive){};
+    CHIPApplicationBasicGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                        CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ApplicationBasicGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                      keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge
+class CHIPApplicationBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPApplicationBasicGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPApplicationBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPApplicationBasicGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8718,26 +8687,26 @@ class CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubsc
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallback>
+class CHIPApplicationBasicAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ApplicationBasicAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                               CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                             keepAlive){};
+    CHIPApplicationBasicAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ApplicationBasicAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                     keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge
+class CHIPApplicationBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPApplicationBasicAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPApplicationBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPApplicationBasicAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8747,26 +8716,25 @@ class CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscr
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<ThreadNetworkDiagnosticsAttributeListListAttributeCallback>
+class CHIPApplicationBasicAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ApplicationBasicAttributeListListAttributeCallback>
 {
 public:
-    CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                         CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<ThreadNetworkDiagnosticsAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                       keepAlive){};
+    CHIPApplicationBasicAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                 CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ApplicationBasicAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackBridge
+class CHIPApplicationBasicAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPApplicationBasicAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPApplicationBasicAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                             CHIPActionBlock action,
+                                                                             SubscriptionEstablishedHandler establishedHandler) :
+        CHIPApplicationBasicAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8776,28 +8744,25 @@ class CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackSubscription
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackBridge
-    : public CHIPCallbackBridge<TimeFormatLocalizationSupportedCalendarTypesListAttributeCallback>
+class CHIPAccountLoginGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<AccountLoginGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<TimeFormatLocalizationSupportedCalendarTypesListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                              keepAlive){};
+    CHIPAccountLoginGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                    CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<AccountLoginGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void
-    OnSuccessFn(void * context,
-                const chip::app::DataModel::DecodableList<chip::app::Clusters::TimeFormatLocalization::CalendarType> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackSubscriptionBridge
-    : public CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackBridge
+class CHIPAccountLoginGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPAccountLoginGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPAccountLoginGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                CHIPActionBlock action,
+                                                                                SubscriptionEstablishedHandler establishedHandler) :
+        CHIPAccountLoginGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8807,26 +8772,25 @@ class CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackSubsc
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<TimeFormatLocalizationGeneratedCommandListListAttributeCallback>
+class CHIPAccountLoginAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<AccountLoginAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                              CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<TimeFormatLocalizationGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                            keepAlive){};
+    CHIPAccountLoginAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                   CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<AccountLoginAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackBridge
+class CHIPAccountLoginAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPAccountLoginAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPAccountLoginAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                               CHIPActionBlock action,
+                                                                               SubscriptionEstablishedHandler establishedHandler) :
+        CHIPAccountLoginAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8836,26 +8800,25 @@ class CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackSubscri
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<TimeFormatLocalizationAcceptedCommandListListAttributeCallback>
+class CHIPAccountLoginAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<AccountLoginAttributeListListAttributeCallback>
 {
 public:
-    CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<TimeFormatLocalizationAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                           keepAlive){};
+    CHIPAccountLoginAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                             CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<AccountLoginAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackBridge
+class CHIPAccountLoginAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPAccountLoginAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPAccountLoginAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                         CHIPActionBlock action,
+                                                                         SubscriptionEstablishedHandler establishedHandler) :
+        CHIPAccountLoginAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8865,26 +8828,26 @@ class CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackSubscrip
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPTimeFormatLocalizationAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<TimeFormatLocalizationAttributeListListAttributeCallback>
+class CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ElectricalMeasurementGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPTimeFormatLocalizationAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<TimeFormatLocalizationAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                     keepAlive){};
+    CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                             CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ElectricalMeasurementGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                           keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPTimeFormatLocalizationAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPTimeFormatLocalizationAttributeListListAttributeCallbackBridge
+class CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPTimeFormatLocalizationAttributeListListAttributeCallbackSubscriptionBridge(
+    CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPTimeFormatLocalizationAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8894,26 +8857,26 @@ class CHIPTimeFormatLocalizationAttributeListListAttributeCallbackSubscriptionBr
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<UnitLocalizationGeneratedCommandListListAttributeCallback>
+class CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ElectricalMeasurementAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                        CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<UnitLocalizationGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                      keepAlive){};
+    CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                            CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ElectricalMeasurementAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                          keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackBridge
+class CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8923,26 +8886,26 @@ class CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackSubscriptionB
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<UnitLocalizationAcceptedCommandListListAttributeCallback>
+class CHIPElectricalMeasurementAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<ElectricalMeasurementAttributeListListAttributeCallback>
 {
 public:
-    CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<UnitLocalizationAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                     keepAlive){};
+    CHIPElectricalMeasurementAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                      CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<ElectricalMeasurementAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                    keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackBridge
+class CHIPElectricalMeasurementAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPElectricalMeasurementAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    CHIPElectricalMeasurementAttributeListListAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
         SubscriptionEstablishedHandler establishedHandler) :
-        CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+        CHIPElectricalMeasurementAttributeListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8952,25 +8915,23 @@ class CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBr
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPUnitLocalizationAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<UnitLocalizationAttributeListListAttributeCallback>
+class CHIPTestClusterBitmap8AttributeCallbackBridge : public CHIPCallbackBridge<TestClusterBitmap8AttributeCallback>
 {
 public:
-    CHIPUnitLocalizationAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<UnitLocalizationAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPTestClusterBitmap8AttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                  bool keepAlive = false) :
+        CHIPCallbackBridge<TestClusterBitmap8AttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value);
 };
 
-class CHIPUnitLocalizationAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPUnitLocalizationAttributeListListAttributeCallbackBridge
+class CHIPTestClusterBitmap8AttributeCallbackSubscriptionBridge : public CHIPTestClusterBitmap8AttributeCallbackBridge
 {
 public:
-    CHIPUnitLocalizationAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             CHIPActionBlock action,
-                                                                             SubscriptionEstablishedHandler establishedHandler) :
-        CHIPUnitLocalizationAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPTestClusterBitmap8AttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                              CHIPActionBlock action,
+                                                              SubscriptionEstablishedHandler establishedHandler) :
+        CHIPTestClusterBitmap8AttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -8980,25 +8941,23 @@ class CHIPUnitLocalizationAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPUserLabelLabelListListAttributeCallbackBridge : public CHIPCallbackBridge<UserLabelLabelListListAttributeCallback>
+class CHIPTestClusterBitmap16AttributeCallbackBridge : public CHIPCallbackBridge<TestClusterBitmap16AttributeCallback>
 {
 public:
-    CHIPUserLabelLabelListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                      bool keepAlive = false) :
-        CHIPCallbackBridge<UserLabelLabelListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPTestClusterBitmap16AttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                   bool keepAlive = false) :
+        CHIPCallbackBridge<TestClusterBitmap16AttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::UserLabel::Structs::LabelStruct::DecodableType> & value);
+    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value);
 };
 
-class CHIPUserLabelLabelListListAttributeCallbackSubscriptionBridge : public CHIPUserLabelLabelListListAttributeCallbackBridge
+class CHIPTestClusterBitmap16AttributeCallbackSubscriptionBridge : public CHIPTestClusterBitmap16AttributeCallbackBridge
 {
 public:
-    CHIPUserLabelLabelListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                  CHIPActionBlock action,
-                                                                  SubscriptionEstablishedHandler establishedHandler) :
-        CHIPUserLabelLabelListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPTestClusterBitmap16AttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                               CHIPActionBlock action,
+                                                               SubscriptionEstablishedHandler establishedHandler) :
+        CHIPTestClusterBitmap16AttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -9008,25 +8967,23 @@ class CHIPUserLabelLabelListListAttributeCallbackSubscriptionBridge : public CHI
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPUserLabelGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<UserLabelGeneratedCommandListListAttributeCallback>
+class CHIPTestClusterBitmap32AttributeCallbackBridge : public CHIPCallbackBridge<TestClusterBitmap32AttributeCallback>
 {
 public:
-    CHIPUserLabelGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<UserLabelGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPTestClusterBitmap32AttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                   bool keepAlive = false) :
+        CHIPCallbackBridge<TestClusterBitmap32AttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value);
 };
 
-class CHIPUserLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPUserLabelGeneratedCommandListListAttributeCallbackBridge
+class CHIPTestClusterBitmap32AttributeCallbackSubscriptionBridge : public CHIPTestClusterBitmap32AttributeCallbackBridge
 {
 public:
-    CHIPUserLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             CHIPActionBlock action,
-                                                                             SubscriptionEstablishedHandler establishedHandler) :
-        CHIPUserLabelGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPTestClusterBitmap32AttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                               CHIPActionBlock action,
+                                                               SubscriptionEstablishedHandler establishedHandler) :
+        CHIPTestClusterBitmap32AttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -9036,25 +8993,23 @@ class CHIPUserLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPUserLabelAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<UserLabelAcceptedCommandListListAttributeCallback>
+class CHIPTestClusterBitmap64AttributeCallbackBridge : public CHIPCallbackBridge<TestClusterBitmap64AttributeCallback>
 {
 public:
-    CHIPUserLabelAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<UserLabelAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPTestClusterBitmap64AttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                   bool keepAlive = false) :
+        CHIPCallbackBridge<TestClusterBitmap64AttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value);
 };
 
-class CHIPUserLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPUserLabelAcceptedCommandListListAttributeCallbackBridge
+class CHIPTestClusterBitmap64AttributeCallbackSubscriptionBridge : public CHIPTestClusterBitmap64AttributeCallbackBridge
 {
 public:
-    CHIPUserLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                            CHIPActionBlock action,
-                                                                            SubscriptionEstablishedHandler establishedHandler) :
-        CHIPUserLabelAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPTestClusterBitmap64AttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                               CHIPActionBlock action,
+                                                               SubscriptionEstablishedHandler establishedHandler) :
+        CHIPTestClusterBitmap64AttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -9064,24 +9019,23 @@ class CHIPUserLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPUserLabelAttributeListListAttributeCallbackBridge : public CHIPCallbackBridge<UserLabelAttributeListListAttributeCallback>
+class CHIPTestClusterListInt8uListAttributeCallbackBridge : public CHIPCallbackBridge<TestClusterListInt8uListAttributeCallback>
 {
 public:
-    CHIPUserLabelAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                          bool keepAlive = false) :
-        CHIPCallbackBridge<UserLabelAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPTestClusterListInt8uListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                        bool keepAlive = false) :
+        CHIPCallbackBridge<TestClusterListInt8uListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & value);
 };
 
-class CHIPUserLabelAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPUserLabelAttributeListListAttributeCallbackBridge
+class CHIPTestClusterListInt8uListAttributeCallbackSubscriptionBridge : public CHIPTestClusterListInt8uListAttributeCallbackBridge
 {
 public:
-    CHIPUserLabelAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                      CHIPActionBlock action,
-                                                                      SubscriptionEstablishedHandler establishedHandler) :
-        CHIPUserLabelAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPTestClusterListInt8uListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                    CHIPActionBlock action,
+                                                                    SubscriptionEstablishedHandler establishedHandler) :
+        CHIPTestClusterListInt8uListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -9091,25 +9045,25 @@ class CHIPUserLabelAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPWakeOnLanGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<WakeOnLanGeneratedCommandListListAttributeCallback>
+class CHIPTestClusterListOctetStringListAttributeCallbackBridge
+    : public CHIPCallbackBridge<TestClusterListOctetStringListAttributeCallback>
 {
 public:
-    CHIPWakeOnLanGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<WakeOnLanGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPTestClusterListOctetStringListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                              CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<TestClusterListOctetStringListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & value);
 };
 
-class CHIPWakeOnLanGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPWakeOnLanGeneratedCommandListListAttributeCallbackBridge
+class CHIPTestClusterListOctetStringListAttributeCallbackSubscriptionBridge
+    : public CHIPTestClusterListOctetStringListAttributeCallbackBridge
 {
 public:
-    CHIPWakeOnLanGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             CHIPActionBlock action,
-                                                                             SubscriptionEstablishedHandler establishedHandler) :
-        CHIPWakeOnLanGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPTestClusterListOctetStringListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                          CHIPActionBlock action,
+                                                                          SubscriptionEstablishedHandler establishedHandler) :
+        CHIPTestClusterListOctetStringListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -9119,25 +9073,28 @@ class CHIPWakeOnLanGeneratedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPWakeOnLanAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<WakeOnLanAcceptedCommandListListAttributeCallback>
+class CHIPTestClusterListStructOctetStringListAttributeCallbackBridge
+    : public CHIPCallbackBridge<TestClusterListStructOctetStringListAttributeCallback>
 {
 public:
-    CHIPWakeOnLanAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<WakeOnLanAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPTestClusterListStructOctetStringListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                    CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<TestClusterListStructOctetStringListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType> &
+            value);
 };
 
-class CHIPWakeOnLanAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPWakeOnLanAcceptedCommandListListAttributeCallbackBridge
+class CHIPTestClusterListStructOctetStringListAttributeCallbackSubscriptionBridge
+    : public CHIPTestClusterListStructOctetStringListAttributeCallbackBridge
 {
 public:
-    CHIPWakeOnLanAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                            CHIPActionBlock action,
-                                                                            SubscriptionEstablishedHandler establishedHandler) :
-        CHIPWakeOnLanAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPTestClusterListStructOctetStringListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                CHIPActionBlock action,
+                                                                                SubscriptionEstablishedHandler establishedHandler) :
+        CHIPTestClusterListStructOctetStringListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -9147,24 +9104,28 @@ class CHIPWakeOnLanAcceptedCommandListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPWakeOnLanAttributeListListAttributeCallbackBridge : public CHIPCallbackBridge<WakeOnLanAttributeListListAttributeCallback>
+class CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackBridge
+    : public CHIPCallbackBridge<TestClusterListNullablesAndOptionalsStructListAttributeCallback>
 {
 public:
-    CHIPWakeOnLanAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                          bool keepAlive = false) :
-        CHIPCallbackBridge<WakeOnLanAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                              CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<TestClusterListNullablesAndOptionalsStructListAttributeCallback>(queue, handler, action, OnSuccessFn,
+                                                                                            keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context,
+                            const chip::app::DataModel::DecodableList<
+                                chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::DecodableType> & value);
 };
 
-class CHIPWakeOnLanAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPWakeOnLanAttributeListListAttributeCallbackBridge
+class CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackSubscriptionBridge
+    : public CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackBridge
 {
 public:
-    CHIPWakeOnLanAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                      CHIPActionBlock action,
-                                                                      SubscriptionEstablishedHandler establishedHandler) :
-        CHIPWakeOnLanAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -9174,26 +9135,25 @@ class CHIPWakeOnLanAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<WiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallback>
+class CHIPTestClusterStructAttrStructAttributeCallbackBridge
+    : public CHIPCallbackBridge<TestClusterStructAttrStructAttributeCallback>
 {
 public:
-    CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                              CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<WiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                            keepAlive){};
+    CHIPTestClusterStructAttrStructAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                           bool keepAlive = false) :
+        CHIPCallbackBridge<TestClusterStructAttrStructAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType & value);
 };
 
-class CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge
+class CHIPTestClusterStructAttrStructAttributeCallbackSubscriptionBridge
+    : public CHIPTestClusterStructAttrStructAttributeCallbackBridge
 {
 public:
-    CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPTestClusterStructAttrStructAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       CHIPActionBlock action,
+                                                                       SubscriptionEstablishedHandler establishedHandler) :
+        CHIPTestClusterStructAttrStructAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -9203,26 +9163,25 @@ class CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscri
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<WiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallback>
+class CHIPTestClusterListLongOctetStringListAttributeCallbackBridge
+    : public CHIPCallbackBridge<TestClusterListLongOctetStringListAttributeCallback>
 {
 public:
-    CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<WiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                           keepAlive){};
+    CHIPTestClusterListLongOctetStringListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                  CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<TestClusterListLongOctetStringListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & value);
 };
 
-class CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge
+class CHIPTestClusterListLongOctetStringListAttributeCallbackSubscriptionBridge
+    : public CHIPTestClusterListLongOctetStringListAttributeCallbackBridge
 {
 public:
-    CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPTestClusterListLongOctetStringListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                              CHIPActionBlock action,
+                                                                              SubscriptionEstablishedHandler establishedHandler) :
+        CHIPTestClusterListLongOctetStringListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -9232,26 +9191,28 @@ class CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscrip
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<WiFiNetworkDiagnosticsAttributeListListAttributeCallback>
+class CHIPTestClusterListFabricScopedListAttributeCallbackBridge
+    : public CHIPCallbackBridge<TestClusterListFabricScopedListAttributeCallback>
 {
 public:
-    CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<WiFiNetworkDiagnosticsAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                     keepAlive){};
+    CHIPTestClusterListFabricScopedListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                               CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<TestClusterListFabricScopedListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestFabricScoped::DecodableType> &
+            value);
 };
 
-class CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackBridge
+class CHIPTestClusterListFabricScopedListAttributeCallbackSubscriptionBridge
+    : public CHIPTestClusterListFabricScopedListAttributeCallbackBridge
 {
 public:
-    CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPTestClusterListFabricScopedListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                           CHIPActionBlock action,
+                                                                           SubscriptionEstablishedHandler establishedHandler) :
+        CHIPTestClusterListFabricScopedListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -9261,24 +9222,26 @@ class CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBr
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPWindowCoveringConfigStatusAttributeCallbackBridge : public CHIPCallbackBridge<WindowCoveringConfigStatusAttributeCallback>
+class CHIPTestClusterNullableBitmap8AttributeCallbackBridge : public CHIPCallbackBridge<TestClusterNullableBitmap8AttributeCallback>
 {
 public:
-    CHIPWindowCoveringConfigStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+    CHIPTestClusterNullableBitmap8AttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
                                                           bool keepAlive = false) :
-        CHIPCallbackBridge<WindowCoveringConfigStatusAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+        CHIPCallbackBridge<TestClusterNullableBitmap8AttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> value);
+    static void
+    OnSuccessFn(void * context,
+                const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> & value);
 };
 
-class CHIPWindowCoveringConfigStatusAttributeCallbackSubscriptionBridge
-    : public CHIPWindowCoveringConfigStatusAttributeCallbackBridge
+class CHIPTestClusterNullableBitmap8AttributeCallbackSubscriptionBridge
+    : public CHIPTestClusterNullableBitmap8AttributeCallbackBridge
 {
 public:
-    CHIPWindowCoveringConfigStatusAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+    CHIPTestClusterNullableBitmap8AttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                       CHIPActionBlock action,
                                                                       SubscriptionEstablishedHandler establishedHandler) :
-        CHIPWindowCoveringConfigStatusAttributeCallbackBridge(queue, handler, action, true),
+        CHIPTestClusterNullableBitmap8AttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -9288,25 +9251,27 @@ class CHIPWindowCoveringConfigStatusAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPWindowCoveringOperationalStatusAttributeCallbackBridge
-    : public CHIPCallbackBridge<WindowCoveringOperationalStatusAttributeCallback>
+class CHIPTestClusterNullableBitmap16AttributeCallbackBridge
+    : public CHIPCallbackBridge<TestClusterNullableBitmap16AttributeCallback>
 {
 public:
-    CHIPWindowCoveringOperationalStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                               CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<WindowCoveringOperationalStatusAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPTestClusterNullableBitmap16AttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                           bool keepAlive = false) :
+        CHIPCallbackBridge<TestClusterNullableBitmap16AttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::WindowCovering::OperationalStatus> value);
+    static void
+    OnSuccessFn(void * context,
+                const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> & value);
 };
 
-class CHIPWindowCoveringOperationalStatusAttributeCallbackSubscriptionBridge
-    : public CHIPWindowCoveringOperationalStatusAttributeCallbackBridge
+class CHIPTestClusterNullableBitmap16AttributeCallbackSubscriptionBridge
+    : public CHIPTestClusterNullableBitmap16AttributeCallbackBridge
 {
 public:
-    CHIPWindowCoveringOperationalStatusAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                           CHIPActionBlock action,
-                                                                           SubscriptionEstablishedHandler establishedHandler) :
-        CHIPWindowCoveringOperationalStatusAttributeCallbackBridge(queue, handler, action, true),
+    CHIPTestClusterNullableBitmap16AttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       CHIPActionBlock action,
+                                                                       SubscriptionEstablishedHandler establishedHandler) :
+        CHIPTestClusterNullableBitmap16AttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -9316,23 +9281,27 @@ class CHIPWindowCoveringOperationalStatusAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPWindowCoveringModeAttributeCallbackBridge : public CHIPCallbackBridge<WindowCoveringModeAttributeCallback>
+class CHIPTestClusterNullableBitmap32AttributeCallbackBridge
+    : public CHIPCallbackBridge<TestClusterNullableBitmap32AttributeCallback>
 {
 public:
-    CHIPWindowCoveringModeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                  bool keepAlive = false) :
-        CHIPCallbackBridge<WindowCoveringModeAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPTestClusterNullableBitmap32AttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                           bool keepAlive = false) :
+        CHIPCallbackBridge<TestClusterNullableBitmap32AttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::WindowCovering::Mode> value);
+    static void
+    OnSuccessFn(void * context,
+                const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> & value);
 };
 
-class CHIPWindowCoveringModeAttributeCallbackSubscriptionBridge : public CHIPWindowCoveringModeAttributeCallbackBridge
+class CHIPTestClusterNullableBitmap32AttributeCallbackSubscriptionBridge
+    : public CHIPTestClusterNullableBitmap32AttributeCallbackBridge
 {
 public:
-    CHIPWindowCoveringModeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                              CHIPActionBlock action,
-                                                              SubscriptionEstablishedHandler establishedHandler) :
-        CHIPWindowCoveringModeAttributeCallbackBridge(queue, handler, action, true),
+    CHIPTestClusterNullableBitmap32AttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       CHIPActionBlock action,
+                                                                       SubscriptionEstablishedHandler establishedHandler) :
+        CHIPTestClusterNullableBitmap32AttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -9342,24 +9311,27 @@ class CHIPWindowCoveringModeAttributeCallbackSubscriptionBridge : public CHIPWin
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPWindowCoveringSafetyStatusAttributeCallbackBridge : public CHIPCallbackBridge<WindowCoveringSafetyStatusAttributeCallback>
+class CHIPTestClusterNullableBitmap64AttributeCallbackBridge
+    : public CHIPCallbackBridge<TestClusterNullableBitmap64AttributeCallback>
 {
 public:
-    CHIPWindowCoveringSafetyStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                          bool keepAlive = false) :
-        CHIPCallbackBridge<WindowCoveringSafetyStatusAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPTestClusterNullableBitmap64AttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                           bool keepAlive = false) :
+        CHIPCallbackBridge<TestClusterNullableBitmap64AttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, chip::BitMask<chip::app::Clusters::WindowCovering::SafetyStatus> value);
+    static void
+    OnSuccessFn(void * context,
+                const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> & value);
 };
 
-class CHIPWindowCoveringSafetyStatusAttributeCallbackSubscriptionBridge
-    : public CHIPWindowCoveringSafetyStatusAttributeCallbackBridge
+class CHIPTestClusterNullableBitmap64AttributeCallbackSubscriptionBridge
+    : public CHIPTestClusterNullableBitmap64AttributeCallbackBridge
 {
 public:
-    CHIPWindowCoveringSafetyStatusAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                      CHIPActionBlock action,
-                                                                      SubscriptionEstablishedHandler establishedHandler) :
-        CHIPWindowCoveringSafetyStatusAttributeCallbackBridge(queue, handler, action, true),
+    CHIPTestClusterNullableBitmap64AttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       CHIPActionBlock action,
+                                                                       SubscriptionEstablishedHandler establishedHandler) :
+        CHIPTestClusterNullableBitmap64AttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -9369,26 +9341,27 @@ class CHIPWindowCoveringSafetyStatusAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPWindowCoveringGeneratedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<WindowCoveringGeneratedCommandListListAttributeCallback>
+class CHIPTestClusterNullableStructStructAttributeCallbackBridge
+    : public CHIPCallbackBridge<TestClusterNullableStructStructAttributeCallback>
 {
 public:
-    CHIPWindowCoveringGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                      CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<WindowCoveringGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                    keepAlive){};
+    CHIPTestClusterNullableStructStructAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                               CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<TestClusterNullableStructStructAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+    static void OnSuccessFn(
+        void * context,
+        const chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType> & value);
 };
 
-class CHIPWindowCoveringGeneratedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPWindowCoveringGeneratedCommandListListAttributeCallbackBridge
+class CHIPTestClusterNullableStructStructAttributeCallbackSubscriptionBridge
+    : public CHIPTestClusterNullableStructStructAttributeCallbackBridge
 {
 public:
-    CHIPWindowCoveringGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPWindowCoveringGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPTestClusterNullableStructStructAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                           CHIPActionBlock action,
+                                                                           SubscriptionEstablishedHandler establishedHandler) :
+        CHIPTestClusterNullableStructStructAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -9398,26 +9371,25 @@ class CHIPWindowCoveringGeneratedCommandListListAttributeCallbackSubscriptionBri
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPWindowCoveringAcceptedCommandListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<WindowCoveringAcceptedCommandListListAttributeCallback>
+class CHIPTestClusterGeneratedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<TestClusterGeneratedCommandListListAttributeCallback>
 {
 public:
-    CHIPWindowCoveringAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                     CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<WindowCoveringAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
-                                                                                   keepAlive){};
+    CHIPTestClusterGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                   CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<TestClusterGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPWindowCoveringAcceptedCommandListListAttributeCallbackSubscriptionBridge
-    : public CHIPWindowCoveringAcceptedCommandListListAttributeCallbackBridge
+class CHIPTestClusterGeneratedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPTestClusterGeneratedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPWindowCoveringAcceptedCommandListListAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-        SubscriptionEstablishedHandler establishedHandler) :
-        CHIPWindowCoveringAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPTestClusterGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                               CHIPActionBlock action,
+                                                                               SubscriptionEstablishedHandler establishedHandler) :
+        CHIPTestClusterGeneratedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -9427,25 +9399,25 @@ class CHIPWindowCoveringAcceptedCommandListListAttributeCallbackSubscriptionBrid
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPWindowCoveringAttributeListListAttributeCallbackBridge
-    : public CHIPCallbackBridge<WindowCoveringAttributeListListAttributeCallback>
+class CHIPTestClusterAcceptedCommandListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<TestClusterAcceptedCommandListListAttributeCallback>
 {
 public:
-    CHIPWindowCoveringAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                               CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<WindowCoveringAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPTestClusterAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                  CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<TestClusterAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
 };
 
-class CHIPWindowCoveringAttributeListListAttributeCallbackSubscriptionBridge
-    : public CHIPWindowCoveringAttributeListListAttributeCallbackBridge
+class CHIPTestClusterAcceptedCommandListListAttributeCallbackSubscriptionBridge
+    : public CHIPTestClusterAcceptedCommandListListAttributeCallbackBridge
 {
 public:
-    CHIPWindowCoveringAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                           CHIPActionBlock action,
-                                                                           SubscriptionEstablishedHandler establishedHandler) :
-        CHIPWindowCoveringAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+    CHIPTestClusterAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                              CHIPActionBlock action,
+                                                                              SubscriptionEstablishedHandler establishedHandler) :
+        CHIPTestClusterAcceptedCommandListListAttributeCallbackBridge(queue, handler, action, true),
         mEstablishedHandler(establishedHandler)
     {}
 
@@ -9455,277 +9427,246 @@ class CHIPWindowCoveringAttributeListListAttributeCallbackSubscriptionBridge
     SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPAccountLoginClusterGetSetupPINResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPAccountLoginClusterGetSetupPINResponseCallbackType>
-{
-public:
-    CHIPAccountLoginClusterGetSetupPINResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                             CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPAccountLoginClusterGetSetupPINResponseCallbackType>(queue, handler, action, OnSuccessFn,
-                                                                                   keepAlive){};
-
-    static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::AccountLogin::Commands::GetSetupPINResponse::DecodableType & data);
-};
-
-class CHIPApplicationLauncherClusterLauncherResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPApplicationLauncherClusterLauncherResponseCallbackType>
-{
-public:
-    CHIPApplicationLauncherClusterLauncherResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPApplicationLauncherClusterLauncherResponseCallbackType>(queue, handler, action, OnSuccessFn,
-                                                                                       keepAlive){};
-
-    static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType & data);
-};
-
-class CHIPChannelClusterChangeChannelResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPChannelClusterChangeChannelResponseCallbackType>
+class CHIPTestClusterAttributeListListAttributeCallbackBridge
+    : public CHIPCallbackBridge<TestClusterAttributeListListAttributeCallback>
 {
-public:
-    CHIPChannelClusterChangeChannelResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                          bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPChannelClusterChangeChannelResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
+public:
+    CHIPTestClusterAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                            bool keepAlive = false) :
+        CHIPCallbackBridge<TestClusterAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::Channel::Commands::ChangeChannelResponse::DecodableType & data);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
 };
 
-class CHIPContentLauncherClusterLaunchResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPContentLauncherClusterLaunchResponseCallbackType>
+class CHIPTestClusterAttributeListListAttributeCallbackSubscriptionBridge
+    : public CHIPTestClusterAttributeListListAttributeCallbackBridge
 {
 public:
-    CHIPContentLauncherClusterLaunchResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                           bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPContentLauncherClusterLaunchResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPTestClusterAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                        CHIPActionBlock action,
+                                                                        SubscriptionEstablishedHandler establishedHandler) :
+        CHIPTestClusterAttributeListListAttributeCallbackBridge(queue, handler, action, true),
+        mEstablishedHandler(establishedHandler)
+    {}
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & data);
+    static void OnSubscriptionEstablished(void * context);
+
+private:
+    SubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackType>
+class CHIPGroupsClusterAddGroupResponseCallbackBridge : public CHIPCallbackBridge<CHIPGroupsClusterAddGroupResponseCallbackType>
 {
 public:
-    CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackType>(queue, handler, action, OnSuccessFn,
-                                                                                      keepAlive){};
+    CHIPGroupsClusterAddGroupResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                    bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPGroupsClusterAddGroupResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType & data);
+    static void OnSuccessFn(void * context, const chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType & data);
 };
 
-class CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackType>
+class CHIPGroupsClusterViewGroupResponseCallbackBridge : public CHIPCallbackBridge<CHIPGroupsClusterViewGroupResponseCallbackType>
 {
 public:
-    CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackType>(queue, handler, action, OnSuccessFn,
-                                                                                      keepAlive){};
+    CHIPGroupsClusterViewGroupResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                     bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPGroupsClusterViewGroupResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType & data);
+    static void OnSuccessFn(void * context, const chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType & data);
 };
 
-class CHIPDoorLockClusterGetYearDayScheduleResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPDoorLockClusterGetYearDayScheduleResponseCallbackType>
+class CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPGroupsClusterGetGroupMembershipResponseCallbackType>
 {
 public:
-    CHIPDoorLockClusterGetYearDayScheduleResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPDoorLockClusterGetYearDayScheduleResponseCallbackType>(queue, handler, action, OnSuccessFn,
-                                                                                      keepAlive){};
+    CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                              CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPGroupsClusterGetGroupMembershipResponseCallbackType>(queue, handler, action, OnSuccessFn,
+                                                                                    keepAlive){};
 
     static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType & data);
+                            const chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType & data);
 };
 
-class CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPDoorLockClusterGetHolidayScheduleResponseCallbackType>
+class CHIPGroupsClusterRemoveGroupResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPGroupsClusterRemoveGroupResponseCallbackType>
 {
 public:
-    CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPDoorLockClusterGetHolidayScheduleResponseCallbackType>(queue, handler, action, OnSuccessFn,
-                                                                                      keepAlive){};
+    CHIPGroupsClusterRemoveGroupResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                       bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPGroupsClusterRemoveGroupResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType & data);
+    static void OnSuccessFn(void * context, const chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType & data);
 };
 
-class CHIPDoorLockClusterGetUserResponseCallbackBridge : public CHIPCallbackBridge<CHIPDoorLockClusterGetUserResponseCallbackType>
+class CHIPScenesClusterAddSceneResponseCallbackBridge : public CHIPCallbackBridge<CHIPScenesClusterAddSceneResponseCallbackType>
 {
 public:
-    CHIPDoorLockClusterGetUserResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                     bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPDoorLockClusterGetUserResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPScenesClusterAddSceneResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                    bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPScenesClusterAddSceneResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType & data);
+    static void OnSuccessFn(void * context, const chip::app::Clusters::Scenes::Commands::AddSceneResponse::DecodableType & data);
 };
 
-class CHIPDoorLockClusterSetCredentialResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPDoorLockClusterSetCredentialResponseCallbackType>
+class CHIPScenesClusterViewSceneResponseCallbackBridge : public CHIPCallbackBridge<CHIPScenesClusterViewSceneResponseCallbackType>
 {
 public:
-    CHIPDoorLockClusterSetCredentialResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                           bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPDoorLockClusterSetCredentialResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPScenesClusterViewSceneResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                     bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPScenesClusterViewSceneResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType & data);
+    static void OnSuccessFn(void * context, const chip::app::Clusters::Scenes::Commands::ViewSceneResponse::DecodableType & data);
 };
 
-class CHIPDoorLockClusterGetCredentialStatusResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPDoorLockClusterGetCredentialStatusResponseCallbackType>
+class CHIPScenesClusterRemoveSceneResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPScenesClusterRemoveSceneResponseCallbackType>
 {
 public:
-    CHIPDoorLockClusterGetCredentialStatusResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPDoorLockClusterGetCredentialStatusResponseCallbackType>(queue, handler, action, OnSuccessFn,
-                                                                                       keepAlive){};
+    CHIPScenesClusterRemoveSceneResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                       bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPScenesClusterRemoveSceneResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType & data);
+    static void OnSuccessFn(void * context, const chip::app::Clusters::Scenes::Commands::RemoveSceneResponse::DecodableType & data);
 };
 
-class CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackType>
+class CHIPScenesClusterRemoveAllScenesResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPScenesClusterRemoveAllScenesResponseCallbackType>
 {
 public:
-    CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                     CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackType>(queue, handler, action, OnSuccessFn,
-                                                                                           keepAlive){};
+    CHIPScenesClusterRemoveAllScenesResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                           bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPScenesClusterRemoveAllScenesResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::GeneralCommissioning::Commands::ArmFailSafeResponse::DecodableType & data);
+                            const chip::app::Clusters::Scenes::Commands::RemoveAllScenesResponse::DecodableType & data);
 };
 
-class CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallbackType>
+class CHIPScenesClusterStoreSceneResponseCallbackBridge : public CHIPCallbackBridge<CHIPScenesClusterStoreSceneResponseCallbackType>
 {
 public:
-    CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallbackType>(queue, handler, action,
-                                                                                                   OnSuccessFn, keepAlive){};
+    CHIPScenesClusterStoreSceneResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                      bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPScenesClusterStoreSceneResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void
-    OnSuccessFn(void * context,
-                const chip::app::Clusters::GeneralCommissioning::Commands::SetRegulatoryConfigResponse::DecodableType & data);
+    static void OnSuccessFn(void * context, const chip::app::Clusters::Scenes::Commands::StoreSceneResponse::DecodableType & data);
 };
 
-class CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackType>
+class CHIPScenesClusterGetSceneMembershipResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPScenesClusterGetSceneMembershipResponseCallbackType>
 {
 public:
-    CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                               CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackType>(queue, handler, action,
-                                                                                                     OnSuccessFn, keepAlive){};
+    CHIPScenesClusterGetSceneMembershipResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                              CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPScenesClusterGetSceneMembershipResponseCallbackType>(queue, handler, action, OnSuccessFn,
+                                                                                    keepAlive){};
 
-    static void
-    OnSuccessFn(void * context,
-                const chip::app::Clusters::GeneralCommissioning::Commands::CommissioningCompleteResponse::DecodableType & data);
+    static void OnSuccessFn(void * context,
+                            const chip::app::Clusters::Scenes::Commands::GetSceneMembershipResponse::DecodableType & data);
 };
 
-class CHIPGroupKeyManagementClusterKeySetReadResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPGroupKeyManagementClusterKeySetReadResponseCallbackType>
+class CHIPScenesClusterEnhancedAddSceneResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPScenesClusterEnhancedAddSceneResponseCallbackType>
 {
 public:
-    CHIPGroupKeyManagementClusterKeySetReadResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                  CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPGroupKeyManagementClusterKeySetReadResponseCallbackType>(queue, handler, action, OnSuccessFn,
-                                                                                        keepAlive){};
+    CHIPScenesClusterEnhancedAddSceneResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                            bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPScenesClusterEnhancedAddSceneResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadResponse::DecodableType & data);
+                            const chip::app::Clusters::Scenes::Commands::EnhancedAddSceneResponse::DecodableType & data);
 };
 
-class CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallbackType>
+class CHIPScenesClusterEnhancedViewSceneResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPScenesClusterEnhancedViewSceneResponseCallbackType>
 {
 public:
-    CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                            CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallbackType>(queue, handler, action,
-                                                                                                  OnSuccessFn, keepAlive){};
+    CHIPScenesClusterEnhancedViewSceneResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                             CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPScenesClusterEnhancedViewSceneResponseCallbackType>(queue, handler, action, OnSuccessFn,
+                                                                                   keepAlive){};
 
-    static void
-    OnSuccessFn(void * context,
-                const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::DecodableType & data);
+    static void OnSuccessFn(void * context,
+                            const chip::app::Clusters::Scenes::Commands::EnhancedViewSceneResponse::DecodableType & data);
 };
 
-class CHIPGroupsClusterAddGroupResponseCallbackBridge : public CHIPCallbackBridge<CHIPGroupsClusterAddGroupResponseCallbackType>
+class CHIPScenesClusterCopySceneResponseCallbackBridge : public CHIPCallbackBridge<CHIPScenesClusterCopySceneResponseCallbackType>
 {
 public:
-    CHIPGroupsClusterAddGroupResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                    bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPGroupsClusterAddGroupResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPScenesClusterCopySceneResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                     bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPScenesClusterCopySceneResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType & data);
+    static void OnSuccessFn(void * context, const chip::app::Clusters::Scenes::Commands::CopySceneResponse::DecodableType & data);
 };
 
-class CHIPGroupsClusterViewGroupResponseCallbackBridge : public CHIPCallbackBridge<CHIPGroupsClusterViewGroupResponseCallbackType>
+class CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallbackType>
 {
 public:
-    CHIPGroupsClusterViewGroupResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                     bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPGroupsClusterViewGroupResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                         CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallbackType>(queue, handler, action, OnSuccessFn,
+                                                                                               keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType & data);
+    static void
+    OnSuccessFn(void * context,
+                const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImageResponse::DecodableType & data);
 };
 
-class CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPGroupsClusterGetGroupMembershipResponseCallbackType>
+class CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallbackType>
 {
 public:
-    CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                              CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPGroupsClusterGetGroupMembershipResponseCallbackType>(queue, handler, action, OnSuccessFn,
-                                                                                    keepAlive){};
+    CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                          CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallbackType>(queue, handler, action, OnSuccessFn,
+                                                                                                keepAlive){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType & data);
+    static void
+    OnSuccessFn(void * context,
+                const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::DecodableType & data);
 };
 
-class CHIPGroupsClusterRemoveGroupResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPGroupsClusterRemoveGroupResponseCallbackType>
+class CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackType>
 {
 public:
-    CHIPGroupsClusterRemoveGroupResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                       bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPGroupsClusterRemoveGroupResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                     CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackType>(queue, handler, action, OnSuccessFn,
+                                                                                           keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType & data);
+    static void OnSuccessFn(void * context,
+                            const chip::app::Clusters::GeneralCommissioning::Commands::ArmFailSafeResponse::DecodableType & data);
 };
 
-class CHIPKeypadInputClusterSendKeyResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPKeypadInputClusterSendKeyResponseCallbackType>
+class CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallbackType>
 {
 public:
-    CHIPKeypadInputClusterSendKeyResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                        bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPKeypadInputClusterSendKeyResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                             CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallbackType>(queue, handler, action,
+                                                                                                   OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType & data);
+    static void
+    OnSuccessFn(void * context,
+                const chip::app::Clusters::GeneralCommissioning::Commands::SetRegulatoryConfigResponse::DecodableType & data);
 };
 
-class CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>
+class CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackType>
 {
 public:
-    CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                           bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                               CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackType>(queue, handler, action,
+                                                                                                     OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType & data);
+    static void
+    OnSuccessFn(void * context,
+                const chip::app::Clusters::GeneralCommissioning::Commands::CommissioningCompleteResponse::DecodableType & data);
 };
 
 class CHIPNetworkCommissioningClusterScanNetworksResponseCallbackBridge
@@ -9768,32 +9709,17 @@ class CHIPNetworkCommissioningClusterConnectNetworkResponseCallbackBridge
                 const chip::app::Clusters::NetworkCommissioning::Commands::ConnectNetworkResponse::DecodableType & data);
 };
 
-class CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallbackType>
-{
-public:
-    CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                         CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallbackType>(queue, handler, action, OnSuccessFn,
-                                                                                               keepAlive){};
-
-    static void
-    OnSuccessFn(void * context,
-                const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImageResponse::DecodableType & data);
-};
-
-class CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallbackType>
+class CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackType>
 {
 public:
-    CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallbackType>(queue, handler, action, OnSuccessFn,
-                                                                                                keepAlive){};
+    CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackType>(queue, handler, action, OnSuccessFn,
+                                                                                      keepAlive){};
 
-    static void
-    OnSuccessFn(void * context,
-                const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::DecodableType & data);
+    static void OnSuccessFn(void * context,
+                            const chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType & data);
 };
 
 class CHIPOperationalCredentialsClusterAttestationResponseCallbackBridge
@@ -9849,105 +9775,130 @@ class CHIPOperationalCredentialsClusterNOCResponseCallbackBridge
                             const chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::DecodableType & data);
 };
 
-class CHIPScenesClusterAddSceneResponseCallbackBridge : public CHIPCallbackBridge<CHIPScenesClusterAddSceneResponseCallbackType>
+class CHIPGroupKeyManagementClusterKeySetReadResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPGroupKeyManagementClusterKeySetReadResponseCallbackType>
 {
 public:
-    CHIPScenesClusterAddSceneResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                    bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPScenesClusterAddSceneResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPGroupKeyManagementClusterKeySetReadResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                  CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPGroupKeyManagementClusterKeySetReadResponseCallbackType>(queue, handler, action, OnSuccessFn,
+                                                                                        keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::Clusters::Scenes::Commands::AddSceneResponse::DecodableType & data);
+    static void OnSuccessFn(void * context,
+                            const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadResponse::DecodableType & data);
 };
 
-class CHIPScenesClusterViewSceneResponseCallbackBridge : public CHIPCallbackBridge<CHIPScenesClusterViewSceneResponseCallbackType>
+class CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallbackType>
 {
 public:
-    CHIPScenesClusterViewSceneResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                     bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPScenesClusterViewSceneResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                            CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallbackType>(queue, handler, action,
+                                                                                                  OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::Clusters::Scenes::Commands::ViewSceneResponse::DecodableType & data);
+    static void
+    OnSuccessFn(void * context,
+                const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::DecodableType & data);
 };
 
-class CHIPScenesClusterRemoveSceneResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPScenesClusterRemoveSceneResponseCallbackType>
+class CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackType>
 {
 public:
-    CHIPScenesClusterRemoveSceneResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                       bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPScenesClusterRemoveSceneResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackType>(queue, handler, action, OnSuccessFn,
+                                                                                      keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::Clusters::Scenes::Commands::RemoveSceneResponse::DecodableType & data);
+    static void OnSuccessFn(void * context,
+                            const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType & data);
 };
 
-class CHIPScenesClusterRemoveAllScenesResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPScenesClusterRemoveAllScenesResponseCallbackType>
+class CHIPDoorLockClusterGetYearDayScheduleResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPDoorLockClusterGetYearDayScheduleResponseCallbackType>
 {
 public:
-    CHIPScenesClusterRemoveAllScenesResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                           bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPScenesClusterRemoveAllScenesResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPDoorLockClusterGetYearDayScheduleResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPDoorLockClusterGetYearDayScheduleResponseCallbackType>(queue, handler, action, OnSuccessFn,
+                                                                                      keepAlive){};
 
     static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::Scenes::Commands::RemoveAllScenesResponse::DecodableType & data);
+                            const chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType & data);
 };
 
-class CHIPScenesClusterStoreSceneResponseCallbackBridge : public CHIPCallbackBridge<CHIPScenesClusterStoreSceneResponseCallbackType>
+class CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPDoorLockClusterGetHolidayScheduleResponseCallbackType>
 {
 public:
-    CHIPScenesClusterStoreSceneResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                      bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPScenesClusterStoreSceneResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPDoorLockClusterGetHolidayScheduleResponseCallbackType>(queue, handler, action, OnSuccessFn,
+                                                                                      keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::Clusters::Scenes::Commands::StoreSceneResponse::DecodableType & data);
+    static void OnSuccessFn(void * context,
+                            const chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType & data);
 };
 
-class CHIPScenesClusterGetSceneMembershipResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPScenesClusterGetSceneMembershipResponseCallbackType>
+class CHIPDoorLockClusterGetUserResponseCallbackBridge : public CHIPCallbackBridge<CHIPDoorLockClusterGetUserResponseCallbackType>
 {
 public:
-    CHIPScenesClusterGetSceneMembershipResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                              CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPScenesClusterGetSceneMembershipResponseCallbackType>(queue, handler, action, OnSuccessFn,
-                                                                                    keepAlive){};
+    CHIPDoorLockClusterGetUserResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                     bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPDoorLockClusterGetUserResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
+
+    static void OnSuccessFn(void * context, const chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType & data);
+};
+
+class CHIPDoorLockClusterSetCredentialResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPDoorLockClusterSetCredentialResponseCallbackType>
+{
+public:
+    CHIPDoorLockClusterSetCredentialResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                           bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPDoorLockClusterSetCredentialResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
 
     static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::Scenes::Commands::GetSceneMembershipResponse::DecodableType & data);
+                            const chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType & data);
 };
 
-class CHIPScenesClusterEnhancedAddSceneResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPScenesClusterEnhancedAddSceneResponseCallbackType>
+class CHIPDoorLockClusterGetCredentialStatusResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPDoorLockClusterGetCredentialStatusResponseCallbackType>
 {
 public:
-    CHIPScenesClusterEnhancedAddSceneResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                            bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPScenesClusterEnhancedAddSceneResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPDoorLockClusterGetCredentialStatusResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                 CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPDoorLockClusterGetCredentialStatusResponseCallbackType>(queue, handler, action, OnSuccessFn,
+                                                                                       keepAlive){};
 
     static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::Scenes::Commands::EnhancedAddSceneResponse::DecodableType & data);
+                            const chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType & data);
 };
 
-class CHIPScenesClusterEnhancedViewSceneResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPScenesClusterEnhancedViewSceneResponseCallbackType>
+class CHIPThermostatClusterGetWeeklyScheduleResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPThermostatClusterGetWeeklyScheduleResponseCallbackType>
 {
 public:
-    CHIPScenesClusterEnhancedViewSceneResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                             CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPScenesClusterEnhancedViewSceneResponseCallbackType>(queue, handler, action, OnSuccessFn,
-                                                                                   keepAlive){};
+    CHIPThermostatClusterGetWeeklyScheduleResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                 CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPThermostatClusterGetWeeklyScheduleResponseCallbackType>(queue, handler, action, OnSuccessFn,
+                                                                                       keepAlive){};
 
     static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::Scenes::Commands::EnhancedViewSceneResponse::DecodableType & data);
+                            const chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType & data);
 };
 
-class CHIPScenesClusterCopySceneResponseCallbackBridge : public CHIPCallbackBridge<CHIPScenesClusterCopySceneResponseCallbackType>
+class CHIPChannelClusterChangeChannelResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPChannelClusterChangeChannelResponseCallbackType>
 {
 public:
-    CHIPScenesClusterCopySceneResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
-                                                     bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPScenesClusterCopySceneResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
+    CHIPChannelClusterChangeChannelResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                          bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPChannelClusterChangeChannelResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
 
-    static void OnSuccessFn(void * context, const chip::app::Clusters::Scenes::Commands::CopySceneResponse::DecodableType & data);
+    static void OnSuccessFn(void * context,
+                            const chip::app::Clusters::Channel::Commands::ChangeChannelResponse::DecodableType & data);
 };
 
 class CHIPTargetNavigatorClusterNavigateTargetResponseCallbackBridge
@@ -9963,6 +9914,68 @@ class CHIPTargetNavigatorClusterNavigateTargetResponseCallbackBridge
                             const chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::DecodableType & data);
 };
 
+class CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>
+{
+public:
+    CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                           bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
+
+    static void OnSuccessFn(void * context,
+                            const chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType & data);
+};
+
+class CHIPKeypadInputClusterSendKeyResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPKeypadInputClusterSendKeyResponseCallbackType>
+{
+public:
+    CHIPKeypadInputClusterSendKeyResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                        bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPKeypadInputClusterSendKeyResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
+
+    static void OnSuccessFn(void * context,
+                            const chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType & data);
+};
+
+class CHIPContentLauncherClusterLaunchResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPContentLauncherClusterLaunchResponseCallbackType>
+{
+public:
+    CHIPContentLauncherClusterLaunchResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action,
+                                                           bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPContentLauncherClusterLaunchResponseCallbackType>(queue, handler, action, OnSuccessFn, keepAlive){};
+
+    static void OnSuccessFn(void * context,
+                            const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & data);
+};
+
+class CHIPApplicationLauncherClusterLauncherResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPApplicationLauncherClusterLauncherResponseCallbackType>
+{
+public:
+    CHIPApplicationLauncherClusterLauncherResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                 CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPApplicationLauncherClusterLauncherResponseCallbackType>(queue, handler, action, OnSuccessFn,
+                                                                                       keepAlive){};
+
+    static void OnSuccessFn(void * context,
+                            const chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType & data);
+};
+
+class CHIPAccountLoginClusterGetSetupPINResponseCallbackBridge
+    : public CHIPCallbackBridge<CHIPAccountLoginClusterGetSetupPINResponseCallbackType>
+{
+public:
+    CHIPAccountLoginClusterGetSetupPINResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                             CHIPActionBlock action, bool keepAlive = false) :
+        CHIPCallbackBridge<CHIPAccountLoginClusterGetSetupPINResponseCallbackType>(queue, handler, action, OnSuccessFn,
+                                                                                   keepAlive){};
+
+    static void OnSuccessFn(void * context,
+                            const chip::app::Clusters::AccountLogin::Commands::GetSetupPINResponse::DecodableType & data);
+};
+
 class CHIPTestClusterClusterTestSpecificResponseCallbackBridge
     : public CHIPCallbackBridge<CHIPTestClusterClusterTestSpecificResponseCallbackType>
 {
@@ -10120,19 +10133,6 @@ class CHIPTestClusterClusterTestEmitTestFabricScopedEventResponseCallbackBridge
                 const chip::app::Clusters::TestCluster::Commands::TestEmitTestFabricScopedEventResponse::DecodableType & data);
 };
 
-class CHIPThermostatClusterGetWeeklyScheduleResponseCallbackBridge
-    : public CHIPCallbackBridge<CHIPThermostatClusterGetWeeklyScheduleResponseCallbackType>
-{
-public:
-    CHIPThermostatClusterGetWeeklyScheduleResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                 CHIPActionBlock action, bool keepAlive = false) :
-        CHIPCallbackBridge<CHIPThermostatClusterGetWeeklyScheduleResponseCallbackType>(queue, handler, action, OnSuccessFn,
-                                                                                       keepAlive){};
-
-    static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType & data);
-};
-
 class CHIPIdentifyClusterIdentifyEffectIdentifierAttributeCallbackBridge
     : public CHIPCallbackBridge<IdentifyClusterIdentifyEffectIdentifierAttributeCallback>
 {
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h
index 61415ec3c0a6f9..f7946cc96307bf 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h
@@ -34,107 +34,54 @@ typedef void (^SubscriptionEstablishedHandler)(void);
 NS_ASSUME_NONNULL_BEGIN
 
 /**
- * Cluster Access Control
+ * Cluster Identify
  *
  */
-@interface CHIPAccessControl : CHIPCluster
-
-- (void)readAttributeAclWithParams:(CHIPReadParams * _Nullable)params
-                 completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeAclWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAclWithValue:(NSArray * _Nonnull)value
-                            params:(CHIPWriteParams * _Nullable)params
-                 completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeAclWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                      params:(CHIPSubscribeParams * _Nullable)params
-                     subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                               reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAclWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                  endpoint:(NSNumber *)endpoint
-                                     queue:(dispatch_queue_t)queue
-                         completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeExtensionWithParams:(CHIPReadParams * _Nullable)params
-                       completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeExtensionWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeExtensionWithValue:(NSArray * _Nonnull)value
-                                  params:(CHIPWriteParams * _Nullable)params
-                       completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeExtensionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeExtensionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+@interface CHIPIdentify : CHIPCluster
 
-- (void)readAttributeSubjectsPerAccessControlEntryWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeSubjectsPerAccessControlEntryWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                params:(CHIPSubscribeParams * _Nullable)params
-                                               subscriptionEstablished:
-                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSubjectsPerAccessControlEntryWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                            endpoint:(NSNumber *)endpoint
-                                                               queue:(dispatch_queue_t)queue
-                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler;
+- (void)identifyWithParams:(CHIPIdentifyClusterIdentifyParams *)params completionHandler:(StatusCompletion)completionHandler;
+- (void)triggerEffectWithParams:(CHIPIdentifyClusterTriggerEffectParams *)params
+              completionHandler:(StatusCompletion)completionHandler;
 
-- (void)readAttributeTargetsPerAccessControlEntryWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler;
+- (void)readAttributeIdentifyTimeWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeIdentifyTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeIdentifyTimeWithValue:(NSNumber * _Nonnull)value
+                                     params:(CHIPWriteParams * _Nullable)params
+                          completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTargetsPerAccessControlEntryWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTargetsPerAccessControlEntryWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeIdentifyTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeIdentifyTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAccessControlEntriesPerFabricWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributeIdentifyTypeWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAccessControlEntriesPerFabricWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                params:(CHIPSubscribeParams * _Nullable)params
-                                               subscriptionEstablished:
-                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAccessControlEntriesPerFabricWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                            endpoint:(NSNumber *)endpoint
-                                                               queue:(dispatch_queue_t)queue
-                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeIdentifyTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeIdentifyTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
@@ -230,18 +177,45 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Account Login
+ * Cluster Groups
  *
  */
-@interface CHIPAccountLogin : CHIPCluster
+@interface CHIPGroups : CHIPCluster
 
-- (void)getSetupPINWithParams:(CHIPAccountLoginClusterGetSetupPINParams *)params
-            completionHandler:(void (^)(CHIPAccountLoginClusterGetSetupPINResponseParams * _Nullable data,
-                                  NSError * _Nullable error))completionHandler;
-- (void)loginWithParams:(CHIPAccountLoginClusterLoginParams *)params completionHandler:(StatusCompletion)completionHandler;
-- (void)logoutWithParams:(CHIPAccountLoginClusterLogoutParams * _Nullable)params
-       completionHandler:(StatusCompletion)completionHandler;
-- (void)logoutWithCompletionHandler:(StatusCompletion)completionHandler;
+- (void)addGroupWithParams:(CHIPGroupsClusterAddGroupParams *)params
+         completionHandler:
+             (void (^)(CHIPGroupsClusterAddGroupResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
+- (void)viewGroupWithParams:(CHIPGroupsClusterViewGroupParams *)params
+          completionHandler:
+              (void (^)(CHIPGroupsClusterViewGroupResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
+- (void)getGroupMembershipWithParams:(CHIPGroupsClusterGetGroupMembershipParams *)params
+                   completionHandler:(void (^)(CHIPGroupsClusterGetGroupMembershipResponseParams * _Nullable data,
+                                         NSError * _Nullable error))completionHandler;
+- (void)removeGroupWithParams:(CHIPGroupsClusterRemoveGroupParams *)params
+            completionHandler:
+                (void (^)(CHIPGroupsClusterRemoveGroupResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
+- (void)removeAllGroupsWithParams:(CHIPGroupsClusterRemoveAllGroupsParams * _Nullable)params
+                completionHandler:(StatusCompletion)completionHandler;
+- (void)removeAllGroupsWithCompletionHandler:(StatusCompletion)completionHandler;
+- (void)addGroupIfIdentifyingWithParams:(CHIPGroupsClusterAddGroupIfIdentifyingParams *)params
+                      completionHandler:(StatusCompletion)completionHandler;
+
+- (void)readAttributeNameSupportWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeNameSupportWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNameSupportWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
@@ -337,72 +311,144 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster AdministratorCommissioning
+ * Cluster Scenes
  *
  */
-@interface CHIPAdministratorCommissioning : CHIPCluster
+@interface CHIPScenes : CHIPCluster
 
-- (void)openCommissioningWindowWithParams:(CHIPAdministratorCommissioningClusterOpenCommissioningWindowParams *)params
-                        completionHandler:(StatusCompletion)completionHandler;
-- (void)openBasicCommissioningWindowWithParams:(CHIPAdministratorCommissioningClusterOpenBasicCommissioningWindowParams *)params
-                             completionHandler:(StatusCompletion)completionHandler;
-- (void)revokeCommissioningWithParams:(CHIPAdministratorCommissioningClusterRevokeCommissioningParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler;
-- (void)revokeCommissioningWithCompletionHandler:(StatusCompletion)completionHandler;
+- (void)addSceneWithParams:(CHIPScenesClusterAddSceneParams *)params
+         completionHandler:
+             (void (^)(CHIPScenesClusterAddSceneResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
+- (void)viewSceneWithParams:(CHIPScenesClusterViewSceneParams *)params
+          completionHandler:
+              (void (^)(CHIPScenesClusterViewSceneResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
+- (void)removeSceneWithParams:(CHIPScenesClusterRemoveSceneParams *)params
+            completionHandler:
+                (void (^)(CHIPScenesClusterRemoveSceneResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
+- (void)removeAllScenesWithParams:(CHIPScenesClusterRemoveAllScenesParams *)params
+                completionHandler:(void (^)(CHIPScenesClusterRemoveAllScenesResponseParams * _Nullable data,
+                                      NSError * _Nullable error))completionHandler;
+- (void)storeSceneWithParams:(CHIPScenesClusterStoreSceneParams *)params
+           completionHandler:
+               (void (^)(CHIPScenesClusterStoreSceneResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
+- (void)recallSceneWithParams:(CHIPScenesClusterRecallSceneParams *)params completionHandler:(StatusCompletion)completionHandler;
+- (void)getSceneMembershipWithParams:(CHIPScenesClusterGetSceneMembershipParams *)params
+                   completionHandler:(void (^)(CHIPScenesClusterGetSceneMembershipResponseParams * _Nullable data,
+                                         NSError * _Nullable error))completionHandler;
+- (void)enhancedAddSceneWithParams:(CHIPScenesClusterEnhancedAddSceneParams *)params
+                 completionHandler:(void (^)(CHIPScenesClusterEnhancedAddSceneResponseParams * _Nullable data,
+                                       NSError * _Nullable error))completionHandler;
+- (void)enhancedViewSceneWithParams:(CHIPScenesClusterEnhancedViewSceneParams *)params
+                  completionHandler:(void (^)(CHIPScenesClusterEnhancedViewSceneResponseParams * _Nullable data,
+                                        NSError * _Nullable error))completionHandler;
+- (void)copySceneWithParams:(CHIPScenesClusterCopySceneParams *)params
+          completionHandler:
+              (void (^)(CHIPScenesClusterCopySceneResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeWindowStatusWithCompletionHandler:(void (^)(
+- (void)readAttributeSceneCountWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeSceneCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeSceneCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeCurrentSceneWithCompletionHandler:(void (^)(
                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeWindowStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeCurrentSceneWithMinInterval:(NSNumber * _Nonnull)minInterval
                                           maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(CHIPSubscribeParams * _Nullable)params
                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                         reportHandler:
                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeWindowStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeCurrentSceneWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                            endpoint:(NSNumber *)endpoint
                                               queue:(dispatch_queue_t)queue
                                   completionHandler:
                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAdminFabricIndexWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
+- (void)readAttributeCurrentGroupWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAdminFabricIndexWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAdminFabricIndexWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeCurrentGroupWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentGroupWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAdminVendorIdWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributeSceneValidWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAdminVendorIdWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAdminVendorIdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeSceneValidWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeSceneValidWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeNameSupportWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeNameSupportWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNameSupportWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeLastConfiguredByWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeLastConfiguredByWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeLastConfiguredByWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
@@ -498,149 +544,118 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Application Basic
+ * Cluster On/Off
  *
  */
-@interface CHIPApplicationBasic : CHIPCluster
-
-- (void)readAttributeVendorNameWithCompletionHandler:(void (^)(
-                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeVendorNameWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeVendorNameWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeVendorIDWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeVendorIDWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeVendorIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+@interface CHIPOnOff : CHIPCluster
 
-- (void)readAttributeApplicationNameWithCompletionHandler:(void (^)(NSString * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeApplicationNameWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeApplicationNameWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)offWithParams:(CHIPOnOffClusterOffParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler;
+- (void)offWithCompletionHandler:(StatusCompletion)completionHandler;
+- (void)onWithParams:(CHIPOnOffClusterOnParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler;
+- (void)onWithCompletionHandler:(StatusCompletion)completionHandler;
+- (void)toggleWithParams:(CHIPOnOffClusterToggleParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler;
+- (void)toggleWithCompletionHandler:(StatusCompletion)completionHandler;
+- (void)offWithEffectWithParams:(CHIPOnOffClusterOffWithEffectParams *)params completionHandler:(StatusCompletion)completionHandler;
+- (void)onWithRecallGlobalSceneWithParams:(CHIPOnOffClusterOnWithRecallGlobalSceneParams * _Nullable)params
+                        completionHandler:(StatusCompletion)completionHandler;
+- (void)onWithRecallGlobalSceneWithCompletionHandler:(StatusCompletion)completionHandler;
+- (void)onWithTimedOffWithParams:(CHIPOnOffClusterOnWithTimedOffParams *)params
+               completionHandler:(StatusCompletion)completionHandler;
 
-- (void)readAttributeProductIDWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeOnOffWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeProductIDWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeProductIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeOnOffWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                        params:(CHIPSubscribeParams * _Nullable)params
+                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeOnOffWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                    endpoint:(NSNumber *)endpoint
+                                       queue:(dispatch_queue_t)queue
+                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeApplicationWithCompletionHandler:(void (^)(
-                                                          CHIPApplicationBasicClusterApplicationBasicApplication * _Nullable value,
-                                                          NSError * _Nullable error))completionHandler;
+- (void)readAttributeGlobalSceneControlWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeApplicationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:
-                                           (void (^)(CHIPApplicationBasicClusterApplicationBasicApplication * _Nullable value,
-                                               NSError * _Nullable error))reportHandler;
-+ (void)readAttributeApplicationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(CHIPApplicationBasicClusterApplicationBasicApplication * _Nullable value,
-                                         NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeGlobalSceneControlWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGlobalSceneControlWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeOnTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeOnTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOnTimeWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeOnTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
                                     maxInterval:(NSNumber * _Nonnull)maxInterval
                                          params:(CHIPSubscribeParams * _Nullable)params
                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeOnTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                      endpoint:(NSNumber *)endpoint
                                         queue:(dispatch_queue_t)queue
                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeApplicationVersionWithCompletionHandler:(void (^)(NSString * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler;
+- (void)readAttributeOffWaitTimeWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeOffWaitTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOffWaitTimeWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeApplicationVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeApplicationVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeOffWaitTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeOffWaitTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAllowedVendorListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeStartUpOnOffWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeStartUpOnOffWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeStartUpOnOffWithValue:(NSNumber * _Nullable)value
+                                     params:(CHIPWriteParams * _Nullable)params
+                          completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAllowedVendorListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAllowedVendorListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeStartUpOnOffWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeStartUpOnOffWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
@@ -736,60 +751,49 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Application Launcher
+ * Cluster On/off Switch Configuration
  *
  */
-@interface CHIPApplicationLauncher : CHIPCluster
+@interface CHIPOnOffSwitchConfiguration : CHIPCluster
 
-- (void)launchAppWithParams:(CHIPApplicationLauncherClusterLaunchAppParams *)params
-          completionHandler:(void (^)(CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable data,
-                                NSError * _Nullable error))completionHandler;
-- (void)stopAppWithParams:(CHIPApplicationLauncherClusterStopAppParams *)params
-        completionHandler:(void (^)(CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable data,
-                              NSError * _Nullable error))completionHandler;
-- (void)hideAppWithParams:(CHIPApplicationLauncherClusterHideAppParams *)params
-        completionHandler:(void (^)(CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable data,
-                              NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeCatalogListWithCompletionHandler:(void (^)(
-                                                          NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeCatalogListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCatalogListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeCurrentAppWithCompletionHandler:(void (^)(CHIPApplicationLauncherClusterApplicationEP * _Nullable value,
-                                                         NSError * _Nullable error))completionHandler;
-- (void)writeAttributeCurrentAppWithValue:(CHIPApplicationLauncherClusterApplicationEP * _Nullable)value
-                        completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCurrentAppWithValue:(CHIPApplicationLauncherClusterApplicationEP * _Nullable)value
-                                   params:(CHIPWriteParams * _Nullable)params
-                        completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeSwitchTypeWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCurrentAppWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeSwitchTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
                                         maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(CHIPSubscribeParams * _Nullable)params
                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(CHIPApplicationLauncherClusterApplicationEP * _Nullable value,
-                                                        NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentAppWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeSwitchTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                          endpoint:(NSNumber *)endpoint
                                             queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(CHIPApplicationLauncherClusterApplicationEP * _Nullable value,
-                                                      NSError * _Nullable error))completionHandler;
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeSwitchActionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
+- (void)writeAttributeSwitchActionsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSwitchActionsWithValue:(NSNumber * _Nonnull)value
+                                      params:(CHIPWriteParams * _Nullable)params
+                           completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeSwitchActionsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeSwitchActionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
@@ -885,365 +889,303 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Audio Output
+ * Cluster Level Control
  *
  */
-@interface CHIPAudioOutput : CHIPCluster
+@interface CHIPLevelControl : CHIPCluster
 
-- (void)selectOutputWithParams:(CHIPAudioOutputClusterSelectOutputParams *)params
-             completionHandler:(StatusCompletion)completionHandler;
-- (void)renameOutputWithParams:(CHIPAudioOutputClusterRenameOutputParams *)params
-             completionHandler:(StatusCompletion)completionHandler;
+- (void)moveToLevelWithParams:(CHIPLevelControlClusterMoveToLevelParams *)params
+            completionHandler:(StatusCompletion)completionHandler;
+- (void)moveWithParams:(CHIPLevelControlClusterMoveParams *)params completionHandler:(StatusCompletion)completionHandler;
+- (void)stepWithParams:(CHIPLevelControlClusterStepParams *)params completionHandler:(StatusCompletion)completionHandler;
+- (void)stopWithParams:(CHIPLevelControlClusterStopParams *)params completionHandler:(StatusCompletion)completionHandler;
+- (void)moveToLevelWithOnOffWithParams:(CHIPLevelControlClusterMoveToLevelWithOnOffParams *)params
+                     completionHandler:(StatusCompletion)completionHandler;
+- (void)moveWithOnOffWithParams:(CHIPLevelControlClusterMoveWithOnOffParams *)params
+              completionHandler:(StatusCompletion)completionHandler;
+- (void)stepWithOnOffWithParams:(CHIPLevelControlClusterStepWithOnOffParams *)params
+              completionHandler:(StatusCompletion)completionHandler;
+- (void)stopWithOnOffWithParams:(CHIPLevelControlClusterStopWithOnOffParams * _Nullable)params
+              completionHandler:(StatusCompletion)completionHandler;
+- (void)stopWithOnOffWithCompletionHandler:(StatusCompletion)completionHandler;
+- (void)moveToClosestFrequencyWithParams:(CHIPLevelControlClusterMoveToClosestFrequencyParams *)params
+                       completionHandler:(StatusCompletion)completionHandler;
 
-- (void)readAttributeOutputListWithCompletionHandler:(void (^)(
-                                                         NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeCurrentLevelWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeOutputListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOutputListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeCurrentLevelWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentLevelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCurrentOutputWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeRemainingTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                             NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCurrentOutputWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeRemainingTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:
                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentOutputWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeRemainingTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeMinLevelWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMinLevelWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMinLevelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeMaxLevelWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMaxLevelWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMaxLevelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeCurrentFrequencyWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeCurrentFrequencyWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentFrequencyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeMinFrequencyWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMinFrequencyWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMinFrequencyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeMaxFrequencyWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-@end
+- (void)subscribeAttributeMaxFrequencyWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMaxFrequencyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
+- (void)readAttributeOptionsWithCompletionHandler:(void (^)(
+                                                      NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeOptionsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOptionsWithValue:(NSNumber * _Nonnull)value
+                                params:(CHIPWriteParams * _Nullable)params
+                     completionHandler:(StatusCompletion)completionHandler;
 /**
- * Cluster Barrier Control
- *
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
  */
-@interface CHIPBarrierControl : CHIPCluster
-
-- (void)barrierControlGoToPercentWithParams:(CHIPBarrierControlClusterBarrierControlGoToPercentParams *)params
-                          completionHandler:(StatusCompletion)completionHandler;
-- (void)barrierControlStopWithParams:(CHIPBarrierControlClusterBarrierControlStopParams * _Nullable)params
-                   completionHandler:(StatusCompletion)completionHandler;
-- (void)barrierControlStopWithCompletionHandler:(StatusCompletion)completionHandler;
-
-- (void)readAttributeBarrierMovingStateWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeBarrierMovingStateWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBarrierMovingStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeBarrierSafetyStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeBarrierSafetyStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBarrierSafetyStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeOptionsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeOptionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeBarrierCapabilitiesWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeOnOffTransitionTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler;
+- (void)writeAttributeOnOffTransitionTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOnOffTransitionTimeWithValue:(NSNumber * _Nonnull)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeBarrierCapabilitiesWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeOnOffTransitionTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(CHIPSubscribeParams * _Nullable)params
                                      subscriptionEstablished:
                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                reportHandler:
                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBarrierCapabilitiesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeOnOffTransitionTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                   endpoint:(NSNumber *)endpoint
                                                      queue:(dispatch_queue_t)queue
                                          completionHandler:
                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeBarrierOpenEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
-- (void)writeAttributeBarrierOpenEventsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBarrierOpenEventsWithValue:(NSNumber * _Nonnull)value
-                                          params:(CHIPWriteParams * _Nullable)params
-                               completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeBarrierOpenEventsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBarrierOpenEventsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeBarrierCloseEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler;
-- (void)writeAttributeBarrierCloseEventsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBarrierCloseEventsWithValue:(NSNumber * _Nonnull)value
-                                           params:(CHIPWriteParams * _Nullable)params
-                                completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeBarrierCloseEventsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBarrierCloseEventsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeBarrierCommandOpenEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler;
-- (void)writeAttributeBarrierCommandOpenEventsWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBarrierCommandOpenEventsWithValue:(NSNumber * _Nonnull)value
-                                                 params:(CHIPWriteParams * _Nullable)params
-                                      completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeOnLevelWithCompletionHandler:(void (^)(
+                                                      NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeOnLevelWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOnLevelWithValue:(NSNumber * _Nullable)value
+                                params:(CHIPWriteParams * _Nullable)params
+                     completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeBarrierCommandOpenEventsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBarrierCommandOpenEventsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeOnLevelWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeOnLevelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeBarrierCommandCloseEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler;
-- (void)writeAttributeBarrierCommandCloseEventsWithValue:(NSNumber * _Nonnull)value
-                                       completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBarrierCommandCloseEventsWithValue:(NSNumber * _Nonnull)value
-                                                  params:(CHIPWriteParams * _Nullable)params
-                                       completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeOnTransitionTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
+- (void)writeAttributeOnTransitionTimeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOnTransitionTimeWithValue:(NSNumber * _Nullable)value
+                                         params:(CHIPWriteParams * _Nullable)params
+                              completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeBarrierCommandCloseEventsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                            params:(CHIPSubscribeParams * _Nullable)params
-                                           subscriptionEstablished:
-                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBarrierCommandCloseEventsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                        endpoint:(NSNumber *)endpoint
-                                                           queue:(dispatch_queue_t)queue
-                                               completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeOnTransitionTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeOnTransitionTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeBarrierOpenPeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeOffTransitionTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                 NSError * _Nullable error))completionHandler;
-- (void)writeAttributeBarrierOpenPeriodWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBarrierOpenPeriodWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeOffTransitionTimeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOffTransitionTimeWithValue:(NSNumber * _Nullable)value
                                           params:(CHIPWriteParams * _Nullable)params
                                completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeBarrierOpenPeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeOffTransitionTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(CHIPSubscribeParams * _Nullable)params
                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                              reportHandler:
                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBarrierOpenPeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeOffTransitionTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                 endpoint:(NSNumber *)endpoint
                                                    queue:(dispatch_queue_t)queue
                                        completionHandler:
                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeBarrierClosePeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler;
-- (void)writeAttributeBarrierClosePeriodWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBarrierClosePeriodWithValue:(NSNumber * _Nonnull)value
-                                           params:(CHIPWriteParams * _Nullable)params
-                                completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeBarrierClosePeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBarrierClosePeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeBarrierPositionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeDefaultMoveRateWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                               NSError * _Nullable error))completionHandler;
+- (void)writeAttributeDefaultMoveRateWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDefaultMoveRateWithValue:(NSNumber * _Nullable)value
+                                        params:(CHIPWriteParams * _Nullable)params
+                             completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeBarrierPositionWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeDefaultMoveRateWithMinInterval:(NSNumber * _Nonnull)minInterval
                                              maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(CHIPSubscribeParams * _Nullable)params
                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                            reportHandler:
                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBarrierPositionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeDefaultMoveRateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                               endpoint:(NSNumber *)endpoint
                                                  queue:(dispatch_queue_t)queue
                                      completionHandler:
                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
+- (void)readAttributeStartUpCurrentLevelWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
+- (void)writeAttributeStartUpCurrentLevelWithValue:(NSNumber * _Nullable)value
+                                 completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeStartUpCurrentLevelWithValue:(NSNumber * _Nullable)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeStartUpCurrentLevelWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeStartUpCurrentLevelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
 /**
@@ -1338,373 +1280,353 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Basic
+ * Cluster Binary Input (Basic)
  *
  */
-@interface CHIPBasic : CHIPCluster
-
-- (void)mfgSpecificPingWithParams:(CHIPBasicClusterMfgSpecificPingParams * _Nullable)params
-                completionHandler:(StatusCompletion)completionHandler;
-- (void)mfgSpecificPingWithCompletionHandler:(StatusCompletion)completionHandler;
+@interface CHIPBinaryInputBasic : CHIPCluster
 
-- (void)readAttributeDataModelRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeDataModelRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDataModelRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeVendorNameWithCompletionHandler:(void (^)(
+- (void)readAttributeActiveTextWithCompletionHandler:(void (^)(
                                                          NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeActiveTextWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeActiveTextWithValue:(NSString * _Nonnull)value
+                                   params:(CHIPWriteParams * _Nullable)params
+                        completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeVendorNameWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeActiveTextWithMinInterval:(NSNumber * _Nonnull)minInterval
                                         maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(CHIPSubscribeParams * _Nullable)params
                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                       reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeVendorNameWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeActiveTextWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                          endpoint:(NSNumber *)endpoint
                                             queue:(dispatch_queue_t)queue
                                 completionHandler:
                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeVendorIDWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeVendorIDWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeVendorIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeProductNameWithCompletionHandler:(void (^)(
+- (void)readAttributeDescriptionWithCompletionHandler:(void (^)(
                                                           NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeDescriptionWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDescriptionWithValue:(NSString * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeProductNameWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeDescriptionWithMinInterval:(NSNumber * _Nonnull)minInterval
                                          maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(CHIPSubscribeParams * _Nullable)params
                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                        reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeProductNameWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeDescriptionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                           endpoint:(NSNumber *)endpoint
                                              queue:(dispatch_queue_t)queue
                                  completionHandler:
                                      (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeProductIDWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeInactiveTextWithCompletionHandler:(void (^)(
+                                                           NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeInactiveTextWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInactiveTextWithValue:(NSString * _Nonnull)value
+                                     params:(CHIPWriteParams * _Nullable)params
+                          completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeProductIDWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeProductIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeInactiveTextWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeInactiveTextWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNodeLabelWithCompletionHandler:(void (^)(
-                                                        NSString * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNodeLabelWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNodeLabelWithValue:(NSString * _Nonnull)value
-                                  params:(CHIPWriteParams * _Nullable)params
-                       completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeOutOfServiceWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeOutOfServiceWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOutOfServiceWithValue:(NSNumber * _Nonnull)value
+                                     params:(CHIPWriteParams * _Nullable)params
+                          completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNodeLabelWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNodeLabelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeOutOfServiceWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeOutOfServiceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeLocationWithCompletionHandler:(void (^)(
-                                                       NSString * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeLocationWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeLocationWithValue:(NSString * _Nonnull)value
-                                 params:(CHIPWriteParams * _Nullable)params
-                      completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributePolarityWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeLocationWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributePolarityWithMinInterval:(NSNumber * _Nonnull)minInterval
                                       maxInterval:(NSNumber * _Nonnull)maxInterval
                                            params:(CHIPSubscribeParams * _Nullable)params
                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLocationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePolarityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                        endpoint:(NSNumber *)endpoint
                                           queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeHardwareVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributePresentValueWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributePresentValueWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePresentValueWithValue:(NSNumber * _Nonnull)value
+                                     params:(CHIPWriteParams * _Nullable)params
+                          completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeHardwareVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeHardwareVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePresentValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePresentValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeHardwareVersionStringWithCompletionHandler:(void (^)(NSString * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
+- (void)readAttributeReliabilityWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeReliabilityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeReliabilityWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeHardwareVersionStringWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeHardwareVersionStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeReliabilityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeReliabilityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeSoftwareVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeStatusFlagsWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeStatusFlagsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeStatusFlagsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeApplicationTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeSoftwareVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeApplicationTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
                                              maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(CHIPSubscribeParams * _Nullable)params
                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                            reportHandler:
                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSoftwareVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeApplicationTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                               endpoint:(NSNumber *)endpoint
                                                  queue:(dispatch_queue_t)queue
                                      completionHandler:
                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeSoftwareVersionStringWithCompletionHandler:(void (^)(NSString * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeSoftwareVersionStringWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSoftwareVersionStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeManufacturingDateWithCompletionHandler:(void (^)(NSString * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeManufacturingDateWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeManufacturingDateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributePartNumberWithCompletionHandler:(void (^)(
-                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePartNumberWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePartNumberWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeProductURLWithCompletionHandler:(void (^)(
-                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeProductURLWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
                                         maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(CHIPSubscribeParams * _Nullable)params
                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeProductURLWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                          endpoint:(NSNumber *)endpoint
                                             queue:(dispatch_queue_t)queue
                                 completionHandler:
-                                    (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeProductLabelWithCompletionHandler:(void (^)(
-                                                           NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeProductLabelWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeProductLabelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+@end
 
-- (void)readAttributeSerialNumberWithCompletionHandler:(void (^)(
-                                                           NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
+ * Cluster Descriptor
+ *
  */
-- (void)subscribeAttributeSerialNumberWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSerialNumberWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+@interface CHIPDescriptor : CHIPCluster
 
-- (void)readAttributeLocalConfigDisabledWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
-- (void)writeAttributeLocalConfigDisabledWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeLocalConfigDisabledWithValue:(NSNumber * _Nonnull)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeDeviceListWithCompletionHandler:(void (^)(
+                                                         NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeLocalConfigDisabledWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLocalConfigDisabledWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeDeviceListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDeviceListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeReachableWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeServerListWithCompletionHandler:(void (^)(
+                                                         NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeReachableWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeReachableWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeServerListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeServerListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeUniqueIDWithCompletionHandler:(void (^)(
-                                                       NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeClientListWithCompletionHandler:(void (^)(
+                                                         NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeUniqueIDWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeUniqueIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeClientListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClientListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCapabilityMinimaWithCompletionHandler:(void (^)(CHIPBasicClusterCapabilityMinimaStruct * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
+- (void)readAttributePartsListWithCompletionHandler:(void (^)(
+                                                        NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCapabilityMinimaWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:(void (^)(CHIPBasicClusterCapabilityMinimaStruct * _Nullable value,
-                                                              NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCapabilityMinimaWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:(void (^)(CHIPBasicClusterCapabilityMinimaStruct * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePartsListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePartsListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
@@ -1800,193 +1722,33 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Binary Input (Basic)
+ * Cluster Binding
  *
  */
-@interface CHIPBinaryInputBasic : CHIPCluster
+@interface CHIPBinding : CHIPCluster
 
-- (void)readAttributeActiveTextWithCompletionHandler:(void (^)(
-                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeActiveTextWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeActiveTextWithValue:(NSString * _Nonnull)value
-                                   params:(CHIPWriteParams * _Nullable)params
-                        completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeBindingWithParams:(CHIPReadParams * _Nullable)params
+                     completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeBindingWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBindingWithValue:(NSArray * _Nonnull)value
+                                params:(CHIPWriteParams * _Nullable)params
+                     completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeActiveTextWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeActiveTextWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBindingWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeBindingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeDescriptionWithCompletionHandler:(void (^)(
-                                                          NSString * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeDescriptionWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDescriptionWithValue:(NSString * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeDescriptionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDescriptionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeInactiveTextWithCompletionHandler:(void (^)(
-                                                           NSString * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeInactiveTextWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInactiveTextWithValue:(NSString * _Nonnull)value
-                                     params:(CHIPWriteParams * _Nullable)params
-                          completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeInactiveTextWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInactiveTextWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeOutOfServiceWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeOutOfServiceWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOutOfServiceWithValue:(NSNumber * _Nonnull)value
-                                     params:(CHIPWriteParams * _Nullable)params
-                          completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeOutOfServiceWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOutOfServiceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributePolarityWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributePolarityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePolarityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributePresentValueWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributePresentValueWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePresentValueWithValue:(NSNumber * _Nonnull)value
-                                     params:(CHIPWriteParams * _Nullable)params
-                          completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributePresentValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePresentValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeReliabilityWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeReliabilityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeReliabilityWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeReliabilityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeReliabilityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeStatusFlagsWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeStatusFlagsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeStatusFlagsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeApplicationTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeApplicationTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeApplicationTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
@@ -2079,30 +1841,107 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Binding
+ * Cluster Access Control
  *
  */
-@interface CHIPBinding : CHIPCluster
+@interface CHIPAccessControl : CHIPCluster
 
-- (void)readAttributeBindingWithParams:(CHIPReadParams * _Nullable)params
-                     completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeBindingWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBindingWithValue:(NSArray * _Nonnull)value
-                                params:(CHIPWriteParams * _Nullable)params
-                     completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAclWithParams:(CHIPReadParams * _Nullable)params
+                 completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeAclWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAclWithValue:(NSArray * _Nonnull)value
+                            params:(CHIPWriteParams * _Nullable)params
+                 completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeBindingWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBindingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAclWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                      params:(CHIPSubscribeParams * _Nullable)params
+                     subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                               reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAclWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                  endpoint:(NSNumber *)endpoint
+                                     queue:(dispatch_queue_t)queue
+                         completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeExtensionWithParams:(CHIPReadParams * _Nullable)params
+                       completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeExtensionWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeExtensionWithValue:(NSArray * _Nonnull)value
+                                  params:(CHIPWriteParams * _Nullable)params
+                       completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeExtensionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeExtensionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeSubjectsPerAccessControlEntryWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeSubjectsPerAccessControlEntryWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                params:(CHIPSubscribeParams * _Nullable)params
+                                               subscriptionEstablished:
+                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))reportHandler;
++ (void)readAttributeSubjectsPerAccessControlEntryWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                            endpoint:(NSNumber *)endpoint
+                                                               queue:(dispatch_queue_t)queue
+                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeTargetsPerAccessControlEntryWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeTargetsPerAccessControlEntryWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                              subscriptionEstablished:
+                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))reportHandler;
++ (void)readAttributeTargetsPerAccessControlEntryWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                           endpoint:(NSNumber *)endpoint
+                                                              queue:(dispatch_queue_t)queue
+                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeAccessControlEntriesPerFabricWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeAccessControlEntriesPerFabricWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                params:(CHIPSubscribeParams * _Nullable)params
+                                               subscriptionEstablished:
+                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))reportHandler;
++ (void)readAttributeAccessControlEntriesPerFabricWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                            endpoint:(NSNumber *)endpoint
+                                                               queue:(dispatch_queue_t)queue
+                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler;
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
@@ -2198,126 +2037,10 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Boolean State
+ * Cluster Bridged Actions
  *
  */
-@interface CHIPBooleanState : CHIPCluster
-
-- (void)readAttributeStateValueWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeStateValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeStateValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-@end
-
-/**
- * Cluster Bridged Actions
- *
- */
-@interface CHIPBridgedActions : CHIPCluster
+@interface CHIPBridgedActions : CHIPCluster
 
 - (void)instantActionWithParams:(CHIPBridgedActionsClusterInstantActionParams *)params
               completionHandler:(StatusCompletion)completionHandler;
@@ -2487,10 +2210,32 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Bridged Device Basic
+ * Cluster Basic
  *
  */
-@interface CHIPBridgedDeviceBasic : CHIPCluster
+@interface CHIPBasic : CHIPCluster
+
+- (void)mfgSpecificPingWithParams:(CHIPBasicClusterMfgSpecificPingParams * _Nullable)params
+                completionHandler:(StatusCompletion)completionHandler;
+- (void)mfgSpecificPingWithCompletionHandler:(StatusCompletion)completionHandler;
+
+- (void)readAttributeDataModelRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeDataModelRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDataModelRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
 - (void)readAttributeVendorNameWithCompletionHandler:(void (^)(
                                                          NSString * _Nullable value, NSError * _Nullable error))completionHandler;
@@ -2542,6 +2287,22 @@ NS_ASSUME_NONNULL_BEGIN
                                  completionHandler:
                                      (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
+- (void)readAttributeProductIDWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeProductIDWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeProductIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
 - (void)readAttributeNodeLabelWithCompletionHandler:(void (^)(
                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 - (void)writeAttributeNodeLabelWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -2562,6 +2323,26 @@ NS_ASSUME_NONNULL_BEGIN
                                            queue:(dispatch_queue_t)queue
                                completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
+- (void)readAttributeLocationWithCompletionHandler:(void (^)(
+                                                       NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeLocationWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeLocationWithValue:(NSString * _Nonnull)value
+                                 params:(CHIPWriteParams * _Nullable)params
+                      completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeLocationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeLocationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+
 - (void)readAttributeHardwareVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                               NSError * _Nullable error))completionHandler;
 /**
@@ -2724,6 +2505,29 @@ NS_ASSUME_NONNULL_BEGIN
                                   completionHandler:
                                       (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
+- (void)readAttributeLocalConfigDisabledWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
+- (void)writeAttributeLocalConfigDisabledWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeLocalConfigDisabledWithValue:(NSNumber * _Nonnull)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeLocalConfigDisabledWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeLocalConfigDisabledWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
 - (void)readAttributeReachableWithCompletionHandler:(void (^)(
                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
@@ -2756,6 +2560,24 @@ NS_ASSUME_NONNULL_BEGIN
                                           queue:(dispatch_queue_t)queue
                               completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
+- (void)readAttributeCapabilityMinimaWithCompletionHandler:(void (^)(CHIPBasicClusterCapabilityMinimaStruct * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeCapabilityMinimaWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:(void (^)(CHIPBasicClusterCapabilityMinimaStruct * _Nullable value,
+                                                              NSError * _Nullable error))reportHandler;
++ (void)readAttributeCapabilityMinimaWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:(void (^)(CHIPBasicClusterCapabilityMinimaStruct * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
+
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
 /**
@@ -2850,73 +2672,22 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Channel
+ * Cluster OTA Software Update Provider
  *
  */
-@interface CHIPChannel : CHIPCluster
-
-- (void)changeChannelWithParams:(CHIPChannelClusterChangeChannelParams *)params
-              completionHandler:(void (^)(CHIPChannelClusterChangeChannelResponseParams * _Nullable data,
-                                    NSError * _Nullable error))completionHandler;
-- (void)changeChannelByNumberWithParams:(CHIPChannelClusterChangeChannelByNumberParams *)params
-                      completionHandler:(StatusCompletion)completionHandler;
-- (void)skipChannelWithParams:(CHIPChannelClusterSkipChannelParams *)params completionHandler:(StatusCompletion)completionHandler;
+@interface CHIPOtaSoftwareUpdateProvider : CHIPCluster
 
-- (void)readAttributeChannelListWithCompletionHandler:(void (^)(
-                                                          NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeChannelListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeChannelListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)queryImageWithParams:(CHIPOtaSoftwareUpdateProviderClusterQueryImageParams *)params
+           completionHandler:(void (^)(CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseParams * _Nullable data,
+                                 NSError * _Nullable error))completionHandler;
+- (void)applyUpdateRequestWithParams:(CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestParams *)params
+                   completionHandler:(void (^)(CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseParams * _Nullable data,
+                                         NSError * _Nullable error))completionHandler;
+- (void)notifyUpdateAppliedWithParams:(CHIPOtaSoftwareUpdateProviderClusterNotifyUpdateAppliedParams *)params
+                    completionHandler:(StatusCompletion)completionHandler;
 
-- (void)readAttributeLineupWithCompletionHandler:(void (^)(CHIPChannelClusterLineupInfo * _Nullable value,
-                                                     NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeLineupWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(CHIPChannelClusterLineupInfo * _Nullable value,
-                                                    NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLineupWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(CHIPChannelClusterLineupInfo * _Nullable value,
-                                                  NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeCurrentChannelWithCompletionHandler:(void (^)(CHIPChannelClusterChannelInfo * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeCurrentChannelWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:(void (^)(CHIPChannelClusterChannelInfo * _Nullable value,
-                                                            NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentChannelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:(void (^)(CHIPChannelClusterChannelInfo * _Nullable value,
-                                                          NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
@@ -3009,1423 +2780,1295 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Color Control
+ * Cluster OTA Software Update Requestor
  *
  */
-@interface CHIPColorControl : CHIPCluster
-
-- (void)moveToHueWithParams:(CHIPColorControlClusterMoveToHueParams *)params completionHandler:(StatusCompletion)completionHandler;
-- (void)moveHueWithParams:(CHIPColorControlClusterMoveHueParams *)params completionHandler:(StatusCompletion)completionHandler;
-- (void)stepHueWithParams:(CHIPColorControlClusterStepHueParams *)params completionHandler:(StatusCompletion)completionHandler;
-- (void)moveToSaturationWithParams:(CHIPColorControlClusterMoveToSaturationParams *)params
-                 completionHandler:(StatusCompletion)completionHandler;
-- (void)moveSaturationWithParams:(CHIPColorControlClusterMoveSaturationParams *)params
-               completionHandler:(StatusCompletion)completionHandler;
-- (void)stepSaturationWithParams:(CHIPColorControlClusterStepSaturationParams *)params
-               completionHandler:(StatusCompletion)completionHandler;
-- (void)moveToHueAndSaturationWithParams:(CHIPColorControlClusterMoveToHueAndSaturationParams *)params
-                       completionHandler:(StatusCompletion)completionHandler;
-- (void)moveToColorWithParams:(CHIPColorControlClusterMoveToColorParams *)params
-            completionHandler:(StatusCompletion)completionHandler;
-- (void)moveColorWithParams:(CHIPColorControlClusterMoveColorParams *)params completionHandler:(StatusCompletion)completionHandler;
-- (void)stepColorWithParams:(CHIPColorControlClusterStepColorParams *)params completionHandler:(StatusCompletion)completionHandler;
-- (void)moveToColorTemperatureWithParams:(CHIPColorControlClusterMoveToColorTemperatureParams *)params
-                       completionHandler:(StatusCompletion)completionHandler;
-- (void)enhancedMoveToHueWithParams:(CHIPColorControlClusterEnhancedMoveToHueParams *)params
-                  completionHandler:(StatusCompletion)completionHandler;
-- (void)enhancedMoveHueWithParams:(CHIPColorControlClusterEnhancedMoveHueParams *)params
-                completionHandler:(StatusCompletion)completionHandler;
-- (void)enhancedStepHueWithParams:(CHIPColorControlClusterEnhancedStepHueParams *)params
-                completionHandler:(StatusCompletion)completionHandler;
-- (void)enhancedMoveToHueAndSaturationWithParams:(CHIPColorControlClusterEnhancedMoveToHueAndSaturationParams *)params
-                               completionHandler:(StatusCompletion)completionHandler;
-- (void)colorLoopSetWithParams:(CHIPColorControlClusterColorLoopSetParams *)params
-             completionHandler:(StatusCompletion)completionHandler;
-- (void)stopMoveStepWithParams:(CHIPColorControlClusterStopMoveStepParams *)params
-             completionHandler:(StatusCompletion)completionHandler;
-- (void)moveColorTemperatureWithParams:(CHIPColorControlClusterMoveColorTemperatureParams *)params
-                     completionHandler:(StatusCompletion)completionHandler;
-- (void)stepColorTemperatureWithParams:(CHIPColorControlClusterStepColorTemperatureParams *)params
-                     completionHandler:(StatusCompletion)completionHandler;
+@interface CHIPOtaSoftwareUpdateRequestor : CHIPCluster
 
-- (void)readAttributeCurrentHueWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeCurrentHueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentHueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)announceOtaProviderWithParams:(CHIPOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderParams *)params
+                    completionHandler:(StatusCompletion)completionHandler;
 
-- (void)readAttributeCurrentSaturationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeDefaultOtaProvidersWithParams:(CHIPReadParams * _Nullable)params
+                                 completionHandler:
+                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeDefaultOtaProvidersWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDefaultOtaProvidersWithValue:(NSArray * _Nonnull)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCurrentSaturationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentSaturationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeDefaultOtaProvidersWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDefaultOtaProvidersWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRemainingTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributeUpdatePossibleWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRemainingTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRemainingTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeUpdatePossibleWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeUpdatePossibleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCurrentXWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeUpdateStateWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCurrentXWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentXWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeUpdateStateWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeUpdateStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCurrentYWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeUpdateStateProgressWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCurrentYWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentYWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeUpdateStateProgressWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeUpdateStateProgressWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeDriftCompensationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeDriftCompensationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDriftCompensationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCompensationTextWithCompletionHandler:(void (^)(NSString * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCompensationTextWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCompensationTextWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeColorTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeColorTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeColorTemperatureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeColorModeWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeColorModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeColorModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeOptionsWithCompletionHandler:(void (^)(
-                                                      NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeOptionsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOptionsWithValue:(NSNumber * _Nonnull)value
-                                params:(CHIPWriteParams * _Nullable)params
-                     completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeOptionsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOptionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+@end
 
-- (void)readAttributeNumberOfPrimariesWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
 /**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
+ * Cluster Localization Configuration
+ *
  */
-- (void)subscribeAttributeNumberOfPrimariesWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNumberOfPrimariesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+@interface CHIPLocalizationConfiguration : CHIPCluster
 
-- (void)readAttributePrimary1XWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeActiveLocaleWithCompletionHandler:(void (^)(
+                                                           NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeActiveLocaleWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeActiveLocaleWithValue:(NSString * _Nonnull)value
+                                     params:(CHIPWriteParams * _Nullable)params
+                          completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePrimary1XWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePrimary1XWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeActiveLocaleWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeActiveLocaleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePrimary1YWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeSupportedLocalesWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePrimary1YWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePrimary1YWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeSupportedLocalesWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeSupportedLocalesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePrimary1IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePrimary1IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePrimary1IntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePrimary2XWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePrimary2XWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePrimary2XWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePrimary2YWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePrimary2YWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePrimary2YWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePrimary2IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePrimary2IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePrimary2IntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePrimary3XWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePrimary3XWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePrimary3XWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+@end
 
-- (void)readAttributePrimary3YWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
+ * Cluster Time Format Localization
+ *
  */
-- (void)subscribeAttributePrimary3YWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePrimary3YWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+@interface CHIPTimeFormatLocalization : CHIPCluster
 
-- (void)readAttributePrimary3IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeHourFormatWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeHourFormatWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeHourFormatWithValue:(NSNumber * _Nonnull)value
+                                   params:(CHIPWriteParams * _Nullable)params
+                        completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePrimary3IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePrimary3IntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeHourFormatWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeHourFormatWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePrimary4XWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeActiveCalendarTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler;
+- (void)writeAttributeActiveCalendarTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeActiveCalendarTypeWithValue:(NSNumber * _Nonnull)value
+                                           params:(CHIPWriteParams * _Nullable)params
+                                completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePrimary4XWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePrimary4XWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeActiveCalendarTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeActiveCalendarTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePrimary4YWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeSupportedCalendarTypesWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePrimary4YWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePrimary4YWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeSupportedCalendarTypesWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:
+                                                      (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeSupportedCalendarTypesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePrimary4IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePrimary4IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePrimary4IntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePrimary5XWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePrimary5XWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePrimary5XWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePrimary5YWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePrimary5YWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePrimary5YWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePrimary5IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePrimary5IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePrimary5IntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePrimary6XWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePrimary6XWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePrimary6XWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+@end
 
-- (void)readAttributePrimary6YWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * Cluster Unit Localization
+ *
+ */
+@interface CHIPUnitLocalization : CHIPCluster
+
+- (void)readAttributeTemperatureUnitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
+- (void)writeAttributeTemperatureUnitWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTemperatureUnitWithValue:(NSNumber * _Nonnull)value
+                                        params:(CHIPWriteParams * _Nullable)params
+                             completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePrimary6YWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePrimary6YWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeTemperatureUnitWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeTemperatureUnitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePrimary6IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePrimary6IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePrimary6IntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeWhitePointXWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeWhitePointXWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeWhitePointXWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeWhitePointXWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeWhitePointXWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeWhitePointYWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeWhitePointYWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeWhitePointYWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeWhitePointYWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeWhitePointYWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeColorPointRXWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeColorPointRXWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeColorPointRXWithValue:(NSNumber * _Nonnull)value
-                                     params:(CHIPWriteParams * _Nullable)params
-                          completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeColorPointRXWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeColorPointRXWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeColorPointRYWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeColorPointRYWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeColorPointRYWithValue:(NSNumber * _Nonnull)value
-                                     params:(CHIPWriteParams * _Nullable)params
-                          completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeColorPointRYWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeColorPointRYWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeColorPointRIntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
-- (void)writeAttributeColorPointRIntensityWithValue:(NSNumber * _Nullable)value
-                                  completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeColorPointRIntensityWithValue:(NSNumber * _Nullable)value
-                                             params:(CHIPWriteParams * _Nullable)params
-                                  completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeColorPointRIntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeColorPointRIntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+@end
 
-- (void)readAttributeColorPointGXWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeColorPointGXWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeColorPointGXWithValue:(NSNumber * _Nonnull)value
-                                     params:(CHIPWriteParams * _Nullable)params
-                          completionHandler:(StatusCompletion)completionHandler;
 /**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
+ * Cluster Power Source Configuration
+ *
  */
-- (void)subscribeAttributeColorPointGXWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeColorPointGXWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+@interface CHIPPowerSourceConfiguration : CHIPCluster
 
-- (void)readAttributeColorPointGYWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeColorPointGYWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeColorPointGYWithValue:(NSNumber * _Nonnull)value
-                                     params:(CHIPWriteParams * _Nullable)params
-                          completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeSourcesWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeColorPointGYWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeColorPointGYWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeSourcesWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeSourcesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeColorPointGIntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
-- (void)writeAttributeColorPointGIntensityWithValue:(NSNumber * _Nullable)value
-                                  completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeColorPointGIntensityWithValue:(NSNumber * _Nullable)value
-                                             params:(CHIPWriteParams * _Nullable)params
-                                  completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeColorPointGIntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(CHIPSubscribeParams * _Nullable)params
                                       subscriptionEstablished:
                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                 reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeColorPointGIntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                    endpoint:(NSNumber *)endpoint
                                                       queue:(dispatch_queue_t)queue
                                           completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeColorPointBXWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeColorPointBXWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeColorPointBXWithValue:(NSNumber * _Nonnull)value
-                                     params:(CHIPWriteParams * _Nullable)params
-                          completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeColorPointBXWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeColorPointBXWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeColorPointBYWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeColorPointBYWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeColorPointBYWithValue:(NSNumber * _Nonnull)value
-                                     params:(CHIPWriteParams * _Nullable)params
-                          completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeColorPointBYWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeColorPointBYWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeColorPointBIntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
-- (void)writeAttributeColorPointBIntensityWithValue:(NSNumber * _Nullable)value
-                                  completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeColorPointBIntensityWithValue:(NSNumber * _Nullable)value
-                                             params:(CHIPWriteParams * _Nullable)params
-                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeColorPointBIntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeColorPointBIntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeEnhancedCurrentHueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler;
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeEnhancedCurrentHueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeEnhancedCurrentHueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeEnhancedColorModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeEnhancedColorModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeEnhancedColorModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeColorLoopActiveWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeColorLoopActiveWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
                                              maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(CHIPSubscribeParams * _Nullable)params
                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                            reportHandler:
                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeColorLoopActiveWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                               endpoint:(NSNumber *)endpoint
                                                  queue:(dispatch_queue_t)queue
                                      completionHandler:
                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeColorLoopDirectionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler;
+@end
+
+/**
+ * Cluster Power Source
+ *
+ */
+@interface CHIPPowerSource : CHIPCluster
+
+- (void)readAttributeStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeColorLoopDirectionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeColorLoopDirectionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeColorLoopTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributeOrderWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeColorLoopTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeColorLoopTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeOrderWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                        params:(CHIPSubscribeParams * _Nullable)params
+                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeOrderWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                    endpoint:(NSNumber *)endpoint
+                                       queue:(dispatch_queue_t)queue
+                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeColorLoopStartEnhancedHueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeDescriptionWithCompletionHandler:(void (^)(
+                                                          NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeDescriptionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDescriptionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeWiredAssessedInputVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                         NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeColorLoopStartEnhancedHueWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeWiredAssessedInputVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
                                                             params:(CHIPSubscribeParams * _Nullable)params
                                            subscriptionEstablished:
                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
                                                                        NSError * _Nullable error))reportHandler;
-+ (void)readAttributeColorLoopStartEnhancedHueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeWiredAssessedInputVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                         endpoint:(NSNumber *)endpoint
                                                            queue:(dispatch_queue_t)queue
                                                completionHandler:(void (^)(NSNumber * _Nullable value,
                                                                      NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeColorLoopStoredEnhancedHueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeColorLoopStoredEnhancedHueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler;
-+ (void)readAttributeColorLoopStoredEnhancedHueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeColorCapabilitiesWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeWiredAssessedInputFrequencyWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeColorCapabilitiesWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeColorCapabilitiesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeWiredAssessedInputFrequencyWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                              params:(CHIPSubscribeParams * _Nullable)params
+                                             subscriptionEstablished:
+                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))reportHandler;
++ (void)readAttributeWiredAssessedInputFrequencyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                          endpoint:(NSNumber *)endpoint
+                                                             queue:(dispatch_queue_t)queue
+                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeColorTempPhysicalMinMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler;
+- (void)readAttributeWiredCurrentTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeColorTempPhysicalMinMiredsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler;
-+ (void)readAttributeColorTempPhysicalMinMiredsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeColorTempPhysicalMaxMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeColorTempPhysicalMaxMiredsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler;
-+ (void)readAttributeColorTempPhysicalMaxMiredsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeCoupleColorTempToLevelMinMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeCoupleColorTempToLevelMinMiredsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                                 subscriptionEstablished:
-                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCoupleColorTempToLevelMinMiredsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                              endpoint:(NSNumber *)endpoint
-                                                                 queue:(dispatch_queue_t)queue
-                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeStartUpColorTemperatureMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler;
-- (void)writeAttributeStartUpColorTemperatureMiredsWithValue:(NSNumber * _Nonnull)value
-                                           completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeStartUpColorTemperatureMiredsWithValue:(NSNumber * _Nonnull)value
-                                                      params:(CHIPWriteParams * _Nullable)params
-                                           completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeStartUpColorTemperatureMiredsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                params:(CHIPSubscribeParams * _Nullable)params
-                                               subscriptionEstablished:
-                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))reportHandler;
-+ (void)readAttributeStartUpColorTemperatureMiredsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                            endpoint:(NSNumber *)endpoint
-                                                               queue:(dispatch_queue_t)queue
-                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeWiredCurrentTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeWiredCurrentTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+- (void)readAttributeWiredAssessedCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeWiredAssessedCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(CHIPSubscribeParams * _Nullable)params
                                       subscriptionEstablished:
                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                 reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeWiredAssessedCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                    endpoint:(NSNumber *)endpoint
                                                       queue:(dispatch_queue_t)queue
                                           completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+- (void)readAttributeWiredNominalVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeWiredNominalVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(CHIPSubscribeParams * _Nullable)params
                                      subscriptionEstablished:
                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeWiredNominalVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                   endpoint:(NSNumber *)endpoint
                                                      queue:(dispatch_queue_t)queue
                                          completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeWiredMaximumCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-@end
-
-/**
- * Cluster Content Launcher
- *
- */
-@interface CHIPContentLauncher : CHIPCluster
-
-- (void)launchContentWithParams:(CHIPContentLauncherClusterLaunchContentParams *)params
-              completionHandler:(void (^)(CHIPContentLauncherClusterLaunchResponseParams * _Nullable data,
-                                    NSError * _Nullable error))completionHandler;
-- (void)launchURLWithParams:(CHIPContentLauncherClusterLaunchURLParams *)params
-          completionHandler:(void (^)(CHIPContentLauncherClusterLaunchResponseParams * _Nullable data,
-                                NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeWiredMaximumCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeWiredMaximumCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptHeaderWithCompletionHandler:(void (^)(
-                                                           NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeWiredPresentWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptHeaderWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeWiredPresentWithMinInterval:(NSNumber * _Nonnull)minInterval
                                           maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(CHIPSubscribeParams * _Nullable)params
                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptHeaderWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeWiredPresentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                            endpoint:(NSNumber *)endpoint
                                               queue:(dispatch_queue_t)queue
                                   completionHandler:
-                                      (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeSupportedStreamingProtocolsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler;
-- (void)writeAttributeSupportedStreamingProtocolsWithValue:(NSNumber * _Nonnull)value
-                                         completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSupportedStreamingProtocolsWithValue:(NSNumber * _Nonnull)value
-                                                    params:(CHIPWriteParams * _Nullable)params
-                                         completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeActiveWiredFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeSupportedStreamingProtocolsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                              params:(CHIPSubscribeParams * _Nullable)params
-                                             subscriptionEstablished:
-                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSupportedStreamingProtocolsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                          endpoint:(NSNumber *)endpoint
-                                                             queue:(dispatch_queue_t)queue
-                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeActiveWiredFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeActiveWiredFaultsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeBatteryVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBatteryVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeBatteryVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeBatteryPercentRemainingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-@end
-
-/**
- * Cluster Descriptor
- *
- */
-@interface CHIPDescriptor : CHIPCluster
+- (void)subscribeAttributeBatteryPercentRemainingWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler;
++ (void)readAttributeBatteryPercentRemainingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeDeviceListWithCompletionHandler:(void (^)(
-                                                         NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeBatteryTimeRemainingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeDeviceListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDeviceListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBatteryTimeRemainingWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeBatteryTimeRemainingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeServerListWithCompletionHandler:(void (^)(
-                                                         NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeBatteryChargeLevelWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeServerListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeServerListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBatteryChargeLevelWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeBatteryChargeLevelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeClientListWithCompletionHandler:(void (^)(
-                                                         NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeBatteryReplacementNeededWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeClientListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClientListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBatteryReplacementNeededWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))reportHandler;
++ (void)readAttributeBatteryReplacementNeededWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePartsListWithCompletionHandler:(void (^)(
-                                                        NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeBatteryReplaceabilityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePartsListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePartsListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBatteryReplaceabilityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeBatteryReplaceabilityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeBatteryPresentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBatteryPresentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeBatteryPresentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+- (void)readAttributeActiveBatteryFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeActiveBatteryFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(CHIPSubscribeParams * _Nullable)params
                                      subscriptionEstablished:
                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeActiveBatteryFaultsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                   endpoint:(NSNumber *)endpoint
                                                      queue:(dispatch_queue_t)queue
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeBatteryReplacementDescriptionWithCompletionHandler:(void (^)(NSString * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBatteryReplacementDescriptionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                params:(CHIPSubscribeParams * _Nullable)params
+                                               subscriptionEstablished:
+                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                         reportHandler:(void (^)(NSString * _Nullable value,
+                                                                           NSError * _Nullable error))reportHandler;
++ (void)readAttributeBatteryReplacementDescriptionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                            endpoint:(NSNumber *)endpoint
+                                                               queue:(dispatch_queue_t)queue
+                                                   completionHandler:(void (^)(NSString * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeBatteryCommonDesignationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBatteryCommonDesignationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))reportHandler;
++ (void)readAttributeBatteryCommonDesignationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeBatteryANSIDesignationWithCompletionHandler:(void (^)(NSString * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeBatteryANSIDesignationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:(void (^)(NSString * _Nullable value,
+                                                                    NSError * _Nullable error))reportHandler;
++ (void)readAttributeBatteryANSIDesignationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeBatteryIECDesignationWithCompletionHandler:(void (^)(NSString * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeBatteryIECDesignationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeBatteryIECDesignationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeBatteryApprovedChemistryWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeBatteryApprovedChemistryWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))reportHandler;
++ (void)readAttributeBatteryApprovedChemistryWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeBatteryCapacityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeBatteryCapacityWithMinInterval:(NSNumber * _Nonnull)minInterval
                                              maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(CHIPSubscribeParams * _Nullable)params
                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                            reportHandler:
                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeBatteryCapacityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                               endpoint:(NSNumber *)endpoint
                                                  queue:(dispatch_queue_t)queue
                                      completionHandler:
                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-@end
+- (void)readAttributeBatteryQuantityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeBatteryQuantityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeBatteryQuantityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
+- (void)readAttributeBatteryChargeStateWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler;
 /**
- * Cluster Diagnostic Logs
- *
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
  */
-@interface CHIPDiagnosticLogs : CHIPCluster
+- (void)subscribeAttributeBatteryChargeStateWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeBatteryChargeStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)retrieveLogsRequestWithParams:(CHIPDiagnosticLogsClusterRetrieveLogsRequestParams *)params
-                    completionHandler:(void (^)(CHIPDiagnosticLogsClusterRetrieveLogsResponseParams * _Nullable data,
-                                          NSError * _Nullable error))completionHandler;
+- (void)readAttributeBatteryTimeToFullChargeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeBatteryTimeToFullChargeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler;
++ (void)readAttributeBatteryTimeToFullChargeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeBatteryFunctionalWhileChargingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeBatteryFunctionalWhileChargingWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                                subscriptionEstablished:
+                                                    (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                          reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))reportHandler;
++ (void)readAttributeBatteryFunctionalWhileChargingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                             endpoint:(NSNumber *)endpoint
+                                                                queue:(dispatch_queue_t)queue
+                                                    completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeBatteryChargingCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeBatteryChargingCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))reportHandler;
++ (void)readAttributeBatteryChargingCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeActiveBatteryChargeFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeActiveBatteryChargeFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                            params:(CHIPSubscribeParams * _Nullable)params
+                                           subscriptionEstablished:
+                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                     reportHandler:(void (^)(NSArray * _Nullable value,
+                                                                       NSError * _Nullable error))reportHandler;
++ (void)readAttributeActiveBatteryChargeFaultsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                        endpoint:(NSNumber *)endpoint
+                                                           queue:(dispatch_queue_t)queue
+                                               completionHandler:(void (^)(NSArray * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
@@ -4521,788 +4164,928 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Door Lock
+ * Cluster General Commissioning
  *
  */
-@interface CHIPDoorLock : CHIPCluster
+@interface CHIPGeneralCommissioning : CHIPCluster
 
-- (void)lockDoorWithParams:(CHIPDoorLockClusterLockDoorParams * _Nullable)params
-         completionHandler:(StatusCompletion)completionHandler;
-- (void)unlockDoorWithParams:(CHIPDoorLockClusterUnlockDoorParams * _Nullable)params
-           completionHandler:(StatusCompletion)completionHandler;
-- (void)unlockWithTimeoutWithParams:(CHIPDoorLockClusterUnlockWithTimeoutParams *)params
-                  completionHandler:(StatusCompletion)completionHandler;
-- (void)setWeekDayScheduleWithParams:(CHIPDoorLockClusterSetWeekDayScheduleParams *)params
-                   completionHandler:(StatusCompletion)completionHandler;
-- (void)getWeekDayScheduleWithParams:(CHIPDoorLockClusterGetWeekDayScheduleParams *)params
-                   completionHandler:(void (^)(CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable data,
-                                         NSError * _Nullable error))completionHandler;
-- (void)clearWeekDayScheduleWithParams:(CHIPDoorLockClusterClearWeekDayScheduleParams *)params
-                     completionHandler:(StatusCompletion)completionHandler;
-- (void)setYearDayScheduleWithParams:(CHIPDoorLockClusterSetYearDayScheduleParams *)params
-                   completionHandler:(StatusCompletion)completionHandler;
-- (void)getYearDayScheduleWithParams:(CHIPDoorLockClusterGetYearDayScheduleParams *)params
-                   completionHandler:(void (^)(CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable data,
-                                         NSError * _Nullable error))completionHandler;
-- (void)clearYearDayScheduleWithParams:(CHIPDoorLockClusterClearYearDayScheduleParams *)params
-                     completionHandler:(StatusCompletion)completionHandler;
-- (void)setHolidayScheduleWithParams:(CHIPDoorLockClusterSetHolidayScheduleParams *)params
-                   completionHandler:(StatusCompletion)completionHandler;
-- (void)getHolidayScheduleWithParams:(CHIPDoorLockClusterGetHolidayScheduleParams *)params
-                   completionHandler:(void (^)(CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable data,
-                                         NSError * _Nullable error))completionHandler;
-- (void)clearHolidayScheduleWithParams:(CHIPDoorLockClusterClearHolidayScheduleParams *)params
-                     completionHandler:(StatusCompletion)completionHandler;
-- (void)setUserWithParams:(CHIPDoorLockClusterSetUserParams *)params completionHandler:(StatusCompletion)completionHandler;
-- (void)getUserWithParams:(CHIPDoorLockClusterGetUserParams *)params
-        completionHandler:
-            (void (^)(CHIPDoorLockClusterGetUserResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
-- (void)clearUserWithParams:(CHIPDoorLockClusterClearUserParams *)params completionHandler:(StatusCompletion)completionHandler;
-- (void)setCredentialWithParams:(CHIPDoorLockClusterSetCredentialParams *)params
-              completionHandler:(void (^)(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable data,
-                                    NSError * _Nullable error))completionHandler;
-- (void)getCredentialStatusWithParams:(CHIPDoorLockClusterGetCredentialStatusParams *)params
-                    completionHandler:(void (^)(CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable data,
+- (void)armFailSafeWithParams:(CHIPGeneralCommissioningClusterArmFailSafeParams *)params
+            completionHandler:(void (^)(CHIPGeneralCommissioningClusterArmFailSafeResponseParams * _Nullable data,
+                                  NSError * _Nullable error))completionHandler;
+- (void)setRegulatoryConfigWithParams:(CHIPGeneralCommissioningClusterSetRegulatoryConfigParams *)params
+                    completionHandler:(void (^)(CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseParams * _Nullable data,
                                           NSError * _Nullable error))completionHandler;
-- (void)clearCredentialWithParams:(CHIPDoorLockClusterClearCredentialParams *)params
-                completionHandler:(StatusCompletion)completionHandler;
+- (void)commissioningCompleteWithParams:(CHIPGeneralCommissioningClusterCommissioningCompleteParams * _Nullable)params
+                      completionHandler:
+                          (void (^)(CHIPGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable data,
+                              NSError * _Nullable error))completionHandler;
+- (void)commissioningCompleteWithCompletionHandler:
+    (void (^)(CHIPGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable data,
+        NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeLockStateWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeBreadcrumbWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeBreadcrumbWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBreadcrumbWithValue:(NSNumber * _Nonnull)value
+                                   params:(CHIPWriteParams * _Nullable)params
+                        completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeLockStateWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLockStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeLockTypeWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeLockTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLockTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeActuatorEnabledWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeActuatorEnabledWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeActuatorEnabledWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeDoorStateWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeDoorStateWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDoorStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBreadcrumbWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeBreadcrumbWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeDoorOpenEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-- (void)writeAttributeDoorOpenEventsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDoorOpenEventsWithValue:(NSNumber * _Nonnull)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeBasicCommissioningInfoWithCompletionHandler:
+    (void (^)(CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeDoorOpenEventsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDoorOpenEventsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)
+    subscribeAttributeBasicCommissioningInfoWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value,
+                                                      NSError * _Nullable error))reportHandler;
++ (void)readAttributeBasicCommissioningInfoWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value,
+                                                    NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeDoorClosedEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeRegulatoryConfigWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                NSError * _Nullable error))completionHandler;
-- (void)writeAttributeDoorClosedEventsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDoorClosedEventsWithValue:(NSNumber * _Nonnull)value
-                                         params:(CHIPWriteParams * _Nullable)params
-                              completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeDoorClosedEventsWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeRegulatoryConfigWithMinInterval:(NSNumber * _Nonnull)minInterval
                                               maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(CHIPSubscribeParams * _Nullable)params
                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                             reportHandler:
                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDoorClosedEventsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeRegulatoryConfigWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                endpoint:(NSNumber *)endpoint
                                                   queue:(dispatch_queue_t)queue
                                       completionHandler:
                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeOpenPeriodWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeOpenPeriodWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOpenPeriodWithValue:(NSNumber * _Nonnull)value
-                                   params:(CHIPWriteParams * _Nullable)params
-                        completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeLocationCapabilityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeOpenPeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOpenPeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeLocationCapabilityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeLocationCapabilityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNumberOfTotalUsersSupportedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler;
+- (void)readAttributeSupportsConcurrentConnectionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNumberOfTotalUsersSupportedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                              params:(CHIPSubscribeParams * _Nullable)params
-                                             subscriptionEstablished:
-                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNumberOfTotalUsersSupportedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                          endpoint:(NSNumber *)endpoint
-                                                             queue:(dispatch_queue_t)queue
-                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeNumberOfPINUsersSupportedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)subscribeAttributeSupportsConcurrentConnectionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                              subscriptionEstablished:
+                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))reportHandler;
++ (void)readAttributeSupportsConcurrentConnectionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                           endpoint:(NSNumber *)endpoint
+                                                              queue:(dispatch_queue_t)queue
+                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
                                                                         NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNumberOfPINUsersSupportedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                            params:(CHIPSubscribeParams * _Nullable)params
-                                           subscriptionEstablished:
-                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNumberOfPINUsersSupportedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                        endpoint:(NSNumber *)endpoint
-                                                           queue:(dispatch_queue_t)queue
-                                               completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNumberOfRFIDUsersSupportedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler;
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNumberOfRFIDUsersSupportedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNumberOfRFIDUsersSupportedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNumberOfWeekDaySchedulesSupportedPerUserWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                       NSError * _Nullable error))completionHandler;
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNumberOfWeekDaySchedulesSupportedPerUserWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
-                                                                                      subscriptionEstablishedHandler
-                                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                      NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNumberOfWeekDaySchedulesSupportedPerUserWithAttributeCache:
-            (CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                       endpoint:(NSNumber *)endpoint
-                                                                          queue:(dispatch_queue_t)queue
-                                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                    NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNumberOfYearDaySchedulesSupportedPerUserWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                       NSError * _Nullable error))completionHandler;
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNumberOfYearDaySchedulesSupportedPerUserWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
-                                                                                      subscriptionEstablishedHandler
-                                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                      NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNumberOfYearDaySchedulesSupportedPerUserWithAttributeCache:
-            (CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                       endpoint:(NSNumber *)endpoint
-                                                                          queue:(dispatch_queue_t)queue
-                                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                    NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNumberOfHolidaySchedulesSupportedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNumberOfHolidaySchedulesSupportedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                                   subscriptionEstablished:
-                                                       (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                             reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNumberOfHolidaySchedulesSupportedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                endpoint:(NSNumber *)endpoint
-                                                                   queue:(dispatch_queue_t)queue
-                                                       completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMaxPINCodeLengthWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
+@end
+
+/**
+ * Cluster Network Commissioning
+ *
+ */
+@interface CHIPNetworkCommissioning : CHIPCluster
+
+- (void)scanNetworksWithParams:(CHIPNetworkCommissioningClusterScanNetworksParams * _Nullable)params
+             completionHandler:(void (^)(CHIPNetworkCommissioningClusterScanNetworksResponseParams * _Nullable data,
+                                   NSError * _Nullable error))completionHandler;
+- (void)addOrUpdateWiFiNetworkWithParams:(CHIPNetworkCommissioningClusterAddOrUpdateWiFiNetworkParams *)params
+                       completionHandler:(void (^)(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data,
+                                             NSError * _Nullable error))completionHandler;
+- (void)addOrUpdateThreadNetworkWithParams:(CHIPNetworkCommissioningClusterAddOrUpdateThreadNetworkParams *)params
+                         completionHandler:(void (^)(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data,
+                                               NSError * _Nullable error))completionHandler;
+- (void)removeNetworkWithParams:(CHIPNetworkCommissioningClusterRemoveNetworkParams *)params
+              completionHandler:(void (^)(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data,
+                                    NSError * _Nullable error))completionHandler;
+- (void)connectNetworkWithParams:(CHIPNetworkCommissioningClusterConnectNetworkParams *)params
+               completionHandler:(void (^)(CHIPNetworkCommissioningClusterConnectNetworkResponseParams * _Nullable data,
+                                     NSError * _Nullable error))completionHandler;
+- (void)reorderNetworkWithParams:(CHIPNetworkCommissioningClusterReorderNetworkParams *)params
+               completionHandler:(void (^)(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data,
+                                     NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeMaxNetworksWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMaxPINCodeLengthWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMaxPINCodeLengthWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMaxNetworksWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMaxNetworksWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMinPINCodeLengthWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeNetworksWithCompletionHandler:(void (^)(
+                                                       NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeNetworksWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNetworksWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeScanMaxTimeSecondsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeScanMaxTimeSecondsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeScanMaxTimeSecondsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeConnectMaxTimeSecondsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeConnectMaxTimeSecondsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeConnectMaxTimeSecondsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeInterfaceEnabledWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                NSError * _Nullable error))completionHandler;
+- (void)writeAttributeInterfaceEnabledWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInterfaceEnabledWithValue:(NSNumber * _Nonnull)value
+                                         params:(CHIPWriteParams * _Nullable)params
+                              completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMinPINCodeLengthWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeInterfaceEnabledWithMinInterval:(NSNumber * _Nonnull)minInterval
                                               maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(CHIPSubscribeParams * _Nullable)params
                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                             reportHandler:
                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMinPINCodeLengthWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeInterfaceEnabledWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                endpoint:(NSNumber *)endpoint
                                                   queue:(dispatch_queue_t)queue
                                       completionHandler:
                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMaxRFIDCodeLengthWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeLastNetworkingStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMaxRFIDCodeLengthWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMaxRFIDCodeLengthWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeLastNetworkingStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeLastNetworkingStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMinRFIDCodeLengthWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeLastNetworkIDWithCompletionHandler:(void (^)(
+                                                            NSData * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMinRFIDCodeLengthWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMinRFIDCodeLengthWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeLastNetworkIDWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeLastNetworkIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCredentialRulesSupportWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
+- (void)readAttributeLastConnectErrorValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCredentialRulesSupportWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCredentialRulesSupportWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeLastConnectErrorValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeLastConnectErrorValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNumberOfCredentialsSupportedPerUserWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNumberOfCredentialsSupportedPerUserWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                                     subscriptionEstablished:
-                                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                               reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                 NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNumberOfCredentialsSupportedPerUserWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                  endpoint:(NSNumber *)endpoint
-                                                                     queue:(dispatch_queue_t)queue
-                                                         completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeLanguageWithCompletionHandler:(void (^)(
-                                                       NSString * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeLanguageWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeLanguageWithValue:(NSString * _Nonnull)value
-                                 params:(CHIPWriteParams * _Nullable)params
-                      completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeLanguageWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLanguageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeLEDSettingsWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeLEDSettingsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeLEDSettingsWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeLEDSettingsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLEDSettingsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAutoRelockTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-- (void)writeAttributeAutoRelockTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAutoRelockTimeWithValue:(NSNumber * _Nonnull)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAutoRelockTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAutoRelockTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeSoundVolumeWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeSoundVolumeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSoundVolumeWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeSoundVolumeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSoundVolumeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeOperatingModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
-- (void)writeAttributeOperatingModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOperatingModeWithValue:(NSNumber * _Nonnull)value
-                                      params:(CHIPWriteParams * _Nullable)params
-                           completionHandler:(StatusCompletion)completionHandler;
+@end
+
+/**
+ * Cluster Diagnostic Logs
+ *
+ */
+@interface CHIPDiagnosticLogs : CHIPCluster
+
+- (void)retrieveLogsRequestWithParams:(CHIPDiagnosticLogsClusterRetrieveLogsRequestParams *)params
+                    completionHandler:(void (^)(CHIPDiagnosticLogsClusterRetrieveLogsResponseParams * _Nullable data,
+                                          NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeOperatingModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOperatingModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeSupportedOperatingModesWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeSupportedOperatingModesWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSupportedOperatingModesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeDefaultConfigurationRegisterWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler;
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeDefaultConfigurationRegisterWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDefaultConfigurationRegisterWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeEnableLocalProgrammingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
-- (void)writeAttributeEnableLocalProgrammingWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeEnableLocalProgrammingWithValue:(NSNumber * _Nonnull)value
-                                               params:(CHIPWriteParams * _Nullable)params
-                                    completionHandler:(StatusCompletion)completionHandler;
+@end
+
+/**
+ * Cluster General Diagnostics
+ *
+ */
+@interface CHIPGeneralDiagnostics : CHIPCluster
+
+- (void)testEventTriggerWithParams:(CHIPGeneralDiagnosticsClusterTestEventTriggerParams *)params
+                 completionHandler:(StatusCompletion)completionHandler;
+
+- (void)readAttributeNetworkInterfacesWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeEnableLocalProgrammingWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))reportHandler;
-+ (void)readAttributeEnableLocalProgrammingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNetworkInterfacesWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNetworkInterfacesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeEnableOneTouchLockingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
-- (void)writeAttributeEnableOneTouchLockingWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeEnableOneTouchLockingWithValue:(NSNumber * _Nonnull)value
-                                              params:(CHIPWriteParams * _Nullable)params
-                                   completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeRebootCountWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeEnableOneTouchLockingWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeEnableOneTouchLockingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRebootCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRebootCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeEnableInsideStatusLEDWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeUpTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeUpTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeUpTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeTotalOperationalHoursWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                     NSError * _Nullable error))completionHandler;
-- (void)writeAttributeEnableInsideStatusLEDWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeEnableInsideStatusLEDWithValue:(NSNumber * _Nonnull)value
-                                              params:(CHIPWriteParams * _Nullable)params
-                                   completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeEnableInsideStatusLEDWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeTotalOperationalHoursWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
                                                         params:(CHIPSubscribeParams * _Nullable)params
                                        subscriptionEstablished:
                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                  reportHandler:
                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeEnableInsideStatusLEDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeTotalOperationalHoursWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                     endpoint:(NSNumber *)endpoint
                                                        queue:(dispatch_queue_t)queue
                                            completionHandler:
                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeEnablePrivacyModeButtonWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
-- (void)writeAttributeEnablePrivacyModeButtonWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeEnablePrivacyModeButtonWithValue:(NSNumber * _Nonnull)value
-                                                params:(CHIPWriteParams * _Nullable)params
-                                     completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeBootReasonsWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeEnablePrivacyModeButtonWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler;
-+ (void)readAttributeEnablePrivacyModeButtonWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBootReasonsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeBootReasonsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeLocalProgrammingFeaturesWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeActiveHardwareFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeActiveHardwareFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeActiveHardwareFaultsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeActiveRadioFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeActiveRadioFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeActiveRadioFaultsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeActiveNetworkFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeActiveNetworkFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeActiveNetworkFaultsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeTestEventTriggersEnabledWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                        NSError * _Nullable error))completionHandler;
-- (void)writeAttributeLocalProgrammingFeaturesWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeLocalProgrammingFeaturesWithValue:(NSNumber * _Nonnull)value
-                                                 params:(CHIPWriteParams * _Nullable)params
-                                      completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeLocalProgrammingFeaturesWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeTestEventTriggersEnabledWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
                                                            params:(CHIPSubscribeParams * _Nullable)params
                                           subscriptionEstablished:
                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
                                                                       NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLocalProgrammingFeaturesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeTestEventTriggersEnabledWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                        endpoint:(NSNumber *)endpoint
                                                           queue:(dispatch_queue_t)queue
                                               completionHandler:(void (^)(NSNumber * _Nullable value,
                                                                     NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeWrongCodeEntryLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler;
-- (void)writeAttributeWrongCodeEntryLimitWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeWrongCodeEntryLimitWithValue:(NSNumber * _Nonnull)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeWrongCodeEntryLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(CHIPSubscribeParams * _Nullable)params
                                      subscriptionEstablished:
                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeWrongCodeEntryLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                   endpoint:(NSNumber *)endpoint
                                                      queue:(dispatch_queue_t)queue
                                          completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeUserCodeTemporaryDisableTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler;
-- (void)writeAttributeUserCodeTemporaryDisableTimeWithValue:(NSNumber * _Nonnull)value
-                                          completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeUserCodeTemporaryDisableTimeWithValue:(NSNumber * _Nonnull)value
-                                                     params:(CHIPWriteParams * _Nullable)params
-                                          completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeUserCodeTemporaryDisableTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler;
-+ (void)readAttributeUserCodeTemporaryDisableTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeSendPINOverTheAirWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
-- (void)writeAttributeSendPINOverTheAirWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSendPINOverTheAirWithValue:(NSNumber * _Nonnull)value
-                                          params:(CHIPWriteParams * _Nullable)params
-                               completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeSendPINOverTheAirWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSendPINOverTheAirWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRequirePINforRemoteOperationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler;
-- (void)writeAttributeRequirePINforRemoteOperationWithValue:(NSNumber * _Nonnull)value
-                                          completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRequirePINforRemoteOperationWithValue:(NSNumber * _Nonnull)value
-                                                     params:(CHIPWriteParams * _Nullable)params
-                                          completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRequirePINforRemoteOperationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRequirePINforRemoteOperationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeExpiringUserTimeoutWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
-- (void)writeAttributeExpiringUserTimeoutWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeExpiringUserTimeoutWithValue:(NSNumber * _Nonnull)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler;
+@end
+
+/**
+ * Cluster Software Diagnostics
+ *
+ */
+@interface CHIPSoftwareDiagnostics : CHIPCluster
+
+- (void)resetWatermarksWithParams:(CHIPSoftwareDiagnosticsClusterResetWatermarksParams * _Nullable)params
+                completionHandler:(StatusCompletion)completionHandler;
+- (void)resetWatermarksWithCompletionHandler:(StatusCompletion)completionHandler;
+
+- (void)readAttributeThreadMetricsWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeExpiringUserTimeoutWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeExpiringUserTimeoutWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeThreadMetricsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeThreadMetricsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeCurrentHeapFreeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeCurrentHeapFreeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentHeapFreeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeCurrentHeapUsedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeCurrentHeapUsedWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentHeapUsedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeCurrentHeapHighWatermarkWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeCurrentHeapHighWatermarkWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentHeapHighWatermarkWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
@@ -5398,2417 +5181,2111 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Electrical Measurement
+ * Cluster Thread Network Diagnostics
  *
  */
-@interface CHIPElectricalMeasurement : CHIPCluster
+@interface CHIPThreadNetworkDiagnostics : CHIPCluster
 
-- (void)getProfileInfoCommandWithParams:(CHIPElectricalMeasurementClusterGetProfileInfoCommandParams * _Nullable)params
-                      completionHandler:(StatusCompletion)completionHandler;
-- (void)getProfileInfoCommandWithCompletionHandler:(StatusCompletion)completionHandler;
-- (void)getMeasurementProfileCommandWithParams:(CHIPElectricalMeasurementClusterGetMeasurementProfileCommandParams *)params
-                             completionHandler:(StatusCompletion)completionHandler;
+- (void)resetCountsWithParams:(CHIPThreadNetworkDiagnosticsClusterResetCountsParams * _Nullable)params
+            completionHandler:(StatusCompletion)completionHandler;
+- (void)resetCountsWithCompletionHandler:(StatusCompletion)completionHandler;
 
-- (void)readAttributeMeasurementTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeChannelWithCompletionHandler:(void (^)(
+                                                      NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMeasurementTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMeasurementTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeChannelWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeChannelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeDcVoltageWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeRoutingRoleWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeDcVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDcVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRoutingRoleWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRoutingRoleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeDcVoltageMinWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeNetworkNameWithCompletionHandler:(void (^)(
+                                                          NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeDcVoltageMinWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDcVoltageMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNetworkNameWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNetworkNameWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeDcVoltageMaxWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributePanIdWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeDcVoltageMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDcVoltageMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePanIdWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                        params:(CHIPSubscribeParams * _Nullable)params
+                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePanIdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                    endpoint:(NSNumber *)endpoint
+                                       queue:(dispatch_queue_t)queue
+                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeDcCurrentWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeExtendedPanIdWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeDcCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDcCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeExtendedPanIdWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeExtendedPanIdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeDcCurrentMinWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeMeshLocalPrefixWithCompletionHandler:(void (^)(NSData * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeDcCurrentMinWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDcCurrentMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMeshLocalPrefixWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMeshLocalPrefixWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeDcCurrentMaxWithCompletionHandler:(void (^)(
+- (void)readAttributeOverrunCountWithCompletionHandler:(void (^)(
                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeDcCurrentMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeOverrunCountWithMinInterval:(NSNumber * _Nonnull)minInterval
                                           maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(CHIPSubscribeParams * _Nullable)params
                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                         reportHandler:
                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDcCurrentMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeOverrunCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                            endpoint:(NSNumber *)endpoint
                                               queue:(dispatch_queue_t)queue
                                   completionHandler:
                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeDcPowerWithCompletionHandler:(void (^)(
-                                                      NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeDcPowerWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDcPowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeDcPowerMinWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeDcPowerMinWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDcPowerMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeDcPowerMaxWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeNeighborTableListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeDcPowerMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDcPowerMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNeighborTableListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNeighborTableListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeDcVoltageMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeRouteTableListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeDcVoltageMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDcVoltageMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRouteTableListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRouteTableListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeDcVoltageDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
+- (void)readAttributePartitionIdWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeDcVoltageDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDcVoltageDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePartitionIdWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePartitionIdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeDcCurrentMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeWeightingWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeDcCurrentMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDcCurrentMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeWeightingWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeWeightingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeDcCurrentDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
+- (void)readAttributeDataVersionWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeDcCurrentDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDcCurrentDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeDataVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDataVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeDcPowerMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeStableDataVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                 NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeDcPowerMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeStableDataVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(CHIPSubscribeParams * _Nullable)params
                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                              reportHandler:
                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDcPowerMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeStableDataVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                 endpoint:(NSNumber *)endpoint
                                                    queue:(dispatch_queue_t)queue
                                        completionHandler:
                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeDcPowerDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeLeaderRouterIdWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeDcPowerDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeLeaderRouterIdWithMinInterval:(NSNumber * _Nonnull)minInterval
                                             maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(CHIPSubscribeParams * _Nullable)params
                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                           reportHandler:
                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDcPowerDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeLeaderRouterIdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                              endpoint:(NSNumber *)endpoint
                                                 queue:(dispatch_queue_t)queue
                                     completionHandler:
                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcFrequencyWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeDetachedRoleCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcFrequencyWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcFrequencyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeAcFrequencyMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeAcFrequencyMinWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcFrequencyMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeAcFrequencyMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeAcFrequencyMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcFrequencyMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeDetachedRoleCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDetachedRoleCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNeutralCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeChildRoleCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNeutralCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeChildRoleCountWithMinInterval:(NSNumber * _Nonnull)minInterval
                                             maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(CHIPSubscribeParams * _Nullable)params
                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                           reportHandler:
                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNeutralCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeChildRoleCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                              endpoint:(NSNumber *)endpoint
                                                 queue:(dispatch_queue_t)queue
                                     completionHandler:
                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTotalActivePowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
+- (void)readAttributeRouterRoleCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTotalActivePowerWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTotalActivePowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRouterRoleCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRouterRoleCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTotalReactivePowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler;
+- (void)readAttributeLeaderRoleCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTotalReactivePowerWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTotalReactivePowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeLeaderRoleCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeLeaderRoleCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTotalApparentPowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeAttachAttemptCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTotalApparentPowerWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeAttachAttemptCountWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
                                                      params:(CHIPSubscribeParams * _Nullable)params
                                     subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                               reportHandler:
                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTotalApparentPowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeAttachAttemptCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                  endpoint:(NSNumber *)endpoint
                                                     queue:(dispatch_queue_t)queue
                                         completionHandler:
                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMeasured1stHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler;
+- (void)readAttributePartitionIdChangeCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMeasured1stHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMeasured1stHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePartitionIdChangeCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))reportHandler;
++ (void)readAttributePartitionIdChangeCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMeasured3rdHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler;
+- (void)readAttributeBetterPartitionAttachAttemptCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMeasured3rdHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMeasured3rdHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBetterPartitionAttachAttemptCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                                   subscriptionEstablished:
+                                                       (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                             reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))reportHandler;
++ (void)readAttributeBetterPartitionAttachAttemptCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                endpoint:(NSNumber *)endpoint
+                                                                   queue:(dispatch_queue_t)queue
+                                                       completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMeasured5thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler;
+- (void)readAttributeParentChangeCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMeasured5thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMeasured5thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeParentChangeCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeParentChangeCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMeasured7thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler;
+- (void)readAttributeTxTotalCountWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMeasured7thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMeasured7thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeTxTotalCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeTxTotalCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMeasured9thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler;
+- (void)readAttributeTxUnicastCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMeasured9thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMeasured9thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeTxUnicastCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeTxUnicastCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMeasured11thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler;
+- (void)readAttributeTxBroadcastCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMeasured11thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                              params:(CHIPSubscribeParams * _Nullable)params
-                                             subscriptionEstablished:
-                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMeasured11thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                          endpoint:(NSNumber *)endpoint
-                                                             queue:(dispatch_queue_t)queue
-                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeMeasuredPhase1stHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeMeasuredPhase1stHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                                 subscriptionEstablished:
-                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMeasuredPhase1stHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                              endpoint:(NSNumber *)endpoint
-                                                                 queue:(dispatch_queue_t)queue
-                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeMeasuredPhase3rdHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeMeasuredPhase3rdHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                                 subscriptionEstablished:
-                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMeasuredPhase3rdHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                              endpoint:(NSNumber *)endpoint
-                                                                 queue:(dispatch_queue_t)queue
-                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeMeasuredPhase5thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeMeasuredPhase5thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                                 subscriptionEstablished:
-                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMeasuredPhase5thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                              endpoint:(NSNumber *)endpoint
-                                                                 queue:(dispatch_queue_t)queue
-                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeMeasuredPhase7thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeMeasuredPhase7thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                                 subscriptionEstablished:
-                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMeasuredPhase7thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                              endpoint:(NSNumber *)endpoint
-                                                                 queue:(dispatch_queue_t)queue
-                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeTxBroadcastCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeTxBroadcastCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMeasuredPhase9thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeTxAckRequestedCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMeasuredPhase9thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                                 subscriptionEstablished:
-                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMeasuredPhase9thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                              endpoint:(NSNumber *)endpoint
-                                                                 queue:(dispatch_queue_t)queue
-                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeTxAckRequestedCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeTxAckRequestedCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMeasuredPhase11thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))completionHandler;
+- (void)readAttributeTxAckedCountWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMeasuredPhase11thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                                  subscriptionEstablished:
-                                                      (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                            reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMeasuredPhase11thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                               endpoint:(NSNumber *)endpoint
-                                                                  queue:(dispatch_queue_t)queue
-                                                      completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeTxAckedCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeTxAckedCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcFrequencyMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeTxNoAckRequestedCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                     NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcFrequencyMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeTxNoAckRequestedCountWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
                                                         params:(CHIPSubscribeParams * _Nullable)params
                                        subscriptionEstablished:
                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                  reportHandler:
                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcFrequencyMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeTxNoAckRequestedCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                     endpoint:(NSNumber *)endpoint
                                                        queue:(dispatch_queue_t)queue
                                            completionHandler:
                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcFrequencyDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler;
+- (void)readAttributeTxDataCountWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcFrequencyDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcFrequencyDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeTxDataCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeTxDataCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePowerMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeTxDataPollCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePowerMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeTxDataPollCountWithMinInterval:(NSNumber * _Nonnull)minInterval
                                              maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(CHIPSubscribeParams * _Nullable)params
                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                            reportHandler:
                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePowerMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeTxDataPollCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                               endpoint:(NSNumber *)endpoint
                                                  queue:(dispatch_queue_t)queue
                                      completionHandler:
                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePowerDivisorWithCompletionHandler:(void (^)(
+- (void)readAttributeTxBeaconCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeTxBeaconCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeTxBeaconCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeTxBeaconRequestCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeTxBeaconRequestCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeTxBeaconRequestCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeTxOtherCountWithCompletionHandler:(void (^)(
                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePowerDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeTxOtherCountWithMinInterval:(NSNumber * _Nonnull)minInterval
                                           maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(CHIPSubscribeParams * _Nullable)params
                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                         reportHandler:
                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePowerDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeTxOtherCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                            endpoint:(NSNumber *)endpoint
                                               queue:(dispatch_queue_t)queue
                                   completionHandler:
                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeHarmonicCurrentMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler;
+- (void)readAttributeTxRetryCountWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeHarmonicCurrentMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                            params:(CHIPSubscribeParams * _Nullable)params
-                                           subscriptionEstablished:
-                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))reportHandler;
-+ (void)readAttributeHarmonicCurrentMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                        endpoint:(NSNumber *)endpoint
-                                                           queue:(dispatch_queue_t)queue
-                                               completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
-
-- (void)readAttributePhaseHarmonicCurrentMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributePhaseHarmonicCurrentMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                                subscriptionEstablished:
-                                                    (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                          reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))reportHandler;
-+ (void)readAttributePhaseHarmonicCurrentMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                             endpoint:(NSNumber *)endpoint
-                                                                queue:(dispatch_queue_t)queue
-                                                    completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeTxRetryCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeTxRetryCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeInstantaneousVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeTxDirectMaxRetryExpiryCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeInstantaneousVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInstantaneousVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeInstantaneousLineCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)subscribeAttributeTxDirectMaxRetryExpiryCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                              params:(CHIPSubscribeParams * _Nullable)params
+                                             subscriptionEstablished:
+                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))reportHandler;
++ (void)readAttributeTxDirectMaxRetryExpiryCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                          endpoint:(NSNumber *)endpoint
+                                                             queue:(dispatch_queue_t)queue
+                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
                                                                        NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeInstantaneousLineCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInstantaneousLineCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeInstantaneousActiveCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeInstantaneousActiveCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInstantaneousActiveCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeInstantaneousReactiveCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeInstantaneousReactiveCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInstantaneousReactiveCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeInstantaneousPowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeInstantaneousPowerWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInstantaneousPowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsVoltageWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeTxIndirectMaxRetryExpiryCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeTxIndirectMaxRetryExpiryCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                params:(CHIPSubscribeParams * _Nullable)params
+                                               subscriptionEstablished:
+                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))reportHandler;
++ (void)readAttributeTxIndirectMaxRetryExpiryCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                            endpoint:(NSNumber *)endpoint
+                                                               queue:(dispatch_queue_t)queue
+                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsVoltageMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeTxErrCcaCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                             NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsVoltageMinWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeTxErrCcaCountWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:
                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsVoltageMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeTxErrCcaCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsVoltageMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributeTxErrAbortCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsVoltageMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsVoltageMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeTxErrAbortCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeTxErrAbortCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsCurrentWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeTxErrBusyChannelCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeTxErrBusyChannelCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeTxErrBusyChannelCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsCurrentMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributeRxTotalCountWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsCurrentMinWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsCurrentMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRxTotalCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRxTotalCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsCurrentMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributeRxUnicastCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsCurrentMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsCurrentMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeActivePowerWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeActivePowerWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeActivePowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeActivePowerMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeActivePowerMinWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeRxUnicastCountWithMinInterval:(NSNumber * _Nonnull)minInterval
                                             maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(CHIPSubscribeParams * _Nullable)params
                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                           reportHandler:
                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeActivePowerMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeRxUnicastCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                              endpoint:(NSNumber *)endpoint
                                                 queue:(dispatch_queue_t)queue
                                     completionHandler:
                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeActivePowerMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
+- (void)readAttributeRxBroadcastCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeActivePowerMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeActivePowerMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRxBroadcastCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRxBroadcastCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeReactivePowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributeRxDataCountWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeReactivePowerWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeReactivePowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRxDataCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRxDataCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeApparentPowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeRxDataPollCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeRxDataPollCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRxDataPollCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeRxBeaconCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                             NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeApparentPowerWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeRxBeaconCountWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:
                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeApparentPowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeRxBeaconCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePowerFactorWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeRxBeaconRequestCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePowerFactorWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePowerFactorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRxBeaconRequestCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRxBeaconRequestCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAverageRmsVoltageMeasurementPeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                 NSError * _Nullable error))completionHandler;
-- (void)writeAttributeAverageRmsVoltageMeasurementPeriodWithValue:(NSNumber * _Nonnull)value
-                                                completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAverageRmsVoltageMeasurementPeriodWithValue:(NSNumber * _Nonnull)value
-                                                           params:(CHIPWriteParams * _Nullable)params
-                                                completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeRxOtherCountWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAverageRmsVoltageMeasurementPeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                                    subscriptionEstablished:
-                                                        (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                              reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAverageRmsVoltageMeasurementPeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                 endpoint:(NSNumber *)endpoint
-                                                                    queue:(dispatch_queue_t)queue
-                                                        completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRxOtherCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRxOtherCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAverageRmsUnderVoltageCounterWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler;
-- (void)writeAttributeAverageRmsUnderVoltageCounterWithValue:(NSNumber * _Nonnull)value
-                                           completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAverageRmsUnderVoltageCounterWithValue:(NSNumber * _Nonnull)value
-                                                      params:(CHIPWriteParams * _Nullable)params
-                                           completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeRxAddressFilteredCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAverageRmsUnderVoltageCounterWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                params:(CHIPSubscribeParams * _Nullable)params
-                                               subscriptionEstablished:
-                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAverageRmsUnderVoltageCounterWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                            endpoint:(NSNumber *)endpoint
-                                                               queue:(dispatch_queue_t)queue
-                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRxAddressFilteredCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))reportHandler;
++ (void)readAttributeRxAddressFilteredCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsExtremeOverVoltagePeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler;
-- (void)writeAttributeRmsExtremeOverVoltagePeriodWithValue:(NSNumber * _Nonnull)value
-                                         completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsExtremeOverVoltagePeriodWithValue:(NSNumber * _Nonnull)value
-                                                    params:(CHIPWriteParams * _Nullable)params
-                                         completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeRxDestAddrFilteredCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsExtremeOverVoltagePeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                              params:(CHIPSubscribeParams * _Nullable)params
-                                             subscriptionEstablished:
-                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsExtremeOverVoltagePeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                          endpoint:(NSNumber *)endpoint
-                                                             queue:(dispatch_queue_t)queue
-                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRxDestAddrFilteredCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler;
++ (void)readAttributeRxDestAddrFilteredCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsExtremeUnderVoltagePeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler;
-- (void)writeAttributeRmsExtremeUnderVoltagePeriodWithValue:(NSNumber * _Nonnull)value
-                                          completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsExtremeUnderVoltagePeriodWithValue:(NSNumber * _Nonnull)value
-                                                     params:(CHIPWriteParams * _Nullable)params
-                                          completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeRxDuplicatedCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsExtremeUnderVoltagePeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsExtremeUnderVoltagePeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRxDuplicatedCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRxDuplicatedCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsVoltageSagPeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
-- (void)writeAttributeRmsVoltageSagPeriodWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsVoltageSagPeriodWithValue:(NSNumber * _Nonnull)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeRxErrNoFrameCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsVoltageSagPeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsVoltageSagPeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRxErrNoFrameCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRxErrNoFrameCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsVoltageSwellPeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeRxErrUnknownNeighborCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeRxErrUnknownNeighborCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                            params:(CHIPSubscribeParams * _Nullable)params
+                                           subscriptionEstablished:
+                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))reportHandler;
++ (void)readAttributeRxErrUnknownNeighborCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                        endpoint:(NSNumber *)endpoint
+                                                           queue:(dispatch_queue_t)queue
+                                               completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeRxErrInvalidSrcAddrCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeRxErrInvalidSrcAddrCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))reportHandler;
++ (void)readAttributeRxErrInvalidSrcAddrCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:(void (^)(NSNumber * _Nullable value,
                                                                     NSError * _Nullable error))completionHandler;
-- (void)writeAttributeRmsVoltageSwellPeriodWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsVoltageSwellPeriodWithValue:(NSNumber * _Nonnull)value
-                                              params:(CHIPWriteParams * _Nullable)params
-                                   completionHandler:(StatusCompletion)completionHandler;
+
+- (void)readAttributeRxErrSecCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsVoltageSwellPeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsVoltageSwellPeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRxErrSecCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRxErrSecCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcVoltageMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeRxErrFcsCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcVoltageMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcVoltageMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRxErrFcsCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRxErrFcsCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcVoltageDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
+- (void)readAttributeRxErrOtherCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcVoltageDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcVoltageDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRxErrOtherCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRxErrOtherCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcCurrentMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeActiveTimestampWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcCurrentMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcCurrentMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeActiveTimestampWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeActiveTimestampWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcCurrentDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributePendingTimestampWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcCurrentDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributePendingTimestampWithMinInterval:(NSNumber * _Nonnull)minInterval
                                               maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(CHIPSubscribeParams * _Nullable)params
                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                             reportHandler:
                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcCurrentDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributePendingTimestampWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                endpoint:(NSNumber *)endpoint
                                                   queue:(dispatch_queue_t)queue
                                       completionHandler:
                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcPowerMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcPowerMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcPowerMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                        params:(CHIPSubscribeParams * _Nullable)params
+                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDelayWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                    endpoint:(NSNumber *)endpoint
+                                       queue:(dispatch_queue_t)queue
+                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcPowerDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
+- (void)readAttributeSecurityPolicyWithCompletionHandler:
+    (void (^)(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcPowerDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeSecurityPolicyWithMinInterval:(NSNumber * _Nonnull)minInterval
                                             maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(CHIPSubscribeParams * _Nullable)params
                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                           reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcPowerDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              (void (^)(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value,
+                                                  NSError * _Nullable error))reportHandler;
++ (void)readAttributeSecurityPolicyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                              endpoint:(NSNumber *)endpoint
                                                 queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+                                    completionHandler:(void (^)(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value,
+                                                          NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeOverloadAlarmsMaskWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler;
-- (void)writeAttributeOverloadAlarmsMaskWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOverloadAlarmsMaskWithValue:(NSNumber * _Nonnull)value
-                                           params:(CHIPWriteParams * _Nullable)params
-                                completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeChannelMaskWithCompletionHandler:(void (^)(
+                                                          NSData * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeOverloadAlarmsMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOverloadAlarmsMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeChannelMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeChannelMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeVoltageOverloadWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeOperationalDatasetComponentsWithCompletionHandler:
+    (void (^)(CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value,
+        NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeVoltageOverloadWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeVoltageOverloadWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)
+    subscribeAttributeOperationalDatasetComponentsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:
+                                                        (void (^)(
+                                                            CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value,
+                                                            NSError * _Nullable error))reportHandler;
++ (void)
+    readAttributeOperationalDatasetComponentsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:
+                                                  (void (^)(
+                                                      CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value,
+                                                      NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCurrentOverloadWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeActiveNetworkFaultsListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCurrentOverloadWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentOverloadWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeActiveNetworkFaultsListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSArray * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler;
++ (void)readAttributeActiveNetworkFaultsListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcOverloadAlarmsMaskWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
-- (void)writeAttributeAcOverloadAlarmsMaskWithValue:(NSNumber * _Nonnull)value
-                                  completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAcOverloadAlarmsMaskWithValue:(NSNumber * _Nonnull)value
-                                             params:(CHIPWriteParams * _Nullable)params
-                                  completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcOverloadAlarmsMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(CHIPSubscribeParams * _Nullable)params
                                       subscriptionEstablished:
                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                 reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcOverloadAlarmsMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                    endpoint:(NSNumber *)endpoint
                                                       queue:(dispatch_queue_t)queue
                                           completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcVoltageOverloadWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcVoltageOverloadWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcVoltageOverloadWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcCurrentOverloadWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcCurrentOverloadWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcCurrentOverloadWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcActivePowerOverloadWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcActivePowerOverloadWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcActivePowerOverloadWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcReactivePowerOverloadWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcReactivePowerOverloadWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcReactivePowerOverloadWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+@end
 
-- (void)readAttributeAverageRmsOverVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
 /**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
+ * Cluster WiFi Network Diagnostics
+ *
  */
-- (void)subscribeAttributeAverageRmsOverVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAverageRmsOverVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+@interface CHIPWiFiNetworkDiagnostics : CHIPCluster
 
-- (void)readAttributeAverageRmsUnderVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
+- (void)resetCountsWithParams:(CHIPWiFiNetworkDiagnosticsClusterResetCountsParams * _Nullable)params
+            completionHandler:(StatusCompletion)completionHandler;
+- (void)resetCountsWithCompletionHandler:(StatusCompletion)completionHandler;
+
+- (void)readAttributeBssidWithCompletionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAverageRmsUnderVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAverageRmsUnderVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBssidWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                        params:(CHIPSubscribeParams * _Nullable)params
+                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                 reportHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeBssidWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                    endpoint:(NSNumber *)endpoint
+                                       queue:(dispatch_queue_t)queue
+                           completionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsExtremeOverVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
+- (void)readAttributeSecurityTypeWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsExtremeOverVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsExtremeOverVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeSecurityTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeSecurityTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsExtremeUnderVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
+- (void)readAttributeWiFiVersionWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsExtremeUnderVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsExtremeUnderVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeWiFiVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeWiFiVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsVoltageSagWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeChannelNumberWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                             NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsVoltageSagWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeChannelNumberWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:
                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsVoltageSagWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeChannelNumberWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsVoltageSwellWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeRssiWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeRssiWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                       params:(CHIPSubscribeParams * _Nullable)params
+                      subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRssiWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                   endpoint:(NSNumber *)endpoint
+                                      queue:(dispatch_queue_t)queue
+                          completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeBeaconLostCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsVoltageSwellWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeBeaconLostCountWithMinInterval:(NSNumber * _Nonnull)minInterval
                                              maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(CHIPSubscribeParams * _Nullable)params
                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                            reportHandler:
                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsVoltageSwellWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeBeaconLostCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                               endpoint:(NSNumber *)endpoint
                                                  queue:(dispatch_queue_t)queue
                                      completionHandler:
                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeLineCurrentPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeBeaconRxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeLineCurrentPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLineCurrentPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBeaconRxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeBeaconRxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeActiveCurrentPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributePacketMulticastRxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeActiveCurrentPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeActiveCurrentPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePacketMulticastRxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))reportHandler;
++ (void)readAttributePacketMulticastRxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeReactiveCurrentPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
+- (void)readAttributePacketMulticastTxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeReactiveCurrentPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeReactiveCurrentPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePacketMulticastTxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))reportHandler;
++ (void)readAttributePacketMulticastTxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsVoltagePhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
+- (void)readAttributePacketUnicastRxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsVoltagePhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsVoltagePhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePacketUnicastRxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePacketUnicastRxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsVoltageMinPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributePacketUnicastTxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsVoltageMinPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsVoltageMinPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePacketUnicastTxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePacketUnicastTxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsVoltageMaxPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeCurrentMaxRateWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeCurrentMaxRateWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentMaxRateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeOverrunCountWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeOverrunCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeOverrunCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsVoltageMaxPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(CHIPSubscribeParams * _Nullable)params
                                      subscriptionEstablished:
                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsVoltageMaxPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                   endpoint:(NSNumber *)endpoint
                                                      queue:(dispatch_queue_t)queue
                                          completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsCurrentPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsCurrentPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsCurrentPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsCurrentMinPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsCurrentMinPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsCurrentMinPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsCurrentMaxPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsCurrentMaxPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsCurrentMaxPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeActivePowerPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
+@end
+
+/**
+ * Cluster Ethernet Network Diagnostics
+ *
+ */
+@interface CHIPEthernetNetworkDiagnostics : CHIPCluster
+
+- (void)resetCountsWithParams:(CHIPEthernetNetworkDiagnosticsClusterResetCountsParams * _Nullable)params
+            completionHandler:(StatusCompletion)completionHandler;
+- (void)resetCountsWithCompletionHandler:(StatusCompletion)completionHandler;
+
+- (void)readAttributePHYRateWithCompletionHandler:(void (^)(
+                                                      NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeActivePowerPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeActivePowerPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePHYRateWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePHYRateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeActivePowerMinPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeFullDuplexWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeActivePowerMinPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeActivePowerMinPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeFullDuplexWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFullDuplexWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeActivePowerMaxPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributePacketRxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeActivePowerMaxPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeActivePowerMaxPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePacketRxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePacketRxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeReactivePowerPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributePacketTxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeReactivePowerPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeReactivePowerPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePacketTxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePacketTxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeApparentPowerPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeTxErrCountWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeApparentPowerPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeApparentPowerPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeTxErrCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeTxErrCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePowerFactorPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeCollisionCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePowerFactorPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePowerFactorPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeCollisionCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCollisionCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAverageRmsVoltageMeasurementPeriodPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                       NSError * _Nullable error))completionHandler;
+- (void)readAttributeOverrunCountWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAverageRmsVoltageMeasurementPeriodPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
-                                                                                      subscriptionEstablishedHandler
-                                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                      NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAverageRmsVoltageMeasurementPeriodPhaseBWithAttributeCache:
-            (CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                       endpoint:(NSNumber *)endpoint
-                                                                          queue:(dispatch_queue_t)queue
-                                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                    NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeOverrunCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeOverrunCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAverageRmsOverVoltageCounterPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                 NSError * _Nullable error))completionHandler;
+- (void)readAttributeCarrierDetectWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAverageRmsOverVoltageCounterPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                                    subscriptionEstablished:
-                                                        (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                              reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAverageRmsOverVoltageCounterPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                 endpoint:(NSNumber *)endpoint
-                                                                    queue:(dispatch_queue_t)queue
-                                                        completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeCarrierDetectWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCarrierDetectWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAverageRmsUnderVoltageCounterPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeTimeSinceResetWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAverageRmsUnderVoltageCounterPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                                     subscriptionEstablished:
-                                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                               reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                 NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAverageRmsUnderVoltageCounterPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                  endpoint:(NSNumber *)endpoint
-                                                                     queue:(dispatch_queue_t)queue
-                                                         completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeTimeSinceResetWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeTimeSinceResetWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsExtremeOverVoltagePeriodPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsExtremeOverVoltagePeriodPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                                   subscriptionEstablished:
-                                                       (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                             reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsExtremeOverVoltagePeriodPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                endpoint:(NSNumber *)endpoint
-                                                                   queue:(dispatch_queue_t)queue
-                                                       completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsExtremeUnderVoltagePeriodPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                 NSError * _Nullable error))completionHandler;
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsExtremeUnderVoltagePeriodPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                                    subscriptionEstablished:
-                                                        (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                              reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsExtremeUnderVoltagePeriodPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                 endpoint:(NSNumber *)endpoint
-                                                                    queue:(dispatch_queue_t)queue
-                                                        completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsVoltageSagPeriodPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler;
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsVoltageSagPeriodPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                            params:(CHIPSubscribeParams * _Nullable)params
-                                           subscriptionEstablished:
-                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsVoltageSagPeriodPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                        endpoint:(NSNumber *)endpoint
-                                                           queue:(dispatch_queue_t)queue
-                                               completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsVoltageSwellPeriodPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler;
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsVoltageSwellPeriodPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                              params:(CHIPSubscribeParams * _Nullable)params
-                                             subscriptionEstablished:
-                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsVoltageSwellPeriodPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                          endpoint:(NSNumber *)endpoint
-                                                             queue:(dispatch_queue_t)queue
-                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeLineCurrentPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeLineCurrentPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLineCurrentPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+@end
 
-- (void)readAttributeActiveCurrentPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
 /**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
+ * Cluster Bridged Device Basic
+ *
  */
-- (void)subscribeAttributeActiveCurrentPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeActiveCurrentPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+@interface CHIPBridgedDeviceBasic : CHIPCluster
 
-- (void)readAttributeReactiveCurrentPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
+- (void)readAttributeVendorNameWithCompletionHandler:(void (^)(
+                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeReactiveCurrentPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeReactiveCurrentPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeVendorNameWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeVendorNameWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsVoltagePhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
+- (void)readAttributeVendorIDWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsVoltagePhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsVoltagePhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeVendorIDWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeVendorIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsVoltageMinPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeProductNameWithCompletionHandler:(void (^)(
+                                                          NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsVoltageMinPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsVoltageMinPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeProductNameWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeProductNameWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsVoltageMaxPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeNodeLabelWithCompletionHandler:(void (^)(
+                                                        NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNodeLabelWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNodeLabelWithValue:(NSString * _Nonnull)value
+                                  params:(CHIPWriteParams * _Nullable)params
+                       completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsVoltageMaxPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsVoltageMaxPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNodeLabelWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNodeLabelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsCurrentPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
+- (void)readAttributeHardwareVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsCurrentPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsCurrentPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeHardwareVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeHardwareVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsCurrentMinPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeHardwareVersionStringWithCompletionHandler:(void (^)(NSString * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsCurrentMinPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsCurrentMinPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeHardwareVersionStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeHardwareVersionStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsCurrentMaxPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeSoftwareVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsCurrentMaxPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsCurrentMaxPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeSoftwareVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeSoftwareVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeActivePowerPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeSoftwareVersionStringWithCompletionHandler:(void (^)(NSString * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeSoftwareVersionStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeSoftwareVersionStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeManufacturingDateWithCompletionHandler:(void (^)(NSString * _Nullable value,
                                                                 NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeActivePowerPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeManufacturingDateWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(CHIPSubscribeParams * _Nullable)params
                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                              reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeActivePowerPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeManufacturingDateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                 endpoint:(NSNumber *)endpoint
                                                    queue:(dispatch_queue_t)queue
                                        completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeActivePowerMinPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeActivePowerMinPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeActivePowerMinPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+                                           (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeActivePowerMaxPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributePartNumberWithCompletionHandler:(void (^)(
+                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeActivePowerMaxPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeActivePowerMaxPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePartNumberWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePartNumberWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeReactivePowerPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeProductURLWithCompletionHandler:(void (^)(
+                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeReactivePowerPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeReactivePowerPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeProductURLWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeProductURLWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeApparentPowerPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeProductLabelWithCompletionHandler:(void (^)(
+                                                           NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeApparentPowerPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeApparentPowerPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributePowerFactorPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributePowerFactorPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePowerFactorPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeAverageRmsVoltageMeasurementPeriodPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                       NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeAverageRmsVoltageMeasurementPeriodPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
-                                                                                      subscriptionEstablishedHandler
-                                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                      NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAverageRmsVoltageMeasurementPeriodPhaseCWithAttributeCache:
-            (CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                       endpoint:(NSNumber *)endpoint
-                                                                          queue:(dispatch_queue_t)queue
-                                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                    NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeAverageRmsOverVoltageCounterPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                 NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeAverageRmsOverVoltageCounterPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                                    subscriptionEstablished:
-                                                        (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                              reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAverageRmsOverVoltageCounterPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                 endpoint:(NSNumber *)endpoint
-                                                                    queue:(dispatch_queue_t)queue
-                                                        completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeAverageRmsUnderVoltageCounterPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                  NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeAverageRmsUnderVoltageCounterPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                                     subscriptionEstablished:
-                                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                               reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                 NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAverageRmsUnderVoltageCounterPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                  endpoint:(NSNumber *)endpoint
-                                                                     queue:(dispatch_queue_t)queue
-                                                         completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeRmsExtremeOverVoltagePeriodPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeRmsExtremeOverVoltagePeriodPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                                   subscriptionEstablished:
-                                                       (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                             reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsExtremeOverVoltagePeriodPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                endpoint:(NSNumber *)endpoint
-                                                                   queue:(dispatch_queue_t)queue
-                                                       completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeProductLabelWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeProductLabelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsExtremeUnderVoltagePeriodPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                 NSError * _Nullable error))completionHandler;
+- (void)readAttributeSerialNumberWithCompletionHandler:(void (^)(
+                                                           NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsExtremeUnderVoltagePeriodPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                                    subscriptionEstablished:
-                                                        (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                              reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsExtremeUnderVoltagePeriodPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                 endpoint:(NSNumber *)endpoint
-                                                                    queue:(dispatch_queue_t)queue
-                                                        completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeSerialNumberWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeSerialNumberWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsVoltageSagPeriodPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler;
+- (void)readAttributeReachableWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsVoltageSagPeriodPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                            params:(CHIPSubscribeParams * _Nullable)params
-                                           subscriptionEstablished:
-                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsVoltageSagPeriodPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                        endpoint:(NSNumber *)endpoint
-                                                           queue:(dispatch_queue_t)queue
-                                               completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeReachableWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeReachableWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRmsVoltageSwellPeriodPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler;
+- (void)readAttributeUniqueIDWithCompletionHandler:(void (^)(
+                                                       NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRmsVoltageSwellPeriodPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                              params:(CHIPSubscribeParams * _Nullable)params
-                                             subscriptionEstablished:
-                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRmsVoltageSwellPeriodPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                          endpoint:(NSNumber *)endpoint
-                                                             queue:(dispatch_queue_t)queue
-                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeUniqueIDWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeUniqueIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
@@ -7904,173 +7381,226 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Ethernet Network Diagnostics
+ * Cluster Switch
  *
  */
-@interface CHIPEthernetNetworkDiagnostics : CHIPCluster
-
-- (void)resetCountsWithParams:(CHIPEthernetNetworkDiagnosticsClusterResetCountsParams * _Nullable)params
-            completionHandler:(StatusCompletion)completionHandler;
-- (void)resetCountsWithCompletionHandler:(StatusCompletion)completionHandler;
+@interface CHIPSwitch : CHIPCluster
 
-- (void)readAttributePHYRateWithCompletionHandler:(void (^)(
-                                                      NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeNumberOfPositionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePHYRateWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePHYRateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNumberOfPositionsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNumberOfPositionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeFullDuplexWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeCurrentPositionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeFullDuplexWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFullDuplexWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeCurrentPositionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentPositionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePacketRxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeMultiPressMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                             NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePacketRxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeMultiPressMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:
                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePacketRxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeMultiPressMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePacketTxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePacketTxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePacketTxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTxErrCountWithCompletionHandler:(void (^)(
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTxErrCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
                                         maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(CHIPSubscribeParams * _Nullable)params
                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTxErrCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                          endpoint:(NSNumber *)endpoint
                                             queue:(dispatch_queue_t)queue
                                 completionHandler:
                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCollisionCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCollisionCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCollisionCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeOverrunCountWithCompletionHandler:(void (^)(
+@end
+
+/**
+ * Cluster AdministratorCommissioning
+ *
+ */
+@interface CHIPAdministratorCommissioning : CHIPCluster
+
+- (void)openCommissioningWindowWithParams:(CHIPAdministratorCommissioningClusterOpenCommissioningWindowParams *)params
+                        completionHandler:(StatusCompletion)completionHandler;
+- (void)openBasicCommissioningWindowWithParams:(CHIPAdministratorCommissioningClusterOpenBasicCommissioningWindowParams *)params
+                             completionHandler:(StatusCompletion)completionHandler;
+- (void)revokeCommissioningWithParams:(CHIPAdministratorCommissioningClusterRevokeCommissioningParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler;
+- (void)revokeCommissioningWithCompletionHandler:(StatusCompletion)completionHandler;
+
+- (void)readAttributeWindowStatusWithCompletionHandler:(void (^)(
                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeOverrunCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeWindowStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
                                           maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(CHIPSubscribeParams * _Nullable)params
                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                         reportHandler:
                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOverrunCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeWindowStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                            endpoint:(NSNumber *)endpoint
                                               queue:(dispatch_queue_t)queue
                                   completionHandler:
                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCarrierDetectWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeAdminFabricIndexWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeAdminFabricIndexWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAdminFabricIndexWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeAdminVendorIdWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                             NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCarrierDetectWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeAdminVendorIdWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:
                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCarrierDetectWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeAdminVendorIdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTimeSinceResetWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeTimeSinceResetWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTimeSinceResetWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
 /**
@@ -8165,224 +7695,141 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Fan Control
+ * Cluster Operational Credentials
  *
  */
-@interface CHIPFanControl : CHIPCluster
+@interface CHIPOperationalCredentials : CHIPCluster
 
-- (void)readAttributeFanModeWithCompletionHandler:(void (^)(
-                                                      NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeFanModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeFanModeWithValue:(NSNumber * _Nonnull)value
-                                params:(CHIPWriteParams * _Nullable)params
-                     completionHandler:(StatusCompletion)completionHandler;
+- (void)attestationRequestWithParams:(CHIPOperationalCredentialsClusterAttestationRequestParams *)params
+                   completionHandler:(void (^)(CHIPOperationalCredentialsClusterAttestationResponseParams * _Nullable data,
+                                         NSError * _Nullable error))completionHandler;
+- (void)certificateChainRequestWithParams:(CHIPOperationalCredentialsClusterCertificateChainRequestParams *)params
+                        completionHandler:
+                            (void (^)(CHIPOperationalCredentialsClusterCertificateChainResponseParams * _Nullable data,
+                                NSError * _Nullable error))completionHandler;
+- (void)CSRRequestWithParams:(CHIPOperationalCredentialsClusterCSRRequestParams *)params
+           completionHandler:(void (^)(CHIPOperationalCredentialsClusterCSRResponseParams * _Nullable data,
+                                 NSError * _Nullable error))completionHandler;
+- (void)addNOCWithParams:(CHIPOperationalCredentialsClusterAddNOCParams *)params
+       completionHandler:(void (^)(CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable data,
+                             NSError * _Nullable error))completionHandler;
+- (void)updateNOCWithParams:(CHIPOperationalCredentialsClusterUpdateNOCParams *)params
+          completionHandler:(void (^)(CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable data,
+                                NSError * _Nullable error))completionHandler;
+- (void)updateFabricLabelWithParams:(CHIPOperationalCredentialsClusterUpdateFabricLabelParams *)params
+                  completionHandler:(void (^)(CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable data,
+                                        NSError * _Nullable error))completionHandler;
+- (void)removeFabricWithParams:(CHIPOperationalCredentialsClusterRemoveFabricParams *)params
+             completionHandler:(void (^)(CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable data,
+                                   NSError * _Nullable error))completionHandler;
+- (void)addTrustedRootCertificateWithParams:(CHIPOperationalCredentialsClusterAddTrustedRootCertificateParams *)params
+                          completionHandler:(StatusCompletion)completionHandler;
+
+- (void)readAttributeNOCsWithParams:(CHIPReadParams * _Nullable)params
+                  completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeFanModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeNOCsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                       params:(CHIPSubscribeParams * _Nullable)params
+                      subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNOCsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                   endpoint:(NSNumber *)endpoint
+                                      queue:(dispatch_queue_t)queue
+                          completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeFabricsWithParams:(CHIPReadParams * _Nullable)params
+                     completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeFabricsWithMinInterval:(NSNumber * _Nonnull)minInterval
                                      maxInterval:(NSNumber * _Nonnull)maxInterval
                                           params:(CHIPSubscribeParams * _Nullable)params
                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFanModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                   reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFabricsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                       endpoint:(NSNumber *)endpoint
                                          queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+                             completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeFanModeSequenceWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
-- (void)writeAttributeFanModeSequenceWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeFanModeSequenceWithValue:(NSNumber * _Nonnull)value
-                                        params:(CHIPWriteParams * _Nullable)params
-                             completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeSupportedFabricsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeFanModeSequenceWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFanModeSequenceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeSupportedFabricsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeSupportedFabricsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePercentSettingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-- (void)writeAttributePercentSettingWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePercentSettingWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeCommissionedFabricsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePercentSettingWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePercentSettingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributePercentCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributePercentCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePercentCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeSpeedMaxWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeSpeedMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSpeedMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeSpeedSettingWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeSpeedSettingWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSpeedSettingWithValue:(NSNumber * _Nullable)value
-                                     params:(CHIPWriteParams * _Nullable)params
-                          completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeSpeedSettingWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSpeedSettingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeSpeedCurrentWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeSpeedCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSpeedCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeRockSupportWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeRockSupportWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRockSupportWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeRockSettingWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeRockSettingWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRockSettingWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeRockSettingWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRockSettingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeCommissionedFabricsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCommissionedFabricsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeWindSupportWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeTrustedRootCertificatesWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeWindSupportWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeWindSupportWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeTrustedRootCertificatesWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSArray * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler;
++ (void)readAttributeTrustedRootCertificatesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeWindSettingWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeWindSettingWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeWindSettingWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeCurrentFabricIndexWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeWindSettingWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeWindSettingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeCurrentFabricIndexWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentFabricIndexWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
@@ -8478,56 +7925,125 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Fixed Label
+ * Cluster Group Key Management
  *
  */
-@interface CHIPFixedLabel : CHIPCluster
+@interface CHIPGroupKeyManagement : CHIPCluster
 
-- (void)readAttributeLabelListWithCompletionHandler:(void (^)(
-                                                        NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)keySetWriteWithParams:(CHIPGroupKeyManagementClusterKeySetWriteParams *)params
+            completionHandler:(StatusCompletion)completionHandler;
+- (void)keySetReadWithParams:(CHIPGroupKeyManagementClusterKeySetReadParams *)params
+           completionHandler:(void (^)(CHIPGroupKeyManagementClusterKeySetReadResponseParams * _Nullable data,
+                                 NSError * _Nullable error))completionHandler;
+- (void)keySetRemoveWithParams:(CHIPGroupKeyManagementClusterKeySetRemoveParams *)params
+             completionHandler:(StatusCompletion)completionHandler;
+- (void)keySetReadAllIndicesWithParams:(CHIPGroupKeyManagementClusterKeySetReadAllIndicesParams *)params
+                     completionHandler:(void (^)(CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data,
+                                           NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeGroupKeyMapWithParams:(CHIPReadParams * _Nullable)params
+                         completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeGroupKeyMapWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeGroupKeyMapWithValue:(NSArray * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeLabelListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLabelListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeGroupKeyMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGroupKeyMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeGroupTableWithParams:(CHIPReadParams * _Nullable)params
+                        completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeGroupTableWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGroupTableWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeMaxGroupsPerFabricWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
+- (void)subscribeAttributeMaxGroupsPerFabricWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMaxGroupsPerFabricWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeMaxGroupKeysPerFabricWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeMaxGroupKeysPerFabricWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMaxGroupKeysPerFabricWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
@@ -8593,80 +8109,26 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Flow Measurement
+ * Cluster Fixed Label
  *
  */
-@interface CHIPFlowMeasurement : CHIPCluster
-
-- (void)readAttributeMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeMinMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeMinMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMinMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeMaxMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeMaxMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMaxMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+@interface CHIPFixedLabel : CHIPCluster
 
-- (void)readAttributeToleranceWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeLabelListWithCompletionHandler:(void (^)(
+                                                        NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeToleranceWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeLabelListWithMinInterval:(NSNumber * _Nonnull)minInterval
                                        maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(CHIPSubscribeParams * _Nullable)params
                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeToleranceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeLabelListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                         endpoint:(NSNumber *)endpoint
                                            queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+                               completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
@@ -8762,121 +8224,30 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster General Commissioning
+ * Cluster User Label
  *
  */
-@interface CHIPGeneralCommissioning : CHIPCluster
-
-- (void)armFailSafeWithParams:(CHIPGeneralCommissioningClusterArmFailSafeParams *)params
-            completionHandler:(void (^)(CHIPGeneralCommissioningClusterArmFailSafeResponseParams * _Nullable data,
-                                  NSError * _Nullable error))completionHandler;
-- (void)setRegulatoryConfigWithParams:(CHIPGeneralCommissioningClusterSetRegulatoryConfigParams *)params
-                    completionHandler:(void (^)(CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseParams * _Nullable data,
-                                          NSError * _Nullable error))completionHandler;
-- (void)commissioningCompleteWithParams:(CHIPGeneralCommissioningClusterCommissioningCompleteParams * _Nullable)params
-                      completionHandler:
-                          (void (^)(CHIPGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable data,
-                              NSError * _Nullable error))completionHandler;
-- (void)commissioningCompleteWithCompletionHandler:
-    (void (^)(CHIPGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable data,
-        NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeBreadcrumbWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeBreadcrumbWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBreadcrumbWithValue:(NSNumber * _Nonnull)value
-                                   params:(CHIPWriteParams * _Nullable)params
-                        completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeBreadcrumbWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBreadcrumbWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeBasicCommissioningInfoWithCompletionHandler:
-    (void (^)(CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)
-    subscribeAttributeBasicCommissioningInfoWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value,
-                                                      NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBasicCommissioningInfoWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value,
-                                                    NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeRegulatoryConfigWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeRegulatoryConfigWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRegulatoryConfigWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeLocationCapabilityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeLocationCapabilityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLocationCapabilityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+@interface CHIPUserLabel : CHIPCluster
 
-- (void)readAttributeSupportsConcurrentConnectionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler;
+- (void)readAttributeLabelListWithCompletionHandler:(void (^)(
+                                                        NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeLabelListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeLabelListWithValue:(NSArray * _Nonnull)value
+                                  params:(CHIPWriteParams * _Nullable)params
+                       completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeSupportsConcurrentConnectionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSupportsConcurrentConnectionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeLabelListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeLabelListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
@@ -8972,174 +8343,27 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster General Diagnostics
+ * Cluster Boolean State
  *
  */
-@interface CHIPGeneralDiagnostics : CHIPCluster
-
-- (void)testEventTriggerWithParams:(CHIPGeneralDiagnosticsClusterTestEventTriggerParams *)params
-                 completionHandler:(StatusCompletion)completionHandler;
-
-- (void)readAttributeNetworkInterfacesWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeNetworkInterfacesWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNetworkInterfacesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeRebootCountWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeRebootCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRebootCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeUpTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeUpTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeUpTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeTotalOperationalHoursWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeTotalOperationalHoursWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTotalOperationalHoursWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeBootReasonsWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeBootReasonsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBootReasonsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeActiveHardwareFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeActiveHardwareFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeActiveHardwareFaultsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeActiveRadioFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeActiveRadioFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeActiveRadioFaultsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeActiveNetworkFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeActiveNetworkFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeActiveNetworkFaultsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+@interface CHIPBooleanState : CHIPCluster
 
-- (void)readAttributeTestEventTriggersEnabledWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler;
+- (void)readAttributeStateValueWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTestEventTriggersEnabledWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTestEventTriggersEnabledWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeStateValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeStateValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
@@ -9235,95 +8459,123 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Group Key Management
+ * Cluster Mode Select
  *
  */
-@interface CHIPGroupKeyManagement : CHIPCluster
+@interface CHIPModeSelect : CHIPCluster
 
-- (void)keySetWriteWithParams:(CHIPGroupKeyManagementClusterKeySetWriteParams *)params
-            completionHandler:(StatusCompletion)completionHandler;
-- (void)keySetReadWithParams:(CHIPGroupKeyManagementClusterKeySetReadParams *)params
-           completionHandler:(void (^)(CHIPGroupKeyManagementClusterKeySetReadResponseParams * _Nullable data,
-                                 NSError * _Nullable error))completionHandler;
-- (void)keySetRemoveWithParams:(CHIPGroupKeyManagementClusterKeySetRemoveParams *)params
+- (void)changeToModeWithParams:(CHIPModeSelectClusterChangeToModeParams *)params
              completionHandler:(StatusCompletion)completionHandler;
-- (void)keySetReadAllIndicesWithParams:(CHIPGroupKeyManagementClusterKeySetReadAllIndicesParams *)params
-                     completionHandler:(void (^)(CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data,
-                                           NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGroupKeyMapWithParams:(CHIPReadParams * _Nullable)params
-                         completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeGroupKeyMapWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeGroupKeyMapWithValue:(NSArray * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeDescriptionWithCompletionHandler:(void (^)(
+                                                          NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGroupKeyMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeDescriptionWithMinInterval:(NSNumber * _Nonnull)minInterval
                                          maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(CHIPSubscribeParams * _Nullable)params
                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGroupKeyMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDescriptionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                           endpoint:(NSNumber *)endpoint
                                              queue:(dispatch_queue_t)queue
                                  completionHandler:
-                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGroupTableWithParams:(CHIPReadParams * _Nullable)params
-                        completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeStandardNamespaceWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGroupTableWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGroupTableWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeStandardNamespaceWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeStandardNamespaceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMaxGroupsPerFabricWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler;
+- (void)readAttributeSupportedModesWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMaxGroupsPerFabricWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMaxGroupsPerFabricWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeSupportedModesWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeSupportedModesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMaxGroupKeysPerFabricWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
+- (void)readAttributeCurrentModeWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMaxGroupKeysPerFabricWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMaxGroupKeysPerFabricWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeCurrentModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeStartUpModeWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeStartUpModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeStartUpModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeOnModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeOnModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeOnModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
@@ -9419,865 +8671,784 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Groups
+ * Cluster Door Lock
  *
  */
-@interface CHIPGroups : CHIPCluster
+@interface CHIPDoorLock : CHIPCluster
 
-- (void)addGroupWithParams:(CHIPGroupsClusterAddGroupParams *)params
-         completionHandler:
-             (void (^)(CHIPGroupsClusterAddGroupResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
-- (void)viewGroupWithParams:(CHIPGroupsClusterViewGroupParams *)params
-          completionHandler:
-              (void (^)(CHIPGroupsClusterViewGroupResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
-- (void)getGroupMembershipWithParams:(CHIPGroupsClusterGetGroupMembershipParams *)params
-                   completionHandler:(void (^)(CHIPGroupsClusterGetGroupMembershipResponseParams * _Nullable data,
+- (void)lockDoorWithParams:(CHIPDoorLockClusterLockDoorParams * _Nullable)params
+         completionHandler:(StatusCompletion)completionHandler;
+- (void)unlockDoorWithParams:(CHIPDoorLockClusterUnlockDoorParams * _Nullable)params
+           completionHandler:(StatusCompletion)completionHandler;
+- (void)unlockWithTimeoutWithParams:(CHIPDoorLockClusterUnlockWithTimeoutParams *)params
+                  completionHandler:(StatusCompletion)completionHandler;
+- (void)setWeekDayScheduleWithParams:(CHIPDoorLockClusterSetWeekDayScheduleParams *)params
+                   completionHandler:(StatusCompletion)completionHandler;
+- (void)getWeekDayScheduleWithParams:(CHIPDoorLockClusterGetWeekDayScheduleParams *)params
+                   completionHandler:(void (^)(CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable data,
                                          NSError * _Nullable error))completionHandler;
-- (void)removeGroupWithParams:(CHIPGroupsClusterRemoveGroupParams *)params
-            completionHandler:
-                (void (^)(CHIPGroupsClusterRemoveGroupResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
-- (void)removeAllGroupsWithParams:(CHIPGroupsClusterRemoveAllGroupsParams * _Nullable)params
+- (void)clearWeekDayScheduleWithParams:(CHIPDoorLockClusterClearWeekDayScheduleParams *)params
+                     completionHandler:(StatusCompletion)completionHandler;
+- (void)setYearDayScheduleWithParams:(CHIPDoorLockClusterSetYearDayScheduleParams *)params
+                   completionHandler:(StatusCompletion)completionHandler;
+- (void)getYearDayScheduleWithParams:(CHIPDoorLockClusterGetYearDayScheduleParams *)params
+                   completionHandler:(void (^)(CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable data,
+                                         NSError * _Nullable error))completionHandler;
+- (void)clearYearDayScheduleWithParams:(CHIPDoorLockClusterClearYearDayScheduleParams *)params
+                     completionHandler:(StatusCompletion)completionHandler;
+- (void)setHolidayScheduleWithParams:(CHIPDoorLockClusterSetHolidayScheduleParams *)params
+                   completionHandler:(StatusCompletion)completionHandler;
+- (void)getHolidayScheduleWithParams:(CHIPDoorLockClusterGetHolidayScheduleParams *)params
+                   completionHandler:(void (^)(CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable data,
+                                         NSError * _Nullable error))completionHandler;
+- (void)clearHolidayScheduleWithParams:(CHIPDoorLockClusterClearHolidayScheduleParams *)params
+                     completionHandler:(StatusCompletion)completionHandler;
+- (void)setUserWithParams:(CHIPDoorLockClusterSetUserParams *)params completionHandler:(StatusCompletion)completionHandler;
+- (void)getUserWithParams:(CHIPDoorLockClusterGetUserParams *)params
+        completionHandler:
+            (void (^)(CHIPDoorLockClusterGetUserResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
+- (void)clearUserWithParams:(CHIPDoorLockClusterClearUserParams *)params completionHandler:(StatusCompletion)completionHandler;
+- (void)setCredentialWithParams:(CHIPDoorLockClusterSetCredentialParams *)params
+              completionHandler:(void (^)(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable data,
+                                    NSError * _Nullable error))completionHandler;
+- (void)getCredentialStatusWithParams:(CHIPDoorLockClusterGetCredentialStatusParams *)params
+                    completionHandler:(void (^)(CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable data,
+                                          NSError * _Nullable error))completionHandler;
+- (void)clearCredentialWithParams:(CHIPDoorLockClusterClearCredentialParams *)params
                 completionHandler:(StatusCompletion)completionHandler;
-- (void)removeAllGroupsWithCompletionHandler:(StatusCompletion)completionHandler;
-- (void)addGroupIfIdentifyingWithParams:(CHIPGroupsClusterAddGroupIfIdentifyingParams *)params
-                      completionHandler:(StatusCompletion)completionHandler;
-
-- (void)readAttributeNameSupportWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeNameSupportWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNameSupportWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeLockStateWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeLockStateWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeLockStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeLockTypeWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeLockTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeLockTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeActuatorEnabledWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeActuatorEnabledWithMinInterval:(NSNumber * _Nonnull)minInterval
                                              maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(CHIPSubscribeParams * _Nullable)params
                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                            reportHandler:
                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeActuatorEnabledWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                               endpoint:(NSNumber *)endpoint
                                                  queue:(dispatch_queue_t)queue
                                      completionHandler:
                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-@end
-
-/**
- * Cluster Identify
- *
- */
-@interface CHIPIdentify : CHIPCluster
-
-- (void)identifyWithParams:(CHIPIdentifyClusterIdentifyParams *)params completionHandler:(StatusCompletion)completionHandler;
-- (void)triggerEffectWithParams:(CHIPIdentifyClusterTriggerEffectParams *)params
-              completionHandler:(StatusCompletion)completionHandler;
-
-- (void)readAttributeIdentifyTimeWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeIdentifyTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeIdentifyTimeWithValue:(NSNumber * _Nonnull)value
-                                     params:(CHIPWriteParams * _Nullable)params
-                          completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeDoorStateWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeIdentifyTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeIdentifyTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeIdentifyTypeWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeIdentifyTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeIdentifyTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeDoorStateWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDoorStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeDoorOpenEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
+- (void)writeAttributeDoorOpenEventsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDoorOpenEventsWithValue:(NSNumber * _Nonnull)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeDoorOpenEventsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDoorOpenEventsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeDoorClosedEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
+- (void)writeAttributeDoorClosedEventsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDoorClosedEventsWithValue:(NSNumber * _Nonnull)value
+                                         params:(CHIPWriteParams * _Nullable)params
+                              completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeDoorClosedEventsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDoorClosedEventsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+- (void)readAttributeOpenPeriodWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeOpenPeriodWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOpenPeriodWithValue:(NSNumber * _Nonnull)value
+                                   params:(CHIPWriteParams * _Nullable)params
+                        completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeOpenPeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
                                         maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(CHIPSubscribeParams * _Nullable)params
                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeOpenPeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                          endpoint:(NSNumber *)endpoint
                                             queue:(dispatch_queue_t)queue
                                 completionHandler:
                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeNumberOfTotalUsersSupportedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-@end
+- (void)subscribeAttributeNumberOfTotalUsersSupportedWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                              params:(CHIPSubscribeParams * _Nullable)params
+                                             subscriptionEstablished:
+                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))reportHandler;
++ (void)readAttributeNumberOfTotalUsersSupportedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                          endpoint:(NSNumber *)endpoint
+                                                             queue:(dispatch_queue_t)queue
+                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler;
 
+- (void)readAttributeNumberOfPINUsersSupportedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler;
 /**
- * Cluster Illuminance Measurement
- *
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
  */
-@interface CHIPIlluminanceMeasurement : CHIPCluster
+- (void)subscribeAttributeNumberOfPINUsersSupportedWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                            params:(CHIPSubscribeParams * _Nullable)params
+                                           subscriptionEstablished:
+                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))reportHandler;
++ (void)readAttributeNumberOfPINUsersSupportedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                        endpoint:(NSNumber *)endpoint
+                                                           queue:(dispatch_queue_t)queue
+                                               completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributeNumberOfRFIDUsersSupportedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNumberOfRFIDUsersSupportedWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                             params:(CHIPSubscribeParams * _Nullable)params
+                                            subscriptionEstablished:
+                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))reportHandler;
++ (void)readAttributeNumberOfRFIDUsersSupportedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                         endpoint:(NSNumber *)endpoint
+                                                            queue:(dispatch_queue_t)queue
+                                                completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMinMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
+- (void)readAttributeNumberOfWeekDaySchedulesSupportedPerUserWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                       NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMinMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMinMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNumberOfWeekDaySchedulesSupportedPerUserWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
+                                                                                      subscriptionEstablishedHandler
+                                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                      NSError * _Nullable error))reportHandler;
++ (void)readAttributeNumberOfWeekDaySchedulesSupportedPerUserWithAttributeCache:
+            (CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                       endpoint:(NSNumber *)endpoint
+                                                                          queue:(dispatch_queue_t)queue
+                                                              completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                    NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMaxMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
+- (void)readAttributeNumberOfYearDaySchedulesSupportedPerUserWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                       NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMaxMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMaxMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNumberOfYearDaySchedulesSupportedPerUserWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
+                                                                                      subscriptionEstablishedHandler
+                                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                      NSError * _Nullable error))reportHandler;
++ (void)readAttributeNumberOfYearDaySchedulesSupportedPerUserWithAttributeCache:
+            (CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                       endpoint:(NSNumber *)endpoint
+                                                                          queue:(dispatch_queue_t)queue
+                                                              completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                    NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeToleranceWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeNumberOfHolidaySchedulesSupportedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeToleranceWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeToleranceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNumberOfHolidaySchedulesSupportedWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                                   subscriptionEstablished:
+                                                       (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                             reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))reportHandler;
++ (void)readAttributeNumberOfHolidaySchedulesSupportedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                endpoint:(NSNumber *)endpoint
+                                                                   queue:(dispatch_queue_t)queue
+                                                       completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeLightSensorTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeMaxPINCodeLengthWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeLightSensorTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLightSensorTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMaxPINCodeLengthWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMaxPINCodeLengthWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeMinPINCodeLengthWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMinPINCodeLengthWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMinPINCodeLengthWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeMaxRFIDCodeLengthWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMaxRFIDCodeLengthWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMaxRFIDCodeLengthWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeMinRFIDCodeLengthWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMinRFIDCodeLengthWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMinRFIDCodeLengthWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeCredentialRulesSupportWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeCredentialRulesSupportWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))reportHandler;
++ (void)readAttributeCredentialRulesSupportWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeNumberOfCredentialsSupportedPerUserWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-@end
+- (void)subscribeAttributeNumberOfCredentialsSupportedPerUserWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                                     subscriptionEstablished:
+                                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                               reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                 NSError * _Nullable error))reportHandler;
++ (void)readAttributeNumberOfCredentialsSupportedPerUserWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                  endpoint:(NSNumber *)endpoint
+                                                                     queue:(dispatch_queue_t)queue
+                                                         completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))completionHandler;
 
+- (void)readAttributeLanguageWithCompletionHandler:(void (^)(
+                                                       NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeLanguageWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeLanguageWithValue:(NSString * _Nonnull)value
+                                 params:(CHIPWriteParams * _Nullable)params
+                      completionHandler:(StatusCompletion)completionHandler;
 /**
- * Cluster Keypad Input
- *
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
  */
-@interface CHIPKeypadInput : CHIPCluster
-
-- (void)sendKeyWithParams:(CHIPKeypadInputClusterSendKeyParams *)params
-        completionHandler:
-            (void (^)(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeLanguageWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeLanguageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeLEDSettingsWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeLEDSettingsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeLEDSettingsWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeLEDSettingsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeLEDSettingsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeAutoRelockTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
+- (void)writeAttributeAutoRelockTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAutoRelockTimeWithValue:(NSNumber * _Nonnull)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-@end
-
-/**
- * Cluster Level Control
- *
- */
-@interface CHIPLevelControl : CHIPCluster
-
-- (void)moveToLevelWithParams:(CHIPLevelControlClusterMoveToLevelParams *)params
-            completionHandler:(StatusCompletion)completionHandler;
-- (void)moveWithParams:(CHIPLevelControlClusterMoveParams *)params completionHandler:(StatusCompletion)completionHandler;
-- (void)stepWithParams:(CHIPLevelControlClusterStepParams *)params completionHandler:(StatusCompletion)completionHandler;
-- (void)stopWithParams:(CHIPLevelControlClusterStopParams *)params completionHandler:(StatusCompletion)completionHandler;
-- (void)moveToLevelWithOnOffWithParams:(CHIPLevelControlClusterMoveToLevelWithOnOffParams *)params
-                     completionHandler:(StatusCompletion)completionHandler;
-- (void)moveWithOnOffWithParams:(CHIPLevelControlClusterMoveWithOnOffParams *)params
-              completionHandler:(StatusCompletion)completionHandler;
-- (void)stepWithOnOffWithParams:(CHIPLevelControlClusterStepWithOnOffParams *)params
-              completionHandler:(StatusCompletion)completionHandler;
-- (void)stopWithOnOffWithParams:(CHIPLevelControlClusterStopWithOnOffParams * _Nullable)params
-              completionHandler:(StatusCompletion)completionHandler;
-- (void)stopWithOnOffWithCompletionHandler:(StatusCompletion)completionHandler;
-- (void)moveToClosestFrequencyWithParams:(CHIPLevelControlClusterMoveToClosestFrequencyParams *)params
-                       completionHandler:(StatusCompletion)completionHandler;
+- (void)subscribeAttributeAutoRelockTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAutoRelockTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCurrentLevelWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeSoundVolumeWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeSoundVolumeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSoundVolumeWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCurrentLevelWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentLevelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeSoundVolumeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeSoundVolumeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRemainingTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeOperatingModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                             NSError * _Nullable error))completionHandler;
+- (void)writeAttributeOperatingModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOperatingModeWithValue:(NSNumber * _Nonnull)value
+                                      params:(CHIPWriteParams * _Nullable)params
+                           completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRemainingTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeOperatingModeWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:
                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRemainingTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeOperatingModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMinLevelWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeSupportedOperatingModesWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMinLevelWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMinLevelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeSupportedOperatingModesWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler;
++ (void)readAttributeSupportedOperatingModesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMaxLevelWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeDefaultConfigurationRegisterWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMaxLevelWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMaxLevelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeDefaultConfigurationRegisterWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                              subscriptionEstablished:
+                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))reportHandler;
++ (void)readAttributeDefaultConfigurationRegisterWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                           endpoint:(NSNumber *)endpoint
+                                                              queue:(dispatch_queue_t)queue
+                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCurrentFrequencyWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
+- (void)readAttributeEnableLocalProgrammingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
+- (void)writeAttributeEnableLocalProgrammingWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeEnableLocalProgrammingWithValue:(NSNumber * _Nonnull)value
+                                               params:(CHIPWriteParams * _Nullable)params
+                                    completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCurrentFrequencyWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentFrequencyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeEnableLocalProgrammingWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))reportHandler;
++ (void)readAttributeEnableLocalProgrammingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMinFrequencyWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeEnableOneTouchLockingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
+- (void)writeAttributeEnableOneTouchLockingWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeEnableOneTouchLockingWithValue:(NSNumber * _Nonnull)value
+                                              params:(CHIPWriteParams * _Nullable)params
+                                   completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMinFrequencyWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMinFrequencyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeEnableOneTouchLockingWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeEnableOneTouchLockingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMaxFrequencyWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeEnableInsideStatusLEDWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
+- (void)writeAttributeEnableInsideStatusLEDWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeEnableInsideStatusLEDWithValue:(NSNumber * _Nonnull)value
+                                              params:(CHIPWriteParams * _Nullable)params
+                                   completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMaxFrequencyWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMaxFrequencyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeEnableInsideStatusLEDWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeEnableInsideStatusLEDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeOptionsWithCompletionHandler:(void (^)(
-                                                      NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeOptionsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOptionsWithValue:(NSNumber * _Nonnull)value
-                                params:(CHIPWriteParams * _Nullable)params
-                     completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeEnablePrivacyModeButtonWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
+- (void)writeAttributeEnablePrivacyModeButtonWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeEnablePrivacyModeButtonWithValue:(NSNumber * _Nonnull)value
+                                                params:(CHIPWriteParams * _Nullable)params
+                                     completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeOptionsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOptionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeEnablePrivacyModeButtonWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler;
++ (void)readAttributeEnablePrivacyModeButtonWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeOnOffTransitionTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeLocalProgrammingFeaturesWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler;
+- (void)writeAttributeLocalProgrammingFeaturesWithValue:(NSNumber * _Nonnull)value
+                                      completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeLocalProgrammingFeaturesWithValue:(NSNumber * _Nonnull)value
+                                                 params:(CHIPWriteParams * _Nullable)params
+                                      completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeLocalProgrammingFeaturesWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))reportHandler;
++ (void)readAttributeLocalProgrammingFeaturesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeWrongCodeEntryLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler;
-- (void)writeAttributeOnOffTransitionTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOnOffTransitionTimeWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeWrongCodeEntryLimitWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeWrongCodeEntryLimitWithValue:(NSNumber * _Nonnull)value
                                             params:(CHIPWriteParams * _Nullable)params
                                  completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeOnOffTransitionTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeWrongCodeEntryLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(CHIPSubscribeParams * _Nullable)params
                                      subscriptionEstablished:
                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                reportHandler:
                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOnOffTransitionTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeWrongCodeEntryLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                   endpoint:(NSNumber *)endpoint
                                                      queue:(dispatch_queue_t)queue
                                          completionHandler:
                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeOnLevelWithCompletionHandler:(void (^)(
-                                                      NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeOnLevelWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOnLevelWithValue:(NSNumber * _Nullable)value
-                                params:(CHIPWriteParams * _Nullable)params
-                     completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeOnLevelWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOnLevelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeOnTransitionTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
-- (void)writeAttributeOnTransitionTimeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOnTransitionTimeWithValue:(NSNumber * _Nullable)value
-                                         params:(CHIPWriteParams * _Nullable)params
-                              completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeUserCodeTemporaryDisableTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler;
+- (void)writeAttributeUserCodeTemporaryDisableTimeWithValue:(NSNumber * _Nonnull)value
+                                          completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeUserCodeTemporaryDisableTimeWithValue:(NSNumber * _Nonnull)value
+                                                     params:(CHIPWriteParams * _Nullable)params
+                                          completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeOnTransitionTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOnTransitionTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeUserCodeTemporaryDisableTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                              subscriptionEstablished:
+                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))reportHandler;
++ (void)readAttributeUserCodeTemporaryDisableTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                           endpoint:(NSNumber *)endpoint
+                                                              queue:(dispatch_queue_t)queue
+                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeOffTransitionTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeSendPINOverTheAirWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                 NSError * _Nullable error))completionHandler;
-- (void)writeAttributeOffTransitionTimeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOffTransitionTimeWithValue:(NSNumber * _Nullable)value
+- (void)writeAttributeSendPINOverTheAirWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSendPINOverTheAirWithValue:(NSNumber * _Nonnull)value
                                           params:(CHIPWriteParams * _Nullable)params
                                completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeOffTransitionTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeSendPINOverTheAirWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(CHIPSubscribeParams * _Nullable)params
                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                              reportHandler:
                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOffTransitionTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeSendPINOverTheAirWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                 endpoint:(NSNumber *)endpoint
                                                    queue:(dispatch_queue_t)queue
                                        completionHandler:
                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeDefaultMoveRateWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
-- (void)writeAttributeDefaultMoveRateWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDefaultMoveRateWithValue:(NSNumber * _Nullable)value
-                                        params:(CHIPWriteParams * _Nullable)params
-                             completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeRequirePINforRemoteOperationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler;
+- (void)writeAttributeRequirePINforRemoteOperationWithValue:(NSNumber * _Nonnull)value
+                                          completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRequirePINforRemoteOperationWithValue:(NSNumber * _Nonnull)value
+                                                     params:(CHIPWriteParams * _Nullable)params
+                                          completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeDefaultMoveRateWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDefaultMoveRateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRequirePINforRemoteOperationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                              subscriptionEstablished:
+                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))reportHandler;
++ (void)readAttributeRequirePINforRemoteOperationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                           endpoint:(NSNumber *)endpoint
+                                                              queue:(dispatch_queue_t)queue
+                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeStartUpCurrentLevelWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeExpiringUserTimeoutWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler;
-- (void)writeAttributeStartUpCurrentLevelWithValue:(NSNumber * _Nullable)value
-                                 completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeStartUpCurrentLevelWithValue:(NSNumber * _Nullable)value
+- (void)writeAttributeExpiringUserTimeoutWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeExpiringUserTimeoutWithValue:(NSNumber * _Nonnull)value
                                             params:(CHIPWriteParams * _Nullable)params
                                  completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeStartUpCurrentLevelWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeExpiringUserTimeoutWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(CHIPSubscribeParams * _Nullable)params
                                      subscriptionEstablished:
                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                reportHandler:
                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeStartUpCurrentLevelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeExpiringUserTimeoutWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                   endpoint:(NSNumber *)endpoint
                                                      queue:(dispatch_queue_t)queue
                                          completionHandler:
@@ -10377,292 +9548,434 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Localization Configuration
+ * Cluster Window Covering
  *
  */
-@interface CHIPLocalizationConfiguration : CHIPCluster
+@interface CHIPWindowCovering : CHIPCluster
 
-- (void)readAttributeActiveLocaleWithCompletionHandler:(void (^)(
-                                                           NSString * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeActiveLocaleWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeActiveLocaleWithValue:(NSString * _Nonnull)value
-                                     params:(CHIPWriteParams * _Nullable)params
-                          completionHandler:(StatusCompletion)completionHandler;
+- (void)upOrOpenWithParams:(CHIPWindowCoveringClusterUpOrOpenParams * _Nullable)params
+         completionHandler:(StatusCompletion)completionHandler;
+- (void)upOrOpenWithCompletionHandler:(StatusCompletion)completionHandler;
+- (void)downOrCloseWithParams:(CHIPWindowCoveringClusterDownOrCloseParams * _Nullable)params
+            completionHandler:(StatusCompletion)completionHandler;
+- (void)downOrCloseWithCompletionHandler:(StatusCompletion)completionHandler;
+- (void)stopMotionWithParams:(CHIPWindowCoveringClusterStopMotionParams * _Nullable)params
+           completionHandler:(StatusCompletion)completionHandler;
+- (void)stopMotionWithCompletionHandler:(StatusCompletion)completionHandler;
+- (void)goToLiftValueWithParams:(CHIPWindowCoveringClusterGoToLiftValueParams *)params
+              completionHandler:(StatusCompletion)completionHandler;
+- (void)goToLiftPercentageWithParams:(CHIPWindowCoveringClusterGoToLiftPercentageParams *)params
+                   completionHandler:(StatusCompletion)completionHandler;
+- (void)goToTiltValueWithParams:(CHIPWindowCoveringClusterGoToTiltValueParams *)params
+              completionHandler:(StatusCompletion)completionHandler;
+- (void)goToTiltPercentageWithParams:(CHIPWindowCoveringClusterGoToTiltPercentageParams *)params
+                   completionHandler:(StatusCompletion)completionHandler;
+
+- (void)readAttributeTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeActiveLocaleWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeActiveLocaleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                       params:(CHIPSubscribeParams * _Nullable)params
+                      subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                   endpoint:(NSNumber *)endpoint
+                                      queue:(dispatch_queue_t)queue
+                          completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeSupportedLocalesWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
+- (void)readAttributePhysicalClosedLimitLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeSupportedLocalesWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSupportedLocalesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePhysicalClosedLimitLiftWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler;
++ (void)readAttributePhysicalClosedLimitLiftWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributePhysicalClosedLimitTiltWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePhysicalClosedLimitTiltWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler;
++ (void)readAttributePhysicalClosedLimitTiltWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+- (void)readAttributeCurrentPositionLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeCurrentPositionLiftWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(CHIPSubscribeParams * _Nullable)params
                                      subscriptionEstablished:
                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentPositionLiftWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                   endpoint:(NSNumber *)endpoint
                                                      queue:(dispatch_queue_t)queue
                                          completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeCurrentPositionTiltWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeCurrentPositionTiltWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentPositionTiltWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeNumberOfActuationsLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNumberOfActuationsLiftWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))reportHandler;
++ (void)readAttributeNumberOfActuationsLiftWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeNumberOfActuationsTiltWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-@end
+- (void)subscribeAttributeNumberOfActuationsTiltWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))reportHandler;
++ (void)readAttributeNumberOfActuationsTiltWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
+- (void)readAttributeConfigStatusWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
- * Cluster Low Power
- *
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
  */
-@interface CHIPLowPower : CHIPCluster
-
-- (void)sleepWithParams:(CHIPLowPowerClusterSleepParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler;
-- (void)sleepWithCompletionHandler:(StatusCompletion)completionHandler;
+- (void)subscribeAttributeConfigStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeConfigStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeCurrentPositionLiftPercentageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeCurrentPositionLiftPercentageWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                params:(CHIPSubscribeParams * _Nullable)params
+                                               subscriptionEstablished:
+                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentPositionLiftPercentageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                            endpoint:(NSNumber *)endpoint
+                                                               queue:(dispatch_queue_t)queue
+                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeCurrentPositionTiltPercentageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeCurrentPositionTiltPercentageWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                params:(CHIPSubscribeParams * _Nullable)params
+                                               subscriptionEstablished:
+                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentPositionTiltPercentageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                            endpoint:(NSNumber *)endpoint
+                                                               queue:(dispatch_queue_t)queue
+                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeOperationalStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeOperationalStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeOperationalStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeTargetPositionLiftPercent100thsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeTargetPositionLiftPercent100thsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                                 subscriptionEstablished:
+                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))reportHandler;
++ (void)readAttributeTargetPositionLiftPercent100thsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                              endpoint:(NSNumber *)endpoint
+                                                                 queue:(dispatch_queue_t)queue
+                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeTargetPositionTiltPercent100thsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeTargetPositionTiltPercent100thsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                                 subscriptionEstablished:
+                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))reportHandler;
++ (void)readAttributeTargetPositionTiltPercent100thsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                              endpoint:(NSNumber *)endpoint
+                                                                 queue:(dispatch_queue_t)queue
+                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler;
 
-@end
+- (void)readAttributeEndProductTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeEndProductTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeEndProductTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
+- (void)readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))completionHandler;
 /**
- * Cluster Media Input
- *
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
  */
-@interface CHIPMediaInput : CHIPCluster
+- (void)subscribeAttributeCurrentPositionLiftPercent100thsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                                  subscriptionEstablished:
+                                                      (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                            reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentPositionLiftPercent100thsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                               endpoint:(NSNumber *)endpoint
+                                                                  queue:(dispatch_queue_t)queue
+                                                      completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler;
 
-- (void)selectInputWithParams:(CHIPMediaInputClusterSelectInputParams *)params
-            completionHandler:(StatusCompletion)completionHandler;
-- (void)showInputStatusWithParams:(CHIPMediaInputClusterShowInputStatusParams * _Nullable)params
-                completionHandler:(StatusCompletion)completionHandler;
-- (void)showInputStatusWithCompletionHandler:(StatusCompletion)completionHandler;
-- (void)hideInputStatusWithParams:(CHIPMediaInputClusterHideInputStatusParams * _Nullable)params
-                completionHandler:(StatusCompletion)completionHandler;
-- (void)hideInputStatusWithCompletionHandler:(StatusCompletion)completionHandler;
-- (void)renameInputWithParams:(CHIPMediaInputClusterRenameInputParams *)params
-            completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeCurrentPositionTiltPercent100thsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                                  subscriptionEstablished:
+                                                      (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                            reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentPositionTiltPercent100thsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                               endpoint:(NSNumber *)endpoint
+                                                                  queue:(dispatch_queue_t)queue
+                                                      completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeInputListWithCompletionHandler:(void (^)(
-                                                        NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeInstalledOpenLimitLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeInputListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInputListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeInstalledOpenLimitLiftWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))reportHandler;
++ (void)readAttributeInstalledOpenLimitLiftWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCurrentInputWithCompletionHandler:(void (^)(
+- (void)readAttributeInstalledClosedLimitLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeInstalledClosedLimitLiftWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))reportHandler;
++ (void)readAttributeInstalledClosedLimitLiftWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeInstalledOpenLimitTiltWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeInstalledOpenLimitTiltWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))reportHandler;
++ (void)readAttributeInstalledOpenLimitTiltWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeInstalledClosedLimitTiltWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeInstalledClosedLimitTiltWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))reportHandler;
++ (void)readAttributeInstalledClosedLimitTiltWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeModeWithValue:(NSNumber * _Nonnull)value
+                             params:(CHIPWriteParams * _Nullable)params
+                  completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                       params:(CHIPSubscribeParams * _Nullable)params
+                      subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                   endpoint:(NSNumber *)endpoint
+                                      queue:(dispatch_queue_t)queue
+                          completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeSafetyStatusWithCompletionHandler:(void (^)(
                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCurrentInputWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeSafetyStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
                                           maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(CHIPSubscribeParams * _Nullable)params
                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                         reportHandler:
                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentInputWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeSafetyStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                            endpoint:(NSNumber *)endpoint
                                               queue:(dispatch_queue_t)queue
                                   completionHandler:
@@ -10762,395 +10075,227 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Media Playback
+ * Cluster Barrier Control
  *
  */
-@interface CHIPMediaPlayback : CHIPCluster
+@interface CHIPBarrierControl : CHIPCluster
 
-- (void)playWithParams:(CHIPMediaPlaybackClusterPlayParams * _Nullable)params
-     completionHandler:
-         (void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
-- (void)playWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                      NSError * _Nullable error))completionHandler;
-- (void)pauseWithParams:(CHIPMediaPlaybackClusterPauseParams * _Nullable)params
-      completionHandler:
-          (void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
-- (void)pauseWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                       NSError * _Nullable error))completionHandler;
-- (void)stopPlaybackWithParams:(CHIPMediaPlaybackClusterStopPlaybackParams * _Nullable)params
-             completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                   NSError * _Nullable error))completionHandler;
-- (void)stopPlaybackWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                              NSError * _Nullable error))completionHandler;
-- (void)startOverWithParams:(CHIPMediaPlaybackClusterStartOverParams * _Nullable)params
-          completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                NSError * _Nullable error))completionHandler;
-- (void)startOverWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                           NSError * _Nullable error))completionHandler;
-- (void)previousWithParams:(CHIPMediaPlaybackClusterPreviousParams * _Nullable)params
-         completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                               NSError * _Nullable error))completionHandler;
-- (void)previousWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                          NSError * _Nullable error))completionHandler;
-- (void)nextWithParams:(CHIPMediaPlaybackClusterNextParams * _Nullable)params
-     completionHandler:
-         (void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
-- (void)nextWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                      NSError * _Nullable error))completionHandler;
-- (void)rewindWithParams:(CHIPMediaPlaybackClusterRewindParams * _Nullable)params
-       completionHandler:
-           (void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
-- (void)rewindWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                        NSError * _Nullable error))completionHandler;
-- (void)fastForwardWithParams:(CHIPMediaPlaybackClusterFastForwardParams * _Nullable)params
-            completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                  NSError * _Nullable error))completionHandler;
-- (void)fastForwardWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                             NSError * _Nullable error))completionHandler;
-- (void)skipForwardWithParams:(CHIPMediaPlaybackClusterSkipForwardParams *)params
-            completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                  NSError * _Nullable error))completionHandler;
-- (void)skipBackwardWithParams:(CHIPMediaPlaybackClusterSkipBackwardParams *)params
-             completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                   NSError * _Nullable error))completionHandler;
-- (void)seekWithParams:(CHIPMediaPlaybackClusterSeekParams *)params
-     completionHandler:
-         (void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
+- (void)barrierControlGoToPercentWithParams:(CHIPBarrierControlClusterBarrierControlGoToPercentParams *)params
+                          completionHandler:(StatusCompletion)completionHandler;
+- (void)barrierControlStopWithParams:(CHIPBarrierControlClusterBarrierControlStopParams * _Nullable)params
+                   completionHandler:(StatusCompletion)completionHandler;
+- (void)barrierControlStopWithCompletionHandler:(StatusCompletion)completionHandler;
 
-- (void)readAttributeCurrentStateWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeBarrierMovingStateWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCurrentStateWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBarrierMovingStateWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeBarrierMovingStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeStartTimeWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeBarrierSafetyStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeStartTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeStartTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBarrierSafetyStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeBarrierSafetyStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeDurationWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeBarrierCapabilitiesWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeDurationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDurationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBarrierCapabilitiesWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeBarrierCapabilitiesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeSampledPositionWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeBarrierOpenEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
+- (void)writeAttributeBarrierOpenEventsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBarrierOpenEventsWithValue:(NSNumber * _Nonnull)value
+                                          params:(CHIPWriteParams * _Nullable)params
+                               completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeSampledPositionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value,
-                                                             NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSampledPositionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value,
-                                                           NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBarrierOpenEventsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeBarrierOpenEventsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePlaybackSpeedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributeBarrierCloseEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler;
+- (void)writeAttributeBarrierCloseEventsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBarrierCloseEventsWithValue:(NSNumber * _Nonnull)value
+                                           params:(CHIPWriteParams * _Nullable)params
+                                completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePlaybackSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePlaybackSpeedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBarrierCloseEventsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeBarrierCloseEventsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeSeekRangeEndWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeBarrierCommandOpenEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler;
+- (void)writeAttributeBarrierCommandOpenEventsWithValue:(NSNumber * _Nonnull)value
+                                      completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBarrierCommandOpenEventsWithValue:(NSNumber * _Nonnull)value
+                                                 params:(CHIPWriteParams * _Nullable)params
+                                      completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeSeekRangeEndWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSeekRangeEndWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBarrierCommandOpenEventsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))reportHandler;
++ (void)readAttributeBarrierCommandOpenEventsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeSeekRangeStartWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
+- (void)readAttributeBarrierCommandCloseEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler;
+- (void)writeAttributeBarrierCommandCloseEventsWithValue:(NSNumber * _Nonnull)value
+                                       completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBarrierCommandCloseEventsWithValue:(NSNumber * _Nonnull)value
+                                                  params:(CHIPWriteParams * _Nullable)params
+                                       completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeSeekRangeStartWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSeekRangeStartWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBarrierCommandCloseEventsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                            params:(CHIPSubscribeParams * _Nullable)params
+                                           subscriptionEstablished:
+                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))reportHandler;
++ (void)readAttributeBarrierCommandCloseEventsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                        endpoint:(NSNumber *)endpoint
+                                                           queue:(dispatch_queue_t)queue
+                                               completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeBarrierOpenPeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
+- (void)writeAttributeBarrierOpenPeriodWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBarrierOpenPeriodWithValue:(NSNumber * _Nonnull)value
+                                          params:(CHIPWriteParams * _Nullable)params
+                               completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBarrierOpenPeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeBarrierOpenPeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeBarrierClosePeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler;
+- (void)writeAttributeBarrierClosePeriodWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBarrierClosePeriodWithValue:(NSNumber * _Nonnull)value
+                                           params:(CHIPWriteParams * _Nullable)params
+                                completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBarrierClosePeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeBarrierClosePeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeBarrierPositionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeBarrierPositionWithMinInterval:(NSNumber * _Nonnull)minInterval
                                              maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(CHIPSubscribeParams * _Nullable)params
                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                            reportHandler:
                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeBarrierPositionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                               endpoint:(NSNumber *)endpoint
                                                  queue:(dispatch_queue_t)queue
                                      completionHandler:
                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-@end
-
-/**
- * Cluster Mode Select
- *
- */
-@interface CHIPModeSelect : CHIPCluster
-
-- (void)changeToModeWithParams:(CHIPModeSelectClusterChangeToModeParams *)params
-             completionHandler:(StatusCompletion)completionHandler;
-
-- (void)readAttributeDescriptionWithCompletionHandler:(void (^)(
-                                                          NSString * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeDescriptionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDescriptionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeStandardNamespaceWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeStandardNamespaceWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeStandardNamespaceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeSupportedModesWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeSupportedModesWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSupportedModesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeCurrentModeWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeCurrentModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeStartUpModeWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeStartUpModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeStartUpModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeOnModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeOnModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOnModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
 /**
@@ -11245,465 +10390,432 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Network Commissioning
+ * Cluster Pump Configuration and Control
  *
  */
-@interface CHIPNetworkCommissioning : CHIPCluster
-
-- (void)scanNetworksWithParams:(CHIPNetworkCommissioningClusterScanNetworksParams * _Nullable)params
-             completionHandler:(void (^)(CHIPNetworkCommissioningClusterScanNetworksResponseParams * _Nullable data,
-                                   NSError * _Nullable error))completionHandler;
-- (void)addOrUpdateWiFiNetworkWithParams:(CHIPNetworkCommissioningClusterAddOrUpdateWiFiNetworkParams *)params
-                       completionHandler:(void (^)(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data,
-                                             NSError * _Nullable error))completionHandler;
-- (void)addOrUpdateThreadNetworkWithParams:(CHIPNetworkCommissioningClusterAddOrUpdateThreadNetworkParams *)params
-                         completionHandler:(void (^)(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data,
-                                               NSError * _Nullable error))completionHandler;
-- (void)removeNetworkWithParams:(CHIPNetworkCommissioningClusterRemoveNetworkParams *)params
-              completionHandler:(void (^)(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data,
-                                    NSError * _Nullable error))completionHandler;
-- (void)connectNetworkWithParams:(CHIPNetworkCommissioningClusterConnectNetworkParams *)params
-               completionHandler:(void (^)(CHIPNetworkCommissioningClusterConnectNetworkResponseParams * _Nullable data,
-                                     NSError * _Nullable error))completionHandler;
-- (void)reorderNetworkWithParams:(CHIPNetworkCommissioningClusterReorderNetworkParams *)params
-               completionHandler:(void (^)(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data,
-                                     NSError * _Nullable error))completionHandler;
+@interface CHIPPumpConfigurationAndControl : CHIPCluster
 
-- (void)readAttributeMaxNetworksWithCompletionHandler:(void (^)(
+- (void)readAttributeMaxPressureWithCompletionHandler:(void (^)(
                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMaxNetworksWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeMaxPressureWithMinInterval:(NSNumber * _Nonnull)minInterval
                                          maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(CHIPSubscribeParams * _Nullable)params
                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMaxNetworksWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeMaxPressureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                           endpoint:(NSNumber *)endpoint
                                              queue:(dispatch_queue_t)queue
                                  completionHandler:
                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNetworksWithCompletionHandler:(void (^)(
-                                                       NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeMaxSpeedWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNetworksWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeMaxSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval
                                       maxInterval:(NSNumber * _Nonnull)maxInterval
                                            params:(CHIPSubscribeParams * _Nullable)params
                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNetworksWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMaxSpeedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                        endpoint:(NSNumber *)endpoint
                                           queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeScanMaxTimeSecondsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler;
+- (void)readAttributeMaxFlowWithCompletionHandler:(void (^)(
+                                                      NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeScanMaxTimeSecondsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeScanMaxTimeSecondsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMaxFlowWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMaxFlowWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeConnectMaxTimeSecondsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
+- (void)readAttributeMinConstPressureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeConnectMaxTimeSecondsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeConnectMaxTimeSecondsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMinConstPressureWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMinConstPressureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeInterfaceEnabledWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeMaxConstPressureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                NSError * _Nullable error))completionHandler;
-- (void)writeAttributeInterfaceEnabledWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInterfaceEnabledWithValue:(NSNumber * _Nonnull)value
-                                         params:(CHIPWriteParams * _Nullable)params
-                              completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeInterfaceEnabledWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeMaxConstPressureWithMinInterval:(NSNumber * _Nonnull)minInterval
                                               maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(CHIPSubscribeParams * _Nullable)params
                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                             reportHandler:
                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInterfaceEnabledWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeMaxConstPressureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                endpoint:(NSNumber *)endpoint
                                                   queue:(dispatch_queue_t)queue
                                       completionHandler:
                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeLastNetworkingStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeMinCompPressureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeLastNetworkingStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLastNetworkingStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMinCompPressureWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMinCompPressureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeLastNetworkIDWithCompletionHandler:(void (^)(
-                                                            NSData * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeMaxCompPressureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeLastNetworkIDWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeMaxCompPressureWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMaxCompPressureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeMinConstSpeedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeMinConstSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLastNetworkIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMinConstSpeedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
-                                       (void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler;
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeLastConnectErrorValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
+- (void)readAttributeMaxConstSpeedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeLastConnectErrorValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLastConnectErrorValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMaxConstSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMaxConstSpeedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeMinConstFlowWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMinConstFlowWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMinConstFlowWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeMaxConstFlowWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMaxConstFlowWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMaxConstFlowWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeMinConstTempWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMinConstTempWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMinConstTempWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+- (void)readAttributeMaxConstTempWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeMaxConstTempWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMaxConstTempWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributePumpStatusWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributePumpStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
                                         maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(CHIPSubscribeParams * _Nullable)params
                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributePumpStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                          endpoint:(NSNumber *)endpoint
                                             queue:(dispatch_queue_t)queue
                                 completionHandler:
                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeEffectiveOperationModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-@end
+- (void)subscribeAttributeEffectiveOperationModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))reportHandler;
++ (void)readAttributeEffectiveOperationModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
+- (void)readAttributeEffectiveControlModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
- * Cluster OTA Software Update Provider
- *
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
  */
-@interface CHIPOtaSoftwareUpdateProvider : CHIPCluster
-
-- (void)queryImageWithParams:(CHIPOtaSoftwareUpdateProviderClusterQueryImageParams *)params
-           completionHandler:(void (^)(CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseParams * _Nullable data,
-                                 NSError * _Nullable error))completionHandler;
-- (void)applyUpdateRequestWithParams:(CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestParams *)params
-                   completionHandler:(void (^)(CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseParams * _Nullable data,
-                                         NSError * _Nullable error))completionHandler;
-- (void)notifyUpdateAppliedWithParams:(CHIPOtaSoftwareUpdateProviderClusterNotifyUpdateAppliedParams *)params
-                    completionHandler:(StatusCompletion)completionHandler;
-
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeEffectiveControlModeWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(CHIPSubscribeParams * _Nullable)params
                                       subscriptionEstablished:
                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                 reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeEffectiveControlModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                    endpoint:(NSNumber *)endpoint
                                                       queue:(dispatch_queue_t)queue
                                           completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeCapacityWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeCapacityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCapacityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeSpeedWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                        params:(CHIPSubscribeParams * _Nullable)params
+                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeSpeedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                    endpoint:(NSNumber *)endpoint
+                                       queue:(dispatch_queue_t)queue
+                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeLifetimeRunningHoursWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
+- (void)writeAttributeLifetimeRunningHoursWithValue:(NSNumber * _Nullable)value
+                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeLifetimeRunningHoursWithValue:(NSNumber * _Nullable)value
+                                             params:(CHIPWriteParams * _Nullable)params
+                                  completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeLifetimeRunningHoursWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeLifetimeRunningHoursWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributePowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-@end
-
-/**
- * Cluster OTA Software Update Requestor
- *
- */
-@interface CHIPOtaSoftwareUpdateRequestor : CHIPCluster
-
-- (void)announceOtaProviderWithParams:(CHIPOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderParams *)params
-                    completionHandler:(StatusCompletion)completionHandler;
+- (void)subscribeAttributePowerWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                        params:(CHIPSubscribeParams * _Nullable)params
+                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                    endpoint:(NSNumber *)endpoint
+                                       queue:(dispatch_queue_t)queue
+                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeDefaultOtaProvidersWithParams:(CHIPReadParams * _Nullable)params
-                                 completionHandler:
-                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeDefaultOtaProvidersWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDefaultOtaProvidersWithValue:(NSArray * _Nonnull)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeLifetimeEnergyConsumedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
+- (void)writeAttributeLifetimeEnergyConsumedWithValue:(NSNumber * _Nullable)value
+                                    completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeLifetimeEnergyConsumedWithValue:(NSNumber * _Nullable)value
+                                               params:(CHIPWriteParams * _Nullable)params
+                                    completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeDefaultOtaProvidersWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDefaultOtaProvidersWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeLifetimeEnergyConsumedWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))reportHandler;
++ (void)readAttributeLifetimeEnergyConsumedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeUpdatePossibleWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
+- (void)readAttributeOperationModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
+- (void)writeAttributeOperationModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOperationModeWithValue:(NSNumber * _Nonnull)value
+                                      params:(CHIPWriteParams * _Nullable)params
+                           completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeUpdatePossibleWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeUpdatePossibleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeOperationModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeOperationModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeUpdateStateWithCompletionHandler:(void (^)(
+- (void)readAttributeControlModeWithCompletionHandler:(void (^)(
                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeControlModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeControlModeWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeUpdateStateWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeControlModeWithMinInterval:(NSNumber * _Nonnull)minInterval
                                          maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(CHIPSubscribeParams * _Nullable)params
                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeUpdateStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeControlModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                           endpoint:(NSNumber *)endpoint
                                              queue:(dispatch_queue_t)queue
                                  completionHandler:
                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeUpdateStateProgressWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeUpdateStateProgressWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeUpdateStateProgressWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
 /**
@@ -11798,1529 +10910,1357 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Occupancy Sensing
+ * Cluster Thermostat
  *
  */
-@interface CHIPOccupancySensing : CHIPCluster
+@interface CHIPThermostat : CHIPCluster
 
-- (void)readAttributeOccupancyWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)setpointRaiseLowerWithParams:(CHIPThermostatClusterSetpointRaiseLowerParams *)params
+                   completionHandler:(StatusCompletion)completionHandler;
+- (void)setWeeklyScheduleWithParams:(CHIPThermostatClusterSetWeeklyScheduleParams *)params
+                  completionHandler:(StatusCompletion)completionHandler;
+- (void)getWeeklyScheduleWithParams:(CHIPThermostatClusterGetWeeklyScheduleParams *)params
+                  completionHandler:(void (^)(CHIPThermostatClusterGetWeeklyScheduleResponseParams * _Nullable data,
+                                        NSError * _Nullable error))completionHandler;
+- (void)clearWeeklyScheduleWithParams:(CHIPThermostatClusterClearWeeklyScheduleParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler;
+- (void)clearWeeklyScheduleWithCompletionHandler:(StatusCompletion)completionHandler;
+
+- (void)readAttributeLocalTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeOccupancyWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOccupancyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeLocalTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeLocalTemperatureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeOccupancySensorTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeOutdoorTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeOccupancySensorTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOccupancySensorTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeOutdoorTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeOutdoorTemperatureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeOccupancySensorTypeBitmapWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler;
+- (void)readAttributeOccupancyWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeOccupancySensorTypeBitmapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                            params:(CHIPSubscribeParams * _Nullable)params
-                                           subscriptionEstablished:
-                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOccupancySensorTypeBitmapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                        endpoint:(NSNumber *)endpoint
-                                                           queue:(dispatch_queue_t)queue
-                                               completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeOccupancyWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeOccupancyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePirOccupiedToUnoccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler;
-- (void)writeAttributePirOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value
-                                          completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePirOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value
-                                                     params:(CHIPWriteParams * _Nullable)params
-                                          completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAbsMinHeatSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePirOccupiedToUnoccupiedDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler;
-+ (void)readAttributePirOccupiedToUnoccupiedDelayWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAbsMinHeatSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler;
++ (void)readAttributeAbsMinHeatSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePirUnoccupiedToOccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler;
-- (void)writeAttributePirUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value
-                                          completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePirUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value
-                                                     params:(CHIPWriteParams * _Nullable)params
-                                          completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAbsMaxHeatSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePirUnoccupiedToOccupiedDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler;
-+ (void)readAttributePirUnoccupiedToOccupiedDelayWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAbsMaxHeatSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler;
++ (void)readAttributeAbsMaxHeatSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePirUnoccupiedToOccupiedThresholdWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))completionHandler;
-- (void)writeAttributePirUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value
-                                              completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePirUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value
-                                                         params:(CHIPWriteParams * _Nullable)params
-                                              completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAbsMinCoolSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePirUnoccupiedToOccupiedThresholdWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                                  subscriptionEstablished:
-                                                      (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                            reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))reportHandler;
-+ (void)readAttributePirUnoccupiedToOccupiedThresholdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                               endpoint:(NSNumber *)endpoint
-                                                                  queue:(dispatch_queue_t)queue
-                                                      completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAbsMinCoolSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler;
++ (void)readAttributeAbsMinCoolSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeUltrasonicOccupiedToUnoccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                  NSError * _Nullable error))completionHandler;
-- (void)writeAttributeUltrasonicOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value
-                                                 completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeUltrasonicOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value
-                                                            params:(CHIPWriteParams * _Nullable)params
-                                                 completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAbsMaxCoolSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeUltrasonicOccupiedToUnoccupiedDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                                     subscriptionEstablished:
-                                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                               reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                 NSError * _Nullable error))reportHandler;
-+ (void)readAttributeUltrasonicOccupiedToUnoccupiedDelayWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                  endpoint:(NSNumber *)endpoint
-                                                                     queue:(dispatch_queue_t)queue
-                                                         completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAbsMaxCoolSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler;
++ (void)readAttributeAbsMaxCoolSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeUltrasonicUnoccupiedToOccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                  NSError * _Nullable error))completionHandler;
-- (void)writeAttributeUltrasonicUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value
-                                                 completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeUltrasonicUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value
-                                                            params:(CHIPWriteParams * _Nullable)params
-                                                 completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributePICoolingDemandWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeUltrasonicUnoccupiedToOccupiedDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                                     subscriptionEstablished:
-                                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                               reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                 NSError * _Nullable error))reportHandler;
-+ (void)readAttributeUltrasonicUnoccupiedToOccupiedDelayWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                  endpoint:(NSNumber *)endpoint
-                                                                     queue:(dispatch_queue_t)queue
-                                                         completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePICoolingDemandWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePICoolingDemandWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeUltrasonicUnoccupiedToOccupiedThresholdWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                      NSError * _Nullable error))completionHandler;
-- (void)writeAttributeUltrasonicUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value
-                                                     completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeUltrasonicUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value
-                                                                params:(CHIPWriteParams * _Nullable)params
-                                                     completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributePIHeatingDemandWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeUltrasonicUnoccupiedToOccupiedThresholdWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
-                                                                                     subscriptionEstablishedHandler
-                                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                     NSError * _Nullable error))reportHandler;
-+ (void)readAttributeUltrasonicUnoccupiedToOccupiedThresholdWithAttributeCache:
-            (CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                      endpoint:(NSNumber *)endpoint
-                                                                         queue:(dispatch_queue_t)queue
-                                                             completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                   NSError * _Nullable error))completionHandler;
-
-- (void)readAttributePhysicalContactOccupiedToUnoccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                       NSError * _Nullable error))completionHandler;
-- (void)writeAttributePhysicalContactOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value
-                                                      completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePhysicalContactOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value
-                                                                 params:(CHIPWriteParams * _Nullable)params
-                                                      completionHandler:(StatusCompletion)completionHandler;
+- (void)subscribeAttributePIHeatingDemandWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePIHeatingDemandWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeHVACSystemTypeConfigurationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))completionHandler;
+- (void)writeAttributeHVACSystemTypeConfigurationWithValue:(NSNumber * _Nonnull)value
+                                         completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeHVACSystemTypeConfigurationWithValue:(NSNumber * _Nonnull)value
+                                                    params:(CHIPWriteParams * _Nullable)params
+                                         completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePhysicalContactOccupiedToUnoccupiedDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
-                                                                                      subscriptionEstablishedHandler
-                                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                      NSError * _Nullable error))reportHandler;
-+ (void)readAttributePhysicalContactOccupiedToUnoccupiedDelayWithAttributeCache:
-            (CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                       endpoint:(NSNumber *)endpoint
-                                                                          queue:(dispatch_queue_t)queue
-                                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                    NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeHVACSystemTypeConfigurationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                              params:(CHIPSubscribeParams * _Nullable)params
+                                             subscriptionEstablished:
+                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))reportHandler;
++ (void)readAttributeHVACSystemTypeConfigurationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                          endpoint:(NSNumber *)endpoint
+                                                             queue:(dispatch_queue_t)queue
+                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePhysicalContactUnoccupiedToOccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                       NSError * _Nullable error))completionHandler;
-- (void)writeAttributePhysicalContactUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value
-                                                      completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePhysicalContactUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value
-                                                                 params:(CHIPWriteParams * _Nullable)params
-                                                      completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeLocalTemperatureCalibrationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))completionHandler;
+- (void)writeAttributeLocalTemperatureCalibrationWithValue:(NSNumber * _Nonnull)value
+                                         completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeLocalTemperatureCalibrationWithValue:(NSNumber * _Nonnull)value
+                                                    params:(CHIPWriteParams * _Nullable)params
+                                         completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePhysicalContactUnoccupiedToOccupiedDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
-                                                                                      subscriptionEstablishedHandler
-                                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                      NSError * _Nullable error))reportHandler;
-+ (void)readAttributePhysicalContactUnoccupiedToOccupiedDelayWithAttributeCache:
-            (CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                       endpoint:(NSNumber *)endpoint
-                                                                          queue:(dispatch_queue_t)queue
-                                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                    NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeLocalTemperatureCalibrationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                              params:(CHIPSubscribeParams * _Nullable)params
+                                             subscriptionEstablished:
+                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))reportHandler;
++ (void)readAttributeLocalTemperatureCalibrationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                          endpoint:(NSNumber *)endpoint
+                                                             queue:(dispatch_queue_t)queue
+                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePhysicalContactUnoccupiedToOccupiedThresholdWithCompletionHandler:
-    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributePhysicalContactUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value
-                                                          completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePhysicalContactUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value
-                                                                     params:(CHIPWriteParams * _Nullable)params
-                                                          completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeOccupiedCoolingSetpointWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
+- (void)writeAttributeOccupiedCoolingSetpointWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOccupiedCoolingSetpointWithValue:(NSNumber * _Nonnull)value
+                                                params:(CHIPWriteParams * _Nullable)params
+                                     completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePhysicalContactUnoccupiedToOccupiedThresholdWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
-                                                                                          subscriptionEstablishedHandler
-                                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                          NSError * _Nullable error))reportHandler;
-+ (void)readAttributePhysicalContactUnoccupiedToOccupiedThresholdWithAttributeCache:
-            (CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                           endpoint:(NSNumber *)endpoint
-                                                                              queue:(dispatch_queue_t)queue
-                                                                  completionHandler:
-                                                                      (void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeOccupiedCoolingSetpointWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler;
++ (void)readAttributeOccupiedCoolingSetpointWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+- (void)readAttributeOccupiedHeatingSetpointWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
+- (void)writeAttributeOccupiedHeatingSetpointWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOccupiedHeatingSetpointWithValue:(NSNumber * _Nonnull)value
+                                                params:(CHIPWriteParams * _Nullable)params
+                                     completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeOccupiedHeatingSetpointWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler;
++ (void)readAttributeOccupiedHeatingSetpointWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeUnoccupiedCoolingSetpointWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler;
+- (void)writeAttributeUnoccupiedCoolingSetpointWithValue:(NSNumber * _Nonnull)value
+                                       completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeUnoccupiedCoolingSetpointWithValue:(NSNumber * _Nonnull)value
+                                                  params:(CHIPWriteParams * _Nullable)params
+                                       completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeUnoccupiedCoolingSetpointWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                            params:(CHIPSubscribeParams * _Nullable)params
+                                           subscriptionEstablished:
+                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))reportHandler;
++ (void)readAttributeUnoccupiedCoolingSetpointWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                        endpoint:(NSNumber *)endpoint
+                                                           queue:(dispatch_queue_t)queue
+                                               completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeUnoccupiedHeatingSetpointWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler;
+- (void)writeAttributeUnoccupiedHeatingSetpointWithValue:(NSNumber * _Nonnull)value
+                                       completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeUnoccupiedHeatingSetpointWithValue:(NSNumber * _Nonnull)value
+                                                  params:(CHIPWriteParams * _Nullable)params
+                                       completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeUnoccupiedHeatingSetpointWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                            params:(CHIPSubscribeParams * _Nullable)params
+                                           subscriptionEstablished:
+                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))reportHandler;
++ (void)readAttributeUnoccupiedHeatingSetpointWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                        endpoint:(NSNumber *)endpoint
+                                                           queue:(dispatch_queue_t)queue
+                                               completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeMinHeatSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
+- (void)writeAttributeMinHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value
+                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMinHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value
+                                             params:(CHIPWriteParams * _Nullable)params
+                                  completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeMinHeatSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(CHIPSubscribeParams * _Nullable)params
                                       subscriptionEstablished:
                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                 reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMinHeatSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                    endpoint:(NSNumber *)endpoint
                                                       queue:(dispatch_queue_t)queue
                                           completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeMaxHeatSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
+- (void)writeAttributeMaxHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value
+                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMaxHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value
+                                             params:(CHIPWriteParams * _Nullable)params
+                                  completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMaxHeatSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMaxHeatSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeMinCoolSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
+- (void)writeAttributeMinCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value
+                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMinCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value
+                                             params:(CHIPWriteParams * _Nullable)params
+                                  completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-@end
-
-/**
- * Cluster On/Off
- *
- */
-@interface CHIPOnOff : CHIPCluster
-
-- (void)offWithParams:(CHIPOnOffClusterOffParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler;
-- (void)offWithCompletionHandler:(StatusCompletion)completionHandler;
-- (void)onWithParams:(CHIPOnOffClusterOnParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler;
-- (void)onWithCompletionHandler:(StatusCompletion)completionHandler;
-- (void)toggleWithParams:(CHIPOnOffClusterToggleParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler;
-- (void)toggleWithCompletionHandler:(StatusCompletion)completionHandler;
-- (void)offWithEffectWithParams:(CHIPOnOffClusterOffWithEffectParams *)params completionHandler:(StatusCompletion)completionHandler;
-- (void)onWithRecallGlobalSceneWithParams:(CHIPOnOffClusterOnWithRecallGlobalSceneParams * _Nullable)params
-                        completionHandler:(StatusCompletion)completionHandler;
-- (void)onWithRecallGlobalSceneWithCompletionHandler:(StatusCompletion)completionHandler;
-- (void)onWithTimedOffWithParams:(CHIPOnOffClusterOnWithTimedOffParams *)params
-               completionHandler:(StatusCompletion)completionHandler;
-
-- (void)readAttributeOnOffWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeOnOffWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                        params:(CHIPSubscribeParams * _Nullable)params
-                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOnOffWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                    endpoint:(NSNumber *)endpoint
-                                       queue:(dispatch_queue_t)queue
-                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeGlobalSceneControlWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeGlobalSceneControlWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGlobalSceneControlWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeOnTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeOnTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOnTimeWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeOnTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOnTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeOffWaitTimeWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeOffWaitTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOffWaitTimeWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeOffWaitTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOffWaitTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeStartUpOnOffWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeStartUpOnOffWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeStartUpOnOffWithValue:(NSNumber * _Nullable)value
-                                     params:(CHIPWriteParams * _Nullable)params
-                          completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeStartUpOnOffWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeStartUpOnOffWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMinCoolSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMinCoolSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+- (void)readAttributeMaxCoolSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
+- (void)writeAttributeMaxCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value
+                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMaxCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value
+                                             params:(CHIPWriteParams * _Nullable)params
+                                  completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeMaxCoolSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(CHIPSubscribeParams * _Nullable)params
                                       subscriptionEstablished:
                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                 reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMaxCoolSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                    endpoint:(NSNumber *)endpoint
                                                       queue:(dispatch_queue_t)queue
                                           completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+- (void)readAttributeMinSetpointDeadBandWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler;
+- (void)writeAttributeMinSetpointDeadBandWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMinSetpointDeadBandWithValue:(NSNumber * _Nonnull)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeMinSetpointDeadBandWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(CHIPSubscribeParams * _Nullable)params
                                      subscriptionEstablished:
                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMinSetpointDeadBandWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                   endpoint:(NSNumber *)endpoint
                                                      queue:(dispatch_queue_t)queue
                                          completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeRemoteSensingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
+- (void)writeAttributeRemoteSensingWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRemoteSensingWithValue:(NSNumber * _Nonnull)value
+                                      params:(CHIPWriteParams * _Nullable)params
+                           completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeRemoteSensingWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRemoteSensingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+- (void)readAttributeControlSequenceOfOperationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler;
+- (void)writeAttributeControlSequenceOfOperationWithValue:(NSNumber * _Nonnull)value
+                                        completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeControlSequenceOfOperationWithValue:(NSNumber * _Nonnull)value
+                                                   params:(CHIPWriteParams * _Nullable)params
+                                        completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeControlSequenceOfOperationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                             params:(CHIPSubscribeParams * _Nullable)params
+                                            subscriptionEstablished:
+                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))reportHandler;
++ (void)readAttributeControlSequenceOfOperationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                         endpoint:(NSNumber *)endpoint
+                                                            queue:(dispatch_queue_t)queue
+                                                completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeSystemModeWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeSystemModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSystemModeWithValue:(NSNumber * _Nonnull)value
+                                   params:(CHIPWriteParams * _Nullable)params
+                        completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeSystemModeWithMinInterval:(NSNumber * _Nonnull)minInterval
                                         maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(CHIPSubscribeParams * _Nullable)params
                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeSystemModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                          endpoint:(NSNumber *)endpoint
                                             queue:(dispatch_queue_t)queue
                                 completionHandler:
                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeThermostatRunningModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-@end
+- (void)subscribeAttributeThermostatRunningModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeThermostatRunningModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
+- (void)readAttributeStartOfWeekWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
- * Cluster On/off Switch Configuration
- *
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
  */
-@interface CHIPOnOffSwitchConfiguration : CHIPCluster
+- (void)subscribeAttributeStartOfWeekWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeStartOfWeekWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeSwitchTypeWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeNumberOfWeeklyTransitionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeSwitchTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSwitchTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNumberOfWeeklyTransitionsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                            params:(CHIPSubscribeParams * _Nullable)params
+                                           subscriptionEstablished:
+                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))reportHandler;
++ (void)readAttributeNumberOfWeeklyTransitionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                        endpoint:(NSNumber *)endpoint
+                                                           queue:(dispatch_queue_t)queue
+                                               completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeSwitchActionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
-- (void)writeAttributeSwitchActionsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSwitchActionsWithValue:(NSNumber * _Nonnull)value
-                                      params:(CHIPWriteParams * _Nullable)params
-                           completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeNumberOfDailyTransitionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeSwitchActionsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSwitchActionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNumberOfDailyTransitionsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))reportHandler;
++ (void)readAttributeNumberOfDailyTransitionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeTemperatureSetpointHoldWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
+- (void)writeAttributeTemperatureSetpointHoldWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTemperatureSetpointHoldWithValue:(NSNumber * _Nonnull)value
+                                                params:(CHIPWriteParams * _Nullable)params
+                                     completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeTemperatureSetpointHoldWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler;
++ (void)readAttributeTemperatureSetpointHoldWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeTemperatureSetpointHoldDurationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler;
+- (void)writeAttributeTemperatureSetpointHoldDurationWithValue:(NSNumber * _Nullable)value
+                                             completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTemperatureSetpointHoldDurationWithValue:(NSNumber * _Nullable)value
+                                                        params:(CHIPWriteParams * _Nullable)params
+                                             completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeTemperatureSetpointHoldDurationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                                 subscriptionEstablished:
+                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))reportHandler;
++ (void)readAttributeTemperatureSetpointHoldDurationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                              endpoint:(NSNumber *)endpoint
+                                                                 queue:(dispatch_queue_t)queue
+                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeThermostatProgrammingOperationModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                 NSError * _Nullable error))completionHandler;
+- (void)writeAttributeThermostatProgrammingOperationModeWithValue:(NSNumber * _Nonnull)value
+                                                completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeThermostatProgrammingOperationModeWithValue:(NSNumber * _Nonnull)value
+                                                           params:(CHIPWriteParams * _Nullable)params
+                                                completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeThermostatProgrammingOperationModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                                    subscriptionEstablished:
+                                                        (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                              reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                NSError * _Nullable error))reportHandler;
++ (void)readAttributeThermostatProgrammingOperationModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                 endpoint:(NSNumber *)endpoint
+                                                                    queue:(dispatch_queue_t)queue
+                                                        completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeThermostatRunningStateWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeThermostatRunningStateWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))reportHandler;
++ (void)readAttributeThermostatRunningStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeSetpointChangeSourceWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-@end
+- (void)subscribeAttributeSetpointChangeSourceWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeSetpointChangeSourceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-/**
- * Cluster Operational Credentials
- *
- */
-@interface CHIPOperationalCredentials : CHIPCluster
-
-- (void)attestationRequestWithParams:(CHIPOperationalCredentialsClusterAttestationRequestParams *)params
-                   completionHandler:(void (^)(CHIPOperationalCredentialsClusterAttestationResponseParams * _Nullable data,
-                                         NSError * _Nullable error))completionHandler;
-- (void)certificateChainRequestWithParams:(CHIPOperationalCredentialsClusterCertificateChainRequestParams *)params
-                        completionHandler:
-                            (void (^)(CHIPOperationalCredentialsClusterCertificateChainResponseParams * _Nullable data,
-                                NSError * _Nullable error))completionHandler;
-- (void)CSRRequestWithParams:(CHIPOperationalCredentialsClusterCSRRequestParams *)params
-           completionHandler:(void (^)(CHIPOperationalCredentialsClusterCSRResponseParams * _Nullable data,
-                                 NSError * _Nullable error))completionHandler;
-- (void)addNOCWithParams:(CHIPOperationalCredentialsClusterAddNOCParams *)params
-       completionHandler:(void (^)(CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable data,
-                             NSError * _Nullable error))completionHandler;
-- (void)updateNOCWithParams:(CHIPOperationalCredentialsClusterUpdateNOCParams *)params
-          completionHandler:(void (^)(CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable data,
-                                NSError * _Nullable error))completionHandler;
-- (void)updateFabricLabelWithParams:(CHIPOperationalCredentialsClusterUpdateFabricLabelParams *)params
-                  completionHandler:(void (^)(CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable data,
-                                        NSError * _Nullable error))completionHandler;
-- (void)removeFabricWithParams:(CHIPOperationalCredentialsClusterRemoveFabricParams *)params
-             completionHandler:(void (^)(CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable data,
-                                   NSError * _Nullable error))completionHandler;
-- (void)addTrustedRootCertificateWithParams:(CHIPOperationalCredentialsClusterAddTrustedRootCertificateParams *)params
-                          completionHandler:(StatusCompletion)completionHandler;
-
-- (void)readAttributeNOCsWithParams:(CHIPReadParams * _Nullable)params
-                  completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeNOCsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                       params:(CHIPSubscribeParams * _Nullable)params
-                      subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNOCsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                   endpoint:(NSNumber *)endpoint
-                                      queue:(dispatch_queue_t)queue
-                          completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeFabricsWithParams:(CHIPReadParams * _Nullable)params
-                     completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeSetpointChangeAmountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeFabricsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFabricsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeSetpointChangeAmountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeSetpointChangeAmountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeSupportedFabricsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
+- (void)readAttributeSetpointChangeSourceTimestampWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeSupportedFabricsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSupportedFabricsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeSetpointChangeSourceTimestampWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                params:(CHIPSubscribeParams * _Nullable)params
+                                               subscriptionEstablished:
+                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))reportHandler;
++ (void)readAttributeSetpointChangeSourceTimestampWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                            endpoint:(NSNumber *)endpoint
+                                                               queue:(dispatch_queue_t)queue
+                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCommissionedFabricsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeOccupiedSetbackWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
+- (void)writeAttributeOccupiedSetbackWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOccupiedSetbackWithValue:(NSNumber * _Nullable)value
+                                        params:(CHIPWriteParams * _Nullable)params
+                             completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCommissionedFabricsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCommissionedFabricsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeOccupiedSetbackWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeOccupiedSetbackWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTrustedRootCertificatesWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
+- (void)readAttributeOccupiedSetbackMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTrustedRootCertificatesWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSArray * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTrustedRootCertificatesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeOccupiedSetbackMinWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeOccupiedSetbackMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCurrentFabricIndexWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeOccupiedSetbackMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCurrentFabricIndexWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeOccupiedSetbackMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
                                                      params:(CHIPSubscribeParams * _Nullable)params
                                     subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                               reportHandler:
                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentFabricIndexWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeOccupiedSetbackMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                  endpoint:(NSNumber *)endpoint
                                                     queue:(dispatch_queue_t)queue
                                         completionHandler:
                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+- (void)readAttributeUnoccupiedSetbackWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
+- (void)writeAttributeUnoccupiedSetbackWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeUnoccupiedSetbackWithValue:(NSNumber * _Nullable)value
+                                          params:(CHIPWriteParams * _Nullable)params
+                               completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeUnoccupiedSetbackWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeUnoccupiedSetbackWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeUnoccupiedSetbackMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeUnoccupiedSetbackMinWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(CHIPSubscribeParams * _Nullable)params
                                       subscriptionEstablished:
                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                 reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeUnoccupiedSetbackMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                    endpoint:(NSNumber *)endpoint
                                                       queue:(dispatch_queue_t)queue
                                           completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeUnoccupiedSetbackMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeUnoccupiedSetbackMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeUnoccupiedSetbackMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeEmergencyHeatDeltaWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler;
+- (void)writeAttributeEmergencyHeatDeltaWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeEmergencyHeatDeltaWithValue:(NSNumber * _Nonnull)value
+                                           params:(CHIPWriteParams * _Nullable)params
+                                completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeEmergencyHeatDeltaWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeEmergencyHeatDeltaWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeACTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeACTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeACTypeWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeACTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeACTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeACCapacityWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeACCapacityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeACCapacityWithValue:(NSNumber * _Nonnull)value
+                                   params:(CHIPWriteParams * _Nullable)params
+                        completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeACCapacityWithMinInterval:(NSNumber * _Nonnull)minInterval
                                         maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(CHIPSubscribeParams * _Nullable)params
                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeACCapacityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                          endpoint:(NSNumber *)endpoint
                                             queue:(dispatch_queue_t)queue
                                 completionHandler:
                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-@end
-
-/**
- * Cluster Power Source
- *
- */
-@interface CHIPPowerSource : CHIPCluster
-
-- (void)readAttributeStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeACRefrigerantTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
+- (void)writeAttributeACRefrigerantTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeACRefrigerantTypeWithValue:(NSNumber * _Nonnull)value
+                                          params:(CHIPWriteParams * _Nullable)params
+                               completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeACRefrigerantTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeACRefrigerantTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeOrderWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeACCompressorTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
+- (void)writeAttributeACCompressorTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeACCompressorTypeWithValue:(NSNumber * _Nonnull)value
+                                         params:(CHIPWriteParams * _Nullable)params
+                              completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeOrderWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                        params:(CHIPSubscribeParams * _Nullable)params
-                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOrderWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                    endpoint:(NSNumber *)endpoint
-                                       queue:(dispatch_queue_t)queue
-                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeACCompressorTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeACCompressorTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeDescriptionWithCompletionHandler:(void (^)(
-                                                          NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeACErrorCodeWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeACErrorCodeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeACErrorCodeWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeDescriptionWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeACErrorCodeWithMinInterval:(NSNumber * _Nonnull)minInterval
                                          maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(CHIPSubscribeParams * _Nullable)params
                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDescriptionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeACErrorCodeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                           endpoint:(NSNumber *)endpoint
                                              queue:(dispatch_queue_t)queue
                                  completionHandler:
-                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeWiredAssessedInputVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler;
+- (void)readAttributeACLouverPositionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
+- (void)writeAttributeACLouverPositionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeACLouverPositionWithValue:(NSNumber * _Nonnull)value
+                                         params:(CHIPWriteParams * _Nullable)params
+                              completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeWiredAssessedInputVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                            params:(CHIPSubscribeParams * _Nullable)params
-                                           subscriptionEstablished:
-                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))reportHandler;
-+ (void)readAttributeWiredAssessedInputVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                        endpoint:(NSNumber *)endpoint
-                                                           queue:(dispatch_queue_t)queue
-                                               completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeACLouverPositionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeACLouverPositionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeWiredAssessedInputFrequencyWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler;
+- (void)readAttributeACCoilTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeWiredAssessedInputFrequencyWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                              params:(CHIPSubscribeParams * _Nullable)params
-                                             subscriptionEstablished:
-                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))reportHandler;
-+ (void)readAttributeWiredAssessedInputFrequencyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                          endpoint:(NSNumber *)endpoint
-                                                             queue:(dispatch_queue_t)queue
-                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeACCoilTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeACCoilTemperatureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeWiredCurrentTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeACCapacityformatWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                NSError * _Nullable error))completionHandler;
+- (void)writeAttributeACCapacityformatWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeACCapacityformatWithValue:(NSNumber * _Nonnull)value
+                                         params:(CHIPWriteParams * _Nullable)params
+                              completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeWiredCurrentTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeACCapacityformatWithMinInterval:(NSNumber * _Nonnull)minInterval
                                               maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(CHIPSubscribeParams * _Nullable)params
                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                             reportHandler:
                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeWiredCurrentTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeACCapacityformatWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                endpoint:(NSNumber *)endpoint
                                                   queue:(dispatch_queue_t)queue
                                       completionHandler:
                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeWiredAssessedCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeWiredAssessedCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(CHIPSubscribeParams * _Nullable)params
                                       subscriptionEstablished:
                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                 reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeWiredAssessedCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                    endpoint:(NSNumber *)endpoint
                                                       queue:(dispatch_queue_t)queue
                                           completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeWiredNominalVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeWiredNominalVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(CHIPSubscribeParams * _Nullable)params
                                      subscriptionEstablished:
                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeWiredNominalVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                   endpoint:(NSNumber *)endpoint
                                                      queue:(dispatch_queue_t)queue
                                          completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeWiredMaximumCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeWiredMaximumCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeWiredMaximumCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeWiredPresentWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeWiredPresentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeWiredPresentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeActiveWiredFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeActiveWiredFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeActiveWiredFaultsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeBatteryVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeBatteryVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBatteryVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeBatteryPercentRemainingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeBatteryPercentRemainingWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBatteryPercentRemainingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+@end
 
-- (void)readAttributeBatteryTimeRemainingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
 /**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
+ * Cluster Fan Control
+ *
  */
-- (void)subscribeAttributeBatteryTimeRemainingWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBatteryTimeRemainingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+@interface CHIPFanControl : CHIPCluster
 
-- (void)readAttributeBatteryChargeLevelWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler;
+- (void)readAttributeFanModeWithCompletionHandler:(void (^)(
+                                                      NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeFanModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeFanModeWithValue:(NSNumber * _Nonnull)value
+                                params:(CHIPWriteParams * _Nullable)params
+                     completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeBatteryChargeLevelWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBatteryChargeLevelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeFanModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFanModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeBatteryReplacementNeededWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler;
+- (void)readAttributeFanModeSequenceWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
+- (void)writeAttributeFanModeSequenceWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeFanModeSequenceWithValue:(NSNumber * _Nonnull)value
+                                        params:(CHIPWriteParams * _Nullable)params
+                             completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeBatteryReplacementNeededWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBatteryReplacementNeededWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeFanModeSequenceWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFanModeSequenceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeBatteryReplaceabilityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
+- (void)readAttributePercentSettingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
+- (void)writeAttributePercentSettingWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePercentSettingWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeBatteryReplaceabilityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBatteryReplaceabilityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePercentSettingWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePercentSettingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeBatteryPresentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributePercentCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeBatteryPresentWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributePercentCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
                                             maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(CHIPSubscribeParams * _Nullable)params
                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                           reportHandler:
                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBatteryPresentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributePercentCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                              endpoint:(NSNumber *)endpoint
                                                 queue:(dispatch_queue_t)queue
                                     completionHandler:
                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeActiveBatteryFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeSpeedMaxWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeActiveBatteryFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeActiveBatteryFaultsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeSpeedMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeSpeedMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeBatteryReplacementDescriptionWithCompletionHandler:(void (^)(NSString * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributeSpeedSettingWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeSpeedSettingWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSpeedSettingWithValue:(NSNumber * _Nullable)value
+                                     params:(CHIPWriteParams * _Nullable)params
+                          completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeBatteryReplacementDescriptionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                params:(CHIPSubscribeParams * _Nullable)params
-                                               subscriptionEstablished:
-                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                         reportHandler:(void (^)(NSString * _Nullable value,
-                                                                           NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBatteryReplacementDescriptionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                            endpoint:(NSNumber *)endpoint
-                                                               queue:(dispatch_queue_t)queue
-                                                   completionHandler:(void (^)(NSString * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeSpeedSettingWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeSpeedSettingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeBatteryCommonDesignationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler;
+- (void)readAttributeSpeedCurrentWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeBatteryCommonDesignationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBatteryCommonDesignationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeBatteryANSIDesignationWithCompletionHandler:(void (^)(NSString * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeBatteryANSIDesignationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:(void (^)(NSString * _Nullable value,
-                                                                    NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBatteryANSIDesignationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeBatteryIECDesignationWithCompletionHandler:(void (^)(NSString * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeBatteryIECDesignationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBatteryIECDesignationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeBatteryApprovedChemistryWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeBatteryApprovedChemistryWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBatteryApprovedChemistryWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeBatteryCapacityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeBatteryCapacityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBatteryCapacityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeBatteryQuantityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeBatteryQuantityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBatteryQuantityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeBatteryChargeStateWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeBatteryChargeStateWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBatteryChargeStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeSpeedCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeSpeedCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeBatteryTimeToFullChargeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
+- (void)readAttributeRockSupportWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeBatteryTimeToFullChargeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBatteryTimeToFullChargeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRockSupportWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRockSupportWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeBatteryFunctionalWhileChargingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))completionHandler;
+- (void)readAttributeRockSettingWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeRockSettingWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRockSettingWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeBatteryFunctionalWhileChargingWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                                subscriptionEstablished:
-                                                    (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                          reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBatteryFunctionalWhileChargingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                             endpoint:(NSNumber *)endpoint
-                                                                queue:(dispatch_queue_t)queue
-                                                    completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRockSettingWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRockSettingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeBatteryChargingCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
+- (void)readAttributeWindSupportWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeBatteryChargingCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBatteryChargingCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeWindSupportWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeWindSupportWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeActiveBatteryChargeFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler;
+- (void)readAttributeWindSettingWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeWindSettingWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeWindSettingWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeActiveBatteryChargeFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                            params:(CHIPSubscribeParams * _Nullable)params
-                                           subscriptionEstablished:
-                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                     reportHandler:(void (^)(NSArray * _Nullable value,
-                                                                       NSError * _Nullable error))reportHandler;
-+ (void)readAttributeActiveBatteryChargeFaultsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                        endpoint:(NSNumber *)endpoint
-                                                           queue:(dispatch_queue_t)queue
-                                               completionHandler:(void (^)(NSArray * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeWindSettingWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeWindSettingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
@@ -13416,28 +12356,83 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Power Source Configuration
+ * Cluster Thermostat User Interface Configuration
  *
  */
-@interface CHIPPowerSourceConfiguration : CHIPCluster
+@interface CHIPThermostatUserInterfaceConfiguration : CHIPCluster
 
-- (void)readAttributeSourcesWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeTemperatureDisplayModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
+- (void)writeAttributeTemperatureDisplayModeWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTemperatureDisplayModeWithValue:(NSNumber * _Nonnull)value
+                                               params:(CHIPWriteParams * _Nullable)params
+                                    completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeSourcesWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSourcesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeTemperatureDisplayModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))reportHandler;
++ (void)readAttributeTemperatureDisplayModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeKeypadLockoutWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
+- (void)writeAttributeKeypadLockoutWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeKeypadLockoutWithValue:(NSNumber * _Nonnull)value
+                                      params:(CHIPWriteParams * _Nullable)params
+                           completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeKeypadLockoutWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeKeypadLockoutWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeScheduleProgrammingVisibilityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler;
+- (void)writeAttributeScheduleProgrammingVisibilityWithValue:(NSNumber * _Nonnull)value
+                                           completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeScheduleProgrammingVisibilityWithValue:(NSNumber * _Nonnull)value
+                                                      params:(CHIPWriteParams * _Nullable)params
+                                           completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeScheduleProgrammingVisibilityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                params:(CHIPSubscribeParams * _Nullable)params
+                                               subscriptionEstablished:
+                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))reportHandler;
++ (void)readAttributeScheduleProgrammingVisibilityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                            endpoint:(NSNumber *)endpoint
+                                                               queue:(dispatch_queue_t)queue
+                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
@@ -13530,686 +12525,1010 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Pressure Measurement
+ * Cluster Color Control
  *
  */
-@interface CHIPPressureMeasurement : CHIPCluster
+@interface CHIPColorControl : CHIPCluster
 
-- (void)readAttributeMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)moveToHueWithParams:(CHIPColorControlClusterMoveToHueParams *)params completionHandler:(StatusCompletion)completionHandler;
+- (void)moveHueWithParams:(CHIPColorControlClusterMoveHueParams *)params completionHandler:(StatusCompletion)completionHandler;
+- (void)stepHueWithParams:(CHIPColorControlClusterStepHueParams *)params completionHandler:(StatusCompletion)completionHandler;
+- (void)moveToSaturationWithParams:(CHIPColorControlClusterMoveToSaturationParams *)params
+                 completionHandler:(StatusCompletion)completionHandler;
+- (void)moveSaturationWithParams:(CHIPColorControlClusterMoveSaturationParams *)params
+               completionHandler:(StatusCompletion)completionHandler;
+- (void)stepSaturationWithParams:(CHIPColorControlClusterStepSaturationParams *)params
+               completionHandler:(StatusCompletion)completionHandler;
+- (void)moveToHueAndSaturationWithParams:(CHIPColorControlClusterMoveToHueAndSaturationParams *)params
+                       completionHandler:(StatusCompletion)completionHandler;
+- (void)moveToColorWithParams:(CHIPColorControlClusterMoveToColorParams *)params
+            completionHandler:(StatusCompletion)completionHandler;
+- (void)moveColorWithParams:(CHIPColorControlClusterMoveColorParams *)params completionHandler:(StatusCompletion)completionHandler;
+- (void)stepColorWithParams:(CHIPColorControlClusterStepColorParams *)params completionHandler:(StatusCompletion)completionHandler;
+- (void)moveToColorTemperatureWithParams:(CHIPColorControlClusterMoveToColorTemperatureParams *)params
+                       completionHandler:(StatusCompletion)completionHandler;
+- (void)enhancedMoveToHueWithParams:(CHIPColorControlClusterEnhancedMoveToHueParams *)params
+                  completionHandler:(StatusCompletion)completionHandler;
+- (void)enhancedMoveHueWithParams:(CHIPColorControlClusterEnhancedMoveHueParams *)params
+                completionHandler:(StatusCompletion)completionHandler;
+- (void)enhancedStepHueWithParams:(CHIPColorControlClusterEnhancedStepHueParams *)params
+                completionHandler:(StatusCompletion)completionHandler;
+- (void)enhancedMoveToHueAndSaturationWithParams:(CHIPColorControlClusterEnhancedMoveToHueAndSaturationParams *)params
+                               completionHandler:(StatusCompletion)completionHandler;
+- (void)colorLoopSetWithParams:(CHIPColorControlClusterColorLoopSetParams *)params
+             completionHandler:(StatusCompletion)completionHandler;
+- (void)stopMoveStepWithParams:(CHIPColorControlClusterStopMoveStepParams *)params
+             completionHandler:(StatusCompletion)completionHandler;
+- (void)moveColorTemperatureWithParams:(CHIPColorControlClusterMoveColorTemperatureParams *)params
+                     completionHandler:(StatusCompletion)completionHandler;
+- (void)stepColorTemperatureWithParams:(CHIPColorControlClusterStepColorTemperatureParams *)params
+                     completionHandler:(StatusCompletion)completionHandler;
+
+- (void)readAttributeCurrentHueWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeCurrentHueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentHueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeCurrentSaturationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeCurrentSaturationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentSaturationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeRemainingTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                             NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeRemainingTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:
                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeRemainingTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMinMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeCurrentXWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeCurrentXWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentXWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeCurrentYWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeCurrentYWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentYWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeDriftCompensationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeDriftCompensationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDriftCompensationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeCompensationTextWithCompletionHandler:(void (^)(NSString * _Nullable value,
                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMinMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeCompensationTextWithMinInterval:(NSNumber * _Nonnull)minInterval
                                               maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(CHIPSubscribeParams * _Nullable)params
                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                             reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMinMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCompensationTextWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                endpoint:(NSNumber *)endpoint
                                                   queue:(dispatch_queue_t)queue
                                       completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+                                          (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMaxMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeColorTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMaxMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeColorTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval
                                               maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(CHIPSubscribeParams * _Nullable)params
                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                             reportHandler:
                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMaxMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeColorTemperatureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                endpoint:(NSNumber *)endpoint
                                                   queue:(dispatch_queue_t)queue
                                       completionHandler:
                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeToleranceWithCompletionHandler:(void (^)(
+- (void)readAttributeColorModeWithCompletionHandler:(void (^)(
                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeToleranceWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeColorModeWithMinInterval:(NSNumber * _Nonnull)minInterval
                                        maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(CHIPSubscribeParams * _Nullable)params
                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeToleranceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeColorModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                         endpoint:(NSNumber *)endpoint
                                            queue:(dispatch_queue_t)queue
                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeScaledValueWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeOptionsWithCompletionHandler:(void (^)(
+                                                      NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeOptionsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOptionsWithValue:(NSNumber * _Nonnull)value
+                                params:(CHIPWriteParams * _Nullable)params
+                     completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeScaledValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeScaledValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeOptionsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeOptionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMinScaledValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
+- (void)readAttributeNumberOfPrimariesWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMinScaledValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMinScaledValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeMaxScaledValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNumberOfPrimariesWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNumberOfPrimariesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributePrimary1XWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMaxScaledValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMaxScaledValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePrimary1XWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePrimary1XWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeScaledToleranceWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributePrimary1YWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeScaledToleranceWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeScaledToleranceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePrimary1YWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePrimary1YWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeScaleWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributePrimary1IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeScaleWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                        params:(CHIPSubscribeParams * _Nullable)params
-                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeScaleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                    endpoint:(NSNumber *)endpoint
-                                       queue:(dispatch_queue_t)queue
-                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePrimary1IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePrimary1IntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributePrimary2XWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePrimary2XWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePrimary2XWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributePrimary2YWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePrimary2YWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePrimary2YWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributePrimary2IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePrimary2IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePrimary2IntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributePrimary3XWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePrimary3XWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePrimary3XWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributePrimary3YWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-@end
+- (void)subscribeAttributePrimary3YWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePrimary3YWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
+- (void)readAttributePrimary3IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
- * Cluster Pump Configuration and Control
- *
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
  */
-@interface CHIPPumpConfigurationAndControl : CHIPCluster
+- (void)subscribeAttributePrimary3IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePrimary3IntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMaxPressureWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributePrimary4XWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMaxPressureWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMaxPressureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePrimary4XWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePrimary4XWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMaxSpeedWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributePrimary4YWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMaxSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMaxSpeedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePrimary4YWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePrimary4YWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMaxFlowWithCompletionHandler:(void (^)(
-                                                      NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributePrimary4IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMaxFlowWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMaxFlowWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePrimary4IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePrimary4IntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMinConstPressureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
+- (void)readAttributePrimary5XWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMinConstPressureWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMinConstPressureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePrimary5XWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePrimary5XWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMaxConstPressureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
+- (void)readAttributePrimary5YWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMaxConstPressureWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMaxConstPressureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePrimary5YWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePrimary5YWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMinCompPressureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributePrimary5IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMinCompPressureWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMinCompPressureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePrimary5IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePrimary5IntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMaxCompPressureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributePrimary6XWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMaxCompPressureWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMaxCompPressureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePrimary6XWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePrimary6XWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMinConstSpeedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributePrimary6YWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMinConstSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMinConstSpeedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePrimary6YWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePrimary6YWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMaxConstSpeedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributePrimary6IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMaxConstSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMaxConstSpeedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePrimary6IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePrimary6IntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMinConstFlowWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeWhitePointXWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeWhitePointXWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeWhitePointXWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMinConstFlowWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMinConstFlowWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeWhitePointXWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeWhitePointXWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMaxConstFlowWithCompletionHandler:(void (^)(
+- (void)readAttributeWhitePointYWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeWhitePointYWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeWhitePointYWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeWhitePointYWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeWhitePointYWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeColorPointRXWithCompletionHandler:(void (^)(
                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeColorPointRXWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeColorPointRXWithValue:(NSNumber * _Nonnull)value
+                                     params:(CHIPWriteParams * _Nullable)params
+                          completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMaxConstFlowWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeColorPointRXWithMinInterval:(NSNumber * _Nonnull)minInterval
                                           maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(CHIPSubscribeParams * _Nullable)params
                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                         reportHandler:
                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMaxConstFlowWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeColorPointRXWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                            endpoint:(NSNumber *)endpoint
                                               queue:(dispatch_queue_t)queue
                                   completionHandler:
                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMinConstTempWithCompletionHandler:(void (^)(
+- (void)readAttributeColorPointRYWithCompletionHandler:(void (^)(
                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeColorPointRYWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeColorPointRYWithValue:(NSNumber * _Nonnull)value
+                                     params:(CHIPWriteParams * _Nullable)params
+                          completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMinConstTempWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeColorPointRYWithMinInterval:(NSNumber * _Nonnull)minInterval
                                           maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(CHIPSubscribeParams * _Nullable)params
                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                         reportHandler:
                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMinConstTempWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeColorPointRYWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                            endpoint:(NSNumber *)endpoint
                                               queue:(dispatch_queue_t)queue
                                   completionHandler:
                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMaxConstTempWithCompletionHandler:(void (^)(
+- (void)readAttributeColorPointRIntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
+- (void)writeAttributeColorPointRIntensityWithValue:(NSNumber * _Nullable)value
+                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeColorPointRIntensityWithValue:(NSNumber * _Nullable)value
+                                             params:(CHIPWriteParams * _Nullable)params
+                                  completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeColorPointRIntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeColorPointRIntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeColorPointGXWithCompletionHandler:(void (^)(
                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeColorPointGXWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeColorPointGXWithValue:(NSNumber * _Nonnull)value
+                                     params:(CHIPWriteParams * _Nullable)params
+                          completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMaxConstTempWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeColorPointGXWithMinInterval:(NSNumber * _Nonnull)minInterval
                                           maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(CHIPSubscribeParams * _Nullable)params
                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                         reportHandler:
                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMaxConstTempWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeColorPointGXWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                            endpoint:(NSNumber *)endpoint
                                               queue:(dispatch_queue_t)queue
                                   completionHandler:
                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePumpStatusWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributePumpStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePumpStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeEffectiveOperationModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
+- (void)readAttributeColorPointGYWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeColorPointGYWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeColorPointGYWithValue:(NSNumber * _Nonnull)value
+                                     params:(CHIPWriteParams * _Nullable)params
+                          completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeEffectiveOperationModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))reportHandler;
-+ (void)readAttributeEffectiveOperationModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeColorPointGYWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeColorPointGYWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeEffectiveControlModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeColorPointGIntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
+- (void)writeAttributeColorPointGIntensityWithValue:(NSNumber * _Nullable)value
+                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeColorPointGIntensityWithValue:(NSNumber * _Nullable)value
+                                             params:(CHIPWriteParams * _Nullable)params
+                                  completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeEffectiveControlModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeColorPointGIntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(CHIPSubscribeParams * _Nullable)params
                                       subscriptionEstablished:
                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                 reportHandler:
                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeEffectiveControlModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeColorPointGIntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                    endpoint:(NSNumber *)endpoint
                                                       queue:(dispatch_queue_t)queue
                                           completionHandler:
                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCapacityWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeColorPointBXWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeColorPointBXWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeColorPointBXWithValue:(NSNumber * _Nonnull)value
+                                     params:(CHIPWriteParams * _Nullable)params
+                          completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCapacityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCapacityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeColorPointBXWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeColorPointBXWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeSpeedWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeColorPointBYWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeColorPointBYWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeColorPointBYWithValue:(NSNumber * _Nonnull)value
+                                     params:(CHIPWriteParams * _Nullable)params
+                          completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                        params:(CHIPSubscribeParams * _Nullable)params
-                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSpeedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                    endpoint:(NSNumber *)endpoint
-                                       queue:(dispatch_queue_t)queue
-                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeColorPointBYWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeColorPointBYWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeLifetimeRunningHoursWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeColorPointBIntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
-- (void)writeAttributeLifetimeRunningHoursWithValue:(NSNumber * _Nullable)value
+- (void)writeAttributeColorPointBIntensityWithValue:(NSNumber * _Nullable)value
                                   completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeLifetimeRunningHoursWithValue:(NSNumber * _Nullable)value
+- (void)writeAttributeColorPointBIntensityWithValue:(NSNumber * _Nullable)value
                                              params:(CHIPWriteParams * _Nullable)params
                                   completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeLifetimeRunningHoursWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeColorPointBIntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(CHIPSubscribeParams * _Nullable)params
                                       subscriptionEstablished:
                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                 reportHandler:
                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLifetimeRunningHoursWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeColorPointBIntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                    endpoint:(NSNumber *)endpoint
                                                       queue:(dispatch_queue_t)queue
                                           completionHandler:
                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeEnhancedCurrentHueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePowerWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                        params:(CHIPSubscribeParams * _Nullable)params
-                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                    endpoint:(NSNumber *)endpoint
-                                       queue:(dispatch_queue_t)queue
-                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeEnhancedCurrentHueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeEnhancedCurrentHueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeLifetimeEnergyConsumedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
-- (void)writeAttributeLifetimeEnergyConsumedWithValue:(NSNumber * _Nullable)value
-                                    completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeLifetimeEnergyConsumedWithValue:(NSNumber * _Nullable)value
-                                               params:(CHIPWriteParams * _Nullable)params
-                                    completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeEnhancedColorModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeLifetimeEnergyConsumedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLifetimeEnergyConsumedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeEnhancedColorModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeEnhancedColorModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeOperationModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
-- (void)writeAttributeOperationModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOperationModeWithValue:(NSNumber * _Nonnull)value
-                                      params:(CHIPWriteParams * _Nullable)params
-                           completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeColorLoopActiveWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeOperationModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOperationModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeColorLoopActiveWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeColorLoopActiveWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeControlModeWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeControlModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeControlModeWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeColorLoopDirectionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeControlModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeControlModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeColorLoopDirectionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeColorLoopDirectionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeColorLoopTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeColorLoopTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeColorLoopTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeColorLoopStartEnhancedHueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeColorLoopStartEnhancedHueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                            params:(CHIPSubscribeParams * _Nullable)params
+                                           subscriptionEstablished:
+                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))reportHandler;
++ (void)readAttributeColorLoopStartEnhancedHueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                        endpoint:(NSNumber *)endpoint
+                                                           queue:(dispatch_queue_t)queue
+                                               completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeColorLoopStoredEnhancedHueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeColorLoopStoredEnhancedHueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                             params:(CHIPSubscribeParams * _Nullable)params
+                                            subscriptionEstablished:
+                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))reportHandler;
++ (void)readAttributeColorLoopStoredEnhancedHueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                         endpoint:(NSNumber *)endpoint
+                                                            queue:(dispatch_queue_t)queue
+                                                completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeColorCapabilitiesWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeColorCapabilitiesWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeColorCapabilitiesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeColorTempPhysicalMinMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeColorTempPhysicalMinMiredsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                             params:(CHIPSubscribeParams * _Nullable)params
+                                            subscriptionEstablished:
+                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))reportHandler;
++ (void)readAttributeColorTempPhysicalMinMiredsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                         endpoint:(NSNumber *)endpoint
+                                                            queue:(dispatch_queue_t)queue
+                                                completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeColorTempPhysicalMaxMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeColorTempPhysicalMaxMiredsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                             params:(CHIPSubscribeParams * _Nullable)params
+                                            subscriptionEstablished:
+                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))reportHandler;
++ (void)readAttributeColorTempPhysicalMaxMiredsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                         endpoint:(NSNumber *)endpoint
+                                                            queue:(dispatch_queue_t)queue
+                                                completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeCoupleColorTempToLevelMinMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeCoupleColorTempToLevelMinMiredsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                                 subscriptionEstablished:
+                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))reportHandler;
++ (void)readAttributeCoupleColorTempToLevelMinMiredsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                              endpoint:(NSNumber *)endpoint
+                                                                 queue:(dispatch_queue_t)queue
+                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeStartUpColorTemperatureMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler;
+- (void)writeAttributeStartUpColorTemperatureMiredsWithValue:(NSNumber * _Nonnull)value
+                                           completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeStartUpColorTemperatureMiredsWithValue:(NSNumber * _Nonnull)value
+                                                      params:(CHIPWriteParams * _Nullable)params
+                                           completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeStartUpColorTemperatureMiredsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                params:(CHIPSubscribeParams * _Nullable)params
+                                               subscriptionEstablished:
+                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))reportHandler;
++ (void)readAttributeStartUpColorTemperatureMiredsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                            endpoint:(NSNumber *)endpoint
+                                                               queue:(dispatch_queue_t)queue
+                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler;
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
@@ -14305,10 +13624,10 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Relative Humidity Measurement
+ * Cluster Illuminance Measurement
  *
  */
-@interface CHIPRelativeHumidityMeasurement : CHIPCluster
+@interface CHIPIlluminanceMeasurement : CHIPCluster
 
 - (void)readAttributeMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                             NSError * _Nullable error))completionHandler;
@@ -14380,6 +13699,24 @@ NS_ASSUME_NONNULL_BEGIN
                                            queue:(dispatch_queue_t)queue
                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
+- (void)readAttributeLightSensorTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeLightSensorTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeLightSensorTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
 /**
@@ -14474,145 +13811,81 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Scenes
+ * Cluster Temperature Measurement
  *
  */
-@interface CHIPScenes : CHIPCluster
-
-- (void)addSceneWithParams:(CHIPScenesClusterAddSceneParams *)params
-         completionHandler:
-             (void (^)(CHIPScenesClusterAddSceneResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
-- (void)viewSceneWithParams:(CHIPScenesClusterViewSceneParams *)params
-          completionHandler:
-              (void (^)(CHIPScenesClusterViewSceneResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
-- (void)removeSceneWithParams:(CHIPScenesClusterRemoveSceneParams *)params
-            completionHandler:
-                (void (^)(CHIPScenesClusterRemoveSceneResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
-- (void)removeAllScenesWithParams:(CHIPScenesClusterRemoveAllScenesParams *)params
-                completionHandler:(void (^)(CHIPScenesClusterRemoveAllScenesResponseParams * _Nullable data,
-                                      NSError * _Nullable error))completionHandler;
-- (void)storeSceneWithParams:(CHIPScenesClusterStoreSceneParams *)params
-           completionHandler:
-               (void (^)(CHIPScenesClusterStoreSceneResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
-- (void)recallSceneWithParams:(CHIPScenesClusterRecallSceneParams *)params completionHandler:(StatusCompletion)completionHandler;
-- (void)getSceneMembershipWithParams:(CHIPScenesClusterGetSceneMembershipParams *)params
-                   completionHandler:(void (^)(CHIPScenesClusterGetSceneMembershipResponseParams * _Nullable data,
-                                         NSError * _Nullable error))completionHandler;
-- (void)enhancedAddSceneWithParams:(CHIPScenesClusterEnhancedAddSceneParams *)params
-                 completionHandler:(void (^)(CHIPScenesClusterEnhancedAddSceneResponseParams * _Nullable data,
-                                       NSError * _Nullable error))completionHandler;
-- (void)enhancedViewSceneWithParams:(CHIPScenesClusterEnhancedViewSceneParams *)params
-                  completionHandler:(void (^)(CHIPScenesClusterEnhancedViewSceneResponseParams * _Nullable data,
-                                        NSError * _Nullable error))completionHandler;
-- (void)copySceneWithParams:(CHIPScenesClusterCopySceneParams *)params
-          completionHandler:
-              (void (^)(CHIPScenesClusterCopySceneResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
+@interface CHIPTemperatureMeasurement : CHIPCluster
 
-- (void)readAttributeSceneCountWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeSceneCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSceneCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCurrentSceneWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeMinMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCurrentSceneWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentSceneWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeCurrentGroupWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeCurrentGroupWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentGroupWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeSceneValidWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeSceneValidWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSceneValidWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeNameSupportWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeNameSupportWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNameSupportWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMinMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMinMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeLastConfiguredByWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeMaxMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeLastConfiguredByWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeMaxMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
                                               maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(CHIPSubscribeParams * _Nullable)params
                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                             reportHandler:
                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLastConfiguredByWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeMaxMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                endpoint:(NSNumber *)endpoint
                                                   queue:(dispatch_queue_t)queue
                                       completionHandler:
                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
+- (void)readAttributeToleranceWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeToleranceWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeToleranceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
 /**
@@ -14707,240 +13980,166 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Software Diagnostics
+ * Cluster Pressure Measurement
  *
  */
-@interface CHIPSoftwareDiagnostics : CHIPCluster
-
-- (void)resetWatermarksWithParams:(CHIPSoftwareDiagnosticsClusterResetWatermarksParams * _Nullable)params
-                completionHandler:(StatusCompletion)completionHandler;
-- (void)resetWatermarksWithCompletionHandler:(StatusCompletion)completionHandler;
+@interface CHIPPressureMeasurement : CHIPCluster
 
-- (void)readAttributeThreadMetricsWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeThreadMetricsWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeThreadMetricsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCurrentHeapFreeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeMinMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCurrentHeapFreeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentHeapFreeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMinMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMinMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCurrentHeapUsedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeMaxMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCurrentHeapUsedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentHeapUsedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMaxMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMaxMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCurrentHeapHighWatermarkWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler;
+- (void)readAttributeToleranceWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCurrentHeapHighWatermarkWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentHeapHighWatermarkWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeToleranceWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeToleranceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeScaledValueWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeScaledValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeScaledValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeMinScaledValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMinScaledValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMinScaledValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeMaxScaledValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-@end
-
-/**
- * Cluster Switch
- *
- */
-@interface CHIPSwitch : CHIPCluster
-
-- (void)readAttributeNumberOfPositionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeNumberOfPositionsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNumberOfPositionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMaxScaledValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMaxScaledValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCurrentPositionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeScaledToleranceWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCurrentPositionWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeScaledToleranceWithMinInterval:(NSNumber * _Nonnull)minInterval
                                              maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(CHIPSubscribeParams * _Nullable)params
                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                            reportHandler:
                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentPositionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeScaledToleranceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                               endpoint:(NSNumber *)endpoint
                                                  queue:(dispatch_queue_t)queue
                                      completionHandler:
                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMultiPressMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributeScaleWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMultiPressMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMultiPressMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeScaleWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                        params:(CHIPSubscribeParams * _Nullable)params
+                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeScaleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                    endpoint:(NSNumber *)endpoint
+                                       queue:(dispatch_queue_t)queue
+                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
@@ -15036,49 +14235,81 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Target Navigator
+ * Cluster Flow Measurement
  *
  */
-@interface CHIPTargetNavigator : CHIPCluster
-
-- (void)navigateTargetWithParams:(CHIPTargetNavigatorClusterNavigateTargetParams *)params
-               completionHandler:(void (^)(CHIPTargetNavigatorClusterNavigateTargetResponseParams * _Nullable data,
-                                     NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeTargetListWithCompletionHandler:(void (^)(
-                                                         NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeTargetListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTargetListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+@interface CHIPFlowMeasurement : CHIPCluster
 
-- (void)readAttributeCurrentTargetWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                             NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCurrentTargetWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:
                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentTargetWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
+- (void)readAttributeMinMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeMinMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMinMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeMaxMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeMaxMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMaxMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeToleranceWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeToleranceWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeToleranceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
 /**
@@ -15173,10 +14404,10 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Temperature Measurement
+ * Cluster Relative Humidity Measurement
  *
  */
-@interface CHIPTemperatureMeasurement : CHIPCluster
+@interface CHIPRelativeHumidityMeasurement : CHIPCluster
 
 - (void)readAttributeMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                             NSError * _Nullable error))completionHandler;
@@ -15342,1814 +14573,1989 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Test Cluster
+ * Cluster Occupancy Sensing
  *
  */
-@interface CHIPTestCluster : CHIPCluster
+@interface CHIPOccupancySensing : CHIPCluster
 
-- (void)testWithParams:(CHIPTestClusterClusterTestParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler;
-- (void)testWithCompletionHandler:(StatusCompletion)completionHandler;
-- (void)testNotHandledWithParams:(CHIPTestClusterClusterTestNotHandledParams * _Nullable)params
-               completionHandler:(StatusCompletion)completionHandler;
-- (void)testNotHandledWithCompletionHandler:(StatusCompletion)completionHandler;
-- (void)testSpecificWithParams:(CHIPTestClusterClusterTestSpecificParams * _Nullable)params
-             completionHandler:(void (^)(CHIPTestClusterClusterTestSpecificResponseParams * _Nullable data,
-                                   NSError * _Nullable error))completionHandler;
-- (void)testSpecificWithCompletionHandler:(void (^)(CHIPTestClusterClusterTestSpecificResponseParams * _Nullable data,
-                                              NSError * _Nullable error))completionHandler;
-- (void)testUnknownCommandWithParams:(CHIPTestClusterClusterTestUnknownCommandParams * _Nullable)params
-                   completionHandler:(StatusCompletion)completionHandler;
-- (void)testUnknownCommandWithCompletionHandler:(StatusCompletion)completionHandler;
-- (void)testAddArgumentsWithParams:(CHIPTestClusterClusterTestAddArgumentsParams *)params
-                 completionHandler:(void (^)(CHIPTestClusterClusterTestAddArgumentsResponseParams * _Nullable data,
-                                       NSError * _Nullable error))completionHandler;
-- (void)testSimpleArgumentRequestWithParams:(CHIPTestClusterClusterTestSimpleArgumentRequestParams *)params
-                          completionHandler:(void (^)(CHIPTestClusterClusterTestSimpleArgumentResponseParams * _Nullable data,
-                                                NSError * _Nullable error))completionHandler;
-- (void)testStructArrayArgumentRequestWithParams:(CHIPTestClusterClusterTestStructArrayArgumentRequestParams *)params
-                               completionHandler:
-                                   (void (^)(CHIPTestClusterClusterTestStructArrayArgumentResponseParams * _Nullable data,
-                                       NSError * _Nullable error))completionHandler;
-- (void)testStructArgumentRequestWithParams:(CHIPTestClusterClusterTestStructArgumentRequestParams *)params
-                          completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
-                                                NSError * _Nullable error))completionHandler;
-- (void)testNestedStructArgumentRequestWithParams:(CHIPTestClusterClusterTestNestedStructArgumentRequestParams *)params
-                                completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
-                                                      NSError * _Nullable error))completionHandler;
-- (void)testListStructArgumentRequestWithParams:(CHIPTestClusterClusterTestListStructArgumentRequestParams *)params
-                              completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
-                                                    NSError * _Nullable error))completionHandler;
-- (void)testListInt8UArgumentRequestWithParams:(CHIPTestClusterClusterTestListInt8UArgumentRequestParams *)params
-                             completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
-                                                   NSError * _Nullable error))completionHandler;
-- (void)testNestedStructListArgumentRequestWithParams:(CHIPTestClusterClusterTestNestedStructListArgumentRequestParams *)params
-                                    completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
-                                                          NSError * _Nullable error))completionHandler;
-- (void)testListNestedStructListArgumentRequestWithParams:
-            (CHIPTestClusterClusterTestListNestedStructListArgumentRequestParams *)params
-                                        completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
-                                                              NSError * _Nullable error))completionHandler;
-- (void)testListInt8UReverseRequestWithParams:(CHIPTestClusterClusterTestListInt8UReverseRequestParams *)params
-                            completionHandler:(void (^)(CHIPTestClusterClusterTestListInt8UReverseResponseParams * _Nullable data,
-                                                  NSError * _Nullable error))completionHandler;
-- (void)testEnumsRequestWithParams:(CHIPTestClusterClusterTestEnumsRequestParams *)params
-                 completionHandler:(void (^)(CHIPTestClusterClusterTestEnumsResponseParams * _Nullable data,
-                                       NSError * _Nullable error))completionHandler;
-- (void)testNullableOptionalRequestWithParams:(CHIPTestClusterClusterTestNullableOptionalRequestParams * _Nullable)params
-                            completionHandler:(void (^)(CHIPTestClusterClusterTestNullableOptionalResponseParams * _Nullable data,
-                                                  NSError * _Nullable error))completionHandler;
-- (void)testComplexNullableOptionalRequestWithParams:(CHIPTestClusterClusterTestComplexNullableOptionalRequestParams *)params
-                                   completionHandler:
-                                       (void (^)(CHIPTestClusterClusterTestComplexNullableOptionalResponseParams * _Nullable data,
-                                           NSError * _Nullable error))completionHandler;
-- (void)simpleStructEchoRequestWithParams:(CHIPTestClusterClusterSimpleStructEchoRequestParams *)params
-                        completionHandler:(void (^)(CHIPTestClusterClusterSimpleStructResponseParams * _Nullable data,
-                                              NSError * _Nullable error))completionHandler;
-- (void)timedInvokeRequestWithParams:(CHIPTestClusterClusterTimedInvokeRequestParams * _Nullable)params
-                   completionHandler:(StatusCompletion)completionHandler;
-- (void)timedInvokeRequestWithCompletionHandler:(StatusCompletion)completionHandler;
-- (void)testSimpleOptionalArgumentRequestWithParams:
-            (CHIPTestClusterClusterTestSimpleOptionalArgumentRequestParams * _Nullable)params
-                                  completionHandler:(StatusCompletion)completionHandler;
-- (void)testEmitTestEventRequestWithParams:(CHIPTestClusterClusterTestEmitTestEventRequestParams *)params
-                         completionHandler:(void (^)(CHIPTestClusterClusterTestEmitTestEventResponseParams * _Nullable data,
-                                               NSError * _Nullable error))completionHandler;
-- (void)testEmitTestFabricScopedEventRequestWithParams:(CHIPTestClusterClusterTestEmitTestFabricScopedEventRequestParams *)params
-                                     completionHandler:
-                                         (void (^)(
-                                             CHIPTestClusterClusterTestEmitTestFabricScopedEventResponseParams * _Nullable data,
-                                             NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeBooleanWithCompletionHandler:(void (^)(
-                                                      NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeBooleanWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBooleanWithValue:(NSNumber * _Nonnull)value
-                                params:(CHIPWriteParams * _Nullable)params
-                     completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeOccupancyWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeBooleanWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBooleanWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeOccupancyWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeOccupancyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeBitmap8WithCompletionHandler:(void (^)(
-                                                      NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeBitmap8WithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBitmap8WithValue:(NSNumber * _Nonnull)value
-                                params:(CHIPWriteParams * _Nullable)params
-                     completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeOccupancySensorTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeBitmap8WithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBitmap8WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeOccupancySensorTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeOccupancySensorTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeBitmap16WithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeBitmap16WithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBitmap16WithValue:(NSNumber * _Nonnull)value
-                                 params:(CHIPWriteParams * _Nullable)params
-                      completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeOccupancySensorTypeBitmapWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeBitmap16WithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBitmap16WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeOccupancySensorTypeBitmapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                            params:(CHIPSubscribeParams * _Nullable)params
+                                           subscriptionEstablished:
+                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))reportHandler;
++ (void)readAttributeOccupancySensorTypeBitmapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                        endpoint:(NSNumber *)endpoint
+                                                           queue:(dispatch_queue_t)queue
+                                               completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeBitmap32WithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeBitmap32WithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBitmap32WithValue:(NSNumber * _Nonnull)value
-                                 params:(CHIPWriteParams * _Nullable)params
-                      completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributePirOccupiedToUnoccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler;
+- (void)writeAttributePirOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value
+                                          completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePirOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value
+                                                     params:(CHIPWriteParams * _Nullable)params
+                                          completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeBitmap32WithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBitmap32WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePirOccupiedToUnoccupiedDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                              subscriptionEstablished:
+                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))reportHandler;
++ (void)readAttributePirOccupiedToUnoccupiedDelayWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                           endpoint:(NSNumber *)endpoint
+                                                              queue:(dispatch_queue_t)queue
+                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeBitmap64WithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeBitmap64WithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBitmap64WithValue:(NSNumber * _Nonnull)value
-                                 params:(CHIPWriteParams * _Nullable)params
-                      completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributePirUnoccupiedToOccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler;
+- (void)writeAttributePirUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value
+                                          completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePirUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value
+                                                     params:(CHIPWriteParams * _Nullable)params
+                                          completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeBitmap64WithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBitmap64WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePirUnoccupiedToOccupiedDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                              subscriptionEstablished:
+                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))reportHandler;
++ (void)readAttributePirUnoccupiedToOccupiedDelayWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                           endpoint:(NSNumber *)endpoint
+                                                              queue:(dispatch_queue_t)queue
+                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeInt8uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeInt8uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInt8uWithValue:(NSNumber * _Nonnull)value
-                              params:(CHIPWriteParams * _Nullable)params
-                   completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributePirUnoccupiedToOccupiedThresholdWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))completionHandler;
+- (void)writeAttributePirUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value
+                                              completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePirUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value
+                                                         params:(CHIPWriteParams * _Nullable)params
+                                              completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeInt8uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                        params:(CHIPSubscribeParams * _Nullable)params
-                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInt8uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                    endpoint:(NSNumber *)endpoint
-                                       queue:(dispatch_queue_t)queue
-                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePirUnoccupiedToOccupiedThresholdWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                                  subscriptionEstablished:
+                                                      (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                            reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))reportHandler;
++ (void)readAttributePirUnoccupiedToOccupiedThresholdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                               endpoint:(NSNumber *)endpoint
+                                                                  queue:(dispatch_queue_t)queue
+                                                      completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeInt16uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeInt16uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInt16uWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeUltrasonicOccupiedToUnoccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                  NSError * _Nullable error))completionHandler;
+- (void)writeAttributeUltrasonicOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value
+                                                 completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeUltrasonicOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value
+                                                            params:(CHIPWriteParams * _Nullable)params
+                                                 completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeInt16uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInt16uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeUltrasonicOccupiedToUnoccupiedDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                                     subscriptionEstablished:
+                                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                               reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                 NSError * _Nullable error))reportHandler;
++ (void)readAttributeUltrasonicOccupiedToUnoccupiedDelayWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                  endpoint:(NSNumber *)endpoint
+                                                                     queue:(dispatch_queue_t)queue
+                                                         completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeInt24uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeInt24uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInt24uWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeUltrasonicUnoccupiedToOccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                  NSError * _Nullable error))completionHandler;
+- (void)writeAttributeUltrasonicUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value
+                                                 completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeUltrasonicUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value
+                                                            params:(CHIPWriteParams * _Nullable)params
+                                                 completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeInt24uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInt24uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeInt32uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeInt32uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInt32uWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeInt32uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInt32uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeUltrasonicUnoccupiedToOccupiedDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                                     subscriptionEstablished:
+                                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                               reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                 NSError * _Nullable error))reportHandler;
++ (void)readAttributeUltrasonicUnoccupiedToOccupiedDelayWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                  endpoint:(NSNumber *)endpoint
+                                                                     queue:(dispatch_queue_t)queue
+                                                         completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeInt40uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeInt40uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInt40uWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeUltrasonicUnoccupiedToOccupiedThresholdWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                      NSError * _Nullable error))completionHandler;
+- (void)writeAttributeUltrasonicUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value
+                                                     completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeUltrasonicUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value
+                                                                params:(CHIPWriteParams * _Nullable)params
+                                                     completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeInt40uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInt40uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeUltrasonicUnoccupiedToOccupiedThresholdWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
+                                                                                     subscriptionEstablishedHandler
+                                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                     NSError * _Nullable error))reportHandler;
++ (void)readAttributeUltrasonicUnoccupiedToOccupiedThresholdWithAttributeCache:
+            (CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                      endpoint:(NSNumber *)endpoint
+                                                                         queue:(dispatch_queue_t)queue
+                                                             completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                   NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeInt48uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeInt48uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInt48uWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributePhysicalContactOccupiedToUnoccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                       NSError * _Nullable error))completionHandler;
+- (void)writeAttributePhysicalContactOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value
+                                                      completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePhysicalContactOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value
+                                                                 params:(CHIPWriteParams * _Nullable)params
+                                                      completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeInt48uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInt48uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePhysicalContactOccupiedToUnoccupiedDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
+                                                                                      subscriptionEstablishedHandler
+                                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                      NSError * _Nullable error))reportHandler;
++ (void)readAttributePhysicalContactOccupiedToUnoccupiedDelayWithAttributeCache:
+            (CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                       endpoint:(NSNumber *)endpoint
+                                                                          queue:(dispatch_queue_t)queue
+                                                              completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                    NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeInt56uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeInt56uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInt56uWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributePhysicalContactUnoccupiedToOccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                       NSError * _Nullable error))completionHandler;
+- (void)writeAttributePhysicalContactUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value
+                                                      completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePhysicalContactUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value
+                                                                 params:(CHIPWriteParams * _Nullable)params
+                                                      completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeInt56uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInt56uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePhysicalContactUnoccupiedToOccupiedDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
+                                                                                      subscriptionEstablishedHandler
+                                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                      NSError * _Nullable error))reportHandler;
++ (void)readAttributePhysicalContactUnoccupiedToOccupiedDelayWithAttributeCache:
+            (CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                       endpoint:(NSNumber *)endpoint
+                                                                          queue:(dispatch_queue_t)queue
+                                                              completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                    NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeInt64uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeInt64uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInt64uWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributePhysicalContactUnoccupiedToOccupiedThresholdWithCompletionHandler:
+    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributePhysicalContactUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value
+                                                          completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePhysicalContactUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value
+                                                                     params:(CHIPWriteParams * _Nullable)params
+                                                          completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeInt64uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInt64uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePhysicalContactUnoccupiedToOccupiedThresholdWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
+                                                                                          subscriptionEstablishedHandler
+                                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                          NSError * _Nullable error))reportHandler;
++ (void)readAttributePhysicalContactUnoccupiedToOccupiedThresholdWithAttributeCache:
+            (CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                           endpoint:(NSNumber *)endpoint
+                                                                              queue:(dispatch_queue_t)queue
+                                                                  completionHandler:
+                                                                      (void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeInt8sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeInt8sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInt8sWithValue:(NSNumber * _Nonnull)value
-                              params:(CHIPWriteParams * _Nullable)params
-                   completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeInt8sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                        params:(CHIPSubscribeParams * _Nullable)params
-                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInt8sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                    endpoint:(NSNumber *)endpoint
-                                       queue:(dispatch_queue_t)queue
-                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeInt16sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeInt16sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInt16sWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeInt16sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInt16sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeInt24sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeInt24sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInt24sWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeInt24sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInt24sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeInt32sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeInt32sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInt32sWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeInt32sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInt32sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeInt40sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeInt40sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInt40sWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeInt40sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInt40sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeInt48sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeInt48sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInt48sWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler;
+@end
+
+/**
+ * Cluster Wake on LAN
+ *
+ */
+@interface CHIPWakeOnLan : CHIPCluster
+
+- (void)readAttributeMACAddressWithCompletionHandler:(void (^)(
+                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeInt48sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInt48sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMACAddressWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeMACAddressWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeInt56sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeInt56sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInt56sWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeInt56sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInt56sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeInt64sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeInt64sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInt64sWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeInt64sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInt64sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeEnum8WithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeEnum8WithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeEnum8WithValue:(NSNumber * _Nonnull)value
-                              params:(CHIPWriteParams * _Nullable)params
-                   completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeEnum8WithMinInterval:(NSNumber * _Nonnull)minInterval
-                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                        params:(CHIPSubscribeParams * _Nullable)params
-                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeEnum8WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                    endpoint:(NSNumber *)endpoint
-                                       queue:(dispatch_queue_t)queue
-                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeEnum16WithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeEnum16WithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeEnum16WithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeEnum16WithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeEnum16WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeFloatSingleWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeFloatSingleWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeFloatSingleWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeFloatSingleWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFloatSingleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeFloatDoubleWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeFloatDoubleWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeFloatDoubleWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler;
+@end
+
+/**
+ * Cluster Channel
+ *
+ */
+@interface CHIPChannel : CHIPCluster
+
+- (void)changeChannelWithParams:(CHIPChannelClusterChangeChannelParams *)params
+              completionHandler:(void (^)(CHIPChannelClusterChangeChannelResponseParams * _Nullable data,
+                                    NSError * _Nullable error))completionHandler;
+- (void)changeChannelByNumberWithParams:(CHIPChannelClusterChangeChannelByNumberParams *)params
+                      completionHandler:(StatusCompletion)completionHandler;
+- (void)skipChannelWithParams:(CHIPChannelClusterSkipChannelParams *)params completionHandler:(StatusCompletion)completionHandler;
+
+- (void)readAttributeChannelListWithCompletionHandler:(void (^)(
+                                                          NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeFloatDoubleWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeChannelListWithMinInterval:(NSNumber * _Nonnull)minInterval
                                          maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(CHIPSubscribeParams * _Nullable)params
                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFloatDoubleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeChannelListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                           endpoint:(NSNumber *)endpoint
                                              queue:(dispatch_queue_t)queue
                                  completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeOctetStringWithCompletionHandler:(void (^)(
-                                                          NSData * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeOctetStringWithValue:(NSData * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOctetStringWithValue:(NSData * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeLineupWithCompletionHandler:(void (^)(CHIPChannelClusterLineupInfo * _Nullable value,
+                                                     NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeOctetStringWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOctetStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeLineupWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(CHIPChannelClusterLineupInfo * _Nullable value,
+                                                    NSError * _Nullable error))reportHandler;
++ (void)readAttributeLineupWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(CHIPChannelClusterLineupInfo * _Nullable value,
+                                                  NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeListInt8uWithCompletionHandler:(void (^)(
-                                                        NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeListInt8uWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeListInt8uWithValue:(NSArray * _Nonnull)value
-                                  params:(CHIPWriteParams * _Nullable)params
-                       completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeCurrentChannelWithCompletionHandler:(void (^)(CHIPChannelClusterChannelInfo * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeListInt8uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeListInt8uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeCurrentChannelWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:(void (^)(CHIPChannelClusterChannelInfo * _Nullable value,
+                                                            NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentChannelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:(void (^)(CHIPChannelClusterChannelInfo * _Nullable value,
+                                                          NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeListOctetStringWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
-- (void)writeAttributeListOctetStringWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeListOctetStringWithValue:(NSArray * _Nonnull)value
-                                        params:(CHIPWriteParams * _Nullable)params
-                             completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeListOctetStringWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeListOctetStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeListStructOctetStringWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
-- (void)writeAttributeListStructOctetStringWithValue:(NSArray * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeListStructOctetStringWithValue:(NSArray * _Nonnull)value
-                                              params:(CHIPWriteParams * _Nullable)params
-                                   completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeListStructOctetStringWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeListStructOctetStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeLongOctetStringWithCompletionHandler:(void (^)(NSData * _Nullable value,
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                               NSError * _Nullable error))completionHandler;
-- (void)writeAttributeLongOctetStringWithValue:(NSData * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeLongOctetStringWithValue:(NSData * _Nonnull)value
-                                        params:(CHIPWriteParams * _Nullable)params
-                             completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeLongOctetStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
                                              maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(CHIPSubscribeParams * _Nullable)params
                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                            reportHandler:
-                                               (void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLongOctetStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                               endpoint:(NSNumber *)endpoint
                                                  queue:(dispatch_queue_t)queue
                                      completionHandler:
-                                         (void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler;
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCharStringWithCompletionHandler:(void (^)(
-                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeCharStringWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCharStringWithValue:(NSString * _Nonnull)value
-                                   params:(CHIPWriteParams * _Nullable)params
-                        completionHandler:(StatusCompletion)completionHandler;
+@end
+
+/**
+ * Cluster Target Navigator
+ *
+ */
+@interface CHIPTargetNavigator : CHIPCluster
+
+- (void)navigateTargetWithParams:(CHIPTargetNavigatorClusterNavigateTargetParams *)params
+               completionHandler:(void (^)(CHIPTargetNavigatorClusterNavigateTargetResponseParams * _Nullable data,
+                                     NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeTargetListWithCompletionHandler:(void (^)(
+                                                         NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCharStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeTargetListWithMinInterval:(NSNumber * _Nonnull)minInterval
                                         maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(CHIPSubscribeParams * _Nullable)params
                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCharStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeTargetListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                          endpoint:(NSNumber *)endpoint
                                             queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeLongCharStringWithCompletionHandler:(void (^)(NSString * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-- (void)writeAttributeLongCharStringWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeLongCharStringWithValue:(NSString * _Nonnull)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeCurrentTargetWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeLongCharStringWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLongCharStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeCurrentTargetWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentTargetWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeEpochUsWithCompletionHandler:(void (^)(
-                                                      NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeEpochUsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeEpochUsWithValue:(NSNumber * _Nonnull)value
-                                params:(CHIPWriteParams * _Nullable)params
-                     completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeEpochUsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeEpochUsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeEpochSWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeEpochSWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeEpochSWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeEpochSWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeEpochSWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeVendorIdWithCompletionHandler:(void (^)(
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+@end
+
+/**
+ * Cluster Media Playback
+ *
+ */
+@interface CHIPMediaPlayback : CHIPCluster
+
+- (void)playWithParams:(CHIPMediaPlaybackClusterPlayParams * _Nullable)params
+     completionHandler:
+         (void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
+- (void)playWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                                      NSError * _Nullable error))completionHandler;
+- (void)pauseWithParams:(CHIPMediaPlaybackClusterPauseParams * _Nullable)params
+      completionHandler:
+          (void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
+- (void)pauseWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                                       NSError * _Nullable error))completionHandler;
+- (void)stopPlaybackWithParams:(CHIPMediaPlaybackClusterStopPlaybackParams * _Nullable)params
+             completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                                   NSError * _Nullable error))completionHandler;
+- (void)stopPlaybackWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                                              NSError * _Nullable error))completionHandler;
+- (void)startOverWithParams:(CHIPMediaPlaybackClusterStartOverParams * _Nullable)params
+          completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                                NSError * _Nullable error))completionHandler;
+- (void)startOverWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                                           NSError * _Nullable error))completionHandler;
+- (void)previousWithParams:(CHIPMediaPlaybackClusterPreviousParams * _Nullable)params
+         completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                               NSError * _Nullable error))completionHandler;
+- (void)previousWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                                          NSError * _Nullable error))completionHandler;
+- (void)nextWithParams:(CHIPMediaPlaybackClusterNextParams * _Nullable)params
+     completionHandler:
+         (void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
+- (void)nextWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                                      NSError * _Nullable error))completionHandler;
+- (void)rewindWithParams:(CHIPMediaPlaybackClusterRewindParams * _Nullable)params
+       completionHandler:
+           (void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
+- (void)rewindWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                                        NSError * _Nullable error))completionHandler;
+- (void)fastForwardWithParams:(CHIPMediaPlaybackClusterFastForwardParams * _Nullable)params
+            completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                                  NSError * _Nullable error))completionHandler;
+- (void)fastForwardWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                                             NSError * _Nullable error))completionHandler;
+- (void)skipForwardWithParams:(CHIPMediaPlaybackClusterSkipForwardParams *)params
+            completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                                  NSError * _Nullable error))completionHandler;
+- (void)skipBackwardWithParams:(CHIPMediaPlaybackClusterSkipBackwardParams *)params
+             completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                                   NSError * _Nullable error))completionHandler;
+- (void)seekWithParams:(CHIPMediaPlaybackClusterSeekParams *)params
+     completionHandler:
+         (void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeCurrentStateWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeCurrentStateWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeStartTimeWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeStartTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeStartTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeDurationWithCompletionHandler:(void (^)(
                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeVendorIdWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeVendorIdWithValue:(NSNumber * _Nonnull)value
-                                 params:(CHIPWriteParams * _Nullable)params
-                      completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeVendorIdWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeVendorIdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeDurationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDurationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeSampledPositionWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeSampledPositionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value,
+                                                             NSError * _Nullable error))reportHandler;
++ (void)readAttributeSampledPositionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value,
+                                                           NSError * _Nullable error))completionHandler;
+
+- (void)readAttributePlaybackSpeedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributePlaybackSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePlaybackSpeedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeSeekRangeEndWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeSeekRangeEndWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeSeekRangeEndWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeSeekRangeStartWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeSeekRangeStartWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeSeekRangeStartWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeListNullablesAndOptionalsStructWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler;
-- (void)writeAttributeListNullablesAndOptionalsStructWithValue:(NSArray * _Nonnull)value
-                                             completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeListNullablesAndOptionalsStructWithValue:(NSArray * _Nonnull)value
-                                                        params:(CHIPWriteParams * _Nullable)params
-                                             completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeListNullablesAndOptionalsStructWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                                 subscriptionEstablished:
-                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                           reportHandler:(void (^)(NSArray * _Nullable value,
-                                                                             NSError * _Nullable error))reportHandler;
-+ (void)readAttributeListNullablesAndOptionalsStructWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                              endpoint:(NSNumber *)endpoint
-                                                                 queue:(dispatch_queue_t)queue
-                                                     completionHandler:(void (^)(NSArray * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeEnumAttrWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeEnumAttrWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeEnumAttrWithValue:(NSNumber * _Nonnull)value
-                                 params:(CHIPWriteParams * _Nullable)params
-                      completionHandler:(StatusCompletion)completionHandler;
+@end
+
+/**
+ * Cluster Media Input
+ *
+ */
+@interface CHIPMediaInput : CHIPCluster
+
+- (void)selectInputWithParams:(CHIPMediaInputClusterSelectInputParams *)params
+            completionHandler:(StatusCompletion)completionHandler;
+- (void)showInputStatusWithParams:(CHIPMediaInputClusterShowInputStatusParams * _Nullable)params
+                completionHandler:(StatusCompletion)completionHandler;
+- (void)showInputStatusWithCompletionHandler:(StatusCompletion)completionHandler;
+- (void)hideInputStatusWithParams:(CHIPMediaInputClusterHideInputStatusParams * _Nullable)params
+                completionHandler:(StatusCompletion)completionHandler;
+- (void)hideInputStatusWithCompletionHandler:(StatusCompletion)completionHandler;
+- (void)renameInputWithParams:(CHIPMediaInputClusterRenameInputParams *)params
+            completionHandler:(StatusCompletion)completionHandler;
+
+- (void)readAttributeInputListWithCompletionHandler:(void (^)(
+                                                        NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeEnumAttrWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeEnumAttrWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeInputListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeInputListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeStructAttrWithCompletionHandler:(void (^)(CHIPTestClusterClusterSimpleStruct * _Nullable value,
-                                                         NSError * _Nullable error))completionHandler;
-- (void)writeAttributeStructAttrWithValue:(CHIPTestClusterClusterSimpleStruct * _Nonnull)value
-                        completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeStructAttrWithValue:(CHIPTestClusterClusterSimpleStruct * _Nonnull)value
-                                   params:(CHIPWriteParams * _Nullable)params
-                        completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeCurrentInputWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeStructAttrWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(CHIPTestClusterClusterSimpleStruct * _Nullable value,
-                                                        NSError * _Nullable error))reportHandler;
-+ (void)readAttributeStructAttrWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(CHIPTestClusterClusterSimpleStruct * _Nullable value,
-                                                      NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeCurrentInputWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentInputWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRangeRestrictedInt8uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
-- (void)writeAttributeRangeRestrictedInt8uWithValue:(NSNumber * _Nonnull)value
-                                  completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRangeRestrictedInt8uWithValue:(NSNumber * _Nonnull)value
-                                             params:(CHIPWriteParams * _Nullable)params
-                                  completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRangeRestrictedInt8uWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(CHIPSubscribeParams * _Nullable)params
                                       subscriptionEstablished:
                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                 reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRangeRestrictedInt8uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                    endpoint:(NSNumber *)endpoint
                                                       queue:(dispatch_queue_t)queue
                                           completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRangeRestrictedInt8sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
-- (void)writeAttributeRangeRestrictedInt8sWithValue:(NSNumber * _Nonnull)value
-                                  completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRangeRestrictedInt8sWithValue:(NSNumber * _Nonnull)value
-                                             params:(CHIPWriteParams * _Nullable)params
-                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRangeRestrictedInt8sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRangeRestrictedInt8sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRangeRestrictedInt16uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
-- (void)writeAttributeRangeRestrictedInt16uWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRangeRestrictedInt16uWithValue:(NSNumber * _Nonnull)value
-                                              params:(CHIPWriteParams * _Nullable)params
-                                   completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRangeRestrictedInt16uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRangeRestrictedInt16uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+@end
+
+/**
+ * Cluster Low Power
+ *
+ */
+@interface CHIPLowPower : CHIPCluster
+
+- (void)sleepWithParams:(CHIPLowPowerClusterSleepParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler;
+- (void)sleepWithCompletionHandler:(StatusCompletion)completionHandler;
 
-- (void)readAttributeRangeRestrictedInt16sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
-- (void)writeAttributeRangeRestrictedInt16sWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRangeRestrictedInt16sWithValue:(NSNumber * _Nonnull)value
-                                              params:(CHIPWriteParams * _Nullable)params
-                                   completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRangeRestrictedInt16sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRangeRestrictedInt16sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeListLongOctetStringWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler;
-- (void)writeAttributeListLongOctetStringWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeListLongOctetStringWithValue:(NSArray * _Nonnull)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeListLongOctetStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(CHIPSubscribeParams * _Nullable)params
                                      subscriptionEstablished:
                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeListLongOctetStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                   endpoint:(NSNumber *)endpoint
                                                      queue:(dispatch_queue_t)queue
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeListFabricScopedWithParams:(CHIPReadParams * _Nullable)params
-                              completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeListFabricScopedWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeListFabricScopedWithValue:(NSArray * _Nonnull)value
-                                         params:(CHIPWriteParams * _Nullable)params
-                              completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeListFabricScopedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeListFabricScopedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTimedWriteBooleanWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
-- (void)writeAttributeTimedWriteBooleanWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTimedWriteBooleanWithValue:(NSNumber * _Nonnull)value
-                                          params:(CHIPWriteParams * _Nullable)params
-                               completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTimedWriteBooleanWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTimedWriteBooleanWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGeneralErrorBooleanWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
-- (void)writeAttributeGeneralErrorBooleanWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeGeneralErrorBooleanWithValue:(NSNumber * _Nonnull)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGeneralErrorBooleanWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneralErrorBooleanWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeClusterErrorBooleanWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+@end
+
+/**
+ * Cluster Keypad Input
+ *
+ */
+@interface CHIPKeypadInput : CHIPCluster
+
+- (void)sendKeyWithParams:(CHIPKeypadInputClusterSendKeyParams *)params
+        completionHandler:
+            (void (^)(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable data, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler;
-- (void)writeAttributeClusterErrorBooleanWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeClusterErrorBooleanWithValue:(NSNumber * _Nonnull)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeClusterErrorBooleanWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(CHIPSubscribeParams * _Nullable)params
                                      subscriptionEstablished:
                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterErrorBooleanWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                   endpoint:(NSNumber *)endpoint
                                                      queue:(dispatch_queue_t)queue
                                          completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeUnsupportedWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeUnsupportedWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeUnsupportedWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeUnsupportedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeUnsupportedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableBooleanWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                               NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableBooleanWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableBooleanWithValue:(NSNumber * _Nullable)value
-                                        params:(CHIPWriteParams * _Nullable)params
-                             completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableBooleanWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
                                              maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(CHIPSubscribeParams * _Nullable)params
                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                            reportHandler:
                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableBooleanWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                               endpoint:(NSNumber *)endpoint
                                                  queue:(dispatch_queue_t)queue
                                      completionHandler:
                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableBitmap8WithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableBitmap8WithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableBitmap8WithValue:(NSNumber * _Nullable)value
-                                        params:(CHIPWriteParams * _Nullable)params
-                             completionHandler:(StatusCompletion)completionHandler;
+@end
+
+/**
+ * Cluster Content Launcher
+ *
+ */
+@interface CHIPContentLauncher : CHIPCluster
+
+- (void)launchContentWithParams:(CHIPContentLauncherClusterLaunchContentParams *)params
+              completionHandler:(void (^)(CHIPContentLauncherClusterLaunchResponseParams * _Nullable data,
+                                    NSError * _Nullable error))completionHandler;
+- (void)launchURLWithParams:(CHIPContentLauncherClusterLaunchURLParams *)params
+          completionHandler:(void (^)(CHIPContentLauncherClusterLaunchResponseParams * _Nullable data,
+                                NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeAcceptHeaderWithCompletionHandler:(void (^)(
+                                                           NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableBitmap8WithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableBitmap8WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcceptHeaderWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptHeaderWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableBitmap16WithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableBitmap16WithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableBitmap16WithValue:(NSNumber * _Nullable)value
-                                         params:(CHIPWriteParams * _Nullable)params
-                              completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeSupportedStreamingProtocolsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))completionHandler;
+- (void)writeAttributeSupportedStreamingProtocolsWithValue:(NSNumber * _Nonnull)value
+                                         completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSupportedStreamingProtocolsWithValue:(NSNumber * _Nonnull)value
+                                                    params:(CHIPWriteParams * _Nullable)params
+                                         completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableBitmap16WithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableBitmap16WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeSupportedStreamingProtocolsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                              params:(CHIPSubscribeParams * _Nullable)params
+                                             subscriptionEstablished:
+                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))reportHandler;
++ (void)readAttributeSupportedStreamingProtocolsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                          endpoint:(NSNumber *)endpoint
+                                                             queue:(dispatch_queue_t)queue
+                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableBitmap32WithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableBitmap32WithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableBitmap32WithValue:(NSNumber * _Nullable)value
-                                         params:(CHIPWriteParams * _Nullable)params
-                              completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableBitmap32WithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableBitmap32WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableBitmap64WithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableBitmap64WithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableBitmap64WithValue:(NSNumber * _Nullable)value
-                                         params:(CHIPWriteParams * _Nullable)params
-                              completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableBitmap64WithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableBitmap64WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableInt8uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableInt8uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableInt8uWithValue:(NSNumber * _Nullable)value
-                                      params:(CHIPWriteParams * _Nullable)params
-                           completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableInt8uWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableInt8uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableInt16uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableInt16uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableInt16uWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableInt16uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableInt16uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableInt24uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableInt24uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableInt24uWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableInt24uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableInt24uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+@end
 
-- (void)readAttributeNullableInt32uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableInt32uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableInt32uWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler;
 /**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
+ * Cluster Audio Output
+ *
  */
-- (void)subscribeAttributeNullableInt32uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableInt32uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+@interface CHIPAudioOutput : CHIPCluster
 
-- (void)readAttributeNullableInt40uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableInt40uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableInt40uWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler;
+- (void)selectOutputWithParams:(CHIPAudioOutputClusterSelectOutputParams *)params
+             completionHandler:(StatusCompletion)completionHandler;
+- (void)renameOutputWithParams:(CHIPAudioOutputClusterRenameOutputParams *)params
+             completionHandler:(StatusCompletion)completionHandler;
+
+- (void)readAttributeOutputListWithCompletionHandler:(void (^)(
+                                                         NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableInt40uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableInt40uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeNullableInt48uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableInt48uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableInt48uWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler;
+- (void)subscribeAttributeOutputListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeOutputListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeCurrentOutputWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableInt48uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableInt48uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeCurrentOutputWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentOutputWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableInt56uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableInt56uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableInt56uWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableInt56uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableInt56uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableInt64uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableInt64uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableInt64uWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableInt64uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableInt64uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableInt8sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableInt8sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableInt8sWithValue:(NSNumber * _Nullable)value
-                                      params:(CHIPWriteParams * _Nullable)params
-                           completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableInt8sWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableInt8sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableInt16sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableInt16sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableInt16sWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableInt16sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableInt16sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableInt24sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableInt24sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableInt24sWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableInt24sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableInt24sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+@end
 
-- (void)readAttributeNullableInt32sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableInt32sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableInt32sWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler;
 /**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
+ * Cluster Application Launcher
+ *
  */
-- (void)subscribeAttributeNullableInt32sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableInt32sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+@interface CHIPApplicationLauncher : CHIPCluster
 
-- (void)readAttributeNullableInt40sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableInt40sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableInt40sWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler;
+- (void)launchAppWithParams:(CHIPApplicationLauncherClusterLaunchAppParams *)params
+          completionHandler:(void (^)(CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable data,
+                                NSError * _Nullable error))completionHandler;
+- (void)stopAppWithParams:(CHIPApplicationLauncherClusterStopAppParams *)params
+        completionHandler:(void (^)(CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable data,
+                              NSError * _Nullable error))completionHandler;
+- (void)hideAppWithParams:(CHIPApplicationLauncherClusterHideAppParams *)params
+        completionHandler:(void (^)(CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable data,
+                              NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeCatalogListWithCompletionHandler:(void (^)(
+                                                          NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableInt40sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableInt40sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeCatalogListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCatalogListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableInt48sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableInt48sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableInt48sWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeCurrentAppWithCompletionHandler:(void (^)(CHIPApplicationLauncherClusterApplicationEP * _Nullable value,
+                                                         NSError * _Nullable error))completionHandler;
+- (void)writeAttributeCurrentAppWithValue:(CHIPApplicationLauncherClusterApplicationEP * _Nullable)value
+                        completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCurrentAppWithValue:(CHIPApplicationLauncherClusterApplicationEP * _Nullable)value
+                                   params:(CHIPWriteParams * _Nullable)params
+                        completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableInt48sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableInt48sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeCurrentAppWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(CHIPApplicationLauncherClusterApplicationEP * _Nullable value,
+                                                        NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentAppWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(CHIPApplicationLauncherClusterApplicationEP * _Nullable value,
+                                                      NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableInt56sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableInt56sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableInt56sWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableInt56sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableInt56sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableInt64sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableInt64sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableInt64sWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableInt64sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableInt64sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableEnum8WithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableEnum8WithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableEnum8WithValue:(NSNumber * _Nullable)value
-                                      params:(CHIPWriteParams * _Nullable)params
-                           completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableEnum8WithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableEnum8WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableEnum16WithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableEnum16WithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableEnum16WithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableEnum16WithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableEnum16WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableFloatSingleWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableFloatSingleWithValue:(NSNumber * _Nullable)value
-                                 completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableFloatSingleWithValue:(NSNumber * _Nullable)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableFloatSingleWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableFloatSingleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+@end
 
-- (void)readAttributeNullableFloatDoubleWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableFloatDoubleWithValue:(NSNumber * _Nullable)value
-                                 completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableFloatDoubleWithValue:(NSNumber * _Nullable)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler;
 /**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
+ * Cluster Application Basic
+ *
  */
-- (void)subscribeAttributeNullableFloatDoubleWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableFloatDoubleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+@interface CHIPApplicationBasic : CHIPCluster
 
-- (void)readAttributeNullableOctetStringWithCompletionHandler:(void (^)(NSData * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableOctetStringWithValue:(NSData * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableOctetStringWithValue:(NSData * _Nullable)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeVendorNameWithCompletionHandler:(void (^)(
+                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableOctetStringWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableOctetStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeVendorNameWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeVendorNameWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableCharStringWithCompletionHandler:(void (^)(NSString * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableCharStringWithValue:(NSString * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableCharStringWithValue:(NSString * _Nullable)value
-                                           params:(CHIPWriteParams * _Nullable)params
-                                completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeVendorIDWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableCharStringWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableCharStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeVendorIDWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeVendorIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableEnumAttrWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableEnumAttrWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableEnumAttrWithValue:(NSNumber * _Nullable)value
-                                         params:(CHIPWriteParams * _Nullable)params
-                              completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeApplicationNameWithCompletionHandler:(void (^)(NSString * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableEnumAttrWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableEnumAttrWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeApplicationNameWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeApplicationNameWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableStructWithCompletionHandler:(void (^)(CHIPTestClusterClusterSimpleStruct * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableStructWithValue:(CHIPTestClusterClusterSimpleStruct * _Nullable)value
-                            completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableStructWithValue:(CHIPTestClusterClusterSimpleStruct * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeProductIDWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableStructWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:(void (^)(CHIPTestClusterClusterSimpleStruct * _Nullable value,
-                                                            NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableStructWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:(void (^)(CHIPTestClusterClusterSimpleStruct * _Nullable value,
-                                                          NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeProductIDWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeProductIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableRangeRestrictedInt8uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableRangeRestrictedInt8uWithValue:(NSNumber * _Nullable)value
-                                          completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableRangeRestrictedInt8uWithValue:(NSNumber * _Nullable)value
-                                                     params:(CHIPWriteParams * _Nullable)params
-                                          completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeApplicationWithCompletionHandler:(void (^)(
+                                                          CHIPApplicationBasicClusterApplicationBasicApplication * _Nullable value,
+                                                          NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableRangeRestrictedInt8uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableRangeRestrictedInt8uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeApplicationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:
+                                           (void (^)(CHIPApplicationBasicClusterApplicationBasicApplication * _Nullable value,
+                                               NSError * _Nullable error))reportHandler;
++ (void)readAttributeApplicationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(CHIPApplicationBasicClusterApplicationBasicApplication * _Nullable value,
+                                         NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableRangeRestrictedInt8sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableRangeRestrictedInt8sWithValue:(NSNumber * _Nullable)value
-                                          completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableRangeRestrictedInt8sWithValue:(NSNumber * _Nullable)value
-                                                     params:(CHIPWriteParams * _Nullable)params
-                                          completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableRangeRestrictedInt8sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableRangeRestrictedInt8sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableRangeRestrictedInt16uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableRangeRestrictedInt16uWithValue:(NSNumber * _Nullable)value
-                                           completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableRangeRestrictedInt16uWithValue:(NSNumber * _Nullable)value
-                                                      params:(CHIPWriteParams * _Nullable)params
-                                           completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeApplicationVersionWithCompletionHandler:(void (^)(NSString * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableRangeRestrictedInt16uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                params:(CHIPSubscribeParams * _Nullable)params
-                                               subscriptionEstablished:
-                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableRangeRestrictedInt16uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                            endpoint:(NSNumber *)endpoint
-                                                               queue:(dispatch_queue_t)queue
-                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeApplicationVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeApplicationVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNullableRangeRestrictedInt16sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler;
-- (void)writeAttributeNullableRangeRestrictedInt16sWithValue:(NSNumber * _Nullable)value
-                                           completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNullableRangeRestrictedInt16sWithValue:(NSNumber * _Nullable)value
-                                                      params:(CHIPWriteParams * _Nullable)params
-                                           completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeAllowedVendorListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNullableRangeRestrictedInt16sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                params:(CHIPSubscribeParams * _Nullable)params
-                                               subscriptionEstablished:
-                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNullableRangeRestrictedInt16sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                            endpoint:(NSNumber *)endpoint
-                                                               queue:(dispatch_queue_t)queue
-                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAllowedVendorListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAllowedVendorListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
@@ -17245,2455 +16651,2524 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Thermostat
+ * Cluster Account Login
  *
  */
-@interface CHIPThermostat : CHIPCluster
-
-- (void)setpointRaiseLowerWithParams:(CHIPThermostatClusterSetpointRaiseLowerParams *)params
-                   completionHandler:(StatusCompletion)completionHandler;
-- (void)setWeeklyScheduleWithParams:(CHIPThermostatClusterSetWeeklyScheduleParams *)params
-                  completionHandler:(StatusCompletion)completionHandler;
-- (void)getWeeklyScheduleWithParams:(CHIPThermostatClusterGetWeeklyScheduleParams *)params
-                  completionHandler:(void (^)(CHIPThermostatClusterGetWeeklyScheduleResponseParams * _Nullable data,
-                                        NSError * _Nullable error))completionHandler;
-- (void)clearWeeklyScheduleWithParams:(CHIPThermostatClusterClearWeeklyScheduleParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler;
-- (void)clearWeeklyScheduleWithCompletionHandler:(StatusCompletion)completionHandler;
-
-- (void)readAttributeLocalTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeLocalTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLocalTemperatureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeOutdoorTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeOutdoorTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOutdoorTemperatureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+@interface CHIPAccountLogin : CHIPCluster
 
-- (void)readAttributeOccupancyWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeOccupancyWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOccupancyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)getSetupPINWithParams:(CHIPAccountLoginClusterGetSetupPINParams *)params
+            completionHandler:(void (^)(CHIPAccountLoginClusterGetSetupPINResponseParams * _Nullable data,
+                                  NSError * _Nullable error))completionHandler;
+- (void)loginWithParams:(CHIPAccountLoginClusterLoginParams *)params completionHandler:(StatusCompletion)completionHandler;
+- (void)logoutWithParams:(CHIPAccountLoginClusterLogoutParams * _Nullable)params
+       completionHandler:(StatusCompletion)completionHandler;
+- (void)logoutWithCompletionHandler:(StatusCompletion)completionHandler;
 
-- (void)readAttributeAbsMinHeatSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAbsMinHeatSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAbsMinHeatSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAbsMaxHeatSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAbsMaxHeatSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAbsMaxHeatSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAbsMinCoolSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAbsMinCoolSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAbsMinCoolSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAbsMaxCoolSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAbsMaxCoolSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAbsMaxCoolSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePICoolingDemandWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePICoolingDemandWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
                                              maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(CHIPSubscribeParams * _Nullable)params
                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                            reportHandler:
                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePICoolingDemandWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                               endpoint:(NSNumber *)endpoint
                                                  queue:(dispatch_queue_t)queue
                                      completionHandler:
                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePIHeatingDemandWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+@end
+
+/**
+ * Cluster Electrical Measurement
+ *
+ */
+@interface CHIPElectricalMeasurement : CHIPCluster
+
+- (void)getProfileInfoCommandWithParams:(CHIPElectricalMeasurementClusterGetProfileInfoCommandParams * _Nullable)params
+                      completionHandler:(StatusCompletion)completionHandler;
+- (void)getProfileInfoCommandWithCompletionHandler:(StatusCompletion)completionHandler;
+- (void)getMeasurementProfileCommandWithParams:(CHIPElectricalMeasurementClusterGetMeasurementProfileCommandParams *)params
+                             completionHandler:(StatusCompletion)completionHandler;
+
+- (void)readAttributeMeasurementTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePIHeatingDemandWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeMeasurementTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
                                              maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(CHIPSubscribeParams * _Nullable)params
                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                            reportHandler:
                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePIHeatingDemandWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeMeasurementTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                               endpoint:(NSNumber *)endpoint
                                                  queue:(dispatch_queue_t)queue
                                      completionHandler:
                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeHVACSystemTypeConfigurationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler;
-- (void)writeAttributeHVACSystemTypeConfigurationWithValue:(NSNumber * _Nonnull)value
-                                         completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeHVACSystemTypeConfigurationWithValue:(NSNumber * _Nonnull)value
-                                                    params:(CHIPWriteParams * _Nullable)params
-                                         completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeHVACSystemTypeConfigurationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                              params:(CHIPSubscribeParams * _Nullable)params
-                                             subscriptionEstablished:
-                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))reportHandler;
-+ (void)readAttributeHVACSystemTypeConfigurationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                          endpoint:(NSNumber *)endpoint
-                                                             queue:(dispatch_queue_t)queue
-                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeLocalTemperatureCalibrationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler;
-- (void)writeAttributeLocalTemperatureCalibrationWithValue:(NSNumber * _Nonnull)value
-                                         completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeLocalTemperatureCalibrationWithValue:(NSNumber * _Nonnull)value
-                                                    params:(CHIPWriteParams * _Nullable)params
-                                         completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeLocalTemperatureCalibrationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                              params:(CHIPSubscribeParams * _Nullable)params
-                                             subscriptionEstablished:
-                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLocalTemperatureCalibrationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                          endpoint:(NSNumber *)endpoint
-                                                             queue:(dispatch_queue_t)queue
-                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeOccupiedCoolingSetpointWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
-- (void)writeAttributeOccupiedCoolingSetpointWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOccupiedCoolingSetpointWithValue:(NSNumber * _Nonnull)value
-                                                params:(CHIPWriteParams * _Nullable)params
-                                     completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeDcVoltageWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeOccupiedCoolingSetpointWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOccupiedCoolingSetpointWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeDcVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDcVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeOccupiedHeatingSetpointWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
-- (void)writeAttributeOccupiedHeatingSetpointWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOccupiedHeatingSetpointWithValue:(NSNumber * _Nonnull)value
-                                                params:(CHIPWriteParams * _Nullable)params
-                                     completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeDcVoltageMinWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeOccupiedHeatingSetpointWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOccupiedHeatingSetpointWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeDcVoltageMinWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDcVoltageMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeUnoccupiedCoolingSetpointWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler;
-- (void)writeAttributeUnoccupiedCoolingSetpointWithValue:(NSNumber * _Nonnull)value
-                                       completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeUnoccupiedCoolingSetpointWithValue:(NSNumber * _Nonnull)value
-                                                  params:(CHIPWriteParams * _Nullable)params
-                                       completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeDcVoltageMaxWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeUnoccupiedCoolingSetpointWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                            params:(CHIPSubscribeParams * _Nullable)params
-                                           subscriptionEstablished:
-                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))reportHandler;
-+ (void)readAttributeUnoccupiedCoolingSetpointWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                        endpoint:(NSNumber *)endpoint
-                                                           queue:(dispatch_queue_t)queue
-                                               completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeDcVoltageMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDcVoltageMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeUnoccupiedHeatingSetpointWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler;
-- (void)writeAttributeUnoccupiedHeatingSetpointWithValue:(NSNumber * _Nonnull)value
-                                       completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeUnoccupiedHeatingSetpointWithValue:(NSNumber * _Nonnull)value
-                                                  params:(CHIPWriteParams * _Nullable)params
-                                       completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeDcCurrentWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeUnoccupiedHeatingSetpointWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                            params:(CHIPSubscribeParams * _Nullable)params
-                                           subscriptionEstablished:
-                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))reportHandler;
-+ (void)readAttributeUnoccupiedHeatingSetpointWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                        endpoint:(NSNumber *)endpoint
-                                                           queue:(dispatch_queue_t)queue
-                                               completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeDcCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDcCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMinHeatSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
-- (void)writeAttributeMinHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value
-                                  completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMinHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value
-                                             params:(CHIPWriteParams * _Nullable)params
-                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeDcCurrentMinWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMinHeatSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMinHeatSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeDcCurrentMinWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDcCurrentMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMaxHeatSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
-- (void)writeAttributeMaxHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value
-                                  completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMaxHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value
-                                             params:(CHIPWriteParams * _Nullable)params
-                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeDcCurrentMaxWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMaxHeatSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMaxHeatSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeDcCurrentMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDcCurrentMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMinCoolSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
-- (void)writeAttributeMinCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value
-                                  completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMinCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value
-                                             params:(CHIPWriteParams * _Nullable)params
-                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeDcPowerWithCompletionHandler:(void (^)(
+                                                      NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMinCoolSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMinCoolSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeDcPowerWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDcPowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMaxCoolSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
-- (void)writeAttributeMaxCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value
-                                  completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMaxCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value
-                                             params:(CHIPWriteParams * _Nullable)params
-                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeDcPowerMinWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMaxCoolSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMaxCoolSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeDcPowerMinWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDcPowerMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMinSetpointDeadBandWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeDcPowerMaxWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeDcPowerMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDcPowerMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeDcVoltageMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler;
-- (void)writeAttributeMinSetpointDeadBandWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMinSetpointDeadBandWithValue:(NSNumber * _Nonnull)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMinSetpointDeadBandWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeDcVoltageMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(CHIPSubscribeParams * _Nullable)params
                                      subscriptionEstablished:
                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                reportHandler:
                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMinSetpointDeadBandWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeDcVoltageMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                   endpoint:(NSNumber *)endpoint
                                                      queue:(dispatch_queue_t)queue
                                          completionHandler:
                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRemoteSensingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
-- (void)writeAttributeRemoteSensingWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRemoteSensingWithValue:(NSNumber * _Nonnull)value
-                                      params:(CHIPWriteParams * _Nullable)params
-                           completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeDcVoltageDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRemoteSensingWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRemoteSensingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeDcVoltageDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDcVoltageDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeControlSequenceOfOperationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler;
-- (void)writeAttributeControlSequenceOfOperationWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeControlSequenceOfOperationWithValue:(NSNumber * _Nonnull)value
-                                                   params:(CHIPWriteParams * _Nullable)params
-                                        completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeDcCurrentMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeControlSequenceOfOperationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler;
-+ (void)readAttributeControlSequenceOfOperationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeDcCurrentMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDcCurrentMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeDcCurrentDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeDcCurrentDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDcCurrentDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeSystemModeWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeSystemModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSystemModeWithValue:(NSNumber * _Nonnull)value
-                                   params:(CHIPWriteParams * _Nullable)params
-                        completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeDcPowerMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeSystemModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSystemModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeDcPowerMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDcPowerMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeThermostatRunningModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
+- (void)readAttributeDcPowerDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeThermostatRunningModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeThermostatRunningModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeDcPowerDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeDcPowerDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeStartOfWeekWithCompletionHandler:(void (^)(
+- (void)readAttributeAcFrequencyWithCompletionHandler:(void (^)(
                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeStartOfWeekWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeAcFrequencyWithMinInterval:(NSNumber * _Nonnull)minInterval
                                          maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(CHIPSubscribeParams * _Nullable)params
                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeStartOfWeekWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeAcFrequencyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                           endpoint:(NSNumber *)endpoint
                                              queue:(dispatch_queue_t)queue
                                  completionHandler:
                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNumberOfWeeklyTransitionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler;
+- (void)readAttributeAcFrequencyMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNumberOfWeeklyTransitionsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                            params:(CHIPSubscribeParams * _Nullable)params
-                                           subscriptionEstablished:
-                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNumberOfWeeklyTransitionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                        endpoint:(NSNumber *)endpoint
-                                                           queue:(dispatch_queue_t)queue
-                                               completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcFrequencyMinWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcFrequencyMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNumberOfDailyTransitionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler;
+- (void)readAttributeAcFrequencyMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNumberOfDailyTransitionsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNumberOfDailyTransitionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcFrequencyMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcFrequencyMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTemperatureSetpointHoldWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
-- (void)writeAttributeTemperatureSetpointHoldWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTemperatureSetpointHoldWithValue:(NSNumber * _Nonnull)value
-                                                params:(CHIPWriteParams * _Nullable)params
-                                     completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeNeutralCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTemperatureSetpointHoldWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTemperatureSetpointHoldWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNeutralCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNeutralCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTemperatureSetpointHoldDurationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler;
-- (void)writeAttributeTemperatureSetpointHoldDurationWithValue:(NSNumber * _Nullable)value
-                                             completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTemperatureSetpointHoldDurationWithValue:(NSNumber * _Nullable)value
-                                                        params:(CHIPWriteParams * _Nullable)params
-                                             completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeTotalActivePowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTemperatureSetpointHoldDurationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                                 subscriptionEstablished:
-                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTemperatureSetpointHoldDurationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                              endpoint:(NSNumber *)endpoint
-                                                                 queue:(dispatch_queue_t)queue
-                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeTotalActivePowerWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeTotalActivePowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeTotalReactivePowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeTotalReactivePowerWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeTotalReactivePowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeTotalApparentPowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeTotalApparentPowerWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeTotalApparentPowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeMeasured1stHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeMeasured1stHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                             params:(CHIPSubscribeParams * _Nullable)params
+                                            subscriptionEstablished:
+                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))reportHandler;
++ (void)readAttributeMeasured1stHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                         endpoint:(NSNumber *)endpoint
+                                                            queue:(dispatch_queue_t)queue
+                                                completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeMeasured3rdHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeMeasured3rdHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                             params:(CHIPSubscribeParams * _Nullable)params
+                                            subscriptionEstablished:
+                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))reportHandler;
++ (void)readAttributeMeasured3rdHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                         endpoint:(NSNumber *)endpoint
+                                                            queue:(dispatch_queue_t)queue
+                                                completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeThermostatProgrammingOperationModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                 NSError * _Nullable error))completionHandler;
-- (void)writeAttributeThermostatProgrammingOperationModeWithValue:(NSNumber * _Nonnull)value
-                                                completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeThermostatProgrammingOperationModeWithValue:(NSNumber * _Nonnull)value
-                                                           params:(CHIPWriteParams * _Nullable)params
-                                                completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeMeasured5thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeThermostatProgrammingOperationModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                                    subscriptionEstablished:
-                                                        (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                              reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                NSError * _Nullable error))reportHandler;
-+ (void)readAttributeThermostatProgrammingOperationModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                 endpoint:(NSNumber *)endpoint
-                                                                    queue:(dispatch_queue_t)queue
-                                                        completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMeasured5thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                             params:(CHIPSubscribeParams * _Nullable)params
+                                            subscriptionEstablished:
+                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))reportHandler;
++ (void)readAttributeMeasured5thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                         endpoint:(NSNumber *)endpoint
+                                                            queue:(dispatch_queue_t)queue
+                                                completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeThermostatRunningStateWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
+- (void)readAttributeMeasured7thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeThermostatRunningStateWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))reportHandler;
-+ (void)readAttributeThermostatRunningStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMeasured7thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                             params:(CHIPSubscribeParams * _Nullable)params
+                                            subscriptionEstablished:
+                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))reportHandler;
++ (void)readAttributeMeasured7thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                         endpoint:(NSNumber *)endpoint
+                                                            queue:(dispatch_queue_t)queue
+                                                completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeSetpointChangeSourceWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeMeasured9thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeSetpointChangeSourceWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSetpointChangeSourceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMeasured9thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                             params:(CHIPSubscribeParams * _Nullable)params
+                                            subscriptionEstablished:
+                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))reportHandler;
++ (void)readAttributeMeasured9thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                         endpoint:(NSNumber *)endpoint
+                                                            queue:(dispatch_queue_t)queue
+                                                completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeSetpointChangeAmountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeMeasured11thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeSetpointChangeAmountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSetpointChangeAmountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMeasured11thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                              params:(CHIPSubscribeParams * _Nullable)params
+                                             subscriptionEstablished:
+                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))reportHandler;
++ (void)readAttributeMeasured11thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                          endpoint:(NSNumber *)endpoint
+                                                             queue:(dispatch_queue_t)queue
+                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeSetpointChangeSourceTimestampWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributeMeasuredPhase1stHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeSetpointChangeSourceTimestampWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                params:(CHIPSubscribeParams * _Nullable)params
-                                               subscriptionEstablished:
-                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSetpointChangeSourceTimestampWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                            endpoint:(NSNumber *)endpoint
-                                                               queue:(dispatch_queue_t)queue
-                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMeasuredPhase1stHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                                 subscriptionEstablished:
+                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))reportHandler;
++ (void)readAttributeMeasuredPhase1stHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                              endpoint:(NSNumber *)endpoint
+                                                                 queue:(dispatch_queue_t)queue
+                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeOccupiedSetbackWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
-- (void)writeAttributeOccupiedSetbackWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOccupiedSetbackWithValue:(NSNumber * _Nullable)value
-                                        params:(CHIPWriteParams * _Nullable)params
-                             completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeMeasuredPhase3rdHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeOccupiedSetbackWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOccupiedSetbackWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMeasuredPhase3rdHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                                 subscriptionEstablished:
+                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))reportHandler;
++ (void)readAttributeMeasuredPhase3rdHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                              endpoint:(NSNumber *)endpoint
+                                                                 queue:(dispatch_queue_t)queue
+                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeOccupiedSetbackMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler;
+- (void)readAttributeMeasuredPhase5thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeOccupiedSetbackMinWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOccupiedSetbackMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMeasuredPhase5thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                                 subscriptionEstablished:
+                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))reportHandler;
++ (void)readAttributeMeasuredPhase5thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                              endpoint:(NSNumber *)endpoint
+                                                                 queue:(dispatch_queue_t)queue
+                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeOccupiedSetbackMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler;
+- (void)readAttributeMeasuredPhase7thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeOccupiedSetbackMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOccupiedSetbackMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMeasuredPhase7thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                                 subscriptionEstablished:
+                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))reportHandler;
++ (void)readAttributeMeasuredPhase7thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                              endpoint:(NSNumber *)endpoint
+                                                                 queue:(dispatch_queue_t)queue
+                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeUnoccupiedSetbackWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
-- (void)writeAttributeUnoccupiedSetbackWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeUnoccupiedSetbackWithValue:(NSNumber * _Nullable)value
-                                          params:(CHIPWriteParams * _Nullable)params
-                               completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeMeasuredPhase9thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeUnoccupiedSetbackWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeUnoccupiedSetbackWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeMeasuredPhase9thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                                 subscriptionEstablished:
+                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))reportHandler;
++ (void)readAttributeMeasuredPhase9thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                              endpoint:(NSNumber *)endpoint
+                                                                 queue:(dispatch_queue_t)queue
+                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeUnoccupiedSetbackMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeMeasuredPhase11thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeUnoccupiedSetbackMinWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeUnoccupiedSetbackMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeMeasuredPhase11thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                                  subscriptionEstablished:
+                                                      (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                            reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))reportHandler;
++ (void)readAttributeMeasuredPhase11thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                               endpoint:(NSNumber *)endpoint
+                                                                  queue:(dispatch_queue_t)queue
+                                                      completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeUnoccupiedSetbackMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeAcFrequencyMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeUnoccupiedSetbackMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeUnoccupiedSetbackMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcFrequencyMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcFrequencyMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeEmergencyHeatDeltaWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeAcFrequencyDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                  NSError * _Nullable error))completionHandler;
-- (void)writeAttributeEmergencyHeatDeltaWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeEmergencyHeatDeltaWithValue:(NSNumber * _Nonnull)value
-                                           params:(CHIPWriteParams * _Nullable)params
-                                completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeEmergencyHeatDeltaWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeAcFrequencyDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
                                                      params:(CHIPSubscribeParams * _Nullable)params
                                     subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                               reportHandler:
                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeEmergencyHeatDeltaWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeAcFrequencyDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                  endpoint:(NSNumber *)endpoint
                                                     queue:(dispatch_queue_t)queue
                                         completionHandler:
                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeACTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeACTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeACTypeWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributePowerMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeACTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeACTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePowerMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePowerMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeACCapacityWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeACCapacityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeACCapacityWithValue:(NSNumber * _Nonnull)value
-                                   params:(CHIPWriteParams * _Nullable)params
-                        completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributePowerDivisorWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeACCapacityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeACCapacityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePowerDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePowerDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeACRefrigerantTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
-- (void)writeAttributeACRefrigerantTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeACRefrigerantTypeWithValue:(NSNumber * _Nonnull)value
-                                          params:(CHIPWriteParams * _Nullable)params
-                               completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeHarmonicCurrentMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeACRefrigerantTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeACRefrigerantTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeHarmonicCurrentMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                            params:(CHIPSubscribeParams * _Nullable)params
+                                           subscriptionEstablished:
+                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))reportHandler;
++ (void)readAttributeHarmonicCurrentMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                        endpoint:(NSNumber *)endpoint
+                                                           queue:(dispatch_queue_t)queue
+                                               completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeACCompressorTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
-- (void)writeAttributeACCompressorTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeACCompressorTypeWithValue:(NSNumber * _Nonnull)value
-                                         params:(CHIPWriteParams * _Nullable)params
-                              completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributePhaseHarmonicCurrentMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeACCompressorTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeACCompressorTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePhaseHarmonicCurrentMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                                subscriptionEstablished:
+                                                    (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                          reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))reportHandler;
++ (void)readAttributePhaseHarmonicCurrentMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                             endpoint:(NSNumber *)endpoint
+                                                                queue:(dispatch_queue_t)queue
+                                                    completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeACErrorCodeWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeACErrorCodeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeACErrorCodeWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeInstantaneousVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeACErrorCodeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeACErrorCodeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeInstantaneousVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeInstantaneousVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeACLouverPositionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
-- (void)writeAttributeACLouverPositionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeACLouverPositionWithValue:(NSNumber * _Nonnull)value
-                                         params:(CHIPWriteParams * _Nullable)params
-                              completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeInstantaneousLineCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeACLouverPositionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeACLouverPositionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeInstantaneousLineCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))reportHandler;
++ (void)readAttributeInstantaneousLineCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeACCoilTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeInstantaneousActiveCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeACCoilTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeACCoilTemperatureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeInstantaneousActiveCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                             params:(CHIPSubscribeParams * _Nullable)params
+                                            subscriptionEstablished:
+                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))reportHandler;
++ (void)readAttributeInstantaneousActiveCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                         endpoint:(NSNumber *)endpoint
+                                                            queue:(dispatch_queue_t)queue
+                                                completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeACCapacityformatWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
-- (void)writeAttributeACCapacityformatWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeACCapacityformatWithValue:(NSNumber * _Nonnull)value
-                                         params:(CHIPWriteParams * _Nullable)params
-                              completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeInstantaneousReactiveCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeACCapacityformatWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeACCapacityformatWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeInstantaneousReactiveCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                              subscriptionEstablished:
+                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))reportHandler;
++ (void)readAttributeInstantaneousReactiveCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                           endpoint:(NSNumber *)endpoint
+                                                              queue:(dispatch_queue_t)queue
+                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeInstantaneousPowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeInstantaneousPowerWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeInstantaneousPowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeRmsVoltageWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRmsVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeRmsVoltageMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeRmsVoltageMinWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsVoltageMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+- (void)readAttributeRmsVoltageMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeRmsVoltageMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsVoltageMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeRmsCurrentWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeRmsCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
                                         maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(CHIPSubscribeParams * _Nullable)params
                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeRmsCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                          endpoint:(NSNumber *)endpoint
                                             queue:(dispatch_queue_t)queue
                                 completionHandler:
                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeRmsCurrentMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRmsCurrentMinWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsCurrentMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-@end
+- (void)readAttributeRmsCurrentMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeRmsCurrentMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsCurrentMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
+- (void)readAttributeActivePowerWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 /**
- * Cluster Thermostat User Interface Configuration
- *
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
  */
-@interface CHIPThermostatUserInterfaceConfiguration : CHIPCluster
+- (void)subscribeAttributeActivePowerWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeActivePowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTemperatureDisplayModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
-- (void)writeAttributeTemperatureDisplayModeWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTemperatureDisplayModeWithValue:(NSNumber * _Nonnull)value
-                                               params:(CHIPWriteParams * _Nullable)params
-                                    completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeActivePowerMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeActivePowerMinWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeActivePowerMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeActivePowerMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeActivePowerMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeActivePowerMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeReactivePowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTemperatureDisplayModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTemperatureDisplayModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeReactivePowerWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeReactivePowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeKeypadLockoutWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeApparentPowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                             NSError * _Nullable error))completionHandler;
-- (void)writeAttributeKeypadLockoutWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeKeypadLockoutWithValue:(NSNumber * _Nonnull)value
-                                      params:(CHIPWriteParams * _Nullable)params
-                           completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeKeypadLockoutWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeApparentPowerWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:
                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeKeypadLockoutWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeApparentPowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeScheduleProgrammingVisibilityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributePowerFactorWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributePowerFactorWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePowerFactorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeAverageRmsVoltageMeasurementPeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                 NSError * _Nullable error))completionHandler;
+- (void)writeAttributeAverageRmsVoltageMeasurementPeriodWithValue:(NSNumber * _Nonnull)value
+                                                completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAverageRmsVoltageMeasurementPeriodWithValue:(NSNumber * _Nonnull)value
+                                                           params:(CHIPWriteParams * _Nullable)params
+                                                completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeAverageRmsVoltageMeasurementPeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                                    subscriptionEstablished:
+                                                        (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                              reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                NSError * _Nullable error))reportHandler;
++ (void)readAttributeAverageRmsVoltageMeasurementPeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                 endpoint:(NSNumber *)endpoint
+                                                                    queue:(dispatch_queue_t)queue
+                                                        completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeAverageRmsUnderVoltageCounterWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                             NSError * _Nullable error))completionHandler;
-- (void)writeAttributeScheduleProgrammingVisibilityWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeAverageRmsUnderVoltageCounterWithValue:(NSNumber * _Nonnull)value
                                            completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeScheduleProgrammingVisibilityWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeAverageRmsUnderVoltageCounterWithValue:(NSNumber * _Nonnull)value
                                                       params:(CHIPWriteParams * _Nullable)params
                                            completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeScheduleProgrammingVisibilityWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeAverageRmsUnderVoltageCounterWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                                 params:(CHIPSubscribeParams * _Nullable)params
                                                subscriptionEstablished:
                                                    (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                          reportHandler:(void (^)(NSNumber * _Nullable value,
                                                                            NSError * _Nullable error))reportHandler;
-+ (void)readAttributeScheduleProgrammingVisibilityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeAverageRmsUnderVoltageCounterWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                             endpoint:(NSNumber *)endpoint
                                                                queue:(dispatch_queue_t)queue
                                                    completionHandler:(void (^)(NSNumber * _Nullable value,
                                                                          NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeRmsExtremeOverVoltagePeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))completionHandler;
+- (void)writeAttributeRmsExtremeOverVoltagePeriodWithValue:(NSNumber * _Nonnull)value
+                                         completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsExtremeOverVoltagePeriodWithValue:(NSNumber * _Nonnull)value
+                                                    params:(CHIPWriteParams * _Nullable)params
+                                         completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRmsExtremeOverVoltagePeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                              params:(CHIPSubscribeParams * _Nullable)params
+                                             subscriptionEstablished:
+                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsExtremeOverVoltagePeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                          endpoint:(NSNumber *)endpoint
+                                                             queue:(dispatch_queue_t)queue
+                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+- (void)readAttributeRmsExtremeUnderVoltagePeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler;
+- (void)writeAttributeRmsExtremeUnderVoltagePeriodWithValue:(NSNumber * _Nonnull)value
+                                          completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsExtremeUnderVoltagePeriodWithValue:(NSNumber * _Nonnull)value
+                                                     params:(CHIPWriteParams * _Nullable)params
+                                          completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeRmsExtremeUnderVoltagePeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                              subscriptionEstablished:
+                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsExtremeUnderVoltagePeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                           endpoint:(NSNumber *)endpoint
+                                                              queue:(dispatch_queue_t)queue
+                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeRmsVoltageSagPeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler;
+- (void)writeAttributeRmsVoltageSagPeriodWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsVoltageSagPeriodWithValue:(NSNumber * _Nonnull)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeRmsVoltageSagPeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(CHIPSubscribeParams * _Nullable)params
                                      subscriptionEstablished:
                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsVoltageSagPeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                   endpoint:(NSNumber *)endpoint
                                                      queue:(dispatch_queue_t)queue
                                          completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-@end
-
-/**
- * Cluster Thread Network Diagnostics
- *
- */
-@interface CHIPThreadNetworkDiagnostics : CHIPCluster
-
-- (void)resetCountsWithParams:(CHIPThreadNetworkDiagnosticsClusterResetCountsParams * _Nullable)params
-            completionHandler:(StatusCompletion)completionHandler;
-- (void)resetCountsWithCompletionHandler:(StatusCompletion)completionHandler;
-
-- (void)readAttributeChannelWithCompletionHandler:(void (^)(
-                                                      NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeChannelWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeChannelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeRoutingRoleWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeRoutingRoleWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRoutingRoleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNetworkNameWithCompletionHandler:(void (^)(
-                                                          NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeRmsVoltageSwellPeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
+- (void)writeAttributeRmsVoltageSwellPeriodWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsVoltageSwellPeriodWithValue:(NSNumber * _Nonnull)value
+                                              params:(CHIPWriteParams * _Nullable)params
+                                   completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNetworkNameWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNetworkNameWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRmsVoltageSwellPeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsVoltageSwellPeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePanIdWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeAcVoltageMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePanIdWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                        params:(CHIPSubscribeParams * _Nullable)params
-                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePanIdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                    endpoint:(NSNumber *)endpoint
-                                       queue:(dispatch_queue_t)queue
-                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcVoltageMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcVoltageMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeExtendedPanIdWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributeAcVoltageDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeExtendedPanIdWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeExtendedPanIdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcVoltageDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcVoltageDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMeshLocalPrefixWithCompletionHandler:(void (^)(NSData * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeAcCurrentMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMeshLocalPrefixWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMeshLocalPrefixWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcCurrentMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcCurrentMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeOverrunCountWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeAcCurrentDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeOverrunCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOverrunCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcCurrentDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcCurrentDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNeighborTableListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+- (void)readAttributeAcPowerMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                 NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNeighborTableListWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeAcPowerMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(CHIPSubscribeParams * _Nullable)params
                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                              reportHandler:
-                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNeighborTableListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcPowerMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                 endpoint:(NSNumber *)endpoint
                                                    queue:(dispatch_queue_t)queue
                                        completionHandler:
-                                           (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRouteTableListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+- (void)readAttributeAcPowerDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRouteTableListWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeAcPowerDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
                                             maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(CHIPSubscribeParams * _Nullable)params
                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                           reportHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRouteTableListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcPowerDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                              endpoint:(NSNumber *)endpoint
                                                 queue:(dispatch_queue_t)queue
                                     completionHandler:
-                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePartitionIdWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeOverloadAlarmsMaskWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler;
+- (void)writeAttributeOverloadAlarmsMaskWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOverloadAlarmsMaskWithValue:(NSNumber * _Nonnull)value
+                                           params:(CHIPWriteParams * _Nullable)params
+                                completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePartitionIdWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePartitionIdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeOverloadAlarmsMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeOverloadAlarmsMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeWeightingWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeVoltageOverloadWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeWeightingWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeWeightingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeVoltageOverloadWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeVoltageOverloadWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeDataVersionWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeCurrentOverloadWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeDataVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDataVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeCurrentOverloadWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCurrentOverloadWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeStableDataVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeAcOverloadAlarmsMaskWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
+- (void)writeAttributeAcOverloadAlarmsMaskWithValue:(NSNumber * _Nonnull)value
+                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAcOverloadAlarmsMaskWithValue:(NSNumber * _Nonnull)value
+                                             params:(CHIPWriteParams * _Nullable)params
+                                  completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeAcOverloadAlarmsMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcOverloadAlarmsMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeAcVoltageOverloadWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                 NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeStableDataVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeAcVoltageOverloadWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(CHIPSubscribeParams * _Nullable)params
                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                              reportHandler:
                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeStableDataVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeAcVoltageOverloadWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                 endpoint:(NSNumber *)endpoint
                                                    queue:(dispatch_queue_t)queue
                                        completionHandler:
                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeLeaderRouterIdWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeLeaderRouterIdWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLeaderRouterIdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeDetachedRoleCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeAcCurrentOverloadWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                 NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeDetachedRoleCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeAcCurrentOverloadWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(CHIPSubscribeParams * _Nullable)params
                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                              reportHandler:
                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDetachedRoleCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeAcCurrentOverloadWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                 endpoint:(NSNumber *)endpoint
                                                    queue:(dispatch_queue_t)queue
                                        completionHandler:
                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeChildRoleCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
+- (void)readAttributeAcActivePowerOverloadWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeChildRoleCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeChildRoleCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcActivePowerOverloadWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcActivePowerOverloadWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRouterRoleCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeAcReactivePowerOverloadWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRouterRoleCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRouterRoleCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAcReactivePowerOverloadWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler;
++ (void)readAttributeAcReactivePowerOverloadWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeLeaderRoleCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeAverageRmsOverVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeLeaderRoleCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLeaderRoleCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAverageRmsOverVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeAverageRmsOverVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAttachAttemptCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler;
+- (void)readAttributeAverageRmsUnderVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAttachAttemptCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttachAttemptCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAverageRmsUnderVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))reportHandler;
++ (void)readAttributeAverageRmsUnderVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePartitionIdChangeCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeRmsExtremeOverVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeRmsExtremeOverVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsExtremeOverVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeRmsExtremeUnderVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                      NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePartitionIdChangeCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeRmsExtremeUnderVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
                                                          params:(CHIPSubscribeParams * _Nullable)params
                                         subscriptionEstablished:
                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
                                                                     NSError * _Nullable error))reportHandler;
-+ (void)readAttributePartitionIdChangeCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeRmsExtremeUnderVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                      endpoint:(NSNumber *)endpoint
                                                         queue:(dispatch_queue_t)queue
                                             completionHandler:
                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeBetterPartitionAttachAttemptCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeRmsVoltageSagWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeBetterPartitionAttachAttemptCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                                   subscriptionEstablished:
-                                                       (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                             reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBetterPartitionAttachAttemptCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                endpoint:(NSNumber *)endpoint
-                                                                   queue:(dispatch_queue_t)queue
-                                                       completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRmsVoltageSagWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsVoltageSagWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeParentChangeCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeRmsVoltageSwellWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeRmsVoltageSwellWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsVoltageSwellWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeLineCurrentPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                 NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeParentChangeCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeLineCurrentPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(CHIPSubscribeParams * _Nullable)params
                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                              reportHandler:
                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeParentChangeCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeLineCurrentPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                 endpoint:(NSNumber *)endpoint
                                                    queue:(dispatch_queue_t)queue
                                        completionHandler:
                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTxTotalCountWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeTxTotalCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTxTotalCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeTxUnicastCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
+- (void)readAttributeActiveCurrentPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTxUnicastCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTxUnicastCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeActiveCurrentPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeActiveCurrentPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTxBroadcastCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeReactiveCurrentPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeReactiveCurrentPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeReactiveCurrentPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeRmsVoltagePhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTxBroadcastCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeRmsVoltagePhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
                                               maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(CHIPSubscribeParams * _Nullable)params
                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                             reportHandler:
                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTxBroadcastCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeRmsVoltagePhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                endpoint:(NSNumber *)endpoint
                                                   queue:(dispatch_queue_t)queue
                                       completionHandler:
                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTxAckRequestedCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeRmsVoltageMinPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTxAckRequestedCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeRmsVoltageMinPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(CHIPSubscribeParams * _Nullable)params
                                      subscriptionEstablished:
                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                reportHandler:
                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTxAckRequestedCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeRmsVoltageMinPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                   endpoint:(NSNumber *)endpoint
                                                      queue:(dispatch_queue_t)queue
                                          completionHandler:
                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTxAckedCountWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeRmsVoltageMaxPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTxAckedCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTxAckedCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRmsVoltageMaxPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsVoltageMaxPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTxNoAckRequestedCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
+- (void)readAttributeRmsCurrentPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTxNoAckRequestedCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTxNoAckRequestedCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRmsCurrentPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsCurrentPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTxDataCountWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeRmsCurrentMinPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTxDataCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTxDataCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRmsCurrentMinPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsCurrentMinPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTxDataPollCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeRmsCurrentMaxPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTxDataPollCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTxDataPollCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRmsCurrentMaxPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsCurrentMaxPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTxBeaconCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributeActivePowerPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTxBeaconCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTxBeaconCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeActivePowerPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeActivePowerPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTxBeaconRequestCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeActivePowerMinPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTxBeaconRequestCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeActivePowerMinPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(CHIPSubscribeParams * _Nullable)params
                                       subscriptionEstablished:
                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                 reportHandler:
                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTxBeaconRequestCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeActivePowerMinPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                    endpoint:(NSNumber *)endpoint
                                                       queue:(dispatch_queue_t)queue
                                           completionHandler:
                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTxOtherCountWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeActivePowerMaxPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTxOtherCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTxOtherCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeActivePowerMaxPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeActivePowerMaxPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTxRetryCountWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeReactivePowerPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTxRetryCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTxRetryCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeReactivePowerPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeReactivePowerPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTxDirectMaxRetryExpiryCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler;
+- (void)readAttributeApparentPowerPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTxDirectMaxRetryExpiryCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                              params:(CHIPSubscribeParams * _Nullable)params
-                                             subscriptionEstablished:
-                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTxDirectMaxRetryExpiryCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                          endpoint:(NSNumber *)endpoint
-                                                             queue:(dispatch_queue_t)queue
-                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeApparentPowerPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeApparentPowerPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributePowerFactorPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributePowerFactorPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePowerFactorPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTxIndirectMaxRetryExpiryCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributeAverageRmsVoltageMeasurementPeriodPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                       NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTxIndirectMaxRetryExpiryCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                params:(CHIPSubscribeParams * _Nullable)params
-                                               subscriptionEstablished:
-                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTxIndirectMaxRetryExpiryCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                            endpoint:(NSNumber *)endpoint
-                                                               queue:(dispatch_queue_t)queue
-                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAverageRmsVoltageMeasurementPeriodPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
+                                                                                      subscriptionEstablishedHandler
+                                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                      NSError * _Nullable error))reportHandler;
++ (void)readAttributeAverageRmsVoltageMeasurementPeriodPhaseBWithAttributeCache:
+            (CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                       endpoint:(NSNumber *)endpoint
+                                                                          queue:(dispatch_queue_t)queue
+                                                              completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                    NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTxErrCcaCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributeAverageRmsOverVoltageCounterPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                 NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTxErrCcaCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTxErrCcaCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAverageRmsOverVoltageCounterPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                                    subscriptionEstablished:
+                                                        (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                              reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                NSError * _Nullable error))reportHandler;
++ (void)readAttributeAverageRmsOverVoltageCounterPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                 endpoint:(NSNumber *)endpoint
+                                                                    queue:(dispatch_queue_t)queue
+                                                        completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTxErrAbortCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeAverageRmsUnderVoltageCounterPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTxErrAbortCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTxErrAbortCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAverageRmsUnderVoltageCounterPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                                     subscriptionEstablished:
+                                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                               reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                 NSError * _Nullable error))reportHandler;
++ (void)readAttributeAverageRmsUnderVoltageCounterPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                  endpoint:(NSNumber *)endpoint
+                                                                     queue:(dispatch_queue_t)queue
+                                                         completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTxErrBusyChannelCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
+- (void)readAttributeRmsExtremeOverVoltagePeriodPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTxErrBusyChannelCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTxErrBusyChannelCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRmsExtremeOverVoltagePeriodPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                                   subscriptionEstablished:
+                                                       (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                             reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsExtremeOverVoltagePeriodPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                endpoint:(NSNumber *)endpoint
+                                                                   queue:(dispatch_queue_t)queue
+                                                       completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRxTotalCountWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeRmsExtremeUnderVoltagePeriodPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                 NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRxTotalCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRxTotalCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRmsExtremeUnderVoltagePeriodPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                                    subscriptionEstablished:
+                                                        (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                              reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsExtremeUnderVoltagePeriodPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                 endpoint:(NSNumber *)endpoint
+                                                                    queue:(dispatch_queue_t)queue
+                                                        completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRxUnicastCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
+- (void)readAttributeRmsVoltageSagPeriodPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRxUnicastCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRxUnicastCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRmsVoltageSagPeriodPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                            params:(CHIPSubscribeParams * _Nullable)params
+                                           subscriptionEstablished:
+                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsVoltageSagPeriodPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                        endpoint:(NSNumber *)endpoint
+                                                           queue:(dispatch_queue_t)queue
+                                               completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRxBroadcastCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
+- (void)readAttributeRmsVoltageSwellPeriodPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRxBroadcastCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRxBroadcastCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRmsVoltageSwellPeriodPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                              params:(CHIPSubscribeParams * _Nullable)params
+                                             subscriptionEstablished:
+                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsVoltageSwellPeriodPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                          endpoint:(NSNumber *)endpoint
+                                                             queue:(dispatch_queue_t)queue
+                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRxDataCountWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeLineCurrentPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRxDataCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRxDataCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeLineCurrentPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeLineCurrentPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRxDataPollCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeActiveCurrentPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRxDataPollCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRxDataPollCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeActiveCurrentPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeActiveCurrentPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRxBeaconCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributeReactiveCurrentPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRxBeaconCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRxBeaconCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeReactiveCurrentPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeReactiveCurrentPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRxBeaconRequestCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeRmsVoltagePhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRxBeaconRequestCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRxBeaconRequestCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRmsVoltagePhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsVoltagePhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRxOtherCountWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeRmsVoltageMinPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRxOtherCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRxOtherCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRmsVoltageMinPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsVoltageMinPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRxAddressFilteredCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
+- (void)readAttributeRmsVoltageMaxPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRxAddressFilteredCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRxAddressFilteredCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRmsVoltageMaxPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsVoltageMaxPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRxDestAddrFilteredCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
+- (void)readAttributeRmsCurrentPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRxDestAddrFilteredCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRxDestAddrFilteredCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRmsCurrentPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsCurrentPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRxDuplicatedCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeRmsCurrentMinPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRxDuplicatedCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRxDuplicatedCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRmsCurrentMinPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsCurrentMinPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRxErrNoFrameCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeRmsCurrentMaxPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeRmsCurrentMaxPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsCurrentMaxPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeActivePowerPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                 NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRxErrNoFrameCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeActivePowerPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(CHIPSubscribeParams * _Nullable)params
                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                              reportHandler:
                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRxErrNoFrameCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeActivePowerPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                 endpoint:(NSNumber *)endpoint
                                                    queue:(dispatch_queue_t)queue
                                        completionHandler:
                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRxErrUnknownNeighborCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeRxErrUnknownNeighborCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                            params:(CHIPSubscribeParams * _Nullable)params
-                                           subscriptionEstablished:
-                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRxErrUnknownNeighborCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                        endpoint:(NSNumber *)endpoint
-                                                           queue:(dispatch_queue_t)queue
-                                               completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
-
-- (void)readAttributeRxErrInvalidSrcAddrCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler;
+- (void)readAttributeActivePowerMinPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRxErrInvalidSrcAddrCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRxErrInvalidSrcAddrCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeActivePowerMinPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeActivePowerMinPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRxErrSecCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributeActivePowerMaxPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRxErrSecCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRxErrSecCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeActivePowerMaxPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeActivePowerMaxPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRxErrFcsCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributeReactivePowerPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRxErrFcsCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRxErrFcsCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeReactivePowerPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeReactivePowerPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRxErrOtherCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeApparentPowerPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRxErrOtherCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRxErrOtherCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeApparentPowerPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeApparentPowerPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeActiveTimestampWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributePowerFactorPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeActiveTimestampWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeActiveTimestampWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributePowerFactorPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributePowerFactorPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePendingTimestampWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler;
+- (void)readAttributeAverageRmsVoltageMeasurementPeriodPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                       NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePendingTimestampWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePendingTimestampWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAverageRmsVoltageMeasurementPeriodPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
+                                                                                      subscriptionEstablishedHandler
+                                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                      NSError * _Nullable error))reportHandler;
++ (void)readAttributeAverageRmsVoltageMeasurementPeriodPhaseCWithAttributeCache:
+            (CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                       endpoint:(NSNumber *)endpoint
+                                                                          queue:(dispatch_queue_t)queue
+                                                              completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                    NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeAverageRmsOverVoltageCounterPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                 NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                        params:(CHIPSubscribeParams * _Nullable)params
-                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeDelayWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                    endpoint:(NSNumber *)endpoint
-                                       queue:(dispatch_queue_t)queue
-                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAverageRmsOverVoltageCounterPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                                    subscriptionEstablished:
+                                                        (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                              reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                NSError * _Nullable error))reportHandler;
++ (void)readAttributeAverageRmsOverVoltageCounterPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                 endpoint:(NSNumber *)endpoint
+                                                                    queue:(dispatch_queue_t)queue
+                                                        completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeSecurityPolicyWithCompletionHandler:
-    (void (^)(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeAverageRmsUnderVoltageCounterPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                  NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeSecurityPolicyWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value,
-                                                  NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSecurityPolicyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:(void (^)(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value,
-                                                          NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeAverageRmsUnderVoltageCounterPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                                     subscriptionEstablished:
+                                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                               reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                 NSError * _Nullable error))reportHandler;
++ (void)readAttributeAverageRmsUnderVoltageCounterPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                  endpoint:(NSNumber *)endpoint
+                                                                     queue:(dispatch_queue_t)queue
+                                                         completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeChannelMaskWithCompletionHandler:(void (^)(
-                                                          NSData * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeRmsExtremeOverVoltagePeriodPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeChannelMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeChannelMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRmsExtremeOverVoltagePeriodPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                                   subscriptionEstablished:
+                                                       (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                             reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsExtremeOverVoltagePeriodPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                endpoint:(NSNumber *)endpoint
+                                                                   queue:(dispatch_queue_t)queue
+                                                       completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeOperationalDatasetComponentsWithCompletionHandler:
-    (void (^)(CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value,
-        NSError * _Nullable error))completionHandler;
+- (void)readAttributeRmsExtremeUnderVoltagePeriodPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                 NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)
-    subscribeAttributeOperationalDatasetComponentsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:
-                                                        (void (^)(
-                                                            CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value,
-                                                            NSError * _Nullable error))reportHandler;
-+ (void)
-    readAttributeOperationalDatasetComponentsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:
-                                                  (void (^)(
-                                                      CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value,
-                                                      NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRmsExtremeUnderVoltagePeriodPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                                    subscriptionEstablished:
+                                                        (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                              reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsExtremeUnderVoltagePeriodPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                 endpoint:(NSNumber *)endpoint
+                                                                    queue:(dispatch_queue_t)queue
+                                                        completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeActiveNetworkFaultsListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
+- (void)readAttributeRmsVoltageSagPeriodPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeActiveNetworkFaultsListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSArray * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler;
-+ (void)readAttributeActiveNetworkFaultsListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRmsVoltageSagPeriodPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                            params:(CHIPSubscribeParams * _Nullable)params
+                                           subscriptionEstablished:
+                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsVoltageSagPeriodPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                        endpoint:(NSNumber *)endpoint
+                                                           queue:(dispatch_queue_t)queue
+                                               completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeRmsVoltageSwellPeriodPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeRmsVoltageSwellPeriodPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                              params:(CHIPSubscribeParams * _Nullable)params
+                                             subscriptionEstablished:
+                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))reportHandler;
++ (void)readAttributeRmsVoltageSwellPeriodPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                          endpoint:(NSNumber *)endpoint
+                                                             queue:(dispatch_queue_t)queue
+                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler;
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
@@ -19789,1289 +19264,1814 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Time Format Localization
+ * Cluster Test Cluster
  *
  */
-@interface CHIPTimeFormatLocalization : CHIPCluster
+@interface CHIPTestCluster : CHIPCluster
 
-- (void)readAttributeHourFormatWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeHourFormatWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeHourFormatWithValue:(NSNumber * _Nonnull)value
-                                   params:(CHIPWriteParams * _Nullable)params
-                        completionHandler:(StatusCompletion)completionHandler;
-/**
- * This API does not support setting autoResubscribe to NO in the
- * CHIPSubscribeParams.
- */
-- (void)subscribeAttributeHourFormatWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeHourFormatWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)testWithParams:(CHIPTestClusterClusterTestParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler;
+- (void)testWithCompletionHandler:(StatusCompletion)completionHandler;
+- (void)testNotHandledWithParams:(CHIPTestClusterClusterTestNotHandledParams * _Nullable)params
+               completionHandler:(StatusCompletion)completionHandler;
+- (void)testNotHandledWithCompletionHandler:(StatusCompletion)completionHandler;
+- (void)testSpecificWithParams:(CHIPTestClusterClusterTestSpecificParams * _Nullable)params
+             completionHandler:(void (^)(CHIPTestClusterClusterTestSpecificResponseParams * _Nullable data,
+                                   NSError * _Nullable error))completionHandler;
+- (void)testSpecificWithCompletionHandler:(void (^)(CHIPTestClusterClusterTestSpecificResponseParams * _Nullable data,
+                                              NSError * _Nullable error))completionHandler;
+- (void)testUnknownCommandWithParams:(CHIPTestClusterClusterTestUnknownCommandParams * _Nullable)params
+                   completionHandler:(StatusCompletion)completionHandler;
+- (void)testUnknownCommandWithCompletionHandler:(StatusCompletion)completionHandler;
+- (void)testAddArgumentsWithParams:(CHIPTestClusterClusterTestAddArgumentsParams *)params
+                 completionHandler:(void (^)(CHIPTestClusterClusterTestAddArgumentsResponseParams * _Nullable data,
+                                       NSError * _Nullable error))completionHandler;
+- (void)testSimpleArgumentRequestWithParams:(CHIPTestClusterClusterTestSimpleArgumentRequestParams *)params
+                          completionHandler:(void (^)(CHIPTestClusterClusterTestSimpleArgumentResponseParams * _Nullable data,
+                                                NSError * _Nullable error))completionHandler;
+- (void)testStructArrayArgumentRequestWithParams:(CHIPTestClusterClusterTestStructArrayArgumentRequestParams *)params
+                               completionHandler:
+                                   (void (^)(CHIPTestClusterClusterTestStructArrayArgumentResponseParams * _Nullable data,
+                                       NSError * _Nullable error))completionHandler;
+- (void)testStructArgumentRequestWithParams:(CHIPTestClusterClusterTestStructArgumentRequestParams *)params
+                          completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
+                                                NSError * _Nullable error))completionHandler;
+- (void)testNestedStructArgumentRequestWithParams:(CHIPTestClusterClusterTestNestedStructArgumentRequestParams *)params
+                                completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
+                                                      NSError * _Nullable error))completionHandler;
+- (void)testListStructArgumentRequestWithParams:(CHIPTestClusterClusterTestListStructArgumentRequestParams *)params
+                              completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
+                                                    NSError * _Nullable error))completionHandler;
+- (void)testListInt8UArgumentRequestWithParams:(CHIPTestClusterClusterTestListInt8UArgumentRequestParams *)params
+                             completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
+                                                   NSError * _Nullable error))completionHandler;
+- (void)testNestedStructListArgumentRequestWithParams:(CHIPTestClusterClusterTestNestedStructListArgumentRequestParams *)params
+                                    completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
+                                                          NSError * _Nullable error))completionHandler;
+- (void)testListNestedStructListArgumentRequestWithParams:
+            (CHIPTestClusterClusterTestListNestedStructListArgumentRequestParams *)params
+                                        completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
+                                                              NSError * _Nullable error))completionHandler;
+- (void)testListInt8UReverseRequestWithParams:(CHIPTestClusterClusterTestListInt8UReverseRequestParams *)params
+                            completionHandler:(void (^)(CHIPTestClusterClusterTestListInt8UReverseResponseParams * _Nullable data,
+                                                  NSError * _Nullable error))completionHandler;
+- (void)testEnumsRequestWithParams:(CHIPTestClusterClusterTestEnumsRequestParams *)params
+                 completionHandler:(void (^)(CHIPTestClusterClusterTestEnumsResponseParams * _Nullable data,
+                                       NSError * _Nullable error))completionHandler;
+- (void)testNullableOptionalRequestWithParams:(CHIPTestClusterClusterTestNullableOptionalRequestParams * _Nullable)params
+                            completionHandler:(void (^)(CHIPTestClusterClusterTestNullableOptionalResponseParams * _Nullable data,
+                                                  NSError * _Nullable error))completionHandler;
+- (void)testComplexNullableOptionalRequestWithParams:(CHIPTestClusterClusterTestComplexNullableOptionalRequestParams *)params
+                                   completionHandler:
+                                       (void (^)(CHIPTestClusterClusterTestComplexNullableOptionalResponseParams * _Nullable data,
+                                           NSError * _Nullable error))completionHandler;
+- (void)simpleStructEchoRequestWithParams:(CHIPTestClusterClusterSimpleStructEchoRequestParams *)params
+                        completionHandler:(void (^)(CHIPTestClusterClusterSimpleStructResponseParams * _Nullable data,
+                                              NSError * _Nullable error))completionHandler;
+- (void)timedInvokeRequestWithParams:(CHIPTestClusterClusterTimedInvokeRequestParams * _Nullable)params
+                   completionHandler:(StatusCompletion)completionHandler;
+- (void)timedInvokeRequestWithCompletionHandler:(StatusCompletion)completionHandler;
+- (void)testSimpleOptionalArgumentRequestWithParams:
+            (CHIPTestClusterClusterTestSimpleOptionalArgumentRequestParams * _Nullable)params
+                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)testEmitTestEventRequestWithParams:(CHIPTestClusterClusterTestEmitTestEventRequestParams *)params
+                         completionHandler:(void (^)(CHIPTestClusterClusterTestEmitTestEventResponseParams * _Nullable data,
+                                               NSError * _Nullable error))completionHandler;
+- (void)testEmitTestFabricScopedEventRequestWithParams:(CHIPTestClusterClusterTestEmitTestFabricScopedEventRequestParams *)params
+                                     completionHandler:
+                                         (void (^)(
+                                             CHIPTestClusterClusterTestEmitTestFabricScopedEventResponseParams * _Nullable data,
+                                             NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeActiveCalendarTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler;
-- (void)writeAttributeActiveCalendarTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeActiveCalendarTypeWithValue:(NSNumber * _Nonnull)value
-                                           params:(CHIPWriteParams * _Nullable)params
-                                completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeBooleanWithCompletionHandler:(void (^)(
+                                                      NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeBooleanWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBooleanWithValue:(NSNumber * _Nonnull)value
+                                params:(CHIPWriteParams * _Nullable)params
+                     completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeActiveCalendarTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeActiveCalendarTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBooleanWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeBooleanWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeSupportedCalendarTypesWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
+- (void)readAttributeBitmap8WithCompletionHandler:(void (^)(
+                                                      NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeBitmap8WithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBitmap8WithValue:(NSNumber * _Nonnull)value
+                                params:(CHIPWriteParams * _Nullable)params
+                     completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeSupportedCalendarTypesWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:
-                                                      (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSupportedCalendarTypesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBitmap8WithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeBitmap8WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeBitmap16WithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeBitmap16WithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBitmap16WithValue:(NSNumber * _Nonnull)value
+                                 params:(CHIPWriteParams * _Nullable)params
+                      completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBitmap16WithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeBitmap16WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeBitmap32WithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeBitmap32WithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBitmap32WithValue:(NSNumber * _Nonnull)value
+                                 params:(CHIPWriteParams * _Nullable)params
+                      completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBitmap32WithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeBitmap32WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeBitmap64WithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeBitmap64WithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBitmap64WithValue:(NSNumber * _Nonnull)value
+                                 params:(CHIPWriteParams * _Nullable)params
+                      completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeBitmap64WithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeBitmap64WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeInt8uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeInt8uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInt8uWithValue:(NSNumber * _Nonnull)value
+                              params:(CHIPWriteParams * _Nullable)params
+                   completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeInt8uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                        params:(CHIPSubscribeParams * _Nullable)params
+                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeInt8uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                    endpoint:(NSNumber *)endpoint
+                                       queue:(dispatch_queue_t)queue
+                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeInt16uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeInt16uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInt16uWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-@end
+- (void)subscribeAttributeInt16uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeInt16uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
+- (void)readAttributeInt24uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeInt24uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInt24uWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler;
 /**
- * Cluster Unit Localization
- *
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
  */
-@interface CHIPUnitLocalization : CHIPCluster
+- (void)subscribeAttributeInt24uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeInt24uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTemperatureUnitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
-- (void)writeAttributeTemperatureUnitWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTemperatureUnitWithValue:(NSNumber * _Nonnull)value
-                                        params:(CHIPWriteParams * _Nullable)params
-                             completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeInt32uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeInt32uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInt32uWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTemperatureUnitWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTemperatureUnitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeInt32uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeInt32uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeInt40uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeInt40uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInt40uWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeInt40uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeInt40uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeInt48uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeInt48uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInt48uWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeInt48uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeInt48uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeInt56uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeInt56uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInt56uWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeInt56uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeInt56uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeInt64uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeInt64uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInt64uWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeInt64uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeInt64uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeInt8sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeInt8sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInt8sWithValue:(NSNumber * _Nonnull)value
+                              params:(CHIPWriteParams * _Nullable)params
+                   completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-@end
+- (void)subscribeAttributeInt8sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                        params:(CHIPSubscribeParams * _Nullable)params
+                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeInt8sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                    endpoint:(NSNumber *)endpoint
+                                       queue:(dispatch_queue_t)queue
+                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
+- (void)readAttributeInt16sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeInt16sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInt16sWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler;
 /**
- * Cluster User Label
- *
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
  */
-@interface CHIPUserLabel : CHIPCluster
+- (void)subscribeAttributeInt16sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeInt16sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeLabelListWithCompletionHandler:(void (^)(
-                                                        NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeLabelListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeLabelListWithValue:(NSArray * _Nonnull)value
-                                  params:(CHIPWriteParams * _Nullable)params
-                       completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeInt24sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeInt24sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInt24sWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeLabelListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeLabelListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeInt24sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeInt24sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeInt32sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeInt32sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInt32sWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeInt32sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeInt32sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeInt40sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeInt40sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInt40sWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeInt40sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeInt40sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeInt48sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeInt48sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInt48sWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeInt48sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeInt48sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeInt56sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeInt56sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInt56sWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeInt56sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeInt56sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeInt64sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeInt64sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInt64sWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-@end
+- (void)subscribeAttributeInt64sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeInt64sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
+- (void)readAttributeEnum8WithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeEnum8WithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeEnum8WithValue:(NSNumber * _Nonnull)value
+                              params:(CHIPWriteParams * _Nullable)params
+                   completionHandler:(StatusCompletion)completionHandler;
 /**
- * Cluster Wake on LAN
- *
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
  */
-@interface CHIPWakeOnLan : CHIPCluster
+- (void)subscribeAttributeEnum8WithMinInterval:(NSNumber * _Nonnull)minInterval
+                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                        params:(CHIPSubscribeParams * _Nullable)params
+                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeEnum8WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                    endpoint:(NSNumber *)endpoint
+                                       queue:(dispatch_queue_t)queue
+                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeMACAddressWithCompletionHandler:(void (^)(
-                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeEnum16WithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeEnum16WithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeEnum16WithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeMACAddressWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeMACAddressWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeEnum16WithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeEnum16WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeFloatSingleWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeFloatSingleWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeFloatSingleWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeFloatSingleWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFloatSingleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeFloatDoubleWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeFloatDoubleWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeFloatDoubleWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeFloatDoubleWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeFloatDoubleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeOctetStringWithCompletionHandler:(void (^)(
+                                                          NSData * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeOctetStringWithValue:(NSData * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOctetStringWithValue:(NSData * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeOctetStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeOctetStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeListInt8uWithCompletionHandler:(void (^)(
+                                                        NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeListInt8uWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeListInt8uWithValue:(NSArray * _Nonnull)value
+                                  params:(CHIPWriteParams * _Nullable)params
+                       completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeListInt8uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeListInt8uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeListOctetStringWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                               NSError * _Nullable error))completionHandler;
+- (void)writeAttributeListOctetStringWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeListOctetStringWithValue:(NSArray * _Nonnull)value
+                                        params:(CHIPWriteParams * _Nullable)params
+                             completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeListOctetStringWithMinInterval:(NSNumber * _Nonnull)minInterval
                                              maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(CHIPSubscribeParams * _Nullable)params
                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                            reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeListOctetStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                               endpoint:(NSNumber *)endpoint
                                                  queue:(dispatch_queue_t)queue
                                      completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-
-@end
+                                         (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
+- (void)readAttributeListStructOctetStringWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
+- (void)writeAttributeListStructOctetStringWithValue:(NSArray * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeListStructOctetStringWithValue:(NSArray * _Nonnull)value
+                                              params:(CHIPWriteParams * _Nullable)params
+                                   completionHandler:(StatusCompletion)completionHandler;
 /**
- * Cluster WiFi Network Diagnostics
- *
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
  */
-@interface CHIPWiFiNetworkDiagnostics : CHIPCluster
-
-- (void)resetCountsWithParams:(CHIPWiFiNetworkDiagnosticsClusterResetCountsParams * _Nullable)params
-            completionHandler:(StatusCompletion)completionHandler;
-- (void)resetCountsWithCompletionHandler:(StatusCompletion)completionHandler;
+- (void)subscribeAttributeListStructOctetStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeListStructOctetStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeBssidWithCompletionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeLongOctetStringWithCompletionHandler:(void (^)(NSData * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
+- (void)writeAttributeLongOctetStringWithValue:(NSData * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeLongOctetStringWithValue:(NSData * _Nonnull)value
+                                        params:(CHIPWriteParams * _Nullable)params
+                             completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeBssidWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                        params:(CHIPSubscribeParams * _Nullable)params
-                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                 reportHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBssidWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                    endpoint:(NSNumber *)endpoint
-                                       queue:(dispatch_queue_t)queue
-                           completionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeLongOctetStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeLongOctetStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeSecurityTypeWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeCharStringWithCompletionHandler:(void (^)(
+                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeCharStringWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCharStringWithValue:(NSString * _Nonnull)value
+                                   params:(CHIPWriteParams * _Nullable)params
+                        completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeSecurityTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSecurityTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeCharStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeCharStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:
+                                    (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeWiFiVersionWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeLongCharStringWithCompletionHandler:(void (^)(NSString * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
+- (void)writeAttributeLongCharStringWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeLongCharStringWithValue:(NSString * _Nonnull)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeWiFiVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeWiFiVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeLongCharStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeLongCharStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeChannelNumberWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributeEpochUsWithCompletionHandler:(void (^)(
+                                                      NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeEpochUsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeEpochUsWithValue:(NSNumber * _Nonnull)value
+                                params:(CHIPWriteParams * _Nullable)params
+                     completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeChannelNumberWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeChannelNumberWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeEpochUsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeEpochUsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeRssiWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeEpochSWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeEpochSWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeEpochSWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeRssiWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                       params:(CHIPSubscribeParams * _Nullable)params
-                      subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeRssiWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                   endpoint:(NSNumber *)endpoint
-                                      queue:(dispatch_queue_t)queue
-                          completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeEpochSWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeEpochSWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeBeaconLostCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeVendorIdWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeVendorIdWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeVendorIdWithValue:(NSNumber * _Nonnull)value
+                                 params:(CHIPWriteParams * _Nullable)params
+                      completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeBeaconLostCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBeaconLostCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeVendorIdWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeVendorIdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeBeaconRxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributeListNullablesAndOptionalsStructWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler;
+- (void)writeAttributeListNullablesAndOptionalsStructWithValue:(NSArray * _Nonnull)value
+                                             completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeListNullablesAndOptionalsStructWithValue:(NSArray * _Nonnull)value
+                                                        params:(CHIPWriteParams * _Nullable)params
+                                             completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeBeaconRxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeBeaconRxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeListNullablesAndOptionalsStructWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                                 subscriptionEstablished:
+                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                           reportHandler:(void (^)(NSArray * _Nullable value,
+                                                                             NSError * _Nullable error))reportHandler;
++ (void)readAttributeListNullablesAndOptionalsStructWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                              endpoint:(NSNumber *)endpoint
+                                                                 queue:(dispatch_queue_t)queue
+                                                     completionHandler:(void (^)(NSArray * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePacketMulticastRxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
+- (void)readAttributeEnumAttrWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeEnumAttrWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeEnumAttrWithValue:(NSNumber * _Nonnull)value
+                                 params:(CHIPWriteParams * _Nullable)params
+                      completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePacketMulticastRxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))reportHandler;
-+ (void)readAttributePacketMulticastRxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeEnumAttrWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeEnumAttrWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePacketMulticastTxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
+- (void)readAttributeStructAttrWithCompletionHandler:(void (^)(CHIPTestClusterClusterSimpleStruct * _Nullable value,
+                                                         NSError * _Nullable error))completionHandler;
+- (void)writeAttributeStructAttrWithValue:(CHIPTestClusterClusterSimpleStruct * _Nonnull)value
+                        completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeStructAttrWithValue:(CHIPTestClusterClusterSimpleStruct * _Nonnull)value
+                                   params:(CHIPWriteParams * _Nullable)params
+                        completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePacketMulticastTxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))reportHandler;
-+ (void)readAttributePacketMulticastTxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeStructAttrWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(CHIPTestClusterClusterSimpleStruct * _Nullable value,
+                                                        NSError * _Nullable error))reportHandler;
++ (void)readAttributeStructAttrWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(CHIPTestClusterClusterSimpleStruct * _Nullable value,
+                                                      NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePacketUnicastRxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeRangeRestrictedInt8uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
+- (void)writeAttributeRangeRestrictedInt8uWithValue:(NSNumber * _Nonnull)value
+                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRangeRestrictedInt8uWithValue:(NSNumber * _Nonnull)value
+                                             params:(CHIPWriteParams * _Nullable)params
+                                  completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePacketUnicastRxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeRangeRestrictedInt8uWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(CHIPSubscribeParams * _Nullable)params
                                       subscriptionEstablished:
                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                 reportHandler:
                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePacketUnicastRxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeRangeRestrictedInt8uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                    endpoint:(NSNumber *)endpoint
                                                       queue:(dispatch_queue_t)queue
                                           completionHandler:
                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePacketUnicastTxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeRangeRestrictedInt8sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
+- (void)writeAttributeRangeRestrictedInt8sWithValue:(NSNumber * _Nonnull)value
+                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRangeRestrictedInt8sWithValue:(NSNumber * _Nonnull)value
+                                             params:(CHIPWriteParams * _Nullable)params
+                                  completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePacketUnicastTxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeRangeRestrictedInt8sWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(CHIPSubscribeParams * _Nullable)params
                                       subscriptionEstablished:
                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                 reportHandler:
                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributePacketUnicastTxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeRangeRestrictedInt8sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                    endpoint:(NSNumber *)endpoint
                                                       queue:(dispatch_queue_t)queue
                                           completionHandler:
                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCurrentMaxRateWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler;
+- (void)readAttributeRangeRestrictedInt16uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
+- (void)writeAttributeRangeRestrictedInt16uWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRangeRestrictedInt16uWithValue:(NSNumber * _Nonnull)value
+                                              params:(CHIPWriteParams * _Nullable)params
+                                   completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCurrentMaxRateWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentMaxRateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeRangeRestrictedInt16uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRangeRestrictedInt16uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeOverrunCountWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeRangeRestrictedInt16sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler;
+- (void)writeAttributeRangeRestrictedInt16sWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRangeRestrictedInt16sWithValue:(NSNumber * _Nonnull)value
+                                              params:(CHIPWriteParams * _Nullable)params
+                                   completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeRangeRestrictedInt16sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeRangeRestrictedInt16sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeListLongOctetStringWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
+- (void)writeAttributeListLongOctetStringWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeListLongOctetStringWithValue:(NSArray * _Nonnull)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeListLongOctetStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeListLongOctetStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeListFabricScopedWithParams:(CHIPReadParams * _Nullable)params
+                              completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeListFabricScopedWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeListFabricScopedWithValue:(NSArray * _Nonnull)value
+                                         params:(CHIPWriteParams * _Nullable)params
+                              completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeListFabricScopedWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeListFabricScopedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeTimedWriteBooleanWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler;
+- (void)writeAttributeTimedWriteBooleanWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTimedWriteBooleanWithValue:(NSNumber * _Nonnull)value
+                                          params:(CHIPWriteParams * _Nullable)params
+                               completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeOverrunCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOverrunCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeTimedWriteBooleanWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeTimedWriteBooleanWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler;
+- (void)readAttributeGeneralErrorBooleanWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
+- (void)writeAttributeGeneralErrorBooleanWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeGeneralErrorBooleanWithValue:(NSNumber * _Nonnull)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeGeneralErrorBooleanWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeGeneralErrorBooleanWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+- (void)readAttributeClusterErrorBooleanWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler;
+- (void)writeAttributeClusterErrorBooleanWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeClusterErrorBooleanWithValue:(NSNumber * _Nonnull)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeClusterErrorBooleanWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(CHIPSubscribeParams * _Nullable)params
                                      subscriptionEstablished:
                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeClusterErrorBooleanWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                   endpoint:(NSNumber *)endpoint
                                                      queue:(dispatch_queue_t)queue
                                          completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeUnsupportedWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeUnsupportedWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeUnsupportedWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeUnsupportedWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeUnsupportedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeNullableBooleanWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableBooleanWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableBooleanWithValue:(NSNumber * _Nullable)value
+                                        params:(CHIPWriteParams * _Nullable)params
+                             completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:
-                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNullableBooleanWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableBooleanWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeNullableBitmap8WithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                               NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableBitmap8WithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableBitmap8WithValue:(NSNumber * _Nullable)value
+                                        params:(CHIPWriteParams * _Nullable)params
+                             completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeNullableBitmap8WithMinInterval:(NSNumber * _Nonnull)minInterval
                                              maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(CHIPSubscribeParams * _Nullable)params
                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                            reportHandler:
                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeNullableBitmap8WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                               endpoint:(NSNumber *)endpoint
                                                  queue:(dispatch_queue_t)queue
                                      completionHandler:
                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-@end
+- (void)readAttributeNullableBitmap16WithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableBitmap16WithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableBitmap16WithValue:(NSNumber * _Nullable)value
+                                         params:(CHIPWriteParams * _Nullable)params
+                              completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeNullableBitmap16WithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableBitmap16WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeNullableBitmap32WithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableBitmap32WithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableBitmap32WithValue:(NSNumber * _Nullable)value
+                                         params:(CHIPWriteParams * _Nullable)params
+                              completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeNullableBitmap32WithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableBitmap32WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeNullableBitmap64WithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableBitmap64WithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableBitmap64WithValue:(NSNumber * _Nullable)value
+                                         params:(CHIPWriteParams * _Nullable)params
+                              completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeNullableBitmap64WithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableBitmap64WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeNullableInt8uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableInt8uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableInt8uWithValue:(NSNumber * _Nullable)value
+                                      params:(CHIPWriteParams * _Nullable)params
+                           completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeNullableInt8uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableInt8uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeNullableInt16uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableInt16uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableInt16uWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeNullableInt16uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableInt16uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
+- (void)readAttributeNullableInt24uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableInt24uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableInt24uWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler;
 /**
- * Cluster Window Covering
- *
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
  */
-@interface CHIPWindowCovering : CHIPCluster
-
-- (void)upOrOpenWithParams:(CHIPWindowCoveringClusterUpOrOpenParams * _Nullable)params
-         completionHandler:(StatusCompletion)completionHandler;
-- (void)upOrOpenWithCompletionHandler:(StatusCompletion)completionHandler;
-- (void)downOrCloseWithParams:(CHIPWindowCoveringClusterDownOrCloseParams * _Nullable)params
-            completionHandler:(StatusCompletion)completionHandler;
-- (void)downOrCloseWithCompletionHandler:(StatusCompletion)completionHandler;
-- (void)stopMotionWithParams:(CHIPWindowCoveringClusterStopMotionParams * _Nullable)params
-           completionHandler:(StatusCompletion)completionHandler;
-- (void)stopMotionWithCompletionHandler:(StatusCompletion)completionHandler;
-- (void)goToLiftValueWithParams:(CHIPWindowCoveringClusterGoToLiftValueParams *)params
-              completionHandler:(StatusCompletion)completionHandler;
-- (void)goToLiftPercentageWithParams:(CHIPWindowCoveringClusterGoToLiftPercentageParams *)params
-                   completionHandler:(StatusCompletion)completionHandler;
-- (void)goToTiltValueWithParams:(CHIPWindowCoveringClusterGoToTiltValueParams *)params
-              completionHandler:(StatusCompletion)completionHandler;
-- (void)goToTiltPercentageWithParams:(CHIPWindowCoveringClusterGoToTiltPercentageParams *)params
-                   completionHandler:(StatusCompletion)completionHandler;
+- (void)subscribeAttributeNullableInt24uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableInt24uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeNullableInt32uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableInt32uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableInt32uWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                       params:(CHIPSubscribeParams * _Nullable)params
-                      subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                   endpoint:(NSNumber *)endpoint
-                                      queue:(dispatch_queue_t)queue
-                          completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNullableInt32uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableInt32uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePhysicalClosedLimitLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
+- (void)readAttributeNullableInt40uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableInt40uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableInt40uWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePhysicalClosedLimitLiftWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler;
-+ (void)readAttributePhysicalClosedLimitLiftWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNullableInt40uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableInt40uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributePhysicalClosedLimitTiltWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler;
+- (void)readAttributeNullableInt48uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableInt48uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableInt48uWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributePhysicalClosedLimitTiltWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler;
-+ (void)readAttributePhysicalClosedLimitTiltWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNullableInt48uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableInt48uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCurrentPositionLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeNullableInt56uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableInt56uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableInt56uWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCurrentPositionLiftWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentPositionLiftWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNullableInt56uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableInt56uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCurrentPositionTiltWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler;
+- (void)readAttributeNullableInt64uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableInt64uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableInt64uWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCurrentPositionTiltWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentPositionTiltWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNullableInt64uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableInt64uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNumberOfActuationsLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
+- (void)readAttributeNullableInt8sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableInt8sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableInt8sWithValue:(NSNumber * _Nullable)value
+                                      params:(CHIPWriteParams * _Nullable)params
+                           completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNumberOfActuationsLiftWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNumberOfActuationsLiftWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNullableInt8sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableInt8sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeNumberOfActuationsTiltWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
+- (void)readAttributeNullableInt16sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableInt16sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableInt16sWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeNumberOfActuationsTiltWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))reportHandler;
-+ (void)readAttributeNumberOfActuationsTiltWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNullableInt16sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableInt16sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeNullableInt24sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableInt24sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableInt24sWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeNullableInt24sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableInt24sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeConfigStatusWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeNullableInt32sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableInt32sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableInt32sWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeConfigStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeConfigStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNullableInt32sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableInt32sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCurrentPositionLiftPercentageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributeNullableInt40sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableInt40sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableInt40sWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCurrentPositionLiftPercentageWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                params:(CHIPSubscribeParams * _Nullable)params
-                                               subscriptionEstablished:
-                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentPositionLiftPercentageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                            endpoint:(NSNumber *)endpoint
-                                                               queue:(dispatch_queue_t)queue
-                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNullableInt40sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableInt40sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCurrentPositionTiltPercentageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler;
+- (void)readAttributeNullableInt48sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableInt48sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableInt48sWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCurrentPositionTiltPercentageWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                params:(CHIPSubscribeParams * _Nullable)params
-                                               subscriptionEstablished:
-                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentPositionTiltPercentageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                            endpoint:(NSNumber *)endpoint
-                                                               queue:(dispatch_queue_t)queue
-                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNullableInt48sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableInt48sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeOperationalStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler;
+- (void)readAttributeNullableInt56sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableInt56sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableInt56sWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeOperationalStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeOperationalStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNullableInt56sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableInt56sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTargetPositionLiftPercent100thsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeNullableInt64sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableInt64sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableInt64sWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTargetPositionLiftPercent100thsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                                 subscriptionEstablished:
-                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTargetPositionLiftPercent100thsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                              endpoint:(NSNumber *)endpoint
-                                                                 queue:(dispatch_queue_t)queue
-                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNullableInt64sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableInt64sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeTargetPositionTiltPercent100thsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler;
+- (void)readAttributeNullableEnum8WithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableEnum8WithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableEnum8WithValue:(NSNumber * _Nullable)value
+                                      params:(CHIPWriteParams * _Nullable)params
+                           completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeTargetPositionTiltPercent100thsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                                 subscriptionEstablished:
-                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))reportHandler;
-+ (void)readAttributeTargetPositionTiltPercent100thsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                              endpoint:(NSNumber *)endpoint
-                                                                 queue:(dispatch_queue_t)queue
-                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNullableEnum8WithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableEnum8WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeEndProductTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeNullableEnum16WithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                              NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableEnum16WithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableEnum16WithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeEndProductTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeNullableEnum16WithMinInterval:(NSNumber * _Nonnull)minInterval
                                             maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(CHIPSubscribeParams * _Nullable)params
                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                           reportHandler:
                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeEndProductTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeNullableEnum16WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                              endpoint:(NSNumber *)endpoint
                                                 queue:(dispatch_queue_t)queue
                                     completionHandler:
                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))completionHandler;
+- (void)readAttributeNullableFloatSingleWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableFloatSingleWithValue:(NSNumber * _Nullable)value
+                                 completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableFloatSingleWithValue:(NSNumber * _Nullable)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeNullableFloatSingleWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableFloatSingleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeNullableFloatDoubleWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableFloatDoubleWithValue:(NSNumber * _Nullable)value
+                                 completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableFloatDoubleWithValue:(NSNumber * _Nullable)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler;
+/**
+ * This API does not support setting autoResubscribe to NO in the
+ * CHIPSubscribeParams.
+ */
+- (void)subscribeAttributeNullableFloatDoubleWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableFloatDoubleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+
+- (void)readAttributeNullableOctetStringWithCompletionHandler:(void (^)(NSData * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableOctetStringWithValue:(NSData * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableOctetStringWithValue:(NSData * _Nullable)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCurrentPositionLiftPercent100thsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                                  subscriptionEstablished:
-                                                      (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                            reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentPositionLiftPercent100thsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                               endpoint:(NSNumber *)endpoint
-                                                                  queue:(dispatch_queue_t)queue
-                                                      completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNullableOctetStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableOctetStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))completionHandler;
+- (void)readAttributeNullableCharStringWithCompletionHandler:(void (^)(NSString * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableCharStringWithValue:(NSString * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableCharStringWithValue:(NSString * _Nullable)value
+                                           params:(CHIPWriteParams * _Nullable)params
+                                completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeCurrentPositionTiltPercent100thsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                                  subscriptionEstablished:
-                                                      (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                            reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))reportHandler;
-+ (void)readAttributeCurrentPositionTiltPercent100thsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                               endpoint:(NSNumber *)endpoint
-                                                                  queue:(dispatch_queue_t)queue
-                                                      completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNullableCharStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableCharStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeInstalledOpenLimitLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
+- (void)readAttributeNullableEnumAttrWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableEnumAttrWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableEnumAttrWithValue:(NSNumber * _Nullable)value
+                                         params:(CHIPWriteParams * _Nullable)params
+                              completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeInstalledOpenLimitLiftWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInstalledOpenLimitLiftWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNullableEnumAttrWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableEnumAttrWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeInstalledClosedLimitLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler;
+- (void)readAttributeNullableStructWithCompletionHandler:(void (^)(CHIPTestClusterClusterSimpleStruct * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableStructWithValue:(CHIPTestClusterClusterSimpleStruct * _Nullable)value
+                            completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableStructWithValue:(CHIPTestClusterClusterSimpleStruct * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeInstalledClosedLimitLiftWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInstalledClosedLimitLiftWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNullableStructWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:(void (^)(CHIPTestClusterClusterSimpleStruct * _Nullable value,
+                                                            NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableStructWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:(void (^)(CHIPTestClusterClusterSimpleStruct * _Nullable value,
+                                                          NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeInstalledOpenLimitTiltWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler;
+- (void)readAttributeNullableRangeRestrictedInt8uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableRangeRestrictedInt8uWithValue:(NSNumber * _Nullable)value
+                                          completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableRangeRestrictedInt8uWithValue:(NSNumber * _Nullable)value
+                                                     params:(CHIPWriteParams * _Nullable)params
+                                          completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeInstalledOpenLimitTiltWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInstalledOpenLimitTiltWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNullableRangeRestrictedInt8uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                              subscriptionEstablished:
+                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableRangeRestrictedInt8uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                           endpoint:(NSNumber *)endpoint
+                                                              queue:(dispatch_queue_t)queue
+                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeInstalledClosedLimitTiltWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler;
+- (void)readAttributeNullableRangeRestrictedInt8sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableRangeRestrictedInt8sWithValue:(NSNumber * _Nullable)value
+                                          completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableRangeRestrictedInt8sWithValue:(NSNumber * _Nullable)value
+                                                     params:(CHIPWriteParams * _Nullable)params
+                                          completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeInstalledClosedLimitTiltWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler;
-+ (void)readAttributeInstalledClosedLimitTiltWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNullableRangeRestrictedInt8sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                              subscriptionEstablished:
+                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableRangeRestrictedInt8sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                           endpoint:(NSNumber *)endpoint
+                                                              queue:(dispatch_queue_t)queue
+                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)writeAttributeModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeModeWithValue:(NSNumber * _Nonnull)value
-                             params:(CHIPWriteParams * _Nullable)params
-                  completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeNullableRangeRestrictedInt16uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableRangeRestrictedInt16uWithValue:(NSNumber * _Nullable)value
+                                           completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableRangeRestrictedInt16uWithValue:(NSNumber * _Nullable)value
+                                                      params:(CHIPWriteParams * _Nullable)params
+                                           completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                       params:(CHIPSubscribeParams * _Nullable)params
-                      subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                   endpoint:(NSNumber *)endpoint
-                                      queue:(dispatch_queue_t)queue
-                          completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNullableRangeRestrictedInt16uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                params:(CHIPSubscribeParams * _Nullable)params
+                                               subscriptionEstablished:
+                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableRangeRestrictedInt16uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                            endpoint:(NSNumber *)endpoint
+                                                               queue:(dispatch_queue_t)queue
+                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler;
 
-- (void)readAttributeSafetyStatusWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeNullableRangeRestrictedInt16sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler;
+- (void)writeAttributeNullableRangeRestrictedInt16sWithValue:(NSNumber * _Nullable)value
+                                           completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNullableRangeRestrictedInt16sWithValue:(NSNumber * _Nullable)value
+                                                      params:(CHIPWriteParams * _Nullable)params
+                                           completionHandler:(StatusCompletion)completionHandler;
 /**
  * This API does not support setting autoResubscribe to NO in the
  * CHIPSubscribeParams.
  */
-- (void)subscribeAttributeSafetyStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSafetyStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeNullableRangeRestrictedInt16sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                params:(CHIPSubscribeParams * _Nullable)params
+                                               subscriptionEstablished:
+                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))reportHandler;
++ (void)readAttributeNullableRangeRestrictedInt16sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                            endpoint:(NSNumber *)endpoint
+                                                               queue:(dispatch_queue_t)queue
+                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler;
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler;
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm
index d3c409b122e2af..363c3ac2684e38 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm
@@ -35,225 +35,85 @@
 using chip::Callback::Cancelable;
 using namespace chip::app::Clusters;
 // NOLINTBEGIN(clang-analyzer-cplusplus.NewDeleteLeaks): Linter is unable to locate the delete on these objects.
-@implementation CHIPAccessControl
+@implementation CHIPIdentify
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)readAttributeAclWithParams:(CHIPReadParams * _Nullable)params
-                 completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPAccessControlAclListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = AccessControl::Attributes::Acl::TypeInfo;
-            auto successFn = Callback<AccessControlAclListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue]);
-        });
-}
-
-- (void)writeAttributeAclWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeAclWithValue:(NSArray * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeAclWithValue:(NSArray * _Nonnull)value
-                            params:(CHIPWriteParams * _Nullable)params
-                 completionHandler:(StatusCompletion)completionHandler
+- (void)identifyWithParams:(CHIPIdentifyClusterIdentifyParams *)params completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    Identify::Commands::Identify::Type request;
     if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
+    request.identifyTime = params.identifyTime.unsignedShortValue;
 
-    new CHIPDefaultSuccessCallbackBridge(
+    new CHIPCommandSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
+        ^(id _Nullable value, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = AccessControl::Attributes::Acl::TypeInfo;
-            TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPAccessControlClusterAccessControlEntry class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (CHIPAccessControlClusterAccessControlEntry *) value[i_0];
-                        listHolder_0->mList[i_0].privilege
-                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].privilege)>>(
-                                element_0.privilege.unsignedCharValue);
-                        listHolder_0->mList[i_0].authMode
-                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].authMode)>>(
-                                element_0.authMode.unsignedCharValue);
-                        if (element_0.subjects == nil) {
-                            listHolder_0->mList[i_0].subjects.SetNull();
-                        } else {
-                            auto & nonNullValue_2 = listHolder_0->mList[i_0].subjects.SetNonNull();
-                            {
-                                using ListType_3 = std::remove_reference_t<decltype(nonNullValue_2)>;
-                                using ListMemberType_3 = ListMemberTypeGetter<ListType_3>::Type;
-                                if (element_0.subjects.count != 0) {
-                                    auto * listHolder_3 = new ListHolder<ListMemberType_3>(element_0.subjects.count);
-                                    if (listHolder_3 == nullptr || listHolder_3->mList == nullptr) {
-                                        return CHIP_ERROR_INVALID_ARGUMENT;
-                                    }
-                                    listFreer.add(listHolder_3);
-                                    for (size_t i_3 = 0; i_3 < element_0.subjects.count; ++i_3) {
-                                        if (![element_0.subjects[i_3] isKindOfClass:[NSNumber class]]) {
-                                            // Wrong kind of value.
-                                            return CHIP_ERROR_INVALID_ARGUMENT;
-                                        }
-                                        auto element_3 = (NSNumber *) element_0.subjects[i_3];
-                                        listHolder_3->mList[i_3] = element_3.unsignedLongLongValue;
-                                    }
-                                    nonNullValue_2 = ListType_3(listHolder_3->mList, element_0.subjects.count);
-                                } else {
-                                    nonNullValue_2 = ListType_3();
-                                }
-                            }
-                        }
-                        if (element_0.targets == nil) {
-                            listHolder_0->mList[i_0].targets.SetNull();
-                        } else {
-                            auto & nonNullValue_2 = listHolder_0->mList[i_0].targets.SetNonNull();
-                            {
-                                using ListType_3 = std::remove_reference_t<decltype(nonNullValue_2)>;
-                                using ListMemberType_3 = ListMemberTypeGetter<ListType_3>::Type;
-                                if (element_0.targets.count != 0) {
-                                    auto * listHolder_3 = new ListHolder<ListMemberType_3>(element_0.targets.count);
-                                    if (listHolder_3 == nullptr || listHolder_3->mList == nullptr) {
-                                        return CHIP_ERROR_INVALID_ARGUMENT;
-                                    }
-                                    listFreer.add(listHolder_3);
-                                    for (size_t i_3 = 0; i_3 < element_0.targets.count; ++i_3) {
-                                        if (![element_0.targets[i_3] isKindOfClass:[CHIPAccessControlClusterTarget class]]) {
-                                            // Wrong kind of value.
-                                            return CHIP_ERROR_INVALID_ARGUMENT;
-                                        }
-                                        auto element_3 = (CHIPAccessControlClusterTarget *) element_0.targets[i_3];
-                                        if (element_3.cluster == nil) {
-                                            listHolder_3->mList[i_3].cluster.SetNull();
-                                        } else {
-                                            auto & nonNullValue_5 = listHolder_3->mList[i_3].cluster.SetNonNull();
-                                            nonNullValue_5 = element_3.cluster.unsignedIntValue;
-                                        }
-                                        if (element_3.endpoint == nil) {
-                                            listHolder_3->mList[i_3].endpoint.SetNull();
-                                        } else {
-                                            auto & nonNullValue_5 = listHolder_3->mList[i_3].endpoint.SetNonNull();
-                                            nonNullValue_5 = element_3.endpoint.unsignedShortValue;
-                                        }
-                                        if (element_3.deviceType == nil) {
-                                            listHolder_3->mList[i_3].deviceType.SetNull();
-                                        } else {
-                                            auto & nonNullValue_5 = listHolder_3->mList[i_3].deviceType.SetNonNull();
-                                            nonNullValue_5 = element_3.deviceType.unsignedIntValue;
-                                        }
-                                    }
-                                    nonNullValue_2 = ListType_3(listHolder_3->mList, element_0.targets.count);
-                                } else {
-                                    nonNullValue_2 = ListType_3();
-                                }
-                            }
-                        }
-                        listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeAclWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                      params:(CHIPSubscribeParams * _Nullable)params
-                     subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                               reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)triggerEffectWithParams:(CHIPIdentifyClusterTriggerEffectParams *)params
+              completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPAccessControlAclListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    Identify::Commands::TriggerEffect::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.effectIdentifier
+        = static_cast<std::remove_reference_t<decltype(request.effectIdentifier)>>(params.effectIdentifier.unsignedCharValue);
+    request.effectVariant
+        = static_cast<std::remove_reference_t<decltype(request.effectVariant)>>(params.effectVariant.unsignedCharValue);
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
         ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = AccessControl::Attributes::Acl::TypeInfo;
-            auto successFn = Callback<AccessControlAclListAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAccessControlAclListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-+ (void)readAttributeAclWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                  endpoint:(NSNumber *)endpoint
-                                     queue:(dispatch_queue_t)queue
-                         completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeIdentifyTimeWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPAccessControlAclListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = AccessControl::Attributes::Acl::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<AccessControlAclListAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Identify::Attributes::IdentifyTime::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)readAttributeExtensionWithParams:(CHIPReadParams * _Nullable)params
-                       completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPAccessControlExtensionListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = AccessControl::Attributes::Extension::TypeInfo;
-            auto successFn = Callback<AccessControlExtensionListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue]);
-        });
-}
-
-- (void)writeAttributeExtensionWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeIdentifyTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeExtensionWithValue:(NSArray * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self writeAttributeIdentifyTimeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeExtensionWithValue:(NSArray * _Nonnull)value
-                                  params:(CHIPWriteParams * _Nullable)params
-                       completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeIdentifyTimeWithValue:(NSNumber * _Nonnull)value
+                                     params:(CHIPWriteParams * _Nullable)params
+                          completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -269,31 +129,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AccessControl::Attributes::Extension::TypeInfo;
+            using TypeInfo = Identify::Attributes::IdentifyTime::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPAccessControlClusterExtensionEntry class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (CHIPAccessControlClusterExtensionEntry *) value[i_0];
-                        listHolder_0->mList[i_0].data = [self asByteSpan:element_0.data];
-                        listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -301,137 +139,11 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeExtensionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPAccessControlExtensionListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = AccessControl::Attributes::Extension::TypeInfo;
-            auto successFn = Callback<AccessControlExtensionListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAccessControlExtensionListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeExtensionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPAccessControlExtensionListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = AccessControl::Attributes::Extension::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<AccessControlExtensionListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeSubjectsPerAccessControlEntryWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = AccessControl::Attributes::SubjectsPerAccessControlEntry::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeSubjectsPerAccessControlEntryWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                params:(CHIPSubscribeParams * _Nullable)params
-                                               subscriptionEstablished:
-                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))reportHandler
-{
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = AccessControl::Attributes::SubjectsPerAccessControlEntry::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeSubjectsPerAccessControlEntryWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                            endpoint:(NSNumber *)endpoint
-                                                               queue:(dispatch_queue_t)queue
-                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = AccessControl::Attributes::SubjectsPerAccessControlEntry::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeTargetsPerAccessControlEntryWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = AccessControl::Attributes::TargetsPerAccessControlEntry::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeTargetsPerAccessControlEntryWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeIdentifyTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -440,7 +152,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = AccessControl::Attributes::TargetsPerAccessControlEntry::TypeInfo;
+            using TypeInfo = Identify::Attributes::IdentifyTime::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -452,16 +164,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTargetsPerAccessControlEntryWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
++ (void)readAttributeIdentifyTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = AccessControl::Attributes::TargetsPerAccessControlEntry::TypeInfo;
+            using TypeInfo = Identify::Attributes::IdentifyTime::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -477,60 +189,58 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAccessControlEntriesPerFabricWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler
+- (void)readAttributeIdentifyTypeWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = AccessControl::Attributes::AccessControlEntriesPerFabric::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Identify::Attributes::IdentifyType::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAccessControlEntriesPerFabricWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                params:(CHIPSubscribeParams * _Nullable)params
-                                               subscriptionEstablished:
-                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeIdentifyTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = AccessControl::Attributes::AccessControlEntriesPerFabric::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Identify::Attributes::IdentifyType::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAccessControlEntriesPerFabricWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                            endpoint:(NSNumber *)endpoint
-                                                               queue:(dispatch_queue_t)queue
-                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler
++ (void)readAttributeIdentifyTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = AccessControl::Attributes::AccessControlEntriesPerFabric::TypeInfo;
+            using TypeInfo = Identify::Attributes::IdentifyType::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -543,10 +253,10 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPAccessControlGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPIdentifyGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = AccessControl::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<AccessControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Identify::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<IdentifyGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -560,19 +270,19 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
                                                 reportHandler:
                                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPAccessControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPIdentifyGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = AccessControl::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<AccessControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Identify::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<IdentifyGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAccessControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPIdentifyGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -585,17 +295,17 @@ + (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheC
                                           completionHandler:
                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPAccessControlGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPIdentifyGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = AccessControl::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = Identify::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<AccessControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<IdentifyGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -608,10 +318,10 @@ new CHIPAccessControlGeneratedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPAccessControlAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPIdentifyAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = AccessControl::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<AccessControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Identify::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<IdentifyAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -625,19 +335,19 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPAccessControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPIdentifyAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = AccessControl::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<AccessControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Identify::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<IdentifyAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAccessControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPIdentifyAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -650,17 +360,17 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPAccessControlAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPIdentifyAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = AccessControl::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = Identify::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<AccessControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<IdentifyAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -673,10 +383,10 @@ new CHIPAccessControlAcceptedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPAccessControlAttributeListListAttributeCallbackBridge(
+    new CHIPIdentifyAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = AccessControl::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<AccessControlAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Identify::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<IdentifyAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -688,19 +398,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPAccessControlAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPIdentifyAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = AccessControl::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<AccessControlAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Identify::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<IdentifyAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAccessControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPIdentifyAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -713,17 +423,17 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPAccessControlAttributeListListAttributeCallbackBridge(
+    new CHIPIdentifyAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = AccessControl::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = Identify::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<AccessControlAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<IdentifyAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -737,7 +447,7 @@ - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = AccessControl::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = Identify::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -757,7 +467,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = AccessControl::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Identify::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -777,7 +487,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = AccessControl::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Identify::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -797,7 +507,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = AccessControl::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = Identify::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -818,7 +528,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = AccessControl::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Identify::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -839,7 +549,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = AccessControl::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Identify::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -857,54 +567,142 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPAccountLogin
+@implementation CHIPGroups
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)getSetupPINWithParams:(CHIPAccountLoginClusterGetSetupPINParams *)params
-            completionHandler:(void (^)(CHIPAccountLoginClusterGetSetupPINResponseParams * _Nullable data,
-                                  NSError * _Nullable error))completionHandler
+- (void)addGroupWithParams:(CHIPGroupsClusterAddGroupParams *)params
+         completionHandler:
+             (void (^)(CHIPGroupsClusterAddGroupResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    AccountLogin::Commands::GetSetupPIN::Type request;
+    Groups::Commands::AddGroup::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    if (!timedInvokeTimeoutMs.HasValue()) {
-        timedInvokeTimeoutMs.SetValue(10000);
+    request.groupId = params.groupId.unsignedShortValue;
+    request.groupName = [self asCharSpan:params.groupName];
+
+    new CHIPGroupsClusterAddGroupResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPGroupsClusterAddGroupResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)viewGroupWithParams:(CHIPGroupsClusterViewGroupParams *)params
+          completionHandler:
+              (void (^)(CHIPGroupsClusterViewGroupResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    Groups::Commands::ViewGroup::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
     }
-    request.tempAccountIdentifier = [self asCharSpan:params.tempAccountIdentifier];
+    request.groupId = params.groupId.unsignedShortValue;
 
-    new CHIPAccountLoginClusterGetSetupPINResponseCallbackBridge(
+    new CHIPGroupsClusterViewGroupResponseCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPAccountLoginClusterGetSetupPINResponseCallbackType>::FromCancelable(success);
+            auto successFn = Callback<CHIPGroupsClusterViewGroupResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.InvokeCommand(
                 request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)loginWithParams:(CHIPAccountLoginClusterLoginParams *)params completionHandler:(StatusCompletion)completionHandler
+- (void)getGroupMembershipWithParams:(CHIPGroupsClusterGetGroupMembershipParams *)params
+                   completionHandler:(void (^)(CHIPGroupsClusterGetGroupMembershipResponseParams * _Nullable data,
+                                         NSError * _Nullable error))completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    AccountLogin::Commands::Login::Type request;
+    Groups::Commands::GetGroupMembership::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    if (!timedInvokeTimeoutMs.HasValue()) {
-        timedInvokeTimeoutMs.SetValue(10000);
+    {
+        using ListType_0 = std::remove_reference_t<decltype(request.groupList)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        if (params.groupList.count != 0) {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.groupList.count);
+            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return;
+            }
+            listFreer.add(listHolder_0);
+            for (size_t i_0 = 0; i_0 < params.groupList.count; ++i_0) {
+                if (![params.groupList[i_0] isKindOfClass:[NSNumber class]]) {
+                    // Wrong kind of value.
+                    return;
+                }
+                auto element_0 = (NSNumber *) params.groupList[i_0];
+                listHolder_0->mList[i_0] = element_0.unsignedShortValue;
+            }
+            request.groupList = ListType_0(listHolder_0->mList, params.groupList.count);
+        } else {
+            request.groupList = ListType_0();
+        }
+    }
+
+    new CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPGroupsClusterGetGroupMembershipResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)removeGroupWithParams:(CHIPGroupsClusterRemoveGroupParams *)params
+            completionHandler:
+                (void (^)(CHIPGroupsClusterRemoveGroupResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    Groups::Commands::RemoveGroup::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.groupId = params.groupId.unsignedShortValue;
+
+    new CHIPGroupsClusterRemoveGroupResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPGroupsClusterRemoveGroupResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)removeAllGroupsWithCompletionHandler:(StatusCompletion)completionHandler
+{
+    [self removeAllGroupsWithParams:nil completionHandler:completionHandler];
+}
+- (void)removeAllGroupsWithParams:(CHIPGroupsClusterRemoveAllGroupsParams * _Nullable)params
+                completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    Groups::Commands::RemoveAllGroups::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
     }
-    request.tempAccountIdentifier = [self asCharSpan:params.tempAccountIdentifier];
-    request.setupPIN = [self asCharSpan:params.setupPIN];
 
     new CHIPCommandSuccessCallbackBridge(
         self.callbackQueue,
@@ -919,24 +717,19 @@ new CHIPCommandSuccessCallbackBridge(
         });
 }
 
-- (void)logoutWithCompletionHandler:(StatusCompletion)completionHandler
-{
-    [self logoutWithParams:nil completionHandler:completionHandler];
-}
-- (void)logoutWithParams:(CHIPAccountLoginClusterLogoutParams * _Nullable)params
-       completionHandler:(StatusCompletion)completionHandler
+- (void)addGroupIfIdentifyingWithParams:(CHIPGroupsClusterAddGroupIfIdentifyingParams *)params
+                      completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    AccountLogin::Commands::Logout::Type request;
+    Groups::Commands::AddGroupIfIdentifying::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    if (!timedInvokeTimeoutMs.HasValue()) {
-        timedInvokeTimeoutMs.SetValue(10000);
-    }
+    request.groupId = params.groupId.unsignedShortValue;
+    request.groupName = [self asCharSpan:params.groupName];
 
     new CHIPCommandSuccessCallbackBridge(
         self.callbackQueue,
@@ -951,13 +744,74 @@ new CHIPCommandSuccessCallbackBridge(
         });
 }
 
+- (void)readAttributeNameSupportWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Groups::Attributes::NameSupport::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeNameSupportWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = Groups::Attributes::NameSupport::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeNameSupportWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Groups::Attributes::NameSupport::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPAccountLoginGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPGroupsGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = AccountLogin::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<AccountLoginGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Groups::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<GroupsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -971,19 +825,19 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
                                                 reportHandler:
                                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPAccountLoginGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPGroupsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = AccountLogin::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<AccountLoginGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Groups::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<GroupsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAccountLoginGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPGroupsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -996,17 +850,17 @@ + (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheC
                                           completionHandler:
                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPAccountLoginGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPGroupsGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = AccountLogin::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = Groups::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<AccountLoginGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<GroupsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -1019,10 +873,10 @@ new CHIPAccountLoginGeneratedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPAccountLoginAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPGroupsAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = AccountLogin::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<AccountLoginAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Groups::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<GroupsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -1036,19 +890,19 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPAccountLoginAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPGroupsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = AccountLogin::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<AccountLoginAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Groups::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<GroupsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAccountLoginAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPGroupsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -1061,17 +915,17 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPAccountLoginAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPGroupsAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = AccountLogin::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = Groups::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<AccountLoginAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<GroupsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -1084,10 +938,10 @@ new CHIPAccountLoginAcceptedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPAccountLoginAttributeListListAttributeCallbackBridge(
+    new CHIPGroupsAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = AccountLogin::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<AccountLoginAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Groups::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<GroupsAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -1099,19 +953,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPAccountLoginAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPGroupsAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = AccountLogin::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<AccountLoginAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Groups::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<GroupsAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAccountLoginAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPGroupsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -1124,31 +978,30 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPAccountLoginAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = AccountLogin::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<AccountLoginAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPGroupsAttributeListListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Groups::Attributes::AttributeList::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<GroupsAttributeListListAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = AccountLogin::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = Groups::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -1168,7 +1021,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = AccountLogin::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Groups::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -1188,7 +1041,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = AccountLogin::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Groups::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -1208,7 +1061,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = AccountLogin::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = Groups::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -1229,7 +1082,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = AccountLogin::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Groups::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -1250,7 +1103,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = AccountLogin::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Groups::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -1268,123 +1121,427 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPAdministratorCommissioning
+@implementation CHIPScenes
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)openCommissioningWindowWithParams:(CHIPAdministratorCommissioningClusterOpenCommissioningWindowParams *)params
-                        completionHandler:(StatusCompletion)completionHandler
+- (void)addSceneWithParams:(CHIPScenesClusterAddSceneParams *)params
+         completionHandler:
+             (void (^)(CHIPScenesClusterAddSceneResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    AdministratorCommissioning::Commands::OpenCommissioningWindow::Type request;
+    Scenes::Commands::AddScene::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    if (!timedInvokeTimeoutMs.HasValue()) {
-        timedInvokeTimeoutMs.SetValue(10000);
+    request.groupId = params.groupId.unsignedShortValue;
+    request.sceneId = params.sceneId.unsignedCharValue;
+    request.transitionTime = params.transitionTime.unsignedShortValue;
+    request.sceneName = [self asCharSpan:params.sceneName];
+    {
+        using ListType_0 = std::remove_reference_t<decltype(request.extensionFieldSets)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        if (params.extensionFieldSets.count != 0) {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.extensionFieldSets.count);
+            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return;
+            }
+            listFreer.add(listHolder_0);
+            for (size_t i_0 = 0; i_0 < params.extensionFieldSets.count; ++i_0) {
+                if (![params.extensionFieldSets[i_0] isKindOfClass:[CHIPScenesClusterExtensionFieldSet class]]) {
+                    // Wrong kind of value.
+                    return;
+                }
+                auto element_0 = (CHIPScenesClusterExtensionFieldSet *) params.extensionFieldSets[i_0];
+                listHolder_0->mList[i_0].clusterId = element_0.clusterId.unsignedIntValue;
+                {
+                    using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].attributeValueList)>;
+                    using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
+                    if (element_0.attributeValueList.count != 0) {
+                        auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.attributeValueList.count);
+                        if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
+                            return;
+                        }
+                        listFreer.add(listHolder_2);
+                        for (size_t i_2 = 0; i_2 < element_0.attributeValueList.count; ++i_2) {
+                            if (![element_0.attributeValueList[i_2] isKindOfClass:[CHIPScenesClusterAttributeValuePair class]]) {
+                                // Wrong kind of value.
+                                return;
+                            }
+                            auto element_2 = (CHIPScenesClusterAttributeValuePair *) element_0.attributeValueList[i_2];
+                            if (element_2.attributeId != nil) {
+                                auto & definedValue_4 = listHolder_2->mList[i_2].attributeId.Emplace();
+                                definedValue_4 = element_2.attributeId.unsignedIntValue;
+                            }
+                            {
+                                using ListType_4 = std::remove_reference_t<decltype(listHolder_2->mList[i_2].attributeValue)>;
+                                using ListMemberType_4 = ListMemberTypeGetter<ListType_4>::Type;
+                                if (element_2.attributeValue.count != 0) {
+                                    auto * listHolder_4 = new ListHolder<ListMemberType_4>(element_2.attributeValue.count);
+                                    if (listHolder_4 == nullptr || listHolder_4->mList == nullptr) {
+                                        return;
+                                    }
+                                    listFreer.add(listHolder_4);
+                                    for (size_t i_4 = 0; i_4 < element_2.attributeValue.count; ++i_4) {
+                                        if (![element_2.attributeValue[i_4] isKindOfClass:[NSNumber class]]) {
+                                            // Wrong kind of value.
+                                            return;
+                                        }
+                                        auto element_4 = (NSNumber *) element_2.attributeValue[i_4];
+                                        listHolder_4->mList[i_4] = element_4.unsignedCharValue;
+                                    }
+                                    listHolder_2->mList[i_2].attributeValue
+                                        = ListType_4(listHolder_4->mList, element_2.attributeValue.count);
+                                } else {
+                                    listHolder_2->mList[i_2].attributeValue = ListType_4();
+                                }
+                            }
+                        }
+                        listHolder_0->mList[i_0].attributeValueList
+                            = ListType_2(listHolder_2->mList, element_0.attributeValueList.count);
+                    } else {
+                        listHolder_0->mList[i_0].attributeValueList = ListType_2();
+                    }
+                }
+            }
+            request.extensionFieldSets = ListType_0(listHolder_0->mList, params.extensionFieldSets.count);
+        } else {
+            request.extensionFieldSets = ListType_0();
+        }
     }
-    request.commissioningTimeout = params.commissioningTimeout.unsignedShortValue;
-    request.PAKEVerifier = [self asByteSpan:params.pakeVerifier];
-    request.discriminator = params.discriminator.unsignedShortValue;
-    request.iterations = params.iterations.unsignedIntValue;
-    request.salt = [self asByteSpan:params.salt];
 
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+    new CHIPScenesClusterAddSceneResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPScenesClusterAddSceneResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.InvokeCommand(
                 request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)openBasicCommissioningWindowWithParams:(CHIPAdministratorCommissioningClusterOpenBasicCommissioningWindowParams *)params
-                             completionHandler:(StatusCompletion)completionHandler
+- (void)viewSceneWithParams:(CHIPScenesClusterViewSceneParams *)params
+          completionHandler:
+              (void (^)(CHIPScenesClusterViewSceneResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Type request;
+    Scenes::Commands::ViewScene::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    if (!timedInvokeTimeoutMs.HasValue()) {
-        timedInvokeTimeoutMs.SetValue(10000);
-    }
-    request.commissioningTimeout = params.commissioningTimeout.unsignedShortValue;
+    request.groupId = params.groupId.unsignedShortValue;
+    request.sceneId = params.sceneId.unsignedCharValue;
 
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+    new CHIPScenesClusterViewSceneResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPScenesClusterViewSceneResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.InvokeCommand(
                 request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)revokeCommissioningWithCompletionHandler:(StatusCompletion)completionHandler
+- (void)removeSceneWithParams:(CHIPScenesClusterRemoveSceneParams *)params
+            completionHandler:
+                (void (^)(CHIPScenesClusterRemoveSceneResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
-    [self revokeCommissioningWithParams:nil completionHandler:completionHandler];
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    Scenes::Commands::RemoveScene::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.groupId = params.groupId.unsignedShortValue;
+    request.sceneId = params.sceneId.unsignedCharValue;
+
+    new CHIPScenesClusterRemoveSceneResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPScenesClusterRemoveSceneResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
-- (void)revokeCommissioningWithParams:(CHIPAdministratorCommissioningClusterRevokeCommissioningParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler
+
+- (void)removeAllScenesWithParams:(CHIPScenesClusterRemoveAllScenesParams *)params
+                completionHandler:(void (^)(CHIPScenesClusterRemoveAllScenesResponseParams * _Nullable data,
+                                      NSError * _Nullable error))completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    AdministratorCommissioning::Commands::RevokeCommissioning::Type request;
+    Scenes::Commands::RemoveAllScenes::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    if (!timedInvokeTimeoutMs.HasValue()) {
-        timedInvokeTimeoutMs.SetValue(10000);
-    }
+    request.groupId = params.groupId.unsignedShortValue;
 
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+    new CHIPScenesClusterRemoveAllScenesResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPScenesClusterRemoveAllScenesResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.InvokeCommand(
                 request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)readAttributeWindowStatusWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)storeSceneWithParams:(CHIPScenesClusterStoreSceneParams *)params
+           completionHandler:
+               (void (^)(CHIPScenesClusterStoreSceneResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = AdministratorCommissioning::Attributes::WindowStatus::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    Scenes::Commands::StoreScene::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.groupId = params.groupId.unsignedShortValue;
+    request.sceneId = params.sceneId.unsignedCharValue;
+
+    new CHIPScenesClusterStoreSceneResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPScenesClusterStoreSceneResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-- (void)subscribeAttributeWindowStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)recallSceneWithParams:(CHIPScenesClusterRecallSceneParams *)params completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    Scenes::Commands::RecallScene::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.groupId = params.groupId.unsignedShortValue;
+    request.sceneId = params.sceneId.unsignedCharValue;
+    if (params.transitionTime != nil) {
+        auto & definedValue_0 = request.transitionTime.Emplace();
+        if (params.transitionTime == nil) {
+            definedValue_0.SetNull();
+        } else {
+            auto & nonNullValue_1 = definedValue_0.SetNonNull();
+            nonNullValue_1 = params.transitionTime.unsignedShortValue;
+        }
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)getSceneMembershipWithParams:(CHIPScenesClusterGetSceneMembershipParams *)params
+                   completionHandler:(void (^)(CHIPScenesClusterGetSceneMembershipResponseParams * _Nullable data,
+                                         NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    Scenes::Commands::GetSceneMembership::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.groupId = params.groupId.unsignedShortValue;
+
+    new CHIPScenesClusterGetSceneMembershipResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPScenesClusterGetSceneMembershipResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)enhancedAddSceneWithParams:(CHIPScenesClusterEnhancedAddSceneParams *)params
+                 completionHandler:(void (^)(CHIPScenesClusterEnhancedAddSceneResponseParams * _Nullable data,
+                                       NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    Scenes::Commands::EnhancedAddScene::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.groupId = params.groupId.unsignedShortValue;
+    request.sceneId = params.sceneId.unsignedCharValue;
+    request.transitionTime = params.transitionTime.unsignedShortValue;
+    request.sceneName = [self asCharSpan:params.sceneName];
+    {
+        using ListType_0 = std::remove_reference_t<decltype(request.extensionFieldSets)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        if (params.extensionFieldSets.count != 0) {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.extensionFieldSets.count);
+            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return;
+            }
+            listFreer.add(listHolder_0);
+            for (size_t i_0 = 0; i_0 < params.extensionFieldSets.count; ++i_0) {
+                if (![params.extensionFieldSets[i_0] isKindOfClass:[CHIPScenesClusterExtensionFieldSet class]]) {
+                    // Wrong kind of value.
+                    return;
+                }
+                auto element_0 = (CHIPScenesClusterExtensionFieldSet *) params.extensionFieldSets[i_0];
+                listHolder_0->mList[i_0].clusterId = element_0.clusterId.unsignedIntValue;
+                {
+                    using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].attributeValueList)>;
+                    using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
+                    if (element_0.attributeValueList.count != 0) {
+                        auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.attributeValueList.count);
+                        if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
+                            return;
+                        }
+                        listFreer.add(listHolder_2);
+                        for (size_t i_2 = 0; i_2 < element_0.attributeValueList.count; ++i_2) {
+                            if (![element_0.attributeValueList[i_2] isKindOfClass:[CHIPScenesClusterAttributeValuePair class]]) {
+                                // Wrong kind of value.
+                                return;
+                            }
+                            auto element_2 = (CHIPScenesClusterAttributeValuePair *) element_0.attributeValueList[i_2];
+                            if (element_2.attributeId != nil) {
+                                auto & definedValue_4 = listHolder_2->mList[i_2].attributeId.Emplace();
+                                definedValue_4 = element_2.attributeId.unsignedIntValue;
+                            }
+                            {
+                                using ListType_4 = std::remove_reference_t<decltype(listHolder_2->mList[i_2].attributeValue)>;
+                                using ListMemberType_4 = ListMemberTypeGetter<ListType_4>::Type;
+                                if (element_2.attributeValue.count != 0) {
+                                    auto * listHolder_4 = new ListHolder<ListMemberType_4>(element_2.attributeValue.count);
+                                    if (listHolder_4 == nullptr || listHolder_4->mList == nullptr) {
+                                        return;
+                                    }
+                                    listFreer.add(listHolder_4);
+                                    for (size_t i_4 = 0; i_4 < element_2.attributeValue.count; ++i_4) {
+                                        if (![element_2.attributeValue[i_4] isKindOfClass:[NSNumber class]]) {
+                                            // Wrong kind of value.
+                                            return;
+                                        }
+                                        auto element_4 = (NSNumber *) element_2.attributeValue[i_4];
+                                        listHolder_4->mList[i_4] = element_4.unsignedCharValue;
+                                    }
+                                    listHolder_2->mList[i_2].attributeValue
+                                        = ListType_4(listHolder_4->mList, element_2.attributeValue.count);
+                                } else {
+                                    listHolder_2->mList[i_2].attributeValue = ListType_4();
+                                }
+                            }
+                        }
+                        listHolder_0->mList[i_0].attributeValueList
+                            = ListType_2(listHolder_2->mList, element_0.attributeValueList.count);
+                    } else {
+                        listHolder_0->mList[i_0].attributeValueList = ListType_2();
+                    }
+                }
+            }
+            request.extensionFieldSets = ListType_0(listHolder_0->mList, params.extensionFieldSets.count);
+        } else {
+            request.extensionFieldSets = ListType_0();
+        }
+    }
+
+    new CHIPScenesClusterEnhancedAddSceneResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPScenesClusterEnhancedAddSceneResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)enhancedViewSceneWithParams:(CHIPScenesClusterEnhancedViewSceneParams *)params
+                  completionHandler:(void (^)(CHIPScenesClusterEnhancedViewSceneResponseParams * _Nullable data,
+                                        NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    Scenes::Commands::EnhancedViewScene::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.groupId = params.groupId.unsignedShortValue;
+    request.sceneId = params.sceneId.unsignedCharValue;
+
+    new CHIPScenesClusterEnhancedViewSceneResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPScenesClusterEnhancedViewSceneResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)copySceneWithParams:(CHIPScenesClusterCopySceneParams *)params
+          completionHandler:
+              (void (^)(CHIPScenesClusterCopySceneResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    Scenes::Commands::CopyScene::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.mode = static_cast<std::remove_reference_t<decltype(request.mode)>>(params.mode.unsignedCharValue);
+    request.groupIdFrom = params.groupIdFrom.unsignedShortValue;
+    request.sceneIdFrom = params.sceneIdFrom.unsignedCharValue;
+    request.groupIdTo = params.groupIdTo.unsignedShortValue;
+    request.sceneIdTo = params.sceneIdTo.unsignedCharValue;
+
+    new CHIPScenesClusterCopySceneResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPScenesClusterCopySceneResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)readAttributeSceneCountWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Scenes::Attributes::SceneCount::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeSceneCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -1393,7 +1550,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = AdministratorCommissioning::Attributes::WindowStatus::TypeInfo;
+            using TypeInfo = Scenes::Attributes::SceneCount::TypeInfo;
             auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -1405,16 +1562,15 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeWindowStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeSceneCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = AdministratorCommissioning::Attributes::WindowStatus::TypeInfo;
+            using TypeInfo = Scenes::Attributes::SceneCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -1430,23 +1586,22 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeAdminFabricIndexWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeCurrentSceneWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = AdministratorCommissioning::Attributes::AdminFabricIndex::TypeInfo;
+        using TypeInfo = Scenes::Attributes::CurrentScene::TypeInfo;
         auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAdminFabricIndexWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentSceneWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -1455,7 +1610,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = AdministratorCommissioning::Attributes::AdminFabricIndex::TypeInfo;
+            using TypeInfo = Scenes::Attributes::CurrentScene::TypeInfo;
             auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -1467,16 +1622,16 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAdminFabricIndexWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCurrentSceneWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = AdministratorCommissioning::Attributes::AdminFabricIndex::TypeInfo;
+            using TypeInfo = Scenes::Attributes::CurrentScene::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -1492,23 +1647,22 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeAdminVendorIdWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeCurrentGroupWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = AdministratorCommissioning::Attributes::AdminVendorId::TypeInfo;
+        using TypeInfo = Scenes::Attributes::CurrentGroup::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAdminVendorIdWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentGroupWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -1517,7 +1671,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = AdministratorCommissioning::Attributes::AdminVendorId::TypeInfo;
+            using TypeInfo = Scenes::Attributes::CurrentGroup::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -1529,16 +1683,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAdminVendorIdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCurrentGroupWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = AdministratorCommissioning::Attributes::AdminVendorId::TypeInfo;
+            using TypeInfo = Scenes::Attributes::CurrentGroup::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -1554,193 +1708,311 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeSceneValidWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = AdministratorCommissioning::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<AdministratorCommissioningGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Scenes::Attributes::SceneValid::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSceneValidWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = AdministratorCommissioning::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<AdministratorCommissioningGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Scenes::Attributes::SceneValid::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge::
-                    OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeSceneValidWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = AdministratorCommissioning::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<AdministratorCommissioningGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Scenes::Attributes::SceneValid::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeNameSupportWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = AdministratorCommissioning::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<AdministratorCommissioningAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Scenes::Attributes::NameSupport::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNameSupportWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = AdministratorCommissioning::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<AdministratorCommissioningAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Scenes::Attributes::NameSupport::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNameSupportWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = AdministratorCommissioning::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<AdministratorCommissioningAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Scenes::Attributes::NameSupport::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeLastConfiguredByWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPAdministratorCommissioningAttributeListListAttributeCallbackBridge(
+    new CHIPNullableInt64uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = AdministratorCommissioning::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<AdministratorCommissioningAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Scenes::Attributes::LastConfiguredBy::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeLastConfiguredByWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPAdministratorCommissioningAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = AdministratorCommissioning::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<AdministratorCommissioningAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Scenes::Attributes::LastConfiguredBy::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAdministratorCommissioningAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeLastConfiguredByWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPAdministratorCommissioningAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = AdministratorCommissioning::Attributes::AttributeList::TypeInfo;
+    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Scenes::Attributes::LastConfiguredBy::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
+{
+    new CHIPScenesGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Scenes::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<ScenesGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPScenesGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = Scenes::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<ScenesGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPScenesGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPScenesGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = Scenes::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<AdministratorCommissioningAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<ScenesGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
+{
+    new CHIPScenesAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Scenes::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<ScenesAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPScenesAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = Scenes::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<ScenesAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPScenesAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPScenesAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = Scenes::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<ScenesAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -1750,11 +2022,73 @@ new CHIPAdministratorCommissioningAttributeListListAttributeCallbackBridge(
         });
 }
 
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPScenesAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Scenes::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<ScenesAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPScenesAttributeListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = Scenes::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<ScenesAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPScenesAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPScenesAttributeListListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Scenes::Attributes::AttributeList::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<ScenesAttributeListListAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = AdministratorCommissioning::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = Scenes::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -1774,7 +2108,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = AdministratorCommissioning::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Scenes::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -1794,7 +2128,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = AdministratorCommissioning::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Scenes::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -1814,7 +2148,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = AdministratorCommissioning::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = Scenes::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -1835,7 +2169,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = AdministratorCommissioning::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Scenes::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -1856,7 +2190,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = AdministratorCommissioning::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Scenes::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -1874,124 +2208,232 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPApplicationBasic
+@implementation CHIPOnOff
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)readAttributeVendorNameWithCompletionHandler:(void (^)(
-                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)offWithCompletionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ApplicationBasic::Attributes::VendorName::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    [self offWithParams:nil completionHandler:completionHandler];
+}
+- (void)offWithParams:(CHIPOnOffClusterOffParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    OnOff::Commands::Off::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-- (void)subscribeAttributeVendorNameWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)onWithCompletionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+    [self onWithParams:nil completionHandler:completionHandler];
+}
+- (void)onWithParams:(CHIPOnOffClusterOnParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    OnOff::Commands::On::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
         ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = ApplicationBasic::Attributes::VendorName::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)toggleWithCompletionHandler:(StatusCompletion)completionHandler
+{
+    [self toggleWithParams:nil completionHandler:completionHandler];
+}
+- (void)toggleWithParams:(CHIPOnOffClusterToggleParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    OnOff::Commands::Toggle::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
         },
-        subscriptionEstablishedHandler);
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-+ (void)readAttributeVendorNameWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)offWithEffectWithParams:(CHIPOnOffClusterOffWithEffectParams *)params completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ApplicationBasic::Attributes::VendorName::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    OnOff::Commands::OffWithEffect::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+    }
+    request.effectId = static_cast<std::remove_reference_t<decltype(request.effectId)>>(params.effectId.unsignedCharValue);
+    request.effectVariant
+        = static_cast<std::remove_reference_t<decltype(request.effectVariant)>>(params.effectVariant.unsignedCharValue);
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-- (void)readAttributeVendorIDWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)onWithRecallGlobalSceneWithCompletionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ApplicationBasic::Attributes::VendorID::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    [self onWithRecallGlobalSceneWithParams:nil completionHandler:completionHandler];
+}
+- (void)onWithRecallGlobalSceneWithParams:(CHIPOnOffClusterOnWithRecallGlobalSceneParams * _Nullable)params
+                        completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    OnOff::Commands::OnWithRecallGlobalScene::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)onWithTimedOffWithParams:(CHIPOnOffClusterOnWithTimedOffParams *)params
+               completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    OnOff::Commands::OnWithTimedOff::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.onOffControl
+        = static_cast<std::remove_reference_t<decltype(request.onOffControl)>>(params.onOffControl.unsignedCharValue);
+    request.onTime = params.onTime.unsignedShortValue;
+    request.offWaitTime = params.offWaitTime.unsignedShortValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)readAttributeOnOffWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = OnOff::Attributes::OnOff::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeVendorIDWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOnOffWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                        params:(CHIPSubscribeParams * _Nullable)params
+                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ApplicationBasic::Attributes::VendorID::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OnOff::Attributes::OnOff::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeVendorIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOnOffWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                    endpoint:(NSNumber *)endpoint
+                                       queue:(dispatch_queue_t)queue
+                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ApplicationBasic::Attributes::VendorID::TypeInfo;
+            using TypeInfo = OnOff::Attributes::OnOff::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -2001,59 +2443,59 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeApplicationNameWithCompletionHandler:(void (^)(NSString * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeGlobalSceneControlWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ApplicationBasic::Attributes::ApplicationName::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = OnOff::Attributes::GlobalSceneControl::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeApplicationNameWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGlobalSceneControlWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ApplicationBasic::Attributes::ApplicationName::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OnOff::Attributes::GlobalSceneControl::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeApplicationNameWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGlobalSceneControlWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ApplicationBasic::Attributes::ApplicationName::TypeInfo;
+            using TypeInfo = OnOff::Attributes::GlobalSceneControl::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -2063,22 +2505,53 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
-- (void)readAttributeProductIDWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeOnTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ApplicationBasic::Attributes::ProductID::TypeInfo;
+        using TypeInfo = OnOff::Attributes::OnTime::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeProductIDWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeOnTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeOnTimeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeOnTimeWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = OnOff::Attributes::OnTime::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeOnTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -2087,7 +2560,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ApplicationBasic::Attributes::ProductID::TypeInfo;
+            using TypeInfo = OnOff::Attributes::OnTime::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -2099,15 +2572,15 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeProductIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOnTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ApplicationBasic::Attributes::ProductID::TypeInfo;
+            using TypeInfo = OnOff::Attributes::OnTime::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -2123,186 +2596,90 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeApplicationWithCompletionHandler:
-    (void (^)(CHIPApplicationBasicClusterApplicationBasicApplication * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPApplicationBasicApplicationStructAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ApplicationBasic::Attributes::Application::TypeInfo;
-            auto successFn = Callback<ApplicationBasicApplicationStructAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeApplicationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:
-                                           (void (^)(CHIPApplicationBasicClusterApplicationBasicApplication * _Nullable value,
-                                               NSError * _Nullable error))reportHandler
+- (void)readAttributeOffWaitTimeWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPApplicationBasicApplicationStructAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = ApplicationBasic::Attributes::Application::TypeInfo;
-            auto successFn = Callback<ApplicationBasicApplicationStructAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPApplicationBasicApplicationStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = OnOff::Attributes::OffWaitTime::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-+ (void)readAttributeApplicationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(CHIPApplicationBasicClusterApplicationBasicApplication * _Nullable value,
-                                         NSError * _Nullable error))completionHandler
+- (void)writeAttributeOffWaitTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPApplicationBasicApplicationStructAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = ApplicationBasic::Attributes::Application::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ApplicationBasicApplicationStructAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+    [self writeAttributeOffWaitTimeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-
-- (void)readAttributeStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeOffWaitTimeWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPApplicationBasicClusterApplicationStatusEnumAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ApplicationBasic::Attributes::Status::TypeInfo;
-            auto successFn = Callback<ApplicationBasicClusterApplicationStatusEnumAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
 
-- (void)subscribeAttributeStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPApplicationBasicClusterApplicationStatusEnumAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
         ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = ApplicationBasic::Attributes::Status::TypeInfo;
-            auto successFn = Callback<ApplicationBasicClusterApplicationStatusEnumAttributeCallback>::FromCancelable(success);
+            ListFreer listFreer;
+            using TypeInfo = OnOff::Attributes::OffWaitTime::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPApplicationBasicClusterApplicationStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPApplicationBasicClusterApplicationStatusEnumAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = ApplicationBasic::Attributes::Status::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ApplicationBasicClusterApplicationStatusEnumAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)readAttributeApplicationVersionWithCompletionHandler:(void (^)(NSString * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler
-{
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ApplicationBasic::Attributes::ApplicationVersion::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeApplicationVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOffWaitTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ApplicationBasic::Attributes::ApplicationVersion::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OnOff::Attributes::OffWaitTime::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeApplicationVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOffWaitTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ApplicationBasic::Attributes::ApplicationVersion::TypeInfo;
+            using TypeInfo = OnOff::Attributes::OffWaitTime::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -2312,61 +2689,97 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
-- (void)readAttributeAllowedVendorListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeStartUpOnOffWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPApplicationBasicAllowedVendorListListAttributeCallbackBridge(
+    new CHIPNullableOnOffClusterOnOffStartUpOnOffAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ApplicationBasic::Attributes::AllowedVendorList::TypeInfo;
-            auto successFn = Callback<ApplicationBasicAllowedVendorListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OnOff::Attributes::StartUpOnOff::TypeInfo;
+            auto successFn = Callback<NullableOnOffClusterOnOffStartUpOnOffAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAllowedVendorListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeStartUpOnOffWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPApplicationBasicAllowedVendorListListAttributeCallbackSubscriptionBridge(
+    [self writeAttributeStartUpOnOffWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeStartUpOnOffWithValue:(NSNumber * _Nullable)value
+                                     params:(CHIPWriteParams * _Nullable)params
+                          completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = OnOff::Attributes::StartUpOnOff::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeStartUpOnOffWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableOnOffClusterOnOffStartUpOnOffAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ApplicationBasic::Attributes::AllowedVendorList::TypeInfo;
-            auto successFn = Callback<ApplicationBasicAllowedVendorListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OnOff::Attributes::StartUpOnOff::TypeInfo;
+            auto successFn = Callback<NullableOnOffClusterOnOffStartUpOnOffAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPApplicationBasicAllowedVendorListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableOnOffClusterOnOffStartUpOnOffAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAllowedVendorListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeStartUpOnOffWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPApplicationBasicAllowedVendorListListAttributeCallbackBridge(
+    new CHIPNullableOnOffClusterOnOffStartUpOnOffAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = ApplicationBasic::Attributes::AllowedVendorList::TypeInfo;
+                using TypeInfo = OnOff::Attributes::StartUpOnOff::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ApplicationBasicAllowedVendorListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<NullableOnOffClusterOnOffStartUpOnOffAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -2379,10 +2792,10 @@ new CHIPApplicationBasicAllowedVendorListListAttributeCallbackBridge(
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPApplicationBasicGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPOnOffGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ApplicationBasic::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<ApplicationBasicGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OnOff::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<OnOffGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -2396,19 +2809,19 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
                                                 reportHandler:
                                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPApplicationBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPOnOffGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ApplicationBasic::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<ApplicationBasicGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OnOff::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<OnOffGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPApplicationBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPOnOffGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -2421,17 +2834,17 @@ + (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheC
                                           completionHandler:
                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPApplicationBasicGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPOnOffGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = ApplicationBasic::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = OnOff::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ApplicationBasicGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<OnOffGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -2444,10 +2857,10 @@ new CHIPApplicationBasicGeneratedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPApplicationBasicAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPOnOffAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ApplicationBasic::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<ApplicationBasicAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OnOff::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<OnOffAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -2461,19 +2874,19 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPApplicationBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPOnOffAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ApplicationBasic::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<ApplicationBasicAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OnOff::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<OnOffAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPApplicationBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPOnOffAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -2486,17 +2899,17 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPApplicationBasicAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPOnOffAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = ApplicationBasic::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = OnOff::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ApplicationBasicAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<OnOffAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -2509,10 +2922,10 @@ new CHIPApplicationBasicAcceptedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPApplicationBasicAttributeListListAttributeCallbackBridge(
+    new CHIPOnOffAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ApplicationBasic::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<ApplicationBasicAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OnOff::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<OnOffAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -2524,19 +2937,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPApplicationBasicAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPOnOffAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ApplicationBasic::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<ApplicationBasicAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OnOff::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<OnOffAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPApplicationBasicAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPOnOffAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -2549,31 +2962,30 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPApplicationBasicAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = ApplicationBasic::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ApplicationBasicAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPOnOffAttributeListListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = OnOff::Attributes::AttributeList::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<OnOffAttributeListListAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ApplicationBasic::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = OnOff::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -2593,7 +3005,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ApplicationBasic::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = OnOff::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -2613,7 +3025,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ApplicationBasic::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = OnOff::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -2633,7 +3045,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ApplicationBasic::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = OnOff::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -2654,7 +3066,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ApplicationBasic::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = OnOff::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -2675,7 +3087,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ApplicationBasic::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = OnOff::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -2693,173 +3105,91 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPApplicationLauncher
+@implementation CHIPOnOffSwitchConfiguration
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)launchAppWithParams:(CHIPApplicationLauncherClusterLaunchAppParams *)params
-          completionHandler:(void (^)(CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable data,
-                                NSError * _Nullable error))completionHandler
+- (void)readAttributeSwitchTypeWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    ApplicationLauncher::Commands::LaunchApp::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.application.catalogVendorId = params.application.catalogVendorId.unsignedShortValue;
-    request.application.applicationId = [self asCharSpan:params.application.applicationId];
-    if (params.data != nil) {
-        auto & definedValue_0 = request.data.Emplace();
-        definedValue_0 = [self asByteSpan:params.data];
-    }
-
-    new CHIPApplicationLauncherClusterLauncherResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPApplicationLauncherClusterLauncherResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = OnOffSwitchConfiguration::Attributes::SwitchType::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)stopAppWithParams:(CHIPApplicationLauncherClusterStopAppParams *)params
-        completionHandler:(void (^)(CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable data,
-                              NSError * _Nullable error))completionHandler
+- (void)subscribeAttributeSwitchTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    ApplicationLauncher::Commands::StopApp::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.application.catalogVendorId = params.application.catalogVendorId.unsignedShortValue;
-    request.application.applicationId = [self asCharSpan:params.application.applicationId];
-
-    new CHIPApplicationLauncherClusterLauncherResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPApplicationLauncherClusterLauncherResponseCallbackType>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = OnOffSwitchConfiguration::Attributes::SwitchType::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
 
-- (void)hideAppWithParams:(CHIPApplicationLauncherClusterHideAppParams *)params
-        completionHandler:(void (^)(CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable data,
-                              NSError * _Nullable error))completionHandler
++ (void)readAttributeSwitchTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    ApplicationLauncher::Commands::HideApp::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.application.catalogVendorId = params.application.catalogVendorId.unsignedShortValue;
-    request.application.applicationId = [self asCharSpan:params.application.applicationId];
-
-    new CHIPApplicationLauncherClusterLauncherResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPApplicationLauncherClusterLauncherResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)readAttributeCatalogListWithCompletionHandler:(void (^)(
-                                                          NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPApplicationLauncherCatalogListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ApplicationLauncher::Attributes::CatalogList::TypeInfo;
-            auto successFn = Callback<ApplicationLauncherCatalogListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeCatalogListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPApplicationLauncherCatalogListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = ApplicationLauncher::Attributes::CatalogList::TypeInfo;
-            auto successFn = Callback<ApplicationLauncherCatalogListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPApplicationLauncherCatalogListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeCatalogListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPApplicationLauncherCatalogListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = ApplicationLauncher::Attributes::CatalogList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ApplicationLauncherCatalogListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = OnOffSwitchConfiguration::Attributes::SwitchType::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeCurrentAppWithCompletionHandler:(void (^)(CHIPApplicationLauncherClusterApplicationEP * _Nullable value,
-                                                         NSError * _Nullable error))completionHandler
+- (void)readAttributeSwitchActionsWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPApplicationLauncherCurrentAppStructAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ApplicationLauncher::Attributes::CurrentApp::TypeInfo;
-            auto successFn = Callback<ApplicationLauncherCurrentAppStructAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = OnOffSwitchConfiguration::Attributes::SwitchActions::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)writeAttributeCurrentAppWithValue:(CHIPApplicationLauncherClusterApplicationEP * _Nullable)value
-                        completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSwitchActionsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeCurrentAppWithValue:(CHIPApplicationLauncherClusterApplicationEP * _Nullable) value
-                                     params:nil
-                          completionHandler:completionHandler];
+    [self writeAttributeSwitchActionsWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeCurrentAppWithValue:(CHIPApplicationLauncherClusterApplicationEP * _Nullable)value
-                                   params:(CHIPWriteParams * _Nullable)params
-                        completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSwitchActionsWithValue:(NSNumber * _Nonnull)value
+                                      params:(CHIPWriteParams * _Nullable)params
+                           completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -2875,19 +3205,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ApplicationLauncher::Attributes::CurrentApp::TypeInfo;
+            using TypeInfo = OnOffSwitchConfiguration::Attributes::SwitchActions::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0.application.catalogVendorId = value.application.catalogVendorId.unsignedShortValue;
-                nonNullValue_0.application.applicationId = [self asCharSpan:value.application.applicationId];
-                if (value.endpoint != nil) {
-                    auto & definedValue_2 = nonNullValue_0.endpoint.Emplace();
-                    definedValue_2 = value.endpoint.unsignedShortValue;
-                }
-            }
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -2895,65 +3215,64 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeCurrentAppWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(CHIPApplicationLauncherClusterApplicationEP * _Nullable value,
-                                                        NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSwitchActionsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPApplicationLauncherCurrentAppStructAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ApplicationLauncher::Attributes::CurrentApp::TypeInfo;
-            auto successFn = Callback<ApplicationLauncherCurrentAppStructAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OnOffSwitchConfiguration::Attributes::SwitchActions::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPApplicationLauncherCurrentAppStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentAppWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(CHIPApplicationLauncherClusterApplicationEP * _Nullable value,
-                                                      NSError * _Nullable error))completionHandler
++ (void)readAttributeSwitchActionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPApplicationLauncherCurrentAppStructAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = ApplicationLauncher::Attributes::CurrentApp::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ApplicationLauncherCurrentAppStructAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = OnOffSwitchConfiguration::Attributes::SwitchActions::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ApplicationLauncher::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<ApplicationLauncherGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OnOffSwitchConfiguration::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<OnOffSwitchConfigurationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -2967,20 +3286,20 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
                                                 reportHandler:
                                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ApplicationLauncher::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<ApplicationLauncherGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OnOffSwitchConfiguration::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<OnOffSwitchConfigurationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -2992,17 +3311,18 @@ + (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheC
                                           completionHandler:
                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = ApplicationLauncher::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = OnOffSwitchConfiguration::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ApplicationLauncherGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn
+                    = Callback<OnOffSwitchConfigurationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -3015,10 +3335,10 @@ new CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ApplicationLauncher::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<ApplicationLauncherAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OnOffSwitchConfiguration::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<OnOffSwitchConfigurationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -3032,20 +3352,20 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ApplicationLauncher::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<ApplicationLauncherAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OnOffSwitchConfiguration::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<OnOffSwitchConfigurationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -3057,17 +3377,18 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = ApplicationLauncher::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = OnOffSwitchConfiguration::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ApplicationLauncherAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn
+                    = Callback<OnOffSwitchConfigurationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -3080,10 +3401,10 @@ new CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPApplicationLauncherAttributeListListAttributeCallbackBridge(
+    new CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ApplicationLauncher::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<ApplicationLauncherAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OnOffSwitchConfiguration::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<OnOffSwitchConfigurationAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -3095,19 +3416,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPApplicationLauncherAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ApplicationLauncher::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<ApplicationLauncherAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OnOffSwitchConfiguration::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<OnOffSwitchConfigurationAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPApplicationLauncherAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -3120,17 +3441,17 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPApplicationLauncherAttributeListListAttributeCallbackBridge(
+    new CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = ApplicationLauncher::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = OnOffSwitchConfiguration::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ApplicationLauncherAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<OnOffSwitchConfigurationAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -3144,7 +3465,7 @@ - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ApplicationLauncher::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = OnOffSwitchConfiguration::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -3164,7 +3485,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ApplicationLauncher::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = OnOffSwitchConfiguration::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -3184,7 +3505,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ApplicationLauncher::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = OnOffSwitchConfiguration::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -3204,7 +3525,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ApplicationLauncher::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = OnOffSwitchConfiguration::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -3225,7 +3546,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ApplicationLauncher::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = OnOffSwitchConfiguration::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -3246,7 +3567,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ApplicationLauncher::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = OnOffSwitchConfiguration::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -3264,25 +3585,28 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPAudioOutput
+@implementation CHIPLevelControl
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)selectOutputWithParams:(CHIPAudioOutputClusterSelectOutputParams *)params
-             completionHandler:(StatusCompletion)completionHandler
+- (void)moveToLevelWithParams:(CHIPLevelControlClusterMoveToLevelParams *)params
+            completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    AudioOutput::Commands::SelectOutput::Type request;
+    LevelControl::Commands::MoveToLevel::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    request.index = params.index.unsignedCharValue;
+    request.level = params.level.unsignedCharValue;
+    request.transitionTime = params.transitionTime.unsignedShortValue;
+    request.optionMask = params.optionMask.unsignedCharValue;
+    request.optionOverride = params.optionOverride.unsignedCharValue;
 
     new CHIPCommandSuccessCallbackBridge(
         self.callbackQueue,
@@ -3297,19 +3621,20 @@ new CHIPCommandSuccessCallbackBridge(
         });
 }
 
-- (void)renameOutputWithParams:(CHIPAudioOutputClusterRenameOutputParams *)params
-             completionHandler:(StatusCompletion)completionHandler
+- (void)moveWithParams:(CHIPLevelControlClusterMoveParams *)params completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    AudioOutput::Commands::RenameOutput::Type request;
+    LevelControl::Commands::Move::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    request.index = params.index.unsignedCharValue;
-    request.name = [self asCharSpan:params.name];
+    request.moveMode = static_cast<std::remove_reference_t<decltype(request.moveMode)>>(params.moveMode.unsignedCharValue);
+    request.rate = params.rate.unsignedCharValue;
+    request.optionMask = params.optionMask.unsignedCharValue;
+    request.optionOverride = params.optionOverride.unsignedCharValue;
 
     new CHIPCommandSuccessCallbackBridge(
         self.callbackQueue,
@@ -3324,374 +3649,312 @@ new CHIPCommandSuccessCallbackBridge(
         });
 }
 
-- (void)readAttributeOutputListWithCompletionHandler:(void (^)(
-                                                         NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)stepWithParams:(CHIPLevelControlClusterStepParams *)params completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPAudioOutputOutputListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = AudioOutput::Attributes::OutputList::TypeInfo;
-            auto successFn = Callback<AudioOutputOutputListListAttributeCallback>::FromCancelable(success);
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    LevelControl::Commands::Step::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.stepMode = static_cast<std::remove_reference_t<decltype(request.stepMode)>>(params.stepMode.unsignedCharValue);
+    request.stepSize = params.stepSize.unsignedCharValue;
+    request.transitionTime = params.transitionTime.unsignedShortValue;
+    request.optionMask = params.optionMask.unsignedCharValue;
+    request.optionOverride = params.optionOverride.unsignedCharValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeOutputListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)stopWithParams:(CHIPLevelControlClusterStopParams *)params completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPAudioOutputOutputListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    LevelControl::Commands::Stop::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.optionMask = params.optionMask.unsignedCharValue;
+    request.optionOverride = params.optionOverride.unsignedCharValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
         ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = AudioOutput::Attributes::OutputList::TypeInfo;
-            auto successFn = Callback<AudioOutputOutputListListAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAudioOutputOutputListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeOutputListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPAudioOutputOutputListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = AudioOutput::Attributes::OutputList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<AudioOutputOutputListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)readAttributeCurrentOutputWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)moveToLevelWithOnOffWithParams:(CHIPLevelControlClusterMoveToLevelWithOnOffParams *)params
+                     completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = AudioOutput::Attributes::CurrentOutput::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    LevelControl::Commands::MoveToLevelWithOnOff::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.level = params.level.unsignedCharValue;
+    request.transitionTime = params.transitionTime.unsignedShortValue;
 
-- (void)subscribeAttributeCurrentOutputWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
         ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = AudioOutput::Attributes::CurrentOutput::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-+ (void)readAttributeCurrentOutputWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)moveWithOnOffWithParams:(CHIPLevelControlClusterMoveWithOnOffParams *)params
+              completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = AudioOutput::Attributes::CurrentOutput::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    LevelControl::Commands::MoveWithOnOff::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
+    }
+    request.moveMode = static_cast<std::remove_reference_t<decltype(request.moveMode)>>(params.moveMode.unsignedCharValue);
+    request.rate = params.rate.unsignedCharValue;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
-{
-    new CHIPAudioOutputGeneratedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = AudioOutput::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<AudioOutputGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)stepWithOnOffWithParams:(CHIPLevelControlClusterStepWithOnOffParams *)params
+              completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPAudioOutputGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = AudioOutput::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<AudioOutputGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAudioOutputGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    LevelControl::Commands::StepWithOnOff::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.stepMode = static_cast<std::remove_reference_t<decltype(request.stepMode)>>(params.stepMode.unsignedCharValue);
+    request.stepSize = params.stepSize.unsignedCharValue;
+    request.transitionTime = params.transitionTime.unsignedShortValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
         },
-        subscriptionEstablishedHandler);
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)stopWithOnOffWithCompletionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPAudioOutputGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = AudioOutput::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<AudioOutputGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+    [self stopWithOnOffWithParams:nil completionHandler:completionHandler];
 }
-
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)stopWithOnOffWithParams:(CHIPLevelControlClusterStopWithOnOffParams * _Nullable)params
+              completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPAudioOutputAcceptedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = AudioOutput::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<AudioOutputAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    LevelControl::Commands::StopWithOnOff::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)moveToClosestFrequencyWithParams:(CHIPLevelControlClusterMoveToClosestFrequencyParams *)params
+                       completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPAudioOutputAcceptedCommandListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    LevelControl::Commands::MoveToClosestFrequency::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.frequency = params.frequency.unsignedShortValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
         ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = AudioOutput::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<AudioOutputAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAudioOutputAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPAudioOutputAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = AudioOutput::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<AudioOutputAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeCurrentLevelWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPAudioOutputAttributeListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = AudioOutput::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<AudioOutputAttributeListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = LevelControl::Attributes::CurrentLevel::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentLevelWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPAudioOutputAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = AudioOutput::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<AudioOutputAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = LevelControl::Attributes::CurrentLevel::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPAudioOutputAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCurrentLevelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPAudioOutputAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = AudioOutput::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<AudioOutputAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = LevelControl::Attributes::CurrentLevel::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeRemainingTimeWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = AudioOutput::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = LevelControl::Attributes::RemainingTime::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRemainingTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = AudioOutput::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = LevelControl::Attributes::RemainingTime::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRemainingTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = AudioOutput::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::RemainingTime::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -3701,59 +3964,57 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeMinLevelWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = AudioOutput::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = LevelControl::Attributes::MinLevel::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMinLevelWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = AudioOutput::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = LevelControl::Attributes::MinLevel::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMinLevelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = AudioOutput::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::MinLevel::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -3763,87 +4024,22 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPBarrierControl
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)barrierControlGoToPercentWithParams:(CHIPBarrierControlClusterBarrierControlGoToPercentParams *)params
-                          completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    BarrierControl::Commands::BarrierControlGoToPercent::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.percentOpen = params.percentOpen.unsignedCharValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)barrierControlStopWithCompletionHandler:(StatusCompletion)completionHandler
-{
-    [self barrierControlStopWithParams:nil completionHandler:completionHandler];
-}
-- (void)barrierControlStopWithParams:(CHIPBarrierControlClusterBarrierControlStopParams * _Nullable)params
-                   completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    BarrierControl::Commands::BarrierControlStop::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)readAttributeBarrierMovingStateWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler
+- (void)readAttributeMaxLevelWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BarrierControl::Attributes::BarrierMovingState::TypeInfo;
+        using TypeInfo = LevelControl::Attributes::MaxLevel::TypeInfo;
         auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeBarrierMovingStateWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMaxLevelWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -3852,7 +4048,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BarrierControl::Attributes::BarrierMovingState::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::MaxLevel::TypeInfo;
             auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -3864,16 +4060,15 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBarrierMovingStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMaxLevelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BarrierControl::Attributes::BarrierMovingState::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::MaxLevel::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -3889,24 +4084,23 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeBarrierSafetyStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeCurrentFrequencyWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BarrierControl::Attributes::BarrierSafetyStatus::TypeInfo;
+        using TypeInfo = LevelControl::Attributes::CurrentFrequency::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeBarrierSafetyStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentFrequencyWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -3915,7 +4109,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BarrierControl::Attributes::BarrierSafetyStatus::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::CurrentFrequency::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -3927,16 +4121,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBarrierSafetyStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCurrentFrequencyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BarrierControl::Attributes::BarrierSafetyStatus::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::CurrentFrequency::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -3952,60 +4146,58 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeBarrierCapabilitiesWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeMinFrequencyWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BarrierControl::Attributes::BarrierCapabilities::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = LevelControl::Attributes::MinFrequency::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeBarrierCapabilitiesWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMinFrequencyWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BarrierControl::Attributes::BarrierCapabilities::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = LevelControl::Attributes::MinFrequency::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBarrierCapabilitiesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMinFrequencyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BarrierControl::Attributes::BarrierCapabilities::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::MinFrequency::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -4015,55 +4207,22 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeBarrierOpenEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeMaxFrequencyWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BarrierControl::Attributes::BarrierOpenEvents::TypeInfo;
+        using TypeInfo = LevelControl::Attributes::MaxFrequency::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeBarrierOpenEventsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeBarrierOpenEventsWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeBarrierOpenEventsWithValue:(NSNumber * _Nonnull)value
-                                          params:(CHIPWriteParams * _Nullable)params
-                               completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = BarrierControl::Attributes::BarrierOpenEvents::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeBarrierOpenEventsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMaxFrequencyWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -4072,7 +4231,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BarrierControl::Attributes::BarrierOpenEvents::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::MaxFrequency::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -4084,16 +4243,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBarrierOpenEventsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMaxFrequencyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BarrierControl::Attributes::BarrierOpenEvents::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::MaxFrequency::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -4109,24 +4268,23 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeBarrierCloseEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler
+- (void)readAttributeOptionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BarrierControl::Attributes::BarrierCloseEvents::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = LevelControl::Attributes::Options::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeBarrierCloseEventsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOptionsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeBarrierCloseEventsWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self writeAttributeOptionsWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeBarrierCloseEventsWithValue:(NSNumber * _Nonnull)value
-                                           params:(CHIPWriteParams * _Nullable)params
-                                completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOptionsWithValue:(NSNumber * _Nonnull)value
+                                params:(CHIPWriteParams * _Nullable)params
+                     completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -4142,9 +4300,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BarrierControl::Attributes::BarrierCloseEvents::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::Options::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -4152,48 +4310,46 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeBarrierCloseEventsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOptionsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BarrierControl::Attributes::BarrierCloseEvents::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = LevelControl::Attributes::Options::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBarrierCloseEventsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOptionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BarrierControl::Attributes::BarrierCloseEvents::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::Options::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -4203,27 +4359,24 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeBarrierCommandOpenEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
+- (void)readAttributeOnOffTransitionTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BarrierControl::Attributes::BarrierCommandOpenEvents::TypeInfo;
+        using TypeInfo = LevelControl::Attributes::OnOffTransitionTime::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeBarrierCommandOpenEventsWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOnOffTransitionTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeBarrierCommandOpenEventsWithValue:(NSNumber * _Nonnull) value
-                                                   params:nil
-                                        completionHandler:completionHandler];
+    [self writeAttributeOnOffTransitionTimeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeBarrierCommandOpenEventsWithValue:(NSNumber * _Nonnull)value
-                                                 params:(CHIPWriteParams * _Nullable)params
-                                      completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOnOffTransitionTimeWithValue:(NSNumber * _Nonnull)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -4239,7 +4392,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BarrierControl::Attributes::BarrierCommandOpenEvents::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::OnOffTransitionTime::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -4249,13 +4402,13 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeBarrierCommandOpenEventsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOnOffTransitionTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -4264,7 +4417,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BarrierControl::Attributes::BarrierCommandOpenEvents::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::OnOffTransitionTime::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -4276,16 +4429,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBarrierCommandOpenEventsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOnOffTransitionTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BarrierControl::Attributes::BarrierCommandOpenEvents::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::OnOffTransitionTime::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -4301,27 +4454,24 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeBarrierCommandCloseEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
+- (void)readAttributeOnLevelWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BarrierControl::Attributes::BarrierCommandCloseEvents::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = LevelControl::Attributes::OnLevel::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)writeAttributeBarrierCommandCloseEventsWithValue:(NSNumber * _Nonnull)value
-                                       completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOnLevelWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeBarrierCommandCloseEventsWithValue:(NSNumber * _Nonnull) value
-                                                    params:nil
-                                         completionHandler:completionHandler];
+    [self writeAttributeOnLevelWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeBarrierCommandCloseEventsWithValue:(NSNumber * _Nonnull)value
-                                                  params:(CHIPWriteParams * _Nullable)params
-                                       completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOnLevelWithValue:(NSNumber * _Nullable)value
+                                params:(CHIPWriteParams * _Nullable)params
+                     completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -4337,9 +4487,14 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BarrierControl::Attributes::BarrierCommandCloseEvents::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::OnLevel::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -4347,49 +4502,46 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeBarrierCommandCloseEventsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                            params:(CHIPSubscribeParams * _Nullable)params
-                                           subscriptionEstablished:
-                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOnLevelWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BarrierControl::Attributes::BarrierCommandCloseEvents::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = LevelControl::Attributes::OnLevel::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBarrierCommandCloseEventsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                        endpoint:(NSNumber *)endpoint
-                                                           queue:(dispatch_queue_t)queue
-                                               completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
++ (void)readAttributeOnLevelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BarrierControl::Attributes::BarrierCommandCloseEvents::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::OnLevel::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -4399,24 +4551,25 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeBarrierOpenPeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeOnTransitionTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BarrierControl::Attributes::BarrierOpenPeriod::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt16uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = LevelControl::Attributes::OnTransitionTime::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)writeAttributeBarrierOpenPeriodWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOnTransitionTimeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeBarrierOpenPeriodWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self writeAttributeOnTransitionTimeWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeBarrierOpenPeriodWithValue:(NSNumber * _Nonnull)value
-                                          params:(CHIPWriteParams * _Nullable)params
-                               completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOnTransitionTimeWithValue:(NSNumber * _Nullable)value
+                                         params:(CHIPWriteParams * _Nullable)params
+                              completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -4432,9 +4585,14 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BarrierControl::Attributes::BarrierOpenPeriod::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::OnTransitionTime::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedShortValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -4442,48 +4600,48 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeBarrierOpenPeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOnTransitionTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BarrierControl::Attributes::BarrierOpenPeriod::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = LevelControl::Attributes::OnTransitionTime::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBarrierOpenPeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOnTransitionTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BarrierControl::Attributes::BarrierOpenPeriod::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::OnTransitionTime::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -4493,24 +4651,25 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeBarrierClosePeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler
+- (void)readAttributeOffTransitionTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BarrierControl::Attributes::BarrierClosePeriod::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt16uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = LevelControl::Attributes::OffTransitionTime::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)writeAttributeBarrierClosePeriodWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOffTransitionTimeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeBarrierClosePeriodWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self writeAttributeOffTransitionTimeWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeBarrierClosePeriodWithValue:(NSNumber * _Nonnull)value
-                                           params:(CHIPWriteParams * _Nullable)params
-                                completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOffTransitionTimeWithValue:(NSNumber * _Nullable)value
+                                          params:(CHIPWriteParams * _Nullable)params
+                               completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -4526,9 +4685,14 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BarrierControl::Attributes::BarrierClosePeriod::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::OffTransitionTime::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedShortValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -4536,48 +4700,48 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeBarrierClosePeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOffTransitionTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BarrierControl::Attributes::BarrierClosePeriod::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = LevelControl::Attributes::OffTransitionTime::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBarrierClosePeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOffTransitionTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BarrierControl::Attributes::BarrierClosePeriod::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::OffTransitionTime::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -4587,59 +4751,97 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeBarrierPositionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeDefaultMoveRateWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BarrierControl::Attributes::BarrierPosition::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = LevelControl::Attributes::DefaultMoveRate::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeBarrierPositionWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)writeAttributeDefaultMoveRateWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeDefaultMoveRateWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeDefaultMoveRateWithValue:(NSNumber * _Nullable)value
+                                        params:(CHIPWriteParams * _Nullable)params
+                             completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = LevelControl::Attributes::DefaultMoveRate::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeDefaultMoveRateWithMinInterval:(NSNumber * _Nonnull)minInterval
                                              maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(CHIPSubscribeParams * _Nullable)params
                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                            reportHandler:
                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BarrierControl::Attributes::BarrierPosition::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = LevelControl::Attributes::DefaultMoveRate::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBarrierPositionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeDefaultMoveRateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                               endpoint:(NSNumber *)endpoint
                                                  queue:(dispatch_queue_t)queue
                                      completionHandler:
                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BarrierControl::Attributes::BarrierPosition::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::DefaultMoveRate::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -4649,62 +4851,163 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeStartUpCurrentLevelWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPBarrierControlGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPNullableInt8uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = BarrierControl::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<BarrierControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = LevelControl::Attributes::StartUpCurrentLevel::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeStartUpCurrentLevelWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPBarrierControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    [self writeAttributeStartUpCurrentLevelWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeStartUpCurrentLevelWithValue:(NSNumber * _Nullable)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = LevelControl::Attributes::StartUpCurrentLevel::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeStartUpCurrentLevelWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BarrierControl::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<BarrierControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = LevelControl::Attributes::StartUpCurrentLevel::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBarrierControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeStartUpCurrentLevelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBarrierControlGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = LevelControl::Attributes::StartUpCurrentLevel::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
+{
+    new CHIPLevelControlGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = LevelControl::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<LevelControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPLevelControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = LevelControl::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<LevelControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPLevelControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPLevelControlGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = BarrierControl::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = LevelControl::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<BarrierControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<LevelControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -4717,10 +5020,10 @@ new CHIPBarrierControlGeneratedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPBarrierControlAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPLevelControlAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = BarrierControl::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<BarrierControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = LevelControl::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<LevelControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -4734,19 +5037,19 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBarrierControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPLevelControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BarrierControl::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<BarrierControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = LevelControl::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<LevelControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBarrierControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPLevelControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -4759,17 +5062,17 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBarrierControlAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPLevelControlAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = BarrierControl::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = LevelControl::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<BarrierControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<LevelControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -4782,10 +5085,10 @@ new CHIPBarrierControlAcceptedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBarrierControlAttributeListListAttributeCallbackBridge(
+    new CHIPLevelControlAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = BarrierControl::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<BarrierControlAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = LevelControl::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<LevelControlAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -4797,19 +5100,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBarrierControlAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPLevelControlAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BarrierControl::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<BarrierControlAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = LevelControl::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<LevelControlAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBarrierControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPLevelControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -4822,17 +5125,17 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBarrierControlAttributeListListAttributeCallbackBridge(
+    new CHIPLevelControlAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = BarrierControl::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = LevelControl::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<BarrierControlAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<LevelControlAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -4846,7 +5149,7 @@ - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BarrierControl::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = LevelControl::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -4866,7 +5169,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BarrierControl::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -4886,7 +5189,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BarrierControl::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -4906,7 +5209,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BarrierControl::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = LevelControl::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -4927,7 +5230,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BarrierControl::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -4948,7 +5251,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BarrierControl::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -4966,116 +5269,57 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPBasic
+@implementation CHIPBinaryInputBasic
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)mfgSpecificPingWithCompletionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeActiveTextWithCompletionHandler:(void (^)(
+                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    [self mfgSpecificPingWithParams:nil completionHandler:completionHandler];
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BinaryInputBasic::Attributes::ActiveText::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
-- (void)mfgSpecificPingWithParams:(CHIPBasicClusterMfgSpecificPingParams * _Nullable)params
-                completionHandler:(StatusCompletion)completionHandler
+
+- (void)writeAttributeActiveTextWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    Basic::Commands::MfgSpecificPing::Type request;
+    [self writeAttributeActiveTextWithValue:(NSString * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeActiveTextWithValue:(NSString * _Nonnull)value
+                                   params:(CHIPWriteParams * _Nullable)params
+                        completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
     }
 
-    new CHIPCommandSuccessCallbackBridge(
+    new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
+        ^(id _Nullable ignored, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            ListFreer listFreer;
+            using TypeInfo = BinaryInputBasic::Attributes::ActiveText::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = [self asCharSpan:value];
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)readAttributeDataModelRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Basic::Attributes::DataModelRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeDataModelRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = Basic::Attributes::DataModelRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeDataModelRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = Basic::Attributes::DataModelRevision::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeVendorNameWithCompletionHandler:(void (^)(
-                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Basic::Attributes::VendorName::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeVendorNameWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeActiveTextWithMinInterval:(NSNumber * _Nonnull)minInterval
                                         maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(CHIPSubscribeParams * _Nullable)params
                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
@@ -5088,7 +5332,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Basic::Attributes::VendorName::TypeInfo;
+            using TypeInfo = BinaryInputBasic::Attributes::ActiveText::TypeInfo;
             auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -5100,7 +5344,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeVendorNameWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeActiveTextWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                          endpoint:(NSNumber *)endpoint
                                             queue:(dispatch_queue_t)queue
                                 completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
@@ -5108,7 +5352,7 @@ + (void)readAttributeVendorNameWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Basic::Attributes::VendorName::TypeInfo;
+            using TypeInfo = BinaryInputBasic::Attributes::ActiveText::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -5124,78 +5368,50 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
-- (void)readAttributeVendorIDWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeDescriptionWithCompletionHandler:(void (^)(
+                                                          NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPVendorIdAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Basic::Attributes::VendorID::TypeInfo;
-        auto successFn = Callback<VendorIdAttributeCallback>::FromCancelable(success);
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BinaryInputBasic::Attributes::Description::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeVendorIDWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeDescriptionWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPVendorIdAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = Basic::Attributes::VendorID::TypeInfo;
-            auto successFn = Callback<VendorIdAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPVendorIdAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+    [self writeAttributeDescriptionWithValue:(NSString * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-
-+ (void)readAttributeVendorIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeDescriptionWithValue:(NSString * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPVendorIdAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = Basic::Attributes::VendorID::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<VendorIdAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
+    }
 
-- (void)readAttributeProductNameWithCompletionHandler:(void (^)(
-                                                          NSString * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Basic::Attributes::ProductName::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = BinaryInputBasic::Attributes::Description::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = [self asCharSpan:value];
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
 }
 
-- (void)subscribeAttributeProductNameWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeDescriptionWithMinInterval:(NSNumber * _Nonnull)minInterval
                                          maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(CHIPSubscribeParams * _Nullable)params
                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
@@ -5208,7 +5424,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Basic::Attributes::ProductName::TypeInfo;
+            using TypeInfo = BinaryInputBasic::Attributes::Description::TypeInfo;
             auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -5220,7 +5436,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeProductNameWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeDescriptionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                           endpoint:(NSNumber *)endpoint
                                              queue:(dispatch_queue_t)queue
                                  completionHandler:
@@ -5229,7 +5445,7 @@ + (void)readAttributeProductNameWithAttributeCache:(CHIPAttributeCacheContainer
     new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Basic::Attributes::ProductName::TypeInfo;
+            using TypeInfo = BinaryInputBasic::Attributes::Description::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -5245,84 +5461,24 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
-- (void)readAttributeProductIDWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Basic::Attributes::ProductID::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeProductIDWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = Basic::Attributes::ProductID::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeProductIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = Basic::Attributes::ProductID::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeNodeLabelWithCompletionHandler:(void (^)(
-                                                        NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeInactiveTextWithCompletionHandler:(void (^)(
+                                                           NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Basic::Attributes::NodeLabel::TypeInfo;
+        using TypeInfo = BinaryInputBasic::Attributes::InactiveText::TypeInfo;
         auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeNodeLabelWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeInactiveTextWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeNodeLabelWithValue:(NSString * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self writeAttributeInactiveTextWithValue:(NSString * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeNodeLabelWithValue:(NSString * _Nonnull)value
-                                  params:(CHIPWriteParams * _Nullable)params
-                       completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeInactiveTextWithValue:(NSString * _Nonnull)value
+                                     params:(CHIPWriteParams * _Nullable)params
+                          completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -5338,7 +5494,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Basic::Attributes::NodeLabel::TypeInfo;
+            using TypeInfo = BinaryInputBasic::Attributes::InactiveText::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = [self asCharSpan:value];
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -5348,11 +5504,11 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeNodeLabelWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeInactiveTextWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -5361,7 +5517,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Basic::Attributes::NodeLabel::TypeInfo;
+            using TypeInfo = BinaryInputBasic::Attributes::InactiveText::TypeInfo;
             auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -5373,15 +5529,16 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNodeLabelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeInactiveTextWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Basic::Attributes::NodeLabel::TypeInfo;
+            using TypeInfo = BinaryInputBasic::Attributes::InactiveText::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -5397,24 +5554,24 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
-- (void)readAttributeLocationWithCompletionHandler:(void (^)(
-                                                       NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeOutOfServiceWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Basic::Attributes::Location::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BinaryInputBasic::Attributes::OutOfService::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeLocationWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOutOfServiceWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeLocationWithValue:(NSString * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self writeAttributeOutOfServiceWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeLocationWithValue:(NSString * _Nonnull)value
-                                 params:(CHIPWriteParams * _Nullable)params
-                      completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOutOfServiceWithValue:(NSNumber * _Nonnull)value
+                                     params:(CHIPWriteParams * _Nullable)params
+                          completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -5430,9 +5587,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Basic::Attributes::Location::TypeInfo;
+            using TypeInfo = BinaryInputBasic::Attributes::OutOfService::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
+            cppValue = value.boolValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -5440,46 +5597,47 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeLocationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOutOfServiceWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Basic::Attributes::Location::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BinaryInputBasic::Attributes::OutOfService::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeLocationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOutOfServiceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Basic::Attributes::Location::TypeInfo;
+            using TypeInfo = BinaryInputBasic::Attributes::OutOfService::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -5489,59 +5647,57 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
-- (void)readAttributeHardwareVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributePolarityWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Basic::Attributes::HardwareVersion::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BinaryInputBasic::Attributes::Polarity::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeHardwareVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePolarityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Basic::Attributes::HardwareVersion::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BinaryInputBasic::Attributes::Polarity::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeHardwareVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePolarityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Basic::Attributes::HardwareVersion::TypeInfo;
+            using TypeInfo = BinaryInputBasic::Attributes::Polarity::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -5551,60 +5707,90 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeHardwareVersionStringWithCompletionHandler:(void (^)(NSString * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler
+- (void)readAttributePresentValueWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Basic::Attributes::HardwareVersionString::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BinaryInputBasic::Attributes::PresentValue::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeHardwareVersionStringWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributePresentValueWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    [self writeAttributePresentValueWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributePresentValueWithValue:(NSNumber * _Nonnull)value
+                                     params:(CHIPWriteParams * _Nullable)params
+                          completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = BinaryInputBasic::Attributes::PresentValue::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.boolValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributePresentValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Basic::Attributes::HardwareVersionString::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BinaryInputBasic::Attributes::PresentValue::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeHardwareVersionStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePresentValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Basic::Attributes::HardwareVersionString::TypeInfo;
+            using TypeInfo = BinaryInputBasic::Attributes::PresentValue::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -5614,59 +5800,90 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
-- (void)readAttributeSoftwareVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeReliabilityWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Basic::Attributes::SoftwareVersion::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BinaryInputBasic::Attributes::Reliability::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeSoftwareVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeReliabilityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeReliabilityWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeReliabilityWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = BinaryInputBasic::Attributes::Reliability::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeReliabilityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Basic::Attributes::SoftwareVersion::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BinaryInputBasic::Attributes::Reliability::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSoftwareVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeReliabilityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Basic::Attributes::SoftwareVersion::TypeInfo;
+            using TypeInfo = BinaryInputBasic::Attributes::Reliability::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -5676,60 +5893,58 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeSoftwareVersionStringWithCompletionHandler:(void (^)(NSString * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler
+- (void)readAttributeStatusFlagsWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Basic::Attributes::SoftwareVersionString::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BinaryInputBasic::Attributes::StatusFlags::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeSoftwareVersionStringWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeStatusFlagsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Basic::Attributes::SoftwareVersionString::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BinaryInputBasic::Attributes::StatusFlags::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSoftwareVersionStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeStatusFlagsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Basic::Attributes::SoftwareVersionString::TypeInfo;
+            using TypeInfo = BinaryInputBasic::Attributes::StatusFlags::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -5739,59 +5954,59 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
-- (void)readAttributeManufacturingDateWithCompletionHandler:(void (^)(NSString * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeApplicationTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Basic::Attributes::ManufacturingDate::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BinaryInputBasic::Attributes::ApplicationType::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeManufacturingDateWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeApplicationTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Basic::Attributes::ManufacturingDate::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BinaryInputBasic::Attributes::ApplicationType::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeManufacturingDateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeApplicationTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Basic::Attributes::ManufacturingDate::TypeInfo;
+            using TypeInfo = BinaryInputBasic::Attributes::ApplicationType::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -5801,239 +6016,250 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
-- (void)readAttributePartNumberWithCompletionHandler:(void (^)(
-                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Basic::Attributes::PartNumber::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = BinaryInputBasic::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<BinaryInputBasicGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributePartNumberWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Basic::Attributes::PartNumber::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BinaryInputBasic::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<BinaryInputBasicGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePartNumberWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = Basic::Attributes::PartNumber::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = BinaryInputBasic::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<BinaryInputBasicGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeProductURLWithCompletionHandler:(void (^)(
-                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Basic::Attributes::ProductURL::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = BinaryInputBasic::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<BinaryInputBasicAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeProductURLWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Basic::Attributes::ProductURL::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BinaryInputBasic::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<BinaryInputBasicAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeProductURLWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = Basic::Attributes::ProductURL::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = BinaryInputBasic::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<BinaryInputBasicAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeProductLabelWithCompletionHandler:(void (^)(
-                                                           NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Basic::Attributes::ProductLabel::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPBinaryInputBasicAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = BinaryInputBasic::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<BinaryInputBasicAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeProductLabelWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPBinaryInputBasicAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Basic::Attributes::ProductLabel::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BinaryInputBasic::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<BinaryInputBasicAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBinaryInputBasicAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeProductLabelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = Basic::Attributes::ProductLabel::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPBinaryInputBasicAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = BinaryInputBasic::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<BinaryInputBasicAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeSerialNumberWithCompletionHandler:(void (^)(
-                                                           NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Basic::Attributes::SerialNumber::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BinaryInputBasic::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeSerialNumberWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Basic::Attributes::SerialNumber::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BinaryInputBasic::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSerialNumberWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Basic::Attributes::SerialNumber::TypeInfo;
+            using TypeInfo = BinaryInputBasic::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -6043,92 +6269,59 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
-- (void)readAttributeLocalConfigDisabledWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Basic::Attributes::LocalConfigDisabled::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BinaryInputBasic::Attributes::ClusterRevision::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeLocalConfigDisabledWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeLocalConfigDisabledWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeLocalConfigDisabledWithValue:(NSNumber * _Nonnull)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Basic::Attributes::LocalConfigDisabled::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeLocalConfigDisabledWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Basic::Attributes::LocalConfigDisabled::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BinaryInputBasic::Attributes::ClusterRevision::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeLocalConfigDisabledWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Basic::Attributes::LocalConfigDisabled::TypeInfo;
+            using TypeInfo = BinaryInputBasic::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -6138,181 +6331,192 @@ new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable *
     });
 }
 
-- (void)readAttributeReachableWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+@end
+
+@implementation CHIPDescriptor
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Basic::Attributes::Reachable::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    return &_cppCluster;
 }
 
-- (void)subscribeAttributeReachableWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)readAttributeDeviceListWithCompletionHandler:(void (^)(
+                                                         NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPDescriptorDeviceListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Descriptor::Attributes::DeviceList::TypeInfo;
+            auto successFn = Callback<DescriptorDeviceListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeDeviceListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPDescriptorDeviceListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Basic::Attributes::Reachable::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Descriptor::Attributes::DeviceList::TypeInfo;
+            auto successFn = Callback<DescriptorDeviceListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPDescriptorDeviceListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeReachableWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeDeviceListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = Basic::Attributes::Reachable::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPDescriptorDeviceListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = Descriptor::Attributes::DeviceList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<DescriptorDeviceListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeUniqueIDWithCompletionHandler:(void (^)(
-                                                       NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeServerListWithCompletionHandler:(void (^)(
+                                                         NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Basic::Attributes::UniqueID::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPDescriptorServerListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Descriptor::Attributes::ServerList::TypeInfo;
+            auto successFn = Callback<DescriptorServerListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeUniqueIDWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeServerListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPDescriptorServerListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Basic::Attributes::UniqueID::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Descriptor::Attributes::ServerList::TypeInfo;
+            auto successFn = Callback<DescriptorServerListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPDescriptorServerListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeUniqueIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeServerListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = Basic::Attributes::UniqueID::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPDescriptorServerListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = Descriptor::Attributes::ServerList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<DescriptorServerListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeCapabilityMinimaWithCompletionHandler:(void (^)(CHIPBasicClusterCapabilityMinimaStruct * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeClientListWithCompletionHandler:(void (^)(
+                                                         NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBasicCapabilityMinimaStructAttributeCallbackBridge(
+    new CHIPDescriptorClientListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Basic::Attributes::CapabilityMinima::TypeInfo;
-            auto successFn = Callback<BasicCapabilityMinimaStructAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Descriptor::Attributes::ClientList::TypeInfo;
+            auto successFn = Callback<DescriptorClientListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeCapabilityMinimaWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:(void (^)(CHIPBasicClusterCapabilityMinimaStruct * _Nullable value,
-                                                              NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClientListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBasicCapabilityMinimaStructAttributeCallbackSubscriptionBridge(
+    new CHIPDescriptorClientListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Basic::Attributes::CapabilityMinima::TypeInfo;
-            auto successFn = Callback<BasicCapabilityMinimaStructAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Descriptor::Attributes::ClientList::TypeInfo;
+            auto successFn = Callback<DescriptorClientListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBasicCapabilityMinimaStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPDescriptorClientListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCapabilityMinimaWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:(void (^)(CHIPBasicClusterCapabilityMinimaStruct * _Nullable value,
-                                                            NSError * _Nullable error))completionHandler
++ (void)readAttributeClientListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBasicCapabilityMinimaStructAttributeCallbackBridge(
+    new CHIPDescriptorClientListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = Basic::Attributes::CapabilityMinima::TypeInfo;
+                using TypeInfo = Descriptor::Attributes::ClientList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<BasicCapabilityMinimaStructAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<DescriptorClientListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -6322,13 +6526,74 @@ new CHIPBasicCapabilityMinimaStructAttributeCallbackBridge(
         });
 }
 
+- (void)readAttributePartsListWithCompletionHandler:(void (^)(
+                                                        NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPDescriptorPartsListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Descriptor::Attributes::PartsList::TypeInfo;
+            auto successFn = Callback<DescriptorPartsListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributePartsListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPDescriptorPartsListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = Descriptor::Attributes::PartsList::TypeInfo;
+            auto successFn = Callback<DescriptorPartsListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPDescriptorPartsListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributePartsListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPDescriptorPartsListListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Descriptor::Attributes::PartsList::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<DescriptorPartsListListAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPBasicGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPDescriptorGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Basic::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<BasicGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Descriptor::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<DescriptorGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -6342,19 +6607,19 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
                                                 reportHandler:
                                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPDescriptorGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Basic::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<BasicGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Descriptor::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<DescriptorGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPDescriptorGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -6367,17 +6632,17 @@ + (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheC
                                           completionHandler:
                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBasicGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPDescriptorGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = Basic::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = Descriptor::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<BasicGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<DescriptorGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -6390,10 +6655,10 @@ new CHIPBasicGeneratedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPBasicAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPDescriptorAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Basic::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<BasicAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Descriptor::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<DescriptorAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -6407,19 +6672,19 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPDescriptorAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Basic::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<BasicAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Descriptor::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<DescriptorAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPDescriptorAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -6432,17 +6697,17 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBasicAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPDescriptorAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = Basic::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = Descriptor::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<BasicAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<DescriptorAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -6455,10 +6720,10 @@ new CHIPBasicAcceptedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBasicAttributeListListAttributeCallbackBridge(
+    new CHIPDescriptorAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Basic::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<BasicAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Descriptor::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<DescriptorAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -6470,19 +6735,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBasicAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPDescriptorAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Basic::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<BasicAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Descriptor::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<DescriptorAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBasicAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPDescriptorAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -6495,30 +6760,31 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBasicAttributeListListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = Basic::Attributes::AttributeList::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BasicAttributeListListAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPDescriptorAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = Descriptor::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<DescriptorAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Basic::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = Descriptor::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -6538,7 +6804,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Basic::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Descriptor::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -6558,7 +6824,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Basic::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Descriptor::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -6578,7 +6844,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Basic::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = Descriptor::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -6599,7 +6865,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Basic::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Descriptor::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -6620,7 +6886,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Basic::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Descriptor::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -6638,31 +6904,33 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPBinaryInputBasic
+@implementation CHIPBinding
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)readAttributeActiveTextWithCompletionHandler:(void (^)(
-                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeBindingWithParams:(CHIPReadParams * _Nullable)params
+                     completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BinaryInputBasic::Attributes::ActiveText::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPBindingBindingListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Binding::Attributes::Binding::TypeInfo;
+            auto successFn = Callback<BindingBindingListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue]);
+        });
 }
 
-- (void)writeAttributeActiveTextWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBindingWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeActiveTextWithValue:(NSString * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self writeAttributeBindingWithValue:(NSArray * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeActiveTextWithValue:(NSString * _Nonnull)value
-                                   params:(CHIPWriteParams * _Nullable)params
-                        completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBindingWithValue:(NSArray * _Nonnull)value
+                                params:(CHIPWriteParams * _Nullable)params
+                     completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -6678,9 +6946,46 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BinaryInputBasic::Attributes::ActiveText::TypeInfo;
+            using TypeInfo = Binding::Attributes::Binding::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[CHIPBindingClusterTargetStruct class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (CHIPBindingClusterTargetStruct *) value[i_0];
+                        if (element_0.node != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].node.Emplace();
+                            definedValue_2 = element_0.node.unsignedLongLongValue;
+                        }
+                        if (element_0.group != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].group.Emplace();
+                            definedValue_2 = element_0.group.unsignedShortValue;
+                        }
+                        if (element_0.endpoint != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].endpoint.Emplace();
+                            definedValue_2 = element_0.endpoint.unsignedShortValue;
+                        }
+                        if (element_0.cluster != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].cluster.Emplace();
+                            definedValue_2 = element_0.cluster.unsignedIntValue;
+                        }
+                        listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -6688,46 +6993,46 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeActiveTextWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBindingWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPBindingBindingListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BinaryInputBasic::Attributes::ActiveText::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Binding::Attributes::Binding::TypeInfo;
+            auto successFn = Callback<BindingBindingListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBindingBindingListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeActiveTextWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBindingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBindingBindingListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BinaryInputBasic::Attributes::ActiveText::TypeInfo;
+            using TypeInfo = Binding::Attributes::Binding::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BindingBindingListAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -6737,276 +7042,250 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
-- (void)readAttributeDescriptionWithCompletionHandler:(void (^)(
-                                                          NSString * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BinaryInputBasic::Attributes::Description::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)writeAttributeDescriptionWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeDescriptionWithValue:(NSString * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeDescriptionWithValue:(NSString * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = BinaryInputBasic::Attributes::Description::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPBindingGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Binding::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<BindingGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeDescriptionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPBindingGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BinaryInputBasic::Attributes::Description::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Binding::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<BindingGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBindingGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDescriptionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = BinaryInputBasic::Attributes::Description::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPBindingGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = Binding::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<BindingGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeInactiveTextWithCompletionHandler:(void (^)(
-                                                           NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BinaryInputBasic::Attributes::InactiveText::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPBindingAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Binding::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<BindingAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)writeAttributeInactiveTextWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeInactiveTextWithValue:(NSString * _Nonnull) value params:nil completionHandler:completionHandler];
+    new CHIPBindingAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = Binding::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<BindingAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPBindingAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
-- (void)writeAttributeInactiveTextWithValue:(NSString * _Nonnull)value
-                                     params:(CHIPWriteParams * _Nullable)params
-                          completionHandler:(StatusCompletion)completionHandler
+
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
+    new CHIPBindingAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = Binding::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<BindingAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
 
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = BinaryInputBasic::Attributes::InactiveText::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPBindingAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Binding::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<BindingAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeInactiveTextWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPBindingAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BinaryInputBasic::Attributes::InactiveText::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Binding::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<BindingAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBindingAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInactiveTextWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = BinaryInputBasic::Attributes::InactiveText::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPBindingAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = Binding::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<BindingAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeOutOfServiceWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BinaryInputBasic::Attributes::OutOfService::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Binding::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeOutOfServiceWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeOutOfServiceWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeOutOfServiceWithValue:(NSNumber * _Nonnull)value
-                                     params:(CHIPWriteParams * _Nullable)params
-                          completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = BinaryInputBasic::Attributes::OutOfService::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeOutOfServiceWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BinaryInputBasic::Attributes::OutOfService::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Binding::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOutOfServiceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BinaryInputBasic::Attributes::OutOfService::TypeInfo;
+            using TypeInfo = Binding::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -7016,57 +7295,59 @@ new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable *
     });
 }
 
-- (void)readAttributePolarityWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BinaryInputBasic::Attributes::Polarity::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Binding::Attributes::ClusterRevision::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributePolarityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BinaryInputBasic::Attributes::Polarity::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Binding::Attributes::ClusterRevision::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePolarityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BinaryInputBasic::Attributes::Polarity::TypeInfo;
+            using TypeInfo = Binding::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -7076,24 +7357,35 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributePresentValueWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+@end
+
+@implementation CHIPAccessControl
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BinaryInputBasic::Attributes::PresentValue::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    return &_cppCluster;
 }
 
-- (void)writeAttributePresentValueWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeAclWithParams:(CHIPReadParams * _Nullable)params
+                 completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    [self writeAttributePresentValueWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    new CHIPAccessControlAclListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = AccessControl::Attributes::Acl::TypeInfo;
+            auto successFn = Callback<AccessControlAclListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue]);
+        });
 }
-- (void)writeAttributePresentValueWithValue:(NSNumber * _Nonnull)value
-                                     params:(CHIPWriteParams * _Nullable)params
-                          completionHandler:(StatusCompletion)completionHandler
+
+- (void)writeAttributeAclWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeAclWithValue:(NSArray * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeAclWithValue:(NSArray * _Nonnull)value
+                            params:(CHIPWriteParams * _Nullable)params
+                 completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -7109,57 +7401,154 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BinaryInputBasic::Attributes::PresentValue::TypeInfo;
+            using TypeInfo = AccessControl::Attributes::Acl::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[CHIPAccessControlClusterAccessControlEntry class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (CHIPAccessControlClusterAccessControlEntry *) value[i_0];
+                        listHolder_0->mList[i_0].privilege
+                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].privilege)>>(
+                                element_0.privilege.unsignedCharValue);
+                        listHolder_0->mList[i_0].authMode
+                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].authMode)>>(
+                                element_0.authMode.unsignedCharValue);
+                        if (element_0.subjects == nil) {
+                            listHolder_0->mList[i_0].subjects.SetNull();
+                        } else {
+                            auto & nonNullValue_2 = listHolder_0->mList[i_0].subjects.SetNonNull();
+                            {
+                                using ListType_3 = std::remove_reference_t<decltype(nonNullValue_2)>;
+                                using ListMemberType_3 = ListMemberTypeGetter<ListType_3>::Type;
+                                if (element_0.subjects.count != 0) {
+                                    auto * listHolder_3 = new ListHolder<ListMemberType_3>(element_0.subjects.count);
+                                    if (listHolder_3 == nullptr || listHolder_3->mList == nullptr) {
+                                        return CHIP_ERROR_INVALID_ARGUMENT;
+                                    }
+                                    listFreer.add(listHolder_3);
+                                    for (size_t i_3 = 0; i_3 < element_0.subjects.count; ++i_3) {
+                                        if (![element_0.subjects[i_3] isKindOfClass:[NSNumber class]]) {
+                                            // Wrong kind of value.
+                                            return CHIP_ERROR_INVALID_ARGUMENT;
+                                        }
+                                        auto element_3 = (NSNumber *) element_0.subjects[i_3];
+                                        listHolder_3->mList[i_3] = element_3.unsignedLongLongValue;
+                                    }
+                                    nonNullValue_2 = ListType_3(listHolder_3->mList, element_0.subjects.count);
+                                } else {
+                                    nonNullValue_2 = ListType_3();
+                                }
+                            }
+                        }
+                        if (element_0.targets == nil) {
+                            listHolder_0->mList[i_0].targets.SetNull();
+                        } else {
+                            auto & nonNullValue_2 = listHolder_0->mList[i_0].targets.SetNonNull();
+                            {
+                                using ListType_3 = std::remove_reference_t<decltype(nonNullValue_2)>;
+                                using ListMemberType_3 = ListMemberTypeGetter<ListType_3>::Type;
+                                if (element_0.targets.count != 0) {
+                                    auto * listHolder_3 = new ListHolder<ListMemberType_3>(element_0.targets.count);
+                                    if (listHolder_3 == nullptr || listHolder_3->mList == nullptr) {
+                                        return CHIP_ERROR_INVALID_ARGUMENT;
+                                    }
+                                    listFreer.add(listHolder_3);
+                                    for (size_t i_3 = 0; i_3 < element_0.targets.count; ++i_3) {
+                                        if (![element_0.targets[i_3] isKindOfClass:[CHIPAccessControlClusterTarget class]]) {
+                                            // Wrong kind of value.
+                                            return CHIP_ERROR_INVALID_ARGUMENT;
+                                        }
+                                        auto element_3 = (CHIPAccessControlClusterTarget *) element_0.targets[i_3];
+                                        if (element_3.cluster == nil) {
+                                            listHolder_3->mList[i_3].cluster.SetNull();
+                                        } else {
+                                            auto & nonNullValue_5 = listHolder_3->mList[i_3].cluster.SetNonNull();
+                                            nonNullValue_5 = element_3.cluster.unsignedIntValue;
+                                        }
+                                        if (element_3.endpoint == nil) {
+                                            listHolder_3->mList[i_3].endpoint.SetNull();
+                                        } else {
+                                            auto & nonNullValue_5 = listHolder_3->mList[i_3].endpoint.SetNonNull();
+                                            nonNullValue_5 = element_3.endpoint.unsignedShortValue;
+                                        }
+                                        if (element_3.deviceType == nil) {
+                                            listHolder_3->mList[i_3].deviceType.SetNull();
+                                        } else {
+                                            auto & nonNullValue_5 = listHolder_3->mList[i_3].deviceType.SetNonNull();
+                                            nonNullValue_5 = element_3.deviceType.unsignedIntValue;
+                                        }
+                                    }
+                                    nonNullValue_2 = ListType_3(listHolder_3->mList, element_0.targets.count);
+                                } else {
+                                    nonNullValue_2 = ListType_3();
+                                }
+                            }
+                        }
+                        listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
 }
 
-- (void)subscribeAttributePresentValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAclWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                      params:(CHIPSubscribeParams * _Nullable)params
+                     subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                               reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPAccessControlAclListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BinaryInputBasic::Attributes::PresentValue::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AccessControl::Attributes::Acl::TypeInfo;
+            auto successFn = Callback<AccessControlAclListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPAccessControlAclListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePresentValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAclWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                  endpoint:(NSNumber *)endpoint
+                                     queue:(dispatch_queue_t)queue
+                         completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPAccessControlAclListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BinaryInputBasic::Attributes::PresentValue::TypeInfo;
+            using TypeInfo = AccessControl::Attributes::Acl::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<AccessControlAclListAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -7169,24 +7558,26 @@ new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable *
     });
 }
 
-- (void)readAttributeReliabilityWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeExtensionWithParams:(CHIPReadParams * _Nullable)params
+                       completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BinaryInputBasic::Attributes::Reliability::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPAccessControlExtensionListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = AccessControl::Attributes::Extension::TypeInfo;
+            auto successFn = Callback<AccessControlExtensionListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue]);
+        });
 }
 
-- (void)writeAttributeReliabilityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeExtensionWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeReliabilityWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self writeAttributeExtensionWithValue:(NSArray * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeReliabilityWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeExtensionWithValue:(NSArray * _Nonnull)value
+                                  params:(CHIPWriteParams * _Nullable)params
+                       completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -7202,9 +7593,31 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BinaryInputBasic::Attributes::Reliability::TypeInfo;
+            using TypeInfo = AccessControl::Attributes::Extension::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[CHIPAccessControlClusterExtensionEntry class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (CHIPAccessControlClusterExtensionEntry *) value[i_0];
+                        listHolder_0->mList[i_0].data = [self asByteSpan:element_0.data];
+                        listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -7212,47 +7625,110 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeReliabilityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeExtensionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPAccessControlExtensionListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BinaryInputBasic::Attributes::Reliability::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AccessControl::Attributes::Extension::TypeInfo;
+            auto successFn = Callback<AccessControlExtensionListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPAccessControlExtensionListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeReliabilityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeExtensionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPAccessControlExtensionListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = AccessControl::Attributes::Extension::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<AccessControlExtensionListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
+- (void)readAttributeSubjectsPerAccessControlEntryWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = AccessControl::Attributes::SubjectsPerAccessControlEntry::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeSubjectsPerAccessControlEntryWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                params:(CHIPSubscribeParams * _Nullable)params
+                                               subscriptionEstablished:
+                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))reportHandler
+{
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = AccessControl::Attributes::SubjectsPerAccessControlEntry::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeSubjectsPerAccessControlEntryWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                            endpoint:(NSNumber *)endpoint
+                                                               queue:(dispatch_queue_t)queue
+                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BinaryInputBasic::Attributes::Reliability::TypeInfo;
+            using TypeInfo = AccessControl::Attributes::SubjectsPerAccessControlEntry::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -7262,58 +7738,60 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeStatusFlagsWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeTargetsPerAccessControlEntryWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BinaryInputBasic::Attributes::StatusFlags::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = AccessControl::Attributes::TargetsPerAccessControlEntry::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeStatusFlagsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTargetsPerAccessControlEntryWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                              subscriptionEstablished:
+                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BinaryInputBasic::Attributes::StatusFlags::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AccessControl::Attributes::TargetsPerAccessControlEntry::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeStatusFlagsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTargetsPerAccessControlEntryWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                           endpoint:(NSNumber *)endpoint
+                                                              queue:(dispatch_queue_t)queue
+                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BinaryInputBasic::Attributes::StatusFlags::TypeInfo;
+            using TypeInfo = AccessControl::Attributes::TargetsPerAccessControlEntry::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -7323,59 +7801,60 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeApplicationTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeAccessControlEntriesPerFabricWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BinaryInputBasic::Attributes::ApplicationType::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = AccessControl::Attributes::AccessControlEntriesPerFabric::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeApplicationTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAccessControlEntriesPerFabricWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                params:(CHIPSubscribeParams * _Nullable)params
+                                               subscriptionEstablished:
+                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BinaryInputBasic::Attributes::ApplicationType::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AccessControl::Attributes::AccessControlEntriesPerFabric::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeApplicationTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAccessControlEntriesPerFabricWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                            endpoint:(NSNumber *)endpoint
+                                                               queue:(dispatch_queue_t)queue
+                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BinaryInputBasic::Attributes::ApplicationType::TypeInfo;
+            using TypeInfo = AccessControl::Attributes::AccessControlEntriesPerFabric::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -7388,10 +7867,10 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPAccessControlGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = BinaryInputBasic::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<BinaryInputBasicGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AccessControl::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<AccessControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -7405,19 +7884,19 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
                                                 reportHandler:
                                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPAccessControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BinaryInputBasic::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<BinaryInputBasicGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AccessControl::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<AccessControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPAccessControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -7430,17 +7909,17 @@ + (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheC
                                           completionHandler:
                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPAccessControlGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = BinaryInputBasic::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = AccessControl::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<BinaryInputBasicGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<AccessControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -7453,10 +7932,10 @@ new CHIPBinaryInputBasicGeneratedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPAccessControlAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = BinaryInputBasic::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<BinaryInputBasicAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AccessControl::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<AccessControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -7470,19 +7949,19 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPAccessControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BinaryInputBasic::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<BinaryInputBasicAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AccessControl::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<AccessControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPAccessControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -7495,17 +7974,17 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPAccessControlAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = BinaryInputBasic::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = AccessControl::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<BinaryInputBasicAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<AccessControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -7518,10 +7997,10 @@ new CHIPBinaryInputBasicAcceptedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBinaryInputBasicAttributeListListAttributeCallbackBridge(
+    new CHIPAccessControlAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = BinaryInputBasic::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<BinaryInputBasicAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AccessControl::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<AccessControlAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -7533,19 +8012,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBinaryInputBasicAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPAccessControlAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BinaryInputBasic::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<BinaryInputBasicAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AccessControl::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<AccessControlAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBinaryInputBasicAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPAccessControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -7558,17 +8037,17 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBinaryInputBasicAttributeListListAttributeCallbackBridge(
+    new CHIPAccessControlAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = BinaryInputBasic::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = AccessControl::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<BinaryInputBasicAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<AccessControlAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -7582,7 +8061,7 @@ - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BinaryInputBasic::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = AccessControl::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -7602,7 +8081,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BinaryInputBasic::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = AccessControl::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -7622,7 +8101,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BinaryInputBasic::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = AccessControl::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -7642,7 +8121,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BinaryInputBasic::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = AccessControl::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -7663,7 +8142,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BinaryInputBasic::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = AccessControl::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -7684,7 +8163,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BinaryInputBasic::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = AccessControl::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -7702,200 +8181,431 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPBinding
+@implementation CHIPBridgedActions
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)readAttributeBindingWithParams:(CHIPReadParams * _Nullable)params
-                     completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)instantActionWithParams:(CHIPBridgedActionsClusterInstantActionParams *)params
+              completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPBindingBindingListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Binding::Attributes::Binding::TypeInfo;
-            auto successFn = Callback<BindingBindingListAttributeCallback>::FromCancelable(success);
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    BridgedActions::Commands::InstantAction::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.actionID = params.actionID.unsignedShortValue;
+    if (params.invokeID != nil) {
+        auto & definedValue_0 = request.invokeID.Emplace();
+        definedValue_0 = params.invokeID.unsignedIntValue;
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue]);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)writeAttributeBindingWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeBindingWithValue:(NSArray * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeBindingWithValue:(NSArray * _Nonnull)value
-                                params:(CHIPWriteParams * _Nullable)params
-                     completionHandler:(StatusCompletion)completionHandler
+- (void)instantActionWithTransitionWithParams:(CHIPBridgedActionsClusterInstantActionWithTransitionParams *)params
+                            completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    BridgedActions::Commands::InstantActionWithTransition::Type request;
     if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
+    request.actionID = params.actionID.unsignedShortValue;
+    if (params.invokeID != nil) {
+        auto & definedValue_0 = request.invokeID.Emplace();
+        definedValue_0 = params.invokeID.unsignedIntValue;
+    }
+    request.transitionTime = params.transitionTime.unsignedShortValue;
 
-    new CHIPDefaultSuccessCallbackBridge(
+    new CHIPCommandSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
+        ^(id _Nullable value, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Binding::Attributes::Binding::TypeInfo;
-            TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPBindingClusterTargetStruct class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (CHIPBindingClusterTargetStruct *) value[i_0];
-                        if (element_0.node != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].node.Emplace();
-                            definedValue_2 = element_0.node.unsignedLongLongValue;
-                        }
-                        if (element_0.group != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].group.Emplace();
-                            definedValue_2 = element_0.group.unsignedShortValue;
-                        }
-                        if (element_0.endpoint != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].endpoint.Emplace();
-                            definedValue_2 = element_0.endpoint.unsignedShortValue;
-                        }
-                        if (element_0.cluster != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].cluster.Emplace();
-                            definedValue_2 = element_0.cluster.unsignedIntValue;
-                        }
-                        listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeBindingWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)startActionWithParams:(CHIPBridgedActionsClusterStartActionParams *)params
+            completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPBindingBindingListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    BridgedActions::Commands::StartAction::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.actionID = params.actionID.unsignedShortValue;
+    if (params.invokeID != nil) {
+        auto & definedValue_0 = request.invokeID.Emplace();
+        definedValue_0 = params.invokeID.unsignedIntValue;
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
         ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = Binding::Attributes::Binding::TypeInfo;
-            auto successFn = Callback<BindingBindingListAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBindingBindingListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)startActionWithDurationWithParams:(CHIPBridgedActionsClusterStartActionWithDurationParams *)params
+                        completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    BridgedActions::Commands::StartActionWithDuration::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.actionID = params.actionID.unsignedShortValue;
+    if (params.invokeID != nil) {
+        auto & definedValue_0 = request.invokeID.Emplace();
+        definedValue_0 = params.invokeID.unsignedIntValue;
+    }
+    request.duration = params.duration.unsignedIntValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
         },
-        subscriptionEstablishedHandler);
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-+ (void)readAttributeBindingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)stopActionWithParams:(CHIPBridgedActionsClusterStopActionParams *)params
+           completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPBindingBindingListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = Binding::Attributes::Binding::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BindingBindingListAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    BridgedActions::Commands::StopAction::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+    }
+    request.actionID = params.actionID.unsignedShortValue;
+    if (params.invokeID != nil) {
+        auto & definedValue_0 = request.invokeID.Emplace();
+        definedValue_0 = params.invokeID.unsignedIntValue;
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)pauseActionWithParams:(CHIPBridgedActionsClusterPauseActionParams *)params
+            completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPBindingGeneratedCommandListListAttributeCallbackBridge(
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    BridgedActions::Commands::PauseAction::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.actionID = params.actionID.unsignedShortValue;
+    if (params.invokeID != nil) {
+        auto & definedValue_0 = request.invokeID.Emplace();
+        definedValue_0 = params.invokeID.unsignedIntValue;
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)pauseActionWithDurationWithParams:(CHIPBridgedActionsClusterPauseActionWithDurationParams *)params
+                        completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    BridgedActions::Commands::PauseActionWithDuration::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.actionID = params.actionID.unsignedShortValue;
+    if (params.invokeID != nil) {
+        auto & definedValue_0 = request.invokeID.Emplace();
+        definedValue_0 = params.invokeID.unsignedIntValue;
+    }
+    request.duration = params.duration.unsignedIntValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)resumeActionWithParams:(CHIPBridgedActionsClusterResumeActionParams *)params
+             completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    BridgedActions::Commands::ResumeAction::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.actionID = params.actionID.unsignedShortValue;
+    if (params.invokeID != nil) {
+        auto & definedValue_0 = request.invokeID.Emplace();
+        definedValue_0 = params.invokeID.unsignedIntValue;
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)enableActionWithParams:(CHIPBridgedActionsClusterEnableActionParams *)params
+             completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    BridgedActions::Commands::EnableAction::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.actionID = params.actionID.unsignedShortValue;
+    if (params.invokeID != nil) {
+        auto & definedValue_0 = request.invokeID.Emplace();
+        definedValue_0 = params.invokeID.unsignedIntValue;
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)enableActionWithDurationWithParams:(CHIPBridgedActionsClusterEnableActionWithDurationParams *)params
+                         completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    BridgedActions::Commands::EnableActionWithDuration::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.actionID = params.actionID.unsignedShortValue;
+    if (params.invokeID != nil) {
+        auto & definedValue_0 = request.invokeID.Emplace();
+        definedValue_0 = params.invokeID.unsignedIntValue;
+    }
+    request.duration = params.duration.unsignedIntValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)disableActionWithParams:(CHIPBridgedActionsClusterDisableActionParams *)params
+              completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    BridgedActions::Commands::DisableAction::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.actionID = params.actionID.unsignedShortValue;
+    if (params.invokeID != nil) {
+        auto & definedValue_0 = request.invokeID.Emplace();
+        definedValue_0 = params.invokeID.unsignedIntValue;
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)disableActionWithDurationWithParams:(CHIPBridgedActionsClusterDisableActionWithDurationParams *)params
+                          completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    BridgedActions::Commands::DisableActionWithDuration::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.actionID = params.actionID.unsignedShortValue;
+    if (params.invokeID != nil) {
+        auto & definedValue_0 = request.invokeID.Emplace();
+        definedValue_0 = params.invokeID.unsignedIntValue;
+    }
+    request.duration = params.duration.unsignedIntValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)readAttributeActionListWithCompletionHandler:(void (^)(
+                                                         NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPBridgedActionsActionListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Binding::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<BindingGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedActions::Attributes::ActionList::TypeInfo;
+            auto successFn = Callback<BridgedActionsActionListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeActionListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBindingGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPBridgedActionsActionListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Binding::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<BindingGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedActions::Attributes::ActionList::TypeInfo;
+            auto successFn = Callback<BridgedActionsActionListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBindingGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBridgedActionsActionListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeActionListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBindingGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPBridgedActionsActionListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = Binding::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = BridgedActions::Attributes::ActionList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<BindingGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<BridgedActionsActionListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -7905,62 +8615,60 @@ new CHIPBindingGeneratedCommandListListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeEndpointListWithCompletionHandler:(void (^)(
+                                                           NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBindingAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPBridgedActionsEndpointListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Binding::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<BindingAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedActions::Attributes::EndpointList::TypeInfo;
+            auto successFn = Callback<BridgedActionsEndpointListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeEndpointListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBindingAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPBridgedActionsEndpointListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Binding::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<BindingAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedActions::Attributes::EndpointList::TypeInfo;
+            auto successFn = Callback<BridgedActionsEndpointListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBindingAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBridgedActionsEndpointListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeEndpointListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBindingAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPBridgedActionsEndpointListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = Binding::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = BridgedActions::Attributes::EndpointList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<BindingAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<BridgedActionsEndpointListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -7970,251 +8678,57 @@ new CHIPBindingAcceptedCommandListListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeSetupUrlWithCompletionHandler:(void (^)(
+                                                       NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBindingAttributeListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Binding::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<BindingAttributeListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BridgedActions::Attributes::SetupUrl::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSetupUrlWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBindingAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Binding::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<BindingAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedActions::Attributes::SetupUrl::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBindingAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPBindingAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = Binding::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<BindingAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Binding::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = Binding::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = Binding::Attributes::FeatureMap::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Binding::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = Binding::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = Binding::Attributes::ClusterRevision::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-@end
-
-@implementation CHIPBooleanState
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)readAttributeStateValueWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BooleanState::Attributes::StateValue::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeStateValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = BooleanState::Attributes::StateValue::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeStateValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeSetupUrlWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BooleanState::Attributes::StateValue::TypeInfo;
+            using TypeInfo = BridgedActions::Attributes::SetupUrl::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -8227,10 +8741,10 @@ new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable *
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanStateGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPBridgedActionsGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = BooleanState::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<BooleanStateGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedActions::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<BridgedActionsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -8244,19 +8758,19 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
                                                 reportHandler:
                                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBooleanStateGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPBridgedActionsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BooleanState::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<BooleanStateGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedActions::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<BridgedActionsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanStateGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBridgedActionsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -8269,17 +8783,17 @@ + (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheC
                                           completionHandler:
                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanStateGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPBridgedActionsGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = BooleanState::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = BridgedActions::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<BooleanStateGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<BridgedActionsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -8292,10 +8806,10 @@ new CHIPBooleanStateGeneratedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanStateAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPBridgedActionsAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = BooleanState::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<BooleanStateAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedActions::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<BridgedActionsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -8309,19 +8823,19 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBooleanStateAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPBridgedActionsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BooleanState::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<BooleanStateAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedActions::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<BridgedActionsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanStateAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBridgedActionsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -8334,17 +8848,17 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanStateAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPBridgedActionsAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = BooleanState::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = BridgedActions::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<BooleanStateAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<BridgedActionsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -8357,10 +8871,10 @@ new CHIPBooleanStateAcceptedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanStateAttributeListListAttributeCallbackBridge(
+    new CHIPBridgedActionsAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = BooleanState::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<BooleanStateAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedActions::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<BridgedActionsAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -8372,19 +8886,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBooleanStateAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPBridgedActionsAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BooleanState::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<BooleanStateAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedActions::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<BridgedActionsAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanStateAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBridgedActionsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -8397,17 +8911,17 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanStateAttributeListListAttributeCallbackBridge(
+    new CHIPBridgedActionsAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = BooleanState::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = BridgedActions::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<BooleanStateAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<BridgedActionsAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -8421,7 +8935,7 @@ - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BooleanState::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = BridgedActions::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -8441,7 +8955,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BooleanState::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = BridgedActions::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -8461,7 +8975,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BooleanState::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = BridgedActions::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -8481,7 +8995,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BooleanState::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = BridgedActions::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -8502,7 +9016,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BooleanState::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = BridgedActions::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -8523,7 +9037,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BooleanState::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = BridgedActions::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -8541,60 +9055,28 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPBridgedActions
+@implementation CHIPBasic
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)instantActionWithParams:(CHIPBridgedActionsClusterInstantActionParams *)params
-              completionHandler:(StatusCompletion)completionHandler
+- (void)mfgSpecificPingWithCompletionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    BridgedActions::Commands::InstantAction::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.actionID = params.actionID.unsignedShortValue;
-    if (params.invokeID != nil) {
-        auto & definedValue_0 = request.invokeID.Emplace();
-        definedValue_0 = params.invokeID.unsignedIntValue;
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+    [self mfgSpecificPingWithParams:nil completionHandler:completionHandler];
 }
-
-- (void)instantActionWithTransitionWithParams:(CHIPBridgedActionsClusterInstantActionWithTransitionParams *)params
-                            completionHandler:(StatusCompletion)completionHandler
+- (void)mfgSpecificPingWithParams:(CHIPBasicClusterMfgSpecificPingParams * _Nullable)params
+                completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    BridgedActions::Commands::InstantActionWithTransition::Type request;
+    Basic::Commands::MfgSpecificPing::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    request.actionID = params.actionID.unsignedShortValue;
-    if (params.invokeID != nil) {
-        auto & definedValue_0 = request.invokeID.Emplace();
-        definedValue_0 = params.invokeID.unsignedIntValue;
-    }
-    request.transitionTime = params.transitionTime.unsignedShortValue;
 
     new CHIPCommandSuccessCallbackBridge(
         self.callbackQueue,
@@ -8609,451 +9091,357 @@ new CHIPCommandSuccessCallbackBridge(
         });
 }
 
-- (void)startActionWithParams:(CHIPBridgedActionsClusterStartActionParams *)params
-            completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeDataModelRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    BridgedActions::Commands::StartAction::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.actionID = params.actionID.unsignedShortValue;
-    if (params.invokeID != nil) {
-        auto & definedValue_0 = request.invokeID.Emplace();
-        definedValue_0 = params.invokeID.unsignedIntValue;
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Basic::Attributes::DataModelRevision::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)startActionWithDurationWithParams:(CHIPBridgedActionsClusterStartActionWithDurationParams *)params
-                        completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeDataModelRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    BridgedActions::Commands::StartActionWithDuration::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.actionID = params.actionID.unsignedShortValue;
-    if (params.invokeID != nil) {
-        auto & definedValue_0 = request.invokeID.Emplace();
-        definedValue_0 = params.invokeID.unsignedIntValue;
-    }
-    request.duration = params.duration.unsignedIntValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = Basic::Attributes::DataModelRevision::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
 
-- (void)stopActionWithParams:(CHIPBridgedActionsClusterStopActionParams *)params
-           completionHandler:(StatusCompletion)completionHandler
++ (void)readAttributeDataModelRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    BridgedActions::Commands::StopAction::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Basic::Attributes::DataModelRevision::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
-    request.actionID = params.actionID.unsignedShortValue;
-    if (params.invokeID != nil) {
-        auto & definedValue_0 = request.invokeID.Emplace();
-        definedValue_0 = params.invokeID.unsignedIntValue;
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)pauseActionWithParams:(CHIPBridgedActionsClusterPauseActionParams *)params
-            completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeVendorNameWithCompletionHandler:(void (^)(
+                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    BridgedActions::Commands::PauseAction::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.actionID = params.actionID.unsignedShortValue;
-    if (params.invokeID != nil) {
-        auto & definedValue_0 = request.invokeID.Emplace();
-        definedValue_0 = params.invokeID.unsignedIntValue;
-    }
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Basic::Attributes::VendorName::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
 
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
+- (void)subscribeAttributeVendorNameWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = Basic::Attributes::VendorName::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
 
-- (void)pauseActionWithDurationWithParams:(CHIPBridgedActionsClusterPauseActionWithDurationParams *)params
-                        completionHandler:(StatusCompletion)completionHandler
++ (void)readAttributeVendorNameWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    BridgedActions::Commands::PauseActionWithDuration::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.actionID = params.actionID.unsignedShortValue;
-    if (params.invokeID != nil) {
-        auto & definedValue_0 = request.invokeID.Emplace();
-        definedValue_0 = params.invokeID.unsignedIntValue;
-    }
-    request.duration = params.duration.unsignedIntValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)resumeActionWithParams:(CHIPBridgedActionsClusterResumeActionParams *)params
-             completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    BridgedActions::Commands::ResumeAction::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Basic::Attributes::VendorName::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
-    request.actionID = params.actionID.unsignedShortValue;
-    if (params.invokeID != nil) {
-        auto & definedValue_0 = request.invokeID.Emplace();
-        definedValue_0 = params.invokeID.unsignedIntValue;
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)enableActionWithParams:(CHIPBridgedActionsClusterEnableActionParams *)params
-             completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeVendorIDWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    BridgedActions::Commands::EnableAction::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.actionID = params.actionID.unsignedShortValue;
-    if (params.invokeID != nil) {
-        auto & definedValue_0 = request.invokeID.Emplace();
-        definedValue_0 = params.invokeID.unsignedIntValue;
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+    new CHIPVendorIdAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Basic::Attributes::VendorID::TypeInfo;
+        auto successFn = Callback<VendorIdAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)enableActionWithDurationWithParams:(CHIPBridgedActionsClusterEnableActionWithDurationParams *)params
-                         completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeVendorIDWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    BridgedActions::Commands::EnableActionWithDuration::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.actionID = params.actionID.unsignedShortValue;
-    if (params.invokeID != nil) {
-        auto & definedValue_0 = request.invokeID.Emplace();
-        definedValue_0 = params.invokeID.unsignedIntValue;
-    }
-    request.duration = params.duration.unsignedIntValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
+    new CHIPVendorIdAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = Basic::Attributes::VendorID::TypeInfo;
+            auto successFn = Callback<VendorIdAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)disableActionWithParams:(CHIPBridgedActionsClusterDisableActionParams *)params
-              completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    BridgedActions::Commands::DisableAction::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.actionID = params.actionID.unsignedShortValue;
-    if (params.invokeID != nil) {
-        auto & definedValue_0 = request.invokeID.Emplace();
-        definedValue_0 = params.invokeID.unsignedIntValue;
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPVendorIdAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+        subscriptionEstablishedHandler);
 }
 
-- (void)disableActionWithDurationWithParams:(CHIPBridgedActionsClusterDisableActionWithDurationParams *)params
-                          completionHandler:(StatusCompletion)completionHandler
++ (void)readAttributeVendorIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    BridgedActions::Commands::DisableActionWithDuration::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+    new CHIPVendorIdAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Basic::Attributes::VendorID::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<VendorIdAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
-    request.actionID = params.actionID.unsignedShortValue;
-    if (params.invokeID != nil) {
-        auto & definedValue_0 = request.invokeID.Emplace();
-        definedValue_0 = params.invokeID.unsignedIntValue;
-    }
-    request.duration = params.duration.unsignedIntValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeActionListWithCompletionHandler:(void (^)(
-                                                         NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeProductNameWithCompletionHandler:(void (^)(
+                                                          NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBridgedActionsActionListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = BridgedActions::Attributes::ActionList::TypeInfo;
-            auto successFn = Callback<BridgedActionsActionListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Basic::Attributes::ProductName::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeActionListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeProductNameWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBridgedActionsActionListListAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedActions::Attributes::ActionList::TypeInfo;
-            auto successFn = Callback<BridgedActionsActionListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Basic::Attributes::ProductName::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBridgedActionsActionListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeActionListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeProductNameWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBridgedActionsActionListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = BridgedActions::Attributes::ActionList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<BridgedActionsActionListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Basic::Attributes::ProductName::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeEndpointListWithCompletionHandler:(void (^)(
-                                                           NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeProductIDWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBridgedActionsEndpointListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = BridgedActions::Attributes::EndpointList::TypeInfo;
-            auto successFn = Callback<BridgedActionsEndpointListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Basic::Attributes::ProductID::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeEndpointListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeProductIDWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBridgedActionsEndpointListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedActions::Attributes::EndpointList::TypeInfo;
-            auto successFn = Callback<BridgedActionsEndpointListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Basic::Attributes::ProductID::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBridgedActionsEndpointListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeEndpointListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeProductIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBridgedActionsEndpointListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = BridgedActions::Attributes::EndpointList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<BridgedActionsEndpointListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Basic::Attributes::ProductID::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeSetupUrlWithCompletionHandler:(void (^)(
-                                                       NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeNodeLabelWithCompletionHandler:(void (^)(
+                                                        NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BridgedActions::Attributes::SetupUrl::TypeInfo;
+        using TypeInfo = Basic::Attributes::NodeLabel::TypeInfo;
         auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeSetupUrlWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeNodeLabelWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeNodeLabelWithValue:(NSString * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeNodeLabelWithValue:(NSString * _Nonnull)value
+                                  params:(CHIPWriteParams * _Nullable)params
+                       completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Basic::Attributes::NodeLabel::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = [self asCharSpan:value];
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNodeLabelWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -9062,7 +9450,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedActions::Attributes::SetupUrl::TypeInfo;
+            using TypeInfo = Basic::Attributes::NodeLabel::TypeInfo;
             auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -9074,15 +9462,15 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSetupUrlWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNodeLabelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BridgedActions::Attributes::SetupUrl::TypeInfo;
+            using TypeInfo = Basic::Attributes::NodeLabel::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -9098,250 +9486,214 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeLocationWithCompletionHandler:(void (^)(
+                                                       NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBridgedActionsGeneratedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = BridgedActions::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<BridgedActionsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Basic::Attributes::Location::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributeLocationWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeLocationWithValue:(NSString * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeLocationWithValue:(NSString * _Nonnull)value
+                                 params:(CHIPWriteParams * _Nullable)params
+                      completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Basic::Attributes::Location::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = [self asCharSpan:value];
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeLocationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBridgedActionsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedActions::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<BridgedActionsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Basic::Attributes::Location::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBridgedActionsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeLocationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBridgedActionsGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = BridgedActions::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<BridgedActionsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
-{
-    new CHIPBridgedActionsAcceptedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = BridgedActions::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<BridgedActionsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPBridgedActionsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = BridgedActions::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<BridgedActionsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBridgedActionsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPBridgedActionsAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = BridgedActions::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<BridgedActionsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Basic::Attributes::Location::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeHardwareVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPBridgedActionsAttributeListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = BridgedActions::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<BridgedActionsAttributeListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Basic::Attributes::HardwareVersion::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeHardwareVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBridgedActionsAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedActions::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<BridgedActionsAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Basic::Attributes::HardwareVersion::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBridgedActionsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeHardwareVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBridgedActionsAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = BridgedActions::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<BridgedActionsAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Basic::Attributes::HardwareVersion::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeHardwareVersionStringWithCompletionHandler:(void (^)(NSString * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BridgedActions::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Basic::Attributes::HardwareVersionString::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeHardwareVersionStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedActions::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Basic::Attributes::HardwareVersionString::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeHardwareVersionStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BridgedActions::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Basic::Attributes::HardwareVersionString::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -9351,59 +9703,59 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeSoftwareVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BridgedActions::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Basic::Attributes::SoftwareVersion::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeSoftwareVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
                                              maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(CHIPSubscribeParams * _Nullable)params
                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                            reportHandler:
                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedActions::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Basic::Attributes::SoftwareVersion::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeSoftwareVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                               endpoint:(NSNumber *)endpoint
                                                  queue:(dispatch_queue_t)queue
                                      completionHandler:
                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BridgedActions::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Basic::Attributes::SoftwareVersion::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -9413,31 +9765,24 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPBridgedDeviceBasic
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)readAttributeVendorNameWithCompletionHandler:(void (^)(
-                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeSoftwareVersionStringWithCompletionHandler:(void (^)(NSString * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler
 {
     new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BridgedDeviceBasic::Attributes::VendorName::TypeInfo;
+        using TypeInfo = Basic::Attributes::SoftwareVersionString::TypeInfo;
         auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeVendorNameWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSoftwareVersionStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -9446,7 +9791,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedDeviceBasic::Attributes::VendorName::TypeInfo;
+            using TypeInfo = Basic::Attributes::SoftwareVersionString::TypeInfo;
             auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -9458,15 +9803,16 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeVendorNameWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeSoftwareVersionStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BridgedDeviceBasic::Attributes::VendorName::TypeInfo;
+            using TypeInfo = Basic::Attributes::SoftwareVersionString::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -9482,57 +9828,59 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
-- (void)readAttributeVendorIDWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeManufacturingDateWithCompletionHandler:(void (^)(NSString * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPVendorIdAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BridgedDeviceBasic::Attributes::VendorID::TypeInfo;
-        auto successFn = Callback<VendorIdAttributeCallback>::FromCancelable(success);
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Basic::Attributes::ManufacturingDate::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeVendorIDWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeManufacturingDateWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPVendorIdAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedDeviceBasic::Attributes::VendorID::TypeInfo;
-            auto successFn = Callback<VendorIdAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Basic::Attributes::ManufacturingDate::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPVendorIdAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeVendorIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeManufacturingDateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPVendorIdAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BridgedDeviceBasic::Attributes::VendorID::TypeInfo;
+            using TypeInfo = Basic::Attributes::ManufacturingDate::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<VendorIdAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -9542,22 +9890,22 @@ new CHIPVendorIdAttributeCallbackBridge(queue, completionHandler, ^(Cancelable *
     });
 }
 
-- (void)readAttributeProductNameWithCompletionHandler:(void (^)(
-                                                          NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributePartNumberWithCompletionHandler:(void (^)(
+                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BridgedDeviceBasic::Attributes::ProductName::TypeInfo;
+        using TypeInfo = Basic::Attributes::PartNumber::TypeInfo;
         auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeProductNameWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePartNumberWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -9566,7 +9914,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedDeviceBasic::Attributes::ProductName::TypeInfo;
+            using TypeInfo = Basic::Attributes::PartNumber::TypeInfo;
             auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -9578,16 +9926,15 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeProductNameWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePartNumberWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BridgedDeviceBasic::Attributes::ProductName::TypeInfo;
+            using TypeInfo = Basic::Attributes::PartNumber::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -9603,54 +9950,22 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
-- (void)readAttributeNodeLabelWithCompletionHandler:(void (^)(
-                                                        NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeProductURLWithCompletionHandler:(void (^)(
+                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BridgedDeviceBasic::Attributes::NodeLabel::TypeInfo;
+        using TypeInfo = Basic::Attributes::ProductURL::TypeInfo;
         auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeNodeLabelWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNodeLabelWithValue:(NSString * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeNodeLabelWithValue:(NSString * _Nonnull)value
-                                  params:(CHIPWriteParams * _Nullable)params
-                       completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = BridgedDeviceBasic::Attributes::NodeLabel::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeNodeLabelWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeProductURLWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -9659,7 +9974,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedDeviceBasic::Attributes::NodeLabel::TypeInfo;
+            using TypeInfo = Basic::Attributes::ProductURL::TypeInfo;
             auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -9671,15 +9986,15 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNodeLabelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeProductURLWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BridgedDeviceBasic::Attributes::NodeLabel::TypeInfo;
+            using TypeInfo = Basic::Attributes::ProductURL::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -9695,59 +10010,58 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
-- (void)readAttributeHardwareVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeProductLabelWithCompletionHandler:(void (^)(
+                                                           NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BridgedDeviceBasic::Attributes::HardwareVersion::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Basic::Attributes::ProductLabel::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeHardwareVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeProductLabelWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedDeviceBasic::Attributes::HardwareVersion::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Basic::Attributes::ProductLabel::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeHardwareVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeProductLabelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BridgedDeviceBasic::Attributes::HardwareVersion::TypeInfo;
+            using TypeInfo = Basic::Attributes::ProductLabel::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -9757,24 +10071,22 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeHardwareVersionStringWithCompletionHandler:(void (^)(NSString * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler
+- (void)readAttributeSerialNumberWithCompletionHandler:(void (^)(
+                                                           NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BridgedDeviceBasic::Attributes::HardwareVersionString::TypeInfo;
+        using TypeInfo = Basic::Attributes::SerialNumber::TypeInfo;
         auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeHardwareVersionStringWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSerialNumberWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -9783,7 +10095,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedDeviceBasic::Attributes::HardwareVersionString::TypeInfo;
+            using TypeInfo = Basic::Attributes::SerialNumber::TypeInfo;
             auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -9795,16 +10107,16 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeHardwareVersionStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeSerialNumberWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BridgedDeviceBasic::Attributes::HardwareVersionString::TypeInfo;
+            using TypeInfo = Basic::Attributes::SerialNumber::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -9820,59 +10132,92 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
-- (void)readAttributeSoftwareVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeLocalConfigDisabledWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BridgedDeviceBasic::Attributes::SoftwareVersion::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Basic::Attributes::LocalConfigDisabled::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeSoftwareVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeLocalConfigDisabledWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeLocalConfigDisabledWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeLocalConfigDisabledWithValue:(NSNumber * _Nonnull)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Basic::Attributes::LocalConfigDisabled::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.boolValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeLocalConfigDisabledWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedDeviceBasic::Attributes::SoftwareVersion::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Basic::Attributes::LocalConfigDisabled::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSoftwareVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeLocalConfigDisabledWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BridgedDeviceBasic::Attributes::SoftwareVersion::TypeInfo;
+            using TypeInfo = Basic::Attributes::LocalConfigDisabled::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -9882,60 +10227,57 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeSoftwareVersionStringWithCompletionHandler:(void (^)(NSString * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler
+- (void)readAttributeReachableWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BridgedDeviceBasic::Attributes::SoftwareVersionString::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Basic::Attributes::Reachable::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeSoftwareVersionStringWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeReachableWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedDeviceBasic::Attributes::SoftwareVersionString::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Basic::Attributes::Reachable::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSoftwareVersionStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeReachableWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BridgedDeviceBasic::Attributes::SoftwareVersionString::TypeInfo;
+            using TypeInfo = Basic::Attributes::Reachable::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -9945,23 +10287,22 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
-- (void)readAttributeManufacturingDateWithCompletionHandler:(void (^)(NSString * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeUniqueIDWithCompletionHandler:(void (^)(
+                                                       NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BridgedDeviceBasic::Attributes::ManufacturingDate::TypeInfo;
+        using TypeInfo = Basic::Attributes::UniqueID::TypeInfo;
         auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeManufacturingDateWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeUniqueIDWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -9970,7 +10311,7 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedDeviceBasic::Attributes::ManufacturingDate::TypeInfo;
+            using TypeInfo = Basic::Attributes::UniqueID::TypeInfo;
             auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -9982,16 +10323,15 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeManufacturingDateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeUniqueIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BridgedDeviceBasic::Attributes::ManufacturingDate::TypeInfo;
+            using TypeInfo = Basic::Attributes::UniqueID::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -10007,239 +10347,253 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
-- (void)readAttributePartNumberWithCompletionHandler:(void (^)(
-                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeCapabilityMinimaWithCompletionHandler:(void (^)(CHIPBasicClusterCapabilityMinimaStruct * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BridgedDeviceBasic::Attributes::PartNumber::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPBasicCapabilityMinimaStructAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Basic::Attributes::CapabilityMinima::TypeInfo;
+            auto successFn = Callback<BasicCapabilityMinimaStructAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributePartNumberWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCapabilityMinimaWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:(void (^)(CHIPBasicClusterCapabilityMinimaStruct * _Nullable value,
+                                                              NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPBasicCapabilityMinimaStructAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedDeviceBasic::Attributes::PartNumber::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Basic::Attributes::CapabilityMinima::TypeInfo;
+            auto successFn = Callback<BasicCapabilityMinimaStructAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBasicCapabilityMinimaStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePartNumberWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCapabilityMinimaWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:(void (^)(CHIPBasicClusterCapabilityMinimaStruct * _Nullable value,
+                                                            NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = BridgedDeviceBasic::Attributes::PartNumber::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPBasicCapabilityMinimaStructAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = Basic::Attributes::CapabilityMinima::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<BasicCapabilityMinimaStructAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeProductURLWithCompletionHandler:(void (^)(
-                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BridgedDeviceBasic::Attributes::ProductURL::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPBasicGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Basic::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<BasicGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeProductURLWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedDeviceBasic::Attributes::ProductURL::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Basic::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<BasicGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeProductURLWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = BridgedDeviceBasic::Attributes::ProductURL::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPBasicGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = Basic::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<BasicGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeProductLabelWithCompletionHandler:(void (^)(
-                                                           NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BridgedDeviceBasic::Attributes::ProductLabel::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPBasicAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Basic::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<BasicAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeProductLabelWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedDeviceBasic::Attributes::ProductLabel::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Basic::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<BasicAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeProductLabelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = BridgedDeviceBasic::Attributes::ProductLabel::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPBasicAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = Basic::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<BasicAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeSerialNumberWithCompletionHandler:(void (^)(
-                                                           NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BridgedDeviceBasic::Attributes::SerialNumber::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPBasicAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Basic::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<BasicAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeSerialNumberWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPBasicAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedDeviceBasic::Attributes::SerialNumber::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Basic::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<BasicAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBasicAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSerialNumberWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBasicAttributeListListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BridgedDeviceBasic::Attributes::SerialNumber::TypeInfo;
+            using TypeInfo = Basic::Attributes::AttributeList::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BasicAttributeListListAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -10249,57 +10603,57 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
-- (void)readAttributeReachableWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BridgedDeviceBasic::Attributes::Reachable::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Basic::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeReachableWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedDeviceBasic::Attributes::Reachable::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Basic::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeReachableWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BridgedDeviceBasic::Attributes::Reachable::TypeInfo;
+            using TypeInfo = Basic::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -10309,57 +10663,59 @@ new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable *
     });
 }
 
-- (void)readAttributeUniqueIDWithCompletionHandler:(void (^)(
-                                                       NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BridgedDeviceBasic::Attributes::UniqueID::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Basic::Attributes::ClusterRevision::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeUniqueIDWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedDeviceBasic::Attributes::UniqueID::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Basic::Attributes::ClusterRevision::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeUniqueIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BridgedDeviceBasic::Attributes::UniqueID::TypeInfo;
+            using TypeInfo = Basic::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -10369,13 +10725,137 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
+@end
+
+@implementation CHIPOtaSoftwareUpdateProvider
+
+- (chip::Controller::ClusterBase *)getCluster
+{
+    return &_cppCluster;
+}
+
+- (void)queryImageWithParams:(CHIPOtaSoftwareUpdateProviderClusterQueryImageParams *)params
+           completionHandler:(void (^)(CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseParams * _Nullable data,
+                                 NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    OtaSoftwareUpdateProvider::Commands::QueryImage::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.vendorId = static_cast<std::remove_reference_t<decltype(request.vendorId)>>(params.vendorId.unsignedShortValue);
+    request.productId = params.productId.unsignedShortValue;
+    request.softwareVersion = params.softwareVersion.unsignedIntValue;
+    {
+        using ListType_0 = std::remove_reference_t<decltype(request.protocolsSupported)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        if (params.protocolsSupported.count != 0) {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.protocolsSupported.count);
+            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return;
+            }
+            listFreer.add(listHolder_0);
+            for (size_t i_0 = 0; i_0 < params.protocolsSupported.count; ++i_0) {
+                if (![params.protocolsSupported[i_0] isKindOfClass:[NSNumber class]]) {
+                    // Wrong kind of value.
+                    return;
+                }
+                auto element_0 = (NSNumber *) params.protocolsSupported[i_0];
+                listHolder_0->mList[i_0]
+                    = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0])>>(element_0.unsignedCharValue);
+            }
+            request.protocolsSupported = ListType_0(listHolder_0->mList, params.protocolsSupported.count);
+        } else {
+            request.protocolsSupported = ListType_0();
+        }
+    }
+    if (params.hardwareVersion != nil) {
+        auto & definedValue_0 = request.hardwareVersion.Emplace();
+        definedValue_0 = params.hardwareVersion.unsignedShortValue;
+    }
+    if (params.location != nil) {
+        auto & definedValue_0 = request.location.Emplace();
+        definedValue_0 = [self asCharSpan:params.location];
+    }
+    if (params.requestorCanConsent != nil) {
+        auto & definedValue_0 = request.requestorCanConsent.Emplace();
+        definedValue_0 = params.requestorCanConsent.boolValue;
+    }
+    if (params.metadataForProvider != nil) {
+        auto & definedValue_0 = request.metadataForProvider.Emplace();
+        definedValue_0 = [self asByteSpan:params.metadataForProvider];
+    }
+
+    new CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)applyUpdateRequestWithParams:(CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestParams *)params
+                   completionHandler:(void (^)(CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseParams * _Nullable data,
+                                         NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    OtaSoftwareUpdateProvider::Commands::ApplyUpdateRequest::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.updateToken = [self asByteSpan:params.updateToken];
+    request.newVersion = params.newVersion.unsignedIntValue;
+
+    new CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)notifyUpdateAppliedWithParams:(CHIPOtaSoftwareUpdateProviderClusterNotifyUpdateAppliedParams *)params
+                    completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    OtaSoftwareUpdateProvider::Commands::NotifyUpdateApplied::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.updateToken = [self asByteSpan:params.updateToken];
+    request.softwareVersion = params.softwareVersion.unsignedIntValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = BridgedDeviceBasic::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<BridgedDeviceBasicGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<OtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -10389,20 +10869,20 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
                                                 reportHandler:
                                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedDeviceBasic::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<BridgedDeviceBasicGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<OtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -10414,17 +10894,18 @@ + (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheC
                                           completionHandler:
                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = BridgedDeviceBasic::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = OtaSoftwareUpdateProvider::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<BridgedDeviceBasicGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn
+                    = Callback<OtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -10437,10 +10918,10 @@ new CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = BridgedDeviceBasic::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<BridgedDeviceBasicAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<OtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -10454,20 +10935,20 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedDeviceBasic::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<BridgedDeviceBasicAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<OtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -10479,17 +10960,18 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = BridgedDeviceBasic::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = OtaSoftwareUpdateProvider::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<BridgedDeviceBasicAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn
+                    = Callback<OtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -10502,10 +10984,10 @@ new CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBridgedDeviceBasicAttributeListListAttributeCallbackBridge(
+    new CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = BridgedDeviceBasic::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<BridgedDeviceBasicAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<OtaSoftwareUpdateProviderAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -10517,19 +10999,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBridgedDeviceBasicAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedDeviceBasic::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<BridgedDeviceBasicAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<OtaSoftwareUpdateProviderAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBridgedDeviceBasicAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -10542,17 +11024,17 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBridgedDeviceBasicAttributeListListAttributeCallbackBridge(
+    new CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = BridgedDeviceBasic::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = OtaSoftwareUpdateProvider::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<BridgedDeviceBasicAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<OtaSoftwareUpdateProviderAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -10566,7 +11048,7 @@ - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BridgedDeviceBasic::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = OtaSoftwareUpdateProvider::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -10586,7 +11068,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedDeviceBasic::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -10606,7 +11088,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BridgedDeviceBasic::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -10626,7 +11108,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = BridgedDeviceBasic::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = OtaSoftwareUpdateProvider::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -10647,7 +11129,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = BridgedDeviceBasic::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -10668,7 +11150,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = BridgedDeviceBasic::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -10686,49 +11168,33 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPChannel
+@implementation CHIPOtaSoftwareUpdateRequestor
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)changeChannelWithParams:(CHIPChannelClusterChangeChannelParams *)params
-              completionHandler:(void (^)(CHIPChannelClusterChangeChannelResponseParams * _Nullable data,
-                                    NSError * _Nullable error))completionHandler
+- (void)announceOtaProviderWithParams:(CHIPOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderParams *)params
+                    completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    Channel::Commands::ChangeChannel::Type request;
+    OtaSoftwareUpdateRequestor::Commands::AnnounceOtaProvider::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    request.match = [self asCharSpan:params.match];
-
-    new CHIPChannelClusterChangeChannelResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPChannelClusterChangeChannelResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)changeChannelByNumberWithParams:(CHIPChannelClusterChangeChannelByNumberParams *)params
-                      completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    Channel::Commands::ChangeChannelByNumber::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
+    request.providerNodeId = params.providerNodeId.unsignedLongLongValue;
+    request.vendorId = static_cast<std::remove_reference_t<decltype(request.vendorId)>>(params.vendorId.unsignedShortValue);
+    request.announcementReason
+        = static_cast<std::remove_reference_t<decltype(request.announcementReason)>>(params.announcementReason.unsignedCharValue);
+    if (params.metadataForNode != nil) {
+        auto & definedValue_0 = request.metadataForNode.Emplace();
+        definedValue_0 = [self asByteSpan:params.metadataForNode];
     }
-    request.majorNumber = params.majorNumber.unsignedShortValue;
-    request.minorNumber = params.minorNumber.unsignedShortValue;
+    request.endpoint = params.endpoint.unsignedShortValue;
 
     new CHIPCommandSuccessCallbackBridge(
         self.callbackQueue,
@@ -10743,146 +11209,181 @@ new CHIPCommandSuccessCallbackBridge(
         });
 }
 
-- (void)skipChannelWithParams:(CHIPChannelClusterSkipChannelParams *)params completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeDefaultOtaProvidersWithParams:(CHIPReadParams * _Nullable)params
+                                 completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    Channel::Commands::SkipChannel::Type request;
+    new CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::DefaultOtaProviders::TypeInfo;
+            auto successFn = Callback<OtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue]);
+        });
+}
+
+- (void)writeAttributeDefaultOtaProvidersWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeDefaultOtaProvidersWithValue:(NSArray * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeDefaultOtaProvidersWithValue:(NSArray * _Nonnull)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
     }
-    request.count = params.count.unsignedShortValue;
 
-    new CHIPCommandSuccessCallbackBridge(
+    new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
+        ^(id _Nullable ignored, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)readAttributeChannelListWithCompletionHandler:(void (^)(
-                                                          NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPChannelChannelListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Channel::Attributes::ChannelList::TypeInfo;
-            auto successFn = Callback<ChannelChannelListListAttributeCallback>::FromCancelable(success);
+            ListFreer listFreer;
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::DefaultOtaProviders::TypeInfo;
+            TypeInfo::Type cppValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[CHIPOtaSoftwareUpdateRequestorClusterProviderLocation class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (CHIPOtaSoftwareUpdateRequestorClusterProviderLocation *) value[i_0];
+                        listHolder_0->mList[i_0].providerNodeID = element_0.providerNodeID.unsignedLongLongValue;
+                        listHolder_0->mList[i_0].endpoint = element_0.endpoint.unsignedShortValue;
+                        listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeChannelListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeDefaultOtaProvidersWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPChannelChannelListListAttributeCallbackSubscriptionBridge(
+    new CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Channel::Attributes::ChannelList::TypeInfo;
-            auto successFn = Callback<ChannelChannelListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::DefaultOtaProviders::TypeInfo;
+            auto successFn = Callback<OtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPChannelChannelListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeChannelListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeDefaultOtaProvidersWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPChannelChannelListListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = Channel::Attributes::ChannelList::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<ChannelChannelListListAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::DefaultOtaProviders::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn
+                    = Callback<OtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeLineupWithCompletionHandler:(void (^)(CHIPChannelClusterLineupInfo * _Nullable value,
-                                                     NSError * _Nullable error))completionHandler
+- (void)readAttributeUpdatePossibleWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPChannelLineupStructAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Channel::Attributes::Lineup::TypeInfo;
-            auto successFn = Callback<ChannelLineupStructAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdatePossible::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeLineupWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(CHIPChannelClusterLineupInfo * _Nullable value,
-                                                    NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeUpdatePossibleWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPChannelLineupStructAttributeCallbackSubscriptionBridge(
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Channel::Attributes::Lineup::TypeInfo;
-            auto successFn = Callback<ChannelLineupStructAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdatePossible::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPChannelLineupStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeLineupWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(CHIPChannelClusterLineupInfo * _Nullable value,
-                                                  NSError * _Nullable error))completionHandler
++ (void)readAttributeUpdatePossibleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPChannelLineupStructAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Channel::Attributes::Lineup::TypeInfo;
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdatePossible::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<ChannelLineupStructAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -10892,61 +11393,64 @@ new CHIPChannelLineupStructAttributeCallbackBridge(queue, completionHandler, ^(C
     });
 }
 
-- (void)readAttributeCurrentChannelWithCompletionHandler:(void (^)(CHIPChannelClusterChannelInfo * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeUpdateStateWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPChannelCurrentChannelStructAttributeCallbackBridge(
+    new CHIPOtaSoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Channel::Attributes::CurrentChannel::TypeInfo;
-            auto successFn = Callback<ChannelCurrentChannelStructAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdateState::TypeInfo;
+            auto successFn
+                = Callback<OtaSoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeCurrentChannelWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:(void (^)(CHIPChannelClusterChannelInfo * _Nullable value,
-                                                            NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeUpdateStateWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPChannelCurrentChannelStructAttributeCallbackSubscriptionBridge(
+    new CHIPOtaSoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Channel::Attributes::CurrentChannel::TypeInfo;
-            auto successFn = Callback<ChannelCurrentChannelStructAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdateState::TypeInfo;
+            auto successFn
+                = Callback<OtaSoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPChannelCurrentChannelStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPOtaSoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackSubscriptionBridge::
+                    OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentChannelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:(void (^)(CHIPChannelClusterChannelInfo * _Nullable value,
-                                                          NSError * _Nullable error))completionHandler
++ (void)readAttributeUpdateStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPChannelCurrentChannelStructAttributeCallbackBridge(
+    new CHIPOtaSoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = Channel::Attributes::CurrentChannel::TypeInfo;
+                using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdateState::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ChannelCurrentChannelStructAttributeCallback>::FromCancelable(success);
+                auto successFn
+                    = Callback<OtaSoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -10956,62 +11460,128 @@ new CHIPChannelCurrentChannelStructAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeUpdateStateProgressWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPChannelGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPNullableInt8uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Channel::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<ChannelGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdateStateProgress::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPChannelGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+- (void)subscribeAttributeUpdateStateProgressWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Channel::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<ChannelGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdateStateProgress::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPChannelGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
++ (void)readAttributeUpdateStateProgressWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdateStateProgress::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
+{
+    new CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<OtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<OtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackSubscriptionBridge::
+                    OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                    endpoint:(NSNumber *)endpoint
                                                       queue:(dispatch_queue_t)queue
                                           completionHandler:
                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPChannelGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = Channel::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ChannelGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn
+                    = Callback<OtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -11024,10 +11594,10 @@ new CHIPChannelGeneratedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPChannelAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Channel::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<ChannelAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<OtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -11041,20 +11611,20 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPChannelAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Channel::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<ChannelAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<OtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPChannelAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -11066,17 +11636,18 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPChannelAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = Channel::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ChannelAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn
+                    = Callback<OtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -11089,10 +11660,10 @@ new CHIPChannelAcceptedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPChannelAttributeListListAttributeCallbackBridge(
+    new CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Channel::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<ChannelAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<OtaSoftwareUpdateRequestorAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -11104,19 +11675,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPChannelAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Channel::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<ChannelAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<OtaSoftwareUpdateRequestorAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPChannelAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -11129,17 +11700,17 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPChannelAttributeListListAttributeCallbackBridge(
+    new CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = Channel::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ChannelAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<OtaSoftwareUpdateRequestorAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -11153,7 +11724,7 @@ - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Channel::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -11173,7 +11744,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Channel::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -11193,7 +11764,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Channel::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -11213,7 +11784,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Channel::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -11234,7 +11805,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Channel::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -11255,7 +11826,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Channel::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -11273,687 +11844,416 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPColorControl
+@implementation CHIPLocalizationConfiguration
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)moveToHueWithParams:(CHIPColorControlClusterMoveToHueParams *)params completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeActiveLocaleWithCompletionHandler:(void (^)(
+                                                           NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    ColorControl::Commands::MoveToHue::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.hue = params.hue.unsignedCharValue;
-    request.direction = static_cast<std::remove_reference_t<decltype(request.direction)>>(params.direction.unsignedCharValue);
-    request.transitionTime = params.transitionTime.unsignedShortValue;
-    request.optionsMask = params.optionsMask.unsignedCharValue;
-    request.optionsOverride = params.optionsOverride.unsignedCharValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = LocalizationConfiguration::Attributes::ActiveLocale::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)moveHueWithParams:(CHIPColorControlClusterMoveHueParams *)params completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeActiveLocaleWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    ColorControl::Commands::MoveHue::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.moveMode = static_cast<std::remove_reference_t<decltype(request.moveMode)>>(params.moveMode.unsignedCharValue);
-    request.rate = params.rate.unsignedCharValue;
-    request.optionsMask = params.optionsMask.unsignedCharValue;
-    request.optionsOverride = params.optionsOverride.unsignedCharValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+    [self writeAttributeActiveLocaleWithValue:(NSString * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-
-- (void)stepHueWithParams:(CHIPColorControlClusterStepHueParams *)params completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeActiveLocaleWithValue:(NSString * _Nonnull)value
+                                     params:(CHIPWriteParams * _Nullable)params
+                          completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    ColorControl::Commands::StepHue::Type request;
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
     }
-    request.stepMode = static_cast<std::remove_reference_t<decltype(request.stepMode)>>(params.stepMode.unsignedCharValue);
-    request.stepSize = params.stepSize.unsignedCharValue;
-    request.transitionTime = params.transitionTime.unsignedCharValue;
-    request.optionsMask = params.optionsMask.unsignedCharValue;
-    request.optionsOverride = params.optionsOverride.unsignedCharValue;
 
-    new CHIPCommandSuccessCallbackBridge(
+    new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
+        ^(id _Nullable ignored, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            ListFreer listFreer;
+            using TypeInfo = LocalizationConfiguration::Attributes::ActiveLocale::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = [self asCharSpan:value];
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)moveToSaturationWithParams:(CHIPColorControlClusterMoveToSaturationParams *)params
-                 completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeActiveLocaleWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    ColorControl::Commands::MoveToSaturation::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.saturation = params.saturation.unsignedCharValue;
-    request.transitionTime = params.transitionTime.unsignedShortValue;
-    request.optionsMask = params.optionsMask.unsignedCharValue;
-    request.optionsOverride = params.optionsOverride.unsignedCharValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = LocalizationConfiguration::Attributes::ActiveLocale::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
 
-- (void)moveSaturationWithParams:(CHIPColorControlClusterMoveSaturationParams *)params
-               completionHandler:(StatusCompletion)completionHandler
++ (void)readAttributeActiveLocaleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    ColorControl::Commands::MoveSaturation::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = LocalizationConfiguration::Attributes::ActiveLocale::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
-    request.moveMode = static_cast<std::remove_reference_t<decltype(request.moveMode)>>(params.moveMode.unsignedCharValue);
-    request.rate = params.rate.unsignedCharValue;
-    request.optionsMask = params.optionsMask.unsignedCharValue;
-    request.optionsOverride = params.optionsOverride.unsignedCharValue;
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
 
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+- (void)readAttributeSupportedLocalesWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
+{
+    new CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = LocalizationConfiguration::Attributes::SupportedLocales::TypeInfo;
+            auto successFn = Callback<LocalizationConfigurationSupportedLocalesListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)stepSaturationWithParams:(CHIPColorControlClusterStepSaturationParams *)params
-               completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeSupportedLocalesWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    ColorControl::Commands::StepSaturation::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.stepMode = static_cast<std::remove_reference_t<decltype(request.stepMode)>>(params.stepMode.unsignedCharValue);
-    request.stepSize = params.stepSize.unsignedCharValue;
-    request.transitionTime = params.transitionTime.unsignedCharValue;
-    request.optionsMask = params.optionsMask.unsignedCharValue;
-    request.optionsOverride = params.optionsOverride.unsignedCharValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
+    new CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = LocalizationConfiguration::Attributes::SupportedLocales::TypeInfo;
+            auto successFn = Callback<LocalizationConfigurationSupportedLocalesListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
 
-- (void)moveToHueAndSaturationWithParams:(CHIPColorControlClusterMoveToHueAndSaturationParams *)params
-                       completionHandler:(StatusCompletion)completionHandler
++ (void)readAttributeSupportedLocalesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    ColorControl::Commands::MoveToHueAndSaturation::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.hue = params.hue.unsignedCharValue;
-    request.saturation = params.saturation.unsignedCharValue;
-    request.transitionTime = params.transitionTime.unsignedShortValue;
-    request.optionsMask = params.optionsMask.unsignedCharValue;
-    request.optionsOverride = params.optionsOverride.unsignedCharValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+    new CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = LocalizationConfiguration::Attributes::SupportedLocales::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<LocalizationConfigurationSupportedLocalesListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
         });
 }
 
-- (void)moveToColorWithParams:(CHIPColorControlClusterMoveToColorParams *)params
-            completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    ColorControl::Commands::MoveToColor::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.colorX = params.colorX.unsignedShortValue;
-    request.colorY = params.colorY.unsignedShortValue;
-    request.transitionTime = params.transitionTime.unsignedShortValue;
-    request.optionsMask = params.optionsMask.unsignedCharValue;
-    request.optionsOverride = params.optionsOverride.unsignedCharValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+    new CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = LocalizationConfiguration::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<LocalizationConfigurationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)moveColorWithParams:(CHIPColorControlClusterMoveColorParams *)params completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    ColorControl::Commands::MoveColor::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.rateX = params.rateX.shortValue;
-    request.rateY = params.rateY.shortValue;
-    request.optionsMask = params.optionsMask.unsignedCharValue;
-    request.optionsOverride = params.optionsOverride.unsignedCharValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
+    new CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = LocalizationConfiguration::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<LocalizationConfigurationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
 
-- (void)stepColorWithParams:(CHIPColorControlClusterStepColorParams *)params completionHandler:(StatusCompletion)completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    ColorControl::Commands::StepColor::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.stepX = params.stepX.shortValue;
-    request.stepY = params.stepY.shortValue;
-    request.transitionTime = params.transitionTime.unsignedShortValue;
-    request.optionsMask = params.optionsMask.unsignedCharValue;
-    request.optionsOverride = params.optionsOverride.unsignedCharValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)moveToColorTemperatureWithParams:(CHIPColorControlClusterMoveToColorTemperatureParams *)params
-                       completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    ColorControl::Commands::MoveToColorTemperature::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.colorTemperature = params.colorTemperature.unsignedShortValue;
-    request.transitionTime = params.transitionTime.unsignedShortValue;
-    request.optionsMask = params.optionsMask.unsignedCharValue;
-    request.optionsOverride = params.optionsOverride.unsignedCharValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)enhancedMoveToHueWithParams:(CHIPColorControlClusterEnhancedMoveToHueParams *)params
-                  completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    ColorControl::Commands::EnhancedMoveToHue::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.enhancedHue = params.enhancedHue.unsignedShortValue;
-    request.direction = static_cast<std::remove_reference_t<decltype(request.direction)>>(params.direction.unsignedCharValue);
-    request.transitionTime = params.transitionTime.unsignedShortValue;
-    request.optionsMask = params.optionsMask.unsignedCharValue;
-    request.optionsOverride = params.optionsOverride.unsignedCharValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)enhancedMoveHueWithParams:(CHIPColorControlClusterEnhancedMoveHueParams *)params
-                completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    ColorControl::Commands::EnhancedMoveHue::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.moveMode = static_cast<std::remove_reference_t<decltype(request.moveMode)>>(params.moveMode.unsignedCharValue);
-    request.rate = params.rate.unsignedShortValue;
-    request.optionsMask = params.optionsMask.unsignedCharValue;
-    request.optionsOverride = params.optionsOverride.unsignedCharValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)enhancedStepHueWithParams:(CHIPColorControlClusterEnhancedStepHueParams *)params
-                completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    ColorControl::Commands::EnhancedStepHue::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.stepMode = static_cast<std::remove_reference_t<decltype(request.stepMode)>>(params.stepMode.unsignedCharValue);
-    request.stepSize = params.stepSize.unsignedShortValue;
-    request.transitionTime = params.transitionTime.unsignedShortValue;
-    request.optionsMask = params.optionsMask.unsignedCharValue;
-    request.optionsOverride = params.optionsOverride.unsignedCharValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+    new CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = LocalizationConfiguration::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn
+                    = Callback<LocalizationConfigurationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
         });
 }
 
-- (void)enhancedMoveToHueAndSaturationWithParams:(CHIPColorControlClusterEnhancedMoveToHueAndSaturationParams *)params
-                               completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    ColorControl::Commands::EnhancedMoveToHueAndSaturation::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.enhancedHue = params.enhancedHue.unsignedShortValue;
-    request.saturation = params.saturation.unsignedCharValue;
-    request.transitionTime = params.transitionTime.unsignedShortValue;
-    request.optionsMask = params.optionsMask.unsignedCharValue;
-    request.optionsOverride = params.optionsOverride.unsignedCharValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+    new CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = LocalizationConfiguration::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<LocalizationConfigurationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)colorLoopSetWithParams:(CHIPColorControlClusterColorLoopSetParams *)params
-             completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    ColorControl::Commands::ColorLoopSet::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.updateFlags = static_cast<std::remove_reference_t<decltype(request.updateFlags)>>(params.updateFlags.unsignedCharValue);
-    request.action = static_cast<std::remove_reference_t<decltype(request.action)>>(params.action.unsignedCharValue);
-    request.direction = static_cast<std::remove_reference_t<decltype(request.direction)>>(params.direction.unsignedCharValue);
-    request.time = params.time.unsignedShortValue;
-    request.startHue = params.startHue.unsignedShortValue;
-    request.optionsMask = params.optionsMask.unsignedCharValue;
-    request.optionsOverride = params.optionsOverride.unsignedCharValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
+    new CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = LocalizationConfiguration::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<LocalizationConfigurationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)stopMoveStepWithParams:(CHIPColorControlClusterStopMoveStepParams *)params
-             completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    ColorControl::Commands::StopMoveStep::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.optionsMask = params.optionsMask.unsignedCharValue;
-    request.optionsOverride = params.optionsOverride.unsignedCharValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+        subscriptionEstablishedHandler);
 }
 
-- (void)moveColorTemperatureWithParams:(CHIPColorControlClusterMoveColorTemperatureParams *)params
-                     completionHandler:(StatusCompletion)completionHandler
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    ColorControl::Commands::MoveColorTemperature::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.moveMode = static_cast<std::remove_reference_t<decltype(request.moveMode)>>(params.moveMode.unsignedCharValue);
-    request.rate = params.rate.unsignedShortValue;
-    request.colorTemperatureMinimumMireds = params.colorTemperatureMinimumMireds.unsignedShortValue;
-    request.colorTemperatureMaximumMireds = params.colorTemperatureMaximumMireds.unsignedShortValue;
-    request.optionsMask = params.optionsMask.unsignedCharValue;
-    request.optionsOverride = params.optionsOverride.unsignedCharValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+    new CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = LocalizationConfiguration::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn
+                    = Callback<LocalizationConfigurationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
         });
 }
 
-- (void)stepColorTemperatureWithParams:(CHIPColorControlClusterStepColorTemperatureParams *)params
-                     completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    ColorControl::Commands::StepColorTemperature::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.stepMode = static_cast<std::remove_reference_t<decltype(request.stepMode)>>(params.stepMode.unsignedCharValue);
-    request.stepSize = params.stepSize.unsignedShortValue;
-    request.transitionTime = params.transitionTime.unsignedShortValue;
-    request.colorTemperatureMinimumMireds = params.colorTemperatureMinimumMireds.unsignedShortValue;
-    request.colorTemperatureMaximumMireds = params.colorTemperatureMaximumMireds.unsignedShortValue;
-    request.optionsMask = params.optionsMask.unsignedCharValue;
-    request.optionsOverride = params.optionsOverride.unsignedCharValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+    new CHIPLocalizationConfigurationAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = LocalizationConfiguration::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<LocalizationConfigurationAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)readAttributeCurrentHueWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::CurrentHue::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeCurrentHueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPLocalizationConfigurationAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::CurrentHue::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = LocalizationConfiguration::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<LocalizationConfigurationAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPLocalizationConfigurationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentHueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::CurrentHue::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPLocalizationConfigurationAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = LocalizationConfiguration::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<LocalizationConfigurationAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeCurrentSaturationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::CurrentSaturation::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = LocalizationConfiguration::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeCurrentSaturationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::CurrentSaturation::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = LocalizationConfiguration::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentSaturationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::CurrentSaturation::TypeInfo;
+            using TypeInfo = LocalizationConfiguration::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -11963,23 +12263,23 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeRemainingTimeWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::RemainingTime::TypeInfo;
+        using TypeInfo = LocalizationConfiguration::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRemainingTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -11988,7 +12288,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::RemainingTime::TypeInfo;
+            using TypeInfo = LocalizationConfiguration::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -12000,16 +12300,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRemainingTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::RemainingTime::TypeInfo;
+            using TypeInfo = LocalizationConfiguration::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -12025,517 +12325,515 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeCurrentXWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+@end
+
+@implementation CHIPTimeFormatLocalization
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::CurrentX::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    return &_cppCluster;
 }
 
-- (void)subscribeAttributeCurrentXWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)readAttributeHourFormatWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPTimeFormatLocalizationClusterHourFormatAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TimeFormatLocalization::Attributes::HourFormat::TypeInfo;
+            auto successFn = Callback<TimeFormatLocalizationClusterHourFormatAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeHourFormatWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeHourFormatWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeHourFormatWithValue:(NSNumber * _Nonnull)value
+                                   params:(CHIPWriteParams * _Nullable)params
+                        completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TimeFormatLocalization::Attributes::HourFormat::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeHourFormatWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPTimeFormatLocalizationClusterHourFormatAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::CurrentX::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TimeFormatLocalization::Attributes::HourFormat::TypeInfo;
+            auto successFn = Callback<TimeFormatLocalizationClusterHourFormatAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPTimeFormatLocalizationClusterHourFormatAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentXWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeHourFormatWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::CurrentX::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPTimeFormatLocalizationClusterHourFormatAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = TimeFormatLocalization::Attributes::HourFormat::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<TimeFormatLocalizationClusterHourFormatAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeCurrentYWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeActiveCalendarTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::CurrentY::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPTimeFormatLocalizationClusterCalendarTypeAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TimeFormatLocalization::Attributes::ActiveCalendarType::TypeInfo;
+            auto successFn = Callback<TimeFormatLocalizationClusterCalendarTypeAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeCurrentYWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeActiveCalendarTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeActiveCalendarTypeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeActiveCalendarTypeWithValue:(NSNumber * _Nonnull)value
+                                           params:(CHIPWriteParams * _Nullable)params
+                                completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TimeFormatLocalization::Attributes::ActiveCalendarType::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeActiveCalendarTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPTimeFormatLocalizationClusterCalendarTypeAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::CurrentY::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TimeFormatLocalization::Attributes::ActiveCalendarType::TypeInfo;
+            auto successFn = Callback<TimeFormatLocalizationClusterCalendarTypeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPTimeFormatLocalizationClusterCalendarTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentYWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeActiveCalendarTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::CurrentY::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPTimeFormatLocalizationClusterCalendarTypeAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = TimeFormatLocalization::Attributes::ActiveCalendarType::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<TimeFormatLocalizationClusterCalendarTypeAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeDriftCompensationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeSupportedCalendarTypesWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::DriftCompensation::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TimeFormatLocalization::Attributes::SupportedCalendarTypes::TypeInfo;
+            auto successFn = Callback<TimeFormatLocalizationSupportedCalendarTypesListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeDriftCompensationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSupportedCalendarTypesWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:
+                                                      (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::DriftCompensation::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TimeFormatLocalization::Attributes::SupportedCalendarTypes::TypeInfo;
+            auto successFn = Callback<TimeFormatLocalizationSupportedCalendarTypesListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDriftCompensationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeSupportedCalendarTypesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::DriftCompensation::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = TimeFormatLocalization::Attributes::SupportedCalendarTypes::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn
+                    = Callback<TimeFormatLocalizationSupportedCalendarTypesListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeCompensationTextWithCompletionHandler:(void (^)(NSString * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::CompensationText::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TimeFormatLocalization::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<TimeFormatLocalizationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeCompensationTextWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::CompensationText::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TimeFormatLocalization::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<TimeFormatLocalizationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCompensationTextWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::CompensationText::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = TimeFormatLocalization::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<TimeFormatLocalizationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeColorTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::ColorTemperature::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TimeFormatLocalization::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<TimeFormatLocalizationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeColorTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::ColorTemperature::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TimeFormatLocalization::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<TimeFormatLocalizationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeColorTemperatureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::ColorTemperature::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = TimeFormatLocalization::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<TimeFormatLocalizationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeColorModeWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::ColorMode::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPTimeFormatLocalizationAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TimeFormatLocalization::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<TimeFormatLocalizationAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeColorModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPTimeFormatLocalizationAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::ColorMode::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TimeFormatLocalization::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<TimeFormatLocalizationAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPTimeFormatLocalizationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeColorModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::ColorMode::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPTimeFormatLocalizationAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = TimeFormatLocalization::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<TimeFormatLocalizationAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeOptionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::Options::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TimeFormatLocalization::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeOptionsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeOptionsWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeOptionsWithValue:(NSNumber * _Nonnull)value
-                                params:(CHIPWriteParams * _Nullable)params
-                     completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::Options::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeOptionsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = ColorControl::Attributes::Options::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeOptionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::Options::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeNumberOfPrimariesWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt8uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ColorControl::Attributes::NumberOfPrimaries::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeNumberOfPrimariesWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::NumberOfPrimaries::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TimeFormatLocalization::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNumberOfPrimariesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::NumberOfPrimaries::TypeInfo;
+            using TypeInfo = TimeFormatLocalization::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -12545,22 +12843,23 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributePrimary1XWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::Primary1X::TypeInfo;
+        using TypeInfo = TimeFormatLocalization::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributePrimary1XWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -12569,7 +12868,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::Primary1X::TypeInfo;
+            using TypeInfo = TimeFormatLocalization::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -12581,15 +12880,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePrimary1XWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::Primary1X::TypeInfo;
+            using TypeInfo = TimeFormatLocalization::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -12605,303 +12905,355 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributePrimary1YWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+@end
+
+@implementation CHIPUnitLocalization
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::Primary1Y::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    return &_cppCluster;
 }
 
-- (void)subscribeAttributePrimary1YWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)readAttributeTemperatureUnitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPUnitLocalizationClusterTempUnitAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = UnitLocalization::Attributes::TemperatureUnit::TypeInfo;
+            auto successFn = Callback<UnitLocalizationClusterTempUnitAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeTemperatureUnitWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeTemperatureUnitWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeTemperatureUnitWithValue:(NSNumber * _Nonnull)value
+                                        params:(CHIPWriteParams * _Nullable)params
+                             completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = UnitLocalization::Attributes::TemperatureUnit::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeTemperatureUnitWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPUnitLocalizationClusterTempUnitAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::Primary1Y::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = UnitLocalization::Attributes::TemperatureUnit::TypeInfo;
+            auto successFn = Callback<UnitLocalizationClusterTempUnitAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPUnitLocalizationClusterTempUnitAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePrimary1YWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTemperatureUnitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::Primary1Y::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPUnitLocalizationClusterTempUnitAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = UnitLocalization::Attributes::TemperatureUnit::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<UnitLocalizationClusterTempUnitAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributePrimary1IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
+    new CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ColorControl::Attributes::Primary1Intensity::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = UnitLocalization::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<UnitLocalizationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributePrimary1IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::Primary1Intensity::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = UnitLocalization::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<UnitLocalizationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePrimary1IntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::Primary1Intensity::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = UnitLocalization::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<UnitLocalizationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributePrimary2XWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::Primary2X::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = UnitLocalization::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<UnitLocalizationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributePrimary2XWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::Primary2X::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = UnitLocalization::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<UnitLocalizationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePrimary2XWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::Primary2X::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = UnitLocalization::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<UnitLocalizationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributePrimary2YWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::Primary2Y::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPUnitLocalizationAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = UnitLocalization::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<UnitLocalizationAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributePrimary2YWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPUnitLocalizationAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::Primary2Y::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = UnitLocalization::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<UnitLocalizationAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPUnitLocalizationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePrimary2YWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::Primary2Y::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPUnitLocalizationAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = UnitLocalization::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<UnitLocalizationAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributePrimary2IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ColorControl::Attributes::Primary2Intensity::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = UnitLocalization::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributePrimary2IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::Primary2Intensity::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = UnitLocalization::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePrimary2IntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::Primary2Intensity::TypeInfo;
+            using TypeInfo = UnitLocalization::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -12911,22 +13263,23 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributePrimary3XWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::Primary3X::TypeInfo;
+        using TypeInfo = UnitLocalization::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributePrimary3XWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -12935,7 +13288,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::Primary3X::TypeInfo;
+            using TypeInfo = UnitLocalization::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -12947,15 +13300,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePrimary3XWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::Primary3X::TypeInfo;
+            using TypeInfo = UnitLocalization::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -12971,303 +13325,322 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributePrimary3YWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+@end
+
+@implementation CHIPPowerSourceConfiguration
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::Primary3Y::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    return &_cppCluster;
 }
 
-- (void)subscribeAttributePrimary3YWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)readAttributeSourcesWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPPowerSourceConfigurationSourcesListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = PowerSourceConfiguration::Attributes::Sources::TypeInfo;
+            auto successFn = Callback<PowerSourceConfigurationSourcesListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeSourcesWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPPowerSourceConfigurationSourcesListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::Primary3Y::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSourceConfiguration::Attributes::Sources::TypeInfo;
+            auto successFn = Callback<PowerSourceConfigurationSourcesListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPPowerSourceConfigurationSourcesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePrimary3YWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeSourcesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::Primary3Y::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPPowerSourceConfigurationSourcesListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = PowerSourceConfiguration::Attributes::Sources::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<PowerSourceConfigurationSourcesListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributePrimary3IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
+    new CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ColorControl::Attributes::Primary3Intensity::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSourceConfiguration::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<PowerSourceConfigurationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributePrimary3IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::Primary3Intensity::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSourceConfiguration::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<PowerSourceConfigurationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePrimary3IntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::Primary3Intensity::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = PowerSourceConfiguration::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn
+                    = Callback<PowerSourceConfigurationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributePrimary4XWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::Primary4X::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = PowerSourceConfiguration::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<PowerSourceConfigurationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributePrimary4XWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::Primary4X::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSourceConfiguration::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<PowerSourceConfigurationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePrimary4XWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::Primary4X::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = PowerSourceConfiguration::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn
+                    = Callback<PowerSourceConfigurationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributePrimary4YWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::Primary4Y::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPPowerSourceConfigurationAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = PowerSourceConfiguration::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<PowerSourceConfigurationAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributePrimary4YWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPPowerSourceConfigurationAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::Primary4Y::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSourceConfiguration::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<PowerSourceConfigurationAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPPowerSourceConfigurationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePrimary4YWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::Primary4Y::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPPowerSourceConfigurationAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = PowerSourceConfiguration::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<PowerSourceConfigurationAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributePrimary4IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ColorControl::Attributes::Primary4Intensity::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSourceConfiguration::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributePrimary4IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::Primary4Intensity::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSourceConfiguration::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePrimary4IntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::Primary4Intensity::TypeInfo;
+            using TypeInfo = PowerSourceConfiguration::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -13277,22 +13650,23 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributePrimary5XWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::Primary5X::TypeInfo;
+        using TypeInfo = PowerSourceConfiguration::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributePrimary5XWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -13301,7 +13675,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::Primary5X::TypeInfo;
+            using TypeInfo = PowerSourceConfiguration::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -13313,15 +13687,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePrimary5XWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::Primary5X::TypeInfo;
+            using TypeInfo = PowerSourceConfiguration::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -13337,57 +13712,65 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributePrimary5YWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+@end
+
+@implementation CHIPPowerSource
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::Primary5Y::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    return &_cppCluster;
+}
+
+- (void)readAttributeStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::Status::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributePrimary5YWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::Primary5Y::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::Status::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePrimary5YWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::Primary5Y::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::Status::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -13397,60 +13780,56 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributePrimary5IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeOrderWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ColorControl::Attributes::Primary5Intensity::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::Order::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributePrimary5IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOrderWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                        params:(CHIPSubscribeParams * _Nullable)params
+                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::Primary5Intensity::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::Order::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePrimary5IntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOrderWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                    endpoint:(NSNumber *)endpoint
+                                       queue:(dispatch_queue_t)queue
+                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::Primary5Intensity::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::Order::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -13460,57 +13839,58 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributePrimary6XWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeDescriptionWithCompletionHandler:(void (^)(
+                                                          NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::Primary6X::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::Description::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributePrimary6XWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeDescriptionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::Primary6X::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::Description::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePrimary6XWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeDescriptionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::Primary6X::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::Description::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -13520,57 +13900,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributePrimary6YWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeWiredAssessedInputVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::Primary6Y::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::WiredAssessedInputVoltage::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributePrimary6YWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeWiredAssessedInputVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                            params:(CHIPSubscribeParams * _Nullable)params
+                                           subscriptionEstablished:
+                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::Primary6Y::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::WiredAssessedInputVoltage::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePrimary6YWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeWiredAssessedInputVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                        endpoint:(NSNumber *)endpoint
+                                                           queue:(dispatch_queue_t)queue
+                                               completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::Primary6Y::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::WiredAssessedInputVoltage::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -13580,60 +13963,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributePrimary6IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeWiredAssessedInputFrequencyWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ColorControl::Attributes::Primary6Intensity::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::WiredAssessedInputFrequency::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributePrimary6IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeWiredAssessedInputFrequencyWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                              params:(CHIPSubscribeParams * _Nullable)params
+                                             subscriptionEstablished:
+                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::Primary6Intensity::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::WiredAssessedInputFrequency::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePrimary6IntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeWiredAssessedInputFrequencyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                          endpoint:(NSNumber *)endpoint
+                                                             queue:(dispatch_queue_t)queue
+                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::Primary6Intensity::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::WiredAssessedInputFrequency::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -13643,90 +14026,59 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeWhitePointXWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeWiredCurrentTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::WhitePointX::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::WiredCurrentType::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeWhitePointXWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeWhitePointXWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeWhitePointXWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::WhitePointX::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeWhitePointXWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeWiredCurrentTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::WhitePointX::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::WiredCurrentType::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeWhitePointXWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeWiredCurrentTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::WhitePointX::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::WiredCurrentType::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -13736,90 +14088,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeWhitePointYWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeWiredAssessedCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::WhitePointY::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::WiredAssessedCurrent::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeWhitePointYWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeWhitePointYWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeWhitePointYWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::WhitePointY::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeWhitePointYWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeWiredAssessedCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::WhitePointY::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::WiredAssessedCurrent::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeWhitePointYWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeWiredAssessedCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::WhitePointY::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::WiredAssessedCurrent::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -13829,90 +14151,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeColorPointRXWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeWiredNominalVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::ColorPointRX::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::WiredNominalVoltage::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeColorPointRXWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeColorPointRXWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeColorPointRXWithValue:(NSNumber * _Nonnull)value
-                                     params:(CHIPWriteParams * _Nullable)params
-                          completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::ColorPointRX::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeColorPointRXWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeWiredNominalVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::ColorPointRX::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::WiredNominalVoltage::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeColorPointRXWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeWiredNominalVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::ColorPointRX::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::WiredNominalVoltage::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -13922,90 +14214,121 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeColorPointRYWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeWiredMaximumCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::ColorPointRY::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::WiredMaximumCurrent::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeColorPointRYWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeColorPointRYWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeColorPointRYWithValue:(NSNumber * _Nonnull)value
-                                     params:(CHIPWriteParams * _Nullable)params
-                          completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeWiredMaximumCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::ColorPointRY::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = PowerSource::Attributes::WiredMaximumCurrent::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
 
-- (void)subscribeAttributeColorPointRYWithMinInterval:(NSNumber * _Nonnull)minInterval
++ (void)readAttributeWiredMaximumCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = PowerSource::Attributes::WiredMaximumCurrent::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeWiredPresentWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::WiredPresent::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeWiredPresentWithMinInterval:(NSNumber * _Nonnull)minInterval
                                           maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(CHIPSubscribeParams * _Nullable)params
                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                         reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::ColorPointRY::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::WiredPresent::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeColorPointRYWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeWiredPresentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                            endpoint:(NSNumber *)endpoint
                                               queue:(dispatch_queue_t)queue
                                   completionHandler:
                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::ColorPointRY::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::WiredPresent::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -14015,192 +14338,123 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeColorPointRIntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeActiveWiredFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
+    new CHIPPowerSourceActiveWiredFaultsListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ColorControl::Attributes::ColorPointRIntensity::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::ActiveWiredFaults::TypeInfo;
+            auto successFn = Callback<PowerSourceActiveWiredFaultsListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeColorPointRIntensityWithValue:(NSNumber * _Nullable)value
-                                  completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeColorPointRIntensityWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeColorPointRIntensityWithValue:(NSNumber * _Nullable)value
-                                             params:(CHIPWriteParams * _Nullable)params
-                                  completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::ColorPointRIntensity::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeColorPointRIntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeActiveWiredFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPPowerSourceActiveWiredFaultsListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::ColorPointRIntensity::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::ActiveWiredFaults::TypeInfo;
+            auto successFn = Callback<PowerSourceActiveWiredFaultsListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPPowerSourceActiveWiredFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeColorPointRIntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeActiveWiredFaultsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::ColorPointRIntensity::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPPowerSourceActiveWiredFaultsListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = PowerSource::Attributes::ActiveWiredFaults::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<PowerSourceActiveWiredFaultsListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeColorPointGXWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeBatteryVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::ColorPointGX::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::BatteryVoltage::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeColorPointGXWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeColorPointGXWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeColorPointGXWithValue:(NSNumber * _Nonnull)value
-                                     params:(CHIPWriteParams * _Nullable)params
-                          completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::ColorPointGX::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeColorPointGXWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBatteryVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::ColorPointGX::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::BatteryVoltage::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeColorPointGXWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBatteryVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::ColorPointGX::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryVoltage::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -14210,90 +14464,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeColorPointGYWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeBatteryPercentRemainingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::ColorPointGY::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::BatteryPercentRemaining::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeColorPointGYWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeColorPointGYWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeColorPointGYWithValue:(NSNumber * _Nonnull)value
-                                     params:(CHIPWriteParams * _Nullable)params
-                          completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::ColorPointGY::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeColorPointGYWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBatteryPercentRemainingWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::ColorPointGY::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::BatteryPercentRemaining::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeColorPointGYWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBatteryPercentRemainingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::ColorPointGY::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryPercentRemaining::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -14303,57 +14527,18 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeColorPointGIntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeBatteryTimeRemainingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ColorControl::Attributes::ColorPointGIntensity::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeColorPointGIntensityWithValue:(NSNumber * _Nullable)value
-                                  completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeColorPointGIntensityWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeColorPointGIntensityWithValue:(NSNumber * _Nullable)value
-                                             params:(CHIPWriteParams * _Nullable)params
-                                  completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::ColorPointGIntensity::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::BatteryTimeRemaining::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeColorPointGIntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeBatteryTimeRemainingWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(CHIPSubscribeParams * _Nullable)params
                                       subscriptionEstablished:
@@ -14361,41 +14546,41 @@ - (void)subscribeAttributeColorPointGIntensityWithMinInterval:(NSNumber * _Nonnu
                                                 reportHandler:
                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::ColorPointGIntensity::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::BatteryTimeRemaining::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeColorPointGIntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeBatteryTimeRemainingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                    endpoint:(NSNumber *)endpoint
                                                       queue:(dispatch_queue_t)queue
                                           completionHandler:
                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::ColorPointGIntensity::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryTimeRemaining::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -14405,90 +14590,59 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeColorPointBXWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeBatteryChargeLevelWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::ColorPointBX::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::BatteryChargeLevel::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeColorPointBXWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeColorPointBXWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeColorPointBXWithValue:(NSNumber * _Nonnull)value
-                                     params:(CHIPWriteParams * _Nullable)params
-                          completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::ColorPointBX::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeColorPointBXWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBatteryChargeLevelWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::ColorPointBX::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::BatteryChargeLevel::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeColorPointBXWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBatteryChargeLevelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::ColorPointBX::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryChargeLevel::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -14498,90 +14652,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeColorPointBYWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeBatteryReplacementNeededWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::ColorPointBY::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::BatteryReplacementNeeded::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeColorPointBYWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeBatteryReplacementNeededWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeColorPointBYWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeColorPointBYWithValue:(NSNumber * _Nonnull)value
-                                     params:(CHIPWriteParams * _Nullable)params
-                          completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::ColorPointBY::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeColorPointBYWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::ColorPointBY::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::BatteryReplacementNeeded::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeColorPointBYWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBatteryReplacementNeededWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::ColorPointBY::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryReplacementNeeded::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -14591,99 +14715,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeColorPointBIntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt8uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ColorControl::Attributes::ColorPointBIntensity::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeColorPointBIntensityWithValue:(NSNumber * _Nullable)value
-                                  completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeColorPointBIntensityWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeColorPointBIntensityWithValue:(NSNumber * _Nullable)value
-                                             params:(CHIPWriteParams * _Nullable)params
-                                  completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeBatteryReplaceabilityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::ColorPointBIntensity::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::BatteryReplaceability::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeColorPointBIntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBatteryReplaceabilityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::ColorPointBIntensity::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::BatteryReplaceability::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeColorPointBIntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBatteryReplaceabilityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::ColorPointBIntensity::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryReplaceability::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -14693,59 +14778,59 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeEnhancedCurrentHueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler
+- (void)readAttributeBatteryPresentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::EnhancedCurrentHue::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::BatteryPresent::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeEnhancedCurrentHueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBatteryPresentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::EnhancedCurrentHue::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::BatteryPresent::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeEnhancedCurrentHueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBatteryPresentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::EnhancedCurrentHue::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryPresent::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -14755,121 +14840,125 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeEnhancedColorModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeActiveBatteryFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::EnhancedColorMode::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = PowerSource::Attributes::ActiveBatteryFaults::TypeInfo;
+            auto successFn = Callback<PowerSourceActiveBatteryFaultsListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeEnhancedColorModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeActiveBatteryFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::EnhancedColorMode::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::ActiveBatteryFaults::TypeInfo;
+            auto successFn = Callback<PowerSourceActiveBatteryFaultsListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeEnhancedColorModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeActiveBatteryFaultsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::EnhancedColorMode::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = PowerSource::Attributes::ActiveBatteryFaults::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<PowerSourceActiveBatteryFaultsListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeColorLoopActiveWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeBatteryReplacementDescriptionWithCompletionHandler:(void (^)(NSString * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::ColorLoopActive::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::BatteryReplacementDescription::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeColorLoopActiveWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBatteryReplacementDescriptionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                params:(CHIPSubscribeParams * _Nullable)params
+                                               subscriptionEstablished:
+                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                         reportHandler:(void (^)(NSString * _Nullable value,
+                                                                           NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::ColorLoopActive::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::BatteryReplacementDescription::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeColorLoopActiveWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBatteryReplacementDescriptionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                            endpoint:(NSNumber *)endpoint
+                                                               queue:(dispatch_queue_t)queue
+                                                   completionHandler:(void (^)(NSString * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::ColorLoopActive::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryReplacementDescription::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -14879,59 +14968,60 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeColorLoopDirectionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler
+- (void)readAttributeBatteryCommonDesignationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::ColorLoopDirection::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::BatteryCommonDesignation::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeColorLoopDirectionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBatteryCommonDesignationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::ColorLoopDirection::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::BatteryCommonDesignation::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeColorLoopDirectionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBatteryCommonDesignationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::ColorLoopDirection::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryCommonDesignation::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -14941,59 +15031,60 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeColorLoopTimeWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeBatteryANSIDesignationWithCompletionHandler:(void (^)(NSString * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::ColorLoopTime::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::BatteryANSIDesignation::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeColorLoopTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBatteryANSIDesignationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:
+                                                      (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::ColorLoopTime::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::BatteryANSIDesignation::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeColorLoopTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBatteryANSIDesignationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::ColorLoopTime::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryANSIDesignation::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -15003,60 +15094,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeColorLoopStartEnhancedHueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
+- (void)readAttributeBatteryIECDesignationWithCompletionHandler:(void (^)(NSString * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::ColorLoopStartEnhancedHue::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::BatteryIECDesignation::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeColorLoopStartEnhancedHueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                            params:(CHIPSubscribeParams * _Nullable)params
-                                           subscriptionEstablished:
-                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBatteryIECDesignationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::ColorLoopStartEnhancedHue::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::BatteryIECDesignation::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeColorLoopStartEnhancedHueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                        endpoint:(NSNumber *)endpoint
-                                                           queue:(dispatch_queue_t)queue
-                                               completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
++ (void)readAttributeBatteryIECDesignationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::ColorLoopStartEnhancedHue::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryIECDesignation::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -15066,60 +15157,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeColorLoopStoredEnhancedHueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler
+- (void)readAttributeBatteryApprovedChemistryWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::ColorLoopStoredEnhancedHue::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::BatteryApprovedChemistry::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeColorLoopStoredEnhancedHueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBatteryApprovedChemistryWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::ColorLoopStoredEnhancedHue::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::BatteryApprovedChemistry::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeColorLoopStoredEnhancedHueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
++ (void)readAttributeBatteryApprovedChemistryWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::ColorLoopStoredEnhancedHue::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryApprovedChemistry::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -15129,59 +15220,59 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeColorCapabilitiesWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeBatteryCapacityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::ColorCapabilities::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::BatteryCapacity::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeColorCapabilitiesWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBatteryCapacityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::ColorCapabilities::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::BatteryCapacity::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeColorCapabilitiesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBatteryCapacityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::ColorCapabilities::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryCapacity::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -15191,60 +15282,59 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeColorTempPhysicalMinMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler
+- (void)readAttributeBatteryQuantityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::ColorTempPhysicalMinMireds::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::BatteryQuantity::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeColorTempPhysicalMinMiredsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBatteryQuantityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::ColorTempPhysicalMinMireds::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::BatteryQuantity::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeColorTempPhysicalMinMiredsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
++ (void)readAttributeBatteryQuantityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::ColorTempPhysicalMinMireds::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryQuantity::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -15254,60 +15344,59 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeColorTempPhysicalMaxMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler
+- (void)readAttributeBatteryChargeStateWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::ColorTempPhysicalMaxMireds::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::BatteryChargeState::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeColorTempPhysicalMaxMiredsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBatteryChargeStateWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::ColorTempPhysicalMaxMireds::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::BatteryChargeState::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeColorTempPhysicalMaxMiredsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
++ (void)readAttributeBatteryChargeStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::ColorTempPhysicalMaxMireds::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryChargeState::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -15317,60 +15406,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeCoupleColorTempToLevelMinMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeBatteryTimeToFullChargeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::CoupleColorTempToLevelMinMireds::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::BatteryTimeToFullCharge::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeCoupleColorTempToLevelMinMiredsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                                 subscriptionEstablished:
-                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBatteryTimeToFullChargeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::CoupleColorTempToLevelMinMireds::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::BatteryTimeToFullCharge::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCoupleColorTempToLevelMinMiredsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                              endpoint:(NSNumber *)endpoint
-                                                                 queue:(dispatch_queue_t)queue
-                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler
++ (void)readAttributeBatteryTimeToFullChargeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::CoupleColorTempToLevelMinMireds::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryTimeToFullCharge::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -15380,95 +15469,123 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeStartUpColorTemperatureMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler
+- (void)readAttributeBatteryFunctionalWhileChargingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::StartUpColorTemperatureMireds::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::BatteryFunctionalWhileCharging::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeStartUpColorTemperatureMiredsWithValue:(NSNumber * _Nonnull)value
-                                           completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeBatteryFunctionalWhileChargingWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                                subscriptionEstablished:
+                                                    (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                          reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeStartUpColorTemperatureMiredsWithValue:(NSNumber * _Nonnull) value
-                                                        params:nil
-                                             completionHandler:completionHandler];
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = PowerSource::Attributes::BatteryFunctionalWhileCharging::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
-- (void)writeAttributeStartUpColorTemperatureMiredsWithValue:(NSNumber * _Nonnull)value
-                                                      params:(CHIPWriteParams * _Nullable)params
-                                           completionHandler:(StatusCompletion)completionHandler
+
++ (void)readAttributeBatteryFunctionalWhileChargingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                             endpoint:(NSNumber *)endpoint
+                                                                queue:(dispatch_queue_t)queue
+                                                    completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = PowerSource::Attributes::BatteryFunctionalWhileCharging::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
 
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::StartUpColorTemperatureMireds::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+- (void)readAttributeBatteryChargingCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
+{
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PowerSource::Attributes::BatteryChargingCurrent::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeStartUpColorTemperatureMiredsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                params:(CHIPSubscribeParams * _Nullable)params
-                                               subscriptionEstablished:
-                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBatteryChargingCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:
+                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::StartUpColorTemperatureMireds::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::BatteryChargingCurrent::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeStartUpColorTemperatureMiredsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                            endpoint:(NSNumber *)endpoint
-                                                               queue:(dispatch_queue_t)queue
-                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler
++ (void)readAttributeBatteryChargingCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::StartUpColorTemperatureMireds::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryChargingCurrent::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -15478,13 +15595,78 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
+- (void)readAttributeActiveBatteryChargeFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler
+{
+    new CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = PowerSource::Attributes::ActiveBatteryChargeFaults::TypeInfo;
+            auto successFn = Callback<PowerSourceActiveBatteryChargeFaultsListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeActiveBatteryChargeFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                            params:(CHIPSubscribeParams * _Nullable)params
+                                           subscriptionEstablished:
+                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                     reportHandler:(void (^)(NSArray * _Nullable value,
+                                                                       NSError * _Nullable error))reportHandler
+{
+    new CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = PowerSource::Attributes::ActiveBatteryChargeFaults::TypeInfo;
+            auto successFn = Callback<PowerSourceActiveBatteryChargeFaultsListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeActiveBatteryChargeFaultsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                        endpoint:(NSNumber *)endpoint
+                                                           queue:(dispatch_queue_t)queue
+                                               completionHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = PowerSource::Attributes::ActiveBatteryChargeFaults::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<PowerSourceActiveBatteryChargeFaultsListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPColorControlGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPPowerSourceGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ColorControl::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<ColorControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<PowerSourceGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -15498,19 +15680,19 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
                                                 reportHandler:
                                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPColorControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPPowerSourceGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<ColorControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<PowerSourceGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPColorControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPPowerSourceGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -15523,17 +15705,17 @@ + (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheC
                                           completionHandler:
                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPColorControlGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPPowerSourceGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = ColorControl::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = PowerSource::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ColorControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<PowerSourceGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -15546,10 +15728,10 @@ new CHIPColorControlGeneratedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPColorControlAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPPowerSourceAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ColorControl::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<ColorControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<PowerSourceAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -15563,19 +15745,19 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPColorControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPPowerSourceAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<ColorControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<PowerSourceAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPColorControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPPowerSourceAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -15588,17 +15770,17 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPColorControlAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPPowerSourceAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = ColorControl::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = PowerSource::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ColorControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<PowerSourceAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -15611,10 +15793,10 @@ new CHIPColorControlAcceptedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPColorControlAttributeListListAttributeCallbackBridge(
+    new CHIPPowerSourceAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ColorControl::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<ColorControlAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<PowerSourceAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -15626,19 +15808,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPColorControlAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPPowerSourceAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<ColorControlAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PowerSource::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<PowerSourceAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPColorControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPPowerSourceAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -15651,17 +15833,17 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPColorControlAttributeListListAttributeCallbackBridge(
+    new CHIPPowerSourceAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = ColorControl::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = PowerSource::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ColorControlAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<PowerSourceAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -15675,7 +15857,7 @@ - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = PowerSource::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -15695,7 +15877,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -15715,7 +15897,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -15735,7 +15917,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ColorControl::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = PowerSource::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -15756,7 +15938,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ColorControl::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -15777,7 +15959,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ColorControl::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -15795,296 +15977,112 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPContentLauncher
+@implementation CHIPGeneralCommissioning
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)launchContentWithParams:(CHIPContentLauncherClusterLaunchContentParams *)params
-              completionHandler:(void (^)(CHIPContentLauncherClusterLaunchResponseParams * _Nullable data,
-                                    NSError * _Nullable error))completionHandler
+- (void)armFailSafeWithParams:(CHIPGeneralCommissioningClusterArmFailSafeParams *)params
+            completionHandler:(void (^)(CHIPGeneralCommissioningClusterArmFailSafeResponseParams * _Nullable data,
+                                  NSError * _Nullable error))completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    ContentLauncher::Commands::LaunchContent::Type request;
+    GeneralCommissioning::Commands::ArmFailSafe::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    {
-        using ListType_1 = std::remove_reference_t<decltype(request.search.parameterList)>;
-        using ListMemberType_1 = ListMemberTypeGetter<ListType_1>::Type;
-        if (params.search.parameterList.count != 0) {
-            auto * listHolder_1 = new ListHolder<ListMemberType_1>(params.search.parameterList.count);
-            if (listHolder_1 == nullptr || listHolder_1->mList == nullptr) {
-                return;
-            }
-            listFreer.add(listHolder_1);
-            for (size_t i_1 = 0; i_1 < params.search.parameterList.count; ++i_1) {
-                if (![params.search.parameterList[i_1] isKindOfClass:[CHIPContentLauncherClusterParameter class]]) {
-                    // Wrong kind of value.
-                    return;
-                }
-                auto element_1 = (CHIPContentLauncherClusterParameter *) params.search.parameterList[i_1];
-                listHolder_1->mList[i_1].type = static_cast<std::remove_reference_t<decltype(listHolder_1->mList[i_1].type)>>(
-                    element_1.type.unsignedCharValue);
-                listHolder_1->mList[i_1].value = [self asCharSpan:element_1.value];
-                if (element_1.externalIDList != nil) {
-                    auto & definedValue_3 = listHolder_1->mList[i_1].externalIDList.Emplace();
-                    {
-                        using ListType_4 = std::remove_reference_t<decltype(definedValue_3)>;
-                        using ListMemberType_4 = ListMemberTypeGetter<ListType_4>::Type;
-                        if (element_1.externalIDList.count != 0) {
-                            auto * listHolder_4 = new ListHolder<ListMemberType_4>(element_1.externalIDList.count);
-                            if (listHolder_4 == nullptr || listHolder_4->mList == nullptr) {
-                                return;
-                            }
-                            listFreer.add(listHolder_4);
-                            for (size_t i_4 = 0; i_4 < element_1.externalIDList.count; ++i_4) {
-                                if (![element_1.externalIDList[i_4]
-                                        isKindOfClass:[CHIPContentLauncherClusterAdditionalInfo class]]) {
-                                    // Wrong kind of value.
-                                    return;
-                                }
-                                auto element_4 = (CHIPContentLauncherClusterAdditionalInfo *) element_1.externalIDList[i_4];
-                                listHolder_4->mList[i_4].name = [self asCharSpan:element_4.name];
-                                listHolder_4->mList[i_4].value = [self asCharSpan:element_4.value];
-                            }
-                            definedValue_3 = ListType_4(listHolder_4->mList, element_1.externalIDList.count);
-                        } else {
-                            definedValue_3 = ListType_4();
-                        }
-                    }
-                }
-            }
-            request.search.parameterList = ListType_1(listHolder_1->mList, params.search.parameterList.count);
-        } else {
-            request.search.parameterList = ListType_1();
-        }
-    }
-    request.autoPlay = params.autoPlay.boolValue;
-    if (params.data != nil) {
-        auto & definedValue_0 = request.data.Emplace();
-        definedValue_0 = [self asCharSpan:params.data];
-    }
+    request.expiryLengthSeconds = params.expiryLengthSeconds.unsignedShortValue;
+    request.breadcrumb = params.breadcrumb.unsignedLongLongValue;
 
-    new CHIPContentLauncherClusterLaunchResponseCallbackBridge(
+    new CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPContentLauncherClusterLaunchResponseCallbackType>::FromCancelable(success);
+            auto successFn = Callback<CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.InvokeCommand(
                 request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)launchURLWithParams:(CHIPContentLauncherClusterLaunchURLParams *)params
-          completionHandler:(void (^)(CHIPContentLauncherClusterLaunchResponseParams * _Nullable data,
-                                NSError * _Nullable error))completionHandler
+- (void)setRegulatoryConfigWithParams:(CHIPGeneralCommissioningClusterSetRegulatoryConfigParams *)params
+                    completionHandler:(void (^)(CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseParams * _Nullable data,
+                                          NSError * _Nullable error))completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    ContentLauncher::Commands::LaunchURL::Type request;
+    GeneralCommissioning::Commands::SetRegulatoryConfig::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    request.contentURL = [self asCharSpan:params.contentURL];
-    if (params.displayString != nil) {
-        auto & definedValue_0 = request.displayString.Emplace();
-        definedValue_0 = [self asCharSpan:params.displayString];
-    }
-    if (params.brandingInformation != nil) {
-        auto & definedValue_0 = request.brandingInformation.Emplace();
-        definedValue_0.providerName = [self asCharSpan:params.brandingInformation.providerName];
-        if (params.brandingInformation.background != nil) {
-            auto & definedValue_2 = definedValue_0.background.Emplace();
-            if (params.brandingInformation.background.imageUrl != nil) {
-                auto & definedValue_4 = definedValue_2.imageUrl.Emplace();
-                definedValue_4 = [self asCharSpan:params.brandingInformation.background.imageUrl];
-            }
-            if (params.brandingInformation.background.color != nil) {
-                auto & definedValue_4 = definedValue_2.color.Emplace();
-                definedValue_4 = [self asCharSpan:params.brandingInformation.background.color];
-            }
-            if (params.brandingInformation.background.size != nil) {
-                auto & definedValue_4 = definedValue_2.size.Emplace();
-                definedValue_4.width = params.brandingInformation.background.size.width.doubleValue;
-                definedValue_4.height = params.brandingInformation.background.size.height.doubleValue;
-                definedValue_4.metric = static_cast<std::remove_reference_t<decltype(definedValue_4.metric)>>(
-                    params.brandingInformation.background.size.metric.unsignedCharValue);
-            }
-        }
-        if (params.brandingInformation.logo != nil) {
-            auto & definedValue_2 = definedValue_0.logo.Emplace();
-            if (params.brandingInformation.logo.imageUrl != nil) {
-                auto & definedValue_4 = definedValue_2.imageUrl.Emplace();
-                definedValue_4 = [self asCharSpan:params.brandingInformation.logo.imageUrl];
-            }
-            if (params.brandingInformation.logo.color != nil) {
-                auto & definedValue_4 = definedValue_2.color.Emplace();
-                definedValue_4 = [self asCharSpan:params.brandingInformation.logo.color];
-            }
-            if (params.brandingInformation.logo.size != nil) {
-                auto & definedValue_4 = definedValue_2.size.Emplace();
-                definedValue_4.width = params.brandingInformation.logo.size.width.doubleValue;
-                definedValue_4.height = params.brandingInformation.logo.size.height.doubleValue;
-                definedValue_4.metric = static_cast<std::remove_reference_t<decltype(definedValue_4.metric)>>(
-                    params.brandingInformation.logo.size.metric.unsignedCharValue);
-            }
-        }
-        if (params.brandingInformation.progressBar != nil) {
-            auto & definedValue_2 = definedValue_0.progressBar.Emplace();
-            if (params.brandingInformation.progressBar.imageUrl != nil) {
-                auto & definedValue_4 = definedValue_2.imageUrl.Emplace();
-                definedValue_4 = [self asCharSpan:params.brandingInformation.progressBar.imageUrl];
-            }
-            if (params.brandingInformation.progressBar.color != nil) {
-                auto & definedValue_4 = definedValue_2.color.Emplace();
-                definedValue_4 = [self asCharSpan:params.brandingInformation.progressBar.color];
-            }
-            if (params.brandingInformation.progressBar.size != nil) {
-                auto & definedValue_4 = definedValue_2.size.Emplace();
-                definedValue_4.width = params.brandingInformation.progressBar.size.width.doubleValue;
-                definedValue_4.height = params.brandingInformation.progressBar.size.height.doubleValue;
-                definedValue_4.metric = static_cast<std::remove_reference_t<decltype(definedValue_4.metric)>>(
-                    params.brandingInformation.progressBar.size.metric.unsignedCharValue);
-            }
-        }
-        if (params.brandingInformation.splash != nil) {
-            auto & definedValue_2 = definedValue_0.splash.Emplace();
-            if (params.brandingInformation.splash.imageUrl != nil) {
-                auto & definedValue_4 = definedValue_2.imageUrl.Emplace();
-                definedValue_4 = [self asCharSpan:params.brandingInformation.splash.imageUrl];
-            }
-            if (params.brandingInformation.splash.color != nil) {
-                auto & definedValue_4 = definedValue_2.color.Emplace();
-                definedValue_4 = [self asCharSpan:params.brandingInformation.splash.color];
-            }
-            if (params.brandingInformation.splash.size != nil) {
-                auto & definedValue_4 = definedValue_2.size.Emplace();
-                definedValue_4.width = params.brandingInformation.splash.size.width.doubleValue;
-                definedValue_4.height = params.brandingInformation.splash.size.height.doubleValue;
-                definedValue_4.metric = static_cast<std::remove_reference_t<decltype(definedValue_4.metric)>>(
-                    params.brandingInformation.splash.size.metric.unsignedCharValue);
-            }
-        }
-        if (params.brandingInformation.waterMark != nil) {
-            auto & definedValue_2 = definedValue_0.waterMark.Emplace();
-            if (params.brandingInformation.waterMark.imageUrl != nil) {
-                auto & definedValue_4 = definedValue_2.imageUrl.Emplace();
-                definedValue_4 = [self asCharSpan:params.brandingInformation.waterMark.imageUrl];
-            }
-            if (params.brandingInformation.waterMark.color != nil) {
-                auto & definedValue_4 = definedValue_2.color.Emplace();
-                definedValue_4 = [self asCharSpan:params.brandingInformation.waterMark.color];
-            }
-            if (params.brandingInformation.waterMark.size != nil) {
-                auto & definedValue_4 = definedValue_2.size.Emplace();
-                definedValue_4.width = params.brandingInformation.waterMark.size.width.doubleValue;
-                definedValue_4.height = params.brandingInformation.waterMark.size.height.doubleValue;
-                definedValue_4.metric = static_cast<std::remove_reference_t<decltype(definedValue_4.metric)>>(
-                    params.brandingInformation.waterMark.size.metric.unsignedCharValue);
-            }
-        }
-    }
+    request.newRegulatoryConfig
+        = static_cast<std::remove_reference_t<decltype(request.newRegulatoryConfig)>>(params.newRegulatoryConfig.unsignedCharValue);
+    request.countryCode = [self asCharSpan:params.countryCode];
+    request.breadcrumb = params.breadcrumb.unsignedLongLongValue;
 
-    new CHIPContentLauncherClusterLaunchResponseCallbackBridge(
+    new CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPContentLauncherClusterLaunchResponseCallbackType>::FromCancelable(success);
+            auto successFn
+                = Callback<CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.InvokeCommand(
                 request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)readAttributeAcceptHeaderWithCompletionHandler:(void (^)(
-                                                           NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)commissioningCompleteWithCompletionHandler:
+    (void (^)(CHIPGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable data,
+        NSError * _Nullable error))completionHandler
 {
-    new CHIPContentLauncherAcceptHeaderListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ContentLauncher::Attributes::AcceptHeader::TypeInfo;
-            auto successFn = Callback<ContentLauncherAcceptHeaderListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    [self commissioningCompleteWithParams:nil completionHandler:completionHandler];
 }
-
-- (void)subscribeAttributeAcceptHeaderWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)commissioningCompleteWithParams:(CHIPGeneralCommissioningClusterCommissioningCompleteParams * _Nullable)params
+                      completionHandler:
+                          (void (^)(CHIPGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable data,
+                              NSError * _Nullable error))completionHandler
 {
-    new CHIPContentLauncherAcceptHeaderListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = ContentLauncher::Attributes::AcceptHeader::TypeInfo;
-            auto successFn = Callback<ContentLauncherAcceptHeaderListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPContentLauncherAcceptHeaderListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    GeneralCommissioning::Commands::CommissioningComplete::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
 
-+ (void)readAttributeAcceptHeaderWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPContentLauncherAcceptHeaderListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = ContentLauncher::Attributes::AcceptHeader::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ContentLauncherAcceptHeaderListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
+    new CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn
+                = Callback<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)readAttributeSupportedStreamingProtocolsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler
+- (void)readAttributeBreadcrumbWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ContentLauncher::Attributes::SupportedStreamingProtocols::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = GeneralCommissioning::Attributes::Breadcrumb::TypeInfo;
+        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeSupportedStreamingProtocolsWithValue:(NSNumber * _Nonnull)value
-                                         completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBreadcrumbWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeSupportedStreamingProtocolsWithValue:(NSNumber * _Nonnull) value
-                                                      params:nil
-                                           completionHandler:completionHandler];
+    [self writeAttributeBreadcrumbWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeSupportedStreamingProtocolsWithValue:(NSNumber * _Nonnull)value
-                                                    params:(CHIPWriteParams * _Nullable)params
-                                         completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBreadcrumbWithValue:(NSNumber * _Nonnull)value
+                                   params:(CHIPWriteParams * _Nullable)params
+                        completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -16100,9 +16098,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ContentLauncher::Attributes::SupportedStreamingProtocols::TypeInfo;
+            using TypeInfo = GeneralCommissioning::Attributes::Breadcrumb::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedLongLongValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -16110,49 +16108,46 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeSupportedStreamingProtocolsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                              params:(CHIPSubscribeParams * _Nullable)params
-                                             subscriptionEstablished:
-                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBreadcrumbWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ContentLauncher::Attributes::SupportedStreamingProtocols::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralCommissioning::Attributes::Breadcrumb::TypeInfo;
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSupportedStreamingProtocolsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                          endpoint:(NSNumber *)endpoint
-                                                             queue:(dispatch_queue_t)queue
-                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
++ (void)readAttributeBreadcrumbWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ContentLauncher::Attributes::SupportedStreamingProtocols::TypeInfo;
+            using TypeInfo = GeneralCommissioning::Attributes::Breadcrumb::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -16162,62 +16157,65 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeBasicCommissioningInfoWithCompletionHandler:
+    (void (^)(CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPContentLauncherGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ContentLauncher::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<ContentLauncherGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralCommissioning::Attributes::BasicCommissioningInfo::TypeInfo;
+            auto successFn = Callback<GeneralCommissioningBasicCommissioningInfoStructAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)
+    subscribeAttributeBasicCommissioningInfoWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value,
+                                                      NSError * _Nullable error))reportHandler
 {
-    new CHIPContentLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ContentLauncher::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<ContentLauncherGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralCommissioning::Attributes::BasicCommissioningInfo::TypeInfo;
+            auto successFn = Callback<GeneralCommissioningBasicCommissioningInfoStructAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPContentLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBasicCommissioningInfoWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value,
+                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPContentLauncherGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = ContentLauncher::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = GeneralCommissioning::Attributes::BasicCommissioningInfo::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ContentLauncherGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn
+                    = Callback<GeneralCommissioningBasicCommissioningInfoStructAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -16227,62 +16225,62 @@ new CHIPContentLauncherGeneratedCommandListListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeRegulatoryConfigWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPContentLauncherAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ContentLauncher::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<ContentLauncherAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralCommissioning::Attributes::RegulatoryConfig::TypeInfo;
+            auto successFn = Callback<GeneralCommissioningClusterRegulatoryLocationTypeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRegulatoryConfigWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPContentLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ContentLauncher::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<ContentLauncherAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralCommissioning::Attributes::RegulatoryConfig::TypeInfo;
+            auto successFn = Callback<GeneralCommissioningClusterRegulatoryLocationTypeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPContentLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRegulatoryConfigWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPContentLauncherAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = ContentLauncher::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = GeneralCommissioning::Attributes::RegulatoryConfig::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ContentLauncherAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn
+                    = Callback<GeneralCommissioningClusterRegulatoryLocationTypeAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -16292,60 +16290,62 @@ new CHIPContentLauncherAcceptedCommandListListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeLocationCapabilityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPContentLauncherAttributeListListAttributeCallbackBridge(
+    new CHIPGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ContentLauncher::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<ContentLauncherAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralCommissioning::Attributes::LocationCapability::TypeInfo;
+            auto successFn = Callback<GeneralCommissioningClusterRegulatoryLocationTypeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeLocationCapabilityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPContentLauncherAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ContentLauncher::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<ContentLauncherAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralCommissioning::Attributes::LocationCapability::TypeInfo;
+            auto successFn = Callback<GeneralCommissioningClusterRegulatoryLocationTypeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPContentLauncherAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeLocationCapabilityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPContentLauncherAttributeListListAttributeCallbackBridge(
+    new CHIPGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = ContentLauncher::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = GeneralCommissioning::Attributes::LocationCapability::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ContentLauncherAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn
+                    = Callback<GeneralCommissioningClusterRegulatoryLocationTypeAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -16355,57 +16355,60 @@ new CHIPContentLauncherAttributeListListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeSupportsConcurrentConnectionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ContentLauncher::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = GeneralCommissioning::Attributes::SupportsConcurrentConnection::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSupportsConcurrentConnectionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                              subscriptionEstablished:
+                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ContentLauncher::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralCommissioning::Attributes::SupportsConcurrentConnection::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeSupportsConcurrentConnectionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                           endpoint:(NSNumber *)endpoint
+                                                              queue:(dispatch_queue_t)queue
+                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ContentLauncher::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = GeneralCommissioning::Attributes::SupportsConcurrentConnection::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -16415,357 +16418,39 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ContentLauncher::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = GeneralCommissioning::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<GeneralCommissioningGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ContentLauncher::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralCommissioning::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<GeneralCommissioningGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ContentLauncher::Attributes::ClusterRevision::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-@end
-
-@implementation CHIPDescriptor
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)readAttributeDeviceListWithCompletionHandler:(void (^)(
-                                                         NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPDescriptorDeviceListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Descriptor::Attributes::DeviceList::TypeInfo;
-            auto successFn = Callback<DescriptorDeviceListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeDeviceListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPDescriptorDeviceListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = Descriptor::Attributes::DeviceList::TypeInfo;
-            auto successFn = Callback<DescriptorDeviceListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDescriptorDeviceListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeDeviceListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPDescriptorDeviceListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = Descriptor::Attributes::DeviceList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<DescriptorDeviceListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeServerListWithCompletionHandler:(void (^)(
-                                                         NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPDescriptorServerListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Descriptor::Attributes::ServerList::TypeInfo;
-            auto successFn = Callback<DescriptorServerListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeServerListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPDescriptorServerListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = Descriptor::Attributes::ServerList::TypeInfo;
-            auto successFn = Callback<DescriptorServerListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDescriptorServerListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeServerListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPDescriptorServerListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = Descriptor::Attributes::ServerList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<DescriptorServerListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeClientListWithCompletionHandler:(void (^)(
-                                                         NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPDescriptorClientListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Descriptor::Attributes::ClientList::TypeInfo;
-            auto successFn = Callback<DescriptorClientListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeClientListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPDescriptorClientListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = Descriptor::Attributes::ClientList::TypeInfo;
-            auto successFn = Callback<DescriptorClientListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDescriptorClientListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeClientListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPDescriptorClientListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = Descriptor::Attributes::ClientList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<DescriptorClientListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributePartsListWithCompletionHandler:(void (^)(
-                                                        NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPDescriptorPartsListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Descriptor::Attributes::PartsList::TypeInfo;
-            auto successFn = Callback<DescriptorPartsListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributePartsListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPDescriptorPartsListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = Descriptor::Attributes::PartsList::TypeInfo;
-            auto successFn = Callback<DescriptorPartsListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDescriptorPartsListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributePartsListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPDescriptorPartsListListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = Descriptor::Attributes::PartsList::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<DescriptorPartsListListAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
-{
-    new CHIPDescriptorGeneratedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Descriptor::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<DescriptorGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPDescriptorGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = Descriptor::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<DescriptorGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDescriptorGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -16778,17 +16463,17 @@ + (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheC
                                           completionHandler:
                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDescriptorGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = Descriptor::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = GeneralCommissioning::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<DescriptorGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<GeneralCommissioningGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -16801,10 +16486,10 @@ new CHIPDescriptorGeneratedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPDescriptorAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Descriptor::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<DescriptorAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralCommissioning::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<GeneralCommissioningAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -16818,19 +16503,19 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPDescriptorAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Descriptor::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<DescriptorAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralCommissioning::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<GeneralCommissioningAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDescriptorAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -16843,17 +16528,17 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDescriptorAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = Descriptor::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = GeneralCommissioning::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<DescriptorAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<GeneralCommissioningAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -16866,10 +16551,10 @@ new CHIPDescriptorAcceptedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDescriptorAttributeListListAttributeCallbackBridge(
+    new CHIPGeneralCommissioningAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Descriptor::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<DescriptorAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralCommissioning::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<GeneralCommissioningAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -16881,19 +16566,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPDescriptorAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPGeneralCommissioningAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Descriptor::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<DescriptorAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralCommissioning::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<GeneralCommissioningAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDescriptorAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPGeneralCommissioningAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -16906,17 +16591,17 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDescriptorAttributeListListAttributeCallbackBridge(
+    new CHIPGeneralCommissioningAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = Descriptor::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = GeneralCommissioning::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<DescriptorAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<GeneralCommissioningAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -16930,7 +16615,7 @@ - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Descriptor::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = GeneralCommissioning::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -16950,7 +16635,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Descriptor::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = GeneralCommissioning::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -16970,7 +16655,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Descriptor::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = GeneralCommissioning::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -16990,7 +16675,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Descriptor::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = GeneralCommissioning::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -17011,7 +16696,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Descriptor::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = GeneralCommissioning::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -17032,7 +16717,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Descriptor::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = GeneralCommissioning::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -17050,223 +16735,300 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPDiagnosticLogs
+@implementation CHIPNetworkCommissioning
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)retrieveLogsRequestWithParams:(CHIPDiagnosticLogsClusterRetrieveLogsRequestParams *)params
-                    completionHandler:(void (^)(CHIPDiagnosticLogsClusterRetrieveLogsResponseParams * _Nullable data,
-                                          NSError * _Nullable error))completionHandler
+- (void)scanNetworksWithParams:(CHIPNetworkCommissioningClusterScanNetworksParams * _Nullable)params
+             completionHandler:(void (^)(CHIPNetworkCommissioningClusterScanNetworksResponseParams * _Nullable data,
+                                   NSError * _Nullable error))completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    DiagnosticLogs::Commands::RetrieveLogsRequest::Type request;
+    NetworkCommissioning::Commands::ScanNetworks::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    request.intent = static_cast<std::remove_reference_t<decltype(request.intent)>>(params.intent.unsignedCharValue);
-    request.requestedProtocol
-        = static_cast<std::remove_reference_t<decltype(request.requestedProtocol)>>(params.requestedProtocol.unsignedCharValue);
-    request.transferFileDesignator = [self asByteSpan:params.transferFileDesignator];
+    if (params != nil) {
+        if (params.ssid != nil) {
+            auto & definedValue_0 = request.ssid.Emplace();
+            if (params.ssid == nil) {
+                definedValue_0.SetNull();
+            } else {
+                auto & nonNullValue_1 = definedValue_0.SetNonNull();
+                nonNullValue_1 = [self asByteSpan:params.ssid];
+            }
+        }
+        if (params.breadcrumb != nil) {
+            auto & definedValue_0 = request.breadcrumb.Emplace();
+            definedValue_0 = params.breadcrumb.unsignedLongLongValue;
+        }
+    }
 
-    new CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackBridge(
+    new CHIPNetworkCommissioningClusterScanNetworksResponseCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackType>::FromCancelable(success);
+            auto successFn = Callback<CHIPNetworkCommissioningClusterScanNetworksResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.InvokeCommand(
                 request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)addOrUpdateWiFiNetworkWithParams:(CHIPNetworkCommissioningClusterAddOrUpdateWiFiNetworkParams *)params
+                       completionHandler:(void (^)(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data,
+                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackBridge(
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    NetworkCommissioning::Commands::AddOrUpdateWiFiNetwork::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.ssid = [self asByteSpan:params.ssid];
+    request.credentials = [self asByteSpan:params.credentials];
+    if (params.breadcrumb != nil) {
+        auto & definedValue_0 = request.breadcrumb.Emplace();
+        definedValue_0 = params.breadcrumb.unsignedLongLongValue;
+    }
+
+    new CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = DiagnosticLogs::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<DiagnosticLogsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)addOrUpdateThreadNetworkWithParams:(CHIPNetworkCommissioningClusterAddOrUpdateThreadNetworkParams *)params
+                         completionHandler:(void (^)(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data,
+                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = DiagnosticLogs::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<DiagnosticLogsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    NetworkCommissioning::Commands::AddOrUpdateThreadNetwork::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.operationalDataset = [self asByteSpan:params.operationalDataset];
+    if (params.breadcrumb != nil) {
+        auto & definedValue_0 = request.breadcrumb.Emplace();
+        definedValue_0 = params.breadcrumb.unsignedLongLongValue;
+    }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = DiagnosticLogs::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<DiagnosticLogsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
+    new CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)removeNetworkWithParams:(CHIPNetworkCommissioningClusterRemoveNetworkParams *)params
+              completionHandler:(void (^)(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data,
+                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackBridge(
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    NetworkCommissioning::Commands::RemoveNetwork::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.networkID = [self asByteSpan:params.networkID];
+    if (params.breadcrumb != nil) {
+        auto & definedValue_0 = request.breadcrumb.Emplace();
+        definedValue_0 = params.breadcrumb.unsignedLongLongValue;
+    }
+
+    new CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = DiagnosticLogs::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<DiagnosticLogsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)connectNetworkWithParams:(CHIPNetworkCommissioningClusterConnectNetworkParams *)params
+               completionHandler:(void (^)(CHIPNetworkCommissioningClusterConnectNetworkResponseParams * _Nullable data,
+                                     NSError * _Nullable error))completionHandler
 {
-    new CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    NetworkCommissioning::Commands::ConnectNetwork::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.networkID = [self asByteSpan:params.networkID];
+    if (params.breadcrumb != nil) {
+        auto & definedValue_0 = request.breadcrumb.Emplace();
+        definedValue_0 = params.breadcrumb.unsignedLongLongValue;
+    }
+
+    new CHIPNetworkCommissioningClusterConnectNetworkResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPNetworkCommissioningClusterConnectNetworkResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)reorderNetworkWithParams:(CHIPNetworkCommissioningClusterReorderNetworkParams *)params
+               completionHandler:(void (^)(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data,
+                                     NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    NetworkCommissioning::Commands::ReorderNetwork::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.networkID = [self asByteSpan:params.networkID];
+    request.networkIndex = params.networkIndex.unsignedCharValue;
+    if (params.breadcrumb != nil) {
+        auto & definedValue_0 = request.breadcrumb.Emplace();
+        definedValue_0 = params.breadcrumb.unsignedLongLongValue;
+    }
+
+    new CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)readAttributeMaxNetworksWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = NetworkCommissioning::Attributes::MaxNetworks::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeMaxNetworksWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DiagnosticLogs::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<DiagnosticLogsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = NetworkCommissioning::Attributes::MaxNetworks::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMaxNetworksWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = DiagnosticLogs::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<DiagnosticLogsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = NetworkCommissioning::Attributes::MaxNetworks::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeNetworksWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDiagnosticLogsAttributeListListAttributeCallbackBridge(
+    new CHIPNetworkCommissioningNetworksListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = DiagnosticLogs::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<DiagnosticLogsAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = NetworkCommissioning::Attributes::Networks::TypeInfo;
+            auto successFn = Callback<NetworkCommissioningNetworksListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNetworksWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPDiagnosticLogsAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPNetworkCommissioningNetworksListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DiagnosticLogs::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<DiagnosticLogsAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = NetworkCommissioning::Attributes::Networks::TypeInfo;
+            auto successFn = Callback<NetworkCommissioningNetworksListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDiagnosticLogsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNetworkCommissioningNetworksListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNetworksWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDiagnosticLogsAttributeListListAttributeCallbackBridge(
+    new CHIPNetworkCommissioningNetworksListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = DiagnosticLogs::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = NetworkCommissioning::Attributes::Networks::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<DiagnosticLogsAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<NetworkCommissioningNetworksListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -17276,57 +17038,59 @@ new CHIPDiagnosticLogsAttributeListListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeScanMaxTimeSecondsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DiagnosticLogs::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = NetworkCommissioning::Attributes::ScanMaxTimeSeconds::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeScanMaxTimeSecondsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DiagnosticLogs::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = NetworkCommissioning::Attributes::ScanMaxTimeSeconds::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeScanMaxTimeSecondsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = DiagnosticLogs::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = NetworkCommissioning::Attributes::ScanMaxTimeSeconds::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -17336,59 +17100,60 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeConnectMaxTimeSecondsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DiagnosticLogs::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = NetworkCommissioning::Attributes::ConnectMaxTimeSeconds::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeConnectMaxTimeSecondsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DiagnosticLogs::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = NetworkCommissioning::Attributes::ConnectMaxTimeSeconds::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeConnectMaxTimeSecondsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = DiagnosticLogs::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = NetworkCommissioning::Attributes::ConnectMaxTimeSeconds::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -17398,632 +17163,161 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPDoorLock
-
-- (chip::Controller::ClusterBase *)getCluster
+- (void)readAttributeInterfaceEnabledWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    return &_cppCluster;
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = NetworkCommissioning::Attributes::InterfaceEnabled::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)lockDoorWithParams:(CHIPDoorLockClusterLockDoorParams * _Nullable)params
-         completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeInterfaceEnabledWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::LockDoor::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    if (!timedInvokeTimeoutMs.HasValue()) {
-        timedInvokeTimeoutMs.SetValue(10000);
-    }
-    if (params != nil) {
-        if (params.pinCode != nil) {
-            auto & definedValue_0 = request.pinCode.Emplace();
-            definedValue_0 = [self asByteSpan:params.pinCode];
-        }
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+    [self writeAttributeInterfaceEnabledWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-
-- (void)unlockDoorWithParams:(CHIPDoorLockClusterUnlockDoorParams * _Nullable)params
-           completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeInterfaceEnabledWithValue:(NSNumber * _Nonnull)value
+                                         params:(CHIPWriteParams * _Nullable)params
+                              completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::UnlockDoor::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    if (!timedInvokeTimeoutMs.HasValue()) {
-        timedInvokeTimeoutMs.SetValue(10000);
-    }
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
-        if (params.pinCode != nil) {
-            auto & definedValue_0 = request.pinCode.Emplace();
-            definedValue_0 = [self asByteSpan:params.pinCode];
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
     }
 
-    new CHIPCommandSuccessCallbackBridge(
+    new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
+        ^(id _Nullable ignored, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            ListFreer listFreer;
+            using TypeInfo = NetworkCommissioning::Attributes::InterfaceEnabled::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.boolValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)unlockWithTimeoutWithParams:(CHIPDoorLockClusterUnlockWithTimeoutParams *)params
-                  completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeInterfaceEnabledWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::UnlockWithTimeout::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    if (!timedInvokeTimeoutMs.HasValue()) {
-        timedInvokeTimeoutMs.SetValue(10000);
-    }
-    request.timeout = params.timeout.unsignedShortValue;
-    if (params.pinCode != nil) {
-        auto & definedValue_0 = request.pinCode.Emplace();
-        definedValue_0 = [self asByteSpan:params.pinCode];
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = NetworkCommissioning::Attributes::InterfaceEnabled::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
 
-- (void)setWeekDayScheduleWithParams:(CHIPDoorLockClusterSetWeekDayScheduleParams *)params
-                   completionHandler:(StatusCompletion)completionHandler
++ (void)readAttributeInterfaceEnabledWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::SetWeekDaySchedule::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = NetworkCommissioning::Attributes::InterfaceEnabled::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
-    request.weekDayIndex = params.weekDayIndex.unsignedCharValue;
-    request.userIndex = params.userIndex.unsignedShortValue;
-    request.daysMask = static_cast<std::remove_reference_t<decltype(request.daysMask)>>(params.daysMask.unsignedCharValue);
-    request.startHour = params.startHour.unsignedCharValue;
-    request.startMinute = params.startMinute.unsignedCharValue;
-    request.endHour = params.endHour.unsignedCharValue;
-    request.endMinute = params.endMinute.unsignedCharValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)getWeekDayScheduleWithParams:(CHIPDoorLockClusterGetWeekDayScheduleParams *)params
-                   completionHandler:(void (^)(CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable data,
-                                         NSError * _Nullable error))completionHandler
+- (void)readAttributeLastNetworkingStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::GetWeekDaySchedule::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.weekDayIndex = params.weekDayIndex.unsignedCharValue;
-    request.userIndex = params.userIndex.unsignedShortValue;
-
-    new CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackBridge(
+    new CHIPNullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackType>::FromCancelable(success);
+            using TypeInfo = NetworkCommissioning::Attributes::LastNetworkingStatus::TypeInfo;
+            auto successFn
+                = Callback<NullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)clearWeekDayScheduleWithParams:(CHIPDoorLockClusterClearWeekDayScheduleParams *)params
-                     completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeLastNetworkingStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::ClearWeekDaySchedule::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.weekDayIndex = params.weekDayIndex.unsignedCharValue;
-    request.userIndex = params.userIndex.unsignedShortValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)setYearDayScheduleWithParams:(CHIPDoorLockClusterSetYearDayScheduleParams *)params
-                   completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::SetYearDaySchedule::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.yearDayIndex = params.yearDayIndex.unsignedCharValue;
-    request.userIndex = params.userIndex.unsignedShortValue;
-    request.localStartTime = params.localStartTime.unsignedIntValue;
-    request.localEndTime = params.localEndTime.unsignedIntValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)getYearDayScheduleWithParams:(CHIPDoorLockClusterGetYearDayScheduleParams *)params
-                   completionHandler:(void (^)(CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable data,
-                                         NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::GetYearDaySchedule::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.yearDayIndex = params.yearDayIndex.unsignedCharValue;
-    request.userIndex = params.userIndex.unsignedShortValue;
-
-    new CHIPDoorLockClusterGetYearDayScheduleResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPDoorLockClusterGetYearDayScheduleResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)clearYearDayScheduleWithParams:(CHIPDoorLockClusterClearYearDayScheduleParams *)params
-                     completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::ClearYearDaySchedule::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.yearDayIndex = params.yearDayIndex.unsignedCharValue;
-    request.userIndex = params.userIndex.unsignedShortValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)setHolidayScheduleWithParams:(CHIPDoorLockClusterSetHolidayScheduleParams *)params
-                   completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::SetHolidaySchedule::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.holidayIndex = params.holidayIndex.unsignedCharValue;
-    request.localStartTime = params.localStartTime.unsignedIntValue;
-    request.localEndTime = params.localEndTime.unsignedIntValue;
-    request.operatingMode
-        = static_cast<std::remove_reference_t<decltype(request.operatingMode)>>(params.operatingMode.unsignedCharValue);
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)getHolidayScheduleWithParams:(CHIPDoorLockClusterGetHolidayScheduleParams *)params
-                   completionHandler:(void (^)(CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable data,
-                                         NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::GetHolidaySchedule::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.holidayIndex = params.holidayIndex.unsignedCharValue;
-
-    new CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPDoorLockClusterGetHolidayScheduleResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)clearHolidayScheduleWithParams:(CHIPDoorLockClusterClearHolidayScheduleParams *)params
-                     completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::ClearHolidaySchedule::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.holidayIndex = params.holidayIndex.unsignedCharValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)setUserWithParams:(CHIPDoorLockClusterSetUserParams *)params completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::SetUser::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    if (!timedInvokeTimeoutMs.HasValue()) {
-        timedInvokeTimeoutMs.SetValue(10000);
-    }
-    request.operationType
-        = static_cast<std::remove_reference_t<decltype(request.operationType)>>(params.operationType.unsignedCharValue);
-    request.userIndex = params.userIndex.unsignedShortValue;
-    if (params.userName == nil) {
-        request.userName.SetNull();
-    } else {
-        auto & nonNullValue_0 = request.userName.SetNonNull();
-        nonNullValue_0 = [self asCharSpan:params.userName];
-    }
-    if (params.userUniqueId == nil) {
-        request.userUniqueId.SetNull();
-    } else {
-        auto & nonNullValue_0 = request.userUniqueId.SetNonNull();
-        nonNullValue_0 = params.userUniqueId.unsignedIntValue;
-    }
-    if (params.userStatus == nil) {
-        request.userStatus.SetNull();
-    } else {
-        auto & nonNullValue_0 = request.userStatus.SetNonNull();
-        nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(params.userStatus.unsignedCharValue);
-    }
-    if (params.userType == nil) {
-        request.userType.SetNull();
-    } else {
-        auto & nonNullValue_0 = request.userType.SetNonNull();
-        nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(params.userType.unsignedCharValue);
-    }
-    if (params.credentialRule == nil) {
-        request.credentialRule.SetNull();
-    } else {
-        auto & nonNullValue_0 = request.credentialRule.SetNonNull();
-        nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(params.credentialRule.unsignedCharValue);
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)getUserWithParams:(CHIPDoorLockClusterGetUserParams *)params
-        completionHandler:
-            (void (^)(CHIPDoorLockClusterGetUserResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::GetUser::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.userIndex = params.userIndex.unsignedShortValue;
-
-    new CHIPDoorLockClusterGetUserResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPDoorLockClusterGetUserResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)clearUserWithParams:(CHIPDoorLockClusterClearUserParams *)params completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::ClearUser::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    if (!timedInvokeTimeoutMs.HasValue()) {
-        timedInvokeTimeoutMs.SetValue(10000);
-    }
-    request.userIndex = params.userIndex.unsignedShortValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)setCredentialWithParams:(CHIPDoorLockClusterSetCredentialParams *)params
-              completionHandler:(void (^)(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable data,
-                                    NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::SetCredential::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    if (!timedInvokeTimeoutMs.HasValue()) {
-        timedInvokeTimeoutMs.SetValue(10000);
-    }
-    request.operationType
-        = static_cast<std::remove_reference_t<decltype(request.operationType)>>(params.operationType.unsignedCharValue);
-    request.credential.credentialType = static_cast<std::remove_reference_t<decltype(request.credential.credentialType)>>(
-        params.credential.credentialType.unsignedCharValue);
-    request.credential.credentialIndex = params.credential.credentialIndex.unsignedShortValue;
-    request.credentialData = [self asByteSpan:params.credentialData];
-    if (params.userIndex == nil) {
-        request.userIndex.SetNull();
-    } else {
-        auto & nonNullValue_0 = request.userIndex.SetNonNull();
-        nonNullValue_0 = params.userIndex.unsignedShortValue;
-    }
-    if (params.userStatus == nil) {
-        request.userStatus.SetNull();
-    } else {
-        auto & nonNullValue_0 = request.userStatus.SetNonNull();
-        nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(params.userStatus.unsignedCharValue);
-    }
-    if (params.userType == nil) {
-        request.userType.SetNull();
-    } else {
-        auto & nonNullValue_0 = request.userType.SetNonNull();
-        nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(params.userType.unsignedCharValue);
-    }
-
-    new CHIPDoorLockClusterSetCredentialResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPDoorLockClusterSetCredentialResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)getCredentialStatusWithParams:(CHIPDoorLockClusterGetCredentialStatusParams *)params
-                    completionHandler:(void (^)(CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable data,
-                                          NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::GetCredentialStatus::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.credential.credentialType = static_cast<std::remove_reference_t<decltype(request.credential.credentialType)>>(
-        params.credential.credentialType.unsignedCharValue);
-    request.credential.credentialIndex = params.credential.credentialIndex.unsignedShortValue;
-
-    new CHIPDoorLockClusterGetCredentialStatusResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPDoorLockClusterGetCredentialStatusResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)clearCredentialWithParams:(CHIPDoorLockClusterClearCredentialParams *)params
-                completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    DoorLock::Commands::ClearCredential::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    if (!timedInvokeTimeoutMs.HasValue()) {
-        timedInvokeTimeoutMs.SetValue(10000);
-    }
-    if (params.credential == nil) {
-        request.credential.SetNull();
-    } else {
-        auto & nonNullValue_0 = request.credential.SetNonNull();
-        nonNullValue_0.credentialType = static_cast<std::remove_reference_t<decltype(nonNullValue_0.credentialType)>>(
-            params.credential.credentialType.unsignedCharValue);
-        nonNullValue_0.credentialIndex = params.credential.credentialIndex.unsignedShortValue;
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)readAttributeLockStateWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableDoorLockClusterDlLockStateAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = DoorLock::Attributes::LockState::TypeInfo;
-            auto successFn = Callback<NullableDoorLockClusterDlLockStateAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeLockStateWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPNullableDoorLockClusterDlLockStateAttributeCallbackSubscriptionBridge(
+    new CHIPNullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::LockState::TypeInfo;
-            auto successFn = Callback<NullableDoorLockClusterDlLockStateAttributeCallback>::FromCancelable(success);
+            using TypeInfo = NetworkCommissioning::Attributes::LastNetworkingStatus::TypeInfo;
+            auto successFn
+                = Callback<NullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableDoorLockClusterDlLockStateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPNullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackSubscriptionBridge::
+                    OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeLockStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeLastNetworkingStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableDoorLockClusterDlLockStateAttributeCallbackBridge(
+    new CHIPNullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = DoorLock::Attributes::LockState::TypeInfo;
+                using TypeInfo = NetworkCommissioning::Attributes::LastNetworkingStatus::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<NullableDoorLockClusterDlLockStateAttributeCallback>::FromCancelable(success);
+                auto successFn
+                    = Callback<NullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallback>::FromCancelable(
+                        success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -18033,121 +17327,123 @@ new CHIPNullableDoorLockClusterDlLockStateAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeLockTypeWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeLastNetworkIDWithCompletionHandler:(void (^)(
+                                                            NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockClusterDlLockTypeAttributeCallbackBridge(
+    new CHIPNullableOctetStringAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = DoorLock::Attributes::LockType::TypeInfo;
-            auto successFn = Callback<DoorLockClusterDlLockTypeAttributeCallback>::FromCancelable(success);
+            using TypeInfo = NetworkCommissioning::Attributes::LastNetworkID::TypeInfo;
+            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeLockTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeLastNetworkIDWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPDoorLockClusterDlLockTypeAttributeCallbackSubscriptionBridge(
+    new CHIPNullableOctetStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::LockType::TypeInfo;
-            auto successFn = Callback<DoorLockClusterDlLockTypeAttributeCallback>::FromCancelable(success);
+            using TypeInfo = NetworkCommissioning::Attributes::LastNetworkID::TypeInfo;
+            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockClusterDlLockTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeLockTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeLastNetworkIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockClusterDlLockTypeAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = DoorLock::Attributes::LockType::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<DoorLockClusterDlLockTypeAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPNullableOctetStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = NetworkCommissioning::Attributes::LastNetworkID::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeActuatorEnabledWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeLastConnectErrorValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::ActuatorEnabled::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt32sAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = NetworkCommissioning::Attributes::LastConnectErrorValue::TypeInfo;
+            auto successFn = Callback<NullableInt32sAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeActuatorEnabledWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeLastConnectErrorValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt32sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::ActuatorEnabled::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = NetworkCommissioning::Attributes::LastConnectErrorValue::TypeInfo;
+            auto successFn = Callback<NullableInt32sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeActuatorEnabledWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeLastConnectErrorValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt32sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::ActuatorEnabled::TypeInfo;
+            using TypeInfo = NetworkCommissioning::Attributes::LastConnectErrorValue::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt32sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -18157,59 +17453,62 @@ new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable *
     });
 }
 
-- (void)readAttributeDoorStateWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableDoorLockClusterDlDoorStateAttributeCallbackBridge(
+    new CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = DoorLock::Attributes::DoorState::TypeInfo;
-            auto successFn = Callback<NullableDoorLockClusterDlDoorStateAttributeCallback>::FromCancelable(success);
+            using TypeInfo = NetworkCommissioning::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<NetworkCommissioningGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeDoorStateWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableDoorLockClusterDlDoorStateAttributeCallbackSubscriptionBridge(
+    new CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::DoorState::TypeInfo;
-            auto successFn = Callback<NullableDoorLockClusterDlDoorStateAttributeCallback>::FromCancelable(success);
+            using TypeInfo = NetworkCommissioning::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<NetworkCommissioningGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableDoorLockClusterDlDoorStateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDoorStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableDoorLockClusterDlDoorStateAttributeCallbackBridge(
+    new CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = DoorLock::Attributes::DoorState::TypeInfo;
+                using TypeInfo = NetworkCommissioning::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<NullableDoorLockClusterDlDoorStateAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<NetworkCommissioningGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -18219,277 +17518,185 @@ new CHIPNullableDoorLockClusterDlDoorStateAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeDoorOpenEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
-{
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::DoorOpenEvents::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)writeAttributeDoorOpenEventsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeDoorOpenEventsWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeDoorOpenEventsWithValue:(NSNumber * _Nonnull)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::DoorOpenEvents::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = NetworkCommissioning::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<NetworkCommissioningAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeDoorOpenEventsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::DoorOpenEvents::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = NetworkCommissioning::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<NetworkCommissioningAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDoorOpenEventsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::DoorOpenEvents::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = NetworkCommissioning::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<NetworkCommissioningAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeDoorClosedEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
-{
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::DoorClosedEvents::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)writeAttributeDoorClosedEventsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeDoorClosedEventsWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeDoorClosedEventsWithValue:(NSNumber * _Nonnull)value
-                                         params:(CHIPWriteParams * _Nullable)params
-                              completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::DoorClosedEvents::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPNetworkCommissioningAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = NetworkCommissioning::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<NetworkCommissioningAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeDoorClosedEventsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPNetworkCommissioningAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::DoorClosedEvents::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = NetworkCommissioning::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<NetworkCommissioningAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNetworkCommissioningAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDoorClosedEventsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::DoorClosedEvents::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPNetworkCommissioningAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = NetworkCommissioning::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<NetworkCommissioningAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeOpenPeriodWithCompletionHandler:(void (^)(
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::OpenPeriod::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = NetworkCommissioning::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeOpenPeriodWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeOpenPeriodWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeOpenPeriodWithValue:(NSNumber * _Nonnull)value
-                                   params:(CHIPWriteParams * _Nullable)params
-                        completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::OpenPeriod::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeOpenPeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
                                         maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(CHIPSubscribeParams * _Nullable)params
                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::OpenPeriod::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = NetworkCommissioning::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOpenPeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                          endpoint:(NSNumber *)endpoint
                                             queue:(dispatch_queue_t)queue
                                 completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::OpenPeriod::TypeInfo;
+            using TypeInfo = NetworkCommissioning::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -18499,24 +17706,23 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeNumberOfTotalUsersSupportedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::NumberOfTotalUsersSupported::TypeInfo;
+        using TypeInfo = NetworkCommissioning::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeNumberOfTotalUsersSupportedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                              params:(CHIPSubscribeParams * _Nullable)params
-                                             subscriptionEstablished:
-                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -18525,7 +17731,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::NumberOfTotalUsersSupported::TypeInfo;
+            using TypeInfo = NetworkCommissioning::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -18537,16 +17743,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNumberOfTotalUsersSupportedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                          endpoint:(NSNumber *)endpoint
-                                                             queue:(dispatch_queue_t)queue
-                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::NumberOfTotalUsersSupported::TypeInfo;
+            using TypeInfo = NetworkCommissioning::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -18562,251 +17768,285 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeNumberOfPINUsersSupportedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
+@end
+
+@implementation CHIPDiagnosticLogs
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::NumberOfPINUsersSupported::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    return &_cppCluster;
 }
 
-- (void)subscribeAttributeNumberOfPINUsersSupportedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                            params:(CHIPSubscribeParams * _Nullable)params
-                                           subscriptionEstablished:
-                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))reportHandler
+- (void)retrieveLogsRequestWithParams:(CHIPDiagnosticLogsClusterRetrieveLogsRequestParams *)params
+                    completionHandler:(void (^)(CHIPDiagnosticLogsClusterRetrieveLogsResponseParams * _Nullable data,
+                                          NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    DiagnosticLogs::Commands::RetrieveLogsRequest::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.intent = static_cast<std::remove_reference_t<decltype(request.intent)>>(params.intent.unsignedCharValue);
+    request.requestedProtocol
+        = static_cast<std::remove_reference_t<decltype(request.requestedProtocol)>>(params.requestedProtocol.unsignedCharValue);
+    request.transferFileDesignator = [self asByteSpan:params.transferFileDesignator];
+
+    new CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
+{
+    new CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = DiagnosticLogs::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<DiagnosticLogsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::NumberOfPINUsersSupported::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DiagnosticLogs::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<DiagnosticLogsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNumberOfPINUsersSupportedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                        endpoint:(NSNumber *)endpoint
-                                                           queue:(dispatch_queue_t)queue
-                                               completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::NumberOfPINUsersSupported::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeNumberOfRFIDUsersSupportedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::NumberOfRFIDUsersSupported::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPDiagnosticLogsGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = DiagnosticLogs::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<DiagnosticLogsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)subscribeAttributeNumberOfRFIDUsersSupportedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = DiagnosticLogs::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<DiagnosticLogsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::NumberOfRFIDUsersSupported::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DiagnosticLogs::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<DiagnosticLogsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNumberOfRFIDUsersSupportedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::NumberOfRFIDUsersSupported::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPDiagnosticLogsAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = DiagnosticLogs::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<DiagnosticLogsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeNumberOfWeekDaySchedulesSupportedPerUserWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                       NSError * _Nullable error))completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::NumberOfWeekDaySchedulesSupportedPerUser::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPDiagnosticLogsAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = DiagnosticLogs::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<DiagnosticLogsAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeNumberOfWeekDaySchedulesSupportedPerUserWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
-                                                                                      subscriptionEstablishedHandler
-                                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                      NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPDiagnosticLogsAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::NumberOfWeekDaySchedulesSupportedPerUser::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DiagnosticLogs::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<DiagnosticLogsAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPDiagnosticLogsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNumberOfWeekDaySchedulesSupportedPerUserWithAttributeCache:
-            (CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                       endpoint:(NSNumber *)endpoint
-                                                                          queue:(dispatch_queue_t)queue
-                                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                    NSError * _Nullable error))completionHandler
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::NumberOfWeekDaySchedulesSupportedPerUser::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPDiagnosticLogsAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = DiagnosticLogs::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<DiagnosticLogsAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeNumberOfYearDaySchedulesSupportedPerUserWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                       NSError * _Nullable error))completionHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::NumberOfYearDaySchedulesSupportedPerUser::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DiagnosticLogs::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeNumberOfYearDaySchedulesSupportedPerUserWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
-                                                                                      subscriptionEstablishedHandler
-                                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                      NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::NumberOfYearDaySchedulesSupportedPerUser::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DiagnosticLogs::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNumberOfYearDaySchedulesSupportedPerUserWithAttributeCache:
-            (CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                       endpoint:(NSNumber *)endpoint
-                                                                          queue:(dispatch_queue_t)queue
-                                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                    NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::NumberOfYearDaySchedulesSupportedPerUser::TypeInfo;
+            using TypeInfo = DiagnosticLogs::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -18816,60 +18056,59 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeNumberOfHolidaySchedulesSupportedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::NumberOfHolidaySchedulesSupported::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DiagnosticLogs::Attributes::ClusterRevision::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeNumberOfHolidaySchedulesSupportedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                                   subscriptionEstablished:
-                                                       (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                             reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::NumberOfHolidaySchedulesSupported::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DiagnosticLogs::Attributes::ClusterRevision::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNumberOfHolidaySchedulesSupportedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                endpoint:(NSNumber *)endpoint
-                                                                   queue:(dispatch_queue_t)queue
-                                                       completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::NumberOfHolidaySchedulesSupported::TypeInfo;
+            using TypeInfo = DiagnosticLogs::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -18879,59 +18118,158 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeMaxPINCodeLengthWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+@end
+
+@implementation CHIPGeneralDiagnostics
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::MaxPINCodeLength::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    return &_cppCluster;
+}
+
+- (void)testEventTriggerWithParams:(CHIPGeneralDiagnosticsClusterTestEventTriggerParams *)params
+                 completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    GeneralDiagnostics::Commands::TestEventTrigger::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.enableKey = [self asByteSpan:params.enableKey];
+    request.eventTrigger = params.eventTrigger.unsignedLongLongValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)readAttributeNetworkInterfacesWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
+{
+    new CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = GeneralDiagnostics::Attributes::NetworkInterfaces::TypeInfo;
+            auto successFn = Callback<GeneralDiagnosticsNetworkInterfacesListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeNetworkInterfacesWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = GeneralDiagnostics::Attributes::NetworkInterfaces::TypeInfo;
+            auto successFn = Callback<GeneralDiagnosticsNetworkInterfacesListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeNetworkInterfacesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = GeneralDiagnostics::Attributes::NetworkInterfaces::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<GeneralDiagnosticsNetworkInterfacesListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
+- (void)readAttributeRebootCountWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = GeneralDiagnostics::Attributes::RebootCount::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeMaxPINCodeLengthWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRebootCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::MaxPINCodeLength::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralDiagnostics::Attributes::RebootCount::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMaxPINCodeLengthWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRebootCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::MaxPINCodeLength::TypeInfo;
+            using TypeInfo = GeneralDiagnostics::Attributes::RebootCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -18941,59 +18279,56 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeMinPINCodeLengthWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeUpTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::MinPINCodeLength::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = GeneralDiagnostics::Attributes::UpTime::TypeInfo;
+        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeMinPINCodeLengthWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeUpTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::MinPINCodeLength::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralDiagnostics::Attributes::UpTime::TypeInfo;
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMinPINCodeLengthWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeUpTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::MinPINCodeLength::TypeInfo;
+            using TypeInfo = GeneralDiagnostics::Attributes::UpTime::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -19003,59 +18338,60 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeMaxRFIDCodeLengthWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeTotalOperationalHoursWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::MaxRFIDCodeLength::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = GeneralDiagnostics::Attributes::TotalOperationalHours::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeMaxRFIDCodeLengthWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTotalOperationalHoursWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::MaxRFIDCodeLength::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralDiagnostics::Attributes::TotalOperationalHours::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMaxRFIDCodeLengthWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTotalOperationalHoursWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::MaxRFIDCodeLength::TypeInfo;
+            using TypeInfo = GeneralDiagnostics::Attributes::TotalOperationalHours::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -19065,23 +18401,22 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeMinRFIDCodeLengthWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeBootReasonsWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::MinRFIDCodeLength::TypeInfo;
+        using TypeInfo = GeneralDiagnostics::Attributes::BootReasons::TypeInfo;
         auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeMinRFIDCodeLengthWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBootReasonsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -19090,7 +18425,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::MinRFIDCodeLength::TypeInfo;
+            using TypeInfo = GeneralDiagnostics::Attributes::BootReasons::TypeInfo;
             auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -19102,16 +18437,16 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMinRFIDCodeLengthWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBootReasonsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::MinRFIDCodeLength::TypeInfo;
+            using TypeInfo = GeneralDiagnostics::Attributes::BootReasons::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -19127,62 +18462,62 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeCredentialRulesSupportWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
+- (void)readAttributeActiveHardwareFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockCredentialRulesSupportAttributeCallbackBridge(
+    new CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = DoorLock::Attributes::CredentialRulesSupport::TypeInfo;
-            auto successFn = Callback<DoorLockCredentialRulesSupportAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralDiagnostics::Attributes::ActiveHardwareFaults::TypeInfo;
+            auto successFn = Callback<GeneralDiagnosticsActiveHardwareFaultsListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeCredentialRulesSupportWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:
-                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeActiveHardwareFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPDoorLockCredentialRulesSupportAttributeCallbackSubscriptionBridge(
+    new CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::CredentialRulesSupport::TypeInfo;
-            auto successFn = Callback<DoorLockCredentialRulesSupportAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralDiagnostics::Attributes::ActiveHardwareFaults::TypeInfo;
+            auto successFn = Callback<GeneralDiagnosticsActiveHardwareFaultsListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockCredentialRulesSupportAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCredentialRulesSupportWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeActiveHardwareFaultsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockCredentialRulesSupportAttributeCallbackBridge(
+    new CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = DoorLock::Attributes::CredentialRulesSupport::TypeInfo;
+                using TypeInfo = GeneralDiagnostics::Attributes::ActiveHardwareFaults::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<DoorLockCredentialRulesSupportAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<GeneralDiagnosticsActiveHardwareFaultsListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -19192,245 +18527,189 @@ new CHIPDoorLockCredentialRulesSupportAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeNumberOfCredentialsSupportedPerUserWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeActiveRadioFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::NumberOfCredentialsSupportedPerUser::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = GeneralDiagnostics::Attributes::ActiveRadioFaults::TypeInfo;
+            auto successFn = Callback<GeneralDiagnosticsActiveRadioFaultsListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeNumberOfCredentialsSupportedPerUserWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                                     subscriptionEstablished:
-                                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                               reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                 NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeActiveRadioFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::NumberOfCredentialsSupportedPerUser::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralDiagnostics::Attributes::ActiveRadioFaults::TypeInfo;
+            auto successFn = Callback<GeneralDiagnosticsActiveRadioFaultsListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNumberOfCredentialsSupportedPerUserWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                  endpoint:(NSNumber *)endpoint
-                                                                     queue:(dispatch_queue_t)queue
-                                                         completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))completionHandler
++ (void)readAttributeActiveRadioFaultsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::NumberOfCredentialsSupportedPerUser::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = GeneralDiagnostics::Attributes::ActiveRadioFaults::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<GeneralDiagnosticsActiveRadioFaultsListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeLanguageWithCompletionHandler:(void (^)(
-                                                       NSString * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::Language::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)writeAttributeLanguageWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeLanguageWithValue:(NSString * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeLanguageWithValue:(NSString * _Nonnull)value
-                                 params:(CHIPWriteParams * _Nullable)params
-                      completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeActiveNetworkFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::Language::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = GeneralDiagnostics::Attributes::ActiveNetworkFaults::TypeInfo;
+            auto successFn = Callback<GeneralDiagnosticsActiveNetworkFaultsListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeLanguageWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeActiveNetworkFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::Language::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralDiagnostics::Attributes::ActiveNetworkFaults::TypeInfo;
+            auto successFn = Callback<GeneralDiagnosticsActiveNetworkFaultsListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeLanguageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeActiveNetworkFaultsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::Language::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = GeneralDiagnostics::Attributes::ActiveNetworkFaults::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<GeneralDiagnosticsActiveNetworkFaultsListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeLEDSettingsWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeTestEventTriggersEnabledWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::LEDSettings::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = GeneralDiagnostics::Attributes::TestEventTriggersEnabled::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeLEDSettingsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeLEDSettingsWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeLEDSettingsWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::LEDSettings::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeLEDSettingsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTestEventTriggersEnabledWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::LEDSettings::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralDiagnostics::Attributes::TestEventTriggersEnabled::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeLEDSettingsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTestEventTriggersEnabledWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::LEDSettings::TypeInfo;
+            using TypeInfo = GeneralDiagnostics::Attributes::TestEventTriggersEnabled::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -19440,280 +18719,190 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeAutoRelockTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
-{
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::AutoRelockTime::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)writeAttributeAutoRelockTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeAutoRelockTimeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeAutoRelockTimeWithValue:(NSNumber * _Nonnull)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::AutoRelockTime::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = GeneralDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<GeneralDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAutoRelockTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::AutoRelockTime::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<GeneralDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAutoRelockTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::AutoRelockTime::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = GeneralDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<GeneralDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeSoundVolumeWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::SoundVolume::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)writeAttributeSoundVolumeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeSoundVolumeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeSoundVolumeWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::SoundVolume::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = GeneralDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<GeneralDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeSoundVolumeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::SoundVolume::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<GeneralDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSoundVolumeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::SoundVolume::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = GeneralDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<GeneralDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeOperatingModeWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockClusterDlOperatingModeAttributeCallbackBridge(
+    new CHIPGeneralDiagnosticsAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = DoorLock::Attributes::OperatingMode::TypeInfo;
-            auto successFn = Callback<DoorLockClusterDlOperatingModeAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralDiagnostics::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<GeneralDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeOperatingModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeOperatingModeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeOperatingModeWithValue:(NSNumber * _Nonnull)value
-                                      params:(CHIPWriteParams * _Nullable)params
-                           completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::OperatingMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeOperatingModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPDoorLockClusterDlOperatingModeAttributeCallbackSubscriptionBridge(
+    new CHIPGeneralDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::OperatingMode::TypeInfo;
-            auto successFn = Callback<DoorLockClusterDlOperatingModeAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralDiagnostics::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<GeneralDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockClusterDlOperatingModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPGeneralDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOperatingModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockClusterDlOperatingModeAttributeCallbackBridge(
+    new CHIPGeneralDiagnosticsAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = DoorLock::Attributes::OperatingMode::TypeInfo;
+                using TypeInfo = GeneralDiagnostics::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<DoorLockClusterDlOperatingModeAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<GeneralDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -19723,127 +18912,220 @@ new CHIPDoorLockClusterDlOperatingModeAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeSupportedOperatingModesWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockSupportedOperatingModesAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = DoorLock::Attributes::SupportedOperatingModes::TypeInfo;
-            auto successFn = Callback<DoorLockSupportedOperatingModesAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = GeneralDiagnostics::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = GeneralDiagnostics::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
 
-- (void)subscribeAttributeSupportedOperatingModesWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockSupportedOperatingModesAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = GeneralDiagnostics::Attributes::FeatureMap::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = GeneralDiagnostics::Attributes::ClusterRevision::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::SupportedOperatingModes::TypeInfo;
-            auto successFn = Callback<DoorLockSupportedOperatingModesAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GeneralDiagnostics::Attributes::ClusterRevision::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockSupportedOperatingModesAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSupportedOperatingModesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockSupportedOperatingModesAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = DoorLock::Attributes::SupportedOperatingModes::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<DoorLockSupportedOperatingModesAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = GeneralDiagnostics::Attributes::ClusterRevision::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+@end
+
+@implementation CHIPSoftwareDiagnostics
+
+- (chip::Controller::ClusterBase *)getCluster
+{
+    return &_cppCluster;
+}
+
+- (void)resetWatermarksWithCompletionHandler:(StatusCompletion)completionHandler
+{
+    [self resetWatermarksWithParams:nil completionHandler:completionHandler];
+}
+- (void)resetWatermarksWithParams:(CHIPSoftwareDiagnosticsClusterResetWatermarksParams * _Nullable)params
+                completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    SoftwareDiagnostics::Commands::ResetWatermarks::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)readAttributeDefaultConfigurationRegisterWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler
+- (void)readAttributeThreadMetricsWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackBridge(
+    new CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = DoorLock::Attributes::DefaultConfigurationRegister::TypeInfo;
-            auto successFn = Callback<DoorLockDefaultConfigurationRegisterAttributeCallback>::FromCancelable(success);
+            using TypeInfo = SoftwareDiagnostics::Attributes::ThreadMetrics::TypeInfo;
+            auto successFn = Callback<SoftwareDiagnosticsThreadMetricsListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeDefaultConfigurationRegisterWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeThreadMetricsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackSubscriptionBridge(
+    new CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::DefaultConfigurationRegister::TypeInfo;
-            auto successFn = Callback<DoorLockDefaultConfigurationRegisterAttributeCallback>::FromCancelable(success);
+            using TypeInfo = SoftwareDiagnostics::Attributes::ThreadMetrics::TypeInfo;
+            auto successFn = Callback<SoftwareDiagnosticsThreadMetricsListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDefaultConfigurationRegisterWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
++ (void)readAttributeThreadMetricsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackBridge(
+    new CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = DoorLock::Attributes::DefaultConfigurationRegister::TypeInfo;
+                using TypeInfo = SoftwareDiagnostics::Attributes::ThreadMetrics::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<DoorLockDefaultConfigurationRegisterAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<SoftwareDiagnosticsThreadMetricsListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -19853,93 +19135,59 @@ new CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeEnableLocalProgrammingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
+- (void)readAttributeCurrentHeapFreeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::EnableLocalProgramming::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = SoftwareDiagnostics::Attributes::CurrentHeapFree::TypeInfo;
+        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeEnableLocalProgrammingWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeEnableLocalProgrammingWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeEnableLocalProgrammingWithValue:(NSNumber * _Nonnull)value
-                                               params:(CHIPWriteParams * _Nullable)params
-                                    completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::EnableLocalProgramming::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeEnableLocalProgrammingWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:
-                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentHeapFreeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::EnableLocalProgramming::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = SoftwareDiagnostics::Attributes::CurrentHeapFree::TypeInfo;
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeEnableLocalProgrammingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCurrentHeapFreeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::EnableLocalProgramming::TypeInfo;
+            using TypeInfo = SoftwareDiagnostics::Attributes::CurrentHeapFree::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -19949,93 +19197,59 @@ new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable *
     });
 }
 
-- (void)readAttributeEnableOneTouchLockingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler
+- (void)readAttributeCurrentHeapUsedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::EnableOneTouchLocking::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = SoftwareDiagnostics::Attributes::CurrentHeapUsed::TypeInfo;
+        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeEnableOneTouchLockingWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeEnableOneTouchLockingWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeEnableOneTouchLockingWithValue:(NSNumber * _Nonnull)value
-                                              params:(CHIPWriteParams * _Nullable)params
-                                   completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::EnableOneTouchLocking::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeEnableOneTouchLockingWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentHeapUsedWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::EnableOneTouchLocking::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = SoftwareDiagnostics::Attributes::CurrentHeapUsed::TypeInfo;
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeEnableOneTouchLockingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCurrentHeapUsedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::EnableOneTouchLocking::TypeInfo;
+            using TypeInfo = SoftwareDiagnostics::Attributes::CurrentHeapUsed::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -20045,93 +19259,60 @@ new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable *
     });
 }
 
-- (void)readAttributeEnableInsideStatusLEDWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler
+- (void)readAttributeCurrentHeapHighWatermarkWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::EnableInsideStatusLED::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = SoftwareDiagnostics::Attributes::CurrentHeapHighWatermark::TypeInfo;
+        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeEnableInsideStatusLEDWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeCurrentHeapHighWatermarkWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeEnableInsideStatusLEDWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeEnableInsideStatusLEDWithValue:(NSNumber * _Nonnull)value
-                                              params:(CHIPWriteParams * _Nullable)params
-                                   completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::EnableInsideStatusLED::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeEnableInsideStatusLEDWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::EnableInsideStatusLED::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = SoftwareDiagnostics::Attributes::CurrentHeapHighWatermark::TypeInfo;
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeEnableInsideStatusLEDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCurrentHeapHighWatermarkWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::EnableInsideStatusLED::TypeInfo;
+            using TypeInfo = SoftwareDiagnostics::Attributes::CurrentHeapHighWatermark::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -20141,195 +19322,190 @@ new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable *
     });
 }
 
-- (void)readAttributeEnablePrivacyModeButtonWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
-{
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::EnablePrivacyModeButton::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)writeAttributeEnablePrivacyModeButtonWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeEnablePrivacyModeButtonWithValue:(NSNumber * _Nonnull) value
-                                                  params:nil
-                                       completionHandler:completionHandler];
-}
-- (void)writeAttributeEnablePrivacyModeButtonWithValue:(NSNumber * _Nonnull)value
-                                                params:(CHIPWriteParams * _Nullable)params
-                                     completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::EnablePrivacyModeButton::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = SoftwareDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<SoftwareDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeEnablePrivacyModeButtonWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::EnablePrivacyModeButton::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = SoftwareDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<SoftwareDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeEnablePrivacyModeButtonWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::EnablePrivacyModeButton::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = SoftwareDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<SoftwareDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeLocalProgrammingFeaturesWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackBridge(
+    new CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = DoorLock::Attributes::LocalProgrammingFeatures::TypeInfo;
-            auto successFn = Callback<DoorLockLocalProgrammingFeaturesAttributeCallback>::FromCancelable(success);
+            using TypeInfo = SoftwareDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<SoftwareDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeLocalProgrammingFeaturesWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeLocalProgrammingFeaturesWithValue:(NSNumber * _Nonnull) value
-                                                   params:nil
-                                        completionHandler:completionHandler];
+    new CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = SoftwareDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<SoftwareDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
-- (void)writeAttributeLocalProgrammingFeaturesWithValue:(NSNumber * _Nonnull)value
-                                                 params:(CHIPWriteParams * _Nullable)params
-                                      completionHandler:(StatusCompletion)completionHandler
+
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
+    new CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = SoftwareDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<SoftwareDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
 
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::LocalProgrammingFeatures::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = SoftwareDiagnostics::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<SoftwareDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeLocalProgrammingFeaturesWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackSubscriptionBridge(
+    new CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::LocalProgrammingFeatures::TypeInfo;
-            auto successFn = Callback<DoorLockLocalProgrammingFeaturesAttributeCallback>::FromCancelable(success);
+            using TypeInfo = SoftwareDiagnostics::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<SoftwareDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeLocalProgrammingFeaturesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackBridge(
+    new CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = DoorLock::Attributes::LocalProgrammingFeatures::TypeInfo;
+                using TypeInfo = SoftwareDiagnostics::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<DoorLockLocalProgrammingFeaturesAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<SoftwareDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -20339,92 +19515,57 @@ new CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeWrongCodeEntryLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::WrongCodeEntryLimit::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = SoftwareDiagnostics::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeWrongCodeEntryLimitWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeWrongCodeEntryLimitWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeWrongCodeEntryLimitWithValue:(NSNumber * _Nonnull)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::WrongCodeEntryLimit::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeWrongCodeEntryLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::WrongCodeEntryLimit::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = SoftwareDiagnostics::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeWrongCodeEntryLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::WrongCodeEntryLimit::TypeInfo;
+            using TypeInfo = SoftwareDiagnostics::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -20434,95 +19575,59 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeUserCodeTemporaryDisableTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::UserCodeTemporaryDisableTime::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = SoftwareDiagnostics::Attributes::ClusterRevision::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeUserCodeTemporaryDisableTimeWithValue:(NSNumber * _Nonnull)value
-                                          completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeUserCodeTemporaryDisableTimeWithValue:(NSNumber * _Nonnull) value
-                                                       params:nil
-                                            completionHandler:completionHandler];
-}
-- (void)writeAttributeUserCodeTemporaryDisableTimeWithValue:(NSNumber * _Nonnull)value
-                                                     params:(CHIPWriteParams * _Nullable)params
-                                          completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::UserCodeTemporaryDisableTime::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeUserCodeTemporaryDisableTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::UserCodeTemporaryDisableTime::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = SoftwareDiagnostics::Attributes::ClusterRevision::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeUserCodeTemporaryDisableTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::UserCodeTemporaryDisableTime::TypeInfo;
+            using TypeInfo = SoftwareDiagnostics::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -20532,91 +19637,95 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeSendPINOverTheAirWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+@end
+
+@implementation CHIPThreadNetworkDiagnostics
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::SendPINOverTheAir::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    return &_cppCluster;
 }
 
-- (void)writeAttributeSendPINOverTheAirWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)resetCountsWithCompletionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeSendPINOverTheAirWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self resetCountsWithParams:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeSendPINOverTheAirWithValue:(NSNumber * _Nonnull)value
-                                          params:(CHIPWriteParams * _Nullable)params
-                               completionHandler:(StatusCompletion)completionHandler
+- (void)resetCountsWithParams:(CHIPThreadNetworkDiagnosticsClusterResetCountsParams * _Nullable)params
+            completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ThreadNetworkDiagnostics::Commands::ResetCounts::Type request;
     if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
 
-    new CHIPDefaultSuccessCallbackBridge(
+    new CHIPCommandSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
+        ^(id _Nullable value, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::SendPINOverTheAir::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeSendPINOverTheAirWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)readAttributeChannelWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Channel::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeChannelWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::SendPINOverTheAir::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Channel::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSendPINOverTheAirWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeChannelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::SendPINOverTheAir::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Channel::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -20626,190 +19735,124 @@ new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable *
     });
 }
 
-- (void)readAttributeRequirePINforRemoteOperationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler
-{
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::RequirePINforRemoteOperation::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)writeAttributeRequirePINforRemoteOperationWithValue:(NSNumber * _Nonnull)value
-                                          completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeRequirePINforRemoteOperationWithValue:(NSNumber * _Nonnull) value
-                                                       params:nil
-                                            completionHandler:completionHandler];
-}
-- (void)writeAttributeRequirePINforRemoteOperationWithValue:(NSNumber * _Nonnull)value
-                                                     params:(CHIPWriteParams * _Nullable)params
-                                          completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeRoutingRoleWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::RequirePINforRemoteOperation::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RoutingRole::TypeInfo;
+            auto successFn = Callback<NullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeRequirePINforRemoteOperationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRoutingRoleWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::RequirePINforRemoteOperation::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RoutingRole::TypeInfo;
+            auto successFn = Callback<NullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackSubscriptionBridge::
+                    OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRequirePINforRemoteOperationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
++ (void)readAttributeRoutingRoleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::RequirePINforRemoteOperation::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = ThreadNetworkDiagnostics::Attributes::RoutingRole::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn
+                    = Callback<NullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeExpiringUserTimeoutWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::ExpiringUserTimeout::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)writeAttributeExpiringUserTimeoutWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeExpiringUserTimeoutWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeExpiringUserTimeoutWithValue:(NSNumber * _Nonnull)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeNetworkNameWithCompletionHandler:(void (^)(
+                                                          NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::ExpiringUserTimeout::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPNullableCharStringAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::NetworkName::TypeInfo;
+            auto successFn = Callback<NullableCharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeExpiringUserTimeoutWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNetworkNameWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::ExpiringUserTimeout::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::NetworkName::TypeInfo;
+            auto successFn = Callback<NullableCharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeExpiringUserTimeoutWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNetworkNameWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::ExpiringUserTimeout::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::NetworkName::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableCharStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -20819,250 +19862,244 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributePanIdWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPNullableInt16uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = DoorLock::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<DoorLockGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PanId::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePanIdWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                        params:(CHIPSubscribeParams * _Nullable)params
+                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPDoorLockGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<DoorLockGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PanId::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePanIdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                    endpoint:(NSNumber *)endpoint
+                                       queue:(dispatch_queue_t)queue
+                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = DoorLock::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<DoorLockGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PanId::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeExtendedPanIdWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPNullableInt64uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = DoorLock::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<DoorLockAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ExtendedPanId::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeExtendedPanIdWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPDoorLockAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<DoorLockAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ExtendedPanId::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeExtendedPanIdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = DoorLock::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<DoorLockAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ExtendedPanId::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeMeshLocalPrefixWithCompletionHandler:(void (^)(
+                                                              NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockAttributeListListAttributeCallbackBridge(
+    new CHIPNullableOctetStringAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = DoorLock::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<DoorLockAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::MeshLocalPrefix::TypeInfo;
+            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMeshLocalPrefixWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPDoorLockAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPNullableOctetStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<DoorLockAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::MeshLocalPrefix::TypeInfo;
+            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoorLockAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMeshLocalPrefixWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDoorLockAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = DoorLock::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<DoorLockAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPNullableOctetStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::MeshLocalPrefix::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeOverrunCountWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::OverrunCount::TypeInfo;
+        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOverrunCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::OverrunCount::TypeInfo;
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOverrunCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::OverrunCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -21072,187 +20109,187 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeNeighborTableListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = DoorLock::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::NeighborTableList::TypeInfo;
+            auto successFn = Callback<ThreadNetworkDiagnosticsNeighborTableListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNeighborTableListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = DoorLock::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::NeighborTableList::TypeInfo;
+            auto successFn = Callback<ThreadNetworkDiagnosticsNeighborTableListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNeighborTableListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = DoorLock::Attributes::ClusterRevision::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = ThreadNetworkDiagnostics::Attributes::NeighborTableList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<ThreadNetworkDiagnosticsNeighborTableListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-@end
-
-@implementation CHIPElectricalMeasurement
-
-- (chip::Controller::ClusterBase *)getCluster
+- (void)readAttributeRouteTableListWithCompletionHandler:(void (^)(
+                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    return &_cppCluster;
+    new CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RouteTableList::TypeInfo;
+            auto successFn = Callback<ThreadNetworkDiagnosticsRouteTableListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)getProfileInfoCommandWithCompletionHandler:(StatusCompletion)completionHandler
-{
-    [self getProfileInfoCommandWithParams:nil completionHandler:completionHandler];
-}
-- (void)getProfileInfoCommandWithParams:(CHIPElectricalMeasurementClusterGetProfileInfoCommandParams * _Nullable)params
-                      completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeRouteTableListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    ElectricalMeasurement::Commands::GetProfileInfoCommand::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
+    new CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RouteTableList::TypeInfo;
+            auto successFn = Callback<ThreadNetworkDiagnosticsRouteTableListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
 
-- (void)getMeasurementProfileCommandWithParams:(CHIPElectricalMeasurementClusterGetMeasurementProfileCommandParams *)params
-                             completionHandler:(StatusCompletion)completionHandler
++ (void)readAttributeRouteTableListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    ElectricalMeasurement::Commands::GetMeasurementProfileCommand::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.attributeId = params.attributeId.unsignedShortValue;
-    request.startTime = params.startTime.unsignedIntValue;
-    request.numberOfIntervals = params.numberOfIntervals.unsignedCharValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+    new CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = ThreadNetworkDiagnostics::Attributes::RouteTableList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<ThreadNetworkDiagnosticsRouteTableListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
         });
 }
 
-- (void)readAttributeMeasurementTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributePartitionIdWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::MeasurementType::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt32uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PartitionId::TypeInfo;
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeMeasurementTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePartitionIdWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::MeasurementType::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PartitionId::TypeInfo;
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMeasurementTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePartitionIdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::MeasurementType::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PartitionId::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -21262,57 +20299,58 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeDcVoltageWithCompletionHandler:(void (^)(
+- (void)readAttributeWeightingWithCompletionHandler:(void (^)(
                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::DcVoltage::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Weighting::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeDcVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeWeightingWithMinInterval:(NSNumber * _Nonnull)minInterval
                                        maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(CHIPSubscribeParams * _Nullable)params
                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltage::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Weighting::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDcVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeWeightingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                         endpoint:(NSNumber *)endpoint
                                            queue:(dispatch_queue_t)queue
                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltage::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Weighting::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -21322,58 +20360,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeDcVoltageMinWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeDataVersionWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageMin::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::DataVersion::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeDcVoltageMinWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeDataVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageMin::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::DataVersion::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDcVoltageMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeDataVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageMin::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::DataVersion::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -21383,58 +20422,60 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeDcVoltageMaxWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeStableDataVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageMax::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::StableDataVersion::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeDcVoltageMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeStableDataVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageMax::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::StableDataVersion::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDcVoltageMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeStableDataVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageMax::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::StableDataVersion::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -21444,57 +20485,60 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeDcCurrentWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeLeaderRouterIdWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::DcCurrent::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::LeaderRouterId::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeDcCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeLeaderRouterIdWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrent::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::LeaderRouterId::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDcCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeLeaderRouterIdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::LeaderRouterId::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -21504,58 +20548,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeDcCurrentMinWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeDetachedRoleCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentMin::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::DetachedRoleCount::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeDcCurrentMinWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeDetachedRoleCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentMin::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::DetachedRoleCount::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDcCurrentMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeDetachedRoleCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentMin::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::DetachedRoleCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -21565,58 +20610,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeDcCurrentMaxWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeChildRoleCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentMax::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChildRoleCount::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeDcCurrentMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeChildRoleCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentMax::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChildRoleCount::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDcCurrentMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeChildRoleCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentMax::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChildRoleCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -21626,56 +20672,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeDcPowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeRouterRoleCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::DcPower::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RouterRoleCount::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeDcPowerWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRouterRoleCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::DcPower::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RouterRoleCount::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDcPowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRouterRoleCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcPower::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RouterRoleCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -21685,57 +20734,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeDcPowerMinWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeLeaderRoleCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::DcPowerMin::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::LeaderRoleCount::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeDcPowerMinWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeLeaderRoleCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::DcPowerMin::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::LeaderRoleCount::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDcPowerMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeLeaderRoleCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcPowerMin::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::LeaderRoleCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -21745,57 +20796,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeDcPowerMaxWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAttachAttemptCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::DcPowerMax::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::AttachAttemptCount::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeDcPowerMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAttachAttemptCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::DcPowerMax::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::AttachAttemptCount::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDcPowerMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAttachAttemptCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcPowerMax::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::AttachAttemptCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -21805,24 +20858,24 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeDcVoltageMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributePartitionIdChangeCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageMultiplier::TypeInfo;
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::PartitionIdChangeCount::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeDcVoltageMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePartitionIdChangeCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:
+                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -21831,7 +20884,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageMultiplier::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PartitionIdChangeCount::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -21843,16 +20896,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDcVoltageMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePartitionIdChangeCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageMultiplier::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PartitionIdChangeCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -21868,23 +20921,24 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeDcVoltageDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeBetterPartitionAttachAttemptCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageDivisor::TypeInfo;
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::BetterPartitionAttachAttemptCount::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeDcVoltageDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBetterPartitionAttachAttemptCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                                   subscriptionEstablished:
+                                                       (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                             reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -21893,7 +20947,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageDivisor::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::BetterPartitionAttachAttemptCount::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -21905,16 +20959,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDcVoltageDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBetterPartitionAttachAttemptCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                endpoint:(NSNumber *)endpoint
+                                                                   queue:(dispatch_queue_t)queue
+                                                       completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageDivisor::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::BetterPartitionAttachAttemptCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -21930,24 +20984,23 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeDcCurrentMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeParentChangeCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentMultiplier::TypeInfo;
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::ParentChangeCount::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeDcCurrentMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeParentChangeCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -21956,7 +21009,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentMultiplier::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ParentChangeCount::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -21968,16 +21021,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDcCurrentMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeParentChangeCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentMultiplier::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ParentChangeCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -21993,59 +21046,58 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeDcCurrentDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeTxTotalCountWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentDivisor::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxTotalCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeDcCurrentDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTxTotalCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentDivisor::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxTotalCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDcCurrentDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTxTotalCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentDivisor::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxTotalCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -22055,59 +21107,59 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeDcPowerMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeTxUnicastCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::DcPowerMultiplier::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxUnicastCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeDcPowerMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTxUnicastCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::DcPowerMultiplier::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxUnicastCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDcPowerMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTxUnicastCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcPowerMultiplier::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxUnicastCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -22117,59 +21169,59 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeDcPowerDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeTxBroadcastCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::DcPowerDivisor::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxBroadcastCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeDcPowerDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTxBroadcastCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::DcPowerDivisor::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxBroadcastCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDcPowerDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTxBroadcastCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcPowerDivisor::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxBroadcastCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -22179,58 +21231,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAcFrequencyWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeTxAckRequestedCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AcFrequency::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxAckRequestedCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAcFrequencyWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTxAckRequestedCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequency::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxAckRequestedCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcFrequencyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTxAckRequestedCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequency::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxAckRequestedCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -22240,59 +21294,58 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAcFrequencyMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeTxAckedCountWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyMin::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxAckedCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAcFrequencyMinWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTxAckedCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyMin::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxAckedCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcFrequencyMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTxAckedCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyMin::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxAckedCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -22302,59 +21355,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAcFrequencyMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeTxNoAckRequestedCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyMax::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxNoAckRequestedCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAcFrequencyMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTxNoAckRequestedCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyMax::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxNoAckRequestedCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcFrequencyMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTxNoAckRequestedCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyMax::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxNoAckRequestedCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -22364,59 +21418,58 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeNeutralCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeTxDataCountWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::NeutralCurrent::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxDataCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeNeutralCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+- (void)subscribeAttributeTxDataCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::NeutralCurrent::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxDataCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNeutralCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTxDataCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::NeutralCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxDataCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -22426,59 +21479,59 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeTotalActivePowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeTxDataPollCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::TotalActivePower::TypeInfo;
-        auto successFn = Callback<Int32sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxDataPollCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeTotalActivePowerWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTxDataPollCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::TotalActivePower::TypeInfo;
-            auto successFn = Callback<Int32sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxDataPollCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTotalActivePowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTxDataPollCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::TotalActivePower::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxDataPollCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -22488,59 +21541,59 @@ new CHIPInt32sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeTotalReactivePowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler
+- (void)readAttributeTxBeaconCountWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::TotalReactivePower::TypeInfo;
-        auto successFn = Callback<Int32sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxBeaconCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeTotalReactivePowerWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTxBeaconCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::TotalReactivePower::TypeInfo;
-            auto successFn = Callback<Int32sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxBeaconCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTotalReactivePowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTxBeaconCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::TotalReactivePower::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxBeaconCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -22550,23 +21603,24 @@ new CHIPInt32sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeTotalApparentPowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler
+- (void)readAttributeTxBeaconRequestCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::TotalApparentPower::TypeInfo;
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxBeaconRequestCount::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeTotalApparentPowerWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTxBeaconRequestCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -22575,7 +21629,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::TotalApparentPower::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxBeaconRequestCount::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -22587,16 +21641,16 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTotalApparentPowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTxBeaconRequestCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::TotalApparentPower::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxBeaconRequestCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -22612,60 +21666,58 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeMeasured1stHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler
+- (void)readAttributeTxOtherCountWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::Measured1stHarmonicCurrent::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxOtherCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeMeasured1stHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTxOtherCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::Measured1stHarmonicCurrent::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxOtherCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMeasured1stHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
++ (void)readAttributeTxOtherCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::Measured1stHarmonicCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxOtherCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -22675,60 +21727,58 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeMeasured3rdHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler
+- (void)readAttributeTxRetryCountWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::Measured3rdHarmonicCurrent::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxRetryCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeMeasured3rdHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTxRetryCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::Measured3rdHarmonicCurrent::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxRetryCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMeasured3rdHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
++ (void)readAttributeTxRetryCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::Measured3rdHarmonicCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxRetryCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -22738,60 +21788,60 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeMeasured5thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler
+- (void)readAttributeTxDirectMaxRetryExpiryCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::Measured5thHarmonicCurrent::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxDirectMaxRetryExpiryCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeMeasured5thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTxDirectMaxRetryExpiryCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                              params:(CHIPSubscribeParams * _Nullable)params
+                                             subscriptionEstablished:
+                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::Measured5thHarmonicCurrent::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxDirectMaxRetryExpiryCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMeasured5thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
++ (void)readAttributeTxDirectMaxRetryExpiryCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                          endpoint:(NSNumber *)endpoint
+                                                             queue:(dispatch_queue_t)queue
+                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::Measured5thHarmonicCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxDirectMaxRetryExpiryCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -22801,60 +21851,60 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeMeasured7thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler
+- (void)readAttributeTxIndirectMaxRetryExpiryCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::Measured7thHarmonicCurrent::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxIndirectMaxRetryExpiryCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeMeasured7thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTxIndirectMaxRetryExpiryCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                params:(CHIPSubscribeParams * _Nullable)params
+                                               subscriptionEstablished:
+                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::Measured7thHarmonicCurrent::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxIndirectMaxRetryExpiryCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMeasured7thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
++ (void)readAttributeTxIndirectMaxRetryExpiryCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                            endpoint:(NSNumber *)endpoint
+                                                               queue:(dispatch_queue_t)queue
+                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::Measured7thHarmonicCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxIndirectMaxRetryExpiryCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -22864,60 +21914,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeMeasured9thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler
+- (void)readAttributeTxErrCcaCountWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::Measured9thHarmonicCurrent::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxErrCcaCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeMeasured9thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTxErrCcaCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::Measured9thHarmonicCurrent::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxErrCcaCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMeasured9thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
++ (void)readAttributeTxErrCcaCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::Measured9thHarmonicCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxErrCcaCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -22927,60 +21976,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeMeasured11thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler
+- (void)readAttributeTxErrAbortCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::Measured11thHarmonicCurrent::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxErrAbortCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeMeasured11thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                              params:(CHIPSubscribeParams * _Nullable)params
-                                             subscriptionEstablished:
-                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTxErrAbortCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::Measured11thHarmonicCurrent::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxErrAbortCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMeasured11thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                          endpoint:(NSNumber *)endpoint
-                                                             queue:(dispatch_queue_t)queue
-                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
++ (void)readAttributeTxErrAbortCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::Measured11thHarmonicCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxErrAbortCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -22990,60 +22038,60 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeMeasuredPhase1stHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeTxErrBusyChannelCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase1stHarmonicCurrent::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxErrBusyChannelCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeMeasuredPhase1stHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                                 subscriptionEstablished:
-                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTxErrBusyChannelCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase1stHarmonicCurrent::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxErrBusyChannelCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMeasuredPhase1stHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                              endpoint:(NSNumber *)endpoint
-                                                                 queue:(dispatch_queue_t)queue
-                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler
++ (void)readAttributeTxErrBusyChannelCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase1stHarmonicCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxErrBusyChannelCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -23053,60 +22101,58 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeMeasuredPhase3rdHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeRxTotalCountWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase3rdHarmonicCurrent::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxTotalCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeMeasuredPhase3rdHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                                 subscriptionEstablished:
-                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRxTotalCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase3rdHarmonicCurrent::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxTotalCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMeasuredPhase3rdHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                              endpoint:(NSNumber *)endpoint
-                                                                 queue:(dispatch_queue_t)queue
-                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler
++ (void)readAttributeRxTotalCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase3rdHarmonicCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxTotalCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -23116,60 +22162,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeMeasuredPhase5thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeRxUnicastCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase5thHarmonicCurrent::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxUnicastCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeMeasuredPhase5thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                                 subscriptionEstablished:
-                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRxUnicastCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase5thHarmonicCurrent::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxUnicastCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMeasuredPhase5thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                              endpoint:(NSNumber *)endpoint
-                                                                 queue:(dispatch_queue_t)queue
-                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler
++ (void)readAttributeRxUnicastCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase5thHarmonicCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxUnicastCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -23179,60 +22224,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeMeasuredPhase7thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeRxBroadcastCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase7thHarmonicCurrent::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxBroadcastCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeMeasuredPhase7thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                                 subscriptionEstablished:
-                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRxBroadcastCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase7thHarmonicCurrent::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxBroadcastCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMeasuredPhase7thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                              endpoint:(NSNumber *)endpoint
-                                                                 queue:(dispatch_queue_t)queue
-                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler
++ (void)readAttributeRxBroadcastCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase7thHarmonicCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxBroadcastCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -23242,60 +22286,58 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeMeasuredPhase9thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeRxDataCountWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase9thHarmonicCurrent::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDataCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeMeasuredPhase9thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                                 subscriptionEstablished:
-                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRxDataCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase9thHarmonicCurrent::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDataCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMeasuredPhase9thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                              endpoint:(NSNumber *)endpoint
-                                                                 queue:(dispatch_queue_t)queue
-                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler
++ (void)readAttributeRxDataCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase9thHarmonicCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDataCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -23305,60 +22347,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeMeasuredPhase11thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeRxDataPollCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase11thHarmonicCurrent::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDataPollCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeMeasuredPhase11thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                                  subscriptionEstablished:
-                                                      (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                            reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRxDataPollCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase11thHarmonicCurrent::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDataPollCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMeasuredPhase11thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                               endpoint:(NSNumber *)endpoint
-                                                                  queue:(dispatch_queue_t)queue
-                                                      completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler
++ (void)readAttributeRxDataPollCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase11thHarmonicCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDataPollCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -23368,60 +22409,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAcFrequencyMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler
+- (void)readAttributeRxBeaconCountWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyMultiplier::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxBeaconCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAcFrequencyMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRxBeaconCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyMultiplier::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxBeaconCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcFrequencyMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRxBeaconCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyMultiplier::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxBeaconCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -23431,59 +22471,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAcFrequencyDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler
+- (void)readAttributeRxBeaconRequestCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyDivisor::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxBeaconRequestCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAcFrequencyDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRxBeaconRequestCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyDivisor::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxBeaconRequestCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcFrequencyDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRxBeaconRequestCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyDivisor::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxBeaconRequestCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -23493,23 +22534,22 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributePowerMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeRxOtherCountWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::PowerMultiplier::TypeInfo;
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxOtherCount::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributePowerMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRxOtherCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -23518,7 +22558,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::PowerMultiplier::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxOtherCount::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -23530,16 +22570,16 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePowerMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRxOtherCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::PowerMultiplier::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxOtherCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -23555,22 +22595,24 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributePowerDivisorWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeRxAddressFilteredCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::PowerDivisor::TypeInfo;
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxAddressFilteredCount::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributePowerDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRxAddressFilteredCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:
+                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -23579,7 +22621,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::PowerDivisor::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxAddressFilteredCount::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -23591,16 +22633,16 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePowerDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRxAddressFilteredCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::PowerDivisor::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxAddressFilteredCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -23616,60 +22658,60 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeHarmonicCurrentMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
+- (void)readAttributeRxDestAddrFilteredCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::HarmonicCurrentMultiplier::TypeInfo;
-        auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDestAddrFilteredCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeHarmonicCurrentMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                            params:(CHIPSubscribeParams * _Nullable)params
-                                           subscriptionEstablished:
-                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRxDestAddrFilteredCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::HarmonicCurrentMultiplier::TypeInfo;
-            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDestAddrFilteredCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeHarmonicCurrentMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                        endpoint:(NSNumber *)endpoint
-                                                           queue:(dispatch_queue_t)queue
-                                               completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
++ (void)readAttributeRxDestAddrFilteredCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::HarmonicCurrentMultiplier::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDestAddrFilteredCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -23679,60 +22721,59 @@ new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributePhaseHarmonicCurrentMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeRxDuplicatedCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::PhaseHarmonicCurrentMultiplier::TypeInfo;
-        auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDuplicatedCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributePhaseHarmonicCurrentMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                                subscriptionEstablished:
-                                                    (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                          reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRxDuplicatedCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::PhaseHarmonicCurrentMultiplier::TypeInfo;
-            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDuplicatedCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePhaseHarmonicCurrentMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                             endpoint:(NSNumber *)endpoint
-                                                                queue:(dispatch_queue_t)queue
-                                                    completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler
++ (void)readAttributeRxDuplicatedCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::PhaseHarmonicCurrentMultiplier::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDuplicatedCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -23742,60 +22783,59 @@ new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeInstantaneousVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeRxErrNoFrameCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousVoltage::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrNoFrameCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeInstantaneousVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRxErrNoFrameCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousVoltage::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrNoFrameCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInstantaneousVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRxErrNoFrameCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousVoltage::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrNoFrameCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -23805,60 +22845,60 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeInstantaneousLineCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
+- (void)readAttributeRxErrUnknownNeighborCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousLineCurrent::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrUnknownNeighborCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeInstantaneousLineCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRxErrUnknownNeighborCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                            params:(CHIPSubscribeParams * _Nullable)params
+                                           subscriptionEstablished:
+                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousLineCurrent::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrUnknownNeighborCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInstantaneousLineCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRxErrUnknownNeighborCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                        endpoint:(NSNumber *)endpoint
+                                                           queue:(dispatch_queue_t)queue
+                                               completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousLineCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrUnknownNeighborCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -23868,60 +22908,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeInstantaneousActiveCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler
+- (void)readAttributeRxErrInvalidSrcAddrCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousActiveCurrent::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrInvalidSrcAddrCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeInstantaneousActiveCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRxErrInvalidSrcAddrCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousActiveCurrent::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrInvalidSrcAddrCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInstantaneousActiveCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
++ (void)readAttributeRxErrInvalidSrcAddrCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousActiveCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrInvalidSrcAddrCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -23931,60 +22971,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeInstantaneousReactiveCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler
+- (void)readAttributeRxErrSecCountWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousReactiveCurrent::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrSecCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeInstantaneousReactiveCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRxErrSecCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousReactiveCurrent::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrSecCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInstantaneousReactiveCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
++ (void)readAttributeRxErrSecCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousReactiveCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrSecCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -23994,59 +23033,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeInstantaneousPowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler
+- (void)readAttributeRxErrFcsCountWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousPower::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrFcsCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeInstantaneousPowerWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRxErrFcsCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousPower::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrFcsCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInstantaneousPowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRxErrFcsCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousPower::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrFcsCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -24056,57 +23095,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRmsVoltageWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeRxErrOtherCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltage::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrOtherCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRmsVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRxErrOtherCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltage::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrOtherCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRxErrOtherCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltage::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrOtherCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -24116,59 +23157,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRmsVoltageMinWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeActiveTimestampWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMin::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt64uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeRmsVoltageMinWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeActiveTimestampWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMin::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsVoltageMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeActiveTimestampWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMin::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -24178,59 +23220,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRmsVoltageMaxWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributePendingTimestampWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMax::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt64uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PendingTimestamp::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeRmsVoltageMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePendingTimestampWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMax::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PendingTimestamp::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsVoltageMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePendingTimestampWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMax::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PendingTimestamp::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -24240,57 +23283,57 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRmsCurrentWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrent::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt32uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Delay::TypeInfo;
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeRmsCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                        params:(CHIPSubscribeParams * _Nullable)params
+                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrent::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Delay::TypeInfo;
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeDelayWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                    endpoint:(NSNumber *)endpoint
+                                       queue:(dispatch_queue_t)queue
+                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Delay::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -24300,121 +23343,123 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRmsCurrentMinWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeSecurityPolicyWithCompletionHandler:
+    (void (^)(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMin::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::SecurityPolicy::TypeInfo;
+            auto successFn = Callback<ThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeRmsCurrentMinWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSecurityPolicyWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value,
+                                                  NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMin::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::SecurityPolicy::TypeInfo;
+            auto successFn = Callback<ThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsCurrentMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeSecurityPolicyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:(void (^)(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value,
+                                                          NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMin::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = ThreadNetworkDiagnostics::Attributes::SecurityPolicy::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<ThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeRmsCurrentMaxWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeChannelMaskWithCompletionHandler:(void (^)(
+                                                          NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMax::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableOctetStringAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChannelMask::TypeInfo;
+            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeRmsCurrentMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeChannelMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableOctetStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMax::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChannelMask::TypeInfo;
+            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsCurrentMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeChannelMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableOctetStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMax::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChannelMask::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -24424,306 +23469,398 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeActivePowerWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeOperationalDatasetComponentsWithCompletionHandler:
+    (void (^)(CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value,
+        NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::ActivePower::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::TypeInfo;
+            auto successFn
+                = Callback<ThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeActivePowerWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)
+    subscribeAttributeOperationalDatasetComponentsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:
+                                                        (void (^)(
+                                                            CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value,
+                                                            NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePower::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::TypeInfo;
+            auto successFn
+                = Callback<ThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackSubscriptionBridge::
+                    OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeActivePowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)
+    readAttributeOperationalDatasetComponentsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:
+                                                  (void (^)(
+                                                      CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value,
+                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePower::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn
+                    = Callback<ThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallback>::FromCancelable(
+                        success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeActivePowerMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeActiveNetworkFaultsListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMin::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::TypeInfo;
+            auto successFn
+                = Callback<ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeActivePowerMinWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeActiveNetworkFaultsListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:
+                                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMin::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::TypeInfo;
+            auto successFn
+                = Callback<ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackSubscriptionBridge::
+                    OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeActivePowerMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeActiveNetworkFaultsListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMin::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn
+                    = Callback<ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeActivePowerMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMax::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<ThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeActivePowerMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMax::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<ThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeActivePowerMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMax::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = ThreadNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn
+                    = Callback<ThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeReactivePowerWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::ReactivePower::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<ThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeReactivePowerWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<ThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = ThreadNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn
+                    = Callback<ThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<ThreadNetworkDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::ReactivePower::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<ThreadNetworkDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeReactivePowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::ReactivePower::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = ThreadNetworkDiagnostics::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<ThreadNetworkDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeApparentPowerWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::ApparentPower::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeApparentPowerWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::ApparentPower::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeApparentPowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::ApparentPower::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -24733,58 +23870,59 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributePowerFactorWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::PowerFactor::TypeInfo;
-        auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThreadNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributePowerFactorWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::PowerFactor::TypeInfo;
-            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePowerFactorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::PowerFactor::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -24794,95 +23932,95 @@ new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeAverageRmsVoltageMeasurementPeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                 NSError * _Nullable error))completionHandler
+@end
+
+@implementation CHIPWiFiNetworkDiagnostics
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriod::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    return &_cppCluster;
 }
 
-- (void)writeAttributeAverageRmsVoltageMeasurementPeriodWithValue:(NSNumber * _Nonnull)value
-                                                completionHandler:(StatusCompletion)completionHandler
+- (void)resetCountsWithCompletionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeAverageRmsVoltageMeasurementPeriodWithValue:(NSNumber * _Nonnull) value
-                                                             params:nil
-                                                  completionHandler:completionHandler];
+    [self resetCountsWithParams:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeAverageRmsVoltageMeasurementPeriodWithValue:(NSNumber * _Nonnull)value
-                                                           params:(CHIPWriteParams * _Nullable)params
-                                                completionHandler:(StatusCompletion)completionHandler
+- (void)resetCountsWithParams:(CHIPWiFiNetworkDiagnosticsClusterResetCountsParams * _Nullable)params
+            completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    WiFiNetworkDiagnostics::Commands::ResetCounts::Type request;
     if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
 
-    new CHIPDefaultSuccessCallbackBridge(
+    new CHIPCommandSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
+        ^(id _Nullable value, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriod::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeAverageRmsVoltageMeasurementPeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                                    subscriptionEstablished:
-                                                        (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                              reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                NSError * _Nullable error))reportHandler
+- (void)readAttributeBssidWithCompletionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableOctetStringAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::Bssid::TypeInfo;
+            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeBssidWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                        params:(CHIPSubscribeParams * _Nullable)params
+                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                 reportHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableOctetStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriod::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::Bssid::TypeInfo;
+            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAverageRmsVoltageMeasurementPeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                 endpoint:(NSNumber *)endpoint
-                                                                    queue:(dispatch_queue_t)queue
-                                                        completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler
++ (void)readAttributeBssidWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                    endpoint:(NSNumber *)endpoint
+                                       queue:(dispatch_queue_t)queue
+                           completionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableOctetStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriod::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::Bssid::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -24892,193 +24030,191 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAverageRmsUnderVoltageCounterWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounter::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)writeAttributeAverageRmsUnderVoltageCounterWithValue:(NSNumber * _Nonnull)value
-                                           completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeAverageRmsUnderVoltageCounterWithValue:(NSNumber * _Nonnull) value
-                                                        params:nil
-                                             completionHandler:completionHandler];
-}
-- (void)writeAttributeAverageRmsUnderVoltageCounterWithValue:(NSNumber * _Nonnull)value
-                                                      params:(CHIPWriteParams * _Nullable)params
-                                           completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeSecurityTypeWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounter::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPNullableWiFiNetworkDiagnosticsClusterSecurityTypeAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::SecurityType::TypeInfo;
+            auto successFn = Callback<NullableWiFiNetworkDiagnosticsClusterSecurityTypeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAverageRmsUnderVoltageCounterWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                params:(CHIPSubscribeParams * _Nullable)params
-                                               subscriptionEstablished:
-                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSecurityTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableWiFiNetworkDiagnosticsClusterSecurityTypeAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounter::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::SecurityType::TypeInfo;
+            auto successFn = Callback<NullableWiFiNetworkDiagnosticsClusterSecurityTypeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPNullableWiFiNetworkDiagnosticsClusterSecurityTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAverageRmsUnderVoltageCounterWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                            endpoint:(NSNumber *)endpoint
-                                                               queue:(dispatch_queue_t)queue
-                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler
++ (void)readAttributeSecurityTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounter::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPNullableWiFiNetworkDiagnosticsClusterSecurityTypeAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = WiFiNetworkDiagnostics::Attributes::SecurityType::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn
+                    = Callback<NullableWiFiNetworkDiagnosticsClusterSecurityTypeAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeRmsExtremeOverVoltagePeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler
+- (void)readAttributeWiFiVersionWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriod::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableWiFiNetworkDiagnosticsClusterWiFiVersionTypeAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::WiFiVersion::TypeInfo;
+            auto successFn
+                = Callback<NullableWiFiNetworkDiagnosticsClusterWiFiVersionTypeAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)writeAttributeRmsExtremeOverVoltagePeriodWithValue:(NSNumber * _Nonnull)value
-                                         completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeWiFiVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeRmsExtremeOverVoltagePeriodWithValue:(NSNumber * _Nonnull) value
-                                                      params:nil
-                                           completionHandler:completionHandler];
+    new CHIPNullableWiFiNetworkDiagnosticsClusterWiFiVersionTypeAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::WiFiVersion::TypeInfo;
+            auto successFn
+                = Callback<NullableWiFiNetworkDiagnosticsClusterWiFiVersionTypeAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPNullableWiFiNetworkDiagnosticsClusterWiFiVersionTypeAttributeCallbackSubscriptionBridge::
+                    OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
-- (void)writeAttributeRmsExtremeOverVoltagePeriodWithValue:(NSNumber * _Nonnull)value
-                                                    params:(CHIPWriteParams * _Nullable)params
-                                         completionHandler:(StatusCompletion)completionHandler
+
++ (void)readAttributeWiFiVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
+    new CHIPNullableWiFiNetworkDiagnosticsClusterWiFiVersionTypeAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = WiFiNetworkDiagnostics::Attributes::WiFiVersion::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn
+                    = Callback<NullableWiFiNetworkDiagnosticsClusterWiFiVersionTypeAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
 
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriod::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+- (void)readAttributeChannelNumberWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPNullableInt16uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::ChannelNumber::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeRmsExtremeOverVoltagePeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                              params:(CHIPSubscribeParams * _Nullable)params
-                                             subscriptionEstablished:
-                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeChannelNumberWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriod::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::ChannelNumber::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsExtremeOverVoltagePeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                          endpoint:(NSNumber *)endpoint
-                                                             queue:(dispatch_queue_t)queue
-                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
++ (void)readAttributeChannelNumberWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriod::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::ChannelNumber::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -25088,95 +24224,57 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRmsExtremeUnderVoltagePeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriod::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)writeAttributeRmsExtremeUnderVoltagePeriodWithValue:(NSNumber * _Nonnull)value
-                                          completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeRmsExtremeUnderVoltagePeriodWithValue:(NSNumber * _Nonnull) value
-                                                       params:nil
-                                            completionHandler:completionHandler];
-}
-- (void)writeAttributeRmsExtremeUnderVoltagePeriodWithValue:(NSNumber * _Nonnull)value
-                                                     params:(CHIPWriteParams * _Nullable)params
-                                          completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeRssiWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriod::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPNullableInt8sAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::Rssi::TypeInfo;
+            auto successFn = Callback<NullableInt8sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeRmsExtremeUnderVoltagePeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRssiWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                       params:(CHIPSubscribeParams * _Nullable)params
+                      subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriod::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::Rssi::TypeInfo;
+            auto successFn = Callback<NullableInt8sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsExtremeUnderVoltagePeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
++ (void)readAttributeRssiWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                   endpoint:(NSNumber *)endpoint
+                                      queue:(dispatch_queue_t)queue
+                          completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriod::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::Rssi::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -25186,92 +24284,59 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRmsVoltageSagPeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeBeaconLostCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSagPeriod::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = WiFiNetworkDiagnostics::Attributes::BeaconLostCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeRmsVoltageSagPeriodWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeRmsVoltageSagPeriodWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeRmsVoltageSagPeriodWithValue:(NSNumber * _Nonnull)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSagPeriod::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeRmsVoltageSagPeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBeaconLostCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSagPeriod::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::BeaconLostCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsVoltageSagPeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBeaconLostCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSagPeriod::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::BeaconLostCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -25281,93 +24346,59 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRmsVoltageSwellPeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler
+- (void)readAttributeBeaconRxCountWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriod::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = WiFiNetworkDiagnostics::Attributes::BeaconRxCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeRmsVoltageSwellPeriodWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeRmsVoltageSwellPeriodWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeRmsVoltageSwellPeriodWithValue:(NSNumber * _Nonnull)value
-                                              params:(CHIPWriteParams * _Nullable)params
-                                   completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeBeaconRxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriod::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeRmsVoltageSwellPeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriod::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::BeaconRxCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsVoltageSwellPeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBeaconRxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriod::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::BeaconRxCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -25377,60 +24408,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAcVoltageMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributePacketMulticastRxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AcVoltageMultiplier::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketMulticastRxCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAcVoltageMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePacketMulticastRxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:
+                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AcVoltageMultiplier::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketMulticastRxCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcVoltageMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePacketMulticastRxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcVoltageMultiplier::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketMulticastRxCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -25440,59 +24471,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAcVoltageDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributePacketMulticastTxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AcVoltageDivisor::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketMulticastTxCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAcVoltageDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePacketMulticastTxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:
+                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AcVoltageDivisor::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketMulticastTxCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcVoltageDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePacketMulticastTxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcVoltageDivisor::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketMulticastTxCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -25502,60 +24534,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAcCurrentMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributePacketUnicastRxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AcCurrentMultiplier::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketUnicastRxCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAcCurrentMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePacketUnicastRxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AcCurrentMultiplier::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketUnicastRxCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcCurrentMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePacketUnicastRxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcCurrentMultiplier::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketUnicastRxCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -25565,59 +24597,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAcCurrentDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributePacketUnicastTxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AcCurrentDivisor::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketUnicastTxCount::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAcCurrentDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePacketUnicastTxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AcCurrentDivisor::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketUnicastTxCount::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcCurrentDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePacketUnicastTxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcCurrentDivisor::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketUnicastTxCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -25627,59 +24660,59 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAcPowerMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeCurrentMaxRateWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AcPowerMultiplier::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = WiFiNetworkDiagnostics::Attributes::CurrentMaxRate::TypeInfo;
+        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAcPowerMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentMaxRateWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AcPowerMultiplier::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::CurrentMaxRate::TypeInfo;
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcPowerMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCurrentMaxRateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcPowerMultiplier::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::CurrentMaxRate::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -25689,59 +24722,58 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAcPowerDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeOverrunCountWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AcPowerDivisor::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = WiFiNetworkDiagnostics::Attributes::OverrunCount::TypeInfo;
+        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAcPowerDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOverrunCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AcPowerDivisor::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::OverrunCount::TypeInfo;
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcPowerDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOverrunCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcPowerDivisor::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::OverrunCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -25751,215 +24783,250 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeOverloadAlarmsMaskWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler
-{
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::OverloadAlarmsMask::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)writeAttributeOverloadAlarmsMaskWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeOverloadAlarmsMaskWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeOverloadAlarmsMaskWithValue:(NSNumber * _Nonnull)value
-                                           params:(CHIPWriteParams * _Nullable)params
-                                completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::OverloadAlarmsMask::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<WiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeOverloadAlarmsMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::OverloadAlarmsMask::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<WiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOverloadAlarmsMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::OverloadAlarmsMask::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = WiFiNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<WiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeVoltageOverloadWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::VoltageOverload::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<WiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeVoltageOverloadWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::VoltageOverload::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<WiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeVoltageOverloadWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::VoltageOverload::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+    new CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = WiFiNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<WiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeCurrentOverloadWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::CurrentOverload::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<WiFiNetworkDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<WiFiNetworkDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = WiFiNetworkDiagnostics::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<WiFiNetworkDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = WiFiNetworkDiagnostics::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeCurrentOverloadWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::CurrentOverload::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentOverloadWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::CurrentOverload::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -25969,56 +25036,23 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAcOverloadAlarmsMaskWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AcOverloadAlarmsMask::TypeInfo;
+        using TypeInfo = WiFiNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeAcOverloadAlarmsMaskWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeAcOverloadAlarmsMaskWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeAcOverloadAlarmsMaskWithValue:(NSNumber * _Nonnull)value
-                                             params:(CHIPWriteParams * _Nullable)params
-                                  completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcOverloadAlarmsMask::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeAcOverloadAlarmsMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -26027,7 +25061,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AcOverloadAlarmsMask::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -26039,16 +25073,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcOverloadAlarmsMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcOverloadAlarmsMask::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -26064,121 +25098,161 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAcVoltageOverloadWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+@end
+
+@implementation CHIPEthernetNetworkDiagnostics
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AcVoltageOverload::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    return &_cppCluster;
 }
 
-- (void)subscribeAttributeAcVoltageOverloadWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)resetCountsWithCompletionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    [self resetCountsWithParams:nil completionHandler:completionHandler];
+}
+- (void)resetCountsWithParams:(CHIPEthernetNetworkDiagnosticsClusterResetCountsParams * _Nullable)params
+            completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    EthernetNetworkDiagnostics::Commands::ResetCounts::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)readAttributePHYRateWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPNullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::PHYRate::TypeInfo;
+            auto successFn
+                = Callback<NullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributePHYRateWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AcVoltageOverload::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::PHYRate::TypeInfo;
+            auto successFn
+                = Callback<NullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPNullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackSubscriptionBridge::
+                    OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcVoltageOverloadWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePHYRateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcVoltageOverload::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPNullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = EthernetNetworkDiagnostics::Attributes::PHYRate::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn
+                    = Callback<NullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeAcCurrentOverloadWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeFullDuplexWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AcCurrentOverload::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableBooleanAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::FullDuplex::TypeInfo;
+            auto successFn = Callback<NullableBooleanAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeAcCurrentOverloadWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFullDuplexWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPNullableBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AcCurrentOverload::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::FullDuplex::TypeInfo;
+            auto successFn = Callback<NullableBooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcCurrentOverloadWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFullDuplexWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcCurrentOverload::TypeInfo;
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::FullDuplex::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableBooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -26188,60 +25262,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAcActivePowerOverloadWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler
+- (void)readAttributePacketRxCountWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AcActivePowerOverload::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = EthernetNetworkDiagnostics::Attributes::PacketRxCount::TypeInfo;
+        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAcActivePowerOverloadWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePacketRxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AcActivePowerOverload::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::PacketRxCount::TypeInfo;
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcActivePowerOverloadWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePacketRxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcActivePowerOverload::TypeInfo;
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::PacketRxCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -26251,60 +25324,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAcReactivePowerOverloadWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
+- (void)readAttributePacketTxCountWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AcReactivePowerOverload::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = EthernetNetworkDiagnostics::Attributes::PacketTxCount::TypeInfo;
+        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAcReactivePowerOverloadWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePacketTxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AcReactivePowerOverload::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::PacketTxCount::TypeInfo;
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcReactivePowerOverloadWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePacketTxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcReactivePowerOverload::TypeInfo;
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::PacketTxCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -26314,60 +25386,57 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAverageRmsOverVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler
+- (void)readAttributeTxErrCountWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsOverVoltage::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = EthernetNetworkDiagnostics::Attributes::TxErrCount::TypeInfo;
+        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAverageRmsOverVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTxErrCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsOverVoltage::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::TxErrCount::TypeInfo;
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAverageRmsOverVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTxErrCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsOverVoltage::TypeInfo;
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::TxErrCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -26377,60 +25446,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAverageRmsUnderVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
+- (void)readAttributeCollisionCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltage::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = EthernetNetworkDiagnostics::Attributes::CollisionCount::TypeInfo;
+        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAverageRmsUnderVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:
-                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCollisionCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltage::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::CollisionCount::TypeInfo;
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAverageRmsUnderVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCollisionCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltage::TypeInfo;
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::CollisionCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -26440,60 +25508,58 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRmsExtremeOverVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler
+- (void)readAttributeOverrunCountWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltage::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = EthernetNetworkDiagnostics::Attributes::OverrunCount::TypeInfo;
+        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRmsExtremeOverVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOverrunCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltage::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::OverrunCount::TypeInfo;
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsExtremeOverVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOverrunCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltage::TypeInfo;
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::OverrunCount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -26503,60 +25569,60 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRmsExtremeUnderVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
+- (void)readAttributeCarrierDetectWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltage::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableBooleanAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::CarrierDetect::TypeInfo;
+            auto successFn = Callback<NullableBooleanAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeRmsExtremeUnderVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:
-                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCarrierDetectWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPNullableBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltage::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::CarrierDetect::TypeInfo;
+            auto successFn = Callback<NullableBooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsExtremeUnderVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCarrierDetectWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltage::TypeInfo;
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::CarrierDetect::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableBooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -26566,59 +25632,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRmsVoltageSagWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeTimeSinceResetWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSag::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = EthernetNetworkDiagnostics::Attributes::TimeSinceReset::TypeInfo;
+        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRmsVoltageSagWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTimeSinceResetWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSag::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::TimeSinceReset::TypeInfo;
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsVoltageSagWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTimeSinceResetWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSag::TypeInfo;
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::TimeSinceReset::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -26628,247 +25694,253 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRmsVoltageSwellWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwell::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<EthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeRmsVoltageSwellWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwell::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<EthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::
+                    OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsVoltageSwellWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwell::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = EthernetNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn
+                    = Callback<EthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeLineCurrentPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::LineCurrentPhaseB::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<EthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeLineCurrentPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::LineCurrentPhaseB::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<EthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeLineCurrentPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::LineCurrentPhaseB::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = EthernetNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn
+                    = Callback<EthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeActiveCurrentPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::ActiveCurrentPhaseB::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<EthernetNetworkDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeActiveCurrentPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::ActiveCurrentPhaseB::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<EthernetNetworkDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeActiveCurrentPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::ActiveCurrentPhaseB::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = EthernetNetworkDiagnostics::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<EthernetNetworkDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeReactiveCurrentPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::ReactiveCurrentPhaseB::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = EthernetNetworkDiagnostics::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeReactiveCurrentPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::ReactiveCurrentPhaseB::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeReactiveCurrentPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::ReactiveCurrentPhaseB::TypeInfo;
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -26878,23 +25950,23 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRmsVoltagePhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltagePhaseB::TypeInfo;
+        using TypeInfo = EthernetNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRmsVoltagePhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -26903,7 +25975,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltagePhaseB::TypeInfo;
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -26915,16 +25987,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsVoltagePhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltagePhaseB::TypeInfo;
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -26940,60 +26012,66 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRmsVoltageMinPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMinPhaseB::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+@end
+
+@implementation CHIPBridgedDeviceBasic
+
+- (chip::Controller::ClusterBase *)getCluster
+{
+    return &_cppCluster;
+}
+
+- (void)readAttributeVendorNameWithCompletionHandler:(void (^)(
+                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BridgedDeviceBasic::Attributes::VendorName::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRmsVoltageMinPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeVendorNameWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMinPhaseB::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedDeviceBasic::Attributes::VendorName::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsVoltageMinPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeVendorNameWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMinPhaseB::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::VendorName::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -27003,60 +26081,57 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRmsVoltageMaxPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeVendorIDWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMaxPhaseB::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPVendorIdAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BridgedDeviceBasic::Attributes::VendorID::TypeInfo;
+        auto successFn = Callback<VendorIdAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRmsVoltageMaxPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeVendorIDWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPVendorIdAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMaxPhaseB::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedDeviceBasic::Attributes::VendorID::TypeInfo;
+            auto successFn = Callback<VendorIdAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPVendorIdAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsVoltageMaxPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeVendorIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPVendorIdAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMaxPhaseB::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::VendorID::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<VendorIdAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -27066,59 +26141,58 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRmsCurrentPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeProductNameWithCompletionHandler:(void (^)(
+                                                          NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentPhaseB::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BridgedDeviceBasic::Attributes::ProductName::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRmsCurrentPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeProductNameWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentPhaseB::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedDeviceBasic::Attributes::ProductName::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsCurrentPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeProductNameWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentPhaseB::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::ProductName::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -27128,60 +26202,89 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRmsCurrentMinPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeNodeLabelWithCompletionHandler:(void (^)(
+                                                        NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMinPhaseB::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BridgedDeviceBasic::Attributes::NodeLabel::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRmsCurrentMinPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeNodeLabelWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeNodeLabelWithValue:(NSString * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeNodeLabelWithValue:(NSString * _Nonnull)value
+                                  params:(CHIPWriteParams * _Nullable)params
+                       completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = BridgedDeviceBasic::Attributes::NodeLabel::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = [self asCharSpan:value];
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNodeLabelWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMinPhaseB::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedDeviceBasic::Attributes::NodeLabel::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsCurrentMinPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNodeLabelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMinPhaseB::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::NodeLabel::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -27191,24 +26294,23 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRmsCurrentMaxPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeHardwareVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMaxPhaseB::TypeInfo;
+        using TypeInfo = BridgedDeviceBasic::Attributes::HardwareVersion::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRmsCurrentMaxPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeHardwareVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -27217,7 +26319,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMaxPhaseB::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::HardwareVersion::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -27229,16 +26331,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsCurrentMaxPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeHardwareVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMaxPhaseB::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::HardwareVersion::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -27254,59 +26356,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeActivePowerPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeHardwareVersionStringWithCompletionHandler:(void (^)(NSString * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerPhaseB::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BridgedDeviceBasic::Attributes::HardwareVersionString::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeActivePowerPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeHardwareVersionStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerPhaseB::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedDeviceBasic::Attributes::HardwareVersionString::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeActivePowerPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeHardwareVersionStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerPhaseB::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::HardwareVersionString::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -27316,60 +26419,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeActivePowerMinPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeSoftwareVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMinPhaseB::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BridgedDeviceBasic::Attributes::SoftwareVersion::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeActivePowerMinPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSoftwareVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMinPhaseB::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedDeviceBasic::Attributes::SoftwareVersion::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeActivePowerMinPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeSoftwareVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMinPhaseB::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::SoftwareVersion::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -27379,60 +26481,60 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeActivePowerMaxPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeSoftwareVersionStringWithCompletionHandler:(void (^)(NSString * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMaxPhaseB::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BridgedDeviceBasic::Attributes::SoftwareVersionString::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeActivePowerMaxPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSoftwareVersionStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMaxPhaseB::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedDeviceBasic::Attributes::SoftwareVersionString::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeActivePowerMaxPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeSoftwareVersionStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMaxPhaseB::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::SoftwareVersionString::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -27442,60 +26544,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeReactivePowerPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeManufacturingDateWithCompletionHandler:(void (^)(NSString * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::ReactivePowerPhaseB::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BridgedDeviceBasic::Attributes::ManufacturingDate::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeReactivePowerPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeManufacturingDateWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::ReactivePowerPhaseB::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedDeviceBasic::Attributes::ManufacturingDate::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeReactivePowerPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeManufacturingDateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::ReactivePowerPhaseB::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::ManufacturingDate::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -27505,60 +26606,57 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeApparentPowerPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributePartNumberWithCompletionHandler:(void (^)(
+                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::ApparentPowerPhaseB::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BridgedDeviceBasic::Attributes::PartNumber::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeApparentPowerPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePartNumberWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::ApparentPowerPhaseB::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedDeviceBasic::Attributes::PartNumber::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeApparentPowerPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePartNumberWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::ApparentPowerPhaseB::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::PartNumber::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -27568,59 +26666,57 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributePowerFactorPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeProductURLWithCompletionHandler:(void (^)(
+                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::PowerFactorPhaseB::TypeInfo;
-        auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BridgedDeviceBasic::Attributes::ProductURL::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributePowerFactorPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeProductURLWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8sAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::PowerFactorPhaseB::TypeInfo;
-            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            using TypeInfo = BridgedDeviceBasic::Attributes::ProductURL::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePowerFactorPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeProductURLWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::PowerFactorPhaseB::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::ProductURL::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -27630,61 +26726,58 @@ new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeAverageRmsVoltageMeasurementPeriodPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                       NSError * _Nullable error))completionHandler
+- (void)readAttributeProductLabelWithCompletionHandler:(void (^)(
+                                                           NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriodPhaseB::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BridgedDeviceBasic::Attributes::ProductLabel::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAverageRmsVoltageMeasurementPeriodPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
-                                                                                      subscriptionEstablishedHandler
-                                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                      NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeProductLabelWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriodPhaseB::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedDeviceBasic::Attributes::ProductLabel::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAverageRmsVoltageMeasurementPeriodPhaseBWithAttributeCache:
-            (CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                       endpoint:(NSNumber *)endpoint
-                                                                          queue:(dispatch_queue_t)queue
-                                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                    NSError * _Nullable error))completionHandler
++ (void)readAttributeProductLabelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriodPhaseB::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::ProductLabel::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -27694,60 +26787,58 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAverageRmsOverVoltageCounterPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                 NSError * _Nullable error))completionHandler
+- (void)readAttributeSerialNumberWithCompletionHandler:(void (^)(
+                                                           NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsOverVoltageCounterPhaseB::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BridgedDeviceBasic::Attributes::SerialNumber::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAverageRmsOverVoltageCounterPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                                    subscriptionEstablished:
-                                                        (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                              reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSerialNumberWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsOverVoltageCounterPhaseB::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedDeviceBasic::Attributes::SerialNumber::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAverageRmsOverVoltageCounterPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                 endpoint:(NSNumber *)endpoint
-                                                                    queue:(dispatch_queue_t)queue
-                                                        completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler
++ (void)readAttributeSerialNumberWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsOverVoltageCounterPhaseB::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::SerialNumber::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -27757,60 +26848,57 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAverageRmsUnderVoltageCounterPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeReachableWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounterPhaseB::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BridgedDeviceBasic::Attributes::Reachable::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAverageRmsUnderVoltageCounterPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                                     subscriptionEstablished:
-                                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                               reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                 NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeReachableWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounterPhaseB::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedDeviceBasic::Attributes::Reachable::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAverageRmsUnderVoltageCounterPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                  endpoint:(NSNumber *)endpoint
-                                                                     queue:(dispatch_queue_t)queue
-                                                         completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))completionHandler
++ (void)readAttributeReachableWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounterPhaseB::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::Reachable::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -27820,60 +26908,57 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRmsExtremeOverVoltagePeriodPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeUniqueIDWithCompletionHandler:(void (^)(
+                                                       NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriodPhaseB::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BridgedDeviceBasic::Attributes::UniqueID::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRmsExtremeOverVoltagePeriodPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                                   subscriptionEstablished:
-                                                       (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                             reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeUniqueIDWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriodPhaseB::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedDeviceBasic::Attributes::UniqueID::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsExtremeOverVoltagePeriodPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                endpoint:(NSNumber *)endpoint
-                                                                   queue:(dispatch_queue_t)queue
-                                                       completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))completionHandler
++ (void)readAttributeUniqueIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriodPhaseB::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::UniqueID::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -27883,186 +26968,250 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRmsExtremeUnderVoltagePeriodPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                 NSError * _Nullable error))completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriodPhaseB::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = BridgedDeviceBasic::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<BridgedDeviceBasicGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeRmsExtremeUnderVoltagePeriodPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                                    subscriptionEstablished:
-                                                        (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                              reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriodPhaseB::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedDeviceBasic::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<BridgedDeviceBasicGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsExtremeUnderVoltagePeriodPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                 endpoint:(NSNumber *)endpoint
-                                                                    queue:(dispatch_queue_t)queue
-                                                        completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriodPhaseB::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPBridgedDeviceBasicGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = BridgedDeviceBasic::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<BridgedDeviceBasicGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeRmsVoltageSagPeriodPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSagPeriodPhaseB::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = BridgedDeviceBasic::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<BridgedDeviceBasicAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeRmsVoltageSagPeriodPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                            params:(CHIPSubscribeParams * _Nullable)params
-                                           subscriptionEstablished:
-                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSagPeriodPhaseB::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedDeviceBasic::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<BridgedDeviceBasicAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsVoltageSagPeriodPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                        endpoint:(NSNumber *)endpoint
-                                                           queue:(dispatch_queue_t)queue
-                                               completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSagPeriodPhaseB::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPBridgedDeviceBasicAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = BridgedDeviceBasic::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<BridgedDeviceBasicAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeRmsVoltageSwellPeriodPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriodPhaseB::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPBridgedDeviceBasicAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = BridgedDeviceBasic::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<BridgedDeviceBasicAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPBridgedDeviceBasicAttributeListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = BridgedDeviceBasic::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<BridgedDeviceBasicAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPBridgedDeviceBasicAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPBridgedDeviceBasicAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = BridgedDeviceBasic::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<BridgedDeviceBasicAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BridgedDeviceBasic::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRmsVoltageSwellPeriodPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                              params:(CHIPSubscribeParams * _Nullable)params
-                                             subscriptionEstablished:
-                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriodPhaseB::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BridgedDeviceBasic::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsVoltageSwellPeriodPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                          endpoint:(NSNumber *)endpoint
-                                                             queue:(dispatch_queue_t)queue
-                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriodPhaseB::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -28072,23 +27221,23 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeLineCurrentPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::LineCurrentPhaseC::TypeInfo;
+        using TypeInfo = BridgedDeviceBasic::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeLineCurrentPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -28097,7 +27246,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::LineCurrentPhaseC::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -28109,16 +27258,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeLineCurrentPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::LineCurrentPhaseC::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -28134,60 +27283,68 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeActiveCurrentPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::ActiveCurrentPhaseC::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+@end
+
+@implementation CHIPSwitch
+
+- (chip::Controller::ClusterBase *)getCluster
+{
+    return &_cppCluster;
+}
+
+- (void)readAttributeNumberOfPositionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
+{
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Switch::Attributes::NumberOfPositions::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeActiveCurrentPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNumberOfPositionsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::ActiveCurrentPhaseC::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Switch::Attributes::NumberOfPositions::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeActiveCurrentPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNumberOfPositionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::ActiveCurrentPhaseC::TypeInfo;
+            using TypeInfo = Switch::Attributes::NumberOfPositions::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -28197,60 +27354,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeReactiveCurrentPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler
+- (void)readAttributeCurrentPositionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::ReactiveCurrentPhaseC::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Switch::Attributes::CurrentPosition::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeReactiveCurrentPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentPositionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::ReactiveCurrentPhaseC::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Switch::Attributes::CurrentPosition::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeReactiveCurrentPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCurrentPositionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::ReactiveCurrentPhaseC::TypeInfo;
+            using TypeInfo = Switch::Attributes::CurrentPosition::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -28260,59 +27416,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRmsVoltagePhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeMultiPressMaxWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltagePhaseC::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Switch::Attributes::MultiPressMax::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRmsVoltagePhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMultiPressMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltagePhaseC::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Switch::Attributes::MultiPressMax::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsVoltagePhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMultiPressMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltagePhaseC::TypeInfo;
+            using TypeInfo = Switch::Attributes::MultiPressMax::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -28322,185 +27478,189 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRmsVoltageMinPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMinPhaseC::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPSwitchGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Switch::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<SwitchGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeRmsVoltageMinPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPSwitchGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMinPhaseC::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Switch::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<SwitchGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPSwitchGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsVoltageMinPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMinPhaseC::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPSwitchGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = Switch::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<SwitchGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeRmsVoltageMaxPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMaxPhaseC::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPSwitchAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Switch::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<SwitchAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeRmsVoltageMaxPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(CHIPSubscribeParams * _Nullable)params
                                      subscriptionEstablished:
                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPSwitchAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMaxPhaseC::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Switch::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<SwitchAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPSwitchAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsVoltageMaxPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                   endpoint:(NSNumber *)endpoint
                                                      queue:(dispatch_queue_t)queue
                                          completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMaxPhaseC::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPSwitchAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = Switch::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<SwitchAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeRmsCurrentPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentPhaseC::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPSwitchAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Switch::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<SwitchAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeRmsCurrentPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPSwitchAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentPhaseC::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Switch::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<SwitchAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPSwitchAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsCurrentPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPSwitchAttributeListListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentPhaseC::TypeInfo;
+            using TypeInfo = Switch::Attributes::AttributeList::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<SwitchAttributeListListAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -28510,60 +27670,57 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRmsCurrentMinPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMinPhaseC::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Switch::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRmsCurrentMinPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMinPhaseC::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Switch::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsCurrentMinPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMinPhaseC::TypeInfo;
+            using TypeInfo = Switch::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -28573,24 +27730,23 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRmsCurrentMaxPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMaxPhaseC::TypeInfo;
+        using TypeInfo = Switch::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRmsCurrentMaxPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -28599,7 +27755,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMaxPhaseC::TypeInfo;
+            using TypeInfo = Switch::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -28611,16 +27767,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsCurrentMaxPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMaxPhaseC::TypeInfo;
+            using TypeInfo = Switch::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -28636,122 +27792,161 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeActivePowerPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+@end
+
+@implementation CHIPAdministratorCommissioning
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerPhaseC::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    return &_cppCluster;
 }
 
-- (void)subscribeAttributeActivePowerPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)openCommissioningWindowWithParams:(CHIPAdministratorCommissioningClusterOpenCommissioningWindowParams *)params
+                        completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    AdministratorCommissioning::Commands::OpenCommissioningWindow::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    if (!timedInvokeTimeoutMs.HasValue()) {
+        timedInvokeTimeoutMs.SetValue(10000);
+    }
+    request.commissioningTimeout = params.commissioningTimeout.unsignedShortValue;
+    request.PAKEVerifier = [self asByteSpan:params.pakeVerifier];
+    request.discriminator = params.discriminator.unsignedShortValue;
+    request.iterations = params.iterations.unsignedIntValue;
+    request.salt = [self asByteSpan:params.salt];
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
         ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerPhaseC::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-+ (void)readAttributeActivePowerPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)openBasicCommissioningWindowWithParams:(CHIPAdministratorCommissioningClusterOpenBasicCommissioningWindowParams *)params
+                             completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerPhaseC::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+    }
+    if (!timedInvokeTimeoutMs.HasValue()) {
+        timedInvokeTimeoutMs.SetValue(10000);
+    }
+    request.commissioningTimeout = params.commissioningTimeout.unsignedShortValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-- (void)readAttributeActivePowerMinPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)revokeCommissioningWithCompletionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMinPhaseC::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    [self revokeCommissioningWithParams:nil completionHandler:completionHandler];
+}
+- (void)revokeCommissioningWithParams:(CHIPAdministratorCommissioningClusterRevokeCommissioningParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    AdministratorCommissioning::Commands::RevokeCommissioning::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    if (!timedInvokeTimeoutMs.HasValue()) {
+        timedInvokeTimeoutMs.SetValue(10000);
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)readAttributeWindowStatusWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = AdministratorCommissioning::Attributes::WindowStatus::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeActivePowerMinPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeWindowStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMinPhaseC::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AdministratorCommissioning::Attributes::WindowStatus::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeActivePowerMinPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeWindowStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMinPhaseC::TypeInfo;
+            using TypeInfo = AdministratorCommissioning::Attributes::WindowStatus::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -28761,60 +27956,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeActivePowerMaxPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeAdminFabricIndexWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMaxPhaseC::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = AdministratorCommissioning::Attributes::AdminFabricIndex::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeActivePowerMaxPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAdminFabricIndexWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMaxPhaseC::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AdministratorCommissioning::Attributes::AdminFabricIndex::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeActivePowerMaxPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAdminFabricIndexWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMaxPhaseC::TypeInfo;
+            using TypeInfo = AdministratorCommissioning::Attributes::AdminFabricIndex::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -28824,60 +28018,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeReactivePowerPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeAdminVendorIdWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::ReactivePowerPhaseC::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = AdministratorCommissioning::Attributes::AdminVendorId::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeReactivePowerPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAdminVendorIdWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::ReactivePowerPhaseC::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AdministratorCommissioning::Attributes::AdminVendorId::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeReactivePowerPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAdminVendorIdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::ReactivePowerPhaseC::TypeInfo;
+            using TypeInfo = AdministratorCommissioning::Attributes::AdminVendorId::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -28887,186 +28080,253 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeApparentPowerPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
+{
+    new CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = AdministratorCommissioning::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<AdministratorCommissioningGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = AdministratorCommissioning::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<AdministratorCommissioningGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge::
+                    OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPAdministratorCommissioningGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = AdministratorCommissioning::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn
+                    = Callback<AdministratorCommissioningGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::ApparentPowerPhaseC::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = AdministratorCommissioning::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<AdministratorCommissioningAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeApparentPowerPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(CHIPSubscribeParams * _Nullable)params
                                      subscriptionEstablished:
                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::ApparentPowerPhaseC::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AdministratorCommissioning::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<AdministratorCommissioningAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeApparentPowerPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                   endpoint:(NSNumber *)endpoint
                                                      queue:(dispatch_queue_t)queue
                                          completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::ApparentPowerPhaseC::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPAdministratorCommissioningAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = AdministratorCommissioning::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn
+                    = Callback<AdministratorCommissioningAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributePowerFactorPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::PowerFactorPhaseC::TypeInfo;
-        auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPAdministratorCommissioningAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = AdministratorCommissioning::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<AdministratorCommissioningAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributePowerFactorPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8sAttributeCallbackSubscriptionBridge(
+    new CHIPAdministratorCommissioningAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::PowerFactorPhaseC::TypeInfo;
-            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AdministratorCommissioning::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<AdministratorCommissioningAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPAdministratorCommissioningAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePowerFactorPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::PowerFactorPhaseC::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPAdministratorCommissioningAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = AdministratorCommissioning::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<AdministratorCommissioningAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeAverageRmsVoltageMeasurementPeriodPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                       NSError * _Nullable error))completionHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriodPhaseC::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = AdministratorCommissioning::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAverageRmsVoltageMeasurementPeriodPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
-                                                                                      subscriptionEstablishedHandler
-                                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                      NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriodPhaseC::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AdministratorCommissioning::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAverageRmsVoltageMeasurementPeriodPhaseCWithAttributeCache:
-            (CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                       endpoint:(NSNumber *)endpoint
-                                                                          queue:(dispatch_queue_t)queue
-                                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                    NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriodPhaseC::TypeInfo;
+            using TypeInfo = AdministratorCommissioning::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -29076,24 +28336,23 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAverageRmsOverVoltageCounterPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                 NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsOverVoltageCounterPhaseC::TypeInfo;
+        using TypeInfo = AdministratorCommissioning::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAverageRmsOverVoltageCounterPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                                    subscriptionEstablished:
-                                                        (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                              reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -29102,7 +28361,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsOverVoltageCounterPhaseC::TypeInfo;
+            using TypeInfo = AdministratorCommissioning::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -29114,16 +28373,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAverageRmsOverVoltageCounterPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                 endpoint:(NSNumber *)endpoint
-                                                                    queue:(dispatch_queue_t)queue
-                                                        completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsOverVoltageCounterPhaseC::TypeInfo;
+            using TypeInfo = AdministratorCommissioning::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -29139,249 +28398,399 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAverageRmsUnderVoltageCounterPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                  NSError * _Nullable error))completionHandler
+@end
+
+@implementation CHIPOperationalCredentials
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounterPhaseC::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    return &_cppCluster;
 }
 
-- (void)subscribeAttributeAverageRmsUnderVoltageCounterPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                                     subscriptionEstablished:
-                                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                               reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                 NSError * _Nullable error))reportHandler
+- (void)attestationRequestWithParams:(CHIPOperationalCredentialsClusterAttestationRequestParams *)params
+                   completionHandler:(void (^)(CHIPOperationalCredentialsClusterAttestationResponseParams * _Nullable data,
+                                         NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounterPhaseC::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    OperationalCredentials::Commands::AttestationRequest::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.attestationNonce = [self asByteSpan:params.attestationNonce];
+
+    new CHIPOperationalCredentialsClusterAttestationResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPOperationalCredentialsClusterAttestationResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-+ (void)readAttributeAverageRmsUnderVoltageCounterPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                  endpoint:(NSNumber *)endpoint
-                                                                     queue:(dispatch_queue_t)queue
-                                                         completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))completionHandler
+- (void)certificateChainRequestWithParams:(CHIPOperationalCredentialsClusterCertificateChainRequestParams *)params
+                        completionHandler:
+                            (void (^)(CHIPOperationalCredentialsClusterCertificateChainResponseParams * _Nullable data,
+                                NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounterPhaseC::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    OperationalCredentials::Commands::CertificateChainRequest::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+    }
+    request.certificateType = params.certificateType.unsignedCharValue;
+
+    new CHIPOperationalCredentialsClusterCertificateChainResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn
+                = Callback<CHIPOperationalCredentialsClusterCertificateChainResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-- (void)readAttributeRmsExtremeOverVoltagePeriodPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                NSError * _Nullable error))completionHandler
+- (void)CSRRequestWithParams:(CHIPOperationalCredentialsClusterCSRRequestParams *)params
+           completionHandler:(void (^)(CHIPOperationalCredentialsClusterCSRResponseParams * _Nullable data,
+                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriodPhaseC::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    OperationalCredentials::Commands::CSRRequest::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.CSRNonce = [self asByteSpan:params.csrNonce];
+    if (params.isForUpdateNOC != nil) {
+        auto & definedValue_0 = request.isForUpdateNOC.Emplace();
+        definedValue_0 = params.isForUpdateNOC.boolValue;
+    }
+
+    new CHIPOperationalCredentialsClusterCSRResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPOperationalCredentialsClusterCSRResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-- (void)subscribeAttributeRmsExtremeOverVoltagePeriodPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                                   subscriptionEstablished:
-                                                       (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                             reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))reportHandler
+- (void)addNOCWithParams:(CHIPOperationalCredentialsClusterAddNOCParams *)params
+       completionHandler:(void (^)(CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable data,
+                             NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    OperationalCredentials::Commands::AddNOC::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.NOCValue = [self asByteSpan:params.nocValue];
+    if (params.icacValue != nil) {
+        auto & definedValue_0 = request.ICACValue.Emplace();
+        definedValue_0 = [self asByteSpan:params.icacValue];
+    }
+    request.IPKValue = [self asByteSpan:params.ipkValue];
+    request.caseAdminSubject = params.caseAdminSubject.unsignedLongLongValue;
+    request.adminVendorId
+        = static_cast<std::remove_reference_t<decltype(request.adminVendorId)>>(params.adminVendorId.unsignedShortValue);
+
+    new CHIPOperationalCredentialsClusterNOCResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPOperationalCredentialsClusterNOCResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)updateNOCWithParams:(CHIPOperationalCredentialsClusterUpdateNOCParams *)params
+          completionHandler:(void (^)(CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable data,
+                                NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    OperationalCredentials::Commands::UpdateNOC::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.NOCValue = [self asByteSpan:params.nocValue];
+    if (params.icacValue != nil) {
+        auto & definedValue_0 = request.ICACValue.Emplace();
+        definedValue_0 = [self asByteSpan:params.icacValue];
+    }
+
+    new CHIPOperationalCredentialsClusterNOCResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPOperationalCredentialsClusterNOCResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)updateFabricLabelWithParams:(CHIPOperationalCredentialsClusterUpdateFabricLabelParams *)params
+                  completionHandler:(void (^)(CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable data,
+                                        NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    OperationalCredentials::Commands::UpdateFabricLabel::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.label = [self asCharSpan:params.label];
+
+    new CHIPOperationalCredentialsClusterNOCResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPOperationalCredentialsClusterNOCResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)removeFabricWithParams:(CHIPOperationalCredentialsClusterRemoveFabricParams *)params
+             completionHandler:(void (^)(CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable data,
+                                   NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    OperationalCredentials::Commands::RemoveFabric::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.fabricIndex = params.fabricIndex.unsignedCharValue;
+
+    new CHIPOperationalCredentialsClusterNOCResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPOperationalCredentialsClusterNOCResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)addTrustedRootCertificateWithParams:(CHIPOperationalCredentialsClusterAddTrustedRootCertificateParams *)params
+                          completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    OperationalCredentials::Commands::AddTrustedRootCertificate::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.rootCertificate = [self asByteSpan:params.rootCertificate];
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)readAttributeNOCsWithParams:(CHIPReadParams * _Nullable)params
+                  completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPOperationalCredentialsNOCsListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = OperationalCredentials::Attributes::NOCs::TypeInfo;
+            auto successFn = Callback<OperationalCredentialsNOCsListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue]);
+        });
+}
+
+- (void)subscribeAttributeNOCsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                       params:(CHIPSubscribeParams * _Nullable)params
+                      subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPOperationalCredentialsNOCsListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriodPhaseC::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OperationalCredentials::Attributes::NOCs::TypeInfo;
+            auto successFn = Callback<OperationalCredentialsNOCsListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPOperationalCredentialsNOCsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsExtremeOverVoltagePeriodPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                endpoint:(NSNumber *)endpoint
-                                                                   queue:(dispatch_queue_t)queue
-                                                       completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))completionHandler
++ (void)readAttributeNOCsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                   endpoint:(NSNumber *)endpoint
+                                      queue:(dispatch_queue_t)queue
+                          completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriodPhaseC::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPOperationalCredentialsNOCsListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = OperationalCredentials::Attributes::NOCs::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<OperationalCredentialsNOCsListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeRmsExtremeUnderVoltagePeriodPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                 NSError * _Nullable error))completionHandler
+- (void)readAttributeFabricsWithParams:(CHIPReadParams * _Nullable)params
+                     completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriodPhaseC::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPOperationalCredentialsFabricsListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = OperationalCredentials::Attributes::Fabrics::TypeInfo;
+            auto successFn = Callback<OperationalCredentialsFabricsListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue]);
+        });
 }
 
-- (void)subscribeAttributeRmsExtremeUnderVoltagePeriodPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                                    subscriptionEstablished:
-                                                        (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                              reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFabricsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPOperationalCredentialsFabricsListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriodPhaseC::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OperationalCredentials::Attributes::Fabrics::TypeInfo;
+            auto successFn = Callback<OperationalCredentialsFabricsListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPOperationalCredentialsFabricsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsExtremeUnderVoltagePeriodPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                 endpoint:(NSNumber *)endpoint
-                                                                    queue:(dispatch_queue_t)queue
-                                                        completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler
++ (void)readAttributeFabricsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriodPhaseC::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPOperationalCredentialsFabricsListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = OperationalCredentials::Attributes::Fabrics::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<OperationalCredentialsFabricsListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeRmsVoltageSagPeriodPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
+- (void)readAttributeSupportedFabricsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSagPeriodPhaseC::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = OperationalCredentials::Attributes::SupportedFabrics::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRmsVoltageSagPeriodPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                            params:(CHIPSubscribeParams * _Nullable)params
-                                           subscriptionEstablished:
-                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSupportedFabricsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSagPeriodPhaseC::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OperationalCredentials::Attributes::SupportedFabrics::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsVoltageSagPeriodPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                        endpoint:(NSNumber *)endpoint
-                                                           queue:(dispatch_queue_t)queue
-                                               completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
++ (void)readAttributeSupportedFabricsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSagPeriodPhaseC::TypeInfo;
+            using TypeInfo = OperationalCredentials::Attributes::SupportedFabrics::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -29391,60 +28800,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRmsVoltageSwellPeriodPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler
+- (void)readAttributeCommissionedFabricsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriodPhaseC::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = OperationalCredentials::Attributes::CommissionedFabrics::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRmsVoltageSwellPeriodPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                              params:(CHIPSubscribeParams * _Nullable)params
-                                             subscriptionEstablished:
-                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCommissionedFabricsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriodPhaseC::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OperationalCredentials::Attributes::CommissionedFabrics::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRmsVoltageSwellPeriodPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                          endpoint:(NSNumber *)endpoint
-                                                             queue:(dispatch_queue_t)queue
-                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
++ (void)readAttributeCommissionedFabricsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriodPhaseC::TypeInfo;
+            using TypeInfo = OperationalCredentials::Attributes::CommissionedFabrics::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -29454,39 +28863,167 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeTrustedRootCertificatesWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ElectricalMeasurement::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<ElectricalMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OperationalCredentials::Attributes::TrustedRootCertificates::TypeInfo;
+            auto successFn = Callback<OperationalCredentialsTrustedRootCertificatesListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTrustedRootCertificatesWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:
+                                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<ElectricalMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OperationalCredentials::Attributes::TrustedRootCertificates::TypeInfo;
+            auto successFn = Callback<OperationalCredentialsTrustedRootCertificatesListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeTrustedRootCertificatesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = OperationalCredentials::Attributes::TrustedRootCertificates::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn
+                    = Callback<OperationalCredentialsTrustedRootCertificatesListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
+- (void)readAttributeCurrentFabricIndexWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler
+{
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = OperationalCredentials::Attributes::CurrentFabricIndex::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeCurrentFabricIndexWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = OperationalCredentials::Attributes::CurrentFabricIndex::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeCurrentFabricIndexWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = OperationalCredentials::Attributes::CurrentFabricIndex::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
+{
+    new CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = OperationalCredentials::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<OperationalCredentialsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = OperationalCredentials::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<OperationalCredentialsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
                 nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -29499,17 +29036,17 @@ + (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheC
                                           completionHandler:
                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = ElectricalMeasurement::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = OperationalCredentials::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ElectricalMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<OperationalCredentialsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -29522,10 +29059,10 @@ new CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ElectricalMeasurement::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<ElectricalMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OperationalCredentials::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<OperationalCredentialsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -29539,20 +29076,20 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<ElectricalMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OperationalCredentials::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<OperationalCredentialsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -29564,17 +29101,17 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = ElectricalMeasurement::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = OperationalCredentials::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ElectricalMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<OperationalCredentialsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -29587,10 +29124,10 @@ new CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPElectricalMeasurementAttributeListListAttributeCallbackBridge(
+    new CHIPOperationalCredentialsAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ElectricalMeasurement::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<ElectricalMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OperationalCredentials::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<OperationalCredentialsAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -29602,19 +29139,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPElectricalMeasurementAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPOperationalCredentialsAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<ElectricalMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OperationalCredentials::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<OperationalCredentialsAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPElectricalMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPOperationalCredentialsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -29627,17 +29164,17 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPElectricalMeasurementAttributeListListAttributeCallbackBridge(
+    new CHIPOperationalCredentialsAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = ElectricalMeasurement::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = OperationalCredentials::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ElectricalMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<OperationalCredentialsAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -29651,7 +29188,7 @@ - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = OperationalCredentials::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -29671,7 +29208,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = OperationalCredentials::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -29691,7 +29228,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = OperationalCredentials::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -29711,7 +29248,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ElectricalMeasurement::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = OperationalCredentials::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -29732,7 +29269,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ElectricalMeasurement::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = OperationalCredentials::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -29753,7 +29290,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ElectricalMeasurement::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = OperationalCredentials::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -29771,28 +29308,113 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPEthernetNetworkDiagnostics
+@implementation CHIPGroupKeyManagement
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)resetCountsWithCompletionHandler:(StatusCompletion)completionHandler
+- (void)keySetWriteWithParams:(CHIPGroupKeyManagementClusterKeySetWriteParams *)params
+            completionHandler:(StatusCompletion)completionHandler
 {
-    [self resetCountsWithParams:nil completionHandler:completionHandler];
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    GroupKeyManagement::Commands::KeySetWrite::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.groupKeySet.groupKeySetID = params.groupKeySet.groupKeySetID.unsignedShortValue;
+    request.groupKeySet.groupKeySecurityPolicy
+        = static_cast<std::remove_reference_t<decltype(request.groupKeySet.groupKeySecurityPolicy)>>(
+            params.groupKeySet.groupKeySecurityPolicy.unsignedCharValue);
+    if (params.groupKeySet.epochKey0 == nil) {
+        request.groupKeySet.epochKey0.SetNull();
+    } else {
+        auto & nonNullValue_1 = request.groupKeySet.epochKey0.SetNonNull();
+        nonNullValue_1 = [self asByteSpan:params.groupKeySet.epochKey0];
+    }
+    if (params.groupKeySet.epochStartTime0 == nil) {
+        request.groupKeySet.epochStartTime0.SetNull();
+    } else {
+        auto & nonNullValue_1 = request.groupKeySet.epochStartTime0.SetNonNull();
+        nonNullValue_1 = params.groupKeySet.epochStartTime0.unsignedLongLongValue;
+    }
+    if (params.groupKeySet.epochKey1 == nil) {
+        request.groupKeySet.epochKey1.SetNull();
+    } else {
+        auto & nonNullValue_1 = request.groupKeySet.epochKey1.SetNonNull();
+        nonNullValue_1 = [self asByteSpan:params.groupKeySet.epochKey1];
+    }
+    if (params.groupKeySet.epochStartTime1 == nil) {
+        request.groupKeySet.epochStartTime1.SetNull();
+    } else {
+        auto & nonNullValue_1 = request.groupKeySet.epochStartTime1.SetNonNull();
+        nonNullValue_1 = params.groupKeySet.epochStartTime1.unsignedLongLongValue;
+    }
+    if (params.groupKeySet.epochKey2 == nil) {
+        request.groupKeySet.epochKey2.SetNull();
+    } else {
+        auto & nonNullValue_1 = request.groupKeySet.epochKey2.SetNonNull();
+        nonNullValue_1 = [self asByteSpan:params.groupKeySet.epochKey2];
+    }
+    if (params.groupKeySet.epochStartTime2 == nil) {
+        request.groupKeySet.epochStartTime2.SetNull();
+    } else {
+        auto & nonNullValue_1 = request.groupKeySet.epochStartTime2.SetNonNull();
+        nonNullValue_1 = params.groupKeySet.epochStartTime2.unsignedLongLongValue;
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
-- (void)resetCountsWithParams:(CHIPEthernetNetworkDiagnosticsClusterResetCountsParams * _Nullable)params
-            completionHandler:(StatusCompletion)completionHandler
+
+- (void)keySetReadWithParams:(CHIPGroupKeyManagementClusterKeySetReadParams *)params
+           completionHandler:(void (^)(CHIPGroupKeyManagementClusterKeySetReadResponseParams * _Nullable data,
+                                 NSError * _Nullable error))completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    EthernetNetworkDiagnostics::Commands::ResetCounts::Type request;
+    GroupKeyManagement::Commands::KeySetRead::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.groupKeySetID = params.groupKeySetID.unsignedShortValue;
+
+    new CHIPGroupKeyManagementClusterKeySetReadResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPGroupKeyManagementClusterKeySetReadResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)keySetRemoveWithParams:(CHIPGroupKeyManagementClusterKeySetRemoveParams *)params
+             completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    GroupKeyManagement::Commands::KeySetRemove::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
+    request.groupKeySetID = params.groupKeySetID.unsignedShortValue;
 
     new CHIPCommandSuccessCallbackBridge(
         self.callbackQueue,
@@ -29807,62 +29429,160 @@ new CHIPCommandSuccessCallbackBridge(
         });
 }
 
-- (void)readAttributePHYRateWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)keySetReadAllIndicesWithParams:(CHIPGroupKeyManagementClusterKeySetReadAllIndicesParams *)params
+                     completionHandler:(void (^)(CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data,
+                                           NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackBridge(
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    GroupKeyManagement::Commands::KeySetReadAllIndices::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    {
+        using ListType_0 = std::remove_reference_t<decltype(request.groupKeySetIDs)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        if (params.groupKeySetIDs.count != 0) {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.groupKeySetIDs.count);
+            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return;
+            }
+            listFreer.add(listHolder_0);
+            for (size_t i_0 = 0; i_0 < params.groupKeySetIDs.count; ++i_0) {
+                if (![params.groupKeySetIDs[i_0] isKindOfClass:[NSNumber class]]) {
+                    // Wrong kind of value.
+                    return;
+                }
+                auto element_0 = (NSNumber *) params.groupKeySetIDs[i_0];
+                listHolder_0->mList[i_0] = element_0.unsignedShortValue;
+            }
+            request.groupKeySetIDs = ListType_0(listHolder_0->mList, params.groupKeySetIDs.count);
+        } else {
+            request.groupKeySetIDs = ListType_0();
+        }
+    }
+
+    new CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::PHYRate::TypeInfo;
             auto successFn
-                = Callback<NullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallback>::FromCancelable(success);
+                = Callback<CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributePHYRateWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)readAttributeGroupKeyMapWithParams:(CHIPReadParams * _Nullable)params
+                         completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackSubscriptionBridge(
+    new CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = GroupKeyManagement::Attributes::GroupKeyMap::TypeInfo;
+            auto successFn = Callback<GroupKeyManagementGroupKeyMapListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue]);
+        });
+}
+
+- (void)writeAttributeGroupKeyMapWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeGroupKeyMapWithValue:(NSArray * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeGroupKeyMapWithValue:(NSArray * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = GroupKeyManagement::Attributes::GroupKeyMap::TypeInfo;
+            TypeInfo::Type cppValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[CHIPGroupKeyManagementClusterGroupKeyMapStruct class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (CHIPGroupKeyManagementClusterGroupKeyMapStruct *) value[i_0];
+                        listHolder_0->mList[i_0].groupId = element_0.groupId.unsignedShortValue;
+                        listHolder_0->mList[i_0].groupKeySetID = element_0.groupKeySetID.unsignedShortValue;
+                        listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeGroupKeyMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::PHYRate::TypeInfo;
-            auto successFn
-                = Callback<NullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GroupKeyManagement::Attributes::GroupKeyMap::TypeInfo;
+            auto successFn = Callback<GroupKeyManagementGroupKeyMapListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackSubscriptionBridge::
-                    OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePHYRateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGroupKeyMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackBridge(
+    new CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = EthernetNetworkDiagnostics::Attributes::PHYRate::TypeInfo;
+                using TypeInfo = GroupKeyManagement::Attributes::GroupKeyMap::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<NullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<GroupKeyManagementGroupKeyMapListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -29872,428 +29592,122 @@ new CHIPNullableEthernetNetworkDiagnosticsClusterPHYRateTypeAttributeCallbackBri
         });
 }
 
-- (void)readAttributeFullDuplexWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeGroupTableWithParams:(CHIPReadParams * _Nullable)params
+                        completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableBooleanAttributeCallbackBridge(
+    new CHIPGroupKeyManagementGroupTableListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::FullDuplex::TypeInfo;
-            auto successFn = Callback<NullableBooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GroupKeyManagement::Attributes::GroupTable::TypeInfo;
+            auto successFn = Callback<GroupKeyManagementGroupTableListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue]);
         });
 }
 
-- (void)subscribeAttributeFullDuplexWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeGroupTableWithMinInterval:(NSNumber * _Nonnull)minInterval
                                         maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(CHIPSubscribeParams * _Nullable)params
                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPGroupKeyManagementGroupTableListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::FullDuplex::TypeInfo;
-            auto successFn = Callback<NullableBooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GroupKeyManagement::Attributes::GroupTable::TypeInfo;
+            auto successFn = Callback<GroupKeyManagementGroupTableListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPGroupKeyManagementGroupTableListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFullDuplexWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeGroupTableWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                          endpoint:(NSNumber *)endpoint
                                             queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::FullDuplex::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableBooleanAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPGroupKeyManagementGroupTableListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = GroupKeyManagement::Attributes::GroupTable::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<GroupKeyManagementGroupTableListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributePacketRxCountWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeMaxGroupsPerFabricWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = EthernetNetworkDiagnostics::Attributes::PacketRxCount::TypeInfo;
-        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = GroupKeyManagement::Attributes::MaxGroupsPerFabric::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributePacketRxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt64uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::PacketRxCount::TypeInfo;
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributePacketRxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::PacketRxCount::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributePacketTxCountWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = EthernetNetworkDiagnostics::Attributes::PacketTxCount::TypeInfo;
-        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributePacketTxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt64uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::PacketTxCount::TypeInfo;
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributePacketTxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::PacketTxCount::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeTxErrCountWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = EthernetNetworkDiagnostics::Attributes::TxErrCount::TypeInfo;
-        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeTxErrCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt64uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::TxErrCount::TypeInfo;
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeTxErrCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::TxErrCount::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeCollisionCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
-{
-    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = EthernetNetworkDiagnostics::Attributes::CollisionCount::TypeInfo;
-        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeCollisionCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt64uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::CollisionCount::TypeInfo;
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeCollisionCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::CollisionCount::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeOverrunCountWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = EthernetNetworkDiagnostics::Attributes::OverrunCount::TypeInfo;
-        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeOverrunCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt64uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::OverrunCount::TypeInfo;
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeOverrunCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::OverrunCount::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeCarrierDetectWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableBooleanAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::CarrierDetect::TypeInfo;
-            auto successFn = Callback<NullableBooleanAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeCarrierDetectWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMaxGroupsPerFabricWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::CarrierDetect::TypeInfo;
-            auto successFn = Callback<NullableBooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GroupKeyManagement::Attributes::MaxGroupsPerFabric::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCarrierDetectWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMaxGroupsPerFabricWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::CarrierDetect::TypeInfo;
+            using TypeInfo = GroupKeyManagement::Attributes::MaxGroupsPerFabric::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableBooleanAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -30303,59 +29717,60 @@ new CHIPNullableBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cance
     });
 }
 
-- (void)readAttributeTimeSinceResetWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeMaxGroupKeysPerFabricWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = EthernetNetworkDiagnostics::Attributes::TimeSinceReset::TypeInfo;
-        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = GroupKeyManagement::Attributes::MaxGroupKeysPerFabric::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeTimeSinceResetWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMaxGroupKeysPerFabricWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt64uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::TimeSinceReset::TypeInfo;
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GroupKeyManagement::Attributes::MaxGroupKeysPerFabric::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTimeSinceResetWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMaxGroupKeysPerFabricWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::TimeSinceReset::TypeInfo;
+            using TypeInfo = GroupKeyManagement::Attributes::MaxGroupKeysPerFabric::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -30368,10 +29783,10 @@ new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<EthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GroupKeyManagement::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<GroupKeyManagementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -30385,21 +29800,20 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
                                                 reportHandler:
                                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<EthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GroupKeyManagement::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<GroupKeyManagementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::
-                    OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -30411,18 +29825,17 @@ + (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheC
                                           completionHandler:
                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = EthernetNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = GroupKeyManagement::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<EthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<GroupKeyManagementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -30435,10 +29848,10 @@ new CHIPEthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridg
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<EthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GroupKeyManagement::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<GroupKeyManagementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -30452,20 +29865,20 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<EthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GroupKeyManagement::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<GroupKeyManagementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -30477,18 +29890,17 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = EthernetNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = GroupKeyManagement::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<EthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<GroupKeyManagementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -30501,10 +29913,10 @@ new CHIPEthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackBridge(
+    new CHIPGroupKeyManagementAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<EthernetNetworkDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GroupKeyManagement::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<GroupKeyManagementAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -30516,19 +29928,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPGroupKeyManagementAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<EthernetNetworkDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = GroupKeyManagement::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<GroupKeyManagementAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPGroupKeyManagementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -30541,17 +29953,17 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPEthernetNetworkDiagnosticsAttributeListListAttributeCallbackBridge(
+    new CHIPGroupKeyManagementAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = EthernetNetworkDiagnostics::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = GroupKeyManagement::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<EthernetNetworkDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<GroupKeyManagementAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -30565,7 +29977,7 @@ - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = EthernetNetworkDiagnostics::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = GroupKeyManagement::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -30585,7 +29997,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = GroupKeyManagement::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -30605,7 +30017,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = GroupKeyManagement::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -30625,7 +30037,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = EthernetNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = GroupKeyManagement::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -30646,7 +30058,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = GroupKeyManagement::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -30667,7 +30079,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = GroupKeyManagement::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -30685,97 +30097,130 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPFanControl
+@implementation CHIPFixedLabel
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)readAttributeFanModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeLabelListWithCompletionHandler:(void (^)(
+                                                        NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPFanControlClusterFanModeTypeAttributeCallbackBridge(
+    new CHIPFixedLabelLabelListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = FanControl::Attributes::FanMode::TypeInfo;
-            auto successFn = Callback<FanControlClusterFanModeTypeAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FixedLabel::Attributes::LabelList::TypeInfo;
+            auto successFn = Callback<FixedLabelLabelListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeFanModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeFanModeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeFanModeWithValue:(NSNumber * _Nonnull)value
-                                params:(CHIPWriteParams * _Nullable)params
-                     completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeLabelListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
+    new CHIPFixedLabelLabelListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = FanControl::Attributes::FanMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = FixedLabel::Attributes::LabelList::TypeInfo;
+            auto successFn = Callback<FixedLabelLabelListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPFixedLabelLabelListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeLabelListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPFixedLabelLabelListListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = FixedLabel::Attributes::LabelList::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<FixedLabelLabelListListAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
+{
+    new CHIPFixedLabelGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = FixedLabel::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<FixedLabelGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeFanModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPFanControlClusterFanModeTypeAttributeCallbackSubscriptionBridge(
+    new CHIPFixedLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = FanControl::Attributes::FanMode::TypeInfo;
-            auto successFn = Callback<FanControlClusterFanModeTypeAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FixedLabel::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<FixedLabelGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFanControlClusterFanModeTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPFixedLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFanModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPFanControlClusterFanModeTypeAttributeCallbackBridge(
+    new CHIPFixedLabelGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = FanControl::Attributes::FanMode::TypeInfo;
+                using TypeInfo = FixedLabel::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<FanControlClusterFanModeTypeAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<FixedLabelGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -30785,93 +30230,62 @@ new CHIPFanControlClusterFanModeTypeAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeFanModeSequenceWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPFanControlClusterFanModeSequenceTypeAttributeCallbackBridge(
+    new CHIPFixedLabelAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = FanControl::Attributes::FanModeSequence::TypeInfo;
-            auto successFn = Callback<FanControlClusterFanModeSequenceTypeAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FixedLabel::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<FixedLabelAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeFanModeSequenceWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeFanModeSequenceWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeFanModeSequenceWithValue:(NSNumber * _Nonnull)value
-                                        params:(CHIPWriteParams * _Nullable)params
-                             completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = FanControl::Attributes::FanModeSequence::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeFanModeSequenceWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPFanControlClusterFanModeSequenceTypeAttributeCallbackSubscriptionBridge(
+    new CHIPFixedLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = FanControl::Attributes::FanModeSequence::TypeInfo;
-            auto successFn = Callback<FanControlClusterFanModeSequenceTypeAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FixedLabel::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<FixedLabelAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFanControlClusterFanModeSequenceTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPFixedLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFanModeSequenceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPFanControlClusterFanModeSequenceTypeAttributeCallbackBridge(
+    new CHIPFixedLabelAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = FanControl::Attributes::FanModeSequence::TypeInfo;
+                using TypeInfo = FixedLabel::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<FanControlClusterFanModeSequenceTypeAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<FixedLabelAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -30881,159 +30295,120 @@ new CHIPFanControlClusterFanModeSequenceTypeAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributePercentSettingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
+    new CHIPFixedLabelAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = FanControl::Attributes::PercentSetting::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FixedLabel::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<FixedLabelAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePercentSettingWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributePercentSettingWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributePercentSettingWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = FanControl::Attributes::PercentSetting::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributePercentSettingWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPFixedLabelAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = FanControl::Attributes::PercentSetting::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FixedLabel::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<FixedLabelAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPFixedLabelAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePercentSettingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = FanControl::Attributes::PercentSetting::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPFixedLabelAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = FixedLabel::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<FixedLabelAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributePercentCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = FanControl::Attributes::PercentCurrent::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = FixedLabel::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributePercentCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = FanControl::Attributes::PercentCurrent::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FixedLabel::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePercentCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = FanControl::Attributes::PercentCurrent::TypeInfo;
+            using TypeInfo = FixedLabel::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -31043,57 +30418,59 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeSpeedMaxWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = FanControl::Attributes::SpeedMax::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = FixedLabel::Attributes::ClusterRevision::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeSpeedMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = FanControl::Attributes::SpeedMax::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FixedLabel::Attributes::ClusterRevision::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSpeedMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = FanControl::Attributes::SpeedMax::TypeInfo;
+            using TypeInfo = FixedLabel::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -31103,25 +30480,34 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeSpeedSettingWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+@end
+
+@implementation CHIPUserLabel
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
+    return &_cppCluster;
+}
+
+- (void)readAttributeLabelListWithCompletionHandler:(void (^)(
+                                                        NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPUserLabelLabelListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = FanControl::Attributes::SpeedSetting::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = UserLabel::Attributes::LabelList::TypeInfo;
+            auto successFn = Callback<UserLabelLabelListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeSpeedSettingWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeLabelListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeSpeedSettingWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+    [self writeAttributeLabelListWithValue:(NSArray * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeSpeedSettingWithValue:(NSNumber * _Nullable)value
-                                     params:(CHIPWriteParams * _Nullable)params
-                          completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeLabelListWithValue:(NSArray * _Nonnull)value
+                                  params:(CHIPWriteParams * _Nullable)params
+                       completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -31137,13 +30523,30 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = FanControl::Attributes::SpeedSetting::TypeInfo;
+            using TypeInfo = UserLabel::Attributes::LabelList::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[CHIPUserLabelClusterLabelStruct class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (CHIPUserLabelClusterLabelStruct *) value[i_0];
+                        listHolder_0->mList[i_0].label = [self asCharSpan:element_0.label];
+                        listHolder_0->mList[i_0].value = [self asCharSpan:element_0.value];
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -31152,47 +30555,46 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeSpeedSettingWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeLabelListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPUserLabelLabelListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = FanControl::Attributes::SpeedSetting::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = UserLabel::Attributes::LabelList::TypeInfo;
+            auto successFn = Callback<UserLabelLabelListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPUserLabelLabelListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSpeedSettingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeLabelListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPUserLabelLabelListListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = FanControl::Attributes::SpeedSetting::TypeInfo;
+            using TypeInfo = UserLabel::Attributes::LabelList::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<UserLabelLabelListListAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -31202,212 +30604,250 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeSpeedCurrentWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = FanControl::Attributes::SpeedCurrent::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPUserLabelGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = UserLabel::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<UserLabelGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeSpeedCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPUserLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = FanControl::Attributes::SpeedCurrent::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = UserLabel::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<UserLabelGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPUserLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSpeedCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = FanControl::Attributes::SpeedCurrent::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeRockSupportWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+    new CHIPUserLabelGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = UserLabel::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<UserLabelGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = FanControl::Attributes::RockSupport::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPUserLabelAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = UserLabel::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<UserLabelAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeRockSupportWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPUserLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = FanControl::Attributes::RockSupport::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = UserLabel::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<UserLabelAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPUserLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRockSupportWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = FanControl::Attributes::RockSupport::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPUserLabelAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = UserLabel::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<UserLabelAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeRockSettingWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = FanControl::Attributes::RockSetting::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPUserLabelAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = UserLabel::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<UserLabelAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)writeAttributeRockSettingWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeRockSettingWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeRockSettingWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
+    new CHIPUserLabelAttributeListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = FanControl::Attributes::RockSetting::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = UserLabel::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<UserLabelAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPUserLabelAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPUserLabelAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = UserLabel::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<UserLabelAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
         });
 }
 
-- (void)subscribeAttributeRockSettingWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = UserLabel::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = FanControl::Attributes::RockSetting::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = UserLabel::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRockSettingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = FanControl::Attributes::RockSetting::TypeInfo;
+            using TypeInfo = UserLabel::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -31417,58 +30857,59 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeWindSupportWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = FanControl::Attributes::WindSupport::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = UserLabel::Attributes::ClusterRevision::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeWindSupportWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = FanControl::Attributes::WindSupport::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = UserLabel::Attributes::ClusterRevision::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeWindSupportWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = FanControl::Attributes::WindSupport::TypeInfo;
+            using TypeInfo = UserLabel::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -31478,90 +30919,66 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeWindSettingWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = FanControl::Attributes::WindSetting::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
+@end
 
-- (void)writeAttributeWindSettingWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+@implementation CHIPBooleanState
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    [self writeAttributeWindSettingWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    return &_cppCluster;
 }
-- (void)writeAttributeWindSettingWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
 
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = FanControl::Attributes::WindSetting::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+- (void)readAttributeStateValueWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BooleanState::Attributes::StateValue::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeWindSettingWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeStateValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = FanControl::Attributes::WindSetting::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BooleanState::Attributes::StateValue::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeWindSettingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeStateValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = FanControl::Attributes::WindSetting::TypeInfo;
+            using TypeInfo = BooleanState::Attributes::StateValue::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -31574,10 +30991,10 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPFanControlGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPBooleanStateGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = FanControl::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<FanControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BooleanState::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<BooleanStateGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -31591,19 +31008,19 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
                                                 reportHandler:
                                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPFanControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPBooleanStateGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = FanControl::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<FanControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BooleanState::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<BooleanStateGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFanControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanStateGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -31616,17 +31033,17 @@ + (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheC
                                           completionHandler:
                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPFanControlGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPBooleanStateGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = FanControl::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = BooleanState::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<FanControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<BooleanStateGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -31639,10 +31056,10 @@ new CHIPFanControlGeneratedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPFanControlAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPBooleanStateAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = FanControl::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<FanControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BooleanState::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<BooleanStateAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -31656,19 +31073,19 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPFanControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPBooleanStateAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = FanControl::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<FanControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BooleanState::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<BooleanStateAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFanControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanStateAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -31681,17 +31098,17 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPFanControlAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPBooleanStateAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = FanControl::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = BooleanState::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<FanControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<BooleanStateAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -31704,10 +31121,10 @@ new CHIPFanControlAcceptedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPFanControlAttributeListListAttributeCallbackBridge(
+    new CHIPBooleanStateAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = FanControl::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<FanControlAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BooleanState::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<BooleanStateAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -31719,19 +31136,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPFanControlAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPBooleanStateAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = FanControl::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<FanControlAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BooleanState::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<BooleanStateAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFanControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanStateAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -31744,17 +31161,17 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPFanControlAttributeListListAttributeCallbackBridge(
+    new CHIPBooleanStateAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = FanControl::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = BooleanState::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<FanControlAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<BooleanStateAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -31768,7 +31185,7 @@ - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = FanControl::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = BooleanState::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -31788,7 +31205,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = FanControl::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = BooleanState::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -31808,7 +31225,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = FanControl::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = BooleanState::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -31828,7 +31245,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = FanControl::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = BooleanState::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -31849,7 +31266,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = FanControl::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = BooleanState::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -31870,7 +31287,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = FanControl::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = BooleanState::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -31888,65 +31305,91 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPFixedLabel
+@implementation CHIPModeSelect
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)readAttributeLabelListWithCompletionHandler:(void (^)(
-                                                        NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)changeToModeWithParams:(CHIPModeSelectClusterChangeToModeParams *)params
+             completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPFixedLabelLabelListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = FixedLabel::Attributes::LabelList::TypeInfo;
-            auto successFn = Callback<FixedLabelLabelListListAttributeCallback>::FromCancelable(success);
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ModeSelect::Commands::ChangeToMode::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.newMode = params.newMode.unsignedCharValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeLabelListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)readAttributeDescriptionWithCompletionHandler:(void (^)(
+                                                          NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPFixedLabelLabelListListAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ModeSelect::Attributes::Description::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeDescriptionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = FixedLabel::Attributes::LabelList::TypeInfo;
-            auto successFn = Callback<FixedLabelLabelListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ModeSelect::Attributes::Description::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFixedLabelLabelListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeLabelListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeDescriptionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPFixedLabelLabelListListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = FixedLabel::Attributes::LabelList::TypeInfo;
+            using TypeInfo = ModeSelect::Attributes::Description::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<FixedLabelLabelListListAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -31956,13 +31399,397 @@ new CHIPFixedLabelLabelListListAttributeCallbackBridge(queue, completionHandler,
     });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeStandardNamespaceWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPFixedLabelGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPNullableInt16uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = FixedLabel::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<FixedLabelGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ModeSelect::Attributes::StandardNamespace::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeStandardNamespaceWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ModeSelect::Attributes::StandardNamespace::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeStandardNamespaceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ModeSelect::Attributes::StandardNamespace::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeSupportedModesWithCompletionHandler:(void (^)(
+                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPModeSelectSupportedModesListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ModeSelect::Attributes::SupportedModes::TypeInfo;
+            auto successFn = Callback<ModeSelectSupportedModesListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeSupportedModesWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPModeSelectSupportedModesListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ModeSelect::Attributes::SupportedModes::TypeInfo;
+            auto successFn = Callback<ModeSelectSupportedModesListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPModeSelectSupportedModesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeSupportedModesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPModeSelectSupportedModesListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = ModeSelect::Attributes::SupportedModes::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<ModeSelectSupportedModesListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
+- (void)readAttributeCurrentModeWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ModeSelect::Attributes::CurrentMode::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeCurrentModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ModeSelect::Attributes::CurrentMode::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeCurrentModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ModeSelect::Attributes::CurrentMode::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeStartUpModeWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ModeSelect::Attributes::StartUpMode::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeStartUpModeWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ModeSelect::Attributes::StartUpMode::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeStartUpModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ModeSelect::Attributes::StartUpMode::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeStartUpModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ModeSelect::Attributes::StartUpMode::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeOnModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ModeSelect::Attributes::OnMode::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeOnModeWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ModeSelect::Attributes::OnMode::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeOnModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ModeSelect::Attributes::OnMode::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeOnModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ModeSelect::Attributes::OnMode::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
+{
+    new CHIPModeSelectGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ModeSelect::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<ModeSelectGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -31976,19 +31803,19 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
                                                 reportHandler:
                                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPFixedLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPModeSelectGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = FixedLabel::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<FixedLabelGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ModeSelect::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<ModeSelectGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFixedLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPModeSelectGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -32001,17 +31828,17 @@ + (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheC
                                           completionHandler:
                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPFixedLabelGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPModeSelectGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = FixedLabel::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = ModeSelect::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<FixedLabelGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<ModeSelectGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -32024,10 +31851,10 @@ new CHIPFixedLabelGeneratedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPFixedLabelAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPModeSelectAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = FixedLabel::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<FixedLabelAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ModeSelect::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<ModeSelectAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -32041,19 +31868,19 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPFixedLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPModeSelectAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = FixedLabel::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<FixedLabelAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ModeSelect::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<ModeSelectAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFixedLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPModeSelectAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -32066,17 +31893,17 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPFixedLabelAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPModeSelectAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = FixedLabel::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = ModeSelect::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<FixedLabelAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<ModeSelectAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -32089,10 +31916,10 @@ new CHIPFixedLabelAcceptedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPFixedLabelAttributeListListAttributeCallbackBridge(
+    new CHIPModeSelectAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = FixedLabel::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<FixedLabelAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ModeSelect::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<ModeSelectAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -32104,19 +31931,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPFixedLabelAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPModeSelectAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = FixedLabel::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<FixedLabelAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ModeSelect::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<ModeSelectAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFixedLabelAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPModeSelectAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -32129,17 +31956,17 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPFixedLabelAttributeListListAttributeCallbackBridge(
+    new CHIPModeSelectAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = FixedLabel::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = ModeSelect::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<FixedLabelAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<ModeSelectAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -32153,7 +31980,7 @@ - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = FixedLabel::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = ModeSelect::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -32173,7 +32000,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = FixedLabel::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = ModeSelect::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -32193,7 +32020,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = FixedLabel::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = ModeSelect::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -32213,7 +32040,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = FixedLabel::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = ModeSelect::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -32234,7 +32061,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = FixedLabel::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ModeSelect::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -32255,7 +32082,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = FixedLabel::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ModeSelect::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -32273,446 +32100,630 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPFlowMeasurement
+@implementation CHIPDoorLock
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)readAttributeMeasuredValueWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)lockDoorWithParams:(CHIPDoorLockClusterLockDoorParams * _Nullable)params
+         completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = FlowMeasurement::Attributes::MeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    DoorLock::Commands::LockDoor::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    if (!timedInvokeTimeoutMs.HasValue()) {
+        timedInvokeTimeoutMs.SetValue(10000);
+    }
+    if (params != nil) {
+        if (params.pinCode != nil) {
+            auto & definedValue_0 = request.pinCode.Emplace();
+            definedValue_0 = [self asByteSpan:params.pinCode];
+        }
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)unlockDoorWithParams:(CHIPDoorLockClusterUnlockDoorParams * _Nullable)params
+           completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = FlowMeasurement::Attributes::MeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    DoorLock::Commands::UnlockDoor::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    if (!timedInvokeTimeoutMs.HasValue()) {
+        timedInvokeTimeoutMs.SetValue(10000);
+    }
+    if (params != nil) {
+        if (params.pinCode != nil) {
+            auto & definedValue_0 = request.pinCode.Emplace();
+            definedValue_0 = [self asByteSpan:params.pinCode];
+        }
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
         },
-        subscriptionEstablishedHandler);
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-+ (void)readAttributeMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)unlockWithTimeoutWithParams:(CHIPDoorLockClusterUnlockWithTimeoutParams *)params
+                  completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = FlowMeasurement::Attributes::MeasuredValue::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    DoorLock::Commands::UnlockWithTimeout::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
+    }
+    if (!timedInvokeTimeoutMs.HasValue()) {
+        timedInvokeTimeoutMs.SetValue(10000);
+    }
+    request.timeout = params.timeout.unsignedShortValue;
+    if (params.pinCode != nil) {
+        auto & definedValue_0 = request.pinCode.Emplace();
+        definedValue_0 = [self asByteSpan:params.pinCode];
+    }
 
-- (void)readAttributeMinMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt16uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = FlowMeasurement::Attributes::MinMeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeMinMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)setWeekDayScheduleWithParams:(CHIPDoorLockClusterSetWeekDayScheduleParams *)params
+                   completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    DoorLock::Commands::SetWeekDaySchedule::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.weekDayIndex = params.weekDayIndex.unsignedCharValue;
+    request.userIndex = params.userIndex.unsignedShortValue;
+    request.daysMask = static_cast<std::remove_reference_t<decltype(request.daysMask)>>(params.daysMask.unsignedCharValue);
+    request.startHour = params.startHour.unsignedCharValue;
+    request.startMinute = params.startMinute.unsignedCharValue;
+    request.endHour = params.endHour.unsignedCharValue;
+    request.endMinute = params.endMinute.unsignedCharValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
         ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = FlowMeasurement::Attributes::MinMeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-+ (void)readAttributeMinMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)getWeekDayScheduleWithParams:(CHIPDoorLockClusterGetWeekDayScheduleParams *)params
+                   completionHandler:(void (^)(CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable data,
+                                         NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = FlowMeasurement::Attributes::MinMeasuredValue::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    DoorLock::Commands::GetWeekDaySchedule::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
+    }
+    request.weekDayIndex = params.weekDayIndex.unsignedCharValue;
+    request.userIndex = params.userIndex.unsignedShortValue;
 
-- (void)readAttributeMaxMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt16uAttributeCallbackBridge(
+    new CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = FlowMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeMaxMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)clearWeekDayScheduleWithParams:(CHIPDoorLockClusterClearWeekDayScheduleParams *)params
+                     completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    DoorLock::Commands::ClearWeekDaySchedule::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.weekDayIndex = params.weekDayIndex.unsignedCharValue;
+    request.userIndex = params.userIndex.unsignedShortValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
         ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = FlowMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-+ (void)readAttributeMaxMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)setYearDayScheduleWithParams:(CHIPDoorLockClusterSetYearDayScheduleParams *)params
+                   completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = FlowMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    DoorLock::Commands::SetYearDaySchedule::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeToleranceWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = FlowMeasurement::Attributes::Tolerance::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
+    }
+    request.yearDayIndex = params.yearDayIndex.unsignedCharValue;
+    request.userIndex = params.userIndex.unsignedShortValue;
+    request.localStartTime = params.localStartTime.unsignedIntValue;
+    request.localEndTime = params.localEndTime.unsignedIntValue;
 
-- (void)subscribeAttributeToleranceWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
         ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = FlowMeasurement::Attributes::Tolerance::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-+ (void)readAttributeToleranceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)getYearDayScheduleWithParams:(CHIPDoorLockClusterGetYearDayScheduleParams *)params
+                   completionHandler:(void (^)(CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable data,
+                                         NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = FlowMeasurement::Attributes::Tolerance::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    DoorLock::Commands::GetYearDaySchedule::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
+    }
+    request.yearDayIndex = params.yearDayIndex.unsignedCharValue;
+    request.userIndex = params.userIndex.unsignedShortValue;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
-{
-    new CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPDoorLockClusterGetYearDayScheduleResponseCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = FlowMeasurement::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<FlowMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPDoorLockClusterGetYearDayScheduleResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)clearYearDayScheduleWithParams:(CHIPDoorLockClusterClearYearDayScheduleParams *)params
+                     completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    DoorLock::Commands::ClearYearDaySchedule::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.yearDayIndex = params.yearDayIndex.unsignedCharValue;
+    request.userIndex = params.userIndex.unsignedShortValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
         ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = FlowMeasurement::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<FlowMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)setHolidayScheduleWithParams:(CHIPDoorLockClusterSetHolidayScheduleParams *)params
+                   completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = FlowMeasurement::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<FlowMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    DoorLock::Commands::SetHolidaySchedule::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.holidayIndex = params.holidayIndex.unsignedCharValue;
+    request.localStartTime = params.localStartTime.unsignedIntValue;
+    request.localEndTime = params.localEndTime.unsignedIntValue;
+    request.operatingMode
+        = static_cast<std::remove_reference_t<decltype(request.operatingMode)>>(params.operatingMode.unsignedCharValue);
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)getHolidayScheduleWithParams:(CHIPDoorLockClusterGetHolidayScheduleParams *)params
+                   completionHandler:(void (^)(CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable data,
+                                         NSError * _Nullable error))completionHandler
 {
-    new CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackBridge(
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    DoorLock::Commands::GetHolidaySchedule::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.holidayIndex = params.holidayIndex.unsignedCharValue;
+
+    new CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = FlowMeasurement::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<FlowMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPDoorLockClusterGetHolidayScheduleResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)clearHolidayScheduleWithParams:(CHIPDoorLockClusterClearHolidayScheduleParams *)params
+                     completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    DoorLock::Commands::ClearHolidaySchedule::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.holidayIndex = params.holidayIndex.unsignedCharValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
         ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = FlowMeasurement::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<FlowMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)setUserWithParams:(CHIPDoorLockClusterSetUserParams *)params completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = FlowMeasurement::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<FlowMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    DoorLock::Commands::SetUser::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    if (!timedInvokeTimeoutMs.HasValue()) {
+        timedInvokeTimeoutMs.SetValue(10000);
+    }
+    request.operationType
+        = static_cast<std::remove_reference_t<decltype(request.operationType)>>(params.operationType.unsignedCharValue);
+    request.userIndex = params.userIndex.unsignedShortValue;
+    if (params.userName == nil) {
+        request.userName.SetNull();
+    } else {
+        auto & nonNullValue_0 = request.userName.SetNonNull();
+        nonNullValue_0 = [self asCharSpan:params.userName];
+    }
+    if (params.userUniqueId == nil) {
+        request.userUniqueId.SetNull();
+    } else {
+        auto & nonNullValue_0 = request.userUniqueId.SetNonNull();
+        nonNullValue_0 = params.userUniqueId.unsignedIntValue;
+    }
+    if (params.userStatus == nil) {
+        request.userStatus.SetNull();
+    } else {
+        auto & nonNullValue_0 = request.userStatus.SetNonNull();
+        nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(params.userStatus.unsignedCharValue);
+    }
+    if (params.userType == nil) {
+        request.userType.SetNull();
+    } else {
+        auto & nonNullValue_0 = request.userType.SetNonNull();
+        nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(params.userType.unsignedCharValue);
+    }
+    if (params.credentialRule == nil) {
+        request.credentialRule.SetNull();
+    } else {
+        auto & nonNullValue_0 = request.credentialRule.SetNonNull();
+        nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(params.credentialRule.unsignedCharValue);
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)getUserWithParams:(CHIPDoorLockClusterGetUserParams *)params
+        completionHandler:
+            (void (^)(CHIPDoorLockClusterGetUserResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
-    new CHIPFlowMeasurementAttributeListListAttributeCallbackBridge(
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    DoorLock::Commands::GetUser::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.userIndex = params.userIndex.unsignedShortValue;
+
+    new CHIPDoorLockClusterGetUserResponseCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = FlowMeasurement::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<FlowMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPDoorLockClusterGetUserResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)clearUserWithParams:(CHIPDoorLockClusterClearUserParams *)params completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    DoorLock::Commands::ClearUser::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    if (!timedInvokeTimeoutMs.HasValue()) {
+        timedInvokeTimeoutMs.SetValue(10000);
+    }
+    request.userIndex = params.userIndex.unsignedShortValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)setCredentialWithParams:(CHIPDoorLockClusterSetCredentialParams *)params
+              completionHandler:(void (^)(CHIPDoorLockClusterSetCredentialResponseParams * _Nullable data,
+                                    NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    DoorLock::Commands::SetCredential::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    if (!timedInvokeTimeoutMs.HasValue()) {
+        timedInvokeTimeoutMs.SetValue(10000);
+    }
+    request.operationType
+        = static_cast<std::remove_reference_t<decltype(request.operationType)>>(params.operationType.unsignedCharValue);
+    request.credential.credentialType = static_cast<std::remove_reference_t<decltype(request.credential.credentialType)>>(
+        params.credential.credentialType.unsignedCharValue);
+    request.credential.credentialIndex = params.credential.credentialIndex.unsignedShortValue;
+    request.credentialData = [self asByteSpan:params.credentialData];
+    if (params.userIndex == nil) {
+        request.userIndex.SetNull();
+    } else {
+        auto & nonNullValue_0 = request.userIndex.SetNonNull();
+        nonNullValue_0 = params.userIndex.unsignedShortValue;
+    }
+    if (params.userStatus == nil) {
+        request.userStatus.SetNull();
+    } else {
+        auto & nonNullValue_0 = request.userStatus.SetNonNull();
+        nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(params.userStatus.unsignedCharValue);
+    }
+    if (params.userType == nil) {
+        request.userType.SetNull();
+    } else {
+        auto & nonNullValue_0 = request.userType.SetNonNull();
+        nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(params.userType.unsignedCharValue);
+    }
+
+    new CHIPDoorLockClusterSetCredentialResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPDoorLockClusterSetCredentialResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)getCredentialStatusWithParams:(CHIPDoorLockClusterGetCredentialStatusParams *)params
+                    completionHandler:(void (^)(CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable data,
+                                          NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    DoorLock::Commands::GetCredentialStatus::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.credential.credentialType = static_cast<std::remove_reference_t<decltype(request.credential.credentialType)>>(
+        params.credential.credentialType.unsignedCharValue);
+    request.credential.credentialIndex = params.credential.credentialIndex.unsignedShortValue;
+
+    new CHIPDoorLockClusterGetCredentialStatusResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPDoorLockClusterGetCredentialStatusResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)clearCredentialWithParams:(CHIPDoorLockClusterClearCredentialParams *)params
+                completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    DoorLock::Commands::ClearCredential::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    if (!timedInvokeTimeoutMs.HasValue()) {
+        timedInvokeTimeoutMs.SetValue(10000);
+    }
+    if (params.credential == nil) {
+        request.credential.SetNull();
+    } else {
+        auto & nonNullValue_0 = request.credential.SetNonNull();
+        nonNullValue_0.credentialType = static_cast<std::remove_reference_t<decltype(nonNullValue_0.credentialType)>>(
+            params.credential.credentialType.unsignedCharValue);
+        nonNullValue_0.credentialIndex = params.credential.credentialIndex.unsignedShortValue;
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)readAttributeLockStateWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPNullableDoorLockClusterDlLockStateAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = DoorLock::Attributes::LockState::TypeInfo;
+            auto successFn = Callback<NullableDoorLockClusterDlLockStateAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeLockStateWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPFlowMeasurementAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPNullableDoorLockClusterDlLockStateAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = FlowMeasurement::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<FlowMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::LockState::TypeInfo;
+            auto successFn = Callback<NullableDoorLockClusterDlLockStateAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFlowMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableDoorLockClusterDlLockStateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeLockStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPFlowMeasurementAttributeListListAttributeCallbackBridge(
+    new CHIPNullableDoorLockClusterDlLockStateAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = FlowMeasurement::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = DoorLock::Attributes::LockState::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<FlowMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<NullableDoorLockClusterDlLockStateAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -32722,119 +32733,121 @@ new CHIPFlowMeasurementAttributeListListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeLockTypeWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = FlowMeasurement::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPDoorLockClusterDlLockTypeAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = DoorLock::Attributes::LockType::TypeInfo;
+            auto successFn = Callback<DoorLockClusterDlLockTypeAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeLockTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPDoorLockClusterDlLockTypeAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = FlowMeasurement::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::LockType::TypeInfo;
+            auto successFn = Callback<DoorLockClusterDlLockTypeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPDoorLockClusterDlLockTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeLockTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = FlowMeasurement::Attributes::FeatureMap::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPDoorLockClusterDlLockTypeAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = DoorLock::Attributes::LockType::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<DoorLockClusterDlLockTypeAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeActuatorEnabledWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = FlowMeasurement::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::ActuatorEnabled::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeActuatorEnabledWithMinInterval:(NSNumber * _Nonnull)minInterval
                                              maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(CHIPSubscribeParams * _Nullable)params
                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                            reportHandler:
                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = FlowMeasurement::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::ActuatorEnabled::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeActuatorEnabledWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                               endpoint:(NSNumber *)endpoint
                                                  queue:(dispatch_queue_t)queue
                                      completionHandler:
                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = FlowMeasurement::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::ActuatorEnabled::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -32844,114 +32857,86 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPGeneralCommissioning
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)armFailSafeWithParams:(CHIPGeneralCommissioningClusterArmFailSafeParams *)params
-            completionHandler:(void (^)(CHIPGeneralCommissioningClusterArmFailSafeResponseParams * _Nullable data,
-                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeDoorStateWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    GeneralCommissioning::Commands::ArmFailSafe::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.expiryLengthSeconds = params.expiryLengthSeconds.unsignedShortValue;
-    request.breadcrumb = params.breadcrumb.unsignedLongLongValue;
-
-    new CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge(
+    new CHIPNullableDoorLockClusterDlDoorStateAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackType>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::DoorState::TypeInfo;
+            auto successFn = Callback<NullableDoorLockClusterDlDoorStateAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)setRegulatoryConfigWithParams:(CHIPGeneralCommissioningClusterSetRegulatoryConfigParams *)params
-                    completionHandler:(void (^)(CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseParams * _Nullable data,
-                                          NSError * _Nullable error))completionHandler
+- (void)subscribeAttributeDoorStateWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    GeneralCommissioning::Commands::SetRegulatoryConfig::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.newRegulatoryConfig
-        = static_cast<std::remove_reference_t<decltype(request.newRegulatoryConfig)>>(params.newRegulatoryConfig.unsignedCharValue);
-    request.countryCode = [self asCharSpan:params.countryCode];
-    request.breadcrumb = params.breadcrumb.unsignedLongLongValue;
-
-    new CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn
-                = Callback<CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallbackType>::FromCancelable(success);
+    new CHIPNullableDoorLockClusterDlDoorStateAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = DoorLock::Attributes::DoorState::TypeInfo;
+            auto successFn = Callback<NullableDoorLockClusterDlDoorStateAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPNullableDoorLockClusterDlDoorStateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
 
-- (void)commissioningCompleteWithCompletionHandler:
-    (void (^)(CHIPGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable data,
-        NSError * _Nullable error))completionHandler
-{
-    [self commissioningCompleteWithParams:nil completionHandler:completionHandler];
-}
-- (void)commissioningCompleteWithParams:(CHIPGeneralCommissioningClusterCommissioningCompleteParams * _Nullable)params
-                      completionHandler:
-                          (void (^)(CHIPGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable data,
-                              NSError * _Nullable error))completionHandler
++ (void)readAttributeDoorStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    GeneralCommissioning::Commands::CommissioningComplete::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn
-                = Callback<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+    new CHIPNullableDoorLockClusterDlDoorStateAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = DoorLock::Attributes::DoorState::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<NullableDoorLockClusterDlDoorStateAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
         });
 }
 
-- (void)readAttributeBreadcrumbWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeDoorOpenEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = GeneralCommissioning::Attributes::Breadcrumb::TypeInfo;
-        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::DoorOpenEvents::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeBreadcrumbWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDoorOpenEventsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeBreadcrumbWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self writeAttributeDoorOpenEventsWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeBreadcrumbWithValue:(NSNumber * _Nonnull)value
-                                   params:(CHIPWriteParams * _Nullable)params
-                        completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDoorOpenEventsWithValue:(NSNumber * _Nonnull)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -32967,9 +32952,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GeneralCommissioning::Attributes::Breadcrumb::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::DoorOpenEvents::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -32977,46 +32962,48 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeBreadcrumbWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeDoorOpenEventsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt64uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GeneralCommissioning::Attributes::Breadcrumb::TypeInfo;
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::DoorOpenEvents::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBreadcrumbWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeDoorOpenEventsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = GeneralCommissioning::Attributes::Breadcrumb::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::DoorOpenEvents::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -33026,258 +33013,246 @@ new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeBasicCommissioningInfoWithCompletionHandler:
-    (void (^)(CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeDoorClosedEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = GeneralCommissioning::Attributes::BasicCommissioningInfo::TypeInfo;
-            auto successFn = Callback<GeneralCommissioningBasicCommissioningInfoStructAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::DoorClosedEvents::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)
-    subscribeAttributeBasicCommissioningInfoWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value,
-                                                      NSError * _Nullable error))reportHandler
+- (void)writeAttributeDoorClosedEventsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = GeneralCommissioning::Attributes::BasicCommissioningInfo::TypeInfo;
-            auto successFn = Callback<GeneralCommissioningBasicCommissioningInfoStructAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+    [self writeAttributeDoorClosedEventsWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-
-+ (void)readAttributeBasicCommissioningInfoWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value,
-                                                    NSError * _Nullable error))completionHandler
+- (void)writeAttributeDoorClosedEventsWithValue:(NSNumber * _Nonnull)value
+                                         params:(CHIPWriteParams * _Nullable)params
+                              completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPGeneralCommissioningBasicCommissioningInfoStructAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = GeneralCommissioning::Attributes::BasicCommissioningInfo::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<GeneralCommissioningBasicCommissioningInfoStructAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
 
-- (void)readAttributeRegulatoryConfigWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
-{
-    new CHIPGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = GeneralCommissioning::Attributes::RegulatoryConfig::TypeInfo;
-            auto successFn = Callback<GeneralCommissioningClusterRegulatoryLocationTypeAttributeCallback>::FromCancelable(success);
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = DoorLock::Attributes::DoorClosedEvents::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedIntValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeRegulatoryConfigWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeDoorClosedEventsWithMinInterval:(NSNumber * _Nonnull)minInterval
                                               maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(CHIPSubscribeParams * _Nullable)params
                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                             reportHandler:
                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GeneralCommissioning::Attributes::RegulatoryConfig::TypeInfo;
-            auto successFn = Callback<GeneralCommissioningClusterRegulatoryLocationTypeAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::DoorClosedEvents::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRegulatoryConfigWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeDoorClosedEventsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                endpoint:(NSNumber *)endpoint
                                                   queue:(dispatch_queue_t)queue
                                       completionHandler:
                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = GeneralCommissioning::Attributes::RegulatoryConfig::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<GeneralCommissioningClusterRegulatoryLocationTypeAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = DoorLock::Attributes::DoorClosedEvents::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeLocationCapabilityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler
+- (void)readAttributeOpenPeriodWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = GeneralCommissioning::Attributes::LocationCapability::TypeInfo;
-            auto successFn = Callback<GeneralCommissioningClusterRegulatoryLocationTypeAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::OpenPeriod::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributeOpenPeriodWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeOpenPeriodWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeOpenPeriodWithValue:(NSNumber * _Nonnull)value
+                                   params:(CHIPWriteParams * _Nullable)params
+                        completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = DoorLock::Attributes::OpenPeriod::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeLocationCapabilityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOpenPeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GeneralCommissioning::Attributes::LocationCapability::TypeInfo;
-            auto successFn = Callback<GeneralCommissioningClusterRegulatoryLocationTypeAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::OpenPeriod::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeLocationCapabilityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOpenPeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = GeneralCommissioning::Attributes::LocationCapability::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<GeneralCommissioningClusterRegulatoryLocationTypeAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = DoorLock::Attributes::OpenPeriod::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeSupportsConcurrentConnectionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler
+- (void)readAttributeNumberOfTotalUsersSupportedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = GeneralCommissioning::Attributes::SupportsConcurrentConnection::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::NumberOfTotalUsersSupported::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeSupportsConcurrentConnectionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNumberOfTotalUsersSupportedWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                              params:(CHIPSubscribeParams * _Nullable)params
+                                             subscriptionEstablished:
+                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))reportHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GeneralCommissioning::Attributes::SupportsConcurrentConnection::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::NumberOfTotalUsersSupported::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSupportsConcurrentConnectionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
++ (void)readAttributeNumberOfTotalUsersSupportedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                          endpoint:(NSNumber *)endpoint
+                                                             queue:(dispatch_queue_t)queue
+                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = GeneralCommissioning::Attributes::SupportsConcurrentConnection::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::NumberOfTotalUsersSupported::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -33287,250 +33262,187 @@ new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable *
     });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeNumberOfPINUsersSupportedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler
 {
-    new CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = GeneralCommissioning::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<GeneralCommissioningGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::NumberOfPINUsersSupported::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNumberOfPINUsersSupportedWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                            params:(CHIPSubscribeParams * _Nullable)params
+                                           subscriptionEstablished:
+                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))reportHandler
 {
-    new CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GeneralCommissioning::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<GeneralCommissioningGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::NumberOfPINUsersSupported::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNumberOfPINUsersSupportedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                        endpoint:(NSNumber *)endpoint
+                                                           queue:(dispatch_queue_t)queue
+                                               completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
-    new CHIPGeneralCommissioningGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = GeneralCommissioning::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<GeneralCommissioningGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = DoorLock::Attributes::NumberOfPINUsersSupported::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeNumberOfRFIDUsersSupportedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler
 {
-    new CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = GeneralCommissioning::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<GeneralCommissioningAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::NumberOfRFIDUsersSupported::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNumberOfRFIDUsersSupportedWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                             params:(CHIPSubscribeParams * _Nullable)params
+                                            subscriptionEstablished:
+                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))reportHandler
 {
-    new CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GeneralCommissioning::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<GeneralCommissioningAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::NumberOfRFIDUsersSupported::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNumberOfRFIDUsersSupportedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                         endpoint:(NSNumber *)endpoint
+                                                            queue:(dispatch_queue_t)queue
+                                                completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPGeneralCommissioningAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = GeneralCommissioning::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<GeneralCommissioningAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = DoorLock::Attributes::NumberOfRFIDUsersSupported::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPGeneralCommissioningAttributeListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = GeneralCommissioning::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<GeneralCommissioningAttributeListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPGeneralCommissioningAttributeListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = GeneralCommissioning::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<GeneralCommissioningAttributeListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGeneralCommissioningAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPGeneralCommissioningAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = GeneralCommissioning::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<GeneralCommissioningAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeNumberOfWeekDaySchedulesSupportedPerUserWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                       NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = GeneralCommissioning::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::NumberOfWeekDaySchedulesSupportedPerUser::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNumberOfWeekDaySchedulesSupportedPerUserWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
+                                                                                      subscriptionEstablishedHandler
+                                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                      NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GeneralCommissioning::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::NumberOfWeekDaySchedulesSupportedPerUser::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNumberOfWeekDaySchedulesSupportedPerUserWithAttributeCache:
+            (CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                       endpoint:(NSNumber *)endpoint
+                                                                          queue:(dispatch_queue_t)queue
+                                                              completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = GeneralCommissioning::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::NumberOfWeekDaySchedulesSupportedPerUser::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -33540,59 +33452,61 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeNumberOfYearDaySchedulesSupportedPerUserWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                       NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = GeneralCommissioning::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::NumberOfYearDaySchedulesSupportedPerUser::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNumberOfYearDaySchedulesSupportedPerUserWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
+                                                                                      subscriptionEstablishedHandler
+                                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                      NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GeneralCommissioning::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::NumberOfYearDaySchedulesSupportedPerUser::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNumberOfYearDaySchedulesSupportedPerUserWithAttributeCache:
+            (CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                       endpoint:(NSNumber *)endpoint
+                                                                          queue:(dispatch_queue_t)queue
+                                                              completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = GeneralCommissioning::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::NumberOfYearDaySchedulesSupportedPerUser::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -33602,158 +33516,122 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPGeneralDiagnostics
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)testEventTriggerWithParams:(CHIPGeneralDiagnosticsClusterTestEventTriggerParams *)params
-                 completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    GeneralDiagnostics::Commands::TestEventTrigger::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.enableKey = [self asByteSpan:params.enableKey];
-    request.eventTrigger = params.eventTrigger.unsignedLongLongValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)readAttributeNetworkInterfacesWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeNumberOfHolidaySchedulesSupportedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = GeneralDiagnostics::Attributes::NetworkInterfaces::TypeInfo;
-            auto successFn = Callback<GeneralDiagnosticsNetworkInterfacesListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::NumberOfHolidaySchedulesSupported::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeNetworkInterfacesWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNumberOfHolidaySchedulesSupportedWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                                   subscriptionEstablished:
+                                                       (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                             reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))reportHandler
 {
-    new CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GeneralDiagnostics::Attributes::NetworkInterfaces::TypeInfo;
-            auto successFn = Callback<GeneralDiagnosticsNetworkInterfacesListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::NumberOfHolidaySchedulesSupported::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNetworkInterfacesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNumberOfHolidaySchedulesSupportedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                endpoint:(NSNumber *)endpoint
+                                                                   queue:(dispatch_queue_t)queue
+                                                       completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPGeneralDiagnosticsNetworkInterfacesListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = GeneralDiagnostics::Attributes::NetworkInterfaces::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<GeneralDiagnosticsNetworkInterfacesListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = DoorLock::Attributes::NumberOfHolidaySchedulesSupported::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeRebootCountWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeMaxPINCodeLengthWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = GeneralDiagnostics::Attributes::RebootCount::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::MaxPINCodeLength::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRebootCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMaxPINCodeLengthWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GeneralDiagnostics::Attributes::RebootCount::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::MaxPINCodeLength::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRebootCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMaxPINCodeLengthWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = GeneralDiagnostics::Attributes::RebootCount::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::MaxPINCodeLength::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -33763,56 +33641,59 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeUpTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeMinPINCodeLengthWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = GeneralDiagnostics::Attributes::UpTime::TypeInfo;
-        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::MinPINCodeLength::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeUpTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMinPINCodeLengthWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt64uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GeneralDiagnostics::Attributes::UpTime::TypeInfo;
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::MinPINCodeLength::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeUpTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMinPINCodeLengthWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = GeneralDiagnostics::Attributes::UpTime::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::MinPINCodeLength::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -33822,60 +33703,59 @@ new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeTotalOperationalHoursWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler
+- (void)readAttributeMaxRFIDCodeLengthWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = GeneralDiagnostics::Attributes::TotalOperationalHours::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::MaxRFIDCodeLength::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeTotalOperationalHoursWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMaxRFIDCodeLengthWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GeneralDiagnostics::Attributes::TotalOperationalHours::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::MaxRFIDCodeLength::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTotalOperationalHoursWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMaxRFIDCodeLengthWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = GeneralDiagnostics::Attributes::TotalOperationalHours::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::MaxRFIDCodeLength::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -33885,22 +33765,23 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeBootReasonsWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeMinRFIDCodeLengthWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = GeneralDiagnostics::Attributes::BootReasons::TypeInfo;
+        using TypeInfo = DoorLock::Attributes::MinRFIDCodeLength::TypeInfo;
         auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeBootReasonsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMinRFIDCodeLengthWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -33909,7 +33790,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GeneralDiagnostics::Attributes::BootReasons::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::MinRFIDCodeLength::TypeInfo;
             auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -33921,16 +33802,16 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBootReasonsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMinRFIDCodeLengthWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = GeneralDiagnostics::Attributes::BootReasons::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::MinRFIDCodeLength::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -33946,62 +33827,62 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeActiveHardwareFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeCredentialRulesSupportWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
-    new CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackBridge(
+    new CHIPDoorLockCredentialRulesSupportAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = GeneralDiagnostics::Attributes::ActiveHardwareFaults::TypeInfo;
-            auto successFn = Callback<GeneralDiagnosticsActiveHardwareFaultsListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::CredentialRulesSupport::TypeInfo;
+            auto successFn = Callback<DoorLockCredentialRulesSupportAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeActiveHardwareFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCredentialRulesSupportWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:
+                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackSubscriptionBridge(
+    new CHIPDoorLockCredentialRulesSupportAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GeneralDiagnostics::Attributes::ActiveHardwareFaults::TypeInfo;
-            auto successFn = Callback<GeneralDiagnosticsActiveHardwareFaultsListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::CredentialRulesSupport::TypeInfo;
+            auto successFn = Callback<DoorLockCredentialRulesSupportAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPDoorLockCredentialRulesSupportAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeActiveHardwareFaultsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCredentialRulesSupportWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackBridge(
+    new CHIPDoorLockCredentialRulesSupportAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = GeneralDiagnostics::Attributes::ActiveHardwareFaults::TypeInfo;
+                using TypeInfo = DoorLock::Attributes::CredentialRulesSupport::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<GeneralDiagnosticsActiveHardwareFaultsListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<DoorLockCredentialRulesSupportAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -34011,189 +33892,245 @@ new CHIPGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeActiveRadioFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeNumberOfCredentialsSupportedPerUserWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = GeneralDiagnostics::Attributes::ActiveRadioFaults::TypeInfo;
-            auto successFn = Callback<GeneralDiagnosticsActiveRadioFaultsListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::NumberOfCredentialsSupportedPerUser::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeActiveRadioFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNumberOfCredentialsSupportedPerUserWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                                     subscriptionEstablished:
+                                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                               reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                 NSError * _Nullable error))reportHandler
 {
-    new CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GeneralDiagnostics::Attributes::ActiveRadioFaults::TypeInfo;
-            auto successFn = Callback<GeneralDiagnosticsActiveRadioFaultsListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::NumberOfCredentialsSupportedPerUser::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeActiveRadioFaultsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNumberOfCredentialsSupportedPerUserWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                  endpoint:(NSNumber *)endpoint
+                                                                     queue:(dispatch_queue_t)queue
+                                                         completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = GeneralDiagnostics::Attributes::ActiveRadioFaults::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<GeneralDiagnosticsActiveRadioFaultsListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = DoorLock::Attributes::NumberOfCredentialsSupportedPerUser::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeActiveNetworkFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeLanguageWithCompletionHandler:(void (^)(
+                                                       NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = GeneralDiagnostics::Attributes::ActiveNetworkFaults::TypeInfo;
-            auto successFn = Callback<GeneralDiagnosticsActiveNetworkFaultsListAttributeCallback>::FromCancelable(success);
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::Language::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributeLanguageWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeLanguageWithValue:(NSString * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeLanguageWithValue:(NSString * _Nonnull)value
+                                 params:(CHIPWriteParams * _Nullable)params
+                      completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = DoorLock::Attributes::Language::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = [self asCharSpan:value];
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeActiveNetworkFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeLanguageWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GeneralDiagnostics::Attributes::ActiveNetworkFaults::TypeInfo;
-            auto successFn = Callback<GeneralDiagnosticsActiveNetworkFaultsListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::Language::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeActiveNetworkFaultsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeLanguageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = GeneralDiagnostics::Attributes::ActiveNetworkFaults::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<GeneralDiagnosticsActiveNetworkFaultsListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = DoorLock::Attributes::Language::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeTestEventTriggersEnabledWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
+- (void)readAttributeLEDSettingsWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = GeneralDiagnostics::Attributes::TestEventTriggersEnabled::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::LEDSettings::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeTestEventTriggersEnabledWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler
+- (void)writeAttributeLEDSettingsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    [self writeAttributeLEDSettingsWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeLEDSettingsWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = DoorLock::Attributes::LEDSettings::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeLEDSettingsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GeneralDiagnostics::Attributes::TestEventTriggersEnabled::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::LEDSettings::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTestEventTriggersEnabledWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeLEDSettingsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = GeneralDiagnostics::Attributes::TestEventTriggersEnabled::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::LEDSettings::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -34203,190 +34140,280 @@ new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable *
     });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeAutoRelockTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = GeneralDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<GeneralDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::AutoRelockTime::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributeAutoRelockTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeAutoRelockTimeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeAutoRelockTimeWithValue:(NSNumber * _Nonnull)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = DoorLock::Attributes::AutoRelockTime::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedIntValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAutoRelockTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GeneralDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<GeneralDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::AutoRelockTime::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAutoRelockTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPGeneralDiagnosticsGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = GeneralDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<GeneralDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = DoorLock::Attributes::AutoRelockTime::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeSoundVolumeWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = GeneralDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<GeneralDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::SoundVolume::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributeSoundVolumeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeSoundVolumeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeSoundVolumeWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = DoorLock::Attributes::SoundVolume::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSoundVolumeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GeneralDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<GeneralDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::SoundVolume::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeSoundVolumeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPGeneralDiagnosticsAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = GeneralDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<GeneralDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = DoorLock::Attributes::SoundVolume::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeOperatingModeWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPGeneralDiagnosticsAttributeListListAttributeCallbackBridge(
+    new CHIPDoorLockClusterDlOperatingModeAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = GeneralDiagnostics::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<GeneralDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::OperatingMode::TypeInfo;
+            auto successFn = Callback<DoorLockClusterDlOperatingModeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)writeAttributeOperatingModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeOperatingModeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeOperatingModeWithValue:(NSNumber * _Nonnull)value
+                                      params:(CHIPWriteParams * _Nullable)params
+                           completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = DoorLock::Attributes::OperatingMode::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeOperatingModeWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPGeneralDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPDoorLockClusterDlOperatingModeAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GeneralDiagnostics::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<GeneralDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::OperatingMode::TypeInfo;
+            auto successFn = Callback<DoorLockClusterDlOperatingModeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGeneralDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPDoorLockClusterDlOperatingModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeOperatingModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPGeneralDiagnosticsAttributeListListAttributeCallbackBridge(
+    new CHIPDoorLockClusterDlOperatingModeAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = GeneralDiagnostics::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = DoorLock::Attributes::OperatingMode::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<GeneralDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<DoorLockClusterDlOperatingModeAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -34396,316 +34423,251 @@ new CHIPGeneralDiagnosticsAttributeListListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeSupportedOperatingModesWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = GeneralDiagnostics::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPDoorLockSupportedOperatingModesAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = DoorLock::Attributes::SupportedOperatingModes::TypeInfo;
+            auto successFn = Callback<DoorLockSupportedOperatingModesAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSupportedOperatingModesWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPDoorLockSupportedOperatingModesAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GeneralDiagnostics::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::SupportedOperatingModes::TypeInfo;
+            auto successFn = Callback<DoorLockSupportedOperatingModesAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPDoorLockSupportedOperatingModesAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeSupportedOperatingModesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = GeneralDiagnostics::Attributes::FeatureMap::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPDoorLockSupportedOperatingModesAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = DoorLock::Attributes::SupportedOperatingModes::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<DoorLockSupportedOperatingModesAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeDefaultConfigurationRegisterWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = GeneralDiagnostics::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = DoorLock::Attributes::DefaultConfigurationRegister::TypeInfo;
+            auto successFn = Callback<DoorLockDefaultConfigurationRegisterAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeDefaultConfigurationRegisterWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                              subscriptionEstablished:
+                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GeneralDiagnostics::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::DefaultConfigurationRegister::TypeInfo;
+            auto successFn = Callback<DoorLockDefaultConfigurationRegisterAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeDefaultConfigurationRegisterWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                           endpoint:(NSNumber *)endpoint
+                                                              queue:(dispatch_queue_t)queue
+                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = GeneralDiagnostics::Attributes::ClusterRevision::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPDoorLockDefaultConfigurationRegisterAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = DoorLock::Attributes::DefaultConfigurationRegister::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<DoorLockDefaultConfigurationRegisterAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-@end
-
-@implementation CHIPGroupKeyManagement
-
-- (chip::Controller::ClusterBase *)getCluster
+- (void)readAttributeEnableLocalProgrammingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
-    return &_cppCluster;
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::EnableLocalProgramming::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)keySetWriteWithParams:(CHIPGroupKeyManagementClusterKeySetWriteParams *)params
-            completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeEnableLocalProgrammingWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    GroupKeyManagement::Commands::KeySetWrite::Type request;
+    [self writeAttributeEnableLocalProgrammingWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeEnableLocalProgrammingWithValue:(NSNumber * _Nonnull)value
+                                               params:(CHIPWriteParams * _Nullable)params
+                                    completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
     }
-    request.groupKeySet.groupKeySetID = params.groupKeySet.groupKeySetID.unsignedShortValue;
-    request.groupKeySet.groupKeySecurityPolicy
-        = static_cast<std::remove_reference_t<decltype(request.groupKeySet.groupKeySecurityPolicy)>>(
-            params.groupKeySet.groupKeySecurityPolicy.unsignedCharValue);
-    if (params.groupKeySet.epochKey0 == nil) {
-        request.groupKeySet.epochKey0.SetNull();
-    } else {
-        auto & nonNullValue_1 = request.groupKeySet.epochKey0.SetNonNull();
-        nonNullValue_1 = [self asByteSpan:params.groupKeySet.epochKey0];
-    }
-    if (params.groupKeySet.epochStartTime0 == nil) {
-        request.groupKeySet.epochStartTime0.SetNull();
-    } else {
-        auto & nonNullValue_1 = request.groupKeySet.epochStartTime0.SetNonNull();
-        nonNullValue_1 = params.groupKeySet.epochStartTime0.unsignedLongLongValue;
-    }
-    if (params.groupKeySet.epochKey1 == nil) {
-        request.groupKeySet.epochKey1.SetNull();
-    } else {
-        auto & nonNullValue_1 = request.groupKeySet.epochKey1.SetNonNull();
-        nonNullValue_1 = [self asByteSpan:params.groupKeySet.epochKey1];
-    }
-    if (params.groupKeySet.epochStartTime1 == nil) {
-        request.groupKeySet.epochStartTime1.SetNull();
-    } else {
-        auto & nonNullValue_1 = request.groupKeySet.epochStartTime1.SetNonNull();
-        nonNullValue_1 = params.groupKeySet.epochStartTime1.unsignedLongLongValue;
-    }
-    if (params.groupKeySet.epochKey2 == nil) {
-        request.groupKeySet.epochKey2.SetNull();
-    } else {
-        auto & nonNullValue_1 = request.groupKeySet.epochKey2.SetNonNull();
-        nonNullValue_1 = [self asByteSpan:params.groupKeySet.epochKey2];
-    }
-    if (params.groupKeySet.epochStartTime2 == nil) {
-        request.groupKeySet.epochStartTime2.SetNull();
-    } else {
-        auto & nonNullValue_1 = request.groupKeySet.epochStartTime2.SetNonNull();
-        nonNullValue_1 = params.groupKeySet.epochStartTime2.unsignedLongLongValue;
-    }
 
-    new CHIPCommandSuccessCallbackBridge(
+    new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
+        ^(id _Nullable ignored, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)keySetReadWithParams:(CHIPGroupKeyManagementClusterKeySetReadParams *)params
-           completionHandler:(void (^)(CHIPGroupKeyManagementClusterKeySetReadResponseParams * _Nullable data,
-                                 NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    GroupKeyManagement::Commands::KeySetRead::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.groupKeySetID = params.groupKeySetID.unsignedShortValue;
-
-    new CHIPGroupKeyManagementClusterKeySetReadResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPGroupKeyManagementClusterKeySetReadResponseCallbackType>::FromCancelable(success);
+            ListFreer listFreer;
+            using TypeInfo = DoorLock::Attributes::EnableLocalProgramming::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.boolValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)keySetRemoveWithParams:(CHIPGroupKeyManagementClusterKeySetRemoveParams *)params
-             completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeEnableLocalProgrammingWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:
+                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    GroupKeyManagement::Commands::KeySetRemove::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.groupKeySetID = params.groupKeySetID.unsignedShortValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = DoorLock::Attributes::EnableLocalProgramming::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
 
-- (void)keySetReadAllIndicesWithParams:(CHIPGroupKeyManagementClusterKeySetReadAllIndicesParams *)params
-                     completionHandler:(void (^)(CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data,
-                                           NSError * _Nullable error))completionHandler
++ (void)readAttributeEnableLocalProgrammingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    GroupKeyManagement::Commands::KeySetReadAllIndices::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    {
-        using ListType_0 = std::remove_reference_t<decltype(request.groupKeySetIDs)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        if (params.groupKeySetIDs.count != 0) {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.groupKeySetIDs.count);
-            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                return;
-            }
-            listFreer.add(listHolder_0);
-            for (size_t i_0 = 0; i_0 < params.groupKeySetIDs.count; ++i_0) {
-                if (![params.groupKeySetIDs[i_0] isKindOfClass:[NSNumber class]]) {
-                    // Wrong kind of value.
-                    return;
-                }
-                auto element_0 = (NSNumber *) params.groupKeySetIDs[i_0];
-                listHolder_0->mList[i_0] = element_0.unsignedShortValue;
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = DoorLock::Attributes::EnableLocalProgramming::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            request.groupKeySetIDs = ListType_0(listHolder_0->mList, params.groupKeySetIDs.count);
-        } else {
-            request.groupKeySetIDs = ListType_0();
+            return err;
         }
-    }
-
-    new CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn
-                = Callback<CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeGroupKeyMapWithParams:(CHIPReadParams * _Nullable)params
-                         completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeEnableOneTouchLockingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = GroupKeyManagement::Attributes::GroupKeyMap::TypeInfo;
-            auto successFn = Callback<GroupKeyManagementGroupKeyMapListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue]);
-        });
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::EnableOneTouchLocking::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)writeAttributeGroupKeyMapWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeEnableOneTouchLockingWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeGroupKeyMapWithValue:(NSArray * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self writeAttributeEnableOneTouchLockingWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeGroupKeyMapWithValue:(NSArray * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeEnableOneTouchLockingWithValue:(NSNumber * _Nonnull)value
+                                              params:(CHIPWriteParams * _Nullable)params
+                                   completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -34721,32 +34683,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GroupKeyManagement::Attributes::GroupKeyMap::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::EnableOneTouchLocking::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPGroupKeyManagementClusterGroupKeyMapStruct class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (CHIPGroupKeyManagementClusterGroupKeyMapStruct *) value[i_0];
-                        listHolder_0->mList[i_0].groupId = element_0.groupId.unsignedShortValue;
-                        listHolder_0->mList[i_0].groupKeySetID = element_0.groupKeySetID.unsignedShortValue;
-                        listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.boolValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -34754,172 +34693,145 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeGroupKeyMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeEnableOneTouchLockingWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackSubscriptionBridge(
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GroupKeyManagement::Attributes::GroupKeyMap::TypeInfo;
-            auto successFn = Callback<GroupKeyManagementGroupKeyMapListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::EnableOneTouchLocking::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGroupKeyMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeEnableOneTouchLockingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPGroupKeyManagementGroupKeyMapListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = GroupKeyManagement::Attributes::GroupKeyMap::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<GroupKeyManagementGroupKeyMapListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = DoorLock::Attributes::EnableOneTouchLocking::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeGroupTableWithParams:(CHIPReadParams * _Nullable)params
-                        completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeEnableInsideStatusLEDWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPGroupKeyManagementGroupTableListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = GroupKeyManagement::Attributes::GroupTable::TypeInfo;
-            auto successFn = Callback<GroupKeyManagementGroupTableListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue]);
-        });
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::EnableInsideStatusLED::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeGroupTableWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeEnableInsideStatusLEDWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPGroupKeyManagementGroupTableListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = GroupKeyManagement::Attributes::GroupTable::TypeInfo;
-            auto successFn = Callback<GroupKeyManagementGroupTableListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGroupKeyManagementGroupTableListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+    [self writeAttributeEnableInsideStatusLEDWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-
-+ (void)readAttributeGroupTableWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeEnableInsideStatusLEDWithValue:(NSNumber * _Nonnull)value
+                                              params:(CHIPWriteParams * _Nullable)params
+                                   completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPGroupKeyManagementGroupTableListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = GroupKeyManagement::Attributes::GroupTable::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<GroupKeyManagementGroupTableListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
 
-- (void)readAttributeMaxGroupsPerFabricWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = GroupKeyManagement::Attributes::MaxGroupsPerFabric::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = DoorLock::Attributes::EnableInsideStatusLED::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.boolValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
 }
 
-- (void)subscribeAttributeMaxGroupsPerFabricWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeEnableInsideStatusLEDWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GroupKeyManagement::Attributes::MaxGroupsPerFabric::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::EnableInsideStatusLED::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMaxGroupsPerFabricWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeEnableInsideStatusLEDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = GroupKeyManagement::Attributes::MaxGroupsPerFabric::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::EnableInsideStatusLED::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -34929,60 +34841,95 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeMaxGroupKeysPerFabricWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler
+- (void)readAttributeEnablePrivacyModeButtonWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = GroupKeyManagement::Attributes::MaxGroupKeysPerFabric::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::EnablePrivacyModeButton::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeMaxGroupKeysPerFabricWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeEnablePrivacyModeButtonWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeEnablePrivacyModeButtonWithValue:(NSNumber * _Nonnull) value
+                                                  params:nil
+                                       completionHandler:completionHandler];
+}
+- (void)writeAttributeEnablePrivacyModeButtonWithValue:(NSNumber * _Nonnull)value
+                                                params:(CHIPWriteParams * _Nullable)params
+                                     completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = DoorLock::Attributes::EnablePrivacyModeButton::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.boolValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeEnablePrivacyModeButtonWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler
+{
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GroupKeyManagement::Attributes::MaxGroupKeysPerFabric::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::EnablePrivacyModeButton::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMaxGroupKeysPerFabricWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeEnablePrivacyModeButtonWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = GroupKeyManagement::Attributes::MaxGroupKeysPerFabric::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::EnablePrivacyModeButton::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -34992,62 +34939,97 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeLocalProgrammingFeaturesWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler
 {
-    new CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = GroupKeyManagement::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<GroupKeyManagementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::LocalProgrammingFeatures::TypeInfo;
+            auto successFn = Callback<DoorLockLocalProgrammingFeaturesAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeLocalProgrammingFeaturesWithValue:(NSNumber * _Nonnull)value
+                                      completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    [self writeAttributeLocalProgrammingFeaturesWithValue:(NSNumber * _Nonnull) value
+                                                   params:nil
+                                        completionHandler:completionHandler];
+}
+- (void)writeAttributeLocalProgrammingFeaturesWithValue:(NSNumber * _Nonnull)value
+                                                 params:(CHIPWriteParams * _Nullable)params
+                                      completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = DoorLock::Attributes::LocalProgrammingFeatures::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeLocalProgrammingFeaturesWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))reportHandler
+{
+    new CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GroupKeyManagement::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<GroupKeyManagementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::LocalProgrammingFeatures::TypeInfo;
+            auto successFn = Callback<DoorLockLocalProgrammingFeaturesAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeLocalProgrammingFeaturesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPDoorLockLocalProgrammingFeaturesAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = GroupKeyManagement::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = DoorLock::Attributes::LocalProgrammingFeatures::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<GroupKeyManagementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<DoorLockLocalProgrammingFeaturesAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -35057,185 +35039,284 @@ new CHIPGroupKeyManagementGeneratedCommandListListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+- (void)readAttributeWrongCodeEntryLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = GroupKeyManagement::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<GroupKeyManagementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::WrongCodeEntryLimit::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributeWrongCodeEntryLimitWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeWrongCodeEntryLimitWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeWrongCodeEntryLimitWithValue:(NSNumber * _Nonnull)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = DoorLock::Attributes::WrongCodeEntryLimit::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeWrongCodeEntryLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(CHIPSubscribeParams * _Nullable)params
                                      subscriptionEstablished:
                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GroupKeyManagement::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<GroupKeyManagementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::WrongCodeEntryLimit::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeWrongCodeEntryLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                   endpoint:(NSNumber *)endpoint
                                                      queue:(dispatch_queue_t)queue
                                          completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPGroupKeyManagementAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = GroupKeyManagement::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<GroupKeyManagementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = DoorLock::Attributes::WrongCodeEntryLimit::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeUserCodeTemporaryDisableTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler
 {
-    new CHIPGroupKeyManagementAttributeListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = GroupKeyManagement::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<GroupKeyManagementAttributeListListAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::UserCodeTemporaryDisableTime::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributeUserCodeTemporaryDisableTimeWithValue:(NSNumber * _Nonnull)value
+                                          completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeUserCodeTemporaryDisableTimeWithValue:(NSNumber * _Nonnull) value
+                                                       params:nil
+                                            completionHandler:completionHandler];
+}
+- (void)writeAttributeUserCodeTemporaryDisableTimeWithValue:(NSNumber * _Nonnull)value
+                                                     params:(CHIPWriteParams * _Nullable)params
+                                          completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = DoorLock::Attributes::UserCodeTemporaryDisableTime::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeUserCodeTemporaryDisableTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                              subscriptionEstablished:
+                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))reportHandler
 {
-    new CHIPGroupKeyManagementAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GroupKeyManagement::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<GroupKeyManagementAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::UserCodeTemporaryDisableTime::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGroupKeyManagementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeUserCodeTemporaryDisableTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                           endpoint:(NSNumber *)endpoint
+                                                              queue:(dispatch_queue_t)queue
+                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler
 {
-    new CHIPGroupKeyManagementAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = GroupKeyManagement::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<GroupKeyManagementAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = DoorLock::Attributes::UserCodeTemporaryDisableTime::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeSendPINOverTheAirWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = GroupKeyManagement::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::SendPINOverTheAir::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeSendPINOverTheAirWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeSendPINOverTheAirWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeSendPINOverTheAirWithValue:(NSNumber * _Nonnull)value
+                                          params:(CHIPWriteParams * _Nullable)params
+                               completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = DoorLock::Attributes::SendPINOverTheAir::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.boolValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeSendPINOverTheAirWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GroupKeyManagement::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::SendPINOverTheAir::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeSendPINOverTheAirWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = GroupKeyManagement::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::SendPINOverTheAir::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -35245,59 +35326,95 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeRequirePINforRemoteOperationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = GroupKeyManagement::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::RequirePINforRemoteOperation::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeRequirePINforRemoteOperationWithValue:(NSNumber * _Nonnull)value
+                                          completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeRequirePINforRemoteOperationWithValue:(NSNumber * _Nonnull) value
+                                                       params:nil
+                                            completionHandler:completionHandler];
+}
+- (void)writeAttributeRequirePINforRemoteOperationWithValue:(NSNumber * _Nonnull)value
+                                                     params:(CHIPWriteParams * _Nullable)params
+                                          completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = DoorLock::Attributes::RequirePINforRemoteOperation::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.boolValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeRequirePINforRemoteOperationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                              subscriptionEstablished:
+                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))reportHandler
+{
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = GroupKeyManagement::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::RequirePINforRemoteOperation::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRequirePINforRemoteOperationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                           endpoint:(NSNumber *)endpoint
+                                                              queue:(dispatch_queue_t)queue
+                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = GroupKeyManagement::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::RequirePINforRemoteOperation::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -35307,237 +35424,92 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPGroups
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)addGroupWithParams:(CHIPGroupsClusterAddGroupParams *)params
-         completionHandler:
-             (void (^)(CHIPGroupsClusterAddGroupResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    Groups::Commands::AddGroup::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.groupId = params.groupId.unsignedShortValue;
-    request.groupName = [self asCharSpan:params.groupName];
-
-    new CHIPGroupsClusterAddGroupResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPGroupsClusterAddGroupResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)viewGroupWithParams:(CHIPGroupsClusterViewGroupParams *)params
-          completionHandler:
-              (void (^)(CHIPGroupsClusterViewGroupResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    Groups::Commands::ViewGroup::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.groupId = params.groupId.unsignedShortValue;
-
-    new CHIPGroupsClusterViewGroupResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPGroupsClusterViewGroupResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)getGroupMembershipWithParams:(CHIPGroupsClusterGetGroupMembershipParams *)params
-                   completionHandler:(void (^)(CHIPGroupsClusterGetGroupMembershipResponseParams * _Nullable data,
-                                         NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    Groups::Commands::GetGroupMembership::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    {
-        using ListType_0 = std::remove_reference_t<decltype(request.groupList)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        if (params.groupList.count != 0) {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.groupList.count);
-            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                return;
-            }
-            listFreer.add(listHolder_0);
-            for (size_t i_0 = 0; i_0 < params.groupList.count; ++i_0) {
-                if (![params.groupList[i_0] isKindOfClass:[NSNumber class]]) {
-                    // Wrong kind of value.
-                    return;
-                }
-                auto element_0 = (NSNumber *) params.groupList[i_0];
-                listHolder_0->mList[i_0] = element_0.unsignedShortValue;
-            }
-            request.groupList = ListType_0(listHolder_0->mList, params.groupList.count);
-        } else {
-            request.groupList = ListType_0();
-        }
-    }
-
-    new CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPGroupsClusterGetGroupMembershipResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)removeGroupWithParams:(CHIPGroupsClusterRemoveGroupParams *)params
-            completionHandler:
-                (void (^)(CHIPGroupsClusterRemoveGroupResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
+- (void)readAttributeExpiringUserTimeoutWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    Groups::Commands::RemoveGroup::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.groupId = params.groupId.unsignedShortValue;
-
-    new CHIPGroupsClusterRemoveGroupResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPGroupsClusterRemoveGroupResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = DoorLock::Attributes::ExpiringUserTimeout::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)removeAllGroupsWithCompletionHandler:(StatusCompletion)completionHandler
-{
-    [self removeAllGroupsWithParams:nil completionHandler:completionHandler];
-}
-- (void)removeAllGroupsWithParams:(CHIPGroupsClusterRemoveAllGroupsParams * _Nullable)params
-                completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeExpiringUserTimeoutWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    Groups::Commands::RemoveAllGroups::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+    [self writeAttributeExpiringUserTimeoutWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-
-- (void)addGroupIfIdentifyingWithParams:(CHIPGroupsClusterAddGroupIfIdentifyingParams *)params
-                      completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeExpiringUserTimeoutWithValue:(NSNumber * _Nonnull)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    Groups::Commands::AddGroupIfIdentifying::Type request;
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
     }
-    request.groupId = params.groupId.unsignedShortValue;
-    request.groupName = [self asCharSpan:params.groupName];
 
-    new CHIPCommandSuccessCallbackBridge(
+    new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
+        ^(id _Nullable ignored, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            ListFreer listFreer;
+            using TypeInfo = DoorLock::Attributes::ExpiringUserTimeout::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)readAttributeNameSupportWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Groups::Attributes::NameSupport::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeNameSupportWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeExpiringUserTimeoutWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Groups::Attributes::NameSupport::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::ExpiringUserTimeout::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNameSupportWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeExpiringUserTimeoutWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Groups::Attributes::NameSupport::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::ExpiringUserTimeout::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -35550,10 +35522,10 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPGroupsGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPDoorLockGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Groups::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<GroupsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<DoorLockGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -35567,19 +35539,19 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
                                                 reportHandler:
                                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPGroupsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPDoorLockGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Groups::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<GroupsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<DoorLockGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGroupsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPDoorLockGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -35592,17 +35564,17 @@ + (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheC
                                           completionHandler:
                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPGroupsGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPDoorLockGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = Groups::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = DoorLock::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<GroupsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<DoorLockGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -35615,10 +35587,10 @@ new CHIPGroupsGeneratedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPGroupsAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPDoorLockAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Groups::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<GroupsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<DoorLockAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -35632,19 +35604,19 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPGroupsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPDoorLockAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Groups::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<GroupsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<DoorLockAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGroupsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPDoorLockAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -35657,17 +35629,17 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPGroupsAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPDoorLockAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = Groups::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = DoorLock::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<GroupsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<DoorLockAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -35680,10 +35652,10 @@ new CHIPGroupsAcceptedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPGroupsAttributeListListAttributeCallbackBridge(
+    new CHIPDoorLockAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Groups::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<GroupsAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<DoorLockAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -35695,19 +35667,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPGroupsAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPDoorLockAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Groups::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<GroupsAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = DoorLock::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<DoorLockAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPGroupsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPDoorLockAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -35720,30 +35692,31 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPGroupsAttributeListListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = Groups::Attributes::AttributeList::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<GroupsAttributeListListAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPDoorLockAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = DoorLock::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<DoorLockAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Groups::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = DoorLock::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -35763,7 +35736,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Groups::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -35783,7 +35756,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Groups::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -35803,7 +35776,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Groups::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = DoorLock::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -35824,7 +35797,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Groups::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -35845,7 +35818,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Groups::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -35863,24 +35836,28 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPIdentify
+@implementation CHIPWindowCovering
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)identifyWithParams:(CHIPIdentifyClusterIdentifyParams *)params completionHandler:(StatusCompletion)completionHandler
+- (void)upOrOpenWithCompletionHandler:(StatusCompletion)completionHandler
+{
+    [self upOrOpenWithParams:nil completionHandler:completionHandler];
+}
+- (void)upOrOpenWithParams:(CHIPWindowCoveringClusterUpOrOpenParams * _Nullable)params
+         completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    Identify::Commands::Identify::Type request;
+    WindowCovering::Commands::UpOrOpen::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    request.identifyTime = params.identifyTime.unsignedShortValue;
 
     new CHIPCommandSuccessCallbackBridge(
         self.callbackQueue,
@@ -35895,21 +35872,21 @@ new CHIPCommandSuccessCallbackBridge(
         });
 }
 
-- (void)triggerEffectWithParams:(CHIPIdentifyClusterTriggerEffectParams *)params
-              completionHandler:(StatusCompletion)completionHandler
+- (void)downOrCloseWithCompletionHandler:(StatusCompletion)completionHandler
+{
+    [self downOrCloseWithParams:nil completionHandler:completionHandler];
+}
+- (void)downOrCloseWithParams:(CHIPWindowCoveringClusterDownOrCloseParams * _Nullable)params
+            completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    Identify::Commands::TriggerEffect::Type request;
+    WindowCovering::Commands::DownOrClose::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    request.effectIdentifier
-        = static_cast<std::remove_reference_t<decltype(request.effectIdentifier)>>(params.effectIdentifier.unsignedCharValue);
-    request.effectVariant
-        = static_cast<std::remove_reference_t<decltype(request.effectVariant)>>(params.effectVariant.unsignedCharValue);
 
     new CHIPCommandSuccessCallbackBridge(
         self.callbackQueue,
@@ -35924,344 +35901,191 @@ new CHIPCommandSuccessCallbackBridge(
         });
 }
 
-- (void)readAttributeIdentifyTimeWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)stopMotionWithCompletionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Identify::Attributes::IdentifyTime::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)writeAttributeIdentifyTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeIdentifyTimeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self stopMotionWithParams:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeIdentifyTimeWithValue:(NSNumber * _Nonnull)value
-                                     params:(CHIPWriteParams * _Nullable)params
-                          completionHandler:(StatusCompletion)completionHandler
+- (void)stopMotionWithParams:(CHIPWindowCoveringClusterStopMotionParams * _Nullable)params
+           completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    WindowCovering::Commands::StopMotion::Type request;
     if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
 
-    new CHIPDefaultSuccessCallbackBridge(
+    new CHIPCommandSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
+        ^(id _Nullable value, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Identify::Attributes::IdentifyTime::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeIdentifyTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = Identify::Attributes::IdentifyTime::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeIdentifyTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)goToLiftValueWithParams:(CHIPWindowCoveringClusterGoToLiftValueParams *)params
+              completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = Identify::Attributes::IdentifyTime::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    WindowCovering::Commands::GoToLiftValue::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeIdentifyTypeWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Identify::Attributes::IdentifyType::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
+    }
+    request.liftValue = params.liftValue.unsignedShortValue;
 
-- (void)subscribeAttributeIdentifyTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
         ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = Identify::Attributes::IdentifyType::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-+ (void)readAttributeIdentifyTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)goToLiftPercentageWithParams:(CHIPWindowCoveringClusterGoToLiftPercentageParams *)params
+                   completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = Identify::Attributes::IdentifyType::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    WindowCovering::Commands::GoToLiftPercentage::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
+    }
+    request.liftPercent100thsValue = params.liftPercent100thsValue.unsignedShortValue;
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
-{
-    new CHIPIdentifyGeneratedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Identify::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<IdentifyGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)goToTiltValueWithParams:(CHIPWindowCoveringClusterGoToTiltValueParams *)params
+              completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPIdentifyGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    WindowCovering::Commands::GoToTiltValue::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.tiltValue = params.tiltValue.unsignedShortValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
         ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = Identify::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<IdentifyGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPIdentifyGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPIdentifyGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = Identify::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<IdentifyGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)goToTiltPercentageWithParams:(CHIPWindowCoveringClusterGoToTiltPercentageParams *)params
+                   completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPIdentifyAcceptedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Identify::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<IdentifyAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    WindowCovering::Commands::GoToTiltPercentage::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.tiltPercent100thsValue = params.tiltPercent100thsValue.unsignedShortValue;
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPIdentifyAcceptedCommandListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
         ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = Identify::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<IdentifyAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPIdentifyAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPIdentifyAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = Identify::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<IdentifyAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPIdentifyAttributeListListAttributeCallbackBridge(
+    new CHIPWindowCoveringClusterTypeAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Identify::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<IdentifyAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::Type::TypeInfo;
+            auto successFn = Callback<WindowCoveringClusterTypeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                       params:(CHIPSubscribeParams * _Nullable)params
+                      subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPIdentifyAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPWindowCoveringClusterTypeAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Identify::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<IdentifyAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::Type::TypeInfo;
+            auto successFn = Callback<WindowCoveringClusterTypeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPIdentifyAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPWindowCoveringClusterTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                   endpoint:(NSNumber *)endpoint
+                                      queue:(dispatch_queue_t)queue
+                          completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPIdentifyAttributeListListAttributeCallbackBridge(
+    new CHIPWindowCoveringClusterTypeAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = Identify::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = WindowCovering::Attributes::Type::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<IdentifyAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<WindowCoveringClusterTypeAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -36271,57 +36095,60 @@ new CHIPIdentifyAttributeListListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributePhysicalClosedLimitLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Identify::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = WindowCovering::Attributes::PhysicalClosedLimitLift::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePhysicalClosedLimitLiftWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Identify::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::PhysicalClosedLimitLift::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePhysicalClosedLimitLiftWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Identify::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::PhysicalClosedLimitLift::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -36331,23 +36158,24 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributePhysicalClosedLimitTiltWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Identify::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = WindowCovering::Attributes::PhysicalClosedLimitTilt::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePhysicalClosedLimitTiltWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -36356,7 +36184,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Identify::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::PhysicalClosedLimitTilt::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -36368,16 +36196,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePhysicalClosedLimitTiltWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Identify::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::PhysicalClosedLimitTilt::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -36393,33 +36221,25 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPIlluminanceMeasurement
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)readAttributeMeasuredValueWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeCurrentPositionLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
     new CHIPNullableInt16uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = IlluminanceMeasurement::Attributes::MeasuredValue::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::CurrentPositionLift::TypeInfo;
             auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentPositionLiftWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -36428,7 +36248,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = IlluminanceMeasurement::Attributes::MeasuredValue::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::CurrentPositionLift::TypeInfo;
             auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -36440,16 +36260,16 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCurrentPositionLiftWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = IlluminanceMeasurement::Attributes::MeasuredValue::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::CurrentPositionLift::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -36465,24 +36285,25 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeMinMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeCurrentPositionTiltWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
     new CHIPNullableInt16uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = IlluminanceMeasurement::Attributes::MinMeasuredValue::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::CurrentPositionTilt::TypeInfo;
             auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeMinMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentPositionTiltWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -36491,7 +36312,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = IlluminanceMeasurement::Attributes::MinMeasuredValue::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::CurrentPositionTilt::TypeInfo;
             auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -36503,16 +36324,16 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMinMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCurrentPositionTiltWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = IlluminanceMeasurement::Attributes::MinMeasuredValue::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::CurrentPositionTilt::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -36528,60 +36349,60 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeMaxMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeNumberOfActuationsLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = IlluminanceMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = WindowCovering::Attributes::NumberOfActuationsLift::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeMaxMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNumberOfActuationsLiftWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:
+                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = IlluminanceMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::NumberOfActuationsLift::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMaxMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNumberOfActuationsLiftWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = IlluminanceMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::NumberOfActuationsLift::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -36591,22 +36412,24 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeToleranceWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeNumberOfActuationsTiltWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = IlluminanceMeasurement::Attributes::Tolerance::TypeInfo;
+        using TypeInfo = WindowCovering::Attributes::NumberOfActuationsTilt::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeToleranceWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNumberOfActuationsTiltWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:
+                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -36615,7 +36438,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = IlluminanceMeasurement::Attributes::Tolerance::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::NumberOfActuationsTilt::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -36627,15 +36450,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeToleranceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNumberOfActuationsTiltWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = IlluminanceMeasurement::Attributes::Tolerance::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::NumberOfActuationsTilt::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -36651,253 +36475,252 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeLightSensorTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeConfigStatusWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
+    new CHIPWindowCoveringConfigStatusAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = IlluminanceMeasurement::Attributes::LightSensorType::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::ConfigStatus::TypeInfo;
+            auto successFn = Callback<WindowCoveringConfigStatusAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeLightSensorTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeConfigStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPWindowCoveringConfigStatusAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = IlluminanceMeasurement::Attributes::LightSensorType::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::ConfigStatus::TypeInfo;
+            auto successFn = Callback<WindowCoveringConfigStatusAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPWindowCoveringConfigStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeLightSensorTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeConfigStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = IlluminanceMeasurement::Attributes::LightSensorType::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPWindowCoveringConfigStatusAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = WindowCovering::Attributes::ConfigStatus::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<WindowCoveringConfigStatusAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeCurrentPositionLiftPercentageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler
 {
-    new CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPNullableInt8uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = IlluminanceMeasurement::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<IlluminanceMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::CurrentPositionLiftPercentage::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentPositionLiftPercentageWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                params:(CHIPSubscribeParams * _Nullable)params
+                                               subscriptionEstablished:
+                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))reportHandler
 {
-    new CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = IlluminanceMeasurement::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<IlluminanceMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::CurrentPositionLiftPercentage::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCurrentPositionLiftPercentageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                            endpoint:(NSNumber *)endpoint
+                                                               queue:(dispatch_queue_t)queue
+                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler
 {
-    new CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = IlluminanceMeasurement::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<IlluminanceMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = WindowCovering::Attributes::CurrentPositionLiftPercentage::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeCurrentPositionTiltPercentageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler
 {
-    new CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPNullableInt8uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = IlluminanceMeasurement::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<IlluminanceMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::CurrentPositionTiltPercentage::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentPositionTiltPercentageWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                params:(CHIPSubscribeParams * _Nullable)params
+                                               subscriptionEstablished:
+                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))reportHandler
 {
-    new CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = IlluminanceMeasurement::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<IlluminanceMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::CurrentPositionTiltPercentage::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCurrentPositionTiltPercentageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                            endpoint:(NSNumber *)endpoint
+                                                               queue:(dispatch_queue_t)queue
+                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler
 {
-    new CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = IlluminanceMeasurement::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<IlluminanceMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = WindowCovering::Attributes::CurrentPositionTiltPercentage::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeOperationalStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPIlluminanceMeasurementAttributeListListAttributeCallbackBridge(
+    new CHIPWindowCoveringOperationalStatusAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = IlluminanceMeasurement::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<IlluminanceMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::OperationalStatus::TypeInfo;
+            auto successFn = Callback<WindowCoveringOperationalStatusAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOperationalStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPIlluminanceMeasurementAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPWindowCoveringOperationalStatusAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = IlluminanceMeasurement::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<IlluminanceMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::OperationalStatus::TypeInfo;
+            auto successFn = Callback<WindowCoveringOperationalStatusAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPIlluminanceMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPWindowCoveringOperationalStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOperationalStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPIlluminanceMeasurementAttributeListListAttributeCallbackBridge(
+    new CHIPWindowCoveringOperationalStatusAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = IlluminanceMeasurement::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = WindowCovering::Attributes::OperationalStatus::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<IlluminanceMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<WindowCoveringOperationalStatusAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -36907,57 +36730,61 @@ new CHIPIlluminanceMeasurementAttributeListListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeTargetPositionLiftPercent100thsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = IlluminanceMeasurement::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt16uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = WindowCovering::Attributes::TargetPositionLiftPercent100ths::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTargetPositionLiftPercent100thsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                                 subscriptionEstablished:
+                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = IlluminanceMeasurement::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::TargetPositionLiftPercent100ths::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTargetPositionLiftPercent100thsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                              endpoint:(NSNumber *)endpoint
+                                                                 queue:(dispatch_queue_t)queue
+                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = IlluminanceMeasurement::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::TargetPositionLiftPercent100ths::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -36967,59 +36794,61 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeTargetPositionTiltPercent100thsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = IlluminanceMeasurement::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt16uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = WindowCovering::Attributes::TargetPositionTiltPercent100ths::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTargetPositionTiltPercent100thsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                                 subscriptionEstablished:
+                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = IlluminanceMeasurement::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::TargetPositionTiltPercent100ths::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTargetPositionTiltPercent100thsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                              endpoint:(NSNumber *)endpoint
+                                                                 queue:(dispatch_queue_t)queue
+                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = IlluminanceMeasurement::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::TargetPositionTiltPercent100ths::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -37029,94 +36858,61 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPKeypadInput
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)sendKeyWithParams:(CHIPKeypadInputClusterSendKeyParams *)params
-        completionHandler:
-            (void (^)(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    KeypadInput::Commands::SendKey::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.keyCode = static_cast<std::remove_reference_t<decltype(request.keyCode)>>(params.keyCode.unsignedCharValue);
-
-    new CHIPKeypadInputClusterSendKeyResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPKeypadInputClusterSendKeyResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeEndProductTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPKeypadInputGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPWindowCoveringClusterEndProductTypeAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = KeypadInput::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<KeypadInputGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::EndProductType::TypeInfo;
+            auto successFn = Callback<WindowCoveringClusterEndProductTypeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeEndProductTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPKeypadInputGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPWindowCoveringClusterEndProductTypeAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = KeypadInput::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<KeypadInputGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::EndProductType::TypeInfo;
+            auto successFn = Callback<WindowCoveringClusterEndProductTypeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPKeypadInputGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPWindowCoveringClusterEndProductTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeEndProductTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPKeypadInputGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPWindowCoveringClusterEndProductTypeAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = KeypadInput::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = WindowCovering::Attributes::EndProductType::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<KeypadInputGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<WindowCoveringClusterEndProductTypeAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -37126,185 +36922,188 @@ new CHIPKeypadInputGeneratedCommandListListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPKeypadInputAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPNullableInt16uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = KeypadInput::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<KeypadInputAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::CurrentPositionLiftPercent100ths::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentPositionLiftPercent100thsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                                  subscriptionEstablished:
+                                                      (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                            reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))reportHandler
 {
-    new CHIPKeypadInputAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = KeypadInput::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<KeypadInputAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::CurrentPositionLiftPercent100ths::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPKeypadInputAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCurrentPositionLiftPercent100thsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                               endpoint:(NSNumber *)endpoint
+                                                                  queue:(dispatch_queue_t)queue
+                                                      completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler
 {
-    new CHIPKeypadInputAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = KeypadInput::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<KeypadInputAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = WindowCovering::Attributes::CurrentPositionLiftPercent100ths::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPKeypadInputAttributeListListAttributeCallbackBridge(
+    new CHIPNullableInt16uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = KeypadInput::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<KeypadInputAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::CurrentPositionTiltPercent100ths::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentPositionTiltPercent100thsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                                  subscriptionEstablished:
+                                                      (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                            reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))reportHandler
 {
-    new CHIPKeypadInputAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = KeypadInput::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<KeypadInputAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::CurrentPositionTiltPercent100ths::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPKeypadInputAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCurrentPositionTiltPercent100thsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                               endpoint:(NSNumber *)endpoint
+                                                                  queue:(dispatch_queue_t)queue
+                                                      completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler
 {
-    new CHIPKeypadInputAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = KeypadInput::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<KeypadInputAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = WindowCovering::Attributes::CurrentPositionTiltPercent100ths::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeInstalledOpenLimitLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = KeypadInput::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = WindowCovering::Attributes::InstalledOpenLimitLift::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeInstalledOpenLimitLiftWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:
+                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = KeypadInput::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::InstalledOpenLimitLift::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeInstalledOpenLimitLiftWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = KeypadInput::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::InstalledOpenLimitLift::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -37314,23 +37113,24 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeInstalledClosedLimitLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = KeypadInput::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = WindowCovering::Attributes::InstalledClosedLimitLift::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeInstalledClosedLimitLiftWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -37339,7 +37139,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = KeypadInput::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::InstalledClosedLimitLift::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -37351,16 +37151,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeInstalledClosedLimitLiftWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = KeypadInput::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::InstalledClosedLimitLift::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -37376,560 +37176,531 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPLevelControl
-
-- (chip::Controller::ClusterBase *)getCluster
+- (void)readAttributeInstalledOpenLimitTiltWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
-    return &_cppCluster;
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = WindowCovering::Attributes::InstalledOpenLimitTilt::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)moveToLevelWithParams:(CHIPLevelControlClusterMoveToLevelParams *)params
-            completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeInstalledOpenLimitTiltWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:
+                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    LevelControl::Commands::MoveToLevel::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.level = params.level.unsignedCharValue;
-    request.transitionTime = params.transitionTime.unsignedShortValue;
-    request.optionMask = params.optionMask.unsignedCharValue;
-    request.optionOverride = params.optionOverride.unsignedCharValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = WindowCovering::Attributes::InstalledOpenLimitTilt::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
 
-- (void)moveWithParams:(CHIPLevelControlClusterMoveParams *)params completionHandler:(StatusCompletion)completionHandler
++ (void)readAttributeInstalledOpenLimitTiltWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    LevelControl::Commands::Move::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = WindowCovering::Attributes::InstalledOpenLimitTilt::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
-    request.moveMode = static_cast<std::remove_reference_t<decltype(request.moveMode)>>(params.moveMode.unsignedCharValue);
-    request.rate = params.rate.unsignedCharValue;
-    request.optionMask = params.optionMask.unsignedCharValue;
-    request.optionOverride = params.optionOverride.unsignedCharValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)stepWithParams:(CHIPLevelControlClusterStepParams *)params completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeInstalledClosedLimitTiltWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    LevelControl::Commands::Step::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.stepMode = static_cast<std::remove_reference_t<decltype(request.stepMode)>>(params.stepMode.unsignedCharValue);
-    request.stepSize = params.stepSize.unsignedCharValue;
-    request.transitionTime = params.transitionTime.unsignedShortValue;
-    request.optionMask = params.optionMask.unsignedCharValue;
-    request.optionOverride = params.optionOverride.unsignedCharValue;
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = WindowCovering::Attributes::InstalledClosedLimitTilt::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
 
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
+- (void)subscribeAttributeInstalledClosedLimitTiltWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))reportHandler
+{
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = WindowCovering::Attributes::InstalledClosedLimitTilt::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
 
-- (void)stopWithParams:(CHIPLevelControlClusterStopParams *)params completionHandler:(StatusCompletion)completionHandler
++ (void)readAttributeInstalledClosedLimitTiltWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    LevelControl::Commands::Stop::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = WindowCovering::Attributes::InstalledClosedLimitTilt::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
-    request.optionMask = params.optionMask.unsignedCharValue;
-    request.optionOverride = params.optionOverride.unsignedCharValue;
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
 
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+- (void)readAttributeModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPWindowCoveringModeAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = WindowCovering::Attributes::Mode::TypeInfo;
+            auto successFn = Callback<WindowCoveringModeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)moveToLevelWithOnOffWithParams:(CHIPLevelControlClusterMoveToLevelWithOnOffParams *)params
-                     completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    LevelControl::Commands::MoveToLevelWithOnOff::Type request;
+    [self writeAttributeModeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeModeWithValue:(NSNumber * _Nonnull)value
+                             params:(CHIPWriteParams * _Nullable)params
+                  completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
     }
-    request.level = params.level.unsignedCharValue;
-    request.transitionTime = params.transitionTime.unsignedShortValue;
 
-    new CHIPCommandSuccessCallbackBridge(
+    new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
+        ^(id _Nullable ignored, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            ListFreer listFreer;
+            using TypeInfo = WindowCovering::Attributes::Mode::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)moveWithOnOffWithParams:(CHIPLevelControlClusterMoveWithOnOffParams *)params
-              completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                       params:(CHIPSubscribeParams * _Nullable)params
+                      subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    LevelControl::Commands::MoveWithOnOff::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.moveMode = static_cast<std::remove_reference_t<decltype(request.moveMode)>>(params.moveMode.unsignedCharValue);
-    request.rate = params.rate.unsignedCharValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
+    new CHIPWindowCoveringModeAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = WindowCovering::Attributes::Mode::TypeInfo;
+            auto successFn = Callback<WindowCoveringModeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)stepWithOnOffWithParams:(CHIPLevelControlClusterStepWithOnOffParams *)params
-              completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    LevelControl::Commands::StepWithOnOff::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.stepMode = static_cast<std::remove_reference_t<decltype(request.stepMode)>>(params.stepMode.unsignedCharValue);
-    request.stepSize = params.stepSize.unsignedCharValue;
-    request.transitionTime = params.transitionTime.unsignedShortValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPWindowCoveringModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+        subscriptionEstablishedHandler);
 }
 
-- (void)stopWithOnOffWithCompletionHandler:(StatusCompletion)completionHandler
-{
-    [self stopWithOnOffWithParams:nil completionHandler:completionHandler];
-}
-- (void)stopWithOnOffWithParams:(CHIPLevelControlClusterStopWithOnOffParams * _Nullable)params
-              completionHandler:(StatusCompletion)completionHandler
++ (void)readAttributeModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                   endpoint:(NSNumber *)endpoint
+                                      queue:(dispatch_queue_t)queue
+                          completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    LevelControl::Commands::StopWithOnOff::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+    new CHIPWindowCoveringModeAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = WindowCovering::Attributes::Mode::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<WindowCoveringModeAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)moveToClosestFrequencyWithParams:(CHIPLevelControlClusterMoveToClosestFrequencyParams *)params
-                       completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeSafetyStatusWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    LevelControl::Commands::MoveToClosestFrequency::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.frequency = params.frequency.unsignedShortValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+    new CHIPWindowCoveringSafetyStatusAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = WindowCovering::Attributes::SafetyStatus::TypeInfo;
+            auto successFn = Callback<WindowCoveringSafetyStatusAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)readAttributeCurrentLevelWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = LevelControl::Attributes::CurrentLevel::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeCurrentLevelWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeSafetyStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
                                           maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(CHIPSubscribeParams * _Nullable)params
                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                         reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPWindowCoveringSafetyStatusAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LevelControl::Attributes::CurrentLevel::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::SafetyStatus::TypeInfo;
+            auto successFn = Callback<WindowCoveringSafetyStatusAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPWindowCoveringSafetyStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentLevelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeSafetyStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                            endpoint:(NSNumber *)endpoint
                                               queue:(dispatch_queue_t)queue
                                   completionHandler:
                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = LevelControl::Attributes::CurrentLevel::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPWindowCoveringSafetyStatusAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = WindowCovering::Attributes::SafetyStatus::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<WindowCoveringSafetyStatusAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeRemainingTimeWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = LevelControl::Attributes::RemainingTime::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPWindowCoveringGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = WindowCovering::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<WindowCoveringGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeRemainingTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPWindowCoveringGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LevelControl::Attributes::RemainingTime::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<WindowCoveringGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPWindowCoveringGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRemainingTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = LevelControl::Attributes::RemainingTime::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPWindowCoveringGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = WindowCovering::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<WindowCoveringGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeMinLevelWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = LevelControl::Attributes::MinLevel::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPWindowCoveringAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = WindowCovering::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<WindowCoveringAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeMinLevelWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPWindowCoveringAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LevelControl::Attributes::MinLevel::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<WindowCoveringAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPWindowCoveringAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMinLevelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = LevelControl::Attributes::MinLevel::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPWindowCoveringAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = WindowCovering::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<WindowCoveringAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeMaxLevelWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = LevelControl::Attributes::MaxLevel::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPWindowCoveringAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = WindowCovering::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<WindowCoveringAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeMaxLevelWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPWindowCoveringAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LevelControl::Attributes::MaxLevel::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<WindowCoveringAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPWindowCoveringAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMaxLevelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = LevelControl::Attributes::MaxLevel::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPWindowCoveringAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = WindowCovering::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<WindowCoveringAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeCurrentFrequencyWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = LevelControl::Attributes::CurrentFrequency::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = WindowCovering::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeCurrentFrequencyWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LevelControl::Attributes::CurrentFrequency::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = WindowCovering::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentFrequencyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = LevelControl::Attributes::CurrentFrequency::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -37939,22 +37710,23 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeMinFrequencyWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = LevelControl::Attributes::MinFrequency::TypeInfo;
+        using TypeInfo = WindowCovering::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeMinFrequencyWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -37963,7 +37735,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LevelControl::Attributes::MinFrequency::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -37975,16 +37747,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMinFrequencyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = LevelControl::Attributes::MinFrequency::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -38000,22 +37772,150 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeMaxFrequencyWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = LevelControl::Attributes::MaxFrequency::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
+@end
 
-- (void)subscribeAttributeMaxFrequencyWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+@implementation CHIPBarrierControl
+
+- (chip::Controller::ClusterBase *)getCluster
+{
+    return &_cppCluster;
+}
+
+- (void)barrierControlGoToPercentWithParams:(CHIPBarrierControlClusterBarrierControlGoToPercentParams *)params
+                          completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    BarrierControl::Commands::BarrierControlGoToPercent::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.percentOpen = params.percentOpen.unsignedCharValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)barrierControlStopWithCompletionHandler:(StatusCompletion)completionHandler
+{
+    [self barrierControlStopWithParams:nil completionHandler:completionHandler];
+}
+- (void)barrierControlStopWithParams:(CHIPBarrierControlClusterBarrierControlStopParams * _Nullable)params
+                   completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    BarrierControl::Commands::BarrierControlStop::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)readAttributeBarrierMovingStateWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler
+{
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BarrierControl::Attributes::BarrierMovingState::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeBarrierMovingStateWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = BarrierControl::Attributes::BarrierMovingState::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeBarrierMovingStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = BarrierControl::Attributes::BarrierMovingState::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeBarrierSafetyStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BarrierControl::Attributes::BarrierSafetyStatus::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeBarrierSafetyStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -38024,7 +37924,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LevelControl::Attributes::MaxFrequency::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::BarrierSafetyStatus::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -38036,16 +37936,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMaxFrequencyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBarrierSafetyStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = LevelControl::Attributes::MaxFrequency::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::BarrierSafetyStatus::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -38061,23 +37961,87 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeOptionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeBarrierCapabilitiesWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = LevelControl::Attributes::Options::TypeInfo;
+        using TypeInfo = BarrierControl::Attributes::BarrierCapabilities::TypeInfo;
         auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeOptionsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeBarrierCapabilitiesWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeOptionsWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = BarrierControl::Attributes::BarrierCapabilities::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
-- (void)writeAttributeOptionsWithValue:(NSNumber * _Nonnull)value
-                                params:(CHIPWriteParams * _Nullable)params
-                     completionHandler:(StatusCompletion)completionHandler
+
++ (void)readAttributeBarrierCapabilitiesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = BarrierControl::Attributes::BarrierCapabilities::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeBarrierOpenEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BarrierControl::Attributes::BarrierOpenEvents::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributeBarrierOpenEventsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeBarrierOpenEventsWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeBarrierOpenEventsWithValue:(NSNumber * _Nonnull)value
+                                          params:(CHIPWriteParams * _Nullable)params
+                               completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -38093,9 +38057,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LevelControl::Attributes::Options::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::BarrierOpenEvents::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -38103,46 +38067,48 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeOptionsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBarrierOpenEventsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LevelControl::Attributes::Options::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BarrierControl::Attributes::BarrierOpenEvents::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOptionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBarrierOpenEventsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = LevelControl::Attributes::Options::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::BarrierOpenEvents::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -38152,24 +38118,24 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeOnOffTransitionTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeBarrierCloseEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = LevelControl::Attributes::OnOffTransitionTime::TypeInfo;
+        using TypeInfo = BarrierControl::Attributes::BarrierCloseEvents::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeOnOffTransitionTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBarrierCloseEventsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeOnOffTransitionTimeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self writeAttributeBarrierCloseEventsWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeOnOffTransitionTimeWithValue:(NSNumber * _Nonnull)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBarrierCloseEventsWithValue:(NSNumber * _Nonnull)value
+                                           params:(CHIPWriteParams * _Nullable)params
+                                completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -38185,7 +38151,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LevelControl::Attributes::OnOffTransitionTime::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::BarrierCloseEvents::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -38195,13 +38161,12 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeOnOffTransitionTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBarrierCloseEventsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -38210,7 +38175,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LevelControl::Attributes::OnOffTransitionTime::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::BarrierCloseEvents::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -38222,16 +38187,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOnOffTransitionTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBarrierCloseEventsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = LevelControl::Attributes::OnOffTransitionTime::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::BarrierCloseEvents::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -38247,24 +38212,27 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeOnLevelWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeBarrierCommandOpenEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = LevelControl::Attributes::OnLevel::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BarrierControl::Attributes::BarrierCommandOpenEvents::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)writeAttributeOnLevelWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBarrierCommandOpenEventsWithValue:(NSNumber * _Nonnull)value
+                                      completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeOnLevelWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+    [self writeAttributeBarrierCommandOpenEventsWithValue:(NSNumber * _Nonnull) value
+                                                   params:nil
+                                        completionHandler:completionHandler];
 }
-- (void)writeAttributeOnLevelWithValue:(NSNumber * _Nullable)value
-                                params:(CHIPWriteParams * _Nullable)params
-                     completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBarrierCommandOpenEventsWithValue:(NSNumber * _Nonnull)value
+                                                 params:(CHIPWriteParams * _Nullable)params
+                                      completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -38280,14 +38248,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LevelControl::Attributes::OnLevel::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::BarrierCommandOpenEvents::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -38295,46 +38258,49 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeOnLevelWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBarrierCommandOpenEventsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LevelControl::Attributes::OnLevel::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BarrierControl::Attributes::BarrierCommandOpenEvents::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOnLevelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBarrierCommandOpenEventsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = LevelControl::Attributes::OnLevel::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::BarrierCommandOpenEvents::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -38344,25 +38310,27 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeOnTransitionTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeBarrierCommandCloseEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = LevelControl::Attributes::OnTransitionTime::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BarrierControl::Attributes::BarrierCommandCloseEvents::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)writeAttributeOnTransitionTimeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBarrierCommandCloseEventsWithValue:(NSNumber * _Nonnull)value
+                                       completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeOnTransitionTimeWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+    [self writeAttributeBarrierCommandCloseEventsWithValue:(NSNumber * _Nonnull) value
+                                                    params:nil
+                                         completionHandler:completionHandler];
 }
-- (void)writeAttributeOnTransitionTimeWithValue:(NSNumber * _Nullable)value
-                                         params:(CHIPWriteParams * _Nullable)params
-                              completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBarrierCommandCloseEventsWithValue:(NSNumber * _Nonnull)value
+                                                  params:(CHIPWriteParams * _Nullable)params
+                                       completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -38378,14 +38346,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LevelControl::Attributes::OnTransitionTime::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::BarrierCommandCloseEvents::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -38393,48 +38356,49 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeOnTransitionTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBarrierCommandCloseEventsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                            params:(CHIPSubscribeParams * _Nullable)params
+                                           subscriptionEstablished:
+                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LevelControl::Attributes::OnTransitionTime::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BarrierControl::Attributes::BarrierCommandCloseEvents::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOnTransitionTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBarrierCommandCloseEventsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                        endpoint:(NSNumber *)endpoint
+                                                           queue:(dispatch_queue_t)queue
+                                               completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = LevelControl::Attributes::OnTransitionTime::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::BarrierCommandCloseEvents::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -38444,23 +38408,22 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeOffTransitionTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeBarrierOpenPeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = LevelControl::Attributes::OffTransitionTime::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BarrierControl::Attributes::BarrierOpenPeriod::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)writeAttributeOffTransitionTimeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBarrierOpenPeriodWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeOffTransitionTimeWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+    [self writeAttributeBarrierOpenPeriodWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeOffTransitionTimeWithValue:(NSNumber * _Nullable)value
+- (void)writeAttributeBarrierOpenPeriodWithValue:(NSNumber * _Nonnull)value
                                           params:(CHIPWriteParams * _Nullable)params
                                completionHandler:(StatusCompletion)completionHandler
 {
@@ -38478,14 +38441,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LevelControl::Attributes::OffTransitionTime::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::BarrierOpenPeriod::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -38493,48 +38451,48 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeOffTransitionTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeBarrierOpenPeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(CHIPSubscribeParams * _Nullable)params
                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                              reportHandler:
                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LevelControl::Attributes::OffTransitionTime::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BarrierControl::Attributes::BarrierOpenPeriod::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOffTransitionTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeBarrierOpenPeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                 endpoint:(NSNumber *)endpoint
                                                    queue:(dispatch_queue_t)queue
                                        completionHandler:
                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = LevelControl::Attributes::OffTransitionTime::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::BarrierOpenPeriod::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -38544,25 +38502,24 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeDefaultMoveRateWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeBarrierClosePeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = LevelControl::Attributes::DefaultMoveRate::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BarrierControl::Attributes::BarrierClosePeriod::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)writeAttributeDefaultMoveRateWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBarrierClosePeriodWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeDefaultMoveRateWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+    [self writeAttributeBarrierClosePeriodWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeDefaultMoveRateWithValue:(NSNumber * _Nullable)value
-                                        params:(CHIPWriteParams * _Nullable)params
-                             completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBarrierClosePeriodWithValue:(NSNumber * _Nonnull)value
+                                           params:(CHIPWriteParams * _Nullable)params
+                                completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -38578,14 +38535,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LevelControl::Attributes::DefaultMoveRate::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::BarrierClosePeriod::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -38593,48 +38545,48 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeDefaultMoveRateWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBarrierClosePeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LevelControl::Attributes::DefaultMoveRate::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BarrierControl::Attributes::BarrierClosePeriod::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDefaultMoveRateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBarrierClosePeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = LevelControl::Attributes::DefaultMoveRate::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::BarrierClosePeriod::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -38644,98 +38596,59 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeStartUpCurrentLevelWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt8uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = LevelControl::Attributes::StartUpCurrentLevel::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeStartUpCurrentLevelWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeStartUpCurrentLevelWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeStartUpCurrentLevelWithValue:(NSNumber * _Nullable)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeBarrierPositionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = LevelControl::Attributes::StartUpCurrentLevel::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = BarrierControl::Attributes::BarrierPosition::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeStartUpCurrentLevelWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBarrierPositionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LevelControl::Attributes::StartUpCurrentLevel::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BarrierControl::Attributes::BarrierPosition::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeStartUpCurrentLevelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBarrierPositionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = LevelControl::Attributes::StartUpCurrentLevel::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::BarrierPosition::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -38748,10 +38661,10 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPLevelControlGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPBarrierControlGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = LevelControl::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<LevelControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BarrierControl::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<BarrierControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -38765,19 +38678,19 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
                                                 reportHandler:
                                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPLevelControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPBarrierControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LevelControl::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<LevelControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BarrierControl::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<BarrierControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPLevelControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBarrierControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -38790,17 +38703,17 @@ + (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheC
                                           completionHandler:
                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPLevelControlGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPBarrierControlGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = LevelControl::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = BarrierControl::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<LevelControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<BarrierControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -38813,10 +38726,10 @@ new CHIPLevelControlGeneratedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPLevelControlAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPBarrierControlAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = LevelControl::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<LevelControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BarrierControl::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<BarrierControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -38830,19 +38743,19 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPLevelControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPBarrierControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LevelControl::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<LevelControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BarrierControl::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<BarrierControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPLevelControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBarrierControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -38855,17 +38768,17 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPLevelControlAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPBarrierControlAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = LevelControl::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = BarrierControl::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<LevelControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<BarrierControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -38878,10 +38791,10 @@ new CHIPLevelControlAcceptedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPLevelControlAttributeListListAttributeCallbackBridge(
+    new CHIPBarrierControlAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = LevelControl::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<LevelControlAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BarrierControl::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<BarrierControlAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -38893,19 +38806,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPLevelControlAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPBarrierControlAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LevelControl::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<LevelControlAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = BarrierControl::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<BarrierControlAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPLevelControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBarrierControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -38918,17 +38831,17 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPLevelControlAttributeListListAttributeCallbackBridge(
+    new CHIPBarrierControlAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = LevelControl::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = BarrierControl::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<LevelControlAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<BarrierControlAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -38942,7 +38855,7 @@ - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = LevelControl::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = BarrierControl::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -38962,7 +38875,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LevelControl::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -38982,7 +38895,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = LevelControl::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -39002,7 +38915,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = LevelControl::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = BarrierControl::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -39023,7 +38936,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LevelControl::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -39044,7 +38957,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = LevelControl::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -39062,97 +38975,66 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPLocalizationConfiguration
+@implementation CHIPPumpConfigurationAndControl
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)readAttributeActiveLocaleWithCompletionHandler:(void (^)(
-                                                           NSString * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = LocalizationConfiguration::Attributes::ActiveLocale::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)writeAttributeActiveLocaleWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeActiveLocaleWithValue:(NSString * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeActiveLocaleWithValue:(NSString * _Nonnull)value
-                                     params:(CHIPWriteParams * _Nullable)params
-                          completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeMaxPressureWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = LocalizationConfiguration::Attributes::ActiveLocale::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPNullableInt16sAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxPressure::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeActiveLocaleWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMaxPressureWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LocalizationConfiguration::Attributes::ActiveLocale::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxPressure::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeActiveLocaleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMaxPressureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = LocalizationConfiguration::Attributes::ActiveLocale::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxPressure::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -39162,316 +39044,244 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
-- (void)readAttributeSupportedLocalesWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeMaxSpeedWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackBridge(
+    new CHIPNullableInt16uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = LocalizationConfiguration::Attributes::SupportedLocales::TypeInfo;
-            auto successFn = Callback<LocalizationConfigurationSupportedLocalesListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxSpeed::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeSupportedLocalesWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMaxSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LocalizationConfiguration::Attributes::SupportedLocales::TypeInfo;
-            auto successFn = Callback<LocalizationConfigurationSupportedLocalesListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxSpeed::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSupportedLocalesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMaxSpeedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPLocalizationConfigurationSupportedLocalesListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = LocalizationConfiguration::Attributes::SupportedLocales::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<LocalizationConfigurationSupportedLocalesListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxSpeed::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeMaxFlowWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPNullableInt16uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = LocalizationConfiguration::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<LocalizationConfigurationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxFlow::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMaxFlowWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LocalizationConfiguration::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<LocalizationConfigurationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxFlow::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMaxFlowWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPLocalizationConfigurationGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = LocalizationConfiguration::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<LocalizationConfigurationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxFlow::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeMinConstPressureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPNullableInt16sAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = LocalizationConfiguration::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<LocalizationConfigurationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstPressure::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMinConstPressureWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LocalizationConfiguration::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<LocalizationConfigurationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstPressure::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMinConstPressureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPLocalizationConfigurationAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = LocalizationConfiguration::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<LocalizationConfigurationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstPressure::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeMaxConstPressureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPLocalizationConfigurationAttributeListListAttributeCallbackBridge(
+    new CHIPNullableInt16sAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = LocalizationConfiguration::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<LocalizationConfigurationAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstPressure::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPLocalizationConfigurationAttributeListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = LocalizationConfiguration::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<LocalizationConfigurationAttributeListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPLocalizationConfigurationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPLocalizationConfigurationAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = LocalizationConfiguration::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<LocalizationConfigurationAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = LocalizationConfiguration::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMaxConstPressureWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LocalizationConfiguration::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstPressure::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMaxConstPressureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = LocalizationConfiguration::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstPressure::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -39481,59 +39291,60 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeMinCompPressureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = LocalizationConfiguration::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt16sAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MinCompPressure::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeMinCompPressureWithMinInterval:(NSNumber * _Nonnull)minInterval
                                              maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(CHIPSubscribeParams * _Nullable)params
                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                            reportHandler:
                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LocalizationConfiguration::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MinCompPressure::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeMinCompPressureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                               endpoint:(NSNumber *)endpoint
                                                  queue:(dispatch_queue_t)queue
                                      completionHandler:
                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = LocalizationConfiguration::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MinCompPressure::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -39543,287 +39354,248 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPLowPower
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)sleepWithCompletionHandler:(StatusCompletion)completionHandler
-{
-    [self sleepWithParams:nil completionHandler:completionHandler];
-}
-- (void)sleepWithParams:(CHIPLowPowerClusterSleepParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    LowPower::Commands::Sleep::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeMaxCompPressureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPLowPowerGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPNullableInt16sAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = LowPower::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<LowPowerGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxCompPressure::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMaxCompPressureWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPLowPowerGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LowPower::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<LowPowerGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxCompPressure::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPLowPowerGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMaxCompPressureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPLowPowerGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = LowPower::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<LowPowerGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxCompPressure::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeMinConstSpeedWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPLowPowerAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPNullableInt16uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = LowPower::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<LowPowerAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstSpeed::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMinConstSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPLowPowerAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LowPower::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<LowPowerAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstSpeed::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPLowPowerAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMinConstSpeedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPLowPowerAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = LowPower::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<LowPowerAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstSpeed::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeMaxConstSpeedWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPLowPowerAttributeListListAttributeCallbackBridge(
+    new CHIPNullableInt16uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = LowPower::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<LowPowerAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstSpeed::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeMaxConstSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPLowPowerAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LowPower::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<LowPowerAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstSpeed::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPLowPowerAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeMaxConstSpeedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPLowPowerAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = LowPower::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<LowPowerAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstSpeed::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeMinConstFlowWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = LowPower::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt16uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstFlow::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMinConstFlowWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LowPower::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstFlow::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMinConstFlowWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = LowPower::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstFlow::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -39833,59 +39605,59 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeMaxConstFlowWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = LowPower::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt16uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstFlow::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMaxConstFlowWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = LowPower::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstFlow::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
++ (void)readAttributeMaxConstFlowWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = LowPower::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstFlow::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -39895,176 +39667,59 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPMediaInput
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)selectInputWithParams:(CHIPMediaInputClusterSelectInputParams *)params completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    MediaInput::Commands::SelectInput::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.index = params.index.unsignedCharValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)showInputStatusWithCompletionHandler:(StatusCompletion)completionHandler
-{
-    [self showInputStatusWithParams:nil completionHandler:completionHandler];
-}
-- (void)showInputStatusWithParams:(CHIPMediaInputClusterShowInputStatusParams * _Nullable)params
-                completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    MediaInput::Commands::ShowInputStatus::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)hideInputStatusWithCompletionHandler:(StatusCompletion)completionHandler
-{
-    [self hideInputStatusWithParams:nil completionHandler:completionHandler];
-}
-- (void)hideInputStatusWithParams:(CHIPMediaInputClusterHideInputStatusParams * _Nullable)params
-                completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    MediaInput::Commands::HideInputStatus::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)renameInputWithParams:(CHIPMediaInputClusterRenameInputParams *)params completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    MediaInput::Commands::RenameInput::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.index = params.index.unsignedCharValue;
-    request.name = [self asCharSpan:params.name];
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)readAttributeInputListWithCompletionHandler:(void (^)(
-                                                        NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeMinConstTempWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPMediaInputInputListListAttributeCallbackBridge(
+    new CHIPNullableInt16sAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = MediaInput::Attributes::InputList::TypeInfo;
-            auto successFn = Callback<MediaInputInputListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstTemp::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeInputListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMinConstTempWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPMediaInputInputListListAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = MediaInput::Attributes::InputList::TypeInfo;
-            auto successFn = Callback<MediaInputInputListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstTemp::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPMediaInputInputListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInputListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMinConstTempWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPMediaInputInputListListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = MediaInput::Attributes::InputList::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstTemp::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<MediaInputInputListListAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -40074,58 +39729,59 @@ new CHIPMediaInputInputListListAttributeCallbackBridge(queue, completionHandler,
     });
 }
 
-- (void)readAttributeCurrentInputWithCompletionHandler:(void (^)(
+- (void)readAttributeMaxConstTempWithCompletionHandler:(void (^)(
                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = MediaInput::Attributes::CurrentInput::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt16sAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstTemp::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeCurrentInputWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeMaxConstTempWithMinInterval:(NSNumber * _Nonnull)minInterval
                                           maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(CHIPSubscribeParams * _Nullable)params
                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                         reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = MediaInput::Attributes::CurrentInput::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstTemp::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentInputWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeMaxConstTempWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                            endpoint:(NSNumber *)endpoint
                                               queue:(dispatch_queue_t)queue
                                   completionHandler:
                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = MediaInput::Attributes::CurrentInput::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstTemp::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -40135,62 +39791,59 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributePumpStatusWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPMediaInputGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = MediaInput::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<MediaInputGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::PumpStatus::TypeInfo;
+            auto successFn = Callback<PumpConfigurationAndControlPumpStatusAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePumpStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPMediaInputGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = MediaInput::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<MediaInputGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::PumpStatus::TypeInfo;
+            auto successFn = Callback<PumpConfigurationAndControlPumpStatusAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPMediaInputGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePumpStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPMediaInputGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = MediaInput::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = PumpConfigurationAndControl::Attributes::PumpStatus::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<MediaInputGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<PumpConfigurationAndControlPumpStatusAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -40200,62 +39853,66 @@ new CHIPMediaInputGeneratedCommandListListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeEffectiveOperationModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
-    new CHIPMediaInputAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = MediaInput::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<MediaInputAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::EffectiveOperationMode::TypeInfo;
+            auto successFn
+                = Callback<PumpConfigurationAndControlClusterPumpOperationModeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeEffectiveOperationModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:
+                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPMediaInputAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = MediaInput::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<MediaInputAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::EffectiveOperationMode::TypeInfo;
+            auto successFn
+                = Callback<PumpConfigurationAndControlClusterPumpOperationModeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPMediaInputAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackSubscriptionBridge::
+                    OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeEffectiveOperationModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPMediaInputAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = MediaInput::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = PumpConfigurationAndControl::Attributes::EffectiveOperationMode::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<MediaInputAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn
+                    = Callback<PumpConfigurationAndControlClusterPumpOperationModeAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -40265,60 +39922,63 @@ new CHIPMediaInputAcceptedCommandListListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeEffectiveControlModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPMediaInputAttributeListListAttributeCallbackBridge(
+    new CHIPPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = MediaInput::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<MediaInputAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::EffectiveControlMode::TypeInfo;
+            auto successFn = Callback<PumpConfigurationAndControlClusterPumpControlModeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeEffectiveControlModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPMediaInputAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = MediaInput::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<MediaInputAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::EffectiveControlMode::TypeInfo;
+            auto successFn = Callback<PumpConfigurationAndControlClusterPumpControlModeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPMediaInputAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeEffectiveControlModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPMediaInputAttributeListListAttributeCallbackBridge(
+    new CHIPPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = MediaInput::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = PumpConfigurationAndControl::Attributes::EffectiveControlMode::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<MediaInputAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn
+                    = Callback<PumpConfigurationAndControlClusterPumpControlModeAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -40328,57 +39988,58 @@ new CHIPMediaInputAttributeListListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeCapacityWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = MediaInput::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt16sAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = PumpConfigurationAndControl::Attributes::Capacity::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCapacityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = MediaInput::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::Capacity::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCapacityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = MediaInput::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::Capacity::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -40388,59 +40049,57 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeSpeedWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = MediaInput::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt16uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = PumpConfigurationAndControl::Attributes::Speed::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                        params:(CHIPSubscribeParams * _Nullable)params
+                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = MediaInput::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::Speed::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeSpeedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                    endpoint:(NSNumber *)endpoint
+                                       queue:(dispatch_queue_t)queue
+                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = MediaInput::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::Speed::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -40450,354 +40109,363 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPMediaPlayback
-
-- (chip::Controller::ClusterBase *)getCluster
+- (void)readAttributeLifetimeRunningHoursWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    return &_cppCluster;
+    new CHIPNullableInt32uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = PumpConfigurationAndControl::Attributes::LifetimeRunningHours::TypeInfo;
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)playWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                      NSError * _Nullable error))completionHandler
+- (void)writeAttributeLifetimeRunningHoursWithValue:(NSNumber * _Nullable)value
+                                  completionHandler:(StatusCompletion)completionHandler
 {
-    [self playWithParams:nil completionHandler:completionHandler];
+    [self writeAttributeLifetimeRunningHoursWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
 }
-- (void)playWithParams:(CHIPMediaPlaybackClusterPlayParams * _Nullable)params
-     completionHandler:
-         (void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
+- (void)writeAttributeLifetimeRunningHoursWithValue:(NSNumber * _Nullable)value
+                                             params:(CHIPWriteParams * _Nullable)params
+                                  completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    MediaPlayback::Commands::Play::Type request;
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
     }
 
-    new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>::FromCancelable(success);
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::LifetimeRunningHours::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedIntValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)pauseWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                       NSError * _Nullable error))completionHandler
-{
-    [self pauseWithParams:nil completionHandler:completionHandler];
-}
-- (void)pauseWithParams:(CHIPMediaPlaybackClusterPauseParams * _Nullable)params
-      completionHandler:
-          (void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
+- (void)subscribeAttributeLifetimeRunningHoursWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    MediaPlayback::Commands::Pause::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>::FromCancelable(success);
+    new CHIPNullableInt32uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = PumpConfigurationAndControl::Attributes::LifetimeRunningHours::TypeInfo;
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
 
-- (void)stopPlaybackWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                              NSError * _Nullable error))completionHandler
-{
-    [self stopPlaybackWithParams:nil completionHandler:completionHandler];
-}
-- (void)stopPlaybackWithParams:(CHIPMediaPlaybackClusterStopPlaybackParams * _Nullable)params
-             completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                   NSError * _Nullable error))completionHandler
++ (void)readAttributeLifetimeRunningHoursWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    MediaPlayback::Commands::StopPlayback::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+    new CHIPNullableInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::LifetimeRunningHours::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
-
-    new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)startOverWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                           NSError * _Nullable error))completionHandler
-{
-    [self startOverWithParams:nil completionHandler:completionHandler];
-}
-- (void)startOverWithParams:(CHIPMediaPlaybackClusterStartOverParams * _Nullable)params
-          completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                NSError * _Nullable error))completionHandler
+- (void)readAttributePowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    MediaPlayback::Commands::StartOver::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge(
+    new CHIPNullableInt32uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::Power::TypeInfo;
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)previousWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                          NSError * _Nullable error))completionHandler
-{
-    [self previousWithParams:nil completionHandler:completionHandler];
-}
-- (void)previousWithParams:(CHIPMediaPlaybackClusterPreviousParams * _Nullable)params
-         completionHandler:
-             (void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
+- (void)subscribeAttributePowerWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                        params:(CHIPSubscribeParams * _Nullable)params
+                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    MediaPlayback::Commands::Previous::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>::FromCancelable(success);
+    new CHIPNullableInt32uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = PumpConfigurationAndControl::Attributes::Power::TypeInfo;
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
 
-- (void)nextWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                      NSError * _Nullable error))completionHandler
-{
-    [self nextWithParams:nil completionHandler:completionHandler];
-}
-- (void)nextWithParams:(CHIPMediaPlaybackClusterNextParams * _Nullable)params
-     completionHandler:
-         (void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
++ (void)readAttributePowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                    endpoint:(NSNumber *)endpoint
+                                       queue:(dispatch_queue_t)queue
+                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    MediaPlayback::Commands::Next::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+    new CHIPNullableInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::Power::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
-
-    new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)rewindWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                        NSError * _Nullable error))completionHandler
-{
-    [self rewindWithParams:nil completionHandler:completionHandler];
-}
-- (void)rewindWithParams:(CHIPMediaPlaybackClusterRewindParams * _Nullable)params
-       completionHandler:
-           (void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
+- (void)readAttributeLifetimeEnergyConsumedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    MediaPlayback::Commands::Rewind::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge(
+    new CHIPNullableInt32uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::LifetimeEnergyConsumed::TypeInfo;
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)fastForwardWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                             NSError * _Nullable error))completionHandler
+- (void)writeAttributeLifetimeEnergyConsumedWithValue:(NSNumber * _Nullable)value
+                                    completionHandler:(StatusCompletion)completionHandler
 {
-    [self fastForwardWithParams:nil completionHandler:completionHandler];
+    [self writeAttributeLifetimeEnergyConsumedWithValue:(NSNumber * _Nullable) value
+                                                 params:nil
+                                      completionHandler:completionHandler];
 }
-- (void)fastForwardWithParams:(CHIPMediaPlaybackClusterFastForwardParams * _Nullable)params
-            completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                  NSError * _Nullable error))completionHandler
+- (void)writeAttributeLifetimeEnergyConsumedWithValue:(NSNumber * _Nullable)value
+                                               params:(CHIPWriteParams * _Nullable)params
+                                    completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    MediaPlayback::Commands::FastForward::Type request;
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
     }
 
-    new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>::FromCancelable(success);
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::LifetimeEnergyConsumed::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedIntValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)skipForwardWithParams:(CHIPMediaPlaybackClusterSkipForwardParams *)params
-            completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                  NSError * _Nullable error))completionHandler
+- (void)subscribeAttributeLifetimeEnergyConsumedWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:
+                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    MediaPlayback::Commands::SkipForward::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.deltaPositionMilliseconds = params.deltaPositionMilliseconds.unsignedLongLongValue;
-
-    new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>::FromCancelable(success);
+    new CHIPNullableInt32uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = PumpConfigurationAndControl::Attributes::LifetimeEnergyConsumed::TypeInfo;
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
 
-- (void)skipBackwardWithParams:(CHIPMediaPlaybackClusterSkipBackwardParams *)params
-             completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
-                                   NSError * _Nullable error))completionHandler
++ (void)readAttributeLifetimeEnergyConsumedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    MediaPlayback::Commands::SkipBackward::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+    new CHIPNullableInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::LifetimeEnergyConsumed::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
-    request.deltaPositionMilliseconds = params.deltaPositionMilliseconds.unsignedLongLongValue;
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
 
-    new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge(
+- (void)readAttributeOperationModeWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::OperationMode::TypeInfo;
+            auto successFn
+                = Callback<PumpConfigurationAndControlClusterPumpOperationModeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)seekWithParams:(CHIPMediaPlaybackClusterSeekParams *)params
-     completionHandler:
-         (void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
+- (void)writeAttributeOperationModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    MediaPlayback::Commands::Seek::Type request;
+    [self writeAttributeOperationModeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeOperationModeWithValue:(NSNumber * _Nonnull)value
+                                      params:(CHIPWriteParams * _Nullable)params
+                           completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
     }
-    request.position = params.position.unsignedLongLongValue;
-
-    new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
 
-- (void)readAttributeCurrentStateWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = MediaPlayback::Attributes::CurrentState::TypeInfo;
-            auto successFn = Callback<MediaPlaybackClusterPlaybackStateEnumAttributeCallback>::FromCancelable(success);
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::OperationMode::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeCurrentStateWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOperationModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackSubscriptionBridge(
+    new CHIPPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = MediaPlayback::Attributes::CurrentState::TypeInfo;
-            auto successFn = Callback<MediaPlaybackClusterPlaybackStateEnumAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::OperationMode::TypeInfo;
+            auto successFn
+                = Callback<PumpConfigurationAndControlClusterPumpOperationModeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackSubscriptionBridge::
+                    OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOperationModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackBridge(
+    new CHIPPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = MediaPlayback::Attributes::CurrentState::TypeInfo;
+                using TypeInfo = PumpConfigurationAndControl::Attributes::OperationMode::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<MediaPlaybackClusterPlaybackStateEnumAttributeCallback>::FromCancelable(success);
+                auto successFn
+                    = Callback<PumpConfigurationAndControlClusterPumpOperationModeAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -40807,183 +40475,93 @@ new CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeStartTimeWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeControlModeWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt64uAttributeCallbackBridge(
+    new CHIPPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = MediaPlayback::Attributes::StartTime::TypeInfo;
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::ControlMode::TypeInfo;
+            auto successFn = Callback<PumpConfigurationAndControlClusterPumpControlModeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeStartTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeControlModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeControlModeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeControlModeWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::ControlMode::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeControlModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = MediaPlayback::Attributes::StartTime::TypeInfo;
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::ControlMode::TypeInfo;
+            auto successFn = Callback<PumpConfigurationAndControlClusterPumpControlModeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeStartTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = MediaPlayback::Attributes::StartTime::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeDurationWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt64uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = MediaPlayback::Attributes::Duration::TypeInfo;
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeDurationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = MediaPlayback::Attributes::Duration::TypeInfo;
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeDurationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = MediaPlayback::Attributes::Duration::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeSampledPositionWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
-{
-    new CHIPMediaPlaybackSampledPositionStructAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = MediaPlayback::Attributes::SampledPosition::TypeInfo;
-            auto successFn = Callback<MediaPlaybackSampledPositionStructAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeSampledPositionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value,
-                                                             NSError * _Nullable error))reportHandler
-{
-    new CHIPMediaPlaybackSampledPositionStructAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = MediaPlayback::Attributes::SampledPosition::TypeInfo;
-            auto successFn = Callback<MediaPlaybackSampledPositionStructAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPMediaPlaybackSampledPositionStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeSampledPositionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value,
-                                                           NSError * _Nullable error))completionHandler
++ (void)readAttributeControlModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPMediaPlaybackSampledPositionStructAttributeCallbackBridge(
+    new CHIPPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = MediaPlayback::Attributes::SampledPosition::TypeInfo;
+                using TypeInfo = PumpConfigurationAndControl::Attributes::ControlMode::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<MediaPlaybackSampledPositionStructAttributeCallback>::FromCancelable(success);
+                auto successFn
+                    = Callback<PumpConfigurationAndControlClusterPumpControlModeAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -40993,200 +40571,14 @@ new CHIPMediaPlaybackSampledPositionStructAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributePlaybackSpeedWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPFloatAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = MediaPlayback::Attributes::PlaybackSpeed::TypeInfo;
-        auto successFn = Callback<FloatAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributePlaybackSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPFloatAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = MediaPlayback::Attributes::PlaybackSpeed::TypeInfo;
-            auto successFn = Callback<FloatAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFloatAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributePlaybackSpeedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPFloatAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = MediaPlayback::Attributes::PlaybackSpeed::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<FloatAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeSeekRangeEndWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt64uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = MediaPlayback::Attributes::SeekRangeEnd::TypeInfo;
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeSeekRangeEndWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = MediaPlayback::Attributes::SeekRangeEnd::TypeInfo;
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeSeekRangeEndWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = MediaPlayback::Attributes::SeekRangeEnd::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeSeekRangeStartWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt64uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = MediaPlayback::Attributes::SeekRangeStart::TypeInfo;
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeSeekRangeStartWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = MediaPlayback::Attributes::SeekRangeStart::TypeInfo;
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeSeekRangeStartWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = MediaPlayback::Attributes::SeekRangeStart::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = MediaPlayback::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<MediaPlaybackGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn
+                = Callback<PumpConfigurationAndControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -41200,20 +40592,22 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
                                                 reportHandler:
                                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = MediaPlayback::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<MediaPlaybackGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn
+                = Callback<PumpConfigurationAndControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::
+                    OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -41225,17 +40619,18 @@ + (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheC
                                           completionHandler:
                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = MediaPlayback::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = PumpConfigurationAndControl::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<MediaPlaybackGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn
+                    = Callback<PumpConfigurationAndControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -41248,10 +40643,10 @@ new CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = MediaPlayback::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<MediaPlaybackAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<PumpConfigurationAndControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -41265,20 +40660,21 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = MediaPlayback::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<MediaPlaybackAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<PumpConfigurationAndControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::
+                    OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -41290,17 +40686,18 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = MediaPlayback::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = PumpConfigurationAndControl::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<MediaPlaybackAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn
+                    = Callback<PumpConfigurationAndControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -41313,10 +40710,10 @@ new CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPMediaPlaybackAttributeListListAttributeCallbackBridge(
+    new CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = MediaPlayback::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<MediaPlaybackAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<PumpConfigurationAndControlAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -41328,19 +40725,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPMediaPlaybackAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = MediaPlayback::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<MediaPlaybackAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PumpConfigurationAndControl::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<PumpConfigurationAndControlAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPMediaPlaybackAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -41353,17 +40750,17 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPMediaPlaybackAttributeListListAttributeCallbackBridge(
+    new CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = MediaPlayback::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = PumpConfigurationAndControl::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<MediaPlaybackAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<PumpConfigurationAndControlAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -41377,7 +40774,7 @@ - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = MediaPlayback::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = PumpConfigurationAndControl::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -41397,7 +40794,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = MediaPlayback::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -41417,7 +40814,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = MediaPlayback::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -41437,7 +40834,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = MediaPlayback::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = PumpConfigurationAndControl::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -41458,7 +40855,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = MediaPlayback::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -41479,7 +40876,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = MediaPlayback::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -41497,25 +40894,26 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPModeSelect
+@implementation CHIPThermostat
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)changeToModeWithParams:(CHIPModeSelectClusterChangeToModeParams *)params
-             completionHandler:(StatusCompletion)completionHandler
+- (void)setpointRaiseLowerWithParams:(CHIPThermostatClusterSetpointRaiseLowerParams *)params
+                   completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    ModeSelect::Commands::ChangeToMode::Type request;
+    Thermostat::Commands::SetpointRaiseLower::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    request.newMode = params.newMode.unsignedCharValue;
+    request.mode = static_cast<std::remove_reference_t<decltype(request.mode)>>(params.mode.unsignedCharValue);
+    request.amount = params.amount.charValue;
 
     new CHIPCommandSuccessCallbackBridge(
         self.callbackQueue,
@@ -41530,121 +40928,179 @@ new CHIPCommandSuccessCallbackBridge(
         });
 }
 
-- (void)readAttributeDescriptionWithCompletionHandler:(void (^)(
-                                                          NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)setWeeklyScheduleWithParams:(CHIPThermostatClusterSetWeeklyScheduleParams *)params
+                  completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ModeSelect::Attributes::Description::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    Thermostat::Commands::SetWeeklySchedule::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.numberOfTransitionsForSequence = params.numberOfTransitionsForSequence.unsignedCharValue;
+    request.dayOfWeekForSequence = static_cast<std::remove_reference_t<decltype(request.dayOfWeekForSequence)>>(
+        params.dayOfWeekForSequence.unsignedCharValue);
+    request.modeForSequence
+        = static_cast<std::remove_reference_t<decltype(request.modeForSequence)>>(params.modeForSequence.unsignedCharValue);
+    {
+        using ListType_0 = std::remove_reference_t<decltype(request.transitions)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        if (params.transitions.count != 0) {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.transitions.count);
+            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return;
+            }
+            listFreer.add(listHolder_0);
+            for (size_t i_0 = 0; i_0 < params.transitions.count; ++i_0) {
+                if (![params.transitions[i_0] isKindOfClass:[CHIPThermostatClusterThermostatScheduleTransition class]]) {
+                    // Wrong kind of value.
+                    return;
+                }
+                auto element_0 = (CHIPThermostatClusterThermostatScheduleTransition *) params.transitions[i_0];
+                listHolder_0->mList[i_0].transitionTime = element_0.transitionTime.unsignedShortValue;
+                if (element_0.heatSetpoint == nil) {
+                    listHolder_0->mList[i_0].heatSetpoint.SetNull();
+                } else {
+                    auto & nonNullValue_2 = listHolder_0->mList[i_0].heatSetpoint.SetNonNull();
+                    nonNullValue_2 = element_0.heatSetpoint.shortValue;
+                }
+                if (element_0.coolSetpoint == nil) {
+                    listHolder_0->mList[i_0].coolSetpoint.SetNull();
+                } else {
+                    auto & nonNullValue_2 = listHolder_0->mList[i_0].coolSetpoint.SetNonNull();
+                    nonNullValue_2 = element_0.coolSetpoint.shortValue;
+                }
+            }
+            request.transitions = ListType_0(listHolder_0->mList, params.transitions.count);
+        } else {
+            request.transitions = ListType_0();
+        }
+    }
 
-- (void)subscribeAttributeDescriptionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
         ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = ModeSelect::Attributes::Description::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-+ (void)readAttributeDescriptionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)getWeeklyScheduleWithParams:(CHIPThermostatClusterGetWeeklyScheduleParams *)params
+                  completionHandler:(void (^)(CHIPThermostatClusterGetWeeklyScheduleResponseParams * _Nullable data,
+                                        NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ModeSelect::Attributes::Description::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    Thermostat::Commands::GetWeeklySchedule::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+    }
+    request.daysToReturn
+        = static_cast<std::remove_reference_t<decltype(request.daysToReturn)>>(params.daysToReturn.unsignedCharValue);
+    request.modeToReturn
+        = static_cast<std::remove_reference_t<decltype(request.modeToReturn)>>(params.modeToReturn.unsignedCharValue);
+
+    new CHIPThermostatClusterGetWeeklyScheduleResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPThermostatClusterGetWeeklyScheduleResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-- (void)readAttributeStandardNamespaceWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)clearWeeklyScheduleWithCompletionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(
+    [self clearWeeklyScheduleWithParams:nil completionHandler:completionHandler];
+}
+- (void)clearWeeklyScheduleWithParams:(CHIPThermostatClusterClearWeeklyScheduleParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    Thermostat::Commands::ClearWeeklySchedule::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)readAttributeLocalTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
+{
+    new CHIPNullableInt16sAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ModeSelect::Attributes::StandardNamespace::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::LocalTemperature::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeStandardNamespaceWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeLocalTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ModeSelect::Attributes::StandardNamespace::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::LocalTemperature::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeStandardNamespaceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeLocalTemperatureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ModeSelect::Attributes::StandardNamespace::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::LocalTemperature::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -41654,86 +41110,85 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeSupportedModesWithCompletionHandler:(void (^)(
-                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeOutdoorTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPModeSelectSupportedModesListAttributeCallbackBridge(
+    new CHIPNullableInt16sAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ModeSelect::Attributes::SupportedModes::TypeInfo;
-            auto successFn = Callback<ModeSelectSupportedModesListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::OutdoorTemperature::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeSupportedModesWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOutdoorTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPModeSelectSupportedModesListAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ModeSelect::Attributes::SupportedModes::TypeInfo;
-            auto successFn = Callback<ModeSelectSupportedModesListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::OutdoorTemperature::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPModeSelectSupportedModesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSupportedModesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOutdoorTemperatureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPModeSelectSupportedModesListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = ModeSelect::Attributes::SupportedModes::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ModeSelectSupportedModesListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Thermostat::Attributes::OutdoorTemperature::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeCurrentModeWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeOccupancyWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ModeSelect::Attributes::CurrentMode::TypeInfo;
+        using TypeInfo = Thermostat::Attributes::Occupancy::TypeInfo;
         auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeCurrentModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOccupancyWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -41742,7 +41197,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ModeSelect::Attributes::CurrentMode::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::Occupancy::TypeInfo;
             auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -41754,16 +41209,15 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOccupancyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ModeSelect::Attributes::CurrentMode::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::Occupancy::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -41779,96 +41233,60 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeStartUpModeWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt8uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ModeSelect::Attributes::StartUpMode::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeStartUpModeWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeAbsMinHeatSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ModeSelect::Attributes::StartUpMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::AbsMinHeatSetpointLimit::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeStartUpModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAbsMinHeatSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ModeSelect::Attributes::StartUpMode::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::AbsMinHeatSetpointLimit::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeStartUpModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAbsMinHeatSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ModeSelect::Attributes::StartUpMode::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::AbsMinHeatSetpointLimit::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -41878,94 +41296,60 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeOnModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt8uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ModeSelect::Attributes::OnMode::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeOnModeWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeAbsMaxHeatSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ModeSelect::Attributes::OnMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::AbsMaxHeatSetpointLimit::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeOnModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAbsMaxHeatSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ModeSelect::Attributes::OnMode::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::AbsMaxHeatSetpointLimit::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOnModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAbsMaxHeatSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ModeSelect::Attributes::OnMode::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::AbsMaxHeatSetpointLimit::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -41975,250 +41359,185 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeAbsMinCoolSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPModeSelectGeneratedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ModeSelect::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<ModeSelectGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::AbsMinCoolSetpointLimit::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAbsMinCoolSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler
 {
-    new CHIPModeSelectGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ModeSelect::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<ModeSelectGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::AbsMinCoolSetpointLimit::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPModeSelectGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAbsMinCoolSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPModeSelectGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = ModeSelect::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ModeSelectGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Thermostat::Attributes::AbsMinCoolSetpointLimit::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeAbsMaxCoolSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPModeSelectAcceptedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ModeSelect::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<ModeSelectAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::AbsMaxCoolSetpointLimit::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAbsMaxCoolSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler
 {
-    new CHIPModeSelectAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ModeSelect::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<ModeSelectAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPModeSelectAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPModeSelectAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = ModeSelect::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ModeSelectAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPModeSelectAttributeListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ModeSelect::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<ModeSelectAttributeListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPModeSelectAttributeListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = ModeSelect::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<ModeSelectAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::AbsMaxCoolSetpointLimit::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPModeSelectAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAbsMaxCoolSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPModeSelectAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = ModeSelect::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ModeSelectAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Thermostat::Attributes::AbsMaxCoolSetpointLimit::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributePICoolingDemandWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ModeSelect::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::PICoolingDemand::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePICoolingDemandWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ModeSelect::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::PICoolingDemand::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePICoolingDemandWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ModeSelect::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::PICoolingDemand::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -42228,59 +41547,59 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributePIHeatingDemandWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ModeSelect::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::PIHeatingDemand::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributePIHeatingDemandWithMinInterval:(NSNumber * _Nonnull)minInterval
                                              maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(CHIPSubscribeParams * _Nullable)params
                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                            reportHandler:
                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ModeSelect::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::PIHeatingDemand::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributePIHeatingDemandWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                               endpoint:(NSNumber *)endpoint
                                                  queue:(dispatch_queue_t)queue
                                      completionHandler:
                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ModeSelect::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::PIHeatingDemand::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -42290,205 +41609,59 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPNetworkCommissioning
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)scanNetworksWithParams:(CHIPNetworkCommissioningClusterScanNetworksParams * _Nullable)params
-             completionHandler:(void (^)(CHIPNetworkCommissioningClusterScanNetworksResponseParams * _Nullable data,
-                                   NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    NetworkCommissioning::Commands::ScanNetworks::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    if (params != nil) {
-        if (params.ssid != nil) {
-            auto & definedValue_0 = request.ssid.Emplace();
-            if (params.ssid == nil) {
-                definedValue_0.SetNull();
-            } else {
-                auto & nonNullValue_1 = definedValue_0.SetNonNull();
-                nonNullValue_1 = [self asByteSpan:params.ssid];
-            }
-        }
-        if (params.breadcrumb != nil) {
-            auto & definedValue_0 = request.breadcrumb.Emplace();
-            definedValue_0 = params.breadcrumb.unsignedLongLongValue;
-        }
-    }
-
-    new CHIPNetworkCommissioningClusterScanNetworksResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPNetworkCommissioningClusterScanNetworksResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)addOrUpdateWiFiNetworkWithParams:(CHIPNetworkCommissioningClusterAddOrUpdateWiFiNetworkParams *)params
-                       completionHandler:(void (^)(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data,
-                                             NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    NetworkCommissioning::Commands::AddOrUpdateWiFiNetwork::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.ssid = [self asByteSpan:params.ssid];
-    request.credentials = [self asByteSpan:params.credentials];
-    if (params.breadcrumb != nil) {
-        auto & definedValue_0 = request.breadcrumb.Emplace();
-        definedValue_0 = params.breadcrumb.unsignedLongLongValue;
-    }
-
-    new CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)addOrUpdateThreadNetworkWithParams:(CHIPNetworkCommissioningClusterAddOrUpdateThreadNetworkParams *)params
-                         completionHandler:(void (^)(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data,
-                                               NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    NetworkCommissioning::Commands::AddOrUpdateThreadNetwork::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.operationalDataset = [self asByteSpan:params.operationalDataset];
-    if (params.breadcrumb != nil) {
-        auto & definedValue_0 = request.breadcrumb.Emplace();
-        definedValue_0 = params.breadcrumb.unsignedLongLongValue;
-    }
-
-    new CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)removeNetworkWithParams:(CHIPNetworkCommissioningClusterRemoveNetworkParams *)params
-              completionHandler:(void (^)(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data,
-                                    NSError * _Nullable error))completionHandler
+- (void)readAttributeHVACSystemTypeConfigurationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    NetworkCommissioning::Commands::RemoveNetwork::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.networkID = [self asByteSpan:params.networkID];
-    if (params.breadcrumb != nil) {
-        auto & definedValue_0 = request.breadcrumb.Emplace();
-        definedValue_0 = params.breadcrumb.unsignedLongLongValue;
-    }
-
-    new CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::HVACSystemTypeConfiguration::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)connectNetworkWithParams:(CHIPNetworkCommissioningClusterConnectNetworkParams *)params
-               completionHandler:(void (^)(CHIPNetworkCommissioningClusterConnectNetworkResponseParams * _Nullable data,
-                                     NSError * _Nullable error))completionHandler
+- (void)writeAttributeHVACSystemTypeConfigurationWithValue:(NSNumber * _Nonnull)value
+                                         completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    NetworkCommissioning::Commands::ConnectNetwork::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.networkID = [self asByteSpan:params.networkID];
-    if (params.breadcrumb != nil) {
-        auto & definedValue_0 = request.breadcrumb.Emplace();
-        definedValue_0 = params.breadcrumb.unsignedLongLongValue;
-    }
-
-    new CHIPNetworkCommissioningClusterConnectNetworkResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPNetworkCommissioningClusterConnectNetworkResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+    [self writeAttributeHVACSystemTypeConfigurationWithValue:(NSNumber * _Nonnull) value
+                                                      params:nil
+                                           completionHandler:completionHandler];
 }
-
-- (void)reorderNetworkWithParams:(CHIPNetworkCommissioningClusterReorderNetworkParams *)params
-               completionHandler:(void (^)(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data,
-                                     NSError * _Nullable error))completionHandler
+- (void)writeAttributeHVACSystemTypeConfigurationWithValue:(NSNumber * _Nonnull)value
+                                                    params:(CHIPWriteParams * _Nullable)params
+                                         completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    NetworkCommissioning::Commands::ReorderNetwork::Type request;
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
     }
-    request.networkID = [self asByteSpan:params.networkID];
-    request.networkIndex = params.networkIndex.unsignedCharValue;
-    if (params.breadcrumb != nil) {
-        auto & definedValue_0 = request.breadcrumb.Emplace();
-        definedValue_0 = params.breadcrumb.unsignedLongLongValue;
-    }
 
-    new CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackType>::FromCancelable(success);
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Thermostat::Attributes::HVACSystemTypeConfiguration::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)readAttributeMaxNetworksWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = NetworkCommissioning::Attributes::MaxNetworks::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeMaxNetworksWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeHVACSystemTypeConfigurationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                              params:(CHIPSubscribeParams * _Nullable)params
+                                             subscriptionEstablished:
+                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))reportHandler
 {
     new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -42497,7 +41670,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = NetworkCommissioning::Attributes::MaxNetworks::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::HVACSystemTypeConfiguration::TypeInfo;
             auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -42509,16 +41682,16 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMaxNetworksWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeHVACSystemTypeConfigurationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                          endpoint:(NSNumber *)endpoint
+                                                             queue:(dispatch_queue_t)queue
+                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = NetworkCommissioning::Attributes::MaxNetworks::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::HVACSystemTypeConfiguration::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -42534,120 +41707,95 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeNetworksWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeLocalTemperatureCalibrationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))completionHandler
 {
-    new CHIPNetworkCommissioningNetworksListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = NetworkCommissioning::Attributes::Networks::TypeInfo;
-            auto successFn = Callback<NetworkCommissioningNetworksListAttributeCallback>::FromCancelable(success);
+    new CHIPInt8sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::LocalTemperatureCalibration::TypeInfo;
+        auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributeLocalTemperatureCalibrationWithValue:(NSNumber * _Nonnull)value
+                                         completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeLocalTemperatureCalibrationWithValue:(NSNumber * _Nonnull) value
+                                                      params:nil
+                                           completionHandler:completionHandler];
+}
+- (void)writeAttributeLocalTemperatureCalibrationWithValue:(NSNumber * _Nonnull)value
+                                                    params:(CHIPWriteParams * _Nullable)params
+                                         completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Thermostat::Attributes::LocalTemperatureCalibration::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.charValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeNetworksWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeLocalTemperatureCalibrationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                              params:(CHIPSubscribeParams * _Nullable)params
+                                             subscriptionEstablished:
+                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))reportHandler
 {
-    new CHIPNetworkCommissioningNetworksListAttributeCallbackSubscriptionBridge(
+    new CHIPInt8sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = NetworkCommissioning::Attributes::Networks::TypeInfo;
-            auto successFn = Callback<NetworkCommissioningNetworksListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::LocalTemperatureCalibration::TypeInfo;
+            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNetworkCommissioningNetworksListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNetworksWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeLocalTemperatureCalibrationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                          endpoint:(NSNumber *)endpoint
+                                                             queue:(dispatch_queue_t)queue
+                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler
 {
-    new CHIPNetworkCommissioningNetworksListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = NetworkCommissioning::Attributes::Networks::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<NetworkCommissioningNetworksListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeScanMaxTimeSecondsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler
-{
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = NetworkCommissioning::Attributes::ScanMaxTimeSeconds::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeScanMaxTimeSecondsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = NetworkCommissioning::Attributes::ScanMaxTimeSeconds::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeScanMaxTimeSecondsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = NetworkCommissioning::Attributes::ScanMaxTimeSeconds::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::LocalTemperatureCalibration::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -42657,60 +41805,95 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeConnectMaxTimeSecondsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler
+- (void)readAttributeOccupiedCoolingSetpointWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = NetworkCommissioning::Attributes::ConnectMaxTimeSeconds::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::OccupiedCoolingSetpoint::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeConnectMaxTimeSecondsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeOccupiedCoolingSetpointWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeOccupiedCoolingSetpointWithValue:(NSNumber * _Nonnull) value
+                                                  params:nil
+                                       completionHandler:completionHandler];
+}
+- (void)writeAttributeOccupiedCoolingSetpointWithValue:(NSNumber * _Nonnull)value
+                                                params:(CHIPWriteParams * _Nullable)params
+                                     completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Thermostat::Attributes::OccupiedCoolingSetpoint::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.shortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeOccupiedCoolingSetpointWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler
+{
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = NetworkCommissioning::Attributes::ConnectMaxTimeSeconds::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::OccupiedCoolingSetpoint::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeConnectMaxTimeSecondsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOccupiedCoolingSetpointWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = NetworkCommissioning::Attributes::ConnectMaxTimeSeconds::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::OccupiedCoolingSetpoint::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -42720,24 +41903,27 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeInterfaceEnabledWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeOccupiedHeatingSetpointWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = NetworkCommissioning::Attributes::InterfaceEnabled::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::OccupiedHeatingSetpoint::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeInterfaceEnabledWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOccupiedHeatingSetpointWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeInterfaceEnabledWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self writeAttributeOccupiedHeatingSetpointWithValue:(NSNumber * _Nonnull) value
+                                                  params:nil
+                                       completionHandler:completionHandler];
 }
-- (void)writeAttributeInterfaceEnabledWithValue:(NSNumber * _Nonnull)value
-                                         params:(CHIPWriteParams * _Nullable)params
-                              completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOccupiedHeatingSetpointWithValue:(NSNumber * _Nonnull)value
+                                                params:(CHIPWriteParams * _Nullable)params
+                                     completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -42753,9 +41939,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = NetworkCommissioning::Attributes::InterfaceEnabled::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::OccupiedHeatingSetpoint::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -42763,48 +41949,49 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeInterfaceEnabledWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOccupiedHeatingSetpointWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = NetworkCommissioning::Attributes::InterfaceEnabled::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::OccupiedHeatingSetpoint::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInterfaceEnabledWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOccupiedHeatingSetpointWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = NetworkCommissioning::Attributes::InterfaceEnabled::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::OccupiedHeatingSetpoint::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -42814,129 +42001,95 @@ new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable *
     });
 }
 
-- (void)readAttributeLastNetworkingStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeUnoccupiedCoolingSetpointWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = NetworkCommissioning::Attributes::LastNetworkingStatus::TypeInfo;
-            auto successFn
-                = Callback<NullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::UnoccupiedCoolingSetpoint::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeLastNetworkingStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeUnoccupiedCoolingSetpointWithValue:(NSNumber * _Nonnull)value
+                                       completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPNullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = NetworkCommissioning::Attributes::LastNetworkingStatus::TypeInfo;
-            auto successFn
-                = Callback<NullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackSubscriptionBridge::
-                    OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+    [self writeAttributeUnoccupiedCoolingSetpointWithValue:(NSNumber * _Nonnull) value
+                                                    params:nil
+                                         completionHandler:completionHandler];
 }
-
-+ (void)readAttributeLastNetworkingStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeUnoccupiedCoolingSetpointWithValue:(NSNumber * _Nonnull)value
+                                                  params:(CHIPWriteParams * _Nullable)params
+                                       completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPNullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = NetworkCommissioning::Attributes::LastNetworkingStatus::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<NullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallback>::FromCancelable(
-                        success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
 
-- (void)readAttributeLastNetworkIDWithCompletionHandler:(void (^)(
-                                                            NSData * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableOctetStringAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = NetworkCommissioning::Attributes::LastNetworkID::TypeInfo;
-            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Thermostat::Attributes::UnoccupiedCoolingSetpoint::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.shortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeLastNetworkIDWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeUnoccupiedCoolingSetpointWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                            params:(CHIPSubscribeParams * _Nullable)params
+                                           subscriptionEstablished:
+                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableOctetStringAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = NetworkCommissioning::Attributes::LastNetworkID::TypeInfo;
-            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::UnoccupiedCoolingSetpoint::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeLastNetworkIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeUnoccupiedCoolingSetpointWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                        endpoint:(NSNumber *)endpoint
+                                                           queue:(dispatch_queue_t)queue
+                                               completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableOctetStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = NetworkCommissioning::Attributes::LastNetworkID::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::UnoccupiedCoolingSetpoint::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -42946,61 +42099,95 @@ new CHIPNullableOctetStringAttributeCallbackBridge(queue, completionHandler, ^(C
     });
 }
 
-- (void)readAttributeLastConnectErrorValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler
+- (void)readAttributeUnoccupiedHeatingSetpointWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt32sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = NetworkCommissioning::Attributes::LastConnectErrorValue::TypeInfo;
-            auto successFn = Callback<NullableInt32sAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::UnoccupiedHeatingSetpoint::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributeUnoccupiedHeatingSetpointWithValue:(NSNumber * _Nonnull)value
+                                       completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeUnoccupiedHeatingSetpointWithValue:(NSNumber * _Nonnull) value
+                                                    params:nil
+                                         completionHandler:completionHandler];
+}
+- (void)writeAttributeUnoccupiedHeatingSetpointWithValue:(NSNumber * _Nonnull)value
+                                                  params:(CHIPWriteParams * _Nullable)params
+                                       completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Thermostat::Attributes::UnoccupiedHeatingSetpoint::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.shortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeLastConnectErrorValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeUnoccupiedHeatingSetpointWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                            params:(CHIPSubscribeParams * _Nullable)params
+                                           subscriptionEstablished:
+                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt32sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = NetworkCommissioning::Attributes::LastConnectErrorValue::TypeInfo;
-            auto successFn = Callback<NullableInt32sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::UnoccupiedHeatingSetpoint::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeLastConnectErrorValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeUnoccupiedHeatingSetpointWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                        endpoint:(NSNumber *)endpoint
+                                                           queue:(dispatch_queue_t)queue
+                                               completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt32sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = NetworkCommissioning::Attributes::LastConnectErrorValue::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::UnoccupiedHeatingSetpoint::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt32sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -43010,250 +42197,377 @@ new CHIPNullableInt32sAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+- (void)readAttributeMinHeatSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = NetworkCommissioning::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<NetworkCommissioningGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::MinHeatSetpointLimit::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributeMinHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeMinHeatSetpointLimitWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeMinHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value
+                                             params:(CHIPWriteParams * _Nullable)params
+                                  completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Thermostat::Attributes::MinHeatSetpointLimit::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.shortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeMinHeatSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(CHIPSubscribeParams * _Nullable)params
                                       subscriptionEstablished:
                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                 reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = NetworkCommissioning::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<NetworkCommissioningGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::MinHeatSetpointLimit::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeMinHeatSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                    endpoint:(NSNumber *)endpoint
                                                       queue:(dispatch_queue_t)queue
                                           completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNetworkCommissioningGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = NetworkCommissioning::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<NetworkCommissioningGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Thermostat::Attributes::MinHeatSetpointLimit::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeMaxHeatSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = NetworkCommissioning::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<NetworkCommissioningAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::MaxHeatSetpointLimit::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributeMaxHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeMaxHeatSetpointLimitWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeMaxHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value
+                                             params:(CHIPWriteParams * _Nullable)params
+                                  completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Thermostat::Attributes::MaxHeatSetpointLimit::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.shortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMaxHeatSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = NetworkCommissioning::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<NetworkCommissioningAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::MaxHeatSetpointLimit::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMaxHeatSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNetworkCommissioningAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = NetworkCommissioning::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<NetworkCommissioningAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Thermostat::Attributes::MaxHeatSetpointLimit::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeMinCoolSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPNetworkCommissioningAttributeListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = NetworkCommissioning::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<NetworkCommissioningAttributeListListAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::MinCoolSetpointLimit::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributeMinCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeMinCoolSetpointLimitWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeMinCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value
+                                             params:(CHIPWriteParams * _Nullable)params
+                                  completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Thermostat::Attributes::MinCoolSetpointLimit::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.shortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMinCoolSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNetworkCommissioningAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = NetworkCommissioning::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<NetworkCommissioningAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::MinCoolSetpointLimit::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNetworkCommissioningAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMinCoolSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNetworkCommissioningAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = NetworkCommissioning::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<NetworkCommissioningAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Thermostat::Attributes::MinCoolSetpointLimit::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeMaxCoolSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = NetworkCommissioning::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::MaxCoolSetpointLimit::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeMaxCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeMaxCoolSetpointLimitWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeMaxCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value
+                                             params:(CHIPWriteParams * _Nullable)params
+                                  completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Thermostat::Attributes::MaxCoolSetpointLimit::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.shortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeMaxCoolSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = NetworkCommissioning::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::MaxCoolSetpointLimit::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMaxCoolSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = NetworkCommissioning::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::MaxCoolSetpointLimit::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -43263,59 +42577,92 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeMinSetpointDeadBandWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = NetworkCommissioning::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::MinSetpointDeadBand::TypeInfo;
+        auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeMinSetpointDeadBandWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeMinSetpointDeadBandWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeMinSetpointDeadBandWithValue:(NSNumber * _Nonnull)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Thermostat::Attributes::MinSetpointDeadBand::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.charValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeMinSetpointDeadBandWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt8sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = NetworkCommissioning::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::MinSetpointDeadBand::TypeInfo;
+            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMinSetpointDeadBandWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = NetworkCommissioning::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::MinSetpointDeadBand::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -43325,316 +42672,191 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPOtaSoftwareUpdateProvider
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)queryImageWithParams:(CHIPOtaSoftwareUpdateProviderClusterQueryImageParams *)params
-           completionHandler:(void (^)(CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseParams * _Nullable data,
-                                 NSError * _Nullable error))completionHandler
+- (void)readAttributeRemoteSensingWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    OtaSoftwareUpdateProvider::Commands::QueryImage::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.vendorId = static_cast<std::remove_reference_t<decltype(request.vendorId)>>(params.vendorId.unsignedShortValue);
-    request.productId = params.productId.unsignedShortValue;
-    request.softwareVersion = params.softwareVersion.unsignedIntValue;
-    {
-        using ListType_0 = std::remove_reference_t<decltype(request.protocolsSupported)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        if (params.protocolsSupported.count != 0) {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.protocolsSupported.count);
-            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                return;
-            }
-            listFreer.add(listHolder_0);
-            for (size_t i_0 = 0; i_0 < params.protocolsSupported.count; ++i_0) {
-                if (![params.protocolsSupported[i_0] isKindOfClass:[NSNumber class]]) {
-                    // Wrong kind of value.
-                    return;
-                }
-                auto element_0 = (NSNumber *) params.protocolsSupported[i_0];
-                listHolder_0->mList[i_0]
-                    = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0])>>(element_0.unsignedCharValue);
-            }
-            request.protocolsSupported = ListType_0(listHolder_0->mList, params.protocolsSupported.count);
-        } else {
-            request.protocolsSupported = ListType_0();
-        }
-    }
-    if (params.hardwareVersion != nil) {
-        auto & definedValue_0 = request.hardwareVersion.Emplace();
-        definedValue_0 = params.hardwareVersion.unsignedShortValue;
-    }
-    if (params.location != nil) {
-        auto & definedValue_0 = request.location.Emplace();
-        definedValue_0 = [self asCharSpan:params.location];
-    }
-    if (params.requestorCanConsent != nil) {
-        auto & definedValue_0 = request.requestorCanConsent.Emplace();
-        definedValue_0 = params.requestorCanConsent.boolValue;
-    }
-    if (params.metadataForProvider != nil) {
-        auto & definedValue_0 = request.metadataForProvider.Emplace();
-        definedValue_0 = [self asByteSpan:params.metadataForProvider];
-    }
-
-    new CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::RemoteSensing::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)applyUpdateRequestWithParams:(CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestParams *)params
-                   completionHandler:(void (^)(CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseParams * _Nullable data,
-                                         NSError * _Nullable error))completionHandler
+- (void)writeAttributeRemoteSensingWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    OtaSoftwareUpdateProvider::Commands::ApplyUpdateRequest::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.updateToken = [self asByteSpan:params.updateToken];
-    request.newVersion = params.newVersion.unsignedIntValue;
-
-    new CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+    [self writeAttributeRemoteSensingWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-
-- (void)notifyUpdateAppliedWithParams:(CHIPOtaSoftwareUpdateProviderClusterNotifyUpdateAppliedParams *)params
-                    completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRemoteSensingWithValue:(NSNumber * _Nonnull)value
+                                      params:(CHIPWriteParams * _Nullable)params
+                           completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    OtaSoftwareUpdateProvider::Commands::NotifyUpdateApplied::Type request;
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
     }
-    request.updateToken = [self asByteSpan:params.updateToken];
-    request.softwareVersion = params.softwareVersion.unsignedIntValue;
 
-    new CHIPCommandSuccessCallbackBridge(
+    new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
+        ^(id _Nullable ignored, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            ListFreer listFreer;
+            using TypeInfo = Thermostat::Attributes::RemoteSensing::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
-{
-    new CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<OtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRemoteSensingWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<OtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::RemoteSensing::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRemoteSensingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPOtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = OtaSoftwareUpdateProvider::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<OtaSoftwareUpdateProviderGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Thermostat::Attributes::RemoteSensing::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeControlSequenceOfOperationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler
 {
-    new CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPThermostatClusterThermostatControlSequenceAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<OtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::ControlSequenceOfOperation::TypeInfo;
+            auto successFn = Callback<ThermostatClusterThermostatControlSequenceAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeControlSequenceOfOperationWithValue:(NSNumber * _Nonnull)value
+                                        completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<OtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+    [self writeAttributeControlSequenceOfOperationWithValue:(NSNumber * _Nonnull) value
+                                                     params:nil
+                                          completionHandler:completionHandler];
 }
-
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeControlSequenceOfOperationWithValue:(NSNumber * _Nonnull)value
+                                                   params:(CHIPWriteParams * _Nullable)params
+                                        completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPOtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = OtaSoftwareUpdateProvider::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<OtaSoftwareUpdateProviderAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<OtaSoftwareUpdateProviderAttributeListListAttributeCallback>::FromCancelable(success);
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Thermostat::Attributes::ControlSequenceOfOperation::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeControlSequenceOfOperationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                             params:(CHIPSubscribeParams * _Nullable)params
+                                            subscriptionEstablished:
+                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))reportHandler
 {
-    new CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPThermostatClusterThermostatControlSequenceAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<OtaSoftwareUpdateProviderAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::ControlSequenceOfOperation::TypeInfo;
+            auto successFn = Callback<ThermostatClusterThermostatControlSequenceAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPThermostatClusterThermostatControlSequenceAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeControlSequenceOfOperationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                         endpoint:(NSNumber *)endpoint
+                                                            queue:(dispatch_queue_t)queue
+                                                completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackBridge(
+    new CHIPThermostatClusterThermostatControlSequenceAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = OtaSoftwareUpdateProvider::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = Thermostat::Attributes::ControlSequenceOfOperation::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<OtaSoftwareUpdateProviderAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<ThermostatClusterThermostatControlSequenceAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -43644,57 +42866,89 @@ new CHIPOtaSoftwareUpdateProviderAttributeListListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+- (void)readAttributeSystemModeWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OtaSoftwareUpdateProvider::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::SystemMode::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)writeAttributeSystemModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeSystemModeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeSystemModeWithValue:(NSNumber * _Nonnull)value
+                                   params:(CHIPWriteParams * _Nullable)params
+                        completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Thermostat::Attributes::SystemMode::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeSystemModeWithMinInterval:(NSNumber * _Nonnull)minInterval
                                         maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(CHIPSubscribeParams * _Nullable)params
                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::SystemMode::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeSystemModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                          endpoint:(NSNumber *)endpoint
                                             queue:(dispatch_queue_t)queue
                                 completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::SystemMode::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -43704,59 +42958,60 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeThermostatRunningModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OtaSoftwareUpdateProvider::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::ThermostatRunningMode::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeThermostatRunningModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::ThermostatRunningMode::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeThermostatRunningModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::ThermostatRunningMode::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -43766,224 +43021,184 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPOtaSoftwareUpdateRequestor
-
-- (chip::Controller::ClusterBase *)getCluster
+- (void)readAttributeStartOfWeekWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    return &_cppCluster;
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::StartOfWeek::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)announceOtaProviderWithParams:(CHIPOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderParams *)params
-                    completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeStartOfWeekWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    OtaSoftwareUpdateRequestor::Commands::AnnounceOtaProvider::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.providerNodeId = params.providerNodeId.unsignedLongLongValue;
-    request.vendorId = static_cast<std::remove_reference_t<decltype(request.vendorId)>>(params.vendorId.unsignedShortValue);
-    request.announcementReason
-        = static_cast<std::remove_reference_t<decltype(request.announcementReason)>>(params.announcementReason.unsignedCharValue);
-    if (params.metadataForNode != nil) {
-        auto & definedValue_0 = request.metadataForNode.Emplace();
-        definedValue_0 = [self asByteSpan:params.metadataForNode];
-    }
-    request.endpoint = params.endpoint.unsignedShortValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = Thermostat::Attributes::StartOfWeek::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
 
-- (void)readAttributeDefaultOtaProvidersWithParams:(CHIPReadParams * _Nullable)params
-                                 completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeStartOfWeekWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::DefaultOtaProviders::TypeInfo;
-            auto successFn = Callback<OtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue]);
-        });
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Thermostat::Attributes::StartOfWeek::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)writeAttributeDefaultOtaProvidersWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeDefaultOtaProvidersWithValue:(NSArray * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeDefaultOtaProvidersWithValue:(NSArray * _Nonnull)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeNumberOfWeeklyTransitionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::DefaultOtaProviders::TypeInfo;
-            TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPOtaSoftwareUpdateRequestorClusterProviderLocation class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (CHIPOtaSoftwareUpdateRequestorClusterProviderLocation *) value[i_0];
-                        listHolder_0->mList[i_0].providerNodeID = element_0.providerNodeID.unsignedLongLongValue;
-                        listHolder_0->mList[i_0].endpoint = element_0.endpoint.unsignedShortValue;
-                        listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::NumberOfWeeklyTransitions::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeDefaultOtaProvidersWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNumberOfWeeklyTransitionsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                            params:(CHIPSubscribeParams * _Nullable)params
+                                           subscriptionEstablished:
+                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))reportHandler
 {
-    new CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::DefaultOtaProviders::TypeInfo;
-            auto successFn = Callback<OtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::NumberOfWeeklyTransitions::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDefaultOtaProvidersWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNumberOfWeeklyTransitionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                        endpoint:(NSNumber *)endpoint
+                                                           queue:(dispatch_queue_t)queue
+                                               completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
-    new CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::DefaultOtaProviders::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<OtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Thermostat::Attributes::NumberOfWeeklyTransitions::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeUpdatePossibleWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeNumberOfDailyTransitionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdatePossible::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::NumberOfDailyTransitions::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeUpdatePossibleWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNumberOfDailyTransitionsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))reportHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdatePossible::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::NumberOfDailyTransitions::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeUpdatePossibleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNumberOfDailyTransitionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdatePossible::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::NumberOfDailyTransitions::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -43993,128 +43208,199 @@ new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable *
     });
 }
 
-- (void)readAttributeUpdateStateWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeTemperatureSetpointHoldWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPOtaSoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdateState::TypeInfo;
-            auto successFn
-                = Callback<OtaSoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::TemperatureSetpointHold::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributeTemperatureSetpointHoldWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeTemperatureSetpointHoldWithValue:(NSNumber * _Nonnull) value
+                                                  params:nil
+                                       completionHandler:completionHandler];
+}
+- (void)writeAttributeTemperatureSetpointHoldWithValue:(NSNumber * _Nonnull)value
+                                                params:(CHIPWriteParams * _Nullable)params
+                                     completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Thermostat::Attributes::TemperatureSetpointHold::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeUpdateStateWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTemperatureSetpointHoldWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler
 {
-    new CHIPOtaSoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdateState::TypeInfo;
-            auto successFn
-                = Callback<OtaSoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::TemperatureSetpointHold::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOtaSoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackSubscriptionBridge::
-                    OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeUpdateStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTemperatureSetpointHoldWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPOtaSoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdateState::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<OtaSoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Thermostat::Attributes::TemperatureSetpointHold::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeUpdateStateProgressWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeTemperatureSetpointHoldDurationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
+    new CHIPNullableInt16uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdateStateProgress::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::TemperatureSetpointHoldDuration::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeUpdateStateProgressWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeTemperatureSetpointHoldDurationWithValue:(NSNumber * _Nullable)value
+                                             completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeTemperatureSetpointHoldDurationWithValue:(NSNumber * _Nullable) value
+                                                          params:nil
+                                               completionHandler:completionHandler];
+}
+- (void)writeAttributeTemperatureSetpointHoldDurationWithValue:(NSNumber * _Nullable)value
+                                                        params:(CHIPWriteParams * _Nullable)params
+                                             completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Thermostat::Attributes::TemperatureSetpointHoldDuration::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedShortValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeTemperatureSetpointHoldDurationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                                 subscriptionEstablished:
+                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdateStateProgress::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::TemperatureSetpointHoldDuration::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeUpdateStateProgressWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTemperatureSetpointHoldDurationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                              endpoint:(NSNumber *)endpoint
+                                                                 queue:(dispatch_queue_t)queue
+                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdateStateProgress::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::TemperatureSetpointHoldDuration::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -44124,253 +43410,285 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeThermostatProgrammingOperationModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<OtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::ThermostatProgrammingOperationMode::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributeThermostatProgrammingOperationModeWithValue:(NSNumber * _Nonnull)value
+                                                completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeThermostatProgrammingOperationModeWithValue:(NSNumber * _Nonnull) value
+                                                             params:nil
+                                                  completionHandler:completionHandler];
+}
+- (void)writeAttributeThermostatProgrammingOperationModeWithValue:(NSNumber * _Nonnull)value
+                                                           params:(CHIPWriteParams * _Nullable)params
+                                                completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Thermostat::Attributes::ThermostatProgrammingOperationMode::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeThermostatProgrammingOperationModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                                    subscriptionEstablished:
+                                                        (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                              reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                NSError * _Nullable error))reportHandler
 {
-    new CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<OtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::ThermostatProgrammingOperationMode::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackSubscriptionBridge::
-                    OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeThermostatProgrammingOperationModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                 endpoint:(NSNumber *)endpoint
+                                                                    queue:(dispatch_queue_t)queue
+                                                        completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPOtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<OtaSoftwareUpdateRequestorGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Thermostat::Attributes::ThermostatProgrammingOperationMode::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeThermostatRunningStateWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
-    new CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<OtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::ThermostatRunningState::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeThermostatRunningStateWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:
+                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<OtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::ThermostatRunningState::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeThermostatRunningStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPOtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<OtaSoftwareUpdateRequestorAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Thermostat::Attributes::ThermostatRunningState::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeSetpointChangeSourceWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<OtaSoftwareUpdateRequestorAttributeListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::SetpointChangeSource::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSetpointChangeSourceWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<OtaSoftwareUpdateRequestorAttributeListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            using TypeInfo = Thermostat::Attributes::SetpointChangeSource::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeSetpointChangeSourceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPOtaSoftwareUpdateRequestorAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<OtaSoftwareUpdateRequestorAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Thermostat::Attributes::SetpointChangeSource::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeSetpointChangeAmountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt16sAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Thermostat::Attributes::SetpointChangeAmount::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSetpointChangeAmountWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::SetpointChangeAmount::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeSetpointChangeAmountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::SetpointChangeAmount::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -44380,59 +43698,60 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeSetpointChangeSourceTimestampWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::SetpointChangeSourceTimestamp::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSetpointChangeSourceTimestampWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                params:(CHIPSubscribeParams * _Nullable)params
+                                               subscriptionEstablished:
+                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::SetpointChangeSourceTimestamp::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeSetpointChangeSourceTimestampWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                            endpoint:(NSNumber *)endpoint
+                                                               queue:(dispatch_queue_t)queue
+                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::SetpointChangeSourceTimestamp::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -44442,66 +43761,97 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPOccupancySensing
-
-- (chip::Controller::ClusterBase *)getCluster
+- (void)readAttributeOccupiedSetbackWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    return &_cppCluster;
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Thermostat::Attributes::OccupiedSetback::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)readAttributeOccupancyWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeOccupiedSetbackWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OccupancySensing::Attributes::Occupancy::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    [self writeAttributeOccupiedSetbackWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
 }
+- (void)writeAttributeOccupiedSetbackWithValue:(NSNumber * _Nullable)value
+                                        params:(CHIPWriteParams * _Nullable)params
+                             completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
 
-- (void)subscribeAttributeOccupancyWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Thermostat::Attributes::OccupiedSetback::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeOccupiedSetbackWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OccupancySensing::Attributes::Occupancy::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::OccupiedSetback::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOccupancyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOccupiedSetbackWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OccupancySensing::Attributes::Occupancy::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::OccupiedSetback::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -44511,60 +43861,60 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeOccupancySensorTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeOccupiedSetbackMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OccupancySensing::Attributes::OccupancySensorType::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Thermostat::Attributes::OccupiedSetbackMin::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeOccupancySensorTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOccupiedSetbackMinWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OccupancySensing::Attributes::OccupancySensorType::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::OccupiedSetbackMin::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOccupancySensorTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOccupiedSetbackMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OccupancySensing::Attributes::OccupancySensorType::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::OccupiedSetbackMin::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -44574,60 +43924,60 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeOccupancySensorTypeBitmapWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
+- (void)readAttributeOccupiedSetbackMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OccupancySensing::Attributes::OccupancySensorTypeBitmap::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Thermostat::Attributes::OccupiedSetbackMax::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeOccupancySensorTypeBitmapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                            params:(CHIPSubscribeParams * _Nullable)params
-                                           subscriptionEstablished:
-                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOccupiedSetbackMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OccupancySensing::Attributes::OccupancySensorTypeBitmap::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::OccupiedSetbackMax::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOccupancySensorTypeBitmapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                        endpoint:(NSNumber *)endpoint
-                                                           queue:(dispatch_queue_t)queue
-                                               completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
++ (void)readAttributeOccupiedSetbackMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OccupancySensing::Attributes::OccupancySensorTypeBitmap::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::OccupiedSetbackMax::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -44637,27 +43987,25 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributePirOccupiedToUnoccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler
+- (void)readAttributeUnoccupiedSetbackWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Thermostat::Attributes::UnoccupiedSetback::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)writeAttributePirOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value
-                                          completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeUnoccupiedSetbackWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributePirOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull) value
-                                                       params:nil
-                                            completionHandler:completionHandler];
+    [self writeAttributeUnoccupiedSetbackWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributePirOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value
-                                                     params:(CHIPWriteParams * _Nullable)params
-                                          completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeUnoccupiedSetbackWithValue:(NSNumber * _Nullable)value
+                                          params:(CHIPWriteParams * _Nullable)params
+                               completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -44673,9 +44021,14 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::UnoccupiedSetback::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -44683,49 +44036,48 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributePirOccupiedToUnoccupiedDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeUnoccupiedSetbackWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::UnoccupiedSetback::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePirOccupiedToUnoccupiedDelayWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
++ (void)readAttributeUnoccupiedSetbackWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::UnoccupiedSetback::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -44735,95 +44087,61 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributePirUnoccupiedToOccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)writeAttributePirUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value
-                                          completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributePirUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull) value
-                                                       params:nil
-                                            completionHandler:completionHandler];
-}
-- (void)writeAttributePirUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value
-                                                     params:(CHIPWriteParams * _Nullable)params
-                                          completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeUnoccupiedSetbackMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Thermostat::Attributes::UnoccupiedSetbackMin::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributePirUnoccupiedToOccupiedDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeUnoccupiedSetbackMinWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::UnoccupiedSetbackMin::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePirUnoccupiedToOccupiedDelayWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
++ (void)readAttributeUnoccupiedSetbackMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::UnoccupiedSetbackMin::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -44833,27 +44151,88 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributePirUnoccupiedToOccupiedThresholdWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeUnoccupiedSetbackMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
+{
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Thermostat::Attributes::UnoccupiedSetbackMax::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeUnoccupiedSetbackMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = Thermostat::Attributes::UnoccupiedSetbackMax::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeUnoccupiedSetbackMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Thermostat::Attributes::UnoccupiedSetbackMax::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeEmergencyHeatDeltaWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo;
+        using TypeInfo = Thermostat::Attributes::EmergencyHeatDelta::TypeInfo;
         auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributePirUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value
-                                              completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeEmergencyHeatDeltaWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributePirUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull) value
-                                                           params:nil
-                                                completionHandler:completionHandler];
+    [self writeAttributeEmergencyHeatDeltaWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributePirUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value
-                                                         params:(CHIPWriteParams * _Nullable)params
-                                              completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeEmergencyHeatDeltaWithValue:(NSNumber * _Nonnull)value
+                                           params:(CHIPWriteParams * _Nullable)params
+                                completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -44869,7 +44248,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::EmergencyHeatDelta::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -44879,13 +44258,12 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributePirUnoccupiedToOccupiedThresholdWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                                  subscriptionEstablished:
-                                                      (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                            reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeEmergencyHeatDeltaWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -44894,7 +44272,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::EmergencyHeatDelta::TypeInfo;
             auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -44906,16 +44284,16 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePirUnoccupiedToOccupiedThresholdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                               endpoint:(NSNumber *)endpoint
-                                                                  queue:(dispatch_queue_t)queue
-                                                      completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler
++ (void)readAttributeEmergencyHeatDeltaWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::EmergencyHeatDelta::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -44931,27 +44309,23 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeUltrasonicOccupiedToUnoccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeACTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OccupancySensing::Attributes::UltrasonicOccupiedToUnoccupiedDelay::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::ACType::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeUltrasonicOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value
-                                                 completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeACTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeUltrasonicOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull) value
-                                                              params:nil
-                                                   completionHandler:completionHandler];
+    [self writeAttributeACTypeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeUltrasonicOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value
-                                                            params:(CHIPWriteParams * _Nullable)params
-                                                 completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeACTypeWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -44967,9 +44341,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OccupancySensing::Attributes::UltrasonicOccupiedToUnoccupiedDelay::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::ACType::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -44977,49 +44351,46 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeUltrasonicOccupiedToUnoccupiedDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                                     subscriptionEstablished:
-                                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                               reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                 NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeACTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OccupancySensing::Attributes::UltrasonicOccupiedToUnoccupiedDelay::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::ACType::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeUltrasonicOccupiedToUnoccupiedDelayWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                  endpoint:(NSNumber *)endpoint
-                                                                     queue:(dispatch_queue_t)queue
-                                                         completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))completionHandler
++ (void)readAttributeACTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OccupancySensing::Attributes::UltrasonicOccupiedToUnoccupiedDelay::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::ACType::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -45029,27 +44400,24 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeUltrasonicUnoccupiedToOccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeACCapacityWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedDelay::TypeInfo;
+        using TypeInfo = Thermostat::Attributes::ACCapacity::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeUltrasonicUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value
-                                                 completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeACCapacityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeUltrasonicUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull) value
-                                                              params:nil
-                                                   completionHandler:completionHandler];
+    [self writeAttributeACCapacityWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeUltrasonicUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value
-                                                            params:(CHIPWriteParams * _Nullable)params
-                                                 completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeACCapacityWithValue:(NSNumber * _Nonnull)value
+                                   params:(CHIPWriteParams * _Nullable)params
+                        completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -45065,7 +44433,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedDelay::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::ACCapacity::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -45075,13 +44443,11 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeUltrasonicUnoccupiedToOccupiedDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                                     subscriptionEstablished:
-                                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                               reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                 NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeACCapacityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -45090,7 +44456,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedDelay::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::ACCapacity::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -45102,16 +44468,15 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeUltrasonicUnoccupiedToOccupiedDelayWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                  endpoint:(NSNumber *)endpoint
-                                                                     queue:(dispatch_queue_t)queue
-                                                         completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))completionHandler
++ (void)readAttributeACCapacityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedDelay::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::ACCapacity::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -45127,27 +44492,24 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeUltrasonicUnoccupiedToOccupiedThresholdWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                      NSError * _Nullable error))completionHandler
+- (void)readAttributeACRefrigerantTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedThreshold::TypeInfo;
+        using TypeInfo = Thermostat::Attributes::ACRefrigerantType::TypeInfo;
         auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeUltrasonicUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value
-                                                     completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeACRefrigerantTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeUltrasonicUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull) value
-                                                                  params:nil
-                                                       completionHandler:completionHandler];
+    [self writeAttributeACRefrigerantTypeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeUltrasonicUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value
-                                                                params:(CHIPWriteParams * _Nullable)params
-                                                     completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeACRefrigerantTypeWithValue:(NSNumber * _Nonnull)value
+                                          params:(CHIPWriteParams * _Nullable)params
+                               completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -45163,7 +44525,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedThreshold::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::ACRefrigerantType::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -45173,13 +44535,12 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeUltrasonicUnoccupiedToOccupiedThresholdWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
-                                                                                     subscriptionEstablishedHandler
-                                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                     NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeACRefrigerantTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -45188,7 +44549,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedThreshold::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::ACRefrigerantType::TypeInfo;
             auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -45200,17 +44561,16 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeUltrasonicUnoccupiedToOccupiedThresholdWithAttributeCache:
-            (CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                      endpoint:(NSNumber *)endpoint
-                                                                         queue:(dispatch_queue_t)queue
-                                                             completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                   NSError * _Nullable error))completionHandler
++ (void)readAttributeACRefrigerantTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedThreshold::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::ACRefrigerantType::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -45226,27 +44586,24 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributePhysicalContactOccupiedToUnoccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                       NSError * _Nullable error))completionHandler
+- (void)readAttributeACCompressorTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OccupancySensing::Attributes::PhysicalContactOccupiedToUnoccupiedDelay::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::ACCompressorType::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributePhysicalContactOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value
-                                                      completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeACCompressorTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributePhysicalContactOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull) value
-                                                                   params:nil
-                                                        completionHandler:completionHandler];
+    [self writeAttributeACCompressorTypeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributePhysicalContactOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value
-                                                                 params:(CHIPWriteParams * _Nullable)params
-                                                      completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeACCompressorTypeWithValue:(NSNumber * _Nonnull)value
+                                         params:(CHIPWriteParams * _Nullable)params
+                              completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -45262,9 +44619,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OccupancySensing::Attributes::PhysicalContactOccupiedToUnoccupiedDelay::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::ACCompressorType::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -45272,50 +44629,48 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributePhysicalContactOccupiedToUnoccupiedDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
-                                                                                      subscriptionEstablishedHandler
-                                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                      NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeACCompressorTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OccupancySensing::Attributes::PhysicalContactOccupiedToUnoccupiedDelay::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::ACCompressorType::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePhysicalContactOccupiedToUnoccupiedDelayWithAttributeCache:
-            (CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                       endpoint:(NSNumber *)endpoint
-                                                                          queue:(dispatch_queue_t)queue
-                                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                    NSError * _Nullable error))completionHandler
++ (void)readAttributeACCompressorTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OccupancySensing::Attributes::PhysicalContactOccupiedToUnoccupiedDelay::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::ACCompressorType::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -45325,27 +44680,24 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributePhysicalContactUnoccupiedToOccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                       NSError * _Nullable error))completionHandler
+- (void)readAttributeACErrorCodeWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedDelay::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::ACErrorCode::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributePhysicalContactUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value
-                                                      completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeACErrorCodeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributePhysicalContactUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull) value
-                                                                   params:nil
-                                                        completionHandler:completionHandler];
+    [self writeAttributeACErrorCodeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributePhysicalContactUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value
-                                                                 params:(CHIPWriteParams * _Nullable)params
-                                                      completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeACErrorCodeWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -45361,9 +44713,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedDelay::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::ACErrorCode::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -45371,50 +44723,47 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributePhysicalContactUnoccupiedToOccupiedDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
-                                                                                      subscriptionEstablishedHandler
-                                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                      NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeACErrorCodeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedDelay::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::ACErrorCode::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePhysicalContactUnoccupiedToOccupiedDelayWithAttributeCache:
-            (CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                       endpoint:(NSNumber *)endpoint
-                                                                          queue:(dispatch_queue_t)queue
-                                                              completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                    NSError * _Nullable error))completionHandler
++ (void)readAttributeACErrorCodeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedDelay::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::ACErrorCode::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -45424,27 +44773,24 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributePhysicalContactUnoccupiedToOccupiedThresholdWithCompletionHandler:
-    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeACLouverPositionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::TypeInfo;
+        using TypeInfo = Thermostat::Attributes::ACLouverPosition::TypeInfo;
         auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributePhysicalContactUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value
-                                                          completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeACLouverPositionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributePhysicalContactUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull) value
-                                                                       params:nil
-                                                            completionHandler:completionHandler];
+    [self writeAttributeACLouverPositionWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributePhysicalContactUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value
-                                                                     params:(CHIPWriteParams * _Nullable)params
-                                                          completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeACLouverPositionWithValue:(NSNumber * _Nonnull)value
+                                         params:(CHIPWriteParams * _Nullable)params
+                              completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -45460,7 +44806,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::ACLouverPosition::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -45470,13 +44816,12 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributePhysicalContactUnoccupiedToOccupiedThresholdWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
-                                                                                          subscriptionEstablishedHandler
-                                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                          NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeACLouverPositionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -45485,7 +44830,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::ACLouverPosition::TypeInfo;
             auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -45497,17 +44842,16 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePhysicalContactUnoccupiedToOccupiedThresholdWithAttributeCache:
-            (CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                           endpoint:(NSNumber *)endpoint
-                                                                              queue:(dispatch_queue_t)queue
-                                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                        NSError * _Nullable error))completionHandler
++ (void)readAttributeACLouverPositionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::ACLouverPosition::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -45523,78 +44867,235 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeACCoilTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPOccupancySensingGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPNullableInt16sAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = OccupancySensing::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<OccupancySensingGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::ACCoilTemperature::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeACCoilTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPOccupancySensingGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OccupancySensing::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<OccupancySensingGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::ACCoilTemperature::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOccupancySensingGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeACCoilTemperatureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPOccupancySensingGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = OccupancySensing::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<OccupancySensingGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Thermostat::Attributes::ACCoilTemperature::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeACCapacityformatWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
+{
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Thermostat::Attributes::ACCapacityformat::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributeACCapacityformatWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeACCapacityformatWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeACCapacityformatWithValue:(NSNumber * _Nonnull)value
+                                         params:(CHIPWriteParams * _Nullable)params
+                              completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Thermostat::Attributes::ACCapacityformat::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeACCapacityformatWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = Thermostat::Attributes::ACCapacityformat::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeACCapacityformatWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Thermostat::Attributes::ACCapacityformat::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
+{
+    new CHIPThermostatGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Thermostat::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<ThermostatGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPThermostatGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = Thermostat::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<ThermostatGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPThermostatGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPThermostatGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = Thermostat::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<ThermostatGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPOccupancySensingAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPThermostatAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = OccupancySensing::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<OccupancySensingAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<ThermostatAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -45608,19 +45109,19 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPOccupancySensingAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPThermostatAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OccupancySensing::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<OccupancySensingAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<ThermostatAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOccupancySensingAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPThermostatAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -45633,17 +45134,17 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPOccupancySensingAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPThermostatAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = OccupancySensing::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = Thermostat::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<OccupancySensingAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<ThermostatAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -45656,10 +45157,10 @@ new CHIPOccupancySensingAcceptedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPOccupancySensingAttributeListListAttributeCallbackBridge(
+    new CHIPThermostatAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = OccupancySensing::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<OccupancySensingAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<ThermostatAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -45671,19 +45172,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPOccupancySensingAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPThermostatAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OccupancySensing::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<OccupancySensingAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = Thermostat::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<ThermostatAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOccupancySensingAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPThermostatAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -45696,17 +45197,17 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPOccupancySensingAttributeListListAttributeCallbackBridge(
+    new CHIPThermostatAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = OccupancySensing::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = Thermostat::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<OccupancySensingAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<ThermostatAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -45720,7 +45221,7 @@ - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OccupancySensing::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = Thermostat::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -45740,7 +45241,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OccupancySensing::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -45760,7 +45261,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OccupancySensing::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -45780,7 +45281,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OccupancySensing::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = Thermostat::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -45801,7 +45302,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OccupancySensing::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -45822,7 +45323,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OccupancySensing::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -45840,294 +45341,293 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPOnOff
+@implementation CHIPFanControl
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)offWithCompletionHandler:(StatusCompletion)completionHandler
-{
-    [self offWithParams:nil completionHandler:completionHandler];
-}
-- (void)offWithParams:(CHIPOnOffClusterOffParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeFanModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    OnOff::Commands::Off::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+    new CHIPFanControlClusterFanModeTypeAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = FanControl::Attributes::FanMode::TypeInfo;
+            auto successFn = Callback<FanControlClusterFanModeTypeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)onWithCompletionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeFanModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self onWithParams:nil completionHandler:completionHandler];
+    [self writeAttributeFanModeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)onWithParams:(CHIPOnOffClusterOnParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeFanModeWithValue:(NSNumber * _Nonnull)value
+                                params:(CHIPWriteParams * _Nullable)params
+                     completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    OnOff::Commands::On::Type request;
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
     }
 
-    new CHIPCommandSuccessCallbackBridge(
+    new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
+        ^(id _Nullable ignored, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            ListFreer listFreer;
+            using TypeInfo = FanControl::Attributes::FanMode::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)toggleWithCompletionHandler:(StatusCompletion)completionHandler
-{
-    [self toggleWithParams:nil completionHandler:completionHandler];
-}
-- (void)toggleWithParams:(CHIPOnOffClusterToggleParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeFanModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    OnOff::Commands::Toggle::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
+    new CHIPFanControlClusterFanModeTypeAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = FanControl::Attributes::FanMode::TypeInfo;
+            auto successFn = Callback<FanControlClusterFanModeTypeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPFanControlClusterFanModeTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
 
-- (void)offWithEffectWithParams:(CHIPOnOffClusterOffWithEffectParams *)params completionHandler:(StatusCompletion)completionHandler
++ (void)readAttributeFanModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    OnOff::Commands::OffWithEffect::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.effectId = static_cast<std::remove_reference_t<decltype(request.effectId)>>(params.effectId.unsignedCharValue);
-    request.effectVariant
-        = static_cast<std::remove_reference_t<decltype(request.effectVariant)>>(params.effectVariant.unsignedCharValue);
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+    new CHIPFanControlClusterFanModeTypeAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = FanControl::Attributes::FanMode::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<FanControlClusterFanModeTypeAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
         });
 }
 
-- (void)onWithRecallGlobalSceneWithCompletionHandler:(StatusCompletion)completionHandler
-{
-    [self onWithRecallGlobalSceneWithParams:nil completionHandler:completionHandler];
-}
-- (void)onWithRecallGlobalSceneWithParams:(CHIPOnOffClusterOnWithRecallGlobalSceneParams * _Nullable)params
-                        completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeFanModeSequenceWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    OnOff::Commands::OnWithRecallGlobalScene::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+    new CHIPFanControlClusterFanModeSequenceTypeAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = FanControl::Attributes::FanModeSequence::TypeInfo;
+            auto successFn = Callback<FanControlClusterFanModeSequenceTypeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)onWithTimedOffWithParams:(CHIPOnOffClusterOnWithTimedOffParams *)params
-               completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeFanModeSequenceWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    OnOff::Commands::OnWithTimedOff::Type request;
+    [self writeAttributeFanModeSequenceWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeFanModeSequenceWithValue:(NSNumber * _Nonnull)value
+                                        params:(CHIPWriteParams * _Nullable)params
+                             completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
     }
-    request.onOffControl
-        = static_cast<std::remove_reference_t<decltype(request.onOffControl)>>(params.onOffControl.unsignedCharValue);
-    request.onTime = params.onTime.unsignedShortValue;
-    request.offWaitTime = params.offWaitTime.unsignedShortValue;
 
-    new CHIPCommandSuccessCallbackBridge(
+    new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
+        ^(id _Nullable ignored, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            ListFreer listFreer;
+            using TypeInfo = FanControl::Attributes::FanModeSequence::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)readAttributeOnOffWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OnOff::Attributes::OnOff::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeOnOffWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                        params:(CHIPSubscribeParams * _Nullable)params
-                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFanModeSequenceWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPFanControlClusterFanModeSequenceTypeAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OnOff::Attributes::OnOff::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FanControl::Attributes::FanModeSequence::TypeInfo;
+            auto successFn = Callback<FanControlClusterFanModeSequenceTypeAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPFanControlClusterFanModeSequenceTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOnOffWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                    endpoint:(NSNumber *)endpoint
-                                       queue:(dispatch_queue_t)queue
-                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFanModeSequenceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = OnOff::Attributes::OnOff::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPFanControlClusterFanModeSequenceTypeAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = FanControl::Attributes::FanModeSequence::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<FanControlClusterFanModeSequenceTypeAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeGlobalSceneControlWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler
+- (void)readAttributePercentSettingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OnOff::Attributes::GlobalSceneControl::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeGlobalSceneControlWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = FanControl::Attributes::PercentSetting::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributePercentSettingWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    [self writeAttributePercentSettingWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributePercentSettingWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = FanControl::Attributes::PercentSetting::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributePercentSettingWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OnOff::Attributes::GlobalSceneControl::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FanControl::Attributes::PercentSetting::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGlobalSceneControlWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePercentSettingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OnOff::Attributes::GlobalSceneControl::TypeInfo;
+            using TypeInfo = FanControl::Attributes::PercentSetting::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -46137,88 +45637,59 @@ new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable *
     });
 }
 
-- (void)readAttributeOnTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributePercentCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OnOff::Attributes::OnTime::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = FanControl::Attributes::PercentCurrent::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeOnTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeOnTimeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeOnTimeWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = OnOff::Attributes::OnTime::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeOnTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePercentCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OnOff::Attributes::OnTime::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FanControl::Attributes::PercentCurrent::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOnTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePercentCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OnOff::Attributes::OnTime::TypeInfo;
+            using TypeInfo = FanControl::Attributes::PercentCurrent::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -46228,90 +45699,57 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeOffWaitTimeWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeSpeedMaxWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OnOff::Attributes::OffWaitTime::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = FanControl::Attributes::SpeedMax::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeOffWaitTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeOffWaitTimeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeOffWaitTimeWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = OnOff::Attributes::OffWaitTime::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeOffWaitTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSpeedMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OnOff::Attributes::OffWaitTime::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FanControl::Attributes::SpeedMax::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOffWaitTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeSpeedMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OnOff::Attributes::OffWaitTime::TypeInfo;
+            using TypeInfo = FanControl::Attributes::SpeedMax::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -46321,23 +45759,23 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeStartUpOnOffWithCompletionHandler:(void (^)(
+- (void)readAttributeSpeedSettingWithCompletionHandler:(void (^)(
                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableOnOffClusterOnOffStartUpOnOffAttributeCallbackBridge(
+    new CHIPNullableInt8uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = OnOff::Attributes::StartUpOnOff::TypeInfo;
-            auto successFn = Callback<NullableOnOffClusterOnOffStartUpOnOffAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FanControl::Attributes::SpeedSetting::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeStartUpOnOffWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSpeedSettingWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeStartUpOnOffWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+    [self writeAttributeSpeedSettingWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeStartUpOnOffWithValue:(NSNumber * _Nullable)value
+- (void)writeAttributeSpeedSettingWithValue:(NSNumber * _Nullable)value
                                      params:(CHIPWriteParams * _Nullable)params
                           completionHandler:(StatusCompletion)completionHandler
 {
@@ -46355,13 +45793,13 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OnOff::Attributes::StartUpOnOff::TypeInfo;
+            using TypeInfo = FanControl::Attributes::SpeedSetting::TypeInfo;
             TypeInfo::Type cppValue;
             if (value == nil) {
                 cppValue.SetNull();
             } else {
                 auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
+                nonNullValue_0 = value.unsignedCharValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -46370,240 +45808,169 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeStartUpOnOffWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeSpeedSettingWithMinInterval:(NSNumber * _Nonnull)minInterval
                                           maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(CHIPSubscribeParams * _Nullable)params
                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                         reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableOnOffClusterOnOffStartUpOnOffAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OnOff::Attributes::StartUpOnOff::TypeInfo;
-            auto successFn = Callback<NullableOnOffClusterOnOffStartUpOnOffAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FanControl::Attributes::SpeedSetting::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableOnOffClusterOnOffStartUpOnOffAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeStartUpOnOffWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeSpeedSettingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                            endpoint:(NSNumber *)endpoint
                                               queue:(dispatch_queue_t)queue
                                   completionHandler:
                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableOnOffClusterOnOffStartUpOnOffAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = OnOff::Attributes::StartUpOnOff::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<NullableOnOffClusterOnOffStartUpOnOffAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
-{
-    new CHIPOnOffGeneratedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = OnOff::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<OnOffGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPOnOffGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = OnOff::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<OnOffGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOnOffGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPOnOffGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = OnOff::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<OnOffGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = FanControl::Attributes::SpeedSetting::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeSpeedCurrentWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPOnOffAcceptedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = OnOff::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<OnOffAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = FanControl::Attributes::SpeedCurrent::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSpeedCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPOnOffAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OnOff::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<OnOffAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FanControl::Attributes::SpeedCurrent::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOnOffAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeSpeedCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPOnOffAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = OnOff::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<OnOffAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = FanControl::Attributes::SpeedCurrent::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeRockSupportWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPOnOffAttributeListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = OnOff::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<OnOffAttributeListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = FanControl::Attributes::RockSupport::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRockSupportWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPOnOffAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OnOff::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<OnOffAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FanControl::Attributes::RockSupport::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOnOffAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRockSupportWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPOnOffAttributeListListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OnOff::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = FanControl::Attributes::RockSupport::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<OnOffAttributeListListAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -46613,119 +45980,90 @@ new CHIPOnOffAttributeListListAttributeCallbackBridge(queue, completionHandler,
     });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeRockSettingWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OnOff::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = FanControl::Attributes::RockSetting::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeRockSettingWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = OnOff::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+    [self writeAttributeRockSettingWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeRockSettingWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = OnOff::Attributes::FeatureMap::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
+    }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OnOff::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = FanControl::Attributes::RockSetting::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRockSettingWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OnOff::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FanControl::Attributes::RockSetting::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRockSettingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OnOff::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = FanControl::Attributes::RockSetting::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -46735,31 +46073,22 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPOnOffSwitchConfiguration
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)readAttributeSwitchTypeWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeWindSupportWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OnOffSwitchConfiguration::Attributes::SwitchType::TypeInfo;
+        using TypeInfo = FanControl::Attributes::WindSupport::TypeInfo;
         auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeSwitchTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeWindSupportWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -46768,7 +46097,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OnOffSwitchConfiguration::Attributes::SwitchType::TypeInfo;
+            using TypeInfo = FanControl::Attributes::WindSupport::TypeInfo;
             auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -46780,15 +46109,16 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSwitchTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeWindSupportWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OnOffSwitchConfiguration::Attributes::SwitchType::TypeInfo;
+            using TypeInfo = FanControl::Attributes::WindSupport::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -46804,24 +46134,24 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeSwitchActionsWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeWindSettingWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OnOffSwitchConfiguration::Attributes::SwitchActions::TypeInfo;
+        using TypeInfo = FanControl::Attributes::WindSetting::TypeInfo;
         auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeSwitchActionsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeWindSettingWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeSwitchActionsWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self writeAttributeWindSettingWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeSwitchActionsWithValue:(NSNumber * _Nonnull)value
-                                      params:(CHIPWriteParams * _Nullable)params
-                           completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeWindSettingWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -46837,7 +46167,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OnOffSwitchConfiguration::Attributes::SwitchActions::TypeInfo;
+            using TypeInfo = FanControl::Attributes::WindSetting::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -46847,12 +46177,11 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeSwitchActionsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeWindSettingWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -46861,7 +46190,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OnOffSwitchConfiguration::Attributes::SwitchActions::TypeInfo;
+            using TypeInfo = FanControl::Attributes::WindSetting::TypeInfo;
             auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -46873,16 +46202,16 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSwitchActionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeWindSettingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OnOffSwitchConfiguration::Attributes::SwitchActions::TypeInfo;
+            using TypeInfo = FanControl::Attributes::WindSetting::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -46901,10 +46230,10 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPFanControlGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = OnOffSwitchConfiguration::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<OnOffSwitchConfigurationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FanControl::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<FanControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -46918,20 +46247,20 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
                                                 reportHandler:
                                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPFanControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OnOffSwitchConfiguration::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<OnOffSwitchConfigurationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FanControl::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<FanControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPFanControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -46943,18 +46272,17 @@ + (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheC
                                           completionHandler:
                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPFanControlGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = OnOffSwitchConfiguration::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = FanControl::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<OnOffSwitchConfigurationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<FanControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -46967,10 +46295,10 @@ new CHIPOnOffSwitchConfigurationGeneratedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPFanControlAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = OnOffSwitchConfiguration::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<OnOffSwitchConfigurationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FanControl::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<FanControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -46984,20 +46312,20 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPFanControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OnOffSwitchConfiguration::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<OnOffSwitchConfigurationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FanControl::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<FanControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPFanControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -47009,18 +46337,17 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPFanControlAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = OnOffSwitchConfiguration::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = FanControl::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<OnOffSwitchConfigurationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<FanControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -47033,10 +46360,10 @@ new CHIPOnOffSwitchConfigurationAcceptedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackBridge(
+    new CHIPFanControlAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = OnOffSwitchConfiguration::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<OnOffSwitchConfigurationAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FanControl::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<FanControlAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -47048,19 +46375,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPFanControlAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OnOffSwitchConfiguration::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<OnOffSwitchConfigurationAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FanControl::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<FanControlAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPFanControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -47073,17 +46400,17 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPOnOffSwitchConfigurationAttributeListListAttributeCallbackBridge(
+    new CHIPFanControlAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = OnOffSwitchConfiguration::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = FanControl::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<OnOffSwitchConfigurationAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<FanControlAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -47097,7 +46424,7 @@ - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OnOffSwitchConfiguration::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = FanControl::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -47117,7 +46444,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OnOffSwitchConfiguration::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = FanControl::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -47137,7 +46464,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OnOffSwitchConfiguration::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = FanControl::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -47157,7 +46484,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OnOffSwitchConfiguration::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = FanControl::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -47178,7 +46505,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OnOffSwitchConfiguration::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = FanControl::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -47199,7 +46526,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OnOffSwitchConfiguration::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = FanControl::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -47217,391 +46544,94 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPOperationalCredentials
+@implementation CHIPThermostatUserInterfaceConfiguration
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)attestationRequestWithParams:(CHIPOperationalCredentialsClusterAttestationRequestParams *)params
-                   completionHandler:(void (^)(CHIPOperationalCredentialsClusterAttestationResponseParams * _Nullable data,
-                                         NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    OperationalCredentials::Commands::AttestationRequest::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.attestationNonce = [self asByteSpan:params.attestationNonce];
-
-    new CHIPOperationalCredentialsClusterAttestationResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPOperationalCredentialsClusterAttestationResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)certificateChainRequestWithParams:(CHIPOperationalCredentialsClusterCertificateChainRequestParams *)params
-                        completionHandler:
-                            (void (^)(CHIPOperationalCredentialsClusterCertificateChainResponseParams * _Nullable data,
-                                NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    OperationalCredentials::Commands::CertificateChainRequest::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.certificateType = params.certificateType.unsignedCharValue;
-
-    new CHIPOperationalCredentialsClusterCertificateChainResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn
-                = Callback<CHIPOperationalCredentialsClusterCertificateChainResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)CSRRequestWithParams:(CHIPOperationalCredentialsClusterCSRRequestParams *)params
-           completionHandler:(void (^)(CHIPOperationalCredentialsClusterCSRResponseParams * _Nullable data,
-                                 NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    OperationalCredentials::Commands::CSRRequest::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.CSRNonce = [self asByteSpan:params.csrNonce];
-    if (params.isForUpdateNOC != nil) {
-        auto & definedValue_0 = request.isForUpdateNOC.Emplace();
-        definedValue_0 = params.isForUpdateNOC.boolValue;
-    }
-
-    new CHIPOperationalCredentialsClusterCSRResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPOperationalCredentialsClusterCSRResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)addNOCWithParams:(CHIPOperationalCredentialsClusterAddNOCParams *)params
-       completionHandler:(void (^)(CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable data,
-                             NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    OperationalCredentials::Commands::AddNOC::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.NOCValue = [self asByteSpan:params.nocValue];
-    if (params.icacValue != nil) {
-        auto & definedValue_0 = request.ICACValue.Emplace();
-        definedValue_0 = [self asByteSpan:params.icacValue];
-    }
-    request.IPKValue = [self asByteSpan:params.ipkValue];
-    request.caseAdminSubject = params.caseAdminSubject.unsignedLongLongValue;
-    request.adminVendorId
-        = static_cast<std::remove_reference_t<decltype(request.adminVendorId)>>(params.adminVendorId.unsignedShortValue);
-
-    new CHIPOperationalCredentialsClusterNOCResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPOperationalCredentialsClusterNOCResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)updateNOCWithParams:(CHIPOperationalCredentialsClusterUpdateNOCParams *)params
-          completionHandler:(void (^)(CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable data,
-                                NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    OperationalCredentials::Commands::UpdateNOC::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.NOCValue = [self asByteSpan:params.nocValue];
-    if (params.icacValue != nil) {
-        auto & definedValue_0 = request.ICACValue.Emplace();
-        definedValue_0 = [self asByteSpan:params.icacValue];
-    }
-
-    new CHIPOperationalCredentialsClusterNOCResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPOperationalCredentialsClusterNOCResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)updateFabricLabelWithParams:(CHIPOperationalCredentialsClusterUpdateFabricLabelParams *)params
-                  completionHandler:(void (^)(CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable data,
-                                        NSError * _Nullable error))completionHandler
+- (void)readAttributeTemperatureDisplayModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    OperationalCredentials::Commands::UpdateFabricLabel::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.label = [self asCharSpan:params.label];
-
-    new CHIPOperationalCredentialsClusterNOCResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPOperationalCredentialsClusterNOCResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::TemperatureDisplayMode::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)removeFabricWithParams:(CHIPOperationalCredentialsClusterRemoveFabricParams *)params
-             completionHandler:(void (^)(CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable data,
-                                   NSError * _Nullable error))completionHandler
+- (void)writeAttributeTemperatureDisplayModeWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    OperationalCredentials::Commands::RemoveFabric::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.fabricIndex = params.fabricIndex.unsignedCharValue;
-
-    new CHIPOperationalCredentialsClusterNOCResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPOperationalCredentialsClusterNOCResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+    [self writeAttributeTemperatureDisplayModeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-
-- (void)addTrustedRootCertificateWithParams:(CHIPOperationalCredentialsClusterAddTrustedRootCertificateParams *)params
-                          completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTemperatureDisplayModeWithValue:(NSNumber * _Nonnull)value
+                                               params:(CHIPWriteParams * _Nullable)params
+                                    completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    OperationalCredentials::Commands::AddTrustedRootCertificate::Type request;
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
     }
-    request.rootCertificate = [self asByteSpan:params.rootCertificate];
 
-    new CHIPCommandSuccessCallbackBridge(
+    new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
+        ^(id _Nullable ignored, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)readAttributeNOCsWithParams:(CHIPReadParams * _Nullable)params
-                  completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPOperationalCredentialsNOCsListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = OperationalCredentials::Attributes::NOCs::TypeInfo;
-            auto successFn = Callback<OperationalCredentialsNOCsListAttributeCallback>::FromCancelable(success);
+            ListFreer listFreer;
+            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::TemperatureDisplayMode::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue]);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeNOCsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                       params:(CHIPSubscribeParams * _Nullable)params
-                      subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTemperatureDisplayModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:
+                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPOperationalCredentialsNOCsListAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OperationalCredentials::Attributes::NOCs::TypeInfo;
-            auto successFn = Callback<OperationalCredentialsNOCsListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::TemperatureDisplayMode::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOperationalCredentialsNOCsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNOCsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                   endpoint:(NSNumber *)endpoint
-                                      queue:(dispatch_queue_t)queue
-                          completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPOperationalCredentialsNOCsListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = OperationalCredentials::Attributes::NOCs::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<OperationalCredentialsNOCsListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeFabricsWithParams:(CHIPReadParams * _Nullable)params
-                     completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPOperationalCredentialsFabricsListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = OperationalCredentials::Attributes::Fabrics::TypeInfo;
-            auto successFn = Callback<OperationalCredentialsFabricsListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue]);
-        });
-}
-
-- (void)subscribeAttributeFabricsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPOperationalCredentialsFabricsListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = OperationalCredentials::Attributes::Fabrics::TypeInfo;
-            auto successFn = Callback<OperationalCredentialsFabricsListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOperationalCredentialsFabricsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeFabricsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPOperationalCredentialsFabricsListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = OperationalCredentials::Attributes::Fabrics::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<OperationalCredentialsFabricsListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeSupportedFabricsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
-{
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OperationalCredentials::Attributes::SupportedFabrics::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeSupportedFabricsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = OperationalCredentials::Attributes::SupportedFabrics::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeSupportedFabricsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTemperatureDisplayModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OperationalCredentials::Attributes::SupportedFabrics::TypeInfo;
+            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::TemperatureDisplayMode::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -47617,24 +46647,55 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeCommissionedFabricsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeKeypadLockoutWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OperationalCredentials::Attributes::CommissionedFabrics::TypeInfo;
+        using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::KeypadLockout::TypeInfo;
         auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeCommissionedFabricsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeKeypadLockoutWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeKeypadLockoutWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeKeypadLockoutWithValue:(NSNumber * _Nonnull)value
+                                      params:(CHIPWriteParams * _Nullable)params
+                           completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::KeypadLockout::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeKeypadLockoutWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -47643,7 +46704,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OperationalCredentials::Attributes::CommissionedFabrics::TypeInfo;
+            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::KeypadLockout::TypeInfo;
             auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -47655,16 +46716,16 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCommissionedFabricsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeKeypadLockoutWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OperationalCredentials::Attributes::CommissionedFabrics::TypeInfo;
+            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::KeypadLockout::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -47680,89 +46741,59 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeTrustedRootCertificatesWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
+- (void)readAttributeScheduleProgrammingVisibilityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler
 {
-    new CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = OperationalCredentials::Attributes::TrustedRootCertificates::TypeInfo;
-            auto successFn = Callback<OperationalCredentialsTrustedRootCertificatesListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeTrustedRootCertificatesWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:
-                                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeScheduleProgrammingVisibilityWithValue:(NSNumber * _Nonnull)value
+                                           completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = OperationalCredentials::Attributes::TrustedRootCertificates::TypeInfo;
-            auto successFn = Callback<OperationalCredentialsTrustedRootCertificatesListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+    [self writeAttributeScheduleProgrammingVisibilityWithValue:(NSNumber * _Nonnull) value
+                                                        params:nil
+                                             completionHandler:completionHandler];
 }
-
-+ (void)readAttributeTrustedRootCertificatesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeScheduleProgrammingVisibilityWithValue:(NSNumber * _Nonnull)value
+                                                      params:(CHIPWriteParams * _Nullable)params
+                                           completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPOperationalCredentialsTrustedRootCertificatesListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = OperationalCredentials::Attributes::TrustedRootCertificates::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<OperationalCredentialsTrustedRootCertificatesListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
 
-- (void)readAttributeCurrentFabricIndexWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler
-{
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OperationalCredentials::Attributes::CurrentFabricIndex::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
 }
 
-- (void)subscribeAttributeCurrentFabricIndexWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeScheduleProgrammingVisibilityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                params:(CHIPSubscribeParams * _Nullable)params
+                                               subscriptionEstablished:
+                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))reportHandler
 {
     new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -47771,7 +46802,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OperationalCredentials::Attributes::CurrentFabricIndex::TypeInfo;
+            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::TypeInfo;
             auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -47783,16 +46814,16 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentFabricIndexWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeScheduleProgrammingVisibilityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                            endpoint:(NSNumber *)endpoint
+                                                               queue:(dispatch_queue_t)queue
+                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OperationalCredentials::Attributes::CurrentFabricIndex::TypeInfo;
+            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -47811,10 +46842,11 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = OperationalCredentials::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<OperationalCredentialsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn
+                = Callback<ThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -47828,19 +46860,21 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
                                                 reportHandler:
                                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OperationalCredentials::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<OperationalCredentialsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn
+                = Callback<ThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge::
+                    OnSubscriptionEstablished,
                 nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -47853,17 +46887,19 @@ + (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheC
                                           completionHandler:
                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = OperationalCredentials::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<OperationalCredentialsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn
+                    = Callback<ThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallback>::FromCancelable(
+                        success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -47876,10 +46912,11 @@ new CHIPOperationalCredentialsGeneratedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = OperationalCredentials::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<OperationalCredentialsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn
+                = Callback<ThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -47893,19 +46930,21 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OperationalCredentials::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<OperationalCredentialsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn
+                = Callback<ThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge::
+                    OnSubscriptionEstablished,
                 nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -47918,17 +46957,19 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = OperationalCredentials::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<OperationalCredentialsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn
+                    = Callback<ThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallback>::FromCancelable(
+                        success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -47941,10 +46982,11 @@ new CHIPOperationalCredentialsAcceptedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPOperationalCredentialsAttributeListListAttributeCallbackBridge(
+    new CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = OperationalCredentials::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<OperationalCredentialsAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::AttributeList::TypeInfo;
+            auto successFn
+                = Callback<ThermostatUserInterfaceConfigurationAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -47956,20 +46998,22 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPOperationalCredentialsAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OperationalCredentials::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<OperationalCredentialsAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::AttributeList::TypeInfo;
+            auto successFn
+                = Callback<ThermostatUserInterfaceConfigurationAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOperationalCredentialsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackSubscriptionBridge::
+                    OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -47981,17 +47025,18 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPOperationalCredentialsAttributeListListAttributeCallbackBridge(
+    new CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = OperationalCredentials::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<OperationalCredentialsAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn
+                    = Callback<ThermostatUserInterfaceConfigurationAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -48005,7 +47050,7 @@ - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OperationalCredentials::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -48025,7 +47070,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OperationalCredentials::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -48045,7 +47090,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OperationalCredentials::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -48065,7 +47110,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = OperationalCredentials::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -48086,7 +47131,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = OperationalCredentials::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -48107,7 +47152,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = OperationalCredentials::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -48125,434 +47170,625 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPPowerSource
+@implementation CHIPColorControl
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)readAttributeStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)moveToHueWithParams:(CHIPColorControlClusterMoveToHueParams *)params completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::Status::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ColorControl::Commands::MoveToHue::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.hue = params.hue.unsignedCharValue;
+    request.direction = static_cast<std::remove_reference_t<decltype(request.direction)>>(params.direction.unsignedCharValue);
+    request.transitionTime = params.transitionTime.unsignedShortValue;
+    request.optionsMask = params.optionsMask.unsignedCharValue;
+    request.optionsOverride = params.optionsOverride.unsignedCharValue;
 
-- (void)subscribeAttributeStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
         ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = PowerSource::Attributes::Status::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-+ (void)readAttributeStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)moveHueWithParams:(CHIPColorControlClusterMoveHueParams *)params completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::Status::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ColorControl::Commands::MoveHue::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
+    }
+    request.moveMode = static_cast<std::remove_reference_t<decltype(request.moveMode)>>(params.moveMode.unsignedCharValue);
+    request.rate = params.rate.unsignedCharValue;
+    request.optionsMask = params.optionsMask.unsignedCharValue;
+    request.optionsOverride = params.optionsOverride.unsignedCharValue;
 
-- (void)readAttributeOrderWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::Order::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-- (void)subscribeAttributeOrderWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                        params:(CHIPSubscribeParams * _Nullable)params
-                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)stepHueWithParams:(CHIPColorControlClusterStepHueParams *)params completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ColorControl::Commands::StepHue::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.stepMode = static_cast<std::remove_reference_t<decltype(request.stepMode)>>(params.stepMode.unsignedCharValue);
+    request.stepSize = params.stepSize.unsignedCharValue;
+    request.transitionTime = params.transitionTime.unsignedCharValue;
+    request.optionsMask = params.optionsMask.unsignedCharValue;
+    request.optionsOverride = params.optionsOverride.unsignedCharValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
         ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = PowerSource::Attributes::Order::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-+ (void)readAttributeOrderWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                    endpoint:(NSNumber *)endpoint
-                                       queue:(dispatch_queue_t)queue
-                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)moveToSaturationWithParams:(CHIPColorControlClusterMoveToSaturationParams *)params
+                 completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::Order::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ColorControl::Commands::MoveToSaturation::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
+    }
+    request.saturation = params.saturation.unsignedCharValue;
+    request.transitionTime = params.transitionTime.unsignedShortValue;
+    request.optionsMask = params.optionsMask.unsignedCharValue;
+    request.optionsOverride = params.optionsOverride.unsignedCharValue;
 
-- (void)readAttributeDescriptionWithCompletionHandler:(void (^)(
-                                                          NSString * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::Description::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-- (void)subscribeAttributeDescriptionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)moveSaturationWithParams:(CHIPColorControlClusterMoveSaturationParams *)params
+               completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ColorControl::Commands::MoveSaturation::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.moveMode = static_cast<std::remove_reference_t<decltype(request.moveMode)>>(params.moveMode.unsignedCharValue);
+    request.rate = params.rate.unsignedCharValue;
+    request.optionsMask = params.optionsMask.unsignedCharValue;
+    request.optionsOverride = params.optionsOverride.unsignedCharValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
         ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = PowerSource::Attributes::Description::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-+ (void)readAttributeDescriptionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)stepSaturationWithParams:(CHIPColorControlClusterStepSaturationParams *)params
+               completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::Description::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ColorControl::Commands::StepSaturation::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
+    }
+    request.stepMode = static_cast<std::remove_reference_t<decltype(request.stepMode)>>(params.stepMode.unsignedCharValue);
+    request.stepSize = params.stepSize.unsignedCharValue;
+    request.transitionTime = params.transitionTime.unsignedCharValue;
+    request.optionsMask = params.optionsMask.unsignedCharValue;
+    request.optionsOverride = params.optionsOverride.unsignedCharValue;
 
-- (void)readAttributeWiredAssessedInputVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
-{
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::WiredAssessedInputVoltage::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-- (void)subscribeAttributeWiredAssessedInputVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                            params:(CHIPSubscribeParams * _Nullable)params
-                                           subscriptionEstablished:
-                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))reportHandler
+- (void)moveToHueAndSaturationWithParams:(CHIPColorControlClusterMoveToHueAndSaturationParams *)params
+                       completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ColorControl::Commands::MoveToHueAndSaturation::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.hue = params.hue.unsignedCharValue;
+    request.saturation = params.saturation.unsignedCharValue;
+    request.transitionTime = params.transitionTime.unsignedShortValue;
+    request.optionsMask = params.optionsMask.unsignedCharValue;
+    request.optionsOverride = params.optionsOverride.unsignedCharValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
         ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = PowerSource::Attributes::WiredAssessedInputVoltage::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-+ (void)readAttributeWiredAssessedInputVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                        endpoint:(NSNumber *)endpoint
-                                                           queue:(dispatch_queue_t)queue
-                                               completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
+- (void)moveToColorWithParams:(CHIPColorControlClusterMoveToColorParams *)params
+            completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::WiredAssessedInputVoltage::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ColorControl::Commands::MoveToColor::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
+    }
+    request.colorX = params.colorX.unsignedShortValue;
+    request.colorY = params.colorY.unsignedShortValue;
+    request.transitionTime = params.transitionTime.unsignedShortValue;
+    request.optionsMask = params.optionsMask.unsignedCharValue;
+    request.optionsOverride = params.optionsOverride.unsignedCharValue;
 
-- (void)readAttributeWiredAssessedInputFrequencyWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::WiredAssessedInputFrequency::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-- (void)subscribeAttributeWiredAssessedInputFrequencyWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                              params:(CHIPSubscribeParams * _Nullable)params
-                                             subscriptionEstablished:
-                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))reportHandler
+- (void)moveColorWithParams:(CHIPColorControlClusterMoveColorParams *)params completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ColorControl::Commands::MoveColor::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.rateX = params.rateX.shortValue;
+    request.rateY = params.rateY.shortValue;
+    request.optionsMask = params.optionsMask.unsignedCharValue;
+    request.optionsOverride = params.optionsOverride.unsignedCharValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
         ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = PowerSource::Attributes::WiredAssessedInputFrequency::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-+ (void)readAttributeWiredAssessedInputFrequencyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                          endpoint:(NSNumber *)endpoint
-                                                             queue:(dispatch_queue_t)queue
-                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
+- (void)stepColorWithParams:(CHIPColorControlClusterStepColorParams *)params completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::WiredAssessedInputFrequency::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ColorControl::Commands::StepColor::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
+    }
+    request.stepX = params.stepX.shortValue;
+    request.stepY = params.stepY.shortValue;
+    request.transitionTime = params.transitionTime.unsignedShortValue;
+    request.optionsMask = params.optionsMask.unsignedCharValue;
+    request.optionsOverride = params.optionsOverride.unsignedCharValue;
 
-- (void)readAttributeWiredCurrentTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
-{
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::WiredCurrentType::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-- (void)subscribeAttributeWiredCurrentTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)moveToColorTemperatureWithParams:(CHIPColorControlClusterMoveToColorTemperatureParams *)params
+                       completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ColorControl::Commands::MoveToColorTemperature::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.colorTemperature = params.colorTemperature.unsignedShortValue;
+    request.transitionTime = params.transitionTime.unsignedShortValue;
+    request.optionsMask = params.optionsMask.unsignedCharValue;
+    request.optionsOverride = params.optionsOverride.unsignedCharValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
         ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = PowerSource::Attributes::WiredCurrentType::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-+ (void)readAttributeWiredCurrentTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)enhancedMoveToHueWithParams:(CHIPColorControlClusterEnhancedMoveToHueParams *)params
+                  completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::WiredCurrentType::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ColorControl::Commands::EnhancedMoveToHue::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+    }
+    request.enhancedHue = params.enhancedHue.unsignedShortValue;
+    request.direction = static_cast<std::remove_reference_t<decltype(request.direction)>>(params.direction.unsignedCharValue);
+    request.transitionTime = params.transitionTime.unsignedShortValue;
+    request.optionsMask = params.optionsMask.unsignedCharValue;
+    request.optionsOverride = params.optionsOverride.unsignedCharValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-- (void)readAttributeWiredAssessedCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)enhancedMoveHueWithParams:(CHIPColorControlClusterEnhancedMoveHueParams *)params
+                completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::WiredAssessedCurrent::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ColorControl::Commands::EnhancedMoveHue::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.moveMode = static_cast<std::remove_reference_t<decltype(request.moveMode)>>(params.moveMode.unsignedCharValue);
+    request.rate = params.rate.unsignedShortValue;
+    request.optionsMask = params.optionsMask.unsignedCharValue;
+    request.optionsOverride = params.optionsOverride.unsignedCharValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)enhancedStepHueWithParams:(CHIPColorControlClusterEnhancedStepHueParams *)params
+                completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ColorControl::Commands::EnhancedStepHue::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.stepMode = static_cast<std::remove_reference_t<decltype(request.stepMode)>>(params.stepMode.unsignedCharValue);
+    request.stepSize = params.stepSize.unsignedShortValue;
+    request.transitionTime = params.transitionTime.unsignedShortValue;
+    request.optionsMask = params.optionsMask.unsignedCharValue;
+    request.optionsOverride = params.optionsOverride.unsignedCharValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)enhancedMoveToHueAndSaturationWithParams:(CHIPColorControlClusterEnhancedMoveToHueAndSaturationParams *)params
+                               completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ColorControl::Commands::EnhancedMoveToHueAndSaturation::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.enhancedHue = params.enhancedHue.unsignedShortValue;
+    request.saturation = params.saturation.unsignedCharValue;
+    request.transitionTime = params.transitionTime.unsignedShortValue;
+    request.optionsMask = params.optionsMask.unsignedCharValue;
+    request.optionsOverride = params.optionsOverride.unsignedCharValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)colorLoopSetWithParams:(CHIPColorControlClusterColorLoopSetParams *)params
+             completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ColorControl::Commands::ColorLoopSet::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.updateFlags = static_cast<std::remove_reference_t<decltype(request.updateFlags)>>(params.updateFlags.unsignedCharValue);
+    request.action = static_cast<std::remove_reference_t<decltype(request.action)>>(params.action.unsignedCharValue);
+    request.direction = static_cast<std::remove_reference_t<decltype(request.direction)>>(params.direction.unsignedCharValue);
+    request.time = params.time.unsignedShortValue;
+    request.startHue = params.startHue.unsignedShortValue;
+    request.optionsMask = params.optionsMask.unsignedCharValue;
+    request.optionsOverride = params.optionsOverride.unsignedCharValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)stopMoveStepWithParams:(CHIPColorControlClusterStopMoveStepParams *)params
+             completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ColorControl::Commands::StopMoveStep::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.optionsMask = params.optionsMask.unsignedCharValue;
+    request.optionsOverride = params.optionsOverride.unsignedCharValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)moveColorTemperatureWithParams:(CHIPColorControlClusterMoveColorTemperatureParams *)params
+                     completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ColorControl::Commands::MoveColorTemperature::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.moveMode = static_cast<std::remove_reference_t<decltype(request.moveMode)>>(params.moveMode.unsignedCharValue);
+    request.rate = params.rate.unsignedShortValue;
+    request.colorTemperatureMinimumMireds = params.colorTemperatureMinimumMireds.unsignedShortValue;
+    request.colorTemperatureMaximumMireds = params.colorTemperatureMaximumMireds.unsignedShortValue;
+    request.optionsMask = params.optionsMask.unsignedCharValue;
+    request.optionsOverride = params.optionsOverride.unsignedCharValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)stepColorTemperatureWithParams:(CHIPColorControlClusterStepColorTemperatureParams *)params
+                     completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ColorControl::Commands::StepColorTemperature::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.stepMode = static_cast<std::remove_reference_t<decltype(request.stepMode)>>(params.stepMode.unsignedCharValue);
+    request.stepSize = params.stepSize.unsignedShortValue;
+    request.transitionTime = params.transitionTime.unsignedShortValue;
+    request.colorTemperatureMinimumMireds = params.colorTemperatureMinimumMireds.unsignedShortValue;
+    request.colorTemperatureMaximumMireds = params.colorTemperatureMaximumMireds.unsignedShortValue;
+    request.optionsMask = params.optionsMask.unsignedCharValue;
+    request.optionsOverride = params.optionsOverride.unsignedCharValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)readAttributeCurrentHueWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::CurrentHue::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeWiredAssessedCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentHueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::WiredAssessedCurrent::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::CurrentHue::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeWiredAssessedCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCurrentHueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::WiredAssessedCurrent::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::CurrentHue::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -48562,60 +47798,59 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeWiredNominalVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeCurrentSaturationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::WiredNominalVoltage::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::CurrentSaturation::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeWiredNominalVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentSaturationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::WiredNominalVoltage::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::CurrentSaturation::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeWiredNominalVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCurrentSaturationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::WiredNominalVoltage::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::CurrentSaturation::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -48625,60 +47860,59 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeWiredMaximumCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeRemainingTimeWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::WiredMaximumCurrent::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::RemainingTime::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeWiredMaximumCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRemainingTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::WiredMaximumCurrent::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::RemainingTime::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeWiredMaximumCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRemainingTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::WiredMaximumCurrent::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::RemainingTime::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -48688,58 +47922,57 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeWiredPresentWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeCurrentXWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::WiredPresent::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::CurrentX::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeWiredPresentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentXWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::WiredPresent::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::CurrentX::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeWiredPresentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCurrentXWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::WiredPresent::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::CurrentX::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -48749,123 +47982,119 @@ new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable *
     });
 }
 
-- (void)readAttributeActiveWiredFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeCurrentYWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPPowerSourceActiveWiredFaultsListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PowerSource::Attributes::ActiveWiredFaults::TypeInfo;
-            auto successFn = Callback<PowerSourceActiveWiredFaultsListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::CurrentY::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeActiveWiredFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentYWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPPowerSourceActiveWiredFaultsListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::ActiveWiredFaults::TypeInfo;
-            auto successFn = Callback<PowerSourceActiveWiredFaultsListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::CurrentY::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPowerSourceActiveWiredFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeActiveWiredFaultsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCurrentYWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPPowerSourceActiveWiredFaultsListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = PowerSource::Attributes::ActiveWiredFaults::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<PowerSourceActiveWiredFaultsListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ColorControl::Attributes::CurrentY::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeBatteryVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeDriftCompensationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::BatteryVoltage::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::DriftCompensation::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeBatteryVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeDriftCompensationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::BatteryVoltage::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::DriftCompensation::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBatteryVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeDriftCompensationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::BatteryVoltage::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::DriftCompensation::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -48875,60 +48104,59 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeBatteryPercentRemainingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
+- (void)readAttributeCompensationTextWithCompletionHandler:(void (^)(NSString * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::BatteryPercentRemaining::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::CompensationText::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeBatteryPercentRemainingWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCompensationTextWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::BatteryPercentRemaining::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::CompensationText::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBatteryPercentRemainingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCompensationTextWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::BatteryPercentRemaining::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::CompensationText::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -48938,60 +48166,59 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeBatteryTimeRemainingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeColorTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::BatteryTimeRemaining::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::ColorTemperature::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeBatteryTimeRemainingWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeColorTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::BatteryTimeRemaining::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::ColorTemperature::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBatteryTimeRemainingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeColorTemperatureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::BatteryTimeRemaining::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorTemperature::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -49001,23 +48228,22 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeBatteryChargeLevelWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler
+- (void)readAttributeColorModeWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::BatteryChargeLevel::TypeInfo;
+        using TypeInfo = ColorControl::Attributes::ColorMode::TypeInfo;
         auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeBatteryChargeLevelWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeColorModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -49026,7 +48252,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::BatteryChargeLevel::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorMode::TypeInfo;
             auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -49038,16 +48264,15 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBatteryChargeLevelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeColorModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::BatteryChargeLevel::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorMode::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -49063,60 +48288,88 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeBatteryReplacementNeededWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
+- (void)readAttributeOptionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::BatteryReplacementNeeded::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::Options::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeBatteryReplacementNeededWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler
+- (void)writeAttributeOptionsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    [self writeAttributeOptionsWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeOptionsWithValue:(NSNumber * _Nonnull)value
+                                params:(CHIPWriteParams * _Nullable)params
+                     completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ColorControl::Attributes::Options::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeOptionsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::BatteryReplacementNeeded::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::Options::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBatteryReplacementNeededWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOptionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::BatteryReplacementNeeded::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Options::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -49126,60 +48379,60 @@ new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable *
     });
 }
 
-- (void)readAttributeBatteryReplaceabilityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler
+- (void)readAttributeNumberOfPrimariesWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::BatteryReplaceability::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ColorControl::Attributes::NumberOfPrimaries::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeBatteryReplaceabilityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNumberOfPrimariesWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::BatteryReplaceability::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::NumberOfPrimaries::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBatteryReplaceabilityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNumberOfPrimariesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::BatteryReplaceability::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::NumberOfPrimaries::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -49189,59 +48442,57 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeBatteryPresentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributePrimary1XWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::BatteryPresent::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::Primary1X::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeBatteryPresentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePrimary1XWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::BatteryPresent::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::Primary1X::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBatteryPresentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePrimary1XWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::BatteryPresent::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary1X::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -49251,125 +48502,120 @@ new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable *
     });
 }
 
-- (void)readAttributeActiveBatteryFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributePrimary1YWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PowerSource::Attributes::ActiveBatteryFaults::TypeInfo;
-            auto successFn = Callback<PowerSourceActiveBatteryFaultsListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::Primary1Y::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeActiveBatteryFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePrimary1YWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::ActiveBatteryFaults::TypeInfo;
-            auto successFn = Callback<PowerSourceActiveBatteryFaultsListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::Primary1Y::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeActiveBatteryFaultsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePrimary1YWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPPowerSourceActiveBatteryFaultsListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = PowerSource::Attributes::ActiveBatteryFaults::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<PowerSourceActiveBatteryFaultsListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ColorControl::Attributes::Primary1Y::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeBatteryReplacementDescriptionWithCompletionHandler:(void (^)(NSString * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler
+- (void)readAttributePrimary1IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::BatteryReplacementDescription::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ColorControl::Attributes::Primary1Intensity::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeBatteryReplacementDescriptionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                params:(CHIPSubscribeParams * _Nullable)params
-                                               subscriptionEstablished:
-                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                         reportHandler:(void (^)(NSString * _Nullable value,
-                                                                           NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePrimary1IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::BatteryReplacementDescription::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::Primary1Intensity::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBatteryReplacementDescriptionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                            endpoint:(NSNumber *)endpoint
-                                                               queue:(dispatch_queue_t)queue
-                                                   completionHandler:(void (^)(NSString * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler
++ (void)readAttributePrimary1IntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::BatteryReplacementDescription::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary1Intensity::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -49379,60 +48625,57 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
-- (void)readAttributeBatteryCommonDesignationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
+- (void)readAttributePrimary2XWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::BatteryCommonDesignation::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::Primary2X::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeBatteryCommonDesignationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePrimary2XWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::BatteryCommonDesignation::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::Primary2X::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBatteryCommonDesignationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePrimary2XWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::BatteryCommonDesignation::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary2X::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -49442,60 +48685,57 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeBatteryANSIDesignationWithCompletionHandler:(void (^)(NSString * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
+- (void)readAttributePrimary2YWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::BatteryANSIDesignation::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::Primary2Y::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeBatteryANSIDesignationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:
-                                                      (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePrimary2YWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::BatteryANSIDesignation::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::Primary2Y::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBatteryANSIDesignationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
++ (void)readAttributePrimary2YWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::BatteryANSIDesignation::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary2Y::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -49505,60 +48745,60 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
-- (void)readAttributeBatteryIECDesignationWithCompletionHandler:(void (^)(NSString * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler
+- (void)readAttributePrimary2IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::BatteryIECDesignation::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ColorControl::Attributes::Primary2Intensity::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeBatteryIECDesignationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePrimary2IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::BatteryIECDesignation::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::Primary2Intensity::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBatteryIECDesignationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePrimary2IntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::BatteryIECDesignation::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary2Intensity::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -49568,60 +48808,57 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
-- (void)readAttributeBatteryApprovedChemistryWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
+- (void)readAttributePrimary3XWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::BatteryApprovedChemistry::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::Primary3X::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeBatteryApprovedChemistryWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePrimary3XWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::BatteryApprovedChemistry::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::Primary3X::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBatteryApprovedChemistryWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePrimary3XWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::BatteryApprovedChemistry::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary3X::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -49631,59 +48868,57 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeBatteryCapacityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributePrimary3YWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::BatteryCapacity::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::Primary3Y::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeBatteryCapacityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePrimary3YWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::BatteryCapacity::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::Primary3Y::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBatteryCapacityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePrimary3YWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::BatteryCapacity::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary3Y::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -49693,59 +48928,60 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeBatteryQuantityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributePrimary3IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::BatteryQuantity::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ColorControl::Attributes::Primary3Intensity::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeBatteryQuantityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePrimary3IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::BatteryQuantity::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::Primary3Intensity::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBatteryQuantityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePrimary3IntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::BatteryQuantity::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary3Intensity::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -49755,59 +48991,57 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeBatteryChargeStateWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler
+- (void)readAttributePrimary4XWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::BatteryChargeState::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::Primary4X::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeBatteryChargeStateWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePrimary4XWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::BatteryChargeState::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::Primary4X::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBatteryChargeStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePrimary4XWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::BatteryChargeState::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary4X::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -49817,60 +49051,57 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeBatteryTimeToFullChargeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
+- (void)readAttributePrimary4YWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::BatteryTimeToFullCharge::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::Primary4Y::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeBatteryTimeToFullChargeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePrimary4YWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::BatteryTimeToFullCharge::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::Primary4Y::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBatteryTimeToFullChargeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePrimary4YWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::BatteryTimeToFullCharge::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary4Y::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -49880,60 +49111,60 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeBatteryFunctionalWhileChargingWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributePrimary4IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::BatteryFunctionalWhileCharging::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ColorControl::Attributes::Primary4Intensity::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeBatteryFunctionalWhileChargingWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                                subscriptionEstablished:
-                                                    (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                          reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePrimary4IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::BatteryFunctionalWhileCharging::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::Primary4Intensity::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBatteryFunctionalWhileChargingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                             endpoint:(NSNumber *)endpoint
-                                                                queue:(dispatch_queue_t)queue
-                                                    completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler
++ (void)readAttributePrimary4IntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::BatteryFunctionalWhileCharging::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary4Intensity::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -49943,60 +49174,57 @@ new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable *
     });
 }
 
-- (void)readAttributeBatteryChargingCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
+- (void)readAttributePrimary5XWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::BatteryChargingCurrent::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::Primary5X::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeBatteryChargingCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:
-                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePrimary5XWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::BatteryChargingCurrent::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::Primary5X::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBatteryChargingCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePrimary5XWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::BatteryChargingCurrent::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary5X::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -50006,315 +49234,303 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeActiveBatteryChargeFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
+- (void)readAttributePrimary5YWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PowerSource::Attributes::ActiveBatteryChargeFaults::TypeInfo;
-            auto successFn = Callback<PowerSourceActiveBatteryChargeFaultsListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::Primary5Y::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeActiveBatteryChargeFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                            params:(CHIPSubscribeParams * _Nullable)params
-                                           subscriptionEstablished:
-                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                     reportHandler:(void (^)(NSArray * _Nullable value,
-                                                                       NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePrimary5YWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::ActiveBatteryChargeFaults::TypeInfo;
-            auto successFn = Callback<PowerSourceActiveBatteryChargeFaultsListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::Primary5Y::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeActiveBatteryChargeFaultsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                        endpoint:(NSNumber *)endpoint
-                                                           queue:(dispatch_queue_t)queue
-                                               completionHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePrimary5YWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPPowerSourceActiveBatteryChargeFaultsListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = PowerSource::Attributes::ActiveBatteryChargeFaults::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<PowerSourceActiveBatteryChargeFaultsListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ColorControl::Attributes::Primary5Y::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributePrimary5IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPPowerSourceGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPNullableInt8uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PowerSource::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<PowerSourceGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::Primary5Intensity::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePrimary5IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPPowerSourceGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<PowerSourceGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::Primary5Intensity::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPowerSourceGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPPowerSourceGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = PowerSource::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<PowerSourceGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
++ (void)readAttributePrimary5IntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ColorControl::Attributes::Primary5Intensity::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributePrimary6XWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPPowerSourceAcceptedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PowerSource::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<PowerSourceAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::Primary6X::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePrimary6XWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPPowerSourceAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<PowerSourceAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::Primary6X::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPowerSourceAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePrimary6XWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPPowerSourceAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = PowerSource::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<PowerSourceAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ColorControl::Attributes::Primary6X::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributePrimary6YWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPPowerSourceAttributeListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PowerSource::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<PowerSourceAttributeListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::Primary6Y::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePrimary6YWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPPowerSourceAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<PowerSourceAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::Primary6Y::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPowerSourceAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePrimary6YWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPPowerSourceAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = PowerSource::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<PowerSourceAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ColorControl::Attributes::Primary6Y::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributePrimary6IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ColorControl::Attributes::Primary6Intensity::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePrimary6IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::Primary6Intensity::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePrimary6IntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary6Intensity::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -50324,23 +49540,54 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeWhitePointXWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSource::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = ColorControl::Attributes::WhitePointX::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeWhitePointXWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeWhitePointXWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeWhitePointXWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ColorControl::Attributes::WhitePointX::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeWhitePointXWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -50349,7 +49596,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSource::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::WhitePointX::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -50361,16 +49608,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeWhitePointXWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSource::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::WhitePointX::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -50386,322 +49633,378 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPPowerSourceConfiguration
-
-- (chip::Controller::ClusterBase *)getCluster
+- (void)readAttributeWhitePointYWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    return &_cppCluster;
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::WhitePointY::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)readAttributeSourcesWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeWhitePointYWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPPowerSourceConfigurationSourcesListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PowerSourceConfiguration::Attributes::Sources::TypeInfo;
-            auto successFn = Callback<PowerSourceConfigurationSourcesListAttributeCallback>::FromCancelable(success);
+    [self writeAttributeWhitePointYWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeWhitePointYWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ColorControl::Attributes::WhitePointY::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeSourcesWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeWhitePointYWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPPowerSourceConfigurationSourcesListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSourceConfiguration::Attributes::Sources::TypeInfo;
-            auto successFn = Callback<PowerSourceConfigurationSourcesListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::WhitePointY::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPowerSourceConfigurationSourcesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSourcesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeWhitePointYWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPPowerSourceConfigurationSourcesListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = PowerSourceConfiguration::Attributes::Sources::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<PowerSourceConfigurationSourcesListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ColorControl::Attributes::WhitePointY::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeColorPointRXWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PowerSourceConfiguration::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<PowerSourceConfigurationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::ColorPointRX::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributeColorPointRXWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeColorPointRXWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeColorPointRXWithValue:(NSNumber * _Nonnull)value
+                                     params:(CHIPWriteParams * _Nullable)params
+                          completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ColorControl::Attributes::ColorPointRX::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeColorPointRXWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSourceConfiguration::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<PowerSourceConfigurationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::ColorPointRX::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeColorPointRXWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPPowerSourceConfigurationGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = PowerSourceConfiguration::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<PowerSourceConfigurationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ColorControl::Attributes::ColorPointRX::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeColorPointRYWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PowerSourceConfiguration::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<PowerSourceConfigurationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::ColorPointRY::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributeColorPointRYWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeColorPointRYWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeColorPointRYWithValue:(NSNumber * _Nonnull)value
+                                     params:(CHIPWriteParams * _Nullable)params
+                          completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ColorControl::Attributes::ColorPointRY::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeColorPointRYWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSourceConfiguration::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<PowerSourceConfigurationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::ColorPointRY::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeColorPointRYWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPPowerSourceConfigurationAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = PowerSourceConfiguration::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<PowerSourceConfigurationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ColorControl::Attributes::ColorPointRY::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeColorPointRIntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPPowerSourceConfigurationAttributeListListAttributeCallbackBridge(
+    new CHIPNullableInt8uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PowerSourceConfiguration::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<PowerSourceConfigurationAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::ColorPointRIntensity::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeColorPointRIntensityWithValue:(NSNumber * _Nullable)value
+                                  completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPPowerSourceConfigurationAttributeListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = PowerSourceConfiguration::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<PowerSourceConfigurationAttributeListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPowerSourceConfigurationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+    [self writeAttributeColorPointRIntensityWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
 }
-
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeColorPointRIntensityWithValue:(NSNumber * _Nullable)value
+                                             params:(CHIPWriteParams * _Nullable)params
+                                  completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPPowerSourceConfigurationAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = PowerSourceConfiguration::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<PowerSourceConfigurationAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ColorControl::Attributes::ColorPointRIntensity::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
             }
-            return CHIP_ERROR_NOT_FOUND;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSourceConfiguration::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeColorPointRIntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSourceConfiguration::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::ColorPointRIntensity::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeColorPointRIntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSourceConfiguration::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorPointRIntensity::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -50711,23 +50014,54 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeColorPointGXWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PowerSourceConfiguration::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = ColorControl::Attributes::ColorPointGX::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeColorPointGXWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeColorPointGXWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeColorPointGXWithValue:(NSNumber * _Nonnull)value
+                                     params:(CHIPWriteParams * _Nullable)params
+                          completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ColorControl::Attributes::ColorPointGX::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeColorPointGXWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -50736,7 +50070,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PowerSourceConfiguration::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorPointGX::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -50748,16 +50082,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeColorPointGXWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PowerSourceConfiguration::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorPointGX::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -50773,69 +50107,90 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPPressureMeasurement
-
-- (chip::Controller::ClusterBase *)getCluster
+- (void)readAttributeColorPointGYWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    return &_cppCluster;
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::ColorPointGY::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)readAttributeMeasuredValueWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeColorPointGYWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PressureMeasurement::Attributes::MeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+    [self writeAttributeColorPointGYWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeColorPointGYWithValue:(NSNumber * _Nonnull)value
+                                     params:(CHIPWriteParams * _Nullable)params
+                          completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ColorControl::Attributes::ColorPointGY::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeColorPointGYWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PressureMeasurement::Attributes::MeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::ColorPointGY::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeColorPointGYWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PressureMeasurement::Attributes::MeasuredValue::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorPointGY::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -50845,60 +50200,99 @@ new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeMinMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeColorPointGIntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(
+    new CHIPNullableInt8uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PressureMeasurement::Attributes::MinMeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::ColorPointGIntensity::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeMinMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeColorPointGIntensityWithValue:(NSNumber * _Nullable)value
+                                  completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
+    [self writeAttributeColorPointGIntensityWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeColorPointGIntensityWithValue:(NSNumber * _Nullable)value
+                                             params:(CHIPWriteParams * _Nullable)params
+                                  completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ColorControl::Attributes::ColorPointGIntensity::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeColorPointGIntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PressureMeasurement::Attributes::MinMeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::ColorPointGIntensity::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMinMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeColorPointGIntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PressureMeasurement::Attributes::MinMeasuredValue::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorPointGIntensity::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -50908,60 +50302,90 @@ new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeMaxMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeColorPointBXWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PressureMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::ColorPointBX::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeMaxMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeColorPointBXWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
+    [self writeAttributeColorPointBXWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeColorPointBXWithValue:(NSNumber * _Nonnull)value
+                                     params:(CHIPWriteParams * _Nullable)params
+                          completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ColorControl::Attributes::ColorPointBX::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeColorPointBXWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PressureMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::ColorPointBX::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMaxMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeColorPointBXWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PressureMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorPointBX::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -50971,22 +50395,54 @@ new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeToleranceWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeColorPointBYWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PressureMeasurement::Attributes::Tolerance::TypeInfo;
+        using TypeInfo = ColorControl::Attributes::ColorPointBY::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeToleranceWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeColorPointBYWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeColorPointBYWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeColorPointBYWithValue:(NSNumber * _Nonnull)value
+                                     params:(CHIPWriteParams * _Nullable)params
+                          completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ColorControl::Attributes::ColorPointBY::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeColorPointBYWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -50995,7 +50451,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PressureMeasurement::Attributes::Tolerance::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorPointBY::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -51007,15 +50463,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeToleranceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeColorPointBYWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PressureMeasurement::Attributes::Tolerance::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorPointBY::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -51031,59 +50488,99 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeScaledValueWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeColorPointBIntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(
+    new CHIPNullableInt8uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PressureMeasurement::Attributes::ScaledValue::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::ColorPointBIntensity::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeScaledValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeColorPointBIntensityWithValue:(NSNumber * _Nullable)value
+                                  completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
+    [self writeAttributeColorPointBIntensityWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeColorPointBIntensityWithValue:(NSNumber * _Nullable)value
+                                             params:(CHIPWriteParams * _Nullable)params
+                                  completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ColorControl::Attributes::ColorPointBIntensity::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeColorPointBIntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PressureMeasurement::Attributes::ScaledValue::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::ColorPointBIntensity::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeScaledValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeColorPointBIntensityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PressureMeasurement::Attributes::ScaledValue::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorPointBIntensity::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -51093,60 +50590,59 @@ new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeMinScaledValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeEnhancedCurrentHueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PressureMeasurement::Attributes::MinScaledValue::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::EnhancedCurrentHue::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeMinScaledValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeEnhancedCurrentHueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PressureMeasurement::Attributes::MinScaledValue::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::EnhancedCurrentHue::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMinScaledValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeEnhancedCurrentHueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PressureMeasurement::Attributes::MinScaledValue::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::EnhancedCurrentHue::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -51156,60 +50652,59 @@ new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeMaxScaledValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeEnhancedColorModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PressureMeasurement::Attributes::MaxScaledValue::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::EnhancedColorMode::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeMaxScaledValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeEnhancedColorModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PressureMeasurement::Attributes::MaxScaledValue::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::EnhancedColorMode::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMaxScaledValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeEnhancedColorModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PressureMeasurement::Attributes::MaxScaledValue::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::EnhancedColorMode::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -51219,59 +50714,59 @@ new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeScaledToleranceWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeColorLoopActiveWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PressureMeasurement::Attributes::ScaledTolerance::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::ColorLoopActive::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeScaledToleranceWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeColorLoopActiveWithMinInterval:(NSNumber * _Nonnull)minInterval
                                              maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(CHIPSubscribeParams * _Nullable)params
                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                            reportHandler:
                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PressureMeasurement::Attributes::ScaledTolerance::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::ColorLoopActive::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeScaledToleranceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeColorLoopActiveWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                               endpoint:(NSNumber *)endpoint
                                                  queue:(dispatch_queue_t)queue
                                      completionHandler:
                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PressureMeasurement::Attributes::ScaledTolerance::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorLoopActive::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -51281,56 +50776,59 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeScaleWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeColorLoopDirectionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PressureMeasurement::Attributes::Scale::TypeInfo;
-        auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::ColorLoopDirection::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeScaleWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                        params:(CHIPSubscribeParams * _Nullable)params
-                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeColorLoopDirectionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8sAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PressureMeasurement::Attributes::Scale::TypeInfo;
-            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::ColorLoopDirection::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeScaleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                    endpoint:(NSNumber *)endpoint
-                                       queue:(dispatch_queue_t)queue
-                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeColorLoopDirectionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PressureMeasurement::Attributes::Scale::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorLoopDirection::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -51340,250 +50838,247 @@ new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeColorLoopTimeWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPPressureMeasurementGeneratedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PressureMeasurement::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<PressureMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::ColorLoopTime::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeColorLoopTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPPressureMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PressureMeasurement::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<PressureMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::ColorLoopTime::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPressureMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeColorLoopTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPPressureMeasurementGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = PressureMeasurement::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<PressureMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ColorControl::Attributes::ColorLoopTime::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeColorLoopStartEnhancedHueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler
 {
-    new CHIPPressureMeasurementAcceptedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PressureMeasurement::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<PressureMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::ColorLoopStartEnhancedHue::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeColorLoopStartEnhancedHueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                            params:(CHIPSubscribeParams * _Nullable)params
+                                           subscriptionEstablished:
+                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))reportHandler
 {
-    new CHIPPressureMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PressureMeasurement::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<PressureMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::ColorLoopStartEnhancedHue::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPressureMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPPressureMeasurementAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = PressureMeasurement::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<PressureMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
++ (void)readAttributeColorLoopStartEnhancedHueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                        endpoint:(NSNumber *)endpoint
+                                                           queue:(dispatch_queue_t)queue
+                                               completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ColorControl::Attributes::ColorLoopStartEnhancedHue::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeColorLoopStoredEnhancedHueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler
 {
-    new CHIPPressureMeasurementAttributeListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PressureMeasurement::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<PressureMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::ColorLoopStoredEnhancedHue::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeColorLoopStoredEnhancedHueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                             params:(CHIPSubscribeParams * _Nullable)params
+                                            subscriptionEstablished:
+                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))reportHandler
 {
-    new CHIPPressureMeasurementAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PressureMeasurement::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<PressureMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::ColorLoopStoredEnhancedHue::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPressureMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeColorLoopStoredEnhancedHueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                         endpoint:(NSNumber *)endpoint
+                                                            queue:(dispatch_queue_t)queue
+                                                completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPPressureMeasurementAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = PressureMeasurement::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<PressureMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ColorControl::Attributes::ColorLoopStoredEnhancedHue::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeColorCapabilitiesWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PressureMeasurement::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::ColorCapabilities::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeColorCapabilitiesWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PressureMeasurement::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::ColorCapabilities::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeColorCapabilitiesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PressureMeasurement::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorCapabilities::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -51593,23 +51088,24 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeColorTempPhysicalMinMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PressureMeasurement::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = ColorControl::Attributes::ColorTempPhysicalMinMireds::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeColorTempPhysicalMinMiredsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                             params:(CHIPSubscribeParams * _Nullable)params
+                                            subscriptionEstablished:
+                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -51618,7 +51114,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PressureMeasurement::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorTempPhysicalMinMireds::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -51630,16 +51126,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeColorTempPhysicalMinMiredsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                         endpoint:(NSNumber *)endpoint
+                                                            queue:(dispatch_queue_t)queue
+                                                completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PressureMeasurement::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorTempPhysicalMinMireds::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -51655,68 +51151,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPPumpConfigurationAndControl
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)readAttributeMaxPressureWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeColorTempPhysicalMaxMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxPressure::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::ColorTempPhysicalMaxMireds::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeMaxPressureWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeColorTempPhysicalMaxMiredsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                             params:(CHIPSubscribeParams * _Nullable)params
+                                            subscriptionEstablished:
+                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxPressure::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::ColorTempPhysicalMaxMireds::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMaxPressureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeColorTempPhysicalMaxMiredsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                         endpoint:(NSNumber *)endpoint
+                                                            queue:(dispatch_queue_t)queue
+                                                completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxPressure::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorTempPhysicalMaxMireds::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -51726,58 +51214,60 @@ new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeMaxSpeedWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeCoupleColorTempToLevelMinMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxSpeed::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::CoupleColorTempToLevelMinMireds::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeMaxSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCoupleColorTempToLevelMinMiredsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                                 subscriptionEstablished:
+                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxSpeed::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::CoupleColorTempToLevelMinMireds::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMaxSpeedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCoupleColorTempToLevelMinMiredsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                              endpoint:(NSNumber *)endpoint
+                                                                 queue:(dispatch_queue_t)queue
+                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxSpeed::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::CoupleColorTempToLevelMinMireds::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -51787,57 +51277,95 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeMaxFlowWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeStartUpColorTemperatureMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxFlow::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::StartUpColorTemperatureMireds::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributeStartUpColorTemperatureMiredsWithValue:(NSNumber * _Nonnull)value
+                                           completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeStartUpColorTemperatureMiredsWithValue:(NSNumber * _Nonnull) value
+                                                        params:nil
+                                             completionHandler:completionHandler];
+}
+- (void)writeAttributeStartUpColorTemperatureMiredsWithValue:(NSNumber * _Nonnull)value
+                                                      params:(CHIPWriteParams * _Nullable)params
+                                           completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ColorControl::Attributes::StartUpColorTemperatureMireds::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeMaxFlowWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeStartUpColorTemperatureMiredsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                params:(CHIPSubscribeParams * _Nullable)params
+                                               subscriptionEstablished:
+                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxFlow::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::StartUpColorTemperatureMireds::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMaxFlowWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeStartUpColorTemperatureMiredsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                            endpoint:(NSNumber *)endpoint
+                                                               queue:(dispatch_queue_t)queue
+                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxFlow::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::StartUpColorTemperatureMireds::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -51847,249 +51375,250 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeMinConstPressureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(
+    new CHIPColorControlGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstPressure::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<ColorControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeMinConstPressureWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPColorControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstPressure::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<ColorControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPColorControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMinConstPressureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstPressure::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPColorControlGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = ColorControl::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<ColorControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeMaxConstPressureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(
+    new CHIPColorControlAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstPressure::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<ColorControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeMaxConstPressureWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPColorControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstPressure::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<ColorControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPColorControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMaxConstPressureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstPressure::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPColorControlAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = ColorControl::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<ColorControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeMinCompPressureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(
+    new CHIPColorControlAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MinCompPressure::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<ColorControlAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeMinCompPressureWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPColorControlAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MinCompPressure::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<ColorControlAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPColorControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMinCompPressureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MinCompPressure::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPColorControlAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = ColorControl::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<ColorControlAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeMaxCompPressureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxCompPressure::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeMaxCompPressureWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxCompPressure::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMaxCompPressureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxCompPressure::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -52099,60 +51628,59 @@ new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeMinConstSpeedWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstSpeed::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ColorControl::Attributes::ClusterRevision::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeMinConstSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstSpeed::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ColorControl::Attributes::ClusterRevision::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMinConstSpeedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstSpeed::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -52162,19 +51690,28 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeMaxConstSpeedWithCompletionHandler:(void (^)(
+@end
+
+@implementation CHIPIlluminanceMeasurement
+
+- (chip::Controller::ClusterBase *)getCluster
+{
+    return &_cppCluster;
+}
+
+- (void)readAttributeMeasuredValueWithCompletionHandler:(void (^)(
                                                             NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPNullableInt16uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstSpeed::TypeInfo;
+            using TypeInfo = IlluminanceMeasurement::Attributes::MeasuredValue::TypeInfo;
             auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeMaxConstSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
@@ -52188,7 +51725,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstSpeed::TypeInfo;
+            using TypeInfo = IlluminanceMeasurement::Attributes::MeasuredValue::TypeInfo;
             auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -52200,7 +51737,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMaxConstSpeedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
@@ -52209,7 +51746,7 @@ + (void)readAttributeMaxConstSpeedWithAttributeCache:(CHIPAttributeCacheContaine
     new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstSpeed::TypeInfo;
+            using TypeInfo = IlluminanceMeasurement::Attributes::MeasuredValue::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -52225,23 +51762,24 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeMinConstFlowWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeMinMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPNullableInt16uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstFlow::TypeInfo;
+            using TypeInfo = IlluminanceMeasurement::Attributes::MinMeasuredValue::TypeInfo;
             auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeMinConstFlowWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMinMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -52250,7 +51788,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstFlow::TypeInfo;
+            using TypeInfo = IlluminanceMeasurement::Attributes::MinMeasuredValue::TypeInfo;
             auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -52262,16 +51800,16 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMinConstFlowWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMinMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstFlow::TypeInfo;
+            using TypeInfo = IlluminanceMeasurement::Attributes::MinMeasuredValue::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -52287,23 +51825,24 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeMaxConstFlowWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeMaxMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPNullableInt16uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstFlow::TypeInfo;
+            using TypeInfo = IlluminanceMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
             auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeMaxConstFlowWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMaxMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -52312,7 +51851,7 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstFlow::TypeInfo;
+            using TypeInfo = IlluminanceMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
             auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -52324,16 +51863,16 @@ new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMaxConstFlowWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMaxMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstFlow::TypeInfo;
+            using TypeInfo = IlluminanceMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -52349,59 +51888,57 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeMinConstTempWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeToleranceWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstTemp::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = IlluminanceMeasurement::Attributes::Tolerance::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeMinConstTempWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeToleranceWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstTemp::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = IlluminanceMeasurement::Attributes::Tolerance::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMinConstTempWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeToleranceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstTemp::TypeInfo;
+            using TypeInfo = IlluminanceMeasurement::Attributes::Tolerance::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -52411,59 +51948,60 @@ new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeMaxConstTempWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeLightSensorTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(
+    new CHIPNullableInt8uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstTemp::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = IlluminanceMeasurement::Attributes::LightSensorType::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeMaxConstTempWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeLightSensorTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstTemp::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = IlluminanceMeasurement::Attributes::LightSensorType::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMaxConstTempWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeLightSensorTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstTemp::TypeInfo;
+            using TypeInfo = IlluminanceMeasurement::Attributes::LightSensorType::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -52473,59 +52011,62 @@ new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributePumpStatusWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackBridge(
+    new CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::PumpStatus::TypeInfo;
-            auto successFn = Callback<PumpConfigurationAndControlPumpStatusAttributeCallback>::FromCancelable(success);
+            using TypeInfo = IlluminanceMeasurement::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<IlluminanceMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributePumpStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackSubscriptionBridge(
+    new CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::PumpStatus::TypeInfo;
-            auto successFn = Callback<PumpConfigurationAndControlPumpStatusAttributeCallback>::FromCancelable(success);
+            using TypeInfo = IlluminanceMeasurement::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<IlluminanceMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePumpStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackBridge(
+    new CHIPIlluminanceMeasurementGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = PumpConfigurationAndControl::Attributes::PumpStatus::TypeInfo;
+                using TypeInfo = IlluminanceMeasurement::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<PumpConfigurationAndControlPumpStatusAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<IlluminanceMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -52535,66 +52076,62 @@ new CHIPPumpConfigurationAndControlPumpStatusAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeEffectiveOperationModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge(
+    new CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::EffectiveOperationMode::TypeInfo;
-            auto successFn
-                = Callback<PumpConfigurationAndControlClusterPumpOperationModeAttributeCallback>::FromCancelable(success);
+            using TypeInfo = IlluminanceMeasurement::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<IlluminanceMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeEffectiveOperationModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:
-                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackSubscriptionBridge(
+    new CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::EffectiveOperationMode::TypeInfo;
-            auto successFn
-                = Callback<PumpConfigurationAndControlClusterPumpOperationModeAttributeCallback>::FromCancelable(success);
+            using TypeInfo = IlluminanceMeasurement::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<IlluminanceMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackSubscriptionBridge::
-                    OnSubscriptionEstablished,
+                CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
                 nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeEffectiveOperationModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge(
+    new CHIPIlluminanceMeasurementAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = PumpConfigurationAndControl::Attributes::EffectiveOperationMode::TypeInfo;
+                using TypeInfo = IlluminanceMeasurement::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<PumpConfigurationAndControlClusterPumpOperationModeAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<IlluminanceMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -52604,63 +52141,60 @@ new CHIPPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBrid
         });
 }
 
-- (void)readAttributeEffectiveControlModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge(
+    new CHIPIlluminanceMeasurementAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::EffectiveControlMode::TypeInfo;
-            auto successFn = Callback<PumpConfigurationAndControlClusterPumpControlModeAttributeCallback>::FromCancelable(success);
+            using TypeInfo = IlluminanceMeasurement::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<IlluminanceMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeEffectiveControlModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackSubscriptionBridge(
+    new CHIPIlluminanceMeasurementAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::EffectiveControlMode::TypeInfo;
-            auto successFn = Callback<PumpConfigurationAndControlClusterPumpControlModeAttributeCallback>::FromCancelable(success);
+            using TypeInfo = IlluminanceMeasurement::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<IlluminanceMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPIlluminanceMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeEffectiveControlModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge(
+    new CHIPIlluminanceMeasurementAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = PumpConfigurationAndControl::Attributes::EffectiveControlMode::TypeInfo;
+                using TypeInfo = IlluminanceMeasurement::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<PumpConfigurationAndControlClusterPumpControlModeAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<IlluminanceMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -52670,58 +52204,57 @@ new CHIPPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge
         });
 }
 
-- (void)readAttributeCapacityWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::Capacity::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = IlluminanceMeasurement::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeCapacityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::Capacity::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = IlluminanceMeasurement::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCapacityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::Capacity::TypeInfo;
+            using TypeInfo = IlluminanceMeasurement::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -52731,57 +52264,59 @@ new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeSpeedWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::Speed::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = IlluminanceMeasurement::Attributes::ClusterRevision::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                        params:(CHIPSubscribeParams * _Nullable)params
-                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::Speed::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = IlluminanceMeasurement::Attributes::ClusterRevision::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSpeedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                    endpoint:(NSNumber *)endpoint
-                                       queue:(dispatch_queue_t)queue
-                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::Speed::TypeInfo;
+            using TypeInfo = IlluminanceMeasurement::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -52791,99 +52326,69 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeLifetimeRunningHoursWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt32uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::LifetimeRunningHours::TypeInfo;
-            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
+@end
 
-- (void)writeAttributeLifetimeRunningHoursWithValue:(NSNumber * _Nullable)value
-                                  completionHandler:(StatusCompletion)completionHandler
+@implementation CHIPTemperatureMeasurement
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    [self writeAttributeLifetimeRunningHoursWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+    return &_cppCluster;
 }
-- (void)writeAttributeLifetimeRunningHoursWithValue:(NSNumber * _Nullable)value
-                                             params:(CHIPWriteParams * _Nullable)params
-                                  completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
 
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::LifetimeRunningHours::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedIntValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+- (void)readAttributeMeasuredValueWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPNullableInt16sAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TemperatureMeasurement::Attributes::MeasuredValue::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeLifetimeRunningHoursWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::LifetimeRunningHours::TypeInfo;
-            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TemperatureMeasurement::Attributes::MeasuredValue::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeLifetimeRunningHoursWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::LifetimeRunningHours::TypeInfo;
+            using TypeInfo = TemperatureMeasurement::Attributes::MeasuredValue::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -52893,57 +52398,60 @@ new CHIPNullableInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributePowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeMinMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt32uAttributeCallbackBridge(
+    new CHIPNullableInt16sAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::Power::TypeInfo;
-            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TemperatureMeasurement::Attributes::MinMeasuredValue::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributePowerWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                        params:(CHIPSubscribeParams * _Nullable)params
-                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMinMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::Power::TypeInfo;
-            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TemperatureMeasurement::Attributes::MinMeasuredValue::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                    endpoint:(NSNumber *)endpoint
-                                       queue:(dispatch_queue_t)queue
-                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMinMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::Power::TypeInfo;
+            using TypeInfo = TemperatureMeasurement::Attributes::MinMeasuredValue::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -52953,101 +52461,120 @@ new CHIPNullableInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeLifetimeEnergyConsumedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
+- (void)readAttributeMaxMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt32uAttributeCallbackBridge(
+    new CHIPNullableInt16sAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::LifetimeEnergyConsumed::TypeInfo;
-            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TemperatureMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeLifetimeEnergyConsumedWithValue:(NSNumber * _Nullable)value
-                                    completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeMaxMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeLifetimeEnergyConsumedWithValue:(NSNumber * _Nullable) value
-                                                 params:nil
-                                      completionHandler:completionHandler];
+    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = TemperatureMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
-- (void)writeAttributeLifetimeEnergyConsumedWithValue:(NSNumber * _Nullable)value
-                                               params:(CHIPWriteParams * _Nullable)params
-                                    completionHandler:(StatusCompletion)completionHandler
+
++ (void)readAttributeMaxMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = TemperatureMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
 
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::LifetimeEnergyConsumed::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedIntValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+- (void)readAttributeToleranceWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TemperatureMeasurement::Attributes::Tolerance::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeLifetimeEnergyConsumedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:
-                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeToleranceWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::LifetimeEnergyConsumed::TypeInfo;
-            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TemperatureMeasurement::Attributes::Tolerance::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeLifetimeEnergyConsumedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeToleranceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::LifetimeEnergyConsumed::TypeInfo;
+            using TypeInfo = TemperatureMeasurement::Attributes::Tolerance::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -53057,97 +52584,62 @@ new CHIPNullableInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeOperationModeWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge(
+    new CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::OperationMode::TypeInfo;
-            auto successFn
-                = Callback<PumpConfigurationAndControlClusterPumpOperationModeAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TemperatureMeasurement::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<TemperatureMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeOperationModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeOperationModeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeOperationModeWithValue:(NSNumber * _Nonnull)value
-                                      params:(CHIPWriteParams * _Nullable)params
-                           completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::OperationMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeOperationModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackSubscriptionBridge(
+    new CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::OperationMode::TypeInfo;
-            auto successFn
-                = Callback<PumpConfigurationAndControlClusterPumpOperationModeAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TemperatureMeasurement::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<TemperatureMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackSubscriptionBridge::
-                    OnSubscriptionEstablished,
+                CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
                 nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOperationModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge(
+    new CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = PumpConfigurationAndControl::Attributes::OperationMode::TypeInfo;
+                using TypeInfo = TemperatureMeasurement::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<PumpConfigurationAndControlClusterPumpOperationModeAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<TemperatureMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -53157,209 +52649,43 @@ new CHIPPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBrid
         });
 }
 
-- (void)readAttributeControlModeWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge(
+    new CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::ControlMode::TypeInfo;
-            auto successFn = Callback<PumpConfigurationAndControlClusterPumpControlModeAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TemperatureMeasurement::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<TemperatureMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeControlModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeControlModeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeControlModeWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::ControlMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeControlModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::ControlMode::TypeInfo;
-            auto successFn = Callback<PumpConfigurationAndControlClusterPumpControlModeAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeControlModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = PumpConfigurationAndControl::Attributes::ControlMode::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<PumpConfigurationAndControlClusterPumpControlModeAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
-{
-    new CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn
-                = Callback<PumpConfigurationAndControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn
-                = Callback<PumpConfigurationAndControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackSubscriptionBridge::
-                    OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPPumpConfigurationAndControlGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = PumpConfigurationAndControl::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<PumpConfigurationAndControlGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
-{
-    new CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<PumpConfigurationAndControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<PumpConfigurationAndControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackSubscriptionBridge::
-                    OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+    new CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = TemperatureMeasurement::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<TemperatureMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
 
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
@@ -53368,18 +52694,17 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = PumpConfigurationAndControl::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = TemperatureMeasurement::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<PumpConfigurationAndControlAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<TemperatureMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -53392,10 +52717,10 @@ new CHIPPumpConfigurationAndControlAcceptedCommandListListAttributeCallbackBridg
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackBridge(
+    new CHIPTemperatureMeasurementAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = PumpConfigurationAndControl::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<PumpConfigurationAndControlAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TemperatureMeasurement::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<TemperatureMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -53407,19 +52732,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPTemperatureMeasurementAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<PumpConfigurationAndControlAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TemperatureMeasurement::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<TemperatureMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPTemperatureMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -53432,17 +52757,17 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPPumpConfigurationAndControlAttributeListListAttributeCallbackBridge(
+    new CHIPTemperatureMeasurementAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = PumpConfigurationAndControl::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = TemperatureMeasurement::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<PumpConfigurationAndControlAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<TemperatureMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -53456,7 +52781,7 @@ - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PumpConfigurationAndControl::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = TemperatureMeasurement::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -53476,7 +52801,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = TemperatureMeasurement::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -53496,7 +52821,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = TemperatureMeasurement::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -53516,7 +52841,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = PumpConfigurationAndControl::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = TemperatureMeasurement::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -53537,7 +52862,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = PumpConfigurationAndControl::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = TemperatureMeasurement::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -53558,7 +52883,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = TemperatureMeasurement::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -53576,7 +52901,7 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPRelativeHumidityMeasurement
+@implementation CHIPPressureMeasurement
 
 - (chip::Controller::ClusterBase *)getCluster
 {
@@ -53586,10 +52911,10 @@ @implementation CHIPRelativeHumidityMeasurement
 - (void)readAttributeMeasuredValueWithCompletionHandler:(void (^)(
                                                             NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(
+    new CHIPNullableInt16sAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::MeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PressureMeasurement::Attributes::MeasuredValue::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -53602,19 +52927,19 @@ - (void)subscribeAttributeMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minI
                                          reportHandler:
                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::MeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PressureMeasurement::Attributes::MeasuredValue::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -53627,16 +52952,16 @@ + (void)readAttributeMeasuredValueWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::MeasuredValue::TypeInfo;
+            using TypeInfo = PressureMeasurement::Attributes::MeasuredValue::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -53649,10 +52974,10 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
 - (void)readAttributeMinMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(
+    new CHIPNullableInt16sAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::MinMeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PressureMeasurement::Attributes::MinMeasuredValue::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -53665,19 +52990,19 @@ - (void)subscribeAttributeMinMeasuredValueWithMinInterval:(NSNumber * _Nonnull)m
                                             reportHandler:
                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::MinMeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PressureMeasurement::Attributes::MinMeasuredValue::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -53690,16 +53015,16 @@ + (void)readAttributeMinMeasuredValueWithAttributeCache:(CHIPAttributeCacheConta
                                       completionHandler:
                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::MinMeasuredValue::TypeInfo;
+            using TypeInfo = PressureMeasurement::Attributes::MinMeasuredValue::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -53712,10 +53037,10 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
 - (void)readAttributeMaxMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(
+    new CHIPNullableInt16sAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PressureMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -53728,19 +53053,19 @@ - (void)subscribeAttributeMaxMeasuredValueWithMinInterval:(NSNumber * _Nonnull)m
                                             reportHandler:
                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PressureMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -53753,16 +53078,16 @@ + (void)readAttributeMaxMeasuredValueWithAttributeCache:(CHIPAttributeCacheConta
                                       completionHandler:
                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
+            using TypeInfo = PressureMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -53776,7 +53101,7 @@ - (void)readAttributeToleranceWithCompletionHandler:(void (^)(
                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = RelativeHumidityMeasurement::Attributes::Tolerance::TypeInfo;
+        using TypeInfo = PressureMeasurement::Attributes::Tolerance::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -53796,7 +53121,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::Tolerance::TypeInfo;
+            using TypeInfo = PressureMeasurement::Attributes::Tolerance::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -53816,7 +53141,7 @@ + (void)readAttributeToleranceWithAttributeCache:(CHIPAttributeCacheContainer *)
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::Tolerance::TypeInfo;
+            using TypeInfo = PressureMeasurement::Attributes::Tolerance::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -53832,210 +53157,513 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeScaledValueWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPRelativeHumidityMeasurementGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPNullableInt16sAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn
-                = Callback<RelativeHumidityMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PressureMeasurement::Attributes::ScaledValue::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeScaledValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPRelativeHumidityMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn
-                = Callback<RelativeHumidityMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PressureMeasurement::Attributes::ScaledValue::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPRelativeHumidityMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::
-                    OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeScaledValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPRelativeHumidityMeasurementGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = RelativeHumidityMeasurement::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<RelativeHumidityMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = PressureMeasurement::Attributes::ScaledValue::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeMinScaledValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPRelativeHumidityMeasurementAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPNullableInt16sAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<RelativeHumidityMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PressureMeasurement::Attributes::MinScaledValue::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMinScaledValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPRelativeHumidityMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<RelativeHumidityMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PressureMeasurement::Attributes::MinScaledValue::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPRelativeHumidityMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::
-                    OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMinScaledValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPRelativeHumidityMeasurementAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = RelativeHumidityMeasurement::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<RelativeHumidityMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = PressureMeasurement::Attributes::MinScaledValue::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeMaxScaledValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPRelativeHumidityMeasurementAttributeListListAttributeCallbackBridge(
+    new CHIPNullableInt16sAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<RelativeHumidityMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PressureMeasurement::Attributes::MaxScaledValue::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMaxScaledValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPRelativeHumidityMeasurementAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<RelativeHumidityMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = PressureMeasurement::Attributes::MaxScaledValue::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPRelativeHumidityMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMaxScaledValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPRelativeHumidityMeasurementAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = RelativeHumidityMeasurement::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<RelativeHumidityMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = PressureMeasurement::Attributes::MaxScaledValue::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeScaledToleranceWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PressureMeasurement::Attributes::ScaledTolerance::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeScaledToleranceWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = PressureMeasurement::Attributes::ScaledTolerance::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeScaledToleranceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = PressureMeasurement::Attributes::ScaledTolerance::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeScaleWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt8sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = PressureMeasurement::Attributes::Scale::TypeInfo;
+        auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeScaleWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                        params:(CHIPSubscribeParams * _Nullable)params
+                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt8sAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = PressureMeasurement::Attributes::Scale::TypeInfo;
+            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeScaleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                    endpoint:(NSNumber *)endpoint
+                                       queue:(dispatch_queue_t)queue
+                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = PressureMeasurement::Attributes::Scale::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
+{
+    new CHIPPressureMeasurementGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = PressureMeasurement::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<PressureMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPPressureMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = PressureMeasurement::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<PressureMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPPressureMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPPressureMeasurementGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = PressureMeasurement::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<PressureMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
+{
+    new CHIPPressureMeasurementAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = PressureMeasurement::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<PressureMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPPressureMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = PressureMeasurement::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<PressureMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPPressureMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPPressureMeasurementAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = PressureMeasurement::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<PressureMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPPressureMeasurementAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = PressureMeasurement::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<PressureMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPPressureMeasurementAttributeListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = PressureMeasurement::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<PressureMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPPressureMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPPressureMeasurementAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = PressureMeasurement::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<PressureMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = RelativeHumidityMeasurement::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = PressureMeasurement::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -54055,7 +53683,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = PressureMeasurement::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -54075,7 +53703,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = PressureMeasurement::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -54095,7 +53723,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = RelativeHumidityMeasurement::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = PressureMeasurement::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -54116,7 +53744,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = PressureMeasurement::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -54137,7 +53765,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = PressureMeasurement::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -54155,462 +53783,130 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPScenes
+@implementation CHIPFlowMeasurement
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)addSceneWithParams:(CHIPScenesClusterAddSceneParams *)params
-         completionHandler:
-             (void (^)(CHIPScenesClusterAddSceneResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
+- (void)readAttributeMeasuredValueWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    Scenes::Commands::AddScene::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.groupId = params.groupId.unsignedShortValue;
-    request.sceneId = params.sceneId.unsignedCharValue;
-    request.transitionTime = params.transitionTime.unsignedShortValue;
-    request.sceneName = [self asCharSpan:params.sceneName];
-    {
-        using ListType_0 = std::remove_reference_t<decltype(request.extensionFieldSets)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        if (params.extensionFieldSets.count != 0) {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.extensionFieldSets.count);
-            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                return;
-            }
-            listFreer.add(listHolder_0);
-            for (size_t i_0 = 0; i_0 < params.extensionFieldSets.count; ++i_0) {
-                if (![params.extensionFieldSets[i_0] isKindOfClass:[CHIPScenesClusterExtensionFieldSet class]]) {
-                    // Wrong kind of value.
-                    return;
-                }
-                auto element_0 = (CHIPScenesClusterExtensionFieldSet *) params.extensionFieldSets[i_0];
-                listHolder_0->mList[i_0].clusterId = element_0.clusterId.unsignedIntValue;
-                {
-                    using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].attributeValueList)>;
-                    using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
-                    if (element_0.attributeValueList.count != 0) {
-                        auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.attributeValueList.count);
-                        if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
-                            return;
-                        }
-                        listFreer.add(listHolder_2);
-                        for (size_t i_2 = 0; i_2 < element_0.attributeValueList.count; ++i_2) {
-                            if (![element_0.attributeValueList[i_2] isKindOfClass:[CHIPScenesClusterAttributeValuePair class]]) {
-                                // Wrong kind of value.
-                                return;
-                            }
-                            auto element_2 = (CHIPScenesClusterAttributeValuePair *) element_0.attributeValueList[i_2];
-                            if (element_2.attributeId != nil) {
-                                auto & definedValue_4 = listHolder_2->mList[i_2].attributeId.Emplace();
-                                definedValue_4 = element_2.attributeId.unsignedIntValue;
-                            }
-                            {
-                                using ListType_4 = std::remove_reference_t<decltype(listHolder_2->mList[i_2].attributeValue)>;
-                                using ListMemberType_4 = ListMemberTypeGetter<ListType_4>::Type;
-                                if (element_2.attributeValue.count != 0) {
-                                    auto * listHolder_4 = new ListHolder<ListMemberType_4>(element_2.attributeValue.count);
-                                    if (listHolder_4 == nullptr || listHolder_4->mList == nullptr) {
-                                        return;
-                                    }
-                                    listFreer.add(listHolder_4);
-                                    for (size_t i_4 = 0; i_4 < element_2.attributeValue.count; ++i_4) {
-                                        if (![element_2.attributeValue[i_4] isKindOfClass:[NSNumber class]]) {
-                                            // Wrong kind of value.
-                                            return;
-                                        }
-                                        auto element_4 = (NSNumber *) element_2.attributeValue[i_4];
-                                        listHolder_4->mList[i_4] = element_4.unsignedCharValue;
-                                    }
-                                    listHolder_2->mList[i_2].attributeValue
-                                        = ListType_4(listHolder_4->mList, element_2.attributeValue.count);
-                                } else {
-                                    listHolder_2->mList[i_2].attributeValue = ListType_4();
-                                }
-                            }
-                        }
-                        listHolder_0->mList[i_0].attributeValueList
-                            = ListType_2(listHolder_2->mList, element_0.attributeValueList.count);
-                    } else {
-                        listHolder_0->mList[i_0].attributeValueList = ListType_2();
-                    }
-                }
-            }
-            request.extensionFieldSets = ListType_0(listHolder_0->mList, params.extensionFieldSets.count);
-        } else {
-            request.extensionFieldSets = ListType_0();
-        }
-    }
-
-    new CHIPScenesClusterAddSceneResponseCallbackBridge(
+    new CHIPNullableInt16uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPScenesClusterAddSceneResponseCallbackType>::FromCancelable(success);
+            using TypeInfo = FlowMeasurement::Attributes::MeasuredValue::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)viewSceneWithParams:(CHIPScenesClusterViewSceneParams *)params
-          completionHandler:
-              (void (^)(CHIPScenesClusterViewSceneResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
+- (void)subscribeAttributeMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    Scenes::Commands::ViewScene::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = FlowMeasurement::Attributes::MeasuredValue::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = FlowMeasurement::Attributes::MeasuredValue::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
-    request.groupId = params.groupId.unsignedShortValue;
-    request.sceneId = params.sceneId.unsignedCharValue;
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
 
-    new CHIPScenesClusterViewSceneResponseCallbackBridge(
+- (void)readAttributeMinMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
+{
+    new CHIPNullableInt16uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPScenesClusterViewSceneResponseCallbackType>::FromCancelable(success);
+            using TypeInfo = FlowMeasurement::Attributes::MinMeasuredValue::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)removeSceneWithParams:(CHIPScenesClusterRemoveSceneParams *)params
-            completionHandler:
-                (void (^)(CHIPScenesClusterRemoveSceneResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
+- (void)subscribeAttributeMinMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    Scenes::Commands::RemoveScene::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.groupId = params.groupId.unsignedShortValue;
-    request.sceneId = params.sceneId.unsignedCharValue;
-
-    new CHIPScenesClusterRemoveSceneResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPScenesClusterRemoveSceneResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)removeAllScenesWithParams:(CHIPScenesClusterRemoveAllScenesParams *)params
-                completionHandler:(void (^)(CHIPScenesClusterRemoveAllScenesResponseParams * _Nullable data,
-                                      NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    Scenes::Commands::RemoveAllScenes::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.groupId = params.groupId.unsignedShortValue;
-
-    new CHIPScenesClusterRemoveAllScenesResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPScenesClusterRemoveAllScenesResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)storeSceneWithParams:(CHIPScenesClusterStoreSceneParams *)params
-           completionHandler:
-               (void (^)(CHIPScenesClusterStoreSceneResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    Scenes::Commands::StoreScene::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.groupId = params.groupId.unsignedShortValue;
-    request.sceneId = params.sceneId.unsignedCharValue;
-
-    new CHIPScenesClusterStoreSceneResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPScenesClusterStoreSceneResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)recallSceneWithParams:(CHIPScenesClusterRecallSceneParams *)params completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    Scenes::Commands::RecallScene::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.groupId = params.groupId.unsignedShortValue;
-    request.sceneId = params.sceneId.unsignedCharValue;
-    if (params.transitionTime != nil) {
-        auto & definedValue_0 = request.transitionTime.Emplace();
-        if (params.transitionTime == nil) {
-            definedValue_0.SetNull();
-        } else {
-            auto & nonNullValue_1 = definedValue_0.SetNonNull();
-            nonNullValue_1 = params.transitionTime.unsignedShortValue;
-        }
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)getSceneMembershipWithParams:(CHIPScenesClusterGetSceneMembershipParams *)params
-                   completionHandler:(void (^)(CHIPScenesClusterGetSceneMembershipResponseParams * _Nullable data,
-                                         NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    Scenes::Commands::GetSceneMembership::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.groupId = params.groupId.unsignedShortValue;
-
-    new CHIPScenesClusterGetSceneMembershipResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPScenesClusterGetSceneMembershipResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)enhancedAddSceneWithParams:(CHIPScenesClusterEnhancedAddSceneParams *)params
-                 completionHandler:(void (^)(CHIPScenesClusterEnhancedAddSceneResponseParams * _Nullable data,
-                                       NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    Scenes::Commands::EnhancedAddScene::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.groupId = params.groupId.unsignedShortValue;
-    request.sceneId = params.sceneId.unsignedCharValue;
-    request.transitionTime = params.transitionTime.unsignedShortValue;
-    request.sceneName = [self asCharSpan:params.sceneName];
-    {
-        using ListType_0 = std::remove_reference_t<decltype(request.extensionFieldSets)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        if (params.extensionFieldSets.count != 0) {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.extensionFieldSets.count);
-            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                return;
-            }
-            listFreer.add(listHolder_0);
-            for (size_t i_0 = 0; i_0 < params.extensionFieldSets.count; ++i_0) {
-                if (![params.extensionFieldSets[i_0] isKindOfClass:[CHIPScenesClusterExtensionFieldSet class]]) {
-                    // Wrong kind of value.
-                    return;
-                }
-                auto element_0 = (CHIPScenesClusterExtensionFieldSet *) params.extensionFieldSets[i_0];
-                listHolder_0->mList[i_0].clusterId = element_0.clusterId.unsignedIntValue;
-                {
-                    using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].attributeValueList)>;
-                    using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
-                    if (element_0.attributeValueList.count != 0) {
-                        auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.attributeValueList.count);
-                        if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
-                            return;
-                        }
-                        listFreer.add(listHolder_2);
-                        for (size_t i_2 = 0; i_2 < element_0.attributeValueList.count; ++i_2) {
-                            if (![element_0.attributeValueList[i_2] isKindOfClass:[CHIPScenesClusterAttributeValuePair class]]) {
-                                // Wrong kind of value.
-                                return;
-                            }
-                            auto element_2 = (CHIPScenesClusterAttributeValuePair *) element_0.attributeValueList[i_2];
-                            if (element_2.attributeId != nil) {
-                                auto & definedValue_4 = listHolder_2->mList[i_2].attributeId.Emplace();
-                                definedValue_4 = element_2.attributeId.unsignedIntValue;
-                            }
-                            {
-                                using ListType_4 = std::remove_reference_t<decltype(listHolder_2->mList[i_2].attributeValue)>;
-                                using ListMemberType_4 = ListMemberTypeGetter<ListType_4>::Type;
-                                if (element_2.attributeValue.count != 0) {
-                                    auto * listHolder_4 = new ListHolder<ListMemberType_4>(element_2.attributeValue.count);
-                                    if (listHolder_4 == nullptr || listHolder_4->mList == nullptr) {
-                                        return;
-                                    }
-                                    listFreer.add(listHolder_4);
-                                    for (size_t i_4 = 0; i_4 < element_2.attributeValue.count; ++i_4) {
-                                        if (![element_2.attributeValue[i_4] isKindOfClass:[NSNumber class]]) {
-                                            // Wrong kind of value.
-                                            return;
-                                        }
-                                        auto element_4 = (NSNumber *) element_2.attributeValue[i_4];
-                                        listHolder_4->mList[i_4] = element_4.unsignedCharValue;
-                                    }
-                                    listHolder_2->mList[i_2].attributeValue
-                                        = ListType_4(listHolder_4->mList, element_2.attributeValue.count);
-                                } else {
-                                    listHolder_2->mList[i_2].attributeValue = ListType_4();
-                                }
-                            }
-                        }
-                        listHolder_0->mList[i_0].attributeValueList
-                            = ListType_2(listHolder_2->mList, element_0.attributeValueList.count);
-                    } else {
-                        listHolder_0->mList[i_0].attributeValueList = ListType_2();
-                    }
-                }
-            }
-            request.extensionFieldSets = ListType_0(listHolder_0->mList, params.extensionFieldSets.count);
-        } else {
-            request.extensionFieldSets = ListType_0();
-        }
-    }
-
-    new CHIPScenesClusterEnhancedAddSceneResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPScenesClusterEnhancedAddSceneResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)enhancedViewSceneWithParams:(CHIPScenesClusterEnhancedViewSceneParams *)params
-                  completionHandler:(void (^)(CHIPScenesClusterEnhancedViewSceneResponseParams * _Nullable data,
-                                        NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    Scenes::Commands::EnhancedViewScene::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.groupId = params.groupId.unsignedShortValue;
-    request.sceneId = params.sceneId.unsignedCharValue;
-
-    new CHIPScenesClusterEnhancedViewSceneResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPScenesClusterEnhancedViewSceneResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)copySceneWithParams:(CHIPScenesClusterCopySceneParams *)params
-          completionHandler:
-              (void (^)(CHIPScenesClusterCopySceneResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    Scenes::Commands::CopyScene::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.mode = static_cast<std::remove_reference_t<decltype(request.mode)>>(params.mode.unsignedCharValue);
-    request.groupIdFrom = params.groupIdFrom.unsignedShortValue;
-    request.sceneIdFrom = params.sceneIdFrom.unsignedCharValue;
-    request.groupIdTo = params.groupIdTo.unsignedShortValue;
-    request.sceneIdTo = params.sceneIdTo.unsignedCharValue;
-
-    new CHIPScenesClusterCopySceneResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPScenesClusterCopySceneResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)readAttributeSceneCountWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Scenes::Attributes::SceneCount::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeSceneCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Scenes::Attributes::SceneCount::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FlowMeasurement::Attributes::MinMeasuredValue::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSceneCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMinMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Scenes::Attributes::SceneCount::TypeInfo;
+            using TypeInfo = FlowMeasurement::Attributes::MinMeasuredValue::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -54620,58 +53916,60 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeCurrentSceneWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeMaxMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Scenes::Attributes::CurrentScene::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt16uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = FlowMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeCurrentSceneWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMaxMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Scenes::Attributes::CurrentScene::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FlowMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentSceneWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMaxMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Scenes::Attributes::CurrentScene::TypeInfo;
+            using TypeInfo = FlowMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -54681,22 +53979,22 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeCurrentGroupWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeToleranceWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Scenes::Attributes::CurrentGroup::TypeInfo;
+        using TypeInfo = FlowMeasurement::Attributes::Tolerance::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeCurrentGroupWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeToleranceWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -54705,7 +54003,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Scenes::Attributes::CurrentGroup::TypeInfo;
+            using TypeInfo = FlowMeasurement::Attributes::Tolerance::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -54717,16 +54015,15 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentGroupWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeToleranceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Scenes::Attributes::CurrentGroup::TypeInfo;
+            using TypeInfo = FlowMeasurement::Attributes::Tolerance::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -54742,288 +54039,104 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeSceneValidWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Scenes::Attributes::SceneValid::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = FlowMeasurement::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<FlowMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeSceneValidWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Scenes::Attributes::SceneValid::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FlowMeasurement::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<FlowMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSceneValidWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = Scenes::Attributes::SceneValid::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPFlowMeasurementGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = FlowMeasurement::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<FlowMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeNameSupportWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Scenes::Attributes::NameSupport::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = FlowMeasurement::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<FlowMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeNameSupportWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Scenes::Attributes::NameSupport::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FlowMeasurement::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<FlowMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeNameSupportWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = Scenes::Attributes::NameSupport::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeLastConfiguredByWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt64uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Scenes::Attributes::LastConfiguredBy::TypeInfo;
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeLastConfiguredByWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = Scenes::Attributes::LastConfiguredBy::TypeInfo;
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeLastConfiguredByWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = Scenes::Attributes::LastConfiguredBy::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
-{
-    new CHIPScenesGeneratedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Scenes::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<ScenesGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPScenesGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = Scenes::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<ScenesGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPScenesGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPScenesGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = Scenes::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ScenesGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
-{
-    new CHIPScenesAcceptedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Scenes::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<ScenesAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPScenesAcceptedCommandListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = Scenes::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<ScenesAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPScenesAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -55036,17 +54149,17 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPScenesAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPFlowMeasurementAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = Scenes::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = FlowMeasurement::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ScenesAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<FlowMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -55059,10 +54172,10 @@ new CHIPScenesAcceptedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPScenesAttributeListListAttributeCallbackBridge(
+    new CHIPFlowMeasurementAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Scenes::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<ScenesAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FlowMeasurement::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<FlowMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -55074,19 +54187,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPScenesAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPFlowMeasurementAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Scenes::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<ScenesAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = FlowMeasurement::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<FlowMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPScenesAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPFlowMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -55099,30 +54212,31 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPScenesAttributeListListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = Scenes::Attributes::AttributeList::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<ScenesAttributeListListAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPFlowMeasurementAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = FlowMeasurement::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<FlowMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Scenes::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = FlowMeasurement::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -55142,7 +54256,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Scenes::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = FlowMeasurement::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -55162,7 +54276,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Scenes::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = FlowMeasurement::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -55182,7 +54296,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Scenes::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = FlowMeasurement::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -55203,7 +54317,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Scenes::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = FlowMeasurement::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -55224,7 +54338,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Scenes::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = FlowMeasurement::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -55242,158 +54356,130 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPSoftwareDiagnostics
+@implementation CHIPRelativeHumidityMeasurement
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)resetWatermarksWithCompletionHandler:(StatusCompletion)completionHandler
-{
-    [self resetWatermarksWithParams:nil completionHandler:completionHandler];
-}
-- (void)resetWatermarksWithParams:(CHIPSoftwareDiagnosticsClusterResetWatermarksParams * _Nullable)params
-                completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    SoftwareDiagnostics::Commands::ResetWatermarks::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)readAttributeThreadMetricsWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeMeasuredValueWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackBridge(
+    new CHIPNullableInt16uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = SoftwareDiagnostics::Attributes::ThreadMetrics::TypeInfo;
-            auto successFn = Callback<SoftwareDiagnosticsThreadMetricsListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::MeasuredValue::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeThreadMetricsWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = SoftwareDiagnostics::Attributes::ThreadMetrics::TypeInfo;
-            auto successFn = Callback<SoftwareDiagnosticsThreadMetricsListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::MeasuredValue::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeThreadMetricsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPSoftwareDiagnosticsThreadMetricsListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = SoftwareDiagnostics::Attributes::ThreadMetrics::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<SoftwareDiagnosticsThreadMetricsListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::MeasuredValue::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeCurrentHeapFreeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeMinMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = SoftwareDiagnostics::Attributes::CurrentHeapFree::TypeInfo;
-        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt16uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::MinMeasuredValue::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeCurrentHeapFreeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMinMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt64uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = SoftwareDiagnostics::Attributes::CurrentHeapFree::TypeInfo;
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::MinMeasuredValue::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentHeapFreeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMinMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = SoftwareDiagnostics::Attributes::CurrentHeapFree::TypeInfo;
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::MinMeasuredValue::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -55403,59 +54489,60 @@ new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeCurrentHeapUsedWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeMaxMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = SoftwareDiagnostics::Attributes::CurrentHeapUsed::TypeInfo;
-        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt16uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeCurrentHeapUsedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMaxMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt64uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = SoftwareDiagnostics::Attributes::CurrentHeapUsed::TypeInfo;
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentHeapUsedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMaxMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = SoftwareDiagnostics::Attributes::CurrentHeapUsed::TypeInfo;
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -55465,60 +54552,57 @@ new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeCurrentHeapHighWatermarkWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
+- (void)readAttributeToleranceWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = SoftwareDiagnostics::Attributes::CurrentHeapHighWatermark::TypeInfo;
-        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = RelativeHumidityMeasurement::Attributes::Tolerance::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeCurrentHeapHighWatermarkWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeToleranceWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt64uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = SoftwareDiagnostics::Attributes::CurrentHeapHighWatermark::TypeInfo;
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::Tolerance::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentHeapHighWatermarkWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeToleranceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = SoftwareDiagnostics::Attributes::CurrentHeapHighWatermark::TypeInfo;
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::Tolerance::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -55531,10 +54615,11 @@ new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPRelativeHumidityMeasurementGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = SoftwareDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<SoftwareDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn
+                = Callback<RelativeHumidityMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -55548,20 +54633,22 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
                                                 reportHandler:
                                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPRelativeHumidityMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = SoftwareDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<SoftwareDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn
+                = Callback<RelativeHumidityMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPRelativeHumidityMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::
+                    OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -55573,17 +54660,18 @@ + (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheC
                                           completionHandler:
                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPRelativeHumidityMeasurementGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = SoftwareDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = RelativeHumidityMeasurement::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<SoftwareDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn
+                    = Callback<RelativeHumidityMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -55596,10 +54684,10 @@ new CHIPSoftwareDiagnosticsGeneratedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPRelativeHumidityMeasurementAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = SoftwareDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<SoftwareDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<RelativeHumidityMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -55613,20 +54701,21 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPRelativeHumidityMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = SoftwareDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<SoftwareDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<RelativeHumidityMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPRelativeHumidityMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::
+                    OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -55638,17 +54727,18 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPRelativeHumidityMeasurementAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = SoftwareDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = RelativeHumidityMeasurement::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<SoftwareDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn
+                    = Callback<RelativeHumidityMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -55661,10 +54751,10 @@ new CHIPSoftwareDiagnosticsAcceptedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackBridge(
+    new CHIPRelativeHumidityMeasurementAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = SoftwareDiagnostics::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<SoftwareDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<RelativeHumidityMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -55676,19 +54766,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPRelativeHumidityMeasurementAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = SoftwareDiagnostics::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<SoftwareDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<RelativeHumidityMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPRelativeHumidityMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -55701,17 +54791,17 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPSoftwareDiagnosticsAttributeListListAttributeCallbackBridge(
+    new CHIPRelativeHumidityMeasurementAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = SoftwareDiagnostics::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = RelativeHumidityMeasurement::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<SoftwareDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<RelativeHumidityMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -55725,7 +54815,7 @@ - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = SoftwareDiagnostics::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = RelativeHumidityMeasurement::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -55745,7 +54835,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = SoftwareDiagnostics::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -55765,7 +54855,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = SoftwareDiagnostics::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -55785,7 +54875,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = SoftwareDiagnostics::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = RelativeHumidityMeasurement::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -55806,7 +54896,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = SoftwareDiagnostics::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -55827,7 +54917,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = SoftwareDiagnostics::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -55845,30 +54935,29 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPSwitch
+@implementation CHIPOccupancySensing
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)readAttributeNumberOfPositionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeOccupancyWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Switch::Attributes::NumberOfPositions::TypeInfo;
+        using TypeInfo = OccupancySensing::Attributes::Occupancy::TypeInfo;
         auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeNumberOfPositionsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOccupancyWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -55877,7 +54966,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Switch::Attributes::NumberOfPositions::TypeInfo;
+            using TypeInfo = OccupancySensing::Attributes::Occupancy::TypeInfo;
             auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -55889,16 +54978,15 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNumberOfPositionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOccupancyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Switch::Attributes::NumberOfPositions::TypeInfo;
+            using TypeInfo = OccupancySensing::Attributes::Occupancy::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -55914,23 +55002,24 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeCurrentPositionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeOccupancySensorTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Switch::Attributes::CurrentPosition::TypeInfo;
+        using TypeInfo = OccupancySensing::Attributes::OccupancySensorType::TypeInfo;
         auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeCurrentPositionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOccupancySensorTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -55939,7 +55028,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Switch::Attributes::CurrentPosition::TypeInfo;
+            using TypeInfo = OccupancySensing::Attributes::OccupancySensorType::TypeInfo;
             auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -55951,16 +55040,16 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentPositionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOccupancySensorTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Switch::Attributes::CurrentPosition::TypeInfo;
+            using TypeInfo = OccupancySensing::Attributes::OccupancySensorType::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -55976,23 +55065,24 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeMultiPressMaxWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeOccupancySensorTypeBitmapWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Switch::Attributes::MultiPressMax::TypeInfo;
+        using TypeInfo = OccupancySensing::Attributes::OccupancySensorTypeBitmap::TypeInfo;
         auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeMultiPressMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOccupancySensorTypeBitmapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                            params:(CHIPSubscribeParams * _Nullable)params
+                                           subscriptionEstablished:
+                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))reportHandler
 {
     new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -56001,7 +55091,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Switch::Attributes::MultiPressMax::TypeInfo;
+            using TypeInfo = OccupancySensing::Attributes::OccupancySensorTypeBitmap::TypeInfo;
             auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -56013,16 +55103,16 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMultiPressMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOccupancySensorTypeBitmapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                        endpoint:(NSNumber *)endpoint
+                                                           queue:(dispatch_queue_t)queue
+                                               completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Switch::Attributes::MultiPressMax::TypeInfo;
+            using TypeInfo = OccupancySensing::Attributes::OccupancySensorTypeBitmap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -56038,189 +55128,193 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributePirOccupiedToUnoccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler
 {
-    new CHIPSwitchGeneratedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Switch::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<SwitchGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributePirOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value
+                                          completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPSwitchGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = Switch::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<SwitchGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPSwitchGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+    [self writeAttributePirOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull) value
+                                                       params:nil
+                                            completionHandler:completionHandler];
 }
-
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributePirOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value
+                                                     params:(CHIPWriteParams * _Nullable)params
+                                          completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPSwitchGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = Switch::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<SwitchGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
-{
-    new CHIPSwitchAcceptedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Switch::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<SwitchAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePirOccupiedToUnoccupiedDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                              subscriptionEstablished:
+                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))reportHandler
 {
-    new CHIPSwitchAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Switch::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<SwitchAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPSwitchAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePirOccupiedToUnoccupiedDelayWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                           endpoint:(NSNumber *)endpoint
+                                                              queue:(dispatch_queue_t)queue
+                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler
 {
-    new CHIPSwitchAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = Switch::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<SwitchAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributePirUnoccupiedToOccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler
 {
-    new CHIPSwitchAttributeListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Switch::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<SwitchAttributeListListAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributePirUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value
+                                          completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributePirUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull) value
+                                                       params:nil
+                                            completionHandler:completionHandler];
+}
+- (void)writeAttributePirUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value
+                                                     params:(CHIPWriteParams * _Nullable)params
+                                          completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePirUnoccupiedToOccupiedDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                              subscriptionEstablished:
+                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))reportHandler
 {
-    new CHIPSwitchAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Switch::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<SwitchAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPSwitchAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePirUnoccupiedToOccupiedDelayWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                           endpoint:(NSNumber *)endpoint
+                                                              queue:(dispatch_queue_t)queue
+                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler
 {
-    new CHIPSwitchAttributeListListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Switch::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<SwitchAttributeListListAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -56230,57 +55324,95 @@ new CHIPSwitchAttributeListListAttributeCallbackBridge(queue, completionHandler,
     });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributePirUnoccupiedToOccupiedThresholdWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Switch::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributePirUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value
+                                              completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    [self writeAttributePirUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull) value
+                                                           params:nil
+                                                completionHandler:completionHandler];
+}
+- (void)writeAttributePirUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value
+                                                         params:(CHIPWriteParams * _Nullable)params
+                                              completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributePirUnoccupiedToOccupiedThresholdWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                                  subscriptionEstablished:
+                                                      (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                            reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))reportHandler
+{
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Switch::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePirUnoccupiedToOccupiedThresholdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                               endpoint:(NSNumber *)endpoint
+                                                                  queue:(dispatch_queue_t)queue
+                                                      completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Switch::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -56290,32 +55422,68 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeUltrasonicOccupiedToUnoccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                  NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Switch::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = OccupancySensing::Attributes::UltrasonicOccupiedToUnoccupiedDelay::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeUltrasonicOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value
+                                                 completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+    [self writeAttributeUltrasonicOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull) value
+                                                              params:nil
+                                                   completionHandler:completionHandler];
+}
+- (void)writeAttributeUltrasonicOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value
+                                                            params:(CHIPWriteParams * _Nullable)params
+                                                 completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = OccupancySensing::Attributes::UltrasonicOccupiedToUnoccupiedDelay::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeUltrasonicOccupiedToUnoccupiedDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                                     subscriptionEstablished:
+                                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                               reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                 NSError * _Nullable error))reportHandler
+{
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Switch::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = OccupancySensing::Attributes::UltrasonicOccupiedToUnoccupiedDelay::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -56327,16 +55495,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeUltrasonicOccupiedToUnoccupiedDelayWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                  endpoint:(NSNumber *)endpoint
+                                                                     queue:(dispatch_queue_t)queue
+                                                         completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Switch::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = OccupancySensing::Attributes::UltrasonicOccupiedToUnoccupiedDelay::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -56352,121 +55520,157 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPTargetNavigator
-
-- (chip::Controller::ClusterBase *)getCluster
+- (void)readAttributeUltrasonicUnoccupiedToOccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                  NSError * _Nullable error))completionHandler
 {
-    return &_cppCluster;
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedDelay::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)navigateTargetWithParams:(CHIPTargetNavigatorClusterNavigateTargetParams *)params
-               completionHandler:(void (^)(CHIPTargetNavigatorClusterNavigateTargetResponseParams * _Nullable data,
-                                     NSError * _Nullable error))completionHandler
+- (void)writeAttributeUltrasonicUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value
+                                                 completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    TargetNavigator::Commands::NavigateTarget::Type request;
+    [self writeAttributeUltrasonicUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull) value
+                                                              params:nil
+                                                   completionHandler:completionHandler];
+}
+- (void)writeAttributeUltrasonicUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value
+                                                            params:(CHIPWriteParams * _Nullable)params
+                                                 completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
     }
-    request.target = params.target.unsignedCharValue;
-    if (params.data != nil) {
-        auto & definedValue_0 = request.data.Emplace();
-        definedValue_0 = [self asCharSpan:params.data];
-    }
-
-    new CHIPTargetNavigatorClusterNavigateTargetResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPTargetNavigatorClusterNavigateTargetResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
 
-- (void)readAttributeTargetListWithCompletionHandler:(void (^)(
-                                                         NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPTargetNavigatorTargetListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TargetNavigator::Attributes::TargetList::TypeInfo;
-            auto successFn = Callback<TargetNavigatorTargetListListAttributeCallback>::FromCancelable(success);
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedDelay::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeTargetListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeUltrasonicUnoccupiedToOccupiedDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                                     subscriptionEstablished:
+                                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                               reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                 NSError * _Nullable error))reportHandler
 {
-    new CHIPTargetNavigatorTargetListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TargetNavigator::Attributes::TargetList::TypeInfo;
-            auto successFn = Callback<TargetNavigatorTargetListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedDelay::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTargetNavigatorTargetListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTargetListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeUltrasonicUnoccupiedToOccupiedDelayWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                  endpoint:(NSNumber *)endpoint
+                                                                     queue:(dispatch_queue_t)queue
+                                                         completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPTargetNavigatorTargetListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = TargetNavigator::Attributes::TargetList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TargetNavigatorTargetListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedDelay::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeCurrentTargetWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeUltrasonicUnoccupiedToOccupiedThresholdWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                      NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TargetNavigator::Attributes::CurrentTarget::TypeInfo;
+        using TypeInfo = OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedThreshold::TypeInfo;
         auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeCurrentTargetWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeUltrasonicUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value
+                                                     completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeUltrasonicUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull) value
+                                                                  params:nil
+                                                       completionHandler:completionHandler];
+}
+- (void)writeAttributeUltrasonicUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value
+                                                                params:(CHIPWriteParams * _Nullable)params
+                                                     completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedThreshold::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeUltrasonicUnoccupiedToOccupiedThresholdWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
+                                                                                     subscriptionEstablishedHandler
+                                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                     NSError * _Nullable error))reportHandler
 {
     new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -56475,7 +55679,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TargetNavigator::Attributes::CurrentTarget::TypeInfo;
+            using TypeInfo = OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedThreshold::TypeInfo;
             auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -56487,16 +55691,17 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentTargetWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeUltrasonicUnoccupiedToOccupiedThresholdWithAttributeCache:
+            (CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                      endpoint:(NSNumber *)endpoint
+                                                                         queue:(dispatch_queue_t)queue
+                                                             completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                   NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TargetNavigator::Attributes::CurrentTarget::TypeInfo;
+            using TypeInfo = OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedThreshold::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -56512,570 +55717,294 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributePhysicalContactOccupiedToUnoccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                       NSError * _Nullable error))completionHandler
 {
-    new CHIPTargetNavigatorGeneratedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TargetNavigator::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<TargetNavigatorGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = OccupancySensing::Attributes::PhysicalContactOccupiedToUnoccupiedDelay::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributePhysicalContactOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value
+                                                      completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributePhysicalContactOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull) value
+                                                                   params:nil
+                                                        completionHandler:completionHandler];
+}
+- (void)writeAttributePhysicalContactOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value
+                                                                 params:(CHIPWriteParams * _Nullable)params
+                                                      completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = OccupancySensing::Attributes::PhysicalContactOccupiedToUnoccupiedDelay::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePhysicalContactOccupiedToUnoccupiedDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
+                                                                                      subscriptionEstablishedHandler
+                                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                      NSError * _Nullable error))reportHandler
 {
-    new CHIPTargetNavigatorGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TargetNavigator::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<TargetNavigatorGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OccupancySensing::Attributes::PhysicalContactOccupiedToUnoccupiedDelay::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTargetNavigatorGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePhysicalContactOccupiedToUnoccupiedDelayWithAttributeCache:
+            (CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                       endpoint:(NSNumber *)endpoint
+                                                                          queue:(dispatch_queue_t)queue
+                                                              completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPTargetNavigatorGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = TargetNavigator::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TargetNavigatorGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = OccupancySensing::Attributes::PhysicalContactOccupiedToUnoccupiedDelay::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributePhysicalContactUnoccupiedToOccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                       NSError * _Nullable error))completionHandler
 {
-    new CHIPTargetNavigatorAcceptedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TargetNavigator::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<TargetNavigatorAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedDelay::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributePhysicalContactUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value
+                                                      completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributePhysicalContactUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull) value
+                                                                   params:nil
+                                                        completionHandler:completionHandler];
+}
+- (void)writeAttributePhysicalContactUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value
+                                                                 params:(CHIPWriteParams * _Nullable)params
+                                                      completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedDelay::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePhysicalContactUnoccupiedToOccupiedDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
+                                                                                      subscriptionEstablishedHandler
+                                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                      NSError * _Nullable error))reportHandler
 {
-    new CHIPTargetNavigatorAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TargetNavigator::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<TargetNavigatorAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedDelay::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTargetNavigatorAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePhysicalContactUnoccupiedToOccupiedDelayWithAttributeCache:
+            (CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                       endpoint:(NSNumber *)endpoint
+                                                                          queue:(dispatch_queue_t)queue
+                                                              completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPTargetNavigatorAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = TargetNavigator::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TargetNavigatorAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedDelay::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributePhysicalContactUnoccupiedToOccupiedThresholdWithCompletionHandler:
+    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTargetNavigatorAttributeListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TargetNavigator::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<TargetNavigatorAttributeListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributePhysicalContactUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value
+                                                          completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPTargetNavigatorAttributeListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = TargetNavigator::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<TargetNavigatorAttributeListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTargetNavigatorAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPTargetNavigatorAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = TargetNavigator::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TargetNavigatorAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TargetNavigator::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = TargetNavigator::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = TargetNavigator::Attributes::FeatureMap::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TargetNavigator::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = TargetNavigator::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+    [self writeAttributePhysicalContactUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull) value
+                                                                       params:nil
+                                                            completionHandler:completionHandler];
 }
-
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributePhysicalContactUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value
+                                                                     params:(CHIPWriteParams * _Nullable)params
+                                                          completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = TargetNavigator::Attributes::ClusterRevision::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-@end
-
-@implementation CHIPTemperatureMeasurement
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)readAttributeMeasuredValueWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt16sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TemperatureMeasurement::Attributes::MeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
+    }
 
-- (void)subscribeAttributeMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = TemperatureMeasurement::Attributes::MeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
         },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = TemperatureMeasurement::Attributes::MeasuredValue::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeMinMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt16sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TemperatureMeasurement::Attributes::MinMeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeMinMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = TemperatureMeasurement::Attributes::MinMeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeMinMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = TemperatureMeasurement::Attributes::MinMeasuredValue::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeMaxMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt16sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TemperatureMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            ListFreer listFreer;
+            using TypeInfo = OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeMaxMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = TemperatureMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeMaxMeasuredValueWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = TemperatureMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeToleranceWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TemperatureMeasurement::Attributes::Tolerance::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeToleranceWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePhysicalContactUnoccupiedToOccupiedThresholdWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
+                                                                                          subscriptionEstablishedHandler
+                                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                          NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TemperatureMeasurement::Attributes::Tolerance::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeToleranceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePhysicalContactUnoccupiedToOccupiedThresholdWithAttributeCache:
+            (CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                           endpoint:(NSNumber *)endpoint
+                                                                              queue:(dispatch_queue_t)queue
+                                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                        NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TemperatureMeasurement::Attributes::Tolerance::TypeInfo;
+            using TypeInfo = OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -57088,10 +56017,10 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPOccupancySensingGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TemperatureMeasurement::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<TemperatureMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OccupancySensing::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<OccupancySensingGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -57105,20 +56034,20 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
                                                 reportHandler:
                                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPOccupancySensingGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TemperatureMeasurement::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<TemperatureMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OccupancySensing::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<OccupancySensingGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPOccupancySensingGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -57130,17 +56059,17 @@ + (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheC
                                           completionHandler:
                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPOccupancySensingGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = TemperatureMeasurement::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = OccupancySensing::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TemperatureMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<OccupancySensingGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -57153,10 +56082,10 @@ new CHIPTemperatureMeasurementGeneratedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPOccupancySensingAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TemperatureMeasurement::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<TemperatureMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OccupancySensing::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<OccupancySensingAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -57170,20 +56099,20 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPOccupancySensingAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TemperatureMeasurement::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<TemperatureMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OccupancySensing::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<OccupancySensingAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPOccupancySensingAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
@@ -57195,17 +56124,17 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPOccupancySensingAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = TemperatureMeasurement::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = OccupancySensing::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TemperatureMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<OccupancySensingAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -57218,10 +56147,10 @@ new CHIPTemperatureMeasurementAcceptedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTemperatureMeasurementAttributeListListAttributeCallbackBridge(
+    new CHIPOccupancySensingAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TemperatureMeasurement::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<TemperatureMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OccupancySensing::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<OccupancySensingAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -57233,19 +56162,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPTemperatureMeasurementAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPOccupancySensingAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TemperatureMeasurement::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<TemperatureMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = OccupancySensing::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<OccupancySensingAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTemperatureMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPOccupancySensingAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -57258,17 +56187,17 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTemperatureMeasurementAttributeListListAttributeCallbackBridge(
+    new CHIPOccupancySensingAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = TemperatureMeasurement::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = OccupancySensing::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TemperatureMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<OccupancySensingAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -57282,7 +56211,7 @@ - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TemperatureMeasurement::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = OccupancySensing::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -57302,7 +56231,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TemperatureMeasurement::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = OccupancySensing::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -57322,7 +56251,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TemperatureMeasurement::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = OccupancySensing::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -57342,7 +56271,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TemperatureMeasurement::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = OccupancySensing::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -57363,7 +56292,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TemperatureMeasurement::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = OccupancySensing::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -57384,7 +56313,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TemperatureMeasurement::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = OccupancySensing::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -57402,112 +56331,433 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
 
 @end
 
-@implementation CHIPTestCluster
+@implementation CHIPWakeOnLan
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)testWithCompletionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeMACAddressWithCompletionHandler:(void (^)(
+                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    [self testWithParams:nil completionHandler:completionHandler];
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = WakeOnLan::Attributes::MACAddress::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
-- (void)testWithParams:(CHIPTestClusterClusterTestParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler
+
+- (void)subscribeAttributeMACAddressWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    TestCluster::Commands::Test::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = WakeOnLan::Attributes::MACAddress::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeMACAddressWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = WakeOnLan::Attributes::MACAddress::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
 
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
+{
+    new CHIPWakeOnLanGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = WakeOnLan::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<WakeOnLanGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPWakeOnLanGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = WakeOnLan::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<WakeOnLanGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPWakeOnLanGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPWakeOnLanGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = WakeOnLan::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<WakeOnLanGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
+{
+    new CHIPWakeOnLanAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = WakeOnLan::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<WakeOnLanAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPWakeOnLanAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = WakeOnLan::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<WakeOnLanAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPWakeOnLanAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPWakeOnLanAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = WakeOnLan::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<WakeOnLanAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
         });
 }
 
-- (void)testNotHandledWithCompletionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    [self testNotHandledWithParams:nil completionHandler:completionHandler];
+    new CHIPWakeOnLanAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = WakeOnLan::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<WakeOnLanAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
-- (void)testNotHandledWithParams:(CHIPTestClusterClusterTestNotHandledParams * _Nullable)params
-               completionHandler:(StatusCompletion)completionHandler
+
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    TestCluster::Commands::TestNotHandled::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
+    new CHIPWakeOnLanAttributeListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = WakeOnLan::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<WakeOnLanAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPWakeOnLanAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
 
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPWakeOnLanAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = WakeOnLan::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<WakeOnLanAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = WakeOnLan::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = WakeOnLan::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = WakeOnLan::Attributes::FeatureMap::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = WakeOnLan::Attributes::ClusterRevision::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = WakeOnLan::Attributes::ClusterRevision::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
 
-- (void)testSpecificWithCompletionHandler:(void (^)(CHIPTestClusterClusterTestSpecificResponseParams * _Nullable data,
-                                              NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    [self testSpecificWithParams:nil completionHandler:completionHandler];
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = WakeOnLan::Attributes::ClusterRevision::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
-- (void)testSpecificWithParams:(CHIPTestClusterClusterTestSpecificParams * _Nullable)params
-             completionHandler:(void (^)(CHIPTestClusterClusterTestSpecificResponseParams * _Nullable data,
-                                   NSError * _Nullable error))completionHandler
+
+@end
+
+@implementation CHIPChannel
+
+- (chip::Controller::ClusterBase *)getCluster
+{
+    return &_cppCluster;
+}
+
+- (void)changeChannelWithParams:(CHIPChannelClusterChangeChannelParams *)params
+              completionHandler:(void (^)(CHIPChannelClusterChangeChannelResponseParams * _Nullable data,
+                                    NSError * _Nullable error))completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    TestCluster::Commands::TestSpecific::Type request;
+    Channel::Commands::ChangeChannel::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
+    request.match = [self asCharSpan:params.match];
 
-    new CHIPTestClusterClusterTestSpecificResponseCallbackBridge(
+    new CHIPChannelClusterChangeChannelResponseCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPTestClusterClusterTestSpecificResponseCallbackType>::FromCancelable(success);
+            auto successFn = Callback<CHIPChannelClusterChangeChannelResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.InvokeCommand(
                 request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)testUnknownCommandWithCompletionHandler:(StatusCompletion)completionHandler
-{
-    [self testUnknownCommandWithParams:nil completionHandler:completionHandler];
-}
-- (void)testUnknownCommandWithParams:(CHIPTestClusterClusterTestUnknownCommandParams * _Nullable)params
-                   completionHandler:(StatusCompletion)completionHandler
+- (void)changeChannelByNumberWithParams:(CHIPChannelClusterChangeChannelByNumberParams *)params
+                      completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    TestCluster::Commands::TestUnknownCommand::Type request;
+    Channel::Commands::ChangeChannelByNumber::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
+    request.majorNumber = params.majorNumber.unsignedShortValue;
+    request.minorNumber = params.minorNumber.unsignedShortValue;
 
     new CHIPCommandSuccessCallbackBridge(
         self.callbackQueue,
@@ -57522,1338 +56772,1418 @@ new CHIPCommandSuccessCallbackBridge(
         });
 }
 
-- (void)testAddArgumentsWithParams:(CHIPTestClusterClusterTestAddArgumentsParams *)params
-                 completionHandler:(void (^)(CHIPTestClusterClusterTestAddArgumentsResponseParams * _Nullable data,
-                                       NSError * _Nullable error))completionHandler
+- (void)skipChannelWithParams:(CHIPChannelClusterSkipChannelParams *)params completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    TestCluster::Commands::TestAddArguments::Type request;
+    Channel::Commands::SkipChannel::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    request.arg1 = params.arg1.unsignedCharValue;
-    request.arg2 = params.arg2.unsignedCharValue;
+    request.count = params.count.unsignedShortValue;
 
-    new CHIPTestClusterClusterTestAddArgumentsResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPTestClusterClusterTestAddArgumentsResponseCallbackType>::FromCancelable(success);
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.InvokeCommand(
                 request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)testSimpleArgumentRequestWithParams:(CHIPTestClusterClusterTestSimpleArgumentRequestParams *)params
-                          completionHandler:(void (^)(CHIPTestClusterClusterTestSimpleArgumentResponseParams * _Nullable data,
-                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeChannelListWithCompletionHandler:(void (^)(
+                                                          NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    TestCluster::Commands::TestSimpleArgumentRequest::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.arg1 = params.arg1.boolValue;
-
-    new CHIPTestClusterClusterTestSimpleArgumentResponseCallbackBridge(
+    new CHIPChannelChannelListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPTestClusterClusterTestSimpleArgumentResponseCallbackType>::FromCancelable(success);
+            using TypeInfo = Channel::Attributes::ChannelList::TypeInfo;
+            auto successFn = Callback<ChannelChannelListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)testStructArrayArgumentRequestWithParams:(CHIPTestClusterClusterTestStructArrayArgumentRequestParams *)params
-                               completionHandler:
-                                   (void (^)(CHIPTestClusterClusterTestStructArrayArgumentResponseParams * _Nullable data,
-                                       NSError * _Nullable error))completionHandler
+- (void)subscribeAttributeChannelListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    TestCluster::Commands::TestStructArrayArgumentRequest::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    {
-        using ListType_0 = std::remove_reference_t<decltype(request.arg1)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        if (params.arg1.count != 0) {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.arg1.count);
-            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                return;
+    new CHIPChannelChannelListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            listFreer.add(listHolder_0);
-            for (size_t i_0 = 0; i_0 < params.arg1.count; ++i_0) {
-                if (![params.arg1[i_0] isKindOfClass:[CHIPTestClusterClusterNestedStructList class]]) {
-                    // Wrong kind of value.
-                    return;
-                }
-                auto element_0 = (CHIPTestClusterClusterNestedStructList *) params.arg1[i_0];
-                listHolder_0->mList[i_0].a = element_0.a.unsignedCharValue;
-                listHolder_0->mList[i_0].b = element_0.b.boolValue;
-                listHolder_0->mList[i_0].c.a = element_0.c.a.unsignedCharValue;
-                listHolder_0->mList[i_0].c.b = element_0.c.b.boolValue;
-                listHolder_0->mList[i_0].c.c
-                    = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].c.c)>>(element_0.c.c.unsignedCharValue);
-                listHolder_0->mList[i_0].c.d = [self asByteSpan:element_0.c.d];
-                listHolder_0->mList[i_0].c.e = [self asCharSpan:element_0.c.e];
-                listHolder_0->mList[i_0].c.f
-                    = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].c.f)>>(element_0.c.f.unsignedCharValue);
-                listHolder_0->mList[i_0].c.g = element_0.c.g.floatValue;
-                listHolder_0->mList[i_0].c.h = element_0.c.h.doubleValue;
-                {
-                    using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].d)>;
-                    using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
-                    if (element_0.d.count != 0) {
-                        auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.d.count);
-                        if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
-                            return;
-                        }
-                        listFreer.add(listHolder_2);
-                        for (size_t i_2 = 0; i_2 < element_0.d.count; ++i_2) {
-                            if (![element_0.d[i_2] isKindOfClass:[CHIPTestClusterClusterSimpleStruct class]]) {
-                                // Wrong kind of value.
-                                return;
-                            }
-                            auto element_2 = (CHIPTestClusterClusterSimpleStruct *) element_0.d[i_2];
-                            listHolder_2->mList[i_2].a = element_2.a.unsignedCharValue;
-                            listHolder_2->mList[i_2].b = element_2.b.boolValue;
-                            listHolder_2->mList[i_2].c = static_cast<std::remove_reference_t<decltype(listHolder_2->mList[i_2].c)>>(
-                                element_2.c.unsignedCharValue);
-                            listHolder_2->mList[i_2].d = [self asByteSpan:element_2.d];
-                            listHolder_2->mList[i_2].e = [self asCharSpan:element_2.e];
-                            listHolder_2->mList[i_2].f = static_cast<std::remove_reference_t<decltype(listHolder_2->mList[i_2].f)>>(
-                                element_2.f.unsignedCharValue);
-                            listHolder_2->mList[i_2].g = element_2.g.floatValue;
-                            listHolder_2->mList[i_2].h = element_2.h.doubleValue;
-                        }
-                        listHolder_0->mList[i_0].d = ListType_2(listHolder_2->mList, element_0.d.count);
-                    } else {
-                        listHolder_0->mList[i_0].d = ListType_2();
-                    }
-                }
-                {
-                    using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].e)>;
-                    using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
-                    if (element_0.e.count != 0) {
-                        auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.e.count);
-                        if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
-                            return;
-                        }
-                        listFreer.add(listHolder_2);
-                        for (size_t i_2 = 0; i_2 < element_0.e.count; ++i_2) {
-                            if (![element_0.e[i_2] isKindOfClass:[NSNumber class]]) {
-                                // Wrong kind of value.
-                                return;
-                            }
-                            auto element_2 = (NSNumber *) element_0.e[i_2];
-                            listHolder_2->mList[i_2] = element_2.unsignedIntValue;
-                        }
-                        listHolder_0->mList[i_0].e = ListType_2(listHolder_2->mList, element_0.e.count);
-                    } else {
-                        listHolder_0->mList[i_0].e = ListType_2();
-                    }
-                }
-                {
-                    using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].f)>;
-                    using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
-                    if (element_0.f.count != 0) {
-                        auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.f.count);
-                        if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
-                            return;
-                        }
-                        listFreer.add(listHolder_2);
-                        for (size_t i_2 = 0; i_2 < element_0.f.count; ++i_2) {
-                            if (![element_0.f[i_2] isKindOfClass:[NSData class]]) {
-                                // Wrong kind of value.
-                                return;
-                            }
-                            auto element_2 = (NSData *) element_0.f[i_2];
-                            listHolder_2->mList[i_2] = [self asByteSpan:element_2];
-                        }
-                        listHolder_0->mList[i_0].f = ListType_2(listHolder_2->mList, element_0.f.count);
-                    } else {
-                        listHolder_0->mList[i_0].f = ListType_2();
-                    }
-                }
-                {
-                    using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].g)>;
-                    using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
-                    if (element_0.g.count != 0) {
-                        auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.g.count);
-                        if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
-                            return;
-                        }
-                        listFreer.add(listHolder_2);
-                        for (size_t i_2 = 0; i_2 < element_0.g.count; ++i_2) {
-                            if (![element_0.g[i_2] isKindOfClass:[NSNumber class]]) {
-                                // Wrong kind of value.
-                                return;
-                            }
-                            auto element_2 = (NSNumber *) element_0.g[i_2];
-                            listHolder_2->mList[i_2] = element_2.unsignedCharValue;
-                        }
-                        listHolder_0->mList[i_0].g = ListType_2(listHolder_2->mList, element_0.g.count);
-                    } else {
-                        listHolder_0->mList[i_0].g = ListType_2();
-                    }
-                }
-            }
-            request.arg1 = ListType_0(listHolder_0->mList, params.arg1.count);
-        } else {
-            request.arg1 = ListType_0();
-        }
-    }
-    {
-        using ListType_0 = std::remove_reference_t<decltype(request.arg2)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        if (params.arg2.count != 0) {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.arg2.count);
-            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                return;
-            }
-            listFreer.add(listHolder_0);
-            for (size_t i_0 = 0; i_0 < params.arg2.count; ++i_0) {
-                if (![params.arg2[i_0] isKindOfClass:[CHIPTestClusterClusterSimpleStruct class]]) {
-                    // Wrong kind of value.
-                    return;
-                }
-                auto element_0 = (CHIPTestClusterClusterSimpleStruct *) params.arg2[i_0];
-                listHolder_0->mList[i_0].a = element_0.a.unsignedCharValue;
-                listHolder_0->mList[i_0].b = element_0.b.boolValue;
-                listHolder_0->mList[i_0].c
-                    = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].c)>>(element_0.c.unsignedCharValue);
-                listHolder_0->mList[i_0].d = [self asByteSpan:element_0.d];
-                listHolder_0->mList[i_0].e = [self asCharSpan:element_0.e];
-                listHolder_0->mList[i_0].f
-                    = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].f)>>(element_0.f.unsignedCharValue);
-                listHolder_0->mList[i_0].g = element_0.g.floatValue;
-                listHolder_0->mList[i_0].h = element_0.h.doubleValue;
-            }
-            request.arg2 = ListType_0(listHolder_0->mList, params.arg2.count);
-        } else {
-            request.arg2 = ListType_0();
-        }
-    }
-    {
-        using ListType_0 = std::remove_reference_t<decltype(request.arg3)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        if (params.arg3.count != 0) {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.arg3.count);
-            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                return;
-            }
-            listFreer.add(listHolder_0);
-            for (size_t i_0 = 0; i_0 < params.arg3.count; ++i_0) {
-                if (![params.arg3[i_0] isKindOfClass:[NSNumber class]]) {
-                    // Wrong kind of value.
-                    return;
-                }
-                auto element_0 = (NSNumber *) params.arg3[i_0];
-                listHolder_0->mList[i_0]
-                    = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0])>>(element_0.unsignedCharValue);
-            }
-            request.arg3 = ListType_0(listHolder_0->mList, params.arg3.count);
-        } else {
-            request.arg3 = ListType_0();
-        }
-    }
-    {
-        using ListType_0 = std::remove_reference_t<decltype(request.arg4)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        if (params.arg4.count != 0) {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.arg4.count);
-            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                return;
-            }
-            listFreer.add(listHolder_0);
-            for (size_t i_0 = 0; i_0 < params.arg4.count; ++i_0) {
-                if (![params.arg4[i_0] isKindOfClass:[NSNumber class]]) {
-                    // Wrong kind of value.
-                    return;
-                }
-                auto element_0 = (NSNumber *) params.arg4[i_0];
-                listHolder_0->mList[i_0] = element_0.boolValue;
+            using TypeInfo = Channel::Attributes::ChannelList::TypeInfo;
+            auto successFn = Callback<ChannelChannelListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPChannelChannelListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeChannelListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPChannelChannelListListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Channel::Attributes::ChannelList::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<ChannelChannelListListAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            request.arg4 = ListType_0(listHolder_0->mList, params.arg4.count);
-        } else {
-            request.arg4 = ListType_0();
+            return err;
         }
-    }
-    request.arg5 = static_cast<std::remove_reference_t<decltype(request.arg5)>>(params.arg5.unsignedCharValue);
-    request.arg6 = params.arg6.boolValue;
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
 
-    new CHIPTestClusterClusterTestStructArrayArgumentResponseCallbackBridge(
+- (void)readAttributeLineupWithCompletionHandler:(void (^)(CHIPChannelClusterLineupInfo * _Nullable value,
+                                                     NSError * _Nullable error))completionHandler
+{
+    new CHIPChannelLineupStructAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPTestClusterClusterTestStructArrayArgumentResponseCallbackType>::FromCancelable(success);
+            using TypeInfo = Channel::Attributes::Lineup::TypeInfo;
+            auto successFn = Callback<ChannelLineupStructAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)testStructArgumentRequestWithParams:(CHIPTestClusterClusterTestStructArgumentRequestParams *)params
-                          completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
-                                                NSError * _Nullable error))completionHandler
+- (void)subscribeAttributeLineupWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(CHIPChannelClusterLineupInfo * _Nullable value,
+                                                    NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    TestCluster::Commands::TestStructArgumentRequest::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.arg1.a = params.arg1.a.unsignedCharValue;
-    request.arg1.b = params.arg1.b.boolValue;
-    request.arg1.c = static_cast<std::remove_reference_t<decltype(request.arg1.c)>>(params.arg1.c.unsignedCharValue);
-    request.arg1.d = [self asByteSpan:params.arg1.d];
-    request.arg1.e = [self asCharSpan:params.arg1.e];
-    request.arg1.f = static_cast<std::remove_reference_t<decltype(request.arg1.f)>>(params.arg1.f.unsignedCharValue);
-    request.arg1.g = params.arg1.g.floatValue;
-    request.arg1.h = params.arg1.h.doubleValue;
-
-    new CHIPTestClusterClusterBooleanResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPTestClusterClusterBooleanResponseCallbackType>::FromCancelable(success);
+    new CHIPChannelLineupStructAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = Channel::Attributes::Lineup::TypeInfo;
+            auto successFn = Callback<ChannelLineupStructAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPChannelLineupStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
 
-- (void)testNestedStructArgumentRequestWithParams:(CHIPTestClusterClusterTestNestedStructArgumentRequestParams *)params
-                                completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
-                                                      NSError * _Nullable error))completionHandler
++ (void)readAttributeLineupWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(CHIPChannelClusterLineupInfo * _Nullable value,
+                                                  NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    TestCluster::Commands::TestNestedStructArgumentRequest::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+    new CHIPChannelLineupStructAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Channel::Attributes::Lineup::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<ChannelLineupStructAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
-    request.arg1.a = params.arg1.a.unsignedCharValue;
-    request.arg1.b = params.arg1.b.boolValue;
-    request.arg1.c.a = params.arg1.c.a.unsignedCharValue;
-    request.arg1.c.b = params.arg1.c.b.boolValue;
-    request.arg1.c.c = static_cast<std::remove_reference_t<decltype(request.arg1.c.c)>>(params.arg1.c.c.unsignedCharValue);
-    request.arg1.c.d = [self asByteSpan:params.arg1.c.d];
-    request.arg1.c.e = [self asCharSpan:params.arg1.c.e];
-    request.arg1.c.f = static_cast<std::remove_reference_t<decltype(request.arg1.c.f)>>(params.arg1.c.f.unsignedCharValue);
-    request.arg1.c.g = params.arg1.c.g.floatValue;
-    request.arg1.c.h = params.arg1.c.h.doubleValue;
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
 
-    new CHIPTestClusterClusterBooleanResponseCallbackBridge(
+- (void)readAttributeCurrentChannelWithCompletionHandler:(void (^)(CHIPChannelClusterChannelInfo * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
+{
+    new CHIPChannelCurrentChannelStructAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPTestClusterClusterBooleanResponseCallbackType>::FromCancelable(success);
+            using TypeInfo = Channel::Attributes::CurrentChannel::TypeInfo;
+            auto successFn = Callback<ChannelCurrentChannelStructAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)testListStructArgumentRequestWithParams:(CHIPTestClusterClusterTestListStructArgumentRequestParams *)params
-                              completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
-                                                    NSError * _Nullable error))completionHandler
+- (void)subscribeAttributeCurrentChannelWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:(void (^)(CHIPChannelClusterChannelInfo * _Nullable value,
+                                                            NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    TestCluster::Commands::TestListStructArgumentRequest::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    {
-        using ListType_0 = std::remove_reference_t<decltype(request.arg1)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        if (params.arg1.count != 0) {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.arg1.count);
-            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                return;
+    new CHIPChannelCurrentChannelStructAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            listFreer.add(listHolder_0);
-            for (size_t i_0 = 0; i_0 < params.arg1.count; ++i_0) {
-                if (![params.arg1[i_0] isKindOfClass:[CHIPTestClusterClusterSimpleStruct class]]) {
-                    // Wrong kind of value.
-                    return;
+            using TypeInfo = Channel::Attributes::CurrentChannel::TypeInfo;
+            auto successFn = Callback<ChannelCurrentChannelStructAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPChannelCurrentChannelStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeCurrentChannelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:(void (^)(CHIPChannelClusterChannelInfo * _Nullable value,
+                                                          NSError * _Nullable error))completionHandler
+{
+    new CHIPChannelCurrentChannelStructAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = Channel::Attributes::CurrentChannel::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<ChannelCurrentChannelStructAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
                 }
-                auto element_0 = (CHIPTestClusterClusterSimpleStruct *) params.arg1[i_0];
-                listHolder_0->mList[i_0].a = element_0.a.unsignedCharValue;
-                listHolder_0->mList[i_0].b = element_0.b.boolValue;
-                listHolder_0->mList[i_0].c
-                    = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].c)>>(element_0.c.unsignedCharValue);
-                listHolder_0->mList[i_0].d = [self asByteSpan:element_0.d];
-                listHolder_0->mList[i_0].e = [self asCharSpan:element_0.e];
-                listHolder_0->mList[i_0].f
-                    = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].f)>>(element_0.f.unsignedCharValue);
-                listHolder_0->mList[i_0].g = element_0.g.floatValue;
-                listHolder_0->mList[i_0].h = element_0.h.doubleValue;
+                return err;
             }
-            request.arg1 = ListType_0(listHolder_0->mList, params.arg1.count);
-        } else {
-            request.arg1 = ListType_0();
-        }
-    }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
 
-    new CHIPTestClusterClusterBooleanResponseCallbackBridge(
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
+{
+    new CHIPChannelGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPTestClusterClusterBooleanResponseCallbackType>::FromCancelable(success);
+            using TypeInfo = Channel::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<ChannelGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)testListInt8UArgumentRequestWithParams:(CHIPTestClusterClusterTestListInt8UArgumentRequestParams *)params
-                             completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
-                                                   NSError * _Nullable error))completionHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    TestCluster::Commands::TestListInt8UArgumentRequest::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    {
-        using ListType_0 = std::remove_reference_t<decltype(request.arg1)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        if (params.arg1.count != 0) {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.arg1.count);
-            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                return;
+    new CHIPChannelGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            listFreer.add(listHolder_0);
-            for (size_t i_0 = 0; i_0 < params.arg1.count; ++i_0) {
-                if (![params.arg1[i_0] isKindOfClass:[NSNumber class]]) {
-                    // Wrong kind of value.
-                    return;
+            using TypeInfo = Channel::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<ChannelGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPChannelGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPChannelGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = Channel::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<ChannelGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
                 }
-                auto element_0 = (NSNumber *) params.arg1[i_0];
-                listHolder_0->mList[i_0] = element_0.unsignedCharValue;
+                return err;
             }
-            request.arg1 = ListType_0(listHolder_0->mList, params.arg1.count);
-        } else {
-            request.arg1 = ListType_0();
-        }
-    }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
 
-    new CHIPTestClusterClusterBooleanResponseCallbackBridge(
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
+{
+    new CHIPChannelAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPTestClusterClusterBooleanResponseCallbackType>::FromCancelable(success);
+            using TypeInfo = Channel::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<ChannelAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)testNestedStructListArgumentRequestWithParams:(CHIPTestClusterClusterTestNestedStructListArgumentRequestParams *)params
-                                    completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
-                                                          NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    TestCluster::Commands::TestNestedStructListArgumentRequest::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.arg1.a = params.arg1.a.unsignedCharValue;
-    request.arg1.b = params.arg1.b.boolValue;
-    request.arg1.c.a = params.arg1.c.a.unsignedCharValue;
-    request.arg1.c.b = params.arg1.c.b.boolValue;
-    request.arg1.c.c = static_cast<std::remove_reference_t<decltype(request.arg1.c.c)>>(params.arg1.c.c.unsignedCharValue);
-    request.arg1.c.d = [self asByteSpan:params.arg1.c.d];
-    request.arg1.c.e = [self asCharSpan:params.arg1.c.e];
-    request.arg1.c.f = static_cast<std::remove_reference_t<decltype(request.arg1.c.f)>>(params.arg1.c.f.unsignedCharValue);
-    request.arg1.c.g = params.arg1.c.g.floatValue;
-    request.arg1.c.h = params.arg1.c.h.doubleValue;
-    {
-        using ListType_1 = std::remove_reference_t<decltype(request.arg1.d)>;
-        using ListMemberType_1 = ListMemberTypeGetter<ListType_1>::Type;
-        if (params.arg1.d.count != 0) {
-            auto * listHolder_1 = new ListHolder<ListMemberType_1>(params.arg1.d.count);
-            if (listHolder_1 == nullptr || listHolder_1->mList == nullptr) {
-                return;
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPChannelAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            listFreer.add(listHolder_1);
-            for (size_t i_1 = 0; i_1 < params.arg1.d.count; ++i_1) {
-                if (![params.arg1.d[i_1] isKindOfClass:[CHIPTestClusterClusterSimpleStruct class]]) {
-                    // Wrong kind of value.
-                    return;
+            using TypeInfo = Channel::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<ChannelAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPChannelAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPChannelAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = Channel::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<ChannelAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
                 }
-                auto element_1 = (CHIPTestClusterClusterSimpleStruct *) params.arg1.d[i_1];
-                listHolder_1->mList[i_1].a = element_1.a.unsignedCharValue;
-                listHolder_1->mList[i_1].b = element_1.b.boolValue;
-                listHolder_1->mList[i_1].c
-                    = static_cast<std::remove_reference_t<decltype(listHolder_1->mList[i_1].c)>>(element_1.c.unsignedCharValue);
-                listHolder_1->mList[i_1].d = [self asByteSpan:element_1.d];
-                listHolder_1->mList[i_1].e = [self asCharSpan:element_1.e];
-                listHolder_1->mList[i_1].f
-                    = static_cast<std::remove_reference_t<decltype(listHolder_1->mList[i_1].f)>>(element_1.f.unsignedCharValue);
-                listHolder_1->mList[i_1].g = element_1.g.floatValue;
-                listHolder_1->mList[i_1].h = element_1.h.doubleValue;
+                return err;
             }
-            request.arg1.d = ListType_1(listHolder_1->mList, params.arg1.d.count);
-        } else {
-            request.arg1.d = ListType_1();
-        }
-    }
-    {
-        using ListType_1 = std::remove_reference_t<decltype(request.arg1.e)>;
-        using ListMemberType_1 = ListMemberTypeGetter<ListType_1>::Type;
-        if (params.arg1.e.count != 0) {
-            auto * listHolder_1 = new ListHolder<ListMemberType_1>(params.arg1.e.count);
-            if (listHolder_1 == nullptr || listHolder_1->mList == nullptr) {
-                return;
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPChannelAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = Channel::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<ChannelAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPChannelAttributeListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            listFreer.add(listHolder_1);
-            for (size_t i_1 = 0; i_1 < params.arg1.e.count; ++i_1) {
-                if (![params.arg1.e[i_1] isKindOfClass:[NSNumber class]]) {
-                    // Wrong kind of value.
-                    return;
+            using TypeInfo = Channel::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<ChannelAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPChannelAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPChannelAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = Channel::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<ChannelAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
                 }
-                auto element_1 = (NSNumber *) params.arg1.e[i_1];
-                listHolder_1->mList[i_1] = element_1.unsignedIntValue;
+                return err;
             }
-            request.arg1.e = ListType_1(listHolder_1->mList, params.arg1.e.count);
-        } else {
-            request.arg1.e = ListType_1();
-        }
-    }
-    {
-        using ListType_1 = std::remove_reference_t<decltype(request.arg1.f)>;
-        using ListMemberType_1 = ListMemberTypeGetter<ListType_1>::Type;
-        if (params.arg1.f.count != 0) {
-            auto * listHolder_1 = new ListHolder<ListMemberType_1>(params.arg1.f.count);
-            if (listHolder_1 == nullptr || listHolder_1->mList == nullptr) {
-                return;
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Channel::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            listFreer.add(listHolder_1);
-            for (size_t i_1 = 0; i_1 < params.arg1.f.count; ++i_1) {
-                if (![params.arg1.f[i_1] isKindOfClass:[NSData class]]) {
-                    // Wrong kind of value.
-                    return;
-                }
-                auto element_1 = (NSData *) params.arg1.f[i_1];
-                listHolder_1->mList[i_1] = [self asByteSpan:element_1];
+            using TypeInfo = Channel::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Channel::Attributes::FeatureMap::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            request.arg1.f = ListType_1(listHolder_1->mList, params.arg1.f.count);
-        } else {
-            request.arg1.f = ListType_1();
+            return err;
         }
-    }
-    {
-        using ListType_1 = std::remove_reference_t<decltype(request.arg1.g)>;
-        using ListMemberType_1 = ListMemberTypeGetter<ListType_1>::Type;
-        if (params.arg1.g.count != 0) {
-            auto * listHolder_1 = new ListHolder<ListMemberType_1>(params.arg1.g.count);
-            if (listHolder_1 == nullptr || listHolder_1->mList == nullptr) {
-                return;
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = Channel::Attributes::ClusterRevision::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            listFreer.add(listHolder_1);
-            for (size_t i_1 = 0; i_1 < params.arg1.g.count; ++i_1) {
-                if (![params.arg1.g[i_1] isKindOfClass:[NSNumber class]]) {
-                    // Wrong kind of value.
-                    return;
-                }
-                auto element_1 = (NSNumber *) params.arg1.g[i_1];
-                listHolder_1->mList[i_1] = element_1.unsignedCharValue;
+            using TypeInfo = Channel::Attributes::ClusterRevision::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = Channel::Attributes::ClusterRevision::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            request.arg1.g = ListType_1(listHolder_1->mList, params.arg1.g.count);
-        } else {
-            request.arg1.g = ListType_1();
+            return err;
         }
-    }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
 
-    new CHIPTestClusterClusterBooleanResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPTestClusterClusterBooleanResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+@end
+
+@implementation CHIPTargetNavigator
+
+- (chip::Controller::ClusterBase *)getCluster
+{
+    return &_cppCluster;
 }
 
-- (void)testListNestedStructListArgumentRequestWithParams:
-            (CHIPTestClusterClusterTestListNestedStructListArgumentRequestParams *)params
-                                        completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
-                                                              NSError * _Nullable error))completionHandler
+- (void)navigateTargetWithParams:(CHIPTargetNavigatorClusterNavigateTargetParams *)params
+               completionHandler:(void (^)(CHIPTargetNavigatorClusterNavigateTargetResponseParams * _Nullable data,
+                                     NSError * _Nullable error))completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    TestCluster::Commands::TestListNestedStructListArgumentRequest::Type request;
+    TargetNavigator::Commands::NavigateTarget::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    {
-        using ListType_0 = std::remove_reference_t<decltype(request.arg1)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        if (params.arg1.count != 0) {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.arg1.count);
-            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                return;
-            }
-            listFreer.add(listHolder_0);
-            for (size_t i_0 = 0; i_0 < params.arg1.count; ++i_0) {
-                if (![params.arg1[i_0] isKindOfClass:[CHIPTestClusterClusterNestedStructList class]]) {
-                    // Wrong kind of value.
-                    return;
-                }
-                auto element_0 = (CHIPTestClusterClusterNestedStructList *) params.arg1[i_0];
-                listHolder_0->mList[i_0].a = element_0.a.unsignedCharValue;
-                listHolder_0->mList[i_0].b = element_0.b.boolValue;
-                listHolder_0->mList[i_0].c.a = element_0.c.a.unsignedCharValue;
-                listHolder_0->mList[i_0].c.b = element_0.c.b.boolValue;
-                listHolder_0->mList[i_0].c.c
-                    = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].c.c)>>(element_0.c.c.unsignedCharValue);
-                listHolder_0->mList[i_0].c.d = [self asByteSpan:element_0.c.d];
-                listHolder_0->mList[i_0].c.e = [self asCharSpan:element_0.c.e];
-                listHolder_0->mList[i_0].c.f
-                    = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].c.f)>>(element_0.c.f.unsignedCharValue);
-                listHolder_0->mList[i_0].c.g = element_0.c.g.floatValue;
-                listHolder_0->mList[i_0].c.h = element_0.c.h.doubleValue;
-                {
-                    using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].d)>;
-                    using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
-                    if (element_0.d.count != 0) {
-                        auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.d.count);
-                        if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
-                            return;
-                        }
-                        listFreer.add(listHolder_2);
-                        for (size_t i_2 = 0; i_2 < element_0.d.count; ++i_2) {
-                            if (![element_0.d[i_2] isKindOfClass:[CHIPTestClusterClusterSimpleStruct class]]) {
-                                // Wrong kind of value.
-                                return;
-                            }
-                            auto element_2 = (CHIPTestClusterClusterSimpleStruct *) element_0.d[i_2];
-                            listHolder_2->mList[i_2].a = element_2.a.unsignedCharValue;
-                            listHolder_2->mList[i_2].b = element_2.b.boolValue;
-                            listHolder_2->mList[i_2].c = static_cast<std::remove_reference_t<decltype(listHolder_2->mList[i_2].c)>>(
-                                element_2.c.unsignedCharValue);
-                            listHolder_2->mList[i_2].d = [self asByteSpan:element_2.d];
-                            listHolder_2->mList[i_2].e = [self asCharSpan:element_2.e];
-                            listHolder_2->mList[i_2].f = static_cast<std::remove_reference_t<decltype(listHolder_2->mList[i_2].f)>>(
-                                element_2.f.unsignedCharValue);
-                            listHolder_2->mList[i_2].g = element_2.g.floatValue;
-                            listHolder_2->mList[i_2].h = element_2.h.doubleValue;
-                        }
-                        listHolder_0->mList[i_0].d = ListType_2(listHolder_2->mList, element_0.d.count);
-                    } else {
-                        listHolder_0->mList[i_0].d = ListType_2();
-                    }
-                }
-                {
-                    using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].e)>;
-                    using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
-                    if (element_0.e.count != 0) {
-                        auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.e.count);
-                        if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
-                            return;
-                        }
-                        listFreer.add(listHolder_2);
-                        for (size_t i_2 = 0; i_2 < element_0.e.count; ++i_2) {
-                            if (![element_0.e[i_2] isKindOfClass:[NSNumber class]]) {
-                                // Wrong kind of value.
-                                return;
-                            }
-                            auto element_2 = (NSNumber *) element_0.e[i_2];
-                            listHolder_2->mList[i_2] = element_2.unsignedIntValue;
-                        }
-                        listHolder_0->mList[i_0].e = ListType_2(listHolder_2->mList, element_0.e.count);
-                    } else {
-                        listHolder_0->mList[i_0].e = ListType_2();
-                    }
-                }
-                {
-                    using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].f)>;
-                    using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
-                    if (element_0.f.count != 0) {
-                        auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.f.count);
-                        if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
-                            return;
-                        }
-                        listFreer.add(listHolder_2);
-                        for (size_t i_2 = 0; i_2 < element_0.f.count; ++i_2) {
-                            if (![element_0.f[i_2] isKindOfClass:[NSData class]]) {
-                                // Wrong kind of value.
-                                return;
-                            }
-                            auto element_2 = (NSData *) element_0.f[i_2];
-                            listHolder_2->mList[i_2] = [self asByteSpan:element_2];
-                        }
-                        listHolder_0->mList[i_0].f = ListType_2(listHolder_2->mList, element_0.f.count);
-                    } else {
-                        listHolder_0->mList[i_0].f = ListType_2();
-                    }
-                }
-                {
-                    using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].g)>;
-                    using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
-                    if (element_0.g.count != 0) {
-                        auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.g.count);
-                        if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
-                            return;
-                        }
-                        listFreer.add(listHolder_2);
-                        for (size_t i_2 = 0; i_2 < element_0.g.count; ++i_2) {
-                            if (![element_0.g[i_2] isKindOfClass:[NSNumber class]]) {
-                                // Wrong kind of value.
-                                return;
-                            }
-                            auto element_2 = (NSNumber *) element_0.g[i_2];
-                            listHolder_2->mList[i_2] = element_2.unsignedCharValue;
-                        }
-                        listHolder_0->mList[i_0].g = ListType_2(listHolder_2->mList, element_0.g.count);
-                    } else {
-                        listHolder_0->mList[i_0].g = ListType_2();
-                    }
-                }
-            }
-            request.arg1 = ListType_0(listHolder_0->mList, params.arg1.count);
-        } else {
-            request.arg1 = ListType_0();
-        }
+    request.target = params.target.unsignedCharValue;
+    if (params.data != nil) {
+        auto & definedValue_0 = request.data.Emplace();
+        definedValue_0 = [self asCharSpan:params.data];
     }
 
-    new CHIPTestClusterClusterBooleanResponseCallbackBridge(
+    new CHIPTargetNavigatorClusterNavigateTargetResponseCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPTestClusterClusterBooleanResponseCallbackType>::FromCancelable(success);
+            auto successFn = Callback<CHIPTargetNavigatorClusterNavigateTargetResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.InvokeCommand(
                 request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)testListInt8UReverseRequestWithParams:(CHIPTestClusterClusterTestListInt8UReverseRequestParams *)params
-                            completionHandler:(void (^)(CHIPTestClusterClusterTestListInt8UReverseResponseParams * _Nullable data,
-                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeTargetListWithCompletionHandler:(void (^)(
+                                                         NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    TestCluster::Commands::TestListInt8UReverseRequest::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    {
-        using ListType_0 = std::remove_reference_t<decltype(request.arg1)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        if (params.arg1.count != 0) {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.arg1.count);
-            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                return;
-            }
-            listFreer.add(listHolder_0);
-            for (size_t i_0 = 0; i_0 < params.arg1.count; ++i_0) {
-                if (![params.arg1[i_0] isKindOfClass:[NSNumber class]]) {
-                    // Wrong kind of value.
-                    return;
-                }
-                auto element_0 = (NSNumber *) params.arg1[i_0];
-                listHolder_0->mList[i_0] = element_0.unsignedCharValue;
+    new CHIPTargetNavigatorTargetListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TargetNavigator::Attributes::TargetList::TypeInfo;
+            auto successFn = Callback<TargetNavigatorTargetListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeTargetListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPTargetNavigatorTargetListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            request.arg1 = ListType_0(listHolder_0->mList, params.arg1.count);
-        } else {
-            request.arg1 = ListType_0();
+            using TypeInfo = TargetNavigator::Attributes::TargetList::TypeInfo;
+            auto successFn = Callback<TargetNavigatorTargetListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPTargetNavigatorTargetListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeTargetListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPTargetNavigatorTargetListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = TargetNavigator::Attributes::TargetList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<TargetNavigatorTargetListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
+- (void)readAttributeCurrentTargetWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TargetNavigator::Attributes::CurrentTarget::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeCurrentTargetWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = TargetNavigator::Attributes::CurrentTarget::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeCurrentTargetWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = TargetNavigator::Attributes::CurrentTarget::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
 
-    new CHIPTestClusterClusterTestListInt8UReverseResponseCallbackBridge(
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
+{
+    new CHIPTargetNavigatorGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPTestClusterClusterTestListInt8UReverseResponseCallbackType>::FromCancelable(success);
+            using TypeInfo = TargetNavigator::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<TargetNavigatorGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)testEnumsRequestWithParams:(CHIPTestClusterClusterTestEnumsRequestParams *)params
-                 completionHandler:(void (^)(CHIPTestClusterClusterTestEnumsResponseParams * _Nullable data,
-                                       NSError * _Nullable error))completionHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPTargetNavigatorGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = TargetNavigator::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<TargetNavigatorGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPTargetNavigatorGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPTargetNavigatorGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = TargetNavigator::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<TargetNavigatorGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
+{
+    new CHIPTargetNavigatorAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TargetNavigator::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<TargetNavigatorAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPTargetNavigatorAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = TargetNavigator::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<TargetNavigatorAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPTargetNavigatorAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPTargetNavigatorAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = TargetNavigator::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<TargetNavigatorAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPTargetNavigatorAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TargetNavigator::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<TargetNavigatorAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPTargetNavigatorAttributeListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = TargetNavigator::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<TargetNavigatorAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPTargetNavigatorAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPTargetNavigatorAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = TargetNavigator::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<TargetNavigatorAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TargetNavigator::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = TargetNavigator::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = TargetNavigator::Attributes::FeatureMap::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TargetNavigator::Attributes::ClusterRevision::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = TargetNavigator::Attributes::ClusterRevision::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = TargetNavigator::Attributes::ClusterRevision::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+@end
+
+@implementation CHIPMediaPlayback
+
+- (chip::Controller::ClusterBase *)getCluster
+{
+    return &_cppCluster;
+}
+
+- (void)playWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                                      NSError * _Nullable error))completionHandler
+{
+    [self playWithParams:nil completionHandler:completionHandler];
+}
+- (void)playWithParams:(CHIPMediaPlaybackClusterPlayParams * _Nullable)params
+     completionHandler:
+         (void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    TestCluster::Commands::TestEnumsRequest::Type request;
+    MediaPlayback::Commands::Play::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    request.arg1 = static_cast<std::remove_reference_t<decltype(request.arg1)>>(params.arg1.unsignedShortValue);
-    request.arg2 = static_cast<std::remove_reference_t<decltype(request.arg2)>>(params.arg2.unsignedCharValue);
 
-    new CHIPTestClusterClusterTestEnumsResponseCallbackBridge(
+    new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPTestClusterClusterTestEnumsResponseCallbackType>::FromCancelable(success);
+            auto successFn = Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.InvokeCommand(
                 request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)testNullableOptionalRequestWithParams:(CHIPTestClusterClusterTestNullableOptionalRequestParams * _Nullable)params
-                            completionHandler:(void (^)(CHIPTestClusterClusterTestNullableOptionalResponseParams * _Nullable data,
-                                                  NSError * _Nullable error))completionHandler
+- (void)pauseWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                                       NSError * _Nullable error))completionHandler
+{
+    [self pauseWithParams:nil completionHandler:completionHandler];
+}
+- (void)pauseWithParams:(CHIPMediaPlaybackClusterPauseParams * _Nullable)params
+      completionHandler:
+          (void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    TestCluster::Commands::TestNullableOptionalRequest::Type request;
+    MediaPlayback::Commands::Pause::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    if (params != nil) {
-        if (params.arg1 != nil) {
-            auto & definedValue_0 = request.arg1.Emplace();
-            if (params.arg1 == nil) {
-                definedValue_0.SetNull();
-            } else {
-                auto & nonNullValue_1 = definedValue_0.SetNonNull();
-                nonNullValue_1 = params.arg1.unsignedCharValue;
-            }
-        }
-    }
 
-    new CHIPTestClusterClusterTestNullableOptionalResponseCallbackBridge(
+    new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPTestClusterClusterTestNullableOptionalResponseCallbackType>::FromCancelable(success);
+            auto successFn = Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.InvokeCommand(
                 request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)testComplexNullableOptionalRequestWithParams:(CHIPTestClusterClusterTestComplexNullableOptionalRequestParams *)params
-                                   completionHandler:
-                                       (void (^)(CHIPTestClusterClusterTestComplexNullableOptionalResponseParams * _Nullable data,
-                                           NSError * _Nullable error))completionHandler
+- (void)stopPlaybackWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                                              NSError * _Nullable error))completionHandler
+{
+    [self stopPlaybackWithParams:nil completionHandler:completionHandler];
+}
+- (void)stopPlaybackWithParams:(CHIPMediaPlaybackClusterStopPlaybackParams * _Nullable)params
+             completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                                   NSError * _Nullable error))completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    TestCluster::Commands::TestComplexNullableOptionalRequest::Type request;
+    MediaPlayback::Commands::StopPlayback::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    if (params.nullableInt == nil) {
-        request.nullableInt.SetNull();
-    } else {
-        auto & nonNullValue_0 = request.nullableInt.SetNonNull();
-        nonNullValue_0 = params.nullableInt.unsignedShortValue;
-    }
-    if (params.optionalInt != nil) {
-        auto & definedValue_0 = request.optionalInt.Emplace();
-        definedValue_0 = params.optionalInt.unsignedShortValue;
-    }
-    if (params.nullableOptionalInt != nil) {
-        auto & definedValue_0 = request.nullableOptionalInt.Emplace();
-        if (params.nullableOptionalInt == nil) {
-            definedValue_0.SetNull();
-        } else {
-            auto & nonNullValue_1 = definedValue_0.SetNonNull();
-            nonNullValue_1 = params.nullableOptionalInt.unsignedShortValue;
-        }
-    }
-    if (params.nullableString == nil) {
-        request.nullableString.SetNull();
-    } else {
-        auto & nonNullValue_0 = request.nullableString.SetNonNull();
-        nonNullValue_0 = [self asCharSpan:params.nullableString];
-    }
-    if (params.optionalString != nil) {
-        auto & definedValue_0 = request.optionalString.Emplace();
-        definedValue_0 = [self asCharSpan:params.optionalString];
-    }
-    if (params.nullableOptionalString != nil) {
-        auto & definedValue_0 = request.nullableOptionalString.Emplace();
-        if (params.nullableOptionalString == nil) {
-            definedValue_0.SetNull();
-        } else {
-            auto & nonNullValue_1 = definedValue_0.SetNonNull();
-            nonNullValue_1 = [self asCharSpan:params.nullableOptionalString];
-        }
-    }
-    if (params.nullableStruct == nil) {
-        request.nullableStruct.SetNull();
-    } else {
-        auto & nonNullValue_0 = request.nullableStruct.SetNonNull();
-        nonNullValue_0.a = params.nullableStruct.a.unsignedCharValue;
-        nonNullValue_0.b = params.nullableStruct.b.boolValue;
-        nonNullValue_0.c
-            = static_cast<std::remove_reference_t<decltype(nonNullValue_0.c)>>(params.nullableStruct.c.unsignedCharValue);
-        nonNullValue_0.d = [self asByteSpan:params.nullableStruct.d];
-        nonNullValue_0.e = [self asCharSpan:params.nullableStruct.e];
-        nonNullValue_0.f
-            = static_cast<std::remove_reference_t<decltype(nonNullValue_0.f)>>(params.nullableStruct.f.unsignedCharValue);
-        nonNullValue_0.g = params.nullableStruct.g.floatValue;
-        nonNullValue_0.h = params.nullableStruct.h.doubleValue;
-    }
-    if (params.optionalStruct != nil) {
-        auto & definedValue_0 = request.optionalStruct.Emplace();
-        definedValue_0.a = params.optionalStruct.a.unsignedCharValue;
-        definedValue_0.b = params.optionalStruct.b.boolValue;
-        definedValue_0.c
-            = static_cast<std::remove_reference_t<decltype(definedValue_0.c)>>(params.optionalStruct.c.unsignedCharValue);
-        definedValue_0.d = [self asByteSpan:params.optionalStruct.d];
-        definedValue_0.e = [self asCharSpan:params.optionalStruct.e];
-        definedValue_0.f
-            = static_cast<std::remove_reference_t<decltype(definedValue_0.f)>>(params.optionalStruct.f.unsignedCharValue);
-        definedValue_0.g = params.optionalStruct.g.floatValue;
-        definedValue_0.h = params.optionalStruct.h.doubleValue;
-    }
-    if (params.nullableOptionalStruct != nil) {
-        auto & definedValue_0 = request.nullableOptionalStruct.Emplace();
-        if (params.nullableOptionalStruct == nil) {
-            definedValue_0.SetNull();
-        } else {
-            auto & nonNullValue_1 = definedValue_0.SetNonNull();
-            nonNullValue_1.a = params.nullableOptionalStruct.a.unsignedCharValue;
-            nonNullValue_1.b = params.nullableOptionalStruct.b.boolValue;
-            nonNullValue_1.c = static_cast<std::remove_reference_t<decltype(nonNullValue_1.c)>>(
-                params.nullableOptionalStruct.c.unsignedCharValue);
-            nonNullValue_1.d = [self asByteSpan:params.nullableOptionalStruct.d];
-            nonNullValue_1.e = [self asCharSpan:params.nullableOptionalStruct.e];
-            nonNullValue_1.f = static_cast<std::remove_reference_t<decltype(nonNullValue_1.f)>>(
-                params.nullableOptionalStruct.f.unsignedCharValue);
-            nonNullValue_1.g = params.nullableOptionalStruct.g.floatValue;
-            nonNullValue_1.h = params.nullableOptionalStruct.h.doubleValue;
-        }
-    }
-    if (params.nullableList == nil) {
-        request.nullableList.SetNull();
-    } else {
-        auto & nonNullValue_0 = request.nullableList.SetNonNull();
-        {
-            using ListType_1 = std::remove_reference_t<decltype(nonNullValue_0)>;
-            using ListMemberType_1 = ListMemberTypeGetter<ListType_1>::Type;
-            if (params.nullableList.count != 0) {
-                auto * listHolder_1 = new ListHolder<ListMemberType_1>(params.nullableList.count);
-                if (listHolder_1 == nullptr || listHolder_1->mList == nullptr) {
-                    return;
-                }
-                listFreer.add(listHolder_1);
-                for (size_t i_1 = 0; i_1 < params.nullableList.count; ++i_1) {
-                    if (![params.nullableList[i_1] isKindOfClass:[NSNumber class]]) {
-                        // Wrong kind of value.
-                        return;
-                    }
-                    auto element_1 = (NSNumber *) params.nullableList[i_1];
-                    listHolder_1->mList[i_1]
-                        = static_cast<std::remove_reference_t<decltype(listHolder_1->mList[i_1])>>(element_1.unsignedCharValue);
-                }
-                nonNullValue_0 = ListType_1(listHolder_1->mList, params.nullableList.count);
-            } else {
-                nonNullValue_0 = ListType_1();
-            }
-        }
-    }
-    if (params.optionalList != nil) {
-        auto & definedValue_0 = request.optionalList.Emplace();
-        {
-            using ListType_1 = std::remove_reference_t<decltype(definedValue_0)>;
-            using ListMemberType_1 = ListMemberTypeGetter<ListType_1>::Type;
-            if (params.optionalList.count != 0) {
-                auto * listHolder_1 = new ListHolder<ListMemberType_1>(params.optionalList.count);
-                if (listHolder_1 == nullptr || listHolder_1->mList == nullptr) {
-                    return;
-                }
-                listFreer.add(listHolder_1);
-                for (size_t i_1 = 0; i_1 < params.optionalList.count; ++i_1) {
-                    if (![params.optionalList[i_1] isKindOfClass:[NSNumber class]]) {
-                        // Wrong kind of value.
-                        return;
-                    }
-                    auto element_1 = (NSNumber *) params.optionalList[i_1];
-                    listHolder_1->mList[i_1]
-                        = static_cast<std::remove_reference_t<decltype(listHolder_1->mList[i_1])>>(element_1.unsignedCharValue);
-                }
-                definedValue_0 = ListType_1(listHolder_1->mList, params.optionalList.count);
-            } else {
-                definedValue_0 = ListType_1();
-            }
-        }
-    }
-    if (params.nullableOptionalList != nil) {
-        auto & definedValue_0 = request.nullableOptionalList.Emplace();
-        if (params.nullableOptionalList == nil) {
-            definedValue_0.SetNull();
-        } else {
-            auto & nonNullValue_1 = definedValue_0.SetNonNull();
-            {
-                using ListType_2 = std::remove_reference_t<decltype(nonNullValue_1)>;
-                using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
-                if (params.nullableOptionalList.count != 0) {
-                    auto * listHolder_2 = new ListHolder<ListMemberType_2>(params.nullableOptionalList.count);
-                    if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
-                        return;
-                    }
-                    listFreer.add(listHolder_2);
-                    for (size_t i_2 = 0; i_2 < params.nullableOptionalList.count; ++i_2) {
-                        if (![params.nullableOptionalList[i_2] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return;
-                        }
-                        auto element_2 = (NSNumber *) params.nullableOptionalList[i_2];
-                        listHolder_2->mList[i_2]
-                            = static_cast<std::remove_reference_t<decltype(listHolder_2->mList[i_2])>>(element_2.unsignedCharValue);
-                    }
-                    nonNullValue_1 = ListType_2(listHolder_2->mList, params.nullableOptionalList.count);
-                } else {
-                    nonNullValue_1 = ListType_2();
-                }
-            }
-        }
-    }
 
-    new CHIPTestClusterClusterTestComplexNullableOptionalResponseCallbackBridge(
+    new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn
-                = Callback<CHIPTestClusterClusterTestComplexNullableOptionalResponseCallbackType>::FromCancelable(success);
+            auto successFn = Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.InvokeCommand(
                 request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)simpleStructEchoRequestWithParams:(CHIPTestClusterClusterSimpleStructEchoRequestParams *)params
-                        completionHandler:(void (^)(CHIPTestClusterClusterSimpleStructResponseParams * _Nullable data,
-                                              NSError * _Nullable error))completionHandler
+- (void)startOverWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                                           NSError * _Nullable error))completionHandler
+{
+    [self startOverWithParams:nil completionHandler:completionHandler];
+}
+- (void)startOverWithParams:(CHIPMediaPlaybackClusterStartOverParams * _Nullable)params
+          completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                                NSError * _Nullable error))completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    TestCluster::Commands::SimpleStructEchoRequest::Type request;
+    MediaPlayback::Commands::StartOver::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    request.arg1.a = params.arg1.a.unsignedCharValue;
-    request.arg1.b = params.arg1.b.boolValue;
-    request.arg1.c = static_cast<std::remove_reference_t<decltype(request.arg1.c)>>(params.arg1.c.unsignedCharValue);
-    request.arg1.d = [self asByteSpan:params.arg1.d];
-    request.arg1.e = [self asCharSpan:params.arg1.e];
-    request.arg1.f = static_cast<std::remove_reference_t<decltype(request.arg1.f)>>(params.arg1.f.unsignedCharValue);
-    request.arg1.g = params.arg1.g.floatValue;
-    request.arg1.h = params.arg1.h.doubleValue;
 
-    new CHIPTestClusterClusterSimpleStructResponseCallbackBridge(
+    new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPTestClusterClusterSimpleStructResponseCallbackType>::FromCancelable(success);
+            auto successFn = Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.InvokeCommand(
                 request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)timedInvokeRequestWithCompletionHandler:(StatusCompletion)completionHandler
+- (void)previousWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                                          NSError * _Nullable error))completionHandler
 {
-    [self timedInvokeRequestWithParams:nil completionHandler:completionHandler];
+    [self previousWithParams:nil completionHandler:completionHandler];
 }
-- (void)timedInvokeRequestWithParams:(CHIPTestClusterClusterTimedInvokeRequestParams * _Nullable)params
-                   completionHandler:(StatusCompletion)completionHandler
+- (void)previousWithParams:(CHIPMediaPlaybackClusterPreviousParams * _Nullable)params
+         completionHandler:
+             (void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    TestCluster::Commands::TimedInvokeRequest::Type request;
+    MediaPlayback::Commands::Previous::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    if (!timedInvokeTimeoutMs.HasValue()) {
-        timedInvokeTimeoutMs.SetValue(10000);
-    }
 
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+    new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.InvokeCommand(
                 request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)testSimpleOptionalArgumentRequestWithParams:
-            (CHIPTestClusterClusterTestSimpleOptionalArgumentRequestParams * _Nullable)params
-                                  completionHandler:(StatusCompletion)completionHandler
+- (void)nextWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                                      NSError * _Nullable error))completionHandler
+{
+    [self nextWithParams:nil completionHandler:completionHandler];
+}
+- (void)nextWithParams:(CHIPMediaPlaybackClusterNextParams * _Nullable)params
+     completionHandler:
+         (void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    TestCluster::Commands::TestSimpleOptionalArgumentRequest::Type request;
+    MediaPlayback::Commands::Next::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    if (params != nil) {
-        if (params.arg1 != nil) {
-            auto & definedValue_0 = request.arg1.Emplace();
-            definedValue_0 = params.arg1.boolValue;
-        }
-    }
 
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+    new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.InvokeCommand(
                 request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)testEmitTestEventRequestWithParams:(CHIPTestClusterClusterTestEmitTestEventRequestParams *)params
-                         completionHandler:(void (^)(CHIPTestClusterClusterTestEmitTestEventResponseParams * _Nullable data,
-                                               NSError * _Nullable error))completionHandler
+- (void)rewindWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                                        NSError * _Nullable error))completionHandler
+{
+    [self rewindWithParams:nil completionHandler:completionHandler];
+}
+- (void)rewindWithParams:(CHIPMediaPlaybackClusterRewindParams * _Nullable)params
+       completionHandler:
+           (void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    TestCluster::Commands::TestEmitTestEventRequest::Type request;
+    MediaPlayback::Commands::Rewind::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    request.arg1 = params.arg1.unsignedCharValue;
-    request.arg2 = static_cast<std::remove_reference_t<decltype(request.arg2)>>(params.arg2.unsignedCharValue);
-    request.arg3 = params.arg3.boolValue;
 
-    new CHIPTestClusterClusterTestEmitTestEventResponseCallbackBridge(
+    new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPTestClusterClusterTestEmitTestEventResponseCallbackType>::FromCancelable(success);
+            auto successFn = Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.InvokeCommand(
                 request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)testEmitTestFabricScopedEventRequestWithParams:(CHIPTestClusterClusterTestEmitTestFabricScopedEventRequestParams *)params
-                                     completionHandler:
-                                         (void (^)(
-                                             CHIPTestClusterClusterTestEmitTestFabricScopedEventResponseParams * _Nullable data,
+- (void)fastForwardWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
                                              NSError * _Nullable error))completionHandler
+{
+    [self fastForwardWithParams:nil completionHandler:completionHandler];
+}
+- (void)fastForwardWithParams:(CHIPMediaPlaybackClusterFastForwardParams * _Nullable)params
+            completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                                  NSError * _Nullable error))completionHandler
 {
     chip::Optional<uint16_t> timedInvokeTimeoutMs;
     ListFreer listFreer;
-    TestCluster::Commands::TestEmitTestFabricScopedEventRequest::Type request;
+    MediaPlayback::Commands::FastForward::Type request;
     if (params != nil) {
         if (params.timedInvokeTimeoutMs != nil) {
             timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-    request.arg1 = params.arg1.unsignedCharValue;
 
-    new CHIPTestClusterClusterTestEmitTestFabricScopedEventResponseCallbackBridge(
+    new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn
-                = Callback<CHIPTestClusterClusterTestEmitTestFabricScopedEventResponseCallbackType>::FromCancelable(success);
+            auto successFn = Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.InvokeCommand(
                 request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)readAttributeBooleanWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)skipForwardWithParams:(CHIPMediaPlaybackClusterSkipForwardParams *)params
+            completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::Boolean::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    MediaPlayback::Commands::SkipForward::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.deltaPositionMilliseconds = params.deltaPositionMilliseconds.unsignedLongLongValue;
+
+    new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-- (void)writeAttributeBooleanWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)skipBackwardWithParams:(CHIPMediaPlaybackClusterSkipBackwardParams *)params
+             completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data,
+                                   NSError * _Nullable error))completionHandler
 {
-    [self writeAttributeBooleanWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    MediaPlayback::Commands::SkipBackward::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.deltaPositionMilliseconds = params.deltaPositionMilliseconds.unsignedLongLongValue;
+
+    new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
-- (void)writeAttributeBooleanWithValue:(NSNumber * _Nonnull)value
-                                params:(CHIPWriteParams * _Nullable)params
-                     completionHandler:(StatusCompletion)completionHandler
+
+- (void)seekWithParams:(CHIPMediaPlaybackClusterSeekParams *)params
+     completionHandler:
+         (void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    MediaPlayback::Commands::Seek::Type request;
     if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
+    request.position = params.position.unsignedLongLongValue;
 
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::Boolean::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPMediaPlaybackClusterPlaybackResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeBooleanWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)readAttributeCurrentStateWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = MediaPlayback::Attributes::CurrentState::TypeInfo;
+            auto successFn = Callback<MediaPlaybackClusterPlaybackStateEnumAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeCurrentStateWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::Boolean::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = MediaPlayback::Attributes::CurrentState::TypeInfo;
+            auto successFn = Callback<MediaPlaybackClusterPlaybackStateEnumAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBooleanWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCurrentStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::Boolean::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = MediaPlayback::Attributes::CurrentState::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<MediaPlaybackClusterPlaybackStateEnumAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeBitmap8WithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeStartTimeWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterBitmap8AttributeCallbackBridge(
+    new CHIPNullableInt64uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::Bitmap8::TypeInfo;
-            auto successFn = Callback<TestClusterBitmap8AttributeCallback>::FromCancelable(success);
+            using TypeInfo = MediaPlayback::Attributes::StartTime::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeBitmap8WithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeBitmap8WithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeBitmap8WithValue:(NSNumber * _Nonnull)value
-                                params:(CHIPWriteParams * _Nullable)params
-                     completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::Bitmap8::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeBitmap8WithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeStartTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPTestClusterBitmap8AttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::Bitmap8::TypeInfo;
-            auto successFn = Callback<TestClusterBitmap8AttributeCallback>::FromCancelable(success);
+            using TypeInfo = MediaPlayback::Attributes::StartTime::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterBitmap8AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBitmap8WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeStartTimeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterBitmap8AttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::Bitmap8::TypeInfo;
+            using TypeInfo = MediaPlayback::Attributes::StartTime::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<TestClusterBitmap8AttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -58863,90 +58193,58 @@ new CHIPTestClusterBitmap8AttributeCallbackBridge(queue, completionHandler, ^(Ca
     });
 }
 
-- (void)readAttributeBitmap16WithCompletionHandler:(void (^)(
+- (void)readAttributeDurationWithCompletionHandler:(void (^)(
                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterBitmap16AttributeCallbackBridge(
+    new CHIPNullableInt64uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::Bitmap16::TypeInfo;
-            auto successFn = Callback<TestClusterBitmap16AttributeCallback>::FromCancelable(success);
+            using TypeInfo = MediaPlayback::Attributes::Duration::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeBitmap16WithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeBitmap16WithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeBitmap16WithValue:(NSNumber * _Nonnull)value
-                                 params:(CHIPWriteParams * _Nullable)params
-                      completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::Bitmap16::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeBitmap16WithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeDurationWithMinInterval:(NSNumber * _Nonnull)minInterval
                                       maxInterval:(NSNumber * _Nonnull)maxInterval
                                            params:(CHIPSubscribeParams * _Nullable)params
                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPTestClusterBitmap16AttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::Bitmap16::TypeInfo;
-            auto successFn = Callback<TestClusterBitmap16AttributeCallback>::FromCancelable(success);
+            using TypeInfo = MediaPlayback::Attributes::Duration::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterBitmap16AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBitmap16WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeDurationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                        endpoint:(NSNumber *)endpoint
                                           queue:(dispatch_queue_t)queue
                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterBitmap16AttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::Bitmap16::TypeInfo;
+            using TypeInfo = MediaPlayback::Attributes::Duration::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<TestClusterBitmap16AttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -58956,90 +58254,123 @@ new CHIPTestClusterBitmap16AttributeCallbackBridge(queue, completionHandler, ^(C
     });
 }
 
-- (void)readAttributeBitmap32WithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeSampledPositionWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterBitmap32AttributeCallbackBridge(
+    new CHIPMediaPlaybackSampledPositionStructAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::Bitmap32::TypeInfo;
-            auto successFn = Callback<TestClusterBitmap32AttributeCallback>::FromCancelable(success);
+            using TypeInfo = MediaPlayback::Attributes::SampledPosition::TypeInfo;
+            auto successFn = Callback<MediaPlaybackSampledPositionStructAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeBitmap32WithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeBitmap32WithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeBitmap32WithValue:(NSNumber * _Nonnull)value
-                                 params:(CHIPWriteParams * _Nullable)params
-                      completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeSampledPositionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value,
+                                                             NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
+    new CHIPMediaPlaybackSampledPositionStructAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::Bitmap32::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedIntValue);
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = MediaPlayback::Attributes::SampledPosition::TypeInfo;
+            auto successFn = Callback<MediaPlaybackSampledPositionStructAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPMediaPlaybackSampledPositionStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeSampledPositionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value,
+                                                           NSError * _Nullable error))completionHandler
+{
+    new CHIPMediaPlaybackSampledPositionStructAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = MediaPlayback::Attributes::SampledPosition::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<MediaPlaybackSampledPositionStructAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
         });
 }
 
-- (void)subscribeAttributeBitmap32WithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)readAttributePlaybackSpeedWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterBitmap32AttributeCallbackSubscriptionBridge(
+    new CHIPFloatAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = MediaPlayback::Attributes::PlaybackSpeed::TypeInfo;
+        auto successFn = Callback<FloatAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributePlaybackSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPFloatAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::Bitmap32::TypeInfo;
-            auto successFn = Callback<TestClusterBitmap32AttributeCallback>::FromCancelable(success);
+            using TypeInfo = MediaPlayback::Attributes::PlaybackSpeed::TypeInfo;
+            auto successFn = Callback<FloatAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterBitmap32AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPFloatAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBitmap32WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePlaybackSpeedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterBitmap32AttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPFloatAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::Bitmap32::TypeInfo;
+            using TypeInfo = MediaPlayback::Attributes::PlaybackSpeed::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<TestClusterBitmap32AttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<FloatAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -59049,90 +58380,59 @@ new CHIPTestClusterBitmap32AttributeCallbackBridge(queue, completionHandler, ^(C
     });
 }
 
-- (void)readAttributeBitmap64WithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeSeekRangeEndWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterBitmap64AttributeCallbackBridge(
+    new CHIPNullableInt64uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::Bitmap64::TypeInfo;
-            auto successFn = Callback<TestClusterBitmap64AttributeCallback>::FromCancelable(success);
+            using TypeInfo = MediaPlayback::Attributes::SeekRangeEnd::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeBitmap64WithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeBitmap64WithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeBitmap64WithValue:(NSNumber * _Nonnull)value
-                                 params:(CHIPWriteParams * _Nullable)params
-                      completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::Bitmap64::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedLongLongValue);
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeBitmap64WithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSeekRangeEndWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPTestClusterBitmap64AttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::Bitmap64::TypeInfo;
-            auto successFn = Callback<TestClusterBitmap64AttributeCallback>::FromCancelable(success);
+            using TypeInfo = MediaPlayback::Attributes::SeekRangeEnd::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterBitmap64AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBitmap64WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeSeekRangeEndWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterBitmap64AttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::Bitmap64::TypeInfo;
+            using TypeInfo = MediaPlayback::Attributes::SeekRangeEnd::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<TestClusterBitmap64AttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -59142,88 +58442,60 @@ new CHIPTestClusterBitmap64AttributeCallbackBridge(queue, completionHandler, ^(C
     });
 }
 
-- (void)readAttributeInt8uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::Int8u::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)writeAttributeInt8uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeInt8uWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeInt8uWithValue:(NSNumber * _Nonnull)value
-                              params:(CHIPWriteParams * _Nullable)params
-                   completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeSeekRangeStartWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::Int8u::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPNullableInt64uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = MediaPlayback::Attributes::SeekRangeStart::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeInt8uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                        params:(CHIPSubscribeParams * _Nullable)params
-                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSeekRangeStartWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::Int8u::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = MediaPlayback::Attributes::SeekRangeStart::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInt8uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                    endpoint:(NSNumber *)endpoint
-                                       queue:(dispatch_queue_t)queue
-                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeSeekRangeStartWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::Int8u::TypeInfo;
+            using TypeInfo = MediaPlayback::Attributes::SeekRangeStart::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -59233,235 +58505,215 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeInt16uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::Int16u::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)writeAttributeInt16uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeInt16uWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeInt16uWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::Int16u::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = MediaPlayback::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<MediaPlaybackGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeInt16uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::Int16u::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = MediaPlayback::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<MediaPlaybackGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInt16uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::Int16u::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPMediaPlaybackGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = MediaPlayback::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<MediaPlaybackGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeInt24uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::Int24u::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)writeAttributeInt24uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeInt24uWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeInt24uWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::Int24u::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = MediaPlayback::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<MediaPlaybackAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeInt24uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::Int24u::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = MediaPlayback::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<MediaPlaybackAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInt24uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::Int24u::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPMediaPlaybackAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = MediaPlayback::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<MediaPlaybackAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeInt32uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::Int32u::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPMediaPlaybackAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = MediaPlayback::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<MediaPlaybackAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)writeAttributeInt32uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeInt32uWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeInt32uWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
+    new CHIPMediaPlaybackAttributeListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::Int32u::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = MediaPlayback::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<MediaPlaybackAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPMediaPlaybackAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPMediaPlaybackAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = MediaPlayback::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<MediaPlaybackAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
         });
 }
 
-- (void)subscribeAttributeInt32uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = MediaPlayback::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -59470,7 +58722,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::Int32u::TypeInfo;
+            using TypeInfo = MediaPlayback::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -59482,15 +58734,15 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInt32uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::Int32u::TypeInfo;
+            using TypeInfo = MediaPlayback::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -59506,88 +58758,59 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeInt40uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::Int40u::TypeInfo;
-        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = MediaPlayback::Attributes::ClusterRevision::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeInt40uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeInt40uWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeInt40uWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::Int40u::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeInt40uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt64uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::Int40u::TypeInfo;
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = MediaPlayback::Attributes::ClusterRevision::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInt40uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::Int40u::TypeInfo;
+            using TypeInfo = MediaPlayback::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -59597,88 +58820,176 @@ new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeInt48uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+@end
+
+@implementation CHIPMediaInput
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::Int48u::TypeInfo;
-        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    return &_cppCluster;
 }
 
-- (void)writeAttributeInt48uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)selectInputWithParams:(CHIPMediaInputClusterSelectInputParams *)params completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeInt48uWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    MediaInput::Commands::SelectInput::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.index = params.index.unsignedCharValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
-- (void)writeAttributeInt48uWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler
+
+- (void)showInputStatusWithCompletionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    [self showInputStatusWithParams:nil completionHandler:completionHandler];
+}
+- (void)showInputStatusWithParams:(CHIPMediaInputClusterShowInputStatusParams * _Nullable)params
+                completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    MediaInput::Commands::ShowInputStatus::Type request;
     if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
 
-    new CHIPDefaultSuccessCallbackBridge(
+    new CHIPCommandSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
+        ^(id _Nullable value, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::Int48u::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeInt48uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)hideInputStatusWithCompletionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt64uAttributeCallbackSubscriptionBridge(
+    [self hideInputStatusWithParams:nil completionHandler:completionHandler];
+}
+- (void)hideInputStatusWithParams:(CHIPMediaInputClusterHideInputStatusParams * _Nullable)params
+                completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    MediaInput::Commands::HideInputStatus::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)renameInputWithParams:(CHIPMediaInputClusterRenameInputParams *)params completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    MediaInput::Commands::RenameInput::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.index = params.index.unsignedCharValue;
+    request.name = [self asCharSpan:params.name];
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)readAttributeInputListWithCompletionHandler:(void (^)(
+                                                        NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPMediaInputInputListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = MediaInput::Attributes::InputList::TypeInfo;
+            auto successFn = Callback<MediaInputInputListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeInputListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPMediaInputInputListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::Int48u::TypeInfo;
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = MediaInput::Attributes::InputList::TypeInfo;
+            auto successFn = Callback<MediaInputInputListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPMediaInputInputListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInt48uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeInputListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPMediaInputInputListListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::Int48u::TypeInfo;
+            using TypeInfo = MediaInput::Attributes::InputList::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<MediaInputInputListListAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -59688,88 +58999,58 @@ new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeInt56uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeCurrentInputWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::Int56u::TypeInfo;
-        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = MediaInput::Attributes::CurrentInput::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeInt56uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeInt56uWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeInt56uWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::Int56u::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeInt56uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentInputWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt64uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::Int56u::TypeInfo;
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = MediaInput::Attributes::CurrentInput::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInt56uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCurrentInputWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::Int56u::TypeInfo;
+            using TypeInfo = MediaInput::Attributes::CurrentInput::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -59779,361 +59060,250 @@ new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeInt64uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::Int64u::TypeInfo;
-        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPMediaInputGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = MediaInput::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<MediaInputGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)writeAttributeInt64uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeInt64uWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeInt64uWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::Int64u::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeInt64uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt64uAttributeCallbackSubscriptionBridge(
+    new CHIPMediaInputGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::Int64u::TypeInfo;
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = MediaInput::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<MediaInputGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPMediaInputGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInt64uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::Int64u::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPMediaInputGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = MediaInput::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<MediaInputGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeInt8sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt8sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::Int8s::TypeInfo;
-        auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)writeAttributeInt8sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeInt8sWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeInt8sWithValue:(NSNumber * _Nonnull)value
-                              params:(CHIPWriteParams * _Nullable)params
-                   completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::Int8s::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.charValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPMediaInputAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = MediaInput::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<MediaInputAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeInt8sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                        params:(CHIPSubscribeParams * _Nullable)params
-                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8sAttributeCallbackSubscriptionBridge(
+    new CHIPMediaInputAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::Int8s::TypeInfo;
-            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = MediaInput::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<MediaInputAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPMediaInputAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInt8sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                    endpoint:(NSNumber *)endpoint
-                                       queue:(dispatch_queue_t)queue
-                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::Int8s::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPMediaInputAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = MediaInput::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<MediaInputAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeInt16sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::Int16s::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)writeAttributeInt16sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeInt16sWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeInt16sWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::Int16s::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPMediaInputAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = MediaInput::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<MediaInputAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeInt16sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPMediaInputAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::Int16s::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = MediaInput::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<MediaInputAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPMediaInputAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInt16sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::Int16s::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPMediaInputAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = MediaInput::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<MediaInputAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeInt24sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::Int24s::TypeInfo;
-        auto successFn = Callback<Int32sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = MediaInput::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeInt24sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeInt24sWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeInt24sWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::Int24s::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.intValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeInt24sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::Int24s::TypeInfo;
-            auto successFn = Callback<Int32sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = MediaInput::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInt24sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::Int24s::TypeInfo;
+            using TypeInfo = MediaInput::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -60143,88 +59313,59 @@ new CHIPInt32sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeInt32sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::Int32s::TypeInfo;
-        auto successFn = Callback<Int32sAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = MediaInput::Attributes::ClusterRevision::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeInt32sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeInt32sWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeInt32sWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::Int32s::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.intValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeInt32sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::Int32s::TypeInfo;
-            auto successFn = Callback<Int32sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = MediaInput::Attributes::ClusterRevision::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInt32sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::Int32s::TypeInfo;
+            using TypeInfo = MediaInput::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -60234,361 +59375,287 @@ new CHIPInt32sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeInt40sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+@end
+
+@implementation CHIPLowPower
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPInt64sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::Int40s::TypeInfo;
-        auto successFn = Callback<Int64sAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    return &_cppCluster;
 }
 
-- (void)writeAttributeInt40sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)sleepWithCompletionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeInt40sWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self sleepWithParams:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeInt40sWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler
+- (void)sleepWithParams:(CHIPLowPowerClusterSleepParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    LowPower::Commands::Sleep::Type request;
     if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
 
-    new CHIPDefaultSuccessCallbackBridge(
+    new CHIPCommandSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
+        ^(id _Nullable value, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::Int40s::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.longLongValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeInt40sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64sAttributeCallbackSubscriptionBridge(
+    new CHIPLowPowerGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = LowPower::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<LowPowerGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPLowPowerGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::Int40s::TypeInfo;
-            auto successFn = Callback<Int64sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = LowPower::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<LowPowerGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPLowPowerGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInt40sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::Int40s::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int64sAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPLowPowerGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = LowPower::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<LowPowerGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeInt48sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt64sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::Int48s::TypeInfo;
-        auto successFn = Callback<Int64sAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)writeAttributeInt48sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeInt48sWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeInt48sWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::Int48s::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.longLongValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPLowPowerAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = LowPower::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<LowPowerAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeInt48sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt64sAttributeCallbackSubscriptionBridge(
+    new CHIPLowPowerAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::Int48s::TypeInfo;
-            auto successFn = Callback<Int64sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = LowPower::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<LowPowerAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPLowPowerAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInt48sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::Int48s::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int64sAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPLowPowerAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = LowPower::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<LowPowerAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeInt56sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt64sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::Int56s::TypeInfo;
-        auto successFn = Callback<Int64sAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)writeAttributeInt56sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeInt56sWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeInt56sWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::Int56s::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.longLongValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPLowPowerAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = LowPower::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<LowPowerAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeInt56sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt64sAttributeCallbackSubscriptionBridge(
+    new CHIPLowPowerAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::Int56s::TypeInfo;
-            auto successFn = Callback<Int64sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = LowPower::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<LowPowerAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPLowPowerAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInt56sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::Int56s::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int64sAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPLowPowerAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = LowPower::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<LowPowerAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeInt64sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::Int64s::TypeInfo;
-        auto successFn = Callback<Int64sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = LowPower::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeInt64sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeInt64sWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeInt64sWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::Int64s::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.longLongValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeInt64sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt64sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::Int64s::TypeInfo;
-            auto successFn = Callback<Int64sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = LowPower::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInt64sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::Int64s::TypeInfo;
+            using TypeInfo = LowPower::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int64sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -60598,88 +59665,59 @@ new CHIPInt64sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeEnum8WithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::Enum8::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = LowPower::Attributes::ClusterRevision::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeEnum8WithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeEnum8WithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeEnum8WithValue:(NSNumber * _Nonnull)value
-                              params:(CHIPWriteParams * _Nullable)params
-                   completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::Enum8::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeEnum8WithMinInterval:(NSNumber * _Nonnull)minInterval
-                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                        params:(CHIPSubscribeParams * _Nullable)params
-                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::Enum8::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = LowPower::Attributes::ClusterRevision::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeEnum8WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                    endpoint:(NSNumber *)endpoint
-                                       queue:(dispatch_queue_t)queue
-                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::Enum8::TypeInfo;
+            using TypeInfo = LowPower::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -60689,274 +59727,282 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeEnum16WithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::Enum16::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
+@end
 
-- (void)writeAttributeEnum16WithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+@implementation CHIPKeypadInput
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    [self writeAttributeEnum16WithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    return &_cppCluster;
 }
-- (void)writeAttributeEnum16WithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler
+
+- (void)sendKeyWithParams:(CHIPKeypadInputClusterSendKeyParams *)params
+        completionHandler:
+            (void (^)(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    KeypadInput::Commands::SendKey::Type request;
     if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
+    request.keyCode = static_cast<std::remove_reference_t<decltype(request.keyCode)>>(params.keyCode.unsignedCharValue);
 
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::Enum16::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPKeypadInputClusterSendKeyResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPKeypadInputClusterSendKeyResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeEnum16WithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPKeypadInputGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = KeypadInput::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<KeypadInputGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPKeypadInputGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::Enum16::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = KeypadInput::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<KeypadInputGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPKeypadInputGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeEnum16WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::Enum16::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeFloatSingleWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPFloatAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::FloatSingle::TypeInfo;
-        auto successFn = Callback<FloatAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPKeypadInputGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = KeypadInput::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<KeypadInputGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)writeAttributeFloatSingleWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeFloatSingleWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeFloatSingleWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::FloatSingle::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.floatValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPKeypadInputAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = KeypadInput::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<KeypadInputAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeFloatSingleWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPFloatAttributeCallbackSubscriptionBridge(
+    new CHIPKeypadInputAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::FloatSingle::TypeInfo;
-            auto successFn = Callback<FloatAttributeCallback>::FromCancelable(success);
+            using TypeInfo = KeypadInput::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<KeypadInputAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPFloatAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPKeypadInputAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFloatSingleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPFloatAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::FloatSingle::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<FloatAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPKeypadInputAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = KeypadInput::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<KeypadInputAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeFloatDoubleWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDoubleAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::FloatDouble::TypeInfo;
-        auto successFn = Callback<DoubleAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPKeypadInputAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = KeypadInput::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<KeypadInputAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)writeAttributeFloatDoubleWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeFloatDoubleWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeFloatDoubleWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
+    new CHIPKeypadInputAttributeListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::FloatDouble::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.doubleValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = KeypadInput::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<KeypadInputAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPKeypadInputAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPKeypadInputAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = KeypadInput::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<KeypadInputAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
         });
 }
 
-- (void)subscribeAttributeFloatDoubleWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDoubleAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = KeypadInput::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::FloatDouble::TypeInfo;
-            auto successFn = Callback<DoubleAttributeCallback>::FromCancelable(success);
+            using TypeInfo = KeypadInput::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPDoubleAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFloatDoubleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPDoubleAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::FloatDouble::TypeInfo;
+            using TypeInfo = KeypadInput::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<DoubleAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -60966,90 +60012,59 @@ new CHIPDoubleAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeOctetStringWithCompletionHandler:(void (^)(
-                                                          NSData * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPOctetStringAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::OctetString::TypeInfo;
-            auto successFn = Callback<OctetStringAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeOctetStringWithValue:(NSData * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeOctetStringWithValue:(NSData * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeOctetStringWithValue:(NSData * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::OctetString::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = [self asByteSpan:value];
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = KeypadInput::Attributes::ClusterRevision::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeOctetStringWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPOctetStringAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::OctetString::TypeInfo;
-            auto successFn = Callback<OctetStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = KeypadInput::Attributes::ClusterRevision::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOctetStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPOctetStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::OctetString::TypeInfo;
+            using TypeInfo = KeypadInput::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<OctetStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -61059,348 +60074,268 @@ new CHIPOctetStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelabl
     });
 }
 
-- (void)readAttributeListInt8uWithCompletionHandler:(void (^)(
-                                                        NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPTestClusterListInt8uListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::ListInt8u::TypeInfo;
-            auto successFn = Callback<TestClusterListInt8uListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
+@end
 
-- (void)writeAttributeListInt8uWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+@implementation CHIPContentLauncher
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    [self writeAttributeListInt8uWithValue:(NSArray * _Nonnull) value params:nil completionHandler:completionHandler];
+    return &_cppCluster;
 }
-- (void)writeAttributeListInt8uWithValue:(NSArray * _Nonnull)value
-                                  params:(CHIPWriteParams * _Nullable)params
-                       completionHandler:(StatusCompletion)completionHandler
+
+- (void)launchContentWithParams:(CHIPContentLauncherClusterLaunchContentParams *)params
+              completionHandler:(void (^)(CHIPContentLauncherClusterLaunchResponseParams * _Nullable data,
+                                    NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ContentLauncher::Commands::LaunchContent::Type request;
     if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::ListInt8u::TypeInfo;
-            TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
+    {
+        using ListType_1 = std::remove_reference_t<decltype(request.search.parameterList)>;
+        using ListMemberType_1 = ListMemberTypeGetter<ListType_1>::Type;
+        if (params.search.parameterList.count != 0) {
+            auto * listHolder_1 = new ListHolder<ListMemberType_1>(params.search.parameterList.count);
+            if (listHolder_1 == nullptr || listHolder_1->mList == nullptr) {
+                return;
+            }
+            listFreer.add(listHolder_1);
+            for (size_t i_1 = 0; i_1 < params.search.parameterList.count; ++i_1) {
+                if (![params.search.parameterList[i_1] isKindOfClass:[CHIPContentLauncherClusterParameter class]]) {
+                    // Wrong kind of value.
+                    return;
+                }
+                auto element_1 = (CHIPContentLauncherClusterParameter *) params.search.parameterList[i_1];
+                listHolder_1->mList[i_1].type = static_cast<std::remove_reference_t<decltype(listHolder_1->mList[i_1].type)>>(
+                    element_1.type.unsignedCharValue);
+                listHolder_1->mList[i_1].value = [self asCharSpan:element_1.value];
+                if (element_1.externalIDList != nil) {
+                    auto & definedValue_3 = listHolder_1->mList[i_1].externalIDList.Emplace();
+                    {
+                        using ListType_4 = std::remove_reference_t<decltype(definedValue_3)>;
+                        using ListMemberType_4 = ListMemberTypeGetter<ListType_4>::Type;
+                        if (element_1.externalIDList.count != 0) {
+                            auto * listHolder_4 = new ListHolder<ListMemberType_4>(element_1.externalIDList.count);
+                            if (listHolder_4 == nullptr || listHolder_4->mList == nullptr) {
+                                return;
+                            }
+                            listFreer.add(listHolder_4);
+                            for (size_t i_4 = 0; i_4 < element_1.externalIDList.count; ++i_4) {
+                                if (![element_1.externalIDList[i_4]
+                                        isKindOfClass:[CHIPContentLauncherClusterAdditionalInfo class]]) {
+                                    // Wrong kind of value.
+                                    return;
+                                }
+                                auto element_4 = (CHIPContentLauncherClusterAdditionalInfo *) element_1.externalIDList[i_4];
+                                listHolder_4->mList[i_4].name = [self asCharSpan:element_4.name];
+                                listHolder_4->mList[i_4].value = [self asCharSpan:element_4.value];
+                            }
+                            definedValue_3 = ListType_4(listHolder_4->mList, element_1.externalIDList.count);
+                        } else {
+                            definedValue_3 = ListType_4();
                         }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedCharValue;
                     }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
                 }
             }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
+            request.search.parameterList = ListType_1(listHolder_1->mList, params.search.parameterList.count);
+        } else {
+            request.search.parameterList = ListType_1();
+        }
+    }
+    request.autoPlay = params.autoPlay.boolValue;
+    if (params.data != nil) {
+        auto & definedValue_0 = request.data.Emplace();
+        definedValue_0 = [self asCharSpan:params.data];
+    }
 
-- (void)subscribeAttributeListInt8uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPTestClusterListInt8uListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = TestCluster::Attributes::ListInt8u::TypeInfo;
-            auto successFn = Callback<TestClusterListInt8uListAttributeCallback>::FromCancelable(success);
+    new CHIPContentLauncherClusterLaunchResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPContentLauncherClusterLaunchResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterListInt8uListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeListInt8uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPTestClusterListInt8uListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = TestCluster::Attributes::ListInt8u::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TestClusterListInt8uListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)readAttributeListOctetStringWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)launchURLWithParams:(CHIPContentLauncherClusterLaunchURLParams *)params
+          completionHandler:(void (^)(CHIPContentLauncherClusterLaunchResponseParams * _Nullable data,
+                                NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterListOctetStringListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::ListOctetString::TypeInfo;
-            auto successFn = Callback<TestClusterListOctetStringListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeListOctetStringWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeListOctetStringWithValue:(NSArray * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeListOctetStringWithValue:(NSArray * _Nonnull)value
-                                        params:(CHIPWriteParams * _Nullable)params
-                             completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ContentLauncher::Commands::LaunchURL::Type request;
     if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::ListOctetString::TypeInfo;
-            TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSData class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSData *) value[i_0];
-                        listHolder_0->mList[i_0] = [self asByteSpan:element_0];
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
+    request.contentURL = [self asCharSpan:params.contentURL];
+    if (params.displayString != nil) {
+        auto & definedValue_0 = request.displayString.Emplace();
+        definedValue_0 = [self asCharSpan:params.displayString];
+    }
+    if (params.brandingInformation != nil) {
+        auto & definedValue_0 = request.brandingInformation.Emplace();
+        definedValue_0.providerName = [self asCharSpan:params.brandingInformation.providerName];
+        if (params.brandingInformation.background != nil) {
+            auto & definedValue_2 = definedValue_0.background.Emplace();
+            if (params.brandingInformation.background.imageUrl != nil) {
+                auto & definedValue_4 = definedValue_2.imageUrl.Emplace();
+                definedValue_4 = [self asCharSpan:params.brandingInformation.background.imageUrl];
             }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeListOctetStringWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPTestClusterListOctetStringListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
+            if (params.brandingInformation.background.color != nil) {
+                auto & definedValue_4 = definedValue_2.color.Emplace();
+                definedValue_4 = [self asCharSpan:params.brandingInformation.background.color];
             }
-            using TypeInfo = TestCluster::Attributes::ListOctetString::TypeInfo;
-            auto successFn = Callback<TestClusterListOctetStringListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterListOctetStringListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeListOctetStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPTestClusterListOctetStringListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = TestCluster::Attributes::ListOctetString::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TestClusterListOctetStringListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+            if (params.brandingInformation.background.size != nil) {
+                auto & definedValue_4 = definedValue_2.size.Emplace();
+                definedValue_4.width = params.brandingInformation.background.size.width.doubleValue;
+                definedValue_4.height = params.brandingInformation.background.size.height.doubleValue;
+                definedValue_4.metric = static_cast<std::remove_reference_t<decltype(definedValue_4.metric)>>(
+                    params.brandingInformation.background.size.metric.unsignedCharValue);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
+        }
+        if (params.brandingInformation.logo != nil) {
+            auto & definedValue_2 = definedValue_0.logo.Emplace();
+            if (params.brandingInformation.logo.imageUrl != nil) {
+                auto & definedValue_4 = definedValue_2.imageUrl.Emplace();
+                definedValue_4 = [self asCharSpan:params.brandingInformation.logo.imageUrl];
+            }
+            if (params.brandingInformation.logo.color != nil) {
+                auto & definedValue_4 = definedValue_2.color.Emplace();
+                definedValue_4 = [self asCharSpan:params.brandingInformation.logo.color];
+            }
+            if (params.brandingInformation.logo.size != nil) {
+                auto & definedValue_4 = definedValue_2.size.Emplace();
+                definedValue_4.width = params.brandingInformation.logo.size.width.doubleValue;
+                definedValue_4.height = params.brandingInformation.logo.size.height.doubleValue;
+                definedValue_4.metric = static_cast<std::remove_reference_t<decltype(definedValue_4.metric)>>(
+                    params.brandingInformation.logo.size.metric.unsignedCharValue);
+            }
+        }
+        if (params.brandingInformation.progressBar != nil) {
+            auto & definedValue_2 = definedValue_0.progressBar.Emplace();
+            if (params.brandingInformation.progressBar.imageUrl != nil) {
+                auto & definedValue_4 = definedValue_2.imageUrl.Emplace();
+                definedValue_4 = [self asCharSpan:params.brandingInformation.progressBar.imageUrl];
+            }
+            if (params.brandingInformation.progressBar.color != nil) {
+                auto & definedValue_4 = definedValue_2.color.Emplace();
+                definedValue_4 = [self asCharSpan:params.brandingInformation.progressBar.color];
+            }
+            if (params.brandingInformation.progressBar.size != nil) {
+                auto & definedValue_4 = definedValue_2.size.Emplace();
+                definedValue_4.width = params.brandingInformation.progressBar.size.width.doubleValue;
+                definedValue_4.height = params.brandingInformation.progressBar.size.height.doubleValue;
+                definedValue_4.metric = static_cast<std::remove_reference_t<decltype(definedValue_4.metric)>>(
+                    params.brandingInformation.progressBar.size.metric.unsignedCharValue);
+            }
+        }
+        if (params.brandingInformation.splash != nil) {
+            auto & definedValue_2 = definedValue_0.splash.Emplace();
+            if (params.brandingInformation.splash.imageUrl != nil) {
+                auto & definedValue_4 = definedValue_2.imageUrl.Emplace();
+                definedValue_4 = [self asCharSpan:params.brandingInformation.splash.imageUrl];
+            }
+            if (params.brandingInformation.splash.color != nil) {
+                auto & definedValue_4 = definedValue_2.color.Emplace();
+                definedValue_4 = [self asCharSpan:params.brandingInformation.splash.color];
+            }
+            if (params.brandingInformation.splash.size != nil) {
+                auto & definedValue_4 = definedValue_2.size.Emplace();
+                definedValue_4.width = params.brandingInformation.splash.size.width.doubleValue;
+                definedValue_4.height = params.brandingInformation.splash.size.height.doubleValue;
+                definedValue_4.metric = static_cast<std::remove_reference_t<decltype(definedValue_4.metric)>>(
+                    params.brandingInformation.splash.size.metric.unsignedCharValue);
+            }
+        }
+        if (params.brandingInformation.waterMark != nil) {
+            auto & definedValue_2 = definedValue_0.waterMark.Emplace();
+            if (params.brandingInformation.waterMark.imageUrl != nil) {
+                auto & definedValue_4 = definedValue_2.imageUrl.Emplace();
+                definedValue_4 = [self asCharSpan:params.brandingInformation.waterMark.imageUrl];
+            }
+            if (params.brandingInformation.waterMark.color != nil) {
+                auto & definedValue_4 = definedValue_2.color.Emplace();
+                definedValue_4 = [self asCharSpan:params.brandingInformation.waterMark.color];
+            }
+            if (params.brandingInformation.waterMark.size != nil) {
+                auto & definedValue_4 = definedValue_2.size.Emplace();
+                definedValue_4.width = params.brandingInformation.waterMark.size.width.doubleValue;
+                definedValue_4.height = params.brandingInformation.waterMark.size.height.doubleValue;
+                definedValue_4.metric = static_cast<std::remove_reference_t<decltype(definedValue_4.metric)>>(
+                    params.brandingInformation.waterMark.size.metric.unsignedCharValue);
+            }
+        }
+    }
 
-- (void)readAttributeListStructOctetStringWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler
-{
-    new CHIPTestClusterListStructOctetStringListAttributeCallbackBridge(
+    new CHIPContentLauncherClusterLaunchResponseCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::ListStructOctetString::TypeInfo;
-            auto successFn = Callback<TestClusterListStructOctetStringListAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPContentLauncherClusterLaunchResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)writeAttributeListStructOctetStringWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeListStructOctetStringWithValue:(NSArray * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeListStructOctetStringWithValue:(NSArray * _Nonnull)value
-                                              params:(CHIPWriteParams * _Nullable)params
-                                   completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeAcceptHeaderWithCompletionHandler:(void (^)(
+                                                           NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::ListStructOctetString::TypeInfo;
-            TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPTestClusterClusterTestListStructOctet class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (CHIPTestClusterClusterTestListStructOctet *) value[i_0];
-                        listHolder_0->mList[i_0].member1 = element_0.member1.unsignedLongLongValue;
-                        listHolder_0->mList[i_0].member2 = [self asByteSpan:element_0.member2];
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPContentLauncherAcceptHeaderListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ContentLauncher::Attributes::AcceptHeader::TypeInfo;
+            auto successFn = Callback<ContentLauncherAcceptHeaderListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeListStructOctetStringWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcceptHeaderWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPTestClusterListStructOctetStringListAttributeCallbackSubscriptionBridge(
+    new CHIPContentLauncherAcceptHeaderListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::ListStructOctetString::TypeInfo;
-            auto successFn = Callback<TestClusterListStructOctetStringListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ContentLauncher::Attributes::AcceptHeader::TypeInfo;
+            auto successFn = Callback<ContentLauncherAcceptHeaderListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterListStructOctetStringListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPContentLauncherAcceptHeaderListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeListStructOctetStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcceptHeaderWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterListStructOctetStringListAttributeCallbackBridge(
+    new CHIPContentLauncherAcceptHeaderListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = TestCluster::Attributes::ListStructOctetString::TypeInfo;
+                using TypeInfo = ContentLauncher::Attributes::AcceptHeader::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TestClusterListStructOctetStringListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<ContentLauncherAcceptHeaderListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -61410,25 +60345,27 @@ new CHIPTestClusterListStructOctetStringListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeLongOctetStringWithCompletionHandler:(void (^)(
-                                                              NSData * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeSupportedStreamingProtocolsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))completionHandler
 {
-    new CHIPOctetStringAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::LongOctetString::TypeInfo;
-            auto successFn = Callback<OctetStringAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ContentLauncher::Attributes::SupportedStreamingProtocols::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)writeAttributeLongOctetStringWithValue:(NSData * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSupportedStreamingProtocolsWithValue:(NSNumber * _Nonnull)value
+                                         completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeLongOctetStringWithValue:(NSData * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self writeAttributeSupportedStreamingProtocolsWithValue:(NSNumber * _Nonnull) value
+                                                      params:nil
+                                           completionHandler:completionHandler];
 }
-- (void)writeAttributeLongOctetStringWithValue:(NSData * _Nonnull)value
-                                        params:(CHIPWriteParams * _Nullable)params
-                             completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSupportedStreamingProtocolsWithValue:(NSNumber * _Nonnull)value
+                                                    params:(CHIPWriteParams * _Nullable)params
+                                         completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -61444,9 +60381,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::LongOctetString::TypeInfo;
+            using TypeInfo = ContentLauncher::Attributes::SupportedStreamingProtocols::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = [self asByteSpan:value];
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -61454,48 +60391,49 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeLongOctetStringWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeSupportedStreamingProtocolsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                              params:(CHIPSubscribeParams * _Nullable)params
+                                             subscriptionEstablished:
+                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))reportHandler
 {
-    new CHIPOctetStringAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::LongOctetString::TypeInfo;
-            auto successFn = Callback<OctetStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ContentLauncher::Attributes::SupportedStreamingProtocols::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeLongOctetStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeSupportedStreamingProtocolsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                          endpoint:(NSNumber *)endpoint
+                                                             queue:(dispatch_queue_t)queue
+                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler
 {
-    new CHIPOctetStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::LongOctetString::TypeInfo;
+            using TypeInfo = ContentLauncher::Attributes::SupportedStreamingProtocols::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<OctetStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -61505,183 +60443,250 @@ new CHIPOctetStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelabl
     });
 }
 
-- (void)readAttributeCharStringWithCompletionHandler:(void (^)(
-                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::CharString::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)writeAttributeCharStringWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeCharStringWithValue:(NSString * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeCharStringWithValue:(NSString * _Nonnull)value
-                                   params:(CHIPWriteParams * _Nullable)params
-                        completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::CharString::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPContentLauncherGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ContentLauncher::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<ContentLauncherGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeCharStringWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPContentLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::CharString::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ContentLauncher::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<ContentLauncherGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPContentLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCharStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::CharString::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPContentLauncherGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = ContentLauncher::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<ContentLauncherGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeLongCharStringWithCompletionHandler:(void (^)(NSString * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::LongCharString::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPContentLauncherAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ContentLauncher::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<ContentLauncherAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)writeAttributeLongCharStringWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeLongCharStringWithValue:(NSString * _Nonnull) value params:nil completionHandler:completionHandler];
+    new CHIPContentLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ContentLauncher::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<ContentLauncherAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPContentLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
-- (void)writeAttributeLongCharStringWithValue:(NSString * _Nonnull)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler
+
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
+    new CHIPContentLauncherAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = ContentLauncher::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<ContentLauncherAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
 
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPContentLauncherAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ContentLauncher::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<ContentLauncherAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPContentLauncherAttributeListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::LongCharString::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ContentLauncher::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<ContentLauncherAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPContentLauncherAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPContentLauncherAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = ContentLauncher::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<ContentLauncherAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
         });
 }
 
-- (void)subscribeAttributeLongCharStringWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ContentLauncher::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::LongCharString::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ContentLauncher::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeLongCharStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::LongCharString::TypeInfo;
+            using TypeInfo = ContentLauncher::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -61691,88 +60696,59 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
-- (void)readAttributeEpochUsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::EpochUs::TypeInfo;
-        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ContentLauncher::Attributes::ClusterRevision::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeEpochUsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeEpochUsWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeEpochUsWithValue:(NSNumber * _Nonnull)value
-                                params:(CHIPWriteParams * _Nullable)params
-                     completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::EpochUs::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeEpochUsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt64uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::EpochUs::TypeInfo;
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ContentLauncher::Attributes::ClusterRevision::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeEpochUsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::EpochUs::TypeInfo;
+            using TypeInfo = ContentLauncher::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -61782,180 +60758,183 @@ new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeEpochSWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+@end
+
+@implementation CHIPAudioOutput
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::EpochS::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    return &_cppCluster;
 }
 
-- (void)writeAttributeEpochSWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)selectOutputWithParams:(CHIPAudioOutputClusterSelectOutputParams *)params
+             completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeEpochSWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    AudioOutput::Commands::SelectOutput::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.index = params.index.unsignedCharValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
-- (void)writeAttributeEpochSWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler
+
+- (void)renameOutputWithParams:(CHIPAudioOutputClusterRenameOutputParams *)params
+             completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    AudioOutput::Commands::RenameOutput::Type request;
     if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
+    request.index = params.index.unsignedCharValue;
+    request.name = [self asCharSpan:params.name];
 
-    new CHIPDefaultSuccessCallbackBridge(
+    new CHIPCommandSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
+        ^(id _Nullable value, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::EpochS::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeEpochSWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)readAttributeOutputListWithCompletionHandler:(void (^)(
+                                                         NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPAudioOutputOutputListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = AudioOutput::Attributes::OutputList::TypeInfo;
+            auto successFn = Callback<AudioOutputOutputListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeOutputListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPAudioOutputOutputListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::EpochS::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AudioOutput::Attributes::OutputList::TypeInfo;
+            auto successFn = Callback<AudioOutputOutputListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPAudioOutputOutputListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeEpochSWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOutputListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::EpochS::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPAudioOutputOutputListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = AudioOutput::Attributes::OutputList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<AudioOutputOutputListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeVendorIdWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeCurrentOutputWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPVendorIdAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::VendorId::TypeInfo;
-        auto successFn = Callback<VendorIdAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = AudioOutput::Attributes::CurrentOutput::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeVendorIdWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeVendorIdWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeVendorIdWithValue:(NSNumber * _Nonnull)value
-                                 params:(CHIPWriteParams * _Nullable)params
-                      completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::VendorId::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeVendorIdWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentOutputWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPVendorIdAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::VendorId::TypeInfo;
-            auto successFn = Callback<VendorIdAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AudioOutput::Attributes::CurrentOutput::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPVendorIdAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeVendorIdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCurrentOutputWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPVendorIdAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::VendorId::TypeInfo;
+            using TypeInfo = AudioOutput::Attributes::CurrentOutput::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<VendorIdAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -61965,290 +60944,62 @@ new CHIPVendorIdAttributeCallbackBridge(queue, completionHandler, ^(Cancelable *
     });
 }
 
-- (void)readAttributeListNullablesAndOptionalsStructWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackBridge(
+    new CHIPAudioOutputGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::ListNullablesAndOptionalsStruct::TypeInfo;
-            auto successFn = Callback<TestClusterListNullablesAndOptionalsStructListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AudioOutput::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<AudioOutputGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeListNullablesAndOptionalsStructWithValue:(NSArray * _Nonnull)value
-                                             completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeListNullablesAndOptionalsStructWithValue:(NSArray * _Nonnull) value
-                                                          params:nil
-                                               completionHandler:completionHandler];
+    new CHIPAudioOutputGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = AudioOutput::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<AudioOutputGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPAudioOutputGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
-- (void)writeAttributeListNullablesAndOptionalsStructWithValue:(NSArray * _Nonnull)value
-                                                        params:(CHIPWriteParams * _Nullable)params
-                                             completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
 
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::ListNullablesAndOptionalsStruct::TypeInfo;
-            TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPTestClusterClusterNullablesAndOptionalsStruct class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (CHIPTestClusterClusterNullablesAndOptionalsStruct *) value[i_0];
-                        if (element_0.nullableInt == nil) {
-                            listHolder_0->mList[i_0].nullableInt.SetNull();
-                        } else {
-                            auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableInt.SetNonNull();
-                            nonNullValue_2 = element_0.nullableInt.unsignedShortValue;
-                        }
-                        if (element_0.optionalInt != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].optionalInt.Emplace();
-                            definedValue_2 = element_0.optionalInt.unsignedShortValue;
-                        }
-                        if (element_0.nullableOptionalInt != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalInt.Emplace();
-                            if (element_0.nullableOptionalInt == nil) {
-                                definedValue_2.SetNull();
-                            } else {
-                                auto & nonNullValue_3 = definedValue_2.SetNonNull();
-                                nonNullValue_3 = element_0.nullableOptionalInt.unsignedShortValue;
-                            }
-                        }
-                        if (element_0.nullableString == nil) {
-                            listHolder_0->mList[i_0].nullableString.SetNull();
-                        } else {
-                            auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableString.SetNonNull();
-                            nonNullValue_2 = [self asCharSpan:element_0.nullableString];
-                        }
-                        if (element_0.optionalString != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].optionalString.Emplace();
-                            definedValue_2 = [self asCharSpan:element_0.optionalString];
-                        }
-                        if (element_0.nullableOptionalString != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalString.Emplace();
-                            if (element_0.nullableOptionalString == nil) {
-                                definedValue_2.SetNull();
-                            } else {
-                                auto & nonNullValue_3 = definedValue_2.SetNonNull();
-                                nonNullValue_3 = [self asCharSpan:element_0.nullableOptionalString];
-                            }
-                        }
-                        if (element_0.nullableStruct == nil) {
-                            listHolder_0->mList[i_0].nullableStruct.SetNull();
-                        } else {
-                            auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableStruct.SetNonNull();
-                            nonNullValue_2.a = element_0.nullableStruct.a.unsignedCharValue;
-                            nonNullValue_2.b = element_0.nullableStruct.b.boolValue;
-                            nonNullValue_2.c = static_cast<std::remove_reference_t<decltype(nonNullValue_2.c)>>(
-                                element_0.nullableStruct.c.unsignedCharValue);
-                            nonNullValue_2.d = [self asByteSpan:element_0.nullableStruct.d];
-                            nonNullValue_2.e = [self asCharSpan:element_0.nullableStruct.e];
-                            nonNullValue_2.f = static_cast<std::remove_reference_t<decltype(nonNullValue_2.f)>>(
-                                element_0.nullableStruct.f.unsignedCharValue);
-                            nonNullValue_2.g = element_0.nullableStruct.g.floatValue;
-                            nonNullValue_2.h = element_0.nullableStruct.h.doubleValue;
-                        }
-                        if (element_0.optionalStruct != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].optionalStruct.Emplace();
-                            definedValue_2.a = element_0.optionalStruct.a.unsignedCharValue;
-                            definedValue_2.b = element_0.optionalStruct.b.boolValue;
-                            definedValue_2.c = static_cast<std::remove_reference_t<decltype(definedValue_2.c)>>(
-                                element_0.optionalStruct.c.unsignedCharValue);
-                            definedValue_2.d = [self asByteSpan:element_0.optionalStruct.d];
-                            definedValue_2.e = [self asCharSpan:element_0.optionalStruct.e];
-                            definedValue_2.f = static_cast<std::remove_reference_t<decltype(definedValue_2.f)>>(
-                                element_0.optionalStruct.f.unsignedCharValue);
-                            definedValue_2.g = element_0.optionalStruct.g.floatValue;
-                            definedValue_2.h = element_0.optionalStruct.h.doubleValue;
-                        }
-                        if (element_0.nullableOptionalStruct != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalStruct.Emplace();
-                            if (element_0.nullableOptionalStruct == nil) {
-                                definedValue_2.SetNull();
-                            } else {
-                                auto & nonNullValue_3 = definedValue_2.SetNonNull();
-                                nonNullValue_3.a = element_0.nullableOptionalStruct.a.unsignedCharValue;
-                                nonNullValue_3.b = element_0.nullableOptionalStruct.b.boolValue;
-                                nonNullValue_3.c = static_cast<std::remove_reference_t<decltype(nonNullValue_3.c)>>(
-                                    element_0.nullableOptionalStruct.c.unsignedCharValue);
-                                nonNullValue_3.d = [self asByteSpan:element_0.nullableOptionalStruct.d];
-                                nonNullValue_3.e = [self asCharSpan:element_0.nullableOptionalStruct.e];
-                                nonNullValue_3.f = static_cast<std::remove_reference_t<decltype(nonNullValue_3.f)>>(
-                                    element_0.nullableOptionalStruct.f.unsignedCharValue);
-                                nonNullValue_3.g = element_0.nullableOptionalStruct.g.floatValue;
-                                nonNullValue_3.h = element_0.nullableOptionalStruct.h.doubleValue;
-                            }
-                        }
-                        if (element_0.nullableList == nil) {
-                            listHolder_0->mList[i_0].nullableList.SetNull();
-                        } else {
-                            auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableList.SetNonNull();
-                            {
-                                using ListType_3 = std::remove_reference_t<decltype(nonNullValue_2)>;
-                                using ListMemberType_3 = ListMemberTypeGetter<ListType_3>::Type;
-                                if (element_0.nullableList.count != 0) {
-                                    auto * listHolder_3 = new ListHolder<ListMemberType_3>(element_0.nullableList.count);
-                                    if (listHolder_3 == nullptr || listHolder_3->mList == nullptr) {
-                                        return CHIP_ERROR_INVALID_ARGUMENT;
-                                    }
-                                    listFreer.add(listHolder_3);
-                                    for (size_t i_3 = 0; i_3 < element_0.nullableList.count; ++i_3) {
-                                        if (![element_0.nullableList[i_3] isKindOfClass:[NSNumber class]]) {
-                                            // Wrong kind of value.
-                                            return CHIP_ERROR_INVALID_ARGUMENT;
-                                        }
-                                        auto element_3 = (NSNumber *) element_0.nullableList[i_3];
-                                        listHolder_3->mList[i_3]
-                                            = static_cast<std::remove_reference_t<decltype(listHolder_3->mList[i_3])>>(
-                                                element_3.unsignedCharValue);
-                                    }
-                                    nonNullValue_2 = ListType_3(listHolder_3->mList, element_0.nullableList.count);
-                                } else {
-                                    nonNullValue_2 = ListType_3();
-                                }
-                            }
-                        }
-                        if (element_0.optionalList != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].optionalList.Emplace();
-                            {
-                                using ListType_3 = std::remove_reference_t<decltype(definedValue_2)>;
-                                using ListMemberType_3 = ListMemberTypeGetter<ListType_3>::Type;
-                                if (element_0.optionalList.count != 0) {
-                                    auto * listHolder_3 = new ListHolder<ListMemberType_3>(element_0.optionalList.count);
-                                    if (listHolder_3 == nullptr || listHolder_3->mList == nullptr) {
-                                        return CHIP_ERROR_INVALID_ARGUMENT;
-                                    }
-                                    listFreer.add(listHolder_3);
-                                    for (size_t i_3 = 0; i_3 < element_0.optionalList.count; ++i_3) {
-                                        if (![element_0.optionalList[i_3] isKindOfClass:[NSNumber class]]) {
-                                            // Wrong kind of value.
-                                            return CHIP_ERROR_INVALID_ARGUMENT;
-                                        }
-                                        auto element_3 = (NSNumber *) element_0.optionalList[i_3];
-                                        listHolder_3->mList[i_3]
-                                            = static_cast<std::remove_reference_t<decltype(listHolder_3->mList[i_3])>>(
-                                                element_3.unsignedCharValue);
-                                    }
-                                    definedValue_2 = ListType_3(listHolder_3->mList, element_0.optionalList.count);
-                                } else {
-                                    definedValue_2 = ListType_3();
-                                }
-                            }
-                        }
-                        if (element_0.nullableOptionalList != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalList.Emplace();
-                            if (element_0.nullableOptionalList == nil) {
-                                definedValue_2.SetNull();
-                            } else {
-                                auto & nonNullValue_3 = definedValue_2.SetNonNull();
-                                {
-                                    using ListType_4 = std::remove_reference_t<decltype(nonNullValue_3)>;
-                                    using ListMemberType_4 = ListMemberTypeGetter<ListType_4>::Type;
-                                    if (element_0.nullableOptionalList.count != 0) {
-                                        auto * listHolder_4
-                                            = new ListHolder<ListMemberType_4>(element_0.nullableOptionalList.count);
-                                        if (listHolder_4 == nullptr || listHolder_4->mList == nullptr) {
-                                            return CHIP_ERROR_INVALID_ARGUMENT;
-                                        }
-                                        listFreer.add(listHolder_4);
-                                        for (size_t i_4 = 0; i_4 < element_0.nullableOptionalList.count; ++i_4) {
-                                            if (![element_0.nullableOptionalList[i_4] isKindOfClass:[NSNumber class]]) {
-                                                // Wrong kind of value.
-                                                return CHIP_ERROR_INVALID_ARGUMENT;
-                                            }
-                                            auto element_4 = (NSNumber *) element_0.nullableOptionalList[i_4];
-                                            listHolder_4->mList[i_4]
-                                                = static_cast<std::remove_reference_t<decltype(listHolder_4->mList[i_4])>>(
-                                                    element_4.unsignedCharValue);
-                                        }
-                                        nonNullValue_3 = ListType_4(listHolder_4->mList, element_0.nullableOptionalList.count);
-                                    } else {
-                                        nonNullValue_3 = ListType_4();
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeListNullablesAndOptionalsStructWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                                 subscriptionEstablished:
-                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                           reportHandler:(void (^)(NSArray * _Nullable value,
-                                                                             NSError * _Nullable error))reportHandler
-{
-    new CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = TestCluster::Attributes::ListNullablesAndOptionalsStruct::TypeInfo;
-            auto successFn = Callback<TestClusterListNullablesAndOptionalsStructListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeListNullablesAndOptionalsStructWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                              endpoint:(NSNumber *)endpoint
-                                                                 queue:(dispatch_queue_t)queue
-                                                     completionHandler:(void (^)(NSArray * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackBridge(
+    new CHIPAudioOutputGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = TestCluster::Attributes::ListNullablesAndOptionalsStruct::TypeInfo;
+                using TypeInfo = AudioOutput::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TestClusterListNullablesAndOptionalsStructListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<AudioOutputGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -62258,91 +61009,62 @@ new CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeEnumAttrWithCompletionHandler:(void (^)(
-                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterClusterSimpleEnumAttributeCallbackBridge(
+    new CHIPAudioOutputAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::EnumAttr::TypeInfo;
-            auto successFn = Callback<TestClusterClusterSimpleEnumAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AudioOutput::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<AudioOutputAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeEnumAttrWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeEnumAttrWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeEnumAttrWithValue:(NSNumber * _Nonnull)value
-                                 params:(CHIPWriteParams * _Nullable)params
-                      completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::EnumAttr::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeEnumAttrWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                           params:(CHIPSubscribeParams * _Nullable)params
-                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge(
+    new CHIPAudioOutputAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::EnumAttr::TypeInfo;
-            auto successFn = Callback<TestClusterClusterSimpleEnumAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AudioOutput::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<AudioOutputAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPAudioOutputAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeEnumAttrWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                       endpoint:(NSNumber *)endpoint
-                                          queue:(dispatch_queue_t)queue
-                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterClusterSimpleEnumAttributeCallbackBridge(
+    new CHIPAudioOutputAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = TestCluster::Attributes::EnumAttr::TypeInfo;
+                using TypeInfo = AudioOutput::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TestClusterClusterSimpleEnumAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<AudioOutputAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -62352,103 +61074,60 @@ new CHIPTestClusterClusterSimpleEnumAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeStructAttrWithCompletionHandler:(void (^)(CHIPTestClusterClusterSimpleStruct * _Nullable value,
-                                                         NSError * _Nullable error))completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterStructAttrStructAttributeCallbackBridge(
+    new CHIPAudioOutputAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::StructAttr::TypeInfo;
-            auto successFn = Callback<TestClusterStructAttrStructAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AudioOutput::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<AudioOutputAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeStructAttrWithValue:(CHIPTestClusterClusterSimpleStruct * _Nonnull)value
-                        completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeStructAttrWithValue:(CHIPTestClusterClusterSimpleStruct * _Nonnull) value
-                                     params:nil
-                          completionHandler:completionHandler];
-}
-- (void)writeAttributeStructAttrWithValue:(CHIPTestClusterClusterSimpleStruct * _Nonnull)value
-                                   params:(CHIPWriteParams * _Nullable)params
-                        completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::StructAttr::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue.a = value.a.unsignedCharValue;
-            cppValue.b = value.b.boolValue;
-            cppValue.c = static_cast<std::remove_reference_t<decltype(cppValue.c)>>(value.c.unsignedCharValue);
-            cppValue.d = [self asByteSpan:value.d];
-            cppValue.e = [self asCharSpan:value.e];
-            cppValue.f = static_cast<std::remove_reference_t<decltype(cppValue.f)>>(value.f.unsignedCharValue);
-            cppValue.g = value.g.floatValue;
-            cppValue.h = value.h.doubleValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeStructAttrWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(CHIPTestClusterClusterSimpleStruct * _Nullable value,
-                                                        NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPTestClusterStructAttrStructAttributeCallbackSubscriptionBridge(
+    new CHIPAudioOutputAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::StructAttr::TypeInfo;
-            auto successFn = Callback<TestClusterStructAttrStructAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AudioOutput::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<AudioOutputAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterStructAttrStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPAudioOutputAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeStructAttrWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(CHIPTestClusterClusterSimpleStruct * _Nullable value,
-                                                      NSError * _Nullable error))completionHandler
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterStructAttrStructAttributeCallbackBridge(
+    new CHIPAudioOutputAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = TestCluster::Attributes::StructAttr::TypeInfo;
+                using TypeInfo = AudioOutput::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TestClusterStructAttrStructAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<AudioOutputAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -62458,92 +61137,57 @@ new CHIPTestClusterStructAttrStructAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeRangeRestrictedInt8uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::RangeRestrictedInt8u::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = AudioOutput::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeRangeRestrictedInt8uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeRangeRestrictedInt8uWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeRangeRestrictedInt8uWithValue:(NSNumber * _Nonnull)value
-                                             params:(CHIPWriteParams * _Nullable)params
-                                  completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::RangeRestrictedInt8u::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeRangeRestrictedInt8uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::RangeRestrictedInt8u::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AudioOutput::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRangeRestrictedInt8uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::RangeRestrictedInt8u::TypeInfo;
+            using TypeInfo = AudioOutput::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -62553,92 +61197,59 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeRangeRestrictedInt8sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::RangeRestrictedInt8s::TypeInfo;
-        auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = AudioOutput::Attributes::ClusterRevision::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeRangeRestrictedInt8sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeRangeRestrictedInt8sWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeRangeRestrictedInt8sWithValue:(NSNumber * _Nonnull)value
-                                             params:(CHIPWriteParams * _Nullable)params
-                                  completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::RangeRestrictedInt8s::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.charValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeRangeRestrictedInt8sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPInt8sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::RangeRestrictedInt8s::TypeInfo;
-            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AudioOutput::Attributes::ClusterRevision::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRangeRestrictedInt8sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::RangeRestrictedInt8s::TypeInfo;
+            using TypeInfo = AudioOutput::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -62648,121 +61259,175 @@ new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeRangeRestrictedInt16uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler
+@end
+
+@implementation CHIPApplicationLauncher
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::RangeRestrictedInt16u::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    return &_cppCluster;
 }
 
-- (void)writeAttributeRangeRestrictedInt16uWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler
+- (void)launchAppWithParams:(CHIPApplicationLauncherClusterLaunchAppParams *)params
+          completionHandler:(void (^)(CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable data,
+                                NSError * _Nullable error))completionHandler
 {
-    [self writeAttributeRangeRestrictedInt16uWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ApplicationLauncher::Commands::LaunchApp::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.application.catalogVendorId = params.application.catalogVendorId.unsignedShortValue;
+    request.application.applicationId = [self asCharSpan:params.application.applicationId];
+    if (params.data != nil) {
+        auto & definedValue_0 = request.data.Emplace();
+        definedValue_0 = [self asByteSpan:params.data];
+    }
+
+    new CHIPApplicationLauncherClusterLauncherResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPApplicationLauncherClusterLauncherResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
-- (void)writeAttributeRangeRestrictedInt16uWithValue:(NSNumber * _Nonnull)value
-                                              params:(CHIPWriteParams * _Nullable)params
-                                   completionHandler:(StatusCompletion)completionHandler
+
+- (void)stopAppWithParams:(CHIPApplicationLauncherClusterStopAppParams *)params
+        completionHandler:(void (^)(CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable data,
+                              NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ApplicationLauncher::Commands::StopApp::Type request;
     if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
+    request.application.catalogVendorId = params.application.catalogVendorId.unsignedShortValue;
+    request.application.applicationId = [self asCharSpan:params.application.applicationId];
 
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::RangeRestrictedInt16u::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+    new CHIPApplicationLauncherClusterLauncherResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPApplicationLauncherClusterLauncherResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeRangeRestrictedInt16uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)hideAppWithParams:(CHIPApplicationLauncherClusterHideAppParams *)params
+        completionHandler:(void (^)(CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable data,
+                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ApplicationLauncher::Commands::HideApp::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.application.catalogVendorId = params.application.catalogVendorId.unsignedShortValue;
+    request.application.applicationId = [self asCharSpan:params.application.applicationId];
+
+    new CHIPApplicationLauncherClusterLauncherResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPApplicationLauncherClusterLauncherResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)readAttributeCatalogListWithCompletionHandler:(void (^)(
+                                                          NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPApplicationLauncherCatalogListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ApplicationLauncher::Attributes::CatalogList::TypeInfo;
+            auto successFn = Callback<ApplicationLauncherCatalogListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeCatalogListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPApplicationLauncherCatalogListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::RangeRestrictedInt16u::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ApplicationLauncher::Attributes::CatalogList::TypeInfo;
+            auto successFn = Callback<ApplicationLauncherCatalogListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPApplicationLauncherCatalogListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRangeRestrictedInt16uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCatalogListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::RangeRestrictedInt16u::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPApplicationLauncherCatalogListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = ApplicationLauncher::Attributes::CatalogList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<ApplicationLauncherCatalogListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeRangeRestrictedInt16sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler
+- (void)readAttributeCurrentAppWithCompletionHandler:(void (^)(CHIPApplicationLauncherClusterApplicationEP * _Nullable value,
+                                                         NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::RangeRestrictedInt16s::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPApplicationLauncherCurrentAppStructAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ApplicationLauncher::Attributes::CurrentApp::TypeInfo;
+            auto successFn = Callback<ApplicationLauncherCurrentAppStructAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)writeAttributeRangeRestrictedInt16sWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentAppWithValue:(CHIPApplicationLauncherClusterApplicationEP * _Nullable)value
+                        completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeRangeRestrictedInt16sWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self writeAttributeCurrentAppWithValue:(CHIPApplicationLauncherClusterApplicationEP * _Nullable) value
+                                     params:nil
+                          completionHandler:completionHandler];
 }
-- (void)writeAttributeRangeRestrictedInt16sWithValue:(NSNumber * _Nonnull)value
-                                              params:(CHIPWriteParams * _Nullable)params
-                                   completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentAppWithValue:(CHIPApplicationLauncherClusterApplicationEP * _Nullable)value
+                                   params:(CHIPWriteParams * _Nullable)params
+                        completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -62778,9 +61443,19 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::RangeRestrictedInt16s::TypeInfo;
+            using TypeInfo = ApplicationLauncher::Attributes::CurrentApp::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0.application.catalogVendorId = value.application.catalogVendorId.unsignedShortValue;
+                nonNullValue_0.application.applicationId = [self asCharSpan:value.application.applicationId];
+                if (value.endpoint != nil) {
+                    auto & definedValue_2 = nonNullValue_0.endpoint.Emplace();
+                    definedValue_2 = value.endpoint.unsignedShortValue;
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -62788,124 +61463,136 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeRangeRestrictedInt16sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentAppWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(CHIPApplicationLauncherClusterApplicationEP * _Nullable value,
+                                                        NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPApplicationLauncherCurrentAppStructAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::RangeRestrictedInt16s::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ApplicationLauncher::Attributes::CurrentApp::TypeInfo;
+            auto successFn = Callback<ApplicationLauncherCurrentAppStructAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPApplicationLauncherCurrentAppStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRangeRestrictedInt16sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCurrentAppWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(CHIPApplicationLauncherClusterApplicationEP * _Nullable value,
+                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::RangeRestrictedInt16s::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPApplicationLauncherCurrentAppStructAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = ApplicationLauncher::Attributes::CurrentApp::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<ApplicationLauncherCurrentAppStructAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeListLongOctetStringWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterListLongOctetStringListAttributeCallbackBridge(
+    new CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::ListLongOctetString::TypeInfo;
-            auto successFn = Callback<TestClusterListLongOctetStringListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ApplicationLauncher::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<ApplicationLauncherGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeListLongOctetStringWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeListLongOctetStringWithValue:(NSArray * _Nonnull) value params:nil completionHandler:completionHandler];
+    new CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ApplicationLauncher::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<ApplicationLauncherGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
-- (void)writeAttributeListLongOctetStringWithValue:(NSArray * _Nonnull)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
 
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::ListLongOctetString::TypeInfo;
-            TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSData class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSData *) value[i_0];
-                        listHolder_0->mList[i_0] = [self asByteSpan:element_0];
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPApplicationLauncherGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = ApplicationLauncher::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<ApplicationLauncherGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
                 }
+                return err;
             }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
+{
+    new CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ApplicationLauncher::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<ApplicationLauncherAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeListLongOctetStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(CHIPSubscribeParams * _Nullable)params
                                      subscriptionEstablished:
@@ -62913,42 +61600,42 @@ - (void)subscribeAttributeListLongOctetStringWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPTestClusterListLongOctetStringListAttributeCallbackSubscriptionBridge(
+    new CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::ListLongOctetString::TypeInfo;
-            auto successFn = Callback<TestClusterListLongOctetStringListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ApplicationLauncher::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<ApplicationLauncherAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterListLongOctetStringListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeListLongOctetStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                   endpoint:(NSNumber *)endpoint
                                                      queue:(dispatch_queue_t)queue
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterListLongOctetStringListAttributeCallbackBridge(
+    new CHIPApplicationLauncherAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = TestCluster::Attributes::ListLongOctetString::TypeInfo;
+                using TypeInfo = ApplicationLauncher::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TestClusterListLongOctetStringListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<ApplicationLauncherAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -62958,171 +61645,60 @@ new CHIPTestClusterListLongOctetStringListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeListFabricScopedWithParams:(CHIPReadParams * _Nullable)params
-                              completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterListFabricScopedListAttributeCallbackBridge(
+    new CHIPApplicationLauncherAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::ListFabricScoped::TypeInfo;
-            auto successFn = Callback<TestClusterListFabricScopedListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ApplicationLauncher::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<ApplicationLauncherAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue]);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeListFabricScopedWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeListFabricScopedWithValue:(NSArray * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeListFabricScopedWithValue:(NSArray * _Nonnull)value
-                                         params:(CHIPWriteParams * _Nullable)params
-                              completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::ListFabricScoped::TypeInfo;
-            TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPTestClusterClusterTestFabricScoped class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (CHIPTestClusterClusterTestFabricScoped *) value[i_0];
-                        listHolder_0->mList[i_0].fabricSensitiveInt8u = element_0.fabricSensitiveInt8u.unsignedCharValue;
-                        if (element_0.optionalFabricSensitiveInt8u != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].optionalFabricSensitiveInt8u.Emplace();
-                            definedValue_2 = element_0.optionalFabricSensitiveInt8u.unsignedCharValue;
-                        }
-                        if (element_0.nullableFabricSensitiveInt8u == nil) {
-                            listHolder_0->mList[i_0].nullableFabricSensitiveInt8u.SetNull();
-                        } else {
-                            auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableFabricSensitiveInt8u.SetNonNull();
-                            nonNullValue_2 = element_0.nullableFabricSensitiveInt8u.unsignedCharValue;
-                        }
-                        if (element_0.nullableOptionalFabricSensitiveInt8u != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalFabricSensitiveInt8u.Emplace();
-                            if (element_0.nullableOptionalFabricSensitiveInt8u == nil) {
-                                definedValue_2.SetNull();
-                            } else {
-                                auto & nonNullValue_3 = definedValue_2.SetNonNull();
-                                nonNullValue_3 = element_0.nullableOptionalFabricSensitiveInt8u.unsignedCharValue;
-                            }
-                        }
-                        listHolder_0->mList[i_0].fabricSensitiveCharString = [self asCharSpan:element_0.fabricSensitiveCharString];
-                        listHolder_0->mList[i_0].fabricSensitiveStruct.a = element_0.fabricSensitiveStruct.a.unsignedCharValue;
-                        listHolder_0->mList[i_0].fabricSensitiveStruct.b = element_0.fabricSensitiveStruct.b.boolValue;
-                        listHolder_0->mList[i_0].fabricSensitiveStruct.c
-                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveStruct.c)>>(
-                                element_0.fabricSensitiveStruct.c.unsignedCharValue);
-                        listHolder_0->mList[i_0].fabricSensitiveStruct.d = [self asByteSpan:element_0.fabricSensitiveStruct.d];
-                        listHolder_0->mList[i_0].fabricSensitiveStruct.e = [self asCharSpan:element_0.fabricSensitiveStruct.e];
-                        listHolder_0->mList[i_0].fabricSensitiveStruct.f
-                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveStruct.f)>>(
-                                element_0.fabricSensitiveStruct.f.unsignedCharValue);
-                        listHolder_0->mList[i_0].fabricSensitiveStruct.g = element_0.fabricSensitiveStruct.g.floatValue;
-                        listHolder_0->mList[i_0].fabricSensitiveStruct.h = element_0.fabricSensitiveStruct.h.doubleValue;
-                        {
-                            using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveInt8uList)>;
-                            using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
-                            if (element_0.fabricSensitiveInt8uList.count != 0) {
-                                auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.fabricSensitiveInt8uList.count);
-                                if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
-                                    return CHIP_ERROR_INVALID_ARGUMENT;
-                                }
-                                listFreer.add(listHolder_2);
-                                for (size_t i_2 = 0; i_2 < element_0.fabricSensitiveInt8uList.count; ++i_2) {
-                                    if (![element_0.fabricSensitiveInt8uList[i_2] isKindOfClass:[NSNumber class]]) {
-                                        // Wrong kind of value.
-                                        return CHIP_ERROR_INVALID_ARGUMENT;
-                                    }
-                                    auto element_2 = (NSNumber *) element_0.fabricSensitiveInt8uList[i_2];
-                                    listHolder_2->mList[i_2] = element_2.unsignedCharValue;
-                                }
-                                listHolder_0->mList[i_0].fabricSensitiveInt8uList
-                                    = ListType_2(listHolder_2->mList, element_0.fabricSensitiveInt8uList.count);
-                            } else {
-                                listHolder_0->mList[i_0].fabricSensitiveInt8uList = ListType_2();
-                            }
-                        }
-                        listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeListFabricScopedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPTestClusterListFabricScopedListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+    new CHIPApplicationLauncherAttributeListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::ListFabricScoped::TypeInfo;
-            auto successFn = Callback<TestClusterListFabricScopedListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ApplicationLauncher::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<ApplicationLauncherAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterListFabricScopedListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPApplicationLauncherAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeListFabricScopedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterListFabricScopedListAttributeCallbackBridge(
+    new CHIPApplicationLauncherAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = TestCluster::Attributes::ListFabricScoped::TypeInfo;
+                using TypeInfo = ApplicationLauncher::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TestClusterListFabricScopedListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<ApplicationLauncherAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -63132,91 +61708,57 @@ new CHIPTestClusterListFabricScopedListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeTimedWriteBooleanWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::TimedWriteBoolean::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ApplicationLauncher::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeTimedWriteBooleanWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeTimedWriteBooleanWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeTimedWriteBooleanWithValue:(NSNumber * _Nonnull)value
-                                          params:(CHIPWriteParams * _Nullable)params
-                               completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::TimedWriteBoolean::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeTimedWriteBooleanWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::TimedWriteBoolean::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ApplicationLauncher::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTimedWriteBooleanWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::TimedWriteBoolean::TypeInfo;
+            using TypeInfo = ApplicationLauncher::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -63226,92 +61768,59 @@ new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable *
     });
 }
 
-- (void)readAttributeGeneralErrorBooleanWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::GeneralErrorBoolean::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ApplicationLauncher::Attributes::ClusterRevision::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeGeneralErrorBooleanWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeGeneralErrorBooleanWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeGeneralErrorBooleanWithValue:(NSNumber * _Nonnull)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::GeneralErrorBoolean::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeGeneralErrorBooleanWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::GeneralErrorBoolean::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ApplicationLauncher::Attributes::ClusterRevision::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneralErrorBooleanWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::GeneralErrorBoolean::TypeInfo;
+            using TypeInfo = ApplicationLauncher::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -63321,92 +61830,66 @@ new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable *
     });
 }
 
-- (void)readAttributeClusterErrorBooleanWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
-{
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::ClusterErrorBoolean::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
+@end
 
-- (void)writeAttributeClusterErrorBooleanWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+@implementation CHIPApplicationBasic
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    [self writeAttributeClusterErrorBooleanWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    return &_cppCluster;
 }
-- (void)writeAttributeClusterErrorBooleanWithValue:(NSNumber * _Nonnull)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
 
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::ClusterErrorBoolean::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+- (void)readAttributeVendorNameWithCompletionHandler:(void (^)(
+                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ApplicationBasic::Attributes::VendorName::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeClusterErrorBooleanWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeVendorNameWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::ClusterErrorBoolean::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ApplicationBasic::Attributes::VendorName::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterErrorBooleanWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeVendorNameWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::ClusterErrorBoolean::TypeInfo;
+            using TypeInfo = ApplicationBasic::Attributes::VendorName::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -63416,90 +61899,57 @@ new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable *
     });
 }
 
-- (void)readAttributeUnsupportedWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeVendorIDWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::Unsupported::TypeInfo;
-        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ApplicationBasic::Attributes::VendorID::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeUnsupportedWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeUnsupportedWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeUnsupportedWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::Unsupported::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeUnsupportedWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeVendorIDWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::Unsupported::TypeInfo;
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ApplicationBasic::Attributes::VendorID::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeUnsupportedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeVendorIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::Unsupported::TypeInfo;
+            using TypeInfo = ApplicationBasic::Attributes::VendorID::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -63509,97 +61959,59 @@ new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable *
     });
 }
 
-- (void)readAttributeNullableBooleanWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeApplicationNameWithCompletionHandler:(void (^)(NSString * _Nullable value,
                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableBooleanAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableBoolean::TypeInfo;
-            auto successFn = Callback<NullableBooleanAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeNullableBooleanWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableBooleanWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableBooleanWithValue:(NSNumber * _Nullable)value
-                                        params:(CHIPWriteParams * _Nullable)params
-                             completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableBoolean::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.boolValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ApplicationBasic::Attributes::ApplicationName::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeNullableBooleanWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeApplicationNameWithMinInterval:(NSNumber * _Nonnull)minInterval
                                              maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(CHIPSubscribeParams * _Nullable)params
                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                            reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+                                               (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableBooleanAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableBoolean::TypeInfo;
-            auto successFn = Callback<NullableBooleanAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ApplicationBasic::Attributes::ApplicationName::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableBooleanWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeApplicationNameWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                               endpoint:(NSNumber *)endpoint
                                                  queue:(dispatch_queue_t)queue
                                      completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+                                         (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableBoolean::TypeInfo;
+            using TypeInfo = ApplicationBasic::Attributes::ApplicationName::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableBooleanAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -63609,98 +62021,123 @@ new CHIPNullableBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cance
     });
 }
 
-- (void)readAttributeNullableBitmap8WithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeProductIDWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterNullableBitmap8AttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableBitmap8::TypeInfo;
-            auto successFn = Callback<TestClusterNullableBitmap8AttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ApplicationBasic::Attributes::ProductID::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)writeAttributeNullableBitmap8WithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeProductIDWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeNullableBitmap8WithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ApplicationBasic::Attributes::ProductID::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
-- (void)writeAttributeNullableBitmap8WithValue:(NSNumber * _Nullable)value
-                                        params:(CHIPWriteParams * _Nullable)params
-                             completionHandler:(StatusCompletion)completionHandler
+
++ (void)readAttributeProductIDWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ApplicationBasic::Attributes::ProductID::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
 
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableBitmap8::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+- (void)readAttributeApplicationWithCompletionHandler:
+    (void (^)(CHIPApplicationBasicClusterApplicationBasicApplication * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPApplicationBasicApplicationStructAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ApplicationBasic::Attributes::Application::TypeInfo;
+            auto successFn = Callback<ApplicationBasicApplicationStructAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeNullableBitmap8WithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeApplicationWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:
+                                           (void (^)(CHIPApplicationBasicClusterApplicationBasicApplication * _Nullable value,
+                                               NSError * _Nullable error))reportHandler
 {
-    new CHIPTestClusterNullableBitmap8AttributeCallbackSubscriptionBridge(
+    new CHIPApplicationBasicApplicationStructAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableBitmap8::TypeInfo;
-            auto successFn = Callback<TestClusterNullableBitmap8AttributeCallback>::FromCancelable(success);
+            using TypeInfo = ApplicationBasic::Attributes::Application::TypeInfo;
+            auto successFn = Callback<ApplicationBasicApplicationStructAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterNullableBitmap8AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPApplicationBasicApplicationStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableBitmap8WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeApplicationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(CHIPApplicationBasicClusterApplicationBasicApplication * _Nullable value,
+                                         NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterNullableBitmap8AttributeCallbackBridge(
+    new CHIPApplicationBasicApplicationStructAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = TestCluster::Attributes::NullableBitmap8::TypeInfo;
+                using TypeInfo = ApplicationBasic::Attributes::Application::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TestClusterNullableBitmap8AttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<ApplicationBasicApplicationStructAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -63710,98 +62147,58 @@ new CHIPTestClusterNullableBitmap8AttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeNullableBitmap16WithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterNullableBitmap16AttributeCallbackBridge(
+    new CHIPApplicationBasicClusterApplicationStatusEnumAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableBitmap16::TypeInfo;
-            auto successFn = Callback<TestClusterNullableBitmap16AttributeCallback>::FromCancelable(success);
+            using TypeInfo = ApplicationBasic::Attributes::Status::TypeInfo;
+            auto successFn = Callback<ApplicationBasicClusterApplicationStatusEnumAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeNullableBitmap16WithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableBitmap16WithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableBitmap16WithValue:(NSNumber * _Nullable)value
-                                         params:(CHIPWriteParams * _Nullable)params
-                              completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableBitmap16::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedShortValue);
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeNullableBitmap16WithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPTestClusterNullableBitmap16AttributeCallbackSubscriptionBridge(
+    new CHIPApplicationBasicClusterApplicationStatusEnumAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableBitmap16::TypeInfo;
-            auto successFn = Callback<TestClusterNullableBitmap16AttributeCallback>::FromCancelable(success);
+            using TypeInfo = ApplicationBasic::Attributes::Status::TypeInfo;
+            auto successFn = Callback<ApplicationBasicClusterApplicationStatusEnumAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterNullableBitmap16AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPApplicationBasicClusterApplicationStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableBitmap16WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterNullableBitmap16AttributeCallbackBridge(
+    new CHIPApplicationBasicClusterApplicationStatusEnumAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = TestCluster::Attributes::NullableBitmap16::TypeInfo;
+                using TypeInfo = ApplicationBasic::Attributes::Status::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TestClusterNullableBitmap16AttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<ApplicationBasicClusterApplicationStatusEnumAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -63811,98 +62208,123 @@ new CHIPTestClusterNullableBitmap16AttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeNullableBitmap32WithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeApplicationVersionWithCompletionHandler:(void (^)(NSString * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterNullableBitmap32AttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableBitmap32::TypeInfo;
-            auto successFn = Callback<TestClusterNullableBitmap32AttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ApplicationBasic::Attributes::ApplicationVersion::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)writeAttributeNullableBitmap32WithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeApplicationVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeNullableBitmap32WithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ApplicationBasic::Attributes::ApplicationVersion::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
-- (void)writeAttributeNullableBitmap32WithValue:(NSNumber * _Nullable)value
-                                         params:(CHIPWriteParams * _Nullable)params
-                              completionHandler:(StatusCompletion)completionHandler
+
++ (void)readAttributeApplicationVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ApplicationBasic::Attributes::ApplicationVersion::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
 
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableBitmap32::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedIntValue);
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+- (void)readAttributeAllowedVendorListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
+{
+    new CHIPApplicationBasicAllowedVendorListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ApplicationBasic::Attributes::AllowedVendorList::TypeInfo;
+            auto successFn = Callback<ApplicationBasicAllowedVendorListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeNullableBitmap32WithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAllowedVendorListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPTestClusterNullableBitmap32AttributeCallbackSubscriptionBridge(
+    new CHIPApplicationBasicAllowedVendorListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableBitmap32::TypeInfo;
-            auto successFn = Callback<TestClusterNullableBitmap32AttributeCallback>::FromCancelable(success);
+            using TypeInfo = ApplicationBasic::Attributes::AllowedVendorList::TypeInfo;
+            auto successFn = Callback<ApplicationBasicAllowedVendorListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterNullableBitmap32AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPApplicationBasicAllowedVendorListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableBitmap32WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAllowedVendorListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterNullableBitmap32AttributeCallbackBridge(
+    new CHIPApplicationBasicAllowedVendorListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = TestCluster::Attributes::NullableBitmap32::TypeInfo;
+                using TypeInfo = ApplicationBasic::Attributes::AllowedVendorList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TestClusterNullableBitmap32AttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<ApplicationBasicAllowedVendorListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -63912,98 +62334,62 @@ new CHIPTestClusterNullableBitmap32AttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeNullableBitmap64WithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterNullableBitmap64AttributeCallbackBridge(
+    new CHIPApplicationBasicGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableBitmap64::TypeInfo;
-            auto successFn = Callback<TestClusterNullableBitmap64AttributeCallback>::FromCancelable(success);
+            using TypeInfo = ApplicationBasic::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<ApplicationBasicGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeNullableBitmap64WithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableBitmap64WithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableBitmap64WithValue:(NSNumber * _Nullable)value
-                                         params:(CHIPWriteParams * _Nullable)params
-                              completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableBitmap64::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedLongLongValue);
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeNullableBitmap64WithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPTestClusterNullableBitmap64AttributeCallbackSubscriptionBridge(
+    new CHIPApplicationBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableBitmap64::TypeInfo;
-            auto successFn = Callback<TestClusterNullableBitmap64AttributeCallback>::FromCancelable(success);
+            using TypeInfo = ApplicationBasic::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<ApplicationBasicGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterNullableBitmap64AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPApplicationBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableBitmap64WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterNullableBitmap64AttributeCallbackBridge(
+    new CHIPApplicationBasicGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = TestCluster::Attributes::NullableBitmap64::TypeInfo;
+                using TypeInfo = ApplicationBasic::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TestClusterNullableBitmap64AttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<ApplicationBasicGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -64013,297 +62399,185 @@ new CHIPTestClusterNullableBitmap64AttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeNullableInt8uWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
+    new CHIPApplicationBasicAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableInt8u::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ApplicationBasic::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<ApplicationBasicAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeNullableInt8uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableInt8uWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableInt8uWithValue:(NSNumber * _Nullable)value
-                                      params:(CHIPWriteParams * _Nullable)params
-                           completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableInt8u::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeNullableInt8uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPApplicationBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableInt8u::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ApplicationBasic::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<ApplicationBasicAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPApplicationBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableInt8uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableInt8u::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPApplicationBasicAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = ApplicationBasic::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<ApplicationBasicAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeNullableInt16uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(
+    new CHIPApplicationBasicAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableInt16u::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ApplicationBasic::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<ApplicationBasicAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeNullableInt16uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableInt16uWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableInt16uWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableInt16u::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeNullableInt16uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPApplicationBasicAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableInt16u::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ApplicationBasic::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<ApplicationBasicAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPApplicationBasicAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableInt16uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableInt16u::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPApplicationBasicAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = ApplicationBasic::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<ApplicationBasicAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
-
-- (void)readAttributeNullableInt24uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt32uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableInt24u::TypeInfo;
-            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return CHIP_ERROR_NOT_FOUND;
         });
 }
 
-- (void)writeAttributeNullableInt24uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableInt24uWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableInt24uWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableInt24u::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedIntValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ApplicationBasic::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeNullableInt24uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableInt24u::TypeInfo;
-            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ApplicationBasic::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableInt24uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableInt24u::TypeInfo;
+            using TypeInfo = ApplicationBasic::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -64313,97 +62587,59 @@ new CHIPNullableInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeNullableInt32uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt32uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableInt32u::TypeInfo;
-            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeNullableInt32uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableInt32uWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableInt32uWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableInt32u::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedIntValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ApplicationBasic::Attributes::ClusterRevision::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeNullableInt32uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableInt32u::TypeInfo;
-            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ApplicationBasic::Attributes::ClusterRevision::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableInt32uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableInt32u::TypeInfo;
+            using TypeInfo = ApplicationBasic::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -64413,297 +62649,346 @@ new CHIPNullableInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeNullableInt40uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+@end
+
+@implementation CHIPAccountLogin
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPNullableInt64uAttributeCallbackBridge(
+    return &_cppCluster;
+}
+
+- (void)getSetupPINWithParams:(CHIPAccountLoginClusterGetSetupPINParams *)params
+            completionHandler:(void (^)(CHIPAccountLoginClusterGetSetupPINResponseParams * _Nullable data,
+                                  NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    AccountLogin::Commands::GetSetupPIN::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    if (!timedInvokeTimeoutMs.HasValue()) {
+        timedInvokeTimeoutMs.SetValue(10000);
+    }
+    request.tempAccountIdentifier = [self asCharSpan:params.tempAccountIdentifier];
+
+    new CHIPAccountLoginClusterGetSetupPINResponseCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableInt40u::TypeInfo;
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPAccountLoginClusterGetSetupPINResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)writeAttributeNullableInt40uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)loginWithParams:(CHIPAccountLoginClusterLoginParams *)params completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeNullableInt40uWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    AccountLogin::Commands::Login::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    if (!timedInvokeTimeoutMs.HasValue()) {
+        timedInvokeTimeoutMs.SetValue(10000);
+    }
+    request.tempAccountIdentifier = [self asCharSpan:params.tempAccountIdentifier];
+    request.setupPIN = [self asCharSpan:params.setupPIN];
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
-- (void)writeAttributeNullableInt40uWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler
+
+- (void)logoutWithCompletionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    [self logoutWithParams:nil completionHandler:completionHandler];
+}
+- (void)logoutWithParams:(CHIPAccountLoginClusterLogoutParams * _Nullable)params
+       completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    AccountLogin::Commands::Logout::Type request;
     if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
+    if (!timedInvokeTimeoutMs.HasValue()) {
+        timedInvokeTimeoutMs.SetValue(10000);
+    }
 
-    new CHIPDefaultSuccessCallbackBridge(
+    new CHIPCommandSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
+        ^(id _Nullable value, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableInt40u::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedLongLongValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeNullableInt40uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
+    new CHIPAccountLoginGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = AccountLogin::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<AccountLoginGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPAccountLoginGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableInt40u::TypeInfo;
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AccountLogin::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<AccountLoginGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPAccountLoginGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableInt40uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableInt40u::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPAccountLoginGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = AccountLogin::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<AccountLoginGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeNullableInt48uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt64uAttributeCallbackBridge(
+    new CHIPAccountLoginAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableInt48u::TypeInfo;
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AccountLogin::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<AccountLoginAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeNullableInt48uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeNullableInt48uWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableInt48uWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableInt48u::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedLongLongValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeNullableInt48uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
+    new CHIPAccountLoginAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableInt48u::TypeInfo;
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AccountLogin::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<AccountLoginAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPAccountLoginAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableInt48uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableInt48u::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPAccountLoginAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = AccountLogin::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<AccountLoginAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeNullableInt56uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt64uAttributeCallbackBridge(
+    new CHIPAccountLoginAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableInt56u::TypeInfo;
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AccountLogin::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<AccountLoginAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeNullableInt56uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableInt56uWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableInt56uWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
+    new CHIPAccountLoginAttributeListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableInt56u::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedLongLongValue;
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            using TypeInfo = AccountLogin::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<AccountLoginAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPAccountLoginAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPAccountLoginAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = AccountLogin::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<AccountLoginAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
         });
 }
 
-- (void)subscribeAttributeNullableInt56uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = AccountLogin::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableInt56u::TypeInfo;
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AccountLogin::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableInt56uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableInt56u::TypeInfo;
+            using TypeInfo = AccountLogin::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -64713,97 +62998,59 @@ new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeNullableInt64uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt64uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableInt64u::TypeInfo;
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeNullableInt64uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableInt64uWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableInt64uWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableInt64u::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedLongLongValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = AccountLogin::Attributes::ClusterRevision::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeNullableInt64uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableInt64u::TypeInfo;
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = AccountLogin::Attributes::ClusterRevision::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableInt64uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableInt64u::TypeInfo;
+            using TypeInfo = AccountLogin::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -64813,97 +63060,125 @@ new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeNullableInt8sWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+@end
+
+@implementation CHIPElectricalMeasurement
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPNullableInt8sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableInt8s::TypeInfo;
-            auto successFn = Callback<NullableInt8sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    return &_cppCluster;
 }
 
-- (void)writeAttributeNullableInt8sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)getProfileInfoCommandWithCompletionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeNullableInt8sWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+    [self getProfileInfoCommandWithParams:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeNullableInt8sWithValue:(NSNumber * _Nullable)value
-                                      params:(CHIPWriteParams * _Nullable)params
-                           completionHandler:(StatusCompletion)completionHandler
+- (void)getProfileInfoCommandWithParams:(CHIPElectricalMeasurementClusterGetProfileInfoCommandParams * _Nullable)params
+                      completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ElectricalMeasurement::Commands::GetProfileInfoCommand::Type request;
     if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
     }
 
-    new CHIPDefaultSuccessCallbackBridge(
+    new CHIPCommandSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
+        ^(id _Nullable value, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableInt8s::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.charValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeNullableInt8sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)getMeasurementProfileCommandWithParams:(CHIPElectricalMeasurementClusterGetMeasurementProfileCommandParams *)params
+                             completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPNullableInt8sAttributeCallbackSubscriptionBridge(
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    ElectricalMeasurement::Commands::GetMeasurementProfileCommand::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.attributeId = params.attributeId.unsignedShortValue;
+    request.startTime = params.startTime.unsignedIntValue;
+    request.numberOfIntervals = params.numberOfIntervals.unsignedCharValue;
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)readAttributeMeasurementTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
+{
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::MeasurementType::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeMeasurementTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableInt8s::TypeInfo;
-            auto successFn = Callback<NullableInt8sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::MeasurementType::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableInt8sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMeasurementTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableInt8s::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::MeasurementType::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -64913,97 +63188,57 @@ new CHIPNullableInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeNullableInt16sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt16sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableInt16s::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeNullableInt16sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableInt16sWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableInt16sWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeDcVoltageWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableInt16s::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.shortValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::DcVoltage::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeNullableInt16sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeDcVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableInt16s::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltage::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableInt16sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
++ (void)readAttributeDcVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableInt16s::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltage::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -65013,97 +63248,58 @@ new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeNullableInt24sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt32sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableInt24s::TypeInfo;
-            auto successFn = Callback<NullableInt32sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeNullableInt24sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableInt24sWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableInt24sWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeDcVoltageMinWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableInt24s::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.intValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageMin::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeNullableInt24sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeDcVoltageMinWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt32sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableInt24s::TypeInfo;
-            auto successFn = Callback<NullableInt32sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageMin::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableInt24sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeDcVoltageMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt32sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableInt24s::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageMin::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt32sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -65113,97 +63309,58 @@ new CHIPNullableInt32sAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeNullableInt32sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt32sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableInt32s::TypeInfo;
-            auto successFn = Callback<NullableInt32sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeNullableInt32sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableInt32sWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableInt32sWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeDcVoltageMaxWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableInt32s::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.intValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageMax::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeNullableInt32sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeDcVoltageMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt32sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableInt32s::TypeInfo;
-            auto successFn = Callback<NullableInt32sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageMax::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableInt32sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeDcVoltageMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt32sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableInt32s::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageMax::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt32sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -65213,97 +63370,57 @@ new CHIPNullableInt32sAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeNullableInt40sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt64sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableInt40s::TypeInfo;
-            auto successFn = Callback<NullableInt64sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeNullableInt40sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableInt40sWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableInt40sWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeDcCurrentWithCompletionHandler:(void (^)(
+                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableInt40s::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.longLongValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::DcCurrent::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeNullableInt40sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeDcCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt64sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableInt40s::TypeInfo;
-            auto successFn = Callback<NullableInt64sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrent::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableInt40sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeDcCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt64sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableInt40s::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrent::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt64sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -65313,97 +63430,58 @@ new CHIPNullableInt64sAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeNullableInt48sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt64sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableInt48s::TypeInfo;
-            auto successFn = Callback<NullableInt64sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeNullableInt48sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableInt48sWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableInt48sWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeDcCurrentMinWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableInt48s::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.longLongValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentMin::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeNullableInt48sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeDcCurrentMinWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt64sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableInt48s::TypeInfo;
-            auto successFn = Callback<NullableInt64sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentMin::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableInt48sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeDcCurrentMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt64sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableInt48s::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentMin::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt64sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -65413,97 +63491,117 @@ new CHIPNullableInt64sAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeNullableInt56sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeDcCurrentMaxWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt64sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableInt56s::TypeInfo;
-            auto successFn = Callback<NullableInt64sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentMax::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)writeAttributeNullableInt56sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeDcCurrentMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeNullableInt56sWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentMax::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
-- (void)writeAttributeNullableInt56sWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler
+
++ (void)readAttributeDcCurrentMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentMax::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
 
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableInt56s::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.longLongValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+- (void)readAttributeDcPowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::DcPower::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeNullableInt56sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeDcPowerWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt64sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableInt56s::TypeInfo;
-            auto successFn = Callback<NullableInt64sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::DcPower::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableInt56sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeDcPowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt64sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableInt56s::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcPower::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt64sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -65513,97 +63611,57 @@ new CHIPNullableInt64sAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeNullableInt64sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeDcPowerMinWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt64sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableInt64s::TypeInfo;
-            auto successFn = Callback<NullableInt64sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeNullableInt64sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableInt64sWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableInt64sWithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableInt64s::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.longLongValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::DcPowerMin::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeNullableInt64sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeDcPowerMinWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt64sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableInt64s::TypeInfo;
-            auto successFn = Callback<NullableInt64sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::DcPowerMin::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableInt64sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeDcPowerMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt64sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableInt64s::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcPowerMin::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt64sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -65613,97 +63671,57 @@ new CHIPNullableInt64sAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeNullableEnum8WithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt8uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableEnum8::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeNullableEnum8WithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableEnum8WithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableEnum8WithValue:(NSNumber * _Nullable)value
-                                      params:(CHIPWriteParams * _Nullable)params
-                           completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeDcPowerMaxWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableEnum8::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::DcPowerMax::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeNullableEnum8WithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeDcPowerMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableEnum8::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::DcPowerMax::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableEnum8WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeDcPowerMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableEnum8::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcPowerMax::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -65713,97 +63731,60 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeNullableEnum16WithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt16uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableEnum16::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeNullableEnum16WithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableEnum16WithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableEnum16WithValue:(NSNumber * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeDcVoltageMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableEnum16::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageMultiplier::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeNullableEnum16WithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeDcVoltageMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableEnum16::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageMultiplier::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableEnum16WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeDcVoltageMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableEnum16::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageMultiplier::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -65813,98 +63794,59 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeNullableFloatSingleWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableFloatAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableFloatSingle::TypeInfo;
-            auto successFn = Callback<NullableFloatAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeNullableFloatSingleWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableFloatSingleWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableFloatSingleWithValue:(NSNumber * _Nullable)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeDcVoltageDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableFloatSingle::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.floatValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageDivisor::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeNullableFloatSingleWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeDcVoltageDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableFloatAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableFloatSingle::TypeInfo;
-            auto successFn = Callback<NullableFloatAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageDivisor::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableFloatAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableFloatSingleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeDcVoltageDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableFloatAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableFloatSingle::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageDivisor::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableFloatAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -65914,56 +63856,18 @@ new CHIPNullableFloatAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeNullableFloatDoubleWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeDcCurrentMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableDoubleAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableFloatDouble::TypeInfo;
-            auto successFn = Callback<NullableDoubleAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeNullableFloatDoubleWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableFloatDoubleWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableFloatDoubleWithValue:(NSNumber * _Nullable)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableFloatDouble::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.doubleValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentMultiplier::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeNullableFloatDoubleWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeDcCurrentMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(CHIPSubscribeParams * _Nullable)params
                                      subscriptionEstablished:
@@ -65971,41 +63875,41 @@ - (void)subscribeAttributeNullableFloatDoubleWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableDoubleAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableFloatDouble::TypeInfo;
-            auto successFn = Callback<NullableDoubleAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentMultiplier::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableDoubleAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableFloatDoubleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeDcCurrentMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                   endpoint:(NSNumber *)endpoint
                                                      queue:(dispatch_queue_t)queue
                                          completionHandler:
                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableDoubleAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableFloatDouble::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentMultiplier::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableDoubleAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -66015,98 +63919,59 @@ new CHIPNullableDoubleAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeNullableOctetStringWithCompletionHandler:(void (^)(NSData * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableOctetStringAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableOctetString::TypeInfo;
-            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeNullableOctetStringWithValue:(NSData * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableOctetStringWithValue:(NSData * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableOctetStringWithValue:(NSData * _Nullable)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeDcCurrentDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableOctetString::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = [self asByteSpan:value];
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentDivisor::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeNullableOctetStringWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeDcCurrentDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableOctetStringAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableOctetString::TypeInfo;
-            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentDivisor::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableOctetStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeDcCurrentDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableOctetStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableOctetString::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentDivisor::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -66116,97 +63981,59 @@ new CHIPNullableOctetStringAttributeCallbackBridge(queue, completionHandler, ^(C
     });
 }
 
-- (void)readAttributeNullableCharStringWithCompletionHandler:(void (^)(NSString * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler
+- (void)readAttributeDcPowerMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableCharStringAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableCharString::TypeInfo;
-            auto successFn = Callback<NullableCharStringAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeNullableCharStringWithValue:(NSString * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableCharStringWithValue:(NSString * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableCharStringWithValue:(NSString * _Nullable)value
-                                           params:(CHIPWriteParams * _Nullable)params
-                                completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableCharString::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = [self asCharSpan:value];
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::DcPowerMultiplier::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeNullableCharStringWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeDcPowerMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableCharString::TypeInfo;
-            auto successFn = Callback<NullableCharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::DcPowerMultiplier::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableCharStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeDcPowerMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableCharString::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcPowerMultiplier::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableCharStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -66216,313 +64043,120 @@ new CHIPNullableCharStringAttributeCallbackBridge(queue, completionHandler, ^(Ca
     });
 }
 
-- (void)readAttributeNullableEnumAttrWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableEnumAttr::TypeInfo;
-            auto successFn = Callback<NullableTestClusterClusterSimpleEnumAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeNullableEnumAttrWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableEnumAttrWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableEnumAttrWithValue:(NSNumber * _Nullable)value
-                                         params:(CHIPWriteParams * _Nullable)params
-                              completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableEnumAttr::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeNullableEnumAttrWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = TestCluster::Attributes::NullableEnumAttr::TypeInfo;
-            auto successFn = Callback<NullableTestClusterClusterSimpleEnumAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeNullableEnumAttrWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = TestCluster::Attributes::NullableEnumAttr::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<NullableTestClusterClusterSimpleEnumAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeNullableStructWithCompletionHandler:(void (^)(CHIPTestClusterClusterSimpleStruct * _Nullable value,
+- (void)readAttributeDcPowerDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterNullableStructStructAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableStruct::TypeInfo;
-            auto successFn = Callback<TestClusterNullableStructStructAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeNullableStructWithValue:(CHIPTestClusterClusterSimpleStruct * _Nullable)value
-                            completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableStructWithValue:(CHIPTestClusterClusterSimpleStruct * _Nullable) value
-                                         params:nil
-                              completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableStructWithValue:(CHIPTestClusterClusterSimpleStruct * _Nullable)value
-                                       params:(CHIPWriteParams * _Nullable)params
-                            completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableStruct::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0.a = value.a.unsignedCharValue;
-                nonNullValue_0.b = value.b.boolValue;
-                nonNullValue_0.c = static_cast<std::remove_reference_t<decltype(nonNullValue_0.c)>>(value.c.unsignedCharValue);
-                nonNullValue_0.d = [self asByteSpan:value.d];
-                nonNullValue_0.e = [self asCharSpan:value.e];
-                nonNullValue_0.f = static_cast<std::remove_reference_t<decltype(nonNullValue_0.f)>>(value.f.unsignedCharValue);
-                nonNullValue_0.g = value.g.floatValue;
-                nonNullValue_0.h = value.h.doubleValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::DcPowerDivisor::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeNullableStructWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeDcPowerDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
                                             maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(CHIPSubscribeParams * _Nullable)params
                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:(void (^)(CHIPTestClusterClusterSimpleStruct * _Nullable value,
-                                                            NSError * _Nullable error))reportHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPTestClusterNullableStructStructAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableStruct::TypeInfo;
-            auto successFn = Callback<TestClusterNullableStructStructAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::DcPowerDivisor::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterNullableStructStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableStructWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeDcPowerDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                              endpoint:(NSNumber *)endpoint
                                                 queue:(dispatch_queue_t)queue
-                                    completionHandler:(void (^)(CHIPTestClusterClusterSimpleStruct * _Nullable value,
-                                                          NSError * _Nullable error))completionHandler
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterNullableStructStructAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = TestCluster::Attributes::NullableStruct::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TestClusterNullableStructStructAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcPowerDivisor::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeNullableRangeRestrictedInt8uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt8uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt8u::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)writeAttributeNullableRangeRestrictedInt8uWithValue:(NSNumber * _Nullable)value
-                                          completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableRangeRestrictedInt8uWithValue:(NSNumber * _Nullable) value
-                                                       params:nil
-                                            completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableRangeRestrictedInt8uWithValue:(NSNumber * _Nullable)value
-                                                     params:(CHIPWriteParams * _Nullable)params
-                                          completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeAcFrequencyWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt8u::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::AcFrequency::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeNullableRangeRestrictedInt8uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcFrequencyWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt8u::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequency::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableRangeRestrictedInt8uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
++ (void)readAttributeAcFrequencyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt8u::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequency::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -66532,101 +64166,59 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeNullableRangeRestrictedInt8sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt8sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt8s::TypeInfo;
-            auto successFn = Callback<NullableInt8sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeNullableRangeRestrictedInt8sWithValue:(NSNumber * _Nullable)value
-                                          completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableRangeRestrictedInt8sWithValue:(NSNumber * _Nullable) value
-                                                       params:nil
-                                            completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableRangeRestrictedInt8sWithValue:(NSNumber * _Nullable)value
-                                                     params:(CHIPWriteParams * _Nullable)params
-                                          completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeAcFrequencyMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt8s::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.charValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyMin::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeNullableRangeRestrictedInt8sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                               params:(CHIPSubscribeParams * _Nullable)params
-                                              subscriptionEstablished:
-                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcFrequencyMinWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt8s::TypeInfo;
-            auto successFn = Callback<NullableInt8sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyMin::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableRangeRestrictedInt8sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                           endpoint:(NSNumber *)endpoint
-                                                              queue:(dispatch_queue_t)queue
-                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
++ (void)readAttributeAcFrequencyMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt8s::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyMin::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -66636,101 +64228,59 @@ new CHIPNullableInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeNullableRangeRestrictedInt16uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler
+- (void)readAttributeAcFrequencyMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt16u::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyMax::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)writeAttributeNullableRangeRestrictedInt16uWithValue:(NSNumber * _Nullable)value
-                                           completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableRangeRestrictedInt16uWithValue:(NSNumber * _Nullable) value
-                                                        params:nil
-                                             completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableRangeRestrictedInt16uWithValue:(NSNumber * _Nullable)value
-                                                      params:(CHIPWriteParams * _Nullable)params
-                                           completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt16u::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeNullableRangeRestrictedInt16uWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                params:(CHIPSubscribeParams * _Nullable)params
-                                               subscriptionEstablished:
-                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcFrequencyMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt16u::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyMax::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableRangeRestrictedInt16uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                            endpoint:(NSNumber *)endpoint
-                                                               queue:(dispatch_queue_t)queue
-                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler
++ (void)readAttributeAcFrequencyMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt16u::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyMax::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -66740,101 +64290,59 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeNullableRangeRestrictedInt16sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt16sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt16s::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeNullableRangeRestrictedInt16sWithValue:(NSNumber * _Nullable)value
-                                           completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeNullableRangeRestrictedInt16sWithValue:(NSNumber * _Nullable) value
-                                                        params:nil
-                                             completionHandler:completionHandler];
-}
-- (void)writeAttributeNullableRangeRestrictedInt16sWithValue:(NSNumber * _Nullable)value
-                                                      params:(CHIPWriteParams * _Nullable)params
-                                           completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeNeutralCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt16s::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.shortValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::NeutralCurrent::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeNullableRangeRestrictedInt16sWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                params:(CHIPSubscribeParams * _Nullable)params
-                                               subscriptionEstablished:
-                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNeutralCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt16s::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::NeutralCurrent::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNullableRangeRestrictedInt16sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                            endpoint:(NSNumber *)endpoint
-                                                               queue:(dispatch_queue_t)queue
-                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler
++ (void)readAttributeNeutralCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt16s::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::NeutralCurrent::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -66844,250 +64352,246 @@ new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeTotalActivePowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterGeneratedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<TestClusterGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt32sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::TotalActivePower::TypeInfo;
+        auto successFn = Callback<Int32sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTotalActivePowerWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPTestClusterGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt32sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<TestClusterGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::TotalActivePower::TypeInfo;
+            auto successFn = Callback<Int32sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTotalActivePowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = TestCluster::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TestClusterGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt32sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ElectricalMeasurement::Attributes::TotalActivePower::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int32sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeTotalReactivePowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterAcceptedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<TestClusterAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt32sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::TotalReactivePower::TypeInfo;
+        auto successFn = Callback<Int32sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTotalReactivePowerWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPTestClusterAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt32sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<TestClusterAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::TotalReactivePower::TypeInfo;
+            auto successFn = Callback<Int32sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTotalReactivePowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = TestCluster::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TestClusterAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt32sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ElectricalMeasurement::Attributes::TotalReactivePower::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int32sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeTotalApparentPowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterAttributeListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TestCluster::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<TestClusterAttributeListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::TotalApparentPower::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTotalApparentPowerWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPTestClusterAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<TestClusterAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::TotalApparentPower::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTestClusterAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTotalApparentPowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTestClusterAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = TestCluster::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TestClusterAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ElectricalMeasurement::Attributes::TotalApparentPower::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeMeasured1stHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::Measured1stHarmonicCurrent::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMeasured1stHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                             params:(CHIPSubscribeParams * _Nullable)params
+                                            subscriptionEstablished:
+                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::Measured1stHarmonicCurrent::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMeasured1stHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                         endpoint:(NSNumber *)endpoint
+                                                            queue:(dispatch_queue_t)queue
+                                                completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::Measured1stHarmonicCurrent::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -67097,59 +64601,60 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeMeasured3rdHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TestCluster::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::Measured3rdHarmonicCurrent::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMeasured3rdHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                             params:(CHIPSubscribeParams * _Nullable)params
+                                            subscriptionEstablished:
+                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TestCluster::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::Measured3rdHarmonicCurrent::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMeasured3rdHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                         endpoint:(NSNumber *)endpoint
+                                                            queue:(dispatch_queue_t)queue
+                                                completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TestCluster::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::Measured3rdHarmonicCurrent::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -67159,215 +64664,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPThermostat
-
-- (chip::Controller::ClusterBase *)getCluster
+- (void)readAttributeMeasured5thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler
 {
-    return &_cppCluster;
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::Measured5thHarmonicCurrent::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)setpointRaiseLowerWithParams:(CHIPThermostatClusterSetpointRaiseLowerParams *)params
-                   completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    Thermostat::Commands::SetpointRaiseLower::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.mode = static_cast<std::remove_reference_t<decltype(request.mode)>>(params.mode.unsignedCharValue);
-    request.amount = params.amount.charValue;
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)setWeeklyScheduleWithParams:(CHIPThermostatClusterSetWeeklyScheduleParams *)params
-                  completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    Thermostat::Commands::SetWeeklySchedule::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.numberOfTransitionsForSequence = params.numberOfTransitionsForSequence.unsignedCharValue;
-    request.dayOfWeekForSequence = static_cast<std::remove_reference_t<decltype(request.dayOfWeekForSequence)>>(
-        params.dayOfWeekForSequence.unsignedCharValue);
-    request.modeForSequence
-        = static_cast<std::remove_reference_t<decltype(request.modeForSequence)>>(params.modeForSequence.unsignedCharValue);
-    {
-        using ListType_0 = std::remove_reference_t<decltype(request.transitions)>;
-        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-        if (params.transitions.count != 0) {
-            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.transitions.count);
-            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                return;
-            }
-            listFreer.add(listHolder_0);
-            for (size_t i_0 = 0; i_0 < params.transitions.count; ++i_0) {
-                if (![params.transitions[i_0] isKindOfClass:[CHIPThermostatClusterThermostatScheduleTransition class]]) {
-                    // Wrong kind of value.
-                    return;
-                }
-                auto element_0 = (CHIPThermostatClusterThermostatScheduleTransition *) params.transitions[i_0];
-                listHolder_0->mList[i_0].transitionTime = element_0.transitionTime.unsignedShortValue;
-                if (element_0.heatSetpoint == nil) {
-                    listHolder_0->mList[i_0].heatSetpoint.SetNull();
-                } else {
-                    auto & nonNullValue_2 = listHolder_0->mList[i_0].heatSetpoint.SetNonNull();
-                    nonNullValue_2 = element_0.heatSetpoint.shortValue;
-                }
-                if (element_0.coolSetpoint == nil) {
-                    listHolder_0->mList[i_0].coolSetpoint.SetNull();
-                } else {
-                    auto & nonNullValue_2 = listHolder_0->mList[i_0].coolSetpoint.SetNonNull();
-                    nonNullValue_2 = element_0.coolSetpoint.shortValue;
-                }
-            }
-            request.transitions = ListType_0(listHolder_0->mList, params.transitions.count);
-        } else {
-            request.transitions = ListType_0();
-        }
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)getWeeklyScheduleWithParams:(CHIPThermostatClusterGetWeeklyScheduleParams *)params
-                  completionHandler:(void (^)(CHIPThermostatClusterGetWeeklyScheduleResponseParams * _Nullable data,
-                                        NSError * _Nullable error))completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    Thermostat::Commands::GetWeeklySchedule::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-    request.daysToReturn
-        = static_cast<std::remove_reference_t<decltype(request.daysToReturn)>>(params.daysToReturn.unsignedCharValue);
-    request.modeToReturn
-        = static_cast<std::remove_reference_t<decltype(request.modeToReturn)>>(params.modeToReturn.unsignedCharValue);
-
-    new CHIPThermostatClusterGetWeeklyScheduleResponseCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPThermostatClusterGetWeeklyScheduleResponseCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)clearWeeklyScheduleWithCompletionHandler:(StatusCompletion)completionHandler
-{
-    [self clearWeeklyScheduleWithParams:nil completionHandler:completionHandler];
-}
-- (void)clearWeeklyScheduleWithParams:(CHIPThermostatClusterClearWeeklyScheduleParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    Thermostat::Commands::ClearWeeklySchedule::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)readAttributeLocalTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt16sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Thermostat::Attributes::LocalTemperature::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeLocalTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMeasured5thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                             params:(CHIPSubscribeParams * _Nullable)params
+                                            subscriptionEstablished:
+                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::LocalTemperature::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::Measured5thHarmonicCurrent::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeLocalTemperatureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMeasured5thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                         endpoint:(NSNumber *)endpoint
+                                                            queue:(dispatch_queue_t)queue
+                                                completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::LocalTemperature::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::Measured5thHarmonicCurrent::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -67377,60 +64727,60 @@ new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeOutdoorTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler
+- (void)readAttributeMeasured7thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Thermostat::Attributes::OutdoorTemperature::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::Measured7thHarmonicCurrent::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeOutdoorTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMeasured7thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                             params:(CHIPSubscribeParams * _Nullable)params
+                                            subscriptionEstablished:
+                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::OutdoorTemperature::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::Measured7thHarmonicCurrent::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOutdoorTemperatureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMeasured7thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                         endpoint:(NSNumber *)endpoint
+                                                            queue:(dispatch_queue_t)queue
+                                                completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::OutdoorTemperature::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::Measured7thHarmonicCurrent::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -67440,57 +64790,60 @@ new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeOccupancyWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeMeasured9thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::Occupancy::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::Measured9thHarmonicCurrent::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeOccupancyWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMeasured9thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                             params:(CHIPSubscribeParams * _Nullable)params
+                                            subscriptionEstablished:
+                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::Occupancy::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::Measured9thHarmonicCurrent::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOccupancyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMeasured9thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                         endpoint:(NSNumber *)endpoint
+                                                            queue:(dispatch_queue_t)queue
+                                                completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::Occupancy::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::Measured9thHarmonicCurrent::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -67500,24 +64853,24 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeAbsMinHeatSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
+- (void)readAttributeMeasured11thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))completionHandler
 {
     new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::AbsMinHeatSetpointLimit::TypeInfo;
+        using TypeInfo = ElectricalMeasurement::Attributes::Measured11thHarmonicCurrent::TypeInfo;
         auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAbsMinHeatSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMeasured11thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                              params:(CHIPSubscribeParams * _Nullable)params
+                                             subscriptionEstablished:
+                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))reportHandler
 {
     new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -67526,7 +64879,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::AbsMinHeatSetpointLimit::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::Measured11thHarmonicCurrent::TypeInfo;
             auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -67538,16 +64891,16 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAbsMinHeatSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMeasured11thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                          endpoint:(NSNumber *)endpoint
+                                                             queue:(dispatch_queue_t)queue
+                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler
 {
     new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::AbsMinHeatSetpointLimit::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::Measured11thHarmonicCurrent::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -67563,24 +64916,24 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAbsMaxHeatSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
+- (void)readAttributeMeasuredPhase1stHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler
 {
     new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::AbsMaxHeatSetpointLimit::TypeInfo;
+        using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase1stHarmonicCurrent::TypeInfo;
         auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAbsMaxHeatSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMeasuredPhase1stHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                                 subscriptionEstablished:
+                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))reportHandler
 {
     new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -67589,7 +64942,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::AbsMaxHeatSetpointLimit::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase1stHarmonicCurrent::TypeInfo;
             auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -67601,16 +64954,16 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAbsMaxHeatSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMeasuredPhase1stHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                              endpoint:(NSNumber *)endpoint
+                                                                 queue:(dispatch_queue_t)queue
+                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler
 {
     new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::AbsMaxHeatSetpointLimit::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase1stHarmonicCurrent::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -67626,24 +64979,24 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAbsMinCoolSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
+- (void)readAttributeMeasuredPhase3rdHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler
 {
     new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::AbsMinCoolSetpointLimit::TypeInfo;
+        using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase3rdHarmonicCurrent::TypeInfo;
         auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAbsMinCoolSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMeasuredPhase3rdHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                                 subscriptionEstablished:
+                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))reportHandler
 {
     new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -67652,7 +65005,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::AbsMinCoolSetpointLimit::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase3rdHarmonicCurrent::TypeInfo;
             auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -67664,16 +65017,16 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAbsMinCoolSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMeasuredPhase3rdHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                              endpoint:(NSNumber *)endpoint
+                                                                 queue:(dispatch_queue_t)queue
+                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler
 {
     new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::AbsMinCoolSetpointLimit::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase3rdHarmonicCurrent::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -67689,24 +65042,24 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAbsMaxCoolSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
+- (void)readAttributeMeasuredPhase5thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler
 {
     new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::AbsMaxCoolSetpointLimit::TypeInfo;
+        using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase5thHarmonicCurrent::TypeInfo;
         auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAbsMaxCoolSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMeasuredPhase5thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                                 subscriptionEstablished:
+                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))reportHandler
 {
     new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -67715,7 +65068,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::AbsMaxCoolSetpointLimit::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase5thHarmonicCurrent::TypeInfo;
             auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -67727,16 +65080,16 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAbsMaxCoolSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMeasuredPhase5thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                              endpoint:(NSNumber *)endpoint
+                                                                 queue:(dispatch_queue_t)queue
+                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler
 {
     new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::AbsMaxCoolSetpointLimit::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase5thHarmonicCurrent::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -67752,59 +65105,60 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributePICoolingDemandWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeMeasuredPhase7thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::PICoolingDemand::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase7thHarmonicCurrent::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributePICoolingDemandWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMeasuredPhase7thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                                 subscriptionEstablished:
+                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::PICoolingDemand::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase7thHarmonicCurrent::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePICoolingDemandWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMeasuredPhase7thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                              endpoint:(NSNumber *)endpoint
+                                                                 queue:(dispatch_queue_t)queue
+                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::PICoolingDemand::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase7thHarmonicCurrent::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -67814,59 +65168,60 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributePIHeatingDemandWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeMeasuredPhase9thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::PIHeatingDemand::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase9thHarmonicCurrent::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributePIHeatingDemandWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMeasuredPhase9thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                                 subscriptionEstablished:
+                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::PIHeatingDemand::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase9thHarmonicCurrent::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePIHeatingDemandWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeMeasuredPhase9thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                              endpoint:(NSNumber *)endpoint
+                                                                 queue:(dispatch_queue_t)queue
+                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::PIHeatingDemand::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase9thHarmonicCurrent::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -67876,95 +65231,60 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeHVACSystemTypeConfigurationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler
+- (void)readAttributeMeasuredPhase11thHarmonicCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::HVACSystemTypeConfiguration::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase11thHarmonicCurrent::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeHVACSystemTypeConfigurationWithValue:(NSNumber * _Nonnull)value
-                                         completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeHVACSystemTypeConfigurationWithValue:(NSNumber * _Nonnull) value
-                                                      params:nil
-                                           completionHandler:completionHandler];
-}
-- (void)writeAttributeHVACSystemTypeConfigurationWithValue:(NSNumber * _Nonnull)value
-                                                    params:(CHIPWriteParams * _Nullable)params
-                                         completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::HVACSystemTypeConfiguration::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeHVACSystemTypeConfigurationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                              params:(CHIPSubscribeParams * _Nullable)params
-                                             subscriptionEstablished:
-                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeMeasuredPhase11thHarmonicCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                                  subscriptionEstablished:
+                                                      (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                            reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::HVACSystemTypeConfiguration::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase11thHarmonicCurrent::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeHVACSystemTypeConfigurationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                          endpoint:(NSNumber *)endpoint
-                                                             queue:(dispatch_queue_t)queue
-                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
++ (void)readAttributeMeasuredPhase11thHarmonicCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                               endpoint:(NSNumber *)endpoint
+                                                                  queue:(dispatch_queue_t)queue
+                                                      completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::HVACSystemTypeConfiguration::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase11thHarmonicCurrent::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -67974,95 +65294,60 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeLocalTemperatureCalibrationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler
+- (void)readAttributeAcFrequencyMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::LocalTemperatureCalibration::TypeInfo;
-        auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyMultiplier::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeLocalTemperatureCalibrationWithValue:(NSNumber * _Nonnull)value
-                                         completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeLocalTemperatureCalibrationWithValue:(NSNumber * _Nonnull) value
-                                                      params:nil
-                                           completionHandler:completionHandler];
-}
-- (void)writeAttributeLocalTemperatureCalibrationWithValue:(NSNumber * _Nonnull)value
-                                                    params:(CHIPWriteParams * _Nullable)params
-                                         completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::LocalTemperatureCalibration::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.charValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeLocalTemperatureCalibrationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                              params:(CHIPSubscribeParams * _Nullable)params
-                                             subscriptionEstablished:
-                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcFrequencyMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::LocalTemperatureCalibration::TypeInfo;
-            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyMultiplier::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeLocalTemperatureCalibrationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                          endpoint:(NSNumber *)endpoint
-                                                             queue:(dispatch_queue_t)queue
-                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
++ (void)readAttributeAcFrequencyMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::LocalTemperatureCalibration::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyMultiplier::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -68072,95 +65357,59 @@ new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeOccupiedCoolingSetpointWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
+- (void)readAttributeAcFrequencyDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::OccupiedCoolingSetpoint::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyDivisor::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeOccupiedCoolingSetpointWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeOccupiedCoolingSetpointWithValue:(NSNumber * _Nonnull) value
-                                                  params:nil
-                                       completionHandler:completionHandler];
-}
-- (void)writeAttributeOccupiedCoolingSetpointWithValue:(NSNumber * _Nonnull)value
-                                                params:(CHIPWriteParams * _Nullable)params
-                                     completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::OccupiedCoolingSetpoint::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeOccupiedCoolingSetpointWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcFrequencyDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::OccupiedCoolingSetpoint::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyDivisor::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOccupiedCoolingSetpointWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcFrequencyDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::OccupiedCoolingSetpoint::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyDivisor::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -68170,95 +65419,59 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeOccupiedHeatingSetpointWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
+- (void)readAttributePowerMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::OccupiedHeatingSetpoint::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::PowerMultiplier::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeOccupiedHeatingSetpointWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeOccupiedHeatingSetpointWithValue:(NSNumber * _Nonnull) value
-                                                  params:nil
-                                       completionHandler:completionHandler];
-}
-- (void)writeAttributeOccupiedHeatingSetpointWithValue:(NSNumber * _Nonnull)value
-                                                params:(CHIPWriteParams * _Nullable)params
-                                     completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::OccupiedHeatingSetpoint::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeOccupiedHeatingSetpointWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePowerMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::OccupiedHeatingSetpoint::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::PowerMultiplier::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOccupiedHeatingSetpointWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePowerMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::OccupiedHeatingSetpoint::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::PowerMultiplier::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -68268,95 +65481,58 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeUnoccupiedCoolingSetpointWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
+- (void)readAttributePowerDivisorWithCompletionHandler:(void (^)(
+                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::UnoccupiedCoolingSetpoint::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::PowerDivisor::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeUnoccupiedCoolingSetpointWithValue:(NSNumber * _Nonnull)value
-                                       completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeUnoccupiedCoolingSetpointWithValue:(NSNumber * _Nonnull) value
-                                                    params:nil
-                                         completionHandler:completionHandler];
-}
-- (void)writeAttributeUnoccupiedCoolingSetpointWithValue:(NSNumber * _Nonnull)value
-                                                  params:(CHIPWriteParams * _Nullable)params
-                                       completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::UnoccupiedCoolingSetpoint::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeUnoccupiedCoolingSetpointWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                            params:(CHIPSubscribeParams * _Nullable)params
-                                           subscriptionEstablished:
-                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePowerDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                               params:(CHIPSubscribeParams * _Nullable)params
+                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::UnoccupiedCoolingSetpoint::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::PowerDivisor::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeUnoccupiedCoolingSetpointWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                        endpoint:(NSNumber *)endpoint
-                                                           queue:(dispatch_queue_t)queue
-                                               completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
++ (void)readAttributePowerDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                           endpoint:(NSNumber *)endpoint
+                                              queue:(dispatch_queue_t)queue
+                                  completionHandler:
+                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::UnoccupiedCoolingSetpoint::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::PowerDivisor::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -68366,53 +65542,18 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeUnoccupiedHeatingSetpointWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeHarmonicCurrentMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                         NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::UnoccupiedHeatingSetpoint::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt8sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::HarmonicCurrentMultiplier::TypeInfo;
+        auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeUnoccupiedHeatingSetpointWithValue:(NSNumber * _Nonnull)value
-                                       completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeUnoccupiedHeatingSetpointWithValue:(NSNumber * _Nonnull) value
-                                                    params:nil
-                                         completionHandler:completionHandler];
-}
-- (void)writeAttributeUnoccupiedHeatingSetpointWithValue:(NSNumber * _Nonnull)value
-                                                  params:(CHIPWriteParams * _Nullable)params
-                                       completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::UnoccupiedHeatingSetpoint::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeUnoccupiedHeatingSetpointWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeHarmonicCurrentMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
                                                             params:(CHIPSubscribeParams * _Nullable)params
                                            subscriptionEstablished:
@@ -68420,41 +65561,41 @@ - (void)subscribeAttributeUnoccupiedHeatingSetpointWithMinInterval:(NSNumber * _
                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
                                                                        NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt8sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::UnoccupiedHeatingSetpoint::TypeInfo;
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::HarmonicCurrentMultiplier::TypeInfo;
+            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeUnoccupiedHeatingSetpointWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeHarmonicCurrentMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                         endpoint:(NSNumber *)endpoint
                                                            queue:(dispatch_queue_t)queue
                                                completionHandler:(void (^)(NSNumber * _Nullable value,
                                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::UnoccupiedHeatingSetpoint::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::HarmonicCurrentMultiplier::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -68464,50 +65605,81 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeMinHeatSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributePhaseHarmonicCurrentMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::MinHeatSetpointLimit::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt8sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::PhaseHarmonicCurrentMultiplier::TypeInfo;
+        auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeMinHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeMinHeatSetpointLimitWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeMinHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value
-                                             params:(CHIPWriteParams * _Nullable)params
-                                  completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributePhaseHarmonicCurrentMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                                subscriptionEstablished:
+                                                    (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                          reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
+    new CHIPInt8sAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::MinHeatSetpointLimit::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ElectricalMeasurement::Attributes::PhaseHarmonicCurrentMultiplier::TypeInfo;
+            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
 
-- (void)subscribeAttributeMinHeatSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
++ (void)readAttributePhaseHarmonicCurrentMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                             endpoint:(NSNumber *)endpoint
+                                                                queue:(dispatch_queue_t)queue
+                                                    completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))completionHandler
+{
+    new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ElectricalMeasurement::Attributes::PhaseHarmonicCurrentMultiplier::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeInstantaneousVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousVoltage::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeInstantaneousVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(CHIPSubscribeParams * _Nullable)params
                                       subscriptionEstablished:
@@ -68522,7 +65694,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::MinHeatSetpointLimit::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousVoltage::TypeInfo;
             auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -68534,7 +65706,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMinHeatSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeInstantaneousVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                    endpoint:(NSNumber *)endpoint
                                                       queue:(dispatch_queue_t)queue
                                           completionHandler:
@@ -68543,7 +65715,7 @@ + (void)readAttributeMinHeatSetpointLimitWithAttributeCache:(CHIPAttributeCacheC
     new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::MinHeatSetpointLimit::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousVoltage::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -68559,56 +65731,87 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeMaxHeatSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeInstantaneousLineCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::MaxHeatSetpointLimit::TypeInfo;
-        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousLineCurrent::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeMaxHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeInstantaneousLineCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                          subscriptionEstablished:
+                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeMaxHeatSetpointLimitWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousLineCurrent::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
-- (void)writeAttributeMaxHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value
-                                             params:(CHIPWriteParams * _Nullable)params
-                                  completionHandler:(StatusCompletion)completionHandler
+
++ (void)readAttributeInstantaneousLineCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                       endpoint:(NSNumber *)endpoint
+                                                          queue:(dispatch_queue_t)queue
+                                              completionHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousLineCurrent::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
 
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::MaxHeatSetpointLimit::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+- (void)readAttributeInstantaneousActiveCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousActiveCurrent::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeMaxHeatSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeInstantaneousActiveCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                             params:(CHIPSubscribeParams * _Nullable)params
+                                            subscriptionEstablished:
+                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))reportHandler
 {
     new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -68617,7 +65820,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::MaxHeatSetpointLimit::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousActiveCurrent::TypeInfo;
             auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -68629,16 +65832,16 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMaxHeatSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeInstantaneousActiveCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                         endpoint:(NSNumber *)endpoint
+                                                            queue:(dispatch_queue_t)queue
+                                                completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
     new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::MaxHeatSetpointLimit::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousActiveCurrent::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -68654,56 +65857,24 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeMinCoolSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeInstantaneousReactiveCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler
 {
     new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::MinCoolSetpointLimit::TypeInfo;
+        using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousReactiveCurrent::TypeInfo;
         auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeMinCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeMinCoolSetpointLimitWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeMinCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value
-                                             params:(CHIPWriteParams * _Nullable)params
-                                  completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::MinCoolSetpointLimit::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeMinCoolSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeInstantaneousReactiveCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                              subscriptionEstablished:
+                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))reportHandler
 {
     new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -68712,7 +65883,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::MinCoolSetpointLimit::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousReactiveCurrent::TypeInfo;
             auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -68724,16 +65895,16 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMinCoolSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeInstantaneousReactiveCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                           endpoint:(NSNumber *)endpoint
+                                                              queue:(dispatch_queue_t)queue
+                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler
 {
     new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::MinCoolSetpointLimit::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousReactiveCurrent::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -68749,56 +65920,23 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeMaxCoolSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeInstantaneousPowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler
 {
     new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::MaxCoolSetpointLimit::TypeInfo;
+        using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousPower::TypeInfo;
         auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeMaxCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeMaxCoolSetpointLimitWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeMaxCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value
-                                             params:(CHIPWriteParams * _Nullable)params
-                                  completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::MaxCoolSetpointLimit::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeMaxCoolSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeInstantaneousPowerWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -68807,7 +65945,7 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::MaxCoolSetpointLimit::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousPower::TypeInfo;
             auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -68819,16 +65957,16 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMaxCoolSetpointLimitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeInstantaneousPowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::MaxCoolSetpointLimit::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousPower::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -68844,92 +65982,57 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeMinSetpointDeadBandWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsVoltageWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::MinSetpointDeadBand::TypeInfo;
-        auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltage::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeMinSetpointDeadBandWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeMinSetpointDeadBandWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeMinSetpointDeadBandWithValue:(NSNumber * _Nonnull)value
-                                            params:(CHIPWriteParams * _Nullable)params
-                                 completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::MinSetpointDeadBand::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.charValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeMinSetpointDeadBandWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::MinSetpointDeadBand::TypeInfo;
-            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltage::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMinSetpointDeadBandWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::MinSetpointDeadBand::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltage::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -68939,91 +66042,121 @@ new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeRemoteSensingWithCompletionHandler:(void (^)(
+- (void)readAttributeRmsVoltageMinWithCompletionHandler:(void (^)(
                                                             NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::RemoteSensing::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMin::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeRemoteSensingWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeRmsVoltageMinWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeRemoteSensingWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMin::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
-- (void)writeAttributeRemoteSensingWithValue:(NSNumber * _Nonnull)value
-                                      params:(CHIPWriteParams * _Nullable)params
-                           completionHandler:(StatusCompletion)completionHandler
+
++ (void)readAttributeRmsVoltageMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMin::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
 
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::RemoteSensing::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+- (void)readAttributeRmsVoltageMaxWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMax::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeRemoteSensingWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeRmsVoltageMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:
                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::RemoteSensing::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMax::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRemoteSensingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeRmsVoltageMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::RemoteSensing::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMax::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -69033,189 +66166,119 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeControlSequenceOfOperationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsCurrentWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPThermostatClusterThermostatControlSequenceAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Thermostat::Attributes::ControlSequenceOfOperation::TypeInfo;
-            auto successFn = Callback<ThermostatClusterThermostatControlSequenceAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeControlSequenceOfOperationWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeControlSequenceOfOperationWithValue:(NSNumber * _Nonnull) value
-                                                     params:nil
-                                          completionHandler:completionHandler];
-}
-- (void)writeAttributeControlSequenceOfOperationWithValue:(NSNumber * _Nonnull)value
-                                                   params:(CHIPWriteParams * _Nullable)params
-                                        completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::ControlSequenceOfOperation::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrent::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeControlSequenceOfOperationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                             params:(CHIPSubscribeParams * _Nullable)params
-                                            subscriptionEstablished:
-                                                (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                      reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPThermostatClusterThermostatControlSequenceAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::ControlSequenceOfOperation::TypeInfo;
-            auto successFn = Callback<ThermostatClusterThermostatControlSequenceAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrent::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPThermostatClusterThermostatControlSequenceAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeControlSequenceOfOperationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                         endpoint:(NSNumber *)endpoint
-                                                            queue:(dispatch_queue_t)queue
-                                                completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsCurrentWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPThermostatClusterThermostatControlSequenceAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = Thermostat::Attributes::ControlSequenceOfOperation::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ThermostatClusterThermostatControlSequenceAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrent::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeSystemModeWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsCurrentMinWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::SystemMode::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMin::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeSystemModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeSystemModeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeSystemModeWithValue:(NSNumber * _Nonnull)value
-                                   params:(CHIPWriteParams * _Nullable)params
-                        completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::SystemMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeSystemModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsCurrentMinWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::SystemMode::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMin::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSystemModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsCurrentMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::SystemMode::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMin::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -69225,60 +66288,59 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeThermostatRunningModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsCurrentMaxWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::ThermostatRunningMode::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMax::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeThermostatRunningModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsCurrentMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::ThermostatRunningMode::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMax::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeThermostatRunningModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsCurrentMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::ThermostatRunningMode::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMax::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -69288,58 +66350,58 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeStartOfWeekWithCompletionHandler:(void (^)(
+- (void)readAttributeActivePowerWithCompletionHandler:(void (^)(
                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::StartOfWeek::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::ActivePower::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeStartOfWeekWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeActivePowerWithMinInterval:(NSNumber * _Nonnull)minInterval
                                          maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(CHIPSubscribeParams * _Nullable)params
                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::StartOfWeek::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePower::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeStartOfWeekWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeActivePowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                           endpoint:(NSNumber *)endpoint
                                              queue:(dispatch_queue_t)queue
                                  completionHandler:
                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::StartOfWeek::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePower::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -69349,60 +66411,59 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeNumberOfWeeklyTransitionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
+- (void)readAttributeActivePowerMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::NumberOfWeeklyTransitions::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMin::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeNumberOfWeeklyTransitionsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                            params:(CHIPSubscribeParams * _Nullable)params
-                                           subscriptionEstablished:
-                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeActivePowerMinWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::NumberOfWeeklyTransitions::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMin::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNumberOfWeeklyTransitionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                        endpoint:(NSNumber *)endpoint
-                                                           queue:(dispatch_queue_t)queue
-                                               completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
++ (void)readAttributeActivePowerMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::NumberOfWeeklyTransitions::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMin::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -69412,60 +66473,59 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeNumberOfDailyTransitionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
+- (void)readAttributeActivePowerMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::NumberOfDailyTransitions::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMax::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeNumberOfDailyTransitionsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeActivePowerMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::NumberOfDailyTransitions::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMax::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNumberOfDailyTransitionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeActivePowerMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::NumberOfDailyTransitions::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMax::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -69475,95 +66535,59 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeTemperatureSetpointHoldWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
+- (void)readAttributeReactivePowerWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::TemperatureSetpointHold::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::ReactivePower::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeTemperatureSetpointHoldWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeTemperatureSetpointHoldWithValue:(NSNumber * _Nonnull) value
-                                                  params:nil
-                                       completionHandler:completionHandler];
-}
-- (void)writeAttributeTemperatureSetpointHoldWithValue:(NSNumber * _Nonnull)value
-                                                params:(CHIPWriteParams * _Nullable)params
-                                     completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::TemperatureSetpointHold::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeTemperatureSetpointHoldWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeReactivePowerWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::TemperatureSetpointHold::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::ReactivePower::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTemperatureSetpointHoldWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeReactivePowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::TemperatureSetpointHold::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ReactivePower::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -69573,101 +66597,59 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeTemperatureSetpointHoldDurationWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt16uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Thermostat::Attributes::TemperatureSetpointHoldDuration::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeTemperatureSetpointHoldDurationWithValue:(NSNumber * _Nullable)value
-                                             completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeTemperatureSetpointHoldDurationWithValue:(NSNumber * _Nullable) value
-                                                          params:nil
-                                               completionHandler:completionHandler];
-}
-- (void)writeAttributeTemperatureSetpointHoldDurationWithValue:(NSNumber * _Nullable)value
-                                                        params:(CHIPWriteParams * _Nullable)params
-                                             completionHandler:(StatusCompletion)completionHandler
+- (void)readAttributeApparentPowerWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::TemperatureSetpointHoldDuration::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::ApparentPower::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeTemperatureSetpointHoldDurationWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                                 subscriptionEstablished:
-                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeApparentPowerWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::TemperatureSetpointHoldDuration::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::ApparentPower::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTemperatureSetpointHoldDurationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                              endpoint:(NSNumber *)endpoint
-                                                                 queue:(dispatch_queue_t)queue
-                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler
++ (void)readAttributeApparentPowerWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::TemperatureSetpointHoldDuration::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ApparentPower::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -69677,25 +66659,86 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeThermostatProgrammingOperationModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributePowerFactorWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt8sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::PowerFactor::TypeInfo;
+        auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributePowerFactorWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt8sAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ElectricalMeasurement::Attributes::PowerFactor::TypeInfo;
+            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributePowerFactorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ElectricalMeasurement::Attributes::PowerFactor::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeAverageRmsVoltageMeasurementPeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::ThermostatProgrammingOperationMode::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriod::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeThermostatProgrammingOperationModeWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeAverageRmsVoltageMeasurementPeriodWithValue:(NSNumber * _Nonnull)value
                                                 completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeThermostatProgrammingOperationModeWithValue:(NSNumber * _Nonnull) value
+    [self writeAttributeAverageRmsVoltageMeasurementPeriodWithValue:(NSNumber * _Nonnull) value
                                                              params:nil
                                                   completionHandler:completionHandler];
 }
-- (void)writeAttributeThermostatProgrammingOperationModeWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeAverageRmsVoltageMeasurementPeriodWithValue:(NSNumber * _Nonnull)value
                                                            params:(CHIPWriteParams * _Nullable)params
                                                 completionHandler:(StatusCompletion)completionHandler
 {
@@ -69713,9 +66756,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::ThermostatProgrammingOperationMode::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriod::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -69723,7 +66766,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeThermostatProgrammingOperationModeWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeAverageRmsVoltageMeasurementPeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
                                                                      params:(CHIPSubscribeParams * _Nullable)params
                                                     subscriptionEstablished:
@@ -69731,41 +66774,41 @@ - (void)subscribeAttributeThermostatProgrammingOperationModeWithMinInterval:(NSN
                                                               reportHandler:(void (^)(NSNumber * _Nullable value,
                                                                                 NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::ThermostatProgrammingOperationMode::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriod::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeThermostatProgrammingOperationModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeAverageRmsVoltageMeasurementPeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                                  endpoint:(NSNumber *)endpoint
                                                                     queue:(dispatch_queue_t)queue
                                                         completionHandler:(void (^)(NSNumber * _Nullable value,
                                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::ThermostatProgrammingOperationMode::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriod::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -69775,24 +66818,59 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeThermostatRunningStateWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
+- (void)readAttributeAverageRmsUnderVoltageCounterWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::ThermostatRunningState::TypeInfo;
+        using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounter::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeThermostatRunningStateWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:
-                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeAverageRmsUnderVoltageCounterWithValue:(NSNumber * _Nonnull)value
+                                           completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeAverageRmsUnderVoltageCounterWithValue:(NSNumber * _Nonnull) value
+                                                        params:nil
+                                             completionHandler:completionHandler];
+}
+- (void)writeAttributeAverageRmsUnderVoltageCounterWithValue:(NSNumber * _Nonnull)value
+                                                      params:(CHIPWriteParams * _Nullable)params
+                                           completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounter::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeAverageRmsUnderVoltageCounterWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                params:(CHIPSubscribeParams * _Nullable)params
+                                               subscriptionEstablished:
+                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -69801,7 +66879,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::ThermostatRunningState::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounter::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -69813,16 +66891,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeThermostatRunningStateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAverageRmsUnderVoltageCounterWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                            endpoint:(NSNumber *)endpoint
+                                                               queue:(dispatch_queue_t)queue
+                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::ThermostatRunningState::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounter::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -69838,60 +66916,95 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeSetpointChangeSourceWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsExtremeOverVoltagePeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::SetpointChangeSource::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriod::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeSetpointChangeSourceWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeRmsExtremeOverVoltagePeriodWithValue:(NSNumber * _Nonnull)value
+                                         completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeRmsExtremeOverVoltagePeriodWithValue:(NSNumber * _Nonnull) value
+                                                      params:nil
+                                           completionHandler:completionHandler];
+}
+- (void)writeAttributeRmsExtremeOverVoltagePeriodWithValue:(NSNumber * _Nonnull)value
+                                                    params:(CHIPWriteParams * _Nullable)params
+                                         completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriod::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeRmsExtremeOverVoltagePeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                              params:(CHIPSubscribeParams * _Nullable)params
+                                             subscriptionEstablished:
+                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))reportHandler
+{
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::SetpointChangeSource::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriod::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSetpointChangeSourceWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsExtremeOverVoltagePeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                          endpoint:(NSNumber *)endpoint
+                                                             queue:(dispatch_queue_t)queue
+                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::SetpointChangeSource::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriod::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -69901,61 +67014,95 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeSetpointChangeAmountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsExtremeUnderVoltagePeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Thermostat::Attributes::SetpointChangeAmount::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriod::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributeRmsExtremeUnderVoltagePeriodWithValue:(NSNumber * _Nonnull)value
+                                          completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeRmsExtremeUnderVoltagePeriodWithValue:(NSNumber * _Nonnull) value
+                                                       params:nil
+                                            completionHandler:completionHandler];
+}
+- (void)writeAttributeRmsExtremeUnderVoltagePeriodWithValue:(NSNumber * _Nonnull)value
+                                                     params:(CHIPWriteParams * _Nullable)params
+                                          completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriod::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeSetpointChangeAmountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsExtremeUnderVoltagePeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                              subscriptionEstablished:
+                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::SetpointChangeAmount::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriod::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSetpointChangeAmountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsExtremeUnderVoltagePeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                           endpoint:(NSNumber *)endpoint
+                                                              queue:(dispatch_queue_t)queue
+                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::SetpointChangeAmount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriod::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -69965,60 +67112,92 @@ new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeSetpointChangeSourceTimestampWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsVoltageSagPeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::SetpointChangeSourceTimestamp::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSagPeriod::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeSetpointChangeSourceTimestampWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                params:(CHIPSubscribeParams * _Nullable)params
-                                               subscriptionEstablished:
-                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))reportHandler
+- (void)writeAttributeRmsVoltageSagPeriodWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeRmsVoltageSagPeriodWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeRmsVoltageSagPeriodWithValue:(NSNumber * _Nonnull)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSagPeriod::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeRmsVoltageSagPeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::SetpointChangeSourceTimestamp::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSagPeriod::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSetpointChangeSourceTimestampWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                            endpoint:(NSNumber *)endpoint
-                                                               queue:(dispatch_queue_t)queue
-                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsVoltageSagPeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::SetpointChangeSourceTimestamp::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSagPeriod::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -70028,25 +67207,25 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeOccupiedSetbackWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsVoltageSwellPeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Thermostat::Attributes::OccupiedSetback::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriod::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)writeAttributeOccupiedSetbackWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsVoltageSwellPeriodWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeOccupiedSetbackWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+    [self writeAttributeRmsVoltageSwellPeriodWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeOccupiedSetbackWithValue:(NSNumber * _Nullable)value
-                                        params:(CHIPWriteParams * _Nullable)params
-                             completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsVoltageSwellPeriodWithValue:(NSNumber * _Nonnull)value
+                                              params:(CHIPWriteParams * _Nullable)params
+                                   completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -70062,14 +67241,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::OccupiedSetback::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriod::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -70077,48 +67251,49 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeOccupiedSetbackWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsVoltageSwellPeriodWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::OccupiedSetback::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriod::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOccupiedSetbackWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsVoltageSwellPeriodWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::OccupiedSetback::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriod::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -70128,60 +67303,60 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeOccupiedSetbackMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler
+- (void)readAttributeAcVoltageMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Thermostat::Attributes::OccupiedSetbackMin::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::AcVoltageMultiplier::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeOccupiedSetbackMinWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcVoltageMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::OccupiedSetbackMin::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::AcVoltageMultiplier::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOccupiedSetbackMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcVoltageMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::OccupiedSetbackMin::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcVoltageMultiplier::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -70191,60 +67366,59 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeOccupiedSetbackMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler
+- (void)readAttributeAcVoltageDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Thermostat::Attributes::OccupiedSetbackMax::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::AcVoltageDivisor::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeOccupiedSetbackMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcVoltageDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::OccupiedSetbackMax::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::AcVoltageDivisor::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOccupiedSetbackMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcVoltageDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::OccupiedSetbackMax::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcVoltageDivisor::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -70254,97 +67428,122 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeUnoccupiedSetbackWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeAcCurrentMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Thermostat::Attributes::UnoccupiedSetback::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::AcCurrentMultiplier::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)writeAttributeUnoccupiedSetbackWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeAcCurrentMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeUnoccupiedSetbackWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ElectricalMeasurement::Attributes::AcCurrentMultiplier::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
-- (void)writeAttributeUnoccupiedSetbackWithValue:(NSNumber * _Nullable)value
-                                          params:(CHIPWriteParams * _Nullable)params
-                               completionHandler:(StatusCompletion)completionHandler
+
++ (void)readAttributeAcCurrentMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcCurrentMultiplier::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
 
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::UnoccupiedSetback::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+- (void)readAttributeAcCurrentDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::AcCurrentDivisor::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeUnoccupiedSetbackWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcCurrentDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::UnoccupiedSetback::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::AcCurrentDivisor::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeUnoccupiedSetbackWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcCurrentDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::UnoccupiedSetback::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcCurrentDivisor::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -70354,61 +67553,59 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeUnoccupiedSetbackMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeAcPowerMultiplierWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Thermostat::Attributes::UnoccupiedSetbackMin::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::AcPowerMultiplier::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeUnoccupiedSetbackMinWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcPowerMultiplierWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::UnoccupiedSetbackMin::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::AcPowerMultiplier::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeUnoccupiedSetbackMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcPowerMultiplierWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::UnoccupiedSetbackMin::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcPowerMultiplier::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -70418,61 +67615,59 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeUnoccupiedSetbackMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeAcPowerDivisorWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Thermostat::Attributes::UnoccupiedSetbackMax::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::AcPowerDivisor::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeUnoccupiedSetbackMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcPowerDivisorWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::UnoccupiedSetbackMax::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::AcPowerDivisor::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeUnoccupiedSetbackMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcPowerDivisorWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::UnoccupiedSetbackMax::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcPowerDivisor::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -70482,22 +67677,22 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeEmergencyHeatDeltaWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeOverloadAlarmsMaskWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                  NSError * _Nullable error))completionHandler
 {
     new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::EmergencyHeatDelta::TypeInfo;
+        using TypeInfo = ElectricalMeasurement::Attributes::OverloadAlarmsMask::TypeInfo;
         auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeEmergencyHeatDeltaWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOverloadAlarmsMaskWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeEmergencyHeatDeltaWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self writeAttributeOverloadAlarmsMaskWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeEmergencyHeatDeltaWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeOverloadAlarmsMaskWithValue:(NSNumber * _Nonnull)value
                                            params:(CHIPWriteParams * _Nullable)params
                                 completionHandler:(StatusCompletion)completionHandler
 {
@@ -70515,7 +67710,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::EmergencyHeatDelta::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::OverloadAlarmsMask::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -70525,7 +67720,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeEmergencyHeatDeltaWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeOverloadAlarmsMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
                                                      params:(CHIPSubscribeParams * _Nullable)params
                                     subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
@@ -70539,7 +67734,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::EmergencyHeatDelta::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::OverloadAlarmsMask::TypeInfo;
             auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -70551,7 +67746,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeEmergencyHeatDeltaWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeOverloadAlarmsMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                  endpoint:(NSNumber *)endpoint
                                                     queue:(dispatch_queue_t)queue
                                         completionHandler:
@@ -70560,7 +67755,7 @@ + (void)readAttributeEmergencyHeatDeltaWithAttributeCache:(CHIPAttributeCacheCon
     new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::EmergencyHeatDelta::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::OverloadAlarmsMask::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -70576,88 +67771,121 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeACTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeVoltageOverloadWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::ACType::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::VoltageOverload::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeACTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeVoltageOverloadWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self writeAttributeACTypeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ElectricalMeasurement::Attributes::VoltageOverload::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
-- (void)writeAttributeACTypeWithValue:(NSNumber * _Nonnull)value
-                               params:(CHIPWriteParams * _Nullable)params
-                    completionHandler:(StatusCompletion)completionHandler
+
++ (void)readAttributeVoltageOverloadWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ElectricalMeasurement::Attributes::VoltageOverload::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
 
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::ACType::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
+- (void)readAttributeCurrentOverloadWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::CurrentOverload::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeACTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                         params:(CHIPSubscribeParams * _Nullable)params
-                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCurrentOverloadWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::ACType::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::CurrentOverload::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeACTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                     endpoint:(NSNumber *)endpoint
-                                        queue:(dispatch_queue_t)queue
-                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCurrentOverloadWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::ACType::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::CurrentOverload::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -70667,24 +67895,24 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeACCapacityWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAcOverloadAlarmsMaskWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::ACCapacity::TypeInfo;
+        using TypeInfo = ElectricalMeasurement::Attributes::AcOverloadAlarmsMask::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeACCapacityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcOverloadAlarmsMaskWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeACCapacityWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self writeAttributeAcOverloadAlarmsMaskWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeACCapacityWithValue:(NSNumber * _Nonnull)value
-                                   params:(CHIPWriteParams * _Nullable)params
-                        completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcOverloadAlarmsMaskWithValue:(NSNumber * _Nonnull)value
+                                             params:(CHIPWriteParams * _Nullable)params
+                                  completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -70700,7 +67928,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::ACCapacity::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcOverloadAlarmsMask::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -70710,11 +67938,13 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeACCapacityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcOverloadAlarmsMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -70723,7 +67953,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::ACCapacity::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcOverloadAlarmsMask::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -70735,15 +67965,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeACCapacityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcOverloadAlarmsMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::ACCapacity::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcOverloadAlarmsMask::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -70759,91 +67990,59 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeACRefrigerantTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeAcVoltageOverloadWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::ACRefrigerantType::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::AcVoltageOverload::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeACRefrigerantTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeACRefrigerantTypeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeACRefrigerantTypeWithValue:(NSNumber * _Nonnull)value
-                                          params:(CHIPWriteParams * _Nullable)params
-                               completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::ACRefrigerantType::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeACRefrigerantTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeAcVoltageOverloadWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(CHIPSubscribeParams * _Nullable)params
                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                              reportHandler:
                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::ACRefrigerantType::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::AcVoltageOverload::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeACRefrigerantTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeAcVoltageOverloadWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                 endpoint:(NSNumber *)endpoint
                                                    queue:(dispatch_queue_t)queue
                                        completionHandler:
                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::ACRefrigerantType::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcVoltageOverload::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -70853,91 +68052,59 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeACCompressorTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeAcCurrentOverloadWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::ACCompressorType::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::AcCurrentOverload::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeACCompressorTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeACCompressorTypeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeACCompressorTypeWithValue:(NSNumber * _Nonnull)value
-                                         params:(CHIPWriteParams * _Nullable)params
-                              completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::ACCompressorType::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeACCompressorTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcCurrentOverloadWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::ACCompressorType::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::AcCurrentOverload::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeACCompressorTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcCurrentOverloadWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::ACCompressorType::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcCurrentOverload::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -70947,90 +68114,60 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeACErrorCodeWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAcActivePowerOverloadWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::ACErrorCode::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::AcActivePowerOverload::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeACErrorCodeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeACErrorCodeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeACErrorCodeWithValue:(NSNumber * _Nonnull)value
-                                    params:(CHIPWriteParams * _Nullable)params
-                         completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::ACErrorCode::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeACErrorCodeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcActivePowerOverloadWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::ACErrorCode::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::AcActivePowerOverload::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeACErrorCodeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcActivePowerOverloadWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::ACErrorCode::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcActivePowerOverload::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -71040,91 +68177,60 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeACLouverPositionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeAcReactivePowerOverloadWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::ACLouverPosition::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::AcReactivePowerOverload::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeACLouverPositionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeACLouverPositionWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeACLouverPositionWithValue:(NSNumber * _Nonnull)value
-                                         params:(CHIPWriteParams * _Nullable)params
-                              completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::ACLouverPosition::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeACLouverPositionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAcReactivePowerOverloadWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                          params:(CHIPSubscribeParams * _Nullable)params
+                                         subscriptionEstablished:
+                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::ACLouverPosition::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::AcReactivePowerOverload::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeACLouverPositionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAcReactivePowerOverloadWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                      endpoint:(NSNumber *)endpoint
+                                                         queue:(dispatch_queue_t)queue
+                                             completionHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::ACLouverPosition::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcReactivePowerOverload::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -71134,60 +68240,60 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeACCoilTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeAverageRmsOverVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Thermostat::Attributes::ACCoilTemperature::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsOverVoltage::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeACCoilTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAverageRmsOverVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::ACCoilTemperature::TypeInfo;
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsOverVoltage::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeACCoilTemperatureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAverageRmsOverVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::ACCoilTemperature::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsOverVoltage::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -71197,91 +68303,60 @@ new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeACCapacityformatWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeAverageRmsUnderVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::ACCapacityformat::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltage::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeACCapacityformatWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeACCapacityformatWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeACCapacityformatWithValue:(NSNumber * _Nonnull)value
-                                         params:(CHIPWriteParams * _Nullable)params
-                              completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::ACCapacityformat::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeACCapacityformatWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAverageRmsUnderVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:
+                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::ACCapacityformat::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltage::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeACCapacityformatWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAverageRmsUnderVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::ACCapacityformat::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltage::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -71291,250 +68366,247 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsExtremeOverVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPThermostatGeneratedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Thermostat::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<ThermostatGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltage::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsExtremeOverVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPThermostatGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<ThermostatGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltage::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPThermostatGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsExtremeOverVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPThermostatGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = Thermostat::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ThermostatGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltage::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsExtremeUnderVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
-    new CHIPThermostatAcceptedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Thermostat::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<ThermostatAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltage::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsExtremeUnderVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                         params:(CHIPSubscribeParams * _Nullable)params
+                                        subscriptionEstablished:
+                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                  reportHandler:
+                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPThermostatAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<ThermostatAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltage::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPThermostatAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsExtremeUnderVoltageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                     endpoint:(NSNumber *)endpoint
+                                                        queue:(dispatch_queue_t)queue
+                                            completionHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPThermostatAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = Thermostat::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ThermostatAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltage::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsVoltageSagWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPThermostatAttributeListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = Thermostat::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<ThermostatAttributeListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSag::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeRmsVoltageSagWithMinInterval:(NSNumber * _Nonnull)minInterval
                                            maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(CHIPSubscribeParams * _Nullable)params
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPThermostatAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<ThermostatAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSag::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPThermostatAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeRmsVoltageSagWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                             endpoint:(NSNumber *)endpoint
                                                queue:(dispatch_queue_t)queue
                                    completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPThermostatAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = Thermostat::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ThermostatAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSag::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsVoltageSwellWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwell::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsVoltageSwellWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwell::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsVoltageSwellWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwell::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -71544,23 +68616,23 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeLineCurrentPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = Thermostat::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = ElectricalMeasurement::Attributes::LineCurrentPhaseB::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeLineCurrentPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -71569,7 +68641,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = Thermostat::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::LineCurrentPhaseB::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -71581,16 +68653,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeLineCurrentPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = Thermostat::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::LineCurrentPhaseB::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -71606,102 +68678,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPThermostatUserInterfaceConfiguration
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)readAttributeTemperatureDisplayModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
+- (void)readAttributeActiveCurrentPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::TemperatureDisplayMode::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::ActiveCurrentPhaseB::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeTemperatureDisplayModeWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeTemperatureDisplayModeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeTemperatureDisplayModeWithValue:(NSNumber * _Nonnull)value
-                                               params:(CHIPWriteParams * _Nullable)params
-                                    completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::TemperatureDisplayMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeTemperatureDisplayModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:
-                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeActiveCurrentPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::TemperatureDisplayMode::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::ActiveCurrentPhaseB::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTemperatureDisplayModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeActiveCurrentPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::TemperatureDisplayMode::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ActiveCurrentPhaseB::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -71711,91 +68741,60 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeKeypadLockoutWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeReactiveCurrentPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::KeypadLockout::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::ReactiveCurrentPhaseB::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeKeypadLockoutWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeKeypadLockoutWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
-}
-- (void)writeAttributeKeypadLockoutWithValue:(NSNumber * _Nonnull)value
-                                      params:(CHIPWriteParams * _Nullable)params
-                           completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::KeypadLockout::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeKeypadLockoutWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeReactiveCurrentPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::KeypadLockout::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::ReactiveCurrentPhaseB::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeKeypadLockoutWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeReactiveCurrentPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::KeypadLockout::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ReactiveCurrentPhaseB::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -71805,95 +68804,59 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeScheduleProgrammingVisibilityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsVoltagePhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::TypeInfo;
-        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltagePhaseB::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)writeAttributeScheduleProgrammingVisibilityWithValue:(NSNumber * _Nonnull)value
-                                           completionHandler:(StatusCompletion)completionHandler
-{
-    [self writeAttributeScheduleProgrammingVisibilityWithValue:(NSNumber * _Nonnull) value
-                                                        params:nil
-                                             completionHandler:completionHandler];
-}
-- (void)writeAttributeScheduleProgrammingVisibilityWithValue:(NSNumber * _Nonnull)value
-                                                      params:(CHIPWriteParams * _Nullable)params
-                                           completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedWriteTimeoutMs;
-    if (params != nil) {
-        if (params.timedWriteTimeoutMs != nil) {
-            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(
-                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
-        });
-}
-
-- (void)subscribeAttributeScheduleProgrammingVisibilityWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                params:(CHIPSubscribeParams * _Nullable)params
-                                               subscriptionEstablished:
-                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsVoltagePhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::TypeInfo;
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltagePhaseB::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeScheduleProgrammingVisibilityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                            endpoint:(NSNumber *)endpoint
-                                                               queue:(dispatch_queue_t)queue
-                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsVoltagePhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltagePhaseB::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -71903,264 +68866,185 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
     });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsVoltageMinPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn
-                = Callback<ThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn
-                = Callback<ThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackSubscriptionBridge::
-                    OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<ThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallback>::FromCancelable(
-                        success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
-{
-    new CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn
-                = Callback<ThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMinPhaseB::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeRmsVoltageMinPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(CHIPSubscribeParams * _Nullable)params
                                      subscriptionEstablished:
                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                                reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn
-                = Callback<ThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMinPhaseB::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackSubscriptionBridge::
-                    OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeRmsVoltageMinPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                                   endpoint:(NSNumber *)endpoint
                                                      queue:(dispatch_queue_t)queue
                                          completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<ThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallback>::FromCancelable(
-                        success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMinPhaseB::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsVoltageMaxPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::AttributeList::TypeInfo;
-            auto successFn
-                = Callback<ThermostatUserInterfaceConfigurationAttributeListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMaxPhaseB::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsVoltageMaxPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::AttributeList::TypeInfo;
-            auto successFn
-                = Callback<ThermostatUserInterfaceConfigurationAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMaxPhaseB::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackSubscriptionBridge::
-                    OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsVoltageMaxPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPThermostatUserInterfaceConfigurationAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<ThermostatUserInterfaceConfigurationAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMaxPhaseB::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsCurrentPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentPhaseB::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsCurrentPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentPhaseB::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsCurrentPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentPhaseB::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -72170,23 +69054,24 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsCurrentMinPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMinPhaseB::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsCurrentMinPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -72195,7 +69080,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMinPhaseB::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -72207,16 +69092,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsCurrentMinPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMinPhaseB::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -72232,95 +69117,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPThreadNetworkDiagnostics
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)resetCountsWithCompletionHandler:(StatusCompletion)completionHandler
-{
-    [self resetCountsWithParams:nil completionHandler:completionHandler];
-}
-- (void)resetCountsWithParams:(CHIPThreadNetworkDiagnosticsClusterResetCountsParams * _Nullable)params
-            completionHandler:(StatusCompletion)completionHandler
-{
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    ThreadNetworkDiagnostics::Commands::ResetCounts::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
-        }
-    }
-
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)readAttributeChannelWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsCurrentMaxPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Channel::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMaxPhaseB::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeChannelWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                          params:(CHIPSubscribeParams * _Nullable)params
-                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsCurrentMaxPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Channel::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMaxPhaseB::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeChannelWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                      endpoint:(NSNumber *)endpoint
-                                         queue:(dispatch_queue_t)queue
-                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsCurrentMaxPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Channel::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMaxPhaseB::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -72330,124 +69180,122 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeRoutingRoleWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeActivePowerPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RoutingRole::TypeInfo;
-            auto successFn = Callback<NullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerPhaseB::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeRoutingRoleWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeActivePowerPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RoutingRole::TypeInfo;
-            auto successFn = Callback<NullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerPhaseB::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackSubscriptionBridge::
-                    OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRoutingRoleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeActivePowerPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = ThreadNetworkDiagnostics::Attributes::RoutingRole::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<NullableThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerPhaseB::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeNetworkNameWithCompletionHandler:(void (^)(
-                                                          NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeActivePowerMinPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableCharStringAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::NetworkName::TypeInfo;
-            auto successFn = Callback<NullableCharStringAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMinPhaseB::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeNetworkNameWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeActivePowerMinPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableCharStringAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::NetworkName::TypeInfo;
-            auto successFn = Callback<NullableCharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMinPhaseB::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNetworkNameWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeActivePowerMinPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::NetworkName::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMinPhaseB::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableCharStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -72457,57 +69305,60 @@ new CHIPNullableCharStringAttributeCallbackBridge(queue, completionHandler, ^(Ca
     });
 }
 
-- (void)readAttributePanIdWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeActivePowerMaxPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PanId::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMaxPhaseB::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributePanIdWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                        params:(CHIPSubscribeParams * _Nullable)params
-                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeActivePowerMaxPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PanId::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMaxPhaseB::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePanIdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                    endpoint:(NSNumber *)endpoint
-                                       queue:(dispatch_queue_t)queue
-                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeActivePowerMaxPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PanId::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMaxPhaseB::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -72517,60 +69368,60 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeExtendedPanIdWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeReactivePowerPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt64uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ExtendedPanId::TypeInfo;
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::ReactivePowerPhaseB::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeExtendedPanIdWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeReactivePowerPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ExtendedPanId::TypeInfo;
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::ReactivePowerPhaseB::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeExtendedPanIdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeReactivePowerPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ExtendedPanId::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ReactivePowerPhaseB::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -72580,60 +69431,60 @@ new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeMeshLocalPrefixWithCompletionHandler:(void (^)(
-                                                              NSData * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeApparentPowerPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableOctetStringAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::MeshLocalPrefix::TypeInfo;
-            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::ApparentPowerPhaseB::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeMeshLocalPrefixWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeApparentPowerPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableOctetStringAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::MeshLocalPrefix::TypeInfo;
-            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::ApparentPowerPhaseB::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMeshLocalPrefixWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeApparentPowerPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableOctetStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::MeshLocalPrefix::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ApparentPowerPhaseB::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -72643,58 +69494,59 @@ new CHIPNullableOctetStringAttributeCallbackBridge(queue, completionHandler, ^(C
     });
 }
 
-- (void)readAttributeOverrunCountWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributePowerFactorPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::OverrunCount::TypeInfo;
-        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::PowerFactorPhaseB::TypeInfo;
+        auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeOverrunCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePowerFactorPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt64uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::OverrunCount::TypeInfo;
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::PowerFactorPhaseB::TypeInfo;
+            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOverrunCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePowerFactorPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::OverrunCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::PowerFactorPhaseB::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -72704,187 +69556,124 @@ new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeNeighborTableListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
-{
-    new CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::NeighborTableList::TypeInfo;
-            auto successFn = Callback<ThreadNetworkDiagnosticsNeighborTableListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeNeighborTableListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::NeighborTableList::TypeInfo;
-            auto successFn = Callback<ThreadNetworkDiagnosticsNeighborTableListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeNeighborTableListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPThreadNetworkDiagnosticsNeighborTableListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = ThreadNetworkDiagnostics::Attributes::NeighborTableList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ThreadNetworkDiagnosticsNeighborTableListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeRouteTableListWithCompletionHandler:(void (^)(
-                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAverageRmsVoltageMeasurementPeriodPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                       NSError * _Nullable error))completionHandler
 {
-    new CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RouteTableList::TypeInfo;
-            auto successFn = Callback<ThreadNetworkDiagnosticsRouteTableListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriodPhaseB::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeRouteTableListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAverageRmsVoltageMeasurementPeriodPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
+                                                                                      subscriptionEstablishedHandler
+                                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                      NSError * _Nullable error))reportHandler
 {
-    new CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RouteTableList::TypeInfo;
-            auto successFn = Callback<ThreadNetworkDiagnosticsRouteTableListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriodPhaseB::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRouteTableListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAverageRmsVoltageMeasurementPeriodPhaseBWithAttributeCache:
+            (CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                       endpoint:(NSNumber *)endpoint
+                                                                          queue:(dispatch_queue_t)queue
+                                                              completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPThreadNetworkDiagnosticsRouteTableListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = ThreadNetworkDiagnostics::Attributes::RouteTableList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ThreadNetworkDiagnosticsRouteTableListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriodPhaseB::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributePartitionIdWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAverageRmsOverVoltageCounterPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt32uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PartitionId::TypeInfo;
-            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsOverVoltageCounterPhaseB::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributePartitionIdWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAverageRmsOverVoltageCounterPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                                    subscriptionEstablished:
+                                                        (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                              reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PartitionId::TypeInfo;
-            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsOverVoltageCounterPhaseB::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePartitionIdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAverageRmsOverVoltageCounterPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                 endpoint:(NSNumber *)endpoint
+                                                                    queue:(dispatch_queue_t)queue
+                                                        completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PartitionId::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsOverVoltageCounterPhaseB::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -72894,58 +69683,60 @@ new CHIPNullableInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeWeightingWithCompletionHandler:(void (^)(
-                                                        NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAverageRmsUnderVoltageCounterPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Weighting::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounterPhaseB::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeWeightingWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAverageRmsUnderVoltageCounterPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                                     subscriptionEstablished:
+                                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                               reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                 NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Weighting::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounterPhaseB::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeWeightingWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAverageRmsUnderVoltageCounterPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                  endpoint:(NSNumber *)endpoint
+                                                                     queue:(dispatch_queue_t)queue
+                                                         completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Weighting::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounterPhaseB::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -72955,59 +69746,60 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeDataVersionWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsExtremeOverVoltagePeriodPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::DataVersion::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriodPhaseB::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeDataVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsExtremeOverVoltagePeriodPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                                   subscriptionEstablished:
+                                                       (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                             reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::DataVersion::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriodPhaseB::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDataVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsExtremeOverVoltagePeriodPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                endpoint:(NSNumber *)endpoint
+                                                                   queue:(dispatch_queue_t)queue
+                                                       completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::DataVersion::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriodPhaseB::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -73017,60 +69809,60 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeStableDataVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsExtremeUnderVoltagePeriodPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::StableDataVersion::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriodPhaseB::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeStableDataVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsExtremeUnderVoltagePeriodPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                                    subscriptionEstablished:
+                                                        (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                              reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::StableDataVersion::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriodPhaseB::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeStableDataVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsExtremeUnderVoltagePeriodPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                 endpoint:(NSNumber *)endpoint
+                                                                    queue:(dispatch_queue_t)queue
+                                                        completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::StableDataVersion::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriodPhaseB::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -73080,60 +69872,60 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeLeaderRouterIdWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsVoltageSagPeriodPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::LeaderRouterId::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSagPeriodPhaseB::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeLeaderRouterIdWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsVoltageSagPeriodPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                            params:(CHIPSubscribeParams * _Nullable)params
+                                           subscriptionEstablished:
+                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::LeaderRouterId::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSagPeriodPhaseB::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeLeaderRouterIdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsVoltageSagPeriodPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                        endpoint:(NSNumber *)endpoint
+                                                           queue:(dispatch_queue_t)queue
+                                               completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::LeaderRouterId::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSagPeriodPhaseB::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -73143,23 +69935,24 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeDetachedRoleCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsVoltageSwellPeriodPhaseBWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::DetachedRoleCount::TypeInfo;
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriodPhaseB::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeDetachedRoleCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsVoltageSwellPeriodPhaseBWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                              params:(CHIPSubscribeParams * _Nullable)params
+                                             subscriptionEstablished:
+                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -73168,7 +69961,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::DetachedRoleCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriodPhaseB::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -73180,16 +69973,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDetachedRoleCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsVoltageSwellPeriodPhaseBWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                          endpoint:(NSNumber *)endpoint
+                                                             queue:(dispatch_queue_t)queue
+                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::DetachedRoleCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriodPhaseB::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -73205,23 +69998,23 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeChildRoleCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeLineCurrentPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChildRoleCount::TypeInfo;
+        using TypeInfo = ElectricalMeasurement::Attributes::LineCurrentPhaseC::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeChildRoleCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeLineCurrentPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -73230,7 +70023,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChildRoleCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::LineCurrentPhaseC::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -73242,16 +70035,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeChildRoleCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeLineCurrentPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChildRoleCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::LineCurrentPhaseC::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -73267,59 +70060,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRouterRoleCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeActiveCurrentPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RouterRoleCount::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::ActiveCurrentPhaseC::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRouterRoleCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeActiveCurrentPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RouterRoleCount::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::ActiveCurrentPhaseC::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRouterRoleCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeActiveCurrentPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RouterRoleCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ActiveCurrentPhaseC::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -73329,59 +70123,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeLeaderRoleCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeReactiveCurrentPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::LeaderRoleCount::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::ReactiveCurrentPhaseC::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeLeaderRoleCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeReactiveCurrentPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::LeaderRoleCount::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::ReactiveCurrentPhaseC::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeLeaderRoleCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeReactiveCurrentPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::LeaderRoleCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ReactiveCurrentPhaseC::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -73391,23 +70186,23 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeAttachAttemptCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsVoltagePhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::AttachAttemptCount::TypeInfo;
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltagePhaseC::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeAttachAttemptCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsVoltagePhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -73416,7 +70211,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::AttachAttemptCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltagePhaseC::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -73428,16 +70223,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttachAttemptCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsVoltagePhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::AttachAttemptCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltagePhaseC::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -73453,24 +70248,24 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributePartitionIdChangeCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsVoltageMinPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::PartitionIdChangeCount::TypeInfo;
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMinPhaseC::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributePartitionIdChangeCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:
-                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsVoltageMinPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -73479,7 +70274,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PartitionIdChangeCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMinPhaseC::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -73491,16 +70286,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePartitionIdChangeCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsVoltageMinPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PartitionIdChangeCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMinPhaseC::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -73516,24 +70311,24 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeBetterPartitionAttachAttemptCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsVoltageMaxPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::BetterPartitionAttachAttemptCount::TypeInfo;
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMaxPhaseC::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeBetterPartitionAttachAttemptCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                                   subscriptionEstablished:
-                                                       (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                             reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsVoltageMaxPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -73542,7 +70337,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::BetterPartitionAttachAttemptCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMaxPhaseC::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -73554,16 +70349,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBetterPartitionAttachAttemptCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                                endpoint:(NSNumber *)endpoint
-                                                                   queue:(dispatch_queue_t)queue
-                                                       completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsVoltageMaxPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::BetterPartitionAttachAttemptCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMaxPhaseC::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -73579,23 +70374,23 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeParentChangeCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsCurrentPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::ParentChangeCount::TypeInfo;
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentPhaseC::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeParentChangeCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsCurrentPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -73604,7 +70399,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ParentChangeCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentPhaseC::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -73616,16 +70411,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeParentChangeCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsCurrentPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ParentChangeCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentPhaseC::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -73641,58 +70436,60 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeTxTotalCountWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsCurrentMinPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxTotalCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMinPhaseC::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeTxTotalCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsCurrentMinPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxTotalCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMinPhaseC::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTxTotalCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsCurrentMinPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxTotalCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMinPhaseC::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -73702,59 +70499,60 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeTxUnicastCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsCurrentMaxPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxUnicastCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMaxPhaseC::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeTxUnicastCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsCurrentMaxPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxUnicastCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMaxPhaseC::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTxUnicastCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsCurrentMaxPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxUnicastCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMaxPhaseC::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -73764,59 +70562,59 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeTxBroadcastCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeActivePowerPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxBroadcastCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerPhaseC::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeTxBroadcastCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeActivePowerPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxBroadcastCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerPhaseC::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTxBroadcastCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeActivePowerPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxBroadcastCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerPhaseC::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -73826,60 +70624,60 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeTxAckRequestedCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeActivePowerMinPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxAckRequestedCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMinPhaseC::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeTxAckRequestedCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeActivePowerMinPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxAckRequestedCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMinPhaseC::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTxAckRequestedCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeActivePowerMinPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxAckRequestedCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMinPhaseC::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -73889,58 +70687,60 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeTxAckedCountWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeActivePowerMaxPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxAckedCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMaxPhaseC::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeTxAckedCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeActivePowerMaxPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxAckedCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMaxPhaseC::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTxAckedCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeActivePowerMaxPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxAckedCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMaxPhaseC::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -73950,60 +70750,60 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeTxNoAckRequestedCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler
+- (void)readAttributeReactivePowerPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxNoAckRequestedCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::ReactivePowerPhaseC::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeTxNoAckRequestedCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeReactivePowerPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxNoAckRequestedCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::ReactivePowerPhaseC::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTxNoAckRequestedCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeReactivePowerPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxNoAckRequestedCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ReactivePowerPhaseC::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -74013,58 +70813,60 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeTxDataCountWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeApparentPowerPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxDataCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::ApparentPowerPhaseC::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeTxDataCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeApparentPowerPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxDataCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::ApparentPowerPhaseC::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTxDataCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeApparentPowerPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxDataCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ApparentPowerPhaseC::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -74074,59 +70876,59 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeTxDataPollCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributePowerFactorPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxDataPollCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::PowerFactorPhaseC::TypeInfo;
+        auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeTxDataPollCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributePowerFactorPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt8sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxDataPollCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::PowerFactorPhaseC::TypeInfo;
+            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTxDataPollCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributePowerFactorPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxDataPollCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::PowerFactorPhaseC::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -74136,59 +70938,61 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeTxBeaconCountWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAverageRmsVoltageMeasurementPeriodPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                       NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxBeaconCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriodPhaseC::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeTxBeaconCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAverageRmsVoltageMeasurementPeriodPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                           params:(CHIPSubscribeParams * _Nullable)params
+                                                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)
+                                                                                      subscriptionEstablishedHandler
+                                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                      NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxBeaconCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriodPhaseC::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTxBeaconCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAverageRmsVoltageMeasurementPeriodPhaseCWithAttributeCache:
+            (CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                       endpoint:(NSNumber *)endpoint
+                                                                          queue:(dispatch_queue_t)queue
+                                                              completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxBeaconCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriodPhaseC::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -74198,60 +71002,60 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeTxBeaconRequestCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeAverageRmsOverVoltageCounterPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxBeaconRequestCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsOverVoltageCounterPhaseC::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeTxBeaconRequestCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAverageRmsOverVoltageCounterPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                                    subscriptionEstablished:
+                                                        (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                              reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxBeaconRequestCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsOverVoltageCounterPhaseC::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTxBeaconRequestCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAverageRmsOverVoltageCounterPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                 endpoint:(NSNumber *)endpoint
+                                                                    queue:(dispatch_queue_t)queue
+                                                        completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxBeaconRequestCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsOverVoltageCounterPhaseC::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -74261,58 +71065,60 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeTxOtherCountWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeAverageRmsUnderVoltageCounterPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxOtherCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounterPhaseC::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeTxOtherCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeAverageRmsUnderVoltageCounterPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                                     subscriptionEstablished:
+                                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                               reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                 NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxOtherCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounterPhaseC::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTxOtherCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeAverageRmsUnderVoltageCounterPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                  endpoint:(NSNumber *)endpoint
+                                                                     queue:(dispatch_queue_t)queue
+                                                         completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxOtherCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounterPhaseC::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -74322,58 +71128,60 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeTxRetryCountWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsExtremeOverVoltagePeriodPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxRetryCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriodPhaseC::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeTxRetryCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsExtremeOverVoltagePeriodPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                                   subscriptionEstablished:
+                                                       (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                             reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                               NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxRetryCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriodPhaseC::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTxRetryCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsExtremeOverVoltagePeriodPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                endpoint:(NSNumber *)endpoint
+                                                                   queue:(dispatch_queue_t)queue
+                                                       completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxRetryCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriodPhaseC::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -74383,60 +71191,60 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeTxDirectMaxRetryExpiryCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                          NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsExtremeUnderVoltagePeriodPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxDirectMaxRetryExpiryCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriodPhaseC::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeTxDirectMaxRetryExpiryCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                              params:(CHIPSubscribeParams * _Nullable)params
-                                             subscriptionEstablished:
-                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeRmsExtremeUnderVoltagePeriodPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                                    subscriptionEstablished:
+                                                        (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                              reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                                NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxDirectMaxRetryExpiryCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriodPhaseC::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTxDirectMaxRetryExpiryCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                          endpoint:(NSNumber *)endpoint
-                                                             queue:(dispatch_queue_t)queue
-                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
++ (void)readAttributeRmsExtremeUnderVoltagePeriodPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                                 endpoint:(NSNumber *)endpoint
+                                                                    queue:(dispatch_queue_t)queue
+                                                        completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxDirectMaxRetryExpiryCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriodPhaseC::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -74446,247 +71254,1809 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeTxIndirectMaxRetryExpiryCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler
+- (void)readAttributeRmsVoltageSagPeriodPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSagPeriodPhaseC::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeRmsVoltageSagPeriodPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                            params:(CHIPSubscribeParams * _Nullable)params
+                                           subscriptionEstablished:
+                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))reportHandler
+{
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSagPeriodPhaseC::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeRmsVoltageSagPeriodPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                        endpoint:(NSNumber *)endpoint
+                                                           queue:(dispatch_queue_t)queue
+                                               completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                     NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSagPeriodPhaseC::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeRmsVoltageSwellPeriodPhaseCWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriodPhaseC::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeRmsVoltageSwellPeriodPhaseCWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                              params:(CHIPSubscribeParams * _Nullable)params
+                                             subscriptionEstablished:
+                                                 (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                       reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))reportHandler
+{
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriodPhaseC::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeRmsVoltageSwellPeriodPhaseCWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                          endpoint:(NSNumber *)endpoint
+                                                             queue:(dispatch_queue_t)queue
+                                                 completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                       NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriodPhaseC::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
+{
+    new CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ElectricalMeasurement::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<ElectricalMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ElectricalMeasurement::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<ElectricalMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPElectricalMeasurementGeneratedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = ElectricalMeasurement::Attributes::GeneratedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<ElectricalMeasurementGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
+- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
+{
+    new CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ElectricalMeasurement::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<ElectricalMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ElectricalMeasurement::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<ElectricalMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPElectricalMeasurementAcceptedCommandListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = ElectricalMeasurement::Attributes::AcceptedCommandList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<ElectricalMeasurementAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
+- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
+                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPElectricalMeasurementAttributeListListAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = ElectricalMeasurement::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<ElectricalMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPElectricalMeasurementAttributeListListAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ElectricalMeasurement::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<ElectricalMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPElectricalMeasurementAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPElectricalMeasurementAttributeListListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = ElectricalMeasurement::Attributes::AttributeList::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<ElectricalMeasurementAttributeListListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
+            }
+            return CHIP_ERROR_NOT_FOUND;
+        });
+}
+
+- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
+                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::FeatureMap::TypeInfo;
+        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ElectricalMeasurement::Attributes::FeatureMap::TypeInfo;
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ElectricalMeasurement::Attributes::FeatureMap::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = ElectricalMeasurement::Attributes::ClusterRevision::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = ElectricalMeasurement::Attributes::ClusterRevision::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = ElectricalMeasurement::Attributes::ClusterRevision::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+@end
+
+@implementation CHIPTestCluster
+
+- (chip::Controller::ClusterBase *)getCluster
+{
+    return &_cppCluster;
+}
+
+- (void)testWithCompletionHandler:(StatusCompletion)completionHandler
+{
+    [self testWithParams:nil completionHandler:completionHandler];
+}
+- (void)testWithParams:(CHIPTestClusterClusterTestParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    TestCluster::Commands::Test::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)testNotHandledWithCompletionHandler:(StatusCompletion)completionHandler
+{
+    [self testNotHandledWithParams:nil completionHandler:completionHandler];
+}
+- (void)testNotHandledWithParams:(CHIPTestClusterClusterTestNotHandledParams * _Nullable)params
+               completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    TestCluster::Commands::TestNotHandled::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)testSpecificWithCompletionHandler:(void (^)(CHIPTestClusterClusterTestSpecificResponseParams * _Nullable data,
+                                              NSError * _Nullable error))completionHandler
+{
+    [self testSpecificWithParams:nil completionHandler:completionHandler];
+}
+- (void)testSpecificWithParams:(CHIPTestClusterClusterTestSpecificParams * _Nullable)params
+             completionHandler:(void (^)(CHIPTestClusterClusterTestSpecificResponseParams * _Nullable data,
+                                   NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    TestCluster::Commands::TestSpecific::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPTestClusterClusterTestSpecificResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPTestClusterClusterTestSpecificResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)testUnknownCommandWithCompletionHandler:(StatusCompletion)completionHandler
+{
+    [self testUnknownCommandWithParams:nil completionHandler:completionHandler];
+}
+- (void)testUnknownCommandWithParams:(CHIPTestClusterClusterTestUnknownCommandParams * _Nullable)params
+                   completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    TestCluster::Commands::TestUnknownCommand::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)testAddArgumentsWithParams:(CHIPTestClusterClusterTestAddArgumentsParams *)params
+                 completionHandler:(void (^)(CHIPTestClusterClusterTestAddArgumentsResponseParams * _Nullable data,
+                                       NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    TestCluster::Commands::TestAddArguments::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.arg1 = params.arg1.unsignedCharValue;
+    request.arg2 = params.arg2.unsignedCharValue;
+
+    new CHIPTestClusterClusterTestAddArgumentsResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPTestClusterClusterTestAddArgumentsResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)testSimpleArgumentRequestWithParams:(CHIPTestClusterClusterTestSimpleArgumentRequestParams *)params
+                          completionHandler:(void (^)(CHIPTestClusterClusterTestSimpleArgumentResponseParams * _Nullable data,
+                                                NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    TestCluster::Commands::TestSimpleArgumentRequest::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.arg1 = params.arg1.boolValue;
+
+    new CHIPTestClusterClusterTestSimpleArgumentResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPTestClusterClusterTestSimpleArgumentResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)testStructArrayArgumentRequestWithParams:(CHIPTestClusterClusterTestStructArrayArgumentRequestParams *)params
+                               completionHandler:
+                                   (void (^)(CHIPTestClusterClusterTestStructArrayArgumentResponseParams * _Nullable data,
+                                       NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    TestCluster::Commands::TestStructArrayArgumentRequest::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    {
+        using ListType_0 = std::remove_reference_t<decltype(request.arg1)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        if (params.arg1.count != 0) {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.arg1.count);
+            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return;
+            }
+            listFreer.add(listHolder_0);
+            for (size_t i_0 = 0; i_0 < params.arg1.count; ++i_0) {
+                if (![params.arg1[i_0] isKindOfClass:[CHIPTestClusterClusterNestedStructList class]]) {
+                    // Wrong kind of value.
+                    return;
+                }
+                auto element_0 = (CHIPTestClusterClusterNestedStructList *) params.arg1[i_0];
+                listHolder_0->mList[i_0].a = element_0.a.unsignedCharValue;
+                listHolder_0->mList[i_0].b = element_0.b.boolValue;
+                listHolder_0->mList[i_0].c.a = element_0.c.a.unsignedCharValue;
+                listHolder_0->mList[i_0].c.b = element_0.c.b.boolValue;
+                listHolder_0->mList[i_0].c.c
+                    = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].c.c)>>(element_0.c.c.unsignedCharValue);
+                listHolder_0->mList[i_0].c.d = [self asByteSpan:element_0.c.d];
+                listHolder_0->mList[i_0].c.e = [self asCharSpan:element_0.c.e];
+                listHolder_0->mList[i_0].c.f
+                    = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].c.f)>>(element_0.c.f.unsignedCharValue);
+                listHolder_0->mList[i_0].c.g = element_0.c.g.floatValue;
+                listHolder_0->mList[i_0].c.h = element_0.c.h.doubleValue;
+                {
+                    using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].d)>;
+                    using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
+                    if (element_0.d.count != 0) {
+                        auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.d.count);
+                        if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
+                            return;
+                        }
+                        listFreer.add(listHolder_2);
+                        for (size_t i_2 = 0; i_2 < element_0.d.count; ++i_2) {
+                            if (![element_0.d[i_2] isKindOfClass:[CHIPTestClusterClusterSimpleStruct class]]) {
+                                // Wrong kind of value.
+                                return;
+                            }
+                            auto element_2 = (CHIPTestClusterClusterSimpleStruct *) element_0.d[i_2];
+                            listHolder_2->mList[i_2].a = element_2.a.unsignedCharValue;
+                            listHolder_2->mList[i_2].b = element_2.b.boolValue;
+                            listHolder_2->mList[i_2].c = static_cast<std::remove_reference_t<decltype(listHolder_2->mList[i_2].c)>>(
+                                element_2.c.unsignedCharValue);
+                            listHolder_2->mList[i_2].d = [self asByteSpan:element_2.d];
+                            listHolder_2->mList[i_2].e = [self asCharSpan:element_2.e];
+                            listHolder_2->mList[i_2].f = static_cast<std::remove_reference_t<decltype(listHolder_2->mList[i_2].f)>>(
+                                element_2.f.unsignedCharValue);
+                            listHolder_2->mList[i_2].g = element_2.g.floatValue;
+                            listHolder_2->mList[i_2].h = element_2.h.doubleValue;
+                        }
+                        listHolder_0->mList[i_0].d = ListType_2(listHolder_2->mList, element_0.d.count);
+                    } else {
+                        listHolder_0->mList[i_0].d = ListType_2();
+                    }
+                }
+                {
+                    using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].e)>;
+                    using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
+                    if (element_0.e.count != 0) {
+                        auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.e.count);
+                        if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
+                            return;
+                        }
+                        listFreer.add(listHolder_2);
+                        for (size_t i_2 = 0; i_2 < element_0.e.count; ++i_2) {
+                            if (![element_0.e[i_2] isKindOfClass:[NSNumber class]]) {
+                                // Wrong kind of value.
+                                return;
+                            }
+                            auto element_2 = (NSNumber *) element_0.e[i_2];
+                            listHolder_2->mList[i_2] = element_2.unsignedIntValue;
+                        }
+                        listHolder_0->mList[i_0].e = ListType_2(listHolder_2->mList, element_0.e.count);
+                    } else {
+                        listHolder_0->mList[i_0].e = ListType_2();
+                    }
+                }
+                {
+                    using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].f)>;
+                    using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
+                    if (element_0.f.count != 0) {
+                        auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.f.count);
+                        if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
+                            return;
+                        }
+                        listFreer.add(listHolder_2);
+                        for (size_t i_2 = 0; i_2 < element_0.f.count; ++i_2) {
+                            if (![element_0.f[i_2] isKindOfClass:[NSData class]]) {
+                                // Wrong kind of value.
+                                return;
+                            }
+                            auto element_2 = (NSData *) element_0.f[i_2];
+                            listHolder_2->mList[i_2] = [self asByteSpan:element_2];
+                        }
+                        listHolder_0->mList[i_0].f = ListType_2(listHolder_2->mList, element_0.f.count);
+                    } else {
+                        listHolder_0->mList[i_0].f = ListType_2();
+                    }
+                }
+                {
+                    using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].g)>;
+                    using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
+                    if (element_0.g.count != 0) {
+                        auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.g.count);
+                        if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
+                            return;
+                        }
+                        listFreer.add(listHolder_2);
+                        for (size_t i_2 = 0; i_2 < element_0.g.count; ++i_2) {
+                            if (![element_0.g[i_2] isKindOfClass:[NSNumber class]]) {
+                                // Wrong kind of value.
+                                return;
+                            }
+                            auto element_2 = (NSNumber *) element_0.g[i_2];
+                            listHolder_2->mList[i_2] = element_2.unsignedCharValue;
+                        }
+                        listHolder_0->mList[i_0].g = ListType_2(listHolder_2->mList, element_0.g.count);
+                    } else {
+                        listHolder_0->mList[i_0].g = ListType_2();
+                    }
+                }
+            }
+            request.arg1 = ListType_0(listHolder_0->mList, params.arg1.count);
+        } else {
+            request.arg1 = ListType_0();
+        }
+    }
+    {
+        using ListType_0 = std::remove_reference_t<decltype(request.arg2)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        if (params.arg2.count != 0) {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.arg2.count);
+            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return;
+            }
+            listFreer.add(listHolder_0);
+            for (size_t i_0 = 0; i_0 < params.arg2.count; ++i_0) {
+                if (![params.arg2[i_0] isKindOfClass:[CHIPTestClusterClusterSimpleStruct class]]) {
+                    // Wrong kind of value.
+                    return;
+                }
+                auto element_0 = (CHIPTestClusterClusterSimpleStruct *) params.arg2[i_0];
+                listHolder_0->mList[i_0].a = element_0.a.unsignedCharValue;
+                listHolder_0->mList[i_0].b = element_0.b.boolValue;
+                listHolder_0->mList[i_0].c
+                    = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].c)>>(element_0.c.unsignedCharValue);
+                listHolder_0->mList[i_0].d = [self asByteSpan:element_0.d];
+                listHolder_0->mList[i_0].e = [self asCharSpan:element_0.e];
+                listHolder_0->mList[i_0].f
+                    = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].f)>>(element_0.f.unsignedCharValue);
+                listHolder_0->mList[i_0].g = element_0.g.floatValue;
+                listHolder_0->mList[i_0].h = element_0.h.doubleValue;
+            }
+            request.arg2 = ListType_0(listHolder_0->mList, params.arg2.count);
+        } else {
+            request.arg2 = ListType_0();
+        }
+    }
+    {
+        using ListType_0 = std::remove_reference_t<decltype(request.arg3)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        if (params.arg3.count != 0) {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.arg3.count);
+            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return;
+            }
+            listFreer.add(listHolder_0);
+            for (size_t i_0 = 0; i_0 < params.arg3.count; ++i_0) {
+                if (![params.arg3[i_0] isKindOfClass:[NSNumber class]]) {
+                    // Wrong kind of value.
+                    return;
+                }
+                auto element_0 = (NSNumber *) params.arg3[i_0];
+                listHolder_0->mList[i_0]
+                    = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0])>>(element_0.unsignedCharValue);
+            }
+            request.arg3 = ListType_0(listHolder_0->mList, params.arg3.count);
+        } else {
+            request.arg3 = ListType_0();
+        }
+    }
+    {
+        using ListType_0 = std::remove_reference_t<decltype(request.arg4)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        if (params.arg4.count != 0) {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.arg4.count);
+            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return;
+            }
+            listFreer.add(listHolder_0);
+            for (size_t i_0 = 0; i_0 < params.arg4.count; ++i_0) {
+                if (![params.arg4[i_0] isKindOfClass:[NSNumber class]]) {
+                    // Wrong kind of value.
+                    return;
+                }
+                auto element_0 = (NSNumber *) params.arg4[i_0];
+                listHolder_0->mList[i_0] = element_0.boolValue;
+            }
+            request.arg4 = ListType_0(listHolder_0->mList, params.arg4.count);
+        } else {
+            request.arg4 = ListType_0();
+        }
+    }
+    request.arg5 = static_cast<std::remove_reference_t<decltype(request.arg5)>>(params.arg5.unsignedCharValue);
+    request.arg6 = params.arg6.boolValue;
+
+    new CHIPTestClusterClusterTestStructArrayArgumentResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPTestClusterClusterTestStructArrayArgumentResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)testStructArgumentRequestWithParams:(CHIPTestClusterClusterTestStructArgumentRequestParams *)params
+                          completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
+                                                NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    TestCluster::Commands::TestStructArgumentRequest::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.arg1.a = params.arg1.a.unsignedCharValue;
+    request.arg1.b = params.arg1.b.boolValue;
+    request.arg1.c = static_cast<std::remove_reference_t<decltype(request.arg1.c)>>(params.arg1.c.unsignedCharValue);
+    request.arg1.d = [self asByteSpan:params.arg1.d];
+    request.arg1.e = [self asCharSpan:params.arg1.e];
+    request.arg1.f = static_cast<std::remove_reference_t<decltype(request.arg1.f)>>(params.arg1.f.unsignedCharValue);
+    request.arg1.g = params.arg1.g.floatValue;
+    request.arg1.h = params.arg1.h.doubleValue;
+
+    new CHIPTestClusterClusterBooleanResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPTestClusterClusterBooleanResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)testNestedStructArgumentRequestWithParams:(CHIPTestClusterClusterTestNestedStructArgumentRequestParams *)params
+                                completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
+                                                      NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    TestCluster::Commands::TestNestedStructArgumentRequest::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.arg1.a = params.arg1.a.unsignedCharValue;
+    request.arg1.b = params.arg1.b.boolValue;
+    request.arg1.c.a = params.arg1.c.a.unsignedCharValue;
+    request.arg1.c.b = params.arg1.c.b.boolValue;
+    request.arg1.c.c = static_cast<std::remove_reference_t<decltype(request.arg1.c.c)>>(params.arg1.c.c.unsignedCharValue);
+    request.arg1.c.d = [self asByteSpan:params.arg1.c.d];
+    request.arg1.c.e = [self asCharSpan:params.arg1.c.e];
+    request.arg1.c.f = static_cast<std::remove_reference_t<decltype(request.arg1.c.f)>>(params.arg1.c.f.unsignedCharValue);
+    request.arg1.c.g = params.arg1.c.g.floatValue;
+    request.arg1.c.h = params.arg1.c.h.doubleValue;
+
+    new CHIPTestClusterClusterBooleanResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPTestClusterClusterBooleanResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)testListStructArgumentRequestWithParams:(CHIPTestClusterClusterTestListStructArgumentRequestParams *)params
+                              completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
+                                                    NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    TestCluster::Commands::TestListStructArgumentRequest::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    {
+        using ListType_0 = std::remove_reference_t<decltype(request.arg1)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        if (params.arg1.count != 0) {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.arg1.count);
+            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return;
+            }
+            listFreer.add(listHolder_0);
+            for (size_t i_0 = 0; i_0 < params.arg1.count; ++i_0) {
+                if (![params.arg1[i_0] isKindOfClass:[CHIPTestClusterClusterSimpleStruct class]]) {
+                    // Wrong kind of value.
+                    return;
+                }
+                auto element_0 = (CHIPTestClusterClusterSimpleStruct *) params.arg1[i_0];
+                listHolder_0->mList[i_0].a = element_0.a.unsignedCharValue;
+                listHolder_0->mList[i_0].b = element_0.b.boolValue;
+                listHolder_0->mList[i_0].c
+                    = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].c)>>(element_0.c.unsignedCharValue);
+                listHolder_0->mList[i_0].d = [self asByteSpan:element_0.d];
+                listHolder_0->mList[i_0].e = [self asCharSpan:element_0.e];
+                listHolder_0->mList[i_0].f
+                    = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].f)>>(element_0.f.unsignedCharValue);
+                listHolder_0->mList[i_0].g = element_0.g.floatValue;
+                listHolder_0->mList[i_0].h = element_0.h.doubleValue;
+            }
+            request.arg1 = ListType_0(listHolder_0->mList, params.arg1.count);
+        } else {
+            request.arg1 = ListType_0();
+        }
+    }
+
+    new CHIPTestClusterClusterBooleanResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPTestClusterClusterBooleanResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)testListInt8UArgumentRequestWithParams:(CHIPTestClusterClusterTestListInt8UArgumentRequestParams *)params
+                             completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
+                                                   NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    TestCluster::Commands::TestListInt8UArgumentRequest::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    {
+        using ListType_0 = std::remove_reference_t<decltype(request.arg1)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        if (params.arg1.count != 0) {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.arg1.count);
+            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return;
+            }
+            listFreer.add(listHolder_0);
+            for (size_t i_0 = 0; i_0 < params.arg1.count; ++i_0) {
+                if (![params.arg1[i_0] isKindOfClass:[NSNumber class]]) {
+                    // Wrong kind of value.
+                    return;
+                }
+                auto element_0 = (NSNumber *) params.arg1[i_0];
+                listHolder_0->mList[i_0] = element_0.unsignedCharValue;
+            }
+            request.arg1 = ListType_0(listHolder_0->mList, params.arg1.count);
+        } else {
+            request.arg1 = ListType_0();
+        }
+    }
+
+    new CHIPTestClusterClusterBooleanResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPTestClusterClusterBooleanResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)testNestedStructListArgumentRequestWithParams:(CHIPTestClusterClusterTestNestedStructListArgumentRequestParams *)params
+                                    completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
+                                                          NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    TestCluster::Commands::TestNestedStructListArgumentRequest::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.arg1.a = params.arg1.a.unsignedCharValue;
+    request.arg1.b = params.arg1.b.boolValue;
+    request.arg1.c.a = params.arg1.c.a.unsignedCharValue;
+    request.arg1.c.b = params.arg1.c.b.boolValue;
+    request.arg1.c.c = static_cast<std::remove_reference_t<decltype(request.arg1.c.c)>>(params.arg1.c.c.unsignedCharValue);
+    request.arg1.c.d = [self asByteSpan:params.arg1.c.d];
+    request.arg1.c.e = [self asCharSpan:params.arg1.c.e];
+    request.arg1.c.f = static_cast<std::remove_reference_t<decltype(request.arg1.c.f)>>(params.arg1.c.f.unsignedCharValue);
+    request.arg1.c.g = params.arg1.c.g.floatValue;
+    request.arg1.c.h = params.arg1.c.h.doubleValue;
+    {
+        using ListType_1 = std::remove_reference_t<decltype(request.arg1.d)>;
+        using ListMemberType_1 = ListMemberTypeGetter<ListType_1>::Type;
+        if (params.arg1.d.count != 0) {
+            auto * listHolder_1 = new ListHolder<ListMemberType_1>(params.arg1.d.count);
+            if (listHolder_1 == nullptr || listHolder_1->mList == nullptr) {
+                return;
+            }
+            listFreer.add(listHolder_1);
+            for (size_t i_1 = 0; i_1 < params.arg1.d.count; ++i_1) {
+                if (![params.arg1.d[i_1] isKindOfClass:[CHIPTestClusterClusterSimpleStruct class]]) {
+                    // Wrong kind of value.
+                    return;
+                }
+                auto element_1 = (CHIPTestClusterClusterSimpleStruct *) params.arg1.d[i_1];
+                listHolder_1->mList[i_1].a = element_1.a.unsignedCharValue;
+                listHolder_1->mList[i_1].b = element_1.b.boolValue;
+                listHolder_1->mList[i_1].c
+                    = static_cast<std::remove_reference_t<decltype(listHolder_1->mList[i_1].c)>>(element_1.c.unsignedCharValue);
+                listHolder_1->mList[i_1].d = [self asByteSpan:element_1.d];
+                listHolder_1->mList[i_1].e = [self asCharSpan:element_1.e];
+                listHolder_1->mList[i_1].f
+                    = static_cast<std::remove_reference_t<decltype(listHolder_1->mList[i_1].f)>>(element_1.f.unsignedCharValue);
+                listHolder_1->mList[i_1].g = element_1.g.floatValue;
+                listHolder_1->mList[i_1].h = element_1.h.doubleValue;
+            }
+            request.arg1.d = ListType_1(listHolder_1->mList, params.arg1.d.count);
+        } else {
+            request.arg1.d = ListType_1();
+        }
+    }
+    {
+        using ListType_1 = std::remove_reference_t<decltype(request.arg1.e)>;
+        using ListMemberType_1 = ListMemberTypeGetter<ListType_1>::Type;
+        if (params.arg1.e.count != 0) {
+            auto * listHolder_1 = new ListHolder<ListMemberType_1>(params.arg1.e.count);
+            if (listHolder_1 == nullptr || listHolder_1->mList == nullptr) {
+                return;
+            }
+            listFreer.add(listHolder_1);
+            for (size_t i_1 = 0; i_1 < params.arg1.e.count; ++i_1) {
+                if (![params.arg1.e[i_1] isKindOfClass:[NSNumber class]]) {
+                    // Wrong kind of value.
+                    return;
+                }
+                auto element_1 = (NSNumber *) params.arg1.e[i_1];
+                listHolder_1->mList[i_1] = element_1.unsignedIntValue;
+            }
+            request.arg1.e = ListType_1(listHolder_1->mList, params.arg1.e.count);
+        } else {
+            request.arg1.e = ListType_1();
+        }
+    }
+    {
+        using ListType_1 = std::remove_reference_t<decltype(request.arg1.f)>;
+        using ListMemberType_1 = ListMemberTypeGetter<ListType_1>::Type;
+        if (params.arg1.f.count != 0) {
+            auto * listHolder_1 = new ListHolder<ListMemberType_1>(params.arg1.f.count);
+            if (listHolder_1 == nullptr || listHolder_1->mList == nullptr) {
+                return;
+            }
+            listFreer.add(listHolder_1);
+            for (size_t i_1 = 0; i_1 < params.arg1.f.count; ++i_1) {
+                if (![params.arg1.f[i_1] isKindOfClass:[NSData class]]) {
+                    // Wrong kind of value.
+                    return;
+                }
+                auto element_1 = (NSData *) params.arg1.f[i_1];
+                listHolder_1->mList[i_1] = [self asByteSpan:element_1];
+            }
+            request.arg1.f = ListType_1(listHolder_1->mList, params.arg1.f.count);
+        } else {
+            request.arg1.f = ListType_1();
+        }
+    }
+    {
+        using ListType_1 = std::remove_reference_t<decltype(request.arg1.g)>;
+        using ListMemberType_1 = ListMemberTypeGetter<ListType_1>::Type;
+        if (params.arg1.g.count != 0) {
+            auto * listHolder_1 = new ListHolder<ListMemberType_1>(params.arg1.g.count);
+            if (listHolder_1 == nullptr || listHolder_1->mList == nullptr) {
+                return;
+            }
+            listFreer.add(listHolder_1);
+            for (size_t i_1 = 0; i_1 < params.arg1.g.count; ++i_1) {
+                if (![params.arg1.g[i_1] isKindOfClass:[NSNumber class]]) {
+                    // Wrong kind of value.
+                    return;
+                }
+                auto element_1 = (NSNumber *) params.arg1.g[i_1];
+                listHolder_1->mList[i_1] = element_1.unsignedCharValue;
+            }
+            request.arg1.g = ListType_1(listHolder_1->mList, params.arg1.g.count);
+        } else {
+            request.arg1.g = ListType_1();
+        }
+    }
+
+    new CHIPTestClusterClusterBooleanResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPTestClusterClusterBooleanResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)testListNestedStructListArgumentRequestWithParams:
+            (CHIPTestClusterClusterTestListNestedStructListArgumentRequestParams *)params
+                                        completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
+                                                              NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    TestCluster::Commands::TestListNestedStructListArgumentRequest::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    {
+        using ListType_0 = std::remove_reference_t<decltype(request.arg1)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        if (params.arg1.count != 0) {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.arg1.count);
+            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return;
+            }
+            listFreer.add(listHolder_0);
+            for (size_t i_0 = 0; i_0 < params.arg1.count; ++i_0) {
+                if (![params.arg1[i_0] isKindOfClass:[CHIPTestClusterClusterNestedStructList class]]) {
+                    // Wrong kind of value.
+                    return;
+                }
+                auto element_0 = (CHIPTestClusterClusterNestedStructList *) params.arg1[i_0];
+                listHolder_0->mList[i_0].a = element_0.a.unsignedCharValue;
+                listHolder_0->mList[i_0].b = element_0.b.boolValue;
+                listHolder_0->mList[i_0].c.a = element_0.c.a.unsignedCharValue;
+                listHolder_0->mList[i_0].c.b = element_0.c.b.boolValue;
+                listHolder_0->mList[i_0].c.c
+                    = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].c.c)>>(element_0.c.c.unsignedCharValue);
+                listHolder_0->mList[i_0].c.d = [self asByteSpan:element_0.c.d];
+                listHolder_0->mList[i_0].c.e = [self asCharSpan:element_0.c.e];
+                listHolder_0->mList[i_0].c.f
+                    = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].c.f)>>(element_0.c.f.unsignedCharValue);
+                listHolder_0->mList[i_0].c.g = element_0.c.g.floatValue;
+                listHolder_0->mList[i_0].c.h = element_0.c.h.doubleValue;
+                {
+                    using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].d)>;
+                    using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
+                    if (element_0.d.count != 0) {
+                        auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.d.count);
+                        if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
+                            return;
+                        }
+                        listFreer.add(listHolder_2);
+                        for (size_t i_2 = 0; i_2 < element_0.d.count; ++i_2) {
+                            if (![element_0.d[i_2] isKindOfClass:[CHIPTestClusterClusterSimpleStruct class]]) {
+                                // Wrong kind of value.
+                                return;
+                            }
+                            auto element_2 = (CHIPTestClusterClusterSimpleStruct *) element_0.d[i_2];
+                            listHolder_2->mList[i_2].a = element_2.a.unsignedCharValue;
+                            listHolder_2->mList[i_2].b = element_2.b.boolValue;
+                            listHolder_2->mList[i_2].c = static_cast<std::remove_reference_t<decltype(listHolder_2->mList[i_2].c)>>(
+                                element_2.c.unsignedCharValue);
+                            listHolder_2->mList[i_2].d = [self asByteSpan:element_2.d];
+                            listHolder_2->mList[i_2].e = [self asCharSpan:element_2.e];
+                            listHolder_2->mList[i_2].f = static_cast<std::remove_reference_t<decltype(listHolder_2->mList[i_2].f)>>(
+                                element_2.f.unsignedCharValue);
+                            listHolder_2->mList[i_2].g = element_2.g.floatValue;
+                            listHolder_2->mList[i_2].h = element_2.h.doubleValue;
+                        }
+                        listHolder_0->mList[i_0].d = ListType_2(listHolder_2->mList, element_0.d.count);
+                    } else {
+                        listHolder_0->mList[i_0].d = ListType_2();
+                    }
+                }
+                {
+                    using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].e)>;
+                    using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
+                    if (element_0.e.count != 0) {
+                        auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.e.count);
+                        if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
+                            return;
+                        }
+                        listFreer.add(listHolder_2);
+                        for (size_t i_2 = 0; i_2 < element_0.e.count; ++i_2) {
+                            if (![element_0.e[i_2] isKindOfClass:[NSNumber class]]) {
+                                // Wrong kind of value.
+                                return;
+                            }
+                            auto element_2 = (NSNumber *) element_0.e[i_2];
+                            listHolder_2->mList[i_2] = element_2.unsignedIntValue;
+                        }
+                        listHolder_0->mList[i_0].e = ListType_2(listHolder_2->mList, element_0.e.count);
+                    } else {
+                        listHolder_0->mList[i_0].e = ListType_2();
+                    }
+                }
+                {
+                    using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].f)>;
+                    using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
+                    if (element_0.f.count != 0) {
+                        auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.f.count);
+                        if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
+                            return;
+                        }
+                        listFreer.add(listHolder_2);
+                        for (size_t i_2 = 0; i_2 < element_0.f.count; ++i_2) {
+                            if (![element_0.f[i_2] isKindOfClass:[NSData class]]) {
+                                // Wrong kind of value.
+                                return;
+                            }
+                            auto element_2 = (NSData *) element_0.f[i_2];
+                            listHolder_2->mList[i_2] = [self asByteSpan:element_2];
+                        }
+                        listHolder_0->mList[i_0].f = ListType_2(listHolder_2->mList, element_0.f.count);
+                    } else {
+                        listHolder_0->mList[i_0].f = ListType_2();
+                    }
+                }
+                {
+                    using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].g)>;
+                    using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
+                    if (element_0.g.count != 0) {
+                        auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.g.count);
+                        if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
+                            return;
+                        }
+                        listFreer.add(listHolder_2);
+                        for (size_t i_2 = 0; i_2 < element_0.g.count; ++i_2) {
+                            if (![element_0.g[i_2] isKindOfClass:[NSNumber class]]) {
+                                // Wrong kind of value.
+                                return;
+                            }
+                            auto element_2 = (NSNumber *) element_0.g[i_2];
+                            listHolder_2->mList[i_2] = element_2.unsignedCharValue;
+                        }
+                        listHolder_0->mList[i_0].g = ListType_2(listHolder_2->mList, element_0.g.count);
+                    } else {
+                        listHolder_0->mList[i_0].g = ListType_2();
+                    }
+                }
+            }
+            request.arg1 = ListType_0(listHolder_0->mList, params.arg1.count);
+        } else {
+            request.arg1 = ListType_0();
+        }
+    }
+
+    new CHIPTestClusterClusterBooleanResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPTestClusterClusterBooleanResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)testListInt8UReverseRequestWithParams:(CHIPTestClusterClusterTestListInt8UReverseRequestParams *)params
+                            completionHandler:(void (^)(CHIPTestClusterClusterTestListInt8UReverseResponseParams * _Nullable data,
+                                                  NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    TestCluster::Commands::TestListInt8UReverseRequest::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    {
+        using ListType_0 = std::remove_reference_t<decltype(request.arg1)>;
+        using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+        if (params.arg1.count != 0) {
+            auto * listHolder_0 = new ListHolder<ListMemberType_0>(params.arg1.count);
+            if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return;
+            }
+            listFreer.add(listHolder_0);
+            for (size_t i_0 = 0; i_0 < params.arg1.count; ++i_0) {
+                if (![params.arg1[i_0] isKindOfClass:[NSNumber class]]) {
+                    // Wrong kind of value.
+                    return;
+                }
+                auto element_0 = (NSNumber *) params.arg1[i_0];
+                listHolder_0->mList[i_0] = element_0.unsignedCharValue;
+            }
+            request.arg1 = ListType_0(listHolder_0->mList, params.arg1.count);
+        } else {
+            request.arg1 = ListType_0();
+        }
+    }
+
+    new CHIPTestClusterClusterTestListInt8UReverseResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPTestClusterClusterTestListInt8UReverseResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)testEnumsRequestWithParams:(CHIPTestClusterClusterTestEnumsRequestParams *)params
+                 completionHandler:(void (^)(CHIPTestClusterClusterTestEnumsResponseParams * _Nullable data,
+                                       NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    TestCluster::Commands::TestEnumsRequest::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.arg1 = static_cast<std::remove_reference_t<decltype(request.arg1)>>(params.arg1.unsignedShortValue);
+    request.arg2 = static_cast<std::remove_reference_t<decltype(request.arg2)>>(params.arg2.unsignedCharValue);
+
+    new CHIPTestClusterClusterTestEnumsResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPTestClusterClusterTestEnumsResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)testNullableOptionalRequestWithParams:(CHIPTestClusterClusterTestNullableOptionalRequestParams * _Nullable)params
+                            completionHandler:(void (^)(CHIPTestClusterClusterTestNullableOptionalResponseParams * _Nullable data,
+                                                  NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    TestCluster::Commands::TestNullableOptionalRequest::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    if (params != nil) {
+        if (params.arg1 != nil) {
+            auto & definedValue_0 = request.arg1.Emplace();
+            if (params.arg1 == nil) {
+                definedValue_0.SetNull();
+            } else {
+                auto & nonNullValue_1 = definedValue_0.SetNonNull();
+                nonNullValue_1 = params.arg1.unsignedCharValue;
+            }
+        }
+    }
+
+    new CHIPTestClusterClusterTestNullableOptionalResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPTestClusterClusterTestNullableOptionalResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)testComplexNullableOptionalRequestWithParams:(CHIPTestClusterClusterTestComplexNullableOptionalRequestParams *)params
+                                   completionHandler:
+                                       (void (^)(CHIPTestClusterClusterTestComplexNullableOptionalResponseParams * _Nullable data,
+                                           NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    TestCluster::Commands::TestComplexNullableOptionalRequest::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    if (params.nullableInt == nil) {
+        request.nullableInt.SetNull();
+    } else {
+        auto & nonNullValue_0 = request.nullableInt.SetNonNull();
+        nonNullValue_0 = params.nullableInt.unsignedShortValue;
+    }
+    if (params.optionalInt != nil) {
+        auto & definedValue_0 = request.optionalInt.Emplace();
+        definedValue_0 = params.optionalInt.unsignedShortValue;
+    }
+    if (params.nullableOptionalInt != nil) {
+        auto & definedValue_0 = request.nullableOptionalInt.Emplace();
+        if (params.nullableOptionalInt == nil) {
+            definedValue_0.SetNull();
+        } else {
+            auto & nonNullValue_1 = definedValue_0.SetNonNull();
+            nonNullValue_1 = params.nullableOptionalInt.unsignedShortValue;
+        }
+    }
+    if (params.nullableString == nil) {
+        request.nullableString.SetNull();
+    } else {
+        auto & nonNullValue_0 = request.nullableString.SetNonNull();
+        nonNullValue_0 = [self asCharSpan:params.nullableString];
+    }
+    if (params.optionalString != nil) {
+        auto & definedValue_0 = request.optionalString.Emplace();
+        definedValue_0 = [self asCharSpan:params.optionalString];
+    }
+    if (params.nullableOptionalString != nil) {
+        auto & definedValue_0 = request.nullableOptionalString.Emplace();
+        if (params.nullableOptionalString == nil) {
+            definedValue_0.SetNull();
+        } else {
+            auto & nonNullValue_1 = definedValue_0.SetNonNull();
+            nonNullValue_1 = [self asCharSpan:params.nullableOptionalString];
+        }
+    }
+    if (params.nullableStruct == nil) {
+        request.nullableStruct.SetNull();
+    } else {
+        auto & nonNullValue_0 = request.nullableStruct.SetNonNull();
+        nonNullValue_0.a = params.nullableStruct.a.unsignedCharValue;
+        nonNullValue_0.b = params.nullableStruct.b.boolValue;
+        nonNullValue_0.c
+            = static_cast<std::remove_reference_t<decltype(nonNullValue_0.c)>>(params.nullableStruct.c.unsignedCharValue);
+        nonNullValue_0.d = [self asByteSpan:params.nullableStruct.d];
+        nonNullValue_0.e = [self asCharSpan:params.nullableStruct.e];
+        nonNullValue_0.f
+            = static_cast<std::remove_reference_t<decltype(nonNullValue_0.f)>>(params.nullableStruct.f.unsignedCharValue);
+        nonNullValue_0.g = params.nullableStruct.g.floatValue;
+        nonNullValue_0.h = params.nullableStruct.h.doubleValue;
+    }
+    if (params.optionalStruct != nil) {
+        auto & definedValue_0 = request.optionalStruct.Emplace();
+        definedValue_0.a = params.optionalStruct.a.unsignedCharValue;
+        definedValue_0.b = params.optionalStruct.b.boolValue;
+        definedValue_0.c
+            = static_cast<std::remove_reference_t<decltype(definedValue_0.c)>>(params.optionalStruct.c.unsignedCharValue);
+        definedValue_0.d = [self asByteSpan:params.optionalStruct.d];
+        definedValue_0.e = [self asCharSpan:params.optionalStruct.e];
+        definedValue_0.f
+            = static_cast<std::remove_reference_t<decltype(definedValue_0.f)>>(params.optionalStruct.f.unsignedCharValue);
+        definedValue_0.g = params.optionalStruct.g.floatValue;
+        definedValue_0.h = params.optionalStruct.h.doubleValue;
+    }
+    if (params.nullableOptionalStruct != nil) {
+        auto & definedValue_0 = request.nullableOptionalStruct.Emplace();
+        if (params.nullableOptionalStruct == nil) {
+            definedValue_0.SetNull();
+        } else {
+            auto & nonNullValue_1 = definedValue_0.SetNonNull();
+            nonNullValue_1.a = params.nullableOptionalStruct.a.unsignedCharValue;
+            nonNullValue_1.b = params.nullableOptionalStruct.b.boolValue;
+            nonNullValue_1.c = static_cast<std::remove_reference_t<decltype(nonNullValue_1.c)>>(
+                params.nullableOptionalStruct.c.unsignedCharValue);
+            nonNullValue_1.d = [self asByteSpan:params.nullableOptionalStruct.d];
+            nonNullValue_1.e = [self asCharSpan:params.nullableOptionalStruct.e];
+            nonNullValue_1.f = static_cast<std::remove_reference_t<decltype(nonNullValue_1.f)>>(
+                params.nullableOptionalStruct.f.unsignedCharValue);
+            nonNullValue_1.g = params.nullableOptionalStruct.g.floatValue;
+            nonNullValue_1.h = params.nullableOptionalStruct.h.doubleValue;
+        }
+    }
+    if (params.nullableList == nil) {
+        request.nullableList.SetNull();
+    } else {
+        auto & nonNullValue_0 = request.nullableList.SetNonNull();
+        {
+            using ListType_1 = std::remove_reference_t<decltype(nonNullValue_0)>;
+            using ListMemberType_1 = ListMemberTypeGetter<ListType_1>::Type;
+            if (params.nullableList.count != 0) {
+                auto * listHolder_1 = new ListHolder<ListMemberType_1>(params.nullableList.count);
+                if (listHolder_1 == nullptr || listHolder_1->mList == nullptr) {
+                    return;
+                }
+                listFreer.add(listHolder_1);
+                for (size_t i_1 = 0; i_1 < params.nullableList.count; ++i_1) {
+                    if (![params.nullableList[i_1] isKindOfClass:[NSNumber class]]) {
+                        // Wrong kind of value.
+                        return;
+                    }
+                    auto element_1 = (NSNumber *) params.nullableList[i_1];
+                    listHolder_1->mList[i_1]
+                        = static_cast<std::remove_reference_t<decltype(listHolder_1->mList[i_1])>>(element_1.unsignedCharValue);
+                }
+                nonNullValue_0 = ListType_1(listHolder_1->mList, params.nullableList.count);
+            } else {
+                nonNullValue_0 = ListType_1();
+            }
+        }
+    }
+    if (params.optionalList != nil) {
+        auto & definedValue_0 = request.optionalList.Emplace();
+        {
+            using ListType_1 = std::remove_reference_t<decltype(definedValue_0)>;
+            using ListMemberType_1 = ListMemberTypeGetter<ListType_1>::Type;
+            if (params.optionalList.count != 0) {
+                auto * listHolder_1 = new ListHolder<ListMemberType_1>(params.optionalList.count);
+                if (listHolder_1 == nullptr || listHolder_1->mList == nullptr) {
+                    return;
+                }
+                listFreer.add(listHolder_1);
+                for (size_t i_1 = 0; i_1 < params.optionalList.count; ++i_1) {
+                    if (![params.optionalList[i_1] isKindOfClass:[NSNumber class]]) {
+                        // Wrong kind of value.
+                        return;
+                    }
+                    auto element_1 = (NSNumber *) params.optionalList[i_1];
+                    listHolder_1->mList[i_1]
+                        = static_cast<std::remove_reference_t<decltype(listHolder_1->mList[i_1])>>(element_1.unsignedCharValue);
+                }
+                definedValue_0 = ListType_1(listHolder_1->mList, params.optionalList.count);
+            } else {
+                definedValue_0 = ListType_1();
+            }
+        }
+    }
+    if (params.nullableOptionalList != nil) {
+        auto & definedValue_0 = request.nullableOptionalList.Emplace();
+        if (params.nullableOptionalList == nil) {
+            definedValue_0.SetNull();
+        } else {
+            auto & nonNullValue_1 = definedValue_0.SetNonNull();
+            {
+                using ListType_2 = std::remove_reference_t<decltype(nonNullValue_1)>;
+                using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
+                if (params.nullableOptionalList.count != 0) {
+                    auto * listHolder_2 = new ListHolder<ListMemberType_2>(params.nullableOptionalList.count);
+                    if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
+                        return;
+                    }
+                    listFreer.add(listHolder_2);
+                    for (size_t i_2 = 0; i_2 < params.nullableOptionalList.count; ++i_2) {
+                        if (![params.nullableOptionalList[i_2] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return;
+                        }
+                        auto element_2 = (NSNumber *) params.nullableOptionalList[i_2];
+                        listHolder_2->mList[i_2]
+                            = static_cast<std::remove_reference_t<decltype(listHolder_2->mList[i_2])>>(element_2.unsignedCharValue);
+                    }
+                    nonNullValue_1 = ListType_2(listHolder_2->mList, params.nullableOptionalList.count);
+                } else {
+                    nonNullValue_1 = ListType_2();
+                }
+            }
+        }
+    }
+
+    new CHIPTestClusterClusterTestComplexNullableOptionalResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn
+                = Callback<CHIPTestClusterClusterTestComplexNullableOptionalResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)simpleStructEchoRequestWithParams:(CHIPTestClusterClusterSimpleStructEchoRequestParams *)params
+                        completionHandler:(void (^)(CHIPTestClusterClusterSimpleStructResponseParams * _Nullable data,
+                                              NSError * _Nullable error))completionHandler
+{
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    TestCluster::Commands::SimpleStructEchoRequest::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.arg1.a = params.arg1.a.unsignedCharValue;
+    request.arg1.b = params.arg1.b.boolValue;
+    request.arg1.c = static_cast<std::remove_reference_t<decltype(request.arg1.c)>>(params.arg1.c.unsignedCharValue);
+    request.arg1.d = [self asByteSpan:params.arg1.d];
+    request.arg1.e = [self asCharSpan:params.arg1.e];
+    request.arg1.f = static_cast<std::remove_reference_t<decltype(request.arg1.f)>>(params.arg1.f.unsignedCharValue);
+    request.arg1.g = params.arg1.g.floatValue;
+    request.arg1.h = params.arg1.h.doubleValue;
+
+    new CHIPTestClusterClusterSimpleStructResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPTestClusterClusterSimpleStructResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
+}
+
+- (void)timedInvokeRequestWithCompletionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxIndirectMaxRetryExpiryCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    [self timedInvokeRequestWithParams:nil completionHandler:completionHandler];
 }
-
-- (void)subscribeAttributeTxIndirectMaxRetryExpiryCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                params:(CHIPSubscribeParams * _Nullable)params
-                                               subscriptionEstablished:
-                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))reportHandler
+- (void)timedInvokeRequestWithParams:(CHIPTestClusterClusterTimedInvokeRequestParams * _Nullable)params
+                   completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    TestCluster::Commands::TimedInvokeRequest::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    if (!timedInvokeTimeoutMs.HasValue()) {
+        timedInvokeTimeoutMs.SetValue(10000);
+    }
+
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
         ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxIndirectMaxRetryExpiryCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-+ (void)readAttributeTxIndirectMaxRetryExpiryCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                            endpoint:(NSNumber *)endpoint
-                                                               queue:(dispatch_queue_t)queue
-                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler
+- (void)testSimpleOptionalArgumentRequestWithParams:
+            (CHIPTestClusterClusterTestSimpleOptionalArgumentRequestParams * _Nullable)params
+                                  completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxIndirectMaxRetryExpiryCount::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    TestCluster::Commands::TestSimpleOptionalArgumentRequest::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
+    }
+    if (params != nil) {
+        if (params.arg1 != nil) {
+            auto & definedValue_0 = request.arg1.Emplace();
+            definedValue_0 = params.arg1.boolValue;
+        }
+    }
 
-- (void)readAttributeTxErrCcaCountWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxErrCcaCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPCommandSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable value, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-- (void)subscribeAttributeTxErrCcaCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)testEmitTestEventRequestWithParams:(CHIPTestClusterClusterTestEmitTestEventRequestParams *)params
+                         completionHandler:(void (^)(CHIPTestClusterClusterTestEmitTestEventResponseParams * _Nullable data,
+                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxErrCcaCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    TestCluster::Commands::TestEmitTestEventRequest::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        }
+    }
+    request.arg1 = params.arg1.unsignedCharValue;
+    request.arg2 = static_cast<std::remove_reference_t<decltype(request.arg2)>>(params.arg2.unsignedCharValue);
+    request.arg3 = params.arg3.boolValue;
+
+    new CHIPTestClusterClusterTestEmitTestEventResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn = Callback<CHIPTestClusterClusterTestEmitTestEventResponseCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-+ (void)readAttributeTxErrCcaCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)testEmitTestFabricScopedEventRequestWithParams:(CHIPTestClusterClusterTestEmitTestFabricScopedEventRequestParams *)params
+                                     completionHandler:
+                                         (void (^)(
+                                             CHIPTestClusterClusterTestEmitTestFabricScopedEventResponseParams * _Nullable data,
+                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxErrCcaCount::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedInvokeTimeoutMs;
+    ListFreer listFreer;
+    TestCluster::Commands::TestEmitTestFabricScopedEventRequest::Type request;
+    if (params != nil) {
+        if (params.timedInvokeTimeoutMs != nil) {
+            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+    }
+    request.arg1 = params.arg1.unsignedCharValue;
+
+    new CHIPTestClusterClusterTestEmitTestFabricScopedEventResponseCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            auto successFn
+                = Callback<CHIPTestClusterClusterTestEmitTestFabricScopedEventResponseCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.InvokeCommand(
+                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+        });
 }
 
-- (void)readAttributeTxErrAbortCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeBooleanWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxErrAbortCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::Boolean::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeTxErrAbortCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeBooleanWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxErrAbortCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+    [self writeAttributeBooleanWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-
-+ (void)readAttributeTxErrAbortCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeBooleanWithValue:(NSNumber * _Nonnull)value
+                                params:(CHIPWriteParams * _Nullable)params
+                     completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxErrAbortCount::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
+    }
 
-- (void)readAttributeTxErrBusyChannelCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                    NSError * _Nullable error))completionHandler
-{
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxErrBusyChannelCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::Boolean::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.boolValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
 }
 
-- (void)subscribeAttributeTxErrBusyChannelCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                        params:(CHIPSubscribeParams * _Nullable)params
-                                       subscriptionEstablished:
-                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                 reportHandler:
-                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBooleanWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxErrBusyChannelCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::Boolean::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTxErrBusyChannelCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                    endpoint:(NSNumber *)endpoint
-                                                       queue:(dispatch_queue_t)queue
-                                           completionHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBooleanWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxErrBusyChannelCount::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::Boolean::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -74696,120 +73066,89 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRxTotalCountWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeBitmap8WithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxTotalCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPTestClusterBitmap8AttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::Bitmap8::TypeInfo;
+            auto successFn = Callback<TestClusterBitmap8AttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeRxTotalCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeBitmap8WithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxTotalCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+    [self writeAttributeBitmap8WithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-
-+ (void)readAttributeRxTotalCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeBitmap8WithValue:(NSNumber * _Nonnull)value
+                                params:(CHIPWriteParams * _Nullable)params
+                     completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxTotalCount::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
+    }
 
-- (void)readAttributeRxUnicastCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
-{
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxUnicastCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::Bitmap8::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
 }
 
-- (void)subscribeAttributeRxUnicastCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeBitmap8WithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPTestClusterBitmap8AttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxUnicastCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::Bitmap8::TypeInfo;
+            auto successFn = Callback<TestClusterBitmap8AttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPTestClusterBitmap8AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRxUnicastCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBitmap8WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPTestClusterBitmap8AttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxUnicastCount::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::Bitmap8::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<TestClusterBitmap8AttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -74819,59 +73158,90 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRxBroadcastCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeBitmap16WithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxBroadcastCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPTestClusterBitmap16AttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::Bitmap16::TypeInfo;
+            auto successFn = Callback<TestClusterBitmap16AttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeRxBroadcastCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeBitmap16WithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeBitmap16WithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeBitmap16WithValue:(NSNumber * _Nonnull)value
+                                 params:(CHIPWriteParams * _Nullable)params
+                      completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::Bitmap16::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeBitmap16WithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPTestClusterBitmap16AttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxBroadcastCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::Bitmap16::TypeInfo;
+            auto successFn = Callback<TestClusterBitmap16AttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPTestClusterBitmap16AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRxBroadcastCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBitmap16WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPTestClusterBitmap16AttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxBroadcastCount::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::Bitmap16::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<TestClusterBitmap16AttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -74881,58 +73251,90 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRxDataCountWithCompletionHandler:(void (^)(
-                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeBitmap32WithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDataCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPTestClusterBitmap32AttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::Bitmap32::TypeInfo;
+            auto successFn = Callback<TestClusterBitmap32AttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeRxDataCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeBitmap32WithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeBitmap32WithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeBitmap32WithValue:(NSNumber * _Nonnull)value
+                                 params:(CHIPWriteParams * _Nullable)params
+                      completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::Bitmap32::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedIntValue);
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeBitmap32WithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPTestClusterBitmap32AttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDataCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::Bitmap32::TypeInfo;
+            auto successFn = Callback<TestClusterBitmap32AttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPTestClusterBitmap32AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRxDataCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBitmap32WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPTestClusterBitmap32AttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDataCount::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::Bitmap32::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<TestClusterBitmap32AttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -74942,59 +73344,90 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRxDataPollCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeBitmap64WithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDataPollCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPTestClusterBitmap64AttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::Bitmap64::TypeInfo;
+            auto successFn = Callback<TestClusterBitmap64AttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeRxDataPollCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeBitmap64WithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeBitmap64WithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeBitmap64WithValue:(NSNumber * _Nonnull)value
+                                 params:(CHIPWriteParams * _Nullable)params
+                      completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::Bitmap64::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedLongLongValue);
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeBitmap64WithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPTestClusterBitmap64AttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDataPollCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::Bitmap64::TypeInfo;
+            auto successFn = Callback<TestClusterBitmap64AttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPTestClusterBitmap64AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRxDataPollCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeBitmap64WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPTestClusterBitmap64AttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDataPollCount::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::Bitmap64::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<TestClusterBitmap64AttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -75004,59 +73437,88 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRxBeaconCountWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeInt8uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxBeaconCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::Int8u::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRxBeaconCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeInt8uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeInt8uWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeInt8uWithValue:(NSNumber * _Nonnull)value
+                              params:(CHIPWriteParams * _Nullable)params
+                   completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::Int8u::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeInt8uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                        params:(CHIPSubscribeParams * _Nullable)params
+                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxBeaconCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::Int8u::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRxBeaconCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeInt8uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                    endpoint:(NSNumber *)endpoint
+                                       queue:(dispatch_queue_t)queue
+                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxBeaconCount::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::Int8u::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -75066,60 +73528,88 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRxBeaconRequestCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeInt16uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxBeaconRequestCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::Int16u::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRxBeaconRequestCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeInt16uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeInt16uWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeInt16uWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::Int16u::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeInt16uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxBeaconRequestCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::Int16u::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRxBeaconRequestCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeInt16uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxBeaconRequestCount::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::Int16u::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -75129,22 +73619,53 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRxOtherCountWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeInt24uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxOtherCount::TypeInfo;
+        using TypeInfo = TestCluster::Attributes::Int24u::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRxOtherCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeInt24uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeInt24uWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeInt24uWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::Int24u::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedIntValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeInt24uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -75153,7 +73674,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxOtherCount::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::Int24u::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -75165,16 +73686,15 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRxOtherCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeInt24uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxOtherCount::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::Int24u::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -75190,24 +73710,53 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRxAddressFilteredCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
+- (void)readAttributeInt32uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxAddressFilteredCount::TypeInfo;
+        using TypeInfo = TestCluster::Attributes::Int32u::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRxAddressFilteredCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:
-                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeInt32uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeInt32uWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeInt32uWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::Int32u::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedIntValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeInt32uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -75216,7 +73765,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxAddressFilteredCount::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::Int32u::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -75228,16 +73777,15 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRxAddressFilteredCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeInt32uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxAddressFilteredCount::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::Int32u::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -75253,60 +73801,88 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRxDestAddrFilteredCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
+- (void)readAttributeInt40uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDestAddrFilteredCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::Int40u::TypeInfo;
+        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRxDestAddrFilteredCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler
+- (void)writeAttributeInt40uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeInt40uWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeInt40uWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::Int40u::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedLongLongValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeInt40uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDestAddrFilteredCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::Int40u::TypeInfo;
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRxDestAddrFilteredCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeInt40uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDestAddrFilteredCount::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::Int40u::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -75316,59 +73892,88 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRxDuplicatedCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeInt48uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDuplicatedCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::Int48u::TypeInfo;
+        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRxDuplicatedCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeInt48uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeInt48uWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeInt48uWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::Int48u::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedLongLongValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeInt48uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDuplicatedCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::Int48u::TypeInfo;
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRxDuplicatedCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeInt48uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDuplicatedCount::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::Int48u::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -75378,59 +73983,88 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRxErrNoFrameCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeInt56uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrNoFrameCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::Int56u::TypeInfo;
+        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRxErrNoFrameCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeInt56uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeInt56uWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeInt56uWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::Int56u::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedLongLongValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeInt56uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrNoFrameCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::Int56u::TypeInfo;
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRxErrNoFrameCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeInt56uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrNoFrameCount::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::Int56u::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -75440,60 +74074,88 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRxErrUnknownNeighborCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                        NSError * _Nullable error))completionHandler
+- (void)readAttributeInt64uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrUnknownNeighborCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::Int64u::TypeInfo;
+        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRxErrUnknownNeighborCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                            params:(CHIPSubscribeParams * _Nullable)params
-                                           subscriptionEstablished:
-                                               (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                     reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))reportHandler
+- (void)writeAttributeInt64uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeInt64uWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeInt64uWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::Int64u::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedLongLongValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeInt64uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrUnknownNeighborCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::Int64u::TypeInfo;
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRxErrUnknownNeighborCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                        endpoint:(NSNumber *)endpoint
-                                                           queue:(dispatch_queue_t)queue
-                                               completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
++ (void)readAttributeInt64uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrUnknownNeighborCount::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::Int64u::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -75503,60 +74165,88 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRxErrInvalidSrcAddrCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
+- (void)readAttributeInt8sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrInvalidSrcAddrCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::Int8s::TypeInfo;
+        auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRxErrInvalidSrcAddrCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler
+- (void)writeAttributeInt8sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeInt8sWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeInt8sWithValue:(NSNumber * _Nonnull)value
+                              params:(CHIPWriteParams * _Nullable)params
+                   completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::Int8s::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.charValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeInt8sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                        params:(CHIPSubscribeParams * _Nullable)params
+                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt8sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrInvalidSrcAddrCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::Int8s::TypeInfo;
+            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRxErrInvalidSrcAddrCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeInt8sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                    endpoint:(NSNumber *)endpoint
+                                       queue:(dispatch_queue_t)queue
+                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrInvalidSrcAddrCount::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::Int8s::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -75566,59 +74256,88 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRxErrSecCountWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeInt16sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrSecCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::Int16s::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRxErrSecCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeInt16sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeInt16sWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeInt16sWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::Int16s::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.shortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeInt16sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrSecCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::Int16s::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRxErrSecCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeInt16sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrSecCount::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::Int16s::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -75628,59 +74347,88 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRxErrFcsCountWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeInt24sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrFcsCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::Int24s::TypeInfo;
+        auto successFn = Callback<Int32sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRxErrFcsCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeInt24sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeInt24sWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeInt24sWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::Int24s::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.intValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeInt24sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt32sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrFcsCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::Int24s::TypeInfo;
+            auto successFn = Callback<Int32sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRxErrFcsCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeInt24sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrFcsCount::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::Int24s::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -75690,59 +74438,88 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeRxErrOtherCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeInt32sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrOtherCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt32sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::Int32s::TypeInfo;
+        auto successFn = Callback<Int32sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeRxErrOtherCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeInt32sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeInt32sWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeInt32sWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::Int32s::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.intValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeInt32sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt32sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrOtherCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::Int32s::TypeInfo;
+            auto successFn = Callback<Int32sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRxErrOtherCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeInt32sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt32sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrOtherCount::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::Int32s::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int32sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -75752,60 +74529,88 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeActiveTimestampWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeInt40sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt64uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::TypeInfo;
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+    new CHIPInt64sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::Int40s::TypeInfo;
+        auto successFn = Callback<Int64sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributeInt40sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeInt40sWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeInt40sWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::Int40s::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.longLongValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeActiveTimestampWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeInt40sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
+    new CHIPInt64sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::TypeInfo;
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::Int40s::TypeInfo;
+            auto successFn = Callback<Int64sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeActiveTimestampWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeInt40sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt64sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::Int40s::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int64sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -75815,60 +74620,88 @@ new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributePendingTimestampWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeInt48sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt64uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PendingTimestamp::TypeInfo;
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+    new CHIPInt64sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::Int48s::TypeInfo;
+        auto successFn = Callback<Int64sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributeInt48sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeInt48sWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeInt48sWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::Int48s::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.longLongValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributePendingTimestampWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                            reportHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeInt48sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
+    new CHIPInt64sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PendingTimestamp::TypeInfo;
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::Int48s::TypeInfo;
+            auto successFn = Callback<Int64sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePendingTimestampWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                               endpoint:(NSNumber *)endpoint
-                                                  queue:(dispatch_queue_t)queue
-                                      completionHandler:
-                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeInt48sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt64sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PendingTimestamp::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::Int48s::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int64sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -75878,57 +74711,88 @@ new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeInt56sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt32uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Delay::TypeInfo;
-            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt64sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::Int56s::TypeInfo;
+        auto successFn = Callback<Int64sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributeInt56sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeInt56sWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeInt56sWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::Int56s::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.longLongValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                        params:(CHIPSubscribeParams * _Nullable)params
-                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeInt56sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPInt64sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Delay::TypeInfo;
-            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::Int56s::TypeInfo;
+            auto successFn = Callback<Int64sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeDelayWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                    endpoint:(NSNumber *)endpoint
-                                       queue:(dispatch_queue_t)queue
-                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeInt56sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt64sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Delay::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::Int56s::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int64sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -75938,123 +74802,88 @@ new CHIPNullableInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeSecurityPolicyWithCompletionHandler:
-    (void (^)(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeInt64sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::SecurityPolicy::TypeInfo;
-            auto successFn = Callback<ThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt64sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::Int64s::TypeInfo;
+        auto successFn = Callback<Int64sAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeSecurityPolicyWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value,
-                                                  NSError * _Nullable error))reportHandler
+- (void)writeAttributeInt64sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::SecurityPolicy::TypeInfo;
-            auto successFn = Callback<ThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+    [self writeAttributeInt64sWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-
-+ (void)readAttributeSecurityPolicyWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:(void (^)(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value,
-                                                          NSError * _Nullable error))completionHandler
+- (void)writeAttributeInt64sWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = ThreadNetworkDiagnostics::Attributes::SecurityPolicy::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ThreadNetworkDiagnosticsSecurityPolicyStructAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
 
-- (void)readAttributeChannelMaskWithCompletionHandler:(void (^)(
-                                                          NSData * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableOctetStringAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChannelMask::TypeInfo;
-            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::Int64s::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.longLongValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeChannelMaskWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeInt64sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableOctetStringAttributeCallbackSubscriptionBridge(
+    new CHIPInt64sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChannelMask::TypeInfo;
-            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::Int64s::TypeInfo;
+            auto successFn = Callback<Int64sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeChannelMaskWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeInt64sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableOctetStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt64sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChannelMask::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::Int64s::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int64sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -76064,398 +74893,365 @@ new CHIPNullableOctetStringAttributeCallbackBridge(queue, completionHandler, ^(C
     });
 }
 
-- (void)readAttributeOperationalDatasetComponentsWithCompletionHandler:
-    (void (^)(CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value,
-        NSError * _Nullable error))completionHandler
+- (void)readAttributeEnum8WithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::TypeInfo;
-            auto successFn
-                = Callback<ThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::Enum8::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)
-    subscribeAttributeOperationalDatasetComponentsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:
-                                                        (void (^)(
-                                                            CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value,
-                                                            NSError * _Nullable error))reportHandler
+- (void)writeAttributeEnum8WithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::TypeInfo;
-            auto successFn
-                = Callback<ThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackSubscriptionBridge::
-                    OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+    [self writeAttributeEnum8WithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-
-+ (void)
-    readAttributeOperationalDatasetComponentsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:
-                                                  (void (^)(
-                                                      CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value,
-                                                      NSError * _Nullable error))completionHandler
+- (void)writeAttributeEnum8WithValue:(NSNumber * _Nonnull)value
+                              params:(CHIPWriteParams * _Nullable)params
+                   completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<ThreadNetworkDiagnosticsOperationalDatasetComponentsStructAttributeCallback>::FromCancelable(
-                        success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
 
-- (void)readAttributeActiveNetworkFaultsListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
-{
-    new CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::TypeInfo;
-            auto successFn
-                = Callback<ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback>::FromCancelable(success);
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::Enum8::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeActiveNetworkFaultsListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:
-                                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeEnum8WithMinInterval:(NSNumber * _Nonnull)minInterval
+                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                        params:(CHIPSubscribeParams * _Nullable)params
+                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::TypeInfo;
-            auto successFn
-                = Callback<ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::Enum8::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackSubscriptionBridge::
-                    OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeActiveNetworkFaultsListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeEnum8WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                    endpoint:(NSNumber *)endpoint
+                                       queue:(dispatch_queue_t)queue
+                           completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = TestCluster::Attributes::Enum8::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeEnum16WithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<ThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::Enum16::TypeInfo;
+        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeEnum16WithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<ThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+    [self writeAttributeEnum16WithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeEnum16WithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = ThreadNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<ThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
-{
-    new CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<ThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::Enum16::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeEnum16WithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<ThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::Enum16::TypeInfo;
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeEnum16WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = ThreadNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<ThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = TestCluster::Attributes::Enum16::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeFloatSingleWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<ThreadNetworkDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
+    new CHIPFloatAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::FloatSingle::TypeInfo;
+        auto successFn = Callback<FloatAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributeFloatSingleWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeFloatSingleWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeFloatSingleWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::FloatSingle::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.floatValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeFloatSingleWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPFloatAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<ThreadNetworkDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::FloatSingle::TypeInfo;
+            auto successFn = Callback<FloatAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPFloatAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFloatSingleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPThreadNetworkDiagnosticsAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = ThreadNetworkDiagnostics::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<ThreadNetworkDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPFloatAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = TestCluster::Attributes::FloatSingle::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<FloatAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeFloatDoubleWithCompletionHandler:(void (^)(
+                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPDoubleAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::FloatDouble::TypeInfo;
+        auto successFn = Callback<DoubleAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeFloatDoubleWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeFloatDoubleWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeFloatDoubleWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::FloatDouble::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.doubleValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeFloatDoubleWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPDoubleAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::FloatDouble::TypeInfo;
+            auto successFn = Callback<DoubleAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPDoubleAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeFloatDoubleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPDoubleAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::FloatDouble::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<DoubleAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -76465,59 +75261,90 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeOctetStringWithCompletionHandler:(void (^)(
+                                                          NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = ThreadNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPOctetStringAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::OctetString::TypeInfo;
+            auto successFn = Callback<OctetStringAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeOctetStringWithValue:(NSData * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeOctetStringWithValue:(NSData * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeOctetStringWithValue:(NSData * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::OctetString::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = [self asByteSpan:value];
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeOctetStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPOctetStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::OctetString::TypeInfo;
+            auto successFn = Callback<OctetStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOctetStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPOctetStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::OctetString::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<OctetStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -76527,34 +75354,25 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPTimeFormatLocalization
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)readAttributeHourFormatWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeListInt8uWithCompletionHandler:(void (^)(
+                                                        NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTimeFormatLocalizationClusterHourFormatAttributeCallbackBridge(
+    new CHIPTestClusterListInt8uListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TimeFormatLocalization::Attributes::HourFormat::TypeInfo;
-            auto successFn = Callback<TimeFormatLocalizationClusterHourFormatAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::ListInt8u::TypeInfo;
+            auto successFn = Callback<TestClusterListInt8uListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeHourFormatWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeListInt8uWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeHourFormatWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self writeAttributeListInt8uWithValue:(NSArray * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeHourFormatWithValue:(NSNumber * _Nonnull)value
-                                   params:(CHIPWriteParams * _Nullable)params
-                        completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeListInt8uWithValue:(NSArray * _Nonnull)value
+                                  params:(CHIPWriteParams * _Nullable)params
+                       completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -76570,9 +75388,30 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TimeFormatLocalization::Attributes::HourFormat::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::ListInt8u::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedCharValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -76580,47 +75419,47 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeHourFormatWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeListInt8uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                       maxInterval:(NSNumber * _Nonnull)maxInterval
+                                            params:(CHIPSubscribeParams * _Nullable)params
+                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPTimeFormatLocalizationClusterHourFormatAttributeCallbackSubscriptionBridge(
+    new CHIPTestClusterListInt8uListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TimeFormatLocalization::Attributes::HourFormat::TypeInfo;
-            auto successFn = Callback<TimeFormatLocalizationClusterHourFormatAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::ListInt8u::TypeInfo;
+            auto successFn = Callback<TestClusterListInt8uListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTimeFormatLocalizationClusterHourFormatAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPTestClusterListInt8uListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeHourFormatWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeListInt8uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                        endpoint:(NSNumber *)endpoint
+                                           queue:(dispatch_queue_t)queue
+                               completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTimeFormatLocalizationClusterHourFormatAttributeCallbackBridge(
+    new CHIPTestClusterListInt8uListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = TimeFormatLocalization::Attributes::HourFormat::TypeInfo;
+                using TypeInfo = TestCluster::Attributes::ListInt8u::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TimeFormatLocalizationClusterHourFormatAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<TestClusterListInt8uListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -76630,25 +75469,25 @@ new CHIPTimeFormatLocalizationClusterHourFormatAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeActiveCalendarTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                 NSError * _Nullable error))completionHandler
+- (void)readAttributeListOctetStringWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPTimeFormatLocalizationClusterCalendarTypeAttributeCallbackBridge(
+    new CHIPTestClusterListOctetStringListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TimeFormatLocalization::Attributes::ActiveCalendarType::TypeInfo;
-            auto successFn = Callback<TimeFormatLocalizationClusterCalendarTypeAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::ListOctetString::TypeInfo;
+            auto successFn = Callback<TestClusterListOctetStringListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeActiveCalendarTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeListOctetStringWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeActiveCalendarTypeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self writeAttributeListOctetStringWithValue:(NSArray * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeActiveCalendarTypeWithValue:(NSNumber * _Nonnull)value
-                                           params:(CHIPWriteParams * _Nullable)params
-                                completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeListOctetStringWithValue:(NSArray * _Nonnull)value
+                                        params:(CHIPWriteParams * _Nullable)params
+                             completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -76664,9 +75503,30 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TimeFormatLocalization::Attributes::ActiveCalendarType::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::ListOctetString::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSData class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSData *) value[i_0];
+                        listHolder_0->mList[i_0] = [self asByteSpan:element_0];
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -76674,49 +75534,49 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeActiveCalendarTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                     params:(CHIPSubscribeParams * _Nullable)params
-                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                              reportHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeListOctetStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPTimeFormatLocalizationClusterCalendarTypeAttributeCallbackSubscriptionBridge(
+    new CHIPTestClusterListOctetStringListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TimeFormatLocalization::Attributes::ActiveCalendarType::TypeInfo;
-            auto successFn = Callback<TimeFormatLocalizationClusterCalendarTypeAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::ListOctetString::TypeInfo;
+            auto successFn = Callback<TestClusterListOctetStringListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTimeFormatLocalizationClusterCalendarTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPTestClusterListOctetStringListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeActiveCalendarTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                 endpoint:(NSNumber *)endpoint
-                                                    queue:(dispatch_queue_t)queue
-                                        completionHandler:
-                                            (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeListOctetStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTimeFormatLocalizationClusterCalendarTypeAttributeCallbackBridge(
+    new CHIPTestClusterListOctetStringListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = TimeFormatLocalization::Attributes::ActiveCalendarType::TypeInfo;
+                using TypeInfo = TestCluster::Attributes::ListOctetString::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TimeFormatLocalizationClusterCalendarTypeAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<TestClusterListOctetStringListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -76726,193 +75586,116 @@ new CHIPTimeFormatLocalizationClusterCalendarTypeAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeSupportedCalendarTypesWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
+- (void)readAttributeListStructOctetStringWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackBridge(
+    new CHIPTestClusterListStructOctetStringListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TimeFormatLocalization::Attributes::SupportedCalendarTypes::TypeInfo;
-            auto successFn = Callback<TimeFormatLocalizationSupportedCalendarTypesListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::ListStructOctetString::TypeInfo;
+            auto successFn = Callback<TestClusterListStructOctetStringListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeSupportedCalendarTypesWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:
-                                                      (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = TimeFormatLocalization::Attributes::SupportedCalendarTypes::TypeInfo;
-            auto successFn = Callback<TimeFormatLocalizationSupportedCalendarTypesListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeSupportedCalendarTypesWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeListStructOctetStringWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPTimeFormatLocalizationSupportedCalendarTypesListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = TimeFormatLocalization::Attributes::SupportedCalendarTypes::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<TimeFormatLocalizationSupportedCalendarTypesListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+    [self writeAttributeListStructOctetStringWithValue:(NSArray * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)writeAttributeListStructOctetStringWithValue:(NSArray * _Nonnull)value
+                                              params:(CHIPWriteParams * _Nullable)params
+                                   completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TimeFormatLocalization::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<TimeFormatLocalizationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = TimeFormatLocalization::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<TimeFormatLocalizationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
         },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPTimeFormatLocalizationGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = TimeFormatLocalization::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TimeFormatLocalizationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::ListStructOctetString::TypeInfo;
+            TypeInfo::Type cppValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[CHIPTestClusterClusterTestListStructOctet class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (CHIPTestClusterClusterTestListStructOctet *) value[i_0];
+                        listHolder_0->mList[i_0].member1 = element_0.member1.unsignedLongLongValue;
+                        listHolder_0->mList[i_0].member2 = [self asByteSpan:element_0.member2];
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
                 }
-                return err;
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
-{
-    new CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TimeFormatLocalization::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<TimeFormatLocalizationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeListStructOctetStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPTestClusterListStructOctetStringListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TimeFormatLocalization::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<TimeFormatLocalizationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::ListStructOctetString::TypeInfo;
+            auto successFn = Callback<TestClusterListStructOctetStringListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPTestClusterListStructOctetStringListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeListStructOctetStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPTestClusterListStructOctetStringListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = TimeFormatLocalization::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = TestCluster::Attributes::ListStructOctetString::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TimeFormatLocalizationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<TestClusterListStructOctetStringListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -76922,182 +75705,92 @@ new CHIPTimeFormatLocalizationAcceptedCommandListListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeLongOctetStringWithCompletionHandler:(void (^)(
+                                                              NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPTimeFormatLocalizationAttributeListListAttributeCallbackBridge(
+    new CHIPOctetStringAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = TimeFormatLocalization::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<TimeFormatLocalizationAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::LongOctetString::TypeInfo;
+            auto successFn = Callback<OctetStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPTimeFormatLocalizationAttributeListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = TimeFormatLocalization::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<TimeFormatLocalizationAttributeListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPTimeFormatLocalizationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPTimeFormatLocalizationAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = TimeFormatLocalization::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<TimeFormatLocalizationAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TimeFormatLocalization::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
-}
-
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeLongOctetStringWithValue:(NSData * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = TimeFormatLocalization::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+    [self writeAttributeLongOctetStringWithValue:(NSData * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeLongOctetStringWithValue:(NSData * _Nonnull)value
+                                        params:(CHIPWriteParams * _Nullable)params
+                             completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = TimeFormatLocalization::Attributes::FeatureMap::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
+    }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
-{
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = TimeFormatLocalization::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::LongOctetString::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = [self asByteSpan:value];
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeLongOctetStringWithMinInterval:(NSNumber * _Nonnull)minInterval
                                              maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(CHIPSubscribeParams * _Nullable)params
                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                            reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+                                               (void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPOctetStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = TimeFormatLocalization::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::LongOctetString::TypeInfo;
+            auto successFn = Callback<OctetStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeLongOctetStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                               endpoint:(NSNumber *)endpoint
                                                  queue:(dispatch_queue_t)queue
                                      completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+                                         (void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPOctetStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = TimeFormatLocalization::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::LongOctetString::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<OctetStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -77107,34 +75800,24 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPUnitLocalization
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)readAttributeTemperatureUnitWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeCharStringWithCompletionHandler:(void (^)(
+                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPUnitLocalizationClusterTempUnitAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = UnitLocalization::Attributes::TemperatureUnit::TypeInfo;
-            auto successFn = Callback<UnitLocalizationClusterTempUnitAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::CharString::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)writeAttributeTemperatureUnitWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCharStringWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeTemperatureUnitWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self writeAttributeCharStringWithValue:(NSString * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)writeAttributeTemperatureUnitWithValue:(NSNumber * _Nonnull)value
-                                        params:(CHIPWriteParams * _Nullable)params
-                             completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCharStringWithValue:(NSString * _Nonnull)value
+                                   params:(CHIPWriteParams * _Nullable)params
+                        completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -77150,9 +75833,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = UnitLocalization::Attributes::TemperatureUnit::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::CharString::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            cppValue = [self asCharSpan:value];
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -77160,267 +75843,287 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeTemperatureUnitWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeCharStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPUnitLocalizationClusterTempUnitAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = UnitLocalization::Attributes::TemperatureUnit::TypeInfo;
-            auto successFn = Callback<UnitLocalizationClusterTempUnitAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::CharString::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPUnitLocalizationClusterTempUnitAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTemperatureUnitWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeCharStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPUnitLocalizationClusterTempUnitAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = UnitLocalization::Attributes::TemperatureUnit::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<UnitLocalizationClusterTempUnitAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = TestCluster::Attributes::CharString::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeLongCharStringWithCompletionHandler:(void (^)(NSString * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = UnitLocalization::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<UnitLocalizationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::LongCharString::TypeInfo;
+        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeLongCharStringWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = UnitLocalization::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<UnitLocalizationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+    [self writeAttributeLongCharStringWithValue:(NSString * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeLongCharStringWithValue:(NSString * _Nonnull)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPUnitLocalizationGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = UnitLocalization::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<UnitLocalizationGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
-{
-    new CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = UnitLocalization::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<UnitLocalizationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::LongCharString::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = [self asCharSpan:value];
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeLongCharStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = UnitLocalization::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<UnitLocalizationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::LongCharString::TypeInfo;
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeLongCharStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPUnitLocalizationAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = UnitLocalization::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<UnitLocalizationAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = TestCluster::Attributes::LongCharString::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeEpochUsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPUnitLocalizationAttributeListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = UnitLocalization::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<UnitLocalizationAttributeListListAttributeCallback>::FromCancelable(success);
+    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::EpochUs::TypeInfo;
+        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
+}
+
+- (void)writeAttributeEpochUsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeEpochUsWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeEpochUsWithValue:(NSNumber * _Nonnull)value
+                                params:(CHIPWriteParams * _Nullable)params
+                     completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::EpochUs::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedLongLongValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeEpochUsWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                     maxInterval:(NSNumber * _Nonnull)maxInterval
+                                          params:(CHIPSubscribeParams * _Nullable)params
+                         subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPUnitLocalizationAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = UnitLocalization::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<UnitLocalizationAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::EpochUs::TypeInfo;
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPUnitLocalizationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeEpochUsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                      endpoint:(NSNumber *)endpoint
+                                         queue:(dispatch_queue_t)queue
+                             completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPUnitLocalizationAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = UnitLocalization::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<UnitLocalizationAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = TestCluster::Attributes::EpochUs::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeEpochSWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = UnitLocalization::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = TestCluster::Attributes::EpochS::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeEpochSWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeEpochSWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeEpochSWithValue:(NSNumber * _Nonnull)value
+                               params:(CHIPWriteParams * _Nullable)params
+                    completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::EpochS::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedIntValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeEpochSWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                    maxInterval:(NSNumber * _Nonnull)maxInterval
+                                         params:(CHIPSubscribeParams * _Nullable)params
+                        subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -77429,7 +76132,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = UnitLocalization::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::EpochS::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -77441,15 +76144,15 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeEpochSWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                     endpoint:(NSNumber *)endpoint
+                                        queue:(dispatch_queue_t)queue
+                            completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = UnitLocalization::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::EpochS::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -77465,59 +76168,89 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeVendorIdWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = UnitLocalization::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPVendorIdAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::VendorId::TypeInfo;
+        auto successFn = Callback<VendorIdAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeVendorIdWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeVendorIdWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeVendorIdWithValue:(NSNumber * _Nonnull)value
+                                 params:(CHIPWriteParams * _Nullable)params
+                      completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::VendorId::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeVendorIdWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPVendorIdAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = UnitLocalization::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::VendorId::TypeInfo;
+            auto successFn = Callback<VendorIdAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPVendorIdAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeVendorIdWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPVendorIdAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = UnitLocalization::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::VendorId::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<VendorIdAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -77527,34 +76260,28 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPUserLabel
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)readAttributeLabelListWithCompletionHandler:(void (^)(
-                                                        NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeListNullablesAndOptionalsStructWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPUserLabelLabelListListAttributeCallbackBridge(
+    new CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = UserLabel::Attributes::LabelList::TypeInfo;
-            auto successFn = Callback<UserLabelLabelListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::ListNullablesAndOptionalsStruct::TypeInfo;
+            auto successFn = Callback<TestClusterListNullablesAndOptionalsStructListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeLabelListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeListNullablesAndOptionalsStructWithValue:(NSArray * _Nonnull)value
+                                             completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeLabelListWithValue:(NSArray * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self writeAttributeListNullablesAndOptionalsStructWithValue:(NSArray * _Nonnull) value
+                                                          params:nil
+                                               completionHandler:completionHandler];
 }
-- (void)writeAttributeLabelListWithValue:(NSArray * _Nonnull)value
-                                  params:(CHIPWriteParams * _Nullable)params
-                       completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeListNullablesAndOptionalsStructWithValue:(NSArray * _Nonnull)value
+                                                        params:(CHIPWriteParams * _Nullable)params
+                                             completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -77570,7 +76297,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = UserLabel::Attributes::LabelList::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::ListNullablesAndOptionalsStruct::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -77582,13 +76309,184 @@ new CHIPDefaultSuccessCallbackBridge(
                     }
                     listFreer.add(listHolder_0);
                     for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPUserLabelClusterLabelStruct class]]) {
+                        if (![value[i_0] isKindOfClass:[CHIPTestClusterClusterNullablesAndOptionalsStruct class]]) {
                             // Wrong kind of value.
                             return CHIP_ERROR_INVALID_ARGUMENT;
                         }
-                        auto element_0 = (CHIPUserLabelClusterLabelStruct *) value[i_0];
-                        listHolder_0->mList[i_0].label = [self asCharSpan:element_0.label];
-                        listHolder_0->mList[i_0].value = [self asCharSpan:element_0.value];
+                        auto element_0 = (CHIPTestClusterClusterNullablesAndOptionalsStruct *) value[i_0];
+                        if (element_0.nullableInt == nil) {
+                            listHolder_0->mList[i_0].nullableInt.SetNull();
+                        } else {
+                            auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableInt.SetNonNull();
+                            nonNullValue_2 = element_0.nullableInt.unsignedShortValue;
+                        }
+                        if (element_0.optionalInt != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].optionalInt.Emplace();
+                            definedValue_2 = element_0.optionalInt.unsignedShortValue;
+                        }
+                        if (element_0.nullableOptionalInt != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalInt.Emplace();
+                            if (element_0.nullableOptionalInt == nil) {
+                                definedValue_2.SetNull();
+                            } else {
+                                auto & nonNullValue_3 = definedValue_2.SetNonNull();
+                                nonNullValue_3 = element_0.nullableOptionalInt.unsignedShortValue;
+                            }
+                        }
+                        if (element_0.nullableString == nil) {
+                            listHolder_0->mList[i_0].nullableString.SetNull();
+                        } else {
+                            auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableString.SetNonNull();
+                            nonNullValue_2 = [self asCharSpan:element_0.nullableString];
+                        }
+                        if (element_0.optionalString != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].optionalString.Emplace();
+                            definedValue_2 = [self asCharSpan:element_0.optionalString];
+                        }
+                        if (element_0.nullableOptionalString != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalString.Emplace();
+                            if (element_0.nullableOptionalString == nil) {
+                                definedValue_2.SetNull();
+                            } else {
+                                auto & nonNullValue_3 = definedValue_2.SetNonNull();
+                                nonNullValue_3 = [self asCharSpan:element_0.nullableOptionalString];
+                            }
+                        }
+                        if (element_0.nullableStruct == nil) {
+                            listHolder_0->mList[i_0].nullableStruct.SetNull();
+                        } else {
+                            auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableStruct.SetNonNull();
+                            nonNullValue_2.a = element_0.nullableStruct.a.unsignedCharValue;
+                            nonNullValue_2.b = element_0.nullableStruct.b.boolValue;
+                            nonNullValue_2.c = static_cast<std::remove_reference_t<decltype(nonNullValue_2.c)>>(
+                                element_0.nullableStruct.c.unsignedCharValue);
+                            nonNullValue_2.d = [self asByteSpan:element_0.nullableStruct.d];
+                            nonNullValue_2.e = [self asCharSpan:element_0.nullableStruct.e];
+                            nonNullValue_2.f = static_cast<std::remove_reference_t<decltype(nonNullValue_2.f)>>(
+                                element_0.nullableStruct.f.unsignedCharValue);
+                            nonNullValue_2.g = element_0.nullableStruct.g.floatValue;
+                            nonNullValue_2.h = element_0.nullableStruct.h.doubleValue;
+                        }
+                        if (element_0.optionalStruct != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].optionalStruct.Emplace();
+                            definedValue_2.a = element_0.optionalStruct.a.unsignedCharValue;
+                            definedValue_2.b = element_0.optionalStruct.b.boolValue;
+                            definedValue_2.c = static_cast<std::remove_reference_t<decltype(definedValue_2.c)>>(
+                                element_0.optionalStruct.c.unsignedCharValue);
+                            definedValue_2.d = [self asByteSpan:element_0.optionalStruct.d];
+                            definedValue_2.e = [self asCharSpan:element_0.optionalStruct.e];
+                            definedValue_2.f = static_cast<std::remove_reference_t<decltype(definedValue_2.f)>>(
+                                element_0.optionalStruct.f.unsignedCharValue);
+                            definedValue_2.g = element_0.optionalStruct.g.floatValue;
+                            definedValue_2.h = element_0.optionalStruct.h.doubleValue;
+                        }
+                        if (element_0.nullableOptionalStruct != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalStruct.Emplace();
+                            if (element_0.nullableOptionalStruct == nil) {
+                                definedValue_2.SetNull();
+                            } else {
+                                auto & nonNullValue_3 = definedValue_2.SetNonNull();
+                                nonNullValue_3.a = element_0.nullableOptionalStruct.a.unsignedCharValue;
+                                nonNullValue_3.b = element_0.nullableOptionalStruct.b.boolValue;
+                                nonNullValue_3.c = static_cast<std::remove_reference_t<decltype(nonNullValue_3.c)>>(
+                                    element_0.nullableOptionalStruct.c.unsignedCharValue);
+                                nonNullValue_3.d = [self asByteSpan:element_0.nullableOptionalStruct.d];
+                                nonNullValue_3.e = [self asCharSpan:element_0.nullableOptionalStruct.e];
+                                nonNullValue_3.f = static_cast<std::remove_reference_t<decltype(nonNullValue_3.f)>>(
+                                    element_0.nullableOptionalStruct.f.unsignedCharValue);
+                                nonNullValue_3.g = element_0.nullableOptionalStruct.g.floatValue;
+                                nonNullValue_3.h = element_0.nullableOptionalStruct.h.doubleValue;
+                            }
+                        }
+                        if (element_0.nullableList == nil) {
+                            listHolder_0->mList[i_0].nullableList.SetNull();
+                        } else {
+                            auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableList.SetNonNull();
+                            {
+                                using ListType_3 = std::remove_reference_t<decltype(nonNullValue_2)>;
+                                using ListMemberType_3 = ListMemberTypeGetter<ListType_3>::Type;
+                                if (element_0.nullableList.count != 0) {
+                                    auto * listHolder_3 = new ListHolder<ListMemberType_3>(element_0.nullableList.count);
+                                    if (listHolder_3 == nullptr || listHolder_3->mList == nullptr) {
+                                        return CHIP_ERROR_INVALID_ARGUMENT;
+                                    }
+                                    listFreer.add(listHolder_3);
+                                    for (size_t i_3 = 0; i_3 < element_0.nullableList.count; ++i_3) {
+                                        if (![element_0.nullableList[i_3] isKindOfClass:[NSNumber class]]) {
+                                            // Wrong kind of value.
+                                            return CHIP_ERROR_INVALID_ARGUMENT;
+                                        }
+                                        auto element_3 = (NSNumber *) element_0.nullableList[i_3];
+                                        listHolder_3->mList[i_3]
+                                            = static_cast<std::remove_reference_t<decltype(listHolder_3->mList[i_3])>>(
+                                                element_3.unsignedCharValue);
+                                    }
+                                    nonNullValue_2 = ListType_3(listHolder_3->mList, element_0.nullableList.count);
+                                } else {
+                                    nonNullValue_2 = ListType_3();
+                                }
+                            }
+                        }
+                        if (element_0.optionalList != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].optionalList.Emplace();
+                            {
+                                using ListType_3 = std::remove_reference_t<decltype(definedValue_2)>;
+                                using ListMemberType_3 = ListMemberTypeGetter<ListType_3>::Type;
+                                if (element_0.optionalList.count != 0) {
+                                    auto * listHolder_3 = new ListHolder<ListMemberType_3>(element_0.optionalList.count);
+                                    if (listHolder_3 == nullptr || listHolder_3->mList == nullptr) {
+                                        return CHIP_ERROR_INVALID_ARGUMENT;
+                                    }
+                                    listFreer.add(listHolder_3);
+                                    for (size_t i_3 = 0; i_3 < element_0.optionalList.count; ++i_3) {
+                                        if (![element_0.optionalList[i_3] isKindOfClass:[NSNumber class]]) {
+                                            // Wrong kind of value.
+                                            return CHIP_ERROR_INVALID_ARGUMENT;
+                                        }
+                                        auto element_3 = (NSNumber *) element_0.optionalList[i_3];
+                                        listHolder_3->mList[i_3]
+                                            = static_cast<std::remove_reference_t<decltype(listHolder_3->mList[i_3])>>(
+                                                element_3.unsignedCharValue);
+                                    }
+                                    definedValue_2 = ListType_3(listHolder_3->mList, element_0.optionalList.count);
+                                } else {
+                                    definedValue_2 = ListType_3();
+                                }
+                            }
+                        }
+                        if (element_0.nullableOptionalList != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalList.Emplace();
+                            if (element_0.nullableOptionalList == nil) {
+                                definedValue_2.SetNull();
+                            } else {
+                                auto & nonNullValue_3 = definedValue_2.SetNonNull();
+                                {
+                                    using ListType_4 = std::remove_reference_t<decltype(nonNullValue_3)>;
+                                    using ListMemberType_4 = ListMemberTypeGetter<ListType_4>::Type;
+                                    if (element_0.nullableOptionalList.count != 0) {
+                                        auto * listHolder_4
+                                            = new ListHolder<ListMemberType_4>(element_0.nullableOptionalList.count);
+                                        if (listHolder_4 == nullptr || listHolder_4->mList == nullptr) {
+                                            return CHIP_ERROR_INVALID_ARGUMENT;
+                                        }
+                                        listFreer.add(listHolder_4);
+                                        for (size_t i_4 = 0; i_4 < element_0.nullableOptionalList.count; ++i_4) {
+                                            if (![element_0.nullableOptionalList[i_4] isKindOfClass:[NSNumber class]]) {
+                                                // Wrong kind of value.
+                                                return CHIP_ERROR_INVALID_ARGUMENT;
+                                            }
+                                            auto element_4 = (NSNumber *) element_0.nullableOptionalList[i_4];
+                                            listHolder_4->mList[i_4]
+                                                = static_cast<std::remove_reference_t<decltype(listHolder_4->mList[i_4])>>(
+                                                    element_4.unsignedCharValue);
+                                        }
+                                        nonNullValue_3 = ListType_4(listHolder_4->mList, element_0.nullableOptionalList.count);
+                                    } else {
+                                        nonNullValue_3 = ListType_4();
+                                    }
+                                }
+                            }
+                        }
                     }
                     cppValue = ListType_0(listHolder_0->mList, value.count);
                 } else {
@@ -77602,111 +76500,144 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeLabelListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                       maxInterval:(NSNumber * _Nonnull)maxInterval
-                                            params:(CHIPSubscribeParams * _Nullable)params
-                           subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                     reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeListNullablesAndOptionalsStructWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                                 subscriptionEstablished:
+                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                           reportHandler:(void (^)(NSArray * _Nullable value,
+                                                                             NSError * _Nullable error))reportHandler
 {
-    new CHIPUserLabelLabelListListAttributeCallbackSubscriptionBridge(
+    new CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = UserLabel::Attributes::LabelList::TypeInfo;
-            auto successFn = Callback<UserLabelLabelListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::ListNullablesAndOptionalsStruct::TypeInfo;
+            auto successFn = Callback<TestClusterListNullablesAndOptionalsStructListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPUserLabelLabelListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeLabelListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                        endpoint:(NSNumber *)endpoint
-                                           queue:(dispatch_queue_t)queue
-                               completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeListNullablesAndOptionalsStructWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                              endpoint:(NSNumber *)endpoint
+                                                                 queue:(dispatch_queue_t)queue
+                                                     completionHandler:(void (^)(NSArray * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler
 {
-    new CHIPUserLabelLabelListListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = UserLabel::Attributes::LabelList::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<UserLabelLabelListListAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPTestClusterListNullablesAndOptionalsStructListAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = TestCluster::Attributes::ListNullablesAndOptionalsStruct::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<TestClusterListNullablesAndOptionalsStructListAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeEnumAttrWithCompletionHandler:(void (^)(
+                                                       NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPUserLabelGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPTestClusterClusterSimpleEnumAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = UserLabel::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<UserLabelGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::EnumAttr::TypeInfo;
+            auto successFn = Callback<TestClusterClusterSimpleEnumAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeEnumAttrWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPUserLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    [self writeAttributeEnumAttrWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeEnumAttrWithValue:(NSNumber * _Nonnull)value
+                                 params:(CHIPWriteParams * _Nullable)params
+                      completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::EnumAttr::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeEnumAttrWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                      maxInterval:(NSNumber * _Nonnull)maxInterval
+                                           params:(CHIPSubscribeParams * _Nullable)params
+                          subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = UserLabel::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<UserLabelGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::EnumAttr::TypeInfo;
+            auto successFn = Callback<TestClusterClusterSimpleEnumAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPUserLabelGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeEnumAttrWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                       endpoint:(NSNumber *)endpoint
+                                          queue:(dispatch_queue_t)queue
+                              completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPUserLabelGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPTestClusterClusterSimpleEnumAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = UserLabel::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = TestCluster::Attributes::EnumAttr::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<UserLabelGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<TestClusterClusterSimpleEnumAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -77716,62 +76647,103 @@ new CHIPUserLabelGeneratedCommandListListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeStructAttrWithCompletionHandler:(void (^)(CHIPTestClusterClusterSimpleStruct * _Nullable value,
+                                                         NSError * _Nullable error))completionHandler
 {
-    new CHIPUserLabelAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPTestClusterStructAttrStructAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = UserLabel::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<UserLabelAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::StructAttr::TypeInfo;
+            auto successFn = Callback<TestClusterStructAttrStructAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeStructAttrWithValue:(CHIPTestClusterClusterSimpleStruct * _Nonnull)value
+                        completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPUserLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    [self writeAttributeStructAttrWithValue:(CHIPTestClusterClusterSimpleStruct * _Nonnull) value
+                                     params:nil
+                          completionHandler:completionHandler];
+}
+- (void)writeAttributeStructAttrWithValue:(CHIPTestClusterClusterSimpleStruct * _Nonnull)value
+                                   params:(CHIPWriteParams * _Nullable)params
+                        completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::StructAttr::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue.a = value.a.unsignedCharValue;
+            cppValue.b = value.b.boolValue;
+            cppValue.c = static_cast<std::remove_reference_t<decltype(cppValue.c)>>(value.c.unsignedCharValue);
+            cppValue.d = [self asByteSpan:value.d];
+            cppValue.e = [self asCharSpan:value.e];
+            cppValue.f = static_cast<std::remove_reference_t<decltype(cppValue.f)>>(value.f.unsignedCharValue);
+            cppValue.g = value.g.floatValue;
+            cppValue.h = value.h.doubleValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeStructAttrWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                        maxInterval:(NSNumber * _Nonnull)maxInterval
+                                             params:(CHIPSubscribeParams * _Nullable)params
+                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                      reportHandler:(void (^)(CHIPTestClusterClusterSimpleStruct * _Nullable value,
+                                                        NSError * _Nullable error))reportHandler
+{
+    new CHIPTestClusterStructAttrStructAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = UserLabel::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<UserLabelAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::StructAttr::TypeInfo;
+            auto successFn = Callback<TestClusterStructAttrStructAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPUserLabelAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPTestClusterStructAttrStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeStructAttrWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                         endpoint:(NSNumber *)endpoint
+                                            queue:(dispatch_queue_t)queue
+                                completionHandler:(void (^)(CHIPTestClusterClusterSimpleStruct * _Nullable value,
+                                                      NSError * _Nullable error))completionHandler
 {
-    new CHIPUserLabelAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPTestClusterStructAttrStructAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = UserLabel::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = TestCluster::Attributes::StructAttr::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<UserLabelAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<TestClusterStructAttrStructAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -77781,120 +76753,187 @@ new CHIPUserLabelAcceptedCommandListListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeRangeRestrictedInt8uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPUserLabelAttributeListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = UserLabel::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<UserLabelAttributeListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::RangeRestrictedInt8u::TypeInfo;
+        auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeRangeRestrictedInt8uWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeRangeRestrictedInt8uWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeRangeRestrictedInt8uWithValue:(NSNumber * _Nonnull)value
+                                             params:(CHIPWriteParams * _Nullable)params
+                                  completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::RangeRestrictedInt8u::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeRangeRestrictedInt8uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPUserLabelAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = UserLabel::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<UserLabelAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::RangeRestrictedInt8u::TypeInfo;
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPUserLabelAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRangeRestrictedInt8uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPUserLabelAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = UserLabel::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<UserLabelAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = TestCluster::Attributes::RangeRestrictedInt8u::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<Int8uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeRangeRestrictedInt8sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = UserLabel::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+    new CHIPInt8sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::RangeRestrictedInt8s::TypeInfo;
+        auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeRangeRestrictedInt8sWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeRangeRestrictedInt8sWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeRangeRestrictedInt8sWithValue:(NSNumber * _Nonnull)value
+                                             params:(CHIPWriteParams * _Nullable)params
+                                  completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::RangeRestrictedInt8s::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.charValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeRangeRestrictedInt8sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                       params:(CHIPSubscribeParams * _Nullable)params
+                                      subscriptionEstablished:
+                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                reportHandler:
+                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt8sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = UserLabel::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::RangeRestrictedInt8s::TypeInfo;
+            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRangeRestrictedInt8sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                   endpoint:(NSNumber *)endpoint
+                                                      queue:(dispatch_queue_t)queue
+                                          completionHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = UserLabel::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::RangeRestrictedInt8s::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int8sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -77904,23 +76943,57 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeRangeRestrictedInt16uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = UserLabel::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = TestCluster::Attributes::RangeRestrictedInt16u::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeRangeRestrictedInt16uWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeRangeRestrictedInt16uWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeRangeRestrictedInt16uWithValue:(NSNumber * _Nonnull)value
+                                              params:(CHIPWriteParams * _Nullable)params
+                                   completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::RangeRestrictedInt16u::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeRangeRestrictedInt16uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -77929,7 +77002,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = UserLabel::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::RangeRestrictedInt16u::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -77941,16 +77014,16 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRangeRestrictedInt16uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = UserLabel::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::RangeRestrictedInt16u::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -77966,66 +77039,93 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPWakeOnLan
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)readAttributeMACAddressWithCompletionHandler:(void (^)(
-                                                         NSString * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeRangeRestrictedInt16sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = WakeOnLan::Attributes::MACAddress::TypeInfo;
-        auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+    new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::RangeRestrictedInt16s::TypeInfo;
+        auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeMACAddressWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeRangeRestrictedInt16sWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPCharStringAttributeCallbackSubscriptionBridge(
+    [self writeAttributeRangeRestrictedInt16sWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeRangeRestrictedInt16sWithValue:(NSNumber * _Nonnull)value
+                                              params:(CHIPWriteParams * _Nullable)params
+                                   completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::RangeRestrictedInt16s::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.shortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeRangeRestrictedInt16sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                   maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                        params:(CHIPSubscribeParams * _Nullable)params
+                                       subscriptionEstablished:
+                                           (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                 reportHandler:
+                                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WakeOnLan::Attributes::MACAddress::TypeInfo;
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::RangeRestrictedInt16s::TypeInfo;
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeMACAddressWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeRangeRestrictedInt16sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                    endpoint:(NSNumber *)endpoint
+                                                       queue:(dispatch_queue_t)queue
+                                           completionHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WakeOnLan::Attributes::MACAddress::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::RangeRestrictedInt16s::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<Int16sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -78035,62 +77135,115 @@ new CHIPCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable
     });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeListLongOctetStringWithCompletionHandler:(void (^)(NSArray * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPWakeOnLanGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPTestClusterListLongOctetStringListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WakeOnLan::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<WakeOnLanGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::ListLongOctetString::TypeInfo;
+            auto successFn = Callback<TestClusterListLongOctetStringListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeListLongOctetStringWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPWakeOnLanGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    [self writeAttributeListLongOctetStringWithValue:(NSArray * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeListLongOctetStringWithValue:(NSArray * _Nonnull)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::ListLongOctetString::TypeInfo;
+            TypeInfo::Type cppValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSData class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSData *) value[i_0];
+                        listHolder_0->mList[i_0] = [self asByteSpan:element_0];
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeListLongOctetStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPTestClusterListLongOctetStringListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WakeOnLan::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<WakeOnLanGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::ListLongOctetString::TypeInfo;
+            auto successFn = Callback<TestClusterListLongOctetStringListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWakeOnLanGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPTestClusterListLongOctetStringListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeListLongOctetStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPWakeOnLanGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPTestClusterListLongOctetStringListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = WakeOnLan::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = TestCluster::Attributes::ListLongOctetString::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<WakeOnLanGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<TestClusterListLongOctetStringListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -78100,62 +77253,171 @@ new CHIPWakeOnLanGeneratedCommandListListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeListFabricScopedWithParams:(CHIPReadParams * _Nullable)params
+                              completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPWakeOnLanAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPTestClusterListFabricScopedListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WakeOnLan::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<WakeOnLanAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::ListFabricScoped::TypeInfo;
+            auto successFn = Callback<TestClusterListFabricScopedListAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue]);
+        });
+}
+
+- (void)writeAttributeListFabricScopedWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeListFabricScopedWithValue:(NSArray * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeListFabricScopedWithValue:(NSArray * _Nonnull)value
+                                         params:(CHIPWriteParams * _Nullable)params
+                              completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::ListFabricScoped::TypeInfo;
+            TypeInfo::Type cppValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[CHIPTestClusterClusterTestFabricScoped class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (CHIPTestClusterClusterTestFabricScoped *) value[i_0];
+                        listHolder_0->mList[i_0].fabricSensitiveInt8u = element_0.fabricSensitiveInt8u.unsignedCharValue;
+                        if (element_0.optionalFabricSensitiveInt8u != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].optionalFabricSensitiveInt8u.Emplace();
+                            definedValue_2 = element_0.optionalFabricSensitiveInt8u.unsignedCharValue;
+                        }
+                        if (element_0.nullableFabricSensitiveInt8u == nil) {
+                            listHolder_0->mList[i_0].nullableFabricSensitiveInt8u.SetNull();
+                        } else {
+                            auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableFabricSensitiveInt8u.SetNonNull();
+                            nonNullValue_2 = element_0.nullableFabricSensitiveInt8u.unsignedCharValue;
+                        }
+                        if (element_0.nullableOptionalFabricSensitiveInt8u != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalFabricSensitiveInt8u.Emplace();
+                            if (element_0.nullableOptionalFabricSensitiveInt8u == nil) {
+                                definedValue_2.SetNull();
+                            } else {
+                                auto & nonNullValue_3 = definedValue_2.SetNonNull();
+                                nonNullValue_3 = element_0.nullableOptionalFabricSensitiveInt8u.unsignedCharValue;
+                            }
+                        }
+                        listHolder_0->mList[i_0].fabricSensitiveCharString = [self asCharSpan:element_0.fabricSensitiveCharString];
+                        listHolder_0->mList[i_0].fabricSensitiveStruct.a = element_0.fabricSensitiveStruct.a.unsignedCharValue;
+                        listHolder_0->mList[i_0].fabricSensitiveStruct.b = element_0.fabricSensitiveStruct.b.boolValue;
+                        listHolder_0->mList[i_0].fabricSensitiveStruct.c
+                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveStruct.c)>>(
+                                element_0.fabricSensitiveStruct.c.unsignedCharValue);
+                        listHolder_0->mList[i_0].fabricSensitiveStruct.d = [self asByteSpan:element_0.fabricSensitiveStruct.d];
+                        listHolder_0->mList[i_0].fabricSensitiveStruct.e = [self asCharSpan:element_0.fabricSensitiveStruct.e];
+                        listHolder_0->mList[i_0].fabricSensitiveStruct.f
+                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveStruct.f)>>(
+                                element_0.fabricSensitiveStruct.f.unsignedCharValue);
+                        listHolder_0->mList[i_0].fabricSensitiveStruct.g = element_0.fabricSensitiveStruct.g.floatValue;
+                        listHolder_0->mList[i_0].fabricSensitiveStruct.h = element_0.fabricSensitiveStruct.h.doubleValue;
+                        {
+                            using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveInt8uList)>;
+                            using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
+                            if (element_0.fabricSensitiveInt8uList.count != 0) {
+                                auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.fabricSensitiveInt8uList.count);
+                                if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
+                                    return CHIP_ERROR_INVALID_ARGUMENT;
+                                }
+                                listFreer.add(listHolder_2);
+                                for (size_t i_2 = 0; i_2 < element_0.fabricSensitiveInt8uList.count; ++i_2) {
+                                    if (![element_0.fabricSensitiveInt8uList[i_2] isKindOfClass:[NSNumber class]]) {
+                                        // Wrong kind of value.
+                                        return CHIP_ERROR_INVALID_ARGUMENT;
+                                    }
+                                    auto element_2 = (NSNumber *) element_0.fabricSensitiveInt8uList[i_2];
+                                    listHolder_2->mList[i_2] = element_2.unsignedCharValue;
+                                }
+                                listHolder_0->mList[i_0].fabricSensitiveInt8uList
+                                    = ListType_2(listHolder_2->mList, element_0.fabricSensitiveInt8uList.count);
+                            } else {
+                                listHolder_0->mList[i_0].fabricSensitiveInt8uList = ListType_2();
+                            }
+                        }
+                        listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeListFabricScopedWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPWakeOnLanAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPTestClusterListFabricScopedListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WakeOnLan::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<WakeOnLanAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::ListFabricScoped::TypeInfo;
+            auto successFn = Callback<TestClusterListFabricScopedListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWakeOnLanAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPTestClusterListFabricScopedListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeListFabricScopedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPWakeOnLanAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPTestClusterListFabricScopedListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = WakeOnLan::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = TestCluster::Attributes::ListFabricScoped::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<WakeOnLanAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<TestClusterListFabricScopedListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -78165,120 +77427,91 @@ new CHIPWakeOnLanAcceptedCommandListListAttributeCallbackBridge(
         });
 }
 
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeTimedWriteBooleanWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                NSError * _Nullable error))completionHandler
 {
-    new CHIPWakeOnLanAttributeListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WakeOnLan::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<WakeOnLanAttributeListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::TimedWriteBoolean::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeTimedWriteBooleanWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPWakeOnLanAttributeListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = WakeOnLan::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<WakeOnLanAttributeListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWakeOnLanAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+    [self writeAttributeTimedWriteBooleanWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeTimedWriteBooleanWithValue:(NSNumber * _Nonnull)value
+                                          params:(CHIPWriteParams * _Nullable)params
+                               completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPWakeOnLanAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = WakeOnLan::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<WakeOnLanAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = WakeOnLan::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::TimedWriteBoolean::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.boolValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
 }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeTimedWriteBooleanWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                               maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                    params:(CHIPSubscribeParams * _Nullable)params
+                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                             reportHandler:
+                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WakeOnLan::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::TimedWriteBoolean::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeTimedWriteBooleanWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                endpoint:(NSNumber *)endpoint
+                                                   queue:(dispatch_queue_t)queue
+                                       completionHandler:
+                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WakeOnLan::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::TimedWriteBoolean::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -78288,59 +77521,92 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeGeneralErrorBooleanWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = WakeOnLan::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::GeneralErrorBoolean::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
     });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeGeneralErrorBooleanWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeGeneralErrorBooleanWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeGeneralErrorBooleanWithValue:(NSNumber * _Nonnull)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::GeneralErrorBoolean::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.boolValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeGeneralErrorBooleanWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WakeOnLan::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::GeneralErrorBoolean::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeGeneralErrorBooleanWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WakeOnLan::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::GeneralErrorBoolean::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -78350,95 +77616,92 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPWiFiNetworkDiagnostics
-
-- (chip::Controller::ClusterBase *)getCluster
+- (void)readAttributeClusterErrorBooleanWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    return &_cppCluster;
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::ClusterErrorBoolean::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)resetCountsWithCompletionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeClusterErrorBooleanWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self resetCountsWithParams:nil completionHandler:completionHandler];
+    [self writeAttributeClusterErrorBooleanWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-- (void)resetCountsWithParams:(CHIPWiFiNetworkDiagnosticsClusterResetCountsParams * _Nullable)params
-            completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeClusterErrorBooleanWithValue:(NSNumber * _Nonnull)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    WiFiNetworkDiagnostics::Commands::ResetCounts::Type request;
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
     }
 
-    new CHIPCommandSuccessCallbackBridge(
+    new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
+        ^(id _Nullable ignored, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)readAttributeBssidWithCompletionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableOctetStringAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::Bssid::TypeInfo;
-            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::ClusterErrorBoolean::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.boolValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeBssidWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                   maxInterval:(NSNumber * _Nonnull)maxInterval
-                                        params:(CHIPSubscribeParams * _Nullable)params
-                       subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                 reportHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeClusterErrorBooleanWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableOctetStringAttributeCallbackSubscriptionBridge(
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::Bssid::TypeInfo;
-            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::ClusterErrorBoolean::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBssidWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                    endpoint:(NSNumber *)endpoint
-                                       queue:(dispatch_queue_t)queue
-                           completionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeClusterErrorBooleanWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableOctetStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::Bssid::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::ClusterErrorBoolean::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -78448,191 +77711,90 @@ new CHIPNullableOctetStringAttributeCallbackBridge(queue, completionHandler, ^(C
     });
 }
 
-- (void)readAttributeSecurityTypeWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableWiFiNetworkDiagnosticsClusterSecurityTypeAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::SecurityType::TypeInfo;
-            auto successFn = Callback<NullableWiFiNetworkDiagnosticsClusterSecurityTypeAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeSecurityTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPNullableWiFiNetworkDiagnosticsClusterSecurityTypeAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::SecurityType::TypeInfo;
-            auto successFn = Callback<NullableWiFiNetworkDiagnosticsClusterSecurityTypeAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableWiFiNetworkDiagnosticsClusterSecurityTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeSecurityTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableWiFiNetworkDiagnosticsClusterSecurityTypeAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = WiFiNetworkDiagnostics::Attributes::SecurityType::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<NullableWiFiNetworkDiagnosticsClusterSecurityTypeAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeWiFiVersionWithCompletionHandler:(void (^)(
+- (void)readAttributeUnsupportedWithCompletionHandler:(void (^)(
                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableWiFiNetworkDiagnosticsClusterWiFiVersionTypeAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::WiFiVersion::TypeInfo;
-            auto successFn
-                = Callback<NullableWiFiNetworkDiagnosticsClusterWiFiVersionTypeAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    new CHIPBooleanAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        using TypeInfo = TestCluster::Attributes::Unsupported::TypeInfo;
+        auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
+        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+    });
 }
 
-- (void)subscribeAttributeWiFiVersionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                         maxInterval:(NSNumber * _Nonnull)maxInterval
-                                              params:(CHIPSubscribeParams * _Nullable)params
-                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeUnsupportedWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPNullableWiFiNetworkDiagnosticsClusterWiFiVersionTypeAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::WiFiVersion::TypeInfo;
-            auto successFn
-                = Callback<NullableWiFiNetworkDiagnosticsClusterWiFiVersionTypeAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableWiFiNetworkDiagnosticsClusterWiFiVersionTypeAttributeCallbackSubscriptionBridge::
-                    OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+    [self writeAttributeUnsupportedWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
 }
-
-+ (void)readAttributeWiFiVersionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                          endpoint:(NSNumber *)endpoint
-                                             queue:(dispatch_queue_t)queue
-                                 completionHandler:
-                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeUnsupportedWithValue:(NSNumber * _Nonnull)value
+                                    params:(CHIPWriteParams * _Nullable)params
+                         completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPNullableWiFiNetworkDiagnosticsClusterWiFiVersionTypeAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = WiFiNetworkDiagnostics::Attributes::WiFiVersion::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn
-                    = Callback<NullableWiFiNetworkDiagnosticsClusterWiFiVersionTypeAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
 
-- (void)readAttributeChannelNumberWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt16uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::ChannelNumber::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::Unsupported::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.boolValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
-
-- (void)subscribeAttributeChannelNumberWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+
+- (void)subscribeAttributeUnsupportedWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                         maxInterval:(NSNumber * _Nonnull)maxInterval
+                                              params:(CHIPSubscribeParams * _Nullable)params
+                             subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::ChannelNumber::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::Unsupported::TypeInfo;
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeChannelNumberWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeUnsupportedWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                          endpoint:(NSNumber *)endpoint
+                                             queue:(dispatch_queue_t)queue
+                                 completionHandler:
+                                     (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::ChannelNumber::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::Unsupported::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<BooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -78642,57 +77804,97 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeRssiWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeNullableBooleanWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8sAttributeCallbackBridge(
+    new CHIPNullableBooleanAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::Rssi::TypeInfo;
-            auto successFn = Callback<NullableInt8sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableBoolean::TypeInfo;
+            auto successFn = Callback<NullableBooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeRssiWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                       params:(CHIPSubscribeParams * _Nullable)params
-                      subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeNullableBooleanWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPNullableInt8sAttributeCallbackSubscriptionBridge(
+    [self writeAttributeNullableBooleanWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeNullableBooleanWithValue:(NSNumber * _Nullable)value
+                                        params:(CHIPWriteParams * _Nullable)params
+                             completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableBoolean::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.boolValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNullableBooleanWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                             maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                  params:(CHIPSubscribeParams * _Nullable)params
+                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                           reportHandler:
+                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableBooleanAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::Rssi::TypeInfo;
-            auto successFn = Callback<NullableInt8sAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableBoolean::TypeInfo;
+            auto successFn = Callback<NullableBooleanAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableBooleanAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeRssiWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                   endpoint:(NSNumber *)endpoint
-                                      queue:(dispatch_queue_t)queue
-                          completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableBooleanWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                              endpoint:(NSNumber *)endpoint
+                                                 queue:(dispatch_queue_t)queue
+                                     completionHandler:
+                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableBooleanAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::Rssi::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::NullableBoolean::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8sAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableBooleanAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -78702,373 +77904,501 @@ new CHIPNullableInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeBeaconLostCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeNullableBitmap8WithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = WiFiNetworkDiagnostics::Attributes::BeaconLostCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPTestClusterNullableBitmap8AttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::NullableBitmap8::TypeInfo;
+            auto successFn = Callback<TestClusterNullableBitmap8AttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeBeaconLostCountWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)writeAttributeNullableBitmap8WithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeNullableBitmap8WithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeNullableBitmap8WithValue:(NSNumber * _Nullable)value
+                                        params:(CHIPWriteParams * _Nullable)params
+                             completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableBitmap8::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNullableBitmap8WithMinInterval:(NSNumber * _Nonnull)minInterval
                                              maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(CHIPSubscribeParams * _Nullable)params
                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                            reportHandler:
                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPTestClusterNullableBitmap8AttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::BeaconLostCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableBitmap8::TypeInfo;
+            auto successFn = Callback<TestClusterNullableBitmap8AttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPTestClusterNullableBitmap8AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBeaconLostCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeNullableBitmap8WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                               endpoint:(NSNumber *)endpoint
                                                  queue:(dispatch_queue_t)queue
                                      completionHandler:
                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::BeaconLostCount::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPTestClusterNullableBitmap8AttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = TestCluster::Attributes::NullableBitmap8::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<TestClusterNullableBitmap8AttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeBeaconRxCountWithCompletionHandler:(void (^)(
-                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeNullableBitmap16WithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = WiFiNetworkDiagnostics::Attributes::BeaconRxCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPTestClusterNullableBitmap16AttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::NullableBitmap16::TypeInfo;
+            auto successFn = Callback<TestClusterNullableBitmap16AttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeBeaconRxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeNullableBitmap16WithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeNullableBitmap16WithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeNullableBitmap16WithValue:(NSNumber * _Nullable)value
+                                         params:(CHIPWriteParams * _Nullable)params
+                              completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableBitmap16::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedShortValue);
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNullableBitmap16WithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPTestClusterNullableBitmap16AttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::BeaconRxCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableBitmap16::TypeInfo;
+            auto successFn = Callback<TestClusterNullableBitmap16AttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPTestClusterNullableBitmap16AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeBeaconRxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableBitmap16WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::BeaconRxCount::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPTestClusterNullableBitmap16AttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = TestCluster::Attributes::NullableBitmap16::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<TestClusterNullableBitmap16AttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributePacketMulticastRxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
+- (void)readAttributeNullableBitmap32WithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketMulticastRxCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPTestClusterNullableBitmap32AttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::NullableBitmap32::TypeInfo;
+            auto successFn = Callback<TestClusterNullableBitmap32AttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributePacketMulticastRxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:
-                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeNullableBitmap32WithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeNullableBitmap32WithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeNullableBitmap32WithValue:(NSNumber * _Nullable)value
+                                         params:(CHIPWriteParams * _Nullable)params
+                              completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableBitmap32::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedIntValue);
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNullableBitmap32WithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPTestClusterNullableBitmap32AttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketMulticastRxCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableBitmap32::TypeInfo;
+            auto successFn = Callback<TestClusterNullableBitmap32AttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPTestClusterNullableBitmap32AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePacketMulticastRxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableBitmap32WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketMulticastRxCount::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPTestClusterNullableBitmap32AttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = TestCluster::Attributes::NullableBitmap32::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<TestClusterNullableBitmap32AttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributePacketMulticastTxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
+- (void)readAttributeNullableBitmap64WithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketMulticastTxCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPTestClusterNullableBitmap64AttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::NullableBitmap64::TypeInfo;
+            auto successFn = Callback<TestClusterNullableBitmap64AttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributePacketMulticastTxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:
-                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeNullableBitmap64WithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketMulticastTxCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+    [self writeAttributeNullableBitmap64WithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
 }
-
-+ (void)readAttributePacketMulticastTxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeNullableBitmap64WithValue:(NSNumber * _Nullable)value
+                                         params:(CHIPWriteParams * _Nullable)params
+                              completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketMulticastTxCount::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
-            }
-            return err;
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
-        return CHIP_ERROR_NOT_FOUND;
-    });
-}
+    }
 
-- (void)readAttributePacketUnicastRxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
-{
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketUnicastRxCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableBitmap64::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedLongLongValue);
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
 }
 
-- (void)subscribeAttributePacketUnicastRxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNullableBitmap64WithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPTestClusterNullableBitmap64AttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketUnicastRxCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableBitmap64::TypeInfo;
+            auto successFn = Callback<TestClusterNullableBitmap64AttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPTestClusterNullableBitmap64AttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePacketUnicastRxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableBitmap64WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketUnicastRxCount::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPTestClusterNullableBitmap64AttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = TestCluster::Attributes::NullableBitmap64::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<TestClusterNullableBitmap64AttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributePacketUnicastTxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeNullableInt8uWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketUnicastTxCount::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::NullableInt8u::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributePacketUnicastTxCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeNullableInt8uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeNullableInt8uWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeNullableInt8uWithValue:(NSNumber * _Nullable)value
+                                      params:(CHIPWriteParams * _Nullable)params
+                           completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableInt8u::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNullableInt8uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketUnicastTxCount::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableInt8u::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePacketUnicastTxCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableInt8uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketUnicastTxCount::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::NullableInt8u::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -79078,59 +78408,97 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeCurrentMaxRateWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+- (void)readAttributeNullableInt16uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
                                                              NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = WiFiNetworkDiagnostics::Attributes::CurrentMaxRate::TypeInfo;
-        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt16uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::NullableInt16u::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeCurrentMaxRateWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)writeAttributeNullableInt16uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeNullableInt16uWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeNullableInt16uWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableInt16u::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedShortValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNullableInt16uWithMinInterval:(NSNumber * _Nonnull)minInterval
                                             maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(CHIPSubscribeParams * _Nullable)params
                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                           reportHandler:
                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt64uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::CurrentMaxRate::TypeInfo;
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableInt16u::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentMaxRateWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeNullableInt16uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
                                              endpoint:(NSNumber *)endpoint
                                                 queue:(dispatch_queue_t)queue
                                     completionHandler:
                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::CurrentMaxRate::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::NullableInt16u::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -79140,58 +78508,97 @@ new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeOverrunCountWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeNullableInt24uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = WiFiNetworkDiagnostics::Attributes::OverrunCount::TypeInfo;
-        auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt32uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::NullableInt24u::TypeInfo;
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeOverrunCountWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeNullableInt24uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt64uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeNullableInt24uWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeNullableInt24uWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableInt24u::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedIntValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNullableInt24uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::OverrunCount::TypeInfo;
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableInt24u::TypeInfo;
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeOverrunCountWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableInt24uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::OverrunCount::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::NullableInt24u::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int64uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -79201,250 +78608,197 @@ new CHIPInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                   NSError * _Nullable error))completionHandler
+- (void)readAttributeNullableInt32uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPNullableInt32uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<WiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableInt32u::TypeInfo;
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                       params:(CHIPSubscribeParams * _Nullable)params
-                                      subscriptionEstablished:
-                                          (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                reportHandler:
-                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<WiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                   endpoint:(NSNumber *)endpoint
-                                                      queue:(dispatch_queue_t)queue
-                                          completionHandler:
-                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeNullableInt32uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPWiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = WiFiNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<WiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+    [self writeAttributeNullableInt32uWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
 }
-
-- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)writeAttributeNullableInt32uWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<WiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
 
-- (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
-{
-    new CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<WiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
-                nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
         },
-        subscriptionEstablishedHandler);
-}
-
-+ (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPWiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = WiFiNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<WiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableInt32u::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedIntValue;
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
-
-- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
-                                                            NSArray * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<WiFiNetworkDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                params:(CHIPSubscribeParams * _Nullable)params
-                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNullableInt32uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt32uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<WiFiNetworkDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableInt32u::TypeInfo;
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                            endpoint:(NSNumber *)endpoint
-                                               queue:(dispatch_queue_t)queue
-                                   completionHandler:
-                                       (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableInt32uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPWiFiNetworkDiagnosticsAttributeListListAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = WiFiNetworkDiagnostics::Attributes::AttributeList::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<WiFiNetworkDiagnosticsAttributeListListAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPNullableInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = TestCluster::Attributes::NullableInt32u::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt32uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeNullableInt40uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
+{
+    new CHIPNullableInt64uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::NullableInt40u::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
-                                                         NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeNullableInt40uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = WiFiNetworkDiagnostics::Attributes::FeatureMap::TypeInfo;
-        auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    [self writeAttributeNullableInt40uWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
 }
+- (void)writeAttributeNullableInt40uWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
 
-- (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                        maxInterval:(NSNumber * _Nonnull)maxInterval
-                                             params:(CHIPSubscribeParams * _Nullable)params
-                            subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                      reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableInt40u::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedLongLongValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNullableInt40uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt32uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::FeatureMap::TypeInfo;
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableInt40u::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                         endpoint:(NSNumber *)endpoint
-                                            queue:(dispatch_queue_t)queue
-                                completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableInt40uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::NullableInt40u::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -79454,59 +78808,97 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeNullableInt48uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = WiFiNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt64uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::NullableInt48u::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                 subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                           reportHandler:
-                                               (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeNullableInt48uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeNullableInt48uWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeNullableInt48uWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableInt48u::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedLongLongValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNullableInt48uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableInt48u::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                              endpoint:(NSNumber *)endpoint
-                                                 queue:(dispatch_queue_t)queue
-                                     completionHandler:
-                                         (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableInt48uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::NullableInt48u::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -79516,321 +78908,497 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-@end
-
-@implementation CHIPWindowCovering
-
-- (chip::Controller::ClusterBase *)getCluster
+- (void)readAttributeNullableInt56uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    return &_cppCluster;
+    new CHIPNullableInt64uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::NullableInt56u::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)upOrOpenWithCompletionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNullableInt56uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self upOrOpenWithParams:nil completionHandler:completionHandler];
+    [self writeAttributeNullableInt56uWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
 }
-- (void)upOrOpenWithParams:(CHIPWindowCoveringClusterUpOrOpenParams * _Nullable)params
-         completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNullableInt56uWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    WindowCovering::Commands::UpOrOpen::Type request;
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
     }
 
-    new CHIPCommandSuccessCallbackBridge(
+    new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
+        ^(id _Nullable ignored, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableInt56u::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedLongLongValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)downOrCloseWithCompletionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeNullableInt56uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    [self downOrCloseWithParams:nil completionHandler:completionHandler];
+    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = TestCluster::Attributes::NullableInt56u::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
-- (void)downOrCloseWithParams:(CHIPWindowCoveringClusterDownOrCloseParams * _Nullable)params
-            completionHandler:(StatusCompletion)completionHandler
+
++ (void)readAttributeNullableInt56uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    WindowCovering::Commands::DownOrClose::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = TestCluster::Attributes::NullableInt56u::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
 
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+- (void)readAttributeNullableInt64uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
+{
+    new CHIPNullableInt64uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::NullableInt64u::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)stopMotionWithCompletionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNullableInt64uWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    [self stopMotionWithParams:nil completionHandler:completionHandler];
+    [self writeAttributeNullableInt64uWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
 }
-- (void)stopMotionWithParams:(CHIPWindowCoveringClusterStopMotionParams * _Nullable)params
-           completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNullableInt64uWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    WindowCovering::Commands::StopMotion::Type request;
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
     }
 
-    new CHIPCommandSuccessCallbackBridge(
+    new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
+        ^(id _Nullable ignored, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableInt64u::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedLongLongValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)goToLiftValueWithParams:(CHIPWindowCoveringClusterGoToLiftValueParams *)params
-              completionHandler:(StatusCompletion)completionHandler
+- (void)subscribeAttributeNullableInt64uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    WindowCovering::Commands::GoToLiftValue::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+    new CHIPNullableInt64uAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = TestCluster::Attributes::NullableInt64u::TypeInfo;
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPNullableInt64uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
+}
+
++ (void)readAttributeNullableInt64uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPNullableInt64uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = TestCluster::Attributes::NullableInt64u::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt64uAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
-    request.liftValue = params.liftValue.unsignedShortValue;
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
 
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+- (void)readAttributeNullableInt8sWithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+{
+    new CHIPNullableInt8sAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::NullableInt8s::TypeInfo;
+            auto successFn = Callback<NullableInt8sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)goToLiftPercentageWithParams:(CHIPWindowCoveringClusterGoToLiftPercentageParams *)params
-                   completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNullableInt8sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    WindowCovering::Commands::GoToLiftPercentage::Type request;
+    [self writeAttributeNullableInt8sWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeNullableInt8sWithValue:(NSNumber * _Nullable)value
+                                      params:(CHIPWriteParams * _Nullable)params
+                           completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
     }
-    request.liftPercent100thsValue = params.liftPercent100thsValue.unsignedShortValue;
 
-    new CHIPCommandSuccessCallbackBridge(
+    new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
+        ^(id _Nullable ignored, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableInt8s::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.charValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNullableInt8sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableInt8sAttributeCallbackSubscriptionBridge(
+        self.callbackQueue, reportHandler,
+        ^(Cancelable * success, Cancelable * failure) {
+            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
+                // We don't support disabling auto-resubscribe.
+                return CHIP_ERROR_INVALID_ARGUMENT;
+            }
+            using TypeInfo = TestCluster::Attributes::NullableInt8s::TypeInfo;
+            auto successFn = Callback<NullableInt8sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
+            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
+                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
+                CHIPNullableInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
+                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
+        },
+        subscriptionEstablishedHandler);
 }
 
-- (void)goToTiltValueWithParams:(CHIPWindowCoveringClusterGoToTiltValueParams *)params
-              completionHandler:(StatusCompletion)completionHandler
++ (void)readAttributeNullableInt8sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    WindowCovering::Commands::GoToTiltValue::Type request;
-    if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+    new CHIPNullableInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = TestCluster::Attributes::NullableInt8s::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt8sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
+            }
+            return err;
         }
-    }
-    request.tiltValue = params.tiltValue.unsignedShortValue;
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
 
-    new CHIPCommandSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
+- (void)readAttributeNullableInt16sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
+{
+    new CHIPNullableInt16sAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::NullableInt16s::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)goToTiltPercentageWithParams:(CHIPWindowCoveringClusterGoToTiltPercentageParams *)params
-                   completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNullableInt16sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    chip::Optional<uint16_t> timedInvokeTimeoutMs;
-    ListFreer listFreer;
-    WindowCovering::Commands::GoToTiltPercentage::Type request;
+    [self writeAttributeNullableInt16sWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeNullableInt16sWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
-        if (params.timedInvokeTimeoutMs != nil) {
-            timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
         }
     }
-    request.tiltPercent100thsValue = params.tiltPercent100thsValue.unsignedShortValue;
 
-    new CHIPCommandSuccessCallbackBridge(
+    new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
-        ^(id _Nullable value, NSError * _Nullable error) {
+        ^(id _Nullable ignored, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
-            auto successFn = Callback<CHIPCommandSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.InvokeCommand(
-                request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
-        });
-}
-
-- (void)readAttributeTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
-{
-    new CHIPWindowCoveringClusterTypeAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WindowCovering::Attributes::Type::TypeInfo;
-            auto successFn = Callback<WindowCoveringClusterTypeAttributeCallback>::FromCancelable(success);
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableInt16s::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.shortValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                       params:(CHIPSubscribeParams * _Nullable)params
-                      subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNullableInt16sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPWindowCoveringClusterTypeAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WindowCovering::Attributes::Type::TypeInfo;
-            auto successFn = Callback<WindowCoveringClusterTypeAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableInt16s::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWindowCoveringClusterTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                   endpoint:(NSNumber *)endpoint
-                                      queue:(dispatch_queue_t)queue
-                          completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableInt16sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPWindowCoveringClusterTypeAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = WindowCovering::Attributes::Type::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<WindowCoveringClusterTypeAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = TestCluster::Attributes::NullableInt16s::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
+}
+
+- (void)readAttributeNullableInt24sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
+{
+    new CHIPNullableInt32sAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::NullableInt24s::TypeInfo;
+            auto successFn = Callback<NullableInt32sAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)readAttributePhysicalClosedLimitLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
+- (void)writeAttributeNullableInt24sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = WindowCovering::Attributes::PhysicalClosedLimitLift::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    [self writeAttributeNullableInt24sWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
 }
+- (void)writeAttributeNullableInt24sWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
 
-- (void)subscribeAttributePhysicalClosedLimitLiftWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableInt24s::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.intValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNullableInt24sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt32sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WindowCovering::Attributes::PhysicalClosedLimitLift::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableInt24s::TypeInfo;
+            auto successFn = Callback<NullableInt32sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePhysicalClosedLimitLiftWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableInt24sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt32sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WindowCovering::Attributes::PhysicalClosedLimitLift::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::NullableInt24s::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt32sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -79840,60 +79408,97 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributePhysicalClosedLimitTiltWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))completionHandler
+- (void)readAttributeNullableInt32sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = WindowCovering::Attributes::PhysicalClosedLimitTilt::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt32sAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::NullableInt32s::TypeInfo;
+            auto successFn = Callback<NullableInt32sAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributePhysicalClosedLimitTiltWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                     maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                          params:(CHIPSubscribeParams * _Nullable)params
-                                         subscriptionEstablished:
-                                             (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                   reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))reportHandler
+- (void)writeAttributeNullableInt32sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeNullableInt32sWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeNullableInt32sWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableInt32s::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.intValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNullableInt32sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableInt32sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WindowCovering::Attributes::PhysicalClosedLimitTilt::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableInt32s::TypeInfo;
+            auto successFn = Callback<NullableInt32sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt32sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributePhysicalClosedLimitTiltWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                      endpoint:(NSNumber *)endpoint
-                                                         queue:(dispatch_queue_t)queue
-                                             completionHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableInt32sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt32sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WindowCovering::Attributes::PhysicalClosedLimitTilt::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::NullableInt32s::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt32sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -79903,61 +79508,97 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeCurrentPositionLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeNullableInt40sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(
+    new CHIPNullableInt64sAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WindowCovering::Attributes::CurrentPositionLift::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableInt40s::TypeInfo;
+            auto successFn = Callback<NullableInt64sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeCurrentPositionLiftWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeNullableInt40sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeNullableInt40sWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeNullableInt40sWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableInt40s::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.longLongValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNullableInt40sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableInt64sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WindowCovering::Attributes::CurrentPositionLift::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableInt40s::TypeInfo;
+            auto successFn = Callback<NullableInt64sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentPositionLiftWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableInt40sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt64sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WindowCovering::Attributes::CurrentPositionLift::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::NullableInt40s::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt64sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -79967,61 +79608,97 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeCurrentPositionTiltWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                  NSError * _Nullable error))completionHandler
+- (void)readAttributeNullableInt48sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(
+    new CHIPNullableInt64sAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WindowCovering::Attributes::CurrentPositionTilt::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableInt48s::TypeInfo;
+            auto successFn = Callback<NullableInt64sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeCurrentPositionTiltWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                      params:(CHIPSubscribeParams * _Nullable)params
-                                     subscriptionEstablished:
-                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                               reportHandler:
-                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeNullableInt48sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeNullableInt48sWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeNullableInt48sWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableInt48s::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.longLongValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNullableInt48sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableInt64sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = WindowCovering::Attributes::CurrentPositionTilt::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            }
+            using TypeInfo = TestCluster::Attributes::NullableInt48s::TypeInfo;
+            auto successFn = Callback<NullableInt64sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentPositionTiltWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                  endpoint:(NSNumber *)endpoint
-                                                     queue:(dispatch_queue_t)queue
-                                         completionHandler:
-                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableInt48sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt64sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WindowCovering::Attributes::CurrentPositionTilt::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::NullableInt48s::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt64sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -80031,60 +79708,97 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeNumberOfActuationsLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
+- (void)readAttributeNullableInt56sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = WindowCovering::Attributes::NumberOfActuationsLift::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt64sAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::NullableInt56s::TypeInfo;
+            auto successFn = Callback<NullableInt64sAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeNumberOfActuationsLiftWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:
-                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeNullableInt56sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeNullableInt56sWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeNullableInt56sWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableInt56s::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.longLongValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNullableInt56sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableInt64sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WindowCovering::Attributes::NumberOfActuationsLift::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableInt56s::TypeInfo;
+            auto successFn = Callback<NullableInt64sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNumberOfActuationsLiftWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableInt56sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt64sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WindowCovering::Attributes::NumberOfActuationsLift::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::NullableInt56s::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt64sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -80094,60 +79808,97 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeNumberOfActuationsTiltWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
+- (void)readAttributeNullableInt64sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = WindowCovering::Attributes::NumberOfActuationsTilt::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt64sAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::NullableInt64s::TypeInfo;
+            auto successFn = Callback<NullableInt64sAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeNumberOfActuationsTiltWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:
-                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeNullableInt64sWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeNullableInt64sWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeNullableInt64sWithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableInt64s::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.longLongValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNullableInt64sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableInt64sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WindowCovering::Attributes::NumberOfActuationsTilt::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableInt64s::TypeInfo;
+            auto successFn = Callback<NullableInt64sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt64sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeNumberOfActuationsTiltWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableInt64sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt64sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WindowCovering::Attributes::NumberOfActuationsTilt::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::NullableInt64s::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt64sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -80157,88 +79908,61 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeConfigStatusWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeNullableEnum8WithCompletionHandler:(void (^)(
+                                                            NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPWindowCoveringConfigStatusAttributeCallbackBridge(
+    new CHIPNullableInt8uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WindowCovering::Attributes::ConfigStatus::TypeInfo;
-            auto successFn = Callback<WindowCoveringConfigStatusAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableEnum8::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeConfigStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeNullableEnum8WithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPWindowCoveringConfigStatusAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = WindowCovering::Attributes::ConfigStatus::TypeInfo;
-            auto successFn = Callback<WindowCoveringConfigStatusAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWindowCoveringConfigStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+    [self writeAttributeNullableEnum8WithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
 }
-
-+ (void)readAttributeConfigStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeNullableEnum8WithValue:(NSNumber * _Nullable)value
+                                      params:(CHIPWriteParams * _Nullable)params
+                           completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPWindowCoveringConfigStatusAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = WindowCovering::Attributes::ConfigStatus::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<WindowCoveringConfigStatusAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
 
-- (void)readAttributeCurrentPositionLiftPercentageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt8uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WindowCovering::Attributes::CurrentPositionLiftPercentage::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableEnum8::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeCurrentPositionLiftPercentageWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                params:(CHIPSubscribeParams * _Nullable)params
-                                               subscriptionEstablished:
-                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNullableEnum8WithMinInterval:(NSNumber * _Nonnull)minInterval
+                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                params:(CHIPSubscribeParams * _Nullable)params
+                               subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                         reportHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
@@ -80247,7 +79971,7 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WindowCovering::Attributes::CurrentPositionLiftPercentage::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::NullableEnum8::TypeInfo;
             auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -80259,16 +79983,16 @@ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentPositionLiftPercentageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                            endpoint:(NSNumber *)endpoint
-                                                               queue:(dispatch_queue_t)queue
-                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableEnum8WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                            endpoint:(NSNumber *)endpoint
+                                               queue:(dispatch_queue_t)queue
+                                   completionHandler:
+                                       (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WindowCovering::Attributes::CurrentPositionLiftPercentage::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::NullableEnum8::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -80284,61 +80008,97 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeCurrentPositionTiltPercentageWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler
+- (void)readAttributeNullableEnum16WithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(
+    new CHIPNullableInt16uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WindowCovering::Attributes::CurrentPositionTiltPercentage::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableEnum16::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeCurrentPositionTiltPercentageWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                params:(CHIPSubscribeParams * _Nullable)params
-                                               subscriptionEstablished:
-                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))reportHandler
+- (void)writeAttributeNullableEnum16WithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeNullableEnum16WithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeNullableEnum16WithValue:(NSNumber * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableEnum16::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedShortValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNullableEnum16WithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:
+                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WindowCovering::Attributes::CurrentPositionTiltPercentage::TypeInfo;
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableEnum16::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentPositionTiltPercentageWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                            endpoint:(NSNumber *)endpoint
-                                                               queue:(dispatch_queue_t)queue
-                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                         NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableEnum16WithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:
+                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WindowCovering::Attributes::CurrentPositionTiltPercentage::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::NullableEnum16::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -80348,125 +80108,98 @@ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancela
     });
 }
 
-- (void)readAttributeOperationalStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                NSError * _Nullable error))completionHandler
+- (void)readAttributeNullableFloatSingleWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPWindowCoveringOperationalStatusAttributeCallbackBridge(
+    new CHIPNullableFloatAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WindowCovering::Attributes::OperationalStatus::TypeInfo;
-            auto successFn = Callback<WindowCoveringOperationalStatusAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableFloatSingle::TypeInfo;
+            auto successFn = Callback<NullableFloatAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeOperationalStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                               maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                    params:(CHIPSubscribeParams * _Nullable)params
-                                   subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                             reportHandler:
-                                                 (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeNullableFloatSingleWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPWindowCoveringOperationalStatusAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = WindowCovering::Attributes::OperationalStatus::TypeInfo;
-            auto successFn = Callback<WindowCoveringOperationalStatusAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWindowCoveringOperationalStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+    [self writeAttributeNullableFloatSingleWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
 }
-
-+ (void)readAttributeOperationalStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                endpoint:(NSNumber *)endpoint
-                                                   queue:(dispatch_queue_t)queue
-                                       completionHandler:
-                                           (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeNullableFloatSingleWithValue:(NSNumber * _Nullable)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPWindowCoveringOperationalStatusAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = WindowCovering::Attributes::OperationalStatus::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<WindowCoveringOperationalStatusAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
 
-- (void)readAttributeTargetPositionLiftPercent100thsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt16uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WindowCovering::Attributes::TargetPositionLiftPercent100ths::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableFloatSingle::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.floatValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)subscribeAttributeTargetPositionLiftPercent100thsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                                 subscriptionEstablished:
-                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))reportHandler
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNullableFloatSingleWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableFloatAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WindowCovering::Attributes::TargetPositionLiftPercent100ths::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableFloatSingle::TypeInfo;
+            auto successFn = Callback<NullableFloatAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableFloatAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTargetPositionLiftPercent100thsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                              endpoint:(NSNumber *)endpoint
-                                                                 queue:(dispatch_queue_t)queue
-                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableFloatSingleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableFloatAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WindowCovering::Attributes::TargetPositionLiftPercent100ths::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::NullableFloatSingle::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableFloatAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -80476,61 +80209,98 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeTargetPositionTiltPercent100thsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))completionHandler
+- (void)readAttributeNullableFloatDoubleWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(
+    new CHIPNullableDoubleAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WindowCovering::Attributes::TargetPositionTiltPercent100ths::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableFloatDouble::TypeInfo;
+            auto successFn = Callback<NullableDoubleAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeTargetPositionTiltPercent100thsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                             maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                  params:(CHIPSubscribeParams * _Nullable)params
-                                                 subscriptionEstablished:
-                                                     (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                           reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                             NSError * _Nullable error))reportHandler
+- (void)writeAttributeNullableFloatDoubleWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeNullableFloatDoubleWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeNullableFloatDoubleWithValue:(NSNumber * _Nullable)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableFloatDouble::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.doubleValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNullableFloatDoubleWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableDoubleAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WindowCovering::Attributes::TargetPositionTiltPercent100ths::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableFloatDouble::TypeInfo;
+            auto successFn = Callback<NullableDoubleAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableDoubleAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeTargetPositionTiltPercent100thsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                              endpoint:(NSNumber *)endpoint
-                                                                 queue:(dispatch_queue_t)queue
-                                                     completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                           NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableFloatDoubleWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableDoubleAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WindowCovering::Attributes::TargetPositionTiltPercent100ths::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::NullableFloatDouble::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableDoubleAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -80540,125 +80310,98 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeEndProductTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                             NSError * _Nullable error))completionHandler
+- (void)readAttributeNullableOctetStringWithCompletionHandler:(void (^)(NSData * _Nullable value,
+                                                                  NSError * _Nullable error))completionHandler
 {
-    new CHIPWindowCoveringClusterEndProductTypeAttributeCallbackBridge(
+    new CHIPNullableOctetStringAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WindowCovering::Attributes::EndProductType::TypeInfo;
-            auto successFn = Callback<WindowCoveringClusterEndProductTypeAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableOctetString::TypeInfo;
+            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeEndProductTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                            maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                 params:(CHIPSubscribeParams * _Nullable)params
-                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                          reportHandler:
-                                              (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeNullableOctetStringWithValue:(NSData * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPWindowCoveringClusterEndProductTypeAttributeCallbackSubscriptionBridge(
-        self.callbackQueue, reportHandler,
-        ^(Cancelable * success, Cancelable * failure) {
-            if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
-                // We don't support disabling auto-resubscribe.
-                return CHIP_ERROR_INVALID_ARGUMENT;
-            }
-            using TypeInfo = WindowCovering::Attributes::EndProductType::TypeInfo;
-            auto successFn = Callback<WindowCoveringClusterEndProductTypeAttributeCallback>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
-                [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWindowCoveringClusterEndProductTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
-                params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
-                params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
-        },
-        subscriptionEstablishedHandler);
+    [self writeAttributeNullableOctetStringWithValue:(NSData * _Nullable) value params:nil completionHandler:completionHandler];
 }
-
-+ (void)readAttributeEndProductTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                             endpoint:(NSNumber *)endpoint
-                                                queue:(dispatch_queue_t)queue
-                                    completionHandler:
-                                        (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)writeAttributeNullableOctetStringWithValue:(NSData * _Nullable)value
+                                            params:(CHIPWriteParams * _Nullable)params
+                                 completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPWindowCoveringClusterEndProductTypeAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = WindowCovering::Attributes::EndProductType::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<WindowCoveringClusterEndProductTypeAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
-            }
-            return CHIP_ERROR_NOT_FOUND;
-        });
-}
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
 
-- (void)readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))completionHandler
-{
-    new CHIPNullableInt16uAttributeCallbackBridge(
-        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WindowCovering::Attributes::CurrentPositionLiftPercent100ths::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableOctetString::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = [self asByteSpan:value];
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
         });
 }
 
-- (void)subscribeAttributeCurrentPositionLiftPercent100thsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                                  subscriptionEstablished:
-                                                      (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                            reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNullableOctetStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                 maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                      params:(CHIPSubscribeParams * _Nullable)params
+                                     subscriptionEstablished:
+                                         (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                               reportHandler:
+                                                   (void (^)(NSData * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPNullableOctetStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WindowCovering::Attributes::CurrentPositionLiftPercent100ths::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableOctetString::TypeInfo;
+            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableOctetStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentPositionLiftPercent100thsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                               endpoint:(NSNumber *)endpoint
-                                                                  queue:(dispatch_queue_t)queue
-                                                      completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableOctetStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                  endpoint:(NSNumber *)endpoint
+                                                     queue:(dispatch_queue_t)queue
+                                         completionHandler:
+                                             (void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableOctetStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WindowCovering::Attributes::CurrentPositionLiftPercent100ths::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::NullableOctetString::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableOctetStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -80668,61 +80411,97 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                               NSError * _Nullable error))completionHandler
+- (void)readAttributeNullableCharStringWithCompletionHandler:(void (^)(NSString * _Nullable value,
+                                                                 NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(
+    new CHIPNullableCharStringAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WindowCovering::Attributes::CurrentPositionTiltPercent100ths::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableCharString::TypeInfo;
+            auto successFn = Callback<NullableCharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeCurrentPositionTiltPercent100thsWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                              maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                                   params:(CHIPSubscribeParams * _Nullable)params
-                                                  subscriptionEstablished:
-                                                      (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                            reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                              NSError * _Nullable error))reportHandler
+- (void)writeAttributeNullableCharStringWithValue:(NSString * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeNullableCharStringWithValue:(NSString * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeNullableCharStringWithValue:(NSString * _Nullable)value
+                                           params:(CHIPWriteParams * _Nullable)params
+                                completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableCharString::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = [self asCharSpan:value];
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNullableCharStringWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                     params:(CHIPSubscribeParams * _Nullable)params
+                                    subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                              reportHandler:
+                                                  (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableCharStringAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WindowCovering::Attributes::CurrentPositionTiltPercent100ths::TypeInfo;
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableCharString::TypeInfo;
+            auto successFn = Callback<NullableCharStringAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeCurrentPositionTiltPercent100thsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                               endpoint:(NSNumber *)endpoint
-                                                                  queue:(dispatch_queue_t)queue
-                                                      completionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                            NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableCharStringWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                 endpoint:(NSNumber *)endpoint
+                                                    queue:(dispatch_queue_t)queue
+                                        completionHandler:
+                                            (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WindowCovering::Attributes::CurrentPositionTiltPercent100ths::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::NullableCharString::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableCharStringAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -80732,186 +80511,313 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel
     });
 }
 
-- (void)readAttributeInstalledOpenLimitLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
+- (void)readAttributeNullableEnumAttrWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                               NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = WindowCovering::Attributes::InstalledOpenLimitLift::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::NullableEnumAttr::TypeInfo;
+            auto successFn = Callback<NullableTestClusterClusterSimpleEnumAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeInstalledOpenLimitLiftWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:
-                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeNullableEnumAttrWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeNullableEnumAttrWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler];
+}
+- (void)writeAttributeNullableEnumAttrWithValue:(NSNumber * _Nullable)value
+                                         params:(CHIPWriteParams * _Nullable)params
+                              completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableEnumAttr::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNullableEnumAttrWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                              maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                   params:(CHIPSubscribeParams * _Nullable)params
+                                  subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                            reportHandler:
+                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WindowCovering::Attributes::InstalledOpenLimitLift::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableEnumAttr::TypeInfo;
+            auto successFn = Callback<NullableTestClusterClusterSimpleEnumAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInstalledOpenLimitLiftWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableEnumAttrWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                               endpoint:(NSNumber *)endpoint
+                                                  queue:(dispatch_queue_t)queue
+                                      completionHandler:
+                                          (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = WindowCovering::Attributes::InstalledOpenLimitLift::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPNullableTestClusterClusterSimpleEnumAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = TestCluster::Attributes::NullableEnumAttr::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<NullableTestClusterClusterSimpleEnumAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeInstalledClosedLimitLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
+- (void)readAttributeNullableStructWithCompletionHandler:(void (^)(CHIPTestClusterClusterSimpleStruct * _Nullable value,
+                                                             NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = WindowCovering::Attributes::InstalledClosedLimitLift::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPTestClusterNullableStructStructAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::NullableStruct::TypeInfo;
+            auto successFn = Callback<TestClusterNullableStructStructAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeNullableStructWithValue:(CHIPTestClusterClusterSimpleStruct * _Nullable)value
+                            completionHandler:(StatusCompletion)completionHandler
+{
+    [self writeAttributeNullableStructWithValue:(CHIPTestClusterClusterSimpleStruct * _Nullable) value
+                                         params:nil
+                              completionHandler:completionHandler];
+}
+- (void)writeAttributeNullableStructWithValue:(CHIPTestClusterClusterSimpleStruct * _Nullable)value
+                                       params:(CHIPWriteParams * _Nullable)params
+                            completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableStruct::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0.a = value.a.unsignedCharValue;
+                nonNullValue_0.b = value.b.boolValue;
+                nonNullValue_0.c = static_cast<std::remove_reference_t<decltype(nonNullValue_0.c)>>(value.c.unsignedCharValue);
+                nonNullValue_0.d = [self asByteSpan:value.d];
+                nonNullValue_0.e = [self asCharSpan:value.e];
+                nonNullValue_0.f = static_cast<std::remove_reference_t<decltype(nonNullValue_0.f)>>(value.f.unsignedCharValue);
+                nonNullValue_0.g = value.g.floatValue;
+                nonNullValue_0.h = value.h.doubleValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
 }
 
-- (void)subscribeAttributeInstalledClosedLimitLiftWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNullableStructWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                            maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                 params:(CHIPSubscribeParams * _Nullable)params
+                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                          reportHandler:(void (^)(CHIPTestClusterClusterSimpleStruct * _Nullable value,
+                                                            NSError * _Nullable error))reportHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    new CHIPTestClusterNullableStructStructAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WindowCovering::Attributes::InstalledClosedLimitLift::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableStruct::TypeInfo;
+            auto successFn = Callback<TestClusterNullableStructStructAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPTestClusterNullableStructStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInstalledClosedLimitLiftWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableStructWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                             endpoint:(NSNumber *)endpoint
+                                                queue:(dispatch_queue_t)queue
+                                    completionHandler:(void (^)(CHIPTestClusterClusterSimpleStruct * _Nullable value,
+                                                          NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        if (attributeCacheContainer.cppAttributeCache) {
-            chip::app::ConcreteAttributePath path;
-            using TypeInfo = WindowCovering::Attributes::InstalledClosedLimitLift::TypeInfo;
-            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-            path.mClusterId = TypeInfo::GetClusterId();
-            path.mAttributeId = TypeInfo::GetAttributeId();
-            TypeInfo::DecodableType value;
-            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-            if (err == CHIP_NO_ERROR) {
-                successFn->mCall(successFn->mContext, value);
+    new CHIPTestClusterNullableStructStructAttributeCallbackBridge(
+        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            if (attributeCacheContainer.cppAttributeCache) {
+                chip::app::ConcreteAttributePath path;
+                using TypeInfo = TestCluster::Attributes::NullableStruct::TypeInfo;
+                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+                path.mClusterId = TypeInfo::GetClusterId();
+                path.mAttributeId = TypeInfo::GetAttributeId();
+                TypeInfo::DecodableType value;
+                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+                auto successFn = Callback<TestClusterNullableStructStructAttributeCallback>::FromCancelable(success);
+                if (err == CHIP_NO_ERROR) {
+                    successFn->mCall(successFn->mContext, value);
+                }
+                return err;
             }
-            return err;
-        }
-        return CHIP_ERROR_NOT_FOUND;
-    });
+            return CHIP_ERROR_NOT_FOUND;
+        });
 }
 
-- (void)readAttributeInstalledOpenLimitTiltWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                     NSError * _Nullable error))completionHandler
+- (void)readAttributeNullableRangeRestrictedInt8uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = WindowCovering::Attributes::InstalledOpenLimitTilt::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt8uAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt8u::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeInstalledOpenLimitTiltWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                    maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                         params:(CHIPSubscribeParams * _Nullable)params
-                                        subscriptionEstablished:
-                                            (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                  reportHandler:
-                                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeNullableRangeRestrictedInt8uWithValue:(NSNumber * _Nullable)value
+                                          completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeNullableRangeRestrictedInt8uWithValue:(NSNumber * _Nullable) value
+                                                       params:nil
+                                            completionHandler:completionHandler];
+}
+- (void)writeAttributeNullableRangeRestrictedInt8uWithValue:(NSNumber * _Nullable)value
+                                                     params:(CHIPWriteParams * _Nullable)params
+                                          completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt8u::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNullableRangeRestrictedInt8uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                              subscriptionEstablished:
+                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WindowCovering::Attributes::InstalledOpenLimitTilt::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt8u::TypeInfo;
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInstalledOpenLimitTiltWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                     endpoint:(NSNumber *)endpoint
-                                                        queue:(dispatch_queue_t)queue
-                                            completionHandler:
-                                                (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableRangeRestrictedInt8uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                           endpoint:(NSNumber *)endpoint
+                                                              queue:(dispatch_queue_t)queue
+                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WindowCovering::Attributes::InstalledOpenLimitTilt::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt8u::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -80921,60 +80827,101 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeInstalledClosedLimitTiltWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
-                                                                       NSError * _Nullable error))completionHandler
+- (void)readAttributeNullableRangeRestrictedInt8sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = WindowCovering::Attributes::InstalledClosedLimitTilt::TypeInfo;
-        auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
-        auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-        return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
-    });
+    new CHIPNullableInt8sAttributeCallbackBridge(
+        self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt8s::TypeInfo;
+            auto successFn = Callback<NullableInt8sAttributeCallback>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)subscribeAttributeInstalledClosedLimitTiltWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                                      maxInterval:(NSNumber * _Nonnull)maxInterval
-                                                           params:(CHIPSubscribeParams * _Nullable)params
-                                          subscriptionEstablished:
-                                              (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                                    reportHandler:(void (^)(NSNumber * _Nullable value,
-                                                                      NSError * _Nullable error))reportHandler
+- (void)writeAttributeNullableRangeRestrictedInt8sWithValue:(NSNumber * _Nullable)value
+                                          completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPInt16uAttributeCallbackSubscriptionBridge(
+    [self writeAttributeNullableRangeRestrictedInt8sWithValue:(NSNumber * _Nullable) value
+                                                       params:nil
+                                            completionHandler:completionHandler];
+}
+- (void)writeAttributeNullableRangeRestrictedInt8sWithValue:(NSNumber * _Nullable)value
+                                                     params:(CHIPWriteParams * _Nullable)params
+                                          completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt8s::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.charValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNullableRangeRestrictedInt8sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                          maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                               params:(CHIPSubscribeParams * _Nullable)params
+                                              subscriptionEstablished:
+                                                  (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                        reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                          NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableInt8sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WindowCovering::Attributes::InstalledClosedLimitTilt::TypeInfo;
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt8s::TypeInfo;
+            auto successFn = Callback<NullableInt8sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt8sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeInstalledClosedLimitTiltWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                                       endpoint:(NSNumber *)endpoint
-                                                          queue:(dispatch_queue_t)queue
-                                              completionHandler:
-                                                  (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableRangeRestrictedInt8sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                           endpoint:(NSNumber *)endpoint
+                                                              queue:(dispatch_queue_t)queue
+                                                  completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                        NSError * _Nullable error))completionHandler
 {
-    new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt8sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WindowCovering::Attributes::InstalledClosedLimitTilt::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt8s::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt8sAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -80984,24 +80931,28 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
     });
 }
 
-- (void)readAttributeModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeNullableRangeRestrictedInt16uWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler
 {
-    new CHIPWindowCoveringModeAttributeCallbackBridge(
+    new CHIPNullableInt16uAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WindowCovering::Attributes::Mode::TypeInfo;
-            auto successFn = Callback<WindowCoveringModeAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt16u::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNullableRangeRestrictedInt16uWithValue:(NSNumber * _Nullable)value
+                                           completionHandler:(StatusCompletion)completionHandler
 {
-    [self writeAttributeModeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+    [self writeAttributeNullableRangeRestrictedInt16uWithValue:(NSNumber * _Nullable) value
+                                                        params:nil
+                                             completionHandler:completionHandler];
 }
-- (void)writeAttributeModeWithValue:(NSNumber * _Nonnull)value
-                             params:(CHIPWriteParams * _Nullable)params
-                  completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNullableRangeRestrictedInt16uWithValue:(NSNumber * _Nullable)value
+                                                      params:(CHIPWriteParams * _Nullable)params
+                                           completionHandler:(StatusCompletion)completionHandler
 {
     chip::Optional<uint16_t> timedWriteTimeoutMs;
     if (params != nil) {
@@ -81017,9 +80968,14 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::Mode::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt16u::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedShortValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(
@@ -81027,46 +80983,49 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)subscribeAttributeModeWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                  maxInterval:(NSNumber * _Nonnull)maxInterval
-                                       params:(CHIPSubscribeParams * _Nullable)params
-                      subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeNullableRangeRestrictedInt16uWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                params:(CHIPSubscribeParams * _Nullable)params
+                                               subscriptionEstablished:
+                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))reportHandler
 {
-    new CHIPWindowCoveringModeAttributeCallbackSubscriptionBridge(
+    new CHIPNullableInt16uAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WindowCovering::Attributes::Mode::TypeInfo;
-            auto successFn = Callback<WindowCoveringModeAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt16u::TypeInfo;
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWindowCoveringModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeModeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                   endpoint:(NSNumber *)endpoint
-                                      queue:(dispatch_queue_t)queue
-                          completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableRangeRestrictedInt16uWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                            endpoint:(NSNumber *)endpoint
+                                                               queue:(dispatch_queue_t)queue
+                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler
 {
-    new CHIPWindowCoveringModeAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+    new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WindowCovering::Attributes::Mode::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt16u::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
             TypeInfo::DecodableType value;
             CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-            auto successFn = Callback<WindowCoveringModeAttributeCallback>::FromCancelable(success);
+            auto successFn = Callback<NullableInt16uAttributeCallback>::FromCancelable(success);
             if (err == CHIP_NO_ERROR) {
                 successFn->mCall(successFn->mContext, value);
             }
@@ -81076,76 +81035,117 @@ new CHIPWindowCoveringModeAttributeCallbackBridge(queue, completionHandler, ^(Ca
     });
 }
 
-- (void)readAttributeSafetyStatusWithCompletionHandler:(void (^)(
-                                                           NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeNullableRangeRestrictedInt16sWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                            NSError * _Nullable error))completionHandler
 {
-    new CHIPWindowCoveringSafetyStatusAttributeCallbackBridge(
+    new CHIPNullableInt16sAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WindowCovering::Attributes::SafetyStatus::TypeInfo;
-            auto successFn = Callback<WindowCoveringSafetyStatusAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt16s::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)subscribeAttributeSafetyStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
-                                          maxInterval:(NSNumber * _Nonnull)maxInterval
-                                               params:(CHIPSubscribeParams * _Nullable)params
-                              subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
-                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)writeAttributeNullableRangeRestrictedInt16sWithValue:(NSNumber * _Nullable)value
+                                           completionHandler:(StatusCompletion)completionHandler
 {
-    new CHIPWindowCoveringSafetyStatusAttributeCallbackSubscriptionBridge(
+    [self writeAttributeNullableRangeRestrictedInt16sWithValue:(NSNumber * _Nullable) value
+                                                        params:nil
+                                             completionHandler:completionHandler];
+}
+- (void)writeAttributeNullableRangeRestrictedInt16sWithValue:(NSNumber * _Nullable)value
+                                                      params:(CHIPWriteParams * _Nullable)params
+                                           completionHandler:(StatusCompletion)completionHandler
+{
+    chip::Optional<uint16_t> timedWriteTimeoutMs;
+    if (params != nil) {
+        if (params.timedWriteTimeoutMs != nil) {
+            timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue);
+        }
+    }
+
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt16s::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.shortValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(
+                cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs);
+        });
+}
+
+- (void)subscribeAttributeNullableRangeRestrictedInt16sWithMinInterval:(NSNumber * _Nonnull)minInterval
+                                                           maxInterval:(NSNumber * _Nonnull)maxInterval
+                                                                params:(CHIPSubscribeParams * _Nullable)params
+                                               subscriptionEstablished:
+                                                   (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+                                                         reportHandler:(void (^)(NSNumber * _Nullable value,
+                                                                           NSError * _Nullable error))reportHandler
+{
+    new CHIPNullableInt16sAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WindowCovering::Attributes::SafetyStatus::TypeInfo;
-            auto successFn = Callback<WindowCoveringSafetyStatusAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt16s::TypeInfo;
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWindowCoveringSafetyStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
         subscriptionEstablishedHandler);
 }
 
-+ (void)readAttributeSafetyStatusWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
-                                           endpoint:(NSNumber *)endpoint
-                                              queue:(dispatch_queue_t)queue
-                                  completionHandler:
-                                      (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeNullableRangeRestrictedInt16sWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+                                                            endpoint:(NSNumber *)endpoint
+                                                               queue:(dispatch_queue_t)queue
+                                                   completionHandler:(void (^)(NSNumber * _Nullable value,
+                                                                         NSError * _Nullable error))completionHandler
 {
-    new CHIPWindowCoveringSafetyStatusAttributeCallbackBridge(
-        queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            if (attributeCacheContainer.cppAttributeCache) {
-                chip::app::ConcreteAttributePath path;
-                using TypeInfo = WindowCovering::Attributes::SafetyStatus::TypeInfo;
-                path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
-                path.mClusterId = TypeInfo::GetClusterId();
-                path.mAttributeId = TypeInfo::GetAttributeId();
-                TypeInfo::DecodableType value;
-                CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<WindowCoveringSafetyStatusAttributeCallback>::FromCancelable(success);
-                if (err == CHIP_NO_ERROR) {
-                    successFn->mCall(successFn->mContext, value);
-                }
-                return err;
+    new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+        if (attributeCacheContainer.cppAttributeCache) {
+            chip::app::ConcreteAttributePath path;
+            using TypeInfo = TestCluster::Attributes::NullableRangeRestrictedInt16s::TypeInfo;
+            path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+            path.mClusterId = TypeInfo::GetClusterId();
+            path.mAttributeId = TypeInfo::GetAttributeId();
+            TypeInfo::DecodableType value;
+            CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+            auto successFn = Callback<NullableInt16sAttributeCallback>::FromCancelable(success);
+            if (err == CHIP_NO_ERROR) {
+                successFn->mCall(successFn->mContext, value);
             }
-            return CHIP_ERROR_NOT_FOUND;
-        });
+            return err;
+        }
+        return CHIP_ERROR_NOT_FOUND;
+    });
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                    NSError * _Nullable error))completionHandler
 {
-    new CHIPWindowCoveringGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPTestClusterGeneratedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WindowCovering::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<WindowCoveringGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<TestClusterGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -81159,19 +81159,19 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
                                                 reportHandler:
                                                     (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPWindowCoveringGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPTestClusterGeneratedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WindowCovering::Attributes::GeneratedCommandList::TypeInfo;
-            auto successFn = Callback<WindowCoveringGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::GeneratedCommandList::TypeInfo;
+            auto successFn = Callback<TestClusterGeneratedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWindowCoveringGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPTestClusterGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -81184,17 +81184,17 @@ + (void)readAttributeGeneratedCommandListWithAttributeCache:(CHIPAttributeCacheC
                                           completionHandler:
                                               (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPWindowCoveringGeneratedCommandListListAttributeCallbackBridge(
+    new CHIPTestClusterGeneratedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = WindowCovering::Attributes::GeneratedCommandList::TypeInfo;
+                using TypeInfo = TestCluster::Attributes::GeneratedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<WindowCoveringGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<TestClusterGeneratedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -81207,10 +81207,10 @@ new CHIPWindowCoveringGeneratedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
                                                                   NSError * _Nullable error))completionHandler
 {
-    new CHIPWindowCoveringAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPTestClusterAcceptedCommandListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WindowCovering::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<WindowCoveringAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<TestClusterAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -81224,19 +81224,19 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
                                                reportHandler:
                                                    (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPWindowCoveringAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+    new CHIPTestClusterAcceptedCommandListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WindowCovering::Attributes::AcceptedCommandList::TypeInfo;
-            auto successFn = Callback<WindowCoveringAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::AcceptedCommandList::TypeInfo;
+            auto successFn = Callback<TestClusterAcceptedCommandListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWindowCoveringAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPTestClusterAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -81249,17 +81249,17 @@ + (void)readAttributeAcceptedCommandListWithAttributeCache:(CHIPAttributeCacheCo
                                          completionHandler:
                                              (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPWindowCoveringAcceptedCommandListListAttributeCallbackBridge(
+    new CHIPTestClusterAcceptedCommandListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = WindowCovering::Attributes::AcceptedCommandList::TypeInfo;
+                using TypeInfo = TestCluster::Attributes::AcceptedCommandList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<WindowCoveringAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<TestClusterAcceptedCommandListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -81272,10 +81272,10 @@ new CHIPWindowCoveringAcceptedCommandListListAttributeCallbackBridge(
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
                                                             NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPWindowCoveringAttributeListListAttributeCallbackBridge(
+    new CHIPTestClusterAttributeListListAttributeCallbackBridge(
         self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-            using TypeInfo = WindowCovering::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<WindowCoveringAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<TestClusterAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
         });
@@ -81287,19 +81287,19 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
                                subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    new CHIPWindowCoveringAttributeListListAttributeCallbackSubscriptionBridge(
+    new CHIPTestClusterAttributeListListAttributeCallbackSubscriptionBridge(
         self.callbackQueue, reportHandler,
         ^(Cancelable * success, Cancelable * failure) {
             if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WindowCovering::Attributes::AttributeList::TypeInfo;
-            auto successFn = Callback<WindowCoveringAttributeListListAttributeCallback>::FromCancelable(success);
+            using TypeInfo = TestCluster::Attributes::AttributeList::TypeInfo;
+            auto successFn = Callback<TestClusterAttributeListListAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
                 [minInterval unsignedShortValue], [maxInterval unsignedShortValue],
-                CHIPWindowCoveringAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+                CHIPTestClusterAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
                 params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
                 params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
         },
@@ -81312,17 +81312,17 @@ + (void)readAttributeAttributeListWithAttributeCache:(CHIPAttributeCacheContaine
                                    completionHandler:
                                        (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
-    new CHIPWindowCoveringAttributeListListAttributeCallbackBridge(
+    new CHIPTestClusterAttributeListListAttributeCallbackBridge(
         queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
             if (attributeCacheContainer.cppAttributeCache) {
                 chip::app::ConcreteAttributePath path;
-                using TypeInfo = WindowCovering::Attributes::AttributeList::TypeInfo;
+                using TypeInfo = TestCluster::Attributes::AttributeList::TypeInfo;
                 path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
                 path.mClusterId = TypeInfo::GetClusterId();
                 path.mAttributeId = TypeInfo::GetAttributeId();
                 TypeInfo::DecodableType value;
                 CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
-                auto successFn = Callback<WindowCoveringAttributeListListAttributeCallback>::FromCancelable(success);
+                auto successFn = Callback<TestClusterAttributeListListAttributeCallback>::FromCancelable(success);
                 if (err == CHIP_NO_ERROR) {
                     successFn->mCall(successFn->mContext, value);
                 }
@@ -81336,7 +81336,7 @@ - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
                                                          NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = WindowCovering::Attributes::FeatureMap::TypeInfo;
+        using TypeInfo = TestCluster::Attributes::FeatureMap::TypeInfo;
         auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -81356,7 +81356,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WindowCovering::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::FeatureMap::TypeInfo;
             auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -81376,7 +81376,7 @@ + (void)readAttributeFeatureMapWithAttributeCache:(CHIPAttributeCacheContainer *
     new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WindowCovering::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::FeatureMap::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
@@ -81396,7 +81396,7 @@ - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _
                                                               NSError * _Nullable error))completionHandler
 {
     new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
-        using TypeInfo = WindowCovering::Attributes::ClusterRevision::TypeInfo;
+        using TypeInfo = TestCluster::Attributes::ClusterRevision::TypeInfo;
         auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
         auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
         return self.cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -81417,7 +81417,7 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge(
                 // We don't support disabling auto-resubscribe.
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
-            using TypeInfo = WindowCovering::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::ClusterRevision::TypeInfo;
             auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -81438,7 +81438,7 @@ + (void)readAttributeClusterRevisionWithAttributeCache:(CHIPAttributeCacheContai
     new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
         if (attributeCacheContainer.cppAttributeCache) {
             chip::app::ConcreteAttributePath path;
-            using TypeInfo = WindowCovering::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::ClusterRevision::TypeInfo;
             path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
             path.mClusterId = TypeInfo::GetClusterId();
             path.mAttributeId = TypeInfo::GetAttributeId();
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc_internal.h b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc_internal.h
index eb816635b5053c..2f8c417d4a0f57 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc_internal.h
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc_internal.h
@@ -21,258 +21,258 @@
 
 #import "CHIPDevice.h"
 
-@interface CHIPAccessControl ()
-@property (readonly) chip::Controller::AccessControlCluster cppCluster;
-@end
-
-@interface CHIPAccountLogin ()
-@property (readonly) chip::Controller::AccountLoginCluster cppCluster;
-@end
-
-@interface CHIPAdministratorCommissioning ()
-@property (readonly) chip::Controller::AdministratorCommissioningCluster cppCluster;
+@interface CHIPIdentify ()
+@property (readonly) chip::Controller::IdentifyCluster cppCluster;
 @end
 
-@interface CHIPApplicationBasic ()
-@property (readonly) chip::Controller::ApplicationBasicCluster cppCluster;
+@interface CHIPGroups ()
+@property (readonly) chip::Controller::GroupsCluster cppCluster;
 @end
 
-@interface CHIPApplicationLauncher ()
-@property (readonly) chip::Controller::ApplicationLauncherCluster cppCluster;
+@interface CHIPScenes ()
+@property (readonly) chip::Controller::ScenesCluster cppCluster;
 @end
 
-@interface CHIPAudioOutput ()
-@property (readonly) chip::Controller::AudioOutputCluster cppCluster;
+@interface CHIPOnOff ()
+@property (readonly) chip::Controller::OnOffCluster cppCluster;
 @end
 
-@interface CHIPBarrierControl ()
-@property (readonly) chip::Controller::BarrierControlCluster cppCluster;
+@interface CHIPOnOffSwitchConfiguration ()
+@property (readonly) chip::Controller::OnOffSwitchConfigurationCluster cppCluster;
 @end
 
-@interface CHIPBasic ()
-@property (readonly) chip::Controller::BasicCluster cppCluster;
+@interface CHIPLevelControl ()
+@property (readonly) chip::Controller::LevelControlCluster cppCluster;
 @end
 
 @interface CHIPBinaryInputBasic ()
 @property (readonly) chip::Controller::BinaryInputBasicCluster cppCluster;
 @end
 
+@interface CHIPDescriptor ()
+@property (readonly) chip::Controller::DescriptorCluster cppCluster;
+@end
+
 @interface CHIPBinding ()
 @property (readonly) chip::Controller::BindingCluster cppCluster;
 @end
 
-@interface CHIPBooleanState ()
-@property (readonly) chip::Controller::BooleanStateCluster cppCluster;
+@interface CHIPAccessControl ()
+@property (readonly) chip::Controller::AccessControlCluster cppCluster;
 @end
 
 @interface CHIPBridgedActions ()
 @property (readonly) chip::Controller::BridgedActionsCluster cppCluster;
 @end
 
-@interface CHIPBridgedDeviceBasic ()
-@property (readonly) chip::Controller::BridgedDeviceBasicCluster cppCluster;
+@interface CHIPBasic ()
+@property (readonly) chip::Controller::BasicCluster cppCluster;
 @end
 
-@interface CHIPChannel ()
-@property (readonly) chip::Controller::ChannelCluster cppCluster;
+@interface CHIPOtaSoftwareUpdateProvider ()
+@property (readonly) chip::Controller::OtaSoftwareUpdateProviderCluster cppCluster;
 @end
 
-@interface CHIPColorControl ()
-@property (readonly) chip::Controller::ColorControlCluster cppCluster;
+@interface CHIPOtaSoftwareUpdateRequestor ()
+@property (readonly) chip::Controller::OtaSoftwareUpdateRequestorCluster cppCluster;
 @end
 
-@interface CHIPContentLauncher ()
-@property (readonly) chip::Controller::ContentLauncherCluster cppCluster;
+@interface CHIPLocalizationConfiguration ()
+@property (readonly) chip::Controller::LocalizationConfigurationCluster cppCluster;
 @end
 
-@interface CHIPDescriptor ()
-@property (readonly) chip::Controller::DescriptorCluster cppCluster;
+@interface CHIPTimeFormatLocalization ()
+@property (readonly) chip::Controller::TimeFormatLocalizationCluster cppCluster;
 @end
 
-@interface CHIPDiagnosticLogs ()
-@property (readonly) chip::Controller::DiagnosticLogsCluster cppCluster;
+@interface CHIPUnitLocalization ()
+@property (readonly) chip::Controller::UnitLocalizationCluster cppCluster;
 @end
 
-@interface CHIPDoorLock ()
-@property (readonly) chip::Controller::DoorLockCluster cppCluster;
+@interface CHIPPowerSourceConfiguration ()
+@property (readonly) chip::Controller::PowerSourceConfigurationCluster cppCluster;
 @end
 
-@interface CHIPElectricalMeasurement ()
-@property (readonly) chip::Controller::ElectricalMeasurementCluster cppCluster;
+@interface CHIPPowerSource ()
+@property (readonly) chip::Controller::PowerSourceCluster cppCluster;
 @end
 
-@interface CHIPEthernetNetworkDiagnostics ()
-@property (readonly) chip::Controller::EthernetNetworkDiagnosticsCluster cppCluster;
+@interface CHIPGeneralCommissioning ()
+@property (readonly) chip::Controller::GeneralCommissioningCluster cppCluster;
 @end
 
-@interface CHIPFanControl ()
-@property (readonly) chip::Controller::FanControlCluster cppCluster;
+@interface CHIPNetworkCommissioning ()
+@property (readonly) chip::Controller::NetworkCommissioningCluster cppCluster;
 @end
 
-@interface CHIPFixedLabel ()
-@property (readonly) chip::Controller::FixedLabelCluster cppCluster;
+@interface CHIPDiagnosticLogs ()
+@property (readonly) chip::Controller::DiagnosticLogsCluster cppCluster;
 @end
 
-@interface CHIPFlowMeasurement ()
-@property (readonly) chip::Controller::FlowMeasurementCluster cppCluster;
+@interface CHIPGeneralDiagnostics ()
+@property (readonly) chip::Controller::GeneralDiagnosticsCluster cppCluster;
 @end
 
-@interface CHIPGeneralCommissioning ()
-@property (readonly) chip::Controller::GeneralCommissioningCluster cppCluster;
+@interface CHIPSoftwareDiagnostics ()
+@property (readonly) chip::Controller::SoftwareDiagnosticsCluster cppCluster;
 @end
 
-@interface CHIPGeneralDiagnostics ()
-@property (readonly) chip::Controller::GeneralDiagnosticsCluster cppCluster;
+@interface CHIPThreadNetworkDiagnostics ()
+@property (readonly) chip::Controller::ThreadNetworkDiagnosticsCluster cppCluster;
 @end
 
-@interface CHIPGroupKeyManagement ()
-@property (readonly) chip::Controller::GroupKeyManagementCluster cppCluster;
+@interface CHIPWiFiNetworkDiagnostics ()
+@property (readonly) chip::Controller::WiFiNetworkDiagnosticsCluster cppCluster;
 @end
 
-@interface CHIPGroups ()
-@property (readonly) chip::Controller::GroupsCluster cppCluster;
+@interface CHIPEthernetNetworkDiagnostics ()
+@property (readonly) chip::Controller::EthernetNetworkDiagnosticsCluster cppCluster;
 @end
 
-@interface CHIPIdentify ()
-@property (readonly) chip::Controller::IdentifyCluster cppCluster;
+@interface CHIPBridgedDeviceBasic ()
+@property (readonly) chip::Controller::BridgedDeviceBasicCluster cppCluster;
 @end
 
-@interface CHIPIlluminanceMeasurement ()
-@property (readonly) chip::Controller::IlluminanceMeasurementCluster cppCluster;
+@interface CHIPSwitch ()
+@property (readonly) chip::Controller::SwitchCluster cppCluster;
 @end
 
-@interface CHIPKeypadInput ()
-@property (readonly) chip::Controller::KeypadInputCluster cppCluster;
+@interface CHIPAdministratorCommissioning ()
+@property (readonly) chip::Controller::AdministratorCommissioningCluster cppCluster;
 @end
 
-@interface CHIPLevelControl ()
-@property (readonly) chip::Controller::LevelControlCluster cppCluster;
+@interface CHIPOperationalCredentials ()
+@property (readonly) chip::Controller::OperationalCredentialsCluster cppCluster;
 @end
 
-@interface CHIPLocalizationConfiguration ()
-@property (readonly) chip::Controller::LocalizationConfigurationCluster cppCluster;
+@interface CHIPGroupKeyManagement ()
+@property (readonly) chip::Controller::GroupKeyManagementCluster cppCluster;
 @end
 
-@interface CHIPLowPower ()
-@property (readonly) chip::Controller::LowPowerCluster cppCluster;
+@interface CHIPFixedLabel ()
+@property (readonly) chip::Controller::FixedLabelCluster cppCluster;
 @end
 
-@interface CHIPMediaInput ()
-@property (readonly) chip::Controller::MediaInputCluster cppCluster;
+@interface CHIPUserLabel ()
+@property (readonly) chip::Controller::UserLabelCluster cppCluster;
 @end
 
-@interface CHIPMediaPlayback ()
-@property (readonly) chip::Controller::MediaPlaybackCluster cppCluster;
+@interface CHIPBooleanState ()
+@property (readonly) chip::Controller::BooleanStateCluster cppCluster;
 @end
 
 @interface CHIPModeSelect ()
 @property (readonly) chip::Controller::ModeSelectCluster cppCluster;
 @end
 
-@interface CHIPNetworkCommissioning ()
-@property (readonly) chip::Controller::NetworkCommissioningCluster cppCluster;
+@interface CHIPDoorLock ()
+@property (readonly) chip::Controller::DoorLockCluster cppCluster;
 @end
 
-@interface CHIPOtaSoftwareUpdateProvider ()
-@property (readonly) chip::Controller::OtaSoftwareUpdateProviderCluster cppCluster;
+@interface CHIPWindowCovering ()
+@property (readonly) chip::Controller::WindowCoveringCluster cppCluster;
 @end
 
-@interface CHIPOtaSoftwareUpdateRequestor ()
-@property (readonly) chip::Controller::OtaSoftwareUpdateRequestorCluster cppCluster;
+@interface CHIPBarrierControl ()
+@property (readonly) chip::Controller::BarrierControlCluster cppCluster;
 @end
 
-@interface CHIPOccupancySensing ()
-@property (readonly) chip::Controller::OccupancySensingCluster cppCluster;
+@interface CHIPPumpConfigurationAndControl ()
+@property (readonly) chip::Controller::PumpConfigurationAndControlCluster cppCluster;
 @end
 
-@interface CHIPOnOff ()
-@property (readonly) chip::Controller::OnOffCluster cppCluster;
+@interface CHIPThermostat ()
+@property (readonly) chip::Controller::ThermostatCluster cppCluster;
 @end
 
-@interface CHIPOnOffSwitchConfiguration ()
-@property (readonly) chip::Controller::OnOffSwitchConfigurationCluster cppCluster;
+@interface CHIPFanControl ()
+@property (readonly) chip::Controller::FanControlCluster cppCluster;
 @end
 
-@interface CHIPOperationalCredentials ()
-@property (readonly) chip::Controller::OperationalCredentialsCluster cppCluster;
+@interface CHIPThermostatUserInterfaceConfiguration ()
+@property (readonly) chip::Controller::ThermostatUserInterfaceConfigurationCluster cppCluster;
 @end
 
-@interface CHIPPowerSource ()
-@property (readonly) chip::Controller::PowerSourceCluster cppCluster;
+@interface CHIPColorControl ()
+@property (readonly) chip::Controller::ColorControlCluster cppCluster;
 @end
 
-@interface CHIPPowerSourceConfiguration ()
-@property (readonly) chip::Controller::PowerSourceConfigurationCluster cppCluster;
+@interface CHIPIlluminanceMeasurement ()
+@property (readonly) chip::Controller::IlluminanceMeasurementCluster cppCluster;
+@end
+
+@interface CHIPTemperatureMeasurement ()
+@property (readonly) chip::Controller::TemperatureMeasurementCluster cppCluster;
 @end
 
 @interface CHIPPressureMeasurement ()
 @property (readonly) chip::Controller::PressureMeasurementCluster cppCluster;
 @end
 
-@interface CHIPPumpConfigurationAndControl ()
-@property (readonly) chip::Controller::PumpConfigurationAndControlCluster cppCluster;
+@interface CHIPFlowMeasurement ()
+@property (readonly) chip::Controller::FlowMeasurementCluster cppCluster;
 @end
 
 @interface CHIPRelativeHumidityMeasurement ()
 @property (readonly) chip::Controller::RelativeHumidityMeasurementCluster cppCluster;
 @end
 
-@interface CHIPScenes ()
-@property (readonly) chip::Controller::ScenesCluster cppCluster;
+@interface CHIPOccupancySensing ()
+@property (readonly) chip::Controller::OccupancySensingCluster cppCluster;
 @end
 
-@interface CHIPSoftwareDiagnostics ()
-@property (readonly) chip::Controller::SoftwareDiagnosticsCluster cppCluster;
+@interface CHIPWakeOnLan ()
+@property (readonly) chip::Controller::WakeOnLanCluster cppCluster;
 @end
 
-@interface CHIPSwitch ()
-@property (readonly) chip::Controller::SwitchCluster cppCluster;
+@interface CHIPChannel ()
+@property (readonly) chip::Controller::ChannelCluster cppCluster;
 @end
 
 @interface CHIPTargetNavigator ()
 @property (readonly) chip::Controller::TargetNavigatorCluster cppCluster;
 @end
 
-@interface CHIPTemperatureMeasurement ()
-@property (readonly) chip::Controller::TemperatureMeasurementCluster cppCluster;
+@interface CHIPMediaPlayback ()
+@property (readonly) chip::Controller::MediaPlaybackCluster cppCluster;
 @end
 
-@interface CHIPTestCluster ()
-@property (readonly) chip::Controller::TestClusterCluster cppCluster;
+@interface CHIPMediaInput ()
+@property (readonly) chip::Controller::MediaInputCluster cppCluster;
 @end
 
-@interface CHIPThermostat ()
-@property (readonly) chip::Controller::ThermostatCluster cppCluster;
+@interface CHIPLowPower ()
+@property (readonly) chip::Controller::LowPowerCluster cppCluster;
 @end
 
-@interface CHIPThermostatUserInterfaceConfiguration ()
-@property (readonly) chip::Controller::ThermostatUserInterfaceConfigurationCluster cppCluster;
+@interface CHIPKeypadInput ()
+@property (readonly) chip::Controller::KeypadInputCluster cppCluster;
 @end
 
-@interface CHIPThreadNetworkDiagnostics ()
-@property (readonly) chip::Controller::ThreadNetworkDiagnosticsCluster cppCluster;
+@interface CHIPContentLauncher ()
+@property (readonly) chip::Controller::ContentLauncherCluster cppCluster;
 @end
 
-@interface CHIPTimeFormatLocalization ()
-@property (readonly) chip::Controller::TimeFormatLocalizationCluster cppCluster;
+@interface CHIPAudioOutput ()
+@property (readonly) chip::Controller::AudioOutputCluster cppCluster;
 @end
 
-@interface CHIPUnitLocalization ()
-@property (readonly) chip::Controller::UnitLocalizationCluster cppCluster;
+@interface CHIPApplicationLauncher ()
+@property (readonly) chip::Controller::ApplicationLauncherCluster cppCluster;
 @end
 
-@interface CHIPUserLabel ()
-@property (readonly) chip::Controller::UserLabelCluster cppCluster;
+@interface CHIPApplicationBasic ()
+@property (readonly) chip::Controller::ApplicationBasicCluster cppCluster;
 @end
 
-@interface CHIPWakeOnLan ()
-@property (readonly) chip::Controller::WakeOnLanCluster cppCluster;
+@interface CHIPAccountLogin ()
+@property (readonly) chip::Controller::AccountLoginCluster cppCluster;
 @end
 
-@interface CHIPWiFiNetworkDiagnostics ()
-@property (readonly) chip::Controller::WiFiNetworkDiagnosticsCluster cppCluster;
+@interface CHIPElectricalMeasurement ()
+@property (readonly) chip::Controller::ElectricalMeasurementCluster cppCluster;
 @end
 
-@interface CHIPWindowCovering ()
-@property (readonly) chip::Controller::WindowCoveringCluster cppCluster;
+@interface CHIPTestCluster ()
+@property (readonly) chip::Controller::TestClusterCluster cppCluster;
 @end
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPEventTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPEventTLVValueDecoder.mm
index 073315ad6e0583..6d9b804ff0e2e9 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPEventTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPEventTLVValueDecoder.mm
@@ -37,6 +37,96 @@
 id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aReader, CHIP_ERROR * aError)
 {
     switch (aPath.mClusterId) {
+    case Clusters::Identify::Id: {
+        using namespace Clusters::Identify;
+        switch (aPath.mEventId) {
+
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::Groups::Id: {
+        using namespace Clusters::Groups;
+        switch (aPath.mEventId) {
+
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::Scenes::Id: {
+        using namespace Clusters::Scenes;
+        switch (aPath.mEventId) {
+
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::OnOff::Id: {
+        using namespace Clusters::OnOff;
+        switch (aPath.mEventId) {
+
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::OnOffSwitchConfiguration::Id: {
+        using namespace Clusters::OnOffSwitchConfiguration;
+        switch (aPath.mEventId) {
+
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::LevelControl::Id: {
+        using namespace Clusters::LevelControl;
+        switch (aPath.mEventId) {
+
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::BinaryInputBasic::Id: {
+        using namespace Clusters::BinaryInputBasic;
+        switch (aPath.mEventId) {
+
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::Descriptor::Id: {
+        using namespace Clusters::Descriptor;
+        switch (aPath.mEventId) {
+
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::Binding::Id: {
+        using namespace Clusters::Binding;
+        switch (aPath.mEventId) {
+
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
     case Clusters::AccessControl::Id: {
         using namespace Clusters::AccessControl;
         switch (aPath.mEventId) {
@@ -212,59 +302,70 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::AccountLogin::Id: {
-        using namespace Clusters::AccountLogin;
+    case Clusters::BridgedActions::Id: {
+        using namespace Clusters::BridgedActions;
         switch (aPath.mEventId) {
 
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::AdministratorCommissioning::Id: {
-        using namespace Clusters::AdministratorCommissioning;
-        switch (aPath.mEventId) {
+        case Events::StateChanged::Id: {
+            Events::StateChanged::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
 
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::ApplicationBasic::Id: {
-        using namespace Clusters::ApplicationBasic;
-        switch (aPath.mEventId) {
+            CHIPBridgedActionsClusterStateChangedEvent * value = [CHIPBridgedActionsClusterStateChangedEvent new];
 
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::ApplicationLauncher::Id: {
-        using namespace Clusters::ApplicationLauncher;
-        switch (aPath.mEventId) {
+            do {
+                NSNumber * _Nonnull memberValue;
+                memberValue = [NSNumber numberWithUnsignedShort:cppValue.actionID];
+                value.actionID = memberValue;
+            } while (0);
+            do {
+                NSNumber * _Nonnull memberValue;
+                memberValue = [NSNumber numberWithUnsignedInt:cppValue.invokeID];
+                value.invokeID = memberValue;
+            } while (0);
+            do {
+                NSNumber * _Nonnull memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.newState)];
+                value.newState = memberValue;
+            } while (0);
 
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
+            return value;
         }
-        break;
-    }
-    case Clusters::AudioOutput::Id: {
-        using namespace Clusters::AudioOutput;
-        switch (aPath.mEventId) {
 
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
+        case Events::ActionFailed::Id: {
+            Events::ActionFailed::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+
+            CHIPBridgedActionsClusterActionFailedEvent * value = [CHIPBridgedActionsClusterActionFailedEvent new];
+
+            do {
+                NSNumber * _Nonnull memberValue;
+                memberValue = [NSNumber numberWithUnsignedShort:cppValue.actionID];
+                value.actionID = memberValue;
+            } while (0);
+            do {
+                NSNumber * _Nonnull memberValue;
+                memberValue = [NSNumber numberWithUnsignedInt:cppValue.invokeID];
+                value.invokeID = memberValue;
+            } while (0);
+            do {
+                NSNumber * _Nonnull memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.newState)];
+                value.newState = memberValue;
+            } while (0);
+            do {
+                NSNumber * _Nonnull memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.error)];
+                value.error = memberValue;
+            } while (0);
+
+            return value;
         }
-        break;
-    }
-    case Clusters::BarrierControl::Id: {
-        using namespace Clusters::BarrierControl;
-        switch (aPath.mEventId) {
 
         default:
             *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
@@ -342,18 +443,8 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::BinaryInputBasic::Id: {
-        using namespace Clusters::BinaryInputBasic;
-        switch (aPath.mEventId) {
-
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::Binding::Id: {
-        using namespace Clusters::Binding;
+    case Clusters::OtaSoftwareUpdateProvider::Id: {
+        using namespace Clusters::OtaSoftwareUpdateProvider;
         switch (aPath.mEventId) {
 
         default:
@@ -362,94 +453,109 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::BooleanState::Id: {
-        using namespace Clusters::BooleanState;
+    case Clusters::OtaSoftwareUpdateRequestor::Id: {
+        using namespace Clusters::OtaSoftwareUpdateRequestor;
         switch (aPath.mEventId) {
 
-        case Events::StateChange::Id: {
-            Events::StateChange::DecodableType cppValue;
+        case Events::StateTransition::Id: {
+            Events::StateTransition::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
 
-            CHIPBooleanStateClusterStateChangeEvent * value = [CHIPBooleanStateClusterStateChangeEvent new];
+            CHIPOtaSoftwareUpdateRequestorClusterStateTransitionEvent * value =
+                [CHIPOtaSoftwareUpdateRequestorClusterStateTransitionEvent new];
 
             do {
                 NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithBool:cppValue.stateValue];
-                value.stateValue = memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.previousState)];
+                value.previousState = memberValue;
+            } while (0);
+            do {
+                NSNumber * _Nonnull memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.newState)];
+                value.newState = memberValue;
+            } while (0);
+            do {
+                NSNumber * _Nonnull memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.reason)];
+                value.reason = memberValue;
+            } while (0);
+            do {
+                NSNumber * _Nullable memberValue;
+                if (cppValue.targetSoftwareVersion.IsNull()) {
+                    memberValue = nil;
+                } else {
+                    memberValue = [NSNumber numberWithUnsignedInt:cppValue.targetSoftwareVersion.Value()];
+                }
+                value.targetSoftwareVersion = memberValue;
             } while (0);
 
             return value;
         }
 
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::BridgedActions::Id: {
-        using namespace Clusters::BridgedActions;
-        switch (aPath.mEventId) {
-
-        case Events::StateChanged::Id: {
-            Events::StateChanged::DecodableType cppValue;
+        case Events::VersionApplied::Id: {
+            Events::VersionApplied::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
 
-            CHIPBridgedActionsClusterStateChangedEvent * value = [CHIPBridgedActionsClusterStateChangedEvent new];
+            CHIPOtaSoftwareUpdateRequestorClusterVersionAppliedEvent * value =
+                [CHIPOtaSoftwareUpdateRequestorClusterVersionAppliedEvent new];
 
             do {
                 NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedShort:cppValue.actionID];
-                value.actionID = memberValue;
-            } while (0);
-            do {
-                NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedInt:cppValue.invokeID];
-                value.invokeID = memberValue;
+                memberValue = [NSNumber numberWithUnsignedInt:cppValue.softwareVersion];
+                value.softwareVersion = memberValue;
             } while (0);
             do {
                 NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.newState)];
-                value.newState = memberValue;
+                memberValue = [NSNumber numberWithUnsignedShort:cppValue.productID];
+                value.productID = memberValue;
             } while (0);
 
             return value;
         }
 
-        case Events::ActionFailed::Id: {
-            Events::ActionFailed::DecodableType cppValue;
+        case Events::DownloadError::Id: {
+            Events::DownloadError::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
 
-            CHIPBridgedActionsClusterActionFailedEvent * value = [CHIPBridgedActionsClusterActionFailedEvent new];
+            CHIPOtaSoftwareUpdateRequestorClusterDownloadErrorEvent * value =
+                [CHIPOtaSoftwareUpdateRequestorClusterDownloadErrorEvent new];
 
             do {
                 NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedShort:cppValue.actionID];
-                value.actionID = memberValue;
+                memberValue = [NSNumber numberWithUnsignedInt:cppValue.softwareVersion];
+                value.softwareVersion = memberValue;
             } while (0);
             do {
                 NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedInt:cppValue.invokeID];
-                value.invokeID = memberValue;
+                memberValue = [NSNumber numberWithUnsignedLongLong:cppValue.bytesDownloaded];
+                value.bytesDownloaded = memberValue;
             } while (0);
             do {
-                NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.newState)];
-                value.newState = memberValue;
+                NSNumber * _Nullable memberValue;
+                if (cppValue.progressPercent.IsNull()) {
+                    memberValue = nil;
+                } else {
+                    memberValue = [NSNumber numberWithUnsignedChar:cppValue.progressPercent.Value()];
+                }
+                value.progressPercent = memberValue;
             } while (0);
             do {
-                NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.error)];
-                value.error = memberValue;
+                NSNumber * _Nullable memberValue;
+                if (cppValue.platformCode.IsNull()) {
+                    memberValue = nil;
+                } else {
+                    memberValue = [NSNumber numberWithLongLong:cppValue.platformCode.Value()];
+                }
+                value.platformCode = memberValue;
             } while (0);
 
             return value;
@@ -461,69 +567,29 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::BridgedDeviceBasic::Id: {
-        using namespace Clusters::BridgedDeviceBasic;
+    case Clusters::LocalizationConfiguration::Id: {
+        using namespace Clusters::LocalizationConfiguration;
         switch (aPath.mEventId) {
 
-        case Events::StartUp::Id: {
-            Events::StartUp::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-
-            CHIPBridgedDeviceBasicClusterStartUpEvent * value = [CHIPBridgedDeviceBasicClusterStartUpEvent new];
-
-            do {
-                NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedInt:cppValue.softwareVersion];
-                value.softwareVersion = memberValue;
-            } while (0);
-
-            return value;
-        }
-
-        case Events::ShutDown::Id: {
-            Events::ShutDown::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-
-            CHIPBridgedDeviceBasicClusterShutDownEvent * value = [CHIPBridgedDeviceBasicClusterShutDownEvent new];
-
-            return value;
-        }
-
-        case Events::Leave::Id: {
-            Events::Leave::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-
-            CHIPBridgedDeviceBasicClusterLeaveEvent * value = [CHIPBridgedDeviceBasicClusterLeaveEvent new];
-
-            return value;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
         }
+        break;
+    }
+    case Clusters::TimeFormatLocalization::Id: {
+        using namespace Clusters::TimeFormatLocalization;
+        switch (aPath.mEventId) {
 
-        case Events::ReachableChanged::Id: {
-            Events::ReachableChanged::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-
-            CHIPBridgedDeviceBasicClusterReachableChangedEvent * value = [CHIPBridgedDeviceBasicClusterReachableChangedEvent new];
-
-            do {
-                NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithBool:cppValue.reachableNewValue];
-                value.reachableNewValue = memberValue;
-            } while (0);
-
-            return value;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
         }
+        break;
+    }
+    case Clusters::UnitLocalization::Id: {
+        using namespace Clusters::UnitLocalization;
+        switch (aPath.mEventId) {
 
         default:
             *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
@@ -531,8 +597,8 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::Channel::Id: {
-        using namespace Clusters::Channel;
+    case Clusters::PowerSourceConfiguration::Id: {
+        using namespace Clusters::PowerSourceConfiguration;
         switch (aPath.mEventId) {
 
         default:
@@ -541,8 +607,8 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::ColorControl::Id: {
-        using namespace Clusters::ColorControl;
+    case Clusters::PowerSource::Id: {
+        using namespace Clusters::PowerSource;
         switch (aPath.mEventId) {
 
         default:
@@ -551,8 +617,8 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::ContentLauncher::Id: {
-        using namespace Clusters::ContentLauncher;
+    case Clusters::GeneralCommissioning::Id: {
+        using namespace Clusters::GeneralCommissioning;
         switch (aPath.mEventId) {
 
         default:
@@ -561,8 +627,8 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::Descriptor::Id: {
-        using namespace Clusters::Descriptor;
+    case Clusters::NetworkCommissioning::Id: {
+        using namespace Clusters::NetworkCommissioning;
         switch (aPath.mEventId) {
 
         default:
@@ -581,286 +647,322 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::DoorLock::Id: {
-        using namespace Clusters::DoorLock;
+    case Clusters::GeneralDiagnostics::Id: {
+        using namespace Clusters::GeneralDiagnostics;
         switch (aPath.mEventId) {
 
-        case Events::DoorLockAlarm::Id: {
-            Events::DoorLockAlarm::DecodableType cppValue;
+        case Events::HardwareFaultChange::Id: {
+            Events::HardwareFaultChange::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
 
-            CHIPDoorLockClusterDoorLockAlarmEvent * value = [CHIPDoorLockClusterDoorLockAlarmEvent new];
+            CHIPGeneralDiagnosticsClusterHardwareFaultChangeEvent * value =
+                [CHIPGeneralDiagnosticsClusterHardwareFaultChangeEvent new];
 
             do {
-                NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.alarmCode)];
-                value.alarmCode = memberValue;
+                NSArray * _Nonnull memberValue;
+                { // Scope for our temporary variables
+                    auto * array_0 = [NSMutableArray new];
+                    auto iter_0 = cppValue.current.begin();
+                    while (iter_0.Next()) {
+                        auto & entry_0 = iter_0.GetValue();
+                        NSNumber * newElement_0;
+                        newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
+                        [array_0 addObject:newElement_0];
+                    }
+                    CHIP_ERROR err = iter_0.GetStatus();
+                    if (err != CHIP_NO_ERROR) {
+                        *aError = err;
+                        return nil;
+                    }
+                    memberValue = array_0;
+                }
+                value.current = memberValue;
+            } while (0);
+            do {
+                NSArray * _Nonnull memberValue;
+                { // Scope for our temporary variables
+                    auto * array_0 = [NSMutableArray new];
+                    auto iter_0 = cppValue.previous.begin();
+                    while (iter_0.Next()) {
+                        auto & entry_0 = iter_0.GetValue();
+                        NSNumber * newElement_0;
+                        newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
+                        [array_0 addObject:newElement_0];
+                    }
+                    CHIP_ERROR err = iter_0.GetStatus();
+                    if (err != CHIP_NO_ERROR) {
+                        *aError = err;
+                        return nil;
+                    }
+                    memberValue = array_0;
+                }
+                value.previous = memberValue;
             } while (0);
 
             return value;
         }
 
-        case Events::DoorStateChange::Id: {
-            Events::DoorStateChange::DecodableType cppValue;
+        case Events::RadioFaultChange::Id: {
+            Events::RadioFaultChange::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
 
-            CHIPDoorLockClusterDoorStateChangeEvent * value = [CHIPDoorLockClusterDoorStateChangeEvent new];
+            CHIPGeneralDiagnosticsClusterRadioFaultChangeEvent * value = [CHIPGeneralDiagnosticsClusterRadioFaultChangeEvent new];
 
             do {
-                NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.doorState)];
-                value.doorState = memberValue;
+                NSArray * _Nonnull memberValue;
+                { // Scope for our temporary variables
+                    auto * array_0 = [NSMutableArray new];
+                    auto iter_0 = cppValue.current.begin();
+                    while (iter_0.Next()) {
+                        auto & entry_0 = iter_0.GetValue();
+                        NSNumber * newElement_0;
+                        newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
+                        [array_0 addObject:newElement_0];
+                    }
+                    CHIP_ERROR err = iter_0.GetStatus();
+                    if (err != CHIP_NO_ERROR) {
+                        *aError = err;
+                        return nil;
+                    }
+                    memberValue = array_0;
+                }
+                value.current = memberValue;
+            } while (0);
+            do {
+                NSArray * _Nonnull memberValue;
+                { // Scope for our temporary variables
+                    auto * array_0 = [NSMutableArray new];
+                    auto iter_0 = cppValue.previous.begin();
+                    while (iter_0.Next()) {
+                        auto & entry_0 = iter_0.GetValue();
+                        NSNumber * newElement_0;
+                        newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
+                        [array_0 addObject:newElement_0];
+                    }
+                    CHIP_ERROR err = iter_0.GetStatus();
+                    if (err != CHIP_NO_ERROR) {
+                        *aError = err;
+                        return nil;
+                    }
+                    memberValue = array_0;
+                }
+                value.previous = memberValue;
             } while (0);
 
             return value;
         }
 
-        case Events::LockOperation::Id: {
-            Events::LockOperation::DecodableType cppValue;
+        case Events::NetworkFaultChange::Id: {
+            Events::NetworkFaultChange::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
 
-            CHIPDoorLockClusterLockOperationEvent * value = [CHIPDoorLockClusterLockOperationEvent new];
+            CHIPGeneralDiagnosticsClusterNetworkFaultChangeEvent * value =
+                [CHIPGeneralDiagnosticsClusterNetworkFaultChangeEvent new];
 
             do {
-                NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.lockOperationType)];
-                value.lockOperationType = memberValue;
-            } while (0);
-            do {
-                NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.operationSource)];
-                value.operationSource = memberValue;
-            } while (0);
-            do {
-                NSNumber * _Nullable memberValue;
-                if (cppValue.userIndex.IsNull()) {
-                    memberValue = nil;
-                } else {
-                    memberValue = [NSNumber numberWithUnsignedShort:cppValue.userIndex.Value()];
-                }
-                value.userIndex = memberValue;
-            } while (0);
-            do {
-                NSNumber * _Nullable memberValue;
-                if (cppValue.fabricIndex.IsNull()) {
-                    memberValue = nil;
-                } else {
-                    memberValue = [NSNumber numberWithUnsignedChar:cppValue.fabricIndex.Value()];
-                }
-                value.fabricIndex = memberValue;
-            } while (0);
-            do {
-                NSNumber * _Nullable memberValue;
-                if (cppValue.sourceNode.IsNull()) {
-                    memberValue = nil;
-                } else {
-                    memberValue = [NSNumber numberWithUnsignedLongLong:cppValue.sourceNode.Value()];
+                NSArray * _Nonnull memberValue;
+                { // Scope for our temporary variables
+                    auto * array_0 = [NSMutableArray new];
+                    auto iter_0 = cppValue.current.begin();
+                    while (iter_0.Next()) {
+                        auto & entry_0 = iter_0.GetValue();
+                        NSNumber * newElement_0;
+                        newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
+                        [array_0 addObject:newElement_0];
+                    }
+                    CHIP_ERROR err = iter_0.GetStatus();
+                    if (err != CHIP_NO_ERROR) {
+                        *aError = err;
+                        return nil;
+                    }
+                    memberValue = array_0;
                 }
-                value.sourceNode = memberValue;
+                value.current = memberValue;
             } while (0);
             do {
-                NSArray * _Nullable memberValue;
-                if (cppValue.credentials.HasValue()) {
-                    if (cppValue.credentials.Value().IsNull()) {
-                        memberValue = nil;
-                    } else {
-                        { // Scope for our temporary variables
-                            auto * array_2 = [NSMutableArray new];
-                            auto iter_2 = cppValue.credentials.Value().Value().begin();
-                            while (iter_2.Next()) {
-                                auto & entry_2 = iter_2.GetValue();
-                                CHIPDoorLockClusterDlCredential * newElement_2;
-                                newElement_2 = [CHIPDoorLockClusterDlCredential new];
-                                newElement_2.credentialType =
-                                    [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_2.credentialType)];
-                                newElement_2.credentialIndex = [NSNumber numberWithUnsignedShort:entry_2.credentialIndex];
-                                [array_2 addObject:newElement_2];
-                            }
-                            CHIP_ERROR err = iter_2.GetStatus();
-                            if (err != CHIP_NO_ERROR) {
-                                *aError = err;
-                                return nil;
-                            }
-                            memberValue = array_2;
-                        }
+                NSArray * _Nonnull memberValue;
+                { // Scope for our temporary variables
+                    auto * array_0 = [NSMutableArray new];
+                    auto iter_0 = cppValue.previous.begin();
+                    while (iter_0.Next()) {
+                        auto & entry_0 = iter_0.GetValue();
+                        NSNumber * newElement_0;
+                        newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
+                        [array_0 addObject:newElement_0];
                     }
-                } else {
-                    memberValue = nil;
+                    CHIP_ERROR err = iter_0.GetStatus();
+                    if (err != CHIP_NO_ERROR) {
+                        *aError = err;
+                        return nil;
+                    }
+                    memberValue = array_0;
                 }
-                value.credentials = memberValue;
+                value.previous = memberValue;
             } while (0);
 
             return value;
         }
 
-        case Events::LockOperationError::Id: {
-            Events::LockOperationError::DecodableType cppValue;
+        case Events::BootReason::Id: {
+            Events::BootReason::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
 
-            CHIPDoorLockClusterLockOperationErrorEvent * value = [CHIPDoorLockClusterLockOperationErrorEvent new];
+            CHIPGeneralDiagnosticsClusterBootReasonEvent * value = [CHIPGeneralDiagnosticsClusterBootReasonEvent new];
 
             do {
                 NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.lockOperationType)];
-                value.lockOperationType = memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.bootReason)];
+                value.bootReason = memberValue;
             } while (0);
+
+            return value;
+        }
+
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::SoftwareDiagnostics::Id: {
+        using namespace Clusters::SoftwareDiagnostics;
+        switch (aPath.mEventId) {
+
+        case Events::SoftwareFault::Id: {
+            Events::SoftwareFault::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+
+            CHIPSoftwareDiagnosticsClusterSoftwareFaultEvent * value = [CHIPSoftwareDiagnosticsClusterSoftwareFaultEvent new];
+
             do {
-                NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.operationSource)];
-                value.operationSource = memberValue;
+                CHIPSoftwareDiagnosticsClusterSoftwareFaultStruct * _Nonnull memberValue;
+                memberValue = [CHIPSoftwareDiagnosticsClusterSoftwareFaultStruct new];
+                memberValue.id = [NSNumber numberWithUnsignedLongLong:cppValue.softwareFault.id];
+                memberValue.name = [[NSString alloc] initWithBytes:cppValue.softwareFault.name.data()
+                                                            length:cppValue.softwareFault.name.size()
+                                                          encoding:NSUTF8StringEncoding];
+                memberValue.faultRecording = [NSData dataWithBytes:cppValue.softwareFault.faultRecording.data()
+                                                            length:cppValue.softwareFault.faultRecording.size()];
+                value.softwareFault = memberValue;
             } while (0);
+
+            return value;
+        }
+
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::ThreadNetworkDiagnostics::Id: {
+        using namespace Clusters::ThreadNetworkDiagnostics;
+        switch (aPath.mEventId) {
+
+        case Events::ConnectionStatus::Id: {
+            Events::ConnectionStatus::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+
+            CHIPThreadNetworkDiagnosticsClusterConnectionStatusEvent * value =
+                [CHIPThreadNetworkDiagnosticsClusterConnectionStatusEvent new];
+
             do {
                 NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.operationError)];
-                value.operationError = memberValue;
-            } while (0);
-            do {
-                NSNumber * _Nullable memberValue;
-                if (cppValue.userIndex.IsNull()) {
-                    memberValue = nil;
-                } else {
-                    memberValue = [NSNumber numberWithUnsignedShort:cppValue.userIndex.Value()];
-                }
-                value.userIndex = memberValue;
-            } while (0);
-            do {
-                NSNumber * _Nullable memberValue;
-                if (cppValue.fabricIndex.IsNull()) {
-                    memberValue = nil;
-                } else {
-                    memberValue = [NSNumber numberWithUnsignedChar:cppValue.fabricIndex.Value()];
-                }
-                value.fabricIndex = memberValue;
-            } while (0);
-            do {
-                NSNumber * _Nullable memberValue;
-                if (cppValue.sourceNode.IsNull()) {
-                    memberValue = nil;
-                } else {
-                    memberValue = [NSNumber numberWithUnsignedLongLong:cppValue.sourceNode.Value()];
-                }
-                value.sourceNode = memberValue;
-            } while (0);
-            do {
-                NSArray * _Nullable memberValue;
-                if (cppValue.credentials.HasValue()) {
-                    if (cppValue.credentials.Value().IsNull()) {
-                        memberValue = nil;
-                    } else {
-                        { // Scope for our temporary variables
-                            auto * array_2 = [NSMutableArray new];
-                            auto iter_2 = cppValue.credentials.Value().Value().begin();
-                            while (iter_2.Next()) {
-                                auto & entry_2 = iter_2.GetValue();
-                                CHIPDoorLockClusterDlCredential * newElement_2;
-                                newElement_2 = [CHIPDoorLockClusterDlCredential new];
-                                newElement_2.credentialType =
-                                    [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_2.credentialType)];
-                                newElement_2.credentialIndex = [NSNumber numberWithUnsignedShort:entry_2.credentialIndex];
-                                [array_2 addObject:newElement_2];
-                            }
-                            CHIP_ERROR err = iter_2.GetStatus();
-                            if (err != CHIP_NO_ERROR) {
-                                *aError = err;
-                                return nil;
-                            }
-                            memberValue = array_2;
-                        }
-                    }
-                } else {
-                    memberValue = nil;
-                }
-                value.credentials = memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.connectionStatus)];
+                value.connectionStatus = memberValue;
             } while (0);
 
             return value;
         }
 
-        case Events::LockUserChange::Id: {
-            Events::LockUserChange::DecodableType cppValue;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::WiFiNetworkDiagnostics::Id: {
+        using namespace Clusters::WiFiNetworkDiagnostics;
+        switch (aPath.mEventId) {
+
+        case Events::Disconnection::Id: {
+            Events::Disconnection::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
 
-            CHIPDoorLockClusterLockUserChangeEvent * value = [CHIPDoorLockClusterLockUserChangeEvent new];
+            CHIPWiFiNetworkDiagnosticsClusterDisconnectionEvent * value = [CHIPWiFiNetworkDiagnosticsClusterDisconnectionEvent new];
 
             do {
                 NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.lockDataType)];
-                value.lockDataType = memberValue;
+                memberValue = [NSNumber numberWithUnsignedShort:cppValue.reasonCode];
+                value.reasonCode = memberValue;
             } while (0);
+
+            return value;
+        }
+
+        case Events::AssociationFailure::Id: {
+            Events::AssociationFailure::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+
+            CHIPWiFiNetworkDiagnosticsClusterAssociationFailureEvent * value =
+                [CHIPWiFiNetworkDiagnosticsClusterAssociationFailureEvent new];
+
             do {
                 NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.dataOperationType)];
-                value.dataOperationType = memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.associationFailure)];
+                value.associationFailure = memberValue;
             } while (0);
             do {
                 NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.operationSource)];
-                value.operationSource = memberValue;
-            } while (0);
-            do {
-                NSNumber * _Nullable memberValue;
-                if (cppValue.userIndex.IsNull()) {
-                    memberValue = nil;
-                } else {
-                    memberValue = [NSNumber numberWithUnsignedShort:cppValue.userIndex.Value()];
-                }
-                value.userIndex = memberValue;
-            } while (0);
-            do {
-                NSNumber * _Nullable memberValue;
-                if (cppValue.fabricIndex.IsNull()) {
-                    memberValue = nil;
-                } else {
-                    memberValue = [NSNumber numberWithUnsignedChar:cppValue.fabricIndex.Value()];
-                }
-                value.fabricIndex = memberValue;
-            } while (0);
-            do {
-                NSNumber * _Nullable memberValue;
-                if (cppValue.sourceNode.IsNull()) {
-                    memberValue = nil;
-                } else {
-                    memberValue = [NSNumber numberWithUnsignedLongLong:cppValue.sourceNode.Value()];
-                }
-                value.sourceNode = memberValue;
-            } while (0);
-            do {
-                NSNumber * _Nullable memberValue;
-                if (cppValue.dataIndex.IsNull()) {
-                    memberValue = nil;
-                } else {
-                    memberValue = [NSNumber numberWithUnsignedShort:cppValue.dataIndex.Value()];
-                }
-                value.dataIndex = memberValue;
+                memberValue = [NSNumber numberWithUnsignedShort:cppValue.status];
+                value.status = memberValue;
             } while (0);
 
             return value;
         }
 
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
+        case Events::ConnectionStatus::Id: {
+            Events::ConnectionStatus::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+
+            CHIPWiFiNetworkDiagnosticsClusterConnectionStatusEvent * value =
+                [CHIPWiFiNetworkDiagnosticsClusterConnectionStatusEvent new];
+
+            do {
+                NSNumber * _Nonnull memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.connectionStatus)];
+                value.connectionStatus = memberValue;
+            } while (0);
+
+            return value;
         }
-        break;
-    }
-    case Clusters::ElectricalMeasurement::Id: {
-        using namespace Clusters::ElectricalMeasurement;
-        switch (aPath.mEventId) {
 
         default:
             *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
@@ -878,39 +980,69 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::FanControl::Id: {
-        using namespace Clusters::FanControl;
+    case Clusters::BridgedDeviceBasic::Id: {
+        using namespace Clusters::BridgedDeviceBasic;
         switch (aPath.mEventId) {
 
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
+        case Events::StartUp::Id: {
+            Events::StartUp::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+
+            CHIPBridgedDeviceBasicClusterStartUpEvent * value = [CHIPBridgedDeviceBasicClusterStartUpEvent new];
+
+            do {
+                NSNumber * _Nonnull memberValue;
+                memberValue = [NSNumber numberWithUnsignedInt:cppValue.softwareVersion];
+                value.softwareVersion = memberValue;
+            } while (0);
+
+            return value;
         }
-        break;
-    }
-    case Clusters::FixedLabel::Id: {
-        using namespace Clusters::FixedLabel;
-        switch (aPath.mEventId) {
 
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
+        case Events::ShutDown::Id: {
+            Events::ShutDown::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+
+            CHIPBridgedDeviceBasicClusterShutDownEvent * value = [CHIPBridgedDeviceBasicClusterShutDownEvent new];
+
+            return value;
         }
-        break;
-    }
-    case Clusters::FlowMeasurement::Id: {
-        using namespace Clusters::FlowMeasurement;
-        switch (aPath.mEventId) {
 
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
+        case Events::Leave::Id: {
+            Events::Leave::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+
+            CHIPBridgedDeviceBasicClusterLeaveEvent * value = [CHIPBridgedDeviceBasicClusterLeaveEvent new];
+
+            return value;
+        }
+
+        case Events::ReachableChanged::Id: {
+            Events::ReachableChanged::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+
+            CHIPBridgedDeviceBasicClusterReachableChangedEvent * value = [CHIPBridgedDeviceBasicClusterReachableChangedEvent new];
+
+            do {
+                NSNumber * _Nonnull memberValue;
+                memberValue = [NSNumber numberWithBool:cppValue.reachableNewValue];
+                value.reachableNewValue = memberValue;
+            } while (0);
+
+            return value;
         }
-        break;
-    }
-    case Clusters::GeneralCommissioning::Id: {
-        using namespace Clusters::GeneralCommissioning;
-        switch (aPath.mEventId) {
 
         default:
             *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
@@ -918,184 +1050,141 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::GeneralDiagnostics::Id: {
-        using namespace Clusters::GeneralDiagnostics;
+    case Clusters::Switch::Id: {
+        using namespace Clusters::Switch;
         switch (aPath.mEventId) {
 
-        case Events::HardwareFaultChange::Id: {
-            Events::HardwareFaultChange::DecodableType cppValue;
+        case Events::SwitchLatched::Id: {
+            Events::SwitchLatched::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+
+            CHIPSwitchClusterSwitchLatchedEvent * value = [CHIPSwitchClusterSwitchLatchedEvent new];
+
+            do {
+                NSNumber * _Nonnull memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:cppValue.newPosition];
+                value.newPosition = memberValue;
+            } while (0);
+
+            return value;
+        }
+
+        case Events::InitialPress::Id: {
+            Events::InitialPress::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+
+            CHIPSwitchClusterInitialPressEvent * value = [CHIPSwitchClusterInitialPressEvent new];
+
+            do {
+                NSNumber * _Nonnull memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:cppValue.newPosition];
+                value.newPosition = memberValue;
+            } while (0);
+
+            return value;
+        }
+
+        case Events::LongPress::Id: {
+            Events::LongPress::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+
+            CHIPSwitchClusterLongPressEvent * value = [CHIPSwitchClusterLongPressEvent new];
+
+            do {
+                NSNumber * _Nonnull memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:cppValue.newPosition];
+                value.newPosition = memberValue;
+            } while (0);
+
+            return value;
+        }
+
+        case Events::ShortRelease::Id: {
+            Events::ShortRelease::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
 
-            CHIPGeneralDiagnosticsClusterHardwareFaultChangeEvent * value =
-                [CHIPGeneralDiagnosticsClusterHardwareFaultChangeEvent new];
+            CHIPSwitchClusterShortReleaseEvent * value = [CHIPSwitchClusterShortReleaseEvent new];
 
             do {
-                NSArray * _Nonnull memberValue;
-                { // Scope for our temporary variables
-                    auto * array_0 = [NSMutableArray new];
-                    auto iter_0 = cppValue.current.begin();
-                    while (iter_0.Next()) {
-                        auto & entry_0 = iter_0.GetValue();
-                        NSNumber * newElement_0;
-                        newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
-                        [array_0 addObject:newElement_0];
-                    }
-                    CHIP_ERROR err = iter_0.GetStatus();
-                    if (err != CHIP_NO_ERROR) {
-                        *aError = err;
-                        return nil;
-                    }
-                    memberValue = array_0;
-                }
-                value.current = memberValue;
-            } while (0);
-            do {
-                NSArray * _Nonnull memberValue;
-                { // Scope for our temporary variables
-                    auto * array_0 = [NSMutableArray new];
-                    auto iter_0 = cppValue.previous.begin();
-                    while (iter_0.Next()) {
-                        auto & entry_0 = iter_0.GetValue();
-                        NSNumber * newElement_0;
-                        newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
-                        [array_0 addObject:newElement_0];
-                    }
-                    CHIP_ERROR err = iter_0.GetStatus();
-                    if (err != CHIP_NO_ERROR) {
-                        *aError = err;
-                        return nil;
-                    }
-                    memberValue = array_0;
-                }
-                value.previous = memberValue;
+                NSNumber * _Nonnull memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:cppValue.previousPosition];
+                value.previousPosition = memberValue;
             } while (0);
 
             return value;
         }
 
-        case Events::RadioFaultChange::Id: {
-            Events::RadioFaultChange::DecodableType cppValue;
+        case Events::LongRelease::Id: {
+            Events::LongRelease::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
 
-            CHIPGeneralDiagnosticsClusterRadioFaultChangeEvent * value = [CHIPGeneralDiagnosticsClusterRadioFaultChangeEvent new];
+            CHIPSwitchClusterLongReleaseEvent * value = [CHIPSwitchClusterLongReleaseEvent new];
 
             do {
-                NSArray * _Nonnull memberValue;
-                { // Scope for our temporary variables
-                    auto * array_0 = [NSMutableArray new];
-                    auto iter_0 = cppValue.current.begin();
-                    while (iter_0.Next()) {
-                        auto & entry_0 = iter_0.GetValue();
-                        NSNumber * newElement_0;
-                        newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
-                        [array_0 addObject:newElement_0];
-                    }
-                    CHIP_ERROR err = iter_0.GetStatus();
-                    if (err != CHIP_NO_ERROR) {
-                        *aError = err;
-                        return nil;
-                    }
-                    memberValue = array_0;
-                }
-                value.current = memberValue;
-            } while (0);
-            do {
-                NSArray * _Nonnull memberValue;
-                { // Scope for our temporary variables
-                    auto * array_0 = [NSMutableArray new];
-                    auto iter_0 = cppValue.previous.begin();
-                    while (iter_0.Next()) {
-                        auto & entry_0 = iter_0.GetValue();
-                        NSNumber * newElement_0;
-                        newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
-                        [array_0 addObject:newElement_0];
-                    }
-                    CHIP_ERROR err = iter_0.GetStatus();
-                    if (err != CHIP_NO_ERROR) {
-                        *aError = err;
-                        return nil;
-                    }
-                    memberValue = array_0;
-                }
-                value.previous = memberValue;
+                NSNumber * _Nonnull memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:cppValue.previousPosition];
+                value.previousPosition = memberValue;
             } while (0);
 
             return value;
         }
 
-        case Events::NetworkFaultChange::Id: {
-            Events::NetworkFaultChange::DecodableType cppValue;
+        case Events::MultiPressOngoing::Id: {
+            Events::MultiPressOngoing::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
 
-            CHIPGeneralDiagnosticsClusterNetworkFaultChangeEvent * value =
-                [CHIPGeneralDiagnosticsClusterNetworkFaultChangeEvent new];
+            CHIPSwitchClusterMultiPressOngoingEvent * value = [CHIPSwitchClusterMultiPressOngoingEvent new];
 
             do {
-                NSArray * _Nonnull memberValue;
-                { // Scope for our temporary variables
-                    auto * array_0 = [NSMutableArray new];
-                    auto iter_0 = cppValue.current.begin();
-                    while (iter_0.Next()) {
-                        auto & entry_0 = iter_0.GetValue();
-                        NSNumber * newElement_0;
-                        newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
-                        [array_0 addObject:newElement_0];
-                    }
-                    CHIP_ERROR err = iter_0.GetStatus();
-                    if (err != CHIP_NO_ERROR) {
-                        *aError = err;
-                        return nil;
-                    }
-                    memberValue = array_0;
-                }
-                value.current = memberValue;
+                NSNumber * _Nonnull memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:cppValue.newPosition];
+                value.newPosition = memberValue;
             } while (0);
             do {
-                NSArray * _Nonnull memberValue;
-                { // Scope for our temporary variables
-                    auto * array_0 = [NSMutableArray new];
-                    auto iter_0 = cppValue.previous.begin();
-                    while (iter_0.Next()) {
-                        auto & entry_0 = iter_0.GetValue();
-                        NSNumber * newElement_0;
-                        newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
-                        [array_0 addObject:newElement_0];
-                    }
-                    CHIP_ERROR err = iter_0.GetStatus();
-                    if (err != CHIP_NO_ERROR) {
-                        *aError = err;
-                        return nil;
-                    }
-                    memberValue = array_0;
-                }
-                value.previous = memberValue;
+                NSNumber * _Nonnull memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:cppValue.currentNumberOfPressesCounted];
+                value.currentNumberOfPressesCounted = memberValue;
             } while (0);
 
             return value;
         }
 
-        case Events::BootReason::Id: {
-            Events::BootReason::DecodableType cppValue;
+        case Events::MultiPressComplete::Id: {
+            Events::MultiPressComplete::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
 
-            CHIPGeneralDiagnosticsClusterBootReasonEvent * value = [CHIPGeneralDiagnosticsClusterBootReasonEvent new];
+            CHIPSwitchClusterMultiPressCompleteEvent * value = [CHIPSwitchClusterMultiPressCompleteEvent new];
 
             do {
                 NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.bootReason)];
-                value.bootReason = memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:cppValue.newPosition];
+                value.newPosition = memberValue;
+            } while (0);
+            do {
+                NSNumber * _Nonnull memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:cppValue.totalNumberOfPressesCounted];
+                value.totalNumberOfPressesCounted = memberValue;
             } while (0);
 
             return value;
@@ -1107,8 +1196,8 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::GroupKeyManagement::Id: {
-        using namespace Clusters::GroupKeyManagement;
+    case Clusters::AdministratorCommissioning::Id: {
+        using namespace Clusters::AdministratorCommissioning;
         switch (aPath.mEventId) {
 
         default:
@@ -1117,8 +1206,8 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::Groups::Id: {
-        using namespace Clusters::Groups;
+    case Clusters::OperationalCredentials::Id: {
+        using namespace Clusters::OperationalCredentials;
         switch (aPath.mEventId) {
 
         default:
@@ -1127,8 +1216,8 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::Identify::Id: {
-        using namespace Clusters::Identify;
+    case Clusters::GroupKeyManagement::Id: {
+        using namespace Clusters::GroupKeyManagement;
         switch (aPath.mEventId) {
 
         default:
@@ -1137,8 +1226,8 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::IlluminanceMeasurement::Id: {
-        using namespace Clusters::IlluminanceMeasurement;
+    case Clusters::FixedLabel::Id: {
+        using namespace Clusters::FixedLabel;
         switch (aPath.mEventId) {
 
         default:
@@ -1147,8 +1236,8 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::KeypadInput::Id: {
-        using namespace Clusters::KeypadInput;
+    case Clusters::UserLabel::Id: {
+        using namespace Clusters::UserLabel;
         switch (aPath.mEventId) {
 
         default:
@@ -1157,49 +1246,27 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::LevelControl::Id: {
-        using namespace Clusters::LevelControl;
+    case Clusters::BooleanState::Id: {
+        using namespace Clusters::BooleanState;
         switch (aPath.mEventId) {
 
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::LocalizationConfiguration::Id: {
-        using namespace Clusters::LocalizationConfiguration;
-        switch (aPath.mEventId) {
+        case Events::StateChange::Id: {
+            Events::StateChange::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
 
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::LowPower::Id: {
-        using namespace Clusters::LowPower;
-        switch (aPath.mEventId) {
+            CHIPBooleanStateClusterStateChangeEvent * value = [CHIPBooleanStateClusterStateChangeEvent new];
 
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::MediaInput::Id: {
-        using namespace Clusters::MediaInput;
-        switch (aPath.mEventId) {
+            do {
+                NSNumber * _Nonnull memberValue;
+                memberValue = [NSNumber numberWithBool:cppValue.stateValue];
+                value.stateValue = memberValue;
+            } while (0);
 
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
+            return value;
         }
-        break;
-    }
-    case Clusters::MediaPlayback::Id: {
-        using namespace Clusters::MediaPlayback;
-        switch (aPath.mEventId) {
 
         default:
             *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
@@ -1217,183 +1284,276 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::NetworkCommissioning::Id: {
-        using namespace Clusters::NetworkCommissioning;
+    case Clusters::DoorLock::Id: {
+        using namespace Clusters::DoorLock;
         switch (aPath.mEventId) {
 
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::OtaSoftwareUpdateProvider::Id: {
-        using namespace Clusters::OtaSoftwareUpdateProvider;
-        switch (aPath.mEventId) {
+        case Events::DoorLockAlarm::Id: {
+            Events::DoorLockAlarm::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+
+            CHIPDoorLockClusterDoorLockAlarmEvent * value = [CHIPDoorLockClusterDoorLockAlarmEvent new];
 
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
+            do {
+                NSNumber * _Nonnull memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.alarmCode)];
+                value.alarmCode = memberValue;
+            } while (0);
+
+            return value;
         }
-        break;
-    }
-    case Clusters::OtaSoftwareUpdateRequestor::Id: {
-        using namespace Clusters::OtaSoftwareUpdateRequestor;
-        switch (aPath.mEventId) {
 
-        case Events::StateTransition::Id: {
-            Events::StateTransition::DecodableType cppValue;
+        case Events::DoorStateChange::Id: {
+            Events::DoorStateChange::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
 
-            CHIPOtaSoftwareUpdateRequestorClusterStateTransitionEvent * value =
-                [CHIPOtaSoftwareUpdateRequestorClusterStateTransitionEvent new];
+            CHIPDoorLockClusterDoorStateChangeEvent * value = [CHIPDoorLockClusterDoorStateChangeEvent new];
 
             do {
                 NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.previousState)];
-                value.previousState = memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.doorState)];
+                value.doorState = memberValue;
             } while (0);
+
+            return value;
+        }
+
+        case Events::LockOperation::Id: {
+            Events::LockOperation::DecodableType cppValue;
+            *aError = DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR) {
+                return nil;
+            }
+
+            CHIPDoorLockClusterLockOperationEvent * value = [CHIPDoorLockClusterLockOperationEvent new];
+
             do {
                 NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.newState)];
-                value.newState = memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.lockOperationType)];
+                value.lockOperationType = memberValue;
             } while (0);
             do {
                 NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.reason)];
-                value.reason = memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.operationSource)];
+                value.operationSource = memberValue;
             } while (0);
             do {
                 NSNumber * _Nullable memberValue;
-                if (cppValue.targetSoftwareVersion.IsNull()) {
+                if (cppValue.userIndex.IsNull()) {
                     memberValue = nil;
                 } else {
-                    memberValue = [NSNumber numberWithUnsignedInt:cppValue.targetSoftwareVersion.Value()];
+                    memberValue = [NSNumber numberWithUnsignedShort:cppValue.userIndex.Value()];
                 }
-                value.targetSoftwareVersion = memberValue;
+                value.userIndex = memberValue;
+            } while (0);
+            do {
+                NSNumber * _Nullable memberValue;
+                if (cppValue.fabricIndex.IsNull()) {
+                    memberValue = nil;
+                } else {
+                    memberValue = [NSNumber numberWithUnsignedChar:cppValue.fabricIndex.Value()];
+                }
+                value.fabricIndex = memberValue;
+            } while (0);
+            do {
+                NSNumber * _Nullable memberValue;
+                if (cppValue.sourceNode.IsNull()) {
+                    memberValue = nil;
+                } else {
+                    memberValue = [NSNumber numberWithUnsignedLongLong:cppValue.sourceNode.Value()];
+                }
+                value.sourceNode = memberValue;
+            } while (0);
+            do {
+                NSArray * _Nullable memberValue;
+                if (cppValue.credentials.HasValue()) {
+                    if (cppValue.credentials.Value().IsNull()) {
+                        memberValue = nil;
+                    } else {
+                        { // Scope for our temporary variables
+                            auto * array_2 = [NSMutableArray new];
+                            auto iter_2 = cppValue.credentials.Value().Value().begin();
+                            while (iter_2.Next()) {
+                                auto & entry_2 = iter_2.GetValue();
+                                CHIPDoorLockClusterDlCredential * newElement_2;
+                                newElement_2 = [CHIPDoorLockClusterDlCredential new];
+                                newElement_2.credentialType =
+                                    [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_2.credentialType)];
+                                newElement_2.credentialIndex = [NSNumber numberWithUnsignedShort:entry_2.credentialIndex];
+                                [array_2 addObject:newElement_2];
+                            }
+                            CHIP_ERROR err = iter_2.GetStatus();
+                            if (err != CHIP_NO_ERROR) {
+                                *aError = err;
+                                return nil;
+                            }
+                            memberValue = array_2;
+                        }
+                    }
+                } else {
+                    memberValue = nil;
+                }
+                value.credentials = memberValue;
             } while (0);
 
             return value;
         }
 
-        case Events::VersionApplied::Id: {
-            Events::VersionApplied::DecodableType cppValue;
+        case Events::LockOperationError::Id: {
+            Events::LockOperationError::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
 
-            CHIPOtaSoftwareUpdateRequestorClusterVersionAppliedEvent * value =
-                [CHIPOtaSoftwareUpdateRequestorClusterVersionAppliedEvent new];
+            CHIPDoorLockClusterLockOperationErrorEvent * value = [CHIPDoorLockClusterLockOperationErrorEvent new];
 
             do {
                 NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedInt:cppValue.softwareVersion];
-                value.softwareVersion = memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.lockOperationType)];
+                value.lockOperationType = memberValue;
             } while (0);
             do {
                 NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedShort:cppValue.productID];
-                value.productID = memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.operationSource)];
+                value.operationSource = memberValue;
+            } while (0);
+            do {
+                NSNumber * _Nonnull memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.operationError)];
+                value.operationError = memberValue;
+            } while (0);
+            do {
+                NSNumber * _Nullable memberValue;
+                if (cppValue.userIndex.IsNull()) {
+                    memberValue = nil;
+                } else {
+                    memberValue = [NSNumber numberWithUnsignedShort:cppValue.userIndex.Value()];
+                }
+                value.userIndex = memberValue;
+            } while (0);
+            do {
+                NSNumber * _Nullable memberValue;
+                if (cppValue.fabricIndex.IsNull()) {
+                    memberValue = nil;
+                } else {
+                    memberValue = [NSNumber numberWithUnsignedChar:cppValue.fabricIndex.Value()];
+                }
+                value.fabricIndex = memberValue;
+            } while (0);
+            do {
+                NSNumber * _Nullable memberValue;
+                if (cppValue.sourceNode.IsNull()) {
+                    memberValue = nil;
+                } else {
+                    memberValue = [NSNumber numberWithUnsignedLongLong:cppValue.sourceNode.Value()];
+                }
+                value.sourceNode = memberValue;
+            } while (0);
+            do {
+                NSArray * _Nullable memberValue;
+                if (cppValue.credentials.HasValue()) {
+                    if (cppValue.credentials.Value().IsNull()) {
+                        memberValue = nil;
+                    } else {
+                        { // Scope for our temporary variables
+                            auto * array_2 = [NSMutableArray new];
+                            auto iter_2 = cppValue.credentials.Value().Value().begin();
+                            while (iter_2.Next()) {
+                                auto & entry_2 = iter_2.GetValue();
+                                CHIPDoorLockClusterDlCredential * newElement_2;
+                                newElement_2 = [CHIPDoorLockClusterDlCredential new];
+                                newElement_2.credentialType =
+                                    [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_2.credentialType)];
+                                newElement_2.credentialIndex = [NSNumber numberWithUnsignedShort:entry_2.credentialIndex];
+                                [array_2 addObject:newElement_2];
+                            }
+                            CHIP_ERROR err = iter_2.GetStatus();
+                            if (err != CHIP_NO_ERROR) {
+                                *aError = err;
+                                return nil;
+                            }
+                            memberValue = array_2;
+                        }
+                    }
+                } else {
+                    memberValue = nil;
+                }
+                value.credentials = memberValue;
             } while (0);
 
             return value;
         }
 
-        case Events::DownloadError::Id: {
-            Events::DownloadError::DecodableType cppValue;
+        case Events::LockUserChange::Id: {
+            Events::LockUserChange::DecodableType cppValue;
             *aError = DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR) {
                 return nil;
             }
 
-            CHIPOtaSoftwareUpdateRequestorClusterDownloadErrorEvent * value =
-                [CHIPOtaSoftwareUpdateRequestorClusterDownloadErrorEvent new];
+            CHIPDoorLockClusterLockUserChangeEvent * value = [CHIPDoorLockClusterLockUserChangeEvent new];
 
             do {
                 NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedInt:cppValue.softwareVersion];
-                value.softwareVersion = memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.lockDataType)];
+                value.lockDataType = memberValue;
             } while (0);
             do {
                 NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedLongLong:cppValue.bytesDownloaded];
-                value.bytesDownloaded = memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.dataOperationType)];
+                value.dataOperationType = memberValue;
+            } while (0);
+            do {
+                NSNumber * _Nonnull memberValue;
+                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.operationSource)];
+                value.operationSource = memberValue;
             } while (0);
             do {
                 NSNumber * _Nullable memberValue;
-                if (cppValue.progressPercent.IsNull()) {
+                if (cppValue.userIndex.IsNull()) {
                     memberValue = nil;
                 } else {
-                    memberValue = [NSNumber numberWithUnsignedChar:cppValue.progressPercent.Value()];
+                    memberValue = [NSNumber numberWithUnsignedShort:cppValue.userIndex.Value()];
                 }
-                value.progressPercent = memberValue;
+                value.userIndex = memberValue;
             } while (0);
             do {
                 NSNumber * _Nullable memberValue;
-                if (cppValue.platformCode.IsNull()) {
+                if (cppValue.fabricIndex.IsNull()) {
                     memberValue = nil;
                 } else {
-                    memberValue = [NSNumber numberWithLongLong:cppValue.platformCode.Value()];
+                    memberValue = [NSNumber numberWithUnsignedChar:cppValue.fabricIndex.Value()];
                 }
-                value.platformCode = memberValue;
-            } while (0);
-
-            return value;
-        }
-
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::OccupancySensing::Id: {
-        using namespace Clusters::OccupancySensing;
-        switch (aPath.mEventId) {
-
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::OnOff::Id: {
-        using namespace Clusters::OnOff;
-        switch (aPath.mEventId) {
-
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::OnOffSwitchConfiguration::Id: {
-        using namespace Clusters::OnOffSwitchConfiguration;
-        switch (aPath.mEventId) {
-
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::OperationalCredentials::Id: {
-        using namespace Clusters::OperationalCredentials;
-        switch (aPath.mEventId) {
+                value.fabricIndex = memberValue;
+            } while (0);
+            do {
+                NSNumber * _Nullable memberValue;
+                if (cppValue.sourceNode.IsNull()) {
+                    memberValue = nil;
+                } else {
+                    memberValue = [NSNumber numberWithUnsignedLongLong:cppValue.sourceNode.Value()];
+                }
+                value.sourceNode = memberValue;
+            } while (0);
+            do {
+                NSNumber * _Nullable memberValue;
+                if (cppValue.dataIndex.IsNull()) {
+                    memberValue = nil;
+                } else {
+                    memberValue = [NSNumber numberWithUnsignedShort:cppValue.dataIndex.Value()];
+                }
+                value.dataIndex = memberValue;
+            } while (0);
 
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
+            return value;
         }
-        break;
-    }
-    case Clusters::PowerSource::Id: {
-        using namespace Clusters::PowerSource;
-        switch (aPath.mEventId) {
 
         default:
             *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
@@ -1401,8 +1561,8 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::PowerSourceConfiguration::Id: {
-        using namespace Clusters::PowerSourceConfiguration;
+    case Clusters::WindowCovering::Id: {
+        using namespace Clusters::WindowCovering;
         switch (aPath.mEventId) {
 
         default:
@@ -1411,8 +1571,8 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::PressureMeasurement::Id: {
-        using namespace Clusters::PressureMeasurement;
+    case Clusters::BarrierControl::Id: {
+        using namespace Clusters::BarrierControl;
         switch (aPath.mEventId) {
 
         default:
@@ -1651,8 +1811,8 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::RelativeHumidityMeasurement::Id: {
-        using namespace Clusters::RelativeHumidityMeasurement;
+    case Clusters::Thermostat::Id: {
+        using namespace Clusters::Thermostat;
         switch (aPath.mEventId) {
 
         default:
@@ -1661,8 +1821,8 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::Scenes::Id: {
-        using namespace Clusters::Scenes;
+    case Clusters::FanControl::Id: {
+        using namespace Clusters::FanControl;
         switch (aPath.mEventId) {
 
         default:
@@ -1671,33 +1831,19 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::SoftwareDiagnostics::Id: {
-        using namespace Clusters::SoftwareDiagnostics;
+    case Clusters::ThermostatUserInterfaceConfiguration::Id: {
+        using namespace Clusters::ThermostatUserInterfaceConfiguration;
         switch (aPath.mEventId) {
 
-        case Events::SoftwareFault::Id: {
-            Events::SoftwareFault::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-
-            CHIPSoftwareDiagnosticsClusterSoftwareFaultEvent * value = [CHIPSoftwareDiagnosticsClusterSoftwareFaultEvent new];
-
-            do {
-                CHIPSoftwareDiagnosticsClusterSoftwareFaultStruct * _Nonnull memberValue;
-                memberValue = [CHIPSoftwareDiagnosticsClusterSoftwareFaultStruct new];
-                memberValue.id = [NSNumber numberWithUnsignedLongLong:cppValue.softwareFault.id];
-                memberValue.name = [[NSString alloc] initWithBytes:cppValue.softwareFault.name.data()
-                                                            length:cppValue.softwareFault.name.size()
-                                                          encoding:NSUTF8StringEncoding];
-                memberValue.faultRecording = [NSData dataWithBytes:cppValue.softwareFault.faultRecording.data()
-                                                            length:cppValue.softwareFault.faultRecording.size()];
-                value.softwareFault = memberValue;
-            } while (0);
-
-            return value;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
         }
+        break;
+    }
+    case Clusters::ColorControl::Id: {
+        using namespace Clusters::ColorControl;
+        switch (aPath.mEventId) {
 
         default:
             *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
@@ -1705,145 +1851,169 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::Switch::Id: {
-        using namespace Clusters::Switch;
+    case Clusters::IlluminanceMeasurement::Id: {
+        using namespace Clusters::IlluminanceMeasurement;
         switch (aPath.mEventId) {
 
-        case Events::SwitchLatched::Id: {
-            Events::SwitchLatched::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-
-            CHIPSwitchClusterSwitchLatchedEvent * value = [CHIPSwitchClusterSwitchLatchedEvent new];
-
-            do {
-                NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:cppValue.newPosition];
-                value.newPosition = memberValue;
-            } while (0);
-
-            return value;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
         }
+        break;
+    }
+    case Clusters::TemperatureMeasurement::Id: {
+        using namespace Clusters::TemperatureMeasurement;
+        switch (aPath.mEventId) {
 
-        case Events::InitialPress::Id: {
-            Events::InitialPress::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-
-            CHIPSwitchClusterInitialPressEvent * value = [CHIPSwitchClusterInitialPressEvent new];
-
-            do {
-                NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:cppValue.newPosition];
-                value.newPosition = memberValue;
-            } while (0);
-
-            return value;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
         }
+        break;
+    }
+    case Clusters::PressureMeasurement::Id: {
+        using namespace Clusters::PressureMeasurement;
+        switch (aPath.mEventId) {
 
-        case Events::LongPress::Id: {
-            Events::LongPress::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-
-            CHIPSwitchClusterLongPressEvent * value = [CHIPSwitchClusterLongPressEvent new];
-
-            do {
-                NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:cppValue.newPosition];
-                value.newPosition = memberValue;
-            } while (0);
-
-            return value;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
         }
+        break;
+    }
+    case Clusters::FlowMeasurement::Id: {
+        using namespace Clusters::FlowMeasurement;
+        switch (aPath.mEventId) {
 
-        case Events::ShortRelease::Id: {
-            Events::ShortRelease::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-
-            CHIPSwitchClusterShortReleaseEvent * value = [CHIPSwitchClusterShortReleaseEvent new];
-
-            do {
-                NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:cppValue.previousPosition];
-                value.previousPosition = memberValue;
-            } while (0);
-
-            return value;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
         }
+        break;
+    }
+    case Clusters::RelativeHumidityMeasurement::Id: {
+        using namespace Clusters::RelativeHumidityMeasurement;
+        switch (aPath.mEventId) {
 
-        case Events::LongRelease::Id: {
-            Events::LongRelease::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-
-            CHIPSwitchClusterLongReleaseEvent * value = [CHIPSwitchClusterLongReleaseEvent new];
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::OccupancySensing::Id: {
+        using namespace Clusters::OccupancySensing;
+        switch (aPath.mEventId) {
 
-            do {
-                NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:cppValue.previousPosition];
-                value.previousPosition = memberValue;
-            } while (0);
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::WakeOnLan::Id: {
+        using namespace Clusters::WakeOnLan;
+        switch (aPath.mEventId) {
 
-            return value;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
         }
+        break;
+    }
+    case Clusters::Channel::Id: {
+        using namespace Clusters::Channel;
+        switch (aPath.mEventId) {
 
-        case Events::MultiPressOngoing::Id: {
-            Events::MultiPressOngoing::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::TargetNavigator::Id: {
+        using namespace Clusters::TargetNavigator;
+        switch (aPath.mEventId) {
 
-            CHIPSwitchClusterMultiPressOngoingEvent * value = [CHIPSwitchClusterMultiPressOngoingEvent new];
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::MediaPlayback::Id: {
+        using namespace Clusters::MediaPlayback;
+        switch (aPath.mEventId) {
 
-            do {
-                NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:cppValue.newPosition];
-                value.newPosition = memberValue;
-            } while (0);
-            do {
-                NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:cppValue.currentNumberOfPressesCounted];
-                value.currentNumberOfPressesCounted = memberValue;
-            } while (0);
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::MediaInput::Id: {
+        using namespace Clusters::MediaInput;
+        switch (aPath.mEventId) {
 
-            return value;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
         }
+        break;
+    }
+    case Clusters::LowPower::Id: {
+        using namespace Clusters::LowPower;
+        switch (aPath.mEventId) {
 
-        case Events::MultiPressComplete::Id: {
-            Events::MultiPressComplete::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::KeypadInput::Id: {
+        using namespace Clusters::KeypadInput;
+        switch (aPath.mEventId) {
 
-            CHIPSwitchClusterMultiPressCompleteEvent * value = [CHIPSwitchClusterMultiPressCompleteEvent new];
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::ContentLauncher::Id: {
+        using namespace Clusters::ContentLauncher;
+        switch (aPath.mEventId) {
 
-            do {
-                NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:cppValue.newPosition];
-                value.newPosition = memberValue;
-            } while (0);
-            do {
-                NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:cppValue.totalNumberOfPressesCounted];
-                value.totalNumberOfPressesCounted = memberValue;
-            } while (0);
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::AudioOutput::Id: {
+        using namespace Clusters::AudioOutput;
+        switch (aPath.mEventId) {
 
-            return value;
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
+        }
+        break;
+    }
+    case Clusters::ApplicationLauncher::Id: {
+        using namespace Clusters::ApplicationLauncher;
+        switch (aPath.mEventId) {
+
+        default:
+            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
+            break;
         }
+        break;
+    }
+    case Clusters::ApplicationBasic::Id: {
+        using namespace Clusters::ApplicationBasic;
+        switch (aPath.mEventId) {
 
         default:
             *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
@@ -1851,8 +2021,8 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::TargetNavigator::Id: {
-        using namespace Clusters::TargetNavigator;
+    case Clusters::AccountLogin::Id: {
+        using namespace Clusters::AccountLogin;
         switch (aPath.mEventId) {
 
         default:
@@ -1861,8 +2031,8 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::TemperatureMeasurement::Id: {
-        using namespace Clusters::TemperatureMeasurement;
+    case Clusters::ElectricalMeasurement::Id: {
+        using namespace Clusters::ElectricalMeasurement;
         switch (aPath.mEventId) {
 
         default:
@@ -1992,176 +2162,6 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea
         }
         break;
     }
-    case Clusters::Thermostat::Id: {
-        using namespace Clusters::Thermostat;
-        switch (aPath.mEventId) {
-
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::ThermostatUserInterfaceConfiguration::Id: {
-        using namespace Clusters::ThermostatUserInterfaceConfiguration;
-        switch (aPath.mEventId) {
-
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::ThreadNetworkDiagnostics::Id: {
-        using namespace Clusters::ThreadNetworkDiagnostics;
-        switch (aPath.mEventId) {
-
-        case Events::ConnectionStatus::Id: {
-            Events::ConnectionStatus::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-
-            CHIPThreadNetworkDiagnosticsClusterConnectionStatusEvent * value =
-                [CHIPThreadNetworkDiagnosticsClusterConnectionStatusEvent new];
-
-            do {
-                NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.connectionStatus)];
-                value.connectionStatus = memberValue;
-            } while (0);
-
-            return value;
-        }
-
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::TimeFormatLocalization::Id: {
-        using namespace Clusters::TimeFormatLocalization;
-        switch (aPath.mEventId) {
-
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::UnitLocalization::Id: {
-        using namespace Clusters::UnitLocalization;
-        switch (aPath.mEventId) {
-
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::UserLabel::Id: {
-        using namespace Clusters::UserLabel;
-        switch (aPath.mEventId) {
-
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::WakeOnLan::Id: {
-        using namespace Clusters::WakeOnLan;
-        switch (aPath.mEventId) {
-
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::WiFiNetworkDiagnostics::Id: {
-        using namespace Clusters::WiFiNetworkDiagnostics;
-        switch (aPath.mEventId) {
-
-        case Events::Disconnection::Id: {
-            Events::Disconnection::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-
-            CHIPWiFiNetworkDiagnosticsClusterDisconnectionEvent * value = [CHIPWiFiNetworkDiagnosticsClusterDisconnectionEvent new];
-
-            do {
-                NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedShort:cppValue.reasonCode];
-                value.reasonCode = memberValue;
-            } while (0);
-
-            return value;
-        }
-
-        case Events::AssociationFailure::Id: {
-            Events::AssociationFailure::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-
-            CHIPWiFiNetworkDiagnosticsClusterAssociationFailureEvent * value =
-                [CHIPWiFiNetworkDiagnosticsClusterAssociationFailureEvent new];
-
-            do {
-                NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.associationFailure)];
-                value.associationFailure = memberValue;
-            } while (0);
-            do {
-                NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedShort:cppValue.status];
-                value.status = memberValue;
-            } while (0);
-
-            return value;
-        }
-
-        case Events::ConnectionStatus::Id: {
-            Events::ConnectionStatus::DecodableType cppValue;
-            *aError = DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR) {
-                return nil;
-            }
-
-            CHIPWiFiNetworkDiagnosticsClusterConnectionStatusEvent * value =
-                [CHIPWiFiNetworkDiagnosticsClusterConnectionStatusEvent new];
-
-            do {
-                NSNumber * _Nonnull memberValue;
-                memberValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.connectionStatus)];
-                value.connectionStatus = memberValue;
-            } while (0);
-
-            return value;
-        }
-
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
-        }
-        break;
-    }
-    case Clusters::WindowCovering::Id: {
-        using namespace Clusters::WindowCovering;
-        switch (aPath.mEventId) {
-
-        default:
-            *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
-            break;
-        }
-        break;
-    }
     default: {
         *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
         break;
diff --git a/third_party/zap/repo b/third_party/zap/repo
index ca9cbecbc36228..fd3adabbb2ac03 160000
--- a/third_party/zap/repo
+++ b/third_party/zap/repo
@@ -1 +1 @@
-Subproject commit ca9cbecbc36228db65349864a77402075c39d9d2
+Subproject commit fd3adabbb2ac031d765da028fb51475260b7cfaf
diff --git a/zzz_generated/all-clusters-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/all-clusters-app/zap-generated/PluginApplicationCallbacks.h
index deda63ad5884a3..a1ca42f58595fe 100644
--- a/zzz_generated/all-clusters-app/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/all-clusters-app/zap-generated/PluginApplicationCallbacks.h
@@ -22,66 +22,66 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAccountLoginPluginServerInitCallback();                                                                                  \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterApplicationBasicPluginServerInitCallback();                                                                              \
-    MatterApplicationLauncherPluginServerInitCallback();                                                                           \
-    MatterAudioOutputPluginServerInitCallback();                                                                                   \
-    MatterBarrierControlPluginServerInitCallback();                                                                                \
-    MatterBasicPluginServerInitCallback();                                                                                         \
+    MatterIdentifyPluginServerInitCallback();                                                                                      \
+    MatterGroupsPluginServerInitCallback();                                                                                        \
+    MatterScenesPluginServerInitCallback();                                                                                        \
+    MatterOnOffPluginServerInitCallback();                                                                                         \
+    MatterOnOffSwitchConfigurationPluginServerInitCallback();                                                                      \
+    MatterLevelControlPluginServerInitCallback();                                                                                  \
     MatterBinaryInputBasicPluginServerInitCallback();                                                                              \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
     MatterBindingPluginServerInitCallback();                                                                                       \
-    MatterBooleanStatePluginServerInitCallback();                                                                                  \
+    MatterAccessControlPluginServerInitCallback();                                                                                 \
     MatterBridgedActionsPluginServerInitCallback();                                                                                \
-    MatterChannelPluginServerInitCallback();                                                                                       \
-    MatterColorControlPluginServerInitCallback();                                                                                  \
-    MatterContentLauncherPluginServerInitCallback();                                                                               \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterDoorLockPluginServerInitCallback();                                                                                      \
-    MatterElectricalMeasurementPluginServerInitCallback();                                                                         \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFanControlPluginServerInitCallback();                                                                                    \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterFlowMeasurementPluginServerInitCallback();                                                                               \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterIlluminanceMeasurementPluginServerInitCallback();                                                                        \
-    MatterKeypadInputPluginServerInitCallback();                                                                                   \
-    MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterLowPowerPluginServerInitCallback();                                                                                      \
-    MatterMediaInputPluginServerInitCallback();                                                                                    \
-    MatterMediaPlaybackPluginServerInitCallback();                                                                                 \
-    MatterModeSelectPluginServerInitCallback();                                                                                    \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterBasicPluginServerInitCallback();                                                                                         \
     MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
     MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterOccupancySensingPluginServerInitCallback();                                                                              \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterOnOffSwitchConfigurationPluginServerInitCallback();                                                                      \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterPowerSourcePluginServerInitCallback();                                                                                   \
+    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterUnitLocalizationPluginServerInitCallback();                                                                              \
     MatterPowerSourceConfigurationPluginServerInitCallback();                                                                      \
-    MatterPressureMeasurementPluginServerInitCallback();                                                                           \
-    MatterPumpConfigurationAndControlPluginServerInitCallback();                                                                   \
-    MatterRelativeHumidityMeasurementPluginServerInitCallback();                                                                   \
-    MatterScenesPluginServerInitCallback();                                                                                        \
+    MatterPowerSourcePluginServerInitCallback();                                                                                   \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
+    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
     MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterTargetNavigatorPluginServerInitCallback();                                                                               \
-    MatterTemperatureMeasurementPluginServerInitCallback();                                                                        \
-    MatterTestClusterPluginServerInitCallback();                                                                                   \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
+    MatterUserLabelPluginServerInitCallback();                                                                                     \
+    MatterBooleanStatePluginServerInitCallback();                                                                                  \
+    MatterModeSelectPluginServerInitCallback();                                                                                    \
+    MatterDoorLockPluginServerInitCallback();                                                                                      \
+    MatterWindowCoveringPluginServerInitCallback();                                                                                \
+    MatterBarrierControlPluginServerInitCallback();                                                                                \
+    MatterPumpConfigurationAndControlPluginServerInitCallback();                                                                   \
     MatterThermostatPluginServerInitCallback();                                                                                    \
+    MatterFanControlPluginServerInitCallback();                                                                                    \
     MatterThermostatUserInterfaceConfigurationPluginServerInitCallback();                                                          \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterUnitLocalizationPluginServerInitCallback();                                                                              \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
+    MatterColorControlPluginServerInitCallback();                                                                                  \
+    MatterIlluminanceMeasurementPluginServerInitCallback();                                                                        \
+    MatterTemperatureMeasurementPluginServerInitCallback();                                                                        \
+    MatterPressureMeasurementPluginServerInitCallback();                                                                           \
+    MatterFlowMeasurementPluginServerInitCallback();                                                                               \
+    MatterRelativeHumidityMeasurementPluginServerInitCallback();                                                                   \
+    MatterOccupancySensingPluginServerInitCallback();                                                                              \
     MatterWakeOnLanPluginServerInitCallback();                                                                                     \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterWindowCoveringPluginServerInitCallback();
+    MatterChannelPluginServerInitCallback();                                                                                       \
+    MatterTargetNavigatorPluginServerInitCallback();                                                                               \
+    MatterMediaPlaybackPluginServerInitCallback();                                                                                 \
+    MatterMediaInputPluginServerInitCallback();                                                                                    \
+    MatterLowPowerPluginServerInitCallback();                                                                                      \
+    MatterKeypadInputPluginServerInitCallback();                                                                                   \
+    MatterContentLauncherPluginServerInitCallback();                                                                               \
+    MatterAudioOutputPluginServerInitCallback();                                                                                   \
+    MatterApplicationLauncherPluginServerInitCallback();                                                                           \
+    MatterApplicationBasicPluginServerInitCallback();                                                                              \
+    MatterAccountLoginPluginServerInitCallback();                                                                                  \
+    MatterElectricalMeasurementPluginServerInitCallback();                                                                         \
+    MatterTestClusterPluginServerInitCallback();
diff --git a/zzz_generated/all-clusters-app/zap-generated/access.h b/zzz_generated/all-clusters-app/zap-generated/access.h
index 3852ec7430be5e..45449aa7662e8f 100644
--- a/zzz_generated/all-clusters-app/zap-generated/access.h
+++ b/zzz_generated/all-clusters-app/zap-generated/access.h
@@ -29,6 +29,8 @@
 
 // Parallel array data (*cluster*, attribute, privilege) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__CLUSTER { \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
+    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
@@ -37,18 +39,16 @@
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
-    /* Cluster: Color Control, Attribute: WhitePointX, Privilege: view */ \
-    /* Cluster: Color Control, Attribute: WhitePointY, Privilege: view */ \
-    /* Cluster: Color Control, Attribute: ColorPointRX, Privilege: view */ \
-    /* Cluster: Color Control, Attribute: ColorPointRY, Privilege: view */ \
-    /* Cluster: Color Control, Attribute: ColorPointRIntensity, Privilege: view */ \
-    /* Cluster: Color Control, Attribute: ColorPointGX, Privilege: view */ \
-    /* Cluster: Color Control, Attribute: ColorPointGY, Privilege: view */ \
-    /* Cluster: Color Control, Attribute: ColorPointGIntensity, Privilege: view */ \
-    /* Cluster: Color Control, Attribute: ColorPointBX, Privilege: view */ \
-    /* Cluster: Color Control, Attribute: ColorPointBY, Privilege: view */ \
-    /* Cluster: Color Control, Attribute: ColorPointBIntensity, Privilege: view */ \
-    /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
+    /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
+    49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
+    49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
+    /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
+    49, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
+    49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
+    49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
+    62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
+    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
     /* Cluster: Door Lock, Attribute: DoorOpenEvents, Privilege: view */ \
     /* Cluster: Door Lock, Attribute: DoorClosedEvents, Privilege: view */ \
     /* Cluster: Door Lock, Attribute: OpenPeriod, Privilege: view */ \
@@ -62,17 +62,7 @@
     /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: view */ \
     /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: view */ \
     /* Cluster: Door Lock, Attribute: RequirePINforRemoteOperation, Privilege: view */ \
-    /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
-    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
-    49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
-    49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
-    /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
-    49, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
-    49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
-    49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
-    62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \
@@ -86,20 +76,6 @@
     /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \
-    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
-    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
-}
-
-// Parallel array data (cluster, *attribute*, privilege) for read attribute
-#define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \
-    0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
-    1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
-    /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
-    /* Cluster: Access Control, Attribute: TargetsPerAccessControlEntry, Privilege: view */ \
-    /* Cluster: Access Control, Attribute: AccessControlEntriesPerFabric, Privilege: view */ \
-    /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
-    /* Cluster: Basic, Attribute: Location, Privilege: view */ \
-    /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: Color Control, Attribute: WhitePointX, Privilege: view */ \
     /* Cluster: Color Control, Attribute: WhitePointY, Privilege: view */ \
     /* Cluster: Color Control, Attribute: ColorPointRX, Privilege: view */ \
@@ -112,6 +88,30 @@
     /* Cluster: Color Control, Attribute: ColorPointBY, Privilege: view */ \
     /* Cluster: Color Control, Attribute: ColorPointBIntensity, Privilege: view */ \
     /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
+}
+
+// Parallel array data (cluster, *attribute*, privilege) for read attribute
+#define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
+    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
+    0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
+    1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
+    /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
+    /* Cluster: Access Control, Attribute: TargetsPerAccessControlEntry, Privilege: view */ \
+    /* Cluster: Access Control, Attribute: AccessControlEntriesPerFabric, Privilege: view */ \
+    /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
+    /* Cluster: Basic, Attribute: Location, Privilege: view */ \
+    /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
+    /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
+    0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
+    1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
+    /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
+    5, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
+    6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
+    7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
+    0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
+    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
     /* Cluster: Door Lock, Attribute: DoorOpenEvents, Privilege: view */ \
     /* Cluster: Door Lock, Attribute: DoorClosedEvents, Privilege: view */ \
     /* Cluster: Door Lock, Attribute: OpenPeriod, Privilege: view */ \
@@ -125,17 +125,7 @@
     /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: view */ \
     /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: view */ \
     /* Cluster: Door Lock, Attribute: RequirePINforRemoteOperation, Privilege: view */ \
-    /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
-    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
-    0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
-    1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
-    /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
-    5, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
-    6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
-    7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
-    0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \
@@ -149,20 +139,6 @@
     /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \
-    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
-    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
-}
-
-// Parallel array data (cluster, attribute, *privilege*) for read attribute
-#define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
-    /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
-    /* Cluster: Access Control, Attribute: TargetsPerAccessControlEntry, Privilege: view */ \
-    /* Cluster: Access Control, Attribute: AccessControlEntriesPerFabric, Privilege: view */ \
-    /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
-    /* Cluster: Basic, Attribute: Location, Privilege: view */ \
-    /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: Color Control, Attribute: WhitePointX, Privilege: view */ \
     /* Cluster: Color Control, Attribute: WhitePointY, Privilege: view */ \
     /* Cluster: Color Control, Attribute: ColorPointRX, Privilege: view */ \
@@ -175,6 +151,30 @@
     /* Cluster: Color Control, Attribute: ColorPointBY, Privilege: view */ \
     /* Cluster: Color Control, Attribute: ColorPointBIntensity, Privilege: view */ \
     /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
+}
+
+// Parallel array data (cluster, attribute, *privilege*) for read attribute
+#define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
+    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
+    /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
+    /* Cluster: Access Control, Attribute: TargetsPerAccessControlEntry, Privilege: view */ \
+    /* Cluster: Access Control, Attribute: AccessControlEntriesPerFabric, Privilege: view */ \
+    /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
+    /* Cluster: Basic, Attribute: Location, Privilege: view */ \
+    /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
+    /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
+    /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
+    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
     /* Cluster: Door Lock, Attribute: DoorOpenEvents, Privilege: view */ \
     /* Cluster: Door Lock, Attribute: DoorClosedEvents, Privilege: view */ \
     /* Cluster: Door Lock, Attribute: OpenPeriod, Privilege: view */ \
@@ -188,17 +188,7 @@
     /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: view */ \
     /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: view */ \
     /* Cluster: Door Lock, Attribute: RequirePINforRemoteOperation, Privilege: view */ \
-    /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
-    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
-    /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \
@@ -212,31 +202,35 @@
     /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \
-    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
-    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
+    /* Cluster: Color Control, Attribute: WhitePointX, Privilege: view */ \
+    /* Cluster: Color Control, Attribute: WhitePointY, Privilege: view */ \
+    /* Cluster: Color Control, Attribute: ColorPointRX, Privilege: view */ \
+    /* Cluster: Color Control, Attribute: ColorPointRY, Privilege: view */ \
+    /* Cluster: Color Control, Attribute: ColorPointRIntensity, Privilege: view */ \
+    /* Cluster: Color Control, Attribute: ColorPointGX, Privilege: view */ \
+    /* Cluster: Color Control, Attribute: ColorPointGY, Privilege: view */ \
+    /* Cluster: Color Control, Attribute: ColorPointGIntensity, Privilege: view */ \
+    /* Cluster: Color Control, Attribute: ColorPointBX, Privilege: view */ \
+    /* Cluster: Color Control, Attribute: ColorPointBY, Privilege: view */ \
+    /* Cluster: Color Control, Attribute: ColorPointBIntensity, Privilege: view */ \
+    /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // Parallel array data (*cluster*, attribute, privilege) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__CLUSTER { \
+    6, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    8, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
-    768, /* Cluster: Color Control, Attribute: WhitePointX, Privilege: manage */ \
-    768, /* Cluster: Color Control, Attribute: WhitePointY, Privilege: manage */ \
-    768, /* Cluster: Color Control, Attribute: ColorPointRX, Privilege: manage */ \
-    768, /* Cluster: Color Control, Attribute: ColorPointRY, Privilege: manage */ \
-    768, /* Cluster: Color Control, Attribute: ColorPointRIntensity, Privilege: manage */ \
-    768, /* Cluster: Color Control, Attribute: ColorPointGX, Privilege: manage */ \
-    768, /* Cluster: Color Control, Attribute: ColorPointGY, Privilege: manage */ \
-    768, /* Cluster: Color Control, Attribute: ColorPointGIntensity, Privilege: manage */ \
-    768, /* Cluster: Color Control, Attribute: ColorPointBX, Privilege: manage */ \
-    768, /* Cluster: Color Control, Attribute: ColorPointBY, Privilege: manage */ \
-    768, /* Cluster: Color Control, Attribute: ColorPointBIntensity, Privilege: manage */ \
-    768, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
+    49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
+    65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
     257, /* Cluster: Door Lock, Attribute: DoorOpenEvents, Privilege: manage */ \
     257, /* Cluster: Door Lock, Attribute: DoorClosedEvents, Privilege: manage */ \
     257, /* Cluster: Door Lock, Attribute: OpenPeriod, Privilege: manage */ \
@@ -250,11 +244,7 @@
     257, /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: administer */ \
     257, /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: administer */ \
     257, /* Cluster: Door Lock, Attribute: RequirePINforRemoteOperation, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
-    8, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
-    49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    6, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    258, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
     512, /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: manage */ \
     512, /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: manage */ \
     512, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \
@@ -268,29 +258,33 @@
     513, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \
     516, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \
     516, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \
-    65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
-    258, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
+    768, /* Cluster: Color Control, Attribute: WhitePointX, Privilege: manage */ \
+    768, /* Cluster: Color Control, Attribute: WhitePointY, Privilege: manage */ \
+    768, /* Cluster: Color Control, Attribute: ColorPointRX, Privilege: manage */ \
+    768, /* Cluster: Color Control, Attribute: ColorPointRY, Privilege: manage */ \
+    768, /* Cluster: Color Control, Attribute: ColorPointRIntensity, Privilege: manage */ \
+    768, /* Cluster: Color Control, Attribute: ColorPointGX, Privilege: manage */ \
+    768, /* Cluster: Color Control, Attribute: ColorPointGY, Privilege: manage */ \
+    768, /* Cluster: Color Control, Attribute: ColorPointGIntensity, Privilege: manage */ \
+    768, /* Cluster: Color Control, Attribute: ColorPointBX, Privilege: manage */ \
+    768, /* Cluster: Color Control, Attribute: ColorPointBY, Privilege: manage */ \
+    768, /* Cluster: Color Control, Attribute: ColorPointBIntensity, Privilege: manage */ \
+    768, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__ATTRIBUTE { \
+    16387, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    16384, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     5, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
-    48, /* Cluster: Color Control, Attribute: WhitePointX, Privilege: manage */ \
-    49, /* Cluster: Color Control, Attribute: WhitePointY, Privilege: manage */ \
-    50, /* Cluster: Color Control, Attribute: ColorPointRX, Privilege: manage */ \
-    51, /* Cluster: Color Control, Attribute: ColorPointRY, Privilege: manage */ \
-    52, /* Cluster: Color Control, Attribute: ColorPointRIntensity, Privilege: manage */ \
-    54, /* Cluster: Color Control, Attribute: ColorPointGX, Privilege: manage */ \
-    55, /* Cluster: Color Control, Attribute: ColorPointGY, Privilege: manage */ \
-    56, /* Cluster: Color Control, Attribute: ColorPointGIntensity, Privilege: manage */ \
-    58, /* Cluster: Color Control, Attribute: ColorPointBX, Privilege: manage */ \
-    59, /* Cluster: Color Control, Attribute: ColorPointBY, Privilege: manage */ \
-    60, /* Cluster: Color Control, Attribute: ColorPointBIntensity, Privilege: manage */ \
-    16400, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
+    4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
+    0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
     4, /* Cluster: Door Lock, Attribute: DoorOpenEvents, Privilege: manage */ \
     5, /* Cluster: Door Lock, Attribute: DoorClosedEvents, Privilege: manage */ \
     6, /* Cluster: Door Lock, Attribute: OpenPeriod, Privilege: manage */ \
@@ -304,11 +298,7 @@
     48, /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: administer */ \
     49, /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: administer */ \
     51, /* Cluster: Door Lock, Attribute: RequirePINforRemoteOperation, Privilege: administer */ \
-    0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
-    16384, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
-    4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    16387, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    23, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
     21, /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: manage */ \
     23, /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: manage */ \
     32, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \
@@ -322,29 +312,33 @@
     28, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \
     1, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \
     2, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \
-    0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
-    23, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
+    48, /* Cluster: Color Control, Attribute: WhitePointX, Privilege: manage */ \
+    49, /* Cluster: Color Control, Attribute: WhitePointY, Privilege: manage */ \
+    50, /* Cluster: Color Control, Attribute: ColorPointRX, Privilege: manage */ \
+    51, /* Cluster: Color Control, Attribute: ColorPointRY, Privilege: manage */ \
+    52, /* Cluster: Color Control, Attribute: ColorPointRIntensity, Privilege: manage */ \
+    54, /* Cluster: Color Control, Attribute: ColorPointGX, Privilege: manage */ \
+    55, /* Cluster: Color Control, Attribute: ColorPointGY, Privilege: manage */ \
+    56, /* Cluster: Color Control, Attribute: ColorPointGIntensity, Privilege: manage */ \
+    58, /* Cluster: Color Control, Attribute: ColorPointBX, Privilege: manage */ \
+    59, /* Cluster: Color Control, Attribute: ColorPointBY, Privilege: manage */ \
+    60, /* Cluster: Color Control, Attribute: ColorPointBIntensity, Privilege: manage */ \
+    16400, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__PRIVILEGE { \
+    kMatterAccessPrivilegeManage, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: WhitePointX, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: WhitePointY, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: ColorPointRX, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: ColorPointRY, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: ColorPointRIntensity, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: ColorPointGX, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: ColorPointGY, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: ColorPointGIntensity, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: ColorPointBX, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: ColorPointBY, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: ColorPointBIntensity, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Door Lock, Attribute: DoorOpenEvents, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Door Lock, Attribute: DoorClosedEvents, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Door Lock, Attribute: OpenPeriod, Privilege: manage */ \
@@ -358,11 +352,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Attribute: RequirePINforRemoteOperation, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \
@@ -376,47 +366,46 @@
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: WhitePointX, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: WhitePointY, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: ColorPointRX, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: ColorPointRY, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: ColorPointRIntensity, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: ColorPointGX, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: ColorPointGY, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: ColorPointGIntensity, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: ColorPointBX, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: ColorPointBY, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: ColorPointBIntensity, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: ClearWeekDaySchedule, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    3, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -425,47 +414,47 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: ClearWeekDaySchedule, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    11, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \
-    12, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \
-    13, /* Cluster: Door Lock, Command: ClearWeekDaySchedule, Privilege: administer */ \
-    14, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \
-    15, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \
-    26, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \
-    27, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \
-    29, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \
-    34, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \
-    36, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \
-    38, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \
-    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    64, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
     0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
-    64, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
+    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -474,47 +463,47 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    11, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \
+    12, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \
+    13, /* Cluster: Door Lock, Command: ClearWeekDaySchedule, Privilege: administer */ \
+    14, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \
+    15, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \
+    26, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \
+    27, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \
+    29, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \
+    34, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \
+    36, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \
+    38, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearWeekDaySchedule, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -523,10 +512,21 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearWeekDaySchedule, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/all-clusters-app/zap-generated/gen_config.h b/zzz_generated/all-clusters-app/zap-generated/gen_config.h
index 131feae3ac3028..9c3164e9f1105e 100644
--- a/zzz_generated/all-clusters-app/zap-generated/gen_config.h
+++ b/zzz_generated/all-clusters-app/zap-generated/gen_config.h
@@ -29,402 +29,402 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
-#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ACCOUNT_LOGIN_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_APPLICATION_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_AUDIO_OUTPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BARRIER_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (3)
+#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_ON_OFF_SWITCH_CONFIG_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_BINARY_INPUT_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (3)
 #define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_BOOLEAN_STATE_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_BRIDGED_ACTIONS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (3)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ELECTRICAL_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FAN_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (3)
-#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOW_POWER_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_MEDIA_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_MEDIA_PLAYBACK_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OCCUPANCY_SENSING_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_ON_OFF_SWITCH_CONFIG_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT (3)
+#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_POWER_SOURCE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_PUMP_CONFIG_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT (3)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TEST_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_BOOLEAN_STATE_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BARRIER_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_PUMP_CONFIG_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_THERMOSTAT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FAN_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_OCCUPANCY_SENSING_CLUSTER_SERVER_ENDPOINT_COUNT (2)
 #define EMBER_AF_WAKE_ON_LAN_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_MEDIA_PLAYBACK_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_MEDIA_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOW_POWER_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_AUDIO_OUTPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_APPLICATION_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ACCOUNT_LOGIN_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ELECTRICAL_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TEST_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
-// Use this macro to check if the server side of the Access Control cluster is included
-#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL
-
-// Use this macro to check if the server side of the Account Login cluster is included
-#define ZCL_USING_ACCOUNT_LOGIN_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ACCOUNT_LOGIN_SERVER
-#define EMBER_AF_PLUGIN_ACCOUNT_LOGIN
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
 
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
+// Use this macro to check if the server side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUPS_SERVER
+#define EMBER_AF_PLUGIN_GROUPS
 
-// Use this macro to check if the server side of the Application Basic cluster is included
-#define ZCL_USING_APPLICATION_BASIC_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_APPLICATION_BASIC_SERVER
-#define EMBER_AF_PLUGIN_APPLICATION_BASIC
+// Use this macro to check if the server side of the Scenes cluster is included
+#define ZCL_USING_SCENES_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SCENES_SERVER
+#define EMBER_AF_PLUGIN_SCENES
+// User options for server plugin Scenes
+// Cluster spec 1.4.8.2
+#ifdef CHIP_CONFIG_MAX_SCENES_PER_FABRIC
+#define MATTER_SCENES_TABLE_SIZE CHIP_CONFIG_MAX_SCENES_PER_FABRIC
+#else
+#define MATTER_SCENES_TABLE_SIZE 16
+#endif
 
-// Use this macro to check if the server side of the Application Launcher cluster is included
-#define ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_APPLICATION_LAUNCHER_SERVER
-#define EMBER_AF_PLUGIN_APPLICATION_LAUNCHER
+// Scenes FeatureMap Attribute Toggle Scenes Name feature
+// App cluster specs 1.4.4
+#define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
+#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0000 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
 
-// Use this macro to check if the server side of the Audio Output cluster is included
-#define ZCL_USING_AUDIO_OUTPUT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_AUDIO_OUTPUT_SERVER
-#define EMBER_AF_PLUGIN_AUDIO_OUTPUT
+// Use this macro to check if the server side of the On/Off cluster is included
+#define ZCL_USING_ON_OFF_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF
 
-// Use this macro to check if the server side of the Barrier Control cluster is included
-#define ZCL_USING_BARRIER_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BARRIER_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_BARRIER_CONTROL
+// Use this macro to check if the server side of the On/off Switch Configuration cluster is included
+#define ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF_SWITCH_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF_SWITCH_CONFIGURATION
 
-// Use this macro to check if the server side of the Basic cluster is included
-#define ZCL_USING_BASIC_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BASIC_SERVER
-#define EMBER_AF_PLUGIN_BASIC
+// Use this macro to check if the server side of the Level Control cluster is included
+#define ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL
+// User options for server plugin Level Control
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL 254
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0
 
 // Use this macro to check if the server side of the Binary Input (Basic) cluster is included
 #define ZCL_USING_BINARY_INPUT_BASIC_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_BINARY_INPUT_BASIC_SERVER
 #define EMBER_AF_PLUGIN_BINARY_INPUT_BASIC
 
+// Use this macro to check if the server side of the Descriptor cluster is included
+#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR
+
 // Use this macro to check if the server side of the Binding cluster is included
 #define ZCL_USING_BINDING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_BINDING_SERVER
 #define EMBER_AF_PLUGIN_BINDING
 
-// Use this macro to check if the server side of the Boolean State cluster is included
-#define ZCL_USING_BOOLEAN_STATE_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BOOLEAN_STATE_SERVER
-#define EMBER_AF_PLUGIN_BOOLEAN_STATE
+// Use this macro to check if the server side of the Access Control cluster is included
+#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL
 
 // Use this macro to check if the server side of the Bridged Actions cluster is included
 #define ZCL_USING_BRIDGED_ACTIONS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_BRIDGED_ACTIONS_SERVER
 #define EMBER_AF_PLUGIN_BRIDGED_ACTIONS
 
-// Use this macro to check if the server side of the Channel cluster is included
-#define ZCL_USING_CHANNEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_CHANNEL_SERVER
-#define EMBER_AF_PLUGIN_CHANNEL
-
-// Use this macro to check if the server side of the Color Control cluster is included
-#define ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_COLOR_CONTROL
-// User options for server plugin Color Control
-#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY
-#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP
-#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV
-
-// Use this macro to check if the server side of the Content Launcher cluster is included
-#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_SERVER
-#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER
-
-// Use this macro to check if the server side of the Descriptor cluster is included
-#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR
+// Use this macro to check if the server side of the Basic cluster is included
+#define ZCL_USING_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BASIC_SERVER
+#define EMBER_AF_PLUGIN_BASIC
 
-// Use this macro to check if the server side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
+#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
 
-// Use this macro to check if the server side of the Door Lock cluster is included
-#define ZCL_USING_DOOR_LOCK_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DOOR_LOCK_SERVER
-#define EMBER_AF_PLUGIN_DOOR_LOCK
+// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
+#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
 
-// Use this macro to check if the server side of the Electrical Measurement cluster is included
-#define ZCL_USING_ELECTRICAL_MEASUREMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ELECTRICAL_MEASUREMENT_SERVER
-#define EMBER_AF_PLUGIN_ELECTRICAL_MEASUREMENT
+// Use this macro to check if the server side of the Localization Configuration cluster is included
+#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
 
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
 
-// Use this macro to check if the server side of the Fan Control cluster is included
-#define ZCL_USING_FAN_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FAN_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_FAN_CONTROL
+// Use this macro to check if the server side of the Unit Localization cluster is included
+#define ZCL_USING_UNIT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION
 
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
+// Use this macro to check if the server side of the Power Source Configuration cluster is included
+#define ZCL_USING_POWER_SOURCE_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_POWER_SOURCE_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_POWER_SOURCE_CONFIGURATION
 
-// Use this macro to check if the server side of the Flow Measurement cluster is included
-#define ZCL_USING_FLOW_MEASUREMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT_SERVER
-#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT
+// Use this macro to check if the server side of the Power Source cluster is included
+#define ZCL_USING_POWER_SOURCE_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_POWER_SOURCE_SERVER
+#define EMBER_AF_PLUGIN_POWER_SOURCE
 
 // Use this macro to check if the server side of the General Commissioning cluster is included
 #define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
 
+// Use this macro to check if the server side of the Network Commissioning cluster is included
+#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+
 // Use this macro to check if the server side of the General Diagnostics cluster is included
 #define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+// Use this macro to check if the server side of the Software Diagnostics cluster is included
+#define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
 
-// Use this macro to check if the server side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUPS_SERVER
-#define EMBER_AF_PLUGIN_GROUPS
+// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
 
-// Use this macro to check if the server side of the Identify cluster is included
-#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
 
-// Use this macro to check if the server side of the Illuminance Measurement cluster is included
-#define ZCL_USING_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT_SERVER
-#define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
 
-// Use this macro to check if the server side of the Keypad Input cluster is included
-#define ZCL_USING_KEYPAD_INPUT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_KEYPAD_INPUT_SERVER
-#define EMBER_AF_PLUGIN_KEYPAD_INPUT
+// Use this macro to check if the server side of the Switch cluster is included
+#define ZCL_USING_SWITCH_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SWITCH_SERVER
+#define EMBER_AF_PLUGIN_SWITCH
+
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
 
-// Use this macro to check if the server side of the Level Control cluster is included
-#define ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL
-// User options for server plugin Level Control
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL 254
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0
+// Use this macro to check if the server side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
 
-// Use this macro to check if the server side of the Localization Configuration cluster is included
-#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
 
-// Use this macro to check if the server side of the Low Power cluster is included
-#define ZCL_USING_LOW_POWER_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LOW_POWER_SERVER
-#define EMBER_AF_PLUGIN_LOW_POWER
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
 
-// Use this macro to check if the server side of the Media Input cluster is included
-#define ZCL_USING_MEDIA_INPUT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_MEDIA_INPUT_SERVER
-#define EMBER_AF_PLUGIN_MEDIA_INPUT
+// Use this macro to check if the server side of the User Label cluster is included
+#define ZCL_USING_USER_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_USER_LABEL_SERVER
+#define EMBER_AF_PLUGIN_USER_LABEL
 
-// Use this macro to check if the server side of the Media Playback cluster is included
-#define ZCL_USING_MEDIA_PLAYBACK_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_MEDIA_PLAYBACK_SERVER
-#define EMBER_AF_PLUGIN_MEDIA_PLAYBACK
+// Use this macro to check if the server side of the Boolean State cluster is included
+#define ZCL_USING_BOOLEAN_STATE_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BOOLEAN_STATE_SERVER
+#define EMBER_AF_PLUGIN_BOOLEAN_STATE
 
 // Use this macro to check if the server side of the Mode Select cluster is included
 #define ZCL_USING_MODE_SELECT_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_MODE_SELECT_SERVER
 #define EMBER_AF_PLUGIN_MODE_SELECT
 
-// Use this macro to check if the server side of the Network Commissioning cluster is included
-#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+// Use this macro to check if the server side of the Door Lock cluster is included
+#define ZCL_USING_DOOR_LOCK_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DOOR_LOCK_SERVER
+#define EMBER_AF_PLUGIN_DOOR_LOCK
 
-// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
-#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
+// Use this macro to check if the server side of the Window Covering cluster is included
+#define ZCL_USING_WINDOW_COVERING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WINDOW_COVERING_SERVER
+#define EMBER_AF_PLUGIN_WINDOW_COVERING
 
-// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
-#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
+// Use this macro to check if the server side of the Barrier Control cluster is included
+#define ZCL_USING_BARRIER_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BARRIER_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_BARRIER_CONTROL
 
-// Use this macro to check if the server side of the Occupancy Sensing cluster is included
-#define ZCL_USING_OCCUPANCY_SENSING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING_SERVER
-#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING
+// Use this macro to check if the server side of the Pump Configuration and Control cluster is included
+#define ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL
 
-// Use this macro to check if the server side of the On/Off cluster is included
-#define ZCL_USING_ON_OFF_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF
+// Use this macro to check if the server side of the Thermostat cluster is included
+#define ZCL_USING_THERMOSTAT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THERMOSTAT_SERVER
+#define EMBER_AF_PLUGIN_THERMOSTAT
 
-// Use this macro to check if the server side of the On/off Switch Configuration cluster is included
-#define ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF_SWITCH_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF_SWITCH_CONFIGURATION
+// Use this macro to check if the server side of the Fan Control cluster is included
+#define ZCL_USING_FAN_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FAN_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_FAN_CONTROL
 
-// Use this macro to check if the server side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+// Use this macro to check if the server side of the Thermostat User Interface Configuration cluster is included
+#define ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION
 
-// Use this macro to check if the server side of the Power Source cluster is included
-#define ZCL_USING_POWER_SOURCE_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_POWER_SOURCE_SERVER
-#define EMBER_AF_PLUGIN_POWER_SOURCE
+// Use this macro to check if the server side of the Color Control cluster is included
+#define ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_COLOR_CONTROL
+// User options for server plugin Color Control
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV
 
-// Use this macro to check if the server side of the Power Source Configuration cluster is included
-#define ZCL_USING_POWER_SOURCE_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_POWER_SOURCE_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_POWER_SOURCE_CONFIGURATION
+// Use this macro to check if the server side of the Illuminance Measurement cluster is included
+#define ZCL_USING_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT_SERVER
+#define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT
+
+// Use this macro to check if the server side of the Temperature Measurement cluster is included
+#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER
+#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT
 
 // Use this macro to check if the server side of the Pressure Measurement cluster is included
 #define ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_PRESSURE_MEASUREMENT_SERVER
 #define EMBER_AF_PLUGIN_PRESSURE_MEASUREMENT
 
-// Use this macro to check if the server side of the Pump Configuration and Control cluster is included
-#define ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL
+// Use this macro to check if the server side of the Flow Measurement cluster is included
+#define ZCL_USING_FLOW_MEASUREMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT_SERVER
+#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT
 
 // Use this macro to check if the server side of the Relative Humidity Measurement cluster is included
 #define ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_RELATIVE_HUMIDITY_MEASUREMENT_SERVER
 #define EMBER_AF_PLUGIN_RELATIVE_HUMIDITY_MEASUREMENT
 
-// Use this macro to check if the server side of the Scenes cluster is included
-#define ZCL_USING_SCENES_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_SCENES_SERVER
-#define EMBER_AF_PLUGIN_SCENES
-// User options for server plugin Scenes
-// Cluster spec 1.4.8.2
-#ifdef CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#define MATTER_SCENES_TABLE_SIZE CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#else
-#define MATTER_SCENES_TABLE_SIZE 16
-#endif
-
-// Scenes FeatureMap Attribute Toggle Scenes Name feature
-// App cluster specs 1.4.4
-#define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
-#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0000 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
+// Use this macro to check if the server side of the Occupancy Sensing cluster is included
+#define ZCL_USING_OCCUPANCY_SENSING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING_SERVER
+#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING
 
-// Use this macro to check if the server side of the Software Diagnostics cluster is included
-#define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
+// Use this macro to check if the server side of the Wake on LAN cluster is included
+#define ZCL_USING_WAKE_ON_LAN_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WAKE_ON_LAN_SERVER
+#define EMBER_AF_PLUGIN_WAKE_ON_LAN
 
-// Use this macro to check if the server side of the Switch cluster is included
-#define ZCL_USING_SWITCH_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_SWITCH_SERVER
-#define EMBER_AF_PLUGIN_SWITCH
+// Use this macro to check if the server side of the Channel cluster is included
+#define ZCL_USING_CHANNEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_CHANNEL_SERVER
+#define EMBER_AF_PLUGIN_CHANNEL
 
 // Use this macro to check if the server side of the Target Navigator cluster is included
 #define ZCL_USING_TARGET_NAVIGATOR_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_TARGET_NAVIGATOR_SERVER
 #define EMBER_AF_PLUGIN_TARGET_NAVIGATOR
 
-// Use this macro to check if the server side of the Temperature Measurement cluster is included
-#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER
-#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT
+// Use this macro to check if the server side of the Media Playback cluster is included
+#define ZCL_USING_MEDIA_PLAYBACK_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_MEDIA_PLAYBACK_SERVER
+#define EMBER_AF_PLUGIN_MEDIA_PLAYBACK
 
-// Use this macro to check if the server side of the Test Cluster cluster is included
-#define ZCL_USING_TEST_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TEST_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TEST_CLUSTER
+// Use this macro to check if the server side of the Media Input cluster is included
+#define ZCL_USING_MEDIA_INPUT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_MEDIA_INPUT_SERVER
+#define EMBER_AF_PLUGIN_MEDIA_INPUT
 
-// Use this macro to check if the server side of the Thermostat cluster is included
-#define ZCL_USING_THERMOSTAT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THERMOSTAT_SERVER
-#define EMBER_AF_PLUGIN_THERMOSTAT
+// Use this macro to check if the server side of the Low Power cluster is included
+#define ZCL_USING_LOW_POWER_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOW_POWER_SERVER
+#define EMBER_AF_PLUGIN_LOW_POWER
 
-// Use this macro to check if the server side of the Thermostat User Interface Configuration cluster is included
-#define ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION
+// Use this macro to check if the server side of the Keypad Input cluster is included
+#define ZCL_USING_KEYPAD_INPUT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_KEYPAD_INPUT_SERVER
+#define EMBER_AF_PLUGIN_KEYPAD_INPUT
 
-// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
-#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Content Launcher cluster is included
+#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_SERVER
+#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER
 
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+// Use this macro to check if the server side of the Audio Output cluster is included
+#define ZCL_USING_AUDIO_OUTPUT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_AUDIO_OUTPUT_SERVER
+#define EMBER_AF_PLUGIN_AUDIO_OUTPUT
 
-// Use this macro to check if the server side of the Unit Localization cluster is included
-#define ZCL_USING_UNIT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION
+// Use this macro to check if the server side of the Application Launcher cluster is included
+#define ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_APPLICATION_LAUNCHER_SERVER
+#define EMBER_AF_PLUGIN_APPLICATION_LAUNCHER
 
-// Use this macro to check if the server side of the User Label cluster is included
-#define ZCL_USING_USER_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_USER_LABEL_SERVER
-#define EMBER_AF_PLUGIN_USER_LABEL
+// Use this macro to check if the server side of the Application Basic cluster is included
+#define ZCL_USING_APPLICATION_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_APPLICATION_BASIC_SERVER
+#define EMBER_AF_PLUGIN_APPLICATION_BASIC
 
-// Use this macro to check if the server side of the Wake on LAN cluster is included
-#define ZCL_USING_WAKE_ON_LAN_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WAKE_ON_LAN_SERVER
-#define EMBER_AF_PLUGIN_WAKE_ON_LAN
+// Use this macro to check if the server side of the Account Login cluster is included
+#define ZCL_USING_ACCOUNT_LOGIN_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACCOUNT_LOGIN_SERVER
+#define EMBER_AF_PLUGIN_ACCOUNT_LOGIN
 
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Electrical Measurement cluster is included
+#define ZCL_USING_ELECTRICAL_MEASUREMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ELECTRICAL_MEASUREMENT_SERVER
+#define EMBER_AF_PLUGIN_ELECTRICAL_MEASUREMENT
 
-// Use this macro to check if the server side of the Window Covering cluster is included
-#define ZCL_USING_WINDOW_COVERING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WINDOW_COVERING_SERVER
-#define EMBER_AF_PLUGIN_WINDOW_COVERING
+// Use this macro to check if the server side of the Test Cluster cluster is included
+#define ZCL_USING_TEST_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TEST_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TEST_CLUSTER
diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/all-clusters-minimal-app/zap-generated/PluginApplicationCallbacks.h
index f9e37bf1d34e90..7816ea2675e2b6 100644
--- a/zzz_generated/all-clusters-minimal-app/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/all-clusters-minimal-app/zap-generated/PluginApplicationCallbacks.h
@@ -22,62 +22,62 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAccountLoginPluginServerInitCallback();                                                                                  \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterApplicationBasicPluginServerInitCallback();                                                                              \
-    MatterApplicationLauncherPluginServerInitCallback();                                                                           \
-    MatterAudioOutputPluginServerInitCallback();                                                                                   \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterBindingPluginServerInitCallback();                                                                                       \
-    MatterBooleanStatePluginServerInitCallback();                                                                                  \
-    MatterBridgedActionsPluginServerInitCallback();                                                                                \
-    MatterChannelPluginServerInitCallback();                                                                                       \
-    MatterColorControlPluginServerInitCallback();                                                                                  \
-    MatterContentLauncherPluginServerInitCallback();                                                                               \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterDoorLockPluginServerInitCallback();                                                                                      \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFanControlPluginServerInitCallback();                                                                                    \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterFlowMeasurementPluginServerInitCallback();                                                                               \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
     MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterIlluminanceMeasurementPluginServerInitCallback();                                                                        \
-    MatterKeypadInputPluginServerInitCallback();                                                                                   \
+    MatterGroupsPluginServerInitCallback();                                                                                        \
+    MatterScenesPluginServerInitCallback();                                                                                        \
+    MatterOnOffPluginServerInitCallback();                                                                                         \
     MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterLowPowerPluginServerInitCallback();                                                                                      \
-    MatterMediaInputPluginServerInitCallback();                                                                                    \
-    MatterMediaPlaybackPluginServerInitCallback();                                                                                 \
-    MatterModeSelectPluginServerInitCallback();                                                                                    \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
+    MatterBindingPluginServerInitCallback();                                                                                       \
+    MatterAccessControlPluginServerInitCallback();                                                                                 \
+    MatterBridgedActionsPluginServerInitCallback();                                                                                \
+    MatterBasicPluginServerInitCallback();                                                                                         \
     MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
     MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterOccupancySensingPluginServerInitCallback();                                                                              \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterPowerSourcePluginServerInitCallback();                                                                                   \
+    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterUnitLocalizationPluginServerInitCallback();                                                                              \
     MatterPowerSourceConfigurationPluginServerInitCallback();                                                                      \
-    MatterPressureMeasurementPluginServerInitCallback();                                                                           \
-    MatterPumpConfigurationAndControlPluginServerInitCallback();                                                                   \
-    MatterRelativeHumidityMeasurementPluginServerInitCallback();                                                                   \
-    MatterScenesPluginServerInitCallback();                                                                                        \
+    MatterPowerSourcePluginServerInitCallback();                                                                                   \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
+    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
     MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterTargetNavigatorPluginServerInitCallback();                                                                               \
-    MatterTemperatureMeasurementPluginServerInitCallback();                                                                        \
-    MatterTestClusterPluginServerInitCallback();                                                                                   \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
+    MatterUserLabelPluginServerInitCallback();                                                                                     \
+    MatterBooleanStatePluginServerInitCallback();                                                                                  \
+    MatterModeSelectPluginServerInitCallback();                                                                                    \
+    MatterDoorLockPluginServerInitCallback();                                                                                      \
+    MatterWindowCoveringPluginServerInitCallback();                                                                                \
+    MatterPumpConfigurationAndControlPluginServerInitCallback();                                                                   \
     MatterThermostatPluginServerInitCallback();                                                                                    \
+    MatterFanControlPluginServerInitCallback();                                                                                    \
     MatterThermostatUserInterfaceConfigurationPluginServerInitCallback();                                                          \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterUnitLocalizationPluginServerInitCallback();                                                                              \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
+    MatterColorControlPluginServerInitCallback();                                                                                  \
+    MatterIlluminanceMeasurementPluginServerInitCallback();                                                                        \
+    MatterTemperatureMeasurementPluginServerInitCallback();                                                                        \
+    MatterPressureMeasurementPluginServerInitCallback();                                                                           \
+    MatterFlowMeasurementPluginServerInitCallback();                                                                               \
+    MatterRelativeHumidityMeasurementPluginServerInitCallback();                                                                   \
+    MatterOccupancySensingPluginServerInitCallback();                                                                              \
     MatterWakeOnLanPluginServerInitCallback();                                                                                     \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterWindowCoveringPluginServerInitCallback();
+    MatterChannelPluginServerInitCallback();                                                                                       \
+    MatterTargetNavigatorPluginServerInitCallback();                                                                               \
+    MatterMediaPlaybackPluginServerInitCallback();                                                                                 \
+    MatterMediaInputPluginServerInitCallback();                                                                                    \
+    MatterLowPowerPluginServerInitCallback();                                                                                      \
+    MatterKeypadInputPluginServerInitCallback();                                                                                   \
+    MatterContentLauncherPluginServerInitCallback();                                                                               \
+    MatterAudioOutputPluginServerInitCallback();                                                                                   \
+    MatterApplicationLauncherPluginServerInitCallback();                                                                           \
+    MatterApplicationBasicPluginServerInitCallback();                                                                              \
+    MatterAccountLoginPluginServerInitCallback();                                                                                  \
+    MatterTestClusterPluginServerInitCallback();
diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/access.h b/zzz_generated/all-clusters-minimal-app/zap-generated/access.h
index dcc08ca1ce86ea..61813697e29df0 100644
--- a/zzz_generated/all-clusters-minimal-app/zap-generated/access.h
+++ b/zzz_generated/all-clusters-minimal-app/zap-generated/access.h
@@ -35,10 +35,7 @@
     /* Cluster: Access Control, Attribute: AccessControlEntriesPerFabric, Privilege: view */ \
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: OperatingMode, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -46,12 +43,15 @@
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
+    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: OperatingMode, Privilege: view */ \
+    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \
-    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
-    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for read attribute
@@ -62,10 +62,7 @@
     /* Cluster: Access Control, Attribute: AccessControlEntriesPerFabric, Privilege: view */ \
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: OperatingMode, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -73,12 +70,15 @@
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
+    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: OperatingMode, Privilege: view */ \
+    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \
-    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
-    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for read attribute
@@ -89,10 +89,7 @@
     /* Cluster: Access Control, Attribute: AccessControlEntriesPerFabric, Privilege: view */ \
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: OperatingMode, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -100,12 +97,15 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
+    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: OperatingMode, Privilege: view */ \
+    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \
-    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
-    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -115,17 +115,17 @@
     31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: manage */ \
-    257, /* Cluster: Door Lock, Attribute: OperatingMode, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
+    65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
+    257, /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: manage */ \
+    257, /* Cluster: Door Lock, Attribute: OperatingMode, Privilege: manage */ \
+    258, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
     512, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \
     513, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \
     513, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \
     516, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \
-    65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
-    258, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for write attribute
@@ -133,17 +133,17 @@
     0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     5, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
-    35, /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: manage */ \
-    37, /* Cluster: Door Lock, Attribute: OperatingMode, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
+    0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
+    35, /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: manage */ \
+    37, /* Cluster: Door Lock, Attribute: OperatingMode, Privilege: manage */ \
+    23, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
     32, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \
     27, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \
     28, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \
     1, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \
-    0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
-    23, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for write attribute
@@ -151,43 +151,43 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Door Lock, Attribute: OperatingMode, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Door Lock, Attribute: OperatingMode, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -196,34 +196,34 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -232,34 +232,34 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -268,10 +268,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/gen_config.h b/zzz_generated/all-clusters-minimal-app/zap-generated/gen_config.h
index 291787a9c072ef..4e733287b29334 100644
--- a/zzz_generated/all-clusters-minimal-app/zap-generated/gen_config.h
+++ b/zzz_generated/all-clusters-minimal-app/zap-generated/gen_config.h
@@ -29,378 +29,378 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
-#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ACCOUNT_LOGIN_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_APPLICATION_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_AUDIO_OUTPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_BOOLEAN_STATE_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BRIDGED_ACTIONS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (3)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FAN_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (3)
 #define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (3)
+#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (2)
 #define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOW_POWER_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_MEDIA_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_MEDIA_PLAYBACK_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (3)
+#define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BRIDGED_ACTIONS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OCCUPANCY_SENSING_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT (3)
+#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_POWER_SOURCE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_PUMP_CONFIG_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT (3)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TEST_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_BOOLEAN_STATE_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_PUMP_CONFIG_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_THERMOSTAT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FAN_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_OCCUPANCY_SENSING_CLUSTER_SERVER_ENDPOINT_COUNT (2)
 #define EMBER_AF_WAKE_ON_LAN_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_MEDIA_PLAYBACK_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_MEDIA_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOW_POWER_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_AUDIO_OUTPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_APPLICATION_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ACCOUNT_LOGIN_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TEST_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
-// Use this macro to check if the server side of the Access Control cluster is included
-#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
 
-// Use this macro to check if the server side of the Account Login cluster is included
-#define ZCL_USING_ACCOUNT_LOGIN_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ACCOUNT_LOGIN_SERVER
-#define EMBER_AF_PLUGIN_ACCOUNT_LOGIN
+// Use this macro to check if the server side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUPS_SERVER
+#define EMBER_AF_PLUGIN_GROUPS
 
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
+// Use this macro to check if the server side of the Scenes cluster is included
+#define ZCL_USING_SCENES_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SCENES_SERVER
+#define EMBER_AF_PLUGIN_SCENES
+// User options for server plugin Scenes
+// Cluster spec 1.4.8.2
+#ifdef CHIP_CONFIG_MAX_SCENES_PER_FABRIC
+#define MATTER_SCENES_TABLE_SIZE CHIP_CONFIG_MAX_SCENES_PER_FABRIC
+#else
+#define MATTER_SCENES_TABLE_SIZE 16
+#endif
 
-// Use this macro to check if the server side of the Application Basic cluster is included
-#define ZCL_USING_APPLICATION_BASIC_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_APPLICATION_BASIC_SERVER
-#define EMBER_AF_PLUGIN_APPLICATION_BASIC
+// Scenes FeatureMap Attribute Toggle Scenes Name feature
+// App cluster specs 1.4.4
+#define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
+#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0000 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
 
-// Use this macro to check if the server side of the Application Launcher cluster is included
-#define ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_APPLICATION_LAUNCHER_SERVER
-#define EMBER_AF_PLUGIN_APPLICATION_LAUNCHER
+// Use this macro to check if the server side of the On/Off cluster is included
+#define ZCL_USING_ON_OFF_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF
 
-// Use this macro to check if the server side of the Audio Output cluster is included
-#define ZCL_USING_AUDIO_OUTPUT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_AUDIO_OUTPUT_SERVER
-#define EMBER_AF_PLUGIN_AUDIO_OUTPUT
+// Use this macro to check if the server side of the Level Control cluster is included
+#define ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL
+// User options for server plugin Level Control
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL 254
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0
 
-// Use this macro to check if the server side of the Basic cluster is included
-#define ZCL_USING_BASIC_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BASIC_SERVER
-#define EMBER_AF_PLUGIN_BASIC
+// Use this macro to check if the server side of the Descriptor cluster is included
+#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR
 
 // Use this macro to check if the server side of the Binding cluster is included
 #define ZCL_USING_BINDING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_BINDING_SERVER
 #define EMBER_AF_PLUGIN_BINDING
 
-// Use this macro to check if the server side of the Boolean State cluster is included
-#define ZCL_USING_BOOLEAN_STATE_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BOOLEAN_STATE_SERVER
-#define EMBER_AF_PLUGIN_BOOLEAN_STATE
+// Use this macro to check if the server side of the Access Control cluster is included
+#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL
 
 // Use this macro to check if the server side of the Bridged Actions cluster is included
 #define ZCL_USING_BRIDGED_ACTIONS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_BRIDGED_ACTIONS_SERVER
 #define EMBER_AF_PLUGIN_BRIDGED_ACTIONS
 
-// Use this macro to check if the server side of the Channel cluster is included
-#define ZCL_USING_CHANNEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_CHANNEL_SERVER
-#define EMBER_AF_PLUGIN_CHANNEL
-
-// Use this macro to check if the server side of the Color Control cluster is included
-#define ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_COLOR_CONTROL
-// User options for server plugin Color Control
-#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY
-#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP
-#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV
-
-// Use this macro to check if the server side of the Content Launcher cluster is included
-#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_SERVER
-#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER
+// Use this macro to check if the server side of the Basic cluster is included
+#define ZCL_USING_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BASIC_SERVER
+#define EMBER_AF_PLUGIN_BASIC
 
-// Use this macro to check if the server side of the Descriptor cluster is included
-#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR
+// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
+#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
 
-// Use this macro to check if the server side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
+#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
 
-// Use this macro to check if the server side of the Door Lock cluster is included
-#define ZCL_USING_DOOR_LOCK_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DOOR_LOCK_SERVER
-#define EMBER_AF_PLUGIN_DOOR_LOCK
+// Use this macro to check if the server side of the Localization Configuration cluster is included
+#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
 
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
 
-// Use this macro to check if the server side of the Fan Control cluster is included
-#define ZCL_USING_FAN_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FAN_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_FAN_CONTROL
+// Use this macro to check if the server side of the Unit Localization cluster is included
+#define ZCL_USING_UNIT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION
 
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
+// Use this macro to check if the server side of the Power Source Configuration cluster is included
+#define ZCL_USING_POWER_SOURCE_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_POWER_SOURCE_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_POWER_SOURCE_CONFIGURATION
 
-// Use this macro to check if the server side of the Flow Measurement cluster is included
-#define ZCL_USING_FLOW_MEASUREMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT_SERVER
-#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT
+// Use this macro to check if the server side of the Power Source cluster is included
+#define ZCL_USING_POWER_SOURCE_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_POWER_SOURCE_SERVER
+#define EMBER_AF_PLUGIN_POWER_SOURCE
 
 // Use this macro to check if the server side of the General Commissioning cluster is included
 #define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
 
+// Use this macro to check if the server side of the Network Commissioning cluster is included
+#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+
 // Use this macro to check if the server side of the General Diagnostics cluster is included
 #define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+// Use this macro to check if the server side of the Software Diagnostics cluster is included
+#define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
 
-// Use this macro to check if the server side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUPS_SERVER
-#define EMBER_AF_PLUGIN_GROUPS
+// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
 
-// Use this macro to check if the server side of the Identify cluster is included
-#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
 
-// Use this macro to check if the server side of the Illuminance Measurement cluster is included
-#define ZCL_USING_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT_SERVER
-#define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Switch cluster is included
+#define ZCL_USING_SWITCH_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SWITCH_SERVER
+#define EMBER_AF_PLUGIN_SWITCH
 
-// Use this macro to check if the server side of the Keypad Input cluster is included
-#define ZCL_USING_KEYPAD_INPUT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_KEYPAD_INPUT_SERVER
-#define EMBER_AF_PLUGIN_KEYPAD_INPUT
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
 
-// Use this macro to check if the server side of the Level Control cluster is included
-#define ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL
-// User options for server plugin Level Control
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL 254
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0
+// Use this macro to check if the server side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
 
-// Use this macro to check if the server side of the Localization Configuration cluster is included
-#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
 
-// Use this macro to check if the server side of the Low Power cluster is included
-#define ZCL_USING_LOW_POWER_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LOW_POWER_SERVER
-#define EMBER_AF_PLUGIN_LOW_POWER
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
 
-// Use this macro to check if the server side of the Media Input cluster is included
-#define ZCL_USING_MEDIA_INPUT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_MEDIA_INPUT_SERVER
-#define EMBER_AF_PLUGIN_MEDIA_INPUT
+// Use this macro to check if the server side of the User Label cluster is included
+#define ZCL_USING_USER_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_USER_LABEL_SERVER
+#define EMBER_AF_PLUGIN_USER_LABEL
 
-// Use this macro to check if the server side of the Media Playback cluster is included
-#define ZCL_USING_MEDIA_PLAYBACK_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_MEDIA_PLAYBACK_SERVER
-#define EMBER_AF_PLUGIN_MEDIA_PLAYBACK
+// Use this macro to check if the server side of the Boolean State cluster is included
+#define ZCL_USING_BOOLEAN_STATE_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BOOLEAN_STATE_SERVER
+#define EMBER_AF_PLUGIN_BOOLEAN_STATE
 
 // Use this macro to check if the server side of the Mode Select cluster is included
 #define ZCL_USING_MODE_SELECT_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_MODE_SELECT_SERVER
 #define EMBER_AF_PLUGIN_MODE_SELECT
 
-// Use this macro to check if the server side of the Network Commissioning cluster is included
-#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+// Use this macro to check if the server side of the Door Lock cluster is included
+#define ZCL_USING_DOOR_LOCK_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DOOR_LOCK_SERVER
+#define EMBER_AF_PLUGIN_DOOR_LOCK
 
-// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
-#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
+// Use this macro to check if the server side of the Window Covering cluster is included
+#define ZCL_USING_WINDOW_COVERING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WINDOW_COVERING_SERVER
+#define EMBER_AF_PLUGIN_WINDOW_COVERING
 
-// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
-#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
+// Use this macro to check if the server side of the Pump Configuration and Control cluster is included
+#define ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL
 
-// Use this macro to check if the server side of the Occupancy Sensing cluster is included
-#define ZCL_USING_OCCUPANCY_SENSING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING_SERVER
-#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING
+// Use this macro to check if the server side of the Thermostat cluster is included
+#define ZCL_USING_THERMOSTAT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THERMOSTAT_SERVER
+#define EMBER_AF_PLUGIN_THERMOSTAT
 
-// Use this macro to check if the server side of the On/Off cluster is included
-#define ZCL_USING_ON_OFF_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF
+// Use this macro to check if the server side of the Fan Control cluster is included
+#define ZCL_USING_FAN_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FAN_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_FAN_CONTROL
 
-// Use this macro to check if the server side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+// Use this macro to check if the server side of the Thermostat User Interface Configuration cluster is included
+#define ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION
 
-// Use this macro to check if the server side of the Power Source cluster is included
-#define ZCL_USING_POWER_SOURCE_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_POWER_SOURCE_SERVER
-#define EMBER_AF_PLUGIN_POWER_SOURCE
+// Use this macro to check if the server side of the Color Control cluster is included
+#define ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_COLOR_CONTROL
+// User options for server plugin Color Control
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV
 
-// Use this macro to check if the server side of the Power Source Configuration cluster is included
-#define ZCL_USING_POWER_SOURCE_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_POWER_SOURCE_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_POWER_SOURCE_CONFIGURATION
+// Use this macro to check if the server side of the Illuminance Measurement cluster is included
+#define ZCL_USING_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT_SERVER
+#define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT
+
+// Use this macro to check if the server side of the Temperature Measurement cluster is included
+#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER
+#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT
 
 // Use this macro to check if the server side of the Pressure Measurement cluster is included
 #define ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_PRESSURE_MEASUREMENT_SERVER
 #define EMBER_AF_PLUGIN_PRESSURE_MEASUREMENT
 
-// Use this macro to check if the server side of the Pump Configuration and Control cluster is included
-#define ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL
+// Use this macro to check if the server side of the Flow Measurement cluster is included
+#define ZCL_USING_FLOW_MEASUREMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT_SERVER
+#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT
 
 // Use this macro to check if the server side of the Relative Humidity Measurement cluster is included
 #define ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_RELATIVE_HUMIDITY_MEASUREMENT_SERVER
 #define EMBER_AF_PLUGIN_RELATIVE_HUMIDITY_MEASUREMENT
 
-// Use this macro to check if the server side of the Scenes cluster is included
-#define ZCL_USING_SCENES_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_SCENES_SERVER
-#define EMBER_AF_PLUGIN_SCENES
-// User options for server plugin Scenes
-// Cluster spec 1.4.8.2
-#ifdef CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#define MATTER_SCENES_TABLE_SIZE CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#else
-#define MATTER_SCENES_TABLE_SIZE 16
-#endif
-
-// Scenes FeatureMap Attribute Toggle Scenes Name feature
-// App cluster specs 1.4.4
-#define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
-#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0000 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
+// Use this macro to check if the server side of the Occupancy Sensing cluster is included
+#define ZCL_USING_OCCUPANCY_SENSING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING_SERVER
+#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING
 
-// Use this macro to check if the server side of the Software Diagnostics cluster is included
-#define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
+// Use this macro to check if the server side of the Wake on LAN cluster is included
+#define ZCL_USING_WAKE_ON_LAN_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WAKE_ON_LAN_SERVER
+#define EMBER_AF_PLUGIN_WAKE_ON_LAN
 
-// Use this macro to check if the server side of the Switch cluster is included
-#define ZCL_USING_SWITCH_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_SWITCH_SERVER
-#define EMBER_AF_PLUGIN_SWITCH
+// Use this macro to check if the server side of the Channel cluster is included
+#define ZCL_USING_CHANNEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_CHANNEL_SERVER
+#define EMBER_AF_PLUGIN_CHANNEL
 
 // Use this macro to check if the server side of the Target Navigator cluster is included
 #define ZCL_USING_TARGET_NAVIGATOR_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_TARGET_NAVIGATOR_SERVER
 #define EMBER_AF_PLUGIN_TARGET_NAVIGATOR
 
-// Use this macro to check if the server side of the Temperature Measurement cluster is included
-#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER
-#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT
-
-// Use this macro to check if the server side of the Test Cluster cluster is included
-#define ZCL_USING_TEST_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TEST_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TEST_CLUSTER
+// Use this macro to check if the server side of the Media Playback cluster is included
+#define ZCL_USING_MEDIA_PLAYBACK_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_MEDIA_PLAYBACK_SERVER
+#define EMBER_AF_PLUGIN_MEDIA_PLAYBACK
 
-// Use this macro to check if the server side of the Thermostat cluster is included
-#define ZCL_USING_THERMOSTAT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THERMOSTAT_SERVER
-#define EMBER_AF_PLUGIN_THERMOSTAT
+// Use this macro to check if the server side of the Media Input cluster is included
+#define ZCL_USING_MEDIA_INPUT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_MEDIA_INPUT_SERVER
+#define EMBER_AF_PLUGIN_MEDIA_INPUT
 
-// Use this macro to check if the server side of the Thermostat User Interface Configuration cluster is included
-#define ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION
+// Use this macro to check if the server side of the Low Power cluster is included
+#define ZCL_USING_LOW_POWER_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOW_POWER_SERVER
+#define EMBER_AF_PLUGIN_LOW_POWER
 
-// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
-#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Keypad Input cluster is included
+#define ZCL_USING_KEYPAD_INPUT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_KEYPAD_INPUT_SERVER
+#define EMBER_AF_PLUGIN_KEYPAD_INPUT
 
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+// Use this macro to check if the server side of the Content Launcher cluster is included
+#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_SERVER
+#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER
 
-// Use this macro to check if the server side of the Unit Localization cluster is included
-#define ZCL_USING_UNIT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION
+// Use this macro to check if the server side of the Audio Output cluster is included
+#define ZCL_USING_AUDIO_OUTPUT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_AUDIO_OUTPUT_SERVER
+#define EMBER_AF_PLUGIN_AUDIO_OUTPUT
 
-// Use this macro to check if the server side of the User Label cluster is included
-#define ZCL_USING_USER_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_USER_LABEL_SERVER
-#define EMBER_AF_PLUGIN_USER_LABEL
+// Use this macro to check if the server side of the Application Launcher cluster is included
+#define ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_APPLICATION_LAUNCHER_SERVER
+#define EMBER_AF_PLUGIN_APPLICATION_LAUNCHER
 
-// Use this macro to check if the server side of the Wake on LAN cluster is included
-#define ZCL_USING_WAKE_ON_LAN_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WAKE_ON_LAN_SERVER
-#define EMBER_AF_PLUGIN_WAKE_ON_LAN
+// Use this macro to check if the server side of the Application Basic cluster is included
+#define ZCL_USING_APPLICATION_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_APPLICATION_BASIC_SERVER
+#define EMBER_AF_PLUGIN_APPLICATION_BASIC
 
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Account Login cluster is included
+#define ZCL_USING_ACCOUNT_LOGIN_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACCOUNT_LOGIN_SERVER
+#define EMBER_AF_PLUGIN_ACCOUNT_LOGIN
 
-// Use this macro to check if the server side of the Window Covering cluster is included
-#define ZCL_USING_WINDOW_COVERING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WINDOW_COVERING_SERVER
-#define EMBER_AF_PLUGIN_WINDOW_COVERING
+// Use this macro to check if the server side of the Test Cluster cluster is included
+#define ZCL_USING_TEST_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TEST_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TEST_CLUSTER
diff --git a/zzz_generated/bridge-app/zap-generated/CHIPClientCallbacks.h b/zzz_generated/bridge-app/zap-generated/CHIPClientCallbacks.h
index 8600cae67484a1..70ca3e88c274a6 100644
--- a/zzz_generated/bridge-app/zap-generated/CHIPClientCallbacks.h
+++ b/zzz_generated/bridge-app/zap-generated/CHIPClientCallbacks.h
@@ -30,6 +30,15 @@
 #include <lib/support/Span.h>
 
 // List specific responses
+typedef void (*BindingBindingListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::Binding::Structs::TargetStruct::DecodableType> & data);
+typedef void (*BindingGeneratedCommandListListAttributeCallback)(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*BindingAcceptedCommandListListAttributeCallback)(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*BindingAttributeListListAttributeCallback)(void * context,
+                                                          const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*AccessControlAclListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::DecodableType> &
@@ -43,12 +52,3 @@ typedef void (*AccessControlAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*AccessControlAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*BindingBindingListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::Binding::Structs::TargetStruct::DecodableType> & data);
-typedef void (*BindingGeneratedCommandListListAttributeCallback)(void * context,
-                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*BindingAcceptedCommandListListAttributeCallback)(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*BindingAttributeListListAttributeCallback)(void * context,
-                                                          const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
diff --git a/zzz_generated/bridge-app/zap-generated/CHIPClusters.h b/zzz_generated/bridge-app/zap-generated/CHIPClusters.h
index 2b8d6be3f76f10..064689a24df362 100644
--- a/zzz_generated/bridge-app/zap-generated/CHIPClusters.h
+++ b/zzz_generated/bridge-app/zap-generated/CHIPClusters.h
@@ -30,18 +30,18 @@
 namespace chip {
 namespace Controller {
 
-class DLL_EXPORT AccessControlCluster : public ClusterBase
+class DLL_EXPORT BindingCluster : public ClusterBase
 {
 public:
-    AccessControlCluster() : ClusterBase(app::Clusters::AccessControl::Id) {}
-    ~AccessControlCluster() {}
+    BindingCluster() : ClusterBase(app::Clusters::Binding::Id) {}
+    ~BindingCluster() {}
 };
 
-class DLL_EXPORT BindingCluster : public ClusterBase
+class DLL_EXPORT AccessControlCluster : public ClusterBase
 {
 public:
-    BindingCluster() : ClusterBase(app::Clusters::Binding::Id) {}
-    ~BindingCluster() {}
+    AccessControlCluster() : ClusterBase(app::Clusters::AccessControl::Id) {}
+    ~AccessControlCluster() {}
 };
 
 } // namespace Controller
diff --git a/zzz_generated/bridge-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/bridge-app/zap-generated/PluginApplicationCallbacks.h
index c4d061504588cc..5f5d48107cd835 100644
--- a/zzz_generated/bridge-app/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/bridge-app/zap-generated/PluginApplicationCallbacks.h
@@ -22,28 +22,28 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
+    MatterIdentifyPluginServerInitCallback();                                                                                      \
+    MatterOnOffPluginServerInitCallback();                                                                                         \
+    MatterLevelControlPluginServerInitCallback();                                                                                  \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
+    MatterBindingPluginClientInitCallback();                                                                                       \
     MatterAccessControlPluginClientInitCallback();                                                                                 \
     MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterBindingPluginClientInitCallback();                                                                                       \
     MatterBridgedActionsPluginServerInitCallback();                                                                                \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterLevelControlPluginServerInitCallback();                                                                                  \
+    MatterBasicPluginServerInitCallback();                                                                                         \
     MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterUnitLocalizationPluginServerInitCallback();                                                                              \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
     MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
     MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterUnitLocalizationPluginServerInitCallback();                                                                              \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
+    MatterSwitchPluginServerInitCallback();                                                                                        \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterUserLabelPluginServerInitCallback();
diff --git a/zzz_generated/bridge-app/zap-generated/access.h b/zzz_generated/bridge-app/zap-generated/access.h
index eb6bab6034bfba..3b7bef42840337 100644
--- a/zzz_generated/bridge-app/zap-generated/access.h
+++ b/zzz_generated/bridge-app/zap-generated/access.h
@@ -29,6 +29,7 @@
 
 // Parallel array data (*cluster*, attribute, privilege) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__CLUSTER { \
+    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
@@ -38,8 +39,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
-    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -47,11 +46,13 @@
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \
+    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
@@ -61,8 +62,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
-    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -70,11 +69,13 @@
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \
+    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
@@ -84,8 +85,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
-    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -93,6 +92,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -100,43 +100,43 @@
 
 // Parallel array data (*cluster*, attribute, privilege) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__CLUSTER { \
+    8, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
-    8, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__ATTRIBUTE { \
+    16384, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     5, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
-    16384, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__PRIVILEGE { \
+    kMatterAccessPrivilegeManage, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -144,24 +144,20 @@
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    3, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -170,28 +166,28 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    64, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
-    64, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -200,28 +196,28 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -230,6 +226,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/bridge-app/zap-generated/gen_config.h b/zzz_generated/bridge-app/zap-generated/gen_config.h
index 50d6788e443a49..9790a51299bb3c 100644
--- a/zzz_generated/bridge-app/zap-generated/gen_config.h
+++ b/zzz_generated/bridge-app/zap-generated/gen_config.h
@@ -29,34 +29,62 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
+#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (3)
+#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_ACCESS_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_BRIDGED_ACTIONS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (3)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
+
+// Use this macro to check if the server side of the On/Off cluster is included
+#define ZCL_USING_ON_OFF_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF
+
+// Use this macro to check if the server side of the Level Control cluster is included
+#define ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL
+// User options for server plugin Level Control
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL 254
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0
+
+// Use this macro to check if the server side of the Descriptor cluster is included
+#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR
+
+// Use this macro to check if the client side of the Binding cluster is included
+#define ZCL_USING_BINDING_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_BINDING_CLIENT
+
 // Use this macro to check if the client side of the Access Control cluster is included
 #define ZCL_USING_ACCESS_CONTROL_CLUSTER_CLIENT
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL_CLIENT
@@ -66,120 +94,92 @@
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL
 
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
+// Use this macro to check if the server side of the Bridged Actions cluster is included
+#define ZCL_USING_BRIDGED_ACTIONS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS_SERVER
+#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS
 
 // Use this macro to check if the server side of the Basic cluster is included
 #define ZCL_USING_BASIC_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_BASIC_SERVER
 #define EMBER_AF_PLUGIN_BASIC
 
-// Use this macro to check if the client side of the Binding cluster is included
-#define ZCL_USING_BINDING_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_BINDING_CLIENT
-
-// Use this macro to check if the server side of the Bridged Actions cluster is included
-#define ZCL_USING_BRIDGED_ACTIONS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS_SERVER
-#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS
-
-// Use this macro to check if the server side of the Descriptor cluster is included
-#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR
+// Use this macro to check if the server side of the Localization Configuration cluster is included
+#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
 
-// Use this macro to check if the server side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
 
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Unit Localization cluster is included
+#define ZCL_USING_UNIT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION
 
 // Use this macro to check if the server side of the General Commissioning cluster is included
 #define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
 
-// Use this macro to check if the server side of the General Diagnostics cluster is included
-#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
-
-// Use this macro to check if the server side of the Identify cluster is included
-#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY
-
-// Use this macro to check if the server side of the Level Control cluster is included
-#define ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL
-// User options for server plugin Level Control
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL 254
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0
-
-// Use this macro to check if the server side of the Localization Configuration cluster is included
-#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
-
 // Use this macro to check if the server side of the Network Commissioning cluster is included
 #define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
 
-// Use this macro to check if the server side of the On/Off cluster is included
-#define ZCL_USING_ON_OFF_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
 
-// Use this macro to check if the server side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
 // Use this macro to check if the server side of the Software Diagnostics cluster is included
 #define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
 
+// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+
 // Use this macro to check if the server side of the Switch cluster is included
 #define ZCL_USING_SWITCH_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SWITCH_SERVER
 #define EMBER_AF_PLUGIN_SWITCH
 
-// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
-#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
 
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+// Use this macro to check if the server side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
 
-// Use this macro to check if the server side of the Unit Localization cluster is included
-#define ZCL_USING_UNIT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
 
 // Use this macro to check if the server side of the User Label cluster is included
 #define ZCL_USING_USER_LABEL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL
-
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
index 0a3f17efc7450d..eaf5f28ad1bf29 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
@@ -3604,248 +3604,186 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
 }
 
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const AccountLogin::Commands::GetSetupPINResponse::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("setupPIN", indent + 1, value.setupPIN));
-    DataModelLogger::LogString(indent, "}");
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const ApplicationLauncher::Commands::LauncherResponse::DecodableType & value)
+                                     const Groups::Commands::AddGroupResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("data", indent + 1, value.data));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Channel::Commands::ChangeChannelResponse::DecodableType & value)
+                                     const Groups::Commands::ViewGroupResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("data", indent + 1, value.data));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupName", indent + 1, value.groupName));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const ContentLauncher::Commands::LaunchResponse::DecodableType & value)
+                                     const Groups::Commands::GetGroupMembershipResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("data", indent + 1, value.data));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("capacity", indent + 1, value.capacity));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupList", indent + 1, value.groupList));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType & value)
+                                     const Groups::Commands::RemoveGroupResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("content", indent + 1, value.content));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("timeStamp", indent + 1, value.timeStamp));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("timeSinceBoot", indent + 1, value.timeSinceBoot));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType & value)
+                                     const Scenes::Commands::AddSceneResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("weekDayIndex", indent + 1, value.weekDayIndex));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userIndex", indent + 1, value.userIndex));
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("daysMask", indent + 1, value.daysMask));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("startHour", indent + 1, value.startHour));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("startMinute", indent + 1, value.startMinute));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("endHour", indent + 1, value.endHour));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("endMinute", indent + 1, value.endMinute));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneId", indent + 1, value.sceneId));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DoorLock::Commands::GetYearDayScheduleResponse::DecodableType & value)
+                                     const Scenes::Commands::ViewSceneResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("yearDayIndex", indent + 1, value.yearDayIndex));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userIndex", indent + 1, value.userIndex));
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("localStartTime", indent + 1, value.localStartTime));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("localEndTime", indent + 1, value.localEndTime));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneId", indent + 1, value.sceneId));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("transitionTime", indent + 1, value.transitionTime));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneName", indent + 1, value.sceneName));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("extensionFieldSets", indent + 1, value.extensionFieldSets));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DoorLock::Commands::GetHolidayScheduleResponse::DecodableType & value)
+                                     const Scenes::Commands::RemoveSceneResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("holidayIndex", indent + 1, value.holidayIndex));
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("localStartTime", indent + 1, value.localStartTime));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("localEndTime", indent + 1, value.localEndTime));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("operatingMode", indent + 1, value.operatingMode));
-    DataModelLogger::LogString(indent, "}");
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DoorLock::Commands::GetUserResponse::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userIndex", indent + 1, value.userIndex));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userName", indent + 1, value.userName));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userUniqueId", indent + 1, value.userUniqueId));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userStatus", indent + 1, value.userStatus));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userType", indent + 1, value.userType));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("credentialRule", indent + 1, value.credentialRule));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("credentials", indent + 1, value.credentials));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("creatorFabricIndex", indent + 1, value.creatorFabricIndex));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("lastModifiedFabricIndex", indent + 1, value.lastModifiedFabricIndex));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("nextUserIndex", indent + 1, value.nextUserIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneId", indent + 1, value.sceneId));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DoorLock::Commands::SetCredentialResponse::DecodableType & value)
+                                     const Scenes::Commands::RemoveAllScenesResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userIndex", indent + 1, value.userIndex));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("nextCredentialIndex", indent + 1, value.nextCredentialIndex));
-    DataModelLogger::LogString(indent, "}");
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const DoorLock::Commands::GetCredentialStatusResponse::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("credentialExists", indent + 1, value.credentialExists));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userIndex", indent + 1, value.userIndex));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("creatorFabricIndex", indent + 1, value.creatorFabricIndex));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("lastModifiedFabricIndex", indent + 1, value.lastModifiedFabricIndex));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("nextCredentialIndex", indent + 1, value.nextCredentialIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const ElectricalMeasurement::Commands::GetProfileInfoResponseCommand::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("profileCount", indent + 1, value.profileCount));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("profileIntervalPeriod", indent + 1, value.profileIntervalPeriod));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("maxNumberOfIntervals", indent + 1, value.maxNumberOfIntervals));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("listOfAttributes", indent + 1, value.listOfAttributes));
-    DataModelLogger::LogString(indent, "}");
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR
-DataModelLogger::LogValue(const char * label, size_t indent,
-                          const ElectricalMeasurement::Commands::GetMeasurementProfileResponseCommand::DecodableType & value)
+                                     const Scenes::Commands::StoreSceneResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("startTime", indent + 1, value.startTime));
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("profileIntervalPeriod", indent + 1, value.profileIntervalPeriod));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("numberOfIntervalsDelivered", indent + 1, value.numberOfIntervalsDelivered));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("attributeId", indent + 1, value.attributeId));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("intervals", indent + 1, value.intervals));
-    DataModelLogger::LogString(indent, "}");
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const GeneralCommissioning::Commands::ArmFailSafeResponse::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("errorCode", indent + 1, value.errorCode));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("debugText", indent + 1, value.debugText));
-    DataModelLogger::LogString(indent, "}");
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const GeneralCommissioning::Commands::SetRegulatoryConfigResponse::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("errorCode", indent + 1, value.errorCode));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("debugText", indent + 1, value.debugText));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneId", indent + 1, value.sceneId));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const GeneralCommissioning::Commands::CommissioningCompleteResponse::DecodableType & value)
+                                     const Scenes::Commands::GetSceneMembershipResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("errorCode", indent + 1, value.errorCode));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("debugText", indent + 1, value.debugText));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("capacity", indent + 1, value.capacity));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneList", indent + 1, value.sceneList));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const GroupKeyManagement::Commands::KeySetReadResponse::DecodableType & value)
+                                     const Scenes::Commands::EnhancedAddSceneResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupKeySet", indent + 1, value.groupKeySet));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneId", indent + 1, value.sceneId));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::DecodableType & value)
+                                     const Scenes::Commands::EnhancedViewSceneResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupKeySetIDs", indent + 1, value.groupKeySetIDs));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneId", indent + 1, value.sceneId));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("transitionTime", indent + 1, value.transitionTime));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneName", indent + 1, value.sceneName));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("extensionFieldSets", indent + 1, value.extensionFieldSets));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Groups::Commands::AddGroupResponse::DecodableType & value)
+                                     const Scenes::Commands::CopySceneResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupIdFrom", indent + 1, value.groupIdFrom));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneIdFrom", indent + 1, value.sceneIdFrom));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Groups::Commands::ViewGroupResponse::DecodableType & value)
+                                     const OtaSoftwareUpdateProvider::Commands::QueryImageResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupName", indent + 1, value.groupName));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("delayedActionTime", indent + 1, value.delayedActionTime));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("imageURI", indent + 1, value.imageURI));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("softwareVersion", indent + 1, value.softwareVersion));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("softwareVersionString", indent + 1, value.softwareVersionString));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("updateToken", indent + 1, value.updateToken));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("userConsentNeeded", indent + 1, value.userConsentNeeded));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("metadataForRequestor", indent + 1, value.metadataForRequestor));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Groups::Commands::GetGroupMembershipResponse::DecodableType & value)
+                                     const OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("capacity", indent + 1, value.capacity));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupList", indent + 1, value.groupList));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("action", indent + 1, value.action));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("delayedActionTime", indent + 1, value.delayedActionTime));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Groups::Commands::RemoveGroupResponse::DecodableType & value)
+                                     const GeneralCommissioning::Commands::ArmFailSafeResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("errorCode", indent + 1, value.errorCode));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("debugText", indent + 1, value.debugText));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const KeypadInput::Commands::SendKeyResponse::DecodableType & value)
+                                     const GeneralCommissioning::Commands::SetRegulatoryConfigResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("errorCode", indent + 1, value.errorCode));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("debugText", indent + 1, value.debugText));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const MediaPlayback::Commands::PlaybackResponse::DecodableType & value)
+                                     const GeneralCommissioning::Commands::CommissioningCompleteResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("data", indent + 1, value.data));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("errorCode", indent + 1, value.errorCode));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("debugText", indent + 1, value.debugText));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
@@ -3881,26 +3819,13 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const OtaSoftwareUpdateProvider::Commands::QueryImageResponse::DecodableType & value)
+                                     const DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("delayedActionTime", indent + 1, value.delayedActionTime));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("imageURI", indent + 1, value.imageURI));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("softwareVersion", indent + 1, value.softwareVersion));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("softwareVersionString", indent + 1, value.softwareVersionString));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("updateToken", indent + 1, value.updateToken));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userConsentNeeded", indent + 1, value.userConsentNeeded));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("metadataForRequestor", indent + 1, value.metadataForRequestor));
-    DataModelLogger::LogString(indent, "}");
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("action", indent + 1, value.action));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("delayedActionTime", indent + 1, value.delayedActionTime));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("content", indent + 1, value.content));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("timeStamp", indent + 1, value.timeStamp));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("timeSinceBoot", indent + 1, value.timeSinceBoot));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
@@ -3941,103 +3866,157 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Scenes::Commands::AddSceneResponse::DecodableType & value)
+                                     const GroupKeyManagement::Commands::KeySetReadResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneId", indent + 1, value.sceneId));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupKeySet", indent + 1, value.groupKeySet));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Scenes::Commands::ViewSceneResponse::DecodableType & value)
+                                     const GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneId", indent + 1, value.sceneId));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("transitionTime", indent + 1, value.transitionTime));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneName", indent + 1, value.sceneName));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("extensionFieldSets", indent + 1, value.extensionFieldSets));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("groupKeySetIDs", indent + 1, value.groupKeySetIDs));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Scenes::Commands::RemoveSceneResponse::DecodableType & value)
+                                     const DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("weekDayIndex", indent + 1, value.weekDayIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("userIndex", indent + 1, value.userIndex));
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneId", indent + 1, value.sceneId));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("daysMask", indent + 1, value.daysMask));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("startHour", indent + 1, value.startHour));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("startMinute", indent + 1, value.startMinute));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("endHour", indent + 1, value.endHour));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("endMinute", indent + 1, value.endMinute));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Scenes::Commands::RemoveAllScenesResponse::DecodableType & value)
+                                     const DoorLock::Commands::GetYearDayScheduleResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("yearDayIndex", indent + 1, value.yearDayIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("userIndex", indent + 1, value.userIndex));
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("localStartTime", indent + 1, value.localStartTime));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("localEndTime", indent + 1, value.localEndTime));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Scenes::Commands::StoreSceneResponse::DecodableType & value)
+                                     const DoorLock::Commands::GetHolidayScheduleResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("holidayIndex", indent + 1, value.holidayIndex));
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneId", indent + 1, value.sceneId));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("localStartTime", indent + 1, value.localStartTime));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("localEndTime", indent + 1, value.localEndTime));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("operatingMode", indent + 1, value.operatingMode));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Scenes::Commands::GetSceneMembershipResponse::DecodableType & value)
+                                     const DoorLock::Commands::GetUserResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("userIndex", indent + 1, value.userIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("userName", indent + 1, value.userName));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("userUniqueId", indent + 1, value.userUniqueId));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("userStatus", indent + 1, value.userStatus));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("userType", indent + 1, value.userType));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("credentialRule", indent + 1, value.credentialRule));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("credentials", indent + 1, value.credentials));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("creatorFabricIndex", indent + 1, value.creatorFabricIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("lastModifiedFabricIndex", indent + 1, value.lastModifiedFabricIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("nextUserIndex", indent + 1, value.nextUserIndex));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const DoorLock::Commands::SetCredentialResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("capacity", indent + 1, value.capacity));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneList", indent + 1, value.sceneList));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("userIndex", indent + 1, value.userIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("nextCredentialIndex", indent + 1, value.nextCredentialIndex));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Scenes::Commands::EnhancedAddSceneResponse::DecodableType & value)
+                                     const DoorLock::Commands::GetCredentialStatusResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("credentialExists", indent + 1, value.credentialExists));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("userIndex", indent + 1, value.userIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("creatorFabricIndex", indent + 1, value.creatorFabricIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("lastModifiedFabricIndex", indent + 1, value.lastModifiedFabricIndex));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("nextCredentialIndex", indent + 1, value.nextCredentialIndex));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(
+        DataModelLogger::LogValue("numberOfTransitionsForSequence", indent + 1, value.numberOfTransitionsForSequence));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("dayOfWeekForSequence", indent + 1, value.dayOfWeekForSequence));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("modeForSequence", indent + 1, value.modeForSequence));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("transitions", indent + 1, value.transitions));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const Channel::Commands::ChangeChannelResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneId", indent + 1, value.sceneId));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("data", indent + 1, value.data));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Scenes::Commands::EnhancedViewSceneResponse::DecodableType & value)
+                                     const TargetNavigator::Commands::NavigateTargetResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneId", indent + 1, value.sceneId));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("transitionTime", indent + 1, value.transitionTime));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneName", indent + 1, value.sceneName));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("extensionFieldSets", indent + 1, value.extensionFieldSets));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("data", indent + 1, value.data));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Scenes::Commands::CopySceneResponse::DecodableType & value)
+                                     const MediaPlayback::Commands::PlaybackResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("groupIdFrom", indent + 1, value.groupIdFrom));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("sceneIdFrom", indent + 1, value.sceneIdFrom));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("data", indent + 1, value.data));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const TargetNavigator::Commands::NavigateTargetResponse::DecodableType & value)
+                                     const KeypadInput::Commands::SendKeyResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const ContentLauncher::Commands::LaunchResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("data", indent + 1, value.data));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const ApplicationLauncher::Commands::LauncherResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
@@ -4045,6 +4024,39 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const AccountLogin::Commands::GetSetupPINResponse::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("setupPIN", indent + 1, value.setupPIN));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const ElectricalMeasurement::Commands::GetProfileInfoResponseCommand::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("profileCount", indent + 1, value.profileCount));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("profileIntervalPeriod", indent + 1, value.profileIntervalPeriod));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("maxNumberOfIntervals", indent + 1, value.maxNumberOfIntervals));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("listOfAttributes", indent + 1, value.listOfAttributes));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR
+DataModelLogger::LogValue(const char * label, size_t indent,
+                          const ElectricalMeasurement::Commands::GetMeasurementProfileResponseCommand::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    ReturnErrorOnFailure(DataModelLogger::LogValue("startTime", indent + 1, value.startTime));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("profileIntervalPeriod", indent + 1, value.profileIntervalPeriod));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("numberOfIntervalsDelivered", indent + 1, value.numberOfIntervalsDelivered));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("attributeId", indent + 1, value.attributeId));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("intervals", indent + 1, value.intervals));
+    DataModelLogger::LogString(indent, "}");
+    return CHIP_NO_ERROR;
+}
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
                                      const TestCluster::Commands::TestSpecificResponse::DecodableType & value)
 {
@@ -4183,18 +4195,6 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
-    ReturnErrorOnFailure(
-        DataModelLogger::LogValue("numberOfTransitionsForSequence", indent + 1, value.numberOfTransitionsForSequence));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("dayOfWeekForSequence", indent + 1, value.dayOfWeekForSequence));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("modeForSequence", indent + 1, value.modeForSequence));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("transitions", indent + 1, value.transitions));
-    DataModelLogger::LogString(indent, "}");
-    return CHIP_NO_ERROR;
-}
 
 CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributePath & path, chip::TLV::TLVReader * data)
 {
@@ -4204,56 +4204,40 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
 
     switch (path.mClusterId)
     {
-    case AccessControl::Id: {
+    case Identify::Id: {
         switch (path.mAttributeId)
         {
-        case AccessControl::Attributes::Acl::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::DecodableType>
-                value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ACL", 1, value);
-        }
-        case AccessControl::Attributes::Extension::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::ExtensionEntry::DecodableType> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Extension", 1, value);
-        }
-        case AccessControl::Attributes::SubjectsPerAccessControlEntry::Id: {
-            uint16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SubjectsPerAccessControlEntry", 1, value);
-        }
-        case AccessControl::Attributes::TargetsPerAccessControlEntry::Id: {
+        case Identify::Attributes::IdentifyTime::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TargetsPerAccessControlEntry", 1, value);
+            return DataModelLogger::LogValue("identify time", 1, value);
         }
-        case AccessControl::Attributes::AccessControlEntriesPerFabric::Id: {
-            uint16_t value;
+        case Identify::Attributes::IdentifyType::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AccessControlEntriesPerFabric", 1, value);
+            return DataModelLogger::LogValue("identify type", 1, value);
         }
-        case AccessControl::Attributes::GeneratedCommandList::Id: {
+        case Identify::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case AccessControl::Attributes::AcceptedCommandList::Id: {
+        case Identify::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case AccessControl::Attributes::AttributeList::Id: {
+        case Identify::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case AccessControl::Attributes::FeatureMap::Id: {
+        case Identify::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case AccessControl::Attributes::ClusterRevision::Id: {
+        case Identify::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -4261,30 +4245,35 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case AccountLogin::Id: {
+    case Groups::Id: {
         switch (path.mAttributeId)
         {
-        case AccountLogin::Attributes::GeneratedCommandList::Id: {
+        case Groups::Attributes::NameSupport::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("name support", 1, value);
+        }
+        case Groups::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case AccountLogin::Attributes::AcceptedCommandList::Id: {
+        case Groups::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case AccountLogin::Attributes::AttributeList::Id: {
+        case Groups::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case AccountLogin::Attributes::FeatureMap::Id: {
+        case Groups::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case AccountLogin::Attributes::ClusterRevision::Id: {
+        case Groups::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -4292,45 +4281,60 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case AdministratorCommissioning::Id: {
+    case Scenes::Id: {
         switch (path.mAttributeId)
         {
-        case AdministratorCommissioning::Attributes::WindowStatus::Id: {
+        case Scenes::Attributes::SceneCount::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("WindowStatus", 1, value);
+            return DataModelLogger::LogValue("SceneCount", 1, value);
         }
-        case AdministratorCommissioning::Attributes::AdminFabricIndex::Id: {
-            chip::FabricIndex value;
+        case Scenes::Attributes::CurrentScene::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AdminFabricIndex", 1, value);
+            return DataModelLogger::LogValue("CurrentScene", 1, value);
         }
-        case AdministratorCommissioning::Attributes::AdminVendorId::Id: {
-            uint16_t value;
+        case Scenes::Attributes::CurrentGroup::Id: {
+            chip::GroupId value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AdminVendorId", 1, value);
+            return DataModelLogger::LogValue("CurrentGroup", 1, value);
         }
-        case AdministratorCommissioning::Attributes::GeneratedCommandList::Id: {
+        case Scenes::Attributes::SceneValid::Id: {
+            bool value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SceneValid", 1, value);
+        }
+        case Scenes::Attributes::NameSupport::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("NameSupport", 1, value);
+        }
+        case Scenes::Attributes::LastConfiguredBy::Id: {
+            chip::app::DataModel::Nullable<chip::NodeId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("LastConfiguredBy", 1, value);
+        }
+        case Scenes::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case AdministratorCommissioning::Attributes::AcceptedCommandList::Id: {
+        case Scenes::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case AdministratorCommissioning::Attributes::AttributeList::Id: {
+        case Scenes::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case AdministratorCommissioning::Attributes::FeatureMap::Id: {
+        case Scenes::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case AdministratorCommissioning::Attributes::ClusterRevision::Id: {
+        case Scenes::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -4338,70 +4342,55 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case ApplicationBasic::Id: {
+    case OnOff::Id: {
         switch (path.mAttributeId)
         {
-        case ApplicationBasic::Attributes::VendorName::Id: {
-            chip::CharSpan value;
+        case OnOff::Attributes::OnOff::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("VendorName", 1, value);
+            return DataModelLogger::LogValue("OnOff", 1, value);
         }
-        case ApplicationBasic::Attributes::VendorID::Id: {
-            uint16_t value;
+        case OnOff::Attributes::GlobalSceneControl::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("VendorID", 1, value);
+            return DataModelLogger::LogValue("GlobalSceneControl", 1, value);
         }
-        case ApplicationBasic::Attributes::ApplicationName::Id: {
-            chip::CharSpan value;
+        case OnOff::Attributes::OnTime::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ApplicationName", 1, value);
+            return DataModelLogger::LogValue("OnTime", 1, value);
         }
-        case ApplicationBasic::Attributes::ProductID::Id: {
+        case OnOff::Attributes::OffWaitTime::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ProductID", 1, value);
+            return DataModelLogger::LogValue("OffWaitTime", 1, value);
         }
-        case ApplicationBasic::Attributes::Application::Id: {
-            chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::DecodableType value;
+        case OnOff::Attributes::StartUpOnOff::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::OnOff::OnOffStartUpOnOff> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Application", 1, value);
-        }
-        case ApplicationBasic::Attributes::Status::Id: {
-            chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Status", 1, value);
-        }
-        case ApplicationBasic::Attributes::ApplicationVersion::Id: {
-            chip::CharSpan value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ApplicationVersion", 1, value);
-        }
-        case ApplicationBasic::Attributes::AllowedVendorList::Id: {
-            chip::app::DataModel::DecodableList<chip::VendorId> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AllowedVendorList", 1, value);
+            return DataModelLogger::LogValue("StartUpOnOff", 1, value);
         }
-        case ApplicationBasic::Attributes::GeneratedCommandList::Id: {
+        case OnOff::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ApplicationBasic::Attributes::AcceptedCommandList::Id: {
+        case OnOff::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ApplicationBasic::Attributes::AttributeList::Id: {
+        case OnOff::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ApplicationBasic::Attributes::FeatureMap::Id: {
+        case OnOff::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ApplicationBasic::Attributes::ClusterRevision::Id: {
+        case OnOff::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -4409,40 +4398,40 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case ApplicationLauncher::Id: {
+    case OnOffSwitchConfiguration::Id: {
         switch (path.mAttributeId)
         {
-        case ApplicationLauncher::Attributes::CatalogList::Id: {
-            chip::app::DataModel::DecodableList<uint16_t> value;
+        case OnOffSwitchConfiguration::Attributes::SwitchType::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CatalogList", 1, value);
+            return DataModelLogger::LogValue("switch type", 1, value);
         }
-        case ApplicationLauncher::Attributes::CurrentApp::Id: {
-            chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::DecodableType> value;
+        case OnOffSwitchConfiguration::Attributes::SwitchActions::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentApp", 1, value);
+            return DataModelLogger::LogValue("switch actions", 1, value);
         }
-        case ApplicationLauncher::Attributes::GeneratedCommandList::Id: {
+        case OnOffSwitchConfiguration::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ApplicationLauncher::Attributes::AcceptedCommandList::Id: {
+        case OnOffSwitchConfiguration::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ApplicationLauncher::Attributes::AttributeList::Id: {
+        case OnOffSwitchConfiguration::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ApplicationLauncher::Attributes::FeatureMap::Id: {
+        case OnOffSwitchConfiguration::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ApplicationLauncher::Attributes::ClusterRevision::Id: {
+        case OnOffSwitchConfiguration::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -4450,121 +4439,100 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case AudioOutput::Id: {
+    case LevelControl::Id: {
         switch (path.mAttributeId)
         {
-        case AudioOutput::Attributes::OutputList::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::OutputInfo::DecodableType> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OutputList", 1, value);
-        }
-        case AudioOutput::Attributes::CurrentOutput::Id: {
+        case LevelControl::Attributes::CurrentLevel::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentOutput", 1, value);
-        }
-        case AudioOutput::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("current level", 1, value);
         }
-        case AudioOutput::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case LevelControl::Attributes::RemainingTime::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("remaining time", 1, value);
         }
-        case AudioOutput::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case LevelControl::Attributes::MinLevel::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("min level", 1, value);
         }
-        case AudioOutput::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case LevelControl::Attributes::MaxLevel::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("max level", 1, value);
         }
-        case AudioOutput::Attributes::ClusterRevision::Id: {
+        case LevelControl::Attributes::CurrentFrequency::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
-        }
+            return DataModelLogger::LogValue("current frequency", 1, value);
         }
-        break;
-    }
-    case BarrierControl::Id: {
-        switch (path.mAttributeId)
-        {
-        case BarrierControl::Attributes::BarrierMovingState::Id: {
-            uint8_t value;
+        case LevelControl::Attributes::MinFrequency::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("barrier moving state", 1, value);
+            return DataModelLogger::LogValue("min frequency", 1, value);
         }
-        case BarrierControl::Attributes::BarrierSafetyStatus::Id: {
+        case LevelControl::Attributes::MaxFrequency::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("barrier safety status", 1, value);
+            return DataModelLogger::LogValue("max frequency", 1, value);
         }
-        case BarrierControl::Attributes::BarrierCapabilities::Id: {
+        case LevelControl::Attributes::Options::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("barrier capabilities", 1, value);
-        }
-        case BarrierControl::Attributes::BarrierOpenEvents::Id: {
-            uint16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("barrier open events", 1, value);
+            return DataModelLogger::LogValue("options", 1, value);
         }
-        case BarrierControl::Attributes::BarrierCloseEvents::Id: {
+        case LevelControl::Attributes::OnOffTransitionTime::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("barrier close events", 1, value);
+            return DataModelLogger::LogValue("on off transition time", 1, value);
         }
-        case BarrierControl::Attributes::BarrierCommandOpenEvents::Id: {
-            uint16_t value;
+        case LevelControl::Attributes::OnLevel::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("barrier command open events", 1, value);
+            return DataModelLogger::LogValue("on level", 1, value);
         }
-        case BarrierControl::Attributes::BarrierCommandCloseEvents::Id: {
-            uint16_t value;
+        case LevelControl::Attributes::OnTransitionTime::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("barrier command close events", 1, value);
+            return DataModelLogger::LogValue("on transition time", 1, value);
         }
-        case BarrierControl::Attributes::BarrierOpenPeriod::Id: {
-            uint16_t value;
+        case LevelControl::Attributes::OffTransitionTime::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("barrier open period", 1, value);
+            return DataModelLogger::LogValue("off transition time", 1, value);
         }
-        case BarrierControl::Attributes::BarrierClosePeriod::Id: {
-            uint16_t value;
+        case LevelControl::Attributes::DefaultMoveRate::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("barrier close period", 1, value);
+            return DataModelLogger::LogValue("default move rate", 1, value);
         }
-        case BarrierControl::Attributes::BarrierPosition::Id: {
-            uint8_t value;
+        case LevelControl::Attributes::StartUpCurrentLevel::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("barrier position", 1, value);
+            return DataModelLogger::LogValue("start up current level", 1, value);
         }
-        case BarrierControl::Attributes::GeneratedCommandList::Id: {
+        case LevelControl::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case BarrierControl::Attributes::AcceptedCommandList::Id: {
+        case LevelControl::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case BarrierControl::Attributes::AttributeList::Id: {
+        case LevelControl::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case BarrierControl::Attributes::FeatureMap::Id: {
+        case LevelControl::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case BarrierControl::Attributes::ClusterRevision::Id: {
+        case LevelControl::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -4572,206 +4540,126 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case Basic::Id: {
+    case BinaryInputBasic::Id: {
         switch (path.mAttributeId)
         {
-        case Basic::Attributes::DataModelRevision::Id: {
-            uint16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("DataModelRevision", 1, value);
-        }
-        case Basic::Attributes::VendorName::Id: {
+        case BinaryInputBasic::Attributes::ActiveText::Id: {
             chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("VendorName", 1, value);
+            return DataModelLogger::LogValue("active text", 1, value);
         }
-        case Basic::Attributes::VendorID::Id: {
-            chip::VendorId value;
+        case BinaryInputBasic::Attributes::Description::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("VendorID", 1, value);
+            return DataModelLogger::LogValue("description", 1, value);
         }
-        case Basic::Attributes::ProductName::Id: {
+        case BinaryInputBasic::Attributes::InactiveText::Id: {
             chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ProductName", 1, value);
+            return DataModelLogger::LogValue("inactive text", 1, value);
         }
-        case Basic::Attributes::ProductID::Id: {
-            uint16_t value;
+        case BinaryInputBasic::Attributes::OutOfService::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ProductID", 1, value);
+            return DataModelLogger::LogValue("out of service", 1, value);
         }
-        case Basic::Attributes::NodeLabel::Id: {
-            chip::CharSpan value;
+        case BinaryInputBasic::Attributes::Polarity::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NodeLabel", 1, value);
+            return DataModelLogger::LogValue("polarity", 1, value);
         }
-        case Basic::Attributes::Location::Id: {
-            chip::CharSpan value;
+        case BinaryInputBasic::Attributes::PresentValue::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Location", 1, value);
+            return DataModelLogger::LogValue("present value", 1, value);
         }
-        case Basic::Attributes::HardwareVersion::Id: {
-            uint16_t value;
+        case BinaryInputBasic::Attributes::Reliability::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("HardwareVersion", 1, value);
+            return DataModelLogger::LogValue("reliability", 1, value);
         }
-        case Basic::Attributes::HardwareVersionString::Id: {
-            chip::CharSpan value;
+        case BinaryInputBasic::Attributes::StatusFlags::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("HardwareVersionString", 1, value);
+            return DataModelLogger::LogValue("status flags", 1, value);
         }
-        case Basic::Attributes::SoftwareVersion::Id: {
+        case BinaryInputBasic::Attributes::ApplicationType::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SoftwareVersion", 1, value);
+            return DataModelLogger::LogValue("application type", 1, value);
         }
-        case Basic::Attributes::SoftwareVersionString::Id: {
-            chip::CharSpan value;
+        case BinaryInputBasic::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SoftwareVersionString", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case Basic::Attributes::ManufacturingDate::Id: {
-            chip::CharSpan value;
+        case BinaryInputBasic::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ManufacturingDate", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case Basic::Attributes::PartNumber::Id: {
-            chip::CharSpan value;
+        case BinaryInputBasic::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PartNumber", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case Basic::Attributes::ProductURL::Id: {
-            chip::CharSpan value;
+        case BinaryInputBasic::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ProductURL", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case Basic::Attributes::ProductLabel::Id: {
-            chip::CharSpan value;
+        case BinaryInputBasic::Attributes::ClusterRevision::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ProductLabel", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case Basic::Attributes::SerialNumber::Id: {
-            chip::CharSpan value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SerialNumber", 1, value);
         }
-        case Basic::Attributes::LocalConfigDisabled::Id: {
-            bool value;
+        break;
+    }
+    case Descriptor::Id: {
+        switch (path.mAttributeId)
+        {
+        case Descriptor::Attributes::DeviceList::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::DeviceType::DecodableType> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LocalConfigDisabled", 1, value);
-        }
-        case Basic::Attributes::Reachable::Id: {
-            bool value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Reachable", 1, value);
-        }
-        case Basic::Attributes::UniqueID::Id: {
-            chip::CharSpan value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("UniqueID", 1, value);
-        }
-        case Basic::Attributes::CapabilityMinima::Id: {
-            chip::app::Clusters::Basic::Structs::CapabilityMinimaStruct::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CapabilityMinima", 1, value);
-        }
-        case Basic::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
-        }
-        case Basic::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
-        }
-        case Basic::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
-        }
-        case Basic::Attributes::FeatureMap::Id: {
-            uint32_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
-        }
-        case Basic::Attributes::ClusterRevision::Id: {
-            uint16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
-        }
-        }
-        break;
-    }
-    case BinaryInputBasic::Id: {
-        switch (path.mAttributeId)
-        {
-        case BinaryInputBasic::Attributes::ActiveText::Id: {
-            chip::CharSpan value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("active text", 1, value);
-        }
-        case BinaryInputBasic::Attributes::Description::Id: {
-            chip::CharSpan value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("description", 1, value);
-        }
-        case BinaryInputBasic::Attributes::InactiveText::Id: {
-            chip::CharSpan value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("inactive text", 1, value);
-        }
-        case BinaryInputBasic::Attributes::OutOfService::Id: {
-            bool value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("out of service", 1, value);
-        }
-        case BinaryInputBasic::Attributes::Polarity::Id: {
-            uint8_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("polarity", 1, value);
-        }
-        case BinaryInputBasic::Attributes::PresentValue::Id: {
-            bool value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("present value", 1, value);
+            return DataModelLogger::LogValue("device list", 1, value);
         }
-        case BinaryInputBasic::Attributes::Reliability::Id: {
-            uint8_t value;
+        case Descriptor::Attributes::ServerList::Id: {
+            chip::app::DataModel::DecodableList<chip::ClusterId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("reliability", 1, value);
+            return DataModelLogger::LogValue("server list", 1, value);
         }
-        case BinaryInputBasic::Attributes::StatusFlags::Id: {
-            uint8_t value;
+        case Descriptor::Attributes::ClientList::Id: {
+            chip::app::DataModel::DecodableList<chip::ClusterId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("status flags", 1, value);
+            return DataModelLogger::LogValue("client list", 1, value);
         }
-        case BinaryInputBasic::Attributes::ApplicationType::Id: {
-            uint32_t value;
+        case Descriptor::Attributes::PartsList::Id: {
+            chip::app::DataModel::DecodableList<chip::EndpointId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("application type", 1, value);
+            return DataModelLogger::LogValue("parts list", 1, value);
         }
-        case BinaryInputBasic::Attributes::GeneratedCommandList::Id: {
+        case Descriptor::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case BinaryInputBasic::Attributes::AcceptedCommandList::Id: {
+        case Descriptor::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case BinaryInputBasic::Attributes::AttributeList::Id: {
+        case Descriptor::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case BinaryInputBasic::Attributes::FeatureMap::Id: {
+        case Descriptor::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case BinaryInputBasic::Attributes::ClusterRevision::Id: {
+        case Descriptor::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -4815,35 +4703,56 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case BooleanState::Id: {
+    case AccessControl::Id: {
         switch (path.mAttributeId)
         {
-        case BooleanState::Attributes::StateValue::Id: {
-            bool value;
+        case AccessControl::Attributes::Acl::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("StateValue", 1, value);
+            return DataModelLogger::LogValue("ACL", 1, value);
         }
-        case BooleanState::Attributes::GeneratedCommandList::Id: {
+        case AccessControl::Attributes::Extension::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::ExtensionEntry::DecodableType> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("Extension", 1, value);
+        }
+        case AccessControl::Attributes::SubjectsPerAccessControlEntry::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SubjectsPerAccessControlEntry", 1, value);
+        }
+        case AccessControl::Attributes::TargetsPerAccessControlEntry::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("TargetsPerAccessControlEntry", 1, value);
+        }
+        case AccessControl::Attributes::AccessControlEntriesPerFabric::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AccessControlEntriesPerFabric", 1, value);
+        }
+        case AccessControl::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case BooleanState::Attributes::AcceptedCommandList::Id: {
+        case AccessControl::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case BooleanState::Attributes::AttributeList::Id: {
+        case AccessControl::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case BooleanState::Attributes::FeatureMap::Id: {
+        case AccessControl::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case BooleanState::Attributes::ClusterRevision::Id: {
+        case AccessControl::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -4898,105 +4807,130 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case BridgedDeviceBasic::Id: {
+    case Basic::Id: {
         switch (path.mAttributeId)
         {
-        case BridgedDeviceBasic::Attributes::VendorName::Id: {
+        case Basic::Attributes::DataModelRevision::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("DataModelRevision", 1, value);
+        }
+        case Basic::Attributes::VendorName::Id: {
             chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("VendorName", 1, value);
         }
-        case BridgedDeviceBasic::Attributes::VendorID::Id: {
+        case Basic::Attributes::VendorID::Id: {
             chip::VendorId value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("VendorID", 1, value);
         }
-        case BridgedDeviceBasic::Attributes::ProductName::Id: {
+        case Basic::Attributes::ProductName::Id: {
             chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ProductName", 1, value);
         }
-        case BridgedDeviceBasic::Attributes::NodeLabel::Id: {
+        case Basic::Attributes::ProductID::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ProductID", 1, value);
+        }
+        case Basic::Attributes::NodeLabel::Id: {
             chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("NodeLabel", 1, value);
         }
-        case BridgedDeviceBasic::Attributes::HardwareVersion::Id: {
+        case Basic::Attributes::Location::Id: {
+            chip::CharSpan value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("Location", 1, value);
+        }
+        case Basic::Attributes::HardwareVersion::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("HardwareVersion", 1, value);
         }
-        case BridgedDeviceBasic::Attributes::HardwareVersionString::Id: {
+        case Basic::Attributes::HardwareVersionString::Id: {
             chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("HardwareVersionString", 1, value);
         }
-        case BridgedDeviceBasic::Attributes::SoftwareVersion::Id: {
+        case Basic::Attributes::SoftwareVersion::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("SoftwareVersion", 1, value);
         }
-        case BridgedDeviceBasic::Attributes::SoftwareVersionString::Id: {
+        case Basic::Attributes::SoftwareVersionString::Id: {
             chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("SoftwareVersionString", 1, value);
         }
-        case BridgedDeviceBasic::Attributes::ManufacturingDate::Id: {
+        case Basic::Attributes::ManufacturingDate::Id: {
             chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ManufacturingDate", 1, value);
         }
-        case BridgedDeviceBasic::Attributes::PartNumber::Id: {
+        case Basic::Attributes::PartNumber::Id: {
             chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("PartNumber", 1, value);
         }
-        case BridgedDeviceBasic::Attributes::ProductURL::Id: {
+        case Basic::Attributes::ProductURL::Id: {
             chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ProductURL", 1, value);
         }
-        case BridgedDeviceBasic::Attributes::ProductLabel::Id: {
+        case Basic::Attributes::ProductLabel::Id: {
             chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ProductLabel", 1, value);
         }
-        case BridgedDeviceBasic::Attributes::SerialNumber::Id: {
+        case Basic::Attributes::SerialNumber::Id: {
             chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("SerialNumber", 1, value);
         }
-        case BridgedDeviceBasic::Attributes::Reachable::Id: {
+        case Basic::Attributes::LocalConfigDisabled::Id: {
+            bool value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("LocalConfigDisabled", 1, value);
+        }
+        case Basic::Attributes::Reachable::Id: {
             bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("Reachable", 1, value);
         }
-        case BridgedDeviceBasic::Attributes::UniqueID::Id: {
+        case Basic::Attributes::UniqueID::Id: {
             chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("UniqueID", 1, value);
         }
-        case BridgedDeviceBasic::Attributes::GeneratedCommandList::Id: {
+        case Basic::Attributes::CapabilityMinima::Id: {
+            chip::app::Clusters::Basic::Structs::CapabilityMinimaStruct::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("CapabilityMinima", 1, value);
+        }
+        case Basic::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case BridgedDeviceBasic::Attributes::AcceptedCommandList::Id: {
+        case Basic::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case BridgedDeviceBasic::Attributes::AttributeList::Id: {
+        case Basic::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case BridgedDeviceBasic::Attributes::FeatureMap::Id: {
+        case Basic::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case BridgedDeviceBasic::Attributes::ClusterRevision::Id: {
+        case Basic::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -5004,45 +4938,30 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case Channel::Id: {
+    case OtaSoftwareUpdateProvider::Id: {
         switch (path.mAttributeId)
         {
-        case Channel::Attributes::ChannelList::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ChannelList", 1, value);
-        }
-        case Channel::Attributes::Lineup::Id: {
-            chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::LineupInfo::DecodableType> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Lineup", 1, value);
-        }
-        case Channel::Attributes::CurrentChannel::Id: {
-            chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentChannel", 1, value);
-        }
-        case Channel::Attributes::GeneratedCommandList::Id: {
+        case OtaSoftwareUpdateProvider::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case Channel::Attributes::AcceptedCommandList::Id: {
+        case OtaSoftwareUpdateProvider::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case Channel::Attributes::AttributeList::Id: {
+        case OtaSoftwareUpdateProvider::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case Channel::Attributes::FeatureMap::Id: {
+        case OtaSoftwareUpdateProvider::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case Channel::Attributes::ClusterRevision::Id: {
+        case OtaSoftwareUpdateProvider::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -5050,290 +4969,397 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case ColorControl::Id: {
+    case OtaSoftwareUpdateRequestor::Id: {
         switch (path.mAttributeId)
         {
-        case ColorControl::Attributes::CurrentHue::Id: {
-            uint8_t value;
+        case OtaSoftwareUpdateRequestor::Attributes::DefaultOtaProviders::Id: {
+            chip::app::DataModel::DecodableList<
+                chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentHue", 1, value);
+            return DataModelLogger::LogValue("DefaultOtaProviders", 1, value);
         }
-        case ColorControl::Attributes::CurrentSaturation::Id: {
-            uint8_t value;
+        case OtaSoftwareUpdateRequestor::Attributes::UpdatePossible::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentSaturation", 1, value);
+            return DataModelLogger::LogValue("UpdatePossible", 1, value);
         }
-        case ColorControl::Attributes::RemainingTime::Id: {
-            uint16_t value;
+        case OtaSoftwareUpdateRequestor::Attributes::UpdateState::Id: {
+            chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAUpdateStateEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RemainingTime", 1, value);
+            return DataModelLogger::LogValue("UpdateState", 1, value);
         }
-        case ColorControl::Attributes::CurrentX::Id: {
-            uint16_t value;
+        case OtaSoftwareUpdateRequestor::Attributes::UpdateStateProgress::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentX", 1, value);
+            return DataModelLogger::LogValue("UpdateStateProgress", 1, value);
         }
-        case ColorControl::Attributes::CurrentY::Id: {
-            uint16_t value;
+        case OtaSoftwareUpdateRequestor::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentY", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ColorControl::Attributes::DriftCompensation::Id: {
-            uint8_t value;
+        case OtaSoftwareUpdateRequestor::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("DriftCompensation", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ColorControl::Attributes::CompensationText::Id: {
-            chip::CharSpan value;
+        case OtaSoftwareUpdateRequestor::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CompensationText", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ColorControl::Attributes::ColorTemperature::Id: {
-            uint16_t value;
+        case OtaSoftwareUpdateRequestor::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ColorTemperature", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ColorControl::Attributes::ColorMode::Id: {
-            uint8_t value;
+        case OtaSoftwareUpdateRequestor::Attributes::ClusterRevision::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ColorMode", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case ColorControl::Attributes::Options::Id: {
-            uint8_t value;
+        }
+        break;
+    }
+    case LocalizationConfiguration::Id: {
+        switch (path.mAttributeId)
+        {
+        case LocalizationConfiguration::Attributes::ActiveLocale::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Options", 1, value);
+            return DataModelLogger::LogValue("ActiveLocale", 1, value);
         }
-        case ColorControl::Attributes::NumberOfPrimaries::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case LocalizationConfiguration::Attributes::SupportedLocales::Id: {
+            chip::app::DataModel::DecodableList<chip::CharSpan> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NumberOfPrimaries", 1, value);
+            return DataModelLogger::LogValue("SupportedLocales", 1, value);
         }
-        case ColorControl::Attributes::Primary1X::Id: {
-            uint16_t value;
+        case LocalizationConfiguration::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Primary1X", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ColorControl::Attributes::Primary1Y::Id: {
-            uint16_t value;
+        case LocalizationConfiguration::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Primary1Y", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ColorControl::Attributes::Primary1Intensity::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case LocalizationConfiguration::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Primary1Intensity", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ColorControl::Attributes::Primary2X::Id: {
-            uint16_t value;
+        case LocalizationConfiguration::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Primary2X", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ColorControl::Attributes::Primary2Y::Id: {
+        case LocalizationConfiguration::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Primary2Y", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case ColorControl::Attributes::Primary2Intensity::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        }
+        break;
+    }
+    case TimeFormatLocalization::Id: {
+        switch (path.mAttributeId)
+        {
+        case TimeFormatLocalization::Attributes::HourFormat::Id: {
+            chip::app::Clusters::TimeFormatLocalization::HourFormat value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Primary2Intensity", 1, value);
+            return DataModelLogger::LogValue("HourFormat", 1, value);
         }
-        case ColorControl::Attributes::Primary3X::Id: {
-            uint16_t value;
+        case TimeFormatLocalization::Attributes::ActiveCalendarType::Id: {
+            chip::app::Clusters::TimeFormatLocalization::CalendarType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Primary3X", 1, value);
+            return DataModelLogger::LogValue("ActiveCalendarType", 1, value);
         }
-        case ColorControl::Attributes::Primary3Y::Id: {
-            uint16_t value;
+        case TimeFormatLocalization::Attributes::SupportedCalendarTypes::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::TimeFormatLocalization::CalendarType> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Primary3Y", 1, value);
+            return DataModelLogger::LogValue("SupportedCalendarTypes", 1, value);
         }
-        case ColorControl::Attributes::Primary3Intensity::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case TimeFormatLocalization::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Primary3Intensity", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ColorControl::Attributes::Primary4X::Id: {
-            uint16_t value;
+        case TimeFormatLocalization::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Primary4X", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ColorControl::Attributes::Primary4Y::Id: {
-            uint16_t value;
+        case TimeFormatLocalization::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Primary4Y", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ColorControl::Attributes::Primary4Intensity::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case TimeFormatLocalization::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Primary4Intensity", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ColorControl::Attributes::Primary5X::Id: {
+        case TimeFormatLocalization::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Primary5X", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case ColorControl::Attributes::Primary5Y::Id: {
-            uint16_t value;
+        }
+        break;
+    }
+    case UnitLocalization::Id: {
+        switch (path.mAttributeId)
+        {
+        case UnitLocalization::Attributes::TemperatureUnit::Id: {
+            chip::app::Clusters::UnitLocalization::TempUnit value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Primary5Y", 1, value);
+            return DataModelLogger::LogValue("TemperatureUnit", 1, value);
         }
-        case ColorControl::Attributes::Primary5Intensity::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case UnitLocalization::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Primary5Intensity", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ColorControl::Attributes::Primary6X::Id: {
-            uint16_t value;
+        case UnitLocalization::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Primary6X", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ColorControl::Attributes::Primary6Y::Id: {
-            uint16_t value;
+        case UnitLocalization::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Primary6Y", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ColorControl::Attributes::Primary6Intensity::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case UnitLocalization::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Primary6Intensity", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ColorControl::Attributes::WhitePointX::Id: {
+        case UnitLocalization::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("WhitePointX", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case ColorControl::Attributes::WhitePointY::Id: {
-            uint16_t value;
+        }
+        break;
+    }
+    case PowerSourceConfiguration::Id: {
+        switch (path.mAttributeId)
+        {
+        case PowerSourceConfiguration::Attributes::Sources::Id: {
+            chip::app::DataModel::DecodableList<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("WhitePointY", 1, value);
+            return DataModelLogger::LogValue("Sources", 1, value);
         }
-        case ColorControl::Attributes::ColorPointRX::Id: {
-            uint16_t value;
+        case PowerSourceConfiguration::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ColorPointRX", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ColorControl::Attributes::ColorPointRY::Id: {
-            uint16_t value;
+        case PowerSourceConfiguration::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ColorPointRY", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ColorControl::Attributes::ColorPointRIntensity::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case PowerSourceConfiguration::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ColorPointRIntensity", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ColorControl::Attributes::ColorPointGX::Id: {
-            uint16_t value;
+        case PowerSourceConfiguration::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ColorPointGX", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ColorControl::Attributes::ColorPointGY::Id: {
+        case PowerSourceConfiguration::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ColorPointGY", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case ColorControl::Attributes::ColorPointGIntensity::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        }
+        break;
+    }
+    case PowerSource::Id: {
+        switch (path.mAttributeId)
+        {
+        case PowerSource::Attributes::Status::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ColorPointGIntensity", 1, value);
+            return DataModelLogger::LogValue("Status", 1, value);
         }
-        case ColorControl::Attributes::ColorPointBX::Id: {
-            uint16_t value;
+        case PowerSource::Attributes::Order::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ColorPointBX", 1, value);
+            return DataModelLogger::LogValue("Order", 1, value);
         }
-        case ColorControl::Attributes::ColorPointBY::Id: {
-            uint16_t value;
+        case PowerSource::Attributes::Description::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ColorPointBY", 1, value);
+            return DataModelLogger::LogValue("Description", 1, value);
         }
-        case ColorControl::Attributes::ColorPointBIntensity::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case PowerSource::Attributes::WiredAssessedInputVoltage::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ColorPointBIntensity", 1, value);
+            return DataModelLogger::LogValue("WiredAssessedInputVoltage", 1, value);
         }
-        case ColorControl::Attributes::EnhancedCurrentHue::Id: {
+        case PowerSource::Attributes::WiredAssessedInputFrequency::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EnhancedCurrentHue", 1, value);
+            return DataModelLogger::LogValue("WiredAssessedInputFrequency", 1, value);
         }
-        case ColorControl::Attributes::EnhancedColorMode::Id: {
+        case PowerSource::Attributes::WiredCurrentType::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EnhancedColorMode", 1, value);
+            return DataModelLogger::LogValue("WiredCurrentType", 1, value);
         }
-        case ColorControl::Attributes::ColorLoopActive::Id: {
+        case PowerSource::Attributes::WiredAssessedCurrent::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("WiredAssessedCurrent", 1, value);
+        }
+        case PowerSource::Attributes::WiredNominalVoltage::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("WiredNominalVoltage", 1, value);
+        }
+        case PowerSource::Attributes::WiredMaximumCurrent::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("WiredMaximumCurrent", 1, value);
+        }
+        case PowerSource::Attributes::WiredPresent::Id: {
+            bool value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("WiredPresent", 1, value);
+        }
+        case PowerSource::Attributes::ActiveWiredFaults::Id: {
+            chip::app::DataModel::DecodableList<uint8_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ActiveWiredFaults", 1, value);
+        }
+        case PowerSource::Attributes::BatteryVoltage::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("BatteryVoltage", 1, value);
+        }
+        case PowerSource::Attributes::BatteryPercentRemaining::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ColorLoopActive", 1, value);
+            return DataModelLogger::LogValue("BatteryPercentRemaining", 1, value);
         }
-        case ColorControl::Attributes::ColorLoopDirection::Id: {
+        case PowerSource::Attributes::BatteryTimeRemaining::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("BatteryTimeRemaining", 1, value);
+        }
+        case PowerSource::Attributes::BatteryChargeLevel::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ColorLoopDirection", 1, value);
+            return DataModelLogger::LogValue("BatteryChargeLevel", 1, value);
         }
-        case ColorControl::Attributes::ColorLoopTime::Id: {
-            uint16_t value;
+        case PowerSource::Attributes::BatteryReplacementNeeded::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ColorLoopTime", 1, value);
+            return DataModelLogger::LogValue("BatteryReplacementNeeded", 1, value);
         }
-        case ColorControl::Attributes::ColorLoopStartEnhancedHue::Id: {
-            uint16_t value;
+        case PowerSource::Attributes::BatteryReplaceability::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ColorLoopStartEnhancedHue", 1, value);
+            return DataModelLogger::LogValue("BatteryReplaceability", 1, value);
         }
-        case ColorControl::Attributes::ColorLoopStoredEnhancedHue::Id: {
-            uint16_t value;
+        case PowerSource::Attributes::BatteryPresent::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ColorLoopStoredEnhancedHue", 1, value);
+            return DataModelLogger::LogValue("BatteryPresent", 1, value);
         }
-        case ColorControl::Attributes::ColorCapabilities::Id: {
-            uint16_t value;
+        case PowerSource::Attributes::ActiveBatteryFaults::Id: {
+            chip::app::DataModel::DecodableList<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ColorCapabilities", 1, value);
+            return DataModelLogger::LogValue("ActiveBatteryFaults", 1, value);
         }
-        case ColorControl::Attributes::ColorTempPhysicalMinMireds::Id: {
-            uint16_t value;
+        case PowerSource::Attributes::BatteryReplacementDescription::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ColorTempPhysicalMinMireds", 1, value);
+            return DataModelLogger::LogValue("BatteryReplacementDescription", 1, value);
         }
-        case ColorControl::Attributes::ColorTempPhysicalMaxMireds::Id: {
-            uint16_t value;
+        case PowerSource::Attributes::BatteryCommonDesignation::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ColorTempPhysicalMaxMireds", 1, value);
+            return DataModelLogger::LogValue("BatteryCommonDesignation", 1, value);
         }
-        case ColorControl::Attributes::CoupleColorTempToLevelMinMireds::Id: {
-            uint16_t value;
+        case PowerSource::Attributes::BatteryANSIDesignation::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CoupleColorTempToLevelMinMireds", 1, value);
+            return DataModelLogger::LogValue("BatteryANSIDesignation", 1, value);
         }
-        case ColorControl::Attributes::StartUpColorTemperatureMireds::Id: {
-            uint16_t value;
+        case PowerSource::Attributes::BatteryIECDesignation::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("StartUpColorTemperatureMireds", 1, value);
+            return DataModelLogger::LogValue("BatteryIECDesignation", 1, value);
         }
-        case ColorControl::Attributes::GeneratedCommandList::Id: {
+        case PowerSource::Attributes::BatteryApprovedChemistry::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("BatteryApprovedChemistry", 1, value);
+        }
+        case PowerSource::Attributes::BatteryCapacity::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("BatteryCapacity", 1, value);
+        }
+        case PowerSource::Attributes::BatteryQuantity::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("BatteryQuantity", 1, value);
+        }
+        case PowerSource::Attributes::BatteryChargeState::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("BatteryChargeState", 1, value);
+        }
+        case PowerSource::Attributes::BatteryTimeToFullCharge::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("BatteryTimeToFullCharge", 1, value);
+        }
+        case PowerSource::Attributes::BatteryFunctionalWhileCharging::Id: {
+            bool value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("BatteryFunctionalWhileCharging", 1, value);
+        }
+        case PowerSource::Attributes::BatteryChargingCurrent::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("BatteryChargingCurrent", 1, value);
+        }
+        case PowerSource::Attributes::ActiveBatteryChargeFaults::Id: {
+            chip::app::DataModel::DecodableList<uint8_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ActiveBatteryChargeFaults", 1, value);
+        }
+        case PowerSource::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ColorControl::Attributes::AcceptedCommandList::Id: {
+        case PowerSource::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ColorControl::Attributes::AttributeList::Id: {
+        case PowerSource::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ColorControl::Attributes::FeatureMap::Id: {
+        case PowerSource::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ColorControl::Attributes::ClusterRevision::Id: {
+        case PowerSource::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -5341,40 +5367,55 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case ContentLauncher::Id: {
+    case GeneralCommissioning::Id: {
         switch (path.mAttributeId)
         {
-        case ContentLauncher::Attributes::AcceptHeader::Id: {
-            chip::app::DataModel::DecodableList<chip::CharSpan> value;
+        case GeneralCommissioning::Attributes::Breadcrumb::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptHeader", 1, value);
+            return DataModelLogger::LogValue("Breadcrumb", 1, value);
         }
-        case ContentLauncher::Attributes::SupportedStreamingProtocols::Id: {
-            uint32_t value;
+        case GeneralCommissioning::Attributes::BasicCommissioningInfo::Id: {
+            chip::app::Clusters::GeneralCommissioning::Structs::BasicCommissioningInfo::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SupportedStreamingProtocols", 1, value);
+            return DataModelLogger::LogValue("BasicCommissioningInfo", 1, value);
         }
-        case ContentLauncher::Attributes::GeneratedCommandList::Id: {
+        case GeneralCommissioning::Attributes::RegulatoryConfig::Id: {
+            chip::app::Clusters::GeneralCommissioning::RegulatoryLocationType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("RegulatoryConfig", 1, value);
+        }
+        case GeneralCommissioning::Attributes::LocationCapability::Id: {
+            chip::app::Clusters::GeneralCommissioning::RegulatoryLocationType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("LocationCapability", 1, value);
+        }
+        case GeneralCommissioning::Attributes::SupportsConcurrentConnection::Id: {
+            bool value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SupportsConcurrentConnection", 1, value);
+        }
+        case GeneralCommissioning::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ContentLauncher::Attributes::AcceptedCommandList::Id: {
+        case GeneralCommissioning::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ContentLauncher::Attributes::AttributeList::Id: {
+        case GeneralCommissioning::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ContentLauncher::Attributes::FeatureMap::Id: {
+        case GeneralCommissioning::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ContentLauncher::Attributes::ClusterRevision::Id: {
+        case GeneralCommissioning::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -5382,50 +5423,71 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case Descriptor::Id: {
+    case NetworkCommissioning::Id: {
         switch (path.mAttributeId)
         {
-        case Descriptor::Attributes::DeviceList::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::DeviceType::DecodableType> value;
+        case NetworkCommissioning::Attributes::MaxNetworks::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("device list", 1, value);
+            return DataModelLogger::LogValue("MaxNetworks", 1, value);
         }
-        case Descriptor::Attributes::ServerList::Id: {
-            chip::app::DataModel::DecodableList<chip::ClusterId> value;
+        case NetworkCommissioning::Attributes::Networks::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("server list", 1, value);
+            return DataModelLogger::LogValue("Networks", 1, value);
         }
-        case Descriptor::Attributes::ClientList::Id: {
-            chip::app::DataModel::DecodableList<chip::ClusterId> value;
+        case NetworkCommissioning::Attributes::ScanMaxTimeSeconds::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("client list", 1, value);
+            return DataModelLogger::LogValue("ScanMaxTimeSeconds", 1, value);
         }
-        case Descriptor::Attributes::PartsList::Id: {
-            chip::app::DataModel::DecodableList<chip::EndpointId> value;
+        case NetworkCommissioning::Attributes::ConnectMaxTimeSeconds::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("parts list", 1, value);
+            return DataModelLogger::LogValue("ConnectMaxTimeSeconds", 1, value);
         }
-        case Descriptor::Attributes::GeneratedCommandList::Id: {
+        case NetworkCommissioning::Attributes::InterfaceEnabled::Id: {
+            bool value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("InterfaceEnabled", 1, value);
+        }
+        case NetworkCommissioning::Attributes::LastNetworkingStatus::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatus> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("LastNetworkingStatus", 1, value);
+        }
+        case NetworkCommissioning::Attributes::LastNetworkID::Id: {
+            chip::app::DataModel::Nullable<chip::ByteSpan> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("LastNetworkID", 1, value);
+        }
+        case NetworkCommissioning::Attributes::LastConnectErrorValue::Id: {
+            chip::app::DataModel::Nullable<int32_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("LastConnectErrorValue", 1, value);
+        }
+        case NetworkCommissioning::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case Descriptor::Attributes::AcceptedCommandList::Id: {
+        case NetworkCommissioning::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case Descriptor::Attributes::AttributeList::Id: {
+        case NetworkCommissioning::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case Descriptor::Attributes::FeatureMap::Id: {
+        case NetworkCommissioning::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case Descriptor::Attributes::ClusterRevision::Id: {
+        case NetworkCommissioning::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -5464,881 +5526,851 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case DoorLock::Id: {
+    case GeneralDiagnostics::Id: {
         switch (path.mAttributeId)
         {
-        case DoorLock::Attributes::LockState::Id: {
-            chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> value;
+        case GeneralDiagnostics::Attributes::NetworkInterfaces::Id: {
+            chip::app::DataModel::DecodableList<
+                chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LockState", 1, value);
+            return DataModelLogger::LogValue("NetworkInterfaces", 1, value);
         }
-        case DoorLock::Attributes::LockType::Id: {
-            chip::app::Clusters::DoorLock::DlLockType value;
+        case GeneralDiagnostics::Attributes::RebootCount::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LockType", 1, value);
+            return DataModelLogger::LogValue("RebootCount", 1, value);
         }
-        case DoorLock::Attributes::ActuatorEnabled::Id: {
-            bool value;
+        case GeneralDiagnostics::Attributes::UpTime::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActuatorEnabled", 1, value);
+            return DataModelLogger::LogValue("UpTime", 1, value);
         }
-        case DoorLock::Attributes::DoorState::Id: {
-            chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlDoorState> value;
+        case GeneralDiagnostics::Attributes::TotalOperationalHours::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("DoorState", 1, value);
+            return DataModelLogger::LogValue("TotalOperationalHours", 1, value);
         }
-        case DoorLock::Attributes::DoorOpenEvents::Id: {
-            uint32_t value;
+        case GeneralDiagnostics::Attributes::BootReasons::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("DoorOpenEvents", 1, value);
+            return DataModelLogger::LogValue("BootReasons", 1, value);
         }
-        case DoorLock::Attributes::DoorClosedEvents::Id: {
-            uint32_t value;
+        case GeneralDiagnostics::Attributes::ActiveHardwareFaults::Id: {
+            chip::app::DataModel::DecodableList<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("DoorClosedEvents", 1, value);
+            return DataModelLogger::LogValue("ActiveHardwareFaults", 1, value);
         }
-        case DoorLock::Attributes::OpenPeriod::Id: {
-            uint16_t value;
+        case GeneralDiagnostics::Attributes::ActiveRadioFaults::Id: {
+            chip::app::DataModel::DecodableList<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OpenPeriod", 1, value);
+            return DataModelLogger::LogValue("ActiveRadioFaults", 1, value);
         }
-        case DoorLock::Attributes::NumberOfTotalUsersSupported::Id: {
-            uint16_t value;
+        case GeneralDiagnostics::Attributes::ActiveNetworkFaults::Id: {
+            chip::app::DataModel::DecodableList<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NumberOfTotalUsersSupported", 1, value);
+            return DataModelLogger::LogValue("ActiveNetworkFaults", 1, value);
         }
-        case DoorLock::Attributes::NumberOfPINUsersSupported::Id: {
-            uint16_t value;
+        case GeneralDiagnostics::Attributes::TestEventTriggersEnabled::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NumberOfPINUsersSupported", 1, value);
+            return DataModelLogger::LogValue("TestEventTriggersEnabled", 1, value);
         }
-        case DoorLock::Attributes::NumberOfRFIDUsersSupported::Id: {
-            uint16_t value;
+        case GeneralDiagnostics::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NumberOfRFIDUsersSupported", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case DoorLock::Attributes::NumberOfWeekDaySchedulesSupportedPerUser::Id: {
-            uint8_t value;
+        case GeneralDiagnostics::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NumberOfWeekDaySchedulesSupportedPerUser", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case DoorLock::Attributes::NumberOfYearDaySchedulesSupportedPerUser::Id: {
-            uint8_t value;
+        case GeneralDiagnostics::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NumberOfYearDaySchedulesSupportedPerUser", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case DoorLock::Attributes::NumberOfHolidaySchedulesSupported::Id: {
-            uint8_t value;
+        case GeneralDiagnostics::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NumberOfHolidaySchedulesSupported", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case DoorLock::Attributes::MaxPINCodeLength::Id: {
-            uint8_t value;
+        case GeneralDiagnostics::Attributes::ClusterRevision::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MaxPINCodeLength", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case DoorLock::Attributes::MinPINCodeLength::Id: {
-            uint8_t value;
+        }
+        break;
+    }
+    case SoftwareDiagnostics::Id: {
+        switch (path.mAttributeId)
+        {
+        case SoftwareDiagnostics::Attributes::ThreadMetrics::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MinPINCodeLength", 1, value);
+            return DataModelLogger::LogValue("ThreadMetrics", 1, value);
         }
-        case DoorLock::Attributes::MaxRFIDCodeLength::Id: {
-            uint8_t value;
+        case SoftwareDiagnostics::Attributes::CurrentHeapFree::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MaxRFIDCodeLength", 1, value);
+            return DataModelLogger::LogValue("CurrentHeapFree", 1, value);
         }
-        case DoorLock::Attributes::MinRFIDCodeLength::Id: {
-            uint8_t value;
+        case SoftwareDiagnostics::Attributes::CurrentHeapUsed::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MinRFIDCodeLength", 1, value);
+            return DataModelLogger::LogValue("CurrentHeapUsed", 1, value);
         }
-        case DoorLock::Attributes::CredentialRulesSupport::Id: {
-            chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask> value;
+        case SoftwareDiagnostics::Attributes::CurrentHeapHighWatermark::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CredentialRulesSupport", 1, value);
+            return DataModelLogger::LogValue("CurrentHeapHighWatermark", 1, value);
         }
-        case DoorLock::Attributes::NumberOfCredentialsSupportedPerUser::Id: {
-            uint8_t value;
+        case SoftwareDiagnostics::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NumberOfCredentialsSupportedPerUser", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case DoorLock::Attributes::Language::Id: {
-            chip::CharSpan value;
+        case SoftwareDiagnostics::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Language", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case DoorLock::Attributes::LEDSettings::Id: {
-            uint8_t value;
+        case SoftwareDiagnostics::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LEDSettings", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case DoorLock::Attributes::AutoRelockTime::Id: {
+        case SoftwareDiagnostics::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AutoRelockTime", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case DoorLock::Attributes::SoundVolume::Id: {
-            uint8_t value;
+        case SoftwareDiagnostics::Attributes::ClusterRevision::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SoundVolume", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case DoorLock::Attributes::OperatingMode::Id: {
-            chip::app::Clusters::DoorLock::DlOperatingMode value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OperatingMode", 1, value);
         }
-        case DoorLock::Attributes::SupportedOperatingModes::Id: {
-            chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes> value;
+        break;
+    }
+    case ThreadNetworkDiagnostics::Id: {
+        switch (path.mAttributeId)
+        {
+        case ThreadNetworkDiagnostics::Attributes::Channel::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SupportedOperatingModes", 1, value);
+            return DataModelLogger::LogValue("channel", 1, value);
         }
-        case DoorLock::Attributes::DefaultConfigurationRegister::Id: {
-            chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister> value;
+        case ThreadNetworkDiagnostics::Attributes::RoutingRole::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("DefaultConfigurationRegister", 1, value);
+            return DataModelLogger::LogValue("RoutingRole", 1, value);
         }
-        case DoorLock::Attributes::EnableLocalProgramming::Id: {
-            bool value;
+        case ThreadNetworkDiagnostics::Attributes::NetworkName::Id: {
+            chip::app::DataModel::Nullable<chip::CharSpan> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EnableLocalProgramming", 1, value);
+            return DataModelLogger::LogValue("NetworkName", 1, value);
         }
-        case DoorLock::Attributes::EnableOneTouchLocking::Id: {
-            bool value;
+        case ThreadNetworkDiagnostics::Attributes::PanId::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EnableOneTouchLocking", 1, value);
+            return DataModelLogger::LogValue("PanId", 1, value);
         }
-        case DoorLock::Attributes::EnableInsideStatusLED::Id: {
-            bool value;
+        case ThreadNetworkDiagnostics::Attributes::ExtendedPanId::Id: {
+            chip::app::DataModel::Nullable<uint64_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EnableInsideStatusLED", 1, value);
+            return DataModelLogger::LogValue("ExtendedPanId", 1, value);
         }
-        case DoorLock::Attributes::EnablePrivacyModeButton::Id: {
-            bool value;
+        case ThreadNetworkDiagnostics::Attributes::MeshLocalPrefix::Id: {
+            chip::app::DataModel::Nullable<chip::ByteSpan> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EnablePrivacyModeButton", 1, value);
+            return DataModelLogger::LogValue("MeshLocalPrefix", 1, value);
         }
-        case DoorLock::Attributes::LocalProgrammingFeatures::Id: {
-            chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> value;
+        case ThreadNetworkDiagnostics::Attributes::OverrunCount::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LocalProgrammingFeatures", 1, value);
+            return DataModelLogger::LogValue("OverrunCount", 1, value);
         }
-        case DoorLock::Attributes::WrongCodeEntryLimit::Id: {
-            uint8_t value;
+        case ThreadNetworkDiagnostics::Attributes::NeighborTableList::Id: {
+            chip::app::DataModel::DecodableList<
+                chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("WrongCodeEntryLimit", 1, value);
+            return DataModelLogger::LogValue("NeighborTableList", 1, value);
         }
-        case DoorLock::Attributes::UserCodeTemporaryDisableTime::Id: {
-            uint8_t value;
+        case ThreadNetworkDiagnostics::Attributes::RouteTableList::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("UserCodeTemporaryDisableTime", 1, value);
+            return DataModelLogger::LogValue("RouteTableList", 1, value);
         }
-        case DoorLock::Attributes::SendPINOverTheAir::Id: {
-            bool value;
+        case ThreadNetworkDiagnostics::Attributes::PartitionId::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SendPINOverTheAir", 1, value);
+            return DataModelLogger::LogValue("PartitionId", 1, value);
         }
-        case DoorLock::Attributes::RequirePINforRemoteOperation::Id: {
-            bool value;
+        case ThreadNetworkDiagnostics::Attributes::Weighting::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RequirePINforRemoteOperation", 1, value);
+            return DataModelLogger::LogValue("weighting", 1, value);
         }
-        case DoorLock::Attributes::ExpiringUserTimeout::Id: {
-            uint16_t value;
+        case ThreadNetworkDiagnostics::Attributes::DataVersion::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ExpiringUserTimeout", 1, value);
+            return DataModelLogger::LogValue("DataVersion", 1, value);
         }
-        case DoorLock::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case ThreadNetworkDiagnostics::Attributes::StableDataVersion::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("StableDataVersion", 1, value);
         }
-        case DoorLock::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case ThreadNetworkDiagnostics::Attributes::LeaderRouterId::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("LeaderRouterId", 1, value);
         }
-        case DoorLock::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case ThreadNetworkDiagnostics::Attributes::DetachedRoleCount::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("DetachedRoleCount", 1, value);
         }
-        case DoorLock::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case ThreadNetworkDiagnostics::Attributes::ChildRoleCount::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("ChildRoleCount", 1, value);
         }
-        case DoorLock::Attributes::ClusterRevision::Id: {
+        case ThreadNetworkDiagnostics::Attributes::RouterRoleCount::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+            return DataModelLogger::LogValue("RouterRoleCount", 1, value);
         }
+        case ThreadNetworkDiagnostics::Attributes::LeaderRoleCount::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("LeaderRoleCount", 1, value);
         }
-        break;
-    }
-    case ElectricalMeasurement::Id: {
-        switch (path.mAttributeId)
-        {
-        case ElectricalMeasurement::Attributes::MeasurementType::Id: {
-            uint32_t value;
+        case ThreadNetworkDiagnostics::Attributes::AttachAttemptCount::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("measurement type", 1, value);
+            return DataModelLogger::LogValue("AttachAttemptCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::DcVoltage::Id: {
-            int16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("dc voltage", 1, value);
-        }
-        case ElectricalMeasurement::Attributes::DcVoltageMin::Id: {
-            int16_t value;
+        case ThreadNetworkDiagnostics::Attributes::PartitionIdChangeCount::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("dc voltage min", 1, value);
+            return DataModelLogger::LogValue("PartitionIdChangeCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::DcVoltageMax::Id: {
-            int16_t value;
+        case ThreadNetworkDiagnostics::Attributes::BetterPartitionAttachAttemptCount::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("dc voltage max", 1, value);
+            return DataModelLogger::LogValue("BetterPartitionAttachAttemptCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::DcCurrent::Id: {
-            int16_t value;
+        case ThreadNetworkDiagnostics::Attributes::ParentChangeCount::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("dc current", 1, value);
+            return DataModelLogger::LogValue("ParentChangeCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::DcCurrentMin::Id: {
-            int16_t value;
+        case ThreadNetworkDiagnostics::Attributes::TxTotalCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("dc current min", 1, value);
+            return DataModelLogger::LogValue("TxTotalCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::DcCurrentMax::Id: {
-            int16_t value;
+        case ThreadNetworkDiagnostics::Attributes::TxUnicastCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("dc current max", 1, value);
+            return DataModelLogger::LogValue("TxUnicastCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::DcPower::Id: {
-            int16_t value;
+        case ThreadNetworkDiagnostics::Attributes::TxBroadcastCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("dc power", 1, value);
+            return DataModelLogger::LogValue("TxBroadcastCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::DcPowerMin::Id: {
-            int16_t value;
+        case ThreadNetworkDiagnostics::Attributes::TxAckRequestedCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("dc power min", 1, value);
+            return DataModelLogger::LogValue("TxAckRequestedCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::DcPowerMax::Id: {
-            int16_t value;
+        case ThreadNetworkDiagnostics::Attributes::TxAckedCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("dc power max", 1, value);
+            return DataModelLogger::LogValue("TxAckedCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::DcVoltageMultiplier::Id: {
-            uint16_t value;
+        case ThreadNetworkDiagnostics::Attributes::TxNoAckRequestedCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("dc voltage multiplier", 1, value);
+            return DataModelLogger::LogValue("TxNoAckRequestedCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::DcVoltageDivisor::Id: {
-            uint16_t value;
+        case ThreadNetworkDiagnostics::Attributes::TxDataCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("dc voltage divisor", 1, value);
+            return DataModelLogger::LogValue("TxDataCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::DcCurrentMultiplier::Id: {
-            uint16_t value;
+        case ThreadNetworkDiagnostics::Attributes::TxDataPollCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("dc current multiplier", 1, value);
+            return DataModelLogger::LogValue("TxDataPollCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::DcCurrentDivisor::Id: {
-            uint16_t value;
+        case ThreadNetworkDiagnostics::Attributes::TxBeaconCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("dc current divisor", 1, value);
+            return DataModelLogger::LogValue("TxBeaconCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::DcPowerMultiplier::Id: {
-            uint16_t value;
+        case ThreadNetworkDiagnostics::Attributes::TxBeaconRequestCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("dc power multiplier", 1, value);
+            return DataModelLogger::LogValue("TxBeaconRequestCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::DcPowerDivisor::Id: {
-            uint16_t value;
+        case ThreadNetworkDiagnostics::Attributes::TxOtherCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("dc power divisor", 1, value);
+            return DataModelLogger::LogValue("TxOtherCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AcFrequency::Id: {
-            uint16_t value;
+        case ThreadNetworkDiagnostics::Attributes::TxRetryCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ac frequency", 1, value);
+            return DataModelLogger::LogValue("TxRetryCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AcFrequencyMin::Id: {
-            uint16_t value;
+        case ThreadNetworkDiagnostics::Attributes::TxDirectMaxRetryExpiryCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ac frequency min", 1, value);
+            return DataModelLogger::LogValue("TxDirectMaxRetryExpiryCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AcFrequencyMax::Id: {
-            uint16_t value;
+        case ThreadNetworkDiagnostics::Attributes::TxIndirectMaxRetryExpiryCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ac frequency max", 1, value);
+            return DataModelLogger::LogValue("TxIndirectMaxRetryExpiryCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::NeutralCurrent::Id: {
-            uint16_t value;
+        case ThreadNetworkDiagnostics::Attributes::TxErrCcaCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("neutral current", 1, value);
+            return DataModelLogger::LogValue("TxErrCcaCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::TotalActivePower::Id: {
-            int32_t value;
+        case ThreadNetworkDiagnostics::Attributes::TxErrAbortCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("total active power", 1, value);
+            return DataModelLogger::LogValue("TxErrAbortCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::TotalReactivePower::Id: {
-            int32_t value;
+        case ThreadNetworkDiagnostics::Attributes::TxErrBusyChannelCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("total reactive power", 1, value);
+            return DataModelLogger::LogValue("TxErrBusyChannelCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::TotalApparentPower::Id: {
+        case ThreadNetworkDiagnostics::Attributes::RxTotalCount::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("total apparent power", 1, value);
+            return DataModelLogger::LogValue("RxTotalCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::Measured1stHarmonicCurrent::Id: {
-            int16_t value;
+        case ThreadNetworkDiagnostics::Attributes::RxUnicastCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("measured 1st harmonic current", 1, value);
+            return DataModelLogger::LogValue("RxUnicastCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::Measured3rdHarmonicCurrent::Id: {
-            int16_t value;
+        case ThreadNetworkDiagnostics::Attributes::RxBroadcastCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("measured 3rd harmonic current", 1, value);
+            return DataModelLogger::LogValue("RxBroadcastCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::Measured5thHarmonicCurrent::Id: {
-            int16_t value;
+        case ThreadNetworkDiagnostics::Attributes::RxDataCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("measured 5th harmonic current", 1, value);
+            return DataModelLogger::LogValue("RxDataCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::Measured7thHarmonicCurrent::Id: {
-            int16_t value;
+        case ThreadNetworkDiagnostics::Attributes::RxDataPollCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("measured 7th harmonic current", 1, value);
+            return DataModelLogger::LogValue("RxDataPollCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::Measured9thHarmonicCurrent::Id: {
-            int16_t value;
+        case ThreadNetworkDiagnostics::Attributes::RxBeaconCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("measured 9th harmonic current", 1, value);
+            return DataModelLogger::LogValue("RxBeaconCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::Measured11thHarmonicCurrent::Id: {
-            int16_t value;
+        case ThreadNetworkDiagnostics::Attributes::RxBeaconRequestCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("measured 11th harmonic current", 1, value);
+            return DataModelLogger::LogValue("RxBeaconRequestCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::MeasuredPhase1stHarmonicCurrent::Id: {
-            int16_t value;
+        case ThreadNetworkDiagnostics::Attributes::RxOtherCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("measured phase 1st harmonic current", 1, value);
+            return DataModelLogger::LogValue("RxOtherCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::MeasuredPhase3rdHarmonicCurrent::Id: {
-            int16_t value;
+        case ThreadNetworkDiagnostics::Attributes::RxAddressFilteredCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("measured phase 3rd harmonic current", 1, value);
+            return DataModelLogger::LogValue("RxAddressFilteredCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::MeasuredPhase5thHarmonicCurrent::Id: {
-            int16_t value;
+        case ThreadNetworkDiagnostics::Attributes::RxDestAddrFilteredCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("measured phase 5th harmonic current", 1, value);
+            return DataModelLogger::LogValue("RxDestAddrFilteredCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::MeasuredPhase7thHarmonicCurrent::Id: {
-            int16_t value;
+        case ThreadNetworkDiagnostics::Attributes::RxDuplicatedCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("measured phase 7th harmonic current", 1, value);
+            return DataModelLogger::LogValue("RxDuplicatedCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::MeasuredPhase9thHarmonicCurrent::Id: {
-            int16_t value;
+        case ThreadNetworkDiagnostics::Attributes::RxErrNoFrameCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("measured phase 9th harmonic current", 1, value);
+            return DataModelLogger::LogValue("RxErrNoFrameCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::MeasuredPhase11thHarmonicCurrent::Id: {
-            int16_t value;
+        case ThreadNetworkDiagnostics::Attributes::RxErrUnknownNeighborCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("measured phase 11th harmonic current", 1, value);
+            return DataModelLogger::LogValue("RxErrUnknownNeighborCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AcFrequencyMultiplier::Id: {
-            uint16_t value;
+        case ThreadNetworkDiagnostics::Attributes::RxErrInvalidSrcAddrCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ac frequency multiplier", 1, value);
+            return DataModelLogger::LogValue("RxErrInvalidSrcAddrCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AcFrequencyDivisor::Id: {
-            uint16_t value;
+        case ThreadNetworkDiagnostics::Attributes::RxErrSecCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ac frequency divisor", 1, value);
+            return DataModelLogger::LogValue("RxErrSecCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::PowerMultiplier::Id: {
+        case ThreadNetworkDiagnostics::Attributes::RxErrFcsCount::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("power multiplier", 1, value);
+            return DataModelLogger::LogValue("RxErrFcsCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::PowerDivisor::Id: {
+        case ThreadNetworkDiagnostics::Attributes::RxErrOtherCount::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("power divisor", 1, value);
+            return DataModelLogger::LogValue("RxErrOtherCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::HarmonicCurrentMultiplier::Id: {
-            int8_t value;
+        case ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::Id: {
+            chip::app::DataModel::Nullable<uint64_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("harmonic current multiplier", 1, value);
+            return DataModelLogger::LogValue("ActiveTimestamp", 1, value);
         }
-        case ElectricalMeasurement::Attributes::PhaseHarmonicCurrentMultiplier::Id: {
-            int8_t value;
+        case ThreadNetworkDiagnostics::Attributes::PendingTimestamp::Id: {
+            chip::app::DataModel::Nullable<uint64_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("phase harmonic current multiplier", 1, value);
+            return DataModelLogger::LogValue("PendingTimestamp", 1, value);
         }
-        case ElectricalMeasurement::Attributes::InstantaneousVoltage::Id: {
-            int16_t value;
+        case ThreadNetworkDiagnostics::Attributes::Delay::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("instantaneous voltage", 1, value);
+            return DataModelLogger::LogValue("delay", 1, value);
         }
-        case ElectricalMeasurement::Attributes::InstantaneousLineCurrent::Id: {
-            uint16_t value;
+        case ThreadNetworkDiagnostics::Attributes::SecurityPolicy::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("instantaneous line current", 1, value);
+            return DataModelLogger::LogValue("SecurityPolicy", 1, value);
         }
-        case ElectricalMeasurement::Attributes::InstantaneousActiveCurrent::Id: {
-            int16_t value;
+        case ThreadNetworkDiagnostics::Attributes::ChannelMask::Id: {
+            chip::app::DataModel::Nullable<chip::ByteSpan> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("instantaneous active current", 1, value);
+            return DataModelLogger::LogValue("ChannelMask", 1, value);
         }
-        case ElectricalMeasurement::Attributes::InstantaneousReactiveCurrent::Id: {
-            int16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("instantaneous reactive current", 1, value);
-        }
-        case ElectricalMeasurement::Attributes::InstantaneousPower::Id: {
-            int16_t value;
+        case ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::Id: {
+            chip::app::DataModel::Nullable<
+                chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("instantaneous power", 1, value);
+            return DataModelLogger::LogValue("OperationalDatasetComponents", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsVoltage::Id: {
-            uint16_t value;
+        case ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms voltage", 1, value);
+            return DataModelLogger::LogValue("ActiveNetworkFaultsList", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsVoltageMin::Id: {
-            uint16_t value;
+        case ThreadNetworkDiagnostics::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms voltage min", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsVoltageMax::Id: {
-            uint16_t value;
+        case ThreadNetworkDiagnostics::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms voltage max", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsCurrent::Id: {
-            uint16_t value;
+        case ThreadNetworkDiagnostics::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms current", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsCurrentMin::Id: {
-            uint16_t value;
+        case ThreadNetworkDiagnostics::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms current min", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsCurrentMax::Id: {
+        case ThreadNetworkDiagnostics::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms current max", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case ElectricalMeasurement::Attributes::ActivePower::Id: {
-            int16_t value;
+        }
+        break;
+    }
+    case WiFiNetworkDiagnostics::Id: {
+        switch (path.mAttributeId)
+        {
+        case WiFiNetworkDiagnostics::Attributes::Bssid::Id: {
+            chip::app::DataModel::Nullable<chip::ByteSpan> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("active power", 1, value);
+            return DataModelLogger::LogValue("bssid", 1, value);
         }
-        case ElectricalMeasurement::Attributes::ActivePowerMin::Id: {
-            int16_t value;
+        case WiFiNetworkDiagnostics::Attributes::SecurityType::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::WiFiNetworkDiagnostics::SecurityType> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("active power min", 1, value);
+            return DataModelLogger::LogValue("SecurityType", 1, value);
         }
-        case ElectricalMeasurement::Attributes::ActivePowerMax::Id: {
-            int16_t value;
+        case WiFiNetworkDiagnostics::Attributes::WiFiVersion::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::WiFiNetworkDiagnostics::WiFiVersionType> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("active power max", 1, value);
+            return DataModelLogger::LogValue("WiFiVersion", 1, value);
         }
-        case ElectricalMeasurement::Attributes::ReactivePower::Id: {
-            int16_t value;
+        case WiFiNetworkDiagnostics::Attributes::ChannelNumber::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("reactive power", 1, value);
+            return DataModelLogger::LogValue("ChannelNumber", 1, value);
         }
-        case ElectricalMeasurement::Attributes::ApparentPower::Id: {
-            uint16_t value;
+        case WiFiNetworkDiagnostics::Attributes::Rssi::Id: {
+            chip::app::DataModel::Nullable<int8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("apparent power", 1, value);
+            return DataModelLogger::LogValue("Rssi", 1, value);
         }
-        case ElectricalMeasurement::Attributes::PowerFactor::Id: {
-            int8_t value;
+        case WiFiNetworkDiagnostics::Attributes::BeaconLostCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("power factor", 1, value);
+            return DataModelLogger::LogValue("BeaconLostCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriod::Id: {
-            uint16_t value;
+        case WiFiNetworkDiagnostics::Attributes::BeaconRxCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("average rms voltage measurement period", 1, value);
+            return DataModelLogger::LogValue("BeaconRxCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounter::Id: {
-            uint16_t value;
+        case WiFiNetworkDiagnostics::Attributes::PacketMulticastRxCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("average rms under voltage counter", 1, value);
+            return DataModelLogger::LogValue("PacketMulticastRxCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriod::Id: {
-            uint16_t value;
+        case WiFiNetworkDiagnostics::Attributes::PacketMulticastTxCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms extreme over voltage period", 1, value);
+            return DataModelLogger::LogValue("PacketMulticastTxCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriod::Id: {
-            uint16_t value;
+        case WiFiNetworkDiagnostics::Attributes::PacketUnicastRxCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms extreme under voltage period", 1, value);
+            return DataModelLogger::LogValue("PacketUnicastRxCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsVoltageSagPeriod::Id: {
-            uint16_t value;
+        case WiFiNetworkDiagnostics::Attributes::PacketUnicastTxCount::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms voltage sag period", 1, value);
+            return DataModelLogger::LogValue("PacketUnicastTxCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsVoltageSwellPeriod::Id: {
-            uint16_t value;
+        case WiFiNetworkDiagnostics::Attributes::CurrentMaxRate::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms voltage swell period", 1, value);
+            return DataModelLogger::LogValue("CurrentMaxRate", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AcVoltageMultiplier::Id: {
-            uint16_t value;
+        case WiFiNetworkDiagnostics::Attributes::OverrunCount::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ac voltage multiplier", 1, value);
+            return DataModelLogger::LogValue("OverrunCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AcVoltageDivisor::Id: {
-            uint16_t value;
+        case WiFiNetworkDiagnostics::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ac voltage divisor", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AcCurrentMultiplier::Id: {
-            uint16_t value;
+        case WiFiNetworkDiagnostics::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ac current multiplier", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AcCurrentDivisor::Id: {
-            uint16_t value;
+        case WiFiNetworkDiagnostics::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ac current divisor", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AcPowerMultiplier::Id: {
-            uint16_t value;
+        case WiFiNetworkDiagnostics::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ac power multiplier", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AcPowerDivisor::Id: {
+        case WiFiNetworkDiagnostics::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ac power divisor", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case ElectricalMeasurement::Attributes::OverloadAlarmsMask::Id: {
-            uint8_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("overload alarms mask", 1, value);
         }
-        case ElectricalMeasurement::Attributes::VoltageOverload::Id: {
-            int16_t value;
+        break;
+    }
+    case EthernetNetworkDiagnostics::Id: {
+        switch (path.mAttributeId)
+        {
+        case EthernetNetworkDiagnostics::Attributes::PHYRate::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateType> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("voltage overload", 1, value);
+            return DataModelLogger::LogValue("PHYRate", 1, value);
         }
-        case ElectricalMeasurement::Attributes::CurrentOverload::Id: {
-            int16_t value;
+        case EthernetNetworkDiagnostics::Attributes::FullDuplex::Id: {
+            chip::app::DataModel::Nullable<bool> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("current overload", 1, value);
+            return DataModelLogger::LogValue("FullDuplex", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AcOverloadAlarmsMask::Id: {
-            uint16_t value;
+        case EthernetNetworkDiagnostics::Attributes::PacketRxCount::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ac overload alarms mask", 1, value);
+            return DataModelLogger::LogValue("PacketRxCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AcVoltageOverload::Id: {
-            int16_t value;
+        case EthernetNetworkDiagnostics::Attributes::PacketTxCount::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ac voltage overload", 1, value);
+            return DataModelLogger::LogValue("PacketTxCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AcCurrentOverload::Id: {
-            int16_t value;
+        case EthernetNetworkDiagnostics::Attributes::TxErrCount::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ac current overload", 1, value);
+            return DataModelLogger::LogValue("TxErrCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AcActivePowerOverload::Id: {
-            int16_t value;
+        case EthernetNetworkDiagnostics::Attributes::CollisionCount::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ac active power overload", 1, value);
+            return DataModelLogger::LogValue("CollisionCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AcReactivePowerOverload::Id: {
-            int16_t value;
+        case EthernetNetworkDiagnostics::Attributes::OverrunCount::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ac reactive power overload", 1, value);
+            return DataModelLogger::LogValue("OverrunCount", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AverageRmsOverVoltage::Id: {
-            int16_t value;
+        case EthernetNetworkDiagnostics::Attributes::CarrierDetect::Id: {
+            chip::app::DataModel::Nullable<bool> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("average rms over voltage", 1, value);
+            return DataModelLogger::LogValue("CarrierDetect", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AverageRmsUnderVoltage::Id: {
-            int16_t value;
+        case EthernetNetworkDiagnostics::Attributes::TimeSinceReset::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("average rms under voltage", 1, value);
+            return DataModelLogger::LogValue("TimeSinceReset", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsExtremeOverVoltage::Id: {
-            int16_t value;
+        case EthernetNetworkDiagnostics::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms extreme over voltage", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsExtremeUnderVoltage::Id: {
-            int16_t value;
+        case EthernetNetworkDiagnostics::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms extreme under voltage", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsVoltageSag::Id: {
-            int16_t value;
+        case EthernetNetworkDiagnostics::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms voltage sag", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsVoltageSwell::Id: {
-            int16_t value;
+        case EthernetNetworkDiagnostics::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms voltage swell", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ElectricalMeasurement::Attributes::LineCurrentPhaseB::Id: {
+        case EthernetNetworkDiagnostics::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("line current phase b", 1, value);
-        }
-        case ElectricalMeasurement::Attributes::ActiveCurrentPhaseB::Id: {
-            int16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("active current phase b", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case ElectricalMeasurement::Attributes::ReactiveCurrentPhaseB::Id: {
-            int16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("reactive current phase b", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsVoltagePhaseB::Id: {
-            uint16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms voltage phase b", 1, value);
-        }
-        case ElectricalMeasurement::Attributes::RmsVoltageMinPhaseB::Id: {
-            uint16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms voltage min phase b", 1, value);
-        }
-        case ElectricalMeasurement::Attributes::RmsVoltageMaxPhaseB::Id: {
-            uint16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms voltage max phase b", 1, value);
-        }
-        case ElectricalMeasurement::Attributes::RmsCurrentPhaseB::Id: {
-            uint16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms current phase b", 1, value);
-        }
-        case ElectricalMeasurement::Attributes::RmsCurrentMinPhaseB::Id: {
-            uint16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms current min phase b", 1, value);
-        }
-        case ElectricalMeasurement::Attributes::RmsCurrentMaxPhaseB::Id: {
-            uint16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms current max phase b", 1, value);
-        }
-        case ElectricalMeasurement::Attributes::ActivePowerPhaseB::Id: {
-            int16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("active power phase b", 1, value);
-        }
-        case ElectricalMeasurement::Attributes::ActivePowerMinPhaseB::Id: {
-            int16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("active power min phase b", 1, value);
-        }
-        case ElectricalMeasurement::Attributes::ActivePowerMaxPhaseB::Id: {
-            int16_t value;
+        break;
+    }
+    case BridgedDeviceBasic::Id: {
+        switch (path.mAttributeId)
+        {
+        case BridgedDeviceBasic::Attributes::VendorName::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("active power max phase b", 1, value);
+            return DataModelLogger::LogValue("VendorName", 1, value);
         }
-        case ElectricalMeasurement::Attributes::ReactivePowerPhaseB::Id: {
-            int16_t value;
+        case BridgedDeviceBasic::Attributes::VendorID::Id: {
+            chip::VendorId value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("reactive power phase b", 1, value);
+            return DataModelLogger::LogValue("VendorID", 1, value);
         }
-        case ElectricalMeasurement::Attributes::ApparentPowerPhaseB::Id: {
-            uint16_t value;
+        case BridgedDeviceBasic::Attributes::ProductName::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("apparent power phase b", 1, value);
+            return DataModelLogger::LogValue("ProductName", 1, value);
         }
-        case ElectricalMeasurement::Attributes::PowerFactorPhaseB::Id: {
-            int8_t value;
+        case BridgedDeviceBasic::Attributes::NodeLabel::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("power factor phase b", 1, value);
+            return DataModelLogger::LogValue("NodeLabel", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriodPhaseB::Id: {
+        case BridgedDeviceBasic::Attributes::HardwareVersion::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("average rms voltage measurement period phase b", 1, value);
+            return DataModelLogger::LogValue("HardwareVersion", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AverageRmsOverVoltageCounterPhaseB::Id: {
-            uint16_t value;
+        case BridgedDeviceBasic::Attributes::HardwareVersionString::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("average rms over voltage counter phase b", 1, value);
+            return DataModelLogger::LogValue("HardwareVersionString", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounterPhaseB::Id: {
-            uint16_t value;
+        case BridgedDeviceBasic::Attributes::SoftwareVersion::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("average rms under voltage counter phase b", 1, value);
+            return DataModelLogger::LogValue("SoftwareVersion", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriodPhaseB::Id: {
-            uint16_t value;
+        case BridgedDeviceBasic::Attributes::SoftwareVersionString::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms extreme over voltage period phase b", 1, value);
+            return DataModelLogger::LogValue("SoftwareVersionString", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriodPhaseB::Id: {
-            uint16_t value;
+        case BridgedDeviceBasic::Attributes::ManufacturingDate::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms extreme under voltage period phase b", 1, value);
+            return DataModelLogger::LogValue("ManufacturingDate", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsVoltageSagPeriodPhaseB::Id: {
-            uint16_t value;
+        case BridgedDeviceBasic::Attributes::PartNumber::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms voltage sag period phase b", 1, value);
+            return DataModelLogger::LogValue("PartNumber", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsVoltageSwellPeriodPhaseB::Id: {
-            uint16_t value;
+        case BridgedDeviceBasic::Attributes::ProductURL::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms voltage swell period phase b", 1, value);
+            return DataModelLogger::LogValue("ProductURL", 1, value);
         }
-        case ElectricalMeasurement::Attributes::LineCurrentPhaseC::Id: {
-            uint16_t value;
+        case BridgedDeviceBasic::Attributes::ProductLabel::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("line current phase c", 1, value);
+            return DataModelLogger::LogValue("ProductLabel", 1, value);
         }
-        case ElectricalMeasurement::Attributes::ActiveCurrentPhaseC::Id: {
-            int16_t value;
+        case BridgedDeviceBasic::Attributes::SerialNumber::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("active current phase c", 1, value);
+            return DataModelLogger::LogValue("SerialNumber", 1, value);
         }
-        case ElectricalMeasurement::Attributes::ReactiveCurrentPhaseC::Id: {
-            int16_t value;
+        case BridgedDeviceBasic::Attributes::Reachable::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("reactive current phase c", 1, value);
+            return DataModelLogger::LogValue("Reachable", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsVoltagePhaseC::Id: {
-            uint16_t value;
+        case BridgedDeviceBasic::Attributes::UniqueID::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms voltage phase c", 1, value);
+            return DataModelLogger::LogValue("UniqueID", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsVoltageMinPhaseC::Id: {
-            uint16_t value;
+        case BridgedDeviceBasic::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms voltage min phase c", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsVoltageMaxPhaseC::Id: {
-            uint16_t value;
+        case BridgedDeviceBasic::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms voltage max phase c", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsCurrentPhaseC::Id: {
-            uint16_t value;
+        case BridgedDeviceBasic::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms current phase c", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsCurrentMinPhaseC::Id: {
-            uint16_t value;
+        case BridgedDeviceBasic::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms current min phase c", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsCurrentMaxPhaseC::Id: {
+        case BridgedDeviceBasic::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms current max phase c", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case ElectricalMeasurement::Attributes::ActivePowerPhaseC::Id: {
-            int16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("active power phase c", 1, value);
         }
-        case ElectricalMeasurement::Attributes::ActivePowerMinPhaseC::Id: {
-            int16_t value;
+        break;
+    }
+    case Switch::Id: {
+        switch (path.mAttributeId)
+        {
+        case Switch::Attributes::NumberOfPositions::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("active power min phase c", 1, value);
+            return DataModelLogger::LogValue("number of positions", 1, value);
         }
-        case ElectricalMeasurement::Attributes::ActivePowerMaxPhaseC::Id: {
-            int16_t value;
+        case Switch::Attributes::CurrentPosition::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("active power max phase c", 1, value);
+            return DataModelLogger::LogValue("current position", 1, value);
         }
-        case ElectricalMeasurement::Attributes::ReactivePowerPhaseC::Id: {
-            int16_t value;
+        case Switch::Attributes::MultiPressMax::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("reactive power phase c", 1, value);
+            return DataModelLogger::LogValue("multi press max", 1, value);
         }
-        case ElectricalMeasurement::Attributes::ApparentPowerPhaseC::Id: {
-            uint16_t value;
+        case Switch::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("apparent power phase c", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ElectricalMeasurement::Attributes::PowerFactorPhaseC::Id: {
-            int8_t value;
+        case Switch::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("power factor phase c", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriodPhaseC::Id: {
-            uint16_t value;
+        case Switch::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("average rms voltage measurement period phase c", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AverageRmsOverVoltageCounterPhaseC::Id: {
-            uint16_t value;
+        case Switch::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("average rms over voltage counter phase c", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounterPhaseC::Id: {
+        case Switch::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("average rms under voltage counter phase c", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriodPhaseC::Id: {
-            uint16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms extreme over voltage period phase c", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriodPhaseC::Id: {
-            uint16_t value;
+        break;
+    }
+    case AdministratorCommissioning::Id: {
+        switch (path.mAttributeId)
+        {
+        case AdministratorCommissioning::Attributes::WindowStatus::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms extreme under voltage period phase c", 1, value);
+            return DataModelLogger::LogValue("WindowStatus", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsVoltageSagPeriodPhaseC::Id: {
-            uint16_t value;
+        case AdministratorCommissioning::Attributes::AdminFabricIndex::Id: {
+            chip::FabricIndex value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms voltage sag period phase c", 1, value);
+            return DataModelLogger::LogValue("AdminFabricIndex", 1, value);
         }
-        case ElectricalMeasurement::Attributes::RmsVoltageSwellPeriodPhaseC::Id: {
+        case AdministratorCommissioning::Attributes::AdminVendorId::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rms voltage swell period phase c", 1, value);
+            return DataModelLogger::LogValue("AdminVendorId", 1, value);
         }
-        case ElectricalMeasurement::Attributes::GeneratedCommandList::Id: {
+        case AdministratorCommissioning::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AcceptedCommandList::Id: {
+        case AdministratorCommissioning::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ElectricalMeasurement::Attributes::AttributeList::Id: {
+        case AdministratorCommissioning::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ElectricalMeasurement::Attributes::FeatureMap::Id: {
+        case AdministratorCommissioning::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ElectricalMeasurement::Attributes::ClusterRevision::Id: {
+        case AdministratorCommissioning::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -6346,75 +6378,63 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case EthernetNetworkDiagnostics::Id: {
+    case OperationalCredentials::Id: {
         switch (path.mAttributeId)
         {
-        case EthernetNetworkDiagnostics::Attributes::PHYRate::Id: {
-            chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateType> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PHYRate", 1, value);
-        }
-        case EthernetNetworkDiagnostics::Attributes::FullDuplex::Id: {
-            chip::app::DataModel::Nullable<bool> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FullDuplex", 1, value);
-        }
-        case EthernetNetworkDiagnostics::Attributes::PacketRxCount::Id: {
-            uint64_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PacketRxCount", 1, value);
-        }
-        case EthernetNetworkDiagnostics::Attributes::PacketTxCount::Id: {
-            uint64_t value;
+        case OperationalCredentials::Attributes::NOCs::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PacketTxCount", 1, value);
+            return DataModelLogger::LogValue("NOCs", 1, value);
         }
-        case EthernetNetworkDiagnostics::Attributes::TxErrCount::Id: {
-            uint64_t value;
+        case OperationalCredentials::Attributes::Fabrics::Id: {
+            chip::app::DataModel::DecodableList<
+                chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxErrCount", 1, value);
+            return DataModelLogger::LogValue("Fabrics", 1, value);
         }
-        case EthernetNetworkDiagnostics::Attributes::CollisionCount::Id: {
-            uint64_t value;
+        case OperationalCredentials::Attributes::SupportedFabrics::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CollisionCount", 1, value);
+            return DataModelLogger::LogValue("SupportedFabrics", 1, value);
         }
-        case EthernetNetworkDiagnostics::Attributes::OverrunCount::Id: {
-            uint64_t value;
+        case OperationalCredentials::Attributes::CommissionedFabrics::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OverrunCount", 1, value);
+            return DataModelLogger::LogValue("CommissionedFabrics", 1, value);
         }
-        case EthernetNetworkDiagnostics::Attributes::CarrierDetect::Id: {
-            chip::app::DataModel::Nullable<bool> value;
+        case OperationalCredentials::Attributes::TrustedRootCertificates::Id: {
+            chip::app::DataModel::DecodableList<chip::ByteSpan> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CarrierDetect", 1, value);
+            return DataModelLogger::LogValue("TrustedRootCertificates", 1, value);
         }
-        case EthernetNetworkDiagnostics::Attributes::TimeSinceReset::Id: {
-            uint64_t value;
+        case OperationalCredentials::Attributes::CurrentFabricIndex::Id: {
+            chip::FabricIndex value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TimeSinceReset", 1, value);
+            return DataModelLogger::LogValue("CurrentFabricIndex", 1, value);
         }
-        case EthernetNetworkDiagnostics::Attributes::GeneratedCommandList::Id: {
+        case OperationalCredentials::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case EthernetNetworkDiagnostics::Attributes::AcceptedCommandList::Id: {
+        case OperationalCredentials::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case EthernetNetworkDiagnostics::Attributes::AttributeList::Id: {
+        case OperationalCredentials::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case EthernetNetworkDiagnostics::Attributes::FeatureMap::Id: {
+        case OperationalCredentials::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case EthernetNetworkDiagnostics::Attributes::ClusterRevision::Id: {
+        case OperationalCredentials::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -6422,85 +6442,52 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case FanControl::Id: {
+    case GroupKeyManagement::Id: {
         switch (path.mAttributeId)
         {
-        case FanControl::Attributes::FanMode::Id: {
-            chip::app::Clusters::FanControl::FanModeType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("fan mode", 1, value);
-        }
-        case FanControl::Attributes::FanModeSequence::Id: {
-            chip::app::Clusters::FanControl::FanModeSequenceType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("fan mode sequence", 1, value);
-        }
-        case FanControl::Attributes::PercentSetting::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("percent setting", 1, value);
-        }
-        case FanControl::Attributes::PercentCurrent::Id: {
-            uint8_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("percent current", 1, value);
-        }
-        case FanControl::Attributes::SpeedMax::Id: {
-            uint8_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("speed max", 1, value);
-        }
-        case FanControl::Attributes::SpeedSetting::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("speed setting", 1, value);
-        }
-        case FanControl::Attributes::SpeedCurrent::Id: {
-            uint8_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("speed current", 1, value);
-        }
-        case FanControl::Attributes::RockSupport::Id: {
-            uint8_t value;
+        case GroupKeyManagement::Attributes::GroupKeyMap::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rock support", 1, value);
+            return DataModelLogger::LogValue("GroupKeyMap", 1, value);
         }
-        case FanControl::Attributes::RockSetting::Id: {
-            uint8_t value;
+        case GroupKeyManagement::Attributes::GroupTable::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupInfoMapStruct::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("rock setting", 1, value);
+            return DataModelLogger::LogValue("GroupTable", 1, value);
         }
-        case FanControl::Attributes::WindSupport::Id: {
-            uint8_t value;
+        case GroupKeyManagement::Attributes::MaxGroupsPerFabric::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("wind support", 1, value);
+            return DataModelLogger::LogValue("MaxGroupsPerFabric", 1, value);
         }
-        case FanControl::Attributes::WindSetting::Id: {
-            uint8_t value;
+        case GroupKeyManagement::Attributes::MaxGroupKeysPerFabric::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("wind setting", 1, value);
+            return DataModelLogger::LogValue("MaxGroupKeysPerFabric", 1, value);
         }
-        case FanControl::Attributes::GeneratedCommandList::Id: {
+        case GroupKeyManagement::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case FanControl::Attributes::AcceptedCommandList::Id: {
+        case GroupKeyManagement::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case FanControl::Attributes::AttributeList::Id: {
+        case GroupKeyManagement::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case FanControl::Attributes::FeatureMap::Id: {
+        case GroupKeyManagement::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case FanControl::Attributes::ClusterRevision::Id: {
+        case GroupKeyManagement::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -6544,50 +6531,71 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case FlowMeasurement::Id: {
+    case UserLabel::Id: {
         switch (path.mAttributeId)
         {
-        case FlowMeasurement::Attributes::MeasuredValue::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case UserLabel::Attributes::LabelList::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::UserLabel::Structs::LabelStruct::DecodableType> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MeasuredValue", 1, value);
+            return DataModelLogger::LogValue("label list", 1, value);
         }
-        case FlowMeasurement::Attributes::MinMeasuredValue::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case UserLabel::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MinMeasuredValue", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case FlowMeasurement::Attributes::MaxMeasuredValue::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case UserLabel::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MaxMeasuredValue", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case FlowMeasurement::Attributes::Tolerance::Id: {
+        case UserLabel::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AttributeList", 1, value);
+        }
+        case UserLabel::Attributes::FeatureMap::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
+        }
+        case UserLabel::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Tolerance", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case FlowMeasurement::Attributes::GeneratedCommandList::Id: {
+        }
+        break;
+    }
+    case BooleanState::Id: {
+        switch (path.mAttributeId)
+        {
+        case BooleanState::Attributes::StateValue::Id: {
+            bool value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("StateValue", 1, value);
+        }
+        case BooleanState::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case FlowMeasurement::Attributes::AcceptedCommandList::Id: {
+        case BooleanState::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case FlowMeasurement::Attributes::AttributeList::Id: {
+        case BooleanState::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case FlowMeasurement::Attributes::FeatureMap::Id: {
+        case BooleanState::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case FlowMeasurement::Attributes::ClusterRevision::Id: {
+        case BooleanState::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -6595,55 +6603,60 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case GeneralCommissioning::Id: {
+    case ModeSelect::Id: {
         switch (path.mAttributeId)
         {
-        case GeneralCommissioning::Attributes::Breadcrumb::Id: {
-            uint64_t value;
+        case ModeSelect::Attributes::Description::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Breadcrumb", 1, value);
+            return DataModelLogger::LogValue("Description", 1, value);
         }
-        case GeneralCommissioning::Attributes::BasicCommissioningInfo::Id: {
-            chip::app::Clusters::GeneralCommissioning::Structs::BasicCommissioningInfo::DecodableType value;
+        case ModeSelect::Attributes::StandardNamespace::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BasicCommissioningInfo", 1, value);
+            return DataModelLogger::LogValue("StandardNamespace", 1, value);
         }
-        case GeneralCommissioning::Attributes::RegulatoryConfig::Id: {
-            chip::app::Clusters::GeneralCommissioning::RegulatoryLocationType value;
+        case ModeSelect::Attributes::SupportedModes::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RegulatoryConfig", 1, value);
+            return DataModelLogger::LogValue("SupportedModes", 1, value);
         }
-        case GeneralCommissioning::Attributes::LocationCapability::Id: {
-            chip::app::Clusters::GeneralCommissioning::RegulatoryLocationType value;
+        case ModeSelect::Attributes::CurrentMode::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LocationCapability", 1, value);
+            return DataModelLogger::LogValue("CurrentMode", 1, value);
         }
-        case GeneralCommissioning::Attributes::SupportsConcurrentConnection::Id: {
-            bool value;
+        case ModeSelect::Attributes::StartUpMode::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SupportsConcurrentConnection", 1, value);
+            return DataModelLogger::LogValue("StartUpMode", 1, value);
         }
-        case GeneralCommissioning::Attributes::GeneratedCommandList::Id: {
+        case ModeSelect::Attributes::OnMode::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("OnMode", 1, value);
+        }
+        case ModeSelect::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case GeneralCommissioning::Attributes::AcceptedCommandList::Id: {
+        case ModeSelect::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case GeneralCommissioning::Attributes::AttributeList::Id: {
+        case ModeSelect::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case GeneralCommissioning::Attributes::FeatureMap::Id: {
+        case ModeSelect::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case GeneralCommissioning::Attributes::ClusterRevision::Id: {
+        case ModeSelect::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -6651,207 +6664,210 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case GeneralDiagnostics::Id: {
+    case DoorLock::Id: {
         switch (path.mAttributeId)
         {
-        case GeneralDiagnostics::Attributes::NetworkInterfaces::Id: {
-            chip::app::DataModel::DecodableList<
-                chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType>
-                value;
+        case DoorLock::Attributes::LockState::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NetworkInterfaces", 1, value);
+            return DataModelLogger::LogValue("LockState", 1, value);
         }
-        case GeneralDiagnostics::Attributes::RebootCount::Id: {
-            uint16_t value;
+        case DoorLock::Attributes::LockType::Id: {
+            chip::app::Clusters::DoorLock::DlLockType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RebootCount", 1, value);
+            return DataModelLogger::LogValue("LockType", 1, value);
         }
-        case GeneralDiagnostics::Attributes::UpTime::Id: {
-            uint64_t value;
+        case DoorLock::Attributes::ActuatorEnabled::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("UpTime", 1, value);
+            return DataModelLogger::LogValue("ActuatorEnabled", 1, value);
         }
-        case GeneralDiagnostics::Attributes::TotalOperationalHours::Id: {
-            uint32_t value;
+        case DoorLock::Attributes::DoorState::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlDoorState> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TotalOperationalHours", 1, value);
+            return DataModelLogger::LogValue("DoorState", 1, value);
         }
-        case GeneralDiagnostics::Attributes::BootReasons::Id: {
-            uint8_t value;
+        case DoorLock::Attributes::DoorOpenEvents::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BootReasons", 1, value);
+            return DataModelLogger::LogValue("DoorOpenEvents", 1, value);
         }
-        case GeneralDiagnostics::Attributes::ActiveHardwareFaults::Id: {
-            chip::app::DataModel::DecodableList<uint8_t> value;
+        case DoorLock::Attributes::DoorClosedEvents::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActiveHardwareFaults", 1, value);
+            return DataModelLogger::LogValue("DoorClosedEvents", 1, value);
         }
-        case GeneralDiagnostics::Attributes::ActiveRadioFaults::Id: {
-            chip::app::DataModel::DecodableList<uint8_t> value;
+        case DoorLock::Attributes::OpenPeriod::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActiveRadioFaults", 1, value);
+            return DataModelLogger::LogValue("OpenPeriod", 1, value);
         }
-        case GeneralDiagnostics::Attributes::ActiveNetworkFaults::Id: {
-            chip::app::DataModel::DecodableList<uint8_t> value;
+        case DoorLock::Attributes::NumberOfTotalUsersSupported::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActiveNetworkFaults", 1, value);
+            return DataModelLogger::LogValue("NumberOfTotalUsersSupported", 1, value);
         }
-        case GeneralDiagnostics::Attributes::TestEventTriggersEnabled::Id: {
-            bool value;
+        case DoorLock::Attributes::NumberOfPINUsersSupported::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TestEventTriggersEnabled", 1, value);
+            return DataModelLogger::LogValue("NumberOfPINUsersSupported", 1, value);
         }
-        case GeneralDiagnostics::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case DoorLock::Attributes::NumberOfRFIDUsersSupported::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("NumberOfRFIDUsersSupported", 1, value);
         }
-        case GeneralDiagnostics::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case DoorLock::Attributes::NumberOfWeekDaySchedulesSupportedPerUser::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("NumberOfWeekDaySchedulesSupportedPerUser", 1, value);
         }
-        case GeneralDiagnostics::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case DoorLock::Attributes::NumberOfYearDaySchedulesSupportedPerUser::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("NumberOfYearDaySchedulesSupportedPerUser", 1, value);
         }
-        case GeneralDiagnostics::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case DoorLock::Attributes::NumberOfHolidaySchedulesSupported::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("NumberOfHolidaySchedulesSupported", 1, value);
         }
-        case GeneralDiagnostics::Attributes::ClusterRevision::Id: {
-            uint16_t value;
+        case DoorLock::Attributes::MaxPINCodeLength::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
-        }
+            return DataModelLogger::LogValue("MaxPINCodeLength", 1, value);
         }
-        break;
-    }
-    case GroupKeyManagement::Id: {
-        switch (path.mAttributeId)
-        {
-        case GroupKeyManagement::Attributes::GroupKeyMap::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::DecodableType>
-                value;
+        case DoorLock::Attributes::MinPINCodeLength::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GroupKeyMap", 1, value);
+            return DataModelLogger::LogValue("MinPINCodeLength", 1, value);
         }
-        case GroupKeyManagement::Attributes::GroupTable::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupInfoMapStruct::DecodableType>
-                value;
+        case DoorLock::Attributes::MaxRFIDCodeLength::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GroupTable", 1, value);
+            return DataModelLogger::LogValue("MaxRFIDCodeLength", 1, value);
         }
-        case GroupKeyManagement::Attributes::MaxGroupsPerFabric::Id: {
-            uint16_t value;
+        case DoorLock::Attributes::MinRFIDCodeLength::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MaxGroupsPerFabric", 1, value);
+            return DataModelLogger::LogValue("MinRFIDCodeLength", 1, value);
         }
-        case GroupKeyManagement::Attributes::MaxGroupKeysPerFabric::Id: {
-            uint16_t value;
+        case DoorLock::Attributes::CredentialRulesSupport::Id: {
+            chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MaxGroupKeysPerFabric", 1, value);
+            return DataModelLogger::LogValue("CredentialRulesSupport", 1, value);
         }
-        case GroupKeyManagement::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case DoorLock::Attributes::NumberOfCredentialsSupportedPerUser::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("NumberOfCredentialsSupportedPerUser", 1, value);
         }
-        case GroupKeyManagement::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case DoorLock::Attributes::Language::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("Language", 1, value);
         }
-        case GroupKeyManagement::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case DoorLock::Attributes::LEDSettings::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("LEDSettings", 1, value);
         }
-        case GroupKeyManagement::Attributes::FeatureMap::Id: {
+        case DoorLock::Attributes::AutoRelockTime::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("AutoRelockTime", 1, value);
         }
-        case GroupKeyManagement::Attributes::ClusterRevision::Id: {
-            uint16_t value;
+        case DoorLock::Attributes::SoundVolume::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+            return DataModelLogger::LogValue("SoundVolume", 1, value);
         }
+        case DoorLock::Attributes::OperatingMode::Id: {
+            chip::app::Clusters::DoorLock::DlOperatingMode value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("OperatingMode", 1, value);
         }
-        break;
-    }
-    case Groups::Id: {
-        switch (path.mAttributeId)
-        {
-        case Groups::Attributes::NameSupport::Id: {
-            uint8_t value;
+        case DoorLock::Attributes::SupportedOperatingModes::Id: {
+            chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("name support", 1, value);
+            return DataModelLogger::LogValue("SupportedOperatingModes", 1, value);
         }
-        case Groups::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case DoorLock::Attributes::DefaultConfigurationRegister::Id: {
+            chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("DefaultConfigurationRegister", 1, value);
         }
-        case Groups::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case DoorLock::Attributes::EnableLocalProgramming::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("EnableLocalProgramming", 1, value);
         }
-        case Groups::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case DoorLock::Attributes::EnableOneTouchLocking::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("EnableOneTouchLocking", 1, value);
         }
-        case Groups::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case DoorLock::Attributes::EnableInsideStatusLED::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("EnableInsideStatusLED", 1, value);
         }
-        case Groups::Attributes::ClusterRevision::Id: {
-            uint16_t value;
+        case DoorLock::Attributes::EnablePrivacyModeButton::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+            return DataModelLogger::LogValue("EnablePrivacyModeButton", 1, value);
         }
+        case DoorLock::Attributes::LocalProgrammingFeatures::Id: {
+            chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("LocalProgrammingFeatures", 1, value);
         }
-        break;
-    }
-    case Identify::Id: {
-        switch (path.mAttributeId)
-        {
-        case Identify::Attributes::IdentifyTime::Id: {
-            uint16_t value;
+        case DoorLock::Attributes::WrongCodeEntryLimit::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("identify time", 1, value);
+            return DataModelLogger::LogValue("WrongCodeEntryLimit", 1, value);
         }
-        case Identify::Attributes::IdentifyType::Id: {
+        case DoorLock::Attributes::UserCodeTemporaryDisableTime::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("identify type", 1, value);
+            return DataModelLogger::LogValue("UserCodeTemporaryDisableTime", 1, value);
         }
-        case Identify::Attributes::GeneratedCommandList::Id: {
+        case DoorLock::Attributes::SendPINOverTheAir::Id: {
+            bool value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SendPINOverTheAir", 1, value);
+        }
+        case DoorLock::Attributes::RequirePINforRemoteOperation::Id: {
+            bool value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("RequirePINforRemoteOperation", 1, value);
+        }
+        case DoorLock::Attributes::ExpiringUserTimeout::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ExpiringUserTimeout", 1, value);
+        }
+        case DoorLock::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case Identify::Attributes::AcceptedCommandList::Id: {
+        case DoorLock::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case Identify::Attributes::AttributeList::Id: {
+        case DoorLock::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case Identify::Attributes::FeatureMap::Id: {
+        case DoorLock::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case Identify::Attributes::ClusterRevision::Id: {
+        case DoorLock::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -6859,86 +6875,140 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case IlluminanceMeasurement::Id: {
+    case WindowCovering::Id: {
         switch (path.mAttributeId)
         {
-        case IlluminanceMeasurement::Attributes::MeasuredValue::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case WindowCovering::Attributes::Type::Id: {
+            chip::app::Clusters::WindowCovering::Type value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MeasuredValue", 1, value);
+            return DataModelLogger::LogValue("Type", 1, value);
         }
-        case IlluminanceMeasurement::Attributes::MinMeasuredValue::Id: {
+        case WindowCovering::Attributes::PhysicalClosedLimitLift::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("PhysicalClosedLimitLift", 1, value);
+        }
+        case WindowCovering::Attributes::PhysicalClosedLimitTilt::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("PhysicalClosedLimitTilt", 1, value);
+        }
+        case WindowCovering::Attributes::CurrentPositionLift::Id: {
             chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MinMeasuredValue", 1, value);
+            return DataModelLogger::LogValue("CurrentPositionLift", 1, value);
         }
-        case IlluminanceMeasurement::Attributes::MaxMeasuredValue::Id: {
+        case WindowCovering::Attributes::CurrentPositionTilt::Id: {
             chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MaxMeasuredValue", 1, value);
+            return DataModelLogger::LogValue("CurrentPositionTilt", 1, value);
         }
-        case IlluminanceMeasurement::Attributes::Tolerance::Id: {
+        case WindowCovering::Attributes::NumberOfActuationsLift::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Tolerance", 1, value);
+            return DataModelLogger::LogValue("NumberOfActuationsLift", 1, value);
         }
-        case IlluminanceMeasurement::Attributes::LightSensorType::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case WindowCovering::Attributes::NumberOfActuationsTilt::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LightSensorType", 1, value);
+            return DataModelLogger::LogValue("NumberOfActuationsTilt", 1, value);
         }
-        case IlluminanceMeasurement::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case WindowCovering::Attributes::ConfigStatus::Id: {
+            chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("ConfigStatus", 1, value);
         }
-        case IlluminanceMeasurement::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case WindowCovering::Attributes::CurrentPositionLiftPercentage::Id: {
+            chip::app::DataModel::Nullable<chip::Percent> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("CurrentPositionLiftPercentage", 1, value);
         }
-        case IlluminanceMeasurement::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case WindowCovering::Attributes::CurrentPositionTiltPercentage::Id: {
+            chip::app::DataModel::Nullable<chip::Percent> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("CurrentPositionTiltPercentage", 1, value);
         }
-        case IlluminanceMeasurement::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case WindowCovering::Attributes::OperationalStatus::Id: {
+            chip::BitMask<chip::app::Clusters::WindowCovering::OperationalStatus> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("OperationalStatus", 1, value);
         }
-        case IlluminanceMeasurement::Attributes::ClusterRevision::Id: {
+        case WindowCovering::Attributes::TargetPositionLiftPercent100ths::Id: {
+            chip::app::DataModel::Nullable<chip::Percent100ths> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("TargetPositionLiftPercent100ths", 1, value);
+        }
+        case WindowCovering::Attributes::TargetPositionTiltPercent100ths::Id: {
+            chip::app::DataModel::Nullable<chip::Percent100ths> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("TargetPositionTiltPercent100ths", 1, value);
+        }
+        case WindowCovering::Attributes::EndProductType::Id: {
+            chip::app::Clusters::WindowCovering::EndProductType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("EndProductType", 1, value);
+        }
+        case WindowCovering::Attributes::CurrentPositionLiftPercent100ths::Id: {
+            chip::app::DataModel::Nullable<chip::Percent100ths> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("CurrentPositionLiftPercent100ths", 1, value);
+        }
+        case WindowCovering::Attributes::CurrentPositionTiltPercent100ths::Id: {
+            chip::app::DataModel::Nullable<chip::Percent100ths> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("CurrentPositionTiltPercent100ths", 1, value);
+        }
+        case WindowCovering::Attributes::InstalledOpenLimitLift::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+            return DataModelLogger::LogValue("InstalledOpenLimitLift", 1, value);
         }
+        case WindowCovering::Attributes::InstalledClosedLimitLift::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("InstalledClosedLimitLift", 1, value);
         }
-        break;
-    }
-    case KeypadInput::Id: {
-        switch (path.mAttributeId)
-        {
-        case KeypadInput::Attributes::GeneratedCommandList::Id: {
+        case WindowCovering::Attributes::InstalledOpenLimitTilt::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("InstalledOpenLimitTilt", 1, value);
+        }
+        case WindowCovering::Attributes::InstalledClosedLimitTilt::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("InstalledClosedLimitTilt", 1, value);
+        }
+        case WindowCovering::Attributes::Mode::Id: {
+            chip::BitMask<chip::app::Clusters::WindowCovering::Mode> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("Mode", 1, value);
+        }
+        case WindowCovering::Attributes::SafetyStatus::Id: {
+            chip::BitMask<chip::app::Clusters::WindowCovering::SafetyStatus> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SafetyStatus", 1, value);
+        }
+        case WindowCovering::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case KeypadInput::Attributes::AcceptedCommandList::Id: {
+        case WindowCovering::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case KeypadInput::Attributes::AttributeList::Id: {
+        case WindowCovering::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case KeypadInput::Attributes::FeatureMap::Id: {
+        case WindowCovering::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case KeypadInput::Attributes::ClusterRevision::Id: {
+        case WindowCovering::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -6946,100 +7016,80 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case LevelControl::Id: {
+    case BarrierControl::Id: {
         switch (path.mAttributeId)
         {
-        case LevelControl::Attributes::CurrentLevel::Id: {
+        case BarrierControl::Attributes::BarrierMovingState::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("current level", 1, value);
+            return DataModelLogger::LogValue("barrier moving state", 1, value);
         }
-        case LevelControl::Attributes::RemainingTime::Id: {
+        case BarrierControl::Attributes::BarrierSafetyStatus::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("remaining time", 1, value);
-        }
-        case LevelControl::Attributes::MinLevel::Id: {
-            uint8_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("min level", 1, value);
+            return DataModelLogger::LogValue("barrier safety status", 1, value);
         }
-        case LevelControl::Attributes::MaxLevel::Id: {
+        case BarrierControl::Attributes::BarrierCapabilities::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("max level", 1, value);
+            return DataModelLogger::LogValue("barrier capabilities", 1, value);
         }
-        case LevelControl::Attributes::CurrentFrequency::Id: {
+        case BarrierControl::Attributes::BarrierOpenEvents::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("current frequency", 1, value);
+            return DataModelLogger::LogValue("barrier open events", 1, value);
         }
-        case LevelControl::Attributes::MinFrequency::Id: {
+        case BarrierControl::Attributes::BarrierCloseEvents::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("min frequency", 1, value);
+            return DataModelLogger::LogValue("barrier close events", 1, value);
         }
-        case LevelControl::Attributes::MaxFrequency::Id: {
+        case BarrierControl::Attributes::BarrierCommandOpenEvents::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("max frequency", 1, value);
-        }
-        case LevelControl::Attributes::Options::Id: {
-            uint8_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("options", 1, value);
+            return DataModelLogger::LogValue("barrier command open events", 1, value);
         }
-        case LevelControl::Attributes::OnOffTransitionTime::Id: {
+        case BarrierControl::Attributes::BarrierCommandCloseEvents::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("on off transition time", 1, value);
-        }
-        case LevelControl::Attributes::OnLevel::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("on level", 1, value);
-        }
-        case LevelControl::Attributes::OnTransitionTime::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("on transition time", 1, value);
+            return DataModelLogger::LogValue("barrier command close events", 1, value);
         }
-        case LevelControl::Attributes::OffTransitionTime::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case BarrierControl::Attributes::BarrierOpenPeriod::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("off transition time", 1, value);
+            return DataModelLogger::LogValue("barrier open period", 1, value);
         }
-        case LevelControl::Attributes::DefaultMoveRate::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case BarrierControl::Attributes::BarrierClosePeriod::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("default move rate", 1, value);
+            return DataModelLogger::LogValue("barrier close period", 1, value);
         }
-        case LevelControl::Attributes::StartUpCurrentLevel::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case BarrierControl::Attributes::BarrierPosition::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("start up current level", 1, value);
+            return DataModelLogger::LogValue("barrier position", 1, value);
         }
-        case LevelControl::Attributes::GeneratedCommandList::Id: {
+        case BarrierControl::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case LevelControl::Attributes::AcceptedCommandList::Id: {
+        case BarrierControl::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case LevelControl::Attributes::AttributeList::Id: {
+        case BarrierControl::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case LevelControl::Attributes::FeatureMap::Id: {
+        case BarrierControl::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case LevelControl::Attributes::ClusterRevision::Id: {
+        case BarrierControl::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -7047,112 +7097,145 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case LocalizationConfiguration::Id: {
+    case PumpConfigurationAndControl::Id: {
         switch (path.mAttributeId)
         {
-        case LocalizationConfiguration::Attributes::ActiveLocale::Id: {
-            chip::CharSpan value;
+        case PumpConfigurationAndControl::Attributes::MaxPressure::Id: {
+            chip::app::DataModel::Nullable<int16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActiveLocale", 1, value);
+            return DataModelLogger::LogValue("MaxPressure", 1, value);
         }
-        case LocalizationConfiguration::Attributes::SupportedLocales::Id: {
-            chip::app::DataModel::DecodableList<chip::CharSpan> value;
+        case PumpConfigurationAndControl::Attributes::MaxSpeed::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SupportedLocales", 1, value);
+            return DataModelLogger::LogValue("MaxSpeed", 1, value);
         }
-        case LocalizationConfiguration::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case PumpConfigurationAndControl::Attributes::MaxFlow::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("MaxFlow", 1, value);
         }
-        case LocalizationConfiguration::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case PumpConfigurationAndControl::Attributes::MinConstPressure::Id: {
+            chip::app::DataModel::Nullable<int16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("MinConstPressure", 1, value);
         }
-        case LocalizationConfiguration::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case PumpConfigurationAndControl::Attributes::MaxConstPressure::Id: {
+            chip::app::DataModel::Nullable<int16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("MaxConstPressure", 1, value);
         }
-        case LocalizationConfiguration::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case PumpConfigurationAndControl::Attributes::MinCompPressure::Id: {
+            chip::app::DataModel::Nullable<int16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("MinCompPressure", 1, value);
         }
-        case LocalizationConfiguration::Attributes::ClusterRevision::Id: {
-            uint16_t value;
+        case PumpConfigurationAndControl::Attributes::MaxCompPressure::Id: {
+            chip::app::DataModel::Nullable<int16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+            return DataModelLogger::LogValue("MaxCompPressure", 1, value);
         }
+        case PumpConfigurationAndControl::Attributes::MinConstSpeed::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("MinConstSpeed", 1, value);
         }
-        break;
-    }
-    case LowPower::Id: {
-        switch (path.mAttributeId)
-        {
-        case LowPower::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case PumpConfigurationAndControl::Attributes::MaxConstSpeed::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("MaxConstSpeed", 1, value);
         }
-        case LowPower::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case PumpConfigurationAndControl::Attributes::MinConstFlow::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("MinConstFlow", 1, value);
         }
-        case LowPower::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case PumpConfigurationAndControl::Attributes::MaxConstFlow::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("MaxConstFlow", 1, value);
         }
-        case LowPower::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case PumpConfigurationAndControl::Attributes::MinConstTemp::Id: {
+            chip::app::DataModel::Nullable<int16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("MinConstTemp", 1, value);
         }
-        case LowPower::Attributes::ClusterRevision::Id: {
-            uint16_t value;
+        case PumpConfigurationAndControl::Attributes::MaxConstTemp::Id: {
+            chip::app::DataModel::Nullable<int16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+            return DataModelLogger::LogValue("MaxConstTemp", 1, value);
         }
+        case PumpConfigurationAndControl::Attributes::PumpStatus::Id: {
+            chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("PumpStatus", 1, value);
         }
-        break;
-    }
-    case MediaInput::Id: {
-        switch (path.mAttributeId)
-        {
-        case MediaInput::Attributes::InputList::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::InputInfo::DecodableType> value;
+        case PumpConfigurationAndControl::Attributes::EffectiveOperationMode::Id: {
+            chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("InputList", 1, value);
+            return DataModelLogger::LogValue("EffectiveOperationMode", 1, value);
         }
-        case MediaInput::Attributes::CurrentInput::Id: {
-            uint8_t value;
+        case PumpConfigurationAndControl::Attributes::EffectiveControlMode::Id: {
+            chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentInput", 1, value);
+            return DataModelLogger::LogValue("EffectiveControlMode", 1, value);
         }
-        case MediaInput::Attributes::GeneratedCommandList::Id: {
+        case PumpConfigurationAndControl::Attributes::Capacity::Id: {
+            chip::app::DataModel::Nullable<int16_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("Capacity", 1, value);
+        }
+        case PumpConfigurationAndControl::Attributes::Speed::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("Speed", 1, value);
+        }
+        case PumpConfigurationAndControl::Attributes::LifetimeRunningHours::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("LifetimeRunningHours", 1, value);
+        }
+        case PumpConfigurationAndControl::Attributes::Power::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("Power", 1, value);
+        }
+        case PumpConfigurationAndControl::Attributes::LifetimeEnergyConsumed::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("LifetimeEnergyConsumed", 1, value);
+        }
+        case PumpConfigurationAndControl::Attributes::OperationMode::Id: {
+            chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("OperationMode", 1, value);
+        }
+        case PumpConfigurationAndControl::Attributes::ControlMode::Id: {
+            chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ControlMode", 1, value);
+        }
+        case PumpConfigurationAndControl::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case MediaInput::Attributes::AcceptedCommandList::Id: {
+        case PumpConfigurationAndControl::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case MediaInput::Attributes::AttributeList::Id: {
+        case PumpConfigurationAndControl::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case MediaInput::Attributes::FeatureMap::Id: {
+        case PumpConfigurationAndControl::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case MediaInput::Attributes::ClusterRevision::Id: {
+        case PumpConfigurationAndControl::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -7160,282 +7243,275 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case MediaPlayback::Id: {
+    case Thermostat::Id: {
         switch (path.mAttributeId)
         {
-        case MediaPlayback::Attributes::CurrentState::Id: {
-            chip::app::Clusters::MediaPlayback::PlaybackStateEnum value;
+        case Thermostat::Attributes::LocalTemperature::Id: {
+            chip::app::DataModel::Nullable<int16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentState", 1, value);
+            return DataModelLogger::LogValue("LocalTemperature", 1, value);
         }
-        case MediaPlayback::Attributes::StartTime::Id: {
-            chip::app::DataModel::Nullable<uint64_t> value;
+        case Thermostat::Attributes::OutdoorTemperature::Id: {
+            chip::app::DataModel::Nullable<int16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("StartTime", 1, value);
+            return DataModelLogger::LogValue("OutdoorTemperature", 1, value);
         }
-        case MediaPlayback::Attributes::Duration::Id: {
-            chip::app::DataModel::Nullable<uint64_t> value;
+        case Thermostat::Attributes::Occupancy::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Duration", 1, value);
+            return DataModelLogger::LogValue("Occupancy", 1, value);
         }
-        case MediaPlayback::Attributes::SampledPosition::Id: {
-            chip::app::DataModel::Nullable<chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::DecodableType> value;
+        case Thermostat::Attributes::AbsMinHeatSetpointLimit::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SampledPosition", 1, value);
+            return DataModelLogger::LogValue("AbsMinHeatSetpointLimit", 1, value);
         }
-        case MediaPlayback::Attributes::PlaybackSpeed::Id: {
-            float value;
+        case Thermostat::Attributes::AbsMaxHeatSetpointLimit::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PlaybackSpeed", 1, value);
+            return DataModelLogger::LogValue("AbsMaxHeatSetpointLimit", 1, value);
         }
-        case MediaPlayback::Attributes::SeekRangeEnd::Id: {
-            chip::app::DataModel::Nullable<uint64_t> value;
+        case Thermostat::Attributes::AbsMinCoolSetpointLimit::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SeekRangeEnd", 1, value);
+            return DataModelLogger::LogValue("AbsMinCoolSetpointLimit", 1, value);
         }
-        case MediaPlayback::Attributes::SeekRangeStart::Id: {
-            chip::app::DataModel::Nullable<uint64_t> value;
+        case Thermostat::Attributes::AbsMaxCoolSetpointLimit::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SeekRangeStart", 1, value);
+            return DataModelLogger::LogValue("AbsMaxCoolSetpointLimit", 1, value);
         }
-        case MediaPlayback::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case Thermostat::Attributes::PICoolingDemand::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("PICoolingDemand", 1, value);
         }
-        case MediaPlayback::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case Thermostat::Attributes::PIHeatingDemand::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("PIHeatingDemand", 1, value);
         }
-        case MediaPlayback::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case Thermostat::Attributes::HVACSystemTypeConfiguration::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("HVACSystemTypeConfiguration", 1, value);
         }
-        case MediaPlayback::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case Thermostat::Attributes::LocalTemperatureCalibration::Id: {
+            int8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("LocalTemperatureCalibration", 1, value);
         }
-        case MediaPlayback::Attributes::ClusterRevision::Id: {
-            uint16_t value;
+        case Thermostat::Attributes::OccupiedCoolingSetpoint::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
-        }
+            return DataModelLogger::LogValue("OccupiedCoolingSetpoint", 1, value);
         }
-        break;
-    }
-    case ModeSelect::Id: {
-        switch (path.mAttributeId)
-        {
-        case ModeSelect::Attributes::Description::Id: {
-            chip::CharSpan value;
+        case Thermostat::Attributes::OccupiedHeatingSetpoint::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Description", 1, value);
+            return DataModelLogger::LogValue("OccupiedHeatingSetpoint", 1, value);
         }
-        case ModeSelect::Attributes::StandardNamespace::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case Thermostat::Attributes::UnoccupiedCoolingSetpoint::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("StandardNamespace", 1, value);
+            return DataModelLogger::LogValue("UnoccupiedCoolingSetpoint", 1, value);
         }
-        case ModeSelect::Attributes::SupportedModes::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType> value;
+        case Thermostat::Attributes::UnoccupiedHeatingSetpoint::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SupportedModes", 1, value);
+            return DataModelLogger::LogValue("UnoccupiedHeatingSetpoint", 1, value);
         }
-        case ModeSelect::Attributes::CurrentMode::Id: {
-            uint8_t value;
+        case Thermostat::Attributes::MinHeatSetpointLimit::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentMode", 1, value);
+            return DataModelLogger::LogValue("MinHeatSetpointLimit", 1, value);
         }
-        case ModeSelect::Attributes::StartUpMode::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case Thermostat::Attributes::MaxHeatSetpointLimit::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("StartUpMode", 1, value);
+            return DataModelLogger::LogValue("MaxHeatSetpointLimit", 1, value);
         }
-        case ModeSelect::Attributes::OnMode::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case Thermostat::Attributes::MinCoolSetpointLimit::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OnMode", 1, value);
+            return DataModelLogger::LogValue("MinCoolSetpointLimit", 1, value);
         }
-        case ModeSelect::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case Thermostat::Attributes::MaxCoolSetpointLimit::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("MaxCoolSetpointLimit", 1, value);
         }
-        case ModeSelect::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case Thermostat::Attributes::MinSetpointDeadBand::Id: {
+            int8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("MinSetpointDeadBand", 1, value);
         }
-        case ModeSelect::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case Thermostat::Attributes::RemoteSensing::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("RemoteSensing", 1, value);
         }
-        case ModeSelect::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case Thermostat::Attributes::ControlSequenceOfOperation::Id: {
+            chip::app::Clusters::Thermostat::ThermostatControlSequence value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("ControlSequenceOfOperation", 1, value);
         }
-        case ModeSelect::Attributes::ClusterRevision::Id: {
-            uint16_t value;
+        case Thermostat::Attributes::SystemMode::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
-        }
+            return DataModelLogger::LogValue("SystemMode", 1, value);
         }
-        break;
-    }
-    case NetworkCommissioning::Id: {
-        switch (path.mAttributeId)
-        {
-        case NetworkCommissioning::Attributes::MaxNetworks::Id: {
+        case Thermostat::Attributes::ThermostatRunningMode::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MaxNetworks", 1, value);
+            return DataModelLogger::LogValue("ThermostatRunningMode", 1, value);
         }
-        case NetworkCommissioning::Attributes::Networks::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::DecodableType>
-                value;
+        case Thermostat::Attributes::StartOfWeek::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Networks", 1, value);
+            return DataModelLogger::LogValue("StartOfWeek", 1, value);
         }
-        case NetworkCommissioning::Attributes::ScanMaxTimeSeconds::Id: {
+        case Thermostat::Attributes::NumberOfWeeklyTransitions::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ScanMaxTimeSeconds", 1, value);
+            return DataModelLogger::LogValue("NumberOfWeeklyTransitions", 1, value);
         }
-        case NetworkCommissioning::Attributes::ConnectMaxTimeSeconds::Id: {
+        case Thermostat::Attributes::NumberOfDailyTransitions::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ConnectMaxTimeSeconds", 1, value);
+            return DataModelLogger::LogValue("NumberOfDailyTransitions", 1, value);
         }
-        case NetworkCommissioning::Attributes::InterfaceEnabled::Id: {
-            bool value;
+        case Thermostat::Attributes::TemperatureSetpointHold::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("InterfaceEnabled", 1, value);
+            return DataModelLogger::LogValue("TemperatureSetpointHold", 1, value);
         }
-        case NetworkCommissioning::Attributes::LastNetworkingStatus::Id: {
-            chip::app::DataModel::Nullable<chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatus> value;
+        case Thermostat::Attributes::TemperatureSetpointHoldDuration::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LastNetworkingStatus", 1, value);
+            return DataModelLogger::LogValue("TemperatureSetpointHoldDuration", 1, value);
         }
-        case NetworkCommissioning::Attributes::LastNetworkID::Id: {
-            chip::app::DataModel::Nullable<chip::ByteSpan> value;
+        case Thermostat::Attributes::ThermostatProgrammingOperationMode::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LastNetworkID", 1, value);
+            return DataModelLogger::LogValue("ThermostatProgrammingOperationMode", 1, value);
         }
-        case NetworkCommissioning::Attributes::LastConnectErrorValue::Id: {
-            chip::app::DataModel::Nullable<int32_t> value;
+        case Thermostat::Attributes::ThermostatRunningState::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LastConnectErrorValue", 1, value);
+            return DataModelLogger::LogValue("ThermostatRunningState", 1, value);
         }
-        case NetworkCommissioning::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case Thermostat::Attributes::SetpointChangeSource::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("SetpointChangeSource", 1, value);
         }
-        case NetworkCommissioning::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case Thermostat::Attributes::SetpointChangeAmount::Id: {
+            chip::app::DataModel::Nullable<int16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("SetpointChangeAmount", 1, value);
         }
-        case NetworkCommissioning::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case Thermostat::Attributes::SetpointChangeSourceTimestamp::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("SetpointChangeSourceTimestamp", 1, value);
         }
-        case NetworkCommissioning::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case Thermostat::Attributes::OccupiedSetback::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("OccupiedSetback", 1, value);
         }
-        case NetworkCommissioning::Attributes::ClusterRevision::Id: {
-            uint16_t value;
+        case Thermostat::Attributes::OccupiedSetbackMin::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+            return DataModelLogger::LogValue("OccupiedSetbackMin", 1, value);
         }
+        case Thermostat::Attributes::OccupiedSetbackMax::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("OccupiedSetbackMax", 1, value);
         }
-        break;
-    }
-    case OtaSoftwareUpdateProvider::Id: {
-        switch (path.mAttributeId)
-        {
-        case OtaSoftwareUpdateProvider::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case Thermostat::Attributes::UnoccupiedSetback::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("UnoccupiedSetback", 1, value);
         }
-        case OtaSoftwareUpdateProvider::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case Thermostat::Attributes::UnoccupiedSetbackMin::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("UnoccupiedSetbackMin", 1, value);
         }
-        case OtaSoftwareUpdateProvider::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case Thermostat::Attributes::UnoccupiedSetbackMax::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("UnoccupiedSetbackMax", 1, value);
         }
-        case OtaSoftwareUpdateProvider::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case Thermostat::Attributes::EmergencyHeatDelta::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("EmergencyHeatDelta", 1, value);
         }
-        case OtaSoftwareUpdateProvider::Attributes::ClusterRevision::Id: {
+        case Thermostat::Attributes::ACType::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ACType", 1, value);
+        }
+        case Thermostat::Attributes::ACCapacity::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+            return DataModelLogger::LogValue("ACCapacity", 1, value);
         }
+        case Thermostat::Attributes::ACRefrigerantType::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ACRefrigerantType", 1, value);
         }
-        break;
-    }
-    case OtaSoftwareUpdateRequestor::Id: {
-        switch (path.mAttributeId)
-        {
-        case OtaSoftwareUpdateRequestor::Attributes::DefaultOtaProviders::Id: {
-            chip::app::DataModel::DecodableList<
-                chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType>
-                value;
+        case Thermostat::Attributes::ACCompressorType::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("DefaultOtaProviders", 1, value);
+            return DataModelLogger::LogValue("ACCompressorType", 1, value);
         }
-        case OtaSoftwareUpdateRequestor::Attributes::UpdatePossible::Id: {
-            bool value;
+        case Thermostat::Attributes::ACErrorCode::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("UpdatePossible", 1, value);
+            return DataModelLogger::LogValue("ACErrorCode", 1, value);
         }
-        case OtaSoftwareUpdateRequestor::Attributes::UpdateState::Id: {
-            chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAUpdateStateEnum value;
+        case Thermostat::Attributes::ACLouverPosition::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("UpdateState", 1, value);
+            return DataModelLogger::LogValue("ACLouverPosition", 1, value);
         }
-        case OtaSoftwareUpdateRequestor::Attributes::UpdateStateProgress::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case Thermostat::Attributes::ACCoilTemperature::Id: {
+            chip::app::DataModel::Nullable<int16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("UpdateStateProgress", 1, value);
+            return DataModelLogger::LogValue("ACCoilTemperature", 1, value);
         }
-        case OtaSoftwareUpdateRequestor::Attributes::GeneratedCommandList::Id: {
+        case Thermostat::Attributes::ACCapacityformat::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ACCapacityformat", 1, value);
+        }
+        case Thermostat::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case OtaSoftwareUpdateRequestor::Attributes::AcceptedCommandList::Id: {
+        case Thermostat::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case OtaSoftwareUpdateRequestor::Attributes::AttributeList::Id: {
+        case Thermostat::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case OtaSoftwareUpdateRequestor::Attributes::FeatureMap::Id: {
+        case Thermostat::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case OtaSoftwareUpdateRequestor::Attributes::ClusterRevision::Id: {
+        case Thermostat::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -7443,90 +7519,85 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case OccupancySensing::Id: {
+    case FanControl::Id: {
         switch (path.mAttributeId)
         {
-        case OccupancySensing::Attributes::Occupancy::Id: {
-            uint8_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("occupancy", 1, value);
-        }
-        case OccupancySensing::Attributes::OccupancySensorType::Id: {
-            uint8_t value;
+        case FanControl::Attributes::FanMode::Id: {
+            chip::app::Clusters::FanControl::FanModeType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("occupancy sensor type", 1, value);
+            return DataModelLogger::LogValue("fan mode", 1, value);
         }
-        case OccupancySensing::Attributes::OccupancySensorTypeBitmap::Id: {
-            uint8_t value;
+        case FanControl::Attributes::FanModeSequence::Id: {
+            chip::app::Clusters::FanControl::FanModeSequenceType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("occupancy sensor type bitmap", 1, value);
+            return DataModelLogger::LogValue("fan mode sequence", 1, value);
         }
-        case OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::Id: {
-            uint16_t value;
+        case FanControl::Attributes::PercentSetting::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PIR occupied to unoccupied delay", 1, value);
+            return DataModelLogger::LogValue("percent setting", 1, value);
         }
-        case OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::Id: {
-            uint16_t value;
+        case FanControl::Attributes::PercentCurrent::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PIR unoccupied to occupied delay", 1, value);
+            return DataModelLogger::LogValue("percent current", 1, value);
         }
-        case OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::Id: {
+        case FanControl::Attributes::SpeedMax::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PIR unoccupied to occupied threshold", 1, value);
+            return DataModelLogger::LogValue("speed max", 1, value);
         }
-        case OccupancySensing::Attributes::UltrasonicOccupiedToUnoccupiedDelay::Id: {
-            uint16_t value;
+        case FanControl::Attributes::SpeedSetting::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ultrasonic occupied to unoccupied delay", 1, value);
+            return DataModelLogger::LogValue("speed setting", 1, value);
         }
-        case OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedDelay::Id: {
-            uint16_t value;
+        case FanControl::Attributes::SpeedCurrent::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ultrasonic unoccupied to occupied delay", 1, value);
+            return DataModelLogger::LogValue("speed current", 1, value);
         }
-        case OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedThreshold::Id: {
+        case FanControl::Attributes::RockSupport::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ultrasonic unoccupied to occupied threshold", 1, value);
+            return DataModelLogger::LogValue("rock support", 1, value);
         }
-        case OccupancySensing::Attributes::PhysicalContactOccupiedToUnoccupiedDelay::Id: {
-            uint16_t value;
+        case FanControl::Attributes::RockSetting::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("physical contact occupied to unoccupied delay", 1, value);
+            return DataModelLogger::LogValue("rock setting", 1, value);
         }
-        case OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedDelay::Id: {
-            uint16_t value;
+        case FanControl::Attributes::WindSupport::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("physical contact unoccupied to occupied delay", 1, value);
+            return DataModelLogger::LogValue("wind support", 1, value);
         }
-        case OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::Id: {
+        case FanControl::Attributes::WindSetting::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("physical contact unoccupied to occupied threshold", 1, value);
+            return DataModelLogger::LogValue("wind setting", 1, value);
         }
-        case OccupancySensing::Attributes::GeneratedCommandList::Id: {
+        case FanControl::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case OccupancySensing::Attributes::AcceptedCommandList::Id: {
+        case FanControl::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case OccupancySensing::Attributes::AttributeList::Id: {
+        case FanControl::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case OccupancySensing::Attributes::FeatureMap::Id: {
+        case FanControl::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case OccupancySensing::Attributes::ClusterRevision::Id: {
+        case FanControl::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -7534,55 +7605,45 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case OnOff::Id: {
+    case ThermostatUserInterfaceConfiguration::Id: {
         switch (path.mAttributeId)
         {
-        case OnOff::Attributes::OnOff::Id: {
-            bool value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OnOff", 1, value);
-        }
-        case OnOff::Attributes::GlobalSceneControl::Id: {
-            bool value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GlobalSceneControl", 1, value);
-        }
-        case OnOff::Attributes::OnTime::Id: {
-            uint16_t value;
+        case ThermostatUserInterfaceConfiguration::Attributes::TemperatureDisplayMode::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OnTime", 1, value);
+            return DataModelLogger::LogValue("temperature display mode", 1, value);
         }
-        case OnOff::Attributes::OffWaitTime::Id: {
-            uint16_t value;
+        case ThermostatUserInterfaceConfiguration::Attributes::KeypadLockout::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OffWaitTime", 1, value);
+            return DataModelLogger::LogValue("keypad lockout", 1, value);
         }
-        case OnOff::Attributes::StartUpOnOff::Id: {
-            chip::app::DataModel::Nullable<chip::app::Clusters::OnOff::OnOffStartUpOnOff> value;
+        case ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("StartUpOnOff", 1, value);
+            return DataModelLogger::LogValue("schedule programming visibility", 1, value);
         }
-        case OnOff::Attributes::GeneratedCommandList::Id: {
+        case ThermostatUserInterfaceConfiguration::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case OnOff::Attributes::AcceptedCommandList::Id: {
+        case ThermostatUserInterfaceConfiguration::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case OnOff::Attributes::AttributeList::Id: {
+        case ThermostatUserInterfaceConfiguration::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case OnOff::Attributes::FeatureMap::Id: {
+        case ThermostatUserInterfaceConfiguration::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case OnOff::Attributes::ClusterRevision::Id: {
+        case ThermostatUserInterfaceConfiguration::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -7590,290 +7651,346 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case OnOffSwitchConfiguration::Id: {
+    case ColorControl::Id: {
         switch (path.mAttributeId)
         {
-        case OnOffSwitchConfiguration::Attributes::SwitchType::Id: {
+        case ColorControl::Attributes::CurrentHue::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("switch type", 1, value);
+            return DataModelLogger::LogValue("CurrentHue", 1, value);
         }
-        case OnOffSwitchConfiguration::Attributes::SwitchActions::Id: {
+        case ColorControl::Attributes::CurrentSaturation::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("switch actions", 1, value);
+            return DataModelLogger::LogValue("CurrentSaturation", 1, value);
         }
-        case OnOffSwitchConfiguration::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case ColorControl::Attributes::RemainingTime::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("RemainingTime", 1, value);
         }
-        case OnOffSwitchConfiguration::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
-        }
-        case OnOffSwitchConfiguration::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
-        }
-        case OnOffSwitchConfiguration::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case ColorControl::Attributes::CurrentX::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("CurrentX", 1, value);
         }
-        case OnOffSwitchConfiguration::Attributes::ClusterRevision::Id: {
+        case ColorControl::Attributes::CurrentY::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
-        }
+            return DataModelLogger::LogValue("CurrentY", 1, value);
         }
-        break;
-    }
-    case OperationalCredentials::Id: {
-        switch (path.mAttributeId)
-        {
-        case OperationalCredentials::Attributes::NOCs::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::DecodableType>
-                value;
+        case ColorControl::Attributes::DriftCompensation::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NOCs", 1, value);
+            return DataModelLogger::LogValue("DriftCompensation", 1, value);
         }
-        case OperationalCredentials::Attributes::Fabrics::Id: {
-            chip::app::DataModel::DecodableList<
-                chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType>
-                value;
+        case ColorControl::Attributes::CompensationText::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Fabrics", 1, value);
+            return DataModelLogger::LogValue("CompensationText", 1, value);
         }
-        case OperationalCredentials::Attributes::SupportedFabrics::Id: {
-            uint8_t value;
+        case ColorControl::Attributes::ColorTemperature::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SupportedFabrics", 1, value);
+            return DataModelLogger::LogValue("ColorTemperature", 1, value);
         }
-        case OperationalCredentials::Attributes::CommissionedFabrics::Id: {
+        case ColorControl::Attributes::ColorMode::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CommissionedFabrics", 1, value);
+            return DataModelLogger::LogValue("ColorMode", 1, value);
         }
-        case OperationalCredentials::Attributes::TrustedRootCertificates::Id: {
-            chip::app::DataModel::DecodableList<chip::ByteSpan> value;
+        case ColorControl::Attributes::Options::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TrustedRootCertificates", 1, value);
+            return DataModelLogger::LogValue("Options", 1, value);
         }
-        case OperationalCredentials::Attributes::CurrentFabricIndex::Id: {
-            chip::FabricIndex value;
+        case ColorControl::Attributes::NumberOfPrimaries::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentFabricIndex", 1, value);
+            return DataModelLogger::LogValue("NumberOfPrimaries", 1, value);
         }
-        case OperationalCredentials::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case ColorControl::Attributes::Primary1X::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("Primary1X", 1, value);
         }
-        case OperationalCredentials::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case ColorControl::Attributes::Primary1Y::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("Primary1Y", 1, value);
         }
-        case OperationalCredentials::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case ColorControl::Attributes::Primary1Intensity::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("Primary1Intensity", 1, value);
         }
-        case OperationalCredentials::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case ColorControl::Attributes::Primary2X::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("Primary2X", 1, value);
         }
-        case OperationalCredentials::Attributes::ClusterRevision::Id: {
+        case ColorControl::Attributes::Primary2Y::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
-        }
+            return DataModelLogger::LogValue("Primary2Y", 1, value);
         }
-        break;
-    }
-    case PowerSource::Id: {
-        switch (path.mAttributeId)
-        {
-        case PowerSource::Attributes::Status::Id: {
-            uint8_t value;
+        case ColorControl::Attributes::Primary2Intensity::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Status", 1, value);
+            return DataModelLogger::LogValue("Primary2Intensity", 1, value);
         }
-        case PowerSource::Attributes::Order::Id: {
-            uint8_t value;
+        case ColorControl::Attributes::Primary3X::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Order", 1, value);
+            return DataModelLogger::LogValue("Primary3X", 1, value);
         }
-        case PowerSource::Attributes::Description::Id: {
-            chip::CharSpan value;
+        case ColorControl::Attributes::Primary3Y::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Description", 1, value);
+            return DataModelLogger::LogValue("Primary3Y", 1, value);
         }
-        case PowerSource::Attributes::WiredAssessedInputVoltage::Id: {
-            uint32_t value;
+        case ColorControl::Attributes::Primary3Intensity::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("WiredAssessedInputVoltage", 1, value);
+            return DataModelLogger::LogValue("Primary3Intensity", 1, value);
         }
-        case PowerSource::Attributes::WiredAssessedInputFrequency::Id: {
+        case ColorControl::Attributes::Primary4X::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("WiredAssessedInputFrequency", 1, value);
+            return DataModelLogger::LogValue("Primary4X", 1, value);
         }
-        case PowerSource::Attributes::WiredCurrentType::Id: {
-            uint8_t value;
+        case ColorControl::Attributes::Primary4Y::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("WiredCurrentType", 1, value);
+            return DataModelLogger::LogValue("Primary4Y", 1, value);
         }
-        case PowerSource::Attributes::WiredAssessedCurrent::Id: {
-            uint32_t value;
+        case ColorControl::Attributes::Primary4Intensity::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("WiredAssessedCurrent", 1, value);
+            return DataModelLogger::LogValue("Primary4Intensity", 1, value);
         }
-        case PowerSource::Attributes::WiredNominalVoltage::Id: {
-            uint32_t value;
+        case ColorControl::Attributes::Primary5X::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("WiredNominalVoltage", 1, value);
+            return DataModelLogger::LogValue("Primary5X", 1, value);
         }
-        case PowerSource::Attributes::WiredMaximumCurrent::Id: {
-            uint32_t value;
+        case ColorControl::Attributes::Primary5Y::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("WiredMaximumCurrent", 1, value);
+            return DataModelLogger::LogValue("Primary5Y", 1, value);
         }
-        case PowerSource::Attributes::WiredPresent::Id: {
-            bool value;
+        case ColorControl::Attributes::Primary5Intensity::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("WiredPresent", 1, value);
+            return DataModelLogger::LogValue("Primary5Intensity", 1, value);
         }
-        case PowerSource::Attributes::ActiveWiredFaults::Id: {
-            chip::app::DataModel::DecodableList<uint8_t> value;
+        case ColorControl::Attributes::Primary6X::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActiveWiredFaults", 1, value);
+            return DataModelLogger::LogValue("Primary6X", 1, value);
         }
-        case PowerSource::Attributes::BatteryVoltage::Id: {
-            uint32_t value;
+        case ColorControl::Attributes::Primary6Y::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatteryVoltage", 1, value);
+            return DataModelLogger::LogValue("Primary6Y", 1, value);
         }
-        case PowerSource::Attributes::BatteryPercentRemaining::Id: {
-            uint8_t value;
+        case ColorControl::Attributes::Primary6Intensity::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatteryPercentRemaining", 1, value);
+            return DataModelLogger::LogValue("Primary6Intensity", 1, value);
         }
-        case PowerSource::Attributes::BatteryTimeRemaining::Id: {
-            uint32_t value;
+        case ColorControl::Attributes::WhitePointX::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatteryTimeRemaining", 1, value);
+            return DataModelLogger::LogValue("WhitePointX", 1, value);
         }
-        case PowerSource::Attributes::BatteryChargeLevel::Id: {
-            uint8_t value;
+        case ColorControl::Attributes::WhitePointY::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatteryChargeLevel", 1, value);
+            return DataModelLogger::LogValue("WhitePointY", 1, value);
         }
-        case PowerSource::Attributes::BatteryReplacementNeeded::Id: {
-            bool value;
+        case ColorControl::Attributes::ColorPointRX::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatteryReplacementNeeded", 1, value);
+            return DataModelLogger::LogValue("ColorPointRX", 1, value);
         }
-        case PowerSource::Attributes::BatteryReplaceability::Id: {
-            uint8_t value;
+        case ColorControl::Attributes::ColorPointRY::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatteryReplaceability", 1, value);
+            return DataModelLogger::LogValue("ColorPointRY", 1, value);
         }
-        case PowerSource::Attributes::BatteryPresent::Id: {
-            bool value;
+        case ColorControl::Attributes::ColorPointRIntensity::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatteryPresent", 1, value);
+            return DataModelLogger::LogValue("ColorPointRIntensity", 1, value);
         }
-        case PowerSource::Attributes::ActiveBatteryFaults::Id: {
-            chip::app::DataModel::DecodableList<uint8_t> value;
+        case ColorControl::Attributes::ColorPointGX::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActiveBatteryFaults", 1, value);
+            return DataModelLogger::LogValue("ColorPointGX", 1, value);
         }
-        case PowerSource::Attributes::BatteryReplacementDescription::Id: {
-            chip::CharSpan value;
+        case ColorControl::Attributes::ColorPointGY::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatteryReplacementDescription", 1, value);
+            return DataModelLogger::LogValue("ColorPointGY", 1, value);
         }
-        case PowerSource::Attributes::BatteryCommonDesignation::Id: {
-            uint32_t value;
+        case ColorControl::Attributes::ColorPointGIntensity::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatteryCommonDesignation", 1, value);
+            return DataModelLogger::LogValue("ColorPointGIntensity", 1, value);
         }
-        case PowerSource::Attributes::BatteryANSIDesignation::Id: {
-            chip::CharSpan value;
+        case ColorControl::Attributes::ColorPointBX::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatteryANSIDesignation", 1, value);
+            return DataModelLogger::LogValue("ColorPointBX", 1, value);
         }
-        case PowerSource::Attributes::BatteryIECDesignation::Id: {
-            chip::CharSpan value;
+        case ColorControl::Attributes::ColorPointBY::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatteryIECDesignation", 1, value);
+            return DataModelLogger::LogValue("ColorPointBY", 1, value);
         }
-        case PowerSource::Attributes::BatteryApprovedChemistry::Id: {
-            uint32_t value;
+        case ColorControl::Attributes::ColorPointBIntensity::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatteryApprovedChemistry", 1, value);
+            return DataModelLogger::LogValue("ColorPointBIntensity", 1, value);
         }
-        case PowerSource::Attributes::BatteryCapacity::Id: {
-            uint32_t value;
+        case ColorControl::Attributes::EnhancedCurrentHue::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatteryCapacity", 1, value);
+            return DataModelLogger::LogValue("EnhancedCurrentHue", 1, value);
         }
-        case PowerSource::Attributes::BatteryQuantity::Id: {
+        case ColorControl::Attributes::EnhancedColorMode::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatteryQuantity", 1, value);
+            return DataModelLogger::LogValue("EnhancedColorMode", 1, value);
         }
-        case PowerSource::Attributes::BatteryChargeState::Id: {
+        case ColorControl::Attributes::ColorLoopActive::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatteryChargeState", 1, value);
+            return DataModelLogger::LogValue("ColorLoopActive", 1, value);
         }
-        case PowerSource::Attributes::BatteryTimeToFullCharge::Id: {
-            uint32_t value;
+        case ColorControl::Attributes::ColorLoopDirection::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatteryTimeToFullCharge", 1, value);
+            return DataModelLogger::LogValue("ColorLoopDirection", 1, value);
         }
-        case PowerSource::Attributes::BatteryFunctionalWhileCharging::Id: {
-            bool value;
+        case ColorControl::Attributes::ColorLoopTime::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatteryFunctionalWhileCharging", 1, value);
+            return DataModelLogger::LogValue("ColorLoopTime", 1, value);
         }
-        case PowerSource::Attributes::BatteryChargingCurrent::Id: {
+        case ColorControl::Attributes::ColorLoopStartEnhancedHue::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ColorLoopStartEnhancedHue", 1, value);
+        }
+        case ColorControl::Attributes::ColorLoopStoredEnhancedHue::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ColorLoopStoredEnhancedHue", 1, value);
+        }
+        case ColorControl::Attributes::ColorCapabilities::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ColorCapabilities", 1, value);
+        }
+        case ColorControl::Attributes::ColorTempPhysicalMinMireds::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ColorTempPhysicalMinMireds", 1, value);
+        }
+        case ColorControl::Attributes::ColorTempPhysicalMaxMireds::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ColorTempPhysicalMaxMireds", 1, value);
+        }
+        case ColorControl::Attributes::CoupleColorTempToLevelMinMireds::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("CoupleColorTempToLevelMinMireds", 1, value);
+        }
+        case ColorControl::Attributes::StartUpColorTemperatureMireds::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("StartUpColorTemperatureMireds", 1, value);
+        }
+        case ColorControl::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+        }
+        case ColorControl::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+        }
+        case ColorControl::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AttributeList", 1, value);
+        }
+        case ColorControl::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BatteryChargingCurrent", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case PowerSource::Attributes::ActiveBatteryChargeFaults::Id: {
-            chip::app::DataModel::DecodableList<uint8_t> value;
+        case ColorControl::Attributes::ClusterRevision::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActiveBatteryChargeFaults", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case PowerSource::Attributes::GeneratedCommandList::Id: {
+        }
+        break;
+    }
+    case IlluminanceMeasurement::Id: {
+        switch (path.mAttributeId)
+        {
+        case IlluminanceMeasurement::Attributes::MeasuredValue::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("MeasuredValue", 1, value);
+        }
+        case IlluminanceMeasurement::Attributes::MinMeasuredValue::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("MinMeasuredValue", 1, value);
+        }
+        case IlluminanceMeasurement::Attributes::MaxMeasuredValue::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("MaxMeasuredValue", 1, value);
+        }
+        case IlluminanceMeasurement::Attributes::Tolerance::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("Tolerance", 1, value);
+        }
+        case IlluminanceMeasurement::Attributes::LightSensorType::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("LightSensorType", 1, value);
+        }
+        case IlluminanceMeasurement::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case PowerSource::Attributes::AcceptedCommandList::Id: {
+        case IlluminanceMeasurement::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case PowerSource::Attributes::AttributeList::Id: {
+        case IlluminanceMeasurement::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case PowerSource::Attributes::FeatureMap::Id: {
+        case IlluminanceMeasurement::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case PowerSource::Attributes::ClusterRevision::Id: {
+        case IlluminanceMeasurement::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -7881,35 +7998,50 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case PowerSourceConfiguration::Id: {
+    case TemperatureMeasurement::Id: {
         switch (path.mAttributeId)
         {
-        case PowerSourceConfiguration::Attributes::Sources::Id: {
-            chip::app::DataModel::DecodableList<uint8_t> value;
+        case TemperatureMeasurement::Attributes::MeasuredValue::Id: {
+            chip::app::DataModel::Nullable<int16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Sources", 1, value);
+            return DataModelLogger::LogValue("MeasuredValue", 1, value);
         }
-        case PowerSourceConfiguration::Attributes::GeneratedCommandList::Id: {
+        case TemperatureMeasurement::Attributes::MinMeasuredValue::Id: {
+            chip::app::DataModel::Nullable<int16_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("MinMeasuredValue", 1, value);
+        }
+        case TemperatureMeasurement::Attributes::MaxMeasuredValue::Id: {
+            chip::app::DataModel::Nullable<int16_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("MaxMeasuredValue", 1, value);
+        }
+        case TemperatureMeasurement::Attributes::Tolerance::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("Tolerance", 1, value);
+        }
+        case TemperatureMeasurement::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case PowerSourceConfiguration::Attributes::AcceptedCommandList::Id: {
+        case TemperatureMeasurement::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case PowerSourceConfiguration::Attributes::AttributeList::Id: {
+        case TemperatureMeasurement::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case PowerSourceConfiguration::Attributes::FeatureMap::Id: {
+        case TemperatureMeasurement::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case PowerSourceConfiguration::Attributes::ClusterRevision::Id: {
+        case TemperatureMeasurement::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -7993,257 +8125,192 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case PumpConfigurationAndControl::Id: {
+    case FlowMeasurement::Id: {
         switch (path.mAttributeId)
         {
-        case PumpConfigurationAndControl::Attributes::MaxPressure::Id: {
-            chip::app::DataModel::Nullable<int16_t> value;
+        case FlowMeasurement::Attributes::MeasuredValue::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MaxPressure", 1, value);
+            return DataModelLogger::LogValue("MeasuredValue", 1, value);
         }
-        case PumpConfigurationAndControl::Attributes::MaxSpeed::Id: {
+        case FlowMeasurement::Attributes::MinMeasuredValue::Id: {
             chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MaxSpeed", 1, value);
+            return DataModelLogger::LogValue("MinMeasuredValue", 1, value);
         }
-        case PumpConfigurationAndControl::Attributes::MaxFlow::Id: {
+        case FlowMeasurement::Attributes::MaxMeasuredValue::Id: {
             chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MaxFlow", 1, value);
+            return DataModelLogger::LogValue("MaxMeasuredValue", 1, value);
         }
-        case PumpConfigurationAndControl::Attributes::MinConstPressure::Id: {
-            chip::app::DataModel::Nullable<int16_t> value;
+        case FlowMeasurement::Attributes::Tolerance::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MinConstPressure", 1, value);
+            return DataModelLogger::LogValue("Tolerance", 1, value);
         }
-        case PumpConfigurationAndControl::Attributes::MaxConstPressure::Id: {
-            chip::app::DataModel::Nullable<int16_t> value;
+        case FlowMeasurement::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MaxConstPressure", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case PumpConfigurationAndControl::Attributes::MinCompPressure::Id: {
-            chip::app::DataModel::Nullable<int16_t> value;
+        case FlowMeasurement::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MinCompPressure", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case PumpConfigurationAndControl::Attributes::MaxCompPressure::Id: {
-            chip::app::DataModel::Nullable<int16_t> value;
+        case FlowMeasurement::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MaxCompPressure", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case PumpConfigurationAndControl::Attributes::MinConstSpeed::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case FlowMeasurement::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MinConstSpeed", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case PumpConfigurationAndControl::Attributes::MaxConstSpeed::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case FlowMeasurement::Attributes::ClusterRevision::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MaxConstSpeed", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case PumpConfigurationAndControl::Attributes::MinConstFlow::Id: {
+        }
+        break;
+    }
+    case RelativeHumidityMeasurement::Id: {
+        switch (path.mAttributeId)
+        {
+        case RelativeHumidityMeasurement::Attributes::MeasuredValue::Id: {
             chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MinConstFlow", 1, value);
+            return DataModelLogger::LogValue("measured value", 1, value);
         }
-        case PumpConfigurationAndControl::Attributes::MaxConstFlow::Id: {
+        case RelativeHumidityMeasurement::Attributes::MinMeasuredValue::Id: {
             chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MaxConstFlow", 1, value);
+            return DataModelLogger::LogValue("min measured value", 1, value);
         }
-        case PumpConfigurationAndControl::Attributes::MinConstTemp::Id: {
-            chip::app::DataModel::Nullable<int16_t> value;
+        case RelativeHumidityMeasurement::Attributes::MaxMeasuredValue::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MinConstTemp", 1, value);
+            return DataModelLogger::LogValue("max measured value", 1, value);
         }
-        case PumpConfigurationAndControl::Attributes::MaxConstTemp::Id: {
-            chip::app::DataModel::Nullable<int16_t> value;
+        case RelativeHumidityMeasurement::Attributes::Tolerance::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MaxConstTemp", 1, value);
+            return DataModelLogger::LogValue("tolerance", 1, value);
         }
-        case PumpConfigurationAndControl::Attributes::PumpStatus::Id: {
-            chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatus> value;
+        case RelativeHumidityMeasurement::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PumpStatus", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case PumpConfigurationAndControl::Attributes::EffectiveOperationMode::Id: {
-            chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value;
+        case RelativeHumidityMeasurement::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EffectiveOperationMode", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case PumpConfigurationAndControl::Attributes::EffectiveControlMode::Id: {
-            chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value;
+        case RelativeHumidityMeasurement::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EffectiveControlMode", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case PumpConfigurationAndControl::Attributes::Capacity::Id: {
-            chip::app::DataModel::Nullable<int16_t> value;
+        case RelativeHumidityMeasurement::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Capacity", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case PumpConfigurationAndControl::Attributes::Speed::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case RelativeHumidityMeasurement::Attributes::ClusterRevision::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Speed", 1, value);
-        }
-        case PumpConfigurationAndControl::Attributes::LifetimeRunningHours::Id: {
-            chip::app::DataModel::Nullable<uint32_t> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LifetimeRunningHours", 1, value);
-        }
-        case PumpConfigurationAndControl::Attributes::Power::Id: {
-            chip::app::DataModel::Nullable<uint32_t> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Power", 1, value);
-        }
-        case PumpConfigurationAndControl::Attributes::LifetimeEnergyConsumed::Id: {
-            chip::app::DataModel::Nullable<uint32_t> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LifetimeEnergyConsumed", 1, value);
-        }
-        case PumpConfigurationAndControl::Attributes::OperationMode::Id: {
-            chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OperationMode", 1, value);
-        }
-        case PumpConfigurationAndControl::Attributes::ControlMode::Id: {
-            chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ControlMode", 1, value);
-        }
-        case PumpConfigurationAndControl::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
-        }
-        case PumpConfigurationAndControl::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
-        }
-        case PumpConfigurationAndControl::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
-        }
-        case PumpConfigurationAndControl::Attributes::FeatureMap::Id: {
-            uint32_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
-        }
-        case PumpConfigurationAndControl::Attributes::ClusterRevision::Id: {
-            uint16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
         }
         break;
     }
-    case RelativeHumidityMeasurement::Id: {
+    case OccupancySensing::Id: {
         switch (path.mAttributeId)
         {
-        case RelativeHumidityMeasurement::Attributes::MeasuredValue::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case OccupancySensing::Attributes::Occupancy::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("measured value", 1, value);
+            return DataModelLogger::LogValue("occupancy", 1, value);
         }
-        case RelativeHumidityMeasurement::Attributes::MinMeasuredValue::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case OccupancySensing::Attributes::OccupancySensorType::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("min measured value", 1, value);
+            return DataModelLogger::LogValue("occupancy sensor type", 1, value);
         }
-        case RelativeHumidityMeasurement::Attributes::MaxMeasuredValue::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case OccupancySensing::Attributes::OccupancySensorTypeBitmap::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("max measured value", 1, value);
+            return DataModelLogger::LogValue("occupancy sensor type bitmap", 1, value);
         }
-        case RelativeHumidityMeasurement::Attributes::Tolerance::Id: {
+        case OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("tolerance", 1, value);
-        }
-        case RelativeHumidityMeasurement::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
-        }
-        case RelativeHumidityMeasurement::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("PIR occupied to unoccupied delay", 1, value);
         }
-        case RelativeHumidityMeasurement::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("PIR unoccupied to occupied delay", 1, value);
         }
-        case RelativeHumidityMeasurement::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("PIR unoccupied to occupied threshold", 1, value);
         }
-        case RelativeHumidityMeasurement::Attributes::ClusterRevision::Id: {
+        case OccupancySensing::Attributes::UltrasonicOccupiedToUnoccupiedDelay::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
-        }
+            return DataModelLogger::LogValue("ultrasonic occupied to unoccupied delay", 1, value);
         }
-        break;
-    }
-    case Scenes::Id: {
-        switch (path.mAttributeId)
-        {
-        case Scenes::Attributes::SceneCount::Id: {
-            uint8_t value;
+        case OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedDelay::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SceneCount", 1, value);
+            return DataModelLogger::LogValue("ultrasonic unoccupied to occupied delay", 1, value);
         }
-        case Scenes::Attributes::CurrentScene::Id: {
+        case OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedThreshold::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentScene", 1, value);
+            return DataModelLogger::LogValue("ultrasonic unoccupied to occupied threshold", 1, value);
         }
-        case Scenes::Attributes::CurrentGroup::Id: {
-            chip::GroupId value;
+        case OccupancySensing::Attributes::PhysicalContactOccupiedToUnoccupiedDelay::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentGroup", 1, value);
+            return DataModelLogger::LogValue("physical contact occupied to unoccupied delay", 1, value);
         }
-        case Scenes::Attributes::SceneValid::Id: {
-            bool value;
+        case OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedDelay::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SceneValid", 1, value);
+            return DataModelLogger::LogValue("physical contact unoccupied to occupied delay", 1, value);
         }
-        case Scenes::Attributes::NameSupport::Id: {
+        case OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NameSupport", 1, value);
-        }
-        case Scenes::Attributes::LastConfiguredBy::Id: {
-            chip::app::DataModel::Nullable<chip::NodeId> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LastConfiguredBy", 1, value);
+            return DataModelLogger::LogValue("physical contact unoccupied to occupied threshold", 1, value);
         }
-        case Scenes::Attributes::GeneratedCommandList::Id: {
+        case OccupancySensing::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case Scenes::Attributes::AcceptedCommandList::Id: {
+        case OccupancySensing::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case Scenes::Attributes::AttributeList::Id: {
+        case OccupancySensing::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case Scenes::Attributes::FeatureMap::Id: {
+        case OccupancySensing::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case Scenes::Attributes::ClusterRevision::Id: {
+        case OccupancySensing::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -8251,51 +8318,35 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case SoftwareDiagnostics::Id: {
+    case WakeOnLan::Id: {
         switch (path.mAttributeId)
         {
-        case SoftwareDiagnostics::Attributes::ThreadMetrics::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType>
-                value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ThreadMetrics", 1, value);
-        }
-        case SoftwareDiagnostics::Attributes::CurrentHeapFree::Id: {
-            uint64_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentHeapFree", 1, value);
-        }
-        case SoftwareDiagnostics::Attributes::CurrentHeapUsed::Id: {
-            uint64_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentHeapUsed", 1, value);
-        }
-        case SoftwareDiagnostics::Attributes::CurrentHeapHighWatermark::Id: {
-            uint64_t value;
+        case WakeOnLan::Attributes::MACAddress::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentHeapHighWatermark", 1, value);
+            return DataModelLogger::LogValue("MACAddress", 1, value);
         }
-        case SoftwareDiagnostics::Attributes::GeneratedCommandList::Id: {
+        case WakeOnLan::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case SoftwareDiagnostics::Attributes::AcceptedCommandList::Id: {
+        case WakeOnLan::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case SoftwareDiagnostics::Attributes::AttributeList::Id: {
+        case WakeOnLan::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case SoftwareDiagnostics::Attributes::FeatureMap::Id: {
+        case WakeOnLan::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case SoftwareDiagnostics::Attributes::ClusterRevision::Id: {
+        case WakeOnLan::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -8303,45 +8354,45 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case Switch::Id: {
+    case Channel::Id: {
         switch (path.mAttributeId)
         {
-        case Switch::Attributes::NumberOfPositions::Id: {
-            uint8_t value;
+        case Channel::Attributes::ChannelList::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("number of positions", 1, value);
+            return DataModelLogger::LogValue("ChannelList", 1, value);
         }
-        case Switch::Attributes::CurrentPosition::Id: {
-            uint8_t value;
+        case Channel::Attributes::Lineup::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::LineupInfo::DecodableType> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("current position", 1, value);
+            return DataModelLogger::LogValue("Lineup", 1, value);
         }
-        case Switch::Attributes::MultiPressMax::Id: {
-            uint8_t value;
+        case Channel::Attributes::CurrentChannel::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("multi press max", 1, value);
+            return DataModelLogger::LogValue("CurrentChannel", 1, value);
         }
-        case Switch::Attributes::GeneratedCommandList::Id: {
+        case Channel::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case Switch::Attributes::AcceptedCommandList::Id: {
+        case Channel::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case Switch::Attributes::AttributeList::Id: {
+        case Channel::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case Switch::Attributes::FeatureMap::Id: {
+        case Channel::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case Switch::Attributes::ClusterRevision::Id: {
+        case Channel::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -8390,50 +8441,65 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case TemperatureMeasurement::Id: {
+    case MediaPlayback::Id: {
         switch (path.mAttributeId)
         {
-        case TemperatureMeasurement::Attributes::MeasuredValue::Id: {
-            chip::app::DataModel::Nullable<int16_t> value;
+        case MediaPlayback::Attributes::CurrentState::Id: {
+            chip::app::Clusters::MediaPlayback::PlaybackStateEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MeasuredValue", 1, value);
+            return DataModelLogger::LogValue("CurrentState", 1, value);
         }
-        case TemperatureMeasurement::Attributes::MinMeasuredValue::Id: {
-            chip::app::DataModel::Nullable<int16_t> value;
+        case MediaPlayback::Attributes::StartTime::Id: {
+            chip::app::DataModel::Nullable<uint64_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MinMeasuredValue", 1, value);
+            return DataModelLogger::LogValue("StartTime", 1, value);
         }
-        case TemperatureMeasurement::Attributes::MaxMeasuredValue::Id: {
-            chip::app::DataModel::Nullable<int16_t> value;
+        case MediaPlayback::Attributes::Duration::Id: {
+            chip::app::DataModel::Nullable<uint64_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MaxMeasuredValue", 1, value);
+            return DataModelLogger::LogValue("Duration", 1, value);
         }
-        case TemperatureMeasurement::Attributes::Tolerance::Id: {
-            uint16_t value;
+        case MediaPlayback::Attributes::SampledPosition::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::DecodableType> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Tolerance", 1, value);
+            return DataModelLogger::LogValue("SampledPosition", 1, value);
         }
-        case TemperatureMeasurement::Attributes::GeneratedCommandList::Id: {
+        case MediaPlayback::Attributes::PlaybackSpeed::Id: {
+            float value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("PlaybackSpeed", 1, value);
+        }
+        case MediaPlayback::Attributes::SeekRangeEnd::Id: {
+            chip::app::DataModel::Nullable<uint64_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SeekRangeEnd", 1, value);
+        }
+        case MediaPlayback::Attributes::SeekRangeStart::Id: {
+            chip::app::DataModel::Nullable<uint64_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SeekRangeStart", 1, value);
+        }
+        case MediaPlayback::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case TemperatureMeasurement::Attributes::AcceptedCommandList::Id: {
+        case MediaPlayback::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case TemperatureMeasurement::Attributes::AttributeList::Id: {
+        case MediaPlayback::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case TemperatureMeasurement::Attributes::FeatureMap::Id: {
+        case MediaPlayback::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case TemperatureMeasurement::Attributes::ClusterRevision::Id: {
+        case MediaPlayback::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -8441,438 +8507,327 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case TestCluster::Id: {
+    case MediaInput::Id: {
         switch (path.mAttributeId)
         {
-        case TestCluster::Attributes::Boolean::Id: {
-            bool value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("boolean", 1, value);
-        }
-        case TestCluster::Attributes::Bitmap8::Id: {
-            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("bitmap8", 1, value);
-        }
-        case TestCluster::Attributes::Bitmap16::Id: {
-            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("bitmap16", 1, value);
-        }
-        case TestCluster::Attributes::Bitmap32::Id: {
-            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("bitmap32", 1, value);
-        }
-        case TestCluster::Attributes::Bitmap64::Id: {
-            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value;
+        case MediaInput::Attributes::InputList::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::InputInfo::DecodableType> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("bitmap64", 1, value);
+            return DataModelLogger::LogValue("InputList", 1, value);
         }
-        case TestCluster::Attributes::Int8u::Id: {
+        case MediaInput::Attributes::CurrentInput::Id: {
             uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("int8u", 1, value);
-        }
-        case TestCluster::Attributes::Int16u::Id: {
-            uint16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("int16u", 1, value);
-        }
-        case TestCluster::Attributes::Int24u::Id: {
-            uint32_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("int24u", 1, value);
-        }
-        case TestCluster::Attributes::Int32u::Id: {
-            uint32_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("int32u", 1, value);
-        }
-        case TestCluster::Attributes::Int40u::Id: {
-            uint64_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("int40u", 1, value);
-        }
-        case TestCluster::Attributes::Int48u::Id: {
-            uint64_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("int48u", 1, value);
-        }
-        case TestCluster::Attributes::Int56u::Id: {
-            uint64_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("int56u", 1, value);
-        }
-        case TestCluster::Attributes::Int64u::Id: {
-            uint64_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("int64u", 1, value);
-        }
-        case TestCluster::Attributes::Int8s::Id: {
-            int8_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("int8s", 1, value);
-        }
-        case TestCluster::Attributes::Int16s::Id: {
-            int16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("int16s", 1, value);
-        }
-        case TestCluster::Attributes::Int24s::Id: {
-            int32_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("int24s", 1, value);
-        }
-        case TestCluster::Attributes::Int32s::Id: {
-            int32_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("int32s", 1, value);
-        }
-        case TestCluster::Attributes::Int40s::Id: {
-            int64_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("int40s", 1, value);
+            return DataModelLogger::LogValue("CurrentInput", 1, value);
         }
-        case TestCluster::Attributes::Int48s::Id: {
-            int64_t value;
+        case MediaInput::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("int48s", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case TestCluster::Attributes::Int56s::Id: {
-            int64_t value;
+        case MediaInput::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("int56s", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case TestCluster::Attributes::Int64s::Id: {
-            int64_t value;
+        case MediaInput::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("int64s", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case TestCluster::Attributes::Enum8::Id: {
-            uint8_t value;
+        case MediaInput::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("enum8", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case TestCluster::Attributes::Enum16::Id: {
+        case MediaInput::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("enum16", 1, value);
-        }
-        case TestCluster::Attributes::FloatSingle::Id: {
-            float value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("float_single", 1, value);
-        }
-        case TestCluster::Attributes::FloatDouble::Id: {
-            double value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("float_double", 1, value);
-        }
-        case TestCluster::Attributes::OctetString::Id: {
-            chip::ByteSpan value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("octet_string", 1, value);
-        }
-        case TestCluster::Attributes::ListInt8u::Id: {
-            chip::app::DataModel::DecodableList<uint8_t> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("list_int8u", 1, value);
-        }
-        case TestCluster::Attributes::ListOctetString::Id: {
-            chip::app::DataModel::DecodableList<chip::ByteSpan> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("list_octet_string", 1, value);
-        }
-        case TestCluster::Attributes::ListStructOctetString::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType>
-                value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("list_struct_octet_string", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case TestCluster::Attributes::LongOctetString::Id: {
-            chip::ByteSpan value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("long_octet_string", 1, value);
         }
-        case TestCluster::Attributes::CharString::Id: {
-            chip::CharSpan value;
+        break;
+    }
+    case LowPower::Id: {
+        switch (path.mAttributeId)
+        {
+        case LowPower::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("char_string", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case TestCluster::Attributes::LongCharString::Id: {
-            chip::CharSpan value;
+        case LowPower::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("long_char_string", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case TestCluster::Attributes::EpochUs::Id: {
-            uint64_t value;
+        case LowPower::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("epoch_us", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case TestCluster::Attributes::EpochS::Id: {
+        case LowPower::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("epoch_s", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case TestCluster::Attributes::VendorId::Id: {
-            chip::VendorId value;
+        case LowPower::Attributes::ClusterRevision::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("vendor_id", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case TestCluster::Attributes::ListNullablesAndOptionalsStruct::Id: {
-            chip::app::DataModel::DecodableList<
-                chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::DecodableType>
-                value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("list_nullables_and_optionals_struct", 1, value);
         }
-        case TestCluster::Attributes::EnumAttr::Id: {
-            chip::app::Clusters::TestCluster::SimpleEnum value;
+        break;
+    }
+    case KeypadInput::Id: {
+        switch (path.mAttributeId)
+        {
+        case KeypadInput::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("enum_attr", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case TestCluster::Attributes::StructAttr::Id: {
-            chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType value;
+        case KeypadInput::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("struct_attr", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case TestCluster::Attributes::RangeRestrictedInt8u::Id: {
-            uint8_t value;
+        case KeypadInput::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("range_restricted_int8u", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case TestCluster::Attributes::RangeRestrictedInt8s::Id: {
-            int8_t value;
+        case KeypadInput::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("range_restricted_int8s", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case TestCluster::Attributes::RangeRestrictedInt16u::Id: {
+        case KeypadInput::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("range_restricted_int16u", 1, value);
-        }
-        case TestCluster::Attributes::RangeRestrictedInt16s::Id: {
-            int16_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("range_restricted_int16s", 1, value);
-        }
-        case TestCluster::Attributes::ListLongOctetString::Id: {
-            chip::app::DataModel::DecodableList<chip::ByteSpan> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("list_long_octet_string", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case TestCluster::Attributes::ListFabricScoped::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestFabricScoped::DecodableType> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("list_fabric_scoped", 1, value);
         }
-        case TestCluster::Attributes::TimedWriteBoolean::Id: {
-            bool value;
+        break;
+    }
+    case ContentLauncher::Id: {
+        switch (path.mAttributeId)
+        {
+        case ContentLauncher::Attributes::AcceptHeader::Id: {
+            chip::app::DataModel::DecodableList<chip::CharSpan> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("timed_write_boolean", 1, value);
+            return DataModelLogger::LogValue("AcceptHeader", 1, value);
         }
-        case TestCluster::Attributes::GeneralErrorBoolean::Id: {
-            bool value;
+        case ContentLauncher::Attributes::SupportedStreamingProtocols::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("general_error_boolean", 1, value);
+            return DataModelLogger::LogValue("SupportedStreamingProtocols", 1, value);
         }
-        case TestCluster::Attributes::ClusterErrorBoolean::Id: {
-            bool value;
+        case ContentLauncher::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("cluster_error_boolean", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case TestCluster::Attributes::Unsupported::Id: {
-            bool value;
+        case ContentLauncher::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("unsupported", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case TestCluster::Attributes::NullableBoolean::Id: {
-            chip::app::DataModel::Nullable<bool> value;
+        case ContentLauncher::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_boolean", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case TestCluster::Attributes::NullableBitmap8::Id: {
-            chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> value;
+        case ContentLauncher::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_bitmap8", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case TestCluster::Attributes::NullableBitmap16::Id: {
-            chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> value;
+        case ContentLauncher::Attributes::ClusterRevision::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_bitmap16", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case TestCluster::Attributes::NullableBitmap32::Id: {
-            chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_bitmap32", 1, value);
         }
-        case TestCluster::Attributes::NullableBitmap64::Id: {
-            chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> value;
+        break;
+    }
+    case AudioOutput::Id: {
+        switch (path.mAttributeId)
+        {
+        case AudioOutput::Attributes::OutputList::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::OutputInfo::DecodableType> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_bitmap64", 1, value);
+            return DataModelLogger::LogValue("OutputList", 1, value);
         }
-        case TestCluster::Attributes::NullableInt8u::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case AudioOutput::Attributes::CurrentOutput::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_int8u", 1, value);
+            return DataModelLogger::LogValue("CurrentOutput", 1, value);
         }
-        case TestCluster::Attributes::NullableInt16u::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case AudioOutput::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_int16u", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case TestCluster::Attributes::NullableInt24u::Id: {
-            chip::app::DataModel::Nullable<uint32_t> value;
+        case AudioOutput::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_int24u", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case TestCluster::Attributes::NullableInt32u::Id: {
-            chip::app::DataModel::Nullable<uint32_t> value;
+        case AudioOutput::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_int32u", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case TestCluster::Attributes::NullableInt40u::Id: {
-            chip::app::DataModel::Nullable<uint64_t> value;
+        case AudioOutput::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_int40u", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case TestCluster::Attributes::NullableInt48u::Id: {
-            chip::app::DataModel::Nullable<uint64_t> value;
+        case AudioOutput::Attributes::ClusterRevision::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_int48u", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case TestCluster::Attributes::NullableInt56u::Id: {
-            chip::app::DataModel::Nullable<uint64_t> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_int56u", 1, value);
         }
-        case TestCluster::Attributes::NullableInt64u::Id: {
-            chip::app::DataModel::Nullable<uint64_t> value;
+        break;
+    }
+    case ApplicationLauncher::Id: {
+        switch (path.mAttributeId)
+        {
+        case ApplicationLauncher::Attributes::CatalogList::Id: {
+            chip::app::DataModel::DecodableList<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_int64u", 1, value);
+            return DataModelLogger::LogValue("CatalogList", 1, value);
         }
-        case TestCluster::Attributes::NullableInt8s::Id: {
-            chip::app::DataModel::Nullable<int8_t> value;
+        case ApplicationLauncher::Attributes::CurrentApp::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::DecodableType> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_int8s", 1, value);
+            return DataModelLogger::LogValue("CurrentApp", 1, value);
         }
-        case TestCluster::Attributes::NullableInt16s::Id: {
-            chip::app::DataModel::Nullable<int16_t> value;
+        case ApplicationLauncher::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_int16s", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case TestCluster::Attributes::NullableInt24s::Id: {
-            chip::app::DataModel::Nullable<int32_t> value;
+        case ApplicationLauncher::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_int24s", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case TestCluster::Attributes::NullableInt32s::Id: {
-            chip::app::DataModel::Nullable<int32_t> value;
+        case ApplicationLauncher::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_int32s", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case TestCluster::Attributes::NullableInt40s::Id: {
-            chip::app::DataModel::Nullable<int64_t> value;
+        case ApplicationLauncher::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_int40s", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case TestCluster::Attributes::NullableInt48s::Id: {
-            chip::app::DataModel::Nullable<int64_t> value;
+        case ApplicationLauncher::Attributes::ClusterRevision::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_int48s", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case TestCluster::Attributes::NullableInt56s::Id: {
-            chip::app::DataModel::Nullable<int64_t> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_int56s", 1, value);
         }
-        case TestCluster::Attributes::NullableInt64s::Id: {
-            chip::app::DataModel::Nullable<int64_t> value;
+        break;
+    }
+    case ApplicationBasic::Id: {
+        switch (path.mAttributeId)
+        {
+        case ApplicationBasic::Attributes::VendorName::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_int64s", 1, value);
+            return DataModelLogger::LogValue("VendorName", 1, value);
         }
-        case TestCluster::Attributes::NullableEnum8::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case ApplicationBasic::Attributes::VendorID::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_enum8", 1, value);
+            return DataModelLogger::LogValue("VendorID", 1, value);
         }
-        case TestCluster::Attributes::NullableEnum16::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case ApplicationBasic::Attributes::ApplicationName::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_enum16", 1, value);
+            return DataModelLogger::LogValue("ApplicationName", 1, value);
         }
-        case TestCluster::Attributes::NullableFloatSingle::Id: {
-            chip::app::DataModel::Nullable<float> value;
+        case ApplicationBasic::Attributes::ProductID::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_float_single", 1, value);
+            return DataModelLogger::LogValue("ProductID", 1, value);
         }
-        case TestCluster::Attributes::NullableFloatDouble::Id: {
-            chip::app::DataModel::Nullable<double> value;
+        case ApplicationBasic::Attributes::Application::Id: {
+            chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_float_double", 1, value);
+            return DataModelLogger::LogValue("Application", 1, value);
         }
-        case TestCluster::Attributes::NullableOctetString::Id: {
-            chip::app::DataModel::Nullable<chip::ByteSpan> value;
+        case ApplicationBasic::Attributes::Status::Id: {
+            chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_octet_string", 1, value);
+            return DataModelLogger::LogValue("Status", 1, value);
         }
-        case TestCluster::Attributes::NullableCharString::Id: {
-            chip::app::DataModel::Nullable<chip::CharSpan> value;
+        case ApplicationBasic::Attributes::ApplicationVersion::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_char_string", 1, value);
+            return DataModelLogger::LogValue("ApplicationVersion", 1, value);
         }
-        case TestCluster::Attributes::NullableEnumAttr::Id: {
-            chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> value;
+        case ApplicationBasic::Attributes::AllowedVendorList::Id: {
+            chip::app::DataModel::DecodableList<chip::VendorId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_enum_attr", 1, value);
+            return DataModelLogger::LogValue("AllowedVendorList", 1, value);
         }
-        case TestCluster::Attributes::NullableStruct::Id: {
-            chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType> value;
+        case ApplicationBasic::Attributes::GeneratedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_struct", 1, value);
+            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case TestCluster::Attributes::NullableRangeRestrictedInt8u::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case ApplicationBasic::Attributes::AcceptedCommandList::Id: {
+            chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_range_restricted_int8u", 1, value);
+            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case TestCluster::Attributes::NullableRangeRestrictedInt8s::Id: {
-            chip::app::DataModel::Nullable<int8_t> value;
+        case ApplicationBasic::Attributes::AttributeList::Id: {
+            chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_range_restricted_int8s", 1, value);
+            return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case TestCluster::Attributes::NullableRangeRestrictedInt16u::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case ApplicationBasic::Attributes::FeatureMap::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_range_restricted_int16u", 1, value);
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case TestCluster::Attributes::NullableRangeRestrictedInt16s::Id: {
-            chip::app::DataModel::Nullable<int16_t> value;
+        case ApplicationBasic::Attributes::ClusterRevision::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("nullable_range_restricted_int16s", 1, value);
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
-        case TestCluster::Attributes::GeneratedCommandList::Id: {
+        }
+        break;
+    }
+    case AccountLogin::Id: {
+        switch (path.mAttributeId)
+        {
+        case AccountLogin::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case TestCluster::Attributes::AcceptedCommandList::Id: {
+        case AccountLogin::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case TestCluster::Attributes::AttributeList::Id: {
+        case AccountLogin::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case TestCluster::Attributes::FeatureMap::Id: {
+        case AccountLogin::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case TestCluster::Attributes::ClusterRevision::Id: {
+        case AccountLogin::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -8880,673 +8835,670 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case Thermostat::Id: {
+    case ElectricalMeasurement::Id: {
         switch (path.mAttributeId)
         {
-        case Thermostat::Attributes::LocalTemperature::Id: {
-            chip::app::DataModel::Nullable<int16_t> value;
+        case ElectricalMeasurement::Attributes::MeasurementType::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LocalTemperature", 1, value);
+            return DataModelLogger::LogValue("measurement type", 1, value);
         }
-        case Thermostat::Attributes::OutdoorTemperature::Id: {
-            chip::app::DataModel::Nullable<int16_t> value;
+        case ElectricalMeasurement::Attributes::DcVoltage::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OutdoorTemperature", 1, value);
+            return DataModelLogger::LogValue("dc voltage", 1, value);
         }
-        case Thermostat::Attributes::Occupancy::Id: {
-            uint8_t value;
+        case ElectricalMeasurement::Attributes::DcVoltageMin::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Occupancy", 1, value);
+            return DataModelLogger::LogValue("dc voltage min", 1, value);
         }
-        case Thermostat::Attributes::AbsMinHeatSetpointLimit::Id: {
+        case ElectricalMeasurement::Attributes::DcVoltageMax::Id: {
             int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AbsMinHeatSetpointLimit", 1, value);
+            return DataModelLogger::LogValue("dc voltage max", 1, value);
         }
-        case Thermostat::Attributes::AbsMaxHeatSetpointLimit::Id: {
+        case ElectricalMeasurement::Attributes::DcCurrent::Id: {
             int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AbsMaxHeatSetpointLimit", 1, value);
+            return DataModelLogger::LogValue("dc current", 1, value);
         }
-        case Thermostat::Attributes::AbsMinCoolSetpointLimit::Id: {
+        case ElectricalMeasurement::Attributes::DcCurrentMin::Id: {
             int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AbsMinCoolSetpointLimit", 1, value);
+            return DataModelLogger::LogValue("dc current min", 1, value);
         }
-        case Thermostat::Attributes::AbsMaxCoolSetpointLimit::Id: {
+        case ElectricalMeasurement::Attributes::DcCurrentMax::Id: {
             int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AbsMaxCoolSetpointLimit", 1, value);
+            return DataModelLogger::LogValue("dc current max", 1, value);
         }
-        case Thermostat::Attributes::PICoolingDemand::Id: {
-            uint8_t value;
+        case ElectricalMeasurement::Attributes::DcPower::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PICoolingDemand", 1, value);
+            return DataModelLogger::LogValue("dc power", 1, value);
         }
-        case Thermostat::Attributes::PIHeatingDemand::Id: {
-            uint8_t value;
+        case ElectricalMeasurement::Attributes::DcPowerMin::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PIHeatingDemand", 1, value);
+            return DataModelLogger::LogValue("dc power min", 1, value);
         }
-        case Thermostat::Attributes::HVACSystemTypeConfiguration::Id: {
-            uint8_t value;
+        case ElectricalMeasurement::Attributes::DcPowerMax::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("HVACSystemTypeConfiguration", 1, value);
+            return DataModelLogger::LogValue("dc power max", 1, value);
         }
-        case Thermostat::Attributes::LocalTemperatureCalibration::Id: {
-            int8_t value;
+        case ElectricalMeasurement::Attributes::DcVoltageMultiplier::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LocalTemperatureCalibration", 1, value);
+            return DataModelLogger::LogValue("dc voltage multiplier", 1, value);
         }
-        case Thermostat::Attributes::OccupiedCoolingSetpoint::Id: {
-            int16_t value;
+        case ElectricalMeasurement::Attributes::DcVoltageDivisor::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OccupiedCoolingSetpoint", 1, value);
+            return DataModelLogger::LogValue("dc voltage divisor", 1, value);
         }
-        case Thermostat::Attributes::OccupiedHeatingSetpoint::Id: {
-            int16_t value;
+        case ElectricalMeasurement::Attributes::DcCurrentMultiplier::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OccupiedHeatingSetpoint", 1, value);
+            return DataModelLogger::LogValue("dc current multiplier", 1, value);
         }
-        case Thermostat::Attributes::UnoccupiedCoolingSetpoint::Id: {
-            int16_t value;
+        case ElectricalMeasurement::Attributes::DcCurrentDivisor::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("UnoccupiedCoolingSetpoint", 1, value);
+            return DataModelLogger::LogValue("dc current divisor", 1, value);
         }
-        case Thermostat::Attributes::UnoccupiedHeatingSetpoint::Id: {
-            int16_t value;
+        case ElectricalMeasurement::Attributes::DcPowerMultiplier::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("UnoccupiedHeatingSetpoint", 1, value);
+            return DataModelLogger::LogValue("dc power multiplier", 1, value);
         }
-        case Thermostat::Attributes::MinHeatSetpointLimit::Id: {
-            int16_t value;
+        case ElectricalMeasurement::Attributes::DcPowerDivisor::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MinHeatSetpointLimit", 1, value);
+            return DataModelLogger::LogValue("dc power divisor", 1, value);
         }
-        case Thermostat::Attributes::MaxHeatSetpointLimit::Id: {
-            int16_t value;
+        case ElectricalMeasurement::Attributes::AcFrequency::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MaxHeatSetpointLimit", 1, value);
+            return DataModelLogger::LogValue("ac frequency", 1, value);
         }
-        case Thermostat::Attributes::MinCoolSetpointLimit::Id: {
-            int16_t value;
+        case ElectricalMeasurement::Attributes::AcFrequencyMin::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MinCoolSetpointLimit", 1, value);
+            return DataModelLogger::LogValue("ac frequency min", 1, value);
         }
-        case Thermostat::Attributes::MaxCoolSetpointLimit::Id: {
-            int16_t value;
+        case ElectricalMeasurement::Attributes::AcFrequencyMax::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MaxCoolSetpointLimit", 1, value);
+            return DataModelLogger::LogValue("ac frequency max", 1, value);
         }
-        case Thermostat::Attributes::MinSetpointDeadBand::Id: {
-            int8_t value;
+        case ElectricalMeasurement::Attributes::NeutralCurrent::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MinSetpointDeadBand", 1, value);
+            return DataModelLogger::LogValue("neutral current", 1, value);
         }
-        case Thermostat::Attributes::RemoteSensing::Id: {
-            uint8_t value;
+        case ElectricalMeasurement::Attributes::TotalActivePower::Id: {
+            int32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RemoteSensing", 1, value);
+            return DataModelLogger::LogValue("total active power", 1, value);
         }
-        case Thermostat::Attributes::ControlSequenceOfOperation::Id: {
-            chip::app::Clusters::Thermostat::ThermostatControlSequence value;
+        case ElectricalMeasurement::Attributes::TotalReactivePower::Id: {
+            int32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ControlSequenceOfOperation", 1, value);
+            return DataModelLogger::LogValue("total reactive power", 1, value);
         }
-        case Thermostat::Attributes::SystemMode::Id: {
-            uint8_t value;
+        case ElectricalMeasurement::Attributes::TotalApparentPower::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SystemMode", 1, value);
+            return DataModelLogger::LogValue("total apparent power", 1, value);
         }
-        case Thermostat::Attributes::ThermostatRunningMode::Id: {
-            uint8_t value;
+        case ElectricalMeasurement::Attributes::Measured1stHarmonicCurrent::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ThermostatRunningMode", 1, value);
+            return DataModelLogger::LogValue("measured 1st harmonic current", 1, value);
         }
-        case Thermostat::Attributes::StartOfWeek::Id: {
-            uint8_t value;
+        case ElectricalMeasurement::Attributes::Measured3rdHarmonicCurrent::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("StartOfWeek", 1, value);
+            return DataModelLogger::LogValue("measured 3rd harmonic current", 1, value);
         }
-        case Thermostat::Attributes::NumberOfWeeklyTransitions::Id: {
-            uint8_t value;
+        case ElectricalMeasurement::Attributes::Measured5thHarmonicCurrent::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NumberOfWeeklyTransitions", 1, value);
+            return DataModelLogger::LogValue("measured 5th harmonic current", 1, value);
         }
-        case Thermostat::Attributes::NumberOfDailyTransitions::Id: {
-            uint8_t value;
+        case ElectricalMeasurement::Attributes::Measured7thHarmonicCurrent::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NumberOfDailyTransitions", 1, value);
+            return DataModelLogger::LogValue("measured 7th harmonic current", 1, value);
         }
-        case Thermostat::Attributes::TemperatureSetpointHold::Id: {
-            uint8_t value;
+        case ElectricalMeasurement::Attributes::Measured9thHarmonicCurrent::Id: {
+            int16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("measured 9th harmonic current", 1, value);
+        }
+        case ElectricalMeasurement::Attributes::Measured11thHarmonicCurrent::Id: {
+            int16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("measured 11th harmonic current", 1, value);
+        }
+        case ElectricalMeasurement::Attributes::MeasuredPhase1stHarmonicCurrent::Id: {
+            int16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("measured phase 1st harmonic current", 1, value);
+        }
+        case ElectricalMeasurement::Attributes::MeasuredPhase3rdHarmonicCurrent::Id: {
+            int16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("measured phase 3rd harmonic current", 1, value);
+        }
+        case ElectricalMeasurement::Attributes::MeasuredPhase5thHarmonicCurrent::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TemperatureSetpointHold", 1, value);
+            return DataModelLogger::LogValue("measured phase 5th harmonic current", 1, value);
         }
-        case Thermostat::Attributes::TemperatureSetpointHoldDuration::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case ElectricalMeasurement::Attributes::MeasuredPhase7thHarmonicCurrent::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TemperatureSetpointHoldDuration", 1, value);
+            return DataModelLogger::LogValue("measured phase 7th harmonic current", 1, value);
         }
-        case Thermostat::Attributes::ThermostatProgrammingOperationMode::Id: {
-            uint8_t value;
+        case ElectricalMeasurement::Attributes::MeasuredPhase9thHarmonicCurrent::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ThermostatProgrammingOperationMode", 1, value);
+            return DataModelLogger::LogValue("measured phase 9th harmonic current", 1, value);
         }
-        case Thermostat::Attributes::ThermostatRunningState::Id: {
-            uint16_t value;
+        case ElectricalMeasurement::Attributes::MeasuredPhase11thHarmonicCurrent::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ThermostatRunningState", 1, value);
+            return DataModelLogger::LogValue("measured phase 11th harmonic current", 1, value);
         }
-        case Thermostat::Attributes::SetpointChangeSource::Id: {
-            uint8_t value;
+        case ElectricalMeasurement::Attributes::AcFrequencyMultiplier::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SetpointChangeSource", 1, value);
+            return DataModelLogger::LogValue("ac frequency multiplier", 1, value);
         }
-        case Thermostat::Attributes::SetpointChangeAmount::Id: {
-            chip::app::DataModel::Nullable<int16_t> value;
+        case ElectricalMeasurement::Attributes::AcFrequencyDivisor::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SetpointChangeAmount", 1, value);
+            return DataModelLogger::LogValue("ac frequency divisor", 1, value);
         }
-        case Thermostat::Attributes::SetpointChangeSourceTimestamp::Id: {
+        case ElectricalMeasurement::Attributes::PowerMultiplier::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SetpointChangeSourceTimestamp", 1, value);
+            return DataModelLogger::LogValue("power multiplier", 1, value);
         }
-        case Thermostat::Attributes::OccupiedSetback::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case ElectricalMeasurement::Attributes::PowerDivisor::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OccupiedSetback", 1, value);
+            return DataModelLogger::LogValue("power divisor", 1, value);
         }
-        case Thermostat::Attributes::OccupiedSetbackMin::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case ElectricalMeasurement::Attributes::HarmonicCurrentMultiplier::Id: {
+            int8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OccupiedSetbackMin", 1, value);
+            return DataModelLogger::LogValue("harmonic current multiplier", 1, value);
         }
-        case Thermostat::Attributes::OccupiedSetbackMax::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case ElectricalMeasurement::Attributes::PhaseHarmonicCurrentMultiplier::Id: {
+            int8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OccupiedSetbackMax", 1, value);
+            return DataModelLogger::LogValue("phase harmonic current multiplier", 1, value);
         }
-        case Thermostat::Attributes::UnoccupiedSetback::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case ElectricalMeasurement::Attributes::InstantaneousVoltage::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("UnoccupiedSetback", 1, value);
+            return DataModelLogger::LogValue("instantaneous voltage", 1, value);
         }
-        case Thermostat::Attributes::UnoccupiedSetbackMin::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case ElectricalMeasurement::Attributes::InstantaneousLineCurrent::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("UnoccupiedSetbackMin", 1, value);
+            return DataModelLogger::LogValue("instantaneous line current", 1, value);
         }
-        case Thermostat::Attributes::UnoccupiedSetbackMax::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case ElectricalMeasurement::Attributes::InstantaneousActiveCurrent::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("UnoccupiedSetbackMax", 1, value);
+            return DataModelLogger::LogValue("instantaneous active current", 1, value);
         }
-        case Thermostat::Attributes::EmergencyHeatDelta::Id: {
-            uint8_t value;
+        case ElectricalMeasurement::Attributes::InstantaneousReactiveCurrent::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EmergencyHeatDelta", 1, value);
+            return DataModelLogger::LogValue("instantaneous reactive current", 1, value);
         }
-        case Thermostat::Attributes::ACType::Id: {
-            uint8_t value;
+        case ElectricalMeasurement::Attributes::InstantaneousPower::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ACType", 1, value);
+            return DataModelLogger::LogValue("instantaneous power", 1, value);
         }
-        case Thermostat::Attributes::ACCapacity::Id: {
+        case ElectricalMeasurement::Attributes::RmsVoltage::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ACCapacity", 1, value);
-        }
-        case Thermostat::Attributes::ACRefrigerantType::Id: {
-            uint8_t value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ACRefrigerantType", 1, value);
+            return DataModelLogger::LogValue("rms voltage", 1, value);
         }
-        case Thermostat::Attributes::ACCompressorType::Id: {
-            uint8_t value;
+        case ElectricalMeasurement::Attributes::RmsVoltageMin::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ACCompressorType", 1, value);
+            return DataModelLogger::LogValue("rms voltage min", 1, value);
         }
-        case Thermostat::Attributes::ACErrorCode::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::RmsVoltageMax::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ACErrorCode", 1, value);
+            return DataModelLogger::LogValue("rms voltage max", 1, value);
         }
-        case Thermostat::Attributes::ACLouverPosition::Id: {
-            uint8_t value;
+        case ElectricalMeasurement::Attributes::RmsCurrent::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ACLouverPosition", 1, value);
+            return DataModelLogger::LogValue("rms current", 1, value);
         }
-        case Thermostat::Attributes::ACCoilTemperature::Id: {
-            chip::app::DataModel::Nullable<int16_t> value;
+        case ElectricalMeasurement::Attributes::RmsCurrentMin::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ACCoilTemperature", 1, value);
+            return DataModelLogger::LogValue("rms current min", 1, value);
         }
-        case Thermostat::Attributes::ACCapacityformat::Id: {
-            uint8_t value;
+        case ElectricalMeasurement::Attributes::RmsCurrentMax::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ACCapacityformat", 1, value);
+            return DataModelLogger::LogValue("rms current max", 1, value);
         }
-        case Thermostat::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case ElectricalMeasurement::Attributes::ActivePower::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("active power", 1, value);
         }
-        case Thermostat::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case ElectricalMeasurement::Attributes::ActivePowerMin::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("active power min", 1, value);
         }
-        case Thermostat::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case ElectricalMeasurement::Attributes::ActivePowerMax::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("active power max", 1, value);
         }
-        case Thermostat::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::ReactivePower::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("reactive power", 1, value);
         }
-        case Thermostat::Attributes::ClusterRevision::Id: {
+        case ElectricalMeasurement::Attributes::ApparentPower::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
-        }
+            return DataModelLogger::LogValue("apparent power", 1, value);
         }
-        break;
-    }
-    case ThermostatUserInterfaceConfiguration::Id: {
-        switch (path.mAttributeId)
-        {
-        case ThermostatUserInterfaceConfiguration::Attributes::TemperatureDisplayMode::Id: {
-            uint8_t value;
+        case ElectricalMeasurement::Attributes::PowerFactor::Id: {
+            int8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("temperature display mode", 1, value);
+            return DataModelLogger::LogValue("power factor", 1, value);
         }
-        case ThermostatUserInterfaceConfiguration::Attributes::KeypadLockout::Id: {
-            uint8_t value;
+        case ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriod::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("keypad lockout", 1, value);
+            return DataModelLogger::LogValue("average rms voltage measurement period", 1, value);
         }
-        case ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::Id: {
-            uint8_t value;
+        case ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounter::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("schedule programming visibility", 1, value);
+            return DataModelLogger::LogValue("average rms under voltage counter", 1, value);
         }
-        case ThermostatUserInterfaceConfiguration::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriod::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("rms extreme over voltage period", 1, value);
         }
-        case ThermostatUserInterfaceConfiguration::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriod::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("rms extreme under voltage period", 1, value);
         }
-        case ThermostatUserInterfaceConfiguration::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case ElectricalMeasurement::Attributes::RmsVoltageSagPeriod::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("rms voltage sag period", 1, value);
         }
-        case ThermostatUserInterfaceConfiguration::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::RmsVoltageSwellPeriod::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("rms voltage swell period", 1, value);
         }
-        case ThermostatUserInterfaceConfiguration::Attributes::ClusterRevision::Id: {
+        case ElectricalMeasurement::Attributes::AcVoltageMultiplier::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
-        }
+            return DataModelLogger::LogValue("ac voltage multiplier", 1, value);
         }
-        break;
-    }
-    case ThreadNetworkDiagnostics::Id: {
-        switch (path.mAttributeId)
-        {
-        case ThreadNetworkDiagnostics::Attributes::Channel::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case ElectricalMeasurement::Attributes::AcVoltageDivisor::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("channel", 1, value);
+            return DataModelLogger::LogValue("ac voltage divisor", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RoutingRole::Id: {
-            chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::RoutingRole> value;
+        case ElectricalMeasurement::Attributes::AcCurrentMultiplier::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RoutingRole", 1, value);
+            return DataModelLogger::LogValue("ac current multiplier", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::NetworkName::Id: {
-            chip::app::DataModel::Nullable<chip::CharSpan> value;
+        case ElectricalMeasurement::Attributes::AcCurrentDivisor::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NetworkName", 1, value);
+            return DataModelLogger::LogValue("ac current divisor", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::PanId::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case ElectricalMeasurement::Attributes::AcPowerMultiplier::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PanId", 1, value);
+            return DataModelLogger::LogValue("ac power multiplier", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::ExtendedPanId::Id: {
-            chip::app::DataModel::Nullable<uint64_t> value;
+        case ElectricalMeasurement::Attributes::AcPowerDivisor::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ExtendedPanId", 1, value);
+            return DataModelLogger::LogValue("ac power divisor", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::MeshLocalPrefix::Id: {
-            chip::app::DataModel::Nullable<chip::ByteSpan> value;
+        case ElectricalMeasurement::Attributes::OverloadAlarmsMask::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MeshLocalPrefix", 1, value);
+            return DataModelLogger::LogValue("overload alarms mask", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::OverrunCount::Id: {
-            uint64_t value;
+        case ElectricalMeasurement::Attributes::VoltageOverload::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OverrunCount", 1, value);
-        }
-        case ThreadNetworkDiagnostics::Attributes::NeighborTableList::Id: {
-            chip::app::DataModel::DecodableList<
-                chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType>
-                value;
+            return DataModelLogger::LogValue("voltage overload", 1, value);
+        }
+        case ElectricalMeasurement::Attributes::CurrentOverload::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NeighborTableList", 1, value);
+            return DataModelLogger::LogValue("current overload", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RouteTableList::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType>
-                value;
+        case ElectricalMeasurement::Attributes::AcOverloadAlarmsMask::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RouteTableList", 1, value);
+            return DataModelLogger::LogValue("ac overload alarms mask", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::PartitionId::Id: {
-            chip::app::DataModel::Nullable<uint32_t> value;
+        case ElectricalMeasurement::Attributes::AcVoltageOverload::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PartitionId", 1, value);
+            return DataModelLogger::LogValue("ac voltage overload", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::Weighting::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case ElectricalMeasurement::Attributes::AcCurrentOverload::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("weighting", 1, value);
+            return DataModelLogger::LogValue("ac current overload", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::DataVersion::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case ElectricalMeasurement::Attributes::AcActivePowerOverload::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("DataVersion", 1, value);
+            return DataModelLogger::LogValue("ac active power overload", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::StableDataVersion::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case ElectricalMeasurement::Attributes::AcReactivePowerOverload::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("StableDataVersion", 1, value);
+            return DataModelLogger::LogValue("ac reactive power overload", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::LeaderRouterId::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
+        case ElectricalMeasurement::Attributes::AverageRmsOverVoltage::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LeaderRouterId", 1, value);
+            return DataModelLogger::LogValue("average rms over voltage", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::DetachedRoleCount::Id: {
-            uint16_t value;
+        case ElectricalMeasurement::Attributes::AverageRmsUnderVoltage::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("DetachedRoleCount", 1, value);
+            return DataModelLogger::LogValue("average rms under voltage", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::ChildRoleCount::Id: {
-            uint16_t value;
+        case ElectricalMeasurement::Attributes::RmsExtremeOverVoltage::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ChildRoleCount", 1, value);
+            return DataModelLogger::LogValue("rms extreme over voltage", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RouterRoleCount::Id: {
-            uint16_t value;
+        case ElectricalMeasurement::Attributes::RmsExtremeUnderVoltage::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RouterRoleCount", 1, value);
+            return DataModelLogger::LogValue("rms extreme under voltage", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::LeaderRoleCount::Id: {
-            uint16_t value;
+        case ElectricalMeasurement::Attributes::RmsVoltageSag::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LeaderRoleCount", 1, value);
+            return DataModelLogger::LogValue("rms voltage sag", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::AttachAttemptCount::Id: {
-            uint16_t value;
+        case ElectricalMeasurement::Attributes::RmsVoltageSwell::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttachAttemptCount", 1, value);
+            return DataModelLogger::LogValue("rms voltage swell", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::PartitionIdChangeCount::Id: {
+        case ElectricalMeasurement::Attributes::LineCurrentPhaseB::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PartitionIdChangeCount", 1, value);
+            return DataModelLogger::LogValue("line current phase b", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::BetterPartitionAttachAttemptCount::Id: {
-            uint16_t value;
+        case ElectricalMeasurement::Attributes::ActiveCurrentPhaseB::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BetterPartitionAttachAttemptCount", 1, value);
+            return DataModelLogger::LogValue("active current phase b", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::ParentChangeCount::Id: {
-            uint16_t value;
+        case ElectricalMeasurement::Attributes::ReactiveCurrentPhaseB::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ParentChangeCount", 1, value);
+            return DataModelLogger::LogValue("reactive current phase b", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxTotalCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::RmsVoltagePhaseB::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxTotalCount", 1, value);
+            return DataModelLogger::LogValue("rms voltage phase b", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxUnicastCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::RmsVoltageMinPhaseB::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxUnicastCount", 1, value);
+            return DataModelLogger::LogValue("rms voltage min phase b", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxBroadcastCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::RmsVoltageMaxPhaseB::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxBroadcastCount", 1, value);
+            return DataModelLogger::LogValue("rms voltage max phase b", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxAckRequestedCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::RmsCurrentPhaseB::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxAckRequestedCount", 1, value);
+            return DataModelLogger::LogValue("rms current phase b", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxAckedCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::RmsCurrentMinPhaseB::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxAckedCount", 1, value);
+            return DataModelLogger::LogValue("rms current min phase b", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxNoAckRequestedCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::RmsCurrentMaxPhaseB::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxNoAckRequestedCount", 1, value);
+            return DataModelLogger::LogValue("rms current max phase b", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxDataCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::ActivePowerPhaseB::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxDataCount", 1, value);
+            return DataModelLogger::LogValue("active power phase b", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxDataPollCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::ActivePowerMinPhaseB::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxDataPollCount", 1, value);
+            return DataModelLogger::LogValue("active power min phase b", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxBeaconCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::ActivePowerMaxPhaseB::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxBeaconCount", 1, value);
+            return DataModelLogger::LogValue("active power max phase b", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxBeaconRequestCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::ReactivePowerPhaseB::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxBeaconRequestCount", 1, value);
+            return DataModelLogger::LogValue("reactive power phase b", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxOtherCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::ApparentPowerPhaseB::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxOtherCount", 1, value);
+            return DataModelLogger::LogValue("apparent power phase b", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxRetryCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::PowerFactorPhaseB::Id: {
+            int8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxRetryCount", 1, value);
+            return DataModelLogger::LogValue("power factor phase b", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxDirectMaxRetryExpiryCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriodPhaseB::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxDirectMaxRetryExpiryCount", 1, value);
+            return DataModelLogger::LogValue("average rms voltage measurement period phase b", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxIndirectMaxRetryExpiryCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::AverageRmsOverVoltageCounterPhaseB::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxIndirectMaxRetryExpiryCount", 1, value);
+            return DataModelLogger::LogValue("average rms over voltage counter phase b", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxErrCcaCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounterPhaseB::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxErrCcaCount", 1, value);
+            return DataModelLogger::LogValue("average rms under voltage counter phase b", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxErrAbortCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriodPhaseB::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxErrAbortCount", 1, value);
+            return DataModelLogger::LogValue("rms extreme over voltage period phase b", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::TxErrBusyChannelCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriodPhaseB::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TxErrBusyChannelCount", 1, value);
+            return DataModelLogger::LogValue("rms extreme under voltage period phase b", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxTotalCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::RmsVoltageSagPeriodPhaseB::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxTotalCount", 1, value);
+            return DataModelLogger::LogValue("rms voltage sag period phase b", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxUnicastCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::RmsVoltageSwellPeriodPhaseB::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxUnicastCount", 1, value);
+            return DataModelLogger::LogValue("rms voltage swell period phase b", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxBroadcastCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::LineCurrentPhaseC::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxBroadcastCount", 1, value);
+            return DataModelLogger::LogValue("line current phase c", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxDataCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::ActiveCurrentPhaseC::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxDataCount", 1, value);
+            return DataModelLogger::LogValue("active current phase c", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxDataPollCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::ReactiveCurrentPhaseC::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxDataPollCount", 1, value);
+            return DataModelLogger::LogValue("reactive current phase c", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxBeaconCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::RmsVoltagePhaseC::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxBeaconCount", 1, value);
+            return DataModelLogger::LogValue("rms voltage phase c", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxBeaconRequestCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::RmsVoltageMinPhaseC::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxBeaconRequestCount", 1, value);
+            return DataModelLogger::LogValue("rms voltage min phase c", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxOtherCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::RmsVoltageMaxPhaseC::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxOtherCount", 1, value);
+            return DataModelLogger::LogValue("rms voltage max phase c", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxAddressFilteredCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::RmsCurrentPhaseC::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxAddressFilteredCount", 1, value);
+            return DataModelLogger::LogValue("rms current phase c", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxDestAddrFilteredCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::RmsCurrentMinPhaseC::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxDestAddrFilteredCount", 1, value);
+            return DataModelLogger::LogValue("rms current min phase c", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxDuplicatedCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::RmsCurrentMaxPhaseC::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxDuplicatedCount", 1, value);
+            return DataModelLogger::LogValue("rms current max phase c", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxErrNoFrameCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::ActivePowerPhaseC::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxErrNoFrameCount", 1, value);
+            return DataModelLogger::LogValue("active power phase c", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxErrUnknownNeighborCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::ActivePowerMinPhaseC::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxErrUnknownNeighborCount", 1, value);
+            return DataModelLogger::LogValue("active power min phase c", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxErrInvalidSrcAddrCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::ActivePowerMaxPhaseC::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxErrInvalidSrcAddrCount", 1, value);
+            return DataModelLogger::LogValue("active power max phase c", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxErrSecCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::ReactivePowerPhaseC::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxErrSecCount", 1, value);
+            return DataModelLogger::LogValue("reactive power phase c", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxErrFcsCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::ApparentPowerPhaseC::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxErrFcsCount", 1, value);
+            return DataModelLogger::LogValue("apparent power phase c", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::RxErrOtherCount::Id: {
-            uint32_t value;
+        case ElectricalMeasurement::Attributes::PowerFactorPhaseC::Id: {
+            int8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RxErrOtherCount", 1, value);
+            return DataModelLogger::LogValue("power factor phase c", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::Id: {
-            chip::app::DataModel::Nullable<uint64_t> value;
+        case ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriodPhaseC::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActiveTimestamp", 1, value);
+            return DataModelLogger::LogValue("average rms voltage measurement period phase c", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::PendingTimestamp::Id: {
-            chip::app::DataModel::Nullable<uint64_t> value;
+        case ElectricalMeasurement::Attributes::AverageRmsOverVoltageCounterPhaseC::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PendingTimestamp", 1, value);
+            return DataModelLogger::LogValue("average rms over voltage counter phase c", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::Delay::Id: {
-            chip::app::DataModel::Nullable<uint32_t> value;
+        case ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounterPhaseC::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("delay", 1, value);
+            return DataModelLogger::LogValue("average rms under voltage counter phase c", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::SecurityPolicy::Id: {
-            chip::app::DataModel::Nullable<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType>
-                value;
+        case ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriodPhaseC::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SecurityPolicy", 1, value);
+            return DataModelLogger::LogValue("rms extreme over voltage period phase c", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::ChannelMask::Id: {
-            chip::app::DataModel::Nullable<chip::ByteSpan> value;
+        case ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriodPhaseC::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ChannelMask", 1, value);
+            return DataModelLogger::LogValue("rms extreme under voltage period phase c", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::Id: {
-            chip::app::DataModel::Nullable<
-                chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType>
-                value;
+        case ElectricalMeasurement::Attributes::RmsVoltageSagPeriodPhaseC::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OperationalDatasetComponents", 1, value);
+            return DataModelLogger::LogValue("rms voltage sag period phase c", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> value;
+        case ElectricalMeasurement::Attributes::RmsVoltageSwellPeriodPhaseC::Id: {
+            uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActiveNetworkFaultsList", 1, value);
+            return DataModelLogger::LogValue("rms voltage swell period phase c", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::GeneratedCommandList::Id: {
+        case ElectricalMeasurement::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::AcceptedCommandList::Id: {
+        case ElectricalMeasurement::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::AttributeList::Id: {
+        case ElectricalMeasurement::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::FeatureMap::Id: {
+        case ElectricalMeasurement::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case ThreadNetworkDiagnostics::Attributes::ClusterRevision::Id: {
+        case ElectricalMeasurement::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -9554,390 +9506,438 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case TimeFormatLocalization::Id: {
+    case TestCluster::Id: {
         switch (path.mAttributeId)
         {
-        case TimeFormatLocalization::Attributes::HourFormat::Id: {
-            chip::app::Clusters::TimeFormatLocalization::HourFormat value;
+        case TestCluster::Attributes::Boolean::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("HourFormat", 1, value);
+            return DataModelLogger::LogValue("boolean", 1, value);
         }
-        case TimeFormatLocalization::Attributes::ActiveCalendarType::Id: {
-            chip::app::Clusters::TimeFormatLocalization::CalendarType value;
+        case TestCluster::Attributes::Bitmap8::Id: {
+            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActiveCalendarType", 1, value);
+            return DataModelLogger::LogValue("bitmap8", 1, value);
         }
-        case TimeFormatLocalization::Attributes::SupportedCalendarTypes::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::TimeFormatLocalization::CalendarType> value;
+        case TestCluster::Attributes::Bitmap16::Id: {
+            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SupportedCalendarTypes", 1, value);
+            return DataModelLogger::LogValue("bitmap16", 1, value);
         }
-        case TimeFormatLocalization::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case TestCluster::Attributes::Bitmap32::Id: {
+            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("bitmap32", 1, value);
         }
-        case TimeFormatLocalization::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case TestCluster::Attributes::Bitmap64::Id: {
+            chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("bitmap64", 1, value);
         }
-        case TimeFormatLocalization::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case TestCluster::Attributes::Int8u::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("int8u", 1, value);
         }
-        case TimeFormatLocalization::Attributes::FeatureMap::Id: {
+        case TestCluster::Attributes::Int16u::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("int16u", 1, value);
+        }
+        case TestCluster::Attributes::Int24u::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("int24u", 1, value);
         }
-        case TimeFormatLocalization::Attributes::ClusterRevision::Id: {
-            uint16_t value;
+        case TestCluster::Attributes::Int32u::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+            return DataModelLogger::LogValue("int32u", 1, value);
         }
+        case TestCluster::Attributes::Int40u::Id: {
+            uint64_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("int40u", 1, value);
         }
-        break;
-    }
-    case UnitLocalization::Id: {
-        switch (path.mAttributeId)
-        {
-        case UnitLocalization::Attributes::TemperatureUnit::Id: {
-            chip::app::Clusters::UnitLocalization::TempUnit value;
+        case TestCluster::Attributes::Int48u::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TemperatureUnit", 1, value);
+            return DataModelLogger::LogValue("int48u", 1, value);
         }
-        case UnitLocalization::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case TestCluster::Attributes::Int56u::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("int56u", 1, value);
         }
-        case UnitLocalization::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case TestCluster::Attributes::Int64u::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("int64u", 1, value);
         }
-        case UnitLocalization::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case TestCluster::Attributes::Int8s::Id: {
+            int8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("int8s", 1, value);
         }
-        case UnitLocalization::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case TestCluster::Attributes::Int16s::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("int16s", 1, value);
         }
-        case UnitLocalization::Attributes::ClusterRevision::Id: {
+        case TestCluster::Attributes::Int24s::Id: {
+            int32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("int24s", 1, value);
+        }
+        case TestCluster::Attributes::Int32s::Id: {
+            int32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("int32s", 1, value);
+        }
+        case TestCluster::Attributes::Int40s::Id: {
+            int64_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("int40s", 1, value);
+        }
+        case TestCluster::Attributes::Int48s::Id: {
+            int64_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("int48s", 1, value);
+        }
+        case TestCluster::Attributes::Int56s::Id: {
+            int64_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("int56s", 1, value);
+        }
+        case TestCluster::Attributes::Int64s::Id: {
+            int64_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("int64s", 1, value);
+        }
+        case TestCluster::Attributes::Enum8::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("enum8", 1, value);
+        }
+        case TestCluster::Attributes::Enum16::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+            return DataModelLogger::LogValue("enum16", 1, value);
+        }
+        case TestCluster::Attributes::FloatSingle::Id: {
+            float value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("float_single", 1, value);
         }
+        case TestCluster::Attributes::FloatDouble::Id: {
+            double value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("float_double", 1, value);
         }
-        break;
-    }
-    case UserLabel::Id: {
-        switch (path.mAttributeId)
-        {
-        case UserLabel::Attributes::LabelList::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::UserLabel::Structs::LabelStruct::DecodableType> value;
+        case TestCluster::Attributes::OctetString::Id: {
+            chip::ByteSpan value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("octet_string", 1, value);
+        }
+        case TestCluster::Attributes::ListInt8u::Id: {
+            chip::app::DataModel::DecodableList<uint8_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("list_int8u", 1, value);
+        }
+        case TestCluster::Attributes::ListOctetString::Id: {
+            chip::app::DataModel::DecodableList<chip::ByteSpan> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("list_octet_string", 1, value);
+        }
+        case TestCluster::Attributes::ListStructOctetString::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("label list", 1, value);
+            return DataModelLogger::LogValue("list_struct_octet_string", 1, value);
         }
-        case UserLabel::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case TestCluster::Attributes::LongOctetString::Id: {
+            chip::ByteSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("long_octet_string", 1, value);
         }
-        case UserLabel::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case TestCluster::Attributes::CharString::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("char_string", 1, value);
         }
-        case UserLabel::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case TestCluster::Attributes::LongCharString::Id: {
+            chip::CharSpan value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("long_char_string", 1, value);
         }
-        case UserLabel::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case TestCluster::Attributes::EpochUs::Id: {
+            uint64_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("epoch_us", 1, value);
         }
-        case UserLabel::Attributes::ClusterRevision::Id: {
-            uint16_t value;
+        case TestCluster::Attributes::EpochS::Id: {
+            uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+            return DataModelLogger::LogValue("epoch_s", 1, value);
         }
+        case TestCluster::Attributes::VendorId::Id: {
+            chip::VendorId value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("vendor_id", 1, value);
         }
-        break;
-    }
-    case WakeOnLan::Id: {
-        switch (path.mAttributeId)
-        {
-        case WakeOnLan::Attributes::MACAddress::Id: {
-            chip::CharSpan value;
+        case TestCluster::Attributes::ListNullablesAndOptionalsStruct::Id: {
+            chip::app::DataModel::DecodableList<
+                chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::DecodableType>
+                value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MACAddress", 1, value);
+            return DataModelLogger::LogValue("list_nullables_and_optionals_struct", 1, value);
         }
-        case WakeOnLan::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case TestCluster::Attributes::EnumAttr::Id: {
+            chip::app::Clusters::TestCluster::SimpleEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("enum_attr", 1, value);
         }
-        case WakeOnLan::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case TestCluster::Attributes::StructAttr::Id: {
+            chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("struct_attr", 1, value);
         }
-        case WakeOnLan::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case TestCluster::Attributes::RangeRestrictedInt8u::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("range_restricted_int8u", 1, value);
         }
-        case WakeOnLan::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case TestCluster::Attributes::RangeRestrictedInt8s::Id: {
+            int8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("range_restricted_int8s", 1, value);
         }
-        case WakeOnLan::Attributes::ClusterRevision::Id: {
+        case TestCluster::Attributes::RangeRestrictedInt16u::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
-        }
+            return DataModelLogger::LogValue("range_restricted_int16u", 1, value);
         }
-        break;
-    }
-    case WiFiNetworkDiagnostics::Id: {
-        switch (path.mAttributeId)
-        {
-        case WiFiNetworkDiagnostics::Attributes::Bssid::Id: {
-            chip::app::DataModel::Nullable<chip::ByteSpan> value;
+        case TestCluster::Attributes::RangeRestrictedInt16s::Id: {
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("bssid", 1, value);
+            return DataModelLogger::LogValue("range_restricted_int16s", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::SecurityType::Id: {
-            chip::app::DataModel::Nullable<chip::app::Clusters::WiFiNetworkDiagnostics::SecurityType> value;
+        case TestCluster::Attributes::ListLongOctetString::Id: {
+            chip::app::DataModel::DecodableList<chip::ByteSpan> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SecurityType", 1, value);
+            return DataModelLogger::LogValue("list_long_octet_string", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::WiFiVersion::Id: {
-            chip::app::DataModel::Nullable<chip::app::Clusters::WiFiNetworkDiagnostics::WiFiVersionType> value;
+        case TestCluster::Attributes::ListFabricScoped::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestFabricScoped::DecodableType> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("WiFiVersion", 1, value);
+            return DataModelLogger::LogValue("list_fabric_scoped", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::ChannelNumber::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case TestCluster::Attributes::TimedWriteBoolean::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ChannelNumber", 1, value);
+            return DataModelLogger::LogValue("timed_write_boolean", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::Rssi::Id: {
-            chip::app::DataModel::Nullable<int8_t> value;
+        case TestCluster::Attributes::GeneralErrorBoolean::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Rssi", 1, value);
+            return DataModelLogger::LogValue("general_error_boolean", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::BeaconLostCount::Id: {
-            uint32_t value;
+        case TestCluster::Attributes::ClusterErrorBoolean::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BeaconLostCount", 1, value);
+            return DataModelLogger::LogValue("cluster_error_boolean", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::BeaconRxCount::Id: {
-            uint32_t value;
+        case TestCluster::Attributes::Unsupported::Id: {
+            bool value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BeaconRxCount", 1, value);
+            return DataModelLogger::LogValue("unsupported", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::PacketMulticastRxCount::Id: {
-            uint32_t value;
+        case TestCluster::Attributes::NullableBoolean::Id: {
+            chip::app::DataModel::Nullable<bool> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PacketMulticastRxCount", 1, value);
+            return DataModelLogger::LogValue("nullable_boolean", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::PacketMulticastTxCount::Id: {
-            uint32_t value;
+        case TestCluster::Attributes::NullableBitmap8::Id: {
+            chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PacketMulticastTxCount", 1, value);
+            return DataModelLogger::LogValue("nullable_bitmap8", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::PacketUnicastRxCount::Id: {
-            uint32_t value;
+        case TestCluster::Attributes::NullableBitmap16::Id: {
+            chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap16MaskMap>> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PacketUnicastRxCount", 1, value);
+            return DataModelLogger::LogValue("nullable_bitmap16", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::PacketUnicastTxCount::Id: {
-            uint32_t value;
+        case TestCluster::Attributes::NullableBitmap32::Id: {
+            chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap32MaskMap>> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PacketUnicastTxCount", 1, value);
+            return DataModelLogger::LogValue("nullable_bitmap32", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::CurrentMaxRate::Id: {
-            uint64_t value;
+        case TestCluster::Attributes::NullableBitmap64::Id: {
+            chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap64MaskMap>> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentMaxRate", 1, value);
+            return DataModelLogger::LogValue("nullable_bitmap64", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::OverrunCount::Id: {
-            uint64_t value;
+        case TestCluster::Attributes::NullableInt8u::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OverrunCount", 1, value);
+            return DataModelLogger::LogValue("nullable_int8u", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::GeneratedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case TestCluster::Attributes::NullableInt16u::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
+            return DataModelLogger::LogValue("nullable_int16u", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::AcceptedCommandList::Id: {
-            chip::app::DataModel::DecodableList<chip::CommandId> value;
+        case TestCluster::Attributes::NullableInt24u::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
+            return DataModelLogger::LogValue("nullable_int24u", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::AttributeList::Id: {
-            chip::app::DataModel::DecodableList<chip::AttributeId> value;
+        case TestCluster::Attributes::NullableInt32u::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AttributeList", 1, value);
+            return DataModelLogger::LogValue("nullable_int32u", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::FeatureMap::Id: {
-            uint32_t value;
+        case TestCluster::Attributes::NullableInt40u::Id: {
+            chip::app::DataModel::Nullable<uint64_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("FeatureMap", 1, value);
+            return DataModelLogger::LogValue("nullable_int40u", 1, value);
         }
-        case WiFiNetworkDiagnostics::Attributes::ClusterRevision::Id: {
-            uint16_t value;
+        case TestCluster::Attributes::NullableInt48u::Id: {
+            chip::app::DataModel::Nullable<uint64_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClusterRevision", 1, value);
-        }
+            return DataModelLogger::LogValue("nullable_int48u", 1, value);
         }
-        break;
-    }
-    case WindowCovering::Id: {
-        switch (path.mAttributeId)
-        {
-        case WindowCovering::Attributes::Type::Id: {
-            chip::app::Clusters::WindowCovering::Type value;
+        case TestCluster::Attributes::NullableInt56u::Id: {
+            chip::app::DataModel::Nullable<uint64_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Type", 1, value);
+            return DataModelLogger::LogValue("nullable_int56u", 1, value);
         }
-        case WindowCovering::Attributes::PhysicalClosedLimitLift::Id: {
-            uint16_t value;
+        case TestCluster::Attributes::NullableInt64u::Id: {
+            chip::app::DataModel::Nullable<uint64_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PhysicalClosedLimitLift", 1, value);
+            return DataModelLogger::LogValue("nullable_int64u", 1, value);
         }
-        case WindowCovering::Attributes::PhysicalClosedLimitTilt::Id: {
-            uint16_t value;
+        case TestCluster::Attributes::NullableInt8s::Id: {
+            chip::app::DataModel::Nullable<int8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PhysicalClosedLimitTilt", 1, value);
+            return DataModelLogger::LogValue("nullable_int8s", 1, value);
         }
-        case WindowCovering::Attributes::CurrentPositionLift::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case TestCluster::Attributes::NullableInt16s::Id: {
+            chip::app::DataModel::Nullable<int16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentPositionLift", 1, value);
+            return DataModelLogger::LogValue("nullable_int16s", 1, value);
         }
-        case WindowCovering::Attributes::CurrentPositionTilt::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+        case TestCluster::Attributes::NullableInt24s::Id: {
+            chip::app::DataModel::Nullable<int32_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentPositionTilt", 1, value);
+            return DataModelLogger::LogValue("nullable_int24s", 1, value);
         }
-        case WindowCovering::Attributes::NumberOfActuationsLift::Id: {
-            uint16_t value;
+        case TestCluster::Attributes::NullableInt32s::Id: {
+            chip::app::DataModel::Nullable<int32_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NumberOfActuationsLift", 1, value);
+            return DataModelLogger::LogValue("nullable_int32s", 1, value);
         }
-        case WindowCovering::Attributes::NumberOfActuationsTilt::Id: {
-            uint16_t value;
+        case TestCluster::Attributes::NullableInt40s::Id: {
+            chip::app::DataModel::Nullable<int64_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NumberOfActuationsTilt", 1, value);
+            return DataModelLogger::LogValue("nullable_int40s", 1, value);
         }
-        case WindowCovering::Attributes::ConfigStatus::Id: {
-            chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> value;
+        case TestCluster::Attributes::NullableInt48s::Id: {
+            chip::app::DataModel::Nullable<int64_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ConfigStatus", 1, value);
+            return DataModelLogger::LogValue("nullable_int48s", 1, value);
         }
-        case WindowCovering::Attributes::CurrentPositionLiftPercentage::Id: {
-            chip::app::DataModel::Nullable<chip::Percent> value;
+        case TestCluster::Attributes::NullableInt56s::Id: {
+            chip::app::DataModel::Nullable<int64_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentPositionLiftPercentage", 1, value);
+            return DataModelLogger::LogValue("nullable_int56s", 1, value);
         }
-        case WindowCovering::Attributes::CurrentPositionTiltPercentage::Id: {
-            chip::app::DataModel::Nullable<chip::Percent> value;
+        case TestCluster::Attributes::NullableInt64s::Id: {
+            chip::app::DataModel::Nullable<int64_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentPositionTiltPercentage", 1, value);
+            return DataModelLogger::LogValue("nullable_int64s", 1, value);
         }
-        case WindowCovering::Attributes::OperationalStatus::Id: {
-            chip::BitMask<chip::app::Clusters::WindowCovering::OperationalStatus> value;
+        case TestCluster::Attributes::NullableEnum8::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("OperationalStatus", 1, value);
+            return DataModelLogger::LogValue("nullable_enum8", 1, value);
         }
-        case WindowCovering::Attributes::TargetPositionLiftPercent100ths::Id: {
-            chip::app::DataModel::Nullable<chip::Percent100ths> value;
+        case TestCluster::Attributes::NullableEnum16::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TargetPositionLiftPercent100ths", 1, value);
+            return DataModelLogger::LogValue("nullable_enum16", 1, value);
         }
-        case WindowCovering::Attributes::TargetPositionTiltPercent100ths::Id: {
-            chip::app::DataModel::Nullable<chip::Percent100ths> value;
+        case TestCluster::Attributes::NullableFloatSingle::Id: {
+            chip::app::DataModel::Nullable<float> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("TargetPositionTiltPercent100ths", 1, value);
+            return DataModelLogger::LogValue("nullable_float_single", 1, value);
         }
-        case WindowCovering::Attributes::EndProductType::Id: {
-            chip::app::Clusters::WindowCovering::EndProductType value;
+        case TestCluster::Attributes::NullableFloatDouble::Id: {
+            chip::app::DataModel::Nullable<double> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EndProductType", 1, value);
+            return DataModelLogger::LogValue("nullable_float_double", 1, value);
         }
-        case WindowCovering::Attributes::CurrentPositionLiftPercent100ths::Id: {
-            chip::app::DataModel::Nullable<chip::Percent100ths> value;
+        case TestCluster::Attributes::NullableOctetString::Id: {
+            chip::app::DataModel::Nullable<chip::ByteSpan> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentPositionLiftPercent100ths", 1, value);
+            return DataModelLogger::LogValue("nullable_octet_string", 1, value);
         }
-        case WindowCovering::Attributes::CurrentPositionTiltPercent100ths::Id: {
-            chip::app::DataModel::Nullable<chip::Percent100ths> value;
+        case TestCluster::Attributes::NullableCharString::Id: {
+            chip::app::DataModel::Nullable<chip::CharSpan> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CurrentPositionTiltPercent100ths", 1, value);
+            return DataModelLogger::LogValue("nullable_char_string", 1, value);
         }
-        case WindowCovering::Attributes::InstalledOpenLimitLift::Id: {
-            uint16_t value;
+        case TestCluster::Attributes::NullableEnumAttr::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("InstalledOpenLimitLift", 1, value);
+            return DataModelLogger::LogValue("nullable_enum_attr", 1, value);
         }
-        case WindowCovering::Attributes::InstalledClosedLimitLift::Id: {
-            uint16_t value;
+        case TestCluster::Attributes::NullableStruct::Id: {
+            chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("InstalledClosedLimitLift", 1, value);
+            return DataModelLogger::LogValue("nullable_struct", 1, value);
         }
-        case WindowCovering::Attributes::InstalledOpenLimitTilt::Id: {
-            uint16_t value;
+        case TestCluster::Attributes::NullableRangeRestrictedInt8u::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("InstalledOpenLimitTilt", 1, value);
+            return DataModelLogger::LogValue("nullable_range_restricted_int8u", 1, value);
         }
-        case WindowCovering::Attributes::InstalledClosedLimitTilt::Id: {
-            uint16_t value;
+        case TestCluster::Attributes::NullableRangeRestrictedInt8s::Id: {
+            chip::app::DataModel::Nullable<int8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("InstalledClosedLimitTilt", 1, value);
+            return DataModelLogger::LogValue("nullable_range_restricted_int8s", 1, value);
         }
-        case WindowCovering::Attributes::Mode::Id: {
-            chip::BitMask<chip::app::Clusters::WindowCovering::Mode> value;
+        case TestCluster::Attributes::NullableRangeRestrictedInt16u::Id: {
+            chip::app::DataModel::Nullable<uint16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Mode", 1, value);
+            return DataModelLogger::LogValue("nullable_range_restricted_int16u", 1, value);
         }
-        case WindowCovering::Attributes::SafetyStatus::Id: {
-            chip::BitMask<chip::app::Clusters::WindowCovering::SafetyStatus> value;
+        case TestCluster::Attributes::NullableRangeRestrictedInt16s::Id: {
+            chip::app::DataModel::Nullable<int16_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SafetyStatus", 1, value);
+            return DataModelLogger::LogValue("nullable_range_restricted_int16s", 1, value);
         }
-        case WindowCovering::Attributes::GeneratedCommandList::Id: {
+        case TestCluster::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
         }
-        case WindowCovering::Attributes::AcceptedCommandList::Id: {
+        case TestCluster::Attributes::AcceptedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
         }
-        case WindowCovering::Attributes::AttributeList::Id: {
+        case TestCluster::Attributes::AttributeList::Id: {
             chip::app::DataModel::DecodableList<chip::AttributeId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AttributeList", 1, value);
         }
-        case WindowCovering::Attributes::FeatureMap::Id: {
+        case TestCluster::Attributes::FeatureMap::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("FeatureMap", 1, value);
         }
-        case WindowCovering::Attributes::ClusterRevision::Id: {
+        case TestCluster::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -9959,194 +9959,116 @@ CHIP_ERROR DataModelLogger::LogCommand(const chip::app::ConcreteCommandPath & pa
 
     switch (path.mClusterId)
     {
-    case AccountLogin::Id: {
-        switch (path.mCommandId)
-        {
-        case AccountLogin::Commands::GetSetupPINResponse::Id: {
-            AccountLogin::Commands::GetSetupPINResponse::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GetSetupPINResponse", 1, value);
-        }
-        }
-        break;
-    }
-    case ApplicationLauncher::Id: {
+    case Groups::Id: {
         switch (path.mCommandId)
         {
-        case ApplicationLauncher::Commands::LauncherResponse::Id: {
-            ApplicationLauncher::Commands::LauncherResponse::DecodableType value;
+        case Groups::Commands::AddGroupResponse::Id: {
+            Groups::Commands::AddGroupResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LauncherResponse", 1, value);
-        }
+            return DataModelLogger::LogValue("AddGroupResponse", 1, value);
         }
-        break;
-    }
-    case Channel::Id: {
-        switch (path.mCommandId)
-        {
-        case Channel::Commands::ChangeChannelResponse::Id: {
-            Channel::Commands::ChangeChannelResponse::DecodableType value;
+        case Groups::Commands::ViewGroupResponse::Id: {
+            Groups::Commands::ViewGroupResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ChangeChannelResponse", 1, value);
-        }
+            return DataModelLogger::LogValue("ViewGroupResponse", 1, value);
         }
-        break;
-    }
-    case ContentLauncher::Id: {
-        switch (path.mCommandId)
-        {
-        case ContentLauncher::Commands::LaunchResponse::Id: {
-            ContentLauncher::Commands::LaunchResponse::DecodableType value;
+        case Groups::Commands::GetGroupMembershipResponse::Id: {
+            Groups::Commands::GetGroupMembershipResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LaunchResponse", 1, value);
-        }
+            return DataModelLogger::LogValue("GetGroupMembershipResponse", 1, value);
         }
-        break;
-    }
-    case DiagnosticLogs::Id: {
-        switch (path.mCommandId)
-        {
-        case DiagnosticLogs::Commands::RetrieveLogsResponse::Id: {
-            DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType value;
+        case Groups::Commands::RemoveGroupResponse::Id: {
+            Groups::Commands::RemoveGroupResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RetrieveLogsResponse", 1, value);
+            return DataModelLogger::LogValue("RemoveGroupResponse", 1, value);
         }
         }
         break;
     }
-    case DoorLock::Id: {
+    case Scenes::Id: {
         switch (path.mCommandId)
         {
-        case DoorLock::Commands::GetWeekDayScheduleResponse::Id: {
-            DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GetWeekDayScheduleResponse", 1, value);
-        }
-        case DoorLock::Commands::GetYearDayScheduleResponse::Id: {
-            DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GetYearDayScheduleResponse", 1, value);
-        }
-        case DoorLock::Commands::GetHolidayScheduleResponse::Id: {
-            DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GetHolidayScheduleResponse", 1, value);
-        }
-        case DoorLock::Commands::GetUserResponse::Id: {
-            DoorLock::Commands::GetUserResponse::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GetUserResponse", 1, value);
-        }
-        case DoorLock::Commands::SetCredentialResponse::Id: {
-            DoorLock::Commands::SetCredentialResponse::DecodableType value;
+        case Scenes::Commands::AddSceneResponse::Id: {
+            Scenes::Commands::AddSceneResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SetCredentialResponse", 1, value);
+            return DataModelLogger::LogValue("AddSceneResponse", 1, value);
         }
-        case DoorLock::Commands::GetCredentialStatusResponse::Id: {
-            DoorLock::Commands::GetCredentialStatusResponse::DecodableType value;
+        case Scenes::Commands::ViewSceneResponse::Id: {
+            Scenes::Commands::ViewSceneResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GetCredentialStatusResponse", 1, value);
-        }
+            return DataModelLogger::LogValue("ViewSceneResponse", 1, value);
         }
-        break;
-    }
-    case ElectricalMeasurement::Id: {
-        switch (path.mCommandId)
-        {
-        case ElectricalMeasurement::Commands::GetProfileInfoResponseCommand::Id: {
-            ElectricalMeasurement::Commands::GetProfileInfoResponseCommand::DecodableType value;
+        case Scenes::Commands::RemoveSceneResponse::Id: {
+            Scenes::Commands::RemoveSceneResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GetProfileInfoResponseCommand", 1, value);
+            return DataModelLogger::LogValue("RemoveSceneResponse", 1, value);
         }
-        case ElectricalMeasurement::Commands::GetMeasurementProfileResponseCommand::Id: {
-            ElectricalMeasurement::Commands::GetMeasurementProfileResponseCommand::DecodableType value;
+        case Scenes::Commands::RemoveAllScenesResponse::Id: {
+            Scenes::Commands::RemoveAllScenesResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GetMeasurementProfileResponseCommand", 1, value);
-        }
+            return DataModelLogger::LogValue("RemoveAllScenesResponse", 1, value);
         }
-        break;
-    }
-    case GeneralCommissioning::Id: {
-        switch (path.mCommandId)
-        {
-        case GeneralCommissioning::Commands::ArmFailSafeResponse::Id: {
-            GeneralCommissioning::Commands::ArmFailSafeResponse::DecodableType value;
+        case Scenes::Commands::StoreSceneResponse::Id: {
+            Scenes::Commands::StoreSceneResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ArmFailSafeResponse", 1, value);
+            return DataModelLogger::LogValue("StoreSceneResponse", 1, value);
         }
-        case GeneralCommissioning::Commands::SetRegulatoryConfigResponse::Id: {
-            GeneralCommissioning::Commands::SetRegulatoryConfigResponse::DecodableType value;
+        case Scenes::Commands::GetSceneMembershipResponse::Id: {
+            Scenes::Commands::GetSceneMembershipResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SetRegulatoryConfigResponse", 1, value);
+            return DataModelLogger::LogValue("GetSceneMembershipResponse", 1, value);
         }
-        case GeneralCommissioning::Commands::CommissioningCompleteResponse::Id: {
-            GeneralCommissioning::Commands::CommissioningCompleteResponse::DecodableType value;
+        case Scenes::Commands::EnhancedAddSceneResponse::Id: {
+            Scenes::Commands::EnhancedAddSceneResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CommissioningCompleteResponse", 1, value);
-        }
+            return DataModelLogger::LogValue("EnhancedAddSceneResponse", 1, value);
         }
-        break;
-    }
-    case GroupKeyManagement::Id: {
-        switch (path.mCommandId)
-        {
-        case GroupKeyManagement::Commands::KeySetReadResponse::Id: {
-            GroupKeyManagement::Commands::KeySetReadResponse::DecodableType value;
+        case Scenes::Commands::EnhancedViewSceneResponse::Id: {
+            Scenes::Commands::EnhancedViewSceneResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("KeySetReadResponse", 1, value);
+            return DataModelLogger::LogValue("EnhancedViewSceneResponse", 1, value);
         }
-        case GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::Id: {
-            GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::DecodableType value;
+        case Scenes::Commands::CopySceneResponse::Id: {
+            Scenes::Commands::CopySceneResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("KeySetReadAllIndicesResponse", 1, value);
+            return DataModelLogger::LogValue("CopySceneResponse", 1, value);
         }
         }
         break;
     }
-    case Groups::Id: {
+    case OtaSoftwareUpdateProvider::Id: {
         switch (path.mCommandId)
         {
-        case Groups::Commands::AddGroupResponse::Id: {
-            Groups::Commands::AddGroupResponse::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AddGroupResponse", 1, value);
-        }
-        case Groups::Commands::ViewGroupResponse::Id: {
-            Groups::Commands::ViewGroupResponse::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ViewGroupResponse", 1, value);
-        }
-        case Groups::Commands::GetGroupMembershipResponse::Id: {
-            Groups::Commands::GetGroupMembershipResponse::DecodableType value;
+        case OtaSoftwareUpdateProvider::Commands::QueryImageResponse::Id: {
+            OtaSoftwareUpdateProvider::Commands::QueryImageResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GetGroupMembershipResponse", 1, value);
+            return DataModelLogger::LogValue("QueryImageResponse", 1, value);
         }
-        case Groups::Commands::RemoveGroupResponse::Id: {
-            Groups::Commands::RemoveGroupResponse::DecodableType value;
+        case OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::Id: {
+            OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RemoveGroupResponse", 1, value);
+            return DataModelLogger::LogValue("ApplyUpdateResponse", 1, value);
         }
         }
         break;
     }
-    case KeypadInput::Id: {
+    case GeneralCommissioning::Id: {
         switch (path.mCommandId)
         {
-        case KeypadInput::Commands::SendKeyResponse::Id: {
-            KeypadInput::Commands::SendKeyResponse::DecodableType value;
+        case GeneralCommissioning::Commands::ArmFailSafeResponse::Id: {
+            GeneralCommissioning::Commands::ArmFailSafeResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SendKeyResponse", 1, value);
+            return DataModelLogger::LogValue("ArmFailSafeResponse", 1, value);
         }
+        case GeneralCommissioning::Commands::SetRegulatoryConfigResponse::Id: {
+            GeneralCommissioning::Commands::SetRegulatoryConfigResponse::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SetRegulatoryConfigResponse", 1, value);
         }
-        break;
-    }
-    case MediaPlayback::Id: {
-        switch (path.mCommandId)
-        {
-        case MediaPlayback::Commands::PlaybackResponse::Id: {
-            MediaPlayback::Commands::PlaybackResponse::DecodableType value;
+        case GeneralCommissioning::Commands::CommissioningCompleteResponse::Id: {
+            GeneralCommissioning::Commands::CommissioningCompleteResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("PlaybackResponse", 1, value);
+            return DataModelLogger::LogValue("CommissioningCompleteResponse", 1, value);
         }
         }
         break;
@@ -10172,18 +10094,13 @@ CHIP_ERROR DataModelLogger::LogCommand(const chip::app::ConcreteCommandPath & pa
         }
         break;
     }
-    case OtaSoftwareUpdateProvider::Id: {
+    case DiagnosticLogs::Id: {
         switch (path.mCommandId)
         {
-        case OtaSoftwareUpdateProvider::Commands::QueryImageResponse::Id: {
-            OtaSoftwareUpdateProvider::Commands::QueryImageResponse::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("QueryImageResponse", 1, value);
-        }
-        case OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::Id: {
-            OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::DecodableType value;
+        case DiagnosticLogs::Commands::RetrieveLogsResponse::Id: {
+            DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ApplyUpdateResponse", 1, value);
+            return DataModelLogger::LogValue("RetrieveLogsResponse", 1, value);
         }
         }
         break;
@@ -10214,53 +10131,76 @@ CHIP_ERROR DataModelLogger::LogCommand(const chip::app::ConcreteCommandPath & pa
         }
         break;
     }
-    case Scenes::Id: {
+    case GroupKeyManagement::Id: {
         switch (path.mCommandId)
         {
-        case Scenes::Commands::AddSceneResponse::Id: {
-            Scenes::Commands::AddSceneResponse::DecodableType value;
+        case GroupKeyManagement::Commands::KeySetReadResponse::Id: {
+            GroupKeyManagement::Commands::KeySetReadResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AddSceneResponse", 1, value);
+            return DataModelLogger::LogValue("KeySetReadResponse", 1, value);
         }
-        case Scenes::Commands::ViewSceneResponse::Id: {
-            Scenes::Commands::ViewSceneResponse::DecodableType value;
+        case GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::Id: {
+            GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ViewSceneResponse", 1, value);
+            return DataModelLogger::LogValue("KeySetReadAllIndicesResponse", 1, value);
         }
-        case Scenes::Commands::RemoveSceneResponse::Id: {
-            Scenes::Commands::RemoveSceneResponse::DecodableType value;
+        }
+        break;
+    }
+    case DoorLock::Id: {
+        switch (path.mCommandId)
+        {
+        case DoorLock::Commands::GetWeekDayScheduleResponse::Id: {
+            DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RemoveSceneResponse", 1, value);
+            return DataModelLogger::LogValue("GetWeekDayScheduleResponse", 1, value);
         }
-        case Scenes::Commands::RemoveAllScenesResponse::Id: {
-            Scenes::Commands::RemoveAllScenesResponse::DecodableType value;
+        case DoorLock::Commands::GetYearDayScheduleResponse::Id: {
+            DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RemoveAllScenesResponse", 1, value);
+            return DataModelLogger::LogValue("GetYearDayScheduleResponse", 1, value);
         }
-        case Scenes::Commands::StoreSceneResponse::Id: {
-            Scenes::Commands::StoreSceneResponse::DecodableType value;
+        case DoorLock::Commands::GetHolidayScheduleResponse::Id: {
+            DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("StoreSceneResponse", 1, value);
+            return DataModelLogger::LogValue("GetHolidayScheduleResponse", 1, value);
         }
-        case Scenes::Commands::GetSceneMembershipResponse::Id: {
-            Scenes::Commands::GetSceneMembershipResponse::DecodableType value;
+        case DoorLock::Commands::GetUserResponse::Id: {
+            DoorLock::Commands::GetUserResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GetSceneMembershipResponse", 1, value);
+            return DataModelLogger::LogValue("GetUserResponse", 1, value);
         }
-        case Scenes::Commands::EnhancedAddSceneResponse::Id: {
-            Scenes::Commands::EnhancedAddSceneResponse::DecodableType value;
+        case DoorLock::Commands::SetCredentialResponse::Id: {
+            DoorLock::Commands::SetCredentialResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EnhancedAddSceneResponse", 1, value);
+            return DataModelLogger::LogValue("SetCredentialResponse", 1, value);
         }
-        case Scenes::Commands::EnhancedViewSceneResponse::Id: {
-            Scenes::Commands::EnhancedViewSceneResponse::DecodableType value;
+        case DoorLock::Commands::GetCredentialStatusResponse::Id: {
+            DoorLock::Commands::GetCredentialStatusResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("EnhancedViewSceneResponse", 1, value);
+            return DataModelLogger::LogValue("GetCredentialStatusResponse", 1, value);
         }
-        case Scenes::Commands::CopySceneResponse::Id: {
-            Scenes::Commands::CopySceneResponse::DecodableType value;
+        }
+        break;
+    }
+    case Thermostat::Id: {
+        switch (path.mCommandId)
+        {
+        case Thermostat::Commands::GetWeeklyScheduleResponse::Id: {
+            Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("CopySceneResponse", 1, value);
+            return DataModelLogger::LogValue("GetWeeklyScheduleResponse", 1, value);
+        }
+        }
+        break;
+    }
+    case Channel::Id: {
+        switch (path.mCommandId)
+        {
+        case Channel::Commands::ChangeChannelResponse::Id: {
+            Channel::Commands::ChangeChannelResponse::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ChangeChannelResponse", 1, value);
         }
         }
         break;
@@ -10276,6 +10216,77 @@ CHIP_ERROR DataModelLogger::LogCommand(const chip::app::ConcreteCommandPath & pa
         }
         break;
     }
+    case MediaPlayback::Id: {
+        switch (path.mCommandId)
+        {
+        case MediaPlayback::Commands::PlaybackResponse::Id: {
+            MediaPlayback::Commands::PlaybackResponse::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("PlaybackResponse", 1, value);
+        }
+        }
+        break;
+    }
+    case KeypadInput::Id: {
+        switch (path.mCommandId)
+        {
+        case KeypadInput::Commands::SendKeyResponse::Id: {
+            KeypadInput::Commands::SendKeyResponse::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SendKeyResponse", 1, value);
+        }
+        }
+        break;
+    }
+    case ContentLauncher::Id: {
+        switch (path.mCommandId)
+        {
+        case ContentLauncher::Commands::LaunchResponse::Id: {
+            ContentLauncher::Commands::LaunchResponse::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("LaunchResponse", 1, value);
+        }
+        }
+        break;
+    }
+    case ApplicationLauncher::Id: {
+        switch (path.mCommandId)
+        {
+        case ApplicationLauncher::Commands::LauncherResponse::Id: {
+            ApplicationLauncher::Commands::LauncherResponse::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("LauncherResponse", 1, value);
+        }
+        }
+        break;
+    }
+    case AccountLogin::Id: {
+        switch (path.mCommandId)
+        {
+        case AccountLogin::Commands::GetSetupPINResponse::Id: {
+            AccountLogin::Commands::GetSetupPINResponse::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("GetSetupPINResponse", 1, value);
+        }
+        }
+        break;
+    }
+    case ElectricalMeasurement::Id: {
+        switch (path.mCommandId)
+        {
+        case ElectricalMeasurement::Commands::GetProfileInfoResponseCommand::Id: {
+            ElectricalMeasurement::Commands::GetProfileInfoResponseCommand::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("GetProfileInfoResponseCommand", 1, value);
+        }
+        case ElectricalMeasurement::Commands::GetMeasurementProfileResponseCommand::Id: {
+            ElectricalMeasurement::Commands::GetMeasurementProfileResponseCommand::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("GetMeasurementProfileResponseCommand", 1, value);
+        }
+        }
+        break;
+    }
     case TestCluster::Id: {
         switch (path.mCommandId)
         {
@@ -10342,17 +10353,6 @@ CHIP_ERROR DataModelLogger::LogCommand(const chip::app::ConcreteCommandPath & pa
         }
         break;
     }
-    case Thermostat::Id: {
-        switch (path.mCommandId)
-        {
-        case Thermostat::Commands::GetWeeklyScheduleResponse::Id: {
-            Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("GetWeeklyScheduleResponse", 1, value);
-        }
-        }
-        break;
-    }
     default:
         break;
     }
@@ -10394,65 +10394,144 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
         case AccessControl::Events::AccessControlEntryChanged::Id: {
             chip::app::Clusters::AccessControl::Events::AccessControlEntryChanged::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AccessControlEntryChanged", 1, value);
+            return DataModelLogger::LogValue("AccessControlEntryChanged", 1, value);
+        }
+        case AccessControl::Events::AccessControlExtensionChanged::Id: {
+            chip::app::Clusters::AccessControl::Events::AccessControlExtensionChanged::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AccessControlExtensionChanged", 1, value);
+        }
+        }
+        break;
+    }
+    case BridgedActions::Id: {
+        switch (header.mPath.mEventId)
+        {
+        case BridgedActions::Events::StateChanged::Id: {
+            chip::app::Clusters::BridgedActions::Events::StateChanged::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("StateChanged", 1, value);
+        }
+        case BridgedActions::Events::ActionFailed::Id: {
+            chip::app::Clusters::BridgedActions::Events::ActionFailed::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ActionFailed", 1, value);
+        }
+        }
+        break;
+    }
+    case Basic::Id: {
+        switch (header.mPath.mEventId)
+        {
+        case Basic::Events::StartUp::Id: {
+            chip::app::Clusters::Basic::Events::StartUp::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("StartUp", 1, value);
+        }
+        case Basic::Events::ShutDown::Id: {
+            chip::app::Clusters::Basic::Events::ShutDown::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ShutDown", 1, value);
+        }
+        case Basic::Events::Leave::Id: {
+            chip::app::Clusters::Basic::Events::Leave::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("Leave", 1, value);
+        }
+        case Basic::Events::ReachableChanged::Id: {
+            chip::app::Clusters::Basic::Events::ReachableChanged::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ReachableChanged", 1, value);
+        }
+        }
+        break;
+    }
+    case OtaSoftwareUpdateRequestor::Id: {
+        switch (header.mPath.mEventId)
+        {
+        case OtaSoftwareUpdateRequestor::Events::StateTransition::Id: {
+            chip::app::Clusters::OtaSoftwareUpdateRequestor::Events::StateTransition::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("StateTransition", 1, value);
         }
-        case AccessControl::Events::AccessControlExtensionChanged::Id: {
-            chip::app::Clusters::AccessControl::Events::AccessControlExtensionChanged::DecodableType value;
+        case OtaSoftwareUpdateRequestor::Events::VersionApplied::Id: {
+            chip::app::Clusters::OtaSoftwareUpdateRequestor::Events::VersionApplied::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AccessControlExtensionChanged", 1, value);
+            return DataModelLogger::LogValue("VersionApplied", 1, value);
+        }
+        case OtaSoftwareUpdateRequestor::Events::DownloadError::Id: {
+            chip::app::Clusters::OtaSoftwareUpdateRequestor::Events::DownloadError::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("DownloadError", 1, value);
         }
         }
         break;
     }
-    case Basic::Id: {
+    case GeneralDiagnostics::Id: {
         switch (header.mPath.mEventId)
         {
-        case Basic::Events::StartUp::Id: {
-            chip::app::Clusters::Basic::Events::StartUp::DecodableType value;
+        case GeneralDiagnostics::Events::HardwareFaultChange::Id: {
+            chip::app::Clusters::GeneralDiagnostics::Events::HardwareFaultChange::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("StartUp", 1, value);
+            return DataModelLogger::LogValue("HardwareFaultChange", 1, value);
         }
-        case Basic::Events::ShutDown::Id: {
-            chip::app::Clusters::Basic::Events::ShutDown::DecodableType value;
+        case GeneralDiagnostics::Events::RadioFaultChange::Id: {
+            chip::app::Clusters::GeneralDiagnostics::Events::RadioFaultChange::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ShutDown", 1, value);
+            return DataModelLogger::LogValue("RadioFaultChange", 1, value);
         }
-        case Basic::Events::Leave::Id: {
-            chip::app::Clusters::Basic::Events::Leave::DecodableType value;
+        case GeneralDiagnostics::Events::NetworkFaultChange::Id: {
+            chip::app::Clusters::GeneralDiagnostics::Events::NetworkFaultChange::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Leave", 1, value);
+            return DataModelLogger::LogValue("NetworkFaultChange", 1, value);
         }
-        case Basic::Events::ReachableChanged::Id: {
-            chip::app::Clusters::Basic::Events::ReachableChanged::DecodableType value;
+        case GeneralDiagnostics::Events::BootReason::Id: {
+            chip::app::Clusters::GeneralDiagnostics::Events::BootReason::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ReachableChanged", 1, value);
+            return DataModelLogger::LogValue("BootReason", 1, value);
         }
         }
         break;
     }
-    case BooleanState::Id: {
+    case SoftwareDiagnostics::Id: {
         switch (header.mPath.mEventId)
         {
-        case BooleanState::Events::StateChange::Id: {
-            chip::app::Clusters::BooleanState::Events::StateChange::DecodableType value;
+        case SoftwareDiagnostics::Events::SoftwareFault::Id: {
+            chip::app::Clusters::SoftwareDiagnostics::Events::SoftwareFault::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("StateChange", 1, value);
+            return DataModelLogger::LogValue("SoftwareFault", 1, value);
         }
         }
         break;
     }
-    case BridgedActions::Id: {
+    case ThreadNetworkDiagnostics::Id: {
         switch (header.mPath.mEventId)
         {
-        case BridgedActions::Events::StateChanged::Id: {
-            chip::app::Clusters::BridgedActions::Events::StateChanged::DecodableType value;
+        case ThreadNetworkDiagnostics::Events::ConnectionStatus::Id: {
+            chip::app::Clusters::ThreadNetworkDiagnostics::Events::ConnectionStatus::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("StateChanged", 1, value);
+            return DataModelLogger::LogValue("ConnectionStatus", 1, value);
         }
-        case BridgedActions::Events::ActionFailed::Id: {
-            chip::app::Clusters::BridgedActions::Events::ActionFailed::DecodableType value;
+        }
+        break;
+    }
+    case WiFiNetworkDiagnostics::Id: {
+        switch (header.mPath.mEventId)
+        {
+        case WiFiNetworkDiagnostics::Events::Disconnection::Id: {
+            chip::app::Clusters::WiFiNetworkDiagnostics::Events::Disconnection::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActionFailed", 1, value);
+            return DataModelLogger::LogValue("Disconnection", 1, value);
+        }
+        case WiFiNetworkDiagnostics::Events::AssociationFailure::Id: {
+            chip::app::Clusters::WiFiNetworkDiagnostics::Events::AssociationFailure::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AssociationFailure", 1, value);
+        }
+        case WiFiNetworkDiagnostics::Events::ConnectionStatus::Id: {
+            chip::app::Clusters::WiFiNetworkDiagnostics::Events::ConnectionStatus::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ConnectionStatus", 1, value);
         }
         }
         break;
@@ -10483,80 +10562,85 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
         }
         break;
     }
-    case DoorLock::Id: {
+    case Switch::Id: {
         switch (header.mPath.mEventId)
         {
-        case DoorLock::Events::DoorLockAlarm::Id: {
-            chip::app::Clusters::DoorLock::Events::DoorLockAlarm::DecodableType value;
+        case Switch::Events::SwitchLatched::Id: {
+            chip::app::Clusters::Switch::Events::SwitchLatched::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("DoorLockAlarm", 1, value);
+            return DataModelLogger::LogValue("SwitchLatched", 1, value);
         }
-        case DoorLock::Events::DoorStateChange::Id: {
-            chip::app::Clusters::DoorLock::Events::DoorStateChange::DecodableType value;
+        case Switch::Events::InitialPress::Id: {
+            chip::app::Clusters::Switch::Events::InitialPress::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("DoorStateChange", 1, value);
+            return DataModelLogger::LogValue("InitialPress", 1, value);
         }
-        case DoorLock::Events::LockOperation::Id: {
-            chip::app::Clusters::DoorLock::Events::LockOperation::DecodableType value;
+        case Switch::Events::LongPress::Id: {
+            chip::app::Clusters::Switch::Events::LongPress::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LockOperation", 1, value);
+            return DataModelLogger::LogValue("LongPress", 1, value);
         }
-        case DoorLock::Events::LockOperationError::Id: {
-            chip::app::Clusters::DoorLock::Events::LockOperationError::DecodableType value;
+        case Switch::Events::ShortRelease::Id: {
+            chip::app::Clusters::Switch::Events::ShortRelease::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LockOperationError", 1, value);
+            return DataModelLogger::LogValue("ShortRelease", 1, value);
         }
-        case DoorLock::Events::LockUserChange::Id: {
-            chip::app::Clusters::DoorLock::Events::LockUserChange::DecodableType value;
+        case Switch::Events::LongRelease::Id: {
+            chip::app::Clusters::Switch::Events::LongRelease::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LockUserChange", 1, value);
-        }
+            return DataModelLogger::LogValue("LongRelease", 1, value);
         }
-        break;
-    }
-    case GeneralDiagnostics::Id: {
-        switch (header.mPath.mEventId)
-        {
-        case GeneralDiagnostics::Events::HardwareFaultChange::Id: {
-            chip::app::Clusters::GeneralDiagnostics::Events::HardwareFaultChange::DecodableType value;
+        case Switch::Events::MultiPressOngoing::Id: {
+            chip::app::Clusters::Switch::Events::MultiPressOngoing::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("HardwareFaultChange", 1, value);
+            return DataModelLogger::LogValue("MultiPressOngoing", 1, value);
         }
-        case GeneralDiagnostics::Events::RadioFaultChange::Id: {
-            chip::app::Clusters::GeneralDiagnostics::Events::RadioFaultChange::DecodableType value;
+        case Switch::Events::MultiPressComplete::Id: {
+            chip::app::Clusters::Switch::Events::MultiPressComplete::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("RadioFaultChange", 1, value);
+            return DataModelLogger::LogValue("MultiPressComplete", 1, value);
         }
-        case GeneralDiagnostics::Events::NetworkFaultChange::Id: {
-            chip::app::Clusters::GeneralDiagnostics::Events::NetworkFaultChange::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("NetworkFaultChange", 1, value);
         }
-        case GeneralDiagnostics::Events::BootReason::Id: {
-            chip::app::Clusters::GeneralDiagnostics::Events::BootReason::DecodableType value;
+        break;
+    }
+    case BooleanState::Id: {
+        switch (header.mPath.mEventId)
+        {
+        case BooleanState::Events::StateChange::Id: {
+            chip::app::Clusters::BooleanState::Events::StateChange::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("BootReason", 1, value);
+            return DataModelLogger::LogValue("StateChange", 1, value);
         }
         }
         break;
     }
-    case OtaSoftwareUpdateRequestor::Id: {
+    case DoorLock::Id: {
         switch (header.mPath.mEventId)
         {
-        case OtaSoftwareUpdateRequestor::Events::StateTransition::Id: {
-            chip::app::Clusters::OtaSoftwareUpdateRequestor::Events::StateTransition::DecodableType value;
+        case DoorLock::Events::DoorLockAlarm::Id: {
+            chip::app::Clusters::DoorLock::Events::DoorLockAlarm::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("StateTransition", 1, value);
+            return DataModelLogger::LogValue("DoorLockAlarm", 1, value);
         }
-        case OtaSoftwareUpdateRequestor::Events::VersionApplied::Id: {
-            chip::app::Clusters::OtaSoftwareUpdateRequestor::Events::VersionApplied::DecodableType value;
+        case DoorLock::Events::DoorStateChange::Id: {
+            chip::app::Clusters::DoorLock::Events::DoorStateChange::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("VersionApplied", 1, value);
+            return DataModelLogger::LogValue("DoorStateChange", 1, value);
         }
-        case OtaSoftwareUpdateRequestor::Events::DownloadError::Id: {
-            chip::app::Clusters::OtaSoftwareUpdateRequestor::Events::DownloadError::DecodableType value;
+        case DoorLock::Events::LockOperation::Id: {
+            chip::app::Clusters::DoorLock::Events::LockOperation::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("DownloadError", 1, value);
+            return DataModelLogger::LogValue("LockOperation", 1, value);
+        }
+        case DoorLock::Events::LockOperationError::Id: {
+            chip::app::Clusters::DoorLock::Events::LockOperationError::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("LockOperationError", 1, value);
+        }
+        case DoorLock::Events::LockUserChange::Id: {
+            chip::app::Clusters::DoorLock::Events::LockUserChange::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("LockUserChange", 1, value);
         }
         }
         break;
@@ -10652,58 +10736,6 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
         }
         break;
     }
-    case SoftwareDiagnostics::Id: {
-        switch (header.mPath.mEventId)
-        {
-        case SoftwareDiagnostics::Events::SoftwareFault::Id: {
-            chip::app::Clusters::SoftwareDiagnostics::Events::SoftwareFault::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SoftwareFault", 1, value);
-        }
-        }
-        break;
-    }
-    case Switch::Id: {
-        switch (header.mPath.mEventId)
-        {
-        case Switch::Events::SwitchLatched::Id: {
-            chip::app::Clusters::Switch::Events::SwitchLatched::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("SwitchLatched", 1, value);
-        }
-        case Switch::Events::InitialPress::Id: {
-            chip::app::Clusters::Switch::Events::InitialPress::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("InitialPress", 1, value);
-        }
-        case Switch::Events::LongPress::Id: {
-            chip::app::Clusters::Switch::Events::LongPress::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LongPress", 1, value);
-        }
-        case Switch::Events::ShortRelease::Id: {
-            chip::app::Clusters::Switch::Events::ShortRelease::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ShortRelease", 1, value);
-        }
-        case Switch::Events::LongRelease::Id: {
-            chip::app::Clusters::Switch::Events::LongRelease::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LongRelease", 1, value);
-        }
-        case Switch::Events::MultiPressOngoing::Id: {
-            chip::app::Clusters::Switch::Events::MultiPressOngoing::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MultiPressOngoing", 1, value);
-        }
-        case Switch::Events::MultiPressComplete::Id: {
-            chip::app::Clusters::Switch::Events::MultiPressComplete::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("MultiPressComplete", 1, value);
-        }
-        }
-        break;
-    }
     case TestCluster::Id: {
         switch (header.mPath.mEventId)
         {
@@ -10720,38 +10752,6 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
         }
         break;
     }
-    case ThreadNetworkDiagnostics::Id: {
-        switch (header.mPath.mEventId)
-        {
-        case ThreadNetworkDiagnostics::Events::ConnectionStatus::Id: {
-            chip::app::Clusters::ThreadNetworkDiagnostics::Events::ConnectionStatus::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ConnectionStatus", 1, value);
-        }
-        }
-        break;
-    }
-    case WiFiNetworkDiagnostics::Id: {
-        switch (header.mPath.mEventId)
-        {
-        case WiFiNetworkDiagnostics::Events::Disconnection::Id: {
-            chip::app::Clusters::WiFiNetworkDiagnostics::Events::Disconnection::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("Disconnection", 1, value);
-        }
-        case WiFiNetworkDiagnostics::Events::AssociationFailure::Id: {
-            chip::app::Clusters::WiFiNetworkDiagnostics::Events::AssociationFailure::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("AssociationFailure", 1, value);
-        }
-        case WiFiNetworkDiagnostics::Events::ConnectionStatus::Id: {
-            chip::app::Clusters::WiFiNetworkDiagnostics::Events::ConnectionStatus::DecodableType value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ConnectionStatus", 1, value);
-        }
-        }
-        break;
-    }
     default:
         break;
     }
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
index 2f4fbcbc175a24..00ad898efe9483 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
@@ -265,33 +265,37 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::TestCluster::Events::TestFabricScopedEvent::DecodableType & value);
 
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::AccountLogin::Commands::GetSetupPINResponse::DecodableType & value);
+                           const chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType & value);
+                           const chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::Channel::Commands::ChangeChannelResponse::DecodableType & value);
+                           const chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & value);
+                           const chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType & value);
+                           const chip::app::Clusters::Scenes::Commands::AddSceneResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType & value);
+                           const chip::app::Clusters::Scenes::Commands::ViewSceneResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType & value);
+                           const chip::app::Clusters::Scenes::Commands::RemoveSceneResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType & value);
+                           const chip::app::Clusters::Scenes::Commands::RemoveAllScenesResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType & value);
+                           const chip::app::Clusters::Scenes::Commands::StoreSceneResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType & value);
+                           const chip::app::Clusters::Scenes::Commands::GetSceneMembershipResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType & value);
+                           const chip::app::Clusters::Scenes::Commands::EnhancedAddSceneResponse::DecodableType & value);
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::Scenes::Commands::EnhancedViewSceneResponse::DecodableType & value);
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::Scenes::Commands::CopySceneResponse::DecodableType & value);
 static CHIP_ERROR
 LogValue(const char * label, size_t indent,
-         const chip::app::Clusters::ElectricalMeasurement::Commands::GetProfileInfoResponseCommand::DecodableType & value);
+         const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImageResponse::DecodableType & value);
 static CHIP_ERROR
 LogValue(const char * label, size_t indent,
-         const chip::app::Clusters::ElectricalMeasurement::Commands::GetMeasurementProfileResponseCommand::DecodableType & value);
+         const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::GeneralCommissioning::Commands::ArmFailSafeResponse::DecodableType & value);
 static CHIP_ERROR
@@ -300,23 +304,6 @@ LogValue(const char * label, size_t indent,
 static CHIP_ERROR
 LogValue(const char * label, size_t indent,
          const chip::app::Clusters::GeneralCommissioning::Commands::CommissioningCompleteResponse::DecodableType & value);
-static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadResponse::DecodableType & value);
-static CHIP_ERROR
-LogValue(const char * label, size_t indent,
-         const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::DecodableType & value);
-static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType & value);
-static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType & value);
-static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType & value);
-static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType & value);
-static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType & value);
-static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::NetworkCommissioning::Commands::ScanNetworksResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
@@ -324,12 +311,8 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
 static CHIP_ERROR
 LogValue(const char * label, size_t indent,
          const chip::app::Clusters::NetworkCommissioning::Commands::ConnectNetworkResponse::DecodableType & value);
-static CHIP_ERROR
-LogValue(const char * label, size_t indent,
-         const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImageResponse::DecodableType & value);
-static CHIP_ERROR
-LogValue(const char * label, size_t indent,
-         const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::DecodableType & value);
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::OperationalCredentials::Commands::AttestationResponse::DecodableType & value);
 static CHIP_ERROR
@@ -340,25 +323,44 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::Scenes::Commands::AddSceneResponse::DecodableType & value);
+                           const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadResponse::DecodableType & value);
+static CHIP_ERROR
+LogValue(const char * label, size_t indent,
+         const chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::Scenes::Commands::ViewSceneResponse::DecodableType & value);
+                           const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::Scenes::Commands::RemoveSceneResponse::DecodableType & value);
+                           const chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::Scenes::Commands::RemoveAllScenesResponse::DecodableType & value);
+                           const chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::Scenes::Commands::StoreSceneResponse::DecodableType & value);
+                           const chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::Scenes::Commands::GetSceneMembershipResponse::DecodableType & value);
+                           const chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::Scenes::Commands::EnhancedAddSceneResponse::DecodableType & value);
+                           const chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::Scenes::Commands::EnhancedViewSceneResponse::DecodableType & value);
+                           const chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::Scenes::Commands::CopySceneResponse::DecodableType & value);
+                           const chip::app::Clusters::Channel::Commands::ChangeChannelResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::DecodableType & value);
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType & value);
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType & value);
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & value);
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType & value);
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::AccountLogin::Commands::GetSetupPINResponse::DecodableType & value);
+static CHIP_ERROR
+LogValue(const char * label, size_t indent,
+         const chip::app::Clusters::ElectricalMeasurement::Commands::GetProfileInfoResponseCommand::DecodableType & value);
+static CHIP_ERROR
+LogValue(const char * label, size_t indent,
+         const chip::app::Clusters::ElectricalMeasurement::Commands::GetMeasurementProfileResponseCommand::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::TestCluster::Commands::TestSpecificResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
@@ -386,5 +388,3 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
 static CHIP_ERROR
 LogValue(const char * label, size_t indent,
          const chip::app::Clusters::TestCluster::Commands::TestEmitTestFabricScopedEventResponse::DecodableType & value);
-static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType & value);
diff --git a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h
index a1ae4558ce883f..c9794be677b862 100644
--- a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h
+++ b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h
@@ -30,74 +30,63 @@
 #include <lib/support/Span.h>
 
 // List specific responses
-typedef void (*AccessControlAclListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::DecodableType> &
-        data);
-typedef void (*AccessControlExtensionListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::ExtensionEntry::DecodableType> & data);
-typedef void (*AccessControlGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*AccessControlAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*AccessControlAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*AccountLoginGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*AccountLoginAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*AccountLoginAttributeListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*AdministratorCommissioningGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*AdministratorCommissioningAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*AdministratorCommissioningAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ApplicationBasicAllowedVendorListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::VendorId> & data);
-typedef void (*ApplicationBasicGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ApplicationBasicAcceptedCommandListListAttributeCallback)(
+typedef void (*IdentifyGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ApplicationBasicAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ApplicationLauncherCatalogListListAttributeCallback)(void * context,
-                                                                    const chip::app::DataModel::DecodableList<uint16_t> & data);
-typedef void (*ApplicationLauncherGeneratedCommandListListAttributeCallback)(
+typedef void (*IdentifyAcceptedCommandListListAttributeCallback)(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*IdentifyAttributeListListAttributeCallback)(void * context,
+                                                           const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*GroupsGeneratedCommandListListAttributeCallback)(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*GroupsAcceptedCommandListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*GroupsAttributeListListAttributeCallback)(void * context,
+                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*ScenesGeneratedCommandListListAttributeCallback)(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ScenesAcceptedCommandListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ScenesAttributeListListAttributeCallback)(void * context,
+                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*OnOffGeneratedCommandListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*OnOffAcceptedCommandListListAttributeCallback)(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*OnOffAttributeListListAttributeCallback)(void * context,
+                                                        const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*OnOffSwitchConfigurationGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ApplicationLauncherAcceptedCommandListListAttributeCallback)(
+typedef void (*OnOffSwitchConfigurationAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ApplicationLauncherAttributeListListAttributeCallback)(
+typedef void (*OnOffSwitchConfigurationAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*AudioOutputOutputListListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::OutputInfo::DecodableType> & data);
-typedef void (*AudioOutputGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*AudioOutputAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*AudioOutputAttributeListListAttributeCallback)(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*BarrierControlGeneratedCommandListListAttributeCallback)(
+typedef void (*LevelControlGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*BarrierControlAcceptedCommandListListAttributeCallback)(
+typedef void (*LevelControlAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*BarrierControlAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*BasicGeneratedCommandListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*BasicAcceptedCommandListListAttributeCallback)(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*BasicAttributeListListAttributeCallback)(void * context,
-                                                        const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*LevelControlAttributeListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*BinaryInputBasicGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*BinaryInputBasicAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*BinaryInputBasicAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*DescriptorDeviceListListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::DeviceType::DecodableType> & data);
+typedef void (*DescriptorServerListListAttributeCallback)(void * context,
+                                                          const chip::app::DataModel::DecodableList<chip::ClusterId> & data);
+typedef void (*DescriptorClientListListAttributeCallback)(void * context,
+                                                          const chip::app::DataModel::DecodableList<chip::ClusterId> & data);
+typedef void (*DescriptorPartsListListAttributeCallback)(void * context,
+                                                         const chip::app::DataModel::DecodableList<chip::EndpointId> & data);
+typedef void (*DescriptorGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*DescriptorAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*DescriptorAttributeListListAttributeCallback)(void * context,
+                                                             const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*BindingBindingListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::Binding::Structs::TargetStruct::DecodableType> & data);
@@ -107,12 +96,19 @@ typedef void (*BindingAcceptedCommandListListAttributeCallback)(void * context,
                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*BindingAttributeListListAttributeCallback)(void * context,
                                                           const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*BooleanStateGeneratedCommandListListAttributeCallback)(
+typedef void (*AccessControlAclListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::AccessControlEntry::DecodableType> &
+        data);
+typedef void (*AccessControlExtensionListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::AccessControl::Structs::ExtensionEntry::DecodableType> & data);
+typedef void (*AccessControlGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*BooleanStateAcceptedCommandListListAttributeCallback)(
+typedef void (*AccessControlAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*BooleanStateAttributeListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*AccessControlAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*BridgedActionsActionListListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::ActionStruct::DecodableType> & data);
@@ -126,100 +122,73 @@ typedef void (*BridgedActionsAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*BridgedActionsAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*BridgedDeviceBasicGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*BridgedDeviceBasicAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*BridgedDeviceBasicAttributeListListAttributeCallback)(
+typedef void (*BasicGeneratedCommandListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*BasicAcceptedCommandListListAttributeCallback)(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*BasicAttributeListListAttributeCallback)(void * context,
+                                                        const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*OtaSoftwareUpdateProviderAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ChannelChannelListListAttributeCallback)(
+typedef void (*OtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallback)(
     void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> & data);
-typedef void (*ChannelGeneratedCommandListListAttributeCallback)(void * context,
-                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ChannelAcceptedCommandListListAttributeCallback)(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ChannelAttributeListListAttributeCallback)(void * context,
-                                                          const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ColorControlGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ColorControlAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ColorControlAttributeListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ContentLauncherAcceptHeaderListAttributeCallback)(void * context,
-                                                                 const chip::app::DataModel::DecodableList<chip::CharSpan> & data);
-typedef void (*ContentLauncherGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ContentLauncherAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ContentLauncherAttributeListListAttributeCallback)(
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType> & data);
+typedef void (*OtaSoftwareUpdateRequestorAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*DescriptorDeviceListListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::DeviceType::DecodableType> & data);
-typedef void (*DescriptorServerListListAttributeCallback)(void * context,
-                                                          const chip::app::DataModel::DecodableList<chip::ClusterId> & data);
-typedef void (*DescriptorClientListListAttributeCallback)(void * context,
-                                                          const chip::app::DataModel::DecodableList<chip::ClusterId> & data);
-typedef void (*DescriptorPartsListListAttributeCallback)(void * context,
-                                                         const chip::app::DataModel::DecodableList<chip::EndpointId> & data);
-typedef void (*DescriptorGeneratedCommandListListAttributeCallback)(
+typedef void (*LocalizationConfigurationSupportedLocalesListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CharSpan> & data);
+typedef void (*LocalizationConfigurationGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*DescriptorAcceptedCommandListListAttributeCallback)(
+typedef void (*LocalizationConfigurationAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*DescriptorAttributeListListAttributeCallback)(void * context,
-                                                             const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*DiagnosticLogsGeneratedCommandListListAttributeCallback)(
+typedef void (*TimeFormatLocalizationSupportedCalendarTypesListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::TimeFormatLocalization::CalendarType> & data);
+typedef void (*TimeFormatLocalizationGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*DiagnosticLogsAcceptedCommandListListAttributeCallback)(
+typedef void (*TimeFormatLocalizationAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*DiagnosticLogsAttributeListListAttributeCallback)(
+typedef void (*UnitLocalizationAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*DoorLockGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*DoorLockAcceptedCommandListListAttributeCallback)(void * context,
-                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*DoorLockAttributeListListAttributeCallback)(void * context,
-                                                           const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ElectricalMeasurementGeneratedCommandListListAttributeCallback)(
+typedef void (*PowerSourceConfigurationSourcesListAttributeCallback)(void * context,
+                                                                     const chip::app::DataModel::DecodableList<uint8_t> & data);
+typedef void (*PowerSourceConfigurationGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ElectricalMeasurementAcceptedCommandListListAttributeCallback)(
+typedef void (*PowerSourceConfigurationAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ElectricalMeasurementAttributeListListAttributeCallback)(
+typedef void (*PowerSourceConfigurationAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*EthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallback)(
+typedef void (*PowerSourceActiveWiredFaultsListAttributeCallback)(void * context,
+                                                                  const chip::app::DataModel::DecodableList<uint8_t> & data);
+typedef void (*PowerSourceActiveBatteryFaultsListAttributeCallback)(void * context,
+                                                                    const chip::app::DataModel::DecodableList<uint8_t> & data);
+typedef void (*PowerSourceActiveBatteryChargeFaultsListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<uint8_t> & data);
+typedef void (*PowerSourceGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*EthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallback)(
+typedef void (*PowerSourceAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*EthernetNetworkDiagnosticsAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*FanControlGeneratedCommandListListAttributeCallback)(
+typedef void (*PowerSourceAttributeListListAttributeCallback)(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*GeneralCommissioningGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*FanControlAcceptedCommandListListAttributeCallback)(
+typedef void (*GeneralCommissioningAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*FanControlAttributeListListAttributeCallback)(void * context,
-                                                             const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*FixedLabelLabelListListAttributeCallback)(
+typedef void (*GeneralCommissioningAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*NetworkCommissioningNetworksListAttributeCallback)(
     void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::FixedLabel::Structs::LabelStruct::DecodableType> & data);
-typedef void (*FixedLabelGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*FixedLabelAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*FixedLabelAttributeListListAttributeCallback)(void * context,
-                                                             const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*FlowMeasurementGeneratedCommandListListAttributeCallback)(
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::DecodableType> &
+        data);
+typedef void (*NetworkCommissioningGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*FlowMeasurementAcceptedCommandListListAttributeCallback)(
+typedef void (*NetworkCommissioningAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*FlowMeasurementAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*GeneralCommissioningGeneratedCommandListListAttributeCallback)(
+typedef void (*DiagnosticLogsGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*GeneralCommissioningAcceptedCommandListListAttributeCallback)(
+typedef void (*DiagnosticLogsAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*GeneralCommissioningAttributeListListAttributeCallback)(
+typedef void (*DiagnosticLogsAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*GeneralDiagnosticsNetworkInterfacesListAttributeCallback)(
     void * context,
@@ -237,77 +206,114 @@ typedef void (*GeneralDiagnosticsAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*GeneralDiagnosticsAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*GroupKeyManagementGroupKeyMapListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::DecodableType> &
-        data);
-typedef void (*GroupKeyManagementGroupTableListAttributeCallback)(
+typedef void (*SoftwareDiagnosticsThreadMetricsListAttributeCallback)(
     void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupInfoMapStruct::DecodableType> &
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType> &
         data);
-typedef void (*GroupKeyManagementGeneratedCommandListListAttributeCallback)(
+typedef void (*SoftwareDiagnosticsGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*GroupKeyManagementAcceptedCommandListListAttributeCallback)(
+typedef void (*SoftwareDiagnosticsAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*GroupKeyManagementAttributeListListAttributeCallback)(
+typedef void (*SoftwareDiagnosticsAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*GroupsGeneratedCommandListListAttributeCallback)(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*GroupsAcceptedCommandListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*GroupsAttributeListListAttributeCallback)(void * context,
-                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*IdentifyGeneratedCommandListListAttributeCallback)(
+typedef void (*ThreadNetworkDiagnosticsNeighborTableListListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & data);
+typedef void (*ThreadNetworkDiagnosticsRouteTableListListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> &
+        data);
+typedef void (*ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & data);
+typedef void (*ThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*IdentifyAcceptedCommandListListAttributeCallback)(void * context,
-                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*IdentifyAttributeListListAttributeCallback)(void * context,
-                                                           const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*IlluminanceMeasurementGeneratedCommandListListAttributeCallback)(
+typedef void (*ThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*IlluminanceMeasurementAcceptedCommandListListAttributeCallback)(
+typedef void (*ThreadNetworkDiagnosticsAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*WiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*IlluminanceMeasurementAttributeListListAttributeCallback)(
+typedef void (*WiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*WiFiNetworkDiagnosticsAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*KeypadInputGeneratedCommandListListAttributeCallback)(
+typedef void (*EthernetNetworkDiagnosticsGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*KeypadInputAcceptedCommandListListAttributeCallback)(
+typedef void (*EthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*KeypadInputAttributeListListAttributeCallback)(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*LevelControlGeneratedCommandListListAttributeCallback)(
+typedef void (*EthernetNetworkDiagnosticsAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*BridgedDeviceBasicGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*LevelControlAcceptedCommandListListAttributeCallback)(
+typedef void (*BridgedDeviceBasicAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*LevelControlAttributeListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*LocalizationConfigurationSupportedLocalesListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CharSpan> & data);
-typedef void (*LocalizationConfigurationGeneratedCommandListListAttributeCallback)(
+typedef void (*BridgedDeviceBasicAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*SwitchGeneratedCommandListListAttributeCallback)(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*SwitchAcceptedCommandListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*SwitchAttributeListListAttributeCallback)(void * context,
+                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*AdministratorCommissioningGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*LocalizationConfigurationAcceptedCommandListListAttributeCallback)(
+typedef void (*AdministratorCommissioningAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*LowPowerGeneratedCommandListListAttributeCallback)(
+typedef void (*AdministratorCommissioningAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*OperationalCredentialsNOCsListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::DecodableType> &
+        data);
+typedef void (*OperationalCredentialsFabricsListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & data);
+typedef void (*OperationalCredentialsTrustedRootCertificatesListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & data);
+typedef void (*OperationalCredentialsGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*LowPowerAcceptedCommandListListAttributeCallback)(void * context,
-                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*LowPowerAttributeListListAttributeCallback)(void * context,
-                                                           const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*MediaInputInputListListAttributeCallback)(
+typedef void (*OperationalCredentialsAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*OperationalCredentialsAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*GroupKeyManagementGroupKeyMapListAttributeCallback)(
     void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::InputInfo::DecodableType> & data);
-typedef void (*MediaInputGeneratedCommandListListAttributeCallback)(
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::DecodableType> &
+        data);
+typedef void (*GroupKeyManagementGroupTableListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupInfoMapStruct::DecodableType> &
+        data);
+typedef void (*GroupKeyManagementGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*MediaInputAcceptedCommandListListAttributeCallback)(
+typedef void (*GroupKeyManagementAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*MediaInputAttributeListListAttributeCallback)(void * context,
+typedef void (*GroupKeyManagementAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*FixedLabelLabelListListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::FixedLabel::Structs::LabelStruct::DecodableType> & data);
+typedef void (*FixedLabelGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*FixedLabelAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*FixedLabelAttributeListListAttributeCallback)(void * context,
                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*MediaPlaybackGeneratedCommandListListAttributeCallback)(
+typedef void (*UserLabelLabelListListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::UserLabel::Structs::LabelStruct::DecodableType> & data);
+typedef void (*UserLabelGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*MediaPlaybackAcceptedCommandListListAttributeCallback)(
+typedef void (*UserLabelAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*MediaPlaybackAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*BooleanStateGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*BooleanStateAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*BooleanStateAttributeListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*ModeSelectSupportedModesListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType> & data);
@@ -317,83 +323,65 @@ typedef void (*ModeSelectAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*ModeSelectAttributeListListAttributeCallback)(void * context,
                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*NetworkCommissioningNetworksListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::DecodableType> &
-        data);
-typedef void (*NetworkCommissioningGeneratedCommandListListAttributeCallback)(
+typedef void (*DoorLockGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*NetworkCommissioningAcceptedCommandListListAttributeCallback)(
+typedef void (*DoorLockAcceptedCommandListListAttributeCallback)(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*DoorLockAttributeListListAttributeCallback)(void * context,
+                                                           const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*WindowCoveringGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*OtaSoftwareUpdateProviderAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*OtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType> & data);
-typedef void (*OtaSoftwareUpdateRequestorAttributeListListAttributeCallback)(
+typedef void (*WindowCoveringAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*WindowCoveringAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*OccupancySensingGeneratedCommandListListAttributeCallback)(
+typedef void (*BarrierControlGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*OccupancySensingAcceptedCommandListListAttributeCallback)(
+typedef void (*BarrierControlAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*OccupancySensingAttributeListListAttributeCallback)(
+typedef void (*BarrierControlAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*OnOffGeneratedCommandListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*OnOffAcceptedCommandListListAttributeCallback)(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*OnOffAttributeListListAttributeCallback)(void * context,
-                                                        const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*OnOffSwitchConfigurationGeneratedCommandListListAttributeCallback)(
+typedef void (*PumpConfigurationAndControlGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*OnOffSwitchConfigurationAcceptedCommandListListAttributeCallback)(
+typedef void (*PumpConfigurationAndControlAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*OnOffSwitchConfigurationAttributeListListAttributeCallback)(
+typedef void (*PumpConfigurationAndControlAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*OperationalCredentialsNOCsListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::DecodableType> &
-        data);
-typedef void (*OperationalCredentialsFabricsListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & data);
-typedef void (*OperationalCredentialsTrustedRootCertificatesListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & data);
-typedef void (*OperationalCredentialsGeneratedCommandListListAttributeCallback)(
+typedef void (*ThermostatAttributeListListAttributeCallback)(void * context,
+                                                             const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*FanControlGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*OperationalCredentialsAcceptedCommandListListAttributeCallback)(
+typedef void (*FanControlAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*OperationalCredentialsAttributeListListAttributeCallback)(
+typedef void (*FanControlAttributeListListAttributeCallback)(void * context,
+                                                             const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*ThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ThermostatUserInterfaceConfigurationAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*PowerSourceActiveWiredFaultsListAttributeCallback)(void * context,
-                                                                  const chip::app::DataModel::DecodableList<uint8_t> & data);
-typedef void (*PowerSourceActiveBatteryFaultsListAttributeCallback)(void * context,
-                                                                    const chip::app::DataModel::DecodableList<uint8_t> & data);
-typedef void (*PowerSourceActiveBatteryChargeFaultsListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<uint8_t> & data);
-typedef void (*PowerSourceGeneratedCommandListListAttributeCallback)(
+typedef void (*ColorControlGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*PowerSourceAcceptedCommandListListAttributeCallback)(
+typedef void (*ColorControlAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*PowerSourceAttributeListListAttributeCallback)(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*PowerSourceConfigurationSourcesListAttributeCallback)(void * context,
-                                                                     const chip::app::DataModel::DecodableList<uint8_t> & data);
-typedef void (*PowerSourceConfigurationGeneratedCommandListListAttributeCallback)(
+typedef void (*ColorControlAttributeListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*IlluminanceMeasurementGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*PowerSourceConfigurationAcceptedCommandListListAttributeCallback)(
+typedef void (*IlluminanceMeasurementAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*PowerSourceConfigurationAttributeListListAttributeCallback)(
+typedef void (*IlluminanceMeasurementAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*TemperatureMeasurementAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*PressureMeasurementAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*PumpConfigurationAndControlGeneratedCommandListListAttributeCallback)(
+typedef void (*FlowMeasurementGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*PumpConfigurationAndControlAcceptedCommandListListAttributeCallback)(
+typedef void (*FlowMeasurementAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*PumpConfigurationAndControlAttributeListListAttributeCallback)(
+typedef void (*FlowMeasurementAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*RelativeHumidityMeasurementGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
@@ -401,28 +389,27 @@ typedef void (*RelativeHumidityMeasurementAcceptedCommandListListAttributeCallba
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*RelativeHumidityMeasurementAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ScenesGeneratedCommandListListAttributeCallback)(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ScenesAcceptedCommandListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ScenesAttributeListListAttributeCallback)(void * context,
-                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*SoftwareDiagnosticsThreadMetricsListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::DecodableType> &
-        data);
-typedef void (*SoftwareDiagnosticsGeneratedCommandListListAttributeCallback)(
+typedef void (*OccupancySensingGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*SoftwareDiagnosticsAcceptedCommandListListAttributeCallback)(
+typedef void (*OccupancySensingAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*SoftwareDiagnosticsAttributeListListAttributeCallback)(
+typedef void (*OccupancySensingAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*SwitchGeneratedCommandListListAttributeCallback)(void * context,
+typedef void (*WakeOnLanGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*WakeOnLanAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*WakeOnLanAttributeListListAttributeCallback)(void * context,
+                                                            const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*ChannelChannelListListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> & data);
+typedef void (*ChannelGeneratedCommandListListAttributeCallback)(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ChannelAcceptedCommandListListAttributeCallback)(void * context,
                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*SwitchAcceptedCommandListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*SwitchAttributeListListAttributeCallback)(void * context,
-                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*ChannelAttributeListListAttributeCallback)(void * context,
+                                                          const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*TargetNavigatorTargetListListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType> & data);
@@ -432,7 +419,77 @@ typedef void (*TargetNavigatorAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*TargetNavigatorAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*TemperatureMeasurementAttributeListListAttributeCallback)(
+typedef void (*MediaPlaybackGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*MediaPlaybackAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*MediaPlaybackAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*MediaInputInputListListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::InputInfo::DecodableType> & data);
+typedef void (*MediaInputGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*MediaInputAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*MediaInputAttributeListListAttributeCallback)(void * context,
+                                                             const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*LowPowerGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*LowPowerAcceptedCommandListListAttributeCallback)(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*LowPowerAttributeListListAttributeCallback)(void * context,
+                                                           const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*KeypadInputGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*KeypadInputAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*KeypadInputAttributeListListAttributeCallback)(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*ContentLauncherAcceptHeaderListAttributeCallback)(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::CharSpan> & data);
+typedef void (*ContentLauncherGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ContentLauncherAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ContentLauncherAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*AudioOutputOutputListListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::OutputInfo::DecodableType> & data);
+typedef void (*AudioOutputGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*AudioOutputAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*AudioOutputAttributeListListAttributeCallback)(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*ApplicationLauncherCatalogListListAttributeCallback)(void * context,
+                                                                    const chip::app::DataModel::DecodableList<uint16_t> & data);
+typedef void (*ApplicationLauncherGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ApplicationLauncherAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ApplicationLauncherAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*ApplicationBasicAllowedVendorListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::VendorId> & data);
+typedef void (*ApplicationBasicGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ApplicationBasicAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ApplicationBasicAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*AccountLoginGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*AccountLoginAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*AccountLoginAttributeListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*ElectricalMeasurementGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ElectricalMeasurementAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ElectricalMeasurementAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*TestClusterListInt8uListAttributeCallback)(void * context,
                                                           const chip::app::DataModel::DecodableList<uint8_t> & data);
@@ -457,60 +514,3 @@ typedef void (*TestClusterAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*TestClusterAttributeListListAttributeCallback)(void * context,
                                                               const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ThermostatAttributeListListAttributeCallback)(void * context,
-                                                             const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ThermostatUserInterfaceConfigurationAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ThreadNetworkDiagnosticsNeighborTableListListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & data);
-typedef void (*ThreadNetworkDiagnosticsRouteTableListListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> &
-        data);
-typedef void (*ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & data);
-typedef void (*ThreadNetworkDiagnosticsGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ThreadNetworkDiagnosticsAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ThreadNetworkDiagnosticsAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*TimeFormatLocalizationSupportedCalendarTypesListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::TimeFormatLocalization::CalendarType> & data);
-typedef void (*TimeFormatLocalizationGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*TimeFormatLocalizationAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*UnitLocalizationAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*UserLabelLabelListListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::UserLabel::Structs::LabelStruct::DecodableType> & data);
-typedef void (*UserLabelGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*UserLabelAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*WakeOnLanGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*WakeOnLanAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*WakeOnLanAttributeListListAttributeCallback)(void * context,
-                                                            const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*WiFiNetworkDiagnosticsGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*WiFiNetworkDiagnosticsAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*WiFiNetworkDiagnosticsAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*WindowCoveringGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*WindowCoveringAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*WindowCoveringAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
diff --git a/zzz_generated/controller-clusters/zap-generated/CHIPClusters.h b/zzz_generated/controller-clusters/zap-generated/CHIPClusters.h
index bc78e44807375d..113b56ef9f3059 100644
--- a/zzz_generated/controller-clusters/zap-generated/CHIPClusters.h
+++ b/zzz_generated/controller-clusters/zap-generated/CHIPClusters.h
@@ -30,67 +30,60 @@
 namespace chip {
 namespace Controller {
 
-class DLL_EXPORT AccessControlCluster : public ClusterBase
-{
-public:
-    AccessControlCluster() : ClusterBase(app::Clusters::AccessControl::Id) {}
-    ~AccessControlCluster() {}
-};
-
-class DLL_EXPORT AccountLoginCluster : public ClusterBase
+class DLL_EXPORT IdentifyCluster : public ClusterBase
 {
 public:
-    AccountLoginCluster() : ClusterBase(app::Clusters::AccountLogin::Id) {}
-    ~AccountLoginCluster() {}
+    IdentifyCluster() : ClusterBase(app::Clusters::Identify::Id) {}
+    ~IdentifyCluster() {}
 };
 
-class DLL_EXPORT AdministratorCommissioningCluster : public ClusterBase
+class DLL_EXPORT GroupsCluster : public ClusterBase
 {
 public:
-    AdministratorCommissioningCluster() : ClusterBase(app::Clusters::AdministratorCommissioning::Id) {}
-    ~AdministratorCommissioningCluster() {}
+    GroupsCluster() : ClusterBase(app::Clusters::Groups::Id) {}
+    ~GroupsCluster() {}
 };
 
-class DLL_EXPORT ApplicationBasicCluster : public ClusterBase
+class DLL_EXPORT ScenesCluster : public ClusterBase
 {
 public:
-    ApplicationBasicCluster() : ClusterBase(app::Clusters::ApplicationBasic::Id) {}
-    ~ApplicationBasicCluster() {}
+    ScenesCluster() : ClusterBase(app::Clusters::Scenes::Id) {}
+    ~ScenesCluster() {}
 };
 
-class DLL_EXPORT ApplicationLauncherCluster : public ClusterBase
+class DLL_EXPORT OnOffCluster : public ClusterBase
 {
 public:
-    ApplicationLauncherCluster() : ClusterBase(app::Clusters::ApplicationLauncher::Id) {}
-    ~ApplicationLauncherCluster() {}
+    OnOffCluster() : ClusterBase(app::Clusters::OnOff::Id) {}
+    ~OnOffCluster() {}
 };
 
-class DLL_EXPORT AudioOutputCluster : public ClusterBase
+class DLL_EXPORT OnOffSwitchConfigurationCluster : public ClusterBase
 {
 public:
-    AudioOutputCluster() : ClusterBase(app::Clusters::AudioOutput::Id) {}
-    ~AudioOutputCluster() {}
+    OnOffSwitchConfigurationCluster() : ClusterBase(app::Clusters::OnOffSwitchConfiguration::Id) {}
+    ~OnOffSwitchConfigurationCluster() {}
 };
 
-class DLL_EXPORT BarrierControlCluster : public ClusterBase
+class DLL_EXPORT LevelControlCluster : public ClusterBase
 {
 public:
-    BarrierControlCluster() : ClusterBase(app::Clusters::BarrierControl::Id) {}
-    ~BarrierControlCluster() {}
+    LevelControlCluster() : ClusterBase(app::Clusters::LevelControl::Id) {}
+    ~LevelControlCluster() {}
 };
 
-class DLL_EXPORT BasicCluster : public ClusterBase
+class DLL_EXPORT BinaryInputBasicCluster : public ClusterBase
 {
 public:
-    BasicCluster() : ClusterBase(app::Clusters::Basic::Id) {}
-    ~BasicCluster() {}
+    BinaryInputBasicCluster() : ClusterBase(app::Clusters::BinaryInputBasic::Id) {}
+    ~BinaryInputBasicCluster() {}
 };
 
-class DLL_EXPORT BinaryInputBasicCluster : public ClusterBase
+class DLL_EXPORT DescriptorCluster : public ClusterBase
 {
 public:
-    BinaryInputBasicCluster() : ClusterBase(app::Clusters::BinaryInputBasic::Id) {}
-    ~BinaryInputBasicCluster() {}
+    DescriptorCluster() : ClusterBase(app::Clusters::Descriptor::Id) {}
+    ~DescriptorCluster() {}
 };
 
 class DLL_EXPORT BindingCluster : public ClusterBase
@@ -100,11 +93,11 @@ class DLL_EXPORT BindingCluster : public ClusterBase
     ~BindingCluster() {}
 };
 
-class DLL_EXPORT BooleanStateCluster : public ClusterBase
+class DLL_EXPORT AccessControlCluster : public ClusterBase
 {
 public:
-    BooleanStateCluster() : ClusterBase(app::Clusters::BooleanState::Id) {}
-    ~BooleanStateCluster() {}
+    AccessControlCluster() : ClusterBase(app::Clusters::AccessControl::Id) {}
+    ~AccessControlCluster() {}
 };
 
 class DLL_EXPORT BridgedActionsCluster : public ClusterBase
@@ -114,172 +107,172 @@ class DLL_EXPORT BridgedActionsCluster : public ClusterBase
     ~BridgedActionsCluster() {}
 };
 
-class DLL_EXPORT BridgedDeviceBasicCluster : public ClusterBase
+class DLL_EXPORT BasicCluster : public ClusterBase
 {
 public:
-    BridgedDeviceBasicCluster() : ClusterBase(app::Clusters::BridgedDeviceBasic::Id) {}
-    ~BridgedDeviceBasicCluster() {}
+    BasicCluster() : ClusterBase(app::Clusters::Basic::Id) {}
+    ~BasicCluster() {}
 };
 
-class DLL_EXPORT ChannelCluster : public ClusterBase
+class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
 {
 public:
-    ChannelCluster() : ClusterBase(app::Clusters::Channel::Id) {}
-    ~ChannelCluster() {}
+    OtaSoftwareUpdateProviderCluster() : ClusterBase(app::Clusters::OtaSoftwareUpdateProvider::Id) {}
+    ~OtaSoftwareUpdateProviderCluster() {}
 };
 
-class DLL_EXPORT ColorControlCluster : public ClusterBase
+class DLL_EXPORT OtaSoftwareUpdateRequestorCluster : public ClusterBase
 {
 public:
-    ColorControlCluster() : ClusterBase(app::Clusters::ColorControl::Id) {}
-    ~ColorControlCluster() {}
+    OtaSoftwareUpdateRequestorCluster() : ClusterBase(app::Clusters::OtaSoftwareUpdateRequestor::Id) {}
+    ~OtaSoftwareUpdateRequestorCluster() {}
 };
 
-class DLL_EXPORT ContentLauncherCluster : public ClusterBase
+class DLL_EXPORT LocalizationConfigurationCluster : public ClusterBase
 {
 public:
-    ContentLauncherCluster() : ClusterBase(app::Clusters::ContentLauncher::Id) {}
-    ~ContentLauncherCluster() {}
+    LocalizationConfigurationCluster() : ClusterBase(app::Clusters::LocalizationConfiguration::Id) {}
+    ~LocalizationConfigurationCluster() {}
 };
 
-class DLL_EXPORT DescriptorCluster : public ClusterBase
+class DLL_EXPORT TimeFormatLocalizationCluster : public ClusterBase
 {
 public:
-    DescriptorCluster() : ClusterBase(app::Clusters::Descriptor::Id) {}
-    ~DescriptorCluster() {}
+    TimeFormatLocalizationCluster() : ClusterBase(app::Clusters::TimeFormatLocalization::Id) {}
+    ~TimeFormatLocalizationCluster() {}
 };
 
-class DLL_EXPORT DiagnosticLogsCluster : public ClusterBase
+class DLL_EXPORT UnitLocalizationCluster : public ClusterBase
 {
 public:
-    DiagnosticLogsCluster() : ClusterBase(app::Clusters::DiagnosticLogs::Id) {}
-    ~DiagnosticLogsCluster() {}
+    UnitLocalizationCluster() : ClusterBase(app::Clusters::UnitLocalization::Id) {}
+    ~UnitLocalizationCluster() {}
 };
 
-class DLL_EXPORT DoorLockCluster : public ClusterBase
+class DLL_EXPORT PowerSourceConfigurationCluster : public ClusterBase
 {
 public:
-    DoorLockCluster() : ClusterBase(app::Clusters::DoorLock::Id) {}
-    ~DoorLockCluster() {}
+    PowerSourceConfigurationCluster() : ClusterBase(app::Clusters::PowerSourceConfiguration::Id) {}
+    ~PowerSourceConfigurationCluster() {}
 };
 
-class DLL_EXPORT ElectricalMeasurementCluster : public ClusterBase
+class DLL_EXPORT PowerSourceCluster : public ClusterBase
 {
 public:
-    ElectricalMeasurementCluster() : ClusterBase(app::Clusters::ElectricalMeasurement::Id) {}
-    ~ElectricalMeasurementCluster() {}
+    PowerSourceCluster() : ClusterBase(app::Clusters::PowerSource::Id) {}
+    ~PowerSourceCluster() {}
 };
 
-class DLL_EXPORT EthernetNetworkDiagnosticsCluster : public ClusterBase
+class DLL_EXPORT GeneralCommissioningCluster : public ClusterBase
 {
 public:
-    EthernetNetworkDiagnosticsCluster() : ClusterBase(app::Clusters::EthernetNetworkDiagnostics::Id) {}
-    ~EthernetNetworkDiagnosticsCluster() {}
+    GeneralCommissioningCluster() : ClusterBase(app::Clusters::GeneralCommissioning::Id) {}
+    ~GeneralCommissioningCluster() {}
 };
 
-class DLL_EXPORT FanControlCluster : public ClusterBase
+class DLL_EXPORT NetworkCommissioningCluster : public ClusterBase
 {
 public:
-    FanControlCluster() : ClusterBase(app::Clusters::FanControl::Id) {}
-    ~FanControlCluster() {}
+    NetworkCommissioningCluster() : ClusterBase(app::Clusters::NetworkCommissioning::Id) {}
+    ~NetworkCommissioningCluster() {}
 };
 
-class DLL_EXPORT FixedLabelCluster : public ClusterBase
+class DLL_EXPORT DiagnosticLogsCluster : public ClusterBase
 {
 public:
-    FixedLabelCluster() : ClusterBase(app::Clusters::FixedLabel::Id) {}
-    ~FixedLabelCluster() {}
+    DiagnosticLogsCluster() : ClusterBase(app::Clusters::DiagnosticLogs::Id) {}
+    ~DiagnosticLogsCluster() {}
 };
 
-class DLL_EXPORT FlowMeasurementCluster : public ClusterBase
+class DLL_EXPORT GeneralDiagnosticsCluster : public ClusterBase
 {
 public:
-    FlowMeasurementCluster() : ClusterBase(app::Clusters::FlowMeasurement::Id) {}
-    ~FlowMeasurementCluster() {}
+    GeneralDiagnosticsCluster() : ClusterBase(app::Clusters::GeneralDiagnostics::Id) {}
+    ~GeneralDiagnosticsCluster() {}
 };
 
-class DLL_EXPORT GeneralCommissioningCluster : public ClusterBase
+class DLL_EXPORT SoftwareDiagnosticsCluster : public ClusterBase
 {
 public:
-    GeneralCommissioningCluster() : ClusterBase(app::Clusters::GeneralCommissioning::Id) {}
-    ~GeneralCommissioningCluster() {}
+    SoftwareDiagnosticsCluster() : ClusterBase(app::Clusters::SoftwareDiagnostics::Id) {}
+    ~SoftwareDiagnosticsCluster() {}
 };
 
-class DLL_EXPORT GeneralDiagnosticsCluster : public ClusterBase
+class DLL_EXPORT ThreadNetworkDiagnosticsCluster : public ClusterBase
 {
 public:
-    GeneralDiagnosticsCluster() : ClusterBase(app::Clusters::GeneralDiagnostics::Id) {}
-    ~GeneralDiagnosticsCluster() {}
+    ThreadNetworkDiagnosticsCluster() : ClusterBase(app::Clusters::ThreadNetworkDiagnostics::Id) {}
+    ~ThreadNetworkDiagnosticsCluster() {}
 };
 
-class DLL_EXPORT GroupKeyManagementCluster : public ClusterBase
+class DLL_EXPORT WiFiNetworkDiagnosticsCluster : public ClusterBase
 {
 public:
-    GroupKeyManagementCluster() : ClusterBase(app::Clusters::GroupKeyManagement::Id) {}
-    ~GroupKeyManagementCluster() {}
+    WiFiNetworkDiagnosticsCluster() : ClusterBase(app::Clusters::WiFiNetworkDiagnostics::Id) {}
+    ~WiFiNetworkDiagnosticsCluster() {}
 };
 
-class DLL_EXPORT GroupsCluster : public ClusterBase
+class DLL_EXPORT EthernetNetworkDiagnosticsCluster : public ClusterBase
 {
 public:
-    GroupsCluster() : ClusterBase(app::Clusters::Groups::Id) {}
-    ~GroupsCluster() {}
+    EthernetNetworkDiagnosticsCluster() : ClusterBase(app::Clusters::EthernetNetworkDiagnostics::Id) {}
+    ~EthernetNetworkDiagnosticsCluster() {}
 };
 
-class DLL_EXPORT IdentifyCluster : public ClusterBase
+class DLL_EXPORT BridgedDeviceBasicCluster : public ClusterBase
 {
 public:
-    IdentifyCluster() : ClusterBase(app::Clusters::Identify::Id) {}
-    ~IdentifyCluster() {}
+    BridgedDeviceBasicCluster() : ClusterBase(app::Clusters::BridgedDeviceBasic::Id) {}
+    ~BridgedDeviceBasicCluster() {}
 };
 
-class DLL_EXPORT IlluminanceMeasurementCluster : public ClusterBase
+class DLL_EXPORT SwitchCluster : public ClusterBase
 {
 public:
-    IlluminanceMeasurementCluster() : ClusterBase(app::Clusters::IlluminanceMeasurement::Id) {}
-    ~IlluminanceMeasurementCluster() {}
+    SwitchCluster() : ClusterBase(app::Clusters::Switch::Id) {}
+    ~SwitchCluster() {}
 };
 
-class DLL_EXPORT KeypadInputCluster : public ClusterBase
+class DLL_EXPORT AdministratorCommissioningCluster : public ClusterBase
 {
 public:
-    KeypadInputCluster() : ClusterBase(app::Clusters::KeypadInput::Id) {}
-    ~KeypadInputCluster() {}
+    AdministratorCommissioningCluster() : ClusterBase(app::Clusters::AdministratorCommissioning::Id) {}
+    ~AdministratorCommissioningCluster() {}
 };
 
-class DLL_EXPORT LevelControlCluster : public ClusterBase
+class DLL_EXPORT OperationalCredentialsCluster : public ClusterBase
 {
 public:
-    LevelControlCluster() : ClusterBase(app::Clusters::LevelControl::Id) {}
-    ~LevelControlCluster() {}
+    OperationalCredentialsCluster() : ClusterBase(app::Clusters::OperationalCredentials::Id) {}
+    ~OperationalCredentialsCluster() {}
 };
 
-class DLL_EXPORT LocalizationConfigurationCluster : public ClusterBase
+class DLL_EXPORT GroupKeyManagementCluster : public ClusterBase
 {
 public:
-    LocalizationConfigurationCluster() : ClusterBase(app::Clusters::LocalizationConfiguration::Id) {}
-    ~LocalizationConfigurationCluster() {}
+    GroupKeyManagementCluster() : ClusterBase(app::Clusters::GroupKeyManagement::Id) {}
+    ~GroupKeyManagementCluster() {}
 };
 
-class DLL_EXPORT LowPowerCluster : public ClusterBase
+class DLL_EXPORT FixedLabelCluster : public ClusterBase
 {
 public:
-    LowPowerCluster() : ClusterBase(app::Clusters::LowPower::Id) {}
-    ~LowPowerCluster() {}
+    FixedLabelCluster() : ClusterBase(app::Clusters::FixedLabel::Id) {}
+    ~FixedLabelCluster() {}
 };
 
-class DLL_EXPORT MediaInputCluster : public ClusterBase
+class DLL_EXPORT UserLabelCluster : public ClusterBase
 {
 public:
-    MediaInputCluster() : ClusterBase(app::Clusters::MediaInput::Id) {}
-    ~MediaInputCluster() {}
+    UserLabelCluster() : ClusterBase(app::Clusters::UserLabel::Id) {}
+    ~UserLabelCluster() {}
 };
 
-class DLL_EXPORT MediaPlaybackCluster : public ClusterBase
+class DLL_EXPORT BooleanStateCluster : public ClusterBase
 {
 public:
-    MediaPlaybackCluster() : ClusterBase(app::Clusters::MediaPlayback::Id) {}
-    ~MediaPlaybackCluster() {}
+    BooleanStateCluster() : ClusterBase(app::Clusters::BooleanState::Id) {}
+    ~BooleanStateCluster() {}
 };
 
 class DLL_EXPORT ModeSelectCluster : public ClusterBase
@@ -289,67 +282,74 @@ class DLL_EXPORT ModeSelectCluster : public ClusterBase
     ~ModeSelectCluster() {}
 };
 
-class DLL_EXPORT NetworkCommissioningCluster : public ClusterBase
+class DLL_EXPORT DoorLockCluster : public ClusterBase
 {
 public:
-    NetworkCommissioningCluster() : ClusterBase(app::Clusters::NetworkCommissioning::Id) {}
-    ~NetworkCommissioningCluster() {}
+    DoorLockCluster() : ClusterBase(app::Clusters::DoorLock::Id) {}
+    ~DoorLockCluster() {}
 };
 
-class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
+class DLL_EXPORT WindowCoveringCluster : public ClusterBase
 {
 public:
-    OtaSoftwareUpdateProviderCluster() : ClusterBase(app::Clusters::OtaSoftwareUpdateProvider::Id) {}
-    ~OtaSoftwareUpdateProviderCluster() {}
+    WindowCoveringCluster() : ClusterBase(app::Clusters::WindowCovering::Id) {}
+    ~WindowCoveringCluster() {}
 };
 
-class DLL_EXPORT OtaSoftwareUpdateRequestorCluster : public ClusterBase
+class DLL_EXPORT BarrierControlCluster : public ClusterBase
 {
 public:
-    OtaSoftwareUpdateRequestorCluster() : ClusterBase(app::Clusters::OtaSoftwareUpdateRequestor::Id) {}
-    ~OtaSoftwareUpdateRequestorCluster() {}
+    BarrierControlCluster() : ClusterBase(app::Clusters::BarrierControl::Id) {}
+    ~BarrierControlCluster() {}
 };
 
-class DLL_EXPORT OccupancySensingCluster : public ClusterBase
+class DLL_EXPORT PumpConfigurationAndControlCluster : public ClusterBase
 {
 public:
-    OccupancySensingCluster() : ClusterBase(app::Clusters::OccupancySensing::Id) {}
-    ~OccupancySensingCluster() {}
+    PumpConfigurationAndControlCluster() : ClusterBase(app::Clusters::PumpConfigurationAndControl::Id) {}
+    ~PumpConfigurationAndControlCluster() {}
 };
 
-class DLL_EXPORT OnOffCluster : public ClusterBase
+class DLL_EXPORT ThermostatCluster : public ClusterBase
 {
 public:
-    OnOffCluster() : ClusterBase(app::Clusters::OnOff::Id) {}
-    ~OnOffCluster() {}
+    ThermostatCluster() : ClusterBase(app::Clusters::Thermostat::Id) {}
+    ~ThermostatCluster() {}
 };
 
-class DLL_EXPORT OnOffSwitchConfigurationCluster : public ClusterBase
+class DLL_EXPORT FanControlCluster : public ClusterBase
 {
 public:
-    OnOffSwitchConfigurationCluster() : ClusterBase(app::Clusters::OnOffSwitchConfiguration::Id) {}
-    ~OnOffSwitchConfigurationCluster() {}
+    FanControlCluster() : ClusterBase(app::Clusters::FanControl::Id) {}
+    ~FanControlCluster() {}
 };
 
-class DLL_EXPORT OperationalCredentialsCluster : public ClusterBase
+class DLL_EXPORT ThermostatUserInterfaceConfigurationCluster : public ClusterBase
 {
 public:
-    OperationalCredentialsCluster() : ClusterBase(app::Clusters::OperationalCredentials::Id) {}
-    ~OperationalCredentialsCluster() {}
+    ThermostatUserInterfaceConfigurationCluster() : ClusterBase(app::Clusters::ThermostatUserInterfaceConfiguration::Id) {}
+    ~ThermostatUserInterfaceConfigurationCluster() {}
 };
 
-class DLL_EXPORT PowerSourceCluster : public ClusterBase
+class DLL_EXPORT ColorControlCluster : public ClusterBase
 {
 public:
-    PowerSourceCluster() : ClusterBase(app::Clusters::PowerSource::Id) {}
-    ~PowerSourceCluster() {}
+    ColorControlCluster() : ClusterBase(app::Clusters::ColorControl::Id) {}
+    ~ColorControlCluster() {}
 };
 
-class DLL_EXPORT PowerSourceConfigurationCluster : public ClusterBase
+class DLL_EXPORT IlluminanceMeasurementCluster : public ClusterBase
 {
 public:
-    PowerSourceConfigurationCluster() : ClusterBase(app::Clusters::PowerSourceConfiguration::Id) {}
-    ~PowerSourceConfigurationCluster() {}
+    IlluminanceMeasurementCluster() : ClusterBase(app::Clusters::IlluminanceMeasurement::Id) {}
+    ~IlluminanceMeasurementCluster() {}
+};
+
+class DLL_EXPORT TemperatureMeasurementCluster : public ClusterBase
+{
+public:
+    TemperatureMeasurementCluster() : ClusterBase(app::Clusters::TemperatureMeasurement::Id) {}
+    ~TemperatureMeasurementCluster() {}
 };
 
 class DLL_EXPORT PressureMeasurementCluster : public ClusterBase
@@ -359,11 +359,11 @@ class DLL_EXPORT PressureMeasurementCluster : public ClusterBase
     ~PressureMeasurementCluster() {}
 };
 
-class DLL_EXPORT PumpConfigurationAndControlCluster : public ClusterBase
+class DLL_EXPORT FlowMeasurementCluster : public ClusterBase
 {
 public:
-    PumpConfigurationAndControlCluster() : ClusterBase(app::Clusters::PumpConfigurationAndControl::Id) {}
-    ~PumpConfigurationAndControlCluster() {}
+    FlowMeasurementCluster() : ClusterBase(app::Clusters::FlowMeasurement::Id) {}
+    ~FlowMeasurementCluster() {}
 };
 
 class DLL_EXPORT RelativeHumidityMeasurementCluster : public ClusterBase
@@ -373,25 +373,25 @@ class DLL_EXPORT RelativeHumidityMeasurementCluster : public ClusterBase
     ~RelativeHumidityMeasurementCluster() {}
 };
 
-class DLL_EXPORT ScenesCluster : public ClusterBase
+class DLL_EXPORT OccupancySensingCluster : public ClusterBase
 {
 public:
-    ScenesCluster() : ClusterBase(app::Clusters::Scenes::Id) {}
-    ~ScenesCluster() {}
+    OccupancySensingCluster() : ClusterBase(app::Clusters::OccupancySensing::Id) {}
+    ~OccupancySensingCluster() {}
 };
 
-class DLL_EXPORT SoftwareDiagnosticsCluster : public ClusterBase
+class DLL_EXPORT WakeOnLanCluster : public ClusterBase
 {
 public:
-    SoftwareDiagnosticsCluster() : ClusterBase(app::Clusters::SoftwareDiagnostics::Id) {}
-    ~SoftwareDiagnosticsCluster() {}
+    WakeOnLanCluster() : ClusterBase(app::Clusters::WakeOnLan::Id) {}
+    ~WakeOnLanCluster() {}
 };
 
-class DLL_EXPORT SwitchCluster : public ClusterBase
+class DLL_EXPORT ChannelCluster : public ClusterBase
 {
 public:
-    SwitchCluster() : ClusterBase(app::Clusters::Switch::Id) {}
-    ~SwitchCluster() {}
+    ChannelCluster() : ClusterBase(app::Clusters::Channel::Id) {}
+    ~ChannelCluster() {}
 };
 
 class DLL_EXPORT TargetNavigatorCluster : public ClusterBase
@@ -401,81 +401,81 @@ class DLL_EXPORT TargetNavigatorCluster : public ClusterBase
     ~TargetNavigatorCluster() {}
 };
 
-class DLL_EXPORT TemperatureMeasurementCluster : public ClusterBase
+class DLL_EXPORT MediaPlaybackCluster : public ClusterBase
 {
 public:
-    TemperatureMeasurementCluster() : ClusterBase(app::Clusters::TemperatureMeasurement::Id) {}
-    ~TemperatureMeasurementCluster() {}
+    MediaPlaybackCluster() : ClusterBase(app::Clusters::MediaPlayback::Id) {}
+    ~MediaPlaybackCluster() {}
 };
 
-class DLL_EXPORT TestClusterCluster : public ClusterBase
+class DLL_EXPORT MediaInputCluster : public ClusterBase
 {
 public:
-    TestClusterCluster() : ClusterBase(app::Clusters::TestCluster::Id) {}
-    ~TestClusterCluster() {}
+    MediaInputCluster() : ClusterBase(app::Clusters::MediaInput::Id) {}
+    ~MediaInputCluster() {}
 };
 
-class DLL_EXPORT ThermostatCluster : public ClusterBase
+class DLL_EXPORT LowPowerCluster : public ClusterBase
 {
 public:
-    ThermostatCluster() : ClusterBase(app::Clusters::Thermostat::Id) {}
-    ~ThermostatCluster() {}
+    LowPowerCluster() : ClusterBase(app::Clusters::LowPower::Id) {}
+    ~LowPowerCluster() {}
 };
 
-class DLL_EXPORT ThermostatUserInterfaceConfigurationCluster : public ClusterBase
+class DLL_EXPORT KeypadInputCluster : public ClusterBase
 {
 public:
-    ThermostatUserInterfaceConfigurationCluster() : ClusterBase(app::Clusters::ThermostatUserInterfaceConfiguration::Id) {}
-    ~ThermostatUserInterfaceConfigurationCluster() {}
+    KeypadInputCluster() : ClusterBase(app::Clusters::KeypadInput::Id) {}
+    ~KeypadInputCluster() {}
 };
 
-class DLL_EXPORT ThreadNetworkDiagnosticsCluster : public ClusterBase
+class DLL_EXPORT ContentLauncherCluster : public ClusterBase
 {
 public:
-    ThreadNetworkDiagnosticsCluster() : ClusterBase(app::Clusters::ThreadNetworkDiagnostics::Id) {}
-    ~ThreadNetworkDiagnosticsCluster() {}
+    ContentLauncherCluster() : ClusterBase(app::Clusters::ContentLauncher::Id) {}
+    ~ContentLauncherCluster() {}
 };
 
-class DLL_EXPORT TimeFormatLocalizationCluster : public ClusterBase
+class DLL_EXPORT AudioOutputCluster : public ClusterBase
 {
 public:
-    TimeFormatLocalizationCluster() : ClusterBase(app::Clusters::TimeFormatLocalization::Id) {}
-    ~TimeFormatLocalizationCluster() {}
+    AudioOutputCluster() : ClusterBase(app::Clusters::AudioOutput::Id) {}
+    ~AudioOutputCluster() {}
 };
 
-class DLL_EXPORT UnitLocalizationCluster : public ClusterBase
+class DLL_EXPORT ApplicationLauncherCluster : public ClusterBase
 {
 public:
-    UnitLocalizationCluster() : ClusterBase(app::Clusters::UnitLocalization::Id) {}
-    ~UnitLocalizationCluster() {}
+    ApplicationLauncherCluster() : ClusterBase(app::Clusters::ApplicationLauncher::Id) {}
+    ~ApplicationLauncherCluster() {}
 };
 
-class DLL_EXPORT UserLabelCluster : public ClusterBase
+class DLL_EXPORT ApplicationBasicCluster : public ClusterBase
 {
 public:
-    UserLabelCluster() : ClusterBase(app::Clusters::UserLabel::Id) {}
-    ~UserLabelCluster() {}
+    ApplicationBasicCluster() : ClusterBase(app::Clusters::ApplicationBasic::Id) {}
+    ~ApplicationBasicCluster() {}
 };
 
-class DLL_EXPORT WakeOnLanCluster : public ClusterBase
+class DLL_EXPORT AccountLoginCluster : public ClusterBase
 {
 public:
-    WakeOnLanCluster() : ClusterBase(app::Clusters::WakeOnLan::Id) {}
-    ~WakeOnLanCluster() {}
+    AccountLoginCluster() : ClusterBase(app::Clusters::AccountLogin::Id) {}
+    ~AccountLoginCluster() {}
 };
 
-class DLL_EXPORT WiFiNetworkDiagnosticsCluster : public ClusterBase
+class DLL_EXPORT ElectricalMeasurementCluster : public ClusterBase
 {
 public:
-    WiFiNetworkDiagnosticsCluster() : ClusterBase(app::Clusters::WiFiNetworkDiagnostics::Id) {}
-    ~WiFiNetworkDiagnosticsCluster() {}
+    ElectricalMeasurementCluster() : ClusterBase(app::Clusters::ElectricalMeasurement::Id) {}
+    ~ElectricalMeasurementCluster() {}
 };
 
-class DLL_EXPORT WindowCoveringCluster : public ClusterBase
+class DLL_EXPORT TestClusterCluster : public ClusterBase
 {
 public:
-    WindowCoveringCluster() : ClusterBase(app::Clusters::WindowCovering::Id) {}
-    ~WindowCoveringCluster() {}
+    TestClusterCluster() : ClusterBase(app::Clusters::TestCluster::Id) {}
+    ~TestClusterCluster() {}
 };
 
 } // namespace Controller
diff --git a/zzz_generated/controller-clusters/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/controller-clusters/zap-generated/PluginApplicationCallbacks.h
index ac1234b9cd2493..2a939f3d431dd2 100644
--- a/zzz_generated/controller-clusters/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/controller-clusters/zap-generated/PluginApplicationCallbacks.h
@@ -22,67 +22,67 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterAccessControlPluginClientInitCallback();                                                                                 \
-    MatterAccountLoginPluginClientInitCallback();                                                                                  \
-    MatterAdministratorCommissioningPluginClientInitCallback();                                                                    \
-    MatterApplicationBasicPluginClientInitCallback();                                                                              \
-    MatterApplicationLauncherPluginClientInitCallback();                                                                           \
-    MatterAudioOutputPluginClientInitCallback();                                                                                   \
-    MatterBarrierControlPluginClientInitCallback();                                                                                \
-    MatterBasicPluginClientInitCallback();                                                                                         \
+    MatterIdentifyPluginClientInitCallback();                                                                                      \
+    MatterGroupsPluginClientInitCallback();                                                                                        \
+    MatterScenesPluginClientInitCallback();                                                                                        \
+    MatterOnOffPluginClientInitCallback();                                                                                         \
+    MatterOnOffSwitchConfigurationPluginClientInitCallback();                                                                      \
+    MatterLevelControlPluginClientInitCallback();                                                                                  \
     MatterBinaryInputBasicPluginClientInitCallback();                                                                              \
+    MatterDescriptorPluginClientInitCallback();                                                                                    \
     MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterBooleanStatePluginClientInitCallback();                                                                                  \
+    MatterAccessControlPluginClientInitCallback();                                                                                 \
     MatterBridgedActionsPluginClientInitCallback();                                                                                \
-    MatterBridgedDeviceBasicPluginClientInitCallback();                                                                            \
-    MatterChannelPluginClientInitCallback();                                                                                       \
-    MatterColorControlPluginClientInitCallback();                                                                                  \
-    MatterContentLauncherPluginClientInitCallback();                                                                               \
-    MatterDescriptorPluginClientInitCallback();                                                                                    \
-    MatterDiagnosticLogsPluginClientInitCallback();                                                                                \
-    MatterDoorLockPluginClientInitCallback();                                                                                      \
-    MatterElectricalMeasurementPluginClientInitCallback();                                                                         \
-    MatterEthernetNetworkDiagnosticsPluginClientInitCallback();                                                                    \
-    MatterFanControlPluginClientInitCallback();                                                                                    \
-    MatterFixedLabelPluginClientInitCallback();                                                                                    \
-    MatterFlowMeasurementPluginClientInitCallback();                                                                               \
-    MatterGeneralCommissioningPluginClientInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginClientInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginClientInitCallback();                                                                            \
-    MatterGroupsPluginClientInitCallback();                                                                                        \
-    MatterIdentifyPluginClientInitCallback();                                                                                      \
-    MatterIlluminanceMeasurementPluginClientInitCallback();                                                                        \
-    MatterKeypadInputPluginClientInitCallback();                                                                                   \
-    MatterLevelControlPluginClientInitCallback();                                                                                  \
-    MatterLocalizationConfigurationPluginClientInitCallback();                                                                     \
-    MatterLowPowerPluginClientInitCallback();                                                                                      \
-    MatterMediaInputPluginClientInitCallback();                                                                                    \
-    MatterMediaPlaybackPluginClientInitCallback();                                                                                 \
-    MatterModeSelectPluginClientInitCallback();                                                                                    \
-    MatterNetworkCommissioningPluginClientInitCallback();                                                                          \
+    MatterBasicPluginClientInitCallback();                                                                                         \
     MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
     MatterOtaSoftwareUpdateRequestorPluginClientInitCallback();                                                                    \
-    MatterOccupancySensingPluginClientInitCallback();                                                                              \
-    MatterOnOffPluginClientInitCallback();                                                                                         \
-    MatterOnOffSwitchConfigurationPluginClientInitCallback();                                                                      \
-    MatterOperationalCredentialsPluginClientInitCallback();                                                                        \
-    MatterPowerSourcePluginClientInitCallback();                                                                                   \
+    MatterLocalizationConfigurationPluginClientInitCallback();                                                                     \
+    MatterTimeFormatLocalizationPluginClientInitCallback();                                                                        \
+    MatterUnitLocalizationPluginClientInitCallback();                                                                              \
     MatterPowerSourceConfigurationPluginClientInitCallback();                                                                      \
-    MatterPressureMeasurementPluginClientInitCallback();                                                                           \
-    MatterPumpConfigurationAndControlPluginClientInitCallback();                                                                   \
-    MatterRelativeHumidityMeasurementPluginClientInitCallback();                                                                   \
-    MatterScenesPluginClientInitCallback();                                                                                        \
+    MatterPowerSourcePluginClientInitCallback();                                                                                   \
+    MatterGeneralCommissioningPluginClientInitCallback();                                                                          \
+    MatterNetworkCommissioningPluginClientInitCallback();                                                                          \
+    MatterDiagnosticLogsPluginClientInitCallback();                                                                                \
+    MatterGeneralDiagnosticsPluginClientInitCallback();                                                                            \
     MatterSoftwareDiagnosticsPluginClientInitCallback();                                                                           \
+    MatterThreadNetworkDiagnosticsPluginClientInitCallback();                                                                      \
+    MatterWiFiNetworkDiagnosticsPluginClientInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginClientInitCallback();                                                                    \
+    MatterBridgedDeviceBasicPluginClientInitCallback();                                                                            \
     MatterSwitchPluginClientInitCallback();                                                                                        \
-    MatterTargetNavigatorPluginClientInitCallback();                                                                               \
-    MatterTemperatureMeasurementPluginClientInitCallback();                                                                        \
-    MatterTestClusterPluginClientInitCallback();                                                                                   \
+    MatterAdministratorCommissioningPluginClientInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginClientInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginClientInitCallback();                                                                            \
+    MatterFixedLabelPluginClientInitCallback();                                                                                    \
+    MatterUserLabelPluginClientInitCallback();                                                                                     \
+    MatterBooleanStatePluginClientInitCallback();                                                                                  \
+    MatterModeSelectPluginClientInitCallback();                                                                                    \
+    MatterDoorLockPluginClientInitCallback();                                                                                      \
+    MatterWindowCoveringPluginClientInitCallback();                                                                                \
+    MatterBarrierControlPluginClientInitCallback();                                                                                \
+    MatterPumpConfigurationAndControlPluginClientInitCallback();                                                                   \
     MatterThermostatPluginClientInitCallback();                                                                                    \
+    MatterFanControlPluginClientInitCallback();                                                                                    \
     MatterThermostatUserInterfaceConfigurationPluginClientInitCallback();                                                          \
-    MatterThreadNetworkDiagnosticsPluginClientInitCallback();                                                                      \
-    MatterTimeFormatLocalizationPluginClientInitCallback();                                                                        \
-    MatterUnitLocalizationPluginClientInitCallback();                                                                              \
-    MatterUserLabelPluginClientInitCallback();                                                                                     \
+    MatterColorControlPluginClientInitCallback();                                                                                  \
+    MatterIlluminanceMeasurementPluginClientInitCallback();                                                                        \
+    MatterTemperatureMeasurementPluginClientInitCallback();                                                                        \
+    MatterPressureMeasurementPluginClientInitCallback();                                                                           \
+    MatterFlowMeasurementPluginClientInitCallback();                                                                               \
+    MatterRelativeHumidityMeasurementPluginClientInitCallback();                                                                   \
+    MatterOccupancySensingPluginClientInitCallback();                                                                              \
     MatterWakeOnLanPluginClientInitCallback();                                                                                     \
-    MatterWiFiNetworkDiagnosticsPluginClientInitCallback();                                                                        \
-    MatterWindowCoveringPluginClientInitCallback();
+    MatterChannelPluginClientInitCallback();                                                                                       \
+    MatterTargetNavigatorPluginClientInitCallback();                                                                               \
+    MatterMediaPlaybackPluginClientInitCallback();                                                                                 \
+    MatterMediaInputPluginClientInitCallback();                                                                                    \
+    MatterLowPowerPluginClientInitCallback();                                                                                      \
+    MatterKeypadInputPluginClientInitCallback();                                                                                   \
+    MatterContentLauncherPluginClientInitCallback();                                                                               \
+    MatterAudioOutputPluginClientInitCallback();                                                                                   \
+    MatterApplicationLauncherPluginClientInitCallback();                                                                           \
+    MatterApplicationBasicPluginClientInitCallback();                                                                              \
+    MatterAccountLoginPluginClientInitCallback();                                                                                  \
+    MatterElectricalMeasurementPluginClientInitCallback();                                                                         \
+    MatterTestClusterPluginClientInitCallback();
diff --git a/zzz_generated/controller-clusters/zap-generated/gen_config.h b/zzz_generated/controller-clusters/zap-generated/gen_config.h
index 38c08402707a43..bcb14dfe6829c4 100644
--- a/zzz_generated/controller-clusters/zap-generated/gen_config.h
+++ b/zzz_generated/controller-clusters/zap-generated/gen_config.h
@@ -29,325 +29,325 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
-#define EMBER_AF_ACCESS_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_ACCOUNT_LOGIN_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_APPLICATION_BASIC_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_APPLICATION_LAUNCHER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_AUDIO_OUTPUT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_BARRIER_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_BASIC_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_IDENTIFY_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUPS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_SCENES_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_ON_OFF_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_ON_OFF_SWITCH_CONFIG_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_LEVEL_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_BINARY_INPUT_BASIC_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_BOOLEAN_STATE_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_ACCESS_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_BRIDGED_ACTIONS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_BRIDGED_DEVICE_BASIC_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_CHANNEL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_COLOR_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_DOOR_LOCK_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_ELECTRICAL_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_FAN_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUPS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_IDENTIFY_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_ILLUMINANCE_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_KEYPAD_INPUT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_LEVEL_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOW_POWER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_MEDIA_INPUT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_MEDIA_PLAYBACK_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_MODE_SELECT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_BASIC_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_REQUESTOR_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_OCCUPANCY_SENSING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_ON_OFF_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_ON_OFF_SWITCH_CONFIG_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_POWER_SOURCE_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_POWER_SOURCE_CONFIGURATION_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_PUMP_CONFIG_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_SCENES_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_POWER_SOURCE_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_BRIDGED_DEVICE_BASIC_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_SWITCH_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_TARGET_NAVIGATOR_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_TEST_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_USER_LABEL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_BOOLEAN_STATE_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_MODE_SELECT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_DOOR_LOCK_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_WINDOW_COVERING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_BARRIER_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_PUMP_CONFIG_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_THERMOSTAT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_FAN_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_USER_LABEL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_COLOR_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_ILLUMINANCE_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_OCCUPANCY_SENSING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_WAKE_ON_LAN_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_WINDOW_COVERING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_CHANNEL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_TARGET_NAVIGATOR_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_MEDIA_PLAYBACK_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_MEDIA_INPUT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOW_POWER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_KEYPAD_INPUT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_AUDIO_OUTPUT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_APPLICATION_LAUNCHER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_APPLICATION_BASIC_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_ACCOUNT_LOGIN_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_ELECTRICAL_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_TEST_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
-// Use this macro to check if the client side of the Access Control cluster is included
-#define ZCL_USING_ACCESS_CONTROL_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL_CLIENT
-
-// Use this macro to check if the client side of the Account Login cluster is included
-#define ZCL_USING_ACCOUNT_LOGIN_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_ACCOUNT_LOGIN_CLIENT
-
-// Use this macro to check if the client side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_CLIENT
+// Use this macro to check if the client side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_IDENTIFY_CLIENT
 
-// Use this macro to check if the client side of the Application Basic cluster is included
-#define ZCL_USING_APPLICATION_BASIC_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_APPLICATION_BASIC_CLIENT
+// Use this macro to check if the client side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_GROUPS_CLIENT
 
-// Use this macro to check if the client side of the Application Launcher cluster is included
-#define ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_APPLICATION_LAUNCHER_CLIENT
+// Use this macro to check if the client side of the Scenes cluster is included
+#define ZCL_USING_SCENES_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_SCENES_CLIENT
 
-// Use this macro to check if the client side of the Audio Output cluster is included
-#define ZCL_USING_AUDIO_OUTPUT_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_AUDIO_OUTPUT_CLIENT
+// Use this macro to check if the client side of the On/Off cluster is included
+#define ZCL_USING_ON_OFF_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_ON_OFF_CLIENT
 
-// Use this macro to check if the client side of the Barrier Control cluster is included
-#define ZCL_USING_BARRIER_CONTROL_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_BARRIER_CONTROL_CLIENT
+// Use this macro to check if the client side of the On/off Switch Configuration cluster is included
+#define ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_ON_OFF_SWITCH_CONFIGURATION_CLIENT
 
-// Use this macro to check if the client side of the Basic cluster is included
-#define ZCL_USING_BASIC_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_BASIC_CLIENT
+// Use this macro to check if the client side of the Level Control cluster is included
+#define ZCL_USING_LEVEL_CONTROL_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_CLIENT
 
 // Use this macro to check if the client side of the Binary Input (Basic) cluster is included
 #define ZCL_USING_BINARY_INPUT_BASIC_CLUSTER_CLIENT
 #define EMBER_AF_PLUGIN_BINARY_INPUT_BASIC_CLIENT
 
+// Use this macro to check if the client side of the Descriptor cluster is included
+#define ZCL_USING_DESCRIPTOR_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_DESCRIPTOR_CLIENT
+
 // Use this macro to check if the client side of the Binding cluster is included
 #define ZCL_USING_BINDING_CLUSTER_CLIENT
 #define EMBER_AF_PLUGIN_BINDING_CLIENT
 
-// Use this macro to check if the client side of the Boolean State cluster is included
-#define ZCL_USING_BOOLEAN_STATE_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_BOOLEAN_STATE_CLIENT
+// Use this macro to check if the client side of the Access Control cluster is included
+#define ZCL_USING_ACCESS_CONTROL_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL_CLIENT
 
 // Use this macro to check if the client side of the Bridged Actions cluster is included
 #define ZCL_USING_BRIDGED_ACTIONS_CLUSTER_CLIENT
 #define EMBER_AF_PLUGIN_BRIDGED_ACTIONS_CLIENT
 
-// Use this macro to check if the client side of the Bridged Device Basic cluster is included
-#define ZCL_USING_BRIDGED_DEVICE_BASIC_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_BRIDGED_DEVICE_BASIC_CLIENT
-
-// Use this macro to check if the client side of the Channel cluster is included
-#define ZCL_USING_CHANNEL_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_CHANNEL_CLIENT
-
-// Use this macro to check if the client side of the Color Control cluster is included
-#define ZCL_USING_COLOR_CONTROL_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_COLOR_CONTROL_CLIENT
-
-// Use this macro to check if the client side of the Content Launcher cluster is included
-#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_CLIENT
-
-// Use this macro to check if the client side of the Descriptor cluster is included
-#define ZCL_USING_DESCRIPTOR_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_DESCRIPTOR_CLIENT
+// Use this macro to check if the client side of the Basic cluster is included
+#define ZCL_USING_BASIC_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_BASIC_CLIENT
 
-// Use this macro to check if the client side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_CLIENT
+// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
+#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
 
-// Use this macro to check if the client side of the Door Lock cluster is included
-#define ZCL_USING_DOOR_LOCK_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_DOOR_LOCK_CLIENT
+// Use this macro to check if the client side of the OTA Software Update Requestor cluster is included
+#define ZCL_USING_OTA_REQUESTOR_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_CLIENT
 
-// Use this macro to check if the client side of the Electrical Measurement cluster is included
-#define ZCL_USING_ELECTRICAL_MEASUREMENT_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_ELECTRICAL_MEASUREMENT_CLIENT
+// Use this macro to check if the client side of the Localization Configuration cluster is included
+#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_CLIENT
 
-// Use this macro to check if the client side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_CLIENT
+// Use this macro to check if the client side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_CLIENT
 
-// Use this macro to check if the client side of the Fan Control cluster is included
-#define ZCL_USING_FAN_CONTROL_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_FAN_CONTROL_CLIENT
+// Use this macro to check if the client side of the Unit Localization cluster is included
+#define ZCL_USING_UNIT_LOCALIZATION_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION_CLIENT
 
-// Use this macro to check if the client side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_FIXED_LABEL_CLIENT
+// Use this macro to check if the client side of the Power Source Configuration cluster is included
+#define ZCL_USING_POWER_SOURCE_CONFIGURATION_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_POWER_SOURCE_CONFIGURATION_CLIENT
 
-// Use this macro to check if the client side of the Flow Measurement cluster is included
-#define ZCL_USING_FLOW_MEASUREMENT_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT_CLIENT
+// Use this macro to check if the client side of the Power Source cluster is included
+#define ZCL_USING_POWER_SOURCE_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_POWER_SOURCE_CLIENT
 
 // Use this macro to check if the client side of the General Commissioning cluster is included
 #define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_CLIENT
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_CLIENT
 
+// Use this macro to check if the client side of the Network Commissioning cluster is included
+#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_CLIENT
+
+// Use this macro to check if the client side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_CLIENT
+
 // Use this macro to check if the client side of the General Diagnostics cluster is included
 #define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_CLIENT
 #define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_CLIENT
 
-// Use this macro to check if the client side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_CLIENT
+// Use this macro to check if the client side of the Software Diagnostics cluster is included
+#define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_CLIENT
 
-// Use this macro to check if the client side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_GROUPS_CLIENT
+// Use this macro to check if the client side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_CLIENT
 
-// Use this macro to check if the client side of the Identify cluster is included
-#define ZCL_USING_IDENTIFY_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_IDENTIFY_CLIENT
+// Use this macro to check if the client side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_CLIENT
 
-// Use this macro to check if the client side of the Illuminance Measurement cluster is included
-#define ZCL_USING_ILLUMINANCE_MEASUREMENT_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT_CLIENT
+// Use this macro to check if the client side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_CLIENT
 
-// Use this macro to check if the client side of the Keypad Input cluster is included
-#define ZCL_USING_KEYPAD_INPUT_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_KEYPAD_INPUT_CLIENT
+// Use this macro to check if the client side of the Bridged Device Basic cluster is included
+#define ZCL_USING_BRIDGED_DEVICE_BASIC_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_BRIDGED_DEVICE_BASIC_CLIENT
 
-// Use this macro to check if the client side of the Level Control cluster is included
-#define ZCL_USING_LEVEL_CONTROL_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_CLIENT
+// Use this macro to check if the client side of the Switch cluster is included
+#define ZCL_USING_SWITCH_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_SWITCH_CLIENT
 
-// Use this macro to check if the client side of the Localization Configuration cluster is included
-#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_CLIENT
+// Use this macro to check if the client side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_CLIENT
 
-// Use this macro to check if the client side of the Low Power cluster is included
-#define ZCL_USING_LOW_POWER_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_LOW_POWER_CLIENT
+// Use this macro to check if the client side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_CLIENT
 
-// Use this macro to check if the client side of the Media Input cluster is included
-#define ZCL_USING_MEDIA_INPUT_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_MEDIA_INPUT_CLIENT
+// Use this macro to check if the client side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_CLIENT
 
-// Use this macro to check if the client side of the Media Playback cluster is included
-#define ZCL_USING_MEDIA_PLAYBACK_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_MEDIA_PLAYBACK_CLIENT
+// Use this macro to check if the client side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_FIXED_LABEL_CLIENT
+
+// Use this macro to check if the client side of the User Label cluster is included
+#define ZCL_USING_USER_LABEL_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_USER_LABEL_CLIENT
+
+// Use this macro to check if the client side of the Boolean State cluster is included
+#define ZCL_USING_BOOLEAN_STATE_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_BOOLEAN_STATE_CLIENT
 
 // Use this macro to check if the client side of the Mode Select cluster is included
 #define ZCL_USING_MODE_SELECT_CLUSTER_CLIENT
 #define EMBER_AF_PLUGIN_MODE_SELECT_CLIENT
 
-// Use this macro to check if the client side of the Network Commissioning cluster is included
-#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_CLIENT
+// Use this macro to check if the client side of the Door Lock cluster is included
+#define ZCL_USING_DOOR_LOCK_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_DOOR_LOCK_CLIENT
 
-// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
-#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
+// Use this macro to check if the client side of the Window Covering cluster is included
+#define ZCL_USING_WINDOW_COVERING_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_WINDOW_COVERING_CLIENT
 
-// Use this macro to check if the client side of the OTA Software Update Requestor cluster is included
-#define ZCL_USING_OTA_REQUESTOR_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_CLIENT
+// Use this macro to check if the client side of the Barrier Control cluster is included
+#define ZCL_USING_BARRIER_CONTROL_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_BARRIER_CONTROL_CLIENT
 
-// Use this macro to check if the client side of the Occupancy Sensing cluster is included
-#define ZCL_USING_OCCUPANCY_SENSING_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING_CLIENT
+// Use this macro to check if the client side of the Pump Configuration and Control cluster is included
+#define ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL_CLIENT
 
-// Use this macro to check if the client side of the On/Off cluster is included
-#define ZCL_USING_ON_OFF_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_ON_OFF_CLIENT
+// Use this macro to check if the client side of the Thermostat cluster is included
+#define ZCL_USING_THERMOSTAT_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_THERMOSTAT_CLIENT
 
-// Use this macro to check if the client side of the On/off Switch Configuration cluster is included
-#define ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_ON_OFF_SWITCH_CONFIGURATION_CLIENT
+// Use this macro to check if the client side of the Fan Control cluster is included
+#define ZCL_USING_FAN_CONTROL_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_FAN_CONTROL_CLIENT
 
-// Use this macro to check if the client side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_CLIENT
+// Use this macro to check if the client side of the Thermostat User Interface Configuration cluster is included
+#define ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLIENT
 
-// Use this macro to check if the client side of the Power Source cluster is included
-#define ZCL_USING_POWER_SOURCE_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_POWER_SOURCE_CLIENT
+// Use this macro to check if the client side of the Color Control cluster is included
+#define ZCL_USING_COLOR_CONTROL_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_CLIENT
 
-// Use this macro to check if the client side of the Power Source Configuration cluster is included
-#define ZCL_USING_POWER_SOURCE_CONFIGURATION_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_POWER_SOURCE_CONFIGURATION_CLIENT
+// Use this macro to check if the client side of the Illuminance Measurement cluster is included
+#define ZCL_USING_ILLUMINANCE_MEASUREMENT_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT_CLIENT
+
+// Use this macro to check if the client side of the Temperature Measurement cluster is included
+#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_CLIENT
 
 // Use this macro to check if the client side of the Pressure Measurement cluster is included
 #define ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_CLIENT
 #define EMBER_AF_PLUGIN_PRESSURE_MEASUREMENT_CLIENT
 
-// Use this macro to check if the client side of the Pump Configuration and Control cluster is included
-#define ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL_CLIENT
+// Use this macro to check if the client side of the Flow Measurement cluster is included
+#define ZCL_USING_FLOW_MEASUREMENT_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT_CLIENT
 
 // Use this macro to check if the client side of the Relative Humidity Measurement cluster is included
 #define ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT
 #define EMBER_AF_PLUGIN_RELATIVE_HUMIDITY_MEASUREMENT_CLIENT
 
-// Use this macro to check if the client side of the Scenes cluster is included
-#define ZCL_USING_SCENES_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_SCENES_CLIENT
+// Use this macro to check if the client side of the Occupancy Sensing cluster is included
+#define ZCL_USING_OCCUPANCY_SENSING_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING_CLIENT
 
-// Use this macro to check if the client side of the Software Diagnostics cluster is included
-#define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_CLIENT
+// Use this macro to check if the client side of the Wake on LAN cluster is included
+#define ZCL_USING_WAKE_ON_LAN_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_WAKE_ON_LAN_CLIENT
 
-// Use this macro to check if the client side of the Switch cluster is included
-#define ZCL_USING_SWITCH_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_SWITCH_CLIENT
+// Use this macro to check if the client side of the Channel cluster is included
+#define ZCL_USING_CHANNEL_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_CHANNEL_CLIENT
 
 // Use this macro to check if the client side of the Target Navigator cluster is included
 #define ZCL_USING_TARGET_NAVIGATOR_CLUSTER_CLIENT
 #define EMBER_AF_PLUGIN_TARGET_NAVIGATOR_CLIENT
 
-// Use this macro to check if the client side of the Temperature Measurement cluster is included
-#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_CLIENT
+// Use this macro to check if the client side of the Media Playback cluster is included
+#define ZCL_USING_MEDIA_PLAYBACK_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_MEDIA_PLAYBACK_CLIENT
 
-// Use this macro to check if the client side of the Test Cluster cluster is included
-#define ZCL_USING_TEST_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_TEST_CLUSTER_CLIENT
+// Use this macro to check if the client side of the Media Input cluster is included
+#define ZCL_USING_MEDIA_INPUT_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_MEDIA_INPUT_CLIENT
 
-// Use this macro to check if the client side of the Thermostat cluster is included
-#define ZCL_USING_THERMOSTAT_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_THERMOSTAT_CLIENT
+// Use this macro to check if the client side of the Low Power cluster is included
+#define ZCL_USING_LOW_POWER_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_LOW_POWER_CLIENT
 
-// Use this macro to check if the client side of the Thermostat User Interface Configuration cluster is included
-#define ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLIENT
+// Use this macro to check if the client side of the Keypad Input cluster is included
+#define ZCL_USING_KEYPAD_INPUT_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_KEYPAD_INPUT_CLIENT
 
-// Use this macro to check if the client side of the Thread Network Diagnostics cluster is included
-#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_CLIENT
+// Use this macro to check if the client side of the Content Launcher cluster is included
+#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_CLIENT
 
-// Use this macro to check if the client side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_CLIENT
+// Use this macro to check if the client side of the Audio Output cluster is included
+#define ZCL_USING_AUDIO_OUTPUT_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_AUDIO_OUTPUT_CLIENT
 
-// Use this macro to check if the client side of the Unit Localization cluster is included
-#define ZCL_USING_UNIT_LOCALIZATION_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION_CLIENT
+// Use this macro to check if the client side of the Application Launcher cluster is included
+#define ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_APPLICATION_LAUNCHER_CLIENT
 
-// Use this macro to check if the client side of the User Label cluster is included
-#define ZCL_USING_USER_LABEL_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_USER_LABEL_CLIENT
+// Use this macro to check if the client side of the Application Basic cluster is included
+#define ZCL_USING_APPLICATION_BASIC_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_APPLICATION_BASIC_CLIENT
 
-// Use this macro to check if the client side of the Wake on LAN cluster is included
-#define ZCL_USING_WAKE_ON_LAN_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_WAKE_ON_LAN_CLIENT
+// Use this macro to check if the client side of the Account Login cluster is included
+#define ZCL_USING_ACCOUNT_LOGIN_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_ACCOUNT_LOGIN_CLIENT
 
-// Use this macro to check if the client side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_CLIENT
+// Use this macro to check if the client side of the Electrical Measurement cluster is included
+#define ZCL_USING_ELECTRICAL_MEASUREMENT_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_ELECTRICAL_MEASUREMENT_CLIENT
 
-// Use this macro to check if the client side of the Window Covering cluster is included
-#define ZCL_USING_WINDOW_COVERING_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_WINDOW_COVERING_CLIENT
+// Use this macro to check if the client side of the Test Cluster cluster is included
+#define ZCL_USING_TEST_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_TEST_CLUSTER_CLIENT
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/CHIPTestClustersObjc.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/CHIPTestClustersObjc.h
index 6b499b60008112..1cdc445b668776 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/CHIPTestClustersObjc.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/CHIPTestClustersObjc.h
@@ -24,31 +24,12 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /**
- * Cluster Access Control
- *
- */
-@interface CHIPTestAccessControl : CHIPAccessControl
-
-- (void)writeAttributeSubjectsPerAccessControlEntryWithValue:(NSNumber * _Nonnull)value
-                                           completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTargetsPerAccessControlEntryWithValue:(NSNumber * _Nonnull)value
-                                          completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAccessControlEntriesPerFabricWithValue:(NSNumber * _Nonnull)value
-                                           completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-
-@end
-
-/**
- * Cluster Account Login
+ * Cluster Identify
  *
  */
-@interface CHIPTestAccountLogin : CHIPAccountLogin
+@interface CHIPTestIdentify : CHIPIdentify
 
+- (void)writeAttributeIdentifyTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -58,14 +39,12 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster AdministratorCommissioning
+ * Cluster Groups
  *
  */
-@interface CHIPTestAdministratorCommissioning : CHIPAdministratorCommissioning
+@interface CHIPTestGroups : CHIPGroups
 
-- (void)writeAttributeWindowStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAdminFabricIndexWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAdminVendorIdWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNameSupportWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -75,20 +54,17 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Application Basic
+ * Cluster Scenes
  *
  */
-@interface CHIPTestApplicationBasic : CHIPApplicationBasic
+@interface CHIPTestScenes : CHIPScenes
 
-- (void)writeAttributeVendorNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeVendorIDWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeApplicationNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeProductIDWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeApplicationWithValue:(CHIPApplicationBasicClusterApplicationBasicApplication * _Nonnull)value
-                         completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeApplicationVersionWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAllowedVendorListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSceneCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCurrentSceneWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCurrentGroupWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSceneValidWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNameSupportWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeLastConfiguredByWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -98,12 +74,13 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Application Launcher
+ * Cluster On/Off
  *
  */
-@interface CHIPTestApplicationLauncher : CHIPApplicationLauncher
+@interface CHIPTestOnOff : CHIPOnOff
 
-- (void)writeAttributeCatalogListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOnOffWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeGlobalSceneControlWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -113,13 +90,12 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Audio Output
+ * Cluster On/off Switch Configuration
  *
  */
-@interface CHIPTestAudioOutput : CHIPAudioOutput
+@interface CHIPTestOnOffSwitchConfiguration : CHIPOnOffSwitchConfiguration
 
-- (void)writeAttributeOutputListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCurrentOutputWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSwitchTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -129,15 +105,18 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Barrier Control
+ * Cluster Level Control
  *
  */
-@interface CHIPTestBarrierControl : CHIPBarrierControl
+@interface CHIPTestLevelControl : CHIPLevelControl
 
-- (void)writeAttributeBarrierMovingStateWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBarrierSafetyStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBarrierCapabilitiesWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBarrierPositionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCurrentLevelWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRemainingTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMinLevelWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMaxLevelWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCurrentFrequencyWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMinFrequencyWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMaxFrequencyWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -147,31 +126,14 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Basic
+ * Cluster Binary Input (Basic)
  *
  */
-@interface CHIPTestBasic : CHIPBasic
+@interface CHIPTestBinaryInputBasic : CHIPBinaryInputBasic
 
-- (void)writeAttributeDataModelRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeVendorNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeVendorIDWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeProductNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeProductIDWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeHardwareVersionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeHardwareVersionStringWithValue:(NSString * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSoftwareVersionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSoftwareVersionStringWithValue:(NSString * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeManufacturingDateWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePartNumberWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeProductURLWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeProductLabelWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSerialNumberWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeReachableWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeUniqueIDWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCapabilityMinimaWithValue:(CHIPBasicClusterCapabilityMinimaStruct * _Nonnull)value
-                              completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePolarityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeStatusFlagsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeApplicationTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -181,14 +143,15 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Binary Input (Basic)
+ * Cluster Descriptor
  *
  */
-@interface CHIPTestBinaryInputBasic : CHIPBinaryInputBasic
+@interface CHIPTestDescriptor : CHIPDescriptor
 
-- (void)writeAttributePolarityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeStatusFlagsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeApplicationTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDeviceListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeServerListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeClientListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePartsListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -212,12 +175,17 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Boolean State
+ * Cluster Access Control
  *
  */
-@interface CHIPTestBooleanState : CHIPBooleanState
+@interface CHIPTestAccessControl : CHIPAccessControl
 
-- (void)writeAttributeStateValueWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSubjectsPerAccessControlEntryWithValue:(NSNumber * _Nonnull)value
+                                           completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTargetsPerAccessControlEntryWithValue:(NSNumber * _Nonnull)value
+                                          completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAccessControlEntriesPerFabricWithValue:(NSNumber * _Nonnull)value
+                                           completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -244,14 +212,16 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Bridged Device Basic
+ * Cluster Basic
  *
  */
-@interface CHIPTestBridgedDeviceBasic : CHIPBridgedDeviceBasic
+@interface CHIPTestBasic : CHIPBasic
 
+- (void)writeAttributeDataModelRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeVendorNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeVendorIDWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeProductNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeProductIDWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeHardwareVersionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeHardwareVersionStringWithValue:(NSString * _Nonnull)value
                                    completionHandler:(StatusCompletion)completionHandler;
@@ -265,6 +235,8 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)writeAttributeSerialNumberWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeReachableWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeUniqueIDWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCapabilityMinimaWithValue:(CHIPBasicClusterCapabilityMinimaStruct * _Nonnull)value
+                              completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -274,16 +246,11 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Channel
+ * Cluster OTA Software Update Provider
  *
  */
-@interface CHIPTestChannel : CHIPChannel
+@interface CHIPTestOtaSoftwareUpdateProvider : CHIPOtaSoftwareUpdateProvider
 
-- (void)writeAttributeChannelListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeLineupWithValue:(CHIPChannelClusterLineupInfo * _Nullable)value
-                    completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCurrentChannelWithValue:(CHIPChannelClusterChannelInfo * _Nullable)value
-                            completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -293,55 +260,15 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Color Control
+ * Cluster OTA Software Update Requestor
  *
  */
-@interface CHIPTestColorControl : CHIPColorControl
+@interface CHIPTestOtaSoftwareUpdateRequestor : CHIPOtaSoftwareUpdateRequestor
 
-- (void)writeAttributeCurrentHueWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCurrentSaturationWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRemainingTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCurrentXWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCurrentYWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDriftCompensationWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCompensationTextWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeColorTemperatureWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeColorModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNumberOfPrimariesWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePrimary1XWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePrimary1YWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePrimary1IntensityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePrimary2XWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePrimary2YWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePrimary2IntensityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePrimary3XWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePrimary3YWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePrimary3IntensityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePrimary4XWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePrimary4YWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePrimary4IntensityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePrimary5XWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePrimary5YWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePrimary5IntensityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePrimary6XWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePrimary6YWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePrimary6IntensityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeEnhancedCurrentHueWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeEnhancedColorModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeColorLoopActiveWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeColorLoopDirectionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeColorLoopTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeColorLoopStartEnhancedHueWithValue:(NSNumber * _Nonnull)value
-                                       completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeColorLoopStoredEnhancedHueWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeColorCapabilitiesWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeColorTempPhysicalMinMiredsWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeColorTempPhysicalMaxMiredsWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCoupleColorTempToLevelMinMiredsWithValue:(NSNumber * _Nonnull)value
-                                             completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeUpdatePossibleWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeUpdateStateWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeUpdateStateProgressWithValue:(NSNumber * _Nullable)value
+                                 completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -351,12 +278,12 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Content Launcher
+ * Cluster Localization Configuration
  *
  */
-@interface CHIPTestContentLauncher : CHIPContentLauncher
+@interface CHIPTestLocalizationConfiguration : CHIPLocalizationConfiguration
 
-- (void)writeAttributeAcceptHeaderWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSupportedLocalesWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -366,15 +293,13 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Descriptor
+ * Cluster Time Format Localization
  *
  */
-@interface CHIPTestDescriptor : CHIPDescriptor
+@interface CHIPTestTimeFormatLocalization : CHIPTimeFormatLocalization
 
-- (void)writeAttributeDeviceListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeServerListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeClientListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePartsListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSupportedCalendarTypesWithValue:(NSArray * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -384,10 +309,10 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Diagnostic Logs
+ * Cluster Unit Localization
  *
  */
-@interface CHIPTestDiagnosticLogs : CHIPDiagnosticLogs
+@interface CHIPTestUnitLocalization : CHIPUnitLocalization
 
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -398,39 +323,12 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Door Lock
+ * Cluster Power Source Configuration
  *
  */
-@interface CHIPTestDoorLock : CHIPDoorLock
+@interface CHIPTestPowerSourceConfiguration : CHIPPowerSourceConfiguration
 
-- (void)writeAttributeLockStateWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeLockTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeActuatorEnabledWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDoorStateWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNumberOfTotalUsersSupportedWithValue:(NSNumber * _Nonnull)value
-                                         completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNumberOfPINUsersSupportedWithValue:(NSNumber * _Nonnull)value
-                                       completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNumberOfRFIDUsersSupportedWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNumberOfWeekDaySchedulesSupportedPerUserWithValue:(NSNumber * _Nonnull)value
-                                                      completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNumberOfYearDaySchedulesSupportedPerUserWithValue:(NSNumber * _Nonnull)value
-                                                      completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNumberOfHolidaySchedulesSupportedWithValue:(NSNumber * _Nonnull)value
-                                               completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMaxPINCodeLengthWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMinPINCodeLengthWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMaxRFIDCodeLengthWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMinRFIDCodeLengthWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCredentialRulesSupportWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNumberOfCredentialsSupportedPerUserWithValue:(NSNumber * _Nonnull)value
-                                                 completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSupportedOperatingModesWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDefaultConfigurationRegisterWithValue:(NSNumber * _Nonnull)value
-                                          completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSourcesWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -440,176 +338,58 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Electrical Measurement
+ * Cluster Power Source
  *
  */
-@interface CHIPTestElectricalMeasurement : CHIPElectricalMeasurement
+@interface CHIPTestPowerSource : CHIPPowerSource
 
-- (void)writeAttributeMeasurementTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDcVoltageWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDcVoltageMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDcVoltageMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDcCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDcCurrentMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDcCurrentMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDcPowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDcPowerMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDcPowerMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDcVoltageMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDcVoltageDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDcCurrentMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDcCurrentDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDcPowerMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDcPowerDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAcFrequencyWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAcFrequencyMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAcFrequencyMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNeutralCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTotalActivePowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTotalReactivePowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTotalApparentPowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMeasured1stHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMeasured3rdHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMeasured5thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMeasured7thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMeasured9thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMeasured11thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
-                                         completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMeasuredPhase1stHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
-                                             completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMeasuredPhase3rdHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
-                                             completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMeasuredPhase5thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
-                                             completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMeasuredPhase7thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
-                                             completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMeasuredPhase9thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
-                                             completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMeasuredPhase11thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
-                                              completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAcFrequencyMultiplierWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAcFrequencyDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePowerMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePowerDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeHarmonicCurrentMultiplierWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOrderWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDescriptionWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeWiredAssessedInputVoltageWithValue:(NSNumber * _Nonnull)value
                                        completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePhaseHarmonicCurrentMultiplierWithValue:(NSNumber * _Nonnull)value
-                                            completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInstantaneousVoltageWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeWiredAssessedInputFrequencyWithValue:(NSNumber * _Nonnull)value
+                                         completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeWiredCurrentTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeWiredAssessedCurrentWithValue:(NSNumber * _Nonnull)value
                                   completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInstantaneousLineCurrentWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInstantaneousActiveCurrentWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInstantaneousReactiveCurrentWithValue:(NSNumber * _Nonnull)value
-                                          completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInstantaneousPowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsVoltageWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsVoltageMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsVoltageMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsCurrentMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsCurrentMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeActivePowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeActivePowerMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeActivePowerMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeReactivePowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeApparentPowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePowerFactorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAcVoltageMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAcVoltageDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAcCurrentMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAcCurrentDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAcPowerMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAcPowerDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeVoltageOverloadWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCurrentOverloadWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAcVoltageOverloadWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAcCurrentOverloadWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAcActivePowerOverloadWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAcReactivePowerOverloadWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeWiredNominalVoltageWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeWiredMaximumCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeWiredPresentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeActiveWiredFaultsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBatteryVoltageWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBatteryPercentRemainingWithValue:(NSNumber * _Nonnull)value
                                      completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAverageRmsOverVoltageWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeBatteryTimeRemainingWithValue:(NSNumber * _Nonnull)value
+                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBatteryChargeLevelWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBatteryReplacementNeededWithValue:(NSNumber * _Nonnull)value
+                                      completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBatteryReplaceabilityWithValue:(NSNumber * _Nonnull)value
                                    completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAverageRmsUnderVoltageWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeBatteryPresentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeActiveBatteryFaultsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBatteryReplacementDescriptionWithValue:(NSString * _Nonnull)value
+                                           completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBatteryCommonDesignationWithValue:(NSNumber * _Nonnull)value
+                                      completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBatteryANSIDesignationWithValue:(NSString * _Nonnull)value
                                     completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsExtremeOverVoltageWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeBatteryIECDesignationWithValue:(NSString * _Nonnull)value
                                    completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsExtremeUnderVoltageWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeBatteryApprovedChemistryWithValue:(NSNumber * _Nonnull)value
+                                      completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBatteryCapacityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBatteryQuantityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBatteryChargeStateWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBatteryTimeToFullChargeWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBatteryFunctionalWhileChargingWithValue:(NSNumber * _Nonnull)value
+                                            completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBatteryChargingCurrentWithValue:(NSNumber * _Nonnull)value
                                     completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsVoltageSagWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsVoltageSwellWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeLineCurrentPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeActiveCurrentPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeReactiveCurrentPhaseBWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsVoltagePhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsVoltageMinPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsVoltageMaxPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsCurrentPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsCurrentMinPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsCurrentMaxPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeActivePowerPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeActivePowerMinPhaseBWithValue:(NSNumber * _Nonnull)value
-                                  completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeActivePowerMaxPhaseBWithValue:(NSNumber * _Nonnull)value
-                                  completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeReactivePowerPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeApparentPowerPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePowerFactorPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAverageRmsVoltageMeasurementPeriodPhaseBWithValue:(NSNumber * _Nonnull)value
-                                                      completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAverageRmsOverVoltageCounterPhaseBWithValue:(NSNumber * _Nonnull)value
-                                                completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAverageRmsUnderVoltageCounterPhaseBWithValue:(NSNumber * _Nonnull)value
-                                                 completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsExtremeOverVoltagePeriodPhaseBWithValue:(NSNumber * _Nonnull)value
-                                               completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsExtremeUnderVoltagePeriodPhaseBWithValue:(NSNumber * _Nonnull)value
-                                                completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsVoltageSagPeriodPhaseBWithValue:(NSNumber * _Nonnull)value
-                                       completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsVoltageSwellPeriodPhaseBWithValue:(NSNumber * _Nonnull)value
-                                         completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeLineCurrentPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeActiveCurrentPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeReactiveCurrentPhaseCWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsVoltagePhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsVoltageMinPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsVoltageMaxPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsCurrentPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsCurrentMinPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsCurrentMaxPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeActivePowerPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeActivePowerMinPhaseCWithValue:(NSNumber * _Nonnull)value
-                                  completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeActivePowerMaxPhaseCWithValue:(NSNumber * _Nonnull)value
-                                  completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeReactivePowerPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeApparentPowerPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePowerFactorPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAverageRmsVoltageMeasurementPeriodPhaseCWithValue:(NSNumber * _Nonnull)value
-                                                      completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAverageRmsOverVoltageCounterPhaseCWithValue:(NSNumber * _Nonnull)value
-                                                completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAverageRmsUnderVoltageCounterPhaseCWithValue:(NSNumber * _Nonnull)value
-                                                 completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsExtremeOverVoltagePeriodPhaseCWithValue:(NSNumber * _Nonnull)value
-                                               completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsExtremeUnderVoltagePeriodPhaseCWithValue:(NSNumber * _Nonnull)value
-                                                completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsVoltageSagPeriodPhaseCWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeActiveBatteryChargeFaultsWithValue:(NSArray * _Nonnull)value
                                        completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRmsVoltageSwellPeriodPhaseCWithValue:(NSNumber * _Nonnull)value
-                                         completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -619,20 +399,17 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Ethernet Network Diagnostics
+ * Cluster General Commissioning
  *
  */
-@interface CHIPTestEthernetNetworkDiagnostics : CHIPEthernetNetworkDiagnostics
+@interface CHIPTestGeneralCommissioning : CHIPGeneralCommissioning
 
-- (void)writeAttributePHYRateWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeFullDuplexWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePacketRxCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePacketTxCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTxErrCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCollisionCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOverrunCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCarrierDetectWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTimeSinceResetWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBasicCommissioningInfoWithValue:(CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRegulatoryConfigWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeLocationCapabilityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSupportsConcurrentConnectionWithValue:(NSNumber * _Nonnull)value
+                                          completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -642,16 +419,21 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Fan Control
+ * Cluster Network Commissioning
  *
  */
-@interface CHIPTestFanControl : CHIPFanControl
+@interface CHIPTestNetworkCommissioning : CHIPNetworkCommissioning
 
-- (void)writeAttributePercentCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSpeedMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSpeedCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRockSupportWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeWindSupportWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMaxNetworksWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNetworksWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeScanMaxTimeSecondsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeConnectMaxTimeSecondsWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeLastNetworkingStatusWithValue:(NSNumber * _Nullable)value
+                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeLastNetworkIDWithValue:(NSData * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeLastConnectErrorValueWithValue:(NSNumber * _Nullable)value
+                                   completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -661,12 +443,11 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Fixed Label
+ * Cluster Diagnostic Logs
  *
  */
-@interface CHIPTestFixedLabel : CHIPFixedLabel
+@interface CHIPTestDiagnosticLogs : CHIPDiagnosticLogs
 
-- (void)writeAttributeLabelListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -676,15 +457,22 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Flow Measurement
+ * Cluster General Diagnostics
  *
  */
-@interface CHIPTestFlowMeasurement : CHIPFlowMeasurement
+@interface CHIPTestGeneralDiagnostics : CHIPGeneralDiagnostics
 
-- (void)writeAttributeMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMinMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMaxMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeToleranceWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNetworkInterfacesWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRebootCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeUpTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTotalOperationalHoursWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBootReasonsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeActiveHardwareFaultsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeActiveRadioFaultsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeActiveNetworkFaultsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTestEventTriggersEnabledWithValue:(NSNumber * _Nonnull)value
+                                      completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -694,17 +482,16 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster General Commissioning
+ * Cluster Software Diagnostics
  *
  */
-@interface CHIPTestGeneralCommissioning : CHIPGeneralCommissioning
-
-- (void)writeAttributeBasicCommissioningInfoWithValue:(CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRegulatoryConfigWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeLocationCapabilityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSupportsConcurrentConnectionWithValue:(NSNumber * _Nonnull)value
-                                          completionHandler:(StatusCompletion)completionHandler;
+@interface CHIPTestSoftwareDiagnostics : CHIPSoftwareDiagnostics
+
+- (void)writeAttributeThreadMetricsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCurrentHeapFreeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCurrentHeapUsedWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCurrentHeapHighWatermarkWithValue:(NSNumber * _Nonnull)value
+                                      completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -714,22 +501,90 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster General Diagnostics
+ * Cluster Thread Network Diagnostics
  *
  */
-@interface CHIPTestGeneralDiagnostics : CHIPGeneralDiagnostics
+@interface CHIPTestThreadNetworkDiagnostics : CHIPThreadNetworkDiagnostics
 
-- (void)writeAttributeNetworkInterfacesWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRebootCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeUpTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTotalOperationalHoursWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeChannelWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRoutingRoleWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNetworkNameWithValue:(NSString * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePanIdWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeExtendedPanIdWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMeshLocalPrefixWithValue:(NSData * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOverrunCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNeighborTableListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRouteTableListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePartitionIdWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeWeightingWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDataVersionWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeStableDataVersionWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeLeaderRouterIdWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDetachedRoleCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeChildRoleCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRouterRoleCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeLeaderRoleCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAttachAttemptCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePartitionIdChangeCountWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBetterPartitionAttachAttemptCountWithValue:(NSNumber * _Nonnull)value
+                                               completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeParentChangeCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTxTotalCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTxUnicastCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTxBroadcastCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTxAckRequestedCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTxAckedCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTxNoAckRequestedCountWithValue:(NSNumber * _Nonnull)value
                                    completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBootReasonsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeActiveHardwareFaultsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeActiveRadioFaultsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeActiveNetworkFaultsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTestEventTriggersEnabledWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeTxDataCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTxDataPollCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTxBeaconCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTxBeaconRequestCountWithValue:(NSNumber * _Nonnull)value
+                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTxOtherCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTxRetryCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTxDirectMaxRetryExpiryCountWithValue:(NSNumber * _Nonnull)value
+                                         completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTxIndirectMaxRetryExpiryCountWithValue:(NSNumber * _Nonnull)value
+                                           completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTxErrCcaCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTxErrAbortCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTxErrBusyChannelCountWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRxTotalCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRxUnicastCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRxBroadcastCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRxDataCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRxDataPollCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRxBeaconCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRxBeaconRequestCountWithValue:(NSNumber * _Nonnull)value
+                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRxOtherCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRxAddressFilteredCountWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRxDestAddrFilteredCountWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRxDuplicatedCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRxErrNoFrameCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRxErrUnknownNeighborCountWithValue:(NSNumber * _Nonnull)value
+                                       completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRxErrInvalidSrcAddrCountWithValue:(NSNumber * _Nonnull)value
                                       completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRxErrSecCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRxErrFcsCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRxErrOtherCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeActiveTimestampWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePendingTimestampWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDelayWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSecurityPolicyWithValue:(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable)value
+                            completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeChannelMaskWithValue:(NSData * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOperationalDatasetComponentsWithValue:
+            (CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable)value
+                                          completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeActiveNetworkFaultsListWithValue:(NSArray * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -739,15 +594,28 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Group Key Management
+ * Cluster WiFi Network Diagnostics
  *
  */
-@interface CHIPTestGroupKeyManagement : CHIPGroupKeyManagement
+@interface CHIPTestWiFiNetworkDiagnostics : CHIPWiFiNetworkDiagnostics
 
-- (void)writeAttributeGroupTableWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMaxGroupsPerFabricWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMaxGroupKeysPerFabricWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBssidWithValue:(NSData * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSecurityTypeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeWiFiVersionWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeChannelNumberWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRssiWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBeaconLostCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBeaconRxCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePacketMulticastRxCountWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePacketMulticastTxCountWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePacketUnicastRxCountWithValue:(NSNumber * _Nonnull)value
+                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePacketUnicastTxCountWithValue:(NSNumber * _Nonnull)value
+                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCurrentMaxRateWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOverrunCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -757,12 +625,20 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Groups
+ * Cluster Ethernet Network Diagnostics
  *
  */
-@interface CHIPTestGroups : CHIPGroups
+@interface CHIPTestEthernetNetworkDiagnostics : CHIPEthernetNetworkDiagnostics
 
-- (void)writeAttributeNameSupportWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePHYRateWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeFullDuplexWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePacketRxCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePacketTxCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTxErrCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCollisionCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOverrunCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCarrierDetectWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTimeSinceResetWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -772,12 +648,27 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Identify
+ * Cluster Bridged Device Basic
  *
  */
-@interface CHIPTestIdentify : CHIPIdentify
+@interface CHIPTestBridgedDeviceBasic : CHIPBridgedDeviceBasic
 
-- (void)writeAttributeIdentifyTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeVendorNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeVendorIDWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeProductNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeHardwareVersionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeHardwareVersionStringWithValue:(NSString * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSoftwareVersionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSoftwareVersionStringWithValue:(NSString * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeManufacturingDateWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePartNumberWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeProductURLWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeProductLabelWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSerialNumberWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeReachableWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeUniqueIDWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -787,16 +678,14 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Illuminance Measurement
+ * Cluster Switch
  *
  */
-@interface CHIPTestIlluminanceMeasurement : CHIPIlluminanceMeasurement
+@interface CHIPTestSwitch : CHIPSwitch
 
-- (void)writeAttributeMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMinMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMaxMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeToleranceWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeLightSensorTypeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNumberOfPositionsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCurrentPositionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMultiPressMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -806,11 +695,14 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Keypad Input
+ * Cluster AdministratorCommissioning
  *
  */
-@interface CHIPTestKeypadInput : CHIPKeypadInput
+@interface CHIPTestAdministratorCommissioning : CHIPAdministratorCommissioning
 
+- (void)writeAttributeWindowStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAdminFabricIndexWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAdminVendorIdWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -820,18 +712,18 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Level Control
+ * Cluster Operational Credentials
  *
  */
-@interface CHIPTestLevelControl : CHIPLevelControl
+@interface CHIPTestOperationalCredentials : CHIPOperationalCredentials
 
-- (void)writeAttributeCurrentLevelWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRemainingTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMinLevelWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMaxLevelWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCurrentFrequencyWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMinFrequencyWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMaxFrequencyWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNOCsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeFabricsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSupportedFabricsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCommissionedFabricsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTrustedRootCertificatesWithValue:(NSArray * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCurrentFabricIndexWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -841,12 +733,15 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Localization Configuration
+ * Cluster Group Key Management
  *
  */
-@interface CHIPTestLocalizationConfiguration : CHIPLocalizationConfiguration
+@interface CHIPTestGroupKeyManagement : CHIPGroupKeyManagement
 
-- (void)writeAttributeSupportedLocalesWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeGroupTableWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMaxGroupsPerFabricWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMaxGroupKeysPerFabricWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -856,11 +751,12 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Low Power
+ * Cluster Fixed Label
  *
  */
-@interface CHIPTestLowPower : CHIPLowPower
+@interface CHIPTestFixedLabel : CHIPFixedLabel
 
+- (void)writeAttributeLabelListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -870,13 +766,11 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Media Input
+ * Cluster User Label
  *
  */
-@interface CHIPTestMediaInput : CHIPMediaInput
+@interface CHIPTestUserLabel : CHIPUserLabel
 
-- (void)writeAttributeInputListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCurrentInputWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -886,19 +780,12 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Media Playback
+ * Cluster Boolean State
  *
  */
-@interface CHIPTestMediaPlayback : CHIPMediaPlayback
+@interface CHIPTestBooleanState : CHIPBooleanState
 
-- (void)writeAttributeCurrentStateWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeStartTimeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDurationWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSampledPositionWithValue:(CHIPMediaPlaybackClusterPlaybackPosition * _Nullable)value
-                             completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePlaybackSpeedWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSeekRangeEndWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSeekRangeStartWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeStateValueWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -926,21 +813,90 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Network Commissioning
+ * Cluster Door Lock
+ *
+ */
+@interface CHIPTestDoorLock : CHIPDoorLock
+
+- (void)writeAttributeLockStateWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeLockTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeActuatorEnabledWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDoorStateWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNumberOfTotalUsersSupportedWithValue:(NSNumber * _Nonnull)value
+                                         completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNumberOfPINUsersSupportedWithValue:(NSNumber * _Nonnull)value
+                                       completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNumberOfRFIDUsersSupportedWithValue:(NSNumber * _Nonnull)value
+                                        completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNumberOfWeekDaySchedulesSupportedPerUserWithValue:(NSNumber * _Nonnull)value
+                                                      completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNumberOfYearDaySchedulesSupportedPerUserWithValue:(NSNumber * _Nonnull)value
+                                                      completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNumberOfHolidaySchedulesSupportedWithValue:(NSNumber * _Nonnull)value
+                                               completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMaxPINCodeLengthWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMinPINCodeLengthWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMaxRFIDCodeLengthWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMinRFIDCodeLengthWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCredentialRulesSupportWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNumberOfCredentialsSupportedPerUserWithValue:(NSNumber * _Nonnull)value
+                                                 completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSupportedOperatingModesWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDefaultConfigurationRegisterWithValue:(NSNumber * _Nonnull)value
+                                          completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+
+@end
+
+/**
+ * Cluster Window Covering
  *
  */
-@interface CHIPTestNetworkCommissioning : CHIPNetworkCommissioning
+@interface CHIPTestWindowCovering : CHIPWindowCovering
 
-- (void)writeAttributeMaxNetworksWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNetworksWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeScanMaxTimeSecondsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeConnectMaxTimeSecondsWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeLastNetworkingStatusWithValue:(NSNumber * _Nullable)value
-                                  completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeLastNetworkIDWithValue:(NSData * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeLastConnectErrorValueWithValue:(NSNumber * _Nullable)value
-                                   completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePhysicalClosedLimitLiftWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePhysicalClosedLimitTiltWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCurrentPositionLiftWithValue:(NSNumber * _Nullable)value
+                                 completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCurrentPositionTiltWithValue:(NSNumber * _Nullable)value
+                                 completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNumberOfActuationsLiftWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNumberOfActuationsTiltWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeConfigStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCurrentPositionLiftPercentageWithValue:(NSNumber * _Nullable)value
+                                           completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCurrentPositionTiltPercentageWithValue:(NSNumber * _Nullable)value
+                                           completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOperationalStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTargetPositionLiftPercent100thsWithValue:(NSNumber * _Nullable)value
+                                             completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTargetPositionTiltPercent100thsWithValue:(NSNumber * _Nullable)value
+                                             completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeEndProductTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCurrentPositionLiftPercent100thsWithValue:(NSNumber * _Nullable)value
+                                              completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCurrentPositionTiltPercent100thsWithValue:(NSNumber * _Nullable)value
+                                              completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInstalledOpenLimitLiftWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInstalledClosedLimitLiftWithValue:(NSNumber * _Nonnull)value
+                                      completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInstalledOpenLimitTiltWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInstalledClosedLimitTiltWithValue:(NSNumber * _Nonnull)value
+                                      completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSafetyStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -950,11 +906,15 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster OTA Software Update Provider
+ * Cluster Barrier Control
  *
  */
-@interface CHIPTestOtaSoftwareUpdateProvider : CHIPOtaSoftwareUpdateProvider
+@interface CHIPTestBarrierControl : CHIPBarrierControl
 
+- (void)writeAttributeBarrierMovingStateWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBarrierSafetyStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBarrierCapabilitiesWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeBarrierPositionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -964,15 +924,32 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster OTA Software Update Requestor
+ * Cluster Pump Configuration and Control
  *
  */
-@interface CHIPTestOtaSoftwareUpdateRequestor : CHIPOtaSoftwareUpdateRequestor
+@interface CHIPTestPumpConfigurationAndControl : CHIPPumpConfigurationAndControl
 
-- (void)writeAttributeUpdatePossibleWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeUpdateStateWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeUpdateStateProgressWithValue:(NSNumber * _Nullable)value
-                                 completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMaxPressureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMaxSpeedWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMaxFlowWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMinConstPressureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMaxConstPressureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMinCompPressureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMaxCompPressureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMinConstSpeedWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMaxConstSpeedWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMinConstFlowWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMaxConstFlowWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMinConstTempWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMaxConstTempWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePumpStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeEffectiveOperationModeWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeEffectiveControlModeWithValue:(NSNumber * _Nonnull)value
+                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCapacityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSpeedWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePowerWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -982,15 +959,46 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Occupancy Sensing
+ * Cluster Thermostat
  *
  */
-@interface CHIPTestOccupancySensing : CHIPOccupancySensing
+@interface CHIPTestThermostat : CHIPThermostat
 
+- (void)writeAttributeLocalTemperatureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOutdoorTemperatureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeOccupancyWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOccupancySensorTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOccupancySensorTypeBitmapWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeAbsMinHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAbsMaxHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAbsMinCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAbsMaxCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePICoolingDemandWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePIHeatingDemandWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeThermostatRunningModeWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeStartOfWeekWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNumberOfWeeklyTransitionsWithValue:(NSNumber * _Nonnull)value
                                        completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNumberOfDailyTransitionsWithValue:(NSNumber * _Nonnull)value
+                                      completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeThermostatRunningStateWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSetpointChangeSourceWithValue:(NSNumber * _Nonnull)value
+                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSetpointChangeAmountWithValue:(NSNumber * _Nullable)value
+                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSetpointChangeSourceTimestampWithValue:(NSNumber * _Nonnull)value
+                                           completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOccupiedSetbackMinWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOccupiedSetbackMaxWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeUnoccupiedSetbackMinWithValue:(NSNumber * _Nullable)value
+                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeUnoccupiedSetbackMaxWithValue:(NSNumber * _Nullable)value
+                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeACCoilTemperatureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -1000,28 +1008,16 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster On/Off
- *
- */
-@interface CHIPTestOnOff : CHIPOnOff
-
-- (void)writeAttributeOnOffWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeGlobalSceneControlWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-
-@end
-
-/**
- * Cluster On/off Switch Configuration
+ * Cluster Fan Control
  *
  */
-@interface CHIPTestOnOffSwitchConfiguration : CHIPOnOffSwitchConfiguration
+@interface CHIPTestFanControl : CHIPFanControl
 
-- (void)writeAttributeSwitchTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePercentCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSpeedMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSpeedCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRockSupportWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeWindSupportWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -1031,18 +1027,11 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Operational Credentials
+ * Cluster Thermostat User Interface Configuration
  *
  */
-@interface CHIPTestOperationalCredentials : CHIPOperationalCredentials
+@interface CHIPTestThermostatUserInterfaceConfiguration : CHIPThermostatUserInterfaceConfiguration
 
-- (void)writeAttributeNOCsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeFabricsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSupportedFabricsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCommissionedFabricsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTrustedRootCertificatesWithValue:(NSArray * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCurrentFabricIndexWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -1052,58 +1041,55 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Power Source
+ * Cluster Color Control
  *
  */
-@interface CHIPTestPowerSource : CHIPPowerSource
+@interface CHIPTestColorControl : CHIPColorControl
 
-- (void)writeAttributeStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOrderWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDescriptionWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeWiredAssessedInputVoltageWithValue:(NSNumber * _Nonnull)value
-                                       completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeWiredAssessedInputFrequencyWithValue:(NSNumber * _Nonnull)value
-                                         completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeWiredCurrentTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeWiredAssessedCurrentWithValue:(NSNumber * _Nonnull)value
-                                  completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeWiredNominalVoltageWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeWiredMaximumCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeWiredPresentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeActiveWiredFaultsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBatteryVoltageWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBatteryPercentRemainingWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBatteryTimeRemainingWithValue:(NSNumber * _Nonnull)value
-                                  completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBatteryChargeLevelWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBatteryReplacementNeededWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBatteryReplaceabilityWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBatteryPresentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeActiveBatteryFaultsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBatteryReplacementDescriptionWithValue:(NSString * _Nonnull)value
-                                           completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBatteryCommonDesignationWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBatteryANSIDesignationWithValue:(NSString * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBatteryIECDesignationWithValue:(NSString * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBatteryApprovedChemistryWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBatteryCapacityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBatteryQuantityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBatteryChargeStateWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBatteryTimeToFullChargeWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBatteryFunctionalWhileChargingWithValue:(NSNumber * _Nonnull)value
-                                            completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBatteryChargingCurrentWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeActiveBatteryChargeFaultsWithValue:(NSArray * _Nonnull)value
+- (void)writeAttributeCurrentHueWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCurrentSaturationWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRemainingTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCurrentXWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCurrentYWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDriftCompensationWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCompensationTextWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeColorTemperatureWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeColorModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNumberOfPrimariesWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePrimary1XWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePrimary1YWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePrimary1IntensityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePrimary2XWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePrimary2YWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePrimary2IntensityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePrimary3XWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePrimary3YWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePrimary3IntensityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePrimary4XWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePrimary4YWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePrimary4IntensityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePrimary5XWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePrimary5YWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePrimary5IntensityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePrimary6XWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePrimary6YWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePrimary6IntensityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeEnhancedCurrentHueWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeEnhancedColorModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeColorLoopActiveWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeColorLoopDirectionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeColorLoopTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeColorLoopStartEnhancedHueWithValue:(NSNumber * _Nonnull)value
                                        completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeColorLoopStoredEnhancedHueWithValue:(NSNumber * _Nonnull)value
+                                        completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeColorCapabilitiesWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeColorTempPhysicalMinMiredsWithValue:(NSNumber * _Nonnull)value
+                                        completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeColorTempPhysicalMaxMiredsWithValue:(NSNumber * _Nonnull)value
+                                        completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCoupleColorTempToLevelMinMiredsWithValue:(NSNumber * _Nonnull)value
+                                             completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -1113,12 +1099,34 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Power Source Configuration
+ * Cluster Illuminance Measurement
  *
  */
-@interface CHIPTestPowerSourceConfiguration : CHIPPowerSourceConfiguration
+@interface CHIPTestIlluminanceMeasurement : CHIPIlluminanceMeasurement
 
-- (void)writeAttributeSourcesWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMinMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMaxMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeToleranceWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeLightSensorTypeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+
+@end
+
+/**
+ * Cluster Temperature Measurement
+ *
+ */
+@interface CHIPTestTemperatureMeasurement : CHIPTemperatureMeasurement
+
+- (void)writeAttributeMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMinMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMaxMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeToleranceWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -1151,32 +1159,15 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Pump Configuration and Control
+ * Cluster Flow Measurement
  *
  */
-@interface CHIPTestPumpConfigurationAndControl : CHIPPumpConfigurationAndControl
+@interface CHIPTestFlowMeasurement : CHIPFlowMeasurement
 
-- (void)writeAttributeMaxPressureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMaxSpeedWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMaxFlowWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMinConstPressureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMaxConstPressureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMinCompPressureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMaxCompPressureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMinConstSpeedWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMaxConstSpeedWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMinConstFlowWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMaxConstFlowWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMinConstTempWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMaxConstTempWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePumpStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeEffectiveOperationModeWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeEffectiveControlModeWithValue:(NSNumber * _Nonnull)value
-                                  completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCapacityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSpeedWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePowerWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMinMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMaxMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeToleranceWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -1204,17 +1195,15 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Scenes
+ * Cluster Occupancy Sensing
  *
  */
-@interface CHIPTestScenes : CHIPScenes
+@interface CHIPTestOccupancySensing : CHIPOccupancySensing
 
-- (void)writeAttributeSceneCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCurrentSceneWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCurrentGroupWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSceneValidWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNameSupportWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeLastConfiguredByWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOccupancyWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOccupancySensorTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOccupancySensorTypeBitmapWithValue:(NSNumber * _Nonnull)value
+                                       completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -1224,16 +1213,12 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Software Diagnostics
+ * Cluster Wake on LAN
  *
  */
-@interface CHIPTestSoftwareDiagnostics : CHIPSoftwareDiagnostics
+@interface CHIPTestWakeOnLan : CHIPWakeOnLan
 
-- (void)writeAttributeThreadMetricsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCurrentHeapFreeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCurrentHeapUsedWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCurrentHeapHighWatermarkWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMACAddressWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -1243,14 +1228,16 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Switch
+ * Cluster Channel
  *
  */
-@interface CHIPTestSwitch : CHIPSwitch
+@interface CHIPTestChannel : CHIPChannel
 
-- (void)writeAttributeNumberOfPositionsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCurrentPositionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMultiPressMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeChannelListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeLineupWithValue:(CHIPChannelClusterLineupInfo * _Nullable)value
+                    completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCurrentChannelWithValue:(CHIPChannelClusterChannelInfo * _Nullable)value
+                            completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -1276,15 +1263,19 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Temperature Measurement
+ * Cluster Media Playback
  *
  */
-@interface CHIPTestTemperatureMeasurement : CHIPTemperatureMeasurement
+@interface CHIPTestMediaPlayback : CHIPMediaPlayback
 
-- (void)writeAttributeMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMinMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMaxMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeToleranceWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCurrentStateWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeStartTimeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDurationWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSampledPositionWithValue:(CHIPMediaPlaybackClusterPlaybackPosition * _Nullable)value
+                             completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePlaybackSpeedWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSeekRangeEndWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeSeekRangeStartWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -1294,11 +1285,13 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Test Cluster
+ * Cluster Media Input
  *
  */
-@interface CHIPTestTestCluster : CHIPTestCluster
+@interface CHIPTestMediaInput : CHIPMediaInput
 
+- (void)writeAttributeInputListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCurrentInputWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -1308,46 +1301,11 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Thermostat
+ * Cluster Low Power
  *
  */
-@interface CHIPTestThermostat : CHIPThermostat
+@interface CHIPTestLowPower : CHIPLowPower
 
-- (void)writeAttributeLocalTemperatureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOutdoorTemperatureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOccupancyWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAbsMinHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAbsMaxHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAbsMinCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAbsMaxCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePICoolingDemandWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePIHeatingDemandWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeThermostatRunningModeWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeStartOfWeekWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNumberOfWeeklyTransitionsWithValue:(NSNumber * _Nonnull)value
-                                       completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNumberOfDailyTransitionsWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeThermostatRunningStateWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSetpointChangeSourceWithValue:(NSNumber * _Nonnull)value
-                                  completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSetpointChangeAmountWithValue:(NSNumber * _Nullable)value
-                                  completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSetpointChangeSourceTimestampWithValue:(NSNumber * _Nonnull)value
-                                           completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOccupiedSetbackMinWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOccupiedSetbackMaxWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeUnoccupiedSetbackMinWithValue:(NSNumber * _Nullable)value
-                                  completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeUnoccupiedSetbackMaxWithValue:(NSNumber * _Nullable)value
-                                  completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeACCoilTemperatureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -1357,10 +1315,10 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Thermostat User Interface Configuration
+ * Cluster Keypad Input
  *
  */
-@interface CHIPTestThermostatUserInterfaceConfiguration : CHIPThermostatUserInterfaceConfiguration
+@interface CHIPTestKeypadInput : CHIPKeypadInput
 
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -1371,90 +1329,12 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Thread Network Diagnostics
- *
- */
-@interface CHIPTestThreadNetworkDiagnostics : CHIPThreadNetworkDiagnostics
-
-- (void)writeAttributeChannelWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRoutingRoleWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNetworkNameWithValue:(NSString * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePanIdWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeExtendedPanIdWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeMeshLocalPrefixWithValue:(NSData * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOverrunCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNeighborTableListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRouteTableListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePartitionIdWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeWeightingWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDataVersionWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeStableDataVersionWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeLeaderRouterIdWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDetachedRoleCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeChildRoleCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRouterRoleCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeLeaderRoleCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeAttachAttemptCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePartitionIdChangeCountWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBetterPartitionAttachAttemptCountWithValue:(NSNumber * _Nonnull)value
-                                               completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeParentChangeCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTxTotalCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTxUnicastCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTxBroadcastCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTxAckRequestedCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTxAckedCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTxNoAckRequestedCountWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTxDataCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTxDataPollCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTxBeaconCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTxBeaconRequestCountWithValue:(NSNumber * _Nonnull)value
-                                  completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTxOtherCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTxRetryCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTxDirectMaxRetryExpiryCountWithValue:(NSNumber * _Nonnull)value
-                                         completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTxIndirectMaxRetryExpiryCountWithValue:(NSNumber * _Nonnull)value
-                                           completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTxErrCcaCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTxErrAbortCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTxErrBusyChannelCountWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRxTotalCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRxUnicastCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRxBroadcastCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRxDataCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRxDataPollCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRxBeaconCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRxBeaconRequestCountWithValue:(NSNumber * _Nonnull)value
-                                  completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRxOtherCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRxAddressFilteredCountWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRxDestAddrFilteredCountWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRxDuplicatedCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRxErrNoFrameCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRxErrUnknownNeighborCountWithValue:(NSNumber * _Nonnull)value
-                                       completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRxErrInvalidSrcAddrCountWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRxErrSecCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRxErrFcsCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRxErrOtherCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeActiveTimestampWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePendingTimestampWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeDelayWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSecurityPolicyWithValue:(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable)value
-                            completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeChannelMaskWithValue:(NSData * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOperationalDatasetComponentsWithValue:
-            (CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable)value
-                                          completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeActiveNetworkFaultsListWithValue:(NSArray * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler;
+ * Cluster Content Launcher
+ *
+ */
+@interface CHIPTestContentLauncher : CHIPContentLauncher
+
+- (void)writeAttributeAcceptHeaderWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -1464,13 +1344,13 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Time Format Localization
+ * Cluster Audio Output
  *
  */
-@interface CHIPTestTimeFormatLocalization : CHIPTimeFormatLocalization
+@interface CHIPTestAudioOutput : CHIPAudioOutput
 
-- (void)writeAttributeSupportedCalendarTypesWithValue:(NSArray * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOutputListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCurrentOutputWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -1480,11 +1360,12 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Unit Localization
+ * Cluster Application Launcher
  *
  */
-@interface CHIPTestUnitLocalization : CHIPUnitLocalization
+@interface CHIPTestApplicationLauncher : CHIPApplicationLauncher
 
+- (void)writeAttributeCatalogListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -1494,11 +1375,20 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster User Label
+ * Cluster Application Basic
  *
  */
-@interface CHIPTestUserLabel : CHIPUserLabel
+@interface CHIPTestApplicationBasic : CHIPApplicationBasic
 
+- (void)writeAttributeVendorNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeVendorIDWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeApplicationNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeProductIDWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeApplicationWithValue:(CHIPApplicationBasicClusterApplicationBasicApplication * _Nonnull)value
+                         completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeApplicationVersionWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAllowedVendorListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -1508,12 +1398,11 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Wake on LAN
+ * Cluster Account Login
  *
  */
-@interface CHIPTestWakeOnLan : CHIPWakeOnLan
+@interface CHIPTestAccountLogin : CHIPAccountLogin
 
-- (void)writeAttributeMACAddressWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -1523,28 +1412,176 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster WiFi Network Diagnostics
+ * Cluster Electrical Measurement
  *
  */
-@interface CHIPTestWiFiNetworkDiagnostics : CHIPWiFiNetworkDiagnostics
+@interface CHIPTestElectricalMeasurement : CHIPElectricalMeasurement
 
-- (void)writeAttributeBssidWithValue:(NSData * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSecurityTypeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeWiFiVersionWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeChannelNumberWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeRssiWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBeaconLostCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeBeaconRxCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePacketMulticastRxCountWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeMeasurementTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDcVoltageWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDcVoltageMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDcVoltageMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDcCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDcCurrentMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDcCurrentMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDcPowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDcPowerMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDcPowerMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDcVoltageMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDcVoltageDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDcCurrentMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDcCurrentDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDcPowerMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeDcPowerDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAcFrequencyWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAcFrequencyMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAcFrequencyMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeNeutralCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTotalActivePowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTotalReactivePowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeTotalApparentPowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMeasured1stHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
+                                        completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMeasured3rdHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
+                                        completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMeasured5thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
+                                        completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMeasured7thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
+                                        completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMeasured9thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
+                                        completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMeasured11thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
+                                         completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMeasuredPhase1stHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
+                                             completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMeasuredPhase3rdHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
+                                             completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMeasuredPhase5thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
+                                             completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMeasuredPhase7thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
+                                             completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMeasuredPhase9thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
+                                             completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeMeasuredPhase11thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
+                                              completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAcFrequencyMultiplierWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAcFrequencyDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePowerMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePowerDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeHarmonicCurrentMultiplierWithValue:(NSNumber * _Nonnull)value
+                                       completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePhaseHarmonicCurrentMultiplierWithValue:(NSNumber * _Nonnull)value
+                                            completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInstantaneousVoltageWithValue:(NSNumber * _Nonnull)value
+                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInstantaneousLineCurrentWithValue:(NSNumber * _Nonnull)value
+                                      completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInstantaneousActiveCurrentWithValue:(NSNumber * _Nonnull)value
+                                        completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInstantaneousReactiveCurrentWithValue:(NSNumber * _Nonnull)value
+                                          completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeInstantaneousPowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsVoltageWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsVoltageMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsVoltageMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsCurrentMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsCurrentMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeActivePowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeActivePowerMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeActivePowerMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeReactivePowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeApparentPowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePowerFactorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAcVoltageMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAcVoltageDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAcCurrentMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAcCurrentDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAcPowerMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAcPowerDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeVoltageOverloadWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeCurrentOverloadWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAcVoltageOverloadWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAcCurrentOverloadWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAcActivePowerOverloadWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAcReactivePowerOverloadWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAverageRmsOverVoltageWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAverageRmsUnderVoltageWithValue:(NSNumber * _Nonnull)value
                                     completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePacketMulticastTxCountWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeRmsExtremeOverVoltageWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsExtremeUnderVoltageWithValue:(NSNumber * _Nonnull)value
                                     completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePacketUnicastRxCountWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeRmsVoltageSagWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsVoltageSwellWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeLineCurrentPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeActiveCurrentPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeReactiveCurrentPhaseBWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsVoltagePhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsVoltageMinPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsVoltageMaxPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsCurrentPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsCurrentMinPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsCurrentMaxPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeActivePowerPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeActivePowerMinPhaseBWithValue:(NSNumber * _Nonnull)value
                                   completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePacketUnicastTxCountWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeActivePowerMaxPhaseBWithValue:(NSNumber * _Nonnull)value
                                   completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCurrentMaxRateWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOverrunCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeReactivePowerPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeApparentPowerPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePowerFactorPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAverageRmsVoltageMeasurementPeriodPhaseBWithValue:(NSNumber * _Nonnull)value
+                                                      completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAverageRmsOverVoltageCounterPhaseBWithValue:(NSNumber * _Nonnull)value
+                                                completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAverageRmsUnderVoltageCounterPhaseBWithValue:(NSNumber * _Nonnull)value
+                                                 completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsExtremeOverVoltagePeriodPhaseBWithValue:(NSNumber * _Nonnull)value
+                                               completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsExtremeUnderVoltagePeriodPhaseBWithValue:(NSNumber * _Nonnull)value
+                                                completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsVoltageSagPeriodPhaseBWithValue:(NSNumber * _Nonnull)value
+                                       completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsVoltageSwellPeriodPhaseBWithValue:(NSNumber * _Nonnull)value
+                                         completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeLineCurrentPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeActiveCurrentPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeReactiveCurrentPhaseCWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsVoltagePhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsVoltageMinPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsVoltageMaxPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsCurrentPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsCurrentMinPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsCurrentMaxPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeActivePowerPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeActivePowerMinPhaseCWithValue:(NSNumber * _Nonnull)value
+                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeActivePowerMaxPhaseCWithValue:(NSNumber * _Nonnull)value
+                                  completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeReactivePowerPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeApparentPowerPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributePowerFactorPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAverageRmsVoltageMeasurementPeriodPhaseCWithValue:(NSNumber * _Nonnull)value
+                                                      completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAverageRmsOverVoltageCounterPhaseCWithValue:(NSNumber * _Nonnull)value
+                                                completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeAverageRmsUnderVoltageCounterPhaseCWithValue:(NSNumber * _Nonnull)value
+                                                 completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsExtremeOverVoltagePeriodPhaseCWithValue:(NSNumber * _Nonnull)value
+                                               completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsExtremeUnderVoltagePeriodPhaseCWithValue:(NSNumber * _Nonnull)value
+                                                completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsVoltageSagPeriodPhaseCWithValue:(NSNumber * _Nonnull)value
+                                       completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeRmsVoltageSwellPeriodPhaseCWithValue:(NSNumber * _Nonnull)value
+                                         completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
@@ -1554,48 +1591,11 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * Cluster Window Covering
+ * Cluster Test Cluster
  *
  */
-@interface CHIPTestWindowCovering : CHIPWindowCovering
+@interface CHIPTestTestCluster : CHIPTestCluster
 
-- (void)writeAttributeTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePhysicalClosedLimitLiftWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributePhysicalClosedLimitTiltWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCurrentPositionLiftWithValue:(NSNumber * _Nullable)value
-                                 completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCurrentPositionTiltWithValue:(NSNumber * _Nullable)value
-                                 completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNumberOfActuationsLiftWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeNumberOfActuationsTiltWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeConfigStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCurrentPositionLiftPercentageWithValue:(NSNumber * _Nullable)value
-                                           completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCurrentPositionTiltPercentageWithValue:(NSNumber * _Nullable)value
-                                           completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeOperationalStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTargetPositionLiftPercent100thsWithValue:(NSNumber * _Nullable)value
-                                             completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeTargetPositionTiltPercent100thsWithValue:(NSNumber * _Nullable)value
-                                             completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeEndProductTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCurrentPositionLiftPercent100thsWithValue:(NSNumber * _Nullable)value
-                                              completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeCurrentPositionTiltPercent100thsWithValue:(NSNumber * _Nullable)value
-                                              completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInstalledOpenLimitLiftWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInstalledClosedLimitLiftWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInstalledOpenLimitTiltWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeInstalledClosedLimitTiltWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeSafetyStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
 - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/CHIPTestClustersObjc.mm b/zzz_generated/darwin-framework-tool/zap-generated/cluster/CHIPTestClustersObjc.mm
index 0ad47c8b713e04..0186b2e90b463c 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/CHIPTestClustersObjc.mm
+++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/CHIPTestClustersObjc.mm
@@ -32,57 +32,18 @@
 using chip::Callback::Cancelable;
 using namespace chip::app::Clusters;
 
-@interface CHIPTestAccessControl ()
-@property (readonly) chip::Controller::AccessControlCluster cppCluster;
+@interface CHIPTestIdentify ()
+@property (readonly) chip::Controller::IdentifyCluster cppCluster;
 @end
 
-@implementation CHIPTestAccessControl
+@implementation CHIPTestIdentify
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeSubjectsPerAccessControlEntryWithValue:(NSNumber * _Nonnull)value
-                                           completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = AccessControl::Attributes::SubjectsPerAccessControlEntry::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeTargetsPerAccessControlEntryWithValue:(NSNumber * _Nonnull)value
-                                          completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = AccessControl::Attributes::TargetsPerAccessControlEntry::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeAccessControlEntriesPerFabricWithValue:(NSNumber * _Nonnull)value
-                                           completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeIdentifyTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -91,9 +52,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AccessControl::Attributes::AccessControlEntriesPerFabric::TypeInfo;
+            using TypeInfo = Identify::Attributes::IdentifyType::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -109,7 +70,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AccessControl::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = Identify::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -148,7 +109,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AccessControl::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = Identify::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -187,7 +148,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AccessControl::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = Identify::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -226,7 +187,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AccessControl::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Identify::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -244,7 +205,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AccessControl::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Identify::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -255,17 +216,35 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestAccountLogin ()
-@property (readonly) chip::Controller::AccountLoginCluster cppCluster;
+@interface CHIPTestGroups ()
+@property (readonly) chip::Controller::GroupsCluster cppCluster;
 @end
 
-@implementation CHIPTestAccountLogin
+@implementation CHIPTestGroups
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
+- (void)writeAttributeNameSupportWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Groups::Attributes::NameSupport::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
@@ -275,7 +254,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AccountLogin::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = Groups::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -314,7 +293,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AccountLogin::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = Groups::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -353,7 +332,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AccountLogin::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = Groups::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -392,7 +371,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AccountLogin::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Groups::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -410,7 +389,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AccountLogin::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Groups::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -421,18 +400,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestAdministratorCommissioning ()
-@property (readonly) chip::Controller::AdministratorCommissioningCluster cppCluster;
+@interface CHIPTestScenes ()
+@property (readonly) chip::Controller::ScenesCluster cppCluster;
 @end
 
-@implementation CHIPTestAdministratorCommissioning
+@implementation CHIPTestScenes
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeWindowStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSceneCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -441,7 +420,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AdministratorCommissioning::Attributes::WindowStatus::TypeInfo;
+            using TypeInfo = Scenes::Attributes::SceneCount::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -450,7 +429,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeAdminFabricIndexWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentSceneWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -459,7 +438,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AdministratorCommissioning::Attributes::AdminFabricIndex::TypeInfo;
+            using TypeInfo = Scenes::Attributes::CurrentScene::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -468,7 +447,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeAdminVendorIdWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentGroupWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -477,7 +456,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AdministratorCommissioning::Attributes::AdminVendorId::TypeInfo;
+            using TypeInfo = Scenes::Attributes::CurrentGroup::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -486,6 +465,65 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
+- (void)writeAttributeSceneValidWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Scenes::Attributes::SceneValid::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.boolValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeNameSupportWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Scenes::Attributes::NameSupport::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeLastConfiguredByWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Scenes::Attributes::LastConfiguredBy::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedLongLongValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
@@ -495,7 +533,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AdministratorCommissioning::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = Scenes::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -534,7 +572,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AdministratorCommissioning::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = Scenes::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -573,7 +611,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AdministratorCommissioning::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = Scenes::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -612,7 +650,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AdministratorCommissioning::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Scenes::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -630,7 +668,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AdministratorCommissioning::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Scenes::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -641,18 +679,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestApplicationBasic ()
-@property (readonly) chip::Controller::ApplicationBasicCluster cppCluster;
+@interface CHIPTestOnOff ()
+@property (readonly) chip::Controller::OnOffCluster cppCluster;
 @end
 
-@implementation CHIPTestApplicationBasic
+@implementation CHIPTestOnOff
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeVendorNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOnOffWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -661,16 +699,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ApplicationBasic::Attributes::VendorName::TypeInfo;
+            using TypeInfo = OnOff::Attributes::OnOff::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
+            cppValue = value.boolValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeVendorIDWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeGlobalSceneControlWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -679,16 +717,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ApplicationBasic::Attributes::VendorID::TypeInfo;
+            using TypeInfo = OnOff::Attributes::GlobalSceneControl::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.boolValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeApplicationNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -697,16 +735,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ApplicationBasic::Attributes::ApplicationName::TypeInfo;
+            using TypeInfo = OnOff::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeProductIDWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -715,17 +774,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ApplicationBasic::Attributes::ProductID::TypeInfo;
+            using TypeInfo = OnOff::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeApplicationWithValue:(CHIPApplicationBasicClusterApplicationBasicApplication * _Nonnull)value
-                         completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -734,17 +813,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ApplicationBasic::Attributes::Application::TypeInfo;
+            using TypeInfo = OnOff::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue.catalogVendorId = value.catalogVendorId.unsignedShortValue;
-            cppValue.applicationId = [self asCharSpan:value.applicationId];
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -753,16 +852,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ApplicationBasic::Attributes::Status::TypeInfo;
+            using TypeInfo = OnOff::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeApplicationVersionWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -771,16 +870,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ApplicationBasic::Attributes::ApplicationVersion::TypeInfo;
+            using TypeInfo = OnOff::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAllowedVendorListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+@end
+
+@interface CHIPTestOnOffSwitchConfiguration ()
+@property (readonly) chip::Controller::OnOffSwitchConfigurationCluster cppCluster;
+@end
+
+@implementation CHIPTestOnOffSwitchConfiguration
+
+- (chip::Controller::ClusterBase *)getCluster
+{
+    return &_cppCluster;
+}
+
+- (void)writeAttributeSwitchTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -789,31 +901,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ApplicationBasic::Attributes::AllowedVendorList::TypeInfo;
+            using TypeInfo = OnOffSwitchConfiguration::Attributes::SwitchType::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0])>>(
-                            element_0.unsignedShortValue);
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -829,7 +919,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ApplicationBasic::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = OnOffSwitchConfiguration::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -868,7 +958,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ApplicationBasic::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = OnOffSwitchConfiguration::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -907,7 +997,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ApplicationBasic::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = OnOffSwitchConfiguration::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -946,7 +1036,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ApplicationBasic::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = OnOffSwitchConfiguration::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -964,7 +1054,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ApplicationBasic::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = OnOffSwitchConfiguration::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -975,18 +1065,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestApplicationLauncher ()
-@property (readonly) chip::Controller::ApplicationLauncherCluster cppCluster;
+@interface CHIPTestLevelControl ()
+@property (readonly) chip::Controller::LevelControlCluster cppCluster;
 @end
 
-@implementation CHIPTestApplicationLauncher
+@implementation CHIPTestLevelControl
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeCatalogListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentLevelWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -995,30 +1085,117 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ApplicationLauncher::Attributes::CatalogList::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::CurrentLevel::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedShortValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeRemainingTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = LevelControl::Attributes::RemainingTime::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeMinLevelWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = LevelControl::Attributes::MinLevel::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeMaxLevelWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = LevelControl::Attributes::MaxLevel::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeCurrentFrequencyWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = LevelControl::Attributes::CurrentFrequency::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeMinFrequencyWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = LevelControl::Attributes::MinFrequency::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeMaxFrequencyWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = LevelControl::Attributes::MaxFrequency::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -1034,7 +1211,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ApplicationLauncher::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -1073,7 +1250,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ApplicationLauncher::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -1112,7 +1289,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ApplicationLauncher::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -1151,7 +1328,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ApplicationLauncher::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -1169,7 +1346,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ApplicationLauncher::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = LevelControl::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -1180,18 +1357,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestAudioOutput ()
-@property (readonly) chip::Controller::AudioOutputCluster cppCluster;
+@interface CHIPTestBinaryInputBasic ()
+@property (readonly) chip::Controller::BinaryInputBasicCluster cppCluster;
 @end
 
-@implementation CHIPTestAudioOutput
+@implementation CHIPTestBinaryInputBasic
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeOutputListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePolarityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -1200,41 +1377,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AudioOutput::Attributes::OutputList::TypeInfo;
+            using TypeInfo = BinaryInputBasic::Attributes::Polarity::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPAudioOutputClusterOutputInfo class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (CHIPAudioOutputClusterOutputInfo *) value[i_0];
-                        listHolder_0->mList[i_0].index = element_0.index.unsignedCharValue;
-                        listHolder_0->mList[i_0].outputType
-                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].outputType)>>(
-                                element_0.outputType.unsignedCharValue);
-                        listHolder_0->mList[i_0].name = [self asCharSpan:element_0.name];
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeCurrentOutputWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeStatusFlagsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -1243,7 +1395,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AudioOutput::Attributes::CurrentOutput::TypeInfo;
+            using TypeInfo = BinaryInputBasic::Attributes::StatusFlags::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -1252,6 +1404,24 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
+- (void)writeAttributeApplicationTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = BinaryInputBasic::Attributes::ApplicationType::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedIntValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
@@ -1261,7 +1431,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AudioOutput::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = BinaryInputBasic::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -1300,7 +1470,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AudioOutput::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = BinaryInputBasic::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -1339,7 +1509,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AudioOutput::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = BinaryInputBasic::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -1378,7 +1548,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AudioOutput::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = BinaryInputBasic::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -1396,7 +1566,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = AudioOutput::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = BinaryInputBasic::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -1407,18 +1577,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestBarrierControl ()
-@property (readonly) chip::Controller::BarrierControlCluster cppCluster;
+@interface CHIPTestDescriptor ()
+@property (readonly) chip::Controller::DescriptorCluster cppCluster;
 @end
 
-@implementation CHIPTestBarrierControl
+@implementation CHIPTestDescriptor
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeBarrierMovingStateWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDeviceListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -1427,16 +1597,38 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BarrierControl::Attributes::BarrierMovingState::TypeInfo;
+            using TypeInfo = Descriptor::Attributes::DeviceList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[CHIPDescriptorClusterDeviceType class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (CHIPDescriptorClusterDeviceType *) value[i_0];
+                        listHolder_0->mList[i_0].type = element_0.type.unsignedIntValue;
+                        listHolder_0->mList[i_0].revision = element_0.revision.unsignedShortValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeBarrierSafetyStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeServerListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -1445,16 +1637,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BarrierControl::Attributes::BarrierSafetyStatus::TypeInfo;
+            using TypeInfo = Descriptor::Attributes::ServerList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeBarrierCapabilitiesWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeClientListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -1463,16 +1676,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BarrierControl::Attributes::BarrierCapabilities::TypeInfo;
+            using TypeInfo = Descriptor::Attributes::ClientList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeBarrierPositionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePartsListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -1481,9 +1715,30 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BarrierControl::Attributes::BarrierPosition::TypeInfo;
+            using TypeInfo = Descriptor::Attributes::PartsList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedShortValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -1499,7 +1754,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BarrierControl::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = Descriptor::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -1538,7 +1793,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BarrierControl::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = Descriptor::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -1577,7 +1832,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BarrierControl::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = Descriptor::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -1616,7 +1871,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BarrierControl::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Descriptor::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -1634,7 +1889,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BarrierControl::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Descriptor::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -1645,18 +1900,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestBasic ()
-@property (readonly) chip::Controller::BasicCluster cppCluster;
+@interface CHIPTestBinding ()
+@property (readonly) chip::Controller::BindingCluster cppCluster;
 @end
 
-@implementation CHIPTestBasic
+@implementation CHIPTestBinding
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeDataModelRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -1665,16 +1920,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Basic::Attributes::DataModelRevision::TypeInfo;
+            using TypeInfo = Binding::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeVendorNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -1683,16 +1959,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Basic::Attributes::VendorName::TypeInfo;
+            using TypeInfo = Binding::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeVendorIDWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -1701,89 +1998,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Basic::Attributes::VendorID::TypeInfo;
+            using TypeInfo = Binding::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeProductNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Basic::Attributes::ProductName::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeProductIDWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Basic::Attributes::ProductID::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeHardwareVersionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Basic::Attributes::HardwareVersion::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeHardwareVersionStringWithValue:(NSString * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Basic::Attributes::HardwareVersionString::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeSoftwareVersionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -1792,7 +2037,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Basic::Attributes::SoftwareVersion::TypeInfo;
+            using TypeInfo = Binding::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -1801,26 +2046,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeSoftwareVersionStringWithValue:(NSString * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Basic::Attributes::SoftwareVersionString::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeManufacturingDateWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -1829,88 +2055,30 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Basic::Attributes::ManufacturingDate::TypeInfo;
+            using TypeInfo = Binding::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePartNumberWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Basic::Attributes::PartNumber::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
+@end
 
-- (void)writeAttributeProductURLWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Basic::Attributes::ProductURL::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
+@interface CHIPTestAccessControl ()
+@property (readonly) chip::Controller::AccessControlCluster cppCluster;
+@end
 
-- (void)writeAttributeProductLabelWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Basic::Attributes::ProductLabel::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
+@implementation CHIPTestAccessControl
 
-- (void)writeAttributeSerialNumberWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Basic::Attributes::SerialNumber::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    return &_cppCluster;
 }
 
-- (void)writeAttributeReachableWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSubjectsPerAccessControlEntryWithValue:(NSNumber * _Nonnull)value
+                                           completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -1919,16 +2087,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Basic::Attributes::Reachable::TypeInfo;
+            using TypeInfo = AccessControl::Attributes::SubjectsPerAccessControlEntry::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeUniqueIDWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTargetsPerAccessControlEntryWithValue:(NSNumber * _Nonnull)value
+                                          completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -1937,17 +2106,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Basic::Attributes::UniqueID::TypeInfo;
+            using TypeInfo = AccessControl::Attributes::TargetsPerAccessControlEntry::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeCapabilityMinimaWithValue:(CHIPBasicClusterCapabilityMinimaStruct * _Nonnull)value
-                              completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAccessControlEntriesPerFabricWithValue:(NSNumber * _Nonnull)value
+                                           completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -1956,10 +2125,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Basic::Attributes::CapabilityMinima::TypeInfo;
+            using TypeInfo = AccessControl::Attributes::AccessControlEntriesPerFabric::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue.caseSessionsPerFabric = value.caseSessionsPerFabric.unsignedShortValue;
-            cppValue.subscriptionsPerFabric = value.subscriptionsPerFabric.unsignedShortValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -1975,7 +2143,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Basic::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = AccessControl::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -2014,7 +2182,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Basic::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = AccessControl::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -2053,7 +2221,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Basic::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = AccessControl::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -2092,7 +2260,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Basic::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = AccessControl::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -2110,7 +2278,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Basic::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = AccessControl::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -2121,36 +2289,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestBinaryInputBasic ()
-@property (readonly) chip::Controller::BinaryInputBasicCluster cppCluster;
+@interface CHIPTestBridgedActions ()
+@property (readonly) chip::Controller::BridgedActionsCluster cppCluster;
 @end
 
-@implementation CHIPTestBinaryInputBasic
+@implementation CHIPTestBridgedActions
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributePolarityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = BinaryInputBasic::Attributes::Polarity::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeStatusFlagsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeActionListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -2159,43 +2309,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BinaryInputBasic::Attributes::StatusFlags::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeApplicationTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = BinaryInputBasic::Attributes::ApplicationType::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = BinaryInputBasic::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = BridgedActions::Attributes::ActionList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -2207,12 +2321,21 @@ new CHIPDefaultSuccessCallbackBridge(
                     }
                     listFreer.add(listHolder_0);
                     for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                        if (![value[i_0] isKindOfClass:[CHIPBridgedActionsClusterActionStruct class]]) {
                             // Wrong kind of value.
                             return CHIP_ERROR_INVALID_ARGUMENT;
                         }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                        auto element_0 = (CHIPBridgedActionsClusterActionStruct *) value[i_0];
+                        listHolder_0->mList[i_0].actionID = element_0.actionID.unsignedShortValue;
+                        listHolder_0->mList[i_0].name = [self asCharSpan:element_0.name];
+                        listHolder_0->mList[i_0].type
+                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].type)>>(
+                                element_0.type.unsignedCharValue);
+                        listHolder_0->mList[i_0].endpointListID = element_0.endpointListID.unsignedShortValue;
+                        listHolder_0->mList[i_0].supportedCommands = element_0.supportedCommands.unsignedShortValue;
+                        listHolder_0->mList[i_0].status
+                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].status)>>(
+                                element_0.status.unsignedCharValue);
                     }
                     cppValue = ListType_0(listHolder_0->mList, value.count);
                 } else {
@@ -2225,7 +2348,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeEndpointListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -2234,7 +2357,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BinaryInputBasic::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = BridgedActions::Attributes::EndpointList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -2246,51 +2369,38 @@ new CHIPDefaultSuccessCallbackBridge(
                     }
                     listFreer.add(listHolder_0);
                     for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                        if (![value[i_0] isKindOfClass:[CHIPBridgedActionsClusterEndpointListStruct class]]) {
                             // Wrong kind of value.
                             return CHIP_ERROR_INVALID_ARGUMENT;
                         }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = BinaryInputBasic::Attributes::AttributeList::TypeInfo;
-            TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        auto element_0 = (CHIPBridgedActionsClusterEndpointListStruct *) value[i_0];
+                        listHolder_0->mList[i_0].endpointListID = element_0.endpointListID.unsignedShortValue;
+                        listHolder_0->mList[i_0].name = [self asCharSpan:element_0.name];
+                        listHolder_0->mList[i_0].type
+                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].type)>>(
+                                element_0.type.unsignedCharValue);
+                        {
+                            using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].endpoints)>;
+                            using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
+                            if (element_0.endpoints.count != 0) {
+                                auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.endpoints.count);
+                                if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
+                                    return CHIP_ERROR_INVALID_ARGUMENT;
+                                }
+                                listFreer.add(listHolder_2);
+                                for (size_t i_2 = 0; i_2 < element_0.endpoints.count; ++i_2) {
+                                    if (![element_0.endpoints[i_2] isKindOfClass:[NSNumber class]]) {
+                                        // Wrong kind of value.
+                                        return CHIP_ERROR_INVALID_ARGUMENT;
+                                    }
+                                    auto element_2 = (NSNumber *) element_0.endpoints[i_2];
+                                    listHolder_2->mList[i_2] = element_2.unsignedShortValue;
+                                }
+                                listHolder_0->mList[i_0].endpoints = ListType_2(listHolder_2->mList, element_0.endpoints.count);
+                            } else {
+                                listHolder_0->mList[i_0].endpoints = ListType_2();
+                            }
                         }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
                     }
                     cppValue = ListType_0(listHolder_0->mList, value.count);
                 } else {
@@ -2303,25 +2413,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = BinaryInputBasic::Attributes::FeatureMap::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSetupUrlWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -2330,28 +2422,15 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BinaryInputBasic::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = BridgedActions::Attributes::SetupUrl::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = [self asCharSpan:value];
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-@end
-
-@interface CHIPTestBinding ()
-@property (readonly) chip::Controller::BindingCluster cppCluster;
-@end
-
-@implementation CHIPTestBinding
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
@@ -2361,7 +2440,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Binding::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = BridgedActions::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -2400,7 +2479,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Binding::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = BridgedActions::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -2439,7 +2518,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Binding::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = BridgedActions::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -2478,7 +2557,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Binding::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = BridgedActions::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -2496,7 +2575,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Binding::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = BridgedActions::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -2507,18 +2586,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestBooleanState ()
-@property (readonly) chip::Controller::BooleanStateCluster cppCluster;
+@interface CHIPTestBasic ()
+@property (readonly) chip::Controller::BasicCluster cppCluster;
 @end
 
-@implementation CHIPTestBooleanState
+@implementation CHIPTestBasic
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeStateValueWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDataModelRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -2527,16 +2606,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BooleanState::Attributes::StateValue::TypeInfo;
+            using TypeInfo = Basic::Attributes::DataModelRevision::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeVendorNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -2545,37 +2624,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BooleanState::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = Basic::Attributes::VendorName::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = [self asCharSpan:value];
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeVendorIDWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -2584,37 +2642,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BooleanState::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = Basic::Attributes::VendorID::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeProductNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -2623,37 +2660,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BooleanState::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = Basic::Attributes::ProductName::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = [self asCharSpan:value];
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeProductIDWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -2662,16 +2678,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BooleanState::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Basic::Attributes::ProductID::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeHardwareVersionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -2680,7 +2696,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BooleanState::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Basic::Attributes::HardwareVersion::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -2689,20 +2705,8 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-@end
-
-@interface CHIPTestBridgedActions ()
-@property (readonly) chip::Controller::BridgedActionsCluster cppCluster;
-@end
-
-@implementation CHIPTestBridgedActions
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)writeAttributeActionListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeHardwareVersionStringWithValue:(NSString * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -2711,46 +2715,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BridgedActions::Attributes::ActionList::TypeInfo;
+            using TypeInfo = Basic::Attributes::HardwareVersionString::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPBridgedActionsClusterActionStruct class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (CHIPBridgedActionsClusterActionStruct *) value[i_0];
-                        listHolder_0->mList[i_0].actionID = element_0.actionID.unsignedShortValue;
-                        listHolder_0->mList[i_0].name = [self asCharSpan:element_0.name];
-                        listHolder_0->mList[i_0].type
-                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].type)>>(
-                                element_0.type.unsignedCharValue);
-                        listHolder_0->mList[i_0].endpointListID = element_0.endpointListID.unsignedShortValue;
-                        listHolder_0->mList[i_0].supportedCommands = element_0.supportedCommands.unsignedShortValue;
-                        listHolder_0->mList[i_0].status
-                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].status)>>(
-                                element_0.status.unsignedCharValue);
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = [self asCharSpan:value];
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeEndpointListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSoftwareVersionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -2759,63 +2733,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BridgedActions::Attributes::EndpointList::TypeInfo;
+            using TypeInfo = Basic::Attributes::SoftwareVersion::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPBridgedActionsClusterEndpointListStruct class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (CHIPBridgedActionsClusterEndpointListStruct *) value[i_0];
-                        listHolder_0->mList[i_0].endpointListID = element_0.endpointListID.unsignedShortValue;
-                        listHolder_0->mList[i_0].name = [self asCharSpan:element_0.name];
-                        listHolder_0->mList[i_0].type
-                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].type)>>(
-                                element_0.type.unsignedCharValue);
-                        {
-                            using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].endpoints)>;
-                            using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
-                            if (element_0.endpoints.count != 0) {
-                                auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.endpoints.count);
-                                if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
-                                    return CHIP_ERROR_INVALID_ARGUMENT;
-                                }
-                                listFreer.add(listHolder_2);
-                                for (size_t i_2 = 0; i_2 < element_0.endpoints.count; ++i_2) {
-                                    if (![element_0.endpoints[i_2] isKindOfClass:[NSNumber class]]) {
-                                        // Wrong kind of value.
-                                        return CHIP_ERROR_INVALID_ARGUMENT;
-                                    }
-                                    auto element_2 = (NSNumber *) element_0.endpoints[i_2];
-                                    listHolder_2->mList[i_2] = element_2.unsignedShortValue;
-                                }
-                                listHolder_0->mList[i_0].endpoints = ListType_2(listHolder_2->mList, element_0.endpoints.count);
-                            } else {
-                                listHolder_0->mList[i_0].endpoints = ListType_2();
-                            }
-                        }
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeSetupUrlWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSoftwareVersionStringWithValue:(NSString * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -2824,7 +2752,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BridgedActions::Attributes::SetupUrl::TypeInfo;
+            using TypeInfo = Basic::Attributes::SoftwareVersionString::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = [self asCharSpan:value];
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -2833,7 +2761,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeManufacturingDateWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -2842,37 +2770,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BridgedActions::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = Basic::Attributes::ManufacturingDate::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = [self asCharSpan:value];
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePartNumberWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -2881,37 +2788,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BridgedActions::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = Basic::Attributes::PartNumber::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = [self asCharSpan:value];
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeProductURLWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -2920,37 +2806,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BridgedActions::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = Basic::Attributes::ProductURL::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = [self asCharSpan:value];
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeProductLabelWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -2959,16 +2824,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BridgedActions::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Basic::Attributes::ProductLabel::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = [self asCharSpan:value];
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSerialNumberWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -2977,29 +2842,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BridgedActions::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Basic::Attributes::SerialNumber::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = [self asCharSpan:value];
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-@end
-
-@interface CHIPTestBridgedDeviceBasic ()
-@property (readonly) chip::Controller::BridgedDeviceBasicCluster cppCluster;
-@end
-
-@implementation CHIPTestBridgedDeviceBasic
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)writeAttributeVendorNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeReachableWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3008,16 +2860,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BridgedDeviceBasic::Attributes::VendorName::TypeInfo;
+            using TypeInfo = Basic::Attributes::Reachable::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
+            cppValue = value.boolValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeVendorIDWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeUniqueIDWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3026,16 +2878,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BridgedDeviceBasic::Attributes::VendorID::TypeInfo;
+            using TypeInfo = Basic::Attributes::UniqueID::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
+            cppValue = [self asCharSpan:value];
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeProductNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCapabilityMinimaWithValue:(CHIPBasicClusterCapabilityMinimaStruct * _Nonnull)value
+                              completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3044,16 +2897,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BridgedDeviceBasic::Attributes::ProductName::TypeInfo;
+            using TypeInfo = Basic::Attributes::CapabilityMinima::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
+            cppValue.caseSessionsPerFabric = value.caseSessionsPerFabric.unsignedShortValue;
+            cppValue.subscriptionsPerFabric = value.subscriptionsPerFabric.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeHardwareVersionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3062,54 +2916,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BridgedDeviceBasic::Attributes::HardwareVersion::TypeInfo;
+            using TypeInfo = Basic::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeHardwareVersionStringWithValue:(NSString * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = BridgedDeviceBasic::Attributes::HardwareVersionString::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeSoftwareVersionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = BridgedDeviceBasic::Attributes::SoftwareVersion::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeSoftwareVersionStringWithValue:(NSString * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3118,16 +2955,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BridgedDeviceBasic::Attributes::SoftwareVersionString::TypeInfo;
+            using TypeInfo = Basic::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeManufacturingDateWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3136,16 +2994,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BridgedDeviceBasic::Attributes::ManufacturingDate::TypeInfo;
+            using TypeInfo = Basic::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePartNumberWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3154,16 +3033,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BridgedDeviceBasic::Attributes::PartNumber::TypeInfo;
+            using TypeInfo = Basic::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeProductURLWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3172,85 +3051,26 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BridgedDeviceBasic::Attributes::ProductURL::TypeInfo;
+            using TypeInfo = Basic::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeProductLabelWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = BridgedDeviceBasic::Attributes::ProductLabel::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
+@end
 
-- (void)writeAttributeSerialNumberWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = BridgedDeviceBasic::Attributes::SerialNumber::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
+@interface CHIPTestOtaSoftwareUpdateProvider ()
+@property (readonly) chip::Controller::OtaSoftwareUpdateProviderCluster cppCluster;
+@end
 
-- (void)writeAttributeReachableWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = BridgedDeviceBasic::Attributes::Reachable::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
+@implementation CHIPTestOtaSoftwareUpdateProvider
 
-- (void)writeAttributeUniqueIDWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = BridgedDeviceBasic::Attributes::UniqueID::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    return &_cppCluster;
 }
 
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
@@ -3262,7 +3082,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BridgedDeviceBasic::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -3301,7 +3121,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BridgedDeviceBasic::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -3340,7 +3160,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BridgedDeviceBasic::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -3379,7 +3199,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BridgedDeviceBasic::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -3397,7 +3217,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = BridgedDeviceBasic::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -3408,18 +3228,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestChannel ()
-@property (readonly) chip::Controller::ChannelCluster cppCluster;
+@interface CHIPTestOtaSoftwareUpdateRequestor ()
+@property (readonly) chip::Controller::OtaSoftwareUpdateRequestorCluster cppCluster;
 @end
 
-@implementation CHIPTestChannel
+@implementation CHIPTestOtaSoftwareUpdateRequestor
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeChannelListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeUpdatePossibleWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3428,51 +3248,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Channel::Attributes::ChannelList::TypeInfo;
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdatePossible::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPChannelClusterChannelInfo class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (CHIPChannelClusterChannelInfo *) value[i_0];
-                        listHolder_0->mList[i_0].majorNumber = element_0.majorNumber.unsignedShortValue;
-                        listHolder_0->mList[i_0].minorNumber = element_0.minorNumber.unsignedShortValue;
-                        if (element_0.name != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].name.Emplace();
-                            definedValue_2 = [self asCharSpan:element_0.name];
-                        }
-                        if (element_0.callSign != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].callSign.Emplace();
-                            definedValue_2 = [self asCharSpan:element_0.callSign];
-                        }
-                        if (element_0.affiliateCallSign != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].affiliateCallSign.Emplace();
-                            definedValue_2 = [self asCharSpan:element_0.affiliateCallSign];
-                        }
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.boolValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeLineupWithValue:(CHIPChannelClusterLineupInfo * _Nullable)value
-                    completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeUpdateStateWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3481,32 +3266,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Channel::Attributes::Lineup::TypeInfo;
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdateState::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0.operatorName = [self asCharSpan:value.operatorName];
-                if (value.lineupName != nil) {
-                    auto & definedValue_2 = nonNullValue_0.lineupName.Emplace();
-                    definedValue_2 = [self asCharSpan:value.lineupName];
-                }
-                if (value.postalCode != nil) {
-                    auto & definedValue_2 = nonNullValue_0.postalCode.Emplace();
-                    definedValue_2 = [self asCharSpan:value.postalCode];
-                }
-                nonNullValue_0.lineupInfoType = static_cast<std::remove_reference_t<decltype(nonNullValue_0.lineupInfoType)>>(
-                    value.lineupInfoType.unsignedCharValue);
-            }
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeCurrentChannelWithValue:(CHIPChannelClusterChannelInfo * _Nullable)value
-                            completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeUpdateStateProgressWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3515,26 +3284,13 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Channel::Attributes::CurrentChannel::TypeInfo;
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdateStateProgress::TypeInfo;
             TypeInfo::Type cppValue;
             if (value == nil) {
                 cppValue.SetNull();
             } else {
                 auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0.majorNumber = value.majorNumber.unsignedShortValue;
-                nonNullValue_0.minorNumber = value.minorNumber.unsignedShortValue;
-                if (value.name != nil) {
-                    auto & definedValue_2 = nonNullValue_0.name.Emplace();
-                    definedValue_2 = [self asCharSpan:value.name];
-                }
-                if (value.callSign != nil) {
-                    auto & definedValue_2 = nonNullValue_0.callSign.Emplace();
-                    definedValue_2 = [self asCharSpan:value.callSign];
-                }
-                if (value.affiliateCallSign != nil) {
-                    auto & definedValue_2 = nonNullValue_0.affiliateCallSign.Emplace();
-                    definedValue_2 = [self asCharSpan:value.affiliateCallSign];
-                }
+                nonNullValue_0 = value.unsignedCharValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -3551,7 +3307,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Channel::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -3590,7 +3346,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Channel::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -3629,7 +3385,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Channel::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -3668,7 +3424,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Channel::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -3686,7 +3442,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Channel::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -3697,18 +3453,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestColorControl ()
-@property (readonly) chip::Controller::ColorControlCluster cppCluster;
+@interface CHIPTestLocalizationConfiguration ()
+@property (readonly) chip::Controller::LocalizationConfigurationCluster cppCluster;
 @end
 
-@implementation CHIPTestColorControl
+@implementation CHIPTestLocalizationConfiguration
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeCurrentHueWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSupportedLocalesWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3717,16 +3473,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::CurrentHue::TypeInfo;
+            using TypeInfo = LocalizationConfiguration::Attributes::SupportedLocales::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSString class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSString *) value[i_0];
+                        listHolder_0->mList[i_0] = [self asCharSpan:element_0];
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeCurrentSaturationWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3735,16 +3512,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::CurrentSaturation::TypeInfo;
+            using TypeInfo = LocalizationConfiguration::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRemainingTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3753,16 +3551,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::RemainingTime::TypeInfo;
+            using TypeInfo = LocalizationConfiguration::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeCurrentXWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3771,16 +3590,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::CurrentX::TypeInfo;
+            using TypeInfo = LocalizationConfiguration::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeCurrentYWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3789,16 +3629,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::CurrentY::TypeInfo;
+            using TypeInfo = LocalizationConfiguration::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeDriftCompensationWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3807,34 +3647,30 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::DriftCompensation::TypeInfo;
+            using TypeInfo = LocalizationConfiguration::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeCompensationTextWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+@end
+
+@interface CHIPTestTimeFormatLocalization ()
+@property (readonly) chip::Controller::TimeFormatLocalizationCluster cppCluster;
+@end
+
+@implementation CHIPTestTimeFormatLocalization
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::CompensationText::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    return &_cppCluster;
 }
 
-- (void)writeAttributeColorTemperatureWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSupportedCalendarTypesWithValue:(NSArray * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3843,16 +3679,38 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::ColorTemperature::TypeInfo;
+            using TypeInfo = TimeFormatLocalization::Attributes::SupportedCalendarTypes::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0]
+                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0])>>(element_0.unsignedCharValue);
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeColorModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3861,16 +3719,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::ColorMode::TypeInfo;
+            using TypeInfo = TimeFormatLocalization::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeNumberOfPrimariesWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3879,13 +3758,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::NumberOfPrimaries::TypeInfo;
+            using TypeInfo = TimeFormatLocalization::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -3893,7 +3788,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributePrimary1XWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3902,16 +3797,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::Primary1X::TypeInfo;
+            using TypeInfo = TimeFormatLocalization::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePrimary1YWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3920,16 +3836,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::Primary1Y::TypeInfo;
+            using TypeInfo = TimeFormatLocalization::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePrimary1IntensityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3938,21 +3854,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::Primary1Intensity::TypeInfo;
+            using TypeInfo = TimeFormatLocalization::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePrimary2XWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+@end
+
+@interface CHIPTestUnitLocalization ()
+@property (readonly) chip::Controller::UnitLocalizationCluster cppCluster;
+@end
+
+@implementation CHIPTestUnitLocalization
+
+- (chip::Controller::ClusterBase *)getCluster
+{
+    return &_cppCluster;
+}
+
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3961,16 +3885,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::Primary2X::TypeInfo;
+            using TypeInfo = UnitLocalization::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePrimary2YWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3979,16 +3924,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::Primary2Y::TypeInfo;
+            using TypeInfo = UnitLocalization::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePrimary2IntensityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -3997,13 +3963,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::Primary2Intensity::TypeInfo;
+            using TypeInfo = UnitLocalization::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -4011,7 +3993,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributePrimary3XWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4020,16 +4002,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::Primary3X::TypeInfo;
+            using TypeInfo = UnitLocalization::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePrimary3YWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4038,7 +4020,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::Primary3Y::TypeInfo;
+            using TypeInfo = UnitLocalization::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -4047,7 +4029,20 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributePrimary3IntensityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+@end
+
+@interface CHIPTestPowerSourceConfiguration ()
+@property (readonly) chip::Controller::PowerSourceConfigurationCluster cppCluster;
+@end
+
+@implementation CHIPTestPowerSourceConfiguration
+
+- (chip::Controller::ClusterBase *)getCluster
+{
+    return &_cppCluster;
+}
+
+- (void)writeAttributeSourcesWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4056,13 +4051,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::Primary3Intensity::TypeInfo;
+            using TypeInfo = PowerSourceConfiguration::Attributes::Sources::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedCharValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -4070,7 +4081,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributePrimary4XWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4079,16 +4090,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::Primary4X::TypeInfo;
+            using TypeInfo = PowerSourceConfiguration::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePrimary4YWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4097,16 +4129,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::Primary4Y::TypeInfo;
+            using TypeInfo = PowerSourceConfiguration::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributePrimary4IntensityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4115,13 +4168,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::Primary4Intensity::TypeInfo;
+            using TypeInfo = PowerSourceConfiguration::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -4129,7 +4198,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributePrimary5XWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4138,16 +4207,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::Primary5X::TypeInfo;
+            using TypeInfo = PowerSourceConfiguration::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePrimary5YWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4156,7 +4225,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::Primary5Y::TypeInfo;
+            using TypeInfo = PowerSourceConfiguration::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -4165,7 +4234,20 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributePrimary5IntensityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+@end
+
+@interface CHIPTestPowerSource ()
+@property (readonly) chip::Controller::PowerSourceCluster cppCluster;
+@end
+
+@implementation CHIPTestPowerSource
+
+- (chip::Controller::ClusterBase *)getCluster
+{
+    return &_cppCluster;
+}
+
+- (void)writeAttributeStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4174,21 +4256,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::Primary5Intensity::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::Status::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePrimary6XWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOrderWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4197,16 +4274,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::Primary6X::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::Order::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePrimary6YWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDescriptionWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4215,16 +4292,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::Primary6Y::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::Description::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = [self asCharSpan:value];
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePrimary6IntensityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeWiredAssessedInputVoltageWithValue:(NSNumber * _Nonnull)value
+                                       completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4233,21 +4311,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::Primary6Intensity::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::WiredAssessedInputVoltage::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeEnhancedCurrentHueWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeWiredAssessedInputFrequencyWithValue:(NSNumber * _Nonnull)value
+                                         completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4256,7 +4330,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::EnhancedCurrentHue::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::WiredAssessedInputFrequency::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -4265,7 +4339,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeEnhancedColorModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeWiredCurrentTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4274,7 +4348,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::EnhancedColorMode::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::WiredCurrentType::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -4283,7 +4357,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeColorLoopActiveWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeWiredAssessedCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4292,16 +4366,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::ColorLoopActive::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::WiredAssessedCurrent::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeColorLoopDirectionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeWiredNominalVoltageWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4310,16 +4384,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::ColorLoopDirection::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::WiredNominalVoltage::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeColorLoopTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeWiredMaximumCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4328,17 +4402,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::ColorLoopTime::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::WiredMaximumCurrent::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeColorLoopStartEnhancedHueWithValue:(NSNumber * _Nonnull)value
-                                       completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeWiredPresentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4347,17 +4420,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::ColorLoopStartEnhancedHue::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::WiredPresent::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.boolValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeColorLoopStoredEnhancedHueWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeActiveWiredFaultsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4366,16 +4438,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::ColorLoopStoredEnhancedHue::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::ActiveWiredFaults::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedCharValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeColorCapabilitiesWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBatteryVoltageWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4384,17 +4477,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::ColorCapabilities::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryVoltage::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeColorTempPhysicalMinMiredsWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBatteryPercentRemainingWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4403,17 +4496,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::ColorTempPhysicalMinMireds::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryPercentRemaining::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeColorTempPhysicalMaxMiredsWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBatteryTimeRemainingWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4422,17 +4514,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::ColorTempPhysicalMaxMireds::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryTimeRemaining::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeCoupleColorTempToLevelMinMiredsWithValue:(NSNumber * _Nonnull)value
-                                             completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBatteryChargeLevelWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4441,16 +4532,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::CoupleColorTempToLevelMinMireds::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryChargeLevel::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBatteryReplacementNeededWithValue:(NSNumber * _Nonnull)value
+                                      completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4459,37 +4551,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryReplacementNeeded::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.boolValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBatteryReplaceabilityWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4498,37 +4570,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryReplaceability::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBatteryPresentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4537,7 +4588,25 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryPresent::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.boolValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeActiveBatteryFaultsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = PowerSource::Attributes::ActiveBatteryFaults::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -4554,7 +4623,7 @@ new CHIPDefaultSuccessCallbackBridge(
                             return CHIP_ERROR_INVALID_ARGUMENT;
                         }
                         auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                        listHolder_0->mList[i_0] = element_0.unsignedCharValue;
                     }
                     cppValue = ListType_0(listHolder_0->mList, value.count);
                 } else {
@@ -4567,7 +4636,8 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBatteryReplacementDescriptionWithValue:(NSString * _Nonnull)value
+                                           completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4576,16 +4646,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryReplacementDescription::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = [self asCharSpan:value];
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBatteryCommonDesignationWithValue:(NSNumber * _Nonnull)value
+                                      completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4594,29 +4665,55 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ColorControl::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryCommonDesignation::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-@end
-
-@interface CHIPTestContentLauncher ()
-@property (readonly) chip::Controller::ContentLauncherCluster cppCluster;
-@end
-
-@implementation CHIPTestContentLauncher
+- (void)writeAttributeBatteryANSIDesignationWithValue:(NSString * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = PowerSource::Attributes::BatteryANSIDesignation::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = [self asCharSpan:value];
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
 
-- (chip::Controller::ClusterBase *)getCluster
+- (void)writeAttributeBatteryIECDesignationWithValue:(NSString * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler
 {
-    return &_cppCluster;
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = PowerSource::Attributes::BatteryIECDesignation::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = [self asCharSpan:value];
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)writeAttributeAcceptHeaderWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBatteryApprovedChemistryWithValue:(NSNumber * _Nonnull)value
+                                      completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4625,37 +4722,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ContentLauncher::Attributes::AcceptHeader::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryApprovedChemistry::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSString class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSString *) value[i_0];
-                        listHolder_0->mList[i_0] = [self asCharSpan:element_0];
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBatteryCapacityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4664,37 +4740,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ContentLauncher::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryCapacity::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBatteryQuantityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4703,37 +4758,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ContentLauncher::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryQuantity::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBatteryChargeStateWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4742,37 +4776,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ContentLauncher::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryChargeState::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBatteryTimeToFullChargeWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4781,7 +4795,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ContentLauncher::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryTimeToFullCharge::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -4790,7 +4804,8 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBatteryFunctionalWhileChargingWithValue:(NSNumber * _Nonnull)value
+                                            completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4799,29 +4814,36 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ContentLauncher::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::BatteryFunctionalWhileCharging::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.boolValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-@end
-
-@interface CHIPTestDescriptor ()
-@property (readonly) chip::Controller::DescriptorCluster cppCluster;
-@end
-
-@implementation CHIPTestDescriptor
-
-- (chip::Controller::ClusterBase *)getCluster
+- (void)writeAttributeBatteryChargingCurrentWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler
 {
-    return &_cppCluster;
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = PowerSource::Attributes::BatteryChargingCurrent::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedIntValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)writeAttributeDeviceListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeActiveBatteryChargeFaultsWithValue:(NSArray * _Nonnull)value
+                                       completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4830,7 +4852,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Descriptor::Attributes::DeviceList::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::ActiveBatteryChargeFaults::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -4842,13 +4864,12 @@ new CHIPDefaultSuccessCallbackBridge(
                     }
                     listFreer.add(listHolder_0);
                     for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPDescriptorClusterDeviceType class]]) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
                             // Wrong kind of value.
                             return CHIP_ERROR_INVALID_ARGUMENT;
                         }
-                        auto element_0 = (CHIPDescriptorClusterDeviceType *) value[i_0];
-                        listHolder_0->mList[i_0].type = element_0.type.unsignedIntValue;
-                        listHolder_0->mList[i_0].revision = element_0.revision.unsignedShortValue;
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedCharValue;
                     }
                     cppValue = ListType_0(listHolder_0->mList, value.count);
                 } else {
@@ -4861,7 +4882,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeServerListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4870,7 +4891,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Descriptor::Attributes::ServerList::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -4900,7 +4921,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeClientListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4909,7 +4930,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Descriptor::Attributes::ClientList::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -4939,7 +4960,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributePartsListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4948,7 +4969,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Descriptor::Attributes::PartsList::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -4965,7 +4986,7 @@ new CHIPDefaultSuccessCallbackBridge(
                             return CHIP_ERROR_INVALID_ARGUMENT;
                         }
                         auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedShortValue;
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
                     }
                     cppValue = ListType_0(listHolder_0->mList, value.count);
                 } else {
@@ -4978,7 +4999,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -4987,37 +5008,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Descriptor::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -5026,37 +5026,30 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Descriptor::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = PowerSource::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+@end
+
+@interface CHIPTestGeneralCommissioning ()
+@property (readonly) chip::Controller::GeneralCommissioningCluster cppCluster;
+@end
+
+@implementation CHIPTestGeneralCommissioning
+
+- (chip::Controller::ClusterBase *)getCluster
+{
+    return &_cppCluster;
+}
+
+- (void)writeAttributeBasicCommissioningInfoWithValue:(CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -5065,37 +5058,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Descriptor::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = GeneralCommissioning::Attributes::BasicCommissioningInfo::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue.failSafeExpiryLengthSeconds = value.failSafeExpiryLengthSeconds.unsignedShortValue;
+            cppValue.maxCumulativeFailsafeSeconds = value.maxCumulativeFailsafeSeconds.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRegulatoryConfigWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -5104,16 +5077,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Descriptor::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = GeneralCommissioning::Attributes::RegulatoryConfig::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeLocationCapabilityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -5122,26 +5095,32 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Descriptor::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = GeneralCommissioning::Attributes::LocationCapability::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-@end
-
-@interface CHIPTestDiagnosticLogs ()
-@property (readonly) chip::Controller::DiagnosticLogsCluster cppCluster;
-@end
-
-@implementation CHIPTestDiagnosticLogs
-
-- (chip::Controller::ClusterBase *)getCluster
+- (void)writeAttributeSupportsConcurrentConnectionWithValue:(NSNumber * _Nonnull)value
+                                          completionHandler:(StatusCompletion)completionHandler
 {
-    return &_cppCluster;
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = GeneralCommissioning::Attributes::SupportsConcurrentConnection::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.boolValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
@@ -5153,7 +5132,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DiagnosticLogs::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = GeneralCommissioning::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -5192,7 +5171,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DiagnosticLogs::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = GeneralCommissioning::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -5231,7 +5210,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DiagnosticLogs::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = GeneralCommissioning::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -5270,7 +5249,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DiagnosticLogs::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = GeneralCommissioning::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -5288,7 +5267,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DiagnosticLogs::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = GeneralCommissioning::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -5299,18 +5278,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestDoorLock ()
-@property (readonly) chip::Controller::DoorLockCluster cppCluster;
+@interface CHIPTestNetworkCommissioning ()
+@property (readonly) chip::Controller::NetworkCommissioningCluster cppCluster;
 @end
 
-@implementation CHIPTestDoorLock
+@implementation CHIPTestNetworkCommissioning
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeLockStateWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMaxNetworksWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -5319,21 +5298,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::LockState::TypeInfo;
+            using TypeInfo = NetworkCommissioning::Attributes::MaxNetworks::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
-            }
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeLockTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNetworksWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -5342,16 +5316,38 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::LockType::TypeInfo;
+            using TypeInfo = NetworkCommissioning::Attributes::Networks::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[CHIPNetworkCommissioningClusterNetworkInfo class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (CHIPNetworkCommissioningClusterNetworkInfo *) value[i_0];
+                        listHolder_0->mList[i_0].networkID = [self asByteSpan:element_0.networkID];
+                        listHolder_0->mList[i_0].connected = element_0.connected.boolValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeActuatorEnabledWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeScanMaxTimeSecondsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -5360,16 +5356,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::ActuatorEnabled::TypeInfo;
+            using TypeInfo = NetworkCommissioning::Attributes::ScanMaxTimeSeconds::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeDoorStateWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeConnectMaxTimeSecondsWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -5378,22 +5375,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::DoorState::TypeInfo;
+            using TypeInfo = NetworkCommissioning::Attributes::ConnectMaxTimeSeconds::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
-            }
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeNumberOfTotalUsersSupportedWithValue:(NSNumber * _Nonnull)value
-                                         completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeLastNetworkingStatusWithValue:(NSNumber * _Nullable)value
+                                  completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -5402,17 +5394,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::NumberOfTotalUsersSupported::TypeInfo;
+            using TypeInfo = NetworkCommissioning::Attributes::LastNetworkingStatus::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeNumberOfPINUsersSupportedWithValue:(NSNumber * _Nonnull)value
-                                       completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeLastNetworkIDWithValue:(NSData * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -5421,17 +5417,22 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::NumberOfPINUsersSupported::TypeInfo;
+            using TypeInfo = NetworkCommissioning::Attributes::LastNetworkID::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = [self asByteSpan:value];
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeNumberOfRFIDUsersSupportedWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeLastConnectErrorValueWithValue:(NSNumber * _Nullable)value
+                                   completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -5440,17 +5441,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::NumberOfRFIDUsersSupported::TypeInfo;
+            using TypeInfo = NetworkCommissioning::Attributes::LastConnectErrorValue::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.intValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeNumberOfWeekDaySchedulesSupportedPerUserWithValue:(NSNumber * _Nonnull)value
-                                                      completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -5459,54 +5464,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::NumberOfWeekDaySchedulesSupportedPerUser::TypeInfo;
+            using TypeInfo = NetworkCommissioning::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeNumberOfYearDaySchedulesSupportedPerUserWithValue:(NSNumber * _Nonnull)value
-                                                      completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::NumberOfYearDaySchedulesSupportedPerUser::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeNumberOfHolidaySchedulesSupportedWithValue:(NSNumber * _Nonnull)value
-                                               completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::NumberOfHolidaySchedulesSupported::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeMaxPINCodeLengthWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -5515,16 +5503,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::MaxPINCodeLength::TypeInfo;
+            using TypeInfo = NetworkCommissioning::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeMinPINCodeLengthWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -5533,16 +5542,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::MinPINCodeLength::TypeInfo;
+            using TypeInfo = NetworkCommissioning::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeMaxRFIDCodeLengthWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -5551,16 +5581,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::MaxRFIDCodeLength::TypeInfo;
+            using TypeInfo = NetworkCommissioning::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeMinRFIDCodeLengthWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -5569,89 +5599,26 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::MinRFIDCodeLength::TypeInfo;
+            using TypeInfo = NetworkCommissioning::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeCredentialRulesSupportWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::CredentialRulesSupport::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
+@end
 
-- (void)writeAttributeNumberOfCredentialsSupportedPerUserWithValue:(NSNumber * _Nonnull)value
-                                                 completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::NumberOfCredentialsSupportedPerUser::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
+@interface CHIPTestDiagnosticLogs ()
+@property (readonly) chip::Controller::DiagnosticLogsCluster cppCluster;
+@end
 
-- (void)writeAttributeSupportedOperatingModesWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::SupportedOperatingModes::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
+@implementation CHIPTestDiagnosticLogs
 
-- (void)writeAttributeDefaultConfigurationRegisterWithValue:(NSNumber * _Nonnull)value
-                                          completionHandler:(StatusCompletion)completionHandler
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::DefaultConfigurationRegister::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    return &_cppCluster;
 }
 
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
@@ -5663,7 +5630,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = DiagnosticLogs::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -5702,7 +5669,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = DiagnosticLogs::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -5741,7 +5708,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = DiagnosticLogs::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -5780,7 +5747,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = DiagnosticLogs::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -5798,7 +5765,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = DoorLock::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = DiagnosticLogs::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -5809,36 +5776,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestElectricalMeasurement ()
-@property (readonly) chip::Controller::ElectricalMeasurementCluster cppCluster;
+@interface CHIPTestGeneralDiagnostics ()
+@property (readonly) chip::Controller::GeneralDiagnosticsCluster cppCluster;
 @end
 
-@implementation CHIPTestElectricalMeasurement
+@implementation CHIPTestGeneralDiagnostics
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeMeasurementTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::MeasurementType::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeDcVoltageWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNetworkInterfacesWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -5847,34 +5796,100 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltage::TypeInfo;
+            using TypeInfo = GeneralDiagnostics::Attributes::NetworkInterfaces::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeDcVoltageMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageMin::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[CHIPGeneralDiagnosticsClusterNetworkInterfaceType class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (CHIPGeneralDiagnosticsClusterNetworkInterfaceType *) value[i_0];
+                        listHolder_0->mList[i_0].name = [self asCharSpan:element_0.name];
+                        listHolder_0->mList[i_0].isOperational = element_0.isOperational.boolValue;
+                        if (element_0.offPremiseServicesReachableIPv4 == nil) {
+                            listHolder_0->mList[i_0].offPremiseServicesReachableIPv4.SetNull();
+                        } else {
+                            auto & nonNullValue_2 = listHolder_0->mList[i_0].offPremiseServicesReachableIPv4.SetNonNull();
+                            nonNullValue_2 = element_0.offPremiseServicesReachableIPv4.boolValue;
+                        }
+                        if (element_0.offPremiseServicesReachableIPv6 == nil) {
+                            listHolder_0->mList[i_0].offPremiseServicesReachableIPv6.SetNull();
+                        } else {
+                            auto & nonNullValue_2 = listHolder_0->mList[i_0].offPremiseServicesReachableIPv6.SetNonNull();
+                            nonNullValue_2 = element_0.offPremiseServicesReachableIPv6.boolValue;
+                        }
+                        listHolder_0->mList[i_0].hardwareAddress = [self asByteSpan:element_0.hardwareAddress];
+                        {
+                            using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].IPv4Addresses)>;
+                            using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
+                            if (element_0.iPv4Addresses.count != 0) {
+                                auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.iPv4Addresses.count);
+                                if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
+                                    return CHIP_ERROR_INVALID_ARGUMENT;
+                                }
+                                listFreer.add(listHolder_2);
+                                for (size_t i_2 = 0; i_2 < element_0.iPv4Addresses.count; ++i_2) {
+                                    if (![element_0.iPv4Addresses[i_2] isKindOfClass:[NSData class]]) {
+                                        // Wrong kind of value.
+                                        return CHIP_ERROR_INVALID_ARGUMENT;
+                                    }
+                                    auto element_2 = (NSData *) element_0.iPv4Addresses[i_2];
+                                    listHolder_2->mList[i_2] = [self asByteSpan:element_2];
+                                }
+                                listHolder_0->mList[i_0].IPv4Addresses
+                                    = ListType_2(listHolder_2->mList, element_0.iPv4Addresses.count);
+                            } else {
+                                listHolder_0->mList[i_0].IPv4Addresses = ListType_2();
+                            }
+                        }
+                        {
+                            using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].IPv6Addresses)>;
+                            using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
+                            if (element_0.iPv6Addresses.count != 0) {
+                                auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.iPv6Addresses.count);
+                                if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
+                                    return CHIP_ERROR_INVALID_ARGUMENT;
+                                }
+                                listFreer.add(listHolder_2);
+                                for (size_t i_2 = 0; i_2 < element_0.iPv6Addresses.count; ++i_2) {
+                                    if (![element_0.iPv6Addresses[i_2] isKindOfClass:[NSData class]]) {
+                                        // Wrong kind of value.
+                                        return CHIP_ERROR_INVALID_ARGUMENT;
+                                    }
+                                    auto element_2 = (NSData *) element_0.iPv6Addresses[i_2];
+                                    listHolder_2->mList[i_2] = [self asByteSpan:element_2];
+                                }
+                                listHolder_0->mList[i_0].IPv6Addresses
+                                    = ListType_2(listHolder_2->mList, element_0.iPv6Addresses.count);
+                            } else {
+                                listHolder_0->mList[i_0].IPv6Addresses = ListType_2();
+                            }
+                        }
+                        listHolder_0->mList[i_0].type
+                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].type)>>(
+                                element_0.type.unsignedCharValue);
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeDcVoltageMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRebootCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -5883,16 +5898,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageMax::TypeInfo;
+            using TypeInfo = GeneralDiagnostics::Attributes::RebootCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeDcCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeUpTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -5901,16 +5916,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrent::TypeInfo;
+            using TypeInfo = GeneralDiagnostics::Attributes::UpTime::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedLongLongValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeDcCurrentMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTotalOperationalHoursWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -5919,16 +5935,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentMin::TypeInfo;
+            using TypeInfo = GeneralDiagnostics::Attributes::TotalOperationalHours::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeDcCurrentMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBootReasonsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -5937,16 +5953,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentMax::TypeInfo;
+            using TypeInfo = GeneralDiagnostics::Attributes::BootReasons::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeDcPowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeActiveHardwareFaultsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -5955,16 +5971,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcPower::TypeInfo;
+            using TypeInfo = GeneralDiagnostics::Attributes::ActiveHardwareFaults::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedCharValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeDcPowerMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeActiveRadioFaultsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -5973,16 +6010,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcPowerMin::TypeInfo;
+            using TypeInfo = GeneralDiagnostics::Attributes::ActiveRadioFaults::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedCharValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeDcPowerMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeActiveNetworkFaultsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -5991,16 +6049,38 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcPowerMax::TypeInfo;
+            using TypeInfo = GeneralDiagnostics::Attributes::ActiveNetworkFaults::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedCharValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeDcVoltageMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTestEventTriggersEnabledWithValue:(NSNumber * _Nonnull)value
+                                      completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6009,16 +6089,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageMultiplier::TypeInfo;
+            using TypeInfo = GeneralDiagnostics::Attributes::TestEventTriggersEnabled::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.boolValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeDcVoltageDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6027,16 +6107,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageDivisor::TypeInfo;
+            using TypeInfo = GeneralDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeDcCurrentMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6045,16 +6146,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentMultiplier::TypeInfo;
+            using TypeInfo = GeneralDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeDcCurrentDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6063,16 +6185,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentDivisor::TypeInfo;
+            using TypeInfo = GeneralDiagnostics::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeDcPowerMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6081,16 +6224,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcPowerMultiplier::TypeInfo;
+            using TypeInfo = GeneralDiagnostics::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeDcPowerDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6099,7 +6242,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::DcPowerDivisor::TypeInfo;
+            using TypeInfo = GeneralDiagnostics::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -6108,7 +6251,20 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeAcFrequencyWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+@end
+
+@interface CHIPTestSoftwareDiagnostics ()
+@property (readonly) chip::Controller::SoftwareDiagnosticsCluster cppCluster;
+@end
+
+@implementation CHIPTestSoftwareDiagnostics
+
+- (chip::Controller::ClusterBase *)getCluster
+{
+    return &_cppCluster;
+}
+
+- (void)writeAttributeThreadMetricsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6117,16 +6273,53 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequency::TypeInfo;
+            using TypeInfo = SoftwareDiagnostics::Attributes::ThreadMetrics::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[CHIPSoftwareDiagnosticsClusterThreadMetrics class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (CHIPSoftwareDiagnosticsClusterThreadMetrics *) value[i_0];
+                        listHolder_0->mList[i_0].id = element_0.id.unsignedLongLongValue;
+                        if (element_0.name != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].name.Emplace();
+                            definedValue_2 = [self asCharSpan:element_0.name];
+                        }
+                        if (element_0.stackFreeCurrent != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].stackFreeCurrent.Emplace();
+                            definedValue_2 = element_0.stackFreeCurrent.unsignedIntValue;
+                        }
+                        if (element_0.stackFreeMinimum != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].stackFreeMinimum.Emplace();
+                            definedValue_2 = element_0.stackFreeMinimum.unsignedIntValue;
+                        }
+                        if (element_0.stackSize != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].stackSize.Emplace();
+                            definedValue_2 = element_0.stackSize.unsignedIntValue;
+                        }
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcFrequencyMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentHeapFreeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6135,16 +6328,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyMin::TypeInfo;
+            using TypeInfo = SoftwareDiagnostics::Attributes::CurrentHeapFree::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedLongLongValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcFrequencyMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentHeapUsedWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6153,16 +6346,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyMax::TypeInfo;
+            using TypeInfo = SoftwareDiagnostics::Attributes::CurrentHeapUsed::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedLongLongValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeNeutralCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentHeapHighWatermarkWithValue:(NSNumber * _Nonnull)value
+                                      completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6171,16 +6365,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::NeutralCurrent::TypeInfo;
+            using TypeInfo = SoftwareDiagnostics::Attributes::CurrentHeapHighWatermark::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedLongLongValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeTotalActivePowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6189,16 +6383,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::TotalActivePower::TypeInfo;
+            using TypeInfo = SoftwareDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.intValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeTotalReactivePowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6207,16 +6422,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::TotalReactivePower::TypeInfo;
+            using TypeInfo = SoftwareDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.intValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeTotalApparentPowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6225,17 +6461,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::TotalApparentPower::TypeInfo;
+            using TypeInfo = SoftwareDiagnostics::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeMeasured1stHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6244,17 +6500,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::Measured1stHarmonicCurrent::TypeInfo;
+            using TypeInfo = SoftwareDiagnostics::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeMeasured3rdHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6263,17 +6518,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::Measured3rdHarmonicCurrent::TypeInfo;
+            using TypeInfo = SoftwareDiagnostics::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeMeasured5thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler
+@end
+
+@interface CHIPTestThreadNetworkDiagnostics ()
+@property (readonly) chip::Controller::ThreadNetworkDiagnosticsCluster cppCluster;
+@end
+
+@implementation CHIPTestThreadNetworkDiagnostics
+
+- (chip::Controller::ClusterBase *)getCluster
+{
+    return &_cppCluster;
+}
+
+- (void)writeAttributeChannelWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6282,17 +6549,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::Measured5thHarmonicCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Channel::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedShortValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeMeasured7thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRoutingRoleWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6301,17 +6572,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::Measured7thHarmonicCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RoutingRole::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeMeasured9thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNetworkNameWithValue:(NSString * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6320,17 +6595,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::Measured9thHarmonicCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::NetworkName::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = [self asCharSpan:value];
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeMeasured11thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
-                                         completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePanIdWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6339,17 +6618,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::Measured11thHarmonicCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PanId::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedShortValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeMeasuredPhase1stHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
-                                             completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeExtendedPanIdWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6358,17 +6641,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase1stHarmonicCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ExtendedPanId::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedLongLongValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeMeasuredPhase3rdHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
-                                             completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMeshLocalPrefixWithValue:(NSData * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6377,17 +6664,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase3rdHarmonicCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::MeshLocalPrefix::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = [self asByteSpan:value];
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeMeasuredPhase5thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
-                                             completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOverrunCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6396,17 +6687,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase5thHarmonicCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::OverrunCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedLongLongValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeMeasuredPhase7thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
-                                             completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNeighborTableListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6415,17 +6705,60 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase7thHarmonicCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::NeighborTableList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[CHIPThreadNetworkDiagnosticsClusterNeighborTable class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (CHIPThreadNetworkDiagnosticsClusterNeighborTable *) value[i_0];
+                        listHolder_0->mList[i_0].extAddress = element_0.extAddress.unsignedLongLongValue;
+                        listHolder_0->mList[i_0].age = element_0.age.unsignedIntValue;
+                        listHolder_0->mList[i_0].rloc16 = element_0.rloc16.unsignedShortValue;
+                        listHolder_0->mList[i_0].linkFrameCounter = element_0.linkFrameCounter.unsignedIntValue;
+                        listHolder_0->mList[i_0].mleFrameCounter = element_0.mleFrameCounter.unsignedIntValue;
+                        listHolder_0->mList[i_0].lqi = element_0.lqi.unsignedCharValue;
+                        if (element_0.averageRssi == nil) {
+                            listHolder_0->mList[i_0].averageRssi.SetNull();
+                        } else {
+                            auto & nonNullValue_2 = listHolder_0->mList[i_0].averageRssi.SetNonNull();
+                            nonNullValue_2 = element_0.averageRssi.charValue;
+                        }
+                        if (element_0.lastRssi == nil) {
+                            listHolder_0->mList[i_0].lastRssi.SetNull();
+                        } else {
+                            auto & nonNullValue_2 = listHolder_0->mList[i_0].lastRssi.SetNonNull();
+                            nonNullValue_2 = element_0.lastRssi.charValue;
+                        }
+                        listHolder_0->mList[i_0].frameErrorRate = element_0.frameErrorRate.unsignedCharValue;
+                        listHolder_0->mList[i_0].messageErrorRate = element_0.messageErrorRate.unsignedCharValue;
+                        listHolder_0->mList[i_0].rxOnWhenIdle = element_0.rxOnWhenIdle.boolValue;
+                        listHolder_0->mList[i_0].fullThreadDevice = element_0.fullThreadDevice.boolValue;
+                        listHolder_0->mList[i_0].fullNetworkData = element_0.fullNetworkData.boolValue;
+                        listHolder_0->mList[i_0].isChild = element_0.isChild.boolValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeMeasuredPhase9thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
-                                             completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRouteTableListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6434,17 +6767,46 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase9thHarmonicCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RouteTableList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[CHIPThreadNetworkDiagnosticsClusterRouteTable class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (CHIPThreadNetworkDiagnosticsClusterRouteTable *) value[i_0];
+                        listHolder_0->mList[i_0].extAddress = element_0.extAddress.unsignedLongLongValue;
+                        listHolder_0->mList[i_0].rloc16 = element_0.rloc16.unsignedShortValue;
+                        listHolder_0->mList[i_0].routerId = element_0.routerId.unsignedCharValue;
+                        listHolder_0->mList[i_0].nextHop = element_0.nextHop.unsignedCharValue;
+                        listHolder_0->mList[i_0].pathCost = element_0.pathCost.unsignedCharValue;
+                        listHolder_0->mList[i_0].LQIIn = element_0.lqiIn.unsignedCharValue;
+                        listHolder_0->mList[i_0].LQIOut = element_0.lqiOut.unsignedCharValue;
+                        listHolder_0->mList[i_0].age = element_0.age.unsignedCharValue;
+                        listHolder_0->mList[i_0].allocated = element_0.allocated.boolValue;
+                        listHolder_0->mList[i_0].linkEstablished = element_0.linkEstablished.boolValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeMeasuredPhase11thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
-                                              completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePartitionIdWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6453,17 +6815,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase11thHarmonicCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PartitionId::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedIntValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcFrequencyMultiplierWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeWeightingWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6472,16 +6838,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyMultiplier::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Weighting::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcFrequencyDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDataVersionWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6490,16 +6861,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyDivisor::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::DataVersion::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePowerMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeStableDataVersionWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6508,16 +6884,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::PowerMultiplier::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::StableDataVersion::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePowerDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeLeaderRouterIdWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6526,17 +6907,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::PowerDivisor::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::LeaderRouterId::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeHarmonicCurrentMultiplierWithValue:(NSNumber * _Nonnull)value
-                                       completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDetachedRoleCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6545,17 +6930,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::HarmonicCurrentMultiplier::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::DetachedRoleCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.charValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePhaseHarmonicCurrentMultiplierWithValue:(NSNumber * _Nonnull)value
-                                            completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeChildRoleCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6564,16 +6948,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::PhaseHarmonicCurrentMultiplier::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChildRoleCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.charValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeInstantaneousVoltageWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRouterRoleCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6582,17 +6966,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousVoltage::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RouterRoleCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeInstantaneousLineCurrentWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeLeaderRoleCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6601,7 +6984,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousLineCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::LeaderRoleCount::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -6610,8 +6993,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeInstantaneousActiveCurrentWithValue:(NSNumber * _Nonnull)value
-                                        completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAttachAttemptCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6620,17 +7002,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousActiveCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::AttachAttemptCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeInstantaneousReactiveCurrentWithValue:(NSNumber * _Nonnull)value
-                                          completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePartitionIdChangeCountWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6639,16 +7021,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousReactiveCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PartitionIdChangeCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeInstantaneousPowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBetterPartitionAttachAttemptCountWithValue:(NSNumber * _Nonnull)value
+                                               completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6657,16 +7040,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousPower::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::BetterPartitionAttachAttemptCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsVoltageWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeParentChangeCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6675,7 +7058,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltage::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ParentChangeCount::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -6684,7 +7067,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeRmsVoltageMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTxTotalCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6693,16 +7076,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMin::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxTotalCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsVoltageMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTxUnicastCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6711,16 +7094,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMax::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxUnicastCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTxBroadcastCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6729,16 +7112,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrent::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxBroadcastCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsCurrentMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTxAckRequestedCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6747,16 +7130,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMin::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxAckRequestedCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsCurrentMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTxAckedCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6765,16 +7148,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMax::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxAckedCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeActivePowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTxNoAckRequestedCountWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6783,16 +7167,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePower::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxNoAckRequestedCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeActivePowerMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTxDataCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6801,16 +7185,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMin::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxDataCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeActivePowerMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTxDataPollCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6819,16 +7203,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMax::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxDataPollCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeReactivePowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTxBeaconCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6837,16 +7221,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::ReactivePower::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxBeaconCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeApparentPowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTxBeaconRequestCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6855,16 +7239,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::ApparentPower::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxBeaconRequestCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePowerFactorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTxOtherCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6873,16 +7257,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::PowerFactor::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxOtherCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.charValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcVoltageMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTxRetryCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6891,16 +7275,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcVoltageMultiplier::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxRetryCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcVoltageDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTxDirectMaxRetryExpiryCountWithValue:(NSNumber * _Nonnull)value
+                                         completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6909,16 +7294,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcVoltageDivisor::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxDirectMaxRetryExpiryCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcCurrentMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTxIndirectMaxRetryExpiryCountWithValue:(NSNumber * _Nonnull)value
+                                           completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6927,16 +7313,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcCurrentMultiplier::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxIndirectMaxRetryExpiryCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcCurrentDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTxErrCcaCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6945,16 +7331,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcCurrentDivisor::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxErrCcaCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcPowerMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTxErrAbortCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6963,16 +7349,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcPowerMultiplier::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxErrAbortCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcPowerDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTxErrBusyChannelCountWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6981,16 +7368,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcPowerDivisor::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxErrBusyChannelCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeVoltageOverloadWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRxTotalCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -6999,16 +7386,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::VoltageOverload::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxTotalCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeCurrentOverloadWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRxUnicastCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7017,16 +7404,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::CurrentOverload::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxUnicastCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcVoltageOverloadWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRxBroadcastCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7035,16 +7422,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcVoltageOverload::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxBroadcastCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcCurrentOverloadWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRxDataCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7053,17 +7440,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcCurrentOverload::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDataCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcActivePowerOverloadWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRxDataPollCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7072,17 +7458,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcActivePowerOverload::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDataPollCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcReactivePowerOverloadWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRxBeaconCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7091,17 +7476,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcReactivePowerOverload::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxBeaconCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAverageRmsOverVoltageWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRxBeaconRequestCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7110,17 +7494,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsOverVoltage::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxBeaconRequestCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAverageRmsUnderVoltageWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRxOtherCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7129,17 +7512,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltage::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxOtherCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsExtremeOverVoltageWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRxAddressFilteredCountWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7148,17 +7531,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltage::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxAddressFilteredCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsExtremeUnderVoltageWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRxDestAddrFilteredCountWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7167,16 +7550,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltage::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDestAddrFilteredCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsVoltageSagWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRxDuplicatedCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7185,16 +7568,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSag::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDuplicatedCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsVoltageSwellWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRxErrNoFrameCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7203,16 +7586,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwell::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrNoFrameCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeLineCurrentPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRxErrUnknownNeighborCountWithValue:(NSNumber * _Nonnull)value
+                                       completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7221,16 +7605,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::LineCurrentPhaseB::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrUnknownNeighborCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeActiveCurrentPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRxErrInvalidSrcAddrCountWithValue:(NSNumber * _Nonnull)value
+                                      completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7239,17 +7624,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::ActiveCurrentPhaseB::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrInvalidSrcAddrCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeReactiveCurrentPhaseBWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRxErrSecCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7258,16 +7642,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::ReactiveCurrentPhaseB::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrSecCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsVoltagePhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRxErrFcsCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7276,16 +7660,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltagePhaseB::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrFcsCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsVoltageMinPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRxErrOtherCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7294,16 +7678,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMinPhaseB::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrOtherCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsVoltageMaxPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeActiveTimestampWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7312,16 +7696,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMaxPhaseB::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedLongLongValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsCurrentPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePendingTimestampWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7330,16 +7719,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentPhaseB::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PendingTimestamp::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedLongLongValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsCurrentMinPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDelayWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7348,16 +7742,22 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMinPhaseB::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Delay::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedIntValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsCurrentMaxPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSecurityPolicyWithValue:(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable)value
+                            completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7366,16 +7766,22 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMaxPhaseB::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::SecurityPolicy::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0.rotationTime = value.rotationTime.unsignedShortValue;
+                nonNullValue_0.flags = value.flags.unsignedShortValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeActivePowerPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeChannelMaskWithValue:(NSData * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7384,16 +7790,23 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerPhaseB::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChannelMask::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = [self asByteSpan:value];
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
 
-- (void)writeAttributeActivePowerMinPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOperationalDatasetComponentsWithValue:
+            (CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable)value
+                                          completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7402,16 +7815,33 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMinPhaseB::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0.activeTimestampPresent = value.activeTimestampPresent.boolValue;
+                nonNullValue_0.pendingTimestampPresent = value.pendingTimestampPresent.boolValue;
+                nonNullValue_0.masterKeyPresent = value.masterKeyPresent.boolValue;
+                nonNullValue_0.networkNamePresent = value.networkNamePresent.boolValue;
+                nonNullValue_0.extendedPanIdPresent = value.extendedPanIdPresent.boolValue;
+                nonNullValue_0.meshLocalPrefixPresent = value.meshLocalPrefixPresent.boolValue;
+                nonNullValue_0.delayPresent = value.delayPresent.boolValue;
+                nonNullValue_0.panIdPresent = value.panIdPresent.boolValue;
+                nonNullValue_0.channelPresent = value.channelPresent.boolValue;
+                nonNullValue_0.pskcPresent = value.pskcPresent.boolValue;
+                nonNullValue_0.securityPolicyPresent = value.securityPolicyPresent.boolValue;
+                nonNullValue_0.channelMaskPresent = value.channelMaskPresent.boolValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeActivePowerMaxPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeActiveNetworkFaultsListWithValue:(NSArray * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7420,16 +7850,38 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMaxPhaseB::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0]
+                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0])>>(element_0.unsignedCharValue);
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeReactivePowerPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7438,16 +7890,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::ReactivePowerPhaseB::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeApparentPowerPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7456,16 +7929,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::ApparentPowerPhaseB::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePowerFactorPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7474,17 +7968,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::PowerFactorPhaseB::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.charValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAverageRmsVoltageMeasurementPeriodPhaseBWithValue:(NSNumber * _Nonnull)value
-                                                      completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7493,17 +8007,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriodPhaseB::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAverageRmsOverVoltageCounterPhaseBWithValue:(NSNumber * _Nonnull)value
-                                                completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7512,7 +8025,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsOverVoltageCounterPhaseB::TypeInfo;
+            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -7521,8 +8034,20 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeAverageRmsUnderVoltageCounterPhaseBWithValue:(NSNumber * _Nonnull)value
-                                                 completionHandler:(StatusCompletion)completionHandler
+@end
+
+@interface CHIPTestWiFiNetworkDiagnostics ()
+@property (readonly) chip::Controller::WiFiNetworkDiagnosticsCluster cppCluster;
+@end
+
+@implementation CHIPTestWiFiNetworkDiagnostics
+
+- (chip::Controller::ClusterBase *)getCluster
+{
+    return &_cppCluster;
+}
+
+- (void)writeAttributeBssidWithValue:(NSData * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7531,17 +8056,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounterPhaseB::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::Bssid::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = [self asByteSpan:value];
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsExtremeOverVoltagePeriodPhaseBWithValue:(NSNumber * _Nonnull)value
-                                               completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSecurityTypeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7550,17 +8079,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriodPhaseB::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::SecurityType::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsExtremeUnderVoltagePeriodPhaseBWithValue:(NSNumber * _Nonnull)value
-                                                completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeWiFiVersionWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7569,17 +8102,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriodPhaseB::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::WiFiVersion::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsVoltageSagPeriodPhaseBWithValue:(NSNumber * _Nonnull)value
-                                       completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeChannelNumberWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7588,17 +8125,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSagPeriodPhaseB::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::ChannelNumber::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedShortValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsVoltageSwellPeriodPhaseBWithValue:(NSNumber * _Nonnull)value
-                                         completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRssiWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7607,16 +8148,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriodPhaseB::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::Rssi::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.charValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeLineCurrentPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBeaconLostCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7625,16 +8171,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::LineCurrentPhaseC::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::BeaconLostCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeActiveCurrentPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBeaconRxCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7643,17 +8189,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::ActiveCurrentPhaseC::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::BeaconRxCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeReactiveCurrentPhaseCWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePacketMulticastRxCountWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7662,16 +8208,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::ReactiveCurrentPhaseC::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketMulticastRxCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsVoltagePhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePacketMulticastTxCountWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7680,16 +8227,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltagePhaseC::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketMulticastTxCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsVoltageMinPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePacketUnicastRxCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7698,16 +8245,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMinPhaseC::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketUnicastRxCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsVoltageMaxPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePacketUnicastTxCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7716,16 +8263,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMaxPhaseC::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketUnicastTxCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsCurrentPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentMaxRateWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7734,16 +8281,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentPhaseC::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::CurrentMaxRate::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedLongLongValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsCurrentMinPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOverrunCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7752,16 +8299,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMinPhaseC::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::OverrunCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedLongLongValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsCurrentMaxPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7770,16 +8317,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMaxPhaseC::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeActivePowerPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7788,16 +8356,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerPhaseC::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeActivePowerMinPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7806,16 +8395,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMinPhaseC::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeActivePowerMaxPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7824,16 +8434,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMaxPhaseC::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeReactivePowerPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7842,16 +8452,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::ReactivePowerPhaseC::TypeInfo;
+            using TypeInfo = WiFiNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeApparentPowerPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+@end
+
+@interface CHIPTestEthernetNetworkDiagnostics ()
+@property (readonly) chip::Controller::EthernetNetworkDiagnosticsCluster cppCluster;
+@end
+
+@implementation CHIPTestEthernetNetworkDiagnostics
+
+- (chip::Controller::ClusterBase *)getCluster
+{
+    return &_cppCluster;
+}
+
+- (void)writeAttributePHYRateWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7860,16 +8483,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::ApparentPowerPhaseC::TypeInfo;
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::PHYRate::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePowerFactorPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeFullDuplexWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7878,17 +8506,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::PowerFactorPhaseC::TypeInfo;
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::FullDuplex::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.charValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.boolValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAverageRmsVoltageMeasurementPeriodPhaseCWithValue:(NSNumber * _Nonnull)value
-                                                      completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePacketRxCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7897,17 +8529,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriodPhaseC::TypeInfo;
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::PacketRxCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedLongLongValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAverageRmsOverVoltageCounterPhaseCWithValue:(NSNumber * _Nonnull)value
-                                                completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePacketTxCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7916,17 +8547,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsOverVoltageCounterPhaseC::TypeInfo;
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::PacketTxCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedLongLongValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAverageRmsUnderVoltageCounterPhaseCWithValue:(NSNumber * _Nonnull)value
-                                                 completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTxErrCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7935,17 +8565,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounterPhaseC::TypeInfo;
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::TxErrCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedLongLongValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsExtremeOverVoltagePeriodPhaseCWithValue:(NSNumber * _Nonnull)value
-                                               completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCollisionCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7954,17 +8583,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriodPhaseC::TypeInfo;
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::CollisionCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedLongLongValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsExtremeUnderVoltagePeriodPhaseCWithValue:(NSNumber * _Nonnull)value
-                                                completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOverrunCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7973,17 +8601,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriodPhaseC::TypeInfo;
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::OverrunCount::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedLongLongValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsVoltageSagPeriodPhaseCWithValue:(NSNumber * _Nonnull)value
-                                       completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCarrierDetectWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -7992,17 +8619,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSagPeriodPhaseC::TypeInfo;
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::CarrierDetect::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.boolValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRmsVoltageSwellPeriodPhaseCWithValue:(NSNumber * _Nonnull)value
-                                         completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTimeSinceResetWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -8011,9 +8642,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriodPhaseC::TypeInfo;
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::TimeSinceReset::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedLongLongValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -8029,7 +8660,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -8068,7 +8699,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -8107,7 +8738,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -8146,7 +8777,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -8164,7 +8795,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ElectricalMeasurement::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = EthernetNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -8175,18 +8806,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestEthernetNetworkDiagnostics ()
-@property (readonly) chip::Controller::EthernetNetworkDiagnosticsCluster cppCluster;
+@interface CHIPTestBridgedDeviceBasic ()
+@property (readonly) chip::Controller::BridgedDeviceBasicCluster cppCluster;
 @end
 
-@implementation CHIPTestEthernetNetworkDiagnostics
+@implementation CHIPTestBridgedDeviceBasic
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributePHYRateWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeVendorNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -8195,21 +8826,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::PHYRate::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::VendorName::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
-            }
+            cppValue = [self asCharSpan:value];
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeFullDuplexWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeVendorIDWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -8218,21 +8844,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::FullDuplex::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::VendorID::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.boolValue;
-            }
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePacketRxCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeProductNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -8241,16 +8862,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::PacketRxCount::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::ProductName::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
+            cppValue = [self asCharSpan:value];
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePacketTxCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeHardwareVersionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -8259,16 +8880,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::PacketTxCount::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::HardwareVersion::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeTxErrCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeHardwareVersionStringWithValue:(NSString * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -8277,16 +8899,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::TxErrCount::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::HardwareVersionString::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
+            cppValue = [self asCharSpan:value];
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeCollisionCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSoftwareVersionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -8295,16 +8917,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::CollisionCount::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::SoftwareVersion::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeOverrunCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSoftwareVersionStringWithValue:(NSString * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -8313,16 +8936,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::OverrunCount::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::SoftwareVersionString::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
+            cppValue = [self asCharSpan:value];
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeCarrierDetectWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeManufacturingDateWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -8331,21 +8954,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::CarrierDetect::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::ManufacturingDate::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.boolValue;
-            }
+            cppValue = [self asCharSpan:value];
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeTimeSinceResetWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePartNumberWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -8354,9 +8972,99 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::TimeSinceReset::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::PartNumber::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
+            cppValue = [self asCharSpan:value];
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeProductURLWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = BridgedDeviceBasic::Attributes::ProductURL::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = [self asCharSpan:value];
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeProductLabelWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = BridgedDeviceBasic::Attributes::ProductLabel::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = [self asCharSpan:value];
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeSerialNumberWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = BridgedDeviceBasic::Attributes::SerialNumber::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = [self asCharSpan:value];
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeReachableWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = BridgedDeviceBasic::Attributes::Reachable::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.boolValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeUniqueIDWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = BridgedDeviceBasic::Attributes::UniqueID::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = [self asCharSpan:value];
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -8372,7 +9080,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -8411,7 +9119,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -8450,7 +9158,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -8489,7 +9197,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -8507,7 +9215,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = EthernetNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = BridgedDeviceBasic::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -8518,54 +9226,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestFanControl ()
-@property (readonly) chip::Controller::FanControlCluster cppCluster;
+@interface CHIPTestSwitch ()
+@property (readonly) chip::Controller::SwitchCluster cppCluster;
 @end
 
-@implementation CHIPTestFanControl
+@implementation CHIPTestSwitch
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributePercentCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = FanControl::Attributes::PercentCurrent::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeSpeedMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = FanControl::Attributes::SpeedMax::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeSpeedCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNumberOfPositionsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -8574,7 +9246,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = FanControl::Attributes::SpeedCurrent::TypeInfo;
+            using TypeInfo = Switch::Attributes::NumberOfPositions::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -8583,7 +9255,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeRockSupportWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentPositionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -8592,7 +9264,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = FanControl::Attributes::RockSupport::TypeInfo;
+            using TypeInfo = Switch::Attributes::CurrentPosition::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -8601,7 +9273,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeWindSupportWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMultiPressMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -8610,7 +9282,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = FanControl::Attributes::WindSupport::TypeInfo;
+            using TypeInfo = Switch::Attributes::MultiPressMax::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -8628,7 +9300,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = FanControl::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = Switch::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -8667,7 +9339,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = FanControl::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = Switch::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -8706,7 +9378,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = FanControl::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = Switch::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -8745,7 +9417,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = FanControl::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Switch::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -8763,7 +9435,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = FanControl::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Switch::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -8774,18 +9446,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestFixedLabel ()
-@property (readonly) chip::Controller::FixedLabelCluster cppCluster;
+@interface CHIPTestAdministratorCommissioning ()
+@property (readonly) chip::Controller::AdministratorCommissioningCluster cppCluster;
 @end
 
-@implementation CHIPTestFixedLabel
+@implementation CHIPTestAdministratorCommissioning
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeLabelListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeWindowStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -8794,38 +9466,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = FixedLabel::Attributes::LabelList::TypeInfo;
+            using TypeInfo = AdministratorCommissioning::Attributes::WindowStatus::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPFixedLabelClusterLabelStruct class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (CHIPFixedLabelClusterLabelStruct *) value[i_0];
-                        listHolder_0->mList[i_0].label = [self asCharSpan:element_0.label];
-                        listHolder_0->mList[i_0].value = [self asCharSpan:element_0.value];
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAdminFabricIndexWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -8834,24 +9484,60 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = FixedLabel::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = AdministratorCommissioning::Attributes::AdminFabricIndex::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeAdminVendorIdWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = AdministratorCommissioning::Attributes::AdminVendorId::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = AdministratorCommissioning::Attributes::GeneratedCommandList::TypeInfo;
+            TypeInfo::Type cppValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
                     }
                     cppValue = ListType_0(listHolder_0->mList, value.count);
                 } else {
@@ -8873,7 +9559,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = FixedLabel::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = AdministratorCommissioning::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -8912,7 +9598,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = FixedLabel::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = AdministratorCommissioning::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -8951,7 +9637,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = FixedLabel::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = AdministratorCommissioning::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -8969,7 +9655,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = FixedLabel::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = AdministratorCommissioning::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -8980,18 +9666,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestFlowMeasurement ()
-@property (readonly) chip::Controller::FlowMeasurementCluster cppCluster;
+@interface CHIPTestOperationalCredentials ()
+@property (readonly) chip::Controller::OperationalCredentialsCluster cppCluster;
 @end
 
-@implementation CHIPTestFlowMeasurement
+@implementation CHIPTestOperationalCredentials
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNOCsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -9000,13 +9686,36 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = FlowMeasurement::Attributes::MeasuredValue::TypeInfo;
+            using TypeInfo = OperationalCredentials::Attributes::NOCs::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[CHIPOperationalCredentialsClusterNOCStruct class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (CHIPOperationalCredentialsClusterNOCStruct *) value[i_0];
+                        listHolder_0->mList[i_0].noc = [self asByteSpan:element_0.noc];
+                        if (element_0.icac == nil) {
+                            listHolder_0->mList[i_0].icac.SetNull();
+                        } else {
+                            auto & nonNullValue_2 = listHolder_0->mList[i_0].icac.SetNonNull();
+                            nonNullValue_2 = [self asByteSpan:element_0.icac];
+                        }
+                        listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -9014,7 +9723,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeMinMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeFabricsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -9023,13 +9732,36 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = FlowMeasurement::Attributes::MinMeasuredValue::TypeInfo;
+            using TypeInfo = OperationalCredentials::Attributes::Fabrics::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[CHIPOperationalCredentialsClusterFabricDescriptor class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (CHIPOperationalCredentialsClusterFabricDescriptor *) value[i_0];
+                        listHolder_0->mList[i_0].rootPublicKey = [self asByteSpan:element_0.rootPublicKey];
+                        listHolder_0->mList[i_0].vendorId
+                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].vendorId)>>(
+                                element_0.vendorId.unsignedShortValue);
+                        listHolder_0->mList[i_0].fabricId = element_0.fabricId.unsignedLongLongValue;
+                        listHolder_0->mList[i_0].nodeId = element_0.nodeId.unsignedLongLongValue;
+                        listHolder_0->mList[i_0].label = [self asCharSpan:element_0.label];
+                        listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -9037,7 +9769,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeMaxMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSupportedFabricsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -9046,13 +9778,66 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = FlowMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
+            using TypeInfo = OperationalCredentials::Attributes::SupportedFabrics::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeCommissionedFabricsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = OperationalCredentials::Attributes::CommissionedFabrics::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeTrustedRootCertificatesWithValue:(NSArray * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = OperationalCredentials::Attributes::TrustedRootCertificates::TypeInfo;
+            TypeInfo::Type cppValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSData class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSData *) value[i_0];
+                        listHolder_0->mList[i_0] = [self asByteSpan:element_0];
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -9060,7 +9845,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeToleranceWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentFabricIndexWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -9069,9 +9854,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = FlowMeasurement::Attributes::Tolerance::TypeInfo;
+            using TypeInfo = OperationalCredentials::Attributes::CurrentFabricIndex::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -9087,7 +9872,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = FlowMeasurement::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = OperationalCredentials::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -9126,7 +9911,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = FlowMeasurement::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = OperationalCredentials::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -9165,7 +9950,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = FlowMeasurement::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = OperationalCredentials::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -9204,7 +9989,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = FlowMeasurement::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = OperationalCredentials::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -9222,7 +10007,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = FlowMeasurement::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = OperationalCredentials::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -9233,38 +10018,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestGeneralCommissioning ()
-@property (readonly) chip::Controller::GeneralCommissioningCluster cppCluster;
+@interface CHIPTestGroupKeyManagement ()
+@property (readonly) chip::Controller::GroupKeyManagementCluster cppCluster;
 @end
 
-@implementation CHIPTestGeneralCommissioning
+@implementation CHIPTestGroupKeyManagement
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeBasicCommissioningInfoWithValue:(CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = GeneralCommissioning::Attributes::BasicCommissioningInfo::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue.failSafeExpiryLengthSeconds = value.failSafeExpiryLengthSeconds.unsignedShortValue;
-            cppValue.maxCumulativeFailsafeSeconds = value.maxCumulativeFailsafeSeconds.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeRegulatoryConfigWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeGroupTableWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -9273,16 +10038,64 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GeneralCommissioning::Attributes::RegulatoryConfig::TypeInfo;
+            using TypeInfo = GroupKeyManagement::Attributes::GroupTable::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[CHIPGroupKeyManagementClusterGroupInfoMapStruct class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (CHIPGroupKeyManagementClusterGroupInfoMapStruct *) value[i_0];
+                        listHolder_0->mList[i_0].groupId = element_0.groupId.unsignedShortValue;
+                        {
+                            using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].endpoints)>;
+                            using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
+                            if (element_0.endpoints.count != 0) {
+                                auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.endpoints.count);
+                                if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
+                                    return CHIP_ERROR_INVALID_ARGUMENT;
+                                }
+                                listFreer.add(listHolder_2);
+                                for (size_t i_2 = 0; i_2 < element_0.endpoints.count; ++i_2) {
+                                    if (![element_0.endpoints[i_2] isKindOfClass:[NSNumber class]]) {
+                                        // Wrong kind of value.
+                                        return CHIP_ERROR_INVALID_ARGUMENT;
+                                    }
+                                    auto element_2 = (NSNumber *) element_0.endpoints[i_2];
+                                    listHolder_2->mList[i_2] = element_2.unsignedShortValue;
+                                }
+                                listHolder_0->mList[i_0].endpoints = ListType_2(listHolder_2->mList, element_0.endpoints.count);
+                            } else {
+                                listHolder_0->mList[i_0].endpoints = ListType_2();
+                            }
+                        }
+                        if (element_0.groupName != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].groupName.Emplace();
+                            definedValue_2 = [self asCharSpan:element_0.groupName];
+                        }
+                        listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeLocationCapabilityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMaxGroupsPerFabricWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -9291,17 +10104,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GeneralCommissioning::Attributes::LocationCapability::TypeInfo;
+            using TypeInfo = GroupKeyManagement::Attributes::MaxGroupsPerFabric::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeSupportsConcurrentConnectionWithValue:(NSNumber * _Nonnull)value
-                                          completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMaxGroupKeysPerFabricWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -9310,9 +10123,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GeneralCommissioning::Attributes::SupportsConcurrentConnection::TypeInfo;
+            using TypeInfo = GroupKeyManagement::Attributes::MaxGroupKeysPerFabric::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -9328,7 +10141,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GeneralCommissioning::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = GroupKeyManagement::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -9367,7 +10180,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GeneralCommissioning::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = GroupKeyManagement::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -9406,7 +10219,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GeneralCommissioning::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = GroupKeyManagement::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -9445,7 +10258,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GeneralCommissioning::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = GroupKeyManagement::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -9463,7 +10276,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GeneralCommissioning::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = GroupKeyManagement::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -9474,18 +10287,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestGeneralDiagnostics ()
-@property (readonly) chip::Controller::GeneralDiagnosticsCluster cppCluster;
+@interface CHIPTestFixedLabel ()
+@property (readonly) chip::Controller::FixedLabelCluster cppCluster;
 @end
 
-@implementation CHIPTestGeneralDiagnostics
+@implementation CHIPTestFixedLabel
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeNetworkInterfacesWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeLabelListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -9494,7 +10307,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GeneralDiagnostics::Attributes::NetworkInterfaces::TypeInfo;
+            using TypeInfo = FixedLabel::Attributes::LabelList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -9506,75 +10319,13 @@ new CHIPDefaultSuccessCallbackBridge(
                     }
                     listFreer.add(listHolder_0);
                     for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPGeneralDiagnosticsClusterNetworkInterfaceType class]]) {
+                        if (![value[i_0] isKindOfClass:[CHIPFixedLabelClusterLabelStruct class]]) {
                             // Wrong kind of value.
                             return CHIP_ERROR_INVALID_ARGUMENT;
                         }
-                        auto element_0 = (CHIPGeneralDiagnosticsClusterNetworkInterfaceType *) value[i_0];
-                        listHolder_0->mList[i_0].name = [self asCharSpan:element_0.name];
-                        listHolder_0->mList[i_0].isOperational = element_0.isOperational.boolValue;
-                        if (element_0.offPremiseServicesReachableIPv4 == nil) {
-                            listHolder_0->mList[i_0].offPremiseServicesReachableIPv4.SetNull();
-                        } else {
-                            auto & nonNullValue_2 = listHolder_0->mList[i_0].offPremiseServicesReachableIPv4.SetNonNull();
-                            nonNullValue_2 = element_0.offPremiseServicesReachableIPv4.boolValue;
-                        }
-                        if (element_0.offPremiseServicesReachableIPv6 == nil) {
-                            listHolder_0->mList[i_0].offPremiseServicesReachableIPv6.SetNull();
-                        } else {
-                            auto & nonNullValue_2 = listHolder_0->mList[i_0].offPremiseServicesReachableIPv6.SetNonNull();
-                            nonNullValue_2 = element_0.offPremiseServicesReachableIPv6.boolValue;
-                        }
-                        listHolder_0->mList[i_0].hardwareAddress = [self asByteSpan:element_0.hardwareAddress];
-                        {
-                            using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].IPv4Addresses)>;
-                            using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
-                            if (element_0.iPv4Addresses.count != 0) {
-                                auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.iPv4Addresses.count);
-                                if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
-                                    return CHIP_ERROR_INVALID_ARGUMENT;
-                                }
-                                listFreer.add(listHolder_2);
-                                for (size_t i_2 = 0; i_2 < element_0.iPv4Addresses.count; ++i_2) {
-                                    if (![element_0.iPv4Addresses[i_2] isKindOfClass:[NSData class]]) {
-                                        // Wrong kind of value.
-                                        return CHIP_ERROR_INVALID_ARGUMENT;
-                                    }
-                                    auto element_2 = (NSData *) element_0.iPv4Addresses[i_2];
-                                    listHolder_2->mList[i_2] = [self asByteSpan:element_2];
-                                }
-                                listHolder_0->mList[i_0].IPv4Addresses
-                                    = ListType_2(listHolder_2->mList, element_0.iPv4Addresses.count);
-                            } else {
-                                listHolder_0->mList[i_0].IPv4Addresses = ListType_2();
-                            }
-                        }
-                        {
-                            using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].IPv6Addresses)>;
-                            using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
-                            if (element_0.iPv6Addresses.count != 0) {
-                                auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.iPv6Addresses.count);
-                                if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
-                                    return CHIP_ERROR_INVALID_ARGUMENT;
-                                }
-                                listFreer.add(listHolder_2);
-                                for (size_t i_2 = 0; i_2 < element_0.iPv6Addresses.count; ++i_2) {
-                                    if (![element_0.iPv6Addresses[i_2] isKindOfClass:[NSData class]]) {
-                                        // Wrong kind of value.
-                                        return CHIP_ERROR_INVALID_ARGUMENT;
-                                    }
-                                    auto element_2 = (NSData *) element_0.iPv6Addresses[i_2];
-                                    listHolder_2->mList[i_2] = [self asByteSpan:element_2];
-                                }
-                                listHolder_0->mList[i_0].IPv6Addresses
-                                    = ListType_2(listHolder_2->mList, element_0.iPv6Addresses.count);
-                            } else {
-                                listHolder_0->mList[i_0].IPv6Addresses = ListType_2();
-                            }
-                        }
-                        listHolder_0->mList[i_0].type
-                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].type)>>(
-                                element_0.type.unsignedCharValue);
+                        auto element_0 = (CHIPFixedLabelClusterLabelStruct *) value[i_0];
+                        listHolder_0->mList[i_0].label = [self asCharSpan:element_0.label];
+                        listHolder_0->mList[i_0].value = [self asCharSpan:element_0.value];
                     }
                     cppValue = ListType_0(listHolder_0->mList, value.count);
                 } else {
@@ -9587,80 +10338,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeRebootCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = GeneralDiagnostics::Attributes::RebootCount::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeUpTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = GeneralDiagnostics::Attributes::UpTime::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeTotalOperationalHoursWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = GeneralDiagnostics::Attributes::TotalOperationalHours::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeBootReasonsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = GeneralDiagnostics::Attributes::BootReasons::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeActiveHardwareFaultsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -9669,7 +10347,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GeneralDiagnostics::Attributes::ActiveHardwareFaults::TypeInfo;
+            using TypeInfo = FixedLabel::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -9686,7 +10364,7 @@ new CHIPDefaultSuccessCallbackBridge(
                             return CHIP_ERROR_INVALID_ARGUMENT;
                         }
                         auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedCharValue;
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
                     }
                     cppValue = ListType_0(listHolder_0->mList, value.count);
                 } else {
@@ -9699,7 +10377,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeActiveRadioFaultsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -9708,7 +10386,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GeneralDiagnostics::Attributes::ActiveRadioFaults::TypeInfo;
+            using TypeInfo = FixedLabel::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -9725,7 +10403,7 @@ new CHIPDefaultSuccessCallbackBridge(
                             return CHIP_ERROR_INVALID_ARGUMENT;
                         }
                         auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedCharValue;
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
                     }
                     cppValue = ListType_0(listHolder_0->mList, value.count);
                 } else {
@@ -9738,7 +10416,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeActiveNetworkFaultsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -9747,7 +10425,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GeneralDiagnostics::Attributes::ActiveNetworkFaults::TypeInfo;
+            using TypeInfo = FixedLabel::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -9764,7 +10442,7 @@ new CHIPDefaultSuccessCallbackBridge(
                             return CHIP_ERROR_INVALID_ARGUMENT;
                         }
                         auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedCharValue;
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
                     }
                     cppValue = ListType_0(listHolder_0->mList, value.count);
                 } else {
@@ -9777,8 +10455,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeTestEventTriggersEnabledWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -9787,16 +10464,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GeneralDiagnostics::Attributes::TestEventTriggersEnabled::TypeInfo;
+            using TypeInfo = FixedLabel::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -9805,7 +10482,38 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GeneralDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = FixedLabel::Attributes::ClusterRevision::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+@end
+
+@interface CHIPTestUserLabel ()
+@property (readonly) chip::Controller::UserLabelCluster cppCluster;
+@end
+
+@implementation CHIPTestUserLabel
+
+- (chip::Controller::ClusterBase *)getCluster
+{
+    return &_cppCluster;
+}
+
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = UserLabel::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -9844,7 +10552,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GeneralDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = UserLabel::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -9883,7 +10591,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GeneralDiagnostics::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = UserLabel::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -9922,7 +10630,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GeneralDiagnostics::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = UserLabel::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -9940,7 +10648,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GeneralDiagnostics::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = UserLabel::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -9951,103 +10659,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestGroupKeyManagement ()
-@property (readonly) chip::Controller::GroupKeyManagementCluster cppCluster;
+@interface CHIPTestBooleanState ()
+@property (readonly) chip::Controller::BooleanStateCluster cppCluster;
 @end
 
-@implementation CHIPTestGroupKeyManagement
+@implementation CHIPTestBooleanState
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeGroupTableWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = GroupKeyManagement::Attributes::GroupTable::TypeInfo;
-            TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPGroupKeyManagementClusterGroupInfoMapStruct class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (CHIPGroupKeyManagementClusterGroupInfoMapStruct *) value[i_0];
-                        listHolder_0->mList[i_0].groupId = element_0.groupId.unsignedShortValue;
-                        {
-                            using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].endpoints)>;
-                            using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
-                            if (element_0.endpoints.count != 0) {
-                                auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.endpoints.count);
-                                if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
-                                    return CHIP_ERROR_INVALID_ARGUMENT;
-                                }
-                                listFreer.add(listHolder_2);
-                                for (size_t i_2 = 0; i_2 < element_0.endpoints.count; ++i_2) {
-                                    if (![element_0.endpoints[i_2] isKindOfClass:[NSNumber class]]) {
-                                        // Wrong kind of value.
-                                        return CHIP_ERROR_INVALID_ARGUMENT;
-                                    }
-                                    auto element_2 = (NSNumber *) element_0.endpoints[i_2];
-                                    listHolder_2->mList[i_2] = element_2.unsignedShortValue;
-                                }
-                                listHolder_0->mList[i_0].endpoints = ListType_2(listHolder_2->mList, element_0.endpoints.count);
-                            } else {
-                                listHolder_0->mList[i_0].endpoints = ListType_2();
-                            }
-                        }
-                        if (element_0.groupName != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].groupName.Emplace();
-                            definedValue_2 = [self asCharSpan:element_0.groupName];
-                        }
-                        listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeMaxGroupsPerFabricWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = GroupKeyManagement::Attributes::MaxGroupsPerFabric::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeMaxGroupKeysPerFabricWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeStateValueWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -10056,9 +10679,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GroupKeyManagement::Attributes::MaxGroupKeysPerFabric::TypeInfo;
+            using TypeInfo = BooleanState::Attributes::StateValue::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.boolValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -10074,7 +10697,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GroupKeyManagement::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = BooleanState::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -10113,7 +10736,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GroupKeyManagement::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = BooleanState::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -10152,7 +10775,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GroupKeyManagement::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = BooleanState::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -10191,7 +10814,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GroupKeyManagement::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = BooleanState::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -10209,7 +10832,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = GroupKeyManagement::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = BooleanState::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -10220,18 +10843,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestGroups ()
-@property (readonly) chip::Controller::GroupsCluster cppCluster;
+@interface CHIPTestModeSelect ()
+@property (readonly) chip::Controller::ModeSelectCluster cppCluster;
 @end
 
-@implementation CHIPTestGroups
+@implementation CHIPTestModeSelect
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeNameSupportWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDescriptionWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -10240,16 +10863,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Groups::Attributes::NameSupport::TypeInfo;
+            using TypeInfo = ModeSelect::Attributes::Description::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            cppValue = [self asCharSpan:value];
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeStandardNamespaceWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -10258,7 +10881,30 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Groups::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = ModeSelect::Attributes::StandardNamespace::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedShortValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeSupportedModesWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ModeSelect::Attributes::SupportedModes::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -10270,12 +10916,37 @@ new CHIPDefaultSuccessCallbackBridge(
                     }
                     listFreer.add(listHolder_0);
                     for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                        if (![value[i_0] isKindOfClass:[CHIPModeSelectClusterModeOptionStruct class]]) {
                             // Wrong kind of value.
                             return CHIP_ERROR_INVALID_ARGUMENT;
                         }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                        auto element_0 = (CHIPModeSelectClusterModeOptionStruct *) value[i_0];
+                        listHolder_0->mList[i_0].label = [self asCharSpan:element_0.label];
+                        listHolder_0->mList[i_0].mode = element_0.mode.unsignedCharValue;
+                        {
+                            using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].semanticTags)>;
+                            using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
+                            if (element_0.semanticTags.count != 0) {
+                                auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.semanticTags.count);
+                                if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
+                                    return CHIP_ERROR_INVALID_ARGUMENT;
+                                }
+                                listFreer.add(listHolder_2);
+                                for (size_t i_2 = 0; i_2 < element_0.semanticTags.count; ++i_2) {
+                                    if (![element_0.semanticTags[i_2] isKindOfClass:[CHIPModeSelectClusterSemanticTag class]]) {
+                                        // Wrong kind of value.
+                                        return CHIP_ERROR_INVALID_ARGUMENT;
+                                    }
+                                    auto element_2 = (CHIPModeSelectClusterSemanticTag *) element_0.semanticTags[i_2];
+                                    listHolder_2->mList[i_2].mfgCode = element_2.mfgCode.unsignedShortValue;
+                                    listHolder_2->mList[i_2].value = element_2.value.unsignedShortValue;
+                                }
+                                listHolder_0->mList[i_0].semanticTags
+                                    = ListType_2(listHolder_2->mList, element_0.semanticTags.count);
+                            } else {
+                                listHolder_0->mList[i_0].semanticTags = ListType_2();
+                            }
+                        }
                     }
                     cppValue = ListType_0(listHolder_0->mList, value.count);
                 } else {
@@ -10288,7 +10959,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -10297,7 +10968,25 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Groups::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = ModeSelect::Attributes::CurrentMode::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ModeSelect::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -10327,7 +11016,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -10336,7 +11025,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Groups::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = ModeSelect::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -10366,7 +11055,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -10375,17 +11064,38 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Groups::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = ModeSelect::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
         ^(id _Nullable ignored, NSError * _Nullable error) {
@@ -10393,7 +11103,25 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Groups::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ModeSelect::Attributes::FeatureMap::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedIntValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ModeSelect::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -10404,18 +11132,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestIdentify ()
-@property (readonly) chip::Controller::IdentifyCluster cppCluster;
+@interface CHIPTestDoorLock ()
+@property (readonly) chip::Controller::DoorLockCluster cppCluster;
 @end
 
-@implementation CHIPTestIdentify
+@implementation CHIPTestDoorLock
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeIdentifyTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeLockStateWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -10424,16 +11152,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Identify::Attributes::IdentifyType::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::LockState::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeLockTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -10442,37 +11175,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Identify::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::LockType::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeActuatorEnabledWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -10481,37 +11193,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Identify::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::ActuatorEnabled::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.boolValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDoorStateWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -10520,29 +11211,13 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Identify::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::DoorState::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -10550,7 +11225,8 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNumberOfTotalUsersSupportedWithValue:(NSNumber * _Nonnull)value
+                                         completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -10559,16 +11235,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Identify::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::NumberOfTotalUsersSupported::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNumberOfPINUsersSupportedWithValue:(NSNumber * _Nonnull)value
+                                       completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -10577,7 +11254,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Identify::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::NumberOfPINUsersSupported::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -10586,20 +11263,27 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-@end
-
-@interface CHIPTestIlluminanceMeasurement ()
-@property (readonly) chip::Controller::IlluminanceMeasurementCluster cppCluster;
-@end
-
-@implementation CHIPTestIlluminanceMeasurement
-
-- (chip::Controller::ClusterBase *)getCluster
+- (void)writeAttributeNumberOfRFIDUsersSupportedWithValue:(NSNumber * _Nonnull)value
+                                        completionHandler:(StatusCompletion)completionHandler
 {
-    return &_cppCluster;
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = DoorLock::Attributes::NumberOfRFIDUsersSupported::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)writeAttributeMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNumberOfWeekDaySchedulesSupportedPerUserWithValue:(NSNumber * _Nonnull)value
+                                                      completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -10608,21 +11292,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = IlluminanceMeasurement::Attributes::MeasuredValue::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::NumberOfWeekDaySchedulesSupportedPerUser::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeMinMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNumberOfYearDaySchedulesSupportedPerUserWithValue:(NSNumber * _Nonnull)value
+                                                      completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -10631,21 +11311,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = IlluminanceMeasurement::Attributes::MinMeasuredValue::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::NumberOfYearDaySchedulesSupportedPerUser::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeMaxMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNumberOfHolidaySchedulesSupportedWithValue:(NSNumber * _Nonnull)value
+                                               completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -10654,21 +11330,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = IlluminanceMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::NumberOfHolidaySchedulesSupported::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeToleranceWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMaxPINCodeLengthWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -10677,16 +11348,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = IlluminanceMeasurement::Attributes::Tolerance::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::MaxPINCodeLength::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeLightSensorTypeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMinPINCodeLengthWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -10695,21 +11366,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = IlluminanceMeasurement::Attributes::LightSensorType::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::MinPINCodeLength::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMaxRFIDCodeLengthWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -10718,37 +11384,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = IlluminanceMeasurement::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::MaxRFIDCodeLength::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMinRFIDCodeLengthWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -10757,37 +11402,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = IlluminanceMeasurement::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::MinRFIDCodeLength::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCredentialRulesSupportWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -10796,37 +11421,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = IlluminanceMeasurement::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::CredentialRulesSupport::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNumberOfCredentialsSupportedPerUserWithValue:(NSNumber * _Nonnull)value
+                                                 completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -10835,16 +11440,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = IlluminanceMeasurement::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::NumberOfCredentialsSupportedPerUser::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSupportedOperatingModesWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -10853,26 +11459,32 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = IlluminanceMeasurement::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::SupportedOperatingModes::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-@end
-
-@interface CHIPTestKeypadInput ()
-@property (readonly) chip::Controller::KeypadInputCluster cppCluster;
-@end
-
-@implementation CHIPTestKeypadInput
-
-- (chip::Controller::ClusterBase *)getCluster
+- (void)writeAttributeDefaultConfigurationRegisterWithValue:(NSNumber * _Nonnull)value
+                                          completionHandler:(StatusCompletion)completionHandler
 {
-    return &_cppCluster;
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = DoorLock::Attributes::DefaultConfigurationRegister::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
@@ -10884,7 +11496,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = KeypadInput::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -10923,7 +11535,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = KeypadInput::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -10962,7 +11574,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = KeypadInput::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -11001,7 +11613,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = KeypadInput::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -11019,7 +11631,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = KeypadInput::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = DoorLock::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -11030,18 +11642,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestLevelControl ()
-@property (readonly) chip::Controller::LevelControlCluster cppCluster;
+@interface CHIPTestWindowCovering ()
+@property (readonly) chip::Controller::WindowCoveringCluster cppCluster;
 @end
 
-@implementation CHIPTestLevelControl
+@implementation CHIPTestWindowCovering
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeCurrentLevelWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -11050,16 +11662,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LevelControl::Attributes::CurrentLevel::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::Type::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRemainingTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePhysicalClosedLimitLiftWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -11068,7 +11681,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LevelControl::Attributes::RemainingTime::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::PhysicalClosedLimitLift::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -11077,7 +11690,8 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeMinLevelWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePhysicalClosedLimitTiltWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -11086,16 +11700,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LevelControl::Attributes::MinLevel::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::PhysicalClosedLimitTilt::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeMaxLevelWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentPositionLiftWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -11104,16 +11718,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LevelControl::Attributes::MaxLevel::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::CurrentPositionLift::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedShortValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeCurrentFrequencyWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentPositionTiltWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -11122,16 +11741,22 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LevelControl::Attributes::CurrentFrequency::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::CurrentPositionTilt::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedShortValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeMinFrequencyWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNumberOfActuationsLiftWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -11140,7 +11765,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LevelControl::Attributes::MinFrequency::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::NumberOfActuationsLift::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -11149,7 +11774,8 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeMaxFrequencyWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNumberOfActuationsTiltWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -11158,7 +11784,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LevelControl::Attributes::MaxFrequency::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::NumberOfActuationsTilt::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -11167,7 +11793,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeConfigStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -11176,37 +11802,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LevelControl::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::ConfigStatus::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentPositionLiftPercentageWithValue:(NSNumber * _Nullable)value
+                                           completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -11215,29 +11821,13 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LevelControl::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::CurrentPositionLiftPercentage::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -11245,7 +11835,8 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentPositionTiltPercentageWithValue:(NSNumber * _Nullable)value
+                                           completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -11254,29 +11845,13 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LevelControl::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::CurrentPositionTiltPercentage::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -11284,7 +11859,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOperationalStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -11293,16 +11868,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LevelControl::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::OperationalStatus::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTargetPositionLiftPercent100thsWithValue:(NSNumber * _Nullable)value
+                                             completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -11311,29 +11887,45 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LevelControl::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::TargetPositionLiftPercent100ths::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedShortValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-@end
-
-@interface CHIPTestLocalizationConfiguration ()
-@property (readonly) chip::Controller::LocalizationConfigurationCluster cppCluster;
-@end
-
-@implementation CHIPTestLocalizationConfiguration
-
-- (chip::Controller::ClusterBase *)getCluster
+- (void)writeAttributeTargetPositionTiltPercent100thsWithValue:(NSNumber * _Nullable)value
+                                             completionHandler:(StatusCompletion)completionHandler
 {
-    return &_cppCluster;
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = WindowCovering::Attributes::TargetPositionTiltPercent100ths::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedShortValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)writeAttributeSupportedLocalesWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeEndProductTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -11342,37 +11934,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LocalizationConfiguration::Attributes::SupportedLocales::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::EndProductType::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSString class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSString *) value[i_0];
-                        listHolder_0->mList[i_0] = [self asCharSpan:element_0];
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentPositionLiftPercent100thsWithValue:(NSNumber * _Nullable)value
+                                              completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -11381,29 +11953,13 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LocalizationConfiguration::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::CurrentPositionLiftPercent100ths::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedShortValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -11411,7 +11967,8 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentPositionTiltPercent100thsWithValue:(NSNumber * _Nullable)value
+                                              completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -11420,29 +11977,13 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LocalizationConfiguration::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::CurrentPositionTiltPercent100ths::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedShortValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -11450,7 +11991,8 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeInstalledOpenLimitLiftWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -11459,37 +12001,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LocalizationConfiguration::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::InstalledOpenLimitLift::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeInstalledClosedLimitLiftWithValue:(NSNumber * _Nonnull)value
+                                      completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -11498,16 +12020,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LocalizationConfiguration::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::InstalledClosedLimitLift::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeInstalledOpenLimitTiltWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -11516,7 +12039,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LocalizationConfiguration::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::InstalledOpenLimitTilt::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -11525,17 +12048,41 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-@end
-
-@interface CHIPTestLowPower ()
-@property (readonly) chip::Controller::LowPowerCluster cppCluster;
-@end
-
-@implementation CHIPTestLowPower
+- (void)writeAttributeInstalledClosedLimitTiltWithValue:(NSNumber * _Nonnull)value
+                                      completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = WindowCovering::Attributes::InstalledClosedLimitTilt::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
 
-- (chip::Controller::ClusterBase *)getCluster
+- (void)writeAttributeSafetyStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
-    return &_cppCluster;
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = WindowCovering::Attributes::SafetyStatus::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
@@ -11547,7 +12094,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LowPower::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -11586,7 +12133,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LowPower::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -11625,7 +12172,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LowPower::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -11664,7 +12211,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LowPower::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -11682,7 +12229,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = LowPower::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = WindowCovering::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -11693,18 +12240,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestMediaInput ()
-@property (readonly) chip::Controller::MediaInputCluster cppCluster;
+@interface CHIPTestBarrierControl ()
+@property (readonly) chip::Controller::BarrierControlCluster cppCluster;
 @end
 
-@implementation CHIPTestMediaInput
+@implementation CHIPTestBarrierControl
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeInputListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBarrierMovingStateWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -11713,42 +12260,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = MediaInput::Attributes::InputList::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::BarrierMovingState::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPMediaInputClusterInputInfo class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (CHIPMediaInputClusterInputInfo *) value[i_0];
-                        listHolder_0->mList[i_0].index = element_0.index.unsignedCharValue;
-                        listHolder_0->mList[i_0].inputType
-                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].inputType)>>(
-                                element_0.inputType.unsignedCharValue);
-                        listHolder_0->mList[i_0].name = [self asCharSpan:element_0.name];
-                        listHolder_0->mList[i_0].description = [self asCharSpan:element_0.descriptionString];
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeCurrentInputWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeBarrierSafetyStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -11757,7 +12278,43 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = MediaInput::Attributes::CurrentInput::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::BarrierSafetyStatus::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeBarrierCapabilitiesWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = BarrierControl::Attributes::BarrierCapabilities::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeBarrierPositionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = BarrierControl::Attributes::BarrierPosition::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -11775,7 +12332,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = MediaInput::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -11814,7 +12371,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = MediaInput::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -11853,7 +12410,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = MediaInput::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -11892,7 +12449,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = MediaInput::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -11910,7 +12467,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = MediaInput::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = BarrierControl::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -11921,18 +12478,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestMediaPlayback ()
-@property (readonly) chip::Controller::MediaPlaybackCluster cppCluster;
+@interface CHIPTestPumpConfigurationAndControl ()
+@property (readonly) chip::Controller::PumpConfigurationAndControlCluster cppCluster;
 @end
 
-@implementation CHIPTestMediaPlayback
+@implementation CHIPTestPumpConfigurationAndControl
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeCurrentStateWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMaxPressureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -11941,16 +12498,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = MediaPlayback::Attributes::CurrentState::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxPressure::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.shortValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeStartTimeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMaxSpeedWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -11959,13 +12521,13 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = MediaPlayback::Attributes::StartTime::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxSpeed::TypeInfo;
             TypeInfo::Type cppValue;
             if (value == nil) {
                 cppValue.SetNull();
             } else {
                 auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedLongLongValue;
+                nonNullValue_0 = value.unsignedShortValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -11973,7 +12535,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeDurationWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMaxFlowWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -11982,13 +12544,13 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = MediaPlayback::Attributes::Duration::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxFlow::TypeInfo;
             TypeInfo::Type cppValue;
             if (value == nil) {
                 cppValue.SetNull();
             } else {
                 auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedLongLongValue;
+                nonNullValue_0 = value.unsignedShortValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -11996,8 +12558,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeSampledPositionWithValue:(CHIPMediaPlaybackClusterPlaybackPosition * _Nullable)value
-                             completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMinConstPressureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12006,19 +12567,13 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = MediaPlayback::Attributes::SampledPosition::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstPressure::TypeInfo;
             TypeInfo::Type cppValue;
             if (value == nil) {
                 cppValue.SetNull();
             } else {
                 auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0.updatedAt = value.updatedAt.unsignedLongLongValue;
-                if (value.position == nil) {
-                    nonNullValue_0.position.SetNull();
-                } else {
-                    auto & nonNullValue_2 = nonNullValue_0.position.SetNonNull();
-                    nonNullValue_2 = value.position.unsignedLongLongValue;
-                }
+                nonNullValue_0 = value.shortValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -12026,7 +12581,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributePlaybackSpeedWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMaxConstPressureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12035,16 +12590,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = MediaPlayback::Attributes::PlaybackSpeed::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstPressure::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.floatValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.shortValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeSeekRangeEndWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMinCompPressureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12053,13 +12613,13 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = MediaPlayback::Attributes::SeekRangeEnd::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MinCompPressure::TypeInfo;
             TypeInfo::Type cppValue;
             if (value == nil) {
                 cppValue.SetNull();
             } else {
                 auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedLongLongValue;
+                nonNullValue_0 = value.shortValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -12067,7 +12627,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeSeekRangeStartWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMaxCompPressureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12076,13 +12636,13 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = MediaPlayback::Attributes::SeekRangeStart::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxCompPressure::TypeInfo;
             TypeInfo::Type cppValue;
             if (value == nil) {
                 cppValue.SetNull();
             } else {
                 auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedLongLongValue;
+                nonNullValue_0 = value.shortValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -12090,7 +12650,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMinConstSpeedWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12099,29 +12659,13 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = MediaPlayback::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstSpeed::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedShortValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -12129,7 +12673,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMaxConstSpeedWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12138,29 +12682,13 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = MediaPlayback::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstSpeed::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedShortValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -12168,7 +12696,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMinConstFlowWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12177,29 +12705,13 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = MediaPlayback::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstFlow::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedShortValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -12207,7 +12719,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMaxConstFlowWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12216,16 +12728,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = MediaPlayback::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstFlow::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedShortValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMinConstTempWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12234,29 +12751,44 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = MediaPlayback::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstTemp::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.shortValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-@end
-
-@interface CHIPTestModeSelect ()
-@property (readonly) chip::Controller::ModeSelectCluster cppCluster;
-@end
-
-@implementation CHIPTestModeSelect
-
-- (chip::Controller::ClusterBase *)getCluster
+- (void)writeAttributeMaxConstTempWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
-    return &_cppCluster;
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstTemp::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.shortValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)writeAttributeDescriptionWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePumpStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12265,16 +12797,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ModeSelect::Attributes::Description::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::PumpStatus::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeStandardNamespaceWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeEffectiveOperationModeWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12283,13 +12816,49 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ModeSelect::Attributes::StandardNamespace::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::EffectiveOperationMode::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeEffectiveControlModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::EffectiveControlMode::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeCapacityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::Capacity::TypeInfo;
             TypeInfo::Type cppValue;
             if (value == nil) {
                 cppValue.SetNull();
             } else {
                 auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
+                nonNullValue_0 = value.shortValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -12297,7 +12866,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeSupportedModesWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSpeedWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12306,54 +12875,13 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ModeSelect::Attributes::SupportedModes::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::Speed::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPModeSelectClusterModeOptionStruct class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (CHIPModeSelectClusterModeOptionStruct *) value[i_0];
-                        listHolder_0->mList[i_0].label = [self asCharSpan:element_0.label];
-                        listHolder_0->mList[i_0].mode = element_0.mode.unsignedCharValue;
-                        {
-                            using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].semanticTags)>;
-                            using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
-                            if (element_0.semanticTags.count != 0) {
-                                auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.semanticTags.count);
-                                if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
-                                    return CHIP_ERROR_INVALID_ARGUMENT;
-                                }
-                                listFreer.add(listHolder_2);
-                                for (size_t i_2 = 0; i_2 < element_0.semanticTags.count; ++i_2) {
-                                    if (![element_0.semanticTags[i_2] isKindOfClass:[CHIPModeSelectClusterSemanticTag class]]) {
-                                        // Wrong kind of value.
-                                        return CHIP_ERROR_INVALID_ARGUMENT;
-                                    }
-                                    auto element_2 = (CHIPModeSelectClusterSemanticTag *) element_0.semanticTags[i_2];
-                                    listHolder_2->mList[i_2].mfgCode = element_2.mfgCode.unsignedShortValue;
-                                    listHolder_2->mList[i_2].value = element_2.value.unsignedShortValue;
-                                }
-                                listHolder_0->mList[i_0].semanticTags
-                                    = ListType_2(listHolder_2->mList, element_0.semanticTags.count);
-                            } else {
-                                listHolder_0->mList[i_0].semanticTags = ListType_2();
-                            }
-                        }
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedShortValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -12361,7 +12889,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeCurrentModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePowerWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12370,9 +12898,14 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ModeSelect::Attributes::CurrentMode::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::Power::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedIntValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -12388,7 +12921,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ModeSelect::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -12427,7 +12960,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ModeSelect::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -12466,7 +12999,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ModeSelect::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -12505,7 +13038,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ModeSelect::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -12523,7 +13056,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ModeSelect::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = PumpConfigurationAndControl::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -12534,18 +13067,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestNetworkCommissioning ()
-@property (readonly) chip::Controller::NetworkCommissioningCluster cppCluster;
+@interface CHIPTestThermostat ()
+@property (readonly) chip::Controller::ThermostatCluster cppCluster;
 @end
 
-@implementation CHIPTestNetworkCommissioning
+@implementation CHIPTestThermostat
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeMaxNetworksWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeLocalTemperatureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12554,16 +13087,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = NetworkCommissioning::Attributes::MaxNetworks::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::LocalTemperature::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.shortValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeNetworksWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOutdoorTemperatureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12572,30 +13110,13 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = NetworkCommissioning::Attributes::Networks::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::OutdoorTemperature::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPNetworkCommissioningClusterNetworkInfo class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (CHIPNetworkCommissioningClusterNetworkInfo *) value[i_0];
-                        listHolder_0->mList[i_0].networkID = [self asByteSpan:element_0.networkID];
-                        listHolder_0->mList[i_0].connected = element_0.connected.boolValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.shortValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -12603,7 +13124,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeScanMaxTimeSecondsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOccupancyWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12612,7 +13133,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = NetworkCommissioning::Attributes::ScanMaxTimeSeconds::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::Occupancy::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -12621,8 +13142,8 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeConnectMaxTimeSecondsWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAbsMinHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12631,17 +13152,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = NetworkCommissioning::Attributes::ConnectMaxTimeSeconds::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::AbsMinHeatSetpointLimit::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeLastNetworkingStatusWithValue:(NSNumber * _Nullable)value
-                                  completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAbsMaxHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12650,21 +13171,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = NetworkCommissioning::Attributes::LastNetworkingStatus::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::AbsMaxHeatSetpointLimit::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeLastNetworkIDWithValue:(NSData * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAbsMinCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12673,22 +13190,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = NetworkCommissioning::Attributes::LastNetworkID::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::AbsMinCoolSetpointLimit::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = [self asByteSpan:value];
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeLastConnectErrorValueWithValue:(NSNumber * _Nullable)value
-                                   completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAbsMaxCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12697,21 +13209,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = NetworkCommissioning::Attributes::LastConnectErrorValue::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::AbsMaxCoolSetpointLimit::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.intValue;
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePICoolingDemandWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12720,37 +13227,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = NetworkCommissioning::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::PICoolingDemand::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePIHeatingDemandWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12759,37 +13245,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = NetworkCommissioning::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::PIHeatingDemand::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeThermostatRunningModeWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12798,37 +13264,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = NetworkCommissioning::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::ThermostatRunningMode::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeStartOfWeekWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12837,16 +13282,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = NetworkCommissioning::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::StartOfWeek::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNumberOfWeeklyTransitionsWithValue:(NSNumber * _Nonnull)value
+                                       completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12855,29 +13301,36 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = NetworkCommissioning::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::NumberOfWeeklyTransitions::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-@end
-
-@interface CHIPTestOtaSoftwareUpdateProvider ()
-@property (readonly) chip::Controller::OtaSoftwareUpdateProviderCluster cppCluster;
-@end
-
-@implementation CHIPTestOtaSoftwareUpdateProvider
-
-- (chip::Controller::ClusterBase *)getCluster
+- (void)writeAttributeNumberOfDailyTransitionsWithValue:(NSNumber * _Nonnull)value
+                                      completionHandler:(StatusCompletion)completionHandler
 {
-    return &_cppCluster;
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Thermostat::Attributes::NumberOfDailyTransitions::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
 }
 
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeThermostatRunningStateWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12886,37 +13339,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::ThermostatRunningState::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSetpointChangeSourceWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12925,37 +13357,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::SetpointChangeSource::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSetpointChangeAmountWithValue:(NSNumber * _Nullable)value
+                                  completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -12964,29 +13376,13 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::SetpointChangeAmount::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.shortValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -12994,7 +13390,8 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSetpointChangeSourceTimestampWithValue:(NSNumber * _Nonnull)value
+                                           completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -13003,7 +13400,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::SetpointChangeSourceTimestamp::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -13012,7 +13409,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOccupiedSetbackMinWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -13021,29 +13418,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OtaSoftwareUpdateProvider::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::OccupiedSetbackMin::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-@end
-
-@interface CHIPTestOtaSoftwareUpdateRequestor ()
-@property (readonly) chip::Controller::OtaSoftwareUpdateRequestorCluster cppCluster;
-@end
-
-@implementation CHIPTestOtaSoftwareUpdateRequestor
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)writeAttributeUpdatePossibleWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOccupiedSetbackMaxWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -13052,16 +13441,22 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdatePossible::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::OccupiedSetbackMax::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeUpdateStateWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeUnoccupiedSetbackMinWithValue:(NSNumber * _Nullable)value
+                                  completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -13070,16 +13465,22 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdateState::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::UnoccupiedSetbackMin::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeUpdateStateProgressWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeUnoccupiedSetbackMaxWithValue:(NSNumber * _Nullable)value
+                                  completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -13088,7 +13489,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdateStateProgress::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::UnoccupiedSetbackMax::TypeInfo;
             TypeInfo::Type cppValue;
             if (value == nil) {
                 cppValue.SetNull();
@@ -13102,7 +13503,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeACCoilTemperatureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -13111,9 +13512,32 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::ACCoilTemperature::TypeInfo;
             TypeInfo::Type cppValue;
-            {
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.shortValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = Thermostat::Attributes::GeneratedCommandList::TypeInfo;
+            TypeInfo::Type cppValue;
+            {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
                 using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
                 if (value.count != 0) {
@@ -13150,7 +13574,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -13189,7 +13613,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -13228,7 +13652,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -13246,7 +13670,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Thermostat::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -13257,18 +13681,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestOccupancySensing ()
-@property (readonly) chip::Controller::OccupancySensingCluster cppCluster;
+@interface CHIPTestFanControl ()
+@property (readonly) chip::Controller::FanControlCluster cppCluster;
 @end
 
-@implementation CHIPTestOccupancySensing
+@implementation CHIPTestFanControl
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeOccupancyWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePercentCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -13277,7 +13701,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OccupancySensing::Attributes::Occupancy::TypeInfo;
+            using TypeInfo = FanControl::Attributes::PercentCurrent::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -13286,7 +13710,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeOccupancySensorTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSpeedMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -13295,7 +13719,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OccupancySensing::Attributes::OccupancySensorType::TypeInfo;
+            using TypeInfo = FanControl::Attributes::SpeedMax::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -13304,8 +13728,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeOccupancySensorTypeBitmapWithValue:(NSNumber * _Nonnull)value
-                                       completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSpeedCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -13314,7 +13737,43 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OccupancySensing::Attributes::OccupancySensorTypeBitmap::TypeInfo;
+            using TypeInfo = FanControl::Attributes::SpeedCurrent::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeRockSupportWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = FanControl::Attributes::RockSupport::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeWindSupportWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = FanControl::Attributes::WindSupport::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -13332,7 +13791,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OccupancySensing::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = FanControl::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -13371,7 +13830,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OccupancySensing::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = FanControl::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -13410,7 +13869,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OccupancySensing::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = FanControl::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -13449,7 +13908,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OccupancySensing::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = FanControl::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -13467,7 +13926,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OccupancySensing::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = FanControl::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -13478,53 +13937,17 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestOnOff ()
-@property (readonly) chip::Controller::OnOffCluster cppCluster;
+@interface CHIPTestThermostatUserInterfaceConfiguration ()
+@property (readonly) chip::Controller::ThermostatUserInterfaceConfigurationCluster cppCluster;
 @end
 
-@implementation CHIPTestOnOff
+@implementation CHIPTestThermostatUserInterfaceConfiguration
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeOnOffWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = OnOff::Attributes::OnOff::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeGlobalSceneControlWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = OnOff::Attributes::GlobalSceneControl::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
@@ -13534,7 +13957,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OnOff::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -13573,7 +13996,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OnOff::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -13612,7 +14035,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OnOff::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -13651,7 +14074,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OnOff::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -13669,7 +14092,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OnOff::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -13680,18 +14103,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestOnOffSwitchConfiguration ()
-@property (readonly) chip::Controller::OnOffSwitchConfigurationCluster cppCluster;
+@interface CHIPTestColorControl ()
+@property (readonly) chip::Controller::ColorControlCluster cppCluster;
 @end
 
-@implementation CHIPTestOnOffSwitchConfiguration
+@implementation CHIPTestColorControl
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeSwitchTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentHueWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -13700,7 +14123,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OnOffSwitchConfiguration::Attributes::SwitchType::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::CurrentHue::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -13709,7 +14132,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentSaturationWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -13718,37 +14141,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OnOffSwitchConfiguration::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::CurrentSaturation::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRemainingTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -13757,37 +14159,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OnOffSwitchConfiguration::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::RemainingTime::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentXWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -13796,37 +14177,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OnOffSwitchConfiguration::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::CurrentX::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentYWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -13835,16 +14195,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OnOffSwitchConfiguration::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::CurrentY::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDriftCompensationWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -13853,29 +14213,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OnOffSwitchConfiguration::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::DriftCompensation::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-@end
-
-@interface CHIPTestOperationalCredentials ()
-@property (readonly) chip::Controller::OperationalCredentialsCluster cppCluster;
-@end
-
-@implementation CHIPTestOperationalCredentials
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)writeAttributeNOCsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCompensationTextWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -13884,44 +14231,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OperationalCredentials::Attributes::NOCs::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::CompensationText::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPOperationalCredentialsClusterNOCStruct class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (CHIPOperationalCredentialsClusterNOCStruct *) value[i_0];
-                        listHolder_0->mList[i_0].noc = [self asByteSpan:element_0.noc];
-                        if (element_0.icac == nil) {
-                            listHolder_0->mList[i_0].icac.SetNull();
-                        } else {
-                            auto & nonNullValue_2 = listHolder_0->mList[i_0].icac.SetNonNull();
-                            nonNullValue_2 = [self asByteSpan:element_0.icac];
-                        }
-                        listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = [self asCharSpan:value];
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeFabricsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeColorTemperatureWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -13930,44 +14249,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OperationalCredentials::Attributes::Fabrics::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorTemperature::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPOperationalCredentialsClusterFabricDescriptor class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (CHIPOperationalCredentialsClusterFabricDescriptor *) value[i_0];
-                        listHolder_0->mList[i_0].rootPublicKey = [self asByteSpan:element_0.rootPublicKey];
-                        listHolder_0->mList[i_0].vendorId
-                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].vendorId)>>(
-                                element_0.vendorId.unsignedShortValue);
-                        listHolder_0->mList[i_0].fabricId = element_0.fabricId.unsignedLongLongValue;
-                        listHolder_0->mList[i_0].nodeId = element_0.nodeId.unsignedLongLongValue;
-                        listHolder_0->mList[i_0].label = [self asCharSpan:element_0.label];
-                        listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeSupportedFabricsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeColorModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -13976,7 +14267,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OperationalCredentials::Attributes::SupportedFabrics::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorMode::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -13985,7 +14276,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeCommissionedFabricsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNumberOfPrimariesWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -13994,17 +14285,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OperationalCredentials::Attributes::CommissionedFabrics::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::NumberOfPrimaries::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeTrustedRootCertificatesWithValue:(NSArray * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePrimary1XWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14013,37 +14308,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OperationalCredentials::Attributes::TrustedRootCertificates::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary1X::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSData class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSData *) value[i_0];
-                        listHolder_0->mList[i_0] = [self asByteSpan:element_0];
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeCurrentFabricIndexWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePrimary1YWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14052,16 +14326,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OperationalCredentials::Attributes::CurrentFabricIndex::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary1Y::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePrimary1IntensityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14070,29 +14344,13 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OperationalCredentials::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary1Intensity::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -14100,7 +14358,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePrimary2XWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14109,37 +14367,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OperationalCredentials::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary2X::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePrimary2YWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14148,37 +14385,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OperationalCredentials::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary2Y::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePrimary2IntensityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14187,16 +14403,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OperationalCredentials::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary2Intensity::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePrimary3XWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14205,7 +14426,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = OperationalCredentials::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary3X::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -14214,20 +14435,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-@end
-
-@interface CHIPTestPowerSource ()
-@property (readonly) chip::Controller::PowerSourceCluster cppCluster;
-@end
-
-@implementation CHIPTestPowerSource
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)writeAttributeStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePrimary3YWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14236,16 +14444,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::Status::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary3Y::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeOrderWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePrimary3IntensityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14254,16 +14462,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::Order::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary3Intensity::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeDescriptionWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePrimary4XWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14272,17 +14485,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::Description::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary4X::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeWiredAssessedInputVoltageWithValue:(NSNumber * _Nonnull)value
-                                       completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePrimary4YWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14291,17 +14503,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::WiredAssessedInputVoltage::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary4Y::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeWiredAssessedInputFrequencyWithValue:(NSNumber * _Nonnull)value
-                                         completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePrimary4IntensityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14310,16 +14521,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::WiredAssessedInputFrequency::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary4Intensity::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeWiredCurrentTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePrimary5XWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14328,16 +14544,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::WiredCurrentType::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary5X::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeWiredAssessedCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePrimary5YWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14346,16 +14562,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::WiredAssessedCurrent::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary5Y::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeWiredNominalVoltageWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePrimary5IntensityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14364,16 +14580,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::WiredNominalVoltage::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary5Intensity::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeWiredMaximumCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePrimary6XWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14382,16 +14603,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::WiredMaximumCurrent::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary6X::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeWiredPresentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePrimary6YWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14400,16 +14621,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::WiredPresent::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary6Y::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeActiveWiredFaultsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePrimary6IntensityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14418,29 +14639,13 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::ActiveWiredFaults::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::Primary6Intensity::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedCharValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -14448,7 +14653,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeBatteryVoltageWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeEnhancedCurrentHueWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14457,17 +14662,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::BatteryVoltage::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::EnhancedCurrentHue::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeBatteryPercentRemainingWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeEnhancedColorModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14476,7 +14680,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::BatteryPercentRemaining::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::EnhancedColorMode::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -14485,7 +14689,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeBatteryTimeRemainingWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeColorLoopActiveWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14494,16 +14698,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::BatteryTimeRemaining::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorLoopActive::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeBatteryChargeLevelWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeColorLoopDirectionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14512,7 +14716,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::BatteryChargeLevel::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorLoopDirection::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -14521,8 +14725,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeBatteryReplacementNeededWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeColorLoopTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14531,17 +14734,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::BatteryReplacementNeeded::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorLoopTime::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeBatteryReplaceabilityWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeColorLoopStartEnhancedHueWithValue:(NSNumber * _Nonnull)value
+                                       completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14550,16 +14753,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::BatteryReplaceability::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorLoopStartEnhancedHue::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeBatteryPresentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeColorLoopStoredEnhancedHueWithValue:(NSNumber * _Nonnull)value
+                                        completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14568,16 +14772,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::BatteryPresent::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorLoopStoredEnhancedHue::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeActiveBatteryFaultsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeColorCapabilitiesWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14586,38 +14790,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::ActiveBatteryFaults::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorCapabilities::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedCharValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeBatteryReplacementDescriptionWithValue:(NSString * _Nonnull)value
-                                           completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeColorTempPhysicalMinMiredsWithValue:(NSNumber * _Nonnull)value
+                                        completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14626,17 +14809,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::BatteryReplacementDescription::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorTempPhysicalMinMireds::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeBatteryCommonDesignationWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeColorTempPhysicalMaxMiredsWithValue:(NSNumber * _Nonnull)value
+                                        completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14645,17 +14828,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::BatteryCommonDesignation::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ColorTempPhysicalMaxMireds::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeBatteryANSIDesignationWithValue:(NSString * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCoupleColorTempToLevelMinMiredsWithValue:(NSNumber * _Nonnull)value
+                                             completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14664,17 +14847,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::BatteryANSIDesignation::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::CoupleColorTempToLevelMinMireds::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeBatteryIECDesignationWithValue:(NSString * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14683,17 +14865,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::BatteryIECDesignation::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeBatteryApprovedChemistryWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14702,16 +14904,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::BatteryApprovedChemistry::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeBatteryCapacityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14720,34 +14943,55 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::BatteryCapacity::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeBatteryQuantityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::BatteryQuantity::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeBatteryChargeStateWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14756,17 +15000,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::BatteryChargeState::TypeInfo;
+            using TypeInfo = ColorControl::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeBatteryTimeToFullChargeWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler
+@end
+
+@interface CHIPTestIlluminanceMeasurement ()
+@property (readonly) chip::Controller::IlluminanceMeasurementCluster cppCluster;
+@end
+
+@implementation CHIPTestIlluminanceMeasurement
+
+- (chip::Controller::ClusterBase *)getCluster
+{
+    return &_cppCluster;
+}
+
+- (void)writeAttributeMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14775,17 +15031,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::BatteryTimeToFullCharge::TypeInfo;
+            using TypeInfo = IlluminanceMeasurement::Attributes::MeasuredValue::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedShortValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeBatteryFunctionalWhileChargingWithValue:(NSNumber * _Nonnull)value
-                                            completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMinMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14794,17 +15054,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::BatteryFunctionalWhileCharging::TypeInfo;
+            using TypeInfo = IlluminanceMeasurement::Attributes::MinMeasuredValue::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedShortValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeBatteryChargingCurrentWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMaxMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14813,17 +15077,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::BatteryChargingCurrent::TypeInfo;
+            using TypeInfo = IlluminanceMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedShortValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeActiveBatteryChargeFaultsWithValue:(NSArray * _Nonnull)value
-                                       completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeToleranceWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -14832,29 +15100,31 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::ActiveBatteryChargeFaults::TypeInfo;
+            using TypeInfo = IlluminanceMeasurement::Attributes::Tolerance::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedCharValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeLightSensorTypeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = IlluminanceMeasurement::Attributes::LightSensorType::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedCharValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -14871,7 +15141,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = IlluminanceMeasurement::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -14910,7 +15180,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = IlluminanceMeasurement::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -14949,7 +15219,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = IlluminanceMeasurement::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -14988,7 +15258,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = IlluminanceMeasurement::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -15006,7 +15276,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSource::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = IlluminanceMeasurement::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -15017,18 +15287,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestPowerSourceConfiguration ()
-@property (readonly) chip::Controller::PowerSourceConfigurationCluster cppCluster;
+@interface CHIPTestTemperatureMeasurement ()
+@property (readonly) chip::Controller::TemperatureMeasurementCluster cppCluster;
 @end
 
-@implementation CHIPTestPowerSourceConfiguration
+@implementation CHIPTestTemperatureMeasurement
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeSourcesWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -15037,29 +15307,59 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSourceConfiguration::Attributes::Sources::TypeInfo;
+            using TypeInfo = TemperatureMeasurement::Attributes::MeasuredValue::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedCharValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.shortValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeMinMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TemperatureMeasurement::Attributes::MinMeasuredValue::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.shortValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeMaxMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TemperatureMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.shortValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -15067,6 +15367,24 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
+- (void)writeAttributeToleranceWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = TemperatureMeasurement::Attributes::Tolerance::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
@@ -15076,7 +15394,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSourceConfiguration::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = TemperatureMeasurement::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -15115,7 +15433,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSourceConfiguration::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = TemperatureMeasurement::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -15154,7 +15472,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSourceConfiguration::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = TemperatureMeasurement::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -15193,7 +15511,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSourceConfiguration::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = TemperatureMeasurement::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -15211,7 +15529,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PowerSourceConfiguration::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = TemperatureMeasurement::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -15580,18 +15898,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestPumpConfigurationAndControl ()
-@property (readonly) chip::Controller::PumpConfigurationAndControlCluster cppCluster;
+@interface CHIPTestFlowMeasurement ()
+@property (readonly) chip::Controller::FlowMeasurementCluster cppCluster;
 @end
 
-@implementation CHIPTestPumpConfigurationAndControl
+@implementation CHIPTestFlowMeasurement
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeMaxPressureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -15600,13 +15918,13 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxPressure::TypeInfo;
+            using TypeInfo = FlowMeasurement::Attributes::MeasuredValue::TypeInfo;
             TypeInfo::Type cppValue;
             if (value == nil) {
                 cppValue.SetNull();
             } else {
                 auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.shortValue;
+                nonNullValue_0 = value.unsignedShortValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -15614,7 +15932,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeMaxSpeedWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMinMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -15623,7 +15941,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxSpeed::TypeInfo;
+            using TypeInfo = FlowMeasurement::Attributes::MinMeasuredValue::TypeInfo;
             TypeInfo::Type cppValue;
             if (value == nil) {
                 cppValue.SetNull();
@@ -15637,7 +15955,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeMaxFlowWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMaxMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -15646,7 +15964,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxFlow::TypeInfo;
+            using TypeInfo = FlowMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
             TypeInfo::Type cppValue;
             if (value == nil) {
                 cppValue.SetNull();
@@ -15660,7 +15978,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeMinConstPressureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeToleranceWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -15669,21 +15987,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstPressure::TypeInfo;
+            using TypeInfo = FlowMeasurement::Attributes::Tolerance::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.shortValue;
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeMaxConstPressureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -15692,13 +16005,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstPressure::TypeInfo;
+            using TypeInfo = FlowMeasurement::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.shortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -15706,7 +16035,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeMinCompPressureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -15715,13 +16044,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MinCompPressure::TypeInfo;
+            using TypeInfo = FlowMeasurement::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.shortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -15729,7 +16074,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeMaxCompPressureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -15738,13 +16083,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxCompPressure::TypeInfo;
+            using TypeInfo = FlowMeasurement::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.shortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -15752,7 +16113,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeMinConstSpeedWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -15761,21 +16122,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstSpeed::TypeInfo;
+            using TypeInfo = FlowMeasurement::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeMaxConstSpeedWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -15784,21 +16140,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstSpeed::TypeInfo;
+            using TypeInfo = FlowMeasurement::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeMinConstFlowWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+@end
+
+@interface CHIPTestRelativeHumidityMeasurement ()
+@property (readonly) chip::Controller::RelativeHumidityMeasurementCluster cppCluster;
+@end
+
+@implementation CHIPTestRelativeHumidityMeasurement
+
+- (chip::Controller::ClusterBase *)getCluster
+{
+    return &_cppCluster;
+}
+
+- (void)writeAttributeMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -15807,7 +16171,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstFlow::TypeInfo;
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::MeasuredValue::TypeInfo;
             TypeInfo::Type cppValue;
             if (value == nil) {
                 cppValue.SetNull();
@@ -15821,7 +16185,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeMaxConstFlowWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMinMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -15830,7 +16194,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstFlow::TypeInfo;
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::MinMeasuredValue::TypeInfo;
             TypeInfo::Type cppValue;
             if (value == nil) {
                 cppValue.SetNull();
@@ -15844,7 +16208,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeMinConstTempWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMaxMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -15853,13 +16217,13 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MinConstTemp::TypeInfo;
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
             TypeInfo::Type cppValue;
             if (value == nil) {
                 cppValue.SetNull();
             } else {
                 auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.shortValue;
+                nonNullValue_0 = value.unsignedShortValue;
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -15867,7 +16231,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeMaxConstTempWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeToleranceWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -15876,21 +16240,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::MaxConstTemp::TypeInfo;
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::Tolerance::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.shortValue;
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePumpStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -15899,17 +16258,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::PumpStatus::TypeInfo;
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeEffectiveOperationModeWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -15918,16 +16297,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::EffectiveOperationMode::TypeInfo;
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeEffectiveControlModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -15936,39 +16336,55 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::EffectiveControlMode::TypeInfo;
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeCapacityWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
         ^(id _Nullable ignored, NSError * _Nullable error) {
             completionHandler(error);
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::Capacity::TypeInfo;
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.shortValue;
-            }
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeSpeedWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -15977,21 +16393,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::Speed::TypeInfo;
+            using TypeInfo = RelativeHumidityMeasurement::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePowerWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+@end
+
+@interface CHIPTestOccupancySensing ()
+@property (readonly) chip::Controller::OccupancySensingCluster cppCluster;
+@end
+
+@implementation CHIPTestOccupancySensing
+
+- (chip::Controller::ClusterBase *)getCluster
+{
+    return &_cppCluster;
+}
+
+- (void)writeAttributeOccupancyWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -16000,14 +16424,46 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::Power::TypeInfo;
+            using TypeInfo = OccupancySensing::Attributes::Occupancy::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedIntValue;
-            }
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeOccupancySensorTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = OccupancySensing::Attributes::OccupancySensorType::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeOccupancySensorTypeBitmapWithValue:(NSNumber * _Nonnull)value
+                                       completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = OccupancySensing::Attributes::OccupancySensorTypeBitmap::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -16023,7 +16479,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = OccupancySensing::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -16062,7 +16518,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = OccupancySensing::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -16101,7 +16557,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = OccupancySensing::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -16140,7 +16596,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = OccupancySensing::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -16158,7 +16614,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = PumpConfigurationAndControl::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = OccupancySensing::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -16169,87 +16625,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestRelativeHumidityMeasurement ()
-@property (readonly) chip::Controller::RelativeHumidityMeasurementCluster cppCluster;
+@interface CHIPTestWakeOnLan ()
+@property (readonly) chip::Controller::WakeOnLanCluster cppCluster;
 @end
 
-@implementation CHIPTestRelativeHumidityMeasurement
+@implementation CHIPTestWakeOnLan
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::MeasuredValue::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeMinMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::MinMeasuredValue::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeMaxMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeToleranceWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMACAddressWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -16258,9 +16645,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::Tolerance::TypeInfo;
+            using TypeInfo = WakeOnLan::Attributes::MACAddress::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = [self asCharSpan:value];
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -16276,7 +16663,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = WakeOnLan::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -16315,7 +16702,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = WakeOnLan::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -16354,7 +16741,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = WakeOnLan::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -16393,7 +16780,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = WakeOnLan::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -16411,7 +16798,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = RelativeHumidityMeasurement::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = WakeOnLan::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -16422,36 +16809,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestScenes ()
-@property (readonly) chip::Controller::ScenesCluster cppCluster;
+@interface CHIPTestChannel ()
+@property (readonly) chip::Controller::ChannelCluster cppCluster;
 @end
 
-@implementation CHIPTestScenes
+@implementation CHIPTestChannel
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeSceneCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Scenes::Attributes::SceneCount::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeCurrentSceneWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeChannelListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -16460,52 +16829,51 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Scenes::Attributes::CurrentScene::TypeInfo;
+            using TypeInfo = Channel::Attributes::ChannelList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeCurrentGroupWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Scenes::Attributes::CurrentGroup::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeSceneValidWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Scenes::Attributes::SceneValid::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[CHIPChannelClusterChannelInfo class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (CHIPChannelClusterChannelInfo *) value[i_0];
+                        listHolder_0->mList[i_0].majorNumber = element_0.majorNumber.unsignedShortValue;
+                        listHolder_0->mList[i_0].minorNumber = element_0.minorNumber.unsignedShortValue;
+                        if (element_0.name != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].name.Emplace();
+                            definedValue_2 = [self asCharSpan:element_0.name];
+                        }
+                        if (element_0.callSign != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].callSign.Emplace();
+                            definedValue_2 = [self asCharSpan:element_0.callSign];
+                        }
+                        if (element_0.affiliateCallSign != nil) {
+                            auto & definedValue_2 = listHolder_0->mList[i_0].affiliateCallSign.Emplace();
+                            definedValue_2 = [self asCharSpan:element_0.affiliateCallSign];
+                        }
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeNameSupportWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeLineupWithValue:(CHIPChannelClusterLineupInfo * _Nullable)value
+                    completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -16514,16 +16882,32 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Scenes::Attributes::NameSupport::TypeInfo;
+            using TypeInfo = Channel::Attributes::Lineup::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0.operatorName = [self asCharSpan:value.operatorName];
+                if (value.lineupName != nil) {
+                    auto & definedValue_2 = nonNullValue_0.lineupName.Emplace();
+                    definedValue_2 = [self asCharSpan:value.lineupName];
+                }
+                if (value.postalCode != nil) {
+                    auto & definedValue_2 = nonNullValue_0.postalCode.Emplace();
+                    definedValue_2 = [self asCharSpan:value.postalCode];
+                }
+                nonNullValue_0.lineupInfoType = static_cast<std::remove_reference_t<decltype(nonNullValue_0.lineupInfoType)>>(
+                    value.lineupInfoType.unsignedCharValue);
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeLastConfiguredByWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentChannelWithValue:(CHIPChannelClusterChannelInfo * _Nullable)value
+                            completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -16532,13 +16916,26 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Scenes::Attributes::LastConfiguredBy::TypeInfo;
+            using TypeInfo = Channel::Attributes::CurrentChannel::TypeInfo;
             TypeInfo::Type cppValue;
             if (value == nil) {
                 cppValue.SetNull();
             } else {
                 auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedLongLongValue;
+                nonNullValue_0.majorNumber = value.majorNumber.unsignedShortValue;
+                nonNullValue_0.minorNumber = value.minorNumber.unsignedShortValue;
+                if (value.name != nil) {
+                    auto & definedValue_2 = nonNullValue_0.name.Emplace();
+                    definedValue_2 = [self asCharSpan:value.name];
+                }
+                if (value.callSign != nil) {
+                    auto & definedValue_2 = nonNullValue_0.callSign.Emplace();
+                    definedValue_2 = [self asCharSpan:value.callSign];
+                }
+                if (value.affiliateCallSign != nil) {
+                    auto & definedValue_2 = nonNullValue_0.affiliateCallSign.Emplace();
+                    definedValue_2 = [self asCharSpan:value.affiliateCallSign];
+                }
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -16555,7 +16952,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Scenes::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = Channel::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -16594,7 +16991,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Scenes::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = Channel::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -16633,7 +17030,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Scenes::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = Channel::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -16672,7 +17069,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Scenes::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = Channel::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -16690,7 +17087,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Scenes::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = Channel::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -16701,18 +17098,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestSoftwareDiagnostics ()
-@property (readonly) chip::Controller::SoftwareDiagnosticsCluster cppCluster;
+@interface CHIPTestTargetNavigator ()
+@property (readonly) chip::Controller::TargetNavigatorCluster cppCluster;
 @end
 
-@implementation CHIPTestSoftwareDiagnostics
+@implementation CHIPTestTargetNavigator
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeThreadMetricsWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTargetListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -16721,7 +17118,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = SoftwareDiagnostics::Attributes::ThreadMetrics::TypeInfo;
+            using TypeInfo = TargetNavigator::Attributes::TargetList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -16733,28 +17130,13 @@ new CHIPDefaultSuccessCallbackBridge(
                     }
                     listFreer.add(listHolder_0);
                     for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPSoftwareDiagnosticsClusterThreadMetrics class]]) {
+                        if (![value[i_0] isKindOfClass:[CHIPTargetNavigatorClusterTargetInfo class]]) {
                             // Wrong kind of value.
                             return CHIP_ERROR_INVALID_ARGUMENT;
                         }
-                        auto element_0 = (CHIPSoftwareDiagnosticsClusterThreadMetrics *) value[i_0];
-                        listHolder_0->mList[i_0].id = element_0.id.unsignedLongLongValue;
-                        if (element_0.name != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].name.Emplace();
-                            definedValue_2 = [self asCharSpan:element_0.name];
-                        }
-                        if (element_0.stackFreeCurrent != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].stackFreeCurrent.Emplace();
-                            definedValue_2 = element_0.stackFreeCurrent.unsignedIntValue;
-                        }
-                        if (element_0.stackFreeMinimum != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].stackFreeMinimum.Emplace();
-                            definedValue_2 = element_0.stackFreeMinimum.unsignedIntValue;
-                        }
-                        if (element_0.stackSize != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].stackSize.Emplace();
-                            definedValue_2 = element_0.stackSize.unsignedIntValue;
-                        }
+                        auto element_0 = (CHIPTargetNavigatorClusterTargetInfo *) value[i_0];
+                        listHolder_0->mList[i_0].identifier = element_0.identifier.unsignedCharValue;
+                        listHolder_0->mList[i_0].name = [self asCharSpan:element_0.name];
                     }
                     cppValue = ListType_0(listHolder_0->mList, value.count);
                 } else {
@@ -16767,44 +17149,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeCurrentHeapFreeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = SoftwareDiagnostics::Attributes::CurrentHeapFree::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeCurrentHeapUsedWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = SoftwareDiagnostics::Attributes::CurrentHeapUsed::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeCurrentHeapHighWatermarkWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentTargetWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -16813,9 +17158,9 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = SoftwareDiagnostics::Attributes::CurrentHeapHighWatermark::TypeInfo;
+            using TypeInfo = TargetNavigator::Attributes::CurrentTarget::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
+            cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -16831,7 +17176,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = SoftwareDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = TargetNavigator::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -16870,7 +17215,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = SoftwareDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = TargetNavigator::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -16909,7 +17254,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = SoftwareDiagnostics::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = TargetNavigator::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -16948,7 +17293,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = SoftwareDiagnostics::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = TargetNavigator::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -16966,7 +17311,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = SoftwareDiagnostics::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = TargetNavigator::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -16977,18 +17322,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestSwitch ()
-@property (readonly) chip::Controller::SwitchCluster cppCluster;
+@interface CHIPTestMediaPlayback ()
+@property (readonly) chip::Controller::MediaPlaybackCluster cppCluster;
 @end
 
-@implementation CHIPTestSwitch
+@implementation CHIPTestMediaPlayback
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeNumberOfPositionsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentStateWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -16997,16 +17342,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Switch::Attributes::NumberOfPositions::TypeInfo;
+            using TypeInfo = MediaPlayback::Attributes::CurrentState::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeCurrentPositionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeStartTimeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -17015,16 +17360,21 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Switch::Attributes::CurrentPosition::TypeInfo;
+            using TypeInfo = MediaPlayback::Attributes::StartTime::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedLongLongValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeMultiPressMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDurationWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -17033,16 +17383,22 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Switch::Attributes::MultiPressMax::TypeInfo;
+            using TypeInfo = MediaPlayback::Attributes::Duration::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedLongLongValue;
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeSampledPositionWithValue:(CHIPMediaPlaybackClusterPlaybackPosition * _Nullable)value
+                             completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -17051,30 +17407,123 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Switch::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = MediaPlayback::Attributes::SampledPosition::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0.updatedAt = value.updatedAt.unsignedLongLongValue;
+                if (value.position == nil) {
+                    nonNullValue_0.position.SetNull();
+                } else {
+                    auto & nonNullValue_2 = nonNullValue_0.position.SetNonNull();
+                    nonNullValue_2 = value.position.unsignedLongLongValue;
+                }
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributePlaybackSpeedWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = MediaPlayback::Attributes::PlaybackSpeed::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.floatValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeSeekRangeEndWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = MediaPlayback::Attributes::SeekRangeEnd::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedLongLongValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeSeekRangeStartWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = MediaPlayback::Attributes::SeekRangeStart::TypeInfo;
+            TypeInfo::Type cppValue;
+            if (value == nil) {
+                cppValue.SetNull();
+            } else {
+                auto & nonNullValue_0 = cppValue.SetNonNull();
+                nonNullValue_0 = value.unsignedLongLongValue;
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = MediaPlayback::Attributes::GeneratedCommandList::TypeInfo;
+            TypeInfo::Type cppValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
@@ -17090,7 +17539,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Switch::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = MediaPlayback::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -17129,7 +17578,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Switch::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = MediaPlayback::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -17168,7 +17617,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Switch::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = MediaPlayback::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -17186,7 +17635,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Switch::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = MediaPlayback::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -17197,18 +17646,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestTargetNavigator ()
-@property (readonly) chip::Controller::TargetNavigatorCluster cppCluster;
+@interface CHIPTestMediaInput ()
+@property (readonly) chip::Controller::MediaInputCluster cppCluster;
 @end
 
-@implementation CHIPTestTargetNavigator
+@implementation CHIPTestMediaInput
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeTargetListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeInputListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -17217,7 +17666,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TargetNavigator::Attributes::TargetList::TypeInfo;
+            using TypeInfo = MediaInput::Attributes::InputList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -17229,13 +17678,17 @@ new CHIPDefaultSuccessCallbackBridge(
                     }
                     listFreer.add(listHolder_0);
                     for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPTargetNavigatorClusterTargetInfo class]]) {
+                        if (![value[i_0] isKindOfClass:[CHIPMediaInputClusterInputInfo class]]) {
                             // Wrong kind of value.
                             return CHIP_ERROR_INVALID_ARGUMENT;
                         }
-                        auto element_0 = (CHIPTargetNavigatorClusterTargetInfo *) value[i_0];
-                        listHolder_0->mList[i_0].identifier = element_0.identifier.unsignedCharValue;
+                        auto element_0 = (CHIPMediaInputClusterInputInfo *) value[i_0];
+                        listHolder_0->mList[i_0].index = element_0.index.unsignedCharValue;
+                        listHolder_0->mList[i_0].inputType
+                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].inputType)>>(
+                                element_0.inputType.unsignedCharValue);
                         listHolder_0->mList[i_0].name = [self asCharSpan:element_0.name];
+                        listHolder_0->mList[i_0].description = [self asCharSpan:element_0.descriptionString];
                     }
                     cppValue = ListType_0(listHolder_0->mList, value.count);
                 } else {
@@ -17248,7 +17701,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeCurrentTargetWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentInputWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -17257,7 +17710,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TargetNavigator::Attributes::CurrentTarget::TypeInfo;
+            using TypeInfo = MediaInput::Attributes::CurrentInput::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -17275,7 +17728,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TargetNavigator::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = MediaInput::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -17314,7 +17767,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TargetNavigator::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = MediaInput::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -17353,7 +17806,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TargetNavigator::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = MediaInput::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -17392,7 +17845,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TargetNavigator::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = MediaInput::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -17410,7 +17863,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TargetNavigator::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = MediaInput::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -17421,104 +17874,17 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestTemperatureMeasurement ()
-@property (readonly) chip::Controller::TemperatureMeasurementCluster cppCluster;
+@interface CHIPTestLowPower ()
+@property (readonly) chip::Controller::LowPowerCluster cppCluster;
 @end
 
-@implementation CHIPTestTemperatureMeasurement
+@implementation CHIPTestLowPower
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TemperatureMeasurement::Attributes::MeasuredValue::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.shortValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeMinMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TemperatureMeasurement::Attributes::MinMeasuredValue::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.shortValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeMaxMeasuredValueWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TemperatureMeasurement::Attributes::MaxMeasuredValue::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.shortValue;
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeToleranceWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = TemperatureMeasurement::Attributes::Tolerance::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
@@ -17528,7 +17894,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TemperatureMeasurement::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = LowPower::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -17567,7 +17933,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TemperatureMeasurement::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = LowPower::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -17606,7 +17972,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TemperatureMeasurement::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = LowPower::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -17645,7 +18011,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TemperatureMeasurement::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = LowPower::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -17663,7 +18029,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TemperatureMeasurement::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = LowPower::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -17674,11 +18040,11 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestTestCluster ()
-@property (readonly) chip::Controller::TestClusterCluster cppCluster;
+@interface CHIPTestKeypadInput ()
+@property (readonly) chip::Controller::KeypadInputCluster cppCluster;
 @end
 
-@implementation CHIPTestTestCluster
+@implementation CHIPTestKeypadInput
 
 - (chip::Controller::ClusterBase *)getCluster
 {
@@ -17694,7 +18060,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = KeypadInput::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -17733,7 +18099,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = KeypadInput::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -17772,7 +18138,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = KeypadInput::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -17811,7 +18177,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = KeypadInput::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -17829,7 +18195,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TestCluster::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = KeypadInput::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -17840,18 +18206,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestThermostat ()
-@property (readonly) chip::Controller::ThermostatCluster cppCluster;
+@interface CHIPTestContentLauncher ()
+@property (readonly) chip::Controller::ContentLauncherCluster cppCluster;
 @end
 
-@implementation CHIPTestThermostat
+@implementation CHIPTestContentLauncher
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeLocalTemperatureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcceptHeaderWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -17860,13 +18226,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::LocalTemperature::TypeInfo;
+            using TypeInfo = ContentLauncher::Attributes::AcceptHeader::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.shortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSString class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSString *) value[i_0];
+                        listHolder_0->mList[i_0] = [self asCharSpan:element_0];
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -17874,7 +18256,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeOutdoorTemperatureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -17883,13 +18265,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::OutdoorTemperature::TypeInfo;
+            using TypeInfo = ContentLauncher::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.shortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -17897,64 +18295,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeOccupancyWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::Occupancy::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeAbsMinHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::AbsMinHeatSetpointLimit::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeAbsMaxHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::AbsMaxHeatSetpointLimit::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeAbsMinCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -17963,17 +18304,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::AbsMinCoolSetpointLimit::TypeInfo;
+            using TypeInfo = ContentLauncher::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAbsMaxCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -17982,16 +18343,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::AbsMaxCoolSetpointLimit::TypeInfo;
+            using TypeInfo = ContentLauncher::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePICoolingDemandWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18000,16 +18382,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::PICoolingDemand::TypeInfo;
+            using TypeInfo = ContentLauncher::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePIHeatingDemandWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18018,92 +18400,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::PIHeatingDemand::TypeInfo;
+            using TypeInfo = ContentLauncher::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeThermostatRunningModeWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::ThermostatRunningMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
+@end
 
-- (void)writeAttributeStartOfWeekWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::StartOfWeek::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
+@interface CHIPTestAudioOutput ()
+@property (readonly) chip::Controller::AudioOutputCluster cppCluster;
+@end
 
-- (void)writeAttributeNumberOfWeeklyTransitionsWithValue:(NSNumber * _Nonnull)value
-                                       completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::NumberOfWeeklyTransitions::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
+@implementation CHIPTestAudioOutput
 
-- (void)writeAttributeNumberOfDailyTransitionsWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::NumberOfDailyTransitions::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    return &_cppCluster;
 }
 
-- (void)writeAttributeThermostatRunningStateWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOutputListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18112,16 +18431,41 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::ThermostatRunningState::TypeInfo;
+            using TypeInfo = AudioOutput::Attributes::OutputList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[CHIPAudioOutputClusterOutputInfo class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (CHIPAudioOutputClusterOutputInfo *) value[i_0];
+                        listHolder_0->mList[i_0].index = element_0.index.unsignedCharValue;
+                        listHolder_0->mList[i_0].outputType
+                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].outputType)>>(
+                                element_0.outputType.unsignedCharValue);
+                        listHolder_0->mList[i_0].name = [self asCharSpan:element_0.name];
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeSetpointChangeSourceWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentOutputWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18130,7 +18474,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::SetpointChangeSource::TypeInfo;
+            using TypeInfo = AudioOutput::Attributes::CurrentOutput::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedCharValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -18139,8 +18483,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeSetpointChangeAmountWithValue:(NSNumber * _Nullable)value
-                                  completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18149,13 +18492,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::SetpointChangeAmount::TypeInfo;
+            using TypeInfo = AudioOutput::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.shortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -18163,26 +18522,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeSetpointChangeSourceTimestampWithValue:(NSNumber * _Nonnull)value
-                                           completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::SetpointChangeSourceTimestamp::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
-}
-
-- (void)writeAttributeOccupiedSetbackMinWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18191,13 +18531,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::OccupiedSetbackMin::TypeInfo;
+            using TypeInfo = AudioOutput::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -18205,7 +18561,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeOccupiedSetbackMaxWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18214,13 +18570,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::OccupiedSetbackMax::TypeInfo;
+            using TypeInfo = AudioOutput::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -18228,8 +18600,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeUnoccupiedSetbackMinWithValue:(NSNumber * _Nullable)value
-                                  completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18238,22 +18609,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::UnoccupiedSetbackMin::TypeInfo;
+            using TypeInfo = AudioOutput::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeUnoccupiedSetbackMaxWithValue:(NSNumber * _Nullable)value
-                                  completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18262,21 +18627,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::UnoccupiedSetbackMax::TypeInfo;
+            using TypeInfo = AudioOutput::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeACCoilTemperatureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+@end
+
+@interface CHIPTestApplicationLauncher ()
+@property (readonly) chip::Controller::ApplicationLauncherCluster cppCluster;
+@end
+
+@implementation CHIPTestApplicationLauncher
+
+- (chip::Controller::ClusterBase *)getCluster
+{
+    return &_cppCluster;
+}
+
+- (void)writeAttributeCatalogListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18285,13 +18658,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::ACCoilTemperature::TypeInfo;
+            using TypeInfo = ApplicationLauncher::Attributes::CatalogList::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.shortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedShortValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -18308,7 +18697,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = ApplicationLauncher::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -18347,7 +18736,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = ApplicationLauncher::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -18386,7 +18775,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = ApplicationLauncher::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -18425,7 +18814,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = ApplicationLauncher::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -18443,7 +18832,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = Thermostat::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ApplicationLauncher::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -18454,17 +18843,185 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestThermostatUserInterfaceConfiguration ()
-@property (readonly) chip::Controller::ThermostatUserInterfaceConfigurationCluster cppCluster;
+@interface CHIPTestApplicationBasic ()
+@property (readonly) chip::Controller::ApplicationBasicCluster cppCluster;
 @end
 
-@implementation CHIPTestThermostatUserInterfaceConfiguration
+@implementation CHIPTestApplicationBasic
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
+- (void)writeAttributeVendorNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ApplicationBasic::Attributes::VendorName::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = [self asCharSpan:value];
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeVendorIDWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ApplicationBasic::Attributes::VendorID::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeApplicationNameWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ApplicationBasic::Attributes::ApplicationName::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = [self asCharSpan:value];
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeProductIDWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ApplicationBasic::Attributes::ProductID::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeApplicationWithValue:(CHIPApplicationBasicClusterApplicationBasicApplication * _Nonnull)value
+                         completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ApplicationBasic::Attributes::Application::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue.catalogVendorId = value.catalogVendorId.unsignedShortValue;
+            cppValue.applicationId = [self asCharSpan:value.applicationId];
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ApplicationBasic::Attributes::Status::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeApplicationVersionWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ApplicationBasic::Attributes::ApplicationVersion::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = [self asCharSpan:value];
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeAllowedVendorListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ApplicationBasic::Attributes::AllowedVendorList::TypeInfo;
+            TypeInfo::Type cppValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0])>>(
+                            element_0.unsignedShortValue);
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
@@ -18474,7 +19031,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = ApplicationBasic::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -18513,7 +19070,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = ApplicationBasic::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -18552,7 +19109,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = ApplicationBasic::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -18591,7 +19148,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = ApplicationBasic::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -18609,7 +19166,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ApplicationBasic::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -18620,18 +19177,18 @@ new CHIPDefaultSuccessCallbackBridge(
 
 @end
 
-@interface CHIPTestThreadNetworkDiagnostics ()
-@property (readonly) chip::Controller::ThreadNetworkDiagnosticsCluster cppCluster;
+@interface CHIPTestAccountLogin ()
+@property (readonly) chip::Controller::AccountLoginCluster cppCluster;
 @end
 
-@implementation CHIPTestThreadNetworkDiagnostics
+@implementation CHIPTestAccountLogin
 
 - (chip::Controller::ClusterBase *)getCluster
 {
     return &_cppCluster;
 }
 
-- (void)writeAttributeChannelWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18640,13 +19197,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Channel::TypeInfo;
+            using TypeInfo = AccountLogin::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -18654,7 +19227,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeRoutingRoleWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18663,13 +19236,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RoutingRole::TypeInfo;
+            using TypeInfo = AccountLogin::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -18677,7 +19266,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeNetworkNameWithValue:(NSString * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18686,13 +19275,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::NetworkName::TypeInfo;
+            using TypeInfo = AccountLogin::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = [self asCharSpan:value];
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
             }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
@@ -18700,7 +19305,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributePanIdWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18709,21 +19314,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PanId::TypeInfo;
+            using TypeInfo = AccountLogin::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeExtendedPanIdWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18732,44 +19332,29 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ExtendedPanId::TypeInfo;
+            using TypeInfo = AccountLogin::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedLongLongValue;
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeMeshLocalPrefixWithValue:(NSData * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+@end
+
+@interface CHIPTestElectricalMeasurement ()
+@property (readonly) chip::Controller::ElectricalMeasurementCluster cppCluster;
+@end
+
+@implementation CHIPTestElectricalMeasurement
+
+- (chip::Controller::ClusterBase *)getCluster
 {
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::MeshLocalPrefix::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = [self asByteSpan:value];
-            }
-            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
-            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
-            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
-        });
+    return &_cppCluster;
 }
 
-- (void)writeAttributeOverrunCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMeasurementTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18778,16 +19363,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::OverrunCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::MeasurementType::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeNeighborTableListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDcVoltageWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18796,108 +19381,34 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::NeighborTableList::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltage::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPThreadNetworkDiagnosticsClusterNeighborTable class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (CHIPThreadNetworkDiagnosticsClusterNeighborTable *) value[i_0];
-                        listHolder_0->mList[i_0].extAddress = element_0.extAddress.unsignedLongLongValue;
-                        listHolder_0->mList[i_0].age = element_0.age.unsignedIntValue;
-                        listHolder_0->mList[i_0].rloc16 = element_0.rloc16.unsignedShortValue;
-                        listHolder_0->mList[i_0].linkFrameCounter = element_0.linkFrameCounter.unsignedIntValue;
-                        listHolder_0->mList[i_0].mleFrameCounter = element_0.mleFrameCounter.unsignedIntValue;
-                        listHolder_0->mList[i_0].lqi = element_0.lqi.unsignedCharValue;
-                        if (element_0.averageRssi == nil) {
-                            listHolder_0->mList[i_0].averageRssi.SetNull();
-                        } else {
-                            auto & nonNullValue_2 = listHolder_0->mList[i_0].averageRssi.SetNonNull();
-                            nonNullValue_2 = element_0.averageRssi.charValue;
-                        }
-                        if (element_0.lastRssi == nil) {
-                            listHolder_0->mList[i_0].lastRssi.SetNull();
-                        } else {
-                            auto & nonNullValue_2 = listHolder_0->mList[i_0].lastRssi.SetNonNull();
-                            nonNullValue_2 = element_0.lastRssi.charValue;
-                        }
-                        listHolder_0->mList[i_0].frameErrorRate = element_0.frameErrorRate.unsignedCharValue;
-                        listHolder_0->mList[i_0].messageErrorRate = element_0.messageErrorRate.unsignedCharValue;
-                        listHolder_0->mList[i_0].rxOnWhenIdle = element_0.rxOnWhenIdle.boolValue;
-                        listHolder_0->mList[i_0].fullThreadDevice = element_0.fullThreadDevice.boolValue;
-                        listHolder_0->mList[i_0].fullNetworkData = element_0.fullNetworkData.boolValue;
-                        listHolder_0->mList[i_0].isChild = element_0.isChild.boolValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
-
-- (void)writeAttributeRouteTableListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
-{
-    new CHIPDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RouteTableList::TypeInfo;
-            TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[CHIPThreadNetworkDiagnosticsClusterRouteTable class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (CHIPThreadNetworkDiagnosticsClusterRouteTable *) value[i_0];
-                        listHolder_0->mList[i_0].extAddress = element_0.extAddress.unsignedLongLongValue;
-                        listHolder_0->mList[i_0].rloc16 = element_0.rloc16.unsignedShortValue;
-                        listHolder_0->mList[i_0].routerId = element_0.routerId.unsignedCharValue;
-                        listHolder_0->mList[i_0].nextHop = element_0.nextHop.unsignedCharValue;
-                        listHolder_0->mList[i_0].pathCost = element_0.pathCost.unsignedCharValue;
-                        listHolder_0->mList[i_0].LQIIn = element_0.lqiIn.unsignedCharValue;
-                        listHolder_0->mList[i_0].LQIOut = element_0.lqiOut.unsignedCharValue;
-                        listHolder_0->mList[i_0].age = element_0.age.unsignedCharValue;
-                        listHolder_0->mList[i_0].allocated = element_0.allocated.boolValue;
-                        listHolder_0->mList[i_0].linkEstablished = element_0.linkEstablished.boolValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+
+- (void)writeAttributeDcVoltageMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageMin::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePartitionIdWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDcVoltageMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18906,21 +19417,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PartitionId::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageMax::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedIntValue;
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeWeightingWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDcCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18929,21 +19435,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Weighting::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrent::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeDataVersionWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDcCurrentMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18952,21 +19453,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::DataVersion::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentMin::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeStableDataVersionWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDcCurrentMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18975,21 +19471,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::StableDataVersion::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentMax::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeLeaderRouterIdWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDcPowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -18998,21 +19489,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::LeaderRouterId::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcPower::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeDetachedRoleCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDcPowerMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19021,16 +19507,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::DetachedRoleCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcPowerMin::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeChildRoleCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDcPowerMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19039,16 +19525,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChildRoleCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcPowerMax::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRouterRoleCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDcVoltageMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19057,7 +19543,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RouterRoleCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageMultiplier::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -19066,7 +19552,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeLeaderRoleCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDcVoltageDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19075,7 +19561,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::LeaderRoleCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcVoltageDivisor::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -19084,7 +19570,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeAttachAttemptCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDcCurrentMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19093,7 +19579,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::AttachAttemptCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentMultiplier::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -19102,8 +19588,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributePartitionIdChangeCountWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDcCurrentDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19112,7 +19597,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PartitionIdChangeCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcCurrentDivisor::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -19121,8 +19606,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeBetterPartitionAttachAttemptCountWithValue:(NSNumber * _Nonnull)value
-                                               completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDcPowerMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19131,7 +19615,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::BetterPartitionAttachAttemptCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcPowerMultiplier::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -19140,7 +19624,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeParentChangeCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeDcPowerDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19149,7 +19633,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ParentChangeCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::DcPowerDivisor::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -19158,7 +19642,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeTxTotalCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcFrequencyWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19167,16 +19651,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxTotalCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequency::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeTxUnicastCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcFrequencyMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19185,16 +19669,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxUnicastCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyMin::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeTxBroadcastCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcFrequencyMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19203,16 +19687,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxBroadcastCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyMax::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeTxAckRequestedCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeNeutralCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19221,16 +19705,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxAckRequestedCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::NeutralCurrent::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeTxAckedCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTotalActivePowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19239,17 +19723,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxAckedCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::TotalActivePower::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.intValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeTxNoAckRequestedCountWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTotalReactivePowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19258,16 +19741,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxNoAckRequestedCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::TotalReactivePower::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.intValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeTxDataCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeTotalApparentPowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19276,7 +19759,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxDataCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::TotalApparentPower::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -19285,7 +19768,8 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeTxDataPollCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMeasured1stHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
+                                        completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19294,16 +19778,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxDataPollCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::Measured1stHarmonicCurrent::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeTxBeaconCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMeasured3rdHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
+                                        completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19312,16 +19797,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxBeaconCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::Measured3rdHarmonicCurrent::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeTxBeaconRequestCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMeasured5thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
+                                        completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19330,16 +19816,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxBeaconRequestCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::Measured5thHarmonicCurrent::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeTxOtherCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMeasured7thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
+                                        completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19348,16 +19835,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxOtherCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::Measured7thHarmonicCurrent::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeTxRetryCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMeasured9thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
+                                        completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19366,16 +19854,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxRetryCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::Measured9thHarmonicCurrent::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeTxDirectMaxRetryExpiryCountWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeMeasured11thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
                                          completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
@@ -19385,17 +19873,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxDirectMaxRetryExpiryCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::Measured11thHarmonicCurrent::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeTxIndirectMaxRetryExpiryCountWithValue:(NSNumber * _Nonnull)value
-                                           completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMeasuredPhase1stHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
+                                             completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19404,16 +19892,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxIndirectMaxRetryExpiryCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase1stHarmonicCurrent::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeTxErrCcaCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMeasuredPhase3rdHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
+                                             completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19422,16 +19911,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxErrCcaCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase3rdHarmonicCurrent::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeTxErrAbortCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMeasuredPhase5thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
+                                             completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19440,17 +19930,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxErrAbortCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase5thHarmonicCurrent::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeTxErrBusyChannelCountWithValue:(NSNumber * _Nonnull)value
-                                   completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMeasuredPhase7thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
+                                             completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19459,16 +19949,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::TxErrBusyChannelCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase7thHarmonicCurrent::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRxTotalCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMeasuredPhase9thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
+                                             completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19477,16 +19968,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxTotalCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase9thHarmonicCurrent::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRxUnicastCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeMeasuredPhase11thHarmonicCurrentWithValue:(NSNumber * _Nonnull)value
+                                              completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19495,16 +19987,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxUnicastCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::MeasuredPhase11thHarmonicCurrent::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRxBroadcastCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcFrequencyMultiplierWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19513,16 +20006,34 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxBroadcastCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyMultiplier::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeAcFrequencyDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcFrequencyDivisor::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRxDataCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePowerMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19531,7 +20042,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDataCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::PowerMultiplier::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -19540,7 +20051,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeRxDataPollCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePowerDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19549,7 +20060,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDataPollCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::PowerDivisor::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -19558,7 +20069,8 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeRxBeaconCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeHarmonicCurrentMultiplierWithValue:(NSNumber * _Nonnull)value
+                                       completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19567,16 +20079,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxBeaconCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::HarmonicCurrentMultiplier::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.charValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRxBeaconRequestCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePhaseHarmonicCurrentMultiplierWithValue:(NSNumber * _Nonnull)value
+                                            completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19585,16 +20098,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxBeaconRequestCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::PhaseHarmonicCurrentMultiplier::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.charValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRxOtherCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeInstantaneousVoltageWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19603,17 +20116,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxOtherCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousVoltage::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRxAddressFilteredCountWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeInstantaneousLineCurrentWithValue:(NSNumber * _Nonnull)value
+                                      completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19622,17 +20135,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxAddressFilteredCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousLineCurrent::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRxDestAddrFilteredCountWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeInstantaneousActiveCurrentWithValue:(NSNumber * _Nonnull)value
+                                        completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19641,16 +20154,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDestAddrFilteredCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousActiveCurrent::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRxDuplicatedCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeInstantaneousReactiveCurrentWithValue:(NSNumber * _Nonnull)value
+                                          completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19659,16 +20173,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxDuplicatedCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousReactiveCurrent::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRxErrNoFrameCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeInstantaneousPowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19677,17 +20191,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrNoFrameCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::InstantaneousPower::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRxErrUnknownNeighborCountWithValue:(NSNumber * _Nonnull)value
-                                       completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsVoltageWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19696,17 +20209,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrUnknownNeighborCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltage::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRxErrInvalidSrcAddrCountWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsVoltageMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19715,16 +20227,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrInvalidSrcAddrCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMin::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRxErrSecCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsVoltageMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19733,16 +20245,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrSecCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMax::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRxErrFcsCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsCurrentWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19751,16 +20263,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrFcsCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrent::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRxErrOtherCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsCurrentMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19769,16 +20281,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::RxErrOtherCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMin::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeActiveTimestampWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsCurrentMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19787,21 +20299,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ActiveTimestamp::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMax::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedLongLongValue;
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePendingTimestampWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeActivePowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19810,21 +20317,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::PendingTimestamp::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePower::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedLongLongValue;
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeDelayWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeActivePowerMinWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19833,22 +20335,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::Delay::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMin::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedIntValue;
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeSecurityPolicyWithValue:(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable)value
-                            completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeActivePowerMaxWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19857,22 +20353,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::SecurityPolicy::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMax::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0.rotationTime = value.rotationTime.unsignedShortValue;
-                nonNullValue_0.flags = value.flags.unsignedShortValue;
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeChannelMaskWithValue:(NSData * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeReactivePowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19881,23 +20371,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ChannelMask::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ReactivePower::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = [self asByteSpan:value];
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeOperationalDatasetComponentsWithValue:
-            (CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable)value
-                                          completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeApparentPowerWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19906,33 +20389,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::OperationalDatasetComponents::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ApparentPower::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0.activeTimestampPresent = value.activeTimestampPresent.boolValue;
-                nonNullValue_0.pendingTimestampPresent = value.pendingTimestampPresent.boolValue;
-                nonNullValue_0.masterKeyPresent = value.masterKeyPresent.boolValue;
-                nonNullValue_0.networkNamePresent = value.networkNamePresent.boolValue;
-                nonNullValue_0.extendedPanIdPresent = value.extendedPanIdPresent.boolValue;
-                nonNullValue_0.meshLocalPrefixPresent = value.meshLocalPrefixPresent.boolValue;
-                nonNullValue_0.delayPresent = value.delayPresent.boolValue;
-                nonNullValue_0.panIdPresent = value.panIdPresent.boolValue;
-                nonNullValue_0.channelPresent = value.channelPresent.boolValue;
-                nonNullValue_0.pskcPresent = value.pskcPresent.boolValue;
-                nonNullValue_0.securityPolicyPresent = value.securityPolicyPresent.boolValue;
-                nonNullValue_0.channelMaskPresent = value.channelMaskPresent.boolValue;
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeActiveNetworkFaultsListWithValue:(NSArray * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePowerFactorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19941,38 +20407,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::PowerFactor::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0]
-                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0])>>(element_0.unsignedCharValue);
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.charValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcVoltageMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -19981,76 +20425,34 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcVoltageMultiplier::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcVoltageDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
         ^(id _Nullable ignored, NSError * _Nullable error) {
             completionHandler(error);
-        },
-        ^(Cancelable * success, Cancelable * failure) {
-            ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
-            TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcVoltageDivisor::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcCurrentMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20059,37 +20461,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcCurrentMultiplier::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcCurrentDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20098,16 +20479,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcCurrentDivisor::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcPowerMultiplierWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20116,7 +20497,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = ThreadNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcPowerMultiplier::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -20125,21 +20506,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-@end
-
-@interface CHIPTestTimeFormatLocalization ()
-@property (readonly) chip::Controller::TimeFormatLocalizationCluster cppCluster;
-@end
-
-@implementation CHIPTestTimeFormatLocalization
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)writeAttributeSupportedCalendarTypesWithValue:(NSArray * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcPowerDivisorWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20148,38 +20515,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TimeFormatLocalization::Attributes::SupportedCalendarTypes::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcPowerDivisor::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0]
-                            = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0])>>(element_0.unsignedCharValue);
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeVoltageOverloadWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20188,37 +20533,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TimeFormatLocalization::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::VoltageOverload::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeCurrentOverloadWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20227,37 +20551,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TimeFormatLocalization::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::CurrentOverload::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcVoltageOverloadWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20266,37 +20569,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TimeFormatLocalization::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcVoltageOverload::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcCurrentOverloadWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20305,16 +20587,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TimeFormatLocalization::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcCurrentOverload::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcActivePowerOverloadWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20323,29 +20606,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = TimeFormatLocalization::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcActivePowerOverload::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-@end
-
-@interface CHIPTestUnitLocalization ()
-@property (readonly) chip::Controller::UnitLocalizationCluster cppCluster;
-@end
-
-@implementation CHIPTestUnitLocalization
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcReactivePowerOverloadWithValue:(NSNumber * _Nonnull)value
+                                     completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20354,37 +20625,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = UnitLocalization::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcReactivePowerOverload::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAverageRmsOverVoltageWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20393,37 +20644,36 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = UnitLocalization::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsOverVoltage::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.shortValue;
+            auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
+            auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
+            return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
+        });
+}
+
+- (void)writeAttributeAverageRmsUnderVoltageWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler
+{
+    new CHIPDefaultSuccessCallbackBridge(
+        self.callbackQueue,
+        ^(id _Nullable ignored, NSError * _Nullable error) {
+            completionHandler(error);
+        },
+        ^(Cancelable * success, Cancelable * failure) {
+            ListFreer listFreer;
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltage::TypeInfo;
+            TypeInfo::Type cppValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsExtremeOverVoltageWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20432,37 +20682,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = UnitLocalization::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltage::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsExtremeUnderVoltageWithValue:(NSNumber * _Nonnull)value
+                                    completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20471,16 +20701,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = UnitLocalization::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltage::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsVoltageSagWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20489,29 +20719,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = UnitLocalization::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSag::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-@end
-
-@interface CHIPTestUserLabel ()
-@property (readonly) chip::Controller::UserLabelCluster cppCluster;
-@end
-
-@implementation CHIPTestUserLabel
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsVoltageSwellWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20520,37 +20737,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = UserLabel::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwell::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeLineCurrentPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20559,37 +20755,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = UserLabel::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::LineCurrentPhaseB::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeActiveCurrentPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20598,37 +20773,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = UserLabel::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ActiveCurrentPhaseB::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeReactiveCurrentPhaseBWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20637,16 +20792,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = UserLabel::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ReactiveCurrentPhaseB::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsVoltagePhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20655,7 +20810,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = UserLabel::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltagePhaseB::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -20664,20 +20819,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-@end
-
-@interface CHIPTestWakeOnLan ()
-@property (readonly) chip::Controller::WakeOnLanCluster cppCluster;
-@end
-
-@implementation CHIPTestWakeOnLan
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)writeAttributeMACAddressWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsVoltageMinPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20686,16 +20828,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WakeOnLan::Attributes::MACAddress::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMinPhaseB::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = [self asCharSpan:value];
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsVoltageMaxPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20704,37 +20846,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WakeOnLan::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMaxPhaseB::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsCurrentPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20743,37 +20864,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WakeOnLan::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentPhaseB::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsCurrentMinPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20782,37 +20882,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WakeOnLan::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMinPhaseB::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsCurrentMaxPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20821,16 +20900,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WakeOnLan::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMaxPhaseB::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeActivePowerPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20839,29 +20918,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WakeOnLan::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerPhaseB::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-@end
-
-@interface CHIPTestWiFiNetworkDiagnostics ()
-@property (readonly) chip::Controller::WiFiNetworkDiagnosticsCluster cppCluster;
-@end
-
-@implementation CHIPTestWiFiNetworkDiagnostics
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)writeAttributeBssidWithValue:(NSData * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeActivePowerMinPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20870,21 +20936,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::Bssid::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMinPhaseB::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = [self asByteSpan:value];
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeSecurityTypeWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeActivePowerMaxPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20893,21 +20954,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::SecurityType::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMaxPhaseB::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeWiFiVersionWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeReactivePowerPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20916,21 +20972,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::WiFiVersion::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ReactivePowerPhaseB::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeChannelNumberWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeApparentPowerPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20939,21 +20990,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::ChannelNumber::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ApparentPowerPhaseB::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeRssiWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePowerFactorPhaseBWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20962,21 +21008,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::Rssi::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::PowerFactorPhaseB::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.charValue;
-            }
+            cppValue = value.charValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeBeaconLostCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAverageRmsVoltageMeasurementPeriodPhaseBWithValue:(NSNumber * _Nonnull)value
+                                                      completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -20985,16 +21027,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::BeaconLostCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriodPhaseB::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeBeaconRxCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAverageRmsOverVoltageCounterPhaseBWithValue:(NSNumber * _Nonnull)value
+                                                completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21003,17 +21046,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::BeaconRxCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsOverVoltageCounterPhaseB::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePacketMulticastRxCountWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAverageRmsUnderVoltageCounterPhaseBWithValue:(NSNumber * _Nonnull)value
+                                                 completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21022,17 +21065,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketMulticastRxCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounterPhaseB::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePacketMulticastTxCountWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsExtremeOverVoltagePeriodPhaseBWithValue:(NSNumber * _Nonnull)value
+                                               completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21041,16 +21084,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketMulticastTxCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriodPhaseB::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePacketUnicastRxCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsExtremeUnderVoltagePeriodPhaseBWithValue:(NSNumber * _Nonnull)value
+                                                completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21059,16 +21103,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketUnicastRxCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriodPhaseB::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePacketUnicastTxCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsVoltageSagPeriodPhaseBWithValue:(NSNumber * _Nonnull)value
+                                       completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21077,16 +21122,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::PacketUnicastTxCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSagPeriodPhaseB::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeCurrentMaxRateWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsVoltageSwellPeriodPhaseBWithValue:(NSNumber * _Nonnull)value
+                                         completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21095,16 +21141,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::CurrentMaxRate::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriodPhaseB::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeOverrunCountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeLineCurrentPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21113,16 +21159,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::OverrunCount::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::LineCurrentPhaseC::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeActiveCurrentPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21131,37 +21177,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ActiveCurrentPhaseC::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeReactiveCurrentPhaseCWithValue:(NSNumber * _Nonnull)value
+                                   completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21170,37 +21196,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ReactiveCurrentPhaseC::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsVoltagePhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21209,37 +21214,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltagePhaseC::TypeInfo;
             TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
-                }
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsVoltageMinPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21248,16 +21232,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMinPhaseC::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsVoltageMaxPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21266,7 +21250,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WiFiNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageMaxPhaseC::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -21275,20 +21259,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-@end
-
-@interface CHIPTestWindowCovering ()
-@property (readonly) chip::Controller::WindowCoveringCluster cppCluster;
-@end
-
-@implementation CHIPTestWindowCovering
-
-- (chip::Controller::ClusterBase *)getCluster
-{
-    return &_cppCluster;
-}
-
-- (void)writeAttributeTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsCurrentPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21297,17 +21268,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::Type::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentPhaseC::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributePhysicalClosedLimitLiftWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsCurrentMinPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21316,7 +21286,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::PhysicalClosedLimitLift::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMinPhaseC::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -21325,8 +21295,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributePhysicalClosedLimitTiltWithValue:(NSNumber * _Nonnull)value
-                                     completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsCurrentMaxPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21335,7 +21304,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::PhysicalClosedLimitTilt::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsCurrentMaxPhaseC::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -21344,7 +21313,7 @@ new CHIPDefaultSuccessCallbackBridge(
         });
 }
 
-- (void)writeAttributeCurrentPositionLiftWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeActivePowerPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21353,21 +21322,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::CurrentPositionLift::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerPhaseC::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeCurrentPositionTiltWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeActivePowerMinPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21376,22 +21340,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::CurrentPositionTilt::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMinPhaseC::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeNumberOfActuationsLiftWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeActivePowerMaxPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21400,17 +21358,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::NumberOfActuationsLift::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ActivePowerMaxPhaseC::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeNumberOfActuationsTiltWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeReactivePowerPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21419,16 +21376,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::NumberOfActuationsTilt::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ReactivePowerPhaseC::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.shortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeConfigStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeApparentPowerPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21437,17 +21394,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::ConfigStatus::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ApparentPowerPhaseC::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeCurrentPositionLiftPercentageWithValue:(NSNumber * _Nullable)value
-                                           completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributePowerFactorPhaseCWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21456,22 +21412,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::CurrentPositionLiftPercentage::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::PowerFactorPhaseC::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+            cppValue = value.charValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeCurrentPositionTiltPercentageWithValue:(NSNumber * _Nullable)value
-                                           completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAverageRmsVoltageMeasurementPeriodPhaseCWithValue:(NSNumber * _Nonnull)value
+                                                      completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21480,21 +21431,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::CurrentPositionTiltPercentage::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriodPhaseC::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeOperationalStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAverageRmsOverVoltageCounterPhaseCWithValue:(NSNumber * _Nonnull)value
+                                                completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21503,17 +21450,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::OperationalStatus::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsOverVoltageCounterPhaseC::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeTargetPositionLiftPercent100thsWithValue:(NSNumber * _Nullable)value
-                                             completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAverageRmsUnderVoltageCounterPhaseCWithValue:(NSNumber * _Nonnull)value
+                                                 completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21522,22 +21469,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::TargetPositionLiftPercent100ths::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounterPhaseC::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeTargetPositionTiltPercent100thsWithValue:(NSNumber * _Nullable)value
-                                             completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsExtremeOverVoltagePeriodPhaseCWithValue:(NSNumber * _Nonnull)value
+                                               completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21546,21 +21488,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::TargetPositionTiltPercent100ths::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriodPhaseC::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeEndProductTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsExtremeUnderVoltagePeriodPhaseCWithValue:(NSNumber * _Nonnull)value
+                                                completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21569,17 +21507,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::EndProductType::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriodPhaseC::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeCurrentPositionLiftPercent100thsWithValue:(NSNumber * _Nullable)value
-                                              completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsVoltageSagPeriodPhaseCWithValue:(NSNumber * _Nonnull)value
+                                       completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21588,22 +21526,17 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::CurrentPositionLiftPercent100ths::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSagPeriodPhaseC::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeCurrentPositionTiltPercent100thsWithValue:(NSNumber * _Nullable)value
-                                              completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeRmsVoltageSwellPeriodPhaseCWithValue:(NSNumber * _Nonnull)value
+                                         completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21612,22 +21545,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::CurrentPositionTiltPercent100ths::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriodPhaseC::TypeInfo;
             TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeInstalledOpenLimitLiftWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21636,17 +21563,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::InstalledOpenLimitLift::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeInstalledClosedLimitLiftWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21655,17 +21602,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::InstalledClosedLimitLift::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeInstalledOpenLimitTiltWithValue:(NSNumber * _Nonnull)value
-                                    completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21674,17 +21641,37 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::InstalledOpenLimitTilt::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            {
+                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+                if (value.count != 0) {
+                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                        return CHIP_ERROR_INVALID_ARGUMENT;
+                    }
+                    listFreer.add(listHolder_0);
+                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
+                            // Wrong kind of value.
+                            return CHIP_ERROR_INVALID_ARGUMENT;
+                        }
+                        auto element_0 = (NSNumber *) value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedIntValue;
+                    }
+                    cppValue = ListType_0(listHolder_0->mList, value.count);
+                } else {
+                    cppValue = ListType_0();
+                }
+            }
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeInstalledClosedLimitTiltWithValue:(NSNumber * _Nonnull)value
-                                      completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeFeatureMapWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21693,16 +21680,16 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::InstalledClosedLimitTilt::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+            cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
-- (void)writeAttributeSafetyStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
         self.callbackQueue,
@@ -21711,15 +21698,28 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::SafetyStatus::TypeInfo;
+            using TypeInfo = ElectricalMeasurement::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
+            cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
             auto failureFn = Callback<CHIPDefaultFailureCallbackType>::FromCancelable(failure);
             return self.cppCluster.WriteAttribute<TypeInfo>(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall);
         });
 }
 
+@end
+
+@interface CHIPTestTestCluster ()
+@property (readonly) chip::Controller::TestClusterCluster cppCluster;
+@end
+
+@implementation CHIPTestTestCluster
+
+- (chip::Controller::ClusterBase *)getCluster
+{
+    return &_cppCluster;
+}
+
 - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
 {
     new CHIPDefaultSuccessCallbackBridge(
@@ -21729,7 +21729,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::GeneratedCommandList::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -21768,7 +21768,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::AcceptedCommandList::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -21807,7 +21807,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::AttributeList::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::AttributeList::TypeInfo;
             TypeInfo::Type cppValue;
             {
                 using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
@@ -21846,7 +21846,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::FeatureMap::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::FeatureMap::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedIntValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
@@ -21864,7 +21864,7 @@ new CHIPDefaultSuccessCallbackBridge(
         },
         ^(Cancelable * success, Cancelable * failure) {
             ListFreer listFreer;
-            using TypeInfo = WindowCovering::Attributes::ClusterRevision::TypeInfo;
+            using TypeInfo = TestCluster::Attributes::ClusterRevision::TypeInfo;
             TypeInfo::Type cppValue;
             cppValue = value.unsignedShortValue;
             auto successFn = Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(success);
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
index f9282c04ffae87..16537d47bafcf2 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
@@ -152,16 +152,15 @@
 \*----------------------------------------------------------------------------*/
 
 /*----------------------------------------------------------------------------*\
-| Cluster AccessControl                                               | 0x001F |
+| Cluster Identify                                                    | 0x0003 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
+| * Identify                                                          |   0x00 |
+| * TriggerEffect                                                     |   0x40 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * Acl                                                               | 0x0000 |
-| * Extension                                                         | 0x0001 |
-| * SubjectsPerAccessControlEntry                                     | 0x0002 |
-| * TargetsPerAccessControlEntry                                      | 0x0003 |
-| * AccessControlEntriesPerFabric                                     | 0x0004 |
+| * IdentifyTime                                                      | 0x0000 |
+| * IdentifyType                                                      | 0x0001 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -169,281 +168,191 @@
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
-| * AccessControlEntryChanged                                         | 0x0000 |
-| * AccessControlExtensionChanged                                     | 0x0001 |
 \*----------------------------------------------------------------------------*/
 
 /*
- * Attribute Acl
+ * Command Identify
  */
-class ReadAccessControlAcl : public ReadAttribute {
+class IdentifyIdentify : public ClusterCommand {
 public:
-    ReadAccessControlAcl()
-        : ReadAttribute("acl")
+    IdentifyIdentify()
+        : ClusterCommand("identify")
     {
+        AddArgument("IdentifyTime", 0, UINT16_MAX, &mRequest.identifyTime);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadAccessControlAcl() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReadAttribute (0x00000000) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPReadParams * params = [[CHIPReadParams alloc] init];
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster readAttributeAclWithParams:params
-                          completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                              NSLog(@"AccessControl.Acl response %@", [value description]);
-                              if (error != nil) {
-                                  LogNSError("AccessControl Acl read Error", error);
-                              }
-                              SetCommandExitStatus(error);
-                          }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteAccessControlAcl : public WriteAttribute {
-public:
-    WriteAccessControlAcl()
-        : WriteAttribute("acl")
-        , mComplex(&mValue)
-    {
-        AddArgument("attr-name", "acl");
-        AddArgument("attr-value", &mComplex);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteAccessControlAcl() {}
+        ChipLogProgress(chipTool, "Sending cluster (0x00000003) command (0x00000000) on endpoint %u", endpointId);
 
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) WriteAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
+        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPIdentifyClusterIdentifyParams alloc] init];
+        params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSArray * _Nonnull value;
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mValue) {
-                CHIPAccessControlClusterAccessControlEntry * newElement_0;
-                newElement_0 = [CHIPAccessControlClusterAccessControlEntry new];
-                newElement_0.privilege = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.privilege)];
-                newElement_0.authMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.authMode)];
-                if (entry_0.subjects.IsNull()) {
-                    newElement_0.subjects = nil;
-                } else {
-                    { // Scope for our temporary variables
-                        auto * array_3 = [NSMutableArray new];
-                        for (auto & entry_3 : entry_0.subjects.Value()) {
-                            NSNumber * newElement_3;
-                            newElement_3 = [NSNumber numberWithUnsignedLongLong:entry_3];
-                            [array_3 addObject:newElement_3];
-                        }
-                        newElement_0.subjects = array_3;
-                    }
-                }
-                if (entry_0.targets.IsNull()) {
-                    newElement_0.targets = nil;
-                } else {
-                    { // Scope for our temporary variables
-                        auto * array_3 = [NSMutableArray new];
-                        for (auto & entry_3 : entry_0.targets.Value()) {
-                            CHIPAccessControlClusterTarget * newElement_3;
-                            newElement_3 = [CHIPAccessControlClusterTarget new];
-                            if (entry_3.cluster.IsNull()) {
-                                newElement_3.cluster = nil;
-                            } else {
-                                newElement_3.cluster = [NSNumber numberWithUnsignedInt:entry_3.cluster.Value()];
-                            }
-                            if (entry_3.endpoint.IsNull()) {
-                                newElement_3.endpoint = nil;
-                            } else {
-                                newElement_3.endpoint = [NSNumber numberWithUnsignedShort:entry_3.endpoint.Value()];
-                            }
-                            if (entry_3.deviceType.IsNull()) {
-                                newElement_3.deviceType = nil;
-                            } else {
-                                newElement_3.deviceType = [NSNumber numberWithUnsignedInt:entry_3.deviceType.Value()];
-                            }
-                            [array_3 addObject:newElement_3];
-                        }
-                        newElement_0.targets = array_3;
-                    }
-                }
-                newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
-                [array_0 addObject:newElement_0];
-            }
-            value = array_0;
+        params.identifyTime = [NSNumber numberWithUnsignedShort:mRequest.identifyTime];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster identifyWithParams:params
+                      completionHandler:^(NSError * _Nullable error) {
+                          responsesNeeded--;
+                          if (error != nil) {
+                              mError = error;
+                              LogNSError("Error", error);
+                          }
+                          if (responsesNeeded == 0) {
+                              SetCommandExitStatus(mError);
+                          }
+                      }];
         }
-
-        [cluster writeAttributeAclWithValue:value
-                                     params:params
-                          completionHandler:^(NSError * _Nullable error) {
-                              if (error != nil) {
-                                  LogNSError("AccessControl Acl write Error", error);
-                              }
-                              SetCommandExitStatus(error);
-                          }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::DataModel::List<const chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type> mValue;
-    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type>>
-        mComplex;
+    chip::app::Clusters::Identify::Commands::Identify::Type mRequest;
 };
 
-class SubscribeAttributeAccessControlAcl : public SubscribeAttribute {
+/*
+ * Command TriggerEffect
+ */
+class IdentifyTriggerEffect : public ClusterCommand {
 public:
-    SubscribeAttributeAccessControlAcl()
-        : SubscribeAttribute("acl")
+    IdentifyTriggerEffect()
+        : ClusterCommand("trigger-effect")
     {
+        AddArgument("EffectIdentifier", 0, UINT8_MAX, &mRequest.effectIdentifier);
+        AddArgument("EffectVariant", 0, UINT8_MAX, &mRequest.effectVariant);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeAccessControlAcl() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReportAttribute (0x00000000) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAclWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AccessControl.Acl response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000003) command (0x00000040) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPIdentifyClusterTriggerEffectParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.effectIdentifier = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.effectIdentifier)];
+        params.effectVariant = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.effectVariant)];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster triggerEffectWithParams:params
+                           completionHandler:^(NSError * _Nullable error) {
+                               responsesNeeded--;
+                               if (error != nil) {
+                                   mError = error;
+                                   LogNSError("Error", error);
+                               }
+                               if (responsesNeeded == 0) {
+                                   SetCommandExitStatus(mError);
+                               }
+                           }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::Identify::Commands::TriggerEffect::Type mRequest;
 };
 
 /*
- * Attribute Extension
+ * Attribute IdentifyTime
  */
-class ReadAccessControlExtension : public ReadAttribute {
+class ReadIdentifyIdentifyTime : public ReadAttribute {
 public:
-    ReadAccessControlExtension()
-        : ReadAttribute("extension")
+    ReadIdentifyIdentifyTime()
+        : ReadAttribute("identify-time")
     {
     }
 
-    ~ReadAccessControlExtension() {}
+    ~ReadIdentifyIdentifyTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPReadParams * params = [[CHIPReadParams alloc] init];
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster readAttributeExtensionWithParams:params
-                                completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                    NSLog(@"AccessControl.Extension response %@", [value description]);
-                                    if (error != nil) {
-                                        LogNSError("AccessControl Extension read Error", error);
-                                    }
-                                    SetCommandExitStatus(error);
-                                }];
+        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeIdentifyTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Identify.IdentifyTime response %@", [value description]);
+            if (error != nil) {
+                LogNSError("Identify IdentifyTime read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class WriteAccessControlExtension : public WriteAttribute {
+class WriteIdentifyIdentifyTime : public WriteAttribute {
 public:
-    WriteAccessControlExtension()
-        : WriteAttribute("extension")
-        , mComplex(&mValue)
+    WriteIdentifyIdentifyTime()
+        : WriteAttribute("identify-time")
     {
-        AddArgument("attr-name", "extension");
-        AddArgument("attr-value", &mComplex);
+        AddArgument("attr-name", "identify-time");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteAccessControlExtension() {}
+    ~WriteIdentifyIdentifyTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) WriteAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000003) WriteAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSArray * _Nonnull value;
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mValue) {
-                CHIPAccessControlClusterExtensionEntry * newElement_0;
-                newElement_0 = [CHIPAccessControlClusterExtensionEntry new];
-                newElement_0.data = [NSData dataWithBytes:entry_0.data.data() length:entry_0.data.size()];
-                newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
-                [array_0 addObject:newElement_0];
-            }
-            value = array_0;
-        }
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
 
-        [cluster writeAttributeExtensionWithValue:value
-                                           params:params
-                                completionHandler:^(NSError * _Nullable error) {
-                                    if (error != nil) {
-                                        LogNSError("AccessControl Extension write Error", error);
-                                    }
-                                    SetCommandExitStatus(error);
-                                }];
+        [cluster writeAttributeIdentifyTimeWithValue:value
+                                              params:params
+                                   completionHandler:^(NSError * _Nullable error) {
+                                       if (error != nil) {
+                                           LogNSError("Identify IdentifyTime write Error", error);
+                                       }
+                                       SetCommandExitStatus(error);
+                                   }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::DataModel::List<const chip::app::Clusters::AccessControl::Structs::ExtensionEntry::Type> mValue;
-    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::AccessControl::Structs::ExtensionEntry::Type>>
-        mComplex;
+    uint16_t mValue;
 };
 
-class SubscribeAttributeAccessControlExtension : public SubscribeAttribute {
+class SubscribeAttributeIdentifyIdentifyTime : public SubscribeAttribute {
 public:
-    SubscribeAttributeAccessControlExtension()
-        : SubscribeAttribute("extension")
+    SubscribeAttributeIdentifyIdentifyTime()
+        : SubscribeAttribute("identify-time")
     {
     }
 
-    ~SubscribeAttributeAccessControlExtension() {}
+    ~SubscribeAttributeIdentifyIdentifyTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeExtensionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeIdentifyTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AccessControl.Extension response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Identify.IdentifyTime response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -454,28 +363,27 @@ class SubscribeAttributeAccessControlExtension : public SubscribeAttribute {
 };
 
 /*
- * Attribute SubjectsPerAccessControlEntry
+ * Attribute IdentifyType
  */
-class ReadAccessControlSubjectsPerAccessControlEntry : public ReadAttribute {
+class ReadIdentifyIdentifyType : public ReadAttribute {
 public:
-    ReadAccessControlSubjectsPerAccessControlEntry()
-        : ReadAttribute("subjects-per-access-control-entry")
+    ReadIdentifyIdentifyType()
+        : ReadAttribute("identify-type")
     {
     }
 
-    ~ReadAccessControlSubjectsPerAccessControlEntry() {}
+    ~ReadIdentifyIdentifyType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeSubjectsPerAccessControlEntryWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AccessControl.SubjectsPerAccessControlEntry response %@", [value description]);
+        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeIdentifyTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Identify.IdentifyType response %@", [value description]);
             if (error != nil) {
-                LogNSError("AccessControl SubjectsPerAccessControlEntry read Error", error);
+                LogNSError("Identify IdentifyType read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -483,32 +391,32 @@ class ReadAccessControlSubjectsPerAccessControlEntry : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAccessControlSubjectsPerAccessControlEntry : public SubscribeAttribute {
+class SubscribeAttributeIdentifyIdentifyType : public SubscribeAttribute {
 public:
-    SubscribeAttributeAccessControlSubjectsPerAccessControlEntry()
-        : SubscribeAttribute("subjects-per-access-control-entry")
+    SubscribeAttributeIdentifyIdentifyType()
+        : SubscribeAttribute("identify-type")
     {
     }
 
-    ~SubscribeAttributeAccessControlSubjectsPerAccessControlEntry() {}
+    ~SubscribeAttributeIdentifyIdentifyType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSubjectsPerAccessControlEntryWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeIdentifyTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AccessControl.SubjectsPerAccessControlEntry response %@", [value description]);
+                NSLog(@"Identify.IdentifyType response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -519,28 +427,27 @@ class SubscribeAttributeAccessControlSubjectsPerAccessControlEntry : public Subs
 };
 
 /*
- * Attribute TargetsPerAccessControlEntry
+ * Attribute GeneratedCommandList
  */
-class ReadAccessControlTargetsPerAccessControlEntry : public ReadAttribute {
+class ReadIdentifyGeneratedCommandList : public ReadAttribute {
 public:
-    ReadAccessControlTargetsPerAccessControlEntry()
-        : ReadAttribute("targets-per-access-control-entry")
+    ReadIdentifyGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadAccessControlTargetsPerAccessControlEntry() {}
+    ~ReadIdentifyGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeTargetsPerAccessControlEntryWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AccessControl.TargetsPerAccessControlEntry response %@", [value description]);
+        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Identify.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("AccessControl TargetsPerAccessControlEntry read Error", error);
+                LogNSError("Identify GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -548,32 +455,32 @@ class ReadAccessControlTargetsPerAccessControlEntry : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAccessControlTargetsPerAccessControlEntry : public SubscribeAttribute {
+class SubscribeAttributeIdentifyGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeAccessControlTargetsPerAccessControlEntry()
-        : SubscribeAttribute("targets-per-access-control-entry")
+    SubscribeAttributeIdentifyGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeAccessControlTargetsPerAccessControlEntry() {}
+    ~SubscribeAttributeIdentifyGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTargetsPerAccessControlEntryWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AccessControl.TargetsPerAccessControlEntry response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Identify.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -584,28 +491,27 @@ class SubscribeAttributeAccessControlTargetsPerAccessControlEntry : public Subsc
 };
 
 /*
- * Attribute AccessControlEntriesPerFabric
+ * Attribute AcceptedCommandList
  */
-class ReadAccessControlAccessControlEntriesPerFabric : public ReadAttribute {
+class ReadIdentifyAcceptedCommandList : public ReadAttribute {
 public:
-    ReadAccessControlAccessControlEntriesPerFabric()
-        : ReadAttribute("access-control-entries-per-fabric")
+    ReadIdentifyAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadAccessControlAccessControlEntriesPerFabric() {}
+    ~ReadIdentifyAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReadAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAccessControlEntriesPerFabricWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AccessControl.AccessControlEntriesPerFabric response %@", [value description]);
+        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Identify.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("AccessControl AccessControlEntriesPerFabric read Error", error);
+                LogNSError("Identify AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -613,32 +519,32 @@ class ReadAccessControlAccessControlEntriesPerFabric : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAccessControlAccessControlEntriesPerFabric : public SubscribeAttribute {
+class SubscribeAttributeIdentifyAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeAccessControlAccessControlEntriesPerFabric()
-        : SubscribeAttribute("access-control-entries-per-fabric")
+    SubscribeAttributeIdentifyAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeAccessControlAccessControlEntriesPerFabric() {}
+    ~SubscribeAttributeIdentifyAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAccessControlEntriesPerFabricWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AccessControl.AccessControlEntriesPerFabric response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Identify.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -649,27 +555,27 @@ class SubscribeAttributeAccessControlAccessControlEntriesPerFabric : public Subs
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute AttributeList
  */
-class ReadAccessControlGeneratedCommandList : public ReadAttribute {
+class ReadIdentifyAttributeList : public ReadAttribute {
 public:
-    ReadAccessControlGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadIdentifyAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadAccessControlGeneratedCommandList() {}
+    ~ReadIdentifyAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AccessControl.GeneratedCommandList response %@", [value description]);
+        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Identify.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("AccessControl GeneratedCommandList read Error", error);
+                LogNSError("Identify AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -677,32 +583,32 @@ class ReadAccessControlGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAccessControlGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeIdentifyAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeAccessControlGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeIdentifyAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeAccessControlGeneratedCommandList() {}
+    ~SubscribeAttributeIdentifyAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AccessControl.GeneratedCommandList response %@", [value description]);
+                NSLog(@"Identify.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -713,27 +619,27 @@ class SubscribeAttributeAccessControlGeneratedCommandList : public SubscribeAttr
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute FeatureMap
  */
-class ReadAccessControlAcceptedCommandList : public ReadAttribute {
+class ReadIdentifyFeatureMap : public ReadAttribute {
 public:
-    ReadAccessControlAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadIdentifyFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadAccessControlAcceptedCommandList() {}
+    ~ReadIdentifyFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AccessControl.AcceptedCommandList response %@", [value description]);
+        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Identify.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("AccessControl AcceptedCommandList read Error", error);
+                LogNSError("Identify FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -741,32 +647,32 @@ class ReadAccessControlAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAccessControlAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeIdentifyFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeAccessControlAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeIdentifyFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeAccessControlAcceptedCommandList() {}
+    ~SubscribeAttributeIdentifyFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AccessControl.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Identify.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -777,27 +683,27 @@ class SubscribeAttributeAccessControlAcceptedCommandList : public SubscribeAttri
 };
 
 /*
- * Attribute AttributeList
+ * Attribute ClusterRevision
  */
-class ReadAccessControlAttributeList : public ReadAttribute {
+class ReadIdentifyClusterRevision : public ReadAttribute {
 public:
-    ReadAccessControlAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadIdentifyClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadAccessControlAttributeList() {}
+    ~ReadIdentifyClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AccessControl.AttributeList response %@", [value description]);
+        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Identify.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("AccessControl AttributeList read Error", error);
+                LogNSError("Identify ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -805,32 +711,32 @@ class ReadAccessControlAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAccessControlAttributeList : public SubscribeAttribute {
+class SubscribeAttributeIdentifyClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeAccessControlAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeIdentifyClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeAccessControlAttributeList() {}
+    ~SubscribeAttributeIdentifyClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AccessControl.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Identify.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -840,313 +746,335 @@ class SubscribeAttributeAccessControlAttributeList : public SubscribeAttribute {
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster Groups                                                      | 0x0004 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * AddGroup                                                          |   0x00 |
+| * ViewGroup                                                         |   0x01 |
+| * GetGroupMembership                                                |   0x02 |
+| * RemoveGroup                                                       |   0x03 |
+| * RemoveAllGroups                                                   |   0x04 |
+| * AddGroupIfIdentifying                                             |   0x05 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * NameSupport                                                       | 0x0000 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute FeatureMap
+ * Command AddGroup
  */
-class ReadAccessControlFeatureMap : public ReadAttribute {
+class GroupsAddGroup : public ClusterCommand {
 public:
-    ReadAccessControlFeatureMap()
-        : ReadAttribute("feature-map")
+    GroupsAddGroup()
+        : ClusterCommand("add-group")
     {
+        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
+        AddArgument("GroupName", &mRequest.groupName);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadAccessControlFeatureMap() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000004) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AccessControl.FeatureMap response %@", [value description]);
-            if (error != nil) {
-                LogNSError("AccessControl FeatureMap read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPGroupsClusterAddGroupParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
+        params.groupName = [[NSString alloc] initWithBytes:mRequest.groupName.data()
+                                                    length:mRequest.groupName.size()
+                                                  encoding:NSUTF8StringEncoding];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster addGroupWithParams:params
+                      completionHandler:^(CHIPGroupsClusterAddGroupResponseParams * _Nullable values, NSError * _Nullable error) {
+                          NSLog(@"Values: %@", values);
+                          responsesNeeded--;
+                          if (error != nil) {
+                              mError = error;
+                              LogNSError("Error", error);
+                          }
+                          if (responsesNeeded == 0) {
+                              SetCommandExitStatus(mError);
+                          }
+                      }];
+        }
         return CHIP_NO_ERROR;
     }
-};
-
-class SubscribeAttributeAccessControlFeatureMap : public SubscribeAttribute {
-public:
-    SubscribeAttributeAccessControlFeatureMap()
-        : SubscribeAttribute("feature-map")
-    {
-    }
-
-    ~SubscribeAttributeAccessControlFeatureMap() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AccessControl.FeatureMap response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
 
-        return CHIP_NO_ERROR;
-    }
+private:
+    chip::app::Clusters::Groups::Commands::AddGroup::Type mRequest;
 };
 
 /*
- * Attribute ClusterRevision
+ * Command ViewGroup
  */
-class ReadAccessControlClusterRevision : public ReadAttribute {
+class GroupsViewGroup : public ClusterCommand {
 public:
-    ReadAccessControlClusterRevision()
-        : ReadAttribute("cluster-revision")
+    GroupsViewGroup()
+        : ClusterCommand("view-group")
     {
+        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadAccessControlClusterRevision() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000004) command (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AccessControl.ClusterRevision response %@", [value description]);
-            if (error != nil) {
-                LogNSError("AccessControl ClusterRevision read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPGroupsClusterViewGroupParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster viewGroupWithParams:params
+                       completionHandler:^(CHIPGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable error) {
+                           NSLog(@"Values: %@", values);
+                           responsesNeeded--;
+                           if (error != nil) {
+                               mError = error;
+                               LogNSError("Error", error);
+                           }
+                           if (responsesNeeded == 0) {
+                               SetCommandExitStatus(mError);
+                           }
+                       }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::Groups::Commands::ViewGroup::Type mRequest;
 };
 
-class SubscribeAttributeAccessControlClusterRevision : public SubscribeAttribute {
+/*
+ * Command GetGroupMembership
+ */
+class GroupsGetGroupMembership : public ClusterCommand {
 public:
-    SubscribeAttributeAccessControlClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    GroupsGetGroupMembership()
+        : ClusterCommand("get-group-membership")
+        , mComplex_GroupList(&mRequest.groupList)
     {
+        AddArgument("GroupList", &mComplex_GroupList);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeAccessControlClusterRevision() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000004) command (0x00000002) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
+        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPGroupsClusterGetGroupMembershipParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mRequest.groupList) {
+                NSNumber * newElement_0;
+                newElement_0 = [NSNumber numberWithUnsignedShort:entry_0];
+                [array_0 addObject:newElement_0];
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AccessControl.ClusterRevision response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
-
+            params.groupList = array_0;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster getGroupMembershipWithParams:params
+                                completionHandler:^(CHIPGroupsClusterGetGroupMembershipResponseParams * _Nullable values,
+                                    NSError * _Nullable error) {
+                                    NSLog(@"Values: %@", values);
+                                    responsesNeeded--;
+                                    if (error != nil) {
+                                        mError = error;
+                                        LogNSError("Error", error);
+                                    }
+                                    if (responsesNeeded == 0) {
+                                        SetCommandExitStatus(mError);
+                                    }
+                                }];
+        }
         return CHIP_NO_ERROR;
     }
-};
 
-/*----------------------------------------------------------------------------*\
-| Cluster AccountLogin                                                | 0x050E |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * GetSetupPIN                                                       |   0x00 |
-| * Login                                                             |   0x02 |
-| * Logout                                                            |   0x03 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
+private:
+    chip::app::Clusters::Groups::Commands::GetGroupMembership::Type mRequest;
+    TypedComplexArgument<chip::app::DataModel::List<const chip::GroupId>> mComplex_GroupList;
+};
 
 /*
- * Command GetSetupPIN
+ * Command RemoveGroup
  */
-class AccountLoginGetSetupPIN : public ClusterCommand {
+class GroupsRemoveGroup : public ClusterCommand {
 public:
-    AccountLoginGetSetupPIN()
-        : ClusterCommand("get-setup-pin")
+    GroupsRemoveGroup()
+        : ClusterCommand("remove-group")
     {
-        AddArgument("TempAccountIdentifier", &mRequest.tempAccountIdentifier);
+        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000004) command (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPAccountLoginClusterGetSetupPINParams alloc] init];
+        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPGroupsClusterRemoveGroupParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.tempAccountIdentifier = [[NSString alloc] initWithBytes:mRequest.tempAccountIdentifier.data()
-                                                                length:mRequest.tempAccountIdentifier.size()
-                                                              encoding:NSUTF8StringEncoding];
+        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster getSetupPINWithParams:params
-                         completionHandler:^(
-                             CHIPAccountLoginClusterGetSetupPINResponseParams * _Nullable values, NSError * _Nullable error) {
-                             NSLog(@"Values: %@", values);
-                             responsesNeeded--;
-                             if (error != nil) {
-                                 mError = error;
-                                 LogNSError("Error", error);
-                             }
-                             if (responsesNeeded == 0) {
-                                 SetCommandExitStatus(mError);
-                             }
-                         }];
+            [cluster
+                removeGroupWithParams:params
+                    completionHandler:^(CHIPGroupsClusterRemoveGroupResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::AccountLogin::Commands::GetSetupPIN::Type mRequest;
+    chip::app::Clusters::Groups::Commands::RemoveGroup::Type mRequest;
 };
 
 /*
- * Command Login
+ * Command RemoveAllGroups
  */
-class AccountLoginLogin : public ClusterCommand {
+class GroupsRemoveAllGroups : public ClusterCommand {
 public:
-    AccountLoginLogin()
-        : ClusterCommand("login")
+    GroupsRemoveAllGroups()
+        : ClusterCommand("remove-all-groups")
     {
-        AddArgument("TempAccountIdentifier", &mRequest.tempAccountIdentifier);
-        AddArgument("SetupPIN", &mRequest.setupPIN);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) command (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000004) command (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPAccountLoginClusterLoginParams alloc] init];
+        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPGroupsClusterRemoveAllGroupsParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.tempAccountIdentifier = [[NSString alloc] initWithBytes:mRequest.tempAccountIdentifier.data()
-                                                                length:mRequest.tempAccountIdentifier.size()
-                                                              encoding:NSUTF8StringEncoding];
-        params.setupPIN = [[NSString alloc] initWithBytes:mRequest.setupPIN.data()
-                                                   length:mRequest.setupPIN.size()
-                                                 encoding:NSUTF8StringEncoding];
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster loginWithParams:params
-                   completionHandler:^(NSError * _Nullable error) {
-                       responsesNeeded--;
-                       if (error != nil) {
-                           mError = error;
-                           LogNSError("Error", error);
-                       }
-                       if (responsesNeeded == 0) {
-                           SetCommandExitStatus(mError);
-                       }
-                   }];
+            [cluster removeAllGroupsWithParams:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 responsesNeeded--;
+                                 if (error != nil) {
+                                     mError = error;
+                                     LogNSError("Error", error);
+                                 }
+                                 if (responsesNeeded == 0) {
+                                     SetCommandExitStatus(mError);
+                                 }
+                             }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::AccountLogin::Commands::Login::Type mRequest;
 };
 
 /*
- * Command Logout
+ * Command AddGroupIfIdentifying
  */
-class AccountLoginLogout : public ClusterCommand {
+class GroupsAddGroupIfIdentifying : public ClusterCommand {
 public:
-    AccountLoginLogout()
-        : ClusterCommand("logout")
+    GroupsAddGroupIfIdentifying()
+        : ClusterCommand("add-group-if-identifying")
     {
+        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
+        AddArgument("GroupName", &mRequest.groupName);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) command (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000004) command (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPAccountLoginClusterLogoutParams alloc] init];
+        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPGroupsClusterAddGroupIfIdentifyingParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
+        params.groupName = [[NSString alloc] initWithBytes:mRequest.groupName.data()
+                                                    length:mRequest.groupName.size()
+                                                  encoding:NSUTF8StringEncoding];
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster logoutWithParams:params
-                    completionHandler:^(NSError * _Nullable error) {
-                        responsesNeeded--;
-                        if (error != nil) {
-                            mError = error;
-                            LogNSError("Error", error);
-                        }
-                        if (responsesNeeded == 0) {
-                            SetCommandExitStatus(mError);
-                        }
-                    }];
+            [cluster addGroupIfIdentifyingWithParams:params
+                                   completionHandler:^(NSError * _Nullable error) {
+                                       responsesNeeded--;
+                                       if (error != nil) {
+                                           mError = error;
+                                           LogNSError("Error", error);
+                                       }
+                                       if (responsesNeeded == 0) {
+                                           SetCommandExitStatus(mError);
+                                       }
+                                   }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
+    chip::app::Clusters::Groups::Commands::AddGroupIfIdentifying::Type mRequest;
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute NameSupport
  */
-class ReadAccountLoginGeneratedCommandList : public ReadAttribute {
+class ReadGroupsNameSupport : public ReadAttribute {
 public:
-    ReadAccountLoginGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadGroupsNameSupport()
+        : ReadAttribute("name-support")
     {
     }
 
-    ~ReadAccountLoginGeneratedCommandList() {}
+    ~ReadGroupsNameSupport() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000004) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AccountLogin.GeneratedCommandList response %@", [value description]);
+        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNameSupportWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Groups.NameSupport response %@", [value description]);
             if (error != nil) {
-                LogNSError("AccountLogin GeneratedCommandList read Error", error);
+                LogNSError("Groups NameSupport read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -1154,32 +1082,32 @@ class ReadAccountLoginGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAccountLoginGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeGroupsNameSupport : public SubscribeAttribute {
 public:
-    SubscribeAttributeAccountLoginGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeGroupsNameSupport()
+        : SubscribeAttribute("name-support")
     {
     }
 
-    ~SubscribeAttributeAccountLoginGeneratedCommandList() {}
+    ~SubscribeAttributeGroupsNameSupport() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000004) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNameSupportWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AccountLogin.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Groups.NameSupport response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -1190,27 +1118,27 @@ class SubscribeAttributeAccountLoginGeneratedCommandList : public SubscribeAttri
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute GeneratedCommandList
  */
-class ReadAccountLoginAcceptedCommandList : public ReadAttribute {
+class ReadGroupsGeneratedCommandList : public ReadAttribute {
 public:
-    ReadAccountLoginAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadGroupsGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadAccountLoginAcceptedCommandList() {}
+    ~ReadGroupsGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000004) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AccountLogin.AcceptedCommandList response %@", [value description]);
+        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Groups.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("AccountLogin AcceptedCommandList read Error", error);
+                LogNSError("Groups GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -1218,32 +1146,32 @@ class ReadAccountLoginAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAccountLoginAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeGroupsGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeAccountLoginAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeGroupsGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeAccountLoginAcceptedCommandList() {}
+    ~SubscribeAttributeGroupsGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000004) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AccountLogin.AcceptedCommandList response %@", [value description]);
+                NSLog(@"Groups.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -1254,27 +1182,27 @@ class SubscribeAttributeAccountLoginAcceptedCommandList : public SubscribeAttrib
 };
 
 /*
- * Attribute AttributeList
+ * Attribute AcceptedCommandList
  */
-class ReadAccountLoginAttributeList : public ReadAttribute {
+class ReadGroupsAcceptedCommandList : public ReadAttribute {
 public:
-    ReadAccountLoginAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadGroupsAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadAccountLoginAttributeList() {}
+    ~ReadGroupsAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000004) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AccountLogin.AttributeList response %@", [value description]);
+        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Groups.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("AccountLogin AttributeList read Error", error);
+                LogNSError("Groups AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -1282,32 +1210,32 @@ class ReadAccountLoginAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAccountLoginAttributeList : public SubscribeAttribute {
+class SubscribeAttributeGroupsAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeAccountLoginAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeGroupsAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeAccountLoginAttributeList() {}
+    ~SubscribeAttributeGroupsAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000004) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AccountLogin.AttributeList response %@", [value description]);
+                NSLog(@"Groups.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -1318,27 +1246,91 @@ class SubscribeAttributeAccountLoginAttributeList : public SubscribeAttribute {
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute AttributeList
  */
-class ReadAccountLoginFeatureMap : public ReadAttribute {
+class ReadGroupsAttributeList : public ReadAttribute {
 public:
-    ReadAccountLoginFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadGroupsAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadAccountLoginFeatureMap() {}
+    ~ReadGroupsAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000004) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Groups.AttributeList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("Groups AttributeList read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeGroupsAttributeList : public SubscribeAttribute {
+public:
+    SubscribeAttributeGroupsAttributeList()
+        : SubscribeAttribute("attribute-list")
+    {
+    }
+
+    ~SubscribeAttributeGroupsAttributeList() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000004) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Groups.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+/*
+ * Attribute FeatureMap
+ */
+class ReadGroupsFeatureMap : public ReadAttribute {
+public:
+    ReadGroupsFeatureMap()
+        : ReadAttribute("feature-map")
+    {
+    }
+
+    ~ReadGroupsFeatureMap() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000004) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AccountLogin.FeatureMap response %@", [value description]);
+            NSLog(@"Groups.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("AccountLogin FeatureMap read Error", error);
+                LogNSError("Groups FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -1346,20 +1338,20 @@ class ReadAccountLoginFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAccountLoginFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeGroupsFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeAccountLoginFeatureMap()
+    SubscribeAttributeGroupsFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeAccountLoginFeatureMap() {}
+    ~SubscribeAttributeGroupsFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000004) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -1371,7 +1363,7 @@ class SubscribeAttributeAccountLoginFeatureMap : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AccountLogin.FeatureMap response %@", [value description]);
+                NSLog(@"Groups.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -1384,25 +1376,25 @@ class SubscribeAttributeAccountLoginFeatureMap : public SubscribeAttribute {
 /*
  * Attribute ClusterRevision
  */
-class ReadAccountLoginClusterRevision : public ReadAttribute {
+class ReadGroupsClusterRevision : public ReadAttribute {
 public:
-    ReadAccountLoginClusterRevision()
+    ReadGroupsClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadAccountLoginClusterRevision() {}
+    ~ReadGroupsClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000004) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AccountLogin.ClusterRevision response %@", [value description]);
+            NSLog(@"Groups.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("AccountLogin ClusterRevision read Error", error);
+                LogNSError("Groups ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -1410,20 +1402,20 @@ class ReadAccountLoginClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAccountLoginClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeGroupsClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeAccountLoginClusterRevision()
+    SubscribeAttributeGroupsClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeAccountLoginClusterRevision() {}
+    ~SubscribeAttributeGroupsClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000004) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -1435,7 +1427,7 @@ class SubscribeAttributeAccountLoginClusterRevision : public SubscribeAttribute
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AccountLogin.ClusterRevision response %@", [value description]);
+                NSLog(@"Groups.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -1446,17 +1438,27 @@ class SubscribeAttributeAccountLoginClusterRevision : public SubscribeAttribute
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster AdministratorCommissioning                                  | 0x003C |
+| Cluster Scenes                                                      | 0x0005 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * OpenCommissioningWindow                                           |   0x00 |
-| * OpenBasicCommissioningWindow                                      |   0x01 |
-| * RevokeCommissioning                                               |   0x02 |
+| * AddScene                                                          |   0x00 |
+| * ViewScene                                                         |   0x01 |
+| * RemoveScene                                                       |   0x02 |
+| * RemoveAllScenes                                                   |   0x03 |
+| * StoreScene                                                        |   0x04 |
+| * RecallScene                                                       |   0x05 |
+| * GetSceneMembership                                                |   0x06 |
+| * EnhancedAddScene                                                  |   0x40 |
+| * EnhancedViewScene                                                 |   0x41 |
+| * CopyScene                                                         |   0x42 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * WindowStatus                                                      | 0x0000 |
-| * AdminFabricIndex                                                  | 0x0001 |
-| * AdminVendorId                                                     | 0x0002 |
+| * SceneCount                                                        | 0x0000 |
+| * CurrentScene                                                      | 0x0001 |
+| * CurrentGroup                                                      | 0x0002 |
+| * SceneValid                                                        | 0x0003 |
+| * NameSupport                                                       | 0x0004 |
+| * LastConfiguredBy                                                  | 0x0005 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -1467,308 +1469,600 @@ class SubscribeAttributeAccountLoginClusterRevision : public SubscribeAttribute
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command OpenCommissioningWindow
+ * Command AddScene
  */
-class AdministratorCommissioningOpenCommissioningWindow : public ClusterCommand {
+class ScenesAddScene : public ClusterCommand {
 public:
-    AdministratorCommissioningOpenCommissioningWindow()
-        : ClusterCommand("open-commissioning-window")
+    ScenesAddScene()
+        : ClusterCommand("add-scene")
+        , mComplex_ExtensionFieldSets(&mRequest.extensionFieldSets)
     {
-        AddArgument("CommissioningTimeout", 0, UINT16_MAX, &mRequest.commissioningTimeout);
-        AddArgument("PAKEVerifier", &mRequest.PAKEVerifier);
-        AddArgument("Discriminator", 0, UINT16_MAX, &mRequest.discriminator);
-        AddArgument("Iterations", 0, UINT32_MAX, &mRequest.iterations);
-        AddArgument("Salt", &mRequest.salt);
+        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
+        AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        AddArgument("SceneName", &mRequest.sceneName);
+        AddArgument("ExtensionFieldSets", &mComplex_ExtensionFieldSets);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        __auto_type * params = [[CHIPAdministratorCommissioningClusterOpenCommissioningWindowParams alloc] init];
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPScenesClusterAddSceneParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.commissioningTimeout = [NSNumber numberWithUnsignedShort:mRequest.commissioningTimeout];
-        params.pakeVerifier = [NSData dataWithBytes:mRequest.PAKEVerifier.data() length:mRequest.PAKEVerifier.size()];
-        params.discriminator = [NSNumber numberWithUnsignedShort:mRequest.discriminator];
-        params.iterations = [NSNumber numberWithUnsignedInt:mRequest.iterations];
-        params.salt = [NSData dataWithBytes:mRequest.salt.data() length:mRequest.salt.size()];
+        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
+        params.sceneId = [NSNumber numberWithUnsignedChar:mRequest.sceneId];
+        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
+        params.sceneName = [[NSString alloc] initWithBytes:mRequest.sceneName.data()
+                                                    length:mRequest.sceneName.size()
+                                                  encoding:NSUTF8StringEncoding];
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mRequest.extensionFieldSets) {
+                CHIPScenesClusterExtensionFieldSet * newElement_0;
+                newElement_0 = [CHIPScenesClusterExtensionFieldSet new];
+                newElement_0.clusterId = [NSNumber numberWithUnsignedInt:entry_0.clusterId];
+                { // Scope for our temporary variables
+                    auto * array_2 = [NSMutableArray new];
+                    for (auto & entry_2 : entry_0.attributeValueList) {
+                        CHIPScenesClusterAttributeValuePair * newElement_2;
+                        newElement_2 = [CHIPScenesClusterAttributeValuePair new];
+                        if (entry_2.attributeId.HasValue()) {
+                            newElement_2.attributeId = [NSNumber numberWithUnsignedInt:entry_2.attributeId.Value()];
+                        } else {
+                            newElement_2.attributeId = nil;
+                        }
+                        { // Scope for our temporary variables
+                            auto * array_4 = [NSMutableArray new];
+                            for (auto & entry_4 : entry_2.attributeValue) {
+                                NSNumber * newElement_4;
+                                newElement_4 = [NSNumber numberWithUnsignedChar:entry_4];
+                                [array_4 addObject:newElement_4];
+                            }
+                            newElement_2.attributeValue = array_4;
+                        }
+                        [array_2 addObject:newElement_2];
+                    }
+                    newElement_0.attributeValueList = array_2;
+                }
+                [array_0 addObject:newElement_0];
+            }
+            params.extensionFieldSets = array_0;
+        }
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster openCommissioningWindowWithParams:params
-                                     completionHandler:^(NSError * _Nullable error) {
-                                         responsesNeeded--;
-                                         if (error != nil) {
-                                             mError = error;
-                                             LogNSError("Error", error);
-                                         }
-                                         if (responsesNeeded == 0) {
-                                             SetCommandExitStatus(mError);
-                                         }
-                                     }];
+            [cluster addSceneWithParams:params
+                      completionHandler:^(CHIPScenesClusterAddSceneResponseParams * _Nullable values, NSError * _Nullable error) {
+                          NSLog(@"Values: %@", values);
+                          responsesNeeded--;
+                          if (error != nil) {
+                              mError = error;
+                              LogNSError("Error", error);
+                          }
+                          if (responsesNeeded == 0) {
+                              SetCommandExitStatus(mError);
+                          }
+                      }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type mRequest;
+    chip::app::Clusters::Scenes::Commands::AddScene::Type mRequest;
+    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::Scenes::Structs::ExtensionFieldSet::Type>>
+        mComplex_ExtensionFieldSets;
 };
 
 /*
- * Command OpenBasicCommissioningWindow
+ * Command ViewScene
  */
-class AdministratorCommissioningOpenBasicCommissioningWindow : public ClusterCommand {
+class ScenesViewScene : public ClusterCommand {
 public:
-    AdministratorCommissioningOpenBasicCommissioningWindow()
-        : ClusterCommand("open-basic-commissioning-window")
+    ScenesViewScene()
+        : ClusterCommand("view-scene")
     {
-        AddArgument("CommissioningTimeout", 0, UINT16_MAX, &mRequest.commissioningTimeout);
+        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
+        AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) command (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) command (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        __auto_type * params = [[CHIPAdministratorCommissioningClusterOpenBasicCommissioningWindowParams alloc] init];
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPScenesClusterViewSceneParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.commissioningTimeout = [NSNumber numberWithUnsignedShort:mRequest.commissioningTimeout];
+        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
+        params.sceneId = [NSNumber numberWithUnsignedChar:mRequest.sceneId];
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster openBasicCommissioningWindowWithParams:params
-                                          completionHandler:^(NSError * _Nullable error) {
-                                              responsesNeeded--;
-                                              if (error != nil) {
-                                                  mError = error;
-                                                  LogNSError("Error", error);
-                                              }
-                                              if (responsesNeeded == 0) {
-                                                  SetCommandExitStatus(mError);
-                                              }
-                                          }];
+            [cluster viewSceneWithParams:params
+                       completionHandler:^(CHIPScenesClusterViewSceneResponseParams * _Nullable values, NSError * _Nullable error) {
+                           NSLog(@"Values: %@", values);
+                           responsesNeeded--;
+                           if (error != nil) {
+                               mError = error;
+                               LogNSError("Error", error);
+                           }
+                           if (responsesNeeded == 0) {
+                               SetCommandExitStatus(mError);
+                           }
+                       }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Type mRequest;
+    chip::app::Clusters::Scenes::Commands::ViewScene::Type mRequest;
 };
 
 /*
- * Command RevokeCommissioning
+ * Command RemoveScene
  */
-class AdministratorCommissioningRevokeCommissioning : public ClusterCommand {
+class ScenesRemoveScene : public ClusterCommand {
 public:
-    AdministratorCommissioningRevokeCommissioning()
-        : ClusterCommand("revoke-commissioning")
+    ScenesRemoveScene()
+        : ClusterCommand("remove-scene")
     {
+        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
+        AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) command (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) command (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        __auto_type * params = [[CHIPAdministratorCommissioningClusterRevokeCommissioningParams alloc] init];
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPScenesClusterRemoveSceneParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
+        params.sceneId = [NSNumber numberWithUnsignedChar:mRequest.sceneId];
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster revokeCommissioningWithParams:params
-                                 completionHandler:^(NSError * _Nullable error) {
-                                     responsesNeeded--;
-                                     if (error != nil) {
-                                         mError = error;
-                                         LogNSError("Error", error);
-                                     }
-                                     if (responsesNeeded == 0) {
-                                         SetCommandExitStatus(mError);
-                                     }
-                                 }];
+            [cluster
+                removeSceneWithParams:params
+                    completionHandler:^(CHIPScenesClusterRemoveSceneResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
+    chip::app::Clusters::Scenes::Commands::RemoveScene::Type mRequest;
 };
 
 /*
- * Attribute WindowStatus
+ * Command RemoveAllScenes
  */
-class ReadAdministratorCommissioningWindowStatus : public ReadAttribute {
+class ScenesRemoveAllScenes : public ClusterCommand {
 public:
-    ReadAdministratorCommissioningWindowStatus()
-        : ReadAttribute("window-status")
+    ScenesRemoveAllScenes()
+        : ClusterCommand("remove-all-scenes")
     {
+        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadAdministratorCommissioningWindowStatus() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) command (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeWindowStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AdministratorCommissioning.WindowStatus response %@", [value description]);
-            if (error != nil) {
-                LogNSError("AdministratorCommissioning WindowStatus read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPScenesClusterRemoveAllScenesParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster removeAllScenesWithParams:params
+                             completionHandler:^(
+                                 CHIPScenesClusterRemoveAllScenesResponseParams * _Nullable values, NSError * _Nullable error) {
+                                 NSLog(@"Values: %@", values);
+                                 responsesNeeded--;
+                                 if (error != nil) {
+                                     mError = error;
+                                     LogNSError("Error", error);
+                                 }
+                                 if (responsesNeeded == 0) {
+                                     SetCommandExitStatus(mError);
+                                 }
+                             }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::Scenes::Commands::RemoveAllScenes::Type mRequest;
 };
 
-class SubscribeAttributeAdministratorCommissioningWindowStatus : public SubscribeAttribute {
+/*
+ * Command StoreScene
+ */
+class ScenesStoreScene : public ClusterCommand {
 public:
-    SubscribeAttributeAdministratorCommissioningWindowStatus()
-        : SubscribeAttribute("window-status")
+    ScenesStoreScene()
+        : ClusterCommand("store-scene")
     {
+        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
+        AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeAdministratorCommissioningWindowStatus() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReportAttribute (0x00000000) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeWindowStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AdministratorCommissioning.WindowStatus response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) command (0x00000004) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPScenesClusterStoreSceneParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
+        params.sceneId = [NSNumber numberWithUnsignedChar:mRequest.sceneId];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster
+                storeSceneWithParams:params
+                   completionHandler:^(CHIPScenesClusterStoreSceneResponseParams * _Nullable values, NSError * _Nullable error) {
+                       NSLog(@"Values: %@", values);
+                       responsesNeeded--;
+                       if (error != nil) {
+                           mError = error;
+                           LogNSError("Error", error);
+                       }
+                       if (responsesNeeded == 0) {
+                           SetCommandExitStatus(mError);
+                       }
+                   }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::Scenes::Commands::StoreScene::Type mRequest;
 };
 
 /*
- * Attribute AdminFabricIndex
+ * Command RecallScene
  */
-class ReadAdministratorCommissioningAdminFabricIndex : public ReadAttribute {
+class ScenesRecallScene : public ClusterCommand {
 public:
-    ReadAdministratorCommissioningAdminFabricIndex()
-        : ReadAttribute("admin-fabric-index")
+    ScenesRecallScene()
+        : ClusterCommand("recall-scene")
     {
+        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
+        AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadAdministratorCommissioningAdminFabricIndex() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) command (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeAdminFabricIndexWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AdministratorCommissioning.AdminFabricIndex response %@", [value description]);
-            if (error != nil) {
-                LogNSError("AdministratorCommissioning AdminFabricIndex read Error", error);
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPScenesClusterRecallSceneParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
+        params.sceneId = [NSNumber numberWithUnsignedChar:mRequest.sceneId];
+        if (mRequest.transitionTime.HasValue()) {
+            if (mRequest.transitionTime.Value().IsNull()) {
+                params.transitionTime = nil;
+            } else {
+                params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime.Value().Value()];
             }
-            SetCommandExitStatus(error);
-        }];
+        } else {
+            params.transitionTime = nil;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster recallSceneWithParams:params
+                         completionHandler:^(NSError * _Nullable error) {
+                             responsesNeeded--;
+                             if (error != nil) {
+                                 mError = error;
+                                 LogNSError("Error", error);
+                             }
+                             if (responsesNeeded == 0) {
+                                 SetCommandExitStatus(mError);
+                             }
+                         }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::Scenes::Commands::RecallScene::Type mRequest;
 };
 
-class SubscribeAttributeAdministratorCommissioningAdminFabricIndex : public SubscribeAttribute {
+/*
+ * Command GetSceneMembership
+ */
+class ScenesGetSceneMembership : public ClusterCommand {
 public:
-    SubscribeAttributeAdministratorCommissioningAdminFabricIndex()
-        : SubscribeAttribute("admin-fabric-index")
+    ScenesGetSceneMembership()
+        : ClusterCommand("get-scene-membership")
     {
+        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeAdministratorCommissioningAdminFabricIndex() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) command (0x00000006) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAdminFabricIndexWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AdministratorCommissioning.AdminFabricIndex response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPScenesClusterGetSceneMembershipParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster getSceneMembershipWithParams:params
+                                completionHandler:^(CHIPScenesClusterGetSceneMembershipResponseParams * _Nullable values,
+                                    NSError * _Nullable error) {
+                                    NSLog(@"Values: %@", values);
+                                    responsesNeeded--;
+                                    if (error != nil) {
+                                        mError = error;
+                                        LogNSError("Error", error);
+                                    }
+                                    if (responsesNeeded == 0) {
+                                        SetCommandExitStatus(mError);
+                                    }
+                                }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::Scenes::Commands::GetSceneMembership::Type mRequest;
+};
+
+/*
+ * Command EnhancedAddScene
+ */
+class ScenesEnhancedAddScene : public ClusterCommand {
+public:
+    ScenesEnhancedAddScene()
+        : ClusterCommand("enhanced-add-scene")
+        , mComplex_ExtensionFieldSets(&mRequest.extensionFieldSets)
+    {
+        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
+        AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        AddArgument("SceneName", &mRequest.sceneName);
+        AddArgument("ExtensionFieldSets", &mComplex_ExtensionFieldSets);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) command (0x00000040) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPScenesClusterEnhancedAddSceneParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
+        params.sceneId = [NSNumber numberWithUnsignedChar:mRequest.sceneId];
+        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
+        params.sceneName = [[NSString alloc] initWithBytes:mRequest.sceneName.data()
+                                                    length:mRequest.sceneName.size()
+                                                  encoding:NSUTF8StringEncoding];
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mRequest.extensionFieldSets) {
+                CHIPScenesClusterExtensionFieldSet * newElement_0;
+                newElement_0 = [CHIPScenesClusterExtensionFieldSet new];
+                newElement_0.clusterId = [NSNumber numberWithUnsignedInt:entry_0.clusterId];
+                { // Scope for our temporary variables
+                    auto * array_2 = [NSMutableArray new];
+                    for (auto & entry_2 : entry_0.attributeValueList) {
+                        CHIPScenesClusterAttributeValuePair * newElement_2;
+                        newElement_2 = [CHIPScenesClusterAttributeValuePair new];
+                        if (entry_2.attributeId.HasValue()) {
+                            newElement_2.attributeId = [NSNumber numberWithUnsignedInt:entry_2.attributeId.Value()];
+                        } else {
+                            newElement_2.attributeId = nil;
+                        }
+                        { // Scope for our temporary variables
+                            auto * array_4 = [NSMutableArray new];
+                            for (auto & entry_4 : entry_2.attributeValue) {
+                                NSNumber * newElement_4;
+                                newElement_4 = [NSNumber numberWithUnsignedChar:entry_4];
+                                [array_4 addObject:newElement_4];
+                            }
+                            newElement_2.attributeValue = array_4;
+                        }
+                        [array_2 addObject:newElement_2];
+                    }
+                    newElement_0.attributeValueList = array_2;
                 }
-            }];
+                [array_0 addObject:newElement_0];
+            }
+            params.extensionFieldSets = array_0;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster enhancedAddSceneWithParams:params
+                              completionHandler:^(
+                                  CHIPScenesClusterEnhancedAddSceneResponseParams * _Nullable values, NSError * _Nullable error) {
+                                  NSLog(@"Values: %@", values);
+                                  responsesNeeded--;
+                                  if (error != nil) {
+                                      mError = error;
+                                      LogNSError("Error", error);
+                                  }
+                                  if (responsesNeeded == 0) {
+                                      SetCommandExitStatus(mError);
+                                  }
+                              }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::Scenes::Commands::EnhancedAddScene::Type mRequest;
+    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::Scenes::Structs::ExtensionFieldSet::Type>>
+        mComplex_ExtensionFieldSets;
+};
+
+/*
+ * Command EnhancedViewScene
+ */
+class ScenesEnhancedViewScene : public ClusterCommand {
+public:
+    ScenesEnhancedViewScene()
+        : ClusterCommand("enhanced-view-scene")
+    {
+        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
+        AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) command (0x00000041) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPScenesClusterEnhancedViewSceneParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
+        params.sceneId = [NSNumber numberWithUnsignedChar:mRequest.sceneId];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster enhancedViewSceneWithParams:params
+                               completionHandler:^(
+                                   CHIPScenesClusterEnhancedViewSceneResponseParams * _Nullable values, NSError * _Nullable error) {
+                                   NSLog(@"Values: %@", values);
+                                   responsesNeeded--;
+                                   if (error != nil) {
+                                       mError = error;
+                                       LogNSError("Error", error);
+                                   }
+                                   if (responsesNeeded == 0) {
+                                       SetCommandExitStatus(mError);
+                                   }
+                               }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::Scenes::Commands::EnhancedViewScene::Type mRequest;
 };
 
 /*
- * Attribute AdminVendorId
+ * Command CopyScene
  */
-class ReadAdministratorCommissioningAdminVendorId : public ReadAttribute {
+class ScenesCopyScene : public ClusterCommand {
 public:
-    ReadAdministratorCommissioningAdminVendorId()
-        : ReadAttribute("admin-vendor-id")
+    ScenesCopyScene()
+        : ClusterCommand("copy-scene")
     {
+        AddArgument("Mode", 0, UINT8_MAX, &mRequest.mode);
+        AddArgument("GroupIdFrom", 0, UINT16_MAX, &mRequest.groupIdFrom);
+        AddArgument("SceneIdFrom", 0, UINT8_MAX, &mRequest.sceneIdFrom);
+        AddArgument("GroupIdTo", 0, UINT16_MAX, &mRequest.groupIdTo);
+        AddArgument("SceneIdTo", 0, UINT8_MAX, &mRequest.sceneIdTo);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadAdministratorCommissioningAdminVendorId() {}
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) command (0x00000042) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPScenesClusterCopySceneParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.mode = [NSNumber numberWithUnsignedChar:mRequest.mode.Raw()];
+        params.groupIdFrom = [NSNumber numberWithUnsignedShort:mRequest.groupIdFrom];
+        params.sceneIdFrom = [NSNumber numberWithUnsignedChar:mRequest.sceneIdFrom];
+        params.groupIdTo = [NSNumber numberWithUnsignedShort:mRequest.groupIdTo];
+        params.sceneIdTo = [NSNumber numberWithUnsignedChar:mRequest.sceneIdTo];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster copySceneWithParams:params
+                       completionHandler:^(CHIPScenesClusterCopySceneResponseParams * _Nullable values, NSError * _Nullable error) {
+                           NSLog(@"Values: %@", values);
+                           responsesNeeded--;
+                           if (error != nil) {
+                               mError = error;
+                               LogNSError("Error", error);
+                           }
+                           if (responsesNeeded == 0) {
+                               SetCommandExitStatus(mError);
+                           }
+                       }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::Scenes::Commands::CopyScene::Type mRequest;
+};
+
+/*
+ * Attribute SceneCount
+ */
+class ReadScenesSceneCount : public ReadAttribute {
+public:
+    ReadScenesSceneCount()
+        : ReadAttribute("scene-count")
+    {
+    }
+
+    ~ReadScenesSceneCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeAdminVendorIdWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AdministratorCommissioning.AdminVendorId response %@", [value description]);
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeSceneCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Scenes.SceneCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("AdministratorCommissioning AdminVendorId read Error", error);
+                LogNSError("Scenes SceneCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -1776,34 +2070,32 @@ class ReadAdministratorCommissioningAdminVendorId : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAdministratorCommissioningAdminVendorId : public SubscribeAttribute {
+class SubscribeAttributeScenesSceneCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeAdministratorCommissioningAdminVendorId()
-        : SubscribeAttribute("admin-vendor-id")
+    SubscribeAttributeScenesSceneCount()
+        : SubscribeAttribute("scene-count")
     {
     }
 
-    ~SubscribeAttributeAdministratorCommissioningAdminVendorId() {}
+    ~SubscribeAttributeScenesSceneCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAdminVendorIdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSceneCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AdministratorCommissioning.AdminVendorId response %@", [value description]);
+                NSLog(@"Scenes.SceneCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -1814,29 +2106,27 @@ class SubscribeAttributeAdministratorCommissioningAdminVendorId : public Subscri
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute CurrentScene
  */
-class ReadAdministratorCommissioningGeneratedCommandList : public ReadAttribute {
+class ReadScenesCurrentScene : public ReadAttribute {
 public:
-    ReadAdministratorCommissioningGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadScenesCurrentScene()
+        : ReadAttribute("current-scene")
     {
     }
 
-    ~ReadAdministratorCommissioningGeneratedCommandList() {}
+    ~ReadScenesCurrentScene() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AdministratorCommissioning.GeneratedCommandList response %@", [value description]);
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCurrentSceneWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Scenes.CurrentScene response %@", [value description]);
             if (error != nil) {
-                LogNSError("AdministratorCommissioning GeneratedCommandList read Error", error);
+                LogNSError("Scenes CurrentScene read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -1844,34 +2134,32 @@ class ReadAdministratorCommissioningGeneratedCommandList : public ReadAttribute
     }
 };
 
-class SubscribeAttributeAdministratorCommissioningGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeScenesCurrentScene : public SubscribeAttribute {
 public:
-    SubscribeAttributeAdministratorCommissioningGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeScenesCurrentScene()
+        : SubscribeAttribute("current-scene")
     {
     }
 
-    ~SubscribeAttributeAdministratorCommissioningGeneratedCommandList() {}
+    ~SubscribeAttributeScenesCurrentScene() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCurrentSceneWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AdministratorCommissioning.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Scenes.CurrentScene response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -1882,29 +2170,27 @@ class SubscribeAttributeAdministratorCommissioningGeneratedCommandList : public
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute CurrentGroup
  */
-class ReadAdministratorCommissioningAcceptedCommandList : public ReadAttribute {
+class ReadScenesCurrentGroup : public ReadAttribute {
 public:
-    ReadAdministratorCommissioningAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadScenesCurrentGroup()
+        : ReadAttribute("current-group")
     {
     }
 
-    ~ReadAdministratorCommissioningAcceptedCommandList() {}
+    ~ReadScenesCurrentGroup() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AdministratorCommissioning.AcceptedCommandList response %@", [value description]);
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCurrentGroupWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Scenes.CurrentGroup response %@", [value description]);
             if (error != nil) {
-                LogNSError("AdministratorCommissioning AcceptedCommandList read Error", error);
+                LogNSError("Scenes CurrentGroup read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -1912,34 +2198,32 @@ class ReadAdministratorCommissioningAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAdministratorCommissioningAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeScenesCurrentGroup : public SubscribeAttribute {
 public:
-    SubscribeAttributeAdministratorCommissioningAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeScenesCurrentGroup()
+        : SubscribeAttribute("current-group")
     {
     }
 
-    ~SubscribeAttributeAdministratorCommissioningAcceptedCommandList() {}
+    ~SubscribeAttributeScenesCurrentGroup() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCurrentGroupWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AdministratorCommissioning.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Scenes.CurrentGroup response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -1950,29 +2234,27 @@ class SubscribeAttributeAdministratorCommissioningAcceptedCommandList : public S
 };
 
 /*
- * Attribute AttributeList
+ * Attribute SceneValid
  */
-class ReadAdministratorCommissioningAttributeList : public ReadAttribute {
+class ReadScenesSceneValid : public ReadAttribute {
 public:
-    ReadAdministratorCommissioningAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadScenesSceneValid()
+        : ReadAttribute("scene-valid")
     {
     }
 
-    ~ReadAdministratorCommissioningAttributeList() {}
+    ~ReadScenesSceneValid() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AdministratorCommissioning.AttributeList response %@", [value description]);
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeSceneValidWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Scenes.SceneValid response %@", [value description]);
             if (error != nil) {
-                LogNSError("AdministratorCommissioning AttributeList read Error", error);
+                LogNSError("Scenes SceneValid read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -1980,34 +2262,32 @@ class ReadAdministratorCommissioningAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAdministratorCommissioningAttributeList : public SubscribeAttribute {
+class SubscribeAttributeScenesSceneValid : public SubscribeAttribute {
 public:
-    SubscribeAttributeAdministratorCommissioningAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeScenesSceneValid()
+        : SubscribeAttribute("scene-valid")
     {
     }
 
-    ~SubscribeAttributeAdministratorCommissioningAttributeList() {}
+    ~SubscribeAttributeScenesSceneValid() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSceneValidWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AdministratorCommissioning.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Scenes.SceneValid response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -2018,29 +2298,27 @@ class SubscribeAttributeAdministratorCommissioningAttributeList : public Subscri
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute NameSupport
  */
-class ReadAdministratorCommissioningFeatureMap : public ReadAttribute {
+class ReadScenesNameSupport : public ReadAttribute {
 public:
-    ReadAdministratorCommissioningFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadScenesNameSupport()
+        : ReadAttribute("name-support")
     {
     }
 
-    ~ReadAdministratorCommissioningFeatureMap() {}
+    ~ReadScenesNameSupport() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AdministratorCommissioning.FeatureMap response %@", [value description]);
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNameSupportWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Scenes.NameSupport response %@", [value description]);
             if (error != nil) {
-                LogNSError("AdministratorCommissioning FeatureMap read Error", error);
+                LogNSError("Scenes NameSupport read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -2048,34 +2326,32 @@ class ReadAdministratorCommissioningFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAdministratorCommissioningFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeScenesNameSupport : public SubscribeAttribute {
 public:
-    SubscribeAttributeAdministratorCommissioningFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeScenesNameSupport()
+        : SubscribeAttribute("name-support")
     {
     }
 
-    ~SubscribeAttributeAdministratorCommissioningFeatureMap() {}
+    ~SubscribeAttributeScenesNameSupport() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReportAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNameSupportWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AdministratorCommissioning.FeatureMap response %@", [value description]);
+                NSLog(@"Scenes.NameSupport response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -2086,29 +2362,27 @@ class SubscribeAttributeAdministratorCommissioningFeatureMap : public SubscribeA
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute LastConfiguredBy
  */
-class ReadAdministratorCommissioningClusterRevision : public ReadAttribute {
+class ReadScenesLastConfiguredBy : public ReadAttribute {
 public:
-    ReadAdministratorCommissioningClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadScenesLastConfiguredBy()
+        : ReadAttribute("last-configured-by")
     {
     }
 
-    ~ReadAdministratorCommissioningClusterRevision() {}
+    ~ReadScenesLastConfiguredBy() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReadAttribute (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AdministratorCommissioning.ClusterRevision response %@", [value description]);
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeLastConfiguredByWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Scenes.LastConfiguredBy response %@", [value description]);
             if (error != nil) {
-                LogNSError("AdministratorCommissioning ClusterRevision read Error", error);
+                LogNSError("Scenes LastConfiguredBy read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -2116,34 +2390,32 @@ class ReadAdministratorCommissioningClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAdministratorCommissioningClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeScenesLastConfiguredBy : public SubscribeAttribute {
 public:
-    SubscribeAttributeAdministratorCommissioningClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeScenesLastConfiguredBy()
+        : SubscribeAttribute("last-configured-by")
     {
     }
 
-    ~SubscribeAttributeAdministratorCommissioningClusterRevision() {}
+    ~SubscribeAttributeScenesLastConfiguredBy() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReportAttribute (0x00000005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeLastConfiguredByWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AdministratorCommissioning.ClusterRevision response %@", [value description]);
+                NSLog(@"Scenes.LastConfiguredBy response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -2153,53 +2425,28 @@ class SubscribeAttributeAdministratorCommissioningClusterRevision : public Subsc
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster ApplicationBasic                                            | 0x050D |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * VendorName                                                        | 0x0000 |
-| * VendorID                                                          | 0x0001 |
-| * ApplicationName                                                   | 0x0002 |
-| * ProductID                                                         | 0x0003 |
-| * Application                                                       | 0x0004 |
-| * Status                                                            | 0x0005 |
-| * ApplicationVersion                                                | 0x0006 |
-| * AllowedVendorList                                                 | 0x0007 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Attribute VendorName
+ * Attribute GeneratedCommandList
  */
-class ReadApplicationBasicVendorName : public ReadAttribute {
+class ReadScenesGeneratedCommandList : public ReadAttribute {
 public:
-    ReadApplicationBasicVendorName()
-        : ReadAttribute("vendor-name")
+    ReadScenesGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadApplicationBasicVendorName() {}
+    ~ReadScenesGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeVendorNameWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ApplicationBasic.VendorName response %@", [value description]);
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Scenes.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ApplicationBasic VendorName read Error", error);
+                LogNSError("Scenes GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -2207,34 +2454,32 @@ class ReadApplicationBasicVendorName : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeApplicationBasicVendorName : public SubscribeAttribute {
+class SubscribeAttributeScenesGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeApplicationBasicVendorName()
-        : SubscribeAttribute("vendor-name")
+    SubscribeAttributeScenesGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeApplicationBasicVendorName() {}
+    ~SubscribeAttributeScenesGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeVendorNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ApplicationBasic.VendorName response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Scenes.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -2245,29 +2490,27 @@ class SubscribeAttributeApplicationBasicVendorName : public SubscribeAttribute {
 };
 
 /*
- * Attribute VendorID
+ * Attribute AcceptedCommandList
  */
-class ReadApplicationBasicVendorID : public ReadAttribute {
+class ReadScenesAcceptedCommandList : public ReadAttribute {
 public:
-    ReadApplicationBasicVendorID()
-        : ReadAttribute("vendor-id")
+    ReadScenesAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadApplicationBasicVendorID() {}
+    ~ReadScenesAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeVendorIDWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ApplicationBasic.VendorID response %@", [value description]);
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Scenes.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ApplicationBasic VendorID read Error", error);
+                LogNSError("Scenes AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -2275,34 +2518,32 @@ class ReadApplicationBasicVendorID : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeApplicationBasicVendorID : public SubscribeAttribute {
+class SubscribeAttributeScenesAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeApplicationBasicVendorID()
-        : SubscribeAttribute("vendor-id")
+    SubscribeAttributeScenesAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeApplicationBasicVendorID() {}
+    ~SubscribeAttributeScenesAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeVendorIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ApplicationBasic.VendorID response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Scenes.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -2313,29 +2554,27 @@ class SubscribeAttributeApplicationBasicVendorID : public SubscribeAttribute {
 };
 
 /*
- * Attribute ApplicationName
+ * Attribute AttributeList
  */
-class ReadApplicationBasicApplicationName : public ReadAttribute {
+class ReadScenesAttributeList : public ReadAttribute {
 public:
-    ReadApplicationBasicApplicationName()
-        : ReadAttribute("application-name")
+    ReadScenesAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadApplicationBasicApplicationName() {}
+    ~ReadScenesAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeApplicationNameWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ApplicationBasic.ApplicationName response %@", [value description]);
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Scenes.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ApplicationBasic ApplicationName read Error", error);
+                LogNSError("Scenes AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -2343,34 +2582,32 @@ class ReadApplicationBasicApplicationName : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeApplicationBasicApplicationName : public SubscribeAttribute {
+class SubscribeAttributeScenesAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeApplicationBasicApplicationName()
-        : SubscribeAttribute("application-name")
+    SubscribeAttributeScenesAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeApplicationBasicApplicationName() {}
+    ~SubscribeAttributeScenesAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeApplicationNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ApplicationBasic.ApplicationName response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Scenes.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -2381,29 +2618,27 @@ class SubscribeAttributeApplicationBasicApplicationName : public SubscribeAttrib
 };
 
 /*
- * Attribute ProductID
+ * Attribute FeatureMap
  */
-class ReadApplicationBasicProductID : public ReadAttribute {
+class ReadScenesFeatureMap : public ReadAttribute {
 public:
-    ReadApplicationBasicProductID()
-        : ReadAttribute("product-id")
+    ReadScenesFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadApplicationBasicProductID() {}
+    ~ReadScenesFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeProductIDWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ApplicationBasic.ProductID response %@", [value description]);
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Scenes.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("ApplicationBasic ProductID read Error", error);
+                LogNSError("Scenes FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -2411,34 +2646,32 @@ class ReadApplicationBasicProductID : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeApplicationBasicProductID : public SubscribeAttribute {
+class SubscribeAttributeScenesFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeApplicationBasicProductID()
-        : SubscribeAttribute("product-id")
+    SubscribeAttributeScenesFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeApplicationBasicProductID() {}
+    ~SubscribeAttributeScenesFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeProductIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ApplicationBasic.ProductID response %@", [value description]);
+                NSLog(@"Scenes.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -2449,30 +2682,27 @@ class SubscribeAttributeApplicationBasicProductID : public SubscribeAttribute {
 };
 
 /*
- * Attribute Application
+ * Attribute ClusterRevision
  */
-class ReadApplicationBasicApplication : public ReadAttribute {
+class ReadScenesClusterRevision : public ReadAttribute {
 public:
-    ReadApplicationBasicApplication()
-        : ReadAttribute("application")
+    ReadScenesClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadApplicationBasicApplication() {}
+    ~ReadScenesClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeApplicationWithCompletionHandler:^(
-            CHIPApplicationBasicClusterApplicationBasicApplication * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ApplicationBasic.Application response %@", [value description]);
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Scenes.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("ApplicationBasic Application read Error", error);
+                LogNSError("Scenes ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -2480,34 +2710,32 @@ class ReadApplicationBasicApplication : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeApplicationBasicApplication : public SubscribeAttribute {
+class SubscribeAttributeScenesClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeApplicationBasicApplication()
-        : SubscribeAttribute("application")
+    SubscribeAttributeScenesClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeApplicationBasicApplication() {}
+    ~SubscribeAttributeScenesClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeApplicationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(CHIPApplicationBasicClusterApplicationBasicApplication * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ApplicationBasic.Application response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Scenes.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -2517,234 +2745,312 @@ class SubscribeAttributeApplicationBasicApplication : public SubscribeAttribute
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster OnOff                                                       | 0x0006 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * Off                                                               |   0x00 |
+| * On                                                                |   0x01 |
+| * Toggle                                                            |   0x02 |
+| * OffWithEffect                                                     |   0x40 |
+| * OnWithRecallGlobalScene                                           |   0x41 |
+| * OnWithTimedOff                                                    |   0x42 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * OnOff                                                             | 0x0000 |
+| * GlobalSceneControl                                                | 0x4000 |
+| * OnTime                                                            | 0x4001 |
+| * OffWaitTime                                                       | 0x4002 |
+| * StartUpOnOff                                                      | 0x4003 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute Status
+ * Command Off
  */
-class ReadApplicationBasicStatus : public ReadAttribute {
+class OnOffOff : public ClusterCommand {
 public:
-    ReadApplicationBasicStatus()
-        : ReadAttribute("status")
+    OnOffOff()
+        : ClusterCommand("off")
     {
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadApplicationBasicStatus() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ApplicationBasic.Status response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ApplicationBasic Status read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPOnOffClusterOffParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster offWithParams:params
+                 completionHandler:^(NSError * _Nullable error) {
+                     responsesNeeded--;
+                     if (error != nil) {
+                         mError = error;
+                         LogNSError("Error", error);
+                     }
+                     if (responsesNeeded == 0) {
+                         SetCommandExitStatus(mError);
+                     }
+                 }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
 };
 
-class SubscribeAttributeApplicationBasicStatus : public SubscribeAttribute {
+/*
+ * Command On
+ */
+class OnOffOn : public ClusterCommand {
 public:
-    SubscribeAttributeApplicationBasicStatus()
-        : SubscribeAttribute("status")
+    OnOffOn()
+        : ClusterCommand("on")
     {
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeApplicationBasicStatus() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x00000005) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ApplicationBasic.Status response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) command (0x00000001) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPOnOffClusterOnParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster onWithParams:params
+                completionHandler:^(NSError * _Nullable error) {
+                    responsesNeeded--;
+                    if (error != nil) {
+                        mError = error;
+                        LogNSError("Error", error);
+                    }
+                    if (responsesNeeded == 0) {
+                        SetCommandExitStatus(mError);
+                    }
+                }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
 };
 
 /*
- * Attribute ApplicationVersion
+ * Command Toggle
  */
-class ReadApplicationBasicApplicationVersion : public ReadAttribute {
+class OnOffToggle : public ClusterCommand {
 public:
-    ReadApplicationBasicApplicationVersion()
-        : ReadAttribute("application-version")
+    OnOffToggle()
+        : ClusterCommand("toggle")
     {
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadApplicationBasicApplicationVersion() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) command (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeApplicationVersionWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ApplicationBasic.ApplicationVersion response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ApplicationBasic ApplicationVersion read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPOnOffClusterToggleParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster toggleWithParams:params
+                    completionHandler:^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
 };
 
-class SubscribeAttributeApplicationBasicApplicationVersion : public SubscribeAttribute {
+/*
+ * Command OffWithEffect
+ */
+class OnOffOffWithEffect : public ClusterCommand {
 public:
-    SubscribeAttributeApplicationBasicApplicationVersion()
-        : SubscribeAttribute("application-version")
+    OnOffOffWithEffect()
+        : ClusterCommand("off-with-effect")
     {
+        AddArgument("EffectId", 0, UINT8_MAX, &mRequest.effectId);
+        AddArgument("EffectVariant", 0, UINT8_MAX, &mRequest.effectVariant);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeApplicationBasicApplicationVersion() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x00000006) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeApplicationVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ApplicationBasic.ApplicationVersion response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) command (0x00000040) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPOnOffClusterOffWithEffectParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.effectId = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.effectId)];
+        params.effectVariant = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.effectVariant)];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster offWithEffectWithParams:params
+                           completionHandler:^(NSError * _Nullable error) {
+                               responsesNeeded--;
+                               if (error != nil) {
+                                   mError = error;
+                                   LogNSError("Error", error);
+                               }
+                               if (responsesNeeded == 0) {
+                                   SetCommandExitStatus(mError);
+                               }
+                           }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::OnOff::Commands::OffWithEffect::Type mRequest;
 };
 
 /*
- * Attribute AllowedVendorList
+ * Command OnWithRecallGlobalScene
  */
-class ReadApplicationBasicAllowedVendorList : public ReadAttribute {
+class OnOffOnWithRecallGlobalScene : public ClusterCommand {
 public:
-    ReadApplicationBasicAllowedVendorList()
-        : ReadAttribute("allowed-vendor-list")
+    OnOffOnWithRecallGlobalScene()
+        : ClusterCommand("on-with-recall-global-scene")
     {
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadApplicationBasicAllowedVendorList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) command (0x00000041) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeAllowedVendorListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ApplicationBasic.AllowedVendorList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ApplicationBasic AllowedVendorList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPOnOffClusterOnWithRecallGlobalSceneParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster onWithRecallGlobalSceneWithParams:params
+                                     completionHandler:^(NSError * _Nullable error) {
+                                         responsesNeeded--;
+                                         if (error != nil) {
+                                             mError = error;
+                                             LogNSError("Error", error);
+                                         }
+                                         if (responsesNeeded == 0) {
+                                             SetCommandExitStatus(mError);
+                                         }
+                                     }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
 };
 
-class SubscribeAttributeApplicationBasicAllowedVendorList : public SubscribeAttribute {
+/*
+ * Command OnWithTimedOff
+ */
+class OnOffOnWithTimedOff : public ClusterCommand {
 public:
-    SubscribeAttributeApplicationBasicAllowedVendorList()
-        : SubscribeAttribute("allowed-vendor-list")
+    OnOffOnWithTimedOff()
+        : ClusterCommand("on-with-timed-off")
     {
+        AddArgument("OnOffControl", 0, UINT8_MAX, &mRequest.onOffControl);
+        AddArgument("OnTime", 0, UINT16_MAX, &mRequest.onTime);
+        AddArgument("OffWaitTime", 0, UINT16_MAX, &mRequest.offWaitTime);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeApplicationBasicAllowedVendorList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x00000007) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAllowedVendorListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ApplicationBasic.AllowedVendorList response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-};
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) command (0x00000042) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPOnOffClusterOnWithTimedOffParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.onOffControl = [NSNumber numberWithUnsignedChar:mRequest.onOffControl.Raw()];
+        params.onTime = [NSNumber numberWithUnsignedShort:mRequest.onTime];
+        params.offWaitTime = [NSNumber numberWithUnsignedShort:mRequest.offWaitTime];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster onWithTimedOffWithParams:params
+                            completionHandler:^(NSError * _Nullable error) {
+                                responsesNeeded--;
+                                if (error != nil) {
+                                    mError = error;
+                                    LogNSError("Error", error);
+                                }
+                                if (responsesNeeded == 0) {
+                                    SetCommandExitStatus(mError);
+                                }
+                            }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::OnOff::Commands::OnWithTimedOff::Type mRequest;
+};
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute OnOff
  */
-class ReadApplicationBasicGeneratedCommandList : public ReadAttribute {
+class ReadOnOffOnOff : public ReadAttribute {
 public:
-    ReadApplicationBasicGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadOnOffOnOff()
+        : ReadAttribute("on-off")
     {
     }
 
-    ~ReadApplicationBasicGeneratedCommandList() {}
+    ~ReadOnOffOnOff() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ApplicationBasic.GeneratedCommandList response %@", [value description]);
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OnOff.OnOff response %@", [value description]);
             if (error != nil) {
-                LogNSError("ApplicationBasic GeneratedCommandList read Error", error);
+                LogNSError("OnOff OnOff read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -2752,34 +3058,32 @@ class ReadApplicationBasicGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeApplicationBasicGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeOnOffOnOff : public SubscribeAttribute {
 public:
-    SubscribeAttributeApplicationBasicGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeOnOffOnOff()
+        : SubscribeAttribute("on-off")
     {
     }
 
-    ~SubscribeAttributeApplicationBasicGeneratedCommandList() {}
+    ~SubscribeAttributeOnOffOnOff() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOnOffWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ApplicationBasic.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOff.OnOff response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -2790,29 +3094,27 @@ class SubscribeAttributeApplicationBasicGeneratedCommandList : public SubscribeA
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute GlobalSceneControl
  */
-class ReadApplicationBasicAcceptedCommandList : public ReadAttribute {
+class ReadOnOffGlobalSceneControl : public ReadAttribute {
 public:
-    ReadApplicationBasicAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadOnOffGlobalSceneControl()
+        : ReadAttribute("global-scene-control")
     {
     }
 
-    ~ReadApplicationBasicAcceptedCommandList() {}
+    ~ReadOnOffGlobalSceneControl() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReadAttribute (0x00004000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ApplicationBasic.AcceptedCommandList response %@", [value description]);
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGlobalSceneControlWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OnOff.GlobalSceneControl response %@", [value description]);
             if (error != nil) {
-                LogNSError("ApplicationBasic AcceptedCommandList read Error", error);
+                LogNSError("OnOff GlobalSceneControl read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -2820,34 +3122,32 @@ class ReadApplicationBasicAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeApplicationBasicAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeOnOffGlobalSceneControl : public SubscribeAttribute {
 public:
-    SubscribeAttributeApplicationBasicAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeOnOffGlobalSceneControl()
+        : SubscribeAttribute("global-scene-control")
     {
     }
 
-    ~SubscribeAttributeApplicationBasicAcceptedCommandList() {}
+    ~SubscribeAttributeOnOffGlobalSceneControl() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReportAttribute (0x00004000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGlobalSceneControlWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ApplicationBasic.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOff.GlobalSceneControl response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -2858,29 +3158,27 @@ class SubscribeAttributeApplicationBasicAcceptedCommandList : public SubscribeAt
 };
 
 /*
- * Attribute AttributeList
+ * Attribute OnTime
  */
-class ReadApplicationBasicAttributeList : public ReadAttribute {
+class ReadOnOffOnTime : public ReadAttribute {
 public:
-    ReadApplicationBasicAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadOnOffOnTime()
+        : ReadAttribute("on-time")
     {
     }
 
-    ~ReadApplicationBasicAttributeList() {}
+    ~ReadOnOffOnTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReadAttribute (0x00004001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ApplicationBasic.AttributeList response %@", [value description]);
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeOnTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OnOff.OnTime response %@", [value description]);
             if (error != nil) {
-                LogNSError("ApplicationBasic AttributeList read Error", error);
+                LogNSError("OnOff OnTime read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -2888,34 +3186,70 @@ class ReadApplicationBasicAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeApplicationBasicAttributeList : public SubscribeAttribute {
+class WriteOnOffOnTime : public WriteAttribute {
 public:
-    SubscribeAttributeApplicationBasicAttributeList()
-        : SubscribeAttribute("attribute-list")
+    WriteOnOffOnTime()
+        : WriteAttribute("on-time")
     {
+        AddArgument("attr-name", "on-time");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeApplicationBasicAttributeList() {}
+    ~WriteOnOffOnTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) WriteAttribute (0x00004001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster writeAttributeOnTimeWithValue:value
+                                        params:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 if (error != nil) {
+                                     LogNSError("OnOff OnTime write Error", error);
+                                 }
+                                 SetCommandExitStatus(error);
+                             }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeOnOffOnTime : public SubscribeAttribute {
+public:
+    SubscribeAttributeOnOffOnTime()
+        : SubscribeAttribute("on-time")
+    {
+    }
+
+    ~SubscribeAttributeOnOffOnTime() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReportAttribute (0x00004001) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOnTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ApplicationBasic.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOff.OnTime response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -2926,29 +3260,27 @@ class SubscribeAttributeApplicationBasicAttributeList : public SubscribeAttribut
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute OffWaitTime
  */
-class ReadApplicationBasicFeatureMap : public ReadAttribute {
+class ReadOnOffOffWaitTime : public ReadAttribute {
 public:
-    ReadApplicationBasicFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadOnOffOffWaitTime()
+        : ReadAttribute("off-wait-time")
     {
     }
 
-    ~ReadApplicationBasicFeatureMap() {}
+    ~ReadOnOffOffWaitTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReadAttribute (0x00004002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ApplicationBasic.FeatureMap response %@", [value description]);
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeOffWaitTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OnOff.OffWaitTime response %@", [value description]);
             if (error != nil) {
-                LogNSError("ApplicationBasic FeatureMap read Error", error);
+                LogNSError("OnOff OffWaitTime read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -2956,34 +3288,70 @@ class ReadApplicationBasicFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeApplicationBasicFeatureMap : public SubscribeAttribute {
+class WriteOnOffOffWaitTime : public WriteAttribute {
 public:
-    SubscribeAttributeApplicationBasicFeatureMap()
-        : SubscribeAttribute("feature-map")
+    WriteOnOffOffWaitTime()
+        : WriteAttribute("off-wait-time")
     {
+        AddArgument("attr-name", "off-wait-time");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeApplicationBasicFeatureMap() {}
+    ~WriteOnOffOffWaitTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) WriteAttribute (0x00004002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster writeAttributeOffWaitTimeWithValue:value
+                                             params:params
+                                  completionHandler:^(NSError * _Nullable error) {
+                                      if (error != nil) {
+                                          LogNSError("OnOff OffWaitTime write Error", error);
+                                      }
+                                      SetCommandExitStatus(error);
+                                  }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeOnOffOffWaitTime : public SubscribeAttribute {
+public:
+    SubscribeAttributeOnOffOffWaitTime()
+        : SubscribeAttribute("off-wait-time")
+    {
+    }
+
+    ~SubscribeAttributeOnOffOffWaitTime() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReportAttribute (0x00004002) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOffWaitTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ApplicationBasic.FeatureMap response %@", [value description]);
+                NSLog(@"OnOff.OffWaitTime response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -2994,29 +3362,27 @@ class SubscribeAttributeApplicationBasicFeatureMap : public SubscribeAttribute {
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute StartUpOnOff
  */
-class ReadApplicationBasicClusterRevision : public ReadAttribute {
+class ReadOnOffStartUpOnOff : public ReadAttribute {
 public:
-    ReadApplicationBasicClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadOnOffStartUpOnOff()
+        : ReadAttribute("start-up-on-off")
     {
     }
 
-    ~ReadApplicationBasicClusterRevision() {}
+    ~ReadOnOffStartUpOnOff() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReadAttribute (0x00004003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ApplicationBasic.ClusterRevision response %@", [value description]);
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeStartUpOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OnOff.StartUpOnOff response %@", [value description]);
             if (error != nil) {
-                LogNSError("ApplicationBasic ClusterRevision read Error", error);
+                LogNSError("OnOff StartUpOnOff read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -3024,34 +3390,70 @@ class ReadApplicationBasicClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeApplicationBasicClusterRevision : public SubscribeAttribute {
+class WriteOnOffStartUpOnOff : public WriteAttribute {
 public:
-    SubscribeAttributeApplicationBasicClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    WriteOnOffStartUpOnOff()
+        : WriteAttribute("start-up-on-off")
     {
+        AddArgument("attr-name", "start-up-on-off");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeApplicationBasicClusterRevision() {}
+    ~WriteOnOffStartUpOnOff() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) WriteAttribute (0x00004003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeStartUpOnOffWithValue:value
+                                              params:params
+                                   completionHandler:^(NSError * _Nullable error) {
+                                       if (error != nil) {
+                                           LogNSError("OnOff StartUpOnOff write Error", error);
+                                       }
+                                       SetCommandExitStatus(error);
+                                   }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeOnOffStartUpOnOff : public SubscribeAttribute {
+public:
+    SubscribeAttributeOnOffStartUpOnOff()
+        : SubscribeAttribute("start-up-on-off")
+    {
+    }
+
+    ~SubscribeAttributeOnOffStartUpOnOff() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReportAttribute (0x00004003) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeStartUpOnOffWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ApplicationBasic.ClusterRevision response %@", [value description]);
+                NSLog(@"OnOff.StartUpOnOff response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -3061,218 +3463,156 @@ class SubscribeAttributeApplicationBasicClusterRevision : public SubscribeAttrib
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster ApplicationLauncher                                         | 0x050C |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * LaunchApp                                                         |   0x00 |
-| * StopApp                                                           |   0x01 |
-| * HideApp                                                           |   0x02 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * CatalogList                                                       | 0x0000 |
-| * CurrentApp                                                        | 0x0001 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command LaunchApp
+ * Attribute GeneratedCommandList
  */
-class ApplicationLauncherLaunchApp : public ClusterCommand {
+class ReadOnOffGeneratedCommandList : public ReadAttribute {
 public:
-    ApplicationLauncherLaunchApp()
-        : ClusterCommand("launch-app")
-        , mComplex_Application(&mRequest.application)
+    ReadOnOffGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
-        AddArgument("Application", &mComplex_Application);
-        AddArgument("Data", &mRequest.data);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadOnOffGeneratedCommandList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        __auto_type * params = [[CHIPApplicationLauncherClusterLaunchAppParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.application = [CHIPApplicationLauncherClusterApplication new];
-        params.application.catalogVendorId = [NSNumber numberWithUnsignedShort:mRequest.application.catalogVendorId];
-        params.application.applicationId = [[NSString alloc] initWithBytes:mRequest.application.applicationId.data()
-                                                                    length:mRequest.application.applicationId.size()
-                                                                  encoding:NSUTF8StringEncoding];
-        if (mRequest.data.HasValue()) {
-            params.data = [NSData dataWithBytes:mRequest.data.Value().data() length:mRequest.data.Value().size()];
-        } else {
-            params.data = nil;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster launchAppWithParams:params
-                       completionHandler:^(
-                           CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable error) {
-                           NSLog(@"Values: %@", values);
-                           responsesNeeded--;
-                           if (error != nil) {
-                               mError = error;
-                               LogNSError("Error", error);
-                           }
-                           if (responsesNeeded == 0) {
-                               SetCommandExitStatus(mError);
-                           }
-                       }];
-        }
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OnOff.GeneratedCommandList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("OnOff GeneratedCommandList read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::ApplicationLauncher::Commands::LaunchApp::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::ApplicationLauncher::Structs::Application::Type> mComplex_Application;
 };
 
-/*
- * Command StopApp
- */
-class ApplicationLauncherStopApp : public ClusterCommand {
+class SubscribeAttributeOnOffGeneratedCommandList : public SubscribeAttribute {
 public:
-    ApplicationLauncherStopApp()
-        : ClusterCommand("stop-app")
-        , mComplex_Application(&mRequest.application)
+    SubscribeAttributeOnOffGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
-        AddArgument("Application", &mComplex_Application);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeOnOffGeneratedCommandList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) command (0x00000001) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        __auto_type * params = [[CHIPApplicationLauncherClusterStopAppParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.application = [CHIPApplicationLauncherClusterApplication new];
-        params.application.catalogVendorId = [NSNumber numberWithUnsignedShort:mRequest.application.catalogVendorId];
-        params.application.applicationId = [[NSString alloc] initWithBytes:mRequest.application.applicationId.data()
-                                                                    length:mRequest.application.applicationId.size()
-                                                                  encoding:NSUTF8StringEncoding];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster stopAppWithParams:params
-                     completionHandler:^(
-                         CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable error) {
-                         NSLog(@"Values: %@", values);
-                         responsesNeeded--;
-                         if (error != nil) {
-                             mError = error;
-                             LogNSError("Error", error);
-                         }
-                         if (responsesNeeded == 0) {
-                             SetCommandExitStatus(mError);
-                         }
-                     }];
-        }
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOff.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::ApplicationLauncher::Commands::StopApp::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::ApplicationLauncher::Structs::Application::Type> mComplex_Application;
 };
 
 /*
- * Command HideApp
+ * Attribute AcceptedCommandList
  */
-class ApplicationLauncherHideApp : public ClusterCommand {
+class ReadOnOffAcceptedCommandList : public ReadAttribute {
 public:
-    ApplicationLauncherHideApp()
-        : ClusterCommand("hide-app")
-        , mComplex_Application(&mRequest.application)
+    ReadOnOffAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
-        AddArgument("Application", &mComplex_Application);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadOnOffAcceptedCommandList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) command (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        __auto_type * params = [[CHIPApplicationLauncherClusterHideAppParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.application = [CHIPApplicationLauncherClusterApplication new];
-        params.application.catalogVendorId = [NSNumber numberWithUnsignedShort:mRequest.application.catalogVendorId];
-        params.application.applicationId = [[NSString alloc] initWithBytes:mRequest.application.applicationId.data()
-                                                                    length:mRequest.application.applicationId.size()
-                                                                  encoding:NSUTF8StringEncoding];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster hideAppWithParams:params
-                     completionHandler:^(
-                         CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable error) {
-                         NSLog(@"Values: %@", values);
-                         responsesNeeded--;
-                         if (error != nil) {
-                             mError = error;
-                             LogNSError("Error", error);
-                         }
-                         if (responsesNeeded == 0) {
-                             SetCommandExitStatus(mError);
-                         }
-                     }];
-        }
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OnOff.AcceptedCommandList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("OnOff AcceptedCommandList read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
+};
 
-private:
-    chip::app::Clusters::ApplicationLauncher::Commands::HideApp::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::ApplicationLauncher::Structs::Application::Type> mComplex_Application;
+class SubscribeAttributeOnOffAcceptedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeOnOffAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
+    {
+    }
+
+    ~SubscribeAttributeOnOffAcceptedCommandList() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOff.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
 };
 
 /*
- * Attribute CatalogList
+ * Attribute AttributeList
  */
-class ReadApplicationLauncherCatalogList : public ReadAttribute {
+class ReadOnOffAttributeList : public ReadAttribute {
 public:
-    ReadApplicationLauncherCatalogList()
-        : ReadAttribute("catalog-list")
+    ReadOnOffAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadApplicationLauncherCatalogList() {}
+    ~ReadOnOffAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeCatalogListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ApplicationLauncher.CatalogList response %@", [value description]);
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OnOff.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ApplicationLauncher CatalogList read Error", error);
+                LogNSError("OnOff AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -3280,34 +3620,32 @@ class ReadApplicationLauncherCatalogList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeApplicationLauncherCatalogList : public SubscribeAttribute {
+class SubscribeAttributeOnOffAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeApplicationLauncherCatalogList()
-        : SubscribeAttribute("catalog-list")
+    SubscribeAttributeOnOffAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeApplicationLauncherCatalogList() {}
+    ~SubscribeAttributeOnOffAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCatalogListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ApplicationLauncher.CatalogList response %@", [value description]);
+                NSLog(@"OnOff.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -3318,30 +3656,27 @@ class SubscribeAttributeApplicationLauncherCatalogList : public SubscribeAttribu
 };
 
 /*
- * Attribute CurrentApp
+ * Attribute FeatureMap
  */
-class ReadApplicationLauncherCurrentApp : public ReadAttribute {
+class ReadOnOffFeatureMap : public ReadAttribute {
 public:
-    ReadApplicationLauncherCurrentApp()
-        : ReadAttribute("current-app")
+    ReadOnOffFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadApplicationLauncherCurrentApp() {}
+    ~ReadOnOffFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeCurrentAppWithCompletionHandler:^(
-            CHIPApplicationLauncherClusterApplicationEP * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ApplicationLauncher.CurrentApp response %@", [value description]);
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OnOff.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("ApplicationLauncher CurrentApp read Error", error);
+                LogNSError("OnOff FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -3349,92 +3684,32 @@ class ReadApplicationLauncherCurrentApp : public ReadAttribute {
     }
 };
 
-class WriteApplicationLauncherCurrentApp : public WriteAttribute {
-public:
-    WriteApplicationLauncherCurrentApp()
-        : WriteAttribute("current-app")
-        , mComplex(&mValue)
-    {
-        AddArgument("attr-name", "current-app");
-        AddArgument("attr-value", &mComplex);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteApplicationLauncherCurrentApp() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) WriteAttribute (0x00000001) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        CHIPApplicationLauncherClusterApplicationEP * _Nullable value;
-        if (mValue.IsNull()) {
-            value = nil;
-        } else {
-            value = [CHIPApplicationLauncherClusterApplicationEP new];
-            value.application = [CHIPApplicationLauncherClusterApplication new];
-            value.application.catalogVendorId = [NSNumber numberWithUnsignedShort:mValue.Value().application.catalogVendorId];
-            value.application.applicationId = [[NSString alloc] initWithBytes:mValue.Value().application.applicationId.data()
-                                                                       length:mValue.Value().application.applicationId.size()
-                                                                     encoding:NSUTF8StringEncoding];
-            if (mValue.Value().endpoint.HasValue()) {
-                value.endpoint = [NSNumber numberWithUnsignedShort:mValue.Value().endpoint.Value()];
-            } else {
-                value.endpoint = nil;
-            }
-        }
-
-        [cluster writeAttributeCurrentAppWithValue:value
-                                            params:params
-                                 completionHandler:^(NSError * _Nullable error) {
-                                     if (error != nil) {
-                                         LogNSError("ApplicationLauncher CurrentApp write Error", error);
-                                     }
-                                     SetCommandExitStatus(error);
-                                 }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::Type> mValue;
-    TypedComplexArgument<chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::Type>>
-        mComplex;
-};
-
-class SubscribeAttributeApplicationLauncherCurrentApp : public SubscribeAttribute {
+class SubscribeAttributeOnOffFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeApplicationLauncherCurrentApp()
-        : SubscribeAttribute("current-app")
+    SubscribeAttributeOnOffFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeApplicationLauncherCurrentApp() {}
+    ~SubscribeAttributeOnOffFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentAppWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(CHIPApplicationLauncherClusterApplicationEP * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ApplicationLauncher.CurrentApp response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOff.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -3445,29 +3720,27 @@ class SubscribeAttributeApplicationLauncherCurrentApp : public SubscribeAttribut
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute ClusterRevision
  */
-class ReadApplicationLauncherGeneratedCommandList : public ReadAttribute {
+class ReadOnOffClusterRevision : public ReadAttribute {
 public:
-    ReadApplicationLauncherGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadOnOffClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadApplicationLauncherGeneratedCommandList() {}
+    ~ReadOnOffClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ApplicationLauncher.GeneratedCommandList response %@", [value description]);
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OnOff.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("ApplicationLauncher GeneratedCommandList read Error", error);
+                LogNSError("OnOff ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -3475,34 +3748,32 @@ class ReadApplicationLauncherGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeApplicationLauncherGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeOnOffClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeApplicationLauncherGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeOnOffClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeApplicationLauncherGeneratedCommandList() {}
+    ~SubscribeAttributeOnOffClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ApplicationLauncher.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOff.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -3512,30 +3783,47 @@ class SubscribeAttributeApplicationLauncherGeneratedCommandList : public Subscri
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster OnOffSwitchConfiguration                                    | 0x0007 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * SwitchType                                                        | 0x0000 |
+| * SwitchActions                                                     | 0x0010 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute AcceptedCommandList
+ * Attribute SwitchType
  */
-class ReadApplicationLauncherAcceptedCommandList : public ReadAttribute {
+class ReadOnOffSwitchConfigurationSwitchType : public ReadAttribute {
 public:
-    ReadApplicationLauncherAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadOnOffSwitchConfigurationSwitchType()
+        : ReadAttribute("switch-type")
     {
     }
 
-    ~ReadApplicationLauncherAcceptedCommandList() {}
+    ~ReadOnOffSwitchConfigurationSwitchType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ApplicationLauncher.AcceptedCommandList response %@", [value description]);
+        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeSwitchTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OnOffSwitchConfiguration.SwitchType response %@", [value description]);
             if (error != nil) {
-                LogNSError("ApplicationLauncher AcceptedCommandList read Error", error);
+                LogNSError("OnOffSwitchConfiguration SwitchType read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -3543,34 +3831,34 @@ class ReadApplicationLauncherAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeApplicationLauncherAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeOnOffSwitchConfigurationSwitchType : public SubscribeAttribute {
 public:
-    SubscribeAttributeApplicationLauncherAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeOnOffSwitchConfigurationSwitchType()
+        : SubscribeAttribute("switch-type")
     {
     }
 
-    ~SubscribeAttributeApplicationLauncherAcceptedCommandList() {}
+    ~SubscribeAttributeOnOffSwitchConfigurationSwitchType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSwitchTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ApplicationLauncher.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOffSwitchConfiguration.SwitchType response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -3581,29 +3869,29 @@ class SubscribeAttributeApplicationLauncherAcceptedCommandList : public Subscrib
 };
 
 /*
- * Attribute AttributeList
+ * Attribute SwitchActions
  */
-class ReadApplicationLauncherAttributeList : public ReadAttribute {
+class ReadOnOffSwitchConfigurationSwitchActions : public ReadAttribute {
 public:
-    ReadApplicationLauncherAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadOnOffSwitchConfigurationSwitchActions()
+        : ReadAttribute("switch-actions")
     {
     }
 
-    ~ReadApplicationLauncherAttributeList() {}
+    ~ReadOnOffSwitchConfigurationSwitchActions() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReadAttribute (0x00000010) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ApplicationLauncher.AttributeList response %@", [value description]);
+        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeSwitchActionsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OnOffSwitchConfiguration.SwitchActions response %@", [value description]);
             if (error != nil) {
-                LogNSError("ApplicationLauncher AttributeList read Error", error);
+                LogNSError("OnOffSwitchConfiguration SwitchActions read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -3611,34 +3899,74 @@ class ReadApplicationLauncherAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeApplicationLauncherAttributeList : public SubscribeAttribute {
+class WriteOnOffSwitchConfigurationSwitchActions : public WriteAttribute {
 public:
-    SubscribeAttributeApplicationLauncherAttributeList()
-        : SubscribeAttribute("attribute-list")
+    WriteOnOffSwitchConfigurationSwitchActions()
+        : WriteAttribute("switch-actions")
     {
+        AddArgument("attr-name", "switch-actions");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeApplicationLauncherAttributeList() {}
+    ~WriteOnOffSwitchConfigurationSwitchActions() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000007) WriteAttribute (0x00000010) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeSwitchActionsWithValue:value
+                                               params:params
+                                    completionHandler:^(NSError * _Nullable error) {
+                                        if (error != nil) {
+                                            LogNSError("OnOffSwitchConfiguration SwitchActions write Error", error);
+                                        }
+                                        SetCommandExitStatus(error);
+                                    }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeOnOffSwitchConfigurationSwitchActions : public SubscribeAttribute {
+public:
+    SubscribeAttributeOnOffSwitchConfigurationSwitchActions()
+        : SubscribeAttribute("switch-actions")
+    {
+    }
+
+    ~SubscribeAttributeOnOffSwitchConfigurationSwitchActions() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReportAttribute (0x00000010) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSwitchActionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ApplicationLauncher.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOffSwitchConfiguration.SwitchActions response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -3649,29 +3977,29 @@ class SubscribeAttributeApplicationLauncherAttributeList : public SubscribeAttri
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute GeneratedCommandList
  */
-class ReadApplicationLauncherFeatureMap : public ReadAttribute {
+class ReadOnOffSwitchConfigurationGeneratedCommandList : public ReadAttribute {
 public:
-    ReadApplicationLauncherFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadOnOffSwitchConfigurationGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadApplicationLauncherFeatureMap() {}
+    ~ReadOnOffSwitchConfigurationGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ApplicationLauncher.FeatureMap response %@", [value description]);
+        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OnOffSwitchConfiguration.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ApplicationLauncher FeatureMap read Error", error);
+                LogNSError("OnOffSwitchConfiguration GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -3679,34 +4007,34 @@ class ReadApplicationLauncherFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeApplicationLauncherFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeOnOffSwitchConfigurationGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeApplicationLauncherFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeOnOffSwitchConfigurationGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeApplicationLauncherFeatureMap() {}
+    ~SubscribeAttributeOnOffSwitchConfigurationGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ApplicationLauncher.FeatureMap response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOffSwitchConfiguration.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -3717,29 +4045,29 @@ class SubscribeAttributeApplicationLauncherFeatureMap : public SubscribeAttribut
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute AcceptedCommandList
  */
-class ReadApplicationLauncherClusterRevision : public ReadAttribute {
+class ReadOnOffSwitchConfigurationAcceptedCommandList : public ReadAttribute {
 public:
-    ReadApplicationLauncherClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadOnOffSwitchConfigurationAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadApplicationLauncherClusterRevision() {}
+    ~ReadOnOffSwitchConfigurationAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ApplicationLauncher.ClusterRevision response %@", [value description]);
+        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OnOffSwitchConfiguration.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ApplicationLauncher ClusterRevision read Error", error);
+                LogNSError("OnOffSwitchConfiguration AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -3747,34 +4075,34 @@ class ReadApplicationLauncherClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeApplicationLauncherClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeOnOffSwitchConfigurationAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeApplicationLauncherClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeOnOffSwitchConfigurationAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeApplicationLauncherClusterRevision() {}
+    ~SubscribeAttributeOnOffSwitchConfigurationAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ApplicationLauncher.ClusterRevision response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOffSwitchConfiguration.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -3784,139 +4112,30 @@ class SubscribeAttributeApplicationLauncherClusterRevision : public SubscribeAtt
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster AudioOutput                                                 | 0x050B |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * SelectOutput                                                      |   0x00 |
-| * RenameOutput                                                      |   0x01 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * OutputList                                                        | 0x0000 |
-| * CurrentOutput                                                     | 0x0001 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
-/*
- * Command SelectOutput
- */
-class AudioOutputSelectOutput : public ClusterCommand {
-public:
-    AudioOutputSelectOutput()
-        : ClusterCommand("select-output")
-    {
-        AddArgument("Index", 0, UINT8_MAX, &mRequest.index);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) command (0x00000000) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPAudioOutputClusterSelectOutputParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.index = [NSNumber numberWithUnsignedChar:mRequest.index];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster selectOutputWithParams:params
-                          completionHandler:^(NSError * _Nullable error) {
-                              responsesNeeded--;
-                              if (error != nil) {
-                                  mError = error;
-                                  LogNSError("Error", error);
-                              }
-                              if (responsesNeeded == 0) {
-                                  SetCommandExitStatus(mError);
-                              }
-                          }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::AudioOutput::Commands::SelectOutput::Type mRequest;
-};
-
-/*
- * Command RenameOutput
- */
-class AudioOutputRenameOutput : public ClusterCommand {
-public:
-    AudioOutputRenameOutput()
-        : ClusterCommand("rename-output")
-    {
-        AddArgument("Index", 0, UINT8_MAX, &mRequest.index);
-        AddArgument("Name", &mRequest.name);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) command (0x00000001) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPAudioOutputClusterRenameOutputParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.index = [NSNumber numberWithUnsignedChar:mRequest.index];
-        params.name = [[NSString alloc] initWithBytes:mRequest.name.data()
-                                               length:mRequest.name.size()
-                                             encoding:NSUTF8StringEncoding];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster renameOutputWithParams:params
-                          completionHandler:^(NSError * _Nullable error) {
-                              responsesNeeded--;
-                              if (error != nil) {
-                                  mError = error;
-                                  LogNSError("Error", error);
-                              }
-                              if (responsesNeeded == 0) {
-                                  SetCommandExitStatus(mError);
-                              }
-                          }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::AudioOutput::Commands::RenameOutput::Type mRequest;
-};
-
 /*
- * Attribute OutputList
+ * Attribute AttributeList
  */
-class ReadAudioOutputOutputList : public ReadAttribute {
+class ReadOnOffSwitchConfigurationAttributeList : public ReadAttribute {
 public:
-    ReadAudioOutputOutputList()
-        : ReadAttribute("output-list")
+    ReadOnOffSwitchConfigurationAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadAudioOutputOutputList() {}
+    ~ReadOnOffSwitchConfigurationAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeOutputListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AudioOutput.OutputList response %@", [value description]);
+        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OnOffSwitchConfiguration.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("AudioOutput OutputList read Error", error);
+                LogNSError("OnOffSwitchConfiguration AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -3924,32 +4143,34 @@ class ReadAudioOutputOutputList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAudioOutputOutputList : public SubscribeAttribute {
+class SubscribeAttributeOnOffSwitchConfigurationAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeAudioOutputOutputList()
-        : SubscribeAttribute("output-list")
+    SubscribeAttributeOnOffSwitchConfigurationAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeAudioOutputOutputList() {}
+    ~SubscribeAttributeOnOffSwitchConfigurationAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOutputListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AudioOutput.OutputList response %@", [value description]);
+                NSLog(@"OnOffSwitchConfiguration.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -3960,27 +4181,29 @@ class SubscribeAttributeAudioOutputOutputList : public SubscribeAttribute {
 };
 
 /*
- * Attribute CurrentOutput
+ * Attribute FeatureMap
  */
-class ReadAudioOutputCurrentOutput : public ReadAttribute {
+class ReadOnOffSwitchConfigurationFeatureMap : public ReadAttribute {
 public:
-    ReadAudioOutputCurrentOutput()
-        : ReadAttribute("current-output")
+    ReadOnOffSwitchConfigurationFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadAudioOutputCurrentOutput() {}
+    ~ReadOnOffSwitchConfigurationFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCurrentOutputWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AudioOutput.CurrentOutput response %@", [value description]);
+        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OnOffSwitchConfiguration.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("AudioOutput CurrentOutput read Error", error);
+                LogNSError("OnOffSwitchConfiguration FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -3988,32 +4211,34 @@ class ReadAudioOutputCurrentOutput : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAudioOutputCurrentOutput : public SubscribeAttribute {
+class SubscribeAttributeOnOffSwitchConfigurationFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeAudioOutputCurrentOutput()
-        : SubscribeAttribute("current-output")
+    SubscribeAttributeOnOffSwitchConfigurationFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeAudioOutputCurrentOutput() {}
+    ~SubscribeAttributeOnOffSwitchConfigurationFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentOutputWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AudioOutput.CurrentOutput response %@", [value description]);
+                NSLog(@"OnOffSwitchConfiguration.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -4024,27 +4249,29 @@ class SubscribeAttributeAudioOutputCurrentOutput : public SubscribeAttribute {
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute ClusterRevision
  */
-class ReadAudioOutputGeneratedCommandList : public ReadAttribute {
+class ReadOnOffSwitchConfigurationClusterRevision : public ReadAttribute {
 public:
-    ReadAudioOutputGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadOnOffSwitchConfigurationClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadAudioOutputGeneratedCommandList() {}
+    ~ReadOnOffSwitchConfigurationClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AudioOutput.GeneratedCommandList response %@", [value description]);
+        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OnOffSwitchConfiguration.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("AudioOutput GeneratedCommandList read Error", error);
+                LogNSError("OnOffSwitchConfiguration ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -4052,32 +4279,34 @@ class ReadAudioOutputGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAudioOutputGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeOnOffSwitchConfigurationClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeAudioOutputGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeOnOffSwitchConfigurationClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeAudioOutputGeneratedCommandList() {}
+    ~SubscribeAttributeOnOffSwitchConfigurationClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AudioOutput.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OnOffSwitchConfiguration.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -4087,396 +4316,489 @@ class SubscribeAttributeAudioOutputGeneratedCommandList : public SubscribeAttrib
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster LevelControl                                                | 0x0008 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * MoveToLevel                                                       |   0x00 |
+| * Move                                                              |   0x01 |
+| * Step                                                              |   0x02 |
+| * Stop                                                              |   0x03 |
+| * MoveToLevelWithOnOff                                              |   0x04 |
+| * MoveWithOnOff                                                     |   0x05 |
+| * StepWithOnOff                                                     |   0x06 |
+| * StopWithOnOff                                                     |   0x07 |
+| * MoveToClosestFrequency                                            |   0x08 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * CurrentLevel                                                      | 0x0000 |
+| * RemainingTime                                                     | 0x0001 |
+| * MinLevel                                                          | 0x0002 |
+| * MaxLevel                                                          | 0x0003 |
+| * CurrentFrequency                                                  | 0x0004 |
+| * MinFrequency                                                      | 0x0005 |
+| * MaxFrequency                                                      | 0x0006 |
+| * Options                                                           | 0x000F |
+| * OnOffTransitionTime                                               | 0x0010 |
+| * OnLevel                                                           | 0x0011 |
+| * OnTransitionTime                                                  | 0x0012 |
+| * OffTransitionTime                                                 | 0x0013 |
+| * DefaultMoveRate                                                   | 0x0014 |
+| * StartUpCurrentLevel                                               | 0x4000 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute AcceptedCommandList
+ * Command MoveToLevel
  */
-class ReadAudioOutputAcceptedCommandList : public ReadAttribute {
+class LevelControlMoveToLevel : public ClusterCommand {
 public:
-    ReadAudioOutputAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    LevelControlMoveToLevel()
+        : ClusterCommand("move-to-level")
     {
+        AddArgument("Level", 0, UINT8_MAX, &mRequest.level);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        AddArgument("OptionMask", 0, UINT8_MAX, &mRequest.optionMask);
+        AddArgument("OptionOverride", 0, UINT8_MAX, &mRequest.optionOverride);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadAudioOutputAcceptedCommandList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AudioOutput.AcceptedCommandList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("AudioOutput AcceptedCommandList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPLevelControlClusterMoveToLevelParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.level = [NSNumber numberWithUnsignedChar:mRequest.level];
+        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
+        params.optionMask = [NSNumber numberWithUnsignedChar:mRequest.optionMask];
+        params.optionOverride = [NSNumber numberWithUnsignedChar:mRequest.optionOverride];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster moveToLevelWithParams:params
+                         completionHandler:^(NSError * _Nullable error) {
+                             responsesNeeded--;
+                             if (error != nil) {
+                                 mError = error;
+                                 LogNSError("Error", error);
+                             }
+                             if (responsesNeeded == 0) {
+                                 SetCommandExitStatus(mError);
+                             }
+                         }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::LevelControl::Commands::MoveToLevel::Type mRequest;
 };
 
-class SubscribeAttributeAudioOutputAcceptedCommandList : public SubscribeAttribute {
+/*
+ * Command Move
+ */
+class LevelControlMove : public ClusterCommand {
 public:
-    SubscribeAttributeAudioOutputAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    LevelControlMove()
+        : ClusterCommand("move")
     {
+        AddArgument("MoveMode", 0, UINT8_MAX, &mRequest.moveMode);
+        AddArgument("Rate", 0, UINT8_MAX, &mRequest.rate);
+        AddArgument("OptionMask", 0, UINT8_MAX, &mRequest.optionMask);
+        AddArgument("OptionOverride", 0, UINT8_MAX, &mRequest.optionOverride);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeAudioOutputAcceptedCommandList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AudioOutput.AcceptedCommandList response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) command (0x00000001) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPLevelControlClusterMoveParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.moveMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.moveMode)];
+        params.rate = [NSNumber numberWithUnsignedChar:mRequest.rate];
+        params.optionMask = [NSNumber numberWithUnsignedChar:mRequest.optionMask];
+        params.optionOverride = [NSNumber numberWithUnsignedChar:mRequest.optionOverride];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster moveWithParams:params
+                  completionHandler:^(NSError * _Nullable error) {
+                      responsesNeeded--;
+                      if (error != nil) {
+                          mError = error;
+                          LogNSError("Error", error);
+                      }
+                      if (responsesNeeded == 0) {
+                          SetCommandExitStatus(mError);
+                      }
+                  }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::LevelControl::Commands::Move::Type mRequest;
 };
 
 /*
- * Attribute AttributeList
+ * Command Step
  */
-class ReadAudioOutputAttributeList : public ReadAttribute {
+class LevelControlStep : public ClusterCommand {
 public:
-    ReadAudioOutputAttributeList()
-        : ReadAttribute("attribute-list")
+    LevelControlStep()
+        : ClusterCommand("step")
     {
+        AddArgument("StepMode", 0, UINT8_MAX, &mRequest.stepMode);
+        AddArgument("StepSize", 0, UINT8_MAX, &mRequest.stepSize);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        AddArgument("OptionMask", 0, UINT8_MAX, &mRequest.optionMask);
+        AddArgument("OptionOverride", 0, UINT8_MAX, &mRequest.optionOverride);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadAudioOutputAttributeList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) command (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AudioOutput.AttributeList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("AudioOutput AttributeList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPLevelControlClusterStepParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.stepMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.stepMode)];
+        params.stepSize = [NSNumber numberWithUnsignedChar:mRequest.stepSize];
+        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
+        params.optionMask = [NSNumber numberWithUnsignedChar:mRequest.optionMask];
+        params.optionOverride = [NSNumber numberWithUnsignedChar:mRequest.optionOverride];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster stepWithParams:params
+                  completionHandler:^(NSError * _Nullable error) {
+                      responsesNeeded--;
+                      if (error != nil) {
+                          mError = error;
+                          LogNSError("Error", error);
+                      }
+                      if (responsesNeeded == 0) {
+                          SetCommandExitStatus(mError);
+                      }
+                  }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::LevelControl::Commands::Step::Type mRequest;
 };
 
-class SubscribeAttributeAudioOutputAttributeList : public SubscribeAttribute {
+/*
+ * Command Stop
+ */
+class LevelControlStop : public ClusterCommand {
 public:
-    SubscribeAttributeAudioOutputAttributeList()
-        : SubscribeAttribute("attribute-list")
+    LevelControlStop()
+        : ClusterCommand("stop")
     {
+        AddArgument("OptionMask", 0, UINT8_MAX, &mRequest.optionMask);
+        AddArgument("OptionOverride", 0, UINT8_MAX, &mRequest.optionOverride);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeAudioOutputAttributeList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AudioOutput.AttributeList response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) command (0x00000003) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPLevelControlClusterStopParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.optionMask = [NSNumber numberWithUnsignedChar:mRequest.optionMask];
+        params.optionOverride = [NSNumber numberWithUnsignedChar:mRequest.optionOverride];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster stopWithParams:params
+                  completionHandler:^(NSError * _Nullable error) {
+                      responsesNeeded--;
+                      if (error != nil) {
+                          mError = error;
+                          LogNSError("Error", error);
+                      }
+                      if (responsesNeeded == 0) {
+                          SetCommandExitStatus(mError);
+                      }
+                  }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::LevelControl::Commands::Stop::Type mRequest;
 };
 
 /*
- * Attribute FeatureMap
+ * Command MoveToLevelWithOnOff
  */
-class ReadAudioOutputFeatureMap : public ReadAttribute {
+class LevelControlMoveToLevelWithOnOff : public ClusterCommand {
 public:
-    ReadAudioOutputFeatureMap()
-        : ReadAttribute("feature-map")
+    LevelControlMoveToLevelWithOnOff()
+        : ClusterCommand("move-to-level-with-on-off")
     {
+        AddArgument("Level", 0, UINT8_MAX, &mRequest.level);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadAudioOutputFeatureMap() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) command (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AudioOutput.FeatureMap response %@", [value description]);
-            if (error != nil) {
-                LogNSError("AudioOutput FeatureMap read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class SubscribeAttributeAudioOutputFeatureMap : public SubscribeAttribute {
-public:
-    SubscribeAttributeAudioOutputFeatureMap()
-        : SubscribeAttribute("feature-map")
-    {
-    }
-
-    ~SubscribeAttributeAudioOutputFeatureMap() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AudioOutput.FeatureMap response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
-
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPLevelControlClusterMoveToLevelWithOnOffParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.level = [NSNumber numberWithUnsignedChar:mRequest.level];
+        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster moveToLevelWithOnOffWithParams:params
+                                  completionHandler:^(NSError * _Nullable error) {
+                                      responsesNeeded--;
+                                      if (error != nil) {
+                                          mError = error;
+                                          LogNSError("Error", error);
+                                      }
+                                      if (responsesNeeded == 0) {
+                                          SetCommandExitStatus(mError);
+                                      }
+                                  }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::LevelControl::Commands::MoveToLevelWithOnOff::Type mRequest;
 };
 
 /*
- * Attribute ClusterRevision
+ * Command MoveWithOnOff
  */
-class ReadAudioOutputClusterRevision : public ReadAttribute {
+class LevelControlMoveWithOnOff : public ClusterCommand {
 public:
-    ReadAudioOutputClusterRevision()
-        : ReadAttribute("cluster-revision")
+    LevelControlMoveWithOnOff()
+        : ClusterCommand("move-with-on-off")
     {
+        AddArgument("MoveMode", 0, UINT8_MAX, &mRequest.moveMode);
+        AddArgument("Rate", 0, UINT8_MAX, &mRequest.rate);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadAudioOutputClusterRevision() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) command (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AudioOutput.ClusterRevision response %@", [value description]);
-            if (error != nil) {
-                LogNSError("AudioOutput ClusterRevision read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPLevelControlClusterMoveWithOnOffParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.moveMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.moveMode)];
+        params.rate = [NSNumber numberWithUnsignedChar:mRequest.rate];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster moveWithOnOffWithParams:params
+                           completionHandler:^(NSError * _Nullable error) {
+                               responsesNeeded--;
+                               if (error != nil) {
+                                   mError = error;
+                                   LogNSError("Error", error);
+                               }
+                               if (responsesNeeded == 0) {
+                                   SetCommandExitStatus(mError);
+                               }
+                           }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::LevelControl::Commands::MoveWithOnOff::Type mRequest;
 };
 
-class SubscribeAttributeAudioOutputClusterRevision : public SubscribeAttribute {
+/*
+ * Command StepWithOnOff
+ */
+class LevelControlStepWithOnOff : public ClusterCommand {
 public:
-    SubscribeAttributeAudioOutputClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    LevelControlStepWithOnOff()
+        : ClusterCommand("step-with-on-off")
     {
+        AddArgument("StepMode", 0, UINT8_MAX, &mRequest.stepMode);
+        AddArgument("StepSize", 0, UINT8_MAX, &mRequest.stepSize);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeAudioOutputClusterRevision() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AudioOutput.ClusterRevision response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) command (0x00000006) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPLevelControlClusterStepWithOnOffParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.stepMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.stepMode)];
+        params.stepSize = [NSNumber numberWithUnsignedChar:mRequest.stepSize];
+        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster stepWithOnOffWithParams:params
+                           completionHandler:^(NSError * _Nullable error) {
+                               responsesNeeded--;
+                               if (error != nil) {
+                                   mError = error;
+                                   LogNSError("Error", error);
+                               }
+                               if (responsesNeeded == 0) {
+                                   SetCommandExitStatus(mError);
+                               }
+                           }];
+        }
         return CHIP_NO_ERROR;
     }
-};
 
-/*----------------------------------------------------------------------------*\
-| Cluster BarrierControl                                              | 0x0103 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * BarrierControlGoToPercent                                         |   0x00 |
-| * BarrierControlStop                                                |   0x01 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * BarrierMovingState                                                | 0x0001 |
-| * BarrierSafetyStatus                                               | 0x0002 |
-| * BarrierCapabilities                                               | 0x0003 |
-| * BarrierOpenEvents                                                 | 0x0004 |
-| * BarrierCloseEvents                                                | 0x0005 |
-| * BarrierCommandOpenEvents                                          | 0x0006 |
-| * BarrierCommandCloseEvents                                         | 0x0007 |
-| * BarrierOpenPeriod                                                 | 0x0008 |
-| * BarrierClosePeriod                                                | 0x0009 |
-| * BarrierPosition                                                   | 0x000A |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
+private:
+    chip::app::Clusters::LevelControl::Commands::StepWithOnOff::Type mRequest;
+};
 
 /*
- * Command BarrierControlGoToPercent
+ * Command StopWithOnOff
  */
-class BarrierControlBarrierControlGoToPercent : public ClusterCommand {
+class LevelControlStopWithOnOff : public ClusterCommand {
 public:
-    BarrierControlBarrierControlGoToPercent()
-        : ClusterCommand("barrier-control-go-to-percent")
+    LevelControlStopWithOnOff()
+        : ClusterCommand("stop-with-on-off")
     {
-        AddArgument("PercentOpen", 0, UINT8_MAX, &mRequest.percentOpen);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) command (0x00000007) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPBarrierControlClusterBarrierControlGoToPercentParams alloc] init];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPLevelControlClusterStopWithOnOffParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.percentOpen = [NSNumber numberWithUnsignedChar:mRequest.percentOpen];
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster barrierControlGoToPercentWithParams:params
-                                       completionHandler:^(NSError * _Nullable error) {
-                                           responsesNeeded--;
-                                           if (error != nil) {
-                                               mError = error;
-                                               LogNSError("Error", error);
-                                           }
-                                           if (responsesNeeded == 0) {
-                                               SetCommandExitStatus(mError);
-                                           }
-                                       }];
+            [cluster stopWithOnOffWithParams:params
+                           completionHandler:^(NSError * _Nullable error) {
+                               responsesNeeded--;
+                               if (error != nil) {
+                                   mError = error;
+                                   LogNSError("Error", error);
+                               }
+                               if (responsesNeeded == 0) {
+                                   SetCommandExitStatus(mError);
+                               }
+                           }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::BarrierControl::Commands::BarrierControlGoToPercent::Type mRequest;
 };
 
 /*
- * Command BarrierControlStop
+ * Command MoveToClosestFrequency
  */
-class BarrierControlBarrierControlStop : public ClusterCommand {
+class LevelControlMoveToClosestFrequency : public ClusterCommand {
 public:
-    BarrierControlBarrierControlStop()
-        : ClusterCommand("barrier-control-stop")
+    LevelControlMoveToClosestFrequency()
+        : ClusterCommand("move-to-closest-frequency")
     {
+        AddArgument("Frequency", 0, UINT16_MAX, &mRequest.frequency);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) command (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) command (0x00000008) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPBarrierControlClusterBarrierControlStopParams alloc] init];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPLevelControlClusterMoveToClosestFrequencyParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.frequency = [NSNumber numberWithUnsignedShort:mRequest.frequency];
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster barrierControlStopWithParams:params
-                                completionHandler:^(NSError * _Nullable error) {
-                                    responsesNeeded--;
-                                    if (error != nil) {
-                                        mError = error;
-                                        LogNSError("Error", error);
-                                    }
-                                    if (responsesNeeded == 0) {
-                                        SetCommandExitStatus(mError);
-                                    }
-                                }];
+            [cluster moveToClosestFrequencyWithParams:params
+                                    completionHandler:^(NSError * _Nullable error) {
+                                        responsesNeeded--;
+                                        if (error != nil) {
+                                            mError = error;
+                                            LogNSError("Error", error);
+                                        }
+                                        if (responsesNeeded == 0) {
+                                            SetCommandExitStatus(mError);
+                                        }
+                                    }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
+    chip::app::Clusters::LevelControl::Commands::MoveToClosestFrequency::Type mRequest;
 };
 
 /*
- * Attribute BarrierMovingState
+ * Attribute CurrentLevel
  */
-class ReadBarrierControlBarrierMovingState : public ReadAttribute {
+class ReadLevelControlCurrentLevel : public ReadAttribute {
 public:
-    ReadBarrierControlBarrierMovingState()
-        : ReadAttribute("barrier-moving-state")
+    ReadLevelControlCurrentLevel()
+        : ReadAttribute("current-level")
     {
     }
 
-    ~ReadBarrierControlBarrierMovingState() {}
+    ~ReadLevelControlCurrentLevel() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBarrierMovingStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BarrierControl.BarrierMovingState response %@", [value description]);
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCurrentLevelWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LevelControl.CurrentLevel response %@", [value description]);
             if (error != nil) {
-                LogNSError("BarrierControl BarrierMovingState read Error", error);
+                LogNSError("LevelControl CurrentLevel read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -4484,32 +4806,32 @@ class ReadBarrierControlBarrierMovingState : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBarrierControlBarrierMovingState : public SubscribeAttribute {
+class SubscribeAttributeLevelControlCurrentLevel : public SubscribeAttribute {
 public:
-    SubscribeAttributeBarrierControlBarrierMovingState()
-        : SubscribeAttribute("barrier-moving-state")
+    SubscribeAttributeLevelControlCurrentLevel()
+        : SubscribeAttribute("current-level")
     {
     }
 
-    ~SubscribeAttributeBarrierControlBarrierMovingState() {}
+    ~SubscribeAttributeLevelControlCurrentLevel() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBarrierMovingStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCurrentLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BarrierControl.BarrierMovingState response %@", [value description]);
+                NSLog(@"LevelControl.CurrentLevel response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -4520,27 +4842,27 @@ class SubscribeAttributeBarrierControlBarrierMovingState : public SubscribeAttri
 };
 
 /*
- * Attribute BarrierSafetyStatus
+ * Attribute RemainingTime
  */
-class ReadBarrierControlBarrierSafetyStatus : public ReadAttribute {
+class ReadLevelControlRemainingTime : public ReadAttribute {
 public:
-    ReadBarrierControlBarrierSafetyStatus()
-        : ReadAttribute("barrier-safety-status")
+    ReadLevelControlRemainingTime()
+        : ReadAttribute("remaining-time")
     {
     }
 
-    ~ReadBarrierControlBarrierSafetyStatus() {}
+    ~ReadLevelControlRemainingTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBarrierSafetyStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BarrierControl.BarrierSafetyStatus response %@", [value description]);
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeRemainingTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LevelControl.RemainingTime response %@", [value description]);
             if (error != nil) {
-                LogNSError("BarrierControl BarrierSafetyStatus read Error", error);
+                LogNSError("LevelControl RemainingTime read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -4548,32 +4870,32 @@ class ReadBarrierControlBarrierSafetyStatus : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBarrierControlBarrierSafetyStatus : public SubscribeAttribute {
+class SubscribeAttributeLevelControlRemainingTime : public SubscribeAttribute {
 public:
-    SubscribeAttributeBarrierControlBarrierSafetyStatus()
-        : SubscribeAttribute("barrier-safety-status")
+    SubscribeAttributeLevelControlRemainingTime()
+        : SubscribeAttribute("remaining-time")
     {
     }
 
-    ~SubscribeAttributeBarrierControlBarrierSafetyStatus() {}
+    ~SubscribeAttributeLevelControlRemainingTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBarrierSafetyStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRemainingTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BarrierControl.BarrierSafetyStatus response %@", [value description]);
+                NSLog(@"LevelControl.RemainingTime response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -4584,27 +4906,27 @@ class SubscribeAttributeBarrierControlBarrierSafetyStatus : public SubscribeAttr
 };
 
 /*
- * Attribute BarrierCapabilities
+ * Attribute MinLevel
  */
-class ReadBarrierControlBarrierCapabilities : public ReadAttribute {
+class ReadLevelControlMinLevel : public ReadAttribute {
 public:
-    ReadBarrierControlBarrierCapabilities()
-        : ReadAttribute("barrier-capabilities")
+    ReadLevelControlMinLevel()
+        : ReadAttribute("min-level")
     {
     }
 
-    ~ReadBarrierControlBarrierCapabilities() {}
+    ~ReadLevelControlMinLevel() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBarrierCapabilitiesWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BarrierControl.BarrierCapabilities response %@", [value description]);
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeMinLevelWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LevelControl.MinLevel response %@", [value description]);
             if (error != nil) {
-                LogNSError("BarrierControl BarrierCapabilities read Error", error);
+                LogNSError("LevelControl MinLevel read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -4612,32 +4934,32 @@ class ReadBarrierControlBarrierCapabilities : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBarrierControlBarrierCapabilities : public SubscribeAttribute {
+class SubscribeAttributeLevelControlMinLevel : public SubscribeAttribute {
 public:
-    SubscribeAttributeBarrierControlBarrierCapabilities()
-        : SubscribeAttribute("barrier-capabilities")
+    SubscribeAttributeLevelControlMinLevel()
+        : SubscribeAttribute("min-level")
     {
     }
 
-    ~SubscribeAttributeBarrierControlBarrierCapabilities() {}
+    ~SubscribeAttributeLevelControlMinLevel() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBarrierCapabilitiesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMinLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BarrierControl.BarrierCapabilities response %@", [value description]);
+                NSLog(@"LevelControl.MinLevel response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -4648,27 +4970,27 @@ class SubscribeAttributeBarrierControlBarrierCapabilities : public SubscribeAttr
 };
 
 /*
- * Attribute BarrierOpenEvents
+ * Attribute MaxLevel
  */
-class ReadBarrierControlBarrierOpenEvents : public ReadAttribute {
+class ReadLevelControlMaxLevel : public ReadAttribute {
 public:
-    ReadBarrierControlBarrierOpenEvents()
-        : ReadAttribute("barrier-open-events")
+    ReadLevelControlMaxLevel()
+        : ReadAttribute("max-level")
     {
     }
 
-    ~ReadBarrierControlBarrierOpenEvents() {}
+    ~ReadLevelControlMaxLevel() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBarrierOpenEventsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BarrierControl.BarrierOpenEvents response %@", [value description]);
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeMaxLevelWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LevelControl.MaxLevel response %@", [value description]);
             if (error != nil) {
-                LogNSError("BarrierControl BarrierOpenEvents read Error", error);
+                LogNSError("LevelControl MaxLevel read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -4676,70 +4998,96 @@ class ReadBarrierControlBarrierOpenEvents : public ReadAttribute {
     }
 };
 
-class WriteBarrierControlBarrierOpenEvents : public WriteAttribute {
+class SubscribeAttributeLevelControlMaxLevel : public SubscribeAttribute {
 public:
-    WriteBarrierControlBarrierOpenEvents()
-        : WriteAttribute("barrier-open-events")
+    SubscribeAttributeLevelControlMaxLevel()
+        : SubscribeAttribute("max-level")
     {
-        AddArgument("attr-name", "barrier-open-events");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteBarrierControlBarrierOpenEvents() {}
+    ~SubscribeAttributeLevelControlMaxLevel() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) WriteAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeMaxLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.MaxLevel response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
-        [cluster writeAttributeBarrierOpenEventsWithValue:value
-                                                   params:params
-                                        completionHandler:^(NSError * _Nullable error) {
-                                            if (error != nil) {
-                                                LogNSError("BarrierControl BarrierOpenEvents write Error", error);
-                                            }
-                                            SetCommandExitStatus(error);
-                                        }];
         return CHIP_NO_ERROR;
     }
+};
 
-private:
-    uint16_t mValue;
+/*
+ * Attribute CurrentFrequency
+ */
+class ReadLevelControlCurrentFrequency : public ReadAttribute {
+public:
+    ReadLevelControlCurrentFrequency()
+        : ReadAttribute("current-frequency")
+    {
+    }
+
+    ~ReadLevelControlCurrentFrequency() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00000004) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCurrentFrequencyWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LevelControl.CurrentFrequency response %@", [value description]);
+            if (error != nil) {
+                LogNSError("LevelControl CurrentFrequency read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
 };
 
-class SubscribeAttributeBarrierControlBarrierOpenEvents : public SubscribeAttribute {
+class SubscribeAttributeLevelControlCurrentFrequency : public SubscribeAttribute {
 public:
-    SubscribeAttributeBarrierControlBarrierOpenEvents()
-        : SubscribeAttribute("barrier-open-events")
+    SubscribeAttributeLevelControlCurrentFrequency()
+        : SubscribeAttribute("current-frequency")
     {
     }
 
-    ~SubscribeAttributeBarrierControlBarrierOpenEvents() {}
+    ~SubscribeAttributeLevelControlCurrentFrequency() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBarrierOpenEventsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCurrentFrequencyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BarrierControl.BarrierOpenEvents response %@", [value description]);
+                NSLog(@"LevelControl.CurrentFrequency response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -4750,27 +5098,27 @@ class SubscribeAttributeBarrierControlBarrierOpenEvents : public SubscribeAttrib
 };
 
 /*
- * Attribute BarrierCloseEvents
+ * Attribute MinFrequency
  */
-class ReadBarrierControlBarrierCloseEvents : public ReadAttribute {
+class ReadLevelControlMinFrequency : public ReadAttribute {
 public:
-    ReadBarrierControlBarrierCloseEvents()
-        : ReadAttribute("barrier-close-events")
+    ReadLevelControlMinFrequency()
+        : ReadAttribute("min-frequency")
     {
     }
 
-    ~ReadBarrierControlBarrierCloseEvents() {}
+    ~ReadLevelControlMinFrequency() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBarrierCloseEventsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BarrierControl.BarrierCloseEvents response %@", [value description]);
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeMinFrequencyWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LevelControl.MinFrequency response %@", [value description]);
             if (error != nil) {
-                LogNSError("BarrierControl BarrierCloseEvents read Error", error);
+                LogNSError("LevelControl MinFrequency read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -4778,70 +5126,96 @@ class ReadBarrierControlBarrierCloseEvents : public ReadAttribute {
     }
 };
 
-class WriteBarrierControlBarrierCloseEvents : public WriteAttribute {
+class SubscribeAttributeLevelControlMinFrequency : public SubscribeAttribute {
 public:
-    WriteBarrierControlBarrierCloseEvents()
-        : WriteAttribute("barrier-close-events")
+    SubscribeAttributeLevelControlMinFrequency()
+        : SubscribeAttribute("min-frequency")
     {
-        AddArgument("attr-name", "barrier-close-events");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteBarrierControlBarrierCloseEvents() {}
+    ~SubscribeAttributeLevelControlMinFrequency() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) WriteAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00000005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeMinFrequencyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.MinFrequency response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
-        [cluster writeAttributeBarrierCloseEventsWithValue:value
-                                                    params:params
-                                         completionHandler:^(NSError * _Nullable error) {
-                                             if (error != nil) {
-                                                 LogNSError("BarrierControl BarrierCloseEvents write Error", error);
-                                             }
-                                             SetCommandExitStatus(error);
-                                         }];
         return CHIP_NO_ERROR;
     }
+};
 
-private:
-    uint16_t mValue;
+/*
+ * Attribute MaxFrequency
+ */
+class ReadLevelControlMaxFrequency : public ReadAttribute {
+public:
+    ReadLevelControlMaxFrequency()
+        : ReadAttribute("max-frequency")
+    {
+    }
+
+    ~ReadLevelControlMaxFrequency() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00000006) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeMaxFrequencyWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LevelControl.MaxFrequency response %@", [value description]);
+            if (error != nil) {
+                LogNSError("LevelControl MaxFrequency read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
 };
 
-class SubscribeAttributeBarrierControlBarrierCloseEvents : public SubscribeAttribute {
+class SubscribeAttributeLevelControlMaxFrequency : public SubscribeAttribute {
 public:
-    SubscribeAttributeBarrierControlBarrierCloseEvents()
-        : SubscribeAttribute("barrier-close-events")
+    SubscribeAttributeLevelControlMaxFrequency()
+        : SubscribeAttribute("max-frequency")
     {
     }
 
-    ~SubscribeAttributeBarrierControlBarrierCloseEvents() {}
+    ~SubscribeAttributeLevelControlMaxFrequency() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00000006) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBarrierCloseEventsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMaxFrequencyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BarrierControl.BarrierCloseEvents response %@", [value description]);
+                NSLog(@"LevelControl.MaxFrequency response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -4852,99 +5226,98 @@ class SubscribeAttributeBarrierControlBarrierCloseEvents : public SubscribeAttri
 };
 
 /*
- * Attribute BarrierCommandOpenEvents
+ * Attribute Options
  */
-class ReadBarrierControlBarrierCommandOpenEvents : public ReadAttribute {
+class ReadLevelControlOptions : public ReadAttribute {
 public:
-    ReadBarrierControlBarrierCommandOpenEvents()
-        : ReadAttribute("barrier-command-open-events")
+    ReadLevelControlOptions()
+        : ReadAttribute("options")
     {
     }
 
-    ~ReadBarrierControlBarrierCommandOpenEvents() {}
+    ~ReadLevelControlOptions() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x0000000F) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeBarrierCommandOpenEventsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BarrierControl.BarrierCommandOpenEvents response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("BarrierControl BarrierCommandOpenEvents read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeOptionsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LevelControl.Options response %@", [value description]);
+            if (error != nil) {
+                LogNSError("LevelControl Options read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class WriteBarrierControlBarrierCommandOpenEvents : public WriteAttribute {
+class WriteLevelControlOptions : public WriteAttribute {
 public:
-    WriteBarrierControlBarrierCommandOpenEvents()
-        : WriteAttribute("barrier-command-open-events")
+    WriteLevelControlOptions()
+        : WriteAttribute("options")
     {
-        AddArgument("attr-name", "barrier-command-open-events");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        AddArgument("attr-name", "options");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteBarrierControlBarrierCommandOpenEvents() {}
+    ~WriteLevelControlOptions() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) WriteAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) WriteAttribute (0x0000000F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
 
-        [cluster writeAttributeBarrierCommandOpenEventsWithValue:value
-                                                          params:params
-                                               completionHandler:^(NSError * _Nullable error) {
-                                                   if (error != nil) {
-                                                       LogNSError("BarrierControl BarrierCommandOpenEvents write Error", error);
-                                                   }
-                                                   SetCommandExitStatus(error);
-                                               }];
+        [cluster writeAttributeOptionsWithValue:value
+                                         params:params
+                              completionHandler:^(NSError * _Nullable error) {
+                                  if (error != nil) {
+                                      LogNSError("LevelControl Options write Error", error);
+                                  }
+                                  SetCommandExitStatus(error);
+                              }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    uint16_t mValue;
+    uint8_t mValue;
 };
 
-class SubscribeAttributeBarrierControlBarrierCommandOpenEvents : public SubscribeAttribute {
+class SubscribeAttributeLevelControlOptions : public SubscribeAttribute {
 public:
-    SubscribeAttributeBarrierControlBarrierCommandOpenEvents()
-        : SubscribeAttribute("barrier-command-open-events")
+    SubscribeAttributeLevelControlOptions()
+        : SubscribeAttribute("options")
     {
     }
 
-    ~SubscribeAttributeBarrierControlBarrierCommandOpenEvents() {}
+    ~SubscribeAttributeLevelControlOptions() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x0000000F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBarrierCommandOpenEventsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOptionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BarrierControl.BarrierCommandOpenEvents response %@", [value description]);
+                NSLog(@"LevelControl.Options response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -4955,66 +5328,65 @@ class SubscribeAttributeBarrierControlBarrierCommandOpenEvents : public Subscrib
 };
 
 /*
- * Attribute BarrierCommandCloseEvents
+ * Attribute OnOffTransitionTime
  */
-class ReadBarrierControlBarrierCommandCloseEvents : public ReadAttribute {
+class ReadLevelControlOnOffTransitionTime : public ReadAttribute {
 public:
-    ReadBarrierControlBarrierCommandCloseEvents()
-        : ReadAttribute("barrier-command-close-events")
+    ReadLevelControlOnOffTransitionTime()
+        : ReadAttribute("on-off-transition-time")
     {
     }
 
-    ~ReadBarrierControlBarrierCommandCloseEvents() {}
+    ~ReadLevelControlOnOffTransitionTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00000010) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeBarrierCommandCloseEventsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BarrierControl.BarrierCommandCloseEvents response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("BarrierControl BarrierCommandCloseEvents read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeOnOffTransitionTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LevelControl.OnOffTransitionTime response %@", [value description]);
+            if (error != nil) {
+                LogNSError("LevelControl OnOffTransitionTime read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class WriteBarrierControlBarrierCommandCloseEvents : public WriteAttribute {
+class WriteLevelControlOnOffTransitionTime : public WriteAttribute {
 public:
-    WriteBarrierControlBarrierCommandCloseEvents()
-        : WriteAttribute("barrier-command-close-events")
+    WriteLevelControlOnOffTransitionTime()
+        : WriteAttribute("on-off-transition-time")
     {
-        AddArgument("attr-name", "barrier-command-close-events");
+        AddArgument("attr-name", "on-off-transition-time");
         AddArgument("attr-value", 0, UINT16_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteBarrierControlBarrierCommandCloseEvents() {}
+    ~WriteLevelControlOnOffTransitionTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) WriteAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) WriteAttribute (0x00000010) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
         NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
 
-        [cluster writeAttributeBarrierCommandCloseEventsWithValue:value
-                                                           params:params
-                                                completionHandler:^(NSError * _Nullable error) {
-                                                    if (error != nil) {
-                                                        LogNSError("BarrierControl BarrierCommandCloseEvents write Error", error);
-                                                    }
-                                                    SetCommandExitStatus(error);
-                                                }];
+        [cluster writeAttributeOnOffTransitionTimeWithValue:value
+                                                     params:params
+                                          completionHandler:^(NSError * _Nullable error) {
+                                              if (error != nil) {
+                                                  LogNSError("LevelControl OnOffTransitionTime write Error", error);
+                                              }
+                                              SetCommandExitStatus(error);
+                                          }];
         return CHIP_NO_ERROR;
     }
 
@@ -5022,32 +5394,32 @@ class WriteBarrierControlBarrierCommandCloseEvents : public WriteAttribute {
     uint16_t mValue;
 };
 
-class SubscribeAttributeBarrierControlBarrierCommandCloseEvents : public SubscribeAttribute {
+class SubscribeAttributeLevelControlOnOffTransitionTime : public SubscribeAttribute {
 public:
-    SubscribeAttributeBarrierControlBarrierCommandCloseEvents()
-        : SubscribeAttribute("barrier-command-close-events")
+    SubscribeAttributeLevelControlOnOffTransitionTime()
+        : SubscribeAttribute("on-off-transition-time")
     {
     }
 
-    ~SubscribeAttributeBarrierControlBarrierCommandCloseEvents() {}
+    ~SubscribeAttributeLevelControlOnOffTransitionTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00000010) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBarrierCommandCloseEventsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOnOffTransitionTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BarrierControl.BarrierCommandCloseEvents response %@", [value description]);
+                NSLog(@"LevelControl.OnOffTransitionTime response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -5058,27 +5430,27 @@ class SubscribeAttributeBarrierControlBarrierCommandCloseEvents : public Subscri
 };
 
 /*
- * Attribute BarrierOpenPeriod
+ * Attribute OnLevel
  */
-class ReadBarrierControlBarrierOpenPeriod : public ReadAttribute {
+class ReadLevelControlOnLevel : public ReadAttribute {
 public:
-    ReadBarrierControlBarrierOpenPeriod()
-        : ReadAttribute("barrier-open-period")
+    ReadLevelControlOnLevel()
+        : ReadAttribute("on-level")
     {
     }
 
-    ~ReadBarrierControlBarrierOpenPeriod() {}
+    ~ReadLevelControlOnLevel() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00000011) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBarrierOpenPeriodWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BarrierControl.BarrierOpenPeriod response %@", [value description]);
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeOnLevelWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LevelControl.OnLevel response %@", [value description]);
             if (error != nil) {
-                LogNSError("BarrierControl BarrierOpenPeriod read Error", error);
+                LogNSError("LevelControl OnLevel read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -5086,70 +5458,70 @@ class ReadBarrierControlBarrierOpenPeriod : public ReadAttribute {
     }
 };
 
-class WriteBarrierControlBarrierOpenPeriod : public WriteAttribute {
+class WriteLevelControlOnLevel : public WriteAttribute {
 public:
-    WriteBarrierControlBarrierOpenPeriod()
-        : WriteAttribute("barrier-open-period")
+    WriteLevelControlOnLevel()
+        : WriteAttribute("on-level")
     {
-        AddArgument("attr-name", "barrier-open-period");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        AddArgument("attr-name", "on-level");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteBarrierControlBarrierOpenPeriod() {}
+    ~WriteLevelControlOnLevel() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) WriteAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) WriteAttribute (0x00000011) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
 
-        [cluster writeAttributeBarrierOpenPeriodWithValue:value
-                                                   params:params
-                                        completionHandler:^(NSError * _Nullable error) {
-                                            if (error != nil) {
-                                                LogNSError("BarrierControl BarrierOpenPeriod write Error", error);
-                                            }
-                                            SetCommandExitStatus(error);
-                                        }];
+        [cluster writeAttributeOnLevelWithValue:value
+                                         params:params
+                              completionHandler:^(NSError * _Nullable error) {
+                                  if (error != nil) {
+                                      LogNSError("LevelControl OnLevel write Error", error);
+                                  }
+                                  SetCommandExitStatus(error);
+                              }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    uint16_t mValue;
+    uint8_t mValue;
 };
 
-class SubscribeAttributeBarrierControlBarrierOpenPeriod : public SubscribeAttribute {
+class SubscribeAttributeLevelControlOnLevel : public SubscribeAttribute {
 public:
-    SubscribeAttributeBarrierControlBarrierOpenPeriod()
-        : SubscribeAttribute("barrier-open-period")
+    SubscribeAttributeLevelControlOnLevel()
+        : SubscribeAttribute("on-level")
     {
     }
 
-    ~SubscribeAttributeBarrierControlBarrierOpenPeriod() {}
+    ~SubscribeAttributeLevelControlOnLevel() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00000011) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBarrierOpenPeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOnLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BarrierControl.BarrierOpenPeriod response %@", [value description]);
+                NSLog(@"LevelControl.OnLevel response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -5160,27 +5532,27 @@ class SubscribeAttributeBarrierControlBarrierOpenPeriod : public SubscribeAttrib
 };
 
 /*
- * Attribute BarrierClosePeriod
+ * Attribute OnTransitionTime
  */
-class ReadBarrierControlBarrierClosePeriod : public ReadAttribute {
+class ReadLevelControlOnTransitionTime : public ReadAttribute {
 public:
-    ReadBarrierControlBarrierClosePeriod()
-        : ReadAttribute("barrier-close-period")
+    ReadLevelControlOnTransitionTime()
+        : ReadAttribute("on-transition-time")
     {
     }
 
-    ~ReadBarrierControlBarrierClosePeriod() {}
+    ~ReadLevelControlOnTransitionTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00000012) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBarrierClosePeriodWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BarrierControl.BarrierClosePeriod response %@", [value description]);
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeOnTransitionTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LevelControl.OnTransitionTime response %@", [value description]);
             if (error != nil) {
-                LogNSError("BarrierControl BarrierClosePeriod read Error", error);
+                LogNSError("LevelControl OnTransitionTime read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -5188,37 +5560,37 @@ class ReadBarrierControlBarrierClosePeriod : public ReadAttribute {
     }
 };
 
-class WriteBarrierControlBarrierClosePeriod : public WriteAttribute {
+class WriteLevelControlOnTransitionTime : public WriteAttribute {
 public:
-    WriteBarrierControlBarrierClosePeriod()
-        : WriteAttribute("barrier-close-period")
+    WriteLevelControlOnTransitionTime()
+        : WriteAttribute("on-transition-time")
     {
-        AddArgument("attr-name", "barrier-close-period");
+        AddArgument("attr-name", "on-transition-time");
         AddArgument("attr-value", 0, UINT16_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteBarrierControlBarrierClosePeriod() {}
+    ~WriteLevelControlOnTransitionTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) WriteAttribute (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) WriteAttribute (0x00000012) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedShort:mValue];
 
-        [cluster writeAttributeBarrierClosePeriodWithValue:value
-                                                    params:params
-                                         completionHandler:^(NSError * _Nullable error) {
-                                             if (error != nil) {
-                                                 LogNSError("BarrierControl BarrierClosePeriod write Error", error);
-                                             }
-                                             SetCommandExitStatus(error);
-                                         }];
+        [cluster writeAttributeOnTransitionTimeWithValue:value
+                                                  params:params
+                                       completionHandler:^(NSError * _Nullable error) {
+                                           if (error != nil) {
+                                               LogNSError("LevelControl OnTransitionTime write Error", error);
+                                           }
+                                           SetCommandExitStatus(error);
+                                       }];
         return CHIP_NO_ERROR;
     }
 
@@ -5226,32 +5598,32 @@ class WriteBarrierControlBarrierClosePeriod : public WriteAttribute {
     uint16_t mValue;
 };
 
-class SubscribeAttributeBarrierControlBarrierClosePeriod : public SubscribeAttribute {
+class SubscribeAttributeLevelControlOnTransitionTime : public SubscribeAttribute {
 public:
-    SubscribeAttributeBarrierControlBarrierClosePeriod()
-        : SubscribeAttribute("barrier-close-period")
+    SubscribeAttributeLevelControlOnTransitionTime()
+        : SubscribeAttribute("on-transition-time")
     {
     }
 
-    ~SubscribeAttributeBarrierControlBarrierClosePeriod() {}
+    ~SubscribeAttributeLevelControlOnTransitionTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00000012) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBarrierClosePeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOnTransitionTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BarrierControl.BarrierClosePeriod response %@", [value description]);
+                NSLog(@"LevelControl.OnTransitionTime response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -5262,27 +5634,27 @@ class SubscribeAttributeBarrierControlBarrierClosePeriod : public SubscribeAttri
 };
 
 /*
- * Attribute BarrierPosition
+ * Attribute OffTransitionTime
  */
-class ReadBarrierControlBarrierPosition : public ReadAttribute {
+class ReadLevelControlOffTransitionTime : public ReadAttribute {
 public:
-    ReadBarrierControlBarrierPosition()
-        : ReadAttribute("barrier-position")
+    ReadLevelControlOffTransitionTime()
+        : ReadAttribute("off-transition-time")
     {
     }
 
-    ~ReadBarrierControlBarrierPosition() {}
+    ~ReadLevelControlOffTransitionTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x0000000A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00000013) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBarrierPositionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BarrierControl.BarrierPosition response %@", [value description]);
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeOffTransitionTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LevelControl.OffTransitionTime response %@", [value description]);
             if (error != nil) {
-                LogNSError("BarrierControl BarrierPosition read Error", error);
+                LogNSError("LevelControl OffTransitionTime read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -5290,96 +5662,70 @@ class ReadBarrierControlBarrierPosition : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBarrierControlBarrierPosition : public SubscribeAttribute {
+class WriteLevelControlOffTransitionTime : public WriteAttribute {
 public:
-    SubscribeAttributeBarrierControlBarrierPosition()
-        : SubscribeAttribute("barrier-position")
+    WriteLevelControlOffTransitionTime()
+        : WriteAttribute("off-transition-time")
     {
+        AddArgument("attr-name", "off-transition-time");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeBarrierControlBarrierPosition() {}
+    ~WriteLevelControlOffTransitionTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x0000000A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) WriteAttribute (0x00000013) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBarrierPositionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BarrierControl.BarrierPosition response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedShort:mValue];
 
+        [cluster writeAttributeOffTransitionTimeWithValue:value
+                                                   params:params
+                                        completionHandler:^(NSError * _Nullable error) {
+                                            if (error != nil) {
+                                                LogNSError("LevelControl OffTransitionTime write Error", error);
+                                            }
+                                            SetCommandExitStatus(error);
+                                        }];
         return CHIP_NO_ERROR;
     }
-};
-
-/*
- * Attribute GeneratedCommandList
- */
-class ReadBarrierControlGeneratedCommandList : public ReadAttribute {
-public:
-    ReadBarrierControlGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
-    {
-    }
-
-    ~ReadBarrierControlGeneratedCommandList() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BarrierControl.GeneratedCommandList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("BarrierControl GeneratedCommandList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
+private:
+    uint16_t mValue;
 };
 
-class SubscribeAttributeBarrierControlGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeLevelControlOffTransitionTime : public SubscribeAttribute {
 public:
-    SubscribeAttributeBarrierControlGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeLevelControlOffTransitionTime()
+        : SubscribeAttribute("off-transition-time")
     {
     }
 
-    ~SubscribeAttributeBarrierControlGeneratedCommandList() {}
+    ~SubscribeAttributeLevelControlOffTransitionTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00000013) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOffTransitionTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BarrierControl.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.OffTransitionTime response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -5390,27 +5736,27 @@ class SubscribeAttributeBarrierControlGeneratedCommandList : public SubscribeAtt
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute DefaultMoveRate
  */
-class ReadBarrierControlAcceptedCommandList : public ReadAttribute {
+class ReadLevelControlDefaultMoveRate : public ReadAttribute {
 public:
-    ReadBarrierControlAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadLevelControlDefaultMoveRate()
+        : ReadAttribute("default-move-rate")
     {
     }
 
-    ~ReadBarrierControlAcceptedCommandList() {}
+    ~ReadLevelControlDefaultMoveRate() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00000014) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BarrierControl.AcceptedCommandList response %@", [value description]);
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeDefaultMoveRateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LevelControl.DefaultMoveRate response %@", [value description]);
             if (error != nil) {
-                LogNSError("BarrierControl AcceptedCommandList read Error", error);
+                LogNSError("LevelControl DefaultMoveRate read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -5418,32 +5764,70 @@ class ReadBarrierControlAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBarrierControlAcceptedCommandList : public SubscribeAttribute {
+class WriteLevelControlDefaultMoveRate : public WriteAttribute {
 public:
-    SubscribeAttributeBarrierControlAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    WriteLevelControlDefaultMoveRate()
+        : WriteAttribute("default-move-rate")
     {
+        AddArgument("attr-name", "default-move-rate");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeBarrierControlAcceptedCommandList() {}
+    ~WriteLevelControlDefaultMoveRate() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) WriteAttribute (0x00000014) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeDefaultMoveRateWithValue:value
+                                                 params:params
+                                      completionHandler:^(NSError * _Nullable error) {
+                                          if (error != nil) {
+                                              LogNSError("LevelControl DefaultMoveRate write Error", error);
+                                          }
+                                          SetCommandExitStatus(error);
+                                      }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeLevelControlDefaultMoveRate : public SubscribeAttribute {
+public:
+    SubscribeAttributeLevelControlDefaultMoveRate()
+        : SubscribeAttribute("default-move-rate")
+    {
+    }
+
+    ~SubscribeAttributeLevelControlDefaultMoveRate() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00000014) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDefaultMoveRateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BarrierControl.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.DefaultMoveRate response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -5454,27 +5838,27 @@ class SubscribeAttributeBarrierControlAcceptedCommandList : public SubscribeAttr
 };
 
 /*
- * Attribute AttributeList
+ * Attribute StartUpCurrentLevel
  */
-class ReadBarrierControlAttributeList : public ReadAttribute {
+class ReadLevelControlStartUpCurrentLevel : public ReadAttribute {
 public:
-    ReadBarrierControlAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadLevelControlStartUpCurrentLevel()
+        : ReadAttribute("start-up-current-level")
     {
     }
 
-    ~ReadBarrierControlAttributeList() {}
+    ~ReadLevelControlStartUpCurrentLevel() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00004000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BarrierControl.AttributeList response %@", [value description]);
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeStartUpCurrentLevelWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LevelControl.StartUpCurrentLevel response %@", [value description]);
             if (error != nil) {
-                LogNSError("BarrierControl AttributeList read Error", error);
+                LogNSError("LevelControl StartUpCurrentLevel read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -5482,32 +5866,70 @@ class ReadBarrierControlAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBarrierControlAttributeList : public SubscribeAttribute {
+class WriteLevelControlStartUpCurrentLevel : public WriteAttribute {
 public:
-    SubscribeAttributeBarrierControlAttributeList()
-        : SubscribeAttribute("attribute-list")
+    WriteLevelControlStartUpCurrentLevel()
+        : WriteAttribute("start-up-current-level")
     {
+        AddArgument("attr-name", "start-up-current-level");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeBarrierControlAttributeList() {}
+    ~WriteLevelControlStartUpCurrentLevel() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) WriteAttribute (0x00004000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeStartUpCurrentLevelWithValue:value
+                                                     params:params
+                                          completionHandler:^(NSError * _Nullable error) {
+                                              if (error != nil) {
+                                                  LogNSError("LevelControl StartUpCurrentLevel write Error", error);
+                                              }
+                                              SetCommandExitStatus(error);
+                                          }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeLevelControlStartUpCurrentLevel : public SubscribeAttribute {
+public:
+    SubscribeAttributeLevelControlStartUpCurrentLevel()
+        : SubscribeAttribute("start-up-current-level")
+    {
+    }
+
+    ~SubscribeAttributeLevelControlStartUpCurrentLevel() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00004000) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeStartUpCurrentLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BarrierControl.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.StartUpCurrentLevel response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -5518,27 +5940,27 @@ class SubscribeAttributeBarrierControlAttributeList : public SubscribeAttribute
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute GeneratedCommandList
  */
-class ReadBarrierControlFeatureMap : public ReadAttribute {
+class ReadLevelControlGeneratedCommandList : public ReadAttribute {
 public:
-    ReadBarrierControlFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadLevelControlGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadBarrierControlFeatureMap() {}
+    ~ReadLevelControlGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BarrierControl.FeatureMap response %@", [value description]);
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LevelControl.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("BarrierControl FeatureMap read Error", error);
+                LogNSError("LevelControl GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -5546,32 +5968,32 @@ class ReadBarrierControlFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBarrierControlFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeLevelControlGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBarrierControlFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeLevelControlGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeBarrierControlFeatureMap() {}
+    ~SubscribeAttributeLevelControlGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BarrierControl.FeatureMap response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -5582,27 +6004,27 @@ class SubscribeAttributeBarrierControlFeatureMap : public SubscribeAttribute {
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute AcceptedCommandList
  */
-class ReadBarrierControlClusterRevision : public ReadAttribute {
+class ReadLevelControlAcceptedCommandList : public ReadAttribute {
 public:
-    ReadBarrierControlClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadLevelControlAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadBarrierControlClusterRevision() {}
+    ~ReadLevelControlAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BarrierControl.ClusterRevision response %@", [value description]);
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LevelControl.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("BarrierControl ClusterRevision read Error", error);
+                LogNSError("LevelControl AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -5610,32 +6032,32 @@ class ReadBarrierControlClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBarrierControlClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeLevelControlAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBarrierControlClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeLevelControlAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeBarrierControlClusterRevision() {}
+    ~SubscribeAttributeLevelControlAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BarrierControl.ClusterRevision response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -5645,109 +6067,28 @@ class SubscribeAttributeBarrierControlClusterRevision : public SubscribeAttribut
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster Basic                                                       | 0x0028 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * MfgSpecificPing                                                   |   0x00 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * DataModelRevision                                                 | 0x0000 |
-| * VendorName                                                        | 0x0001 |
-| * VendorID                                                          | 0x0002 |
-| * ProductName                                                       | 0x0003 |
-| * ProductID                                                         | 0x0004 |
-| * NodeLabel                                                         | 0x0005 |
-| * Location                                                          | 0x0006 |
-| * HardwareVersion                                                   | 0x0007 |
-| * HardwareVersionString                                             | 0x0008 |
-| * SoftwareVersion                                                   | 0x0009 |
-| * SoftwareVersionString                                             | 0x000A |
-| * ManufacturingDate                                                 | 0x000B |
-| * PartNumber                                                        | 0x000C |
-| * ProductURL                                                        | 0x000D |
-| * ProductLabel                                                      | 0x000E |
-| * SerialNumber                                                      | 0x000F |
-| * LocalConfigDisabled                                               | 0x0010 |
-| * Reachable                                                         | 0x0011 |
-| * UniqueID                                                          | 0x0012 |
-| * CapabilityMinima                                                  | 0x0013 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-| * StartUp                                                           | 0x0000 |
-| * ShutDown                                                          | 0x0001 |
-| * Leave                                                             | 0x0002 |
-| * ReachableChanged                                                  | 0x0003 |
-\*----------------------------------------------------------------------------*/
-
-/*
- * Command MfgSpecificPing
- */
-class BasicMfgSpecificPing : public ClusterCommand {
-public:
-    BasicMfgSpecificPing()
-        : ClusterCommand("mfg-specific-ping")
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) command (0x00000000) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPBasicClusterMfgSpecificPingParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster mfgSpecificPingWithParams:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 responsesNeeded--;
-                                 if (error != nil) {
-                                     mError = error;
-                                     LogNSError("Error", error);
-                                 }
-                                 if (responsesNeeded == 0) {
-                                     SetCommandExitStatus(mError);
-                                 }
-                             }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-};
-
 /*
- * Attribute DataModelRevision
+ * Attribute AttributeList
  */
-class ReadBasicDataModelRevision : public ReadAttribute {
+class ReadLevelControlAttributeList : public ReadAttribute {
 public:
-    ReadBasicDataModelRevision()
-        : ReadAttribute("data-model-revision")
+    ReadLevelControlAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadBasicDataModelRevision() {}
+    ~ReadLevelControlAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeDataModelRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Basic.DataModelRevision response %@", [value description]);
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LevelControl.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("Basic DataModelRevision read Error", error);
+                LogNSError("LevelControl AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -5755,32 +6096,32 @@ class ReadBasicDataModelRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBasicDataModelRevision : public SubscribeAttribute {
+class SubscribeAttributeLevelControlAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBasicDataModelRevision()
-        : SubscribeAttribute("data-model-revision")
+    SubscribeAttributeLevelControlAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeBasicDataModelRevision() {}
+    ~SubscribeAttributeLevelControlAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDataModelRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Basic.DataModelRevision response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -5791,27 +6132,27 @@ class SubscribeAttributeBasicDataModelRevision : public SubscribeAttribute {
 };
 
 /*
- * Attribute VendorName
+ * Attribute FeatureMap
  */
-class ReadBasicVendorName : public ReadAttribute {
+class ReadLevelControlFeatureMap : public ReadAttribute {
 public:
-    ReadBasicVendorName()
-        : ReadAttribute("vendor-name")
+    ReadLevelControlFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadBasicVendorName() {}
+    ~ReadLevelControlFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeVendorNameWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Basic.VendorName response %@", [value description]);
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LevelControl.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("Basic VendorName read Error", error);
+                LogNSError("LevelControl FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -5819,32 +6160,32 @@ class ReadBasicVendorName : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBasicVendorName : public SubscribeAttribute {
+class SubscribeAttributeLevelControlFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeBasicVendorName()
-        : SubscribeAttribute("vendor-name")
+    SubscribeAttributeLevelControlFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeBasicVendorName() {}
+    ~SubscribeAttributeLevelControlFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeVendorNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Basic.VendorName response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LevelControl.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -5855,27 +6196,27 @@ class SubscribeAttributeBasicVendorName : public SubscribeAttribute {
 };
 
 /*
- * Attribute VendorID
+ * Attribute ClusterRevision
  */
-class ReadBasicVendorID : public ReadAttribute {
+class ReadLevelControlClusterRevision : public ReadAttribute {
 public:
-    ReadBasicVendorID()
-        : ReadAttribute("vendor-id")
+    ReadLevelControlClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadBasicVendorID() {}
+    ~ReadLevelControlClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeVendorIDWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Basic.VendorID response %@", [value description]);
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LevelControl.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("Basic VendorID read Error", error);
+                LogNSError("LevelControl ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -5883,32 +6224,32 @@ class ReadBasicVendorID : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBasicVendorID : public SubscribeAttribute {
+class SubscribeAttributeLevelControlClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeBasicVendorID()
-        : SubscribeAttribute("vendor-id")
+    SubscribeAttributeLevelControlClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeBasicVendorID() {}
+    ~SubscribeAttributeLevelControlClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeVendorIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Basic.VendorID response %@", [value description]);
+                NSLog(@"LevelControl.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -5918,28 +6259,54 @@ class SubscribeAttributeBasicVendorID : public SubscribeAttribute {
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster BinaryInputBasic                                            | 0x000F |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * ActiveText                                                        | 0x0004 |
+| * Description                                                       | 0x001C |
+| * InactiveText                                                      | 0x002E |
+| * OutOfService                                                      | 0x0051 |
+| * Polarity                                                          | 0x0054 |
+| * PresentValue                                                      | 0x0055 |
+| * Reliability                                                       | 0x0067 |
+| * StatusFlags                                                       | 0x006F |
+| * ApplicationType                                                   | 0x0100 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute ProductName
+ * Attribute ActiveText
  */
-class ReadBasicProductName : public ReadAttribute {
+class ReadBinaryInputBasicActiveText : public ReadAttribute {
 public:
-    ReadBasicProductName()
-        : ReadAttribute("product-name")
+    ReadBinaryInputBasicActiveText()
+        : ReadAttribute("active-text")
     {
     }
 
-    ~ReadBasicProductName() {}
+    ~ReadBinaryInputBasicActiveText() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeProductNameWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Basic.ProductName response %@", [value description]);
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeActiveTextWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BinaryInputBasic.ActiveText response %@", [value description]);
             if (error != nil) {
-                LogNSError("Basic ProductName read Error", error);
+                LogNSError("BinaryInputBasic ActiveText read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -5947,32 +6314,76 @@ class ReadBasicProductName : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBasicProductName : public SubscribeAttribute {
+class WriteBinaryInputBasicActiveText : public WriteAttribute {
 public:
-    SubscribeAttributeBasicProductName()
-        : SubscribeAttribute("product-name")
+    WriteBinaryInputBasicActiveText()
+        : WriteAttribute("active-text")
     {
+        AddArgument("attr-name", "active-text");
+        AddArgument("attr-value", &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeBasicProductName() {}
+    ~WriteBinaryInputBasicActiveText() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) WriteAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSString * _Nonnull value = [[NSString alloc] initWithBytes:mValue.data()
+                                                             length:mValue.size()
+                                                           encoding:NSUTF8StringEncoding];
+
+        [cluster writeAttributeActiveTextWithValue:value
+                                            params:params
+                                 completionHandler:^(NSError * _Nullable error) {
+                                     if (error != nil) {
+                                         LogNSError("BinaryInputBasic ActiveText write Error", error);
+                                     }
+                                     SetCommandExitStatus(error);
+                                 }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::ByteSpan mValue;
+};
+
+class SubscribeAttributeBinaryInputBasicActiveText : public SubscribeAttribute {
+public:
+    SubscribeAttributeBinaryInputBasicActiveText()
+        : SubscribeAttribute("active-text")
+    {
+    }
+
+    ~SubscribeAttributeBinaryInputBasicActiveText() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeProductNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeActiveTextWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Basic.ProductName response %@", [value description]);
+                NSLog(@"BinaryInputBasic.ActiveText response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -5983,27 +6394,29 @@ class SubscribeAttributeBasicProductName : public SubscribeAttribute {
 };
 
 /*
- * Attribute ProductID
+ * Attribute Description
  */
-class ReadBasicProductID : public ReadAttribute {
+class ReadBinaryInputBasicDescription : public ReadAttribute {
 public:
-    ReadBasicProductID()
-        : ReadAttribute("product-id")
-    {
+    ReadBinaryInputBasicDescription()
+        : ReadAttribute("description")
+    {
     }
 
-    ~ReadBasicProductID() {}
+    ~ReadBinaryInputBasicDescription() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x0000001C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeProductIDWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Basic.ProductID response %@", [value description]);
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeDescriptionWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BinaryInputBasic.Description response %@", [value description]);
             if (error != nil) {
-                LogNSError("Basic ProductID read Error", error);
+                LogNSError("BinaryInputBasic Description read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -6011,32 +6424,76 @@ class ReadBasicProductID : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBasicProductID : public SubscribeAttribute {
+class WriteBinaryInputBasicDescription : public WriteAttribute {
 public:
-    SubscribeAttributeBasicProductID()
-        : SubscribeAttribute("product-id")
+    WriteBinaryInputBasicDescription()
+        : WriteAttribute("description")
     {
+        AddArgument("attr-name", "description");
+        AddArgument("attr-value", &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeBasicProductID() {}
+    ~WriteBinaryInputBasicDescription() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) WriteAttribute (0x0000001C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSString * _Nonnull value = [[NSString alloc] initWithBytes:mValue.data()
+                                                             length:mValue.size()
+                                                           encoding:NSUTF8StringEncoding];
+
+        [cluster writeAttributeDescriptionWithValue:value
+                                             params:params
+                                  completionHandler:^(NSError * _Nullable error) {
+                                      if (error != nil) {
+                                          LogNSError("BinaryInputBasic Description write Error", error);
+                                      }
+                                      SetCommandExitStatus(error);
+                                  }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::ByteSpan mValue;
+};
+
+class SubscribeAttributeBinaryInputBasicDescription : public SubscribeAttribute {
+public:
+    SubscribeAttributeBinaryInputBasicDescription()
+        : SubscribeAttribute("description")
+    {
+    }
+
+    ~SubscribeAttributeBinaryInputBasicDescription() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x0000001C) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeProductIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDescriptionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Basic.ProductID response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BinaryInputBasic.Description response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -6047,27 +6504,29 @@ class SubscribeAttributeBasicProductID : public SubscribeAttribute {
 };
 
 /*
- * Attribute NodeLabel
+ * Attribute InactiveText
  */
-class ReadBasicNodeLabel : public ReadAttribute {
+class ReadBinaryInputBasicInactiveText : public ReadAttribute {
 public:
-    ReadBasicNodeLabel()
-        : ReadAttribute("node-label")
+    ReadBinaryInputBasicInactiveText()
+        : ReadAttribute("inactive-text")
     {
     }
 
-    ~ReadBasicNodeLabel() {}
+    ~ReadBinaryInputBasicInactiveText() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x0000002E) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNodeLabelWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Basic.NodeLabel response %@", [value description]);
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeInactiveTextWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BinaryInputBasic.InactiveText response %@", [value description]);
             if (error != nil) {
-                LogNSError("Basic NodeLabel read Error", error);
+                LogNSError("BinaryInputBasic InactiveText read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -6075,23 +6534,25 @@ class ReadBasicNodeLabel : public ReadAttribute {
     }
 };
 
-class WriteBasicNodeLabel : public WriteAttribute {
+class WriteBinaryInputBasicInactiveText : public WriteAttribute {
 public:
-    WriteBasicNodeLabel()
-        : WriteAttribute("node-label")
+    WriteBinaryInputBasicInactiveText()
+        : WriteAttribute("inactive-text")
     {
-        AddArgument("attr-name", "node-label");
+        AddArgument("attr-name", "inactive-text");
         AddArgument("attr-value", &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteBasicNodeLabel() {}
+    ~WriteBinaryInputBasicInactiveText() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) WriteAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) WriteAttribute (0x0000002E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
@@ -6100,14 +6561,14 @@ class WriteBasicNodeLabel : public WriteAttribute {
                                                              length:mValue.size()
                                                            encoding:NSUTF8StringEncoding];
 
-        [cluster writeAttributeNodeLabelWithValue:value
-                                           params:params
-                                completionHandler:^(NSError * _Nullable error) {
-                                    if (error != nil) {
-                                        LogNSError("Basic NodeLabel write Error", error);
-                                    }
-                                    SetCommandExitStatus(error);
-                                }];
+        [cluster writeAttributeInactiveTextWithValue:value
+                                              params:params
+                                   completionHandler:^(NSError * _Nullable error) {
+                                       if (error != nil) {
+                                           LogNSError("BinaryInputBasic InactiveText write Error", error);
+                                       }
+                                       SetCommandExitStatus(error);
+                                   }];
         return CHIP_NO_ERROR;
     }
 
@@ -6115,32 +6576,34 @@ class WriteBasicNodeLabel : public WriteAttribute {
     chip::ByteSpan mValue;
 };
 
-class SubscribeAttributeBasicNodeLabel : public SubscribeAttribute {
+class SubscribeAttributeBinaryInputBasicInactiveText : public SubscribeAttribute {
 public:
-    SubscribeAttributeBasicNodeLabel()
-        : SubscribeAttribute("node-label")
+    SubscribeAttributeBinaryInputBasicInactiveText()
+        : SubscribeAttribute("inactive-text")
     {
     }
 
-    ~SubscribeAttributeBasicNodeLabel() {}
+    ~SubscribeAttributeBinaryInputBasicInactiveText() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x0000002E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNodeLabelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInactiveTextWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Basic.NodeLabel response %@", [value description]);
+                NSLog(@"BinaryInputBasic.InactiveText response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -6151,27 +6614,29 @@ class SubscribeAttributeBasicNodeLabel : public SubscribeAttribute {
 };
 
 /*
- * Attribute Location
+ * Attribute OutOfService
  */
-class ReadBasicLocation : public ReadAttribute {
+class ReadBinaryInputBasicOutOfService : public ReadAttribute {
 public:
-    ReadBasicLocation()
-        : ReadAttribute("location")
+    ReadBinaryInputBasicOutOfService()
+        : ReadAttribute("out-of-service")
     {
     }
 
-    ~ReadBasicLocation() {}
+    ~ReadBinaryInputBasicOutOfService() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x00000051) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeLocationWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Basic.Location response %@", [value description]);
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeOutOfServiceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BinaryInputBasic.OutOfService response %@", [value description]);
             if (error != nil) {
-                LogNSError("Basic Location read Error", error);
+                LogNSError("BinaryInputBasic OutOfService read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -6179,72 +6644,74 @@ class ReadBasicLocation : public ReadAttribute {
     }
 };
 
-class WriteBasicLocation : public WriteAttribute {
+class WriteBinaryInputBasicOutOfService : public WriteAttribute {
 public:
-    WriteBasicLocation()
-        : WriteAttribute("location")
+    WriteBinaryInputBasicOutOfService()
+        : WriteAttribute("out-of-service")
     {
-        AddArgument("attr-name", "location");
-        AddArgument("attr-value", &mValue);
+        AddArgument("attr-name", "out-of-service");
+        AddArgument("attr-value", 0, 1, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteBasicLocation() {}
+    ~WriteBinaryInputBasicOutOfService() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) WriteAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) WriteAttribute (0x00000051) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSString * _Nonnull value = [[NSString alloc] initWithBytes:mValue.data()
-                                                             length:mValue.size()
-                                                           encoding:NSUTF8StringEncoding];
+        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
 
-        [cluster writeAttributeLocationWithValue:value
-                                          params:params
-                               completionHandler:^(NSError * _Nullable error) {
-                                   if (error != nil) {
-                                       LogNSError("Basic Location write Error", error);
-                                   }
-                                   SetCommandExitStatus(error);
-                               }];
+        [cluster writeAttributeOutOfServiceWithValue:value
+                                              params:params
+                                   completionHandler:^(NSError * _Nullable error) {
+                                       if (error != nil) {
+                                           LogNSError("BinaryInputBasic OutOfService write Error", error);
+                                       }
+                                       SetCommandExitStatus(error);
+                                   }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::ByteSpan mValue;
+    bool mValue;
 };
 
-class SubscribeAttributeBasicLocation : public SubscribeAttribute {
+class SubscribeAttributeBinaryInputBasicOutOfService : public SubscribeAttribute {
 public:
-    SubscribeAttributeBasicLocation()
-        : SubscribeAttribute("location")
+    SubscribeAttributeBinaryInputBasicOutOfService()
+        : SubscribeAttribute("out-of-service")
     {
     }
 
-    ~SubscribeAttributeBasicLocation() {}
+    ~SubscribeAttributeBinaryInputBasicOutOfService() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x00000051) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLocationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOutOfServiceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Basic.Location response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BinaryInputBasic.OutOfService response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -6255,27 +6722,29 @@ class SubscribeAttributeBasicLocation : public SubscribeAttribute {
 };
 
 /*
- * Attribute HardwareVersion
+ * Attribute Polarity
  */
-class ReadBasicHardwareVersion : public ReadAttribute {
+class ReadBinaryInputBasicPolarity : public ReadAttribute {
 public:
-    ReadBasicHardwareVersion()
-        : ReadAttribute("hardware-version")
+    ReadBinaryInputBasicPolarity()
+        : ReadAttribute("polarity")
     {
     }
 
-    ~ReadBasicHardwareVersion() {}
+    ~ReadBinaryInputBasicPolarity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x00000054) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeHardwareVersionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Basic.HardwareVersion response %@", [value description]);
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributePolarityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BinaryInputBasic.Polarity response %@", [value description]);
             if (error != nil) {
-                LogNSError("Basic HardwareVersion read Error", error);
+                LogNSError("BinaryInputBasic Polarity read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -6283,32 +6752,34 @@ class ReadBasicHardwareVersion : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBasicHardwareVersion : public SubscribeAttribute {
+class SubscribeAttributeBinaryInputBasicPolarity : public SubscribeAttribute {
 public:
-    SubscribeAttributeBasicHardwareVersion()
-        : SubscribeAttribute("hardware-version")
+    SubscribeAttributeBinaryInputBasicPolarity()
+        : SubscribeAttribute("polarity")
     {
     }
 
-    ~SubscribeAttributeBasicHardwareVersion() {}
+    ~SubscribeAttributeBinaryInputBasicPolarity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x00000054) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeHardwareVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePolarityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Basic.HardwareVersion response %@", [value description]);
+                NSLog(@"BinaryInputBasic.Polarity response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -6319,27 +6790,29 @@ class SubscribeAttributeBasicHardwareVersion : public SubscribeAttribute {
 };
 
 /*
- * Attribute HardwareVersionString
+ * Attribute PresentValue
  */
-class ReadBasicHardwareVersionString : public ReadAttribute {
+class ReadBinaryInputBasicPresentValue : public ReadAttribute {
 public:
-    ReadBasicHardwareVersionString()
-        : ReadAttribute("hardware-version-string")
+    ReadBinaryInputBasicPresentValue()
+        : ReadAttribute("present-value")
     {
     }
 
-    ~ReadBasicHardwareVersionString() {}
+    ~ReadBinaryInputBasicPresentValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x00000055) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeHardwareVersionStringWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Basic.HardwareVersionString response %@", [value description]);
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributePresentValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BinaryInputBasic.PresentValue response %@", [value description]);
             if (error != nil) {
-                LogNSError("Basic HardwareVersionString read Error", error);
+                LogNSError("BinaryInputBasic PresentValue read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -6347,32 +6820,74 @@ class ReadBasicHardwareVersionString : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBasicHardwareVersionString : public SubscribeAttribute {
+class WriteBinaryInputBasicPresentValue : public WriteAttribute {
 public:
-    SubscribeAttributeBasicHardwareVersionString()
-        : SubscribeAttribute("hardware-version-string")
+    WriteBinaryInputBasicPresentValue()
+        : WriteAttribute("present-value")
     {
+        AddArgument("attr-name", "present-value");
+        AddArgument("attr-value", 0, 1, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeBasicHardwareVersionString() {}
+    ~WriteBinaryInputBasicPresentValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) WriteAttribute (0x00000055) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
+
+        [cluster writeAttributePresentValueWithValue:value
+                                              params:params
+                                   completionHandler:^(NSError * _Nullable error) {
+                                       if (error != nil) {
+                                           LogNSError("BinaryInputBasic PresentValue write Error", error);
+                                       }
+                                       SetCommandExitStatus(error);
+                                   }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    bool mValue;
+};
+
+class SubscribeAttributeBinaryInputBasicPresentValue : public SubscribeAttribute {
+public:
+    SubscribeAttributeBinaryInputBasicPresentValue()
+        : SubscribeAttribute("present-value")
+    {
+    }
+
+    ~SubscribeAttributeBinaryInputBasicPresentValue() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x00000055) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeHardwareVersionStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePresentValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Basic.HardwareVersionString response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BinaryInputBasic.PresentValue response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -6383,27 +6898,29 @@ class SubscribeAttributeBasicHardwareVersionString : public SubscribeAttribute {
 };
 
 /*
- * Attribute SoftwareVersion
+ * Attribute Reliability
  */
-class ReadBasicSoftwareVersion : public ReadAttribute {
+class ReadBinaryInputBasicReliability : public ReadAttribute {
 public:
-    ReadBasicSoftwareVersion()
-        : ReadAttribute("software-version")
+    ReadBinaryInputBasicReliability()
+        : ReadAttribute("reliability")
     {
     }
 
-    ~ReadBasicSoftwareVersion() {}
+    ~ReadBinaryInputBasicReliability() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x00000067) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeSoftwareVersionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Basic.SoftwareVersion response %@", [value description]);
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeReliabilityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BinaryInputBasic.Reliability response %@", [value description]);
             if (error != nil) {
-                LogNSError("Basic SoftwareVersion read Error", error);
+                LogNSError("BinaryInputBasic Reliability read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -6411,32 +6928,74 @@ class ReadBasicSoftwareVersion : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBasicSoftwareVersion : public SubscribeAttribute {
+class WriteBinaryInputBasicReliability : public WriteAttribute {
 public:
-    SubscribeAttributeBasicSoftwareVersion()
-        : SubscribeAttribute("software-version")
+    WriteBinaryInputBasicReliability()
+        : WriteAttribute("reliability")
+    {
+        AddArgument("attr-name", "reliability");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteBinaryInputBasicReliability() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) WriteAttribute (0x00000067) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeReliabilityWithValue:value
+                                             params:params
+                                  completionHandler:^(NSError * _Nullable error) {
+                                      if (error != nil) {
+                                          LogNSError("BinaryInputBasic Reliability write Error", error);
+                                      }
+                                      SetCommandExitStatus(error);
+                                  }];
+        return CHIP_NO_ERROR;
     }
 
-    ~SubscribeAttributeBasicSoftwareVersion() {}
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeBinaryInputBasicReliability : public SubscribeAttribute {
+public:
+    SubscribeAttributeBinaryInputBasicReliability()
+        : SubscribeAttribute("reliability")
+    {
+    }
+
+    ~SubscribeAttributeBinaryInputBasicReliability() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x00000067) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSoftwareVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeReliabilityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Basic.SoftwareVersion response %@", [value description]);
+                NSLog(@"BinaryInputBasic.Reliability response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -6447,27 +7006,29 @@ class SubscribeAttributeBasicSoftwareVersion : public SubscribeAttribute {
 };
 
 /*
- * Attribute SoftwareVersionString
+ * Attribute StatusFlags
  */
-class ReadBasicSoftwareVersionString : public ReadAttribute {
+class ReadBinaryInputBasicStatusFlags : public ReadAttribute {
 public:
-    ReadBasicSoftwareVersionString()
-        : ReadAttribute("software-version-string")
+    ReadBinaryInputBasicStatusFlags()
+        : ReadAttribute("status-flags")
     {
     }
 
-    ~ReadBasicSoftwareVersionString() {}
+    ~ReadBinaryInputBasicStatusFlags() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x0000000A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x0000006F) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeSoftwareVersionStringWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Basic.SoftwareVersionString response %@", [value description]);
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeStatusFlagsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BinaryInputBasic.StatusFlags response %@", [value description]);
             if (error != nil) {
-                LogNSError("Basic SoftwareVersionString read Error", error);
+                LogNSError("BinaryInputBasic StatusFlags read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -6475,32 +7036,34 @@ class ReadBasicSoftwareVersionString : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBasicSoftwareVersionString : public SubscribeAttribute {
+class SubscribeAttributeBinaryInputBasicStatusFlags : public SubscribeAttribute {
 public:
-    SubscribeAttributeBasicSoftwareVersionString()
-        : SubscribeAttribute("software-version-string")
+    SubscribeAttributeBinaryInputBasicStatusFlags()
+        : SubscribeAttribute("status-flags")
     {
     }
 
-    ~SubscribeAttributeBasicSoftwareVersionString() {}
+    ~SubscribeAttributeBinaryInputBasicStatusFlags() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x0000000A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x0000006F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSoftwareVersionStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeStatusFlagsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Basic.SoftwareVersionString response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BinaryInputBasic.StatusFlags response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -6511,27 +7074,29 @@ class SubscribeAttributeBasicSoftwareVersionString : public SubscribeAttribute {
 };
 
 /*
- * Attribute ManufacturingDate
+ * Attribute ApplicationType
  */
-class ReadBasicManufacturingDate : public ReadAttribute {
+class ReadBinaryInputBasicApplicationType : public ReadAttribute {
 public:
-    ReadBasicManufacturingDate()
-        : ReadAttribute("manufacturing-date")
+    ReadBinaryInputBasicApplicationType()
+        : ReadAttribute("application-type")
     {
     }
 
-    ~ReadBasicManufacturingDate() {}
+    ~ReadBinaryInputBasicApplicationType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x0000000B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x00000100) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeManufacturingDateWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Basic.ManufacturingDate response %@", [value description]);
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeApplicationTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BinaryInputBasic.ApplicationType response %@", [value description]);
             if (error != nil) {
-                LogNSError("Basic ManufacturingDate read Error", error);
+                LogNSError("BinaryInputBasic ApplicationType read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -6539,32 +7104,34 @@ class ReadBasicManufacturingDate : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBasicManufacturingDate : public SubscribeAttribute {
+class SubscribeAttributeBinaryInputBasicApplicationType : public SubscribeAttribute {
 public:
-    SubscribeAttributeBasicManufacturingDate()
-        : SubscribeAttribute("manufacturing-date")
+    SubscribeAttributeBinaryInputBasicApplicationType()
+        : SubscribeAttribute("application-type")
     {
     }
 
-    ~SubscribeAttributeBasicManufacturingDate() {}
+    ~SubscribeAttributeBinaryInputBasicApplicationType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x0000000B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x00000100) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeManufacturingDateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeApplicationTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Basic.ManufacturingDate response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BinaryInputBasic.ApplicationType response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -6575,27 +7142,29 @@ class SubscribeAttributeBasicManufacturingDate : public SubscribeAttribute {
 };
 
 /*
- * Attribute PartNumber
+ * Attribute GeneratedCommandList
  */
-class ReadBasicPartNumber : public ReadAttribute {
+class ReadBinaryInputBasicGeneratedCommandList : public ReadAttribute {
 public:
-    ReadBasicPartNumber()
-        : ReadAttribute("part-number")
+    ReadBinaryInputBasicGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadBasicPartNumber() {}
+    ~ReadBinaryInputBasicGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x0000000C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributePartNumberWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Basic.PartNumber response %@", [value description]);
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BinaryInputBasic.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("Basic PartNumber read Error", error);
+                LogNSError("BinaryInputBasic GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -6603,32 +7172,34 @@ class ReadBasicPartNumber : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBasicPartNumber : public SubscribeAttribute {
+class SubscribeAttributeBinaryInputBasicGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBasicPartNumber()
-        : SubscribeAttribute("part-number")
+    SubscribeAttributeBinaryInputBasicGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeBasicPartNumber() {}
+    ~SubscribeAttributeBinaryInputBasicGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x0000000C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePartNumberWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Basic.PartNumber response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BinaryInputBasic.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -6639,27 +7210,29 @@ class SubscribeAttributeBasicPartNumber : public SubscribeAttribute {
 };
 
 /*
- * Attribute ProductURL
+ * Attribute AcceptedCommandList
  */
-class ReadBasicProductURL : public ReadAttribute {
+class ReadBinaryInputBasicAcceptedCommandList : public ReadAttribute {
 public:
-    ReadBasicProductURL()
-        : ReadAttribute("product-url")
+    ReadBinaryInputBasicAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadBasicProductURL() {}
+    ~ReadBinaryInputBasicAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x0000000D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeProductURLWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Basic.ProductURL response %@", [value description]);
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BinaryInputBasic.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("Basic ProductURL read Error", error);
+                LogNSError("BinaryInputBasic AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -6667,32 +7240,34 @@ class ReadBasicProductURL : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBasicProductURL : public SubscribeAttribute {
+class SubscribeAttributeBinaryInputBasicAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBasicProductURL()
-        : SubscribeAttribute("product-url")
+    SubscribeAttributeBinaryInputBasicAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeBasicProductURL() {}
+    ~SubscribeAttributeBinaryInputBasicAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x0000000D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeProductURLWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Basic.ProductURL response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BinaryInputBasic.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -6703,27 +7278,29 @@ class SubscribeAttributeBasicProductURL : public SubscribeAttribute {
 };
 
 /*
- * Attribute ProductLabel
+ * Attribute AttributeList
  */
-class ReadBasicProductLabel : public ReadAttribute {
+class ReadBinaryInputBasicAttributeList : public ReadAttribute {
 public:
-    ReadBasicProductLabel()
-        : ReadAttribute("product-label")
+    ReadBinaryInputBasicAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadBasicProductLabel() {}
+    ~ReadBinaryInputBasicAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x0000000E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeProductLabelWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Basic.ProductLabel response %@", [value description]);
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BinaryInputBasic.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("Basic ProductLabel read Error", error);
+                LogNSError("BinaryInputBasic AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -6731,32 +7308,34 @@ class ReadBasicProductLabel : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBasicProductLabel : public SubscribeAttribute {
+class SubscribeAttributeBinaryInputBasicAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBasicProductLabel()
-        : SubscribeAttribute("product-label")
+    SubscribeAttributeBinaryInputBasicAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeBasicProductLabel() {}
+    ~SubscribeAttributeBinaryInputBasicAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x0000000E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeProductLabelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Basic.ProductLabel response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BinaryInputBasic.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -6767,27 +7346,29 @@ class SubscribeAttributeBasicProductLabel : public SubscribeAttribute {
 };
 
 /*
- * Attribute SerialNumber
+ * Attribute FeatureMap
  */
-class ReadBasicSerialNumber : public ReadAttribute {
+class ReadBinaryInputBasicFeatureMap : public ReadAttribute {
 public:
-    ReadBasicSerialNumber()
-        : ReadAttribute("serial-number")
+    ReadBinaryInputBasicFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadBasicSerialNumber() {}
+    ~ReadBinaryInputBasicFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x0000000F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeSerialNumberWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Basic.SerialNumber response %@", [value description]);
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BinaryInputBasic.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("Basic SerialNumber read Error", error);
+                LogNSError("BinaryInputBasic FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -6795,32 +7376,34 @@ class ReadBasicSerialNumber : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBasicSerialNumber : public SubscribeAttribute {
+class SubscribeAttributeBinaryInputBasicFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeBasicSerialNumber()
-        : SubscribeAttribute("serial-number")
+    SubscribeAttributeBinaryInputBasicFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeBasicSerialNumber() {}
+    ~SubscribeAttributeBinaryInputBasicFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x0000000F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSerialNumberWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Basic.SerialNumber response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BinaryInputBasic.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -6831,27 +7414,29 @@ class SubscribeAttributeBasicSerialNumber : public SubscribeAttribute {
 };
 
 /*
- * Attribute LocalConfigDisabled
+ * Attribute ClusterRevision
  */
-class ReadBasicLocalConfigDisabled : public ReadAttribute {
+class ReadBinaryInputBasicClusterRevision : public ReadAttribute {
 public:
-    ReadBasicLocalConfigDisabled()
-        : ReadAttribute("local-config-disabled")
+    ReadBinaryInputBasicClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadBasicLocalConfigDisabled() {}
+    ~ReadBinaryInputBasicClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeLocalConfigDisabledWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Basic.LocalConfigDisabled response %@", [value description]);
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BinaryInputBasic.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("Basic LocalConfigDisabled read Error", error);
+                LogNSError("BinaryInputBasic ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -6859,70 +7444,117 @@ class ReadBasicLocalConfigDisabled : public ReadAttribute {
     }
 };
 
-class WriteBasicLocalConfigDisabled : public WriteAttribute {
+class SubscribeAttributeBinaryInputBasicClusterRevision : public SubscribeAttribute {
 public:
-    WriteBasicLocalConfigDisabled()
-        : WriteAttribute("local-config-disabled")
+    SubscribeAttributeBinaryInputBasicClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
-        AddArgument("attr-name", "local-config-disabled");
-        AddArgument("attr-value", 0, 1, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteBasicLocalConfigDisabled() {}
+    ~SubscribeAttributeBinaryInputBasicClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) WriteAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
+        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BinaryInputBasic.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
-        [cluster writeAttributeLocalConfigDisabledWithValue:value
-                                                     params:params
-                                          completionHandler:^(NSError * _Nullable error) {
-                                              if (error != nil) {
-                                                  LogNSError("Basic LocalConfigDisabled write Error", error);
-                                              }
-                                              SetCommandExitStatus(error);
-                                          }];
         return CHIP_NO_ERROR;
     }
+};
 
-private:
-    bool mValue;
+/*----------------------------------------------------------------------------*\
+| Cluster Descriptor                                                  | 0x001D |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * DeviceList                                                        | 0x0000 |
+| * ServerList                                                        | 0x0001 |
+| * ClientList                                                        | 0x0002 |
+| * PartsList                                                         | 0x0003 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
+/*
+ * Attribute DeviceList
+ */
+class ReadDescriptorDeviceList : public ReadAttribute {
+public:
+    ReadDescriptorDeviceList()
+        : ReadAttribute("device-list")
+    {
+    }
+
+    ~ReadDescriptorDeviceList() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeDeviceListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Descriptor.DeviceList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("Descriptor DeviceList read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
 };
 
-class SubscribeAttributeBasicLocalConfigDisabled : public SubscribeAttribute {
+class SubscribeAttributeDescriptorDeviceList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBasicLocalConfigDisabled()
-        : SubscribeAttribute("local-config-disabled")
+    SubscribeAttributeDescriptorDeviceList()
+        : SubscribeAttribute("device-list")
     {
     }
 
-    ~SubscribeAttributeBasicLocalConfigDisabled() {}
+    ~SubscribeAttributeDescriptorDeviceList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLocalConfigDisabledWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDeviceListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Basic.LocalConfigDisabled response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Descriptor.DeviceList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -6933,27 +7565,27 @@ class SubscribeAttributeBasicLocalConfigDisabled : public SubscribeAttribute {
 };
 
 /*
- * Attribute Reachable
+ * Attribute ServerList
  */
-class ReadBasicReachable : public ReadAttribute {
+class ReadDescriptorServerList : public ReadAttribute {
 public:
-    ReadBasicReachable()
-        : ReadAttribute("reachable")
+    ReadDescriptorServerList()
+        : ReadAttribute("server-list")
     {
     }
 
-    ~ReadBasicReachable() {}
+    ~ReadDescriptorServerList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeReachableWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Basic.Reachable response %@", [value description]);
+        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeServerListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Descriptor.ServerList response %@", [value description]);
             if (error != nil) {
-                LogNSError("Basic Reachable read Error", error);
+                LogNSError("Descriptor ServerList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -6961,32 +7593,32 @@ class ReadBasicReachable : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBasicReachable : public SubscribeAttribute {
+class SubscribeAttributeDescriptorServerList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBasicReachable()
-        : SubscribeAttribute("reachable")
+    SubscribeAttributeDescriptorServerList()
+        : SubscribeAttribute("server-list")
     {
     }
 
-    ~SubscribeAttributeBasicReachable() {}
+    ~SubscribeAttributeDescriptorServerList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeReachableWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeServerListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Basic.Reachable response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Descriptor.ServerList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -6997,27 +7629,27 @@ class SubscribeAttributeBasicReachable : public SubscribeAttribute {
 };
 
 /*
- * Attribute UniqueID
+ * Attribute ClientList
  */
-class ReadBasicUniqueID : public ReadAttribute {
+class ReadDescriptorClientList : public ReadAttribute {
 public:
-    ReadBasicUniqueID()
-        : ReadAttribute("unique-id")
+    ReadDescriptorClientList()
+        : ReadAttribute("client-list")
     {
     }
 
-    ~ReadBasicUniqueID() {}
+    ~ReadDescriptorClientList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeUniqueIDWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Basic.UniqueID response %@", [value description]);
+        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClientListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Descriptor.ClientList response %@", [value description]);
             if (error != nil) {
-                LogNSError("Basic UniqueID read Error", error);
+                LogNSError("Descriptor ClientList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -7025,32 +7657,32 @@ class ReadBasicUniqueID : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBasicUniqueID : public SubscribeAttribute {
+class SubscribeAttributeDescriptorClientList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBasicUniqueID()
-        : SubscribeAttribute("unique-id")
+    SubscribeAttributeDescriptorClientList()
+        : SubscribeAttribute("client-list")
     {
     }
 
-    ~SubscribeAttributeBasicUniqueID() {}
+    ~SubscribeAttributeDescriptorClientList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeUniqueIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClientListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Basic.UniqueID response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Descriptor.ClientList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -7061,28 +7693,27 @@ class SubscribeAttributeBasicUniqueID : public SubscribeAttribute {
 };
 
 /*
- * Attribute CapabilityMinima
+ * Attribute PartsList
  */
-class ReadBasicCapabilityMinima : public ReadAttribute {
+class ReadDescriptorPartsList : public ReadAttribute {
 public:
-    ReadBasicCapabilityMinima()
-        : ReadAttribute("capability-minima")
+    ReadDescriptorPartsList()
+        : ReadAttribute("parts-list")
     {
     }
 
-    ~ReadBasicCapabilityMinima() {}
+    ~ReadDescriptorPartsList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCapabilityMinimaWithCompletionHandler:^(
-            CHIPBasicClusterCapabilityMinimaStruct * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Basic.CapabilityMinima response %@", [value description]);
+        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributePartsListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Descriptor.PartsList response %@", [value description]);
             if (error != nil) {
-                LogNSError("Basic CapabilityMinima read Error", error);
+                LogNSError("Descriptor PartsList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -7090,32 +7721,32 @@ class ReadBasicCapabilityMinima : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBasicCapabilityMinima : public SubscribeAttribute {
+class SubscribeAttributeDescriptorPartsList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBasicCapabilityMinima()
-        : SubscribeAttribute("capability-minima")
+    SubscribeAttributeDescriptorPartsList()
+        : SubscribeAttribute("parts-list")
     {
     }
 
-    ~SubscribeAttributeBasicCapabilityMinima() {}
+    ~SubscribeAttributeDescriptorPartsList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCapabilityMinimaWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePartsListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(CHIPBasicClusterCapabilityMinimaStruct * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Basic.CapabilityMinima response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Descriptor.PartsList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -7128,25 +7759,25 @@ class SubscribeAttributeBasicCapabilityMinima : public SubscribeAttribute {
 /*
  * Attribute GeneratedCommandList
  */
-class ReadBasicGeneratedCommandList : public ReadAttribute {
+class ReadDescriptorGeneratedCommandList : public ReadAttribute {
 public:
-    ReadBasicGeneratedCommandList()
+    ReadDescriptorGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadBasicGeneratedCommandList() {}
+    ~ReadDescriptorGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Basic.GeneratedCommandList response %@", [value description]);
+            NSLog(@"Descriptor.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("Basic GeneratedCommandList read Error", error);
+                LogNSError("Descriptor GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -7154,20 +7785,20 @@ class ReadBasicGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBasicGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeDescriptorGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBasicGeneratedCommandList()
+    SubscribeAttributeDescriptorGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeBasicGeneratedCommandList() {}
+    ~SubscribeAttributeDescriptorGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -7179,7 +7810,7 @@ class SubscribeAttributeBasicGeneratedCommandList : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Basic.GeneratedCommandList response %@", [value description]);
+                NSLog(@"Descriptor.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -7192,25 +7823,25 @@ class SubscribeAttributeBasicGeneratedCommandList : public SubscribeAttribute {
 /*
  * Attribute AcceptedCommandList
  */
-class ReadBasicAcceptedCommandList : public ReadAttribute {
+class ReadDescriptorAcceptedCommandList : public ReadAttribute {
 public:
-    ReadBasicAcceptedCommandList()
+    ReadDescriptorAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadBasicAcceptedCommandList() {}
+    ~ReadDescriptorAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Basic.AcceptedCommandList response %@", [value description]);
+            NSLog(@"Descriptor.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("Basic AcceptedCommandList read Error", error);
+                LogNSError("Descriptor AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -7218,20 +7849,20 @@ class ReadBasicAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBasicAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeDescriptorAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBasicAcceptedCommandList()
+    SubscribeAttributeDescriptorAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeBasicAcceptedCommandList() {}
+    ~SubscribeAttributeDescriptorAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -7243,7 +7874,7 @@ class SubscribeAttributeBasicAcceptedCommandList : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Basic.AcceptedCommandList response %@", [value description]);
+                NSLog(@"Descriptor.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -7256,25 +7887,25 @@ class SubscribeAttributeBasicAcceptedCommandList : public SubscribeAttribute {
 /*
  * Attribute AttributeList
  */
-class ReadBasicAttributeList : public ReadAttribute {
+class ReadDescriptorAttributeList : public ReadAttribute {
 public:
-    ReadBasicAttributeList()
+    ReadDescriptorAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadBasicAttributeList() {}
+    ~ReadDescriptorAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Basic.AttributeList response %@", [value description]);
+            NSLog(@"Descriptor.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("Basic AttributeList read Error", error);
+                LogNSError("Descriptor AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -7282,20 +7913,20 @@ class ReadBasicAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBasicAttributeList : public SubscribeAttribute {
+class SubscribeAttributeDescriptorAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBasicAttributeList()
+    SubscribeAttributeDescriptorAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeBasicAttributeList() {}
+    ~SubscribeAttributeDescriptorAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -7307,7 +7938,7 @@ class SubscribeAttributeBasicAttributeList : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Basic.AttributeList response %@", [value description]);
+                NSLog(@"Descriptor.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -7320,25 +7951,25 @@ class SubscribeAttributeBasicAttributeList : public SubscribeAttribute {
 /*
  * Attribute FeatureMap
  */
-class ReadBasicFeatureMap : public ReadAttribute {
+class ReadDescriptorFeatureMap : public ReadAttribute {
 public:
-    ReadBasicFeatureMap()
+    ReadDescriptorFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadBasicFeatureMap() {}
+    ~ReadDescriptorFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Basic.FeatureMap response %@", [value description]);
+            NSLog(@"Descriptor.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("Basic FeatureMap read Error", error);
+                LogNSError("Descriptor FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -7346,20 +7977,20 @@ class ReadBasicFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBasicFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeDescriptorFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeBasicFeatureMap()
+    SubscribeAttributeDescriptorFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeBasicFeatureMap() {}
+    ~SubscribeAttributeDescriptorFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -7371,7 +8002,7 @@ class SubscribeAttributeBasicFeatureMap : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Basic.FeatureMap response %@", [value description]);
+                NSLog(@"Descriptor.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -7384,25 +8015,25 @@ class SubscribeAttributeBasicFeatureMap : public SubscribeAttribute {
 /*
  * Attribute ClusterRevision
  */
-class ReadBasicClusterRevision : public ReadAttribute {
+class ReadDescriptorClusterRevision : public ReadAttribute {
 public:
-    ReadBasicClusterRevision()
+    ReadDescriptorClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadBasicClusterRevision() {}
+    ~ReadDescriptorClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Basic.ClusterRevision response %@", [value description]);
+            NSLog(@"Descriptor.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("Basic ClusterRevision read Error", error);
+                LogNSError("Descriptor ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -7410,20 +8041,20 @@ class ReadBasicClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBasicClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeDescriptorClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeBasicClusterRevision()
+    SubscribeAttributeDescriptorClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeBasicClusterRevision() {}
+    ~SubscribeAttributeDescriptorClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -7435,7 +8066,7 @@ class SubscribeAttributeBasicClusterRevision : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Basic.ClusterRevision response %@", [value description]);
+                NSLog(@"Descriptor.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -7446,20 +8077,12 @@ class SubscribeAttributeBasicClusterRevision : public SubscribeAttribute {
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster BinaryInputBasic                                            | 0x000F |
+| Cluster Binding                                                     | 0x001E |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * ActiveText                                                        | 0x0004 |
-| * Description                                                       | 0x001C |
-| * InactiveText                                                      | 0x002E |
-| * OutOfService                                                      | 0x0051 |
-| * Polarity                                                          | 0x0054 |
-| * PresentValue                                                      | 0x0055 |
-| * Reliability                                                       | 0x0067 |
-| * StatusFlags                                                       | 0x006F |
-| * ApplicationType                                                   | 0x0100 |
+| * Binding                                                           | 0x0000 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -7470,106 +8093,133 @@ class SubscribeAttributeBasicClusterRevision : public SubscribeAttribute {
 \*----------------------------------------------------------------------------*/
 
 /*
- * Attribute ActiveText
+ * Attribute Binding
  */
-class ReadBinaryInputBasicActiveText : public ReadAttribute {
+class ReadBindingBinding : public ReadAttribute {
 public:
-    ReadBinaryInputBasicActiveText()
-        : ReadAttribute("active-text")
+    ReadBindingBinding()
+        : ReadAttribute("binding")
     {
     }
 
-    ~ReadBinaryInputBasicActiveText() {}
+    ~ReadBindingBinding() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeActiveTextWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BinaryInputBasic.ActiveText response %@", [value description]);
-            if (error != nil) {
-                LogNSError("BinaryInputBasic ActiveText read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPReadParams * params = [[CHIPReadParams alloc] init];
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster readAttributeBindingWithParams:params
+                              completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                                  NSLog(@"Binding.Binding response %@", [value description]);
+                                  if (error != nil) {
+                                      LogNSError("Binding Binding read Error", error);
+                                  }
+                                  SetCommandExitStatus(error);
+                              }];
         return CHIP_NO_ERROR;
     }
 };
 
-class WriteBinaryInputBasicActiveText : public WriteAttribute {
+class WriteBindingBinding : public WriteAttribute {
 public:
-    WriteBinaryInputBasicActiveText()
-        : WriteAttribute("active-text")
+    WriteBindingBinding()
+        : WriteAttribute("binding")
+        , mComplex(&mValue)
     {
-        AddArgument("attr-name", "active-text");
-        AddArgument("attr-value", &mValue);
+        AddArgument("attr-name", "binding");
+        AddArgument("attr-value", &mComplex);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteBinaryInputBasicActiveText() {}
+    ~WriteBindingBinding() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) WriteAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) WriteAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSString * _Nonnull value = [[NSString alloc] initWithBytes:mValue.data()
-                                                             length:mValue.size()
-                                                           encoding:NSUTF8StringEncoding];
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mValue) {
+                CHIPBindingClusterTargetStruct * newElement_0;
+                newElement_0 = [CHIPBindingClusterTargetStruct new];
+                if (entry_0.node.HasValue()) {
+                    newElement_0.node = [NSNumber numberWithUnsignedLongLong:entry_0.node.Value()];
+                } else {
+                    newElement_0.node = nil;
+                }
+                if (entry_0.group.HasValue()) {
+                    newElement_0.group = [NSNumber numberWithUnsignedShort:entry_0.group.Value()];
+                } else {
+                    newElement_0.group = nil;
+                }
+                if (entry_0.endpoint.HasValue()) {
+                    newElement_0.endpoint = [NSNumber numberWithUnsignedShort:entry_0.endpoint.Value()];
+                } else {
+                    newElement_0.endpoint = nil;
+                }
+                if (entry_0.cluster.HasValue()) {
+                    newElement_0.cluster = [NSNumber numberWithUnsignedInt:entry_0.cluster.Value()];
+                } else {
+                    newElement_0.cluster = nil;
+                }
+                newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
+                [array_0 addObject:newElement_0];
+            }
+            value = array_0;
+        }
 
-        [cluster writeAttributeActiveTextWithValue:value
-                                            params:params
-                                 completionHandler:^(NSError * _Nullable error) {
-                                     if (error != nil) {
-                                         LogNSError("BinaryInputBasic ActiveText write Error", error);
-                                     }
-                                     SetCommandExitStatus(error);
-                                 }];
+        [cluster writeAttributeBindingWithValue:value
+                                         params:params
+                              completionHandler:^(NSError * _Nullable error) {
+                                  if (error != nil) {
+                                      LogNSError("Binding Binding write Error", error);
+                                  }
+                                  SetCommandExitStatus(error);
+                              }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::ByteSpan mValue;
+    chip::app::DataModel::List<const chip::app::Clusters::Binding::Structs::TargetStruct::Type> mValue;
+    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::Binding::Structs::TargetStruct::Type>> mComplex;
 };
 
-class SubscribeAttributeBinaryInputBasicActiveText : public SubscribeAttribute {
+class SubscribeAttributeBindingBinding : public SubscribeAttribute {
 public:
-    SubscribeAttributeBinaryInputBasicActiveText()
-        : SubscribeAttribute("active-text")
+    SubscribeAttributeBindingBinding()
+        : SubscribeAttribute("binding")
     {
     }
 
-    ~SubscribeAttributeBinaryInputBasicActiveText() {}
+    ~SubscribeAttributeBindingBinding() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeActiveTextWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBindingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BinaryInputBasic.ActiveText response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Binding.Binding response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -7580,29 +8230,27 @@ class SubscribeAttributeBinaryInputBasicActiveText : public SubscribeAttribute {
 };
 
 /*
- * Attribute Description
+ * Attribute GeneratedCommandList
  */
-class ReadBinaryInputBasicDescription : public ReadAttribute {
+class ReadBindingGeneratedCommandList : public ReadAttribute {
 public:
-    ReadBinaryInputBasicDescription()
-        : ReadAttribute("description")
+    ReadBindingGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadBinaryInputBasicDescription() {}
+    ~ReadBindingGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x0000001C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeDescriptionWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BinaryInputBasic.Description response %@", [value description]);
+        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Binding.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("BinaryInputBasic Description read Error", error);
+                LogNSError("Binding GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -7610,76 +8258,32 @@ class ReadBinaryInputBasicDescription : public ReadAttribute {
     }
 };
 
-class WriteBinaryInputBasicDescription : public WriteAttribute {
-public:
-    WriteBinaryInputBasicDescription()
-        : WriteAttribute("description")
-    {
-        AddArgument("attr-name", "description");
-        AddArgument("attr-value", &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteBinaryInputBasicDescription() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) WriteAttribute (0x0000001C) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSString * _Nonnull value = [[NSString alloc] initWithBytes:mValue.data()
-                                                             length:mValue.size()
-                                                           encoding:NSUTF8StringEncoding];
-
-        [cluster writeAttributeDescriptionWithValue:value
-                                             params:params
-                                  completionHandler:^(NSError * _Nullable error) {
-                                      if (error != nil) {
-                                          LogNSError("BinaryInputBasic Description write Error", error);
-                                      }
-                                      SetCommandExitStatus(error);
-                                  }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::ByteSpan mValue;
-};
-
-class SubscribeAttributeBinaryInputBasicDescription : public SubscribeAttribute {
+class SubscribeAttributeBindingGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBinaryInputBasicDescription()
-        : SubscribeAttribute("description")
+    SubscribeAttributeBindingGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeBinaryInputBasicDescription() {}
+    ~SubscribeAttributeBindingGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x0000001C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDescriptionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BinaryInputBasic.Description response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Binding.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -7690,29 +8294,27 @@ class SubscribeAttributeBinaryInputBasicDescription : public SubscribeAttribute
 };
 
 /*
- * Attribute InactiveText
+ * Attribute AcceptedCommandList
  */
-class ReadBinaryInputBasicInactiveText : public ReadAttribute {
+class ReadBindingAcceptedCommandList : public ReadAttribute {
 public:
-    ReadBinaryInputBasicInactiveText()
-        : ReadAttribute("inactive-text")
+    ReadBindingAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadBinaryInputBasicInactiveText() {}
+    ~ReadBindingAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x0000002E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeInactiveTextWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BinaryInputBasic.InactiveText response %@", [value description]);
+        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Binding.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("BinaryInputBasic InactiveText read Error", error);
+                LogNSError("Binding AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -7720,76 +8322,32 @@ class ReadBinaryInputBasicInactiveText : public ReadAttribute {
     }
 };
 
-class WriteBinaryInputBasicInactiveText : public WriteAttribute {
-public:
-    WriteBinaryInputBasicInactiveText()
-        : WriteAttribute("inactive-text")
-    {
-        AddArgument("attr-name", "inactive-text");
-        AddArgument("attr-value", &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteBinaryInputBasicInactiveText() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) WriteAttribute (0x0000002E) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSString * _Nonnull value = [[NSString alloc] initWithBytes:mValue.data()
-                                                             length:mValue.size()
-                                                           encoding:NSUTF8StringEncoding];
-
-        [cluster writeAttributeInactiveTextWithValue:value
-                                              params:params
-                                   completionHandler:^(NSError * _Nullable error) {
-                                       if (error != nil) {
-                                           LogNSError("BinaryInputBasic InactiveText write Error", error);
-                                       }
-                                       SetCommandExitStatus(error);
-                                   }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::ByteSpan mValue;
-};
-
-class SubscribeAttributeBinaryInputBasicInactiveText : public SubscribeAttribute {
+class SubscribeAttributeBindingAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBinaryInputBasicInactiveText()
-        : SubscribeAttribute("inactive-text")
+    SubscribeAttributeBindingAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeBinaryInputBasicInactiveText() {}
+    ~SubscribeAttributeBindingAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x0000002E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInactiveTextWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BinaryInputBasic.InactiveText response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Binding.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -7800,29 +8358,27 @@ class SubscribeAttributeBinaryInputBasicInactiveText : public SubscribeAttribute
 };
 
 /*
- * Attribute OutOfService
+ * Attribute AttributeList
  */
-class ReadBinaryInputBasicOutOfService : public ReadAttribute {
+class ReadBindingAttributeList : public ReadAttribute {
 public:
-    ReadBinaryInputBasicOutOfService()
-        : ReadAttribute("out-of-service")
+    ReadBindingAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadBinaryInputBasicOutOfService() {}
+    ~ReadBindingAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x00000051) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeOutOfServiceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BinaryInputBasic.OutOfService response %@", [value description]);
+        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Binding.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("BinaryInputBasic OutOfService read Error", error);
+                LogNSError("Binding AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -7830,74 +8386,32 @@ class ReadBinaryInputBasicOutOfService : public ReadAttribute {
     }
 };
 
-class WriteBinaryInputBasicOutOfService : public WriteAttribute {
-public:
-    WriteBinaryInputBasicOutOfService()
-        : WriteAttribute("out-of-service")
-    {
-        AddArgument("attr-name", "out-of-service");
-        AddArgument("attr-value", 0, 1, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteBinaryInputBasicOutOfService() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) WriteAttribute (0x00000051) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
-
-        [cluster writeAttributeOutOfServiceWithValue:value
-                                              params:params
-                                   completionHandler:^(NSError * _Nullable error) {
-                                       if (error != nil) {
-                                           LogNSError("BinaryInputBasic OutOfService write Error", error);
-                                       }
-                                       SetCommandExitStatus(error);
-                                   }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    bool mValue;
-};
-
-class SubscribeAttributeBinaryInputBasicOutOfService : public SubscribeAttribute {
+class SubscribeAttributeBindingAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBinaryInputBasicOutOfService()
-        : SubscribeAttribute("out-of-service")
+    SubscribeAttributeBindingAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeBinaryInputBasicOutOfService() {}
+    ~SubscribeAttributeBindingAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x00000051) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOutOfServiceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BinaryInputBasic.OutOfService response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Binding.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -7908,29 +8422,27 @@ class SubscribeAttributeBinaryInputBasicOutOfService : public SubscribeAttribute
 };
 
 /*
- * Attribute Polarity
+ * Attribute FeatureMap
  */
-class ReadBinaryInputBasicPolarity : public ReadAttribute {
+class ReadBindingFeatureMap : public ReadAttribute {
 public:
-    ReadBinaryInputBasicPolarity()
-        : ReadAttribute("polarity")
+    ReadBindingFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadBinaryInputBasicPolarity() {}
+    ~ReadBindingFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x00000054) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributePolarityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BinaryInputBasic.Polarity response %@", [value description]);
+        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Binding.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("BinaryInputBasic Polarity read Error", error);
+                LogNSError("Binding FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -7938,34 +8450,32 @@ class ReadBinaryInputBasicPolarity : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBinaryInputBasicPolarity : public SubscribeAttribute {
+class SubscribeAttributeBindingFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeBinaryInputBasicPolarity()
-        : SubscribeAttribute("polarity")
+    SubscribeAttributeBindingFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeBinaryInputBasicPolarity() {}
+    ~SubscribeAttributeBindingFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x00000054) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePolarityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BinaryInputBasic.Polarity response %@", [value description]);
+                NSLog(@"Binding.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -7976,29 +8486,27 @@ class SubscribeAttributeBinaryInputBasicPolarity : public SubscribeAttribute {
 };
 
 /*
- * Attribute PresentValue
+ * Attribute ClusterRevision
  */
-class ReadBinaryInputBasicPresentValue : public ReadAttribute {
+class ReadBindingClusterRevision : public ReadAttribute {
 public:
-    ReadBinaryInputBasicPresentValue()
-        : ReadAttribute("present-value")
+    ReadBindingClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadBinaryInputBasicPresentValue() {}
+    ~ReadBindingClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x00000055) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributePresentValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BinaryInputBasic.PresentValue response %@", [value description]);
+        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Binding.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("BinaryInputBasic PresentValue read Error", error);
+                LogNSError("Binding ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -8006,74 +8514,215 @@ class ReadBinaryInputBasicPresentValue : public ReadAttribute {
     }
 };
 
-class WriteBinaryInputBasicPresentValue : public WriteAttribute {
+class SubscribeAttributeBindingClusterRevision : public SubscribeAttribute {
 public:
-    WriteBinaryInputBasicPresentValue()
-        : WriteAttribute("present-value")
+    SubscribeAttributeBindingClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
-        AddArgument("attr-name", "present-value");
-        AddArgument("attr-value", 0, 1, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteBinaryInputBasicPresentValue() {}
+    ~SubscribeAttributeBindingClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) WriteAttribute (0x00000055) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Binding.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+/*----------------------------------------------------------------------------*\
+| Cluster AccessControl                                               | 0x001F |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * Acl                                                               | 0x0000 |
+| * Extension                                                         | 0x0001 |
+| * SubjectsPerAccessControlEntry                                     | 0x0002 |
+| * TargetsPerAccessControlEntry                                      | 0x0003 |
+| * AccessControlEntriesPerFabric                                     | 0x0004 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * AccessControlEntryChanged                                         | 0x0000 |
+| * AccessControlExtensionChanged                                     | 0x0001 |
+\*----------------------------------------------------------------------------*/
+
+/*
+ * Attribute Acl
+ */
+class ReadAccessControlAcl : public ReadAttribute {
+public:
+    ReadAccessControlAcl()
+        : ReadAttribute("acl")
+    {
+    }
+
+    ~ReadAccessControlAcl() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPReadParams * params = [[CHIPReadParams alloc] init];
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster readAttributeAclWithParams:params
+                          completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                              NSLog(@"AccessControl.Acl response %@", [value description]);
+                              if (error != nil) {
+                                  LogNSError("AccessControl Acl read Error", error);
+                              }
+                              SetCommandExitStatus(error);
+                          }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteAccessControlAcl : public WriteAttribute {
+public:
+    WriteAccessControlAcl()
+        : WriteAttribute("acl")
+        , mComplex(&mValue)
+    {
+        AddArgument("attr-name", "acl");
+        AddArgument("attr-value", &mComplex);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteAccessControlAcl() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) WriteAttribute (0x00000000) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mValue) {
+                CHIPAccessControlClusterAccessControlEntry * newElement_0;
+                newElement_0 = [CHIPAccessControlClusterAccessControlEntry new];
+                newElement_0.privilege = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.privilege)];
+                newElement_0.authMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.authMode)];
+                if (entry_0.subjects.IsNull()) {
+                    newElement_0.subjects = nil;
+                } else {
+                    { // Scope for our temporary variables
+                        auto * array_3 = [NSMutableArray new];
+                        for (auto & entry_3 : entry_0.subjects.Value()) {
+                            NSNumber * newElement_3;
+                            newElement_3 = [NSNumber numberWithUnsignedLongLong:entry_3];
+                            [array_3 addObject:newElement_3];
+                        }
+                        newElement_0.subjects = array_3;
+                    }
+                }
+                if (entry_0.targets.IsNull()) {
+                    newElement_0.targets = nil;
+                } else {
+                    { // Scope for our temporary variables
+                        auto * array_3 = [NSMutableArray new];
+                        for (auto & entry_3 : entry_0.targets.Value()) {
+                            CHIPAccessControlClusterTarget * newElement_3;
+                            newElement_3 = [CHIPAccessControlClusterTarget new];
+                            if (entry_3.cluster.IsNull()) {
+                                newElement_3.cluster = nil;
+                            } else {
+                                newElement_3.cluster = [NSNumber numberWithUnsignedInt:entry_3.cluster.Value()];
+                            }
+                            if (entry_3.endpoint.IsNull()) {
+                                newElement_3.endpoint = nil;
+                            } else {
+                                newElement_3.endpoint = [NSNumber numberWithUnsignedShort:entry_3.endpoint.Value()];
+                            }
+                            if (entry_3.deviceType.IsNull()) {
+                                newElement_3.deviceType = nil;
+                            } else {
+                                newElement_3.deviceType = [NSNumber numberWithUnsignedInt:entry_3.deviceType.Value()];
+                            }
+                            [array_3 addObject:newElement_3];
+                        }
+                        newElement_0.targets = array_3;
+                    }
+                }
+                newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
+                [array_0 addObject:newElement_0];
+            }
+            value = array_0;
+        }
 
-        [cluster writeAttributePresentValueWithValue:value
-                                              params:params
-                                   completionHandler:^(NSError * _Nullable error) {
-                                       if (error != nil) {
-                                           LogNSError("BinaryInputBasic PresentValue write Error", error);
-                                       }
-                                       SetCommandExitStatus(error);
-                                   }];
+        [cluster writeAttributeAclWithValue:value
+                                     params:params
+                          completionHandler:^(NSError * _Nullable error) {
+                              if (error != nil) {
+                                  LogNSError("AccessControl Acl write Error", error);
+                              }
+                              SetCommandExitStatus(error);
+                          }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    bool mValue;
+    chip::app::DataModel::List<const chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type> mValue;
+    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type>>
+        mComplex;
 };
 
-class SubscribeAttributeBinaryInputBasicPresentValue : public SubscribeAttribute {
+class SubscribeAttributeAccessControlAcl : public SubscribeAttribute {
 public:
-    SubscribeAttributeBinaryInputBasicPresentValue()
-        : SubscribeAttribute("present-value")
+    SubscribeAttributeAccessControlAcl()
+        : SubscribeAttribute("acl")
     {
     }
 
-    ~SubscribeAttributeBinaryInputBasicPresentValue() {}
+    ~SubscribeAttributeAccessControlAcl() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x00000055) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePresentValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAclWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BinaryInputBasic.PresentValue response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AccessControl.Acl response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -8084,104 +8733,115 @@ class SubscribeAttributeBinaryInputBasicPresentValue : public SubscribeAttribute
 };
 
 /*
- * Attribute Reliability
+ * Attribute Extension
  */
-class ReadBinaryInputBasicReliability : public ReadAttribute {
+class ReadAccessControlExtension : public ReadAttribute {
 public:
-    ReadBinaryInputBasicReliability()
-        : ReadAttribute("reliability")
+    ReadAccessControlExtension()
+        : ReadAttribute("extension")
     {
     }
 
-    ~ReadBinaryInputBasicReliability() {}
+    ~ReadAccessControlExtension() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x00000067) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeReliabilityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BinaryInputBasic.Reliability response %@", [value description]);
-            if (error != nil) {
-                LogNSError("BinaryInputBasic Reliability read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPReadParams * params = [[CHIPReadParams alloc] init];
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster readAttributeExtensionWithParams:params
+                                completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                                    NSLog(@"AccessControl.Extension response %@", [value description]);
+                                    if (error != nil) {
+                                        LogNSError("AccessControl Extension read Error", error);
+                                    }
+                                    SetCommandExitStatus(error);
+                                }];
         return CHIP_NO_ERROR;
     }
 };
 
-class WriteBinaryInputBasicReliability : public WriteAttribute {
+class WriteAccessControlExtension : public WriteAttribute {
 public:
-    WriteBinaryInputBasicReliability()
-        : WriteAttribute("reliability")
+    WriteAccessControlExtension()
+        : WriteAttribute("extension")
+        , mComplex(&mValue)
     {
-        AddArgument("attr-name", "reliability");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        AddArgument("attr-name", "extension");
+        AddArgument("attr-value", &mComplex);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteBinaryInputBasicReliability() {}
+    ~WriteAccessControlExtension() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) WriteAttribute (0x00000067) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) WriteAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mValue) {
+                CHIPAccessControlClusterExtensionEntry * newElement_0;
+                newElement_0 = [CHIPAccessControlClusterExtensionEntry new];
+                newElement_0.data = [NSData dataWithBytes:entry_0.data.data() length:entry_0.data.size()];
+                newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
+                [array_0 addObject:newElement_0];
+            }
+            value = array_0;
+        }
 
-        [cluster writeAttributeReliabilityWithValue:value
-                                             params:params
-                                  completionHandler:^(NSError * _Nullable error) {
-                                      if (error != nil) {
-                                          LogNSError("BinaryInputBasic Reliability write Error", error);
-                                      }
-                                      SetCommandExitStatus(error);
-                                  }];
+        [cluster writeAttributeExtensionWithValue:value
+                                           params:params
+                                completionHandler:^(NSError * _Nullable error) {
+                                    if (error != nil) {
+                                        LogNSError("AccessControl Extension write Error", error);
+                                    }
+                                    SetCommandExitStatus(error);
+                                }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    uint8_t mValue;
+    chip::app::DataModel::List<const chip::app::Clusters::AccessControl::Structs::ExtensionEntry::Type> mValue;
+    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::AccessControl::Structs::ExtensionEntry::Type>>
+        mComplex;
 };
 
-class SubscribeAttributeBinaryInputBasicReliability : public SubscribeAttribute {
+class SubscribeAttributeAccessControlExtension : public SubscribeAttribute {
 public:
-    SubscribeAttributeBinaryInputBasicReliability()
-        : SubscribeAttribute("reliability")
+    SubscribeAttributeAccessControlExtension()
+        : SubscribeAttribute("extension")
     {
     }
 
-    ~SubscribeAttributeBinaryInputBasicReliability() {}
+    ~SubscribeAttributeAccessControlExtension() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x00000067) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeReliabilityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeExtensionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BinaryInputBasic.Reliability response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AccessControl.Extension response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -8192,29 +8852,28 @@ class SubscribeAttributeBinaryInputBasicReliability : public SubscribeAttribute
 };
 
 /*
- * Attribute StatusFlags
+ * Attribute SubjectsPerAccessControlEntry
  */
-class ReadBinaryInputBasicStatusFlags : public ReadAttribute {
+class ReadAccessControlSubjectsPerAccessControlEntry : public ReadAttribute {
 public:
-    ReadBinaryInputBasicStatusFlags()
-        : ReadAttribute("status-flags")
+    ReadAccessControlSubjectsPerAccessControlEntry()
+        : ReadAttribute("subjects-per-access-control-entry")
     {
     }
 
-    ~ReadBinaryInputBasicStatusFlags() {}
+    ~ReadAccessControlSubjectsPerAccessControlEntry() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x0000006F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeStatusFlagsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BinaryInputBasic.StatusFlags response %@", [value description]);
+        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeSubjectsPerAccessControlEntryWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AccessControl.SubjectsPerAccessControlEntry response %@", [value description]);
             if (error != nil) {
-                LogNSError("BinaryInputBasic StatusFlags read Error", error);
+                LogNSError("AccessControl SubjectsPerAccessControlEntry read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -8222,34 +8881,32 @@ class ReadBinaryInputBasicStatusFlags : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBinaryInputBasicStatusFlags : public SubscribeAttribute {
+class SubscribeAttributeAccessControlSubjectsPerAccessControlEntry : public SubscribeAttribute {
 public:
-    SubscribeAttributeBinaryInputBasicStatusFlags()
-        : SubscribeAttribute("status-flags")
+    SubscribeAttributeAccessControlSubjectsPerAccessControlEntry()
+        : SubscribeAttribute("subjects-per-access-control-entry")
     {
     }
 
-    ~SubscribeAttributeBinaryInputBasicStatusFlags() {}
+    ~SubscribeAttributeAccessControlSubjectsPerAccessControlEntry() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x0000006F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeStatusFlagsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSubjectsPerAccessControlEntryWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BinaryInputBasic.StatusFlags response %@", [value description]);
+                NSLog(@"AccessControl.SubjectsPerAccessControlEntry response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -8260,29 +8917,28 @@ class SubscribeAttributeBinaryInputBasicStatusFlags : public SubscribeAttribute
 };
 
 /*
- * Attribute ApplicationType
+ * Attribute TargetsPerAccessControlEntry
  */
-class ReadBinaryInputBasicApplicationType : public ReadAttribute {
+class ReadAccessControlTargetsPerAccessControlEntry : public ReadAttribute {
 public:
-    ReadBinaryInputBasicApplicationType()
-        : ReadAttribute("application-type")
+    ReadAccessControlTargetsPerAccessControlEntry()
+        : ReadAttribute("targets-per-access-control-entry")
     {
     }
 
-    ~ReadBinaryInputBasicApplicationType() {}
+    ~ReadAccessControlTargetsPerAccessControlEntry() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x00000100) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeApplicationTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BinaryInputBasic.ApplicationType response %@", [value description]);
+        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeTargetsPerAccessControlEntryWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AccessControl.TargetsPerAccessControlEntry response %@", [value description]);
             if (error != nil) {
-                LogNSError("BinaryInputBasic ApplicationType read Error", error);
+                LogNSError("AccessControl TargetsPerAccessControlEntry read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -8290,34 +8946,32 @@ class ReadBinaryInputBasicApplicationType : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBinaryInputBasicApplicationType : public SubscribeAttribute {
+class SubscribeAttributeAccessControlTargetsPerAccessControlEntry : public SubscribeAttribute {
 public:
-    SubscribeAttributeBinaryInputBasicApplicationType()
-        : SubscribeAttribute("application-type")
+    SubscribeAttributeAccessControlTargetsPerAccessControlEntry()
+        : SubscribeAttribute("targets-per-access-control-entry")
     {
     }
 
-    ~SubscribeAttributeBinaryInputBasicApplicationType() {}
+    ~SubscribeAttributeAccessControlTargetsPerAccessControlEntry() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x00000100) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeApplicationTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTargetsPerAccessControlEntryWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BinaryInputBasic.ApplicationType response %@", [value description]);
+                NSLog(@"AccessControl.TargetsPerAccessControlEntry response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -8328,29 +8982,28 @@ class SubscribeAttributeBinaryInputBasicApplicationType : public SubscribeAttrib
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute AccessControlEntriesPerFabric
  */
-class ReadBinaryInputBasicGeneratedCommandList : public ReadAttribute {
+class ReadAccessControlAccessControlEntriesPerFabric : public ReadAttribute {
 public:
-    ReadBinaryInputBasicGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadAccessControlAccessControlEntriesPerFabric()
+        : ReadAttribute("access-control-entries-per-fabric")
     {
     }
 
-    ~ReadBinaryInputBasicGeneratedCommandList() {}
+    ~ReadAccessControlAccessControlEntriesPerFabric() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BinaryInputBasic.GeneratedCommandList response %@", [value description]);
+        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAccessControlEntriesPerFabricWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AccessControl.AccessControlEntriesPerFabric response %@", [value description]);
             if (error != nil) {
-                LogNSError("BinaryInputBasic GeneratedCommandList read Error", error);
+                LogNSError("AccessControl AccessControlEntriesPerFabric read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -8358,34 +9011,32 @@ class ReadBinaryInputBasicGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBinaryInputBasicGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeAccessControlAccessControlEntriesPerFabric : public SubscribeAttribute {
 public:
-    SubscribeAttributeBinaryInputBasicGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeAccessControlAccessControlEntriesPerFabric()
+        : SubscribeAttribute("access-control-entries-per-fabric")
     {
     }
 
-    ~SubscribeAttributeBinaryInputBasicGeneratedCommandList() {}
+    ~SubscribeAttributeAccessControlAccessControlEntriesPerFabric() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReportAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAccessControlEntriesPerFabricWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BinaryInputBasic.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AccessControl.AccessControlEntriesPerFabric response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -8396,29 +9047,27 @@ class SubscribeAttributeBinaryInputBasicGeneratedCommandList : public SubscribeA
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute GeneratedCommandList
  */
-class ReadBinaryInputBasicAcceptedCommandList : public ReadAttribute {
+class ReadAccessControlGeneratedCommandList : public ReadAttribute {
 public:
-    ReadBinaryInputBasicAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadAccessControlGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadBinaryInputBasicAcceptedCommandList() {}
+    ~ReadAccessControlGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BinaryInputBasic.AcceptedCommandList response %@", [value description]);
+        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AccessControl.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("BinaryInputBasic AcceptedCommandList read Error", error);
+                LogNSError("AccessControl GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -8426,34 +9075,32 @@ class ReadBinaryInputBasicAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBinaryInputBasicAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeAccessControlGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBinaryInputBasicAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeAccessControlGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeBinaryInputBasicAcceptedCommandList() {}
+    ~SubscribeAttributeAccessControlGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BinaryInputBasic.AcceptedCommandList response %@", [value description]);
+                NSLog(@"AccessControl.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -8464,29 +9111,27 @@ class SubscribeAttributeBinaryInputBasicAcceptedCommandList : public SubscribeAt
 };
 
 /*
- * Attribute AttributeList
+ * Attribute AcceptedCommandList
  */
-class ReadBinaryInputBasicAttributeList : public ReadAttribute {
+class ReadAccessControlAcceptedCommandList : public ReadAttribute {
 public:
-    ReadBinaryInputBasicAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadAccessControlAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadBinaryInputBasicAttributeList() {}
+    ~ReadAccessControlAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BinaryInputBasic.AttributeList response %@", [value description]);
+        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AccessControl.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("BinaryInputBasic AttributeList read Error", error);
+                LogNSError("AccessControl AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -8494,34 +9139,32 @@ class ReadBinaryInputBasicAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBinaryInputBasicAttributeList : public SubscribeAttribute {
+class SubscribeAttributeAccessControlAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBinaryInputBasicAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeAccessControlAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeBinaryInputBasicAttributeList() {}
+    ~SubscribeAttributeAccessControlAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BinaryInputBasic.AttributeList response %@", [value description]);
+                NSLog(@"AccessControl.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -8532,29 +9175,27 @@ class SubscribeAttributeBinaryInputBasicAttributeList : public SubscribeAttribut
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute AttributeList
  */
-class ReadBinaryInputBasicFeatureMap : public ReadAttribute {
+class ReadAccessControlAttributeList : public ReadAttribute {
 public:
-    ReadBinaryInputBasicFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadAccessControlAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadBinaryInputBasicFeatureMap() {}
+    ~ReadAccessControlAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BinaryInputBasic.FeatureMap response %@", [value description]);
+        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AccessControl.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("BinaryInputBasic FeatureMap read Error", error);
+                LogNSError("AccessControl AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -8562,34 +9203,32 @@ class ReadBinaryInputBasicFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBinaryInputBasicFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeAccessControlAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBinaryInputBasicFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeAccessControlAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeBinaryInputBasicFeatureMap() {}
+    ~SubscribeAttributeAccessControlAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BinaryInputBasic.FeatureMap response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AccessControl.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -8600,29 +9239,27 @@ class SubscribeAttributeBinaryInputBasicFeatureMap : public SubscribeAttribute {
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute FeatureMap
  */
-class ReadBinaryInputBasicClusterRevision : public ReadAttribute {
+class ReadAccessControlFeatureMap : public ReadAttribute {
 public:
-    ReadBinaryInputBasicClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadAccessControlFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadBinaryInputBasicClusterRevision() {}
+    ~ReadAccessControlFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BinaryInputBasic.ClusterRevision response %@", [value description]);
+        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AccessControl.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("BinaryInputBasic ClusterRevision read Error", error);
+                LogNSError("AccessControl FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -8630,34 +9267,32 @@ class ReadBinaryInputBasicClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBinaryInputBasicClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeAccessControlFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeBinaryInputBasicClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeAccessControlFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeBinaryInputBasicClusterRevision() {}
+    ~SubscribeAttributeAccessControlFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000000F) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinaryInputBasic * cluster = [[CHIPBinaryInputBasic alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BinaryInputBasic.ClusterRevision response %@", [value description]);
+                NSLog(@"AccessControl.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -8667,150 +9302,61 @@ class SubscribeAttributeBinaryInputBasicClusterRevision : public SubscribeAttrib
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster Binding                                                     | 0x001E |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * Binding                                                           | 0x0000 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Attribute Binding
+ * Attribute ClusterRevision
  */
-class ReadBindingBinding : public ReadAttribute {
+class ReadAccessControlClusterRevision : public ReadAttribute {
 public:
-    ReadBindingBinding()
-        : ReadAttribute("binding")
+    ReadAccessControlClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadBindingBinding() {}
+    ~ReadAccessControlClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) ReadAttribute (0x00000000) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPReadParams * params = [[CHIPReadParams alloc] init];
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster readAttributeBindingWithParams:params
-                              completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                  NSLog(@"Binding.Binding response %@", [value description]);
-                                  if (error != nil) {
-                                      LogNSError("Binding Binding read Error", error);
-                                  }
-                                  SetCommandExitStatus(error);
-                              }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteBindingBinding : public WriteAttribute {
-public:
-    WriteBindingBinding()
-        : WriteAttribute("binding")
-        , mComplex(&mValue)
-    {
-        AddArgument("attr-name", "binding");
-        AddArgument("attr-value", &mComplex);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteBindingBinding() {}
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) WriteAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSArray * _Nonnull value;
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mValue) {
-                CHIPBindingClusterTargetStruct * newElement_0;
-                newElement_0 = [CHIPBindingClusterTargetStruct new];
-                if (entry_0.node.HasValue()) {
-                    newElement_0.node = [NSNumber numberWithUnsignedLongLong:entry_0.node.Value()];
-                } else {
-                    newElement_0.node = nil;
-                }
-                if (entry_0.group.HasValue()) {
-                    newElement_0.group = [NSNumber numberWithUnsignedShort:entry_0.group.Value()];
-                } else {
-                    newElement_0.group = nil;
-                }
-                if (entry_0.endpoint.HasValue()) {
-                    newElement_0.endpoint = [NSNumber numberWithUnsignedShort:entry_0.endpoint.Value()];
-                } else {
-                    newElement_0.endpoint = nil;
-                }
-                if (entry_0.cluster.HasValue()) {
-                    newElement_0.cluster = [NSNumber numberWithUnsignedInt:entry_0.cluster.Value()];
-                } else {
-                    newElement_0.cluster = nil;
-                }
-                newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
-                [array_0 addObject:newElement_0];
+        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AccessControl.ClusterRevision response %@", [value description]);
+            if (error != nil) {
+                LogNSError("AccessControl ClusterRevision read Error", error);
             }
-            value = array_0;
-        }
-
-        [cluster writeAttributeBindingWithValue:value
-                                         params:params
-                              completionHandler:^(NSError * _Nullable error) {
-                                  if (error != nil) {
-                                      LogNSError("Binding Binding write Error", error);
-                                  }
-                                  SetCommandExitStatus(error);
-                              }];
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::DataModel::List<const chip::app::Clusters::Binding::Structs::TargetStruct::Type> mValue;
-    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::Binding::Structs::TargetStruct::Type>> mComplex;
 };
 
-class SubscribeAttributeBindingBinding : public SubscribeAttribute {
+class SubscribeAttributeAccessControlClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeBindingBinding()
-        : SubscribeAttribute("binding")
+    SubscribeAttributeAccessControlClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeBindingBinding() {}
+    ~SubscribeAttributeAccessControlClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000001F) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBindingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Binding.Binding response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AccessControl.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -8820,365 +9366,670 @@ class SubscribeAttributeBindingBinding : public SubscribeAttribute {
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster BridgedActions                                              | 0x0025 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * InstantAction                                                     |   0x00 |
+| * InstantActionWithTransition                                       |   0x01 |
+| * StartAction                                                       |   0x02 |
+| * StartActionWithDuration                                           |   0x03 |
+| * StopAction                                                        |   0x04 |
+| * PauseAction                                                       |   0x05 |
+| * PauseActionWithDuration                                           |   0x06 |
+| * ResumeAction                                                      |   0x07 |
+| * EnableAction                                                      |   0x08 |
+| * EnableActionWithDuration                                          |   0x09 |
+| * DisableAction                                                     |   0x0A |
+| * DisableActionWithDuration                                         |   0x0B |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * ActionList                                                        | 0x0000 |
+| * EndpointList                                                      | 0x0001 |
+| * SetupUrl                                                          | 0x0002 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * StateChanged                                                      | 0x0000 |
+| * ActionFailed                                                      | 0x0001 |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute GeneratedCommandList
+ * Command InstantAction
  */
-class ReadBindingGeneratedCommandList : public ReadAttribute {
+class BridgedActionsInstantAction : public ClusterCommand {
 public:
-    ReadBindingGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    BridgedActionsInstantAction()
+        : ClusterCommand("instant-action")
     {
+        AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
+        AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadBindingGeneratedCommandList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Binding.GeneratedCommandList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("Binding GeneratedCommandList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPBridgedActionsClusterInstantActionParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
+        if (mRequest.invokeID.HasValue()) {
+            params.invokeID = [NSNumber numberWithUnsignedInt:mRequest.invokeID.Value()];
+        } else {
+            params.invokeID = nil;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster instantActionWithParams:params
+                           completionHandler:^(NSError * _Nullable error) {
+                               responsesNeeded--;
+                               if (error != nil) {
+                                   mError = error;
+                                   LogNSError("Error", error);
+                               }
+                               if (responsesNeeded == 0) {
+                                   SetCommandExitStatus(mError);
+                               }
+                           }];
+        }
         return CHIP_NO_ERROR;
     }
-};
-
-class SubscribeAttributeBindingGeneratedCommandList : public SubscribeAttribute {
-public:
-    SubscribeAttributeBindingGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
-    {
-    }
-
-    ~SubscribeAttributeBindingGeneratedCommandList() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Binding.GeneratedCommandList response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
 
-        return CHIP_NO_ERROR;
-    }
+private:
+    chip::app::Clusters::BridgedActions::Commands::InstantAction::Type mRequest;
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Command InstantActionWithTransition
  */
-class ReadBindingAcceptedCommandList : public ReadAttribute {
+class BridgedActionsInstantActionWithTransition : public ClusterCommand {
 public:
-    ReadBindingAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    BridgedActionsInstantActionWithTransition()
+        : ClusterCommand("instant-action-with-transition")
     {
+        AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
+        AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadBindingAcceptedCommandList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Binding.AcceptedCommandList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("Binding AcceptedCommandList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPBridgedActionsClusterInstantActionWithTransitionParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
+        if (mRequest.invokeID.HasValue()) {
+            params.invokeID = [NSNumber numberWithUnsignedInt:mRequest.invokeID.Value()];
+        } else {
+            params.invokeID = nil;
+        }
+        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster instantActionWithTransitionWithParams:params
+                                         completionHandler:^(NSError * _Nullable error) {
+                                             responsesNeeded--;
+                                             if (error != nil) {
+                                                 mError = error;
+                                                 LogNSError("Error", error);
+                                             }
+                                             if (responsesNeeded == 0) {
+                                                 SetCommandExitStatus(mError);
+                                             }
+                                         }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::BridgedActions::Commands::InstantActionWithTransition::Type mRequest;
 };
 
-class SubscribeAttributeBindingAcceptedCommandList : public SubscribeAttribute {
+/*
+ * Command StartAction
+ */
+class BridgedActionsStartAction : public ClusterCommand {
 public:
-    SubscribeAttributeBindingAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    BridgedActionsStartAction()
+        : ClusterCommand("start-action")
     {
+        AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
+        AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeBindingAcceptedCommandList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Binding.AcceptedCommandList response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000002) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPBridgedActionsClusterStartActionParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
+        if (mRequest.invokeID.HasValue()) {
+            params.invokeID = [NSNumber numberWithUnsignedInt:mRequest.invokeID.Value()];
+        } else {
+            params.invokeID = nil;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster startActionWithParams:params
+                         completionHandler:^(NSError * _Nullable error) {
+                             responsesNeeded--;
+                             if (error != nil) {
+                                 mError = error;
+                                 LogNSError("Error", error);
+                             }
+                             if (responsesNeeded == 0) {
+                                 SetCommandExitStatus(mError);
+                             }
+                         }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::BridgedActions::Commands::StartAction::Type mRequest;
 };
 
 /*
- * Attribute AttributeList
+ * Command StartActionWithDuration
  */
-class ReadBindingAttributeList : public ReadAttribute {
+class BridgedActionsStartActionWithDuration : public ClusterCommand {
 public:
-    ReadBindingAttributeList()
-        : ReadAttribute("attribute-list")
+    BridgedActionsStartActionWithDuration()
+        : ClusterCommand("start-action-with-duration")
     {
+        AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
+        AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
+        AddArgument("Duration", 0, UINT32_MAX, &mRequest.duration);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadBindingAttributeList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Binding.AttributeList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("Binding AttributeList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPBridgedActionsClusterStartActionWithDurationParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
+        if (mRequest.invokeID.HasValue()) {
+            params.invokeID = [NSNumber numberWithUnsignedInt:mRequest.invokeID.Value()];
+        } else {
+            params.invokeID = nil;
+        }
+        params.duration = [NSNumber numberWithUnsignedInt:mRequest.duration];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster startActionWithDurationWithParams:params
+                                     completionHandler:^(NSError * _Nullable error) {
+                                         responsesNeeded--;
+                                         if (error != nil) {
+                                             mError = error;
+                                             LogNSError("Error", error);
+                                         }
+                                         if (responsesNeeded == 0) {
+                                             SetCommandExitStatus(mError);
+                                         }
+                                     }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::BridgedActions::Commands::StartActionWithDuration::Type mRequest;
 };
 
-class SubscribeAttributeBindingAttributeList : public SubscribeAttribute {
+/*
+ * Command StopAction
+ */
+class BridgedActionsStopAction : public ClusterCommand {
 public:
-    SubscribeAttributeBindingAttributeList()
-        : SubscribeAttribute("attribute-list")
+    BridgedActionsStopAction()
+        : ClusterCommand("stop-action")
     {
+        AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
+        AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeBindingAttributeList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000004) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Binding.AttributeList response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
-
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPBridgedActionsClusterStopActionParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
+        if (mRequest.invokeID.HasValue()) {
+            params.invokeID = [NSNumber numberWithUnsignedInt:mRequest.invokeID.Value()];
+        } else {
+            params.invokeID = nil;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster stopActionWithParams:params
+                        completionHandler:^(NSError * _Nullable error) {
+                            responsesNeeded--;
+                            if (error != nil) {
+                                mError = error;
+                                LogNSError("Error", error);
+                            }
+                            if (responsesNeeded == 0) {
+                                SetCommandExitStatus(mError);
+                            }
+                        }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::BridgedActions::Commands::StopAction::Type mRequest;
 };
 
 /*
- * Attribute FeatureMap
+ * Command PauseAction
  */
-class ReadBindingFeatureMap : public ReadAttribute {
+class BridgedActionsPauseAction : public ClusterCommand {
 public:
-    ReadBindingFeatureMap()
-        : ReadAttribute("feature-map")
+    BridgedActionsPauseAction()
+        : ClusterCommand("pause-action")
     {
+        AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
+        AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadBindingFeatureMap() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Binding.FeatureMap response %@", [value description]);
-            if (error != nil) {
-                LogNSError("Binding FeatureMap read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPBridgedActionsClusterPauseActionParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
+        if (mRequest.invokeID.HasValue()) {
+            params.invokeID = [NSNumber numberWithUnsignedInt:mRequest.invokeID.Value()];
+        } else {
+            params.invokeID = nil;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster pauseActionWithParams:params
+                         completionHandler:^(NSError * _Nullable error) {
+                             responsesNeeded--;
+                             if (error != nil) {
+                                 mError = error;
+                                 LogNSError("Error", error);
+                             }
+                             if (responsesNeeded == 0) {
+                                 SetCommandExitStatus(mError);
+                             }
+                         }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::BridgedActions::Commands::PauseAction::Type mRequest;
 };
 
-class SubscribeAttributeBindingFeatureMap : public SubscribeAttribute {
+/*
+ * Command PauseActionWithDuration
+ */
+class BridgedActionsPauseActionWithDuration : public ClusterCommand {
 public:
-    SubscribeAttributeBindingFeatureMap()
-        : SubscribeAttribute("feature-map")
+    BridgedActionsPauseActionWithDuration()
+        : ClusterCommand("pause-action-with-duration")
     {
+        AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
+        AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
+        AddArgument("Duration", 0, UINT32_MAX, &mRequest.duration);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeBindingFeatureMap() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Binding.FeatureMap response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000006) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPBridgedActionsClusterPauseActionWithDurationParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
+        if (mRequest.invokeID.HasValue()) {
+            params.invokeID = [NSNumber numberWithUnsignedInt:mRequest.invokeID.Value()];
+        } else {
+            params.invokeID = nil;
+        }
+        params.duration = [NSNumber numberWithUnsignedInt:mRequest.duration];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster pauseActionWithDurationWithParams:params
+                                     completionHandler:^(NSError * _Nullable error) {
+                                         responsesNeeded--;
+                                         if (error != nil) {
+                                             mError = error;
+                                             LogNSError("Error", error);
+                                         }
+                                         if (responsesNeeded == 0) {
+                                             SetCommandExitStatus(mError);
+                                         }
+                                     }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::BridgedActions::Commands::PauseActionWithDuration::Type mRequest;
 };
 
 /*
- * Attribute ClusterRevision
+ * Command ResumeAction
  */
-class ReadBindingClusterRevision : public ReadAttribute {
+class BridgedActionsResumeAction : public ClusterCommand {
 public:
-    ReadBindingClusterRevision()
-        : ReadAttribute("cluster-revision")
+    BridgedActionsResumeAction()
+        : ClusterCommand("resume-action")
     {
+        AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
+        AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadBindingClusterRevision() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000007) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Binding.ClusterRevision response %@", [value description]);
-            if (error != nil) {
-                LogNSError("Binding ClusterRevision read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPBridgedActionsClusterResumeActionParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
+        if (mRequest.invokeID.HasValue()) {
+            params.invokeID = [NSNumber numberWithUnsignedInt:mRequest.invokeID.Value()];
+        } else {
+            params.invokeID = nil;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster resumeActionWithParams:params
+                          completionHandler:^(NSError * _Nullable error) {
+                              responsesNeeded--;
+                              if (error != nil) {
+                                  mError = error;
+                                  LogNSError("Error", error);
+                              }
+                              if (responsesNeeded == 0) {
+                                  SetCommandExitStatus(mError);
+                              }
+                          }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::BridgedActions::Commands::ResumeAction::Type mRequest;
 };
 
-class SubscribeAttributeBindingClusterRevision : public SubscribeAttribute {
+/*
+ * Command EnableAction
+ */
+class BridgedActionsEnableAction : public ClusterCommand {
 public:
-    SubscribeAttributeBindingClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    BridgedActionsEnableAction()
+        : ClusterCommand("enable-action")
     {
+        AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
+        AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeBindingClusterRevision() {}
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000008) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPBridgedActionsClusterEnableActionParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
+        if (mRequest.invokeID.HasValue()) {
+            params.invokeID = [NSNumber numberWithUnsignedInt:mRequest.invokeID.Value()];
+        } else {
+            params.invokeID = nil;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster enableActionWithParams:params
+                          completionHandler:^(NSError * _Nullable error) {
+                              responsesNeeded--;
+                              if (error != nil) {
+                                  mError = error;
+                                  LogNSError("Error", error);
+                              }
+                              if (responsesNeeded == 0) {
+                                  SetCommandExitStatus(mError);
+                              }
+                          }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::BridgedActions::Commands::EnableAction::Type mRequest;
+};
+
+/*
+ * Command EnableActionWithDuration
+ */
+class BridgedActionsEnableActionWithDuration : public ClusterCommand {
+public:
+    BridgedActionsEnableActionWithDuration()
+        : ClusterCommand("enable-action-with-duration")
+    {
+        AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
+        AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
+        AddArgument("Duration", 0, UINT32_MAX, &mRequest.duration);
+        ClusterCommand::AddArguments();
+    }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001E) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000009) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Binding.ClusterRevision response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPBridgedActionsClusterEnableActionWithDurationParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
+        if (mRequest.invokeID.HasValue()) {
+            params.invokeID = [NSNumber numberWithUnsignedInt:mRequest.invokeID.Value()];
+        } else {
+            params.invokeID = nil;
+        }
+        params.duration = [NSNumber numberWithUnsignedInt:mRequest.duration];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster enableActionWithDurationWithParams:params
+                                      completionHandler:^(NSError * _Nullable error) {
+                                          responsesNeeded--;
+                                          if (error != nil) {
+                                              mError = error;
+                                              LogNSError("Error", error);
+                                          }
+                                          if (responsesNeeded == 0) {
+                                              SetCommandExitStatus(mError);
+                                          }
+                                      }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::BridgedActions::Commands::EnableActionWithDuration::Type mRequest;
+};
 
+/*
+ * Command DisableAction
+ */
+class BridgedActionsDisableAction : public ClusterCommand {
+public:
+    BridgedActionsDisableAction()
+        : ClusterCommand("disable-action")
+    {
+        AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
+        AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x0000000A) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPBridgedActionsClusterDisableActionParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
+        if (mRequest.invokeID.HasValue()) {
+            params.invokeID = [NSNumber numberWithUnsignedInt:mRequest.invokeID.Value()];
+        } else {
+            params.invokeID = nil;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster disableActionWithParams:params
+                           completionHandler:^(NSError * _Nullable error) {
+                               responsesNeeded--;
+                               if (error != nil) {
+                                   mError = error;
+                                   LogNSError("Error", error);
+                               }
+                               if (responsesNeeded == 0) {
+                                   SetCommandExitStatus(mError);
+                               }
+                           }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::BridgedActions::Commands::DisableAction::Type mRequest;
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster BooleanState                                                | 0x0045 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * StateValue                                                        | 0x0000 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-| * StateChange                                                       | 0x0000 |
-\*----------------------------------------------------------------------------*/
+/*
+ * Command DisableActionWithDuration
+ */
+class BridgedActionsDisableActionWithDuration : public ClusterCommand {
+public:
+    BridgedActionsDisableActionWithDuration()
+        : ClusterCommand("disable-action-with-duration")
+    {
+        AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
+        AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
+        AddArgument("Duration", 0, UINT32_MAX, &mRequest.duration);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x0000000B) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPBridgedActionsClusterDisableActionWithDurationParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
+        if (mRequest.invokeID.HasValue()) {
+            params.invokeID = [NSNumber numberWithUnsignedInt:mRequest.invokeID.Value()];
+        } else {
+            params.invokeID = nil;
+        }
+        params.duration = [NSNumber numberWithUnsignedInt:mRequest.duration];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster disableActionWithDurationWithParams:params
+                                       completionHandler:^(NSError * _Nullable error) {
+                                           responsesNeeded--;
+                                           if (error != nil) {
+                                               mError = error;
+                                               LogNSError("Error", error);
+                                           }
+                                           if (responsesNeeded == 0) {
+                                               SetCommandExitStatus(mError);
+                                           }
+                                       }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::BridgedActions::Commands::DisableActionWithDuration::Type mRequest;
+};
 
 /*
- * Attribute StateValue
+ * Attribute ActionList
  */
-class ReadBooleanStateStateValue : public ReadAttribute {
+class ReadBridgedActionsActionList : public ReadAttribute {
 public:
-    ReadBooleanStateStateValue()
-        : ReadAttribute("state-value")
+    ReadBridgedActionsActionList()
+        : ReadAttribute("action-list")
     {
     }
 
-    ~ReadBooleanStateStateValue() {}
+    ~ReadBridgedActionsActionList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000045) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeStateValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BooleanState.StateValue response %@", [value description]);
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeActionListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BridgedActions.ActionList response %@", [value description]);
             if (error != nil) {
-                LogNSError("BooleanState StateValue read Error", error);
+                LogNSError("BridgedActions ActionList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -9186,32 +10037,32 @@ class ReadBooleanStateStateValue : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBooleanStateStateValue : public SubscribeAttribute {
+class SubscribeAttributeBridgedActionsActionList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBooleanStateStateValue()
-        : SubscribeAttribute("state-value")
+    SubscribeAttributeBridgedActionsActionList()
+        : SubscribeAttribute("action-list")
     {
     }
 
-    ~SubscribeAttributeBooleanStateStateValue() {}
+    ~SubscribeAttributeBridgedActionsActionList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000045) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeStateValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeActionListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BooleanState.StateValue response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedActions.ActionList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -9222,27 +10073,27 @@ class SubscribeAttributeBooleanStateStateValue : public SubscribeAttribute {
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute EndpointList
  */
-class ReadBooleanStateGeneratedCommandList : public ReadAttribute {
+class ReadBridgedActionsEndpointList : public ReadAttribute {
 public:
-    ReadBooleanStateGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadBridgedActionsEndpointList()
+        : ReadAttribute("endpoint-list")
     {
     }
 
-    ~ReadBooleanStateGeneratedCommandList() {}
+    ~ReadBridgedActionsEndpointList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000045) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BooleanState.GeneratedCommandList response %@", [value description]);
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeEndpointListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BridgedActions.EndpointList response %@", [value description]);
             if (error != nil) {
-                LogNSError("BooleanState GeneratedCommandList read Error", error);
+                LogNSError("BridgedActions EndpointList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -9250,32 +10101,32 @@ class ReadBooleanStateGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBooleanStateGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeBridgedActionsEndpointList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBooleanStateGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeBridgedActionsEndpointList()
+        : SubscribeAttribute("endpoint-list")
     {
     }
 
-    ~SubscribeAttributeBooleanStateGeneratedCommandList() {}
+    ~SubscribeAttributeBridgedActionsEndpointList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000045) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeEndpointListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BooleanState.GeneratedCommandList response %@", [value description]);
+                NSLog(@"BridgedActions.EndpointList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -9286,27 +10137,155 @@ class SubscribeAttributeBooleanStateGeneratedCommandList : public SubscribeAttri
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute SetupUrl
  */
-class ReadBooleanStateAcceptedCommandList : public ReadAttribute {
+class ReadBridgedActionsSetupUrl : public ReadAttribute {
 public:
-    ReadBooleanStateAcceptedCommandList()
+    ReadBridgedActionsSetupUrl()
+        : ReadAttribute("setup-url")
+    {
+    }
+
+    ~ReadBridgedActionsSetupUrl() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeSetupUrlWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BridgedActions.SetupUrl response %@", [value description]);
+            if (error != nil) {
+                LogNSError("BridgedActions SetupUrl read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeBridgedActionsSetupUrl : public SubscribeAttribute {
+public:
+    SubscribeAttributeBridgedActionsSetupUrl()
+        : SubscribeAttribute("setup-url")
+    {
+    }
+
+    ~SubscribeAttributeBridgedActionsSetupUrl() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeSetupUrlWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedActions.SetupUrl response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+/*
+ * Attribute GeneratedCommandList
+ */
+class ReadBridgedActionsGeneratedCommandList : public ReadAttribute {
+public:
+    ReadBridgedActionsGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
+    {
+    }
+
+    ~ReadBridgedActionsGeneratedCommandList() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BridgedActions.GeneratedCommandList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("BridgedActions GeneratedCommandList read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeBridgedActionsGeneratedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeBridgedActionsGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
+    {
+    }
+
+    ~SubscribeAttributeBridgedActionsGeneratedCommandList() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedActions.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+/*
+ * Attribute AcceptedCommandList
+ */
+class ReadBridgedActionsAcceptedCommandList : public ReadAttribute {
+public:
+    ReadBridgedActionsAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadBooleanStateAcceptedCommandList() {}
+    ~ReadBridgedActionsAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000045) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BooleanState.AcceptedCommandList response %@", [value description]);
+            NSLog(@"BridgedActions.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("BooleanState AcceptedCommandList read Error", error);
+                LogNSError("BridgedActions AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -9314,20 +10293,20 @@ class ReadBooleanStateAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBooleanStateAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeBridgedActionsAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBooleanStateAcceptedCommandList()
+    SubscribeAttributeBridgedActionsAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeBooleanStateAcceptedCommandList() {}
+    ~SubscribeAttributeBridgedActionsAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000045) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -9339,7 +10318,7 @@ class SubscribeAttributeBooleanStateAcceptedCommandList : public SubscribeAttrib
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BooleanState.AcceptedCommandList response %@", [value description]);
+                NSLog(@"BridgedActions.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -9352,25 +10331,25 @@ class SubscribeAttributeBooleanStateAcceptedCommandList : public SubscribeAttrib
 /*
  * Attribute AttributeList
  */
-class ReadBooleanStateAttributeList : public ReadAttribute {
+class ReadBridgedActionsAttributeList : public ReadAttribute {
 public:
-    ReadBooleanStateAttributeList()
+    ReadBridgedActionsAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadBooleanStateAttributeList() {}
+    ~ReadBridgedActionsAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000045) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BooleanState.AttributeList response %@", [value description]);
+            NSLog(@"BridgedActions.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("BooleanState AttributeList read Error", error);
+                LogNSError("BridgedActions AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -9378,20 +10357,20 @@ class ReadBooleanStateAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBooleanStateAttributeList : public SubscribeAttribute {
+class SubscribeAttributeBridgedActionsAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBooleanStateAttributeList()
+    SubscribeAttributeBridgedActionsAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeBooleanStateAttributeList() {}
+    ~SubscribeAttributeBridgedActionsAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000045) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -9403,7 +10382,7 @@ class SubscribeAttributeBooleanStateAttributeList : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BooleanState.AttributeList response %@", [value description]);
+                NSLog(@"BridgedActions.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -9416,25 +10395,25 @@ class SubscribeAttributeBooleanStateAttributeList : public SubscribeAttribute {
 /*
  * Attribute FeatureMap
  */
-class ReadBooleanStateFeatureMap : public ReadAttribute {
+class ReadBridgedActionsFeatureMap : public ReadAttribute {
 public:
-    ReadBooleanStateFeatureMap()
+    ReadBridgedActionsFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadBooleanStateFeatureMap() {}
+    ~ReadBridgedActionsFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000045) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BooleanState.FeatureMap response %@", [value description]);
+            NSLog(@"BridgedActions.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("BooleanState FeatureMap read Error", error);
+                LogNSError("BridgedActions FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -9442,20 +10421,20 @@ class ReadBooleanStateFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBooleanStateFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeBridgedActionsFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeBooleanStateFeatureMap()
+    SubscribeAttributeBridgedActionsFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeBooleanStateFeatureMap() {}
+    ~SubscribeAttributeBridgedActionsFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000045) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -9467,7 +10446,7 @@ class SubscribeAttributeBooleanStateFeatureMap : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BooleanState.FeatureMap response %@", [value description]);
+                NSLog(@"BridgedActions.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -9480,25 +10459,25 @@ class SubscribeAttributeBooleanStateFeatureMap : public SubscribeAttribute {
 /*
  * Attribute ClusterRevision
  */
-class ReadBooleanStateClusterRevision : public ReadAttribute {
+class ReadBridgedActionsClusterRevision : public ReadAttribute {
 public:
-    ReadBooleanStateClusterRevision()
+    ReadBridgedActionsClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadBooleanStateClusterRevision() {}
+    ~ReadBridgedActionsClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000045) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BooleanState.ClusterRevision response %@", [value description]);
+            NSLog(@"BridgedActions.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("BooleanState ClusterRevision read Error", error);
+                LogNSError("BridgedActions ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -9506,20 +10485,20 @@ class ReadBooleanStateClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBooleanStateClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeBridgedActionsClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeBooleanStateClusterRevision()
+    SubscribeAttributeBridgedActionsClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeBooleanStateClusterRevision() {}
+    ~SubscribeAttributeBridgedActionsClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000045) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -9531,7 +10510,7 @@ class SubscribeAttributeBooleanStateClusterRevision : public SubscribeAttribute
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BooleanState.ClusterRevision response %@", [value description]);
+                NSLog(@"BridgedActions.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -9542,26 +10521,32 @@ class SubscribeAttributeBooleanStateClusterRevision : public SubscribeAttribute
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster BridgedActions                                              | 0x0025 |
+| Cluster Basic                                                       | 0x0028 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * InstantAction                                                     |   0x00 |
-| * InstantActionWithTransition                                       |   0x01 |
-| * StartAction                                                       |   0x02 |
-| * StartActionWithDuration                                           |   0x03 |
-| * StopAction                                                        |   0x04 |
-| * PauseAction                                                       |   0x05 |
-| * PauseActionWithDuration                                           |   0x06 |
-| * ResumeAction                                                      |   0x07 |
-| * EnableAction                                                      |   0x08 |
-| * EnableActionWithDuration                                          |   0x09 |
-| * DisableAction                                                     |   0x0A |
-| * DisableActionWithDuration                                         |   0x0B |
+| * MfgSpecificPing                                                   |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * ActionList                                                        | 0x0000 |
-| * EndpointList                                                      | 0x0001 |
-| * SetupUrl                                                          | 0x0002 |
+| * DataModelRevision                                                 | 0x0000 |
+| * VendorName                                                        | 0x0001 |
+| * VendorID                                                          | 0x0002 |
+| * ProductName                                                       | 0x0003 |
+| * ProductID                                                         | 0x0004 |
+| * NodeLabel                                                         | 0x0005 |
+| * Location                                                          | 0x0006 |
+| * HardwareVersion                                                   | 0x0007 |
+| * HardwareVersionString                                             | 0x0008 |
+| * SoftwareVersion                                                   | 0x0009 |
+| * SoftwareVersionString                                             | 0x000A |
+| * ManufacturingDate                                                 | 0x000B |
+| * PartNumber                                                        | 0x000C |
+| * ProductURL                                                        | 0x000D |
+| * ProductLabel                                                      | 0x000E |
+| * SerialNumber                                                      | 0x000F |
+| * LocalConfigDisabled                                               | 0x0010 |
+| * Reachable                                                         | 0x0011 |
+| * UniqueID                                                          | 0x0012 |
+| * CapabilityMinima                                                  | 0x0013 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -9569,642 +10554,267 @@ class SubscribeAttributeBooleanStateClusterRevision : public SubscribeAttribute
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
-| * StateChanged                                                      | 0x0000 |
-| * ActionFailed                                                      | 0x0001 |
+| * StartUp                                                           | 0x0000 |
+| * ShutDown                                                          | 0x0001 |
+| * Leave                                                             | 0x0002 |
+| * ReachableChanged                                                  | 0x0003 |
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command InstantAction
+ * Command MfgSpecificPing
  */
-class BridgedActionsInstantAction : public ClusterCommand {
+class BasicMfgSpecificPing : public ClusterCommand {
 public:
-    BridgedActionsInstantAction()
-        : ClusterCommand("instant-action")
+    BasicMfgSpecificPing()
+        : ClusterCommand("mfg-specific-ping")
     {
-        AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
-        AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPBridgedActionsClusterInstantActionParams alloc] init];
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPBasicClusterMfgSpecificPingParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
-        if (mRequest.invokeID.HasValue()) {
-            params.invokeID = [NSNumber numberWithUnsignedInt:mRequest.invokeID.Value()];
-        } else {
-            params.invokeID = nil;
-        }
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster instantActionWithParams:params
-                           completionHandler:^(NSError * _Nullable error) {
-                               responsesNeeded--;
-                               if (error != nil) {
-                                   mError = error;
-                                   LogNSError("Error", error);
-                               }
-                               if (responsesNeeded == 0) {
-                                   SetCommandExitStatus(mError);
-                               }
-                           }];
+            [cluster mfgSpecificPingWithParams:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 responsesNeeded--;
+                                 if (error != nil) {
+                                     mError = error;
+                                     LogNSError("Error", error);
+                                 }
+                                 if (responsesNeeded == 0) {
+                                     SetCommandExitStatus(mError);
+                                 }
+                             }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::BridgedActions::Commands::InstantAction::Type mRequest;
 };
 
 /*
- * Command InstantActionWithTransition
+ * Attribute DataModelRevision
  */
-class BridgedActionsInstantActionWithTransition : public ClusterCommand {
+class ReadBasicDataModelRevision : public ReadAttribute {
 public:
-    BridgedActionsInstantActionWithTransition()
-        : ClusterCommand("instant-action-with-transition")
+    ReadBasicDataModelRevision()
+        : ReadAttribute("data-model-revision")
     {
-        AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
-        AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadBasicDataModelRevision() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPBridgedActionsClusterInstantActionWithTransitionParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
-        if (mRequest.invokeID.HasValue()) {
-            params.invokeID = [NSNumber numberWithUnsignedInt:mRequest.invokeID.Value()];
-        } else {
-            params.invokeID = nil;
-        }
-        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster instantActionWithTransitionWithParams:params
-                                         completionHandler:^(NSError * _Nullable error) {
-                                             responsesNeeded--;
-                                             if (error != nil) {
-                                                 mError = error;
-                                                 LogNSError("Error", error);
-                                             }
-                                             if (responsesNeeded == 0) {
-                                                 SetCommandExitStatus(mError);
-                                             }
-                                         }];
-        }
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeDataModelRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Basic.DataModelRevision response %@", [value description]);
+            if (error != nil) {
+                LogNSError("Basic DataModelRevision read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::BridgedActions::Commands::InstantActionWithTransition::Type mRequest;
 };
 
-/*
- * Command StartAction
- */
-class BridgedActionsStartAction : public ClusterCommand {
+class SubscribeAttributeBasicDataModelRevision : public SubscribeAttribute {
 public:
-    BridgedActionsStartAction()
-        : ClusterCommand("start-action")
+    SubscribeAttributeBasicDataModelRevision()
+        : SubscribeAttribute("data-model-revision")
     {
-        AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
-        AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeBasicDataModelRevision() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000002) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPBridgedActionsClusterStartActionParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
-        if (mRequest.invokeID.HasValue()) {
-            params.invokeID = [NSNumber numberWithUnsignedInt:mRequest.invokeID.Value()];
-        } else {
-            params.invokeID = nil;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster startActionWithParams:params
-                         completionHandler:^(NSError * _Nullable error) {
-                             responsesNeeded--;
-                             if (error != nil) {
-                                 mError = error;
-                                 LogNSError("Error", error);
-                             }
-                             if (responsesNeeded == 0) {
-                                 SetCommandExitStatus(mError);
-                             }
-                         }];
-        }
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeDataModelRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.DataModelRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::BridgedActions::Commands::StartAction::Type mRequest;
 };
 
 /*
- * Command StartActionWithDuration
+ * Attribute VendorName
  */
-class BridgedActionsStartActionWithDuration : public ClusterCommand {
+class ReadBasicVendorName : public ReadAttribute {
 public:
-    BridgedActionsStartActionWithDuration()
-        : ClusterCommand("start-action-with-duration")
+    ReadBasicVendorName()
+        : ReadAttribute("vendor-name")
     {
-        AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
-        AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
-        AddArgument("Duration", 0, UINT32_MAX, &mRequest.duration);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadBasicVendorName() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPBridgedActionsClusterStartActionWithDurationParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
-        if (mRequest.invokeID.HasValue()) {
-            params.invokeID = [NSNumber numberWithUnsignedInt:mRequest.invokeID.Value()];
-        } else {
-            params.invokeID = nil;
-        }
-        params.duration = [NSNumber numberWithUnsignedInt:mRequest.duration];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster startActionWithDurationWithParams:params
-                                     completionHandler:^(NSError * _Nullable error) {
-                                         responsesNeeded--;
-                                         if (error != nil) {
-                                             mError = error;
-                                             LogNSError("Error", error);
-                                         }
-                                         if (responsesNeeded == 0) {
-                                             SetCommandExitStatus(mError);
-                                         }
-                                     }];
-        }
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeVendorNameWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Basic.VendorName response %@", [value description]);
+            if (error != nil) {
+                LogNSError("Basic VendorName read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::BridgedActions::Commands::StartActionWithDuration::Type mRequest;
 };
 
-/*
- * Command StopAction
- */
-class BridgedActionsStopAction : public ClusterCommand {
+class SubscribeAttributeBasicVendorName : public SubscribeAttribute {
 public:
-    BridgedActionsStopAction()
-        : ClusterCommand("stop-action")
+    SubscribeAttributeBasicVendorName()
+        : SubscribeAttribute("vendor-name")
     {
-        AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
-        AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeBasicVendorName() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000004) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPBridgedActionsClusterStopActionParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
-        if (mRequest.invokeID.HasValue()) {
-            params.invokeID = [NSNumber numberWithUnsignedInt:mRequest.invokeID.Value()];
-        } else {
-            params.invokeID = nil;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster stopActionWithParams:params
-                        completionHandler:^(NSError * _Nullable error) {
-                            responsesNeeded--;
-                            if (error != nil) {
-                                mError = error;
-                                LogNSError("Error", error);
-                            }
-                            if (responsesNeeded == 0) {
-                                SetCommandExitStatus(mError);
-                            }
-                        }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::BridgedActions::Commands::StopAction::Type mRequest;
-};
-
-/*
- * Command PauseAction
- */
-class BridgedActionsPauseAction : public ClusterCommand {
-public:
-    BridgedActionsPauseAction()
-        : ClusterCommand("pause-action")
-    {
-        AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
-        AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000005) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPBridgedActionsClusterPauseActionParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
-        if (mRequest.invokeID.HasValue()) {
-            params.invokeID = [NSNumber numberWithUnsignedInt:mRequest.invokeID.Value()];
-        } else {
-            params.invokeID = nil;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster pauseActionWithParams:params
-                         completionHandler:^(NSError * _Nullable error) {
-                             responsesNeeded--;
-                             if (error != nil) {
-                                 mError = error;
-                                 LogNSError("Error", error);
-                             }
-                             if (responsesNeeded == 0) {
-                                 SetCommandExitStatus(mError);
-                             }
-                         }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::BridgedActions::Commands::PauseAction::Type mRequest;
-};
-
-/*
- * Command PauseActionWithDuration
- */
-class BridgedActionsPauseActionWithDuration : public ClusterCommand {
-public:
-    BridgedActionsPauseActionWithDuration()
-        : ClusterCommand("pause-action-with-duration")
-    {
-        AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
-        AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
-        AddArgument("Duration", 0, UINT32_MAX, &mRequest.duration);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000006) on endpoint %u", endpointId);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeVendorNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.VendorName response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPBridgedActionsClusterPauseActionWithDurationParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
-        if (mRequest.invokeID.HasValue()) {
-            params.invokeID = [NSNumber numberWithUnsignedInt:mRequest.invokeID.Value()];
-        } else {
-            params.invokeID = nil;
-        }
-        params.duration = [NSNumber numberWithUnsignedInt:mRequest.duration];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster pauseActionWithDurationWithParams:params
-                                     completionHandler:^(NSError * _Nullable error) {
-                                         responsesNeeded--;
-                                         if (error != nil) {
-                                             mError = error;
-                                             LogNSError("Error", error);
-                                         }
-                                         if (responsesNeeded == 0) {
-                                             SetCommandExitStatus(mError);
-                                         }
-                                     }];
-        }
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::BridgedActions::Commands::PauseActionWithDuration::Type mRequest;
 };
 
 /*
- * Command ResumeAction
+ * Attribute VendorID
  */
-class BridgedActionsResumeAction : public ClusterCommand {
+class ReadBasicVendorID : public ReadAttribute {
 public:
-    BridgedActionsResumeAction()
-        : ClusterCommand("resume-action")
-    {
-        AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
-        AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    ReadBasicVendorID()
+        : ReadAttribute("vendor-id")
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000007) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPBridgedActionsClusterResumeActionParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
-        if (mRequest.invokeID.HasValue()) {
-            params.invokeID = [NSNumber numberWithUnsignedInt:mRequest.invokeID.Value()];
-        } else {
-            params.invokeID = nil;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster resumeActionWithParams:params
-                          completionHandler:^(NSError * _Nullable error) {
-                              responsesNeeded--;
-                              if (error != nil) {
-                                  mError = error;
-                                  LogNSError("Error", error);
-                              }
-                              if (responsesNeeded == 0) {
-                                  SetCommandExitStatus(mError);
-                              }
-                          }];
-        }
-        return CHIP_NO_ERROR;
     }
 
-private:
-    chip::app::Clusters::BridgedActions::Commands::ResumeAction::Type mRequest;
-};
-
-/*
- * Command EnableAction
- */
-class BridgedActionsEnableAction : public ClusterCommand {
-public:
-    BridgedActionsEnableAction()
-        : ClusterCommand("enable-action")
-    {
-        AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
-        AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
-        ClusterCommand::AddArguments();
-    }
+    ~ReadBasicVendorID() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPBridgedActionsClusterEnableActionParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
-        if (mRequest.invokeID.HasValue()) {
-            params.invokeID = [NSNumber numberWithUnsignedInt:mRequest.invokeID.Value()];
-        } else {
-            params.invokeID = nil;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster enableActionWithParams:params
-                          completionHandler:^(NSError * _Nullable error) {
-                              responsesNeeded--;
-                              if (error != nil) {
-                                  mError = error;
-                                  LogNSError("Error", error);
-                              }
-                              if (responsesNeeded == 0) {
-                                  SetCommandExitStatus(mError);
-                              }
-                          }];
-        }
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeVendorIDWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Basic.VendorID response %@", [value description]);
+            if (error != nil) {
+                LogNSError("Basic VendorID read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::BridgedActions::Commands::EnableAction::Type mRequest;
 };
 
-/*
- * Command EnableActionWithDuration
- */
-class BridgedActionsEnableActionWithDuration : public ClusterCommand {
+class SubscribeAttributeBasicVendorID : public SubscribeAttribute {
 public:
-    BridgedActionsEnableActionWithDuration()
-        : ClusterCommand("enable-action-with-duration")
-    {
-        AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
-        AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
-        AddArgument("Duration", 0, UINT32_MAX, &mRequest.duration);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    SubscribeAttributeBasicVendorID()
+        : SubscribeAttribute("vendor-id")
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000009) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPBridgedActionsClusterEnableActionWithDurationParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
-        if (mRequest.invokeID.HasValue()) {
-            params.invokeID = [NSNumber numberWithUnsignedInt:mRequest.invokeID.Value()];
-        } else {
-            params.invokeID = nil;
-        }
-        params.duration = [NSNumber numberWithUnsignedInt:mRequest.duration];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster enableActionWithDurationWithParams:params
-                                      completionHandler:^(NSError * _Nullable error) {
-                                          responsesNeeded--;
-                                          if (error != nil) {
-                                              mError = error;
-                                              LogNSError("Error", error);
-                                          }
-                                          if (responsesNeeded == 0) {
-                                              SetCommandExitStatus(mError);
-                                          }
-                                      }];
-        }
-        return CHIP_NO_ERROR;
     }
 
-private:
-    chip::app::Clusters::BridgedActions::Commands::EnableActionWithDuration::Type mRequest;
-};
-
-/*
- * Command DisableAction
- */
-class BridgedActionsDisableAction : public ClusterCommand {
-public:
-    BridgedActionsDisableAction()
-        : ClusterCommand("disable-action")
-    {
-        AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
-        AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
-        ClusterCommand::AddArguments();
-    }
+    ~SubscribeAttributeBasicVendorID() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x0000000A) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPBridgedActionsClusterDisableActionParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
-        if (mRequest.invokeID.HasValue()) {
-            params.invokeID = [NSNumber numberWithUnsignedInt:mRequest.invokeID.Value()];
-        } else {
-            params.invokeID = nil;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster disableActionWithParams:params
-                           completionHandler:^(NSError * _Nullable error) {
-                               responsesNeeded--;
-                               if (error != nil) {
-                                   mError = error;
-                                   LogNSError("Error", error);
-                               }
-                               if (responsesNeeded == 0) {
-                                   SetCommandExitStatus(mError);
-                               }
-                           }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::BridgedActions::Commands::DisableAction::Type mRequest;
-};
-
-/*
- * Command DisableActionWithDuration
- */
-class BridgedActionsDisableActionWithDuration : public ClusterCommand {
-public:
-    BridgedActionsDisableActionWithDuration()
-        : ClusterCommand("disable-action-with-duration")
-    {
-        AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
-        AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
-        AddArgument("Duration", 0, UINT32_MAX, &mRequest.duration);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x0000000B) on endpoint %u", endpointId);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeVendorIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.VendorID response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPBridgedActionsClusterDisableActionWithDurationParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
-        if (mRequest.invokeID.HasValue()) {
-            params.invokeID = [NSNumber numberWithUnsignedInt:mRequest.invokeID.Value()];
-        } else {
-            params.invokeID = nil;
-        }
-        params.duration = [NSNumber numberWithUnsignedInt:mRequest.duration];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster disableActionWithDurationWithParams:params
-                                       completionHandler:^(NSError * _Nullable error) {
-                                           responsesNeeded--;
-                                           if (error != nil) {
-                                               mError = error;
-                                               LogNSError("Error", error);
-                                           }
-                                           if (responsesNeeded == 0) {
-                                               SetCommandExitStatus(mError);
-                                           }
-                                       }];
-        }
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::BridgedActions::Commands::DisableActionWithDuration::Type mRequest;
 };
 
 /*
- * Attribute ActionList
+ * Attribute ProductName
  */
-class ReadBridgedActionsActionList : public ReadAttribute {
+class ReadBasicProductName : public ReadAttribute {
 public:
-    ReadBridgedActionsActionList()
-        : ReadAttribute("action-list")
+    ReadBasicProductName()
+        : ReadAttribute("product-name")
     {
     }
 
-    ~ReadBridgedActionsActionList() {}
+    ~ReadBasicProductName() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeActionListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedActions.ActionList response %@", [value description]);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeProductNameWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Basic.ProductName response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedActions ActionList read Error", error);
+                LogNSError("Basic ProductName read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -10212,32 +10822,32 @@ class ReadBridgedActionsActionList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedActionsActionList : public SubscribeAttribute {
+class SubscribeAttributeBasicProductName : public SubscribeAttribute {
 public:
-    SubscribeAttributeBridgedActionsActionList()
-        : SubscribeAttribute("action-list")
+    SubscribeAttributeBasicProductName()
+        : SubscribeAttribute("product-name")
     {
     }
 
-    ~SubscribeAttributeBridgedActionsActionList() {}
+    ~SubscribeAttributeBasicProductName() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeActionListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeProductNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedActions.ActionList response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.ProductName response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -10248,27 +10858,27 @@ class SubscribeAttributeBridgedActionsActionList : public SubscribeAttribute {
 };
 
 /*
- * Attribute EndpointList
+ * Attribute ProductID
  */
-class ReadBridgedActionsEndpointList : public ReadAttribute {
+class ReadBasicProductID : public ReadAttribute {
 public:
-    ReadBridgedActionsEndpointList()
-        : ReadAttribute("endpoint-list")
+    ReadBasicProductID()
+        : ReadAttribute("product-id")
     {
     }
 
-    ~ReadBridgedActionsEndpointList() {}
+    ~ReadBasicProductID() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeEndpointListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedActions.EndpointList response %@", [value description]);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeProductIDWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Basic.ProductID response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedActions EndpointList read Error", error);
+                LogNSError("Basic ProductID read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -10276,32 +10886,32 @@ class ReadBridgedActionsEndpointList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedActionsEndpointList : public SubscribeAttribute {
+class SubscribeAttributeBasicProductID : public SubscribeAttribute {
 public:
-    SubscribeAttributeBridgedActionsEndpointList()
-        : SubscribeAttribute("endpoint-list")
+    SubscribeAttributeBasicProductID()
+        : SubscribeAttribute("product-id")
     {
     }
 
-    ~SubscribeAttributeBridgedActionsEndpointList() {}
+    ~SubscribeAttributeBasicProductID() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeEndpointListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeProductIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedActions.EndpointList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.ProductID response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -10312,27 +10922,27 @@ class SubscribeAttributeBridgedActionsEndpointList : public SubscribeAttribute {
 };
 
 /*
- * Attribute SetupUrl
+ * Attribute NodeLabel
  */
-class ReadBridgedActionsSetupUrl : public ReadAttribute {
+class ReadBasicNodeLabel : public ReadAttribute {
 public:
-    ReadBridgedActionsSetupUrl()
-        : ReadAttribute("setup-url")
+    ReadBasicNodeLabel()
+        : ReadAttribute("node-label")
     {
     }
 
-    ~ReadBridgedActionsSetupUrl() {}
+    ~ReadBasicNodeLabel() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeSetupUrlWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedActions.SetupUrl response %@", [value description]);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNodeLabelWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Basic.NodeLabel response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedActions SetupUrl read Error", error);
+                LogNSError("Basic NodeLabel read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -10340,32 +10950,72 @@ class ReadBridgedActionsSetupUrl : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedActionsSetupUrl : public SubscribeAttribute {
+class WriteBasicNodeLabel : public WriteAttribute {
 public:
-    SubscribeAttributeBridgedActionsSetupUrl()
-        : SubscribeAttribute("setup-url")
+    WriteBasicNodeLabel()
+        : WriteAttribute("node-label")
     {
+        AddArgument("attr-name", "node-label");
+        AddArgument("attr-value", &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeBridgedActionsSetupUrl() {}
+    ~WriteBasicNodeLabel() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) WriteAttribute (0x00000005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSString * _Nonnull value = [[NSString alloc] initWithBytes:mValue.data()
+                                                             length:mValue.size()
+                                                           encoding:NSUTF8StringEncoding];
+
+        [cluster writeAttributeNodeLabelWithValue:value
+                                           params:params
+                                completionHandler:^(NSError * _Nullable error) {
+                                    if (error != nil) {
+                                        LogNSError("Basic NodeLabel write Error", error);
+                                    }
+                                    SetCommandExitStatus(error);
+                                }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::ByteSpan mValue;
+};
+
+class SubscribeAttributeBasicNodeLabel : public SubscribeAttribute {
+public:
+    SubscribeAttributeBasicNodeLabel()
+        : SubscribeAttribute("node-label")
+    {
+    }
+
+    ~SubscribeAttributeBasicNodeLabel() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSetupUrlWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNodeLabelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedActions.SetupUrl response %@", [value description]);
+                NSLog(@"Basic.NodeLabel response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -10376,27 +11026,27 @@ class SubscribeAttributeBridgedActionsSetupUrl : public SubscribeAttribute {
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute Location
  */
-class ReadBridgedActionsGeneratedCommandList : public ReadAttribute {
+class ReadBasicLocation : public ReadAttribute {
 public:
-    ReadBridgedActionsGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadBasicLocation()
+        : ReadAttribute("location")
     {
     }
 
-    ~ReadBridgedActionsGeneratedCommandList() {}
+    ~ReadBasicLocation() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000006) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedActions.GeneratedCommandList response %@", [value description]);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeLocationWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Basic.Location response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedActions GeneratedCommandList read Error", error);
+                LogNSError("Basic Location read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -10404,32 +11054,72 @@ class ReadBridgedActionsGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedActionsGeneratedCommandList : public SubscribeAttribute {
+class WriteBasicLocation : public WriteAttribute {
 public:
-    SubscribeAttributeBridgedActionsGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    WriteBasicLocation()
+        : WriteAttribute("location")
     {
+        AddArgument("attr-name", "location");
+        AddArgument("attr-value", &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeBridgedActionsGeneratedCommandList() {}
+    ~WriteBasicLocation() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) WriteAttribute (0x00000006) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSString * _Nonnull value = [[NSString alloc] initWithBytes:mValue.data()
+                                                             length:mValue.size()
+                                                           encoding:NSUTF8StringEncoding];
+
+        [cluster writeAttributeLocationWithValue:value
+                                          params:params
+                               completionHandler:^(NSError * _Nullable error) {
+                                   if (error != nil) {
+                                       LogNSError("Basic Location write Error", error);
+                                   }
+                                   SetCommandExitStatus(error);
+                               }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::ByteSpan mValue;
+};
+
+class SubscribeAttributeBasicLocation : public SubscribeAttribute {
+public:
+    SubscribeAttributeBasicLocation()
+        : SubscribeAttribute("location")
+    {
+    }
+
+    ~SubscribeAttributeBasicLocation() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000006) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeLocationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedActions.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.Location response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -10440,27 +11130,27 @@ class SubscribeAttributeBridgedActionsGeneratedCommandList : public SubscribeAtt
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute HardwareVersion
  */
-class ReadBridgedActionsAcceptedCommandList : public ReadAttribute {
+class ReadBasicHardwareVersion : public ReadAttribute {
 public:
-    ReadBridgedActionsAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadBasicHardwareVersion()
+        : ReadAttribute("hardware-version")
     {
     }
 
-    ~ReadBridgedActionsAcceptedCommandList() {}
+    ~ReadBasicHardwareVersion() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000007) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedActions.AcceptedCommandList response %@", [value description]);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeHardwareVersionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Basic.HardwareVersion response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedActions AcceptedCommandList read Error", error);
+                LogNSError("Basic HardwareVersion read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -10468,32 +11158,32 @@ class ReadBridgedActionsAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedActionsAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeBasicHardwareVersion : public SubscribeAttribute {
 public:
-    SubscribeAttributeBridgedActionsAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeBasicHardwareVersion()
+        : SubscribeAttribute("hardware-version")
     {
     }
 
-    ~SubscribeAttributeBridgedActionsAcceptedCommandList() {}
+    ~SubscribeAttributeBasicHardwareVersion() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000007) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeHardwareVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedActions.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.HardwareVersion response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -10504,27 +11194,27 @@ class SubscribeAttributeBridgedActionsAcceptedCommandList : public SubscribeAttr
 };
 
 /*
- * Attribute AttributeList
+ * Attribute HardwareVersionString
  */
-class ReadBridgedActionsAttributeList : public ReadAttribute {
+class ReadBasicHardwareVersionString : public ReadAttribute {
 public:
-    ReadBridgedActionsAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadBasicHardwareVersionString()
+        : ReadAttribute("hardware-version-string")
     {
     }
 
-    ~ReadBridgedActionsAttributeList() {}
+    ~ReadBasicHardwareVersionString() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000008) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedActions.AttributeList response %@", [value description]);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeHardwareVersionStringWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Basic.HardwareVersionString response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedActions AttributeList read Error", error);
+                LogNSError("Basic HardwareVersionString read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -10532,32 +11222,32 @@ class ReadBridgedActionsAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedActionsAttributeList : public SubscribeAttribute {
+class SubscribeAttributeBasicHardwareVersionString : public SubscribeAttribute {
 public:
-    SubscribeAttributeBridgedActionsAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeBasicHardwareVersionString()
+        : SubscribeAttribute("hardware-version-string")
     {
     }
 
-    ~SubscribeAttributeBridgedActionsAttributeList() {}
+    ~SubscribeAttributeBasicHardwareVersionString() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000008) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeHardwareVersionStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedActions.AttributeList response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.HardwareVersionString response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -10568,27 +11258,27 @@ class SubscribeAttributeBridgedActionsAttributeList : public SubscribeAttribute
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute SoftwareVersion
  */
-class ReadBridgedActionsFeatureMap : public ReadAttribute {
+class ReadBasicSoftwareVersion : public ReadAttribute {
 public:
-    ReadBridgedActionsFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadBasicSoftwareVersion()
+        : ReadAttribute("software-version")
     {
     }
 
-    ~ReadBridgedActionsFeatureMap() {}
+    ~ReadBasicSoftwareVersion() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000009) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedActions.FeatureMap response %@", [value description]);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeSoftwareVersionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Basic.SoftwareVersion response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedActions FeatureMap read Error", error);
+                LogNSError("Basic SoftwareVersion read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -10596,32 +11286,32 @@ class ReadBridgedActionsFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedActionsFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeBasicSoftwareVersion : public SubscribeAttribute {
 public:
-    SubscribeAttributeBridgedActionsFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeBasicSoftwareVersion()
+        : SubscribeAttribute("software-version")
     {
     }
 
-    ~SubscribeAttributeBridgedActionsFeatureMap() {}
+    ~SubscribeAttributeBasicSoftwareVersion() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000009) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSoftwareVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedActions.FeatureMap response %@", [value description]);
+                NSLog(@"Basic.SoftwareVersion response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -10632,27 +11322,27 @@ class SubscribeAttributeBridgedActionsFeatureMap : public SubscribeAttribute {
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute SoftwareVersionString
  */
-class ReadBridgedActionsClusterRevision : public ReadAttribute {
+class ReadBasicSoftwareVersionString : public ReadAttribute {
 public:
-    ReadBridgedActionsClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadBasicSoftwareVersionString()
+        : ReadAttribute("software-version-string")
     {
     }
 
-    ~ReadBridgedActionsClusterRevision() {}
+    ~ReadBasicSoftwareVersionString() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x0000000A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedActions.ClusterRevision response %@", [value description]);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeSoftwareVersionStringWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Basic.SoftwareVersionString response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedActions ClusterRevision read Error", error);
+                LogNSError("Basic SoftwareVersionString read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -10660,32 +11350,32 @@ class ReadBridgedActionsClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedActionsClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeBasicSoftwareVersionString : public SubscribeAttribute {
 public:
-    SubscribeAttributeBridgedActionsClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeBasicSoftwareVersionString()
+        : SubscribeAttribute("software-version-string")
     {
     }
 
-    ~SubscribeAttributeBridgedActionsClusterRevision() {}
+    ~SubscribeAttributeBasicSoftwareVersionString() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x0000000A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSoftwareVersionStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedActions.ClusterRevision response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.SoftwareVersionString response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -10695,64 +11385,28 @@ class SubscribeAttributeBridgedActionsClusterRevision : public SubscribeAttribut
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster BridgedDeviceBasic                                          | 0x0039 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * VendorName                                                        | 0x0001 |
-| * VendorID                                                          | 0x0002 |
-| * ProductName                                                       | 0x0003 |
-| * NodeLabel                                                         | 0x0005 |
-| * HardwareVersion                                                   | 0x0007 |
-| * HardwareVersionString                                             | 0x0008 |
-| * SoftwareVersion                                                   | 0x0009 |
-| * SoftwareVersionString                                             | 0x000A |
-| * ManufacturingDate                                                 | 0x000B |
-| * PartNumber                                                        | 0x000C |
-| * ProductURL                                                        | 0x000D |
-| * ProductLabel                                                      | 0x000E |
-| * SerialNumber                                                      | 0x000F |
-| * Reachable                                                         | 0x0011 |
-| * UniqueID                                                          | 0x0012 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-| * StartUp                                                           | 0x0000 |
-| * ShutDown                                                          | 0x0001 |
-| * Leave                                                             | 0x0002 |
-| * ReachableChanged                                                  | 0x0003 |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Attribute VendorName
+ * Attribute ManufacturingDate
  */
-class ReadBridgedDeviceBasicVendorName : public ReadAttribute {
+class ReadBasicManufacturingDate : public ReadAttribute {
 public:
-    ReadBridgedDeviceBasicVendorName()
-        : ReadAttribute("vendor-name")
+    ReadBasicManufacturingDate()
+        : ReadAttribute("manufacturing-date")
     {
     }
 
-    ~ReadBridgedDeviceBasicVendorName() {}
+    ~ReadBasicManufacturingDate() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x0000000B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeVendorNameWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedDeviceBasic.VendorName response %@", [value description]);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeManufacturingDateWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Basic.ManufacturingDate response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedDeviceBasic VendorName read Error", error);
+                LogNSError("Basic ManufacturingDate read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -10760,34 +11414,32 @@ class ReadBridgedDeviceBasicVendorName : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedDeviceBasicVendorName : public SubscribeAttribute {
+class SubscribeAttributeBasicManufacturingDate : public SubscribeAttribute {
 public:
-    SubscribeAttributeBridgedDeviceBasicVendorName()
-        : SubscribeAttribute("vendor-name")
+    SubscribeAttributeBasicManufacturingDate()
+        : SubscribeAttribute("manufacturing-date")
     {
     }
 
-    ~SubscribeAttributeBridgedDeviceBasicVendorName() {}
+    ~SubscribeAttributeBasicManufacturingDate() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x0000000B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeVendorNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeManufacturingDateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedDeviceBasic.VendorName response %@", [value description]);
+                NSLog(@"Basic.ManufacturingDate response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -10798,29 +11450,27 @@ class SubscribeAttributeBridgedDeviceBasicVendorName : public SubscribeAttribute
 };
 
 /*
- * Attribute VendorID
+ * Attribute PartNumber
  */
-class ReadBridgedDeviceBasicVendorID : public ReadAttribute {
+class ReadBasicPartNumber : public ReadAttribute {
 public:
-    ReadBridgedDeviceBasicVendorID()
-        : ReadAttribute("vendor-id")
+    ReadBasicPartNumber()
+        : ReadAttribute("part-number")
     {
     }
 
-    ~ReadBridgedDeviceBasicVendorID() {}
+    ~ReadBasicPartNumber() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x0000000C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeVendorIDWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedDeviceBasic.VendorID response %@", [value description]);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributePartNumberWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Basic.PartNumber response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedDeviceBasic VendorID read Error", error);
+                LogNSError("Basic PartNumber read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -10828,34 +11478,32 @@ class ReadBridgedDeviceBasicVendorID : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedDeviceBasicVendorID : public SubscribeAttribute {
+class SubscribeAttributeBasicPartNumber : public SubscribeAttribute {
 public:
-    SubscribeAttributeBridgedDeviceBasicVendorID()
-        : SubscribeAttribute("vendor-id")
+    SubscribeAttributeBasicPartNumber()
+        : SubscribeAttribute("part-number")
     {
     }
 
-    ~SubscribeAttributeBridgedDeviceBasicVendorID() {}
+    ~SubscribeAttributeBasicPartNumber() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x0000000C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeVendorIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePartNumberWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedDeviceBasic.VendorID response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.PartNumber response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -10866,29 +11514,27 @@ class SubscribeAttributeBridgedDeviceBasicVendorID : public SubscribeAttribute {
 };
 
 /*
- * Attribute ProductName
+ * Attribute ProductURL
  */
-class ReadBridgedDeviceBasicProductName : public ReadAttribute {
+class ReadBasicProductURL : public ReadAttribute {
 public:
-    ReadBridgedDeviceBasicProductName()
-        : ReadAttribute("product-name")
+    ReadBasicProductURL()
+        : ReadAttribute("product-url")
     {
     }
 
-    ~ReadBridgedDeviceBasicProductName() {}
+    ~ReadBasicProductURL() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x0000000D) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeProductNameWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedDeviceBasic.ProductName response %@", [value description]);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeProductURLWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Basic.ProductURL response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedDeviceBasic ProductName read Error", error);
+                LogNSError("Basic ProductURL read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -10896,34 +11542,32 @@ class ReadBridgedDeviceBasicProductName : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedDeviceBasicProductName : public SubscribeAttribute {
+class SubscribeAttributeBasicProductURL : public SubscribeAttribute {
 public:
-    SubscribeAttributeBridgedDeviceBasicProductName()
-        : SubscribeAttribute("product-name")
+    SubscribeAttributeBasicProductURL()
+        : SubscribeAttribute("product-url")
     {
     }
 
-    ~SubscribeAttributeBridgedDeviceBasicProductName() {}
+    ~SubscribeAttributeBasicProductURL() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x0000000D) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeProductNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeProductURLWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedDeviceBasic.ProductName response %@", [value description]);
+                NSLog(@"Basic.ProductURL response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -10934,29 +11578,27 @@ class SubscribeAttributeBridgedDeviceBasicProductName : public SubscribeAttribut
 };
 
 /*
- * Attribute NodeLabel
+ * Attribute ProductLabel
  */
-class ReadBridgedDeviceBasicNodeLabel : public ReadAttribute {
+class ReadBasicProductLabel : public ReadAttribute {
 public:
-    ReadBridgedDeviceBasicNodeLabel()
-        : ReadAttribute("node-label")
+    ReadBasicProductLabel()
+        : ReadAttribute("product-label")
     {
     }
 
-    ~ReadBridgedDeviceBasicNodeLabel() {}
+    ~ReadBasicProductLabel() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x0000000E) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeNodeLabelWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedDeviceBasic.NodeLabel response %@", [value description]);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeProductLabelWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Basic.ProductLabel response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedDeviceBasic NodeLabel read Error", error);
+                LogNSError("Basic ProductLabel read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -10964,76 +11606,32 @@ class ReadBridgedDeviceBasicNodeLabel : public ReadAttribute {
     }
 };
 
-class WriteBridgedDeviceBasicNodeLabel : public WriteAttribute {
-public:
-    WriteBridgedDeviceBasicNodeLabel()
-        : WriteAttribute("node-label")
-    {
-        AddArgument("attr-name", "node-label");
-        AddArgument("attr-value", &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteBridgedDeviceBasicNodeLabel() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) WriteAttribute (0x00000005) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSString * _Nonnull value = [[NSString alloc] initWithBytes:mValue.data()
-                                                             length:mValue.size()
-                                                           encoding:NSUTF8StringEncoding];
-
-        [cluster writeAttributeNodeLabelWithValue:value
-                                           params:params
-                                completionHandler:^(NSError * _Nullable error) {
-                                    if (error != nil) {
-                                        LogNSError("BridgedDeviceBasic NodeLabel write Error", error);
-                                    }
-                                    SetCommandExitStatus(error);
-                                }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::ByteSpan mValue;
-};
-
-class SubscribeAttributeBridgedDeviceBasicNodeLabel : public SubscribeAttribute {
+class SubscribeAttributeBasicProductLabel : public SubscribeAttribute {
 public:
-    SubscribeAttributeBridgedDeviceBasicNodeLabel()
-        : SubscribeAttribute("node-label")
+    SubscribeAttributeBasicProductLabel()
+        : SubscribeAttribute("product-label")
     {
     }
 
-    ~SubscribeAttributeBridgedDeviceBasicNodeLabel() {}
+    ~SubscribeAttributeBasicProductLabel() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x0000000E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNodeLabelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeProductLabelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedDeviceBasic.NodeLabel response %@", [value description]);
+                NSLog(@"Basic.ProductLabel response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -11044,29 +11642,27 @@ class SubscribeAttributeBridgedDeviceBasicNodeLabel : public SubscribeAttribute
 };
 
 /*
- * Attribute HardwareVersion
+ * Attribute SerialNumber
  */
-class ReadBridgedDeviceBasicHardwareVersion : public ReadAttribute {
+class ReadBasicSerialNumber : public ReadAttribute {
 public:
-    ReadBridgedDeviceBasicHardwareVersion()
-        : ReadAttribute("hardware-version")
+    ReadBasicSerialNumber()
+        : ReadAttribute("serial-number")
     {
     }
 
-    ~ReadBridgedDeviceBasicHardwareVersion() {}
+    ~ReadBasicSerialNumber() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x0000000F) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeHardwareVersionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedDeviceBasic.HardwareVersion response %@", [value description]);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeSerialNumberWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Basic.SerialNumber response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedDeviceBasic HardwareVersion read Error", error);
+                LogNSError("Basic SerialNumber read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -11074,34 +11670,32 @@ class ReadBridgedDeviceBasicHardwareVersion : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedDeviceBasicHardwareVersion : public SubscribeAttribute {
+class SubscribeAttributeBasicSerialNumber : public SubscribeAttribute {
 public:
-    SubscribeAttributeBridgedDeviceBasicHardwareVersion()
-        : SubscribeAttribute("hardware-version")
+    SubscribeAttributeBasicSerialNumber()
+        : SubscribeAttribute("serial-number")
     {
     }
 
-    ~SubscribeAttributeBridgedDeviceBasicHardwareVersion() {}
+    ~SubscribeAttributeBasicSerialNumber() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x0000000F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeHardwareVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSerialNumberWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedDeviceBasic.HardwareVersion response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.SerialNumber response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -11112,29 +11706,27 @@ class SubscribeAttributeBridgedDeviceBasicHardwareVersion : public SubscribeAttr
 };
 
 /*
- * Attribute HardwareVersionString
+ * Attribute LocalConfigDisabled
  */
-class ReadBridgedDeviceBasicHardwareVersionString : public ReadAttribute {
+class ReadBasicLocalConfigDisabled : public ReadAttribute {
 public:
-    ReadBridgedDeviceBasicHardwareVersionString()
-        : ReadAttribute("hardware-version-string")
+    ReadBasicLocalConfigDisabled()
+        : ReadAttribute("local-config-disabled")
     {
     }
 
-    ~ReadBridgedDeviceBasicHardwareVersionString() {}
+    ~ReadBasicLocalConfigDisabled() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000010) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeHardwareVersionStringWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedDeviceBasic.HardwareVersionString response %@", [value description]);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeLocalConfigDisabledWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Basic.LocalConfigDisabled response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedDeviceBasic HardwareVersionString read Error", error);
+                LogNSError("Basic LocalConfigDisabled read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -11142,102 +11734,70 @@ class ReadBridgedDeviceBasicHardwareVersionString : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedDeviceBasicHardwareVersionString : public SubscribeAttribute {
+class WriteBasicLocalConfigDisabled : public WriteAttribute {
 public:
-    SubscribeAttributeBridgedDeviceBasicHardwareVersionString()
-        : SubscribeAttribute("hardware-version-string")
+    WriteBasicLocalConfigDisabled()
+        : WriteAttribute("local-config-disabled")
     {
+        AddArgument("attr-name", "local-config-disabled");
+        AddArgument("attr-value", 0, 1, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeBridgedDeviceBasicHardwareVersionString() {}
+    ~WriteBasicLocalConfigDisabled() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) WriteAttribute (0x00000010) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeHardwareVersionStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedDeviceBasic.HardwareVersionString response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
 
+        [cluster writeAttributeLocalConfigDisabledWithValue:value
+                                                     params:params
+                                          completionHandler:^(NSError * _Nullable error) {
+                                              if (error != nil) {
+                                                  LogNSError("Basic LocalConfigDisabled write Error", error);
+                                              }
+                                              SetCommandExitStatus(error);
+                                          }];
         return CHIP_NO_ERROR;
     }
-};
-
-/*
- * Attribute SoftwareVersion
- */
-class ReadBridgedDeviceBasicSoftwareVersion : public ReadAttribute {
-public:
-    ReadBridgedDeviceBasicSoftwareVersion()
-        : ReadAttribute("software-version")
-    {
-    }
-
-    ~ReadBridgedDeviceBasicSoftwareVersion() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000009) on endpoint %u", endpointId);
 
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeSoftwareVersionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedDeviceBasic.SoftwareVersion response %@", [value description]);
-            if (error != nil) {
-                LogNSError("BridgedDeviceBasic SoftwareVersion read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
+private:
+    bool mValue;
 };
 
-class SubscribeAttributeBridgedDeviceBasicSoftwareVersion : public SubscribeAttribute {
+class SubscribeAttributeBasicLocalConfigDisabled : public SubscribeAttribute {
 public:
-    SubscribeAttributeBridgedDeviceBasicSoftwareVersion()
-        : SubscribeAttribute("software-version")
+    SubscribeAttributeBasicLocalConfigDisabled()
+        : SubscribeAttribute("local-config-disabled")
     {
     }
 
-    ~SubscribeAttributeBridgedDeviceBasicSoftwareVersion() {}
+    ~SubscribeAttributeBasicLocalConfigDisabled() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000010) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSoftwareVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeLocalConfigDisabledWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedDeviceBasic.SoftwareVersion response %@", [value description]);
+                NSLog(@"Basic.LocalConfigDisabled response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -11248,29 +11808,27 @@ class SubscribeAttributeBridgedDeviceBasicSoftwareVersion : public SubscribeAttr
 };
 
 /*
- * Attribute SoftwareVersionString
+ * Attribute Reachable
  */
-class ReadBridgedDeviceBasicSoftwareVersionString : public ReadAttribute {
+class ReadBasicReachable : public ReadAttribute {
 public:
-    ReadBridgedDeviceBasicSoftwareVersionString()
-        : ReadAttribute("software-version-string")
+    ReadBasicReachable()
+        : ReadAttribute("reachable")
     {
     }
 
-    ~ReadBridgedDeviceBasicSoftwareVersionString() {}
+    ~ReadBasicReachable() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000000A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000011) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeSoftwareVersionStringWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedDeviceBasic.SoftwareVersionString response %@", [value description]);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeReachableWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Basic.Reachable response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedDeviceBasic SoftwareVersionString read Error", error);
+                LogNSError("Basic Reachable read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -11278,34 +11836,32 @@ class ReadBridgedDeviceBasicSoftwareVersionString : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedDeviceBasicSoftwareVersionString : public SubscribeAttribute {
+class SubscribeAttributeBasicReachable : public SubscribeAttribute {
 public:
-    SubscribeAttributeBridgedDeviceBasicSoftwareVersionString()
-        : SubscribeAttribute("software-version-string")
+    SubscribeAttributeBasicReachable()
+        : SubscribeAttribute("reachable")
     {
     }
 
-    ~SubscribeAttributeBridgedDeviceBasicSoftwareVersionString() {}
+    ~SubscribeAttributeBasicReachable() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000000A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000011) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSoftwareVersionStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeReachableWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedDeviceBasic.SoftwareVersionString response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.Reachable response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -11316,29 +11872,27 @@ class SubscribeAttributeBridgedDeviceBasicSoftwareVersionString : public Subscri
 };
 
 /*
- * Attribute ManufacturingDate
+ * Attribute UniqueID
  */
-class ReadBridgedDeviceBasicManufacturingDate : public ReadAttribute {
+class ReadBasicUniqueID : public ReadAttribute {
 public:
-    ReadBridgedDeviceBasicManufacturingDate()
-        : ReadAttribute("manufacturing-date")
+    ReadBasicUniqueID()
+        : ReadAttribute("unique-id")
     {
     }
 
-    ~ReadBridgedDeviceBasicManufacturingDate() {}
+    ~ReadBasicUniqueID() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000000B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000012) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeManufacturingDateWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedDeviceBasic.ManufacturingDate response %@", [value description]);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeUniqueIDWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Basic.UniqueID response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedDeviceBasic ManufacturingDate read Error", error);
+                LogNSError("Basic UniqueID read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -11346,34 +11900,32 @@ class ReadBridgedDeviceBasicManufacturingDate : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedDeviceBasicManufacturingDate : public SubscribeAttribute {
+class SubscribeAttributeBasicUniqueID : public SubscribeAttribute {
 public:
-    SubscribeAttributeBridgedDeviceBasicManufacturingDate()
-        : SubscribeAttribute("manufacturing-date")
+    SubscribeAttributeBasicUniqueID()
+        : SubscribeAttribute("unique-id")
     {
     }
 
-    ~SubscribeAttributeBridgedDeviceBasicManufacturingDate() {}
+    ~SubscribeAttributeBasicUniqueID() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000000B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000012) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeManufacturingDateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeUniqueIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedDeviceBasic.ManufacturingDate response %@", [value description]);
+                NSLog(@"Basic.UniqueID response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -11384,29 +11936,28 @@ class SubscribeAttributeBridgedDeviceBasicManufacturingDate : public SubscribeAt
 };
 
 /*
- * Attribute PartNumber
+ * Attribute CapabilityMinima
  */
-class ReadBridgedDeviceBasicPartNumber : public ReadAttribute {
+class ReadBasicCapabilityMinima : public ReadAttribute {
 public:
-    ReadBridgedDeviceBasicPartNumber()
-        : ReadAttribute("part-number")
+    ReadBasicCapabilityMinima()
+        : ReadAttribute("capability-minima")
     {
     }
 
-    ~ReadBridgedDeviceBasicPartNumber() {}
+    ~ReadBasicCapabilityMinima() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000000C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000013) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributePartNumberWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedDeviceBasic.PartNumber response %@", [value description]);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCapabilityMinimaWithCompletionHandler:^(
+            CHIPBasicClusterCapabilityMinimaStruct * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Basic.CapabilityMinima response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedDeviceBasic PartNumber read Error", error);
+                LogNSError("Basic CapabilityMinima read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -11414,34 +11965,32 @@ class ReadBridgedDeviceBasicPartNumber : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedDeviceBasicPartNumber : public SubscribeAttribute {
+class SubscribeAttributeBasicCapabilityMinima : public SubscribeAttribute {
 public:
-    SubscribeAttributeBridgedDeviceBasicPartNumber()
-        : SubscribeAttribute("part-number")
+    SubscribeAttributeBasicCapabilityMinima()
+        : SubscribeAttribute("capability-minima")
     {
     }
 
-    ~SubscribeAttributeBridgedDeviceBasicPartNumber() {}
+    ~SubscribeAttributeBasicCapabilityMinima() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000000C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000013) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePartNumberWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCapabilityMinimaWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedDeviceBasic.PartNumber response %@", [value description]);
+            reportHandler:^(CHIPBasicClusterCapabilityMinimaStruct * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.CapabilityMinima response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -11452,29 +12001,27 @@ class SubscribeAttributeBridgedDeviceBasicPartNumber : public SubscribeAttribute
 };
 
 /*
- * Attribute ProductURL
+ * Attribute GeneratedCommandList
  */
-class ReadBridgedDeviceBasicProductURL : public ReadAttribute {
+class ReadBasicGeneratedCommandList : public ReadAttribute {
 public:
-    ReadBridgedDeviceBasicProductURL()
-        : ReadAttribute("product-url")
+    ReadBasicGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadBridgedDeviceBasicProductURL() {}
+    ~ReadBasicGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000000D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeProductURLWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedDeviceBasic.ProductURL response %@", [value description]);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Basic.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedDeviceBasic ProductURL read Error", error);
+                LogNSError("Basic GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -11482,34 +12029,32 @@ class ReadBridgedDeviceBasicProductURL : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedDeviceBasicProductURL : public SubscribeAttribute {
+class SubscribeAttributeBasicGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBridgedDeviceBasicProductURL()
-        : SubscribeAttribute("product-url")
+    SubscribeAttributeBasicGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeBridgedDeviceBasicProductURL() {}
+    ~SubscribeAttributeBasicGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000000D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeProductURLWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedDeviceBasic.ProductURL response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -11520,29 +12065,27 @@ class SubscribeAttributeBridgedDeviceBasicProductURL : public SubscribeAttribute
 };
 
 /*
- * Attribute ProductLabel
+ * Attribute AcceptedCommandList
  */
-class ReadBridgedDeviceBasicProductLabel : public ReadAttribute {
+class ReadBasicAcceptedCommandList : public ReadAttribute {
 public:
-    ReadBridgedDeviceBasicProductLabel()
-        : ReadAttribute("product-label")
+    ReadBasicAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadBridgedDeviceBasicProductLabel() {}
+    ~ReadBasicAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000000E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeProductLabelWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedDeviceBasic.ProductLabel response %@", [value description]);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Basic.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedDeviceBasic ProductLabel read Error", error);
+                LogNSError("Basic AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -11550,34 +12093,32 @@ class ReadBridgedDeviceBasicProductLabel : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedDeviceBasicProductLabel : public SubscribeAttribute {
+class SubscribeAttributeBasicAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBridgedDeviceBasicProductLabel()
-        : SubscribeAttribute("product-label")
+    SubscribeAttributeBasicAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeBridgedDeviceBasicProductLabel() {}
+    ~SubscribeAttributeBasicAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000000E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeProductLabelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedDeviceBasic.ProductLabel response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -11588,29 +12129,27 @@ class SubscribeAttributeBridgedDeviceBasicProductLabel : public SubscribeAttribu
 };
 
 /*
- * Attribute SerialNumber
+ * Attribute AttributeList
  */
-class ReadBridgedDeviceBasicSerialNumber : public ReadAttribute {
+class ReadBasicAttributeList : public ReadAttribute {
 public:
-    ReadBridgedDeviceBasicSerialNumber()
-        : ReadAttribute("serial-number")
+    ReadBasicAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadBridgedDeviceBasicSerialNumber() {}
+    ~ReadBasicAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000000F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeSerialNumberWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedDeviceBasic.SerialNumber response %@", [value description]);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Basic.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedDeviceBasic SerialNumber read Error", error);
+                LogNSError("Basic AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -11618,34 +12157,32 @@ class ReadBridgedDeviceBasicSerialNumber : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedDeviceBasicSerialNumber : public SubscribeAttribute {
+class SubscribeAttributeBasicAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBridgedDeviceBasicSerialNumber()
-        : SubscribeAttribute("serial-number")
+    SubscribeAttributeBasicAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeBridgedDeviceBasicSerialNumber() {}
+    ~SubscribeAttributeBasicAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000000F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSerialNumberWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedDeviceBasic.SerialNumber response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -11656,29 +12193,27 @@ class SubscribeAttributeBridgedDeviceBasicSerialNumber : public SubscribeAttribu
 };
 
 /*
- * Attribute Reachable
+ * Attribute FeatureMap
  */
-class ReadBridgedDeviceBasicReachable : public ReadAttribute {
+class ReadBasicFeatureMap : public ReadAttribute {
 public:
-    ReadBridgedDeviceBasicReachable()
-        : ReadAttribute("reachable")
+    ReadBasicFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadBridgedDeviceBasicReachable() {}
+    ~ReadBasicFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeReachableWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedDeviceBasic.Reachable response %@", [value description]);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Basic.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedDeviceBasic Reachable read Error", error);
+                LogNSError("Basic FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -11686,34 +12221,32 @@ class ReadBridgedDeviceBasicReachable : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedDeviceBasicReachable : public SubscribeAttribute {
+class SubscribeAttributeBasicFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeBridgedDeviceBasicReachable()
-        : SubscribeAttribute("reachable")
+    SubscribeAttributeBasicFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeBridgedDeviceBasicReachable() {}
+    ~SubscribeAttributeBasicFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeReachableWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedDeviceBasic.Reachable response %@", [value description]);
+                NSLog(@"Basic.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -11724,29 +12257,27 @@ class SubscribeAttributeBridgedDeviceBasicReachable : public SubscribeAttribute
 };
 
 /*
- * Attribute UniqueID
+ * Attribute ClusterRevision
  */
-class ReadBridgedDeviceBasicUniqueID : public ReadAttribute {
+class ReadBasicClusterRevision : public ReadAttribute {
 public:
-    ReadBridgedDeviceBasicUniqueID()
-        : ReadAttribute("unique-id")
+    ReadBasicClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadBridgedDeviceBasicUniqueID() {}
+    ~ReadBasicClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeUniqueIDWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedDeviceBasic.UniqueID response %@", [value description]);
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Basic.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedDeviceBasic UniqueID read Error", error);
+                LogNSError("Basic ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -11754,34 +12285,32 @@ class ReadBridgedDeviceBasicUniqueID : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedDeviceBasicUniqueID : public SubscribeAttribute {
+class SubscribeAttributeBasicClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeBridgedDeviceBasicUniqueID()
-        : SubscribeAttribute("unique-id")
+    SubscribeAttributeBasicClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeBridgedDeviceBasicUniqueID() {}
+    ~SubscribeAttributeBasicClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeUniqueIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedDeviceBasic.UniqueID response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Basic.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -11791,30 +12320,239 @@ class SubscribeAttributeBridgedDeviceBasicUniqueID : public SubscribeAttribute {
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster OtaSoftwareUpdateProvider                                   | 0x0029 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * QueryImage                                                        |   0x00 |
+| * ApplyUpdateRequest                                                |   0x02 |
+| * NotifyUpdateApplied                                               |   0x04 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute GeneratedCommandList
+ * Command QueryImage
  */
-class ReadBridgedDeviceBasicGeneratedCommandList : public ReadAttribute {
+class OtaSoftwareUpdateProviderQueryImage : public ClusterCommand {
 public:
-    ReadBridgedDeviceBasicGeneratedCommandList()
+    OtaSoftwareUpdateProviderQueryImage()
+        : ClusterCommand("query-image")
+        , mComplex_ProtocolsSupported(&mRequest.protocolsSupported)
+    {
+        AddArgument("VendorId", 0, UINT16_MAX, &mRequest.vendorId);
+        AddArgument("ProductId", 0, UINT16_MAX, &mRequest.productId);
+        AddArgument("SoftwareVersion", 0, UINT32_MAX, &mRequest.softwareVersion);
+        AddArgument("ProtocolsSupported", &mComplex_ProtocolsSupported);
+        AddArgument("HardwareVersion", 0, UINT16_MAX, &mRequest.hardwareVersion);
+        AddArgument("Location", &mRequest.location);
+        AddArgument("RequestorCanConsent", 0, 1, &mRequest.requestorCanConsent);
+        AddArgument("MetadataForProvider", &mRequest.metadataForProvider);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000029) command (0x00000000) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
+        __auto_type * params = [[CHIPOtaSoftwareUpdateProviderClusterQueryImageParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.vendorId = [NSNumber numberWithUnsignedShort:chip::to_underlying(mRequest.vendorId)];
+        params.productId = [NSNumber numberWithUnsignedShort:mRequest.productId];
+        params.softwareVersion = [NSNumber numberWithUnsignedInt:mRequest.softwareVersion];
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mRequest.protocolsSupported) {
+                NSNumber * newElement_0;
+                newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
+                [array_0 addObject:newElement_0];
+            }
+            params.protocolsSupported = array_0;
+        }
+        if (mRequest.hardwareVersion.HasValue()) {
+            params.hardwareVersion = [NSNumber numberWithUnsignedShort:mRequest.hardwareVersion.Value()];
+        } else {
+            params.hardwareVersion = nil;
+        }
+        if (mRequest.location.HasValue()) {
+            params.location = [[NSString alloc] initWithBytes:mRequest.location.Value().data()
+                                                       length:mRequest.location.Value().size()
+                                                     encoding:NSUTF8StringEncoding];
+        } else {
+            params.location = nil;
+        }
+        if (mRequest.requestorCanConsent.HasValue()) {
+            params.requestorCanConsent = [NSNumber numberWithBool:mRequest.requestorCanConsent.Value()];
+        } else {
+            params.requestorCanConsent = nil;
+        }
+        if (mRequest.metadataForProvider.HasValue()) {
+            params.metadataForProvider = [NSData dataWithBytes:mRequest.metadataForProvider.Value().data()
+                                                        length:mRequest.metadataForProvider.Value().size()];
+        } else {
+            params.metadataForProvider = nil;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster queryImageWithParams:params
+                        completionHandler:^(CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseParams * _Nullable values,
+                            NSError * _Nullable error) {
+                            NSLog(@"Values: %@", values);
+                            responsesNeeded--;
+                            if (error != nil) {
+                                mError = error;
+                                LogNSError("Error", error);
+                            }
+                            if (responsesNeeded == 0) {
+                                SetCommandExitStatus(mError);
+                            }
+                        }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImage::Type mRequest;
+    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::OtaSoftwareUpdateProvider::OTADownloadProtocol>>
+        mComplex_ProtocolsSupported;
+};
+
+/*
+ * Command ApplyUpdateRequest
+ */
+class OtaSoftwareUpdateProviderApplyUpdateRequest : public ClusterCommand {
+public:
+    OtaSoftwareUpdateProviderApplyUpdateRequest()
+        : ClusterCommand("apply-update-request")
+    {
+        AddArgument("UpdateToken", &mRequest.updateToken);
+        AddArgument("NewVersion", 0, UINT32_MAX, &mRequest.newVersion);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000029) command (0x00000002) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
+        __auto_type * params = [[CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.updateToken = [NSData dataWithBytes:mRequest.updateToken.data() length:mRequest.updateToken.size()];
+        params.newVersion = [NSNumber numberWithUnsignedInt:mRequest.newVersion];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster
+                applyUpdateRequestWithParams:params
+                           completionHandler:^(CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseParams * _Nullable values,
+                               NSError * _Nullable error) {
+                               NSLog(@"Values: %@", values);
+                               responsesNeeded--;
+                               if (error != nil) {
+                                   mError = error;
+                                   LogNSError("Error", error);
+                               }
+                               if (responsesNeeded == 0) {
+                                   SetCommandExitStatus(mError);
+                               }
+                           }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateRequest::Type mRequest;
+};
+
+/*
+ * Command NotifyUpdateApplied
+ */
+class OtaSoftwareUpdateProviderNotifyUpdateApplied : public ClusterCommand {
+public:
+    OtaSoftwareUpdateProviderNotifyUpdateApplied()
+        : ClusterCommand("notify-update-applied")
+    {
+        AddArgument("UpdateToken", &mRequest.updateToken);
+        AddArgument("SoftwareVersion", 0, UINT32_MAX, &mRequest.softwareVersion);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000029) command (0x00000004) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
+        __auto_type * params = [[CHIPOtaSoftwareUpdateProviderClusterNotifyUpdateAppliedParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.updateToken = [NSData dataWithBytes:mRequest.updateToken.data() length:mRequest.updateToken.size()];
+        params.softwareVersion = [NSNumber numberWithUnsignedInt:mRequest.softwareVersion];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster notifyUpdateAppliedWithParams:params
+                                 completionHandler:^(NSError * _Nullable error) {
+                                     responsesNeeded--;
+                                     if (error != nil) {
+                                         mError = error;
+                                         LogNSError("Error", error);
+                                     }
+                                     if (responsesNeeded == 0) {
+                                         SetCommandExitStatus(mError);
+                                     }
+                                 }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::NotifyUpdateApplied::Type mRequest;
+};
+
+/*
+ * Attribute GeneratedCommandList
+ */
+class ReadOtaSoftwareUpdateProviderGeneratedCommandList : public ReadAttribute {
+public:
+    ReadOtaSoftwareUpdateProviderGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadBridgedDeviceBasicGeneratedCommandList() {}
+    ~ReadOtaSoftwareUpdateProviderGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000029) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedDeviceBasic.GeneratedCommandList response %@", [value description]);
+            NSLog(@"OtaSoftwareUpdateProvider.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedDeviceBasic GeneratedCommandList read Error", error);
+                LogNSError("OtaSoftwareUpdateProvider GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -11822,22 +12560,22 @@ class ReadBridgedDeviceBasicGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedDeviceBasicGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeOtaSoftwareUpdateProviderGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBridgedDeviceBasicGeneratedCommandList()
+    SubscribeAttributeOtaSoftwareUpdateProviderGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeBridgedDeviceBasicGeneratedCommandList() {}
+    ~SubscribeAttributeOtaSoftwareUpdateProviderGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000029) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -11849,7 +12587,7 @@ class SubscribeAttributeBridgedDeviceBasicGeneratedCommandList : public Subscrib
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedDeviceBasic.GeneratedCommandList response %@", [value description]);
+                NSLog(@"OtaSoftwareUpdateProvider.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -11862,27 +12600,27 @@ class SubscribeAttributeBridgedDeviceBasicGeneratedCommandList : public Subscrib
 /*
  * Attribute AcceptedCommandList
  */
-class ReadBridgedDeviceBasicAcceptedCommandList : public ReadAttribute {
+class ReadOtaSoftwareUpdateProviderAcceptedCommandList : public ReadAttribute {
 public:
-    ReadBridgedDeviceBasicAcceptedCommandList()
+    ReadOtaSoftwareUpdateProviderAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadBridgedDeviceBasicAcceptedCommandList() {}
+    ~ReadOtaSoftwareUpdateProviderAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000029) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedDeviceBasic.AcceptedCommandList response %@", [value description]);
+            NSLog(@"OtaSoftwareUpdateProvider.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedDeviceBasic AcceptedCommandList read Error", error);
+                LogNSError("OtaSoftwareUpdateProvider AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -11890,22 +12628,22 @@ class ReadBridgedDeviceBasicAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedDeviceBasicAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeOtaSoftwareUpdateProviderAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBridgedDeviceBasicAcceptedCommandList()
+    SubscribeAttributeOtaSoftwareUpdateProviderAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeBridgedDeviceBasicAcceptedCommandList() {}
+    ~SubscribeAttributeOtaSoftwareUpdateProviderAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000029) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -11917,7 +12655,7 @@ class SubscribeAttributeBridgedDeviceBasicAcceptedCommandList : public Subscribe
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedDeviceBasic.AcceptedCommandList response %@", [value description]);
+                NSLog(@"OtaSoftwareUpdateProvider.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -11930,27 +12668,27 @@ class SubscribeAttributeBridgedDeviceBasicAcceptedCommandList : public Subscribe
 /*
  * Attribute AttributeList
  */
-class ReadBridgedDeviceBasicAttributeList : public ReadAttribute {
+class ReadOtaSoftwareUpdateProviderAttributeList : public ReadAttribute {
 public:
-    ReadBridgedDeviceBasicAttributeList()
+    ReadOtaSoftwareUpdateProviderAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadBridgedDeviceBasicAttributeList() {}
+    ~ReadOtaSoftwareUpdateProviderAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000029) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedDeviceBasic.AttributeList response %@", [value description]);
+            NSLog(@"OtaSoftwareUpdateProvider.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedDeviceBasic AttributeList read Error", error);
+                LogNSError("OtaSoftwareUpdateProvider AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -11958,22 +12696,22 @@ class ReadBridgedDeviceBasicAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedDeviceBasicAttributeList : public SubscribeAttribute {
+class SubscribeAttributeOtaSoftwareUpdateProviderAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeBridgedDeviceBasicAttributeList()
+    SubscribeAttributeOtaSoftwareUpdateProviderAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeBridgedDeviceBasicAttributeList() {}
+    ~SubscribeAttributeOtaSoftwareUpdateProviderAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000029) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -11985,7 +12723,7 @@ class SubscribeAttributeBridgedDeviceBasicAttributeList : public SubscribeAttrib
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedDeviceBasic.AttributeList response %@", [value description]);
+                NSLog(@"OtaSoftwareUpdateProvider.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -11998,27 +12736,27 @@ class SubscribeAttributeBridgedDeviceBasicAttributeList : public SubscribeAttrib
 /*
  * Attribute FeatureMap
  */
-class ReadBridgedDeviceBasicFeatureMap : public ReadAttribute {
+class ReadOtaSoftwareUpdateProviderFeatureMap : public ReadAttribute {
 public:
-    ReadBridgedDeviceBasicFeatureMap()
+    ReadOtaSoftwareUpdateProviderFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadBridgedDeviceBasicFeatureMap() {}
+    ~ReadOtaSoftwareUpdateProviderFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000029) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedDeviceBasic.FeatureMap response %@", [value description]);
+            NSLog(@"OtaSoftwareUpdateProvider.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedDeviceBasic FeatureMap read Error", error);
+                LogNSError("OtaSoftwareUpdateProvider FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -12026,22 +12764,22 @@ class ReadBridgedDeviceBasicFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedDeviceBasicFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeOtaSoftwareUpdateProviderFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeBridgedDeviceBasicFeatureMap()
+    SubscribeAttributeOtaSoftwareUpdateProviderFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeBridgedDeviceBasicFeatureMap() {}
+    ~SubscribeAttributeOtaSoftwareUpdateProviderFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000029) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -12053,7 +12791,7 @@ class SubscribeAttributeBridgedDeviceBasicFeatureMap : public SubscribeAttribute
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedDeviceBasic.FeatureMap response %@", [value description]);
+                NSLog(@"OtaSoftwareUpdateProvider.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -12066,27 +12804,27 @@ class SubscribeAttributeBridgedDeviceBasicFeatureMap : public SubscribeAttribute
 /*
  * Attribute ClusterRevision
  */
-class ReadBridgedDeviceBasicClusterRevision : public ReadAttribute {
+class ReadOtaSoftwareUpdateProviderClusterRevision : public ReadAttribute {
 public:
-    ReadBridgedDeviceBasicClusterRevision()
+    ReadOtaSoftwareUpdateProviderClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadBridgedDeviceBasicClusterRevision() {}
+    ~ReadOtaSoftwareUpdateProviderClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000029) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"BridgedDeviceBasic.ClusterRevision response %@", [value description]);
+            NSLog(@"OtaSoftwareUpdateProvider.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("BridgedDeviceBasic ClusterRevision read Error", error);
+                LogNSError("OtaSoftwareUpdateProvider ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -12094,22 +12832,22 @@ class ReadBridgedDeviceBasicClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeBridgedDeviceBasicClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeOtaSoftwareUpdateProviderClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeBridgedDeviceBasicClusterRevision()
+    SubscribeAttributeOtaSoftwareUpdateProviderClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeBridgedDeviceBasicClusterRevision() {}
+    ~SubscribeAttributeOtaSoftwareUpdateProviderClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000029) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -12121,7 +12859,7 @@ class SubscribeAttributeBridgedDeviceBasicClusterRevision : public SubscribeAttr
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"BridgedDeviceBasic.ClusterRevision response %@", [value description]);
+                NSLog(@"OtaSoftwareUpdateProvider.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -12132,17 +12870,16 @@ class SubscribeAttributeBridgedDeviceBasicClusterRevision : public SubscribeAttr
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster Channel                                                     | 0x0504 |
+| Cluster OtaSoftwareUpdateRequestor                                  | 0x002A |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * ChangeChannel                                                     |   0x00 |
-| * ChangeChannelByNumber                                             |   0x02 |
-| * SkipChannel                                                       |   0x03 |
+| * AnnounceOtaProvider                                               |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * ChannelList                                                       | 0x0000 |
-| * Lineup                                                            | 0x0001 |
-| * CurrentChannel                                                    | 0x0002 |
+| * DefaultOtaProviders                                               | 0x0000 |
+| * UpdatePossible                                                    | 0x0001 |
+| * UpdateState                                                       | 0x0002 |
+| * UpdateStateProgress                                               | 0x0003 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -12150,168 +12887,222 @@ class SubscribeAttributeBridgedDeviceBasicClusterRevision : public SubscribeAttr
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
+| * StateTransition                                                   | 0x0000 |
+| * VersionApplied                                                    | 0x0001 |
+| * DownloadError                                                     | 0x0002 |
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command ChangeChannel
+ * Command AnnounceOtaProvider
  */
-class ChannelChangeChannel : public ClusterCommand {
+class OtaSoftwareUpdateRequestorAnnounceOtaProvider : public ClusterCommand {
 public:
-    ChannelChangeChannel()
-        : ClusterCommand("change-channel")
+    OtaSoftwareUpdateRequestorAnnounceOtaProvider()
+        : ClusterCommand("announce-ota-provider")
     {
-        AddArgument("Match", &mRequest.match);
+        AddArgument("ProviderNodeId", 0, UINT64_MAX, &mRequest.providerNodeId);
+        AddArgument("VendorId", 0, UINT16_MAX, &mRequest.vendorId);
+        AddArgument("AnnouncementReason", 0, UINT8_MAX, &mRequest.announcementReason);
+        AddArgument("MetadataForNode", &mRequest.metadataForNode);
+        AddArgument("Endpoint", 0, UINT16_MAX, &mRequest.endpoint);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000504) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPChannelClusterChangeChannelParams alloc] init];
+        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        __auto_type * params = [[CHIPOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.match = [[NSString alloc] initWithBytes:mRequest.match.data()
-                                                length:mRequest.match.size()
-                                              encoding:NSUTF8StringEncoding];
+        params.providerNodeId = [NSNumber numberWithUnsignedLongLong:mRequest.providerNodeId];
+        params.vendorId = [NSNumber numberWithUnsignedShort:chip::to_underlying(mRequest.vendorId)];
+        params.announcementReason = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.announcementReason)];
+        if (mRequest.metadataForNode.HasValue()) {
+            params.metadataForNode = [NSData dataWithBytes:mRequest.metadataForNode.Value().data()
+                                                    length:mRequest.metadataForNode.Value().size()];
+        } else {
+            params.metadataForNode = nil;
+        }
+        params.endpoint = [NSNumber numberWithUnsignedShort:mRequest.endpoint];
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster changeChannelWithParams:params
-                           completionHandler:^(
-                               CHIPChannelClusterChangeChannelResponseParams * _Nullable values, NSError * _Nullable error) {
-                               NSLog(@"Values: %@", values);
-                               responsesNeeded--;
-                               if (error != nil) {
-                                   mError = error;
-                                   LogNSError("Error", error);
-                               }
-                               if (responsesNeeded == 0) {
-                                   SetCommandExitStatus(mError);
-                               }
-                           }];
+            [cluster announceOtaProviderWithParams:params
+                                 completionHandler:^(NSError * _Nullable error) {
+                                     responsesNeeded--;
+                                     if (error != nil) {
+                                         mError = error;
+                                         LogNSError("Error", error);
+                                     }
+                                     if (responsesNeeded == 0) {
+                                         SetCommandExitStatus(mError);
+                                     }
+                                 }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::Channel::Commands::ChangeChannel::Type mRequest;
+    chip::app::Clusters::OtaSoftwareUpdateRequestor::Commands::AnnounceOtaProvider::Type mRequest;
 };
 
 /*
- * Command ChangeChannelByNumber
+ * Attribute DefaultOtaProviders
  */
-class ChannelChangeChannelByNumber : public ClusterCommand {
+class ReadOtaSoftwareUpdateRequestorDefaultOtaProviders : public ReadAttribute {
 public:
-    ChannelChangeChannelByNumber()
-        : ClusterCommand("change-channel-by-number")
+    ReadOtaSoftwareUpdateRequestorDefaultOtaProviders()
+        : ReadAttribute("default-ota-providers")
     {
-        AddArgument("MajorNumber", 0, UINT16_MAX, &mRequest.majorNumber);
-        AddArgument("MinorNumber", 0, UINT16_MAX, &mRequest.minorNumber);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadOtaSoftwareUpdateRequestorDefaultOtaProviders() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000504) command (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPChannelClusterChangeChannelByNumberParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.majorNumber = [NSNumber numberWithUnsignedShort:mRequest.majorNumber];
-        params.minorNumber = [NSNumber numberWithUnsignedShort:mRequest.minorNumber];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster changeChannelByNumberWithParams:params
-                                   completionHandler:^(NSError * _Nullable error) {
-                                       responsesNeeded--;
-                                       if (error != nil) {
-                                           mError = error;
-                                           LogNSError("Error", error);
-                                       }
-                                       if (responsesNeeded == 0) {
-                                           SetCommandExitStatus(mError);
-                                       }
-                                   }];
-        }
+        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        CHIPReadParams * params = [[CHIPReadParams alloc] init];
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster
+            readAttributeDefaultOtaProvidersWithParams:params
+                                     completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                                         NSLog(@"OtaSoftwareUpdateRequestor.DefaultOtaProviders response %@", [value description]);
+                                         if (error != nil) {
+                                             LogNSError("OtaSoftwareUpdateRequestor DefaultOtaProviders read Error", error);
+                                         }
+                                         SetCommandExitStatus(error);
+                                     }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type mRequest;
 };
 
-/*
- * Command SkipChannel
- */
-class ChannelSkipChannel : public ClusterCommand {
+class WriteOtaSoftwareUpdateRequestorDefaultOtaProviders : public WriteAttribute {
 public:
-    ChannelSkipChannel()
-        : ClusterCommand("skip-channel")
+    WriteOtaSoftwareUpdateRequestorDefaultOtaProviders()
+        : WriteAttribute("default-ota-providers")
+        , mComplex(&mValue)
     {
-        AddArgument("Count", 0, UINT16_MAX, &mRequest.count);
-        ClusterCommand::AddArguments();
+        AddArgument("attr-name", "default-ota-providers");
+        AddArgument("attr-value", &mComplex);
+        WriteAttribute::AddArguments();
     }
 
+    ~WriteOtaSoftwareUpdateRequestorDefaultOtaProviders() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000504) command (0x00000003) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) WriteAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPChannelClusterSkipChannelParams alloc] init];
-        params.timedInvokeTimeoutMs
+        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.count = [NSNumber numberWithUnsignedShort:mRequest.count];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster skipChannelWithParams:params
-                         completionHandler:^(NSError * _Nullable error) {
-                             responsesNeeded--;
-                             if (error != nil) {
-                                 mError = error;
-                                 LogNSError("Error", error);
-                             }
-                             if (responsesNeeded == 0) {
-                                 SetCommandExitStatus(mError);
-                             }
-                         }];
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mValue) {
+                CHIPOtaSoftwareUpdateRequestorClusterProviderLocation * newElement_0;
+                newElement_0 = [CHIPOtaSoftwareUpdateRequestorClusterProviderLocation new];
+                newElement_0.providerNodeID = [NSNumber numberWithUnsignedLongLong:entry_0.providerNodeID];
+                newElement_0.endpoint = [NSNumber numberWithUnsignedShort:entry_0.endpoint];
+                newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
+                [array_0 addObject:newElement_0];
+            }
+            value = array_0;
         }
+
+        [cluster writeAttributeDefaultOtaProvidersWithValue:value
+                                                     params:params
+                                          completionHandler:^(NSError * _Nullable error) {
+                                              if (error != nil) {
+                                                  LogNSError("OtaSoftwareUpdateRequestor DefaultOtaProviders write Error", error);
+                                              }
+                                              SetCommandExitStatus(error);
+                                          }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::Channel::Commands::SkipChannel::Type mRequest;
+    chip::app::DataModel::List<const chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::Type> mValue;
+    TypedComplexArgument<
+        chip::app::DataModel::List<const chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::Type>>
+        mComplex;
+};
+
+class SubscribeAttributeOtaSoftwareUpdateRequestorDefaultOtaProviders : public SubscribeAttribute {
+public:
+    SubscribeAttributeOtaSoftwareUpdateRequestorDefaultOtaProviders()
+        : SubscribeAttribute("default-ota-providers")
+    {
+    }
+
+    ~SubscribeAttributeOtaSoftwareUpdateRequestorDefaultOtaProviders() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeDefaultOtaProvidersWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OtaSoftwareUpdateRequestor.DefaultOtaProviders response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
 };
 
 /*
- * Attribute ChannelList
+ * Attribute UpdatePossible
  */
-class ReadChannelChannelList : public ReadAttribute {
+class ReadOtaSoftwareUpdateRequestorUpdatePossible : public ReadAttribute {
 public:
-    ReadChannelChannelList()
-        : ReadAttribute("channel-list")
+    ReadOtaSoftwareUpdateRequestorUpdatePossible()
+        : ReadAttribute("update-possible")
     {
     }
 
-    ~ReadChannelChannelList() {}
+    ~ReadOtaSoftwareUpdateRequestorUpdatePossible() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeChannelListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Channel.ChannelList response %@", [value description]);
+        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        [cluster readAttributeUpdatePossibleWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OtaSoftwareUpdateRequestor.UpdatePossible response %@", [value description]);
             if (error != nil) {
-                LogNSError("Channel ChannelList read Error", error);
+                LogNSError("OtaSoftwareUpdateRequestor UpdatePossible read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -12319,32 +13110,34 @@ class ReadChannelChannelList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeChannelChannelList : public SubscribeAttribute {
+class SubscribeAttributeOtaSoftwareUpdateRequestorUpdatePossible : public SubscribeAttribute {
 public:
-    SubscribeAttributeChannelChannelList()
-        : SubscribeAttribute("channel-list")
+    SubscribeAttributeOtaSoftwareUpdateRequestorUpdatePossible()
+        : SubscribeAttribute("update-possible")
     {
     }
 
-    ~SubscribeAttributeChannelChannelList() {}
+    ~SubscribeAttributeOtaSoftwareUpdateRequestorUpdatePossible() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeChannelListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeUpdatePossibleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Channel.ChannelList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OtaSoftwareUpdateRequestor.UpdatePossible response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -12355,61 +13148,64 @@ class SubscribeAttributeChannelChannelList : public SubscribeAttribute {
 };
 
 /*
- * Attribute Lineup
+ * Attribute UpdateState
  */
-class ReadChannelLineup : public ReadAttribute {
+class ReadOtaSoftwareUpdateRequestorUpdateState : public ReadAttribute {
 public:
-    ReadChannelLineup()
-        : ReadAttribute("lineup")
+    ReadOtaSoftwareUpdateRequestorUpdateState()
+        : ReadAttribute("update-state")
     {
     }
 
-    ~ReadChannelLineup() {}
+    ~ReadOtaSoftwareUpdateRequestorUpdateState() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeLineupWithCompletionHandler:^(CHIPChannelClusterLineupInfo * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Channel.Lineup response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("Channel Lineup read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        [cluster readAttributeUpdateStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OtaSoftwareUpdateRequestor.UpdateState response %@", [value description]);
+            if (error != nil) {
+                LogNSError("OtaSoftwareUpdateRequestor UpdateState read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeChannelLineup : public SubscribeAttribute {
+class SubscribeAttributeOtaSoftwareUpdateRequestorUpdateState : public SubscribeAttribute {
 public:
-    SubscribeAttributeChannelLineup()
-        : SubscribeAttribute("lineup")
+    SubscribeAttributeOtaSoftwareUpdateRequestorUpdateState()
+        : SubscribeAttribute("update-state")
     {
     }
 
-    ~SubscribeAttributeChannelLineup() {}
+    ~SubscribeAttributeOtaSoftwareUpdateRequestorUpdateState() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLineupWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeUpdateStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(CHIPChannelClusterLineupInfo * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Channel.Lineup response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OtaSoftwareUpdateRequestor.UpdateState response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -12420,28 +13216,29 @@ class SubscribeAttributeChannelLineup : public SubscribeAttribute {
 };
 
 /*
- * Attribute CurrentChannel
+ * Attribute UpdateStateProgress
  */
-class ReadChannelCurrentChannel : public ReadAttribute {
+class ReadOtaSoftwareUpdateRequestorUpdateStateProgress : public ReadAttribute {
 public:
-    ReadChannelCurrentChannel()
-        : ReadAttribute("current-channel")
+    ReadOtaSoftwareUpdateRequestorUpdateStateProgress()
+        : ReadAttribute("update-state-progress")
     {
     }
 
-    ~ReadChannelCurrentChannel() {}
+    ~ReadOtaSoftwareUpdateRequestorUpdateStateProgress() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCurrentChannelWithCompletionHandler:^(
-            CHIPChannelClusterChannelInfo * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Channel.CurrentChannel response %@", [value description]);
+        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        [cluster readAttributeUpdateStateProgressWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OtaSoftwareUpdateRequestor.UpdateStateProgress response %@", [value description]);
             if (error != nil) {
-                LogNSError("Channel CurrentChannel read Error", error);
+                LogNSError("OtaSoftwareUpdateRequestor UpdateStateProgress read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -12449,32 +13246,34 @@ class ReadChannelCurrentChannel : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeChannelCurrentChannel : public SubscribeAttribute {
+class SubscribeAttributeOtaSoftwareUpdateRequestorUpdateStateProgress : public SubscribeAttribute {
 public:
-    SubscribeAttributeChannelCurrentChannel()
-        : SubscribeAttribute("current-channel")
+    SubscribeAttributeOtaSoftwareUpdateRequestorUpdateStateProgress()
+        : SubscribeAttribute("update-state-progress")
     {
     }
 
-    ~SubscribeAttributeChannelCurrentChannel() {}
+    ~SubscribeAttributeOtaSoftwareUpdateRequestorUpdateStateProgress() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentChannelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeUpdateStateProgressWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(CHIPChannelClusterChannelInfo * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Channel.CurrentChannel response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OtaSoftwareUpdateRequestor.UpdateStateProgress response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -12487,25 +13286,27 @@ class SubscribeAttributeChannelCurrentChannel : public SubscribeAttribute {
 /*
  * Attribute GeneratedCommandList
  */
-class ReadChannelGeneratedCommandList : public ReadAttribute {
+class ReadOtaSoftwareUpdateRequestorGeneratedCommandList : public ReadAttribute {
 public:
-    ReadChannelGeneratedCommandList()
+    ReadOtaSoftwareUpdateRequestorGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadChannelGeneratedCommandList() {}
+    ~ReadOtaSoftwareUpdateRequestorGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Channel.GeneratedCommandList response %@", [value description]);
+            NSLog(@"OtaSoftwareUpdateRequestor.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("Channel GeneratedCommandList read Error", error);
+                LogNSError("OtaSoftwareUpdateRequestor GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -12513,20 +13314,22 @@ class ReadChannelGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeChannelGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeOtaSoftwareUpdateRequestorGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeChannelGeneratedCommandList()
+    SubscribeAttributeOtaSoftwareUpdateRequestorGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeChannelGeneratedCommandList() {}
+    ~SubscribeAttributeOtaSoftwareUpdateRequestorGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -12538,7 +13341,7 @@ class SubscribeAttributeChannelGeneratedCommandList : public SubscribeAttribute
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Channel.GeneratedCommandList response %@", [value description]);
+                NSLog(@"OtaSoftwareUpdateRequestor.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -12551,25 +13354,27 @@ class SubscribeAttributeChannelGeneratedCommandList : public SubscribeAttribute
 /*
  * Attribute AcceptedCommandList
  */
-class ReadChannelAcceptedCommandList : public ReadAttribute {
+class ReadOtaSoftwareUpdateRequestorAcceptedCommandList : public ReadAttribute {
 public:
-    ReadChannelAcceptedCommandList()
+    ReadOtaSoftwareUpdateRequestorAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadChannelAcceptedCommandList() {}
+    ~ReadOtaSoftwareUpdateRequestorAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Channel.AcceptedCommandList response %@", [value description]);
+            NSLog(@"OtaSoftwareUpdateRequestor.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("Channel AcceptedCommandList read Error", error);
+                LogNSError("OtaSoftwareUpdateRequestor AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -12577,20 +13382,22 @@ class ReadChannelAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeChannelAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeOtaSoftwareUpdateRequestorAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeChannelAcceptedCommandList()
+    SubscribeAttributeOtaSoftwareUpdateRequestorAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeChannelAcceptedCommandList() {}
+    ~SubscribeAttributeOtaSoftwareUpdateRequestorAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -12602,7 +13409,7 @@ class SubscribeAttributeChannelAcceptedCommandList : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Channel.AcceptedCommandList response %@", [value description]);
+                NSLog(@"OtaSoftwareUpdateRequestor.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -12615,25 +13422,27 @@ class SubscribeAttributeChannelAcceptedCommandList : public SubscribeAttribute {
 /*
  * Attribute AttributeList
  */
-class ReadChannelAttributeList : public ReadAttribute {
+class ReadOtaSoftwareUpdateRequestorAttributeList : public ReadAttribute {
 public:
-    ReadChannelAttributeList()
+    ReadOtaSoftwareUpdateRequestorAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadChannelAttributeList() {}
+    ~ReadOtaSoftwareUpdateRequestorAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Channel.AttributeList response %@", [value description]);
+            NSLog(@"OtaSoftwareUpdateRequestor.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("Channel AttributeList read Error", error);
+                LogNSError("OtaSoftwareUpdateRequestor AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -12641,20 +13450,22 @@ class ReadChannelAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeChannelAttributeList : public SubscribeAttribute {
+class SubscribeAttributeOtaSoftwareUpdateRequestorAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeChannelAttributeList()
+    SubscribeAttributeOtaSoftwareUpdateRequestorAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeChannelAttributeList() {}
+    ~SubscribeAttributeOtaSoftwareUpdateRequestorAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -12666,7 +13477,7 @@ class SubscribeAttributeChannelAttributeList : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Channel.AttributeList response %@", [value description]);
+                NSLog(@"OtaSoftwareUpdateRequestor.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -12679,25 +13490,27 @@ class SubscribeAttributeChannelAttributeList : public SubscribeAttribute {
 /*
  * Attribute FeatureMap
  */
-class ReadChannelFeatureMap : public ReadAttribute {
+class ReadOtaSoftwareUpdateRequestorFeatureMap : public ReadAttribute {
 public:
-    ReadChannelFeatureMap()
+    ReadOtaSoftwareUpdateRequestorFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadChannelFeatureMap() {}
+    ~ReadOtaSoftwareUpdateRequestorFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Channel.FeatureMap response %@", [value description]);
+            NSLog(@"OtaSoftwareUpdateRequestor.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("Channel FeatureMap read Error", error);
+                LogNSError("OtaSoftwareUpdateRequestor FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -12705,20 +13518,22 @@ class ReadChannelFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeChannelFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeOtaSoftwareUpdateRequestorFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeChannelFeatureMap()
+    SubscribeAttributeOtaSoftwareUpdateRequestorFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeChannelFeatureMap() {}
+    ~SubscribeAttributeOtaSoftwareUpdateRequestorFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -12730,7 +13545,7 @@ class SubscribeAttributeChannelFeatureMap : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Channel.FeatureMap response %@", [value description]);
+                NSLog(@"OtaSoftwareUpdateRequestor.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -12743,25 +13558,27 @@ class SubscribeAttributeChannelFeatureMap : public SubscribeAttribute {
 /*
  * Attribute ClusterRevision
  */
-class ReadChannelClusterRevision : public ReadAttribute {
+class ReadOtaSoftwareUpdateRequestorClusterRevision : public ReadAttribute {
 public:
-    ReadChannelClusterRevision()
+    ReadOtaSoftwareUpdateRequestorClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadChannelClusterRevision() {}
+    ~ReadOtaSoftwareUpdateRequestorClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Channel.ClusterRevision response %@", [value description]);
+            NSLog(@"OtaSoftwareUpdateRequestor.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("Channel ClusterRevision read Error", error);
+                LogNSError("OtaSoftwareUpdateRequestor ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -12769,20 +13586,22 @@ class ReadChannelClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeChannelClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeOtaSoftwareUpdateRequestorClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeChannelClusterRevision()
+    SubscribeAttributeOtaSoftwareUpdateRequestorClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeChannelClusterRevision() {}
+    ~SubscribeAttributeOtaSoftwareUpdateRequestorClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -12794,7 +13613,7 @@ class SubscribeAttributeChannelClusterRevision : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Channel.ClusterRevision response %@", [value description]);
+                NSLog(@"OtaSoftwareUpdateRequestor.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -12805,82 +13624,13 @@ class SubscribeAttributeChannelClusterRevision : public SubscribeAttribute {
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster ColorControl                                                | 0x0300 |
+| Cluster LocalizationConfiguration                                   | 0x002B |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * MoveToHue                                                         |   0x00 |
-| * MoveHue                                                           |   0x01 |
-| * StepHue                                                           |   0x02 |
-| * MoveToSaturation                                                  |   0x03 |
-| * MoveSaturation                                                    |   0x04 |
-| * StepSaturation                                                    |   0x05 |
-| * MoveToHueAndSaturation                                            |   0x06 |
-| * MoveToColor                                                       |   0x07 |
-| * MoveColor                                                         |   0x08 |
-| * StepColor                                                         |   0x09 |
-| * MoveToColorTemperature                                            |   0x0A |
-| * EnhancedMoveToHue                                                 |   0x40 |
-| * EnhancedMoveHue                                                   |   0x41 |
-| * EnhancedStepHue                                                   |   0x42 |
-| * EnhancedMoveToHueAndSaturation                                    |   0x43 |
-| * ColorLoopSet                                                      |   0x44 |
-| * StopMoveStep                                                      |   0x47 |
-| * MoveColorTemperature                                              |   0x4B |
-| * StepColorTemperature                                              |   0x4C |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * CurrentHue                                                        | 0x0000 |
-| * CurrentSaturation                                                 | 0x0001 |
-| * RemainingTime                                                     | 0x0002 |
-| * CurrentX                                                          | 0x0003 |
-| * CurrentY                                                          | 0x0004 |
-| * DriftCompensation                                                 | 0x0005 |
-| * CompensationText                                                  | 0x0006 |
-| * ColorTemperature                                                  | 0x0007 |
-| * ColorMode                                                         | 0x0008 |
-| * Options                                                           | 0x000F |
-| * NumberOfPrimaries                                                 | 0x0010 |
-| * Primary1X                                                         | 0x0011 |
-| * Primary1Y                                                         | 0x0012 |
-| * Primary1Intensity                                                 | 0x0013 |
-| * Primary2X                                                         | 0x0015 |
-| * Primary2Y                                                         | 0x0016 |
-| * Primary2Intensity                                                 | 0x0017 |
-| * Primary3X                                                         | 0x0019 |
-| * Primary3Y                                                         | 0x001A |
-| * Primary3Intensity                                                 | 0x001B |
-| * Primary4X                                                         | 0x0020 |
-| * Primary4Y                                                         | 0x0021 |
-| * Primary4Intensity                                                 | 0x0022 |
-| * Primary5X                                                         | 0x0024 |
-| * Primary5Y                                                         | 0x0025 |
-| * Primary5Intensity                                                 | 0x0026 |
-| * Primary6X                                                         | 0x0028 |
-| * Primary6Y                                                         | 0x0029 |
-| * Primary6Intensity                                                 | 0x002A |
-| * WhitePointX                                                       | 0x0030 |
-| * WhitePointY                                                       | 0x0031 |
-| * ColorPointRX                                                      | 0x0032 |
-| * ColorPointRY                                                      | 0x0033 |
-| * ColorPointRIntensity                                              | 0x0034 |
-| * ColorPointGX                                                      | 0x0036 |
-| * ColorPointGY                                                      | 0x0037 |
-| * ColorPointGIntensity                                              | 0x0038 |
-| * ColorPointBX                                                      | 0x003A |
-| * ColorPointBY                                                      | 0x003B |
-| * ColorPointBIntensity                                              | 0x003C |
-| * EnhancedCurrentHue                                                | 0x4000 |
-| * EnhancedColorMode                                                 | 0x4001 |
-| * ColorLoopActive                                                   | 0x4002 |
-| * ColorLoopDirection                                                | 0x4003 |
-| * ColorLoopTime                                                     | 0x4004 |
-| * ColorLoopStartEnhancedHue                                         | 0x4005 |
-| * ColorLoopStoredEnhancedHue                                        | 0x4006 |
-| * ColorCapabilities                                                 | 0x400A |
-| * ColorTempPhysicalMinMireds                                        | 0x400B |
-| * ColorTempPhysicalMaxMireds                                        | 0x400C |
-| * CoupleColorTempToLevelMinMireds                                   | 0x400D |
-| * StartUpColorTemperatureMireds                                     | 0x4010 |
+| * ActiveLocale                                                      | 0x0000 |
+| * SupportedLocales                                                  | 0x0001 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -12891,1040 +13641,748 @@ class SubscribeAttributeChannelClusterRevision : public SubscribeAttribute {
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command MoveToHue
+ * Attribute ActiveLocale
  */
-class ColorControlMoveToHue : public ClusterCommand {
+class ReadLocalizationConfigurationActiveLocale : public ReadAttribute {
 public:
-    ColorControlMoveToHue()
-        : ClusterCommand("move-to-hue")
+    ReadLocalizationConfigurationActiveLocale()
+        : ReadAttribute("active-locale")
     {
-        AddArgument("Hue", 0, UINT8_MAX, &mRequest.hue);
-        AddArgument("Direction", 0, UINT8_MAX, &mRequest.direction);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadLocalizationConfigurationActiveLocale() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPColorControlClusterMoveToHueParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.hue = [NSNumber numberWithUnsignedChar:mRequest.hue];
-        params.direction = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.direction)];
-        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
-        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
-        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster moveToHueWithParams:params
-                       completionHandler:^(NSError * _Nullable error) {
-                           responsesNeeded--;
-                           if (error != nil) {
-                               mError = error;
-                               LogNSError("Error", error);
-                           }
-                           if (responsesNeeded == 0) {
-                               SetCommandExitStatus(mError);
-                           }
-                       }];
-        }
+        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
+        [cluster readAttributeActiveLocaleWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LocalizationConfiguration.ActiveLocale response %@", [value description]);
+            if (error != nil) {
+                LogNSError("LocalizationConfiguration ActiveLocale read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::ColorControl::Commands::MoveToHue::Type mRequest;
 };
 
-/*
- * Command MoveHue
- */
-class ColorControlMoveHue : public ClusterCommand {
+class WriteLocalizationConfigurationActiveLocale : public WriteAttribute {
 public:
-    ColorControlMoveHue()
-        : ClusterCommand("move-hue")
+    WriteLocalizationConfigurationActiveLocale()
+        : WriteAttribute("active-locale")
     {
-        AddArgument("MoveMode", 0, UINT8_MAX, &mRequest.moveMode);
-        AddArgument("Rate", 0, UINT8_MAX, &mRequest.rate);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
-        ClusterCommand::AddArguments();
+        AddArgument("attr-name", "active-locale");
+        AddArgument("attr-value", &mValue);
+        WriteAttribute::AddArguments();
     }
 
+    ~WriteLocalizationConfigurationActiveLocale() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000001) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) WriteAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPColorControlClusterMoveHueParams alloc] init];
-        params.timedInvokeTimeoutMs
+        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.moveMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.moveMode)];
-        params.rate = [NSNumber numberWithUnsignedChar:mRequest.rate];
-        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
-        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster moveHueWithParams:params
-                     completionHandler:^(NSError * _Nullable error) {
-                         responsesNeeded--;
-                         if (error != nil) {
-                             mError = error;
-                             LogNSError("Error", error);
-                         }
-                         if (responsesNeeded == 0) {
-                             SetCommandExitStatus(mError);
-                         }
-                     }];
-        }
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSString * _Nonnull value = [[NSString alloc] initWithBytes:mValue.data()
+                                                             length:mValue.size()
+                                                           encoding:NSUTF8StringEncoding];
+
+        [cluster writeAttributeActiveLocaleWithValue:value
+                                              params:params
+                                   completionHandler:^(NSError * _Nullable error) {
+                                       if (error != nil) {
+                                           LogNSError("LocalizationConfiguration ActiveLocale write Error", error);
+                                       }
+                                       SetCommandExitStatus(error);
+                                   }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::ColorControl::Commands::MoveHue::Type mRequest;
+    chip::ByteSpan mValue;
 };
 
-/*
- * Command StepHue
- */
-class ColorControlStepHue : public ClusterCommand {
+class SubscribeAttributeLocalizationConfigurationActiveLocale : public SubscribeAttribute {
 public:
-    ColorControlStepHue()
-        : ClusterCommand("step-hue")
+    SubscribeAttributeLocalizationConfigurationActiveLocale()
+        : SubscribeAttribute("active-locale")
     {
-        AddArgument("StepMode", 0, UINT8_MAX, &mRequest.stepMode);
-        AddArgument("StepSize", 0, UINT8_MAX, &mRequest.stepSize);
-        AddArgument("TransitionTime", 0, UINT8_MAX, &mRequest.transitionTime);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeLocalizationConfigurationActiveLocale() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000002) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPColorControlClusterStepHueParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.stepMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.stepMode)];
-        params.stepSize = [NSNumber numberWithUnsignedChar:mRequest.stepSize];
-        params.transitionTime = [NSNumber numberWithUnsignedChar:mRequest.transitionTime];
-        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
-        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster stepHueWithParams:params
-                     completionHandler:^(NSError * _Nullable error) {
-                         responsesNeeded--;
-                         if (error != nil) {
-                             mError = error;
-                             LogNSError("Error", error);
-                         }
-                         if (responsesNeeded == 0) {
-                             SetCommandExitStatus(mError);
-                         }
-                     }];
-        }
+        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeActiveLocaleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LocalizationConfiguration.ActiveLocale response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::ColorControl::Commands::StepHue::Type mRequest;
 };
 
 /*
- * Command MoveToSaturation
+ * Attribute SupportedLocales
  */
-class ColorControlMoveToSaturation : public ClusterCommand {
+class ReadLocalizationConfigurationSupportedLocales : public ReadAttribute {
 public:
-    ColorControlMoveToSaturation()
-        : ClusterCommand("move-to-saturation")
+    ReadLocalizationConfigurationSupportedLocales()
+        : ReadAttribute("supported-locales")
     {
-        AddArgument("Saturation", 0, UINT8_MAX, &mRequest.saturation);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadLocalizationConfigurationSupportedLocales() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPColorControlClusterMoveToSaturationParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.saturation = [NSNumber numberWithUnsignedChar:mRequest.saturation];
-        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
-        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
-        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster moveToSaturationWithParams:params
-                              completionHandler:^(NSError * _Nullable error) {
-                                  responsesNeeded--;
-                                  if (error != nil) {
-                                      mError = error;
-                                      LogNSError("Error", error);
-                                  }
-                                  if (responsesNeeded == 0) {
-                                      SetCommandExitStatus(mError);
-                                  }
-                              }];
-        }
+        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
+        [cluster readAttributeSupportedLocalesWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LocalizationConfiguration.SupportedLocales response %@", [value description]);
+            if (error != nil) {
+                LogNSError("LocalizationConfiguration SupportedLocales read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::ColorControl::Commands::MoveToSaturation::Type mRequest;
 };
 
-/*
- * Command MoveSaturation
- */
-class ColorControlMoveSaturation : public ClusterCommand {
+class SubscribeAttributeLocalizationConfigurationSupportedLocales : public SubscribeAttribute {
 public:
-    ColorControlMoveSaturation()
-        : ClusterCommand("move-saturation")
+    SubscribeAttributeLocalizationConfigurationSupportedLocales()
+        : SubscribeAttribute("supported-locales")
     {
-        AddArgument("MoveMode", 0, UINT8_MAX, &mRequest.moveMode);
-        AddArgument("Rate", 0, UINT8_MAX, &mRequest.rate);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeLocalizationConfigurationSupportedLocales() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000004) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPColorControlClusterMoveSaturationParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.moveMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.moveMode)];
-        params.rate = [NSNumber numberWithUnsignedChar:mRequest.rate];
-        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
-        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster moveSaturationWithParams:params
-                            completionHandler:^(NSError * _Nullable error) {
-                                responsesNeeded--;
-                                if (error != nil) {
-                                    mError = error;
-                                    LogNSError("Error", error);
-                                }
-                                if (responsesNeeded == 0) {
-                                    SetCommandExitStatus(mError);
-                                }
-                            }];
-        }
+        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeSupportedLocalesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LocalizationConfiguration.SupportedLocales response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::ColorControl::Commands::MoveSaturation::Type mRequest;
 };
 
 /*
- * Command StepSaturation
+ * Attribute GeneratedCommandList
  */
-class ColorControlStepSaturation : public ClusterCommand {
+class ReadLocalizationConfigurationGeneratedCommandList : public ReadAttribute {
 public:
-    ColorControlStepSaturation()
-        : ClusterCommand("step-saturation")
+    ReadLocalizationConfigurationGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
-        AddArgument("StepMode", 0, UINT8_MAX, &mRequest.stepMode);
-        AddArgument("StepSize", 0, UINT8_MAX, &mRequest.stepSize);
-        AddArgument("TransitionTime", 0, UINT8_MAX, &mRequest.transitionTime);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadLocalizationConfigurationGeneratedCommandList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPColorControlClusterStepSaturationParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.stepMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.stepMode)];
-        params.stepSize = [NSNumber numberWithUnsignedChar:mRequest.stepSize];
-        params.transitionTime = [NSNumber numberWithUnsignedChar:mRequest.transitionTime];
-        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
-        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster stepSaturationWithParams:params
-                            completionHandler:^(NSError * _Nullable error) {
-                                responsesNeeded--;
-                                if (error != nil) {
-                                    mError = error;
-                                    LogNSError("Error", error);
-                                }
-                                if (responsesNeeded == 0) {
-                                    SetCommandExitStatus(mError);
-                                }
-                            }];
-        }
+        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LocalizationConfiguration.GeneratedCommandList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("LocalizationConfiguration GeneratedCommandList read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::ColorControl::Commands::StepSaturation::Type mRequest;
 };
 
-/*
- * Command MoveToHueAndSaturation
- */
-class ColorControlMoveToHueAndSaturation : public ClusterCommand {
+class SubscribeAttributeLocalizationConfigurationGeneratedCommandList : public SubscribeAttribute {
 public:
-    ColorControlMoveToHueAndSaturation()
-        : ClusterCommand("move-to-hue-and-saturation")
+    SubscribeAttributeLocalizationConfigurationGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
-        AddArgument("Hue", 0, UINT8_MAX, &mRequest.hue);
-        AddArgument("Saturation", 0, UINT8_MAX, &mRequest.saturation);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeLocalizationConfigurationGeneratedCommandList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000006) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPColorControlClusterMoveToHueAndSaturationParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.hue = [NSNumber numberWithUnsignedChar:mRequest.hue];
-        params.saturation = [NSNumber numberWithUnsignedChar:mRequest.saturation];
-        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
-        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
-        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster moveToHueAndSaturationWithParams:params
-                                    completionHandler:^(NSError * _Nullable error) {
-                                        responsesNeeded--;
-                                        if (error != nil) {
-                                            mError = error;
-                                            LogNSError("Error", error);
-                                        }
-                                        if (responsesNeeded == 0) {
-                                            SetCommandExitStatus(mError);
-                                        }
-                                    }];
-        }
+        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LocalizationConfiguration.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::ColorControl::Commands::MoveToHueAndSaturation::Type mRequest;
 };
 
 /*
- * Command MoveToColor
+ * Attribute AcceptedCommandList
  */
-class ColorControlMoveToColor : public ClusterCommand {
+class ReadLocalizationConfigurationAcceptedCommandList : public ReadAttribute {
 public:
-    ColorControlMoveToColor()
-        : ClusterCommand("move-to-color")
+    ReadLocalizationConfigurationAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
-        AddArgument("ColorX", 0, UINT16_MAX, &mRequest.colorX);
-        AddArgument("ColorY", 0, UINT16_MAX, &mRequest.colorY);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadLocalizationConfigurationAcceptedCommandList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPColorControlClusterMoveToColorParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.colorX = [NSNumber numberWithUnsignedShort:mRequest.colorX];
-        params.colorY = [NSNumber numberWithUnsignedShort:mRequest.colorY];
-        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
-        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
-        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster moveToColorWithParams:params
-                         completionHandler:^(NSError * _Nullable error) {
-                             responsesNeeded--;
-                             if (error != nil) {
-                                 mError = error;
-                                 LogNSError("Error", error);
-                             }
-                             if (responsesNeeded == 0) {
-                                 SetCommandExitStatus(mError);
-                             }
-                         }];
-        }
+        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LocalizationConfiguration.AcceptedCommandList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("LocalizationConfiguration AcceptedCommandList read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::ColorControl::Commands::MoveToColor::Type mRequest;
 };
 
-/*
- * Command MoveColor
- */
-class ColorControlMoveColor : public ClusterCommand {
+class SubscribeAttributeLocalizationConfigurationAcceptedCommandList : public SubscribeAttribute {
 public:
-    ColorControlMoveColor()
-        : ClusterCommand("move-color")
+    SubscribeAttributeLocalizationConfigurationAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
-        AddArgument("RateX", INT16_MIN, INT16_MAX, &mRequest.rateX);
-        AddArgument("RateY", INT16_MIN, INT16_MAX, &mRequest.rateY);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeLocalizationConfigurationAcceptedCommandList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000008) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPColorControlClusterMoveColorParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.rateX = [NSNumber numberWithShort:mRequest.rateX];
-        params.rateY = [NSNumber numberWithShort:mRequest.rateY];
-        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
-        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster moveColorWithParams:params
-                       completionHandler:^(NSError * _Nullable error) {
-                           responsesNeeded--;
-                           if (error != nil) {
-                               mError = error;
-                               LogNSError("Error", error);
-                           }
-                           if (responsesNeeded == 0) {
-                               SetCommandExitStatus(mError);
-                           }
-                       }];
-        }
+        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LocalizationConfiguration.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::ColorControl::Commands::MoveColor::Type mRequest;
 };
 
 /*
- * Command StepColor
+ * Attribute AttributeList
  */
-class ColorControlStepColor : public ClusterCommand {
+class ReadLocalizationConfigurationAttributeList : public ReadAttribute {
 public:
-    ColorControlStepColor()
-        : ClusterCommand("step-color")
+    ReadLocalizationConfigurationAttributeList()
+        : ReadAttribute("attribute-list")
     {
-        AddArgument("StepX", INT16_MIN, INT16_MAX, &mRequest.stepX);
-        AddArgument("StepY", INT16_MIN, INT16_MAX, &mRequest.stepY);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadLocalizationConfigurationAttributeList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPColorControlClusterStepColorParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.stepX = [NSNumber numberWithShort:mRequest.stepX];
-        params.stepY = [NSNumber numberWithShort:mRequest.stepY];
-        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
-        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
-        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster stepColorWithParams:params
-                       completionHandler:^(NSError * _Nullable error) {
-                           responsesNeeded--;
-                           if (error != nil) {
-                               mError = error;
-                               LogNSError("Error", error);
-                           }
-                           if (responsesNeeded == 0) {
-                               SetCommandExitStatus(mError);
-                           }
-                       }];
-        }
+        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LocalizationConfiguration.AttributeList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("LocalizationConfiguration AttributeList read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::ColorControl::Commands::StepColor::Type mRequest;
 };
 
-/*
- * Command MoveToColorTemperature
- */
-class ColorControlMoveToColorTemperature : public ClusterCommand {
+class SubscribeAttributeLocalizationConfigurationAttributeList : public SubscribeAttribute {
 public:
-    ColorControlMoveToColorTemperature()
-        : ClusterCommand("move-to-color-temperature")
+    SubscribeAttributeLocalizationConfigurationAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
-        AddArgument("ColorTemperature", 0, UINT16_MAX, &mRequest.colorTemperature);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeLocalizationConfigurationAttributeList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x0000000A) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPColorControlClusterMoveToColorTemperatureParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.colorTemperature = [NSNumber numberWithUnsignedShort:mRequest.colorTemperature];
-        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
-        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
-        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster moveToColorTemperatureWithParams:params
-                                    completionHandler:^(NSError * _Nullable error) {
-                                        responsesNeeded--;
-                                        if (error != nil) {
-                                            mError = error;
-                                            LogNSError("Error", error);
-                                        }
-                                        if (responsesNeeded == 0) {
-                                            SetCommandExitStatus(mError);
-                                        }
-                                    }];
-        }
+        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LocalizationConfiguration.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::ColorControl::Commands::MoveToColorTemperature::Type mRequest;
 };
 
 /*
- * Command EnhancedMoveToHue
+ * Attribute FeatureMap
  */
-class ColorControlEnhancedMoveToHue : public ClusterCommand {
+class ReadLocalizationConfigurationFeatureMap : public ReadAttribute {
 public:
-    ColorControlEnhancedMoveToHue()
-        : ClusterCommand("enhanced-move-to-hue")
+    ReadLocalizationConfigurationFeatureMap()
+        : ReadAttribute("feature-map")
     {
-        AddArgument("EnhancedHue", 0, UINT16_MAX, &mRequest.enhancedHue);
-        AddArgument("Direction", 0, UINT8_MAX, &mRequest.direction);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadLocalizationConfigurationFeatureMap() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000040) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPColorControlClusterEnhancedMoveToHueParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.enhancedHue = [NSNumber numberWithUnsignedShort:mRequest.enhancedHue];
-        params.direction = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.direction)];
-        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
-        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
-        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster enhancedMoveToHueWithParams:params
-                               completionHandler:^(NSError * _Nullable error) {
-                                   responsesNeeded--;
-                                   if (error != nil) {
-                                       mError = error;
-                                       LogNSError("Error", error);
-                                   }
-                                   if (responsesNeeded == 0) {
-                                       SetCommandExitStatus(mError);
-                                   }
-                               }];
-        }
+        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LocalizationConfiguration.FeatureMap response %@", [value description]);
+            if (error != nil) {
+                LogNSError("LocalizationConfiguration FeatureMap read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::ColorControl::Commands::EnhancedMoveToHue::Type mRequest;
 };
 
-/*
- * Command EnhancedMoveHue
- */
-class ColorControlEnhancedMoveHue : public ClusterCommand {
+class SubscribeAttributeLocalizationConfigurationFeatureMap : public SubscribeAttribute {
 public:
-    ColorControlEnhancedMoveHue()
-        : ClusterCommand("enhanced-move-hue")
+    SubscribeAttributeLocalizationConfigurationFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
-        AddArgument("MoveMode", 0, UINT8_MAX, &mRequest.moveMode);
-        AddArgument("Rate", 0, UINT16_MAX, &mRequest.rate);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeLocalizationConfigurationFeatureMap() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000041) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPColorControlClusterEnhancedMoveHueParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.moveMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.moveMode)];
-        params.rate = [NSNumber numberWithUnsignedShort:mRequest.rate];
-        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
-        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster enhancedMoveHueWithParams:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 responsesNeeded--;
-                                 if (error != nil) {
-                                     mError = error;
-                                     LogNSError("Error", error);
-                                 }
-                                 if (responsesNeeded == 0) {
-                                     SetCommandExitStatus(mError);
-                                 }
-                             }];
-        }
+        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LocalizationConfiguration.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::ColorControl::Commands::EnhancedMoveHue::Type mRequest;
 };
 
 /*
- * Command EnhancedStepHue
+ * Attribute ClusterRevision
  */
-class ColorControlEnhancedStepHue : public ClusterCommand {
+class ReadLocalizationConfigurationClusterRevision : public ReadAttribute {
 public:
-    ColorControlEnhancedStepHue()
-        : ClusterCommand("enhanced-step-hue")
+    ReadLocalizationConfigurationClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
-        AddArgument("StepMode", 0, UINT8_MAX, &mRequest.stepMode);
-        AddArgument("StepSize", 0, UINT16_MAX, &mRequest.stepSize);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadLocalizationConfigurationClusterRevision() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000042) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPColorControlClusterEnhancedStepHueParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.stepMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.stepMode)];
-        params.stepSize = [NSNumber numberWithUnsignedShort:mRequest.stepSize];
-        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
-        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
-        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster enhancedStepHueWithParams:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 responsesNeeded--;
-                                 if (error != nil) {
-                                     mError = error;
-                                     LogNSError("Error", error);
-                                 }
-                                 if (responsesNeeded == 0) {
-                                     SetCommandExitStatus(mError);
-                                 }
-                             }];
-        }
+        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LocalizationConfiguration.ClusterRevision response %@", [value description]);
+            if (error != nil) {
+                LogNSError("LocalizationConfiguration ClusterRevision read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::ColorControl::Commands::EnhancedStepHue::Type mRequest;
 };
 
-/*
- * Command EnhancedMoveToHueAndSaturation
- */
-class ColorControlEnhancedMoveToHueAndSaturation : public ClusterCommand {
+class SubscribeAttributeLocalizationConfigurationClusterRevision : public SubscribeAttribute {
 public:
-    ColorControlEnhancedMoveToHueAndSaturation()
-        : ClusterCommand("enhanced-move-to-hue-and-saturation")
+    SubscribeAttributeLocalizationConfigurationClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
-        AddArgument("EnhancedHue", 0, UINT16_MAX, &mRequest.enhancedHue);
-        AddArgument("Saturation", 0, UINT8_MAX, &mRequest.saturation);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeLocalizationConfigurationClusterRevision() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000043) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPColorControlClusterEnhancedMoveToHueAndSaturationParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.enhancedHue = [NSNumber numberWithUnsignedShort:mRequest.enhancedHue];
-        params.saturation = [NSNumber numberWithUnsignedChar:mRequest.saturation];
-        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
-        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
-        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster enhancedMoveToHueAndSaturationWithParams:params
-                                            completionHandler:^(NSError * _Nullable error) {
-                                                responsesNeeded--;
-                                                if (error != nil) {
-                                                    mError = error;
-                                                    LogNSError("Error", error);
-                                                }
-                                                if (responsesNeeded == 0) {
-                                                    SetCommandExitStatus(mError);
-                                                }
-                                            }];
-        }
+        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
+                                                                                               endpoint:endpointId
+                                                                                                  queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LocalizationConfiguration.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::ColorControl::Commands::EnhancedMoveToHueAndSaturation::Type mRequest;
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster TimeFormatLocalization                                      | 0x002C |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * HourFormat                                                        | 0x0000 |
+| * ActiveCalendarType                                                | 0x0001 |
+| * SupportedCalendarTypes                                            | 0x0002 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Command ColorLoopSet
+ * Attribute HourFormat
  */
-class ColorControlColorLoopSet : public ClusterCommand {
+class ReadTimeFormatLocalizationHourFormat : public ReadAttribute {
 public:
-    ColorControlColorLoopSet()
-        : ClusterCommand("color-loop-set")
+    ReadTimeFormatLocalizationHourFormat()
+        : ReadAttribute("hour-format")
     {
-        AddArgument("UpdateFlags", 0, UINT8_MAX, &mRequest.updateFlags);
-        AddArgument("Action", 0, UINT8_MAX, &mRequest.action);
-        AddArgument("Direction", 0, UINT8_MAX, &mRequest.direction);
-        AddArgument("Time", 0, UINT16_MAX, &mRequest.time);
-        AddArgument("StartHue", 0, UINT16_MAX, &mRequest.startHue);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadTimeFormatLocalizationHourFormat() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000044) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPColorControlClusterColorLoopSetParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.updateFlags = [NSNumber numberWithUnsignedChar:mRequest.updateFlags.Raw()];
-        params.action = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.action)];
-        params.direction = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.direction)];
-        params.time = [NSNumber numberWithUnsignedShort:mRequest.time];
-        params.startHue = [NSNumber numberWithUnsignedShort:mRequest.startHue];
-        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
-        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster colorLoopSetWithParams:params
-                          completionHandler:^(NSError * _Nullable error) {
-                              responsesNeeded--;
-                              if (error != nil) {
-                                  mError = error;
-                                  LogNSError("Error", error);
-                              }
-                              if (responsesNeeded == 0) {
-                                  SetCommandExitStatus(mError);
-                              }
-                          }];
-        }
+        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeHourFormatWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TimeFormatLocalization.HourFormat response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TimeFormatLocalization HourFormat read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type mRequest;
 };
 
-/*
- * Command StopMoveStep
- */
-class ColorControlStopMoveStep : public ClusterCommand {
+class WriteTimeFormatLocalizationHourFormat : public WriteAttribute {
 public:
-    ColorControlStopMoveStep()
-        : ClusterCommand("stop-move-step")
+    WriteTimeFormatLocalizationHourFormat()
+        : WriteAttribute("hour-format")
     {
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
-        ClusterCommand::AddArguments();
+        AddArgument("attr-name", "hour-format");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
+    ~WriteTimeFormatLocalizationHourFormat() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000047) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) WriteAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPColorControlClusterStopMoveStepParams alloc] init];
-        params.timedInvokeTimeoutMs
+        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
-        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster stopMoveStepWithParams:params
-                          completionHandler:^(NSError * _Nullable error) {
-                              responsesNeeded--;
-                              if (error != nil) {
-                                  mError = error;
-                                  LogNSError("Error", error);
-                              }
-                              if (responsesNeeded == 0) {
-                                  SetCommandExitStatus(mError);
-                              }
-                          }];
-        }
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeHourFormatWithValue:value
+                                            params:params
+                                 completionHandler:^(NSError * _Nullable error) {
+                                     if (error != nil) {
+                                         LogNSError("TimeFormatLocalization HourFormat write Error", error);
+                                     }
+                                     SetCommandExitStatus(error);
+                                 }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::ColorControl::Commands::StopMoveStep::Type mRequest;
+    uint8_t mValue;
 };
 
-/*
- * Command MoveColorTemperature
- */
-class ColorControlMoveColorTemperature : public ClusterCommand {
+class SubscribeAttributeTimeFormatLocalizationHourFormat : public SubscribeAttribute {
 public:
-    ColorControlMoveColorTemperature()
-        : ClusterCommand("move-color-temperature")
+    SubscribeAttributeTimeFormatLocalizationHourFormat()
+        : SubscribeAttribute("hour-format")
     {
-        AddArgument("MoveMode", 0, UINT8_MAX, &mRequest.moveMode);
-        AddArgument("Rate", 0, UINT16_MAX, &mRequest.rate);
-        AddArgument("ColorTemperatureMinimumMireds", 0, UINT16_MAX, &mRequest.colorTemperatureMinimumMireds);
-        AddArgument("ColorTemperatureMaximumMireds", 0, UINT16_MAX, &mRequest.colorTemperatureMaximumMireds);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeTimeFormatLocalizationHourFormat() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x0000004B) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPColorControlClusterMoveColorTemperatureParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.moveMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.moveMode)];
-        params.rate = [NSNumber numberWithUnsignedShort:mRequest.rate];
-        params.colorTemperatureMinimumMireds = [NSNumber numberWithUnsignedShort:mRequest.colorTemperatureMinimumMireds];
-        params.colorTemperatureMaximumMireds = [NSNumber numberWithUnsignedShort:mRequest.colorTemperatureMaximumMireds];
-        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
-        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster moveColorTemperatureWithParams:params
-                                  completionHandler:^(NSError * _Nullable error) {
-                                      responsesNeeded--;
-                                      if (error != nil) {
-                                          mError = error;
-                                          LogNSError("Error", error);
-                                      }
-                                      if (responsesNeeded == 0) {
-                                          SetCommandExitStatus(mError);
-                                      }
-                                  }];
-        }
-        return CHIP_NO_ERROR;
-    }
+        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeHourFormatWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TimeFormatLocalization.HourFormat response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
-private:
-    chip::app::Clusters::ColorControl::Commands::MoveColorTemperature::Type mRequest;
+        return CHIP_NO_ERROR;
+    }
 };
 
 /*
- * Command StepColorTemperature
+ * Attribute ActiveCalendarType
  */
-class ColorControlStepColorTemperature : public ClusterCommand {
+class ReadTimeFormatLocalizationActiveCalendarType : public ReadAttribute {
 public:
-    ColorControlStepColorTemperature()
-        : ClusterCommand("step-color-temperature")
+    ReadTimeFormatLocalizationActiveCalendarType()
+        : ReadAttribute("active-calendar-type")
     {
-        AddArgument("StepMode", 0, UINT8_MAX, &mRequest.stepMode);
-        AddArgument("StepSize", 0, UINT16_MAX, &mRequest.stepSize);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        AddArgument("ColorTemperatureMinimumMireds", 0, UINT16_MAX, &mRequest.colorTemperatureMinimumMireds);
-        AddArgument("ColorTemperatureMaximumMireds", 0, UINT16_MAX, &mRequest.colorTemperatureMaximumMireds);
-        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
-        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadTimeFormatLocalizationActiveCalendarType() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x0000004C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPColorControlClusterStepColorTemperatureParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.stepMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.stepMode)];
-        params.stepSize = [NSNumber numberWithUnsignedShort:mRequest.stepSize];
-        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
-        params.colorTemperatureMinimumMireds = [NSNumber numberWithUnsignedShort:mRequest.colorTemperatureMinimumMireds];
-        params.colorTemperatureMaximumMireds = [NSNumber numberWithUnsignedShort:mRequest.colorTemperatureMaximumMireds];
-        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
-        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster stepColorTemperatureWithParams:params
-                                  completionHandler:^(NSError * _Nullable error) {
-                                      responsesNeeded--;
-                                      if (error != nil) {
-                                          mError = error;
-                                          LogNSError("Error", error);
-                                      }
-                                      if (responsesNeeded == 0) {
-                                          SetCommandExitStatus(mError);
-                                      }
-                                  }];
-        }
+        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeActiveCalendarTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TimeFormatLocalization.ActiveCalendarType response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TimeFormatLocalization ActiveCalendarType read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::ColorControl::Commands::StepColorTemperature::Type mRequest;
 };
 
-/*
- * Attribute CurrentHue
- */
-class ReadColorControlCurrentHue : public ReadAttribute {
+class WriteTimeFormatLocalizationActiveCalendarType : public WriteAttribute {
 public:
-    ReadColorControlCurrentHue()
-        : ReadAttribute("current-hue")
+    WriteTimeFormatLocalizationActiveCalendarType()
+        : WriteAttribute("active-calendar-type")
     {
+        AddArgument("attr-name", "active-calendar-type");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~ReadColorControlCurrentHue() {}
+    ~WriteTimeFormatLocalizationActiveCalendarType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000000) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) WriteAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCurrentHueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.CurrentHue response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ColorControl CurrentHue read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeActiveCalendarTypeWithValue:value
+                                                    params:params
+                                         completionHandler:^(NSError * _Nullable error) {
+                                             if (error != nil) {
+                                                 LogNSError("TimeFormatLocalization ActiveCalendarType write Error", error);
+                                             }
+                                             SetCommandExitStatus(error);
+                                         }];
         return CHIP_NO_ERROR;
     }
+
+private:
+    uint8_t mValue;
 };
 
-class SubscribeAttributeColorControlCurrentHue : public SubscribeAttribute {
+class SubscribeAttributeTimeFormatLocalizationActiveCalendarType : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlCurrentHue()
-        : SubscribeAttribute("current-hue")
+    SubscribeAttributeTimeFormatLocalizationActiveCalendarType()
+        : SubscribeAttribute("active-calendar-type")
     {
     }
 
-    ~SubscribeAttributeColorControlCurrentHue() {}
+    ~SubscribeAttributeTimeFormatLocalizationActiveCalendarType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentHueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeActiveCalendarTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.CurrentHue response %@", [value description]);
+                NSLog(@"TimeFormatLocalization.ActiveCalendarType response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -13935,27 +14393,29 @@ class SubscribeAttributeColorControlCurrentHue : public SubscribeAttribute {
 };
 
 /*
- * Attribute CurrentSaturation
+ * Attribute SupportedCalendarTypes
  */
-class ReadColorControlCurrentSaturation : public ReadAttribute {
+class ReadTimeFormatLocalizationSupportedCalendarTypes : public ReadAttribute {
 public:
-    ReadColorControlCurrentSaturation()
-        : ReadAttribute("current-saturation")
+    ReadTimeFormatLocalizationSupportedCalendarTypes()
+        : ReadAttribute("supported-calendar-types")
     {
     }
 
-    ~ReadColorControlCurrentSaturation() {}
+    ~ReadTimeFormatLocalizationSupportedCalendarTypes() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCurrentSaturationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.CurrentSaturation response %@", [value description]);
+        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeSupportedCalendarTypesWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TimeFormatLocalization.SupportedCalendarTypes response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl CurrentSaturation read Error", error);
+                LogNSError("TimeFormatLocalization SupportedCalendarTypes read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -13963,32 +14423,34 @@ class ReadColorControlCurrentSaturation : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlCurrentSaturation : public SubscribeAttribute {
+class SubscribeAttributeTimeFormatLocalizationSupportedCalendarTypes : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlCurrentSaturation()
-        : SubscribeAttribute("current-saturation")
+    SubscribeAttributeTimeFormatLocalizationSupportedCalendarTypes()
+        : SubscribeAttribute("supported-calendar-types")
     {
     }
 
-    ~SubscribeAttributeColorControlCurrentSaturation() {}
+    ~SubscribeAttributeTimeFormatLocalizationSupportedCalendarTypes() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentSaturationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSupportedCalendarTypesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.CurrentSaturation response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TimeFormatLocalization.SupportedCalendarTypes response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -13999,27 +14461,29 @@ class SubscribeAttributeColorControlCurrentSaturation : public SubscribeAttribut
 };
 
 /*
- * Attribute RemainingTime
+ * Attribute GeneratedCommandList
  */
-class ReadColorControlRemainingTime : public ReadAttribute {
+class ReadTimeFormatLocalizationGeneratedCommandList : public ReadAttribute {
 public:
-    ReadColorControlRemainingTime()
-        : ReadAttribute("remaining-time")
+    ReadTimeFormatLocalizationGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadColorControlRemainingTime() {}
+    ~ReadTimeFormatLocalizationGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeRemainingTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.RemainingTime response %@", [value description]);
+        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TimeFormatLocalization.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl RemainingTime read Error", error);
+                LogNSError("TimeFormatLocalization GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -14027,32 +14491,34 @@ class ReadColorControlRemainingTime : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlRemainingTime : public SubscribeAttribute {
+class SubscribeAttributeTimeFormatLocalizationGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlRemainingTime()
-        : SubscribeAttribute("remaining-time")
+    SubscribeAttributeTimeFormatLocalizationGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeColorControlRemainingTime() {}
+    ~SubscribeAttributeTimeFormatLocalizationGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRemainingTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.RemainingTime response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TimeFormatLocalization.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -14063,27 +14529,29 @@ class SubscribeAttributeColorControlRemainingTime : public SubscribeAttribute {
 };
 
 /*
- * Attribute CurrentX
+ * Attribute AcceptedCommandList
  */
-class ReadColorControlCurrentX : public ReadAttribute {
+class ReadTimeFormatLocalizationAcceptedCommandList : public ReadAttribute {
 public:
-    ReadColorControlCurrentX()
-        : ReadAttribute("current-x")
+    ReadTimeFormatLocalizationAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadColorControlCurrentX() {}
+    ~ReadTimeFormatLocalizationAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCurrentXWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.CurrentX response %@", [value description]);
+        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TimeFormatLocalization.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl CurrentX read Error", error);
+                LogNSError("TimeFormatLocalization AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -14091,32 +14559,34 @@ class ReadColorControlCurrentX : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlCurrentX : public SubscribeAttribute {
+class SubscribeAttributeTimeFormatLocalizationAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlCurrentX()
-        : SubscribeAttribute("current-x")
+    SubscribeAttributeTimeFormatLocalizationAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeColorControlCurrentX() {}
+    ~SubscribeAttributeTimeFormatLocalizationAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentXWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.CurrentX response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TimeFormatLocalization.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -14127,27 +14597,29 @@ class SubscribeAttributeColorControlCurrentX : public SubscribeAttribute {
 };
 
 /*
- * Attribute CurrentY
+ * Attribute AttributeList
  */
-class ReadColorControlCurrentY : public ReadAttribute {
+class ReadTimeFormatLocalizationAttributeList : public ReadAttribute {
 public:
-    ReadColorControlCurrentY()
-        : ReadAttribute("current-y")
+    ReadTimeFormatLocalizationAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadColorControlCurrentY() {}
+    ~ReadTimeFormatLocalizationAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCurrentYWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.CurrentY response %@", [value description]);
+        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TimeFormatLocalization.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl CurrentY read Error", error);
+                LogNSError("TimeFormatLocalization AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -14155,32 +14627,34 @@ class ReadColorControlCurrentY : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlCurrentY : public SubscribeAttribute {
+class SubscribeAttributeTimeFormatLocalizationAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlCurrentY()
-        : SubscribeAttribute("current-y")
+    SubscribeAttributeTimeFormatLocalizationAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeColorControlCurrentY() {}
+    ~SubscribeAttributeTimeFormatLocalizationAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentYWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.CurrentY response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TimeFormatLocalization.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -14191,27 +14665,29 @@ class SubscribeAttributeColorControlCurrentY : public SubscribeAttribute {
 };
 
 /*
- * Attribute DriftCompensation
+ * Attribute FeatureMap
  */
-class ReadColorControlDriftCompensation : public ReadAttribute {
+class ReadTimeFormatLocalizationFeatureMap : public ReadAttribute {
 public:
-    ReadColorControlDriftCompensation()
-        : ReadAttribute("drift-compensation")
+    ReadTimeFormatLocalizationFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadColorControlDriftCompensation() {}
+    ~ReadTimeFormatLocalizationFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeDriftCompensationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.DriftCompensation response %@", [value description]);
+        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TimeFormatLocalization.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl DriftCompensation read Error", error);
+                LogNSError("TimeFormatLocalization FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -14219,32 +14695,34 @@ class ReadColorControlDriftCompensation : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlDriftCompensation : public SubscribeAttribute {
+class SubscribeAttributeTimeFormatLocalizationFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlDriftCompensation()
-        : SubscribeAttribute("drift-compensation")
+    SubscribeAttributeTimeFormatLocalizationFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeColorControlDriftCompensation() {}
+    ~SubscribeAttributeTimeFormatLocalizationFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDriftCompensationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.DriftCompensation response %@", [value description]);
+                NSLog(@"TimeFormatLocalization.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -14255,27 +14733,29 @@ class SubscribeAttributeColorControlDriftCompensation : public SubscribeAttribut
 };
 
 /*
- * Attribute CompensationText
+ * Attribute ClusterRevision
  */
-class ReadColorControlCompensationText : public ReadAttribute {
+class ReadTimeFormatLocalizationClusterRevision : public ReadAttribute {
 public:
-    ReadColorControlCompensationText()
-        : ReadAttribute("compensation-text")
+    ReadTimeFormatLocalizationClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadColorControlCompensationText() {}
+    ~ReadTimeFormatLocalizationClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCompensationTextWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.CompensationText response %@", [value description]);
+        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TimeFormatLocalization.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl CompensationText read Error", error);
+                LogNSError("TimeFormatLocalization ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -14283,32 +14763,34 @@ class ReadColorControlCompensationText : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlCompensationText : public SubscribeAttribute {
+class SubscribeAttributeTimeFormatLocalizationClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlCompensationText()
-        : SubscribeAttribute("compensation-text")
+    SubscribeAttributeTimeFormatLocalizationClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeColorControlCompensationText() {}
+    ~SubscribeAttributeTimeFormatLocalizationClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCompensationTextWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.CompensationText response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TimeFormatLocalization.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -14318,28 +14800,46 @@ class SubscribeAttributeColorControlCompensationText : public SubscribeAttribute
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster UnitLocalization                                            | 0x002D |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * TemperatureUnit                                                   | 0x0000 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute ColorTemperature
+ * Attribute TemperatureUnit
  */
-class ReadColorControlColorTemperature : public ReadAttribute {
+class ReadUnitLocalizationTemperatureUnit : public ReadAttribute {
 public:
-    ReadColorControlColorTemperature()
-        : ReadAttribute("color-temperature")
+    ReadUnitLocalizationTemperatureUnit()
+        : ReadAttribute("temperature-unit")
     {
     }
 
-    ~ReadColorControlColorTemperature() {}
+    ~ReadUnitLocalizationTemperatureUnit() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeColorTemperatureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.ColorTemperature response %@", [value description]);
+        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeTemperatureUnitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"UnitLocalization.TemperatureUnit response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl ColorTemperature read Error", error);
+                LogNSError("UnitLocalization TemperatureUnit read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -14347,32 +14847,74 @@ class ReadColorControlColorTemperature : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlColorTemperature : public SubscribeAttribute {
+class WriteUnitLocalizationTemperatureUnit : public WriteAttribute {
 public:
-    SubscribeAttributeColorControlColorTemperature()
-        : SubscribeAttribute("color-temperature")
+    WriteUnitLocalizationTemperatureUnit()
+        : WriteAttribute("temperature-unit")
     {
+        AddArgument("attr-name", "temperature-unit");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeColorControlColorTemperature() {}
+    ~WriteUnitLocalizationTemperatureUnit() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) WriteAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeTemperatureUnitWithValue:value
+                                                 params:params
+                                      completionHandler:^(NSError * _Nullable error) {
+                                          if (error != nil) {
+                                              LogNSError("UnitLocalization TemperatureUnit write Error", error);
+                                          }
+                                          SetCommandExitStatus(error);
+                                      }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeUnitLocalizationTemperatureUnit : public SubscribeAttribute {
+public:
+    SubscribeAttributeUnitLocalizationTemperatureUnit()
+        : SubscribeAttribute("temperature-unit")
+    {
+    }
+
+    ~SubscribeAttributeUnitLocalizationTemperatureUnit() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeColorTemperatureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTemperatureUnitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.ColorTemperature response %@", [value description]);
+                NSLog(@"UnitLocalization.TemperatureUnit response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -14383,27 +14925,29 @@ class SubscribeAttributeColorControlColorTemperature : public SubscribeAttribute
 };
 
 /*
- * Attribute ColorMode
+ * Attribute GeneratedCommandList
  */
-class ReadColorControlColorMode : public ReadAttribute {
+class ReadUnitLocalizationGeneratedCommandList : public ReadAttribute {
 public:
-    ReadColorControlColorMode()
-        : ReadAttribute("color-mode")
+    ReadUnitLocalizationGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadColorControlColorMode() {}
+    ~ReadUnitLocalizationGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeColorModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.ColorMode response %@", [value description]);
+        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"UnitLocalization.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl ColorMode read Error", error);
+                LogNSError("UnitLocalization GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -14411,32 +14955,34 @@ class ReadColorControlColorMode : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlColorMode : public SubscribeAttribute {
+class SubscribeAttributeUnitLocalizationGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlColorMode()
-        : SubscribeAttribute("color-mode")
+    SubscribeAttributeUnitLocalizationGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeColorControlColorMode() {}
+    ~SubscribeAttributeUnitLocalizationGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeColorModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.ColorMode response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"UnitLocalization.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -14447,27 +14993,29 @@ class SubscribeAttributeColorControlColorMode : public SubscribeAttribute {
 };
 
 /*
- * Attribute Options
+ * Attribute AcceptedCommandList
  */
-class ReadColorControlOptions : public ReadAttribute {
+class ReadUnitLocalizationAcceptedCommandList : public ReadAttribute {
 public:
-    ReadColorControlOptions()
-        : ReadAttribute("options")
+    ReadUnitLocalizationAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadColorControlOptions() {}
+    ~ReadUnitLocalizationAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000000F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeOptionsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.Options response %@", [value description]);
+        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"UnitLocalization.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl Options read Error", error);
+                LogNSError("UnitLocalization AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -14475,70 +15023,34 @@ class ReadColorControlOptions : public ReadAttribute {
     }
 };
 
-class WriteColorControlOptions : public WriteAttribute {
-public:
-    WriteColorControlOptions()
-        : WriteAttribute("options")
-    {
-        AddArgument("attr-name", "options");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteColorControlOptions() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x0000000F) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeOptionsWithValue:value
-                                         params:params
-                              completionHandler:^(NSError * _Nullable error) {
-                                  if (error != nil) {
-                                      LogNSError("ColorControl Options write Error", error);
-                                  }
-                                  SetCommandExitStatus(error);
-                              }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeColorControlOptions : public SubscribeAttribute {
+class SubscribeAttributeUnitLocalizationAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlOptions()
-        : SubscribeAttribute("options")
+    SubscribeAttributeUnitLocalizationAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeColorControlOptions() {}
+    ~SubscribeAttributeUnitLocalizationAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000000F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOptionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.Options response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"UnitLocalization.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -14549,27 +15061,29 @@ class SubscribeAttributeColorControlOptions : public SubscribeAttribute {
 };
 
 /*
- * Attribute NumberOfPrimaries
+ * Attribute AttributeList
  */
-class ReadColorControlNumberOfPrimaries : public ReadAttribute {
+class ReadUnitLocalizationAttributeList : public ReadAttribute {
 public:
-    ReadColorControlNumberOfPrimaries()
-        : ReadAttribute("number-of-primaries")
+    ReadUnitLocalizationAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadColorControlNumberOfPrimaries() {}
+    ~ReadUnitLocalizationAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNumberOfPrimariesWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.NumberOfPrimaries response %@", [value description]);
+        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"UnitLocalization.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl NumberOfPrimaries read Error", error);
+                LogNSError("UnitLocalization AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -14577,32 +15091,34 @@ class ReadColorControlNumberOfPrimaries : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlNumberOfPrimaries : public SubscribeAttribute {
+class SubscribeAttributeUnitLocalizationAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlNumberOfPrimaries()
-        : SubscribeAttribute("number-of-primaries")
+    SubscribeAttributeUnitLocalizationAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeColorControlNumberOfPrimaries() {}
+    ~SubscribeAttributeUnitLocalizationAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNumberOfPrimariesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.NumberOfPrimaries response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"UnitLocalization.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -14613,27 +15129,29 @@ class SubscribeAttributeColorControlNumberOfPrimaries : public SubscribeAttribut
 };
 
 /*
- * Attribute Primary1X
+ * Attribute FeatureMap
  */
-class ReadColorControlPrimary1X : public ReadAttribute {
+class ReadUnitLocalizationFeatureMap : public ReadAttribute {
 public:
-    ReadColorControlPrimary1X()
-        : ReadAttribute("primary1x")
+    ReadUnitLocalizationFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadColorControlPrimary1X() {}
+    ~ReadUnitLocalizationFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributePrimary1XWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.Primary1X response %@", [value description]);
+        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"UnitLocalization.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl Primary1X read Error", error);
+                LogNSError("UnitLocalization FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -14641,32 +15159,34 @@ class ReadColorControlPrimary1X : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlPrimary1X : public SubscribeAttribute {
+class SubscribeAttributeUnitLocalizationFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlPrimary1X()
-        : SubscribeAttribute("primary1x")
+    SubscribeAttributeUnitLocalizationFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeColorControlPrimary1X() {}
+    ~SubscribeAttributeUnitLocalizationFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePrimary1XWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.Primary1X response %@", [value description]);
+                NSLog(@"UnitLocalization.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -14677,27 +15197,29 @@ class SubscribeAttributeColorControlPrimary1X : public SubscribeAttribute {
 };
 
 /*
- * Attribute Primary1Y
+ * Attribute ClusterRevision
  */
-class ReadColorControlPrimary1Y : public ReadAttribute {
+class ReadUnitLocalizationClusterRevision : public ReadAttribute {
 public:
-    ReadColorControlPrimary1Y()
-        : ReadAttribute("primary1y")
+    ReadUnitLocalizationClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadColorControlPrimary1Y() {}
+    ~ReadUnitLocalizationClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributePrimary1YWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.Primary1Y response %@", [value description]);
+        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"UnitLocalization.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl Primary1Y read Error", error);
+                LogNSError("UnitLocalization ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -14705,32 +15227,34 @@ class ReadColorControlPrimary1Y : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlPrimary1Y : public SubscribeAttribute {
+class SubscribeAttributeUnitLocalizationClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlPrimary1Y()
-        : SubscribeAttribute("primary1y")
+    SubscribeAttributeUnitLocalizationClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeColorControlPrimary1Y() {}
+    ~SubscribeAttributeUnitLocalizationClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePrimary1YWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.Primary1Y response %@", [value description]);
+                NSLog(@"UnitLocalization.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -14740,28 +15264,46 @@ class SubscribeAttributeColorControlPrimary1Y : public SubscribeAttribute {
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster PowerSourceConfiguration                                    | 0x002E |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * Sources                                                           | 0x0000 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute Primary1Intensity
+ * Attribute Sources
  */
-class ReadColorControlPrimary1Intensity : public ReadAttribute {
+class ReadPowerSourceConfigurationSources : public ReadAttribute {
 public:
-    ReadColorControlPrimary1Intensity()
-        : ReadAttribute("primary1intensity")
+    ReadPowerSourceConfigurationSources()
+        : ReadAttribute("sources")
     {
     }
 
-    ~ReadColorControlPrimary1Intensity() {}
+    ~ReadPowerSourceConfigurationSources() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002E) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributePrimary1IntensityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.Primary1Intensity response %@", [value description]);
+        CHIPPowerSourceConfiguration * cluster = [[CHIPPowerSourceConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeSourcesWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSourceConfiguration.Sources response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl Primary1Intensity read Error", error);
+                LogNSError("PowerSourceConfiguration Sources read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -14769,32 +15311,34 @@ class ReadColorControlPrimary1Intensity : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlPrimary1Intensity : public SubscribeAttribute {
+class SubscribeAttributePowerSourceConfigurationSources : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlPrimary1Intensity()
-        : SubscribeAttribute("primary1intensity")
+    SubscribeAttributePowerSourceConfigurationSources()
+        : SubscribeAttribute("sources")
     {
     }
 
-    ~SubscribeAttributeColorControlPrimary1Intensity() {}
+    ~SubscribeAttributePowerSourceConfigurationSources() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002E) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSourceConfiguration * cluster = [[CHIPPowerSourceConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePrimary1IntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSourcesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.Primary1Intensity response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSourceConfiguration.Sources response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -14805,27 +15349,29 @@ class SubscribeAttributeColorControlPrimary1Intensity : public SubscribeAttribut
 };
 
 /*
- * Attribute Primary2X
+ * Attribute GeneratedCommandList
  */
-class ReadColorControlPrimary2X : public ReadAttribute {
+class ReadPowerSourceConfigurationGeneratedCommandList : public ReadAttribute {
 public:
-    ReadColorControlPrimary2X()
-        : ReadAttribute("primary2x")
+    ReadPowerSourceConfigurationGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadColorControlPrimary2X() {}
+    ~ReadPowerSourceConfigurationGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000015) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002E) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributePrimary2XWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.Primary2X response %@", [value description]);
+        CHIPPowerSourceConfiguration * cluster = [[CHIPPowerSourceConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSourceConfiguration.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl Primary2X read Error", error);
+                LogNSError("PowerSourceConfiguration GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -14833,32 +15379,34 @@ class ReadColorControlPrimary2X : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlPrimary2X : public SubscribeAttribute {
+class SubscribeAttributePowerSourceConfigurationGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlPrimary2X()
-        : SubscribeAttribute("primary2x")
+    SubscribeAttributePowerSourceConfigurationGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeColorControlPrimary2X() {}
+    ~SubscribeAttributePowerSourceConfigurationGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000015) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002E) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSourceConfiguration * cluster = [[CHIPPowerSourceConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePrimary2XWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.Primary2X response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSourceConfiguration.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -14869,27 +15417,29 @@ class SubscribeAttributeColorControlPrimary2X : public SubscribeAttribute {
 };
 
 /*
- * Attribute Primary2Y
+ * Attribute AcceptedCommandList
  */
-class ReadColorControlPrimary2Y : public ReadAttribute {
+class ReadPowerSourceConfigurationAcceptedCommandList : public ReadAttribute {
 public:
-    ReadColorControlPrimary2Y()
-        : ReadAttribute("primary2y")
+    ReadPowerSourceConfigurationAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadColorControlPrimary2Y() {}
+    ~ReadPowerSourceConfigurationAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000016) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002E) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributePrimary2YWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.Primary2Y response %@", [value description]);
+        CHIPPowerSourceConfiguration * cluster = [[CHIPPowerSourceConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSourceConfiguration.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl Primary2Y read Error", error);
+                LogNSError("PowerSourceConfiguration AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -14897,32 +15447,34 @@ class ReadColorControlPrimary2Y : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlPrimary2Y : public SubscribeAttribute {
+class SubscribeAttributePowerSourceConfigurationAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlPrimary2Y()
-        : SubscribeAttribute("primary2y")
+    SubscribeAttributePowerSourceConfigurationAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeColorControlPrimary2Y() {}
+    ~SubscribeAttributePowerSourceConfigurationAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000016) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002E) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSourceConfiguration * cluster = [[CHIPPowerSourceConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePrimary2YWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.Primary2Y response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSourceConfiguration.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -14933,27 +15485,29 @@ class SubscribeAttributeColorControlPrimary2Y : public SubscribeAttribute {
 };
 
 /*
- * Attribute Primary2Intensity
+ * Attribute AttributeList
  */
-class ReadColorControlPrimary2Intensity : public ReadAttribute {
+class ReadPowerSourceConfigurationAttributeList : public ReadAttribute {
 public:
-    ReadColorControlPrimary2Intensity()
-        : ReadAttribute("primary2intensity")
+    ReadPowerSourceConfigurationAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadColorControlPrimary2Intensity() {}
+    ~ReadPowerSourceConfigurationAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002E) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributePrimary2IntensityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.Primary2Intensity response %@", [value description]);
+        CHIPPowerSourceConfiguration * cluster = [[CHIPPowerSourceConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSourceConfiguration.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl Primary2Intensity read Error", error);
+                LogNSError("PowerSourceConfiguration AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -14961,32 +15515,34 @@ class ReadColorControlPrimary2Intensity : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlPrimary2Intensity : public SubscribeAttribute {
+class SubscribeAttributePowerSourceConfigurationAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlPrimary2Intensity()
-        : SubscribeAttribute("primary2intensity")
+    SubscribeAttributePowerSourceConfigurationAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeColorControlPrimary2Intensity() {}
+    ~SubscribeAttributePowerSourceConfigurationAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002E) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSourceConfiguration * cluster = [[CHIPPowerSourceConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePrimary2IntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.Primary2Intensity response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSourceConfiguration.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -14997,27 +15553,29 @@ class SubscribeAttributeColorControlPrimary2Intensity : public SubscribeAttribut
 };
 
 /*
- * Attribute Primary3X
+ * Attribute FeatureMap
  */
-class ReadColorControlPrimary3X : public ReadAttribute {
+class ReadPowerSourceConfigurationFeatureMap : public ReadAttribute {
 public:
-    ReadColorControlPrimary3X()
-        : ReadAttribute("primary3x")
+    ReadPowerSourceConfigurationFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadColorControlPrimary3X() {}
+    ~ReadPowerSourceConfigurationFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000019) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002E) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributePrimary3XWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.Primary3X response %@", [value description]);
+        CHIPPowerSourceConfiguration * cluster = [[CHIPPowerSourceConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSourceConfiguration.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl Primary3X read Error", error);
+                LogNSError("PowerSourceConfiguration FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -15025,32 +15583,34 @@ class ReadColorControlPrimary3X : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlPrimary3X : public SubscribeAttribute {
+class SubscribeAttributePowerSourceConfigurationFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlPrimary3X()
-        : SubscribeAttribute("primary3x")
+    SubscribeAttributePowerSourceConfigurationFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeColorControlPrimary3X() {}
+    ~SubscribeAttributePowerSourceConfigurationFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000019) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002E) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSourceConfiguration * cluster = [[CHIPPowerSourceConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePrimary3XWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.Primary3X response %@", [value description]);
+                NSLog(@"PowerSourceConfiguration.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -15061,27 +15621,29 @@ class SubscribeAttributeColorControlPrimary3X : public SubscribeAttribute {
 };
 
 /*
- * Attribute Primary3Y
+ * Attribute ClusterRevision
  */
-class ReadColorControlPrimary3Y : public ReadAttribute {
+class ReadPowerSourceConfigurationClusterRevision : public ReadAttribute {
 public:
-    ReadColorControlPrimary3Y()
-        : ReadAttribute("primary3y")
+    ReadPowerSourceConfigurationClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadColorControlPrimary3Y() {}
+    ~ReadPowerSourceConfigurationClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000001A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002E) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributePrimary3YWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.Primary3Y response %@", [value description]);
+        CHIPPowerSourceConfiguration * cluster = [[CHIPPowerSourceConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSourceConfiguration.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl Primary3Y read Error", error);
+                LogNSError("PowerSourceConfiguration ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -15089,32 +15651,34 @@ class ReadColorControlPrimary3Y : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlPrimary3Y : public SubscribeAttribute {
+class SubscribeAttributePowerSourceConfigurationClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlPrimary3Y()
-        : SubscribeAttribute("primary3y")
+    SubscribeAttributePowerSourceConfigurationClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeColorControlPrimary3Y() {}
+    ~SubscribeAttributePowerSourceConfigurationClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000001A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002E) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSourceConfiguration * cluster = [[CHIPPowerSourceConfiguration alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePrimary3YWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.Primary3Y response %@", [value description]);
+                NSLog(@"PowerSourceConfiguration.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -15124,61 +15688,107 @@ class SubscribeAttributeColorControlPrimary3Y : public SubscribeAttribute {
     }
 };
 
-/*
- * Attribute Primary3Intensity
- */
-class ReadColorControlPrimary3Intensity : public ReadAttribute {
-public:
-    ReadColorControlPrimary3Intensity()
-        : ReadAttribute("primary3intensity")
-    {
-    }
-
-    ~ReadColorControlPrimary3Intensity() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000001B) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributePrimary3IntensityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.Primary3Intensity response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ColorControl Primary3Intensity read Error", error);
-            }
-            SetCommandExitStatus(error);
+/*----------------------------------------------------------------------------*\
+| Cluster PowerSource                                                 | 0x002F |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * Status                                                            | 0x0000 |
+| * Order                                                             | 0x0001 |
+| * Description                                                       | 0x0002 |
+| * WiredAssessedInputVoltage                                         | 0x0003 |
+| * WiredAssessedInputFrequency                                       | 0x0004 |
+| * WiredCurrentType                                                  | 0x0005 |
+| * WiredAssessedCurrent                                              | 0x0006 |
+| * WiredNominalVoltage                                               | 0x0007 |
+| * WiredMaximumCurrent                                               | 0x0008 |
+| * WiredPresent                                                      | 0x0009 |
+| * ActiveWiredFaults                                                 | 0x000A |
+| * BatteryVoltage                                                    | 0x000B |
+| * BatteryPercentRemaining                                           | 0x000C |
+| * BatteryTimeRemaining                                              | 0x000D |
+| * BatteryChargeLevel                                                | 0x000E |
+| * BatteryReplacementNeeded                                          | 0x000F |
+| * BatteryReplaceability                                             | 0x0010 |
+| * BatteryPresent                                                    | 0x0011 |
+| * ActiveBatteryFaults                                               | 0x0012 |
+| * BatteryReplacementDescription                                     | 0x0013 |
+| * BatteryCommonDesignation                                          | 0x0014 |
+| * BatteryANSIDesignation                                            | 0x0015 |
+| * BatteryIECDesignation                                             | 0x0016 |
+| * BatteryApprovedChemistry                                          | 0x0017 |
+| * BatteryCapacity                                                   | 0x0018 |
+| * BatteryQuantity                                                   | 0x0019 |
+| * BatteryChargeState                                                | 0x001A |
+| * BatteryTimeToFullCharge                                           | 0x001B |
+| * BatteryFunctionalWhileCharging                                    | 0x001C |
+| * BatteryChargingCurrent                                            | 0x001D |
+| * ActiveBatteryChargeFaults                                         | 0x001E |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
+/*
+ * Attribute Status
+ */
+class ReadPowerSourceStatus : public ReadAttribute {
+public:
+    ReadPowerSourceStatus()
+        : ReadAttribute("status")
+    {
+    }
+
+    ~ReadPowerSourceStatus() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSource.Status response %@", [value description]);
+            if (error != nil) {
+                LogNSError("PowerSource Status read Error", error);
+            }
+            SetCommandExitStatus(error);
         }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeColorControlPrimary3Intensity : public SubscribeAttribute {
+class SubscribeAttributePowerSourceStatus : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlPrimary3Intensity()
-        : SubscribeAttribute("primary3intensity")
+    SubscribeAttributePowerSourceStatus()
+        : SubscribeAttribute("status")
     {
     }
 
-    ~SubscribeAttributeColorControlPrimary3Intensity() {}
+    ~SubscribeAttributePowerSourceStatus() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000001B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePrimary3IntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.Primary3Intensity response %@", [value description]);
+                NSLog(@"PowerSource.Status response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -15189,27 +15799,27 @@ class SubscribeAttributeColorControlPrimary3Intensity : public SubscribeAttribut
 };
 
 /*
- * Attribute Primary4X
+ * Attribute Order
  */
-class ReadColorControlPrimary4X : public ReadAttribute {
+class ReadPowerSourceOrder : public ReadAttribute {
 public:
-    ReadColorControlPrimary4X()
-        : ReadAttribute("primary4x")
+    ReadPowerSourceOrder()
+        : ReadAttribute("order")
     {
     }
 
-    ~ReadColorControlPrimary4X() {}
+    ~ReadPowerSourceOrder() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000020) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributePrimary4XWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.Primary4X response %@", [value description]);
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeOrderWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSource.Order response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl Primary4X read Error", error);
+                LogNSError("PowerSource Order read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -15217,32 +15827,32 @@ class ReadColorControlPrimary4X : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlPrimary4X : public SubscribeAttribute {
+class SubscribeAttributePowerSourceOrder : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlPrimary4X()
-        : SubscribeAttribute("primary4x")
+    SubscribeAttributePowerSourceOrder()
+        : SubscribeAttribute("order")
     {
     }
 
-    ~SubscribeAttributeColorControlPrimary4X() {}
+    ~SubscribeAttributePowerSourceOrder() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000020) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePrimary4XWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOrderWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.Primary4X response %@", [value description]);
+                NSLog(@"PowerSource.Order response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -15253,27 +15863,27 @@ class SubscribeAttributeColorControlPrimary4X : public SubscribeAttribute {
 };
 
 /*
- * Attribute Primary4Y
+ * Attribute Description
  */
-class ReadColorControlPrimary4Y : public ReadAttribute {
+class ReadPowerSourceDescription : public ReadAttribute {
 public:
-    ReadColorControlPrimary4Y()
-        : ReadAttribute("primary4y")
+    ReadPowerSourceDescription()
+        : ReadAttribute("description")
     {
     }
 
-    ~ReadColorControlPrimary4Y() {}
+    ~ReadPowerSourceDescription() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000021) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributePrimary4YWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.Primary4Y response %@", [value description]);
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeDescriptionWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSource.Description response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl Primary4Y read Error", error);
+                LogNSError("PowerSource Description read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -15281,32 +15891,32 @@ class ReadColorControlPrimary4Y : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlPrimary4Y : public SubscribeAttribute {
+class SubscribeAttributePowerSourceDescription : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlPrimary4Y()
-        : SubscribeAttribute("primary4y")
+    SubscribeAttributePowerSourceDescription()
+        : SubscribeAttribute("description")
     {
     }
 
-    ~SubscribeAttributeColorControlPrimary4Y() {}
+    ~SubscribeAttributePowerSourceDescription() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000021) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePrimary4YWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDescriptionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.Primary4Y response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.Description response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -15317,60 +15927,61 @@ class SubscribeAttributeColorControlPrimary4Y : public SubscribeAttribute {
 };
 
 /*
- * Attribute Primary4Intensity
+ * Attribute WiredAssessedInputVoltage
  */
-class ReadColorControlPrimary4Intensity : public ReadAttribute {
+class ReadPowerSourceWiredAssessedInputVoltage : public ReadAttribute {
 public:
-    ReadColorControlPrimary4Intensity()
-        : ReadAttribute("primary4intensity")
+    ReadPowerSourceWiredAssessedInputVoltage()
+        : ReadAttribute("wired-assessed-input-voltage")
     {
     }
 
-    ~ReadColorControlPrimary4Intensity() {}
+    ~ReadPowerSourceWiredAssessedInputVoltage() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000022) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributePrimary4IntensityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.Primary4Intensity response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ColorControl Primary4Intensity read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeWiredAssessedInputVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.WiredAssessedInputVoltage response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("PowerSource WiredAssessedInputVoltage read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeColorControlPrimary4Intensity : public SubscribeAttribute {
+class SubscribeAttributePowerSourceWiredAssessedInputVoltage : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlPrimary4Intensity()
-        : SubscribeAttribute("primary4intensity")
+    SubscribeAttributePowerSourceWiredAssessedInputVoltage()
+        : SubscribeAttribute("wired-assessed-input-voltage")
     {
     }
 
-    ~SubscribeAttributeColorControlPrimary4Intensity() {}
+    ~SubscribeAttributePowerSourceWiredAssessedInputVoltage() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000022) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePrimary4IntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeWiredAssessedInputVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.Primary4Intensity response %@", [value description]);
+                NSLog(@"PowerSource.WiredAssessedInputVoltage response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -15381,60 +15992,61 @@ class SubscribeAttributeColorControlPrimary4Intensity : public SubscribeAttribut
 };
 
 /*
- * Attribute Primary5X
+ * Attribute WiredAssessedInputFrequency
  */
-class ReadColorControlPrimary5X : public ReadAttribute {
+class ReadPowerSourceWiredAssessedInputFrequency : public ReadAttribute {
 public:
-    ReadColorControlPrimary5X()
-        : ReadAttribute("primary5x")
+    ReadPowerSourceWiredAssessedInputFrequency()
+        : ReadAttribute("wired-assessed-input-frequency")
     {
     }
 
-    ~ReadColorControlPrimary5X() {}
+    ~ReadPowerSourceWiredAssessedInputFrequency() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000024) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributePrimary5XWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.Primary5X response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ColorControl Primary5X read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeWiredAssessedInputFrequencyWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.WiredAssessedInputFrequency response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("PowerSource WiredAssessedInputFrequency read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeColorControlPrimary5X : public SubscribeAttribute {
+class SubscribeAttributePowerSourceWiredAssessedInputFrequency : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlPrimary5X()
-        : SubscribeAttribute("primary5x")
+    SubscribeAttributePowerSourceWiredAssessedInputFrequency()
+        : SubscribeAttribute("wired-assessed-input-frequency")
     {
     }
 
-    ~SubscribeAttributeColorControlPrimary5X() {}
+    ~SubscribeAttributePowerSourceWiredAssessedInputFrequency() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000024) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePrimary5XWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeWiredAssessedInputFrequencyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.Primary5X response %@", [value description]);
+                NSLog(@"PowerSource.WiredAssessedInputFrequency response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -15445,27 +16057,27 @@ class SubscribeAttributeColorControlPrimary5X : public SubscribeAttribute {
 };
 
 /*
- * Attribute Primary5Y
+ * Attribute WiredCurrentType
  */
-class ReadColorControlPrimary5Y : public ReadAttribute {
+class ReadPowerSourceWiredCurrentType : public ReadAttribute {
 public:
-    ReadColorControlPrimary5Y()
-        : ReadAttribute("primary5y")
+    ReadPowerSourceWiredCurrentType()
+        : ReadAttribute("wired-current-type")
     {
     }
 
-    ~ReadColorControlPrimary5Y() {}
+    ~ReadPowerSourceWiredCurrentType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000025) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributePrimary5YWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.Primary5Y response %@", [value description]);
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeWiredCurrentTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSource.WiredCurrentType response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl Primary5Y read Error", error);
+                LogNSError("PowerSource WiredCurrentType read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -15473,32 +16085,32 @@ class ReadColorControlPrimary5Y : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlPrimary5Y : public SubscribeAttribute {
+class SubscribeAttributePowerSourceWiredCurrentType : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlPrimary5Y()
-        : SubscribeAttribute("primary5y")
+    SubscribeAttributePowerSourceWiredCurrentType()
+        : SubscribeAttribute("wired-current-type")
     {
     }
 
-    ~SubscribeAttributeColorControlPrimary5Y() {}
+    ~SubscribeAttributePowerSourceWiredCurrentType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000025) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePrimary5YWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeWiredCurrentTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.Primary5Y response %@", [value description]);
+                NSLog(@"PowerSource.WiredCurrentType response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -15509,27 +16121,27 @@ class SubscribeAttributeColorControlPrimary5Y : public SubscribeAttribute {
 };
 
 /*
- * Attribute Primary5Intensity
+ * Attribute WiredAssessedCurrent
  */
-class ReadColorControlPrimary5Intensity : public ReadAttribute {
+class ReadPowerSourceWiredAssessedCurrent : public ReadAttribute {
 public:
-    ReadColorControlPrimary5Intensity()
-        : ReadAttribute("primary5intensity")
+    ReadPowerSourceWiredAssessedCurrent()
+        : ReadAttribute("wired-assessed-current")
     {
     }
 
-    ~ReadColorControlPrimary5Intensity() {}
+    ~ReadPowerSourceWiredAssessedCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000026) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000006) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributePrimary5IntensityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.Primary5Intensity response %@", [value description]);
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeWiredAssessedCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSource.WiredAssessedCurrent response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl Primary5Intensity read Error", error);
+                LogNSError("PowerSource WiredAssessedCurrent read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -15537,32 +16149,32 @@ class ReadColorControlPrimary5Intensity : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlPrimary5Intensity : public SubscribeAttribute {
+class SubscribeAttributePowerSourceWiredAssessedCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlPrimary5Intensity()
-        : SubscribeAttribute("primary5intensity")
+    SubscribeAttributePowerSourceWiredAssessedCurrent()
+        : SubscribeAttribute("wired-assessed-current")
     {
     }
 
-    ~SubscribeAttributeColorControlPrimary5Intensity() {}
+    ~SubscribeAttributePowerSourceWiredAssessedCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000026) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000006) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePrimary5IntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeWiredAssessedCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.Primary5Intensity response %@", [value description]);
+                NSLog(@"PowerSource.WiredAssessedCurrent response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -15573,27 +16185,27 @@ class SubscribeAttributeColorControlPrimary5Intensity : public SubscribeAttribut
 };
 
 /*
- * Attribute Primary6X
+ * Attribute WiredNominalVoltage
  */
-class ReadColorControlPrimary6X : public ReadAttribute {
+class ReadPowerSourceWiredNominalVoltage : public ReadAttribute {
 public:
-    ReadColorControlPrimary6X()
-        : ReadAttribute("primary6x")
+    ReadPowerSourceWiredNominalVoltage()
+        : ReadAttribute("wired-nominal-voltage")
     {
     }
 
-    ~ReadColorControlPrimary6X() {}
+    ~ReadPowerSourceWiredNominalVoltage() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000028) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000007) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributePrimary6XWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.Primary6X response %@", [value description]);
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeWiredNominalVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSource.WiredNominalVoltage response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl Primary6X read Error", error);
+                LogNSError("PowerSource WiredNominalVoltage read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -15601,32 +16213,32 @@ class ReadColorControlPrimary6X : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlPrimary6X : public SubscribeAttribute {
+class SubscribeAttributePowerSourceWiredNominalVoltage : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlPrimary6X()
-        : SubscribeAttribute("primary6x")
+    SubscribeAttributePowerSourceWiredNominalVoltage()
+        : SubscribeAttribute("wired-nominal-voltage")
     {
     }
 
-    ~SubscribeAttributeColorControlPrimary6X() {}
+    ~SubscribeAttributePowerSourceWiredNominalVoltage() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000028) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000007) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePrimary6XWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeWiredNominalVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.Primary6X response %@", [value description]);
+                NSLog(@"PowerSource.WiredNominalVoltage response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -15637,27 +16249,27 @@ class SubscribeAttributeColorControlPrimary6X : public SubscribeAttribute {
 };
 
 /*
- * Attribute Primary6Y
+ * Attribute WiredMaximumCurrent
  */
-class ReadColorControlPrimary6Y : public ReadAttribute {
+class ReadPowerSourceWiredMaximumCurrent : public ReadAttribute {
 public:
-    ReadColorControlPrimary6Y()
-        : ReadAttribute("primary6y")
+    ReadPowerSourceWiredMaximumCurrent()
+        : ReadAttribute("wired-maximum-current")
     {
     }
 
-    ~ReadColorControlPrimary6Y() {}
+    ~ReadPowerSourceWiredMaximumCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000029) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000008) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributePrimary6YWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.Primary6Y response %@", [value description]);
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeWiredMaximumCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSource.WiredMaximumCurrent response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl Primary6Y read Error", error);
+                LogNSError("PowerSource WiredMaximumCurrent read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -15665,32 +16277,32 @@ class ReadColorControlPrimary6Y : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlPrimary6Y : public SubscribeAttribute {
+class SubscribeAttributePowerSourceWiredMaximumCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlPrimary6Y()
-        : SubscribeAttribute("primary6y")
+    SubscribeAttributePowerSourceWiredMaximumCurrent()
+        : SubscribeAttribute("wired-maximum-current")
     {
     }
 
-    ~SubscribeAttributeColorControlPrimary6Y() {}
+    ~SubscribeAttributePowerSourceWiredMaximumCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000029) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000008) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePrimary6YWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeWiredMaximumCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.Primary6Y response %@", [value description]);
+                NSLog(@"PowerSource.WiredMaximumCurrent response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -15701,27 +16313,27 @@ class SubscribeAttributeColorControlPrimary6Y : public SubscribeAttribute {
 };
 
 /*
- * Attribute Primary6Intensity
+ * Attribute WiredPresent
  */
-class ReadColorControlPrimary6Intensity : public ReadAttribute {
+class ReadPowerSourceWiredPresent : public ReadAttribute {
 public:
-    ReadColorControlPrimary6Intensity()
-        : ReadAttribute("primary6intensity")
+    ReadPowerSourceWiredPresent()
+        : ReadAttribute("wired-present")
     {
     }
 
-    ~ReadColorControlPrimary6Intensity() {}
+    ~ReadPowerSourceWiredPresent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000002A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000009) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributePrimary6IntensityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.Primary6Intensity response %@", [value description]);
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeWiredPresentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSource.WiredPresent response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl Primary6Intensity read Error", error);
+                LogNSError("PowerSource WiredPresent read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -15729,32 +16341,32 @@ class ReadColorControlPrimary6Intensity : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlPrimary6Intensity : public SubscribeAttribute {
+class SubscribeAttributePowerSourceWiredPresent : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlPrimary6Intensity()
-        : SubscribeAttribute("primary6intensity")
+    SubscribeAttributePowerSourceWiredPresent()
+        : SubscribeAttribute("wired-present")
     {
     }
 
-    ~SubscribeAttributeColorControlPrimary6Intensity() {}
+    ~SubscribeAttributePowerSourceWiredPresent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000002A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000009) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePrimary6IntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeWiredPresentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.Primary6Intensity response %@", [value description]);
+                NSLog(@"PowerSource.WiredPresent response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -15765,27 +16377,27 @@ class SubscribeAttributeColorControlPrimary6Intensity : public SubscribeAttribut
 };
 
 /*
- * Attribute WhitePointX
+ * Attribute ActiveWiredFaults
  */
-class ReadColorControlWhitePointX : public ReadAttribute {
+class ReadPowerSourceActiveWiredFaults : public ReadAttribute {
 public:
-    ReadColorControlWhitePointX()
-        : ReadAttribute("white-point-x")
+    ReadPowerSourceActiveWiredFaults()
+        : ReadAttribute("active-wired-faults")
     {
     }
 
-    ~ReadColorControlWhitePointX() {}
+    ~ReadPowerSourceActiveWiredFaults() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000030) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000000A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeWhitePointXWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.WhitePointX response %@", [value description]);
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeActiveWiredFaultsWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSource.ActiveWiredFaults response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl WhitePointX read Error", error);
+                LogNSError("PowerSource ActiveWiredFaults read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -15793,70 +16405,32 @@ class ReadColorControlWhitePointX : public ReadAttribute {
     }
 };
 
-class WriteColorControlWhitePointX : public WriteAttribute {
-public:
-    WriteColorControlWhitePointX()
-        : WriteAttribute("white-point-x")
-    {
-        AddArgument("attr-name", "white-point-x");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteColorControlWhitePointX() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x00000030) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeWhitePointXWithValue:value
-                                             params:params
-                                  completionHandler:^(NSError * _Nullable error) {
-                                      if (error != nil) {
-                                          LogNSError("ColorControl WhitePointX write Error", error);
-                                      }
-                                      SetCommandExitStatus(error);
-                                  }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeColorControlWhitePointX : public SubscribeAttribute {
+class SubscribeAttributePowerSourceActiveWiredFaults : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlWhitePointX()
-        : SubscribeAttribute("white-point-x")
+    SubscribeAttributePowerSourceActiveWiredFaults()
+        : SubscribeAttribute("active-wired-faults")
     {
     }
 
-    ~SubscribeAttributeColorControlWhitePointX() {}
+    ~SubscribeAttributePowerSourceActiveWiredFaults() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000030) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000000A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeWhitePointXWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeActiveWiredFaultsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.WhitePointX response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.ActiveWiredFaults response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -15867,27 +16441,27 @@ class SubscribeAttributeColorControlWhitePointX : public SubscribeAttribute {
 };
 
 /*
- * Attribute WhitePointY
+ * Attribute BatteryVoltage
  */
-class ReadColorControlWhitePointY : public ReadAttribute {
+class ReadPowerSourceBatteryVoltage : public ReadAttribute {
 public:
-    ReadColorControlWhitePointY()
-        : ReadAttribute("white-point-y")
+    ReadPowerSourceBatteryVoltage()
+        : ReadAttribute("battery-voltage")
     {
     }
 
-    ~ReadColorControlWhitePointY() {}
+    ~ReadPowerSourceBatteryVoltage() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000031) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000000B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeWhitePointYWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.WhitePointY response %@", [value description]);
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBatteryVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSource.BatteryVoltage response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl WhitePointY read Error", error);
+                LogNSError("PowerSource BatteryVoltage read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -15895,70 +16469,32 @@ class ReadColorControlWhitePointY : public ReadAttribute {
     }
 };
 
-class WriteColorControlWhitePointY : public WriteAttribute {
-public:
-    WriteColorControlWhitePointY()
-        : WriteAttribute("white-point-y")
-    {
-        AddArgument("attr-name", "white-point-y");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteColorControlWhitePointY() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x00000031) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeWhitePointYWithValue:value
-                                             params:params
-                                  completionHandler:^(NSError * _Nullable error) {
-                                      if (error != nil) {
-                                          LogNSError("ColorControl WhitePointY write Error", error);
-                                      }
-                                      SetCommandExitStatus(error);
-                                  }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeColorControlWhitePointY : public SubscribeAttribute {
+class SubscribeAttributePowerSourceBatteryVoltage : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlWhitePointY()
-        : SubscribeAttribute("white-point-y")
+    SubscribeAttributePowerSourceBatteryVoltage()
+        : SubscribeAttribute("battery-voltage")
     {
     }
 
-    ~SubscribeAttributeColorControlWhitePointY() {}
+    ~SubscribeAttributePowerSourceBatteryVoltage() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000031) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000000B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeWhitePointYWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBatteryVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.WhitePointY response %@", [value description]);
+                NSLog(@"PowerSource.BatteryVoltage response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -15969,98 +16505,61 @@ class SubscribeAttributeColorControlWhitePointY : public SubscribeAttribute {
 };
 
 /*
- * Attribute ColorPointRX
+ * Attribute BatteryPercentRemaining
  */
-class ReadColorControlColorPointRX : public ReadAttribute {
+class ReadPowerSourceBatteryPercentRemaining : public ReadAttribute {
 public:
-    ReadColorControlColorPointRX()
-        : ReadAttribute("color-point-rx")
+    ReadPowerSourceBatteryPercentRemaining()
+        : ReadAttribute("battery-percent-remaining")
     {
     }
 
-    ~ReadColorControlColorPointRX() {}
+    ~ReadPowerSourceBatteryPercentRemaining() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000032) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeColorPointRXWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.ColorPointRX response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ColorControl ColorPointRX read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteColorControlColorPointRX : public WriteAttribute {
-public:
-    WriteColorControlColorPointRX()
-        : WriteAttribute("color-point-rx")
-    {
-        AddArgument("attr-name", "color-point-rx");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteColorControlColorPointRX() {}
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000000C) on endpoint %u", endpointId);
 
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x00000032) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeColorPointRXWithValue:value
-                                              params:params
-                                   completionHandler:^(NSError * _Nullable error) {
-                                       if (error != nil) {
-                                           LogNSError("ColorControl ColorPointRX write Error", error);
-                                       }
-                                       SetCommandExitStatus(error);
-                                   }];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeBatteryPercentRemainingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryPercentRemaining response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("PowerSource BatteryPercentRemaining read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    uint16_t mValue;
 };
 
-class SubscribeAttributeColorControlColorPointRX : public SubscribeAttribute {
+class SubscribeAttributePowerSourceBatteryPercentRemaining : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlColorPointRX()
-        : SubscribeAttribute("color-point-rx")
+    SubscribeAttributePowerSourceBatteryPercentRemaining()
+        : SubscribeAttribute("battery-percent-remaining")
     {
     }
 
-    ~SubscribeAttributeColorControlColorPointRX() {}
+    ~SubscribeAttributePowerSourceBatteryPercentRemaining() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000032) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000000C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeColorPointRXWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBatteryPercentRemainingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.ColorPointRX response %@", [value description]);
+                NSLog(@"PowerSource.BatteryPercentRemaining response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -16071,27 +16570,27 @@ class SubscribeAttributeColorControlColorPointRX : public SubscribeAttribute {
 };
 
 /*
- * Attribute ColorPointRY
+ * Attribute BatteryTimeRemaining
  */
-class ReadColorControlColorPointRY : public ReadAttribute {
+class ReadPowerSourceBatteryTimeRemaining : public ReadAttribute {
 public:
-    ReadColorControlColorPointRY()
-        : ReadAttribute("color-point-ry")
+    ReadPowerSourceBatteryTimeRemaining()
+        : ReadAttribute("battery-time-remaining")
     {
     }
 
-    ~ReadColorControlColorPointRY() {}
+    ~ReadPowerSourceBatteryTimeRemaining() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000033) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000000D) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeColorPointRYWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.ColorPointRY response %@", [value description]);
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBatteryTimeRemainingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSource.BatteryTimeRemaining response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl ColorPointRY read Error", error);
+                LogNSError("PowerSource BatteryTimeRemaining read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -16099,70 +16598,32 @@ class ReadColorControlColorPointRY : public ReadAttribute {
     }
 };
 
-class WriteColorControlColorPointRY : public WriteAttribute {
-public:
-    WriteColorControlColorPointRY()
-        : WriteAttribute("color-point-ry")
-    {
-        AddArgument("attr-name", "color-point-ry");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteColorControlColorPointRY() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x00000033) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeColorPointRYWithValue:value
-                                              params:params
-                                   completionHandler:^(NSError * _Nullable error) {
-                                       if (error != nil) {
-                                           LogNSError("ColorControl ColorPointRY write Error", error);
-                                       }
-                                       SetCommandExitStatus(error);
-                                   }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeColorControlColorPointRY : public SubscribeAttribute {
+class SubscribeAttributePowerSourceBatteryTimeRemaining : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlColorPointRY()
-        : SubscribeAttribute("color-point-ry")
+    SubscribeAttributePowerSourceBatteryTimeRemaining()
+        : SubscribeAttribute("battery-time-remaining")
     {
     }
 
-    ~SubscribeAttributeColorControlColorPointRY() {}
+    ~SubscribeAttributePowerSourceBatteryTimeRemaining() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000033) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000000D) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeColorPointRYWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBatteryTimeRemainingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.ColorPointRY response %@", [value description]);
+                NSLog(@"PowerSource.BatteryTimeRemaining response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -16173,27 +16634,27 @@ class SubscribeAttributeColorControlColorPointRY : public SubscribeAttribute {
 };
 
 /*
- * Attribute ColorPointRIntensity
+ * Attribute BatteryChargeLevel
  */
-class ReadColorControlColorPointRIntensity : public ReadAttribute {
+class ReadPowerSourceBatteryChargeLevel : public ReadAttribute {
 public:
-    ReadColorControlColorPointRIntensity()
-        : ReadAttribute("color-point-rintensity")
+    ReadPowerSourceBatteryChargeLevel()
+        : ReadAttribute("battery-charge-level")
     {
     }
 
-    ~ReadColorControlColorPointRIntensity() {}
+    ~ReadPowerSourceBatteryChargeLevel() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000034) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000000E) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeColorPointRIntensityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.ColorPointRIntensity response %@", [value description]);
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBatteryChargeLevelWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSource.BatteryChargeLevel response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl ColorPointRIntensity read Error", error);
+                LogNSError("PowerSource BatteryChargeLevel read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -16201,70 +16662,97 @@ class ReadColorControlColorPointRIntensity : public ReadAttribute {
     }
 };
 
-class WriteColorControlColorPointRIntensity : public WriteAttribute {
+class SubscribeAttributePowerSourceBatteryChargeLevel : public SubscribeAttribute {
 public:
-    WriteColorControlColorPointRIntensity()
-        : WriteAttribute("color-point-rintensity")
+    SubscribeAttributePowerSourceBatteryChargeLevel()
+        : SubscribeAttribute("battery-charge-level")
     {
-        AddArgument("attr-name", "color-point-rintensity");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteColorControlColorPointRIntensity() {}
+    ~SubscribeAttributePowerSourceBatteryChargeLevel() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x00000034) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000000E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeBatteryChargeLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryChargeLevel response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
-        [cluster writeAttributeColorPointRIntensityWithValue:value
-                                                      params:params
-                                           completionHandler:^(NSError * _Nullable error) {
-                                               if (error != nil) {
-                                                   LogNSError("ColorControl ColorPointRIntensity write Error", error);
-                                               }
-                                               SetCommandExitStatus(error);
-                                           }];
         return CHIP_NO_ERROR;
     }
+};
 
-private:
-    uint8_t mValue;
+/*
+ * Attribute BatteryReplacementNeeded
+ */
+class ReadPowerSourceBatteryReplacementNeeded : public ReadAttribute {
+public:
+    ReadPowerSourceBatteryReplacementNeeded()
+        : ReadAttribute("battery-replacement-needed")
+    {
+    }
+
+    ~ReadPowerSourceBatteryReplacementNeeded() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000000F) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeBatteryReplacementNeededWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryReplacementNeeded response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("PowerSource BatteryReplacementNeeded read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
+        return CHIP_NO_ERROR;
+    }
 };
 
-class SubscribeAttributeColorControlColorPointRIntensity : public SubscribeAttribute {
+class SubscribeAttributePowerSourceBatteryReplacementNeeded : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlColorPointRIntensity()
-        : SubscribeAttribute("color-point-rintensity")
+    SubscribeAttributePowerSourceBatteryReplacementNeeded()
+        : SubscribeAttribute("battery-replacement-needed")
     {
     }
 
-    ~SubscribeAttributeColorControlColorPointRIntensity() {}
+    ~SubscribeAttributePowerSourceBatteryReplacementNeeded() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000034) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000000F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeColorPointRIntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBatteryReplacementNeededWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.ColorPointRIntensity response %@", [value description]);
+                NSLog(@"PowerSource.BatteryReplacementNeeded response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -16275,27 +16763,27 @@ class SubscribeAttributeColorControlColorPointRIntensity : public SubscribeAttri
 };
 
 /*
- * Attribute ColorPointGX
+ * Attribute BatteryReplaceability
  */
-class ReadColorControlColorPointGX : public ReadAttribute {
+class ReadPowerSourceBatteryReplaceability : public ReadAttribute {
 public:
-    ReadColorControlColorPointGX()
-        : ReadAttribute("color-point-gx")
+    ReadPowerSourceBatteryReplaceability()
+        : ReadAttribute("battery-replaceability")
     {
     }
 
-    ~ReadColorControlColorPointGX() {}
+    ~ReadPowerSourceBatteryReplaceability() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000036) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000010) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeColorPointGXWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.ColorPointGX response %@", [value description]);
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBatteryReplaceabilityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSource.BatteryReplaceability response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl ColorPointGX read Error", error);
+                LogNSError("PowerSource BatteryReplaceability read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -16303,70 +16791,32 @@ class ReadColorControlColorPointGX : public ReadAttribute {
     }
 };
 
-class WriteColorControlColorPointGX : public WriteAttribute {
-public:
-    WriteColorControlColorPointGX()
-        : WriteAttribute("color-point-gx")
-    {
-        AddArgument("attr-name", "color-point-gx");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteColorControlColorPointGX() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x00000036) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeColorPointGXWithValue:value
-                                              params:params
-                                   completionHandler:^(NSError * _Nullable error) {
-                                       if (error != nil) {
-                                           LogNSError("ColorControl ColorPointGX write Error", error);
-                                       }
-                                       SetCommandExitStatus(error);
-                                   }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeColorControlColorPointGX : public SubscribeAttribute {
+class SubscribeAttributePowerSourceBatteryReplaceability : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlColorPointGX()
-        : SubscribeAttribute("color-point-gx")
+    SubscribeAttributePowerSourceBatteryReplaceability()
+        : SubscribeAttribute("battery-replaceability")
     {
     }
 
-    ~SubscribeAttributeColorControlColorPointGX() {}
+    ~SubscribeAttributePowerSourceBatteryReplaceability() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000036) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000010) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeColorPointGXWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBatteryReplaceabilityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.ColorPointGX response %@", [value description]);
+                NSLog(@"PowerSource.BatteryReplaceability response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -16377,27 +16827,27 @@ class SubscribeAttributeColorControlColorPointGX : public SubscribeAttribute {
 };
 
 /*
- * Attribute ColorPointGY
+ * Attribute BatteryPresent
  */
-class ReadColorControlColorPointGY : public ReadAttribute {
+class ReadPowerSourceBatteryPresent : public ReadAttribute {
 public:
-    ReadColorControlColorPointGY()
-        : ReadAttribute("color-point-gy")
+    ReadPowerSourceBatteryPresent()
+        : ReadAttribute("battery-present")
     {
     }
 
-    ~ReadColorControlColorPointGY() {}
+    ~ReadPowerSourceBatteryPresent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000037) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000011) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeColorPointGYWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.ColorPointGY response %@", [value description]);
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBatteryPresentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSource.BatteryPresent response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl ColorPointGY read Error", error);
+                LogNSError("PowerSource BatteryPresent read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -16405,70 +16855,32 @@ class ReadColorControlColorPointGY : public ReadAttribute {
     }
 };
 
-class WriteColorControlColorPointGY : public WriteAttribute {
-public:
-    WriteColorControlColorPointGY()
-        : WriteAttribute("color-point-gy")
-    {
-        AddArgument("attr-name", "color-point-gy");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteColorControlColorPointGY() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x00000037) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeColorPointGYWithValue:value
-                                              params:params
-                                   completionHandler:^(NSError * _Nullable error) {
-                                       if (error != nil) {
-                                           LogNSError("ColorControl ColorPointGY write Error", error);
-                                       }
-                                       SetCommandExitStatus(error);
-                                   }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeColorControlColorPointGY : public SubscribeAttribute {
+class SubscribeAttributePowerSourceBatteryPresent : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlColorPointGY()
-        : SubscribeAttribute("color-point-gy")
+    SubscribeAttributePowerSourceBatteryPresent()
+        : SubscribeAttribute("battery-present")
     {
     }
 
-    ~SubscribeAttributeColorControlColorPointGY() {}
+    ~SubscribeAttributePowerSourceBatteryPresent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000037) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000011) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeColorPointGYWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBatteryPresentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.ColorPointGY response %@", [value description]);
+                NSLog(@"PowerSource.BatteryPresent response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -16479,27 +16891,27 @@ class SubscribeAttributeColorControlColorPointGY : public SubscribeAttribute {
 };
 
 /*
- * Attribute ColorPointGIntensity
+ * Attribute ActiveBatteryFaults
  */
-class ReadColorControlColorPointGIntensity : public ReadAttribute {
+class ReadPowerSourceActiveBatteryFaults : public ReadAttribute {
 public:
-    ReadColorControlColorPointGIntensity()
-        : ReadAttribute("color-point-gintensity")
+    ReadPowerSourceActiveBatteryFaults()
+        : ReadAttribute("active-battery-faults")
     {
     }
 
-    ~ReadColorControlColorPointGIntensity() {}
+    ~ReadPowerSourceActiveBatteryFaults() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000038) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000012) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeColorPointGIntensityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.ColorPointGIntensity response %@", [value description]);
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeActiveBatteryFaultsWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSource.ActiveBatteryFaults response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl ColorPointGIntensity read Error", error);
+                LogNSError("PowerSource ActiveBatteryFaults read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -16507,70 +16919,32 @@ class ReadColorControlColorPointGIntensity : public ReadAttribute {
     }
 };
 
-class WriteColorControlColorPointGIntensity : public WriteAttribute {
+class SubscribeAttributePowerSourceActiveBatteryFaults : public SubscribeAttribute {
 public:
-    WriteColorControlColorPointGIntensity()
-        : WriteAttribute("color-point-gintensity")
-    {
-        AddArgument("attr-name", "color-point-gintensity");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteColorControlColorPointGIntensity() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x00000038) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeColorPointGIntensityWithValue:value
-                                                      params:params
-                                           completionHandler:^(NSError * _Nullable error) {
-                                               if (error != nil) {
-                                                   LogNSError("ColorControl ColorPointGIntensity write Error", error);
-                                               }
-                                               SetCommandExitStatus(error);
-                                           }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeColorControlColorPointGIntensity : public SubscribeAttribute {
-public:
-    SubscribeAttributeColorControlColorPointGIntensity()
-        : SubscribeAttribute("color-point-gintensity")
+    SubscribeAttributePowerSourceActiveBatteryFaults()
+        : SubscribeAttribute("active-battery-faults")
     {
     }
 
-    ~SubscribeAttributeColorControlColorPointGIntensity() {}
+    ~SubscribeAttributePowerSourceActiveBatteryFaults() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000038) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000012) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeColorPointGIntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeActiveBatteryFaultsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.ColorPointGIntensity response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.ActiveBatteryFaults response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -16581,27 +16955,28 @@ class SubscribeAttributeColorControlColorPointGIntensity : public SubscribeAttri
 };
 
 /*
- * Attribute ColorPointBX
+ * Attribute BatteryReplacementDescription
  */
-class ReadColorControlColorPointBX : public ReadAttribute {
+class ReadPowerSourceBatteryReplacementDescription : public ReadAttribute {
 public:
-    ReadColorControlColorPointBX()
-        : ReadAttribute("color-point-bx")
+    ReadPowerSourceBatteryReplacementDescription()
+        : ReadAttribute("battery-replacement-description")
     {
     }
 
-    ~ReadColorControlColorPointBX() {}
+    ~ReadPowerSourceBatteryReplacementDescription() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000003A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000013) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeColorPointBXWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.ColorPointBX response %@", [value description]);
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBatteryReplacementDescriptionWithCompletionHandler:^(
+            NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSource.BatteryReplacementDescription response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl ColorPointBX read Error", error);
+                LogNSError("PowerSource BatteryReplacementDescription read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -16609,70 +16984,32 @@ class ReadColorControlColorPointBX : public ReadAttribute {
     }
 };
 
-class WriteColorControlColorPointBX : public WriteAttribute {
-public:
-    WriteColorControlColorPointBX()
-        : WriteAttribute("color-point-bx")
-    {
-        AddArgument("attr-name", "color-point-bx");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteColorControlColorPointBX() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x0000003A) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeColorPointBXWithValue:value
-                                              params:params
-                                   completionHandler:^(NSError * _Nullable error) {
-                                       if (error != nil) {
-                                           LogNSError("ColorControl ColorPointBX write Error", error);
-                                       }
-                                       SetCommandExitStatus(error);
-                                   }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeColorControlColorPointBX : public SubscribeAttribute {
+class SubscribeAttributePowerSourceBatteryReplacementDescription : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlColorPointBX()
-        : SubscribeAttribute("color-point-bx")
+    SubscribeAttributePowerSourceBatteryReplacementDescription()
+        : SubscribeAttribute("battery-replacement-description")
     {
     }
 
-    ~SubscribeAttributeColorControlColorPointBX() {}
+    ~SubscribeAttributePowerSourceBatteryReplacementDescription() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000003A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000013) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeColorPointBXWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBatteryReplacementDescriptionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.ColorPointBX response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryReplacementDescription response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -16683,98 +17020,61 @@ class SubscribeAttributeColorControlColorPointBX : public SubscribeAttribute {
 };
 
 /*
- * Attribute ColorPointBY
+ * Attribute BatteryCommonDesignation
  */
-class ReadColorControlColorPointBY : public ReadAttribute {
+class ReadPowerSourceBatteryCommonDesignation : public ReadAttribute {
 public:
-    ReadColorControlColorPointBY()
-        : ReadAttribute("color-point-by")
+    ReadPowerSourceBatteryCommonDesignation()
+        : ReadAttribute("battery-common-designation")
     {
     }
 
-    ~ReadColorControlColorPointBY() {}
+    ~ReadPowerSourceBatteryCommonDesignation() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000003B) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeColorPointBYWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.ColorPointBY response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ColorControl ColorPointBY read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteColorControlColorPointBY : public WriteAttribute {
-public:
-    WriteColorControlColorPointBY()
-        : WriteAttribute("color-point-by")
-    {
-        AddArgument("attr-name", "color-point-by");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteColorControlColorPointBY() {}
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000014) on endpoint %u", endpointId);
 
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x0000003B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeColorPointBYWithValue:value
-                                              params:params
-                                   completionHandler:^(NSError * _Nullable error) {
-                                       if (error != nil) {
-                                           LogNSError("ColorControl ColorPointBY write Error", error);
-                                       }
-                                       SetCommandExitStatus(error);
-                                   }];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeBatteryCommonDesignationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryCommonDesignation response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("PowerSource BatteryCommonDesignation read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    uint16_t mValue;
 };
 
-class SubscribeAttributeColorControlColorPointBY : public SubscribeAttribute {
+class SubscribeAttributePowerSourceBatteryCommonDesignation : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlColorPointBY()
-        : SubscribeAttribute("color-point-by")
+    SubscribeAttributePowerSourceBatteryCommonDesignation()
+        : SubscribeAttribute("battery-common-designation")
     {
     }
 
-    ~SubscribeAttributeColorControlColorPointBY() {}
+    ~SubscribeAttributePowerSourceBatteryCommonDesignation() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000003B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000014) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeColorPointBYWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBatteryCommonDesignationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.ColorPointBY response %@", [value description]);
+                NSLog(@"PowerSource.BatteryCommonDesignation response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -16785,27 +17085,27 @@ class SubscribeAttributeColorControlColorPointBY : public SubscribeAttribute {
 };
 
 /*
- * Attribute ColorPointBIntensity
+ * Attribute BatteryANSIDesignation
  */
-class ReadColorControlColorPointBIntensity : public ReadAttribute {
+class ReadPowerSourceBatteryANSIDesignation : public ReadAttribute {
 public:
-    ReadColorControlColorPointBIntensity()
-        : ReadAttribute("color-point-bintensity")
+    ReadPowerSourceBatteryANSIDesignation()
+        : ReadAttribute("battery-ansidesignation")
     {
     }
 
-    ~ReadColorControlColorPointBIntensity() {}
+    ~ReadPowerSourceBatteryANSIDesignation() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000003C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000015) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeColorPointBIntensityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.ColorPointBIntensity response %@", [value description]);
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBatteryANSIDesignationWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSource.BatteryANSIDesignation response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl ColorPointBIntensity read Error", error);
+                LogNSError("PowerSource BatteryANSIDesignation read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -16813,70 +17113,32 @@ class ReadColorControlColorPointBIntensity : public ReadAttribute {
     }
 };
 
-class WriteColorControlColorPointBIntensity : public WriteAttribute {
-public:
-    WriteColorControlColorPointBIntensity()
-        : WriteAttribute("color-point-bintensity")
-    {
-        AddArgument("attr-name", "color-point-bintensity");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteColorControlColorPointBIntensity() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x0000003C) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeColorPointBIntensityWithValue:value
-                                                      params:params
-                                           completionHandler:^(NSError * _Nullable error) {
-                                               if (error != nil) {
-                                                   LogNSError("ColorControl ColorPointBIntensity write Error", error);
-                                               }
-                                               SetCommandExitStatus(error);
-                                           }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeColorControlColorPointBIntensity : public SubscribeAttribute {
+class SubscribeAttributePowerSourceBatteryANSIDesignation : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlColorPointBIntensity()
-        : SubscribeAttribute("color-point-bintensity")
+    SubscribeAttributePowerSourceBatteryANSIDesignation()
+        : SubscribeAttribute("battery-ansidesignation")
     {
     }
 
-    ~SubscribeAttributeColorControlColorPointBIntensity() {}
+    ~SubscribeAttributePowerSourceBatteryANSIDesignation() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000003C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000015) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeColorPointBIntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBatteryANSIDesignationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.ColorPointBIntensity response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryANSIDesignation response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -16887,27 +17149,27 @@ class SubscribeAttributeColorControlColorPointBIntensity : public SubscribeAttri
 };
 
 /*
- * Attribute EnhancedCurrentHue
+ * Attribute BatteryIECDesignation
  */
-class ReadColorControlEnhancedCurrentHue : public ReadAttribute {
+class ReadPowerSourceBatteryIECDesignation : public ReadAttribute {
 public:
-    ReadColorControlEnhancedCurrentHue()
-        : ReadAttribute("enhanced-current-hue")
+    ReadPowerSourceBatteryIECDesignation()
+        : ReadAttribute("battery-iecdesignation")
     {
     }
 
-    ~ReadColorControlEnhancedCurrentHue() {}
+    ~ReadPowerSourceBatteryIECDesignation() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00004000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000016) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeEnhancedCurrentHueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.EnhancedCurrentHue response %@", [value description]);
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBatteryIECDesignationWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSource.BatteryIECDesignation response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl EnhancedCurrentHue read Error", error);
+                LogNSError("PowerSource BatteryIECDesignation read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -16915,32 +17177,32 @@ class ReadColorControlEnhancedCurrentHue : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlEnhancedCurrentHue : public SubscribeAttribute {
+class SubscribeAttributePowerSourceBatteryIECDesignation : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlEnhancedCurrentHue()
-        : SubscribeAttribute("enhanced-current-hue")
+    SubscribeAttributePowerSourceBatteryIECDesignation()
+        : SubscribeAttribute("battery-iecdesignation")
     {
     }
 
-    ~SubscribeAttributeColorControlEnhancedCurrentHue() {}
+    ~SubscribeAttributePowerSourceBatteryIECDesignation() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00004000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000016) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeEnhancedCurrentHueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBatteryIECDesignationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.EnhancedCurrentHue response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryIECDesignation response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -16951,60 +17213,61 @@ class SubscribeAttributeColorControlEnhancedCurrentHue : public SubscribeAttribu
 };
 
 /*
- * Attribute EnhancedColorMode
+ * Attribute BatteryApprovedChemistry
  */
-class ReadColorControlEnhancedColorMode : public ReadAttribute {
+class ReadPowerSourceBatteryApprovedChemistry : public ReadAttribute {
 public:
-    ReadColorControlEnhancedColorMode()
-        : ReadAttribute("enhanced-color-mode")
+    ReadPowerSourceBatteryApprovedChemistry()
+        : ReadAttribute("battery-approved-chemistry")
     {
     }
 
-    ~ReadColorControlEnhancedColorMode() {}
+    ~ReadPowerSourceBatteryApprovedChemistry() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00004001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000017) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeEnhancedColorModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.EnhancedColorMode response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ColorControl EnhancedColorMode read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeBatteryApprovedChemistryWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryApprovedChemistry response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("PowerSource BatteryApprovedChemistry read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeColorControlEnhancedColorMode : public SubscribeAttribute {
+class SubscribeAttributePowerSourceBatteryApprovedChemistry : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlEnhancedColorMode()
-        : SubscribeAttribute("enhanced-color-mode")
+    SubscribeAttributePowerSourceBatteryApprovedChemistry()
+        : SubscribeAttribute("battery-approved-chemistry")
     {
     }
 
-    ~SubscribeAttributeColorControlEnhancedColorMode() {}
+    ~SubscribeAttributePowerSourceBatteryApprovedChemistry() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00004001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000017) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeEnhancedColorModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBatteryApprovedChemistryWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.EnhancedColorMode response %@", [value description]);
+                NSLog(@"PowerSource.BatteryApprovedChemistry response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -17015,27 +17278,27 @@ class SubscribeAttributeColorControlEnhancedColorMode : public SubscribeAttribut
 };
 
 /*
- * Attribute ColorLoopActive
+ * Attribute BatteryCapacity
  */
-class ReadColorControlColorLoopActive : public ReadAttribute {
+class ReadPowerSourceBatteryCapacity : public ReadAttribute {
 public:
-    ReadColorControlColorLoopActive()
-        : ReadAttribute("color-loop-active")
+    ReadPowerSourceBatteryCapacity()
+        : ReadAttribute("battery-capacity")
     {
     }
 
-    ~ReadColorControlColorLoopActive() {}
+    ~ReadPowerSourceBatteryCapacity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00004002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000018) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeColorLoopActiveWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.ColorLoopActive response %@", [value description]);
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBatteryCapacityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSource.BatteryCapacity response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl ColorLoopActive read Error", error);
+                LogNSError("PowerSource BatteryCapacity read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -17043,32 +17306,32 @@ class ReadColorControlColorLoopActive : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlColorLoopActive : public SubscribeAttribute {
+class SubscribeAttributePowerSourceBatteryCapacity : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlColorLoopActive()
-        : SubscribeAttribute("color-loop-active")
+    SubscribeAttributePowerSourceBatteryCapacity()
+        : SubscribeAttribute("battery-capacity")
     {
     }
 
-    ~SubscribeAttributeColorControlColorLoopActive() {}
+    ~SubscribeAttributePowerSourceBatteryCapacity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00004002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000018) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeColorLoopActiveWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBatteryCapacityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.ColorLoopActive response %@", [value description]);
+                NSLog(@"PowerSource.BatteryCapacity response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -17079,27 +17342,27 @@ class SubscribeAttributeColorControlColorLoopActive : public SubscribeAttribute
 };
 
 /*
- * Attribute ColorLoopDirection
+ * Attribute BatteryQuantity
  */
-class ReadColorControlColorLoopDirection : public ReadAttribute {
+class ReadPowerSourceBatteryQuantity : public ReadAttribute {
 public:
-    ReadColorControlColorLoopDirection()
-        : ReadAttribute("color-loop-direction")
+    ReadPowerSourceBatteryQuantity()
+        : ReadAttribute("battery-quantity")
     {
     }
 
-    ~ReadColorControlColorLoopDirection() {}
+    ~ReadPowerSourceBatteryQuantity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00004003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000019) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeColorLoopDirectionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.ColorLoopDirection response %@", [value description]);
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBatteryQuantityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSource.BatteryQuantity response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl ColorLoopDirection read Error", error);
+                LogNSError("PowerSource BatteryQuantity read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -17107,32 +17370,32 @@ class ReadColorControlColorLoopDirection : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlColorLoopDirection : public SubscribeAttribute {
+class SubscribeAttributePowerSourceBatteryQuantity : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlColorLoopDirection()
-        : SubscribeAttribute("color-loop-direction")
+    SubscribeAttributePowerSourceBatteryQuantity()
+        : SubscribeAttribute("battery-quantity")
     {
     }
 
-    ~SubscribeAttributeColorControlColorLoopDirection() {}
+    ~SubscribeAttributePowerSourceBatteryQuantity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00004003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000019) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeColorLoopDirectionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBatteryQuantityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.ColorLoopDirection response %@", [value description]);
+                NSLog(@"PowerSource.BatteryQuantity response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -17143,27 +17406,27 @@ class SubscribeAttributeColorControlColorLoopDirection : public SubscribeAttribu
 };
 
 /*
- * Attribute ColorLoopTime
+ * Attribute BatteryChargeState
  */
-class ReadColorControlColorLoopTime : public ReadAttribute {
+class ReadPowerSourceBatteryChargeState : public ReadAttribute {
 public:
-    ReadColorControlColorLoopTime()
-        : ReadAttribute("color-loop-time")
+    ReadPowerSourceBatteryChargeState()
+        : ReadAttribute("battery-charge-state")
     {
     }
 
-    ~ReadColorControlColorLoopTime() {}
+    ~ReadPowerSourceBatteryChargeState() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00004004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000001A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeColorLoopTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.ColorLoopTime response %@", [value description]);
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBatteryChargeStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSource.BatteryChargeState response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl ColorLoopTime read Error", error);
+                LogNSError("PowerSource BatteryChargeState read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -17171,32 +17434,32 @@ class ReadColorControlColorLoopTime : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlColorLoopTime : public SubscribeAttribute {
+class SubscribeAttributePowerSourceBatteryChargeState : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlColorLoopTime()
-        : SubscribeAttribute("color-loop-time")
+    SubscribeAttributePowerSourceBatteryChargeState()
+        : SubscribeAttribute("battery-charge-state")
     {
     }
 
-    ~SubscribeAttributeColorControlColorLoopTime() {}
+    ~SubscribeAttributePowerSourceBatteryChargeState() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00004004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000001A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeColorLoopTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBatteryChargeStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.ColorLoopTime response %@", [value description]);
+                NSLog(@"PowerSource.BatteryChargeState response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -17207,28 +17470,28 @@ class SubscribeAttributeColorControlColorLoopTime : public SubscribeAttribute {
 };
 
 /*
- * Attribute ColorLoopStartEnhancedHue
+ * Attribute BatteryTimeToFullCharge
  */
-class ReadColorControlColorLoopStartEnhancedHue : public ReadAttribute {
+class ReadPowerSourceBatteryTimeToFullCharge : public ReadAttribute {
 public:
-    ReadColorControlColorLoopStartEnhancedHue()
-        : ReadAttribute("color-loop-start-enhanced-hue")
+    ReadPowerSourceBatteryTimeToFullCharge()
+        : ReadAttribute("battery-time-to-full-charge")
     {
     }
 
-    ~ReadColorControlColorLoopStartEnhancedHue() {}
+    ~ReadPowerSourceBatteryTimeToFullCharge() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00004005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000001B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster
-            readAttributeColorLoopStartEnhancedHueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.ColorLoopStartEnhancedHue response %@", [value description]);
+            readAttributeBatteryTimeToFullChargeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.BatteryTimeToFullCharge response %@", [value description]);
                 if (error != nil) {
-                    LogNSError("ColorControl ColorLoopStartEnhancedHue read Error", error);
+                    LogNSError("PowerSource BatteryTimeToFullCharge read Error", error);
                 }
                 SetCommandExitStatus(error);
             }];
@@ -17236,32 +17499,32 @@ class ReadColorControlColorLoopStartEnhancedHue : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlColorLoopStartEnhancedHue : public SubscribeAttribute {
+class SubscribeAttributePowerSourceBatteryTimeToFullCharge : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlColorLoopStartEnhancedHue()
-        : SubscribeAttribute("color-loop-start-enhanced-hue")
+    SubscribeAttributePowerSourceBatteryTimeToFullCharge()
+        : SubscribeAttribute("battery-time-to-full-charge")
     {
     }
 
-    ~SubscribeAttributeColorControlColorLoopStartEnhancedHue() {}
+    ~SubscribeAttributePowerSourceBatteryTimeToFullCharge() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00004005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000001B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeColorLoopStartEnhancedHueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBatteryTimeToFullChargeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.ColorLoopStartEnhancedHue response %@", [value description]);
+                NSLog(@"PowerSource.BatteryTimeToFullCharge response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -17272,92 +17535,28 @@ class SubscribeAttributeColorControlColorLoopStartEnhancedHue : public Subscribe
 };
 
 /*
- * Attribute ColorLoopStoredEnhancedHue
- */
-class ReadColorControlColorLoopStoredEnhancedHue : public ReadAttribute {
-public:
-    ReadColorControlColorLoopStoredEnhancedHue()
-        : ReadAttribute("color-loop-stored-enhanced-hue")
-    {
-    }
-
-    ~ReadColorControlColorLoopStoredEnhancedHue() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00004006) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeColorLoopStoredEnhancedHueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.ColorLoopStoredEnhancedHue response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("ColorControl ColorLoopStoredEnhancedHue read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class SubscribeAttributeColorControlColorLoopStoredEnhancedHue : public SubscribeAttribute {
-public:
-    SubscribeAttributeColorControlColorLoopStoredEnhancedHue()
-        : SubscribeAttribute("color-loop-stored-enhanced-hue")
-    {
-    }
-
-    ~SubscribeAttributeColorControlColorLoopStoredEnhancedHue() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00004006) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeColorLoopStoredEnhancedHueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.ColorLoopStoredEnhancedHue response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-/*
- * Attribute ColorCapabilities
+ * Attribute BatteryFunctionalWhileCharging
  */
-class ReadColorControlColorCapabilities : public ReadAttribute {
+class ReadPowerSourceBatteryFunctionalWhileCharging : public ReadAttribute {
 public:
-    ReadColorControlColorCapabilities()
-        : ReadAttribute("color-capabilities")
+    ReadPowerSourceBatteryFunctionalWhileCharging()
+        : ReadAttribute("battery-functional-while-charging")
     {
     }
 
-    ~ReadColorControlColorCapabilities() {}
+    ~ReadPowerSourceBatteryFunctionalWhileCharging() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000400A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000001C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeColorCapabilitiesWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.ColorCapabilities response %@", [value description]);
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBatteryFunctionalWhileChargingWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSource.BatteryFunctionalWhileCharging response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl ColorCapabilities read Error", error);
+                LogNSError("PowerSource BatteryFunctionalWhileCharging read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -17365,162 +17564,32 @@ class ReadColorControlColorCapabilities : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlColorCapabilities : public SubscribeAttribute {
-public:
-    SubscribeAttributeColorControlColorCapabilities()
-        : SubscribeAttribute("color-capabilities")
-    {
-    }
-
-    ~SubscribeAttributeColorControlColorCapabilities() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000400A) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeColorCapabilitiesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.ColorCapabilities response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-/*
- * Attribute ColorTempPhysicalMinMireds
- */
-class ReadColorControlColorTempPhysicalMinMireds : public ReadAttribute {
-public:
-    ReadColorControlColorTempPhysicalMinMireds()
-        : ReadAttribute("color-temp-physical-min-mireds")
-    {
-    }
-
-    ~ReadColorControlColorTempPhysicalMinMireds() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000400B) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeColorTempPhysicalMinMiredsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.ColorTempPhysicalMinMireds response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("ColorControl ColorTempPhysicalMinMireds read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class SubscribeAttributeColorControlColorTempPhysicalMinMireds : public SubscribeAttribute {
-public:
-    SubscribeAttributeColorControlColorTempPhysicalMinMireds()
-        : SubscribeAttribute("color-temp-physical-min-mireds")
-    {
-    }
-
-    ~SubscribeAttributeColorControlColorTempPhysicalMinMireds() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000400B) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeColorTempPhysicalMinMiredsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.ColorTempPhysicalMinMireds response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-/*
- * Attribute ColorTempPhysicalMaxMireds
- */
-class ReadColorControlColorTempPhysicalMaxMireds : public ReadAttribute {
-public:
-    ReadColorControlColorTempPhysicalMaxMireds()
-        : ReadAttribute("color-temp-physical-max-mireds")
-    {
-    }
-
-    ~ReadColorControlColorTempPhysicalMaxMireds() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000400C) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeColorTempPhysicalMaxMiredsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.ColorTempPhysicalMaxMireds response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("ColorControl ColorTempPhysicalMaxMireds read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class SubscribeAttributeColorControlColorTempPhysicalMaxMireds : public SubscribeAttribute {
+class SubscribeAttributePowerSourceBatteryFunctionalWhileCharging : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlColorTempPhysicalMaxMireds()
-        : SubscribeAttribute("color-temp-physical-max-mireds")
+    SubscribeAttributePowerSourceBatteryFunctionalWhileCharging()
+        : SubscribeAttribute("battery-functional-while-charging")
     {
     }
 
-    ~SubscribeAttributeColorControlColorTempPhysicalMaxMireds() {}
+    ~SubscribeAttributePowerSourceBatteryFunctionalWhileCharging() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000400C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000001C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeColorTempPhysicalMaxMiredsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBatteryFunctionalWhileChargingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.ColorTempPhysicalMaxMireds response %@", [value description]);
+                NSLog(@"PowerSource.BatteryFunctionalWhileCharging response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -17531,28 +17600,27 @@ class SubscribeAttributeColorControlColorTempPhysicalMaxMireds : public Subscrib
 };
 
 /*
- * Attribute CoupleColorTempToLevelMinMireds
+ * Attribute BatteryChargingCurrent
  */
-class ReadColorControlCoupleColorTempToLevelMinMireds : public ReadAttribute {
+class ReadPowerSourceBatteryChargingCurrent : public ReadAttribute {
 public:
-    ReadColorControlCoupleColorTempToLevelMinMireds()
-        : ReadAttribute("couple-color-temp-to-level-min-mireds")
+    ReadPowerSourceBatteryChargingCurrent()
+        : ReadAttribute("battery-charging-current")
     {
     }
 
-    ~ReadColorControlCoupleColorTempToLevelMinMireds() {}
+    ~ReadPowerSourceBatteryChargingCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000400D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000001D) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCoupleColorTempToLevelMinMiredsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.CoupleColorTempToLevelMinMireds response %@", [value description]);
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBatteryChargingCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PowerSource.BatteryChargingCurrent response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl CoupleColorTempToLevelMinMireds read Error", error);
+                LogNSError("PowerSource BatteryChargingCurrent read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -17560,32 +17628,32 @@ class ReadColorControlCoupleColorTempToLevelMinMireds : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlCoupleColorTempToLevelMinMireds : public SubscribeAttribute {
+class SubscribeAttributePowerSourceBatteryChargingCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlCoupleColorTempToLevelMinMireds()
-        : SubscribeAttribute("couple-color-temp-to-level-min-mireds")
+    SubscribeAttributePowerSourceBatteryChargingCurrent()
+        : SubscribeAttribute("battery-charging-current")
     {
     }
 
-    ~SubscribeAttributeColorControlCoupleColorTempToLevelMinMireds() {}
+    ~SubscribeAttributePowerSourceBatteryChargingCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000400D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000001D) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCoupleColorTempToLevelMinMiredsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBatteryChargingCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.CoupleColorTempToLevelMinMireds response %@", [value description]);
+                NSLog(@"PowerSource.BatteryChargingCurrent response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -17596,100 +17664,61 @@ class SubscribeAttributeColorControlCoupleColorTempToLevelMinMireds : public Sub
 };
 
 /*
- * Attribute StartUpColorTemperatureMireds
+ * Attribute ActiveBatteryChargeFaults
  */
-class ReadColorControlStartUpColorTemperatureMireds : public ReadAttribute {
+class ReadPowerSourceActiveBatteryChargeFaults : public ReadAttribute {
 public:
-    ReadColorControlStartUpColorTemperatureMireds()
-        : ReadAttribute("start-up-color-temperature-mireds")
+    ReadPowerSourceActiveBatteryChargeFaults()
+        : ReadAttribute("active-battery-charge-faults")
     {
     }
 
-    ~ReadColorControlStartUpColorTemperatureMireds() {}
+    ~ReadPowerSourceActiveBatteryChargeFaults() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00004010) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeStartUpColorTemperatureMiredsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.StartUpColorTemperatureMireds response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ColorControl StartUpColorTemperatureMireds read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteColorControlStartUpColorTemperatureMireds : public WriteAttribute {
-public:
-    WriteColorControlStartUpColorTemperatureMireds()
-        : WriteAttribute("start-up-color-temperature-mireds")
-    {
-        AddArgument("attr-name", "start-up-color-temperature-mireds");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteColorControlStartUpColorTemperatureMireds() {}
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000001E) on endpoint %u", endpointId);
 
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x00004010) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster
-            writeAttributeStartUpColorTemperatureMiredsWithValue:value
-                                                          params:params
-                                               completionHandler:^(NSError * _Nullable error) {
-                                                   if (error != nil) {
-                                                       LogNSError("ColorControl StartUpColorTemperatureMireds write Error", error);
-                                                   }
-                                                   SetCommandExitStatus(error);
-                                               }];
+            readAttributeActiveBatteryChargeFaultsWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.ActiveBatteryChargeFaults response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("PowerSource ActiveBatteryChargeFaults read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    uint16_t mValue;
 };
 
-class SubscribeAttributeColorControlStartUpColorTemperatureMireds : public SubscribeAttribute {
+class SubscribeAttributePowerSourceActiveBatteryChargeFaults : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlStartUpColorTemperatureMireds()
-        : SubscribeAttribute("start-up-color-temperature-mireds")
+    SubscribeAttributePowerSourceActiveBatteryChargeFaults()
+        : SubscribeAttribute("active-battery-charge-faults")
     {
     }
 
-    ~SubscribeAttributeColorControlStartUpColorTemperatureMireds() {}
+    ~SubscribeAttributePowerSourceActiveBatteryChargeFaults() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00004010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000001E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeStartUpColorTemperatureMiredsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeActiveBatteryChargeFaultsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.StartUpColorTemperatureMireds response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PowerSource.ActiveBatteryChargeFaults response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -17702,25 +17731,25 @@ class SubscribeAttributeColorControlStartUpColorTemperatureMireds : public Subsc
 /*
  * Attribute GeneratedCommandList
  */
-class ReadColorControlGeneratedCommandList : public ReadAttribute {
+class ReadPowerSourceGeneratedCommandList : public ReadAttribute {
 public:
-    ReadColorControlGeneratedCommandList()
+    ReadPowerSourceGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadColorControlGeneratedCommandList() {}
+    ~ReadPowerSourceGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.GeneratedCommandList response %@", [value description]);
+            NSLog(@"PowerSource.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl GeneratedCommandList read Error", error);
+                LogNSError("PowerSource GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -17728,20 +17757,20 @@ class ReadColorControlGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributePowerSourceGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlGeneratedCommandList()
+    SubscribeAttributePowerSourceGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeColorControlGeneratedCommandList() {}
+    ~SubscribeAttributePowerSourceGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -17753,7 +17782,7 @@ class SubscribeAttributeColorControlGeneratedCommandList : public SubscribeAttri
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.GeneratedCommandList response %@", [value description]);
+                NSLog(@"PowerSource.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -17766,25 +17795,25 @@ class SubscribeAttributeColorControlGeneratedCommandList : public SubscribeAttri
 /*
  * Attribute AcceptedCommandList
  */
-class ReadColorControlAcceptedCommandList : public ReadAttribute {
+class ReadPowerSourceAcceptedCommandList : public ReadAttribute {
 public:
-    ReadColorControlAcceptedCommandList()
+    ReadPowerSourceAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadColorControlAcceptedCommandList() {}
+    ~ReadPowerSourceAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.AcceptedCommandList response %@", [value description]);
+            NSLog(@"PowerSource.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl AcceptedCommandList read Error", error);
+                LogNSError("PowerSource AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -17792,20 +17821,20 @@ class ReadColorControlAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributePowerSourceAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlAcceptedCommandList()
+    SubscribeAttributePowerSourceAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeColorControlAcceptedCommandList() {}
+    ~SubscribeAttributePowerSourceAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -17817,7 +17846,7 @@ class SubscribeAttributeColorControlAcceptedCommandList : public SubscribeAttrib
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.AcceptedCommandList response %@", [value description]);
+                NSLog(@"PowerSource.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -17830,25 +17859,25 @@ class SubscribeAttributeColorControlAcceptedCommandList : public SubscribeAttrib
 /*
  * Attribute AttributeList
  */
-class ReadColorControlAttributeList : public ReadAttribute {
+class ReadPowerSourceAttributeList : public ReadAttribute {
 public:
-    ReadColorControlAttributeList()
+    ReadPowerSourceAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadColorControlAttributeList() {}
+    ~ReadPowerSourceAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.AttributeList response %@", [value description]);
+            NSLog(@"PowerSource.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl AttributeList read Error", error);
+                LogNSError("PowerSource AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -17856,20 +17885,20 @@ class ReadColorControlAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlAttributeList : public SubscribeAttribute {
+class SubscribeAttributePowerSourceAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlAttributeList()
+    SubscribeAttributePowerSourceAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeColorControlAttributeList() {}
+    ~SubscribeAttributePowerSourceAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -17881,7 +17910,7 @@ class SubscribeAttributeColorControlAttributeList : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.AttributeList response %@", [value description]);
+                NSLog(@"PowerSource.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -17894,25 +17923,25 @@ class SubscribeAttributeColorControlAttributeList : public SubscribeAttribute {
 /*
  * Attribute FeatureMap
  */
-class ReadColorControlFeatureMap : public ReadAttribute {
+class ReadPowerSourceFeatureMap : public ReadAttribute {
 public:
-    ReadColorControlFeatureMap()
+    ReadPowerSourceFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadColorControlFeatureMap() {}
+    ~ReadPowerSourceFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.FeatureMap response %@", [value description]);
+            NSLog(@"PowerSource.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl FeatureMap read Error", error);
+                LogNSError("PowerSource FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -17920,20 +17949,20 @@ class ReadColorControlFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlFeatureMap : public SubscribeAttribute {
+class SubscribeAttributePowerSourceFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlFeatureMap()
+    SubscribeAttributePowerSourceFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeColorControlFeatureMap() {}
+    ~SubscribeAttributePowerSourceFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -17945,7 +17974,7 @@ class SubscribeAttributeColorControlFeatureMap : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.FeatureMap response %@", [value description]);
+                NSLog(@"PowerSource.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -17958,25 +17987,25 @@ class SubscribeAttributeColorControlFeatureMap : public SubscribeAttribute {
 /*
  * Attribute ClusterRevision
  */
-class ReadColorControlClusterRevision : public ReadAttribute {
+class ReadPowerSourceClusterRevision : public ReadAttribute {
 public:
-    ReadColorControlClusterRevision()
+    ReadPowerSourceClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadColorControlClusterRevision() {}
+    ~ReadPowerSourceClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ColorControl.ClusterRevision response %@", [value description]);
+            NSLog(@"PowerSource.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("ColorControl ClusterRevision read Error", error);
+                LogNSError("PowerSource ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -17984,20 +18013,20 @@ class ReadColorControlClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeColorControlClusterRevision : public SubscribeAttribute {
+class SubscribeAttributePowerSourceClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeColorControlClusterRevision()
+    SubscribeAttributePowerSourceClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeColorControlClusterRevision() {}
+    ~SubscribeAttributePowerSourceClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -18009,7 +18038,7 @@ class SubscribeAttributeColorControlClusterRevision : public SubscribeAttribute
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ColorControl.ClusterRevision response %@", [value description]);
+                NSLog(@"PowerSource.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -18020,15 +18049,19 @@ class SubscribeAttributeColorControlClusterRevision : public SubscribeAttribute
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster ContentLauncher                                             | 0x050A |
+| Cluster GeneralCommissioning                                        | 0x0030 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * LaunchContent                                                     |   0x00 |
-| * LaunchURL                                                         |   0x01 |
+| * ArmFailSafe                                                       |   0x00 |
+| * SetRegulatoryConfig                                               |   0x02 |
+| * CommissioningComplete                                             |   0x04 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * AcceptHeader                                                      | 0x0000 |
-| * SupportedStreamingProtocols                                       | 0x0001 |
+| * Breadcrumb                                                        | 0x0000 |
+| * BasicCommissioningInfo                                            | 0x0001 |
+| * RegulatoryConfig                                                  | 0x0002 |
+| * LocationCapability                                                | 0x0003 |
+| * SupportsConcurrentConnection                                      | 0x0004 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -18039,488 +18072,255 @@ class SubscribeAttributeColorControlClusterRevision : public SubscribeAttribute
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command LaunchContent
+ * Command ArmFailSafe
  */
-class ContentLauncherLaunchContent : public ClusterCommand {
+class GeneralCommissioningArmFailSafe : public ClusterCommand {
 public:
-    ContentLauncherLaunchContent()
-        : ClusterCommand("launch-content")
-        , mComplex_Search(&mRequest.search)
+    GeneralCommissioningArmFailSafe()
+        : ClusterCommand("arm-fail-safe")
     {
-        AddArgument("Search", &mComplex_Search);
-        AddArgument("AutoPlay", 0, 1, &mRequest.autoPlay);
-        AddArgument("Data", &mRequest.data);
+        AddArgument("ExpiryLengthSeconds", 0, UINT16_MAX, &mRequest.expiryLengthSeconds);
+        AddArgument("Breadcrumb", 0, UINT64_MAX, &mRequest.breadcrumb);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000030) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPContentLauncherClusterLaunchContentParams alloc] init];
+        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        __auto_type * params = [[CHIPGeneralCommissioningClusterArmFailSafeParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.search = [CHIPContentLauncherClusterContentSearch new];
-        { // Scope for our temporary variables
-            auto * array_1 = [NSMutableArray new];
-            for (auto & entry_1 : mRequest.search.parameterList) {
-                CHIPContentLauncherClusterParameter * newElement_1;
-                newElement_1 = [CHIPContentLauncherClusterParameter new];
-                newElement_1.type = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_1.type)];
-                newElement_1.value = [[NSString alloc] initWithBytes:entry_1.value.data()
-                                                              length:entry_1.value.size()
-                                                            encoding:NSUTF8StringEncoding];
-                if (entry_1.externalIDList.HasValue()) {
-                    { // Scope for our temporary variables
-                        auto * array_4 = [NSMutableArray new];
-                        for (auto & entry_4 : entry_1.externalIDList.Value()) {
-                            CHIPContentLauncherClusterAdditionalInfo * newElement_4;
-                            newElement_4 = [CHIPContentLauncherClusterAdditionalInfo new];
-                            newElement_4.name = [[NSString alloc] initWithBytes:entry_4.name.data()
-                                                                         length:entry_4.name.size()
-                                                                       encoding:NSUTF8StringEncoding];
-                            newElement_4.value = [[NSString alloc] initWithBytes:entry_4.value.data()
-                                                                          length:entry_4.value.size()
-                                                                        encoding:NSUTF8StringEncoding];
-                            [array_4 addObject:newElement_4];
-                        }
-                        newElement_1.externalIDList = array_4;
-                    }
-                } else {
-                    newElement_1.externalIDList = nil;
-                }
-                [array_1 addObject:newElement_1];
-            }
-            params.search.parameterList = array_1;
-        }
-        params.autoPlay = [NSNumber numberWithBool:mRequest.autoPlay];
-        if (mRequest.data.HasValue()) {
-            params.data = [[NSString alloc] initWithBytes:mRequest.data.Value().data()
-                                                   length:mRequest.data.Value().size()
-                                                 encoding:NSUTF8StringEncoding];
-        } else {
-            params.data = nil;
-        }
+        params.expiryLengthSeconds = [NSNumber numberWithUnsignedShort:mRequest.expiryLengthSeconds];
+        params.breadcrumb = [NSNumber numberWithUnsignedLongLong:mRequest.breadcrumb];
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster launchContentWithParams:params
-                           completionHandler:^(
-                               CHIPContentLauncherClusterLaunchResponseParams * _Nullable values, NSError * _Nullable error) {
-                               NSLog(@"Values: %@", values);
-                               responsesNeeded--;
-                               if (error != nil) {
-                                   mError = error;
-                                   LogNSError("Error", error);
-                               }
-                               if (responsesNeeded == 0) {
-                                   SetCommandExitStatus(mError);
-                               }
-                           }];
+            [cluster armFailSafeWithParams:params
+                         completionHandler:^(CHIPGeneralCommissioningClusterArmFailSafeResponseParams * _Nullable values,
+                             NSError * _Nullable error) {
+                             NSLog(@"Values: %@", values);
+                             responsesNeeded--;
+                             if (error != nil) {
+                                 mError = error;
+                                 LogNSError("Error", error);
+                             }
+                             if (responsesNeeded == 0) {
+                                 SetCommandExitStatus(mError);
+                             }
+                         }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::ContentLauncher::Commands::LaunchContent::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::ContentLauncher::Structs::ContentSearch::Type> mComplex_Search;
+    chip::app::Clusters::GeneralCommissioning::Commands::ArmFailSafe::Type mRequest;
 };
 
 /*
- * Command LaunchURL
+ * Command SetRegulatoryConfig
  */
-class ContentLauncherLaunchURL : public ClusterCommand {
+class GeneralCommissioningSetRegulatoryConfig : public ClusterCommand {
 public:
-    ContentLauncherLaunchURL()
-        : ClusterCommand("launch-url")
-        , mComplex_BrandingInformation(&mRequest.brandingInformation)
+    GeneralCommissioningSetRegulatoryConfig()
+        : ClusterCommand("set-regulatory-config")
     {
-        AddArgument("ContentURL", &mRequest.contentURL);
-        AddArgument("DisplayString", &mRequest.displayString);
-        AddArgument("BrandingInformation", &mComplex_BrandingInformation);
+        AddArgument("NewRegulatoryConfig", 0, UINT8_MAX, &mRequest.newRegulatoryConfig);
+        AddArgument("CountryCode", &mRequest.countryCode);
+        AddArgument("Breadcrumb", 0, UINT64_MAX, &mRequest.breadcrumb);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) command (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000030) command (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPContentLauncherClusterLaunchURLParams alloc] init];
+        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        __auto_type * params = [[CHIPGeneralCommissioningClusterSetRegulatoryConfigParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.contentURL = [[NSString alloc] initWithBytes:mRequest.contentURL.data()
-                                                     length:mRequest.contentURL.size()
-                                                   encoding:NSUTF8StringEncoding];
-        if (mRequest.displayString.HasValue()) {
-            params.displayString = [[NSString alloc] initWithBytes:mRequest.displayString.Value().data()
-                                                            length:mRequest.displayString.Value().size()
-                                                          encoding:NSUTF8StringEncoding];
-        } else {
-            params.displayString = nil;
-        }
-        if (mRequest.brandingInformation.HasValue()) {
-            params.brandingInformation = [CHIPContentLauncherClusterBrandingInformation new];
-            params.brandingInformation.providerName =
-                [[NSString alloc] initWithBytes:mRequest.brandingInformation.Value().providerName.data()
-                                         length:mRequest.brandingInformation.Value().providerName.size()
-                                       encoding:NSUTF8StringEncoding];
-            if (mRequest.brandingInformation.Value().background.HasValue()) {
-                params.brandingInformation.background = [CHIPContentLauncherClusterStyleInformation new];
-                if (mRequest.brandingInformation.Value().background.Value().imageUrl.HasValue()) {
-                    params.brandingInformation.background.imageUrl = [[NSString alloc]
-                        initWithBytes:mRequest.brandingInformation.Value().background.Value().imageUrl.Value().data()
-                               length:mRequest.brandingInformation.Value().background.Value().imageUrl.Value().size()
-                             encoding:NSUTF8StringEncoding];
-                } else {
-                    params.brandingInformation.background.imageUrl = nil;
-                }
-                if (mRequest.brandingInformation.Value().background.Value().color.HasValue()) {
-                    params.brandingInformation.background.color =
-                        [[NSString alloc] initWithBytes:mRequest.brandingInformation.Value().background.Value().color.Value().data()
-                                                 length:mRequest.brandingInformation.Value().background.Value().color.Value().size()
-                                               encoding:NSUTF8StringEncoding];
-                } else {
-                    params.brandingInformation.background.color = nil;
-                }
-                if (mRequest.brandingInformation.Value().background.Value().size.HasValue()) {
-                    params.brandingInformation.background.size = [CHIPContentLauncherClusterDimension new];
-                    params.brandingInformation.background.size.width =
-                        [NSNumber numberWithDouble:mRequest.brandingInformation.Value().background.Value().size.Value().width];
-                    params.brandingInformation.background.size.height =
-                        [NSNumber numberWithDouble:mRequest.brandingInformation.Value().background.Value().size.Value().height];
-                    params.brandingInformation.background.size.metric = [NSNumber
-                        numberWithUnsignedChar:chip::to_underlying(
-                                                   mRequest.brandingInformation.Value().background.Value().size.Value().metric)];
-                } else {
-                    params.brandingInformation.background.size = nil;
-                }
-            } else {
-                params.brandingInformation.background = nil;
-            }
-            if (mRequest.brandingInformation.Value().logo.HasValue()) {
-                params.brandingInformation.logo = [CHIPContentLauncherClusterStyleInformation new];
-                if (mRequest.brandingInformation.Value().logo.Value().imageUrl.HasValue()) {
-                    params.brandingInformation.logo.imageUrl =
-                        [[NSString alloc] initWithBytes:mRequest.brandingInformation.Value().logo.Value().imageUrl.Value().data()
-                                                 length:mRequest.brandingInformation.Value().logo.Value().imageUrl.Value().size()
-                                               encoding:NSUTF8StringEncoding];
-                } else {
-                    params.brandingInformation.logo.imageUrl = nil;
-                }
-                if (mRequest.brandingInformation.Value().logo.Value().color.HasValue()) {
-                    params.brandingInformation.logo.color =
-                        [[NSString alloc] initWithBytes:mRequest.brandingInformation.Value().logo.Value().color.Value().data()
-                                                 length:mRequest.brandingInformation.Value().logo.Value().color.Value().size()
-                                               encoding:NSUTF8StringEncoding];
-                } else {
-                    params.brandingInformation.logo.color = nil;
-                }
-                if (mRequest.brandingInformation.Value().logo.Value().size.HasValue()) {
-                    params.brandingInformation.logo.size = [CHIPContentLauncherClusterDimension new];
-                    params.brandingInformation.logo.size.width =
-                        [NSNumber numberWithDouble:mRequest.brandingInformation.Value().logo.Value().size.Value().width];
-                    params.brandingInformation.logo.size.height =
-                        [NSNumber numberWithDouble:mRequest.brandingInformation.Value().logo.Value().size.Value().height];
-                    params.brandingInformation.logo.size.metric = [NSNumber
-                        numberWithUnsignedChar:chip::to_underlying(
-                                                   mRequest.brandingInformation.Value().logo.Value().size.Value().metric)];
-                } else {
-                    params.brandingInformation.logo.size = nil;
-                }
-            } else {
-                params.brandingInformation.logo = nil;
-            }
-            if (mRequest.brandingInformation.Value().progressBar.HasValue()) {
-                params.brandingInformation.progressBar = [CHIPContentLauncherClusterStyleInformation new];
-                if (mRequest.brandingInformation.Value().progressBar.Value().imageUrl.HasValue()) {
-                    params.brandingInformation.progressBar.imageUrl = [[NSString alloc]
-                        initWithBytes:mRequest.brandingInformation.Value().progressBar.Value().imageUrl.Value().data()
-                               length:mRequest.brandingInformation.Value().progressBar.Value().imageUrl.Value().size()
-                             encoding:NSUTF8StringEncoding];
-                } else {
-                    params.brandingInformation.progressBar.imageUrl = nil;
-                }
-                if (mRequest.brandingInformation.Value().progressBar.Value().color.HasValue()) {
-                    params.brandingInformation.progressBar.color = [[NSString alloc]
-                        initWithBytes:mRequest.brandingInformation.Value().progressBar.Value().color.Value().data()
-                               length:mRequest.brandingInformation.Value().progressBar.Value().color.Value().size()
-                             encoding:NSUTF8StringEncoding];
-                } else {
-                    params.brandingInformation.progressBar.color = nil;
-                }
-                if (mRequest.brandingInformation.Value().progressBar.Value().size.HasValue()) {
-                    params.brandingInformation.progressBar.size = [CHIPContentLauncherClusterDimension new];
-                    params.brandingInformation.progressBar.size.width =
-                        [NSNumber numberWithDouble:mRequest.brandingInformation.Value().progressBar.Value().size.Value().width];
-                    params.brandingInformation.progressBar.size.height =
-                        [NSNumber numberWithDouble:mRequest.brandingInformation.Value().progressBar.Value().size.Value().height];
-                    params.brandingInformation.progressBar.size.metric = [NSNumber
-                        numberWithUnsignedChar:chip::to_underlying(
-                                                   mRequest.brandingInformation.Value().progressBar.Value().size.Value().metric)];
-                } else {
-                    params.brandingInformation.progressBar.size = nil;
-                }
-            } else {
-                params.brandingInformation.progressBar = nil;
-            }
-            if (mRequest.brandingInformation.Value().splash.HasValue()) {
-                params.brandingInformation.splash = [CHIPContentLauncherClusterStyleInformation new];
-                if (mRequest.brandingInformation.Value().splash.Value().imageUrl.HasValue()) {
-                    params.brandingInformation.splash.imageUrl =
-                        [[NSString alloc] initWithBytes:mRequest.brandingInformation.Value().splash.Value().imageUrl.Value().data()
-                                                 length:mRequest.brandingInformation.Value().splash.Value().imageUrl.Value().size()
-                                               encoding:NSUTF8StringEncoding];
-                } else {
-                    params.brandingInformation.splash.imageUrl = nil;
-                }
-                if (mRequest.brandingInformation.Value().splash.Value().color.HasValue()) {
-                    params.brandingInformation.splash.color =
-                        [[NSString alloc] initWithBytes:mRequest.brandingInformation.Value().splash.Value().color.Value().data()
-                                                 length:mRequest.brandingInformation.Value().splash.Value().color.Value().size()
-                                               encoding:NSUTF8StringEncoding];
-                } else {
-                    params.brandingInformation.splash.color = nil;
-                }
-                if (mRequest.brandingInformation.Value().splash.Value().size.HasValue()) {
-                    params.brandingInformation.splash.size = [CHIPContentLauncherClusterDimension new];
-                    params.brandingInformation.splash.size.width =
-                        [NSNumber numberWithDouble:mRequest.brandingInformation.Value().splash.Value().size.Value().width];
-                    params.brandingInformation.splash.size.height =
-                        [NSNumber numberWithDouble:mRequest.brandingInformation.Value().splash.Value().size.Value().height];
-                    params.brandingInformation.splash.size.metric = [NSNumber
-                        numberWithUnsignedChar:chip::to_underlying(
-                                                   mRequest.brandingInformation.Value().splash.Value().size.Value().metric)];
-                } else {
-                    params.brandingInformation.splash.size = nil;
-                }
-            } else {
-                params.brandingInformation.splash = nil;
-            }
-            if (mRequest.brandingInformation.Value().waterMark.HasValue()) {
-                params.brandingInformation.waterMark = [CHIPContentLauncherClusterStyleInformation new];
-                if (mRequest.brandingInformation.Value().waterMark.Value().imageUrl.HasValue()) {
-                    params.brandingInformation.waterMark.imageUrl = [[NSString alloc]
-                        initWithBytes:mRequest.brandingInformation.Value().waterMark.Value().imageUrl.Value().data()
-                               length:mRequest.brandingInformation.Value().waterMark.Value().imageUrl.Value().size()
-                             encoding:NSUTF8StringEncoding];
-                } else {
-                    params.brandingInformation.waterMark.imageUrl = nil;
-                }
-                if (mRequest.brandingInformation.Value().waterMark.Value().color.HasValue()) {
-                    params.brandingInformation.waterMark.color =
-                        [[NSString alloc] initWithBytes:mRequest.brandingInformation.Value().waterMark.Value().color.Value().data()
-                                                 length:mRequest.brandingInformation.Value().waterMark.Value().color.Value().size()
-                                               encoding:NSUTF8StringEncoding];
-                } else {
-                    params.brandingInformation.waterMark.color = nil;
-                }
-                if (mRequest.brandingInformation.Value().waterMark.Value().size.HasValue()) {
-                    params.brandingInformation.waterMark.size = [CHIPContentLauncherClusterDimension new];
-                    params.brandingInformation.waterMark.size.width =
-                        [NSNumber numberWithDouble:mRequest.brandingInformation.Value().waterMark.Value().size.Value().width];
-                    params.brandingInformation.waterMark.size.height =
-                        [NSNumber numberWithDouble:mRequest.brandingInformation.Value().waterMark.Value().size.Value().height];
-                    params.brandingInformation.waterMark.size.metric = [NSNumber
-                        numberWithUnsignedChar:chip::to_underlying(
-                                                   mRequest.brandingInformation.Value().waterMark.Value().size.Value().metric)];
-                } else {
-                    params.brandingInformation.waterMark.size = nil;
-                }
-            } else {
-                params.brandingInformation.waterMark = nil;
-            }
-        } else {
-            params.brandingInformation = nil;
-        }
+        params.newRegulatoryConfig = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.newRegulatoryConfig)];
+        params.countryCode = [[NSString alloc] initWithBytes:mRequest.countryCode.data()
+                                                      length:mRequest.countryCode.size()
+                                                    encoding:NSUTF8StringEncoding];
+        params.breadcrumb = [NSNumber numberWithUnsignedLongLong:mRequest.breadcrumb];
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster launchURLWithParams:params
-                       completionHandler:^(
-                           CHIPContentLauncherClusterLaunchResponseParams * _Nullable values, NSError * _Nullable error) {
-                           NSLog(@"Values: %@", values);
-                           responsesNeeded--;
-                           if (error != nil) {
-                               mError = error;
-                               LogNSError("Error", error);
-                           }
-                           if (responsesNeeded == 0) {
-                               SetCommandExitStatus(mError);
-                           }
-                       }];
+            [cluster
+                setRegulatoryConfigWithParams:params
+                            completionHandler:^(CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseParams * _Nullable values,
+                                NSError * _Nullable error) {
+                                NSLog(@"Values: %@", values);
+                                responsesNeeded--;
+                                if (error != nil) {
+                                    mError = error;
+                                    LogNSError("Error", error);
+                                }
+                                if (responsesNeeded == 0) {
+                                    SetCommandExitStatus(mError);
+                                }
+                            }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::ContentLauncher::Commands::LaunchURL::Type mRequest;
-    TypedComplexArgument<chip::Optional<chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::Type>>
-        mComplex_BrandingInformation;
+    chip::app::Clusters::GeneralCommissioning::Commands::SetRegulatoryConfig::Type mRequest;
 };
 
 /*
- * Attribute AcceptHeader
+ * Command CommissioningComplete
  */
-class ReadContentLauncherAcceptHeader : public ReadAttribute {
+class GeneralCommissioningCommissioningComplete : public ClusterCommand {
 public:
-    ReadContentLauncherAcceptHeader()
-        : ReadAttribute("accept-header")
+    GeneralCommissioningCommissioningComplete()
+        : ClusterCommand("commissioning-complete")
     {
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadContentLauncherAcceptHeader() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000030) command (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptHeaderWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ContentLauncher.AcceptHeader response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ContentLauncher AcceptHeader read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        __auto_type * params = [[CHIPGeneralCommissioningClusterCommissioningCompleteParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster commissioningCompleteWithParams:params
+                                   completionHandler:^(
+                                       CHIPGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable values,
+                                       NSError * _Nullable error) {
+                                       NSLog(@"Values: %@", values);
+                                       responsesNeeded--;
+                                       if (error != nil) {
+                                           mError = error;
+                                           LogNSError("Error", error);
+                                       }
+                                       if (responsesNeeded == 0) {
+                                           SetCommandExitStatus(mError);
+                                       }
+                                   }];
+        }
         return CHIP_NO_ERROR;
     }
-};
-
-class SubscribeAttributeContentLauncherAcceptHeader : public SubscribeAttribute {
-public:
-    SubscribeAttributeContentLauncherAcceptHeader()
-        : SubscribeAttribute("accept-header")
-    {
-    }
-
-    ~SubscribeAttributeContentLauncherAcceptHeader() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReportAttribute (0x00000000) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptHeaderWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ContentLauncher.AcceptHeader response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
 
-        return CHIP_NO_ERROR;
-    }
+private:
 };
 
 /*
- * Attribute SupportedStreamingProtocols
+ * Attribute Breadcrumb
  */
-class ReadContentLauncherSupportedStreamingProtocols : public ReadAttribute {
+class ReadGeneralCommissioningBreadcrumb : public ReadAttribute {
 public:
-    ReadContentLauncherSupportedStreamingProtocols()
-        : ReadAttribute("supported-streaming-protocols")
+    ReadGeneralCommissioningBreadcrumb()
+        : ReadAttribute("breadcrumb")
     {
     }
 
-    ~ReadContentLauncherSupportedStreamingProtocols() {}
+    ~ReadGeneralCommissioningBreadcrumb() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeSupportedStreamingProtocolsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ContentLauncher.SupportedStreamingProtocols response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("ContentLauncher SupportedStreamingProtocols read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        [cluster readAttributeBreadcrumbWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GeneralCommissioning.Breadcrumb response %@", [value description]);
+            if (error != nil) {
+                LogNSError("GeneralCommissioning Breadcrumb read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class WriteContentLauncherSupportedStreamingProtocols : public WriteAttribute {
+class WriteGeneralCommissioningBreadcrumb : public WriteAttribute {
 public:
-    WriteContentLauncherSupportedStreamingProtocols()
-        : WriteAttribute("supported-streaming-protocols")
+    WriteGeneralCommissioningBreadcrumb()
+        : WriteAttribute("breadcrumb")
     {
-        AddArgument("attr-name", "supported-streaming-protocols");
-        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
+        AddArgument("attr-name", "breadcrumb");
+        AddArgument("attr-value", 0, UINT64_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteContentLauncherSupportedStreamingProtocols() {}
+    ~WriteGeneralCommissioningBreadcrumb() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) WriteAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000030) WriteAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue];
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedLongLong:mValue];
 
-        [cluster
-            writeAttributeSupportedStreamingProtocolsWithValue:value
-                                                        params:params
-                                             completionHandler:^(NSError * _Nullable error) {
-                                                 if (error != nil) {
-                                                     LogNSError("ContentLauncher SupportedStreamingProtocols write Error", error);
-                                                 }
-                                                 SetCommandExitStatus(error);
-                                             }];
+        [cluster writeAttributeBreadcrumbWithValue:value
+                                            params:params
+                                 completionHandler:^(NSError * _Nullable error) {
+                                     if (error != nil) {
+                                         LogNSError("GeneralCommissioning Breadcrumb write Error", error);
+                                     }
+                                     SetCommandExitStatus(error);
+                                 }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    uint32_t mValue;
+    uint64_t mValue;
 };
 
-class SubscribeAttributeContentLauncherSupportedStreamingProtocols : public SubscribeAttribute {
+class SubscribeAttributeGeneralCommissioningBreadcrumb : public SubscribeAttribute {
 public:
-    SubscribeAttributeContentLauncherSupportedStreamingProtocols()
-        : SubscribeAttribute("supported-streaming-protocols")
+    SubscribeAttributeGeneralCommissioningBreadcrumb()
+        : SubscribeAttribute("breadcrumb")
     {
     }
 
-    ~SubscribeAttributeContentLauncherSupportedStreamingProtocols() {}
+    ~SubscribeAttributeGeneralCommissioningBreadcrumb() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSupportedStreamingProtocolsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBreadcrumbWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ContentLauncher.SupportedStreamingProtocols response %@", [value description]);
+                NSLog(@"GeneralCommissioning.Breadcrumb response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -18531,27 +18331,30 @@ class SubscribeAttributeContentLauncherSupportedStreamingProtocols : public Subs
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute BasicCommissioningInfo
  */
-class ReadContentLauncherGeneratedCommandList : public ReadAttribute {
+class ReadGeneralCommissioningBasicCommissioningInfo : public ReadAttribute {
 public:
-    ReadContentLauncherGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadGeneralCommissioningBasicCommissioningInfo()
+        : ReadAttribute("basic-commissioning-info")
     {
     }
 
-    ~ReadContentLauncherGeneratedCommandList() {}
+    ~ReadGeneralCommissioningBasicCommissioningInfo() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ContentLauncher.GeneratedCommandList response %@", [value description]);
+        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        [cluster readAttributeBasicCommissioningInfoWithCompletionHandler:^(
+            CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GeneralCommissioning.BasicCommissioningInfo response %@", [value description]);
             if (error != nil) {
-                LogNSError("ContentLauncher GeneratedCommandList read Error", error);
+                LogNSError("GeneralCommissioning BasicCommissioningInfo read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -18559,32 +18362,34 @@ class ReadContentLauncherGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeContentLauncherGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeGeneralCommissioningBasicCommissioningInfo : public SubscribeAttribute {
 public:
-    SubscribeAttributeContentLauncherGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeGeneralCommissioningBasicCommissioningInfo()
+        : SubscribeAttribute("basic-commissioning-info")
     {
     }
 
-    ~SubscribeAttributeContentLauncherGeneratedCommandList() {}
+    ~SubscribeAttributeGeneralCommissioningBasicCommissioningInfo() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBasicCommissioningInfoWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ContentLauncher.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralCommissioning.BasicCommissioningInfo response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -18595,27 +18400,29 @@ class SubscribeAttributeContentLauncherGeneratedCommandList : public SubscribeAt
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute RegulatoryConfig
  */
-class ReadContentLauncherAcceptedCommandList : public ReadAttribute {
+class ReadGeneralCommissioningRegulatoryConfig : public ReadAttribute {
 public:
-    ReadContentLauncherAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadGeneralCommissioningRegulatoryConfig()
+        : ReadAttribute("regulatory-config")
     {
     }
 
-    ~ReadContentLauncherAcceptedCommandList() {}
+    ~ReadGeneralCommissioningRegulatoryConfig() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ContentLauncher.AcceptedCommandList response %@", [value description]);
+        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        [cluster readAttributeRegulatoryConfigWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GeneralCommissioning.RegulatoryConfig response %@", [value description]);
             if (error != nil) {
-                LogNSError("ContentLauncher AcceptedCommandList read Error", error);
+                LogNSError("GeneralCommissioning RegulatoryConfig read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -18623,32 +18430,34 @@ class ReadContentLauncherAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeContentLauncherAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeGeneralCommissioningRegulatoryConfig : public SubscribeAttribute {
 public:
-    SubscribeAttributeContentLauncherAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeGeneralCommissioningRegulatoryConfig()
+        : SubscribeAttribute("regulatory-config")
     {
     }
 
-    ~SubscribeAttributeContentLauncherAcceptedCommandList() {}
+    ~SubscribeAttributeGeneralCommissioningRegulatoryConfig() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRegulatoryConfigWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ContentLauncher.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralCommissioning.RegulatoryConfig response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -18659,27 +18468,29 @@ class SubscribeAttributeContentLauncherAcceptedCommandList : public SubscribeAtt
 };
 
 /*
- * Attribute AttributeList
+ * Attribute LocationCapability
  */
-class ReadContentLauncherAttributeList : public ReadAttribute {
+class ReadGeneralCommissioningLocationCapability : public ReadAttribute {
 public:
-    ReadContentLauncherAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadGeneralCommissioningLocationCapability()
+        : ReadAttribute("location-capability")
     {
     }
 
-    ~ReadContentLauncherAttributeList() {}
+    ~ReadGeneralCommissioningLocationCapability() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ContentLauncher.AttributeList response %@", [value description]);
+        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        [cluster readAttributeLocationCapabilityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GeneralCommissioning.LocationCapability response %@", [value description]);
             if (error != nil) {
-                LogNSError("ContentLauncher AttributeList read Error", error);
+                LogNSError("GeneralCommissioning LocationCapability read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -18687,32 +18498,34 @@ class ReadContentLauncherAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeContentLauncherAttributeList : public SubscribeAttribute {
+class SubscribeAttributeGeneralCommissioningLocationCapability : public SubscribeAttribute {
 public:
-    SubscribeAttributeContentLauncherAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeGeneralCommissioningLocationCapability()
+        : SubscribeAttribute("location-capability")
     {
     }
 
-    ~SubscribeAttributeContentLauncherAttributeList() {}
+    ~SubscribeAttributeGeneralCommissioningLocationCapability() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeLocationCapabilityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ContentLauncher.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralCommissioning.LocationCapability response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -18723,27 +18536,30 @@ class SubscribeAttributeContentLauncherAttributeList : public SubscribeAttribute
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute SupportsConcurrentConnection
  */
-class ReadContentLauncherFeatureMap : public ReadAttribute {
+class ReadGeneralCommissioningSupportsConcurrentConnection : public ReadAttribute {
 public:
-    ReadContentLauncherFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadGeneralCommissioningSupportsConcurrentConnection()
+        : ReadAttribute("supports-concurrent-connection")
     {
     }
 
-    ~ReadContentLauncherFeatureMap() {}
+    ~ReadGeneralCommissioningSupportsConcurrentConnection() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ContentLauncher.FeatureMap response %@", [value description]);
+        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        [cluster readAttributeSupportsConcurrentConnectionWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GeneralCommissioning.SupportsConcurrentConnection response %@", [value description]);
             if (error != nil) {
-                LogNSError("ContentLauncher FeatureMap read Error", error);
+                LogNSError("GeneralCommissioning SupportsConcurrentConnection read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -18751,32 +18567,34 @@ class ReadContentLauncherFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeContentLauncherFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeGeneralCommissioningSupportsConcurrentConnection : public SubscribeAttribute {
 public:
-    SubscribeAttributeContentLauncherFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeGeneralCommissioningSupportsConcurrentConnection()
+        : SubscribeAttribute("supports-concurrent-connection")
     {
     }
 
-    ~SubscribeAttributeContentLauncherFeatureMap() {}
+    ~SubscribeAttributeGeneralCommissioningSupportsConcurrentConnection() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReportAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSupportsConcurrentConnectionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ContentLauncher.FeatureMap response %@", [value description]);
+                NSLog(@"GeneralCommissioning.SupportsConcurrentConnection response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -18787,27 +18605,29 @@ class SubscribeAttributeContentLauncherFeatureMap : public SubscribeAttribute {
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute GeneratedCommandList
  */
-class ReadContentLauncherClusterRevision : public ReadAttribute {
+class ReadGeneralCommissioningGeneratedCommandList : public ReadAttribute {
 public:
-    ReadContentLauncherClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadGeneralCommissioningGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadContentLauncherClusterRevision() {}
+    ~ReadGeneralCommissioningGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ContentLauncher.ClusterRevision response %@", [value description]);
+        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GeneralCommissioning.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ContentLauncher ClusterRevision read Error", error);
+                LogNSError("GeneralCommissioning GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -18815,32 +18635,34 @@ class ReadContentLauncherClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeContentLauncherClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeGeneralCommissioningGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeContentLauncherClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeGeneralCommissioningGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeContentLauncherClusterRevision() {}
+    ~SubscribeAttributeGeneralCommissioningGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ContentLauncher.ClusterRevision response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralCommissioning.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -18850,47 +18672,30 @@ class SubscribeAttributeContentLauncherClusterRevision : public SubscribeAttribu
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster Descriptor                                                  | 0x001D |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * DeviceList                                                        | 0x0000 |
-| * ServerList                                                        | 0x0001 |
-| * ClientList                                                        | 0x0002 |
-| * PartsList                                                         | 0x0003 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Attribute DeviceList
+ * Attribute AcceptedCommandList
  */
-class ReadDescriptorDeviceList : public ReadAttribute {
+class ReadGeneralCommissioningAcceptedCommandList : public ReadAttribute {
 public:
-    ReadDescriptorDeviceList()
-        : ReadAttribute("device-list")
+    ReadGeneralCommissioningAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadDescriptorDeviceList() {}
+    ~ReadGeneralCommissioningAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeDeviceListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Descriptor.DeviceList response %@", [value description]);
+        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GeneralCommissioning.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("Descriptor DeviceList read Error", error);
+                LogNSError("GeneralCommissioning AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -18898,32 +18703,34 @@ class ReadDescriptorDeviceList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDescriptorDeviceList : public SubscribeAttribute {
+class SubscribeAttributeGeneralCommissioningAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeDescriptorDeviceList()
-        : SubscribeAttribute("device-list")
+    SubscribeAttributeGeneralCommissioningAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeDescriptorDeviceList() {}
+    ~SubscribeAttributeGeneralCommissioningAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDeviceListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Descriptor.DeviceList response %@", [value description]);
+                NSLog(@"GeneralCommissioning.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -18934,27 +18741,29 @@ class SubscribeAttributeDescriptorDeviceList : public SubscribeAttribute {
 };
 
 /*
- * Attribute ServerList
+ * Attribute AttributeList
  */
-class ReadDescriptorServerList : public ReadAttribute {
+class ReadGeneralCommissioningAttributeList : public ReadAttribute {
 public:
-    ReadDescriptorServerList()
-        : ReadAttribute("server-list")
+    ReadGeneralCommissioningAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadDescriptorServerList() {}
+    ~ReadGeneralCommissioningAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeServerListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Descriptor.ServerList response %@", [value description]);
+        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GeneralCommissioning.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("Descriptor ServerList read Error", error);
+                LogNSError("GeneralCommissioning AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -18962,32 +18771,34 @@ class ReadDescriptorServerList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDescriptorServerList : public SubscribeAttribute {
+class SubscribeAttributeGeneralCommissioningAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeDescriptorServerList()
-        : SubscribeAttribute("server-list")
+    SubscribeAttributeGeneralCommissioningAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeDescriptorServerList() {}
+    ~SubscribeAttributeGeneralCommissioningAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeServerListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Descriptor.ServerList response %@", [value description]);
+                NSLog(@"GeneralCommissioning.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -18998,27 +18809,29 @@ class SubscribeAttributeDescriptorServerList : public SubscribeAttribute {
 };
 
 /*
- * Attribute ClientList
+ * Attribute FeatureMap
  */
-class ReadDescriptorClientList : public ReadAttribute {
+class ReadGeneralCommissioningFeatureMap : public ReadAttribute {
 public:
-    ReadDescriptorClientList()
-        : ReadAttribute("client-list")
+    ReadGeneralCommissioningFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadDescriptorClientList() {}
+    ~ReadGeneralCommissioningFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClientListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Descriptor.ClientList response %@", [value description]);
+        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GeneralCommissioning.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("Descriptor ClientList read Error", error);
+                LogNSError("GeneralCommissioning FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -19026,32 +18839,34 @@ class ReadDescriptorClientList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDescriptorClientList : public SubscribeAttribute {
+class SubscribeAttributeGeneralCommissioningFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeDescriptorClientList()
-        : SubscribeAttribute("client-list")
+    SubscribeAttributeGeneralCommissioningFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeDescriptorClientList() {}
+    ~SubscribeAttributeGeneralCommissioningFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClientListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Descriptor.ClientList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralCommissioning.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -19062,27 +18877,29 @@ class SubscribeAttributeDescriptorClientList : public SubscribeAttribute {
 };
 
 /*
- * Attribute PartsList
+ * Attribute ClusterRevision
  */
-class ReadDescriptorPartsList : public ReadAttribute {
+class ReadGeneralCommissioningClusterRevision : public ReadAttribute {
 public:
-    ReadDescriptorPartsList()
-        : ReadAttribute("parts-list")
+    ReadGeneralCommissioningClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadDescriptorPartsList() {}
+    ~ReadGeneralCommissioningClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributePartsListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Descriptor.PartsList response %@", [value description]);
+        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GeneralCommissioning.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("Descriptor PartsList read Error", error);
+                LogNSError("GeneralCommissioning ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -19090,32 +18907,34 @@ class ReadDescriptorPartsList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDescriptorPartsList : public SubscribeAttribute {
+class SubscribeAttributeGeneralCommissioningClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeDescriptorPartsList()
-        : SubscribeAttribute("parts-list")
+    SubscribeAttributeGeneralCommissioningClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeDescriptorPartsList() {}
+    ~SubscribeAttributeGeneralCommissioningClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePartsListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Descriptor.PartsList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralCommissioning.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -19125,220 +18944,399 @@ class SubscribeAttributeDescriptorPartsList : public SubscribeAttribute {
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster NetworkCommissioning                                        | 0x0031 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * ScanNetworks                                                      |   0x00 |
+| * AddOrUpdateWiFiNetwork                                            |   0x02 |
+| * AddOrUpdateThreadNetwork                                          |   0x03 |
+| * RemoveNetwork                                                     |   0x04 |
+| * ConnectNetwork                                                    |   0x06 |
+| * ReorderNetwork                                                    |   0x08 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * MaxNetworks                                                       | 0x0000 |
+| * Networks                                                          | 0x0001 |
+| * ScanMaxTimeSeconds                                                | 0x0002 |
+| * ConnectMaxTimeSeconds                                             | 0x0003 |
+| * InterfaceEnabled                                                  | 0x0004 |
+| * LastNetworkingStatus                                              | 0x0005 |
+| * LastNetworkID                                                     | 0x0006 |
+| * LastConnectErrorValue                                             | 0x0007 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute GeneratedCommandList
+ * Command ScanNetworks
  */
-class ReadDescriptorGeneratedCommandList : public ReadAttribute {
+class NetworkCommissioningScanNetworks : public ClusterCommand {
 public:
-    ReadDescriptorGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    NetworkCommissioningScanNetworks()
+        : ClusterCommand("scan-networks")
     {
+        AddArgument("Ssid", &mRequest.ssid);
+        AddArgument("Breadcrumb", 0, UINT64_MAX, &mRequest.breadcrumb);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadDescriptorGeneratedCommandList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Descriptor.GeneratedCommandList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("Descriptor GeneratedCommandList read Error", error);
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        __auto_type * params = [[CHIPNetworkCommissioningClusterScanNetworksParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        if (mRequest.ssid.HasValue()) {
+            if (mRequest.ssid.Value().IsNull()) {
+                params.ssid = nil;
+            } else {
+                params.ssid = [NSData dataWithBytes:mRequest.ssid.Value().Value().data()
+                                             length:mRequest.ssid.Value().Value().size()];
             }
-            SetCommandExitStatus(error);
-        }];
+        } else {
+            params.ssid = nil;
+        }
+        if (mRequest.breadcrumb.HasValue()) {
+            params.breadcrumb = [NSNumber numberWithUnsignedLongLong:mRequest.breadcrumb.Value()];
+        } else {
+            params.breadcrumb = nil;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster scanNetworksWithParams:params
+                          completionHandler:^(CHIPNetworkCommissioningClusterScanNetworksResponseParams * _Nullable values,
+                              NSError * _Nullable error) {
+                              NSLog(@"Values: %@", values);
+                              responsesNeeded--;
+                              if (error != nil) {
+                                  mError = error;
+                                  LogNSError("Error", error);
+                              }
+                              if (responsesNeeded == 0) {
+                                  SetCommandExitStatus(mError);
+                              }
+                          }];
+        }
         return CHIP_NO_ERROR;
     }
-};
-
-class SubscribeAttributeDescriptorGeneratedCommandList : public SubscribeAttribute {
-public:
-    SubscribeAttributeDescriptorGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
-    {
-    }
-
-    ~SubscribeAttributeDescriptorGeneratedCommandList() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Descriptor.GeneratedCommandList response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
 
-        return CHIP_NO_ERROR;
-    }
+private:
+    chip::app::Clusters::NetworkCommissioning::Commands::ScanNetworks::Type mRequest;
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Command AddOrUpdateWiFiNetwork
  */
-class ReadDescriptorAcceptedCommandList : public ReadAttribute {
+class NetworkCommissioningAddOrUpdateWiFiNetwork : public ClusterCommand {
 public:
-    ReadDescriptorAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    NetworkCommissioningAddOrUpdateWiFiNetwork()
+        : ClusterCommand("add-or-update-wi-fi-network")
     {
+        AddArgument("Ssid", &mRequest.ssid);
+        AddArgument("Credentials", &mRequest.credentials);
+        AddArgument("Breadcrumb", 0, UINT64_MAX, &mRequest.breadcrumb);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadDescriptorAcceptedCommandList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) command (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Descriptor.AcceptedCommandList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("Descriptor AcceptedCommandList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        __auto_type * params = [[CHIPNetworkCommissioningClusterAddOrUpdateWiFiNetworkParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.ssid = [NSData dataWithBytes:mRequest.ssid.data() length:mRequest.ssid.size()];
+        params.credentials = [NSData dataWithBytes:mRequest.credentials.data() length:mRequest.credentials.size()];
+        if (mRequest.breadcrumb.HasValue()) {
+            params.breadcrumb = [NSNumber numberWithUnsignedLongLong:mRequest.breadcrumb.Value()];
+        } else {
+            params.breadcrumb = nil;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster
+                addOrUpdateWiFiNetworkWithParams:params
+                               completionHandler:^(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable values,
+                                   NSError * _Nullable error) {
+                                   NSLog(@"Values: %@", values);
+                                   responsesNeeded--;
+                                   if (error != nil) {
+                                       mError = error;
+                                       LogNSError("Error", error);
+                                   }
+                                   if (responsesNeeded == 0) {
+                                       SetCommandExitStatus(mError);
+                                   }
+                               }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::NetworkCommissioning::Commands::AddOrUpdateWiFiNetwork::Type mRequest;
 };
 
-class SubscribeAttributeDescriptorAcceptedCommandList : public SubscribeAttribute {
+/*
+ * Command AddOrUpdateThreadNetwork
+ */
+class NetworkCommissioningAddOrUpdateThreadNetwork : public ClusterCommand {
 public:
-    SubscribeAttributeDescriptorAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    NetworkCommissioningAddOrUpdateThreadNetwork()
+        : ClusterCommand("add-or-update-thread-network")
     {
+        AddArgument("OperationalDataset", &mRequest.operationalDataset);
+        AddArgument("Breadcrumb", 0, UINT64_MAX, &mRequest.breadcrumb);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeDescriptorAcceptedCommandList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Descriptor.AcceptedCommandList response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) command (0x00000003) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        __auto_type * params = [[CHIPNetworkCommissioningClusterAddOrUpdateThreadNetworkParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.operationalDataset = [NSData dataWithBytes:mRequest.operationalDataset.data()
+                                                   length:mRequest.operationalDataset.size()];
+        if (mRequest.breadcrumb.HasValue()) {
+            params.breadcrumb = [NSNumber numberWithUnsignedLongLong:mRequest.breadcrumb.Value()];
+        } else {
+            params.breadcrumb = nil;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster
+                addOrUpdateThreadNetworkWithParams:params
+                                 completionHandler:^(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable values,
+                                     NSError * _Nullable error) {
+                                     NSLog(@"Values: %@", values);
+                                     responsesNeeded--;
+                                     if (error != nil) {
+                                         mError = error;
+                                         LogNSError("Error", error);
+                                     }
+                                     if (responsesNeeded == 0) {
+                                         SetCommandExitStatus(mError);
+                                     }
+                                 }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::NetworkCommissioning::Commands::AddOrUpdateThreadNetwork::Type mRequest;
 };
 
 /*
- * Attribute AttributeList
+ * Command RemoveNetwork
  */
-class ReadDescriptorAttributeList : public ReadAttribute {
+class NetworkCommissioningRemoveNetwork : public ClusterCommand {
 public:
-    ReadDescriptorAttributeList()
-        : ReadAttribute("attribute-list")
+    NetworkCommissioningRemoveNetwork()
+        : ClusterCommand("remove-network")
     {
+        AddArgument("NetworkID", &mRequest.networkID);
+        AddArgument("Breadcrumb", 0, UINT64_MAX, &mRequest.breadcrumb);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadDescriptorAttributeList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) command (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Descriptor.AttributeList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("Descriptor AttributeList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        __auto_type * params = [[CHIPNetworkCommissioningClusterRemoveNetworkParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.networkID = [NSData dataWithBytes:mRequest.networkID.data() length:mRequest.networkID.size()];
+        if (mRequest.breadcrumb.HasValue()) {
+            params.breadcrumb = [NSNumber numberWithUnsignedLongLong:mRequest.breadcrumb.Value()];
+        } else {
+            params.breadcrumb = nil;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster removeNetworkWithParams:params
+                           completionHandler:^(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable values,
+                               NSError * _Nullable error) {
+                               NSLog(@"Values: %@", values);
+                               responsesNeeded--;
+                               if (error != nil) {
+                                   mError = error;
+                                   LogNSError("Error", error);
+                               }
+                               if (responsesNeeded == 0) {
+                                   SetCommandExitStatus(mError);
+                               }
+                           }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::NetworkCommissioning::Commands::RemoveNetwork::Type mRequest;
 };
 
-class SubscribeAttributeDescriptorAttributeList : public SubscribeAttribute {
+/*
+ * Command ConnectNetwork
+ */
+class NetworkCommissioningConnectNetwork : public ClusterCommand {
 public:
-    SubscribeAttributeDescriptorAttributeList()
-        : SubscribeAttribute("attribute-list")
+    NetworkCommissioningConnectNetwork()
+        : ClusterCommand("connect-network")
     {
+        AddArgument("NetworkID", &mRequest.networkID);
+        AddArgument("Breadcrumb", 0, UINT64_MAX, &mRequest.breadcrumb);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeDescriptorAttributeList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) command (0x00000006) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Descriptor.AttributeList response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        __auto_type * params = [[CHIPNetworkCommissioningClusterConnectNetworkParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.networkID = [NSData dataWithBytes:mRequest.networkID.data() length:mRequest.networkID.size()];
+        if (mRequest.breadcrumb.HasValue()) {
+            params.breadcrumb = [NSNumber numberWithUnsignedLongLong:mRequest.breadcrumb.Value()];
+        } else {
+            params.breadcrumb = nil;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster connectNetworkWithParams:params
+                            completionHandler:^(CHIPNetworkCommissioningClusterConnectNetworkResponseParams * _Nullable values,
+                                NSError * _Nullable error) {
+                                NSLog(@"Values: %@", values);
+                                responsesNeeded--;
+                                if (error != nil) {
+                                    mError = error;
+                                    LogNSError("Error", error);
+                                }
+                                if (responsesNeeded == 0) {
+                                    SetCommandExitStatus(mError);
+                                }
+                            }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::NetworkCommissioning::Commands::ConnectNetwork::Type mRequest;
+};
+
+/*
+ * Command ReorderNetwork
+ */
+class NetworkCommissioningReorderNetwork : public ClusterCommand {
+public:
+    NetworkCommissioningReorderNetwork()
+        : ClusterCommand("reorder-network")
+    {
+        AddArgument("NetworkID", &mRequest.networkID);
+        AddArgument("NetworkIndex", 0, UINT8_MAX, &mRequest.networkIndex);
+        AddArgument("Breadcrumb", 0, UINT64_MAX, &mRequest.breadcrumb);
+        ClusterCommand::AddArguments();
+    }
 
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) command (0x00000008) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        __auto_type * params = [[CHIPNetworkCommissioningClusterReorderNetworkParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.networkID = [NSData dataWithBytes:mRequest.networkID.data() length:mRequest.networkID.size()];
+        params.networkIndex = [NSNumber numberWithUnsignedChar:mRequest.networkIndex];
+        if (mRequest.breadcrumb.HasValue()) {
+            params.breadcrumb = [NSNumber numberWithUnsignedLongLong:mRequest.breadcrumb.Value()];
+        } else {
+            params.breadcrumb = nil;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster reorderNetworkWithParams:params
+                            completionHandler:^(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable values,
+                                NSError * _Nullable error) {
+                                NSLog(@"Values: %@", values);
+                                responsesNeeded--;
+                                if (error != nil) {
+                                    mError = error;
+                                    LogNSError("Error", error);
+                                }
+                                if (responsesNeeded == 0) {
+                                    SetCommandExitStatus(mError);
+                                }
+                            }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::NetworkCommissioning::Commands::ReorderNetwork::Type mRequest;
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute MaxNetworks
  */
-class ReadDescriptorFeatureMap : public ReadAttribute {
+class ReadNetworkCommissioningMaxNetworks : public ReadAttribute {
 public:
-    ReadDescriptorFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadNetworkCommissioningMaxNetworks()
+        : ReadAttribute("max-networks")
     {
     }
 
-    ~ReadDescriptorFeatureMap() {}
+    ~ReadNetworkCommissioningMaxNetworks() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Descriptor.FeatureMap response %@", [value description]);
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        [cluster readAttributeMaxNetworksWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"NetworkCommissioning.MaxNetworks response %@", [value description]);
             if (error != nil) {
-                LogNSError("Descriptor FeatureMap read Error", error);
+                LogNSError("NetworkCommissioning MaxNetworks read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -19346,32 +19344,34 @@ class ReadDescriptorFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDescriptorFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeNetworkCommissioningMaxNetworks : public SubscribeAttribute {
 public:
-    SubscribeAttributeDescriptorFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeNetworkCommissioningMaxNetworks()
+        : SubscribeAttribute("max-networks")
     {
     }
 
-    ~SubscribeAttributeDescriptorFeatureMap() {}
+    ~SubscribeAttributeNetworkCommissioningMaxNetworks() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMaxNetworksWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Descriptor.FeatureMap response %@", [value description]);
+                NSLog(@"NetworkCommissioning.MaxNetworks response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -19382,27 +19382,29 @@ class SubscribeAttributeDescriptorFeatureMap : public SubscribeAttribute {
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute Networks
  */
-class ReadDescriptorClusterRevision : public ReadAttribute {
+class ReadNetworkCommissioningNetworks : public ReadAttribute {
 public:
-    ReadDescriptorClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadNetworkCommissioningNetworks()
+        : ReadAttribute("networks")
     {
     }
 
-    ~ReadDescriptorClusterRevision() {}
+    ~ReadNetworkCommissioningNetworks() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Descriptor.ClusterRevision response %@", [value description]);
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        [cluster readAttributeNetworksWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"NetworkCommissioning.Networks response %@", [value description]);
             if (error != nil) {
-                LogNSError("Descriptor ClusterRevision read Error", error);
+                LogNSError("NetworkCommissioning Networks read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -19410,32 +19412,34 @@ class ReadDescriptorClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDescriptorClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeNetworkCommissioningNetworks : public SubscribeAttribute {
 public:
-    SubscribeAttributeDescriptorClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeNetworkCommissioningNetworks()
+        : SubscribeAttribute("networks")
     {
     }
 
-    ~SubscribeAttributeDescriptorClusterRevision() {}
+    ~SubscribeAttributeNetworkCommissioningNetworks() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000001D) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNetworksWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Descriptor.ClusterRevision response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.Networks response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -19445,95 +19449,30 @@ class SubscribeAttributeDescriptorClusterRevision : public SubscribeAttribute {
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster DiagnosticLogs                                              | 0x0032 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * RetrieveLogsRequest                                               |   0x00 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
-/*
- * Command RetrieveLogsRequest
- */
-class DiagnosticLogsRetrieveLogsRequest : public ClusterCommand {
-public:
-    DiagnosticLogsRetrieveLogsRequest()
-        : ClusterCommand("retrieve-logs-request")
-    {
-        AddArgument("Intent", 0, UINT8_MAX, &mRequest.intent);
-        AddArgument("RequestedProtocol", 0, UINT8_MAX, &mRequest.requestedProtocol);
-        AddArgument("TransferFileDesignator", &mRequest.transferFileDesignator);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000032) command (0x00000000) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDiagnosticLogsClusterRetrieveLogsRequestParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.intent = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.intent)];
-        params.requestedProtocol = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.requestedProtocol)];
-        params.transferFileDesignator = [NSData dataWithBytes:mRequest.transferFileDesignator.data()
-                                                       length:mRequest.transferFileDesignator.size()];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster retrieveLogsRequestWithParams:params
-                                 completionHandler:^(CHIPDiagnosticLogsClusterRetrieveLogsResponseParams * _Nullable values,
-                                     NSError * _Nullable error) {
-                                     NSLog(@"Values: %@", values);
-                                     responsesNeeded--;
-                                     if (error != nil) {
-                                         mError = error;
-                                         LogNSError("Error", error);
-                                     }
-                                     if (responsesNeeded == 0) {
-                                         SetCommandExitStatus(mError);
-                                     }
-                                 }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsRequest::Type mRequest;
-};
-
 /*
- * Attribute GeneratedCommandList
+ * Attribute ScanMaxTimeSeconds
  */
-class ReadDiagnosticLogsGeneratedCommandList : public ReadAttribute {
+class ReadNetworkCommissioningScanMaxTimeSeconds : public ReadAttribute {
 public:
-    ReadDiagnosticLogsGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadNetworkCommissioningScanMaxTimeSeconds()
+        : ReadAttribute("scan-max-time-seconds")
     {
     }
 
-    ~ReadDiagnosticLogsGeneratedCommandList() {}
+    ~ReadNetworkCommissioningScanMaxTimeSeconds() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000032) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DiagnosticLogs.GeneratedCommandList response %@", [value description]);
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        [cluster readAttributeScanMaxTimeSecondsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"NetworkCommissioning.ScanMaxTimeSeconds response %@", [value description]);
             if (error != nil) {
-                LogNSError("DiagnosticLogs GeneratedCommandList read Error", error);
+                LogNSError("NetworkCommissioning ScanMaxTimeSeconds read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -19541,32 +19480,34 @@ class ReadDiagnosticLogsGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDiagnosticLogsGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeNetworkCommissioningScanMaxTimeSeconds : public SubscribeAttribute {
 public:
-    SubscribeAttributeDiagnosticLogsGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeNetworkCommissioningScanMaxTimeSeconds()
+        : SubscribeAttribute("scan-max-time-seconds")
     {
     }
 
-    ~SubscribeAttributeDiagnosticLogsGeneratedCommandList() {}
+    ~SubscribeAttributeNetworkCommissioningScanMaxTimeSeconds() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000032) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeScanMaxTimeSecondsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DiagnosticLogs.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.ScanMaxTimeSeconds response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -19577,27 +19518,29 @@ class SubscribeAttributeDiagnosticLogsGeneratedCommandList : public SubscribeAtt
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute ConnectMaxTimeSeconds
  */
-class ReadDiagnosticLogsAcceptedCommandList : public ReadAttribute {
+class ReadNetworkCommissioningConnectMaxTimeSeconds : public ReadAttribute {
 public:
-    ReadDiagnosticLogsAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadNetworkCommissioningConnectMaxTimeSeconds()
+        : ReadAttribute("connect-max-time-seconds")
     {
     }
 
-    ~ReadDiagnosticLogsAcceptedCommandList() {}
+    ~ReadNetworkCommissioningConnectMaxTimeSeconds() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000032) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DiagnosticLogs.AcceptedCommandList response %@", [value description]);
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        [cluster readAttributeConnectMaxTimeSecondsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"NetworkCommissioning.ConnectMaxTimeSeconds response %@", [value description]);
             if (error != nil) {
-                LogNSError("DiagnosticLogs AcceptedCommandList read Error", error);
+                LogNSError("NetworkCommissioning ConnectMaxTimeSeconds read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -19605,32 +19548,34 @@ class ReadDiagnosticLogsAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDiagnosticLogsAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeNetworkCommissioningConnectMaxTimeSeconds : public SubscribeAttribute {
 public:
-    SubscribeAttributeDiagnosticLogsAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeNetworkCommissioningConnectMaxTimeSeconds()
+        : SubscribeAttribute("connect-max-time-seconds")
     {
     }
 
-    ~SubscribeAttributeDiagnosticLogsAcceptedCommandList() {}
+    ~SubscribeAttributeNetworkCommissioningConnectMaxTimeSeconds() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000032) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeConnectMaxTimeSecondsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DiagnosticLogs.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.ConnectMaxTimeSeconds response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -19641,27 +19586,29 @@ class SubscribeAttributeDiagnosticLogsAcceptedCommandList : public SubscribeAttr
 };
 
 /*
- * Attribute AttributeList
+ * Attribute InterfaceEnabled
  */
-class ReadDiagnosticLogsAttributeList : public ReadAttribute {
+class ReadNetworkCommissioningInterfaceEnabled : public ReadAttribute {
 public:
-    ReadDiagnosticLogsAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadNetworkCommissioningInterfaceEnabled()
+        : ReadAttribute("interface-enabled")
     {
     }
 
-    ~ReadDiagnosticLogsAttributeList() {}
+    ~ReadNetworkCommissioningInterfaceEnabled() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000032) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DiagnosticLogs.AttributeList response %@", [value description]);
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        [cluster readAttributeInterfaceEnabledWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"NetworkCommissioning.InterfaceEnabled response %@", [value description]);
             if (error != nil) {
-                LogNSError("DiagnosticLogs AttributeList read Error", error);
+                LogNSError("NetworkCommissioning InterfaceEnabled read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -19669,32 +19616,74 @@ class ReadDiagnosticLogsAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDiagnosticLogsAttributeList : public SubscribeAttribute {
+class WriteNetworkCommissioningInterfaceEnabled : public WriteAttribute {
 public:
-    SubscribeAttributeDiagnosticLogsAttributeList()
-        : SubscribeAttribute("attribute-list")
+    WriteNetworkCommissioningInterfaceEnabled()
+        : WriteAttribute("interface-enabled")
     {
+        AddArgument("attr-name", "interface-enabled");
+        AddArgument("attr-value", 0, 1, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeDiagnosticLogsAttributeList() {}
+    ~WriteNetworkCommissioningInterfaceEnabled() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000032) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) WriteAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
+
+        [cluster writeAttributeInterfaceEnabledWithValue:value
+                                                  params:params
+                                       completionHandler:^(NSError * _Nullable error) {
+                                           if (error != nil) {
+                                               LogNSError("NetworkCommissioning InterfaceEnabled write Error", error);
+                                           }
+                                           SetCommandExitStatus(error);
+                                       }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    bool mValue;
+};
+
+class SubscribeAttributeNetworkCommissioningInterfaceEnabled : public SubscribeAttribute {
+public:
+    SubscribeAttributeNetworkCommissioningInterfaceEnabled()
+        : SubscribeAttribute("interface-enabled")
+    {
+    }
+
+    ~SubscribeAttributeNetworkCommissioningInterfaceEnabled() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInterfaceEnabledWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DiagnosticLogs.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.InterfaceEnabled response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -19705,27 +19694,29 @@ class SubscribeAttributeDiagnosticLogsAttributeList : public SubscribeAttribute
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute LastNetworkingStatus
  */
-class ReadDiagnosticLogsFeatureMap : public ReadAttribute {
+class ReadNetworkCommissioningLastNetworkingStatus : public ReadAttribute {
 public:
-    ReadDiagnosticLogsFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadNetworkCommissioningLastNetworkingStatus()
+        : ReadAttribute("last-networking-status")
     {
     }
 
-    ~ReadDiagnosticLogsFeatureMap() {}
+    ~ReadNetworkCommissioningLastNetworkingStatus() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000032) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DiagnosticLogs.FeatureMap response %@", [value description]);
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        [cluster readAttributeLastNetworkingStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"NetworkCommissioning.LastNetworkingStatus response %@", [value description]);
             if (error != nil) {
-                LogNSError("DiagnosticLogs FeatureMap read Error", error);
+                LogNSError("NetworkCommissioning LastNetworkingStatus read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -19733,32 +19724,34 @@ class ReadDiagnosticLogsFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDiagnosticLogsFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeNetworkCommissioningLastNetworkingStatus : public SubscribeAttribute {
 public:
-    SubscribeAttributeDiagnosticLogsFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeNetworkCommissioningLastNetworkingStatus()
+        : SubscribeAttribute("last-networking-status")
     {
     }
 
-    ~SubscribeAttributeDiagnosticLogsFeatureMap() {}
+    ~SubscribeAttributeNetworkCommissioningLastNetworkingStatus() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000032) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x00000005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeLastNetworkingStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DiagnosticLogs.FeatureMap response %@", [value description]);
+                NSLog(@"NetworkCommissioning.LastNetworkingStatus response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -19769,27 +19762,29 @@ class SubscribeAttributeDiagnosticLogsFeatureMap : public SubscribeAttribute {
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute LastNetworkID
  */
-class ReadDiagnosticLogsClusterRevision : public ReadAttribute {
+class ReadNetworkCommissioningLastNetworkID : public ReadAttribute {
 public:
-    ReadDiagnosticLogsClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadNetworkCommissioningLastNetworkID()
+        : ReadAttribute("last-network-id")
     {
     }
 
-    ~ReadDiagnosticLogsClusterRevision() {}
+    ~ReadNetworkCommissioningLastNetworkID() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000032) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x00000006) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DiagnosticLogs.ClusterRevision response %@", [value description]);
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        [cluster readAttributeLastNetworkIDWithCompletionHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"NetworkCommissioning.LastNetworkID response %@", [value description]);
             if (error != nil) {
-                LogNSError("DiagnosticLogs ClusterRevision read Error", error);
+                LogNSError("NetworkCommissioning LastNetworkID read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -19797,32 +19792,34 @@ class ReadDiagnosticLogsClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDiagnosticLogsClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeNetworkCommissioningLastNetworkID : public SubscribeAttribute {
 public:
-    SubscribeAttributeDiagnosticLogsClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeNetworkCommissioningLastNetworkID()
+        : SubscribeAttribute("last-network-id")
     {
     }
 
-    ~SubscribeAttributeDiagnosticLogsClusterRevision() {}
+    ~SubscribeAttributeNetworkCommissioningLastNetworkID() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000032) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x00000006) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeLastNetworkIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DiagnosticLogs.ClusterRevision response %@", [value description]);
+            reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.LastNetworkID response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -19832,1027 +19829,567 @@ class SubscribeAttributeDiagnosticLogsClusterRevision : public SubscribeAttribut
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster DoorLock                                                    | 0x0101 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * LockDoor                                                          |   0x00 |
-| * UnlockDoor                                                        |   0x01 |
-| * UnlockWithTimeout                                                 |   0x03 |
-| * SetWeekDaySchedule                                                |   0x0B |
-| * GetWeekDaySchedule                                                |   0x0C |
-| * ClearWeekDaySchedule                                              |   0x0D |
-| * SetYearDaySchedule                                                |   0x0E |
-| * GetYearDaySchedule                                                |   0x0F |
-| * ClearYearDaySchedule                                              |   0x10 |
-| * SetHolidaySchedule                                                |   0x11 |
-| * GetHolidaySchedule                                                |   0x12 |
-| * ClearHolidaySchedule                                              |   0x13 |
-| * SetUser                                                           |   0x1A |
-| * GetUser                                                           |   0x1B |
-| * ClearUser                                                         |   0x1D |
-| * SetCredential                                                     |   0x22 |
-| * GetCredentialStatus                                               |   0x24 |
-| * ClearCredential                                                   |   0x26 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * LockState                                                         | 0x0000 |
-| * LockType                                                          | 0x0001 |
-| * ActuatorEnabled                                                   | 0x0002 |
-| * DoorState                                                         | 0x0003 |
-| * DoorOpenEvents                                                    | 0x0004 |
-| * DoorClosedEvents                                                  | 0x0005 |
-| * OpenPeriod                                                        | 0x0006 |
-| * NumberOfTotalUsersSupported                                       | 0x0011 |
-| * NumberOfPINUsersSupported                                         | 0x0012 |
-| * NumberOfRFIDUsersSupported                                        | 0x0013 |
-| * NumberOfWeekDaySchedulesSupportedPerUser                          | 0x0014 |
-| * NumberOfYearDaySchedulesSupportedPerUser                          | 0x0015 |
-| * NumberOfHolidaySchedulesSupported                                 | 0x0016 |
-| * MaxPINCodeLength                                                  | 0x0017 |
-| * MinPINCodeLength                                                  | 0x0018 |
-| * MaxRFIDCodeLength                                                 | 0x0019 |
-| * MinRFIDCodeLength                                                 | 0x001A |
-| * CredentialRulesSupport                                            | 0x001B |
-| * NumberOfCredentialsSupportedPerUser                               | 0x001C |
-| * Language                                                          | 0x0021 |
-| * LEDSettings                                                       | 0x0022 |
-| * AutoRelockTime                                                    | 0x0023 |
-| * SoundVolume                                                       | 0x0024 |
-| * OperatingMode                                                     | 0x0025 |
-| * SupportedOperatingModes                                           | 0x0026 |
-| * DefaultConfigurationRegister                                      | 0x0027 |
-| * EnableLocalProgramming                                            | 0x0028 |
-| * EnableOneTouchLocking                                             | 0x0029 |
-| * EnableInsideStatusLED                                             | 0x002A |
-| * EnablePrivacyModeButton                                           | 0x002B |
-| * LocalProgrammingFeatures                                          | 0x002C |
-| * WrongCodeEntryLimit                                               | 0x0030 |
-| * UserCodeTemporaryDisableTime                                      | 0x0031 |
-| * SendPINOverTheAir                                                 | 0x0032 |
-| * RequirePINforRemoteOperation                                      | 0x0033 |
-| * ExpiringUserTimeout                                               | 0x0035 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-| * DoorLockAlarm                                                     | 0x0000 |
-| * DoorStateChange                                                   | 0x0001 |
-| * LockOperation                                                     | 0x0002 |
-| * LockOperationError                                                | 0x0003 |
-| * LockUserChange                                                    | 0x0004 |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command LockDoor
+ * Attribute LastConnectErrorValue
  */
-class DoorLockLockDoor : public ClusterCommand {
+class ReadNetworkCommissioningLastConnectErrorValue : public ReadAttribute {
 public:
-    DoorLockLockDoor()
-        : ClusterCommand("lock-door")
+    ReadNetworkCommissioningLastConnectErrorValue()
+        : ReadAttribute("last-connect-error-value")
     {
-        AddArgument("PinCode", &mRequest.pinCode);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadNetworkCommissioningLastConnectErrorValue() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x00000007) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterLockDoorParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        if (mRequest.pinCode.HasValue()) {
-            params.pinCode = [NSData dataWithBytes:mRequest.pinCode.Value().data() length:mRequest.pinCode.Value().size()];
-        } else {
-            params.pinCode = nil;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster lockDoorWithParams:params
-                      completionHandler:^(NSError * _Nullable error) {
-                          responsesNeeded--;
-                          if (error != nil) {
-                              mError = error;
-                              LogNSError("Error", error);
-                          }
-                          if (responsesNeeded == 0) {
-                              SetCommandExitStatus(mError);
-                          }
-                      }];
-        }
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        [cluster readAttributeLastConnectErrorValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"NetworkCommissioning.LastConnectErrorValue response %@", [value description]);
+            if (error != nil) {
+                LogNSError("NetworkCommissioning LastConnectErrorValue read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::LockDoor::Type mRequest;
 };
 
-/*
- * Command UnlockDoor
- */
-class DoorLockUnlockDoor : public ClusterCommand {
+class SubscribeAttributeNetworkCommissioningLastConnectErrorValue : public SubscribeAttribute {
 public:
-    DoorLockUnlockDoor()
-        : ClusterCommand("unlock-door")
+    SubscribeAttributeNetworkCommissioningLastConnectErrorValue()
+        : SubscribeAttribute("last-connect-error-value")
     {
-        AddArgument("PinCode", &mRequest.pinCode);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeNetworkCommissioningLastConnectErrorValue() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000001) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x00000007) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterUnlockDoorParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        if (mRequest.pinCode.HasValue()) {
-            params.pinCode = [NSData dataWithBytes:mRequest.pinCode.Value().data() length:mRequest.pinCode.Value().size()];
-        } else {
-            params.pinCode = nil;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster unlockDoorWithParams:params
-                        completionHandler:^(NSError * _Nullable error) {
-                            responsesNeeded--;
-                            if (error != nil) {
-                                mError = error;
-                                LogNSError("Error", error);
-                            }
-                            if (responsesNeeded == 0) {
-                                SetCommandExitStatus(mError);
-                            }
-                        }];
-        }
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeLastConnectErrorValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.LastConnectErrorValue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type mRequest;
 };
 
 /*
- * Command UnlockWithTimeout
+ * Attribute GeneratedCommandList
  */
-class DoorLockUnlockWithTimeout : public ClusterCommand {
+class ReadNetworkCommissioningGeneratedCommandList : public ReadAttribute {
 public:
-    DoorLockUnlockWithTimeout()
-        : ClusterCommand("unlock-with-timeout")
+    ReadNetworkCommissioningGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
-        AddArgument("Timeout", 0, UINT16_MAX, &mRequest.timeout);
-        AddArgument("PinCode", &mRequest.pinCode);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadNetworkCommissioningGeneratedCommandList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterUnlockWithTimeoutParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.timeout = [NSNumber numberWithUnsignedShort:mRequest.timeout];
-        if (mRequest.pinCode.HasValue()) {
-            params.pinCode = [NSData dataWithBytes:mRequest.pinCode.Value().data() length:mRequest.pinCode.Value().size()];
-        } else {
-            params.pinCode = nil;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster unlockWithTimeoutWithParams:params
-                               completionHandler:^(NSError * _Nullable error) {
-                                   responsesNeeded--;
-                                   if (error != nil) {
-                                       mError = error;
-                                       LogNSError("Error", error);
-                                   }
-                                   if (responsesNeeded == 0) {
-                                       SetCommandExitStatus(mError);
-                                   }
-                               }];
-        }
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"NetworkCommissioning.GeneratedCommandList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("NetworkCommissioning GeneratedCommandList read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::UnlockWithTimeout::Type mRequest;
 };
 
-/*
- * Command SetWeekDaySchedule
- */
-class DoorLockSetWeekDaySchedule : public ClusterCommand {
+class SubscribeAttributeNetworkCommissioningGeneratedCommandList : public SubscribeAttribute {
 public:
-    DoorLockSetWeekDaySchedule()
-        : ClusterCommand("set-week-day-schedule")
+    SubscribeAttributeNetworkCommissioningGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
-        AddArgument("WeekDayIndex", 0, UINT8_MAX, &mRequest.weekDayIndex);
-        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
-        AddArgument("DaysMask", 0, UINT8_MAX, &mRequest.daysMask);
-        AddArgument("StartHour", 0, UINT8_MAX, &mRequest.startHour);
-        AddArgument("StartMinute", 0, UINT8_MAX, &mRequest.startMinute);
-        AddArgument("EndHour", 0, UINT8_MAX, &mRequest.endHour);
-        AddArgument("EndMinute", 0, UINT8_MAX, &mRequest.endMinute);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeNetworkCommissioningGeneratedCommandList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000000B) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:mRequest.weekDayIndex];
-        params.userIndex = [NSNumber numberWithUnsignedShort:mRequest.userIndex];
-        params.daysMask = [NSNumber numberWithUnsignedChar:mRequest.daysMask.Raw()];
-        params.startHour = [NSNumber numberWithUnsignedChar:mRequest.startHour];
-        params.startMinute = [NSNumber numberWithUnsignedChar:mRequest.startMinute];
-        params.endHour = [NSNumber numberWithUnsignedChar:mRequest.endHour];
-        params.endMinute = [NSNumber numberWithUnsignedChar:mRequest.endMinute];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster setWeekDayScheduleWithParams:params
-                                completionHandler:^(NSError * _Nullable error) {
-                                    responsesNeeded--;
-                                    if (error != nil) {
-                                        mError = error;
-                                        LogNSError("Error", error);
-                                    }
-                                    if (responsesNeeded == 0) {
-                                        SetCommandExitStatus(mError);
-                                    }
-                                }];
-        }
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type mRequest;
 };
 
 /*
- * Command GetWeekDaySchedule
+ * Attribute AcceptedCommandList
  */
-class DoorLockGetWeekDaySchedule : public ClusterCommand {
+class ReadNetworkCommissioningAcceptedCommandList : public ReadAttribute {
 public:
-    DoorLockGetWeekDaySchedule()
-        : ClusterCommand("get-week-day-schedule")
+    ReadNetworkCommissioningAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
-        AddArgument("WeekDayIndex", 0, UINT8_MAX, &mRequest.weekDayIndex);
-        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadNetworkCommissioningAcceptedCommandList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000000C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:mRequest.weekDayIndex];
-        params.userIndex = [NSNumber numberWithUnsignedShort:mRequest.userIndex];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster getWeekDayScheduleWithParams:params
-                                completionHandler:^(CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values,
-                                    NSError * _Nullable error) {
-                                    NSLog(@"Values: %@", values);
-                                    responsesNeeded--;
-                                    if (error != nil) {
-                                        mError = error;
-                                        LogNSError("Error", error);
-                                    }
-                                    if (responsesNeeded == 0) {
-                                        SetCommandExitStatus(mError);
-                                    }
-                                }];
-        }
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"NetworkCommissioning.AcceptedCommandList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("NetworkCommissioning AcceptedCommandList read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type mRequest;
 };
 
-/*
- * Command ClearWeekDaySchedule
- */
-class DoorLockClearWeekDaySchedule : public ClusterCommand {
+class SubscribeAttributeNetworkCommissioningAcceptedCommandList : public SubscribeAttribute {
 public:
-    DoorLockClearWeekDaySchedule()
-        : ClusterCommand("clear-week-day-schedule")
+    SubscribeAttributeNetworkCommissioningAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
-        AddArgument("WeekDayIndex", 0, UINT8_MAX, &mRequest.weekDayIndex);
-        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeNetworkCommissioningAcceptedCommandList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000000D) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterClearWeekDayScheduleParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.weekDayIndex = [NSNumber numberWithUnsignedChar:mRequest.weekDayIndex];
-        params.userIndex = [NSNumber numberWithUnsignedShort:mRequest.userIndex];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster clearWeekDayScheduleWithParams:params
-                                  completionHandler:^(NSError * _Nullable error) {
-                                      responsesNeeded--;
-                                      if (error != nil) {
-                                          mError = error;
-                                          LogNSError("Error", error);
-                                      }
-                                      if (responsesNeeded == 0) {
-                                          SetCommandExitStatus(mError);
-                                      }
-                                  }];
-        }
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::ClearWeekDaySchedule::Type mRequest;
 };
 
 /*
- * Command SetYearDaySchedule
+ * Attribute AttributeList
  */
-class DoorLockSetYearDaySchedule : public ClusterCommand {
+class ReadNetworkCommissioningAttributeList : public ReadAttribute {
 public:
-    DoorLockSetYearDaySchedule()
-        : ClusterCommand("set-year-day-schedule")
+    ReadNetworkCommissioningAttributeList()
+        : ReadAttribute("attribute-list")
     {
-        AddArgument("YearDayIndex", 0, UINT8_MAX, &mRequest.yearDayIndex);
-        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
-        AddArgument("LocalStartTime", 0, UINT32_MAX, &mRequest.localStartTime);
-        AddArgument("LocalEndTime", 0, UINT32_MAX, &mRequest.localEndTime);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadNetworkCommissioningAttributeList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000000E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:mRequest.yearDayIndex];
-        params.userIndex = [NSNumber numberWithUnsignedShort:mRequest.userIndex];
-        params.localStartTime = [NSNumber numberWithUnsignedInt:mRequest.localStartTime];
-        params.localEndTime = [NSNumber numberWithUnsignedInt:mRequest.localEndTime];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster setYearDayScheduleWithParams:params
-                                completionHandler:^(NSError * _Nullable error) {
-                                    responsesNeeded--;
-                                    if (error != nil) {
-                                        mError = error;
-                                        LogNSError("Error", error);
-                                    }
-                                    if (responsesNeeded == 0) {
-                                        SetCommandExitStatus(mError);
-                                    }
-                                }];
-        }
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"NetworkCommissioning.AttributeList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("NetworkCommissioning AttributeList read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::SetYearDaySchedule::Type mRequest;
 };
 
-/*
- * Command GetYearDaySchedule
- */
-class DoorLockGetYearDaySchedule : public ClusterCommand {
+class SubscribeAttributeNetworkCommissioningAttributeList : public SubscribeAttribute {
 public:
-    DoorLockGetYearDaySchedule()
-        : ClusterCommand("get-year-day-schedule")
+    SubscribeAttributeNetworkCommissioningAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
-        AddArgument("YearDayIndex", 0, UINT8_MAX, &mRequest.yearDayIndex);
-        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeNetworkCommissioningAttributeList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000000F) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:mRequest.yearDayIndex];
-        params.userIndex = [NSNumber numberWithUnsignedShort:mRequest.userIndex];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster getYearDayScheduleWithParams:params
-                                completionHandler:^(CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values,
-                                    NSError * _Nullable error) {
-                                    NSLog(@"Values: %@", values);
-                                    responsesNeeded--;
-                                    if (error != nil) {
-                                        mError = error;
-                                        LogNSError("Error", error);
-                                    }
-                                    if (responsesNeeded == 0) {
-                                        SetCommandExitStatus(mError);
-                                    }
-                                }];
-        }
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type mRequest;
 };
 
 /*
- * Command ClearYearDaySchedule
+ * Attribute FeatureMap
  */
-class DoorLockClearYearDaySchedule : public ClusterCommand {
+class ReadNetworkCommissioningFeatureMap : public ReadAttribute {
 public:
-    DoorLockClearYearDaySchedule()
-        : ClusterCommand("clear-year-day-schedule")
+    ReadNetworkCommissioningFeatureMap()
+        : ReadAttribute("feature-map")
     {
-        AddArgument("YearDayIndex", 0, UINT8_MAX, &mRequest.yearDayIndex);
-        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadNetworkCommissioningFeatureMap() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterClearYearDayScheduleParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.yearDayIndex = [NSNumber numberWithUnsignedChar:mRequest.yearDayIndex];
-        params.userIndex = [NSNumber numberWithUnsignedShort:mRequest.userIndex];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster clearYearDayScheduleWithParams:params
-                                  completionHandler:^(NSError * _Nullable error) {
-                                      responsesNeeded--;
-                                      if (error != nil) {
-                                          mError = error;
-                                          LogNSError("Error", error);
-                                      }
-                                      if (responsesNeeded == 0) {
-                                          SetCommandExitStatus(mError);
-                                      }
-                                  }];
-        }
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"NetworkCommissioning.FeatureMap response %@", [value description]);
+            if (error != nil) {
+                LogNSError("NetworkCommissioning FeatureMap read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
+};
 
-private:
-    chip::app::Clusters::DoorLock::Commands::ClearYearDaySchedule::Type mRequest;
+class SubscribeAttributeNetworkCommissioningFeatureMap : public SubscribeAttribute {
+public:
+    SubscribeAttributeNetworkCommissioningFeatureMap()
+        : SubscribeAttribute("feature-map")
+    {
+    }
+
+    ~SubscribeAttributeNetworkCommissioningFeatureMap() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
 };
 
 /*
- * Command SetHolidaySchedule
+ * Attribute ClusterRevision
  */
-class DoorLockSetHolidaySchedule : public ClusterCommand {
+class ReadNetworkCommissioningClusterRevision : public ReadAttribute {
 public:
-    DoorLockSetHolidaySchedule()
-        : ClusterCommand("set-holiday-schedule")
+    ReadNetworkCommissioningClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
-        AddArgument("HolidayIndex", 0, UINT8_MAX, &mRequest.holidayIndex);
-        AddArgument("LocalStartTime", 0, UINT32_MAX, &mRequest.localStartTime);
-        AddArgument("LocalEndTime", 0, UINT32_MAX, &mRequest.localEndTime);
-        AddArgument("OperatingMode", 0, UINT8_MAX, &mRequest.operatingMode);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadNetworkCommissioningClusterRevision() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterSetHolidayScheduleParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.holidayIndex = [NSNumber numberWithUnsignedChar:mRequest.holidayIndex];
-        params.localStartTime = [NSNumber numberWithUnsignedInt:mRequest.localStartTime];
-        params.localEndTime = [NSNumber numberWithUnsignedInt:mRequest.localEndTime];
-        params.operatingMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.operatingMode)];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster setHolidayScheduleWithParams:params
-                                completionHandler:^(NSError * _Nullable error) {
-                                    responsesNeeded--;
-                                    if (error != nil) {
-                                        mError = error;
-                                        LogNSError("Error", error);
-                                    }
-                                    if (responsesNeeded == 0) {
-                                        SetCommandExitStatus(mError);
-                                    }
-                                }];
-        }
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"NetworkCommissioning.ClusterRevision response %@", [value description]);
+            if (error != nil) {
+                LogNSError("NetworkCommissioning ClusterRevision read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
+};
 
-private:
-    chip::app::Clusters::DoorLock::Commands::SetHolidaySchedule::Type mRequest;
+class SubscribeAttributeNetworkCommissioningClusterRevision : public SubscribeAttribute {
+public:
+    SubscribeAttributeNetworkCommissioningClusterRevision()
+        : SubscribeAttribute("cluster-revision")
+    {
+    }
+
+    ~SubscribeAttributeNetworkCommissioningClusterRevision() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
+                                                                                     endpoint:endpointId
+                                                                                        queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster DiagnosticLogs                                              | 0x0032 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * RetrieveLogsRequest                                               |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Command GetHolidaySchedule
+ * Command RetrieveLogsRequest
  */
-class DoorLockGetHolidaySchedule : public ClusterCommand {
+class DiagnosticLogsRetrieveLogsRequest : public ClusterCommand {
 public:
-    DoorLockGetHolidaySchedule()
-        : ClusterCommand("get-holiday-schedule")
+    DiagnosticLogsRetrieveLogsRequest()
+        : ClusterCommand("retrieve-logs-request")
     {
-        AddArgument("HolidayIndex", 0, UINT8_MAX, &mRequest.holidayIndex);
+        AddArgument("Intent", 0, UINT8_MAX, &mRequest.intent);
+        AddArgument("RequestedProtocol", 0, UINT8_MAX, &mRequest.requestedProtocol);
+        AddArgument("TransferFileDesignator", &mRequest.transferFileDesignator);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000032) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterGetHolidayScheduleParams alloc] init];
+        CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPDiagnosticLogsClusterRetrieveLogsRequestParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.holidayIndex = [NSNumber numberWithUnsignedChar:mRequest.holidayIndex];
+        params.intent = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.intent)];
+        params.requestedProtocol = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.requestedProtocol)];
+        params.transferFileDesignator = [NSData dataWithBytes:mRequest.transferFileDesignator.data()
+                                                       length:mRequest.transferFileDesignator.size()];
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster getHolidayScheduleWithParams:params
-                                completionHandler:^(CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values,
-                                    NSError * _Nullable error) {
-                                    NSLog(@"Values: %@", values);
-                                    responsesNeeded--;
-                                    if (error != nil) {
-                                        mError = error;
-                                        LogNSError("Error", error);
-                                    }
-                                    if (responsesNeeded == 0) {
-                                        SetCommandExitStatus(mError);
-                                    }
-                                }];
+            [cluster retrieveLogsRequestWithParams:params
+                                 completionHandler:^(CHIPDiagnosticLogsClusterRetrieveLogsResponseParams * _Nullable values,
+                                     NSError * _Nullable error) {
+                                     NSLog(@"Values: %@", values);
+                                     responsesNeeded--;
+                                     if (error != nil) {
+                                         mError = error;
+                                         LogNSError("Error", error);
+                                     }
+                                     if (responsesNeeded == 0) {
+                                         SetCommandExitStatus(mError);
+                                     }
+                                 }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Type mRequest;
+    chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsRequest::Type mRequest;
 };
 
 /*
- * Command ClearHolidaySchedule
+ * Attribute GeneratedCommandList
  */
-class DoorLockClearHolidaySchedule : public ClusterCommand {
+class ReadDiagnosticLogsGeneratedCommandList : public ReadAttribute {
 public:
-    DoorLockClearHolidaySchedule()
-        : ClusterCommand("clear-holiday-schedule")
+    ReadDiagnosticLogsGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
-        AddArgument("HolidayIndex", 0, UINT8_MAX, &mRequest.holidayIndex);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadDiagnosticLogsGeneratedCommandList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000032) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterClearHolidayScheduleParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.holidayIndex = [NSNumber numberWithUnsignedChar:mRequest.holidayIndex];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster clearHolidayScheduleWithParams:params
-                                  completionHandler:^(NSError * _Nullable error) {
-                                      responsesNeeded--;
-                                      if (error != nil) {
-                                          mError = error;
-                                          LogNSError("Error", error);
-                                      }
-                                      if (responsesNeeded == 0) {
-                                          SetCommandExitStatus(mError);
-                                      }
-                                  }];
-        }
+        CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DiagnosticLogs.GeneratedCommandList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("DiagnosticLogs GeneratedCommandList read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::ClearHolidaySchedule::Type mRequest;
 };
 
-/*
- * Command SetUser
- */
-class DoorLockSetUser : public ClusterCommand {
+class SubscribeAttributeDiagnosticLogsGeneratedCommandList : public SubscribeAttribute {
 public:
-    DoorLockSetUser()
-        : ClusterCommand("set-user")
+    SubscribeAttributeDiagnosticLogsGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
-        AddArgument("OperationType", 0, UINT8_MAX, &mRequest.operationType);
-        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
-        AddArgument("UserName", &mRequest.userName);
-        AddArgument("UserUniqueId", 0, UINT32_MAX, &mRequest.userUniqueId);
-        AddArgument("UserStatus", 0, UINT8_MAX, &mRequest.userStatus);
-        AddArgument("UserType", 0, UINT8_MAX, &mRequest.userType);
-        AddArgument("CredentialRule", 0, UINT8_MAX, &mRequest.credentialRule);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeDiagnosticLogsGeneratedCommandList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000001A) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000032) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterSetUserParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.operationType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.operationType)];
-        params.userIndex = [NSNumber numberWithUnsignedShort:mRequest.userIndex];
-        if (mRequest.userName.IsNull()) {
-            params.userName = nil;
-        } else {
-            params.userName = [[NSString alloc] initWithBytes:mRequest.userName.Value().data()
-                                                       length:mRequest.userName.Value().size()
-                                                     encoding:NSUTF8StringEncoding];
-        }
-        if (mRequest.userUniqueId.IsNull()) {
-            params.userUniqueId = nil;
-        } else {
-            params.userUniqueId = [NSNumber numberWithUnsignedInt:mRequest.userUniqueId.Value()];
-        }
-        if (mRequest.userStatus.IsNull()) {
-            params.userStatus = nil;
-        } else {
-            params.userStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.userStatus.Value())];
-        }
-        if (mRequest.userType.IsNull()) {
-            params.userType = nil;
-        } else {
-            params.userType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.userType.Value())];
-        }
-        if (mRequest.credentialRule.IsNull()) {
-            params.credentialRule = nil;
-        } else {
-            params.credentialRule = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.credentialRule.Value())];
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster setUserWithParams:params
-                     completionHandler:^(NSError * _Nullable error) {
-                         responsesNeeded--;
-                         if (error != nil) {
-                             mError = error;
-                             LogNSError("Error", error);
-                         }
-                         if (responsesNeeded == 0) {
-                             SetCommandExitStatus(mError);
-                         }
-                     }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::SetUser::Type mRequest;
-};
-
-/*
- * Command GetUser
- */
-class DoorLockGetUser : public ClusterCommand {
-public:
-    DoorLockGetUser()
-        : ClusterCommand("get-user")
-    {
-        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000001B) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.userIndex = [NSNumber numberWithUnsignedShort:mRequest.userIndex];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster getUserWithParams:params
-                     completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable error) {
-                         NSLog(@"Values: %@", values);
-                         responsesNeeded--;
-                         if (error != nil) {
-                             mError = error;
-                             LogNSError("Error", error);
-                         }
-                         if (responsesNeeded == 0) {
-                             SetCommandExitStatus(mError);
-                         }
-                     }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::GetUser::Type mRequest;
-};
-
-/*
- * Command ClearUser
- */
-class DoorLockClearUser : public ClusterCommand {
-public:
-    DoorLockClearUser()
-        : ClusterCommand("clear-user")
-    {
-        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000001D) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterClearUserParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.userIndex = [NSNumber numberWithUnsignedShort:mRequest.userIndex];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster clearUserWithParams:params
-                       completionHandler:^(NSError * _Nullable error) {
-                           responsesNeeded--;
-                           if (error != nil) {
-                               mError = error;
-                               LogNSError("Error", error);
-                           }
-                           if (responsesNeeded == 0) {
-                               SetCommandExitStatus(mError);
-                           }
-                       }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::ClearUser::Type mRequest;
-};
-
-/*
- * Command SetCredential
- */
-class DoorLockSetCredential : public ClusterCommand {
-public:
-    DoorLockSetCredential()
-        : ClusterCommand("set-credential")
-        , mComplex_Credential(&mRequest.credential)
-    {
-        AddArgument("OperationType", 0, UINT8_MAX, &mRequest.operationType);
-        AddArgument("Credential", &mComplex_Credential);
-        AddArgument("CredentialData", &mRequest.credentialData);
-        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
-        AddArgument("UserStatus", 0, UINT8_MAX, &mRequest.userStatus);
-        AddArgument("UserType", 0, UINT8_MAX, &mRequest.userType);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000022) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.operationType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.operationType)];
-        params.credential = [CHIPDoorLockClusterDlCredential new];
-        params.credential.credentialType =
-            [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.credential.credentialType)];
-        params.credential.credentialIndex = [NSNumber numberWithUnsignedShort:mRequest.credential.credentialIndex];
-        params.credentialData = [NSData dataWithBytes:mRequest.credentialData.data() length:mRequest.credentialData.size()];
-        if (mRequest.userIndex.IsNull()) {
-            params.userIndex = nil;
-        } else {
-            params.userIndex = [NSNumber numberWithUnsignedShort:mRequest.userIndex.Value()];
-        }
-        if (mRequest.userStatus.IsNull()) {
-            params.userStatus = nil;
-        } else {
-            params.userStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.userStatus.Value())];
-        }
-        if (mRequest.userType.IsNull()) {
-            params.userType = nil;
-        } else {
-            params.userType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.userType.Value())];
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster setCredentialWithParams:params
-                           completionHandler:^(
-                               CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable error) {
-                               NSLog(@"Values: %@", values);
-                               responsesNeeded--;
-                               if (error != nil) {
-                                   mError = error;
-                                   LogNSError("Error", error);
-                               }
-                               if (responsesNeeded == 0) {
-                                   SetCommandExitStatus(mError);
-                               }
-                           }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::SetCredential::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::DoorLock::Structs::DlCredential::Type> mComplex_Credential;
-};
-
-/*
- * Command GetCredentialStatus
- */
-class DoorLockGetCredentialStatus : public ClusterCommand {
-public:
-    DoorLockGetCredentialStatus()
-        : ClusterCommand("get-credential-status")
-        , mComplex_Credential(&mRequest.credential)
-    {
-        AddArgument("Credential", &mComplex_Credential);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000024) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.credential = [CHIPDoorLockClusterDlCredential new];
-        params.credential.credentialType =
-            [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.credential.credentialType)];
-        params.credential.credentialIndex = [NSNumber numberWithUnsignedShort:mRequest.credential.credentialIndex];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster getCredentialStatusWithParams:params
-                                 completionHandler:^(CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values,
-                                     NSError * _Nullable error) {
-                                     NSLog(@"Values: %@", values);
-                                     responsesNeeded--;
-                                     if (error != nil) {
-                                         mError = error;
-                                         LogNSError("Error", error);
-                                     }
-                                     if (responsesNeeded == 0) {
-                                         SetCommandExitStatus(mError);
-                                     }
-                                 }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::DoorLock::Structs::DlCredential::Type> mComplex_Credential;
-};
-
-/*
- * Command ClearCredential
- */
-class DoorLockClearCredential : public ClusterCommand {
-public:
-    DoorLockClearCredential()
-        : ClusterCommand("clear-credential")
-        , mComplex_Credential(&mRequest.credential)
-    {
-        AddArgument("Credential", &mComplex_Credential);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000026) on endpoint %u", endpointId);
+        CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DiagnosticLogs.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        if (mRequest.credential.IsNull()) {
-            params.credential = nil;
-        } else {
-            params.credential = [CHIPDoorLockClusterDlCredential new];
-            params.credential.credentialType =
-                [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.credential.Value().credentialType)];
-            params.credential.credentialIndex = [NSNumber numberWithUnsignedShort:mRequest.credential.Value().credentialIndex];
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster clearCredentialWithParams:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 responsesNeeded--;
-                                 if (error != nil) {
-                                     mError = error;
-                                     LogNSError("Error", error);
-                                 }
-                                 if (responsesNeeded == 0) {
-                                     SetCommandExitStatus(mError);
-                                 }
-                             }];
-        }
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::DoorLock::Commands::ClearCredential::Type mRequest;
-    TypedComplexArgument<chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::Structs::DlCredential::Type>>
-        mComplex_Credential;
 };
 
 /*
- * Attribute LockState
+ * Attribute AcceptedCommandList
  */
-class ReadDoorLockLockState : public ReadAttribute {
+class ReadDiagnosticLogsAcceptedCommandList : public ReadAttribute {
 public:
-    ReadDoorLockLockState()
-        : ReadAttribute("lock-state")
+    ReadDiagnosticLogsAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadDoorLockLockState() {}
+    ~ReadDiagnosticLogsAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000032) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeLockStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.LockState response %@", [value description]);
+        CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DiagnosticLogs.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock LockState read Error", error);
+                LogNSError("DiagnosticLogs AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -20860,32 +20397,32 @@ class ReadDoorLockLockState : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDoorLockLockState : public SubscribeAttribute {
+class SubscribeAttributeDiagnosticLogsAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockLockState()
-        : SubscribeAttribute("lock-state")
+    SubscribeAttributeDiagnosticLogsAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeDoorLockLockState() {}
+    ~SubscribeAttributeDiagnosticLogsAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000032) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLockStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.LockState response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DiagnosticLogs.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -20896,27 +20433,27 @@ class SubscribeAttributeDoorLockLockState : public SubscribeAttribute {
 };
 
 /*
- * Attribute LockType
+ * Attribute AttributeList
  */
-class ReadDoorLockLockType : public ReadAttribute {
+class ReadDiagnosticLogsAttributeList : public ReadAttribute {
 public:
-    ReadDoorLockLockType()
-        : ReadAttribute("lock-type")
+    ReadDiagnosticLogsAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadDoorLockLockType() {}
+    ~ReadDiagnosticLogsAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000032) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeLockTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.LockType response %@", [value description]);
+        CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DiagnosticLogs.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock LockType read Error", error);
+                LogNSError("DiagnosticLogs AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -20924,32 +20461,32 @@ class ReadDoorLockLockType : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDoorLockLockType : public SubscribeAttribute {
+class SubscribeAttributeDiagnosticLogsAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockLockType()
-        : SubscribeAttribute("lock-type")
+    SubscribeAttributeDiagnosticLogsAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeDoorLockLockType() {}
+    ~SubscribeAttributeDiagnosticLogsAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000032) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLockTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.LockType response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DiagnosticLogs.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -20960,27 +20497,27 @@ class SubscribeAttributeDoorLockLockType : public SubscribeAttribute {
 };
 
 /*
- * Attribute ActuatorEnabled
+ * Attribute FeatureMap
  */
-class ReadDoorLockActuatorEnabled : public ReadAttribute {
+class ReadDiagnosticLogsFeatureMap : public ReadAttribute {
 public:
-    ReadDoorLockActuatorEnabled()
-        : ReadAttribute("actuator-enabled")
+    ReadDiagnosticLogsFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadDoorLockActuatorEnabled() {}
+    ~ReadDiagnosticLogsFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000032) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeActuatorEnabledWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.ActuatorEnabled response %@", [value description]);
+        CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DiagnosticLogs.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock ActuatorEnabled read Error", error);
+                LogNSError("DiagnosticLogs FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -20988,32 +20525,32 @@ class ReadDoorLockActuatorEnabled : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDoorLockActuatorEnabled : public SubscribeAttribute {
+class SubscribeAttributeDiagnosticLogsFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockActuatorEnabled()
-        : SubscribeAttribute("actuator-enabled")
+    SubscribeAttributeDiagnosticLogsFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeDoorLockActuatorEnabled() {}
+    ~SubscribeAttributeDiagnosticLogsFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000032) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeActuatorEnabledWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.ActuatorEnabled response %@", [value description]);
+                NSLog(@"DiagnosticLogs.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -21024,27 +20561,27 @@ class SubscribeAttributeDoorLockActuatorEnabled : public SubscribeAttribute {
 };
 
 /*
- * Attribute DoorState
+ * Attribute ClusterRevision
  */
-class ReadDoorLockDoorState : public ReadAttribute {
+class ReadDiagnosticLogsClusterRevision : public ReadAttribute {
 public:
-    ReadDoorLockDoorState()
-        : ReadAttribute("door-state")
+    ReadDiagnosticLogsClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadDoorLockDoorState() {}
+    ~ReadDiagnosticLogsClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000032) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeDoorStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.DoorState response %@", [value description]);
+        CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DiagnosticLogs.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock DoorState read Error", error);
+                LogNSError("DiagnosticLogs ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -21052,32 +20589,32 @@ class ReadDoorLockDoorState : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDoorLockDoorState : public SubscribeAttribute {
+class SubscribeAttributeDiagnosticLogsClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockDoorState()
-        : SubscribeAttribute("door-state")
+    SubscribeAttributeDiagnosticLogsClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeDoorLockDoorState() {}
+    ~SubscribeAttributeDiagnosticLogsClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000032) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDoorStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.DoorState response %@", [value description]);
+                NSLog(@"DiagnosticLogs.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -21087,99 +20624,142 @@ class SubscribeAttributeDoorLockDoorState : public SubscribeAttribute {
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster GeneralDiagnostics                                          | 0x0033 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * TestEventTrigger                                                  |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * NetworkInterfaces                                                 | 0x0000 |
+| * RebootCount                                                       | 0x0001 |
+| * UpTime                                                            | 0x0002 |
+| * TotalOperationalHours                                             | 0x0003 |
+| * BootReasons                                                       | 0x0004 |
+| * ActiveHardwareFaults                                              | 0x0005 |
+| * ActiveRadioFaults                                                 | 0x0006 |
+| * ActiveNetworkFaults                                               | 0x0007 |
+| * TestEventTriggersEnabled                                          | 0x0008 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * HardwareFaultChange                                               | 0x0000 |
+| * RadioFaultChange                                                  | 0x0001 |
+| * NetworkFaultChange                                                | 0x0002 |
+| * BootReason                                                        | 0x0003 |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute DoorOpenEvents
+ * Command TestEventTrigger
  */
-class ReadDoorLockDoorOpenEvents : public ReadAttribute {
+class GeneralDiagnosticsTestEventTrigger : public ClusterCommand {
 public:
-    ReadDoorLockDoorOpenEvents()
-        : ReadAttribute("door-open-events")
+    GeneralDiagnosticsTestEventTrigger()
+        : ClusterCommand("test-event-trigger")
     {
+        AddArgument("EnableKey", &mRequest.enableKey);
+        AddArgument("EventTrigger", 0, UINT64_MAX, &mRequest.eventTrigger);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadDoorLockDoorOpenEvents() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeDoorOpenEventsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.DoorOpenEvents response %@", [value description]);
-            if (error != nil) {
-                LogNSError("DoorLock DoorOpenEvents read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        __auto_type * params = [[CHIPGeneralDiagnosticsClusterTestEventTriggerParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.enableKey = [NSData dataWithBytes:mRequest.enableKey.data() length:mRequest.enableKey.size()];
+        params.eventTrigger = [NSNumber numberWithUnsignedLongLong:mRequest.eventTrigger];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster testEventTriggerWithParams:params
+                              completionHandler:^(NSError * _Nullable error) {
+                                  responsesNeeded--;
+                                  if (error != nil) {
+                                      mError = error;
+                                      LogNSError("Error", error);
+                                  }
+                                  if (responsesNeeded == 0) {
+                                      SetCommandExitStatus(mError);
+                                  }
+                              }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::GeneralDiagnostics::Commands::TestEventTrigger::Type mRequest;
 };
 
-class WriteDoorLockDoorOpenEvents : public WriteAttribute {
+/*
+ * Attribute NetworkInterfaces
+ */
+class ReadGeneralDiagnosticsNetworkInterfaces : public ReadAttribute {
 public:
-    WriteDoorLockDoorOpenEvents()
-        : WriteAttribute("door-open-events")
+    ReadGeneralDiagnosticsNetworkInterfaces()
+        : ReadAttribute("network-interfaces")
     {
-        AddArgument("attr-name", "door-open-events");
-        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteDoorLockDoorOpenEvents() {}
+    ~ReadGeneralDiagnosticsNetworkInterfaces() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000004) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
-        [cluster writeAttributeDoorOpenEventsWithValue:value
-                                                params:params
-                                     completionHandler:^(NSError * _Nullable error) {
-                                         if (error != nil) {
-                                             LogNSError("DoorLock DoorOpenEvents write Error", error);
-                                         }
-                                         SetCommandExitStatus(error);
-                                     }];
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeNetworkInterfacesWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GeneralDiagnostics.NetworkInterfaces response %@", [value description]);
+            if (error != nil) {
+                LogNSError("GeneralDiagnostics NetworkInterfaces read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    uint32_t mValue;
 };
 
-class SubscribeAttributeDoorLockDoorOpenEvents : public SubscribeAttribute {
+class SubscribeAttributeGeneralDiagnosticsNetworkInterfaces : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockDoorOpenEvents()
-        : SubscribeAttribute("door-open-events")
+    SubscribeAttributeGeneralDiagnosticsNetworkInterfaces()
+        : SubscribeAttribute("network-interfaces")
     {
     }
 
-    ~SubscribeAttributeDoorLockDoorOpenEvents() {}
+    ~SubscribeAttributeGeneralDiagnosticsNetworkInterfaces() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDoorOpenEventsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNetworkInterfacesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.DoorOpenEvents response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralDiagnostics.NetworkInterfaces response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -21190,27 +20770,29 @@ class SubscribeAttributeDoorLockDoorOpenEvents : public SubscribeAttribute {
 };
 
 /*
- * Attribute DoorClosedEvents
+ * Attribute RebootCount
  */
-class ReadDoorLockDoorClosedEvents : public ReadAttribute {
+class ReadGeneralDiagnosticsRebootCount : public ReadAttribute {
 public:
-    ReadDoorLockDoorClosedEvents()
-        : ReadAttribute("door-closed-events")
+    ReadGeneralDiagnosticsRebootCount()
+        : ReadAttribute("reboot-count")
     {
     }
 
-    ~ReadDoorLockDoorClosedEvents() {}
+    ~ReadGeneralDiagnosticsRebootCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeDoorClosedEventsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.DoorClosedEvents response %@", [value description]);
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeRebootCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GeneralDiagnostics.RebootCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock DoorClosedEvents read Error", error);
+                LogNSError("GeneralDiagnostics RebootCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -21218,70 +20800,34 @@ class ReadDoorLockDoorClosedEvents : public ReadAttribute {
     }
 };
 
-class WriteDoorLockDoorClosedEvents : public WriteAttribute {
-public:
-    WriteDoorLockDoorClosedEvents()
-        : WriteAttribute("door-closed-events")
-    {
-        AddArgument("attr-name", "door-closed-events");
-        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockDoorClosedEvents() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000005) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue];
-
-        [cluster writeAttributeDoorClosedEventsWithValue:value
-                                                  params:params
-                                       completionHandler:^(NSError * _Nullable error) {
-                                           if (error != nil) {
-                                               LogNSError("DoorLock DoorClosedEvents write Error", error);
-                                           }
-                                           SetCommandExitStatus(error);
-                                       }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint32_t mValue;
-};
-
-class SubscribeAttributeDoorLockDoorClosedEvents : public SubscribeAttribute {
+class SubscribeAttributeGeneralDiagnosticsRebootCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockDoorClosedEvents()
-        : SubscribeAttribute("door-closed-events")
+    SubscribeAttributeGeneralDiagnosticsRebootCount()
+        : SubscribeAttribute("reboot-count")
     {
     }
 
-    ~SubscribeAttributeDoorLockDoorClosedEvents() {}
+    ~SubscribeAttributeGeneralDiagnosticsRebootCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDoorClosedEventsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRebootCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.DoorClosedEvents response %@", [value description]);
+                NSLog(@"GeneralDiagnostics.RebootCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -21292,27 +20838,29 @@ class SubscribeAttributeDoorLockDoorClosedEvents : public SubscribeAttribute {
 };
 
 /*
- * Attribute OpenPeriod
+ * Attribute UpTime
  */
-class ReadDoorLockOpenPeriod : public ReadAttribute {
+class ReadGeneralDiagnosticsUpTime : public ReadAttribute {
 public:
-    ReadDoorLockOpenPeriod()
-        : ReadAttribute("open-period")
+    ReadGeneralDiagnosticsUpTime()
+        : ReadAttribute("up-time")
     {
     }
 
-    ~ReadDoorLockOpenPeriod() {}
+    ~ReadGeneralDiagnosticsUpTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeOpenPeriodWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.OpenPeriod response %@", [value description]);
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeUpTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GeneralDiagnostics.UpTime response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock OpenPeriod read Error", error);
+                LogNSError("GeneralDiagnostics UpTime read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -21320,70 +20868,34 @@ class ReadDoorLockOpenPeriod : public ReadAttribute {
     }
 };
 
-class WriteDoorLockOpenPeriod : public WriteAttribute {
-public:
-    WriteDoorLockOpenPeriod()
-        : WriteAttribute("open-period")
-    {
-        AddArgument("attr-name", "open-period");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockOpenPeriod() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000006) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeOpenPeriodWithValue:value
-                                            params:params
-                                 completionHandler:^(NSError * _Nullable error) {
-                                     if (error != nil) {
-                                         LogNSError("DoorLock OpenPeriod write Error", error);
-                                     }
-                                     SetCommandExitStatus(error);
-                                 }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeDoorLockOpenPeriod : public SubscribeAttribute {
+class SubscribeAttributeGeneralDiagnosticsUpTime : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockOpenPeriod()
-        : SubscribeAttribute("open-period")
+    SubscribeAttributeGeneralDiagnosticsUpTime()
+        : SubscribeAttribute("up-time")
     {
     }
 
-    ~SubscribeAttributeDoorLockOpenPeriod() {}
+    ~SubscribeAttributeGeneralDiagnosticsUpTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOpenPeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeUpTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.OpenPeriod response %@", [value description]);
+                NSLog(@"GeneralDiagnostics.UpTime response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -21394,61 +20906,64 @@ class SubscribeAttributeDoorLockOpenPeriod : public SubscribeAttribute {
 };
 
 /*
- * Attribute NumberOfTotalUsersSupported
+ * Attribute TotalOperationalHours
  */
-class ReadDoorLockNumberOfTotalUsersSupported : public ReadAttribute {
+class ReadGeneralDiagnosticsTotalOperationalHours : public ReadAttribute {
 public:
-    ReadDoorLockNumberOfTotalUsersSupported()
-        : ReadAttribute("number-of-total-users-supported")
+    ReadGeneralDiagnosticsTotalOperationalHours()
+        : ReadAttribute("total-operational-hours")
     {
     }
 
-    ~ReadDoorLockNumberOfTotalUsersSupported() {}
+    ~ReadGeneralDiagnosticsTotalOperationalHours() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeNumberOfTotalUsersSupportedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.NumberOfTotalUsersSupported response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("DoorLock NumberOfTotalUsersSupported read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeTotalOperationalHoursWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GeneralDiagnostics.TotalOperationalHours response %@", [value description]);
+            if (error != nil) {
+                LogNSError("GeneralDiagnostics TotalOperationalHours read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeDoorLockNumberOfTotalUsersSupported : public SubscribeAttribute {
+class SubscribeAttributeGeneralDiagnosticsTotalOperationalHours : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockNumberOfTotalUsersSupported()
-        : SubscribeAttribute("number-of-total-users-supported")
+    SubscribeAttributeGeneralDiagnosticsTotalOperationalHours()
+        : SubscribeAttribute("total-operational-hours")
     {
     }
 
-    ~SubscribeAttributeDoorLockNumberOfTotalUsersSupported() {}
+    ~SubscribeAttributeGeneralDiagnosticsTotalOperationalHours() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNumberOfTotalUsersSupportedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTotalOperationalHoursWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.NumberOfTotalUsersSupported response %@", [value description]);
+                NSLog(@"GeneralDiagnostics.TotalOperationalHours response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -21459,61 +20974,64 @@ class SubscribeAttributeDoorLockNumberOfTotalUsersSupported : public SubscribeAt
 };
 
 /*
- * Attribute NumberOfPINUsersSupported
+ * Attribute BootReasons
  */
-class ReadDoorLockNumberOfPINUsersSupported : public ReadAttribute {
+class ReadGeneralDiagnosticsBootReasons : public ReadAttribute {
 public:
-    ReadDoorLockNumberOfPINUsersSupported()
-        : ReadAttribute("number-of-pinusers-supported")
+    ReadGeneralDiagnosticsBootReasons()
+        : ReadAttribute("boot-reasons")
     {
     }
 
-    ~ReadDoorLockNumberOfPINUsersSupported() {}
+    ~ReadGeneralDiagnosticsBootReasons() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeNumberOfPINUsersSupportedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.NumberOfPINUsersSupported response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("DoorLock NumberOfPINUsersSupported read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeBootReasonsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GeneralDiagnostics.BootReasons response %@", [value description]);
+            if (error != nil) {
+                LogNSError("GeneralDiagnostics BootReasons read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeDoorLockNumberOfPINUsersSupported : public SubscribeAttribute {
+class SubscribeAttributeGeneralDiagnosticsBootReasons : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockNumberOfPINUsersSupported()
-        : SubscribeAttribute("number-of-pinusers-supported")
+    SubscribeAttributeGeneralDiagnosticsBootReasons()
+        : SubscribeAttribute("boot-reasons")
     {
     }
 
-    ~SubscribeAttributeDoorLockNumberOfPINUsersSupported() {}
+    ~SubscribeAttributeGeneralDiagnosticsBootReasons() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNumberOfPINUsersSupportedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBootReasonsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.NumberOfPINUsersSupported response %@", [value description]);
+                NSLog(@"GeneralDiagnostics.BootReasons response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -21524,61 +21042,64 @@ class SubscribeAttributeDoorLockNumberOfPINUsersSupported : public SubscribeAttr
 };
 
 /*
- * Attribute NumberOfRFIDUsersSupported
+ * Attribute ActiveHardwareFaults
  */
-class ReadDoorLockNumberOfRFIDUsersSupported : public ReadAttribute {
+class ReadGeneralDiagnosticsActiveHardwareFaults : public ReadAttribute {
 public:
-    ReadDoorLockNumberOfRFIDUsersSupported()
-        : ReadAttribute("number-of-rfidusers-supported")
+    ReadGeneralDiagnosticsActiveHardwareFaults()
+        : ReadAttribute("active-hardware-faults")
     {
     }
 
-    ~ReadDoorLockNumberOfRFIDUsersSupported() {}
+    ~ReadGeneralDiagnosticsActiveHardwareFaults() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeNumberOfRFIDUsersSupportedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.NumberOfRFIDUsersSupported response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("DoorLock NumberOfRFIDUsersSupported read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeActiveHardwareFaultsWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GeneralDiagnostics.ActiveHardwareFaults response %@", [value description]);
+            if (error != nil) {
+                LogNSError("GeneralDiagnostics ActiveHardwareFaults read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeDoorLockNumberOfRFIDUsersSupported : public SubscribeAttribute {
+class SubscribeAttributeGeneralDiagnosticsActiveHardwareFaults : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockNumberOfRFIDUsersSupported()
-        : SubscribeAttribute("number-of-rfidusers-supported")
+    SubscribeAttributeGeneralDiagnosticsActiveHardwareFaults()
+        : SubscribeAttribute("active-hardware-faults")
     {
     }
 
-    ~SubscribeAttributeDoorLockNumberOfRFIDUsersSupported() {}
+    ~SubscribeAttributeGeneralDiagnosticsActiveHardwareFaults() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x00000005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNumberOfRFIDUsersSupportedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeActiveHardwareFaultsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.NumberOfRFIDUsersSupported response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralDiagnostics.ActiveHardwareFaults response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -21589,28 +21110,29 @@ class SubscribeAttributeDoorLockNumberOfRFIDUsersSupported : public SubscribeAtt
 };
 
 /*
- * Attribute NumberOfWeekDaySchedulesSupportedPerUser
+ * Attribute ActiveRadioFaults
  */
-class ReadDoorLockNumberOfWeekDaySchedulesSupportedPerUser : public ReadAttribute {
+class ReadGeneralDiagnosticsActiveRadioFaults : public ReadAttribute {
 public:
-    ReadDoorLockNumberOfWeekDaySchedulesSupportedPerUser()
-        : ReadAttribute("number-of-week-day-schedules-supported-per-user")
+    ReadGeneralDiagnosticsActiveRadioFaults()
+        : ReadAttribute("active-radio-faults")
     {
     }
 
-    ~ReadDoorLockNumberOfWeekDaySchedulesSupportedPerUser() {}
+    ~ReadGeneralDiagnosticsActiveRadioFaults() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000014) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x00000006) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNumberOfWeekDaySchedulesSupportedPerUserWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.NumberOfWeekDaySchedulesSupportedPerUser response %@", [value description]);
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeActiveRadioFaultsWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GeneralDiagnostics.ActiveRadioFaults response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock NumberOfWeekDaySchedulesSupportedPerUser read Error", error);
+                LogNSError("GeneralDiagnostics ActiveRadioFaults read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -21618,33 +21140,34 @@ class ReadDoorLockNumberOfWeekDaySchedulesSupportedPerUser : public ReadAttribut
     }
 };
 
-class SubscribeAttributeDoorLockNumberOfWeekDaySchedulesSupportedPerUser : public SubscribeAttribute {
+class SubscribeAttributeGeneralDiagnosticsActiveRadioFaults : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockNumberOfWeekDaySchedulesSupportedPerUser()
-        : SubscribeAttribute("number-of-week-day-schedules-supported-per-user")
+    SubscribeAttributeGeneralDiagnosticsActiveRadioFaults()
+        : SubscribeAttribute("active-radio-faults")
     {
     }
 
-    ~SubscribeAttributeDoorLockNumberOfWeekDaySchedulesSupportedPerUser() {}
+    ~SubscribeAttributeGeneralDiagnosticsActiveRadioFaults() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000014) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x00000006) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeNumberOfWeekDaySchedulesSupportedPerUserWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeActiveRadioFaultsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.NumberOfWeekDaySchedulesSupportedPerUser response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralDiagnostics.ActiveRadioFaults response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -21655,28 +21178,29 @@ class SubscribeAttributeDoorLockNumberOfWeekDaySchedulesSupportedPerUser : publi
 };
 
 /*
- * Attribute NumberOfYearDaySchedulesSupportedPerUser
+ * Attribute ActiveNetworkFaults
  */
-class ReadDoorLockNumberOfYearDaySchedulesSupportedPerUser : public ReadAttribute {
+class ReadGeneralDiagnosticsActiveNetworkFaults : public ReadAttribute {
 public:
-    ReadDoorLockNumberOfYearDaySchedulesSupportedPerUser()
-        : ReadAttribute("number-of-year-day-schedules-supported-per-user")
+    ReadGeneralDiagnosticsActiveNetworkFaults()
+        : ReadAttribute("active-network-faults")
     {
     }
 
-    ~ReadDoorLockNumberOfYearDaySchedulesSupportedPerUser() {}
+    ~ReadGeneralDiagnosticsActiveNetworkFaults() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000015) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x00000007) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNumberOfYearDaySchedulesSupportedPerUserWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.NumberOfYearDaySchedulesSupportedPerUser response %@", [value description]);
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeActiveNetworkFaultsWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GeneralDiagnostics.ActiveNetworkFaults response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock NumberOfYearDaySchedulesSupportedPerUser read Error", error);
+                LogNSError("GeneralDiagnostics ActiveNetworkFaults read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -21684,33 +21208,34 @@ class ReadDoorLockNumberOfYearDaySchedulesSupportedPerUser : public ReadAttribut
     }
 };
 
-class SubscribeAttributeDoorLockNumberOfYearDaySchedulesSupportedPerUser : public SubscribeAttribute {
+class SubscribeAttributeGeneralDiagnosticsActiveNetworkFaults : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockNumberOfYearDaySchedulesSupportedPerUser()
-        : SubscribeAttribute("number-of-year-day-schedules-supported-per-user")
+    SubscribeAttributeGeneralDiagnosticsActiveNetworkFaults()
+        : SubscribeAttribute("active-network-faults")
     {
     }
 
-    ~SubscribeAttributeDoorLockNumberOfYearDaySchedulesSupportedPerUser() {}
+    ~SubscribeAttributeGeneralDiagnosticsActiveNetworkFaults() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000015) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x00000007) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeNumberOfYearDaySchedulesSupportedPerUserWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeActiveNetworkFaultsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.NumberOfYearDaySchedulesSupportedPerUser response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralDiagnostics.ActiveNetworkFaults response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -21721,61 +21246,65 @@ class SubscribeAttributeDoorLockNumberOfYearDaySchedulesSupportedPerUser : publi
 };
 
 /*
- * Attribute NumberOfHolidaySchedulesSupported
+ * Attribute TestEventTriggersEnabled
  */
-class ReadDoorLockNumberOfHolidaySchedulesSupported : public ReadAttribute {
+class ReadGeneralDiagnosticsTestEventTriggersEnabled : public ReadAttribute {
 public:
-    ReadDoorLockNumberOfHolidaySchedulesSupported()
-        : ReadAttribute("number-of-holiday-schedules-supported")
+    ReadGeneralDiagnosticsTestEventTriggersEnabled()
+        : ReadAttribute("test-event-triggers-enabled")
     {
     }
 
-    ~ReadDoorLockNumberOfHolidaySchedulesSupported() {}
+    ~ReadGeneralDiagnosticsTestEventTriggersEnabled() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000016) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x00000008) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNumberOfHolidaySchedulesSupportedWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.NumberOfHolidaySchedulesSupported response %@", [value description]);
-            if (error != nil) {
-                LogNSError("DoorLock NumberOfHolidaySchedulesSupported read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster
+            readAttributeTestEventTriggersEnabledWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralDiagnostics.TestEventTriggersEnabled response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("GeneralDiagnostics TestEventTriggersEnabled read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeDoorLockNumberOfHolidaySchedulesSupported : public SubscribeAttribute {
+class SubscribeAttributeGeneralDiagnosticsTestEventTriggersEnabled : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockNumberOfHolidaySchedulesSupported()
-        : SubscribeAttribute("number-of-holiday-schedules-supported")
+    SubscribeAttributeGeneralDiagnosticsTestEventTriggersEnabled()
+        : SubscribeAttribute("test-event-triggers-enabled")
     {
     }
 
-    ~SubscribeAttributeDoorLockNumberOfHolidaySchedulesSupported() {}
+    ~SubscribeAttributeGeneralDiagnosticsTestEventTriggersEnabled() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000016) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x00000008) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNumberOfHolidaySchedulesSupportedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTestEventTriggersEnabledWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.NumberOfHolidaySchedulesSupported response %@", [value description]);
+                NSLog(@"GeneralDiagnostics.TestEventTriggersEnabled response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -21786,27 +21315,29 @@ class SubscribeAttributeDoorLockNumberOfHolidaySchedulesSupported : public Subsc
 };
 
 /*
- * Attribute MaxPINCodeLength
+ * Attribute GeneratedCommandList
  */
-class ReadDoorLockMaxPINCodeLength : public ReadAttribute {
+class ReadGeneralDiagnosticsGeneratedCommandList : public ReadAttribute {
 public:
-    ReadDoorLockMaxPINCodeLength()
-        : ReadAttribute("max-pincode-length")
+    ReadGeneralDiagnosticsGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadDoorLockMaxPINCodeLength() {}
+    ~ReadGeneralDiagnosticsGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeMaxPINCodeLengthWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.MaxPINCodeLength response %@", [value description]);
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GeneralDiagnostics.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock MaxPINCodeLength read Error", error);
+                LogNSError("GeneralDiagnostics GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -21814,32 +21345,34 @@ class ReadDoorLockMaxPINCodeLength : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDoorLockMaxPINCodeLength : public SubscribeAttribute {
+class SubscribeAttributeGeneralDiagnosticsGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockMaxPINCodeLength()
-        : SubscribeAttribute("max-pincode-length")
+    SubscribeAttributeGeneralDiagnosticsGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeDoorLockMaxPINCodeLength() {}
+    ~SubscribeAttributeGeneralDiagnosticsGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMaxPINCodeLengthWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.MaxPINCodeLength response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralDiagnostics.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -21850,27 +21383,29 @@ class SubscribeAttributeDoorLockMaxPINCodeLength : public SubscribeAttribute {
 };
 
 /*
- * Attribute MinPINCodeLength
+ * Attribute AcceptedCommandList
  */
-class ReadDoorLockMinPINCodeLength : public ReadAttribute {
+class ReadGeneralDiagnosticsAcceptedCommandList : public ReadAttribute {
 public:
-    ReadDoorLockMinPINCodeLength()
-        : ReadAttribute("min-pincode-length")
+    ReadGeneralDiagnosticsAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadDoorLockMinPINCodeLength() {}
+    ~ReadGeneralDiagnosticsAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000018) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeMinPINCodeLengthWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.MinPINCodeLength response %@", [value description]);
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GeneralDiagnostics.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock MinPINCodeLength read Error", error);
+                LogNSError("GeneralDiagnostics AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -21878,32 +21413,34 @@ class ReadDoorLockMinPINCodeLength : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDoorLockMinPINCodeLength : public SubscribeAttribute {
+class SubscribeAttributeGeneralDiagnosticsAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockMinPINCodeLength()
-        : SubscribeAttribute("min-pincode-length")
+    SubscribeAttributeGeneralDiagnosticsAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeDoorLockMinPINCodeLength() {}
+    ~SubscribeAttributeGeneralDiagnosticsAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000018) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMinPINCodeLengthWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.MinPINCodeLength response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralDiagnostics.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -21914,27 +21451,29 @@ class SubscribeAttributeDoorLockMinPINCodeLength : public SubscribeAttribute {
 };
 
 /*
- * Attribute MaxRFIDCodeLength
+ * Attribute AttributeList
  */
-class ReadDoorLockMaxRFIDCodeLength : public ReadAttribute {
+class ReadGeneralDiagnosticsAttributeList : public ReadAttribute {
 public:
-    ReadDoorLockMaxRFIDCodeLength()
-        : ReadAttribute("max-rfidcode-length")
+    ReadGeneralDiagnosticsAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadDoorLockMaxRFIDCodeLength() {}
+    ~ReadGeneralDiagnosticsAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000019) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeMaxRFIDCodeLengthWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.MaxRFIDCodeLength response %@", [value description]);
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GeneralDiagnostics.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock MaxRFIDCodeLength read Error", error);
+                LogNSError("GeneralDiagnostics AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -21942,32 +21481,34 @@ class ReadDoorLockMaxRFIDCodeLength : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDoorLockMaxRFIDCodeLength : public SubscribeAttribute {
+class SubscribeAttributeGeneralDiagnosticsAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockMaxRFIDCodeLength()
-        : SubscribeAttribute("max-rfidcode-length")
+    SubscribeAttributeGeneralDiagnosticsAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeDoorLockMaxRFIDCodeLength() {}
+    ~SubscribeAttributeGeneralDiagnosticsAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000019) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMaxRFIDCodeLengthWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.MaxRFIDCodeLength response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GeneralDiagnostics.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -21978,27 +21519,29 @@ class SubscribeAttributeDoorLockMaxRFIDCodeLength : public SubscribeAttribute {
 };
 
 /*
- * Attribute MinRFIDCodeLength
+ * Attribute FeatureMap
  */
-class ReadDoorLockMinRFIDCodeLength : public ReadAttribute {
+class ReadGeneralDiagnosticsFeatureMap : public ReadAttribute {
 public:
-    ReadDoorLockMinRFIDCodeLength()
-        : ReadAttribute("min-rfidcode-length")
+    ReadGeneralDiagnosticsFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadDoorLockMinRFIDCodeLength() {}
+    ~ReadGeneralDiagnosticsFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x0000001A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeMinRFIDCodeLengthWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.MinRFIDCodeLength response %@", [value description]);
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GeneralDiagnostics.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock MinRFIDCodeLength read Error", error);
+                LogNSError("GeneralDiagnostics FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -22006,32 +21549,34 @@ class ReadDoorLockMinRFIDCodeLength : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDoorLockMinRFIDCodeLength : public SubscribeAttribute {
+class SubscribeAttributeGeneralDiagnosticsFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockMinRFIDCodeLength()
-        : SubscribeAttribute("min-rfidcode-length")
+    SubscribeAttributeGeneralDiagnosticsFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeDoorLockMinRFIDCodeLength() {}
+    ~SubscribeAttributeGeneralDiagnosticsFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x0000001A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMinRFIDCodeLengthWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.MinRFIDCodeLength response %@", [value description]);
+                NSLog(@"GeneralDiagnostics.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -22042,27 +21587,29 @@ class SubscribeAttributeDoorLockMinRFIDCodeLength : public SubscribeAttribute {
 };
 
 /*
- * Attribute CredentialRulesSupport
+ * Attribute ClusterRevision
  */
-class ReadDoorLockCredentialRulesSupport : public ReadAttribute {
+class ReadGeneralDiagnosticsClusterRevision : public ReadAttribute {
 public:
-    ReadDoorLockCredentialRulesSupport()
-        : ReadAttribute("credential-rules-support")
+    ReadGeneralDiagnosticsClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadDoorLockCredentialRulesSupport() {}
+    ~ReadGeneralDiagnosticsClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x0000001B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCredentialRulesSupportWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.CredentialRulesSupport response %@", [value description]);
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GeneralDiagnostics.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock CredentialRulesSupport read Error", error);
+                LogNSError("GeneralDiagnostics ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -22070,32 +21617,34 @@ class ReadDoorLockCredentialRulesSupport : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDoorLockCredentialRulesSupport : public SubscribeAttribute {
+class SubscribeAttributeGeneralDiagnosticsClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockCredentialRulesSupport()
-        : SubscribeAttribute("credential-rules-support")
+    SubscribeAttributeGeneralDiagnosticsClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeDoorLockCredentialRulesSupport() {}
+    ~SubscribeAttributeGeneralDiagnosticsClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x0000001B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCredentialRulesSupportWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.CredentialRulesSupport response %@", [value description]);
+                NSLog(@"GeneralDiagnostics.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -22105,29 +21654,94 @@ class SubscribeAttributeDoorLockCredentialRulesSupport : public SubscribeAttribu
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster SoftwareDiagnostics                                         | 0x0034 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * ResetWatermarks                                                   |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * ThreadMetrics                                                     | 0x0000 |
+| * CurrentHeapFree                                                   | 0x0001 |
+| * CurrentHeapUsed                                                   | 0x0002 |
+| * CurrentHeapHighWatermark                                          | 0x0003 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * SoftwareFault                                                     | 0x0000 |
+\*----------------------------------------------------------------------------*/
+
+/*
+ * Command ResetWatermarks
+ */
+class SoftwareDiagnosticsResetWatermarks : public ClusterCommand {
+public:
+    SoftwareDiagnosticsResetWatermarks()
+        : ClusterCommand("reset-watermarks")
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000034) command (0x00000000) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        __auto_type * params = [[CHIPSoftwareDiagnosticsClusterResetWatermarksParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster resetWatermarksWithParams:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 responsesNeeded--;
+                                 if (error != nil) {
+                                     mError = error;
+                                     LogNSError("Error", error);
+                                 }
+                                 if (responsesNeeded == 0) {
+                                     SetCommandExitStatus(mError);
+                                 }
+                             }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+};
+
 /*
- * Attribute NumberOfCredentialsSupportedPerUser
+ * Attribute ThreadMetrics
  */
-class ReadDoorLockNumberOfCredentialsSupportedPerUser : public ReadAttribute {
+class ReadSoftwareDiagnosticsThreadMetrics : public ReadAttribute {
 public:
-    ReadDoorLockNumberOfCredentialsSupportedPerUser()
-        : ReadAttribute("number-of-credentials-supported-per-user")
+    ReadSoftwareDiagnosticsThreadMetrics()
+        : ReadAttribute("thread-metrics")
     {
     }
 
-    ~ReadDoorLockNumberOfCredentialsSupportedPerUser() {}
+    ~ReadSoftwareDiagnosticsThreadMetrics() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x0000001C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNumberOfCredentialsSupportedPerUserWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.NumberOfCredentialsSupportedPerUser response %@", [value description]);
+        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        [cluster readAttributeThreadMetricsWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SoftwareDiagnostics.ThreadMetrics response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock NumberOfCredentialsSupportedPerUser read Error", error);
+                LogNSError("SoftwareDiagnostics ThreadMetrics read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -22135,32 +21749,34 @@ class ReadDoorLockNumberOfCredentialsSupportedPerUser : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDoorLockNumberOfCredentialsSupportedPerUser : public SubscribeAttribute {
+class SubscribeAttributeSoftwareDiagnosticsThreadMetrics : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockNumberOfCredentialsSupportedPerUser()
-        : SubscribeAttribute("number-of-credentials-supported-per-user")
+    SubscribeAttributeSoftwareDiagnosticsThreadMetrics()
+        : SubscribeAttribute("thread-metrics")
     {
     }
 
-    ~SubscribeAttributeDoorLockNumberOfCredentialsSupportedPerUser() {}
+    ~SubscribeAttributeSoftwareDiagnosticsThreadMetrics() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x0000001C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNumberOfCredentialsSupportedPerUserWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeThreadMetricsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.NumberOfCredentialsSupportedPerUser response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SoftwareDiagnostics.ThreadMetrics response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -22171,27 +21787,29 @@ class SubscribeAttributeDoorLockNumberOfCredentialsSupportedPerUser : public Sub
 };
 
 /*
- * Attribute Language
+ * Attribute CurrentHeapFree
  */
-class ReadDoorLockLanguage : public ReadAttribute {
+class ReadSoftwareDiagnosticsCurrentHeapFree : public ReadAttribute {
 public:
-    ReadDoorLockLanguage()
-        : ReadAttribute("language")
+    ReadSoftwareDiagnosticsCurrentHeapFree()
+        : ReadAttribute("current-heap-free")
     {
     }
 
-    ~ReadDoorLockLanguage() {}
+    ~ReadSoftwareDiagnosticsCurrentHeapFree() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000021) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeLanguageWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.Language response %@", [value description]);
+        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        [cluster readAttributeCurrentHeapFreeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SoftwareDiagnostics.CurrentHeapFree response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock Language read Error", error);
+                LogNSError("SoftwareDiagnostics CurrentHeapFree read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -22199,72 +21817,34 @@ class ReadDoorLockLanguage : public ReadAttribute {
     }
 };
 
-class WriteDoorLockLanguage : public WriteAttribute {
-public:
-    WriteDoorLockLanguage()
-        : WriteAttribute("language")
-    {
-        AddArgument("attr-name", "language");
-        AddArgument("attr-value", &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockLanguage() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000021) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSString * _Nonnull value = [[NSString alloc] initWithBytes:mValue.data()
-                                                             length:mValue.size()
-                                                           encoding:NSUTF8StringEncoding];
-
-        [cluster writeAttributeLanguageWithValue:value
-                                          params:params
-                               completionHandler:^(NSError * _Nullable error) {
-                                   if (error != nil) {
-                                       LogNSError("DoorLock Language write Error", error);
-                                   }
-                                   SetCommandExitStatus(error);
-                               }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::ByteSpan mValue;
-};
-
-class SubscribeAttributeDoorLockLanguage : public SubscribeAttribute {
+class SubscribeAttributeSoftwareDiagnosticsCurrentHeapFree : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockLanguage()
-        : SubscribeAttribute("language")
+    SubscribeAttributeSoftwareDiagnosticsCurrentHeapFree()
+        : SubscribeAttribute("current-heap-free")
     {
     }
 
-    ~SubscribeAttributeDoorLockLanguage() {}
+    ~SubscribeAttributeSoftwareDiagnosticsCurrentHeapFree() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000021) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLanguageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCurrentHeapFreeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.Language response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SoftwareDiagnostics.CurrentHeapFree response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -22275,27 +21855,29 @@ class SubscribeAttributeDoorLockLanguage : public SubscribeAttribute {
 };
 
 /*
- * Attribute LEDSettings
+ * Attribute CurrentHeapUsed
  */
-class ReadDoorLockLEDSettings : public ReadAttribute {
+class ReadSoftwareDiagnosticsCurrentHeapUsed : public ReadAttribute {
 public:
-    ReadDoorLockLEDSettings()
-        : ReadAttribute("ledsettings")
+    ReadSoftwareDiagnosticsCurrentHeapUsed()
+        : ReadAttribute("current-heap-used")
     {
     }
 
-    ~ReadDoorLockLEDSettings() {}
+    ~ReadSoftwareDiagnosticsCurrentHeapUsed() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000022) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeLEDSettingsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.LEDSettings response %@", [value description]);
+        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        [cluster readAttributeCurrentHeapUsedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SoftwareDiagnostics.CurrentHeapUsed response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock LEDSettings read Error", error);
+                LogNSError("SoftwareDiagnostics CurrentHeapUsed read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -22303,70 +21885,34 @@ class ReadDoorLockLEDSettings : public ReadAttribute {
     }
 };
 
-class WriteDoorLockLEDSettings : public WriteAttribute {
-public:
-    WriteDoorLockLEDSettings()
-        : WriteAttribute("ledsettings")
-    {
-        AddArgument("attr-name", "ledsettings");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockLEDSettings() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000022) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeLEDSettingsWithValue:value
-                                             params:params
-                                  completionHandler:^(NSError * _Nullable error) {
-                                      if (error != nil) {
-                                          LogNSError("DoorLock LEDSettings write Error", error);
-                                      }
-                                      SetCommandExitStatus(error);
-                                  }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeDoorLockLEDSettings : public SubscribeAttribute {
+class SubscribeAttributeSoftwareDiagnosticsCurrentHeapUsed : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockLEDSettings()
-        : SubscribeAttribute("ledsettings")
+    SubscribeAttributeSoftwareDiagnosticsCurrentHeapUsed()
+        : SubscribeAttribute("current-heap-used")
     {
     }
 
-    ~SubscribeAttributeDoorLockLEDSettings() {}
+    ~SubscribeAttributeSoftwareDiagnosticsCurrentHeapUsed() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000022) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLEDSettingsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCurrentHeapUsedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.LEDSettings response %@", [value description]);
+                NSLog(@"SoftwareDiagnostics.CurrentHeapUsed response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -22377,98 +21923,65 @@ class SubscribeAttributeDoorLockLEDSettings : public SubscribeAttribute {
 };
 
 /*
- * Attribute AutoRelockTime
+ * Attribute CurrentHeapHighWatermark
  */
-class ReadDoorLockAutoRelockTime : public ReadAttribute {
+class ReadSoftwareDiagnosticsCurrentHeapHighWatermark : public ReadAttribute {
 public:
-    ReadDoorLockAutoRelockTime()
-        : ReadAttribute("auto-relock-time")
+    ReadSoftwareDiagnosticsCurrentHeapHighWatermark()
+        : ReadAttribute("current-heap-high-watermark")
     {
     }
 
-    ~ReadDoorLockAutoRelockTime() {}
+    ~ReadSoftwareDiagnosticsCurrentHeapHighWatermark() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000023) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAutoRelockTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.AutoRelockTime response %@", [value description]);
-            if (error != nil) {
-                LogNSError("DoorLock AutoRelockTime read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteDoorLockAutoRelockTime : public WriteAttribute {
-public:
-    WriteDoorLockAutoRelockTime()
-        : WriteAttribute("auto-relock-time")
-    {
-        AddArgument("attr-name", "auto-relock-time");
-        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockAutoRelockTime() {}
+        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000023) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue];
-
-        [cluster writeAttributeAutoRelockTimeWithValue:value
-                                                params:params
-                                     completionHandler:^(NSError * _Nullable error) {
-                                         if (error != nil) {
-                                             LogNSError("DoorLock AutoRelockTime write Error", error);
-                                         }
-                                         SetCommandExitStatus(error);
-                                     }];
+        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        [cluster
+            readAttributeCurrentHeapHighWatermarkWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SoftwareDiagnostics.CurrentHeapHighWatermark response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("SoftwareDiagnostics CurrentHeapHighWatermark read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    uint32_t mValue;
 };
 
-class SubscribeAttributeDoorLockAutoRelockTime : public SubscribeAttribute {
+class SubscribeAttributeSoftwareDiagnosticsCurrentHeapHighWatermark : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockAutoRelockTime()
-        : SubscribeAttribute("auto-relock-time")
+    SubscribeAttributeSoftwareDiagnosticsCurrentHeapHighWatermark()
+        : SubscribeAttribute("current-heap-high-watermark")
     {
     }
 
-    ~SubscribeAttributeDoorLockAutoRelockTime() {}
+    ~SubscribeAttributeSoftwareDiagnosticsCurrentHeapHighWatermark() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000023) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAutoRelockTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCurrentHeapHighWatermarkWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.AutoRelockTime response %@", [value description]);
+                NSLog(@"SoftwareDiagnostics.CurrentHeapHighWatermark response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -22479,27 +21992,29 @@ class SubscribeAttributeDoorLockAutoRelockTime : public SubscribeAttribute {
 };
 
 /*
- * Attribute SoundVolume
+ * Attribute GeneratedCommandList
  */
-class ReadDoorLockSoundVolume : public ReadAttribute {
+class ReadSoftwareDiagnosticsGeneratedCommandList : public ReadAttribute {
 public:
-    ReadDoorLockSoundVolume()
-        : ReadAttribute("sound-volume")
+    ReadSoftwareDiagnosticsGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadDoorLockSoundVolume() {}
+    ~ReadSoftwareDiagnosticsGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000024) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeSoundVolumeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.SoundVolume response %@", [value description]);
+        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SoftwareDiagnostics.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock SoundVolume read Error", error);
+                LogNSError("SoftwareDiagnostics GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -22507,70 +22022,34 @@ class ReadDoorLockSoundVolume : public ReadAttribute {
     }
 };
 
-class WriteDoorLockSoundVolume : public WriteAttribute {
-public:
-    WriteDoorLockSoundVolume()
-        : WriteAttribute("sound-volume")
-    {
-        AddArgument("attr-name", "sound-volume");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockSoundVolume() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000024) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeSoundVolumeWithValue:value
-                                             params:params
-                                  completionHandler:^(NSError * _Nullable error) {
-                                      if (error != nil) {
-                                          LogNSError("DoorLock SoundVolume write Error", error);
-                                      }
-                                      SetCommandExitStatus(error);
-                                  }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeDoorLockSoundVolume : public SubscribeAttribute {
+class SubscribeAttributeSoftwareDiagnosticsGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockSoundVolume()
-        : SubscribeAttribute("sound-volume")
+    SubscribeAttributeSoftwareDiagnosticsGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeDoorLockSoundVolume() {}
+    ~SubscribeAttributeSoftwareDiagnosticsGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000024) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSoundVolumeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.SoundVolume response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SoftwareDiagnostics.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -22581,27 +22060,29 @@ class SubscribeAttributeDoorLockSoundVolume : public SubscribeAttribute {
 };
 
 /*
- * Attribute OperatingMode
+ * Attribute AcceptedCommandList
  */
-class ReadDoorLockOperatingMode : public ReadAttribute {
+class ReadSoftwareDiagnosticsAcceptedCommandList : public ReadAttribute {
 public:
-    ReadDoorLockOperatingMode()
-        : ReadAttribute("operating-mode")
+    ReadSoftwareDiagnosticsAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadDoorLockOperatingMode() {}
+    ~ReadSoftwareDiagnosticsAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000025) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeOperatingModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.OperatingMode response %@", [value description]);
+        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SoftwareDiagnostics.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock OperatingMode read Error", error);
+                LogNSError("SoftwareDiagnostics AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -22609,70 +22090,34 @@ class ReadDoorLockOperatingMode : public ReadAttribute {
     }
 };
 
-class WriteDoorLockOperatingMode : public WriteAttribute {
-public:
-    WriteDoorLockOperatingMode()
-        : WriteAttribute("operating-mode")
-    {
-        AddArgument("attr-name", "operating-mode");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockOperatingMode() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000025) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeOperatingModeWithValue:value
-                                               params:params
-                                    completionHandler:^(NSError * _Nullable error) {
-                                        if (error != nil) {
-                                            LogNSError("DoorLock OperatingMode write Error", error);
-                                        }
-                                        SetCommandExitStatus(error);
-                                    }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeDoorLockOperatingMode : public SubscribeAttribute {
+class SubscribeAttributeSoftwareDiagnosticsAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockOperatingMode()
-        : SubscribeAttribute("operating-mode")
+    SubscribeAttributeSoftwareDiagnosticsAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeDoorLockOperatingMode() {}
+    ~SubscribeAttributeSoftwareDiagnosticsAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000025) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOperatingModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.OperatingMode response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SoftwareDiagnostics.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -22683,61 +22128,64 @@ class SubscribeAttributeDoorLockOperatingMode : public SubscribeAttribute {
 };
 
 /*
- * Attribute SupportedOperatingModes
+ * Attribute AttributeList
  */
-class ReadDoorLockSupportedOperatingModes : public ReadAttribute {
+class ReadSoftwareDiagnosticsAttributeList : public ReadAttribute {
 public:
-    ReadDoorLockSupportedOperatingModes()
-        : ReadAttribute("supported-operating-modes")
+    ReadSoftwareDiagnosticsAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadDoorLockSupportedOperatingModes() {}
+    ~ReadSoftwareDiagnosticsAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000026) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeSupportedOperatingModesWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.SupportedOperatingModes response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("DoorLock SupportedOperatingModes read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SoftwareDiagnostics.AttributeList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("SoftwareDiagnostics AttributeList read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeDoorLockSupportedOperatingModes : public SubscribeAttribute {
+class SubscribeAttributeSoftwareDiagnosticsAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockSupportedOperatingModes()
-        : SubscribeAttribute("supported-operating-modes")
+    SubscribeAttributeSoftwareDiagnosticsAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeDoorLockSupportedOperatingModes() {}
+    ~SubscribeAttributeSoftwareDiagnosticsAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000026) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSupportedOperatingModesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.SupportedOperatingModes response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SoftwareDiagnostics.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -22748,28 +22196,29 @@ class SubscribeAttributeDoorLockSupportedOperatingModes : public SubscribeAttrib
 };
 
 /*
- * Attribute DefaultConfigurationRegister
+ * Attribute FeatureMap
  */
-class ReadDoorLockDefaultConfigurationRegister : public ReadAttribute {
+class ReadSoftwareDiagnosticsFeatureMap : public ReadAttribute {
 public:
-    ReadDoorLockDefaultConfigurationRegister()
-        : ReadAttribute("default-configuration-register")
+    ReadSoftwareDiagnosticsFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadDoorLockDefaultConfigurationRegister() {}
+    ~ReadSoftwareDiagnosticsFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000027) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeDefaultConfigurationRegisterWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.DefaultConfigurationRegister response %@", [value description]);
+        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SoftwareDiagnostics.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock DefaultConfigurationRegister read Error", error);
+                LogNSError("SoftwareDiagnostics FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -22777,32 +22226,34 @@ class ReadDoorLockDefaultConfigurationRegister : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDoorLockDefaultConfigurationRegister : public SubscribeAttribute {
+class SubscribeAttributeSoftwareDiagnosticsFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockDefaultConfigurationRegister()
-        : SubscribeAttribute("default-configuration-register")
+    SubscribeAttributeSoftwareDiagnosticsFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeDoorLockDefaultConfigurationRegister() {}
+    ~SubscribeAttributeSoftwareDiagnosticsFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000027) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDefaultConfigurationRegisterWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.DefaultConfigurationRegister response %@", [value description]);
+                NSLog(@"SoftwareDiagnostics.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -22813,27 +22264,29 @@ class SubscribeAttributeDoorLockDefaultConfigurationRegister : public SubscribeA
 };
 
 /*
- * Attribute EnableLocalProgramming
+ * Attribute ClusterRevision
  */
-class ReadDoorLockEnableLocalProgramming : public ReadAttribute {
+class ReadSoftwareDiagnosticsClusterRevision : public ReadAttribute {
 public:
-    ReadDoorLockEnableLocalProgramming()
-        : ReadAttribute("enable-local-programming")
+    ReadSoftwareDiagnosticsClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadDoorLockEnableLocalProgramming() {}
+    ~ReadSoftwareDiagnosticsClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000028) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeEnableLocalProgrammingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.EnableLocalProgramming response %@", [value description]);
+        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"SoftwareDiagnostics.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock EnableLocalProgramming read Error", error);
+                LogNSError("SoftwareDiagnostics ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -22841,70 +22294,34 @@ class ReadDoorLockEnableLocalProgramming : public ReadAttribute {
     }
 };
 
-class WriteDoorLockEnableLocalProgramming : public WriteAttribute {
-public:
-    WriteDoorLockEnableLocalProgramming()
-        : WriteAttribute("enable-local-programming")
-    {
-        AddArgument("attr-name", "enable-local-programming");
-        AddArgument("attr-value", 0, 1, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockEnableLocalProgramming() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000028) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
-
-        [cluster writeAttributeEnableLocalProgrammingWithValue:value
-                                                        params:params
-                                             completionHandler:^(NSError * _Nullable error) {
-                                                 if (error != nil) {
-                                                     LogNSError("DoorLock EnableLocalProgramming write Error", error);
-                                                 }
-                                                 SetCommandExitStatus(error);
-                                             }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    bool mValue;
-};
-
-class SubscribeAttributeDoorLockEnableLocalProgramming : public SubscribeAttribute {
+class SubscribeAttributeSoftwareDiagnosticsClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockEnableLocalProgramming()
-        : SubscribeAttribute("enable-local-programming")
+    SubscribeAttributeSoftwareDiagnosticsClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeDoorLockEnableLocalProgramming() {}
+    ~SubscribeAttributeSoftwareDiagnosticsClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000028) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeEnableLocalProgrammingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.EnableLocalProgramming response %@", [value description]);
+                NSLog(@"SoftwareDiagnostics.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -22914,99 +22331,188 @@ class SubscribeAttributeDoorLockEnableLocalProgramming : public SubscribeAttribu
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster ThreadNetworkDiagnostics                                    | 0x0035 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * ResetCounts                                                       |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * Channel                                                           | 0x0000 |
+| * RoutingRole                                                       | 0x0001 |
+| * NetworkName                                                       | 0x0002 |
+| * PanId                                                             | 0x0003 |
+| * ExtendedPanId                                                     | 0x0004 |
+| * MeshLocalPrefix                                                   | 0x0005 |
+| * OverrunCount                                                      | 0x0006 |
+| * NeighborTableList                                                 | 0x0007 |
+| * RouteTableList                                                    | 0x0008 |
+| * PartitionId                                                       | 0x0009 |
+| * Weighting                                                         | 0x000A |
+| * DataVersion                                                       | 0x000B |
+| * StableDataVersion                                                 | 0x000C |
+| * LeaderRouterId                                                    | 0x000D |
+| * DetachedRoleCount                                                 | 0x000E |
+| * ChildRoleCount                                                    | 0x000F |
+| * RouterRoleCount                                                   | 0x0010 |
+| * LeaderRoleCount                                                   | 0x0011 |
+| * AttachAttemptCount                                                | 0x0012 |
+| * PartitionIdChangeCount                                            | 0x0013 |
+| * BetterPartitionAttachAttemptCount                                 | 0x0014 |
+| * ParentChangeCount                                                 | 0x0015 |
+| * TxTotalCount                                                      | 0x0016 |
+| * TxUnicastCount                                                    | 0x0017 |
+| * TxBroadcastCount                                                  | 0x0018 |
+| * TxAckRequestedCount                                               | 0x0019 |
+| * TxAckedCount                                                      | 0x001A |
+| * TxNoAckRequestedCount                                             | 0x001B |
+| * TxDataCount                                                       | 0x001C |
+| * TxDataPollCount                                                   | 0x001D |
+| * TxBeaconCount                                                     | 0x001E |
+| * TxBeaconRequestCount                                              | 0x001F |
+| * TxOtherCount                                                      | 0x0020 |
+| * TxRetryCount                                                      | 0x0021 |
+| * TxDirectMaxRetryExpiryCount                                       | 0x0022 |
+| * TxIndirectMaxRetryExpiryCount                                     | 0x0023 |
+| * TxErrCcaCount                                                     | 0x0024 |
+| * TxErrAbortCount                                                   | 0x0025 |
+| * TxErrBusyChannelCount                                             | 0x0026 |
+| * RxTotalCount                                                      | 0x0027 |
+| * RxUnicastCount                                                    | 0x0028 |
+| * RxBroadcastCount                                                  | 0x0029 |
+| * RxDataCount                                                       | 0x002A |
+| * RxDataPollCount                                                   | 0x002B |
+| * RxBeaconCount                                                     | 0x002C |
+| * RxBeaconRequestCount                                              | 0x002D |
+| * RxOtherCount                                                      | 0x002E |
+| * RxAddressFilteredCount                                            | 0x002F |
+| * RxDestAddrFilteredCount                                           | 0x0030 |
+| * RxDuplicatedCount                                                 | 0x0031 |
+| * RxErrNoFrameCount                                                 | 0x0032 |
+| * RxErrUnknownNeighborCount                                         | 0x0033 |
+| * RxErrInvalidSrcAddrCount                                          | 0x0034 |
+| * RxErrSecCount                                                     | 0x0035 |
+| * RxErrFcsCount                                                     | 0x0036 |
+| * RxErrOtherCount                                                   | 0x0037 |
+| * ActiveTimestamp                                                   | 0x0038 |
+| * PendingTimestamp                                                  | 0x0039 |
+| * Delay                                                             | 0x003A |
+| * SecurityPolicy                                                    | 0x003B |
+| * ChannelMask                                                       | 0x003C |
+| * OperationalDatasetComponents                                      | 0x003D |
+| * ActiveNetworkFaultsList                                           | 0x003E |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * ConnectionStatus                                                  | 0x0000 |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute EnableOneTouchLocking
+ * Command ResetCounts
  */
-class ReadDoorLockEnableOneTouchLocking : public ReadAttribute {
+class ThreadNetworkDiagnosticsResetCounts : public ClusterCommand {
 public:
-    ReadDoorLockEnableOneTouchLocking()
-        : ReadAttribute("enable-one-touch-locking")
+    ThreadNetworkDiagnosticsResetCounts()
+        : ClusterCommand("reset-counts")
     {
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadDoorLockEnableOneTouchLocking() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000029) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeEnableOneTouchLockingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.EnableOneTouchLocking response %@", [value description]);
-            if (error != nil) {
-                LogNSError("DoorLock EnableOneTouchLocking read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        __auto_type * params = [[CHIPThreadNetworkDiagnosticsClusterResetCountsParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster resetCountsWithParams:params
+                         completionHandler:^(NSError * _Nullable error) {
+                             responsesNeeded--;
+                             if (error != nil) {
+                                 mError = error;
+                                 LogNSError("Error", error);
+                             }
+                             if (responsesNeeded == 0) {
+                                 SetCommandExitStatus(mError);
+                             }
+                         }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
 };
 
-class WriteDoorLockEnableOneTouchLocking : public WriteAttribute {
+/*
+ * Attribute Channel
+ */
+class ReadThreadNetworkDiagnosticsChannel : public ReadAttribute {
 public:
-    WriteDoorLockEnableOneTouchLocking()
-        : WriteAttribute("enable-one-touch-locking")
+    ReadThreadNetworkDiagnosticsChannel()
+        : ReadAttribute("channel")
     {
-        AddArgument("attr-name", "enable-one-touch-locking");
-        AddArgument("attr-value", 0, 1, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteDoorLockEnableOneTouchLocking() {}
+    ~ReadThreadNetworkDiagnosticsChannel() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000029) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
-        [cluster writeAttributeEnableOneTouchLockingWithValue:value
-                                                       params:params
-                                            completionHandler:^(NSError * _Nullable error) {
-                                                if (error != nil) {
-                                                    LogNSError("DoorLock EnableOneTouchLocking write Error", error);
-                                                }
-                                                SetCommandExitStatus(error);
-                                            }];
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeChannelWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.Channel response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ThreadNetworkDiagnostics Channel read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    bool mValue;
 };
 
-class SubscribeAttributeDoorLockEnableOneTouchLocking : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsChannel : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockEnableOneTouchLocking()
-        : SubscribeAttribute("enable-one-touch-locking")
+    SubscribeAttributeThreadNetworkDiagnosticsChannel()
+        : SubscribeAttribute("channel")
     {
     }
 
-    ~SubscribeAttributeDoorLockEnableOneTouchLocking() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsChannel() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000029) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeEnableOneTouchLockingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeChannelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.EnableOneTouchLocking response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.Channel response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -23017,27 +22523,29 @@ class SubscribeAttributeDoorLockEnableOneTouchLocking : public SubscribeAttribut
 };
 
 /*
- * Attribute EnableInsideStatusLED
+ * Attribute RoutingRole
  */
-class ReadDoorLockEnableInsideStatusLED : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsRoutingRole : public ReadAttribute {
 public:
-    ReadDoorLockEnableInsideStatusLED()
-        : ReadAttribute("enable-inside-status-led")
+    ReadThreadNetworkDiagnosticsRoutingRole()
+        : ReadAttribute("routing-role")
     {
     }
 
-    ~ReadDoorLockEnableInsideStatusLED() {}
+    ~ReadThreadNetworkDiagnosticsRoutingRole() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x0000002A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeEnableInsideStatusLEDWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.EnableInsideStatusLED response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeRoutingRoleWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.RoutingRole response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock EnableInsideStatusLED read Error", error);
+                LogNSError("ThreadNetworkDiagnostics RoutingRole read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -23045,70 +22553,34 @@ class ReadDoorLockEnableInsideStatusLED : public ReadAttribute {
     }
 };
 
-class WriteDoorLockEnableInsideStatusLED : public WriteAttribute {
-public:
-    WriteDoorLockEnableInsideStatusLED()
-        : WriteAttribute("enable-inside-status-led")
-    {
-        AddArgument("attr-name", "enable-inside-status-led");
-        AddArgument("attr-value", 0, 1, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockEnableInsideStatusLED() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x0000002A) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
-
-        [cluster writeAttributeEnableInsideStatusLEDWithValue:value
-                                                       params:params
-                                            completionHandler:^(NSError * _Nullable error) {
-                                                if (error != nil) {
-                                                    LogNSError("DoorLock EnableInsideStatusLED write Error", error);
-                                                }
-                                                SetCommandExitStatus(error);
-                                            }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    bool mValue;
-};
-
-class SubscribeAttributeDoorLockEnableInsideStatusLED : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsRoutingRole : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockEnableInsideStatusLED()
-        : SubscribeAttribute("enable-inside-status-led")
+    SubscribeAttributeThreadNetworkDiagnosticsRoutingRole()
+        : SubscribeAttribute("routing-role")
     {
     }
 
-    ~SubscribeAttributeDoorLockEnableInsideStatusLED() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsRoutingRole() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x0000002A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeEnableInsideStatusLEDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRoutingRoleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.EnableInsideStatusLED response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.RoutingRole response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -23119,99 +22591,64 @@ class SubscribeAttributeDoorLockEnableInsideStatusLED : public SubscribeAttribut
 };
 
 /*
- * Attribute EnablePrivacyModeButton
+ * Attribute NetworkName
  */
-class ReadDoorLockEnablePrivacyModeButton : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsNetworkName : public ReadAttribute {
 public:
-    ReadDoorLockEnablePrivacyModeButton()
-        : ReadAttribute("enable-privacy-mode-button")
+    ReadThreadNetworkDiagnosticsNetworkName()
+        : ReadAttribute("network-name")
     {
     }
 
-    ~ReadDoorLockEnablePrivacyModeButton() {}
+    ~ReadThreadNetworkDiagnosticsNetworkName() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x0000002B) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeEnablePrivacyModeButtonWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.EnablePrivacyModeButton response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("DoorLock EnablePrivacyModeButton read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteDoorLockEnablePrivacyModeButton : public WriteAttribute {
-public:
-    WriteDoorLockEnablePrivacyModeButton()
-        : WriteAttribute("enable-privacy-mode-button")
-    {
-        AddArgument("attr-name", "enable-privacy-mode-button");
-        AddArgument("attr-value", 0, 1, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockEnablePrivacyModeButton() {}
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x0000002B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
-
-        [cluster writeAttributeEnablePrivacyModeButtonWithValue:value
-                                                         params:params
-                                              completionHandler:^(NSError * _Nullable error) {
-                                                  if (error != nil) {
-                                                      LogNSError("DoorLock EnablePrivacyModeButton write Error", error);
-                                                  }
-                                                  SetCommandExitStatus(error);
-                                              }];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeNetworkNameWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.NetworkName response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ThreadNetworkDiagnostics NetworkName read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    bool mValue;
 };
 
-class SubscribeAttributeDoorLockEnablePrivacyModeButton : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsNetworkName : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockEnablePrivacyModeButton()
-        : SubscribeAttribute("enable-privacy-mode-button")
+    SubscribeAttributeThreadNetworkDiagnosticsNetworkName()
+        : SubscribeAttribute("network-name")
     {
     }
 
-    ~SubscribeAttributeDoorLockEnablePrivacyModeButton() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsNetworkName() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x0000002B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeEnablePrivacyModeButtonWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNetworkNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.EnablePrivacyModeButton response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.NetworkName response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -23222,99 +22659,64 @@ class SubscribeAttributeDoorLockEnablePrivacyModeButton : public SubscribeAttrib
 };
 
 /*
- * Attribute LocalProgrammingFeatures
+ * Attribute PanId
  */
-class ReadDoorLockLocalProgrammingFeatures : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsPanId : public ReadAttribute {
 public:
-    ReadDoorLockLocalProgrammingFeatures()
-        : ReadAttribute("local-programming-features")
+    ReadThreadNetworkDiagnosticsPanId()
+        : ReadAttribute("pan-id")
     {
     }
 
-    ~ReadDoorLockLocalProgrammingFeatures() {}
+    ~ReadThreadNetworkDiagnosticsPanId() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x0000002C) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeLocalProgrammingFeaturesWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.LocalProgrammingFeatures response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("DoorLock LocalProgrammingFeatures read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteDoorLockLocalProgrammingFeatures : public WriteAttribute {
-public:
-    WriteDoorLockLocalProgrammingFeatures()
-        : WriteAttribute("local-programming-features")
-    {
-        AddArgument("attr-name", "local-programming-features");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockLocalProgrammingFeatures() {}
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x0000002C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeLocalProgrammingFeaturesWithValue:value
-                                                          params:params
-                                               completionHandler:^(NSError * _Nullable error) {
-                                                   if (error != nil) {
-                                                       LogNSError("DoorLock LocalProgrammingFeatures write Error", error);
-                                                   }
-                                                   SetCommandExitStatus(error);
-                                               }];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributePanIdWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.PanId response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ThreadNetworkDiagnostics PanId read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    uint8_t mValue;
 };
 
-class SubscribeAttributeDoorLockLocalProgrammingFeatures : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsPanId : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockLocalProgrammingFeatures()
-        : SubscribeAttribute("local-programming-features")
+    SubscribeAttributeThreadNetworkDiagnosticsPanId()
+        : SubscribeAttribute("pan-id")
     {
     }
 
-    ~SubscribeAttributeDoorLockLocalProgrammingFeatures() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsPanId() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x0000002C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLocalProgrammingFeaturesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePanIdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.LocalProgrammingFeatures response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.PanId response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -23325,27 +22727,29 @@ class SubscribeAttributeDoorLockLocalProgrammingFeatures : public SubscribeAttri
 };
 
 /*
- * Attribute WrongCodeEntryLimit
+ * Attribute ExtendedPanId
  */
-class ReadDoorLockWrongCodeEntryLimit : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsExtendedPanId : public ReadAttribute {
 public:
-    ReadDoorLockWrongCodeEntryLimit()
-        : ReadAttribute("wrong-code-entry-limit")
+    ReadThreadNetworkDiagnosticsExtendedPanId()
+        : ReadAttribute("extended-pan-id")
     {
     }
 
-    ~ReadDoorLockWrongCodeEntryLimit() {}
+    ~ReadThreadNetworkDiagnosticsExtendedPanId() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000030) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeWrongCodeEntryLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.WrongCodeEntryLimit response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeExtendedPanIdWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.ExtendedPanId response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock WrongCodeEntryLimit read Error", error);
+                LogNSError("ThreadNetworkDiagnostics ExtendedPanId read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -23353,70 +22757,34 @@ class ReadDoorLockWrongCodeEntryLimit : public ReadAttribute {
     }
 };
 
-class WriteDoorLockWrongCodeEntryLimit : public WriteAttribute {
-public:
-    WriteDoorLockWrongCodeEntryLimit()
-        : WriteAttribute("wrong-code-entry-limit")
-    {
-        AddArgument("attr-name", "wrong-code-entry-limit");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockWrongCodeEntryLimit() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000030) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeWrongCodeEntryLimitWithValue:value
-                                                     params:params
-                                          completionHandler:^(NSError * _Nullable error) {
-                                              if (error != nil) {
-                                                  LogNSError("DoorLock WrongCodeEntryLimit write Error", error);
-                                              }
-                                              SetCommandExitStatus(error);
-                                          }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeDoorLockWrongCodeEntryLimit : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsExtendedPanId : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockWrongCodeEntryLimit()
-        : SubscribeAttribute("wrong-code-entry-limit")
+    SubscribeAttributeThreadNetworkDiagnosticsExtendedPanId()
+        : SubscribeAttribute("extended-pan-id")
     {
     }
 
-    ~SubscribeAttributeDoorLockWrongCodeEntryLimit() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsExtendedPanId() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000030) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeWrongCodeEntryLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeExtendedPanIdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.WrongCodeEntryLimit response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.ExtendedPanId response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -23427,28 +22795,29 @@ class SubscribeAttributeDoorLockWrongCodeEntryLimit : public SubscribeAttribute
 };
 
 /*
- * Attribute UserCodeTemporaryDisableTime
+ * Attribute MeshLocalPrefix
  */
-class ReadDoorLockUserCodeTemporaryDisableTime : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsMeshLocalPrefix : public ReadAttribute {
 public:
-    ReadDoorLockUserCodeTemporaryDisableTime()
-        : ReadAttribute("user-code-temporary-disable-time")
+    ReadThreadNetworkDiagnosticsMeshLocalPrefix()
+        : ReadAttribute("mesh-local-prefix")
     {
     }
 
-    ~ReadDoorLockUserCodeTemporaryDisableTime() {}
+    ~ReadThreadNetworkDiagnosticsMeshLocalPrefix() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000031) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeUserCodeTemporaryDisableTimeWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.UserCodeTemporaryDisableTime response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeMeshLocalPrefixWithCompletionHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.MeshLocalPrefix response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock UserCodeTemporaryDisableTime read Error", error);
+                LogNSError("ThreadNetworkDiagnostics MeshLocalPrefix read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -23456,70 +22825,34 @@ class ReadDoorLockUserCodeTemporaryDisableTime : public ReadAttribute {
     }
 };
 
-class WriteDoorLockUserCodeTemporaryDisableTime : public WriteAttribute {
-public:
-    WriteDoorLockUserCodeTemporaryDisableTime()
-        : WriteAttribute("user-code-temporary-disable-time")
-    {
-        AddArgument("attr-name", "user-code-temporary-disable-time");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockUserCodeTemporaryDisableTime() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000031) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeUserCodeTemporaryDisableTimeWithValue:value
-                                                              params:params
-                                                   completionHandler:^(NSError * _Nullable error) {
-                                                       if (error != nil) {
-                                                           LogNSError("DoorLock UserCodeTemporaryDisableTime write Error", error);
-                                                       }
-                                                       SetCommandExitStatus(error);
-                                                   }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeDoorLockUserCodeTemporaryDisableTime : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsMeshLocalPrefix : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockUserCodeTemporaryDisableTime()
-        : SubscribeAttribute("user-code-temporary-disable-time")
+    SubscribeAttributeThreadNetworkDiagnosticsMeshLocalPrefix()
+        : SubscribeAttribute("mesh-local-prefix")
     {
     }
 
-    ~SubscribeAttributeDoorLockUserCodeTemporaryDisableTime() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsMeshLocalPrefix() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000031) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeUserCodeTemporaryDisableTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMeshLocalPrefixWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.UserCodeTemporaryDisableTime response %@", [value description]);
+            reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.MeshLocalPrefix response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -23530,27 +22863,29 @@ class SubscribeAttributeDoorLockUserCodeTemporaryDisableTime : public SubscribeA
 };
 
 /*
- * Attribute SendPINOverTheAir
+ * Attribute OverrunCount
  */
-class ReadDoorLockSendPINOverTheAir : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsOverrunCount : public ReadAttribute {
 public:
-    ReadDoorLockSendPINOverTheAir()
-        : ReadAttribute("send-pinover-the-air")
+    ReadThreadNetworkDiagnosticsOverrunCount()
+        : ReadAttribute("overrun-count")
     {
     }
 
-    ~ReadDoorLockSendPINOverTheAir() {}
+    ~ReadThreadNetworkDiagnosticsOverrunCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000032) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000006) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeSendPINOverTheAirWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.SendPINOverTheAir response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeOverrunCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.OverrunCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock SendPINOverTheAir read Error", error);
+                LogNSError("ThreadNetworkDiagnostics OverrunCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -23558,70 +22893,34 @@ class ReadDoorLockSendPINOverTheAir : public ReadAttribute {
     }
 };
 
-class WriteDoorLockSendPINOverTheAir : public WriteAttribute {
-public:
-    WriteDoorLockSendPINOverTheAir()
-        : WriteAttribute("send-pinover-the-air")
-    {
-        AddArgument("attr-name", "send-pinover-the-air");
-        AddArgument("attr-value", 0, 1, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockSendPINOverTheAir() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000032) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
-
-        [cluster writeAttributeSendPINOverTheAirWithValue:value
-                                                   params:params
-                                        completionHandler:^(NSError * _Nullable error) {
-                                            if (error != nil) {
-                                                LogNSError("DoorLock SendPINOverTheAir write Error", error);
-                                            }
-                                            SetCommandExitStatus(error);
-                                        }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    bool mValue;
-};
-
-class SubscribeAttributeDoorLockSendPINOverTheAir : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsOverrunCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockSendPINOverTheAir()
-        : SubscribeAttribute("send-pinover-the-air")
+    SubscribeAttributeThreadNetworkDiagnosticsOverrunCount()
+        : SubscribeAttribute("overrun-count")
     {
     }
 
-    ~SubscribeAttributeDoorLockSendPINOverTheAir() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsOverrunCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000032) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000006) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSendPINOverTheAirWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOverrunCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.SendPINOverTheAir response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.OverrunCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -23632,28 +22931,29 @@ class SubscribeAttributeDoorLockSendPINOverTheAir : public SubscribeAttribute {
 };
 
 /*
- * Attribute RequirePINforRemoteOperation
+ * Attribute NeighborTableList
  */
-class ReadDoorLockRequirePINforRemoteOperation : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsNeighborTableList : public ReadAttribute {
 public:
-    ReadDoorLockRequirePINforRemoteOperation()
-        : ReadAttribute("require-pinfor-remote-operation")
+    ReadThreadNetworkDiagnosticsNeighborTableList()
+        : ReadAttribute("neighbor-table-list")
     {
     }
 
-    ~ReadDoorLockRequirePINforRemoteOperation() {}
+    ~ReadThreadNetworkDiagnosticsNeighborTableList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000033) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000007) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeRequirePINforRemoteOperationWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.RequirePINforRemoteOperation response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeNeighborTableListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.NeighborTableList response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock RequirePINforRemoteOperation read Error", error);
+                LogNSError("ThreadNetworkDiagnostics NeighborTableList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -23661,70 +22961,34 @@ class ReadDoorLockRequirePINforRemoteOperation : public ReadAttribute {
     }
 };
 
-class WriteDoorLockRequirePINforRemoteOperation : public WriteAttribute {
-public:
-    WriteDoorLockRequirePINforRemoteOperation()
-        : WriteAttribute("require-pinfor-remote-operation")
-    {
-        AddArgument("attr-name", "require-pinfor-remote-operation");
-        AddArgument("attr-value", 0, 1, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteDoorLockRequirePINforRemoteOperation() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000033) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
-
-        [cluster writeAttributeRequirePINforRemoteOperationWithValue:value
-                                                              params:params
-                                                   completionHandler:^(NSError * _Nullable error) {
-                                                       if (error != nil) {
-                                                           LogNSError("DoorLock RequirePINforRemoteOperation write Error", error);
-                                                       }
-                                                       SetCommandExitStatus(error);
-                                                   }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    bool mValue;
-};
-
-class SubscribeAttributeDoorLockRequirePINforRemoteOperation : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsNeighborTableList : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockRequirePINforRemoteOperation()
-        : SubscribeAttribute("require-pinfor-remote-operation")
+    SubscribeAttributeThreadNetworkDiagnosticsNeighborTableList()
+        : SubscribeAttribute("neighbor-table-list")
     {
     }
 
-    ~SubscribeAttributeDoorLockRequirePINforRemoteOperation() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsNeighborTableList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000033) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000007) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRequirePINforRemoteOperationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNeighborTableListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.RequirePINforRemoteOperation response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.NeighborTableList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -23735,27 +22999,29 @@ class SubscribeAttributeDoorLockRequirePINforRemoteOperation : public SubscribeA
 };
 
 /*
- * Attribute ExpiringUserTimeout
+ * Attribute RouteTableList
  */
-class ReadDoorLockExpiringUserTimeout : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsRouteTableList : public ReadAttribute {
 public:
-    ReadDoorLockExpiringUserTimeout()
-        : ReadAttribute("expiring-user-timeout")
+    ReadThreadNetworkDiagnosticsRouteTableList()
+        : ReadAttribute("route-table-list")
     {
     }
 
-    ~ReadDoorLockExpiringUserTimeout() {}
+    ~ReadThreadNetworkDiagnosticsRouteTableList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000035) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000008) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeExpiringUserTimeoutWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.ExpiringUserTimeout response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeRouteTableListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.RouteTableList response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock ExpiringUserTimeout read Error", error);
+                LogNSError("ThreadNetworkDiagnostics RouteTableList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -23763,70 +23029,102 @@ class ReadDoorLockExpiringUserTimeout : public ReadAttribute {
     }
 };
 
-class WriteDoorLockExpiringUserTimeout : public WriteAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsRouteTableList : public SubscribeAttribute {
 public:
-    WriteDoorLockExpiringUserTimeout()
-        : WriteAttribute("expiring-user-timeout")
+    SubscribeAttributeThreadNetworkDiagnosticsRouteTableList()
+        : SubscribeAttribute("route-table-list")
     {
-        AddArgument("attr-name", "expiring-user-timeout");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteDoorLockExpiringUserTimeout() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsRouteTableList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000035) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000008) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeRouteTableListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.RouteTableList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
-        [cluster writeAttributeExpiringUserTimeoutWithValue:value
-                                                     params:params
-                                          completionHandler:^(NSError * _Nullable error) {
-                                              if (error != nil) {
-                                                  LogNSError("DoorLock ExpiringUserTimeout write Error", error);
-                                              }
-                                              SetCommandExitStatus(error);
-                                          }];
         return CHIP_NO_ERROR;
     }
+};
 
-private:
-    uint16_t mValue;
+/*
+ * Attribute PartitionId
+ */
+class ReadThreadNetworkDiagnosticsPartitionId : public ReadAttribute {
+public:
+    ReadThreadNetworkDiagnosticsPartitionId()
+        : ReadAttribute("partition-id")
+    {
+    }
+
+    ~ReadThreadNetworkDiagnosticsPartitionId() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000009) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributePartitionIdWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.PartitionId response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ThreadNetworkDiagnostics PartitionId read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
 };
 
-class SubscribeAttributeDoorLockExpiringUserTimeout : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsPartitionId : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockExpiringUserTimeout()
-        : SubscribeAttribute("expiring-user-timeout")
+    SubscribeAttributeThreadNetworkDiagnosticsPartitionId()
+        : SubscribeAttribute("partition-id")
     {
     }
 
-    ~SubscribeAttributeDoorLockExpiringUserTimeout() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsPartitionId() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000035) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000009) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeExpiringUserTimeoutWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePartitionIdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.ExpiringUserTimeout response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.PartitionId response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -23837,27 +23135,29 @@ class SubscribeAttributeDoorLockExpiringUserTimeout : public SubscribeAttribute
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute Weighting
  */
-class ReadDoorLockGeneratedCommandList : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsWeighting : public ReadAttribute {
 public:
-    ReadDoorLockGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadThreadNetworkDiagnosticsWeighting()
+        : ReadAttribute("weighting")
     {
     }
 
-    ~ReadDoorLockGeneratedCommandList() {}
+    ~ReadThreadNetworkDiagnosticsWeighting() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000000A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.GeneratedCommandList response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeWeightingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.Weighting response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock GeneratedCommandList read Error", error);
+                LogNSError("ThreadNetworkDiagnostics Weighting read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -23865,32 +23165,34 @@ class ReadDoorLockGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDoorLockGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsWeighting : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeThreadNetworkDiagnosticsWeighting()
+        : SubscribeAttribute("weighting")
     {
     }
 
-    ~SubscribeAttributeDoorLockGeneratedCommandList() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsWeighting() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000000A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeWeightingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.Weighting response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -23901,27 +23203,29 @@ class SubscribeAttributeDoorLockGeneratedCommandList : public SubscribeAttribute
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute DataVersion
  */
-class ReadDoorLockAcceptedCommandList : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsDataVersion : public ReadAttribute {
 public:
-    ReadDoorLockAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadThreadNetworkDiagnosticsDataVersion()
+        : ReadAttribute("data-version")
     {
     }
 
-    ~ReadDoorLockAcceptedCommandList() {}
+    ~ReadThreadNetworkDiagnosticsDataVersion() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000000B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.AcceptedCommandList response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeDataVersionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.DataVersion response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock AcceptedCommandList read Error", error);
+                LogNSError("ThreadNetworkDiagnostics DataVersion read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -23929,32 +23233,34 @@ class ReadDoorLockAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDoorLockAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsDataVersion : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeThreadNetworkDiagnosticsDataVersion()
+        : SubscribeAttribute("data-version")
     {
     }
 
-    ~SubscribeAttributeDoorLockAcceptedCommandList() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsDataVersion() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000000B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDataVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.DataVersion response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -23965,27 +23271,29 @@ class SubscribeAttributeDoorLockAcceptedCommandList : public SubscribeAttribute
 };
 
 /*
- * Attribute AttributeList
+ * Attribute StableDataVersion
  */
-class ReadDoorLockAttributeList : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsStableDataVersion : public ReadAttribute {
 public:
-    ReadDoorLockAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadThreadNetworkDiagnosticsStableDataVersion()
+        : ReadAttribute("stable-data-version")
     {
     }
 
-    ~ReadDoorLockAttributeList() {}
+    ~ReadThreadNetworkDiagnosticsStableDataVersion() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000000C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.AttributeList response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeStableDataVersionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.StableDataVersion response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock AttributeList read Error", error);
+                LogNSError("ThreadNetworkDiagnostics StableDataVersion read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -23993,32 +23301,34 @@ class ReadDoorLockAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDoorLockAttributeList : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsStableDataVersion : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeThreadNetworkDiagnosticsStableDataVersion()
+        : SubscribeAttribute("stable-data-version")
     {
     }
 
-    ~SubscribeAttributeDoorLockAttributeList() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsStableDataVersion() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000000C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeStableDataVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.StableDataVersion response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -24029,27 +23339,29 @@ class SubscribeAttributeDoorLockAttributeList : public SubscribeAttribute {
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute LeaderRouterId
  */
-class ReadDoorLockFeatureMap : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsLeaderRouterId : public ReadAttribute {
 public:
-    ReadDoorLockFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadThreadNetworkDiagnosticsLeaderRouterId()
+        : ReadAttribute("leader-router-id")
     {
     }
 
-    ~ReadDoorLockFeatureMap() {}
+    ~ReadThreadNetworkDiagnosticsLeaderRouterId() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000000D) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.FeatureMap response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeLeaderRouterIdWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.LeaderRouterId response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock FeatureMap read Error", error);
+                LogNSError("ThreadNetworkDiagnostics LeaderRouterId read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -24057,32 +23369,34 @@ class ReadDoorLockFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDoorLockFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsLeaderRouterId : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeThreadNetworkDiagnosticsLeaderRouterId()
+        : SubscribeAttribute("leader-router-id")
     {
     }
 
-    ~SubscribeAttributeDoorLockFeatureMap() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsLeaderRouterId() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000000D) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeLeaderRouterIdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.FeatureMap response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.LeaderRouterId response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -24093,27 +23407,29 @@ class SubscribeAttributeDoorLockFeatureMap : public SubscribeAttribute {
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute DetachedRoleCount
  */
-class ReadDoorLockClusterRevision : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsDetachedRoleCount : public ReadAttribute {
 public:
-    ReadDoorLockClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadThreadNetworkDiagnosticsDetachedRoleCount()
+        : ReadAttribute("detached-role-count")
     {
     }
 
-    ~ReadDoorLockClusterRevision() {}
+    ~ReadThreadNetworkDiagnosticsDetachedRoleCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000000E) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DoorLock.ClusterRevision response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeDetachedRoleCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.DetachedRoleCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("DoorLock ClusterRevision read Error", error);
+                LogNSError("ThreadNetworkDiagnostics DetachedRoleCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -24121,32 +23437,34 @@ class ReadDoorLockClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDoorLockClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsDetachedRoleCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeDoorLockClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeThreadNetworkDiagnosticsDetachedRoleCount()
+        : SubscribeAttribute("detached-role-count")
     {
     }
 
-    ~SubscribeAttributeDoorLockClusterRevision() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsDetachedRoleCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000000E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDetachedRoleCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DoorLock.ClusterRevision response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.DetachedRoleCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -24156,268 +23474,98 @@ class SubscribeAttributeDoorLockClusterRevision : public SubscribeAttribute {
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster ElectricalMeasurement                                       | 0x0B04 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * GetProfileInfoCommand                                             |   0x00 |
-| * GetMeasurementProfileCommand                                      |   0x01 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * MeasurementType                                                   | 0x0000 |
-| * DcVoltage                                                         | 0x0100 |
-| * DcVoltageMin                                                      | 0x0101 |
-| * DcVoltageMax                                                      | 0x0102 |
-| * DcCurrent                                                         | 0x0103 |
-| * DcCurrentMin                                                      | 0x0104 |
-| * DcCurrentMax                                                      | 0x0105 |
-| * DcPower                                                           | 0x0106 |
-| * DcPowerMin                                                        | 0x0107 |
-| * DcPowerMax                                                        | 0x0108 |
-| * DcVoltageMultiplier                                               | 0x0200 |
-| * DcVoltageDivisor                                                  | 0x0201 |
-| * DcCurrentMultiplier                                               | 0x0202 |
-| * DcCurrentDivisor                                                  | 0x0203 |
-| * DcPowerMultiplier                                                 | 0x0204 |
-| * DcPowerDivisor                                                    | 0x0205 |
-| * AcFrequency                                                       | 0x0300 |
-| * AcFrequencyMin                                                    | 0x0301 |
-| * AcFrequencyMax                                                    | 0x0302 |
-| * NeutralCurrent                                                    | 0x0303 |
-| * TotalActivePower                                                  | 0x0304 |
-| * TotalReactivePower                                                | 0x0305 |
-| * TotalApparentPower                                                | 0x0306 |
-| * Measured1stHarmonicCurrent                                        | 0x0307 |
-| * Measured3rdHarmonicCurrent                                        | 0x0308 |
-| * Measured5thHarmonicCurrent                                        | 0x0309 |
-| * Measured7thHarmonicCurrent                                        | 0x030A |
-| * Measured9thHarmonicCurrent                                        | 0x030B |
-| * Measured11thHarmonicCurrent                                       | 0x030C |
-| * MeasuredPhase1stHarmonicCurrent                                   | 0x030D |
-| * MeasuredPhase3rdHarmonicCurrent                                   | 0x030E |
-| * MeasuredPhase5thHarmonicCurrent                                   | 0x030F |
-| * MeasuredPhase7thHarmonicCurrent                                   | 0x0310 |
-| * MeasuredPhase9thHarmonicCurrent                                   | 0x0311 |
-| * MeasuredPhase11thHarmonicCurrent                                  | 0x0312 |
-| * AcFrequencyMultiplier                                             | 0x0400 |
-| * AcFrequencyDivisor                                                | 0x0401 |
-| * PowerMultiplier                                                   | 0x0402 |
-| * PowerDivisor                                                      | 0x0403 |
-| * HarmonicCurrentMultiplier                                         | 0x0404 |
-| * PhaseHarmonicCurrentMultiplier                                    | 0x0405 |
-| * InstantaneousVoltage                                              | 0x0500 |
-| * InstantaneousLineCurrent                                          | 0x0501 |
-| * InstantaneousActiveCurrent                                        | 0x0502 |
-| * InstantaneousReactiveCurrent                                      | 0x0503 |
-| * InstantaneousPower                                                | 0x0504 |
-| * RmsVoltage                                                        | 0x0505 |
-| * RmsVoltageMin                                                     | 0x0506 |
-| * RmsVoltageMax                                                     | 0x0507 |
-| * RmsCurrent                                                        | 0x0508 |
-| * RmsCurrentMin                                                     | 0x0509 |
-| * RmsCurrentMax                                                     | 0x050A |
-| * ActivePower                                                       | 0x050B |
-| * ActivePowerMin                                                    | 0x050C |
-| * ActivePowerMax                                                    | 0x050D |
-| * ReactivePower                                                     | 0x050E |
-| * ApparentPower                                                     | 0x050F |
-| * PowerFactor                                                       | 0x0510 |
-| * AverageRmsVoltageMeasurementPeriod                                | 0x0511 |
-| * AverageRmsUnderVoltageCounter                                     | 0x0513 |
-| * RmsExtremeOverVoltagePeriod                                       | 0x0514 |
-| * RmsExtremeUnderVoltagePeriod                                      | 0x0515 |
-| * RmsVoltageSagPeriod                                               | 0x0516 |
-| * RmsVoltageSwellPeriod                                             | 0x0517 |
-| * AcVoltageMultiplier                                               | 0x0600 |
-| * AcVoltageDivisor                                                  | 0x0601 |
-| * AcCurrentMultiplier                                               | 0x0602 |
-| * AcCurrentDivisor                                                  | 0x0603 |
-| * AcPowerMultiplier                                                 | 0x0604 |
-| * AcPowerDivisor                                                    | 0x0605 |
-| * OverloadAlarmsMask                                                | 0x0700 |
-| * VoltageOverload                                                   | 0x0701 |
-| * CurrentOverload                                                   | 0x0702 |
-| * AcOverloadAlarmsMask                                              | 0x0800 |
-| * AcVoltageOverload                                                 | 0x0801 |
-| * AcCurrentOverload                                                 | 0x0802 |
-| * AcActivePowerOverload                                             | 0x0803 |
-| * AcReactivePowerOverload                                           | 0x0804 |
-| * AverageRmsOverVoltage                                             | 0x0805 |
-| * AverageRmsUnderVoltage                                            | 0x0806 |
-| * RmsExtremeOverVoltage                                             | 0x0807 |
-| * RmsExtremeUnderVoltage                                            | 0x0808 |
-| * RmsVoltageSag                                                     | 0x0809 |
-| * RmsVoltageSwell                                                   | 0x080A |
-| * LineCurrentPhaseB                                                 | 0x0901 |
-| * ActiveCurrentPhaseB                                               | 0x0902 |
-| * ReactiveCurrentPhaseB                                             | 0x0903 |
-| * RmsVoltagePhaseB                                                  | 0x0905 |
-| * RmsVoltageMinPhaseB                                               | 0x0906 |
-| * RmsVoltageMaxPhaseB                                               | 0x0907 |
-| * RmsCurrentPhaseB                                                  | 0x0908 |
-| * RmsCurrentMinPhaseB                                               | 0x0909 |
-| * RmsCurrentMaxPhaseB                                               | 0x090A |
-| * ActivePowerPhaseB                                                 | 0x090B |
-| * ActivePowerMinPhaseB                                              | 0x090C |
-| * ActivePowerMaxPhaseB                                              | 0x090D |
-| * ReactivePowerPhaseB                                               | 0x090E |
-| * ApparentPowerPhaseB                                               | 0x090F |
-| * PowerFactorPhaseB                                                 | 0x0910 |
-| * AverageRmsVoltageMeasurementPeriodPhaseB                          | 0x0911 |
-| * AverageRmsOverVoltageCounterPhaseB                                | 0x0912 |
-| * AverageRmsUnderVoltageCounterPhaseB                               | 0x0913 |
-| * RmsExtremeOverVoltagePeriodPhaseB                                 | 0x0914 |
-| * RmsExtremeUnderVoltagePeriodPhaseB                                | 0x0915 |
-| * RmsVoltageSagPeriodPhaseB                                         | 0x0916 |
-| * RmsVoltageSwellPeriodPhaseB                                       | 0x0917 |
-| * LineCurrentPhaseC                                                 | 0x0A01 |
-| * ActiveCurrentPhaseC                                               | 0x0A02 |
-| * ReactiveCurrentPhaseC                                             | 0x0A03 |
-| * RmsVoltagePhaseC                                                  | 0x0A05 |
-| * RmsVoltageMinPhaseC                                               | 0x0A06 |
-| * RmsVoltageMaxPhaseC                                               | 0x0A07 |
-| * RmsCurrentPhaseC                                                  | 0x0A08 |
-| * RmsCurrentMinPhaseC                                               | 0x0A09 |
-| * RmsCurrentMaxPhaseC                                               | 0x0A0A |
-| * ActivePowerPhaseC                                                 | 0x0A0B |
-| * ActivePowerMinPhaseC                                              | 0x0A0C |
-| * ActivePowerMaxPhaseC                                              | 0x0A0D |
-| * ReactivePowerPhaseC                                               | 0x0A0E |
-| * ApparentPowerPhaseC                                               | 0x0A0F |
-| * PowerFactorPhaseC                                                 | 0x0A10 |
-| * AverageRmsVoltageMeasurementPeriodPhaseC                          | 0x0A11 |
-| * AverageRmsOverVoltageCounterPhaseC                                | 0x0A12 |
-| * AverageRmsUnderVoltageCounterPhaseC                               | 0x0A13 |
-| * RmsExtremeOverVoltagePeriodPhaseC                                 | 0x0A14 |
-| * RmsExtremeUnderVoltagePeriodPhaseC                                | 0x0A15 |
-| * RmsVoltageSagPeriodPhaseC                                         | 0x0A16 |
-| * RmsVoltageSwellPeriodPhaseC                                       | 0x0A17 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command GetProfileInfoCommand
+ * Attribute ChildRoleCount
  */
-class ElectricalMeasurementGetProfileInfoCommand : public ClusterCommand {
+class ReadThreadNetworkDiagnosticsChildRoleCount : public ReadAttribute {
 public:
-    ElectricalMeasurementGetProfileInfoCommand()
-        : ClusterCommand("get-profile-info-command")
+    ReadThreadNetworkDiagnosticsChildRoleCount()
+        : ReadAttribute("child-role-count")
     {
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadThreadNetworkDiagnosticsChildRoleCount() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000000F) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        __auto_type * params = [[CHIPElectricalMeasurementClusterGetProfileInfoCommandParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster getProfileInfoCommandWithParams:params
-                                   completionHandler:^(NSError * _Nullable error) {
-                                       responsesNeeded--;
-                                       if (error != nil) {
-                                           mError = error;
-                                           LogNSError("Error", error);
-                                       }
-                                       if (responsesNeeded == 0) {
-                                           SetCommandExitStatus(mError);
-                                       }
-                                   }];
-        }
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeChildRoleCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.ChildRoleCount response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ThreadNetworkDiagnostics ChildRoleCount read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
 };
 
-/*
- * Command GetMeasurementProfileCommand
- */
-class ElectricalMeasurementGetMeasurementProfileCommand : public ClusterCommand {
+class SubscribeAttributeThreadNetworkDiagnosticsChildRoleCount : public SubscribeAttribute {
 public:
-    ElectricalMeasurementGetMeasurementProfileCommand()
-        : ClusterCommand("get-measurement-profile-command")
+    SubscribeAttributeThreadNetworkDiagnosticsChildRoleCount()
+        : SubscribeAttribute("child-role-count")
     {
-        AddArgument("AttributeId", 0, UINT16_MAX, &mRequest.attributeId);
-        AddArgument("StartTime", 0, UINT32_MAX, &mRequest.startTime);
-        AddArgument("NumberOfIntervals", 0, UINT8_MAX, &mRequest.numberOfIntervals);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeThreadNetworkDiagnosticsChildRoleCount() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) command (0x00000001) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000000F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        __auto_type * params = [[CHIPElectricalMeasurementClusterGetMeasurementProfileCommandParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.attributeId = [NSNumber numberWithUnsignedShort:mRequest.attributeId];
-        params.startTime = [NSNumber numberWithUnsignedInt:mRequest.startTime];
-        params.numberOfIntervals = [NSNumber numberWithUnsignedChar:mRequest.numberOfIntervals];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster getMeasurementProfileCommandWithParams:params
-                                          completionHandler:^(NSError * _Nullable error) {
-                                              responsesNeeded--;
-                                              if (error != nil) {
-                                                  mError = error;
-                                                  LogNSError("Error", error);
-                                              }
-                                              if (responsesNeeded == 0) {
-                                                  SetCommandExitStatus(mError);
-                                              }
-                                          }];
-        }
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeChildRoleCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.ChildRoleCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::ElectricalMeasurement::Commands::GetMeasurementProfileCommand::Type mRequest;
 };
 
 /*
- * Attribute MeasurementType
+ * Attribute RouterRoleCount
  */
-class ReadElectricalMeasurementMeasurementType : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsRouterRoleCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementMeasurementType()
-        : ReadAttribute("measurement-type")
+    ReadThreadNetworkDiagnosticsRouterRoleCount()
+        : ReadAttribute("router-role-count")
     {
     }
 
-    ~ReadElectricalMeasurementMeasurementType() {}
+    ~ReadThreadNetworkDiagnosticsRouterRoleCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000010) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeMeasurementTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.MeasurementType response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeRouterRoleCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.RouterRoleCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement MeasurementType read Error", error);
+                LogNSError("ThreadNetworkDiagnostics RouterRoleCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -24425,34 +23573,34 @@ class ReadElectricalMeasurementMeasurementType : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementMeasurementType : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsRouterRoleCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementMeasurementType()
-        : SubscribeAttribute("measurement-type")
+    SubscribeAttributeThreadNetworkDiagnosticsRouterRoleCount()
+        : SubscribeAttribute("router-role-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementMeasurementType() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsRouterRoleCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000010) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMeasurementTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRouterRoleCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.MeasurementType response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.RouterRoleCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -24463,29 +23611,29 @@ class SubscribeAttributeElectricalMeasurementMeasurementType : public SubscribeA
 };
 
 /*
- * Attribute DcVoltage
+ * Attribute LeaderRoleCount
  */
-class ReadElectricalMeasurementDcVoltage : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsLeaderRoleCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementDcVoltage()
-        : ReadAttribute("dc-voltage")
+    ReadThreadNetworkDiagnosticsLeaderRoleCount()
+        : ReadAttribute("leader-role-count")
     {
     }
 
-    ~ReadElectricalMeasurementDcVoltage() {}
+    ~ReadThreadNetworkDiagnosticsLeaderRoleCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000100) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000011) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeDcVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.DcVoltage response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeLeaderRoleCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.LeaderRoleCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement DcVoltage read Error", error);
+                LogNSError("ThreadNetworkDiagnostics LeaderRoleCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -24493,34 +23641,34 @@ class ReadElectricalMeasurementDcVoltage : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementDcVoltage : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsLeaderRoleCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementDcVoltage()
-        : SubscribeAttribute("dc-voltage")
+    SubscribeAttributeThreadNetworkDiagnosticsLeaderRoleCount()
+        : SubscribeAttribute("leader-role-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementDcVoltage() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsLeaderRoleCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000100) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000011) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDcVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeLeaderRoleCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.DcVoltage response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.LeaderRoleCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -24531,29 +23679,29 @@ class SubscribeAttributeElectricalMeasurementDcVoltage : public SubscribeAttribu
 };
 
 /*
- * Attribute DcVoltageMin
+ * Attribute AttachAttemptCount
  */
-class ReadElectricalMeasurementDcVoltageMin : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsAttachAttemptCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementDcVoltageMin()
-        : ReadAttribute("dc-voltage-min")
+    ReadThreadNetworkDiagnosticsAttachAttemptCount()
+        : ReadAttribute("attach-attempt-count")
     {
     }
 
-    ~ReadElectricalMeasurementDcVoltageMin() {}
+    ~ReadThreadNetworkDiagnosticsAttachAttemptCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000101) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000012) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeDcVoltageMinWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.DcVoltageMin response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeAttachAttemptCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.AttachAttemptCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement DcVoltageMin read Error", error);
+                LogNSError("ThreadNetworkDiagnostics AttachAttemptCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -24561,34 +23709,34 @@ class ReadElectricalMeasurementDcVoltageMin : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementDcVoltageMin : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsAttachAttemptCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementDcVoltageMin()
-        : SubscribeAttribute("dc-voltage-min")
+    SubscribeAttributeThreadNetworkDiagnosticsAttachAttemptCount()
+        : SubscribeAttribute("attach-attempt-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementDcVoltageMin() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsAttachAttemptCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000101) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000012) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDcVoltageMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttachAttemptCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.DcVoltageMin response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.AttachAttemptCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -24599,29 +23747,29 @@ class SubscribeAttributeElectricalMeasurementDcVoltageMin : public SubscribeAttr
 };
 
 /*
- * Attribute DcVoltageMax
+ * Attribute PartitionIdChangeCount
  */
-class ReadElectricalMeasurementDcVoltageMax : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsPartitionIdChangeCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementDcVoltageMax()
-        : ReadAttribute("dc-voltage-max")
+    ReadThreadNetworkDiagnosticsPartitionIdChangeCount()
+        : ReadAttribute("partition-id-change-count")
     {
     }
 
-    ~ReadElectricalMeasurementDcVoltageMax() {}
+    ~ReadThreadNetworkDiagnosticsPartitionIdChangeCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000102) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000013) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeDcVoltageMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.DcVoltageMax response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributePartitionIdChangeCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.PartitionIdChangeCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement DcVoltageMax read Error", error);
+                LogNSError("ThreadNetworkDiagnostics PartitionIdChangeCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -24629,34 +23777,34 @@ class ReadElectricalMeasurementDcVoltageMax : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementDcVoltageMax : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsPartitionIdChangeCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementDcVoltageMax()
-        : SubscribeAttribute("dc-voltage-max")
+    SubscribeAttributeThreadNetworkDiagnosticsPartitionIdChangeCount()
+        : SubscribeAttribute("partition-id-change-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementDcVoltageMax() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsPartitionIdChangeCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000102) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000013) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDcVoltageMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePartitionIdChangeCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.DcVoltageMax response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.PartitionIdChangeCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -24667,29 +23815,30 @@ class SubscribeAttributeElectricalMeasurementDcVoltageMax : public SubscribeAttr
 };
 
 /*
- * Attribute DcCurrent
+ * Attribute BetterPartitionAttachAttemptCount
  */
-class ReadElectricalMeasurementDcCurrent : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsBetterPartitionAttachAttemptCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementDcCurrent()
-        : ReadAttribute("dc-current")
+    ReadThreadNetworkDiagnosticsBetterPartitionAttachAttemptCount()
+        : ReadAttribute("better-partition-attach-attempt-count")
     {
     }
 
-    ~ReadElectricalMeasurementDcCurrent() {}
+    ~ReadThreadNetworkDiagnosticsBetterPartitionAttachAttemptCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000103) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000014) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeDcCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.DcCurrent response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeBetterPartitionAttachAttemptCountWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.BetterPartitionAttachAttemptCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement DcCurrent read Error", error);
+                LogNSError("ThreadNetworkDiagnostics BetterPartitionAttachAttemptCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -24697,34 +23846,34 @@ class ReadElectricalMeasurementDcCurrent : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementDcCurrent : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsBetterPartitionAttachAttemptCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementDcCurrent()
-        : SubscribeAttribute("dc-current")
+    SubscribeAttributeThreadNetworkDiagnosticsBetterPartitionAttachAttemptCount()
+        : SubscribeAttribute("better-partition-attach-attempt-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementDcCurrent() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsBetterPartitionAttachAttemptCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000103) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000014) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDcCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBetterPartitionAttachAttemptCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.DcCurrent response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.BetterPartitionAttachAttemptCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -24735,29 +23884,29 @@ class SubscribeAttributeElectricalMeasurementDcCurrent : public SubscribeAttribu
 };
 
 /*
- * Attribute DcCurrentMin
+ * Attribute ParentChangeCount
  */
-class ReadElectricalMeasurementDcCurrentMin : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsParentChangeCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementDcCurrentMin()
-        : ReadAttribute("dc-current-min")
+    ReadThreadNetworkDiagnosticsParentChangeCount()
+        : ReadAttribute("parent-change-count")
     {
     }
 
-    ~ReadElectricalMeasurementDcCurrentMin() {}
+    ~ReadThreadNetworkDiagnosticsParentChangeCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000104) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000015) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeDcCurrentMinWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.DcCurrentMin response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeParentChangeCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.ParentChangeCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement DcCurrentMin read Error", error);
+                LogNSError("ThreadNetworkDiagnostics ParentChangeCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -24765,34 +23914,34 @@ class ReadElectricalMeasurementDcCurrentMin : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementDcCurrentMin : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsParentChangeCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementDcCurrentMin()
-        : SubscribeAttribute("dc-current-min")
+    SubscribeAttributeThreadNetworkDiagnosticsParentChangeCount()
+        : SubscribeAttribute("parent-change-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementDcCurrentMin() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsParentChangeCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000104) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000015) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDcCurrentMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeParentChangeCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.DcCurrentMin response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.ParentChangeCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -24803,29 +23952,29 @@ class SubscribeAttributeElectricalMeasurementDcCurrentMin : public SubscribeAttr
 };
 
 /*
- * Attribute DcCurrentMax
+ * Attribute TxTotalCount
  */
-class ReadElectricalMeasurementDcCurrentMax : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsTxTotalCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementDcCurrentMax()
-        : ReadAttribute("dc-current-max")
+    ReadThreadNetworkDiagnosticsTxTotalCount()
+        : ReadAttribute("tx-total-count")
     {
     }
 
-    ~ReadElectricalMeasurementDcCurrentMax() {}
+    ~ReadThreadNetworkDiagnosticsTxTotalCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000105) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000016) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeDcCurrentMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.DcCurrentMax response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeTxTotalCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.TxTotalCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement DcCurrentMax read Error", error);
+                LogNSError("ThreadNetworkDiagnostics TxTotalCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -24833,34 +23982,34 @@ class ReadElectricalMeasurementDcCurrentMax : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementDcCurrentMax : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsTxTotalCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementDcCurrentMax()
-        : SubscribeAttribute("dc-current-max")
+    SubscribeAttributeThreadNetworkDiagnosticsTxTotalCount()
+        : SubscribeAttribute("tx-total-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementDcCurrentMax() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsTxTotalCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000105) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000016) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDcCurrentMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTxTotalCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.DcCurrentMax response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.TxTotalCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -24871,29 +24020,29 @@ class SubscribeAttributeElectricalMeasurementDcCurrentMax : public SubscribeAttr
 };
 
 /*
- * Attribute DcPower
+ * Attribute TxUnicastCount
  */
-class ReadElectricalMeasurementDcPower : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsTxUnicastCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementDcPower()
-        : ReadAttribute("dc-power")
+    ReadThreadNetworkDiagnosticsTxUnicastCount()
+        : ReadAttribute("tx-unicast-count")
     {
     }
 
-    ~ReadElectricalMeasurementDcPower() {}
+    ~ReadThreadNetworkDiagnosticsTxUnicastCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000106) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000017) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeDcPowerWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.DcPower response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeTxUnicastCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.TxUnicastCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement DcPower read Error", error);
+                LogNSError("ThreadNetworkDiagnostics TxUnicastCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -24901,34 +24050,34 @@ class ReadElectricalMeasurementDcPower : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementDcPower : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsTxUnicastCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementDcPower()
-        : SubscribeAttribute("dc-power")
+    SubscribeAttributeThreadNetworkDiagnosticsTxUnicastCount()
+        : SubscribeAttribute("tx-unicast-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementDcPower() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsTxUnicastCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000106) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000017) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDcPowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTxUnicastCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.DcPower response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.TxUnicastCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -24939,29 +24088,29 @@ class SubscribeAttributeElectricalMeasurementDcPower : public SubscribeAttribute
 };
 
 /*
- * Attribute DcPowerMin
+ * Attribute TxBroadcastCount
  */
-class ReadElectricalMeasurementDcPowerMin : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsTxBroadcastCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementDcPowerMin()
-        : ReadAttribute("dc-power-min")
+    ReadThreadNetworkDiagnosticsTxBroadcastCount()
+        : ReadAttribute("tx-broadcast-count")
     {
     }
 
-    ~ReadElectricalMeasurementDcPowerMin() {}
+    ~ReadThreadNetworkDiagnosticsTxBroadcastCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000107) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000018) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeDcPowerMinWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.DcPowerMin response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeTxBroadcastCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.TxBroadcastCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement DcPowerMin read Error", error);
+                LogNSError("ThreadNetworkDiagnostics TxBroadcastCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -24969,34 +24118,34 @@ class ReadElectricalMeasurementDcPowerMin : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementDcPowerMin : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsTxBroadcastCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementDcPowerMin()
-        : SubscribeAttribute("dc-power-min")
+    SubscribeAttributeThreadNetworkDiagnosticsTxBroadcastCount()
+        : SubscribeAttribute("tx-broadcast-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementDcPowerMin() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsTxBroadcastCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000107) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000018) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDcPowerMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTxBroadcastCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.DcPowerMin response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.TxBroadcastCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -25007,29 +24156,29 @@ class SubscribeAttributeElectricalMeasurementDcPowerMin : public SubscribeAttrib
 };
 
 /*
- * Attribute DcPowerMax
+ * Attribute TxAckRequestedCount
  */
-class ReadElectricalMeasurementDcPowerMax : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsTxAckRequestedCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementDcPowerMax()
-        : ReadAttribute("dc-power-max")
+    ReadThreadNetworkDiagnosticsTxAckRequestedCount()
+        : ReadAttribute("tx-ack-requested-count")
     {
     }
 
-    ~ReadElectricalMeasurementDcPowerMax() {}
+    ~ReadThreadNetworkDiagnosticsTxAckRequestedCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000108) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000019) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeDcPowerMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.DcPowerMax response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeTxAckRequestedCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.TxAckRequestedCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement DcPowerMax read Error", error);
+                LogNSError("ThreadNetworkDiagnostics TxAckRequestedCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -25037,34 +24186,34 @@ class ReadElectricalMeasurementDcPowerMax : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementDcPowerMax : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsTxAckRequestedCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementDcPowerMax()
-        : SubscribeAttribute("dc-power-max")
+    SubscribeAttributeThreadNetworkDiagnosticsTxAckRequestedCount()
+        : SubscribeAttribute("tx-ack-requested-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementDcPowerMax() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsTxAckRequestedCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000108) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000019) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDcPowerMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTxAckRequestedCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.DcPowerMax response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.TxAckRequestedCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -25075,29 +24224,29 @@ class SubscribeAttributeElectricalMeasurementDcPowerMax : public SubscribeAttrib
 };
 
 /*
- * Attribute DcVoltageMultiplier
+ * Attribute TxAckedCount
  */
-class ReadElectricalMeasurementDcVoltageMultiplier : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsTxAckedCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementDcVoltageMultiplier()
-        : ReadAttribute("dc-voltage-multiplier")
+    ReadThreadNetworkDiagnosticsTxAckedCount()
+        : ReadAttribute("tx-acked-count")
     {
     }
 
-    ~ReadElectricalMeasurementDcVoltageMultiplier() {}
+    ~ReadThreadNetworkDiagnosticsTxAckedCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000200) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000001A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeDcVoltageMultiplierWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.DcVoltageMultiplier response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeTxAckedCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.TxAckedCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement DcVoltageMultiplier read Error", error);
+                LogNSError("ThreadNetworkDiagnostics TxAckedCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -25105,34 +24254,34 @@ class ReadElectricalMeasurementDcVoltageMultiplier : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementDcVoltageMultiplier : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsTxAckedCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementDcVoltageMultiplier()
-        : SubscribeAttribute("dc-voltage-multiplier")
+    SubscribeAttributeThreadNetworkDiagnosticsTxAckedCount()
+        : SubscribeAttribute("tx-acked-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementDcVoltageMultiplier() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsTxAckedCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000200) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000001A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDcVoltageMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTxAckedCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.DcVoltageMultiplier response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.TxAckedCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -25143,29 +24292,29 @@ class SubscribeAttributeElectricalMeasurementDcVoltageMultiplier : public Subscr
 };
 
 /*
- * Attribute DcVoltageDivisor
+ * Attribute TxNoAckRequestedCount
  */
-class ReadElectricalMeasurementDcVoltageDivisor : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsTxNoAckRequestedCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementDcVoltageDivisor()
-        : ReadAttribute("dc-voltage-divisor")
+    ReadThreadNetworkDiagnosticsTxNoAckRequestedCount()
+        : ReadAttribute("tx-no-ack-requested-count")
     {
     }
 
-    ~ReadElectricalMeasurementDcVoltageDivisor() {}
+    ~ReadThreadNetworkDiagnosticsTxNoAckRequestedCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000201) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000001B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeDcVoltageDivisorWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.DcVoltageDivisor response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeTxNoAckRequestedCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.TxNoAckRequestedCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement DcVoltageDivisor read Error", error);
+                LogNSError("ThreadNetworkDiagnostics TxNoAckRequestedCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -25173,34 +24322,34 @@ class ReadElectricalMeasurementDcVoltageDivisor : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementDcVoltageDivisor : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsTxNoAckRequestedCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementDcVoltageDivisor()
-        : SubscribeAttribute("dc-voltage-divisor")
+    SubscribeAttributeThreadNetworkDiagnosticsTxNoAckRequestedCount()
+        : SubscribeAttribute("tx-no-ack-requested-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementDcVoltageDivisor() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsTxNoAckRequestedCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000201) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000001B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDcVoltageDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTxNoAckRequestedCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.DcVoltageDivisor response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.TxNoAckRequestedCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -25211,29 +24360,29 @@ class SubscribeAttributeElectricalMeasurementDcVoltageDivisor : public Subscribe
 };
 
 /*
- * Attribute DcCurrentMultiplier
+ * Attribute TxDataCount
  */
-class ReadElectricalMeasurementDcCurrentMultiplier : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsTxDataCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementDcCurrentMultiplier()
-        : ReadAttribute("dc-current-multiplier")
+    ReadThreadNetworkDiagnosticsTxDataCount()
+        : ReadAttribute("tx-data-count")
     {
     }
 
-    ~ReadElectricalMeasurementDcCurrentMultiplier() {}
+    ~ReadThreadNetworkDiagnosticsTxDataCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000202) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000001C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeDcCurrentMultiplierWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.DcCurrentMultiplier response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeTxDataCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.TxDataCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement DcCurrentMultiplier read Error", error);
+                LogNSError("ThreadNetworkDiagnostics TxDataCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -25241,34 +24390,34 @@ class ReadElectricalMeasurementDcCurrentMultiplier : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementDcCurrentMultiplier : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsTxDataCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementDcCurrentMultiplier()
-        : SubscribeAttribute("dc-current-multiplier")
+    SubscribeAttributeThreadNetworkDiagnosticsTxDataCount()
+        : SubscribeAttribute("tx-data-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementDcCurrentMultiplier() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsTxDataCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000202) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000001C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDcCurrentMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTxDataCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.DcCurrentMultiplier response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.TxDataCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -25279,29 +24428,29 @@ class SubscribeAttributeElectricalMeasurementDcCurrentMultiplier : public Subscr
 };
 
 /*
- * Attribute DcCurrentDivisor
+ * Attribute TxDataPollCount
  */
-class ReadElectricalMeasurementDcCurrentDivisor : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsTxDataPollCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementDcCurrentDivisor()
-        : ReadAttribute("dc-current-divisor")
+    ReadThreadNetworkDiagnosticsTxDataPollCount()
+        : ReadAttribute("tx-data-poll-count")
     {
     }
 
-    ~ReadElectricalMeasurementDcCurrentDivisor() {}
+    ~ReadThreadNetworkDiagnosticsTxDataPollCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000203) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000001D) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeDcCurrentDivisorWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.DcCurrentDivisor response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeTxDataPollCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.TxDataPollCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement DcCurrentDivisor read Error", error);
+                LogNSError("ThreadNetworkDiagnostics TxDataPollCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -25309,34 +24458,34 @@ class ReadElectricalMeasurementDcCurrentDivisor : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementDcCurrentDivisor : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsTxDataPollCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementDcCurrentDivisor()
-        : SubscribeAttribute("dc-current-divisor")
+    SubscribeAttributeThreadNetworkDiagnosticsTxDataPollCount()
+        : SubscribeAttribute("tx-data-poll-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementDcCurrentDivisor() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsTxDataPollCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000203) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000001D) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDcCurrentDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTxDataPollCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.DcCurrentDivisor response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.TxDataPollCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -25347,29 +24496,29 @@ class SubscribeAttributeElectricalMeasurementDcCurrentDivisor : public Subscribe
 };
 
 /*
- * Attribute DcPowerMultiplier
+ * Attribute TxBeaconCount
  */
-class ReadElectricalMeasurementDcPowerMultiplier : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsTxBeaconCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementDcPowerMultiplier()
-        : ReadAttribute("dc-power-multiplier")
+    ReadThreadNetworkDiagnosticsTxBeaconCount()
+        : ReadAttribute("tx-beacon-count")
     {
     }
 
-    ~ReadElectricalMeasurementDcPowerMultiplier() {}
+    ~ReadThreadNetworkDiagnosticsTxBeaconCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000204) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000001E) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeDcPowerMultiplierWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.DcPowerMultiplier response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeTxBeaconCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.TxBeaconCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement DcPowerMultiplier read Error", error);
+                LogNSError("ThreadNetworkDiagnostics TxBeaconCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -25377,34 +24526,34 @@ class ReadElectricalMeasurementDcPowerMultiplier : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementDcPowerMultiplier : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsTxBeaconCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementDcPowerMultiplier()
-        : SubscribeAttribute("dc-power-multiplier")
+    SubscribeAttributeThreadNetworkDiagnosticsTxBeaconCount()
+        : SubscribeAttribute("tx-beacon-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementDcPowerMultiplier() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsTxBeaconCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000204) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000001E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDcPowerMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTxBeaconCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.DcPowerMultiplier response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.TxBeaconCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -25415,29 +24564,29 @@ class SubscribeAttributeElectricalMeasurementDcPowerMultiplier : public Subscrib
 };
 
 /*
- * Attribute DcPowerDivisor
+ * Attribute TxBeaconRequestCount
  */
-class ReadElectricalMeasurementDcPowerDivisor : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsTxBeaconRequestCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementDcPowerDivisor()
-        : ReadAttribute("dc-power-divisor")
+    ReadThreadNetworkDiagnosticsTxBeaconRequestCount()
+        : ReadAttribute("tx-beacon-request-count")
     {
     }
 
-    ~ReadElectricalMeasurementDcPowerDivisor() {}
+    ~ReadThreadNetworkDiagnosticsTxBeaconRequestCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000205) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000001F) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeDcPowerDivisorWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.DcPowerDivisor response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeTxBeaconRequestCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.TxBeaconRequestCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement DcPowerDivisor read Error", error);
+                LogNSError("ThreadNetworkDiagnostics TxBeaconRequestCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -25445,34 +24594,34 @@ class ReadElectricalMeasurementDcPowerDivisor : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementDcPowerDivisor : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsTxBeaconRequestCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementDcPowerDivisor()
-        : SubscribeAttribute("dc-power-divisor")
+    SubscribeAttributeThreadNetworkDiagnosticsTxBeaconRequestCount()
+        : SubscribeAttribute("tx-beacon-request-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementDcPowerDivisor() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsTxBeaconRequestCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000205) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000001F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDcPowerDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTxBeaconRequestCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.DcPowerDivisor response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.TxBeaconRequestCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -25483,29 +24632,29 @@ class SubscribeAttributeElectricalMeasurementDcPowerDivisor : public SubscribeAt
 };
 
 /*
- * Attribute AcFrequency
+ * Attribute TxOtherCount
  */
-class ReadElectricalMeasurementAcFrequency : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsTxOtherCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementAcFrequency()
-        : ReadAttribute("ac-frequency")
+    ReadThreadNetworkDiagnosticsTxOtherCount()
+        : ReadAttribute("tx-other-count")
     {
     }
 
-    ~ReadElectricalMeasurementAcFrequency() {}
+    ~ReadThreadNetworkDiagnosticsTxOtherCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000300) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000020) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeAcFrequencyWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AcFrequency response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeTxOtherCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.TxOtherCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement AcFrequency read Error", error);
+                LogNSError("ThreadNetworkDiagnostics TxOtherCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -25513,34 +24662,34 @@ class ReadElectricalMeasurementAcFrequency : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementAcFrequency : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsTxOtherCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAcFrequency()
-        : SubscribeAttribute("ac-frequency")
+    SubscribeAttributeThreadNetworkDiagnosticsTxOtherCount()
+        : SubscribeAttribute("tx-other-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAcFrequency() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsTxOtherCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000300) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000020) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcFrequencyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTxOtherCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AcFrequency response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.TxOtherCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -25551,29 +24700,29 @@ class SubscribeAttributeElectricalMeasurementAcFrequency : public SubscribeAttri
 };
 
 /*
- * Attribute AcFrequencyMin
+ * Attribute TxRetryCount
  */
-class ReadElectricalMeasurementAcFrequencyMin : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsTxRetryCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementAcFrequencyMin()
-        : ReadAttribute("ac-frequency-min")
+    ReadThreadNetworkDiagnosticsTxRetryCount()
+        : ReadAttribute("tx-retry-count")
     {
     }
 
-    ~ReadElectricalMeasurementAcFrequencyMin() {}
+    ~ReadThreadNetworkDiagnosticsTxRetryCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000301) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000021) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeAcFrequencyMinWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AcFrequencyMin response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeTxRetryCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.TxRetryCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement AcFrequencyMin read Error", error);
+                LogNSError("ThreadNetworkDiagnostics TxRetryCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -25581,34 +24730,34 @@ class ReadElectricalMeasurementAcFrequencyMin : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementAcFrequencyMin : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsTxRetryCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAcFrequencyMin()
-        : SubscribeAttribute("ac-frequency-min")
+    SubscribeAttributeThreadNetworkDiagnosticsTxRetryCount()
+        : SubscribeAttribute("tx-retry-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAcFrequencyMin() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsTxRetryCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000301) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000021) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcFrequencyMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTxRetryCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AcFrequencyMin response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.TxRetryCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -25619,64 +24768,65 @@ class SubscribeAttributeElectricalMeasurementAcFrequencyMin : public SubscribeAt
 };
 
 /*
- * Attribute AcFrequencyMax
+ * Attribute TxDirectMaxRetryExpiryCount
  */
-class ReadElectricalMeasurementAcFrequencyMax : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementAcFrequencyMax()
-        : ReadAttribute("ac-frequency-max")
+    ReadThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount()
+        : ReadAttribute("tx-direct-max-retry-expiry-count")
     {
     }
 
-    ~ReadElectricalMeasurementAcFrequencyMax() {}
+    ~ReadThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000302) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000022) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeAcFrequencyMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AcFrequencyMax response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ElectricalMeasurement AcFrequencyMax read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster
+            readAttributeTxDirectMaxRetryExpiryCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.TxDirectMaxRetryExpiryCount response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("ThreadNetworkDiagnostics TxDirectMaxRetryExpiryCount read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeElectricalMeasurementAcFrequencyMax : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAcFrequencyMax()
-        : SubscribeAttribute("ac-frequency-max")
+    SubscribeAttributeThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount()
+        : SubscribeAttribute("tx-direct-max-retry-expiry-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAcFrequencyMax() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000302) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000022) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcFrequencyMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTxDirectMaxRetryExpiryCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AcFrequencyMax response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.TxDirectMaxRetryExpiryCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -25687,29 +24837,30 @@ class SubscribeAttributeElectricalMeasurementAcFrequencyMax : public SubscribeAt
 };
 
 /*
- * Attribute NeutralCurrent
+ * Attribute TxIndirectMaxRetryExpiryCount
  */
-class ReadElectricalMeasurementNeutralCurrent : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementNeutralCurrent()
-        : ReadAttribute("neutral-current")
+    ReadThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount()
+        : ReadAttribute("tx-indirect-max-retry-expiry-count")
     {
     }
 
-    ~ReadElectricalMeasurementNeutralCurrent() {}
+    ~ReadThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000303) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000023) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeNeutralCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.NeutralCurrent response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeTxIndirectMaxRetryExpiryCountWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.TxIndirectMaxRetryExpiryCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement NeutralCurrent read Error", error);
+                LogNSError("ThreadNetworkDiagnostics TxIndirectMaxRetryExpiryCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -25717,34 +24868,34 @@ class ReadElectricalMeasurementNeutralCurrent : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementNeutralCurrent : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementNeutralCurrent()
-        : SubscribeAttribute("neutral-current")
+    SubscribeAttributeThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount()
+        : SubscribeAttribute("tx-indirect-max-retry-expiry-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementNeutralCurrent() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000303) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000023) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNeutralCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTxIndirectMaxRetryExpiryCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.NeutralCurrent response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.TxIndirectMaxRetryExpiryCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -25755,29 +24906,29 @@ class SubscribeAttributeElectricalMeasurementNeutralCurrent : public SubscribeAt
 };
 
 /*
- * Attribute TotalActivePower
+ * Attribute TxErrCcaCount
  */
-class ReadElectricalMeasurementTotalActivePower : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsTxErrCcaCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementTotalActivePower()
-        : ReadAttribute("total-active-power")
+    ReadThreadNetworkDiagnosticsTxErrCcaCount()
+        : ReadAttribute("tx-err-cca-count")
     {
     }
 
-    ~ReadElectricalMeasurementTotalActivePower() {}
+    ~ReadThreadNetworkDiagnosticsTxErrCcaCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000304) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000024) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeTotalActivePowerWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.TotalActivePower response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeTxErrCcaCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.TxErrCcaCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement TotalActivePower read Error", error);
+                LogNSError("ThreadNetworkDiagnostics TxErrCcaCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -25785,34 +24936,34 @@ class ReadElectricalMeasurementTotalActivePower : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementTotalActivePower : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsTxErrCcaCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementTotalActivePower()
-        : SubscribeAttribute("total-active-power")
+    SubscribeAttributeThreadNetworkDiagnosticsTxErrCcaCount()
+        : SubscribeAttribute("tx-err-cca-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementTotalActivePower() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsTxErrCcaCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000304) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000024) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTotalActivePowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTxErrCcaCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.TotalActivePower response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.TxErrCcaCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -25823,29 +24974,29 @@ class SubscribeAttributeElectricalMeasurementTotalActivePower : public Subscribe
 };
 
 /*
- * Attribute TotalReactivePower
+ * Attribute TxErrAbortCount
  */
-class ReadElectricalMeasurementTotalReactivePower : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsTxErrAbortCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementTotalReactivePower()
-        : ReadAttribute("total-reactive-power")
+    ReadThreadNetworkDiagnosticsTxErrAbortCount()
+        : ReadAttribute("tx-err-abort-count")
     {
     }
 
-    ~ReadElectricalMeasurementTotalReactivePower() {}
+    ~ReadThreadNetworkDiagnosticsTxErrAbortCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000305) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000025) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeTotalReactivePowerWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.TotalReactivePower response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeTxErrAbortCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.TxErrAbortCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement TotalReactivePower read Error", error);
+                LogNSError("ThreadNetworkDiagnostics TxErrAbortCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -25853,34 +25004,34 @@ class ReadElectricalMeasurementTotalReactivePower : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementTotalReactivePower : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsTxErrAbortCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementTotalReactivePower()
-        : SubscribeAttribute("total-reactive-power")
+    SubscribeAttributeThreadNetworkDiagnosticsTxErrAbortCount()
+        : SubscribeAttribute("tx-err-abort-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementTotalReactivePower() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsTxErrAbortCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000305) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000025) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTotalReactivePowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTxErrAbortCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.TotalReactivePower response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.TxErrAbortCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -25891,29 +25042,29 @@ class SubscribeAttributeElectricalMeasurementTotalReactivePower : public Subscri
 };
 
 /*
- * Attribute TotalApparentPower
+ * Attribute TxErrBusyChannelCount
  */
-class ReadElectricalMeasurementTotalApparentPower : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsTxErrBusyChannelCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementTotalApparentPower()
-        : ReadAttribute("total-apparent-power")
+    ReadThreadNetworkDiagnosticsTxErrBusyChannelCount()
+        : ReadAttribute("tx-err-busy-channel-count")
     {
     }
 
-    ~ReadElectricalMeasurementTotalApparentPower() {}
+    ~ReadThreadNetworkDiagnosticsTxErrBusyChannelCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000306) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000026) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeTotalApparentPowerWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.TotalApparentPower response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeTxErrBusyChannelCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.TxErrBusyChannelCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement TotalApparentPower read Error", error);
+                LogNSError("ThreadNetworkDiagnostics TxErrBusyChannelCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -25921,34 +25072,34 @@ class ReadElectricalMeasurementTotalApparentPower : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementTotalApparentPower : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsTxErrBusyChannelCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementTotalApparentPower()
-        : SubscribeAttribute("total-apparent-power")
+    SubscribeAttributeThreadNetworkDiagnosticsTxErrBusyChannelCount()
+        : SubscribeAttribute("tx-err-busy-channel-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementTotalApparentPower() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsTxErrBusyChannelCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000306) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000026) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTotalApparentPowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTxErrBusyChannelCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.TotalApparentPower response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.TxErrBusyChannelCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -25959,65 +25110,64 @@ class SubscribeAttributeElectricalMeasurementTotalApparentPower : public Subscri
 };
 
 /*
- * Attribute Measured1stHarmonicCurrent
+ * Attribute RxTotalCount
  */
-class ReadElectricalMeasurementMeasured1stHarmonicCurrent : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsRxTotalCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementMeasured1stHarmonicCurrent()
-        : ReadAttribute("measured1st-harmonic-current")
+    ReadThreadNetworkDiagnosticsRxTotalCount()
+        : ReadAttribute("rx-total-count")
     {
     }
 
-    ~ReadElectricalMeasurementMeasured1stHarmonicCurrent() {}
+    ~ReadThreadNetworkDiagnosticsRxTotalCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000307) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000027) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster
-            readAttributeMeasured1stHarmonicCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.Measured1stHarmonicCurrent response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("ElectricalMeasurement Measured1stHarmonicCurrent read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeRxTotalCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.RxTotalCount response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ThreadNetworkDiagnostics RxTotalCount read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeElectricalMeasurementMeasured1stHarmonicCurrent : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsRxTotalCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementMeasured1stHarmonicCurrent()
-        : SubscribeAttribute("measured1st-harmonic-current")
+    SubscribeAttributeThreadNetworkDiagnosticsRxTotalCount()
+        : SubscribeAttribute("rx-total-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementMeasured1stHarmonicCurrent() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsRxTotalCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000307) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000027) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMeasured1stHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRxTotalCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.Measured1stHarmonicCurrent response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.RxTotalCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -26028,65 +25178,64 @@ class SubscribeAttributeElectricalMeasurementMeasured1stHarmonicCurrent : public
 };
 
 /*
- * Attribute Measured3rdHarmonicCurrent
+ * Attribute RxUnicastCount
  */
-class ReadElectricalMeasurementMeasured3rdHarmonicCurrent : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsRxUnicastCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementMeasured3rdHarmonicCurrent()
-        : ReadAttribute("measured3rd-harmonic-current")
+    ReadThreadNetworkDiagnosticsRxUnicastCount()
+        : ReadAttribute("rx-unicast-count")
     {
     }
 
-    ~ReadElectricalMeasurementMeasured3rdHarmonicCurrent() {}
+    ~ReadThreadNetworkDiagnosticsRxUnicastCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000308) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000028) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster
-            readAttributeMeasured3rdHarmonicCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.Measured3rdHarmonicCurrent response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("ElectricalMeasurement Measured3rdHarmonicCurrent read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeRxUnicastCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.RxUnicastCount response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ThreadNetworkDiagnostics RxUnicastCount read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeElectricalMeasurementMeasured3rdHarmonicCurrent : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsRxUnicastCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementMeasured3rdHarmonicCurrent()
-        : SubscribeAttribute("measured3rd-harmonic-current")
+    SubscribeAttributeThreadNetworkDiagnosticsRxUnicastCount()
+        : SubscribeAttribute("rx-unicast-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementMeasured3rdHarmonicCurrent() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsRxUnicastCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000308) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000028) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMeasured3rdHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRxUnicastCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.Measured3rdHarmonicCurrent response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.RxUnicastCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -26097,65 +25246,64 @@ class SubscribeAttributeElectricalMeasurementMeasured3rdHarmonicCurrent : public
 };
 
 /*
- * Attribute Measured5thHarmonicCurrent
+ * Attribute RxBroadcastCount
  */
-class ReadElectricalMeasurementMeasured5thHarmonicCurrent : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsRxBroadcastCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementMeasured5thHarmonicCurrent()
-        : ReadAttribute("measured5th-harmonic-current")
+    ReadThreadNetworkDiagnosticsRxBroadcastCount()
+        : ReadAttribute("rx-broadcast-count")
     {
     }
 
-    ~ReadElectricalMeasurementMeasured5thHarmonicCurrent() {}
+    ~ReadThreadNetworkDiagnosticsRxBroadcastCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000309) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000029) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster
-            readAttributeMeasured5thHarmonicCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.Measured5thHarmonicCurrent response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("ElectricalMeasurement Measured5thHarmonicCurrent read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeRxBroadcastCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.RxBroadcastCount response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ThreadNetworkDiagnostics RxBroadcastCount read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeElectricalMeasurementMeasured5thHarmonicCurrent : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsRxBroadcastCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementMeasured5thHarmonicCurrent()
-        : SubscribeAttribute("measured5th-harmonic-current")
+    SubscribeAttributeThreadNetworkDiagnosticsRxBroadcastCount()
+        : SubscribeAttribute("rx-broadcast-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementMeasured5thHarmonicCurrent() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsRxBroadcastCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000309) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000029) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMeasured5thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRxBroadcastCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.Measured5thHarmonicCurrent response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.RxBroadcastCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -26166,65 +25314,64 @@ class SubscribeAttributeElectricalMeasurementMeasured5thHarmonicCurrent : public
 };
 
 /*
- * Attribute Measured7thHarmonicCurrent
+ * Attribute RxDataCount
  */
-class ReadElectricalMeasurementMeasured7thHarmonicCurrent : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsRxDataCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementMeasured7thHarmonicCurrent()
-        : ReadAttribute("measured7th-harmonic-current")
+    ReadThreadNetworkDiagnosticsRxDataCount()
+        : ReadAttribute("rx-data-count")
     {
     }
 
-    ~ReadElectricalMeasurementMeasured7thHarmonicCurrent() {}
+    ~ReadThreadNetworkDiagnosticsRxDataCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000030A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000002A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster
-            readAttributeMeasured7thHarmonicCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.Measured7thHarmonicCurrent response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("ElectricalMeasurement Measured7thHarmonicCurrent read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeRxDataCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.RxDataCount response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ThreadNetworkDiagnostics RxDataCount read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeElectricalMeasurementMeasured7thHarmonicCurrent : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsRxDataCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementMeasured7thHarmonicCurrent()
-        : SubscribeAttribute("measured7th-harmonic-current")
+    SubscribeAttributeThreadNetworkDiagnosticsRxDataCount()
+        : SubscribeAttribute("rx-data-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementMeasured7thHarmonicCurrent() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsRxDataCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000030A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000002A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMeasured7thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRxDataCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.Measured7thHarmonicCurrent response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.RxDataCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -26235,65 +25382,64 @@ class SubscribeAttributeElectricalMeasurementMeasured7thHarmonicCurrent : public
 };
 
 /*
- * Attribute Measured9thHarmonicCurrent
+ * Attribute RxDataPollCount
  */
-class ReadElectricalMeasurementMeasured9thHarmonicCurrent : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsRxDataPollCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementMeasured9thHarmonicCurrent()
-        : ReadAttribute("measured9th-harmonic-current")
+    ReadThreadNetworkDiagnosticsRxDataPollCount()
+        : ReadAttribute("rx-data-poll-count")
     {
     }
 
-    ~ReadElectricalMeasurementMeasured9thHarmonicCurrent() {}
+    ~ReadThreadNetworkDiagnosticsRxDataPollCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000030B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000002B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster
-            readAttributeMeasured9thHarmonicCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.Measured9thHarmonicCurrent response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("ElectricalMeasurement Measured9thHarmonicCurrent read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeRxDataPollCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.RxDataPollCount response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ThreadNetworkDiagnostics RxDataPollCount read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeElectricalMeasurementMeasured9thHarmonicCurrent : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsRxDataPollCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementMeasured9thHarmonicCurrent()
-        : SubscribeAttribute("measured9th-harmonic-current")
+    SubscribeAttributeThreadNetworkDiagnosticsRxDataPollCount()
+        : SubscribeAttribute("rx-data-poll-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementMeasured9thHarmonicCurrent() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsRxDataPollCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000030B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000002B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMeasured9thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRxDataPollCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.Measured9thHarmonicCurrent response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.RxDataPollCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -26304,65 +25450,64 @@ class SubscribeAttributeElectricalMeasurementMeasured9thHarmonicCurrent : public
 };
 
 /*
- * Attribute Measured11thHarmonicCurrent
+ * Attribute RxBeaconCount
  */
-class ReadElectricalMeasurementMeasured11thHarmonicCurrent : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsRxBeaconCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementMeasured11thHarmonicCurrent()
-        : ReadAttribute("measured11th-harmonic-current")
+    ReadThreadNetworkDiagnosticsRxBeaconCount()
+        : ReadAttribute("rx-beacon-count")
     {
     }
 
-    ~ReadElectricalMeasurementMeasured11thHarmonicCurrent() {}
+    ~ReadThreadNetworkDiagnosticsRxBeaconCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000030C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000002C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster
-            readAttributeMeasured11thHarmonicCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.Measured11thHarmonicCurrent response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("ElectricalMeasurement Measured11thHarmonicCurrent read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
-        return CHIP_NO_ERROR;
-    }
-};
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeRxBeaconCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.RxBeaconCount response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ThreadNetworkDiagnostics RxBeaconCount read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
 
-class SubscribeAttributeElectricalMeasurementMeasured11thHarmonicCurrent : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsRxBeaconCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementMeasured11thHarmonicCurrent()
-        : SubscribeAttribute("measured11th-harmonic-current")
+    SubscribeAttributeThreadNetworkDiagnosticsRxBeaconCount()
+        : SubscribeAttribute("rx-beacon-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementMeasured11thHarmonicCurrent() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsRxBeaconCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000030C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000002C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMeasured11thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRxBeaconCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.Measured11thHarmonicCurrent response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.RxBeaconCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -26373,30 +25518,29 @@ class SubscribeAttributeElectricalMeasurementMeasured11thHarmonicCurrent : publi
 };
 
 /*
- * Attribute MeasuredPhase1stHarmonicCurrent
+ * Attribute RxBeaconRequestCount
  */
-class ReadElectricalMeasurementMeasuredPhase1stHarmonicCurrent : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsRxBeaconRequestCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementMeasuredPhase1stHarmonicCurrent()
-        : ReadAttribute("measured-phase1st-harmonic-current")
+    ReadThreadNetworkDiagnosticsRxBeaconRequestCount()
+        : ReadAttribute("rx-beacon-request-count")
     {
     }
 
-    ~ReadElectricalMeasurementMeasuredPhase1stHarmonicCurrent() {}
+    ~ReadThreadNetworkDiagnosticsRxBeaconRequestCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000030D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000002D) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeMeasuredPhase1stHarmonicCurrentWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.MeasuredPhase1stHarmonicCurrent response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeRxBeaconRequestCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.RxBeaconRequestCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement MeasuredPhase1stHarmonicCurrent read Error", error);
+                LogNSError("ThreadNetworkDiagnostics RxBeaconRequestCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -26404,34 +25548,34 @@ class ReadElectricalMeasurementMeasuredPhase1stHarmonicCurrent : public ReadAttr
     }
 };
 
-class SubscribeAttributeElectricalMeasurementMeasuredPhase1stHarmonicCurrent : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsRxBeaconRequestCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementMeasuredPhase1stHarmonicCurrent()
-        : SubscribeAttribute("measured-phase1st-harmonic-current")
+    SubscribeAttributeThreadNetworkDiagnosticsRxBeaconRequestCount()
+        : SubscribeAttribute("rx-beacon-request-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementMeasuredPhase1stHarmonicCurrent() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsRxBeaconRequestCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000030D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000002D) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMeasuredPhase1stHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRxBeaconRequestCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.MeasuredPhase1stHarmonicCurrent response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.RxBeaconRequestCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -26442,30 +25586,29 @@ class SubscribeAttributeElectricalMeasurementMeasuredPhase1stHarmonicCurrent : p
 };
 
 /*
- * Attribute MeasuredPhase3rdHarmonicCurrent
+ * Attribute RxOtherCount
  */
-class ReadElectricalMeasurementMeasuredPhase3rdHarmonicCurrent : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsRxOtherCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementMeasuredPhase3rdHarmonicCurrent()
-        : ReadAttribute("measured-phase3rd-harmonic-current")
+    ReadThreadNetworkDiagnosticsRxOtherCount()
+        : ReadAttribute("rx-other-count")
     {
     }
 
-    ~ReadElectricalMeasurementMeasuredPhase3rdHarmonicCurrent() {}
+    ~ReadThreadNetworkDiagnosticsRxOtherCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000030E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000002E) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeMeasuredPhase3rdHarmonicCurrentWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.MeasuredPhase3rdHarmonicCurrent response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeRxOtherCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.RxOtherCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement MeasuredPhase3rdHarmonicCurrent read Error", error);
+                LogNSError("ThreadNetworkDiagnostics RxOtherCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -26473,34 +25616,34 @@ class ReadElectricalMeasurementMeasuredPhase3rdHarmonicCurrent : public ReadAttr
     }
 };
 
-class SubscribeAttributeElectricalMeasurementMeasuredPhase3rdHarmonicCurrent : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsRxOtherCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementMeasuredPhase3rdHarmonicCurrent()
-        : SubscribeAttribute("measured-phase3rd-harmonic-current")
+    SubscribeAttributeThreadNetworkDiagnosticsRxOtherCount()
+        : SubscribeAttribute("rx-other-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementMeasuredPhase3rdHarmonicCurrent() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsRxOtherCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000030E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000002E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMeasuredPhase3rdHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRxOtherCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.MeasuredPhase3rdHarmonicCurrent response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.RxOtherCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -26511,30 +25654,29 @@ class SubscribeAttributeElectricalMeasurementMeasuredPhase3rdHarmonicCurrent : p
 };
 
 /*
- * Attribute MeasuredPhase5thHarmonicCurrent
+ * Attribute RxAddressFilteredCount
  */
-class ReadElectricalMeasurementMeasuredPhase5thHarmonicCurrent : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsRxAddressFilteredCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementMeasuredPhase5thHarmonicCurrent()
-        : ReadAttribute("measured-phase5th-harmonic-current")
+    ReadThreadNetworkDiagnosticsRxAddressFilteredCount()
+        : ReadAttribute("rx-address-filtered-count")
     {
     }
 
-    ~ReadElectricalMeasurementMeasuredPhase5thHarmonicCurrent() {}
+    ~ReadThreadNetworkDiagnosticsRxAddressFilteredCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000030F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000002F) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeMeasuredPhase5thHarmonicCurrentWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.MeasuredPhase5thHarmonicCurrent response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeRxAddressFilteredCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.RxAddressFilteredCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement MeasuredPhase5thHarmonicCurrent read Error", error);
+                LogNSError("ThreadNetworkDiagnostics RxAddressFilteredCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -26542,34 +25684,34 @@ class ReadElectricalMeasurementMeasuredPhase5thHarmonicCurrent : public ReadAttr
     }
 };
 
-class SubscribeAttributeElectricalMeasurementMeasuredPhase5thHarmonicCurrent : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsRxAddressFilteredCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementMeasuredPhase5thHarmonicCurrent()
-        : SubscribeAttribute("measured-phase5th-harmonic-current")
+    SubscribeAttributeThreadNetworkDiagnosticsRxAddressFilteredCount()
+        : SubscribeAttribute("rx-address-filtered-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementMeasuredPhase5thHarmonicCurrent() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsRxAddressFilteredCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000030F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000002F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMeasuredPhase5thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRxAddressFilteredCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.MeasuredPhase5thHarmonicCurrent response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.RxAddressFilteredCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -26580,65 +25722,65 @@ class SubscribeAttributeElectricalMeasurementMeasuredPhase5thHarmonicCurrent : p
 };
 
 /*
- * Attribute MeasuredPhase7thHarmonicCurrent
+ * Attribute RxDestAddrFilteredCount
  */
-class ReadElectricalMeasurementMeasuredPhase7thHarmonicCurrent : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsRxDestAddrFilteredCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementMeasuredPhase7thHarmonicCurrent()
-        : ReadAttribute("measured-phase7th-harmonic-current")
+    ReadThreadNetworkDiagnosticsRxDestAddrFilteredCount()
+        : ReadAttribute("rx-dest-addr-filtered-count")
     {
     }
 
-    ~ReadElectricalMeasurementMeasuredPhase7thHarmonicCurrent() {}
+    ~ReadThreadNetworkDiagnosticsRxDestAddrFilteredCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000310) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000030) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeMeasuredPhase7thHarmonicCurrentWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.MeasuredPhase7thHarmonicCurrent response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ElectricalMeasurement MeasuredPhase7thHarmonicCurrent read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster
+            readAttributeRxDestAddrFilteredCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.RxDestAddrFilteredCount response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("ThreadNetworkDiagnostics RxDestAddrFilteredCount read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeElectricalMeasurementMeasuredPhase7thHarmonicCurrent : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsRxDestAddrFilteredCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementMeasuredPhase7thHarmonicCurrent()
-        : SubscribeAttribute("measured-phase7th-harmonic-current")
+    SubscribeAttributeThreadNetworkDiagnosticsRxDestAddrFilteredCount()
+        : SubscribeAttribute("rx-dest-addr-filtered-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementMeasuredPhase7thHarmonicCurrent() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsRxDestAddrFilteredCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000310) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000030) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMeasuredPhase7thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRxDestAddrFilteredCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.MeasuredPhase7thHarmonicCurrent response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.RxDestAddrFilteredCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -26649,30 +25791,29 @@ class SubscribeAttributeElectricalMeasurementMeasuredPhase7thHarmonicCurrent : p
 };
 
 /*
- * Attribute MeasuredPhase9thHarmonicCurrent
+ * Attribute RxDuplicatedCount
  */
-class ReadElectricalMeasurementMeasuredPhase9thHarmonicCurrent : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsRxDuplicatedCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementMeasuredPhase9thHarmonicCurrent()
-        : ReadAttribute("measured-phase9th-harmonic-current")
+    ReadThreadNetworkDiagnosticsRxDuplicatedCount()
+        : ReadAttribute("rx-duplicated-count")
     {
     }
 
-    ~ReadElectricalMeasurementMeasuredPhase9thHarmonicCurrent() {}
+    ~ReadThreadNetworkDiagnosticsRxDuplicatedCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000311) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000031) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeMeasuredPhase9thHarmonicCurrentWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.MeasuredPhase9thHarmonicCurrent response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeRxDuplicatedCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.RxDuplicatedCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement MeasuredPhase9thHarmonicCurrent read Error", error);
+                LogNSError("ThreadNetworkDiagnostics RxDuplicatedCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -26680,34 +25821,34 @@ class ReadElectricalMeasurementMeasuredPhase9thHarmonicCurrent : public ReadAttr
     }
 };
 
-class SubscribeAttributeElectricalMeasurementMeasuredPhase9thHarmonicCurrent : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsRxDuplicatedCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementMeasuredPhase9thHarmonicCurrent()
-        : SubscribeAttribute("measured-phase9th-harmonic-current")
+    SubscribeAttributeThreadNetworkDiagnosticsRxDuplicatedCount()
+        : SubscribeAttribute("rx-duplicated-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementMeasuredPhase9thHarmonicCurrent() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsRxDuplicatedCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000311) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000031) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMeasuredPhase9thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRxDuplicatedCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.MeasuredPhase9thHarmonicCurrent response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.RxDuplicatedCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -26718,30 +25859,29 @@ class SubscribeAttributeElectricalMeasurementMeasuredPhase9thHarmonicCurrent : p
 };
 
 /*
- * Attribute MeasuredPhase11thHarmonicCurrent
+ * Attribute RxErrNoFrameCount
  */
-class ReadElectricalMeasurementMeasuredPhase11thHarmonicCurrent : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsRxErrNoFrameCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementMeasuredPhase11thHarmonicCurrent()
-        : ReadAttribute("measured-phase11th-harmonic-current")
+    ReadThreadNetworkDiagnosticsRxErrNoFrameCount()
+        : ReadAttribute("rx-err-no-frame-count")
     {
     }
 
-    ~ReadElectricalMeasurementMeasuredPhase11thHarmonicCurrent() {}
+    ~ReadThreadNetworkDiagnosticsRxErrNoFrameCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000312) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000032) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeMeasuredPhase11thHarmonicCurrentWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.MeasuredPhase11thHarmonicCurrent response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeRxErrNoFrameCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.RxErrNoFrameCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement MeasuredPhase11thHarmonicCurrent read Error", error);
+                LogNSError("ThreadNetworkDiagnostics RxErrNoFrameCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -26749,34 +25889,34 @@ class ReadElectricalMeasurementMeasuredPhase11thHarmonicCurrent : public ReadAtt
     }
 };
 
-class SubscribeAttributeElectricalMeasurementMeasuredPhase11thHarmonicCurrent : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsRxErrNoFrameCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementMeasuredPhase11thHarmonicCurrent()
-        : SubscribeAttribute("measured-phase11th-harmonic-current")
+    SubscribeAttributeThreadNetworkDiagnosticsRxErrNoFrameCount()
+        : SubscribeAttribute("rx-err-no-frame-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementMeasuredPhase11thHarmonicCurrent() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsRxErrNoFrameCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000312) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000032) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMeasuredPhase11thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRxErrNoFrameCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.MeasuredPhase11thHarmonicCurrent response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.RxErrNoFrameCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -26787,64 +25927,65 @@ class SubscribeAttributeElectricalMeasurementMeasuredPhase11thHarmonicCurrent :
 };
 
 /*
- * Attribute AcFrequencyMultiplier
+ * Attribute RxErrUnknownNeighborCount
  */
-class ReadElectricalMeasurementAcFrequencyMultiplier : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsRxErrUnknownNeighborCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementAcFrequencyMultiplier()
-        : ReadAttribute("ac-frequency-multiplier")
+    ReadThreadNetworkDiagnosticsRxErrUnknownNeighborCount()
+        : ReadAttribute("rx-err-unknown-neighbor-count")
     {
     }
 
-    ~ReadElectricalMeasurementAcFrequencyMultiplier() {}
+    ~ReadThreadNetworkDiagnosticsRxErrUnknownNeighborCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000400) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000033) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeAcFrequencyMultiplierWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AcFrequencyMultiplier response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ElectricalMeasurement AcFrequencyMultiplier read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster
+            readAttributeRxErrUnknownNeighborCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.RxErrUnknownNeighborCount response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("ThreadNetworkDiagnostics RxErrUnknownNeighborCount read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeElectricalMeasurementAcFrequencyMultiplier : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsRxErrUnknownNeighborCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAcFrequencyMultiplier()
-        : SubscribeAttribute("ac-frequency-multiplier")
+    SubscribeAttributeThreadNetworkDiagnosticsRxErrUnknownNeighborCount()
+        : SubscribeAttribute("rx-err-unknown-neighbor-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAcFrequencyMultiplier() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsRxErrUnknownNeighborCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000400) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000033) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcFrequencyMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRxErrUnknownNeighborCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AcFrequencyMultiplier response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.RxErrUnknownNeighborCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -26855,64 +25996,65 @@ class SubscribeAttributeElectricalMeasurementAcFrequencyMultiplier : public Subs
 };
 
 /*
- * Attribute AcFrequencyDivisor
+ * Attribute RxErrInvalidSrcAddrCount
  */
-class ReadElectricalMeasurementAcFrequencyDivisor : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementAcFrequencyDivisor()
-        : ReadAttribute("ac-frequency-divisor")
+    ReadThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount()
+        : ReadAttribute("rx-err-invalid-src-addr-count")
     {
     }
 
-    ~ReadElectricalMeasurementAcFrequencyDivisor() {}
+    ~ReadThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000401) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000034) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeAcFrequencyDivisorWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AcFrequencyDivisor response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ElectricalMeasurement AcFrequencyDivisor read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster
+            readAttributeRxErrInvalidSrcAddrCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.RxErrInvalidSrcAddrCount response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("ThreadNetworkDiagnostics RxErrInvalidSrcAddrCount read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeElectricalMeasurementAcFrequencyDivisor : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAcFrequencyDivisor()
-        : SubscribeAttribute("ac-frequency-divisor")
+    SubscribeAttributeThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount()
+        : SubscribeAttribute("rx-err-invalid-src-addr-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAcFrequencyDivisor() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000401) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000034) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcFrequencyDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRxErrInvalidSrcAddrCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AcFrequencyDivisor response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.RxErrInvalidSrcAddrCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -26923,29 +26065,29 @@ class SubscribeAttributeElectricalMeasurementAcFrequencyDivisor : public Subscri
 };
 
 /*
- * Attribute PowerMultiplier
+ * Attribute RxErrSecCount
  */
-class ReadElectricalMeasurementPowerMultiplier : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsRxErrSecCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementPowerMultiplier()
-        : ReadAttribute("power-multiplier")
+    ReadThreadNetworkDiagnosticsRxErrSecCount()
+        : ReadAttribute("rx-err-sec-count")
     {
     }
 
-    ~ReadElectricalMeasurementPowerMultiplier() {}
+    ~ReadThreadNetworkDiagnosticsRxErrSecCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000402) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000035) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributePowerMultiplierWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.PowerMultiplier response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeRxErrSecCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.RxErrSecCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement PowerMultiplier read Error", error);
+                LogNSError("ThreadNetworkDiagnostics RxErrSecCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -26953,34 +26095,34 @@ class ReadElectricalMeasurementPowerMultiplier : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementPowerMultiplier : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsRxErrSecCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementPowerMultiplier()
-        : SubscribeAttribute("power-multiplier")
+    SubscribeAttributeThreadNetworkDiagnosticsRxErrSecCount()
+        : SubscribeAttribute("rx-err-sec-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementPowerMultiplier() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsRxErrSecCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000402) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000035) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePowerMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRxErrSecCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.PowerMultiplier response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.RxErrSecCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -26991,29 +26133,29 @@ class SubscribeAttributeElectricalMeasurementPowerMultiplier : public SubscribeA
 };
 
 /*
- * Attribute PowerDivisor
+ * Attribute RxErrFcsCount
  */
-class ReadElectricalMeasurementPowerDivisor : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsRxErrFcsCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementPowerDivisor()
-        : ReadAttribute("power-divisor")
+    ReadThreadNetworkDiagnosticsRxErrFcsCount()
+        : ReadAttribute("rx-err-fcs-count")
     {
     }
 
-    ~ReadElectricalMeasurementPowerDivisor() {}
+    ~ReadThreadNetworkDiagnosticsRxErrFcsCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000403) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000036) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributePowerDivisorWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.PowerDivisor response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeRxErrFcsCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.RxErrFcsCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement PowerDivisor read Error", error);
+                LogNSError("ThreadNetworkDiagnostics RxErrFcsCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -27021,34 +26163,34 @@ class ReadElectricalMeasurementPowerDivisor : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementPowerDivisor : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsRxErrFcsCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementPowerDivisor()
-        : SubscribeAttribute("power-divisor")
+    SubscribeAttributeThreadNetworkDiagnosticsRxErrFcsCount()
+        : SubscribeAttribute("rx-err-fcs-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementPowerDivisor() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsRxErrFcsCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000403) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000036) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePowerDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRxErrFcsCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.PowerDivisor response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.RxErrFcsCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -27059,65 +26201,64 @@ class SubscribeAttributeElectricalMeasurementPowerDivisor : public SubscribeAttr
 };
 
 /*
- * Attribute HarmonicCurrentMultiplier
+ * Attribute RxErrOtherCount
  */
-class ReadElectricalMeasurementHarmonicCurrentMultiplier : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsRxErrOtherCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementHarmonicCurrentMultiplier()
-        : ReadAttribute("harmonic-current-multiplier")
+    ReadThreadNetworkDiagnosticsRxErrOtherCount()
+        : ReadAttribute("rx-err-other-count")
     {
     }
 
-    ~ReadElectricalMeasurementHarmonicCurrentMultiplier() {}
+    ~ReadThreadNetworkDiagnosticsRxErrOtherCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000404) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000037) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster
-            readAttributeHarmonicCurrentMultiplierWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.HarmonicCurrentMultiplier response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("ElectricalMeasurement HarmonicCurrentMultiplier read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeRxErrOtherCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.RxErrOtherCount response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ThreadNetworkDiagnostics RxErrOtherCount read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeElectricalMeasurementHarmonicCurrentMultiplier : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsRxErrOtherCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementHarmonicCurrentMultiplier()
-        : SubscribeAttribute("harmonic-current-multiplier")
+    SubscribeAttributeThreadNetworkDiagnosticsRxErrOtherCount()
+        : SubscribeAttribute("rx-err-other-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementHarmonicCurrentMultiplier() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsRxErrOtherCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000404) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000037) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeHarmonicCurrentMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRxErrOtherCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.HarmonicCurrentMultiplier response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.RxErrOtherCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -27128,30 +26269,29 @@ class SubscribeAttributeElectricalMeasurementHarmonicCurrentMultiplier : public
 };
 
 /*
- * Attribute PhaseHarmonicCurrentMultiplier
+ * Attribute ActiveTimestamp
  */
-class ReadElectricalMeasurementPhaseHarmonicCurrentMultiplier : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsActiveTimestamp : public ReadAttribute {
 public:
-    ReadElectricalMeasurementPhaseHarmonicCurrentMultiplier()
-        : ReadAttribute("phase-harmonic-current-multiplier")
+    ReadThreadNetworkDiagnosticsActiveTimestamp()
+        : ReadAttribute("active-timestamp")
     {
     }
 
-    ~ReadElectricalMeasurementPhaseHarmonicCurrentMultiplier() {}
+    ~ReadThreadNetworkDiagnosticsActiveTimestamp() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000405) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000038) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributePhaseHarmonicCurrentMultiplierWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.PhaseHarmonicCurrentMultiplier response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeActiveTimestampWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.ActiveTimestamp response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement PhaseHarmonicCurrentMultiplier read Error", error);
+                LogNSError("ThreadNetworkDiagnostics ActiveTimestamp read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -27159,34 +26299,34 @@ class ReadElectricalMeasurementPhaseHarmonicCurrentMultiplier : public ReadAttri
     }
 };
 
-class SubscribeAttributeElectricalMeasurementPhaseHarmonicCurrentMultiplier : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsActiveTimestamp : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementPhaseHarmonicCurrentMultiplier()
-        : SubscribeAttribute("phase-harmonic-current-multiplier")
+    SubscribeAttributeThreadNetworkDiagnosticsActiveTimestamp()
+        : SubscribeAttribute("active-timestamp")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementPhaseHarmonicCurrentMultiplier() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsActiveTimestamp() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000405) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000038) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePhaseHarmonicCurrentMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeActiveTimestampWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.PhaseHarmonicCurrentMultiplier response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.ActiveTimestamp response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -27197,29 +26337,29 @@ class SubscribeAttributeElectricalMeasurementPhaseHarmonicCurrentMultiplier : pu
 };
 
 /*
- * Attribute InstantaneousVoltage
+ * Attribute PendingTimestamp
  */
-class ReadElectricalMeasurementInstantaneousVoltage : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsPendingTimestamp : public ReadAttribute {
 public:
-    ReadElectricalMeasurementInstantaneousVoltage()
-        : ReadAttribute("instantaneous-voltage")
+    ReadThreadNetworkDiagnosticsPendingTimestamp()
+        : ReadAttribute("pending-timestamp")
     {
     }
 
-    ~ReadElectricalMeasurementInstantaneousVoltage() {}
+    ~ReadThreadNetworkDiagnosticsPendingTimestamp() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000500) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000039) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeInstantaneousVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.InstantaneousVoltage response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributePendingTimestampWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.PendingTimestamp response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement InstantaneousVoltage read Error", error);
+                LogNSError("ThreadNetworkDiagnostics PendingTimestamp read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -27227,34 +26367,34 @@ class ReadElectricalMeasurementInstantaneousVoltage : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementInstantaneousVoltage : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsPendingTimestamp : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementInstantaneousVoltage()
-        : SubscribeAttribute("instantaneous-voltage")
+    SubscribeAttributeThreadNetworkDiagnosticsPendingTimestamp()
+        : SubscribeAttribute("pending-timestamp")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementInstantaneousVoltage() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsPendingTimestamp() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000500) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000039) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInstantaneousVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePendingTimestampWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.InstantaneousVoltage response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.PendingTimestamp response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -27265,65 +26405,64 @@ class SubscribeAttributeElectricalMeasurementInstantaneousVoltage : public Subsc
 };
 
 /*
- * Attribute InstantaneousLineCurrent
+ * Attribute Delay
  */
-class ReadElectricalMeasurementInstantaneousLineCurrent : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsDelay : public ReadAttribute {
 public:
-    ReadElectricalMeasurementInstantaneousLineCurrent()
-        : ReadAttribute("instantaneous-line-current")
+    ReadThreadNetworkDiagnosticsDelay()
+        : ReadAttribute("delay")
     {
     }
 
-    ~ReadElectricalMeasurementInstantaneousLineCurrent() {}
+    ~ReadThreadNetworkDiagnosticsDelay() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000501) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000003A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster
-            readAttributeInstantaneousLineCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.InstantaneousLineCurrent response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("ElectricalMeasurement InstantaneousLineCurrent read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeDelayWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.Delay response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ThreadNetworkDiagnostics Delay read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeElectricalMeasurementInstantaneousLineCurrent : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsDelay : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementInstantaneousLineCurrent()
-        : SubscribeAttribute("instantaneous-line-current")
+    SubscribeAttributeThreadNetworkDiagnosticsDelay()
+        : SubscribeAttribute("delay")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementInstantaneousLineCurrent() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsDelay() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000501) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000003A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInstantaneousLineCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.InstantaneousLineCurrent response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.Delay response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -27334,65 +26473,65 @@ class SubscribeAttributeElectricalMeasurementInstantaneousLineCurrent : public S
 };
 
 /*
- * Attribute InstantaneousActiveCurrent
+ * Attribute SecurityPolicy
  */
-class ReadElectricalMeasurementInstantaneousActiveCurrent : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsSecurityPolicy : public ReadAttribute {
 public:
-    ReadElectricalMeasurementInstantaneousActiveCurrent()
-        : ReadAttribute("instantaneous-active-current")
+    ReadThreadNetworkDiagnosticsSecurityPolicy()
+        : ReadAttribute("security-policy")
     {
     }
 
-    ~ReadElectricalMeasurementInstantaneousActiveCurrent() {}
+    ~ReadThreadNetworkDiagnosticsSecurityPolicy() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000502) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000003B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster
-            readAttributeInstantaneousActiveCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.InstantaneousActiveCurrent response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("ElectricalMeasurement InstantaneousActiveCurrent read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeSecurityPolicyWithCompletionHandler:^(
+            CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.SecurityPolicy response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ThreadNetworkDiagnostics SecurityPolicy read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeElectricalMeasurementInstantaneousActiveCurrent : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsSecurityPolicy : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementInstantaneousActiveCurrent()
-        : SubscribeAttribute("instantaneous-active-current")
+    SubscribeAttributeThreadNetworkDiagnosticsSecurityPolicy()
+        : SubscribeAttribute("security-policy")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementInstantaneousActiveCurrent() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsSecurityPolicy() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000502) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000003B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInstantaneousActiveCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSecurityPolicyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.InstantaneousActiveCurrent response %@", [value description]);
+            reportHandler:^(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.SecurityPolicy response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -27403,30 +26542,29 @@ class SubscribeAttributeElectricalMeasurementInstantaneousActiveCurrent : public
 };
 
 /*
- * Attribute InstantaneousReactiveCurrent
+ * Attribute ChannelMask
  */
-class ReadElectricalMeasurementInstantaneousReactiveCurrent : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsChannelMask : public ReadAttribute {
 public:
-    ReadElectricalMeasurementInstantaneousReactiveCurrent()
-        : ReadAttribute("instantaneous-reactive-current")
+    ReadThreadNetworkDiagnosticsChannelMask()
+        : ReadAttribute("channel-mask")
     {
     }
 
-    ~ReadElectricalMeasurementInstantaneousReactiveCurrent() {}
+    ~ReadThreadNetworkDiagnosticsChannelMask() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000503) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000003C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeInstantaneousReactiveCurrentWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.InstantaneousReactiveCurrent response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeChannelMaskWithCompletionHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.ChannelMask response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement InstantaneousReactiveCurrent read Error", error);
+                LogNSError("ThreadNetworkDiagnostics ChannelMask read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -27434,34 +26572,34 @@ class ReadElectricalMeasurementInstantaneousReactiveCurrent : public ReadAttribu
     }
 };
 
-class SubscribeAttributeElectricalMeasurementInstantaneousReactiveCurrent : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsChannelMask : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementInstantaneousReactiveCurrent()
-        : SubscribeAttribute("instantaneous-reactive-current")
+    SubscribeAttributeThreadNetworkDiagnosticsChannelMask()
+        : SubscribeAttribute("channel-mask")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementInstantaneousReactiveCurrent() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsChannelMask() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000503) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000003C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInstantaneousReactiveCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeChannelMaskWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.InstantaneousReactiveCurrent response %@", [value description]);
+            reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.ChannelMask response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -27472,29 +26610,30 @@ class SubscribeAttributeElectricalMeasurementInstantaneousReactiveCurrent : publ
 };
 
 /*
- * Attribute InstantaneousPower
+ * Attribute OperationalDatasetComponents
  */
-class ReadElectricalMeasurementInstantaneousPower : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsOperationalDatasetComponents : public ReadAttribute {
 public:
-    ReadElectricalMeasurementInstantaneousPower()
-        : ReadAttribute("instantaneous-power")
+    ReadThreadNetworkDiagnosticsOperationalDatasetComponents()
+        : ReadAttribute("operational-dataset-components")
     {
     }
 
-    ~ReadElectricalMeasurementInstantaneousPower() {}
+    ~ReadThreadNetworkDiagnosticsOperationalDatasetComponents() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000504) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000003D) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeInstantaneousPowerWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.InstantaneousPower response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeOperationalDatasetComponentsWithCompletionHandler:^(
+            CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.OperationalDatasetComponents response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement InstantaneousPower read Error", error);
+                LogNSError("ThreadNetworkDiagnostics OperationalDatasetComponents read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -27502,34 +26641,35 @@ class ReadElectricalMeasurementInstantaneousPower : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementInstantaneousPower : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsOperationalDatasetComponents : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementInstantaneousPower()
-        : SubscribeAttribute("instantaneous-power")
+    SubscribeAttributeThreadNetworkDiagnosticsOperationalDatasetComponents()
+        : SubscribeAttribute("operational-dataset-components")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementInstantaneousPower() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsOperationalDatasetComponents() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000504) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000003D) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInstantaneousPowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOperationalDatasetComponentsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.InstantaneousPower response %@", [value description]);
+            reportHandler:^(
+                CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.OperationalDatasetComponents response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -27540,29 +26680,29 @@ class SubscribeAttributeElectricalMeasurementInstantaneousPower : public Subscri
 };
 
 /*
- * Attribute RmsVoltage
+ * Attribute ActiveNetworkFaultsList
  */
-class ReadElectricalMeasurementRmsVoltage : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsActiveNetworkFaultsList : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsVoltage()
-        : ReadAttribute("rms-voltage")
+    ReadThreadNetworkDiagnosticsActiveNetworkFaultsList()
+        : ReadAttribute("active-network-faults-list")
     {
     }
 
-    ~ReadElectricalMeasurementRmsVoltage() {}
+    ~ReadThreadNetworkDiagnosticsActiveNetworkFaultsList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000505) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000003E) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsVoltage response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeActiveNetworkFaultsListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.ActiveNetworkFaultsList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsVoltage read Error", error);
+                LogNSError("ThreadNetworkDiagnostics ActiveNetworkFaultsList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -27570,34 +26710,34 @@ class ReadElectricalMeasurementRmsVoltage : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsVoltage : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsActiveNetworkFaultsList : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsVoltage()
-        : SubscribeAttribute("rms-voltage")
+    SubscribeAttributeThreadNetworkDiagnosticsActiveNetworkFaultsList()
+        : SubscribeAttribute("active-network-faults-list")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsVoltage() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsActiveNetworkFaultsList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000505) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000003E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeActiveNetworkFaultsListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsVoltage response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.ActiveNetworkFaultsList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -27608,29 +26748,29 @@ class SubscribeAttributeElectricalMeasurementRmsVoltage : public SubscribeAttrib
 };
 
 /*
- * Attribute RmsVoltageMin
+ * Attribute GeneratedCommandList
  */
-class ReadElectricalMeasurementRmsVoltageMin : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsGeneratedCommandList : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsVoltageMin()
-        : ReadAttribute("rms-voltage-min")
+    ReadThreadNetworkDiagnosticsGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadElectricalMeasurementRmsVoltageMin() {}
+    ~ReadThreadNetworkDiagnosticsGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000506) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsVoltageMinWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsVoltageMin response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsVoltageMin read Error", error);
+                LogNSError("ThreadNetworkDiagnostics GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -27638,34 +26778,34 @@ class ReadElectricalMeasurementRmsVoltageMin : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsVoltageMin : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsVoltageMin()
-        : SubscribeAttribute("rms-voltage-min")
+    SubscribeAttributeThreadNetworkDiagnosticsGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsVoltageMin() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000506) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsVoltageMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsVoltageMin response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -27676,29 +26816,29 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageMin : public SubscribeAtt
 };
 
 /*
- * Attribute RmsVoltageMax
+ * Attribute AcceptedCommandList
  */
-class ReadElectricalMeasurementRmsVoltageMax : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsAcceptedCommandList : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsVoltageMax()
-        : ReadAttribute("rms-voltage-max")
+    ReadThreadNetworkDiagnosticsAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadElectricalMeasurementRmsVoltageMax() {}
+    ~ReadThreadNetworkDiagnosticsAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000507) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsVoltageMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsVoltageMax response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsVoltageMax read Error", error);
+                LogNSError("ThreadNetworkDiagnostics AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -27706,34 +26846,34 @@ class ReadElectricalMeasurementRmsVoltageMax : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsVoltageMax : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsVoltageMax()
-        : SubscribeAttribute("rms-voltage-max")
+    SubscribeAttributeThreadNetworkDiagnosticsAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsVoltageMax() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000507) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsVoltageMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsVoltageMax response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -27744,29 +26884,29 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageMax : public SubscribeAtt
 };
 
 /*
- * Attribute RmsCurrent
+ * Attribute AttributeList
  */
-class ReadElectricalMeasurementRmsCurrent : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsAttributeList : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsCurrent()
-        : ReadAttribute("rms-current")
+    ReadThreadNetworkDiagnosticsAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadElectricalMeasurementRmsCurrent() {}
+    ~ReadThreadNetworkDiagnosticsAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000508) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsCurrent response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsCurrent read Error", error);
+                LogNSError("ThreadNetworkDiagnostics AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -27774,34 +26914,34 @@ class ReadElectricalMeasurementRmsCurrent : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsCurrent : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsCurrent()
-        : SubscribeAttribute("rms-current")
+    SubscribeAttributeThreadNetworkDiagnosticsAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsCurrent() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000508) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsCurrent response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThreadNetworkDiagnostics.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -27812,29 +26952,29 @@ class SubscribeAttributeElectricalMeasurementRmsCurrent : public SubscribeAttrib
 };
 
 /*
- * Attribute RmsCurrentMin
+ * Attribute FeatureMap
  */
-class ReadElectricalMeasurementRmsCurrentMin : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsFeatureMap : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsCurrentMin()
-        : ReadAttribute("rms-current-min")
+    ReadThreadNetworkDiagnosticsFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadElectricalMeasurementRmsCurrentMin() {}
+    ~ReadThreadNetworkDiagnosticsFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000509) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsCurrentMinWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsCurrentMin response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsCurrentMin read Error", error);
+                LogNSError("ThreadNetworkDiagnostics FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -27842,34 +26982,34 @@ class ReadElectricalMeasurementRmsCurrentMin : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsCurrentMin : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsCurrentMin()
-        : SubscribeAttribute("rms-current-min")
+    SubscribeAttributeThreadNetworkDiagnosticsFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsCurrentMin() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000509) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsCurrentMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsCurrentMin response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -27880,29 +27020,29 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentMin : public SubscribeAtt
 };
 
 /*
- * Attribute RmsCurrentMax
+ * Attribute ClusterRevision
  */
-class ReadElectricalMeasurementRmsCurrentMax : public ReadAttribute {
+class ReadThreadNetworkDiagnosticsClusterRevision : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsCurrentMax()
-        : ReadAttribute("rms-current-max")
+    ReadThreadNetworkDiagnosticsClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadElectricalMeasurementRmsCurrentMax() {}
+    ~ReadThreadNetworkDiagnosticsClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000050A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsCurrentMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsCurrentMax response %@", [value description]);
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThreadNetworkDiagnostics.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsCurrentMax read Error", error);
+                LogNSError("ThreadNetworkDiagnostics ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -27910,34 +27050,34 @@ class ReadElectricalMeasurementRmsCurrentMax : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsCurrentMax : public SubscribeAttribute {
+class SubscribeAttributeThreadNetworkDiagnosticsClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsCurrentMax()
-        : SubscribeAttribute("rms-current-max")
+    SubscribeAttributeThreadNetworkDiagnosticsClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsCurrentMax() {}
+    ~SubscribeAttributeThreadNetworkDiagnosticsClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000050A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
+                                                                                             endpoint:endpointId
+                                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsCurrentMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsCurrentMax response %@", [value description]);
+                NSLog(@"ThreadNetworkDiagnostics.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -27947,30 +27087,105 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentMax : public SubscribeAtt
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster WiFiNetworkDiagnostics                                      | 0x0036 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * ResetCounts                                                       |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * Bssid                                                             | 0x0000 |
+| * SecurityType                                                      | 0x0001 |
+| * WiFiVersion                                                       | 0x0002 |
+| * ChannelNumber                                                     | 0x0003 |
+| * Rssi                                                              | 0x0004 |
+| * BeaconLostCount                                                   | 0x0005 |
+| * BeaconRxCount                                                     | 0x0006 |
+| * PacketMulticastRxCount                                            | 0x0007 |
+| * PacketMulticastTxCount                                            | 0x0008 |
+| * PacketUnicastRxCount                                              | 0x0009 |
+| * PacketUnicastTxCount                                              | 0x000A |
+| * CurrentMaxRate                                                    | 0x000B |
+| * OverrunCount                                                      | 0x000C |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * Disconnection                                                     | 0x0000 |
+| * AssociationFailure                                                | 0x0001 |
+| * ConnectionStatus                                                  | 0x0002 |
+\*----------------------------------------------------------------------------*/
+
+/*
+ * Command ResetCounts
+ */
+class WiFiNetworkDiagnosticsResetCounts : public ClusterCommand {
+public:
+    WiFiNetworkDiagnosticsResetCounts()
+        : ClusterCommand("reset-counts")
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) command (0x00000000) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        __auto_type * params = [[CHIPWiFiNetworkDiagnosticsClusterResetCountsParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster resetCountsWithParams:params
+                         completionHandler:^(NSError * _Nullable error) {
+                             responsesNeeded--;
+                             if (error != nil) {
+                                 mError = error;
+                                 LogNSError("Error", error);
+                             }
+                             if (responsesNeeded == 0) {
+                                 SetCommandExitStatus(mError);
+                             }
+                         }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+};
+
 /*
- * Attribute ActivePower
+ * Attribute Bssid
  */
-class ReadElectricalMeasurementActivePower : public ReadAttribute {
+class ReadWiFiNetworkDiagnosticsBssid : public ReadAttribute {
 public:
-    ReadElectricalMeasurementActivePower()
-        : ReadAttribute("active-power")
+    ReadWiFiNetworkDiagnosticsBssid()
+        : ReadAttribute("bssid")
     {
     }
 
-    ~ReadElectricalMeasurementActivePower() {}
+    ~ReadWiFiNetworkDiagnosticsBssid() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000050B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeActivePowerWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.ActivePower response %@", [value description]);
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeBssidWithCompletionHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WiFiNetworkDiagnostics.Bssid response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement ActivePower read Error", error);
+                LogNSError("WiFiNetworkDiagnostics Bssid read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -27978,34 +27193,34 @@ class ReadElectricalMeasurementActivePower : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementActivePower : public SubscribeAttribute {
+class SubscribeAttributeWiFiNetworkDiagnosticsBssid : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementActivePower()
-        : SubscribeAttribute("active-power")
+    SubscribeAttributeWiFiNetworkDiagnosticsBssid()
+        : SubscribeAttribute("bssid")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementActivePower() {}
+    ~SubscribeAttributeWiFiNetworkDiagnosticsBssid() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000050B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeActivePowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBssidWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.ActivePower response %@", [value description]);
+            reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WiFiNetworkDiagnostics.Bssid response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -28016,29 +27231,29 @@ class SubscribeAttributeElectricalMeasurementActivePower : public SubscribeAttri
 };
 
 /*
- * Attribute ActivePowerMin
+ * Attribute SecurityType
  */
-class ReadElectricalMeasurementActivePowerMin : public ReadAttribute {
+class ReadWiFiNetworkDiagnosticsSecurityType : public ReadAttribute {
 public:
-    ReadElectricalMeasurementActivePowerMin()
-        : ReadAttribute("active-power-min")
+    ReadWiFiNetworkDiagnosticsSecurityType()
+        : ReadAttribute("security-type")
     {
     }
 
-    ~ReadElectricalMeasurementActivePowerMin() {}
+    ~ReadWiFiNetworkDiagnosticsSecurityType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000050C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeActivePowerMinWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.ActivePowerMin response %@", [value description]);
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeSecurityTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WiFiNetworkDiagnostics.SecurityType response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement ActivePowerMin read Error", error);
+                LogNSError("WiFiNetworkDiagnostics SecurityType read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -28046,34 +27261,34 @@ class ReadElectricalMeasurementActivePowerMin : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementActivePowerMin : public SubscribeAttribute {
+class SubscribeAttributeWiFiNetworkDiagnosticsSecurityType : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementActivePowerMin()
-        : SubscribeAttribute("active-power-min")
+    SubscribeAttributeWiFiNetworkDiagnosticsSecurityType()
+        : SubscribeAttribute("security-type")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementActivePowerMin() {}
+    ~SubscribeAttributeWiFiNetworkDiagnosticsSecurityType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000050C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeActivePowerMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSecurityTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.ActivePowerMin response %@", [value description]);
+                NSLog(@"WiFiNetworkDiagnostics.SecurityType response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -28084,29 +27299,29 @@ class SubscribeAttributeElectricalMeasurementActivePowerMin : public SubscribeAt
 };
 
 /*
- * Attribute ActivePowerMax
+ * Attribute WiFiVersion
  */
-class ReadElectricalMeasurementActivePowerMax : public ReadAttribute {
+class ReadWiFiNetworkDiagnosticsWiFiVersion : public ReadAttribute {
 public:
-    ReadElectricalMeasurementActivePowerMax()
-        : ReadAttribute("active-power-max")
+    ReadWiFiNetworkDiagnosticsWiFiVersion()
+        : ReadAttribute("wi-fi-version")
     {
     }
 
-    ~ReadElectricalMeasurementActivePowerMax() {}
+    ~ReadWiFiNetworkDiagnosticsWiFiVersion() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000050D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeActivePowerMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.ActivePowerMax response %@", [value description]);
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeWiFiVersionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WiFiNetworkDiagnostics.WiFiVersion response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement ActivePowerMax read Error", error);
+                LogNSError("WiFiNetworkDiagnostics WiFiVersion read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -28114,34 +27329,34 @@ class ReadElectricalMeasurementActivePowerMax : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementActivePowerMax : public SubscribeAttribute {
+class SubscribeAttributeWiFiNetworkDiagnosticsWiFiVersion : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementActivePowerMax()
-        : SubscribeAttribute("active-power-max")
+    SubscribeAttributeWiFiNetworkDiagnosticsWiFiVersion()
+        : SubscribeAttribute("wi-fi-version")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementActivePowerMax() {}
+    ~SubscribeAttributeWiFiNetworkDiagnosticsWiFiVersion() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000050D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeActivePowerMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeWiFiVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.ActivePowerMax response %@", [value description]);
+                NSLog(@"WiFiNetworkDiagnostics.WiFiVersion response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -28152,29 +27367,29 @@ class SubscribeAttributeElectricalMeasurementActivePowerMax : public SubscribeAt
 };
 
 /*
- * Attribute ReactivePower
+ * Attribute ChannelNumber
  */
-class ReadElectricalMeasurementReactivePower : public ReadAttribute {
+class ReadWiFiNetworkDiagnosticsChannelNumber : public ReadAttribute {
 public:
-    ReadElectricalMeasurementReactivePower()
-        : ReadAttribute("reactive-power")
+    ReadWiFiNetworkDiagnosticsChannelNumber()
+        : ReadAttribute("channel-number")
     {
     }
 
-    ~ReadElectricalMeasurementReactivePower() {}
+    ~ReadWiFiNetworkDiagnosticsChannelNumber() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000050E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeReactivePowerWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.ReactivePower response %@", [value description]);
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeChannelNumberWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WiFiNetworkDiagnostics.ChannelNumber response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement ReactivePower read Error", error);
+                LogNSError("WiFiNetworkDiagnostics ChannelNumber read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -28182,34 +27397,34 @@ class ReadElectricalMeasurementReactivePower : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementReactivePower : public SubscribeAttribute {
+class SubscribeAttributeWiFiNetworkDiagnosticsChannelNumber : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementReactivePower()
-        : SubscribeAttribute("reactive-power")
+    SubscribeAttributeWiFiNetworkDiagnosticsChannelNumber()
+        : SubscribeAttribute("channel-number")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementReactivePower() {}
+    ~SubscribeAttributeWiFiNetworkDiagnosticsChannelNumber() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000050E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeReactivePowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeChannelNumberWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.ReactivePower response %@", [value description]);
+                NSLog(@"WiFiNetworkDiagnostics.ChannelNumber response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -28220,29 +27435,29 @@ class SubscribeAttributeElectricalMeasurementReactivePower : public SubscribeAtt
 };
 
 /*
- * Attribute ApparentPower
+ * Attribute Rssi
  */
-class ReadElectricalMeasurementApparentPower : public ReadAttribute {
+class ReadWiFiNetworkDiagnosticsRssi : public ReadAttribute {
 public:
-    ReadElectricalMeasurementApparentPower()
-        : ReadAttribute("apparent-power")
+    ReadWiFiNetworkDiagnosticsRssi()
+        : ReadAttribute("rssi")
     {
     }
 
-    ~ReadElectricalMeasurementApparentPower() {}
+    ~ReadWiFiNetworkDiagnosticsRssi() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000050F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeApparentPowerWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.ApparentPower response %@", [value description]);
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeRssiWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WiFiNetworkDiagnostics.Rssi response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement ApparentPower read Error", error);
+                LogNSError("WiFiNetworkDiagnostics Rssi read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -28250,34 +27465,34 @@ class ReadElectricalMeasurementApparentPower : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementApparentPower : public SubscribeAttribute {
+class SubscribeAttributeWiFiNetworkDiagnosticsRssi : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementApparentPower()
-        : SubscribeAttribute("apparent-power")
+    SubscribeAttributeWiFiNetworkDiagnosticsRssi()
+        : SubscribeAttribute("rssi")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementApparentPower() {}
+    ~SubscribeAttributeWiFiNetworkDiagnosticsRssi() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000050F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeApparentPowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRssiWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.ApparentPower response %@", [value description]);
+                NSLog(@"WiFiNetworkDiagnostics.Rssi response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -28288,29 +27503,29 @@ class SubscribeAttributeElectricalMeasurementApparentPower : public SubscribeAtt
 };
 
 /*
- * Attribute PowerFactor
+ * Attribute BeaconLostCount
  */
-class ReadElectricalMeasurementPowerFactor : public ReadAttribute {
+class ReadWiFiNetworkDiagnosticsBeaconLostCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementPowerFactor()
-        : ReadAttribute("power-factor")
+    ReadWiFiNetworkDiagnosticsBeaconLostCount()
+        : ReadAttribute("beacon-lost-count")
     {
     }
 
-    ~ReadElectricalMeasurementPowerFactor() {}
+    ~ReadWiFiNetworkDiagnosticsBeaconLostCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000510) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributePowerFactorWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.PowerFactor response %@", [value description]);
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeBeaconLostCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WiFiNetworkDiagnostics.BeaconLostCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement PowerFactor read Error", error);
+                LogNSError("WiFiNetworkDiagnostics BeaconLostCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -28318,34 +27533,34 @@ class ReadElectricalMeasurementPowerFactor : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementPowerFactor : public SubscribeAttribute {
+class SubscribeAttributeWiFiNetworkDiagnosticsBeaconLostCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementPowerFactor()
-        : SubscribeAttribute("power-factor")
+    SubscribeAttributeWiFiNetworkDiagnosticsBeaconLostCount()
+        : SubscribeAttribute("beacon-lost-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementPowerFactor() {}
+    ~SubscribeAttributeWiFiNetworkDiagnosticsBeaconLostCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000510) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x00000005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePowerFactorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBeaconLostCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.PowerFactor response %@", [value description]);
+                NSLog(@"WiFiNetworkDiagnostics.BeaconLostCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -28356,30 +27571,29 @@ class SubscribeAttributeElectricalMeasurementPowerFactor : public SubscribeAttri
 };
 
 /*
- * Attribute AverageRmsVoltageMeasurementPeriod
+ * Attribute BeaconRxCount
  */
-class ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriod : public ReadAttribute {
+class ReadWiFiNetworkDiagnosticsBeaconRxCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriod()
-        : ReadAttribute("average-rms-voltage-measurement-period")
+    ReadWiFiNetworkDiagnosticsBeaconRxCount()
+        : ReadAttribute("beacon-rx-count")
     {
     }
 
-    ~ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriod() {}
+    ~ReadWiFiNetworkDiagnosticsBeaconRxCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000511) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x00000006) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeAverageRmsVoltageMeasurementPeriodWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AverageRmsVoltageMeasurementPeriod response %@", [value description]);
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeBeaconRxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WiFiNetworkDiagnostics.BeaconRxCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement AverageRmsVoltageMeasurementPeriod read Error", error);
+                LogNSError("WiFiNetworkDiagnostics BeaconRxCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -28387,76 +27601,102 @@ class ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriod : public ReadA
     }
 };
 
-class WriteElectricalMeasurementAverageRmsVoltageMeasurementPeriod : public WriteAttribute {
+class SubscribeAttributeWiFiNetworkDiagnosticsBeaconRxCount : public SubscribeAttribute {
 public:
-    WriteElectricalMeasurementAverageRmsVoltageMeasurementPeriod()
-        : WriteAttribute("average-rms-voltage-measurement-period")
+    SubscribeAttributeWiFiNetworkDiagnosticsBeaconRxCount()
+        : SubscribeAttribute("beacon-rx-count")
     {
-        AddArgument("attr-name", "average-rms-voltage-measurement-period");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteElectricalMeasurementAverageRmsVoltageMeasurementPeriod() {}
+    ~SubscribeAttributeWiFiNetworkDiagnosticsBeaconRxCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) WriteAttribute (0x00000511) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x00000006) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeBeaconRxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WiFiNetworkDiagnostics.BeaconRxCount response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
-        [cluster writeAttributeAverageRmsVoltageMeasurementPeriodWithValue:value
-                                                                    params:params
-                                                         completionHandler:^(NSError * _Nullable error) {
-                                                             if (error != nil) {
-                                                                 LogNSError("ElectricalMeasurement "
-                                                                            "AverageRmsVoltageMeasurementPeriod write Error",
-                                                                     error);
-                                                             }
-                                                             SetCommandExitStatus(error);
-                                                         }];
         return CHIP_NO_ERROR;
     }
+};
 
-private:
-    uint16_t mValue;
+/*
+ * Attribute PacketMulticastRxCount
+ */
+class ReadWiFiNetworkDiagnosticsPacketMulticastRxCount : public ReadAttribute {
+public:
+    ReadWiFiNetworkDiagnosticsPacketMulticastRxCount()
+        : ReadAttribute("packet-multicast-rx-count")
+    {
+    }
+
+    ~ReadWiFiNetworkDiagnosticsPacketMulticastRxCount() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x00000007) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributePacketMulticastRxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WiFiNetworkDiagnostics.PacketMulticastRxCount response %@", [value description]);
+            if (error != nil) {
+                LogNSError("WiFiNetworkDiagnostics PacketMulticastRxCount read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
 };
 
-class SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriod : public SubscribeAttribute {
+class SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastRxCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriod()
-        : SubscribeAttribute("average-rms-voltage-measurement-period")
+    SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastRxCount()
+        : SubscribeAttribute("packet-multicast-rx-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriod() {}
+    ~SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastRxCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000511) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x00000007) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAverageRmsVoltageMeasurementPeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePacketMulticastRxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AverageRmsVoltageMeasurementPeriod response %@", [value description]);
+                NSLog(@"WiFiNetworkDiagnostics.PacketMulticastRxCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -28467,30 +27707,29 @@ class SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriod
 };
 
 /*
- * Attribute AverageRmsUnderVoltageCounter
+ * Attribute PacketMulticastTxCount
  */
-class ReadElectricalMeasurementAverageRmsUnderVoltageCounter : public ReadAttribute {
+class ReadWiFiNetworkDiagnosticsPacketMulticastTxCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementAverageRmsUnderVoltageCounter()
-        : ReadAttribute("average-rms-under-voltage-counter")
+    ReadWiFiNetworkDiagnosticsPacketMulticastTxCount()
+        : ReadAttribute("packet-multicast-tx-count")
     {
     }
 
-    ~ReadElectricalMeasurementAverageRmsUnderVoltageCounter() {}
+    ~ReadWiFiNetworkDiagnosticsPacketMulticastTxCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000513) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x00000008) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeAverageRmsUnderVoltageCounterWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AverageRmsUnderVoltageCounter response %@", [value description]);
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributePacketMulticastTxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WiFiNetworkDiagnostics.PacketMulticastTxCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement AverageRmsUnderVoltageCounter read Error", error);
+                LogNSError("WiFiNetworkDiagnostics PacketMulticastTxCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -28498,76 +27737,34 @@ class ReadElectricalMeasurementAverageRmsUnderVoltageCounter : public ReadAttrib
     }
 };
 
-class WriteElectricalMeasurementAverageRmsUnderVoltageCounter : public WriteAttribute {
-public:
-    WriteElectricalMeasurementAverageRmsUnderVoltageCounter()
-        : WriteAttribute("average-rms-under-voltage-counter")
-    {
-        AddArgument("attr-name", "average-rms-under-voltage-counter");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteElectricalMeasurementAverageRmsUnderVoltageCounter() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) WriteAttribute (0x00000513) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster
-            writeAttributeAverageRmsUnderVoltageCounterWithValue:value
-                                                          params:params
-                                               completionHandler:^(NSError * _Nullable error) {
-                                                   if (error != nil) {
-                                                       LogNSError("ElectricalMeasurement AverageRmsUnderVoltageCounter write Error",
-                                                           error);
-                                                   }
-                                                   SetCommandExitStatus(error);
-                                               }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounter : public SubscribeAttribute {
+class SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastTxCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounter()
-        : SubscribeAttribute("average-rms-under-voltage-counter")
+    SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastTxCount()
+        : SubscribeAttribute("packet-multicast-tx-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounter() {}
+    ~SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastTxCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000513) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x00000008) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAverageRmsUnderVoltageCounterWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePacketMulticastTxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AverageRmsUnderVoltageCounter response %@", [value description]);
+                NSLog(@"WiFiNetworkDiagnostics.PacketMulticastTxCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -28578,107 +27775,64 @@ class SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounter : pub
 };
 
 /*
- * Attribute RmsExtremeOverVoltagePeriod
+ * Attribute PacketUnicastRxCount
  */
-class ReadElectricalMeasurementRmsExtremeOverVoltagePeriod : public ReadAttribute {
+class ReadWiFiNetworkDiagnosticsPacketUnicastRxCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsExtremeOverVoltagePeriod()
-        : ReadAttribute("rms-extreme-over-voltage-period")
+    ReadWiFiNetworkDiagnosticsPacketUnicastRxCount()
+        : ReadAttribute("packet-unicast-rx-count")
     {
     }
 
-    ~ReadElectricalMeasurementRmsExtremeOverVoltagePeriod() {}
+    ~ReadWiFiNetworkDiagnosticsPacketUnicastRxCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000514) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster
-            readAttributeRmsExtremeOverVoltagePeriodWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsExtremeOverVoltagePeriod response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("ElectricalMeasurement RmsExtremeOverVoltagePeriod read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteElectricalMeasurementRmsExtremeOverVoltagePeriod : public WriteAttribute {
-public:
-    WriteElectricalMeasurementRmsExtremeOverVoltagePeriod()
-        : WriteAttribute("rms-extreme-over-voltage-period")
-    {
-        AddArgument("attr-name", "rms-extreme-over-voltage-period");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteElectricalMeasurementRmsExtremeOverVoltagePeriod() {}
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x00000009) on endpoint %u", endpointId);
 
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) WriteAttribute (0x00000514) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster
-            writeAttributeRmsExtremeOverVoltagePeriodWithValue:value
-                                                        params:params
-                                             completionHandler:^(NSError * _Nullable error) {
-                                                 if (error != nil) {
-                                                     LogNSError(
-                                                         "ElectricalMeasurement RmsExtremeOverVoltagePeriod write Error", error);
-                                                 }
-                                                 SetCommandExitStatus(error);
-                                             }];
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributePacketUnicastRxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WiFiNetworkDiagnostics.PacketUnicastRxCount response %@", [value description]);
+            if (error != nil) {
+                LogNSError("WiFiNetworkDiagnostics PacketUnicastRxCount read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    uint16_t mValue;
 };
 
-class SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriod : public SubscribeAttribute {
+class SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastRxCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriod()
-        : SubscribeAttribute("rms-extreme-over-voltage-period")
+    SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastRxCount()
+        : SubscribeAttribute("packet-unicast-rx-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriod() {}
+    ~SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastRxCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000514) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x00000009) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsExtremeOverVoltagePeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePacketUnicastRxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsExtremeOverVoltagePeriod response %@", [value description]);
+                NSLog(@"WiFiNetworkDiagnostics.PacketUnicastRxCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -28689,30 +27843,29 @@ class SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriod : publi
 };
 
 /*
- * Attribute RmsExtremeUnderVoltagePeriod
+ * Attribute PacketUnicastTxCount
  */
-class ReadElectricalMeasurementRmsExtremeUnderVoltagePeriod : public ReadAttribute {
+class ReadWiFiNetworkDiagnosticsPacketUnicastTxCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsExtremeUnderVoltagePeriod()
-        : ReadAttribute("rms-extreme-under-voltage-period")
+    ReadWiFiNetworkDiagnosticsPacketUnicastTxCount()
+        : ReadAttribute("packet-unicast-tx-count")
     {
     }
 
-    ~ReadElectricalMeasurementRmsExtremeUnderVoltagePeriod() {}
+    ~ReadWiFiNetworkDiagnosticsPacketUnicastTxCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000515) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x0000000A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsExtremeUnderVoltagePeriodWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsExtremeUnderVoltagePeriod response %@", [value description]);
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributePacketUnicastTxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WiFiNetworkDiagnostics.PacketUnicastTxCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsExtremeUnderVoltagePeriod read Error", error);
+                LogNSError("WiFiNetworkDiagnostics PacketUnicastTxCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -28720,76 +27873,34 @@ class ReadElectricalMeasurementRmsExtremeUnderVoltagePeriod : public ReadAttribu
     }
 };
 
-class WriteElectricalMeasurementRmsExtremeUnderVoltagePeriod : public WriteAttribute {
-public:
-    WriteElectricalMeasurementRmsExtremeUnderVoltagePeriod()
-        : WriteAttribute("rms-extreme-under-voltage-period")
-    {
-        AddArgument("attr-name", "rms-extreme-under-voltage-period");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteElectricalMeasurementRmsExtremeUnderVoltagePeriod() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) WriteAttribute (0x00000515) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster
-            writeAttributeRmsExtremeUnderVoltagePeriodWithValue:value
-                                                         params:params
-                                              completionHandler:^(NSError * _Nullable error) {
-                                                  if (error != nil) {
-                                                      LogNSError(
-                                                          "ElectricalMeasurement RmsExtremeUnderVoltagePeriod write Error", error);
-                                                  }
-                                                  SetCommandExitStatus(error);
-                                              }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriod : public SubscribeAttribute {
+class SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastTxCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriod()
-        : SubscribeAttribute("rms-extreme-under-voltage-period")
+    SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastTxCount()
+        : SubscribeAttribute("packet-unicast-tx-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriod() {}
+    ~SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastTxCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000515) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x0000000A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsExtremeUnderVoltagePeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePacketUnicastTxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsExtremeUnderVoltagePeriod response %@", [value description]);
+                NSLog(@"WiFiNetworkDiagnostics.PacketUnicastTxCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -28800,29 +27911,29 @@ class SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriod : publ
 };
 
 /*
- * Attribute RmsVoltageSagPeriod
+ * Attribute CurrentMaxRate
  */
-class ReadElectricalMeasurementRmsVoltageSagPeriod : public ReadAttribute {
+class ReadWiFiNetworkDiagnosticsCurrentMaxRate : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsVoltageSagPeriod()
-        : ReadAttribute("rms-voltage-sag-period")
+    ReadWiFiNetworkDiagnosticsCurrentMaxRate()
+        : ReadAttribute("current-max-rate")
     {
     }
 
-    ~ReadElectricalMeasurementRmsVoltageSagPeriod() {}
+    ~ReadWiFiNetworkDiagnosticsCurrentMaxRate() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000516) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x0000000B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsVoltageSagPeriodWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsVoltageSagPeriod response %@", [value description]);
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeCurrentMaxRateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WiFiNetworkDiagnostics.CurrentMaxRate response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsVoltageSagPeriod read Error", error);
+                LogNSError("WiFiNetworkDiagnostics CurrentMaxRate read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -28830,74 +27941,34 @@ class ReadElectricalMeasurementRmsVoltageSagPeriod : public ReadAttribute {
     }
 };
 
-class WriteElectricalMeasurementRmsVoltageSagPeriod : public WriteAttribute {
-public:
-    WriteElectricalMeasurementRmsVoltageSagPeriod()
-        : WriteAttribute("rms-voltage-sag-period")
-    {
-        AddArgument("attr-name", "rms-voltage-sag-period");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteElectricalMeasurementRmsVoltageSagPeriod() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) WriteAttribute (0x00000516) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeRmsVoltageSagPeriodWithValue:value
-                                                     params:params
-                                          completionHandler:^(NSError * _Nullable error) {
-                                              if (error != nil) {
-                                                  LogNSError("ElectricalMeasurement RmsVoltageSagPeriod write Error", error);
-                                              }
-                                              SetCommandExitStatus(error);
-                                          }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriod : public SubscribeAttribute {
+class SubscribeAttributeWiFiNetworkDiagnosticsCurrentMaxRate : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriod()
-        : SubscribeAttribute("rms-voltage-sag-period")
+    SubscribeAttributeWiFiNetworkDiagnosticsCurrentMaxRate()
+        : SubscribeAttribute("current-max-rate")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriod() {}
+    ~SubscribeAttributeWiFiNetworkDiagnosticsCurrentMaxRate() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000516) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x0000000B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsVoltageSagPeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCurrentMaxRateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsVoltageSagPeriod response %@", [value description]);
+                NSLog(@"WiFiNetworkDiagnostics.CurrentMaxRate response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -28908,29 +27979,29 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriod : public Subscr
 };
 
 /*
- * Attribute RmsVoltageSwellPeriod
+ * Attribute OverrunCount
  */
-class ReadElectricalMeasurementRmsVoltageSwellPeriod : public ReadAttribute {
+class ReadWiFiNetworkDiagnosticsOverrunCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsVoltageSwellPeriod()
-        : ReadAttribute("rms-voltage-swell-period")
+    ReadWiFiNetworkDiagnosticsOverrunCount()
+        : ReadAttribute("overrun-count")
     {
     }
 
-    ~ReadElectricalMeasurementRmsVoltageSwellPeriod() {}
+    ~ReadWiFiNetworkDiagnosticsOverrunCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000517) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x0000000C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsVoltageSwellPeriodWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsVoltageSwellPeriod response %@", [value description]);
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeOverrunCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WiFiNetworkDiagnostics.OverrunCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsVoltageSwellPeriod read Error", error);
+                LogNSError("WiFiNetworkDiagnostics OverrunCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -28938,74 +28009,34 @@ class ReadElectricalMeasurementRmsVoltageSwellPeriod : public ReadAttribute {
     }
 };
 
-class WriteElectricalMeasurementRmsVoltageSwellPeriod : public WriteAttribute {
-public:
-    WriteElectricalMeasurementRmsVoltageSwellPeriod()
-        : WriteAttribute("rms-voltage-swell-period")
-    {
-        AddArgument("attr-name", "rms-voltage-swell-period");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteElectricalMeasurementRmsVoltageSwellPeriod() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) WriteAttribute (0x00000517) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeRmsVoltageSwellPeriodWithValue:value
-                                                       params:params
-                                            completionHandler:^(NSError * _Nullable error) {
-                                                if (error != nil) {
-                                                    LogNSError("ElectricalMeasurement RmsVoltageSwellPeriod write Error", error);
-                                                }
-                                                SetCommandExitStatus(error);
-                                            }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriod : public SubscribeAttribute {
+class SubscribeAttributeWiFiNetworkDiagnosticsOverrunCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriod()
-        : SubscribeAttribute("rms-voltage-swell-period")
+    SubscribeAttributeWiFiNetworkDiagnosticsOverrunCount()
+        : SubscribeAttribute("overrun-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriod() {}
+    ~SubscribeAttributeWiFiNetworkDiagnosticsOverrunCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000517) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x0000000C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsVoltageSwellPeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOverrunCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsVoltageSwellPeriod response %@", [value description]);
+                NSLog(@"WiFiNetworkDiagnostics.OverrunCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -29016,29 +28047,29 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriod : public Subs
 };
 
 /*
- * Attribute AcVoltageMultiplier
+ * Attribute GeneratedCommandList
  */
-class ReadElectricalMeasurementAcVoltageMultiplier : public ReadAttribute {
+class ReadWiFiNetworkDiagnosticsGeneratedCommandList : public ReadAttribute {
 public:
-    ReadElectricalMeasurementAcVoltageMultiplier()
-        : ReadAttribute("ac-voltage-multiplier")
+    ReadWiFiNetworkDiagnosticsGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadElectricalMeasurementAcVoltageMultiplier() {}
+    ~ReadWiFiNetworkDiagnosticsGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000600) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeAcVoltageMultiplierWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AcVoltageMultiplier response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ElectricalMeasurement AcVoltageMultiplier read Error", error);
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WiFiNetworkDiagnostics.GeneratedCommandList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("WiFiNetworkDiagnostics GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -29046,34 +28077,34 @@ class ReadElectricalMeasurementAcVoltageMultiplier : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementAcVoltageMultiplier : public SubscribeAttribute {
+class SubscribeAttributeWiFiNetworkDiagnosticsGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAcVoltageMultiplier()
-        : SubscribeAttribute("ac-voltage-multiplier")
+    SubscribeAttributeWiFiNetworkDiagnosticsGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAcVoltageMultiplier() {}
+    ~SubscribeAttributeWiFiNetworkDiagnosticsGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000600) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcVoltageMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AcVoltageMultiplier response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WiFiNetworkDiagnostics.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -29084,29 +28115,29 @@ class SubscribeAttributeElectricalMeasurementAcVoltageMultiplier : public Subscr
 };
 
 /*
- * Attribute AcVoltageDivisor
+ * Attribute AcceptedCommandList
  */
-class ReadElectricalMeasurementAcVoltageDivisor : public ReadAttribute {
+class ReadWiFiNetworkDiagnosticsAcceptedCommandList : public ReadAttribute {
 public:
-    ReadElectricalMeasurementAcVoltageDivisor()
-        : ReadAttribute("ac-voltage-divisor")
+    ReadWiFiNetworkDiagnosticsAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadElectricalMeasurementAcVoltageDivisor() {}
+    ~ReadWiFiNetworkDiagnosticsAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000601) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeAcVoltageDivisorWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AcVoltageDivisor response %@", [value description]);
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WiFiNetworkDiagnostics.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement AcVoltageDivisor read Error", error);
+                LogNSError("WiFiNetworkDiagnostics AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -29114,34 +28145,34 @@ class ReadElectricalMeasurementAcVoltageDivisor : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementAcVoltageDivisor : public SubscribeAttribute {
+class SubscribeAttributeWiFiNetworkDiagnosticsAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAcVoltageDivisor()
-        : SubscribeAttribute("ac-voltage-divisor")
+    SubscribeAttributeWiFiNetworkDiagnosticsAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAcVoltageDivisor() {}
+    ~SubscribeAttributeWiFiNetworkDiagnosticsAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000601) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcVoltageDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AcVoltageDivisor response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WiFiNetworkDiagnostics.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -29152,29 +28183,29 @@ class SubscribeAttributeElectricalMeasurementAcVoltageDivisor : public Subscribe
 };
 
 /*
- * Attribute AcCurrentMultiplier
+ * Attribute AttributeList
  */
-class ReadElectricalMeasurementAcCurrentMultiplier : public ReadAttribute {
+class ReadWiFiNetworkDiagnosticsAttributeList : public ReadAttribute {
 public:
-    ReadElectricalMeasurementAcCurrentMultiplier()
-        : ReadAttribute("ac-current-multiplier")
+    ReadWiFiNetworkDiagnosticsAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadElectricalMeasurementAcCurrentMultiplier() {}
+    ~ReadWiFiNetworkDiagnosticsAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000602) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeAcCurrentMultiplierWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AcCurrentMultiplier response %@", [value description]);
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WiFiNetworkDiagnostics.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement AcCurrentMultiplier read Error", error);
+                LogNSError("WiFiNetworkDiagnostics AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -29182,34 +28213,34 @@ class ReadElectricalMeasurementAcCurrentMultiplier : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementAcCurrentMultiplier : public SubscribeAttribute {
+class SubscribeAttributeWiFiNetworkDiagnosticsAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAcCurrentMultiplier()
-        : SubscribeAttribute("ac-current-multiplier")
+    SubscribeAttributeWiFiNetworkDiagnosticsAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAcCurrentMultiplier() {}
+    ~SubscribeAttributeWiFiNetworkDiagnosticsAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000602) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcCurrentMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AcCurrentMultiplier response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WiFiNetworkDiagnostics.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -29220,29 +28251,29 @@ class SubscribeAttributeElectricalMeasurementAcCurrentMultiplier : public Subscr
 };
 
 /*
- * Attribute AcCurrentDivisor
+ * Attribute FeatureMap
  */
-class ReadElectricalMeasurementAcCurrentDivisor : public ReadAttribute {
+class ReadWiFiNetworkDiagnosticsFeatureMap : public ReadAttribute {
 public:
-    ReadElectricalMeasurementAcCurrentDivisor()
-        : ReadAttribute("ac-current-divisor")
+    ReadWiFiNetworkDiagnosticsFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadElectricalMeasurementAcCurrentDivisor() {}
+    ~ReadWiFiNetworkDiagnosticsFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000603) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeAcCurrentDivisorWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AcCurrentDivisor response %@", [value description]);
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WiFiNetworkDiagnostics.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement AcCurrentDivisor read Error", error);
+                LogNSError("WiFiNetworkDiagnostics FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -29250,34 +28281,34 @@ class ReadElectricalMeasurementAcCurrentDivisor : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementAcCurrentDivisor : public SubscribeAttribute {
+class SubscribeAttributeWiFiNetworkDiagnosticsFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAcCurrentDivisor()
-        : SubscribeAttribute("ac-current-divisor")
+    SubscribeAttributeWiFiNetworkDiagnosticsFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAcCurrentDivisor() {}
+    ~SubscribeAttributeWiFiNetworkDiagnosticsFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000603) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcCurrentDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AcCurrentDivisor response %@", [value description]);
+                NSLog(@"WiFiNetworkDiagnostics.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -29288,29 +28319,29 @@ class SubscribeAttributeElectricalMeasurementAcCurrentDivisor : public Subscribe
 };
 
 /*
- * Attribute AcPowerMultiplier
+ * Attribute ClusterRevision
  */
-class ReadElectricalMeasurementAcPowerMultiplier : public ReadAttribute {
+class ReadWiFiNetworkDiagnosticsClusterRevision : public ReadAttribute {
 public:
-    ReadElectricalMeasurementAcPowerMultiplier()
-        : ReadAttribute("ac-power-multiplier")
+    ReadWiFiNetworkDiagnosticsClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadElectricalMeasurementAcPowerMultiplier() {}
+    ~ReadWiFiNetworkDiagnosticsClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000604) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeAcPowerMultiplierWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AcPowerMultiplier response %@", [value description]);
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WiFiNetworkDiagnostics.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement AcPowerMultiplier read Error", error);
+                LogNSError("WiFiNetworkDiagnostics ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -29318,34 +28349,34 @@ class ReadElectricalMeasurementAcPowerMultiplier : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementAcPowerMultiplier : public SubscribeAttribute {
+class SubscribeAttributeWiFiNetworkDiagnosticsClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAcPowerMultiplier()
-        : SubscribeAttribute("ac-power-multiplier")
+    SubscribeAttributeWiFiNetworkDiagnosticsClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAcPowerMultiplier() {}
+    ~SubscribeAttributeWiFiNetworkDiagnosticsClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000604) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcPowerMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AcPowerMultiplier response %@", [value description]);
+                NSLog(@"WiFiNetworkDiagnostics.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -29355,30 +28386,98 @@ class SubscribeAttributeElectricalMeasurementAcPowerMultiplier : public Subscrib
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster EthernetNetworkDiagnostics                                  | 0x0037 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * ResetCounts                                                       |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * PHYRate                                                           | 0x0000 |
+| * FullDuplex                                                        | 0x0001 |
+| * PacketRxCount                                                     | 0x0002 |
+| * PacketTxCount                                                     | 0x0003 |
+| * TxErrCount                                                        | 0x0004 |
+| * CollisionCount                                                    | 0x0005 |
+| * OverrunCount                                                      | 0x0006 |
+| * CarrierDetect                                                     | 0x0007 |
+| * TimeSinceReset                                                    | 0x0008 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute AcPowerDivisor
+ * Command ResetCounts
  */
-class ReadElectricalMeasurementAcPowerDivisor : public ReadAttribute {
+class EthernetNetworkDiagnosticsResetCounts : public ClusterCommand {
 public:
-    ReadElectricalMeasurementAcPowerDivisor()
-        : ReadAttribute("ac-power-divisor")
+    EthernetNetworkDiagnosticsResetCounts()
+        : ClusterCommand("reset-counts")
     {
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadElectricalMeasurementAcPowerDivisor() {}
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) command (0x00000000) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        __auto_type * params = [[CHIPEthernetNetworkDiagnosticsClusterResetCountsParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster resetCountsWithParams:params
+                         completionHandler:^(NSError * _Nullable error) {
+                             responsesNeeded--;
+                             if (error != nil) {
+                                 mError = error;
+                                 LogNSError("Error", error);
+                             }
+                             if (responsesNeeded == 0) {
+                                 SetCommandExitStatus(mError);
+                             }
+                         }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+};
+
+/*
+ * Attribute PHYRate
+ */
+class ReadEthernetNetworkDiagnosticsPHYRate : public ReadAttribute {
+public:
+    ReadEthernetNetworkDiagnosticsPHYRate()
+        : ReadAttribute("phyrate")
+    {
+    }
+
+    ~ReadEthernetNetworkDiagnosticsPHYRate() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000605) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeAcPowerDivisorWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AcPowerDivisor response %@", [value description]);
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        [cluster readAttributePHYRateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EthernetNetworkDiagnostics.PHYRate response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement AcPowerDivisor read Error", error);
+                LogNSError("EthernetNetworkDiagnostics PHYRate read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -29386,34 +28485,34 @@ class ReadElectricalMeasurementAcPowerDivisor : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementAcPowerDivisor : public SubscribeAttribute {
+class SubscribeAttributeEthernetNetworkDiagnosticsPHYRate : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAcPowerDivisor()
-        : SubscribeAttribute("ac-power-divisor")
+    SubscribeAttributeEthernetNetworkDiagnosticsPHYRate()
+        : SubscribeAttribute("phyrate")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAcPowerDivisor() {}
+    ~SubscribeAttributeEthernetNetworkDiagnosticsPHYRate() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000605) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcPowerDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePHYRateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AcPowerDivisor response %@", [value description]);
+                NSLog(@"EthernetNetworkDiagnostics.PHYRate response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -29424,29 +28523,29 @@ class SubscribeAttributeElectricalMeasurementAcPowerDivisor : public SubscribeAt
 };
 
 /*
- * Attribute OverloadAlarmsMask
+ * Attribute FullDuplex
  */
-class ReadElectricalMeasurementOverloadAlarmsMask : public ReadAttribute {
+class ReadEthernetNetworkDiagnosticsFullDuplex : public ReadAttribute {
 public:
-    ReadElectricalMeasurementOverloadAlarmsMask()
-        : ReadAttribute("overload-alarms-mask")
+    ReadEthernetNetworkDiagnosticsFullDuplex()
+        : ReadAttribute("full-duplex")
     {
     }
 
-    ~ReadElectricalMeasurementOverloadAlarmsMask() {}
+    ~ReadEthernetNetworkDiagnosticsFullDuplex() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000700) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeOverloadAlarmsMaskWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.OverloadAlarmsMask response %@", [value description]);
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        [cluster readAttributeFullDuplexWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EthernetNetworkDiagnostics.FullDuplex response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement OverloadAlarmsMask read Error", error);
+                LogNSError("EthernetNetworkDiagnostics FullDuplex read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -29454,74 +28553,34 @@ class ReadElectricalMeasurementOverloadAlarmsMask : public ReadAttribute {
     }
 };
 
-class WriteElectricalMeasurementOverloadAlarmsMask : public WriteAttribute {
-public:
-    WriteElectricalMeasurementOverloadAlarmsMask()
-        : WriteAttribute("overload-alarms-mask")
-    {
-        AddArgument("attr-name", "overload-alarms-mask");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteElectricalMeasurementOverloadAlarmsMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) WriteAttribute (0x00000700) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeOverloadAlarmsMaskWithValue:value
-                                                    params:params
-                                         completionHandler:^(NSError * _Nullable error) {
-                                             if (error != nil) {
-                                                 LogNSError("ElectricalMeasurement OverloadAlarmsMask write Error", error);
-                                             }
-                                             SetCommandExitStatus(error);
-                                         }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeElectricalMeasurementOverloadAlarmsMask : public SubscribeAttribute {
+class SubscribeAttributeEthernetNetworkDiagnosticsFullDuplex : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementOverloadAlarmsMask()
-        : SubscribeAttribute("overload-alarms-mask")
+    SubscribeAttributeEthernetNetworkDiagnosticsFullDuplex()
+        : SubscribeAttribute("full-duplex")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementOverloadAlarmsMask() {}
+    ~SubscribeAttributeEthernetNetworkDiagnosticsFullDuplex() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000700) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOverloadAlarmsMaskWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFullDuplexWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.OverloadAlarmsMask response %@", [value description]);
+                NSLog(@"EthernetNetworkDiagnostics.FullDuplex response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -29532,29 +28591,29 @@ class SubscribeAttributeElectricalMeasurementOverloadAlarmsMask : public Subscri
 };
 
 /*
- * Attribute VoltageOverload
+ * Attribute PacketRxCount
  */
-class ReadElectricalMeasurementVoltageOverload : public ReadAttribute {
+class ReadEthernetNetworkDiagnosticsPacketRxCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementVoltageOverload()
-        : ReadAttribute("voltage-overload")
+    ReadEthernetNetworkDiagnosticsPacketRxCount()
+        : ReadAttribute("packet-rx-count")
     {
     }
 
-    ~ReadElectricalMeasurementVoltageOverload() {}
+    ~ReadEthernetNetworkDiagnosticsPacketRxCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000701) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeVoltageOverloadWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.VoltageOverload response %@", [value description]);
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        [cluster readAttributePacketRxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EthernetNetworkDiagnostics.PacketRxCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement VoltageOverload read Error", error);
+                LogNSError("EthernetNetworkDiagnostics PacketRxCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -29562,34 +28621,34 @@ class ReadElectricalMeasurementVoltageOverload : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementVoltageOverload : public SubscribeAttribute {
+class SubscribeAttributeEthernetNetworkDiagnosticsPacketRxCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementVoltageOverload()
-        : SubscribeAttribute("voltage-overload")
+    SubscribeAttributeEthernetNetworkDiagnosticsPacketRxCount()
+        : SubscribeAttribute("packet-rx-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementVoltageOverload() {}
+    ~SubscribeAttributeEthernetNetworkDiagnosticsPacketRxCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000701) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeVoltageOverloadWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePacketRxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.VoltageOverload response %@", [value description]);
+                NSLog(@"EthernetNetworkDiagnostics.PacketRxCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -29600,29 +28659,29 @@ class SubscribeAttributeElectricalMeasurementVoltageOverload : public SubscribeA
 };
 
 /*
- * Attribute CurrentOverload
+ * Attribute PacketTxCount
  */
-class ReadElectricalMeasurementCurrentOverload : public ReadAttribute {
+class ReadEthernetNetworkDiagnosticsPacketTxCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementCurrentOverload()
-        : ReadAttribute("current-overload")
+    ReadEthernetNetworkDiagnosticsPacketTxCount()
+        : ReadAttribute("packet-tx-count")
     {
     }
 
-    ~ReadElectricalMeasurementCurrentOverload() {}
+    ~ReadEthernetNetworkDiagnosticsPacketTxCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000702) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeCurrentOverloadWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.CurrentOverload response %@", [value description]);
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        [cluster readAttributePacketTxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EthernetNetworkDiagnostics.PacketTxCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement CurrentOverload read Error", error);
+                LogNSError("EthernetNetworkDiagnostics PacketTxCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -29630,34 +28689,34 @@ class ReadElectricalMeasurementCurrentOverload : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementCurrentOverload : public SubscribeAttribute {
+class SubscribeAttributeEthernetNetworkDiagnosticsPacketTxCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementCurrentOverload()
-        : SubscribeAttribute("current-overload")
+    SubscribeAttributeEthernetNetworkDiagnosticsPacketTxCount()
+        : SubscribeAttribute("packet-tx-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementCurrentOverload() {}
+    ~SubscribeAttributeEthernetNetworkDiagnosticsPacketTxCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000702) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentOverloadWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePacketTxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.CurrentOverload response %@", [value description]);
+                NSLog(@"EthernetNetworkDiagnostics.PacketTxCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -29668,29 +28727,29 @@ class SubscribeAttributeElectricalMeasurementCurrentOverload : public SubscribeA
 };
 
 /*
- * Attribute AcOverloadAlarmsMask
+ * Attribute TxErrCount
  */
-class ReadElectricalMeasurementAcOverloadAlarmsMask : public ReadAttribute {
+class ReadEthernetNetworkDiagnosticsTxErrCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementAcOverloadAlarmsMask()
-        : ReadAttribute("ac-overload-alarms-mask")
+    ReadEthernetNetworkDiagnosticsTxErrCount()
+        : ReadAttribute("tx-err-count")
     {
     }
 
-    ~ReadElectricalMeasurementAcOverloadAlarmsMask() {}
+    ~ReadEthernetNetworkDiagnosticsTxErrCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000800) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeAcOverloadAlarmsMaskWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AcOverloadAlarmsMask response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ElectricalMeasurement AcOverloadAlarmsMask read Error", error);
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        [cluster readAttributeTxErrCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EthernetNetworkDiagnostics.TxErrCount response %@", [value description]);
+            if (error != nil) {
+                LogNSError("EthernetNetworkDiagnostics TxErrCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -29698,74 +28757,34 @@ class ReadElectricalMeasurementAcOverloadAlarmsMask : public ReadAttribute {
     }
 };
 
-class WriteElectricalMeasurementAcOverloadAlarmsMask : public WriteAttribute {
-public:
-    WriteElectricalMeasurementAcOverloadAlarmsMask()
-        : WriteAttribute("ac-overload-alarms-mask")
-    {
-        AddArgument("attr-name", "ac-overload-alarms-mask");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteElectricalMeasurementAcOverloadAlarmsMask() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) WriteAttribute (0x00000800) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeAcOverloadAlarmsMaskWithValue:value
-                                                      params:params
-                                           completionHandler:^(NSError * _Nullable error) {
-                                               if (error != nil) {
-                                                   LogNSError("ElectricalMeasurement AcOverloadAlarmsMask write Error", error);
-                                               }
-                                               SetCommandExitStatus(error);
-                                           }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeElectricalMeasurementAcOverloadAlarmsMask : public SubscribeAttribute {
+class SubscribeAttributeEthernetNetworkDiagnosticsTxErrCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAcOverloadAlarmsMask()
-        : SubscribeAttribute("ac-overload-alarms-mask")
+    SubscribeAttributeEthernetNetworkDiagnosticsTxErrCount()
+        : SubscribeAttribute("tx-err-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAcOverloadAlarmsMask() {}
+    ~SubscribeAttributeEthernetNetworkDiagnosticsTxErrCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000800) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcOverloadAlarmsMaskWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTxErrCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AcOverloadAlarmsMask response %@", [value description]);
+                NSLog(@"EthernetNetworkDiagnostics.TxErrCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -29776,29 +28795,29 @@ class SubscribeAttributeElectricalMeasurementAcOverloadAlarmsMask : public Subsc
 };
 
 /*
- * Attribute AcVoltageOverload
+ * Attribute CollisionCount
  */
-class ReadElectricalMeasurementAcVoltageOverload : public ReadAttribute {
+class ReadEthernetNetworkDiagnosticsCollisionCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementAcVoltageOverload()
-        : ReadAttribute("ac-voltage-overload")
+    ReadEthernetNetworkDiagnosticsCollisionCount()
+        : ReadAttribute("collision-count")
     {
     }
 
-    ~ReadElectricalMeasurementAcVoltageOverload() {}
+    ~ReadEthernetNetworkDiagnosticsCollisionCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000801) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeAcVoltageOverloadWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AcVoltageOverload response %@", [value description]);
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        [cluster readAttributeCollisionCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EthernetNetworkDiagnostics.CollisionCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement AcVoltageOverload read Error", error);
+                LogNSError("EthernetNetworkDiagnostics CollisionCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -29806,34 +28825,34 @@ class ReadElectricalMeasurementAcVoltageOverload : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementAcVoltageOverload : public SubscribeAttribute {
+class SubscribeAttributeEthernetNetworkDiagnosticsCollisionCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAcVoltageOverload()
-        : SubscribeAttribute("ac-voltage-overload")
+    SubscribeAttributeEthernetNetworkDiagnosticsCollisionCount()
+        : SubscribeAttribute("collision-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAcVoltageOverload() {}
+    ~SubscribeAttributeEthernetNetworkDiagnosticsCollisionCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000801) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x00000005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcVoltageOverloadWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCollisionCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AcVoltageOverload response %@", [value description]);
+                NSLog(@"EthernetNetworkDiagnostics.CollisionCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -29844,29 +28863,29 @@ class SubscribeAttributeElectricalMeasurementAcVoltageOverload : public Subscrib
 };
 
 /*
- * Attribute AcCurrentOverload
+ * Attribute OverrunCount
  */
-class ReadElectricalMeasurementAcCurrentOverload : public ReadAttribute {
+class ReadEthernetNetworkDiagnosticsOverrunCount : public ReadAttribute {
 public:
-    ReadElectricalMeasurementAcCurrentOverload()
-        : ReadAttribute("ac-current-overload")
+    ReadEthernetNetworkDiagnosticsOverrunCount()
+        : ReadAttribute("overrun-count")
     {
     }
 
-    ~ReadElectricalMeasurementAcCurrentOverload() {}
+    ~ReadEthernetNetworkDiagnosticsOverrunCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000802) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x00000006) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeAcCurrentOverloadWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AcCurrentOverload response %@", [value description]);
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        [cluster readAttributeOverrunCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EthernetNetworkDiagnostics.OverrunCount response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement AcCurrentOverload read Error", error);
+                LogNSError("EthernetNetworkDiagnostics OverrunCount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -29874,34 +28893,34 @@ class ReadElectricalMeasurementAcCurrentOverload : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementAcCurrentOverload : public SubscribeAttribute {
+class SubscribeAttributeEthernetNetworkDiagnosticsOverrunCount : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAcCurrentOverload()
-        : SubscribeAttribute("ac-current-overload")
+    SubscribeAttributeEthernetNetworkDiagnosticsOverrunCount()
+        : SubscribeAttribute("overrun-count")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAcCurrentOverload() {}
+    ~SubscribeAttributeEthernetNetworkDiagnosticsOverrunCount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000802) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x00000006) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcCurrentOverloadWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOverrunCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AcCurrentOverload response %@", [value description]);
+                NSLog(@"EthernetNetworkDiagnostics.OverrunCount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -29912,29 +28931,29 @@ class SubscribeAttributeElectricalMeasurementAcCurrentOverload : public Subscrib
 };
 
 /*
- * Attribute AcActivePowerOverload
+ * Attribute CarrierDetect
  */
-class ReadElectricalMeasurementAcActivePowerOverload : public ReadAttribute {
+class ReadEthernetNetworkDiagnosticsCarrierDetect : public ReadAttribute {
 public:
-    ReadElectricalMeasurementAcActivePowerOverload()
-        : ReadAttribute("ac-active-power-overload")
+    ReadEthernetNetworkDiagnosticsCarrierDetect()
+        : ReadAttribute("carrier-detect")
     {
     }
 
-    ~ReadElectricalMeasurementAcActivePowerOverload() {}
+    ~ReadEthernetNetworkDiagnosticsCarrierDetect() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000803) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x00000007) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeAcActivePowerOverloadWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AcActivePowerOverload response %@", [value description]);
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        [cluster readAttributeCarrierDetectWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EthernetNetworkDiagnostics.CarrierDetect response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement AcActivePowerOverload read Error", error);
+                LogNSError("EthernetNetworkDiagnostics CarrierDetect read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -29942,34 +28961,34 @@ class ReadElectricalMeasurementAcActivePowerOverload : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementAcActivePowerOverload : public SubscribeAttribute {
+class SubscribeAttributeEthernetNetworkDiagnosticsCarrierDetect : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAcActivePowerOverload()
-        : SubscribeAttribute("ac-active-power-overload")
+    SubscribeAttributeEthernetNetworkDiagnosticsCarrierDetect()
+        : SubscribeAttribute("carrier-detect")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAcActivePowerOverload() {}
+    ~SubscribeAttributeEthernetNetworkDiagnosticsCarrierDetect() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000803) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x00000007) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcActivePowerOverloadWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCarrierDetectWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AcActivePowerOverload response %@", [value description]);
+                NSLog(@"EthernetNetworkDiagnostics.CarrierDetect response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -29980,65 +28999,64 @@ class SubscribeAttributeElectricalMeasurementAcActivePowerOverload : public Subs
 };
 
 /*
- * Attribute AcReactivePowerOverload
+ * Attribute TimeSinceReset
  */
-class ReadElectricalMeasurementAcReactivePowerOverload : public ReadAttribute {
+class ReadEthernetNetworkDiagnosticsTimeSinceReset : public ReadAttribute {
 public:
-    ReadElectricalMeasurementAcReactivePowerOverload()
-        : ReadAttribute("ac-reactive-power-overload")
+    ReadEthernetNetworkDiagnosticsTimeSinceReset()
+        : ReadAttribute("time-since-reset")
     {
     }
 
-    ~ReadElectricalMeasurementAcReactivePowerOverload() {}
+    ~ReadEthernetNetworkDiagnosticsTimeSinceReset() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000804) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x00000008) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster
-            readAttributeAcReactivePowerOverloadWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AcReactivePowerOverload response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("ElectricalMeasurement AcReactivePowerOverload read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        [cluster readAttributeTimeSinceResetWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EthernetNetworkDiagnostics.TimeSinceReset response %@", [value description]);
+            if (error != nil) {
+                LogNSError("EthernetNetworkDiagnostics TimeSinceReset read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeElectricalMeasurementAcReactivePowerOverload : public SubscribeAttribute {
+class SubscribeAttributeEthernetNetworkDiagnosticsTimeSinceReset : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAcReactivePowerOverload()
-        : SubscribeAttribute("ac-reactive-power-overload")
+    SubscribeAttributeEthernetNetworkDiagnosticsTimeSinceReset()
+        : SubscribeAttribute("time-since-reset")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAcReactivePowerOverload() {}
+    ~SubscribeAttributeEthernetNetworkDiagnosticsTimeSinceReset() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000804) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x00000008) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcReactivePowerOverloadWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTimeSinceResetWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AcReactivePowerOverload response %@", [value description]);
+                NSLog(@"EthernetNetworkDiagnostics.TimeSinceReset response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -30049,29 +29067,29 @@ class SubscribeAttributeElectricalMeasurementAcReactivePowerOverload : public Su
 };
 
 /*
- * Attribute AverageRmsOverVoltage
+ * Attribute GeneratedCommandList
  */
-class ReadElectricalMeasurementAverageRmsOverVoltage : public ReadAttribute {
+class ReadEthernetNetworkDiagnosticsGeneratedCommandList : public ReadAttribute {
 public:
-    ReadElectricalMeasurementAverageRmsOverVoltage()
-        : ReadAttribute("average-rms-over-voltage")
+    ReadEthernetNetworkDiagnosticsGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadElectricalMeasurementAverageRmsOverVoltage() {}
+    ~ReadEthernetNetworkDiagnosticsGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000805) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeAverageRmsOverVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AverageRmsOverVoltage response %@", [value description]);
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EthernetNetworkDiagnostics.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement AverageRmsOverVoltage read Error", error);
+                LogNSError("EthernetNetworkDiagnostics GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -30079,34 +29097,34 @@ class ReadElectricalMeasurementAverageRmsOverVoltage : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementAverageRmsOverVoltage : public SubscribeAttribute {
+class SubscribeAttributeEthernetNetworkDiagnosticsGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAverageRmsOverVoltage()
-        : SubscribeAttribute("average-rms-over-voltage")
+    SubscribeAttributeEthernetNetworkDiagnosticsGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAverageRmsOverVoltage() {}
+    ~SubscribeAttributeEthernetNetworkDiagnosticsGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000805) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAverageRmsOverVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AverageRmsOverVoltage response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EthernetNetworkDiagnostics.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -30117,29 +29135,29 @@ class SubscribeAttributeElectricalMeasurementAverageRmsOverVoltage : public Subs
 };
 
 /*
- * Attribute AverageRmsUnderVoltage
+ * Attribute AcceptedCommandList
  */
-class ReadElectricalMeasurementAverageRmsUnderVoltage : public ReadAttribute {
+class ReadEthernetNetworkDiagnosticsAcceptedCommandList : public ReadAttribute {
 public:
-    ReadElectricalMeasurementAverageRmsUnderVoltage()
-        : ReadAttribute("average-rms-under-voltage")
+    ReadEthernetNetworkDiagnosticsAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadElectricalMeasurementAverageRmsUnderVoltage() {}
+    ~ReadEthernetNetworkDiagnosticsAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000806) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeAverageRmsUnderVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AverageRmsUnderVoltage response %@", [value description]);
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EthernetNetworkDiagnostics.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement AverageRmsUnderVoltage read Error", error);
+                LogNSError("EthernetNetworkDiagnostics AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -30147,34 +29165,34 @@ class ReadElectricalMeasurementAverageRmsUnderVoltage : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltage : public SubscribeAttribute {
+class SubscribeAttributeEthernetNetworkDiagnosticsAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltage()
-        : SubscribeAttribute("average-rms-under-voltage")
+    SubscribeAttributeEthernetNetworkDiagnosticsAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltage() {}
+    ~SubscribeAttributeEthernetNetworkDiagnosticsAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000806) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAverageRmsUnderVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AverageRmsUnderVoltage response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EthernetNetworkDiagnostics.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -30185,29 +29203,29 @@ class SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltage : public Sub
 };
 
 /*
- * Attribute RmsExtremeOverVoltage
+ * Attribute AttributeList
  */
-class ReadElectricalMeasurementRmsExtremeOverVoltage : public ReadAttribute {
+class ReadEthernetNetworkDiagnosticsAttributeList : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsExtremeOverVoltage()
-        : ReadAttribute("rms-extreme-over-voltage")
+    ReadEthernetNetworkDiagnosticsAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadElectricalMeasurementRmsExtremeOverVoltage() {}
+    ~ReadEthernetNetworkDiagnosticsAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000807) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsExtremeOverVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsExtremeOverVoltage response %@", [value description]);
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EthernetNetworkDiagnostics.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsExtremeOverVoltage read Error", error);
+                LogNSError("EthernetNetworkDiagnostics AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -30215,34 +29233,34 @@ class ReadElectricalMeasurementRmsExtremeOverVoltage : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltage : public SubscribeAttribute {
+class SubscribeAttributeEthernetNetworkDiagnosticsAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltage()
-        : SubscribeAttribute("rms-extreme-over-voltage")
+    SubscribeAttributeEthernetNetworkDiagnosticsAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltage() {}
+    ~SubscribeAttributeEthernetNetworkDiagnosticsAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000807) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsExtremeOverVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsExtremeOverVoltage response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"EthernetNetworkDiagnostics.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -30253,29 +29271,29 @@ class SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltage : public Subs
 };
 
 /*
- * Attribute RmsExtremeUnderVoltage
+ * Attribute FeatureMap
  */
-class ReadElectricalMeasurementRmsExtremeUnderVoltage : public ReadAttribute {
+class ReadEthernetNetworkDiagnosticsFeatureMap : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsExtremeUnderVoltage()
-        : ReadAttribute("rms-extreme-under-voltage")
+    ReadEthernetNetworkDiagnosticsFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadElectricalMeasurementRmsExtremeUnderVoltage() {}
+    ~ReadEthernetNetworkDiagnosticsFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000808) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsExtremeUnderVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsExtremeUnderVoltage response %@", [value description]);
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EthernetNetworkDiagnostics.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsExtremeUnderVoltage read Error", error);
+                LogNSError("EthernetNetworkDiagnostics FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -30283,34 +29301,34 @@ class ReadElectricalMeasurementRmsExtremeUnderVoltage : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltage : public SubscribeAttribute {
+class SubscribeAttributeEthernetNetworkDiagnosticsFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltage()
-        : SubscribeAttribute("rms-extreme-under-voltage")
+    SubscribeAttributeEthernetNetworkDiagnosticsFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltage() {}
+    ~SubscribeAttributeEthernetNetworkDiagnosticsFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000808) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsExtremeUnderVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsExtremeUnderVoltage response %@", [value description]);
+                NSLog(@"EthernetNetworkDiagnostics.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -30321,29 +29339,29 @@ class SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltage : public Sub
 };
 
 /*
- * Attribute RmsVoltageSag
+ * Attribute ClusterRevision
  */
-class ReadElectricalMeasurementRmsVoltageSag : public ReadAttribute {
+class ReadEthernetNetworkDiagnosticsClusterRevision : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsVoltageSag()
-        : ReadAttribute("rms-voltage-sag")
+    ReadEthernetNetworkDiagnosticsClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadElectricalMeasurementRmsVoltageSag() {}
+    ~ReadEthernetNetworkDiagnosticsClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000809) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsVoltageSagWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsVoltageSag response %@", [value description]);
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"EthernetNetworkDiagnostics.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsVoltageSag read Error", error);
+                LogNSError("EthernetNetworkDiagnostics ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -30351,34 +29369,34 @@ class ReadElectricalMeasurementRmsVoltageSag : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsVoltageSag : public SubscribeAttribute {
+class SubscribeAttributeEthernetNetworkDiagnosticsClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsVoltageSag()
-        : SubscribeAttribute("rms-voltage-sag")
+    SubscribeAttributeEthernetNetworkDiagnosticsClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsVoltageSag() {}
+    ~SubscribeAttributeEthernetNetworkDiagnosticsClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000809) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsVoltageSagWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsVoltageSag response %@", [value description]);
+                NSLog(@"EthernetNetworkDiagnostics.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -30388,30 +29406,64 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageSag : public SubscribeAtt
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster BridgedDeviceBasic                                          | 0x0039 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * VendorName                                                        | 0x0001 |
+| * VendorID                                                          | 0x0002 |
+| * ProductName                                                       | 0x0003 |
+| * NodeLabel                                                         | 0x0005 |
+| * HardwareVersion                                                   | 0x0007 |
+| * HardwareVersionString                                             | 0x0008 |
+| * SoftwareVersion                                                   | 0x0009 |
+| * SoftwareVersionString                                             | 0x000A |
+| * ManufacturingDate                                                 | 0x000B |
+| * PartNumber                                                        | 0x000C |
+| * ProductURL                                                        | 0x000D |
+| * ProductLabel                                                      | 0x000E |
+| * SerialNumber                                                      | 0x000F |
+| * Reachable                                                         | 0x0011 |
+| * UniqueID                                                          | 0x0012 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * StartUp                                                           | 0x0000 |
+| * ShutDown                                                          | 0x0001 |
+| * Leave                                                             | 0x0002 |
+| * ReachableChanged                                                  | 0x0003 |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute RmsVoltageSwell
+ * Attribute VendorName
  */
-class ReadElectricalMeasurementRmsVoltageSwell : public ReadAttribute {
+class ReadBridgedDeviceBasicVendorName : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsVoltageSwell()
-        : ReadAttribute("rms-voltage-swell")
+    ReadBridgedDeviceBasicVendorName()
+        : ReadAttribute("vendor-name")
     {
     }
 
-    ~ReadElectricalMeasurementRmsVoltageSwell() {}
+    ~ReadBridgedDeviceBasicVendorName() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000080A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsVoltageSwellWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsVoltageSwell response %@", [value description]);
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeVendorNameWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BridgedDeviceBasic.VendorName response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsVoltageSwell read Error", error);
+                LogNSError("BridgedDeviceBasic VendorName read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -30419,34 +29471,34 @@ class ReadElectricalMeasurementRmsVoltageSwell : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsVoltageSwell : public SubscribeAttribute {
+class SubscribeAttributeBridgedDeviceBasicVendorName : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsVoltageSwell()
-        : SubscribeAttribute("rms-voltage-swell")
+    SubscribeAttributeBridgedDeviceBasicVendorName()
+        : SubscribeAttribute("vendor-name")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsVoltageSwell() {}
+    ~SubscribeAttributeBridgedDeviceBasicVendorName() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000080A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsVoltageSwellWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeVendorNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsVoltageSwell response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.VendorName response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -30457,29 +29509,29 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageSwell : public SubscribeA
 };
 
 /*
- * Attribute LineCurrentPhaseB
+ * Attribute VendorID
  */
-class ReadElectricalMeasurementLineCurrentPhaseB : public ReadAttribute {
+class ReadBridgedDeviceBasicVendorID : public ReadAttribute {
 public:
-    ReadElectricalMeasurementLineCurrentPhaseB()
-        : ReadAttribute("line-current-phase-b")
+    ReadBridgedDeviceBasicVendorID()
+        : ReadAttribute("vendor-id")
     {
     }
 
-    ~ReadElectricalMeasurementLineCurrentPhaseB() {}
+    ~ReadBridgedDeviceBasicVendorID() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000901) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeLineCurrentPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.LineCurrentPhaseB response %@", [value description]);
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeVendorIDWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BridgedDeviceBasic.VendorID response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement LineCurrentPhaseB read Error", error);
+                LogNSError("BridgedDeviceBasic VendorID read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -30487,34 +29539,34 @@ class ReadElectricalMeasurementLineCurrentPhaseB : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementLineCurrentPhaseB : public SubscribeAttribute {
+class SubscribeAttributeBridgedDeviceBasicVendorID : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementLineCurrentPhaseB()
-        : SubscribeAttribute("line-current-phase-b")
+    SubscribeAttributeBridgedDeviceBasicVendorID()
+        : SubscribeAttribute("vendor-id")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementLineCurrentPhaseB() {}
+    ~SubscribeAttributeBridgedDeviceBasicVendorID() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000901) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLineCurrentPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeVendorIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.LineCurrentPhaseB response %@", [value description]);
+                NSLog(@"BridgedDeviceBasic.VendorID response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -30525,29 +29577,29 @@ class SubscribeAttributeElectricalMeasurementLineCurrentPhaseB : public Subscrib
 };
 
 /*
- * Attribute ActiveCurrentPhaseB
+ * Attribute ProductName
  */
-class ReadElectricalMeasurementActiveCurrentPhaseB : public ReadAttribute {
+class ReadBridgedDeviceBasicProductName : public ReadAttribute {
 public:
-    ReadElectricalMeasurementActiveCurrentPhaseB()
-        : ReadAttribute("active-current-phase-b")
+    ReadBridgedDeviceBasicProductName()
+        : ReadAttribute("product-name")
     {
     }
 
-    ~ReadElectricalMeasurementActiveCurrentPhaseB() {}
+    ~ReadBridgedDeviceBasicProductName() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000902) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeActiveCurrentPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.ActiveCurrentPhaseB response %@", [value description]);
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeProductNameWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BridgedDeviceBasic.ProductName response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement ActiveCurrentPhaseB read Error", error);
+                LogNSError("BridgedDeviceBasic ProductName read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -30555,34 +29607,34 @@ class ReadElectricalMeasurementActiveCurrentPhaseB : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementActiveCurrentPhaseB : public SubscribeAttribute {
+class SubscribeAttributeBridgedDeviceBasicProductName : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementActiveCurrentPhaseB()
-        : SubscribeAttribute("active-current-phase-b")
+    SubscribeAttributeBridgedDeviceBasicProductName()
+        : SubscribeAttribute("product-name")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementActiveCurrentPhaseB() {}
+    ~SubscribeAttributeBridgedDeviceBasicProductName() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000902) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeActiveCurrentPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeProductNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.ActiveCurrentPhaseB response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.ProductName response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -30593,29 +29645,29 @@ class SubscribeAttributeElectricalMeasurementActiveCurrentPhaseB : public Subscr
 };
 
 /*
- * Attribute ReactiveCurrentPhaseB
+ * Attribute NodeLabel
  */
-class ReadElectricalMeasurementReactiveCurrentPhaseB : public ReadAttribute {
+class ReadBridgedDeviceBasicNodeLabel : public ReadAttribute {
 public:
-    ReadElectricalMeasurementReactiveCurrentPhaseB()
-        : ReadAttribute("reactive-current-phase-b")
+    ReadBridgedDeviceBasicNodeLabel()
+        : ReadAttribute("node-label")
     {
     }
 
-    ~ReadElectricalMeasurementReactiveCurrentPhaseB() {}
+    ~ReadBridgedDeviceBasicNodeLabel() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000903) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeReactiveCurrentPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.ReactiveCurrentPhaseB response %@", [value description]);
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeNodeLabelWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BridgedDeviceBasic.NodeLabel response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement ReactiveCurrentPhaseB read Error", error);
+                LogNSError("BridgedDeviceBasic NodeLabel read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -30623,34 +29675,76 @@ class ReadElectricalMeasurementReactiveCurrentPhaseB : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementReactiveCurrentPhaseB : public SubscribeAttribute {
+class WriteBridgedDeviceBasicNodeLabel : public WriteAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementReactiveCurrentPhaseB()
-        : SubscribeAttribute("reactive-current-phase-b")
+    WriteBridgedDeviceBasicNodeLabel()
+        : WriteAttribute("node-label")
     {
+        AddArgument("attr-name", "node-label");
+        AddArgument("attr-value", &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeElectricalMeasurementReactiveCurrentPhaseB() {}
+    ~WriteBridgedDeviceBasicNodeLabel() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000903) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) WriteAttribute (0x00000005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSString * _Nonnull value = [[NSString alloc] initWithBytes:mValue.data()
+                                                             length:mValue.size()
+                                                           encoding:NSUTF8StringEncoding];
+
+        [cluster writeAttributeNodeLabelWithValue:value
+                                           params:params
+                                completionHandler:^(NSError * _Nullable error) {
+                                    if (error != nil) {
+                                        LogNSError("BridgedDeviceBasic NodeLabel write Error", error);
+                                    }
+                                    SetCommandExitStatus(error);
+                                }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::ByteSpan mValue;
+};
+
+class SubscribeAttributeBridgedDeviceBasicNodeLabel : public SubscribeAttribute {
+public:
+    SubscribeAttributeBridgedDeviceBasicNodeLabel()
+        : SubscribeAttribute("node-label")
+    {
+    }
+
+    ~SubscribeAttributeBridgedDeviceBasicNodeLabel() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeReactiveCurrentPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNodeLabelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.ReactiveCurrentPhaseB response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.NodeLabel response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -30661,29 +29755,29 @@ class SubscribeAttributeElectricalMeasurementReactiveCurrentPhaseB : public Subs
 };
 
 /*
- * Attribute RmsVoltagePhaseB
+ * Attribute HardwareVersion
  */
-class ReadElectricalMeasurementRmsVoltagePhaseB : public ReadAttribute {
+class ReadBridgedDeviceBasicHardwareVersion : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsVoltagePhaseB()
-        : ReadAttribute("rms-voltage-phase-b")
+    ReadBridgedDeviceBasicHardwareVersion()
+        : ReadAttribute("hardware-version")
     {
     }
 
-    ~ReadElectricalMeasurementRmsVoltagePhaseB() {}
+    ~ReadBridgedDeviceBasicHardwareVersion() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000905) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000007) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsVoltagePhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsVoltagePhaseB response %@", [value description]);
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeHardwareVersionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BridgedDeviceBasic.HardwareVersion response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsVoltagePhaseB read Error", error);
+                LogNSError("BridgedDeviceBasic HardwareVersion read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -30691,34 +29785,34 @@ class ReadElectricalMeasurementRmsVoltagePhaseB : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsVoltagePhaseB : public SubscribeAttribute {
+class SubscribeAttributeBridgedDeviceBasicHardwareVersion : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsVoltagePhaseB()
-        : SubscribeAttribute("rms-voltage-phase-b")
+    SubscribeAttributeBridgedDeviceBasicHardwareVersion()
+        : SubscribeAttribute("hardware-version")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsVoltagePhaseB() {}
+    ~SubscribeAttributeBridgedDeviceBasicHardwareVersion() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000905) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000007) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsVoltagePhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeHardwareVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsVoltagePhaseB response %@", [value description]);
+                NSLog(@"BridgedDeviceBasic.HardwareVersion response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -30729,29 +29823,29 @@ class SubscribeAttributeElectricalMeasurementRmsVoltagePhaseB : public Subscribe
 };
 
 /*
- * Attribute RmsVoltageMinPhaseB
+ * Attribute HardwareVersionString
  */
-class ReadElectricalMeasurementRmsVoltageMinPhaseB : public ReadAttribute {
+class ReadBridgedDeviceBasicHardwareVersionString : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsVoltageMinPhaseB()
-        : ReadAttribute("rms-voltage-min-phase-b")
+    ReadBridgedDeviceBasicHardwareVersionString()
+        : ReadAttribute("hardware-version-string")
     {
     }
 
-    ~ReadElectricalMeasurementRmsVoltageMinPhaseB() {}
+    ~ReadBridgedDeviceBasicHardwareVersionString() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000906) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000008) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsVoltageMinPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsVoltageMinPhaseB response %@", [value description]);
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeHardwareVersionStringWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BridgedDeviceBasic.HardwareVersionString response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsVoltageMinPhaseB read Error", error);
+                LogNSError("BridgedDeviceBasic HardwareVersionString read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -30759,34 +29853,34 @@ class ReadElectricalMeasurementRmsVoltageMinPhaseB : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsVoltageMinPhaseB : public SubscribeAttribute {
+class SubscribeAttributeBridgedDeviceBasicHardwareVersionString : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsVoltageMinPhaseB()
-        : SubscribeAttribute("rms-voltage-min-phase-b")
+    SubscribeAttributeBridgedDeviceBasicHardwareVersionString()
+        : SubscribeAttribute("hardware-version-string")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsVoltageMinPhaseB() {}
+    ~SubscribeAttributeBridgedDeviceBasicHardwareVersionString() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000906) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000008) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsVoltageMinPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeHardwareVersionStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsVoltageMinPhaseB response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.HardwareVersionString response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -30797,29 +29891,29 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageMinPhaseB : public Subscr
 };
 
 /*
- * Attribute RmsVoltageMaxPhaseB
+ * Attribute SoftwareVersion
  */
-class ReadElectricalMeasurementRmsVoltageMaxPhaseB : public ReadAttribute {
+class ReadBridgedDeviceBasicSoftwareVersion : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsVoltageMaxPhaseB()
-        : ReadAttribute("rms-voltage-max-phase-b")
+    ReadBridgedDeviceBasicSoftwareVersion()
+        : ReadAttribute("software-version")
     {
     }
 
-    ~ReadElectricalMeasurementRmsVoltageMaxPhaseB() {}
+    ~ReadBridgedDeviceBasicSoftwareVersion() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000907) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000009) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsVoltageMaxPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsVoltageMaxPhaseB response %@", [value description]);
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeSoftwareVersionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BridgedDeviceBasic.SoftwareVersion response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsVoltageMaxPhaseB read Error", error);
+                LogNSError("BridgedDeviceBasic SoftwareVersion read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -30827,34 +29921,34 @@ class ReadElectricalMeasurementRmsVoltageMaxPhaseB : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsVoltageMaxPhaseB : public SubscribeAttribute {
+class SubscribeAttributeBridgedDeviceBasicSoftwareVersion : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsVoltageMaxPhaseB()
-        : SubscribeAttribute("rms-voltage-max-phase-b")
+    SubscribeAttributeBridgedDeviceBasicSoftwareVersion()
+        : SubscribeAttribute("software-version")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsVoltageMaxPhaseB() {}
+    ~SubscribeAttributeBridgedDeviceBasicSoftwareVersion() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000907) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000009) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsVoltageMaxPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSoftwareVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsVoltageMaxPhaseB response %@", [value description]);
+                NSLog(@"BridgedDeviceBasic.SoftwareVersion response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -30865,29 +29959,29 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageMaxPhaseB : public Subscr
 };
 
 /*
- * Attribute RmsCurrentPhaseB
+ * Attribute SoftwareVersionString
  */
-class ReadElectricalMeasurementRmsCurrentPhaseB : public ReadAttribute {
+class ReadBridgedDeviceBasicSoftwareVersionString : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsCurrentPhaseB()
-        : ReadAttribute("rms-current-phase-b")
+    ReadBridgedDeviceBasicSoftwareVersionString()
+        : ReadAttribute("software-version-string")
     {
     }
 
-    ~ReadElectricalMeasurementRmsCurrentPhaseB() {}
+    ~ReadBridgedDeviceBasicSoftwareVersionString() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000908) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000000A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsCurrentPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsCurrentPhaseB response %@", [value description]);
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeSoftwareVersionStringWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BridgedDeviceBasic.SoftwareVersionString response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsCurrentPhaseB read Error", error);
+                LogNSError("BridgedDeviceBasic SoftwareVersionString read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -30895,34 +29989,34 @@ class ReadElectricalMeasurementRmsCurrentPhaseB : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsCurrentPhaseB : public SubscribeAttribute {
+class SubscribeAttributeBridgedDeviceBasicSoftwareVersionString : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsCurrentPhaseB()
-        : SubscribeAttribute("rms-current-phase-b")
+    SubscribeAttributeBridgedDeviceBasicSoftwareVersionString()
+        : SubscribeAttribute("software-version-string")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsCurrentPhaseB() {}
+    ~SubscribeAttributeBridgedDeviceBasicSoftwareVersionString() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000908) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000000A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsCurrentPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSoftwareVersionStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsCurrentPhaseB response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.SoftwareVersionString response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -30933,29 +30027,29 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentPhaseB : public Subscribe
 };
 
 /*
- * Attribute RmsCurrentMinPhaseB
+ * Attribute ManufacturingDate
  */
-class ReadElectricalMeasurementRmsCurrentMinPhaseB : public ReadAttribute {
+class ReadBridgedDeviceBasicManufacturingDate : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsCurrentMinPhaseB()
-        : ReadAttribute("rms-current-min-phase-b")
+    ReadBridgedDeviceBasicManufacturingDate()
+        : ReadAttribute("manufacturing-date")
     {
     }
 
-    ~ReadElectricalMeasurementRmsCurrentMinPhaseB() {}
+    ~ReadBridgedDeviceBasicManufacturingDate() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000909) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000000B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsCurrentMinPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsCurrentMinPhaseB response %@", [value description]);
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeManufacturingDateWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BridgedDeviceBasic.ManufacturingDate response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsCurrentMinPhaseB read Error", error);
+                LogNSError("BridgedDeviceBasic ManufacturingDate read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -30963,34 +30057,34 @@ class ReadElectricalMeasurementRmsCurrentMinPhaseB : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsCurrentMinPhaseB : public SubscribeAttribute {
+class SubscribeAttributeBridgedDeviceBasicManufacturingDate : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsCurrentMinPhaseB()
-        : SubscribeAttribute("rms-current-min-phase-b")
+    SubscribeAttributeBridgedDeviceBasicManufacturingDate()
+        : SubscribeAttribute("manufacturing-date")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsCurrentMinPhaseB() {}
+    ~SubscribeAttributeBridgedDeviceBasicManufacturingDate() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000909) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000000B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsCurrentMinPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeManufacturingDateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsCurrentMinPhaseB response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.ManufacturingDate response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -31001,29 +30095,29 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentMinPhaseB : public Subscr
 };
 
 /*
- * Attribute RmsCurrentMaxPhaseB
+ * Attribute PartNumber
  */
-class ReadElectricalMeasurementRmsCurrentMaxPhaseB : public ReadAttribute {
+class ReadBridgedDeviceBasicPartNumber : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsCurrentMaxPhaseB()
-        : ReadAttribute("rms-current-max-phase-b")
+    ReadBridgedDeviceBasicPartNumber()
+        : ReadAttribute("part-number")
     {
     }
 
-    ~ReadElectricalMeasurementRmsCurrentMaxPhaseB() {}
+    ~ReadBridgedDeviceBasicPartNumber() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000090A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000000C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsCurrentMaxPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsCurrentMaxPhaseB response %@", [value description]);
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributePartNumberWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BridgedDeviceBasic.PartNumber response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsCurrentMaxPhaseB read Error", error);
+                LogNSError("BridgedDeviceBasic PartNumber read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -31031,34 +30125,34 @@ class ReadElectricalMeasurementRmsCurrentMaxPhaseB : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsCurrentMaxPhaseB : public SubscribeAttribute {
+class SubscribeAttributeBridgedDeviceBasicPartNumber : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsCurrentMaxPhaseB()
-        : SubscribeAttribute("rms-current-max-phase-b")
+    SubscribeAttributeBridgedDeviceBasicPartNumber()
+        : SubscribeAttribute("part-number")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsCurrentMaxPhaseB() {}
+    ~SubscribeAttributeBridgedDeviceBasicPartNumber() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000090A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000000C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsCurrentMaxPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePartNumberWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsCurrentMaxPhaseB response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.PartNumber response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -31069,29 +30163,29 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentMaxPhaseB : public Subscr
 };
 
 /*
- * Attribute ActivePowerPhaseB
+ * Attribute ProductURL
  */
-class ReadElectricalMeasurementActivePowerPhaseB : public ReadAttribute {
+class ReadBridgedDeviceBasicProductURL : public ReadAttribute {
 public:
-    ReadElectricalMeasurementActivePowerPhaseB()
-        : ReadAttribute("active-power-phase-b")
+    ReadBridgedDeviceBasicProductURL()
+        : ReadAttribute("product-url")
     {
     }
 
-    ~ReadElectricalMeasurementActivePowerPhaseB() {}
+    ~ReadBridgedDeviceBasicProductURL() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000090B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000000D) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeActivePowerPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.ActivePowerPhaseB response %@", [value description]);
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeProductURLWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BridgedDeviceBasic.ProductURL response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement ActivePowerPhaseB read Error", error);
+                LogNSError("BridgedDeviceBasic ProductURL read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -31099,34 +30193,34 @@ class ReadElectricalMeasurementActivePowerPhaseB : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementActivePowerPhaseB : public SubscribeAttribute {
+class SubscribeAttributeBridgedDeviceBasicProductURL : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementActivePowerPhaseB()
-        : SubscribeAttribute("active-power-phase-b")
+    SubscribeAttributeBridgedDeviceBasicProductURL()
+        : SubscribeAttribute("product-url")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementActivePowerPhaseB() {}
+    ~SubscribeAttributeBridgedDeviceBasicProductURL() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000090B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000000D) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeActivePowerPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeProductURLWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.ActivePowerPhaseB response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.ProductURL response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -31137,29 +30231,29 @@ class SubscribeAttributeElectricalMeasurementActivePowerPhaseB : public Subscrib
 };
 
 /*
- * Attribute ActivePowerMinPhaseB
+ * Attribute ProductLabel
  */
-class ReadElectricalMeasurementActivePowerMinPhaseB : public ReadAttribute {
+class ReadBridgedDeviceBasicProductLabel : public ReadAttribute {
 public:
-    ReadElectricalMeasurementActivePowerMinPhaseB()
-        : ReadAttribute("active-power-min-phase-b")
+    ReadBridgedDeviceBasicProductLabel()
+        : ReadAttribute("product-label")
     {
     }
 
-    ~ReadElectricalMeasurementActivePowerMinPhaseB() {}
+    ~ReadBridgedDeviceBasicProductLabel() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000090C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000000E) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeActivePowerMinPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.ActivePowerMinPhaseB response %@", [value description]);
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeProductLabelWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BridgedDeviceBasic.ProductLabel response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement ActivePowerMinPhaseB read Error", error);
+                LogNSError("BridgedDeviceBasic ProductLabel read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -31167,34 +30261,34 @@ class ReadElectricalMeasurementActivePowerMinPhaseB : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementActivePowerMinPhaseB : public SubscribeAttribute {
+class SubscribeAttributeBridgedDeviceBasicProductLabel : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementActivePowerMinPhaseB()
-        : SubscribeAttribute("active-power-min-phase-b")
+    SubscribeAttributeBridgedDeviceBasicProductLabel()
+        : SubscribeAttribute("product-label")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementActivePowerMinPhaseB() {}
+    ~SubscribeAttributeBridgedDeviceBasicProductLabel() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000090C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000000E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeActivePowerMinPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeProductLabelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.ActivePowerMinPhaseB response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.ProductLabel response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -31205,29 +30299,29 @@ class SubscribeAttributeElectricalMeasurementActivePowerMinPhaseB : public Subsc
 };
 
 /*
- * Attribute ActivePowerMaxPhaseB
+ * Attribute SerialNumber
  */
-class ReadElectricalMeasurementActivePowerMaxPhaseB : public ReadAttribute {
+class ReadBridgedDeviceBasicSerialNumber : public ReadAttribute {
 public:
-    ReadElectricalMeasurementActivePowerMaxPhaseB()
-        : ReadAttribute("active-power-max-phase-b")
+    ReadBridgedDeviceBasicSerialNumber()
+        : ReadAttribute("serial-number")
     {
     }
 
-    ~ReadElectricalMeasurementActivePowerMaxPhaseB() {}
+    ~ReadBridgedDeviceBasicSerialNumber() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000090D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000000F) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeActivePowerMaxPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.ActivePowerMaxPhaseB response %@", [value description]);
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeSerialNumberWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BridgedDeviceBasic.SerialNumber response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement ActivePowerMaxPhaseB read Error", error);
+                LogNSError("BridgedDeviceBasic SerialNumber read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -31235,34 +30329,34 @@ class ReadElectricalMeasurementActivePowerMaxPhaseB : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementActivePowerMaxPhaseB : public SubscribeAttribute {
+class SubscribeAttributeBridgedDeviceBasicSerialNumber : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementActivePowerMaxPhaseB()
-        : SubscribeAttribute("active-power-max-phase-b")
+    SubscribeAttributeBridgedDeviceBasicSerialNumber()
+        : SubscribeAttribute("serial-number")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementActivePowerMaxPhaseB() {}
+    ~SubscribeAttributeBridgedDeviceBasicSerialNumber() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000090D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000000F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeActivePowerMaxPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSerialNumberWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.ActivePowerMaxPhaseB response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.SerialNumber response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -31273,29 +30367,29 @@ class SubscribeAttributeElectricalMeasurementActivePowerMaxPhaseB : public Subsc
 };
 
 /*
- * Attribute ReactivePowerPhaseB
+ * Attribute Reachable
  */
-class ReadElectricalMeasurementReactivePowerPhaseB : public ReadAttribute {
+class ReadBridgedDeviceBasicReachable : public ReadAttribute {
 public:
-    ReadElectricalMeasurementReactivePowerPhaseB()
-        : ReadAttribute("reactive-power-phase-b")
+    ReadBridgedDeviceBasicReachable()
+        : ReadAttribute("reachable")
     {
     }
 
-    ~ReadElectricalMeasurementReactivePowerPhaseB() {}
+    ~ReadBridgedDeviceBasicReachable() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000090E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000011) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeReactivePowerPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.ReactivePowerPhaseB response %@", [value description]);
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeReachableWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BridgedDeviceBasic.Reachable response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement ReactivePowerPhaseB read Error", error);
+                LogNSError("BridgedDeviceBasic Reachable read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -31303,34 +30397,34 @@ class ReadElectricalMeasurementReactivePowerPhaseB : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementReactivePowerPhaseB : public SubscribeAttribute {
+class SubscribeAttributeBridgedDeviceBasicReachable : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementReactivePowerPhaseB()
-        : SubscribeAttribute("reactive-power-phase-b")
+    SubscribeAttributeBridgedDeviceBasicReachable()
+        : SubscribeAttribute("reachable")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementReactivePowerPhaseB() {}
+    ~SubscribeAttributeBridgedDeviceBasicReachable() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000090E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000011) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeReactivePowerPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeReachableWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.ReactivePowerPhaseB response %@", [value description]);
+                NSLog(@"BridgedDeviceBasic.Reachable response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -31341,29 +30435,29 @@ class SubscribeAttributeElectricalMeasurementReactivePowerPhaseB : public Subscr
 };
 
 /*
- * Attribute ApparentPowerPhaseB
+ * Attribute UniqueID
  */
-class ReadElectricalMeasurementApparentPowerPhaseB : public ReadAttribute {
+class ReadBridgedDeviceBasicUniqueID : public ReadAttribute {
 public:
-    ReadElectricalMeasurementApparentPowerPhaseB()
-        : ReadAttribute("apparent-power-phase-b")
+    ReadBridgedDeviceBasicUniqueID()
+        : ReadAttribute("unique-id")
     {
     }
 
-    ~ReadElectricalMeasurementApparentPowerPhaseB() {}
+    ~ReadBridgedDeviceBasicUniqueID() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000090F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000012) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeApparentPowerPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.ApparentPowerPhaseB response %@", [value description]);
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeUniqueIDWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BridgedDeviceBasic.UniqueID response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement ApparentPowerPhaseB read Error", error);
+                LogNSError("BridgedDeviceBasic UniqueID read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -31371,34 +30465,34 @@ class ReadElectricalMeasurementApparentPowerPhaseB : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementApparentPowerPhaseB : public SubscribeAttribute {
+class SubscribeAttributeBridgedDeviceBasicUniqueID : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementApparentPowerPhaseB()
-        : SubscribeAttribute("apparent-power-phase-b")
+    SubscribeAttributeBridgedDeviceBasicUniqueID()
+        : SubscribeAttribute("unique-id")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementApparentPowerPhaseB() {}
+    ~SubscribeAttributeBridgedDeviceBasicUniqueID() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000090F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000012) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeApparentPowerPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeUniqueIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.ApparentPowerPhaseB response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.UniqueID response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -31409,29 +30503,29 @@ class SubscribeAttributeElectricalMeasurementApparentPowerPhaseB : public Subscr
 };
 
 /*
- * Attribute PowerFactorPhaseB
+ * Attribute GeneratedCommandList
  */
-class ReadElectricalMeasurementPowerFactorPhaseB : public ReadAttribute {
+class ReadBridgedDeviceBasicGeneratedCommandList : public ReadAttribute {
 public:
-    ReadElectricalMeasurementPowerFactorPhaseB()
-        : ReadAttribute("power-factor-phase-b")
+    ReadBridgedDeviceBasicGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadElectricalMeasurementPowerFactorPhaseB() {}
+    ~ReadBridgedDeviceBasicGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000910) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributePowerFactorPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.PowerFactorPhaseB response %@", [value description]);
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BridgedDeviceBasic.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement PowerFactorPhaseB read Error", error);
+                LogNSError("BridgedDeviceBasic GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -31439,34 +30533,34 @@ class ReadElectricalMeasurementPowerFactorPhaseB : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementPowerFactorPhaseB : public SubscribeAttribute {
+class SubscribeAttributeBridgedDeviceBasicGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementPowerFactorPhaseB()
-        : SubscribeAttribute("power-factor-phase-b")
+    SubscribeAttributeBridgedDeviceBasicGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementPowerFactorPhaseB() {}
+    ~SubscribeAttributeBridgedDeviceBasicGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000910) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePowerFactorPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.PowerFactorPhaseB response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -31477,30 +30571,29 @@ class SubscribeAttributeElectricalMeasurementPowerFactorPhaseB : public Subscrib
 };
 
 /*
- * Attribute AverageRmsVoltageMeasurementPeriodPhaseB
+ * Attribute AcceptedCommandList
  */
-class ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseB : public ReadAttribute {
+class ReadBridgedDeviceBasicAcceptedCommandList : public ReadAttribute {
 public:
-    ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseB()
-        : ReadAttribute("average-rms-voltage-measurement-period-phase-b")
+    ReadBridgedDeviceBasicAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseB() {}
+    ~ReadBridgedDeviceBasicAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000911) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeAverageRmsVoltageMeasurementPeriodPhaseBWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AverageRmsVoltageMeasurementPeriodPhaseB response %@", [value description]);
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BridgedDeviceBasic.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement AverageRmsVoltageMeasurementPeriodPhaseB read Error", error);
+                LogNSError("BridgedDeviceBasic AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -31508,35 +30601,34 @@ class ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseB : public
     }
 };
 
-class SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseB : public SubscribeAttribute {
+class SubscribeAttributeBridgedDeviceBasicAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseB()
-        : SubscribeAttribute("average-rms-voltage-measurement-period-phase-b")
+    SubscribeAttributeBridgedDeviceBasicAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseB() {}
+    ~SubscribeAttributeBridgedDeviceBasicAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000911) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAverageRmsVoltageMeasurementPeriodPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AverageRmsVoltageMeasurementPeriodPhaseB response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -31547,30 +30639,29 @@ class SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriodP
 };
 
 /*
- * Attribute AverageRmsOverVoltageCounterPhaseB
+ * Attribute AttributeList
  */
-class ReadElectricalMeasurementAverageRmsOverVoltageCounterPhaseB : public ReadAttribute {
+class ReadBridgedDeviceBasicAttributeList : public ReadAttribute {
 public:
-    ReadElectricalMeasurementAverageRmsOverVoltageCounterPhaseB()
-        : ReadAttribute("average-rms-over-voltage-counter-phase-b")
+    ReadBridgedDeviceBasicAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadElectricalMeasurementAverageRmsOverVoltageCounterPhaseB() {}
+    ~ReadBridgedDeviceBasicAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000912) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeAverageRmsOverVoltageCounterPhaseBWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AverageRmsOverVoltageCounterPhaseB response %@", [value description]);
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BridgedDeviceBasic.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement AverageRmsOverVoltageCounterPhaseB read Error", error);
+                LogNSError("BridgedDeviceBasic AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -31578,34 +30669,34 @@ class ReadElectricalMeasurementAverageRmsOverVoltageCounterPhaseB : public ReadA
     }
 };
 
-class SubscribeAttributeElectricalMeasurementAverageRmsOverVoltageCounterPhaseB : public SubscribeAttribute {
+class SubscribeAttributeBridgedDeviceBasicAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAverageRmsOverVoltageCounterPhaseB()
-        : SubscribeAttribute("average-rms-over-voltage-counter-phase-b")
+    SubscribeAttributeBridgedDeviceBasicAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAverageRmsOverVoltageCounterPhaseB() {}
+    ~SubscribeAttributeBridgedDeviceBasicAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000912) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAverageRmsOverVoltageCounterPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AverageRmsOverVoltageCounterPhaseB response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BridgedDeviceBasic.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -31616,30 +30707,29 @@ class SubscribeAttributeElectricalMeasurementAverageRmsOverVoltageCounterPhaseB
 };
 
 /*
- * Attribute AverageRmsUnderVoltageCounterPhaseB
+ * Attribute FeatureMap
  */
-class ReadElectricalMeasurementAverageRmsUnderVoltageCounterPhaseB : public ReadAttribute {
+class ReadBridgedDeviceBasicFeatureMap : public ReadAttribute {
 public:
-    ReadElectricalMeasurementAverageRmsUnderVoltageCounterPhaseB()
-        : ReadAttribute("average-rms-under-voltage-counter-phase-b")
+    ReadBridgedDeviceBasicFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadElectricalMeasurementAverageRmsUnderVoltageCounterPhaseB() {}
+    ~ReadBridgedDeviceBasicFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000913) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeAverageRmsUnderVoltageCounterPhaseBWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AverageRmsUnderVoltageCounterPhaseB response %@", [value description]);
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BridgedDeviceBasic.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement AverageRmsUnderVoltageCounterPhaseB read Error", error);
+                LogNSError("BridgedDeviceBasic FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -31647,34 +30737,34 @@ class ReadElectricalMeasurementAverageRmsUnderVoltageCounterPhaseB : public Read
     }
 };
 
-class SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounterPhaseB : public SubscribeAttribute {
+class SubscribeAttributeBridgedDeviceBasicFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounterPhaseB()
-        : SubscribeAttribute("average-rms-under-voltage-counter-phase-b")
+    SubscribeAttributeBridgedDeviceBasicFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounterPhaseB() {}
+    ~SubscribeAttributeBridgedDeviceBasicFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000913) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAverageRmsUnderVoltageCounterPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AverageRmsUnderVoltageCounterPhaseB response %@", [value description]);
+                NSLog(@"BridgedDeviceBasic.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -31685,30 +30775,29 @@ class SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounterPhaseB
 };
 
 /*
- * Attribute RmsExtremeOverVoltagePeriodPhaseB
+ * Attribute ClusterRevision
  */
-class ReadElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseB : public ReadAttribute {
+class ReadBridgedDeviceBasicClusterRevision : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseB()
-        : ReadAttribute("rms-extreme-over-voltage-period-phase-b")
+    ReadBridgedDeviceBasicClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseB() {}
+    ~ReadBridgedDeviceBasicClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000914) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsExtremeOverVoltagePeriodPhaseBWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsExtremeOverVoltagePeriodPhaseB response %@", [value description]);
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BridgedDeviceBasic.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsExtremeOverVoltagePeriodPhaseB read Error", error);
+                LogNSError("BridgedDeviceBasic ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -31716,34 +30805,34 @@ class ReadElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseB : public ReadAt
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseB : public SubscribeAttribute {
+class SubscribeAttributeBridgedDeviceBasicClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseB()
-        : SubscribeAttribute("rms-extreme-over-voltage-period-phase-b")
+    SubscribeAttributeBridgedDeviceBasicClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseB() {}
+    ~SubscribeAttributeBridgedDeviceBasicClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000914) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPBridgedDeviceBasic * cluster = [[CHIPBridgedDeviceBasic alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsExtremeOverVoltagePeriodPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsExtremeOverVoltagePeriodPhaseB response %@", [value description]);
+                NSLog(@"BridgedDeviceBasic.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -31753,31 +30842,53 @@ class SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseB :
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster Switch                                                      | 0x003B |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * NumberOfPositions                                                 | 0x0000 |
+| * CurrentPosition                                                   | 0x0001 |
+| * MultiPressMax                                                     | 0x0002 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * SwitchLatched                                                     | 0x0000 |
+| * InitialPress                                                      | 0x0001 |
+| * LongPress                                                         | 0x0002 |
+| * ShortRelease                                                      | 0x0003 |
+| * LongRelease                                                       | 0x0004 |
+| * MultiPressOngoing                                                 | 0x0005 |
+| * MultiPressComplete                                                | 0x0006 |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute RmsExtremeUnderVoltagePeriodPhaseB
+ * Attribute NumberOfPositions
  */
-class ReadElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseB : public ReadAttribute {
+class ReadSwitchNumberOfPositions : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseB()
-        : ReadAttribute("rms-extreme-under-voltage-period-phase-b")
+    ReadSwitchNumberOfPositions()
+        : ReadAttribute("number-of-positions")
     {
     }
 
-    ~ReadElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseB() {}
+    ~ReadSwitchNumberOfPositions() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000915) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsExtremeUnderVoltagePeriodPhaseBWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsExtremeUnderVoltagePeriodPhaseB response %@", [value description]);
+        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNumberOfPositionsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Switch.NumberOfPositions response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsExtremeUnderVoltagePeriodPhaseB read Error", error);
+                LogNSError("Switch NumberOfPositions read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -31785,34 +30896,32 @@ class ReadElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseB : public ReadA
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseB : public SubscribeAttribute {
+class SubscribeAttributeSwitchNumberOfPositions : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseB()
-        : SubscribeAttribute("rms-extreme-under-voltage-period-phase-b")
+    SubscribeAttributeSwitchNumberOfPositions()
+        : SubscribeAttribute("number-of-positions")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseB() {}
+    ~SubscribeAttributeSwitchNumberOfPositions() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000915) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsExtremeUnderVoltagePeriodPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNumberOfPositionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsExtremeUnderVoltagePeriodPhaseB response %@", [value description]);
+                NSLog(@"Switch.NumberOfPositions response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -31823,65 +30932,60 @@ class SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseB
 };
 
 /*
- * Attribute RmsVoltageSagPeriodPhaseB
+ * Attribute CurrentPosition
  */
-class ReadElectricalMeasurementRmsVoltageSagPeriodPhaseB : public ReadAttribute {
+class ReadSwitchCurrentPosition : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsVoltageSagPeriodPhaseB()
-        : ReadAttribute("rms-voltage-sag-period-phase-b")
+    ReadSwitchCurrentPosition()
+        : ReadAttribute("current-position")
     {
     }
 
-    ~ReadElectricalMeasurementRmsVoltageSagPeriodPhaseB() {}
+    ~ReadSwitchCurrentPosition() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000916) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster
-            readAttributeRmsVoltageSagPeriodPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsVoltageSagPeriodPhaseB response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("ElectricalMeasurement RmsVoltageSagPeriodPhaseB read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCurrentPositionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Switch.CurrentPosition response %@", [value description]);
+            if (error != nil) {
+                LogNSError("Switch CurrentPosition read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriodPhaseB : public SubscribeAttribute {
+class SubscribeAttributeSwitchCurrentPosition : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriodPhaseB()
-        : SubscribeAttribute("rms-voltage-sag-period-phase-b")
+    SubscribeAttributeSwitchCurrentPosition()
+        : SubscribeAttribute("current-position")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriodPhaseB() {}
+    ~SubscribeAttributeSwitchCurrentPosition() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000916) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsVoltageSagPeriodPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCurrentPositionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsVoltageSagPeriodPhaseB response %@", [value description]);
+                NSLog(@"Switch.CurrentPosition response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -31892,65 +30996,60 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriodPhaseB : public
 };
 
 /*
- * Attribute RmsVoltageSwellPeriodPhaseB
+ * Attribute MultiPressMax
  */
-class ReadElectricalMeasurementRmsVoltageSwellPeriodPhaseB : public ReadAttribute {
+class ReadSwitchMultiPressMax : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsVoltageSwellPeriodPhaseB()
-        : ReadAttribute("rms-voltage-swell-period-phase-b")
+    ReadSwitchMultiPressMax()
+        : ReadAttribute("multi-press-max")
     {
     }
 
-    ~ReadElectricalMeasurementRmsVoltageSwellPeriodPhaseB() {}
+    ~ReadSwitchMultiPressMax() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000917) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster
-            readAttributeRmsVoltageSwellPeriodPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsVoltageSwellPeriodPhaseB response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("ElectricalMeasurement RmsVoltageSwellPeriodPhaseB read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeMultiPressMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Switch.MultiPressMax response %@", [value description]);
+            if (error != nil) {
+                LogNSError("Switch MultiPressMax read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriodPhaseB : public SubscribeAttribute {
+class SubscribeAttributeSwitchMultiPressMax : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriodPhaseB()
-        : SubscribeAttribute("rms-voltage-swell-period-phase-b")
+    SubscribeAttributeSwitchMultiPressMax()
+        : SubscribeAttribute("multi-press-max")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriodPhaseB() {}
+    ~SubscribeAttributeSwitchMultiPressMax() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000917) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsVoltageSwellPeriodPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMultiPressMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsVoltageSwellPeriodPhaseB response %@", [value description]);
+                NSLog(@"Switch.MultiPressMax response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -31961,29 +31060,27 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriodPhaseB : publi
 };
 
 /*
- * Attribute LineCurrentPhaseC
+ * Attribute GeneratedCommandList
  */
-class ReadElectricalMeasurementLineCurrentPhaseC : public ReadAttribute {
+class ReadSwitchGeneratedCommandList : public ReadAttribute {
 public:
-    ReadElectricalMeasurementLineCurrentPhaseC()
-        : ReadAttribute("line-current-phase-c")
+    ReadSwitchGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadElectricalMeasurementLineCurrentPhaseC() {}
+    ~ReadSwitchGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A01) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeLineCurrentPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.LineCurrentPhaseC response %@", [value description]);
+        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Switch.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement LineCurrentPhaseC read Error", error);
+                LogNSError("Switch GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -31991,34 +31088,32 @@ class ReadElectricalMeasurementLineCurrentPhaseC : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementLineCurrentPhaseC : public SubscribeAttribute {
+class SubscribeAttributeSwitchGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementLineCurrentPhaseC()
-        : SubscribeAttribute("line-current-phase-c")
+    SubscribeAttributeSwitchGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementLineCurrentPhaseC() {}
+    ~SubscribeAttributeSwitchGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A01) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLineCurrentPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.LineCurrentPhaseC response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Switch.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -32029,29 +31124,27 @@ class SubscribeAttributeElectricalMeasurementLineCurrentPhaseC : public Subscrib
 };
 
 /*
- * Attribute ActiveCurrentPhaseC
+ * Attribute AcceptedCommandList
  */
-class ReadElectricalMeasurementActiveCurrentPhaseC : public ReadAttribute {
+class ReadSwitchAcceptedCommandList : public ReadAttribute {
 public:
-    ReadElectricalMeasurementActiveCurrentPhaseC()
-        : ReadAttribute("active-current-phase-c")
+    ReadSwitchAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadElectricalMeasurementActiveCurrentPhaseC() {}
+    ~ReadSwitchAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A02) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeActiveCurrentPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.ActiveCurrentPhaseC response %@", [value description]);
+        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Switch.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement ActiveCurrentPhaseC read Error", error);
+                LogNSError("Switch AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -32059,34 +31152,32 @@ class ReadElectricalMeasurementActiveCurrentPhaseC : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementActiveCurrentPhaseC : public SubscribeAttribute {
+class SubscribeAttributeSwitchAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementActiveCurrentPhaseC()
-        : SubscribeAttribute("active-current-phase-c")
+    SubscribeAttributeSwitchAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementActiveCurrentPhaseC() {}
+    ~SubscribeAttributeSwitchAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A02) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeActiveCurrentPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.ActiveCurrentPhaseC response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Switch.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -32097,29 +31188,27 @@ class SubscribeAttributeElectricalMeasurementActiveCurrentPhaseC : public Subscr
 };
 
 /*
- * Attribute ReactiveCurrentPhaseC
+ * Attribute AttributeList
  */
-class ReadElectricalMeasurementReactiveCurrentPhaseC : public ReadAttribute {
+class ReadSwitchAttributeList : public ReadAttribute {
 public:
-    ReadElectricalMeasurementReactiveCurrentPhaseC()
-        : ReadAttribute("reactive-current-phase-c")
+    ReadSwitchAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadElectricalMeasurementReactiveCurrentPhaseC() {}
+    ~ReadSwitchAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A03) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeReactiveCurrentPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.ReactiveCurrentPhaseC response %@", [value description]);
+        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Switch.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement ReactiveCurrentPhaseC read Error", error);
+                LogNSError("Switch AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -32127,34 +31216,32 @@ class ReadElectricalMeasurementReactiveCurrentPhaseC : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementReactiveCurrentPhaseC : public SubscribeAttribute {
+class SubscribeAttributeSwitchAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementReactiveCurrentPhaseC()
-        : SubscribeAttribute("reactive-current-phase-c")
+    SubscribeAttributeSwitchAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementReactiveCurrentPhaseC() {}
+    ~SubscribeAttributeSwitchAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A03) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeReactiveCurrentPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.ReactiveCurrentPhaseC response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Switch.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -32165,29 +31252,27 @@ class SubscribeAttributeElectricalMeasurementReactiveCurrentPhaseC : public Subs
 };
 
 /*
- * Attribute RmsVoltagePhaseC
+ * Attribute FeatureMap
  */
-class ReadElectricalMeasurementRmsVoltagePhaseC : public ReadAttribute {
+class ReadSwitchFeatureMap : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsVoltagePhaseC()
-        : ReadAttribute("rms-voltage-phase-c")
+    ReadSwitchFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadElectricalMeasurementRmsVoltagePhaseC() {}
+    ~ReadSwitchFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A05) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsVoltagePhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsVoltagePhaseC response %@", [value description]);
+        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Switch.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsVoltagePhaseC read Error", error);
+                LogNSError("Switch FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -32195,34 +31280,32 @@ class ReadElectricalMeasurementRmsVoltagePhaseC : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsVoltagePhaseC : public SubscribeAttribute {
+class SubscribeAttributeSwitchFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsVoltagePhaseC()
-        : SubscribeAttribute("rms-voltage-phase-c")
+    SubscribeAttributeSwitchFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsVoltagePhaseC() {}
+    ~SubscribeAttributeSwitchFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A05) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsVoltagePhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsVoltagePhaseC response %@", [value description]);
+                NSLog(@"Switch.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -32233,29 +31316,27 @@ class SubscribeAttributeElectricalMeasurementRmsVoltagePhaseC : public Subscribe
 };
 
 /*
- * Attribute RmsVoltageMinPhaseC
+ * Attribute ClusterRevision
  */
-class ReadElectricalMeasurementRmsVoltageMinPhaseC : public ReadAttribute {
+class ReadSwitchClusterRevision : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsVoltageMinPhaseC()
-        : ReadAttribute("rms-voltage-min-phase-c")
+    ReadSwitchClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadElectricalMeasurementRmsVoltageMinPhaseC() {}
+    ~ReadSwitchClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A06) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsVoltageMinPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsVoltageMinPhaseC response %@", [value description]);
+        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Switch.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsVoltageMinPhaseC read Error", error);
+                LogNSError("Switch ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -32263,34 +31344,32 @@ class ReadElectricalMeasurementRmsVoltageMinPhaseC : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsVoltageMinPhaseC : public SubscribeAttribute {
+class SubscribeAttributeSwitchClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsVoltageMinPhaseC()
-        : SubscribeAttribute("rms-voltage-min-phase-c")
+    SubscribeAttributeSwitchClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsVoltageMinPhaseC() {}
+    ~SubscribeAttributeSwitchClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A06) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsVoltageMinPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsVoltageMinPhaseC response %@", [value description]);
+                NSLog(@"Switch.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -32300,98 +31379,194 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageMinPhaseC : public Subscr
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster AdministratorCommissioning                                  | 0x003C |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * OpenCommissioningWindow                                           |   0x00 |
+| * OpenBasicCommissioningWindow                                      |   0x01 |
+| * RevokeCommissioning                                               |   0x02 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * WindowStatus                                                      | 0x0000 |
+| * AdminFabricIndex                                                  | 0x0001 |
+| * AdminVendorId                                                     | 0x0002 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute RmsVoltageMaxPhaseC
+ * Command OpenCommissioningWindow
  */
-class ReadElectricalMeasurementRmsVoltageMaxPhaseC : public ReadAttribute {
+class AdministratorCommissioningOpenCommissioningWindow : public ClusterCommand {
 public:
-    ReadElectricalMeasurementRmsVoltageMaxPhaseC()
-        : ReadAttribute("rms-voltage-max-phase-c")
+    AdministratorCommissioningOpenCommissioningWindow()
+        : ClusterCommand("open-commissioning-window")
     {
+        AddArgument("CommissioningTimeout", 0, UINT16_MAX, &mRequest.commissioningTimeout);
+        AddArgument("PAKEVerifier", &mRequest.PAKEVerifier);
+        AddArgument("Discriminator", 0, UINT16_MAX, &mRequest.discriminator);
+        AddArgument("Iterations", 0, UINT32_MAX, &mRequest.iterations);
+        AddArgument("Salt", &mRequest.salt);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadElectricalMeasurementRmsVoltageMaxPhaseC() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A07) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsVoltageMaxPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsVoltageMaxPhaseC response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsVoltageMaxPhaseC read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        __auto_type * params = [[CHIPAdministratorCommissioningClusterOpenCommissioningWindowParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.commissioningTimeout = [NSNumber numberWithUnsignedShort:mRequest.commissioningTimeout];
+        params.pakeVerifier = [NSData dataWithBytes:mRequest.PAKEVerifier.data() length:mRequest.PAKEVerifier.size()];
+        params.discriminator = [NSNumber numberWithUnsignedShort:mRequest.discriminator];
+        params.iterations = [NSNumber numberWithUnsignedInt:mRequest.iterations];
+        params.salt = [NSData dataWithBytes:mRequest.salt.data() length:mRequest.salt.size()];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster openCommissioningWindowWithParams:params
+                                     completionHandler:^(NSError * _Nullable error) {
+                                         responsesNeeded--;
+                                         if (error != nil) {
+                                             mError = error;
+                                             LogNSError("Error", error);
+                                         }
+                                         if (responsesNeeded == 0) {
+                                             SetCommandExitStatus(mError);
+                                         }
+                                     }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type mRequest;
 };
 
-class SubscribeAttributeElectricalMeasurementRmsVoltageMaxPhaseC : public SubscribeAttribute {
+/*
+ * Command OpenBasicCommissioningWindow
+ */
+class AdministratorCommissioningOpenBasicCommissioningWindow : public ClusterCommand {
 public:
-    SubscribeAttributeElectricalMeasurementRmsVoltageMaxPhaseC()
-        : SubscribeAttribute("rms-voltage-max-phase-c")
+    AdministratorCommissioningOpenBasicCommissioningWindow()
+        : ClusterCommand("open-basic-commissioning-window")
     {
+        AddArgument("CommissioningTimeout", 0, UINT16_MAX, &mRequest.commissioningTimeout);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsVoltageMaxPhaseC() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A07) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) command (0x00000001) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsVoltageMaxPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsVoltageMaxPhaseC response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        __auto_type * params = [[CHIPAdministratorCommissioningClusterOpenBasicCommissioningWindowParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.commissioningTimeout = [NSNumber numberWithUnsignedShort:mRequest.commissioningTimeout];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster openBasicCommissioningWindowWithParams:params
+                                          completionHandler:^(NSError * _Nullable error) {
+                                              responsesNeeded--;
+                                              if (error != nil) {
+                                                  mError = error;
+                                                  LogNSError("Error", error);
+                                              }
+                                              if (responsesNeeded == 0) {
+                                                  SetCommandExitStatus(mError);
+                                              }
+                                          }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Type mRequest;
+};
+
+/*
+ * Command RevokeCommissioning
+ */
+class AdministratorCommissioningRevokeCommissioning : public ClusterCommand {
+public:
+    AdministratorCommissioningRevokeCommissioning()
+        : ClusterCommand("revoke-commissioning")
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) command (0x00000002) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        __auto_type * params = [[CHIPAdministratorCommissioningClusterRevokeCommissioningParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster revokeCommissioningWithParams:params
+                                 completionHandler:^(NSError * _Nullable error) {
+                                     responsesNeeded--;
+                                     if (error != nil) {
+                                         mError = error;
+                                         LogNSError("Error", error);
+                                     }
+                                     if (responsesNeeded == 0) {
+                                         SetCommandExitStatus(mError);
+                                     }
+                                 }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
 };
 
 /*
- * Attribute RmsCurrentPhaseC
+ * Attribute WindowStatus
  */
-class ReadElectricalMeasurementRmsCurrentPhaseC : public ReadAttribute {
+class ReadAdministratorCommissioningWindowStatus : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsCurrentPhaseC()
-        : ReadAttribute("rms-current-phase-c")
+    ReadAdministratorCommissioningWindowStatus()
+        : ReadAttribute("window-status")
     {
     }
 
-    ~ReadElectricalMeasurementRmsCurrentPhaseC() {}
+    ~ReadAdministratorCommissioningWindowStatus() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A08) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsCurrentPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsCurrentPhaseC response %@", [value description]);
+        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        [cluster readAttributeWindowStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AdministratorCommissioning.WindowStatus response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsCurrentPhaseC read Error", error);
+                LogNSError("AdministratorCommissioning WindowStatus read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -32399,34 +31574,34 @@ class ReadElectricalMeasurementRmsCurrentPhaseC : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsCurrentPhaseC : public SubscribeAttribute {
+class SubscribeAttributeAdministratorCommissioningWindowStatus : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsCurrentPhaseC()
-        : SubscribeAttribute("rms-current-phase-c")
+    SubscribeAttributeAdministratorCommissioningWindowStatus()
+        : SubscribeAttribute("window-status")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsCurrentPhaseC() {}
+    ~SubscribeAttributeAdministratorCommissioningWindowStatus() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A08) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsCurrentPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeWindowStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsCurrentPhaseC response %@", [value description]);
+                NSLog(@"AdministratorCommissioning.WindowStatus response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -32437,29 +31612,29 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentPhaseC : public Subscribe
 };
 
 /*
- * Attribute RmsCurrentMinPhaseC
+ * Attribute AdminFabricIndex
  */
-class ReadElectricalMeasurementRmsCurrentMinPhaseC : public ReadAttribute {
+class ReadAdministratorCommissioningAdminFabricIndex : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsCurrentMinPhaseC()
-        : ReadAttribute("rms-current-min-phase-c")
+    ReadAdministratorCommissioningAdminFabricIndex()
+        : ReadAttribute("admin-fabric-index")
     {
     }
 
-    ~ReadElectricalMeasurementRmsCurrentMinPhaseC() {}
+    ~ReadAdministratorCommissioningAdminFabricIndex() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A09) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsCurrentMinPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsCurrentMinPhaseC response %@", [value description]);
+        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        [cluster readAttributeAdminFabricIndexWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AdministratorCommissioning.AdminFabricIndex response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsCurrentMinPhaseC read Error", error);
+                LogNSError("AdministratorCommissioning AdminFabricIndex read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -32467,34 +31642,34 @@ class ReadElectricalMeasurementRmsCurrentMinPhaseC : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsCurrentMinPhaseC : public SubscribeAttribute {
+class SubscribeAttributeAdministratorCommissioningAdminFabricIndex : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsCurrentMinPhaseC()
-        : SubscribeAttribute("rms-current-min-phase-c")
+    SubscribeAttributeAdministratorCommissioningAdminFabricIndex()
+        : SubscribeAttribute("admin-fabric-index")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsCurrentMinPhaseC() {}
+    ~SubscribeAttributeAdministratorCommissioningAdminFabricIndex() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A09) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsCurrentMinPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAdminFabricIndexWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsCurrentMinPhaseC response %@", [value description]);
+                NSLog(@"AdministratorCommissioning.AdminFabricIndex response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -32505,29 +31680,29 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentMinPhaseC : public Subscr
 };
 
 /*
- * Attribute RmsCurrentMaxPhaseC
+ * Attribute AdminVendorId
  */
-class ReadElectricalMeasurementRmsCurrentMaxPhaseC : public ReadAttribute {
+class ReadAdministratorCommissioningAdminVendorId : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsCurrentMaxPhaseC()
-        : ReadAttribute("rms-current-max-phase-c")
+    ReadAdministratorCommissioningAdminVendorId()
+        : ReadAttribute("admin-vendor-id")
     {
     }
 
-    ~ReadElectricalMeasurementRmsCurrentMaxPhaseC() {}
+    ~ReadAdministratorCommissioningAdminVendorId() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A0A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsCurrentMaxPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsCurrentMaxPhaseC response %@", [value description]);
+        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        [cluster readAttributeAdminVendorIdWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AdministratorCommissioning.AdminVendorId response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsCurrentMaxPhaseC read Error", error);
+                LogNSError("AdministratorCommissioning AdminVendorId read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -32535,34 +31710,34 @@ class ReadElectricalMeasurementRmsCurrentMaxPhaseC : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsCurrentMaxPhaseC : public SubscribeAttribute {
+class SubscribeAttributeAdministratorCommissioningAdminVendorId : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsCurrentMaxPhaseC()
-        : SubscribeAttribute("rms-current-max-phase-c")
+    SubscribeAttributeAdministratorCommissioningAdminVendorId()
+        : SubscribeAttribute("admin-vendor-id")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsCurrentMaxPhaseC() {}
+    ~SubscribeAttributeAdministratorCommissioningAdminVendorId() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A0A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsCurrentMaxPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAdminVendorIdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsCurrentMaxPhaseC response %@", [value description]);
+                NSLog(@"AdministratorCommissioning.AdminVendorId response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -32573,29 +31748,29 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentMaxPhaseC : public Subscr
 };
 
 /*
- * Attribute ActivePowerPhaseC
+ * Attribute GeneratedCommandList
  */
-class ReadElectricalMeasurementActivePowerPhaseC : public ReadAttribute {
+class ReadAdministratorCommissioningGeneratedCommandList : public ReadAttribute {
 public:
-    ReadElectricalMeasurementActivePowerPhaseC()
-        : ReadAttribute("active-power-phase-c")
+    ReadAdministratorCommissioningGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadElectricalMeasurementActivePowerPhaseC() {}
+    ~ReadAdministratorCommissioningGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A0B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeActivePowerPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.ActivePowerPhaseC response %@", [value description]);
+        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AdministratorCommissioning.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement ActivePowerPhaseC read Error", error);
+                LogNSError("AdministratorCommissioning GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -32603,34 +31778,34 @@ class ReadElectricalMeasurementActivePowerPhaseC : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementActivePowerPhaseC : public SubscribeAttribute {
+class SubscribeAttributeAdministratorCommissioningGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementActivePowerPhaseC()
-        : SubscribeAttribute("active-power-phase-c")
+    SubscribeAttributeAdministratorCommissioningGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementActivePowerPhaseC() {}
+    ~SubscribeAttributeAdministratorCommissioningGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A0B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeActivePowerPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.ActivePowerPhaseC response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AdministratorCommissioning.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -32641,29 +31816,29 @@ class SubscribeAttributeElectricalMeasurementActivePowerPhaseC : public Subscrib
 };
 
 /*
- * Attribute ActivePowerMinPhaseC
+ * Attribute AcceptedCommandList
  */
-class ReadElectricalMeasurementActivePowerMinPhaseC : public ReadAttribute {
+class ReadAdministratorCommissioningAcceptedCommandList : public ReadAttribute {
 public:
-    ReadElectricalMeasurementActivePowerMinPhaseC()
-        : ReadAttribute("active-power-min-phase-c")
+    ReadAdministratorCommissioningAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadElectricalMeasurementActivePowerMinPhaseC() {}
+    ~ReadAdministratorCommissioningAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A0C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeActivePowerMinPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.ActivePowerMinPhaseC response %@", [value description]);
+        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AdministratorCommissioning.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement ActivePowerMinPhaseC read Error", error);
+                LogNSError("AdministratorCommissioning AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -32671,34 +31846,34 @@ class ReadElectricalMeasurementActivePowerMinPhaseC : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementActivePowerMinPhaseC : public SubscribeAttribute {
+class SubscribeAttributeAdministratorCommissioningAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementActivePowerMinPhaseC()
-        : SubscribeAttribute("active-power-min-phase-c")
+    SubscribeAttributeAdministratorCommissioningAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementActivePowerMinPhaseC() {}
+    ~SubscribeAttributeAdministratorCommissioningAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A0C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeActivePowerMinPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.ActivePowerMinPhaseC response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AdministratorCommissioning.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -32709,29 +31884,29 @@ class SubscribeAttributeElectricalMeasurementActivePowerMinPhaseC : public Subsc
 };
 
 /*
- * Attribute ActivePowerMaxPhaseC
+ * Attribute AttributeList
  */
-class ReadElectricalMeasurementActivePowerMaxPhaseC : public ReadAttribute {
+class ReadAdministratorCommissioningAttributeList : public ReadAttribute {
 public:
-    ReadElectricalMeasurementActivePowerMaxPhaseC()
-        : ReadAttribute("active-power-max-phase-c")
+    ReadAdministratorCommissioningAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadElectricalMeasurementActivePowerMaxPhaseC() {}
+    ~ReadAdministratorCommissioningAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A0D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeActivePowerMaxPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.ActivePowerMaxPhaseC response %@", [value description]);
+        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AdministratorCommissioning.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement ActivePowerMaxPhaseC read Error", error);
+                LogNSError("AdministratorCommissioning AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -32739,34 +31914,34 @@ class ReadElectricalMeasurementActivePowerMaxPhaseC : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementActivePowerMaxPhaseC : public SubscribeAttribute {
+class SubscribeAttributeAdministratorCommissioningAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementActivePowerMaxPhaseC()
-        : SubscribeAttribute("active-power-max-phase-c")
+    SubscribeAttributeAdministratorCommissioningAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementActivePowerMaxPhaseC() {}
+    ~SubscribeAttributeAdministratorCommissioningAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A0D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeActivePowerMaxPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.ActivePowerMaxPhaseC response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AdministratorCommissioning.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -32777,29 +31952,29 @@ class SubscribeAttributeElectricalMeasurementActivePowerMaxPhaseC : public Subsc
 };
 
 /*
- * Attribute ReactivePowerPhaseC
+ * Attribute FeatureMap
  */
-class ReadElectricalMeasurementReactivePowerPhaseC : public ReadAttribute {
+class ReadAdministratorCommissioningFeatureMap : public ReadAttribute {
 public:
-    ReadElectricalMeasurementReactivePowerPhaseC()
-        : ReadAttribute("reactive-power-phase-c")
+    ReadAdministratorCommissioningFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadElectricalMeasurementReactivePowerPhaseC() {}
+    ~ReadAdministratorCommissioningFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A0E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeReactivePowerPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.ReactivePowerPhaseC response %@", [value description]);
+        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AdministratorCommissioning.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement ReactivePowerPhaseC read Error", error);
+                LogNSError("AdministratorCommissioning FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -32807,34 +31982,34 @@ class ReadElectricalMeasurementReactivePowerPhaseC : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementReactivePowerPhaseC : public SubscribeAttribute {
+class SubscribeAttributeAdministratorCommissioningFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementReactivePowerPhaseC()
-        : SubscribeAttribute("reactive-power-phase-c")
+    SubscribeAttributeAdministratorCommissioningFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementReactivePowerPhaseC() {}
+    ~SubscribeAttributeAdministratorCommissioningFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A0E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeReactivePowerPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.ReactivePowerPhaseC response %@", [value description]);
+                NSLog(@"AdministratorCommissioning.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -32845,29 +32020,29 @@ class SubscribeAttributeElectricalMeasurementReactivePowerPhaseC : public Subscr
 };
 
 /*
- * Attribute ApparentPowerPhaseC
+ * Attribute ClusterRevision
  */
-class ReadElectricalMeasurementApparentPowerPhaseC : public ReadAttribute {
+class ReadAdministratorCommissioningClusterRevision : public ReadAttribute {
 public:
-    ReadElectricalMeasurementApparentPowerPhaseC()
-        : ReadAttribute("apparent-power-phase-c")
+    ReadAdministratorCommissioningClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadElectricalMeasurementApparentPowerPhaseC() {}
+    ~ReadAdministratorCommissioningClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A0F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeApparentPowerPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.ApparentPowerPhaseC response %@", [value description]);
+        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AdministratorCommissioning.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement ApparentPowerPhaseC read Error", error);
+                LogNSError("AdministratorCommissioning ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -32875,34 +32050,34 @@ class ReadElectricalMeasurementApparentPowerPhaseC : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementApparentPowerPhaseC : public SubscribeAttribute {
+class SubscribeAttributeAdministratorCommissioningClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementApparentPowerPhaseC()
-        : SubscribeAttribute("apparent-power-phase-c")
+    SubscribeAttributeAdministratorCommissioningClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementApparentPowerPhaseC() {}
+    ~SubscribeAttributeAdministratorCommissioningClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A0F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003C) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPAdministratorCommissioning * cluster = [[CHIPAdministratorCommissioning alloc] initWithDevice:device
+                                                                                                 endpoint:endpointId
+                                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeApparentPowerPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.ApparentPowerPhaseC response %@", [value description]);
+                NSLog(@"AdministratorCommissioning.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -32912,273 +32087,506 @@ class SubscribeAttributeElectricalMeasurementApparentPowerPhaseC : public Subscr
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster OperationalCredentials                                      | 0x003E |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * AttestationRequest                                                |   0x00 |
+| * CertificateChainRequest                                           |   0x02 |
+| * CSRRequest                                                        |   0x04 |
+| * AddNOC                                                            |   0x06 |
+| * UpdateNOC                                                         |   0x07 |
+| * UpdateFabricLabel                                                 |   0x09 |
+| * RemoveFabric                                                      |   0x0A |
+| * AddTrustedRootCertificate                                         |   0x0B |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * NOCs                                                              | 0x0000 |
+| * Fabrics                                                           | 0x0001 |
+| * SupportedFabrics                                                  | 0x0002 |
+| * CommissionedFabrics                                               | 0x0003 |
+| * TrustedRootCertificates                                           | 0x0004 |
+| * CurrentFabricIndex                                                | 0x0005 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute PowerFactorPhaseC
+ * Command AttestationRequest
  */
-class ReadElectricalMeasurementPowerFactorPhaseC : public ReadAttribute {
+class OperationalCredentialsAttestationRequest : public ClusterCommand {
 public:
-    ReadElectricalMeasurementPowerFactorPhaseC()
-        : ReadAttribute("power-factor-phase-c")
+    OperationalCredentialsAttestationRequest()
+        : ClusterCommand("attestation-request")
     {
+        AddArgument("AttestationNonce", &mRequest.attestationNonce);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadElectricalMeasurementPowerFactorPhaseC() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A10) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributePowerFactorPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.PowerFactorPhaseC response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ElectricalMeasurement PowerFactorPhaseC read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        __auto_type * params = [[CHIPOperationalCredentialsClusterAttestationRequestParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.attestationNonce = [NSData dataWithBytes:mRequest.attestationNonce.data() length:mRequest.attestationNonce.size()];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster attestationRequestWithParams:params
+                                completionHandler:^(CHIPOperationalCredentialsClusterAttestationResponseParams * _Nullable values,
+                                    NSError * _Nullable error) {
+                                    NSLog(@"Values: %@", values);
+                                    responsesNeeded--;
+                                    if (error != nil) {
+                                        mError = error;
+                                        LogNSError("Error", error);
+                                    }
+                                    if (responsesNeeded == 0) {
+                                        SetCommandExitStatus(mError);
+                                    }
+                                }];
+        }
         return CHIP_NO_ERROR;
     }
-};
-
-class SubscribeAttributeElectricalMeasurementPowerFactorPhaseC : public SubscribeAttribute {
-public:
-    SubscribeAttributeElectricalMeasurementPowerFactorPhaseC()
-        : SubscribeAttribute("power-factor-phase-c")
-    {
-    }
-
-    ~SubscribeAttributeElectricalMeasurementPowerFactorPhaseC() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A10) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePowerFactorPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.PowerFactorPhaseC response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
 
-        return CHIP_NO_ERROR;
-    }
+private:
+    chip::app::Clusters::OperationalCredentials::Commands::AttestationRequest::Type mRequest;
 };
 
 /*
- * Attribute AverageRmsVoltageMeasurementPeriodPhaseC
+ * Command CertificateChainRequest
  */
-class ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseC : public ReadAttribute {
+class OperationalCredentialsCertificateChainRequest : public ClusterCommand {
 public:
-    ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseC()
-        : ReadAttribute("average-rms-voltage-measurement-period-phase-c")
+    OperationalCredentialsCertificateChainRequest()
+        : ClusterCommand("certificate-chain-request")
     {
+        AddArgument("CertificateType", 0, UINT8_MAX, &mRequest.certificateType);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseC() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A11) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) command (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeAverageRmsVoltageMeasurementPeriodPhaseCWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AverageRmsVoltageMeasurementPeriodPhaseC response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ElectricalMeasurement AverageRmsVoltageMeasurementPeriodPhaseC read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        __auto_type * params = [[CHIPOperationalCredentialsClusterCertificateChainRequestParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.certificateType = [NSNumber numberWithUnsignedChar:mRequest.certificateType];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster certificateChainRequestWithParams:params
+                                     completionHandler:^(
+                                         CHIPOperationalCredentialsClusterCertificateChainResponseParams * _Nullable values,
+                                         NSError * _Nullable error) {
+                                         NSLog(@"Values: %@", values);
+                                         responsesNeeded--;
+                                         if (error != nil) {
+                                             mError = error;
+                                             LogNSError("Error", error);
+                                         }
+                                         if (responsesNeeded == 0) {
+                                             SetCommandExitStatus(mError);
+                                         }
+                                     }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::OperationalCredentials::Commands::CertificateChainRequest::Type mRequest;
 };
 
-class SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseC : public SubscribeAttribute {
+/*
+ * Command CSRRequest
+ */
+class OperationalCredentialsCSRRequest : public ClusterCommand {
 public:
-    SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseC()
-        : SubscribeAttribute("average-rms-voltage-measurement-period-phase-c")
+    OperationalCredentialsCSRRequest()
+        : ClusterCommand("csrrequest")
     {
+        AddArgument("CSRNonce", &mRequest.CSRNonce);
+        AddArgument("IsForUpdateNOC", 0, 1, &mRequest.isForUpdateNOC);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseC() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A11) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) command (0x00000004) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeAverageRmsVoltageMeasurementPeriodPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AverageRmsVoltageMeasurementPeriodPhaseC response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
-
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        __auto_type * params = [[CHIPOperationalCredentialsClusterCSRRequestParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.csrNonce = [NSData dataWithBytes:mRequest.CSRNonce.data() length:mRequest.CSRNonce.size()];
+        if (mRequest.isForUpdateNOC.HasValue()) {
+            params.isForUpdateNOC = [NSNumber numberWithBool:mRequest.isForUpdateNOC.Value()];
+        } else {
+            params.isForUpdateNOC = nil;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster CSRRequestWithParams:params
+                        completionHandler:^(
+                            CHIPOperationalCredentialsClusterCSRResponseParams * _Nullable values, NSError * _Nullable error) {
+                            NSLog(@"Values: %@", values);
+                            responsesNeeded--;
+                            if (error != nil) {
+                                mError = error;
+                                LogNSError("Error", error);
+                            }
+                            if (responsesNeeded == 0) {
+                                SetCommandExitStatus(mError);
+                            }
+                        }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::OperationalCredentials::Commands::CSRRequest::Type mRequest;
 };
 
 /*
- * Attribute AverageRmsOverVoltageCounterPhaseC
+ * Command AddNOC
  */
-class ReadElectricalMeasurementAverageRmsOverVoltageCounterPhaseC : public ReadAttribute {
+class OperationalCredentialsAddNOC : public ClusterCommand {
 public:
-    ReadElectricalMeasurementAverageRmsOverVoltageCounterPhaseC()
-        : ReadAttribute("average-rms-over-voltage-counter-phase-c")
+    OperationalCredentialsAddNOC()
+        : ClusterCommand("add-noc")
+    {
+        AddArgument("NOCValue", &mRequest.NOCValue);
+        AddArgument("ICACValue", &mRequest.ICACValue);
+        AddArgument("IPKValue", &mRequest.IPKValue);
+        AddArgument("CaseAdminSubject", 0, UINT64_MAX, &mRequest.caseAdminSubject);
+        AddArgument("AdminVendorId", 0, UINT16_MAX, &mRequest.adminVendorId);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) command (0x00000006) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        __auto_type * params = [[CHIPOperationalCredentialsClusterAddNOCParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.nocValue = [NSData dataWithBytes:mRequest.NOCValue.data() length:mRequest.NOCValue.size()];
+        if (mRequest.ICACValue.HasValue()) {
+            params.icacValue = [NSData dataWithBytes:mRequest.ICACValue.Value().data() length:mRequest.ICACValue.Value().size()];
+        } else {
+            params.icacValue = nil;
+        }
+        params.ipkValue = [NSData dataWithBytes:mRequest.IPKValue.data() length:mRequest.IPKValue.size()];
+        params.caseAdminSubject = [NSNumber numberWithUnsignedLongLong:mRequest.caseAdminSubject];
+        params.adminVendorId = [NSNumber numberWithUnsignedShort:chip::to_underlying(mRequest.adminVendorId)];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster addNOCWithParams:params
+                    completionHandler:^(
+                        CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
+        }
+        return CHIP_NO_ERROR;
     }
 
-    ~ReadElectricalMeasurementAverageRmsOverVoltageCounterPhaseC() {}
+private:
+    chip::app::Clusters::OperationalCredentials::Commands::AddNOC::Type mRequest;
+};
+
+/*
+ * Command UpdateNOC
+ */
+class OperationalCredentialsUpdateNOC : public ClusterCommand {
+public:
+    OperationalCredentialsUpdateNOC()
+        : ClusterCommand("update-noc")
+    {
+        AddArgument("NOCValue", &mRequest.NOCValue);
+        AddArgument("ICACValue", &mRequest.ICACValue);
+        ClusterCommand::AddArguments();
+    }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A12) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) command (0x00000007) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeAverageRmsOverVoltageCounterPhaseCWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AverageRmsOverVoltageCounterPhaseC response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ElectricalMeasurement AverageRmsOverVoltageCounterPhaseC read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        __auto_type * params = [[CHIPOperationalCredentialsClusterUpdateNOCParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.nocValue = [NSData dataWithBytes:mRequest.NOCValue.data() length:mRequest.NOCValue.size()];
+        if (mRequest.ICACValue.HasValue()) {
+            params.icacValue = [NSData dataWithBytes:mRequest.ICACValue.Value().data() length:mRequest.ICACValue.Value().size()];
+        } else {
+            params.icacValue = nil;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster updateNOCWithParams:params
+                       completionHandler:^(
+                           CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable error) {
+                           NSLog(@"Values: %@", values);
+                           responsesNeeded--;
+                           if (error != nil) {
+                               mError = error;
+                               LogNSError("Error", error);
+                           }
+                           if (responsesNeeded == 0) {
+                               SetCommandExitStatus(mError);
+                           }
+                       }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::OperationalCredentials::Commands::UpdateNOC::Type mRequest;
 };
 
-class SubscribeAttributeElectricalMeasurementAverageRmsOverVoltageCounterPhaseC : public SubscribeAttribute {
+/*
+ * Command UpdateFabricLabel
+ */
+class OperationalCredentialsUpdateFabricLabel : public ClusterCommand {
 public:
-    SubscribeAttributeElectricalMeasurementAverageRmsOverVoltageCounterPhaseC()
-        : SubscribeAttribute("average-rms-over-voltage-counter-phase-c")
+    OperationalCredentialsUpdateFabricLabel()
+        : ClusterCommand("update-fabric-label")
     {
+        AddArgument("Label", &mRequest.label);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeElectricalMeasurementAverageRmsOverVoltageCounterPhaseC() {}
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) command (0x00000009) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        __auto_type * params = [[CHIPOperationalCredentialsClusterUpdateFabricLabelParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.label = [[NSString alloc] initWithBytes:mRequest.label.data()
+                                                length:mRequest.label.size()
+                                              encoding:NSUTF8StringEncoding];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster updateFabricLabelWithParams:params
+                               completionHandler:^(CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable values,
+                                   NSError * _Nullable error) {
+                                   NSLog(@"Values: %@", values);
+                                   responsesNeeded--;
+                                   if (error != nil) {
+                                       mError = error;
+                                       LogNSError("Error", error);
+                                   }
+                                   if (responsesNeeded == 0) {
+                                       SetCommandExitStatus(mError);
+                                   }
+                               }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::OperationalCredentials::Commands::UpdateFabricLabel::Type mRequest;
+};
+
+/*
+ * Command RemoveFabric
+ */
+class OperationalCredentialsRemoveFabric : public ClusterCommand {
+public:
+    OperationalCredentialsRemoveFabric()
+        : ClusterCommand("remove-fabric")
+    {
+        AddArgument("FabricIndex", 0, UINT8_MAX, &mRequest.fabricIndex);
+        ClusterCommand::AddArguments();
+    }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A12) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) command (0x0000000A) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAverageRmsOverVoltageCounterPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AverageRmsOverVoltageCounterPhaseC response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        __auto_type * params = [[CHIPOperationalCredentialsClusterRemoveFabricParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.fabricIndex = [NSNumber numberWithUnsignedChar:mRequest.fabricIndex];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster removeFabricWithParams:params
+                          completionHandler:^(
+                              CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable error) {
+                              NSLog(@"Values: %@", values);
+                              responsesNeeded--;
+                              if (error != nil) {
+                                  mError = error;
+                                  LogNSError("Error", error);
+                              }
+                              if (responsesNeeded == 0) {
+                                  SetCommandExitStatus(mError);
+                              }
+                          }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::OperationalCredentials::Commands::RemoveFabric::Type mRequest;
+};
+
+/*
+ * Command AddTrustedRootCertificate
+ */
+class OperationalCredentialsAddTrustedRootCertificate : public ClusterCommand {
+public:
+    OperationalCredentialsAddTrustedRootCertificate()
+        : ClusterCommand("add-trusted-root-certificate")
+    {
+        AddArgument("RootCertificate", &mRequest.rootCertificate);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) command (0x0000000B) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        __auto_type * params = [[CHIPOperationalCredentialsClusterAddTrustedRootCertificateParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.rootCertificate = [NSData dataWithBytes:mRequest.rootCertificate.data() length:mRequest.rootCertificate.size()];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster addTrustedRootCertificateWithParams:params
+                                       completionHandler:^(NSError * _Nullable error) {
+                                           responsesNeeded--;
+                                           if (error != nil) {
+                                               mError = error;
+                                               LogNSError("Error", error);
+                                           }
+                                           if (responsesNeeded == 0) {
+                                               SetCommandExitStatus(mError);
+                                           }
+                                       }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::OperationalCredentials::Commands::AddTrustedRootCertificate::Type mRequest;
 };
 
 /*
- * Attribute AverageRmsUnderVoltageCounterPhaseC
+ * Attribute NOCs
  */
-class ReadElectricalMeasurementAverageRmsUnderVoltageCounterPhaseC : public ReadAttribute {
+class ReadOperationalCredentialsNOCs : public ReadAttribute {
 public:
-    ReadElectricalMeasurementAverageRmsUnderVoltageCounterPhaseC()
-        : ReadAttribute("average-rms-under-voltage-counter-phase-c")
+    ReadOperationalCredentialsNOCs()
+        : ReadAttribute("nocs")
     {
     }
 
-    ~ReadElectricalMeasurementAverageRmsUnderVoltageCounterPhaseC() {}
+    ~ReadOperationalCredentialsNOCs() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A13) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeAverageRmsUnderVoltageCounterPhaseCWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AverageRmsUnderVoltageCounterPhaseC response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ElectricalMeasurement AverageRmsUnderVoltageCounterPhaseC read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        CHIPReadParams * params = [[CHIPReadParams alloc] init];
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster readAttributeNOCsWithParams:params
+                           completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                               NSLog(@"OperationalCredentials.NOCs response %@", [value description]);
+                               if (error != nil) {
+                                   LogNSError("OperationalCredentials NOCs read Error", error);
+                               }
+                               SetCommandExitStatus(error);
+                           }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounterPhaseC : public SubscribeAttribute {
+class SubscribeAttributeOperationalCredentialsNOCs : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounterPhaseC()
-        : SubscribeAttribute("average-rms-under-voltage-counter-phase-c")
+    SubscribeAttributeOperationalCredentialsNOCs()
+        : SubscribeAttribute("nocs")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounterPhaseC() {}
+    ~SubscribeAttributeOperationalCredentialsNOCs() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A13) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAverageRmsUnderVoltageCounterPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNOCsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AverageRmsUnderVoltageCounterPhaseC response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalCredentials.NOCs response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -33189,65 +32597,67 @@ class SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounterPhaseC
 };
 
 /*
- * Attribute RmsExtremeOverVoltagePeriodPhaseC
+ * Attribute Fabrics
  */
-class ReadElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseC : public ReadAttribute {
+class ReadOperationalCredentialsFabrics : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseC()
-        : ReadAttribute("rms-extreme-over-voltage-period-phase-c")
+    ReadOperationalCredentialsFabrics()
+        : ReadAttribute("fabrics")
     {
     }
 
-    ~ReadElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseC() {}
+    ~ReadOperationalCredentialsFabrics() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A14) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsExtremeOverVoltagePeriodPhaseCWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsExtremeOverVoltagePeriodPhaseC response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsExtremeOverVoltagePeriodPhaseC read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        CHIPReadParams * params = [[CHIPReadParams alloc] init];
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster readAttributeFabricsWithParams:params
+                              completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                                  NSLog(@"OperationalCredentials.Fabrics response %@", [value description]);
+                                  if (error != nil) {
+                                      LogNSError("OperationalCredentials Fabrics read Error", error);
+                                  }
+                                  SetCommandExitStatus(error);
+                              }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseC : public SubscribeAttribute {
+class SubscribeAttributeOperationalCredentialsFabrics : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseC()
-        : SubscribeAttribute("rms-extreme-over-voltage-period-phase-c")
+    SubscribeAttributeOperationalCredentialsFabrics()
+        : SubscribeAttribute("fabrics")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseC() {}
+    ~SubscribeAttributeOperationalCredentialsFabrics() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A14) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsExtremeOverVoltagePeriodPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFabricsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsExtremeOverVoltagePeriodPhaseC response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalCredentials.Fabrics response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -33258,30 +32668,29 @@ class SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseC :
 };
 
 /*
- * Attribute RmsExtremeUnderVoltagePeriodPhaseC
+ * Attribute SupportedFabrics
  */
-class ReadElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseC : public ReadAttribute {
+class ReadOperationalCredentialsSupportedFabrics : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseC()
-        : ReadAttribute("rms-extreme-under-voltage-period-phase-c")
+    ReadOperationalCredentialsSupportedFabrics()
+        : ReadAttribute("supported-fabrics")
     {
     }
 
-    ~ReadElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseC() {}
+    ~ReadOperationalCredentialsSupportedFabrics() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A15) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster readAttributeRmsExtremeUnderVoltagePeriodPhaseCWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.RmsExtremeUnderVoltagePeriodPhaseC response %@", [value description]);
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeSupportedFabricsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OperationalCredentials.SupportedFabrics response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement RmsExtremeUnderVoltagePeriodPhaseC read Error", error);
+                LogNSError("OperationalCredentials SupportedFabrics read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -33289,34 +32698,34 @@ class ReadElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseC : public ReadA
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseC : public SubscribeAttribute {
+class SubscribeAttributeOperationalCredentialsSupportedFabrics : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseC()
-        : SubscribeAttribute("rms-extreme-under-voltage-period-phase-c")
+    SubscribeAttributeOperationalCredentialsSupportedFabrics()
+        : SubscribeAttribute("supported-fabrics")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseC() {}
+    ~SubscribeAttributeOperationalCredentialsSupportedFabrics() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A15) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsExtremeUnderVoltagePeriodPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSupportedFabricsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsExtremeUnderVoltagePeriodPhaseC response %@", [value description]);
+                NSLog(@"OperationalCredentials.SupportedFabrics response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -33327,65 +32736,64 @@ class SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseC
 };
 
 /*
- * Attribute RmsVoltageSagPeriodPhaseC
+ * Attribute CommissionedFabrics
  */
-class ReadElectricalMeasurementRmsVoltageSagPeriodPhaseC : public ReadAttribute {
+class ReadOperationalCredentialsCommissionedFabrics : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsVoltageSagPeriodPhaseC()
-        : ReadAttribute("rms-voltage-sag-period-phase-c")
+    ReadOperationalCredentialsCommissionedFabrics()
+        : ReadAttribute("commissioned-fabrics")
     {
     }
 
-    ~ReadElectricalMeasurementRmsVoltageSagPeriodPhaseC() {}
+    ~ReadOperationalCredentialsCommissionedFabrics() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A16) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster
-            readAttributeRmsVoltageSagPeriodPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsVoltageSagPeriodPhaseC response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("ElectricalMeasurement RmsVoltageSagPeriodPhaseC read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriodPhaseC : public SubscribeAttribute {
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeCommissionedFabricsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OperationalCredentials.CommissionedFabrics response %@", [value description]);
+            if (error != nil) {
+                LogNSError("OperationalCredentials CommissionedFabrics read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeOperationalCredentialsCommissionedFabrics : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriodPhaseC()
-        : SubscribeAttribute("rms-voltage-sag-period-phase-c")
+    SubscribeAttributeOperationalCredentialsCommissionedFabrics()
+        : SubscribeAttribute("commissioned-fabrics")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriodPhaseC() {}
+    ~SubscribeAttributeOperationalCredentialsCommissionedFabrics() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A16) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsVoltageSagPeriodPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCommissionedFabricsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsVoltageSagPeriodPhaseC response %@", [value description]);
+                NSLog(@"OperationalCredentials.CommissionedFabrics response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -33396,65 +32804,132 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriodPhaseC : public
 };
 
 /*
- * Attribute RmsVoltageSwellPeriodPhaseC
+ * Attribute TrustedRootCertificates
  */
-class ReadElectricalMeasurementRmsVoltageSwellPeriodPhaseC : public ReadAttribute {
+class ReadOperationalCredentialsTrustedRootCertificates : public ReadAttribute {
 public:
-    ReadElectricalMeasurementRmsVoltageSwellPeriodPhaseC()
-        : ReadAttribute("rms-voltage-swell-period-phase-c")
+    ReadOperationalCredentialsTrustedRootCertificates()
+        : ReadAttribute("trusted-root-certificates")
     {
     }
 
-    ~ReadElectricalMeasurementRmsVoltageSwellPeriodPhaseC() {}
+    ~ReadOperationalCredentialsTrustedRootCertificates() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A17) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
-        [cluster
-            readAttributeRmsVoltageSwellPeriodPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsVoltageSwellPeriodPhaseC response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("ElectricalMeasurement RmsVoltageSwellPeriodPhaseC read Error", error);
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeTrustedRootCertificatesWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OperationalCredentials.TrustedRootCertificates response %@", [value description]);
+            if (error != nil) {
+                LogNSError("OperationalCredentials TrustedRootCertificates read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeOperationalCredentialsTrustedRootCertificates : public SubscribeAttribute {
+public:
+    SubscribeAttributeOperationalCredentialsTrustedRootCertificates()
+        : SubscribeAttribute("trusted-root-certificates")
+    {
+    }
+
+    ~SubscribeAttributeOperationalCredentialsTrustedRootCertificates() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeTrustedRootCertificatesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OperationalCredentials.TrustedRootCertificates response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
                 }
-                SetCommandExitStatus(error);
             }];
+
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriodPhaseC : public SubscribeAttribute {
+/*
+ * Attribute CurrentFabricIndex
+ */
+class ReadOperationalCredentialsCurrentFabricIndex : public ReadAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriodPhaseC()
-        : SubscribeAttribute("rms-voltage-swell-period-phase-c")
+    ReadOperationalCredentialsCurrentFabricIndex()
+        : ReadAttribute("current-fabric-index")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriodPhaseC() {}
+    ~ReadOperationalCredentialsCurrentFabricIndex() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A17) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReadAttribute (0x00000005) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeCurrentFabricIndexWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OperationalCredentials.CurrentFabricIndex response %@", [value description]);
+            if (error != nil) {
+                LogNSError("OperationalCredentials CurrentFabricIndex read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeOperationalCredentialsCurrentFabricIndex : public SubscribeAttribute {
+public:
+    SubscribeAttributeOperationalCredentialsCurrentFabricIndex()
+        : SubscribeAttribute("current-fabric-index")
+    {
+    }
+
+    ~SubscribeAttributeOperationalCredentialsCurrentFabricIndex() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRmsVoltageSwellPeriodPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCurrentFabricIndexWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.RmsVoltageSwellPeriodPhaseC response %@", [value description]);
+                NSLog(@"OperationalCredentials.CurrentFabricIndex response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -33467,27 +32942,27 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriodPhaseC : publi
 /*
  * Attribute GeneratedCommandList
  */
-class ReadElectricalMeasurementGeneratedCommandList : public ReadAttribute {
+class ReadOperationalCredentialsGeneratedCommandList : public ReadAttribute {
 public:
-    ReadElectricalMeasurementGeneratedCommandList()
+    ReadOperationalCredentialsGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadElectricalMeasurementGeneratedCommandList() {}
+    ~ReadOperationalCredentialsGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.GeneratedCommandList response %@", [value description]);
+            NSLog(@"OperationalCredentials.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement GeneratedCommandList read Error", error);
+                LogNSError("OperationalCredentials GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -33495,22 +32970,22 @@ class ReadElectricalMeasurementGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeOperationalCredentialsGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementGeneratedCommandList()
+    SubscribeAttributeOperationalCredentialsGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementGeneratedCommandList() {}
+    ~SubscribeAttributeOperationalCredentialsGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -33522,7 +32997,7 @@ class SubscribeAttributeElectricalMeasurementGeneratedCommandList : public Subsc
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.GeneratedCommandList response %@", [value description]);
+                NSLog(@"OperationalCredentials.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -33535,27 +33010,27 @@ class SubscribeAttributeElectricalMeasurementGeneratedCommandList : public Subsc
 /*
  * Attribute AcceptedCommandList
  */
-class ReadElectricalMeasurementAcceptedCommandList : public ReadAttribute {
+class ReadOperationalCredentialsAcceptedCommandList : public ReadAttribute {
 public:
-    ReadElectricalMeasurementAcceptedCommandList()
+    ReadOperationalCredentialsAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadElectricalMeasurementAcceptedCommandList() {}
+    ~ReadOperationalCredentialsAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AcceptedCommandList response %@", [value description]);
+            NSLog(@"OperationalCredentials.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement AcceptedCommandList read Error", error);
+                LogNSError("OperationalCredentials AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -33563,22 +33038,22 @@ class ReadElectricalMeasurementAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeOperationalCredentialsAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAcceptedCommandList()
+    SubscribeAttributeOperationalCredentialsAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAcceptedCommandList() {}
+    ~SubscribeAttributeOperationalCredentialsAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -33590,7 +33065,7 @@ class SubscribeAttributeElectricalMeasurementAcceptedCommandList : public Subscr
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AcceptedCommandList response %@", [value description]);
+                NSLog(@"OperationalCredentials.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -33603,27 +33078,27 @@ class SubscribeAttributeElectricalMeasurementAcceptedCommandList : public Subscr
 /*
  * Attribute AttributeList
  */
-class ReadElectricalMeasurementAttributeList : public ReadAttribute {
+class ReadOperationalCredentialsAttributeList : public ReadAttribute {
 public:
-    ReadElectricalMeasurementAttributeList()
+    ReadOperationalCredentialsAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadElectricalMeasurementAttributeList() {}
+    ~ReadOperationalCredentialsAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.AttributeList response %@", [value description]);
+            NSLog(@"OperationalCredentials.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement AttributeList read Error", error);
+                LogNSError("OperationalCredentials AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -33631,22 +33106,22 @@ class ReadElectricalMeasurementAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementAttributeList : public SubscribeAttribute {
+class SubscribeAttributeOperationalCredentialsAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementAttributeList()
+    SubscribeAttributeOperationalCredentialsAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementAttributeList() {}
+    ~SubscribeAttributeOperationalCredentialsAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -33658,7 +33133,7 @@ class SubscribeAttributeElectricalMeasurementAttributeList : public SubscribeAtt
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.AttributeList response %@", [value description]);
+                NSLog(@"OperationalCredentials.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -33671,27 +33146,27 @@ class SubscribeAttributeElectricalMeasurementAttributeList : public SubscribeAtt
 /*
  * Attribute FeatureMap
  */
-class ReadElectricalMeasurementFeatureMap : public ReadAttribute {
+class ReadOperationalCredentialsFeatureMap : public ReadAttribute {
 public:
-    ReadElectricalMeasurementFeatureMap()
+    ReadOperationalCredentialsFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadElectricalMeasurementFeatureMap() {}
+    ~ReadOperationalCredentialsFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.FeatureMap response %@", [value description]);
+            NSLog(@"OperationalCredentials.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement FeatureMap read Error", error);
+                LogNSError("OperationalCredentials FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -33699,22 +33174,22 @@ class ReadElectricalMeasurementFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeOperationalCredentialsFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementFeatureMap()
+    SubscribeAttributeOperationalCredentialsFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementFeatureMap() {}
+    ~SubscribeAttributeOperationalCredentialsFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -33726,7 +33201,7 @@ class SubscribeAttributeElectricalMeasurementFeatureMap : public SubscribeAttrib
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.FeatureMap response %@", [value description]);
+                NSLog(@"OperationalCredentials.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -33739,27 +33214,27 @@ class SubscribeAttributeElectricalMeasurementFeatureMap : public SubscribeAttrib
 /*
  * Attribute ClusterRevision
  */
-class ReadElectricalMeasurementClusterRevision : public ReadAttribute {
+class ReadOperationalCredentialsClusterRevision : public ReadAttribute {
 public:
-    ReadElectricalMeasurementClusterRevision()
+    ReadOperationalCredentialsClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadElectricalMeasurementClusterRevision() {}
+    ~ReadOperationalCredentialsClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ElectricalMeasurement.ClusterRevision response %@", [value description]);
+            NSLog(@"OperationalCredentials.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("ElectricalMeasurement ClusterRevision read Error", error);
+                LogNSError("OperationalCredentials ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -33767,22 +33242,22 @@ class ReadElectricalMeasurementClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeElectricalMeasurementClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeOperationalCredentialsClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeElectricalMeasurementClusterRevision()
+    SubscribeAttributeOperationalCredentialsClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeElectricalMeasurementClusterRevision() {}
+    ~SubscribeAttributeOperationalCredentialsClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
-                                                                                       endpoint:endpointId
-                                                                                          queue:callbackQueue];
+        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -33794,7 +33269,7 @@ class SubscribeAttributeElectricalMeasurementClusterRevision : public SubscribeA
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ElectricalMeasurement.ClusterRevision response %@", [value description]);
+                NSLog(@"OperationalCredentials.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -33805,21 +33280,19 @@ class SubscribeAttributeElectricalMeasurementClusterRevision : public SubscribeA
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster EthernetNetworkDiagnostics                                  | 0x0037 |
+| Cluster GroupKeyManagement                                          | 0x003F |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * ResetCounts                                                       |   0x00 |
+| * KeySetWrite                                                       |   0x00 |
+| * KeySetRead                                                        |   0x01 |
+| * KeySetRemove                                                      |   0x03 |
+| * KeySetReadAllIndices                                              |   0x04 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * PHYRate                                                           | 0x0000 |
-| * FullDuplex                                                        | 0x0001 |
-| * PacketRxCount                                                     | 0x0002 |
-| * PacketTxCount                                                     | 0x0003 |
-| * TxErrCount                                                        | 0x0004 |
-| * CollisionCount                                                    | 0x0005 |
-| * OverrunCount                                                      | 0x0006 |
-| * CarrierDetect                                                     | 0x0007 |
-| * TimeSinceReset                                                    | 0x0008 |
+| * GroupKeyMap                                                       | 0x0000 |
+| * GroupTable                                                        | 0x0001 |
+| * MaxGroupsPerFabric                                                | 0x0002 |
+| * MaxGroupKeysPerFabric                                             | 0x0003 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -33830,31 +33303,70 @@ class SubscribeAttributeElectricalMeasurementClusterRevision : public SubscribeA
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command ResetCounts
+ * Command KeySetWrite
  */
-class EthernetNetworkDiagnosticsResetCounts : public ClusterCommand {
+class GroupKeyManagementKeySetWrite : public ClusterCommand {
 public:
-    EthernetNetworkDiagnosticsResetCounts()
-        : ClusterCommand("reset-counts")
+    GroupKeyManagementKeySetWrite()
+        : ClusterCommand("key-set-write")
+        , mComplex_GroupKeySet(&mRequest.groupKeySet)
     {
+        AddArgument("GroupKeySet", &mComplex_GroupKeySet);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        __auto_type * params = [[CHIPEthernetNetworkDiagnosticsClusterResetCountsParams alloc] init];
+        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        __auto_type * params = [[CHIPGroupKeyManagementClusterKeySetWriteParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.groupKeySet = [CHIPGroupKeyManagementClusterGroupKeySetStruct new];
+        params.groupKeySet.groupKeySetID = [NSNumber numberWithUnsignedShort:mRequest.groupKeySet.groupKeySetID];
+        params.groupKeySet.groupKeySecurityPolicy =
+            [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.groupKeySet.groupKeySecurityPolicy)];
+        if (mRequest.groupKeySet.epochKey0.IsNull()) {
+            params.groupKeySet.epochKey0 = nil;
+        } else {
+            params.groupKeySet.epochKey0 = [NSData dataWithBytes:mRequest.groupKeySet.epochKey0.Value().data()
+                                                          length:mRequest.groupKeySet.epochKey0.Value().size()];
+        }
+        if (mRequest.groupKeySet.epochStartTime0.IsNull()) {
+            params.groupKeySet.epochStartTime0 = nil;
+        } else {
+            params.groupKeySet.epochStartTime0 = [NSNumber numberWithUnsignedLongLong:mRequest.groupKeySet.epochStartTime0.Value()];
+        }
+        if (mRequest.groupKeySet.epochKey1.IsNull()) {
+            params.groupKeySet.epochKey1 = nil;
+        } else {
+            params.groupKeySet.epochKey1 = [NSData dataWithBytes:mRequest.groupKeySet.epochKey1.Value().data()
+                                                          length:mRequest.groupKeySet.epochKey1.Value().size()];
+        }
+        if (mRequest.groupKeySet.epochStartTime1.IsNull()) {
+            params.groupKeySet.epochStartTime1 = nil;
+        } else {
+            params.groupKeySet.epochStartTime1 = [NSNumber numberWithUnsignedLongLong:mRequest.groupKeySet.epochStartTime1.Value()];
+        }
+        if (mRequest.groupKeySet.epochKey2.IsNull()) {
+            params.groupKeySet.epochKey2 = nil;
+        } else {
+            params.groupKeySet.epochKey2 = [NSData dataWithBytes:mRequest.groupKeySet.epochKey2.Value().data()
+                                                          length:mRequest.groupKeySet.epochKey2.Value().size()];
+        }
+        if (mRequest.groupKeySet.epochStartTime2.IsNull()) {
+            params.groupKeySet.epochStartTime2 = nil;
+        } else {
+            params.groupKeySet.epochStartTime2 = [NSNumber numberWithUnsignedLongLong:mRequest.groupKeySet.epochStartTime2.Value()];
+        }
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster resetCountsWithParams:params
+            [cluster keySetWriteWithParams:params
                          completionHandler:^(NSError * _Nullable error) {
                              responsesNeeded--;
                              if (error != nil) {
@@ -33870,203 +33382,281 @@ class EthernetNetworkDiagnosticsResetCounts : public ClusterCommand {
     }
 
 private:
+    chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::GroupKeyManagement::Structs::GroupKeySetStruct::Type> mComplex_GroupKeySet;
 };
 
 /*
- * Attribute PHYRate
+ * Command KeySetRead
  */
-class ReadEthernetNetworkDiagnosticsPHYRate : public ReadAttribute {
+class GroupKeyManagementKeySetRead : public ClusterCommand {
 public:
-    ReadEthernetNetworkDiagnosticsPHYRate()
-        : ReadAttribute("phyrate")
+    GroupKeyManagementKeySetRead()
+        : ClusterCommand("key-set-read")
     {
+        AddArgument("GroupKeySetID", 0, UINT16_MAX, &mRequest.groupKeySetID);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadEthernetNetworkDiagnosticsPHYRate() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) command (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributePHYRateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"EthernetNetworkDiagnostics.PHYRate response %@", [value description]);
-            if (error != nil) {
-                LogNSError("EthernetNetworkDiagnostics PHYRate read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        __auto_type * params = [[CHIPGroupKeyManagementClusterKeySetReadParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.groupKeySetID = [NSNumber numberWithUnsignedShort:mRequest.groupKeySetID];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster keySetReadWithParams:params
+                        completionHandler:^(
+                            CHIPGroupKeyManagementClusterKeySetReadResponseParams * _Nullable values, NSError * _Nullable error) {
+                            NSLog(@"Values: %@", values);
+                            responsesNeeded--;
+                            if (error != nil) {
+                                mError = error;
+                                LogNSError("Error", error);
+                            }
+                            if (responsesNeeded == 0) {
+                                SetCommandExitStatus(mError);
+                            }
+                        }];
+        }
         return CHIP_NO_ERROR;
     }
-};
-
-class SubscribeAttributeEthernetNetworkDiagnosticsPHYRate : public SubscribeAttribute {
-public:
-    SubscribeAttributeEthernetNetworkDiagnosticsPHYRate()
-        : SubscribeAttribute("phyrate")
-    {
-    }
-
-    ~SubscribeAttributeEthernetNetworkDiagnosticsPHYRate() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x00000000) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePHYRateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"EthernetNetworkDiagnostics.PHYRate response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
 
-        return CHIP_NO_ERROR;
-    }
+private:
+    chip::app::Clusters::GroupKeyManagement::Commands::KeySetRead::Type mRequest;
 };
 
 /*
- * Attribute FullDuplex
+ * Command KeySetRemove
  */
-class ReadEthernetNetworkDiagnosticsFullDuplex : public ReadAttribute {
+class GroupKeyManagementKeySetRemove : public ClusterCommand {
 public:
-    ReadEthernetNetworkDiagnosticsFullDuplex()
-        : ReadAttribute("full-duplex")
+    GroupKeyManagementKeySetRemove()
+        : ClusterCommand("key-set-remove")
     {
+        AddArgument("GroupKeySetID", 0, UINT16_MAX, &mRequest.groupKeySetID);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadEthernetNetworkDiagnosticsFullDuplex() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) command (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeFullDuplexWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"EthernetNetworkDiagnostics.FullDuplex response %@", [value description]);
-            if (error != nil) {
-                LogNSError("EthernetNetworkDiagnostics FullDuplex read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        __auto_type * params = [[CHIPGroupKeyManagementClusterKeySetRemoveParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.groupKeySetID = [NSNumber numberWithUnsignedShort:mRequest.groupKeySetID];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster keySetRemoveWithParams:params
+                          completionHandler:^(NSError * _Nullable error) {
+                              responsesNeeded--;
+                              if (error != nil) {
+                                  mError = error;
+                                  LogNSError("Error", error);
+                              }
+                              if (responsesNeeded == 0) {
+                                  SetCommandExitStatus(mError);
+                              }
+                          }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::GroupKeyManagement::Commands::KeySetRemove::Type mRequest;
 };
 
-class SubscribeAttributeEthernetNetworkDiagnosticsFullDuplex : public SubscribeAttribute {
+/*
+ * Command KeySetReadAllIndices
+ */
+class GroupKeyManagementKeySetReadAllIndices : public ClusterCommand {
 public:
-    SubscribeAttributeEthernetNetworkDiagnosticsFullDuplex()
-        : SubscribeAttribute("full-duplex")
+    GroupKeyManagementKeySetReadAllIndices()
+        : ClusterCommand("key-set-read-all-indices")
+        , mComplex_GroupKeySetIDs(&mRequest.groupKeySetIDs)
     {
+        AddArgument("GroupKeySetIDs", &mComplex_GroupKeySetIDs);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeEthernetNetworkDiagnosticsFullDuplex() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) command (0x00000004) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFullDuplexWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
+        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        __auto_type * params = [[CHIPGroupKeyManagementClusterKeySetReadAllIndicesParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mRequest.groupKeySetIDs) {
+                NSNumber * newElement_0;
+                newElement_0 = [NSNumber numberWithUnsignedShort:entry_0];
+                [array_0 addObject:newElement_0];
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"EthernetNetworkDiagnostics.FullDuplex response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
-
+            params.groupKeySetIDs = array_0;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster
+                keySetReadAllIndicesWithParams:params
+                             completionHandler:^(CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable values,
+                                 NSError * _Nullable error) {
+                                 NSLog(@"Values: %@", values);
+                                 responsesNeeded--;
+                                 if (error != nil) {
+                                     mError = error;
+                                     LogNSError("Error", error);
+                                 }
+                                 if (responsesNeeded == 0) {
+                                     SetCommandExitStatus(mError);
+                                 }
+                             }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndices::Type mRequest;
+    TypedComplexArgument<chip::app::DataModel::List<const uint16_t>> mComplex_GroupKeySetIDs;
 };
 
 /*
- * Attribute PacketRxCount
+ * Attribute GroupKeyMap
  */
-class ReadEthernetNetworkDiagnosticsPacketRxCount : public ReadAttribute {
+class ReadGroupKeyManagementGroupKeyMap : public ReadAttribute {
 public:
-    ReadEthernetNetworkDiagnosticsPacketRxCount()
-        : ReadAttribute("packet-rx-count")
+    ReadGroupKeyManagementGroupKeyMap()
+        : ReadAttribute("group-key-map")
     {
     }
 
-    ~ReadEthernetNetworkDiagnosticsPacketRxCount() {}
+    ~ReadGroupKeyManagementGroupKeyMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributePacketRxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"EthernetNetworkDiagnostics.PacketRxCount response %@", [value description]);
-            if (error != nil) {
-                LogNSError("EthernetNetworkDiagnostics PacketRxCount read Error", error);
+        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        CHIPReadParams * params = [[CHIPReadParams alloc] init];
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster readAttributeGroupKeyMapWithParams:params
+                                  completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                                      NSLog(@"GroupKeyManagement.GroupKeyMap response %@", [value description]);
+                                      if (error != nil) {
+                                          LogNSError("GroupKeyManagement GroupKeyMap read Error", error);
+                                      }
+                                      SetCommandExitStatus(error);
+                                  }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteGroupKeyManagementGroupKeyMap : public WriteAttribute {
+public:
+    WriteGroupKeyManagementGroupKeyMap()
+        : WriteAttribute("group-key-map")
+        , mComplex(&mValue)
+    {
+        AddArgument("attr-name", "group-key-map");
+        AddArgument("attr-value", &mComplex);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteGroupKeyManagementGroupKeyMap() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) WriteAttribute (0x00000000) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mValue) {
+                CHIPGroupKeyManagementClusterGroupKeyMapStruct * newElement_0;
+                newElement_0 = [CHIPGroupKeyManagementClusterGroupKeyMapStruct new];
+                newElement_0.groupId = [NSNumber numberWithUnsignedShort:entry_0.groupId];
+                newElement_0.groupKeySetID = [NSNumber numberWithUnsignedShort:entry_0.groupKeySetID];
+                newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
+                [array_0 addObject:newElement_0];
             }
-            SetCommandExitStatus(error);
-        }];
+            value = array_0;
+        }
+
+        [cluster writeAttributeGroupKeyMapWithValue:value
+                                             params:params
+                                  completionHandler:^(NSError * _Nullable error) {
+                                      if (error != nil) {
+                                          LogNSError("GroupKeyManagement GroupKeyMap write Error", error);
+                                      }
+                                      SetCommandExitStatus(error);
+                                  }];
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::DataModel::List<const chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type> mValue;
+    TypedComplexArgument<
+        chip::app::DataModel::List<const chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type>>
+        mComplex;
 };
 
-class SubscribeAttributeEthernetNetworkDiagnosticsPacketRxCount : public SubscribeAttribute {
+class SubscribeAttributeGroupKeyManagementGroupKeyMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeEthernetNetworkDiagnosticsPacketRxCount()
-        : SubscribeAttribute("packet-rx-count")
+    SubscribeAttributeGroupKeyManagementGroupKeyMap()
+        : SubscribeAttribute("group-key-map")
     {
     }
 
-    ~SubscribeAttributeEthernetNetworkDiagnosticsPacketRxCount() {}
+    ~SubscribeAttributeGroupKeyManagementGroupKeyMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePacketRxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGroupKeyMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"EthernetNetworkDiagnostics.PacketRxCount response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GroupKeyManagement.GroupKeyMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -34077,64 +33667,67 @@ class SubscribeAttributeEthernetNetworkDiagnosticsPacketRxCount : public Subscri
 };
 
 /*
- * Attribute PacketTxCount
+ * Attribute GroupTable
  */
-class ReadEthernetNetworkDiagnosticsPacketTxCount : public ReadAttribute {
+class ReadGroupKeyManagementGroupTable : public ReadAttribute {
 public:
-    ReadEthernetNetworkDiagnosticsPacketTxCount()
-        : ReadAttribute("packet-tx-count")
+    ReadGroupKeyManagementGroupTable()
+        : ReadAttribute("group-table")
     {
     }
 
-    ~ReadEthernetNetworkDiagnosticsPacketTxCount() {}
+    ~ReadGroupKeyManagementGroupTable() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributePacketTxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"EthernetNetworkDiagnostics.PacketTxCount response %@", [value description]);
-            if (error != nil) {
-                LogNSError("EthernetNetworkDiagnostics PacketTxCount read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        CHIPReadParams * params = [[CHIPReadParams alloc] init];
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster readAttributeGroupTableWithParams:params
+                                 completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                                     NSLog(@"GroupKeyManagement.GroupTable response %@", [value description]);
+                                     if (error != nil) {
+                                         LogNSError("GroupKeyManagement GroupTable read Error", error);
+                                     }
+                                     SetCommandExitStatus(error);
+                                 }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeEthernetNetworkDiagnosticsPacketTxCount : public SubscribeAttribute {
+class SubscribeAttributeGroupKeyManagementGroupTable : public SubscribeAttribute {
 public:
-    SubscribeAttributeEthernetNetworkDiagnosticsPacketTxCount()
-        : SubscribeAttribute("packet-tx-count")
+    SubscribeAttributeGroupKeyManagementGroupTable()
+        : SubscribeAttribute("group-table")
     {
     }
 
-    ~SubscribeAttributeEthernetNetworkDiagnosticsPacketTxCount() {}
+    ~SubscribeAttributeGroupKeyManagementGroupTable() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePacketTxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGroupTableWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"EthernetNetworkDiagnostics.PacketTxCount response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GroupKeyManagement.GroupTable response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -34145,29 +33738,29 @@ class SubscribeAttributeEthernetNetworkDiagnosticsPacketTxCount : public Subscri
 };
 
 /*
- * Attribute TxErrCount
+ * Attribute MaxGroupsPerFabric
  */
-class ReadEthernetNetworkDiagnosticsTxErrCount : public ReadAttribute {
+class ReadGroupKeyManagementMaxGroupsPerFabric : public ReadAttribute {
 public:
-    ReadEthernetNetworkDiagnosticsTxErrCount()
-        : ReadAttribute("tx-err-count")
+    ReadGroupKeyManagementMaxGroupsPerFabric()
+        : ReadAttribute("max-groups-per-fabric")
     {
     }
 
-    ~ReadEthernetNetworkDiagnosticsTxErrCount() {}
+    ~ReadGroupKeyManagementMaxGroupsPerFabric() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeTxErrCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"EthernetNetworkDiagnostics.TxErrCount response %@", [value description]);
+        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeMaxGroupsPerFabricWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GroupKeyManagement.MaxGroupsPerFabric response %@", [value description]);
             if (error != nil) {
-                LogNSError("EthernetNetworkDiagnostics TxErrCount read Error", error);
+                LogNSError("GroupKeyManagement MaxGroupsPerFabric read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -34175,34 +33768,34 @@ class ReadEthernetNetworkDiagnosticsTxErrCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeEthernetNetworkDiagnosticsTxErrCount : public SubscribeAttribute {
+class SubscribeAttributeGroupKeyManagementMaxGroupsPerFabric : public SubscribeAttribute {
 public:
-    SubscribeAttributeEthernetNetworkDiagnosticsTxErrCount()
-        : SubscribeAttribute("tx-err-count")
+    SubscribeAttributeGroupKeyManagementMaxGroupsPerFabric()
+        : SubscribeAttribute("max-groups-per-fabric")
     {
     }
 
-    ~SubscribeAttributeEthernetNetworkDiagnosticsTxErrCount() {}
+    ~SubscribeAttributeGroupKeyManagementMaxGroupsPerFabric() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTxErrCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMaxGroupsPerFabricWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"EthernetNetworkDiagnostics.TxErrCount response %@", [value description]);
+                NSLog(@"GroupKeyManagement.MaxGroupsPerFabric response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -34213,29 +33806,29 @@ class SubscribeAttributeEthernetNetworkDiagnosticsTxErrCount : public SubscribeA
 };
 
 /*
- * Attribute CollisionCount
+ * Attribute MaxGroupKeysPerFabric
  */
-class ReadEthernetNetworkDiagnosticsCollisionCount : public ReadAttribute {
+class ReadGroupKeyManagementMaxGroupKeysPerFabric : public ReadAttribute {
 public:
-    ReadEthernetNetworkDiagnosticsCollisionCount()
-        : ReadAttribute("collision-count")
+    ReadGroupKeyManagementMaxGroupKeysPerFabric()
+        : ReadAttribute("max-group-keys-per-fabric")
     {
     }
 
-    ~ReadEthernetNetworkDiagnosticsCollisionCount() {}
+    ~ReadGroupKeyManagementMaxGroupKeysPerFabric() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeCollisionCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"EthernetNetworkDiagnostics.CollisionCount response %@", [value description]);
+        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeMaxGroupKeysPerFabricWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GroupKeyManagement.MaxGroupKeysPerFabric response %@", [value description]);
             if (error != nil) {
-                LogNSError("EthernetNetworkDiagnostics CollisionCount read Error", error);
+                LogNSError("GroupKeyManagement MaxGroupKeysPerFabric read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -34243,34 +33836,34 @@ class ReadEthernetNetworkDiagnosticsCollisionCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeEthernetNetworkDiagnosticsCollisionCount : public SubscribeAttribute {
+class SubscribeAttributeGroupKeyManagementMaxGroupKeysPerFabric : public SubscribeAttribute {
 public:
-    SubscribeAttributeEthernetNetworkDiagnosticsCollisionCount()
-        : SubscribeAttribute("collision-count")
+    SubscribeAttributeGroupKeyManagementMaxGroupKeysPerFabric()
+        : SubscribeAttribute("max-group-keys-per-fabric")
     {
     }
 
-    ~SubscribeAttributeEthernetNetworkDiagnosticsCollisionCount() {}
+    ~SubscribeAttributeGroupKeyManagementMaxGroupKeysPerFabric() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCollisionCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMaxGroupKeysPerFabricWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"EthernetNetworkDiagnostics.CollisionCount response %@", [value description]);
+                NSLog(@"GroupKeyManagement.MaxGroupKeysPerFabric response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -34281,29 +33874,29 @@ class SubscribeAttributeEthernetNetworkDiagnosticsCollisionCount : public Subscr
 };
 
 /*
- * Attribute OverrunCount
+ * Attribute GeneratedCommandList
  */
-class ReadEthernetNetworkDiagnosticsOverrunCount : public ReadAttribute {
+class ReadGroupKeyManagementGeneratedCommandList : public ReadAttribute {
 public:
-    ReadEthernetNetworkDiagnosticsOverrunCount()
-        : ReadAttribute("overrun-count")
+    ReadGroupKeyManagementGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadEthernetNetworkDiagnosticsOverrunCount() {}
+    ~ReadGroupKeyManagementGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeOverrunCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"EthernetNetworkDiagnostics.OverrunCount response %@", [value description]);
+        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GroupKeyManagement.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("EthernetNetworkDiagnostics OverrunCount read Error", error);
+                LogNSError("GroupKeyManagement GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -34311,34 +33904,34 @@ class ReadEthernetNetworkDiagnosticsOverrunCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeEthernetNetworkDiagnosticsOverrunCount : public SubscribeAttribute {
+class SubscribeAttributeGroupKeyManagementGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeEthernetNetworkDiagnosticsOverrunCount()
-        : SubscribeAttribute("overrun-count")
+    SubscribeAttributeGroupKeyManagementGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeEthernetNetworkDiagnosticsOverrunCount() {}
+    ~SubscribeAttributeGroupKeyManagementGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOverrunCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"EthernetNetworkDiagnostics.OverrunCount response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GroupKeyManagement.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -34349,29 +33942,29 @@ class SubscribeAttributeEthernetNetworkDiagnosticsOverrunCount : public Subscrib
 };
 
 /*
- * Attribute CarrierDetect
+ * Attribute AcceptedCommandList
  */
-class ReadEthernetNetworkDiagnosticsCarrierDetect : public ReadAttribute {
+class ReadGroupKeyManagementAcceptedCommandList : public ReadAttribute {
 public:
-    ReadEthernetNetworkDiagnosticsCarrierDetect()
-        : ReadAttribute("carrier-detect")
+    ReadGroupKeyManagementAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadEthernetNetworkDiagnosticsCarrierDetect() {}
+    ~ReadGroupKeyManagementAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeCarrierDetectWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"EthernetNetworkDiagnostics.CarrierDetect response %@", [value description]);
+        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GroupKeyManagement.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("EthernetNetworkDiagnostics CarrierDetect read Error", error);
+                LogNSError("GroupKeyManagement AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -34379,34 +33972,34 @@ class ReadEthernetNetworkDiagnosticsCarrierDetect : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeEthernetNetworkDiagnosticsCarrierDetect : public SubscribeAttribute {
+class SubscribeAttributeGroupKeyManagementAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeEthernetNetworkDiagnosticsCarrierDetect()
-        : SubscribeAttribute("carrier-detect")
+    SubscribeAttributeGroupKeyManagementAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeEthernetNetworkDiagnosticsCarrierDetect() {}
+    ~SubscribeAttributeGroupKeyManagementAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCarrierDetectWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"EthernetNetworkDiagnostics.CarrierDetect response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GroupKeyManagement.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -34417,29 +34010,29 @@ class SubscribeAttributeEthernetNetworkDiagnosticsCarrierDetect : public Subscri
 };
 
 /*
- * Attribute TimeSinceReset
+ * Attribute AttributeList
  */
-class ReadEthernetNetworkDiagnosticsTimeSinceReset : public ReadAttribute {
+class ReadGroupKeyManagementAttributeList : public ReadAttribute {
 public:
-    ReadEthernetNetworkDiagnosticsTimeSinceReset()
-        : ReadAttribute("time-since-reset")
+    ReadGroupKeyManagementAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadEthernetNetworkDiagnosticsTimeSinceReset() {}
+    ~ReadGroupKeyManagementAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeTimeSinceResetWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"EthernetNetworkDiagnostics.TimeSinceReset response %@", [value description]);
+        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GroupKeyManagement.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("EthernetNetworkDiagnostics TimeSinceReset read Error", error);
+                LogNSError("GroupKeyManagement AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -34447,34 +34040,34 @@ class ReadEthernetNetworkDiagnosticsTimeSinceReset : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeEthernetNetworkDiagnosticsTimeSinceReset : public SubscribeAttribute {
+class SubscribeAttributeGroupKeyManagementAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeEthernetNetworkDiagnosticsTimeSinceReset()
-        : SubscribeAttribute("time-since-reset")
+    SubscribeAttributeGroupKeyManagementAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeEthernetNetworkDiagnosticsTimeSinceReset() {}
+    ~SubscribeAttributeGroupKeyManagementAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTimeSinceResetWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"EthernetNetworkDiagnostics.TimeSinceReset response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GroupKeyManagement.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -34485,64 +34078,64 @@ class SubscribeAttributeEthernetNetworkDiagnosticsTimeSinceReset : public Subscr
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute FeatureMap
  */
-class ReadEthernetNetworkDiagnosticsGeneratedCommandList : public ReadAttribute {
+class ReadGroupKeyManagementFeatureMap : public ReadAttribute {
 public:
-    ReadEthernetNetworkDiagnosticsGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadGroupKeyManagementFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadEthernetNetworkDiagnosticsGeneratedCommandList() {}
+    ~ReadGroupKeyManagementFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"EthernetNetworkDiagnostics.GeneratedCommandList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("EthernetNetworkDiagnostics GeneratedCommandList read Error", error);
-            }
-            SetCommandExitStatus(error);
+        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GroupKeyManagement.FeatureMap response %@", [value description]);
+            if (error != nil) {
+                LogNSError("GroupKeyManagement FeatureMap read Error", error);
+            }
+            SetCommandExitStatus(error);
         }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeEthernetNetworkDiagnosticsGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeGroupKeyManagementFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeEthernetNetworkDiagnosticsGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeGroupKeyManagementFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeEthernetNetworkDiagnosticsGeneratedCommandList() {}
+    ~SubscribeAttributeGroupKeyManagementFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"EthernetNetworkDiagnostics.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GroupKeyManagement.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -34553,29 +34146,29 @@ class SubscribeAttributeEthernetNetworkDiagnosticsGeneratedCommandList : public
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute ClusterRevision
  */
-class ReadEthernetNetworkDiagnosticsAcceptedCommandList : public ReadAttribute {
+class ReadGroupKeyManagementClusterRevision : public ReadAttribute {
 public:
-    ReadEthernetNetworkDiagnosticsAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadGroupKeyManagementClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadEthernetNetworkDiagnosticsAcceptedCommandList() {}
+    ~ReadGroupKeyManagementClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"EthernetNetworkDiagnostics.AcceptedCommandList response %@", [value description]);
+        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"GroupKeyManagement.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("EthernetNetworkDiagnostics AcceptedCommandList read Error", error);
+                LogNSError("GroupKeyManagement ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -34583,34 +34176,34 @@ class ReadEthernetNetworkDiagnosticsAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeEthernetNetworkDiagnosticsAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeGroupKeyManagementClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeEthernetNetworkDiagnosticsAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeGroupKeyManagementClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeEthernetNetworkDiagnosticsAcceptedCommandList() {}
+    ~SubscribeAttributeGroupKeyManagementClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
+                                                                                 endpoint:endpointId
+                                                                                    queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"EthernetNetworkDiagnostics.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"GroupKeyManagement.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -34620,30 +34213,44 @@ class SubscribeAttributeEthernetNetworkDiagnosticsAcceptedCommandList : public S
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster FixedLabel                                                  | 0x0040 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * LabelList                                                         | 0x0000 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute AttributeList
+ * Attribute LabelList
  */
-class ReadEthernetNetworkDiagnosticsAttributeList : public ReadAttribute {
+class ReadFixedLabelLabelList : public ReadAttribute {
 public:
-    ReadEthernetNetworkDiagnosticsAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadFixedLabelLabelList()
+        : ReadAttribute("label-list")
     {
     }
 
-    ~ReadEthernetNetworkDiagnosticsAttributeList() {}
+    ~ReadFixedLabelLabelList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000040) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"EthernetNetworkDiagnostics.AttributeList response %@", [value description]);
+        CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeLabelListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FixedLabel.LabelList response %@", [value description]);
             if (error != nil) {
-                LogNSError("EthernetNetworkDiagnostics AttributeList read Error", error);
+                LogNSError("FixedLabel LabelList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -34651,34 +34258,32 @@ class ReadEthernetNetworkDiagnosticsAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeEthernetNetworkDiagnosticsAttributeList : public SubscribeAttribute {
+class SubscribeAttributeFixedLabelLabelList : public SubscribeAttribute {
 public:
-    SubscribeAttributeEthernetNetworkDiagnosticsAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeFixedLabelLabelList()
+        : SubscribeAttribute("label-list")
     {
     }
 
-    ~SubscribeAttributeEthernetNetworkDiagnosticsAttributeList() {}
+    ~SubscribeAttributeFixedLabelLabelList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000040) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeLabelListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"EthernetNetworkDiagnostics.AttributeList response %@", [value description]);
+                NSLog(@"FixedLabel.LabelList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -34689,29 +34294,27 @@ class SubscribeAttributeEthernetNetworkDiagnosticsAttributeList : public Subscri
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute GeneratedCommandList
  */
-class ReadEthernetNetworkDiagnosticsFeatureMap : public ReadAttribute {
+class ReadFixedLabelGeneratedCommandList : public ReadAttribute {
 public:
-    ReadEthernetNetworkDiagnosticsFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadFixedLabelGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadEthernetNetworkDiagnosticsFeatureMap() {}
+    ~ReadFixedLabelGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000040) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"EthernetNetworkDiagnostics.FeatureMap response %@", [value description]);
+        CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FixedLabel.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("EthernetNetworkDiagnostics FeatureMap read Error", error);
+                LogNSError("FixedLabel GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -34719,34 +34322,32 @@ class ReadEthernetNetworkDiagnosticsFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeEthernetNetworkDiagnosticsFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeFixedLabelGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeEthernetNetworkDiagnosticsFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeFixedLabelGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeEthernetNetworkDiagnosticsFeatureMap() {}
+    ~SubscribeAttributeFixedLabelGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000040) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"EthernetNetworkDiagnostics.FeatureMap response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FixedLabel.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -34757,29 +34358,27 @@ class SubscribeAttributeEthernetNetworkDiagnosticsFeatureMap : public SubscribeA
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute AcceptedCommandList
  */
-class ReadEthernetNetworkDiagnosticsClusterRevision : public ReadAttribute {
+class ReadFixedLabelAcceptedCommandList : public ReadAttribute {
 public:
-    ReadEthernetNetworkDiagnosticsClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadFixedLabelAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadEthernetNetworkDiagnosticsClusterRevision() {}
+    ~ReadFixedLabelAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000040) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"EthernetNetworkDiagnostics.ClusterRevision response %@", [value description]);
+        CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FixedLabel.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("EthernetNetworkDiagnostics ClusterRevision read Error", error);
+                LogNSError("FixedLabel AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -34787,34 +34386,32 @@ class ReadEthernetNetworkDiagnosticsClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeEthernetNetworkDiagnosticsClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeFixedLabelAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeEthernetNetworkDiagnosticsClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeFixedLabelAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeEthernetNetworkDiagnosticsClusterRevision() {}
+    ~SubscribeAttributeFixedLabelAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000037) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000040) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPEthernetNetworkDiagnostics * cluster = [[CHIPEthernetNetworkDiagnostics alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"EthernetNetworkDiagnostics.ClusterRevision response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FixedLabel.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -34824,54 +34421,28 @@ class SubscribeAttributeEthernetNetworkDiagnosticsClusterRevision : public Subsc
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster FanControl                                                  | 0x0202 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * FanMode                                                           | 0x0000 |
-| * FanModeSequence                                                   | 0x0001 |
-| * PercentSetting                                                    | 0x0002 |
-| * PercentCurrent                                                    | 0x0003 |
-| * SpeedMax                                                          | 0x0004 |
-| * SpeedSetting                                                      | 0x0005 |
-| * SpeedCurrent                                                      | 0x0006 |
-| * RockSupport                                                       | 0x0007 |
-| * RockSetting                                                       | 0x0008 |
-| * WindSupport                                                       | 0x0009 |
-| * WindSetting                                                       | 0x000A |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Attribute FanMode
+ * Attribute AttributeList
  */
-class ReadFanControlFanMode : public ReadAttribute {
+class ReadFixedLabelAttributeList : public ReadAttribute {
 public:
-    ReadFanControlFanMode()
-        : ReadAttribute("fan-mode")
+    ReadFixedLabelAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadFanControlFanMode() {}
+    ~ReadFixedLabelAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000040) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFanModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FanControl.FanMode response %@", [value description]);
+        CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FixedLabel.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("FanControl FanMode read Error", error);
+                LogNSError("FixedLabel AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -34879,70 +34450,32 @@ class ReadFanControlFanMode : public ReadAttribute {
     }
 };
 
-class WriteFanControlFanMode : public WriteAttribute {
-public:
-    WriteFanControlFanMode()
-        : WriteAttribute("fan-mode")
-    {
-        AddArgument("attr-name", "fan-mode");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteFanControlFanMode() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) WriteAttribute (0x00000000) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeFanModeWithValue:value
-                                         params:params
-                              completionHandler:^(NSError * _Nullable error) {
-                                  if (error != nil) {
-                                      LogNSError("FanControl FanMode write Error", error);
-                                  }
-                                  SetCommandExitStatus(error);
-                              }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeFanControlFanMode : public SubscribeAttribute {
+class SubscribeAttributeFixedLabelAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeFanControlFanMode()
-        : SubscribeAttribute("fan-mode")
+    SubscribeAttributeFixedLabelAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeFanControlFanMode() {}
+    ~SubscribeAttributeFixedLabelAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000040) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFanModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FanControl.FanMode response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FixedLabel.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -34953,27 +34486,27 @@ class SubscribeAttributeFanControlFanMode : public SubscribeAttribute {
 };
 
 /*
- * Attribute FanModeSequence
+ * Attribute FeatureMap
  */
-class ReadFanControlFanModeSequence : public ReadAttribute {
+class ReadFixedLabelFeatureMap : public ReadAttribute {
 public:
-    ReadFanControlFanModeSequence()
-        : ReadAttribute("fan-mode-sequence")
+    ReadFixedLabelFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadFanControlFanModeSequence() {}
+    ~ReadFixedLabelFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000040) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFanModeSequenceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FanControl.FanModeSequence response %@", [value description]);
+        CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FixedLabel.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("FanControl FanModeSequence read Error", error);
+                LogNSError("FixedLabel FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -34981,70 +34514,32 @@ class ReadFanControlFanModeSequence : public ReadAttribute {
     }
 };
 
-class WriteFanControlFanModeSequence : public WriteAttribute {
-public:
-    WriteFanControlFanModeSequence()
-        : WriteAttribute("fan-mode-sequence")
-    {
-        AddArgument("attr-name", "fan-mode-sequence");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteFanControlFanModeSequence() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) WriteAttribute (0x00000001) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeFanModeSequenceWithValue:value
-                                                 params:params
-                                      completionHandler:^(NSError * _Nullable error) {
-                                          if (error != nil) {
-                                              LogNSError("FanControl FanModeSequence write Error", error);
-                                          }
-                                          SetCommandExitStatus(error);
-                                      }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeFanControlFanModeSequence : public SubscribeAttribute {
+class SubscribeAttributeFixedLabelFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeFanControlFanModeSequence()
-        : SubscribeAttribute("fan-mode-sequence")
+    SubscribeAttributeFixedLabelFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeFanControlFanModeSequence() {}
+    ~SubscribeAttributeFixedLabelFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000040) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFanModeSequenceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FanControl.FanModeSequence response %@", [value description]);
+                NSLog(@"FixedLabel.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -35055,27 +34550,27 @@ class SubscribeAttributeFanControlFanModeSequence : public SubscribeAttribute {
 };
 
 /*
- * Attribute PercentSetting
+ * Attribute ClusterRevision
  */
-class ReadFanControlPercentSetting : public ReadAttribute {
+class ReadFixedLabelClusterRevision : public ReadAttribute {
 public:
-    ReadFanControlPercentSetting()
-        : ReadAttribute("percent-setting")
+    ReadFixedLabelClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadFanControlPercentSetting() {}
+    ~ReadFixedLabelClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000040) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributePercentSettingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FanControl.PercentSetting response %@", [value description]);
+        CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FixedLabel.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("FanControl PercentSetting read Error", error);
+                LogNSError("FixedLabel ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -35083,70 +34578,32 @@ class ReadFanControlPercentSetting : public ReadAttribute {
     }
 };
 
-class WriteFanControlPercentSetting : public WriteAttribute {
-public:
-    WriteFanControlPercentSetting()
-        : WriteAttribute("percent-setting")
-    {
-        AddArgument("attr-name", "percent-setting");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteFanControlPercentSetting() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) WriteAttribute (0x00000002) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributePercentSettingWithValue:value
-                                                params:params
-                                     completionHandler:^(NSError * _Nullable error) {
-                                         if (error != nil) {
-                                             LogNSError("FanControl PercentSetting write Error", error);
-                                         }
-                                         SetCommandExitStatus(error);
-                                     }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeFanControlPercentSetting : public SubscribeAttribute {
+class SubscribeAttributeFixedLabelClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeFanControlPercentSetting()
-        : SubscribeAttribute("percent-setting")
+    SubscribeAttributeFixedLabelClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeFanControlPercentSetting() {}
+    ~SubscribeAttributeFixedLabelClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000040) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePercentSettingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FanControl.PercentSetting response %@", [value description]);
+                NSLog(@"FixedLabel.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -35156,28 +34613,44 @@ class SubscribeAttributeFanControlPercentSetting : public SubscribeAttribute {
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster UserLabel                                                   | 0x0041 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * LabelList                                                         | 0x0000 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute PercentCurrent
+ * Attribute LabelList
  */
-class ReadFanControlPercentCurrent : public ReadAttribute {
+class ReadUserLabelLabelList : public ReadAttribute {
 public:
-    ReadFanControlPercentCurrent()
-        : ReadAttribute("percent-current")
+    ReadUserLabelLabelList()
+        : ReadAttribute("label-list")
     {
     }
 
-    ~ReadFanControlPercentCurrent() {}
+    ~ReadUserLabelLabelList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000041) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributePercentCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FanControl.PercentCurrent response %@", [value description]);
+        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeLabelListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"UserLabel.LabelList response %@", [value description]);
             if (error != nil) {
-                LogNSError("FanControl PercentCurrent read Error", error);
+                LogNSError("UserLabel LabelList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -35185,96 +34658,87 @@ class ReadFanControlPercentCurrent : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeFanControlPercentCurrent : public SubscribeAttribute {
+class WriteUserLabelLabelList : public WriteAttribute {
 public:
-    SubscribeAttributeFanControlPercentCurrent()
-        : SubscribeAttribute("percent-current")
-    {
-    }
-
-    ~SubscribeAttributeFanControlPercentCurrent() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x00000003) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePercentCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FanControl.PercentCurrent response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-/*
- * Attribute SpeedMax
- */
-class ReadFanControlSpeedMax : public ReadAttribute {
-public:
-    ReadFanControlSpeedMax()
-        : ReadAttribute("speed-max")
+    WriteUserLabelLabelList()
+        : WriteAttribute("label-list")
+        , mComplex(&mValue)
     {
+        AddArgument("attr-name", "label-list");
+        AddArgument("attr-value", &mComplex);
+        WriteAttribute::AddArguments();
     }
 
-    ~ReadFanControlSpeedMax() {}
+    ~WriteUserLabelLabelList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x00000004) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000041) WriteAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeSpeedMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FanControl.SpeedMax response %@", [value description]);
-            if (error != nil) {
-                LogNSError("FanControl SpeedMax read Error", error);
+        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mValue) {
+                CHIPUserLabelClusterLabelStruct * newElement_0;
+                newElement_0 = [CHIPUserLabelClusterLabelStruct new];
+                newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data()
+                                                              length:entry_0.label.size()
+                                                            encoding:NSUTF8StringEncoding];
+                newElement_0.value = [[NSString alloc] initWithBytes:entry_0.value.data()
+                                                              length:entry_0.value.size()
+                                                            encoding:NSUTF8StringEncoding];
+                [array_0 addObject:newElement_0];
             }
-            SetCommandExitStatus(error);
-        }];
+            value = array_0;
+        }
+
+        [cluster writeAttributeLabelListWithValue:value
+                                           params:params
+                                completionHandler:^(NSError * _Nullable error) {
+                                    if (error != nil) {
+                                        LogNSError("UserLabel LabelList write Error", error);
+                                    }
+                                    SetCommandExitStatus(error);
+                                }];
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::DataModel::List<const chip::app::Clusters::UserLabel::Structs::LabelStruct::Type> mValue;
+    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::UserLabel::Structs::LabelStruct::Type>> mComplex;
 };
 
-class SubscribeAttributeFanControlSpeedMax : public SubscribeAttribute {
+class SubscribeAttributeUserLabelLabelList : public SubscribeAttribute {
 public:
-    SubscribeAttributeFanControlSpeedMax()
-        : SubscribeAttribute("speed-max")
+    SubscribeAttributeUserLabelLabelList()
+        : SubscribeAttribute("label-list")
     {
     }
 
-    ~SubscribeAttributeFanControlSpeedMax() {}
+    ~SubscribeAttributeUserLabelLabelList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000041) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSpeedMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeLabelListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FanControl.SpeedMax response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"UserLabel.LabelList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -35285,27 +34749,27 @@ class SubscribeAttributeFanControlSpeedMax : public SubscribeAttribute {
 };
 
 /*
- * Attribute SpeedSetting
+ * Attribute GeneratedCommandList
  */
-class ReadFanControlSpeedSetting : public ReadAttribute {
+class ReadUserLabelGeneratedCommandList : public ReadAttribute {
 public:
-    ReadFanControlSpeedSetting()
-        : ReadAttribute("speed-setting")
+    ReadUserLabelGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadFanControlSpeedSetting() {}
+    ~ReadUserLabelGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000041) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeSpeedSettingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FanControl.SpeedSetting response %@", [value description]);
+        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"UserLabel.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("FanControl SpeedSetting read Error", error);
+                LogNSError("UserLabel GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -35313,70 +34777,32 @@ class ReadFanControlSpeedSetting : public ReadAttribute {
     }
 };
 
-class WriteFanControlSpeedSetting : public WriteAttribute {
-public:
-    WriteFanControlSpeedSetting()
-        : WriteAttribute("speed-setting")
-    {
-        AddArgument("attr-name", "speed-setting");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteFanControlSpeedSetting() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) WriteAttribute (0x00000005) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeSpeedSettingWithValue:value
-                                              params:params
-                                   completionHandler:^(NSError * _Nullable error) {
-                                       if (error != nil) {
-                                           LogNSError("FanControl SpeedSetting write Error", error);
-                                       }
-                                       SetCommandExitStatus(error);
-                                   }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeFanControlSpeedSetting : public SubscribeAttribute {
+class SubscribeAttributeUserLabelGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeFanControlSpeedSetting()
-        : SubscribeAttribute("speed-setting")
+    SubscribeAttributeUserLabelGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeFanControlSpeedSetting() {}
+    ~SubscribeAttributeUserLabelGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000041) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSpeedSettingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FanControl.SpeedSetting response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"UserLabel.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -35387,27 +34813,27 @@ class SubscribeAttributeFanControlSpeedSetting : public SubscribeAttribute {
 };
 
 /*
- * Attribute SpeedCurrent
+ * Attribute AcceptedCommandList
  */
-class ReadFanControlSpeedCurrent : public ReadAttribute {
+class ReadUserLabelAcceptedCommandList : public ReadAttribute {
 public:
-    ReadFanControlSpeedCurrent()
-        : ReadAttribute("speed-current")
+    ReadUserLabelAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadFanControlSpeedCurrent() {}
+    ~ReadUserLabelAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000041) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeSpeedCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FanControl.SpeedCurrent response %@", [value description]);
+        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"UserLabel.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("FanControl SpeedCurrent read Error", error);
+                LogNSError("UserLabel AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -35415,32 +34841,32 @@ class ReadFanControlSpeedCurrent : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeFanControlSpeedCurrent : public SubscribeAttribute {
+class SubscribeAttributeUserLabelAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeFanControlSpeedCurrent()
-        : SubscribeAttribute("speed-current")
+    SubscribeAttributeUserLabelAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeFanControlSpeedCurrent() {}
+    ~SubscribeAttributeUserLabelAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000041) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSpeedCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FanControl.SpeedCurrent response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"UserLabel.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -35451,27 +34877,27 @@ class SubscribeAttributeFanControlSpeedCurrent : public SubscribeAttribute {
 };
 
 /*
- * Attribute RockSupport
+ * Attribute AttributeList
  */
-class ReadFanControlRockSupport : public ReadAttribute {
+class ReadUserLabelAttributeList : public ReadAttribute {
 public:
-    ReadFanControlRockSupport()
-        : ReadAttribute("rock-support")
+    ReadUserLabelAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadFanControlRockSupport() {}
+    ~ReadUserLabelAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000041) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeRockSupportWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FanControl.RockSupport response %@", [value description]);
+        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"UserLabel.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("FanControl RockSupport read Error", error);
+                LogNSError("UserLabel AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -35479,32 +34905,32 @@ class ReadFanControlRockSupport : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeFanControlRockSupport : public SubscribeAttribute {
+class SubscribeAttributeUserLabelAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeFanControlRockSupport()
-        : SubscribeAttribute("rock-support")
+    SubscribeAttributeUserLabelAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeFanControlRockSupport() {}
+    ~SubscribeAttributeUserLabelAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000041) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRockSupportWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FanControl.RockSupport response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"UserLabel.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -35515,27 +34941,27 @@ class SubscribeAttributeFanControlRockSupport : public SubscribeAttribute {
 };
 
 /*
- * Attribute RockSetting
+ * Attribute FeatureMap
  */
-class ReadFanControlRockSetting : public ReadAttribute {
+class ReadUserLabelFeatureMap : public ReadAttribute {
 public:
-    ReadFanControlRockSetting()
-        : ReadAttribute("rock-setting")
+    ReadUserLabelFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadFanControlRockSetting() {}
+    ~ReadUserLabelFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000041) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeRockSettingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FanControl.RockSetting response %@", [value description]);
+        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"UserLabel.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("FanControl RockSetting read Error", error);
+                LogNSError("UserLabel FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -35543,70 +34969,32 @@ class ReadFanControlRockSetting : public ReadAttribute {
     }
 };
 
-class WriteFanControlRockSetting : public WriteAttribute {
-public:
-    WriteFanControlRockSetting()
-        : WriteAttribute("rock-setting")
-    {
-        AddArgument("attr-name", "rock-setting");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteFanControlRockSetting() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) WriteAttribute (0x00000008) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeRockSettingWithValue:value
-                                             params:params
-                                  completionHandler:^(NSError * _Nullable error) {
-                                      if (error != nil) {
-                                          LogNSError("FanControl RockSetting write Error", error);
-                                      }
-                                      SetCommandExitStatus(error);
-                                  }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeFanControlRockSetting : public SubscribeAttribute {
+class SubscribeAttributeUserLabelFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeFanControlRockSetting()
-        : SubscribeAttribute("rock-setting")
+    SubscribeAttributeUserLabelFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeFanControlRockSetting() {}
+    ~SubscribeAttributeUserLabelFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000041) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRockSettingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FanControl.RockSetting response %@", [value description]);
+                NSLog(@"UserLabel.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -35617,27 +35005,27 @@ class SubscribeAttributeFanControlRockSetting : public SubscribeAttribute {
 };
 
 /*
- * Attribute WindSupport
+ * Attribute ClusterRevision
  */
-class ReadFanControlWindSupport : public ReadAttribute {
+class ReadUserLabelClusterRevision : public ReadAttribute {
 public:
-    ReadFanControlWindSupport()
-        : ReadAttribute("wind-support")
+    ReadUserLabelClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadFanControlWindSupport() {}
+    ~ReadUserLabelClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000041) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeWindSupportWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FanControl.WindSupport response %@", [value description]);
+        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"UserLabel.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("FanControl WindSupport read Error", error);
+                LogNSError("UserLabel ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -35645,32 +35033,32 @@ class ReadFanControlWindSupport : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeFanControlWindSupport : public SubscribeAttribute {
+class SubscribeAttributeUserLabelClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeFanControlWindSupport()
-        : SubscribeAttribute("wind-support")
+    SubscribeAttributeUserLabelClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeFanControlWindSupport() {}
+    ~SubscribeAttributeUserLabelClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000041) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeWindSupportWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FanControl.WindSupport response %@", [value description]);
+                NSLog(@"UserLabel.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -35680,28 +35068,45 @@ class SubscribeAttributeFanControlWindSupport : public SubscribeAttribute {
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster BooleanState                                                | 0x0045 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * StateValue                                                        | 0x0000 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * StateChange                                                       | 0x0000 |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute WindSetting
+ * Attribute StateValue
  */
-class ReadFanControlWindSetting : public ReadAttribute {
+class ReadBooleanStateStateValue : public ReadAttribute {
 public:
-    ReadFanControlWindSetting()
-        : ReadAttribute("wind-setting")
+    ReadBooleanStateStateValue()
+        : ReadAttribute("state-value")
     {
     }
 
-    ~ReadFanControlWindSetting() {}
+    ~ReadBooleanStateStateValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x0000000A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000045) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeWindSettingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FanControl.WindSetting response %@", [value description]);
+        CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeStateValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BooleanState.StateValue response %@", [value description]);
             if (error != nil) {
-                LogNSError("FanControl WindSetting read Error", error);
+                LogNSError("BooleanState StateValue read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -35709,70 +35114,32 @@ class ReadFanControlWindSetting : public ReadAttribute {
     }
 };
 
-class WriteFanControlWindSetting : public WriteAttribute {
-public:
-    WriteFanControlWindSetting()
-        : WriteAttribute("wind-setting")
-    {
-        AddArgument("attr-name", "wind-setting");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteFanControlWindSetting() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) WriteAttribute (0x0000000A) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeWindSettingWithValue:value
-                                             params:params
-                                  completionHandler:^(NSError * _Nullable error) {
-                                      if (error != nil) {
-                                          LogNSError("FanControl WindSetting write Error", error);
-                                      }
-                                      SetCommandExitStatus(error);
-                                  }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeFanControlWindSetting : public SubscribeAttribute {
+class SubscribeAttributeBooleanStateStateValue : public SubscribeAttribute {
 public:
-    SubscribeAttributeFanControlWindSetting()
-        : SubscribeAttribute("wind-setting")
+    SubscribeAttributeBooleanStateStateValue()
+        : SubscribeAttribute("state-value")
     {
     }
 
-    ~SubscribeAttributeFanControlWindSetting() {}
+    ~SubscribeAttributeBooleanStateStateValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x0000000A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000045) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeWindSettingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeStateValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FanControl.WindSetting response %@", [value description]);
+                NSLog(@"BooleanState.StateValue response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -35785,25 +35152,25 @@ class SubscribeAttributeFanControlWindSetting : public SubscribeAttribute {
 /*
  * Attribute GeneratedCommandList
  */
-class ReadFanControlGeneratedCommandList : public ReadAttribute {
+class ReadBooleanStateGeneratedCommandList : public ReadAttribute {
 public:
-    ReadFanControlGeneratedCommandList()
+    ReadBooleanStateGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadFanControlGeneratedCommandList() {}
+    ~ReadBooleanStateGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000045) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FanControl.GeneratedCommandList response %@", [value description]);
+            NSLog(@"BooleanState.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("FanControl GeneratedCommandList read Error", error);
+                LogNSError("BooleanState GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -35811,20 +35178,20 @@ class ReadFanControlGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeFanControlGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeBooleanStateGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeFanControlGeneratedCommandList()
+    SubscribeAttributeBooleanStateGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeFanControlGeneratedCommandList() {}
+    ~SubscribeAttributeBooleanStateGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000045) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -35836,7 +35203,7 @@ class SubscribeAttributeFanControlGeneratedCommandList : public SubscribeAttribu
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FanControl.GeneratedCommandList response %@", [value description]);
+                NSLog(@"BooleanState.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -35849,25 +35216,25 @@ class SubscribeAttributeFanControlGeneratedCommandList : public SubscribeAttribu
 /*
  * Attribute AcceptedCommandList
  */
-class ReadFanControlAcceptedCommandList : public ReadAttribute {
+class ReadBooleanStateAcceptedCommandList : public ReadAttribute {
 public:
-    ReadFanControlAcceptedCommandList()
+    ReadBooleanStateAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadFanControlAcceptedCommandList() {}
+    ~ReadBooleanStateAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000045) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FanControl.AcceptedCommandList response %@", [value description]);
+            NSLog(@"BooleanState.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("FanControl AcceptedCommandList read Error", error);
+                LogNSError("BooleanState AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -35875,20 +35242,20 @@ class ReadFanControlAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeFanControlAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeBooleanStateAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeFanControlAcceptedCommandList()
+    SubscribeAttributeBooleanStateAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeFanControlAcceptedCommandList() {}
+    ~SubscribeAttributeBooleanStateAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000045) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -35900,7 +35267,7 @@ class SubscribeAttributeFanControlAcceptedCommandList : public SubscribeAttribut
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FanControl.AcceptedCommandList response %@", [value description]);
+                NSLog(@"BooleanState.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -35913,25 +35280,25 @@ class SubscribeAttributeFanControlAcceptedCommandList : public SubscribeAttribut
 /*
  * Attribute AttributeList
  */
-class ReadFanControlAttributeList : public ReadAttribute {
+class ReadBooleanStateAttributeList : public ReadAttribute {
 public:
-    ReadFanControlAttributeList()
+    ReadBooleanStateAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadFanControlAttributeList() {}
+    ~ReadBooleanStateAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000045) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FanControl.AttributeList response %@", [value description]);
+            NSLog(@"BooleanState.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("FanControl AttributeList read Error", error);
+                LogNSError("BooleanState AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -35939,20 +35306,20 @@ class ReadFanControlAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeFanControlAttributeList : public SubscribeAttribute {
+class SubscribeAttributeBooleanStateAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeFanControlAttributeList()
+    SubscribeAttributeBooleanStateAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeFanControlAttributeList() {}
+    ~SubscribeAttributeBooleanStateAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000045) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -35964,7 +35331,7 @@ class SubscribeAttributeFanControlAttributeList : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FanControl.AttributeList response %@", [value description]);
+                NSLog(@"BooleanState.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -35977,25 +35344,25 @@ class SubscribeAttributeFanControlAttributeList : public SubscribeAttribute {
 /*
  * Attribute FeatureMap
  */
-class ReadFanControlFeatureMap : public ReadAttribute {
+class ReadBooleanStateFeatureMap : public ReadAttribute {
 public:
-    ReadFanControlFeatureMap()
+    ReadBooleanStateFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadFanControlFeatureMap() {}
+    ~ReadBooleanStateFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000045) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FanControl.FeatureMap response %@", [value description]);
+            NSLog(@"BooleanState.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("FanControl FeatureMap read Error", error);
+                LogNSError("BooleanState FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -36003,20 +35370,20 @@ class ReadFanControlFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeFanControlFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeBooleanStateFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeFanControlFeatureMap()
+    SubscribeAttributeBooleanStateFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeFanControlFeatureMap() {}
+    ~SubscribeAttributeBooleanStateFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000045) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -36028,7 +35395,7 @@ class SubscribeAttributeFanControlFeatureMap : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FanControl.FeatureMap response %@", [value description]);
+                NSLog(@"BooleanState.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -36041,25 +35408,25 @@ class SubscribeAttributeFanControlFeatureMap : public SubscribeAttribute {
 /*
  * Attribute ClusterRevision
  */
-class ReadFanControlClusterRevision : public ReadAttribute {
+class ReadBooleanStateClusterRevision : public ReadAttribute {
 public:
-    ReadFanControlClusterRevision()
+    ReadBooleanStateClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadFanControlClusterRevision() {}
+    ~ReadBooleanStateClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000045) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FanControl.ClusterRevision response %@", [value description]);
+            NSLog(@"BooleanState.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("FanControl ClusterRevision read Error", error);
+                LogNSError("BooleanState ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -36067,20 +35434,20 @@ class ReadFanControlClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeFanControlClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeBooleanStateClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeFanControlClusterRevision()
+    SubscribeAttributeBooleanStateClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeFanControlClusterRevision() {}
+    ~SubscribeAttributeBooleanStateClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000045) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -36092,7 +35459,7 @@ class SubscribeAttributeFanControlClusterRevision : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FanControl.ClusterRevision response %@", [value description]);
+                NSLog(@"BooleanState.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -36103,12 +35470,18 @@ class SubscribeAttributeFanControlClusterRevision : public SubscribeAttribute {
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster FixedLabel                                                  | 0x0040 |
+| Cluster ModeSelect                                                  | 0x0050 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
+| * ChangeToMode                                                      |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * LabelList                                                         | 0x0000 |
+| * Description                                                       | 0x0000 |
+| * StandardNamespace                                                 | 0x0001 |
+| * SupportedModes                                                    | 0x0002 |
+| * CurrentMode                                                       | 0x0003 |
+| * StartUpMode                                                       | 0x0004 |
+| * OnMode                                                            | 0x0005 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -36119,27 +35492,71 @@ class SubscribeAttributeFanControlClusterRevision : public SubscribeAttribute {
 \*----------------------------------------------------------------------------*/
 
 /*
- * Attribute LabelList
+ * Command ChangeToMode
  */
-class ReadFixedLabelLabelList : public ReadAttribute {
+class ModeSelectChangeToMode : public ClusterCommand {
 public:
-    ReadFixedLabelLabelList()
-        : ReadAttribute("label-list")
+    ModeSelectChangeToMode()
+        : ClusterCommand("change-to-mode")
     {
+        AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadFixedLabelLabelList() {}
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000050) command (0x00000000) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPModeSelectClusterChangeToModeParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.newMode = [NSNumber numberWithUnsignedChar:mRequest.newMode];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster changeToModeWithParams:params
+                          completionHandler:^(NSError * _Nullable error) {
+                              responsesNeeded--;
+                              if (error != nil) {
+                                  mError = error;
+                                  LogNSError("Error", error);
+                              }
+                              if (responsesNeeded == 0) {
+                                  SetCommandExitStatus(mError);
+                              }
+                          }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::ModeSelect::Commands::ChangeToMode::Type mRequest;
+};
+
+/*
+ * Attribute Description
+ */
+class ReadModeSelectDescription : public ReadAttribute {
+public:
+    ReadModeSelectDescription()
+        : ReadAttribute("description")
+    {
+    }
+
+    ~ReadModeSelectDescription() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000040) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeLabelListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FixedLabel.LabelList response %@", [value description]);
+        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeDescriptionWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ModeSelect.Description response %@", [value description]);
             if (error != nil) {
-                LogNSError("FixedLabel LabelList read Error", error);
+                LogNSError("ModeSelect Description read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -36147,32 +35564,32 @@ class ReadFixedLabelLabelList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeFixedLabelLabelList : public SubscribeAttribute {
+class SubscribeAttributeModeSelectDescription : public SubscribeAttribute {
 public:
-    SubscribeAttributeFixedLabelLabelList()
-        : SubscribeAttribute("label-list")
+    SubscribeAttributeModeSelectDescription()
+        : SubscribeAttribute("description")
     {
     }
 
-    ~SubscribeAttributeFixedLabelLabelList() {}
+    ~SubscribeAttributeModeSelectDescription() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000040) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLabelListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDescriptionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FixedLabel.LabelList response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ModeSelect.Description response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -36183,27 +35600,27 @@ class SubscribeAttributeFixedLabelLabelList : public SubscribeAttribute {
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute StandardNamespace
  */
-class ReadFixedLabelGeneratedCommandList : public ReadAttribute {
+class ReadModeSelectStandardNamespace : public ReadAttribute {
 public:
-    ReadFixedLabelGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadModeSelectStandardNamespace()
+        : ReadAttribute("standard-namespace")
     {
     }
 
-    ~ReadFixedLabelGeneratedCommandList() {}
+    ~ReadModeSelectStandardNamespace() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000040) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FixedLabel.GeneratedCommandList response %@", [value description]);
+        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeStandardNamespaceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ModeSelect.StandardNamespace response %@", [value description]);
             if (error != nil) {
-                LogNSError("FixedLabel GeneratedCommandList read Error", error);
+                LogNSError("ModeSelect StandardNamespace read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -36211,32 +35628,32 @@ class ReadFixedLabelGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeFixedLabelGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeModeSelectStandardNamespace : public SubscribeAttribute {
 public:
-    SubscribeAttributeFixedLabelGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeModeSelectStandardNamespace()
+        : SubscribeAttribute("standard-namespace")
     {
     }
 
-    ~SubscribeAttributeFixedLabelGeneratedCommandList() {}
+    ~SubscribeAttributeModeSelectStandardNamespace() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000040) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeStandardNamespaceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FixedLabel.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ModeSelect.StandardNamespace response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -36247,27 +35664,27 @@ class SubscribeAttributeFixedLabelGeneratedCommandList : public SubscribeAttribu
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute SupportedModes
  */
-class ReadFixedLabelAcceptedCommandList : public ReadAttribute {
+class ReadModeSelectSupportedModes : public ReadAttribute {
 public:
-    ReadFixedLabelAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadModeSelectSupportedModes()
+        : ReadAttribute("supported-modes")
     {
     }
 
-    ~ReadFixedLabelAcceptedCommandList() {}
+    ~ReadModeSelectSupportedModes() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000040) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FixedLabel.AcceptedCommandList response %@", [value description]);
+        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeSupportedModesWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ModeSelect.SupportedModes response %@", [value description]);
             if (error != nil) {
-                LogNSError("FixedLabel AcceptedCommandList read Error", error);
+                LogNSError("ModeSelect SupportedModes read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -36275,32 +35692,32 @@ class ReadFixedLabelAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeFixedLabelAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeModeSelectSupportedModes : public SubscribeAttribute {
 public:
-    SubscribeAttributeFixedLabelAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeModeSelectSupportedModes()
+        : SubscribeAttribute("supported-modes")
     {
     }
 
-    ~SubscribeAttributeFixedLabelAcceptedCommandList() {}
+    ~SubscribeAttributeModeSelectSupportedModes() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000040) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSupportedModesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FixedLabel.AcceptedCommandList response %@", [value description]);
+                NSLog(@"ModeSelect.SupportedModes response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -36311,27 +35728,27 @@ class SubscribeAttributeFixedLabelAcceptedCommandList : public SubscribeAttribut
 };
 
 /*
- * Attribute AttributeList
+ * Attribute CurrentMode
  */
-class ReadFixedLabelAttributeList : public ReadAttribute {
+class ReadModeSelectCurrentMode : public ReadAttribute {
 public:
-    ReadFixedLabelAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadModeSelectCurrentMode()
+        : ReadAttribute("current-mode")
     {
     }
 
-    ~ReadFixedLabelAttributeList() {}
+    ~ReadModeSelectCurrentMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000040) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FixedLabel.AttributeList response %@", [value description]);
+        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCurrentModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ModeSelect.CurrentMode response %@", [value description]);
             if (error != nil) {
-                LogNSError("FixedLabel AttributeList read Error", error);
+                LogNSError("ModeSelect CurrentMode read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -36339,32 +35756,32 @@ class ReadFixedLabelAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeFixedLabelAttributeList : public SubscribeAttribute {
+class SubscribeAttributeModeSelectCurrentMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeFixedLabelAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeModeSelectCurrentMode()
+        : SubscribeAttribute("current-mode")
     {
     }
 
-    ~SubscribeAttributeFixedLabelAttributeList() {}
+    ~SubscribeAttributeModeSelectCurrentMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000040) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCurrentModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FixedLabel.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ModeSelect.CurrentMode response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -36375,27 +35792,27 @@ class SubscribeAttributeFixedLabelAttributeList : public SubscribeAttribute {
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute StartUpMode
  */
-class ReadFixedLabelFeatureMap : public ReadAttribute {
+class ReadModeSelectStartUpMode : public ReadAttribute {
 public:
-    ReadFixedLabelFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadModeSelectStartUpMode()
+        : ReadAttribute("start-up-mode")
     {
     }
 
-    ~ReadFixedLabelFeatureMap() {}
+    ~ReadModeSelectStartUpMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000040) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FixedLabel.FeatureMap response %@", [value description]);
+        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeStartUpModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ModeSelect.StartUpMode response %@", [value description]);
             if (error != nil) {
-                LogNSError("FixedLabel FeatureMap read Error", error);
+                LogNSError("ModeSelect StartUpMode read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -36403,32 +35820,70 @@ class ReadFixedLabelFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeFixedLabelFeatureMap : public SubscribeAttribute {
+class WriteModeSelectStartUpMode : public WriteAttribute {
 public:
-    SubscribeAttributeFixedLabelFeatureMap()
-        : SubscribeAttribute("feature-map")
+    WriteModeSelectStartUpMode()
+        : WriteAttribute("start-up-mode")
     {
+        AddArgument("attr-name", "start-up-mode");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeFixedLabelFeatureMap() {}
+    ~WriteModeSelectStartUpMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000040) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000050) WriteAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeStartUpModeWithValue:value
+                                             params:params
+                                  completionHandler:^(NSError * _Nullable error) {
+                                      if (error != nil) {
+                                          LogNSError("ModeSelect StartUpMode write Error", error);
+                                      }
+                                      SetCommandExitStatus(error);
+                                  }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeModeSelectStartUpMode : public SubscribeAttribute {
+public:
+    SubscribeAttributeModeSelectStartUpMode()
+        : SubscribeAttribute("start-up-mode")
+    {
+    }
+
+    ~SubscribeAttributeModeSelectStartUpMode() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeStartUpModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FixedLabel.FeatureMap response %@", [value description]);
+                NSLog(@"ModeSelect.StartUpMode response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -36439,27 +35894,27 @@ class SubscribeAttributeFixedLabelFeatureMap : public SubscribeAttribute {
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute OnMode
  */
-class ReadFixedLabelClusterRevision : public ReadAttribute {
+class ReadModeSelectOnMode : public ReadAttribute {
 public:
-    ReadFixedLabelClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadModeSelectOnMode()
+        : ReadAttribute("on-mode")
     {
     }
 
-    ~ReadFixedLabelClusterRevision() {}
+    ~ReadModeSelectOnMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000040) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReadAttribute (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FixedLabel.ClusterRevision response %@", [value description]);
+        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeOnModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ModeSelect.OnMode response %@", [value description]);
             if (error != nil) {
-                LogNSError("FixedLabel ClusterRevision read Error", error);
+                LogNSError("ModeSelect OnMode read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -36467,32 +35922,70 @@ class ReadFixedLabelClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeFixedLabelClusterRevision : public SubscribeAttribute {
+class WriteModeSelectOnMode : public WriteAttribute {
 public:
-    SubscribeAttributeFixedLabelClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    WriteModeSelectOnMode()
+        : WriteAttribute("on-mode")
     {
+        AddArgument("attr-name", "on-mode");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeFixedLabelClusterRevision() {}
+    ~WriteModeSelectOnMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000040) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000050) WriteAttribute (0x00000005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeOnModeWithValue:value
+                                        params:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 if (error != nil) {
+                                     LogNSError("ModeSelect OnMode write Error", error);
+                                 }
+                                 SetCommandExitStatus(error);
+                             }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeModeSelectOnMode : public SubscribeAttribute {
+public:
+    SubscribeAttributeModeSelectOnMode()
+        : SubscribeAttribute("on-mode")
+    {
+    }
+
+    ~SubscribeAttributeModeSelectOnMode() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOnModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FixedLabel.ClusterRevision response %@", [value description]);
+                NSLog(@"ModeSelect.OnMode response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -36502,47 +35995,28 @@ class SubscribeAttributeFixedLabelClusterRevision : public SubscribeAttribute {
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster FlowMeasurement                                             | 0x0404 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * MeasuredValue                                                     | 0x0000 |
-| * MinMeasuredValue                                                  | 0x0001 |
-| * MaxMeasuredValue                                                  | 0x0002 |
-| * Tolerance                                                         | 0x0003 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Attribute MeasuredValue
+ * Attribute GeneratedCommandList
  */
-class ReadFlowMeasurementMeasuredValue : public ReadAttribute {
+class ReadModeSelectGeneratedCommandList : public ReadAttribute {
 public:
-    ReadFlowMeasurementMeasuredValue()
-        : ReadAttribute("measured-value")
+    ReadModeSelectGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadFlowMeasurementMeasuredValue() {}
+    ~ReadModeSelectGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FlowMeasurement.MeasuredValue response %@", [value description]);
+        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ModeSelect.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("FlowMeasurement MeasuredValue read Error", error);
+                LogNSError("ModeSelect GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -36550,32 +36024,32 @@ class ReadFlowMeasurementMeasuredValue : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeFlowMeasurementMeasuredValue : public SubscribeAttribute {
+class SubscribeAttributeModeSelectGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeFlowMeasurementMeasuredValue()
-        : SubscribeAttribute("measured-value")
+    SubscribeAttributeModeSelectGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeFlowMeasurementMeasuredValue() {}
+    ~SubscribeAttributeModeSelectGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FlowMeasurement.MeasuredValue response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ModeSelect.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -36586,27 +36060,27 @@ class SubscribeAttributeFlowMeasurementMeasuredValue : public SubscribeAttribute
 };
 
 /*
- * Attribute MinMeasuredValue
+ * Attribute AcceptedCommandList
  */
-class ReadFlowMeasurementMinMeasuredValue : public ReadAttribute {
+class ReadModeSelectAcceptedCommandList : public ReadAttribute {
 public:
-    ReadFlowMeasurementMinMeasuredValue()
-        : ReadAttribute("min-measured-value")
+    ReadModeSelectAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadFlowMeasurementMinMeasuredValue() {}
+    ~ReadModeSelectAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeMinMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FlowMeasurement.MinMeasuredValue response %@", [value description]);
+        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ModeSelect.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("FlowMeasurement MinMeasuredValue read Error", error);
+                LogNSError("ModeSelect AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -36614,276 +36088,20 @@ class ReadFlowMeasurementMinMeasuredValue : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeFlowMeasurementMinMeasuredValue : public SubscribeAttribute {
+class SubscribeAttributeModeSelectAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeFlowMeasurementMinMeasuredValue()
-        : SubscribeAttribute("min-measured-value")
+    SubscribeAttributeModeSelectAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeFlowMeasurementMinMeasuredValue() {}
+    ~SubscribeAttributeModeSelectAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMinMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FlowMeasurement.MinMeasuredValue response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-/*
- * Attribute MaxMeasuredValue
- */
-class ReadFlowMeasurementMaxMeasuredValue : public ReadAttribute {
-public:
-    ReadFlowMeasurementMaxMeasuredValue()
-        : ReadAttribute("max-measured-value")
-    {
-    }
-
-    ~ReadFlowMeasurementMaxMeasuredValue() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReadAttribute (0x00000002) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeMaxMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FlowMeasurement.MaxMeasuredValue response %@", [value description]);
-            if (error != nil) {
-                LogNSError("FlowMeasurement MaxMeasuredValue read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class SubscribeAttributeFlowMeasurementMaxMeasuredValue : public SubscribeAttribute {
-public:
-    SubscribeAttributeFlowMeasurementMaxMeasuredValue()
-        : SubscribeAttribute("max-measured-value")
-    {
-    }
-
-    ~SubscribeAttributeFlowMeasurementMaxMeasuredValue() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReportAttribute (0x00000002) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMaxMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FlowMeasurement.MaxMeasuredValue response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-/*
- * Attribute Tolerance
- */
-class ReadFlowMeasurementTolerance : public ReadAttribute {
-public:
-    ReadFlowMeasurementTolerance()
-        : ReadAttribute("tolerance")
-    {
-    }
-
-    ~ReadFlowMeasurementTolerance() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReadAttribute (0x00000003) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeToleranceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FlowMeasurement.Tolerance response %@", [value description]);
-            if (error != nil) {
-                LogNSError("FlowMeasurement Tolerance read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class SubscribeAttributeFlowMeasurementTolerance : public SubscribeAttribute {
-public:
-    SubscribeAttributeFlowMeasurementTolerance()
-        : SubscribeAttribute("tolerance")
-    {
-    }
-
-    ~SubscribeAttributeFlowMeasurementTolerance() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReportAttribute (0x00000003) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeToleranceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FlowMeasurement.Tolerance response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-/*
- * Attribute GeneratedCommandList
- */
-class ReadFlowMeasurementGeneratedCommandList : public ReadAttribute {
-public:
-    ReadFlowMeasurementGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
-    {
-    }
-
-    ~ReadFlowMeasurementGeneratedCommandList() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FlowMeasurement.GeneratedCommandList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("FlowMeasurement GeneratedCommandList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class SubscribeAttributeFlowMeasurementGeneratedCommandList : public SubscribeAttribute {
-public:
-    SubscribeAttributeFlowMeasurementGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
-    {
-    }
-
-    ~SubscribeAttributeFlowMeasurementGeneratedCommandList() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FlowMeasurement.GeneratedCommandList response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-/*
- * Attribute AcceptedCommandList
- */
-class ReadFlowMeasurementAcceptedCommandList : public ReadAttribute {
-public:
-    ReadFlowMeasurementAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
-    {
-    }
-
-    ~ReadFlowMeasurementAcceptedCommandList() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FlowMeasurement.AcceptedCommandList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("FlowMeasurement AcceptedCommandList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class SubscribeAttributeFlowMeasurementAcceptedCommandList : public SubscribeAttribute {
-public:
-    SubscribeAttributeFlowMeasurementAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
-    {
-    }
-
-    ~SubscribeAttributeFlowMeasurementAcceptedCommandList() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -36895,7 +36113,7 @@ class SubscribeAttributeFlowMeasurementAcceptedCommandList : public SubscribeAtt
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FlowMeasurement.AcceptedCommandList response %@", [value description]);
+                NSLog(@"ModeSelect.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -36908,25 +36126,25 @@ class SubscribeAttributeFlowMeasurementAcceptedCommandList : public SubscribeAtt
 /*
  * Attribute AttributeList
  */
-class ReadFlowMeasurementAttributeList : public ReadAttribute {
+class ReadModeSelectAttributeList : public ReadAttribute {
 public:
-    ReadFlowMeasurementAttributeList()
+    ReadModeSelectAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadFlowMeasurementAttributeList() {}
+    ~ReadModeSelectAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FlowMeasurement.AttributeList response %@", [value description]);
+            NSLog(@"ModeSelect.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("FlowMeasurement AttributeList read Error", error);
+                LogNSError("ModeSelect AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -36934,20 +36152,20 @@ class ReadFlowMeasurementAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeFlowMeasurementAttributeList : public SubscribeAttribute {
+class SubscribeAttributeModeSelectAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeFlowMeasurementAttributeList()
+    SubscribeAttributeModeSelectAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeFlowMeasurementAttributeList() {}
+    ~SubscribeAttributeModeSelectAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -36959,7 +36177,7 @@ class SubscribeAttributeFlowMeasurementAttributeList : public SubscribeAttribute
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FlowMeasurement.AttributeList response %@", [value description]);
+                NSLog(@"ModeSelect.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -36972,25 +36190,25 @@ class SubscribeAttributeFlowMeasurementAttributeList : public SubscribeAttribute
 /*
  * Attribute FeatureMap
  */
-class ReadFlowMeasurementFeatureMap : public ReadAttribute {
+class ReadModeSelectFeatureMap : public ReadAttribute {
 public:
-    ReadFlowMeasurementFeatureMap()
+    ReadModeSelectFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadFlowMeasurementFeatureMap() {}
+    ~ReadModeSelectFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FlowMeasurement.FeatureMap response %@", [value description]);
+            NSLog(@"ModeSelect.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("FlowMeasurement FeatureMap read Error", error);
+                LogNSError("ModeSelect FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -36998,20 +36216,20 @@ class ReadFlowMeasurementFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeFlowMeasurementFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeModeSelectFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeFlowMeasurementFeatureMap()
+    SubscribeAttributeModeSelectFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeFlowMeasurementFeatureMap() {}
+    ~SubscribeAttributeModeSelectFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -37023,7 +36241,7 @@ class SubscribeAttributeFlowMeasurementFeatureMap : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FlowMeasurement.FeatureMap response %@", [value description]);
+                NSLog(@"ModeSelect.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -37036,25 +36254,25 @@ class SubscribeAttributeFlowMeasurementFeatureMap : public SubscribeAttribute {
 /*
  * Attribute ClusterRevision
  */
-class ReadFlowMeasurementClusterRevision : public ReadAttribute {
+class ReadModeSelectClusterRevision : public ReadAttribute {
 public:
-    ReadFlowMeasurementClusterRevision()
+    ReadModeSelectClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadFlowMeasurementClusterRevision() {}
+    ~ReadModeSelectClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"FlowMeasurement.ClusterRevision response %@", [value description]);
+            NSLog(@"ModeSelect.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("FlowMeasurement ClusterRevision read Error", error);
+                LogNSError("ModeSelect ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -37062,20 +36280,20 @@ class ReadFlowMeasurementClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeFlowMeasurementClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeModeSelectClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeFlowMeasurementClusterRevision()
+    SubscribeAttributeModeSelectClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeFlowMeasurementClusterRevision() {}
+    ~SubscribeAttributeModeSelectClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -37087,7 +36305,7 @@ class SubscribeAttributeFlowMeasurementClusterRevision : public SubscribeAttribu
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"FlowMeasurement.ClusterRevision response %@", [value description]);
+                NSLog(@"ModeSelect.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -37098,19 +36316,65 @@ class SubscribeAttributeFlowMeasurementClusterRevision : public SubscribeAttribu
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster GeneralCommissioning                                        | 0x0030 |
+| Cluster DoorLock                                                    | 0x0101 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * ArmFailSafe                                                       |   0x00 |
-| * SetRegulatoryConfig                                               |   0x02 |
-| * CommissioningComplete                                             |   0x04 |
+| * LockDoor                                                          |   0x00 |
+| * UnlockDoor                                                        |   0x01 |
+| * UnlockWithTimeout                                                 |   0x03 |
+| * SetWeekDaySchedule                                                |   0x0B |
+| * GetWeekDaySchedule                                                |   0x0C |
+| * ClearWeekDaySchedule                                              |   0x0D |
+| * SetYearDaySchedule                                                |   0x0E |
+| * GetYearDaySchedule                                                |   0x0F |
+| * ClearYearDaySchedule                                              |   0x10 |
+| * SetHolidaySchedule                                                |   0x11 |
+| * GetHolidaySchedule                                                |   0x12 |
+| * ClearHolidaySchedule                                              |   0x13 |
+| * SetUser                                                           |   0x1A |
+| * GetUser                                                           |   0x1B |
+| * ClearUser                                                         |   0x1D |
+| * SetCredential                                                     |   0x22 |
+| * GetCredentialStatus                                               |   0x24 |
+| * ClearCredential                                                   |   0x26 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * Breadcrumb                                                        | 0x0000 |
-| * BasicCommissioningInfo                                            | 0x0001 |
-| * RegulatoryConfig                                                  | 0x0002 |
-| * LocationCapability                                                | 0x0003 |
-| * SupportsConcurrentConnection                                      | 0x0004 |
+| * LockState                                                         | 0x0000 |
+| * LockType                                                          | 0x0001 |
+| * ActuatorEnabled                                                   | 0x0002 |
+| * DoorState                                                         | 0x0003 |
+| * DoorOpenEvents                                                    | 0x0004 |
+| * DoorClosedEvents                                                  | 0x0005 |
+| * OpenPeriod                                                        | 0x0006 |
+| * NumberOfTotalUsersSupported                                       | 0x0011 |
+| * NumberOfPINUsersSupported                                         | 0x0012 |
+| * NumberOfRFIDUsersSupported                                        | 0x0013 |
+| * NumberOfWeekDaySchedulesSupportedPerUser                          | 0x0014 |
+| * NumberOfYearDaySchedulesSupportedPerUser                          | 0x0015 |
+| * NumberOfHolidaySchedulesSupported                                 | 0x0016 |
+| * MaxPINCodeLength                                                  | 0x0017 |
+| * MinPINCodeLength                                                  | 0x0018 |
+| * MaxRFIDCodeLength                                                 | 0x0019 |
+| * MinRFIDCodeLength                                                 | 0x001A |
+| * CredentialRulesSupport                                            | 0x001B |
+| * NumberOfCredentialsSupportedPerUser                               | 0x001C |
+| * Language                                                          | 0x0021 |
+| * LEDSettings                                                       | 0x0022 |
+| * AutoRelockTime                                                    | 0x0023 |
+| * SoundVolume                                                       | 0x0024 |
+| * OperatingMode                                                     | 0x0025 |
+| * SupportedOperatingModes                                           | 0x0026 |
+| * DefaultConfigurationRegister                                      | 0x0027 |
+| * EnableLocalProgramming                                            | 0x0028 |
+| * EnableOneTouchLocking                                             | 0x0029 |
+| * EnableInsideStatusLED                                             | 0x002A |
+| * EnablePrivacyModeButton                                           | 0x002B |
+| * LocalProgrammingFeatures                                          | 0x002C |
+| * WrongCodeEntryLimit                                               | 0x0030 |
+| * UserCodeTemporaryDisableTime                                      | 0x0031 |
+| * SendPINOverTheAir                                                 | 0x0032 |
+| * RequirePINforRemoteOperation                                      | 0x0033 |
+| * ExpiringUserTimeout                                               | 0x0035 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -37118,633 +36382,960 @@ class SubscribeAttributeFlowMeasurementClusterRevision : public SubscribeAttribu
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
+| * DoorLockAlarm                                                     | 0x0000 |
+| * DoorStateChange                                                   | 0x0001 |
+| * LockOperation                                                     | 0x0002 |
+| * LockOperationError                                                | 0x0003 |
+| * LockUserChange                                                    | 0x0004 |
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command ArmFailSafe
+ * Command LockDoor
  */
-class GeneralCommissioningArmFailSafe : public ClusterCommand {
+class DoorLockLockDoor : public ClusterCommand {
 public:
-    GeneralCommissioningArmFailSafe()
-        : ClusterCommand("arm-fail-safe")
+    DoorLockLockDoor()
+        : ClusterCommand("lock-door")
     {
-        AddArgument("ExpiryLengthSeconds", 0, UINT16_MAX, &mRequest.expiryLengthSeconds);
-        AddArgument("Breadcrumb", 0, UINT64_MAX, &mRequest.breadcrumb);
+        AddArgument("PinCode", &mRequest.pinCode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000030) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        __auto_type * params = [[CHIPGeneralCommissioningClusterArmFailSafeParams alloc] init];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPDoorLockClusterLockDoorParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.expiryLengthSeconds = [NSNumber numberWithUnsignedShort:mRequest.expiryLengthSeconds];
-        params.breadcrumb = [NSNumber numberWithUnsignedLongLong:mRequest.breadcrumb];
+        if (mRequest.pinCode.HasValue()) {
+            params.pinCode = [NSData dataWithBytes:mRequest.pinCode.Value().data() length:mRequest.pinCode.Value().size()];
+        } else {
+            params.pinCode = nil;
+        }
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster armFailSafeWithParams:params
-                         completionHandler:^(CHIPGeneralCommissioningClusterArmFailSafeResponseParams * _Nullable values,
-                             NSError * _Nullable error) {
-                             NSLog(@"Values: %@", values);
-                             responsesNeeded--;
-                             if (error != nil) {
-                                 mError = error;
-                                 LogNSError("Error", error);
-                             }
-                             if (responsesNeeded == 0) {
-                                 SetCommandExitStatus(mError);
-                             }
-                         }];
+            [cluster lockDoorWithParams:params
+                      completionHandler:^(NSError * _Nullable error) {
+                          responsesNeeded--;
+                          if (error != nil) {
+                              mError = error;
+                              LogNSError("Error", error);
+                          }
+                          if (responsesNeeded == 0) {
+                              SetCommandExitStatus(mError);
+                          }
+                      }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::GeneralCommissioning::Commands::ArmFailSafe::Type mRequest;
+    chip::app::Clusters::DoorLock::Commands::LockDoor::Type mRequest;
 };
 
 /*
- * Command SetRegulatoryConfig
+ * Command UnlockDoor
  */
-class GeneralCommissioningSetRegulatoryConfig : public ClusterCommand {
+class DoorLockUnlockDoor : public ClusterCommand {
 public:
-    GeneralCommissioningSetRegulatoryConfig()
-        : ClusterCommand("set-regulatory-config")
+    DoorLockUnlockDoor()
+        : ClusterCommand("unlock-door")
     {
-        AddArgument("NewRegulatoryConfig", 0, UINT8_MAX, &mRequest.newRegulatoryConfig);
-        AddArgument("CountryCode", &mRequest.countryCode);
-        AddArgument("Breadcrumb", 0, UINT64_MAX, &mRequest.breadcrumb);
+        AddArgument("PinCode", &mRequest.pinCode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000030) command (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        __auto_type * params = [[CHIPGeneralCommissioningClusterSetRegulatoryConfigParams alloc] init];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPDoorLockClusterUnlockDoorParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.newRegulatoryConfig = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.newRegulatoryConfig)];
-        params.countryCode = [[NSString alloc] initWithBytes:mRequest.countryCode.data()
-                                                      length:mRequest.countryCode.size()
-                                                    encoding:NSUTF8StringEncoding];
-        params.breadcrumb = [NSNumber numberWithUnsignedLongLong:mRequest.breadcrumb];
+        if (mRequest.pinCode.HasValue()) {
+            params.pinCode = [NSData dataWithBytes:mRequest.pinCode.Value().data() length:mRequest.pinCode.Value().size()];
+        } else {
+            params.pinCode = nil;
+        }
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster
-                setRegulatoryConfigWithParams:params
-                            completionHandler:^(CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseParams * _Nullable values,
-                                NSError * _Nullable error) {
-                                NSLog(@"Values: %@", values);
-                                responsesNeeded--;
-                                if (error != nil) {
-                                    mError = error;
-                                    LogNSError("Error", error);
-                                }
-                                if (responsesNeeded == 0) {
-                                    SetCommandExitStatus(mError);
-                                }
-                            }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::GeneralCommissioning::Commands::SetRegulatoryConfig::Type mRequest;
-};
-
-/*
- * Command CommissioningComplete
+            [cluster unlockDoorWithParams:params
+                        completionHandler:^(NSError * _Nullable error) {
+                            responsesNeeded--;
+                            if (error != nil) {
+                                mError = error;
+                                LogNSError("Error", error);
+                            }
+                            if (responsesNeeded == 0) {
+                                SetCommandExitStatus(mError);
+                            }
+                        }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type mRequest;
+};
+
+/*
+ * Command UnlockWithTimeout
  */
-class GeneralCommissioningCommissioningComplete : public ClusterCommand {
+class DoorLockUnlockWithTimeout : public ClusterCommand {
 public:
-    GeneralCommissioningCommissioningComplete()
-        : ClusterCommand("commissioning-complete")
+    DoorLockUnlockWithTimeout()
+        : ClusterCommand("unlock-with-timeout")
     {
+        AddArgument("Timeout", 0, UINT16_MAX, &mRequest.timeout);
+        AddArgument("PinCode", &mRequest.pinCode);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000030) command (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        __auto_type * params = [[CHIPGeneralCommissioningClusterCommissioningCompleteParams alloc] init];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPDoorLockClusterUnlockWithTimeoutParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.timeout = [NSNumber numberWithUnsignedShort:mRequest.timeout];
+        if (mRequest.pinCode.HasValue()) {
+            params.pinCode = [NSData dataWithBytes:mRequest.pinCode.Value().data() length:mRequest.pinCode.Value().size()];
+        } else {
+            params.pinCode = nil;
+        }
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster commissioningCompleteWithParams:params
-                                   completionHandler:^(
-                                       CHIPGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable values,
-                                       NSError * _Nullable error) {
-                                       NSLog(@"Values: %@", values);
-                                       responsesNeeded--;
-                                       if (error != nil) {
-                                           mError = error;
-                                           LogNSError("Error", error);
-                                       }
-                                       if (responsesNeeded == 0) {
-                                           SetCommandExitStatus(mError);
-                                       }
-                                   }];
+            [cluster unlockWithTimeoutWithParams:params
+                               completionHandler:^(NSError * _Nullable error) {
+                                   responsesNeeded--;
+                                   if (error != nil) {
+                                       mError = error;
+                                       LogNSError("Error", error);
+                                   }
+                                   if (responsesNeeded == 0) {
+                                       SetCommandExitStatus(mError);
+                                   }
+                               }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
+    chip::app::Clusters::DoorLock::Commands::UnlockWithTimeout::Type mRequest;
 };
 
 /*
- * Attribute Breadcrumb
+ * Command SetWeekDaySchedule
  */
-class ReadGeneralCommissioningBreadcrumb : public ReadAttribute {
+class DoorLockSetWeekDaySchedule : public ClusterCommand {
 public:
-    ReadGeneralCommissioningBreadcrumb()
-        : ReadAttribute("breadcrumb")
+    DoorLockSetWeekDaySchedule()
+        : ClusterCommand("set-week-day-schedule")
     {
+        AddArgument("WeekDayIndex", 0, UINT8_MAX, &mRequest.weekDayIndex);
+        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
+        AddArgument("DaysMask", 0, UINT8_MAX, &mRequest.daysMask);
+        AddArgument("StartHour", 0, UINT8_MAX, &mRequest.startHour);
+        AddArgument("StartMinute", 0, UINT8_MAX, &mRequest.startMinute);
+        AddArgument("EndHour", 0, UINT8_MAX, &mRequest.endHour);
+        AddArgument("EndMinute", 0, UINT8_MAX, &mRequest.endMinute);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadGeneralCommissioningBreadcrumb() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000000B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        [cluster readAttributeBreadcrumbWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GeneralCommissioning.Breadcrumb response %@", [value description]);
-            if (error != nil) {
-                LogNSError("GeneralCommissioning Breadcrumb read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:mRequest.weekDayIndex];
+        params.userIndex = [NSNumber numberWithUnsignedShort:mRequest.userIndex];
+        params.daysMask = [NSNumber numberWithUnsignedChar:mRequest.daysMask.Raw()];
+        params.startHour = [NSNumber numberWithUnsignedChar:mRequest.startHour];
+        params.startMinute = [NSNumber numberWithUnsignedChar:mRequest.startMinute];
+        params.endHour = [NSNumber numberWithUnsignedChar:mRequest.endHour];
+        params.endMinute = [NSNumber numberWithUnsignedChar:mRequest.endMinute];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster setWeekDayScheduleWithParams:params
+                                completionHandler:^(NSError * _Nullable error) {
+                                    responsesNeeded--;
+                                    if (error != nil) {
+                                        mError = error;
+                                        LogNSError("Error", error);
+                                    }
+                                    if (responsesNeeded == 0) {
+                                        SetCommandExitStatus(mError);
+                                    }
+                                }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type mRequest;
 };
 
-class WriteGeneralCommissioningBreadcrumb : public WriteAttribute {
+/*
+ * Command GetWeekDaySchedule
+ */
+class DoorLockGetWeekDaySchedule : public ClusterCommand {
 public:
-    WriteGeneralCommissioningBreadcrumb()
-        : WriteAttribute("breadcrumb")
+    DoorLockGetWeekDaySchedule()
+        : ClusterCommand("get-week-day-schedule")
     {
-        AddArgument("attr-name", "breadcrumb");
-        AddArgument("attr-value", 0, UINT64_MAX, &mValue);
-        WriteAttribute::AddArguments();
+        AddArgument("WeekDayIndex", 0, UINT8_MAX, &mRequest.weekDayIndex);
+        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
+        ClusterCommand::AddArguments();
     }
 
-    ~WriteGeneralCommissioningBreadcrumb() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000030) WriteAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000000C) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init];
+        params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedLongLong:mValue];
-
-        [cluster writeAttributeBreadcrumbWithValue:value
-                                            params:params
-                                 completionHandler:^(NSError * _Nullable error) {
-                                     if (error != nil) {
-                                         LogNSError("GeneralCommissioning Breadcrumb write Error", error);
-                                     }
-                                     SetCommandExitStatus(error);
-                                 }];
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:mRequest.weekDayIndex];
+        params.userIndex = [NSNumber numberWithUnsignedShort:mRequest.userIndex];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster getWeekDayScheduleWithParams:params
+                                completionHandler:^(CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values,
+                                    NSError * _Nullable error) {
+                                    NSLog(@"Values: %@", values);
+                                    responsesNeeded--;
+                                    if (error != nil) {
+                                        mError = error;
+                                        LogNSError("Error", error);
+                                    }
+                                    if (responsesNeeded == 0) {
+                                        SetCommandExitStatus(mError);
+                                    }
+                                }];
+        }
         return CHIP_NO_ERROR;
     }
 
 private:
-    uint64_t mValue;
+    chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type mRequest;
 };
 
-class SubscribeAttributeGeneralCommissioningBreadcrumb : public SubscribeAttribute {
+/*
+ * Command ClearWeekDaySchedule
+ */
+class DoorLockClearWeekDaySchedule : public ClusterCommand {
 public:
-    SubscribeAttributeGeneralCommissioningBreadcrumb()
-        : SubscribeAttribute("breadcrumb")
+    DoorLockClearWeekDaySchedule()
+        : ClusterCommand("clear-week-day-schedule")
     {
+        AddArgument("WeekDayIndex", 0, UINT8_MAX, &mRequest.weekDayIndex);
+        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeGeneralCommissioningBreadcrumb() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReportAttribute (0x00000000) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBreadcrumbWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralCommissioning.Breadcrumb response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000000D) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPDoorLockClusterClearWeekDayScheduleParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.weekDayIndex = [NSNumber numberWithUnsignedChar:mRequest.weekDayIndex];
+        params.userIndex = [NSNumber numberWithUnsignedShort:mRequest.userIndex];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster clearWeekDayScheduleWithParams:params
+                                  completionHandler:^(NSError * _Nullable error) {
+                                      responsesNeeded--;
+                                      if (error != nil) {
+                                          mError = error;
+                                          LogNSError("Error", error);
+                                      }
+                                      if (responsesNeeded == 0) {
+                                          SetCommandExitStatus(mError);
+                                      }
+                                  }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::DoorLock::Commands::ClearWeekDaySchedule::Type mRequest;
 };
 
 /*
- * Attribute BasicCommissioningInfo
+ * Command SetYearDaySchedule
  */
-class ReadGeneralCommissioningBasicCommissioningInfo : public ReadAttribute {
+class DoorLockSetYearDaySchedule : public ClusterCommand {
 public:
-    ReadGeneralCommissioningBasicCommissioningInfo()
-        : ReadAttribute("basic-commissioning-info")
+    DoorLockSetYearDaySchedule()
+        : ClusterCommand("set-year-day-schedule")
     {
+        AddArgument("YearDayIndex", 0, UINT8_MAX, &mRequest.yearDayIndex);
+        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
+        AddArgument("LocalStartTime", 0, UINT32_MAX, &mRequest.localStartTime);
+        AddArgument("LocalEndTime", 0, UINT32_MAX, &mRequest.localEndTime);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadGeneralCommissioningBasicCommissioningInfo() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000000E) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        [cluster readAttributeBasicCommissioningInfoWithCompletionHandler:^(
-            CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GeneralCommissioning.BasicCommissioningInfo response %@", [value description]);
-            if (error != nil) {
-                LogNSError("GeneralCommissioning BasicCommissioningInfo read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:mRequest.yearDayIndex];
+        params.userIndex = [NSNumber numberWithUnsignedShort:mRequest.userIndex];
+        params.localStartTime = [NSNumber numberWithUnsignedInt:mRequest.localStartTime];
+        params.localEndTime = [NSNumber numberWithUnsignedInt:mRequest.localEndTime];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster setYearDayScheduleWithParams:params
+                                completionHandler:^(NSError * _Nullable error) {
+                                    responsesNeeded--;
+                                    if (error != nil) {
+                                        mError = error;
+                                        LogNSError("Error", error);
+                                    }
+                                    if (responsesNeeded == 0) {
+                                        SetCommandExitStatus(mError);
+                                    }
+                                }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::DoorLock::Commands::SetYearDaySchedule::Type mRequest;
 };
 
-class SubscribeAttributeGeneralCommissioningBasicCommissioningInfo : public SubscribeAttribute {
+/*
+ * Command GetYearDaySchedule
+ */
+class DoorLockGetYearDaySchedule : public ClusterCommand {
 public:
-    SubscribeAttributeGeneralCommissioningBasicCommissioningInfo()
-        : SubscribeAttribute("basic-commissioning-info")
+    DoorLockGetYearDaySchedule()
+        : ClusterCommand("get-year-day-schedule")
     {
+        AddArgument("YearDayIndex", 0, UINT8_MAX, &mRequest.yearDayIndex);
+        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeGeneralCommissioningBasicCommissioningInfo() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReportAttribute (0x00000001) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBasicCommissioningInfoWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(CHIPGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralCommissioning.BasicCommissioningInfo response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000000F) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:mRequest.yearDayIndex];
+        params.userIndex = [NSNumber numberWithUnsignedShort:mRequest.userIndex];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster getYearDayScheduleWithParams:params
+                                completionHandler:^(CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values,
+                                    NSError * _Nullable error) {
+                                    NSLog(@"Values: %@", values);
+                                    responsesNeeded--;
+                                    if (error != nil) {
+                                        mError = error;
+                                        LogNSError("Error", error);
+                                    }
+                                    if (responsesNeeded == 0) {
+                                        SetCommandExitStatus(mError);
+                                    }
+                                }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type mRequest;
 };
 
 /*
- * Attribute RegulatoryConfig
+ * Command ClearYearDaySchedule
  */
-class ReadGeneralCommissioningRegulatoryConfig : public ReadAttribute {
+class DoorLockClearYearDaySchedule : public ClusterCommand {
 public:
-    ReadGeneralCommissioningRegulatoryConfig()
-        : ReadAttribute("regulatory-config")
+    DoorLockClearYearDaySchedule()
+        : ClusterCommand("clear-year-day-schedule")
     {
+        AddArgument("YearDayIndex", 0, UINT8_MAX, &mRequest.yearDayIndex);
+        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadGeneralCommissioningRegulatoryConfig() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000010) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        [cluster readAttributeRegulatoryConfigWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GeneralCommissioning.RegulatoryConfig response %@", [value description]);
-            if (error != nil) {
-                LogNSError("GeneralCommissioning RegulatoryConfig read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPDoorLockClusterClearYearDayScheduleParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.yearDayIndex = [NSNumber numberWithUnsignedChar:mRequest.yearDayIndex];
+        params.userIndex = [NSNumber numberWithUnsignedShort:mRequest.userIndex];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster clearYearDayScheduleWithParams:params
+                                  completionHandler:^(NSError * _Nullable error) {
+                                      responsesNeeded--;
+                                      if (error != nil) {
+                                          mError = error;
+                                          LogNSError("Error", error);
+                                      }
+                                      if (responsesNeeded == 0) {
+                                          SetCommandExitStatus(mError);
+                                      }
+                                  }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::DoorLock::Commands::ClearYearDaySchedule::Type mRequest;
 };
 
-class SubscribeAttributeGeneralCommissioningRegulatoryConfig : public SubscribeAttribute {
+/*
+ * Command SetHolidaySchedule
+ */
+class DoorLockSetHolidaySchedule : public ClusterCommand {
 public:
-    SubscribeAttributeGeneralCommissioningRegulatoryConfig()
-        : SubscribeAttribute("regulatory-config")
+    DoorLockSetHolidaySchedule()
+        : ClusterCommand("set-holiday-schedule")
     {
+        AddArgument("HolidayIndex", 0, UINT8_MAX, &mRequest.holidayIndex);
+        AddArgument("LocalStartTime", 0, UINT32_MAX, &mRequest.localStartTime);
+        AddArgument("LocalEndTime", 0, UINT32_MAX, &mRequest.localEndTime);
+        AddArgument("OperatingMode", 0, UINT8_MAX, &mRequest.operatingMode);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeGeneralCommissioningRegulatoryConfig() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReportAttribute (0x00000002) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRegulatoryConfigWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralCommissioning.RegulatoryConfig response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000011) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPDoorLockClusterSetHolidayScheduleParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:mRequest.holidayIndex];
+        params.localStartTime = [NSNumber numberWithUnsignedInt:mRequest.localStartTime];
+        params.localEndTime = [NSNumber numberWithUnsignedInt:mRequest.localEndTime];
+        params.operatingMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.operatingMode)];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster setHolidayScheduleWithParams:params
+                                completionHandler:^(NSError * _Nullable error) {
+                                    responsesNeeded--;
+                                    if (error != nil) {
+                                        mError = error;
+                                        LogNSError("Error", error);
+                                    }
+                                    if (responsesNeeded == 0) {
+                                        SetCommandExitStatus(mError);
+                                    }
+                                }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::DoorLock::Commands::SetHolidaySchedule::Type mRequest;
 };
 
 /*
- * Attribute LocationCapability
+ * Command GetHolidaySchedule
  */
-class ReadGeneralCommissioningLocationCapability : public ReadAttribute {
+class DoorLockGetHolidaySchedule : public ClusterCommand {
 public:
-    ReadGeneralCommissioningLocationCapability()
-        : ReadAttribute("location-capability")
+    DoorLockGetHolidaySchedule()
+        : ClusterCommand("get-holiday-schedule")
     {
+        AddArgument("HolidayIndex", 0, UINT8_MAX, &mRequest.holidayIndex);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadGeneralCommissioningLocationCapability() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000012) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        [cluster readAttributeLocationCapabilityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GeneralCommissioning.LocationCapability response %@", [value description]);
-            if (error != nil) {
-                LogNSError("GeneralCommissioning LocationCapability read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class SubscribeAttributeGeneralCommissioningLocationCapability : public SubscribeAttribute {
-public:
-    SubscribeAttributeGeneralCommissioningLocationCapability()
-        : SubscribeAttribute("location-capability")
-    {
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPDoorLockClusterGetHolidayScheduleParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:mRequest.holidayIndex];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster getHolidayScheduleWithParams:params
+                                completionHandler:^(CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values,
+                                    NSError * _Nullable error) {
+                                    NSLog(@"Values: %@", values);
+                                    responsesNeeded--;
+                                    if (error != nil) {
+                                        mError = error;
+                                        LogNSError("Error", error);
+                                    }
+                                    if (responsesNeeded == 0) {
+                                        SetCommandExitStatus(mError);
+                                    }
+                                }];
+        }
+        return CHIP_NO_ERROR;
     }
 
-    ~SubscribeAttributeGeneralCommissioningLocationCapability() {}
+private:
+    chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Type mRequest;
+};
+
+/*
+ * Command ClearHolidaySchedule
+ */
+class DoorLockClearHolidaySchedule : public ClusterCommand {
+public:
+    DoorLockClearHolidaySchedule()
+        : ClusterCommand("clear-holiday-schedule")
+    {
+        AddArgument("HolidayIndex", 0, UINT8_MAX, &mRequest.holidayIndex);
+        ClusterCommand::AddArguments();
+    }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReportAttribute (0x00000003) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLocationCapabilityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralCommissioning.LocationCapability response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000013) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPDoorLockClusterClearHolidayScheduleParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.holidayIndex = [NSNumber numberWithUnsignedChar:mRequest.holidayIndex];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster clearHolidayScheduleWithParams:params
+                                  completionHandler:^(NSError * _Nullable error) {
+                                      responsesNeeded--;
+                                      if (error != nil) {
+                                          mError = error;
+                                          LogNSError("Error", error);
+                                      }
+                                      if (responsesNeeded == 0) {
+                                          SetCommandExitStatus(mError);
+                                      }
+                                  }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::DoorLock::Commands::ClearHolidaySchedule::Type mRequest;
 };
 
 /*
- * Attribute SupportsConcurrentConnection
+ * Command SetUser
  */
-class ReadGeneralCommissioningSupportsConcurrentConnection : public ReadAttribute {
+class DoorLockSetUser : public ClusterCommand {
 public:
-    ReadGeneralCommissioningSupportsConcurrentConnection()
-        : ReadAttribute("supports-concurrent-connection")
+    DoorLockSetUser()
+        : ClusterCommand("set-user")
     {
+        AddArgument("OperationType", 0, UINT8_MAX, &mRequest.operationType);
+        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
+        AddArgument("UserName", &mRequest.userName);
+        AddArgument("UserUniqueId", 0, UINT32_MAX, &mRequest.userUniqueId);
+        AddArgument("UserStatus", 0, UINT8_MAX, &mRequest.userStatus);
+        AddArgument("UserType", 0, UINT8_MAX, &mRequest.userType);
+        AddArgument("CredentialRule", 0, UINT8_MAX, &mRequest.credentialRule);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadGeneralCommissioningSupportsConcurrentConnection() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReadAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000001A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        [cluster readAttributeSupportsConcurrentConnectionWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GeneralCommissioning.SupportsConcurrentConnection response %@", [value description]);
-            if (error != nil) {
-                LogNSError("GeneralCommissioning SupportsConcurrentConnection read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPDoorLockClusterSetUserParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.operationType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.operationType)];
+        params.userIndex = [NSNumber numberWithUnsignedShort:mRequest.userIndex];
+        if (mRequest.userName.IsNull()) {
+            params.userName = nil;
+        } else {
+            params.userName = [[NSString alloc] initWithBytes:mRequest.userName.Value().data()
+                                                       length:mRequest.userName.Value().size()
+                                                     encoding:NSUTF8StringEncoding];
+        }
+        if (mRequest.userUniqueId.IsNull()) {
+            params.userUniqueId = nil;
+        } else {
+            params.userUniqueId = [NSNumber numberWithUnsignedInt:mRequest.userUniqueId.Value()];
+        }
+        if (mRequest.userStatus.IsNull()) {
+            params.userStatus = nil;
+        } else {
+            params.userStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.userStatus.Value())];
+        }
+        if (mRequest.userType.IsNull()) {
+            params.userType = nil;
+        } else {
+            params.userType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.userType.Value())];
+        }
+        if (mRequest.credentialRule.IsNull()) {
+            params.credentialRule = nil;
+        } else {
+            params.credentialRule = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.credentialRule.Value())];
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster setUserWithParams:params
+                     completionHandler:^(NSError * _Nullable error) {
+                         responsesNeeded--;
+                         if (error != nil) {
+                             mError = error;
+                             LogNSError("Error", error);
+                         }
+                         if (responsesNeeded == 0) {
+                             SetCommandExitStatus(mError);
+                         }
+                     }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::DoorLock::Commands::SetUser::Type mRequest;
 };
 
-class SubscribeAttributeGeneralCommissioningSupportsConcurrentConnection : public SubscribeAttribute {
+/*
+ * Command GetUser
+ */
+class DoorLockGetUser : public ClusterCommand {
 public:
-    SubscribeAttributeGeneralCommissioningSupportsConcurrentConnection()
-        : SubscribeAttribute("supports-concurrent-connection")
+    DoorLockGetUser()
+        : ClusterCommand("get-user")
     {
+        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeGeneralCommissioningSupportsConcurrentConnection() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReportAttribute (0x00000004) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSupportsConcurrentConnectionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralCommissioning.SupportsConcurrentConnection response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000001B) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.userIndex = [NSNumber numberWithUnsignedShort:mRequest.userIndex];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster getUserWithParams:params
+                     completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable error) {
+                         NSLog(@"Values: %@", values);
+                         responsesNeeded--;
+                         if (error != nil) {
+                             mError = error;
+                             LogNSError("Error", error);
+                         }
+                         if (responsesNeeded == 0) {
+                             SetCommandExitStatus(mError);
+                         }
+                     }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::DoorLock::Commands::GetUser::Type mRequest;
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Command ClearUser
  */
-class ReadGeneralCommissioningGeneratedCommandList : public ReadAttribute {
+class DoorLockClearUser : public ClusterCommand {
 public:
-    ReadGeneralCommissioningGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    DoorLockClearUser()
+        : ClusterCommand("clear-user")
     {
+        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadGeneralCommissioningGeneratedCommandList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000001D) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GeneralCommissioning.GeneratedCommandList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("GeneralCommissioning GeneratedCommandList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPDoorLockClusterClearUserParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.userIndex = [NSNumber numberWithUnsignedShort:mRequest.userIndex];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster clearUserWithParams:params
+                       completionHandler:^(NSError * _Nullable error) {
+                           responsesNeeded--;
+                           if (error != nil) {
+                               mError = error;
+                               LogNSError("Error", error);
+                           }
+                           if (responsesNeeded == 0) {
+                               SetCommandExitStatus(mError);
+                           }
+                       }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::DoorLock::Commands::ClearUser::Type mRequest;
 };
 
-class SubscribeAttributeGeneralCommissioningGeneratedCommandList : public SubscribeAttribute {
+/*
+ * Command SetCredential
+ */
+class DoorLockSetCredential : public ClusterCommand {
 public:
-    SubscribeAttributeGeneralCommissioningGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    DoorLockSetCredential()
+        : ClusterCommand("set-credential")
+        , mComplex_Credential(&mRequest.credential)
     {
+        AddArgument("OperationType", 0, UINT8_MAX, &mRequest.operationType);
+        AddArgument("Credential", &mComplex_Credential);
+        AddArgument("CredentialData", &mRequest.credentialData);
+        AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
+        AddArgument("UserStatus", 0, UINT8_MAX, &mRequest.userStatus);
+        AddArgument("UserType", 0, UINT8_MAX, &mRequest.userType);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeGeneralCommissioningGeneratedCommandList() {}
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000022) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.operationType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.operationType)];
+        params.credential = [CHIPDoorLockClusterDlCredential new];
+        params.credential.credentialType =
+            [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.credential.credentialType)];
+        params.credential.credentialIndex = [NSNumber numberWithUnsignedShort:mRequest.credential.credentialIndex];
+        params.credentialData = [NSData dataWithBytes:mRequest.credentialData.data() length:mRequest.credentialData.size()];
+        if (mRequest.userIndex.IsNull()) {
+            params.userIndex = nil;
+        } else {
+            params.userIndex = [NSNumber numberWithUnsignedShort:mRequest.userIndex.Value()];
+        }
+        if (mRequest.userStatus.IsNull()) {
+            params.userStatus = nil;
+        } else {
+            params.userStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.userStatus.Value())];
+        }
+        if (mRequest.userType.IsNull()) {
+            params.userType = nil;
+        } else {
+            params.userType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.userType.Value())];
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster setCredentialWithParams:params
+                           completionHandler:^(
+                               CHIPDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable error) {
+                               NSLog(@"Values: %@", values);
+                               responsesNeeded--;
+                               if (error != nil) {
+                                   mError = error;
+                                   LogNSError("Error", error);
+                               }
+                               if (responsesNeeded == 0) {
+                                   SetCommandExitStatus(mError);
+                               }
+                           }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::DoorLock::Commands::SetCredential::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::DoorLock::Structs::DlCredential::Type> mComplex_Credential;
+};
+
+/*
+ * Command GetCredentialStatus
+ */
+class DoorLockGetCredentialStatus : public ClusterCommand {
+public:
+    DoorLockGetCredentialStatus()
+        : ClusterCommand("get-credential-status")
+        , mComplex_Credential(&mRequest.credential)
+    {
+        AddArgument("Credential", &mComplex_Credential);
+        ClusterCommand::AddArguments();
+    }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000024) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralCommissioning.GeneratedCommandList response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.credential = [CHIPDoorLockClusterDlCredential new];
+        params.credential.credentialType =
+            [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.credential.credentialType)];
+        params.credential.credentialIndex = [NSNumber numberWithUnsignedShort:mRequest.credential.credentialIndex];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster getCredentialStatusWithParams:params
+                                 completionHandler:^(CHIPDoorLockClusterGetCredentialStatusResponseParams * _Nullable values,
+                                     NSError * _Nullable error) {
+                                     NSLog(@"Values: %@", values);
+                                     responsesNeeded--;
+                                     if (error != nil) {
+                                         mError = error;
+                                         LogNSError("Error", error);
+                                     }
+                                     if (responsesNeeded == 0) {
+                                         SetCommandExitStatus(mError);
+                                     }
+                                 }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::DoorLock::Structs::DlCredential::Type> mComplex_Credential;
+};
+
+/*
+ * Command ClearCredential
+ */
+class DoorLockClearCredential : public ClusterCommand {
+public:
+    DoorLockClearCredential()
+        : ClusterCommand("clear-credential")
+        , mComplex_Credential(&mRequest.credential)
+    {
+        AddArgument("Credential", &mComplex_Credential);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000026) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        if (mRequest.credential.IsNull()) {
+            params.credential = nil;
+        } else {
+            params.credential = [CHIPDoorLockClusterDlCredential new];
+            params.credential.credentialType =
+                [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.credential.Value().credentialType)];
+            params.credential.credentialIndex = [NSNumber numberWithUnsignedShort:mRequest.credential.Value().credentialIndex];
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster clearCredentialWithParams:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 responsesNeeded--;
+                                 if (error != nil) {
+                                     mError = error;
+                                     LogNSError("Error", error);
+                                 }
+                                 if (responsesNeeded == 0) {
+                                     SetCommandExitStatus(mError);
+                                 }
+                             }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::DoorLock::Commands::ClearCredential::Type mRequest;
+    TypedComplexArgument<chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::Structs::DlCredential::Type>>
+        mComplex_Credential;
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute LockState
  */
-class ReadGeneralCommissioningAcceptedCommandList : public ReadAttribute {
+class ReadDoorLockLockState : public ReadAttribute {
 public:
-    ReadGeneralCommissioningAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadDoorLockLockState()
+        : ReadAttribute("lock-state")
     {
     }
 
-    ~ReadGeneralCommissioningAcceptedCommandList() {}
+    ~ReadDoorLockLockState() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GeneralCommissioning.AcceptedCommandList response %@", [value description]);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeLockStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.LockState response %@", [value description]);
             if (error != nil) {
-                LogNSError("GeneralCommissioning AcceptedCommandList read Error", error);
+                LogNSError("DoorLock LockState read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -37752,34 +37343,32 @@ class ReadGeneralCommissioningAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeGeneralCommissioningAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeDoorLockLockState : public SubscribeAttribute {
 public:
-    SubscribeAttributeGeneralCommissioningAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeDoorLockLockState()
+        : SubscribeAttribute("lock-state")
     {
     }
 
-    ~SubscribeAttributeGeneralCommissioningAcceptedCommandList() {}
+    ~SubscribeAttributeDoorLockLockState() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeLockStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralCommissioning.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.LockState response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -37790,29 +37379,27 @@ class SubscribeAttributeGeneralCommissioningAcceptedCommandList : public Subscri
 };
 
 /*
- * Attribute AttributeList
+ * Attribute LockType
  */
-class ReadGeneralCommissioningAttributeList : public ReadAttribute {
+class ReadDoorLockLockType : public ReadAttribute {
 public:
-    ReadGeneralCommissioningAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadDoorLockLockType()
+        : ReadAttribute("lock-type")
     {
     }
 
-    ~ReadGeneralCommissioningAttributeList() {}
+    ~ReadDoorLockLockType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GeneralCommissioning.AttributeList response %@", [value description]);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeLockTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.LockType response %@", [value description]);
             if (error != nil) {
-                LogNSError("GeneralCommissioning AttributeList read Error", error);
+                LogNSError("DoorLock LockType read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -37820,34 +37407,32 @@ class ReadGeneralCommissioningAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeGeneralCommissioningAttributeList : public SubscribeAttribute {
+class SubscribeAttributeDoorLockLockType : public SubscribeAttribute {
 public:
-    SubscribeAttributeGeneralCommissioningAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeDoorLockLockType()
+        : SubscribeAttribute("lock-type")
     {
     }
 
-    ~SubscribeAttributeGeneralCommissioningAttributeList() {}
+    ~SubscribeAttributeDoorLockLockType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeLockTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralCommissioning.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.LockType response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -37858,29 +37443,27 @@ class SubscribeAttributeGeneralCommissioningAttributeList : public SubscribeAttr
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute ActuatorEnabled
  */
-class ReadGeneralCommissioningFeatureMap : public ReadAttribute {
+class ReadDoorLockActuatorEnabled : public ReadAttribute {
 public:
-    ReadGeneralCommissioningFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadDoorLockActuatorEnabled()
+        : ReadAttribute("actuator-enabled")
     {
     }
 
-    ~ReadGeneralCommissioningFeatureMap() {}
+    ~ReadDoorLockActuatorEnabled() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GeneralCommissioning.FeatureMap response %@", [value description]);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeActuatorEnabledWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.ActuatorEnabled response %@", [value description]);
             if (error != nil) {
-                LogNSError("GeneralCommissioning FeatureMap read Error", error);
+                LogNSError("DoorLock ActuatorEnabled read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -37888,34 +37471,32 @@ class ReadGeneralCommissioningFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeGeneralCommissioningFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeDoorLockActuatorEnabled : public SubscribeAttribute {
 public:
-    SubscribeAttributeGeneralCommissioningFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeDoorLockActuatorEnabled()
+        : SubscribeAttribute("actuator-enabled")
     {
     }
 
-    ~SubscribeAttributeGeneralCommissioningFeatureMap() {}
+    ~SubscribeAttributeDoorLockActuatorEnabled() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeActuatorEnabledWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralCommissioning.FeatureMap response %@", [value description]);
+                NSLog(@"DoorLock.ActuatorEnabled response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -37926,29 +37507,27 @@ class SubscribeAttributeGeneralCommissioningFeatureMap : public SubscribeAttribu
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute DoorState
  */
-class ReadGeneralCommissioningClusterRevision : public ReadAttribute {
+class ReadDoorLockDoorState : public ReadAttribute {
 public:
-    ReadGeneralCommissioningClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadDoorLockDoorState()
+        : ReadAttribute("door-state")
     {
     }
 
-    ~ReadGeneralCommissioningClusterRevision() {}
+    ~ReadDoorLockDoorState() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GeneralCommissioning.ClusterRevision response %@", [value description]);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeDoorStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.DoorState response %@", [value description]);
             if (error != nil) {
-                LogNSError("GeneralCommissioning ClusterRevision read Error", error);
+                LogNSError("DoorLock DoorState read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -37956,34 +37535,32 @@ class ReadGeneralCommissioningClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeGeneralCommissioningClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeDoorLockDoorState : public SubscribeAttribute {
 public:
-    SubscribeAttributeGeneralCommissioningClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeDoorLockDoorState()
+        : SubscribeAttribute("door-state")
     {
     }
 
-    ~SubscribeAttributeGeneralCommissioningClusterRevision() {}
+    ~SubscribeAttributeDoorLockDoorState() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000030) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralCommissioning * cluster = [[CHIPGeneralCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDoorStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralCommissioning.ClusterRevision response %@", [value description]);
+                NSLog(@"DoorLock.DoorState response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -37993,142 +37570,99 @@ class SubscribeAttributeGeneralCommissioningClusterRevision : public SubscribeAt
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster GeneralDiagnostics                                          | 0x0033 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * TestEventTrigger                                                  |   0x00 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * NetworkInterfaces                                                 | 0x0000 |
-| * RebootCount                                                       | 0x0001 |
-| * UpTime                                                            | 0x0002 |
-| * TotalOperationalHours                                             | 0x0003 |
-| * BootReasons                                                       | 0x0004 |
-| * ActiveHardwareFaults                                              | 0x0005 |
-| * ActiveRadioFaults                                                 | 0x0006 |
-| * ActiveNetworkFaults                                               | 0x0007 |
-| * TestEventTriggersEnabled                                          | 0x0008 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-| * HardwareFaultChange                                               | 0x0000 |
-| * RadioFaultChange                                                  | 0x0001 |
-| * NetworkFaultChange                                                | 0x0002 |
-| * BootReason                                                        | 0x0003 |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command TestEventTrigger
+ * Attribute DoorOpenEvents
  */
-class GeneralDiagnosticsTestEventTrigger : public ClusterCommand {
+class ReadDoorLockDoorOpenEvents : public ReadAttribute {
 public:
-    GeneralDiagnosticsTestEventTrigger()
-        : ClusterCommand("test-event-trigger")
+    ReadDoorLockDoorOpenEvents()
+        : ReadAttribute("door-open-events")
     {
-        AddArgument("EnableKey", &mRequest.enableKey);
-        AddArgument("EventTrigger", 0, UINT64_MAX, &mRequest.eventTrigger);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadDoorLockDoorOpenEvents() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        __auto_type * params = [[CHIPGeneralDiagnosticsClusterTestEventTriggerParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.enableKey = [NSData dataWithBytes:mRequest.enableKey.data() length:mRequest.enableKey.size()];
-        params.eventTrigger = [NSNumber numberWithUnsignedLongLong:mRequest.eventTrigger];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster testEventTriggerWithParams:params
-                              completionHandler:^(NSError * _Nullable error) {
-                                  responsesNeeded--;
-                                  if (error != nil) {
-                                      mError = error;
-                                      LogNSError("Error", error);
-                                  }
-                                  if (responsesNeeded == 0) {
-                                      SetCommandExitStatus(mError);
-                                  }
-                              }];
-        }
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeDoorOpenEventsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.DoorOpenEvents response %@", [value description]);
+            if (error != nil) {
+                LogNSError("DoorLock DoorOpenEvents read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::GeneralDiagnostics::Commands::TestEventTrigger::Type mRequest;
 };
 
-/*
- * Attribute NetworkInterfaces
- */
-class ReadGeneralDiagnosticsNetworkInterfaces : public ReadAttribute {
+class WriteDoorLockDoorOpenEvents : public WriteAttribute {
 public:
-    ReadGeneralDiagnosticsNetworkInterfaces()
-        : ReadAttribute("network-interfaces")
+    WriteDoorLockDoorOpenEvents()
+        : WriteAttribute("door-open-events")
     {
+        AddArgument("attr-name", "door-open-events");
+        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~ReadGeneralDiagnosticsNetworkInterfaces() {}
+    ~WriteDoorLockDoorOpenEvents() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x00000000) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeNetworkInterfacesWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GeneralDiagnostics.NetworkInterfaces response %@", [value description]);
-            if (error != nil) {
-                LogNSError("GeneralDiagnostics NetworkInterfaces read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue];
+
+        [cluster writeAttributeDoorOpenEventsWithValue:value
+                                                params:params
+                                     completionHandler:^(NSError * _Nullable error) {
+                                         if (error != nil) {
+                                             LogNSError("DoorLock DoorOpenEvents write Error", error);
+                                         }
+                                         SetCommandExitStatus(error);
+                                     }];
         return CHIP_NO_ERROR;
     }
+
+private:
+    uint32_t mValue;
 };
 
-class SubscribeAttributeGeneralDiagnosticsNetworkInterfaces : public SubscribeAttribute {
+class SubscribeAttributeDoorLockDoorOpenEvents : public SubscribeAttribute {
 public:
-    SubscribeAttributeGeneralDiagnosticsNetworkInterfaces()
-        : SubscribeAttribute("network-interfaces")
+    SubscribeAttributeDoorLockDoorOpenEvents()
+        : SubscribeAttribute("door-open-events")
     {
     }
 
-    ~SubscribeAttributeGeneralDiagnosticsNetworkInterfaces() {}
+    ~SubscribeAttributeDoorLockDoorOpenEvents() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNetworkInterfacesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDoorOpenEventsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralDiagnostics.NetworkInterfaces response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.DoorOpenEvents response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -38139,29 +37673,27 @@ class SubscribeAttributeGeneralDiagnosticsNetworkInterfaces : public SubscribeAt
 };
 
 /*
- * Attribute RebootCount
+ * Attribute DoorClosedEvents
  */
-class ReadGeneralDiagnosticsRebootCount : public ReadAttribute {
+class ReadDoorLockDoorClosedEvents : public ReadAttribute {
 public:
-    ReadGeneralDiagnosticsRebootCount()
-        : ReadAttribute("reboot-count")
+    ReadDoorLockDoorClosedEvents()
+        : ReadAttribute("door-closed-events")
     {
     }
 
-    ~ReadGeneralDiagnosticsRebootCount() {}
+    ~ReadDoorLockDoorClosedEvents() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeRebootCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GeneralDiagnostics.RebootCount response %@", [value description]);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeDoorClosedEventsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.DoorClosedEvents response %@", [value description]);
             if (error != nil) {
-                LogNSError("GeneralDiagnostics RebootCount read Error", error);
+                LogNSError("DoorLock DoorClosedEvents read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -38169,34 +37701,70 @@ class ReadGeneralDiagnosticsRebootCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeGeneralDiagnosticsRebootCount : public SubscribeAttribute {
+class WriteDoorLockDoorClosedEvents : public WriteAttribute {
 public:
-    SubscribeAttributeGeneralDiagnosticsRebootCount()
-        : SubscribeAttribute("reboot-count")
+    WriteDoorLockDoorClosedEvents()
+        : WriteAttribute("door-closed-events")
     {
+        AddArgument("attr-name", "door-closed-events");
+        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeGeneralDiagnosticsRebootCount() {}
+    ~WriteDoorLockDoorClosedEvents() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue];
+
+        [cluster writeAttributeDoorClosedEventsWithValue:value
+                                                  params:params
+                                       completionHandler:^(NSError * _Nullable error) {
+                                           if (error != nil) {
+                                               LogNSError("DoorLock DoorClosedEvents write Error", error);
+                                           }
+                                           SetCommandExitStatus(error);
+                                       }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint32_t mValue;
+};
+
+class SubscribeAttributeDoorLockDoorClosedEvents : public SubscribeAttribute {
+public:
+    SubscribeAttributeDoorLockDoorClosedEvents()
+        : SubscribeAttribute("door-closed-events")
+    {
+    }
+
+    ~SubscribeAttributeDoorLockDoorClosedEvents() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRebootCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDoorClosedEventsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralDiagnostics.RebootCount response %@", [value description]);
+                NSLog(@"DoorLock.DoorClosedEvents response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -38207,29 +37775,27 @@ class SubscribeAttributeGeneralDiagnosticsRebootCount : public SubscribeAttribut
 };
 
 /*
- * Attribute UpTime
+ * Attribute OpenPeriod
  */
-class ReadGeneralDiagnosticsUpTime : public ReadAttribute {
+class ReadDoorLockOpenPeriod : public ReadAttribute {
 public:
-    ReadGeneralDiagnosticsUpTime()
-        : ReadAttribute("up-time")
+    ReadDoorLockOpenPeriod()
+        : ReadAttribute("open-period")
     {
     }
 
-    ~ReadGeneralDiagnosticsUpTime() {}
+    ~ReadDoorLockOpenPeriod() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000006) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeUpTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GeneralDiagnostics.UpTime response %@", [value description]);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeOpenPeriodWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.OpenPeriod response %@", [value description]);
             if (error != nil) {
-                LogNSError("GeneralDiagnostics UpTime read Error", error);
+                LogNSError("DoorLock OpenPeriod read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -38237,34 +37803,70 @@ class ReadGeneralDiagnosticsUpTime : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeGeneralDiagnosticsUpTime : public SubscribeAttribute {
+class WriteDoorLockOpenPeriod : public WriteAttribute {
 public:
-    SubscribeAttributeGeneralDiagnosticsUpTime()
-        : SubscribeAttribute("up-time")
+    WriteDoorLockOpenPeriod()
+        : WriteAttribute("open-period")
     {
+        AddArgument("attr-name", "open-period");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeGeneralDiagnosticsUpTime() {}
+    ~WriteDoorLockOpenPeriod() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000006) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster writeAttributeOpenPeriodWithValue:value
+                                            params:params
+                                 completionHandler:^(NSError * _Nullable error) {
+                                     if (error != nil) {
+                                         LogNSError("DoorLock OpenPeriod write Error", error);
+                                     }
+                                     SetCommandExitStatus(error);
+                                 }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeDoorLockOpenPeriod : public SubscribeAttribute {
+public:
+    SubscribeAttributeDoorLockOpenPeriod()
+        : SubscribeAttribute("open-period")
+    {
+    }
+
+    ~SubscribeAttributeDoorLockOpenPeriod() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000006) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeUpTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOpenPeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralDiagnostics.UpTime response %@", [value description]);
+                NSLog(@"DoorLock.OpenPeriod response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -38275,64 +37877,61 @@ class SubscribeAttributeGeneralDiagnosticsUpTime : public SubscribeAttribute {
 };
 
 /*
- * Attribute TotalOperationalHours
+ * Attribute NumberOfTotalUsersSupported
  */
-class ReadGeneralDiagnosticsTotalOperationalHours : public ReadAttribute {
+class ReadDoorLockNumberOfTotalUsersSupported : public ReadAttribute {
 public:
-    ReadGeneralDiagnosticsTotalOperationalHours()
-        : ReadAttribute("total-operational-hours")
+    ReadDoorLockNumberOfTotalUsersSupported()
+        : ReadAttribute("number-of-total-users-supported")
     {
     }
 
-    ~ReadGeneralDiagnosticsTotalOperationalHours() {}
+    ~ReadDoorLockNumberOfTotalUsersSupported() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000011) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeTotalOperationalHoursWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GeneralDiagnostics.TotalOperationalHours response %@", [value description]);
-            if (error != nil) {
-                LogNSError("GeneralDiagnostics TotalOperationalHours read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeNumberOfTotalUsersSupportedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.NumberOfTotalUsersSupported response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("DoorLock NumberOfTotalUsersSupported read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeGeneralDiagnosticsTotalOperationalHours : public SubscribeAttribute {
+class SubscribeAttributeDoorLockNumberOfTotalUsersSupported : public SubscribeAttribute {
 public:
-    SubscribeAttributeGeneralDiagnosticsTotalOperationalHours()
-        : SubscribeAttribute("total-operational-hours")
+    SubscribeAttributeDoorLockNumberOfTotalUsersSupported()
+        : SubscribeAttribute("number-of-total-users-supported")
     {
     }
 
-    ~SubscribeAttributeGeneralDiagnosticsTotalOperationalHours() {}
+    ~SubscribeAttributeDoorLockNumberOfTotalUsersSupported() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000011) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTotalOperationalHoursWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNumberOfTotalUsersSupportedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralDiagnostics.TotalOperationalHours response %@", [value description]);
+                NSLog(@"DoorLock.NumberOfTotalUsersSupported response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -38343,64 +37942,61 @@ class SubscribeAttributeGeneralDiagnosticsTotalOperationalHours : public Subscri
 };
 
 /*
- * Attribute BootReasons
+ * Attribute NumberOfPINUsersSupported
  */
-class ReadGeneralDiagnosticsBootReasons : public ReadAttribute {
+class ReadDoorLockNumberOfPINUsersSupported : public ReadAttribute {
 public:
-    ReadGeneralDiagnosticsBootReasons()
-        : ReadAttribute("boot-reasons")
+    ReadDoorLockNumberOfPINUsersSupported()
+        : ReadAttribute("number-of-pinusers-supported")
     {
     }
 
-    ~ReadGeneralDiagnosticsBootReasons() {}
+    ~ReadDoorLockNumberOfPINUsersSupported() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000012) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeBootReasonsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GeneralDiagnostics.BootReasons response %@", [value description]);
-            if (error != nil) {
-                LogNSError("GeneralDiagnostics BootReasons read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeNumberOfPINUsersSupportedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.NumberOfPINUsersSupported response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("DoorLock NumberOfPINUsersSupported read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeGeneralDiagnosticsBootReasons : public SubscribeAttribute {
+class SubscribeAttributeDoorLockNumberOfPINUsersSupported : public SubscribeAttribute {
 public:
-    SubscribeAttributeGeneralDiagnosticsBootReasons()
-        : SubscribeAttribute("boot-reasons")
+    SubscribeAttributeDoorLockNumberOfPINUsersSupported()
+        : SubscribeAttribute("number-of-pinusers-supported")
     {
     }
 
-    ~SubscribeAttributeGeneralDiagnosticsBootReasons() {}
+    ~SubscribeAttributeDoorLockNumberOfPINUsersSupported() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000012) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBootReasonsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNumberOfPINUsersSupportedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralDiagnostics.BootReasons response %@", [value description]);
+                NSLog(@"DoorLock.NumberOfPINUsersSupported response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -38411,64 +38007,61 @@ class SubscribeAttributeGeneralDiagnosticsBootReasons : public SubscribeAttribut
 };
 
 /*
- * Attribute ActiveHardwareFaults
+ * Attribute NumberOfRFIDUsersSupported
  */
-class ReadGeneralDiagnosticsActiveHardwareFaults : public ReadAttribute {
+class ReadDoorLockNumberOfRFIDUsersSupported : public ReadAttribute {
 public:
-    ReadGeneralDiagnosticsActiveHardwareFaults()
-        : ReadAttribute("active-hardware-faults")
+    ReadDoorLockNumberOfRFIDUsersSupported()
+        : ReadAttribute("number-of-rfidusers-supported")
     {
     }
 
-    ~ReadGeneralDiagnosticsActiveHardwareFaults() {}
+    ~ReadDoorLockNumberOfRFIDUsersSupported() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000013) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeActiveHardwareFaultsWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GeneralDiagnostics.ActiveHardwareFaults response %@", [value description]);
-            if (error != nil) {
-                LogNSError("GeneralDiagnostics ActiveHardwareFaults read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeNumberOfRFIDUsersSupportedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.NumberOfRFIDUsersSupported response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("DoorLock NumberOfRFIDUsersSupported read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeGeneralDiagnosticsActiveHardwareFaults : public SubscribeAttribute {
+class SubscribeAttributeDoorLockNumberOfRFIDUsersSupported : public SubscribeAttribute {
 public:
-    SubscribeAttributeGeneralDiagnosticsActiveHardwareFaults()
-        : SubscribeAttribute("active-hardware-faults")
+    SubscribeAttributeDoorLockNumberOfRFIDUsersSupported()
+        : SubscribeAttribute("number-of-rfidusers-supported")
     {
     }
 
-    ~SubscribeAttributeGeneralDiagnosticsActiveHardwareFaults() {}
+    ~SubscribeAttributeDoorLockNumberOfRFIDUsersSupported() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000013) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeActiveHardwareFaultsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNumberOfRFIDUsersSupportedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralDiagnostics.ActiveHardwareFaults response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.NumberOfRFIDUsersSupported response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -38479,29 +38072,28 @@ class SubscribeAttributeGeneralDiagnosticsActiveHardwareFaults : public Subscrib
 };
 
 /*
- * Attribute ActiveRadioFaults
+ * Attribute NumberOfWeekDaySchedulesSupportedPerUser
  */
-class ReadGeneralDiagnosticsActiveRadioFaults : public ReadAttribute {
+class ReadDoorLockNumberOfWeekDaySchedulesSupportedPerUser : public ReadAttribute {
 public:
-    ReadGeneralDiagnosticsActiveRadioFaults()
-        : ReadAttribute("active-radio-faults")
+    ReadDoorLockNumberOfWeekDaySchedulesSupportedPerUser()
+        : ReadAttribute("number-of-week-day-schedules-supported-per-user")
     {
     }
 
-    ~ReadGeneralDiagnosticsActiveRadioFaults() {}
+    ~ReadDoorLockNumberOfWeekDaySchedulesSupportedPerUser() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000014) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeActiveRadioFaultsWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GeneralDiagnostics.ActiveRadioFaults response %@", [value description]);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNumberOfWeekDaySchedulesSupportedPerUserWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.NumberOfWeekDaySchedulesSupportedPerUser response %@", [value description]);
             if (error != nil) {
-                LogNSError("GeneralDiagnostics ActiveRadioFaults read Error", error);
+                LogNSError("DoorLock NumberOfWeekDaySchedulesSupportedPerUser read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -38509,34 +38101,33 @@ class ReadGeneralDiagnosticsActiveRadioFaults : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeGeneralDiagnosticsActiveRadioFaults : public SubscribeAttribute {
+class SubscribeAttributeDoorLockNumberOfWeekDaySchedulesSupportedPerUser : public SubscribeAttribute {
 public:
-    SubscribeAttributeGeneralDiagnosticsActiveRadioFaults()
-        : SubscribeAttribute("active-radio-faults")
+    SubscribeAttributeDoorLockNumberOfWeekDaySchedulesSupportedPerUser()
+        : SubscribeAttribute("number-of-week-day-schedules-supported-per-user")
     {
     }
 
-    ~SubscribeAttributeGeneralDiagnosticsActiveRadioFaults() {}
+    ~SubscribeAttributeDoorLockNumberOfWeekDaySchedulesSupportedPerUser() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000014) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeActiveRadioFaultsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster
+            subscribeAttributeNumberOfWeekDaySchedulesSupportedPerUserWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralDiagnostics.ActiveRadioFaults response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.NumberOfWeekDaySchedulesSupportedPerUser response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -38547,29 +38138,28 @@ class SubscribeAttributeGeneralDiagnosticsActiveRadioFaults : public SubscribeAt
 };
 
 /*
- * Attribute ActiveNetworkFaults
+ * Attribute NumberOfYearDaySchedulesSupportedPerUser
  */
-class ReadGeneralDiagnosticsActiveNetworkFaults : public ReadAttribute {
+class ReadDoorLockNumberOfYearDaySchedulesSupportedPerUser : public ReadAttribute {
 public:
-    ReadGeneralDiagnosticsActiveNetworkFaults()
-        : ReadAttribute("active-network-faults")
+    ReadDoorLockNumberOfYearDaySchedulesSupportedPerUser()
+        : ReadAttribute("number-of-year-day-schedules-supported-per-user")
     {
     }
 
-    ~ReadGeneralDiagnosticsActiveNetworkFaults() {}
+    ~ReadDoorLockNumberOfYearDaySchedulesSupportedPerUser() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000015) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeActiveNetworkFaultsWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GeneralDiagnostics.ActiveNetworkFaults response %@", [value description]);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNumberOfYearDaySchedulesSupportedPerUserWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.NumberOfYearDaySchedulesSupportedPerUser response %@", [value description]);
             if (error != nil) {
-                LogNSError("GeneralDiagnostics ActiveNetworkFaults read Error", error);
+                LogNSError("DoorLock NumberOfYearDaySchedulesSupportedPerUser read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -38577,34 +38167,33 @@ class ReadGeneralDiagnosticsActiveNetworkFaults : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeGeneralDiagnosticsActiveNetworkFaults : public SubscribeAttribute {
+class SubscribeAttributeDoorLockNumberOfYearDaySchedulesSupportedPerUser : public SubscribeAttribute {
 public:
-    SubscribeAttributeGeneralDiagnosticsActiveNetworkFaults()
-        : SubscribeAttribute("active-network-faults")
+    SubscribeAttributeDoorLockNumberOfYearDaySchedulesSupportedPerUser()
+        : SubscribeAttribute("number-of-year-day-schedules-supported-per-user")
     {
     }
 
-    ~SubscribeAttributeGeneralDiagnosticsActiveNetworkFaults() {}
+    ~SubscribeAttributeDoorLockNumberOfYearDaySchedulesSupportedPerUser() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000015) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeActiveNetworkFaultsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster
+            subscribeAttributeNumberOfYearDaySchedulesSupportedPerUserWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralDiagnostics.ActiveNetworkFaults response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.NumberOfYearDaySchedulesSupportedPerUser response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -38615,65 +38204,61 @@ class SubscribeAttributeGeneralDiagnosticsActiveNetworkFaults : public Subscribe
 };
 
 /*
- * Attribute TestEventTriggersEnabled
+ * Attribute NumberOfHolidaySchedulesSupported
  */
-class ReadGeneralDiagnosticsTestEventTriggersEnabled : public ReadAttribute {
+class ReadDoorLockNumberOfHolidaySchedulesSupported : public ReadAttribute {
 public:
-    ReadGeneralDiagnosticsTestEventTriggersEnabled()
-        : ReadAttribute("test-event-triggers-enabled")
+    ReadDoorLockNumberOfHolidaySchedulesSupported()
+        : ReadAttribute("number-of-holiday-schedules-supported")
     {
     }
 
-    ~ReadGeneralDiagnosticsTestEventTriggersEnabled() {}
+    ~ReadDoorLockNumberOfHolidaySchedulesSupported() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000016) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster
-            readAttributeTestEventTriggersEnabledWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralDiagnostics.TestEventTriggersEnabled response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("GeneralDiagnostics TestEventTriggersEnabled read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNumberOfHolidaySchedulesSupportedWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.NumberOfHolidaySchedulesSupported response %@", [value description]);
+            if (error != nil) {
+                LogNSError("DoorLock NumberOfHolidaySchedulesSupported read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeGeneralDiagnosticsTestEventTriggersEnabled : public SubscribeAttribute {
+class SubscribeAttributeDoorLockNumberOfHolidaySchedulesSupported : public SubscribeAttribute {
 public:
-    SubscribeAttributeGeneralDiagnosticsTestEventTriggersEnabled()
-        : SubscribeAttribute("test-event-triggers-enabled")
+    SubscribeAttributeDoorLockNumberOfHolidaySchedulesSupported()
+        : SubscribeAttribute("number-of-holiday-schedules-supported")
     {
     }
 
-    ~SubscribeAttributeGeneralDiagnosticsTestEventTriggersEnabled() {}
+    ~SubscribeAttributeDoorLockNumberOfHolidaySchedulesSupported() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000016) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTestEventTriggersEnabledWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNumberOfHolidaySchedulesSupportedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralDiagnostics.TestEventTriggersEnabled response %@", [value description]);
+                NSLog(@"DoorLock.NumberOfHolidaySchedulesSupported response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -38684,29 +38269,27 @@ class SubscribeAttributeGeneralDiagnosticsTestEventTriggersEnabled : public Subs
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute MaxPINCodeLength
  */
-class ReadGeneralDiagnosticsGeneratedCommandList : public ReadAttribute {
+class ReadDoorLockMaxPINCodeLength : public ReadAttribute {
 public:
-    ReadGeneralDiagnosticsGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadDoorLockMaxPINCodeLength()
+        : ReadAttribute("max-pincode-length")
     {
     }
 
-    ~ReadGeneralDiagnosticsGeneratedCommandList() {}
+    ~ReadDoorLockMaxPINCodeLength() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000017) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GeneralDiagnostics.GeneratedCommandList response %@", [value description]);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeMaxPINCodeLengthWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.MaxPINCodeLength response %@", [value description]);
             if (error != nil) {
-                LogNSError("GeneralDiagnostics GeneratedCommandList read Error", error);
+                LogNSError("DoorLock MaxPINCodeLength read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -38714,34 +38297,32 @@ class ReadGeneralDiagnosticsGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeGeneralDiagnosticsGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeDoorLockMaxPINCodeLength : public SubscribeAttribute {
 public:
-    SubscribeAttributeGeneralDiagnosticsGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeDoorLockMaxPINCodeLength()
+        : SubscribeAttribute("max-pincode-length")
     {
     }
 
-    ~SubscribeAttributeGeneralDiagnosticsGeneratedCommandList() {}
+    ~SubscribeAttributeDoorLockMaxPINCodeLength() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000017) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMaxPINCodeLengthWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralDiagnostics.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.MaxPINCodeLength response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -38752,29 +38333,27 @@ class SubscribeAttributeGeneralDiagnosticsGeneratedCommandList : public Subscrib
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute MinPINCodeLength
  */
-class ReadGeneralDiagnosticsAcceptedCommandList : public ReadAttribute {
+class ReadDoorLockMinPINCodeLength : public ReadAttribute {
 public:
-    ReadGeneralDiagnosticsAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadDoorLockMinPINCodeLength()
+        : ReadAttribute("min-pincode-length")
     {
     }
 
-    ~ReadGeneralDiagnosticsAcceptedCommandList() {}
+    ~ReadDoorLockMinPINCodeLength() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000018) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GeneralDiagnostics.AcceptedCommandList response %@", [value description]);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeMinPINCodeLengthWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.MinPINCodeLength response %@", [value description]);
             if (error != nil) {
-                LogNSError("GeneralDiagnostics AcceptedCommandList read Error", error);
+                LogNSError("DoorLock MinPINCodeLength read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -38782,34 +38361,32 @@ class ReadGeneralDiagnosticsAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeGeneralDiagnosticsAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeDoorLockMinPINCodeLength : public SubscribeAttribute {
 public:
-    SubscribeAttributeGeneralDiagnosticsAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeDoorLockMinPINCodeLength()
+        : SubscribeAttribute("min-pincode-length")
     {
     }
 
-    ~SubscribeAttributeGeneralDiagnosticsAcceptedCommandList() {}
+    ~SubscribeAttributeDoorLockMinPINCodeLength() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000018) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMinPINCodeLengthWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralDiagnostics.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.MinPINCodeLength response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -38820,29 +38397,27 @@ class SubscribeAttributeGeneralDiagnosticsAcceptedCommandList : public Subscribe
 };
 
 /*
- * Attribute AttributeList
+ * Attribute MaxRFIDCodeLength
  */
-class ReadGeneralDiagnosticsAttributeList : public ReadAttribute {
+class ReadDoorLockMaxRFIDCodeLength : public ReadAttribute {
 public:
-    ReadGeneralDiagnosticsAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadDoorLockMaxRFIDCodeLength()
+        : ReadAttribute("max-rfidcode-length")
     {
     }
 
-    ~ReadGeneralDiagnosticsAttributeList() {}
+    ~ReadDoorLockMaxRFIDCodeLength() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000019) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GeneralDiagnostics.AttributeList response %@", [value description]);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeMaxRFIDCodeLengthWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.MaxRFIDCodeLength response %@", [value description]);
             if (error != nil) {
-                LogNSError("GeneralDiagnostics AttributeList read Error", error);
+                LogNSError("DoorLock MaxRFIDCodeLength read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -38850,34 +38425,32 @@ class ReadGeneralDiagnosticsAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeGeneralDiagnosticsAttributeList : public SubscribeAttribute {
+class SubscribeAttributeDoorLockMaxRFIDCodeLength : public SubscribeAttribute {
 public:
-    SubscribeAttributeGeneralDiagnosticsAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeDoorLockMaxRFIDCodeLength()
+        : SubscribeAttribute("max-rfidcode-length")
     {
     }
 
-    ~SubscribeAttributeGeneralDiagnosticsAttributeList() {}
+    ~SubscribeAttributeDoorLockMaxRFIDCodeLength() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000019) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMaxRFIDCodeLengthWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralDiagnostics.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.MaxRFIDCodeLength response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -38888,29 +38461,27 @@ class SubscribeAttributeGeneralDiagnosticsAttributeList : public SubscribeAttrib
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute MinRFIDCodeLength
  */
-class ReadGeneralDiagnosticsFeatureMap : public ReadAttribute {
+class ReadDoorLockMinRFIDCodeLength : public ReadAttribute {
 public:
-    ReadGeneralDiagnosticsFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadDoorLockMinRFIDCodeLength()
+        : ReadAttribute("min-rfidcode-length")
     {
     }
 
-    ~ReadGeneralDiagnosticsFeatureMap() {}
+    ~ReadDoorLockMinRFIDCodeLength() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x0000001A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GeneralDiagnostics.FeatureMap response %@", [value description]);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeMinRFIDCodeLengthWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.MinRFIDCodeLength response %@", [value description]);
             if (error != nil) {
-                LogNSError("GeneralDiagnostics FeatureMap read Error", error);
+                LogNSError("DoorLock MinRFIDCodeLength read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -38918,34 +38489,32 @@ class ReadGeneralDiagnosticsFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeGeneralDiagnosticsFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeDoorLockMinRFIDCodeLength : public SubscribeAttribute {
 public:
-    SubscribeAttributeGeneralDiagnosticsFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeDoorLockMinRFIDCodeLength()
+        : SubscribeAttribute("min-rfidcode-length")
     {
     }
 
-    ~SubscribeAttributeGeneralDiagnosticsFeatureMap() {}
+    ~SubscribeAttributeDoorLockMinRFIDCodeLength() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x0000001A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMinRFIDCodeLengthWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralDiagnostics.FeatureMap response %@", [value description]);
+                NSLog(@"DoorLock.MinRFIDCodeLength response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -38956,29 +38525,27 @@ class SubscribeAttributeGeneralDiagnosticsFeatureMap : public SubscribeAttribute
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute CredentialRulesSupport
  */
-class ReadGeneralDiagnosticsClusterRevision : public ReadAttribute {
+class ReadDoorLockCredentialRulesSupport : public ReadAttribute {
 public:
-    ReadGeneralDiagnosticsClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadDoorLockCredentialRulesSupport()
+        : ReadAttribute("credential-rules-support")
     {
     }
 
-    ~ReadGeneralDiagnosticsClusterRevision() {}
+    ~ReadDoorLockCredentialRulesSupport() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x0000001B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GeneralDiagnostics.ClusterRevision response %@", [value description]);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCredentialRulesSupportWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.CredentialRulesSupport response %@", [value description]);
             if (error != nil) {
-                LogNSError("GeneralDiagnostics ClusterRevision read Error", error);
+                LogNSError("DoorLock CredentialRulesSupport read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -38986,34 +38553,32 @@ class ReadGeneralDiagnosticsClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeGeneralDiagnosticsClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeDoorLockCredentialRulesSupport : public SubscribeAttribute {
 public:
-    SubscribeAttributeGeneralDiagnosticsClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeDoorLockCredentialRulesSupport()
+        : SubscribeAttribute("credential-rules-support")
     {
     }
 
-    ~SubscribeAttributeGeneralDiagnosticsClusterRevision() {}
+    ~SubscribeAttributeDoorLockCredentialRulesSupport() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000033) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x0000001B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGeneralDiagnostics * cluster = [[CHIPGeneralDiagnostics alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCredentialRulesSupportWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GeneralDiagnostics.ClusterRevision response %@", [value description]);
+                NSLog(@"DoorLock.CredentialRulesSupport response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -39023,343 +38588,232 @@ class SubscribeAttributeGeneralDiagnosticsClusterRevision : public SubscribeAttr
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster GroupKeyManagement                                          | 0x003F |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * KeySetWrite                                                       |   0x00 |
-| * KeySetRead                                                        |   0x01 |
-| * KeySetRemove                                                      |   0x03 |
-| * KeySetReadAllIndices                                              |   0x04 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * GroupKeyMap                                                       | 0x0000 |
-| * GroupTable                                                        | 0x0001 |
-| * MaxGroupsPerFabric                                                | 0x0002 |
-| * MaxGroupKeysPerFabric                                             | 0x0003 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command KeySetWrite
+ * Attribute NumberOfCredentialsSupportedPerUser
  */
-class GroupKeyManagementKeySetWrite : public ClusterCommand {
+class ReadDoorLockNumberOfCredentialsSupportedPerUser : public ReadAttribute {
 public:
-    GroupKeyManagementKeySetWrite()
-        : ClusterCommand("key-set-write")
-        , mComplex_GroupKeySet(&mRequest.groupKeySet)
+    ReadDoorLockNumberOfCredentialsSupportedPerUser()
+        : ReadAttribute("number-of-credentials-supported-per-user")
     {
-        AddArgument("GroupKeySet", &mComplex_GroupKeySet);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadDoorLockNumberOfCredentialsSupportedPerUser() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x0000001C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        __auto_type * params = [[CHIPGroupKeyManagementClusterKeySetWriteParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.groupKeySet = [CHIPGroupKeyManagementClusterGroupKeySetStruct new];
-        params.groupKeySet.groupKeySetID = [NSNumber numberWithUnsignedShort:mRequest.groupKeySet.groupKeySetID];
-        params.groupKeySet.groupKeySecurityPolicy =
-            [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.groupKeySet.groupKeySecurityPolicy)];
-        if (mRequest.groupKeySet.epochKey0.IsNull()) {
-            params.groupKeySet.epochKey0 = nil;
-        } else {
-            params.groupKeySet.epochKey0 = [NSData dataWithBytes:mRequest.groupKeySet.epochKey0.Value().data()
-                                                          length:mRequest.groupKeySet.epochKey0.Value().size()];
-        }
-        if (mRequest.groupKeySet.epochStartTime0.IsNull()) {
-            params.groupKeySet.epochStartTime0 = nil;
-        } else {
-            params.groupKeySet.epochStartTime0 = [NSNumber numberWithUnsignedLongLong:mRequest.groupKeySet.epochStartTime0.Value()];
-        }
-        if (mRequest.groupKeySet.epochKey1.IsNull()) {
-            params.groupKeySet.epochKey1 = nil;
-        } else {
-            params.groupKeySet.epochKey1 = [NSData dataWithBytes:mRequest.groupKeySet.epochKey1.Value().data()
-                                                          length:mRequest.groupKeySet.epochKey1.Value().size()];
-        }
-        if (mRequest.groupKeySet.epochStartTime1.IsNull()) {
-            params.groupKeySet.epochStartTime1 = nil;
-        } else {
-            params.groupKeySet.epochStartTime1 = [NSNumber numberWithUnsignedLongLong:mRequest.groupKeySet.epochStartTime1.Value()];
-        }
-        if (mRequest.groupKeySet.epochKey2.IsNull()) {
-            params.groupKeySet.epochKey2 = nil;
-        } else {
-            params.groupKeySet.epochKey2 = [NSData dataWithBytes:mRequest.groupKeySet.epochKey2.Value().data()
-                                                          length:mRequest.groupKeySet.epochKey2.Value().size()];
-        }
-        if (mRequest.groupKeySet.epochStartTime2.IsNull()) {
-            params.groupKeySet.epochStartTime2 = nil;
-        } else {
-            params.groupKeySet.epochStartTime2 = [NSNumber numberWithUnsignedLongLong:mRequest.groupKeySet.epochStartTime2.Value()];
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster keySetWriteWithParams:params
-                         completionHandler:^(NSError * _Nullable error) {
-                             responsesNeeded--;
-                             if (error != nil) {
-                                 mError = error;
-                                 LogNSError("Error", error);
-                             }
-                             if (responsesNeeded == 0) {
-                                 SetCommandExitStatus(mError);
-                             }
-                         }];
-        }
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNumberOfCredentialsSupportedPerUserWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.NumberOfCredentialsSupportedPerUser response %@", [value description]);
+            if (error != nil) {
+                LogNSError("DoorLock NumberOfCredentialsSupportedPerUser read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::GroupKeyManagement::Structs::GroupKeySetStruct::Type> mComplex_GroupKeySet;
 };
 
-/*
- * Command KeySetRead
- */
-class GroupKeyManagementKeySetRead : public ClusterCommand {
+class SubscribeAttributeDoorLockNumberOfCredentialsSupportedPerUser : public SubscribeAttribute {
 public:
-    GroupKeyManagementKeySetRead()
-        : ClusterCommand("key-set-read")
+    SubscribeAttributeDoorLockNumberOfCredentialsSupportedPerUser()
+        : SubscribeAttribute("number-of-credentials-supported-per-user")
     {
-        AddArgument("GroupKeySetID", 0, UINT16_MAX, &mRequest.groupKeySetID);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeDoorLockNumberOfCredentialsSupportedPerUser() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) command (0x00000001) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x0000001C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        __auto_type * params = [[CHIPGroupKeyManagementClusterKeySetReadParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.groupKeySetID = [NSNumber numberWithUnsignedShort:mRequest.groupKeySetID];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster keySetReadWithParams:params
-                        completionHandler:^(
-                            CHIPGroupKeyManagementClusterKeySetReadResponseParams * _Nullable values, NSError * _Nullable error) {
-                            NSLog(@"Values: %@", values);
-                            responsesNeeded--;
-                            if (error != nil) {
-                                mError = error;
-                                LogNSError("Error", error);
-                            }
-                            if (responsesNeeded == 0) {
-                                SetCommandExitStatus(mError);
-                            }
-                        }];
-        }
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeNumberOfCredentialsSupportedPerUserWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.NumberOfCredentialsSupportedPerUser response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::GroupKeyManagement::Commands::KeySetRead::Type mRequest;
 };
 
 /*
- * Command KeySetRemove
+ * Attribute Language
  */
-class GroupKeyManagementKeySetRemove : public ClusterCommand {
+class ReadDoorLockLanguage : public ReadAttribute {
 public:
-    GroupKeyManagementKeySetRemove()
-        : ClusterCommand("key-set-remove")
+    ReadDoorLockLanguage()
+        : ReadAttribute("language")
     {
-        AddArgument("GroupKeySetID", 0, UINT16_MAX, &mRequest.groupKeySetID);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadDoorLockLanguage() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) command (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000021) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        __auto_type * params = [[CHIPGroupKeyManagementClusterKeySetRemoveParams alloc] init];
-        params.timedInvokeTimeoutMs
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeLanguageWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.Language response %@", [value description]);
+            if (error != nil) {
+                LogNSError("DoorLock Language read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteDoorLockLanguage : public WriteAttribute {
+public:
+    WriteDoorLockLanguage()
+        : WriteAttribute("language")
+    {
+        AddArgument("attr-name", "language");
+        AddArgument("attr-value", &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteDoorLockLanguage() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000021) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.groupKeySetID = [NSNumber numberWithUnsignedShort:mRequest.groupKeySetID];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster keySetRemoveWithParams:params
-                          completionHandler:^(NSError * _Nullable error) {
-                              responsesNeeded--;
-                              if (error != nil) {
-                                  mError = error;
-                                  LogNSError("Error", error);
-                              }
-                              if (responsesNeeded == 0) {
-                                  SetCommandExitStatus(mError);
-                              }
-                          }];
-        }
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSString * _Nonnull value = [[NSString alloc] initWithBytes:mValue.data()
+                                                             length:mValue.size()
+                                                           encoding:NSUTF8StringEncoding];
+
+        [cluster writeAttributeLanguageWithValue:value
+                                          params:params
+                               completionHandler:^(NSError * _Nullable error) {
+                                   if (error != nil) {
+                                       LogNSError("DoorLock Language write Error", error);
+                                   }
+                                   SetCommandExitStatus(error);
+                               }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::GroupKeyManagement::Commands::KeySetRemove::Type mRequest;
+    chip::ByteSpan mValue;
 };
 
-/*
- * Command KeySetReadAllIndices
- */
-class GroupKeyManagementKeySetReadAllIndices : public ClusterCommand {
+class SubscribeAttributeDoorLockLanguage : public SubscribeAttribute {
 public:
-    GroupKeyManagementKeySetReadAllIndices()
-        : ClusterCommand("key-set-read-all-indices")
-        , mComplex_GroupKeySetIDs(&mRequest.groupKeySetIDs)
+    SubscribeAttributeDoorLockLanguage()
+        : SubscribeAttribute("language")
     {
-        AddArgument("GroupKeySetIDs", &mComplex_GroupKeySetIDs);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeDoorLockLanguage() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) command (0x00000004) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000021) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        __auto_type * params = [[CHIPGroupKeyManagementClusterKeySetReadAllIndicesParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mRequest.groupKeySetIDs) {
-                NSNumber * newElement_0;
-                newElement_0 = [NSNumber numberWithUnsignedShort:entry_0];
-                [array_0 addObject:newElement_0];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeLanguageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
             }
-            params.groupKeySetIDs = array_0;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster
-                keySetReadAllIndicesWithParams:params
-                             completionHandler:^(CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable values,
-                                 NSError * _Nullable error) {
-                                 NSLog(@"Values: %@", values);
-                                 responsesNeeded--;
-                                 if (error != nil) {
-                                     mError = error;
-                                     LogNSError("Error", error);
-                                 }
-                                 if (responsesNeeded == 0) {
-                                     SetCommandExitStatus(mError);
-                                 }
-                             }];
-        }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.Language response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndices::Type mRequest;
-    TypedComplexArgument<chip::app::DataModel::List<const uint16_t>> mComplex_GroupKeySetIDs;
 };
 
 /*
- * Attribute GroupKeyMap
+ * Attribute LEDSettings
  */
-class ReadGroupKeyManagementGroupKeyMap : public ReadAttribute {
+class ReadDoorLockLEDSettings : public ReadAttribute {
 public:
-    ReadGroupKeyManagementGroupKeyMap()
-        : ReadAttribute("group-key-map")
+    ReadDoorLockLEDSettings()
+        : ReadAttribute("ledsettings")
     {
     }
 
-    ~ReadGroupKeyManagementGroupKeyMap() {}
+    ~ReadDoorLockLEDSettings() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000022) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        CHIPReadParams * params = [[CHIPReadParams alloc] init];
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster readAttributeGroupKeyMapWithParams:params
-                                  completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                      NSLog(@"GroupKeyManagement.GroupKeyMap response %@", [value description]);
-                                      if (error != nil) {
-                                          LogNSError("GroupKeyManagement GroupKeyMap read Error", error);
-                                      }
-                                      SetCommandExitStatus(error);
-                                  }];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeLEDSettingsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.LEDSettings response %@", [value description]);
+            if (error != nil) {
+                LogNSError("DoorLock LEDSettings read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class WriteGroupKeyManagementGroupKeyMap : public WriteAttribute {
+class WriteDoorLockLEDSettings : public WriteAttribute {
 public:
-    WriteGroupKeyManagementGroupKeyMap()
-        : WriteAttribute("group-key-map")
-        , mComplex(&mValue)
+    WriteDoorLockLEDSettings()
+        : WriteAttribute("ledsettings")
     {
-        AddArgument("attr-name", "group-key-map");
-        AddArgument("attr-value", &mComplex);
+        AddArgument("attr-name", "ledsettings");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteGroupKeyManagementGroupKeyMap() {}
+    ~WriteDoorLockLEDSettings() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) WriteAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000022) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSArray * _Nonnull value;
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mValue) {
-                CHIPGroupKeyManagementClusterGroupKeyMapStruct * newElement_0;
-                newElement_0 = [CHIPGroupKeyManagementClusterGroupKeyMapStruct new];
-                newElement_0.groupId = [NSNumber numberWithUnsignedShort:entry_0.groupId];
-                newElement_0.groupKeySetID = [NSNumber numberWithUnsignedShort:entry_0.groupKeySetID];
-                newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
-                [array_0 addObject:newElement_0];
-            }
-            value = array_0;
-        }
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
 
-        [cluster writeAttributeGroupKeyMapWithValue:value
+        [cluster writeAttributeLEDSettingsWithValue:value
                                              params:params
                                   completionHandler:^(NSError * _Nullable error) {
                                       if (error != nil) {
-                                          LogNSError("GroupKeyManagement GroupKeyMap write Error", error);
+                                          LogNSError("DoorLock LEDSettings write Error", error);
                                       }
                                       SetCommandExitStatus(error);
                                   }];
@@ -39367,40 +38821,35 @@ class WriteGroupKeyManagementGroupKeyMap : public WriteAttribute {
     }
 
 private:
-    chip::app::DataModel::List<const chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type> mValue;
-    TypedComplexArgument<
-        chip::app::DataModel::List<const chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type>>
-        mComplex;
+    uint8_t mValue;
 };
 
-class SubscribeAttributeGroupKeyManagementGroupKeyMap : public SubscribeAttribute {
+class SubscribeAttributeDoorLockLEDSettings : public SubscribeAttribute {
 public:
-    SubscribeAttributeGroupKeyManagementGroupKeyMap()
-        : SubscribeAttribute("group-key-map")
+    SubscribeAttributeDoorLockLEDSettings()
+        : SubscribeAttribute("ledsettings")
     {
     }
 
-    ~SubscribeAttributeGroupKeyManagementGroupKeyMap() {}
+    ~SubscribeAttributeDoorLockLEDSettings() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000022) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGroupKeyMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeLEDSettingsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GroupKeyManagement.GroupKeyMap response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.LEDSettings response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -39411,67 +38860,98 @@ class SubscribeAttributeGroupKeyManagementGroupKeyMap : public SubscribeAttribut
 };
 
 /*
- * Attribute GroupTable
+ * Attribute AutoRelockTime
  */
-class ReadGroupKeyManagementGroupTable : public ReadAttribute {
+class ReadDoorLockAutoRelockTime : public ReadAttribute {
 public:
-    ReadGroupKeyManagementGroupTable()
-        : ReadAttribute("group-table")
+    ReadDoorLockAutoRelockTime()
+        : ReadAttribute("auto-relock-time")
     {
     }
 
-    ~ReadGroupKeyManagementGroupTable() {}
+    ~ReadDoorLockAutoRelockTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000023) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        CHIPReadParams * params = [[CHIPReadParams alloc] init];
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster readAttributeGroupTableWithParams:params
-                                 completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                     NSLog(@"GroupKeyManagement.GroupTable response %@", [value description]);
-                                     if (error != nil) {
-                                         LogNSError("GroupKeyManagement GroupTable read Error", error);
-                                     }
-                                     SetCommandExitStatus(error);
-                                 }];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAutoRelockTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.AutoRelockTime response %@", [value description]);
+            if (error != nil) {
+                LogNSError("DoorLock AutoRelockTime read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeGroupKeyManagementGroupTable : public SubscribeAttribute {
+class WriteDoorLockAutoRelockTime : public WriteAttribute {
 public:
-    SubscribeAttributeGroupKeyManagementGroupTable()
-        : SubscribeAttribute("group-table")
+    WriteDoorLockAutoRelockTime()
+        : WriteAttribute("auto-relock-time")
     {
+        AddArgument("attr-name", "auto-relock-time");
+        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeGroupKeyManagementGroupTable() {}
+    ~WriteDoorLockAutoRelockTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000023) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue];
+
+        [cluster writeAttributeAutoRelockTimeWithValue:value
+                                                params:params
+                                     completionHandler:^(NSError * _Nullable error) {
+                                         if (error != nil) {
+                                             LogNSError("DoorLock AutoRelockTime write Error", error);
+                                         }
+                                         SetCommandExitStatus(error);
+                                     }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint32_t mValue;
+};
+
+class SubscribeAttributeDoorLockAutoRelockTime : public SubscribeAttribute {
+public:
+    SubscribeAttributeDoorLockAutoRelockTime()
+        : SubscribeAttribute("auto-relock-time")
+    {
+    }
+
+    ~SubscribeAttributeDoorLockAutoRelockTime() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000023) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGroupTableWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAutoRelockTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GroupKeyManagement.GroupTable response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.AutoRelockTime response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -39482,29 +38962,27 @@ class SubscribeAttributeGroupKeyManagementGroupTable : public SubscribeAttribute
 };
 
 /*
- * Attribute MaxGroupsPerFabric
+ * Attribute SoundVolume
  */
-class ReadGroupKeyManagementMaxGroupsPerFabric : public ReadAttribute {
+class ReadDoorLockSoundVolume : public ReadAttribute {
 public:
-    ReadGroupKeyManagementMaxGroupsPerFabric()
-        : ReadAttribute("max-groups-per-fabric")
+    ReadDoorLockSoundVolume()
+        : ReadAttribute("sound-volume")
     {
     }
 
-    ~ReadGroupKeyManagementMaxGroupsPerFabric() {}
+    ~ReadDoorLockSoundVolume() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000024) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeMaxGroupsPerFabricWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GroupKeyManagement.MaxGroupsPerFabric response %@", [value description]);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeSoundVolumeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.SoundVolume response %@", [value description]);
             if (error != nil) {
-                LogNSError("GroupKeyManagement MaxGroupsPerFabric read Error", error);
+                LogNSError("DoorLock SoundVolume read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -39512,34 +38990,70 @@ class ReadGroupKeyManagementMaxGroupsPerFabric : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeGroupKeyManagementMaxGroupsPerFabric : public SubscribeAttribute {
+class WriteDoorLockSoundVolume : public WriteAttribute {
 public:
-    SubscribeAttributeGroupKeyManagementMaxGroupsPerFabric()
-        : SubscribeAttribute("max-groups-per-fabric")
+    WriteDoorLockSoundVolume()
+        : WriteAttribute("sound-volume")
     {
+        AddArgument("attr-name", "sound-volume");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeGroupKeyManagementMaxGroupsPerFabric() {}
+    ~WriteDoorLockSoundVolume() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000024) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeSoundVolumeWithValue:value
+                                             params:params
+                                  completionHandler:^(NSError * _Nullable error) {
+                                      if (error != nil) {
+                                          LogNSError("DoorLock SoundVolume write Error", error);
+                                      }
+                                      SetCommandExitStatus(error);
+                                  }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeDoorLockSoundVolume : public SubscribeAttribute {
+public:
+    SubscribeAttributeDoorLockSoundVolume()
+        : SubscribeAttribute("sound-volume")
+    {
+    }
+
+    ~SubscribeAttributeDoorLockSoundVolume() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000024) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMaxGroupsPerFabricWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSoundVolumeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GroupKeyManagement.MaxGroupsPerFabric response %@", [value description]);
+                NSLog(@"DoorLock.SoundVolume response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -39550,29 +39064,27 @@ class SubscribeAttributeGroupKeyManagementMaxGroupsPerFabric : public SubscribeA
 };
 
 /*
- * Attribute MaxGroupKeysPerFabric
+ * Attribute OperatingMode
  */
-class ReadGroupKeyManagementMaxGroupKeysPerFabric : public ReadAttribute {
+class ReadDoorLockOperatingMode : public ReadAttribute {
 public:
-    ReadGroupKeyManagementMaxGroupKeysPerFabric()
-        : ReadAttribute("max-group-keys-per-fabric")
+    ReadDoorLockOperatingMode()
+        : ReadAttribute("operating-mode")
     {
     }
 
-    ~ReadGroupKeyManagementMaxGroupKeysPerFabric() {}
+    ~ReadDoorLockOperatingMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000025) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeMaxGroupKeysPerFabricWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GroupKeyManagement.MaxGroupKeysPerFabric response %@", [value description]);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeOperatingModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.OperatingMode response %@", [value description]);
             if (error != nil) {
-                LogNSError("GroupKeyManagement MaxGroupKeysPerFabric read Error", error);
+                LogNSError("DoorLock OperatingMode read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -39580,34 +39092,70 @@ class ReadGroupKeyManagementMaxGroupKeysPerFabric : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeGroupKeyManagementMaxGroupKeysPerFabric : public SubscribeAttribute {
+class WriteDoorLockOperatingMode : public WriteAttribute {
 public:
-    SubscribeAttributeGroupKeyManagementMaxGroupKeysPerFabric()
-        : SubscribeAttribute("max-group-keys-per-fabric")
+    WriteDoorLockOperatingMode()
+        : WriteAttribute("operating-mode")
     {
+        AddArgument("attr-name", "operating-mode");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeGroupKeyManagementMaxGroupKeysPerFabric() {}
+    ~WriteDoorLockOperatingMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000025) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMaxGroupKeysPerFabricWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeOperatingModeWithValue:value
+                                               params:params
+                                    completionHandler:^(NSError * _Nullable error) {
+                                        if (error != nil) {
+                                            LogNSError("DoorLock OperatingMode write Error", error);
+                                        }
+                                        SetCommandExitStatus(error);
+                                    }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeDoorLockOperatingMode : public SubscribeAttribute {
+public:
+    SubscribeAttributeDoorLockOperatingMode()
+        : SubscribeAttribute("operating-mode")
+    {
+    }
+
+    ~SubscribeAttributeDoorLockOperatingMode() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000025) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeOperatingModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GroupKeyManagement.MaxGroupKeysPerFabric response %@", [value description]);
+                NSLog(@"DoorLock.OperatingMode response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -39618,64 +39166,61 @@ class SubscribeAttributeGroupKeyManagementMaxGroupKeysPerFabric : public Subscri
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute SupportedOperatingModes
  */
-class ReadGroupKeyManagementGeneratedCommandList : public ReadAttribute {
+class ReadDoorLockSupportedOperatingModes : public ReadAttribute {
 public:
-    ReadGroupKeyManagementGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadDoorLockSupportedOperatingModes()
+        : ReadAttribute("supported-operating-modes")
     {
     }
 
-    ~ReadGroupKeyManagementGeneratedCommandList() {}
+    ~ReadDoorLockSupportedOperatingModes() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000026) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GroupKeyManagement.GeneratedCommandList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("GroupKeyManagement GeneratedCommandList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeSupportedOperatingModesWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.SupportedOperatingModes response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("DoorLock SupportedOperatingModes read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeGroupKeyManagementGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeDoorLockSupportedOperatingModes : public SubscribeAttribute {
 public:
-    SubscribeAttributeGroupKeyManagementGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeDoorLockSupportedOperatingModes()
+        : SubscribeAttribute("supported-operating-modes")
     {
     }
 
-    ~SubscribeAttributeGroupKeyManagementGeneratedCommandList() {}
+    ~SubscribeAttributeDoorLockSupportedOperatingModes() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000026) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSupportedOperatingModesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GroupKeyManagement.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.SupportedOperatingModes response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -39686,29 +39231,28 @@ class SubscribeAttributeGroupKeyManagementGeneratedCommandList : public Subscrib
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute DefaultConfigurationRegister
  */
-class ReadGroupKeyManagementAcceptedCommandList : public ReadAttribute {
+class ReadDoorLockDefaultConfigurationRegister : public ReadAttribute {
 public:
-    ReadGroupKeyManagementAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadDoorLockDefaultConfigurationRegister()
+        : ReadAttribute("default-configuration-register")
     {
     }
 
-    ~ReadGroupKeyManagementAcceptedCommandList() {}
+    ~ReadDoorLockDefaultConfigurationRegister() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000027) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GroupKeyManagement.AcceptedCommandList response %@", [value description]);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeDefaultConfigurationRegisterWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.DefaultConfigurationRegister response %@", [value description]);
             if (error != nil) {
-                LogNSError("GroupKeyManagement AcceptedCommandList read Error", error);
+                LogNSError("DoorLock DefaultConfigurationRegister read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -39716,34 +39260,32 @@ class ReadGroupKeyManagementAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeGroupKeyManagementAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeDoorLockDefaultConfigurationRegister : public SubscribeAttribute {
 public:
-    SubscribeAttributeGroupKeyManagementAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeDoorLockDefaultConfigurationRegister()
+        : SubscribeAttribute("default-configuration-register")
     {
     }
 
-    ~SubscribeAttributeGroupKeyManagementAcceptedCommandList() {}
+    ~SubscribeAttributeDoorLockDefaultConfigurationRegister() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000027) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDefaultConfigurationRegisterWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GroupKeyManagement.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.DefaultConfigurationRegister response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -39754,29 +39296,27 @@ class SubscribeAttributeGroupKeyManagementAcceptedCommandList : public Subscribe
 };
 
 /*
- * Attribute AttributeList
+ * Attribute EnableLocalProgramming
  */
-class ReadGroupKeyManagementAttributeList : public ReadAttribute {
+class ReadDoorLockEnableLocalProgramming : public ReadAttribute {
 public:
-    ReadGroupKeyManagementAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadDoorLockEnableLocalProgramming()
+        : ReadAttribute("enable-local-programming")
     {
     }
 
-    ~ReadGroupKeyManagementAttributeList() {}
+    ~ReadDoorLockEnableLocalProgramming() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000028) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GroupKeyManagement.AttributeList response %@", [value description]);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeEnableLocalProgrammingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.EnableLocalProgramming response %@", [value description]);
             if (error != nil) {
-                LogNSError("GroupKeyManagement AttributeList read Error", error);
+                LogNSError("DoorLock EnableLocalProgramming read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -39784,34 +39324,70 @@ class ReadGroupKeyManagementAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeGroupKeyManagementAttributeList : public SubscribeAttribute {
+class WriteDoorLockEnableLocalProgramming : public WriteAttribute {
 public:
-    SubscribeAttributeGroupKeyManagementAttributeList()
-        : SubscribeAttribute("attribute-list")
+    WriteDoorLockEnableLocalProgramming()
+        : WriteAttribute("enable-local-programming")
     {
+        AddArgument("attr-name", "enable-local-programming");
+        AddArgument("attr-value", 0, 1, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeGroupKeyManagementAttributeList() {}
+    ~WriteDoorLockEnableLocalProgramming() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000028) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
+
+        [cluster writeAttributeEnableLocalProgrammingWithValue:value
+                                                        params:params
+                                             completionHandler:^(NSError * _Nullable error) {
+                                                 if (error != nil) {
+                                                     LogNSError("DoorLock EnableLocalProgramming write Error", error);
+                                                 }
+                                                 SetCommandExitStatus(error);
+                                             }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    bool mValue;
+};
+
+class SubscribeAttributeDoorLockEnableLocalProgramming : public SubscribeAttribute {
+public:
+    SubscribeAttributeDoorLockEnableLocalProgramming()
+        : SubscribeAttribute("enable-local-programming")
+    {
+    }
+
+    ~SubscribeAttributeDoorLockEnableLocalProgramming() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000028) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeEnableLocalProgrammingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GroupKeyManagement.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.EnableLocalProgramming response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -39822,29 +39398,27 @@ class SubscribeAttributeGroupKeyManagementAttributeList : public SubscribeAttrib
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute EnableOneTouchLocking
  */
-class ReadGroupKeyManagementFeatureMap : public ReadAttribute {
+class ReadDoorLockEnableOneTouchLocking : public ReadAttribute {
 public:
-    ReadGroupKeyManagementFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadDoorLockEnableOneTouchLocking()
+        : ReadAttribute("enable-one-touch-locking")
     {
     }
 
-    ~ReadGroupKeyManagementFeatureMap() {}
+    ~ReadDoorLockEnableOneTouchLocking() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000029) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GroupKeyManagement.FeatureMap response %@", [value description]);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeEnableOneTouchLockingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.EnableOneTouchLocking response %@", [value description]);
             if (error != nil) {
-                LogNSError("GroupKeyManagement FeatureMap read Error", error);
+                LogNSError("DoorLock EnableOneTouchLocking read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -39852,34 +39426,70 @@ class ReadGroupKeyManagementFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeGroupKeyManagementFeatureMap : public SubscribeAttribute {
+class WriteDoorLockEnableOneTouchLocking : public WriteAttribute {
 public:
-    SubscribeAttributeGroupKeyManagementFeatureMap()
-        : SubscribeAttribute("feature-map")
+    WriteDoorLockEnableOneTouchLocking()
+        : WriteAttribute("enable-one-touch-locking")
     {
+        AddArgument("attr-name", "enable-one-touch-locking");
+        AddArgument("attr-value", 0, 1, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeGroupKeyManagementFeatureMap() {}
+    ~WriteDoorLockEnableOneTouchLocking() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000029) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
+
+        [cluster writeAttributeEnableOneTouchLockingWithValue:value
+                                                       params:params
+                                            completionHandler:^(NSError * _Nullable error) {
+                                                if (error != nil) {
+                                                    LogNSError("DoorLock EnableOneTouchLocking write Error", error);
+                                                }
+                                                SetCommandExitStatus(error);
+                                            }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    bool mValue;
+};
+
+class SubscribeAttributeDoorLockEnableOneTouchLocking : public SubscribeAttribute {
+public:
+    SubscribeAttributeDoorLockEnableOneTouchLocking()
+        : SubscribeAttribute("enable-one-touch-locking")
+    {
+    }
+
+    ~SubscribeAttributeDoorLockEnableOneTouchLocking() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000029) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeEnableOneTouchLockingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GroupKeyManagement.FeatureMap response %@", [value description]);
+                NSLog(@"DoorLock.EnableOneTouchLocking response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -39890,29 +39500,27 @@ class SubscribeAttributeGroupKeyManagementFeatureMap : public SubscribeAttribute
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute EnableInsideStatusLED
  */
-class ReadGroupKeyManagementClusterRevision : public ReadAttribute {
+class ReadDoorLockEnableInsideStatusLED : public ReadAttribute {
 public:
-    ReadGroupKeyManagementClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadDoorLockEnableInsideStatusLED()
+        : ReadAttribute("enable-inside-status-led")
     {
     }
 
-    ~ReadGroupKeyManagementClusterRevision() {}
+    ~ReadDoorLockEnableInsideStatusLED() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x0000002A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"GroupKeyManagement.ClusterRevision response %@", [value description]);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeEnableInsideStatusLEDWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.EnableInsideStatusLED response %@", [value description]);
             if (error != nil) {
-                LogNSError("GroupKeyManagement ClusterRevision read Error", error);
+                LogNSError("DoorLock EnableInsideStatusLED read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -39920,34 +39528,70 @@ class ReadGroupKeyManagementClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeGroupKeyManagementClusterRevision : public SubscribeAttribute {
+class WriteDoorLockEnableInsideStatusLED : public WriteAttribute {
 public:
-    SubscribeAttributeGroupKeyManagementClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    WriteDoorLockEnableInsideStatusLED()
+        : WriteAttribute("enable-inside-status-led")
     {
+        AddArgument("attr-name", "enable-inside-status-led");
+        AddArgument("attr-value", 0, 1, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeGroupKeyManagementClusterRevision() {}
+    ~WriteDoorLockEnableInsideStatusLED() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003F) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x0000002A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroupKeyManagement * cluster = [[CHIPGroupKeyManagement alloc] initWithDevice:device
-                                                                                 endpoint:endpointId
-                                                                                    queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
+
+        [cluster writeAttributeEnableInsideStatusLEDWithValue:value
+                                                       params:params
+                                            completionHandler:^(NSError * _Nullable error) {
+                                                if (error != nil) {
+                                                    LogNSError("DoorLock EnableInsideStatusLED write Error", error);
+                                                }
+                                                SetCommandExitStatus(error);
+                                            }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    bool mValue;
+};
+
+class SubscribeAttributeDoorLockEnableInsideStatusLED : public SubscribeAttribute {
+public:
+    SubscribeAttributeDoorLockEnableInsideStatusLED()
+        : SubscribeAttribute("enable-inside-status-led")
+    {
+    }
+
+    ~SubscribeAttributeDoorLockEnableInsideStatusLED() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x0000002A) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeEnableInsideStatusLEDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"GroupKeyManagement.ClusterRevision response %@", [value description]);
+                NSLog(@"DoorLock.EnableInsideStatusLED response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -39957,368 +39601,203 @@ class SubscribeAttributeGroupKeyManagementClusterRevision : public SubscribeAttr
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster Groups                                                      | 0x0004 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * AddGroup                                                          |   0x00 |
-| * ViewGroup                                                         |   0x01 |
-| * GetGroupMembership                                                |   0x02 |
-| * RemoveGroup                                                       |   0x03 |
-| * RemoveAllGroups                                                   |   0x04 |
-| * AddGroupIfIdentifying                                             |   0x05 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * NameSupport                                                       | 0x0000 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command AddGroup
+ * Attribute EnablePrivacyModeButton
  */
-class GroupsAddGroup : public ClusterCommand {
+class ReadDoorLockEnablePrivacyModeButton : public ReadAttribute {
 public:
-    GroupsAddGroup()
-        : ClusterCommand("add-group")
+    ReadDoorLockEnablePrivacyModeButton()
+        : ReadAttribute("enable-privacy-mode-button")
     {
-        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
-        AddArgument("GroupName", &mRequest.groupName);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadDoorLockEnablePrivacyModeButton() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000004) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x0000002B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPGroupsClusterAddGroupParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
-        params.groupName = [[NSString alloc] initWithBytes:mRequest.groupName.data()
-                                                    length:mRequest.groupName.size()
-                                                  encoding:NSUTF8StringEncoding];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster addGroupWithParams:params
-                      completionHandler:^(CHIPGroupsClusterAddGroupResponseParams * _Nullable values, NSError * _Nullable error) {
-                          NSLog(@"Values: %@", values);
-                          responsesNeeded--;
-                          if (error != nil) {
-                              mError = error;
-                              LogNSError("Error", error);
-                          }
-                          if (responsesNeeded == 0) {
-                              SetCommandExitStatus(mError);
-                          }
-                      }];
-        }
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeEnablePrivacyModeButtonWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.EnablePrivacyModeButton response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("DoorLock EnablePrivacyModeButton read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::Groups::Commands::AddGroup::Type mRequest;
 };
 
-/*
- * Command ViewGroup
- */
-class GroupsViewGroup : public ClusterCommand {
+class WriteDoorLockEnablePrivacyModeButton : public WriteAttribute {
 public:
-    GroupsViewGroup()
-        : ClusterCommand("view-group")
+    WriteDoorLockEnablePrivacyModeButton()
+        : WriteAttribute("enable-privacy-mode-button")
     {
-        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
-        ClusterCommand::AddArguments();
+        AddArgument("attr-name", "enable-privacy-mode-button");
+        AddArgument("attr-value", 0, 1, &mValue);
+        WriteAttribute::AddArguments();
     }
 
+    ~WriteDoorLockEnablePrivacyModeButton() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000004) command (0x00000001) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x0000002B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPGroupsClusterViewGroupParams alloc] init];
-        params.timedInvokeTimeoutMs
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster viewGroupWithParams:params
-                       completionHandler:^(CHIPGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable error) {
-                           NSLog(@"Values: %@", values);
-                           responsesNeeded--;
-                           if (error != nil) {
-                               mError = error;
-                               LogNSError("Error", error);
-                           }
-                           if (responsesNeeded == 0) {
-                               SetCommandExitStatus(mError);
-                           }
-                       }];
-        }
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
+
+        [cluster writeAttributeEnablePrivacyModeButtonWithValue:value
+                                                         params:params
+                                              completionHandler:^(NSError * _Nullable error) {
+                                                  if (error != nil) {
+                                                      LogNSError("DoorLock EnablePrivacyModeButton write Error", error);
+                                                  }
+                                                  SetCommandExitStatus(error);
+                                              }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::Groups::Commands::ViewGroup::Type mRequest;
+    bool mValue;
 };
 
-/*
- * Command GetGroupMembership
- */
-class GroupsGetGroupMembership : public ClusterCommand {
+class SubscribeAttributeDoorLockEnablePrivacyModeButton : public SubscribeAttribute {
 public:
-    GroupsGetGroupMembership()
-        : ClusterCommand("get-group-membership")
-        , mComplex_GroupList(&mRequest.groupList)
+    SubscribeAttributeDoorLockEnablePrivacyModeButton()
+        : SubscribeAttribute("enable-privacy-mode-button")
     {
-        AddArgument("GroupList", &mComplex_GroupList);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeDoorLockEnablePrivacyModeButton() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000004) command (0x00000002) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x0000002B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPGroupsClusterGetGroupMembershipParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mRequest.groupList) {
-                NSNumber * newElement_0;
-                newElement_0 = [NSNumber numberWithUnsignedShort:entry_0];
-                [array_0 addObject:newElement_0];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeEnablePrivacyModeButtonWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
             }
-            params.groupList = array_0;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster getGroupMembershipWithParams:params
-                                completionHandler:^(CHIPGroupsClusterGetGroupMembershipResponseParams * _Nullable values,
-                                    NSError * _Nullable error) {
-                                    NSLog(@"Values: %@", values);
-                                    responsesNeeded--;
-                                    if (error != nil) {
-                                        mError = error;
-                                        LogNSError("Error", error);
-                                    }
-                                    if (responsesNeeded == 0) {
-                                        SetCommandExitStatus(mError);
-                                    }
-                                }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::Groups::Commands::GetGroupMembership::Type mRequest;
-    TypedComplexArgument<chip::app::DataModel::List<const chip::GroupId>> mComplex_GroupList;
-};
-
-/*
- * Command RemoveGroup
- */
-class GroupsRemoveGroup : public ClusterCommand {
-public:
-    GroupsRemoveGroup()
-        : ClusterCommand("remove-group")
-    {
-        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000004) command (0x00000003) on endpoint %u", endpointId);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.EnablePrivacyModeButton response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPGroupsClusterRemoveGroupParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster
-                removeGroupWithParams:params
-                    completionHandler:^(CHIPGroupsClusterRemoveGroupResponseParams * _Nullable values, NSError * _Nullable error) {
-                        NSLog(@"Values: %@", values);
-                        responsesNeeded--;
-                        if (error != nil) {
-                            mError = error;
-                            LogNSError("Error", error);
-                        }
-                        if (responsesNeeded == 0) {
-                            SetCommandExitStatus(mError);
-                        }
-                    }];
-        }
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::Groups::Commands::RemoveGroup::Type mRequest;
 };
 
 /*
- * Command RemoveAllGroups
+ * Attribute LocalProgrammingFeatures
  */
-class GroupsRemoveAllGroups : public ClusterCommand {
+class ReadDoorLockLocalProgrammingFeatures : public ReadAttribute {
 public:
-    GroupsRemoveAllGroups()
-        : ClusterCommand("remove-all-groups")
+    ReadDoorLockLocalProgrammingFeatures()
+        : ReadAttribute("local-programming-features")
     {
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadDoorLockLocalProgrammingFeatures() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000004) command (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x0000002C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPGroupsClusterRemoveAllGroupsParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster removeAllGroupsWithParams:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 responsesNeeded--;
-                                 if (error != nil) {
-                                     mError = error;
-                                     LogNSError("Error", error);
-                                 }
-                                 if (responsesNeeded == 0) {
-                                     SetCommandExitStatus(mError);
-                                 }
-                             }];
-        }
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeLocalProgrammingFeaturesWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.LocalProgrammingFeatures response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("DoorLock LocalProgrammingFeatures read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
-
-private:
 };
 
-/*
- * Command AddGroupIfIdentifying
- */
-class GroupsAddGroupIfIdentifying : public ClusterCommand {
+class WriteDoorLockLocalProgrammingFeatures : public WriteAttribute {
 public:
-    GroupsAddGroupIfIdentifying()
-        : ClusterCommand("add-group-if-identifying")
+    WriteDoorLockLocalProgrammingFeatures()
+        : WriteAttribute("local-programming-features")
     {
-        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
-        AddArgument("GroupName", &mRequest.groupName);
-        ClusterCommand::AddArguments();
+        AddArgument("attr-name", "local-programming-features");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
+    ~WriteDoorLockLocalProgrammingFeatures() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000004) command (0x00000005) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x0000002C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPGroupsClusterAddGroupIfIdentifyingParams alloc] init];
-        params.timedInvokeTimeoutMs
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
-        params.groupName = [[NSString alloc] initWithBytes:mRequest.groupName.data()
-                                                    length:mRequest.groupName.size()
-                                                  encoding:NSUTF8StringEncoding];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster addGroupIfIdentifyingWithParams:params
-                                   completionHandler:^(NSError * _Nullable error) {
-                                       responsesNeeded--;
-                                       if (error != nil) {
-                                           mError = error;
-                                           LogNSError("Error", error);
-                                       }
-                                       if (responsesNeeded == 0) {
-                                           SetCommandExitStatus(mError);
-                                       }
-                                   }];
-        }
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeLocalProgrammingFeaturesWithValue:value
+                                                          params:params
+                                               completionHandler:^(NSError * _Nullable error) {
+                                                   if (error != nil) {
+                                                       LogNSError("DoorLock LocalProgrammingFeatures write Error", error);
+                                                   }
+                                                   SetCommandExitStatus(error);
+                                               }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::Groups::Commands::AddGroupIfIdentifying::Type mRequest;
-};
-
-/*
- * Attribute NameSupport
- */
-class ReadGroupsNameSupport : public ReadAttribute {
-public:
-    ReadGroupsNameSupport()
-        : ReadAttribute("name-support")
-    {
-    }
-
-    ~ReadGroupsNameSupport() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000004) ReadAttribute (0x00000000) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNameSupportWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Groups.NameSupport response %@", [value description]);
-            if (error != nil) {
-                LogNSError("Groups NameSupport read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
+    uint8_t mValue;
 };
 
-class SubscribeAttributeGroupsNameSupport : public SubscribeAttribute {
+class SubscribeAttributeDoorLockLocalProgrammingFeatures : public SubscribeAttribute {
 public:
-    SubscribeAttributeGroupsNameSupport()
-        : SubscribeAttribute("name-support")
+    SubscribeAttributeDoorLockLocalProgrammingFeatures()
+        : SubscribeAttribute("local-programming-features")
     {
     }
 
-    ~SubscribeAttributeGroupsNameSupport() {}
+    ~SubscribeAttributeDoorLockLocalProgrammingFeatures() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000004) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x0000002C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNameSupportWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeLocalProgrammingFeaturesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Groups.NameSupport response %@", [value description]);
+                NSLog(@"DoorLock.LocalProgrammingFeatures response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -40329,27 +39808,27 @@ class SubscribeAttributeGroupsNameSupport : public SubscribeAttribute {
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute WrongCodeEntryLimit
  */
-class ReadGroupsGeneratedCommandList : public ReadAttribute {
+class ReadDoorLockWrongCodeEntryLimit : public ReadAttribute {
 public:
-    ReadGroupsGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadDoorLockWrongCodeEntryLimit()
+        : ReadAttribute("wrong-code-entry-limit")
     {
     }
 
-    ~ReadGroupsGeneratedCommandList() {}
+    ~ReadDoorLockWrongCodeEntryLimit() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000004) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000030) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Groups.GeneratedCommandList response %@", [value description]);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeWrongCodeEntryLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.WrongCodeEntryLimit response %@", [value description]);
             if (error != nil) {
-                LogNSError("Groups GeneratedCommandList read Error", error);
+                LogNSError("DoorLock WrongCodeEntryLimit read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -40357,32 +39836,70 @@ class ReadGroupsGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeGroupsGeneratedCommandList : public SubscribeAttribute {
+class WriteDoorLockWrongCodeEntryLimit : public WriteAttribute {
 public:
-    SubscribeAttributeGroupsGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    WriteDoorLockWrongCodeEntryLimit()
+        : WriteAttribute("wrong-code-entry-limit")
     {
+        AddArgument("attr-name", "wrong-code-entry-limit");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeGroupsGeneratedCommandList() {}
+    ~WriteDoorLockWrongCodeEntryLimit() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000004) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000030) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeWrongCodeEntryLimitWithValue:value
+                                                     params:params
+                                          completionHandler:^(NSError * _Nullable error) {
+                                              if (error != nil) {
+                                                  LogNSError("DoorLock WrongCodeEntryLimit write Error", error);
+                                              }
+                                              SetCommandExitStatus(error);
+                                          }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeDoorLockWrongCodeEntryLimit : public SubscribeAttribute {
+public:
+    SubscribeAttributeDoorLockWrongCodeEntryLimit()
+        : SubscribeAttribute("wrong-code-entry-limit")
+    {
+    }
+
+    ~SubscribeAttributeDoorLockWrongCodeEntryLimit() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000030) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeWrongCodeEntryLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Groups.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.WrongCodeEntryLimit response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -40393,27 +39910,28 @@ class SubscribeAttributeGroupsGeneratedCommandList : public SubscribeAttribute {
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute UserCodeTemporaryDisableTime
  */
-class ReadGroupsAcceptedCommandList : public ReadAttribute {
+class ReadDoorLockUserCodeTemporaryDisableTime : public ReadAttribute {
 public:
-    ReadGroupsAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadDoorLockUserCodeTemporaryDisableTime()
+        : ReadAttribute("user-code-temporary-disable-time")
     {
     }
 
-    ~ReadGroupsAcceptedCommandList() {}
+    ~ReadDoorLockUserCodeTemporaryDisableTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000004) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000031) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Groups.AcceptedCommandList response %@", [value description]);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeUserCodeTemporaryDisableTimeWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.UserCodeTemporaryDisableTime response %@", [value description]);
             if (error != nil) {
-                LogNSError("Groups AcceptedCommandList read Error", error);
+                LogNSError("DoorLock UserCodeTemporaryDisableTime read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -40421,32 +39939,70 @@ class ReadGroupsAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeGroupsAcceptedCommandList : public SubscribeAttribute {
+class WriteDoorLockUserCodeTemporaryDisableTime : public WriteAttribute {
 public:
-    SubscribeAttributeGroupsAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    WriteDoorLockUserCodeTemporaryDisableTime()
+        : WriteAttribute("user-code-temporary-disable-time")
     {
+        AddArgument("attr-name", "user-code-temporary-disable-time");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeGroupsAcceptedCommandList() {}
+    ~WriteDoorLockUserCodeTemporaryDisableTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000004) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000031) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeUserCodeTemporaryDisableTimeWithValue:value
+                                                              params:params
+                                                   completionHandler:^(NSError * _Nullable error) {
+                                                       if (error != nil) {
+                                                           LogNSError("DoorLock UserCodeTemporaryDisableTime write Error", error);
+                                                       }
+                                                       SetCommandExitStatus(error);
+                                                   }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeDoorLockUserCodeTemporaryDisableTime : public SubscribeAttribute {
+public:
+    SubscribeAttributeDoorLockUserCodeTemporaryDisableTime()
+        : SubscribeAttribute("user-code-temporary-disable-time")
+    {
+    }
+
+    ~SubscribeAttributeDoorLockUserCodeTemporaryDisableTime() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000031) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeUserCodeTemporaryDisableTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Groups.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.UserCodeTemporaryDisableTime response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -40457,27 +40013,27 @@ class SubscribeAttributeGroupsAcceptedCommandList : public SubscribeAttribute {
 };
 
 /*
- * Attribute AttributeList
+ * Attribute SendPINOverTheAir
  */
-class ReadGroupsAttributeList : public ReadAttribute {
+class ReadDoorLockSendPINOverTheAir : public ReadAttribute {
 public:
-    ReadGroupsAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadDoorLockSendPINOverTheAir()
+        : ReadAttribute("send-pinover-the-air")
     {
     }
 
-    ~ReadGroupsAttributeList() {}
+    ~ReadDoorLockSendPINOverTheAir() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000004) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000032) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Groups.AttributeList response %@", [value description]);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeSendPINOverTheAirWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.SendPINOverTheAir response %@", [value description]);
             if (error != nil) {
-                LogNSError("Groups AttributeList read Error", error);
+                LogNSError("DoorLock SendPINOverTheAir read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -40485,32 +40041,70 @@ class ReadGroupsAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeGroupsAttributeList : public SubscribeAttribute {
+class WriteDoorLockSendPINOverTheAir : public WriteAttribute {
 public:
-    SubscribeAttributeGroupsAttributeList()
-        : SubscribeAttribute("attribute-list")
+    WriteDoorLockSendPINOverTheAir()
+        : WriteAttribute("send-pinover-the-air")
     {
+        AddArgument("attr-name", "send-pinover-the-air");
+        AddArgument("attr-value", 0, 1, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeGroupsAttributeList() {}
+    ~WriteDoorLockSendPINOverTheAir() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000004) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000032) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
+
+        [cluster writeAttributeSendPINOverTheAirWithValue:value
+                                                   params:params
+                                        completionHandler:^(NSError * _Nullable error) {
+                                            if (error != nil) {
+                                                LogNSError("DoorLock SendPINOverTheAir write Error", error);
+                                            }
+                                            SetCommandExitStatus(error);
+                                        }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    bool mValue;
+};
+
+class SubscribeAttributeDoorLockSendPINOverTheAir : public SubscribeAttribute {
+public:
+    SubscribeAttributeDoorLockSendPINOverTheAir()
+        : SubscribeAttribute("send-pinover-the-air")
+    {
+    }
+
+    ~SubscribeAttributeDoorLockSendPINOverTheAir() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000032) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSendPINOverTheAirWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Groups.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"DoorLock.SendPINOverTheAir response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -40521,27 +40115,28 @@ class SubscribeAttributeGroupsAttributeList : public SubscribeAttribute {
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute RequirePINforRemoteOperation
  */
-class ReadGroupsFeatureMap : public ReadAttribute {
+class ReadDoorLockRequirePINforRemoteOperation : public ReadAttribute {
 public:
-    ReadGroupsFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadDoorLockRequirePINforRemoteOperation()
+        : ReadAttribute("require-pinfor-remote-operation")
     {
     }
 
-    ~ReadGroupsFeatureMap() {}
+    ~ReadDoorLockRequirePINforRemoteOperation() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000004) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000033) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Groups.FeatureMap response %@", [value description]);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeRequirePINforRemoteOperationWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.RequirePINforRemoteOperation response %@", [value description]);
             if (error != nil) {
-                LogNSError("Groups FeatureMap read Error", error);
+                LogNSError("DoorLock RequirePINforRemoteOperation read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -40549,96 +40144,70 @@ class ReadGroupsFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeGroupsFeatureMap : public SubscribeAttribute {
+class WriteDoorLockRequirePINforRemoteOperation : public WriteAttribute {
 public:
-    SubscribeAttributeGroupsFeatureMap()
-        : SubscribeAttribute("feature-map")
+    WriteDoorLockRequirePINforRemoteOperation()
+        : WriteAttribute("require-pinfor-remote-operation")
     {
+        AddArgument("attr-name", "require-pinfor-remote-operation");
+        AddArgument("attr-value", 0, 1, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeGroupsFeatureMap() {}
+    ~WriteDoorLockRequirePINforRemoteOperation() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000004) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000033) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Groups.FeatureMap response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
 
+        [cluster writeAttributeRequirePINforRemoteOperationWithValue:value
+                                                              params:params
+                                                   completionHandler:^(NSError * _Nullable error) {
+                                                       if (error != nil) {
+                                                           LogNSError("DoorLock RequirePINforRemoteOperation write Error", error);
+                                                       }
+                                                       SetCommandExitStatus(error);
+                                                   }];
         return CHIP_NO_ERROR;
     }
-};
-
-/*
- * Attribute ClusterRevision
- */
-class ReadGroupsClusterRevision : public ReadAttribute {
-public:
-    ReadGroupsClusterRevision()
-        : ReadAttribute("cluster-revision")
-    {
-    }
 
-    ~ReadGroupsClusterRevision() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000004) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Groups.ClusterRevision response %@", [value description]);
-            if (error != nil) {
-                LogNSError("Groups ClusterRevision read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
+private:
+    bool mValue;
 };
 
-class SubscribeAttributeGroupsClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeDoorLockRequirePINforRemoteOperation : public SubscribeAttribute {
 public:
-    SubscribeAttributeGroupsClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeDoorLockRequirePINforRemoteOperation()
+        : SubscribeAttribute("require-pinfor-remote-operation")
     {
     }
 
-    ~SubscribeAttributeGroupsClusterRevision() {}
+    ~SubscribeAttributeDoorLockRequirePINforRemoteOperation() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000004) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000033) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRequirePINforRemoteOperationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Groups.ClusterRevision response %@", [value description]);
+                NSLog(@"DoorLock.RequirePINforRemoteOperation response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -40648,137 +40217,28 @@ class SubscribeAttributeGroupsClusterRevision : public SubscribeAttribute {
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster Identify                                                    | 0x0003 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * Identify                                                          |   0x00 |
-| * TriggerEffect                                                     |   0x40 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * IdentifyTime                                                      | 0x0000 |
-| * IdentifyType                                                      | 0x0001 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
-/*
- * Command Identify
- */
-class IdentifyIdentify : public ClusterCommand {
-public:
-    IdentifyIdentify()
-        : ClusterCommand("identify")
-    {
-        AddArgument("IdentifyTime", 0, UINT16_MAX, &mRequest.identifyTime);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000003) command (0x00000000) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPIdentifyClusterIdentifyParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.identifyTime = [NSNumber numberWithUnsignedShort:mRequest.identifyTime];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster identifyWithParams:params
-                      completionHandler:^(NSError * _Nullable error) {
-                          responsesNeeded--;
-                          if (error != nil) {
-                              mError = error;
-                              LogNSError("Error", error);
-                          }
-                          if (responsesNeeded == 0) {
-                              SetCommandExitStatus(mError);
-                          }
-                      }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::Identify::Commands::Identify::Type mRequest;
-};
-
-/*
- * Command TriggerEffect
- */
-class IdentifyTriggerEffect : public ClusterCommand {
-public:
-    IdentifyTriggerEffect()
-        : ClusterCommand("trigger-effect")
-    {
-        AddArgument("EffectIdentifier", 0, UINT8_MAX, &mRequest.effectIdentifier);
-        AddArgument("EffectVariant", 0, UINT8_MAX, &mRequest.effectVariant);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000003) command (0x00000040) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPIdentifyClusterTriggerEffectParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.effectIdentifier = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.effectIdentifier)];
-        params.effectVariant = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.effectVariant)];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster triggerEffectWithParams:params
-                           completionHandler:^(NSError * _Nullable error) {
-                               responsesNeeded--;
-                               if (error != nil) {
-                                   mError = error;
-                                   LogNSError("Error", error);
-                               }
-                               if (responsesNeeded == 0) {
-                                   SetCommandExitStatus(mError);
-                               }
-                           }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::Identify::Commands::TriggerEffect::Type mRequest;
-};
-
 /*
- * Attribute IdentifyTime
+ * Attribute ExpiringUserTimeout
  */
-class ReadIdentifyIdentifyTime : public ReadAttribute {
+class ReadDoorLockExpiringUserTimeout : public ReadAttribute {
 public:
-    ReadIdentifyIdentifyTime()
-        : ReadAttribute("identify-time")
+    ReadDoorLockExpiringUserTimeout()
+        : ReadAttribute("expiring-user-timeout")
     {
     }
 
-    ~ReadIdentifyIdentifyTime() {}
+    ~ReadDoorLockExpiringUserTimeout() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x00000035) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeIdentifyTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Identify.IdentifyTime response %@", [value description]);
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeExpiringUserTimeoutWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DoorLock.ExpiringUserTimeout response %@", [value description]);
             if (error != nil) {
-                LogNSError("Identify IdentifyTime read Error", error);
+                LogNSError("DoorLock ExpiringUserTimeout read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -40786,37 +40246,37 @@ class ReadIdentifyIdentifyTime : public ReadAttribute {
     }
 };
 
-class WriteIdentifyIdentifyTime : public WriteAttribute {
+class WriteDoorLockExpiringUserTimeout : public WriteAttribute {
 public:
-    WriteIdentifyIdentifyTime()
-        : WriteAttribute("identify-time")
+    WriteDoorLockExpiringUserTimeout()
+        : WriteAttribute("expiring-user-timeout")
     {
-        AddArgument("attr-name", "identify-time");
+        AddArgument("attr-name", "expiring-user-timeout");
         AddArgument("attr-value", 0, UINT16_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteIdentifyIdentifyTime() {}
+    ~WriteDoorLockExpiringUserTimeout() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000003) WriteAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) WriteAttribute (0x00000035) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
         NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
 
-        [cluster writeAttributeIdentifyTimeWithValue:value
-                                              params:params
-                                   completionHandler:^(NSError * _Nullable error) {
-                                       if (error != nil) {
-                                           LogNSError("Identify IdentifyTime write Error", error);
-                                       }
-                                       SetCommandExitStatus(error);
-                                   }];
+        [cluster writeAttributeExpiringUserTimeoutWithValue:value
+                                                     params:params
+                                          completionHandler:^(NSError * _Nullable error) {
+                                              if (error != nil) {
+                                                  LogNSError("DoorLock ExpiringUserTimeout write Error", error);
+                                              }
+                                              SetCommandExitStatus(error);
+                                          }];
         return CHIP_NO_ERROR;
     }
 
@@ -40824,96 +40284,32 @@ class WriteIdentifyIdentifyTime : public WriteAttribute {
     uint16_t mValue;
 };
 
-class SubscribeAttributeIdentifyIdentifyTime : public SubscribeAttribute {
-public:
-    SubscribeAttributeIdentifyIdentifyTime()
-        : SubscribeAttribute("identify-time")
-    {
-    }
-
-    ~SubscribeAttributeIdentifyIdentifyTime() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReportAttribute (0x00000000) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeIdentifyTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Identify.IdentifyTime response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-/*
- * Attribute IdentifyType
- */
-class ReadIdentifyIdentifyType : public ReadAttribute {
-public:
-    ReadIdentifyIdentifyType()
-        : ReadAttribute("identify-type")
-    {
-    }
-
-    ~ReadIdentifyIdentifyType() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReadAttribute (0x00000001) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeIdentifyTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Identify.IdentifyType response %@", [value description]);
-            if (error != nil) {
-                LogNSError("Identify IdentifyType read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class SubscribeAttributeIdentifyIdentifyType : public SubscribeAttribute {
+class SubscribeAttributeDoorLockExpiringUserTimeout : public SubscribeAttribute {
 public:
-    SubscribeAttributeIdentifyIdentifyType()
-        : SubscribeAttribute("identify-type")
+    SubscribeAttributeDoorLockExpiringUserTimeout()
+        : SubscribeAttribute("expiring-user-timeout")
     {
     }
 
-    ~SubscribeAttributeIdentifyIdentifyType() {}
+    ~SubscribeAttributeDoorLockExpiringUserTimeout() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x00000035) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeIdentifyTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeExpiringUserTimeoutWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Identify.IdentifyType response %@", [value description]);
+                NSLog(@"DoorLock.ExpiringUserTimeout response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -40926,25 +40322,25 @@ class SubscribeAttributeIdentifyIdentifyType : public SubscribeAttribute {
 /*
  * Attribute GeneratedCommandList
  */
-class ReadIdentifyGeneratedCommandList : public ReadAttribute {
+class ReadDoorLockGeneratedCommandList : public ReadAttribute {
 public:
-    ReadIdentifyGeneratedCommandList()
+    ReadDoorLockGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadIdentifyGeneratedCommandList() {}
+    ~ReadDoorLockGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Identify.GeneratedCommandList response %@", [value description]);
+            NSLog(@"DoorLock.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("Identify GeneratedCommandList read Error", error);
+                LogNSError("DoorLock GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -40952,20 +40348,20 @@ class ReadIdentifyGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeIdentifyGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeDoorLockGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeIdentifyGeneratedCommandList()
+    SubscribeAttributeDoorLockGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeIdentifyGeneratedCommandList() {}
+    ~SubscribeAttributeDoorLockGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -40977,7 +40373,7 @@ class SubscribeAttributeIdentifyGeneratedCommandList : public SubscribeAttribute
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Identify.GeneratedCommandList response %@", [value description]);
+                NSLog(@"DoorLock.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -40990,25 +40386,25 @@ class SubscribeAttributeIdentifyGeneratedCommandList : public SubscribeAttribute
 /*
  * Attribute AcceptedCommandList
  */
-class ReadIdentifyAcceptedCommandList : public ReadAttribute {
+class ReadDoorLockAcceptedCommandList : public ReadAttribute {
 public:
-    ReadIdentifyAcceptedCommandList()
+    ReadDoorLockAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadIdentifyAcceptedCommandList() {}
+    ~ReadDoorLockAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Identify.AcceptedCommandList response %@", [value description]);
+            NSLog(@"DoorLock.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("Identify AcceptedCommandList read Error", error);
+                LogNSError("DoorLock AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -41016,20 +40412,20 @@ class ReadIdentifyAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeIdentifyAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeDoorLockAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeIdentifyAcceptedCommandList()
+    SubscribeAttributeDoorLockAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeIdentifyAcceptedCommandList() {}
+    ~SubscribeAttributeDoorLockAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -41041,7 +40437,7 @@ class SubscribeAttributeIdentifyAcceptedCommandList : public SubscribeAttribute
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Identify.AcceptedCommandList response %@", [value description]);
+                NSLog(@"DoorLock.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -41054,25 +40450,25 @@ class SubscribeAttributeIdentifyAcceptedCommandList : public SubscribeAttribute
 /*
  * Attribute AttributeList
  */
-class ReadIdentifyAttributeList : public ReadAttribute {
+class ReadDoorLockAttributeList : public ReadAttribute {
 public:
-    ReadIdentifyAttributeList()
+    ReadDoorLockAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadIdentifyAttributeList() {}
+    ~ReadDoorLockAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Identify.AttributeList response %@", [value description]);
+            NSLog(@"DoorLock.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("Identify AttributeList read Error", error);
+                LogNSError("DoorLock AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -41080,20 +40476,20 @@ class ReadIdentifyAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeIdentifyAttributeList : public SubscribeAttribute {
+class SubscribeAttributeDoorLockAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeIdentifyAttributeList()
+    SubscribeAttributeDoorLockAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeIdentifyAttributeList() {}
+    ~SubscribeAttributeDoorLockAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -41105,7 +40501,7 @@ class SubscribeAttributeIdentifyAttributeList : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Identify.AttributeList response %@", [value description]);
+                NSLog(@"DoorLock.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -41118,25 +40514,25 @@ class SubscribeAttributeIdentifyAttributeList : public SubscribeAttribute {
 /*
  * Attribute FeatureMap
  */
-class ReadIdentifyFeatureMap : public ReadAttribute {
+class ReadDoorLockFeatureMap : public ReadAttribute {
 public:
-    ReadIdentifyFeatureMap()
+    ReadDoorLockFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadIdentifyFeatureMap() {}
+    ~ReadDoorLockFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Identify.FeatureMap response %@", [value description]);
+            NSLog(@"DoorLock.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("Identify FeatureMap read Error", error);
+                LogNSError("DoorLock FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -41144,20 +40540,20 @@ class ReadIdentifyFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeIdentifyFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeDoorLockFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeIdentifyFeatureMap()
+    SubscribeAttributeDoorLockFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeIdentifyFeatureMap() {}
+    ~SubscribeAttributeDoorLockFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -41169,7 +40565,7 @@ class SubscribeAttributeIdentifyFeatureMap : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Identify.FeatureMap response %@", [value description]);
+                NSLog(@"DoorLock.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -41182,25 +40578,25 @@ class SubscribeAttributeIdentifyFeatureMap : public SubscribeAttribute {
 /*
  * Attribute ClusterRevision
  */
-class ReadIdentifyClusterRevision : public ReadAttribute {
+class ReadDoorLockClusterRevision : public ReadAttribute {
 public:
-    ReadIdentifyClusterRevision()
+    ReadDoorLockClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadIdentifyClusterRevision() {}
+    ~ReadDoorLockClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Identify.ClusterRevision response %@", [value description]);
+            NSLog(@"DoorLock.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("Identify ClusterRevision read Error", error);
+                LogNSError("DoorLock ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -41208,20 +40604,20 @@ class ReadIdentifyClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeIdentifyClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeDoorLockClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeIdentifyClusterRevision()
+    SubscribeAttributeDoorLockClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeIdentifyClusterRevision() {}
+    ~SubscribeAttributeDoorLockClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000003) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000101) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -41233,7 +40629,7 @@ class SubscribeAttributeIdentifyClusterRevision : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Identify.ClusterRevision response %@", [value description]);
+                NSLog(@"DoorLock.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -41244,16 +40640,40 @@ class SubscribeAttributeIdentifyClusterRevision : public SubscribeAttribute {
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster IlluminanceMeasurement                                      | 0x0400 |
+| Cluster WindowCovering                                              | 0x0102 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
+| * UpOrOpen                                                          |   0x00 |
+| * DownOrClose                                                       |   0x01 |
+| * StopMotion                                                        |   0x02 |
+| * GoToLiftValue                                                     |   0x04 |
+| * GoToLiftPercentage                                                |   0x05 |
+| * GoToTiltValue                                                     |   0x07 |
+| * GoToTiltPercentage                                                |   0x08 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * MeasuredValue                                                     | 0x0000 |
-| * MinMeasuredValue                                                  | 0x0001 |
-| * MaxMeasuredValue                                                  | 0x0002 |
-| * Tolerance                                                         | 0x0003 |
-| * LightSensorType                                                   | 0x0004 |
+| * Type                                                              | 0x0000 |
+| * PhysicalClosedLimitLift                                           | 0x0001 |
+| * PhysicalClosedLimitTilt                                           | 0x0002 |
+| * CurrentPositionLift                                               | 0x0003 |
+| * CurrentPositionTilt                                               | 0x0004 |
+| * NumberOfActuationsLift                                            | 0x0005 |
+| * NumberOfActuationsTilt                                            | 0x0006 |
+| * ConfigStatus                                                      | 0x0007 |
+| * CurrentPositionLiftPercentage                                     | 0x0008 |
+| * CurrentPositionTiltPercentage                                     | 0x0009 |
+| * OperationalStatus                                                 | 0x000A |
+| * TargetPositionLiftPercent100ths                                   | 0x000B |
+| * TargetPositionTiltPercent100ths                                   | 0x000C |
+| * EndProductType                                                    | 0x000D |
+| * CurrentPositionLiftPercent100ths                                  | 0x000E |
+| * CurrentPositionTiltPercent100ths                                  | 0x000F |
+| * InstalledOpenLimitLift                                            | 0x0010 |
+| * InstalledClosedLimitLift                                          | 0x0011 |
+| * InstalledOpenLimitTilt                                            | 0x0012 |
+| * InstalledClosedLimitTilt                                          | 0x0013 |
+| * Mode                                                              | 0x0017 |
+| * SafetyStatus                                                      | 0x001A |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -41264,233 +40684,326 @@ class SubscribeAttributeIdentifyClusterRevision : public SubscribeAttribute {
 \*----------------------------------------------------------------------------*/
 
 /*
- * Attribute MeasuredValue
+ * Command UpOrOpen
  */
-class ReadIlluminanceMeasurementMeasuredValue : public ReadAttribute {
+class WindowCoveringUpOrOpen : public ClusterCommand {
 public:
-    ReadIlluminanceMeasurementMeasuredValue()
-        : ReadAttribute("measured-value")
+    WindowCoveringUpOrOpen()
+        : ClusterCommand("up-or-open")
     {
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadIlluminanceMeasurementMeasuredValue() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"IlluminanceMeasurement.MeasuredValue response %@", [value description]);
-            if (error != nil) {
-                LogNSError("IlluminanceMeasurement MeasuredValue read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class SubscribeAttributeIlluminanceMeasurementMeasuredValue : public SubscribeAttribute {
-public:
-    SubscribeAttributeIlluminanceMeasurementMeasuredValue()
-        : SubscribeAttribute("measured-value")
-    {
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPWindowCoveringClusterUpOrOpenParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster upOrOpenWithParams:params
+                      completionHandler:^(NSError * _Nullable error) {
+                          responsesNeeded--;
+                          if (error != nil) {
+                              mError = error;
+                              LogNSError("Error", error);
+                          }
+                          if (responsesNeeded == 0) {
+                              SetCommandExitStatus(mError);
+                          }
+                      }];
+        }
+        return CHIP_NO_ERROR;
     }
 
-    ~SubscribeAttributeIlluminanceMeasurementMeasuredValue() {}
+private:
+};
+
+/*
+ * Command DownOrClose
+ */
+class WindowCoveringDownOrClose : public ClusterCommand {
+public:
+    WindowCoveringDownOrClose()
+        : ClusterCommand("down-or-close")
+    {
+        ClusterCommand::AddArguments();
+    }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReportAttribute (0x00000000) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"IlluminanceMeasurement.MeasuredValue response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) command (0x00000001) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPWindowCoveringClusterDownOrCloseParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster downOrCloseWithParams:params
+                         completionHandler:^(NSError * _Nullable error) {
+                             responsesNeeded--;
+                             if (error != nil) {
+                                 mError = error;
+                                 LogNSError("Error", error);
+                             }
+                             if (responsesNeeded == 0) {
+                                 SetCommandExitStatus(mError);
+                             }
+                         }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
 };
 
 /*
- * Attribute MinMeasuredValue
+ * Command StopMotion
  */
-class ReadIlluminanceMeasurementMinMeasuredValue : public ReadAttribute {
+class WindowCoveringStopMotion : public ClusterCommand {
 public:
-    ReadIlluminanceMeasurementMinMeasuredValue()
-        : ReadAttribute("min-measured-value")
+    WindowCoveringStopMotion()
+        : ClusterCommand("stop-motion")
     {
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadIlluminanceMeasurementMinMeasuredValue() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) command (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeMinMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"IlluminanceMeasurement.MinMeasuredValue response %@", [value description]);
-            if (error != nil) {
-                LogNSError("IlluminanceMeasurement MinMeasuredValue read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPWindowCoveringClusterStopMotionParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster stopMotionWithParams:params
+                        completionHandler:^(NSError * _Nullable error) {
+                            responsesNeeded--;
+                            if (error != nil) {
+                                mError = error;
+                                LogNSError("Error", error);
+                            }
+                            if (responsesNeeded == 0) {
+                                SetCommandExitStatus(mError);
+                            }
+                        }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
 };
 
-class SubscribeAttributeIlluminanceMeasurementMinMeasuredValue : public SubscribeAttribute {
+/*
+ * Command GoToLiftValue
+ */
+class WindowCoveringGoToLiftValue : public ClusterCommand {
 public:
-    SubscribeAttributeIlluminanceMeasurementMinMeasuredValue()
-        : SubscribeAttribute("min-measured-value")
+    WindowCoveringGoToLiftValue()
+        : ClusterCommand("go-to-lift-value")
     {
+        AddArgument("LiftValue", 0, UINT16_MAX, &mRequest.liftValue);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeIlluminanceMeasurementMinMeasuredValue() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReportAttribute (0x00000001) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMinMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"IlluminanceMeasurement.MinMeasuredValue response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) command (0x00000004) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPWindowCoveringClusterGoToLiftValueParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.liftValue = [NSNumber numberWithUnsignedShort:mRequest.liftValue];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster goToLiftValueWithParams:params
+                           completionHandler:^(NSError * _Nullable error) {
+                               responsesNeeded--;
+                               if (error != nil) {
+                                   mError = error;
+                                   LogNSError("Error", error);
+                               }
+                               if (responsesNeeded == 0) {
+                                   SetCommandExitStatus(mError);
+                               }
+                           }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::WindowCovering::Commands::GoToLiftValue::Type mRequest;
 };
 
 /*
- * Attribute MaxMeasuredValue
+ * Command GoToLiftPercentage
  */
-class ReadIlluminanceMeasurementMaxMeasuredValue : public ReadAttribute {
+class WindowCoveringGoToLiftPercentage : public ClusterCommand {
 public:
-    ReadIlluminanceMeasurementMaxMeasuredValue()
-        : ReadAttribute("max-measured-value")
+    WindowCoveringGoToLiftPercentage()
+        : ClusterCommand("go-to-lift-percentage")
     {
+        AddArgument("LiftPercent100thsValue", 0, UINT16_MAX, &mRequest.liftPercent100thsValue);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadIlluminanceMeasurementMaxMeasuredValue() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) command (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeMaxMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"IlluminanceMeasurement.MaxMeasuredValue response %@", [value description]);
-            if (error != nil) {
-                LogNSError("IlluminanceMeasurement MaxMeasuredValue read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPWindowCoveringClusterGoToLiftPercentageParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.liftPercent100thsValue = [NSNumber numberWithUnsignedShort:mRequest.liftPercent100thsValue];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster goToLiftPercentageWithParams:params
+                                completionHandler:^(NSError * _Nullable error) {
+                                    responsesNeeded--;
+                                    if (error != nil) {
+                                        mError = error;
+                                        LogNSError("Error", error);
+                                    }
+                                    if (responsesNeeded == 0) {
+                                        SetCommandExitStatus(mError);
+                                    }
+                                }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::WindowCovering::Commands::GoToLiftPercentage::Type mRequest;
 };
 
-class SubscribeAttributeIlluminanceMeasurementMaxMeasuredValue : public SubscribeAttribute {
+/*
+ * Command GoToTiltValue
+ */
+class WindowCoveringGoToTiltValue : public ClusterCommand {
 public:
-    SubscribeAttributeIlluminanceMeasurementMaxMeasuredValue()
-        : SubscribeAttribute("max-measured-value")
+    WindowCoveringGoToTiltValue()
+        : ClusterCommand("go-to-tilt-value")
     {
+        AddArgument("TiltValue", 0, UINT16_MAX, &mRequest.tiltValue);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeIlluminanceMeasurementMaxMeasuredValue() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) command (0x00000007) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMaxMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"IlluminanceMeasurement.MaxMeasuredValue response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPWindowCoveringClusterGoToTiltValueParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.tiltValue = [NSNumber numberWithUnsignedShort:mRequest.tiltValue];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster goToTiltValueWithParams:params
+                           completionHandler:^(NSError * _Nullable error) {
+                               responsesNeeded--;
+                               if (error != nil) {
+                                   mError = error;
+                                   LogNSError("Error", error);
+                               }
+                               if (responsesNeeded == 0) {
+                                   SetCommandExitStatus(mError);
+                               }
+                           }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::WindowCovering::Commands::GoToTiltValue::Type mRequest;
+};
+
+/*
+ * Command GoToTiltPercentage
+ */
+class WindowCoveringGoToTiltPercentage : public ClusterCommand {
+public:
+    WindowCoveringGoToTiltPercentage()
+        : ClusterCommand("go-to-tilt-percentage")
+    {
+        AddArgument("TiltPercent100thsValue", 0, UINT16_MAX, &mRequest.tiltPercent100thsValue);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) command (0x00000008) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPWindowCoveringClusterGoToTiltPercentageParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.tiltPercent100thsValue = [NSNumber numberWithUnsignedShort:mRequest.tiltPercent100thsValue];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster goToTiltPercentageWithParams:params
+                                completionHandler:^(NSError * _Nullable error) {
+                                    responsesNeeded--;
+                                    if (error != nil) {
+                                        mError = error;
+                                        LogNSError("Error", error);
+                                    }
+                                    if (responsesNeeded == 0) {
+                                        SetCommandExitStatus(mError);
+                                    }
+                                }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::WindowCovering::Commands::GoToTiltPercentage::Type mRequest;
 };
 
 /*
- * Attribute Tolerance
+ * Attribute Type
  */
-class ReadIlluminanceMeasurementTolerance : public ReadAttribute {
+class ReadWindowCoveringType : public ReadAttribute {
 public:
-    ReadIlluminanceMeasurementTolerance()
-        : ReadAttribute("tolerance")
+    ReadWindowCoveringType()
+        : ReadAttribute("type")
     {
     }
 
-    ~ReadIlluminanceMeasurementTolerance() {}
+    ~ReadWindowCoveringType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeToleranceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"IlluminanceMeasurement.Tolerance response %@", [value description]);
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WindowCovering.Type response %@", [value description]);
             if (error != nil) {
-                LogNSError("IlluminanceMeasurement Tolerance read Error", error);
+                LogNSError("WindowCovering Type read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -41498,34 +41011,32 @@ class ReadIlluminanceMeasurementTolerance : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeIlluminanceMeasurementTolerance : public SubscribeAttribute {
+class SubscribeAttributeWindowCoveringType : public SubscribeAttribute {
 public:
-    SubscribeAttributeIlluminanceMeasurementTolerance()
-        : SubscribeAttribute("tolerance")
+    SubscribeAttributeWindowCoveringType()
+        : SubscribeAttribute("type")
     {
     }
 
-    ~SubscribeAttributeIlluminanceMeasurementTolerance() {}
+    ~SubscribeAttributeWindowCoveringType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeToleranceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"IlluminanceMeasurement.Tolerance response %@", [value description]);
+                NSLog(@"WindowCovering.Type response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -41536,64 +41047,61 @@ class SubscribeAttributeIlluminanceMeasurementTolerance : public SubscribeAttrib
 };
 
 /*
- * Attribute LightSensorType
+ * Attribute PhysicalClosedLimitLift
  */
-class ReadIlluminanceMeasurementLightSensorType : public ReadAttribute {
+class ReadWindowCoveringPhysicalClosedLimitLift : public ReadAttribute {
 public:
-    ReadIlluminanceMeasurementLightSensorType()
-        : ReadAttribute("light-sensor-type")
+    ReadWindowCoveringPhysicalClosedLimitLift()
+        : ReadAttribute("physical-closed-limit-lift")
     {
     }
 
-    ~ReadIlluminanceMeasurementLightSensorType() {}
+    ~ReadWindowCoveringPhysicalClosedLimitLift() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReadAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeLightSensorTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"IlluminanceMeasurement.LightSensorType response %@", [value description]);
-            if (error != nil) {
-                LogNSError("IlluminanceMeasurement LightSensorType read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributePhysicalClosedLimitLiftWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.PhysicalClosedLimitLift response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("WindowCovering PhysicalClosedLimitLift read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeIlluminanceMeasurementLightSensorType : public SubscribeAttribute {
+class SubscribeAttributeWindowCoveringPhysicalClosedLimitLift : public SubscribeAttribute {
 public:
-    SubscribeAttributeIlluminanceMeasurementLightSensorType()
-        : SubscribeAttribute("light-sensor-type")
+    SubscribeAttributeWindowCoveringPhysicalClosedLimitLift()
+        : SubscribeAttribute("physical-closed-limit-lift")
     {
     }
 
-    ~SubscribeAttributeIlluminanceMeasurementLightSensorType() {}
+    ~SubscribeAttributeWindowCoveringPhysicalClosedLimitLift() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLightSensorTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePhysicalClosedLimitLiftWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"IlluminanceMeasurement.LightSensorType response %@", [value description]);
+                NSLog(@"WindowCovering.PhysicalClosedLimitLift response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -41604,64 +41112,61 @@ class SubscribeAttributeIlluminanceMeasurementLightSensorType : public Subscribe
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute PhysicalClosedLimitTilt
  */
-class ReadIlluminanceMeasurementGeneratedCommandList : public ReadAttribute {
+class ReadWindowCoveringPhysicalClosedLimitTilt : public ReadAttribute {
 public:
-    ReadIlluminanceMeasurementGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadWindowCoveringPhysicalClosedLimitTilt()
+        : ReadAttribute("physical-closed-limit-tilt")
     {
     }
 
-    ~ReadIlluminanceMeasurementGeneratedCommandList() {}
+    ~ReadWindowCoveringPhysicalClosedLimitTilt() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"IlluminanceMeasurement.GeneratedCommandList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("IlluminanceMeasurement GeneratedCommandList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributePhysicalClosedLimitTiltWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.PhysicalClosedLimitTilt response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("WindowCovering PhysicalClosedLimitTilt read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeIlluminanceMeasurementGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeWindowCoveringPhysicalClosedLimitTilt : public SubscribeAttribute {
 public:
-    SubscribeAttributeIlluminanceMeasurementGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeWindowCoveringPhysicalClosedLimitTilt()
+        : SubscribeAttribute("physical-closed-limit-tilt")
     {
     }
 
-    ~SubscribeAttributeIlluminanceMeasurementGeneratedCommandList() {}
+    ~SubscribeAttributeWindowCoveringPhysicalClosedLimitTilt() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePhysicalClosedLimitTiltWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"IlluminanceMeasurement.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.PhysicalClosedLimitTilt response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -41672,29 +41177,27 @@ class SubscribeAttributeIlluminanceMeasurementGeneratedCommandList : public Subs
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute CurrentPositionLift
  */
-class ReadIlluminanceMeasurementAcceptedCommandList : public ReadAttribute {
+class ReadWindowCoveringCurrentPositionLift : public ReadAttribute {
 public:
-    ReadIlluminanceMeasurementAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadWindowCoveringCurrentPositionLift()
+        : ReadAttribute("current-position-lift")
     {
     }
 
-    ~ReadIlluminanceMeasurementAcceptedCommandList() {}
+    ~ReadWindowCoveringCurrentPositionLift() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"IlluminanceMeasurement.AcceptedCommandList response %@", [value description]);
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCurrentPositionLiftWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WindowCovering.CurrentPositionLift response %@", [value description]);
             if (error != nil) {
-                LogNSError("IlluminanceMeasurement AcceptedCommandList read Error", error);
+                LogNSError("WindowCovering CurrentPositionLift read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -41702,34 +41205,32 @@ class ReadIlluminanceMeasurementAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeIlluminanceMeasurementAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeWindowCoveringCurrentPositionLift : public SubscribeAttribute {
 public:
-    SubscribeAttributeIlluminanceMeasurementAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeWindowCoveringCurrentPositionLift()
+        : SubscribeAttribute("current-position-lift")
     {
     }
 
-    ~SubscribeAttributeIlluminanceMeasurementAcceptedCommandList() {}
+    ~SubscribeAttributeWindowCoveringCurrentPositionLift() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCurrentPositionLiftWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"IlluminanceMeasurement.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.CurrentPositionLift response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -41740,29 +41241,27 @@ class SubscribeAttributeIlluminanceMeasurementAcceptedCommandList : public Subsc
 };
 
 /*
- * Attribute AttributeList
+ * Attribute CurrentPositionTilt
  */
-class ReadIlluminanceMeasurementAttributeList : public ReadAttribute {
+class ReadWindowCoveringCurrentPositionTilt : public ReadAttribute {
 public:
-    ReadIlluminanceMeasurementAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadWindowCoveringCurrentPositionTilt()
+        : ReadAttribute("current-position-tilt")
     {
     }
 
-    ~ReadIlluminanceMeasurementAttributeList() {}
+    ~ReadWindowCoveringCurrentPositionTilt() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"IlluminanceMeasurement.AttributeList response %@", [value description]);
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCurrentPositionTiltWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WindowCovering.CurrentPositionTilt response %@", [value description]);
             if (error != nil) {
-                LogNSError("IlluminanceMeasurement AttributeList read Error", error);
+                LogNSError("WindowCovering CurrentPositionTilt read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -41770,34 +41269,32 @@ class ReadIlluminanceMeasurementAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeIlluminanceMeasurementAttributeList : public SubscribeAttribute {
+class SubscribeAttributeWindowCoveringCurrentPositionTilt : public SubscribeAttribute {
 public:
-    SubscribeAttributeIlluminanceMeasurementAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeWindowCoveringCurrentPositionTilt()
+        : SubscribeAttribute("current-position-tilt")
     {
     }
 
-    ~SubscribeAttributeIlluminanceMeasurementAttributeList() {}
+    ~SubscribeAttributeWindowCoveringCurrentPositionTilt() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCurrentPositionTiltWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"IlluminanceMeasurement.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.CurrentPositionTilt response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -41808,29 +41305,27 @@ class SubscribeAttributeIlluminanceMeasurementAttributeList : public SubscribeAt
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute NumberOfActuationsLift
  */
-class ReadIlluminanceMeasurementFeatureMap : public ReadAttribute {
+class ReadWindowCoveringNumberOfActuationsLift : public ReadAttribute {
 public:
-    ReadIlluminanceMeasurementFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadWindowCoveringNumberOfActuationsLift()
+        : ReadAttribute("number-of-actuations-lift")
     {
     }
 
-    ~ReadIlluminanceMeasurementFeatureMap() {}
+    ~ReadWindowCoveringNumberOfActuationsLift() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"IlluminanceMeasurement.FeatureMap response %@", [value description]);
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNumberOfActuationsLiftWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WindowCovering.NumberOfActuationsLift response %@", [value description]);
             if (error != nil) {
-                LogNSError("IlluminanceMeasurement FeatureMap read Error", error);
+                LogNSError("WindowCovering NumberOfActuationsLift read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -41838,34 +41333,32 @@ class ReadIlluminanceMeasurementFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeIlluminanceMeasurementFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeWindowCoveringNumberOfActuationsLift : public SubscribeAttribute {
 public:
-    SubscribeAttributeIlluminanceMeasurementFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeWindowCoveringNumberOfActuationsLift()
+        : SubscribeAttribute("number-of-actuations-lift")
     {
     }
 
-    ~SubscribeAttributeIlluminanceMeasurementFeatureMap() {}
+    ~SubscribeAttributeWindowCoveringNumberOfActuationsLift() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNumberOfActuationsLiftWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"IlluminanceMeasurement.FeatureMap response %@", [value description]);
+                NSLog(@"WindowCovering.NumberOfActuationsLift response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -41876,29 +41369,27 @@ class SubscribeAttributeIlluminanceMeasurementFeatureMap : public SubscribeAttri
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute NumberOfActuationsTilt
  */
-class ReadIlluminanceMeasurementClusterRevision : public ReadAttribute {
+class ReadWindowCoveringNumberOfActuationsTilt : public ReadAttribute {
 public:
-    ReadIlluminanceMeasurementClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadWindowCoveringNumberOfActuationsTilt()
+        : ReadAttribute("number-of-actuations-tilt")
     {
     }
 
-    ~ReadIlluminanceMeasurementClusterRevision() {}
+    ~ReadWindowCoveringNumberOfActuationsTilt() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000006) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"IlluminanceMeasurement.ClusterRevision response %@", [value description]);
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNumberOfActuationsTiltWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WindowCovering.NumberOfActuationsTilt response %@", [value description]);
             if (error != nil) {
-                LogNSError("IlluminanceMeasurement ClusterRevision read Error", error);
+                LogNSError("WindowCovering NumberOfActuationsTilt read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -41906,34 +41397,32 @@ class ReadIlluminanceMeasurementClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeIlluminanceMeasurementClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeWindowCoveringNumberOfActuationsTilt : public SubscribeAttribute {
 public:
-    SubscribeAttributeIlluminanceMeasurementClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeWindowCoveringNumberOfActuationsTilt()
+        : SubscribeAttribute("number-of-actuations-tilt")
     {
     }
 
-    ~SubscribeAttributeIlluminanceMeasurementClusterRevision() {}
+    ~SubscribeAttributeWindowCoveringNumberOfActuationsTilt() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000006) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNumberOfActuationsTiltWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"IlluminanceMeasurement.ClusterRevision response %@", [value description]);
+                NSLog(@"WindowCovering.NumberOfActuationsTilt response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -41943,90 +41432,93 @@ class SubscribeAttributeIlluminanceMeasurementClusterRevision : public Subscribe
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster KeypadInput                                                 | 0x0509 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * SendKey                                                           |   0x00 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command SendKey
+ * Attribute ConfigStatus
  */
-class KeypadInputSendKey : public ClusterCommand {
+class ReadWindowCoveringConfigStatus : public ReadAttribute {
 public:
-    KeypadInputSendKey()
-        : ClusterCommand("send-key")
+    ReadWindowCoveringConfigStatus()
+        : ReadAttribute("config-status")
     {
-        AddArgument("KeyCode", 0, UINT8_MAX, &mRequest.keyCode);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadWindowCoveringConfigStatus() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000509) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000007) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.keyCode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.keyCode)];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster
-                sendKeyWithParams:params
-                completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable error) {
-                    NSLog(@"Values: %@", values);
-                    responsesNeeded--;
-                    if (error != nil) {
-                        mError = error;
-                        LogNSError("Error", error);
-                    }
-                    if (responsesNeeded == 0) {
-                        SetCommandExitStatus(mError);
-                    }
-                }];
-        }
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeConfigStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WindowCovering.ConfigStatus response %@", [value description]);
+            if (error != nil) {
+                LogNSError("WindowCovering ConfigStatus read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
+};
 
-private:
-    chip::app::Clusters::KeypadInput::Commands::SendKey::Type mRequest;
+class SubscribeAttributeWindowCoveringConfigStatus : public SubscribeAttribute {
+public:
+    SubscribeAttributeWindowCoveringConfigStatus()
+        : SubscribeAttribute("config-status")
+    {
+    }
+
+    ~SubscribeAttributeWindowCoveringConfigStatus() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000007) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeConfigStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.ConfigStatus response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute CurrentPositionLiftPercentage
  */
-class ReadKeypadInputGeneratedCommandList : public ReadAttribute {
+class ReadWindowCoveringCurrentPositionLiftPercentage : public ReadAttribute {
 public:
-    ReadKeypadInputGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadWindowCoveringCurrentPositionLiftPercentage()
+        : ReadAttribute("current-position-lift-percentage")
     {
     }
 
-    ~ReadKeypadInputGeneratedCommandList() {}
+    ~ReadWindowCoveringCurrentPositionLiftPercentage() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000509) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000008) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"KeypadInput.GeneratedCommandList response %@", [value description]);
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCurrentPositionLiftPercentageWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WindowCovering.CurrentPositionLiftPercentage response %@", [value description]);
             if (error != nil) {
-                LogNSError("KeypadInput GeneratedCommandList read Error", error);
+                LogNSError("WindowCovering CurrentPositionLiftPercentage read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -42034,32 +41526,32 @@ class ReadKeypadInputGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeKeypadInputGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeWindowCoveringCurrentPositionLiftPercentage : public SubscribeAttribute {
 public:
-    SubscribeAttributeKeypadInputGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeWindowCoveringCurrentPositionLiftPercentage()
+        : SubscribeAttribute("current-position-lift-percentage")
     {
     }
 
-    ~SubscribeAttributeKeypadInputGeneratedCommandList() {}
+    ~SubscribeAttributeWindowCoveringCurrentPositionLiftPercentage() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000509) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000008) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCurrentPositionLiftPercentageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"KeypadInput.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.CurrentPositionLiftPercentage response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -42070,27 +41562,28 @@ class SubscribeAttributeKeypadInputGeneratedCommandList : public SubscribeAttrib
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute CurrentPositionTiltPercentage
  */
-class ReadKeypadInputAcceptedCommandList : public ReadAttribute {
+class ReadWindowCoveringCurrentPositionTiltPercentage : public ReadAttribute {
 public:
-    ReadKeypadInputAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadWindowCoveringCurrentPositionTiltPercentage()
+        : ReadAttribute("current-position-tilt-percentage")
     {
     }
 
-    ~ReadKeypadInputAcceptedCommandList() {}
+    ~ReadWindowCoveringCurrentPositionTiltPercentage() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000509) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000009) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"KeypadInput.AcceptedCommandList response %@", [value description]);
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCurrentPositionTiltPercentageWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WindowCovering.CurrentPositionTiltPercentage response %@", [value description]);
             if (error != nil) {
-                LogNSError("KeypadInput AcceptedCommandList read Error", error);
+                LogNSError("WindowCovering CurrentPositionTiltPercentage read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -42098,32 +41591,32 @@ class ReadKeypadInputAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeKeypadInputAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeWindowCoveringCurrentPositionTiltPercentage : public SubscribeAttribute {
 public:
-    SubscribeAttributeKeypadInputAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeWindowCoveringCurrentPositionTiltPercentage()
+        : SubscribeAttribute("current-position-tilt-percentage")
     {
     }
 
-    ~SubscribeAttributeKeypadInputAcceptedCommandList() {}
+    ~SubscribeAttributeWindowCoveringCurrentPositionTiltPercentage() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000509) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000009) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCurrentPositionTiltPercentageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"KeypadInput.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.CurrentPositionTiltPercentage response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -42134,27 +41627,27 @@ class SubscribeAttributeKeypadInputAcceptedCommandList : public SubscribeAttribu
 };
 
 /*
- * Attribute AttributeList
+ * Attribute OperationalStatus
  */
-class ReadKeypadInputAttributeList : public ReadAttribute {
+class ReadWindowCoveringOperationalStatus : public ReadAttribute {
 public:
-    ReadKeypadInputAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadWindowCoveringOperationalStatus()
+        : ReadAttribute("operational-status")
     {
     }
 
-    ~ReadKeypadInputAttributeList() {}
+    ~ReadWindowCoveringOperationalStatus() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000509) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x0000000A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"KeypadInput.AttributeList response %@", [value description]);
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeOperationalStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WindowCovering.OperationalStatus response %@", [value description]);
             if (error != nil) {
-                LogNSError("KeypadInput AttributeList read Error", error);
+                LogNSError("WindowCovering OperationalStatus read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -42162,32 +41655,32 @@ class ReadKeypadInputAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeKeypadInputAttributeList : public SubscribeAttribute {
+class SubscribeAttributeWindowCoveringOperationalStatus : public SubscribeAttribute {
 public:
-    SubscribeAttributeKeypadInputAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeWindowCoveringOperationalStatus()
+        : SubscribeAttribute("operational-status")
     {
     }
 
-    ~SubscribeAttributeKeypadInputAttributeList() {}
+    ~SubscribeAttributeWindowCoveringOperationalStatus() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000509) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x0000000A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOperationalStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"KeypadInput.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.OperationalStatus response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -42198,27 +41691,28 @@ class SubscribeAttributeKeypadInputAttributeList : public SubscribeAttribute {
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute TargetPositionLiftPercent100ths
  */
-class ReadKeypadInputFeatureMap : public ReadAttribute {
+class ReadWindowCoveringTargetPositionLiftPercent100ths : public ReadAttribute {
 public:
-    ReadKeypadInputFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadWindowCoveringTargetPositionLiftPercent100ths()
+        : ReadAttribute("target-position-lift-percent100ths")
     {
     }
 
-    ~ReadKeypadInputFeatureMap() {}
+    ~ReadWindowCoveringTargetPositionLiftPercent100ths() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000509) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x0000000B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"KeypadInput.FeatureMap response %@", [value description]);
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeTargetPositionLiftPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WindowCovering.TargetPositionLiftPercent100ths response %@", [value description]);
             if (error != nil) {
-                LogNSError("KeypadInput FeatureMap read Error", error);
+                LogNSError("WindowCovering TargetPositionLiftPercent100ths read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -42226,32 +41720,32 @@ class ReadKeypadInputFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeKeypadInputFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeWindowCoveringTargetPositionLiftPercent100ths : public SubscribeAttribute {
 public:
-    SubscribeAttributeKeypadInputFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeWindowCoveringTargetPositionLiftPercent100ths()
+        : SubscribeAttribute("target-position-lift-percent100ths")
     {
     }
 
-    ~SubscribeAttributeKeypadInputFeatureMap() {}
+    ~SubscribeAttributeWindowCoveringTargetPositionLiftPercent100ths() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000509) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x0000000B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTargetPositionLiftPercent100thsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"KeypadInput.FeatureMap response %@", [value description]);
+                NSLog(@"WindowCovering.TargetPositionLiftPercent100ths response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -42262,27 +41756,28 @@ class SubscribeAttributeKeypadInputFeatureMap : public SubscribeAttribute {
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute TargetPositionTiltPercent100ths
  */
-class ReadKeypadInputClusterRevision : public ReadAttribute {
+class ReadWindowCoveringTargetPositionTiltPercent100ths : public ReadAttribute {
 public:
-    ReadKeypadInputClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadWindowCoveringTargetPositionTiltPercent100ths()
+        : ReadAttribute("target-position-tilt-percent100ths")
     {
     }
 
-    ~ReadKeypadInputClusterRevision() {}
+    ~ReadWindowCoveringTargetPositionTiltPercent100ths() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000509) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x0000000C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"KeypadInput.ClusterRevision response %@", [value description]);
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeTargetPositionTiltPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WindowCovering.TargetPositionTiltPercent100ths response %@", [value description]);
             if (error != nil) {
-                LogNSError("KeypadInput ClusterRevision read Error", error);
+                LogNSError("WindowCovering TargetPositionTiltPercent100ths read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -42290,32 +41785,32 @@ class ReadKeypadInputClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeKeypadInputClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeWindowCoveringTargetPositionTiltPercent100ths : public SubscribeAttribute {
 public:
-    SubscribeAttributeKeypadInputClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeWindowCoveringTargetPositionTiltPercent100ths()
+        : SubscribeAttribute("target-position-tilt-percent100ths")
     {
     }
 
-    ~SubscribeAttributeKeypadInputClusterRevision() {}
+    ~SubscribeAttributeWindowCoveringTargetPositionTiltPercent100ths() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000509) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x0000000C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTargetPositionTiltPercent100thsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"KeypadInput.ClusterRevision response %@", [value description]);
+                NSLog(@"WindowCovering.TargetPositionTiltPercent100ths response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -42325,489 +41820,222 @@ class SubscribeAttributeKeypadInputClusterRevision : public SubscribeAttribute {
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster LevelControl                                                | 0x0008 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * MoveToLevel                                                       |   0x00 |
-| * Move                                                              |   0x01 |
-| * Step                                                              |   0x02 |
-| * Stop                                                              |   0x03 |
-| * MoveToLevelWithOnOff                                              |   0x04 |
-| * MoveWithOnOff                                                     |   0x05 |
-| * StepWithOnOff                                                     |   0x06 |
-| * StopWithOnOff                                                     |   0x07 |
-| * MoveToClosestFrequency                                            |   0x08 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * CurrentLevel                                                      | 0x0000 |
-| * RemainingTime                                                     | 0x0001 |
-| * MinLevel                                                          | 0x0002 |
-| * MaxLevel                                                          | 0x0003 |
-| * CurrentFrequency                                                  | 0x0004 |
-| * MinFrequency                                                      | 0x0005 |
-| * MaxFrequency                                                      | 0x0006 |
-| * Options                                                           | 0x000F |
-| * OnOffTransitionTime                                               | 0x0010 |
-| * OnLevel                                                           | 0x0011 |
-| * OnTransitionTime                                                  | 0x0012 |
-| * OffTransitionTime                                                 | 0x0013 |
-| * DefaultMoveRate                                                   | 0x0014 |
-| * StartUpCurrentLevel                                               | 0x4000 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command MoveToLevel
+ * Attribute EndProductType
  */
-class LevelControlMoveToLevel : public ClusterCommand {
+class ReadWindowCoveringEndProductType : public ReadAttribute {
 public:
-    LevelControlMoveToLevel()
-        : ClusterCommand("move-to-level")
+    ReadWindowCoveringEndProductType()
+        : ReadAttribute("end-product-type")
     {
-        AddArgument("Level", 0, UINT8_MAX, &mRequest.level);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        AddArgument("OptionMask", 0, UINT8_MAX, &mRequest.optionMask);
-        AddArgument("OptionOverride", 0, UINT8_MAX, &mRequest.optionOverride);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadWindowCoveringEndProductType() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x0000000D) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPLevelControlClusterMoveToLevelParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.level = [NSNumber numberWithUnsignedChar:mRequest.level];
-        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
-        params.optionMask = [NSNumber numberWithUnsignedChar:mRequest.optionMask];
-        params.optionOverride = [NSNumber numberWithUnsignedChar:mRequest.optionOverride];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster moveToLevelWithParams:params
-                         completionHandler:^(NSError * _Nullable error) {
-                             responsesNeeded--;
-                             if (error != nil) {
-                                 mError = error;
-                                 LogNSError("Error", error);
-                             }
-                             if (responsesNeeded == 0) {
-                                 SetCommandExitStatus(mError);
-                             }
-                         }];
-        }
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeEndProductTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WindowCovering.EndProductType response %@", [value description]);
+            if (error != nil) {
+                LogNSError("WindowCovering EndProductType read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::LevelControl::Commands::MoveToLevel::Type mRequest;
 };
 
-/*
- * Command Move
- */
-class LevelControlMove : public ClusterCommand {
+class SubscribeAttributeWindowCoveringEndProductType : public SubscribeAttribute {
 public:
-    LevelControlMove()
-        : ClusterCommand("move")
+    SubscribeAttributeWindowCoveringEndProductType()
+        : SubscribeAttribute("end-product-type")
     {
-        AddArgument("MoveMode", 0, UINT8_MAX, &mRequest.moveMode);
-        AddArgument("Rate", 0, UINT8_MAX, &mRequest.rate);
-        AddArgument("OptionMask", 0, UINT8_MAX, &mRequest.optionMask);
-        AddArgument("OptionOverride", 0, UINT8_MAX, &mRequest.optionOverride);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeWindowCoveringEndProductType() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) command (0x00000001) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x0000000D) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPLevelControlClusterMoveParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.moveMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.moveMode)];
-        params.rate = [NSNumber numberWithUnsignedChar:mRequest.rate];
-        params.optionMask = [NSNumber numberWithUnsignedChar:mRequest.optionMask];
-        params.optionOverride = [NSNumber numberWithUnsignedChar:mRequest.optionOverride];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster moveWithParams:params
-                  completionHandler:^(NSError * _Nullable error) {
-                      responsesNeeded--;
-                      if (error != nil) {
-                          mError = error;
-                          LogNSError("Error", error);
-                      }
-                      if (responsesNeeded == 0) {
-                          SetCommandExitStatus(mError);
-                      }
-                  }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::LevelControl::Commands::Move::Type mRequest;
-};
-
-/*
- * Command Step
- */
-class LevelControlStep : public ClusterCommand {
-public:
-    LevelControlStep()
-        : ClusterCommand("step")
-    {
-        AddArgument("StepMode", 0, UINT8_MAX, &mRequest.stepMode);
-        AddArgument("StepSize", 0, UINT8_MAX, &mRequest.stepSize);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        AddArgument("OptionMask", 0, UINT8_MAX, &mRequest.optionMask);
-        AddArgument("OptionOverride", 0, UINT8_MAX, &mRequest.optionOverride);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) command (0x00000002) on endpoint %u", endpointId);
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeEndProductTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.EndProductType response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPLevelControlClusterStepParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.stepMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.stepMode)];
-        params.stepSize = [NSNumber numberWithUnsignedChar:mRequest.stepSize];
-        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
-        params.optionMask = [NSNumber numberWithUnsignedChar:mRequest.optionMask];
-        params.optionOverride = [NSNumber numberWithUnsignedChar:mRequest.optionOverride];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster stepWithParams:params
-                  completionHandler:^(NSError * _Nullable error) {
-                      responsesNeeded--;
-                      if (error != nil) {
-                          mError = error;
-                          LogNSError("Error", error);
-                      }
-                      if (responsesNeeded == 0) {
-                          SetCommandExitStatus(mError);
-                      }
-                  }];
-        }
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::LevelControl::Commands::Step::Type mRequest;
 };
 
 /*
- * Command Stop
+ * Attribute CurrentPositionLiftPercent100ths
  */
-class LevelControlStop : public ClusterCommand {
+class ReadWindowCoveringCurrentPositionLiftPercent100ths : public ReadAttribute {
 public:
-    LevelControlStop()
-        : ClusterCommand("stop")
-    {
-        AddArgument("OptionMask", 0, UINT8_MAX, &mRequest.optionMask);
-        AddArgument("OptionOverride", 0, UINT8_MAX, &mRequest.optionOverride);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    ReadWindowCoveringCurrentPositionLiftPercent100ths()
+        : ReadAttribute("current-position-lift-percent100ths")
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) command (0x00000003) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPLevelControlClusterStopParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.optionMask = [NSNumber numberWithUnsignedChar:mRequest.optionMask];
-        params.optionOverride = [NSNumber numberWithUnsignedChar:mRequest.optionOverride];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster stopWithParams:params
-                  completionHandler:^(NSError * _Nullable error) {
-                      responsesNeeded--;
-                      if (error != nil) {
-                          mError = error;
-                          LogNSError("Error", error);
-                      }
-                      if (responsesNeeded == 0) {
-                          SetCommandExitStatus(mError);
-                      }
-                  }];
-        }
-        return CHIP_NO_ERROR;
     }
 
-private:
-    chip::app::Clusters::LevelControl::Commands::Stop::Type mRequest;
-};
-
-/*
- * Command MoveToLevelWithOnOff
- */
-class LevelControlMoveToLevelWithOnOff : public ClusterCommand {
-public:
-    LevelControlMoveToLevelWithOnOff()
-        : ClusterCommand("move-to-level-with-on-off")
-    {
-        AddArgument("Level", 0, UINT8_MAX, &mRequest.level);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        ClusterCommand::AddArguments();
-    }
+    ~ReadWindowCoveringCurrentPositionLiftPercent100ths() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) command (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x0000000E) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPLevelControlClusterMoveToLevelWithOnOffParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.level = [NSNumber numberWithUnsignedChar:mRequest.level];
-        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster moveToLevelWithOnOffWithParams:params
-                                  completionHandler:^(NSError * _Nullable error) {
-                                      responsesNeeded--;
-                                      if (error != nil) {
-                                          mError = error;
-                                          LogNSError("Error", error);
-                                      }
-                                      if (responsesNeeded == 0) {
-                                          SetCommandExitStatus(mError);
-                                      }
-                                  }];
-        }
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WindowCovering.CurrentPositionLiftPercent100ths response %@", [value description]);
+            if (error != nil) {
+                LogNSError("WindowCovering CurrentPositionLiftPercent100ths read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::LevelControl::Commands::MoveToLevelWithOnOff::Type mRequest;
 };
 
-/*
- * Command MoveWithOnOff
- */
-class LevelControlMoveWithOnOff : public ClusterCommand {
+class SubscribeAttributeWindowCoveringCurrentPositionLiftPercent100ths : public SubscribeAttribute {
 public:
-    LevelControlMoveWithOnOff()
-        : ClusterCommand("move-with-on-off")
-    {
-        AddArgument("MoveMode", 0, UINT8_MAX, &mRequest.moveMode);
-        AddArgument("Rate", 0, UINT8_MAX, &mRequest.rate);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    SubscribeAttributeWindowCoveringCurrentPositionLiftPercent100ths()
+        : SubscribeAttribute("current-position-lift-percent100ths")
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) command (0x00000005) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPLevelControlClusterMoveWithOnOffParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.moveMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.moveMode)];
-        params.rate = [NSNumber numberWithUnsignedChar:mRequest.rate];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster moveWithOnOffWithParams:params
-                           completionHandler:^(NSError * _Nullable error) {
-                               responsesNeeded--;
-                               if (error != nil) {
-                                   mError = error;
-                                   LogNSError("Error", error);
-                               }
-                               if (responsesNeeded == 0) {
-                                   SetCommandExitStatus(mError);
-                               }
-                           }];
-        }
-        return CHIP_NO_ERROR;
     }
 
-private:
-    chip::app::Clusters::LevelControl::Commands::MoveWithOnOff::Type mRequest;
-};
-
-/*
- * Command StepWithOnOff
- */
-class LevelControlStepWithOnOff : public ClusterCommand {
-public:
-    LevelControlStepWithOnOff()
-        : ClusterCommand("step-with-on-off")
-    {
-        AddArgument("StepMode", 0, UINT8_MAX, &mRequest.stepMode);
-        AddArgument("StepSize", 0, UINT8_MAX, &mRequest.stepSize);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        ClusterCommand::AddArguments();
-    }
+    ~SubscribeAttributeWindowCoveringCurrentPositionLiftPercent100ths() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) command (0x00000006) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x0000000E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPLevelControlClusterStepWithOnOffParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.stepMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.stepMode)];
-        params.stepSize = [NSNumber numberWithUnsignedChar:mRequest.stepSize];
-        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster stepWithOnOffWithParams:params
-                           completionHandler:^(NSError * _Nullable error) {
-                               responsesNeeded--;
-                               if (error != nil) {
-                                   mError = error;
-                                   LogNSError("Error", error);
-                               }
-                               if (responsesNeeded == 0) {
-                                   SetCommandExitStatus(mError);
-                               }
-                           }];
-        }
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeCurrentPositionLiftPercent100thsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.CurrentPositionLiftPercent100ths response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::LevelControl::Commands::StepWithOnOff::Type mRequest;
 };
 
 /*
- * Command StopWithOnOff
+ * Attribute CurrentPositionTiltPercent100ths
  */
-class LevelControlStopWithOnOff : public ClusterCommand {
+class ReadWindowCoveringCurrentPositionTiltPercent100ths : public ReadAttribute {
 public:
-    LevelControlStopWithOnOff()
-        : ClusterCommand("stop-with-on-off")
+    ReadWindowCoveringCurrentPositionTiltPercent100ths()
+        : ReadAttribute("current-position-tilt-percent100ths")
     {
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadWindowCoveringCurrentPositionTiltPercent100ths() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) command (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x0000000F) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPLevelControlClusterStopWithOnOffParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster stopWithOnOffWithParams:params
-                           completionHandler:^(NSError * _Nullable error) {
-                               responsesNeeded--;
-                               if (error != nil) {
-                                   mError = error;
-                                   LogNSError("Error", error);
-                               }
-                               if (responsesNeeded == 0) {
-                                   SetCommandExitStatus(mError);
-                               }
-                           }];
-        }
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WindowCovering.CurrentPositionTiltPercent100ths response %@", [value description]);
+            if (error != nil) {
+                LogNSError("WindowCovering CurrentPositionTiltPercent100ths read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
 };
 
-/*
- * Command MoveToClosestFrequency
- */
-class LevelControlMoveToClosestFrequency : public ClusterCommand {
+class SubscribeAttributeWindowCoveringCurrentPositionTiltPercent100ths : public SubscribeAttribute {
 public:
-    LevelControlMoveToClosestFrequency()
-        : ClusterCommand("move-to-closest-frequency")
+    SubscribeAttributeWindowCoveringCurrentPositionTiltPercent100ths()
+        : SubscribeAttribute("current-position-tilt-percent100ths")
     {
-        AddArgument("Frequency", 0, UINT16_MAX, &mRequest.frequency);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeWindowCoveringCurrentPositionTiltPercent100ths() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) command (0x00000008) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x0000000F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPLevelControlClusterMoveToClosestFrequencyParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.frequency = [NSNumber numberWithUnsignedShort:mRequest.frequency];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster moveToClosestFrequencyWithParams:params
-                                    completionHandler:^(NSError * _Nullable error) {
-                                        responsesNeeded--;
-                                        if (error != nil) {
-                                            mError = error;
-                                            LogNSError("Error", error);
-                                        }
-                                        if (responsesNeeded == 0) {
-                                            SetCommandExitStatus(mError);
-                                        }
-                                    }];
-        }
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeCurrentPositionTiltPercent100thsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.CurrentPositionTiltPercent100ths response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::LevelControl::Commands::MoveToClosestFrequency::Type mRequest;
 };
 
 /*
- * Attribute CurrentLevel
+ * Attribute InstalledOpenLimitLift
  */
-class ReadLevelControlCurrentLevel : public ReadAttribute {
+class ReadWindowCoveringInstalledOpenLimitLift : public ReadAttribute {
 public:
-    ReadLevelControlCurrentLevel()
-        : ReadAttribute("current-level")
+    ReadWindowCoveringInstalledOpenLimitLift()
+        : ReadAttribute("installed-open-limit-lift")
     {
     }
 
-    ~ReadLevelControlCurrentLevel() {}
+    ~ReadWindowCoveringInstalledOpenLimitLift() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000010) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCurrentLevelWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LevelControl.CurrentLevel response %@", [value description]);
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeInstalledOpenLimitLiftWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WindowCovering.InstalledOpenLimitLift response %@", [value description]);
             if (error != nil) {
-                LogNSError("LevelControl CurrentLevel read Error", error);
+                LogNSError("WindowCovering InstalledOpenLimitLift read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -42815,32 +42043,32 @@ class ReadLevelControlCurrentLevel : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLevelControlCurrentLevel : public SubscribeAttribute {
+class SubscribeAttributeWindowCoveringInstalledOpenLimitLift : public SubscribeAttribute {
 public:
-    SubscribeAttributeLevelControlCurrentLevel()
-        : SubscribeAttribute("current-level")
+    SubscribeAttributeWindowCoveringInstalledOpenLimitLift()
+        : SubscribeAttribute("installed-open-limit-lift")
     {
     }
 
-    ~SubscribeAttributeLevelControlCurrentLevel() {}
+    ~SubscribeAttributeWindowCoveringInstalledOpenLimitLift() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000010) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInstalledOpenLimitLiftWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LevelControl.CurrentLevel response %@", [value description]);
+                NSLog(@"WindowCovering.InstalledOpenLimitLift response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -42851,60 +42079,61 @@ class SubscribeAttributeLevelControlCurrentLevel : public SubscribeAttribute {
 };
 
 /*
- * Attribute RemainingTime
+ * Attribute InstalledClosedLimitLift
  */
-class ReadLevelControlRemainingTime : public ReadAttribute {
+class ReadWindowCoveringInstalledClosedLimitLift : public ReadAttribute {
 public:
-    ReadLevelControlRemainingTime()
-        : ReadAttribute("remaining-time")
+    ReadWindowCoveringInstalledClosedLimitLift()
+        : ReadAttribute("installed-closed-limit-lift")
     {
     }
 
-    ~ReadLevelControlRemainingTime() {}
+    ~ReadWindowCoveringInstalledClosedLimitLift() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000011) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeRemainingTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LevelControl.RemainingTime response %@", [value description]);
-            if (error != nil) {
-                LogNSError("LevelControl RemainingTime read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeInstalledClosedLimitLiftWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.InstalledClosedLimitLift response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("WindowCovering InstalledClosedLimitLift read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeLevelControlRemainingTime : public SubscribeAttribute {
+class SubscribeAttributeWindowCoveringInstalledClosedLimitLift : public SubscribeAttribute {
 public:
-    SubscribeAttributeLevelControlRemainingTime()
-        : SubscribeAttribute("remaining-time")
+    SubscribeAttributeWindowCoveringInstalledClosedLimitLift()
+        : SubscribeAttribute("installed-closed-limit-lift")
     {
     }
 
-    ~SubscribeAttributeLevelControlRemainingTime() {}
+    ~SubscribeAttributeWindowCoveringInstalledClosedLimitLift() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000011) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRemainingTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInstalledClosedLimitLiftWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LevelControl.RemainingTime response %@", [value description]);
+                NSLog(@"WindowCovering.InstalledClosedLimitLift response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -42915,27 +42144,27 @@ class SubscribeAttributeLevelControlRemainingTime : public SubscribeAttribute {
 };
 
 /*
- * Attribute MinLevel
+ * Attribute InstalledOpenLimitTilt
  */
-class ReadLevelControlMinLevel : public ReadAttribute {
+class ReadWindowCoveringInstalledOpenLimitTilt : public ReadAttribute {
 public:
-    ReadLevelControlMinLevel()
-        : ReadAttribute("min-level")
+    ReadWindowCoveringInstalledOpenLimitTilt()
+        : ReadAttribute("installed-open-limit-tilt")
     {
     }
 
-    ~ReadLevelControlMinLevel() {}
+    ~ReadWindowCoveringInstalledOpenLimitTilt() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000012) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeMinLevelWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LevelControl.MinLevel response %@", [value description]);
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeInstalledOpenLimitTiltWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WindowCovering.InstalledOpenLimitTilt response %@", [value description]);
             if (error != nil) {
-                LogNSError("LevelControl MinLevel read Error", error);
+                LogNSError("WindowCovering InstalledOpenLimitTilt read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -42943,32 +42172,32 @@ class ReadLevelControlMinLevel : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLevelControlMinLevel : public SubscribeAttribute {
+class SubscribeAttributeWindowCoveringInstalledOpenLimitTilt : public SubscribeAttribute {
 public:
-    SubscribeAttributeLevelControlMinLevel()
-        : SubscribeAttribute("min-level")
+    SubscribeAttributeWindowCoveringInstalledOpenLimitTilt()
+        : SubscribeAttribute("installed-open-limit-tilt")
     {
     }
 
-    ~SubscribeAttributeLevelControlMinLevel() {}
+    ~SubscribeAttributeWindowCoveringInstalledOpenLimitTilt() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000012) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMinLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInstalledOpenLimitTiltWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LevelControl.MinLevel response %@", [value description]);
+                NSLog(@"WindowCovering.InstalledOpenLimitTilt response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -42979,60 +42208,61 @@ class SubscribeAttributeLevelControlMinLevel : public SubscribeAttribute {
 };
 
 /*
- * Attribute MaxLevel
+ * Attribute InstalledClosedLimitTilt
  */
-class ReadLevelControlMaxLevel : public ReadAttribute {
+class ReadWindowCoveringInstalledClosedLimitTilt : public ReadAttribute {
 public:
-    ReadLevelControlMaxLevel()
-        : ReadAttribute("max-level")
+    ReadWindowCoveringInstalledClosedLimitTilt()
+        : ReadAttribute("installed-closed-limit-tilt")
     {
     }
 
-    ~ReadLevelControlMaxLevel() {}
+    ~ReadWindowCoveringInstalledClosedLimitTilt() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000013) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeMaxLevelWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LevelControl.MaxLevel response %@", [value description]);
-            if (error != nil) {
-                LogNSError("LevelControl MaxLevel read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeInstalledClosedLimitTiltWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.InstalledClosedLimitTilt response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("WindowCovering InstalledClosedLimitTilt read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeLevelControlMaxLevel : public SubscribeAttribute {
+class SubscribeAttributeWindowCoveringInstalledClosedLimitTilt : public SubscribeAttribute {
 public:
-    SubscribeAttributeLevelControlMaxLevel()
-        : SubscribeAttribute("max-level")
+    SubscribeAttributeWindowCoveringInstalledClosedLimitTilt()
+        : SubscribeAttribute("installed-closed-limit-tilt")
     {
     }
 
-    ~SubscribeAttributeLevelControlMaxLevel() {}
+    ~SubscribeAttributeWindowCoveringInstalledClosedLimitTilt() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000013) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMaxLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInstalledClosedLimitTiltWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LevelControl.MaxLevel response %@", [value description]);
+                NSLog(@"WindowCovering.InstalledClosedLimitTilt response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -43043,27 +42273,27 @@ class SubscribeAttributeLevelControlMaxLevel : public SubscribeAttribute {
 };
 
 /*
- * Attribute CurrentFrequency
+ * Attribute Mode
  */
-class ReadLevelControlCurrentFrequency : public ReadAttribute {
+class ReadWindowCoveringMode : public ReadAttribute {
 public:
-    ReadLevelControlCurrentFrequency()
-        : ReadAttribute("current-frequency")
+    ReadWindowCoveringMode()
+        : ReadAttribute("mode")
     {
     }
 
-    ~ReadLevelControlCurrentFrequency() {}
+    ~ReadWindowCoveringMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000017) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCurrentFrequencyWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LevelControl.CurrentFrequency response %@", [value description]);
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WindowCovering.Mode response %@", [value description]);
             if (error != nil) {
-                LogNSError("LevelControl CurrentFrequency read Error", error);
+                LogNSError("WindowCovering Mode read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -43071,32 +42301,70 @@ class ReadLevelControlCurrentFrequency : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLevelControlCurrentFrequency : public SubscribeAttribute {
+class WriteWindowCoveringMode : public WriteAttribute {
 public:
-    SubscribeAttributeLevelControlCurrentFrequency()
-        : SubscribeAttribute("current-frequency")
+    WriteWindowCoveringMode()
+        : WriteAttribute("mode")
     {
+        AddArgument("attr-name", "mode");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeLevelControlCurrentFrequency() {}
+    ~WriteWindowCoveringMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) WriteAttribute (0x00000017) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeModeWithValue:value
+                                      params:params
+                           completionHandler:^(NSError * _Nullable error) {
+                               if (error != nil) {
+                                   LogNSError("WindowCovering Mode write Error", error);
+                               }
+                               SetCommandExitStatus(error);
+                           }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeWindowCoveringMode : public SubscribeAttribute {
+public:
+    SubscribeAttributeWindowCoveringMode()
+        : SubscribeAttribute("mode")
+    {
+    }
+
+    ~SubscribeAttributeWindowCoveringMode() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000017) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentFrequencyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LevelControl.CurrentFrequency response %@", [value description]);
+                NSLog(@"WindowCovering.Mode response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -43107,27 +42375,27 @@ class SubscribeAttributeLevelControlCurrentFrequency : public SubscribeAttribute
 };
 
 /*
- * Attribute MinFrequency
+ * Attribute SafetyStatus
  */
-class ReadLevelControlMinFrequency : public ReadAttribute {
+class ReadWindowCoveringSafetyStatus : public ReadAttribute {
 public:
-    ReadLevelControlMinFrequency()
-        : ReadAttribute("min-frequency")
+    ReadWindowCoveringSafetyStatus()
+        : ReadAttribute("safety-status")
     {
     }
 
-    ~ReadLevelControlMinFrequency() {}
+    ~ReadWindowCoveringSafetyStatus() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x0000001A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeMinFrequencyWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LevelControl.MinFrequency response %@", [value description]);
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeSafetyStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WindowCovering.SafetyStatus response %@", [value description]);
             if (error != nil) {
-                LogNSError("LevelControl MinFrequency read Error", error);
+                LogNSError("WindowCovering SafetyStatus read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -43135,32 +42403,32 @@ class ReadLevelControlMinFrequency : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLevelControlMinFrequency : public SubscribeAttribute {
+class SubscribeAttributeWindowCoveringSafetyStatus : public SubscribeAttribute {
 public:
-    SubscribeAttributeLevelControlMinFrequency()
-        : SubscribeAttribute("min-frequency")
+    SubscribeAttributeWindowCoveringSafetyStatus()
+        : SubscribeAttribute("safety-status")
     {
     }
 
-    ~SubscribeAttributeLevelControlMinFrequency() {}
+    ~SubscribeAttributeWindowCoveringSafetyStatus() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x0000001A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMinFrequencyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSafetyStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LevelControl.MinFrequency response %@", [value description]);
+                NSLog(@"WindowCovering.SafetyStatus response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -43171,27 +42439,27 @@ class SubscribeAttributeLevelControlMinFrequency : public SubscribeAttribute {
 };
 
 /*
- * Attribute MaxFrequency
+ * Attribute GeneratedCommandList
  */
-class ReadLevelControlMaxFrequency : public ReadAttribute {
+class ReadWindowCoveringGeneratedCommandList : public ReadAttribute {
 public:
-    ReadLevelControlMaxFrequency()
-        : ReadAttribute("max-frequency")
+    ReadWindowCoveringGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadLevelControlMaxFrequency() {}
+    ~ReadWindowCoveringGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeMaxFrequencyWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LevelControl.MaxFrequency response %@", [value description]);
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WindowCovering.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("LevelControl MaxFrequency read Error", error);
+                LogNSError("WindowCovering GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -43199,32 +42467,32 @@ class ReadLevelControlMaxFrequency : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLevelControlMaxFrequency : public SubscribeAttribute {
+class SubscribeAttributeWindowCoveringGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeLevelControlMaxFrequency()
-        : SubscribeAttribute("max-frequency")
+    SubscribeAttributeWindowCoveringGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeLevelControlMaxFrequency() {}
+    ~SubscribeAttributeWindowCoveringGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMaxFrequencyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LevelControl.MaxFrequency response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -43235,27 +42503,27 @@ class SubscribeAttributeLevelControlMaxFrequency : public SubscribeAttribute {
 };
 
 /*
- * Attribute Options
+ * Attribute AcceptedCommandList
  */
-class ReadLevelControlOptions : public ReadAttribute {
+class ReadWindowCoveringAcceptedCommandList : public ReadAttribute {
 public:
-    ReadLevelControlOptions()
-        : ReadAttribute("options")
+    ReadWindowCoveringAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadLevelControlOptions() {}
+    ~ReadWindowCoveringAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x0000000F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeOptionsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LevelControl.Options response %@", [value description]);
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WindowCovering.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("LevelControl Options read Error", error);
+                LogNSError("WindowCovering AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -43263,70 +42531,32 @@ class ReadLevelControlOptions : public ReadAttribute {
     }
 };
 
-class WriteLevelControlOptions : public WriteAttribute {
-public:
-    WriteLevelControlOptions()
-        : WriteAttribute("options")
-    {
-        AddArgument("attr-name", "options");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteLevelControlOptions() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) WriteAttribute (0x0000000F) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeOptionsWithValue:value
-                                         params:params
-                              completionHandler:^(NSError * _Nullable error) {
-                                  if (error != nil) {
-                                      LogNSError("LevelControl Options write Error", error);
-                                  }
-                                  SetCommandExitStatus(error);
-                              }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeLevelControlOptions : public SubscribeAttribute {
+class SubscribeAttributeWindowCoveringAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeLevelControlOptions()
-        : SubscribeAttribute("options")
+    SubscribeAttributeWindowCoveringAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeLevelControlOptions() {}
+    ~SubscribeAttributeWindowCoveringAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x0000000F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOptionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LevelControl.Options response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -43337,27 +42567,27 @@ class SubscribeAttributeLevelControlOptions : public SubscribeAttribute {
 };
 
 /*
- * Attribute OnOffTransitionTime
+ * Attribute AttributeList
  */
-class ReadLevelControlOnOffTransitionTime : public ReadAttribute {
+class ReadWindowCoveringAttributeList : public ReadAttribute {
 public:
-    ReadLevelControlOnOffTransitionTime()
-        : ReadAttribute("on-off-transition-time")
+    ReadWindowCoveringAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadLevelControlOnOffTransitionTime() {}
+    ~ReadWindowCoveringAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeOnOffTransitionTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LevelControl.OnOffTransitionTime response %@", [value description]);
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WindowCovering.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("LevelControl OnOffTransitionTime read Error", error);
+                LogNSError("WindowCovering AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -43365,70 +42595,32 @@ class ReadLevelControlOnOffTransitionTime : public ReadAttribute {
     }
 };
 
-class WriteLevelControlOnOffTransitionTime : public WriteAttribute {
-public:
-    WriteLevelControlOnOffTransitionTime()
-        : WriteAttribute("on-off-transition-time")
-    {
-        AddArgument("attr-name", "on-off-transition-time");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteLevelControlOnOffTransitionTime() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) WriteAttribute (0x00000010) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeOnOffTransitionTimeWithValue:value
-                                                     params:params
-                                          completionHandler:^(NSError * _Nullable error) {
-                                              if (error != nil) {
-                                                  LogNSError("LevelControl OnOffTransitionTime write Error", error);
-                                              }
-                                              SetCommandExitStatus(error);
-                                          }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeLevelControlOnOffTransitionTime : public SubscribeAttribute {
+class SubscribeAttributeWindowCoveringAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeLevelControlOnOffTransitionTime()
-        : SubscribeAttribute("on-off-transition-time")
+    SubscribeAttributeWindowCoveringAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeLevelControlOnOffTransitionTime() {}
+    ~SubscribeAttributeWindowCoveringAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOnOffTransitionTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LevelControl.OnOffTransitionTime response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WindowCovering.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -43439,27 +42631,27 @@ class SubscribeAttributeLevelControlOnOffTransitionTime : public SubscribeAttrib
 };
 
 /*
- * Attribute OnLevel
+ * Attribute FeatureMap
  */
-class ReadLevelControlOnLevel : public ReadAttribute {
+class ReadWindowCoveringFeatureMap : public ReadAttribute {
 public:
-    ReadLevelControlOnLevel()
-        : ReadAttribute("on-level")
+    ReadWindowCoveringFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadLevelControlOnLevel() {}
+    ~ReadWindowCoveringFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeOnLevelWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LevelControl.OnLevel response %@", [value description]);
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WindowCovering.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("LevelControl OnLevel read Error", error);
+                LogNSError("WindowCovering FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -43467,70 +42659,32 @@ class ReadLevelControlOnLevel : public ReadAttribute {
     }
 };
 
-class WriteLevelControlOnLevel : public WriteAttribute {
-public:
-    WriteLevelControlOnLevel()
-        : WriteAttribute("on-level")
-    {
-        AddArgument("attr-name", "on-level");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteLevelControlOnLevel() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) WriteAttribute (0x00000011) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeOnLevelWithValue:value
-                                         params:params
-                              completionHandler:^(NSError * _Nullable error) {
-                                  if (error != nil) {
-                                      LogNSError("LevelControl OnLevel write Error", error);
-                                  }
-                                  SetCommandExitStatus(error);
-                              }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeLevelControlOnLevel : public SubscribeAttribute {
+class SubscribeAttributeWindowCoveringFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeLevelControlOnLevel()
-        : SubscribeAttribute("on-level")
+    SubscribeAttributeWindowCoveringFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeLevelControlOnLevel() {}
+    ~SubscribeAttributeWindowCoveringFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOnLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LevelControl.OnLevel response %@", [value description]);
+                NSLog(@"WindowCovering.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -43541,27 +42695,27 @@ class SubscribeAttributeLevelControlOnLevel : public SubscribeAttribute {
 };
 
 /*
- * Attribute OnTransitionTime
+ * Attribute ClusterRevision
  */
-class ReadLevelControlOnTransitionTime : public ReadAttribute {
+class ReadWindowCoveringClusterRevision : public ReadAttribute {
 public:
-    ReadLevelControlOnTransitionTime()
-        : ReadAttribute("on-transition-time")
+    ReadWindowCoveringClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadLevelControlOnTransitionTime() {}
+    ~ReadWindowCoveringClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeOnTransitionTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LevelControl.OnTransitionTime response %@", [value description]);
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WindowCovering.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("LevelControl OnTransitionTime read Error", error);
+                LogNSError("WindowCovering ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -43569,70 +42723,32 @@ class ReadLevelControlOnTransitionTime : public ReadAttribute {
     }
 };
 
-class WriteLevelControlOnTransitionTime : public WriteAttribute {
-public:
-    WriteLevelControlOnTransitionTime()
-        : WriteAttribute("on-transition-time")
-    {
-        AddArgument("attr-name", "on-transition-time");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteLevelControlOnTransitionTime() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) WriteAttribute (0x00000012) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeOnTransitionTimeWithValue:value
-                                                  params:params
-                                       completionHandler:^(NSError * _Nullable error) {
-                                           if (error != nil) {
-                                               LogNSError("LevelControl OnTransitionTime write Error", error);
-                                           }
-                                           SetCommandExitStatus(error);
-                                       }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeLevelControlOnTransitionTime : public SubscribeAttribute {
+class SubscribeAttributeWindowCoveringClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeLevelControlOnTransitionTime()
-        : SubscribeAttribute("on-transition-time")
+    SubscribeAttributeWindowCoveringClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeLevelControlOnTransitionTime() {}
+    ~SubscribeAttributeWindowCoveringClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOnTransitionTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LevelControl.OnTransitionTime response %@", [value description]);
+                NSLog(@"WindowCovering.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -43642,130 +42758,140 @@ class SubscribeAttributeLevelControlOnTransitionTime : public SubscribeAttribute
     }
 };
 
-/*
- * Attribute OffTransitionTime
- */
-class ReadLevelControlOffTransitionTime : public ReadAttribute {
-public:
-    ReadLevelControlOffTransitionTime()
-        : ReadAttribute("off-transition-time")
-    {
-    }
-
-    ~ReadLevelControlOffTransitionTime() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00000013) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeOffTransitionTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LevelControl.OffTransitionTime response %@", [value description]);
-            if (error != nil) {
-                LogNSError("LevelControl OffTransitionTime read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
+/*----------------------------------------------------------------------------*\
+| Cluster BarrierControl                                              | 0x0103 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * BarrierControlGoToPercent                                         |   0x00 |
+| * BarrierControlStop                                                |   0x01 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * BarrierMovingState                                                | 0x0001 |
+| * BarrierSafetyStatus                                               | 0x0002 |
+| * BarrierCapabilities                                               | 0x0003 |
+| * BarrierOpenEvents                                                 | 0x0004 |
+| * BarrierCloseEvents                                                | 0x0005 |
+| * BarrierCommandOpenEvents                                          | 0x0006 |
+| * BarrierCommandCloseEvents                                         | 0x0007 |
+| * BarrierOpenPeriod                                                 | 0x0008 |
+| * BarrierClosePeriod                                                | 0x0009 |
+| * BarrierPosition                                                   | 0x000A |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
 
-class WriteLevelControlOffTransitionTime : public WriteAttribute {
+/*
+ * Command BarrierControlGoToPercent
+ */
+class BarrierControlBarrierControlGoToPercent : public ClusterCommand {
 public:
-    WriteLevelControlOffTransitionTime()
-        : WriteAttribute("off-transition-time")
+    BarrierControlBarrierControlGoToPercent()
+        : ClusterCommand("barrier-control-go-to-percent")
     {
-        AddArgument("attr-name", "off-transition-time");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
+        AddArgument("PercentOpen", 0, UINT8_MAX, &mRequest.percentOpen);
+        ClusterCommand::AddArguments();
     }
 
-    ~WriteLevelControlOffTransitionTime() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) WriteAttribute (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) command (0x00000000) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPBarrierControlClusterBarrierControlGoToPercentParams alloc] init];
+        params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeOffTransitionTimeWithValue:value
-                                                   params:params
-                                        completionHandler:^(NSError * _Nullable error) {
-                                            if (error != nil) {
-                                                LogNSError("LevelControl OffTransitionTime write Error", error);
-                                            }
-                                            SetCommandExitStatus(error);
-                                        }];
+        params.percentOpen = [NSNumber numberWithUnsignedChar:mRequest.percentOpen];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster barrierControlGoToPercentWithParams:params
+                                       completionHandler:^(NSError * _Nullable error) {
+                                           responsesNeeded--;
+                                           if (error != nil) {
+                                               mError = error;
+                                               LogNSError("Error", error);
+                                           }
+                                           if (responsesNeeded == 0) {
+                                               SetCommandExitStatus(mError);
+                                           }
+                                       }];
+        }
         return CHIP_NO_ERROR;
     }
 
 private:
-    uint16_t mValue;
+    chip::app::Clusters::BarrierControl::Commands::BarrierControlGoToPercent::Type mRequest;
 };
 
-class SubscribeAttributeLevelControlOffTransitionTime : public SubscribeAttribute {
+/*
+ * Command BarrierControlStop
+ */
+class BarrierControlBarrierControlStop : public ClusterCommand {
 public:
-    SubscribeAttributeLevelControlOffTransitionTime()
-        : SubscribeAttribute("off-transition-time")
+    BarrierControlBarrierControlStop()
+        : ClusterCommand("barrier-control-stop")
     {
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeLevelControlOffTransitionTime() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00000013) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOffTransitionTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LevelControl.OffTransitionTime response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) command (0x00000001) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPBarrierControlClusterBarrierControlStopParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster barrierControlStopWithParams:params
+                                completionHandler:^(NSError * _Nullable error) {
+                                    responsesNeeded--;
+                                    if (error != nil) {
+                                        mError = error;
+                                        LogNSError("Error", error);
+                                    }
+                                    if (responsesNeeded == 0) {
+                                        SetCommandExitStatus(mError);
+                                    }
+                                }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
 };
 
 /*
- * Attribute DefaultMoveRate
+ * Attribute BarrierMovingState
  */
-class ReadLevelControlDefaultMoveRate : public ReadAttribute {
+class ReadBarrierControlBarrierMovingState : public ReadAttribute {
 public:
-    ReadLevelControlDefaultMoveRate()
-        : ReadAttribute("default-move-rate")
+    ReadBarrierControlBarrierMovingState()
+        : ReadAttribute("barrier-moving-state")
     {
     }
 
-    ~ReadLevelControlDefaultMoveRate() {}
+    ~ReadBarrierControlBarrierMovingState() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00000014) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeDefaultMoveRateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LevelControl.DefaultMoveRate response %@", [value description]);
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBarrierMovingStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BarrierControl.BarrierMovingState response %@", [value description]);
             if (error != nil) {
-                LogNSError("LevelControl DefaultMoveRate read Error", error);
+                LogNSError("BarrierControl BarrierMovingState read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -43773,70 +42899,32 @@ class ReadLevelControlDefaultMoveRate : public ReadAttribute {
     }
 };
 
-class WriteLevelControlDefaultMoveRate : public WriteAttribute {
-public:
-    WriteLevelControlDefaultMoveRate()
-        : WriteAttribute("default-move-rate")
-    {
-        AddArgument("attr-name", "default-move-rate");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteLevelControlDefaultMoveRate() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) WriteAttribute (0x00000014) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeDefaultMoveRateWithValue:value
-                                                 params:params
-                                      completionHandler:^(NSError * _Nullable error) {
-                                          if (error != nil) {
-                                              LogNSError("LevelControl DefaultMoveRate write Error", error);
-                                          }
-                                          SetCommandExitStatus(error);
-                                      }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeLevelControlDefaultMoveRate : public SubscribeAttribute {
+class SubscribeAttributeBarrierControlBarrierMovingState : public SubscribeAttribute {
 public:
-    SubscribeAttributeLevelControlDefaultMoveRate()
-        : SubscribeAttribute("default-move-rate")
+    SubscribeAttributeBarrierControlBarrierMovingState()
+        : SubscribeAttribute("barrier-moving-state")
     {
     }
 
-    ~SubscribeAttributeLevelControlDefaultMoveRate() {}
+    ~SubscribeAttributeBarrierControlBarrierMovingState() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00000014) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDefaultMoveRateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBarrierMovingStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LevelControl.DefaultMoveRate response %@", [value description]);
+                NSLog(@"BarrierControl.BarrierMovingState response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -43847,27 +42935,27 @@ class SubscribeAttributeLevelControlDefaultMoveRate : public SubscribeAttribute
 };
 
 /*
- * Attribute StartUpCurrentLevel
+ * Attribute BarrierSafetyStatus
  */
-class ReadLevelControlStartUpCurrentLevel : public ReadAttribute {
+class ReadBarrierControlBarrierSafetyStatus : public ReadAttribute {
 public:
-    ReadLevelControlStartUpCurrentLevel()
-        : ReadAttribute("start-up-current-level")
+    ReadBarrierControlBarrierSafetyStatus()
+        : ReadAttribute("barrier-safety-status")
     {
     }
 
-    ~ReadLevelControlStartUpCurrentLevel() {}
+    ~ReadBarrierControlBarrierSafetyStatus() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x00004000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeStartUpCurrentLevelWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LevelControl.StartUpCurrentLevel response %@", [value description]);
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBarrierSafetyStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BarrierControl.BarrierSafetyStatus response %@", [value description]);
             if (error != nil) {
-                LogNSError("LevelControl StartUpCurrentLevel read Error", error);
+                LogNSError("BarrierControl BarrierSafetyStatus read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -43875,70 +42963,32 @@ class ReadLevelControlStartUpCurrentLevel : public ReadAttribute {
     }
 };
 
-class WriteLevelControlStartUpCurrentLevel : public WriteAttribute {
-public:
-    WriteLevelControlStartUpCurrentLevel()
-        : WriteAttribute("start-up-current-level")
-    {
-        AddArgument("attr-name", "start-up-current-level");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteLevelControlStartUpCurrentLevel() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) WriteAttribute (0x00004000) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeStartUpCurrentLevelWithValue:value
-                                                     params:params
-                                          completionHandler:^(NSError * _Nullable error) {
-                                              if (error != nil) {
-                                                  LogNSError("LevelControl StartUpCurrentLevel write Error", error);
-                                              }
-                                              SetCommandExitStatus(error);
-                                          }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeLevelControlStartUpCurrentLevel : public SubscribeAttribute {
+class SubscribeAttributeBarrierControlBarrierSafetyStatus : public SubscribeAttribute {
 public:
-    SubscribeAttributeLevelControlStartUpCurrentLevel()
-        : SubscribeAttribute("start-up-current-level")
+    SubscribeAttributeBarrierControlBarrierSafetyStatus()
+        : SubscribeAttribute("barrier-safety-status")
     {
     }
 
-    ~SubscribeAttributeLevelControlStartUpCurrentLevel() {}
+    ~SubscribeAttributeBarrierControlBarrierSafetyStatus() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x00004000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeStartUpCurrentLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBarrierSafetyStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LevelControl.StartUpCurrentLevel response %@", [value description]);
+                NSLog(@"BarrierControl.BarrierSafetyStatus response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -43949,27 +42999,27 @@ class SubscribeAttributeLevelControlStartUpCurrentLevel : public SubscribeAttrib
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute BarrierCapabilities
  */
-class ReadLevelControlGeneratedCommandList : public ReadAttribute {
+class ReadBarrierControlBarrierCapabilities : public ReadAttribute {
 public:
-    ReadLevelControlGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadBarrierControlBarrierCapabilities()
+        : ReadAttribute("barrier-capabilities")
     {
     }
 
-    ~ReadLevelControlGeneratedCommandList() {}
+    ~ReadBarrierControlBarrierCapabilities() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LevelControl.GeneratedCommandList response %@", [value description]);
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBarrierCapabilitiesWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BarrierControl.BarrierCapabilities response %@", [value description]);
             if (error != nil) {
-                LogNSError("LevelControl GeneratedCommandList read Error", error);
+                LogNSError("BarrierControl BarrierCapabilities read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -43977,32 +43027,32 @@ class ReadLevelControlGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLevelControlGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeBarrierControlBarrierCapabilities : public SubscribeAttribute {
 public:
-    SubscribeAttributeLevelControlGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeBarrierControlBarrierCapabilities()
+        : SubscribeAttribute("barrier-capabilities")
     {
     }
 
-    ~SubscribeAttributeLevelControlGeneratedCommandList() {}
+    ~SubscribeAttributeBarrierControlBarrierCapabilities() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBarrierCapabilitiesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LevelControl.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BarrierControl.BarrierCapabilities response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -44013,27 +43063,27 @@ class SubscribeAttributeLevelControlGeneratedCommandList : public SubscribeAttri
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute BarrierOpenEvents
  */
-class ReadLevelControlAcceptedCommandList : public ReadAttribute {
+class ReadBarrierControlBarrierOpenEvents : public ReadAttribute {
 public:
-    ReadLevelControlAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadBarrierControlBarrierOpenEvents()
+        : ReadAttribute("barrier-open-events")
     {
     }
 
-    ~ReadLevelControlAcceptedCommandList() {}
+    ~ReadBarrierControlBarrierOpenEvents() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LevelControl.AcceptedCommandList response %@", [value description]);
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBarrierOpenEventsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BarrierControl.BarrierOpenEvents response %@", [value description]);
             if (error != nil) {
-                LogNSError("LevelControl AcceptedCommandList read Error", error);
+                LogNSError("BarrierControl BarrierOpenEvents read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -44041,32 +43091,70 @@ class ReadLevelControlAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLevelControlAcceptedCommandList : public SubscribeAttribute {
+class WriteBarrierControlBarrierOpenEvents : public WriteAttribute {
 public:
-    SubscribeAttributeLevelControlAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    WriteBarrierControlBarrierOpenEvents()
+        : WriteAttribute("barrier-open-events")
     {
+        AddArgument("attr-name", "barrier-open-events");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeLevelControlAcceptedCommandList() {}
+    ~WriteBarrierControlBarrierOpenEvents() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) WriteAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster writeAttributeBarrierOpenEventsWithValue:value
+                                                   params:params
+                                        completionHandler:^(NSError * _Nullable error) {
+                                            if (error != nil) {
+                                                LogNSError("BarrierControl BarrierOpenEvents write Error", error);
+                                            }
+                                            SetCommandExitStatus(error);
+                                        }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeBarrierControlBarrierOpenEvents : public SubscribeAttribute {
+public:
+    SubscribeAttributeBarrierControlBarrierOpenEvents()
+        : SubscribeAttribute("barrier-open-events")
+    {
+    }
+
+    ~SubscribeAttributeBarrierControlBarrierOpenEvents() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBarrierOpenEventsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LevelControl.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BarrierControl.BarrierOpenEvents response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -44077,27 +43165,27 @@ class SubscribeAttributeLevelControlAcceptedCommandList : public SubscribeAttrib
 };
 
 /*
- * Attribute AttributeList
+ * Attribute BarrierCloseEvents
  */
-class ReadLevelControlAttributeList : public ReadAttribute {
+class ReadBarrierControlBarrierCloseEvents : public ReadAttribute {
 public:
-    ReadLevelControlAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadBarrierControlBarrierCloseEvents()
+        : ReadAttribute("barrier-close-events")
     {
     }
 
-    ~ReadLevelControlAttributeList() {}
+    ~ReadBarrierControlBarrierCloseEvents() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LevelControl.AttributeList response %@", [value description]);
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBarrierCloseEventsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BarrierControl.BarrierCloseEvents response %@", [value description]);
             if (error != nil) {
-                LogNSError("LevelControl AttributeList read Error", error);
+                LogNSError("BarrierControl BarrierCloseEvents read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -44105,32 +43193,70 @@ class ReadLevelControlAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLevelControlAttributeList : public SubscribeAttribute {
+class WriteBarrierControlBarrierCloseEvents : public WriteAttribute {
 public:
-    SubscribeAttributeLevelControlAttributeList()
-        : SubscribeAttribute("attribute-list")
+    WriteBarrierControlBarrierCloseEvents()
+        : WriteAttribute("barrier-close-events")
     {
+        AddArgument("attr-name", "barrier-close-events");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeLevelControlAttributeList() {}
+    ~WriteBarrierControlBarrierCloseEvents() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) WriteAttribute (0x00000005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster writeAttributeBarrierCloseEventsWithValue:value
+                                                    params:params
+                                         completionHandler:^(NSError * _Nullable error) {
+                                             if (error != nil) {
+                                                 LogNSError("BarrierControl BarrierCloseEvents write Error", error);
+                                             }
+                                             SetCommandExitStatus(error);
+                                         }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeBarrierControlBarrierCloseEvents : public SubscribeAttribute {
+public:
+    SubscribeAttributeBarrierControlBarrierCloseEvents()
+        : SubscribeAttribute("barrier-close-events")
+    {
+    }
+
+    ~SubscribeAttributeBarrierControlBarrierCloseEvents() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBarrierCloseEventsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LevelControl.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BarrierControl.BarrierCloseEvents response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -44141,60 +43267,99 @@ class SubscribeAttributeLevelControlAttributeList : public SubscribeAttribute {
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute BarrierCommandOpenEvents
  */
-class ReadLevelControlFeatureMap : public ReadAttribute {
+class ReadBarrierControlBarrierCommandOpenEvents : public ReadAttribute {
 public:
-    ReadLevelControlFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadBarrierControlBarrierCommandOpenEvents()
+        : ReadAttribute("barrier-command-open-events")
     {
     }
 
-    ~ReadLevelControlFeatureMap() {}
+    ~ReadBarrierControlBarrierCommandOpenEvents() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x00000006) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LevelControl.FeatureMap response %@", [value description]);
-            if (error != nil) {
-                LogNSError("LevelControl FeatureMap read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeBarrierCommandOpenEventsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BarrierControl.BarrierCommandOpenEvents response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("BarrierControl BarrierCommandOpenEvents read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeLevelControlFeatureMap : public SubscribeAttribute {
+class WriteBarrierControlBarrierCommandOpenEvents : public WriteAttribute {
 public:
-    SubscribeAttributeLevelControlFeatureMap()
-        : SubscribeAttribute("feature-map")
+    WriteBarrierControlBarrierCommandOpenEvents()
+        : WriteAttribute("barrier-command-open-events")
     {
+        AddArgument("attr-name", "barrier-command-open-events");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeLevelControlFeatureMap() {}
+    ~WriteBarrierControlBarrierCommandOpenEvents() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) WriteAttribute (0x00000006) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster writeAttributeBarrierCommandOpenEventsWithValue:value
+                                                          params:params
+                                               completionHandler:^(NSError * _Nullable error) {
+                                                   if (error != nil) {
+                                                       LogNSError("BarrierControl BarrierCommandOpenEvents write Error", error);
+                                                   }
+                                                   SetCommandExitStatus(error);
+                                               }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeBarrierControlBarrierCommandOpenEvents : public SubscribeAttribute {
+public:
+    SubscribeAttributeBarrierControlBarrierCommandOpenEvents()
+        : SubscribeAttribute("barrier-command-open-events")
+    {
+    }
+
+    ~SubscribeAttributeBarrierControlBarrierCommandOpenEvents() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x00000006) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBarrierCommandOpenEventsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LevelControl.FeatureMap response %@", [value description]);
+                NSLog(@"BarrierControl.BarrierCommandOpenEvents response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -44205,27 +43370,130 @@ class SubscribeAttributeLevelControlFeatureMap : public SubscribeAttribute {
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute BarrierCommandCloseEvents
  */
-class ReadLevelControlClusterRevision : public ReadAttribute {
+class ReadBarrierControlBarrierCommandCloseEvents : public ReadAttribute {
 public:
-    ReadLevelControlClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadBarrierControlBarrierCommandCloseEvents()
+        : ReadAttribute("barrier-command-close-events")
     {
     }
 
-    ~ReadLevelControlClusterRevision() {}
+    ~ReadBarrierControlBarrierCommandCloseEvents() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x00000007) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LevelControl.ClusterRevision response %@", [value description]);
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeBarrierCommandCloseEventsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BarrierControl.BarrierCommandCloseEvents response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("BarrierControl BarrierCommandCloseEvents read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteBarrierControlBarrierCommandCloseEvents : public WriteAttribute {
+public:
+    WriteBarrierControlBarrierCommandCloseEvents()
+        : WriteAttribute("barrier-command-close-events")
+    {
+        AddArgument("attr-name", "barrier-command-close-events");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteBarrierControlBarrierCommandCloseEvents() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) WriteAttribute (0x00000007) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster writeAttributeBarrierCommandCloseEventsWithValue:value
+                                                           params:params
+                                                completionHandler:^(NSError * _Nullable error) {
+                                                    if (error != nil) {
+                                                        LogNSError("BarrierControl BarrierCommandCloseEvents write Error", error);
+                                                    }
+                                                    SetCommandExitStatus(error);
+                                                }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeBarrierControlBarrierCommandCloseEvents : public SubscribeAttribute {
+public:
+    SubscribeAttributeBarrierControlBarrierCommandCloseEvents()
+        : SubscribeAttribute("barrier-command-close-events")
+    {
+    }
+
+    ~SubscribeAttributeBarrierControlBarrierCommandCloseEvents() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x00000007) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeBarrierCommandCloseEventsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BarrierControl.BarrierCommandCloseEvents response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+/*
+ * Attribute BarrierOpenPeriod
+ */
+class ReadBarrierControlBarrierOpenPeriod : public ReadAttribute {
+public:
+    ReadBarrierControlBarrierOpenPeriod()
+        : ReadAttribute("barrier-open-period")
+    {
+    }
+
+    ~ReadBarrierControlBarrierOpenPeriod() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x00000008) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBarrierOpenPeriodWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BarrierControl.BarrierOpenPeriod response %@", [value description]);
             if (error != nil) {
-                LogNSError("LevelControl ClusterRevision read Error", error);
+                LogNSError("BarrierControl BarrierOpenPeriod read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -44233,32 +43501,70 @@ class ReadLevelControlClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLevelControlClusterRevision : public SubscribeAttribute {
+class WriteBarrierControlBarrierOpenPeriod : public WriteAttribute {
 public:
-    SubscribeAttributeLevelControlClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    WriteBarrierControlBarrierOpenPeriod()
+        : WriteAttribute("barrier-open-period")
     {
+        AddArgument("attr-name", "barrier-open-period");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeLevelControlClusterRevision() {}
+    ~WriteBarrierControlBarrierOpenPeriod() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000008) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) WriteAttribute (0x00000008) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster writeAttributeBarrierOpenPeriodWithValue:value
+                                                   params:params
+                                        completionHandler:^(NSError * _Nullable error) {
+                                            if (error != nil) {
+                                                LogNSError("BarrierControl BarrierOpenPeriod write Error", error);
+                                            }
+                                            SetCommandExitStatus(error);
+                                        }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeBarrierControlBarrierOpenPeriod : public SubscribeAttribute {
+public:
+    SubscribeAttributeBarrierControlBarrierOpenPeriod()
+        : SubscribeAttribute("barrier-open-period")
+    {
+    }
+
+    ~SubscribeAttributeBarrierControlBarrierOpenPeriod() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x00000008) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBarrierOpenPeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LevelControl.ClusterRevision response %@", [value description]);
+                NSLog(@"BarrierControl.BarrierOpenPeriod response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -44268,47 +43574,28 @@ class SubscribeAttributeLevelControlClusterRevision : public SubscribeAttribute
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster LocalizationConfiguration                                   | 0x002B |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * ActiveLocale                                                      | 0x0000 |
-| * SupportedLocales                                                  | 0x0001 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Attribute ActiveLocale
+ * Attribute BarrierClosePeriod
  */
-class ReadLocalizationConfigurationActiveLocale : public ReadAttribute {
+class ReadBarrierControlBarrierClosePeriod : public ReadAttribute {
 public:
-    ReadLocalizationConfigurationActiveLocale()
-        : ReadAttribute("active-locale")
+    ReadBarrierControlBarrierClosePeriod()
+        : ReadAttribute("barrier-close-period")
     {
     }
 
-    ~ReadLocalizationConfigurationActiveLocale() {}
+    ~ReadBarrierControlBarrierClosePeriod() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x00000009) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
-        [cluster readAttributeActiveLocaleWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LocalizationConfiguration.ActiveLocale response %@", [value description]);
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBarrierClosePeriodWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BarrierControl.BarrierClosePeriod response %@", [value description]);
             if (error != nil) {
-                LogNSError("LocalizationConfiguration ActiveLocale read Error", error);
+                LogNSError("BarrierControl BarrierClosePeriod read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -44316,76 +43603,70 @@ class ReadLocalizationConfigurationActiveLocale : public ReadAttribute {
     }
 };
 
-class WriteLocalizationConfigurationActiveLocale : public WriteAttribute {
+class WriteBarrierControlBarrierClosePeriod : public WriteAttribute {
 public:
-    WriteLocalizationConfigurationActiveLocale()
-        : WriteAttribute("active-locale")
+    WriteBarrierControlBarrierClosePeriod()
+        : WriteAttribute("barrier-close-period")
     {
-        AddArgument("attr-name", "active-locale");
-        AddArgument("attr-value", &mValue);
+        AddArgument("attr-name", "barrier-close-period");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteLocalizationConfigurationActiveLocale() {}
+    ~WriteBarrierControlBarrierClosePeriod() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) WriteAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) WriteAttribute (0x00000009) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSString * _Nonnull value = [[NSString alloc] initWithBytes:mValue.data()
-                                                             length:mValue.size()
-                                                           encoding:NSUTF8StringEncoding];
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
 
-        [cluster writeAttributeActiveLocaleWithValue:value
-                                              params:params
-                                   completionHandler:^(NSError * _Nullable error) {
-                                       if (error != nil) {
-                                           LogNSError("LocalizationConfiguration ActiveLocale write Error", error);
-                                       }
-                                       SetCommandExitStatus(error);
-                                   }];
+        [cluster writeAttributeBarrierClosePeriodWithValue:value
+                                                    params:params
+                                         completionHandler:^(NSError * _Nullable error) {
+                                             if (error != nil) {
+                                                 LogNSError("BarrierControl BarrierClosePeriod write Error", error);
+                                             }
+                                             SetCommandExitStatus(error);
+                                         }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::ByteSpan mValue;
+    uint16_t mValue;
 };
 
-class SubscribeAttributeLocalizationConfigurationActiveLocale : public SubscribeAttribute {
+class SubscribeAttributeBarrierControlBarrierClosePeriod : public SubscribeAttribute {
 public:
-    SubscribeAttributeLocalizationConfigurationActiveLocale()
-        : SubscribeAttribute("active-locale")
+    SubscribeAttributeBarrierControlBarrierClosePeriod()
+        : SubscribeAttribute("barrier-close-period")
     {
     }
 
-    ~SubscribeAttributeLocalizationConfigurationActiveLocale() {}
+    ~SubscribeAttributeBarrierControlBarrierClosePeriod() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x00000009) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeActiveLocaleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBarrierClosePeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LocalizationConfiguration.ActiveLocale response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BarrierControl.BarrierClosePeriod response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -44396,29 +43677,27 @@ class SubscribeAttributeLocalizationConfigurationActiveLocale : public Subscribe
 };
 
 /*
- * Attribute SupportedLocales
+ * Attribute BarrierPosition
  */
-class ReadLocalizationConfigurationSupportedLocales : public ReadAttribute {
+class ReadBarrierControlBarrierPosition : public ReadAttribute {
 public:
-    ReadLocalizationConfigurationSupportedLocales()
-        : ReadAttribute("supported-locales")
+    ReadBarrierControlBarrierPosition()
+        : ReadAttribute("barrier-position")
     {
     }
 
-    ~ReadLocalizationConfigurationSupportedLocales() {}
+    ~ReadBarrierControlBarrierPosition() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x0000000A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
-        [cluster readAttributeSupportedLocalesWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LocalizationConfiguration.SupportedLocales response %@", [value description]);
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBarrierPositionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"BarrierControl.BarrierPosition response %@", [value description]);
             if (error != nil) {
-                LogNSError("LocalizationConfiguration SupportedLocales read Error", error);
+                LogNSError("BarrierControl BarrierPosition read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -44426,34 +43705,32 @@ class ReadLocalizationConfigurationSupportedLocales : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLocalizationConfigurationSupportedLocales : public SubscribeAttribute {
+class SubscribeAttributeBarrierControlBarrierPosition : public SubscribeAttribute {
 public:
-    SubscribeAttributeLocalizationConfigurationSupportedLocales()
-        : SubscribeAttribute("supported-locales")
+    SubscribeAttributeBarrierControlBarrierPosition()
+        : SubscribeAttribute("barrier-position")
     {
     }
 
-    ~SubscribeAttributeLocalizationConfigurationSupportedLocales() {}
+    ~SubscribeAttributeBarrierControlBarrierPosition() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x0000000A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSupportedLocalesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBarrierPositionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LocalizationConfiguration.SupportedLocales response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BarrierControl.BarrierPosition response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -44466,27 +43743,25 @@ class SubscribeAttributeLocalizationConfigurationSupportedLocales : public Subsc
 /*
  * Attribute GeneratedCommandList
  */
-class ReadLocalizationConfigurationGeneratedCommandList : public ReadAttribute {
+class ReadBarrierControlGeneratedCommandList : public ReadAttribute {
 public:
-    ReadLocalizationConfigurationGeneratedCommandList()
+    ReadBarrierControlGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadLocalizationConfigurationGeneratedCommandList() {}
+    ~ReadBarrierControlGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LocalizationConfiguration.GeneratedCommandList response %@", [value description]);
+            NSLog(@"BarrierControl.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("LocalizationConfiguration GeneratedCommandList read Error", error);
+                LogNSError("BarrierControl GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -44494,22 +43769,20 @@ class ReadLocalizationConfigurationGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLocalizationConfigurationGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeBarrierControlGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeLocalizationConfigurationGeneratedCommandList()
+    SubscribeAttributeBarrierControlGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeLocalizationConfigurationGeneratedCommandList() {}
+    ~SubscribeAttributeBarrierControlGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -44521,7 +43794,7 @@ class SubscribeAttributeLocalizationConfigurationGeneratedCommandList : public S
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LocalizationConfiguration.GeneratedCommandList response %@", [value description]);
+                NSLog(@"BarrierControl.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -44534,27 +43807,25 @@ class SubscribeAttributeLocalizationConfigurationGeneratedCommandList : public S
 /*
  * Attribute AcceptedCommandList
  */
-class ReadLocalizationConfigurationAcceptedCommandList : public ReadAttribute {
+class ReadBarrierControlAcceptedCommandList : public ReadAttribute {
 public:
-    ReadLocalizationConfigurationAcceptedCommandList()
+    ReadBarrierControlAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadLocalizationConfigurationAcceptedCommandList() {}
+    ~ReadBarrierControlAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LocalizationConfiguration.AcceptedCommandList response %@", [value description]);
+            NSLog(@"BarrierControl.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("LocalizationConfiguration AcceptedCommandList read Error", error);
+                LogNSError("BarrierControl AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -44562,22 +43833,20 @@ class ReadLocalizationConfigurationAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLocalizationConfigurationAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeBarrierControlAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeLocalizationConfigurationAcceptedCommandList()
+    SubscribeAttributeBarrierControlAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeLocalizationConfigurationAcceptedCommandList() {}
+    ~SubscribeAttributeBarrierControlAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -44589,7 +43858,7 @@ class SubscribeAttributeLocalizationConfigurationAcceptedCommandList : public Su
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LocalizationConfiguration.AcceptedCommandList response %@", [value description]);
+                NSLog(@"BarrierControl.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -44602,27 +43871,25 @@ class SubscribeAttributeLocalizationConfigurationAcceptedCommandList : public Su
 /*
  * Attribute AttributeList
  */
-class ReadLocalizationConfigurationAttributeList : public ReadAttribute {
+class ReadBarrierControlAttributeList : public ReadAttribute {
 public:
-    ReadLocalizationConfigurationAttributeList()
+    ReadBarrierControlAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadLocalizationConfigurationAttributeList() {}
+    ~ReadBarrierControlAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LocalizationConfiguration.AttributeList response %@", [value description]);
+            NSLog(@"BarrierControl.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("LocalizationConfiguration AttributeList read Error", error);
+                LogNSError("BarrierControl AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -44630,22 +43897,20 @@ class ReadLocalizationConfigurationAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLocalizationConfigurationAttributeList : public SubscribeAttribute {
+class SubscribeAttributeBarrierControlAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeLocalizationConfigurationAttributeList()
+    SubscribeAttributeBarrierControlAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeLocalizationConfigurationAttributeList() {}
+    ~SubscribeAttributeBarrierControlAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -44657,7 +43922,7 @@ class SubscribeAttributeLocalizationConfigurationAttributeList : public Subscrib
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LocalizationConfiguration.AttributeList response %@", [value description]);
+                NSLog(@"BarrierControl.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -44670,27 +43935,25 @@ class SubscribeAttributeLocalizationConfigurationAttributeList : public Subscrib
 /*
  * Attribute FeatureMap
  */
-class ReadLocalizationConfigurationFeatureMap : public ReadAttribute {
+class ReadBarrierControlFeatureMap : public ReadAttribute {
 public:
-    ReadLocalizationConfigurationFeatureMap()
+    ReadBarrierControlFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadLocalizationConfigurationFeatureMap() {}
+    ~ReadBarrierControlFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LocalizationConfiguration.FeatureMap response %@", [value description]);
+            NSLog(@"BarrierControl.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("LocalizationConfiguration FeatureMap read Error", error);
+                LogNSError("BarrierControl FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -44698,22 +43961,20 @@ class ReadLocalizationConfigurationFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLocalizationConfigurationFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeBarrierControlFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeLocalizationConfigurationFeatureMap()
+    SubscribeAttributeBarrierControlFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeLocalizationConfigurationFeatureMap() {}
+    ~SubscribeAttributeBarrierControlFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -44725,7 +43986,7 @@ class SubscribeAttributeLocalizationConfigurationFeatureMap : public SubscribeAt
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LocalizationConfiguration.FeatureMap response %@", [value description]);
+                NSLog(@"BarrierControl.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -44738,27 +43999,25 @@ class SubscribeAttributeLocalizationConfigurationFeatureMap : public SubscribeAt
 /*
  * Attribute ClusterRevision
  */
-class ReadLocalizationConfigurationClusterRevision : public ReadAttribute {
+class ReadBarrierControlClusterRevision : public ReadAttribute {
 public:
-    ReadLocalizationConfigurationClusterRevision()
+    ReadBarrierControlClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadLocalizationConfigurationClusterRevision() {}
+    ~ReadBarrierControlClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LocalizationConfiguration.ClusterRevision response %@", [value description]);
+            NSLog(@"BarrierControl.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("LocalizationConfiguration ClusterRevision read Error", error);
+                LogNSError("BarrierControl ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -44766,22 +44025,20 @@ class ReadLocalizationConfigurationClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLocalizationConfigurationClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeBarrierControlClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeLocalizationConfigurationClusterRevision()
+    SubscribeAttributeBarrierControlClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeLocalizationConfigurationClusterRevision() {}
+    ~SubscribeAttributeBarrierControlClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002B) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000103) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLocalizationConfiguration * cluster = [[CHIPLocalizationConfiguration alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
+        CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -44793,7 +44050,7 @@ class SubscribeAttributeLocalizationConfigurationClusterRevision : public Subscr
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LocalizationConfiguration.ClusterRevision response %@", [value description]);
+                NSLog(@"BarrierControl.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -44804,12 +44061,34 @@ class SubscribeAttributeLocalizationConfigurationClusterRevision : public Subscr
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster LowPower                                                    | 0x0508 |
+| Cluster PumpConfigurationAndControl                                 | 0x0200 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * Sleep                                                             |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
+| * MaxPressure                                                       | 0x0000 |
+| * MaxSpeed                                                          | 0x0001 |
+| * MaxFlow                                                           | 0x0002 |
+| * MinConstPressure                                                  | 0x0003 |
+| * MaxConstPressure                                                  | 0x0004 |
+| * MinCompPressure                                                   | 0x0005 |
+| * MaxCompPressure                                                   | 0x0006 |
+| * MinConstSpeed                                                     | 0x0007 |
+| * MaxConstSpeed                                                     | 0x0008 |
+| * MinConstFlow                                                      | 0x0009 |
+| * MaxConstFlow                                                      | 0x000A |
+| * MinConstTemp                                                      | 0x000B |
+| * MaxConstTemp                                                      | 0x000C |
+| * PumpStatus                                                        | 0x0010 |
+| * EffectiveOperationMode                                            | 0x0011 |
+| * EffectiveControlMode                                              | 0x0012 |
+| * Capacity                                                          | 0x0013 |
+| * Speed                                                             | 0x0014 |
+| * LifetimeRunningHours                                              | 0x0015 |
+| * Power                                                             | 0x0016 |
+| * LifetimeEnergyConsumed                                            | 0x0017 |
+| * OperationMode                                                     | 0x0020 |
+| * ControlMode                                                       | 0x0021 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -44817,71 +44096,117 @@ class SubscribeAttributeLocalizationConfigurationClusterRevision : public Subscr
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
+| * SupplyVoltageLow                                                  | 0x0000 |
+| * SupplyVoltageHigh                                                 | 0x0001 |
+| * PowerMissingPhase                                                 | 0x0002 |
+| * SystemPressureLow                                                 | 0x0003 |
+| * SystemPressureHigh                                                | 0x0004 |
+| * DryRunning                                                        | 0x0005 |
+| * MotorTemperatureHigh                                              | 0x0006 |
+| * PumpMotorFatalFailure                                             | 0x0007 |
+| * ElectronicTemperatureHigh                                         | 0x0008 |
+| * PumpBlocked                                                       | 0x0009 |
+| * SensorFailure                                                     | 0x000A |
+| * ElectronicNonFatalFailure                                         | 0x000B |
+| * ElectronicFatalFailure                                            | 0x000C |
+| * GeneralFault                                                      | 0x000D |
+| * Leakage                                                           | 0x000E |
+| * AirDetection                                                      | 0x000F |
+| * TurbineOperation                                                  | 0x0010 |
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command Sleep
+ * Attribute MaxPressure
  */
-class LowPowerSleep : public ClusterCommand {
+class ReadPumpConfigurationAndControlMaxPressure : public ReadAttribute {
 public:
-    LowPowerSleep()
-        : ClusterCommand("sleep")
+    ReadPumpConfigurationAndControlMaxPressure()
+        : ReadAttribute("max-pressure")
     {
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadPumpConfigurationAndControlMaxPressure() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000508) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPLowPowerClusterSleepParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster sleepWithParams:params
-                   completionHandler:^(NSError * _Nullable error) {
-                       responsesNeeded--;
-                       if (error != nil) {
-                           mError = error;
-                           LogNSError("Error", error);
-                       }
-                       if (responsesNeeded == 0) {
-                           SetCommandExitStatus(mError);
-                       }
-                   }];
-        }
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributeMaxPressureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PumpConfigurationAndControl.MaxPressure response %@", [value description]);
+            if (error != nil) {
+                LogNSError("PumpConfigurationAndControl MaxPressure read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
+};
 
-private:
+class SubscribeAttributePumpConfigurationAndControlMaxPressure : public SubscribeAttribute {
+public:
+    SubscribeAttributePumpConfigurationAndControlMaxPressure()
+        : SubscribeAttribute("max-pressure")
+    {
+    }
+
+    ~SubscribeAttributePumpConfigurationAndControlMaxPressure() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeMaxPressureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.MaxPressure response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute MaxSpeed
  */
-class ReadLowPowerGeneratedCommandList : public ReadAttribute {
+class ReadPumpConfigurationAndControlMaxSpeed : public ReadAttribute {
 public:
-    ReadLowPowerGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadPumpConfigurationAndControlMaxSpeed()
+        : ReadAttribute("max-speed")
     {
     }
 
-    ~ReadLowPowerGeneratedCommandList() {}
+    ~ReadPumpConfigurationAndControlMaxSpeed() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000508) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LowPower.GeneratedCommandList response %@", [value description]);
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributeMaxSpeedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PumpConfigurationAndControl.MaxSpeed response %@", [value description]);
             if (error != nil) {
-                LogNSError("LowPower GeneratedCommandList read Error", error);
+                LogNSError("PumpConfigurationAndControl MaxSpeed read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -44889,32 +44214,34 @@ class ReadLowPowerGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLowPowerGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributePumpConfigurationAndControlMaxSpeed : public SubscribeAttribute {
 public:
-    SubscribeAttributeLowPowerGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributePumpConfigurationAndControlMaxSpeed()
+        : SubscribeAttribute("max-speed")
     {
     }
 
-    ~SubscribeAttributeLowPowerGeneratedCommandList() {}
+    ~SubscribeAttributePumpConfigurationAndControlMaxSpeed() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000508) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMaxSpeedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LowPower.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.MaxSpeed response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -44925,27 +44252,29 @@ class SubscribeAttributeLowPowerGeneratedCommandList : public SubscribeAttribute
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute MaxFlow
  */
-class ReadLowPowerAcceptedCommandList : public ReadAttribute {
+class ReadPumpConfigurationAndControlMaxFlow : public ReadAttribute {
 public:
-    ReadLowPowerAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadPumpConfigurationAndControlMaxFlow()
+        : ReadAttribute("max-flow")
     {
     }
 
-    ~ReadLowPowerAcceptedCommandList() {}
+    ~ReadPumpConfigurationAndControlMaxFlow() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000508) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LowPower.AcceptedCommandList response %@", [value description]);
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributeMaxFlowWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PumpConfigurationAndControl.MaxFlow response %@", [value description]);
             if (error != nil) {
-                LogNSError("LowPower AcceptedCommandList read Error", error);
+                LogNSError("PumpConfigurationAndControl MaxFlow read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -44953,32 +44282,34 @@ class ReadLowPowerAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLowPowerAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributePumpConfigurationAndControlMaxFlow : public SubscribeAttribute {
 public:
-    SubscribeAttributeLowPowerAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributePumpConfigurationAndControlMaxFlow()
+        : SubscribeAttribute("max-flow")
     {
     }
 
-    ~SubscribeAttributeLowPowerAcceptedCommandList() {}
+    ~SubscribeAttributePumpConfigurationAndControlMaxFlow() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000508) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMaxFlowWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LowPower.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.MaxFlow response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -44989,27 +44320,29 @@ class SubscribeAttributeLowPowerAcceptedCommandList : public SubscribeAttribute
 };
 
 /*
- * Attribute AttributeList
+ * Attribute MinConstPressure
  */
-class ReadLowPowerAttributeList : public ReadAttribute {
+class ReadPumpConfigurationAndControlMinConstPressure : public ReadAttribute {
 public:
-    ReadLowPowerAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadPumpConfigurationAndControlMinConstPressure()
+        : ReadAttribute("min-const-pressure")
     {
     }
 
-    ~ReadLowPowerAttributeList() {}
+    ~ReadPumpConfigurationAndControlMinConstPressure() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000508) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LowPower.AttributeList response %@", [value description]);
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributeMinConstPressureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PumpConfigurationAndControl.MinConstPressure response %@", [value description]);
             if (error != nil) {
-                LogNSError("LowPower AttributeList read Error", error);
+                LogNSError("PumpConfigurationAndControl MinConstPressure read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -45017,32 +44350,34 @@ class ReadLowPowerAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLowPowerAttributeList : public SubscribeAttribute {
+class SubscribeAttributePumpConfigurationAndControlMinConstPressure : public SubscribeAttribute {
 public:
-    SubscribeAttributeLowPowerAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributePumpConfigurationAndControlMinConstPressure()
+        : SubscribeAttribute("min-const-pressure")
     {
     }
 
-    ~SubscribeAttributeLowPowerAttributeList() {}
+    ~SubscribeAttributePumpConfigurationAndControlMinConstPressure() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000508) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMinConstPressureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LowPower.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.MinConstPressure response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -45053,27 +44388,29 @@ class SubscribeAttributeLowPowerAttributeList : public SubscribeAttribute {
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute MaxConstPressure
  */
-class ReadLowPowerFeatureMap : public ReadAttribute {
+class ReadPumpConfigurationAndControlMaxConstPressure : public ReadAttribute {
 public:
-    ReadLowPowerFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadPumpConfigurationAndControlMaxConstPressure()
+        : ReadAttribute("max-const-pressure")
     {
     }
 
-    ~ReadLowPowerFeatureMap() {}
+    ~ReadPumpConfigurationAndControlMaxConstPressure() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000508) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LowPower.FeatureMap response %@", [value description]);
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributeMaxConstPressureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PumpConfigurationAndControl.MaxConstPressure response %@", [value description]);
             if (error != nil) {
-                LogNSError("LowPower FeatureMap read Error", error);
+                LogNSError("PumpConfigurationAndControl MaxConstPressure read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -45081,32 +44418,34 @@ class ReadLowPowerFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLowPowerFeatureMap : public SubscribeAttribute {
+class SubscribeAttributePumpConfigurationAndControlMaxConstPressure : public SubscribeAttribute {
 public:
-    SubscribeAttributeLowPowerFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributePumpConfigurationAndControlMaxConstPressure()
+        : SubscribeAttribute("max-const-pressure")
     {
     }
 
-    ~SubscribeAttributeLowPowerFeatureMap() {}
+    ~SubscribeAttributePumpConfigurationAndControlMaxConstPressure() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000508) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMaxConstPressureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LowPower.FeatureMap response %@", [value description]);
+                NSLog(@"PumpConfigurationAndControl.MaxConstPressure response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -45117,27 +44456,29 @@ class SubscribeAttributeLowPowerFeatureMap : public SubscribeAttribute {
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute MinCompPressure
  */
-class ReadLowPowerClusterRevision : public ReadAttribute {
+class ReadPumpConfigurationAndControlMinCompPressure : public ReadAttribute {
 public:
-    ReadLowPowerClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadPumpConfigurationAndControlMinCompPressure()
+        : ReadAttribute("min-comp-pressure")
     {
     }
 
-    ~ReadLowPowerClusterRevision() {}
+    ~ReadPumpConfigurationAndControlMinCompPressure() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000508) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"LowPower.ClusterRevision response %@", [value description]);
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributeMinCompPressureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PumpConfigurationAndControl.MinCompPressure response %@", [value description]);
             if (error != nil) {
-                LogNSError("LowPower ClusterRevision read Error", error);
+                LogNSError("PumpConfigurationAndControl MinCompPressure read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -45145,32 +44486,34 @@ class ReadLowPowerClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLowPowerClusterRevision : public SubscribeAttribute {
+class SubscribeAttributePumpConfigurationAndControlMinCompPressure : public SubscribeAttribute {
 public:
-    SubscribeAttributeLowPowerClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributePumpConfigurationAndControlMinCompPressure()
+        : SubscribeAttribute("min-comp-pressure")
     {
     }
 
-    ~SubscribeAttributeLowPowerClusterRevision() {}
+    ~SubscribeAttributePumpConfigurationAndControlMinCompPressure() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000508) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMinCompPressureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LowPower.ClusterRevision response %@", [value description]);
+                NSLog(@"PumpConfigurationAndControl.MinCompPressure response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -45180,223 +44523,166 @@ class SubscribeAttributeLowPowerClusterRevision : public SubscribeAttribute {
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster MediaInput                                                  | 0x0507 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * SelectInput                                                       |   0x00 |
-| * ShowInputStatus                                                   |   0x01 |
-| * HideInputStatus                                                   |   0x02 |
-| * RenameInput                                                       |   0x03 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * InputList                                                         | 0x0000 |
-| * CurrentInput                                                      | 0x0001 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command SelectInput
+ * Attribute MaxCompPressure
  */
-class MediaInputSelectInput : public ClusterCommand {
+class ReadPumpConfigurationAndControlMaxCompPressure : public ReadAttribute {
 public:
-    MediaInputSelectInput()
-        : ClusterCommand("select-input")
+    ReadPumpConfigurationAndControlMaxCompPressure()
+        : ReadAttribute("max-comp-pressure")
     {
-        AddArgument("Index", 0, UINT8_MAX, &mRequest.index);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadPumpConfigurationAndControlMaxCompPressure() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000006) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPMediaInputClusterSelectInputParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.index = [NSNumber numberWithUnsignedChar:mRequest.index];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster selectInputWithParams:params
-                         completionHandler:^(NSError * _Nullable error) {
-                             responsesNeeded--;
-                             if (error != nil) {
-                                 mError = error;
-                                 LogNSError("Error", error);
-                             }
-                             if (responsesNeeded == 0) {
-                                 SetCommandExitStatus(mError);
-                             }
-                         }];
-        }
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributeMaxCompPressureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PumpConfigurationAndControl.MaxCompPressure response %@", [value description]);
+            if (error != nil) {
+                LogNSError("PumpConfigurationAndControl MaxCompPressure read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::MediaInput::Commands::SelectInput::Type mRequest;
 };
 
-/*
- * Command ShowInputStatus
- */
-class MediaInputShowInputStatus : public ClusterCommand {
+class SubscribeAttributePumpConfigurationAndControlMaxCompPressure : public SubscribeAttribute {
 public:
-    MediaInputShowInputStatus()
-        : ClusterCommand("show-input-status")
+    SubscribeAttributePumpConfigurationAndControlMaxCompPressure()
+        : SubscribeAttribute("max-comp-pressure")
     {
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributePumpConfigurationAndControlMaxCompPressure() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) command (0x00000001) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000006) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPMediaInputClusterShowInputStatusParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster showInputStatusWithParams:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 responsesNeeded--;
-                                 if (error != nil) {
-                                     mError = error;
-                                     LogNSError("Error", error);
-                                 }
-                                 if (responsesNeeded == 0) {
-                                     SetCommandExitStatus(mError);
-                                 }
-                             }];
-        }
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeMaxCompPressureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.MaxCompPressure response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
 };
 
 /*
- * Command HideInputStatus
+ * Attribute MinConstSpeed
  */
-class MediaInputHideInputStatus : public ClusterCommand {
+class ReadPumpConfigurationAndControlMinConstSpeed : public ReadAttribute {
 public:
-    MediaInputHideInputStatus()
-        : ClusterCommand("hide-input-status")
+    ReadPumpConfigurationAndControlMinConstSpeed()
+        : ReadAttribute("min-const-speed")
     {
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadPumpConfigurationAndControlMinConstSpeed() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) command (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000007) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPMediaInputClusterHideInputStatusParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster hideInputStatusWithParams:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 responsesNeeded--;
-                                 if (error != nil) {
-                                     mError = error;
-                                     LogNSError("Error", error);
-                                 }
-                                 if (responsesNeeded == 0) {
-                                     SetCommandExitStatus(mError);
-                                 }
-                             }];
-        }
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributeMinConstSpeedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PumpConfigurationAndControl.MinConstSpeed response %@", [value description]);
+            if (error != nil) {
+                LogNSError("PumpConfigurationAndControl MinConstSpeed read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
 };
 
-/*
- * Command RenameInput
- */
-class MediaInputRenameInput : public ClusterCommand {
+class SubscribeAttributePumpConfigurationAndControlMinConstSpeed : public SubscribeAttribute {
 public:
-    MediaInputRenameInput()
-        : ClusterCommand("rename-input")
+    SubscribeAttributePumpConfigurationAndControlMinConstSpeed()
+        : SubscribeAttribute("min-const-speed")
     {
-        AddArgument("Index", 0, UINT8_MAX, &mRequest.index);
-        AddArgument("Name", &mRequest.name);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributePumpConfigurationAndControlMinConstSpeed() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) command (0x00000003) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000007) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPMediaInputClusterRenameInputParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.index = [NSNumber numberWithUnsignedChar:mRequest.index];
-        params.name = [[NSString alloc] initWithBytes:mRequest.name.data()
-                                               length:mRequest.name.size()
-                                             encoding:NSUTF8StringEncoding];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster renameInputWithParams:params
-                         completionHandler:^(NSError * _Nullable error) {
-                             responsesNeeded--;
-                             if (error != nil) {
-                                 mError = error;
-                                 LogNSError("Error", error);
-                             }
-                             if (responsesNeeded == 0) {
-                                 SetCommandExitStatus(mError);
-                             }
-                         }];
-        }
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeMinConstSpeedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.MinConstSpeed response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::MediaInput::Commands::RenameInput::Type mRequest;
 };
 
 /*
- * Attribute InputList
+ * Attribute MaxConstSpeed
  */
-class ReadMediaInputInputList : public ReadAttribute {
+class ReadPumpConfigurationAndControlMaxConstSpeed : public ReadAttribute {
 public:
-    ReadMediaInputInputList()
-        : ReadAttribute("input-list")
+    ReadPumpConfigurationAndControlMaxConstSpeed()
+        : ReadAttribute("max-const-speed")
     {
     }
 
-    ~ReadMediaInputInputList() {}
+    ~ReadPumpConfigurationAndControlMaxConstSpeed() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000008) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeInputListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MediaInput.InputList response %@", [value description]);
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributeMaxConstSpeedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PumpConfigurationAndControl.MaxConstSpeed response %@", [value description]);
             if (error != nil) {
-                LogNSError("MediaInput InputList read Error", error);
+                LogNSError("PumpConfigurationAndControl MaxConstSpeed read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -45404,32 +44690,34 @@ class ReadMediaInputInputList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMediaInputInputList : public SubscribeAttribute {
+class SubscribeAttributePumpConfigurationAndControlMaxConstSpeed : public SubscribeAttribute {
 public:
-    SubscribeAttributeMediaInputInputList()
-        : SubscribeAttribute("input-list")
+    SubscribeAttributePumpConfigurationAndControlMaxConstSpeed()
+        : SubscribeAttribute("max-const-speed")
     {
     }
 
-    ~SubscribeAttributeMediaInputInputList() {}
+    ~SubscribeAttributePumpConfigurationAndControlMaxConstSpeed() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000008) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInputListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMaxConstSpeedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MediaInput.InputList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.MaxConstSpeed response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -45440,27 +44728,29 @@ class SubscribeAttributeMediaInputInputList : public SubscribeAttribute {
 };
 
 /*
- * Attribute CurrentInput
+ * Attribute MinConstFlow
  */
-class ReadMediaInputCurrentInput : public ReadAttribute {
+class ReadPumpConfigurationAndControlMinConstFlow : public ReadAttribute {
 public:
-    ReadMediaInputCurrentInput()
-        : ReadAttribute("current-input")
+    ReadPumpConfigurationAndControlMinConstFlow()
+        : ReadAttribute("min-const-flow")
     {
     }
 
-    ~ReadMediaInputCurrentInput() {}
+    ~ReadPumpConfigurationAndControlMinConstFlow() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000009) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCurrentInputWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MediaInput.CurrentInput response %@", [value description]);
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributeMinConstFlowWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PumpConfigurationAndControl.MinConstFlow response %@", [value description]);
             if (error != nil) {
-                LogNSError("MediaInput CurrentInput read Error", error);
+                LogNSError("PumpConfigurationAndControl MinConstFlow read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -45468,32 +44758,34 @@ class ReadMediaInputCurrentInput : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMediaInputCurrentInput : public SubscribeAttribute {
+class SubscribeAttributePumpConfigurationAndControlMinConstFlow : public SubscribeAttribute {
 public:
-    SubscribeAttributeMediaInputCurrentInput()
-        : SubscribeAttribute("current-input")
+    SubscribeAttributePumpConfigurationAndControlMinConstFlow()
+        : SubscribeAttribute("min-const-flow")
     {
     }
 
-    ~SubscribeAttributeMediaInputCurrentInput() {}
+    ~SubscribeAttributePumpConfigurationAndControlMinConstFlow() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000009) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentInputWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMinConstFlowWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MediaInput.CurrentInput response %@", [value description]);
+                NSLog(@"PumpConfigurationAndControl.MinConstFlow response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -45504,27 +44796,29 @@ class SubscribeAttributeMediaInputCurrentInput : public SubscribeAttribute {
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute MaxConstFlow
  */
-class ReadMediaInputGeneratedCommandList : public ReadAttribute {
+class ReadPumpConfigurationAndControlMaxConstFlow : public ReadAttribute {
 public:
-    ReadMediaInputGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadPumpConfigurationAndControlMaxConstFlow()
+        : ReadAttribute("max-const-flow")
     {
     }
 
-    ~ReadMediaInputGeneratedCommandList() {}
+    ~ReadPumpConfigurationAndControlMaxConstFlow() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x0000000A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MediaInput.GeneratedCommandList response %@", [value description]);
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributeMaxConstFlowWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PumpConfigurationAndControl.MaxConstFlow response %@", [value description]);
             if (error != nil) {
-                LogNSError("MediaInput GeneratedCommandList read Error", error);
+                LogNSError("PumpConfigurationAndControl MaxConstFlow read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -45532,32 +44826,34 @@ class ReadMediaInputGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMediaInputGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributePumpConfigurationAndControlMaxConstFlow : public SubscribeAttribute {
 public:
-    SubscribeAttributeMediaInputGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributePumpConfigurationAndControlMaxConstFlow()
+        : SubscribeAttribute("max-const-flow")
     {
     }
 
-    ~SubscribeAttributeMediaInputGeneratedCommandList() {}
+    ~SubscribeAttributePumpConfigurationAndControlMaxConstFlow() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x0000000A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMaxConstFlowWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MediaInput.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.MaxConstFlow response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -45568,27 +44864,29 @@ class SubscribeAttributeMediaInputGeneratedCommandList : public SubscribeAttribu
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute MinConstTemp
  */
-class ReadMediaInputAcceptedCommandList : public ReadAttribute {
+class ReadPumpConfigurationAndControlMinConstTemp : public ReadAttribute {
 public:
-    ReadMediaInputAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadPumpConfigurationAndControlMinConstTemp()
+        : ReadAttribute("min-const-temp")
     {
     }
 
-    ~ReadMediaInputAcceptedCommandList() {}
+    ~ReadPumpConfigurationAndControlMinConstTemp() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x0000000B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MediaInput.AcceptedCommandList response %@", [value description]);
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributeMinConstTempWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PumpConfigurationAndControl.MinConstTemp response %@", [value description]);
             if (error != nil) {
-                LogNSError("MediaInput AcceptedCommandList read Error", error);
+                LogNSError("PumpConfigurationAndControl MinConstTemp read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -45596,32 +44894,34 @@ class ReadMediaInputAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMediaInputAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributePumpConfigurationAndControlMinConstTemp : public SubscribeAttribute {
 public:
-    SubscribeAttributeMediaInputAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributePumpConfigurationAndControlMinConstTemp()
+        : SubscribeAttribute("min-const-temp")
     {
     }
 
-    ~SubscribeAttributeMediaInputAcceptedCommandList() {}
+    ~SubscribeAttributePumpConfigurationAndControlMinConstTemp() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x0000000B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMinConstTempWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MediaInput.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.MinConstTemp response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -45632,27 +44932,29 @@ class SubscribeAttributeMediaInputAcceptedCommandList : public SubscribeAttribut
 };
 
 /*
- * Attribute AttributeList
+ * Attribute MaxConstTemp
  */
-class ReadMediaInputAttributeList : public ReadAttribute {
+class ReadPumpConfigurationAndControlMaxConstTemp : public ReadAttribute {
 public:
-    ReadMediaInputAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadPumpConfigurationAndControlMaxConstTemp()
+        : ReadAttribute("max-const-temp")
     {
     }
 
-    ~ReadMediaInputAttributeList() {}
+    ~ReadPumpConfigurationAndControlMaxConstTemp() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x0000000C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MediaInput.AttributeList response %@", [value description]);
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributeMaxConstTempWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PumpConfigurationAndControl.MaxConstTemp response %@", [value description]);
             if (error != nil) {
-                LogNSError("MediaInput AttributeList read Error", error);
+                LogNSError("PumpConfigurationAndControl MaxConstTemp read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -45660,32 +44962,34 @@ class ReadMediaInputAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMediaInputAttributeList : public SubscribeAttribute {
+class SubscribeAttributePumpConfigurationAndControlMaxConstTemp : public SubscribeAttribute {
 public:
-    SubscribeAttributeMediaInputAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributePumpConfigurationAndControlMaxConstTemp()
+        : SubscribeAttribute("max-const-temp")
     {
     }
 
-    ~SubscribeAttributeMediaInputAttributeList() {}
+    ~SubscribeAttributePumpConfigurationAndControlMaxConstTemp() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x0000000C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMaxConstTempWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MediaInput.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.MaxConstTemp response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -45696,27 +45000,29 @@ class SubscribeAttributeMediaInputAttributeList : public SubscribeAttribute {
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute PumpStatus
  */
-class ReadMediaInputFeatureMap : public ReadAttribute {
+class ReadPumpConfigurationAndControlPumpStatus : public ReadAttribute {
 public:
-    ReadMediaInputFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadPumpConfigurationAndControlPumpStatus()
+        : ReadAttribute("pump-status")
     {
     }
 
-    ~ReadMediaInputFeatureMap() {}
+    ~ReadPumpConfigurationAndControlPumpStatus() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000010) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MediaInput.FeatureMap response %@", [value description]);
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributePumpStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PumpConfigurationAndControl.PumpStatus response %@", [value description]);
             if (error != nil) {
-                LogNSError("MediaInput FeatureMap read Error", error);
+                LogNSError("PumpConfigurationAndControl PumpStatus read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -45724,32 +45030,34 @@ class ReadMediaInputFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMediaInputFeatureMap : public SubscribeAttribute {
+class SubscribeAttributePumpConfigurationAndControlPumpStatus : public SubscribeAttribute {
 public:
-    SubscribeAttributeMediaInputFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributePumpConfigurationAndControlPumpStatus()
+        : SubscribeAttribute("pump-status")
     {
     }
 
-    ~SubscribeAttributeMediaInputFeatureMap() {}
+    ~SubscribeAttributePumpConfigurationAndControlPumpStatus() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000010) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePumpStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MediaInput.FeatureMap response %@", [value description]);
+                NSLog(@"PumpConfigurationAndControl.PumpStatus response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -45760,27 +45068,29 @@ class SubscribeAttributeMediaInputFeatureMap : public SubscribeAttribute {
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute EffectiveOperationMode
  */
-class ReadMediaInputClusterRevision : public ReadAttribute {
+class ReadPumpConfigurationAndControlEffectiveOperationMode : public ReadAttribute {
 public:
-    ReadMediaInputClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadPumpConfigurationAndControlEffectiveOperationMode()
+        : ReadAttribute("effective-operation-mode")
     {
     }
 
-    ~ReadMediaInputClusterRevision() {}
+    ~ReadPumpConfigurationAndControlEffectiveOperationMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000011) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MediaInput.ClusterRevision response %@", [value description]);
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributeEffectiveOperationModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PumpConfigurationAndControl.EffectiveOperationMode response %@", [value description]);
             if (error != nil) {
-                LogNSError("MediaInput ClusterRevision read Error", error);
+                LogNSError("PumpConfigurationAndControl EffectiveOperationMode read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -45788,32 +45098,34 @@ class ReadMediaInputClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMediaInputClusterRevision : public SubscribeAttribute {
+class SubscribeAttributePumpConfigurationAndControlEffectiveOperationMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeMediaInputClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributePumpConfigurationAndControlEffectiveOperationMode()
+        : SubscribeAttribute("effective-operation-mode")
     {
     }
 
-    ~SubscribeAttributeMediaInputClusterRevision() {}
+    ~SubscribeAttributePumpConfigurationAndControlEffectiveOperationMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000011) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeEffectiveOperationModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MediaInput.ClusterRevision response %@", [value description]);
+                NSLog(@"PumpConfigurationAndControl.EffectiveOperationMode response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -45823,576 +45135,310 @@ class SubscribeAttributeMediaInputClusterRevision : public SubscribeAttribute {
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster MediaPlayback                                               | 0x0506 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * Play                                                              |   0x00 |
-| * Pause                                                             |   0x01 |
-| * StopPlayback                                                      |   0x02 |
-| * StartOver                                                         |   0x03 |
-| * Previous                                                          |   0x04 |
-| * Next                                                              |   0x05 |
-| * Rewind                                                            |   0x06 |
-| * FastForward                                                       |   0x07 |
-| * SkipForward                                                       |   0x08 |
-| * SkipBackward                                                      |   0x09 |
-| * Seek                                                              |   0x0B |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * CurrentState                                                      | 0x0000 |
-| * StartTime                                                         | 0x0001 |
-| * Duration                                                          | 0x0002 |
-| * SampledPosition                                                   | 0x0003 |
-| * PlaybackSpeed                                                     | 0x0004 |
-| * SeekRangeEnd                                                      | 0x0005 |
-| * SeekRangeStart                                                    | 0x0006 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command Play
+ * Attribute EffectiveControlMode
  */
-class MediaPlaybackPlay : public ClusterCommand {
+class ReadPumpConfigurationAndControlEffectiveControlMode : public ReadAttribute {
 public:
-    MediaPlaybackPlay()
-        : ClusterCommand("play")
+    ReadPumpConfigurationAndControlEffectiveControlMode()
+        : ReadAttribute("effective-control-mode")
     {
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadPumpConfigurationAndControlEffectiveControlMode() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000012) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPMediaPlaybackClusterPlayParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster
-                   playWithParams:params
-                completionHandler:^(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                    NSLog(@"Values: %@", values);
-                    responsesNeeded--;
-                    if (error != nil) {
-                        mError = error;
-                        LogNSError("Error", error);
-                    }
-                    if (responsesNeeded == 0) {
-                        SetCommandExitStatus(mError);
-                    }
-                }];
-        }
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributeEffectiveControlModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PumpConfigurationAndControl.EffectiveControlMode response %@", [value description]);
+            if (error != nil) {
+                LogNSError("PumpConfigurationAndControl EffectiveControlMode read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
 };
 
-/*
- * Command Pause
- */
-class MediaPlaybackPause : public ClusterCommand {
+class SubscribeAttributePumpConfigurationAndControlEffectiveControlMode : public SubscribeAttribute {
 public:
-    MediaPlaybackPause()
-        : ClusterCommand("pause")
+    SubscribeAttributePumpConfigurationAndControlEffectiveControlMode()
+        : SubscribeAttribute("effective-control-mode")
     {
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributePumpConfigurationAndControlEffectiveControlMode() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000001) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000012) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPMediaPlaybackClusterPauseParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster
-                  pauseWithParams:params
-                completionHandler:^(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                    NSLog(@"Values: %@", values);
-                    responsesNeeded--;
-                    if (error != nil) {
-                        mError = error;
-                        LogNSError("Error", error);
-                    }
-                    if (responsesNeeded == 0) {
-                        SetCommandExitStatus(mError);
-                    }
-                }];
-        }
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeEffectiveControlModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.EffectiveControlMode response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
 };
 
 /*
- * Command StopPlayback
+ * Attribute Capacity
  */
-class MediaPlaybackStopPlayback : public ClusterCommand {
+class ReadPumpConfigurationAndControlCapacity : public ReadAttribute {
 public:
-    MediaPlaybackStopPlayback()
-        : ClusterCommand("stop-playback")
+    ReadPumpConfigurationAndControlCapacity()
+        : ReadAttribute("capacity")
     {
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadPumpConfigurationAndControlCapacity() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000013) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPMediaPlaybackClusterStopPlaybackParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster stopPlaybackWithParams:params
-                          completionHandler:^(
-                              CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                              NSLog(@"Values: %@", values);
-                              responsesNeeded--;
-                              if (error != nil) {
-                                  mError = error;
-                                  LogNSError("Error", error);
-                              }
-                              if (responsesNeeded == 0) {
-                                  SetCommandExitStatus(mError);
-                              }
-                          }];
-        }
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributeCapacityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PumpConfigurationAndControl.Capacity response %@", [value description]);
+            if (error != nil) {
+                LogNSError("PumpConfigurationAndControl Capacity read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
 };
 
-/*
- * Command StartOver
- */
-class MediaPlaybackStartOver : public ClusterCommand {
+class SubscribeAttributePumpConfigurationAndControlCapacity : public SubscribeAttribute {
 public:
-    MediaPlaybackStartOver()
-        : ClusterCommand("start-over")
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    SubscribeAttributePumpConfigurationAndControlCapacity()
+        : SubscribeAttribute("capacity")
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000003) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPMediaPlaybackClusterStartOverParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster startOverWithParams:params
-                       completionHandler:^(
-                           CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                           NSLog(@"Values: %@", values);
-                           responsesNeeded--;
-                           if (error != nil) {
-                               mError = error;
-                               LogNSError("Error", error);
-                           }
-                           if (responsesNeeded == 0) {
-                               SetCommandExitStatus(mError);
-                           }
-                       }];
-        }
-        return CHIP_NO_ERROR;
     }
 
-private:
-};
-
-/*
- * Command Previous
- */
-class MediaPlaybackPrevious : public ClusterCommand {
-public:
-    MediaPlaybackPrevious()
-        : ClusterCommand("previous")
-    {
-        ClusterCommand::AddArguments();
-    }
+    ~SubscribeAttributePumpConfigurationAndControlCapacity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000004) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000013) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPMediaPlaybackClusterPreviousParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster
-                previousWithParams:params
-                 completionHandler:^(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                     NSLog(@"Values: %@", values);
-                     responsesNeeded--;
-                     if (error != nil) {
-                         mError = error;
-                         LogNSError("Error", error);
-                     }
-                     if (responsesNeeded == 0) {
-                         SetCommandExitStatus(mError);
-                     }
-                 }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-};
-
-/*
- * Command Next
- */
-class MediaPlaybackNext : public ClusterCommand {
-public:
-    MediaPlaybackNext()
-        : ClusterCommand("next")
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000005) on endpoint %u", endpointId);
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeCapacityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.Capacity response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPMediaPlaybackClusterNextParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster
-                   nextWithParams:params
-                completionHandler:^(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                    NSLog(@"Values: %@", values);
-                    responsesNeeded--;
-                    if (error != nil) {
-                        mError = error;
-                        LogNSError("Error", error);
-                    }
-                    if (responsesNeeded == 0) {
-                        SetCommandExitStatus(mError);
-                    }
-                }];
-        }
         return CHIP_NO_ERROR;
     }
-
-private:
 };
 
 /*
- * Command Rewind
+ * Attribute Speed
  */
-class MediaPlaybackRewind : public ClusterCommand {
+class ReadPumpConfigurationAndControlSpeed : public ReadAttribute {
 public:
-    MediaPlaybackRewind()
-        : ClusterCommand("rewind")
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    ReadPumpConfigurationAndControlSpeed()
+        : ReadAttribute("speed")
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000006) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPMediaPlaybackClusterRewindParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster
-                 rewindWithParams:params
-                completionHandler:^(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                    NSLog(@"Values: %@", values);
-                    responsesNeeded--;
-                    if (error != nil) {
-                        mError = error;
-                        LogNSError("Error", error);
-                    }
-                    if (responsesNeeded == 0) {
-                        SetCommandExitStatus(mError);
-                    }
-                }];
-        }
-        return CHIP_NO_ERROR;
     }
 
-private:
-};
-
-/*
- * Command FastForward
- */
-class MediaPlaybackFastForward : public ClusterCommand {
-public:
-    MediaPlaybackFastForward()
-        : ClusterCommand("fast-forward")
-    {
-        ClusterCommand::AddArguments();
-    }
+    ~ReadPumpConfigurationAndControlSpeed() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000014) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPMediaPlaybackClusterFastForwardParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster fastForwardWithParams:params
-                         completionHandler:^(
-                             CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                             NSLog(@"Values: %@", values);
-                             responsesNeeded--;
-                             if (error != nil) {
-                                 mError = error;
-                                 LogNSError("Error", error);
-                             }
-                             if (responsesNeeded == 0) {
-                                 SetCommandExitStatus(mError);
-                             }
-                         }];
-        }
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributeSpeedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PumpConfigurationAndControl.Speed response %@", [value description]);
+            if (error != nil) {
+                LogNSError("PumpConfigurationAndControl Speed read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
 };
 
-/*
- * Command SkipForward
- */
-class MediaPlaybackSkipForward : public ClusterCommand {
+class SubscribeAttributePumpConfigurationAndControlSpeed : public SubscribeAttribute {
 public:
-    MediaPlaybackSkipForward()
-        : ClusterCommand("skip-forward")
+    SubscribeAttributePumpConfigurationAndControlSpeed()
+        : SubscribeAttribute("speed")
     {
-        AddArgument("DeltaPositionMilliseconds", 0, UINT64_MAX, &mRequest.deltaPositionMilliseconds);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributePumpConfigurationAndControlSpeed() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000008) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000014) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPMediaPlaybackClusterSkipForwardParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.deltaPositionMilliseconds = [NSNumber numberWithUnsignedLongLong:mRequest.deltaPositionMilliseconds];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster skipForwardWithParams:params
-                         completionHandler:^(
-                             CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                             NSLog(@"Values: %@", values);
-                             responsesNeeded--;
-                             if (error != nil) {
-                                 mError = error;
-                                 LogNSError("Error", error);
-                             }
-                             if (responsesNeeded == 0) {
-                                 SetCommandExitStatus(mError);
-                             }
-                         }];
-        }
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeSpeedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PumpConfigurationAndControl.Speed response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::MediaPlayback::Commands::SkipForward::Type mRequest;
 };
 
 /*
- * Command SkipBackward
+ * Attribute LifetimeRunningHours
  */
-class MediaPlaybackSkipBackward : public ClusterCommand {
+class ReadPumpConfigurationAndControlLifetimeRunningHours : public ReadAttribute {
 public:
-    MediaPlaybackSkipBackward()
-        : ClusterCommand("skip-backward")
+    ReadPumpConfigurationAndControlLifetimeRunningHours()
+        : ReadAttribute("lifetime-running-hours")
     {
-        AddArgument("DeltaPositionMilliseconds", 0, UINT64_MAX, &mRequest.deltaPositionMilliseconds);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadPumpConfigurationAndControlLifetimeRunningHours() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000015) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPMediaPlaybackClusterSkipBackwardParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.deltaPositionMilliseconds = [NSNumber numberWithUnsignedLongLong:mRequest.deltaPositionMilliseconds];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster skipBackwardWithParams:params
-                          completionHandler:^(
-                              CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                              NSLog(@"Values: %@", values);
-                              responsesNeeded--;
-                              if (error != nil) {
-                                  mError = error;
-                                  LogNSError("Error", error);
-                              }
-                              if (responsesNeeded == 0) {
-                                  SetCommandExitStatus(mError);
-                              }
-                          }];
-        }
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributeLifetimeRunningHoursWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PumpConfigurationAndControl.LifetimeRunningHours response %@", [value description]);
+            if (error != nil) {
+                LogNSError("PumpConfigurationAndControl LifetimeRunningHours read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::MediaPlayback::Commands::SkipBackward::Type mRequest;
 };
 
-/*
- * Command Seek
- */
-class MediaPlaybackSeek : public ClusterCommand {
+class WritePumpConfigurationAndControlLifetimeRunningHours : public WriteAttribute {
 public:
-    MediaPlaybackSeek()
-        : ClusterCommand("seek")
+    WritePumpConfigurationAndControlLifetimeRunningHours()
+        : WriteAttribute("lifetime-running-hours")
     {
-        AddArgument("Position", 0, UINT64_MAX, &mRequest.position);
-        ClusterCommand::AddArguments();
+        AddArgument("attr-name", "lifetime-running-hours");
+        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
+    ~WritePumpConfigurationAndControlLifetimeRunningHours() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x0000000B) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) WriteAttribute (0x00000015) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPMediaPlaybackClusterSeekParams alloc] init];
-        params.timedInvokeTimeoutMs
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.position = [NSNumber numberWithUnsignedLongLong:mRequest.position];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster
-                   seekWithParams:params
-                completionHandler:^(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                    NSLog(@"Values: %@", values);
-                    responsesNeeded--;
-                    if (error != nil) {
-                        mError = error;
-                        LogNSError("Error", error);
-                    }
-                    if (responsesNeeded == 0) {
-                        SetCommandExitStatus(mError);
-                    }
-                }];
-        }
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedInt:mValue];
+
+        [cluster
+            writeAttributeLifetimeRunningHoursWithValue:value
+                                                 params:params
+                                      completionHandler:^(NSError * _Nullable error) {
+                                          if (error != nil) {
+                                              LogNSError("PumpConfigurationAndControl LifetimeRunningHours write Error", error);
+                                          }
+                                          SetCommandExitStatus(error);
+                                      }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::MediaPlayback::Commands::Seek::Type mRequest;
-};
-
-/*
- * Attribute CurrentState
- */
-class ReadMediaPlaybackCurrentState : public ReadAttribute {
-public:
-    ReadMediaPlaybackCurrentState()
-        : ReadAttribute("current-state")
-    {
-    }
-
-    ~ReadMediaPlaybackCurrentState() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReadAttribute (0x00000000) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCurrentStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MediaPlayback.CurrentState response %@", [value description]);
-            if (error != nil) {
-                LogNSError("MediaPlayback CurrentState read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
+    uint32_t mValue;
 };
 
-class SubscribeAttributeMediaPlaybackCurrentState : public SubscribeAttribute {
+class SubscribeAttributePumpConfigurationAndControlLifetimeRunningHours : public SubscribeAttribute {
 public:
-    SubscribeAttributeMediaPlaybackCurrentState()
-        : SubscribeAttribute("current-state")
+    SubscribeAttributePumpConfigurationAndControlLifetimeRunningHours()
+        : SubscribeAttribute("lifetime-running-hours")
     {
     }
 
-    ~SubscribeAttributeMediaPlaybackCurrentState() {}
+    ~SubscribeAttributePumpConfigurationAndControlLifetimeRunningHours() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000015) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeLifetimeRunningHoursWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MediaPlayback.CurrentState response %@", [value description]);
+                NSLog(@"PumpConfigurationAndControl.LifetimeRunningHours response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -46403,27 +45449,29 @@ class SubscribeAttributeMediaPlaybackCurrentState : public SubscribeAttribute {
 };
 
 /*
- * Attribute StartTime
+ * Attribute Power
  */
-class ReadMediaPlaybackStartTime : public ReadAttribute {
+class ReadPumpConfigurationAndControlPower : public ReadAttribute {
 public:
-    ReadMediaPlaybackStartTime()
-        : ReadAttribute("start-time")
+    ReadPumpConfigurationAndControlPower()
+        : ReadAttribute("power")
     {
     }
 
-    ~ReadMediaPlaybackStartTime() {}
+    ~ReadPumpConfigurationAndControlPower() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000016) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeStartTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MediaPlayback.StartTime response %@", [value description]);
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributePowerWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PumpConfigurationAndControl.Power response %@", [value description]);
             if (error != nil) {
-                LogNSError("MediaPlayback StartTime read Error", error);
+                LogNSError("PumpConfigurationAndControl Power read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -46431,32 +45479,34 @@ class ReadMediaPlaybackStartTime : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMediaPlaybackStartTime : public SubscribeAttribute {
+class SubscribeAttributePumpConfigurationAndControlPower : public SubscribeAttribute {
 public:
-    SubscribeAttributeMediaPlaybackStartTime()
-        : SubscribeAttribute("start-time")
+    SubscribeAttributePumpConfigurationAndControlPower()
+        : SubscribeAttribute("power")
     {
     }
 
-    ~SubscribeAttributeMediaPlaybackStartTime() {}
+    ~SubscribeAttributePumpConfigurationAndControlPower() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000016) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeStartTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MediaPlayback.StartTime response %@", [value description]);
+                NSLog(@"PumpConfigurationAndControl.Power response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -46467,27 +45517,29 @@ class SubscribeAttributeMediaPlaybackStartTime : public SubscribeAttribute {
 };
 
 /*
- * Attribute Duration
+ * Attribute LifetimeEnergyConsumed
  */
-class ReadMediaPlaybackDuration : public ReadAttribute {
+class ReadPumpConfigurationAndControlLifetimeEnergyConsumed : public ReadAttribute {
 public:
-    ReadMediaPlaybackDuration()
-        : ReadAttribute("duration")
+    ReadPumpConfigurationAndControlLifetimeEnergyConsumed()
+        : ReadAttribute("lifetime-energy-consumed")
     {
     }
 
-    ~ReadMediaPlaybackDuration() {}
+    ~ReadPumpConfigurationAndControlLifetimeEnergyConsumed() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000017) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeDurationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MediaPlayback.Duration response %@", [value description]);
-            if (error != nil) {
-                LogNSError("MediaPlayback Duration read Error", error);
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributeLifetimeEnergyConsumedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PumpConfigurationAndControl.LifetimeEnergyConsumed response %@", [value description]);
+            if (error != nil) {
+                LogNSError("PumpConfigurationAndControl LifetimeEnergyConsumed read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -46495,32 +45547,75 @@ class ReadMediaPlaybackDuration : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMediaPlaybackDuration : public SubscribeAttribute {
+class WritePumpConfigurationAndControlLifetimeEnergyConsumed : public WriteAttribute {
 public:
-    SubscribeAttributeMediaPlaybackDuration()
-        : SubscribeAttribute("duration")
+    WritePumpConfigurationAndControlLifetimeEnergyConsumed()
+        : WriteAttribute("lifetime-energy-consumed")
     {
+        AddArgument("attr-name", "lifetime-energy-consumed");
+        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeMediaPlaybackDuration() {}
+    ~WritePumpConfigurationAndControlLifetimeEnergyConsumed() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) WriteAttribute (0x00000017) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedInt:mValue];
+
+        [cluster
+            writeAttributeLifetimeEnergyConsumedWithValue:value
+                                                   params:params
+                                        completionHandler:^(NSError * _Nullable error) {
+                                            if (error != nil) {
+                                                LogNSError("PumpConfigurationAndControl LifetimeEnergyConsumed write Error", error);
+                                            }
+                                            SetCommandExitStatus(error);
+                                        }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint32_t mValue;
+};
+
+class SubscribeAttributePumpConfigurationAndControlLifetimeEnergyConsumed : public SubscribeAttribute {
+public:
+    SubscribeAttributePumpConfigurationAndControlLifetimeEnergyConsumed()
+        : SubscribeAttribute("lifetime-energy-consumed")
+    {
+    }
+
+    ~SubscribeAttributePumpConfigurationAndControlLifetimeEnergyConsumed() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000017) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDurationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeLifetimeEnergyConsumedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MediaPlayback.Duration response %@", [value description]);
+                NSLog(@"PumpConfigurationAndControl.LifetimeEnergyConsumed response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -46531,28 +45626,29 @@ class SubscribeAttributeMediaPlaybackDuration : public SubscribeAttribute {
 };
 
 /*
- * Attribute SampledPosition
+ * Attribute OperationMode
  */
-class ReadMediaPlaybackSampledPosition : public ReadAttribute {
+class ReadPumpConfigurationAndControlOperationMode : public ReadAttribute {
 public:
-    ReadMediaPlaybackSampledPosition()
-        : ReadAttribute("sampled-position")
+    ReadPumpConfigurationAndControlOperationMode()
+        : ReadAttribute("operation-mode")
     {
     }
 
-    ~ReadMediaPlaybackSampledPosition() {}
+    ~ReadPumpConfigurationAndControlOperationMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000020) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeSampledPositionWithCompletionHandler:^(
-            CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MediaPlayback.SampledPosition response %@", [value description]);
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributeOperationModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PumpConfigurationAndControl.OperationMode response %@", [value description]);
             if (error != nil) {
-                LogNSError("MediaPlayback SampledPosition read Error", error);
+                LogNSError("PumpConfigurationAndControl OperationMode read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -46560,96 +45656,74 @@ class ReadMediaPlaybackSampledPosition : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMediaPlaybackSampledPosition : public SubscribeAttribute {
+class WritePumpConfigurationAndControlOperationMode : public WriteAttribute {
 public:
-    SubscribeAttributeMediaPlaybackSampledPosition()
-        : SubscribeAttribute("sampled-position")
+    WritePumpConfigurationAndControlOperationMode()
+        : WriteAttribute("operation-mode")
     {
+        AddArgument("attr-name", "operation-mode");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeMediaPlaybackSampledPosition() {}
+    ~WritePumpConfigurationAndControlOperationMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) WriteAttribute (0x00000020) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSampledPositionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MediaPlayback.SampledPosition response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
 
+        [cluster writeAttributeOperationModeWithValue:value
+                                               params:params
+                                    completionHandler:^(NSError * _Nullable error) {
+                                        if (error != nil) {
+                                            LogNSError("PumpConfigurationAndControl OperationMode write Error", error);
+                                        }
+                                        SetCommandExitStatus(error);
+                                    }];
         return CHIP_NO_ERROR;
     }
-};
-
-/*
- * Attribute PlaybackSpeed
- */
-class ReadMediaPlaybackPlaybackSpeed : public ReadAttribute {
-public:
-    ReadMediaPlaybackPlaybackSpeed()
-        : ReadAttribute("playback-speed")
-    {
-    }
-
-    ~ReadMediaPlaybackPlaybackSpeed() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributePlaybackSpeedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MediaPlayback.PlaybackSpeed response %@", [value description]);
-            if (error != nil) {
-                LogNSError("MediaPlayback PlaybackSpeed read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
+private:
+    uint8_t mValue;
 };
 
-class SubscribeAttributeMediaPlaybackPlaybackSpeed : public SubscribeAttribute {
+class SubscribeAttributePumpConfigurationAndControlOperationMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeMediaPlaybackPlaybackSpeed()
-        : SubscribeAttribute("playback-speed")
+    SubscribeAttributePumpConfigurationAndControlOperationMode()
+        : SubscribeAttribute("operation-mode")
     {
     }
 
-    ~SubscribeAttributeMediaPlaybackPlaybackSpeed() {}
+    ~SubscribeAttributePumpConfigurationAndControlOperationMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000020) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePlaybackSpeedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOperationModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MediaPlayback.PlaybackSpeed response %@", [value description]);
+                NSLog(@"PumpConfigurationAndControl.OperationMode response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -46660,27 +45734,29 @@ class SubscribeAttributeMediaPlaybackPlaybackSpeed : public SubscribeAttribute {
 };
 
 /*
- * Attribute SeekRangeEnd
+ * Attribute ControlMode
  */
-class ReadMediaPlaybackSeekRangeEnd : public ReadAttribute {
+class ReadPumpConfigurationAndControlControlMode : public ReadAttribute {
 public:
-    ReadMediaPlaybackSeekRangeEnd()
-        : ReadAttribute("seek-range-end")
+    ReadPumpConfigurationAndControlControlMode()
+        : ReadAttribute("control-mode")
     {
     }
 
-    ~ReadMediaPlaybackSeekRangeEnd() {}
+    ~ReadPumpConfigurationAndControlControlMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReadAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000021) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeSeekRangeEndWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MediaPlayback.SeekRangeEnd response %@", [value description]);
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributeControlModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PumpConfigurationAndControl.ControlMode response %@", [value description]);
             if (error != nil) {
-                LogNSError("MediaPlayback SeekRangeEnd read Error", error);
+                LogNSError("PumpConfigurationAndControl ControlMode read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -46688,96 +45764,74 @@ class ReadMediaPlaybackSeekRangeEnd : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMediaPlaybackSeekRangeEnd : public SubscribeAttribute {
+class WritePumpConfigurationAndControlControlMode : public WriteAttribute {
 public:
-    SubscribeAttributeMediaPlaybackSeekRangeEnd()
-        : SubscribeAttribute("seek-range-end")
+    WritePumpConfigurationAndControlControlMode()
+        : WriteAttribute("control-mode")
     {
+        AddArgument("attr-name", "control-mode");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeMediaPlaybackSeekRangeEnd() {}
+    ~WritePumpConfigurationAndControlControlMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) WriteAttribute (0x00000021) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSeekRangeEndWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MediaPlayback.SeekRangeEnd response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
 
+        [cluster writeAttributeControlModeWithValue:value
+                                             params:params
+                                  completionHandler:^(NSError * _Nullable error) {
+                                      if (error != nil) {
+                                          LogNSError("PumpConfigurationAndControl ControlMode write Error", error);
+                                      }
+                                      SetCommandExitStatus(error);
+                                  }];
         return CHIP_NO_ERROR;
     }
-};
-
-/*
- * Attribute SeekRangeStart
- */
-class ReadMediaPlaybackSeekRangeStart : public ReadAttribute {
-public:
-    ReadMediaPlaybackSeekRangeStart()
-        : ReadAttribute("seek-range-start")
-    {
-    }
-
-    ~ReadMediaPlaybackSeekRangeStart() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReadAttribute (0x00000006) on endpoint %u", endpointId);
 
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeSeekRangeStartWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MediaPlayback.SeekRangeStart response %@", [value description]);
-            if (error != nil) {
-                LogNSError("MediaPlayback SeekRangeStart read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
+private:
+    uint8_t mValue;
 };
 
-class SubscribeAttributeMediaPlaybackSeekRangeStart : public SubscribeAttribute {
+class SubscribeAttributePumpConfigurationAndControlControlMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeMediaPlaybackSeekRangeStart()
-        : SubscribeAttribute("seek-range-start")
+    SubscribeAttributePumpConfigurationAndControlControlMode()
+        : SubscribeAttribute("control-mode")
     {
     }
 
-    ~SubscribeAttributeMediaPlaybackSeekRangeStart() {}
+    ~SubscribeAttributePumpConfigurationAndControlControlMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReportAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000021) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSeekRangeStartWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeControlModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MediaPlayback.SeekRangeStart response %@", [value description]);
+                NSLog(@"PumpConfigurationAndControl.ControlMode response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -46790,25 +45844,27 @@ class SubscribeAttributeMediaPlaybackSeekRangeStart : public SubscribeAttribute
 /*
  * Attribute GeneratedCommandList
  */
-class ReadMediaPlaybackGeneratedCommandList : public ReadAttribute {
+class ReadPumpConfigurationAndControlGeneratedCommandList : public ReadAttribute {
 public:
-    ReadMediaPlaybackGeneratedCommandList()
+    ReadPumpConfigurationAndControlGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadMediaPlaybackGeneratedCommandList() {}
+    ~ReadPumpConfigurationAndControlGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MediaPlayback.GeneratedCommandList response %@", [value description]);
+            NSLog(@"PumpConfigurationAndControl.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("MediaPlayback GeneratedCommandList read Error", error);
+                LogNSError("PumpConfigurationAndControl GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -46816,20 +45872,22 @@ class ReadMediaPlaybackGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMediaPlaybackGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributePumpConfigurationAndControlGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeMediaPlaybackGeneratedCommandList()
+    SubscribeAttributePumpConfigurationAndControlGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeMediaPlaybackGeneratedCommandList() {}
+    ~SubscribeAttributePumpConfigurationAndControlGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -46841,7 +45899,7 @@ class SubscribeAttributeMediaPlaybackGeneratedCommandList : public SubscribeAttr
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MediaPlayback.GeneratedCommandList response %@", [value description]);
+                NSLog(@"PumpConfigurationAndControl.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -46854,25 +45912,27 @@ class SubscribeAttributeMediaPlaybackGeneratedCommandList : public SubscribeAttr
 /*
  * Attribute AcceptedCommandList
  */
-class ReadMediaPlaybackAcceptedCommandList : public ReadAttribute {
+class ReadPumpConfigurationAndControlAcceptedCommandList : public ReadAttribute {
 public:
-    ReadMediaPlaybackAcceptedCommandList()
+    ReadPumpConfigurationAndControlAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadMediaPlaybackAcceptedCommandList() {}
+    ~ReadPumpConfigurationAndControlAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MediaPlayback.AcceptedCommandList response %@", [value description]);
+            NSLog(@"PumpConfigurationAndControl.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("MediaPlayback AcceptedCommandList read Error", error);
+                LogNSError("PumpConfigurationAndControl AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -46880,20 +45940,22 @@ class ReadMediaPlaybackAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMediaPlaybackAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributePumpConfigurationAndControlAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeMediaPlaybackAcceptedCommandList()
+    SubscribeAttributePumpConfigurationAndControlAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeMediaPlaybackAcceptedCommandList() {}
+    ~SubscribeAttributePumpConfigurationAndControlAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -46905,7 +45967,7 @@ class SubscribeAttributeMediaPlaybackAcceptedCommandList : public SubscribeAttri
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MediaPlayback.AcceptedCommandList response %@", [value description]);
+                NSLog(@"PumpConfigurationAndControl.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -46918,25 +45980,27 @@ class SubscribeAttributeMediaPlaybackAcceptedCommandList : public SubscribeAttri
 /*
  * Attribute AttributeList
  */
-class ReadMediaPlaybackAttributeList : public ReadAttribute {
+class ReadPumpConfigurationAndControlAttributeList : public ReadAttribute {
 public:
-    ReadMediaPlaybackAttributeList()
+    ReadPumpConfigurationAndControlAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadMediaPlaybackAttributeList() {}
+    ~ReadPumpConfigurationAndControlAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MediaPlayback.AttributeList response %@", [value description]);
+            NSLog(@"PumpConfigurationAndControl.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("MediaPlayback AttributeList read Error", error);
+                LogNSError("PumpConfigurationAndControl AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -46944,20 +46008,22 @@ class ReadMediaPlaybackAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMediaPlaybackAttributeList : public SubscribeAttribute {
+class SubscribeAttributePumpConfigurationAndControlAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeMediaPlaybackAttributeList()
+    SubscribeAttributePumpConfigurationAndControlAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeMediaPlaybackAttributeList() {}
+    ~SubscribeAttributePumpConfigurationAndControlAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -46969,7 +46035,7 @@ class SubscribeAttributeMediaPlaybackAttributeList : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MediaPlayback.AttributeList response %@", [value description]);
+                NSLog(@"PumpConfigurationAndControl.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -46982,25 +46048,27 @@ class SubscribeAttributeMediaPlaybackAttributeList : public SubscribeAttribute {
 /*
  * Attribute FeatureMap
  */
-class ReadMediaPlaybackFeatureMap : public ReadAttribute {
+class ReadPumpConfigurationAndControlFeatureMap : public ReadAttribute {
 public:
-    ReadMediaPlaybackFeatureMap()
+    ReadPumpConfigurationAndControlFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadMediaPlaybackFeatureMap() {}
+    ~ReadPumpConfigurationAndControlFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MediaPlayback.FeatureMap response %@", [value description]);
+            NSLog(@"PumpConfigurationAndControl.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("MediaPlayback FeatureMap read Error", error);
+                LogNSError("PumpConfigurationAndControl FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -47008,20 +46076,22 @@ class ReadMediaPlaybackFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMediaPlaybackFeatureMap : public SubscribeAttribute {
+class SubscribeAttributePumpConfigurationAndControlFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeMediaPlaybackFeatureMap()
+    SubscribeAttributePumpConfigurationAndControlFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeMediaPlaybackFeatureMap() {}
+    ~SubscribeAttributePumpConfigurationAndControlFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -47033,7 +46103,7 @@ class SubscribeAttributeMediaPlaybackFeatureMap : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MediaPlayback.FeatureMap response %@", [value description]);
+                NSLog(@"PumpConfigurationAndControl.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -47046,25 +46116,27 @@ class SubscribeAttributeMediaPlaybackFeatureMap : public SubscribeAttribute {
 /*
  * Attribute ClusterRevision
  */
-class ReadMediaPlaybackClusterRevision : public ReadAttribute {
+class ReadPumpConfigurationAndControlClusterRevision : public ReadAttribute {
 public:
-    ReadMediaPlaybackClusterRevision()
+    ReadPumpConfigurationAndControlClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadMediaPlaybackClusterRevision() {}
+    ~ReadPumpConfigurationAndControlClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MediaPlayback.ClusterRevision response %@", [value description]);
+            NSLog(@"PumpConfigurationAndControl.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("MediaPlayback ClusterRevision read Error", error);
+                LogNSError("PumpConfigurationAndControl ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -47072,20 +46144,22 @@ class ReadMediaPlaybackClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMediaPlaybackClusterRevision : public SubscribeAttribute {
+class SubscribeAttributePumpConfigurationAndControlClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeMediaPlaybackClusterRevision()
+    SubscribeAttributePumpConfigurationAndControlClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeMediaPlaybackClusterRevision() {}
+    ~SubscribeAttributePumpConfigurationAndControlClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -47097,7 +46171,7 @@ class SubscribeAttributeMediaPlaybackClusterRevision : public SubscribeAttribute
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MediaPlayback.ClusterRevision response %@", [value description]);
+                NSLog(@"PumpConfigurationAndControl.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -47108,18 +46182,64 @@ class SubscribeAttributeMediaPlaybackClusterRevision : public SubscribeAttribute
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster ModeSelect                                                  | 0x0050 |
+| Cluster Thermostat                                                  | 0x0201 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * ChangeToMode                                                      |   0x00 |
+| * SetpointRaiseLower                                                |   0x00 |
+| * SetWeeklySchedule                                                 |   0x01 |
+| * GetWeeklySchedule                                                 |   0x02 |
+| * ClearWeeklySchedule                                               |   0x03 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * Description                                                       | 0x0000 |
-| * StandardNamespace                                                 | 0x0001 |
-| * SupportedModes                                                    | 0x0002 |
-| * CurrentMode                                                       | 0x0003 |
-| * StartUpMode                                                       | 0x0004 |
-| * OnMode                                                            | 0x0005 |
+| * LocalTemperature                                                  | 0x0000 |
+| * OutdoorTemperature                                                | 0x0001 |
+| * Occupancy                                                         | 0x0002 |
+| * AbsMinHeatSetpointLimit                                           | 0x0003 |
+| * AbsMaxHeatSetpointLimit                                           | 0x0004 |
+| * AbsMinCoolSetpointLimit                                           | 0x0005 |
+| * AbsMaxCoolSetpointLimit                                           | 0x0006 |
+| * PICoolingDemand                                                   | 0x0007 |
+| * PIHeatingDemand                                                   | 0x0008 |
+| * HVACSystemTypeConfiguration                                       | 0x0009 |
+| * LocalTemperatureCalibration                                       | 0x0010 |
+| * OccupiedCoolingSetpoint                                           | 0x0011 |
+| * OccupiedHeatingSetpoint                                           | 0x0012 |
+| * UnoccupiedCoolingSetpoint                                         | 0x0013 |
+| * UnoccupiedHeatingSetpoint                                         | 0x0014 |
+| * MinHeatSetpointLimit                                              | 0x0015 |
+| * MaxHeatSetpointLimit                                              | 0x0016 |
+| * MinCoolSetpointLimit                                              | 0x0017 |
+| * MaxCoolSetpointLimit                                              | 0x0018 |
+| * MinSetpointDeadBand                                               | 0x0019 |
+| * RemoteSensing                                                     | 0x001A |
+| * ControlSequenceOfOperation                                        | 0x001B |
+| * SystemMode                                                        | 0x001C |
+| * ThermostatRunningMode                                             | 0x001E |
+| * StartOfWeek                                                       | 0x0020 |
+| * NumberOfWeeklyTransitions                                         | 0x0021 |
+| * NumberOfDailyTransitions                                          | 0x0022 |
+| * TemperatureSetpointHold                                           | 0x0023 |
+| * TemperatureSetpointHoldDuration                                   | 0x0024 |
+| * ThermostatProgrammingOperationMode                                | 0x0025 |
+| * ThermostatRunningState                                            | 0x0029 |
+| * SetpointChangeSource                                              | 0x0030 |
+| * SetpointChangeAmount                                              | 0x0031 |
+| * SetpointChangeSourceTimestamp                                     | 0x0032 |
+| * OccupiedSetback                                                   | 0x0034 |
+| * OccupiedSetbackMin                                                | 0x0035 |
+| * OccupiedSetbackMax                                                | 0x0036 |
+| * UnoccupiedSetback                                                 | 0x0037 |
+| * UnoccupiedSetbackMin                                              | 0x0038 |
+| * UnoccupiedSetbackMax                                              | 0x0039 |
+| * EmergencyHeatDelta                                                | 0x003A |
+| * ACType                                                            | 0x0040 |
+| * ACCapacity                                                        | 0x0041 |
+| * ACRefrigerantType                                                 | 0x0042 |
+| * ACCompressorType                                                  | 0x0043 |
+| * ACErrorCode                                                       | 0x0044 |
+| * ACLouverPosition                                                  | 0x0045 |
+| * ACCoilTemperature                                                 | 0x0046 |
+| * ACCapacityformat                                                  | 0x0047 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -47130,135 +46250,235 @@ class SubscribeAttributeMediaPlaybackClusterRevision : public SubscribeAttribute
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command ChangeToMode
+ * Command SetpointRaiseLower
  */
-class ModeSelectChangeToMode : public ClusterCommand {
+class ThermostatSetpointRaiseLower : public ClusterCommand {
 public:
-    ModeSelectChangeToMode()
-        : ClusterCommand("change-to-mode")
+    ThermostatSetpointRaiseLower()
+        : ClusterCommand("setpoint-raise-lower")
     {
-        AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
+        AddArgument("Mode", 0, UINT8_MAX, &mRequest.mode);
+        AddArgument("Amount", INT8_MIN, INT8_MAX, &mRequest.amount);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000050) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPModeSelectClusterChangeToModeParams alloc] init];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPThermostatClusterSetpointRaiseLowerParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.newMode = [NSNumber numberWithUnsignedChar:mRequest.newMode];
+        params.mode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.mode)];
+        params.amount = [NSNumber numberWithChar:mRequest.amount];
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster changeToModeWithParams:params
-                          completionHandler:^(NSError * _Nullable error) {
-                              responsesNeeded--;
-                              if (error != nil) {
-                                  mError = error;
-                                  LogNSError("Error", error);
-                              }
-                              if (responsesNeeded == 0) {
-                                  SetCommandExitStatus(mError);
-                              }
-                          }];
+            [cluster setpointRaiseLowerWithParams:params
+                                completionHandler:^(NSError * _Nullable error) {
+                                    responsesNeeded--;
+                                    if (error != nil) {
+                                        mError = error;
+                                        LogNSError("Error", error);
+                                    }
+                                    if (responsesNeeded == 0) {
+                                        SetCommandExitStatus(mError);
+                                    }
+                                }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::ModeSelect::Commands::ChangeToMode::Type mRequest;
+    chip::app::Clusters::Thermostat::Commands::SetpointRaiseLower::Type mRequest;
 };
 
 /*
- * Attribute Description
+ * Command SetWeeklySchedule
  */
-class ReadModeSelectDescription : public ReadAttribute {
+class ThermostatSetWeeklySchedule : public ClusterCommand {
 public:
-    ReadModeSelectDescription()
-        : ReadAttribute("description")
+    ThermostatSetWeeklySchedule()
+        : ClusterCommand("set-weekly-schedule")
+        , mComplex_Transitions(&mRequest.transitions)
     {
+        AddArgument("NumberOfTransitionsForSequence", 0, UINT8_MAX, &mRequest.numberOfTransitionsForSequence);
+        AddArgument("DayOfWeekForSequence", 0, UINT8_MAX, &mRequest.dayOfWeekForSequence);
+        AddArgument("ModeForSequence", 0, UINT8_MAX, &mRequest.modeForSequence);
+        AddArgument("Transitions", &mComplex_Transitions);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadModeSelectDescription() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) command (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeDescriptionWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ModeSelect.Description response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ModeSelect Description read Error", error);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPThermostatClusterSetWeeklyScheduleParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.numberOfTransitionsForSequence = [NSNumber numberWithUnsignedChar:mRequest.numberOfTransitionsForSequence];
+        params.dayOfWeekForSequence = [NSNumber numberWithUnsignedChar:mRequest.dayOfWeekForSequence.Raw()];
+        params.modeForSequence = [NSNumber numberWithUnsignedChar:mRequest.modeForSequence.Raw()];
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mRequest.transitions) {
+                CHIPThermostatClusterThermostatScheduleTransition * newElement_0;
+                newElement_0 = [CHIPThermostatClusterThermostatScheduleTransition new];
+                newElement_0.transitionTime = [NSNumber numberWithUnsignedShort:entry_0.transitionTime];
+                if (entry_0.heatSetpoint.IsNull()) {
+                    newElement_0.heatSetpoint = nil;
+                } else {
+                    newElement_0.heatSetpoint = [NSNumber numberWithShort:entry_0.heatSetpoint.Value()];
+                }
+                if (entry_0.coolSetpoint.IsNull()) {
+                    newElement_0.coolSetpoint = nil;
+                } else {
+                    newElement_0.coolSetpoint = [NSNumber numberWithShort:entry_0.coolSetpoint.Value()];
+                }
+                [array_0 addObject:newElement_0];
             }
-            SetCommandExitStatus(error);
-        }];
+            params.transitions = array_0;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster setWeeklyScheduleWithParams:params
+                               completionHandler:^(NSError * _Nullable error) {
+                                   responsesNeeded--;
+                                   if (error != nil) {
+                                       mError = error;
+                                       LogNSError("Error", error);
+                                   }
+                                   if (responsesNeeded == 0) {
+                                       SetCommandExitStatus(mError);
+                                   }
+                               }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::Thermostat::Commands::SetWeeklySchedule::Type mRequest;
+    TypedComplexArgument<
+        chip::app::DataModel::List<const chip::app::Clusters::Thermostat::Structs::ThermostatScheduleTransition::Type>>
+        mComplex_Transitions;
 };
 
-class SubscribeAttributeModeSelectDescription : public SubscribeAttribute {
+/*
+ * Command GetWeeklySchedule
+ */
+class ThermostatGetWeeklySchedule : public ClusterCommand {
 public:
-    SubscribeAttributeModeSelectDescription()
-        : SubscribeAttribute("description")
+    ThermostatGetWeeklySchedule()
+        : ClusterCommand("get-weekly-schedule")
+    {
+        AddArgument("DaysToReturn", 0, UINT8_MAX, &mRequest.daysToReturn);
+        AddArgument("ModeToReturn", 0, UINT8_MAX, &mRequest.modeToReturn);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) command (0x00000002) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPThermostatClusterGetWeeklyScheduleParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.daysToReturn = [NSNumber numberWithUnsignedChar:mRequest.daysToReturn.Raw()];
+        params.modeToReturn = [NSNumber numberWithUnsignedChar:mRequest.modeToReturn.Raw()];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster getWeeklyScheduleWithParams:params
+                               completionHandler:^(CHIPThermostatClusterGetWeeklyScheduleResponseParams * _Nullable values,
+                                   NSError * _Nullable error) {
+                                   NSLog(@"Values: %@", values);
+                                   responsesNeeded--;
+                                   if (error != nil) {
+                                       mError = error;
+                                       LogNSError("Error", error);
+                                   }
+                                   if (responsesNeeded == 0) {
+                                       SetCommandExitStatus(mError);
+                                   }
+                               }];
+        }
+        return CHIP_NO_ERROR;
     }
 
-    ~SubscribeAttributeModeSelectDescription() {}
+private:
+    chip::app::Clusters::Thermostat::Commands::GetWeeklySchedule::Type mRequest;
+};
+
+/*
+ * Command ClearWeeklySchedule
+ */
+class ThermostatClearWeeklySchedule : public ClusterCommand {
+public:
+    ThermostatClearWeeklySchedule()
+        : ClusterCommand("clear-weekly-schedule")
+    {
+        ClusterCommand::AddArguments();
+    }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReportAttribute (0x00000000) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDescriptionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ModeSelect.Description response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) command (0x00000003) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPThermostatClusterClearWeeklyScheduleParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster clearWeeklyScheduleWithParams:params
+                                 completionHandler:^(NSError * _Nullable error) {
+                                     responsesNeeded--;
+                                     if (error != nil) {
+                                         mError = error;
+                                         LogNSError("Error", error);
+                                     }
+                                     if (responsesNeeded == 0) {
+                                         SetCommandExitStatus(mError);
+                                     }
+                                 }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
 };
 
 /*
- * Attribute StandardNamespace
+ * Attribute LocalTemperature
  */
-class ReadModeSelectStandardNamespace : public ReadAttribute {
+class ReadThermostatLocalTemperature : public ReadAttribute {
 public:
-    ReadModeSelectStandardNamespace()
-        : ReadAttribute("standard-namespace")
+    ReadThermostatLocalTemperature()
+        : ReadAttribute("local-temperature")
     {
     }
 
-    ~ReadModeSelectStandardNamespace() {}
+    ~ReadThermostatLocalTemperature() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeStandardNamespaceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ModeSelect.StandardNamespace response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeLocalTemperatureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.LocalTemperature response %@", [value description]);
             if (error != nil) {
-                LogNSError("ModeSelect StandardNamespace read Error", error);
+                LogNSError("Thermostat LocalTemperature read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -47266,32 +46486,32 @@ class ReadModeSelectStandardNamespace : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeModeSelectStandardNamespace : public SubscribeAttribute {
+class SubscribeAttributeThermostatLocalTemperature : public SubscribeAttribute {
 public:
-    SubscribeAttributeModeSelectStandardNamespace()
-        : SubscribeAttribute("standard-namespace")
+    SubscribeAttributeThermostatLocalTemperature()
+        : SubscribeAttribute("local-temperature")
     {
     }
 
-    ~SubscribeAttributeModeSelectStandardNamespace() {}
+    ~SubscribeAttributeThermostatLocalTemperature() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeStandardNamespaceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeLocalTemperatureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ModeSelect.StandardNamespace response %@", [value description]);
+                NSLog(@"Thermostat.LocalTemperature response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -47302,27 +46522,27 @@ class SubscribeAttributeModeSelectStandardNamespace : public SubscribeAttribute
 };
 
 /*
- * Attribute SupportedModes
+ * Attribute OutdoorTemperature
  */
-class ReadModeSelectSupportedModes : public ReadAttribute {
+class ReadThermostatOutdoorTemperature : public ReadAttribute {
 public:
-    ReadModeSelectSupportedModes()
-        : ReadAttribute("supported-modes")
+    ReadThermostatOutdoorTemperature()
+        : ReadAttribute("outdoor-temperature")
     {
     }
 
-    ~ReadModeSelectSupportedModes() {}
+    ~ReadThermostatOutdoorTemperature() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeSupportedModesWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ModeSelect.SupportedModes response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeOutdoorTemperatureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.OutdoorTemperature response %@", [value description]);
             if (error != nil) {
-                LogNSError("ModeSelect SupportedModes read Error", error);
+                LogNSError("Thermostat OutdoorTemperature read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -47330,32 +46550,32 @@ class ReadModeSelectSupportedModes : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeModeSelectSupportedModes : public SubscribeAttribute {
+class SubscribeAttributeThermostatOutdoorTemperature : public SubscribeAttribute {
 public:
-    SubscribeAttributeModeSelectSupportedModes()
-        : SubscribeAttribute("supported-modes")
+    SubscribeAttributeThermostatOutdoorTemperature()
+        : SubscribeAttribute("outdoor-temperature")
     {
     }
 
-    ~SubscribeAttributeModeSelectSupportedModes() {}
+    ~SubscribeAttributeThermostatOutdoorTemperature() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSupportedModesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOutdoorTemperatureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ModeSelect.SupportedModes response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.OutdoorTemperature response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -47366,27 +46586,27 @@ class SubscribeAttributeModeSelectSupportedModes : public SubscribeAttribute {
 };
 
 /*
- * Attribute CurrentMode
+ * Attribute Occupancy
  */
-class ReadModeSelectCurrentMode : public ReadAttribute {
+class ReadThermostatOccupancy : public ReadAttribute {
 public:
-    ReadModeSelectCurrentMode()
-        : ReadAttribute("current-mode")
+    ReadThermostatOccupancy()
+        : ReadAttribute("occupancy")
     {
     }
 
-    ~ReadModeSelectCurrentMode() {}
+    ~ReadThermostatOccupancy() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCurrentModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ModeSelect.CurrentMode response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeOccupancyWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.Occupancy response %@", [value description]);
             if (error != nil) {
-                LogNSError("ModeSelect CurrentMode read Error", error);
+                LogNSError("Thermostat Occupancy read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -47394,32 +46614,32 @@ class ReadModeSelectCurrentMode : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeModeSelectCurrentMode : public SubscribeAttribute {
+class SubscribeAttributeThermostatOccupancy : public SubscribeAttribute {
 public:
-    SubscribeAttributeModeSelectCurrentMode()
-        : SubscribeAttribute("current-mode")
+    SubscribeAttributeThermostatOccupancy()
+        : SubscribeAttribute("occupancy")
     {
     }
 
-    ~SubscribeAttributeModeSelectCurrentMode() {}
+    ~SubscribeAttributeThermostatOccupancy() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOccupancyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ModeSelect.CurrentMode response %@", [value description]);
+                NSLog(@"Thermostat.Occupancy response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -47430,98 +46650,61 @@ class SubscribeAttributeModeSelectCurrentMode : public SubscribeAttribute {
 };
 
 /*
- * Attribute StartUpMode
+ * Attribute AbsMinHeatSetpointLimit
  */
-class ReadModeSelectStartUpMode : public ReadAttribute {
+class ReadThermostatAbsMinHeatSetpointLimit : public ReadAttribute {
 public:
-    ReadModeSelectStartUpMode()
-        : ReadAttribute("start-up-mode")
+    ReadThermostatAbsMinHeatSetpointLimit()
+        : ReadAttribute("abs-min-heat-setpoint-limit")
     {
     }
 
-    ~ReadModeSelectStartUpMode() {}
+    ~ReadThermostatAbsMinHeatSetpointLimit() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReadAttribute (0x00000004) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeStartUpModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ModeSelect.StartUpMode response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ModeSelect StartUpMode read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteModeSelectStartUpMode : public WriteAttribute {
-public:
-    WriteModeSelectStartUpMode()
-        : WriteAttribute("start-up-mode")
-    {
-        AddArgument("attr-name", "start-up-mode");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteModeSelectStartUpMode() {}
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000050) WriteAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeStartUpModeWithValue:value
-                                             params:params
-                                  completionHandler:^(NSError * _Nullable error) {
-                                      if (error != nil) {
-                                          LogNSError("ModeSelect StartUpMode write Error", error);
-                                      }
-                                      SetCommandExitStatus(error);
-                                  }];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeAbsMinHeatSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.AbsMinHeatSetpointLimit response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("Thermostat AbsMinHeatSetpointLimit read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    uint8_t mValue;
 };
 
-class SubscribeAttributeModeSelectStartUpMode : public SubscribeAttribute {
+class SubscribeAttributeThermostatAbsMinHeatSetpointLimit : public SubscribeAttribute {
 public:
-    SubscribeAttributeModeSelectStartUpMode()
-        : SubscribeAttribute("start-up-mode")
+    SubscribeAttributeThermostatAbsMinHeatSetpointLimit()
+        : SubscribeAttribute("abs-min-heat-setpoint-limit")
     {
     }
 
-    ~SubscribeAttributeModeSelectStartUpMode() {}
+    ~SubscribeAttributeThermostatAbsMinHeatSetpointLimit() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeStartUpModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAbsMinHeatSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ModeSelect.StartUpMode response %@", [value description]);
+                NSLog(@"Thermostat.AbsMinHeatSetpointLimit response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -47532,98 +46715,61 @@ class SubscribeAttributeModeSelectStartUpMode : public SubscribeAttribute {
 };
 
 /*
- * Attribute OnMode
+ * Attribute AbsMaxHeatSetpointLimit
  */
-class ReadModeSelectOnMode : public ReadAttribute {
+class ReadThermostatAbsMaxHeatSetpointLimit : public ReadAttribute {
 public:
-    ReadModeSelectOnMode()
-        : ReadAttribute("on-mode")
+    ReadThermostatAbsMaxHeatSetpointLimit()
+        : ReadAttribute("abs-max-heat-setpoint-limit")
     {
     }
 
-    ~ReadModeSelectOnMode() {}
+    ~ReadThermostatAbsMaxHeatSetpointLimit() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReadAttribute (0x00000005) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeOnModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ModeSelect.OnMode response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ModeSelect OnMode read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteModeSelectOnMode : public WriteAttribute {
-public:
-    WriteModeSelectOnMode()
-        : WriteAttribute("on-mode")
-    {
-        AddArgument("attr-name", "on-mode");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteModeSelectOnMode() {}
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000050) WriteAttribute (0x00000005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeOnModeWithValue:value
-                                        params:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 if (error != nil) {
-                                     LogNSError("ModeSelect OnMode write Error", error);
-                                 }
-                                 SetCommandExitStatus(error);
-                             }];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeAbsMaxHeatSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.AbsMaxHeatSetpointLimit response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("Thermostat AbsMaxHeatSetpointLimit read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    uint8_t mValue;
 };
 
-class SubscribeAttributeModeSelectOnMode : public SubscribeAttribute {
+class SubscribeAttributeThermostatAbsMaxHeatSetpointLimit : public SubscribeAttribute {
 public:
-    SubscribeAttributeModeSelectOnMode()
-        : SubscribeAttribute("on-mode")
+    SubscribeAttributeThermostatAbsMaxHeatSetpointLimit()
+        : SubscribeAttribute("abs-max-heat-setpoint-limit")
     {
     }
 
-    ~SubscribeAttributeModeSelectOnMode() {}
+    ~SubscribeAttributeThermostatAbsMaxHeatSetpointLimit() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOnModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAbsMaxHeatSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ModeSelect.OnMode response %@", [value description]);
+                NSLog(@"Thermostat.AbsMaxHeatSetpointLimit response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -47634,60 +46780,61 @@ class SubscribeAttributeModeSelectOnMode : public SubscribeAttribute {
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute AbsMinCoolSetpointLimit
  */
-class ReadModeSelectGeneratedCommandList : public ReadAttribute {
+class ReadThermostatAbsMinCoolSetpointLimit : public ReadAttribute {
 public:
-    ReadModeSelectGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadThermostatAbsMinCoolSetpointLimit()
+        : ReadAttribute("abs-min-cool-setpoint-limit")
     {
     }
 
-    ~ReadModeSelectGeneratedCommandList() {}
+    ~ReadThermostatAbsMinCoolSetpointLimit() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ModeSelect.GeneratedCommandList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ModeSelect GeneratedCommandList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeAbsMinCoolSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.AbsMinCoolSetpointLimit response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("Thermostat AbsMinCoolSetpointLimit read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeModeSelectGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeThermostatAbsMinCoolSetpointLimit : public SubscribeAttribute {
 public:
-    SubscribeAttributeModeSelectGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeThermostatAbsMinCoolSetpointLimit()
+        : SubscribeAttribute("abs-min-cool-setpoint-limit")
     {
     }
 
-    ~SubscribeAttributeModeSelectGeneratedCommandList() {}
+    ~SubscribeAttributeThermostatAbsMinCoolSetpointLimit() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAbsMinCoolSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ModeSelect.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.AbsMinCoolSetpointLimit response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -47698,60 +46845,61 @@ class SubscribeAttributeModeSelectGeneratedCommandList : public SubscribeAttribu
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute AbsMaxCoolSetpointLimit
  */
-class ReadModeSelectAcceptedCommandList : public ReadAttribute {
+class ReadThermostatAbsMaxCoolSetpointLimit : public ReadAttribute {
 public:
-    ReadModeSelectAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadThermostatAbsMaxCoolSetpointLimit()
+        : ReadAttribute("abs-max-cool-setpoint-limit")
     {
     }
 
-    ~ReadModeSelectAcceptedCommandList() {}
+    ~ReadThermostatAbsMaxCoolSetpointLimit() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000006) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ModeSelect.AcceptedCommandList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ModeSelect AcceptedCommandList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeAbsMaxCoolSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.AbsMaxCoolSetpointLimit response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("Thermostat AbsMaxCoolSetpointLimit read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeModeSelectAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeThermostatAbsMaxCoolSetpointLimit : public SubscribeAttribute {
 public:
-    SubscribeAttributeModeSelectAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeThermostatAbsMaxCoolSetpointLimit()
+        : SubscribeAttribute("abs-max-cool-setpoint-limit")
     {
     }
 
-    ~SubscribeAttributeModeSelectAcceptedCommandList() {}
+    ~SubscribeAttributeThermostatAbsMaxCoolSetpointLimit() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000006) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAbsMaxCoolSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ModeSelect.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.AbsMaxCoolSetpointLimit response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -47762,27 +46910,27 @@ class SubscribeAttributeModeSelectAcceptedCommandList : public SubscribeAttribut
 };
 
 /*
- * Attribute AttributeList
+ * Attribute PICoolingDemand
  */
-class ReadModeSelectAttributeList : public ReadAttribute {
+class ReadThermostatPICoolingDemand : public ReadAttribute {
 public:
-    ReadModeSelectAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadThermostatPICoolingDemand()
+        : ReadAttribute("picooling-demand")
     {
     }
 
-    ~ReadModeSelectAttributeList() {}
+    ~ReadThermostatPICoolingDemand() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000007) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ModeSelect.AttributeList response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributePICoolingDemandWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.PICoolingDemand response %@", [value description]);
             if (error != nil) {
-                LogNSError("ModeSelect AttributeList read Error", error);
+                LogNSError("Thermostat PICoolingDemand read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -47790,32 +46938,32 @@ class ReadModeSelectAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeModeSelectAttributeList : public SubscribeAttribute {
+class SubscribeAttributeThermostatPICoolingDemand : public SubscribeAttribute {
 public:
-    SubscribeAttributeModeSelectAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeThermostatPICoolingDemand()
+        : SubscribeAttribute("picooling-demand")
     {
     }
 
-    ~SubscribeAttributeModeSelectAttributeList() {}
+    ~SubscribeAttributeThermostatPICoolingDemand() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000007) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePICoolingDemandWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ModeSelect.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.PICoolingDemand response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -47826,27 +46974,27 @@ class SubscribeAttributeModeSelectAttributeList : public SubscribeAttribute {
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute PIHeatingDemand
  */
-class ReadModeSelectFeatureMap : public ReadAttribute {
+class ReadThermostatPIHeatingDemand : public ReadAttribute {
 public:
-    ReadModeSelectFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadThermostatPIHeatingDemand()
+        : ReadAttribute("piheating-demand")
     {
     }
 
-    ~ReadModeSelectFeatureMap() {}
+    ~ReadThermostatPIHeatingDemand() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000008) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ModeSelect.FeatureMap response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributePIHeatingDemandWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.PIHeatingDemand response %@", [value description]);
             if (error != nil) {
-                LogNSError("ModeSelect FeatureMap read Error", error);
+                LogNSError("Thermostat PIHeatingDemand read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -47854,32 +47002,32 @@ class ReadModeSelectFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeModeSelectFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeThermostatPIHeatingDemand : public SubscribeAttribute {
 public:
-    SubscribeAttributeModeSelectFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeThermostatPIHeatingDemand()
+        : SubscribeAttribute("piheating-demand")
     {
     }
 
-    ~SubscribeAttributeModeSelectFeatureMap() {}
+    ~SubscribeAttributeThermostatPIHeatingDemand() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000008) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePIHeatingDemandWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ModeSelect.FeatureMap response %@", [value description]);
+                NSLog(@"Thermostat.PIHeatingDemand response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -47890,60 +47038,99 @@ class SubscribeAttributeModeSelectFeatureMap : public SubscribeAttribute {
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute HVACSystemTypeConfiguration
  */
-class ReadModeSelectClusterRevision : public ReadAttribute {
+class ReadThermostatHVACSystemTypeConfiguration : public ReadAttribute {
 public:
-    ReadModeSelectClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadThermostatHVACSystemTypeConfiguration()
+        : ReadAttribute("hvacsystem-type-configuration")
     {
     }
 
-    ~ReadModeSelectClusterRevision() {}
+    ~ReadThermostatHVACSystemTypeConfiguration() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000009) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ModeSelect.ClusterRevision response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ModeSelect ClusterRevision read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeHVACSystemTypeConfigurationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.HVACSystemTypeConfiguration response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("Thermostat HVACSystemTypeConfiguration read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeModeSelectClusterRevision : public SubscribeAttribute {
+class WriteThermostatHVACSystemTypeConfiguration : public WriteAttribute {
 public:
-    SubscribeAttributeModeSelectClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    WriteThermostatHVACSystemTypeConfiguration()
+        : WriteAttribute("hvacsystem-type-configuration")
     {
+        AddArgument("attr-name", "hvacsystem-type-configuration");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeModeSelectClusterRevision() {}
+    ~WriteThermostatHVACSystemTypeConfiguration() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000009) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeHVACSystemTypeConfigurationWithValue:value
+                                                             params:params
+                                                  completionHandler:^(NSError * _Nullable error) {
+                                                      if (error != nil) {
+                                                          LogNSError("Thermostat HVACSystemTypeConfiguration write Error", error);
+                                                      }
+                                                      SetCommandExitStatus(error);
+                                                  }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeThermostatHVACSystemTypeConfiguration : public SubscribeAttribute {
+public:
+    SubscribeAttributeThermostatHVACSystemTypeConfiguration()
+        : SubscribeAttribute("hvacsystem-type-configuration")
+    {
+    }
+
+    ~SubscribeAttributeThermostatHVACSystemTypeConfiguration() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000009) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeHVACSystemTypeConfigurationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ModeSelect.ClusterRevision response %@", [value description]);
+                NSLog(@"Thermostat.HVACSystemTypeConfiguration response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -47953,434 +47140,203 @@ class SubscribeAttributeModeSelectClusterRevision : public SubscribeAttribute {
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster NetworkCommissioning                                        | 0x0031 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * ScanNetworks                                                      |   0x00 |
-| * AddOrUpdateWiFiNetwork                                            |   0x02 |
-| * AddOrUpdateThreadNetwork                                          |   0x03 |
-| * RemoveNetwork                                                     |   0x04 |
-| * ConnectNetwork                                                    |   0x06 |
-| * ReorderNetwork                                                    |   0x08 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * MaxNetworks                                                       | 0x0000 |
-| * Networks                                                          | 0x0001 |
-| * ScanMaxTimeSeconds                                                | 0x0002 |
-| * ConnectMaxTimeSeconds                                             | 0x0003 |
-| * InterfaceEnabled                                                  | 0x0004 |
-| * LastNetworkingStatus                                              | 0x0005 |
-| * LastNetworkID                                                     | 0x0006 |
-| * LastConnectErrorValue                                             | 0x0007 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command ScanNetworks
+ * Attribute LocalTemperatureCalibration
  */
-class NetworkCommissioningScanNetworks : public ClusterCommand {
+class ReadThermostatLocalTemperatureCalibration : public ReadAttribute {
 public:
-    NetworkCommissioningScanNetworks()
-        : ClusterCommand("scan-networks")
+    ReadThermostatLocalTemperatureCalibration()
+        : ReadAttribute("local-temperature-calibration")
     {
-        AddArgument("Ssid", &mRequest.ssid);
-        AddArgument("Breadcrumb", 0, UINT64_MAX, &mRequest.breadcrumb);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadThermostatLocalTemperatureCalibration() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000010) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        __auto_type * params = [[CHIPNetworkCommissioningClusterScanNetworksParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        if (mRequest.ssid.HasValue()) {
-            if (mRequest.ssid.Value().IsNull()) {
-                params.ssid = nil;
-            } else {
-                params.ssid = [NSData dataWithBytes:mRequest.ssid.Value().Value().data()
-                                             length:mRequest.ssid.Value().Value().size()];
-            }
-        } else {
-            params.ssid = nil;
-        }
-        if (mRequest.breadcrumb.HasValue()) {
-            params.breadcrumb = [NSNumber numberWithUnsignedLongLong:mRequest.breadcrumb.Value()];
-        } else {
-            params.breadcrumb = nil;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster scanNetworksWithParams:params
-                          completionHandler:^(CHIPNetworkCommissioningClusterScanNetworksResponseParams * _Nullable values,
-                              NSError * _Nullable error) {
-                              NSLog(@"Values: %@", values);
-                              responsesNeeded--;
-                              if (error != nil) {
-                                  mError = error;
-                                  LogNSError("Error", error);
-                              }
-                              if (responsesNeeded == 0) {
-                                  SetCommandExitStatus(mError);
-                              }
-                          }];
-        }
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeLocalTemperatureCalibrationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.LocalTemperatureCalibration response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("Thermostat LocalTemperatureCalibration read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::NetworkCommissioning::Commands::ScanNetworks::Type mRequest;
 };
 
-/*
- * Command AddOrUpdateWiFiNetwork
- */
-class NetworkCommissioningAddOrUpdateWiFiNetwork : public ClusterCommand {
+class WriteThermostatLocalTemperatureCalibration : public WriteAttribute {
 public:
-    NetworkCommissioningAddOrUpdateWiFiNetwork()
-        : ClusterCommand("add-or-update-wi-fi-network")
+    WriteThermostatLocalTemperatureCalibration()
+        : WriteAttribute("local-temperature-calibration")
     {
-        AddArgument("Ssid", &mRequest.ssid);
-        AddArgument("Credentials", &mRequest.credentials);
-        AddArgument("Breadcrumb", 0, UINT64_MAX, &mRequest.breadcrumb);
-        ClusterCommand::AddArguments();
+        AddArgument("attr-name", "local-temperature-calibration");
+        AddArgument("attr-value", INT8_MIN, INT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
+    ~WriteThermostatLocalTemperatureCalibration() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) command (0x00000002) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000010) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        __auto_type * params = [[CHIPNetworkCommissioningClusterAddOrUpdateWiFiNetworkParams alloc] init];
-        params.timedInvokeTimeoutMs
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.ssid = [NSData dataWithBytes:mRequest.ssid.data() length:mRequest.ssid.size()];
-        params.credentials = [NSData dataWithBytes:mRequest.credentials.data() length:mRequest.credentials.size()];
-        if (mRequest.breadcrumb.HasValue()) {
-            params.breadcrumb = [NSNumber numberWithUnsignedLongLong:mRequest.breadcrumb.Value()];
-        } else {
-            params.breadcrumb = nil;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster
-                addOrUpdateWiFiNetworkWithParams:params
-                               completionHandler:^(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable values,
-                                   NSError * _Nullable error) {
-                                   NSLog(@"Values: %@", values);
-                                   responsesNeeded--;
-                                   if (error != nil) {
-                                       mError = error;
-                                       LogNSError("Error", error);
-                                   }
-                                   if (responsesNeeded == 0) {
-                                       SetCommandExitStatus(mError);
-                                   }
-                               }];
-        }
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithChar:mValue];
+
+        [cluster writeAttributeLocalTemperatureCalibrationWithValue:value
+                                                             params:params
+                                                  completionHandler:^(NSError * _Nullable error) {
+                                                      if (error != nil) {
+                                                          LogNSError("Thermostat LocalTemperatureCalibration write Error", error);
+                                                      }
+                                                      SetCommandExitStatus(error);
+                                                  }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::NetworkCommissioning::Commands::AddOrUpdateWiFiNetwork::Type mRequest;
+    int8_t mValue;
 };
 
-/*
- * Command AddOrUpdateThreadNetwork
- */
-class NetworkCommissioningAddOrUpdateThreadNetwork : public ClusterCommand {
+class SubscribeAttributeThermostatLocalTemperatureCalibration : public SubscribeAttribute {
 public:
-    NetworkCommissioningAddOrUpdateThreadNetwork()
-        : ClusterCommand("add-or-update-thread-network")
+    SubscribeAttributeThermostatLocalTemperatureCalibration()
+        : SubscribeAttribute("local-temperature-calibration")
     {
-        AddArgument("OperationalDataset", &mRequest.operationalDataset);
-        AddArgument("Breadcrumb", 0, UINT64_MAX, &mRequest.breadcrumb);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeThermostatLocalTemperatureCalibration() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) command (0x00000003) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000010) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        __auto_type * params = [[CHIPNetworkCommissioningClusterAddOrUpdateThreadNetworkParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.operationalDataset = [NSData dataWithBytes:mRequest.operationalDataset.data()
-                                                   length:mRequest.operationalDataset.size()];
-        if (mRequest.breadcrumb.HasValue()) {
-            params.breadcrumb = [NSNumber numberWithUnsignedLongLong:mRequest.breadcrumb.Value()];
-        } else {
-            params.breadcrumb = nil;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster
-                addOrUpdateThreadNetworkWithParams:params
-                                 completionHandler:^(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable values,
-                                     NSError * _Nullable error) {
-                                     NSLog(@"Values: %@", values);
-                                     responsesNeeded--;
-                                     if (error != nil) {
-                                         mError = error;
-                                         LogNSError("Error", error);
-                                     }
-                                     if (responsesNeeded == 0) {
-                                         SetCommandExitStatus(mError);
-                                     }
-                                 }];
-        }
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeLocalTemperatureCalibrationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.LocalTemperatureCalibration response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::NetworkCommissioning::Commands::AddOrUpdateThreadNetwork::Type mRequest;
 };
 
 /*
- * Command RemoveNetwork
+ * Attribute OccupiedCoolingSetpoint
  */
-class NetworkCommissioningRemoveNetwork : public ClusterCommand {
+class ReadThermostatOccupiedCoolingSetpoint : public ReadAttribute {
 public:
-    NetworkCommissioningRemoveNetwork()
-        : ClusterCommand("remove-network")
+    ReadThermostatOccupiedCoolingSetpoint()
+        : ReadAttribute("occupied-cooling-setpoint")
     {
-        AddArgument("NetworkID", &mRequest.networkID);
-        AddArgument("Breadcrumb", 0, UINT64_MAX, &mRequest.breadcrumb);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadThermostatOccupiedCoolingSetpoint() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) command (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000011) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        __auto_type * params = [[CHIPNetworkCommissioningClusterRemoveNetworkParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.networkID = [NSData dataWithBytes:mRequest.networkID.data() length:mRequest.networkID.size()];
-        if (mRequest.breadcrumb.HasValue()) {
-            params.breadcrumb = [NSNumber numberWithUnsignedLongLong:mRequest.breadcrumb.Value()];
-        } else {
-            params.breadcrumb = nil;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster removeNetworkWithParams:params
-                           completionHandler:^(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable values,
-                               NSError * _Nullable error) {
-                               NSLog(@"Values: %@", values);
-                               responsesNeeded--;
-                               if (error != nil) {
-                                   mError = error;
-                                   LogNSError("Error", error);
-                               }
-                               if (responsesNeeded == 0) {
-                                   SetCommandExitStatus(mError);
-                               }
-                           }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::NetworkCommissioning::Commands::RemoveNetwork::Type mRequest;
-};
-
-/*
- * Command ConnectNetwork
- */
-class NetworkCommissioningConnectNetwork : public ClusterCommand {
-public:
-    NetworkCommissioningConnectNetwork()
-        : ClusterCommand("connect-network")
-    {
-        AddArgument("NetworkID", &mRequest.networkID);
-        AddArgument("Breadcrumb", 0, UINT64_MAX, &mRequest.breadcrumb);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) command (0x00000006) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        __auto_type * params = [[CHIPNetworkCommissioningClusterConnectNetworkParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.networkID = [NSData dataWithBytes:mRequest.networkID.data() length:mRequest.networkID.size()];
-        if (mRequest.breadcrumb.HasValue()) {
-            params.breadcrumb = [NSNumber numberWithUnsignedLongLong:mRequest.breadcrumb.Value()];
-        } else {
-            params.breadcrumb = nil;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster connectNetworkWithParams:params
-                            completionHandler:^(CHIPNetworkCommissioningClusterConnectNetworkResponseParams * _Nullable values,
-                                NSError * _Nullable error) {
-                                NSLog(@"Values: %@", values);
-                                responsesNeeded--;
-                                if (error != nil) {
-                                    mError = error;
-                                    LogNSError("Error", error);
-                                }
-                                if (responsesNeeded == 0) {
-                                    SetCommandExitStatus(mError);
-                                }
-                            }];
-        }
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeOccupiedCoolingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.OccupiedCoolingSetpoint response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("Thermostat OccupiedCoolingSetpoint read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::NetworkCommissioning::Commands::ConnectNetwork::Type mRequest;
 };
 
-/*
- * Command ReorderNetwork
- */
-class NetworkCommissioningReorderNetwork : public ClusterCommand {
+class WriteThermostatOccupiedCoolingSetpoint : public WriteAttribute {
 public:
-    NetworkCommissioningReorderNetwork()
-        : ClusterCommand("reorder-network")
+    WriteThermostatOccupiedCoolingSetpoint()
+        : WriteAttribute("occupied-cooling-setpoint")
     {
-        AddArgument("NetworkID", &mRequest.networkID);
-        AddArgument("NetworkIndex", 0, UINT8_MAX, &mRequest.networkIndex);
-        AddArgument("Breadcrumb", 0, UINT64_MAX, &mRequest.breadcrumb);
-        ClusterCommand::AddArguments();
+        AddArgument("attr-name", "occupied-cooling-setpoint");
+        AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
+    ~WriteThermostatOccupiedCoolingSetpoint() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) command (0x00000008) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000011) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        __auto_type * params = [[CHIPNetworkCommissioningClusterReorderNetworkParams alloc] init];
-        params.timedInvokeTimeoutMs
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.networkID = [NSData dataWithBytes:mRequest.networkID.data() length:mRequest.networkID.size()];
-        params.networkIndex = [NSNumber numberWithUnsignedChar:mRequest.networkIndex];
-        if (mRequest.breadcrumb.HasValue()) {
-            params.breadcrumb = [NSNumber numberWithUnsignedLongLong:mRequest.breadcrumb.Value()];
-        } else {
-            params.breadcrumb = nil;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster reorderNetworkWithParams:params
-                            completionHandler:^(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable values,
-                                NSError * _Nullable error) {
-                                NSLog(@"Values: %@", values);
-                                responsesNeeded--;
-                                if (error != nil) {
-                                    mError = error;
-                                    LogNSError("Error", error);
-                                }
-                                if (responsesNeeded == 0) {
-                                    SetCommandExitStatus(mError);
-                                }
-                            }];
-        }
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue];
+
+        [cluster writeAttributeOccupiedCoolingSetpointWithValue:value
+                                                         params:params
+                                              completionHandler:^(NSError * _Nullable error) {
+                                                  if (error != nil) {
+                                                      LogNSError("Thermostat OccupiedCoolingSetpoint write Error", error);
+                                                  }
+                                                  SetCommandExitStatus(error);
+                                              }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::NetworkCommissioning::Commands::ReorderNetwork::Type mRequest;
-};
-
-/*
- * Attribute MaxNetworks
- */
-class ReadNetworkCommissioningMaxNetworks : public ReadAttribute {
-public:
-    ReadNetworkCommissioningMaxNetworks()
-        : ReadAttribute("max-networks")
-    {
-    }
-
-    ~ReadNetworkCommissioningMaxNetworks() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x00000000) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        [cluster readAttributeMaxNetworksWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"NetworkCommissioning.MaxNetworks response %@", [value description]);
-            if (error != nil) {
-                LogNSError("NetworkCommissioning MaxNetworks read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
+    int16_t mValue;
 };
 
-class SubscribeAttributeNetworkCommissioningMaxNetworks : public SubscribeAttribute {
+class SubscribeAttributeThermostatOccupiedCoolingSetpoint : public SubscribeAttribute {
 public:
-    SubscribeAttributeNetworkCommissioningMaxNetworks()
-        : SubscribeAttribute("max-networks")
+    SubscribeAttributeThermostatOccupiedCoolingSetpoint()
+        : SubscribeAttribute("occupied-cooling-setpoint")
     {
     }
 
-    ~SubscribeAttributeNetworkCommissioningMaxNetworks() {}
+    ~SubscribeAttributeThermostatOccupiedCoolingSetpoint() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000011) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMaxNetworksWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOccupiedCoolingSetpointWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"NetworkCommissioning.MaxNetworks response %@", [value description]);
+                NSLog(@"Thermostat.OccupiedCoolingSetpoint response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -48391,132 +47347,99 @@ class SubscribeAttributeNetworkCommissioningMaxNetworks : public SubscribeAttrib
 };
 
 /*
- * Attribute Networks
+ * Attribute OccupiedHeatingSetpoint
  */
-class ReadNetworkCommissioningNetworks : public ReadAttribute {
+class ReadThermostatOccupiedHeatingSetpoint : public ReadAttribute {
 public:
-    ReadNetworkCommissioningNetworks()
-        : ReadAttribute("networks")
+    ReadThermostatOccupiedHeatingSetpoint()
+        : ReadAttribute("occupied-heating-setpoint")
     {
     }
 
-    ~ReadNetworkCommissioningNetworks() {}
+    ~ReadThermostatOccupiedHeatingSetpoint() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x00000001) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        [cluster readAttributeNetworksWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"NetworkCommissioning.Networks response %@", [value description]);
-            if (error != nil) {
-                LogNSError("NetworkCommissioning Networks read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class SubscribeAttributeNetworkCommissioningNetworks : public SubscribeAttribute {
-public:
-    SubscribeAttributeNetworkCommissioningNetworks()
-        : SubscribeAttribute("networks")
-    {
-    }
-
-    ~SubscribeAttributeNetworkCommissioningNetworks() {}
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000012) on endpoint %u", endpointId);
 
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNetworksWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"NetworkCommissioning.Networks response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeOccupiedHeatingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.OccupiedHeatingSetpoint response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("Thermostat OccupiedHeatingSetpoint read Error", error);
                 }
+                SetCommandExitStatus(error);
             }];
-
         return CHIP_NO_ERROR;
     }
 };
 
-/*
- * Attribute ScanMaxTimeSeconds
- */
-class ReadNetworkCommissioningScanMaxTimeSeconds : public ReadAttribute {
+class WriteThermostatOccupiedHeatingSetpoint : public WriteAttribute {
 public:
-    ReadNetworkCommissioningScanMaxTimeSeconds()
-        : ReadAttribute("scan-max-time-seconds")
+    WriteThermostatOccupiedHeatingSetpoint()
+        : WriteAttribute("occupied-heating-setpoint")
     {
+        AddArgument("attr-name", "occupied-heating-setpoint");
+        AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~ReadNetworkCommissioningScanMaxTimeSeconds() {}
+    ~WriteThermostatOccupiedHeatingSetpoint() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x00000002) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000012) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        [cluster readAttributeScanMaxTimeSecondsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"NetworkCommissioning.ScanMaxTimeSeconds response %@", [value description]);
-            if (error != nil) {
-                LogNSError("NetworkCommissioning ScanMaxTimeSeconds read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue];
+
+        [cluster writeAttributeOccupiedHeatingSetpointWithValue:value
+                                                         params:params
+                                              completionHandler:^(NSError * _Nullable error) {
+                                                  if (error != nil) {
+                                                      LogNSError("Thermostat OccupiedHeatingSetpoint write Error", error);
+                                                  }
+                                                  SetCommandExitStatus(error);
+                                              }];
         return CHIP_NO_ERROR;
     }
+
+private:
+    int16_t mValue;
 };
 
-class SubscribeAttributeNetworkCommissioningScanMaxTimeSeconds : public SubscribeAttribute {
+class SubscribeAttributeThermostatOccupiedHeatingSetpoint : public SubscribeAttribute {
 public:
-    SubscribeAttributeNetworkCommissioningScanMaxTimeSeconds()
-        : SubscribeAttribute("scan-max-time-seconds")
+    SubscribeAttributeThermostatOccupiedHeatingSetpoint()
+        : SubscribeAttribute("occupied-heating-setpoint")
     {
     }
 
-    ~SubscribeAttributeNetworkCommissioningScanMaxTimeSeconds() {}
+    ~SubscribeAttributeThermostatOccupiedHeatingSetpoint() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000012) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeScanMaxTimeSecondsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOccupiedHeatingSetpointWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"NetworkCommissioning.ScanMaxTimeSeconds response %@", [value description]);
+                NSLog(@"Thermostat.OccupiedHeatingSetpoint response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -48527,64 +47450,99 @@ class SubscribeAttributeNetworkCommissioningScanMaxTimeSeconds : public Subscrib
 };
 
 /*
- * Attribute ConnectMaxTimeSeconds
+ * Attribute UnoccupiedCoolingSetpoint
  */
-class ReadNetworkCommissioningConnectMaxTimeSeconds : public ReadAttribute {
+class ReadThermostatUnoccupiedCoolingSetpoint : public ReadAttribute {
 public:
-    ReadNetworkCommissioningConnectMaxTimeSeconds()
-        : ReadAttribute("connect-max-time-seconds")
+    ReadThermostatUnoccupiedCoolingSetpoint()
+        : ReadAttribute("unoccupied-cooling-setpoint")
     {
     }
 
-    ~ReadNetworkCommissioningConnectMaxTimeSeconds() {}
+    ~ReadThermostatUnoccupiedCoolingSetpoint() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000013) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        [cluster readAttributeConnectMaxTimeSecondsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"NetworkCommissioning.ConnectMaxTimeSeconds response %@", [value description]);
-            if (error != nil) {
-                LogNSError("NetworkCommissioning ConnectMaxTimeSeconds read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeUnoccupiedCoolingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.UnoccupiedCoolingSetpoint response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("Thermostat UnoccupiedCoolingSetpoint read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeNetworkCommissioningConnectMaxTimeSeconds : public SubscribeAttribute {
+class WriteThermostatUnoccupiedCoolingSetpoint : public WriteAttribute {
 public:
-    SubscribeAttributeNetworkCommissioningConnectMaxTimeSeconds()
-        : SubscribeAttribute("connect-max-time-seconds")
+    WriteThermostatUnoccupiedCoolingSetpoint()
+        : WriteAttribute("unoccupied-cooling-setpoint")
     {
+        AddArgument("attr-name", "unoccupied-cooling-setpoint");
+        AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeNetworkCommissioningConnectMaxTimeSeconds() {}
+    ~WriteThermostatUnoccupiedCoolingSetpoint() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000013) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue];
+
+        [cluster writeAttributeUnoccupiedCoolingSetpointWithValue:value
+                                                           params:params
+                                                completionHandler:^(NSError * _Nullable error) {
+                                                    if (error != nil) {
+                                                        LogNSError("Thermostat UnoccupiedCoolingSetpoint write Error", error);
+                                                    }
+                                                    SetCommandExitStatus(error);
+                                                }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    int16_t mValue;
+};
+
+class SubscribeAttributeThermostatUnoccupiedCoolingSetpoint : public SubscribeAttribute {
+public:
+    SubscribeAttributeThermostatUnoccupiedCoolingSetpoint()
+        : SubscribeAttribute("unoccupied-cooling-setpoint")
+    {
+    }
+
+    ~SubscribeAttributeThermostatUnoccupiedCoolingSetpoint() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000013) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeConnectMaxTimeSecondsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeUnoccupiedCoolingSetpointWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"NetworkCommissioning.ConnectMaxTimeSeconds response %@", [value description]);
+                NSLog(@"Thermostat.UnoccupiedCoolingSetpoint response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -48595,104 +47553,99 @@ class SubscribeAttributeNetworkCommissioningConnectMaxTimeSeconds : public Subsc
 };
 
 /*
- * Attribute InterfaceEnabled
+ * Attribute UnoccupiedHeatingSetpoint
  */
-class ReadNetworkCommissioningInterfaceEnabled : public ReadAttribute {
+class ReadThermostatUnoccupiedHeatingSetpoint : public ReadAttribute {
 public:
-    ReadNetworkCommissioningInterfaceEnabled()
-        : ReadAttribute("interface-enabled")
+    ReadThermostatUnoccupiedHeatingSetpoint()
+        : ReadAttribute("unoccupied-heating-setpoint")
     {
     }
 
-    ~ReadNetworkCommissioningInterfaceEnabled() {}
+    ~ReadThermostatUnoccupiedHeatingSetpoint() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000014) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        [cluster readAttributeInterfaceEnabledWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"NetworkCommissioning.InterfaceEnabled response %@", [value description]);
-            if (error != nil) {
-                LogNSError("NetworkCommissioning InterfaceEnabled read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeUnoccupiedHeatingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.UnoccupiedHeatingSetpoint response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("Thermostat UnoccupiedHeatingSetpoint read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class WriteNetworkCommissioningInterfaceEnabled : public WriteAttribute {
+class WriteThermostatUnoccupiedHeatingSetpoint : public WriteAttribute {
 public:
-    WriteNetworkCommissioningInterfaceEnabled()
-        : WriteAttribute("interface-enabled")
+    WriteThermostatUnoccupiedHeatingSetpoint()
+        : WriteAttribute("unoccupied-heating-setpoint")
     {
-        AddArgument("attr-name", "interface-enabled");
-        AddArgument("attr-value", 0, 1, &mValue);
+        AddArgument("attr-name", "unoccupied-heating-setpoint");
+        AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteNetworkCommissioningInterfaceEnabled() {}
+    ~WriteThermostatUnoccupiedHeatingSetpoint() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) WriteAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000014) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
+        NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue];
 
-        [cluster writeAttributeInterfaceEnabledWithValue:value
-                                                  params:params
-                                       completionHandler:^(NSError * _Nullable error) {
-                                           if (error != nil) {
-                                               LogNSError("NetworkCommissioning InterfaceEnabled write Error", error);
-                                           }
-                                           SetCommandExitStatus(error);
-                                       }];
+        [cluster writeAttributeUnoccupiedHeatingSetpointWithValue:value
+                                                           params:params
+                                                completionHandler:^(NSError * _Nullable error) {
+                                                    if (error != nil) {
+                                                        LogNSError("Thermostat UnoccupiedHeatingSetpoint write Error", error);
+                                                    }
+                                                    SetCommandExitStatus(error);
+                                                }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    bool mValue;
+    int16_t mValue;
 };
 
-class SubscribeAttributeNetworkCommissioningInterfaceEnabled : public SubscribeAttribute {
+class SubscribeAttributeThermostatUnoccupiedHeatingSetpoint : public SubscribeAttribute {
 public:
-    SubscribeAttributeNetworkCommissioningInterfaceEnabled()
-        : SubscribeAttribute("interface-enabled")
+    SubscribeAttributeThermostatUnoccupiedHeatingSetpoint()
+        : SubscribeAttribute("unoccupied-heating-setpoint")
     {
     }
 
-    ~SubscribeAttributeNetworkCommissioningInterfaceEnabled() {}
+    ~SubscribeAttributeThermostatUnoccupiedHeatingSetpoint() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000014) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInterfaceEnabledWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeUnoccupiedHeatingSetpointWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"NetworkCommissioning.InterfaceEnabled response %@", [value description]);
+                NSLog(@"Thermostat.UnoccupiedHeatingSetpoint response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -48703,29 +47656,27 @@ class SubscribeAttributeNetworkCommissioningInterfaceEnabled : public SubscribeA
 };
 
 /*
- * Attribute LastNetworkingStatus
+ * Attribute MinHeatSetpointLimit
  */
-class ReadNetworkCommissioningLastNetworkingStatus : public ReadAttribute {
+class ReadThermostatMinHeatSetpointLimit : public ReadAttribute {
 public:
-    ReadNetworkCommissioningLastNetworkingStatus()
-        : ReadAttribute("last-networking-status")
+    ReadThermostatMinHeatSetpointLimit()
+        : ReadAttribute("min-heat-setpoint-limit")
     {
     }
 
-    ~ReadNetworkCommissioningLastNetworkingStatus() {}
+    ~ReadThermostatMinHeatSetpointLimit() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000015) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        [cluster readAttributeLastNetworkingStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"NetworkCommissioning.LastNetworkingStatus response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeMinHeatSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.MinHeatSetpointLimit response %@", [value description]);
             if (error != nil) {
-                LogNSError("NetworkCommissioning LastNetworkingStatus read Error", error);
+                LogNSError("Thermostat MinHeatSetpointLimit read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -48733,34 +47684,70 @@ class ReadNetworkCommissioningLastNetworkingStatus : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeNetworkCommissioningLastNetworkingStatus : public SubscribeAttribute {
+class WriteThermostatMinHeatSetpointLimit : public WriteAttribute {
 public:
-    SubscribeAttributeNetworkCommissioningLastNetworkingStatus()
-        : SubscribeAttribute("last-networking-status")
+    WriteThermostatMinHeatSetpointLimit()
+        : WriteAttribute("min-heat-setpoint-limit")
     {
+        AddArgument("attr-name", "min-heat-setpoint-limit");
+        AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeNetworkCommissioningLastNetworkingStatus() {}
+    ~WriteThermostatMinHeatSetpointLimit() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000015) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue];
+
+        [cluster writeAttributeMinHeatSetpointLimitWithValue:value
+                                                      params:params
+                                           completionHandler:^(NSError * _Nullable error) {
+                                               if (error != nil) {
+                                                   LogNSError("Thermostat MinHeatSetpointLimit write Error", error);
+                                               }
+                                               SetCommandExitStatus(error);
+                                           }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    int16_t mValue;
+};
+
+class SubscribeAttributeThermostatMinHeatSetpointLimit : public SubscribeAttribute {
+public:
+    SubscribeAttributeThermostatMinHeatSetpointLimit()
+        : SubscribeAttribute("min-heat-setpoint-limit")
+    {
+    }
+
+    ~SubscribeAttributeThermostatMinHeatSetpointLimit() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000015) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLastNetworkingStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMinHeatSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"NetworkCommissioning.LastNetworkingStatus response %@", [value description]);
+                NSLog(@"Thermostat.MinHeatSetpointLimit response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -48771,29 +47758,27 @@ class SubscribeAttributeNetworkCommissioningLastNetworkingStatus : public Subscr
 };
 
 /*
- * Attribute LastNetworkID
+ * Attribute MaxHeatSetpointLimit
  */
-class ReadNetworkCommissioningLastNetworkID : public ReadAttribute {
+class ReadThermostatMaxHeatSetpointLimit : public ReadAttribute {
 public:
-    ReadNetworkCommissioningLastNetworkID()
-        : ReadAttribute("last-network-id")
+    ReadThermostatMaxHeatSetpointLimit()
+        : ReadAttribute("max-heat-setpoint-limit")
     {
     }
 
-    ~ReadNetworkCommissioningLastNetworkID() {}
+    ~ReadThermostatMaxHeatSetpointLimit() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000016) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        [cluster readAttributeLastNetworkIDWithCompletionHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"NetworkCommissioning.LastNetworkID response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeMaxHeatSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.MaxHeatSetpointLimit response %@", [value description]);
             if (error != nil) {
-                LogNSError("NetworkCommissioning LastNetworkID read Error", error);
+                LogNSError("Thermostat MaxHeatSetpointLimit read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -48801,102 +47786,70 @@ class ReadNetworkCommissioningLastNetworkID : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeNetworkCommissioningLastNetworkID : public SubscribeAttribute {
+class WriteThermostatMaxHeatSetpointLimit : public WriteAttribute {
 public:
-    SubscribeAttributeNetworkCommissioningLastNetworkID()
-        : SubscribeAttribute("last-network-id")
+    WriteThermostatMaxHeatSetpointLimit()
+        : WriteAttribute("max-heat-setpoint-limit")
     {
+        AddArgument("attr-name", "max-heat-setpoint-limit");
+        AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeNetworkCommissioningLastNetworkID() {}
+    ~WriteThermostatMaxHeatSetpointLimit() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000016) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLastNetworkIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"NetworkCommissioning.LastNetworkID response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue];
 
+        [cluster writeAttributeMaxHeatSetpointLimitWithValue:value
+                                                      params:params
+                                           completionHandler:^(NSError * _Nullable error) {
+                                               if (error != nil) {
+                                                   LogNSError("Thermostat MaxHeatSetpointLimit write Error", error);
+                                               }
+                                               SetCommandExitStatus(error);
+                                           }];
         return CHIP_NO_ERROR;
     }
-};
-
-/*
- * Attribute LastConnectErrorValue
- */
-class ReadNetworkCommissioningLastConnectErrorValue : public ReadAttribute {
-public:
-    ReadNetworkCommissioningLastConnectErrorValue()
-        : ReadAttribute("last-connect-error-value")
-    {
-    }
 
-    ~ReadNetworkCommissioningLastConnectErrorValue() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x00000007) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        [cluster readAttributeLastConnectErrorValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"NetworkCommissioning.LastConnectErrorValue response %@", [value description]);
-            if (error != nil) {
-                LogNSError("NetworkCommissioning LastConnectErrorValue read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
+private:
+    int16_t mValue;
 };
 
-class SubscribeAttributeNetworkCommissioningLastConnectErrorValue : public SubscribeAttribute {
+class SubscribeAttributeThermostatMaxHeatSetpointLimit : public SubscribeAttribute {
 public:
-    SubscribeAttributeNetworkCommissioningLastConnectErrorValue()
-        : SubscribeAttribute("last-connect-error-value")
+    SubscribeAttributeThermostatMaxHeatSetpointLimit()
+        : SubscribeAttribute("max-heat-setpoint-limit")
     {
     }
 
-    ~SubscribeAttributeNetworkCommissioningLastConnectErrorValue() {}
+    ~SubscribeAttributeThermostatMaxHeatSetpointLimit() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000016) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLastConnectErrorValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMaxHeatSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"NetworkCommissioning.LastConnectErrorValue response %@", [value description]);
+                NSLog(@"Thermostat.MaxHeatSetpointLimit response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -48907,29 +47860,27 @@ class SubscribeAttributeNetworkCommissioningLastConnectErrorValue : public Subsc
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute MinCoolSetpointLimit
  */
-class ReadNetworkCommissioningGeneratedCommandList : public ReadAttribute {
+class ReadThermostatMinCoolSetpointLimit : public ReadAttribute {
 public:
-    ReadNetworkCommissioningGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadThermostatMinCoolSetpointLimit()
+        : ReadAttribute("min-cool-setpoint-limit")
     {
     }
 
-    ~ReadNetworkCommissioningGeneratedCommandList() {}
+    ~ReadThermostatMinCoolSetpointLimit() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000017) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"NetworkCommissioning.GeneratedCommandList response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeMinCoolSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.MinCoolSetpointLimit response %@", [value description]);
             if (error != nil) {
-                LogNSError("NetworkCommissioning GeneratedCommandList read Error", error);
+                LogNSError("Thermostat MinCoolSetpointLimit read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -48937,34 +47888,70 @@ class ReadNetworkCommissioningGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeNetworkCommissioningGeneratedCommandList : public SubscribeAttribute {
+class WriteThermostatMinCoolSetpointLimit : public WriteAttribute {
 public:
-    SubscribeAttributeNetworkCommissioningGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    WriteThermostatMinCoolSetpointLimit()
+        : WriteAttribute("min-cool-setpoint-limit")
     {
+        AddArgument("attr-name", "min-cool-setpoint-limit");
+        AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeNetworkCommissioningGeneratedCommandList() {}
+    ~WriteThermostatMinCoolSetpointLimit() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000017) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue];
+
+        [cluster writeAttributeMinCoolSetpointLimitWithValue:value
+                                                      params:params
+                                           completionHandler:^(NSError * _Nullable error) {
+                                               if (error != nil) {
+                                                   LogNSError("Thermostat MinCoolSetpointLimit write Error", error);
+                                               }
+                                               SetCommandExitStatus(error);
+                                           }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    int16_t mValue;
+};
+
+class SubscribeAttributeThermostatMinCoolSetpointLimit : public SubscribeAttribute {
+public:
+    SubscribeAttributeThermostatMinCoolSetpointLimit()
+        : SubscribeAttribute("min-cool-setpoint-limit")
+    {
+    }
+
+    ~SubscribeAttributeThermostatMinCoolSetpointLimit() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000017) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMinCoolSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"NetworkCommissioning.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.MinCoolSetpointLimit response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -48975,29 +47962,27 @@ class SubscribeAttributeNetworkCommissioningGeneratedCommandList : public Subscr
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute MaxCoolSetpointLimit
  */
-class ReadNetworkCommissioningAcceptedCommandList : public ReadAttribute {
+class ReadThermostatMaxCoolSetpointLimit : public ReadAttribute {
 public:
-    ReadNetworkCommissioningAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadThermostatMaxCoolSetpointLimit()
+        : ReadAttribute("max-cool-setpoint-limit")
     {
     }
 
-    ~ReadNetworkCommissioningAcceptedCommandList() {}
+    ~ReadThermostatMaxCoolSetpointLimit() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000018) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"NetworkCommissioning.AcceptedCommandList response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeMaxCoolSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.MaxCoolSetpointLimit response %@", [value description]);
             if (error != nil) {
-                LogNSError("NetworkCommissioning AcceptedCommandList read Error", error);
+                LogNSError("Thermostat MaxCoolSetpointLimit read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -49005,34 +47990,70 @@ class ReadNetworkCommissioningAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeNetworkCommissioningAcceptedCommandList : public SubscribeAttribute {
+class WriteThermostatMaxCoolSetpointLimit : public WriteAttribute {
 public:
-    SubscribeAttributeNetworkCommissioningAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    WriteThermostatMaxCoolSetpointLimit()
+        : WriteAttribute("max-cool-setpoint-limit")
     {
+        AddArgument("attr-name", "max-cool-setpoint-limit");
+        AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeNetworkCommissioningAcceptedCommandList() {}
+    ~WriteThermostatMaxCoolSetpointLimit() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000018) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue];
+
+        [cluster writeAttributeMaxCoolSetpointLimitWithValue:value
+                                                      params:params
+                                           completionHandler:^(NSError * _Nullable error) {
+                                               if (error != nil) {
+                                                   LogNSError("Thermostat MaxCoolSetpointLimit write Error", error);
+                                               }
+                                               SetCommandExitStatus(error);
+                                           }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    int16_t mValue;
+};
+
+class SubscribeAttributeThermostatMaxCoolSetpointLimit : public SubscribeAttribute {
+public:
+    SubscribeAttributeThermostatMaxCoolSetpointLimit()
+        : SubscribeAttribute("max-cool-setpoint-limit")
+    {
+    }
+
+    ~SubscribeAttributeThermostatMaxCoolSetpointLimit() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000018) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMaxCoolSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"NetworkCommissioning.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.MaxCoolSetpointLimit response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -49043,29 +48064,27 @@ class SubscribeAttributeNetworkCommissioningAcceptedCommandList : public Subscri
 };
 
 /*
- * Attribute AttributeList
+ * Attribute MinSetpointDeadBand
  */
-class ReadNetworkCommissioningAttributeList : public ReadAttribute {
+class ReadThermostatMinSetpointDeadBand : public ReadAttribute {
 public:
-    ReadNetworkCommissioningAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadThermostatMinSetpointDeadBand()
+        : ReadAttribute("min-setpoint-dead-band")
     {
     }
 
-    ~ReadNetworkCommissioningAttributeList() {}
+    ~ReadThermostatMinSetpointDeadBand() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000019) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"NetworkCommissioning.AttributeList response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeMinSetpointDeadBandWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.MinSetpointDeadBand response %@", [value description]);
             if (error != nil) {
-                LogNSError("NetworkCommissioning AttributeList read Error", error);
+                LogNSError("Thermostat MinSetpointDeadBand read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -49073,34 +48092,70 @@ class ReadNetworkCommissioningAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeNetworkCommissioningAttributeList : public SubscribeAttribute {
+class WriteThermostatMinSetpointDeadBand : public WriteAttribute {
 public:
-    SubscribeAttributeNetworkCommissioningAttributeList()
-        : SubscribeAttribute("attribute-list")
+    WriteThermostatMinSetpointDeadBand()
+        : WriteAttribute("min-setpoint-dead-band")
     {
+        AddArgument("attr-name", "min-setpoint-dead-band");
+        AddArgument("attr-value", INT8_MIN, INT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeNetworkCommissioningAttributeList() {}
+    ~WriteThermostatMinSetpointDeadBand() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000019) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithChar:mValue];
+
+        [cluster writeAttributeMinSetpointDeadBandWithValue:value
+                                                     params:params
+                                          completionHandler:^(NSError * _Nullable error) {
+                                              if (error != nil) {
+                                                  LogNSError("Thermostat MinSetpointDeadBand write Error", error);
+                                              }
+                                              SetCommandExitStatus(error);
+                                          }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    int8_t mValue;
+};
+
+class SubscribeAttributeThermostatMinSetpointDeadBand : public SubscribeAttribute {
+public:
+    SubscribeAttributeThermostatMinSetpointDeadBand()
+        : SubscribeAttribute("min-setpoint-dead-band")
+    {
+    }
+
+    ~SubscribeAttributeThermostatMinSetpointDeadBand() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000019) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMinSetpointDeadBandWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"NetworkCommissioning.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.MinSetpointDeadBand response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -49111,29 +48166,27 @@ class SubscribeAttributeNetworkCommissioningAttributeList : public SubscribeAttr
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute RemoteSensing
  */
-class ReadNetworkCommissioningFeatureMap : public ReadAttribute {
+class ReadThermostatRemoteSensing : public ReadAttribute {
 public:
-    ReadNetworkCommissioningFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadThermostatRemoteSensing()
+        : ReadAttribute("remote-sensing")
     {
     }
 
-    ~ReadNetworkCommissioningFeatureMap() {}
+    ~ReadThermostatRemoteSensing() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x0000001A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"NetworkCommissioning.FeatureMap response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeRemoteSensingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.RemoteSensing response %@", [value description]);
             if (error != nil) {
-                LogNSError("NetworkCommissioning FeatureMap read Error", error);
+                LogNSError("Thermostat RemoteSensing read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -49141,34 +48194,70 @@ class ReadNetworkCommissioningFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeNetworkCommissioningFeatureMap : public SubscribeAttribute {
+class WriteThermostatRemoteSensing : public WriteAttribute {
 public:
-    SubscribeAttributeNetworkCommissioningFeatureMap()
-        : SubscribeAttribute("feature-map")
+    WriteThermostatRemoteSensing()
+        : WriteAttribute("remote-sensing")
     {
+        AddArgument("attr-name", "remote-sensing");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeNetworkCommissioningFeatureMap() {}
+    ~WriteThermostatRemoteSensing() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x0000001A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeRemoteSensingWithValue:value
+                                               params:params
+                                    completionHandler:^(NSError * _Nullable error) {
+                                        if (error != nil) {
+                                            LogNSError("Thermostat RemoteSensing write Error", error);
+                                        }
+                                        SetCommandExitStatus(error);
+                                    }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeThermostatRemoteSensing : public SubscribeAttribute {
+public:
+    SubscribeAttributeThermostatRemoteSensing()
+        : SubscribeAttribute("remote-sensing")
+    {
+    }
+
+    ~SubscribeAttributeThermostatRemoteSensing() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x0000001A) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRemoteSensingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"NetworkCommissioning.FeatureMap response %@", [value description]);
+                NSLog(@"Thermostat.RemoteSensing response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -49179,64 +48268,99 @@ class SubscribeAttributeNetworkCommissioningFeatureMap : public SubscribeAttribu
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute ControlSequenceOfOperation
  */
-class ReadNetworkCommissioningClusterRevision : public ReadAttribute {
+class ReadThermostatControlSequenceOfOperation : public ReadAttribute {
 public:
-    ReadNetworkCommissioningClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadThermostatControlSequenceOfOperation()
+        : ReadAttribute("control-sequence-of-operation")
     {
     }
 
-    ~ReadNetworkCommissioningClusterRevision() {}
+    ~ReadThermostatControlSequenceOfOperation() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x0000001B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"NetworkCommissioning.ClusterRevision response %@", [value description]);
-            if (error != nil) {
-                LogNSError("NetworkCommissioning ClusterRevision read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeControlSequenceOfOperationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.ControlSequenceOfOperation response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("Thermostat ControlSequenceOfOperation read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeNetworkCommissioningClusterRevision : public SubscribeAttribute {
+class WriteThermostatControlSequenceOfOperation : public WriteAttribute {
 public:
-    SubscribeAttributeNetworkCommissioningClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    WriteThermostatControlSequenceOfOperation()
+        : WriteAttribute("control-sequence-of-operation")
     {
+        AddArgument("attr-name", "control-sequence-of-operation");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeNetworkCommissioningClusterRevision() {}
+    ~WriteThermostatControlSequenceOfOperation() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000031) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x0000001B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPNetworkCommissioning * cluster = [[CHIPNetworkCommissioning alloc] initWithDevice:device
-                                                                                     endpoint:endpointId
-                                                                                        queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeControlSequenceOfOperationWithValue:value
+                                                            params:params
+                                                 completionHandler:^(NSError * _Nullable error) {
+                                                     if (error != nil) {
+                                                         LogNSError("Thermostat ControlSequenceOfOperation write Error", error);
+                                                     }
+                                                     SetCommandExitStatus(error);
+                                                 }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeThermostatControlSequenceOfOperation : public SubscribeAttribute {
+public:
+    SubscribeAttributeThermostatControlSequenceOfOperation()
+        : SubscribeAttribute("control-sequence-of-operation")
+    {
+    }
+
+    ~SubscribeAttributeThermostatControlSequenceOfOperation() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x0000001B) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeControlSequenceOfOperationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"NetworkCommissioning.ClusterRevision response %@", [value description]);
+                NSLog(@"Thermostat.ControlSequenceOfOperation response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -49246,239 +48370,130 @@ class SubscribeAttributeNetworkCommissioningClusterRevision : public SubscribeAt
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster OtaSoftwareUpdateProvider                                   | 0x0029 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * QueryImage                                                        |   0x00 |
-| * ApplyUpdateRequest                                                |   0x02 |
-| * NotifyUpdateApplied                                               |   0x04 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command QueryImage
+ * Attribute SystemMode
  */
-class OtaSoftwareUpdateProviderQueryImage : public ClusterCommand {
+class ReadThermostatSystemMode : public ReadAttribute {
 public:
-    OtaSoftwareUpdateProviderQueryImage()
-        : ClusterCommand("query-image")
-        , mComplex_ProtocolsSupported(&mRequest.protocolsSupported)
+    ReadThermostatSystemMode()
+        : ReadAttribute("system-mode")
     {
-        AddArgument("VendorId", 0, UINT16_MAX, &mRequest.vendorId);
-        AddArgument("ProductId", 0, UINT16_MAX, &mRequest.productId);
-        AddArgument("SoftwareVersion", 0, UINT32_MAX, &mRequest.softwareVersion);
-        AddArgument("ProtocolsSupported", &mComplex_ProtocolsSupported);
-        AddArgument("HardwareVersion", 0, UINT16_MAX, &mRequest.hardwareVersion);
-        AddArgument("Location", &mRequest.location);
-        AddArgument("RequestorCanConsent", 0, 1, &mRequest.requestorCanConsent);
-        AddArgument("MetadataForProvider", &mRequest.metadataForProvider);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadThermostatSystemMode() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000029) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x0000001C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
-        __auto_type * params = [[CHIPOtaSoftwareUpdateProviderClusterQueryImageParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.vendorId = [NSNumber numberWithUnsignedShort:chip::to_underlying(mRequest.vendorId)];
-        params.productId = [NSNumber numberWithUnsignedShort:mRequest.productId];
-        params.softwareVersion = [NSNumber numberWithUnsignedInt:mRequest.softwareVersion];
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mRequest.protocolsSupported) {
-                NSNumber * newElement_0;
-                newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
-                [array_0 addObject:newElement_0];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeSystemModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.SystemMode response %@", [value description]);
+            if (error != nil) {
+                LogNSError("Thermostat SystemMode read Error", error);
             }
-            params.protocolsSupported = array_0;
-        }
-        if (mRequest.hardwareVersion.HasValue()) {
-            params.hardwareVersion = [NSNumber numberWithUnsignedShort:mRequest.hardwareVersion.Value()];
-        } else {
-            params.hardwareVersion = nil;
-        }
-        if (mRequest.location.HasValue()) {
-            params.location = [[NSString alloc] initWithBytes:mRequest.location.Value().data()
-                                                       length:mRequest.location.Value().size()
-                                                     encoding:NSUTF8StringEncoding];
-        } else {
-            params.location = nil;
-        }
-        if (mRequest.requestorCanConsent.HasValue()) {
-            params.requestorCanConsent = [NSNumber numberWithBool:mRequest.requestorCanConsent.Value()];
-        } else {
-            params.requestorCanConsent = nil;
-        }
-        if (mRequest.metadataForProvider.HasValue()) {
-            params.metadataForProvider = [NSData dataWithBytes:mRequest.metadataForProvider.Value().data()
-                                                        length:mRequest.metadataForProvider.Value().size()];
-        } else {
-            params.metadataForProvider = nil;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster queryImageWithParams:params
-                        completionHandler:^(CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseParams * _Nullable values,
-                            NSError * _Nullable error) {
-                            NSLog(@"Values: %@", values);
-                            responsesNeeded--;
-                            if (error != nil) {
-                                mError = error;
-                                LogNSError("Error", error);
-                            }
-                            if (responsesNeeded == 0) {
-                                SetCommandExitStatus(mError);
-                            }
-                        }];
-        }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImage::Type mRequest;
-    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::OtaSoftwareUpdateProvider::OTADownloadProtocol>>
-        mComplex_ProtocolsSupported;
 };
 
-/*
- * Command ApplyUpdateRequest
- */
-class OtaSoftwareUpdateProviderApplyUpdateRequest : public ClusterCommand {
+class WriteThermostatSystemMode : public WriteAttribute {
 public:
-    OtaSoftwareUpdateProviderApplyUpdateRequest()
-        : ClusterCommand("apply-update-request")
+    WriteThermostatSystemMode()
+        : WriteAttribute("system-mode")
     {
-        AddArgument("UpdateToken", &mRequest.updateToken);
-        AddArgument("NewVersion", 0, UINT32_MAX, &mRequest.newVersion);
-        ClusterCommand::AddArguments();
+        AddArgument("attr-name", "system-mode");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
+    ~WriteThermostatSystemMode() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000029) command (0x00000002) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x0000001C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
-        __auto_type * params = [[CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestParams alloc] init];
-        params.timedInvokeTimeoutMs
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.updateToken = [NSData dataWithBytes:mRequest.updateToken.data() length:mRequest.updateToken.size()];
-        params.newVersion = [NSNumber numberWithUnsignedInt:mRequest.newVersion];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster
-                applyUpdateRequestWithParams:params
-                           completionHandler:^(CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseParams * _Nullable values,
-                               NSError * _Nullable error) {
-                               NSLog(@"Values: %@", values);
-                               responsesNeeded--;
-                               if (error != nil) {
-                                   mError = error;
-                                   LogNSError("Error", error);
-                               }
-                               if (responsesNeeded == 0) {
-                                   SetCommandExitStatus(mError);
-                               }
-                           }];
-        }
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeSystemModeWithValue:value
+                                            params:params
+                                 completionHandler:^(NSError * _Nullable error) {
+                                     if (error != nil) {
+                                         LogNSError("Thermostat SystemMode write Error", error);
+                                     }
+                                     SetCommandExitStatus(error);
+                                 }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateRequest::Type mRequest;
+    uint8_t mValue;
 };
 
-/*
- * Command NotifyUpdateApplied
- */
-class OtaSoftwareUpdateProviderNotifyUpdateApplied : public ClusterCommand {
+class SubscribeAttributeThermostatSystemMode : public SubscribeAttribute {
 public:
-    OtaSoftwareUpdateProviderNotifyUpdateApplied()
-        : ClusterCommand("notify-update-applied")
+    SubscribeAttributeThermostatSystemMode()
+        : SubscribeAttribute("system-mode")
     {
-        AddArgument("UpdateToken", &mRequest.updateToken);
-        AddArgument("SoftwareVersion", 0, UINT32_MAX, &mRequest.softwareVersion);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeThermostatSystemMode() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000029) command (0x00000004) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x0000001C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
-        __auto_type * params = [[CHIPOtaSoftwareUpdateProviderClusterNotifyUpdateAppliedParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.updateToken = [NSData dataWithBytes:mRequest.updateToken.data() length:mRequest.updateToken.size()];
-        params.softwareVersion = [NSNumber numberWithUnsignedInt:mRequest.softwareVersion];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster notifyUpdateAppliedWithParams:params
-                                 completionHandler:^(NSError * _Nullable error) {
-                                     responsesNeeded--;
-                                     if (error != nil) {
-                                         mError = error;
-                                         LogNSError("Error", error);
-                                     }
-                                     if (responsesNeeded == 0) {
-                                         SetCommandExitStatus(mError);
-                                     }
-                                 }];
-        }
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeSystemModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.SystemMode response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::NotifyUpdateApplied::Type mRequest;
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute ThermostatRunningMode
  */
-class ReadOtaSoftwareUpdateProviderGeneratedCommandList : public ReadAttribute {
+class ReadThermostatThermostatRunningMode : public ReadAttribute {
 public:
-    ReadOtaSoftwareUpdateProviderGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadThermostatThermostatRunningMode()
+        : ReadAttribute("thermostat-running-mode")
     {
     }
 
-    ~ReadOtaSoftwareUpdateProviderGeneratedCommandList() {}
+    ~ReadThermostatThermostatRunningMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000029) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x0000001E) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OtaSoftwareUpdateProvider.GeneratedCommandList response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeThermostatRunningModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.ThermostatRunningMode response %@", [value description]);
             if (error != nil) {
-                LogNSError("OtaSoftwareUpdateProvider GeneratedCommandList read Error", error);
+                LogNSError("Thermostat ThermostatRunningMode read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -49486,34 +48501,32 @@ class ReadOtaSoftwareUpdateProviderGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOtaSoftwareUpdateProviderGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeThermostatThermostatRunningMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeOtaSoftwareUpdateProviderGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeThermostatThermostatRunningMode()
+        : SubscribeAttribute("thermostat-running-mode")
     {
     }
 
-    ~SubscribeAttributeOtaSoftwareUpdateProviderGeneratedCommandList() {}
+    ~SubscribeAttributeThermostatThermostatRunningMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000029) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x0000001E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeThermostatRunningModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OtaSoftwareUpdateProvider.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.ThermostatRunningMode response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -49524,29 +48537,27 @@ class SubscribeAttributeOtaSoftwareUpdateProviderGeneratedCommandList : public S
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute StartOfWeek
  */
-class ReadOtaSoftwareUpdateProviderAcceptedCommandList : public ReadAttribute {
+class ReadThermostatStartOfWeek : public ReadAttribute {
 public:
-    ReadOtaSoftwareUpdateProviderAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadThermostatStartOfWeek()
+        : ReadAttribute("start-of-week")
     {
     }
 
-    ~ReadOtaSoftwareUpdateProviderAcceptedCommandList() {}
+    ~ReadThermostatStartOfWeek() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000029) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000020) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OtaSoftwareUpdateProvider.AcceptedCommandList response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeStartOfWeekWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.StartOfWeek response %@", [value description]);
             if (error != nil) {
-                LogNSError("OtaSoftwareUpdateProvider AcceptedCommandList read Error", error);
+                LogNSError("Thermostat StartOfWeek read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -49554,34 +48565,32 @@ class ReadOtaSoftwareUpdateProviderAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOtaSoftwareUpdateProviderAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeThermostatStartOfWeek : public SubscribeAttribute {
 public:
-    SubscribeAttributeOtaSoftwareUpdateProviderAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeThermostatStartOfWeek()
+        : SubscribeAttribute("start-of-week")
     {
     }
 
-    ~SubscribeAttributeOtaSoftwareUpdateProviderAcceptedCommandList() {}
+    ~SubscribeAttributeThermostatStartOfWeek() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000029) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000020) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeStartOfWeekWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OtaSoftwareUpdateProvider.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.StartOfWeek response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -49592,64 +48601,61 @@ class SubscribeAttributeOtaSoftwareUpdateProviderAcceptedCommandList : public Su
 };
 
 /*
- * Attribute AttributeList
+ * Attribute NumberOfWeeklyTransitions
  */
-class ReadOtaSoftwareUpdateProviderAttributeList : public ReadAttribute {
+class ReadThermostatNumberOfWeeklyTransitions : public ReadAttribute {
 public:
-    ReadOtaSoftwareUpdateProviderAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadThermostatNumberOfWeeklyTransitions()
+        : ReadAttribute("number-of-weekly-transitions")
     {
     }
 
-    ~ReadOtaSoftwareUpdateProviderAttributeList() {}
+    ~ReadThermostatNumberOfWeeklyTransitions() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000029) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000021) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OtaSoftwareUpdateProvider.AttributeList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("OtaSoftwareUpdateProvider AttributeList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeNumberOfWeeklyTransitionsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.NumberOfWeeklyTransitions response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("Thermostat NumberOfWeeklyTransitions read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeOtaSoftwareUpdateProviderAttributeList : public SubscribeAttribute {
+class SubscribeAttributeThermostatNumberOfWeeklyTransitions : public SubscribeAttribute {
 public:
-    SubscribeAttributeOtaSoftwareUpdateProviderAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeThermostatNumberOfWeeklyTransitions()
+        : SubscribeAttribute("number-of-weekly-transitions")
     {
     }
 
-    ~SubscribeAttributeOtaSoftwareUpdateProviderAttributeList() {}
+    ~SubscribeAttributeThermostatNumberOfWeeklyTransitions() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000029) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000021) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNumberOfWeeklyTransitionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OtaSoftwareUpdateProvider.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.NumberOfWeeklyTransitions response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -49660,64 +48666,61 @@ class SubscribeAttributeOtaSoftwareUpdateProviderAttributeList : public Subscrib
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute NumberOfDailyTransitions
  */
-class ReadOtaSoftwareUpdateProviderFeatureMap : public ReadAttribute {
+class ReadThermostatNumberOfDailyTransitions : public ReadAttribute {
 public:
-    ReadOtaSoftwareUpdateProviderFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadThermostatNumberOfDailyTransitions()
+        : ReadAttribute("number-of-daily-transitions")
     {
     }
 
-    ~ReadOtaSoftwareUpdateProviderFeatureMap() {}
+    ~ReadThermostatNumberOfDailyTransitions() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000029) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000022) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OtaSoftwareUpdateProvider.FeatureMap response %@", [value description]);
-            if (error != nil) {
-                LogNSError("OtaSoftwareUpdateProvider FeatureMap read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeNumberOfDailyTransitionsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.NumberOfDailyTransitions response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("Thermostat NumberOfDailyTransitions read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeOtaSoftwareUpdateProviderFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeThermostatNumberOfDailyTransitions : public SubscribeAttribute {
 public:
-    SubscribeAttributeOtaSoftwareUpdateProviderFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeThermostatNumberOfDailyTransitions()
+        : SubscribeAttribute("number-of-daily-transitions")
     {
     }
 
-    ~SubscribeAttributeOtaSoftwareUpdateProviderFeatureMap() {}
+    ~SubscribeAttributeThermostatNumberOfDailyTransitions() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000029) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000022) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNumberOfDailyTransitionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OtaSoftwareUpdateProvider.FeatureMap response %@", [value description]);
+                NSLog(@"Thermostat.NumberOfDailyTransitions response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -49728,64 +48731,99 @@ class SubscribeAttributeOtaSoftwareUpdateProviderFeatureMap : public SubscribeAt
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute TemperatureSetpointHold
  */
-class ReadOtaSoftwareUpdateProviderClusterRevision : public ReadAttribute {
+class ReadThermostatTemperatureSetpointHold : public ReadAttribute {
 public:
-    ReadOtaSoftwareUpdateProviderClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadThermostatTemperatureSetpointHold()
+        : ReadAttribute("temperature-setpoint-hold")
     {
     }
 
-    ~ReadOtaSoftwareUpdateProviderClusterRevision() {}
+    ~ReadThermostatTemperatureSetpointHold() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000029) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000023) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OtaSoftwareUpdateProvider.ClusterRevision response %@", [value description]);
-            if (error != nil) {
-                LogNSError("OtaSoftwareUpdateProvider ClusterRevision read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeTemperatureSetpointHoldWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.TemperatureSetpointHold response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("Thermostat TemperatureSetpointHold read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeOtaSoftwareUpdateProviderClusterRevision : public SubscribeAttribute {
+class WriteThermostatTemperatureSetpointHold : public WriteAttribute {
 public:
-    SubscribeAttributeOtaSoftwareUpdateProviderClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    WriteThermostatTemperatureSetpointHold()
+        : WriteAttribute("temperature-setpoint-hold")
     {
+        AddArgument("attr-name", "temperature-setpoint-hold");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeOtaSoftwareUpdateProviderClusterRevision() {}
+    ~WriteThermostatTemperatureSetpointHold() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000029) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000023) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateProvider * cluster = [[CHIPOtaSoftwareUpdateProvider alloc] initWithDevice:device
-                                                                                               endpoint:endpointId
-                                                                                                  queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeTemperatureSetpointHoldWithValue:value
+                                                         params:params
+                                              completionHandler:^(NSError * _Nullable error) {
+                                                  if (error != nil) {
+                                                      LogNSError("Thermostat TemperatureSetpointHold write Error", error);
+                                                  }
+                                                  SetCommandExitStatus(error);
+                                              }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeThermostatTemperatureSetpointHold : public SubscribeAttribute {
+public:
+    SubscribeAttributeThermostatTemperatureSetpointHold()
+        : SubscribeAttribute("temperature-setpoint-hold")
+    {
+    }
+
+    ~SubscribeAttributeThermostatTemperatureSetpointHold() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000023) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTemperatureSetpointHoldWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OtaSoftwareUpdateProvider.ClusterRevision response %@", [value description]);
+                NSLog(@"Thermostat.TemperatureSetpointHold response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -49795,207 +48833,101 @@ class SubscribeAttributeOtaSoftwareUpdateProviderClusterRevision : public Subscr
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster OtaSoftwareUpdateRequestor                                  | 0x002A |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * AnnounceOtaProvider                                               |   0x00 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * DefaultOtaProviders                                               | 0x0000 |
-| * UpdatePossible                                                    | 0x0001 |
-| * UpdateState                                                       | 0x0002 |
-| * UpdateStateProgress                                               | 0x0003 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-| * StateTransition                                                   | 0x0000 |
-| * VersionApplied                                                    | 0x0001 |
-| * DownloadError                                                     | 0x0002 |
-\*----------------------------------------------------------------------------*/
-
-/*
- * Command AnnounceOtaProvider
- */
-class OtaSoftwareUpdateRequestorAnnounceOtaProvider : public ClusterCommand {
-public:
-    OtaSoftwareUpdateRequestorAnnounceOtaProvider()
-        : ClusterCommand("announce-ota-provider")
-    {
-        AddArgument("ProviderNodeId", 0, UINT64_MAX, &mRequest.providerNodeId);
-        AddArgument("VendorId", 0, UINT16_MAX, &mRequest.vendorId);
-        AddArgument("AnnouncementReason", 0, UINT8_MAX, &mRequest.announcementReason);
-        AddArgument("MetadataForNode", &mRequest.metadataForNode);
-        AddArgument("Endpoint", 0, UINT16_MAX, &mRequest.endpoint);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) command (0x00000000) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        __auto_type * params = [[CHIPOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.providerNodeId = [NSNumber numberWithUnsignedLongLong:mRequest.providerNodeId];
-        params.vendorId = [NSNumber numberWithUnsignedShort:chip::to_underlying(mRequest.vendorId)];
-        params.announcementReason = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.announcementReason)];
-        if (mRequest.metadataForNode.HasValue()) {
-            params.metadataForNode = [NSData dataWithBytes:mRequest.metadataForNode.Value().data()
-                                                    length:mRequest.metadataForNode.Value().size()];
-        } else {
-            params.metadataForNode = nil;
-        }
-        params.endpoint = [NSNumber numberWithUnsignedShort:mRequest.endpoint];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster announceOtaProviderWithParams:params
-                                 completionHandler:^(NSError * _Nullable error) {
-                                     responsesNeeded--;
-                                     if (error != nil) {
-                                         mError = error;
-                                         LogNSError("Error", error);
-                                     }
-                                     if (responsesNeeded == 0) {
-                                         SetCommandExitStatus(mError);
-                                     }
-                                 }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::OtaSoftwareUpdateRequestor::Commands::AnnounceOtaProvider::Type mRequest;
-};
-
 /*
- * Attribute DefaultOtaProviders
+ * Attribute TemperatureSetpointHoldDuration
  */
-class ReadOtaSoftwareUpdateRequestorDefaultOtaProviders : public ReadAttribute {
+class ReadThermostatTemperatureSetpointHoldDuration : public ReadAttribute {
 public:
-    ReadOtaSoftwareUpdateRequestorDefaultOtaProviders()
-        : ReadAttribute("default-ota-providers")
+    ReadThermostatTemperatureSetpointHoldDuration()
+        : ReadAttribute("temperature-setpoint-hold-duration")
     {
     }
 
-    ~ReadOtaSoftwareUpdateRequestorDefaultOtaProviders() {}
+    ~ReadThermostatTemperatureSetpointHoldDuration() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000024) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        CHIPReadParams * params = [[CHIPReadParams alloc] init];
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            readAttributeDefaultOtaProvidersWithParams:params
-                                     completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                         NSLog(@"OtaSoftwareUpdateRequestor.DefaultOtaProviders response %@", [value description]);
-                                         if (error != nil) {
-                                             LogNSError("OtaSoftwareUpdateRequestor DefaultOtaProviders read Error", error);
-                                         }
-                                         SetCommandExitStatus(error);
-                                     }];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeTemperatureSetpointHoldDurationWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.TemperatureSetpointHoldDuration response %@", [value description]);
+            if (error != nil) {
+                LogNSError("Thermostat TemperatureSetpointHoldDuration read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class WriteOtaSoftwareUpdateRequestorDefaultOtaProviders : public WriteAttribute {
+class WriteThermostatTemperatureSetpointHoldDuration : public WriteAttribute {
 public:
-    WriteOtaSoftwareUpdateRequestorDefaultOtaProviders()
-        : WriteAttribute("default-ota-providers")
-        , mComplex(&mValue)
+    WriteThermostatTemperatureSetpointHoldDuration()
+        : WriteAttribute("temperature-setpoint-hold-duration")
     {
-        AddArgument("attr-name", "default-ota-providers");
-        AddArgument("attr-value", &mComplex);
+        AddArgument("attr-name", "temperature-setpoint-hold-duration");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteOtaSoftwareUpdateRequestorDefaultOtaProviders() {}
+    ~WriteThermostatTemperatureSetpointHoldDuration() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) WriteAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000024) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSArray * _Nonnull value;
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mValue) {
-                CHIPOtaSoftwareUpdateRequestorClusterProviderLocation * newElement_0;
-                newElement_0 = [CHIPOtaSoftwareUpdateRequestorClusterProviderLocation new];
-                newElement_0.providerNodeID = [NSNumber numberWithUnsignedLongLong:entry_0.providerNodeID];
-                newElement_0.endpoint = [NSNumber numberWithUnsignedShort:entry_0.endpoint];
-                newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
-                [array_0 addObject:newElement_0];
-            }
-            value = array_0;
-        }
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedShort:mValue];
 
-        [cluster writeAttributeDefaultOtaProvidersWithValue:value
-                                                     params:params
-                                          completionHandler:^(NSError * _Nullable error) {
-                                              if (error != nil) {
-                                                  LogNSError("OtaSoftwareUpdateRequestor DefaultOtaProviders write Error", error);
-                                              }
-                                              SetCommandExitStatus(error);
-                                          }];
+        [cluster writeAttributeTemperatureSetpointHoldDurationWithValue:value
+                                                                 params:params
+                                                      completionHandler:^(NSError * _Nullable error) {
+                                                          if (error != nil) {
+                                                              LogNSError(
+                                                                  "Thermostat TemperatureSetpointHoldDuration write Error", error);
+                                                          }
+                                                          SetCommandExitStatus(error);
+                                                      }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::DataModel::List<const chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::Type> mValue;
-    TypedComplexArgument<
-        chip::app::DataModel::List<const chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::Type>>
-        mComplex;
+    uint16_t mValue;
 };
 
-class SubscribeAttributeOtaSoftwareUpdateRequestorDefaultOtaProviders : public SubscribeAttribute {
+class SubscribeAttributeThermostatTemperatureSetpointHoldDuration : public SubscribeAttribute {
 public:
-    SubscribeAttributeOtaSoftwareUpdateRequestorDefaultOtaProviders()
-        : SubscribeAttribute("default-ota-providers")
+    SubscribeAttributeThermostatTemperatureSetpointHoldDuration()
+        : SubscribeAttribute("temperature-setpoint-hold-duration")
     {
     }
 
-    ~SubscribeAttributeOtaSoftwareUpdateRequestorDefaultOtaProviders() {}
+    ~SubscribeAttributeThermostatTemperatureSetpointHoldDuration() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000024) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDefaultOtaProvidersWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTemperatureSetpointHoldDurationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OtaSoftwareUpdateRequestor.DefaultOtaProviders response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.TemperatureSetpointHoldDuration response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -50006,29 +48938,28 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorDefaultOtaProviders : public S
 };
 
 /*
- * Attribute UpdatePossible
+ * Attribute ThermostatProgrammingOperationMode
  */
-class ReadOtaSoftwareUpdateRequestorUpdatePossible : public ReadAttribute {
+class ReadThermostatThermostatProgrammingOperationMode : public ReadAttribute {
 public:
-    ReadOtaSoftwareUpdateRequestorUpdatePossible()
-        : ReadAttribute("update-possible")
+    ReadThermostatThermostatProgrammingOperationMode()
+        : ReadAttribute("thermostat-programming-operation-mode")
     {
     }
 
-    ~ReadOtaSoftwareUpdateRequestorUpdatePossible() {}
+    ~ReadThermostatThermostatProgrammingOperationMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000025) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeUpdatePossibleWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OtaSoftwareUpdateRequestor.UpdatePossible response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeThermostatProgrammingOperationModeWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.ThermostatProgrammingOperationMode response %@", [value description]);
             if (error != nil) {
-                LogNSError("OtaSoftwareUpdateRequestor UpdatePossible read Error", error);
+                LogNSError("Thermostat ThermostatProgrammingOperationMode read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -50036,34 +48967,72 @@ class ReadOtaSoftwareUpdateRequestorUpdatePossible : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOtaSoftwareUpdateRequestorUpdatePossible : public SubscribeAttribute {
+class WriteThermostatThermostatProgrammingOperationMode : public WriteAttribute {
 public:
-    SubscribeAttributeOtaSoftwareUpdateRequestorUpdatePossible()
-        : SubscribeAttribute("update-possible")
+    WriteThermostatThermostatProgrammingOperationMode()
+        : WriteAttribute("thermostat-programming-operation-mode")
     {
+        AddArgument("attr-name", "thermostat-programming-operation-mode");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeOtaSoftwareUpdateRequestorUpdatePossible() {}
+    ~WriteThermostatThermostatProgrammingOperationMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000025) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster
+            writeAttributeThermostatProgrammingOperationModeWithValue:value
+                                                               params:params
+                                                    completionHandler:^(NSError * _Nullable error) {
+                                                        if (error != nil) {
+                                                            LogNSError(
+                                                                "Thermostat ThermostatProgrammingOperationMode write Error", error);
+                                                        }
+                                                        SetCommandExitStatus(error);
+                                                    }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeThermostatThermostatProgrammingOperationMode : public SubscribeAttribute {
+public:
+    SubscribeAttributeThermostatThermostatProgrammingOperationMode()
+        : SubscribeAttribute("thermostat-programming-operation-mode")
+    {
+    }
+
+    ~SubscribeAttributeThermostatThermostatProgrammingOperationMode() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000025) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeUpdatePossibleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeThermostatProgrammingOperationModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OtaSoftwareUpdateRequestor.UpdatePossible response %@", [value description]);
+                NSLog(@"Thermostat.ThermostatProgrammingOperationMode response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -50074,29 +49043,27 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorUpdatePossible : public Subscr
 };
 
 /*
- * Attribute UpdateState
+ * Attribute ThermostatRunningState
  */
-class ReadOtaSoftwareUpdateRequestorUpdateState : public ReadAttribute {
+class ReadThermostatThermostatRunningState : public ReadAttribute {
 public:
-    ReadOtaSoftwareUpdateRequestorUpdateState()
-        : ReadAttribute("update-state")
+    ReadThermostatThermostatRunningState()
+        : ReadAttribute("thermostat-running-state")
     {
     }
 
-    ~ReadOtaSoftwareUpdateRequestorUpdateState() {}
+    ~ReadThermostatThermostatRunningState() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000029) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeUpdateStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OtaSoftwareUpdateRequestor.UpdateState response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeThermostatRunningStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.ThermostatRunningState response %@", [value description]);
             if (error != nil) {
-                LogNSError("OtaSoftwareUpdateRequestor UpdateState read Error", error);
+                LogNSError("Thermostat ThermostatRunningState read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -50104,34 +49071,32 @@ class ReadOtaSoftwareUpdateRequestorUpdateState : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOtaSoftwareUpdateRequestorUpdateState : public SubscribeAttribute {
+class SubscribeAttributeThermostatThermostatRunningState : public SubscribeAttribute {
 public:
-    SubscribeAttributeOtaSoftwareUpdateRequestorUpdateState()
-        : SubscribeAttribute("update-state")
+    SubscribeAttributeThermostatThermostatRunningState()
+        : SubscribeAttribute("thermostat-running-state")
     {
     }
 
-    ~SubscribeAttributeOtaSoftwareUpdateRequestorUpdateState() {}
+    ~SubscribeAttributeThermostatThermostatRunningState() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000029) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeUpdateStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeThermostatRunningStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OtaSoftwareUpdateRequestor.UpdateState response %@", [value description]);
+                NSLog(@"Thermostat.ThermostatRunningState response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -50142,29 +49107,27 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorUpdateState : public Subscribe
 };
 
 /*
- * Attribute UpdateStateProgress
+ * Attribute SetpointChangeSource
  */
-class ReadOtaSoftwareUpdateRequestorUpdateStateProgress : public ReadAttribute {
+class ReadThermostatSetpointChangeSource : public ReadAttribute {
 public:
-    ReadOtaSoftwareUpdateRequestorUpdateStateProgress()
-        : ReadAttribute("update-state-progress")
+    ReadThermostatSetpointChangeSource()
+        : ReadAttribute("setpoint-change-source")
     {
     }
 
-    ~ReadOtaSoftwareUpdateRequestorUpdateStateProgress() {}
+    ~ReadThermostatSetpointChangeSource() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000030) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeUpdateStateProgressWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OtaSoftwareUpdateRequestor.UpdateStateProgress response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeSetpointChangeSourceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.SetpointChangeSource response %@", [value description]);
             if (error != nil) {
-                LogNSError("OtaSoftwareUpdateRequestor UpdateStateProgress read Error", error);
+                LogNSError("Thermostat SetpointChangeSource read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -50172,34 +49135,32 @@ class ReadOtaSoftwareUpdateRequestorUpdateStateProgress : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOtaSoftwareUpdateRequestorUpdateStateProgress : public SubscribeAttribute {
+class SubscribeAttributeThermostatSetpointChangeSource : public SubscribeAttribute {
 public:
-    SubscribeAttributeOtaSoftwareUpdateRequestorUpdateStateProgress()
-        : SubscribeAttribute("update-state-progress")
+    SubscribeAttributeThermostatSetpointChangeSource()
+        : SubscribeAttribute("setpoint-change-source")
     {
     }
 
-    ~SubscribeAttributeOtaSoftwareUpdateRequestorUpdateStateProgress() {}
+    ~SubscribeAttributeThermostatSetpointChangeSource() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000030) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeUpdateStateProgressWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSetpointChangeSourceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OtaSoftwareUpdateRequestor.UpdateStateProgress response %@", [value description]);
+                NSLog(@"Thermostat.SetpointChangeSource response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -50210,29 +49171,27 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorUpdateStateProgress : public S
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute SetpointChangeAmount
  */
-class ReadOtaSoftwareUpdateRequestorGeneratedCommandList : public ReadAttribute {
+class ReadThermostatSetpointChangeAmount : public ReadAttribute {
 public:
-    ReadOtaSoftwareUpdateRequestorGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadThermostatSetpointChangeAmount()
+        : ReadAttribute("setpoint-change-amount")
     {
     }
 
-    ~ReadOtaSoftwareUpdateRequestorGeneratedCommandList() {}
+    ~ReadThermostatSetpointChangeAmount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000031) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OtaSoftwareUpdateRequestor.GeneratedCommandList response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeSetpointChangeAmountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.SetpointChangeAmount response %@", [value description]);
             if (error != nil) {
-                LogNSError("OtaSoftwareUpdateRequestor GeneratedCommandList read Error", error);
+                LogNSError("Thermostat SetpointChangeAmount read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -50240,34 +49199,32 @@ class ReadOtaSoftwareUpdateRequestorGeneratedCommandList : public ReadAttribute
     }
 };
 
-class SubscribeAttributeOtaSoftwareUpdateRequestorGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeThermostatSetpointChangeAmount : public SubscribeAttribute {
 public:
-    SubscribeAttributeOtaSoftwareUpdateRequestorGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeThermostatSetpointChangeAmount()
+        : SubscribeAttribute("setpoint-change-amount")
     {
     }
 
-    ~SubscribeAttributeOtaSoftwareUpdateRequestorGeneratedCommandList() {}
+    ~SubscribeAttributeThermostatSetpointChangeAmount() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000031) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSetpointChangeAmountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OtaSoftwareUpdateRequestor.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.SetpointChangeAmount response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -50278,29 +49235,28 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorGeneratedCommandList : public
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute SetpointChangeSourceTimestamp
  */
-class ReadOtaSoftwareUpdateRequestorAcceptedCommandList : public ReadAttribute {
+class ReadThermostatSetpointChangeSourceTimestamp : public ReadAttribute {
 public:
-    ReadOtaSoftwareUpdateRequestorAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadThermostatSetpointChangeSourceTimestamp()
+        : ReadAttribute("setpoint-change-source-timestamp")
     {
     }
 
-    ~ReadOtaSoftwareUpdateRequestorAcceptedCommandList() {}
+    ~ReadThermostatSetpointChangeSourceTimestamp() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000032) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OtaSoftwareUpdateRequestor.AcceptedCommandList response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeSetpointChangeSourceTimestampWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.SetpointChangeSourceTimestamp response %@", [value description]);
             if (error != nil) {
-                LogNSError("OtaSoftwareUpdateRequestor AcceptedCommandList read Error", error);
+                LogNSError("Thermostat SetpointChangeSourceTimestamp read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -50308,34 +49264,32 @@ class ReadOtaSoftwareUpdateRequestorAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOtaSoftwareUpdateRequestorAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeThermostatSetpointChangeSourceTimestamp : public SubscribeAttribute {
 public:
-    SubscribeAttributeOtaSoftwareUpdateRequestorAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeThermostatSetpointChangeSourceTimestamp()
+        : SubscribeAttribute("setpoint-change-source-timestamp")
     {
     }
 
-    ~SubscribeAttributeOtaSoftwareUpdateRequestorAcceptedCommandList() {}
+    ~SubscribeAttributeThermostatSetpointChangeSourceTimestamp() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000032) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSetpointChangeSourceTimestampWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OtaSoftwareUpdateRequestor.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.SetpointChangeSourceTimestamp response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -50346,29 +49300,27 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorAcceptedCommandList : public S
 };
 
 /*
- * Attribute AttributeList
+ * Attribute OccupiedSetback
  */
-class ReadOtaSoftwareUpdateRequestorAttributeList : public ReadAttribute {
+class ReadThermostatOccupiedSetback : public ReadAttribute {
 public:
-    ReadOtaSoftwareUpdateRequestorAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadThermostatOccupiedSetback()
+        : ReadAttribute("occupied-setback")
     {
     }
 
-    ~ReadOtaSoftwareUpdateRequestorAttributeList() {}
+    ~ReadThermostatOccupiedSetback() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000034) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OtaSoftwareUpdateRequestor.AttributeList response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeOccupiedSetbackWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.OccupiedSetback response %@", [value description]);
             if (error != nil) {
-                LogNSError("OtaSoftwareUpdateRequestor AttributeList read Error", error);
+                LogNSError("Thermostat OccupiedSetback read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -50376,34 +49328,70 @@ class ReadOtaSoftwareUpdateRequestorAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOtaSoftwareUpdateRequestorAttributeList : public SubscribeAttribute {
+class WriteThermostatOccupiedSetback : public WriteAttribute {
 public:
-    SubscribeAttributeOtaSoftwareUpdateRequestorAttributeList()
-        : SubscribeAttribute("attribute-list")
+    WriteThermostatOccupiedSetback()
+        : WriteAttribute("occupied-setback")
     {
+        AddArgument("attr-name", "occupied-setback");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeOtaSoftwareUpdateRequestorAttributeList() {}
+    ~WriteThermostatOccupiedSetback() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000034) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeOccupiedSetbackWithValue:value
+                                                 params:params
+                                      completionHandler:^(NSError * _Nullable error) {
+                                          if (error != nil) {
+                                              LogNSError("Thermostat OccupiedSetback write Error", error);
+                                          }
+                                          SetCommandExitStatus(error);
+                                      }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeThermostatOccupiedSetback : public SubscribeAttribute {
+public:
+    SubscribeAttributeThermostatOccupiedSetback()
+        : SubscribeAttribute("occupied-setback")
+    {
+    }
+
+    ~SubscribeAttributeThermostatOccupiedSetback() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000034) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOccupiedSetbackWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OtaSoftwareUpdateRequestor.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Thermostat.OccupiedSetback response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -50414,29 +49402,27 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorAttributeList : public Subscri
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute OccupiedSetbackMin
  */
-class ReadOtaSoftwareUpdateRequestorFeatureMap : public ReadAttribute {
+class ReadThermostatOccupiedSetbackMin : public ReadAttribute {
 public:
-    ReadOtaSoftwareUpdateRequestorFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadThermostatOccupiedSetbackMin()
+        : ReadAttribute("occupied-setback-min")
     {
     }
 
-    ~ReadOtaSoftwareUpdateRequestorFeatureMap() {}
+    ~ReadThermostatOccupiedSetbackMin() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000035) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OtaSoftwareUpdateRequestor.FeatureMap response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeOccupiedSetbackMinWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.OccupiedSetbackMin response %@", [value description]);
             if (error != nil) {
-                LogNSError("OtaSoftwareUpdateRequestor FeatureMap read Error", error);
+                LogNSError("Thermostat OccupiedSetbackMin read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -50444,34 +49430,32 @@ class ReadOtaSoftwareUpdateRequestorFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOtaSoftwareUpdateRequestorFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeThermostatOccupiedSetbackMin : public SubscribeAttribute {
 public:
-    SubscribeAttributeOtaSoftwareUpdateRequestorFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeThermostatOccupiedSetbackMin()
+        : SubscribeAttribute("occupied-setback-min")
     {
     }
 
-    ~SubscribeAttributeOtaSoftwareUpdateRequestorFeatureMap() {}
+    ~SubscribeAttributeThermostatOccupiedSetbackMin() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000035) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOccupiedSetbackMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OtaSoftwareUpdateRequestor.FeatureMap response %@", [value description]);
+                NSLog(@"Thermostat.OccupiedSetbackMin response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -50482,29 +49466,27 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorFeatureMap : public SubscribeA
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute OccupiedSetbackMax
  */
-class ReadOtaSoftwareUpdateRequestorClusterRevision : public ReadAttribute {
+class ReadThermostatOccupiedSetbackMax : public ReadAttribute {
 public:
-    ReadOtaSoftwareUpdateRequestorClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadThermostatOccupiedSetbackMax()
+        : ReadAttribute("occupied-setback-max")
     {
     }
 
-    ~ReadOtaSoftwareUpdateRequestorClusterRevision() {}
+    ~ReadThermostatOccupiedSetbackMax() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000036) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OtaSoftwareUpdateRequestor.ClusterRevision response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeOccupiedSetbackMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.OccupiedSetbackMax response %@", [value description]);
             if (error != nil) {
-                LogNSError("OtaSoftwareUpdateRequestor ClusterRevision read Error", error);
+                LogNSError("Thermostat OccupiedSetbackMax read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -50512,34 +49494,32 @@ class ReadOtaSoftwareUpdateRequestorClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOtaSoftwareUpdateRequestorClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeThermostatOccupiedSetbackMax : public SubscribeAttribute {
 public:
-    SubscribeAttributeOtaSoftwareUpdateRequestorClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeThermostatOccupiedSetbackMax()
+        : SubscribeAttribute("occupied-setback-max")
     {
     }
 
-    ~SubscribeAttributeOtaSoftwareUpdateRequestorClusterRevision() {}
+    ~SubscribeAttributeThermostatOccupiedSetbackMax() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002A) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000036) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOtaSoftwareUpdateRequestor * cluster = [[CHIPOtaSoftwareUpdateRequestor alloc] initWithDevice:device
-                                                                                                 endpoint:endpointId
-                                                                                                    queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOccupiedSetbackMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OtaSoftwareUpdateRequestor.ClusterRevision response %@", [value description]);
+                NSLog(@"Thermostat.OccupiedSetbackMax response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -50549,57 +49529,28 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorClusterRevision : public Subsc
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster OccupancySensing                                            | 0x0406 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * Occupancy                                                         | 0x0000 |
-| * OccupancySensorType                                               | 0x0001 |
-| * OccupancySensorTypeBitmap                                         | 0x0002 |
-| * PirOccupiedToUnoccupiedDelay                                      | 0x0010 |
-| * PirUnoccupiedToOccupiedDelay                                      | 0x0011 |
-| * PirUnoccupiedToOccupiedThreshold                                  | 0x0012 |
-| * UltrasonicOccupiedToUnoccupiedDelay                               | 0x0020 |
-| * UltrasonicUnoccupiedToOccupiedDelay                               | 0x0021 |
-| * UltrasonicUnoccupiedToOccupiedThreshold                           | 0x0022 |
-| * PhysicalContactOccupiedToUnoccupiedDelay                          | 0x0030 |
-| * PhysicalContactUnoccupiedToOccupiedDelay                          | 0x0031 |
-| * PhysicalContactUnoccupiedToOccupiedThreshold                      | 0x0032 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Attribute Occupancy
+ * Attribute UnoccupiedSetback
  */
-class ReadOccupancySensingOccupancy : public ReadAttribute {
+class ReadThermostatUnoccupiedSetback : public ReadAttribute {
 public:
-    ReadOccupancySensingOccupancy()
-        : ReadAttribute("occupancy")
+    ReadThermostatUnoccupiedSetback()
+        : ReadAttribute("unoccupied-setback")
     {
     }
 
-    ~ReadOccupancySensingOccupancy() {}
+    ~ReadThermostatUnoccupiedSetback() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000037) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeOccupancyWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OccupancySensing.Occupancy response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeUnoccupiedSetbackWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.UnoccupiedSetback response %@", [value description]);
             if (error != nil) {
-                LogNSError("OccupancySensing Occupancy read Error", error);
+                LogNSError("Thermostat UnoccupiedSetback read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -50607,34 +49558,70 @@ class ReadOccupancySensingOccupancy : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOccupancySensingOccupancy : public SubscribeAttribute {
+class WriteThermostatUnoccupiedSetback : public WriteAttribute {
 public:
-    SubscribeAttributeOccupancySensingOccupancy()
-        : SubscribeAttribute("occupancy")
+    WriteThermostatUnoccupiedSetback()
+        : WriteAttribute("unoccupied-setback")
     {
+        AddArgument("attr-name", "unoccupied-setback");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeOccupancySensingOccupancy() {}
+    ~WriteThermostatUnoccupiedSetback() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000037) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeUnoccupiedSetbackWithValue:value
+                                                   params:params
+                                        completionHandler:^(NSError * _Nullable error) {
+                                            if (error != nil) {
+                                                LogNSError("Thermostat UnoccupiedSetback write Error", error);
+                                            }
+                                            SetCommandExitStatus(error);
+                                        }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeThermostatUnoccupiedSetback : public SubscribeAttribute {
+public:
+    SubscribeAttributeThermostatUnoccupiedSetback()
+        : SubscribeAttribute("unoccupied-setback")
+    {
+    }
+
+    ~SubscribeAttributeThermostatUnoccupiedSetback() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000037) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOccupancyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeUnoccupiedSetbackWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OccupancySensing.Occupancy response %@", [value description]);
+                NSLog(@"Thermostat.UnoccupiedSetback response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -50645,29 +49632,27 @@ class SubscribeAttributeOccupancySensingOccupancy : public SubscribeAttribute {
 };
 
 /*
- * Attribute OccupancySensorType
+ * Attribute UnoccupiedSetbackMin
  */
-class ReadOccupancySensingOccupancySensorType : public ReadAttribute {
+class ReadThermostatUnoccupiedSetbackMin : public ReadAttribute {
 public:
-    ReadOccupancySensingOccupancySensorType()
-        : ReadAttribute("occupancy-sensor-type")
+    ReadThermostatUnoccupiedSetbackMin()
+        : ReadAttribute("unoccupied-setback-min")
     {
     }
 
-    ~ReadOccupancySensingOccupancySensorType() {}
+    ~ReadThermostatUnoccupiedSetbackMin() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000038) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeOccupancySensorTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OccupancySensing.OccupancySensorType response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeUnoccupiedSetbackMinWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.UnoccupiedSetbackMin response %@", [value description]);
             if (error != nil) {
-                LogNSError("OccupancySensing OccupancySensorType read Error", error);
+                LogNSError("Thermostat UnoccupiedSetbackMin read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -50675,34 +49660,32 @@ class ReadOccupancySensingOccupancySensorType : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOccupancySensingOccupancySensorType : public SubscribeAttribute {
+class SubscribeAttributeThermostatUnoccupiedSetbackMin : public SubscribeAttribute {
 public:
-    SubscribeAttributeOccupancySensingOccupancySensorType()
-        : SubscribeAttribute("occupancy-sensor-type")
+    SubscribeAttributeThermostatUnoccupiedSetbackMin()
+        : SubscribeAttribute("unoccupied-setback-min")
     {
     }
 
-    ~SubscribeAttributeOccupancySensingOccupancySensorType() {}
+    ~SubscribeAttributeThermostatUnoccupiedSetbackMin() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000038) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOccupancySensorTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeUnoccupiedSetbackMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OccupancySensing.OccupancySensorType response %@", [value description]);
+                NSLog(@"Thermostat.UnoccupiedSetbackMin response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -50713,65 +49696,60 @@ class SubscribeAttributeOccupancySensingOccupancySensorType : public SubscribeAt
 };
 
 /*
- * Attribute OccupancySensorTypeBitmap
+ * Attribute UnoccupiedSetbackMax
  */
-class ReadOccupancySensingOccupancySensorTypeBitmap : public ReadAttribute {
+class ReadThermostatUnoccupiedSetbackMax : public ReadAttribute {
 public:
-    ReadOccupancySensingOccupancySensorTypeBitmap()
-        : ReadAttribute("occupancy-sensor-type-bitmap")
+    ReadThermostatUnoccupiedSetbackMax()
+        : ReadAttribute("unoccupied-setback-max")
     {
     }
 
-    ~ReadOccupancySensingOccupancySensorTypeBitmap() {}
+    ~ReadThermostatUnoccupiedSetbackMax() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000039) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster
-            readAttributeOccupancySensorTypeBitmapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OccupancySensing.OccupancySensorTypeBitmap response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("OccupancySensing OccupancySensorTypeBitmap read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeUnoccupiedSetbackMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.UnoccupiedSetbackMax response %@", [value description]);
+            if (error != nil) {
+                LogNSError("Thermostat UnoccupiedSetbackMax read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeOccupancySensingOccupancySensorTypeBitmap : public SubscribeAttribute {
+class SubscribeAttributeThermostatUnoccupiedSetbackMax : public SubscribeAttribute {
 public:
-    SubscribeAttributeOccupancySensingOccupancySensorTypeBitmap()
-        : SubscribeAttribute("occupancy-sensor-type-bitmap")
+    SubscribeAttributeThermostatUnoccupiedSetbackMax()
+        : SubscribeAttribute("unoccupied-setback-max")
     {
     }
 
-    ~SubscribeAttributeOccupancySensingOccupancySensorTypeBitmap() {}
+    ~SubscribeAttributeThermostatUnoccupiedSetbackMax() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000039) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOccupancySensorTypeBitmapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeUnoccupiedSetbackMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OccupancySensing.OccupancySensorTypeBitmap response %@", [value description]);
+                NSLog(@"Thermostat.UnoccupiedSetbackMax response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -50782,30 +49760,27 @@ class SubscribeAttributeOccupancySensingOccupancySensorTypeBitmap : public Subsc
 };
 
 /*
- * Attribute PirOccupiedToUnoccupiedDelay
+ * Attribute EmergencyHeatDelta
  */
-class ReadOccupancySensingPirOccupiedToUnoccupiedDelay : public ReadAttribute {
+class ReadThermostatEmergencyHeatDelta : public ReadAttribute {
 public:
-    ReadOccupancySensingPirOccupiedToUnoccupiedDelay()
-        : ReadAttribute("pir-occupied-to-unoccupied-delay")
+    ReadThermostatEmergencyHeatDelta()
+        : ReadAttribute("emergency-heat-delta")
     {
     }
 
-    ~ReadOccupancySensingPirOccupiedToUnoccupiedDelay() {}
+    ~ReadThermostatEmergencyHeatDelta() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x0000003A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributePirOccupiedToUnoccupiedDelayWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OccupancySensing.PirOccupiedToUnoccupiedDelay response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeEmergencyHeatDeltaWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.EmergencyHeatDelta response %@", [value description]);
             if (error != nil) {
-                LogNSError("OccupancySensing PirOccupiedToUnoccupiedDelay read Error", error);
+                LogNSError("Thermostat EmergencyHeatDelta read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -50813,75 +49788,70 @@ class ReadOccupancySensingPirOccupiedToUnoccupiedDelay : public ReadAttribute {
     }
 };
 
-class WriteOccupancySensingPirOccupiedToUnoccupiedDelay : public WriteAttribute {
+class WriteThermostatEmergencyHeatDelta : public WriteAttribute {
 public:
-    WriteOccupancySensingPirOccupiedToUnoccupiedDelay()
-        : WriteAttribute("pir-occupied-to-unoccupied-delay")
+    WriteThermostatEmergencyHeatDelta()
+        : WriteAttribute("emergency-heat-delta")
     {
-        AddArgument("attr-name", "pir-occupied-to-unoccupied-delay");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        AddArgument("attr-name", "emergency-heat-delta");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteOccupancySensingPirOccupiedToUnoccupiedDelay() {}
+    ~WriteThermostatEmergencyHeatDelta() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) WriteAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x0000003A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
 
-        [cluster writeAttributePirOccupiedToUnoccupiedDelayWithValue:value
-                                                              params:params
-                                                   completionHandler:^(NSError * _Nullable error) {
-                                                       if (error != nil) {
-                                                           LogNSError(
-                                                               "OccupancySensing PirOccupiedToUnoccupiedDelay write Error", error);
-                                                       }
-                                                       SetCommandExitStatus(error);
-                                                   }];
+        [cluster writeAttributeEmergencyHeatDeltaWithValue:value
+                                                    params:params
+                                         completionHandler:^(NSError * _Nullable error) {
+                                             if (error != nil) {
+                                                 LogNSError("Thermostat EmergencyHeatDelta write Error", error);
+                                             }
+                                             SetCommandExitStatus(error);
+                                         }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    uint16_t mValue;
+    uint8_t mValue;
 };
 
-class SubscribeAttributeOccupancySensingPirOccupiedToUnoccupiedDelay : public SubscribeAttribute {
+class SubscribeAttributeThermostatEmergencyHeatDelta : public SubscribeAttribute {
 public:
-    SubscribeAttributeOccupancySensingPirOccupiedToUnoccupiedDelay()
-        : SubscribeAttribute("pir-occupied-to-unoccupied-delay")
+    SubscribeAttributeThermostatEmergencyHeatDelta()
+        : SubscribeAttribute("emergency-heat-delta")
     {
     }
 
-    ~SubscribeAttributeOccupancySensingPirOccupiedToUnoccupiedDelay() {}
+    ~SubscribeAttributeThermostatEmergencyHeatDelta() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x0000003A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePirOccupiedToUnoccupiedDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeEmergencyHeatDeltaWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OccupancySensing.PirOccupiedToUnoccupiedDelay response %@", [value description]);
+                NSLog(@"Thermostat.EmergencyHeatDelta response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -50892,30 +49862,27 @@ class SubscribeAttributeOccupancySensingPirOccupiedToUnoccupiedDelay : public Su
 };
 
 /*
- * Attribute PirUnoccupiedToOccupiedDelay
+ * Attribute ACType
  */
-class ReadOccupancySensingPirUnoccupiedToOccupiedDelay : public ReadAttribute {
+class ReadThermostatACType : public ReadAttribute {
 public:
-    ReadOccupancySensingPirUnoccupiedToOccupiedDelay()
-        : ReadAttribute("pir-unoccupied-to-occupied-delay")
+    ReadThermostatACType()
+        : ReadAttribute("actype")
     {
     }
 
-    ~ReadOccupancySensingPirUnoccupiedToOccupiedDelay() {}
+    ~ReadThermostatACType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000040) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributePirUnoccupiedToOccupiedDelayWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OccupancySensing.PirUnoccupiedToOccupiedDelay response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeACTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.ACType response %@", [value description]);
             if (error != nil) {
-                LogNSError("OccupancySensing PirUnoccupiedToOccupiedDelay read Error", error);
+                LogNSError("Thermostat ACType read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -50923,75 +49890,70 @@ class ReadOccupancySensingPirUnoccupiedToOccupiedDelay : public ReadAttribute {
     }
 };
 
-class WriteOccupancySensingPirUnoccupiedToOccupiedDelay : public WriteAttribute {
+class WriteThermostatACType : public WriteAttribute {
 public:
-    WriteOccupancySensingPirUnoccupiedToOccupiedDelay()
-        : WriteAttribute("pir-unoccupied-to-occupied-delay")
+    WriteThermostatACType()
+        : WriteAttribute("actype")
     {
-        AddArgument("attr-name", "pir-unoccupied-to-occupied-delay");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        AddArgument("attr-name", "actype");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteOccupancySensingPirUnoccupiedToOccupiedDelay() {}
+    ~WriteThermostatACType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) WriteAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000040) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
 
-        [cluster writeAttributePirUnoccupiedToOccupiedDelayWithValue:value
-                                                              params:params
-                                                   completionHandler:^(NSError * _Nullable error) {
-                                                       if (error != nil) {
-                                                           LogNSError(
-                                                               "OccupancySensing PirUnoccupiedToOccupiedDelay write Error", error);
-                                                       }
-                                                       SetCommandExitStatus(error);
-                                                   }];
+        [cluster writeAttributeACTypeWithValue:value
+                                        params:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 if (error != nil) {
+                                     LogNSError("Thermostat ACType write Error", error);
+                                 }
+                                 SetCommandExitStatus(error);
+                             }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    uint16_t mValue;
+    uint8_t mValue;
 };
 
-class SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedDelay : public SubscribeAttribute {
+class SubscribeAttributeThermostatACType : public SubscribeAttribute {
 public:
-    SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedDelay()
-        : SubscribeAttribute("pir-unoccupied-to-occupied-delay")
+    SubscribeAttributeThermostatACType()
+        : SubscribeAttribute("actype")
     {
     }
 
-    ~SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedDelay() {}
+    ~SubscribeAttributeThermostatACType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000040) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePirUnoccupiedToOccupiedDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeACTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OccupancySensing.PirUnoccupiedToOccupiedDelay response %@", [value description]);
+                NSLog(@"Thermostat.ACType response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -51002,30 +49964,27 @@ class SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedDelay : public Su
 };
 
 /*
- * Attribute PirUnoccupiedToOccupiedThreshold
+ * Attribute ACCapacity
  */
-class ReadOccupancySensingPirUnoccupiedToOccupiedThreshold : public ReadAttribute {
+class ReadThermostatACCapacity : public ReadAttribute {
 public:
-    ReadOccupancySensingPirUnoccupiedToOccupiedThreshold()
-        : ReadAttribute("pir-unoccupied-to-occupied-threshold")
+    ReadThermostatACCapacity()
+        : ReadAttribute("accapacity")
     {
     }
 
-    ~ReadOccupancySensingPirUnoccupiedToOccupiedThreshold() {}
+    ~ReadThermostatACCapacity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000041) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributePirUnoccupiedToOccupiedThresholdWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OccupancySensing.PirUnoccupiedToOccupiedThreshold response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeACCapacityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.ACCapacity response %@", [value description]);
             if (error != nil) {
-                LogNSError("OccupancySensing PirUnoccupiedToOccupiedThreshold read Error", error);
+                LogNSError("Thermostat ACCapacity read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -51033,76 +49992,70 @@ class ReadOccupancySensingPirUnoccupiedToOccupiedThreshold : public ReadAttribut
     }
 };
 
-class WriteOccupancySensingPirUnoccupiedToOccupiedThreshold : public WriteAttribute {
+class WriteThermostatACCapacity : public WriteAttribute {
 public:
-    WriteOccupancySensingPirUnoccupiedToOccupiedThreshold()
-        : WriteAttribute("pir-unoccupied-to-occupied-threshold")
+    WriteThermostatACCapacity()
+        : WriteAttribute("accapacity")
     {
-        AddArgument("attr-name", "pir-unoccupied-to-occupied-threshold");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        AddArgument("attr-name", "accapacity");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteOccupancySensingPirUnoccupiedToOccupiedThreshold() {}
+    ~WriteThermostatACCapacity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) WriteAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000041) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
 
-        [cluster writeAttributePirUnoccupiedToOccupiedThresholdWithValue:value
-                                                                  params:params
-                                                       completionHandler:^(NSError * _Nullable error) {
-                                                           if (error != nil) {
-                                                               LogNSError(
-                                                                   "OccupancySensing PirUnoccupiedToOccupiedThreshold write Error",
-                                                                   error);
-                                                           }
-                                                           SetCommandExitStatus(error);
-                                                       }];
+        [cluster writeAttributeACCapacityWithValue:value
+                                            params:params
+                                 completionHandler:^(NSError * _Nullable error) {
+                                     if (error != nil) {
+                                         LogNSError("Thermostat ACCapacity write Error", error);
+                                     }
+                                     SetCommandExitStatus(error);
+                                 }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    uint8_t mValue;
+    uint16_t mValue;
 };
 
-class SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedThreshold : public SubscribeAttribute {
+class SubscribeAttributeThermostatACCapacity : public SubscribeAttribute {
 public:
-    SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedThreshold()
-        : SubscribeAttribute("pir-unoccupied-to-occupied-threshold")
+    SubscribeAttributeThermostatACCapacity()
+        : SubscribeAttribute("accapacity")
     {
     }
 
-    ~SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedThreshold() {}
+    ~SubscribeAttributeThermostatACCapacity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000041) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePirUnoccupiedToOccupiedThresholdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeACCapacityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OccupancySensing.PirUnoccupiedToOccupiedThreshold response %@", [value description]);
+                NSLog(@"Thermostat.ACCapacity response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -51113,30 +50066,27 @@ class SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedThreshold : publi
 };
 
 /*
- * Attribute UltrasonicOccupiedToUnoccupiedDelay
+ * Attribute ACRefrigerantType
  */
-class ReadOccupancySensingUltrasonicOccupiedToUnoccupiedDelay : public ReadAttribute {
+class ReadThermostatACRefrigerantType : public ReadAttribute {
 public:
-    ReadOccupancySensingUltrasonicOccupiedToUnoccupiedDelay()
-        : ReadAttribute("ultrasonic-occupied-to-unoccupied-delay")
+    ReadThermostatACRefrigerantType()
+        : ReadAttribute("acrefrigerant-type")
     {
     }
 
-    ~ReadOccupancySensingUltrasonicOccupiedToUnoccupiedDelay() {}
+    ~ReadThermostatACRefrigerantType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x00000020) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000042) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeUltrasonicOccupiedToUnoccupiedDelayWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OccupancySensing.UltrasonicOccupiedToUnoccupiedDelay response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeACRefrigerantTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.ACRefrigerantType response %@", [value description]);
             if (error != nil) {
-                LogNSError("OccupancySensing UltrasonicOccupiedToUnoccupiedDelay read Error", error);
+                LogNSError("Thermostat ACRefrigerantType read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -51144,77 +50094,70 @@ class ReadOccupancySensingUltrasonicOccupiedToUnoccupiedDelay : public ReadAttri
     }
 };
 
-class WriteOccupancySensingUltrasonicOccupiedToUnoccupiedDelay : public WriteAttribute {
+class WriteThermostatACRefrigerantType : public WriteAttribute {
 public:
-    WriteOccupancySensingUltrasonicOccupiedToUnoccupiedDelay()
-        : WriteAttribute("ultrasonic-occupied-to-unoccupied-delay")
+    WriteThermostatACRefrigerantType()
+        : WriteAttribute("acrefrigerant-type")
     {
-        AddArgument("attr-name", "ultrasonic-occupied-to-unoccupied-delay");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        AddArgument("attr-name", "acrefrigerant-type");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteOccupancySensingUltrasonicOccupiedToUnoccupiedDelay() {}
+    ~WriteThermostatACRefrigerantType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) WriteAttribute (0x00000020) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000042) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
 
-        [cluster
-            writeAttributeUltrasonicOccupiedToUnoccupiedDelayWithValue:value
-                                                                params:params
-                                                     completionHandler:^(NSError * _Nullable error) {
-                                                         if (error != nil) {
-                                                             LogNSError(
-                                                                 "OccupancySensing UltrasonicOccupiedToUnoccupiedDelay write Error",
-                                                                 error);
-                                                         }
-                                                         SetCommandExitStatus(error);
-                                                     }];
+        [cluster writeAttributeACRefrigerantTypeWithValue:value
+                                                   params:params
+                                        completionHandler:^(NSError * _Nullable error) {
+                                            if (error != nil) {
+                                                LogNSError("Thermostat ACRefrigerantType write Error", error);
+                                            }
+                                            SetCommandExitStatus(error);
+                                        }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    uint16_t mValue;
+    uint8_t mValue;
 };
 
-class SubscribeAttributeOccupancySensingUltrasonicOccupiedToUnoccupiedDelay : public SubscribeAttribute {
+class SubscribeAttributeThermostatACRefrigerantType : public SubscribeAttribute {
 public:
-    SubscribeAttributeOccupancySensingUltrasonicOccupiedToUnoccupiedDelay()
-        : SubscribeAttribute("ultrasonic-occupied-to-unoccupied-delay")
+    SubscribeAttributeThermostatACRefrigerantType()
+        : SubscribeAttribute("acrefrigerant-type")
     {
     }
 
-    ~SubscribeAttributeOccupancySensingUltrasonicOccupiedToUnoccupiedDelay() {}
+    ~SubscribeAttributeThermostatACRefrigerantType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x00000020) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000042) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeUltrasonicOccupiedToUnoccupiedDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeACRefrigerantTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OccupancySensing.UltrasonicOccupiedToUnoccupiedDelay response %@", [value description]);
+                NSLog(@"Thermostat.ACRefrigerantType response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -51225,30 +50168,27 @@ class SubscribeAttributeOccupancySensingUltrasonicOccupiedToUnoccupiedDelay : pu
 };
 
 /*
- * Attribute UltrasonicUnoccupiedToOccupiedDelay
+ * Attribute ACCompressorType
  */
-class ReadOccupancySensingUltrasonicUnoccupiedToOccupiedDelay : public ReadAttribute {
+class ReadThermostatACCompressorType : public ReadAttribute {
 public:
-    ReadOccupancySensingUltrasonicUnoccupiedToOccupiedDelay()
-        : ReadAttribute("ultrasonic-unoccupied-to-occupied-delay")
+    ReadThermostatACCompressorType()
+        : ReadAttribute("accompressor-type")
     {
     }
 
-    ~ReadOccupancySensingUltrasonicUnoccupiedToOccupiedDelay() {}
+    ~ReadThermostatACCompressorType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x00000021) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000043) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeUltrasonicUnoccupiedToOccupiedDelayWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OccupancySensing.UltrasonicUnoccupiedToOccupiedDelay response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeACCompressorTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.ACCompressorType response %@", [value description]);
             if (error != nil) {
-                LogNSError("OccupancySensing UltrasonicUnoccupiedToOccupiedDelay read Error", error);
+                LogNSError("Thermostat ACCompressorType read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -51256,77 +50196,70 @@ class ReadOccupancySensingUltrasonicUnoccupiedToOccupiedDelay : public ReadAttri
     }
 };
 
-class WriteOccupancySensingUltrasonicUnoccupiedToOccupiedDelay : public WriteAttribute {
+class WriteThermostatACCompressorType : public WriteAttribute {
 public:
-    WriteOccupancySensingUltrasonicUnoccupiedToOccupiedDelay()
-        : WriteAttribute("ultrasonic-unoccupied-to-occupied-delay")
+    WriteThermostatACCompressorType()
+        : WriteAttribute("accompressor-type")
     {
-        AddArgument("attr-name", "ultrasonic-unoccupied-to-occupied-delay");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        AddArgument("attr-name", "accompressor-type");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteOccupancySensingUltrasonicUnoccupiedToOccupiedDelay() {}
+    ~WriteThermostatACCompressorType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) WriteAttribute (0x00000021) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000043) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
 
-        [cluster
-            writeAttributeUltrasonicUnoccupiedToOccupiedDelayWithValue:value
-                                                                params:params
-                                                     completionHandler:^(NSError * _Nullable error) {
-                                                         if (error != nil) {
-                                                             LogNSError(
-                                                                 "OccupancySensing UltrasonicUnoccupiedToOccupiedDelay write Error",
-                                                                 error);
-                                                         }
-                                                         SetCommandExitStatus(error);
-                                                     }];
+        [cluster writeAttributeACCompressorTypeWithValue:value
+                                                  params:params
+                                       completionHandler:^(NSError * _Nullable error) {
+                                           if (error != nil) {
+                                               LogNSError("Thermostat ACCompressorType write Error", error);
+                                           }
+                                           SetCommandExitStatus(error);
+                                       }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    uint16_t mValue;
+    uint8_t mValue;
 };
 
-class SubscribeAttributeOccupancySensingUltrasonicUnoccupiedToOccupiedDelay : public SubscribeAttribute {
+class SubscribeAttributeThermostatACCompressorType : public SubscribeAttribute {
 public:
-    SubscribeAttributeOccupancySensingUltrasonicUnoccupiedToOccupiedDelay()
-        : SubscribeAttribute("ultrasonic-unoccupied-to-occupied-delay")
+    SubscribeAttributeThermostatACCompressorType()
+        : SubscribeAttribute("accompressor-type")
     {
     }
 
-    ~SubscribeAttributeOccupancySensingUltrasonicUnoccupiedToOccupiedDelay() {}
+    ~SubscribeAttributeThermostatACCompressorType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x00000021) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000043) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeUltrasonicUnoccupiedToOccupiedDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeACCompressorTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OccupancySensing.UltrasonicUnoccupiedToOccupiedDelay response %@", [value description]);
+                NSLog(@"Thermostat.ACCompressorType response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -51337,30 +50270,27 @@ class SubscribeAttributeOccupancySensingUltrasonicUnoccupiedToOccupiedDelay : pu
 };
 
 /*
- * Attribute UltrasonicUnoccupiedToOccupiedThreshold
+ * Attribute ACErrorCode
  */
-class ReadOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold : public ReadAttribute {
+class ReadThermostatACErrorCode : public ReadAttribute {
 public:
-    ReadOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold()
-        : ReadAttribute("ultrasonic-unoccupied-to-occupied-threshold")
+    ReadThermostatACErrorCode()
+        : ReadAttribute("acerror-code")
     {
     }
 
-    ~ReadOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold() {}
+    ~ReadThermostatACErrorCode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x00000022) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000044) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeUltrasonicUnoccupiedToOccupiedThresholdWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OccupancySensing.UltrasonicUnoccupiedToOccupiedThreshold response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeACErrorCodeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.ACErrorCode response %@", [value description]);
             if (error != nil) {
-                LogNSError("OccupancySensing UltrasonicUnoccupiedToOccupiedThreshold read Error", error);
+                LogNSError("Thermostat ACErrorCode read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -51368,78 +50298,70 @@ class ReadOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold : public ReadA
     }
 };
 
-class WriteOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold : public WriteAttribute {
+class WriteThermostatACErrorCode : public WriteAttribute {
 public:
-    WriteOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold()
-        : WriteAttribute("ultrasonic-unoccupied-to-occupied-threshold")
+    WriteThermostatACErrorCode()
+        : WriteAttribute("acerror-code")
     {
-        AddArgument("attr-name", "ultrasonic-unoccupied-to-occupied-threshold");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        AddArgument("attr-name", "acerror-code");
+        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold() {}
+    ~WriteThermostatACErrorCode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) WriteAttribute (0x00000022) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000044) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue];
 
-        [cluster
-            writeAttributeUltrasonicUnoccupiedToOccupiedThresholdWithValue:value
-                                                                    params:params
-                                                         completionHandler:^(NSError * _Nullable error) {
-                                                             if (error != nil) {
-                                                                 LogNSError("OccupancySensing "
-                                                                            "UltrasonicUnoccupiedToOccupiedThreshold write Error",
-                                                                     error);
-                                                             }
-                                                             SetCommandExitStatus(error);
-                                                         }];
+        [cluster writeAttributeACErrorCodeWithValue:value
+                                             params:params
+                                  completionHandler:^(NSError * _Nullable error) {
+                                      if (error != nil) {
+                                          LogNSError("Thermostat ACErrorCode write Error", error);
+                                      }
+                                      SetCommandExitStatus(error);
+                                  }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    uint8_t mValue;
+    uint32_t mValue;
 };
 
-class SubscribeAttributeOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold : public SubscribeAttribute {
+class SubscribeAttributeThermostatACErrorCode : public SubscribeAttribute {
 public:
-    SubscribeAttributeOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold()
-        : SubscribeAttribute("ultrasonic-unoccupied-to-occupied-threshold")
+    SubscribeAttributeThermostatACErrorCode()
+        : SubscribeAttribute("acerror-code")
     {
     }
 
-    ~SubscribeAttributeOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold() {}
+    ~SubscribeAttributeThermostatACErrorCode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x00000022) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000044) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributeUltrasonicUnoccupiedToOccupiedThresholdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeACErrorCodeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OccupancySensing.UltrasonicUnoccupiedToOccupiedThreshold response %@", [value description]);
+                NSLog(@"Thermostat.ACErrorCode response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -51450,30 +50372,27 @@ class SubscribeAttributeOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold
 };
 
 /*
- * Attribute PhysicalContactOccupiedToUnoccupiedDelay
+ * Attribute ACLouverPosition
  */
-class ReadOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay : public ReadAttribute {
+class ReadThermostatACLouverPosition : public ReadAttribute {
 public:
-    ReadOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay()
-        : ReadAttribute("physical-contact-occupied-to-unoccupied-delay")
+    ReadThermostatACLouverPosition()
+        : ReadAttribute("aclouver-position")
     {
     }
 
-    ~ReadOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay() {}
+    ~ReadThermostatACLouverPosition() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x00000030) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000045) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributePhysicalContactOccupiedToUnoccupiedDelayWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OccupancySensing.PhysicalContactOccupiedToUnoccupiedDelay response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeACLouverPositionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.ACLouverPosition response %@", [value description]);
             if (error != nil) {
-                LogNSError("OccupancySensing PhysicalContactOccupiedToUnoccupiedDelay read Error", error);
+                LogNSError("Thermostat ACLouverPosition read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -51481,78 +50400,70 @@ class ReadOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay : public Read
     }
 };
 
-class WriteOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay : public WriteAttribute {
+class WriteThermostatACLouverPosition : public WriteAttribute {
 public:
-    WriteOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay()
-        : WriteAttribute("physical-contact-occupied-to-unoccupied-delay")
+    WriteThermostatACLouverPosition()
+        : WriteAttribute("aclouver-position")
     {
-        AddArgument("attr-name", "physical-contact-occupied-to-unoccupied-delay");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        AddArgument("attr-name", "aclouver-position");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay() {}
+    ~WriteThermostatACLouverPosition() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) WriteAttribute (0x00000030) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000045) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
 
-        [cluster
-            writeAttributePhysicalContactOccupiedToUnoccupiedDelayWithValue:value
-                                                                     params:params
-                                                          completionHandler:^(NSError * _Nullable error) {
-                                                              if (error != nil) {
-                                                                  LogNSError("OccupancySensing "
-                                                                             "PhysicalContactOccupiedToUnoccupiedDelay write Error",
-                                                                      error);
-                                                              }
-                                                              SetCommandExitStatus(error);
-                                                          }];
+        [cluster writeAttributeACLouverPositionWithValue:value
+                                                  params:params
+                                       completionHandler:^(NSError * _Nullable error) {
+                                           if (error != nil) {
+                                               LogNSError("Thermostat ACLouverPosition write Error", error);
+                                           }
+                                           SetCommandExitStatus(error);
+                                       }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    uint16_t mValue;
+    uint8_t mValue;
 };
 
-class SubscribeAttributeOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay : public SubscribeAttribute {
+class SubscribeAttributeThermostatACLouverPosition : public SubscribeAttribute {
 public:
-    SubscribeAttributeOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay()
-        : SubscribeAttribute("physical-contact-occupied-to-unoccupied-delay")
+    SubscribeAttributeThermostatACLouverPosition()
+        : SubscribeAttribute("aclouver-position")
     {
     }
 
-    ~SubscribeAttributeOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay() {}
+    ~SubscribeAttributeThermostatACLouverPosition() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x00000030) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000045) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributePhysicalContactOccupiedToUnoccupiedDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeACLouverPositionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OccupancySensing.PhysicalContactOccupiedToUnoccupiedDelay response %@", [value description]);
+                NSLog(@"Thermostat.ACLouverPosition response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -51563,30 +50474,27 @@ class SubscribeAttributeOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay
 };
 
 /*
- * Attribute PhysicalContactUnoccupiedToOccupiedDelay
+ * Attribute ACCoilTemperature
  */
-class ReadOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay : public ReadAttribute {
+class ReadThermostatACCoilTemperature : public ReadAttribute {
 public:
-    ReadOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay()
-        : ReadAttribute("physical-contact-unoccupied-to-occupied-delay")
+    ReadThermostatACCoilTemperature()
+        : ReadAttribute("accoil-temperature")
     {
     }
 
-    ~ReadOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay() {}
+    ~ReadThermostatACCoilTemperature() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x00000031) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000046) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributePhysicalContactUnoccupiedToOccupiedDelayWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OccupancySensing.PhysicalContactUnoccupiedToOccupiedDelay response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeACCoilTemperatureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.ACCoilTemperature response %@", [value description]);
             if (error != nil) {
-                LogNSError("OccupancySensing PhysicalContactUnoccupiedToOccupiedDelay read Error", error);
+                LogNSError("Thermostat ACCoilTemperature read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -51594,78 +50502,32 @@ class ReadOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay : public Read
     }
 };
 
-class WriteOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay : public WriteAttribute {
-public:
-    WriteOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay()
-        : WriteAttribute("physical-contact-unoccupied-to-occupied-delay")
-    {
-        AddArgument("attr-name", "physical-contact-unoccupied-to-occupied-delay");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) WriteAttribute (0x00000031) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster
-            writeAttributePhysicalContactUnoccupiedToOccupiedDelayWithValue:value
-                                                                     params:params
-                                                          completionHandler:^(NSError * _Nullable error) {
-                                                              if (error != nil) {
-                                                                  LogNSError("OccupancySensing "
-                                                                             "PhysicalContactUnoccupiedToOccupiedDelay write Error",
-                                                                      error);
-                                                              }
-                                                              SetCommandExitStatus(error);
-                                                          }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay : public SubscribeAttribute {
+class SubscribeAttributeThermostatACCoilTemperature : public SubscribeAttribute {
 public:
-    SubscribeAttributeOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay()
-        : SubscribeAttribute("physical-contact-unoccupied-to-occupied-delay")
+    SubscribeAttributeThermostatACCoilTemperature()
+        : SubscribeAttribute("accoil-temperature")
     {
     }
 
-    ~SubscribeAttributeOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay() {}
+    ~SubscribeAttributeThermostatACCoilTemperature() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x00000031) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000046) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributePhysicalContactUnoccupiedToOccupiedDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeACCoilTemperatureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OccupancySensing.PhysicalContactUnoccupiedToOccupiedDelay response %@", [value description]);
+                NSLog(@"Thermostat.ACCoilTemperature response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -51676,30 +50538,27 @@ class SubscribeAttributeOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay
 };
 
 /*
- * Attribute PhysicalContactUnoccupiedToOccupiedThreshold
+ * Attribute ACCapacityformat
  */
-class ReadOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold : public ReadAttribute {
+class ReadThermostatACCapacityformat : public ReadAttribute {
 public:
-    ReadOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold()
-        : ReadAttribute("physical-contact-unoccupied-to-occupied-threshold")
+    ReadThermostatACCapacityformat()
+        : ReadAttribute("accapacityformat")
     {
     }
 
-    ~ReadOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold() {}
+    ~ReadThermostatACCapacityformat() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x00000032) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000047) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributePhysicalContactUnoccupiedToOccupiedThresholdWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OccupancySensing.PhysicalContactUnoccupiedToOccupiedThreshold response %@", [value description]);
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeACCapacityformatWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Thermostat.ACCapacityformat response %@", [value description]);
             if (error != nil) {
-                LogNSError("OccupancySensing PhysicalContactUnoccupiedToOccupiedThreshold read Error", error);
+                LogNSError("Thermostat ACCapacityformat read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -51707,42 +50566,37 @@ class ReadOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold : public
     }
 };
 
-class WriteOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold : public WriteAttribute {
+class WriteThermostatACCapacityformat : public WriteAttribute {
 public:
-    WriteOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold()
-        : WriteAttribute("physical-contact-unoccupied-to-occupied-threshold")
+    WriteThermostatACCapacityformat()
+        : WriteAttribute("accapacityformat")
     {
-        AddArgument("attr-name", "physical-contact-unoccupied-to-occupied-threshold");
+        AddArgument("attr-name", "accapacityformat");
         AddArgument("attr-value", 0, UINT8_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold() {}
+    ~WriteThermostatACCapacityformat() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) WriteAttribute (0x00000032) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000047) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
         NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
 
-        [cluster writeAttributePhysicalContactUnoccupiedToOccupiedThresholdWithValue:value
-                                                                              params:params
-                                                                   completionHandler:^(NSError * _Nullable error) {
-                                                                       if (error != nil) {
-                                                                           LogNSError("OccupancySensing "
-                                                                                      "PhysicalContactUnoccupiedToOccupiedThreshold"
-                                                                                      " write Error",
-                                                                               error);
-                                                                       }
-                                                                       SetCommandExitStatus(error);
-                                                                   }];
+        [cluster writeAttributeACCapacityformatWithValue:value
+                                                  params:params
+                                       completionHandler:^(NSError * _Nullable error) {
+                                           if (error != nil) {
+                                               LogNSError("Thermostat ACCapacityformat write Error", error);
+                                           }
+                                           SetCommandExitStatus(error);
+                                       }];
         return CHIP_NO_ERROR;
     }
 
@@ -51750,36 +50604,32 @@ class WriteOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold : public
     uint8_t mValue;
 };
 
-class SubscribeAttributeOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold : public SubscribeAttribute {
+class SubscribeAttributeThermostatACCapacityformat : public SubscribeAttribute {
 public:
-    SubscribeAttributeOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold()
-        : SubscribeAttribute("physical-contact-unoccupied-to-occupied-threshold")
+    SubscribeAttributeThermostatACCapacityformat()
+        : SubscribeAttribute("accapacityformat")
     {
     }
 
-    ~SubscribeAttributeOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold() {}
+    ~SubscribeAttributeThermostatACCapacityformat() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x00000032) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000047) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster
-            subscribeAttributePhysicalContactUnoccupiedToOccupiedThresholdWithMinInterval:[NSNumber
-                                                                                              numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeACCapacityformatWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OccupancySensing.PhysicalContactUnoccupiedToOccupiedThreshold response %@", [value description]);
+                NSLog(@"Thermostat.ACCapacityformat response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -51792,27 +50642,25 @@ class SubscribeAttributeOccupancySensingPhysicalContactUnoccupiedToOccupiedThres
 /*
  * Attribute GeneratedCommandList
  */
-class ReadOccupancySensingGeneratedCommandList : public ReadAttribute {
+class ReadThermostatGeneratedCommandList : public ReadAttribute {
 public:
-    ReadOccupancySensingGeneratedCommandList()
+    ReadThermostatGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadOccupancySensingGeneratedCommandList() {}
+    ~ReadThermostatGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OccupancySensing.GeneratedCommandList response %@", [value description]);
+            NSLog(@"Thermostat.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("OccupancySensing GeneratedCommandList read Error", error);
+                LogNSError("Thermostat GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -51820,22 +50668,20 @@ class ReadOccupancySensingGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOccupancySensingGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeThermostatGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeOccupancySensingGeneratedCommandList()
+    SubscribeAttributeThermostatGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeOccupancySensingGeneratedCommandList() {}
+    ~SubscribeAttributeThermostatGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -51847,7 +50693,7 @@ class SubscribeAttributeOccupancySensingGeneratedCommandList : public SubscribeA
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OccupancySensing.GeneratedCommandList response %@", [value description]);
+                NSLog(@"Thermostat.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -51860,27 +50706,25 @@ class SubscribeAttributeOccupancySensingGeneratedCommandList : public SubscribeA
 /*
  * Attribute AcceptedCommandList
  */
-class ReadOccupancySensingAcceptedCommandList : public ReadAttribute {
+class ReadThermostatAcceptedCommandList : public ReadAttribute {
 public:
-    ReadOccupancySensingAcceptedCommandList()
+    ReadThermostatAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadOccupancySensingAcceptedCommandList() {}
+    ~ReadThermostatAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OccupancySensing.AcceptedCommandList response %@", [value description]);
+            NSLog(@"Thermostat.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("OccupancySensing AcceptedCommandList read Error", error);
+                LogNSError("Thermostat AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -51888,22 +50732,20 @@ class ReadOccupancySensingAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOccupancySensingAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeThermostatAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeOccupancySensingAcceptedCommandList()
+    SubscribeAttributeThermostatAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeOccupancySensingAcceptedCommandList() {}
+    ~SubscribeAttributeThermostatAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -51915,7 +50757,7 @@ class SubscribeAttributeOccupancySensingAcceptedCommandList : public SubscribeAt
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OccupancySensing.AcceptedCommandList response %@", [value description]);
+                NSLog(@"Thermostat.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -51928,27 +50770,25 @@ class SubscribeAttributeOccupancySensingAcceptedCommandList : public SubscribeAt
 /*
  * Attribute AttributeList
  */
-class ReadOccupancySensingAttributeList : public ReadAttribute {
+class ReadThermostatAttributeList : public ReadAttribute {
 public:
-    ReadOccupancySensingAttributeList()
+    ReadThermostatAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadOccupancySensingAttributeList() {}
+    ~ReadThermostatAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OccupancySensing.AttributeList response %@", [value description]);
+            NSLog(@"Thermostat.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("OccupancySensing AttributeList read Error", error);
+                LogNSError("Thermostat AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -51956,22 +50796,20 @@ class ReadOccupancySensingAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOccupancySensingAttributeList : public SubscribeAttribute {
+class SubscribeAttributeThermostatAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeOccupancySensingAttributeList()
+    SubscribeAttributeThermostatAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeOccupancySensingAttributeList() {}
+    ~SubscribeAttributeThermostatAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -51983,7 +50821,7 @@ class SubscribeAttributeOccupancySensingAttributeList : public SubscribeAttribut
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OccupancySensing.AttributeList response %@", [value description]);
+                NSLog(@"Thermostat.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -51996,27 +50834,25 @@ class SubscribeAttributeOccupancySensingAttributeList : public SubscribeAttribut
 /*
  * Attribute FeatureMap
  */
-class ReadOccupancySensingFeatureMap : public ReadAttribute {
+class ReadThermostatFeatureMap : public ReadAttribute {
 public:
-    ReadOccupancySensingFeatureMap()
+    ReadThermostatFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadOccupancySensingFeatureMap() {}
+    ~ReadThermostatFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OccupancySensing.FeatureMap response %@", [value description]);
+            NSLog(@"Thermostat.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("OccupancySensing FeatureMap read Error", error);
+                LogNSError("Thermostat FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -52024,22 +50860,20 @@ class ReadOccupancySensingFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOccupancySensingFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeThermostatFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeOccupancySensingFeatureMap()
+    SubscribeAttributeThermostatFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeOccupancySensingFeatureMap() {}
+    ~SubscribeAttributeThermostatFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -52051,7 +50885,7 @@ class SubscribeAttributeOccupancySensingFeatureMap : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OccupancySensing.FeatureMap response %@", [value description]);
+                NSLog(@"Thermostat.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -52064,27 +50898,25 @@ class SubscribeAttributeOccupancySensingFeatureMap : public SubscribeAttribute {
 /*
  * Attribute ClusterRevision
  */
-class ReadOccupancySensingClusterRevision : public ReadAttribute {
+class ReadThermostatClusterRevision : public ReadAttribute {
 public:
-    ReadOccupancySensingClusterRevision()
+    ReadThermostatClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadOccupancySensingClusterRevision() {}
+    ~ReadThermostatClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OccupancySensing.ClusterRevision response %@", [value description]);
+            NSLog(@"Thermostat.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("OccupancySensing ClusterRevision read Error", error);
+                LogNSError("Thermostat ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -52092,22 +50924,20 @@ class ReadOccupancySensingClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOccupancySensingClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeThermostatClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeOccupancySensingClusterRevision()
+    SubscribeAttributeThermostatClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeOccupancySensingClusterRevision() {}
+    ~SubscribeAttributeThermostatClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -52119,7 +50949,7 @@ class SubscribeAttributeOccupancySensingClusterRevision : public SubscribeAttrib
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OccupancySensing.ClusterRevision response %@", [value description]);
+                NSLog(@"Thermostat.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -52130,22 +50960,22 @@ class SubscribeAttributeOccupancySensingClusterRevision : public SubscribeAttrib
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster OnOff                                                       | 0x0006 |
+| Cluster FanControl                                                  | 0x0202 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * Off                                                               |   0x00 |
-| * On                                                                |   0x01 |
-| * Toggle                                                            |   0x02 |
-| * OffWithEffect                                                     |   0x40 |
-| * OnWithRecallGlobalScene                                           |   0x41 |
-| * OnWithTimedOff                                                    |   0x42 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * OnOff                                                             | 0x0000 |
-| * GlobalSceneControl                                                | 0x4000 |
-| * OnTime                                                            | 0x4001 |
-| * OffWaitTime                                                       | 0x4002 |
-| * StartUpOnOff                                                      | 0x4003 |
+| * FanMode                                                           | 0x0000 |
+| * FanModeSequence                                                   | 0x0001 |
+| * PercentSetting                                                    | 0x0002 |
+| * PercentCurrent                                                    | 0x0003 |
+| * SpeedMax                                                          | 0x0004 |
+| * SpeedSetting                                                      | 0x0005 |
+| * SpeedCurrent                                                      | 0x0006 |
+| * RockSupport                                                       | 0x0007 |
+| * RockSetting                                                       | 0x0008 |
+| * WindSupport                                                       | 0x0009 |
+| * WindSetting                                                       | 0x000A |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -52156,285 +50986,231 @@ class SubscribeAttributeOccupancySensingClusterRevision : public SubscribeAttrib
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command Off
+ * Attribute FanMode
  */
-class OnOffOff : public ClusterCommand {
+class ReadFanControlFanMode : public ReadAttribute {
 public:
-    OnOffOff()
-        : ClusterCommand("off")
+    ReadFanControlFanMode()
+        : ReadAttribute("fan-mode")
     {
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadFanControlFanMode() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPOnOffClusterOffParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster offWithParams:params
-                 completionHandler:^(NSError * _Nullable error) {
-                     responsesNeeded--;
-                     if (error != nil) {
-                         mError = error;
-                         LogNSError("Error", error);
-                     }
-                     if (responsesNeeded == 0) {
-                         SetCommandExitStatus(mError);
-                     }
-                 }];
-        }
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFanModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FanControl.FanMode response %@", [value description]);
+            if (error != nil) {
+                LogNSError("FanControl FanMode read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
 };
 
-/*
- * Command On
- */
-class OnOffOn : public ClusterCommand {
+class WriteFanControlFanMode : public WriteAttribute {
 public:
-    OnOffOn()
-        : ClusterCommand("on")
+    WriteFanControlFanMode()
+        : WriteAttribute("fan-mode")
     {
-        ClusterCommand::AddArguments();
+        AddArgument("attr-name", "fan-mode");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
+    ~WriteFanControlFanMode() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) command (0x00000001) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) WriteAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPOnOffClusterOnParams alloc] init];
-        params.timedInvokeTimeoutMs
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster onWithParams:params
-                completionHandler:^(NSError * _Nullable error) {
-                    responsesNeeded--;
-                    if (error != nil) {
-                        mError = error;
-                        LogNSError("Error", error);
-                    }
-                    if (responsesNeeded == 0) {
-                        SetCommandExitStatus(mError);
-                    }
-                }];
-        }
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeFanModeWithValue:value
+                                         params:params
+                              completionHandler:^(NSError * _Nullable error) {
+                                  if (error != nil) {
+                                      LogNSError("FanControl FanMode write Error", error);
+                                  }
+                                  SetCommandExitStatus(error);
+                              }];
         return CHIP_NO_ERROR;
     }
 
 private:
+    uint8_t mValue;
 };
 
-/*
- * Command Toggle
- */
-class OnOffToggle : public ClusterCommand {
+class SubscribeAttributeFanControlFanMode : public SubscribeAttribute {
 public:
-    OnOffToggle()
-        : ClusterCommand("toggle")
+    SubscribeAttributeFanControlFanMode()
+        : SubscribeAttribute("fan-mode")
     {
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeFanControlFanMode() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) command (0x00000002) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPOnOffClusterToggleParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster toggleWithParams:params
-                    completionHandler:^(NSError * _Nullable error) {
-                        responsesNeeded--;
-                        if (error != nil) {
-                            mError = error;
-                            LogNSError("Error", error);
-                        }
-                        if (responsesNeeded == 0) {
-                            SetCommandExitStatus(mError);
-                        }
-                    }];
-        }
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeFanModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FanControl.FanMode response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
 };
 
 /*
- * Command OffWithEffect
+ * Attribute FanModeSequence
  */
-class OnOffOffWithEffect : public ClusterCommand {
+class ReadFanControlFanModeSequence : public ReadAttribute {
 public:
-    OnOffOffWithEffect()
-        : ClusterCommand("off-with-effect")
+    ReadFanControlFanModeSequence()
+        : ReadAttribute("fan-mode-sequence")
     {
-        AddArgument("EffectId", 0, UINT8_MAX, &mRequest.effectId);
-        AddArgument("EffectVariant", 0, UINT8_MAX, &mRequest.effectVariant);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadFanControlFanModeSequence() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) command (0x00000040) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPOnOffClusterOffWithEffectParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.effectId = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.effectId)];
-        params.effectVariant = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.effectVariant)];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster offWithEffectWithParams:params
-                           completionHandler:^(NSError * _Nullable error) {
-                               responsesNeeded--;
-                               if (error != nil) {
-                                   mError = error;
-                                   LogNSError("Error", error);
-                               }
-                               if (responsesNeeded == 0) {
-                                   SetCommandExitStatus(mError);
-                               }
-                           }];
-        }
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFanModeSequenceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FanControl.FanModeSequence response %@", [value description]);
+            if (error != nil) {
+                LogNSError("FanControl FanModeSequence read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::OnOff::Commands::OffWithEffect::Type mRequest;
 };
 
-/*
- * Command OnWithRecallGlobalScene
- */
-class OnOffOnWithRecallGlobalScene : public ClusterCommand {
+class WriteFanControlFanModeSequence : public WriteAttribute {
 public:
-    OnOffOnWithRecallGlobalScene()
-        : ClusterCommand("on-with-recall-global-scene")
+    WriteFanControlFanModeSequence()
+        : WriteAttribute("fan-mode-sequence")
     {
-        ClusterCommand::AddArguments();
+        AddArgument("attr-name", "fan-mode-sequence");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
+    ~WriteFanControlFanModeSequence() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) command (0x00000041) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) WriteAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPOnOffClusterOnWithRecallGlobalSceneParams alloc] init];
-        params.timedInvokeTimeoutMs
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster onWithRecallGlobalSceneWithParams:params
-                                     completionHandler:^(NSError * _Nullable error) {
-                                         responsesNeeded--;
-                                         if (error != nil) {
-                                             mError = error;
-                                             LogNSError("Error", error);
-                                         }
-                                         if (responsesNeeded == 0) {
-                                             SetCommandExitStatus(mError);
-                                         }
-                                     }];
-        }
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeFanModeSequenceWithValue:value
+                                                 params:params
+                                      completionHandler:^(NSError * _Nullable error) {
+                                          if (error != nil) {
+                                              LogNSError("FanControl FanModeSequence write Error", error);
+                                          }
+                                          SetCommandExitStatus(error);
+                                      }];
         return CHIP_NO_ERROR;
     }
 
 private:
+    uint8_t mValue;
 };
 
-/*
- * Command OnWithTimedOff
- */
-class OnOffOnWithTimedOff : public ClusterCommand {
+class SubscribeAttributeFanControlFanModeSequence : public SubscribeAttribute {
 public:
-    OnOffOnWithTimedOff()
-        : ClusterCommand("on-with-timed-off")
+    SubscribeAttributeFanControlFanModeSequence()
+        : SubscribeAttribute("fan-mode-sequence")
     {
-        AddArgument("OnOffControl", 0, UINT8_MAX, &mRequest.onOffControl);
-        AddArgument("OnTime", 0, UINT16_MAX, &mRequest.onTime);
-        AddArgument("OffWaitTime", 0, UINT16_MAX, &mRequest.offWaitTime);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeFanControlFanModeSequence() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) command (0x00000042) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPOnOffClusterOnWithTimedOffParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.onOffControl = [NSNumber numberWithUnsignedChar:mRequest.onOffControl.Raw()];
-        params.onTime = [NSNumber numberWithUnsignedShort:mRequest.onTime];
-        params.offWaitTime = [NSNumber numberWithUnsignedShort:mRequest.offWaitTime];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster onWithTimedOffWithParams:params
-                            completionHandler:^(NSError * _Nullable error) {
-                                responsesNeeded--;
-                                if (error != nil) {
-                                    mError = error;
-                                    LogNSError("Error", error);
-                                }
-                                if (responsesNeeded == 0) {
-                                    SetCommandExitStatus(mError);
-                                }
-                            }];
-        }
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeFanModeSequenceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FanControl.FanModeSequence response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::OnOff::Commands::OnWithTimedOff::Type mRequest;
 };
 
 /*
- * Attribute OnOff
+ * Attribute PercentSetting
  */
-class ReadOnOffOnOff : public ReadAttribute {
+class ReadFanControlPercentSetting : public ReadAttribute {
 public:
-    ReadOnOffOnOff()
-        : ReadAttribute("on-off")
+    ReadFanControlPercentSetting()
+        : ReadAttribute("percent-setting")
     {
     }
 
-    ~ReadOnOffOnOff() {}
+    ~ReadFanControlPercentSetting() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OnOff.OnOff response %@", [value description]);
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributePercentSettingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FanControl.PercentSetting response %@", [value description]);
             if (error != nil) {
-                LogNSError("OnOff OnOff read Error", error);
+                LogNSError("FanControl PercentSetting read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -52442,96 +51218,70 @@ class ReadOnOffOnOff : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOnOffOnOff : public SubscribeAttribute {
+class WriteFanControlPercentSetting : public WriteAttribute {
 public:
-    SubscribeAttributeOnOffOnOff()
-        : SubscribeAttribute("on-off")
+    WriteFanControlPercentSetting()
+        : WriteAttribute("percent-setting")
     {
+        AddArgument("attr-name", "percent-setting");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeOnOffOnOff() {}
+    ~WriteFanControlPercentSetting() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) WriteAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOnOffWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OnOff.OnOff response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
 
+        [cluster writeAttributePercentSettingWithValue:value
+                                                params:params
+                                     completionHandler:^(NSError * _Nullable error) {
+                                         if (error != nil) {
+                                             LogNSError("FanControl PercentSetting write Error", error);
+                                         }
+                                         SetCommandExitStatus(error);
+                                     }];
         return CHIP_NO_ERROR;
     }
-};
-
-/*
- * Attribute GlobalSceneControl
- */
-class ReadOnOffGlobalSceneControl : public ReadAttribute {
-public:
-    ReadOnOffGlobalSceneControl()
-        : ReadAttribute("global-scene-control")
-    {
-    }
-
-    ~ReadOnOffGlobalSceneControl() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReadAttribute (0x00004000) on endpoint %u", endpointId);
 
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGlobalSceneControlWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OnOff.GlobalSceneControl response %@", [value description]);
-            if (error != nil) {
-                LogNSError("OnOff GlobalSceneControl read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
+private:
+    uint8_t mValue;
 };
 
-class SubscribeAttributeOnOffGlobalSceneControl : public SubscribeAttribute {
+class SubscribeAttributeFanControlPercentSetting : public SubscribeAttribute {
 public:
-    SubscribeAttributeOnOffGlobalSceneControl()
-        : SubscribeAttribute("global-scene-control")
+    SubscribeAttributeFanControlPercentSetting()
+        : SubscribeAttribute("percent-setting")
     {
     }
 
-    ~SubscribeAttributeOnOffGlobalSceneControl() {}
+    ~SubscribeAttributeFanControlPercentSetting() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReportAttribute (0x00004000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGlobalSceneControlWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePercentSettingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OnOff.GlobalSceneControl response %@", [value description]);
+                NSLog(@"FanControl.PercentSetting response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -52542,27 +51292,27 @@ class SubscribeAttributeOnOffGlobalSceneControl : public SubscribeAttribute {
 };
 
 /*
- * Attribute OnTime
+ * Attribute PercentCurrent
  */
-class ReadOnOffOnTime : public ReadAttribute {
+class ReadFanControlPercentCurrent : public ReadAttribute {
 public:
-    ReadOnOffOnTime()
-        : ReadAttribute("on-time")
+    ReadFanControlPercentCurrent()
+        : ReadAttribute("percent-current")
     {
     }
 
-    ~ReadOnOffOnTime() {}
+    ~ReadFanControlPercentCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReadAttribute (0x00004001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeOnTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OnOff.OnTime response %@", [value description]);
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributePercentCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FanControl.PercentCurrent response %@", [value description]);
             if (error != nil) {
-                LogNSError("OnOff OnTime read Error", error);
+                LogNSError("FanControl PercentCurrent read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -52570,70 +51320,32 @@ class ReadOnOffOnTime : public ReadAttribute {
     }
 };
 
-class WriteOnOffOnTime : public WriteAttribute {
-public:
-    WriteOnOffOnTime()
-        : WriteAttribute("on-time")
-    {
-        AddArgument("attr-name", "on-time");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteOnOffOnTime() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) WriteAttribute (0x00004001) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeOnTimeWithValue:value
-                                        params:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 if (error != nil) {
-                                     LogNSError("OnOff OnTime write Error", error);
-                                 }
-                                 SetCommandExitStatus(error);
-                             }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeOnOffOnTime : public SubscribeAttribute {
+class SubscribeAttributeFanControlPercentCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeOnOffOnTime()
-        : SubscribeAttribute("on-time")
+    SubscribeAttributeFanControlPercentCurrent()
+        : SubscribeAttribute("percent-current")
     {
     }
 
-    ~SubscribeAttributeOnOffOnTime() {}
+    ~SubscribeAttributeFanControlPercentCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReportAttribute (0x00004001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOnTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePercentCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OnOff.OnTime response %@", [value description]);
+                NSLog(@"FanControl.PercentCurrent response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -52644,27 +51356,27 @@ class SubscribeAttributeOnOffOnTime : public SubscribeAttribute {
 };
 
 /*
- * Attribute OffWaitTime
+ * Attribute SpeedMax
  */
-class ReadOnOffOffWaitTime : public ReadAttribute {
+class ReadFanControlSpeedMax : public ReadAttribute {
 public:
-    ReadOnOffOffWaitTime()
-        : ReadAttribute("off-wait-time")
+    ReadFanControlSpeedMax()
+        : ReadAttribute("speed-max")
     {
     }
 
-    ~ReadOnOffOffWaitTime() {}
+    ~ReadFanControlSpeedMax() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReadAttribute (0x00004002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeOffWaitTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OnOff.OffWaitTime response %@", [value description]);
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeSpeedMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FanControl.SpeedMax response %@", [value description]);
             if (error != nil) {
-                LogNSError("OnOff OffWaitTime read Error", error);
+                LogNSError("FanControl SpeedMax read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -52672,70 +51384,32 @@ class ReadOnOffOffWaitTime : public ReadAttribute {
     }
 };
 
-class WriteOnOffOffWaitTime : public WriteAttribute {
-public:
-    WriteOnOffOffWaitTime()
-        : WriteAttribute("off-wait-time")
-    {
-        AddArgument("attr-name", "off-wait-time");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteOnOffOffWaitTime() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) WriteAttribute (0x00004002) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeOffWaitTimeWithValue:value
-                                             params:params
-                                  completionHandler:^(NSError * _Nullable error) {
-                                      if (error != nil) {
-                                          LogNSError("OnOff OffWaitTime write Error", error);
-                                      }
-                                      SetCommandExitStatus(error);
-                                  }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeOnOffOffWaitTime : public SubscribeAttribute {
+class SubscribeAttributeFanControlSpeedMax : public SubscribeAttribute {
 public:
-    SubscribeAttributeOnOffOffWaitTime()
-        : SubscribeAttribute("off-wait-time")
+    SubscribeAttributeFanControlSpeedMax()
+        : SubscribeAttribute("speed-max")
     {
     }
 
-    ~SubscribeAttributeOnOffOffWaitTime() {}
+    ~SubscribeAttributeFanControlSpeedMax() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReportAttribute (0x00004002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOffWaitTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSpeedMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OnOff.OffWaitTime response %@", [value description]);
+                NSLog(@"FanControl.SpeedMax response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -52746,27 +51420,27 @@ class SubscribeAttributeOnOffOffWaitTime : public SubscribeAttribute {
 };
 
 /*
- * Attribute StartUpOnOff
+ * Attribute SpeedSetting
  */
-class ReadOnOffStartUpOnOff : public ReadAttribute {
+class ReadFanControlSpeedSetting : public ReadAttribute {
 public:
-    ReadOnOffStartUpOnOff()
-        : ReadAttribute("start-up-on-off")
+    ReadFanControlSpeedSetting()
+        : ReadAttribute("speed-setting")
     {
     }
 
-    ~ReadOnOffStartUpOnOff() {}
+    ~ReadFanControlSpeedSetting() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReadAttribute (0x00004003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeStartUpOnOffWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OnOff.StartUpOnOff response %@", [value description]);
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeSpeedSettingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FanControl.SpeedSetting response %@", [value description]);
             if (error != nil) {
-                LogNSError("OnOff StartUpOnOff read Error", error);
+                LogNSError("FanControl SpeedSetting read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -52774,34 +51448,34 @@ class ReadOnOffStartUpOnOff : public ReadAttribute {
     }
 };
 
-class WriteOnOffStartUpOnOff : public WriteAttribute {
+class WriteFanControlSpeedSetting : public WriteAttribute {
 public:
-    WriteOnOffStartUpOnOff()
-        : WriteAttribute("start-up-on-off")
+    WriteFanControlSpeedSetting()
+        : WriteAttribute("speed-setting")
     {
-        AddArgument("attr-name", "start-up-on-off");
+        AddArgument("attr-name", "speed-setting");
         AddArgument("attr-value", 0, UINT8_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteOnOffStartUpOnOff() {}
+    ~WriteFanControlSpeedSetting() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) WriteAttribute (0x00004003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) WriteAttribute (0x00000005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
         NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
 
-        [cluster writeAttributeStartUpOnOffWithValue:value
+        [cluster writeAttributeSpeedSettingWithValue:value
                                               params:params
                                    completionHandler:^(NSError * _Nullable error) {
                                        if (error != nil) {
-                                           LogNSError("OnOff StartUpOnOff write Error", error);
+                                           LogNSError("FanControl SpeedSetting write Error", error);
                                        }
                                        SetCommandExitStatus(error);
                                    }];
@@ -52812,32 +51486,32 @@ class WriteOnOffStartUpOnOff : public WriteAttribute {
     uint8_t mValue;
 };
 
-class SubscribeAttributeOnOffStartUpOnOff : public SubscribeAttribute {
+class SubscribeAttributeFanControlSpeedSetting : public SubscribeAttribute {
 public:
-    SubscribeAttributeOnOffStartUpOnOff()
-        : SubscribeAttribute("start-up-on-off")
+    SubscribeAttributeFanControlSpeedSetting()
+        : SubscribeAttribute("speed-setting")
     {
     }
 
-    ~SubscribeAttributeOnOffStartUpOnOff() {}
+    ~SubscribeAttributeFanControlSpeedSetting() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReportAttribute (0x00004003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x00000005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeStartUpOnOffWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSpeedSettingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OnOff.StartUpOnOff response %@", [value description]);
+                NSLog(@"FanControl.SpeedSetting response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -52848,27 +51522,27 @@ class SubscribeAttributeOnOffStartUpOnOff : public SubscribeAttribute {
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute SpeedCurrent
  */
-class ReadOnOffGeneratedCommandList : public ReadAttribute {
+class ReadFanControlSpeedCurrent : public ReadAttribute {
 public:
-    ReadOnOffGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadFanControlSpeedCurrent()
+        : ReadAttribute("speed-current")
     {
     }
 
-    ~ReadOnOffGeneratedCommandList() {}
+    ~ReadFanControlSpeedCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x00000006) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OnOff.GeneratedCommandList response %@", [value description]);
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeSpeedCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FanControl.SpeedCurrent response %@", [value description]);
             if (error != nil) {
-                LogNSError("OnOff GeneratedCommandList read Error", error);
+                LogNSError("FanControl SpeedCurrent read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -52876,32 +51550,32 @@ class ReadOnOffGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOnOffGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeFanControlSpeedCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeOnOffGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeFanControlSpeedCurrent()
+        : SubscribeAttribute("speed-current")
     {
     }
 
-    ~SubscribeAttributeOnOffGeneratedCommandList() {}
+    ~SubscribeAttributeFanControlSpeedCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x00000006) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSpeedCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OnOff.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FanControl.SpeedCurrent response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -52912,27 +51586,27 @@ class SubscribeAttributeOnOffGeneratedCommandList : public SubscribeAttribute {
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute RockSupport
  */
-class ReadOnOffAcceptedCommandList : public ReadAttribute {
+class ReadFanControlRockSupport : public ReadAttribute {
 public:
-    ReadOnOffAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadFanControlRockSupport()
+        : ReadAttribute("rock-support")
     {
     }
 
-    ~ReadOnOffAcceptedCommandList() {}
+    ~ReadFanControlRockSupport() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x00000007) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OnOff.AcceptedCommandList response %@", [value description]);
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeRockSupportWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FanControl.RockSupport response %@", [value description]);
             if (error != nil) {
-                LogNSError("OnOff AcceptedCommandList read Error", error);
+                LogNSError("FanControl RockSupport read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -52940,32 +51614,32 @@ class ReadOnOffAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOnOffAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeFanControlRockSupport : public SubscribeAttribute {
 public:
-    SubscribeAttributeOnOffAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeFanControlRockSupport()
+        : SubscribeAttribute("rock-support")
     {
     }
 
-    ~SubscribeAttributeOnOffAcceptedCommandList() {}
+    ~SubscribeAttributeFanControlRockSupport() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x00000007) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRockSupportWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OnOff.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FanControl.RockSupport response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -52976,27 +51650,27 @@ class SubscribeAttributeOnOffAcceptedCommandList : public SubscribeAttribute {
 };
 
 /*
- * Attribute AttributeList
+ * Attribute RockSetting
  */
-class ReadOnOffAttributeList : public ReadAttribute {
+class ReadFanControlRockSetting : public ReadAttribute {
 public:
-    ReadOnOffAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadFanControlRockSetting()
+        : ReadAttribute("rock-setting")
     {
     }
 
-    ~ReadOnOffAttributeList() {}
+    ~ReadFanControlRockSetting() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x00000008) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OnOff.AttributeList response %@", [value description]);
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeRockSettingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FanControl.RockSetting response %@", [value description]);
             if (error != nil) {
-                LogNSError("OnOff AttributeList read Error", error);
+                LogNSError("FanControl RockSetting read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -53004,32 +51678,70 @@ class ReadOnOffAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOnOffAttributeList : public SubscribeAttribute {
+class WriteFanControlRockSetting : public WriteAttribute {
 public:
-    SubscribeAttributeOnOffAttributeList()
-        : SubscribeAttribute("attribute-list")
+    WriteFanControlRockSetting()
+        : WriteAttribute("rock-setting")
     {
+        AddArgument("attr-name", "rock-setting");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeOnOffAttributeList() {}
+    ~WriteFanControlRockSetting() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) WriteAttribute (0x00000008) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeRockSettingWithValue:value
+                                             params:params
+                                  completionHandler:^(NSError * _Nullable error) {
+                                      if (error != nil) {
+                                          LogNSError("FanControl RockSetting write Error", error);
+                                      }
+                                      SetCommandExitStatus(error);
+                                  }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeFanControlRockSetting : public SubscribeAttribute {
+public:
+    SubscribeAttributeFanControlRockSetting()
+        : SubscribeAttribute("rock-setting")
+    {
+    }
+
+    ~SubscribeAttributeFanControlRockSetting() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x00000008) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRockSettingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OnOff.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FanControl.RockSetting response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -53040,27 +51752,27 @@ class SubscribeAttributeOnOffAttributeList : public SubscribeAttribute {
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute WindSupport
  */
-class ReadOnOffFeatureMap : public ReadAttribute {
+class ReadFanControlWindSupport : public ReadAttribute {
 public:
-    ReadOnOffFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadFanControlWindSupport()
+        : ReadAttribute("wind-support")
     {
     }
 
-    ~ReadOnOffFeatureMap() {}
+    ~ReadFanControlWindSupport() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x00000009) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OnOff.FeatureMap response %@", [value description]);
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeWindSupportWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FanControl.WindSupport response %@", [value description]);
             if (error != nil) {
-                LogNSError("OnOff FeatureMap read Error", error);
+                LogNSError("FanControl WindSupport read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -53068,32 +51780,32 @@ class ReadOnOffFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOnOffFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeFanControlWindSupport : public SubscribeAttribute {
 public:
-    SubscribeAttributeOnOffFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeFanControlWindSupport()
+        : SubscribeAttribute("wind-support")
     {
     }
 
-    ~SubscribeAttributeOnOffFeatureMap() {}
+    ~SubscribeAttributeFanControlWindSupport() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x00000009) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeWindSupportWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OnOff.FeatureMap response %@", [value description]);
+                NSLog(@"FanControl.WindSupport response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -53104,178 +51816,27 @@ class SubscribeAttributeOnOffFeatureMap : public SubscribeAttribute {
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute WindSetting
  */
-class ReadOnOffClusterRevision : public ReadAttribute {
+class ReadFanControlWindSetting : public ReadAttribute {
 public:
-    ReadOnOffClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadFanControlWindSetting()
+        : ReadAttribute("wind-setting")
     {
     }
 
-    ~ReadOnOffClusterRevision() {}
+    ~ReadFanControlWindSetting() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x0000000A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OnOff.ClusterRevision response %@", [value description]);
-            if (error != nil) {
-                LogNSError("OnOff ClusterRevision read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class SubscribeAttributeOnOffClusterRevision : public SubscribeAttribute {
-public:
-    SubscribeAttributeOnOffClusterRevision()
-        : SubscribeAttribute("cluster-revision")
-    {
-    }
-
-    ~SubscribeAttributeOnOffClusterRevision() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000006) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OnOff.ClusterRevision response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-/*----------------------------------------------------------------------------*\
-| Cluster OnOffSwitchConfiguration                                    | 0x0007 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * SwitchType                                                        | 0x0000 |
-| * SwitchActions                                                     | 0x0010 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
-/*
- * Attribute SwitchType
- */
-class ReadOnOffSwitchConfigurationSwitchType : public ReadAttribute {
-public:
-    ReadOnOffSwitchConfigurationSwitchType()
-        : ReadAttribute("switch-type")
-    {
-    }
-
-    ~ReadOnOffSwitchConfigurationSwitchType() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReadAttribute (0x00000000) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeSwitchTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OnOffSwitchConfiguration.SwitchType response %@", [value description]);
-            if (error != nil) {
-                LogNSError("OnOffSwitchConfiguration SwitchType read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class SubscribeAttributeOnOffSwitchConfigurationSwitchType : public SubscribeAttribute {
-public:
-    SubscribeAttributeOnOffSwitchConfigurationSwitchType()
-        : SubscribeAttribute("switch-type")
-    {
-    }
-
-    ~SubscribeAttributeOnOffSwitchConfigurationSwitchType() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReportAttribute (0x00000000) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSwitchTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OnOffSwitchConfiguration.SwitchType response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-/*
- * Attribute SwitchActions
- */
-class ReadOnOffSwitchConfigurationSwitchActions : public ReadAttribute {
-public:
-    ReadOnOffSwitchConfigurationSwitchActions()
-        : ReadAttribute("switch-actions")
-    {
-    }
-
-    ~ReadOnOffSwitchConfigurationSwitchActions() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReadAttribute (0x00000010) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeSwitchActionsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OnOffSwitchConfiguration.SwitchActions response %@", [value description]);
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeWindSettingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FanControl.WindSetting response %@", [value description]);
             if (error != nil) {
-                LogNSError("OnOffSwitchConfiguration SwitchActions read Error", error);
+                LogNSError("FanControl WindSetting read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -53283,39 +51844,37 @@ class ReadOnOffSwitchConfigurationSwitchActions : public ReadAttribute {
     }
 };
 
-class WriteOnOffSwitchConfigurationSwitchActions : public WriteAttribute {
+class WriteFanControlWindSetting : public WriteAttribute {
 public:
-    WriteOnOffSwitchConfigurationSwitchActions()
-        : WriteAttribute("switch-actions")
+    WriteFanControlWindSetting()
+        : WriteAttribute("wind-setting")
     {
-        AddArgument("attr-name", "switch-actions");
+        AddArgument("attr-name", "wind-setting");
         AddArgument("attr-value", 0, UINT8_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteOnOffSwitchConfigurationSwitchActions() {}
+    ~WriteFanControlWindSetting() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000007) WriteAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) WriteAttribute (0x0000000A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
         NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
 
-        [cluster writeAttributeSwitchActionsWithValue:value
-                                               params:params
-                                    completionHandler:^(NSError * _Nullable error) {
-                                        if (error != nil) {
-                                            LogNSError("OnOffSwitchConfiguration SwitchActions write Error", error);
-                                        }
-                                        SetCommandExitStatus(error);
-                                    }];
+        [cluster writeAttributeWindSettingWithValue:value
+                                             params:params
+                                  completionHandler:^(NSError * _Nullable error) {
+                                      if (error != nil) {
+                                          LogNSError("FanControl WindSetting write Error", error);
+                                      }
+                                      SetCommandExitStatus(error);
+                                  }];
         return CHIP_NO_ERROR;
     }
 
@@ -53323,34 +51882,32 @@ class WriteOnOffSwitchConfigurationSwitchActions : public WriteAttribute {
     uint8_t mValue;
 };
 
-class SubscribeAttributeOnOffSwitchConfigurationSwitchActions : public SubscribeAttribute {
+class SubscribeAttributeFanControlWindSetting : public SubscribeAttribute {
 public:
-    SubscribeAttributeOnOffSwitchConfigurationSwitchActions()
-        : SubscribeAttribute("switch-actions")
+    SubscribeAttributeFanControlWindSetting()
+        : SubscribeAttribute("wind-setting")
     {
     }
 
-    ~SubscribeAttributeOnOffSwitchConfigurationSwitchActions() {}
+    ~SubscribeAttributeFanControlWindSetting() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReportAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x0000000A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSwitchActionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeWindSettingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OnOffSwitchConfiguration.SwitchActions response %@", [value description]);
+                NSLog(@"FanControl.WindSetting response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -53363,27 +51920,25 @@ class SubscribeAttributeOnOffSwitchConfigurationSwitchActions : public Subscribe
 /*
  * Attribute GeneratedCommandList
  */
-class ReadOnOffSwitchConfigurationGeneratedCommandList : public ReadAttribute {
+class ReadFanControlGeneratedCommandList : public ReadAttribute {
 public:
-    ReadOnOffSwitchConfigurationGeneratedCommandList()
+    ReadFanControlGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadOnOffSwitchConfigurationGeneratedCommandList() {}
+    ~ReadFanControlGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OnOffSwitchConfiguration.GeneratedCommandList response %@", [value description]);
+            NSLog(@"FanControl.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("OnOffSwitchConfiguration GeneratedCommandList read Error", error);
+                LogNSError("FanControl GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -53391,22 +51946,20 @@ class ReadOnOffSwitchConfigurationGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOnOffSwitchConfigurationGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeFanControlGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeOnOffSwitchConfigurationGeneratedCommandList()
+    SubscribeAttributeFanControlGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeOnOffSwitchConfigurationGeneratedCommandList() {}
+    ~SubscribeAttributeFanControlGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -53418,7 +51971,7 @@ class SubscribeAttributeOnOffSwitchConfigurationGeneratedCommandList : public Su
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OnOffSwitchConfiguration.GeneratedCommandList response %@", [value description]);
+                NSLog(@"FanControl.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -53431,27 +51984,25 @@ class SubscribeAttributeOnOffSwitchConfigurationGeneratedCommandList : public Su
 /*
  * Attribute AcceptedCommandList
  */
-class ReadOnOffSwitchConfigurationAcceptedCommandList : public ReadAttribute {
+class ReadFanControlAcceptedCommandList : public ReadAttribute {
 public:
-    ReadOnOffSwitchConfigurationAcceptedCommandList()
+    ReadFanControlAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadOnOffSwitchConfigurationAcceptedCommandList() {}
+    ~ReadFanControlAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OnOffSwitchConfiguration.AcceptedCommandList response %@", [value description]);
+            NSLog(@"FanControl.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("OnOffSwitchConfiguration AcceptedCommandList read Error", error);
+                LogNSError("FanControl AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -53459,22 +52010,20 @@ class ReadOnOffSwitchConfigurationAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOnOffSwitchConfigurationAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeFanControlAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeOnOffSwitchConfigurationAcceptedCommandList()
+    SubscribeAttributeFanControlAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeOnOffSwitchConfigurationAcceptedCommandList() {}
+    ~SubscribeAttributeFanControlAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -53486,7 +52035,7 @@ class SubscribeAttributeOnOffSwitchConfigurationAcceptedCommandList : public Sub
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OnOffSwitchConfiguration.AcceptedCommandList response %@", [value description]);
+                NSLog(@"FanControl.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -53499,27 +52048,25 @@ class SubscribeAttributeOnOffSwitchConfigurationAcceptedCommandList : public Sub
 /*
  * Attribute AttributeList
  */
-class ReadOnOffSwitchConfigurationAttributeList : public ReadAttribute {
+class ReadFanControlAttributeList : public ReadAttribute {
 public:
-    ReadOnOffSwitchConfigurationAttributeList()
+    ReadFanControlAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadOnOffSwitchConfigurationAttributeList() {}
+    ~ReadFanControlAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OnOffSwitchConfiguration.AttributeList response %@", [value description]);
+            NSLog(@"FanControl.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("OnOffSwitchConfiguration AttributeList read Error", error);
+                LogNSError("FanControl AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -53527,22 +52074,20 @@ class ReadOnOffSwitchConfigurationAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOnOffSwitchConfigurationAttributeList : public SubscribeAttribute {
+class SubscribeAttributeFanControlAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeOnOffSwitchConfigurationAttributeList()
+    SubscribeAttributeFanControlAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeOnOffSwitchConfigurationAttributeList() {}
+    ~SubscribeAttributeFanControlAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -53554,7 +52099,7 @@ class SubscribeAttributeOnOffSwitchConfigurationAttributeList : public Subscribe
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OnOffSwitchConfiguration.AttributeList response %@", [value description]);
+                NSLog(@"FanControl.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -53567,27 +52112,25 @@ class SubscribeAttributeOnOffSwitchConfigurationAttributeList : public Subscribe
 /*
  * Attribute FeatureMap
  */
-class ReadOnOffSwitchConfigurationFeatureMap : public ReadAttribute {
+class ReadFanControlFeatureMap : public ReadAttribute {
 public:
-    ReadOnOffSwitchConfigurationFeatureMap()
+    ReadFanControlFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadOnOffSwitchConfigurationFeatureMap() {}
+    ~ReadFanControlFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OnOffSwitchConfiguration.FeatureMap response %@", [value description]);
+            NSLog(@"FanControl.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("OnOffSwitchConfiguration FeatureMap read Error", error);
+                LogNSError("FanControl FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -53595,22 +52138,20 @@ class ReadOnOffSwitchConfigurationFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOnOffSwitchConfigurationFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeFanControlFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeOnOffSwitchConfigurationFeatureMap()
+    SubscribeAttributeFanControlFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeOnOffSwitchConfigurationFeatureMap() {}
+    ~SubscribeAttributeFanControlFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -53622,7 +52163,7 @@ class SubscribeAttributeOnOffSwitchConfigurationFeatureMap : public SubscribeAtt
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OnOffSwitchConfiguration.FeatureMap response %@", [value description]);
+                NSLog(@"FanControl.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -53635,27 +52176,25 @@ class SubscribeAttributeOnOffSwitchConfigurationFeatureMap : public SubscribeAtt
 /*
  * Attribute ClusterRevision
  */
-class ReadOnOffSwitchConfigurationClusterRevision : public ReadAttribute {
+class ReadFanControlClusterRevision : public ReadAttribute {
 public:
-    ReadOnOffSwitchConfigurationClusterRevision()
+    ReadFanControlClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadOnOffSwitchConfigurationClusterRevision() {}
+    ~ReadFanControlClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OnOffSwitchConfiguration.ClusterRevision response %@", [value description]);
+            NSLog(@"FanControl.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("OnOffSwitchConfiguration ClusterRevision read Error", error);
+                LogNSError("FanControl ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -53663,22 +52202,20 @@ class ReadOnOffSwitchConfigurationClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOnOffSwitchConfigurationClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeFanControlClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeOnOffSwitchConfigurationClusterRevision()
+    SubscribeAttributeFanControlClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeOnOffSwitchConfigurationClusterRevision() {}
+    ~SubscribeAttributeFanControlClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000007) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000202) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOnOffSwitchConfiguration * cluster = [[CHIPOnOffSwitchConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -53690,7 +52227,7 @@ class SubscribeAttributeOnOffSwitchConfigurationClusterRevision : public Subscri
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OnOffSwitchConfiguration.ClusterRevision response %@", [value description]);
+                NSLog(@"FanControl.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -53701,25 +52238,14 @@ class SubscribeAttributeOnOffSwitchConfigurationClusterRevision : public Subscri
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster OperationalCredentials                                      | 0x003E |
+| Cluster ThermostatUserInterfaceConfiguration                        | 0x0204 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * AttestationRequest                                                |   0x00 |
-| * CertificateChainRequest                                           |   0x02 |
-| * CSRRequest                                                        |   0x04 |
-| * AddNOC                                                            |   0x06 |
-| * UpdateNOC                                                         |   0x07 |
-| * UpdateFabricLabel                                                 |   0x09 |
-| * RemoveFabric                                                      |   0x0A |
-| * AddTrustedRootCertificate                                         |   0x0B |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * NOCs                                                              | 0x0000 |
-| * Fabrics                                                           | 0x0001 |
-| * SupportedFabrics                                                  | 0x0002 |
-| * CommissionedFabrics                                               | 0x0003 |
-| * TrustedRootCertificates                                           | 0x0004 |
-| * CurrentFabricIndex                                                | 0x0005 |
+| * TemperatureDisplayMode                                            | 0x0000 |
+| * KeypadLockout                                                     | 0x0001 |
+| * ScheduleProgrammingVisibility                                     | 0x0002 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -53730,476 +52256,316 @@ class SubscribeAttributeOnOffSwitchConfigurationClusterRevision : public Subscri
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command AttestationRequest
+ * Attribute TemperatureDisplayMode
  */
-class OperationalCredentialsAttestationRequest : public ClusterCommand {
+class ReadThermostatUserInterfaceConfigurationTemperatureDisplayMode : public ReadAttribute {
 public:
-    OperationalCredentialsAttestationRequest()
-        : ClusterCommand("attestation-request")
+    ReadThermostatUserInterfaceConfigurationTemperatureDisplayMode()
+        : ReadAttribute("temperature-display-mode")
     {
-        AddArgument("AttestationNonce", &mRequest.attestationNonce);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadThermostatUserInterfaceConfigurationTemperatureDisplayMode() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        __auto_type * params = [[CHIPOperationalCredentialsClusterAttestationRequestParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.attestationNonce = [NSData dataWithBytes:mRequest.attestationNonce.data() length:mRequest.attestationNonce.size()];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster attestationRequestWithParams:params
-                                completionHandler:^(CHIPOperationalCredentialsClusterAttestationResponseParams * _Nullable values,
-                                    NSError * _Nullable error) {
-                                    NSLog(@"Values: %@", values);
-                                    responsesNeeded--;
-                                    if (error != nil) {
-                                        mError = error;
-                                        LogNSError("Error", error);
-                                    }
-                                    if (responsesNeeded == 0) {
-                                        SetCommandExitStatus(mError);
-                                    }
-                                }];
-        }
+        CHIPThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeTemperatureDisplayModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThermostatUserInterfaceConfiguration.TemperatureDisplayMode response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ThermostatUserInterfaceConfiguration TemperatureDisplayMode read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::OperationalCredentials::Commands::AttestationRequest::Type mRequest;
 };
 
-/*
- * Command CertificateChainRequest
- */
-class OperationalCredentialsCertificateChainRequest : public ClusterCommand {
+class WriteThermostatUserInterfaceConfigurationTemperatureDisplayMode : public WriteAttribute {
 public:
-    OperationalCredentialsCertificateChainRequest()
-        : ClusterCommand("certificate-chain-request")
+    WriteThermostatUserInterfaceConfigurationTemperatureDisplayMode()
+        : WriteAttribute("temperature-display-mode")
     {
-        AddArgument("CertificateType", 0, UINT8_MAX, &mRequest.certificateType);
-        ClusterCommand::AddArguments();
+        AddArgument("attr-name", "temperature-display-mode");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
+    ~WriteThermostatUserInterfaceConfigurationTemperatureDisplayMode() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) command (0x00000002) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000204) WriteAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        __auto_type * params = [[CHIPOperationalCredentialsClusterCertificateChainRequestParams alloc] init];
-        params.timedInvokeTimeoutMs
+        CHIPThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.certificateType = [NSNumber numberWithUnsignedChar:mRequest.certificateType];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster certificateChainRequestWithParams:params
-                                     completionHandler:^(
-                                         CHIPOperationalCredentialsClusterCertificateChainResponseParams * _Nullable values,
-                                         NSError * _Nullable error) {
-                                         NSLog(@"Values: %@", values);
-                                         responsesNeeded--;
-                                         if (error != nil) {
-                                             mError = error;
-                                             LogNSError("Error", error);
-                                         }
-                                         if (responsesNeeded == 0) {
-                                             SetCommandExitStatus(mError);
-                                         }
-                                     }];
-        }
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeTemperatureDisplayModeWithValue:value
+                                                        params:params
+                                             completionHandler:^(NSError * _Nullable error) {
+                                                 if (error != nil) {
+                                                     LogNSError(
+                                                         "ThermostatUserInterfaceConfiguration TemperatureDisplayMode write Error",
+                                                         error);
+                                                 }
+                                                 SetCommandExitStatus(error);
+                                             }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::OperationalCredentials::Commands::CertificateChainRequest::Type mRequest;
+    uint8_t mValue;
 };
 
-/*
- * Command CSRRequest
- */
-class OperationalCredentialsCSRRequest : public ClusterCommand {
+class SubscribeAttributeThermostatUserInterfaceConfigurationTemperatureDisplayMode : public SubscribeAttribute {
 public:
-    OperationalCredentialsCSRRequest()
-        : ClusterCommand("csrrequest")
+    SubscribeAttributeThermostatUserInterfaceConfigurationTemperatureDisplayMode()
+        : SubscribeAttribute("temperature-display-mode")
     {
-        AddArgument("CSRNonce", &mRequest.CSRNonce);
-        AddArgument("IsForUpdateNOC", 0, 1, &mRequest.isForUpdateNOC);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeThermostatUserInterfaceConfigurationTemperatureDisplayMode() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) command (0x00000004) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        __auto_type * params = [[CHIPOperationalCredentialsClusterCSRRequestParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.csrNonce = [NSData dataWithBytes:mRequest.CSRNonce.data() length:mRequest.CSRNonce.size()];
-        if (mRequest.isForUpdateNOC.HasValue()) {
-            params.isForUpdateNOC = [NSNumber numberWithBool:mRequest.isForUpdateNOC.Value()];
-        } else {
-            params.isForUpdateNOC = nil;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster CSRRequestWithParams:params
-                        completionHandler:^(
-                            CHIPOperationalCredentialsClusterCSRResponseParams * _Nullable values, NSError * _Nullable error) {
-                            NSLog(@"Values: %@", values);
-                            responsesNeeded--;
-                            if (error != nil) {
-                                mError = error;
-                                LogNSError("Error", error);
-                            }
-                            if (responsesNeeded == 0) {
-                                SetCommandExitStatus(mError);
-                            }
-                        }];
-        }
+        CHIPThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeTemperatureDisplayModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThermostatUserInterfaceConfiguration.TemperatureDisplayMode response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::OperationalCredentials::Commands::CSRRequest::Type mRequest;
 };
 
 /*
- * Command AddNOC
+ * Attribute KeypadLockout
  */
-class OperationalCredentialsAddNOC : public ClusterCommand {
+class ReadThermostatUserInterfaceConfigurationKeypadLockout : public ReadAttribute {
 public:
-    OperationalCredentialsAddNOC()
-        : ClusterCommand("add-noc")
+    ReadThermostatUserInterfaceConfigurationKeypadLockout()
+        : ReadAttribute("keypad-lockout")
     {
-        AddArgument("NOCValue", &mRequest.NOCValue);
-        AddArgument("ICACValue", &mRequest.ICACValue);
-        AddArgument("IPKValue", &mRequest.IPKValue);
-        AddArgument("CaseAdminSubject", 0, UINT64_MAX, &mRequest.caseAdminSubject);
-        AddArgument("AdminVendorId", 0, UINT16_MAX, &mRequest.adminVendorId);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadThermostatUserInterfaceConfigurationKeypadLockout() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) command (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        __auto_type * params = [[CHIPOperationalCredentialsClusterAddNOCParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.nocValue = [NSData dataWithBytes:mRequest.NOCValue.data() length:mRequest.NOCValue.size()];
-        if (mRequest.ICACValue.HasValue()) {
-            params.icacValue = [NSData dataWithBytes:mRequest.ICACValue.Value().data() length:mRequest.ICACValue.Value().size()];
-        } else {
-            params.icacValue = nil;
-        }
-        params.ipkValue = [NSData dataWithBytes:mRequest.IPKValue.data() length:mRequest.IPKValue.size()];
-        params.caseAdminSubject = [NSNumber numberWithUnsignedLongLong:mRequest.caseAdminSubject];
-        params.adminVendorId = [NSNumber numberWithUnsignedShort:chip::to_underlying(mRequest.adminVendorId)];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster addNOCWithParams:params
-                    completionHandler:^(
-                        CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable error) {
-                        NSLog(@"Values: %@", values);
-                        responsesNeeded--;
-                        if (error != nil) {
-                            mError = error;
-                            LogNSError("Error", error);
-                        }
-                        if (responsesNeeded == 0) {
-                            SetCommandExitStatus(mError);
-                        }
-                    }];
-        }
+        CHIPThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeKeypadLockoutWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThermostatUserInterfaceConfiguration.KeypadLockout response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ThermostatUserInterfaceConfiguration KeypadLockout read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::OperationalCredentials::Commands::AddNOC::Type mRequest;
 };
 
-/*
- * Command UpdateNOC
- */
-class OperationalCredentialsUpdateNOC : public ClusterCommand {
+class WriteThermostatUserInterfaceConfigurationKeypadLockout : public WriteAttribute {
 public:
-    OperationalCredentialsUpdateNOC()
-        : ClusterCommand("update-noc")
+    WriteThermostatUserInterfaceConfigurationKeypadLockout()
+        : WriteAttribute("keypad-lockout")
     {
-        AddArgument("NOCValue", &mRequest.NOCValue);
-        AddArgument("ICACValue", &mRequest.ICACValue);
-        ClusterCommand::AddArguments();
+        AddArgument("attr-name", "keypad-lockout");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
+    ~WriteThermostatUserInterfaceConfigurationKeypadLockout() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) command (0x00000007) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000204) WriteAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        __auto_type * params = [[CHIPOperationalCredentialsClusterUpdateNOCParams alloc] init];
-        params.timedInvokeTimeoutMs
+        CHIPThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.nocValue = [NSData dataWithBytes:mRequest.NOCValue.data() length:mRequest.NOCValue.size()];
-        if (mRequest.ICACValue.HasValue()) {
-            params.icacValue = [NSData dataWithBytes:mRequest.ICACValue.Value().data() length:mRequest.ICACValue.Value().size()];
-        } else {
-            params.icacValue = nil;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster updateNOCWithParams:params
-                       completionHandler:^(
-                           CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable error) {
-                           NSLog(@"Values: %@", values);
-                           responsesNeeded--;
-                           if (error != nil) {
-                               mError = error;
-                               LogNSError("Error", error);
-                           }
-                           if (responsesNeeded == 0) {
-                               SetCommandExitStatus(mError);
-                           }
-                       }];
-        }
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeKeypadLockoutWithValue:value
+                                               params:params
+                                    completionHandler:^(NSError * _Nullable error) {
+                                        if (error != nil) {
+                                            LogNSError("ThermostatUserInterfaceConfiguration KeypadLockout write Error", error);
+                                        }
+                                        SetCommandExitStatus(error);
+                                    }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::OperationalCredentials::Commands::UpdateNOC::Type mRequest;
+    uint8_t mValue;
 };
 
-/*
- * Command UpdateFabricLabel
- */
-class OperationalCredentialsUpdateFabricLabel : public ClusterCommand {
+class SubscribeAttributeThermostatUserInterfaceConfigurationKeypadLockout : public SubscribeAttribute {
 public:
-    OperationalCredentialsUpdateFabricLabel()
-        : ClusterCommand("update-fabric-label")
+    SubscribeAttributeThermostatUserInterfaceConfigurationKeypadLockout()
+        : SubscribeAttribute("keypad-lockout")
     {
-        AddArgument("Label", &mRequest.label);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeThermostatUserInterfaceConfigurationKeypadLockout() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) command (0x00000009) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        __auto_type * params = [[CHIPOperationalCredentialsClusterUpdateFabricLabelParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.label = [[NSString alloc] initWithBytes:mRequest.label.data()
-                                                length:mRequest.label.size()
-                                              encoding:NSUTF8StringEncoding];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster updateFabricLabelWithParams:params
-                               completionHandler:^(CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable values,
-                                   NSError * _Nullable error) {
-                                   NSLog(@"Values: %@", values);
-                                   responsesNeeded--;
-                                   if (error != nil) {
-                                       mError = error;
-                                       LogNSError("Error", error);
-                                   }
-                                   if (responsesNeeded == 0) {
-                                       SetCommandExitStatus(mError);
-                                   }
-                               }];
-        }
+        CHIPThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeKeypadLockoutWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThermostatUserInterfaceConfiguration.KeypadLockout response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::OperationalCredentials::Commands::UpdateFabricLabel::Type mRequest;
 };
 
 /*
- * Command RemoveFabric
+ * Attribute ScheduleProgrammingVisibility
  */
-class OperationalCredentialsRemoveFabric : public ClusterCommand {
+class ReadThermostatUserInterfaceConfigurationScheduleProgrammingVisibility : public ReadAttribute {
 public:
-    OperationalCredentialsRemoveFabric()
-        : ClusterCommand("remove-fabric")
+    ReadThermostatUserInterfaceConfigurationScheduleProgrammingVisibility()
+        : ReadAttribute("schedule-programming-visibility")
     {
-        AddArgument("FabricIndex", 0, UINT8_MAX, &mRequest.fabricIndex);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadThermostatUserInterfaceConfigurationScheduleProgrammingVisibility() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) command (0x0000000A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        __auto_type * params = [[CHIPOperationalCredentialsClusterRemoveFabricParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.fabricIndex = [NSNumber numberWithUnsignedChar:mRequest.fabricIndex];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster removeFabricWithParams:params
-                          completionHandler:^(
-                              CHIPOperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable error) {
-                              NSLog(@"Values: %@", values);
-                              responsesNeeded--;
-                              if (error != nil) {
-                                  mError = error;
-                                  LogNSError("Error", error);
-                              }
-                              if (responsesNeeded == 0) {
-                                  SetCommandExitStatus(mError);
-                              }
-                          }];
-        }
+        CHIPThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeScheduleProgrammingVisibilityWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThermostatUserInterfaceConfiguration.ScheduleProgrammingVisibility response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ThermostatUserInterfaceConfiguration ScheduleProgrammingVisibility read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::OperationalCredentials::Commands::RemoveFabric::Type mRequest;
 };
 
-/*
- * Command AddTrustedRootCertificate
- */
-class OperationalCredentialsAddTrustedRootCertificate : public ClusterCommand {
+class WriteThermostatUserInterfaceConfigurationScheduleProgrammingVisibility : public WriteAttribute {
 public:
-    OperationalCredentialsAddTrustedRootCertificate()
-        : ClusterCommand("add-trusted-root-certificate")
+    WriteThermostatUserInterfaceConfigurationScheduleProgrammingVisibility()
+        : WriteAttribute("schedule-programming-visibility")
     {
-        AddArgument("RootCertificate", &mRequest.rootCertificate);
-        ClusterCommand::AddArguments();
+        AddArgument("attr-name", "schedule-programming-visibility");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
+    ~WriteThermostatUserInterfaceConfigurationScheduleProgrammingVisibility() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) command (0x0000000B) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000204) WriteAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        __auto_type * params = [[CHIPOperationalCredentialsClusterAddTrustedRootCertificateParams alloc] init];
-        params.timedInvokeTimeoutMs
+        CHIPThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.rootCertificate = [NSData dataWithBytes:mRequest.rootCertificate.data() length:mRequest.rootCertificate.size()];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster addTrustedRootCertificateWithParams:params
-                                       completionHandler:^(NSError * _Nullable error) {
-                                           responsesNeeded--;
-                                           if (error != nil) {
-                                               mError = error;
-                                               LogNSError("Error", error);
-                                           }
-                                           if (responsesNeeded == 0) {
-                                               SetCommandExitStatus(mError);
-                                           }
-                                       }];
-        }
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeScheduleProgrammingVisibilityWithValue:value
+                                                               params:params
+                                                    completionHandler:^(NSError * _Nullable error) {
+                                                        if (error != nil) {
+                                                            LogNSError("ThermostatUserInterfaceConfiguration "
+                                                                       "ScheduleProgrammingVisibility write Error",
+                                                                error);
+                                                        }
+                                                        SetCommandExitStatus(error);
+                                                    }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::OperationalCredentials::Commands::AddTrustedRootCertificate::Type mRequest;
-};
-
-/*
- * Attribute NOCs
- */
-class ReadOperationalCredentialsNOCs : public ReadAttribute {
-public:
-    ReadOperationalCredentialsNOCs()
-        : ReadAttribute("nocs")
-    {
-    }
-
-    ~ReadOperationalCredentialsNOCs() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReadAttribute (0x00000000) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        CHIPReadParams * params = [[CHIPReadParams alloc] init];
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster readAttributeNOCsWithParams:params
-                           completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                               NSLog(@"OperationalCredentials.NOCs response %@", [value description]);
-                               if (error != nil) {
-                                   LogNSError("OperationalCredentials NOCs read Error", error);
-                               }
-                               SetCommandExitStatus(error);
-                           }];
-        return CHIP_NO_ERROR;
-    }
+    uint8_t mValue;
 };
 
-class SubscribeAttributeOperationalCredentialsNOCs : public SubscribeAttribute {
+class SubscribeAttributeThermostatUserInterfaceConfigurationScheduleProgrammingVisibility : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalCredentialsNOCs()
-        : SubscribeAttribute("nocs")
+    SubscribeAttributeThermostatUserInterfaceConfigurationScheduleProgrammingVisibility()
+        : SubscribeAttribute("schedule-programming-visibility")
     {
     }
 
-    ~SubscribeAttributeOperationalCredentialsNOCs() {}
+    ~SubscribeAttributeThermostatUserInterfaceConfigurationScheduleProgrammingVisibility() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNOCsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeScheduleProgrammingVisibilityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalCredentials.NOCs response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThermostatUserInterfaceConfiguration.ScheduleProgrammingVisibility response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -54210,67 +52576,62 @@ class SubscribeAttributeOperationalCredentialsNOCs : public SubscribeAttribute {
 };
 
 /*
- * Attribute Fabrics
+ * Attribute GeneratedCommandList
  */
-class ReadOperationalCredentialsFabrics : public ReadAttribute {
+class ReadThermostatUserInterfaceConfigurationGeneratedCommandList : public ReadAttribute {
 public:
-    ReadOperationalCredentialsFabrics()
-        : ReadAttribute("fabrics")
+    ReadThermostatUserInterfaceConfigurationGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadOperationalCredentialsFabrics() {}
+    ~ReadThermostatUserInterfaceConfigurationGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        CHIPReadParams * params = [[CHIPReadParams alloc] init];
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster readAttributeFabricsWithParams:params
-                              completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                  NSLog(@"OperationalCredentials.Fabrics response %@", [value description]);
-                                  if (error != nil) {
-                                      LogNSError("OperationalCredentials Fabrics read Error", error);
-                                  }
-                                  SetCommandExitStatus(error);
-                              }];
+        CHIPThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThermostatUserInterfaceConfiguration.GeneratedCommandList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ThermostatUserInterfaceConfiguration GeneratedCommandList read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeOperationalCredentialsFabrics : public SubscribeAttribute {
+class SubscribeAttributeThermostatUserInterfaceConfigurationGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalCredentialsFabrics()
-        : SubscribeAttribute("fabrics")
+    SubscribeAttributeThermostatUserInterfaceConfigurationGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeOperationalCredentialsFabrics() {}
+    ~SubscribeAttributeThermostatUserInterfaceConfigurationGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFabricsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalCredentials.Fabrics response %@", [value description]);
+                NSLog(@"ThermostatUserInterfaceConfiguration.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -54281,29 +52642,28 @@ class SubscribeAttributeOperationalCredentialsFabrics : public SubscribeAttribut
 };
 
 /*
- * Attribute SupportedFabrics
+ * Attribute AcceptedCommandList
  */
-class ReadOperationalCredentialsSupportedFabrics : public ReadAttribute {
+class ReadThermostatUserInterfaceConfigurationAcceptedCommandList : public ReadAttribute {
 public:
-    ReadOperationalCredentialsSupportedFabrics()
-        : ReadAttribute("supported-fabrics")
+    ReadThermostatUserInterfaceConfigurationAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadOperationalCredentialsSupportedFabrics() {}
+    ~ReadThermostatUserInterfaceConfigurationAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeSupportedFabricsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalCredentials.SupportedFabrics response %@", [value description]);
+        CHIPThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThermostatUserInterfaceConfiguration.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("OperationalCredentials SupportedFabrics read Error", error);
+                LogNSError("ThermostatUserInterfaceConfiguration AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -54311,34 +52671,33 @@ class ReadOperationalCredentialsSupportedFabrics : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalCredentialsSupportedFabrics : public SubscribeAttribute {
+class SubscribeAttributeThermostatUserInterfaceConfigurationAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalCredentialsSupportedFabrics()
-        : SubscribeAttribute("supported-fabrics")
+    SubscribeAttributeThermostatUserInterfaceConfigurationAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeOperationalCredentialsSupportedFabrics() {}
+    ~SubscribeAttributeThermostatUserInterfaceConfigurationAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSupportedFabricsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalCredentials.SupportedFabrics response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThermostatUserInterfaceConfiguration.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -54349,29 +52708,28 @@ class SubscribeAttributeOperationalCredentialsSupportedFabrics : public Subscrib
 };
 
 /*
- * Attribute CommissionedFabrics
+ * Attribute AttributeList
  */
-class ReadOperationalCredentialsCommissionedFabrics : public ReadAttribute {
+class ReadThermostatUserInterfaceConfigurationAttributeList : public ReadAttribute {
 public:
-    ReadOperationalCredentialsCommissionedFabrics()
-        : ReadAttribute("commissioned-fabrics")
+    ReadThermostatUserInterfaceConfigurationAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadOperationalCredentialsCommissionedFabrics() {}
+    ~ReadThermostatUserInterfaceConfigurationAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeCommissionedFabricsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalCredentials.CommissionedFabrics response %@", [value description]);
+        CHIPThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThermostatUserInterfaceConfiguration.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("OperationalCredentials CommissionedFabrics read Error", error);
+                LogNSError("ThermostatUserInterfaceConfiguration AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -54379,34 +52737,33 @@ class ReadOperationalCredentialsCommissionedFabrics : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalCredentialsCommissionedFabrics : public SubscribeAttribute {
+class SubscribeAttributeThermostatUserInterfaceConfigurationAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalCredentialsCommissionedFabrics()
-        : SubscribeAttribute("commissioned-fabrics")
+    SubscribeAttributeThermostatUserInterfaceConfigurationAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeOperationalCredentialsCommissionedFabrics() {}
+    ~SubscribeAttributeThermostatUserInterfaceConfigurationAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCommissionedFabricsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalCredentials.CommissionedFabrics response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThermostatUserInterfaceConfiguration.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -54417,29 +52774,28 @@ class SubscribeAttributeOperationalCredentialsCommissionedFabrics : public Subsc
 };
 
 /*
- * Attribute TrustedRootCertificates
+ * Attribute FeatureMap
  */
-class ReadOperationalCredentialsTrustedRootCertificates : public ReadAttribute {
+class ReadThermostatUserInterfaceConfigurationFeatureMap : public ReadAttribute {
 public:
-    ReadOperationalCredentialsTrustedRootCertificates()
-        : ReadAttribute("trusted-root-certificates")
+    ReadThermostatUserInterfaceConfigurationFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadOperationalCredentialsTrustedRootCertificates() {}
+    ~ReadThermostatUserInterfaceConfigurationFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReadAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeTrustedRootCertificatesWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalCredentials.TrustedRootCertificates response %@", [value description]);
+        CHIPThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThermostatUserInterfaceConfiguration.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("OperationalCredentials TrustedRootCertificates read Error", error);
+                LogNSError("ThermostatUserInterfaceConfiguration FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -54447,34 +52803,33 @@ class ReadOperationalCredentialsTrustedRootCertificates : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalCredentialsTrustedRootCertificates : public SubscribeAttribute {
+class SubscribeAttributeThermostatUserInterfaceConfigurationFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalCredentialsTrustedRootCertificates()
-        : SubscribeAttribute("trusted-root-certificates")
+    SubscribeAttributeThermostatUserInterfaceConfigurationFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeOperationalCredentialsTrustedRootCertificates() {}
+    ~SubscribeAttributeThermostatUserInterfaceConfigurationFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTrustedRootCertificatesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalCredentials.TrustedRootCertificates response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ThermostatUserInterfaceConfiguration.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -54485,29 +52840,28 @@ class SubscribeAttributeOperationalCredentialsTrustedRootCertificates : public S
 };
 
 /*
- * Attribute CurrentFabricIndex
+ * Attribute ClusterRevision
  */
-class ReadOperationalCredentialsCurrentFabricIndex : public ReadAttribute {
+class ReadThermostatUserInterfaceConfigurationClusterRevision : public ReadAttribute {
 public:
-    ReadOperationalCredentialsCurrentFabricIndex()
-        : ReadAttribute("current-fabric-index")
+    ReadThermostatUserInterfaceConfigurationClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadOperationalCredentialsCurrentFabricIndex() {}
+    ~ReadThermostatUserInterfaceConfigurationClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReadAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeCurrentFabricIndexWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalCredentials.CurrentFabricIndex response %@", [value description]);
+        CHIPThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ThermostatUserInterfaceConfiguration.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("OperationalCredentials CurrentFabricIndex read Error", error);
+                LogNSError("ThermostatUserInterfaceConfiguration ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -54515,34 +52869,33 @@ class ReadOperationalCredentialsCurrentFabricIndex : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalCredentialsCurrentFabricIndex : public SubscribeAttribute {
+class SubscribeAttributeThermostatUserInterfaceConfigurationClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalCredentialsCurrentFabricIndex()
-        : SubscribeAttribute("current-fabric-index")
+    SubscribeAttributeThermostatUserInterfaceConfigurationClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeOperationalCredentialsCurrentFabricIndex() {}
+    ~SubscribeAttributeThermostatUserInterfaceConfigurationClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPThermostatUserInterfaceConfiguration * cluster =
+            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentFabricIndexWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalCredentials.CurrentFabricIndex response %@", [value description]);
+                NSLog(@"ThermostatUserInterfaceConfiguration.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -54552,705 +52905,1127 @@ class SubscribeAttributeOperationalCredentialsCurrentFabricIndex : public Subscr
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster ColorControl                                                | 0x0300 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * MoveToHue                                                         |   0x00 |
+| * MoveHue                                                           |   0x01 |
+| * StepHue                                                           |   0x02 |
+| * MoveToSaturation                                                  |   0x03 |
+| * MoveSaturation                                                    |   0x04 |
+| * StepSaturation                                                    |   0x05 |
+| * MoveToHueAndSaturation                                            |   0x06 |
+| * MoveToColor                                                       |   0x07 |
+| * MoveColor                                                         |   0x08 |
+| * StepColor                                                         |   0x09 |
+| * MoveToColorTemperature                                            |   0x0A |
+| * EnhancedMoveToHue                                                 |   0x40 |
+| * EnhancedMoveHue                                                   |   0x41 |
+| * EnhancedStepHue                                                   |   0x42 |
+| * EnhancedMoveToHueAndSaturation                                    |   0x43 |
+| * ColorLoopSet                                                      |   0x44 |
+| * StopMoveStep                                                      |   0x47 |
+| * MoveColorTemperature                                              |   0x4B |
+| * StepColorTemperature                                              |   0x4C |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * CurrentHue                                                        | 0x0000 |
+| * CurrentSaturation                                                 | 0x0001 |
+| * RemainingTime                                                     | 0x0002 |
+| * CurrentX                                                          | 0x0003 |
+| * CurrentY                                                          | 0x0004 |
+| * DriftCompensation                                                 | 0x0005 |
+| * CompensationText                                                  | 0x0006 |
+| * ColorTemperature                                                  | 0x0007 |
+| * ColorMode                                                         | 0x0008 |
+| * Options                                                           | 0x000F |
+| * NumberOfPrimaries                                                 | 0x0010 |
+| * Primary1X                                                         | 0x0011 |
+| * Primary1Y                                                         | 0x0012 |
+| * Primary1Intensity                                                 | 0x0013 |
+| * Primary2X                                                         | 0x0015 |
+| * Primary2Y                                                         | 0x0016 |
+| * Primary2Intensity                                                 | 0x0017 |
+| * Primary3X                                                         | 0x0019 |
+| * Primary3Y                                                         | 0x001A |
+| * Primary3Intensity                                                 | 0x001B |
+| * Primary4X                                                         | 0x0020 |
+| * Primary4Y                                                         | 0x0021 |
+| * Primary4Intensity                                                 | 0x0022 |
+| * Primary5X                                                         | 0x0024 |
+| * Primary5Y                                                         | 0x0025 |
+| * Primary5Intensity                                                 | 0x0026 |
+| * Primary6X                                                         | 0x0028 |
+| * Primary6Y                                                         | 0x0029 |
+| * Primary6Intensity                                                 | 0x002A |
+| * WhitePointX                                                       | 0x0030 |
+| * WhitePointY                                                       | 0x0031 |
+| * ColorPointRX                                                      | 0x0032 |
+| * ColorPointRY                                                      | 0x0033 |
+| * ColorPointRIntensity                                              | 0x0034 |
+| * ColorPointGX                                                      | 0x0036 |
+| * ColorPointGY                                                      | 0x0037 |
+| * ColorPointGIntensity                                              | 0x0038 |
+| * ColorPointBX                                                      | 0x003A |
+| * ColorPointBY                                                      | 0x003B |
+| * ColorPointBIntensity                                              | 0x003C |
+| * EnhancedCurrentHue                                                | 0x4000 |
+| * EnhancedColorMode                                                 | 0x4001 |
+| * ColorLoopActive                                                   | 0x4002 |
+| * ColorLoopDirection                                                | 0x4003 |
+| * ColorLoopTime                                                     | 0x4004 |
+| * ColorLoopStartEnhancedHue                                         | 0x4005 |
+| * ColorLoopStoredEnhancedHue                                        | 0x4006 |
+| * ColorCapabilities                                                 | 0x400A |
+| * ColorTempPhysicalMinMireds                                        | 0x400B |
+| * ColorTempPhysicalMaxMireds                                        | 0x400C |
+| * CoupleColorTempToLevelMinMireds                                   | 0x400D |
+| * StartUpColorTemperatureMireds                                     | 0x4010 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute GeneratedCommandList
+ * Command MoveToHue
  */
-class ReadOperationalCredentialsGeneratedCommandList : public ReadAttribute {
+class ColorControlMoveToHue : public ClusterCommand {
 public:
-    ReadOperationalCredentialsGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ColorControlMoveToHue()
+        : ClusterCommand("move-to-hue")
     {
+        AddArgument("Hue", 0, UINT8_MAX, &mRequest.hue);
+        AddArgument("Direction", 0, UINT8_MAX, &mRequest.direction);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadOperationalCredentialsGeneratedCommandList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalCredentials.GeneratedCommandList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("OperationalCredentials GeneratedCommandList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPColorControlClusterMoveToHueParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.hue = [NSNumber numberWithUnsignedChar:mRequest.hue];
+        params.direction = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.direction)];
+        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
+        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster moveToHueWithParams:params
+                       completionHandler:^(NSError * _Nullable error) {
+                           responsesNeeded--;
+                           if (error != nil) {
+                               mError = error;
+                               LogNSError("Error", error);
+                           }
+                           if (responsesNeeded == 0) {
+                               SetCommandExitStatus(mError);
+                           }
+                       }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::ColorControl::Commands::MoveToHue::Type mRequest;
 };
 
-class SubscribeAttributeOperationalCredentialsGeneratedCommandList : public SubscribeAttribute {
+/*
+ * Command MoveHue
+ */
+class ColorControlMoveHue : public ClusterCommand {
 public:
-    SubscribeAttributeOperationalCredentialsGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    ColorControlMoveHue()
+        : ClusterCommand("move-hue")
     {
+        AddArgument("MoveMode", 0, UINT8_MAX, &mRequest.moveMode);
+        AddArgument("Rate", 0, UINT8_MAX, &mRequest.rate);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeOperationalCredentialsGeneratedCommandList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalCredentials.GeneratedCommandList response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000001) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPColorControlClusterMoveHueParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.moveMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.moveMode)];
+        params.rate = [NSNumber numberWithUnsignedChar:mRequest.rate];
+        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster moveHueWithParams:params
+                     completionHandler:^(NSError * _Nullable error) {
+                         responsesNeeded--;
+                         if (error != nil) {
+                             mError = error;
+                             LogNSError("Error", error);
+                         }
+                         if (responsesNeeded == 0) {
+                             SetCommandExitStatus(mError);
+                         }
+                     }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::ColorControl::Commands::MoveHue::Type mRequest;
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Command StepHue
  */
-class ReadOperationalCredentialsAcceptedCommandList : public ReadAttribute {
+class ColorControlStepHue : public ClusterCommand {
 public:
-    ReadOperationalCredentialsAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ColorControlStepHue()
+        : ClusterCommand("step-hue")
     {
+        AddArgument("StepMode", 0, UINT8_MAX, &mRequest.stepMode);
+        AddArgument("StepSize", 0, UINT8_MAX, &mRequest.stepSize);
+        AddArgument("TransitionTime", 0, UINT8_MAX, &mRequest.transitionTime);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadOperationalCredentialsAcceptedCommandList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalCredentials.AcceptedCommandList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("OperationalCredentials AcceptedCommandList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPColorControlClusterStepHueParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.stepMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.stepMode)];
+        params.stepSize = [NSNumber numberWithUnsignedChar:mRequest.stepSize];
+        params.transitionTime = [NSNumber numberWithUnsignedChar:mRequest.transitionTime];
+        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster stepHueWithParams:params
+                     completionHandler:^(NSError * _Nullable error) {
+                         responsesNeeded--;
+                         if (error != nil) {
+                             mError = error;
+                             LogNSError("Error", error);
+                         }
+                         if (responsesNeeded == 0) {
+                             SetCommandExitStatus(mError);
+                         }
+                     }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::ColorControl::Commands::StepHue::Type mRequest;
 };
 
-class SubscribeAttributeOperationalCredentialsAcceptedCommandList : public SubscribeAttribute {
+/*
+ * Command MoveToSaturation
+ */
+class ColorControlMoveToSaturation : public ClusterCommand {
 public:
-    SubscribeAttributeOperationalCredentialsAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    ColorControlMoveToSaturation()
+        : ClusterCommand("move-to-saturation")
     {
+        AddArgument("Saturation", 0, UINT8_MAX, &mRequest.saturation);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeOperationalCredentialsAcceptedCommandList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalCredentials.AcceptedCommandList response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000003) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPColorControlClusterMoveToSaturationParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.saturation = [NSNumber numberWithUnsignedChar:mRequest.saturation];
+        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
+        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster moveToSaturationWithParams:params
+                              completionHandler:^(NSError * _Nullable error) {
+                                  responsesNeeded--;
+                                  if (error != nil) {
+                                      mError = error;
+                                      LogNSError("Error", error);
+                                  }
+                                  if (responsesNeeded == 0) {
+                                      SetCommandExitStatus(mError);
+                                  }
+                              }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::ColorControl::Commands::MoveToSaturation::Type mRequest;
 };
 
 /*
- * Attribute AttributeList
+ * Command MoveSaturation
  */
-class ReadOperationalCredentialsAttributeList : public ReadAttribute {
+class ColorControlMoveSaturation : public ClusterCommand {
 public:
-    ReadOperationalCredentialsAttributeList()
-        : ReadAttribute("attribute-list")
+    ColorControlMoveSaturation()
+        : ClusterCommand("move-saturation")
     {
+        AddArgument("MoveMode", 0, UINT8_MAX, &mRequest.moveMode);
+        AddArgument("Rate", 0, UINT8_MAX, &mRequest.rate);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadOperationalCredentialsAttributeList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalCredentials.AttributeList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("OperationalCredentials AttributeList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPColorControlClusterMoveSaturationParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.moveMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.moveMode)];
+        params.rate = [NSNumber numberWithUnsignedChar:mRequest.rate];
+        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster moveSaturationWithParams:params
+                            completionHandler:^(NSError * _Nullable error) {
+                                responsesNeeded--;
+                                if (error != nil) {
+                                    mError = error;
+                                    LogNSError("Error", error);
+                                }
+                                if (responsesNeeded == 0) {
+                                    SetCommandExitStatus(mError);
+                                }
+                            }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::ColorControl::Commands::MoveSaturation::Type mRequest;
 };
 
-class SubscribeAttributeOperationalCredentialsAttributeList : public SubscribeAttribute {
+/*
+ * Command StepSaturation
+ */
+class ColorControlStepSaturation : public ClusterCommand {
 public:
-    SubscribeAttributeOperationalCredentialsAttributeList()
-        : SubscribeAttribute("attribute-list")
+    ColorControlStepSaturation()
+        : ClusterCommand("step-saturation")
     {
+        AddArgument("StepMode", 0, UINT8_MAX, &mRequest.stepMode);
+        AddArgument("StepSize", 0, UINT8_MAX, &mRequest.stepSize);
+        AddArgument("TransitionTime", 0, UINT8_MAX, &mRequest.transitionTime);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeOperationalCredentialsAttributeList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalCredentials.AttributeList response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000005) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPColorControlClusterStepSaturationParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.stepMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.stepMode)];
+        params.stepSize = [NSNumber numberWithUnsignedChar:mRequest.stepSize];
+        params.transitionTime = [NSNumber numberWithUnsignedChar:mRequest.transitionTime];
+        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster stepSaturationWithParams:params
+                            completionHandler:^(NSError * _Nullable error) {
+                                responsesNeeded--;
+                                if (error != nil) {
+                                    mError = error;
+                                    LogNSError("Error", error);
+                                }
+                                if (responsesNeeded == 0) {
+                                    SetCommandExitStatus(mError);
+                                }
+                            }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::ColorControl::Commands::StepSaturation::Type mRequest;
 };
 
 /*
- * Attribute FeatureMap
+ * Command MoveToHueAndSaturation
  */
-class ReadOperationalCredentialsFeatureMap : public ReadAttribute {
+class ColorControlMoveToHueAndSaturation : public ClusterCommand {
 public:
-    ReadOperationalCredentialsFeatureMap()
-        : ReadAttribute("feature-map")
+    ColorControlMoveToHueAndSaturation()
+        : ClusterCommand("move-to-hue-and-saturation")
     {
+        AddArgument("Hue", 0, UINT8_MAX, &mRequest.hue);
+        AddArgument("Saturation", 0, UINT8_MAX, &mRequest.saturation);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadOperationalCredentialsFeatureMap() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000006) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalCredentials.FeatureMap response %@", [value description]);
-            if (error != nil) {
-                LogNSError("OperationalCredentials FeatureMap read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPColorControlClusterMoveToHueAndSaturationParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.hue = [NSNumber numberWithUnsignedChar:mRequest.hue];
+        params.saturation = [NSNumber numberWithUnsignedChar:mRequest.saturation];
+        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
+        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster moveToHueAndSaturationWithParams:params
+                                    completionHandler:^(NSError * _Nullable error) {
+                                        responsesNeeded--;
+                                        if (error != nil) {
+                                            mError = error;
+                                            LogNSError("Error", error);
+                                        }
+                                        if (responsesNeeded == 0) {
+                                            SetCommandExitStatus(mError);
+                                        }
+                                    }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::ColorControl::Commands::MoveToHueAndSaturation::Type mRequest;
 };
 
-class SubscribeAttributeOperationalCredentialsFeatureMap : public SubscribeAttribute {
+/*
+ * Command MoveToColor
+ */
+class ColorControlMoveToColor : public ClusterCommand {
 public:
-    SubscribeAttributeOperationalCredentialsFeatureMap()
-        : SubscribeAttribute("feature-map")
+    ColorControlMoveToColor()
+        : ClusterCommand("move-to-color")
     {
+        AddArgument("ColorX", 0, UINT16_MAX, &mRequest.colorX);
+        AddArgument("ColorY", 0, UINT16_MAX, &mRequest.colorY);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeOperationalCredentialsFeatureMap() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalCredentials.FeatureMap response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000007) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPColorControlClusterMoveToColorParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.colorX = [NSNumber numberWithUnsignedShort:mRequest.colorX];
+        params.colorY = [NSNumber numberWithUnsignedShort:mRequest.colorY];
+        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
+        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster moveToColorWithParams:params
+                         completionHandler:^(NSError * _Nullable error) {
+                             responsesNeeded--;
+                             if (error != nil) {
+                                 mError = error;
+                                 LogNSError("Error", error);
+                             }
+                             if (responsesNeeded == 0) {
+                                 SetCommandExitStatus(mError);
+                             }
+                         }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::ColorControl::Commands::MoveToColor::Type mRequest;
 };
 
 /*
- * Attribute ClusterRevision
+ * Command MoveColor
  */
-class ReadOperationalCredentialsClusterRevision : public ReadAttribute {
+class ColorControlMoveColor : public ClusterCommand {
 public:
-    ReadOperationalCredentialsClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ColorControlMoveColor()
+        : ClusterCommand("move-color")
     {
+        AddArgument("RateX", INT16_MIN, INT16_MAX, &mRequest.rateX);
+        AddArgument("RateY", INT16_MIN, INT16_MAX, &mRequest.rateY);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadOperationalCredentialsClusterRevision() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000008) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalCredentials.ClusterRevision response %@", [value description]);
-            if (error != nil) {
-                LogNSError("OperationalCredentials ClusterRevision read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPColorControlClusterMoveColorParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.rateX = [NSNumber numberWithShort:mRequest.rateX];
+        params.rateY = [NSNumber numberWithShort:mRequest.rateY];
+        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster moveColorWithParams:params
+                       completionHandler:^(NSError * _Nullable error) {
+                           responsesNeeded--;
+                           if (error != nil) {
+                               mError = error;
+                               LogNSError("Error", error);
+                           }
+                           if (responsesNeeded == 0) {
+                               SetCommandExitStatus(mError);
+                           }
+                       }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::ColorControl::Commands::MoveColor::Type mRequest;
 };
 
-class SubscribeAttributeOperationalCredentialsClusterRevision : public SubscribeAttribute {
+/*
+ * Command StepColor
+ */
+class ColorControlStepColor : public ClusterCommand {
 public:
-    SubscribeAttributeOperationalCredentialsClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    ColorControlStepColor()
+        : ClusterCommand("step-color")
     {
+        AddArgument("StepX", INT16_MIN, INT16_MAX, &mRequest.stepX);
+        AddArgument("StepY", INT16_MIN, INT16_MAX, &mRequest.stepY);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeOperationalCredentialsClusterRevision() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003E) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPOperationalCredentials * cluster = [[CHIPOperationalCredentials alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalCredentials.ClusterRevision response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000009) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPColorControlClusterStepColorParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.stepX = [NSNumber numberWithShort:mRequest.stepX];
+        params.stepY = [NSNumber numberWithShort:mRequest.stepY];
+        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
+        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster stepColorWithParams:params
+                       completionHandler:^(NSError * _Nullable error) {
+                           responsesNeeded--;
+                           if (error != nil) {
+                               mError = error;
+                               LogNSError("Error", error);
+                           }
+                           if (responsesNeeded == 0) {
+                               SetCommandExitStatus(mError);
+                           }
+                       }];
+        }
         return CHIP_NO_ERROR;
     }
-};
 
-/*----------------------------------------------------------------------------*\
-| Cluster PowerSource                                                 | 0x002F |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * Status                                                            | 0x0000 |
-| * Order                                                             | 0x0001 |
-| * Description                                                       | 0x0002 |
-| * WiredAssessedInputVoltage                                         | 0x0003 |
-| * WiredAssessedInputFrequency                                       | 0x0004 |
-| * WiredCurrentType                                                  | 0x0005 |
-| * WiredAssessedCurrent                                              | 0x0006 |
-| * WiredNominalVoltage                                               | 0x0007 |
-| * WiredMaximumCurrent                                               | 0x0008 |
-| * WiredPresent                                                      | 0x0009 |
-| * ActiveWiredFaults                                                 | 0x000A |
-| * BatteryVoltage                                                    | 0x000B |
-| * BatteryPercentRemaining                                           | 0x000C |
-| * BatteryTimeRemaining                                              | 0x000D |
-| * BatteryChargeLevel                                                | 0x000E |
-| * BatteryReplacementNeeded                                          | 0x000F |
-| * BatteryReplaceability                                             | 0x0010 |
-| * BatteryPresent                                                    | 0x0011 |
-| * ActiveBatteryFaults                                               | 0x0012 |
-| * BatteryReplacementDescription                                     | 0x0013 |
-| * BatteryCommonDesignation                                          | 0x0014 |
-| * BatteryANSIDesignation                                            | 0x0015 |
-| * BatteryIECDesignation                                             | 0x0016 |
-| * BatteryApprovedChemistry                                          | 0x0017 |
-| * BatteryCapacity                                                   | 0x0018 |
-| * BatteryQuantity                                                   | 0x0019 |
-| * BatteryChargeState                                                | 0x001A |
-| * BatteryTimeToFullCharge                                           | 0x001B |
-| * BatteryFunctionalWhileCharging                                    | 0x001C |
-| * BatteryChargingCurrent                                            | 0x001D |
-| * ActiveBatteryChargeFaults                                         | 0x001E |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
+private:
+    chip::app::Clusters::ColorControl::Commands::StepColor::Type mRequest;
+};
 
 /*
- * Attribute Status
+ * Command MoveToColorTemperature
  */
-class ReadPowerSourceStatus : public ReadAttribute {
+class ColorControlMoveToColorTemperature : public ClusterCommand {
 public:
-    ReadPowerSourceStatus()
-        : ReadAttribute("status")
+    ColorControlMoveToColorTemperature()
+        : ClusterCommand("move-to-color-temperature")
     {
+        AddArgument("ColorTemperature", 0, UINT16_MAX, &mRequest.colorTemperature);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadPowerSourceStatus() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x0000000A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.Status response %@", [value description]);
-            if (error != nil) {
-                LogNSError("PowerSource Status read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPColorControlClusterMoveToColorTemperatureParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.colorTemperature = [NSNumber numberWithUnsignedShort:mRequest.colorTemperature];
+        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
+        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster moveToColorTemperatureWithParams:params
+                                    completionHandler:^(NSError * _Nullable error) {
+                                        responsesNeeded--;
+                                        if (error != nil) {
+                                            mError = error;
+                                            LogNSError("Error", error);
+                                        }
+                                        if (responsesNeeded == 0) {
+                                            SetCommandExitStatus(mError);
+                                        }
+                                    }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::ColorControl::Commands::MoveToColorTemperature::Type mRequest;
 };
 
-class SubscribeAttributePowerSourceStatus : public SubscribeAttribute {
+/*
+ * Command EnhancedMoveToHue
+ */
+class ColorControlEnhancedMoveToHue : public ClusterCommand {
 public:
-    SubscribeAttributePowerSourceStatus()
-        : SubscribeAttribute("status")
+    ColorControlEnhancedMoveToHue()
+        : ClusterCommand("enhanced-move-to-hue")
     {
+        AddArgument("EnhancedHue", 0, UINT16_MAX, &mRequest.enhancedHue);
+        AddArgument("Direction", 0, UINT8_MAX, &mRequest.direction);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributePowerSourceStatus() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000000) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.Status response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000040) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPColorControlClusterEnhancedMoveToHueParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.enhancedHue = [NSNumber numberWithUnsignedShort:mRequest.enhancedHue];
+        params.direction = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.direction)];
+        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
+        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster enhancedMoveToHueWithParams:params
+                               completionHandler:^(NSError * _Nullable error) {
+                                   responsesNeeded--;
+                                   if (error != nil) {
+                                       mError = error;
+                                       LogNSError("Error", error);
+                                   }
+                                   if (responsesNeeded == 0) {
+                                       SetCommandExitStatus(mError);
+                                   }
+                               }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::ColorControl::Commands::EnhancedMoveToHue::Type mRequest;
 };
 
 /*
- * Attribute Order
+ * Command EnhancedMoveHue
  */
-class ReadPowerSourceOrder : public ReadAttribute {
+class ColorControlEnhancedMoveHue : public ClusterCommand {
 public:
-    ReadPowerSourceOrder()
-        : ReadAttribute("order")
+    ColorControlEnhancedMoveHue()
+        : ClusterCommand("enhanced-move-hue")
     {
+        AddArgument("MoveMode", 0, UINT8_MAX, &mRequest.moveMode);
+        AddArgument("Rate", 0, UINT16_MAX, &mRequest.rate);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadPowerSourceOrder() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000041) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeOrderWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.Order response %@", [value description]);
-            if (error != nil) {
-                LogNSError("PowerSource Order read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPColorControlClusterEnhancedMoveHueParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.moveMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.moveMode)];
+        params.rate = [NSNumber numberWithUnsignedShort:mRequest.rate];
+        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster enhancedMoveHueWithParams:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 responsesNeeded--;
+                                 if (error != nil) {
+                                     mError = error;
+                                     LogNSError("Error", error);
+                                 }
+                                 if (responsesNeeded == 0) {
+                                     SetCommandExitStatus(mError);
+                                 }
+                             }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::ColorControl::Commands::EnhancedMoveHue::Type mRequest;
 };
 
-class SubscribeAttributePowerSourceOrder : public SubscribeAttribute {
+/*
+ * Command EnhancedStepHue
+ */
+class ColorControlEnhancedStepHue : public ClusterCommand {
 public:
-    SubscribeAttributePowerSourceOrder()
-        : SubscribeAttribute("order")
+    ColorControlEnhancedStepHue()
+        : ClusterCommand("enhanced-step-hue")
     {
+        AddArgument("StepMode", 0, UINT8_MAX, &mRequest.stepMode);
+        AddArgument("StepSize", 0, UINT16_MAX, &mRequest.stepSize);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributePowerSourceOrder() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000001) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOrderWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.Order response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000042) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPColorControlClusterEnhancedStepHueParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.stepMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.stepMode)];
+        params.stepSize = [NSNumber numberWithUnsignedShort:mRequest.stepSize];
+        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
+        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster enhancedStepHueWithParams:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 responsesNeeded--;
+                                 if (error != nil) {
+                                     mError = error;
+                                     LogNSError("Error", error);
+                                 }
+                                 if (responsesNeeded == 0) {
+                                     SetCommandExitStatus(mError);
+                                 }
+                             }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::ColorControl::Commands::EnhancedStepHue::Type mRequest;
 };
 
 /*
- * Attribute Description
+ * Command EnhancedMoveToHueAndSaturation
  */
-class ReadPowerSourceDescription : public ReadAttribute {
+class ColorControlEnhancedMoveToHueAndSaturation : public ClusterCommand {
 public:
-    ReadPowerSourceDescription()
-        : ReadAttribute("description")
+    ColorControlEnhancedMoveToHueAndSaturation()
+        : ClusterCommand("enhanced-move-to-hue-and-saturation")
     {
+        AddArgument("EnhancedHue", 0, UINT16_MAX, &mRequest.enhancedHue);
+        AddArgument("Saturation", 0, UINT8_MAX, &mRequest.saturation);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadPowerSourceDescription() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000043) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeDescriptionWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.Description response %@", [value description]);
-            if (error != nil) {
-                LogNSError("PowerSource Description read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPColorControlClusterEnhancedMoveToHueAndSaturationParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.enhancedHue = [NSNumber numberWithUnsignedShort:mRequest.enhancedHue];
+        params.saturation = [NSNumber numberWithUnsignedChar:mRequest.saturation];
+        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
+        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster enhancedMoveToHueAndSaturationWithParams:params
+                                            completionHandler:^(NSError * _Nullable error) {
+                                                responsesNeeded--;
+                                                if (error != nil) {
+                                                    mError = error;
+                                                    LogNSError("Error", error);
+                                                }
+                                                if (responsesNeeded == 0) {
+                                                    SetCommandExitStatus(mError);
+                                                }
+                                            }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::ColorControl::Commands::EnhancedMoveToHueAndSaturation::Type mRequest;
 };
 
-class SubscribeAttributePowerSourceDescription : public SubscribeAttribute {
+/*
+ * Command ColorLoopSet
+ */
+class ColorControlColorLoopSet : public ClusterCommand {
 public:
-    SubscribeAttributePowerSourceDescription()
-        : SubscribeAttribute("description")
+    ColorControlColorLoopSet()
+        : ClusterCommand("color-loop-set")
     {
+        AddArgument("UpdateFlags", 0, UINT8_MAX, &mRequest.updateFlags);
+        AddArgument("Action", 0, UINT8_MAX, &mRequest.action);
+        AddArgument("Direction", 0, UINT8_MAX, &mRequest.direction);
+        AddArgument("Time", 0, UINT16_MAX, &mRequest.time);
+        AddArgument("StartHue", 0, UINT16_MAX, &mRequest.startHue);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributePowerSourceDescription() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000002) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDescriptionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.Description response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000044) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPColorControlClusterColorLoopSetParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.updateFlags = [NSNumber numberWithUnsignedChar:mRequest.updateFlags.Raw()];
+        params.action = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.action)];
+        params.direction = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.direction)];
+        params.time = [NSNumber numberWithUnsignedShort:mRequest.time];
+        params.startHue = [NSNumber numberWithUnsignedShort:mRequest.startHue];
+        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster colorLoopSetWithParams:params
+                          completionHandler:^(NSError * _Nullable error) {
+                              responsesNeeded--;
+                              if (error != nil) {
+                                  mError = error;
+                                  LogNSError("Error", error);
+                              }
+                              if (responsesNeeded == 0) {
+                                  SetCommandExitStatus(mError);
+                              }
+                          }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::ColorControl::Commands::ColorLoopSet::Type mRequest;
 };
 
 /*
- * Attribute WiredAssessedInputVoltage
+ * Command StopMoveStep
  */
-class ReadPowerSourceWiredAssessedInputVoltage : public ReadAttribute {
+class ColorControlStopMoveStep : public ClusterCommand {
 public:
-    ReadPowerSourceWiredAssessedInputVoltage()
-        : ReadAttribute("wired-assessed-input-voltage")
+    ColorControlStopMoveStep()
+        : ClusterCommand("stop-move-step")
     {
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadPowerSourceWiredAssessedInputVoltage() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x00000047) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeWiredAssessedInputVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.WiredAssessedInputVoltage response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("PowerSource WiredAssessedInputVoltage read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPColorControlClusterStopMoveStepParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster stopMoveStepWithParams:params
+                          completionHandler:^(NSError * _Nullable error) {
+                              responsesNeeded--;
+                              if (error != nil) {
+                                  mError = error;
+                                  LogNSError("Error", error);
+                              }
+                              if (responsesNeeded == 0) {
+                                  SetCommandExitStatus(mError);
+                              }
+                          }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::ColorControl::Commands::StopMoveStep::Type mRequest;
 };
 
-class SubscribeAttributePowerSourceWiredAssessedInputVoltage : public SubscribeAttribute {
+/*
+ * Command MoveColorTemperature
+ */
+class ColorControlMoveColorTemperature : public ClusterCommand {
 public:
-    SubscribeAttributePowerSourceWiredAssessedInputVoltage()
-        : SubscribeAttribute("wired-assessed-input-voltage")
+    ColorControlMoveColorTemperature()
+        : ClusterCommand("move-color-temperature")
     {
+        AddArgument("MoveMode", 0, UINT8_MAX, &mRequest.moveMode);
+        AddArgument("Rate", 0, UINT16_MAX, &mRequest.rate);
+        AddArgument("ColorTemperatureMinimumMireds", 0, UINT16_MAX, &mRequest.colorTemperatureMinimumMireds);
+        AddArgument("ColorTemperatureMaximumMireds", 0, UINT16_MAX, &mRequest.colorTemperatureMaximumMireds);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributePowerSourceWiredAssessedInputVoltage() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x0000004B) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeWiredAssessedInputVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.WiredAssessedInputVoltage response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPColorControlClusterMoveColorTemperatureParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.moveMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.moveMode)];
+        params.rate = [NSNumber numberWithUnsignedShort:mRequest.rate];
+        params.colorTemperatureMinimumMireds = [NSNumber numberWithUnsignedShort:mRequest.colorTemperatureMinimumMireds];
+        params.colorTemperatureMaximumMireds = [NSNumber numberWithUnsignedShort:mRequest.colorTemperatureMaximumMireds];
+        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster moveColorTemperatureWithParams:params
+                                  completionHandler:^(NSError * _Nullable error) {
+                                      responsesNeeded--;
+                                      if (error != nil) {
+                                          mError = error;
+                                          LogNSError("Error", error);
+                                      }
+                                      if (responsesNeeded == 0) {
+                                          SetCommandExitStatus(mError);
+                                      }
+                                  }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::ColorControl::Commands::MoveColorTemperature::Type mRequest;
+};
+
+/*
+ * Command StepColorTemperature
+ */
+class ColorControlStepColorTemperature : public ClusterCommand {
+public:
+    ColorControlStepColorTemperature()
+        : ClusterCommand("step-color-temperature")
+    {
+        AddArgument("StepMode", 0, UINT8_MAX, &mRequest.stepMode);
+        AddArgument("StepSize", 0, UINT16_MAX, &mRequest.stepSize);
+        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
+        AddArgument("ColorTemperatureMinimumMireds", 0, UINT16_MAX, &mRequest.colorTemperatureMinimumMireds);
+        AddArgument("ColorTemperatureMaximumMireds", 0, UINT16_MAX, &mRequest.colorTemperatureMaximumMireds);
+        AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
+        AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) command (0x0000004C) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPColorControlClusterStepColorTemperatureParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.stepMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.stepMode)];
+        params.stepSize = [NSNumber numberWithUnsignedShort:mRequest.stepSize];
+        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
+        params.colorTemperatureMinimumMireds = [NSNumber numberWithUnsignedShort:mRequest.colorTemperatureMinimumMireds];
+        params.colorTemperatureMaximumMireds = [NSNumber numberWithUnsignedShort:mRequest.colorTemperatureMaximumMireds];
+        params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
+        params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster stepColorTemperatureWithParams:params
+                                  completionHandler:^(NSError * _Nullable error) {
+                                      responsesNeeded--;
+                                      if (error != nil) {
+                                          mError = error;
+                                          LogNSError("Error", error);
+                                      }
+                                      if (responsesNeeded == 0) {
+                                          SetCommandExitStatus(mError);
+                                      }
+                                  }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::ColorControl::Commands::StepColorTemperature::Type mRequest;
 };
 
 /*
- * Attribute WiredAssessedInputFrequency
+ * Attribute CurrentHue
  */
-class ReadPowerSourceWiredAssessedInputFrequency : public ReadAttribute {
+class ReadColorControlCurrentHue : public ReadAttribute {
 public:
-    ReadPowerSourceWiredAssessedInputFrequency()
-        : ReadAttribute("wired-assessed-input-frequency")
+    ReadColorControlCurrentHue()
+        : ReadAttribute("current-hue")
     {
     }
 
-    ~ReadPowerSourceWiredAssessedInputFrequency() {}
+    ~ReadColorControlCurrentHue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeWiredAssessedInputFrequencyWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.WiredAssessedInputFrequency response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("PowerSource WiredAssessedInputFrequency read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCurrentHueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.CurrentHue response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ColorControl CurrentHue read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributePowerSourceWiredAssessedInputFrequency : public SubscribeAttribute {
+class SubscribeAttributeColorControlCurrentHue : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceWiredAssessedInputFrequency()
-        : SubscribeAttribute("wired-assessed-input-frequency")
+    SubscribeAttributeColorControlCurrentHue()
+        : SubscribeAttribute("current-hue")
     {
     }
 
-    ~SubscribeAttributePowerSourceWiredAssessedInputFrequency() {}
+    ~SubscribeAttributeColorControlCurrentHue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeWiredAssessedInputFrequencyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCurrentHueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.WiredAssessedInputFrequency response %@", [value description]);
+                NSLog(@"ColorControl.CurrentHue response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -55261,27 +54036,27 @@ class SubscribeAttributePowerSourceWiredAssessedInputFrequency : public Subscrib
 };
 
 /*
- * Attribute WiredCurrentType
+ * Attribute CurrentSaturation
  */
-class ReadPowerSourceWiredCurrentType : public ReadAttribute {
+class ReadColorControlCurrentSaturation : public ReadAttribute {
 public:
-    ReadPowerSourceWiredCurrentType()
-        : ReadAttribute("wired-current-type")
+    ReadColorControlCurrentSaturation()
+        : ReadAttribute("current-saturation")
     {
     }
 
-    ~ReadPowerSourceWiredCurrentType() {}
+    ~ReadColorControlCurrentSaturation() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeWiredCurrentTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.WiredCurrentType response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCurrentSaturationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.CurrentSaturation response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSource WiredCurrentType read Error", error);
+                LogNSError("ColorControl CurrentSaturation read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -55289,32 +54064,32 @@ class ReadPowerSourceWiredCurrentType : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceWiredCurrentType : public SubscribeAttribute {
+class SubscribeAttributeColorControlCurrentSaturation : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceWiredCurrentType()
-        : SubscribeAttribute("wired-current-type")
+    SubscribeAttributeColorControlCurrentSaturation()
+        : SubscribeAttribute("current-saturation")
     {
     }
 
-    ~SubscribeAttributePowerSourceWiredCurrentType() {}
+    ~SubscribeAttributeColorControlCurrentSaturation() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeWiredCurrentTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCurrentSaturationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.WiredCurrentType response %@", [value description]);
+                NSLog(@"ColorControl.CurrentSaturation response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -55325,27 +54100,27 @@ class SubscribeAttributePowerSourceWiredCurrentType : public SubscribeAttribute
 };
 
 /*
- * Attribute WiredAssessedCurrent
+ * Attribute RemainingTime
  */
-class ReadPowerSourceWiredAssessedCurrent : public ReadAttribute {
+class ReadColorControlRemainingTime : public ReadAttribute {
 public:
-    ReadPowerSourceWiredAssessedCurrent()
-        : ReadAttribute("wired-assessed-current")
+    ReadColorControlRemainingTime()
+        : ReadAttribute("remaining-time")
     {
     }
 
-    ~ReadPowerSourceWiredAssessedCurrent() {}
+    ~ReadColorControlRemainingTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeWiredAssessedCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.WiredAssessedCurrent response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeRemainingTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.RemainingTime response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSource WiredAssessedCurrent read Error", error);
+                LogNSError("ColorControl RemainingTime read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -55353,32 +54128,32 @@ class ReadPowerSourceWiredAssessedCurrent : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceWiredAssessedCurrent : public SubscribeAttribute {
+class SubscribeAttributeColorControlRemainingTime : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceWiredAssessedCurrent()
-        : SubscribeAttribute("wired-assessed-current")
+    SubscribeAttributeColorControlRemainingTime()
+        : SubscribeAttribute("remaining-time")
     {
     }
 
-    ~SubscribeAttributePowerSourceWiredAssessedCurrent() {}
+    ~SubscribeAttributeColorControlRemainingTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeWiredAssessedCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRemainingTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.WiredAssessedCurrent response %@", [value description]);
+                NSLog(@"ColorControl.RemainingTime response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -55389,27 +54164,27 @@ class SubscribeAttributePowerSourceWiredAssessedCurrent : public SubscribeAttrib
 };
 
 /*
- * Attribute WiredNominalVoltage
+ * Attribute CurrentX
  */
-class ReadPowerSourceWiredNominalVoltage : public ReadAttribute {
+class ReadColorControlCurrentX : public ReadAttribute {
 public:
-    ReadPowerSourceWiredNominalVoltage()
-        : ReadAttribute("wired-nominal-voltage")
+    ReadColorControlCurrentX()
+        : ReadAttribute("current-x")
     {
     }
 
-    ~ReadPowerSourceWiredNominalVoltage() {}
+    ~ReadColorControlCurrentX() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeWiredNominalVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.WiredNominalVoltage response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCurrentXWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.CurrentX response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSource WiredNominalVoltage read Error", error);
+                LogNSError("ColorControl CurrentX read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -55417,32 +54192,32 @@ class ReadPowerSourceWiredNominalVoltage : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceWiredNominalVoltage : public SubscribeAttribute {
+class SubscribeAttributeColorControlCurrentX : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceWiredNominalVoltage()
-        : SubscribeAttribute("wired-nominal-voltage")
+    SubscribeAttributeColorControlCurrentX()
+        : SubscribeAttribute("current-x")
     {
     }
 
-    ~SubscribeAttributePowerSourceWiredNominalVoltage() {}
+    ~SubscribeAttributeColorControlCurrentX() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeWiredNominalVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCurrentXWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.WiredNominalVoltage response %@", [value description]);
+                NSLog(@"ColorControl.CurrentX response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -55453,27 +54228,27 @@ class SubscribeAttributePowerSourceWiredNominalVoltage : public SubscribeAttribu
 };
 
 /*
- * Attribute WiredMaximumCurrent
+ * Attribute CurrentY
  */
-class ReadPowerSourceWiredMaximumCurrent : public ReadAttribute {
+class ReadColorControlCurrentY : public ReadAttribute {
 public:
-    ReadPowerSourceWiredMaximumCurrent()
-        : ReadAttribute("wired-maximum-current")
+    ReadColorControlCurrentY()
+        : ReadAttribute("current-y")
     {
     }
 
-    ~ReadPowerSourceWiredMaximumCurrent() {}
+    ~ReadColorControlCurrentY() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeWiredMaximumCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.WiredMaximumCurrent response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCurrentYWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.CurrentY response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSource WiredMaximumCurrent read Error", error);
+                LogNSError("ColorControl CurrentY read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -55481,32 +54256,32 @@ class ReadPowerSourceWiredMaximumCurrent : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceWiredMaximumCurrent : public SubscribeAttribute {
+class SubscribeAttributeColorControlCurrentY : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceWiredMaximumCurrent()
-        : SubscribeAttribute("wired-maximum-current")
+    SubscribeAttributeColorControlCurrentY()
+        : SubscribeAttribute("current-y")
     {
     }
 
-    ~SubscribeAttributePowerSourceWiredMaximumCurrent() {}
+    ~SubscribeAttributeColorControlCurrentY() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeWiredMaximumCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCurrentYWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.WiredMaximumCurrent response %@", [value description]);
+                NSLog(@"ColorControl.CurrentY response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -55517,27 +54292,27 @@ class SubscribeAttributePowerSourceWiredMaximumCurrent : public SubscribeAttribu
 };
 
 /*
- * Attribute WiredPresent
+ * Attribute DriftCompensation
  */
-class ReadPowerSourceWiredPresent : public ReadAttribute {
+class ReadColorControlDriftCompensation : public ReadAttribute {
 public:
-    ReadPowerSourceWiredPresent()
-        : ReadAttribute("wired-present")
+    ReadColorControlDriftCompensation()
+        : ReadAttribute("drift-compensation")
     {
     }
 
-    ~ReadPowerSourceWiredPresent() {}
+    ~ReadColorControlDriftCompensation() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeWiredPresentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.WiredPresent response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeDriftCompensationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.DriftCompensation response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSource WiredPresent read Error", error);
+                LogNSError("ColorControl DriftCompensation read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -55545,32 +54320,32 @@ class ReadPowerSourceWiredPresent : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceWiredPresent : public SubscribeAttribute {
+class SubscribeAttributeColorControlDriftCompensation : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceWiredPresent()
-        : SubscribeAttribute("wired-present")
+    SubscribeAttributeColorControlDriftCompensation()
+        : SubscribeAttribute("drift-compensation")
     {
     }
 
-    ~SubscribeAttributePowerSourceWiredPresent() {}
+    ~SubscribeAttributeColorControlDriftCompensation() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeWiredPresentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDriftCompensationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.WiredPresent response %@", [value description]);
+                NSLog(@"ColorControl.DriftCompensation response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -55581,27 +54356,27 @@ class SubscribeAttributePowerSourceWiredPresent : public SubscribeAttribute {
 };
 
 /*
- * Attribute ActiveWiredFaults
+ * Attribute CompensationText
  */
-class ReadPowerSourceActiveWiredFaults : public ReadAttribute {
+class ReadColorControlCompensationText : public ReadAttribute {
 public:
-    ReadPowerSourceActiveWiredFaults()
-        : ReadAttribute("active-wired-faults")
+    ReadColorControlCompensationText()
+        : ReadAttribute("compensation-text")
     {
     }
 
-    ~ReadPowerSourceActiveWiredFaults() {}
+    ~ReadColorControlCompensationText() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000000A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000006) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeActiveWiredFaultsWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.ActiveWiredFaults response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCompensationTextWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.CompensationText response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSource ActiveWiredFaults read Error", error);
+                LogNSError("ColorControl CompensationText read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -55609,32 +54384,32 @@ class ReadPowerSourceActiveWiredFaults : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceActiveWiredFaults : public SubscribeAttribute {
+class SubscribeAttributeColorControlCompensationText : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceActiveWiredFaults()
-        : SubscribeAttribute("active-wired-faults")
+    SubscribeAttributeColorControlCompensationText()
+        : SubscribeAttribute("compensation-text")
     {
     }
 
-    ~SubscribeAttributePowerSourceActiveWiredFaults() {}
+    ~SubscribeAttributeColorControlCompensationText() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000000A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000006) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeActiveWiredFaultsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCompensationTextWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.ActiveWiredFaults response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.CompensationText response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -55645,27 +54420,27 @@ class SubscribeAttributePowerSourceActiveWiredFaults : public SubscribeAttribute
 };
 
 /*
- * Attribute BatteryVoltage
+ * Attribute ColorTemperature
  */
-class ReadPowerSourceBatteryVoltage : public ReadAttribute {
+class ReadColorControlColorTemperature : public ReadAttribute {
 public:
-    ReadPowerSourceBatteryVoltage()
-        : ReadAttribute("battery-voltage")
+    ReadColorControlColorTemperature()
+        : ReadAttribute("color-temperature")
     {
     }
 
-    ~ReadPowerSourceBatteryVoltage() {}
+    ~ReadColorControlColorTemperature() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000000B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000007) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBatteryVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.BatteryVoltage response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeColorTemperatureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.ColorTemperature response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSource BatteryVoltage read Error", error);
+                LogNSError("ColorControl ColorTemperature read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -55673,32 +54448,32 @@ class ReadPowerSourceBatteryVoltage : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceBatteryVoltage : public SubscribeAttribute {
+class SubscribeAttributeColorControlColorTemperature : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceBatteryVoltage()
-        : SubscribeAttribute("battery-voltage")
+    SubscribeAttributeColorControlColorTemperature()
+        : SubscribeAttribute("color-temperature")
     {
     }
 
-    ~SubscribeAttributePowerSourceBatteryVoltage() {}
+    ~SubscribeAttributeColorControlColorTemperature() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000000B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000007) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBatteryVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeColorTemperatureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.BatteryVoltage response %@", [value description]);
+                NSLog(@"ColorControl.ColorTemperature response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -55709,61 +54484,60 @@ class SubscribeAttributePowerSourceBatteryVoltage : public SubscribeAttribute {
 };
 
 /*
- * Attribute BatteryPercentRemaining
+ * Attribute ColorMode
  */
-class ReadPowerSourceBatteryPercentRemaining : public ReadAttribute {
+class ReadColorControlColorMode : public ReadAttribute {
 public:
-    ReadPowerSourceBatteryPercentRemaining()
-        : ReadAttribute("battery-percent-remaining")
+    ReadColorControlColorMode()
+        : ReadAttribute("color-mode")
     {
     }
 
-    ~ReadPowerSourceBatteryPercentRemaining() {}
+    ~ReadColorControlColorMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000000C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000008) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeBatteryPercentRemainingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.BatteryPercentRemaining response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("PowerSource BatteryPercentRemaining read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeColorModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.ColorMode response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ColorControl ColorMode read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributePowerSourceBatteryPercentRemaining : public SubscribeAttribute {
+class SubscribeAttributeColorControlColorMode : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceBatteryPercentRemaining()
-        : SubscribeAttribute("battery-percent-remaining")
+    SubscribeAttributeColorControlColorMode()
+        : SubscribeAttribute("color-mode")
     {
     }
 
-    ~SubscribeAttributePowerSourceBatteryPercentRemaining() {}
+    ~SubscribeAttributeColorControlColorMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000000C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000008) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBatteryPercentRemainingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeColorModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.BatteryPercentRemaining response %@", [value description]);
+                NSLog(@"ColorControl.ColorMode response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -55774,27 +54548,27 @@ class SubscribeAttributePowerSourceBatteryPercentRemaining : public SubscribeAtt
 };
 
 /*
- * Attribute BatteryTimeRemaining
+ * Attribute Options
  */
-class ReadPowerSourceBatteryTimeRemaining : public ReadAttribute {
+class ReadColorControlOptions : public ReadAttribute {
 public:
-    ReadPowerSourceBatteryTimeRemaining()
-        : ReadAttribute("battery-time-remaining")
+    ReadColorControlOptions()
+        : ReadAttribute("options")
     {
     }
 
-    ~ReadPowerSourceBatteryTimeRemaining() {}
+    ~ReadColorControlOptions() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000000D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000000F) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBatteryTimeRemainingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.BatteryTimeRemaining response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeOptionsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.Options response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSource BatteryTimeRemaining read Error", error);
+                LogNSError("ColorControl Options read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -55802,32 +54576,70 @@ class ReadPowerSourceBatteryTimeRemaining : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceBatteryTimeRemaining : public SubscribeAttribute {
+class WriteColorControlOptions : public WriteAttribute {
 public:
-    SubscribeAttributePowerSourceBatteryTimeRemaining()
-        : SubscribeAttribute("battery-time-remaining")
+    WriteColorControlOptions()
+        : WriteAttribute("options")
     {
+        AddArgument("attr-name", "options");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributePowerSourceBatteryTimeRemaining() {}
+    ~WriteColorControlOptions() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000000D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x0000000F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeOptionsWithValue:value
+                                         params:params
+                              completionHandler:^(NSError * _Nullable error) {
+                                  if (error != nil) {
+                                      LogNSError("ColorControl Options write Error", error);
+                                  }
+                                  SetCommandExitStatus(error);
+                              }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeColorControlOptions : public SubscribeAttribute {
+public:
+    SubscribeAttributeColorControlOptions()
+        : SubscribeAttribute("options")
+    {
+    }
+
+    ~SubscribeAttributeColorControlOptions() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000000F) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBatteryTimeRemainingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOptionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.BatteryTimeRemaining response %@", [value description]);
+                NSLog(@"ColorControl.Options response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -55838,27 +54650,27 @@ class SubscribeAttributePowerSourceBatteryTimeRemaining : public SubscribeAttrib
 };
 
 /*
- * Attribute BatteryChargeLevel
+ * Attribute NumberOfPrimaries
  */
-class ReadPowerSourceBatteryChargeLevel : public ReadAttribute {
+class ReadColorControlNumberOfPrimaries : public ReadAttribute {
 public:
-    ReadPowerSourceBatteryChargeLevel()
-        : ReadAttribute("battery-charge-level")
+    ReadColorControlNumberOfPrimaries()
+        : ReadAttribute("number-of-primaries")
     {
     }
 
-    ~ReadPowerSourceBatteryChargeLevel() {}
+    ~ReadColorControlNumberOfPrimaries() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000000E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000010) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBatteryChargeLevelWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.BatteryChargeLevel response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNumberOfPrimariesWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.NumberOfPrimaries response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSource BatteryChargeLevel read Error", error);
+                LogNSError("ColorControl NumberOfPrimaries read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -55866,32 +54678,32 @@ class ReadPowerSourceBatteryChargeLevel : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceBatteryChargeLevel : public SubscribeAttribute {
+class SubscribeAttributeColorControlNumberOfPrimaries : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceBatteryChargeLevel()
-        : SubscribeAttribute("battery-charge-level")
+    SubscribeAttributeColorControlNumberOfPrimaries()
+        : SubscribeAttribute("number-of-primaries")
     {
     }
 
-    ~SubscribeAttributePowerSourceBatteryChargeLevel() {}
+    ~SubscribeAttributeColorControlNumberOfPrimaries() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000000E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000010) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBatteryChargeLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNumberOfPrimariesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.BatteryChargeLevel response %@", [value description]);
+                NSLog(@"ColorControl.NumberOfPrimaries response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -55902,61 +54714,60 @@ class SubscribeAttributePowerSourceBatteryChargeLevel : public SubscribeAttribut
 };
 
 /*
- * Attribute BatteryReplacementNeeded
+ * Attribute Primary1X
  */
-class ReadPowerSourceBatteryReplacementNeeded : public ReadAttribute {
+class ReadColorControlPrimary1X : public ReadAttribute {
 public:
-    ReadPowerSourceBatteryReplacementNeeded()
-        : ReadAttribute("battery-replacement-needed")
+    ReadColorControlPrimary1X()
+        : ReadAttribute("primary1x")
     {
     }
 
-    ~ReadPowerSourceBatteryReplacementNeeded() {}
+    ~ReadColorControlPrimary1X() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000000F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000011) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeBatteryReplacementNeededWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.BatteryReplacementNeeded response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("PowerSource BatteryReplacementNeeded read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributePrimary1XWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.Primary1X response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ColorControl Primary1X read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributePowerSourceBatteryReplacementNeeded : public SubscribeAttribute {
+class SubscribeAttributeColorControlPrimary1X : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceBatteryReplacementNeeded()
-        : SubscribeAttribute("battery-replacement-needed")
+    SubscribeAttributeColorControlPrimary1X()
+        : SubscribeAttribute("primary1x")
     {
     }
 
-    ~SubscribeAttributePowerSourceBatteryReplacementNeeded() {}
+    ~SubscribeAttributeColorControlPrimary1X() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000000F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000011) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBatteryReplacementNeededWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePrimary1XWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.BatteryReplacementNeeded response %@", [value description]);
+                NSLog(@"ColorControl.Primary1X response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -55967,27 +54778,27 @@ class SubscribeAttributePowerSourceBatteryReplacementNeeded : public SubscribeAt
 };
 
 /*
- * Attribute BatteryReplaceability
+ * Attribute Primary1Y
  */
-class ReadPowerSourceBatteryReplaceability : public ReadAttribute {
+class ReadColorControlPrimary1Y : public ReadAttribute {
 public:
-    ReadPowerSourceBatteryReplaceability()
-        : ReadAttribute("battery-replaceability")
+    ReadColorControlPrimary1Y()
+        : ReadAttribute("primary1y")
     {
     }
 
-    ~ReadPowerSourceBatteryReplaceability() {}
+    ~ReadColorControlPrimary1Y() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000012) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBatteryReplaceabilityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.BatteryReplaceability response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributePrimary1YWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.Primary1Y response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSource BatteryReplaceability read Error", error);
+                LogNSError("ColorControl Primary1Y read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -55995,32 +54806,32 @@ class ReadPowerSourceBatteryReplaceability : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceBatteryReplaceability : public SubscribeAttribute {
+class SubscribeAttributeColorControlPrimary1Y : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceBatteryReplaceability()
-        : SubscribeAttribute("battery-replaceability")
+    SubscribeAttributeColorControlPrimary1Y()
+        : SubscribeAttribute("primary1y")
     {
     }
 
-    ~SubscribeAttributePowerSourceBatteryReplaceability() {}
+    ~SubscribeAttributeColorControlPrimary1Y() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000012) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBatteryReplaceabilityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePrimary1YWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.BatteryReplaceability response %@", [value description]);
+                NSLog(@"ColorControl.Primary1Y response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -56031,27 +54842,27 @@ class SubscribeAttributePowerSourceBatteryReplaceability : public SubscribeAttri
 };
 
 /*
- * Attribute BatteryPresent
+ * Attribute Primary1Intensity
  */
-class ReadPowerSourceBatteryPresent : public ReadAttribute {
+class ReadColorControlPrimary1Intensity : public ReadAttribute {
 public:
-    ReadPowerSourceBatteryPresent()
-        : ReadAttribute("battery-present")
+    ReadColorControlPrimary1Intensity()
+        : ReadAttribute("primary1intensity")
     {
     }
 
-    ~ReadPowerSourceBatteryPresent() {}
+    ~ReadColorControlPrimary1Intensity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000013) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBatteryPresentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.BatteryPresent response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributePrimary1IntensityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.Primary1Intensity response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSource BatteryPresent read Error", error);
+                LogNSError("ColorControl Primary1Intensity read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -56059,32 +54870,32 @@ class ReadPowerSourceBatteryPresent : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceBatteryPresent : public SubscribeAttribute {
+class SubscribeAttributeColorControlPrimary1Intensity : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceBatteryPresent()
-        : SubscribeAttribute("battery-present")
+    SubscribeAttributeColorControlPrimary1Intensity()
+        : SubscribeAttribute("primary1intensity")
     {
     }
 
-    ~SubscribeAttributePowerSourceBatteryPresent() {}
+    ~SubscribeAttributeColorControlPrimary1Intensity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000013) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBatteryPresentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePrimary1IntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.BatteryPresent response %@", [value description]);
+                NSLog(@"ColorControl.Primary1Intensity response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -56095,27 +54906,27 @@ class SubscribeAttributePowerSourceBatteryPresent : public SubscribeAttribute {
 };
 
 /*
- * Attribute ActiveBatteryFaults
+ * Attribute Primary2X
  */
-class ReadPowerSourceActiveBatteryFaults : public ReadAttribute {
+class ReadColorControlPrimary2X : public ReadAttribute {
 public:
-    ReadPowerSourceActiveBatteryFaults()
-        : ReadAttribute("active-battery-faults")
+    ReadColorControlPrimary2X()
+        : ReadAttribute("primary2x")
     {
     }
 
-    ~ReadPowerSourceActiveBatteryFaults() {}
+    ~ReadColorControlPrimary2X() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000015) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeActiveBatteryFaultsWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.ActiveBatteryFaults response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributePrimary2XWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.Primary2X response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSource ActiveBatteryFaults read Error", error);
+                LogNSError("ColorControl Primary2X read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -56123,32 +54934,32 @@ class ReadPowerSourceActiveBatteryFaults : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceActiveBatteryFaults : public SubscribeAttribute {
+class SubscribeAttributeColorControlPrimary2X : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceActiveBatteryFaults()
-        : SubscribeAttribute("active-battery-faults")
+    SubscribeAttributeColorControlPrimary2X()
+        : SubscribeAttribute("primary2x")
     {
     }
 
-    ~SubscribeAttributePowerSourceActiveBatteryFaults() {}
+    ~SubscribeAttributeColorControlPrimary2X() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000015) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeActiveBatteryFaultsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePrimary2XWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.ActiveBatteryFaults response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Primary2X response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -56159,28 +54970,27 @@ class SubscribeAttributePowerSourceActiveBatteryFaults : public SubscribeAttribu
 };
 
 /*
- * Attribute BatteryReplacementDescription
+ * Attribute Primary2Y
  */
-class ReadPowerSourceBatteryReplacementDescription : public ReadAttribute {
+class ReadColorControlPrimary2Y : public ReadAttribute {
 public:
-    ReadPowerSourceBatteryReplacementDescription()
-        : ReadAttribute("battery-replacement-description")
+    ReadColorControlPrimary2Y()
+        : ReadAttribute("primary2y")
     {
     }
 
-    ~ReadPowerSourceBatteryReplacementDescription() {}
+    ~ReadColorControlPrimary2Y() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000016) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBatteryReplacementDescriptionWithCompletionHandler:^(
-            NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.BatteryReplacementDescription response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributePrimary2YWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.Primary2Y response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSource BatteryReplacementDescription read Error", error);
+                LogNSError("ColorControl Primary2Y read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -56188,32 +54998,32 @@ class ReadPowerSourceBatteryReplacementDescription : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceBatteryReplacementDescription : public SubscribeAttribute {
+class SubscribeAttributeColorControlPrimary2Y : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceBatteryReplacementDescription()
-        : SubscribeAttribute("battery-replacement-description")
+    SubscribeAttributeColorControlPrimary2Y()
+        : SubscribeAttribute("primary2y")
     {
     }
 
-    ~SubscribeAttributePowerSourceBatteryReplacementDescription() {}
+    ~SubscribeAttributeColorControlPrimary2Y() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000016) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBatteryReplacementDescriptionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePrimary2YWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.BatteryReplacementDescription response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Primary2Y response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -56224,61 +55034,60 @@ class SubscribeAttributePowerSourceBatteryReplacementDescription : public Subscr
 };
 
 /*
- * Attribute BatteryCommonDesignation
+ * Attribute Primary2Intensity
  */
-class ReadPowerSourceBatteryCommonDesignation : public ReadAttribute {
+class ReadColorControlPrimary2Intensity : public ReadAttribute {
 public:
-    ReadPowerSourceBatteryCommonDesignation()
-        : ReadAttribute("battery-common-designation")
+    ReadColorControlPrimary2Intensity()
+        : ReadAttribute("primary2intensity")
     {
     }
 
-    ~ReadPowerSourceBatteryCommonDesignation() {}
+    ~ReadColorControlPrimary2Intensity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000014) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000017) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeBatteryCommonDesignationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.BatteryCommonDesignation response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("PowerSource BatteryCommonDesignation read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class SubscribeAttributePowerSourceBatteryCommonDesignation : public SubscribeAttribute {
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributePrimary2IntensityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.Primary2Intensity response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ColorControl Primary2Intensity read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeColorControlPrimary2Intensity : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceBatteryCommonDesignation()
-        : SubscribeAttribute("battery-common-designation")
+    SubscribeAttributeColorControlPrimary2Intensity()
+        : SubscribeAttribute("primary2intensity")
     {
     }
 
-    ~SubscribeAttributePowerSourceBatteryCommonDesignation() {}
+    ~SubscribeAttributeColorControlPrimary2Intensity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000014) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000017) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBatteryCommonDesignationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePrimary2IntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.BatteryCommonDesignation response %@", [value description]);
+                NSLog(@"ColorControl.Primary2Intensity response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -56289,27 +55098,27 @@ class SubscribeAttributePowerSourceBatteryCommonDesignation : public SubscribeAt
 };
 
 /*
- * Attribute BatteryANSIDesignation
+ * Attribute Primary3X
  */
-class ReadPowerSourceBatteryANSIDesignation : public ReadAttribute {
+class ReadColorControlPrimary3X : public ReadAttribute {
 public:
-    ReadPowerSourceBatteryANSIDesignation()
-        : ReadAttribute("battery-ansidesignation")
+    ReadColorControlPrimary3X()
+        : ReadAttribute("primary3x")
     {
     }
 
-    ~ReadPowerSourceBatteryANSIDesignation() {}
+    ~ReadColorControlPrimary3X() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000015) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000019) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBatteryANSIDesignationWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.BatteryANSIDesignation response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributePrimary3XWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.Primary3X response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSource BatteryANSIDesignation read Error", error);
+                LogNSError("ColorControl Primary3X read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -56317,32 +55126,32 @@ class ReadPowerSourceBatteryANSIDesignation : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceBatteryANSIDesignation : public SubscribeAttribute {
+class SubscribeAttributeColorControlPrimary3X : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceBatteryANSIDesignation()
-        : SubscribeAttribute("battery-ansidesignation")
+    SubscribeAttributeColorControlPrimary3X()
+        : SubscribeAttribute("primary3x")
     {
     }
 
-    ~SubscribeAttributePowerSourceBatteryANSIDesignation() {}
+    ~SubscribeAttributeColorControlPrimary3X() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000015) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000019) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBatteryANSIDesignationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePrimary3XWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.BatteryANSIDesignation response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Primary3X response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -56353,27 +55162,27 @@ class SubscribeAttributePowerSourceBatteryANSIDesignation : public SubscribeAttr
 };
 
 /*
- * Attribute BatteryIECDesignation
+ * Attribute Primary3Y
  */
-class ReadPowerSourceBatteryIECDesignation : public ReadAttribute {
+class ReadColorControlPrimary3Y : public ReadAttribute {
 public:
-    ReadPowerSourceBatteryIECDesignation()
-        : ReadAttribute("battery-iecdesignation")
+    ReadColorControlPrimary3Y()
+        : ReadAttribute("primary3y")
     {
     }
 
-    ~ReadPowerSourceBatteryIECDesignation() {}
+    ~ReadColorControlPrimary3Y() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000016) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000001A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBatteryIECDesignationWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.BatteryIECDesignation response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributePrimary3YWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.Primary3Y response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSource BatteryIECDesignation read Error", error);
+                LogNSError("ColorControl Primary3Y read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -56381,32 +55190,32 @@ class ReadPowerSourceBatteryIECDesignation : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceBatteryIECDesignation : public SubscribeAttribute {
+class SubscribeAttributeColorControlPrimary3Y : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceBatteryIECDesignation()
-        : SubscribeAttribute("battery-iecdesignation")
+    SubscribeAttributeColorControlPrimary3Y()
+        : SubscribeAttribute("primary3y")
     {
     }
 
-    ~SubscribeAttributePowerSourceBatteryIECDesignation() {}
+    ~SubscribeAttributeColorControlPrimary3Y() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000016) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000001A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBatteryIECDesignationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePrimary3YWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.BatteryIECDesignation response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Primary3Y response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -56417,61 +55226,60 @@ class SubscribeAttributePowerSourceBatteryIECDesignation : public SubscribeAttri
 };
 
 /*
- * Attribute BatteryApprovedChemistry
+ * Attribute Primary3Intensity
  */
-class ReadPowerSourceBatteryApprovedChemistry : public ReadAttribute {
+class ReadColorControlPrimary3Intensity : public ReadAttribute {
 public:
-    ReadPowerSourceBatteryApprovedChemistry()
-        : ReadAttribute("battery-approved-chemistry")
+    ReadColorControlPrimary3Intensity()
+        : ReadAttribute("primary3intensity")
     {
     }
 
-    ~ReadPowerSourceBatteryApprovedChemistry() {}
+    ~ReadColorControlPrimary3Intensity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000001B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeBatteryApprovedChemistryWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.BatteryApprovedChemistry response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("PowerSource BatteryApprovedChemistry read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributePrimary3IntensityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.Primary3Intensity response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ColorControl Primary3Intensity read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributePowerSourceBatteryApprovedChemistry : public SubscribeAttribute {
+class SubscribeAttributeColorControlPrimary3Intensity : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceBatteryApprovedChemistry()
-        : SubscribeAttribute("battery-approved-chemistry")
+    SubscribeAttributeColorControlPrimary3Intensity()
+        : SubscribeAttribute("primary3intensity")
     {
     }
 
-    ~SubscribeAttributePowerSourceBatteryApprovedChemistry() {}
+    ~SubscribeAttributeColorControlPrimary3Intensity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000001B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBatteryApprovedChemistryWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePrimary3IntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.BatteryApprovedChemistry response %@", [value description]);
+                NSLog(@"ColorControl.Primary3Intensity response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -56482,27 +55290,27 @@ class SubscribeAttributePowerSourceBatteryApprovedChemistry : public SubscribeAt
 };
 
 /*
- * Attribute BatteryCapacity
+ * Attribute Primary4X
  */
-class ReadPowerSourceBatteryCapacity : public ReadAttribute {
+class ReadColorControlPrimary4X : public ReadAttribute {
 public:
-    ReadPowerSourceBatteryCapacity()
-        : ReadAttribute("battery-capacity")
+    ReadColorControlPrimary4X()
+        : ReadAttribute("primary4x")
     {
     }
 
-    ~ReadPowerSourceBatteryCapacity() {}
+    ~ReadColorControlPrimary4X() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000018) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000020) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBatteryCapacityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.BatteryCapacity response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributePrimary4XWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.Primary4X response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSource BatteryCapacity read Error", error);
+                LogNSError("ColorControl Primary4X read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -56510,32 +55318,32 @@ class ReadPowerSourceBatteryCapacity : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceBatteryCapacity : public SubscribeAttribute {
+class SubscribeAttributeColorControlPrimary4X : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceBatteryCapacity()
-        : SubscribeAttribute("battery-capacity")
+    SubscribeAttributeColorControlPrimary4X()
+        : SubscribeAttribute("primary4x")
     {
     }
 
-    ~SubscribeAttributePowerSourceBatteryCapacity() {}
+    ~SubscribeAttributeColorControlPrimary4X() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000018) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000020) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBatteryCapacityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePrimary4XWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.BatteryCapacity response %@", [value description]);
+                NSLog(@"ColorControl.Primary4X response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -56546,27 +55354,27 @@ class SubscribeAttributePowerSourceBatteryCapacity : public SubscribeAttribute {
 };
 
 /*
- * Attribute BatteryQuantity
+ * Attribute Primary4Y
  */
-class ReadPowerSourceBatteryQuantity : public ReadAttribute {
+class ReadColorControlPrimary4Y : public ReadAttribute {
 public:
-    ReadPowerSourceBatteryQuantity()
-        : ReadAttribute("battery-quantity")
+    ReadColorControlPrimary4Y()
+        : ReadAttribute("primary4y")
     {
     }
 
-    ~ReadPowerSourceBatteryQuantity() {}
+    ~ReadColorControlPrimary4Y() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x00000019) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000021) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBatteryQuantityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.BatteryQuantity response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributePrimary4YWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.Primary4Y response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSource BatteryQuantity read Error", error);
+                LogNSError("ColorControl Primary4Y read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -56574,32 +55382,32 @@ class ReadPowerSourceBatteryQuantity : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceBatteryQuantity : public SubscribeAttribute {
+class SubscribeAttributeColorControlPrimary4Y : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceBatteryQuantity()
-        : SubscribeAttribute("battery-quantity")
+    SubscribeAttributeColorControlPrimary4Y()
+        : SubscribeAttribute("primary4y")
     {
     }
 
-    ~SubscribeAttributePowerSourceBatteryQuantity() {}
+    ~SubscribeAttributeColorControlPrimary4Y() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x00000019) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000021) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBatteryQuantityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePrimary4YWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.BatteryQuantity response %@", [value description]);
+                NSLog(@"ColorControl.Primary4Y response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -56610,27 +55418,27 @@ class SubscribeAttributePowerSourceBatteryQuantity : public SubscribeAttribute {
 };
 
 /*
- * Attribute BatteryChargeState
+ * Attribute Primary4Intensity
  */
-class ReadPowerSourceBatteryChargeState : public ReadAttribute {
+class ReadColorControlPrimary4Intensity : public ReadAttribute {
 public:
-    ReadPowerSourceBatteryChargeState()
-        : ReadAttribute("battery-charge-state")
+    ReadColorControlPrimary4Intensity()
+        : ReadAttribute("primary4intensity")
     {
     }
 
-    ~ReadPowerSourceBatteryChargeState() {}
+    ~ReadColorControlPrimary4Intensity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000001A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000022) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBatteryChargeStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.BatteryChargeState response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributePrimary4IntensityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.Primary4Intensity response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSource BatteryChargeState read Error", error);
+                LogNSError("ColorControl Primary4Intensity read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -56638,32 +55446,32 @@ class ReadPowerSourceBatteryChargeState : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceBatteryChargeState : public SubscribeAttribute {
+class SubscribeAttributeColorControlPrimary4Intensity : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceBatteryChargeState()
-        : SubscribeAttribute("battery-charge-state")
+    SubscribeAttributeColorControlPrimary4Intensity()
+        : SubscribeAttribute("primary4intensity")
     {
     }
 
-    ~SubscribeAttributePowerSourceBatteryChargeState() {}
+    ~SubscribeAttributeColorControlPrimary4Intensity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000001A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000022) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBatteryChargeStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePrimary4IntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.BatteryChargeState response %@", [value description]);
+                NSLog(@"ColorControl.Primary4Intensity response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -56674,61 +55482,60 @@ class SubscribeAttributePowerSourceBatteryChargeState : public SubscribeAttribut
 };
 
 /*
- * Attribute BatteryTimeToFullCharge
+ * Attribute Primary5X
  */
-class ReadPowerSourceBatteryTimeToFullCharge : public ReadAttribute {
+class ReadColorControlPrimary5X : public ReadAttribute {
 public:
-    ReadPowerSourceBatteryTimeToFullCharge()
-        : ReadAttribute("battery-time-to-full-charge")
+    ReadColorControlPrimary5X()
+        : ReadAttribute("primary5x")
     {
     }
 
-    ~ReadPowerSourceBatteryTimeToFullCharge() {}
+    ~ReadColorControlPrimary5X() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000001B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000024) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeBatteryTimeToFullChargeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.BatteryTimeToFullCharge response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("PowerSource BatteryTimeToFullCharge read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributePrimary5XWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.Primary5X response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ColorControl Primary5X read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributePowerSourceBatteryTimeToFullCharge : public SubscribeAttribute {
+class SubscribeAttributeColorControlPrimary5X : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceBatteryTimeToFullCharge()
-        : SubscribeAttribute("battery-time-to-full-charge")
+    SubscribeAttributeColorControlPrimary5X()
+        : SubscribeAttribute("primary5x")
     {
     }
 
-    ~SubscribeAttributePowerSourceBatteryTimeToFullCharge() {}
+    ~SubscribeAttributeColorControlPrimary5X() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000001B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000024) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBatteryTimeToFullChargeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePrimary5XWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.BatteryTimeToFullCharge response %@", [value description]);
+                NSLog(@"ColorControl.Primary5X response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -56739,28 +55546,27 @@ class SubscribeAttributePowerSourceBatteryTimeToFullCharge : public SubscribeAtt
 };
 
 /*
- * Attribute BatteryFunctionalWhileCharging
+ * Attribute Primary5Y
  */
-class ReadPowerSourceBatteryFunctionalWhileCharging : public ReadAttribute {
+class ReadColorControlPrimary5Y : public ReadAttribute {
 public:
-    ReadPowerSourceBatteryFunctionalWhileCharging()
-        : ReadAttribute("battery-functional-while-charging")
+    ReadColorControlPrimary5Y()
+        : ReadAttribute("primary5y")
     {
     }
 
-    ~ReadPowerSourceBatteryFunctionalWhileCharging() {}
+    ~ReadColorControlPrimary5Y() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000001C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000025) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBatteryFunctionalWhileChargingWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.BatteryFunctionalWhileCharging response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributePrimary5YWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.Primary5Y response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSource BatteryFunctionalWhileCharging read Error", error);
+                LogNSError("ColorControl Primary5Y read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -56768,32 +55574,32 @@ class ReadPowerSourceBatteryFunctionalWhileCharging : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceBatteryFunctionalWhileCharging : public SubscribeAttribute {
+class SubscribeAttributeColorControlPrimary5Y : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceBatteryFunctionalWhileCharging()
-        : SubscribeAttribute("battery-functional-while-charging")
+    SubscribeAttributeColorControlPrimary5Y()
+        : SubscribeAttribute("primary5y")
     {
     }
 
-    ~SubscribeAttributePowerSourceBatteryFunctionalWhileCharging() {}
+    ~SubscribeAttributeColorControlPrimary5Y() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000001C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000025) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBatteryFunctionalWhileChargingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePrimary5YWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.BatteryFunctionalWhileCharging response %@", [value description]);
+                NSLog(@"ColorControl.Primary5Y response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -56804,27 +55610,27 @@ class SubscribeAttributePowerSourceBatteryFunctionalWhileCharging : public Subsc
 };
 
 /*
- * Attribute BatteryChargingCurrent
+ * Attribute Primary5Intensity
  */
-class ReadPowerSourceBatteryChargingCurrent : public ReadAttribute {
+class ReadColorControlPrimary5Intensity : public ReadAttribute {
 public:
-    ReadPowerSourceBatteryChargingCurrent()
-        : ReadAttribute("battery-charging-current")
+    ReadColorControlPrimary5Intensity()
+        : ReadAttribute("primary5intensity")
     {
     }
 
-    ~ReadPowerSourceBatteryChargingCurrent() {}
+    ~ReadColorControlPrimary5Intensity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000001D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000026) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBatteryChargingCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.BatteryChargingCurrent response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributePrimary5IntensityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.Primary5Intensity response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSource BatteryChargingCurrent read Error", error);
+                LogNSError("ColorControl Primary5Intensity read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -56832,32 +55638,32 @@ class ReadPowerSourceBatteryChargingCurrent : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceBatteryChargingCurrent : public SubscribeAttribute {
+class SubscribeAttributeColorControlPrimary5Intensity : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceBatteryChargingCurrent()
-        : SubscribeAttribute("battery-charging-current")
+    SubscribeAttributeColorControlPrimary5Intensity()
+        : SubscribeAttribute("primary5intensity")
     {
     }
 
-    ~SubscribeAttributePowerSourceBatteryChargingCurrent() {}
+    ~SubscribeAttributeColorControlPrimary5Intensity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000001D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000026) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBatteryChargingCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePrimary5IntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.BatteryChargingCurrent response %@", [value description]);
+                NSLog(@"ColorControl.Primary5Intensity response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -56868,61 +55674,60 @@ class SubscribeAttributePowerSourceBatteryChargingCurrent : public SubscribeAttr
 };
 
 /*
- * Attribute ActiveBatteryChargeFaults
+ * Attribute Primary6X
  */
-class ReadPowerSourceActiveBatteryChargeFaults : public ReadAttribute {
+class ReadColorControlPrimary6X : public ReadAttribute {
 public:
-    ReadPowerSourceActiveBatteryChargeFaults()
-        : ReadAttribute("active-battery-charge-faults")
+    ReadColorControlPrimary6X()
+        : ReadAttribute("primary6x")
     {
     }
 
-    ~ReadPowerSourceActiveBatteryChargeFaults() {}
+    ~ReadColorControlPrimary6X() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000001E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000028) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeActiveBatteryChargeFaultsWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.ActiveBatteryChargeFaults response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("PowerSource ActiveBatteryChargeFaults read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributePrimary6XWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.Primary6X response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ColorControl Primary6X read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributePowerSourceActiveBatteryChargeFaults : public SubscribeAttribute {
+class SubscribeAttributeColorControlPrimary6X : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceActiveBatteryChargeFaults()
-        : SubscribeAttribute("active-battery-charge-faults")
+    SubscribeAttributeColorControlPrimary6X()
+        : SubscribeAttribute("primary6x")
     {
     }
 
-    ~SubscribeAttributePowerSourceActiveBatteryChargeFaults() {}
+    ~SubscribeAttributeColorControlPrimary6X() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000001E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000028) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeActiveBatteryChargeFaultsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePrimary6XWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.ActiveBatteryChargeFaults response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Primary6X response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -56933,27 +55738,27 @@ class SubscribeAttributePowerSourceActiveBatteryChargeFaults : public SubscribeA
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute Primary6Y
  */
-class ReadPowerSourceGeneratedCommandList : public ReadAttribute {
+class ReadColorControlPrimary6Y : public ReadAttribute {
 public:
-    ReadPowerSourceGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadColorControlPrimary6Y()
+        : ReadAttribute("primary6y")
     {
     }
 
-    ~ReadPowerSourceGeneratedCommandList() {}
+    ~ReadColorControlPrimary6Y() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000029) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.GeneratedCommandList response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributePrimary6YWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.Primary6Y response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSource GeneratedCommandList read Error", error);
+                LogNSError("ColorControl Primary6Y read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -56961,32 +55766,32 @@ class ReadPowerSourceGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeColorControlPrimary6Y : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeColorControlPrimary6Y()
+        : SubscribeAttribute("primary6y")
     {
     }
 
-    ~SubscribeAttributePowerSourceGeneratedCommandList() {}
+    ~SubscribeAttributeColorControlPrimary6Y() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000029) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePrimary6YWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Primary6Y response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -56997,27 +55802,27 @@ class SubscribeAttributePowerSourceGeneratedCommandList : public SubscribeAttrib
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute Primary6Intensity
  */
-class ReadPowerSourceAcceptedCommandList : public ReadAttribute {
+class ReadColorControlPrimary6Intensity : public ReadAttribute {
 public:
-    ReadPowerSourceAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadColorControlPrimary6Intensity()
+        : ReadAttribute("primary6intensity")
     {
     }
 
-    ~ReadPowerSourceAcceptedCommandList() {}
+    ~ReadColorControlPrimary6Intensity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000002A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.AcceptedCommandList response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributePrimary6IntensityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.Primary6Intensity response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSource AcceptedCommandList read Error", error);
+                LogNSError("ColorControl Primary6Intensity read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -57025,32 +55830,32 @@ class ReadPowerSourceAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeColorControlPrimary6Intensity : public SubscribeAttribute {
 public:
-    SubscribeAttributePowerSourceAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeColorControlPrimary6Intensity()
+        : SubscribeAttribute("primary6intensity")
     {
     }
 
-    ~SubscribeAttributePowerSourceAcceptedCommandList() {}
+    ~SubscribeAttributeColorControlPrimary6Intensity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000002A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePrimary6IntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.Primary6Intensity response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -57061,27 +55866,27 @@ class SubscribeAttributePowerSourceAcceptedCommandList : public SubscribeAttribu
 };
 
 /*
- * Attribute AttributeList
+ * Attribute WhitePointX
  */
-class ReadPowerSourceAttributeList : public ReadAttribute {
+class ReadColorControlWhitePointX : public ReadAttribute {
 public:
-    ReadPowerSourceAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadColorControlWhitePointX()
+        : ReadAttribute("white-point-x")
     {
     }
 
-    ~ReadPowerSourceAttributeList() {}
+    ~ReadColorControlWhitePointX() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000030) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.AttributeList response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeWhitePointXWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.WhitePointX response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSource AttributeList read Error", error);
+                LogNSError("ColorControl WhitePointX read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -57089,32 +55894,70 @@ class ReadPowerSourceAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceAttributeList : public SubscribeAttribute {
+class WriteColorControlWhitePointX : public WriteAttribute {
 public:
-    SubscribeAttributePowerSourceAttributeList()
-        : SubscribeAttribute("attribute-list")
+    WriteColorControlWhitePointX()
+        : WriteAttribute("white-point-x")
     {
+        AddArgument("attr-name", "white-point-x");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributePowerSourceAttributeList() {}
+    ~WriteColorControlWhitePointX() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x00000030) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster writeAttributeWhitePointXWithValue:value
+                                             params:params
+                                  completionHandler:^(NSError * _Nullable error) {
+                                      if (error != nil) {
+                                          LogNSError("ColorControl WhitePointX write Error", error);
+                                      }
+                                      SetCommandExitStatus(error);
+                                  }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeColorControlWhitePointX : public SubscribeAttribute {
+public:
+    SubscribeAttributeColorControlWhitePointX()
+        : SubscribeAttribute("white-point-x")
+    {
+    }
+
+    ~SubscribeAttributeColorControlWhitePointX() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000030) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeWhitePointXWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.WhitePointX response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -57125,27 +55968,27 @@ class SubscribeAttributePowerSourceAttributeList : public SubscribeAttribute {
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute WhitePointY
  */
-class ReadPowerSourceFeatureMap : public ReadAttribute {
+class ReadColorControlWhitePointY : public ReadAttribute {
 public:
-    ReadPowerSourceFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadColorControlWhitePointY()
+        : ReadAttribute("white-point-y")
     {
     }
 
-    ~ReadPowerSourceFeatureMap() {}
+    ~ReadColorControlWhitePointY() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000031) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.FeatureMap response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeWhitePointYWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.WhitePointY response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSource FeatureMap read Error", error);
+                LogNSError("ColorControl WhitePointY read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -57153,32 +55996,70 @@ class ReadPowerSourceFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceFeatureMap : public SubscribeAttribute {
+class WriteColorControlWhitePointY : public WriteAttribute {
 public:
-    SubscribeAttributePowerSourceFeatureMap()
-        : SubscribeAttribute("feature-map")
+    WriteColorControlWhitePointY()
+        : WriteAttribute("white-point-y")
     {
+        AddArgument("attr-name", "white-point-y");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributePowerSourceFeatureMap() {}
+    ~WriteColorControlWhitePointY() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x00000031) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster writeAttributeWhitePointYWithValue:value
+                                             params:params
+                                  completionHandler:^(NSError * _Nullable error) {
+                                      if (error != nil) {
+                                          LogNSError("ColorControl WhitePointY write Error", error);
+                                      }
+                                      SetCommandExitStatus(error);
+                                  }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeColorControlWhitePointY : public SubscribeAttribute {
+public:
+    SubscribeAttributeColorControlWhitePointY()
+        : SubscribeAttribute("white-point-y")
+    {
+    }
+
+    ~SubscribeAttributeColorControlWhitePointY() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000031) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeWhitePointYWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.FeatureMap response %@", [value description]);
+                NSLog(@"ColorControl.WhitePointY response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -57189,27 +56070,27 @@ class SubscribeAttributePowerSourceFeatureMap : public SubscribeAttribute {
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute ColorPointRX
  */
-class ReadPowerSourceClusterRevision : public ReadAttribute {
+class ReadColorControlColorPointRX : public ReadAttribute {
 public:
-    ReadPowerSourceClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadColorControlColorPointRX()
+        : ReadAttribute("color-point-rx")
     {
     }
 
-    ~ReadPowerSourceClusterRevision() {}
+    ~ReadColorControlColorPointRX() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000032) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSource.ClusterRevision response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeColorPointRXWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.ColorPointRX response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSource ClusterRevision read Error", error);
+                LogNSError("ColorControl ColorPointRX read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -57217,32 +56098,70 @@ class ReadPowerSourceClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceClusterRevision : public SubscribeAttribute {
+class WriteColorControlColorPointRX : public WriteAttribute {
 public:
-    SubscribeAttributePowerSourceClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    WriteColorControlColorPointRX()
+        : WriteAttribute("color-point-rx")
     {
+        AddArgument("attr-name", "color-point-rx");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributePowerSourceClusterRevision() {}
+    ~WriteColorControlColorPointRX() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002F) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x00000032) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster writeAttributeColorPointRXWithValue:value
+                                              params:params
+                                   completionHandler:^(NSError * _Nullable error) {
+                                       if (error != nil) {
+                                           LogNSError("ColorControl ColorPointRX write Error", error);
+                                       }
+                                       SetCommandExitStatus(error);
+                                   }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeColorControlColorPointRX : public SubscribeAttribute {
+public:
+    SubscribeAttributeColorControlColorPointRX()
+        : SubscribeAttribute("color-point-rx")
+    {
+    }
+
+    ~SubscribeAttributeColorControlColorPointRX() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000032) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeColorPointRXWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSource.ClusterRevision response %@", [value description]);
+                NSLog(@"ColorControl.ColorPointRX response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -57252,46 +56171,28 @@ class SubscribeAttributePowerSourceClusterRevision : public SubscribeAttribute {
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster PowerSourceConfiguration                                    | 0x002E |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * Sources                                                           | 0x0000 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Attribute Sources
+ * Attribute ColorPointRY
  */
-class ReadPowerSourceConfigurationSources : public ReadAttribute {
+class ReadColorControlColorPointRY : public ReadAttribute {
 public:
-    ReadPowerSourceConfigurationSources()
-        : ReadAttribute("sources")
+    ReadColorControlColorPointRY()
+        : ReadAttribute("color-point-ry")
     {
     }
 
-    ~ReadPowerSourceConfigurationSources() {}
+    ~ReadColorControlColorPointRY() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002E) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000033) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSourceConfiguration * cluster = [[CHIPPowerSourceConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeSourcesWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSourceConfiguration.Sources response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeColorPointRYWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.ColorPointRY response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSourceConfiguration Sources read Error", error);
+                LogNSError("ColorControl ColorPointRY read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -57299,34 +56200,70 @@ class ReadPowerSourceConfigurationSources : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceConfigurationSources : public SubscribeAttribute {
+class WriteColorControlColorPointRY : public WriteAttribute {
 public:
-    SubscribeAttributePowerSourceConfigurationSources()
-        : SubscribeAttribute("sources")
+    WriteColorControlColorPointRY()
+        : WriteAttribute("color-point-ry")
+    {
+        AddArgument("attr-name", "color-point-ry");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteColorControlColorPointRY() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x00000033) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster writeAttributeColorPointRYWithValue:value
+                                              params:params
+                                   completionHandler:^(NSError * _Nullable error) {
+                                       if (error != nil) {
+                                           LogNSError("ColorControl ColorPointRY write Error", error);
+                                       }
+                                       SetCommandExitStatus(error);
+                                   }];
+        return CHIP_NO_ERROR;
     }
 
-    ~SubscribeAttributePowerSourceConfigurationSources() {}
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeColorControlColorPointRY : public SubscribeAttribute {
+public:
+    SubscribeAttributeColorControlColorPointRY()
+        : SubscribeAttribute("color-point-ry")
+    {
+    }
+
+    ~SubscribeAttributeColorControlColorPointRY() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002E) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000033) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSourceConfiguration * cluster = [[CHIPPowerSourceConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSourcesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeColorPointRYWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSourceConfiguration.Sources response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorPointRY response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -57337,29 +56274,27 @@ class SubscribeAttributePowerSourceConfigurationSources : public SubscribeAttrib
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute ColorPointRIntensity
  */
-class ReadPowerSourceConfigurationGeneratedCommandList : public ReadAttribute {
+class ReadColorControlColorPointRIntensity : public ReadAttribute {
 public:
-    ReadPowerSourceConfigurationGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadColorControlColorPointRIntensity()
+        : ReadAttribute("color-point-rintensity")
     {
     }
 
-    ~ReadPowerSourceConfigurationGeneratedCommandList() {}
+    ~ReadColorControlColorPointRIntensity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002E) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000034) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSourceConfiguration * cluster = [[CHIPPowerSourceConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSourceConfiguration.GeneratedCommandList response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeColorPointRIntensityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.ColorPointRIntensity response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSourceConfiguration GeneratedCommandList read Error", error);
+                LogNSError("ColorControl ColorPointRIntensity read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -57367,34 +56302,70 @@ class ReadPowerSourceConfigurationGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceConfigurationGeneratedCommandList : public SubscribeAttribute {
+class WriteColorControlColorPointRIntensity : public WriteAttribute {
 public:
-    SubscribeAttributePowerSourceConfigurationGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    WriteColorControlColorPointRIntensity()
+        : WriteAttribute("color-point-rintensity")
     {
+        AddArgument("attr-name", "color-point-rintensity");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributePowerSourceConfigurationGeneratedCommandList() {}
+    ~WriteColorControlColorPointRIntensity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002E) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x00000034) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSourceConfiguration * cluster = [[CHIPPowerSourceConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeColorPointRIntensityWithValue:value
+                                                      params:params
+                                           completionHandler:^(NSError * _Nullable error) {
+                                               if (error != nil) {
+                                                   LogNSError("ColorControl ColorPointRIntensity write Error", error);
+                                               }
+                                               SetCommandExitStatus(error);
+                                           }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeColorControlColorPointRIntensity : public SubscribeAttribute {
+public:
+    SubscribeAttributeColorControlColorPointRIntensity()
+        : SubscribeAttribute("color-point-rintensity")
+    {
+    }
+
+    ~SubscribeAttributeColorControlColorPointRIntensity() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000034) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeColorPointRIntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSourceConfiguration.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorPointRIntensity response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -57405,29 +56376,27 @@ class SubscribeAttributePowerSourceConfigurationGeneratedCommandList : public Su
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute ColorPointGX
  */
-class ReadPowerSourceConfigurationAcceptedCommandList : public ReadAttribute {
+class ReadColorControlColorPointGX : public ReadAttribute {
 public:
-    ReadPowerSourceConfigurationAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadColorControlColorPointGX()
+        : ReadAttribute("color-point-gx")
     {
     }
 
-    ~ReadPowerSourceConfigurationAcceptedCommandList() {}
+    ~ReadColorControlColorPointGX() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002E) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000036) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSourceConfiguration * cluster = [[CHIPPowerSourceConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSourceConfiguration.AcceptedCommandList response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeColorPointGXWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.ColorPointGX response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSourceConfiguration AcceptedCommandList read Error", error);
+                LogNSError("ColorControl ColorPointGX read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -57435,34 +56404,70 @@ class ReadPowerSourceConfigurationAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceConfigurationAcceptedCommandList : public SubscribeAttribute {
+class WriteColorControlColorPointGX : public WriteAttribute {
 public:
-    SubscribeAttributePowerSourceConfigurationAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    WriteColorControlColorPointGX()
+        : WriteAttribute("color-point-gx")
     {
+        AddArgument("attr-name", "color-point-gx");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributePowerSourceConfigurationAcceptedCommandList() {}
+    ~WriteColorControlColorPointGX() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002E) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x00000036) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSourceConfiguration * cluster = [[CHIPPowerSourceConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster writeAttributeColorPointGXWithValue:value
+                                              params:params
+                                   completionHandler:^(NSError * _Nullable error) {
+                                       if (error != nil) {
+                                           LogNSError("ColorControl ColorPointGX write Error", error);
+                                       }
+                                       SetCommandExitStatus(error);
+                                   }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeColorControlColorPointGX : public SubscribeAttribute {
+public:
+    SubscribeAttributeColorControlColorPointGX()
+        : SubscribeAttribute("color-point-gx")
+    {
+    }
+
+    ~SubscribeAttributeColorControlColorPointGX() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000036) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeColorPointGXWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSourceConfiguration.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorPointGX response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -57473,29 +56478,27 @@ class SubscribeAttributePowerSourceConfigurationAcceptedCommandList : public Sub
 };
 
 /*
- * Attribute AttributeList
+ * Attribute ColorPointGY
  */
-class ReadPowerSourceConfigurationAttributeList : public ReadAttribute {
+class ReadColorControlColorPointGY : public ReadAttribute {
 public:
-    ReadPowerSourceConfigurationAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadColorControlColorPointGY()
+        : ReadAttribute("color-point-gy")
     {
     }
 
-    ~ReadPowerSourceConfigurationAttributeList() {}
+    ~ReadColorControlColorPointGY() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002E) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000037) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSourceConfiguration * cluster = [[CHIPPowerSourceConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSourceConfiguration.AttributeList response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeColorPointGYWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.ColorPointGY response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSourceConfiguration AttributeList read Error", error);
+                LogNSError("ColorControl ColorPointGY read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -57503,34 +56506,70 @@ class ReadPowerSourceConfigurationAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceConfigurationAttributeList : public SubscribeAttribute {
+class WriteColorControlColorPointGY : public WriteAttribute {
 public:
-    SubscribeAttributePowerSourceConfigurationAttributeList()
-        : SubscribeAttribute("attribute-list")
+    WriteColorControlColorPointGY()
+        : WriteAttribute("color-point-gy")
     {
+        AddArgument("attr-name", "color-point-gy");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributePowerSourceConfigurationAttributeList() {}
+    ~WriteColorControlColorPointGY() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002E) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x00000037) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSourceConfiguration * cluster = [[CHIPPowerSourceConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster writeAttributeColorPointGYWithValue:value
+                                              params:params
+                                   completionHandler:^(NSError * _Nullable error) {
+                                       if (error != nil) {
+                                           LogNSError("ColorControl ColorPointGY write Error", error);
+                                       }
+                                       SetCommandExitStatus(error);
+                                   }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeColorControlColorPointGY : public SubscribeAttribute {
+public:
+    SubscribeAttributeColorControlColorPointGY()
+        : SubscribeAttribute("color-point-gy")
+    {
+    }
+
+    ~SubscribeAttributeColorControlColorPointGY() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000037) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeColorPointGYWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSourceConfiguration.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorPointGY response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -57541,29 +56580,27 @@ class SubscribeAttributePowerSourceConfigurationAttributeList : public Subscribe
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute ColorPointGIntensity
  */
-class ReadPowerSourceConfigurationFeatureMap : public ReadAttribute {
+class ReadColorControlColorPointGIntensity : public ReadAttribute {
 public:
-    ReadPowerSourceConfigurationFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadColorControlColorPointGIntensity()
+        : ReadAttribute("color-point-gintensity")
     {
     }
 
-    ~ReadPowerSourceConfigurationFeatureMap() {}
+    ~ReadColorControlColorPointGIntensity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002E) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00000038) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSourceConfiguration * cluster = [[CHIPPowerSourceConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSourceConfiguration.FeatureMap response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeColorPointGIntensityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.ColorPointGIntensity response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSourceConfiguration FeatureMap read Error", error);
+                LogNSError("ColorControl ColorPointGIntensity read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -57571,34 +56608,70 @@ class ReadPowerSourceConfigurationFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceConfigurationFeatureMap : public SubscribeAttribute {
+class WriteColorControlColorPointGIntensity : public WriteAttribute {
 public:
-    SubscribeAttributePowerSourceConfigurationFeatureMap()
-        : SubscribeAttribute("feature-map")
+    WriteColorControlColorPointGIntensity()
+        : WriteAttribute("color-point-gintensity")
     {
+        AddArgument("attr-name", "color-point-gintensity");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributePowerSourceConfigurationFeatureMap() {}
+    ~WriteColorControlColorPointGIntensity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002E) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x00000038) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSourceConfiguration * cluster = [[CHIPPowerSourceConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeColorPointGIntensityWithValue:value
+                                                      params:params
+                                           completionHandler:^(NSError * _Nullable error) {
+                                               if (error != nil) {
+                                                   LogNSError("ColorControl ColorPointGIntensity write Error", error);
+                                               }
+                                               SetCommandExitStatus(error);
+                                           }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeColorControlColorPointGIntensity : public SubscribeAttribute {
+public:
+    SubscribeAttributeColorControlColorPointGIntensity()
+        : SubscribeAttribute("color-point-gintensity")
+    {
+    }
+
+    ~SubscribeAttributeColorControlColorPointGIntensity() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00000038) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeColorPointGIntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSourceConfiguration.FeatureMap response %@", [value description]);
+                NSLog(@"ColorControl.ColorPointGIntensity response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -57609,29 +56682,27 @@ class SubscribeAttributePowerSourceConfigurationFeatureMap : public SubscribeAtt
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute ColorPointBX
  */
-class ReadPowerSourceConfigurationClusterRevision : public ReadAttribute {
+class ReadColorControlColorPointBX : public ReadAttribute {
 public:
-    ReadPowerSourceConfigurationClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadColorControlColorPointBX()
+        : ReadAttribute("color-point-bx")
     {
     }
 
-    ~ReadPowerSourceConfigurationClusterRevision() {}
+    ~ReadColorControlColorPointBX() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002E) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000003A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSourceConfiguration * cluster = [[CHIPPowerSourceConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PowerSourceConfiguration.ClusterRevision response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeColorPointBXWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.ColorPointBX response %@", [value description]);
             if (error != nil) {
-                LogNSError("PowerSourceConfiguration ClusterRevision read Error", error);
+                LogNSError("ColorControl ColorPointBX read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -57639,34 +56710,70 @@ class ReadPowerSourceConfigurationClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePowerSourceConfigurationClusterRevision : public SubscribeAttribute {
+class WriteColorControlColorPointBX : public WriteAttribute {
 public:
-    SubscribeAttributePowerSourceConfigurationClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    WriteColorControlColorPointBX()
+        : WriteAttribute("color-point-bx")
     {
+        AddArgument("attr-name", "color-point-bx");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributePowerSourceConfigurationClusterRevision() {}
+    ~WriteColorControlColorPointBX() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002E) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x0000003A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPowerSourceConfiguration * cluster = [[CHIPPowerSourceConfiguration alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster writeAttributeColorPointBXWithValue:value
+                                              params:params
+                                   completionHandler:^(NSError * _Nullable error) {
+                                       if (error != nil) {
+                                           LogNSError("ColorControl ColorPointBX write Error", error);
+                                       }
+                                       SetCommandExitStatus(error);
+                                   }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeColorControlColorPointBX : public SubscribeAttribute {
+public:
+    SubscribeAttributeColorControlColorPointBX()
+        : SubscribeAttribute("color-point-bx")
+    {
+    }
+
+    ~SubscribeAttributeColorControlColorPointBX() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000003A) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeColorPointBXWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PowerSourceConfiguration.ClusterRevision response %@", [value description]);
+                NSLog(@"ColorControl.ColorPointBX response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -57676,54 +56783,28 @@ class SubscribeAttributePowerSourceConfigurationClusterRevision : public Subscri
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster PressureMeasurement                                         | 0x0403 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * MeasuredValue                                                     | 0x0000 |
-| * MinMeasuredValue                                                  | 0x0001 |
-| * MaxMeasuredValue                                                  | 0x0002 |
-| * Tolerance                                                         | 0x0003 |
-| * ScaledValue                                                       | 0x0010 |
-| * MinScaledValue                                                    | 0x0011 |
-| * MaxScaledValue                                                    | 0x0012 |
-| * ScaledTolerance                                                   | 0x0013 |
-| * Scale                                                             | 0x0014 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Attribute MeasuredValue
+ * Attribute ColorPointBY
  */
-class ReadPressureMeasurementMeasuredValue : public ReadAttribute {
+class ReadColorControlColorPointBY : public ReadAttribute {
 public:
-    ReadPressureMeasurementMeasuredValue()
-        : ReadAttribute("measured-value")
+    ReadColorControlColorPointBY()
+        : ReadAttribute("color-point-by")
     {
     }
 
-    ~ReadPressureMeasurementMeasuredValue() {}
+    ~ReadColorControlColorPointBY() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000003B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PressureMeasurement.MeasuredValue response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeColorPointBYWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.ColorPointBY response %@", [value description]);
             if (error != nil) {
-                LogNSError("PressureMeasurement MeasuredValue read Error", error);
+                LogNSError("ColorControl ColorPointBY read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -57731,34 +56812,70 @@ class ReadPressureMeasurementMeasuredValue : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePressureMeasurementMeasuredValue : public SubscribeAttribute {
+class WriteColorControlColorPointBY : public WriteAttribute {
 public:
-    SubscribeAttributePressureMeasurementMeasuredValue()
-        : SubscribeAttribute("measured-value")
+    WriteColorControlColorPointBY()
+        : WriteAttribute("color-point-by")
     {
+        AddArgument("attr-name", "color-point-by");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributePressureMeasurementMeasuredValue() {}
+    ~WriteColorControlColorPointBY() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x0000003B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster writeAttributeColorPointBYWithValue:value
+                                              params:params
+                                   completionHandler:^(NSError * _Nullable error) {
+                                       if (error != nil) {
+                                           LogNSError("ColorControl ColorPointBY write Error", error);
+                                       }
+                                       SetCommandExitStatus(error);
+                                   }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeColorControlColorPointBY : public SubscribeAttribute {
+public:
+    SubscribeAttributeColorControlColorPointBY()
+        : SubscribeAttribute("color-point-by")
+    {
+    }
+
+    ~SubscribeAttributeColorControlColorPointBY() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000003B) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeColorPointBYWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PressureMeasurement.MeasuredValue response %@", [value description]);
+                NSLog(@"ColorControl.ColorPointBY response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -57769,29 +56886,27 @@ class SubscribeAttributePressureMeasurementMeasuredValue : public SubscribeAttri
 };
 
 /*
- * Attribute MinMeasuredValue
+ * Attribute ColorPointBIntensity
  */
-class ReadPressureMeasurementMinMeasuredValue : public ReadAttribute {
+class ReadColorControlColorPointBIntensity : public ReadAttribute {
 public:
-    ReadPressureMeasurementMinMeasuredValue()
-        : ReadAttribute("min-measured-value")
+    ReadColorControlColorPointBIntensity()
+        : ReadAttribute("color-point-bintensity")
     {
     }
 
-    ~ReadPressureMeasurementMinMeasuredValue() {}
+    ~ReadColorControlColorPointBIntensity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000003C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeMinMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PressureMeasurement.MinMeasuredValue response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeColorPointBIntensityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.ColorPointBIntensity response %@", [value description]);
             if (error != nil) {
-                LogNSError("PressureMeasurement MinMeasuredValue read Error", error);
+                LogNSError("ColorControl ColorPointBIntensity read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -57799,34 +56914,70 @@ class ReadPressureMeasurementMinMeasuredValue : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePressureMeasurementMinMeasuredValue : public SubscribeAttribute {
+class WriteColorControlColorPointBIntensity : public WriteAttribute {
 public:
-    SubscribeAttributePressureMeasurementMinMeasuredValue()
-        : SubscribeAttribute("min-measured-value")
+    WriteColorControlColorPointBIntensity()
+        : WriteAttribute("color-point-bintensity")
     {
+        AddArgument("attr-name", "color-point-bintensity");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributePressureMeasurementMinMeasuredValue() {}
+    ~WriteColorControlColorPointBIntensity() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x0000003C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeColorPointBIntensityWithValue:value
+                                                      params:params
+                                           completionHandler:^(NSError * _Nullable error) {
+                                               if (error != nil) {
+                                                   LogNSError("ColorControl ColorPointBIntensity write Error", error);
+                                               }
+                                               SetCommandExitStatus(error);
+                                           }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeColorControlColorPointBIntensity : public SubscribeAttribute {
+public:
+    SubscribeAttributeColorControlColorPointBIntensity()
+        : SubscribeAttribute("color-point-bintensity")
+    {
+    }
+
+    ~SubscribeAttributeColorControlColorPointBIntensity() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000003C) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMinMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeColorPointBIntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PressureMeasurement.MinMeasuredValue response %@", [value description]);
+                NSLog(@"ColorControl.ColorPointBIntensity response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -57837,29 +56988,27 @@ class SubscribeAttributePressureMeasurementMinMeasuredValue : public SubscribeAt
 };
 
 /*
- * Attribute MaxMeasuredValue
+ * Attribute EnhancedCurrentHue
  */
-class ReadPressureMeasurementMaxMeasuredValue : public ReadAttribute {
+class ReadColorControlEnhancedCurrentHue : public ReadAttribute {
 public:
-    ReadPressureMeasurementMaxMeasuredValue()
-        : ReadAttribute("max-measured-value")
+    ReadColorControlEnhancedCurrentHue()
+        : ReadAttribute("enhanced-current-hue")
     {
     }
 
-    ~ReadPressureMeasurementMaxMeasuredValue() {}
+    ~ReadColorControlEnhancedCurrentHue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00004000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeMaxMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PressureMeasurement.MaxMeasuredValue response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeEnhancedCurrentHueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.EnhancedCurrentHue response %@", [value description]);
             if (error != nil) {
-                LogNSError("PressureMeasurement MaxMeasuredValue read Error", error);
+                LogNSError("ColorControl EnhancedCurrentHue read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -57867,34 +57016,32 @@ class ReadPressureMeasurementMaxMeasuredValue : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePressureMeasurementMaxMeasuredValue : public SubscribeAttribute {
+class SubscribeAttributeColorControlEnhancedCurrentHue : public SubscribeAttribute {
 public:
-    SubscribeAttributePressureMeasurementMaxMeasuredValue()
-        : SubscribeAttribute("max-measured-value")
+    SubscribeAttributeColorControlEnhancedCurrentHue()
+        : SubscribeAttribute("enhanced-current-hue")
     {
     }
 
-    ~SubscribeAttributePressureMeasurementMaxMeasuredValue() {}
+    ~SubscribeAttributeColorControlEnhancedCurrentHue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00004000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMaxMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeEnhancedCurrentHueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PressureMeasurement.MaxMeasuredValue response %@", [value description]);
+                NSLog(@"ColorControl.EnhancedCurrentHue response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -57905,29 +57052,27 @@ class SubscribeAttributePressureMeasurementMaxMeasuredValue : public SubscribeAt
 };
 
 /*
- * Attribute Tolerance
+ * Attribute EnhancedColorMode
  */
-class ReadPressureMeasurementTolerance : public ReadAttribute {
+class ReadColorControlEnhancedColorMode : public ReadAttribute {
 public:
-    ReadPressureMeasurementTolerance()
-        : ReadAttribute("tolerance")
+    ReadColorControlEnhancedColorMode()
+        : ReadAttribute("enhanced-color-mode")
     {
     }
 
-    ~ReadPressureMeasurementTolerance() {}
+    ~ReadColorControlEnhancedColorMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00004001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeToleranceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PressureMeasurement.Tolerance response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeEnhancedColorModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.EnhancedColorMode response %@", [value description]);
             if (error != nil) {
-                LogNSError("PressureMeasurement Tolerance read Error", error);
+                LogNSError("ColorControl EnhancedColorMode read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -57935,34 +57080,32 @@ class ReadPressureMeasurementTolerance : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePressureMeasurementTolerance : public SubscribeAttribute {
+class SubscribeAttributeColorControlEnhancedColorMode : public SubscribeAttribute {
 public:
-    SubscribeAttributePressureMeasurementTolerance()
-        : SubscribeAttribute("tolerance")
+    SubscribeAttributeColorControlEnhancedColorMode()
+        : SubscribeAttribute("enhanced-color-mode")
     {
     }
 
-    ~SubscribeAttributePressureMeasurementTolerance() {}
+    ~SubscribeAttributeColorControlEnhancedColorMode() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00004001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeToleranceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeEnhancedColorModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PressureMeasurement.Tolerance response %@", [value description]);
+                NSLog(@"ColorControl.EnhancedColorMode response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -57973,29 +57116,27 @@ class SubscribeAttributePressureMeasurementTolerance : public SubscribeAttribute
 };
 
 /*
- * Attribute ScaledValue
+ * Attribute ColorLoopActive
  */
-class ReadPressureMeasurementScaledValue : public ReadAttribute {
+class ReadColorControlColorLoopActive : public ReadAttribute {
 public:
-    ReadPressureMeasurementScaledValue()
-        : ReadAttribute("scaled-value")
+    ReadColorControlColorLoopActive()
+        : ReadAttribute("color-loop-active")
     {
     }
 
-    ~ReadPressureMeasurementScaledValue() {}
+    ~ReadColorControlColorLoopActive() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00004002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeScaledValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PressureMeasurement.ScaledValue response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeColorLoopActiveWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.ColorLoopActive response %@", [value description]);
             if (error != nil) {
-                LogNSError("PressureMeasurement ScaledValue read Error", error);
+                LogNSError("ColorControl ColorLoopActive read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -58003,34 +57144,32 @@ class ReadPressureMeasurementScaledValue : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePressureMeasurementScaledValue : public SubscribeAttribute {
+class SubscribeAttributeColorControlColorLoopActive : public SubscribeAttribute {
 public:
-    SubscribeAttributePressureMeasurementScaledValue()
-        : SubscribeAttribute("scaled-value")
+    SubscribeAttributeColorControlColorLoopActive()
+        : SubscribeAttribute("color-loop-active")
     {
     }
 
-    ~SubscribeAttributePressureMeasurementScaledValue() {}
+    ~SubscribeAttributeColorControlColorLoopActive() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00004002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeScaledValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeColorLoopActiveWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PressureMeasurement.ScaledValue response %@", [value description]);
+                NSLog(@"ColorControl.ColorLoopActive response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -58041,29 +57180,27 @@ class SubscribeAttributePressureMeasurementScaledValue : public SubscribeAttribu
 };
 
 /*
- * Attribute MinScaledValue
+ * Attribute ColorLoopDirection
  */
-class ReadPressureMeasurementMinScaledValue : public ReadAttribute {
+class ReadColorControlColorLoopDirection : public ReadAttribute {
 public:
-    ReadPressureMeasurementMinScaledValue()
-        : ReadAttribute("min-scaled-value")
-    {
+    ReadColorControlColorLoopDirection()
+        : ReadAttribute("color-loop-direction")
+    {
     }
 
-    ~ReadPressureMeasurementMinScaledValue() {}
+    ~ReadColorControlColorLoopDirection() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00004003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeMinScaledValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PressureMeasurement.MinScaledValue response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeColorLoopDirectionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.ColorLoopDirection response %@", [value description]);
             if (error != nil) {
-                LogNSError("PressureMeasurement MinScaledValue read Error", error);
+                LogNSError("ColorControl ColorLoopDirection read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -58071,34 +57208,32 @@ class ReadPressureMeasurementMinScaledValue : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePressureMeasurementMinScaledValue : public SubscribeAttribute {
+class SubscribeAttributeColorControlColorLoopDirection : public SubscribeAttribute {
 public:
-    SubscribeAttributePressureMeasurementMinScaledValue()
-        : SubscribeAttribute("min-scaled-value")
+    SubscribeAttributeColorControlColorLoopDirection()
+        : SubscribeAttribute("color-loop-direction")
     {
     }
 
-    ~SubscribeAttributePressureMeasurementMinScaledValue() {}
+    ~SubscribeAttributeColorControlColorLoopDirection() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00004003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMinScaledValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeColorLoopDirectionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PressureMeasurement.MinScaledValue response %@", [value description]);
+                NSLog(@"ColorControl.ColorLoopDirection response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -58109,29 +57244,27 @@ class SubscribeAttributePressureMeasurementMinScaledValue : public SubscribeAttr
 };
 
 /*
- * Attribute MaxScaledValue
+ * Attribute ColorLoopTime
  */
-class ReadPressureMeasurementMaxScaledValue : public ReadAttribute {
+class ReadColorControlColorLoopTime : public ReadAttribute {
 public:
-    ReadPressureMeasurementMaxScaledValue()
-        : ReadAttribute("max-scaled-value")
+    ReadColorControlColorLoopTime()
+        : ReadAttribute("color-loop-time")
     {
     }
 
-    ~ReadPressureMeasurementMaxScaledValue() {}
+    ~ReadColorControlColorLoopTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00004004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeMaxScaledValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PressureMeasurement.MaxScaledValue response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeColorLoopTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.ColorLoopTime response %@", [value description]);
             if (error != nil) {
-                LogNSError("PressureMeasurement MaxScaledValue read Error", error);
+                LogNSError("ColorControl ColorLoopTime read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -58139,34 +57272,32 @@ class ReadPressureMeasurementMaxScaledValue : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePressureMeasurementMaxScaledValue : public SubscribeAttribute {
+class SubscribeAttributeColorControlColorLoopTime : public SubscribeAttribute {
 public:
-    SubscribeAttributePressureMeasurementMaxScaledValue()
-        : SubscribeAttribute("max-scaled-value")
+    SubscribeAttributeColorControlColorLoopTime()
+        : SubscribeAttribute("color-loop-time")
     {
     }
 
-    ~SubscribeAttributePressureMeasurementMaxScaledValue() {}
+    ~SubscribeAttributeColorControlColorLoopTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00004004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMaxScaledValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeColorLoopTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PressureMeasurement.MaxScaledValue response %@", [value description]);
+                NSLog(@"ColorControl.ColorLoopTime response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -58177,64 +57308,61 @@ class SubscribeAttributePressureMeasurementMaxScaledValue : public SubscribeAttr
 };
 
 /*
- * Attribute ScaledTolerance
+ * Attribute ColorLoopStartEnhancedHue
  */
-class ReadPressureMeasurementScaledTolerance : public ReadAttribute {
+class ReadColorControlColorLoopStartEnhancedHue : public ReadAttribute {
 public:
-    ReadPressureMeasurementScaledTolerance()
-        : ReadAttribute("scaled-tolerance")
+    ReadColorControlColorLoopStartEnhancedHue()
+        : ReadAttribute("color-loop-start-enhanced-hue")
     {
     }
 
-    ~ReadPressureMeasurementScaledTolerance() {}
+    ~ReadColorControlColorLoopStartEnhancedHue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00004005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeScaledToleranceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PressureMeasurement.ScaledTolerance response %@", [value description]);
-            if (error != nil) {
-                LogNSError("PressureMeasurement ScaledTolerance read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeColorLoopStartEnhancedHueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorLoopStartEnhancedHue response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("ColorControl ColorLoopStartEnhancedHue read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributePressureMeasurementScaledTolerance : public SubscribeAttribute {
+class SubscribeAttributeColorControlColorLoopStartEnhancedHue : public SubscribeAttribute {
 public:
-    SubscribeAttributePressureMeasurementScaledTolerance()
-        : SubscribeAttribute("scaled-tolerance")
+    SubscribeAttributeColorControlColorLoopStartEnhancedHue()
+        : SubscribeAttribute("color-loop-start-enhanced-hue")
     {
     }
 
-    ~SubscribeAttributePressureMeasurementScaledTolerance() {}
+    ~SubscribeAttributeColorControlColorLoopStartEnhancedHue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00004005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeScaledToleranceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeColorLoopStartEnhancedHueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PressureMeasurement.ScaledTolerance response %@", [value description]);
+                NSLog(@"ColorControl.ColorLoopStartEnhancedHue response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -58245,64 +57373,61 @@ class SubscribeAttributePressureMeasurementScaledTolerance : public SubscribeAtt
 };
 
 /*
- * Attribute Scale
+ * Attribute ColorLoopStoredEnhancedHue
  */
-class ReadPressureMeasurementScale : public ReadAttribute {
+class ReadColorControlColorLoopStoredEnhancedHue : public ReadAttribute {
 public:
-    ReadPressureMeasurementScale()
-        : ReadAttribute("scale")
+    ReadColorControlColorLoopStoredEnhancedHue()
+        : ReadAttribute("color-loop-stored-enhanced-hue")
     {
     }
 
-    ~ReadPressureMeasurementScale() {}
+    ~ReadColorControlColorLoopStoredEnhancedHue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x00000014) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00004006) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeScaleWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PressureMeasurement.Scale response %@", [value description]);
-            if (error != nil) {
-                LogNSError("PressureMeasurement Scale read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeColorLoopStoredEnhancedHueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorLoopStoredEnhancedHue response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("ColorControl ColorLoopStoredEnhancedHue read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributePressureMeasurementScale : public SubscribeAttribute {
+class SubscribeAttributeColorControlColorLoopStoredEnhancedHue : public SubscribeAttribute {
 public:
-    SubscribeAttributePressureMeasurementScale()
-        : SubscribeAttribute("scale")
+    SubscribeAttributeColorControlColorLoopStoredEnhancedHue()
+        : SubscribeAttribute("color-loop-stored-enhanced-hue")
     {
     }
 
-    ~SubscribeAttributePressureMeasurementScale() {}
+    ~SubscribeAttributeColorControlColorLoopStoredEnhancedHue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x00000014) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00004006) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeScaleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeColorLoopStoredEnhancedHueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PressureMeasurement.Scale response %@", [value description]);
+                NSLog(@"ColorControl.ColorLoopStoredEnhancedHue response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -58313,29 +57438,27 @@ class SubscribeAttributePressureMeasurementScale : public SubscribeAttribute {
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute ColorCapabilities
  */
-class ReadPressureMeasurementGeneratedCommandList : public ReadAttribute {
+class ReadColorControlColorCapabilities : public ReadAttribute {
 public:
-    ReadPressureMeasurementGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadColorControlColorCapabilities()
+        : ReadAttribute("color-capabilities")
     {
     }
 
-    ~ReadPressureMeasurementGeneratedCommandList() {}
+    ~ReadColorControlColorCapabilities() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000400A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PressureMeasurement.GeneratedCommandList response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeColorCapabilitiesWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.ColorCapabilities response %@", [value description]);
             if (error != nil) {
-                LogNSError("PressureMeasurement GeneratedCommandList read Error", error);
+                LogNSError("ColorControl ColorCapabilities read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -58343,34 +57466,32 @@ class ReadPressureMeasurementGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePressureMeasurementGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeColorControlColorCapabilities : public SubscribeAttribute {
 public:
-    SubscribeAttributePressureMeasurementGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeColorControlColorCapabilities()
+        : SubscribeAttribute("color-capabilities")
     {
     }
 
-    ~SubscribeAttributePressureMeasurementGeneratedCommandList() {}
+    ~SubscribeAttributeColorControlColorCapabilities() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000400A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeColorCapabilitiesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PressureMeasurement.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorCapabilities response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -58381,64 +57502,61 @@ class SubscribeAttributePressureMeasurementGeneratedCommandList : public Subscri
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute ColorTempPhysicalMinMireds
  */
-class ReadPressureMeasurementAcceptedCommandList : public ReadAttribute {
+class ReadColorControlColorTempPhysicalMinMireds : public ReadAttribute {
 public:
-    ReadPressureMeasurementAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadColorControlColorTempPhysicalMinMireds()
+        : ReadAttribute("color-temp-physical-min-mireds")
     {
     }
 
-    ~ReadPressureMeasurementAcceptedCommandList() {}
+    ~ReadColorControlColorTempPhysicalMinMireds() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000400B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PressureMeasurement.AcceptedCommandList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("PressureMeasurement AcceptedCommandList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeColorTempPhysicalMinMiredsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorTempPhysicalMinMireds response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("ColorControl ColorTempPhysicalMinMireds read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributePressureMeasurementAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeColorControlColorTempPhysicalMinMireds : public SubscribeAttribute {
 public:
-    SubscribeAttributePressureMeasurementAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeColorControlColorTempPhysicalMinMireds()
+        : SubscribeAttribute("color-temp-physical-min-mireds")
     {
     }
 
-    ~SubscribeAttributePressureMeasurementAcceptedCommandList() {}
+    ~SubscribeAttributeColorControlColorTempPhysicalMinMireds() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000400B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeColorTempPhysicalMinMiredsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PressureMeasurement.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorTempPhysicalMinMireds response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -58449,64 +57567,61 @@ class SubscribeAttributePressureMeasurementAcceptedCommandList : public Subscrib
 };
 
 /*
- * Attribute AttributeList
+ * Attribute ColorTempPhysicalMaxMireds
  */
-class ReadPressureMeasurementAttributeList : public ReadAttribute {
+class ReadColorControlColorTempPhysicalMaxMireds : public ReadAttribute {
 public:
-    ReadPressureMeasurementAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadColorControlColorTempPhysicalMaxMireds()
+        : ReadAttribute("color-temp-physical-max-mireds")
     {
     }
 
-    ~ReadPressureMeasurementAttributeList() {}
+    ~ReadColorControlColorTempPhysicalMaxMireds() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000400C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PressureMeasurement.AttributeList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("PressureMeasurement AttributeList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeColorTempPhysicalMaxMiredsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorTempPhysicalMaxMireds response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("ColorControl ColorTempPhysicalMaxMireds read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributePressureMeasurementAttributeList : public SubscribeAttribute {
+class SubscribeAttributeColorControlColorTempPhysicalMaxMireds : public SubscribeAttribute {
 public:
-    SubscribeAttributePressureMeasurementAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeColorControlColorTempPhysicalMaxMireds()
+        : SubscribeAttribute("color-temp-physical-max-mireds")
     {
     }
 
-    ~SubscribeAttributePressureMeasurementAttributeList() {}
+    ~SubscribeAttributeColorControlColorTempPhysicalMaxMireds() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000400C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeColorTempPhysicalMaxMiredsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PressureMeasurement.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.ColorTempPhysicalMaxMireds response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -58517,29 +57632,28 @@ class SubscribeAttributePressureMeasurementAttributeList : public SubscribeAttri
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute CoupleColorTempToLevelMinMireds
  */
-class ReadPressureMeasurementFeatureMap : public ReadAttribute {
+class ReadColorControlCoupleColorTempToLevelMinMireds : public ReadAttribute {
 public:
-    ReadPressureMeasurementFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadColorControlCoupleColorTempToLevelMinMireds()
+        : ReadAttribute("couple-color-temp-to-level-min-mireds")
     {
     }
 
-    ~ReadPressureMeasurementFeatureMap() {}
+    ~ReadColorControlCoupleColorTempToLevelMinMireds() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000400D) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PressureMeasurement.FeatureMap response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCoupleColorTempToLevelMinMiredsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.CoupleColorTempToLevelMinMireds response %@", [value description]);
             if (error != nil) {
-                LogNSError("PressureMeasurement FeatureMap read Error", error);
+                LogNSError("ColorControl CoupleColorTempToLevelMinMireds read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -58547,34 +57661,32 @@ class ReadPressureMeasurementFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePressureMeasurementFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeColorControlCoupleColorTempToLevelMinMireds : public SubscribeAttribute {
 public:
-    SubscribeAttributePressureMeasurementFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeColorControlCoupleColorTempToLevelMinMireds()
+        : SubscribeAttribute("couple-color-temp-to-level-min-mireds")
     {
     }
 
-    ~SubscribeAttributePressureMeasurementFeatureMap() {}
+    ~SubscribeAttributeColorControlCoupleColorTempToLevelMinMireds() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000400D) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCoupleColorTempToLevelMinMiredsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PressureMeasurement.FeatureMap response %@", [value description]);
+                NSLog(@"ColorControl.CoupleColorTempToLevelMinMireds response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -58585,29 +57697,28 @@ class SubscribeAttributePressureMeasurementFeatureMap : public SubscribeAttribut
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute StartUpColorTemperatureMireds
  */
-class ReadPressureMeasurementClusterRevision : public ReadAttribute {
+class ReadColorControlStartUpColorTemperatureMireds : public ReadAttribute {
 public:
-    ReadPressureMeasurementClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadColorControlStartUpColorTemperatureMireds()
+        : ReadAttribute("start-up-color-temperature-mireds")
     {
     }
 
-    ~ReadPressureMeasurementClusterRevision() {}
+    ~ReadColorControlStartUpColorTemperatureMireds() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x00004010) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PressureMeasurement.ClusterRevision response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeStartUpColorTemperatureMiredsWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.StartUpColorTemperatureMireds response %@", [value description]);
             if (error != nil) {
-                LogNSError("PressureMeasurement ClusterRevision read Error", error);
+                LogNSError("ColorControl StartUpColorTemperatureMireds read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -58615,34 +57726,71 @@ class ReadPressureMeasurementClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePressureMeasurementClusterRevision : public SubscribeAttribute {
+class WriteColorControlStartUpColorTemperatureMireds : public WriteAttribute {
 public:
-    SubscribeAttributePressureMeasurementClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    WriteColorControlStartUpColorTemperatureMireds()
+        : WriteAttribute("start-up-color-temperature-mireds")
     {
+        AddArgument("attr-name", "start-up-color-temperature-mireds");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributePressureMeasurementClusterRevision() {}
+    ~WriteColorControlStartUpColorTemperatureMireds() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) WriteAttribute (0x00004010) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster
+            writeAttributeStartUpColorTemperatureMiredsWithValue:value
+                                                          params:params
+                                               completionHandler:^(NSError * _Nullable error) {
+                                                   if (error != nil) {
+                                                       LogNSError("ColorControl StartUpColorTemperatureMireds write Error", error);
+                                                   }
+                                                   SetCommandExitStatus(error);
+                                               }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeColorControlStartUpColorTemperatureMireds : public SubscribeAttribute {
+public:
+    SubscribeAttributeColorControlStartUpColorTemperatureMireds()
+        : SubscribeAttribute("start-up-color-temperature-mireds")
+    {
+    }
+
+    ~SubscribeAttributeColorControlStartUpColorTemperatureMireds() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x00004010) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeStartUpColorTemperatureMiredsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PressureMeasurement.ClusterRevision response %@", [value description]);
+                NSLog(@"ColorControl.StartUpColorTemperatureMireds response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -58652,85 +57800,28 @@ class SubscribeAttributePressureMeasurementClusterRevision : public SubscribeAtt
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster PumpConfigurationAndControl                                 | 0x0200 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * MaxPressure                                                       | 0x0000 |
-| * MaxSpeed                                                          | 0x0001 |
-| * MaxFlow                                                           | 0x0002 |
-| * MinConstPressure                                                  | 0x0003 |
-| * MaxConstPressure                                                  | 0x0004 |
-| * MinCompPressure                                                   | 0x0005 |
-| * MaxCompPressure                                                   | 0x0006 |
-| * MinConstSpeed                                                     | 0x0007 |
-| * MaxConstSpeed                                                     | 0x0008 |
-| * MinConstFlow                                                      | 0x0009 |
-| * MaxConstFlow                                                      | 0x000A |
-| * MinConstTemp                                                      | 0x000B |
-| * MaxConstTemp                                                      | 0x000C |
-| * PumpStatus                                                        | 0x0010 |
-| * EffectiveOperationMode                                            | 0x0011 |
-| * EffectiveControlMode                                              | 0x0012 |
-| * Capacity                                                          | 0x0013 |
-| * Speed                                                             | 0x0014 |
-| * LifetimeRunningHours                                              | 0x0015 |
-| * Power                                                             | 0x0016 |
-| * LifetimeEnergyConsumed                                            | 0x0017 |
-| * OperationMode                                                     | 0x0020 |
-| * ControlMode                                                       | 0x0021 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-| * SupplyVoltageLow                                                  | 0x0000 |
-| * SupplyVoltageHigh                                                 | 0x0001 |
-| * PowerMissingPhase                                                 | 0x0002 |
-| * SystemPressureLow                                                 | 0x0003 |
-| * SystemPressureHigh                                                | 0x0004 |
-| * DryRunning                                                        | 0x0005 |
-| * MotorTemperatureHigh                                              | 0x0006 |
-| * PumpMotorFatalFailure                                             | 0x0007 |
-| * ElectronicTemperatureHigh                                         | 0x0008 |
-| * PumpBlocked                                                       | 0x0009 |
-| * SensorFailure                                                     | 0x000A |
-| * ElectronicNonFatalFailure                                         | 0x000B |
-| * ElectronicFatalFailure                                            | 0x000C |
-| * GeneralFault                                                      | 0x000D |
-| * Leakage                                                           | 0x000E |
-| * AirDetection                                                      | 0x000F |
-| * TurbineOperation                                                  | 0x0010 |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Attribute MaxPressure
+ * Attribute GeneratedCommandList
  */
-class ReadPumpConfigurationAndControlMaxPressure : public ReadAttribute {
+class ReadColorControlGeneratedCommandList : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlMaxPressure()
-        : ReadAttribute("max-pressure")
+    ReadColorControlGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadPumpConfigurationAndControlMaxPressure() {}
+    ~ReadColorControlGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeMaxPressureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.MaxPressure response %@", [value description]);
-            if (error != nil) {
-                LogNSError("PumpConfigurationAndControl MaxPressure read Error", error);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.GeneratedCommandList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ColorControl GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -58738,34 +57829,32 @@ class ReadPumpConfigurationAndControlMaxPressure : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePumpConfigurationAndControlMaxPressure : public SubscribeAttribute {
+class SubscribeAttributeColorControlGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlMaxPressure()
-        : SubscribeAttribute("max-pressure")
+    SubscribeAttributeColorControlGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlMaxPressure() {}
+    ~SubscribeAttributeColorControlGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMaxPressureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.MaxPressure response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -58776,29 +57865,27 @@ class SubscribeAttributePumpConfigurationAndControlMaxPressure : public Subscrib
 };
 
 /*
- * Attribute MaxSpeed
+ * Attribute AcceptedCommandList
  */
-class ReadPumpConfigurationAndControlMaxSpeed : public ReadAttribute {
+class ReadColorControlAcceptedCommandList : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlMaxSpeed()
-        : ReadAttribute("max-speed")
+    ReadColorControlAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadPumpConfigurationAndControlMaxSpeed() {}
+    ~ReadColorControlAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeMaxSpeedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.MaxSpeed response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl MaxSpeed read Error", error);
+                LogNSError("ColorControl AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -58806,34 +57893,32 @@ class ReadPumpConfigurationAndControlMaxSpeed : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePumpConfigurationAndControlMaxSpeed : public SubscribeAttribute {
+class SubscribeAttributeColorControlAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlMaxSpeed()
-        : SubscribeAttribute("max-speed")
+    SubscribeAttributeColorControlAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlMaxSpeed() {}
+    ~SubscribeAttributeColorControlAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMaxSpeedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.MaxSpeed response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -58844,29 +57929,27 @@ class SubscribeAttributePumpConfigurationAndControlMaxSpeed : public SubscribeAt
 };
 
 /*
- * Attribute MaxFlow
+ * Attribute AttributeList
  */
-class ReadPumpConfigurationAndControlMaxFlow : public ReadAttribute {
+class ReadColorControlAttributeList : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlMaxFlow()
-        : ReadAttribute("max-flow")
+    ReadColorControlAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadPumpConfigurationAndControlMaxFlow() {}
+    ~ReadColorControlAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeMaxFlowWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.MaxFlow response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl MaxFlow read Error", error);
+                LogNSError("ColorControl AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -58874,34 +57957,32 @@ class ReadPumpConfigurationAndControlMaxFlow : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePumpConfigurationAndControlMaxFlow : public SubscribeAttribute {
+class SubscribeAttributeColorControlAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlMaxFlow()
-        : SubscribeAttribute("max-flow")
+    SubscribeAttributeColorControlAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlMaxFlow() {}
+    ~SubscribeAttributeColorControlAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMaxFlowWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.MaxFlow response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ColorControl.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -58912,29 +57993,27 @@ class SubscribeAttributePumpConfigurationAndControlMaxFlow : public SubscribeAtt
 };
 
 /*
- * Attribute MinConstPressure
+ * Attribute FeatureMap
  */
-class ReadPumpConfigurationAndControlMinConstPressure : public ReadAttribute {
+class ReadColorControlFeatureMap : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlMinConstPressure()
-        : ReadAttribute("min-const-pressure")
+    ReadColorControlFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadPumpConfigurationAndControlMinConstPressure() {}
+    ~ReadColorControlFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeMinConstPressureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.MinConstPressure response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl MinConstPressure read Error", error);
+                LogNSError("ColorControl FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -58942,34 +58021,32 @@ class ReadPumpConfigurationAndControlMinConstPressure : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePumpConfigurationAndControlMinConstPressure : public SubscribeAttribute {
+class SubscribeAttributeColorControlFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlMinConstPressure()
-        : SubscribeAttribute("min-const-pressure")
+    SubscribeAttributeColorControlFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlMinConstPressure() {}
+    ~SubscribeAttributeColorControlFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMinConstPressureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.MinConstPressure response %@", [value description]);
+                NSLog(@"ColorControl.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -58980,29 +58057,27 @@ class SubscribeAttributePumpConfigurationAndControlMinConstPressure : public Sub
 };
 
 /*
- * Attribute MaxConstPressure
+ * Attribute ClusterRevision
  */
-class ReadPumpConfigurationAndControlMaxConstPressure : public ReadAttribute {
+class ReadColorControlClusterRevision : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlMaxConstPressure()
-        : ReadAttribute("max-const-pressure")
+    ReadColorControlClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadPumpConfigurationAndControlMaxConstPressure() {}
+    ~ReadColorControlClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeMaxConstPressureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.MaxConstPressure response %@", [value description]);
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ColorControl.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl MaxConstPressure read Error", error);
+                LogNSError("ColorControl ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -59010,34 +58085,32 @@ class ReadPumpConfigurationAndControlMaxConstPressure : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePumpConfigurationAndControlMaxConstPressure : public SubscribeAttribute {
+class SubscribeAttributeColorControlClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlMaxConstPressure()
-        : SubscribeAttribute("max-const-pressure")
+    SubscribeAttributeColorControlClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlMaxConstPressure() {}
+    ~SubscribeAttributeColorControlClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000300) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMaxConstPressureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.MaxConstPressure response %@", [value description]);
+                NSLog(@"ColorControl.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -59047,30 +58120,50 @@ class SubscribeAttributePumpConfigurationAndControlMaxConstPressure : public Sub
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster IlluminanceMeasurement                                      | 0x0400 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * MeasuredValue                                                     | 0x0000 |
+| * MinMeasuredValue                                                  | 0x0001 |
+| * MaxMeasuredValue                                                  | 0x0002 |
+| * Tolerance                                                         | 0x0003 |
+| * LightSensorType                                                   | 0x0004 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute MinCompPressure
+ * Attribute MeasuredValue
  */
-class ReadPumpConfigurationAndControlMinCompPressure : public ReadAttribute {
+class ReadIlluminanceMeasurementMeasuredValue : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlMinCompPressure()
-        : ReadAttribute("min-comp-pressure")
+    ReadIlluminanceMeasurementMeasuredValue()
+        : ReadAttribute("measured-value")
     {
     }
 
-    ~ReadPumpConfigurationAndControlMinCompPressure() {}
+    ~ReadIlluminanceMeasurementMeasuredValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeMinCompPressureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.MinCompPressure response %@", [value description]);
+        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"IlluminanceMeasurement.MeasuredValue response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl MinCompPressure read Error", error);
+                LogNSError("IlluminanceMeasurement MeasuredValue read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -59078,34 +58171,34 @@ class ReadPumpConfigurationAndControlMinCompPressure : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePumpConfigurationAndControlMinCompPressure : public SubscribeAttribute {
+class SubscribeAttributeIlluminanceMeasurementMeasuredValue : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlMinCompPressure()
-        : SubscribeAttribute("min-comp-pressure")
+    SubscribeAttributeIlluminanceMeasurementMeasuredValue()
+        : SubscribeAttribute("measured-value")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlMinCompPressure() {}
+    ~SubscribeAttributeIlluminanceMeasurementMeasuredValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMinCompPressureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.MinCompPressure response %@", [value description]);
+                NSLog(@"IlluminanceMeasurement.MeasuredValue response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -59116,29 +58209,29 @@ class SubscribeAttributePumpConfigurationAndControlMinCompPressure : public Subs
 };
 
 /*
- * Attribute MaxCompPressure
+ * Attribute MinMeasuredValue
  */
-class ReadPumpConfigurationAndControlMaxCompPressure : public ReadAttribute {
+class ReadIlluminanceMeasurementMinMeasuredValue : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlMaxCompPressure()
-        : ReadAttribute("max-comp-pressure")
+    ReadIlluminanceMeasurementMinMeasuredValue()
+        : ReadAttribute("min-measured-value")
     {
     }
 
-    ~ReadPumpConfigurationAndControlMaxCompPressure() {}
+    ~ReadIlluminanceMeasurementMinMeasuredValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeMaxCompPressureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.MaxCompPressure response %@", [value description]);
+        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeMinMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"IlluminanceMeasurement.MinMeasuredValue response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl MaxCompPressure read Error", error);
+                LogNSError("IlluminanceMeasurement MinMeasuredValue read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -59146,34 +58239,34 @@ class ReadPumpConfigurationAndControlMaxCompPressure : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePumpConfigurationAndControlMaxCompPressure : public SubscribeAttribute {
+class SubscribeAttributeIlluminanceMeasurementMinMeasuredValue : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlMaxCompPressure()
-        : SubscribeAttribute("max-comp-pressure")
+    SubscribeAttributeIlluminanceMeasurementMinMeasuredValue()
+        : SubscribeAttribute("min-measured-value")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlMaxCompPressure() {}
+    ~SubscribeAttributeIlluminanceMeasurementMinMeasuredValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMaxCompPressureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMinMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.MaxCompPressure response %@", [value description]);
+                NSLog(@"IlluminanceMeasurement.MinMeasuredValue response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -59184,29 +58277,29 @@ class SubscribeAttributePumpConfigurationAndControlMaxCompPressure : public Subs
 };
 
 /*
- * Attribute MinConstSpeed
+ * Attribute MaxMeasuredValue
  */
-class ReadPumpConfigurationAndControlMinConstSpeed : public ReadAttribute {
+class ReadIlluminanceMeasurementMaxMeasuredValue : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlMinConstSpeed()
-        : ReadAttribute("min-const-speed")
+    ReadIlluminanceMeasurementMaxMeasuredValue()
+        : ReadAttribute("max-measured-value")
     {
     }
 
-    ~ReadPumpConfigurationAndControlMinConstSpeed() {}
+    ~ReadIlluminanceMeasurementMaxMeasuredValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeMinConstSpeedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.MinConstSpeed response %@", [value description]);
+        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeMaxMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"IlluminanceMeasurement.MaxMeasuredValue response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl MinConstSpeed read Error", error);
+                LogNSError("IlluminanceMeasurement MaxMeasuredValue read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -59214,34 +58307,34 @@ class ReadPumpConfigurationAndControlMinConstSpeed : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePumpConfigurationAndControlMinConstSpeed : public SubscribeAttribute {
+class SubscribeAttributeIlluminanceMeasurementMaxMeasuredValue : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlMinConstSpeed()
-        : SubscribeAttribute("min-const-speed")
+    SubscribeAttributeIlluminanceMeasurementMaxMeasuredValue()
+        : SubscribeAttribute("max-measured-value")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlMinConstSpeed() {}
+    ~SubscribeAttributeIlluminanceMeasurementMaxMeasuredValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMinConstSpeedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMaxMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.MinConstSpeed response %@", [value description]);
+                NSLog(@"IlluminanceMeasurement.MaxMeasuredValue response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -59252,29 +58345,29 @@ class SubscribeAttributePumpConfigurationAndControlMinConstSpeed : public Subscr
 };
 
 /*
- * Attribute MaxConstSpeed
+ * Attribute Tolerance
  */
-class ReadPumpConfigurationAndControlMaxConstSpeed : public ReadAttribute {
+class ReadIlluminanceMeasurementTolerance : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlMaxConstSpeed()
-        : ReadAttribute("max-const-speed")
+    ReadIlluminanceMeasurementTolerance()
+        : ReadAttribute("tolerance")
     {
     }
 
-    ~ReadPumpConfigurationAndControlMaxConstSpeed() {}
+    ~ReadIlluminanceMeasurementTolerance() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeMaxConstSpeedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.MaxConstSpeed response %@", [value description]);
+        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeToleranceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"IlluminanceMeasurement.Tolerance response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl MaxConstSpeed read Error", error);
+                LogNSError("IlluminanceMeasurement Tolerance read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -59282,34 +58375,34 @@ class ReadPumpConfigurationAndControlMaxConstSpeed : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePumpConfigurationAndControlMaxConstSpeed : public SubscribeAttribute {
+class SubscribeAttributeIlluminanceMeasurementTolerance : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlMaxConstSpeed()
-        : SubscribeAttribute("max-const-speed")
+    SubscribeAttributeIlluminanceMeasurementTolerance()
+        : SubscribeAttribute("tolerance")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlMaxConstSpeed() {}
+    ~SubscribeAttributeIlluminanceMeasurementTolerance() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMaxConstSpeedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeToleranceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.MaxConstSpeed response %@", [value description]);
+                NSLog(@"IlluminanceMeasurement.Tolerance response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -59320,29 +58413,29 @@ class SubscribeAttributePumpConfigurationAndControlMaxConstSpeed : public Subscr
 };
 
 /*
- * Attribute MinConstFlow
+ * Attribute LightSensorType
  */
-class ReadPumpConfigurationAndControlMinConstFlow : public ReadAttribute {
+class ReadIlluminanceMeasurementLightSensorType : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlMinConstFlow()
-        : ReadAttribute("min-const-flow")
+    ReadIlluminanceMeasurementLightSensorType()
+        : ReadAttribute("light-sensor-type")
     {
     }
 
-    ~ReadPumpConfigurationAndControlMinConstFlow() {}
+    ~ReadIlluminanceMeasurementLightSensorType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeMinConstFlowWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.MinConstFlow response %@", [value description]);
+        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeLightSensorTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"IlluminanceMeasurement.LightSensorType response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl MinConstFlow read Error", error);
+                LogNSError("IlluminanceMeasurement LightSensorType read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -59350,34 +58443,34 @@ class ReadPumpConfigurationAndControlMinConstFlow : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePumpConfigurationAndControlMinConstFlow : public SubscribeAttribute {
+class SubscribeAttributeIlluminanceMeasurementLightSensorType : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlMinConstFlow()
-        : SubscribeAttribute("min-const-flow")
+    SubscribeAttributeIlluminanceMeasurementLightSensorType()
+        : SubscribeAttribute("light-sensor-type")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlMinConstFlow() {}
+    ~SubscribeAttributeIlluminanceMeasurementLightSensorType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReportAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMinConstFlowWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeLightSensorTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.MinConstFlow response %@", [value description]);
+                NSLog(@"IlluminanceMeasurement.LightSensorType response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -59388,29 +58481,29 @@ class SubscribeAttributePumpConfigurationAndControlMinConstFlow : public Subscri
 };
 
 /*
- * Attribute MaxConstFlow
+ * Attribute GeneratedCommandList
  */
-class ReadPumpConfigurationAndControlMaxConstFlow : public ReadAttribute {
+class ReadIlluminanceMeasurementGeneratedCommandList : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlMaxConstFlow()
-        : ReadAttribute("max-const-flow")
+    ReadIlluminanceMeasurementGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadPumpConfigurationAndControlMaxConstFlow() {}
+    ~ReadIlluminanceMeasurementGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x0000000A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeMaxConstFlowWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.MaxConstFlow response %@", [value description]);
+        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"IlluminanceMeasurement.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl MaxConstFlow read Error", error);
+                LogNSError("IlluminanceMeasurement GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -59418,34 +58511,34 @@ class ReadPumpConfigurationAndControlMaxConstFlow : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePumpConfigurationAndControlMaxConstFlow : public SubscribeAttribute {
+class SubscribeAttributeIlluminanceMeasurementGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlMaxConstFlow()
-        : SubscribeAttribute("max-const-flow")
+    SubscribeAttributeIlluminanceMeasurementGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlMaxConstFlow() {}
+    ~SubscribeAttributeIlluminanceMeasurementGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x0000000A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMaxConstFlowWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.MaxConstFlow response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"IlluminanceMeasurement.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -59456,29 +58549,29 @@ class SubscribeAttributePumpConfigurationAndControlMaxConstFlow : public Subscri
 };
 
 /*
- * Attribute MinConstTemp
+ * Attribute AcceptedCommandList
  */
-class ReadPumpConfigurationAndControlMinConstTemp : public ReadAttribute {
+class ReadIlluminanceMeasurementAcceptedCommandList : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlMinConstTemp()
-        : ReadAttribute("min-const-temp")
+    ReadIlluminanceMeasurementAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadPumpConfigurationAndControlMinConstTemp() {}
+    ~ReadIlluminanceMeasurementAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x0000000B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeMinConstTempWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.MinConstTemp response %@", [value description]);
+        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"IlluminanceMeasurement.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl MinConstTemp read Error", error);
+                LogNSError("IlluminanceMeasurement AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -59486,34 +58579,34 @@ class ReadPumpConfigurationAndControlMinConstTemp : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePumpConfigurationAndControlMinConstTemp : public SubscribeAttribute {
+class SubscribeAttributeIlluminanceMeasurementAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlMinConstTemp()
-        : SubscribeAttribute("min-const-temp")
+    SubscribeAttributeIlluminanceMeasurementAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlMinConstTemp() {}
+    ~SubscribeAttributeIlluminanceMeasurementAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x0000000B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMinConstTempWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.MinConstTemp response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"IlluminanceMeasurement.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -59524,29 +58617,29 @@ class SubscribeAttributePumpConfigurationAndControlMinConstTemp : public Subscri
 };
 
 /*
- * Attribute MaxConstTemp
+ * Attribute AttributeList
  */
-class ReadPumpConfigurationAndControlMaxConstTemp : public ReadAttribute {
+class ReadIlluminanceMeasurementAttributeList : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlMaxConstTemp()
-        : ReadAttribute("max-const-temp")
+    ReadIlluminanceMeasurementAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadPumpConfigurationAndControlMaxConstTemp() {}
+    ~ReadIlluminanceMeasurementAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x0000000C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeMaxConstTempWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.MaxConstTemp response %@", [value description]);
+        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"IlluminanceMeasurement.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl MaxConstTemp read Error", error);
+                LogNSError("IlluminanceMeasurement AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -59554,34 +58647,34 @@ class ReadPumpConfigurationAndControlMaxConstTemp : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePumpConfigurationAndControlMaxConstTemp : public SubscribeAttribute {
+class SubscribeAttributeIlluminanceMeasurementAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlMaxConstTemp()
-        : SubscribeAttribute("max-const-temp")
+    SubscribeAttributeIlluminanceMeasurementAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlMaxConstTemp() {}
+    ~SubscribeAttributeIlluminanceMeasurementAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x0000000C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMaxConstTempWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.MaxConstTemp response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"IlluminanceMeasurement.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -59592,29 +58685,29 @@ class SubscribeAttributePumpConfigurationAndControlMaxConstTemp : public Subscri
 };
 
 /*
- * Attribute PumpStatus
+ * Attribute FeatureMap
  */
-class ReadPumpConfigurationAndControlPumpStatus : public ReadAttribute {
+class ReadIlluminanceMeasurementFeatureMap : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlPumpStatus()
-        : ReadAttribute("pump-status")
+    ReadIlluminanceMeasurementFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadPumpConfigurationAndControlPumpStatus() {}
+    ~ReadIlluminanceMeasurementFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributePumpStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.PumpStatus response %@", [value description]);
+        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"IlluminanceMeasurement.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl PumpStatus read Error", error);
+                LogNSError("IlluminanceMeasurement FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -59622,34 +58715,34 @@ class ReadPumpConfigurationAndControlPumpStatus : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePumpConfigurationAndControlPumpStatus : public SubscribeAttribute {
+class SubscribeAttributeIlluminanceMeasurementFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlPumpStatus()
-        : SubscribeAttribute("pump-status")
+    SubscribeAttributeIlluminanceMeasurementFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlPumpStatus() {}
+    ~SubscribeAttributeIlluminanceMeasurementFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePumpStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.PumpStatus response %@", [value description]);
+                NSLog(@"IlluminanceMeasurement.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -59660,29 +58753,29 @@ class SubscribeAttributePumpConfigurationAndControlPumpStatus : public Subscribe
 };
 
 /*
- * Attribute EffectiveOperationMode
+ * Attribute ClusterRevision
  */
-class ReadPumpConfigurationAndControlEffectiveOperationMode : public ReadAttribute {
+class ReadIlluminanceMeasurementClusterRevision : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlEffectiveOperationMode()
-        : ReadAttribute("effective-operation-mode")
+    ReadIlluminanceMeasurementClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadPumpConfigurationAndControlEffectiveOperationMode() {}
+    ~ReadIlluminanceMeasurementClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeEffectiveOperationModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.EffectiveOperationMode response %@", [value description]);
+        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"IlluminanceMeasurement.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl EffectiveOperationMode read Error", error);
+                LogNSError("IlluminanceMeasurement ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -59690,34 +58783,34 @@ class ReadPumpConfigurationAndControlEffectiveOperationMode : public ReadAttribu
     }
 };
 
-class SubscribeAttributePumpConfigurationAndControlEffectiveOperationMode : public SubscribeAttribute {
+class SubscribeAttributeIlluminanceMeasurementClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlEffectiveOperationMode()
-        : SubscribeAttribute("effective-operation-mode")
+    SubscribeAttributeIlluminanceMeasurementClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlEffectiveOperationMode() {}
+    ~SubscribeAttributeIlluminanceMeasurementClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000400) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPIlluminanceMeasurement * cluster = [[CHIPIlluminanceMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeEffectiveOperationModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.EffectiveOperationMode response %@", [value description]);
+                NSLog(@"IlluminanceMeasurement.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -59727,30 +58820,49 @@ class SubscribeAttributePumpConfigurationAndControlEffectiveOperationMode : publ
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster TemperatureMeasurement                                      | 0x0402 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * MeasuredValue                                                     | 0x0000 |
+| * MinMeasuredValue                                                  | 0x0001 |
+| * MaxMeasuredValue                                                  | 0x0002 |
+| * Tolerance                                                         | 0x0003 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute EffectiveControlMode
+ * Attribute MeasuredValue
  */
-class ReadPumpConfigurationAndControlEffectiveControlMode : public ReadAttribute {
+class ReadTemperatureMeasurementMeasuredValue : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlEffectiveControlMode()
-        : ReadAttribute("effective-control-mode")
+    ReadTemperatureMeasurementMeasuredValue()
+        : ReadAttribute("measured-value")
     {
     }
 
-    ~ReadPumpConfigurationAndControlEffectiveControlMode() {}
+    ~ReadTemperatureMeasurementMeasuredValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeEffectiveControlModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.EffectiveControlMode response %@", [value description]);
+        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TemperatureMeasurement.MeasuredValue response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl EffectiveControlMode read Error", error);
+                LogNSError("TemperatureMeasurement MeasuredValue read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -59758,34 +58870,34 @@ class ReadPumpConfigurationAndControlEffectiveControlMode : public ReadAttribute
     }
 };
 
-class SubscribeAttributePumpConfigurationAndControlEffectiveControlMode : public SubscribeAttribute {
+class SubscribeAttributeTemperatureMeasurementMeasuredValue : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlEffectiveControlMode()
-        : SubscribeAttribute("effective-control-mode")
+    SubscribeAttributeTemperatureMeasurementMeasuredValue()
+        : SubscribeAttribute("measured-value")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlEffectiveControlMode() {}
+    ~SubscribeAttributeTemperatureMeasurementMeasuredValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeEffectiveControlModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.EffectiveControlMode response %@", [value description]);
+                NSLog(@"TemperatureMeasurement.MeasuredValue response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -59796,29 +58908,29 @@ class SubscribeAttributePumpConfigurationAndControlEffectiveControlMode : public
 };
 
 /*
- * Attribute Capacity
+ * Attribute MinMeasuredValue
  */
-class ReadPumpConfigurationAndControlCapacity : public ReadAttribute {
+class ReadTemperatureMeasurementMinMeasuredValue : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlCapacity()
-        : ReadAttribute("capacity")
+    ReadTemperatureMeasurementMinMeasuredValue()
+        : ReadAttribute("min-measured-value")
     {
     }
 
-    ~ReadPumpConfigurationAndControlCapacity() {}
+    ~ReadTemperatureMeasurementMinMeasuredValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeCapacityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.Capacity response %@", [value description]);
+        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeMinMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TemperatureMeasurement.MinMeasuredValue response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl Capacity read Error", error);
+                LogNSError("TemperatureMeasurement MinMeasuredValue read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -59826,34 +58938,34 @@ class ReadPumpConfigurationAndControlCapacity : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePumpConfigurationAndControlCapacity : public SubscribeAttribute {
+class SubscribeAttributeTemperatureMeasurementMinMeasuredValue : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlCapacity()
-        : SubscribeAttribute("capacity")
+    SubscribeAttributeTemperatureMeasurementMinMeasuredValue()
+        : SubscribeAttribute("min-measured-value")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlCapacity() {}
+    ~SubscribeAttributeTemperatureMeasurementMinMeasuredValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCapacityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMinMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.Capacity response %@", [value description]);
+                NSLog(@"TemperatureMeasurement.MinMeasuredValue response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -59864,29 +58976,29 @@ class SubscribeAttributePumpConfigurationAndControlCapacity : public SubscribeAt
 };
 
 /*
- * Attribute Speed
+ * Attribute MaxMeasuredValue
  */
-class ReadPumpConfigurationAndControlSpeed : public ReadAttribute {
+class ReadTemperatureMeasurementMaxMeasuredValue : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlSpeed()
-        : ReadAttribute("speed")
+    ReadTemperatureMeasurementMaxMeasuredValue()
+        : ReadAttribute("max-measured-value")
     {
     }
 
-    ~ReadPumpConfigurationAndControlSpeed() {}
+    ~ReadTemperatureMeasurementMaxMeasuredValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000014) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeSpeedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.Speed response %@", [value description]);
+        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeMaxMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TemperatureMeasurement.MaxMeasuredValue response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl Speed read Error", error);
+                LogNSError("TemperatureMeasurement MaxMeasuredValue read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -59894,34 +59006,34 @@ class ReadPumpConfigurationAndControlSpeed : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePumpConfigurationAndControlSpeed : public SubscribeAttribute {
+class SubscribeAttributeTemperatureMeasurementMaxMeasuredValue : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlSpeed()
-        : SubscribeAttribute("speed")
+    SubscribeAttributeTemperatureMeasurementMaxMeasuredValue()
+        : SubscribeAttribute("max-measured-value")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlSpeed() {}
+    ~SubscribeAttributeTemperatureMeasurementMaxMeasuredValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000014) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSpeedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMaxMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.Speed response %@", [value description]);
+                NSLog(@"TemperatureMeasurement.MaxMeasuredValue response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -59932,29 +59044,29 @@ class SubscribeAttributePumpConfigurationAndControlSpeed : public SubscribeAttri
 };
 
 /*
- * Attribute LifetimeRunningHours
+ * Attribute Tolerance
  */
-class ReadPumpConfigurationAndControlLifetimeRunningHours : public ReadAttribute {
+class ReadTemperatureMeasurementTolerance : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlLifetimeRunningHours()
-        : ReadAttribute("lifetime-running-hours")
+    ReadTemperatureMeasurementTolerance()
+        : ReadAttribute("tolerance")
     {
     }
 
-    ~ReadPumpConfigurationAndControlLifetimeRunningHours() {}
+    ~ReadTemperatureMeasurementTolerance() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000015) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeLifetimeRunningHoursWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.LifetimeRunningHours response %@", [value description]);
+        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeToleranceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TemperatureMeasurement.Tolerance response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl LifetimeRunningHours read Error", error);
+                LogNSError("TemperatureMeasurement Tolerance read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -59962,75 +59074,34 @@ class ReadPumpConfigurationAndControlLifetimeRunningHours : public ReadAttribute
     }
 };
 
-class WritePumpConfigurationAndControlLifetimeRunningHours : public WriteAttribute {
-public:
-    WritePumpConfigurationAndControlLifetimeRunningHours()
-        : WriteAttribute("lifetime-running-hours")
-    {
-        AddArgument("attr-name", "lifetime-running-hours");
-        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WritePumpConfigurationAndControlLifetimeRunningHours() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) WriteAttribute (0x00000015) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedInt:mValue];
-
-        [cluster
-            writeAttributeLifetimeRunningHoursWithValue:value
-                                                 params:params
-                                      completionHandler:^(NSError * _Nullable error) {
-                                          if (error != nil) {
-                                              LogNSError("PumpConfigurationAndControl LifetimeRunningHours write Error", error);
-                                          }
-                                          SetCommandExitStatus(error);
-                                      }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint32_t mValue;
-};
-
-class SubscribeAttributePumpConfigurationAndControlLifetimeRunningHours : public SubscribeAttribute {
+class SubscribeAttributeTemperatureMeasurementTolerance : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlLifetimeRunningHours()
-        : SubscribeAttribute("lifetime-running-hours")
+    SubscribeAttributeTemperatureMeasurementTolerance()
+        : SubscribeAttribute("tolerance")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlLifetimeRunningHours() {}
+    ~SubscribeAttributeTemperatureMeasurementTolerance() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000015) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLifetimeRunningHoursWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeToleranceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.LifetimeRunningHours response %@", [value description]);
+                NSLog(@"TemperatureMeasurement.Tolerance response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -60041,29 +59112,29 @@ class SubscribeAttributePumpConfigurationAndControlLifetimeRunningHours : public
 };
 
 /*
- * Attribute Power
+ * Attribute GeneratedCommandList
  */
-class ReadPumpConfigurationAndControlPower : public ReadAttribute {
+class ReadTemperatureMeasurementGeneratedCommandList : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlPower()
-        : ReadAttribute("power")
+    ReadTemperatureMeasurementGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadPumpConfigurationAndControlPower() {}
+    ~ReadTemperatureMeasurementGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000016) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributePowerWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.Power response %@", [value description]);
+        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TemperatureMeasurement.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl Power read Error", error);
+                LogNSError("TemperatureMeasurement GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -60071,34 +59142,34 @@ class ReadPumpConfigurationAndControlPower : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePumpConfigurationAndControlPower : public SubscribeAttribute {
+class SubscribeAttributeTemperatureMeasurementGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlPower()
-        : SubscribeAttribute("power")
+    SubscribeAttributeTemperatureMeasurementGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlPower() {}
+    ~SubscribeAttributeTemperatureMeasurementGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000016) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.Power response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TemperatureMeasurement.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -60109,29 +59180,29 @@ class SubscribeAttributePumpConfigurationAndControlPower : public SubscribeAttri
 };
 
 /*
- * Attribute LifetimeEnergyConsumed
+ * Attribute AcceptedCommandList
  */
-class ReadPumpConfigurationAndControlLifetimeEnergyConsumed : public ReadAttribute {
+class ReadTemperatureMeasurementAcceptedCommandList : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlLifetimeEnergyConsumed()
-        : ReadAttribute("lifetime-energy-consumed")
+    ReadTemperatureMeasurementAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadPumpConfigurationAndControlLifetimeEnergyConsumed() {}
+    ~ReadTemperatureMeasurementAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeLifetimeEnergyConsumedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.LifetimeEnergyConsumed response %@", [value description]);
+        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TemperatureMeasurement.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl LifetimeEnergyConsumed read Error", error);
+                LogNSError("TemperatureMeasurement AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -60139,75 +59210,34 @@ class ReadPumpConfigurationAndControlLifetimeEnergyConsumed : public ReadAttribu
     }
 };
 
-class WritePumpConfigurationAndControlLifetimeEnergyConsumed : public WriteAttribute {
-public:
-    WritePumpConfigurationAndControlLifetimeEnergyConsumed()
-        : WriteAttribute("lifetime-energy-consumed")
-    {
-        AddArgument("attr-name", "lifetime-energy-consumed");
-        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WritePumpConfigurationAndControlLifetimeEnergyConsumed() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) WriteAttribute (0x00000017) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedInt:mValue];
-
-        [cluster
-            writeAttributeLifetimeEnergyConsumedWithValue:value
-                                                   params:params
-                                        completionHandler:^(NSError * _Nullable error) {
-                                            if (error != nil) {
-                                                LogNSError("PumpConfigurationAndControl LifetimeEnergyConsumed write Error", error);
-                                            }
-                                            SetCommandExitStatus(error);
-                                        }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint32_t mValue;
-};
-
-class SubscribeAttributePumpConfigurationAndControlLifetimeEnergyConsumed : public SubscribeAttribute {
+class SubscribeAttributeTemperatureMeasurementAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlLifetimeEnergyConsumed()
-        : SubscribeAttribute("lifetime-energy-consumed")
+    SubscribeAttributeTemperatureMeasurementAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlLifetimeEnergyConsumed() {}
+    ~SubscribeAttributeTemperatureMeasurementAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLifetimeEnergyConsumedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.LifetimeEnergyConsumed response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TemperatureMeasurement.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -60218,29 +59248,29 @@ class SubscribeAttributePumpConfigurationAndControlLifetimeEnergyConsumed : publ
 };
 
 /*
- * Attribute OperationMode
+ * Attribute AttributeList
  */
-class ReadPumpConfigurationAndControlOperationMode : public ReadAttribute {
+class ReadTemperatureMeasurementAttributeList : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlOperationMode()
-        : ReadAttribute("operation-mode")
+    ReadTemperatureMeasurementAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadPumpConfigurationAndControlOperationMode() {}
+    ~ReadTemperatureMeasurementAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000020) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeOperationModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.OperationMode response %@", [value description]);
+        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TemperatureMeasurement.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl OperationMode read Error", error);
+                LogNSError("TemperatureMeasurement AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -60248,74 +59278,34 @@ class ReadPumpConfigurationAndControlOperationMode : public ReadAttribute {
     }
 };
 
-class WritePumpConfigurationAndControlOperationMode : public WriteAttribute {
-public:
-    WritePumpConfigurationAndControlOperationMode()
-        : WriteAttribute("operation-mode")
-    {
-        AddArgument("attr-name", "operation-mode");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WritePumpConfigurationAndControlOperationMode() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) WriteAttribute (0x00000020) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeOperationModeWithValue:value
-                                               params:params
-                                    completionHandler:^(NSError * _Nullable error) {
-                                        if (error != nil) {
-                                            LogNSError("PumpConfigurationAndControl OperationMode write Error", error);
-                                        }
-                                        SetCommandExitStatus(error);
-                                    }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributePumpConfigurationAndControlOperationMode : public SubscribeAttribute {
+class SubscribeAttributeTemperatureMeasurementAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlOperationMode()
-        : SubscribeAttribute("operation-mode")
+    SubscribeAttributeTemperatureMeasurementAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlOperationMode() {}
+    ~SubscribeAttributeTemperatureMeasurementAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000020) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOperationModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.OperationMode response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TemperatureMeasurement.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -60326,29 +59316,29 @@ class SubscribeAttributePumpConfigurationAndControlOperationMode : public Subscr
 };
 
 /*
- * Attribute ControlMode
+ * Attribute FeatureMap
  */
-class ReadPumpConfigurationAndControlControlMode : public ReadAttribute {
+class ReadTemperatureMeasurementFeatureMap : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlControlMode()
-        : ReadAttribute("control-mode")
+    ReadTemperatureMeasurementFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadPumpConfigurationAndControlControlMode() {}
+    ~ReadTemperatureMeasurementFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x00000021) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeControlModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.ControlMode response %@", [value description]);
+        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TemperatureMeasurement.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl ControlMode read Error", error);
+                LogNSError("TemperatureMeasurement FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -60356,74 +59346,34 @@ class ReadPumpConfigurationAndControlControlMode : public ReadAttribute {
     }
 };
 
-class WritePumpConfigurationAndControlControlMode : public WriteAttribute {
-public:
-    WritePumpConfigurationAndControlControlMode()
-        : WriteAttribute("control-mode")
-    {
-        AddArgument("attr-name", "control-mode");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WritePumpConfigurationAndControlControlMode() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) WriteAttribute (0x00000021) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeControlModeWithValue:value
-                                             params:params
-                                  completionHandler:^(NSError * _Nullable error) {
-                                      if (error != nil) {
-                                          LogNSError("PumpConfigurationAndControl ControlMode write Error", error);
-                                      }
-                                      SetCommandExitStatus(error);
-                                  }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributePumpConfigurationAndControlControlMode : public SubscribeAttribute {
+class SubscribeAttributeTemperatureMeasurementFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlControlMode()
-        : SubscribeAttribute("control-mode")
+    SubscribeAttributeTemperatureMeasurementFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlControlMode() {}
+    ~SubscribeAttributeTemperatureMeasurementFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x00000021) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeControlModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.ControlMode response %@", [value description]);
+                NSLog(@"TemperatureMeasurement.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -60434,29 +59384,29 @@ class SubscribeAttributePumpConfigurationAndControlControlMode : public Subscrib
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute ClusterRevision
  */
-class ReadPumpConfigurationAndControlGeneratedCommandList : public ReadAttribute {
+class ReadTemperatureMeasurementClusterRevision : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadTemperatureMeasurementClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadPumpConfigurationAndControlGeneratedCommandList() {}
+    ~ReadTemperatureMeasurementClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.GeneratedCommandList response %@", [value description]);
+        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TemperatureMeasurement.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl GeneratedCommandList read Error", error);
+                LogNSError("TemperatureMeasurement ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -60464,34 +59414,34 @@ class ReadPumpConfigurationAndControlGeneratedCommandList : public ReadAttribute
     }
 };
 
-class SubscribeAttributePumpConfigurationAndControlGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeTemperatureMeasurementClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeTemperatureMeasurementClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlGeneratedCommandList() {}
+    ~SubscribeAttributeTemperatureMeasurementClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
+                                                                                         endpoint:endpointId
+                                                                                            queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TemperatureMeasurement.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -60501,30 +59451,54 @@ class SubscribeAttributePumpConfigurationAndControlGeneratedCommandList : public
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster PressureMeasurement                                         | 0x0403 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * MeasuredValue                                                     | 0x0000 |
+| * MinMeasuredValue                                                  | 0x0001 |
+| * MaxMeasuredValue                                                  | 0x0002 |
+| * Tolerance                                                         | 0x0003 |
+| * ScaledValue                                                       | 0x0010 |
+| * MinScaledValue                                                    | 0x0011 |
+| * MaxScaledValue                                                    | 0x0012 |
+| * ScaledTolerance                                                   | 0x0013 |
+| * Scale                                                             | 0x0014 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute AcceptedCommandList
+ * Attribute MeasuredValue
  */
-class ReadPumpConfigurationAndControlAcceptedCommandList : public ReadAttribute {
+class ReadPressureMeasurementMeasuredValue : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadPressureMeasurementMeasuredValue()
+        : ReadAttribute("measured-value")
     {
     }
 
-    ~ReadPumpConfigurationAndControlAcceptedCommandList() {}
+    ~ReadPressureMeasurementMeasuredValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.AcceptedCommandList response %@", [value description]);
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        [cluster readAttributeMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PressureMeasurement.MeasuredValue response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl AcceptedCommandList read Error", error);
+                LogNSError("PressureMeasurement MeasuredValue read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -60532,34 +59506,34 @@ class ReadPumpConfigurationAndControlAcceptedCommandList : public ReadAttribute
     }
 };
 
-class SubscribeAttributePumpConfigurationAndControlAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributePressureMeasurementMeasuredValue : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributePressureMeasurementMeasuredValue()
+        : SubscribeAttribute("measured-value")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlAcceptedCommandList() {}
+    ~SubscribeAttributePressureMeasurementMeasuredValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PressureMeasurement.MeasuredValue response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -60570,29 +59544,29 @@ class SubscribeAttributePumpConfigurationAndControlAcceptedCommandList : public
 };
 
 /*
- * Attribute AttributeList
+ * Attribute MinMeasuredValue
  */
-class ReadPumpConfigurationAndControlAttributeList : public ReadAttribute {
+class ReadPressureMeasurementMinMeasuredValue : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadPressureMeasurementMinMeasuredValue()
+        : ReadAttribute("min-measured-value")
     {
     }
 
-    ~ReadPumpConfigurationAndControlAttributeList() {}
+    ~ReadPressureMeasurementMinMeasuredValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.AttributeList response %@", [value description]);
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        [cluster readAttributeMinMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PressureMeasurement.MinMeasuredValue response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl AttributeList read Error", error);
+                LogNSError("PressureMeasurement MinMeasuredValue read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -60600,34 +59574,34 @@ class ReadPumpConfigurationAndControlAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePumpConfigurationAndControlAttributeList : public SubscribeAttribute {
+class SubscribeAttributePressureMeasurementMinMeasuredValue : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributePressureMeasurementMinMeasuredValue()
+        : SubscribeAttribute("min-measured-value")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlAttributeList() {}
+    ~SubscribeAttributePressureMeasurementMinMeasuredValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMinMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PressureMeasurement.MinMeasuredValue response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -60638,29 +59612,29 @@ class SubscribeAttributePumpConfigurationAndControlAttributeList : public Subscr
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute MaxMeasuredValue
  */
-class ReadPumpConfigurationAndControlFeatureMap : public ReadAttribute {
+class ReadPressureMeasurementMaxMeasuredValue : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadPressureMeasurementMaxMeasuredValue()
+        : ReadAttribute("max-measured-value")
     {
     }
 
-    ~ReadPumpConfigurationAndControlFeatureMap() {}
+    ~ReadPressureMeasurementMaxMeasuredValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.FeatureMap response %@", [value description]);
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        [cluster readAttributeMaxMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PressureMeasurement.MaxMeasuredValue response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl FeatureMap read Error", error);
+                LogNSError("PressureMeasurement MaxMeasuredValue read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -60668,34 +59642,34 @@ class ReadPumpConfigurationAndControlFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePumpConfigurationAndControlFeatureMap : public SubscribeAttribute {
+class SubscribeAttributePressureMeasurementMaxMeasuredValue : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributePressureMeasurementMaxMeasuredValue()
+        : SubscribeAttribute("max-measured-value")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlFeatureMap() {}
+    ~SubscribeAttributePressureMeasurementMaxMeasuredValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMaxMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.FeatureMap response %@", [value description]);
+                NSLog(@"PressureMeasurement.MaxMeasuredValue response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -60706,29 +59680,29 @@ class SubscribeAttributePumpConfigurationAndControlFeatureMap : public Subscribe
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute Tolerance
  */
-class ReadPumpConfigurationAndControlClusterRevision : public ReadAttribute {
+class ReadPressureMeasurementTolerance : public ReadAttribute {
 public:
-    ReadPumpConfigurationAndControlClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadPressureMeasurementTolerance()
+        : ReadAttribute("tolerance")
     {
     }
 
-    ~ReadPumpConfigurationAndControlClusterRevision() {}
+    ~ReadPressureMeasurementTolerance() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"PumpConfigurationAndControl.ClusterRevision response %@", [value description]);
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        [cluster readAttributeToleranceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PressureMeasurement.Tolerance response %@", [value description]);
             if (error != nil) {
-                LogNSError("PumpConfigurationAndControl ClusterRevision read Error", error);
+                LogNSError("PressureMeasurement Tolerance read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -60736,34 +59710,34 @@ class ReadPumpConfigurationAndControlClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributePumpConfigurationAndControlClusterRevision : public SubscribeAttribute {
+class SubscribeAttributePressureMeasurementTolerance : public SubscribeAttribute {
 public:
-    SubscribeAttributePumpConfigurationAndControlClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributePressureMeasurementTolerance()
+        : SubscribeAttribute("tolerance")
     {
     }
 
-    ~SubscribeAttributePumpConfigurationAndControlClusterRevision() {}
+    ~SubscribeAttributePressureMeasurementTolerance() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000200) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPPumpConfigurationAndControl * cluster = [[CHIPPumpConfigurationAndControl alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeToleranceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"PumpConfigurationAndControl.ClusterRevision response %@", [value description]);
+                NSLog(@"PressureMeasurement.Tolerance response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -60773,49 +59747,30 @@ class SubscribeAttributePumpConfigurationAndControlClusterRevision : public Subs
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster RelativeHumidityMeasurement                                 | 0x0405 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * MeasuredValue                                                     | 0x0000 |
-| * MinMeasuredValue                                                  | 0x0001 |
-| * MaxMeasuredValue                                                  | 0x0002 |
-| * Tolerance                                                         | 0x0003 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Attribute MeasuredValue
+ * Attribute ScaledValue
  */
-class ReadRelativeHumidityMeasurementMeasuredValue : public ReadAttribute {
+class ReadPressureMeasurementScaledValue : public ReadAttribute {
 public:
-    ReadRelativeHumidityMeasurementMeasuredValue()
-        : ReadAttribute("measured-value")
+    ReadPressureMeasurementScaledValue()
+        : ReadAttribute("scaled-value")
     {
     }
 
-    ~ReadRelativeHumidityMeasurementMeasuredValue() {}
+    ~ReadPressureMeasurementScaledValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x00000010) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RelativeHumidityMeasurement.MeasuredValue response %@", [value description]);
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        [cluster readAttributeScaledValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PressureMeasurement.ScaledValue response %@", [value description]);
             if (error != nil) {
-                LogNSError("RelativeHumidityMeasurement MeasuredValue read Error", error);
+                LogNSError("PressureMeasurement ScaledValue read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -60823,34 +59778,34 @@ class ReadRelativeHumidityMeasurementMeasuredValue : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRelativeHumidityMeasurementMeasuredValue : public SubscribeAttribute {
+class SubscribeAttributePressureMeasurementScaledValue : public SubscribeAttribute {
 public:
-    SubscribeAttributeRelativeHumidityMeasurementMeasuredValue()
-        : SubscribeAttribute("measured-value")
+    SubscribeAttributePressureMeasurementScaledValue()
+        : SubscribeAttribute("scaled-value")
     {
     }
 
-    ~SubscribeAttributeRelativeHumidityMeasurementMeasuredValue() {}
+    ~SubscribeAttributePressureMeasurementScaledValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x00000010) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeScaledValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RelativeHumidityMeasurement.MeasuredValue response %@", [value description]);
+                NSLog(@"PressureMeasurement.ScaledValue response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -60861,29 +59816,29 @@ class SubscribeAttributeRelativeHumidityMeasurementMeasuredValue : public Subscr
 };
 
 /*
- * Attribute MinMeasuredValue
+ * Attribute MinScaledValue
  */
-class ReadRelativeHumidityMeasurementMinMeasuredValue : public ReadAttribute {
+class ReadPressureMeasurementMinScaledValue : public ReadAttribute {
 public:
-    ReadRelativeHumidityMeasurementMinMeasuredValue()
-        : ReadAttribute("min-measured-value")
+    ReadPressureMeasurementMinScaledValue()
+        : ReadAttribute("min-scaled-value")
     {
     }
 
-    ~ReadRelativeHumidityMeasurementMinMeasuredValue() {}
+    ~ReadPressureMeasurementMinScaledValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x00000011) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeMinMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RelativeHumidityMeasurement.MinMeasuredValue response %@", [value description]);
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        [cluster readAttributeMinScaledValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PressureMeasurement.MinScaledValue response %@", [value description]);
             if (error != nil) {
-                LogNSError("RelativeHumidityMeasurement MinMeasuredValue read Error", error);
+                LogNSError("PressureMeasurement MinScaledValue read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -60891,34 +59846,34 @@ class ReadRelativeHumidityMeasurementMinMeasuredValue : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRelativeHumidityMeasurementMinMeasuredValue : public SubscribeAttribute {
+class SubscribeAttributePressureMeasurementMinScaledValue : public SubscribeAttribute {
 public:
-    SubscribeAttributeRelativeHumidityMeasurementMinMeasuredValue()
-        : SubscribeAttribute("min-measured-value")
-    {
+    SubscribeAttributePressureMeasurementMinScaledValue()
+        : SubscribeAttribute("min-scaled-value")
+    {
     }
 
-    ~SubscribeAttributeRelativeHumidityMeasurementMinMeasuredValue() {}
+    ~SubscribeAttributePressureMeasurementMinScaledValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x00000011) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMinMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMinScaledValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RelativeHumidityMeasurement.MinMeasuredValue response %@", [value description]);
+                NSLog(@"PressureMeasurement.MinScaledValue response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -60929,29 +59884,29 @@ class SubscribeAttributeRelativeHumidityMeasurementMinMeasuredValue : public Sub
 };
 
 /*
- * Attribute MaxMeasuredValue
+ * Attribute MaxScaledValue
  */
-class ReadRelativeHumidityMeasurementMaxMeasuredValue : public ReadAttribute {
+class ReadPressureMeasurementMaxScaledValue : public ReadAttribute {
 public:
-    ReadRelativeHumidityMeasurementMaxMeasuredValue()
-        : ReadAttribute("max-measured-value")
+    ReadPressureMeasurementMaxScaledValue()
+        : ReadAttribute("max-scaled-value")
     {
     }
 
-    ~ReadRelativeHumidityMeasurementMaxMeasuredValue() {}
+    ~ReadPressureMeasurementMaxScaledValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x00000012) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeMaxMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RelativeHumidityMeasurement.MaxMeasuredValue response %@", [value description]);
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        [cluster readAttributeMaxScaledValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PressureMeasurement.MaxScaledValue response %@", [value description]);
             if (error != nil) {
-                LogNSError("RelativeHumidityMeasurement MaxMeasuredValue read Error", error);
+                LogNSError("PressureMeasurement MaxScaledValue read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -60959,34 +59914,34 @@ class ReadRelativeHumidityMeasurementMaxMeasuredValue : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRelativeHumidityMeasurementMaxMeasuredValue : public SubscribeAttribute {
+class SubscribeAttributePressureMeasurementMaxScaledValue : public SubscribeAttribute {
 public:
-    SubscribeAttributeRelativeHumidityMeasurementMaxMeasuredValue()
-        : SubscribeAttribute("max-measured-value")
+    SubscribeAttributePressureMeasurementMaxScaledValue()
+        : SubscribeAttribute("max-scaled-value")
     {
     }
 
-    ~SubscribeAttributeRelativeHumidityMeasurementMaxMeasuredValue() {}
+    ~SubscribeAttributePressureMeasurementMaxScaledValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x00000012) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMaxMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMaxScaledValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RelativeHumidityMeasurement.MaxMeasuredValue response %@", [value description]);
+                NSLog(@"PressureMeasurement.MaxScaledValue response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -60997,29 +59952,29 @@ class SubscribeAttributeRelativeHumidityMeasurementMaxMeasuredValue : public Sub
 };
 
 /*
- * Attribute Tolerance
+ * Attribute ScaledTolerance
  */
-class ReadRelativeHumidityMeasurementTolerance : public ReadAttribute {
+class ReadPressureMeasurementScaledTolerance : public ReadAttribute {
 public:
-    ReadRelativeHumidityMeasurementTolerance()
-        : ReadAttribute("tolerance")
+    ReadPressureMeasurementScaledTolerance()
+        : ReadAttribute("scaled-tolerance")
     {
     }
 
-    ~ReadRelativeHumidityMeasurementTolerance() {}
+    ~ReadPressureMeasurementScaledTolerance() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x00000013) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
-        [cluster readAttributeToleranceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RelativeHumidityMeasurement.Tolerance response %@", [value description]);
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        [cluster readAttributeScaledToleranceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PressureMeasurement.ScaledTolerance response %@", [value description]);
             if (error != nil) {
-                LogNSError("RelativeHumidityMeasurement Tolerance read Error", error);
+                LogNSError("PressureMeasurement ScaledTolerance read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -61027,34 +59982,102 @@ class ReadRelativeHumidityMeasurementTolerance : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRelativeHumidityMeasurementTolerance : public SubscribeAttribute {
+class SubscribeAttributePressureMeasurementScaledTolerance : public SubscribeAttribute {
 public:
-    SubscribeAttributeRelativeHumidityMeasurementTolerance()
-        : SubscribeAttribute("tolerance")
+    SubscribeAttributePressureMeasurementScaledTolerance()
+        : SubscribeAttribute("scaled-tolerance")
     {
     }
 
-    ~SubscribeAttributeRelativeHumidityMeasurementTolerance() {}
+    ~SubscribeAttributePressureMeasurementScaledTolerance() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x00000013) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeToleranceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeScaledToleranceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RelativeHumidityMeasurement.Tolerance response %@", [value description]);
+                NSLog(@"PressureMeasurement.ScaledTolerance response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+/*
+ * Attribute Scale
+ */
+class ReadPressureMeasurementScale : public ReadAttribute {
+public:
+    ReadPressureMeasurementScale()
+        : ReadAttribute("scale")
+    {
+    }
+
+    ~ReadPressureMeasurementScale() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x00000014) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        [cluster readAttributeScaleWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"PressureMeasurement.Scale response %@", [value description]);
+            if (error != nil) {
+                LogNSError("PressureMeasurement Scale read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributePressureMeasurementScale : public SubscribeAttribute {
+public:
+    SubscribeAttributePressureMeasurementScale()
+        : SubscribeAttribute("scale")
+    {
+    }
+
+    ~SubscribeAttributePressureMeasurementScale() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x00000014) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeScaleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"PressureMeasurement.Scale response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -61067,27 +60090,27 @@ class SubscribeAttributeRelativeHumidityMeasurementTolerance : public SubscribeA
 /*
  * Attribute GeneratedCommandList
  */
-class ReadRelativeHumidityMeasurementGeneratedCommandList : public ReadAttribute {
+class ReadPressureMeasurementGeneratedCommandList : public ReadAttribute {
 public:
-    ReadRelativeHumidityMeasurementGeneratedCommandList()
+    ReadPressureMeasurementGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadRelativeHumidityMeasurementGeneratedCommandList() {}
+    ~ReadPressureMeasurementGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RelativeHumidityMeasurement.GeneratedCommandList response %@", [value description]);
+            NSLog(@"PressureMeasurement.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("RelativeHumidityMeasurement GeneratedCommandList read Error", error);
+                LogNSError("PressureMeasurement GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -61095,22 +60118,22 @@ class ReadRelativeHumidityMeasurementGeneratedCommandList : public ReadAttribute
     }
 };
 
-class SubscribeAttributeRelativeHumidityMeasurementGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributePressureMeasurementGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRelativeHumidityMeasurementGeneratedCommandList()
+    SubscribeAttributePressureMeasurementGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeRelativeHumidityMeasurementGeneratedCommandList() {}
+    ~SubscribeAttributePressureMeasurementGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -61122,7 +60145,7 @@ class SubscribeAttributeRelativeHumidityMeasurementGeneratedCommandList : public
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RelativeHumidityMeasurement.GeneratedCommandList response %@", [value description]);
+                NSLog(@"PressureMeasurement.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -61135,27 +60158,27 @@ class SubscribeAttributeRelativeHumidityMeasurementGeneratedCommandList : public
 /*
  * Attribute AcceptedCommandList
  */
-class ReadRelativeHumidityMeasurementAcceptedCommandList : public ReadAttribute {
+class ReadPressureMeasurementAcceptedCommandList : public ReadAttribute {
 public:
-    ReadRelativeHumidityMeasurementAcceptedCommandList()
+    ReadPressureMeasurementAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadRelativeHumidityMeasurementAcceptedCommandList() {}
+    ~ReadPressureMeasurementAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RelativeHumidityMeasurement.AcceptedCommandList response %@", [value description]);
+            NSLog(@"PressureMeasurement.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("RelativeHumidityMeasurement AcceptedCommandList read Error", error);
+                LogNSError("PressureMeasurement AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -61163,22 +60186,22 @@ class ReadRelativeHumidityMeasurementAcceptedCommandList : public ReadAttribute
     }
 };
 
-class SubscribeAttributeRelativeHumidityMeasurementAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributePressureMeasurementAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRelativeHumidityMeasurementAcceptedCommandList()
+    SubscribeAttributePressureMeasurementAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeRelativeHumidityMeasurementAcceptedCommandList() {}
+    ~SubscribeAttributePressureMeasurementAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -61190,7 +60213,7 @@ class SubscribeAttributeRelativeHumidityMeasurementAcceptedCommandList : public
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RelativeHumidityMeasurement.AcceptedCommandList response %@", [value description]);
+                NSLog(@"PressureMeasurement.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -61203,27 +60226,27 @@ class SubscribeAttributeRelativeHumidityMeasurementAcceptedCommandList : public
 /*
  * Attribute AttributeList
  */
-class ReadRelativeHumidityMeasurementAttributeList : public ReadAttribute {
+class ReadPressureMeasurementAttributeList : public ReadAttribute {
 public:
-    ReadRelativeHumidityMeasurementAttributeList()
+    ReadPressureMeasurementAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadRelativeHumidityMeasurementAttributeList() {}
+    ~ReadPressureMeasurementAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RelativeHumidityMeasurement.AttributeList response %@", [value description]);
+            NSLog(@"PressureMeasurement.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("RelativeHumidityMeasurement AttributeList read Error", error);
+                LogNSError("PressureMeasurement AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -61231,22 +60254,22 @@ class ReadRelativeHumidityMeasurementAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRelativeHumidityMeasurementAttributeList : public SubscribeAttribute {
+class SubscribeAttributePressureMeasurementAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRelativeHumidityMeasurementAttributeList()
+    SubscribeAttributePressureMeasurementAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeRelativeHumidityMeasurementAttributeList() {}
+    ~SubscribeAttributePressureMeasurementAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -61258,7 +60281,7 @@ class SubscribeAttributeRelativeHumidityMeasurementAttributeList : public Subscr
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RelativeHumidityMeasurement.AttributeList response %@", [value description]);
+                NSLog(@"PressureMeasurement.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -61271,27 +60294,27 @@ class SubscribeAttributeRelativeHumidityMeasurementAttributeList : public Subscr
 /*
  * Attribute FeatureMap
  */
-class ReadRelativeHumidityMeasurementFeatureMap : public ReadAttribute {
+class ReadPressureMeasurementFeatureMap : public ReadAttribute {
 public:
-    ReadRelativeHumidityMeasurementFeatureMap()
+    ReadPressureMeasurementFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadRelativeHumidityMeasurementFeatureMap() {}
+    ~ReadPressureMeasurementFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RelativeHumidityMeasurement.FeatureMap response %@", [value description]);
+            NSLog(@"PressureMeasurement.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("RelativeHumidityMeasurement FeatureMap read Error", error);
+                LogNSError("PressureMeasurement FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -61299,22 +60322,22 @@ class ReadRelativeHumidityMeasurementFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRelativeHumidityMeasurementFeatureMap : public SubscribeAttribute {
+class SubscribeAttributePressureMeasurementFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeRelativeHumidityMeasurementFeatureMap()
+    SubscribeAttributePressureMeasurementFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeRelativeHumidityMeasurementFeatureMap() {}
+    ~SubscribeAttributePressureMeasurementFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -61326,7 +60349,7 @@ class SubscribeAttributeRelativeHumidityMeasurementFeatureMap : public Subscribe
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RelativeHumidityMeasurement.FeatureMap response %@", [value description]);
+                NSLog(@"PressureMeasurement.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -61339,27 +60362,27 @@ class SubscribeAttributeRelativeHumidityMeasurementFeatureMap : public Subscribe
 /*
  * Attribute ClusterRevision
  */
-class ReadRelativeHumidityMeasurementClusterRevision : public ReadAttribute {
+class ReadPressureMeasurementClusterRevision : public ReadAttribute {
 public:
-    ReadRelativeHumidityMeasurementClusterRevision()
+    ReadPressureMeasurementClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadRelativeHumidityMeasurementClusterRevision() {}
+    ~ReadPressureMeasurementClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RelativeHumidityMeasurement.ClusterRevision response %@", [value description]);
+            NSLog(@"PressureMeasurement.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("RelativeHumidityMeasurement ClusterRevision read Error", error);
+                LogNSError("PressureMeasurement ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -61367,22 +60390,22 @@ class ReadRelativeHumidityMeasurementClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRelativeHumidityMeasurementClusterRevision : public SubscribeAttribute {
+class SubscribeAttributePressureMeasurementClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeRelativeHumidityMeasurementClusterRevision()
+    SubscribeAttributePressureMeasurementClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeRelativeHumidityMeasurementClusterRevision() {}
+    ~SubscribeAttributePressureMeasurementClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000403) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
-                                                                                                   endpoint:endpointId
-                                                                                                      queue:callbackQueue];
+        CHIPPressureMeasurement * cluster = [[CHIPPressureMeasurement alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -61394,7 +60417,7 @@ class SubscribeAttributeRelativeHumidityMeasurementClusterRevision : public Subs
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RelativeHumidityMeasurement.ClusterRevision response %@", [value description]);
+                NSLog(@"PressureMeasurement.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -61405,27 +60428,15 @@ class SubscribeAttributeRelativeHumidityMeasurementClusterRevision : public Subs
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster Scenes                                                      | 0x0005 |
+| Cluster FlowMeasurement                                             | 0x0404 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * AddScene                                                          |   0x00 |
-| * ViewScene                                                         |   0x01 |
-| * RemoveScene                                                       |   0x02 |
-| * RemoveAllScenes                                                   |   0x03 |
-| * StoreScene                                                        |   0x04 |
-| * RecallScene                                                       |   0x05 |
-| * GetSceneMembership                                                |   0x06 |
-| * EnhancedAddScene                                                  |   0x40 |
-| * EnhancedViewScene                                                 |   0x41 |
-| * CopyScene                                                         |   0x42 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * SceneCount                                                        | 0x0000 |
-| * CurrentScene                                                      | 0x0001 |
-| * CurrentGroup                                                      | 0x0002 |
-| * SceneValid                                                        | 0x0003 |
-| * NameSupport                                                       | 0x0004 |
-| * LastConfiguredBy                                                  | 0x0005 |
+| * MeasuredValue                                                     | 0x0000 |
+| * MinMeasuredValue                                                  | 0x0001 |
+| * MaxMeasuredValue                                                  | 0x0002 |
+| * Tolerance                                                         | 0x0003 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -61436,600 +60447,411 @@ class SubscribeAttributeRelativeHumidityMeasurementClusterRevision : public Subs
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command AddScene
+ * Attribute MeasuredValue
  */
-class ScenesAddScene : public ClusterCommand {
+class ReadFlowMeasurementMeasuredValue : public ReadAttribute {
 public:
-    ScenesAddScene()
-        : ClusterCommand("add-scene")
-        , mComplex_ExtensionFieldSets(&mRequest.extensionFieldSets)
+    ReadFlowMeasurementMeasuredValue()
+        : ReadAttribute("measured-value")
     {
-        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
-        AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        AddArgument("SceneName", &mRequest.sceneName);
-        AddArgument("ExtensionFieldSets", &mComplex_ExtensionFieldSets);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadFlowMeasurementMeasuredValue() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPScenesClusterAddSceneParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
-        params.sceneId = [NSNumber numberWithUnsignedChar:mRequest.sceneId];
-        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
-        params.sceneName = [[NSString alloc] initWithBytes:mRequest.sceneName.data()
-                                                    length:mRequest.sceneName.size()
-                                                  encoding:NSUTF8StringEncoding];
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mRequest.extensionFieldSets) {
-                CHIPScenesClusterExtensionFieldSet * newElement_0;
-                newElement_0 = [CHIPScenesClusterExtensionFieldSet new];
-                newElement_0.clusterId = [NSNumber numberWithUnsignedInt:entry_0.clusterId];
-                { // Scope for our temporary variables
-                    auto * array_2 = [NSMutableArray new];
-                    for (auto & entry_2 : entry_0.attributeValueList) {
-                        CHIPScenesClusterAttributeValuePair * newElement_2;
-                        newElement_2 = [CHIPScenesClusterAttributeValuePair new];
-                        if (entry_2.attributeId.HasValue()) {
-                            newElement_2.attributeId = [NSNumber numberWithUnsignedInt:entry_2.attributeId.Value()];
-                        } else {
-                            newElement_2.attributeId = nil;
-                        }
-                        { // Scope for our temporary variables
-                            auto * array_4 = [NSMutableArray new];
-                            for (auto & entry_4 : entry_2.attributeValue) {
-                                NSNumber * newElement_4;
-                                newElement_4 = [NSNumber numberWithUnsignedChar:entry_4];
-                                [array_4 addObject:newElement_4];
-                            }
-                            newElement_2.attributeValue = array_4;
-                        }
-                        [array_2 addObject:newElement_2];
-                    }
-                    newElement_0.attributeValueList = array_2;
-                }
-                [array_0 addObject:newElement_0];
+        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FlowMeasurement.MeasuredValue response %@", [value description]);
+            if (error != nil) {
+                LogNSError("FlowMeasurement MeasuredValue read Error", error);
             }
-            params.extensionFieldSets = array_0;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster addSceneWithParams:params
-                      completionHandler:^(CHIPScenesClusterAddSceneResponseParams * _Nullable values, NSError * _Nullable error) {
-                          NSLog(@"Values: %@", values);
-                          responsesNeeded--;
-                          if (error != nil) {
-                              mError = error;
-                              LogNSError("Error", error);
-                          }
-                          if (responsesNeeded == 0) {
-                              SetCommandExitStatus(mError);
-                          }
-                      }];
-        }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
+};
 
-private:
-    chip::app::Clusters::Scenes::Commands::AddScene::Type mRequest;
-    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::Scenes::Structs::ExtensionFieldSet::Type>>
-        mComplex_ExtensionFieldSets;
+class SubscribeAttributeFlowMeasurementMeasuredValue : public SubscribeAttribute {
+public:
+    SubscribeAttributeFlowMeasurementMeasuredValue()
+        : SubscribeAttribute("measured-value")
+    {
+    }
+
+    ~SubscribeAttributeFlowMeasurementMeasuredValue() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FlowMeasurement.MeasuredValue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
 };
 
 /*
- * Command ViewScene
+ * Attribute MinMeasuredValue
  */
-class ScenesViewScene : public ClusterCommand {
+class ReadFlowMeasurementMinMeasuredValue : public ReadAttribute {
 public:
-    ScenesViewScene()
-        : ClusterCommand("view-scene")
+    ReadFlowMeasurementMinMeasuredValue()
+        : ReadAttribute("min-measured-value")
     {
-        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
-        AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadFlowMeasurementMinMeasuredValue() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) command (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPScenesClusterViewSceneParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
-        params.sceneId = [NSNumber numberWithUnsignedChar:mRequest.sceneId];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster viewSceneWithParams:params
-                       completionHandler:^(CHIPScenesClusterViewSceneResponseParams * _Nullable values, NSError * _Nullable error) {
-                           NSLog(@"Values: %@", values);
-                           responsesNeeded--;
-                           if (error != nil) {
-                               mError = error;
-                               LogNSError("Error", error);
-                           }
-                           if (responsesNeeded == 0) {
-                               SetCommandExitStatus(mError);
-                           }
-                       }];
-        }
+        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeMinMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FlowMeasurement.MinMeasuredValue response %@", [value description]);
+            if (error != nil) {
+                LogNSError("FlowMeasurement MinMeasuredValue read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::Scenes::Commands::ViewScene::Type mRequest;
 };
 
-/*
- * Command RemoveScene
- */
-class ScenesRemoveScene : public ClusterCommand {
+class SubscribeAttributeFlowMeasurementMinMeasuredValue : public SubscribeAttribute {
 public:
-    ScenesRemoveScene()
-        : ClusterCommand("remove-scene")
+    SubscribeAttributeFlowMeasurementMinMeasuredValue()
+        : SubscribeAttribute("min-measured-value")
     {
-        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
-        AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeFlowMeasurementMinMeasuredValue() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) command (0x00000002) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPScenesClusterRemoveSceneParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
-        params.sceneId = [NSNumber numberWithUnsignedChar:mRequest.sceneId];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster
-                removeSceneWithParams:params
-                    completionHandler:^(CHIPScenesClusterRemoveSceneResponseParams * _Nullable values, NSError * _Nullable error) {
-                        NSLog(@"Values: %@", values);
-                        responsesNeeded--;
-                        if (error != nil) {
-                            mError = error;
-                            LogNSError("Error", error);
-                        }
-                        if (responsesNeeded == 0) {
-                            SetCommandExitStatus(mError);
-                        }
-                    }];
-        }
+        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeMinMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FlowMeasurement.MinMeasuredValue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::Scenes::Commands::RemoveScene::Type mRequest;
 };
 
 /*
- * Command RemoveAllScenes
+ * Attribute MaxMeasuredValue
  */
-class ScenesRemoveAllScenes : public ClusterCommand {
+class ReadFlowMeasurementMaxMeasuredValue : public ReadAttribute {
 public:
-    ScenesRemoveAllScenes()
-        : ClusterCommand("remove-all-scenes")
+    ReadFlowMeasurementMaxMeasuredValue()
+        : ReadAttribute("max-measured-value")
     {
-        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadFlowMeasurementMaxMeasuredValue() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) command (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPScenesClusterRemoveAllScenesParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster removeAllScenesWithParams:params
-                             completionHandler:^(
-                                 CHIPScenesClusterRemoveAllScenesResponseParams * _Nullable values, NSError * _Nullable error) {
-                                 NSLog(@"Values: %@", values);
-                                 responsesNeeded--;
-                                 if (error != nil) {
-                                     mError = error;
-                                     LogNSError("Error", error);
-                                 }
-                                 if (responsesNeeded == 0) {
-                                     SetCommandExitStatus(mError);
-                                 }
-                             }];
-        }
+        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeMaxMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FlowMeasurement.MaxMeasuredValue response %@", [value description]);
+            if (error != nil) {
+                LogNSError("FlowMeasurement MaxMeasuredValue read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::Scenes::Commands::RemoveAllScenes::Type mRequest;
 };
 
-/*
- * Command StoreScene
- */
-class ScenesStoreScene : public ClusterCommand {
+class SubscribeAttributeFlowMeasurementMaxMeasuredValue : public SubscribeAttribute {
 public:
-    ScenesStoreScene()
-        : ClusterCommand("store-scene")
+    SubscribeAttributeFlowMeasurementMaxMeasuredValue()
+        : SubscribeAttribute("max-measured-value")
     {
-        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
-        AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeFlowMeasurementMaxMeasuredValue() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) command (0x00000004) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPScenesClusterStoreSceneParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
-        params.sceneId = [NSNumber numberWithUnsignedChar:mRequest.sceneId];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster
-                storeSceneWithParams:params
-                   completionHandler:^(CHIPScenesClusterStoreSceneResponseParams * _Nullable values, NSError * _Nullable error) {
-                       NSLog(@"Values: %@", values);
-                       responsesNeeded--;
-                       if (error != nil) {
-                           mError = error;
-                           LogNSError("Error", error);
-                       }
-                       if (responsesNeeded == 0) {
-                           SetCommandExitStatus(mError);
-                       }
-                   }];
-        }
+        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeMaxMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FlowMeasurement.MaxMeasuredValue response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::Scenes::Commands::StoreScene::Type mRequest;
 };
 
 /*
- * Command RecallScene
+ * Attribute Tolerance
  */
-class ScenesRecallScene : public ClusterCommand {
+class ReadFlowMeasurementTolerance : public ReadAttribute {
 public:
-    ScenesRecallScene()
-        : ClusterCommand("recall-scene")
+    ReadFlowMeasurementTolerance()
+        : ReadAttribute("tolerance")
     {
-        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
-        AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadFlowMeasurementTolerance() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) command (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPScenesClusterRecallSceneParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
-        params.sceneId = [NSNumber numberWithUnsignedChar:mRequest.sceneId];
-        if (mRequest.transitionTime.HasValue()) {
-            if (mRequest.transitionTime.Value().IsNull()) {
-                params.transitionTime = nil;
-            } else {
-                params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime.Value().Value()];
+        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeToleranceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FlowMeasurement.Tolerance response %@", [value description]);
+            if (error != nil) {
+                LogNSError("FlowMeasurement Tolerance read Error", error);
             }
-        } else {
-            params.transitionTime = nil;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster recallSceneWithParams:params
-                         completionHandler:^(NSError * _Nullable error) {
-                             responsesNeeded--;
-                             if (error != nil) {
-                                 mError = error;
-                                 LogNSError("Error", error);
-                             }
-                             if (responsesNeeded == 0) {
-                                 SetCommandExitStatus(mError);
-                             }
-                         }];
-        }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::Scenes::Commands::RecallScene::Type mRequest;
 };
 
-/*
- * Command GetSceneMembership
- */
-class ScenesGetSceneMembership : public ClusterCommand {
+class SubscribeAttributeFlowMeasurementTolerance : public SubscribeAttribute {
 public:
-    ScenesGetSceneMembership()
-        : ClusterCommand("get-scene-membership")
+    SubscribeAttributeFlowMeasurementTolerance()
+        : SubscribeAttribute("tolerance")
     {
-        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeFlowMeasurementTolerance() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) command (0x00000006) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPScenesClusterGetSceneMembershipParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster getSceneMembershipWithParams:params
-                                completionHandler:^(CHIPScenesClusterGetSceneMembershipResponseParams * _Nullable values,
-                                    NSError * _Nullable error) {
-                                    NSLog(@"Values: %@", values);
-                                    responsesNeeded--;
-                                    if (error != nil) {
-                                        mError = error;
-                                        LogNSError("Error", error);
-                                    }
-                                    if (responsesNeeded == 0) {
-                                        SetCommandExitStatus(mError);
-                                    }
-                                }];
-        }
+        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeToleranceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FlowMeasurement.Tolerance response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::Scenes::Commands::GetSceneMembership::Type mRequest;
 };
 
 /*
- * Command EnhancedAddScene
+ * Attribute GeneratedCommandList
  */
-class ScenesEnhancedAddScene : public ClusterCommand {
+class ReadFlowMeasurementGeneratedCommandList : public ReadAttribute {
 public:
-    ScenesEnhancedAddScene()
-        : ClusterCommand("enhanced-add-scene")
-        , mComplex_ExtensionFieldSets(&mRequest.extensionFieldSets)
+    ReadFlowMeasurementGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
-        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
-        AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId);
-        AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
-        AddArgument("SceneName", &mRequest.sceneName);
-        AddArgument("ExtensionFieldSets", &mComplex_ExtensionFieldSets);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadFlowMeasurementGeneratedCommandList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) command (0x00000040) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPScenesClusterEnhancedAddSceneParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
-        params.sceneId = [NSNumber numberWithUnsignedChar:mRequest.sceneId];
-        params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
-        params.sceneName = [[NSString alloc] initWithBytes:mRequest.sceneName.data()
-                                                    length:mRequest.sceneName.size()
-                                                  encoding:NSUTF8StringEncoding];
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mRequest.extensionFieldSets) {
-                CHIPScenesClusterExtensionFieldSet * newElement_0;
-                newElement_0 = [CHIPScenesClusterExtensionFieldSet new];
-                newElement_0.clusterId = [NSNumber numberWithUnsignedInt:entry_0.clusterId];
-                { // Scope for our temporary variables
-                    auto * array_2 = [NSMutableArray new];
-                    for (auto & entry_2 : entry_0.attributeValueList) {
-                        CHIPScenesClusterAttributeValuePair * newElement_2;
-                        newElement_2 = [CHIPScenesClusterAttributeValuePair new];
-                        if (entry_2.attributeId.HasValue()) {
-                            newElement_2.attributeId = [NSNumber numberWithUnsignedInt:entry_2.attributeId.Value()];
-                        } else {
-                            newElement_2.attributeId = nil;
-                        }
-                        { // Scope for our temporary variables
-                            auto * array_4 = [NSMutableArray new];
-                            for (auto & entry_4 : entry_2.attributeValue) {
-                                NSNumber * newElement_4;
-                                newElement_4 = [NSNumber numberWithUnsignedChar:entry_4];
-                                [array_4 addObject:newElement_4];
-                            }
-                            newElement_2.attributeValue = array_4;
-                        }
-                        [array_2 addObject:newElement_2];
-                    }
-                    newElement_0.attributeValueList = array_2;
-                }
-                [array_0 addObject:newElement_0];
+        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FlowMeasurement.GeneratedCommandList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("FlowMeasurement GeneratedCommandList read Error", error);
             }
-            params.extensionFieldSets = array_0;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster enhancedAddSceneWithParams:params
-                              completionHandler:^(
-                                  CHIPScenesClusterEnhancedAddSceneResponseParams * _Nullable values, NSError * _Nullable error) {
-                                  NSLog(@"Values: %@", values);
-                                  responsesNeeded--;
-                                  if (error != nil) {
-                                      mError = error;
-                                      LogNSError("Error", error);
-                                  }
-                                  if (responsesNeeded == 0) {
-                                      SetCommandExitStatus(mError);
-                                  }
-                              }];
-        }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::Scenes::Commands::EnhancedAddScene::Type mRequest;
-    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::Scenes::Structs::ExtensionFieldSet::Type>>
-        mComplex_ExtensionFieldSets;
 };
 
-/*
- * Command EnhancedViewScene
- */
-class ScenesEnhancedViewScene : public ClusterCommand {
+class SubscribeAttributeFlowMeasurementGeneratedCommandList : public SubscribeAttribute {
 public:
-    ScenesEnhancedViewScene()
-        : ClusterCommand("enhanced-view-scene")
+    SubscribeAttributeFlowMeasurementGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
-        AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId);
-        AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeFlowMeasurementGeneratedCommandList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) command (0x00000041) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPScenesClusterEnhancedViewSceneParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId];
-        params.sceneId = [NSNumber numberWithUnsignedChar:mRequest.sceneId];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster enhancedViewSceneWithParams:params
-                               completionHandler:^(
-                                   CHIPScenesClusterEnhancedViewSceneResponseParams * _Nullable values, NSError * _Nullable error) {
-                                   NSLog(@"Values: %@", values);
-                                   responsesNeeded--;
-                                   if (error != nil) {
-                                       mError = error;
-                                       LogNSError("Error", error);
-                                   }
-                                   if (responsesNeeded == 0) {
-                                       SetCommandExitStatus(mError);
-                                   }
-                               }];
-        }
+        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FlowMeasurement.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::Scenes::Commands::EnhancedViewScene::Type mRequest;
 };
 
 /*
- * Command CopyScene
+ * Attribute AcceptedCommandList
  */
-class ScenesCopyScene : public ClusterCommand {
+class ReadFlowMeasurementAcceptedCommandList : public ReadAttribute {
 public:
-    ScenesCopyScene()
-        : ClusterCommand("copy-scene")
+    ReadFlowMeasurementAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
-        AddArgument("Mode", 0, UINT8_MAX, &mRequest.mode);
-        AddArgument("GroupIdFrom", 0, UINT16_MAX, &mRequest.groupIdFrom);
-        AddArgument("SceneIdFrom", 0, UINT8_MAX, &mRequest.sceneIdFrom);
-        AddArgument("GroupIdTo", 0, UINT16_MAX, &mRequest.groupIdTo);
-        AddArgument("SceneIdTo", 0, UINT8_MAX, &mRequest.sceneIdTo);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadFlowMeasurementAcceptedCommandList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) command (0x00000042) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPScenesClusterCopySceneParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.mode = [NSNumber numberWithUnsignedChar:mRequest.mode.Raw()];
-        params.groupIdFrom = [NSNumber numberWithUnsignedShort:mRequest.groupIdFrom];
-        params.sceneIdFrom = [NSNumber numberWithUnsignedChar:mRequest.sceneIdFrom];
-        params.groupIdTo = [NSNumber numberWithUnsignedShort:mRequest.groupIdTo];
-        params.sceneIdTo = [NSNumber numberWithUnsignedChar:mRequest.sceneIdTo];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster copySceneWithParams:params
-                       completionHandler:^(CHIPScenesClusterCopySceneResponseParams * _Nullable values, NSError * _Nullable error) {
-                           NSLog(@"Values: %@", values);
-                           responsesNeeded--;
-                           if (error != nil) {
-                               mError = error;
-                               LogNSError("Error", error);
-                           }
-                           if (responsesNeeded == 0) {
-                               SetCommandExitStatus(mError);
-                           }
-                       }];
-        }
+        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FlowMeasurement.AcceptedCommandList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("FlowMeasurement AcceptedCommandList read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::Scenes::Commands::CopyScene::Type mRequest;
 };
 
-/*
- * Attribute SceneCount
+class SubscribeAttributeFlowMeasurementAcceptedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeFlowMeasurementAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
+    {
+    }
+
+    ~SubscribeAttributeFlowMeasurementAcceptedCommandList() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FlowMeasurement.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+/*
+ * Attribute AttributeList
  */
-class ReadScenesSceneCount : public ReadAttribute {
+class ReadFlowMeasurementAttributeList : public ReadAttribute {
 public:
-    ReadScenesSceneCount()
-        : ReadAttribute("scene-count")
+    ReadFlowMeasurementAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadScenesSceneCount() {}
+    ~ReadFlowMeasurementAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeSceneCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Scenes.SceneCount response %@", [value description]);
+        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FlowMeasurement.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("Scenes SceneCount read Error", error);
+                LogNSError("FlowMeasurement AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -62037,32 +60859,96 @@ class ReadScenesSceneCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeScenesSceneCount : public SubscribeAttribute {
+class SubscribeAttributeFlowMeasurementAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeScenesSceneCount()
-        : SubscribeAttribute("scene-count")
+    SubscribeAttributeFlowMeasurementAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeScenesSceneCount() {}
+    ~SubscribeAttributeFlowMeasurementAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSceneCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"FlowMeasurement.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+/*
+ * Attribute FeatureMap
+ */
+class ReadFlowMeasurementFeatureMap : public ReadAttribute {
+public:
+    ReadFlowMeasurementFeatureMap()
+        : ReadAttribute("feature-map")
+    {
+    }
+
+    ~ReadFlowMeasurementFeatureMap() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FlowMeasurement.FeatureMap response %@", [value description]);
+            if (error != nil) {
+                LogNSError("FlowMeasurement FeatureMap read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeFlowMeasurementFeatureMap : public SubscribeAttribute {
+public:
+    SubscribeAttributeFlowMeasurementFeatureMap()
+        : SubscribeAttribute("feature-map")
+    {
+    }
+
+    ~SubscribeAttributeFlowMeasurementFeatureMap() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Scenes.SceneCount response %@", [value description]);
+                NSLog(@"FlowMeasurement.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -62073,27 +60959,27 @@ class SubscribeAttributeScenesSceneCount : public SubscribeAttribute {
 };
 
 /*
- * Attribute CurrentScene
+ * Attribute ClusterRevision
  */
-class ReadScenesCurrentScene : public ReadAttribute {
+class ReadFlowMeasurementClusterRevision : public ReadAttribute {
 public:
-    ReadScenesCurrentScene()
-        : ReadAttribute("current-scene")
+    ReadFlowMeasurementClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadScenesCurrentScene() {}
+    ~ReadFlowMeasurementClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCurrentSceneWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Scenes.CurrentScene response %@", [value description]);
+        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"FlowMeasurement.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("Scenes CurrentScene read Error", error);
+                LogNSError("FlowMeasurement ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -62101,32 +60987,32 @@ class ReadScenesCurrentScene : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeScenesCurrentScene : public SubscribeAttribute {
+class SubscribeAttributeFlowMeasurementClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeScenesCurrentScene()
-        : SubscribeAttribute("current-scene")
+    SubscribeAttributeFlowMeasurementClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeScenesCurrentScene() {}
+    ~SubscribeAttributeFlowMeasurementClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000404) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentSceneWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Scenes.CurrentScene response %@", [value description]);
+                NSLog(@"FlowMeasurement.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -62136,28 +61022,49 @@ class SubscribeAttributeScenesCurrentScene : public SubscribeAttribute {
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster RelativeHumidityMeasurement                                 | 0x0405 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * MeasuredValue                                                     | 0x0000 |
+| * MinMeasuredValue                                                  | 0x0001 |
+| * MaxMeasuredValue                                                  | 0x0002 |
+| * Tolerance                                                         | 0x0003 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute CurrentGroup
+ * Attribute MeasuredValue
  */
-class ReadScenesCurrentGroup : public ReadAttribute {
+class ReadRelativeHumidityMeasurementMeasuredValue : public ReadAttribute {
 public:
-    ReadScenesCurrentGroup()
-        : ReadAttribute("current-group")
+    ReadRelativeHumidityMeasurementMeasuredValue()
+        : ReadAttribute("measured-value")
     {
     }
 
-    ~ReadScenesCurrentGroup() {}
+    ~ReadRelativeHumidityMeasurementMeasuredValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCurrentGroupWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Scenes.CurrentGroup response %@", [value description]);
+        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributeMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RelativeHumidityMeasurement.MeasuredValue response %@", [value description]);
             if (error != nil) {
-                LogNSError("Scenes CurrentGroup read Error", error);
+                LogNSError("RelativeHumidityMeasurement MeasuredValue read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -62165,32 +61072,34 @@ class ReadScenesCurrentGroup : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeScenesCurrentGroup : public SubscribeAttribute {
+class SubscribeAttributeRelativeHumidityMeasurementMeasuredValue : public SubscribeAttribute {
 public:
-    SubscribeAttributeScenesCurrentGroup()
-        : SubscribeAttribute("current-group")
+    SubscribeAttributeRelativeHumidityMeasurementMeasuredValue()
+        : SubscribeAttribute("measured-value")
     {
     }
 
-    ~SubscribeAttributeScenesCurrentGroup() {}
+    ~SubscribeAttributeRelativeHumidityMeasurementMeasuredValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentGroupWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Scenes.CurrentGroup response %@", [value description]);
+                NSLog(@"RelativeHumidityMeasurement.MeasuredValue response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -62201,27 +61110,29 @@ class SubscribeAttributeScenesCurrentGroup : public SubscribeAttribute {
 };
 
 /*
- * Attribute SceneValid
+ * Attribute MinMeasuredValue
  */
-class ReadScenesSceneValid : public ReadAttribute {
+class ReadRelativeHumidityMeasurementMinMeasuredValue : public ReadAttribute {
 public:
-    ReadScenesSceneValid()
-        : ReadAttribute("scene-valid")
+    ReadRelativeHumidityMeasurementMinMeasuredValue()
+        : ReadAttribute("min-measured-value")
     {
     }
 
-    ~ReadScenesSceneValid() {}
+    ~ReadRelativeHumidityMeasurementMinMeasuredValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeSceneValidWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Scenes.SceneValid response %@", [value description]);
+        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributeMinMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RelativeHumidityMeasurement.MinMeasuredValue response %@", [value description]);
             if (error != nil) {
-                LogNSError("Scenes SceneValid read Error", error);
+                LogNSError("RelativeHumidityMeasurement MinMeasuredValue read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -62229,32 +61140,34 @@ class ReadScenesSceneValid : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeScenesSceneValid : public SubscribeAttribute {
+class SubscribeAttributeRelativeHumidityMeasurementMinMeasuredValue : public SubscribeAttribute {
 public:
-    SubscribeAttributeScenesSceneValid()
-        : SubscribeAttribute("scene-valid")
+    SubscribeAttributeRelativeHumidityMeasurementMinMeasuredValue()
+        : SubscribeAttribute("min-measured-value")
     {
     }
 
-    ~SubscribeAttributeScenesSceneValid() {}
+    ~SubscribeAttributeRelativeHumidityMeasurementMinMeasuredValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSceneValidWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMinMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Scenes.SceneValid response %@", [value description]);
+                NSLog(@"RelativeHumidityMeasurement.MinMeasuredValue response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -62265,27 +61178,29 @@ class SubscribeAttributeScenesSceneValid : public SubscribeAttribute {
 };
 
 /*
- * Attribute NameSupport
+ * Attribute MaxMeasuredValue
  */
-class ReadScenesNameSupport : public ReadAttribute {
+class ReadRelativeHumidityMeasurementMaxMeasuredValue : public ReadAttribute {
 public:
-    ReadScenesNameSupport()
-        : ReadAttribute("name-support")
+    ReadRelativeHumidityMeasurementMaxMeasuredValue()
+        : ReadAttribute("max-measured-value")
     {
     }
 
-    ~ReadScenesNameSupport() {}
+    ~ReadRelativeHumidityMeasurementMaxMeasuredValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReadAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNameSupportWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Scenes.NameSupport response %@", [value description]);
+        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributeMaxMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RelativeHumidityMeasurement.MaxMeasuredValue response %@", [value description]);
             if (error != nil) {
-                LogNSError("Scenes NameSupport read Error", error);
+                LogNSError("RelativeHumidityMeasurement MaxMeasuredValue read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -62293,32 +61208,34 @@ class ReadScenesNameSupport : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeScenesNameSupport : public SubscribeAttribute {
+class SubscribeAttributeRelativeHumidityMeasurementMaxMeasuredValue : public SubscribeAttribute {
 public:
-    SubscribeAttributeScenesNameSupport()
-        : SubscribeAttribute("name-support")
+    SubscribeAttributeRelativeHumidityMeasurementMaxMeasuredValue()
+        : SubscribeAttribute("max-measured-value")
     {
     }
 
-    ~SubscribeAttributeScenesNameSupport() {}
+    ~SubscribeAttributeRelativeHumidityMeasurementMaxMeasuredValue() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNameSupportWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMaxMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Scenes.NameSupport response %@", [value description]);
+                NSLog(@"RelativeHumidityMeasurement.MaxMeasuredValue response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -62329,27 +61246,29 @@ class SubscribeAttributeScenesNameSupport : public SubscribeAttribute {
 };
 
 /*
- * Attribute LastConfiguredBy
+ * Attribute Tolerance
  */
-class ReadScenesLastConfiguredBy : public ReadAttribute {
+class ReadRelativeHumidityMeasurementTolerance : public ReadAttribute {
 public:
-    ReadScenesLastConfiguredBy()
-        : ReadAttribute("last-configured-by")
+    ReadRelativeHumidityMeasurementTolerance()
+        : ReadAttribute("tolerance")
     {
     }
 
-    ~ReadScenesLastConfiguredBy() {}
+    ~ReadRelativeHumidityMeasurementTolerance() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReadAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeLastConfiguredByWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Scenes.LastConfiguredBy response %@", [value description]);
+        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
+        [cluster readAttributeToleranceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RelativeHumidityMeasurement.Tolerance response %@", [value description]);
             if (error != nil) {
-                LogNSError("Scenes LastConfiguredBy read Error", error);
+                LogNSError("RelativeHumidityMeasurement Tolerance read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -62357,32 +61276,34 @@ class ReadScenesLastConfiguredBy : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeScenesLastConfiguredBy : public SubscribeAttribute {
+class SubscribeAttributeRelativeHumidityMeasurementTolerance : public SubscribeAttribute {
 public:
-    SubscribeAttributeScenesLastConfiguredBy()
-        : SubscribeAttribute("last-configured-by")
+    SubscribeAttributeRelativeHumidityMeasurementTolerance()
+        : SubscribeAttribute("tolerance")
     {
     }
 
-    ~SubscribeAttributeScenesLastConfiguredBy() {}
+    ~SubscribeAttributeRelativeHumidityMeasurementTolerance() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLastConfiguredByWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeToleranceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Scenes.LastConfiguredBy response %@", [value description]);
+                NSLog(@"RelativeHumidityMeasurement.Tolerance response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -62395,25 +61316,27 @@ class SubscribeAttributeScenesLastConfiguredBy : public SubscribeAttribute {
 /*
  * Attribute GeneratedCommandList
  */
-class ReadScenesGeneratedCommandList : public ReadAttribute {
+class ReadRelativeHumidityMeasurementGeneratedCommandList : public ReadAttribute {
 public:
-    ReadScenesGeneratedCommandList()
+    ReadRelativeHumidityMeasurementGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadScenesGeneratedCommandList() {}
+    ~ReadRelativeHumidityMeasurementGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Scenes.GeneratedCommandList response %@", [value description]);
+            NSLog(@"RelativeHumidityMeasurement.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("Scenes GeneratedCommandList read Error", error);
+                LogNSError("RelativeHumidityMeasurement GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -62421,20 +61344,22 @@ class ReadScenesGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeScenesGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeRelativeHumidityMeasurementGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeScenesGeneratedCommandList()
+    SubscribeAttributeRelativeHumidityMeasurementGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeScenesGeneratedCommandList() {}
+    ~SubscribeAttributeRelativeHumidityMeasurementGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -62446,7 +61371,7 @@ class SubscribeAttributeScenesGeneratedCommandList : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Scenes.GeneratedCommandList response %@", [value description]);
+                NSLog(@"RelativeHumidityMeasurement.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -62459,25 +61384,27 @@ class SubscribeAttributeScenesGeneratedCommandList : public SubscribeAttribute {
 /*
  * Attribute AcceptedCommandList
  */
-class ReadScenesAcceptedCommandList : public ReadAttribute {
+class ReadRelativeHumidityMeasurementAcceptedCommandList : public ReadAttribute {
 public:
-    ReadScenesAcceptedCommandList()
+    ReadRelativeHumidityMeasurementAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadScenesAcceptedCommandList() {}
+    ~ReadRelativeHumidityMeasurementAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Scenes.AcceptedCommandList response %@", [value description]);
+            NSLog(@"RelativeHumidityMeasurement.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("Scenes AcceptedCommandList read Error", error);
+                LogNSError("RelativeHumidityMeasurement AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -62485,20 +61412,22 @@ class ReadScenesAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeScenesAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeRelativeHumidityMeasurementAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeScenesAcceptedCommandList()
+    SubscribeAttributeRelativeHumidityMeasurementAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeScenesAcceptedCommandList() {}
+    ~SubscribeAttributeRelativeHumidityMeasurementAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -62510,7 +61439,7 @@ class SubscribeAttributeScenesAcceptedCommandList : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Scenes.AcceptedCommandList response %@", [value description]);
+                NSLog(@"RelativeHumidityMeasurement.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -62523,25 +61452,27 @@ class SubscribeAttributeScenesAcceptedCommandList : public SubscribeAttribute {
 /*
  * Attribute AttributeList
  */
-class ReadScenesAttributeList : public ReadAttribute {
+class ReadRelativeHumidityMeasurementAttributeList : public ReadAttribute {
 public:
-    ReadScenesAttributeList()
+    ReadRelativeHumidityMeasurementAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadScenesAttributeList() {}
+    ~ReadRelativeHumidityMeasurementAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Scenes.AttributeList response %@", [value description]);
+            NSLog(@"RelativeHumidityMeasurement.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("Scenes AttributeList read Error", error);
+                LogNSError("RelativeHumidityMeasurement AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -62549,20 +61480,22 @@ class ReadScenesAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeScenesAttributeList : public SubscribeAttribute {
+class SubscribeAttributeRelativeHumidityMeasurementAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeScenesAttributeList()
+    SubscribeAttributeRelativeHumidityMeasurementAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeScenesAttributeList() {}
+    ~SubscribeAttributeRelativeHumidityMeasurementAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -62574,7 +61507,7 @@ class SubscribeAttributeScenesAttributeList : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Scenes.AttributeList response %@", [value description]);
+                NSLog(@"RelativeHumidityMeasurement.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -62587,25 +61520,27 @@ class SubscribeAttributeScenesAttributeList : public SubscribeAttribute {
 /*
  * Attribute FeatureMap
  */
-class ReadScenesFeatureMap : public ReadAttribute {
+class ReadRelativeHumidityMeasurementFeatureMap : public ReadAttribute {
 public:
-    ReadScenesFeatureMap()
+    ReadRelativeHumidityMeasurementFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadScenesFeatureMap() {}
+    ~ReadRelativeHumidityMeasurementFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Scenes.FeatureMap response %@", [value description]);
+            NSLog(@"RelativeHumidityMeasurement.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("Scenes FeatureMap read Error", error);
+                LogNSError("RelativeHumidityMeasurement FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -62613,20 +61548,22 @@ class ReadScenesFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeScenesFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeRelativeHumidityMeasurementFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeScenesFeatureMap()
+    SubscribeAttributeRelativeHumidityMeasurementFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeScenesFeatureMap() {}
+    ~SubscribeAttributeRelativeHumidityMeasurementFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -62638,7 +61575,7 @@ class SubscribeAttributeScenesFeatureMap : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Scenes.FeatureMap response %@", [value description]);
+                NSLog(@"RelativeHumidityMeasurement.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -62651,25 +61588,27 @@ class SubscribeAttributeScenesFeatureMap : public SubscribeAttribute {
 /*
  * Attribute ClusterRevision
  */
-class ReadScenesClusterRevision : public ReadAttribute {
+class ReadRelativeHumidityMeasurementClusterRevision : public ReadAttribute {
 public:
-    ReadScenesClusterRevision()
+    ReadRelativeHumidityMeasurementClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadScenesClusterRevision() {}
+    ~ReadRelativeHumidityMeasurementClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Scenes.ClusterRevision response %@", [value description]);
+            NSLog(@"RelativeHumidityMeasurement.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("Scenes ClusterRevision read Error", error);
+                LogNSError("RelativeHumidityMeasurement ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -62677,20 +61616,22 @@ class ReadScenesClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeScenesClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeRelativeHumidityMeasurementClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeScenesClusterRevision()
+    SubscribeAttributeRelativeHumidityMeasurementClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeScenesClusterRevision() {}
+    ~SubscribeAttributeRelativeHumidityMeasurementClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000005) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000405) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPRelativeHumidityMeasurement * cluster = [[CHIPRelativeHumidityMeasurement alloc] initWithDevice:device
+                                                                                                   endpoint:endpointId
+                                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -62702,7 +61643,7 @@ class SubscribeAttributeScenesClusterRevision : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Scenes.ClusterRevision response %@", [value description]);
+                NSLog(@"RelativeHumidityMeasurement.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -62713,93 +61654,56 @@ class SubscribeAttributeScenesClusterRevision : public SubscribeAttribute {
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster SoftwareDiagnostics                                         | 0x0034 |
+| Cluster OccupancySensing                                            | 0x0406 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * ResetWatermarks                                                   |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * ThreadMetrics                                                     | 0x0000 |
-| * CurrentHeapFree                                                   | 0x0001 |
-| * CurrentHeapUsed                                                   | 0x0002 |
-| * CurrentHeapHighWatermark                                          | 0x0003 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
+| * Occupancy                                                         | 0x0000 |
+| * OccupancySensorType                                               | 0x0001 |
+| * OccupancySensorTypeBitmap                                         | 0x0002 |
+| * PirOccupiedToUnoccupiedDelay                                      | 0x0010 |
+| * PirUnoccupiedToOccupiedDelay                                      | 0x0011 |
+| * PirUnoccupiedToOccupiedThreshold                                  | 0x0012 |
+| * UltrasonicOccupiedToUnoccupiedDelay                               | 0x0020 |
+| * UltrasonicUnoccupiedToOccupiedDelay                               | 0x0021 |
+| * UltrasonicUnoccupiedToOccupiedThreshold                           | 0x0022 |
+| * PhysicalContactOccupiedToUnoccupiedDelay                          | 0x0030 |
+| * PhysicalContactUnoccupiedToOccupiedDelay                          | 0x0031 |
+| * PhysicalContactUnoccupiedToOccupiedThreshold                      | 0x0032 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
-| * SoftwareFault                                                     | 0x0000 |
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command ResetWatermarks
- */
-class SoftwareDiagnosticsResetWatermarks : public ClusterCommand {
-public:
-    SoftwareDiagnosticsResetWatermarks()
-        : ClusterCommand("reset-watermarks")
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000034) command (0x00000000) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        __auto_type * params = [[CHIPSoftwareDiagnosticsClusterResetWatermarksParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster resetWatermarksWithParams:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 responsesNeeded--;
-                                 if (error != nil) {
-                                     mError = error;
-                                     LogNSError("Error", error);
-                                 }
-                                 if (responsesNeeded == 0) {
-                                     SetCommandExitStatus(mError);
-                                 }
-                             }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-};
-
-/*
- * Attribute ThreadMetrics
+ * Attribute Occupancy
  */
-class ReadSoftwareDiagnosticsThreadMetrics : public ReadAttribute {
+class ReadOccupancySensingOccupancy : public ReadAttribute {
 public:
-    ReadSoftwareDiagnosticsThreadMetrics()
-        : ReadAttribute("thread-metrics")
+    ReadOccupancySensingOccupancy()
+        : ReadAttribute("occupancy")
     {
     }
 
-    ~ReadSoftwareDiagnosticsThreadMetrics() {}
+    ~ReadOccupancySensingOccupancy() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeThreadMetricsWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SoftwareDiagnostics.ThreadMetrics response %@", [value description]);
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeOccupancyWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OccupancySensing.Occupancy response %@", [value description]);
             if (error != nil) {
-                LogNSError("SoftwareDiagnostics ThreadMetrics read Error", error);
+                LogNSError("OccupancySensing Occupancy read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -62807,34 +61711,34 @@ class ReadSoftwareDiagnosticsThreadMetrics : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSoftwareDiagnosticsThreadMetrics : public SubscribeAttribute {
+class SubscribeAttributeOccupancySensingOccupancy : public SubscribeAttribute {
 public:
-    SubscribeAttributeSoftwareDiagnosticsThreadMetrics()
-        : SubscribeAttribute("thread-metrics")
+    SubscribeAttributeOccupancySensingOccupancy()
+        : SubscribeAttribute("occupancy")
     {
     }
 
-    ~SubscribeAttributeSoftwareDiagnosticsThreadMetrics() {}
+    ~SubscribeAttributeOccupancySensingOccupancy() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeThreadMetricsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOccupancyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SoftwareDiagnostics.ThreadMetrics response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OccupancySensing.Occupancy response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -62845,29 +61749,29 @@ class SubscribeAttributeSoftwareDiagnosticsThreadMetrics : public SubscribeAttri
 };
 
 /*
- * Attribute CurrentHeapFree
+ * Attribute OccupancySensorType
  */
-class ReadSoftwareDiagnosticsCurrentHeapFree : public ReadAttribute {
+class ReadOccupancySensingOccupancySensorType : public ReadAttribute {
 public:
-    ReadSoftwareDiagnosticsCurrentHeapFree()
-        : ReadAttribute("current-heap-free")
+    ReadOccupancySensingOccupancySensorType()
+        : ReadAttribute("occupancy-sensor-type")
     {
     }
 
-    ~ReadSoftwareDiagnosticsCurrentHeapFree() {}
+    ~ReadOccupancySensingOccupancySensorType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeCurrentHeapFreeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SoftwareDiagnostics.CurrentHeapFree response %@", [value description]);
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeOccupancySensorTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OccupancySensing.OccupancySensorType response %@", [value description]);
             if (error != nil) {
-                LogNSError("SoftwareDiagnostics CurrentHeapFree read Error", error);
+                LogNSError("OccupancySensing OccupancySensorType read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -62875,34 +61779,34 @@ class ReadSoftwareDiagnosticsCurrentHeapFree : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSoftwareDiagnosticsCurrentHeapFree : public SubscribeAttribute {
+class SubscribeAttributeOccupancySensingOccupancySensorType : public SubscribeAttribute {
 public:
-    SubscribeAttributeSoftwareDiagnosticsCurrentHeapFree()
-        : SubscribeAttribute("current-heap-free")
+    SubscribeAttributeOccupancySensingOccupancySensorType()
+        : SubscribeAttribute("occupancy-sensor-type")
     {
     }
 
-    ~SubscribeAttributeSoftwareDiagnosticsCurrentHeapFree() {}
+    ~SubscribeAttributeOccupancySensingOccupancySensorType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentHeapFreeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOccupancySensorTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SoftwareDiagnostics.CurrentHeapFree response %@", [value description]);
+                NSLog(@"OccupancySensing.OccupancySensorType response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -62913,64 +61817,65 @@ class SubscribeAttributeSoftwareDiagnosticsCurrentHeapFree : public SubscribeAtt
 };
 
 /*
- * Attribute CurrentHeapUsed
+ * Attribute OccupancySensorTypeBitmap
  */
-class ReadSoftwareDiagnosticsCurrentHeapUsed : public ReadAttribute {
+class ReadOccupancySensingOccupancySensorTypeBitmap : public ReadAttribute {
 public:
-    ReadSoftwareDiagnosticsCurrentHeapUsed()
-        : ReadAttribute("current-heap-used")
+    ReadOccupancySensingOccupancySensorTypeBitmap()
+        : ReadAttribute("occupancy-sensor-type-bitmap")
     {
     }
 
-    ~ReadSoftwareDiagnosticsCurrentHeapUsed() {}
+    ~ReadOccupancySensingOccupancySensorTypeBitmap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeCurrentHeapUsedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SoftwareDiagnostics.CurrentHeapUsed response %@", [value description]);
-            if (error != nil) {
-                LogNSError("SoftwareDiagnostics CurrentHeapUsed read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster
+            readAttributeOccupancySensorTypeBitmapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OccupancySensing.OccupancySensorTypeBitmap response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("OccupancySensing OccupancySensorTypeBitmap read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeSoftwareDiagnosticsCurrentHeapUsed : public SubscribeAttribute {
+class SubscribeAttributeOccupancySensingOccupancySensorTypeBitmap : public SubscribeAttribute {
 public:
-    SubscribeAttributeSoftwareDiagnosticsCurrentHeapUsed()
-        : SubscribeAttribute("current-heap-used")
+    SubscribeAttributeOccupancySensingOccupancySensorTypeBitmap()
+        : SubscribeAttribute("occupancy-sensor-type-bitmap")
     {
     }
 
-    ~SubscribeAttributeSoftwareDiagnosticsCurrentHeapUsed() {}
+    ~SubscribeAttributeOccupancySensingOccupancySensorTypeBitmap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentHeapUsedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOccupancySensorTypeBitmapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SoftwareDiagnostics.CurrentHeapUsed response %@", [value description]);
+                NSLog(@"OccupancySensing.OccupancySensorTypeBitmap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -62981,65 +61886,106 @@ class SubscribeAttributeSoftwareDiagnosticsCurrentHeapUsed : public SubscribeAtt
 };
 
 /*
- * Attribute CurrentHeapHighWatermark
+ * Attribute PirOccupiedToUnoccupiedDelay
  */
-class ReadSoftwareDiagnosticsCurrentHeapHighWatermark : public ReadAttribute {
+class ReadOccupancySensingPirOccupiedToUnoccupiedDelay : public ReadAttribute {
 public:
-    ReadSoftwareDiagnosticsCurrentHeapHighWatermark()
-        : ReadAttribute("current-heap-high-watermark")
+    ReadOccupancySensingPirOccupiedToUnoccupiedDelay()
+        : ReadAttribute("pir-occupied-to-unoccupied-delay")
     {
     }
 
-    ~ReadSoftwareDiagnosticsCurrentHeapHighWatermark() {}
+    ~ReadOccupancySensingPirOccupiedToUnoccupiedDelay() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x00000010) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster
-            readAttributeCurrentHeapHighWatermarkWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SoftwareDiagnostics.CurrentHeapHighWatermark response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("SoftwareDiagnostics CurrentHeapHighWatermark read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributePirOccupiedToUnoccupiedDelayWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OccupancySensing.PirOccupiedToUnoccupiedDelay response %@", [value description]);
+            if (error != nil) {
+                LogNSError("OccupancySensing PirOccupiedToUnoccupiedDelay read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeSoftwareDiagnosticsCurrentHeapHighWatermark : public SubscribeAttribute {
+class WriteOccupancySensingPirOccupiedToUnoccupiedDelay : public WriteAttribute {
 public:
-    SubscribeAttributeSoftwareDiagnosticsCurrentHeapHighWatermark()
-        : SubscribeAttribute("current-heap-high-watermark")
+    WriteOccupancySensingPirOccupiedToUnoccupiedDelay()
+        : WriteAttribute("pir-occupied-to-unoccupied-delay")
     {
+        AddArgument("attr-name", "pir-occupied-to-unoccupied-delay");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeSoftwareDiagnosticsCurrentHeapHighWatermark() {}
+    ~WriteOccupancySensingPirOccupiedToUnoccupiedDelay() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) WriteAttribute (0x00000010) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster writeAttributePirOccupiedToUnoccupiedDelayWithValue:value
+                                                              params:params
+                                                   completionHandler:^(NSError * _Nullable error) {
+                                                       if (error != nil) {
+                                                           LogNSError(
+                                                               "OccupancySensing PirOccupiedToUnoccupiedDelay write Error", error);
+                                                       }
+                                                       SetCommandExitStatus(error);
+                                                   }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeOccupancySensingPirOccupiedToUnoccupiedDelay : public SubscribeAttribute {
+public:
+    SubscribeAttributeOccupancySensingPirOccupiedToUnoccupiedDelay()
+        : SubscribeAttribute("pir-occupied-to-unoccupied-delay")
+    {
+    }
+
+    ~SubscribeAttributeOccupancySensingPirOccupiedToUnoccupiedDelay() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x00000010) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentHeapHighWatermarkWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePirOccupiedToUnoccupiedDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SoftwareDiagnostics.CurrentHeapHighWatermark response %@", [value description]);
+                NSLog(@"OccupancySensing.PirOccupiedToUnoccupiedDelay response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -63050,29 +61996,30 @@ class SubscribeAttributeSoftwareDiagnosticsCurrentHeapHighWatermark : public Sub
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute PirUnoccupiedToOccupiedDelay
  */
-class ReadSoftwareDiagnosticsGeneratedCommandList : public ReadAttribute {
+class ReadOccupancySensingPirUnoccupiedToOccupiedDelay : public ReadAttribute {
 public:
-    ReadSoftwareDiagnosticsGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadOccupancySensingPirUnoccupiedToOccupiedDelay()
+        : ReadAttribute("pir-unoccupied-to-occupied-delay")
     {
     }
 
-    ~ReadSoftwareDiagnosticsGeneratedCommandList() {}
+    ~ReadOccupancySensingPirUnoccupiedToOccupiedDelay() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x00000011) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SoftwareDiagnostics.GeneratedCommandList response %@", [value description]);
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributePirUnoccupiedToOccupiedDelayWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OccupancySensing.PirUnoccupiedToOccupiedDelay response %@", [value description]);
             if (error != nil) {
-                LogNSError("SoftwareDiagnostics GeneratedCommandList read Error", error);
+                LogNSError("OccupancySensing PirUnoccupiedToOccupiedDelay read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -63080,34 +62027,75 @@ class ReadSoftwareDiagnosticsGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSoftwareDiagnosticsGeneratedCommandList : public SubscribeAttribute {
+class WriteOccupancySensingPirUnoccupiedToOccupiedDelay : public WriteAttribute {
 public:
-    SubscribeAttributeSoftwareDiagnosticsGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    WriteOccupancySensingPirUnoccupiedToOccupiedDelay()
+        : WriteAttribute("pir-unoccupied-to-occupied-delay")
     {
+        AddArgument("attr-name", "pir-unoccupied-to-occupied-delay");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeSoftwareDiagnosticsGeneratedCommandList() {}
+    ~WriteOccupancySensingPirUnoccupiedToOccupiedDelay() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) WriteAttribute (0x00000011) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster writeAttributePirUnoccupiedToOccupiedDelayWithValue:value
+                                                              params:params
+                                                   completionHandler:^(NSError * _Nullable error) {
+                                                       if (error != nil) {
+                                                           LogNSError(
+                                                               "OccupancySensing PirUnoccupiedToOccupiedDelay write Error", error);
+                                                       }
+                                                       SetCommandExitStatus(error);
+                                                   }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedDelay : public SubscribeAttribute {
+public:
+    SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedDelay()
+        : SubscribeAttribute("pir-unoccupied-to-occupied-delay")
+    {
+    }
+
+    ~SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedDelay() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x00000011) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePirUnoccupiedToOccupiedDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SoftwareDiagnostics.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OccupancySensing.PirUnoccupiedToOccupiedDelay response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -63118,29 +62106,30 @@ class SubscribeAttributeSoftwareDiagnosticsGeneratedCommandList : public Subscri
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute PirUnoccupiedToOccupiedThreshold
  */
-class ReadSoftwareDiagnosticsAcceptedCommandList : public ReadAttribute {
+class ReadOccupancySensingPirUnoccupiedToOccupiedThreshold : public ReadAttribute {
 public:
-    ReadSoftwareDiagnosticsAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadOccupancySensingPirUnoccupiedToOccupiedThreshold()
+        : ReadAttribute("pir-unoccupied-to-occupied-threshold")
     {
     }
 
-    ~ReadSoftwareDiagnosticsAcceptedCommandList() {}
+    ~ReadOccupancySensingPirUnoccupiedToOccupiedThreshold() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x00000012) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SoftwareDiagnostics.AcceptedCommandList response %@", [value description]);
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributePirUnoccupiedToOccupiedThresholdWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OccupancySensing.PirUnoccupiedToOccupiedThreshold response %@", [value description]);
             if (error != nil) {
-                LogNSError("SoftwareDiagnostics AcceptedCommandList read Error", error);
+                LogNSError("OccupancySensing PirUnoccupiedToOccupiedThreshold read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -63148,34 +62137,76 @@ class ReadSoftwareDiagnosticsAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSoftwareDiagnosticsAcceptedCommandList : public SubscribeAttribute {
+class WriteOccupancySensingPirUnoccupiedToOccupiedThreshold : public WriteAttribute {
 public:
-    SubscribeAttributeSoftwareDiagnosticsAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    WriteOccupancySensingPirUnoccupiedToOccupiedThreshold()
+        : WriteAttribute("pir-unoccupied-to-occupied-threshold")
     {
+        AddArgument("attr-name", "pir-unoccupied-to-occupied-threshold");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeSoftwareDiagnosticsAcceptedCommandList() {}
+    ~WriteOccupancySensingPirUnoccupiedToOccupiedThreshold() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) WriteAttribute (0x00000012) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributePirUnoccupiedToOccupiedThresholdWithValue:value
+                                                                  params:params
+                                                       completionHandler:^(NSError * _Nullable error) {
+                                                           if (error != nil) {
+                                                               LogNSError(
+                                                                   "OccupancySensing PirUnoccupiedToOccupiedThreshold write Error",
+                                                                   error);
+                                                           }
+                                                           SetCommandExitStatus(error);
+                                                       }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedThreshold : public SubscribeAttribute {
+public:
+    SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedThreshold()
+        : SubscribeAttribute("pir-unoccupied-to-occupied-threshold")
+    {
+    }
+
+    ~SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedThreshold() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x00000012) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePirUnoccupiedToOccupiedThresholdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SoftwareDiagnostics.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OccupancySensing.PirUnoccupiedToOccupiedThreshold response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -63186,29 +62217,30 @@ class SubscribeAttributeSoftwareDiagnosticsAcceptedCommandList : public Subscrib
 };
 
 /*
- * Attribute AttributeList
+ * Attribute UltrasonicOccupiedToUnoccupiedDelay
  */
-class ReadSoftwareDiagnosticsAttributeList : public ReadAttribute {
+class ReadOccupancySensingUltrasonicOccupiedToUnoccupiedDelay : public ReadAttribute {
 public:
-    ReadSoftwareDiagnosticsAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadOccupancySensingUltrasonicOccupiedToUnoccupiedDelay()
+        : ReadAttribute("ultrasonic-occupied-to-unoccupied-delay")
     {
     }
 
-    ~ReadSoftwareDiagnosticsAttributeList() {}
+    ~ReadOccupancySensingUltrasonicOccupiedToUnoccupiedDelay() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x00000020) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SoftwareDiagnostics.AttributeList response %@", [value description]);
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeUltrasonicOccupiedToUnoccupiedDelayWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OccupancySensing.UltrasonicOccupiedToUnoccupiedDelay response %@", [value description]);
             if (error != nil) {
-                LogNSError("SoftwareDiagnostics AttributeList read Error", error);
+                LogNSError("OccupancySensing UltrasonicOccupiedToUnoccupiedDelay read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -63216,34 +62248,77 @@ class ReadSoftwareDiagnosticsAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSoftwareDiagnosticsAttributeList : public SubscribeAttribute {
+class WriteOccupancySensingUltrasonicOccupiedToUnoccupiedDelay : public WriteAttribute {
 public:
-    SubscribeAttributeSoftwareDiagnosticsAttributeList()
-        : SubscribeAttribute("attribute-list")
+    WriteOccupancySensingUltrasonicOccupiedToUnoccupiedDelay()
+        : WriteAttribute("ultrasonic-occupied-to-unoccupied-delay")
     {
+        AddArgument("attr-name", "ultrasonic-occupied-to-unoccupied-delay");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeSoftwareDiagnosticsAttributeList() {}
+    ~WriteOccupancySensingUltrasonicOccupiedToUnoccupiedDelay() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) WriteAttribute (0x00000020) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster
+            writeAttributeUltrasonicOccupiedToUnoccupiedDelayWithValue:value
+                                                                params:params
+                                                     completionHandler:^(NSError * _Nullable error) {
+                                                         if (error != nil) {
+                                                             LogNSError(
+                                                                 "OccupancySensing UltrasonicOccupiedToUnoccupiedDelay write Error",
+                                                                 error);
+                                                         }
+                                                         SetCommandExitStatus(error);
+                                                     }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeOccupancySensingUltrasonicOccupiedToUnoccupiedDelay : public SubscribeAttribute {
+public:
+    SubscribeAttributeOccupancySensingUltrasonicOccupiedToUnoccupiedDelay()
+        : SubscribeAttribute("ultrasonic-occupied-to-unoccupied-delay")
+    {
+    }
+
+    ~SubscribeAttributeOccupancySensingUltrasonicOccupiedToUnoccupiedDelay() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x00000020) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeUltrasonicOccupiedToUnoccupiedDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SoftwareDiagnostics.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"OccupancySensing.UltrasonicOccupiedToUnoccupiedDelay response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -63254,29 +62329,30 @@ class SubscribeAttributeSoftwareDiagnosticsAttributeList : public SubscribeAttri
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute UltrasonicUnoccupiedToOccupiedDelay
  */
-class ReadSoftwareDiagnosticsFeatureMap : public ReadAttribute {
+class ReadOccupancySensingUltrasonicUnoccupiedToOccupiedDelay : public ReadAttribute {
 public:
-    ReadSoftwareDiagnosticsFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadOccupancySensingUltrasonicUnoccupiedToOccupiedDelay()
+        : ReadAttribute("ultrasonic-unoccupied-to-occupied-delay")
     {
     }
 
-    ~ReadSoftwareDiagnosticsFeatureMap() {}
+    ~ReadOccupancySensingUltrasonicUnoccupiedToOccupiedDelay() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x00000021) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SoftwareDiagnostics.FeatureMap response %@", [value description]);
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeUltrasonicUnoccupiedToOccupiedDelayWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OccupancySensing.UltrasonicUnoccupiedToOccupiedDelay response %@", [value description]);
             if (error != nil) {
-                LogNSError("SoftwareDiagnostics FeatureMap read Error", error);
+                LogNSError("OccupancySensing UltrasonicUnoccupiedToOccupiedDelay read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -63284,34 +62360,77 @@ class ReadSoftwareDiagnosticsFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSoftwareDiagnosticsFeatureMap : public SubscribeAttribute {
+class WriteOccupancySensingUltrasonicUnoccupiedToOccupiedDelay : public WriteAttribute {
 public:
-    SubscribeAttributeSoftwareDiagnosticsFeatureMap()
-        : SubscribeAttribute("feature-map")
+    WriteOccupancySensingUltrasonicUnoccupiedToOccupiedDelay()
+        : WriteAttribute("ultrasonic-unoccupied-to-occupied-delay")
     {
+        AddArgument("attr-name", "ultrasonic-unoccupied-to-occupied-delay");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeSoftwareDiagnosticsFeatureMap() {}
+    ~WriteOccupancySensingUltrasonicUnoccupiedToOccupiedDelay() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) WriteAttribute (0x00000021) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster
+            writeAttributeUltrasonicUnoccupiedToOccupiedDelayWithValue:value
+                                                                params:params
+                                                     completionHandler:^(NSError * _Nullable error) {
+                                                         if (error != nil) {
+                                                             LogNSError(
+                                                                 "OccupancySensing UltrasonicUnoccupiedToOccupiedDelay write Error",
+                                                                 error);
+                                                         }
+                                                         SetCommandExitStatus(error);
+                                                     }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeOccupancySensingUltrasonicUnoccupiedToOccupiedDelay : public SubscribeAttribute {
+public:
+    SubscribeAttributeOccupancySensingUltrasonicUnoccupiedToOccupiedDelay()
+        : SubscribeAttribute("ultrasonic-unoccupied-to-occupied-delay")
+    {
+    }
+
+    ~SubscribeAttributeOccupancySensingUltrasonicUnoccupiedToOccupiedDelay() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x00000021) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeUltrasonicUnoccupiedToOccupiedDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SoftwareDiagnostics.FeatureMap response %@", [value description]);
+                NSLog(@"OccupancySensing.UltrasonicUnoccupiedToOccupiedDelay response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -63322,29 +62441,30 @@ class SubscribeAttributeSoftwareDiagnosticsFeatureMap : public SubscribeAttribut
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute UltrasonicUnoccupiedToOccupiedThreshold
  */
-class ReadSoftwareDiagnosticsClusterRevision : public ReadAttribute {
+class ReadOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold : public ReadAttribute {
 public:
-    ReadSoftwareDiagnosticsClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold()
+        : ReadAttribute("ultrasonic-unoccupied-to-occupied-threshold")
     {
     }
 
-    ~ReadSoftwareDiagnosticsClusterRevision() {}
+    ~ReadOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x00000022) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SoftwareDiagnostics.ClusterRevision response %@", [value description]);
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeUltrasonicUnoccupiedToOccupiedThresholdWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OccupancySensing.UltrasonicUnoccupiedToOccupiedThreshold response %@", [value description]);
             if (error != nil) {
-                LogNSError("SoftwareDiagnostics ClusterRevision read Error", error);
+                LogNSError("OccupancySensing UltrasonicUnoccupiedToOccupiedThreshold read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -63352,34 +62472,78 @@ class ReadSoftwareDiagnosticsClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSoftwareDiagnosticsClusterRevision : public SubscribeAttribute {
+class WriteOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold : public WriteAttribute {
 public:
-    SubscribeAttributeSoftwareDiagnosticsClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    WriteOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold()
+        : WriteAttribute("ultrasonic-unoccupied-to-occupied-threshold")
     {
+        AddArgument("attr-name", "ultrasonic-unoccupied-to-occupied-threshold");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeSoftwareDiagnosticsClusterRevision() {}
+    ~WriteOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000034) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) WriteAttribute (0x00000022) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSoftwareDiagnostics * cluster = [[CHIPSoftwareDiagnostics alloc] initWithDevice:device
-                                                                                   endpoint:endpointId
-                                                                                      queue:callbackQueue];
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster
+            writeAttributeUltrasonicUnoccupiedToOccupiedThresholdWithValue:value
+                                                                    params:params
+                                                         completionHandler:^(NSError * _Nullable error) {
+                                                             if (error != nil) {
+                                                                 LogNSError("OccupancySensing "
+                                                                            "UltrasonicUnoccupiedToOccupiedThreshold write Error",
+                                                                     error);
+                                                             }
+                                                             SetCommandExitStatus(error);
+                                                         }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold : public SubscribeAttribute {
+public:
+    SubscribeAttributeOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold()
+        : SubscribeAttribute("ultrasonic-unoccupied-to-occupied-threshold")
+    {
+    }
+
+    ~SubscribeAttributeOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x00000022) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster
+            subscribeAttributeUltrasonicUnoccupiedToOccupiedThresholdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SoftwareDiagnostics.ClusterRevision response %@", [value description]);
+                NSLog(@"OccupancySensing.UltrasonicUnoccupiedToOccupiedThreshold response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -63389,53 +62553,31 @@ class SubscribeAttributeSoftwareDiagnosticsClusterRevision : public SubscribeAtt
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster Switch                                                      | 0x003B |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * NumberOfPositions                                                 | 0x0000 |
-| * CurrentPosition                                                   | 0x0001 |
-| * MultiPressMax                                                     | 0x0002 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-| * SwitchLatched                                                     | 0x0000 |
-| * InitialPress                                                      | 0x0001 |
-| * LongPress                                                         | 0x0002 |
-| * ShortRelease                                                      | 0x0003 |
-| * LongRelease                                                       | 0x0004 |
-| * MultiPressOngoing                                                 | 0x0005 |
-| * MultiPressComplete                                                | 0x0006 |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Attribute NumberOfPositions
+ * Attribute PhysicalContactOccupiedToUnoccupiedDelay
  */
-class ReadSwitchNumberOfPositions : public ReadAttribute {
+class ReadOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay : public ReadAttribute {
 public:
-    ReadSwitchNumberOfPositions()
-        : ReadAttribute("number-of-positions")
+    ReadOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay()
+        : ReadAttribute("physical-contact-occupied-to-unoccupied-delay")
     {
     }
 
-    ~ReadSwitchNumberOfPositions() {}
+    ~ReadOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x00000030) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNumberOfPositionsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Switch.NumberOfPositions response %@", [value description]);
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributePhysicalContactOccupiedToUnoccupiedDelayWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OccupancySensing.PhysicalContactOccupiedToUnoccupiedDelay response %@", [value description]);
             if (error != nil) {
-                LogNSError("Switch NumberOfPositions read Error", error);
+                LogNSError("OccupancySensing PhysicalContactOccupiedToUnoccupiedDelay read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -63443,32 +62585,78 @@ class ReadSwitchNumberOfPositions : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSwitchNumberOfPositions : public SubscribeAttribute {
+class WriteOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay : public WriteAttribute {
 public:
-    SubscribeAttributeSwitchNumberOfPositions()
-        : SubscribeAttribute("number-of-positions")
+    WriteOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay()
+        : WriteAttribute("physical-contact-occupied-to-unoccupied-delay")
     {
+        AddArgument("attr-name", "physical-contact-occupied-to-unoccupied-delay");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeSwitchNumberOfPositions() {}
+    ~WriteOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) WriteAttribute (0x00000030) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster
+            writeAttributePhysicalContactOccupiedToUnoccupiedDelayWithValue:value
+                                                                     params:params
+                                                          completionHandler:^(NSError * _Nullable error) {
+                                                              if (error != nil) {
+                                                                  LogNSError("OccupancySensing "
+                                                                             "PhysicalContactOccupiedToUnoccupiedDelay write Error",
+                                                                      error);
+                                                              }
+                                                              SetCommandExitStatus(error);
+                                                          }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay : public SubscribeAttribute {
+public:
+    SubscribeAttributeOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay()
+        : SubscribeAttribute("physical-contact-occupied-to-unoccupied-delay")
+    {
+    }
+
+    ~SubscribeAttributeOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x00000030) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNumberOfPositionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster
+            subscribeAttributePhysicalContactOccupiedToUnoccupiedDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Switch.NumberOfPositions response %@", [value description]);
+                NSLog(@"OccupancySensing.PhysicalContactOccupiedToUnoccupiedDelay response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -63479,27 +62667,30 @@ class SubscribeAttributeSwitchNumberOfPositions : public SubscribeAttribute {
 };
 
 /*
- * Attribute CurrentPosition
+ * Attribute PhysicalContactUnoccupiedToOccupiedDelay
  */
-class ReadSwitchCurrentPosition : public ReadAttribute {
+class ReadOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay : public ReadAttribute {
 public:
-    ReadSwitchCurrentPosition()
-        : ReadAttribute("current-position")
+    ReadOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay()
+        : ReadAttribute("physical-contact-unoccupied-to-occupied-delay")
     {
     }
 
-    ~ReadSwitchCurrentPosition() {}
+    ~ReadOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x00000031) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCurrentPositionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Switch.CurrentPosition response %@", [value description]);
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributePhysicalContactUnoccupiedToOccupiedDelayWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OccupancySensing.PhysicalContactUnoccupiedToOccupiedDelay response %@", [value description]);
             if (error != nil) {
-                LogNSError("Switch CurrentPosition read Error", error);
+                LogNSError("OccupancySensing PhysicalContactUnoccupiedToOccupiedDelay read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -63507,32 +62698,78 @@ class ReadSwitchCurrentPosition : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSwitchCurrentPosition : public SubscribeAttribute {
+class WriteOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay : public WriteAttribute {
 public:
-    SubscribeAttributeSwitchCurrentPosition()
-        : SubscribeAttribute("current-position")
+    WriteOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay()
+        : WriteAttribute("physical-contact-unoccupied-to-occupied-delay")
     {
+        AddArgument("attr-name", "physical-contact-unoccupied-to-occupied-delay");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeSwitchCurrentPosition() {}
+    ~WriteOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) WriteAttribute (0x00000031) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster
+            writeAttributePhysicalContactUnoccupiedToOccupiedDelayWithValue:value
+                                                                     params:params
+                                                          completionHandler:^(NSError * _Nullable error) {
+                                                              if (error != nil) {
+                                                                  LogNSError("OccupancySensing "
+                                                                             "PhysicalContactUnoccupiedToOccupiedDelay write Error",
+                                                                      error);
+                                                              }
+                                                              SetCommandExitStatus(error);
+                                                          }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay : public SubscribeAttribute {
+public:
+    SubscribeAttributeOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay()
+        : SubscribeAttribute("physical-contact-unoccupied-to-occupied-delay")
+    {
+    }
+
+    ~SubscribeAttributeOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x00000031) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentPositionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster
+            subscribeAttributePhysicalContactUnoccupiedToOccupiedDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Switch.CurrentPosition response %@", [value description]);
+                NSLog(@"OccupancySensing.PhysicalContactUnoccupiedToOccupiedDelay response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -63543,27 +62780,30 @@ class SubscribeAttributeSwitchCurrentPosition : public SubscribeAttribute {
 };
 
 /*
- * Attribute MultiPressMax
+ * Attribute PhysicalContactUnoccupiedToOccupiedThreshold
  */
-class ReadSwitchMultiPressMax : public ReadAttribute {
+class ReadOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold : public ReadAttribute {
 public:
-    ReadSwitchMultiPressMax()
-        : ReadAttribute("multi-press-max")
+    ReadOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold()
+        : ReadAttribute("physical-contact-unoccupied-to-occupied-threshold")
     {
     }
 
-    ~ReadSwitchMultiPressMax() {}
+    ~ReadOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x00000032) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeMultiPressMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Switch.MultiPressMax response %@", [value description]);
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributePhysicalContactUnoccupiedToOccupiedThresholdWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"OccupancySensing.PhysicalContactUnoccupiedToOccupiedThreshold response %@", [value description]);
             if (error != nil) {
-                LogNSError("Switch MultiPressMax read Error", error);
+                LogNSError("OccupancySensing PhysicalContactUnoccupiedToOccupiedThreshold read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -63571,32 +62811,79 @@ class ReadSwitchMultiPressMax : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSwitchMultiPressMax : public SubscribeAttribute {
+class WriteOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold : public WriteAttribute {
 public:
-    SubscribeAttributeSwitchMultiPressMax()
-        : SubscribeAttribute("multi-press-max")
+    WriteOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold()
+        : WriteAttribute("physical-contact-unoccupied-to-occupied-threshold")
     {
+        AddArgument("attr-name", "physical-contact-unoccupied-to-occupied-threshold");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeSwitchMultiPressMax() {}
+    ~WriteOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) WriteAttribute (0x00000032) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributePhysicalContactUnoccupiedToOccupiedThresholdWithValue:value
+                                                                              params:params
+                                                                   completionHandler:^(NSError * _Nullable error) {
+                                                                       if (error != nil) {
+                                                                           LogNSError("OccupancySensing "
+                                                                                      "PhysicalContactUnoccupiedToOccupiedThreshold"
+                                                                                      " write Error",
+                                                                               error);
+                                                                       }
+                                                                       SetCommandExitStatus(error);
+                                                                   }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold : public SubscribeAttribute {
+public:
+    SubscribeAttributeOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold()
+        : SubscribeAttribute("physical-contact-unoccupied-to-occupied-threshold")
+    {
+    }
+
+    ~SubscribeAttributeOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x00000032) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMultiPressMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster
+            subscribeAttributePhysicalContactUnoccupiedToOccupiedThresholdWithMinInterval:[NSNumber
+                                                                                              numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Switch.MultiPressMax response %@", [value description]);
+                NSLog(@"OccupancySensing.PhysicalContactUnoccupiedToOccupiedThreshold response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -63609,25 +62896,27 @@ class SubscribeAttributeSwitchMultiPressMax : public SubscribeAttribute {
 /*
  * Attribute GeneratedCommandList
  */
-class ReadSwitchGeneratedCommandList : public ReadAttribute {
+class ReadOccupancySensingGeneratedCommandList : public ReadAttribute {
 public:
-    ReadSwitchGeneratedCommandList()
+    ReadOccupancySensingGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadSwitchGeneratedCommandList() {}
+    ~ReadOccupancySensingGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Switch.GeneratedCommandList response %@", [value description]);
+            NSLog(@"OccupancySensing.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("Switch GeneratedCommandList read Error", error);
+                LogNSError("OccupancySensing GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -63635,20 +62924,22 @@ class ReadSwitchGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSwitchGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeOccupancySensingGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeSwitchGeneratedCommandList()
+    SubscribeAttributeOccupancySensingGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeSwitchGeneratedCommandList() {}
+    ~SubscribeAttributeOccupancySensingGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -63660,7 +62951,7 @@ class SubscribeAttributeSwitchGeneratedCommandList : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Switch.GeneratedCommandList response %@", [value description]);
+                NSLog(@"OccupancySensing.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -63673,25 +62964,27 @@ class SubscribeAttributeSwitchGeneratedCommandList : public SubscribeAttribute {
 /*
  * Attribute AcceptedCommandList
  */
-class ReadSwitchAcceptedCommandList : public ReadAttribute {
+class ReadOccupancySensingAcceptedCommandList : public ReadAttribute {
 public:
-    ReadSwitchAcceptedCommandList()
+    ReadOccupancySensingAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadSwitchAcceptedCommandList() {}
+    ~ReadOccupancySensingAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Switch.AcceptedCommandList response %@", [value description]);
+            NSLog(@"OccupancySensing.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("Switch AcceptedCommandList read Error", error);
+                LogNSError("OccupancySensing AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -63699,20 +62992,22 @@ class ReadSwitchAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSwitchAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeOccupancySensingAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeSwitchAcceptedCommandList()
+    SubscribeAttributeOccupancySensingAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeSwitchAcceptedCommandList() {}
+    ~SubscribeAttributeOccupancySensingAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -63724,7 +63019,7 @@ class SubscribeAttributeSwitchAcceptedCommandList : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Switch.AcceptedCommandList response %@", [value description]);
+                NSLog(@"OccupancySensing.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -63737,25 +63032,27 @@ class SubscribeAttributeSwitchAcceptedCommandList : public SubscribeAttribute {
 /*
  * Attribute AttributeList
  */
-class ReadSwitchAttributeList : public ReadAttribute {
+class ReadOccupancySensingAttributeList : public ReadAttribute {
 public:
-    ReadSwitchAttributeList()
+    ReadOccupancySensingAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadSwitchAttributeList() {}
+    ~ReadOccupancySensingAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Switch.AttributeList response %@", [value description]);
+            NSLog(@"OccupancySensing.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("Switch AttributeList read Error", error);
+                LogNSError("OccupancySensing AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -63763,20 +63060,22 @@ class ReadSwitchAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSwitchAttributeList : public SubscribeAttribute {
+class SubscribeAttributeOccupancySensingAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeSwitchAttributeList()
+    SubscribeAttributeOccupancySensingAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeSwitchAttributeList() {}
+    ~SubscribeAttributeOccupancySensingAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -63788,7 +63087,7 @@ class SubscribeAttributeSwitchAttributeList : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Switch.AttributeList response %@", [value description]);
+                NSLog(@"OccupancySensing.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -63801,25 +63100,27 @@ class SubscribeAttributeSwitchAttributeList : public SubscribeAttribute {
 /*
  * Attribute FeatureMap
  */
-class ReadSwitchFeatureMap : public ReadAttribute {
+class ReadOccupancySensingFeatureMap : public ReadAttribute {
 public:
-    ReadSwitchFeatureMap()
+    ReadOccupancySensingFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadSwitchFeatureMap() {}
+    ~ReadOccupancySensingFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Switch.FeatureMap response %@", [value description]);
+            NSLog(@"OccupancySensing.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("Switch FeatureMap read Error", error);
+                LogNSError("OccupancySensing FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -63827,20 +63128,22 @@ class ReadSwitchFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSwitchFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeOccupancySensingFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeSwitchFeatureMap()
+    SubscribeAttributeOccupancySensingFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeSwitchFeatureMap() {}
+    ~SubscribeAttributeOccupancySensingFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -63852,7 +63155,7 @@ class SubscribeAttributeSwitchFeatureMap : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Switch.FeatureMap response %@", [value description]);
+                NSLog(@"OccupancySensing.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -63865,25 +63168,27 @@ class SubscribeAttributeSwitchFeatureMap : public SubscribeAttribute {
 /*
  * Attribute ClusterRevision
  */
-class ReadSwitchClusterRevision : public ReadAttribute {
+class ReadOccupancySensingClusterRevision : public ReadAttribute {
 public:
-    ReadSwitchClusterRevision()
+    ReadOccupancySensingClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadSwitchClusterRevision() {}
+    ~ReadOccupancySensingClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Switch.ClusterRevision response %@", [value description]);
+            NSLog(@"OccupancySensing.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("Switch ClusterRevision read Error", error);
+                LogNSError("OccupancySensing ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -63891,20 +63196,22 @@ class ReadSwitchClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSwitchClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeOccupancySensingClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeSwitchClusterRevision()
+    SubscribeAttributeOccupancySensingClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeSwitchClusterRevision() {}
+    ~SubscribeAttributeOccupancySensingClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000003B) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000406) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPOccupancySensing * cluster = [[CHIPOccupancySensing alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -63916,7 +63223,7 @@ class SubscribeAttributeSwitchClusterRevision : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Switch.ClusterRevision response %@", [value description]);
+                NSLog(@"OccupancySensing.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -63927,14 +63234,12 @@ class SubscribeAttributeSwitchClusterRevision : public SubscribeAttribute {
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster TargetNavigator                                             | 0x0505 |
+| Cluster WakeOnLan                                                   | 0x0503 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * NavigateTarget                                                    |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * TargetList                                                        | 0x0000 |
-| * CurrentTarget                                                     | 0x0001 |
+| * MACAddress                                                        | 0x0000 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -63945,145 +63250,27 @@ class SubscribeAttributeSwitchClusterRevision : public SubscribeAttribute {
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command NavigateTarget
- */
-class TargetNavigatorNavigateTarget : public ClusterCommand {
-public:
-    TargetNavigatorNavigateTarget()
-        : ClusterCommand("navigate-target")
-    {
-        AddArgument("Target", 0, UINT8_MAX, &mRequest.target);
-        AddArgument("Data", &mRequest.data);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000505) command (0x00000000) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPTargetNavigatorClusterNavigateTargetParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.target = [NSNumber numberWithUnsignedChar:mRequest.target];
-        if (mRequest.data.HasValue()) {
-            params.data = [[NSString alloc] initWithBytes:mRequest.data.Value().data()
-                                                   length:mRequest.data.Value().size()
-                                                 encoding:NSUTF8StringEncoding];
-        } else {
-            params.data = nil;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster navigateTargetWithParams:params
-                            completionHandler:^(CHIPTargetNavigatorClusterNavigateTargetResponseParams * _Nullable values,
-                                NSError * _Nullable error) {
-                                NSLog(@"Values: %@", values);
-                                responsesNeeded--;
-                                if (error != nil) {
-                                    mError = error;
-                                    LogNSError("Error", error);
-                                }
-                                if (responsesNeeded == 0) {
-                                    SetCommandExitStatus(mError);
-                                }
-                            }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::Clusters::TargetNavigator::Commands::NavigateTarget::Type mRequest;
-};
-
-/*
- * Attribute TargetList
- */
-class ReadTargetNavigatorTargetList : public ReadAttribute {
-public:
-    ReadTargetNavigatorTargetList()
-        : ReadAttribute("target-list")
-    {
-    }
-
-    ~ReadTargetNavigatorTargetList() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReadAttribute (0x00000000) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeTargetListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TargetNavigator.TargetList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("TargetNavigator TargetList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class SubscribeAttributeTargetNavigatorTargetList : public SubscribeAttribute {
-public:
-    SubscribeAttributeTargetNavigatorTargetList()
-        : SubscribeAttribute("target-list")
-    {
-    }
-
-    ~SubscribeAttributeTargetNavigatorTargetList() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReportAttribute (0x00000000) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTargetListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TargetNavigator.TargetList response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-/*
- * Attribute CurrentTarget
+ * Attribute MACAddress
  */
-class ReadTargetNavigatorCurrentTarget : public ReadAttribute {
+class ReadWakeOnLanMACAddress : public ReadAttribute {
 public:
-    ReadTargetNavigatorCurrentTarget()
-        : ReadAttribute("current-target")
+    ReadWakeOnLanMACAddress()
+        : ReadAttribute("macaddress")
     {
     }
 
-    ~ReadTargetNavigatorCurrentTarget() {}
+    ~ReadWakeOnLanMACAddress() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000503) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCurrentTargetWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TargetNavigator.CurrentTarget response %@", [value description]);
+        CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeMACAddressWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"WakeOnLan.MACAddress response %@", [value description]);
             if (error != nil) {
-                LogNSError("TargetNavigator CurrentTarget read Error", error);
+                LogNSError("WakeOnLan MACAddress read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -64091,32 +63278,32 @@ class ReadTargetNavigatorCurrentTarget : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTargetNavigatorCurrentTarget : public SubscribeAttribute {
+class SubscribeAttributeWakeOnLanMACAddress : public SubscribeAttribute {
 public:
-    SubscribeAttributeTargetNavigatorCurrentTarget()
-        : SubscribeAttribute("current-target")
+    SubscribeAttributeWakeOnLanMACAddress()
+        : SubscribeAttribute("macaddress")
     {
     }
 
-    ~SubscribeAttributeTargetNavigatorCurrentTarget() {}
+    ~SubscribeAttributeWakeOnLanMACAddress() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000503) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentTargetWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMACAddressWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TargetNavigator.CurrentTarget response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"WakeOnLan.MACAddress response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -64129,25 +63316,25 @@ class SubscribeAttributeTargetNavigatorCurrentTarget : public SubscribeAttribute
 /*
  * Attribute GeneratedCommandList
  */
-class ReadTargetNavigatorGeneratedCommandList : public ReadAttribute {
+class ReadWakeOnLanGeneratedCommandList : public ReadAttribute {
 public:
-    ReadTargetNavigatorGeneratedCommandList()
+    ReadWakeOnLanGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadTargetNavigatorGeneratedCommandList() {}
+    ~ReadWakeOnLanGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000503) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TargetNavigator.GeneratedCommandList response %@", [value description]);
+            NSLog(@"WakeOnLan.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TargetNavigator GeneratedCommandList read Error", error);
+                LogNSError("WakeOnLan GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -64155,20 +63342,20 @@ class ReadTargetNavigatorGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTargetNavigatorGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeWakeOnLanGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTargetNavigatorGeneratedCommandList()
+    SubscribeAttributeWakeOnLanGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeTargetNavigatorGeneratedCommandList() {}
+    ~SubscribeAttributeWakeOnLanGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000503) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -64180,7 +63367,7 @@ class SubscribeAttributeTargetNavigatorGeneratedCommandList : public SubscribeAt
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TargetNavigator.GeneratedCommandList response %@", [value description]);
+                NSLog(@"WakeOnLan.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -64193,25 +63380,25 @@ class SubscribeAttributeTargetNavigatorGeneratedCommandList : public SubscribeAt
 /*
  * Attribute AcceptedCommandList
  */
-class ReadTargetNavigatorAcceptedCommandList : public ReadAttribute {
+class ReadWakeOnLanAcceptedCommandList : public ReadAttribute {
 public:
-    ReadTargetNavigatorAcceptedCommandList()
+    ReadWakeOnLanAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadTargetNavigatorAcceptedCommandList() {}
+    ~ReadWakeOnLanAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000503) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TargetNavigator.AcceptedCommandList response %@", [value description]);
+            NSLog(@"WakeOnLan.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TargetNavigator AcceptedCommandList read Error", error);
+                LogNSError("WakeOnLan AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -64219,20 +63406,20 @@ class ReadTargetNavigatorAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTargetNavigatorAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeWakeOnLanAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTargetNavigatorAcceptedCommandList()
+    SubscribeAttributeWakeOnLanAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeTargetNavigatorAcceptedCommandList() {}
+    ~SubscribeAttributeWakeOnLanAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000503) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -64244,7 +63431,7 @@ class SubscribeAttributeTargetNavigatorAcceptedCommandList : public SubscribeAtt
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TargetNavigator.AcceptedCommandList response %@", [value description]);
+                NSLog(@"WakeOnLan.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -64257,25 +63444,25 @@ class SubscribeAttributeTargetNavigatorAcceptedCommandList : public SubscribeAtt
 /*
  * Attribute AttributeList
  */
-class ReadTargetNavigatorAttributeList : public ReadAttribute {
+class ReadWakeOnLanAttributeList : public ReadAttribute {
 public:
-    ReadTargetNavigatorAttributeList()
+    ReadWakeOnLanAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadTargetNavigatorAttributeList() {}
+    ~ReadWakeOnLanAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000503) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TargetNavigator.AttributeList response %@", [value description]);
+            NSLog(@"WakeOnLan.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TargetNavigator AttributeList read Error", error);
+                LogNSError("WakeOnLan AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -64283,20 +63470,20 @@ class ReadTargetNavigatorAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTargetNavigatorAttributeList : public SubscribeAttribute {
+class SubscribeAttributeWakeOnLanAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTargetNavigatorAttributeList()
+    SubscribeAttributeWakeOnLanAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeTargetNavigatorAttributeList() {}
+    ~SubscribeAttributeWakeOnLanAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000503) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -64308,7 +63495,7 @@ class SubscribeAttributeTargetNavigatorAttributeList : public SubscribeAttribute
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TargetNavigator.AttributeList response %@", [value description]);
+                NSLog(@"WakeOnLan.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -64321,25 +63508,25 @@ class SubscribeAttributeTargetNavigatorAttributeList : public SubscribeAttribute
 /*
  * Attribute FeatureMap
  */
-class ReadTargetNavigatorFeatureMap : public ReadAttribute {
+class ReadWakeOnLanFeatureMap : public ReadAttribute {
 public:
-    ReadTargetNavigatorFeatureMap()
+    ReadWakeOnLanFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadTargetNavigatorFeatureMap() {}
+    ~ReadWakeOnLanFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000503) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TargetNavigator.FeatureMap response %@", [value description]);
+            NSLog(@"WakeOnLan.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("TargetNavigator FeatureMap read Error", error);
+                LogNSError("WakeOnLan FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -64347,20 +63534,20 @@ class ReadTargetNavigatorFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTargetNavigatorFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeWakeOnLanFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeTargetNavigatorFeatureMap()
+    SubscribeAttributeWakeOnLanFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeTargetNavigatorFeatureMap() {}
+    ~SubscribeAttributeWakeOnLanFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000503) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -64372,7 +63559,7 @@ class SubscribeAttributeTargetNavigatorFeatureMap : public SubscribeAttribute {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TargetNavigator.FeatureMap response %@", [value description]);
+                NSLog(@"WakeOnLan.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -64385,25 +63572,25 @@ class SubscribeAttributeTargetNavigatorFeatureMap : public SubscribeAttribute {
 /*
  * Attribute ClusterRevision
  */
-class ReadTargetNavigatorClusterRevision : public ReadAttribute {
+class ReadWakeOnLanClusterRevision : public ReadAttribute {
 public:
-    ReadTargetNavigatorClusterRevision()
+    ReadWakeOnLanClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadTargetNavigatorClusterRevision() {}
+    ~ReadWakeOnLanClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000503) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TargetNavigator.ClusterRevision response %@", [value description]);
+            NSLog(@"WakeOnLan.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("TargetNavigator ClusterRevision read Error", error);
+                LogNSError("WakeOnLan ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -64411,20 +63598,20 @@ class ReadTargetNavigatorClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTargetNavigatorClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeWakeOnLanClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeTargetNavigatorClusterRevision()
+    SubscribeAttributeWakeOnLanClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeTargetNavigatorClusterRevision() {}
+    ~SubscribeAttributeWakeOnLanClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000503) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -64436,7 +63623,7 @@ class SubscribeAttributeTargetNavigatorClusterRevision : public SubscribeAttribu
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TargetNavigator.ClusterRevision response %@", [value description]);
+                NSLog(@"WakeOnLan.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -64447,15 +63634,17 @@ class SubscribeAttributeTargetNavigatorClusterRevision : public SubscribeAttribu
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster TemperatureMeasurement                                      | 0x0402 |
+| Cluster Channel                                                     | 0x0504 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
+| * ChangeChannel                                                     |   0x00 |
+| * ChangeChannelByNumber                                             |   0x02 |
+| * SkipChannel                                                       |   0x03 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * MeasuredValue                                                     | 0x0000 |
-| * MinMeasuredValue                                                  | 0x0001 |
-| * MaxMeasuredValue                                                  | 0x0002 |
-| * Tolerance                                                         | 0x0003 |
+| * ChannelList                                                       | 0x0000 |
+| * Lineup                                                            | 0x0001 |
+| * CurrentChannel                                                    | 0x0002 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -64466,97 +63655,165 @@ class SubscribeAttributeTargetNavigatorClusterRevision : public SubscribeAttribu
 \*----------------------------------------------------------------------------*/
 
 /*
- * Attribute MeasuredValue
+ * Command ChangeChannel
  */
-class ReadTemperatureMeasurementMeasuredValue : public ReadAttribute {
+class ChannelChangeChannel : public ClusterCommand {
 public:
-    ReadTemperatureMeasurementMeasuredValue()
-        : ReadAttribute("measured-value")
+    ChannelChangeChannel()
+        : ClusterCommand("change-channel")
     {
+        AddArgument("Match", &mRequest.match);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadTemperatureMeasurementMeasuredValue() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000504) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureMeasurement.MeasuredValue response %@", [value description]);
-            if (error != nil) {
-                LogNSError("TemperatureMeasurement MeasuredValue read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPChannelClusterChangeChannelParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.match = [[NSString alloc] initWithBytes:mRequest.match.data()
+                                                length:mRequest.match.size()
+                                              encoding:NSUTF8StringEncoding];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster changeChannelWithParams:params
+                           completionHandler:^(
+                               CHIPChannelClusterChangeChannelResponseParams * _Nullable values, NSError * _Nullable error) {
+                               NSLog(@"Values: %@", values);
+                               responsesNeeded--;
+                               if (error != nil) {
+                                   mError = error;
+                                   LogNSError("Error", error);
+                               }
+                               if (responsesNeeded == 0) {
+                                   SetCommandExitStatus(mError);
+                               }
+                           }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::Channel::Commands::ChangeChannel::Type mRequest;
 };
 
-class SubscribeAttributeTemperatureMeasurementMeasuredValue : public SubscribeAttribute {
+/*
+ * Command ChangeChannelByNumber
+ */
+class ChannelChangeChannelByNumber : public ClusterCommand {
 public:
-    SubscribeAttributeTemperatureMeasurementMeasuredValue()
-        : SubscribeAttribute("measured-value")
-    {
+    ChannelChangeChannelByNumber()
+        : ClusterCommand("change-channel-by-number")
+    {
+        AddArgument("MajorNumber", 0, UINT16_MAX, &mRequest.majorNumber);
+        AddArgument("MinorNumber", 0, UINT16_MAX, &mRequest.minorNumber);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeTemperatureMeasurementMeasuredValue() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000504) command (0x00000002) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureMeasurement.MeasuredValue response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPChannelClusterChangeChannelByNumberParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.majorNumber = [NSNumber numberWithUnsignedShort:mRequest.majorNumber];
+        params.minorNumber = [NSNumber numberWithUnsignedShort:mRequest.minorNumber];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster changeChannelByNumberWithParams:params
+                                   completionHandler:^(NSError * _Nullable error) {
+                                       responsesNeeded--;
+                                       if (error != nil) {
+                                           mError = error;
+                                           LogNSError("Error", error);
+                                       }
+                                       if (responsesNeeded == 0) {
+                                           SetCommandExitStatus(mError);
+                                       }
+                                   }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type mRequest;
+};
+
+/*
+ * Command SkipChannel
+ */
+class ChannelSkipChannel : public ClusterCommand {
+public:
+    ChannelSkipChannel()
+        : ClusterCommand("skip-channel")
+    {
+        AddArgument("Count", 0, UINT16_MAX, &mRequest.count);
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000504) command (0x00000003) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPChannelClusterSkipChannelParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.count = [NSNumber numberWithUnsignedShort:mRequest.count];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster skipChannelWithParams:params
+                         completionHandler:^(NSError * _Nullable error) {
+                             responsesNeeded--;
+                             if (error != nil) {
+                                 mError = error;
+                                 LogNSError("Error", error);
+                             }
+                             if (responsesNeeded == 0) {
+                                 SetCommandExitStatus(mError);
+                             }
+                         }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::Channel::Commands::SkipChannel::Type mRequest;
 };
 
 /*
- * Attribute MinMeasuredValue
+ * Attribute ChannelList
  */
-class ReadTemperatureMeasurementMinMeasuredValue : public ReadAttribute {
+class ReadChannelChannelList : public ReadAttribute {
 public:
-    ReadTemperatureMeasurementMinMeasuredValue()
-        : ReadAttribute("min-measured-value")
+    ReadChannelChannelList()
+        : ReadAttribute("channel-list")
     {
     }
 
-    ~ReadTemperatureMeasurementMinMeasuredValue() {}
+    ~ReadChannelChannelList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeMinMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureMeasurement.MinMeasuredValue response %@", [value description]);
+        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeChannelListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Channel.ChannelList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TemperatureMeasurement MinMeasuredValue read Error", error);
+                LogNSError("Channel ChannelList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -64564,34 +63821,32 @@ class ReadTemperatureMeasurementMinMeasuredValue : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureMeasurementMinMeasuredValue : public SubscribeAttribute {
+class SubscribeAttributeChannelChannelList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureMeasurementMinMeasuredValue()
-        : SubscribeAttribute("min-measured-value")
+    SubscribeAttributeChannelChannelList()
+        : SubscribeAttribute("channel-list")
     {
     }
 
-    ~SubscribeAttributeTemperatureMeasurementMinMeasuredValue() {}
+    ~SubscribeAttributeChannelChannelList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMinMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeChannelListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureMeasurement.MinMeasuredValue response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Channel.ChannelList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -64602,64 +63857,61 @@ class SubscribeAttributeTemperatureMeasurementMinMeasuredValue : public Subscrib
 };
 
 /*
- * Attribute MaxMeasuredValue
+ * Attribute Lineup
  */
-class ReadTemperatureMeasurementMaxMeasuredValue : public ReadAttribute {
+class ReadChannelLineup : public ReadAttribute {
 public:
-    ReadTemperatureMeasurementMaxMeasuredValue()
-        : ReadAttribute("max-measured-value")
+    ReadChannelLineup()
+        : ReadAttribute("lineup")
     {
     }
 
-    ~ReadTemperatureMeasurementMaxMeasuredValue() {}
+    ~ReadChannelLineup() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeMaxMeasuredValueWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureMeasurement.MaxMeasuredValue response %@", [value description]);
-            if (error != nil) {
-                LogNSError("TemperatureMeasurement MaxMeasuredValue read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeLineupWithCompletionHandler:^(CHIPChannelClusterLineupInfo * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Channel.Lineup response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("Channel Lineup read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeTemperatureMeasurementMaxMeasuredValue : public SubscribeAttribute {
+class SubscribeAttributeChannelLineup : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureMeasurementMaxMeasuredValue()
-        : SubscribeAttribute("max-measured-value")
+    SubscribeAttributeChannelLineup()
+        : SubscribeAttribute("lineup")
     {
     }
 
-    ~SubscribeAttributeTemperatureMeasurementMaxMeasuredValue() {}
+    ~SubscribeAttributeChannelLineup() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMaxMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeLineupWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureMeasurement.MaxMeasuredValue response %@", [value description]);
+            reportHandler:^(CHIPChannelClusterLineupInfo * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Channel.Lineup response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -64670,29 +63922,28 @@ class SubscribeAttributeTemperatureMeasurementMaxMeasuredValue : public Subscrib
 };
 
 /*
- * Attribute Tolerance
+ * Attribute CurrentChannel
  */
-class ReadTemperatureMeasurementTolerance : public ReadAttribute {
+class ReadChannelCurrentChannel : public ReadAttribute {
 public:
-    ReadTemperatureMeasurementTolerance()
-        : ReadAttribute("tolerance")
+    ReadChannelCurrentChannel()
+        : ReadAttribute("current-channel")
     {
     }
 
-    ~ReadTemperatureMeasurementTolerance() {}
+    ~ReadChannelCurrentChannel() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeToleranceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureMeasurement.Tolerance response %@", [value description]);
+        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCurrentChannelWithCompletionHandler:^(
+            CHIPChannelClusterChannelInfo * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"Channel.CurrentChannel response %@", [value description]);
             if (error != nil) {
-                LogNSError("TemperatureMeasurement Tolerance read Error", error);
+                LogNSError("Channel CurrentChannel read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -64700,34 +63951,32 @@ class ReadTemperatureMeasurementTolerance : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureMeasurementTolerance : public SubscribeAttribute {
+class SubscribeAttributeChannelCurrentChannel : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureMeasurementTolerance()
-        : SubscribeAttribute("tolerance")
+    SubscribeAttributeChannelCurrentChannel()
+        : SubscribeAttribute("current-channel")
     {
     }
 
-    ~SubscribeAttributeTemperatureMeasurementTolerance() {}
+    ~SubscribeAttributeChannelCurrentChannel() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeToleranceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCurrentChannelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureMeasurement.Tolerance response %@", [value description]);
+            reportHandler:^(CHIPChannelClusterChannelInfo * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"Channel.CurrentChannel response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -64740,27 +63989,25 @@ class SubscribeAttributeTemperatureMeasurementTolerance : public SubscribeAttrib
 /*
  * Attribute GeneratedCommandList
  */
-class ReadTemperatureMeasurementGeneratedCommandList : public ReadAttribute {
+class ReadChannelGeneratedCommandList : public ReadAttribute {
 public:
-    ReadTemperatureMeasurementGeneratedCommandList()
+    ReadChannelGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadTemperatureMeasurementGeneratedCommandList() {}
+    ~ReadChannelGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureMeasurement.GeneratedCommandList response %@", [value description]);
+            NSLog(@"Channel.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TemperatureMeasurement GeneratedCommandList read Error", error);
+                LogNSError("Channel GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -64768,22 +64015,20 @@ class ReadTemperatureMeasurementGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureMeasurementGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeChannelGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureMeasurementGeneratedCommandList()
+    SubscribeAttributeChannelGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeTemperatureMeasurementGeneratedCommandList() {}
+    ~SubscribeAttributeChannelGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -64795,7 +64040,7 @@ class SubscribeAttributeTemperatureMeasurementGeneratedCommandList : public Subs
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureMeasurement.GeneratedCommandList response %@", [value description]);
+                NSLog(@"Channel.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -64808,27 +64053,25 @@ class SubscribeAttributeTemperatureMeasurementGeneratedCommandList : public Subs
 /*
  * Attribute AcceptedCommandList
  */
-class ReadTemperatureMeasurementAcceptedCommandList : public ReadAttribute {
+class ReadChannelAcceptedCommandList : public ReadAttribute {
 public:
-    ReadTemperatureMeasurementAcceptedCommandList()
+    ReadChannelAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadTemperatureMeasurementAcceptedCommandList() {}
+    ~ReadChannelAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureMeasurement.AcceptedCommandList response %@", [value description]);
+            NSLog(@"Channel.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TemperatureMeasurement AcceptedCommandList read Error", error);
+                LogNSError("Channel AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -64836,22 +64079,20 @@ class ReadTemperatureMeasurementAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureMeasurementAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeChannelAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureMeasurementAcceptedCommandList()
+    SubscribeAttributeChannelAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeTemperatureMeasurementAcceptedCommandList() {}
+    ~SubscribeAttributeChannelAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -64863,7 +64104,7 @@ class SubscribeAttributeTemperatureMeasurementAcceptedCommandList : public Subsc
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureMeasurement.AcceptedCommandList response %@", [value description]);
+                NSLog(@"Channel.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -64876,27 +64117,25 @@ class SubscribeAttributeTemperatureMeasurementAcceptedCommandList : public Subsc
 /*
  * Attribute AttributeList
  */
-class ReadTemperatureMeasurementAttributeList : public ReadAttribute {
+class ReadChannelAttributeList : public ReadAttribute {
 public:
-    ReadTemperatureMeasurementAttributeList()
+    ReadChannelAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadTemperatureMeasurementAttributeList() {}
+    ~ReadChannelAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureMeasurement.AttributeList response %@", [value description]);
+            NSLog(@"Channel.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TemperatureMeasurement AttributeList read Error", error);
+                LogNSError("Channel AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -64904,22 +64143,20 @@ class ReadTemperatureMeasurementAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureMeasurementAttributeList : public SubscribeAttribute {
+class SubscribeAttributeChannelAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureMeasurementAttributeList()
+    SubscribeAttributeChannelAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeTemperatureMeasurementAttributeList() {}
+    ~SubscribeAttributeChannelAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -64931,7 +64168,7 @@ class SubscribeAttributeTemperatureMeasurementAttributeList : public SubscribeAt
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureMeasurement.AttributeList response %@", [value description]);
+                NSLog(@"Channel.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -64944,27 +64181,25 @@ class SubscribeAttributeTemperatureMeasurementAttributeList : public SubscribeAt
 /*
  * Attribute FeatureMap
  */
-class ReadTemperatureMeasurementFeatureMap : public ReadAttribute {
+class ReadChannelFeatureMap : public ReadAttribute {
 public:
-    ReadTemperatureMeasurementFeatureMap()
+    ReadChannelFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadTemperatureMeasurementFeatureMap() {}
+    ~ReadChannelFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureMeasurement.FeatureMap response %@", [value description]);
+            NSLog(@"Channel.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("TemperatureMeasurement FeatureMap read Error", error);
+                LogNSError("Channel FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -64972,22 +64207,20 @@ class ReadTemperatureMeasurementFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureMeasurementFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeChannelFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureMeasurementFeatureMap()
+    SubscribeAttributeChannelFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeTemperatureMeasurementFeatureMap() {}
+    ~SubscribeAttributeChannelFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -64999,7 +64232,7 @@ class SubscribeAttributeTemperatureMeasurementFeatureMap : public SubscribeAttri
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureMeasurement.FeatureMap response %@", [value description]);
+                NSLog(@"Channel.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -65012,27 +64245,25 @@ class SubscribeAttributeTemperatureMeasurementFeatureMap : public SubscribeAttri
 /*
  * Attribute ClusterRevision
  */
-class ReadTemperatureMeasurementClusterRevision : public ReadAttribute {
+class ReadChannelClusterRevision : public ReadAttribute {
 public:
-    ReadTemperatureMeasurementClusterRevision()
+    ReadChannelClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadTemperatureMeasurementClusterRevision() {}
+    ~ReadChannelClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureMeasurement.ClusterRevision response %@", [value description]);
+            NSLog(@"Channel.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("TemperatureMeasurement ClusterRevision read Error", error);
+                LogNSError("Channel ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -65040,22 +64271,20 @@ class ReadTemperatureMeasurementClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureMeasurementClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeChannelClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureMeasurementClusterRevision()
+    SubscribeAttributeChannelClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeTemperatureMeasurementClusterRevision() {}
+    ~SubscribeAttributeChannelClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000402) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000504) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTemperatureMeasurement * cluster = [[CHIPTemperatureMeasurement alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -65067,7 +64296,7 @@ class SubscribeAttributeTemperatureMeasurementClusterRevision : public Subscribe
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureMeasurement.ClusterRevision response %@", [value description]);
+                NSLog(@"Channel.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -65078,114 +64307,14 @@ class SubscribeAttributeTemperatureMeasurementClusterRevision : public Subscribe
 };
 
 /*----------------------------------------------------------------------------*\
-| Cluster TestCluster                                                 | 0xFFF1FC05|
+| Cluster TargetNavigator                                             | 0x0505 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * Test                                                              |   0x00 |
-| * TestNotHandled                                                    |   0x01 |
-| * TestSpecific                                                      |   0x02 |
-| * TestUnknownCommand                                                |   0x03 |
-| * TestAddArguments                                                  |   0x04 |
-| * TestSimpleArgumentRequest                                         |   0x05 |
-| * TestStructArrayArgumentRequest                                    |   0x06 |
-| * TestStructArgumentRequest                                         |   0x07 |
-| * TestNestedStructArgumentRequest                                   |   0x08 |
-| * TestListStructArgumentRequest                                     |   0x09 |
-| * TestListInt8UArgumentRequest                                      |   0x0A |
-| * TestNestedStructListArgumentRequest                               |   0x0B |
-| * TestListNestedStructListArgumentRequest                           |   0x0C |
-| * TestListInt8UReverseRequest                                       |   0x0D |
-| * TestEnumsRequest                                                  |   0x0E |
-| * TestNullableOptionalRequest                                       |   0x0F |
-| * TestComplexNullableOptionalRequest                                |   0x10 |
-| * SimpleStructEchoRequest                                           |   0x11 |
-| * TimedInvokeRequest                                                |   0x12 |
-| * TestSimpleOptionalArgumentRequest                                 |   0x13 |
-| * TestEmitTestEventRequest                                          |   0x14 |
-| * TestEmitTestFabricScopedEventRequest                              |   0x15 |
+| * NavigateTarget                                                    |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * Boolean                                                           | 0x0000 |
-| * Bitmap8                                                           | 0x0001 |
-| * Bitmap16                                                          | 0x0002 |
-| * Bitmap32                                                          | 0x0003 |
-| * Bitmap64                                                          | 0x0004 |
-| * Int8u                                                             | 0x0005 |
-| * Int16u                                                            | 0x0006 |
-| * Int24u                                                            | 0x0007 |
-| * Int32u                                                            | 0x0008 |
-| * Int40u                                                            | 0x0009 |
-| * Int48u                                                            | 0x000A |
-| * Int56u                                                            | 0x000B |
-| * Int64u                                                            | 0x000C |
-| * Int8s                                                             | 0x000D |
-| * Int16s                                                            | 0x000E |
-| * Int24s                                                            | 0x000F |
-| * Int32s                                                            | 0x0010 |
-| * Int40s                                                            | 0x0011 |
-| * Int48s                                                            | 0x0012 |
-| * Int56s                                                            | 0x0013 |
-| * Int64s                                                            | 0x0014 |
-| * Enum8                                                             | 0x0015 |
-| * Enum16                                                            | 0x0016 |
-| * FloatSingle                                                       | 0x0017 |
-| * FloatDouble                                                       | 0x0018 |
-| * OctetString                                                       | 0x0019 |
-| * ListInt8u                                                         | 0x001A |
-| * ListOctetString                                                   | 0x001B |
-| * ListStructOctetString                                             | 0x001C |
-| * LongOctetString                                                   | 0x001D |
-| * CharString                                                        | 0x001E |
-| * LongCharString                                                    | 0x001F |
-| * EpochUs                                                           | 0x0020 |
-| * EpochS                                                            | 0x0021 |
-| * VendorId                                                          | 0x0022 |
-| * ListNullablesAndOptionalsStruct                                   | 0x0023 |
-| * EnumAttr                                                          | 0x0024 |
-| * StructAttr                                                        | 0x0025 |
-| * RangeRestrictedInt8u                                              | 0x0026 |
-| * RangeRestrictedInt8s                                              | 0x0027 |
-| * RangeRestrictedInt16u                                             | 0x0028 |
-| * RangeRestrictedInt16s                                             | 0x0029 |
-| * ListLongOctetString                                               | 0x002A |
-| * ListFabricScoped                                                  | 0x002B |
-| * TimedWriteBoolean                                                 | 0x0030 |
-| * GeneralErrorBoolean                                               | 0x0031 |
-| * ClusterErrorBoolean                                               | 0x0032 |
-| * Unsupported                                                       | 0x00FF |
-| * NullableBoolean                                                   | 0x4000 |
-| * NullableBitmap8                                                   | 0x4001 |
-| * NullableBitmap16                                                  | 0x4002 |
-| * NullableBitmap32                                                  | 0x4003 |
-| * NullableBitmap64                                                  | 0x4004 |
-| * NullableInt8u                                                     | 0x4005 |
-| * NullableInt16u                                                    | 0x4006 |
-| * NullableInt24u                                                    | 0x4007 |
-| * NullableInt32u                                                    | 0x4008 |
-| * NullableInt40u                                                    | 0x4009 |
-| * NullableInt48u                                                    | 0x400A |
-| * NullableInt56u                                                    | 0x400B |
-| * NullableInt64u                                                    | 0x400C |
-| * NullableInt8s                                                     | 0x400D |
-| * NullableInt16s                                                    | 0x400E |
-| * NullableInt24s                                                    | 0x400F |
-| * NullableInt32s                                                    | 0x4010 |
-| * NullableInt40s                                                    | 0x4011 |
-| * NullableInt48s                                                    | 0x4012 |
-| * NullableInt56s                                                    | 0x4013 |
-| * NullableInt64s                                                    | 0x4014 |
-| * NullableEnum8                                                     | 0x4015 |
-| * NullableEnum16                                                    | 0x4016 |
-| * NullableFloatSingle                                               | 0x4017 |
-| * NullableFloatDouble                                               | 0x4018 |
-| * NullableOctetString                                               | 0x4019 |
-| * NullableCharString                                                | 0x401E |
-| * NullableEnumAttr                                                  | 0x4024 |
-| * NullableStruct                                                    | 0x4025 |
-| * NullableRangeRestrictedInt8u                                      | 0x4026 |
-| * NullableRangeRestrictedInt8s                                      | 0x4027 |
-| * NullableRangeRestrictedInt16u                                     | 0x4028 |
-| * NullableRangeRestrictedInt16s                                     | 0x4029 |
+| * TargetList                                                        | 0x0000 |
+| * CurrentTarget                                                     | 0x0001 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * AttributeList                                                     | 0xFFFB |
@@ -65193,76 +64322,45 @@ class SubscribeAttributeTemperatureMeasurementClusterRevision : public Subscribe
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
-| * TestEvent                                                         | 0x0001 |
-| * TestFabricScopedEvent                                             | 0x0002 |
 \*----------------------------------------------------------------------------*/
 
 /*
- * Command Test
+ * Command NavigateTarget
  */
-class TestClusterTest : public ClusterCommand {
+class TargetNavigatorNavigateTarget : public ClusterCommand {
 public:
-    TestClusterTest()
-        : ClusterCommand("test")
+    TargetNavigatorNavigateTarget()
+        : ClusterCommand("navigate-target")
     {
+        AddArgument("Target", 0, UINT8_MAX, &mRequest.target);
+        AddArgument("Data", &mRequest.data);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000505) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPTestClusterClusterTestParams alloc] init];
+        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPTargetNavigatorClusterNavigateTargetParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster testWithParams:params
-                  completionHandler:^(NSError * _Nullable error) {
-                      responsesNeeded--;
-                      if (error != nil) {
-                          mError = error;
-                          LogNSError("Error", error);
-                      }
-                      if (responsesNeeded == 0) {
-                          SetCommandExitStatus(mError);
-                      }
-                  }];
+        params.target = [NSNumber numberWithUnsignedChar:mRequest.target];
+        if (mRequest.data.HasValue()) {
+            params.data = [[NSString alloc] initWithBytes:mRequest.data.Value().data()
+                                                   length:mRequest.data.Value().size()
+                                                 encoding:NSUTF8StringEncoding];
+        } else {
+            params.data = nil;
         }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-};
-
-/*
- * Command TestNotHandled
- */
-class TestClusterTestNotHandled : public ClusterCommand {
-public:
-    TestClusterTestNotHandled()
-        : ClusterCommand("test-not-handled")
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000001) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPTestClusterClusterTestNotHandledParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster testNotHandledWithParams:params
-                            completionHandler:^(NSError * _Nullable error) {
+            [cluster navigateTargetWithParams:params
+                            completionHandler:^(CHIPTargetNavigatorClusterNavigateTargetResponseParams * _Nullable values,
+                                NSError * _Nullable error) {
+                                NSLog(@"Values: %@", values);
                                 responsesNeeded--;
                                 if (error != nil) {
                                     mError = error;
@@ -65277,1295 +64375,655 @@ class TestClusterTestNotHandled : public ClusterCommand {
     }
 
 private:
+    chip::app::Clusters::TargetNavigator::Commands::NavigateTarget::Type mRequest;
 };
 
 /*
- * Command TestSpecific
+ * Attribute TargetList
  */
-class TestClusterTestSpecific : public ClusterCommand {
+class ReadTargetNavigatorTargetList : public ReadAttribute {
 public:
-    TestClusterTestSpecific()
-        : ClusterCommand("test-specific")
+    ReadTargetNavigatorTargetList()
+        : ReadAttribute("target-list")
     {
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadTargetNavigatorTargetList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPTestClusterClusterTestSpecificParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster testSpecificWithParams:params
-                          completionHandler:^(
-                              CHIPTestClusterClusterTestSpecificResponseParams * _Nullable values, NSError * _Nullable error) {
-                              NSLog(@"Values: %@", values);
-                              responsesNeeded--;
-                              if (error != nil) {
-                                  mError = error;
-                                  LogNSError("Error", error);
-                              }
-                              if (responsesNeeded == 0) {
-                                  SetCommandExitStatus(mError);
-                              }
-                          }];
-        }
+        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeTargetListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TargetNavigator.TargetList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TargetNavigator TargetList read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
 };
 
-/*
- * Command TestUnknownCommand
- */
-class TestClusterTestUnknownCommand : public ClusterCommand {
+class SubscribeAttributeTargetNavigatorTargetList : public SubscribeAttribute {
 public:
-    TestClusterTestUnknownCommand()
-        : ClusterCommand("test-unknown-command")
+    SubscribeAttributeTargetNavigatorTargetList()
+        : SubscribeAttribute("target-list")
     {
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeTargetNavigatorTargetList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000003) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPTestClusterClusterTestUnknownCommandParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster testUnknownCommandWithParams:params
-                                completionHandler:^(NSError * _Nullable error) {
-                                    responsesNeeded--;
-                                    if (error != nil) {
-                                        mError = error;
-                                        LogNSError("Error", error);
-                                    }
-                                    if (responsesNeeded == 0) {
-                                        SetCommandExitStatus(mError);
-                                    }
-                                }];
-        }
+        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeTargetListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TargetNavigator.TargetList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
 };
 
 /*
- * Command TestAddArguments
+ * Attribute CurrentTarget
  */
-class TestClusterTestAddArguments : public ClusterCommand {
+class ReadTargetNavigatorCurrentTarget : public ReadAttribute {
 public:
-    TestClusterTestAddArguments()
-        : ClusterCommand("test-add-arguments")
+    ReadTargetNavigatorCurrentTarget()
+        : ReadAttribute("current-target")
     {
-        AddArgument("Arg1", 0, UINT8_MAX, &mRequest.arg1);
-        AddArgument("Arg2", 0, UINT8_MAX, &mRequest.arg2);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadTargetNavigatorCurrentTarget() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPTestClusterClusterTestAddArgumentsParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.arg1 = [NSNumber numberWithUnsignedChar:mRequest.arg1];
-        params.arg2 = [NSNumber numberWithUnsignedChar:mRequest.arg2];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster testAddArgumentsWithParams:params
-                              completionHandler:^(CHIPTestClusterClusterTestAddArgumentsResponseParams * _Nullable values,
-                                  NSError * _Nullable error) {
-                                  NSLog(@"Values: %@", values);
-                                  responsesNeeded--;
-                                  if (error != nil) {
-                                      mError = error;
-                                      LogNSError("Error", error);
-                                  }
-                                  if (responsesNeeded == 0) {
-                                      SetCommandExitStatus(mError);
-                                  }
-                              }];
-        }
+        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCurrentTargetWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TargetNavigator.CurrentTarget response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TargetNavigator CurrentTarget read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::TestCluster::Commands::TestAddArguments::Type mRequest;
 };
 
-/*
- * Command TestSimpleArgumentRequest
- */
-class TestClusterTestSimpleArgumentRequest : public ClusterCommand {
+class SubscribeAttributeTargetNavigatorCurrentTarget : public SubscribeAttribute {
 public:
-    TestClusterTestSimpleArgumentRequest()
-        : ClusterCommand("test-simple-argument-request")
+    SubscribeAttributeTargetNavigatorCurrentTarget()
+        : SubscribeAttribute("current-target")
     {
-        AddArgument("Arg1", 0, 1, &mRequest.arg1);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeTargetNavigatorCurrentTarget() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000005) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPTestClusterClusterTestSimpleArgumentRequestParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.arg1 = [NSNumber numberWithBool:mRequest.arg1];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster
-                testSimpleArgumentRequestWithParams:params
-                                  completionHandler:^(CHIPTestClusterClusterTestSimpleArgumentResponseParams * _Nullable values,
-                                      NSError * _Nullable error) {
-                                      NSLog(@"Values: %@", values);
-                                      responsesNeeded--;
-                                      if (error != nil) {
-                                          mError = error;
-                                          LogNSError("Error", error);
-                                      }
-                                      if (responsesNeeded == 0) {
-                                          SetCommandExitStatus(mError);
-                                      }
-                                  }];
-        }
+        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeCurrentTargetWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TargetNavigator.CurrentTarget response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::TestCluster::Commands::TestSimpleArgumentRequest::Type mRequest;
 };
 
 /*
- * Command TestStructArrayArgumentRequest
+ * Attribute GeneratedCommandList
  */
-class TestClusterTestStructArrayArgumentRequest : public ClusterCommand {
+class ReadTargetNavigatorGeneratedCommandList : public ReadAttribute {
 public:
-    TestClusterTestStructArrayArgumentRequest()
-        : ClusterCommand("test-struct-array-argument-request")
-        , mComplex_Arg1(&mRequest.arg1)
-        , mComplex_Arg2(&mRequest.arg2)
-        , mComplex_Arg3(&mRequest.arg3)
-        , mComplex_Arg4(&mRequest.arg4)
+    ReadTargetNavigatorGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
-        AddArgument("Arg1", &mComplex_Arg1);
-        AddArgument("Arg2", &mComplex_Arg2);
-        AddArgument("Arg3", &mComplex_Arg3);
-        AddArgument("Arg4", &mComplex_Arg4);
-        AddArgument("Arg5", 0, UINT8_MAX, &mRequest.arg5);
-        AddArgument("Arg6", 0, 1, &mRequest.arg6);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadTargetNavigatorGeneratedCommandList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPTestClusterClusterTestStructArrayArgumentRequestParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mRequest.arg1) {
-                CHIPTestClusterClusterNestedStructList * newElement_0;
-                newElement_0 = [CHIPTestClusterClusterNestedStructList new];
-                newElement_0.a = [NSNumber numberWithUnsignedChar:entry_0.a];
-                newElement_0.b = [NSNumber numberWithBool:entry_0.b];
-                newElement_0.c = [CHIPTestClusterClusterSimpleStruct new];
-                newElement_0.c.a = [NSNumber numberWithUnsignedChar:entry_0.c.a];
-                newElement_0.c.b = [NSNumber numberWithBool:entry_0.c.b];
-                newElement_0.c.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.c.c)];
-                newElement_0.c.d = [NSData dataWithBytes:entry_0.c.d.data() length:entry_0.c.d.size()];
-                newElement_0.c.e = [[NSString alloc] initWithBytes:entry_0.c.e.data()
-                                                            length:entry_0.c.e.size()
-                                                          encoding:NSUTF8StringEncoding];
-                newElement_0.c.f = [NSNumber numberWithUnsignedChar:entry_0.c.f.Raw()];
-                newElement_0.c.g = [NSNumber numberWithFloat:entry_0.c.g];
-                newElement_0.c.h = [NSNumber numberWithDouble:entry_0.c.h];
-                { // Scope for our temporary variables
-                    auto * array_2 = [NSMutableArray new];
-                    for (auto & entry_2 : entry_0.d) {
-                        CHIPTestClusterClusterSimpleStruct * newElement_2;
-                        newElement_2 = [CHIPTestClusterClusterSimpleStruct new];
-                        newElement_2.a = [NSNumber numberWithUnsignedChar:entry_2.a];
-                        newElement_2.b = [NSNumber numberWithBool:entry_2.b];
-                        newElement_2.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_2.c)];
-                        newElement_2.d = [NSData dataWithBytes:entry_2.d.data() length:entry_2.d.size()];
-                        newElement_2.e = [[NSString alloc] initWithBytes:entry_2.e.data()
-                                                                  length:entry_2.e.size()
-                                                                encoding:NSUTF8StringEncoding];
-                        newElement_2.f = [NSNumber numberWithUnsignedChar:entry_2.f.Raw()];
-                        newElement_2.g = [NSNumber numberWithFloat:entry_2.g];
-                        newElement_2.h = [NSNumber numberWithDouble:entry_2.h];
-                        [array_2 addObject:newElement_2];
-                    }
-                    newElement_0.d = array_2;
-                }
-                { // Scope for our temporary variables
-                    auto * array_2 = [NSMutableArray new];
-                    for (auto & entry_2 : entry_0.e) {
-                        NSNumber * newElement_2;
-                        newElement_2 = [NSNumber numberWithUnsignedInt:entry_2];
-                        [array_2 addObject:newElement_2];
-                    }
-                    newElement_0.e = array_2;
-                }
-                { // Scope for our temporary variables
-                    auto * array_2 = [NSMutableArray new];
-                    for (auto & entry_2 : entry_0.f) {
-                        NSData * newElement_2;
-                        newElement_2 = [NSData dataWithBytes:entry_2.data() length:entry_2.size()];
-                        [array_2 addObject:newElement_2];
-                    }
-                    newElement_0.f = array_2;
-                }
-                { // Scope for our temporary variables
-                    auto * array_2 = [NSMutableArray new];
-                    for (auto & entry_2 : entry_0.g) {
-                        NSNumber * newElement_2;
-                        newElement_2 = [NSNumber numberWithUnsignedChar:entry_2];
-                        [array_2 addObject:newElement_2];
-                    }
-                    newElement_0.g = array_2;
-                }
-                [array_0 addObject:newElement_0];
-            }
-            params.arg1 = array_0;
-        }
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mRequest.arg2) {
-                CHIPTestClusterClusterSimpleStruct * newElement_0;
-                newElement_0 = [CHIPTestClusterClusterSimpleStruct new];
-                newElement_0.a = [NSNumber numberWithUnsignedChar:entry_0.a];
-                newElement_0.b = [NSNumber numberWithBool:entry_0.b];
-                newElement_0.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.c)];
-                newElement_0.d = [NSData dataWithBytes:entry_0.d.data() length:entry_0.d.size()];
-                newElement_0.e = [[NSString alloc] initWithBytes:entry_0.e.data()
-                                                          length:entry_0.e.size()
-                                                        encoding:NSUTF8StringEncoding];
-                newElement_0.f = [NSNumber numberWithUnsignedChar:entry_0.f.Raw()];
-                newElement_0.g = [NSNumber numberWithFloat:entry_0.g];
-                newElement_0.h = [NSNumber numberWithDouble:entry_0.h];
-                [array_0 addObject:newElement_0];
-            }
-            params.arg2 = array_0;
-        }
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mRequest.arg3) {
-                NSNumber * newElement_0;
-                newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
-                [array_0 addObject:newElement_0];
-            }
-            params.arg3 = array_0;
-        }
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mRequest.arg4) {
-                NSNumber * newElement_0;
-                newElement_0 = [NSNumber numberWithBool:entry_0];
-                [array_0 addObject:newElement_0];
+        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TargetNavigator.GeneratedCommandList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TargetNavigator GeneratedCommandList read Error", error);
             }
-            params.arg4 = array_0;
-        }
-        params.arg5 = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.arg5)];
-        params.arg6 = [NSNumber numberWithBool:mRequest.arg6];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster testStructArrayArgumentRequestWithParams:params
-                                            completionHandler:^(
-                                                CHIPTestClusterClusterTestStructArrayArgumentResponseParams * _Nullable values,
-                                                NSError * _Nullable error) {
-                                                NSLog(@"Values: %@", values);
-                                                responsesNeeded--;
-                                                if (error != nil) {
-                                                    mError = error;
-                                                    LogNSError("Error", error);
-                                                }
-                                                if (responsesNeeded == 0) {
-                                                    SetCommandExitStatus(mError);
-                                                }
-                                            }];
-        }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::TestCluster::Commands::TestStructArrayArgumentRequest::Type mRequest;
-    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::NestedStructList::Type>>
-        mComplex_Arg1;
-    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type>>
-        mComplex_Arg2;
-    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::TestCluster::SimpleEnum>> mComplex_Arg3;
-    TypedComplexArgument<chip::app::DataModel::List<const bool>> mComplex_Arg4;
 };
 
-/*
- * Command TestStructArgumentRequest
- */
-class TestClusterTestStructArgumentRequest : public ClusterCommand {
+class SubscribeAttributeTargetNavigatorGeneratedCommandList : public SubscribeAttribute {
 public:
-    TestClusterTestStructArgumentRequest()
-        : ClusterCommand("test-struct-argument-request")
-        , mComplex_Arg1(&mRequest.arg1)
+    SubscribeAttributeTargetNavigatorGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
-        AddArgument("Arg1", &mComplex_Arg1);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeTargetNavigatorGeneratedCommandList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000007) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPTestClusterClusterTestStructArgumentRequestParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.arg1 = [CHIPTestClusterClusterSimpleStruct new];
-        params.arg1.a = [NSNumber numberWithUnsignedChar:mRequest.arg1.a];
-        params.arg1.b = [NSNumber numberWithBool:mRequest.arg1.b];
-        params.arg1.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.arg1.c)];
-        params.arg1.d = [NSData dataWithBytes:mRequest.arg1.d.data() length:mRequest.arg1.d.size()];
-        params.arg1.e = [[NSString alloc] initWithBytes:mRequest.arg1.e.data()
-                                                 length:mRequest.arg1.e.size()
-                                               encoding:NSUTF8StringEncoding];
-        params.arg1.f = [NSNumber numberWithUnsignedChar:mRequest.arg1.f.Raw()];
-        params.arg1.g = [NSNumber numberWithFloat:mRequest.arg1.g];
-        params.arg1.h = [NSNumber numberWithDouble:mRequest.arg1.h];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster testStructArgumentRequestWithParams:params
-                                       completionHandler:^(CHIPTestClusterClusterBooleanResponseParams * _Nullable values,
-                                           NSError * _Nullable error) {
-                                           NSLog(@"Values: %@", values);
-                                           responsesNeeded--;
-                                           if (error != nil) {
-                                               mError = error;
-                                               LogNSError("Error", error);
-                                           }
-                                           if (responsesNeeded == 0) {
-                                               SetCommandExitStatus(mError);
-                                           }
-                                       }];
-        }
+        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TargetNavigator.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::TestCluster::Commands::TestStructArgumentRequest::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type> mComplex_Arg1;
 };
 
 /*
- * Command TestNestedStructArgumentRequest
+ * Attribute AcceptedCommandList
  */
-class TestClusterTestNestedStructArgumentRequest : public ClusterCommand {
+class ReadTargetNavigatorAcceptedCommandList : public ReadAttribute {
 public:
-    TestClusterTestNestedStructArgumentRequest()
-        : ClusterCommand("test-nested-struct-argument-request")
-        , mComplex_Arg1(&mRequest.arg1)
+    ReadTargetNavigatorAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
-        AddArgument("Arg1", &mComplex_Arg1);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadTargetNavigatorAcceptedCommandList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPTestClusterClusterTestNestedStructArgumentRequestParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.arg1 = [CHIPTestClusterClusterNestedStruct new];
-        params.arg1.a = [NSNumber numberWithUnsignedChar:mRequest.arg1.a];
-        params.arg1.b = [NSNumber numberWithBool:mRequest.arg1.b];
-        params.arg1.c = [CHIPTestClusterClusterSimpleStruct new];
-        params.arg1.c.a = [NSNumber numberWithUnsignedChar:mRequest.arg1.c.a];
-        params.arg1.c.b = [NSNumber numberWithBool:mRequest.arg1.c.b];
-        params.arg1.c.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.arg1.c.c)];
-        params.arg1.c.d = [NSData dataWithBytes:mRequest.arg1.c.d.data() length:mRequest.arg1.c.d.size()];
-        params.arg1.c.e = [[NSString alloc] initWithBytes:mRequest.arg1.c.e.data()
-                                                   length:mRequest.arg1.c.e.size()
-                                                 encoding:NSUTF8StringEncoding];
-        params.arg1.c.f = [NSNumber numberWithUnsignedChar:mRequest.arg1.c.f.Raw()];
-        params.arg1.c.g = [NSNumber numberWithFloat:mRequest.arg1.c.g];
-        params.arg1.c.h = [NSNumber numberWithDouble:mRequest.arg1.c.h];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster testNestedStructArgumentRequestWithParams:params
-                                             completionHandler:^(CHIPTestClusterClusterBooleanResponseParams * _Nullable values,
-                                                 NSError * _Nullable error) {
-                                                 NSLog(@"Values: %@", values);
-                                                 responsesNeeded--;
-                                                 if (error != nil) {
-                                                     mError = error;
-                                                     LogNSError("Error", error);
-                                                 }
-                                                 if (responsesNeeded == 0) {
-                                                     SetCommandExitStatus(mError);
-                                                 }
-                                             }];
-        }
+        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TargetNavigator.AcceptedCommandList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TargetNavigator AcceptedCommandList read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::TestCluster::Commands::TestNestedStructArgumentRequest::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::TestCluster::Structs::NestedStruct::Type> mComplex_Arg1;
 };
 
-/*
- * Command TestListStructArgumentRequest
- */
-class TestClusterTestListStructArgumentRequest : public ClusterCommand {
+class SubscribeAttributeTargetNavigatorAcceptedCommandList : public SubscribeAttribute {
 public:
-    TestClusterTestListStructArgumentRequest()
-        : ClusterCommand("test-list-struct-argument-request")
-        , mComplex_Arg1(&mRequest.arg1)
+    SubscribeAttributeTargetNavigatorAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
-        AddArgument("Arg1", &mComplex_Arg1);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeTargetNavigatorAcceptedCommandList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000009) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPTestClusterClusterTestListStructArgumentRequestParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mRequest.arg1) {
-                CHIPTestClusterClusterSimpleStruct * newElement_0;
-                newElement_0 = [CHIPTestClusterClusterSimpleStruct new];
-                newElement_0.a = [NSNumber numberWithUnsignedChar:entry_0.a];
-                newElement_0.b = [NSNumber numberWithBool:entry_0.b];
-                newElement_0.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.c)];
-                newElement_0.d = [NSData dataWithBytes:entry_0.d.data() length:entry_0.d.size()];
-                newElement_0.e = [[NSString alloc] initWithBytes:entry_0.e.data()
-                                                          length:entry_0.e.size()
-                                                        encoding:NSUTF8StringEncoding];
-                newElement_0.f = [NSNumber numberWithUnsignedChar:entry_0.f.Raw()];
-                newElement_0.g = [NSNumber numberWithFloat:entry_0.g];
-                newElement_0.h = [NSNumber numberWithDouble:entry_0.h];
-                [array_0 addObject:newElement_0];
+        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
             }
-            params.arg1 = array_0;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster testListStructArgumentRequestWithParams:params
-                                           completionHandler:^(CHIPTestClusterClusterBooleanResponseParams * _Nullable values,
-                                               NSError * _Nullable error) {
-                                               NSLog(@"Values: %@", values);
-                                               responsesNeeded--;
-                                               if (error != nil) {
-                                                   mError = error;
-                                                   LogNSError("Error", error);
-                                               }
-                                               if (responsesNeeded == 0) {
-                                                   SetCommandExitStatus(mError);
-                                               }
-                                           }];
-        }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TargetNavigator.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::TestCluster::Commands::TestListStructArgumentRequest::Type mRequest;
-    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type>>
-        mComplex_Arg1;
 };
 
 /*
- * Command TestListInt8UArgumentRequest
+ * Attribute AttributeList
  */
-class TestClusterTestListInt8UArgumentRequest : public ClusterCommand {
+class ReadTargetNavigatorAttributeList : public ReadAttribute {
 public:
-    TestClusterTestListInt8UArgumentRequest()
-        : ClusterCommand("test-list-int8uargument-request")
-        , mComplex_Arg1(&mRequest.arg1)
+    ReadTargetNavigatorAttributeList()
+        : ReadAttribute("attribute-list")
     {
-        AddArgument("Arg1", &mComplex_Arg1);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadTargetNavigatorAttributeList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPTestClusterClusterTestListInt8UArgumentRequestParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mRequest.arg1) {
-                NSNumber * newElement_0;
-                newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
-                [array_0 addObject:newElement_0];
+        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TargetNavigator.AttributeList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TargetNavigator AttributeList read Error", error);
             }
-            params.arg1 = array_0;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster testListInt8UArgumentRequestWithParams:params
-                                          completionHandler:^(CHIPTestClusterClusterBooleanResponseParams * _Nullable values,
-                                              NSError * _Nullable error) {
-                                              NSLog(@"Values: %@", values);
-                                              responsesNeeded--;
-                                              if (error != nil) {
-                                                  mError = error;
-                                                  LogNSError("Error", error);
-                                              }
-                                              if (responsesNeeded == 0) {
-                                                  SetCommandExitStatus(mError);
-                                              }
-                                          }];
-        }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::TestCluster::Commands::TestListInt8UArgumentRequest::Type mRequest;
-    TypedComplexArgument<chip::app::DataModel::List<const uint8_t>> mComplex_Arg1;
 };
 
-/*
- * Command TestNestedStructListArgumentRequest
- */
-class TestClusterTestNestedStructListArgumentRequest : public ClusterCommand {
+class SubscribeAttributeTargetNavigatorAttributeList : public SubscribeAttribute {
 public:
-    TestClusterTestNestedStructListArgumentRequest()
-        : ClusterCommand("test-nested-struct-list-argument-request")
-        , mComplex_Arg1(&mRequest.arg1)
+    SubscribeAttributeTargetNavigatorAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
-        AddArgument("Arg1", &mComplex_Arg1);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeTargetNavigatorAttributeList() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000B) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPTestClusterClusterTestNestedStructListArgumentRequestParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.arg1 = [CHIPTestClusterClusterNestedStructList new];
-        params.arg1.a = [NSNumber numberWithUnsignedChar:mRequest.arg1.a];
-        params.arg1.b = [NSNumber numberWithBool:mRequest.arg1.b];
-        params.arg1.c = [CHIPTestClusterClusterSimpleStruct new];
-        params.arg1.c.a = [NSNumber numberWithUnsignedChar:mRequest.arg1.c.a];
-        params.arg1.c.b = [NSNumber numberWithBool:mRequest.arg1.c.b];
-        params.arg1.c.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.arg1.c.c)];
-        params.arg1.c.d = [NSData dataWithBytes:mRequest.arg1.c.d.data() length:mRequest.arg1.c.d.size()];
-        params.arg1.c.e = [[NSString alloc] initWithBytes:mRequest.arg1.c.e.data()
-                                                   length:mRequest.arg1.c.e.size()
-                                                 encoding:NSUTF8StringEncoding];
-        params.arg1.c.f = [NSNumber numberWithUnsignedChar:mRequest.arg1.c.f.Raw()];
-        params.arg1.c.g = [NSNumber numberWithFloat:mRequest.arg1.c.g];
-        params.arg1.c.h = [NSNumber numberWithDouble:mRequest.arg1.c.h];
-        { // Scope for our temporary variables
-            auto * array_1 = [NSMutableArray new];
-            for (auto & entry_1 : mRequest.arg1.d) {
-                CHIPTestClusterClusterSimpleStruct * newElement_1;
-                newElement_1 = [CHIPTestClusterClusterSimpleStruct new];
-                newElement_1.a = [NSNumber numberWithUnsignedChar:entry_1.a];
-                newElement_1.b = [NSNumber numberWithBool:entry_1.b];
-                newElement_1.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_1.c)];
-                newElement_1.d = [NSData dataWithBytes:entry_1.d.data() length:entry_1.d.size()];
-                newElement_1.e = [[NSString alloc] initWithBytes:entry_1.e.data()
-                                                          length:entry_1.e.size()
-                                                        encoding:NSUTF8StringEncoding];
-                newElement_1.f = [NSNumber numberWithUnsignedChar:entry_1.f.Raw()];
-                newElement_1.g = [NSNumber numberWithFloat:entry_1.g];
-                newElement_1.h = [NSNumber numberWithDouble:entry_1.h];
-                [array_1 addObject:newElement_1];
-            }
-            params.arg1.d = array_1;
-        }
-        { // Scope for our temporary variables
-            auto * array_1 = [NSMutableArray new];
-            for (auto & entry_1 : mRequest.arg1.e) {
-                NSNumber * newElement_1;
-                newElement_1 = [NSNumber numberWithUnsignedInt:entry_1];
-                [array_1 addObject:newElement_1];
-            }
-            params.arg1.e = array_1;
-        }
-        { // Scope for our temporary variables
-            auto * array_1 = [NSMutableArray new];
-            for (auto & entry_1 : mRequest.arg1.f) {
-                NSData * newElement_1;
-                newElement_1 = [NSData dataWithBytes:entry_1.data() length:entry_1.size()];
-                [array_1 addObject:newElement_1];
-            }
-            params.arg1.f = array_1;
-        }
-        { // Scope for our temporary variables
-            auto * array_1 = [NSMutableArray new];
-            for (auto & entry_1 : mRequest.arg1.g) {
-                NSNumber * newElement_1;
-                newElement_1 = [NSNumber numberWithUnsignedChar:entry_1];
-                [array_1 addObject:newElement_1];
+        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
             }
-            params.arg1.g = array_1;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster testNestedStructListArgumentRequestWithParams:params
-                                                 completionHandler:^(CHIPTestClusterClusterBooleanResponseParams * _Nullable values,
-                                                     NSError * _Nullable error) {
-                                                     NSLog(@"Values: %@", values);
-                                                     responsesNeeded--;
-                                                     if (error != nil) {
-                                                         mError = error;
-                                                         LogNSError("Error", error);
-                                                     }
-                                                     if (responsesNeeded == 0) {
-                                                         SetCommandExitStatus(mError);
-                                                     }
-                                                 }];
-        }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TargetNavigator.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::TestCluster::Commands::TestNestedStructListArgumentRequest::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::TestCluster::Structs::NestedStructList::Type> mComplex_Arg1;
 };
 
 /*
- * Command TestListNestedStructListArgumentRequest
+ * Attribute FeatureMap
  */
-class TestClusterTestListNestedStructListArgumentRequest : public ClusterCommand {
+class ReadTargetNavigatorFeatureMap : public ReadAttribute {
 public:
-    TestClusterTestListNestedStructListArgumentRequest()
-        : ClusterCommand("test-list-nested-struct-list-argument-request")
-        , mComplex_Arg1(&mRequest.arg1)
+    ReadTargetNavigatorFeatureMap()
+        : ReadAttribute("feature-map")
     {
-        AddArgument("Arg1", &mComplex_Arg1);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadTargetNavigatorFeatureMap() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPTestClusterClusterTestListNestedStructListArgumentRequestParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mRequest.arg1) {
-                CHIPTestClusterClusterNestedStructList * newElement_0;
-                newElement_0 = [CHIPTestClusterClusterNestedStructList new];
-                newElement_0.a = [NSNumber numberWithUnsignedChar:entry_0.a];
-                newElement_0.b = [NSNumber numberWithBool:entry_0.b];
-                newElement_0.c = [CHIPTestClusterClusterSimpleStruct new];
-                newElement_0.c.a = [NSNumber numberWithUnsignedChar:entry_0.c.a];
-                newElement_0.c.b = [NSNumber numberWithBool:entry_0.c.b];
-                newElement_0.c.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.c.c)];
-                newElement_0.c.d = [NSData dataWithBytes:entry_0.c.d.data() length:entry_0.c.d.size()];
-                newElement_0.c.e = [[NSString alloc] initWithBytes:entry_0.c.e.data()
-                                                            length:entry_0.c.e.size()
-                                                          encoding:NSUTF8StringEncoding];
-                newElement_0.c.f = [NSNumber numberWithUnsignedChar:entry_0.c.f.Raw()];
-                newElement_0.c.g = [NSNumber numberWithFloat:entry_0.c.g];
-                newElement_0.c.h = [NSNumber numberWithDouble:entry_0.c.h];
-                { // Scope for our temporary variables
-                    auto * array_2 = [NSMutableArray new];
-                    for (auto & entry_2 : entry_0.d) {
-                        CHIPTestClusterClusterSimpleStruct * newElement_2;
-                        newElement_2 = [CHIPTestClusterClusterSimpleStruct new];
-                        newElement_2.a = [NSNumber numberWithUnsignedChar:entry_2.a];
-                        newElement_2.b = [NSNumber numberWithBool:entry_2.b];
-                        newElement_2.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_2.c)];
-                        newElement_2.d = [NSData dataWithBytes:entry_2.d.data() length:entry_2.d.size()];
-                        newElement_2.e = [[NSString alloc] initWithBytes:entry_2.e.data()
-                                                                  length:entry_2.e.size()
-                                                                encoding:NSUTF8StringEncoding];
-                        newElement_2.f = [NSNumber numberWithUnsignedChar:entry_2.f.Raw()];
-                        newElement_2.g = [NSNumber numberWithFloat:entry_2.g];
-                        newElement_2.h = [NSNumber numberWithDouble:entry_2.h];
-                        [array_2 addObject:newElement_2];
-                    }
-                    newElement_0.d = array_2;
-                }
-                { // Scope for our temporary variables
-                    auto * array_2 = [NSMutableArray new];
-                    for (auto & entry_2 : entry_0.e) {
-                        NSNumber * newElement_2;
-                        newElement_2 = [NSNumber numberWithUnsignedInt:entry_2];
-                        [array_2 addObject:newElement_2];
-                    }
-                    newElement_0.e = array_2;
-                }
-                { // Scope for our temporary variables
-                    auto * array_2 = [NSMutableArray new];
-                    for (auto & entry_2 : entry_0.f) {
-                        NSData * newElement_2;
-                        newElement_2 = [NSData dataWithBytes:entry_2.data() length:entry_2.size()];
-                        [array_2 addObject:newElement_2];
-                    }
-                    newElement_0.f = array_2;
-                }
-                { // Scope for our temporary variables
-                    auto * array_2 = [NSMutableArray new];
-                    for (auto & entry_2 : entry_0.g) {
-                        NSNumber * newElement_2;
-                        newElement_2 = [NSNumber numberWithUnsignedChar:entry_2];
-                        [array_2 addObject:newElement_2];
-                    }
-                    newElement_0.g = array_2;
-                }
-                [array_0 addObject:newElement_0];
+        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TargetNavigator.FeatureMap response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TargetNavigator FeatureMap read Error", error);
             }
-            params.arg1 = array_0;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster
-                testListNestedStructListArgumentRequestWithParams:params
-                                                completionHandler:^(CHIPTestClusterClusterBooleanResponseParams * _Nullable values,
-                                                    NSError * _Nullable error) {
-                                                    NSLog(@"Values: %@", values);
-                                                    responsesNeeded--;
-                                                    if (error != nil) {
-                                                        mError = error;
-                                                        LogNSError("Error", error);
-                                                    }
-                                                    if (responsesNeeded == 0) {
-                                                        SetCommandExitStatus(mError);
-                                                    }
-                                                }];
-        }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::TestCluster::Commands::TestListNestedStructListArgumentRequest::Type mRequest;
-    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::NestedStructList::Type>>
-        mComplex_Arg1;
 };
 
-/*
- * Command TestListInt8UReverseRequest
- */
-class TestClusterTestListInt8UReverseRequest : public ClusterCommand {
+class SubscribeAttributeTargetNavigatorFeatureMap : public SubscribeAttribute {
 public:
-    TestClusterTestListInt8UReverseRequest()
-        : ClusterCommand("test-list-int8ureverse-request")
-        , mComplex_Arg1(&mRequest.arg1)
+    SubscribeAttributeTargetNavigatorFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
-        AddArgument("Arg1", &mComplex_Arg1);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeTargetNavigatorFeatureMap() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000D) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPTestClusterClusterTestListInt8UReverseRequestParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mRequest.arg1) {
-                NSNumber * newElement_0;
-                newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
-                [array_0 addObject:newElement_0];
+        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
             }
-            params.arg1 = array_0;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster
-                testListInt8UReverseRequestWithParams:params
-                                    completionHandler:^(CHIPTestClusterClusterTestListInt8UReverseResponseParams * _Nullable values,
-                                        NSError * _Nullable error) {
-                                        NSLog(@"Values: %@", values);
-                                        responsesNeeded--;
-                                        if (error != nil) {
-                                            mError = error;
-                                            LogNSError("Error", error);
-                                        }
-                                        if (responsesNeeded == 0) {
-                                            SetCommandExitStatus(mError);
-                                        }
-                                    }];
-        }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TargetNavigator.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::TestCluster::Commands::TestListInt8UReverseRequest::Type mRequest;
-    TypedComplexArgument<chip::app::DataModel::List<const uint8_t>> mComplex_Arg1;
 };
 
 /*
- * Command TestEnumsRequest
+ * Attribute ClusterRevision
  */
-class TestClusterTestEnumsRequest : public ClusterCommand {
+class ReadTargetNavigatorClusterRevision : public ReadAttribute {
 public:
-    TestClusterTestEnumsRequest()
-        : ClusterCommand("test-enums-request")
+    ReadTargetNavigatorClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
-        AddArgument("Arg1", 0, UINT16_MAX, &mRequest.arg1);
-        AddArgument("Arg2", 0, UINT8_MAX, &mRequest.arg2);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadTargetNavigatorClusterRevision() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPTestClusterClusterTestEnumsRequestParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.arg1 = [NSNumber numberWithUnsignedShort:chip::to_underlying(mRequest.arg1)];
-        params.arg2 = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.arg2)];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster testEnumsRequestWithParams:params
-                              completionHandler:^(
-                                  CHIPTestClusterClusterTestEnumsResponseParams * _Nullable values, NSError * _Nullable error) {
-                                  NSLog(@"Values: %@", values);
-                                  responsesNeeded--;
-                                  if (error != nil) {
-                                      mError = error;
-                                      LogNSError("Error", error);
-                                  }
-                                  if (responsesNeeded == 0) {
-                                      SetCommandExitStatus(mError);
-                                  }
-                              }];
-        }
+        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TargetNavigator.ClusterRevision response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TargetNavigator ClusterRevision read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
+};
+
+class SubscribeAttributeTargetNavigatorClusterRevision : public SubscribeAttribute {
+public:
+    SubscribeAttributeTargetNavigatorClusterRevision()
+        : SubscribeAttribute("cluster-revision")
+    {
+    }
 
-private:
-    chip::app::Clusters::TestCluster::Commands::TestEnumsRequest::Type mRequest;
+    ~SubscribeAttributeTargetNavigatorClusterRevision() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000505) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TargetNavigator.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster MediaPlayback                                               | 0x0506 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * Play                                                              |   0x00 |
+| * Pause                                                             |   0x01 |
+| * StopPlayback                                                      |   0x02 |
+| * StartOver                                                         |   0x03 |
+| * Previous                                                          |   0x04 |
+| * Next                                                              |   0x05 |
+| * Rewind                                                            |   0x06 |
+| * FastForward                                                       |   0x07 |
+| * SkipForward                                                       |   0x08 |
+| * SkipBackward                                                      |   0x09 |
+| * Seek                                                              |   0x0B |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * CurrentState                                                      | 0x0000 |
+| * StartTime                                                         | 0x0001 |
+| * Duration                                                          | 0x0002 |
+| * SampledPosition                                                   | 0x0003 |
+| * PlaybackSpeed                                                     | 0x0004 |
+| * SeekRangeEnd                                                      | 0x0005 |
+| * SeekRangeStart                                                    | 0x0006 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Command TestNullableOptionalRequest
+ * Command Play
  */
-class TestClusterTestNullableOptionalRequest : public ClusterCommand {
+class MediaPlaybackPlay : public ClusterCommand {
 public:
-    TestClusterTestNullableOptionalRequest()
-        : ClusterCommand("test-nullable-optional-request")
+    MediaPlaybackPlay()
+        : ClusterCommand("play")
     {
-        AddArgument("Arg1", 0, UINT8_MAX, &mRequest.arg1);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPTestClusterClusterTestNullableOptionalRequestParams alloc] init];
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPMediaPlaybackClusterPlayParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        if (mRequest.arg1.HasValue()) {
-            if (mRequest.arg1.Value().IsNull()) {
-                params.arg1 = nil;
-            } else {
-                params.arg1 = [NSNumber numberWithUnsignedChar:mRequest.arg1.Value().Value()];
-            }
-        } else {
-            params.arg1 = nil;
-        }
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster
-                testNullableOptionalRequestWithParams:params
-                                    completionHandler:^(CHIPTestClusterClusterTestNullableOptionalResponseParams * _Nullable values,
-                                        NSError * _Nullable error) {
-                                        NSLog(@"Values: %@", values);
-                                        responsesNeeded--;
-                                        if (error != nil) {
-                                            mError = error;
-                                            LogNSError("Error", error);
-                                        }
-                                        if (responsesNeeded == 0) {
-                                            SetCommandExitStatus(mError);
-                                        }
-                                    }];
+                   playWithParams:params
+                completionHandler:^(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                    NSLog(@"Values: %@", values);
+                    responsesNeeded--;
+                    if (error != nil) {
+                        mError = error;
+                        LogNSError("Error", error);
+                    }
+                    if (responsesNeeded == 0) {
+                        SetCommandExitStatus(mError);
+                    }
+                }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::TestCluster::Commands::TestNullableOptionalRequest::Type mRequest;
 };
 
 /*
- * Command TestComplexNullableOptionalRequest
+ * Command Pause
  */
-class TestClusterTestComplexNullableOptionalRequest : public ClusterCommand {
+class MediaPlaybackPause : public ClusterCommand {
 public:
-    TestClusterTestComplexNullableOptionalRequest()
-        : ClusterCommand("test-complex-nullable-optional-request")
-        , mComplex_NullableStruct(&mRequest.nullableStruct)
-        , mComplex_OptionalStruct(&mRequest.optionalStruct)
-        , mComplex_NullableOptionalStruct(&mRequest.nullableOptionalStruct)
-        , mComplex_NullableList(&mRequest.nullableList)
-        , mComplex_OptionalList(&mRequest.optionalList)
-        , mComplex_NullableOptionalList(&mRequest.nullableOptionalList)
+    MediaPlaybackPause()
+        : ClusterCommand("pause")
     {
-        AddArgument("NullableInt", 0, UINT16_MAX, &mRequest.nullableInt);
-        AddArgument("OptionalInt", 0, UINT16_MAX, &mRequest.optionalInt);
-        AddArgument("NullableOptionalInt", 0, UINT16_MAX, &mRequest.nullableOptionalInt);
-        AddArgument("NullableString", &mRequest.nullableString);
-        AddArgument("OptionalString", &mRequest.optionalString);
-        AddArgument("NullableOptionalString", &mRequest.nullableOptionalString);
-        AddArgument("NullableStruct", &mComplex_NullableStruct);
-        AddArgument("OptionalStruct", &mComplex_OptionalStruct);
-        AddArgument("NullableOptionalStruct", &mComplex_NullableOptionalStruct);
-        AddArgument("NullableList", &mComplex_NullableList);
-        AddArgument("OptionalList", &mComplex_OptionalList);
-        AddArgument("NullableOptionalList", &mComplex_NullableOptionalList);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPTestClusterClusterTestComplexNullableOptionalRequestParams alloc] init];
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPMediaPlaybackClusterPauseParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        if (mRequest.nullableInt.IsNull()) {
-            params.nullableInt = nil;
-        } else {
-            params.nullableInt = [NSNumber numberWithUnsignedShort:mRequest.nullableInt.Value()];
-        }
-        if (mRequest.optionalInt.HasValue()) {
-            params.optionalInt = [NSNumber numberWithUnsignedShort:mRequest.optionalInt.Value()];
-        } else {
-            params.optionalInt = nil;
-        }
-        if (mRequest.nullableOptionalInt.HasValue()) {
-            if (mRequest.nullableOptionalInt.Value().IsNull()) {
-                params.nullableOptionalInt = nil;
-            } else {
-                params.nullableOptionalInt = [NSNumber numberWithUnsignedShort:mRequest.nullableOptionalInt.Value().Value()];
-            }
-        } else {
-            params.nullableOptionalInt = nil;
-        }
-        if (mRequest.nullableString.IsNull()) {
-            params.nullableString = nil;
-        } else {
-            params.nullableString = [[NSString alloc] initWithBytes:mRequest.nullableString.Value().data()
-                                                             length:mRequest.nullableString.Value().size()
-                                                           encoding:NSUTF8StringEncoding];
-        }
-        if (mRequest.optionalString.HasValue()) {
-            params.optionalString = [[NSString alloc] initWithBytes:mRequest.optionalString.Value().data()
-                                                             length:mRequest.optionalString.Value().size()
-                                                           encoding:NSUTF8StringEncoding];
-        } else {
-            params.optionalString = nil;
-        }
-        if (mRequest.nullableOptionalString.HasValue()) {
-            if (mRequest.nullableOptionalString.Value().IsNull()) {
-                params.nullableOptionalString = nil;
-            } else {
-                params.nullableOptionalString =
-                    [[NSString alloc] initWithBytes:mRequest.nullableOptionalString.Value().Value().data()
-                                             length:mRequest.nullableOptionalString.Value().Value().size()
-                                           encoding:NSUTF8StringEncoding];
-            }
-        } else {
-            params.nullableOptionalString = nil;
-        }
-        if (mRequest.nullableStruct.IsNull()) {
-            params.nullableStruct = nil;
-        } else {
-            params.nullableStruct = [CHIPTestClusterClusterSimpleStruct new];
-            params.nullableStruct.a = [NSNumber numberWithUnsignedChar:mRequest.nullableStruct.Value().a];
-            params.nullableStruct.b = [NSNumber numberWithBool:mRequest.nullableStruct.Value().b];
-            params.nullableStruct.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.nullableStruct.Value().c)];
-            params.nullableStruct.d = [NSData dataWithBytes:mRequest.nullableStruct.Value().d.data()
-                                                     length:mRequest.nullableStruct.Value().d.size()];
-            params.nullableStruct.e = [[NSString alloc] initWithBytes:mRequest.nullableStruct.Value().e.data()
-                                                               length:mRequest.nullableStruct.Value().e.size()
-                                                             encoding:NSUTF8StringEncoding];
-            params.nullableStruct.f = [NSNumber numberWithUnsignedChar:mRequest.nullableStruct.Value().f.Raw()];
-            params.nullableStruct.g = [NSNumber numberWithFloat:mRequest.nullableStruct.Value().g];
-            params.nullableStruct.h = [NSNumber numberWithDouble:mRequest.nullableStruct.Value().h];
-        }
-        if (mRequest.optionalStruct.HasValue()) {
-            params.optionalStruct = [CHIPTestClusterClusterSimpleStruct new];
-            params.optionalStruct.a = [NSNumber numberWithUnsignedChar:mRequest.optionalStruct.Value().a];
-            params.optionalStruct.b = [NSNumber numberWithBool:mRequest.optionalStruct.Value().b];
-            params.optionalStruct.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.optionalStruct.Value().c)];
-            params.optionalStruct.d = [NSData dataWithBytes:mRequest.optionalStruct.Value().d.data()
-                                                     length:mRequest.optionalStruct.Value().d.size()];
-            params.optionalStruct.e = [[NSString alloc] initWithBytes:mRequest.optionalStruct.Value().e.data()
-                                                               length:mRequest.optionalStruct.Value().e.size()
-                                                             encoding:NSUTF8StringEncoding];
-            params.optionalStruct.f = [NSNumber numberWithUnsignedChar:mRequest.optionalStruct.Value().f.Raw()];
-            params.optionalStruct.g = [NSNumber numberWithFloat:mRequest.optionalStruct.Value().g];
-            params.optionalStruct.h = [NSNumber numberWithDouble:mRequest.optionalStruct.Value().h];
-        } else {
-            params.optionalStruct = nil;
-        }
-        if (mRequest.nullableOptionalStruct.HasValue()) {
-            if (mRequest.nullableOptionalStruct.Value().IsNull()) {
-                params.nullableOptionalStruct = nil;
-            } else {
-                params.nullableOptionalStruct = [CHIPTestClusterClusterSimpleStruct new];
-                params.nullableOptionalStruct.a =
-                    [NSNumber numberWithUnsignedChar:mRequest.nullableOptionalStruct.Value().Value().a];
-                params.nullableOptionalStruct.b = [NSNumber numberWithBool:mRequest.nullableOptionalStruct.Value().Value().b];
-                params.nullableOptionalStruct.c =
-                    [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.nullableOptionalStruct.Value().Value().c)];
-                params.nullableOptionalStruct.d = [NSData dataWithBytes:mRequest.nullableOptionalStruct.Value().Value().d.data()
-                                                                 length:mRequest.nullableOptionalStruct.Value().Value().d.size()];
-                params.nullableOptionalStruct.e =
-                    [[NSString alloc] initWithBytes:mRequest.nullableOptionalStruct.Value().Value().e.data()
-                                             length:mRequest.nullableOptionalStruct.Value().Value().e.size()
-                                           encoding:NSUTF8StringEncoding];
-                params.nullableOptionalStruct.f =
-                    [NSNumber numberWithUnsignedChar:mRequest.nullableOptionalStruct.Value().Value().f.Raw()];
-                params.nullableOptionalStruct.g = [NSNumber numberWithFloat:mRequest.nullableOptionalStruct.Value().Value().g];
-                params.nullableOptionalStruct.h = [NSNumber numberWithDouble:mRequest.nullableOptionalStruct.Value().Value().h];
-            }
-        } else {
-            params.nullableOptionalStruct = nil;
-        }
-        if (mRequest.nullableList.IsNull()) {
-            params.nullableList = nil;
-        } else {
-            { // Scope for our temporary variables
-                auto * array_1 = [NSMutableArray new];
-                for (auto & entry_1 : mRequest.nullableList.Value()) {
-                    NSNumber * newElement_1;
-                    newElement_1 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_1)];
-                    [array_1 addObject:newElement_1];
-                }
-                params.nullableList = array_1;
-            }
-        }
-        if (mRequest.optionalList.HasValue()) {
-            { // Scope for our temporary variables
-                auto * array_1 = [NSMutableArray new];
-                for (auto & entry_1 : mRequest.optionalList.Value()) {
-                    NSNumber * newElement_1;
-                    newElement_1 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_1)];
-                    [array_1 addObject:newElement_1];
-                }
-                params.optionalList = array_1;
-            }
-        } else {
-            params.optionalList = nil;
-        }
-        if (mRequest.nullableOptionalList.HasValue()) {
-            if (mRequest.nullableOptionalList.Value().IsNull()) {
-                params.nullableOptionalList = nil;
-            } else {
-                { // Scope for our temporary variables
-                    auto * array_2 = [NSMutableArray new];
-                    for (auto & entry_2 : mRequest.nullableOptionalList.Value().Value()) {
-                        NSNumber * newElement_2;
-                        newElement_2 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_2)];
-                        [array_2 addObject:newElement_2];
-                    }
-                    params.nullableOptionalList = array_2;
-                }
-            }
-        } else {
-            params.nullableOptionalList = nil;
-        }
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster
-                testComplexNullableOptionalRequestWithParams:params
-                                           completionHandler:^(
-                                               CHIPTestClusterClusterTestComplexNullableOptionalResponseParams * _Nullable values,
-                                               NSError * _Nullable error) {
-                                               NSLog(@"Values: %@", values);
-                                               responsesNeeded--;
-                                               if (error != nil) {
-                                                   mError = error;
-                                                   LogNSError("Error", error);
-                                               }
-                                               if (responsesNeeded == 0) {
-                                                   SetCommandExitStatus(mError);
-                                               }
-                                           }];
+                  pauseWithParams:params
+                completionHandler:^(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                    NSLog(@"Values: %@", values);
+                    responsesNeeded--;
+                    if (error != nil) {
+                        mError = error;
+                        LogNSError("Error", error);
+                    }
+                    if (responsesNeeded == 0) {
+                        SetCommandExitStatus(mError);
+                    }
+                }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::TestCluster::Commands::TestComplexNullableOptionalRequest::Type mRequest;
-    TypedComplexArgument<chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type>>
-        mComplex_NullableStruct;
-    TypedComplexArgument<chip::Optional<chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type>> mComplex_OptionalStruct;
-    TypedComplexArgument<
-        chip::Optional<chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type>>>
-        mComplex_NullableOptionalStruct;
-    TypedComplexArgument<
-        chip::app::DataModel::Nullable<chip::app::DataModel::List<const chip::app::Clusters::TestCluster::SimpleEnum>>>
-        mComplex_NullableList;
-    TypedComplexArgument<chip::Optional<chip::app::DataModel::List<const chip::app::Clusters::TestCluster::SimpleEnum>>>
-        mComplex_OptionalList;
-    TypedComplexArgument<chip::Optional<
-        chip::app::DataModel::Nullable<chip::app::DataModel::List<const chip::app::Clusters::TestCluster::SimpleEnum>>>>
-        mComplex_NullableOptionalList;
 };
 
 /*
- * Command SimpleStructEchoRequest
+ * Command StopPlayback
  */
-class TestClusterSimpleStructEchoRequest : public ClusterCommand {
+class MediaPlaybackStopPlayback : public ClusterCommand {
 public:
-    TestClusterSimpleStructEchoRequest()
-        : ClusterCommand("simple-struct-echo-request")
-        , mComplex_Arg1(&mRequest.arg1)
+    MediaPlaybackStopPlayback()
+        : ClusterCommand("stop-playback")
     {
-        AddArgument("Arg1", &mComplex_Arg1);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPTestClusterClusterSimpleStructEchoRequestParams alloc] init];
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPMediaPlaybackClusterStopPlaybackParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.arg1 = [CHIPTestClusterClusterSimpleStruct new];
-        params.arg1.a = [NSNumber numberWithUnsignedChar:mRequest.arg1.a];
-        params.arg1.b = [NSNumber numberWithBool:mRequest.arg1.b];
-        params.arg1.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.arg1.c)];
-        params.arg1.d = [NSData dataWithBytes:mRequest.arg1.d.data() length:mRequest.arg1.d.size()];
-        params.arg1.e = [[NSString alloc] initWithBytes:mRequest.arg1.e.data()
-                                                 length:mRequest.arg1.e.size()
-                                               encoding:NSUTF8StringEncoding];
-        params.arg1.f = [NSNumber numberWithUnsignedChar:mRequest.arg1.f.Raw()];
-        params.arg1.g = [NSNumber numberWithFloat:mRequest.arg1.g];
-        params.arg1.h = [NSNumber numberWithDouble:mRequest.arg1.h];
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster simpleStructEchoRequestWithParams:params
-                                     completionHandler:^(CHIPTestClusterClusterSimpleStructResponseParams * _Nullable values,
-                                         NSError * _Nullable error) {
-                                         NSLog(@"Values: %@", values);
-                                         responsesNeeded--;
-                                         if (error != nil) {
-                                             mError = error;
-                                             LogNSError("Error", error);
-                                         }
-                                         if (responsesNeeded == 0) {
-                                             SetCommandExitStatus(mError);
-                                         }
-                                     }];
+            [cluster stopPlaybackWithParams:params
+                          completionHandler:^(
+                              CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                              NSLog(@"Values: %@", values);
+                              responsesNeeded--;
+                              if (error != nil) {
+                                  mError = error;
+                                  LogNSError("Error", error);
+                              }
+                              if (responsesNeeded == 0) {
+                                  SetCommandExitStatus(mError);
+                              }
+                          }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::TestCluster::Commands::SimpleStructEchoRequest::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type> mComplex_Arg1;
 };
 
 /*
- * Command TimedInvokeRequest
+ * Command StartOver
  */
-class TestClusterTimedInvokeRequest : public ClusterCommand {
+class MediaPlaybackStartOver : public ClusterCommand {
 public:
-    TestClusterTimedInvokeRequest()
-        : ClusterCommand("timed-invoke-request")
+    MediaPlaybackStartOver()
+        : ClusterCommand("start-over")
     {
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPTestClusterClusterTimedInvokeRequestParams alloc] init];
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPMediaPlaybackClusterStartOverParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster timedInvokeRequestWithParams:params
-                                completionHandler:^(NSError * _Nullable error) {
-                                    responsesNeeded--;
-                                    if (error != nil) {
-                                        mError = error;
-                                        LogNSError("Error", error);
-                                    }
-                                    if (responsesNeeded == 0) {
-                                        SetCommandExitStatus(mError);
-                                    }
-                                }];
+            [cluster startOverWithParams:params
+                       completionHandler:^(
+                           CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                           NSLog(@"Values: %@", values);
+                           responsesNeeded--;
+                           if (error != nil) {
+                               mError = error;
+                               LogNSError("Error", error);
+                           }
+                           if (responsesNeeded == 0) {
+                               SetCommandExitStatus(mError);
+                           }
+                       }];
         }
         return CHIP_NO_ERROR;
     }
@@ -66574,346 +65032,370 @@ class TestClusterTimedInvokeRequest : public ClusterCommand {
 };
 
 /*
- * Command TestSimpleOptionalArgumentRequest
+ * Command Previous
  */
-class TestClusterTestSimpleOptionalArgumentRequest : public ClusterCommand {
+class MediaPlaybackPrevious : public ClusterCommand {
 public:
-    TestClusterTestSimpleOptionalArgumentRequest()
-        : ClusterCommand("test-simple-optional-argument-request")
+    MediaPlaybackPrevious()
+        : ClusterCommand("previous")
     {
-        AddArgument("Arg1", 0, 1, &mRequest.arg1);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPTestClusterClusterTestSimpleOptionalArgumentRequestParams alloc] init];
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPMediaPlaybackClusterPreviousParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        if (mRequest.arg1.HasValue()) {
-            params.arg1 = [NSNumber numberWithBool:mRequest.arg1.Value()];
-        } else {
-            params.arg1 = nil;
-        }
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster testSimpleOptionalArgumentRequestWithParams:params
-                                               completionHandler:^(NSError * _Nullable error) {
-                                                   responsesNeeded--;
-                                                   if (error != nil) {
-                                                       mError = error;
-                                                       LogNSError("Error", error);
-                                                   }
-                                                   if (responsesNeeded == 0) {
-                                                       SetCommandExitStatus(mError);
-                                                   }
-                                               }];
+            [cluster
+                previousWithParams:params
+                 completionHandler:^(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                     NSLog(@"Values: %@", values);
+                     responsesNeeded--;
+                     if (error != nil) {
+                         mError = error;
+                         LogNSError("Error", error);
+                     }
+                     if (responsesNeeded == 0) {
+                         SetCommandExitStatus(mError);
+                     }
+                 }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::TestCluster::Commands::TestSimpleOptionalArgumentRequest::Type mRequest;
 };
 
 /*
- * Command TestEmitTestEventRequest
+ * Command Next
  */
-class TestClusterTestEmitTestEventRequest : public ClusterCommand {
+class MediaPlaybackNext : public ClusterCommand {
 public:
-    TestClusterTestEmitTestEventRequest()
-        : ClusterCommand("test-emit-test-event-request")
+    MediaPlaybackNext()
+        : ClusterCommand("next")
     {
-        AddArgument("Arg1", 0, UINT8_MAX, &mRequest.arg1);
-        AddArgument("Arg2", 0, UINT8_MAX, &mRequest.arg2);
-        AddArgument("Arg3", 0, 1, &mRequest.arg3);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000014) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPTestClusterClusterTestEmitTestEventRequestParams alloc] init];
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPMediaPlaybackClusterNextParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.arg1 = [NSNumber numberWithUnsignedChar:mRequest.arg1];
-        params.arg2 = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.arg2)];
-        params.arg3 = [NSNumber numberWithBool:mRequest.arg3];
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster testEmitTestEventRequestWithParams:params
-                                      completionHandler:^(CHIPTestClusterClusterTestEmitTestEventResponseParams * _Nullable values,
-                                          NSError * _Nullable error) {
-                                          NSLog(@"Values: %@", values);
-                                          responsesNeeded--;
-                                          if (error != nil) {
-                                              mError = error;
-                                              LogNSError("Error", error);
-                                          }
-                                          if (responsesNeeded == 0) {
-                                              SetCommandExitStatus(mError);
-                                          }
-                                      }];
+            [cluster
+                   nextWithParams:params
+                completionHandler:^(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                    NSLog(@"Values: %@", values);
+                    responsesNeeded--;
+                    if (error != nil) {
+                        mError = error;
+                        LogNSError("Error", error);
+                    }
+                    if (responsesNeeded == 0) {
+                        SetCommandExitStatus(mError);
+                    }
+                }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::TestCluster::Commands::TestEmitTestEventRequest::Type mRequest;
 };
 
 /*
- * Command TestEmitTestFabricScopedEventRequest
+ * Command Rewind
  */
-class TestClusterTestEmitTestFabricScopedEventRequest : public ClusterCommand {
+class MediaPlaybackRewind : public ClusterCommand {
 public:
-    TestClusterTestEmitTestFabricScopedEventRequest()
-        : ClusterCommand("test-emit-test-fabric-scoped-event-request")
+    MediaPlaybackRewind()
+        : ClusterCommand("rewind")
     {
-        AddArgument("Arg1", 0, UINT8_MAX, &mRequest.arg1);
         ClusterCommand::AddArguments();
     }
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000015) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000006) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPTestClusterClusterTestEmitTestFabricScopedEventRequestParams alloc] init];
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPMediaPlaybackClusterRewindParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.arg1 = [NSNumber numberWithUnsignedChar:mRequest.arg1];
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster
-                testEmitTestFabricScopedEventRequestWithParams:params
-                                             completionHandler:^(
-                                                 CHIPTestClusterClusterTestEmitTestFabricScopedEventResponseParams * _Nullable values,
-                                                 NSError * _Nullable error) {
-                                                 NSLog(@"Values: %@", values);
-                                                 responsesNeeded--;
-                                                 if (error != nil) {
-                                                     mError = error;
-                                                     LogNSError("Error", error);
-                                                 }
-                                                 if (responsesNeeded == 0) {
-                                                     SetCommandExitStatus(mError);
-                                                 }
-                                             }];
+                 rewindWithParams:params
+                completionHandler:^(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                    NSLog(@"Values: %@", values);
+                    responsesNeeded--;
+                    if (error != nil) {
+                        mError = error;
+                        LogNSError("Error", error);
+                    }
+                    if (responsesNeeded == 0) {
+                        SetCommandExitStatus(mError);
+                    }
+                }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::TestCluster::Commands::TestEmitTestFabricScopedEventRequest::Type mRequest;
 };
 
 /*
- * Attribute Boolean
+ * Command FastForward
  */
-class ReadTestClusterBoolean : public ReadAttribute {
+class MediaPlaybackFastForward : public ClusterCommand {
 public:
-    ReadTestClusterBoolean()
-        : ReadAttribute("boolean")
+    MediaPlaybackFastForward()
+        : ClusterCommand("fast-forward")
     {
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadTestClusterBoolean() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000007) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBooleanWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.Boolean response %@", [value description]);
-            if (error != nil) {
-                LogNSError("TestCluster Boolean read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPMediaPlaybackClusterFastForwardParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster fastForwardWithParams:params
+                         completionHandler:^(
+                             CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                             NSLog(@"Values: %@", values);
+                             responsesNeeded--;
+                             if (error != nil) {
+                                 mError = error;
+                                 LogNSError("Error", error);
+                             }
+                             if (responsesNeeded == 0) {
+                                 SetCommandExitStatus(mError);
+                             }
+                         }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
 };
 
-class WriteTestClusterBoolean : public WriteAttribute {
+/*
+ * Command SkipForward
+ */
+class MediaPlaybackSkipForward : public ClusterCommand {
 public:
-    WriteTestClusterBoolean()
-        : WriteAttribute("boolean")
+    MediaPlaybackSkipForward()
+        : ClusterCommand("skip-forward")
     {
-        AddArgument("attr-name", "boolean");
-        AddArgument("attr-value", 0, 1, &mValue);
-        WriteAttribute::AddArguments();
+        AddArgument("DeltaPositionMilliseconds", 0, UINT64_MAX, &mRequest.deltaPositionMilliseconds);
+        ClusterCommand::AddArguments();
     }
 
-    ~WriteTestClusterBoolean() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000008) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPMediaPlaybackClusterSkipForwardParams alloc] init];
+        params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
-
-        [cluster writeAttributeBooleanWithValue:value
-                                         params:params
-                              completionHandler:^(NSError * _Nullable error) {
-                                  if (error != nil) {
-                                      LogNSError("TestCluster Boolean write Error", error);
-                                  }
-                                  SetCommandExitStatus(error);
-                              }];
+        params.deltaPositionMilliseconds = [NSNumber numberWithUnsignedLongLong:mRequest.deltaPositionMilliseconds];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster skipForwardWithParams:params
+                         completionHandler:^(
+                             CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                             NSLog(@"Values: %@", values);
+                             responsesNeeded--;
+                             if (error != nil) {
+                                 mError = error;
+                                 LogNSError("Error", error);
+                             }
+                             if (responsesNeeded == 0) {
+                                 SetCommandExitStatus(mError);
+                             }
+                         }];
+        }
         return CHIP_NO_ERROR;
     }
 
 private:
-    bool mValue;
+    chip::app::Clusters::MediaPlayback::Commands::SkipForward::Type mRequest;
 };
 
-class SubscribeAttributeTestClusterBoolean : public SubscribeAttribute {
+/*
+ * Command SkipBackward
+ */
+class MediaPlaybackSkipBackward : public ClusterCommand {
 public:
-    SubscribeAttributeTestClusterBoolean()
-        : SubscribeAttribute("boolean")
+    MediaPlaybackSkipBackward()
+        : ClusterCommand("skip-backward")
     {
+        AddArgument("DeltaPositionMilliseconds", 0, UINT64_MAX, &mRequest.deltaPositionMilliseconds);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeTestClusterBoolean() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000000) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBooleanWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.Boolean response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000009) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPMediaPlaybackClusterSkipBackwardParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.deltaPositionMilliseconds = [NSNumber numberWithUnsignedLongLong:mRequest.deltaPositionMilliseconds];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster skipBackwardWithParams:params
+                          completionHandler:^(
+                              CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                              NSLog(@"Values: %@", values);
+                              responsesNeeded--;
+                              if (error != nil) {
+                                  mError = error;
+                                  LogNSError("Error", error);
+                              }
+                              if (responsesNeeded == 0) {
+                                  SetCommandExitStatus(mError);
+                              }
+                          }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::MediaPlayback::Commands::SkipBackward::Type mRequest;
 };
 
 /*
- * Attribute Bitmap8
+ * Command Seek
  */
-class ReadTestClusterBitmap8 : public ReadAttribute {
+class MediaPlaybackSeek : public ClusterCommand {
 public:
-    ReadTestClusterBitmap8()
-        : ReadAttribute("bitmap8")
+    MediaPlaybackSeek()
+        : ClusterCommand("seek")
     {
+        AddArgument("Position", 0, UINT64_MAX, &mRequest.position);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadTestClusterBitmap8() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x0000000B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBitmap8WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.Bitmap8 response %@", [value description]);
-            if (error != nil) {
-                LogNSError("TestCluster Bitmap8 read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPMediaPlaybackClusterSeekParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.position = [NSNumber numberWithUnsignedLongLong:mRequest.position];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster
+                   seekWithParams:params
+                completionHandler:^(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                    NSLog(@"Values: %@", values);
+                    responsesNeeded--;
+                    if (error != nil) {
+                        mError = error;
+                        LogNSError("Error", error);
+                    }
+                    if (responsesNeeded == 0) {
+                        SetCommandExitStatus(mError);
+                    }
+                }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::MediaPlayback::Commands::Seek::Type mRequest;
 };
 
-class WriteTestClusterBitmap8 : public WriteAttribute {
+/*
+ * Attribute CurrentState
+ */
+class ReadMediaPlaybackCurrentState : public ReadAttribute {
 public:
-    WriteTestClusterBitmap8()
-        : WriteAttribute("bitmap8")
+    ReadMediaPlaybackCurrentState()
+        : ReadAttribute("current-state")
     {
-        AddArgument("attr-name", "bitmap8");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteTestClusterBitmap8() {}
+    ~ReadMediaPlaybackCurrentState() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000001) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
-        [cluster writeAttributeBitmap8WithValue:value
-                                         params:params
-                              completionHandler:^(NSError * _Nullable error) {
-                                  if (error != nil) {
-                                      LogNSError("TestCluster Bitmap8 write Error", error);
-                                  }
-                                  SetCommandExitStatus(error);
-                              }];
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCurrentStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MediaPlayback.CurrentState response %@", [value description]);
+            if (error != nil) {
+                LogNSError("MediaPlayback CurrentState read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    uint8_t mValue;
 };
 
-class SubscribeAttributeTestClusterBitmap8 : public SubscribeAttribute {
+class SubscribeAttributeMediaPlaybackCurrentState : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterBitmap8()
-        : SubscribeAttribute("bitmap8")
+    SubscribeAttributeMediaPlaybackCurrentState()
+        : SubscribeAttribute("current-state")
     {
     }
 
-    ~SubscribeAttributeTestClusterBitmap8() {}
+    ~SubscribeAttributeMediaPlaybackCurrentState() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBitmap8WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCurrentStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.Bitmap8 response %@", [value description]);
+                NSLog(@"MediaPlayback.CurrentState response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -66924,27 +65406,27 @@ class SubscribeAttributeTestClusterBitmap8 : public SubscribeAttribute {
 };
 
 /*
- * Attribute Bitmap16
+ * Attribute StartTime
  */
-class ReadTestClusterBitmap16 : public ReadAttribute {
+class ReadMediaPlaybackStartTime : public ReadAttribute {
 public:
-    ReadTestClusterBitmap16()
-        : ReadAttribute("bitmap16")
+    ReadMediaPlaybackStartTime()
+        : ReadAttribute("start-time")
     {
     }
 
-    ~ReadTestClusterBitmap16() {}
+    ~ReadMediaPlaybackStartTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBitmap16WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.Bitmap16 response %@", [value description]);
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeStartTimeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MediaPlayback.StartTime response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster Bitmap16 read Error", error);
+                LogNSError("MediaPlayback StartTime read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -66952,70 +65434,32 @@ class ReadTestClusterBitmap16 : public ReadAttribute {
     }
 };
 
-class WriteTestClusterBitmap16 : public WriteAttribute {
-public:
-    WriteTestClusterBitmap16()
-        : WriteAttribute("bitmap16")
-    {
-        AddArgument("attr-name", "bitmap16");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterBitmap16() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000002) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeBitmap16WithValue:value
-                                          params:params
-                               completionHandler:^(NSError * _Nullable error) {
-                                   if (error != nil) {
-                                       LogNSError("TestCluster Bitmap16 write Error", error);
-                                   }
-                                   SetCommandExitStatus(error);
-                               }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeTestClusterBitmap16 : public SubscribeAttribute {
+class SubscribeAttributeMediaPlaybackStartTime : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterBitmap16()
-        : SubscribeAttribute("bitmap16")
+    SubscribeAttributeMediaPlaybackStartTime()
+        : SubscribeAttribute("start-time")
     {
     }
 
-    ~SubscribeAttributeTestClusterBitmap16() {}
+    ~SubscribeAttributeMediaPlaybackStartTime() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBitmap16WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeStartTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.Bitmap16 response %@", [value description]);
+                NSLog(@"MediaPlayback.StartTime response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -67026,27 +65470,27 @@ class SubscribeAttributeTestClusterBitmap16 : public SubscribeAttribute {
 };
 
 /*
- * Attribute Bitmap32
+ * Attribute Duration
  */
-class ReadTestClusterBitmap32 : public ReadAttribute {
+class ReadMediaPlaybackDuration : public ReadAttribute {
 public:
-    ReadTestClusterBitmap32()
-        : ReadAttribute("bitmap32")
+    ReadMediaPlaybackDuration()
+        : ReadAttribute("duration")
     {
     }
 
-    ~ReadTestClusterBitmap32() {}
+    ~ReadMediaPlaybackDuration() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBitmap32WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.Bitmap32 response %@", [value description]);
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeDurationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MediaPlayback.Duration response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster Bitmap32 read Error", error);
+                LogNSError("MediaPlayback Duration read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -67054,70 +65498,32 @@ class ReadTestClusterBitmap32 : public ReadAttribute {
     }
 };
 
-class WriteTestClusterBitmap32 : public WriteAttribute {
-public:
-    WriteTestClusterBitmap32()
-        : WriteAttribute("bitmap32")
-    {
-        AddArgument("attr-name", "bitmap32");
-        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterBitmap32() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000003) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue];
-
-        [cluster writeAttributeBitmap32WithValue:value
-                                          params:params
-                               completionHandler:^(NSError * _Nullable error) {
-                                   if (error != nil) {
-                                       LogNSError("TestCluster Bitmap32 write Error", error);
-                                   }
-                                   SetCommandExitStatus(error);
-                               }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint32_t mValue;
-};
-
-class SubscribeAttributeTestClusterBitmap32 : public SubscribeAttribute {
+class SubscribeAttributeMediaPlaybackDuration : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterBitmap32()
-        : SubscribeAttribute("bitmap32")
+    SubscribeAttributeMediaPlaybackDuration()
+        : SubscribeAttribute("duration")
     {
     }
 
-    ~SubscribeAttributeTestClusterBitmap32() {}
+    ~SubscribeAttributeMediaPlaybackDuration() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBitmap32WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDurationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.Bitmap32 response %@", [value description]);
+                NSLog(@"MediaPlayback.Duration response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -67128,27 +65534,28 @@ class SubscribeAttributeTestClusterBitmap32 : public SubscribeAttribute {
 };
 
 /*
- * Attribute Bitmap64
+ * Attribute SampledPosition
  */
-class ReadTestClusterBitmap64 : public ReadAttribute {
+class ReadMediaPlaybackSampledPosition : public ReadAttribute {
 public:
-    ReadTestClusterBitmap64()
-        : ReadAttribute("bitmap64")
+    ReadMediaPlaybackSampledPosition()
+        : ReadAttribute("sampled-position")
     {
     }
 
-    ~ReadTestClusterBitmap64() {}
+    ~ReadMediaPlaybackSampledPosition() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeBitmap64WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.Bitmap64 response %@", [value description]);
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeSampledPositionWithCompletionHandler:^(
+            CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MediaPlayback.SampledPosition response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster Bitmap64 read Error", error);
+                LogNSError("MediaPlayback SampledPosition read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -67156,70 +65563,32 @@ class ReadTestClusterBitmap64 : public ReadAttribute {
     }
 };
 
-class WriteTestClusterBitmap64 : public WriteAttribute {
+class SubscribeAttributeMediaPlaybackSampledPosition : public SubscribeAttribute {
 public:
-    WriteTestClusterBitmap64()
-        : WriteAttribute("bitmap64")
+    SubscribeAttributeMediaPlaybackSampledPosition()
+        : SubscribeAttribute("sampled-position")
     {
-        AddArgument("attr-name", "bitmap64");
-        AddArgument("attr-value", 0, UINT64_MAX, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteTestClusterBitmap64() {}
+    ~SubscribeAttributeMediaPlaybackSampledPosition() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000004) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedLongLong:mValue];
-
-        [cluster writeAttributeBitmap64WithValue:value
-                                          params:params
-                               completionHandler:^(NSError * _Nullable error) {
-                                   if (error != nil) {
-                                       LogNSError("TestCluster Bitmap64 write Error", error);
-                                   }
-                                   SetCommandExitStatus(error);
-                               }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint64_t mValue;
-};
-
-class SubscribeAttributeTestClusterBitmap64 : public SubscribeAttribute {
-public:
-    SubscribeAttributeTestClusterBitmap64()
-        : SubscribeAttribute("bitmap64")
-    {
-    }
-
-    ~SubscribeAttributeTestClusterBitmap64() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBitmap64WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSampledPositionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.Bitmap64 response %@", [value description]);
+            reportHandler:^(CHIPMediaPlaybackClusterPlaybackPosition * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaPlayback.SampledPosition response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -67230,27 +65599,27 @@ class SubscribeAttributeTestClusterBitmap64 : public SubscribeAttribute {
 };
 
 /*
- * Attribute Int8u
+ * Attribute PlaybackSpeed
  */
-class ReadTestClusterInt8u : public ReadAttribute {
+class ReadMediaPlaybackPlaybackSpeed : public ReadAttribute {
 public:
-    ReadTestClusterInt8u()
-        : ReadAttribute("int8u")
+    ReadMediaPlaybackPlaybackSpeed()
+        : ReadAttribute("playback-speed")
     {
     }
 
-    ~ReadTestClusterInt8u() {}
+    ~ReadMediaPlaybackPlaybackSpeed() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeInt8uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.Int8u response %@", [value description]);
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributePlaybackSpeedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MediaPlayback.PlaybackSpeed response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster Int8u read Error", error);
+                LogNSError("MediaPlayback PlaybackSpeed read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -67258,70 +65627,32 @@ class ReadTestClusterInt8u : public ReadAttribute {
     }
 };
 
-class WriteTestClusterInt8u : public WriteAttribute {
-public:
-    WriteTestClusterInt8u()
-        : WriteAttribute("int8u")
-    {
-        AddArgument("attr-name", "int8u");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterInt8u() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000005) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeInt8uWithValue:value
-                                       params:params
-                            completionHandler:^(NSError * _Nullable error) {
-                                if (error != nil) {
-                                    LogNSError("TestCluster Int8u write Error", error);
-                                }
-                                SetCommandExitStatus(error);
-                            }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeTestClusterInt8u : public SubscribeAttribute {
+class SubscribeAttributeMediaPlaybackPlaybackSpeed : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterInt8u()
-        : SubscribeAttribute("int8u")
+    SubscribeAttributeMediaPlaybackPlaybackSpeed()
+        : SubscribeAttribute("playback-speed")
     {
     }
 
-    ~SubscribeAttributeTestClusterInt8u() {}
+    ~SubscribeAttributeMediaPlaybackPlaybackSpeed() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReportAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInt8uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePlaybackSpeedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.Int8u response %@", [value description]);
+                NSLog(@"MediaPlayback.PlaybackSpeed response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -67332,27 +65663,27 @@ class SubscribeAttributeTestClusterInt8u : public SubscribeAttribute {
 };
 
 /*
- * Attribute Int16u
+ * Attribute SeekRangeEnd
  */
-class ReadTestClusterInt16u : public ReadAttribute {
+class ReadMediaPlaybackSeekRangeEnd : public ReadAttribute {
 public:
-    ReadTestClusterInt16u()
-        : ReadAttribute("int16u")
+    ReadMediaPlaybackSeekRangeEnd()
+        : ReadAttribute("seek-range-end")
     {
     }
 
-    ~ReadTestClusterInt16u() {}
+    ~ReadMediaPlaybackSeekRangeEnd() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReadAttribute (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeInt16uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.Int16u response %@", [value description]);
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeSeekRangeEndWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MediaPlayback.SeekRangeEnd response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster Int16u read Error", error);
+                LogNSError("MediaPlayback SeekRangeEnd read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -67360,70 +65691,32 @@ class ReadTestClusterInt16u : public ReadAttribute {
     }
 };
 
-class WriteTestClusterInt16u : public WriteAttribute {
-public:
-    WriteTestClusterInt16u()
-        : WriteAttribute("int16u")
-    {
-        AddArgument("attr-name", "int16u");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterInt16u() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000006) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeInt16uWithValue:value
-                                        params:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 if (error != nil) {
-                                     LogNSError("TestCluster Int16u write Error", error);
-                                 }
-                                 SetCommandExitStatus(error);
-                             }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeTestClusterInt16u : public SubscribeAttribute {
+class SubscribeAttributeMediaPlaybackSeekRangeEnd : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterInt16u()
-        : SubscribeAttribute("int16u")
+    SubscribeAttributeMediaPlaybackSeekRangeEnd()
+        : SubscribeAttribute("seek-range-end")
     {
     }
 
-    ~SubscribeAttributeTestClusterInt16u() {}
+    ~SubscribeAttributeMediaPlaybackSeekRangeEnd() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReportAttribute (0x00000005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInt16uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSeekRangeEndWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.Int16u response %@", [value description]);
+                NSLog(@"MediaPlayback.SeekRangeEnd response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -67434,27 +65727,27 @@ class SubscribeAttributeTestClusterInt16u : public SubscribeAttribute {
 };
 
 /*
- * Attribute Int24u
+ * Attribute SeekRangeStart
  */
-class ReadTestClusterInt24u : public ReadAttribute {
+class ReadMediaPlaybackSeekRangeStart : public ReadAttribute {
 public:
-    ReadTestClusterInt24u()
-        : ReadAttribute("int24u")
+    ReadMediaPlaybackSeekRangeStart()
+        : ReadAttribute("seek-range-start")
     {
     }
 
-    ~ReadTestClusterInt24u() {}
+    ~ReadMediaPlaybackSeekRangeStart() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReadAttribute (0x00000006) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeInt24uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.Int24u response %@", [value description]);
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeSeekRangeStartWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MediaPlayback.SeekRangeStart response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster Int24u read Error", error);
+                LogNSError("MediaPlayback SeekRangeStart read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -67462,70 +65755,32 @@ class ReadTestClusterInt24u : public ReadAttribute {
     }
 };
 
-class WriteTestClusterInt24u : public WriteAttribute {
-public:
-    WriteTestClusterInt24u()
-        : WriteAttribute("int24u")
-    {
-        AddArgument("attr-name", "int24u");
-        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterInt24u() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000007) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue];
-
-        [cluster writeAttributeInt24uWithValue:value
-                                        params:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 if (error != nil) {
-                                     LogNSError("TestCluster Int24u write Error", error);
-                                 }
-                                 SetCommandExitStatus(error);
-                             }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint32_t mValue;
-};
-
-class SubscribeAttributeTestClusterInt24u : public SubscribeAttribute {
+class SubscribeAttributeMediaPlaybackSeekRangeStart : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterInt24u()
-        : SubscribeAttribute("int24u")
+    SubscribeAttributeMediaPlaybackSeekRangeStart()
+        : SubscribeAttribute("seek-range-start")
     {
     }
 
-    ~SubscribeAttributeTestClusterInt24u() {}
+    ~SubscribeAttributeMediaPlaybackSeekRangeStart() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReportAttribute (0x00000006) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInt24uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSeekRangeStartWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.Int24u response %@", [value description]);
+                NSLog(@"MediaPlayback.SeekRangeStart response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -67536,27 +65791,27 @@ class SubscribeAttributeTestClusterInt24u : public SubscribeAttribute {
 };
 
 /*
- * Attribute Int32u
+ * Attribute GeneratedCommandList
  */
-class ReadTestClusterInt32u : public ReadAttribute {
+class ReadMediaPlaybackGeneratedCommandList : public ReadAttribute {
 public:
-    ReadTestClusterInt32u()
-        : ReadAttribute("int32u")
+    ReadMediaPlaybackGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadTestClusterInt32u() {}
+    ~ReadMediaPlaybackGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeInt32uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.Int32u response %@", [value description]);
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MediaPlayback.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster Int32u read Error", error);
+                LogNSError("MediaPlayback GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -67564,70 +65819,32 @@ class ReadTestClusterInt32u : public ReadAttribute {
     }
 };
 
-class WriteTestClusterInt32u : public WriteAttribute {
-public:
-    WriteTestClusterInt32u()
-        : WriteAttribute("int32u")
-    {
-        AddArgument("attr-name", "int32u");
-        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterInt32u() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000008) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue];
-
-        [cluster writeAttributeInt32uWithValue:value
-                                        params:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 if (error != nil) {
-                                     LogNSError("TestCluster Int32u write Error", error);
-                                 }
-                                 SetCommandExitStatus(error);
-                             }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint32_t mValue;
-};
-
-class SubscribeAttributeTestClusterInt32u : public SubscribeAttribute {
+class SubscribeAttributeMediaPlaybackGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterInt32u()
-        : SubscribeAttribute("int32u")
+    SubscribeAttributeMediaPlaybackGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterInt32u() {}
+    ~SubscribeAttributeMediaPlaybackGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInt32uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.Int32u response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaPlayback.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -67638,27 +65855,27 @@ class SubscribeAttributeTestClusterInt32u : public SubscribeAttribute {
 };
 
 /*
- * Attribute Int40u
+ * Attribute AcceptedCommandList
  */
-class ReadTestClusterInt40u : public ReadAttribute {
+class ReadMediaPlaybackAcceptedCommandList : public ReadAttribute {
 public:
-    ReadTestClusterInt40u()
-        : ReadAttribute("int40u")
+    ReadMediaPlaybackAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadTestClusterInt40u() {}
+    ~ReadMediaPlaybackAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeInt40uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.Int40u response %@", [value description]);
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MediaPlayback.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster Int40u read Error", error);
+                LogNSError("MediaPlayback AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -67666,70 +65883,32 @@ class ReadTestClusterInt40u : public ReadAttribute {
     }
 };
 
-class WriteTestClusterInt40u : public WriteAttribute {
-public:
-    WriteTestClusterInt40u()
-        : WriteAttribute("int40u")
-    {
-        AddArgument("attr-name", "int40u");
-        AddArgument("attr-value", 0, UINT64_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterInt40u() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000009) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedLongLong:mValue];
-
-        [cluster writeAttributeInt40uWithValue:value
-                                        params:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 if (error != nil) {
-                                     LogNSError("TestCluster Int40u write Error", error);
-                                 }
-                                 SetCommandExitStatus(error);
-                             }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint64_t mValue;
-};
-
-class SubscribeAttributeTestClusterInt40u : public SubscribeAttribute {
+class SubscribeAttributeMediaPlaybackAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterInt40u()
-        : SubscribeAttribute("int40u")
+    SubscribeAttributeMediaPlaybackAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterInt40u() {}
+    ~SubscribeAttributeMediaPlaybackAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInt40uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.Int40u response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaPlayback.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -67740,27 +65919,27 @@ class SubscribeAttributeTestClusterInt40u : public SubscribeAttribute {
 };
 
 /*
- * Attribute Int48u
+ * Attribute AttributeList
  */
-class ReadTestClusterInt48u : public ReadAttribute {
+class ReadMediaPlaybackAttributeList : public ReadAttribute {
 public:
-    ReadTestClusterInt48u()
-        : ReadAttribute("int48u")
+    ReadMediaPlaybackAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadTestClusterInt48u() {}
+    ~ReadMediaPlaybackAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000000A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeInt48uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.Int48u response %@", [value description]);
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MediaPlayback.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster Int48u read Error", error);
+                LogNSError("MediaPlayback AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -67768,70 +65947,32 @@ class ReadTestClusterInt48u : public ReadAttribute {
     }
 };
 
-class WriteTestClusterInt48u : public WriteAttribute {
-public:
-    WriteTestClusterInt48u()
-        : WriteAttribute("int48u")
-    {
-        AddArgument("attr-name", "int48u");
-        AddArgument("attr-value", 0, UINT64_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterInt48u() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000000A) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedLongLong:mValue];
-
-        [cluster writeAttributeInt48uWithValue:value
-                                        params:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 if (error != nil) {
-                                     LogNSError("TestCluster Int48u write Error", error);
-                                 }
-                                 SetCommandExitStatus(error);
-                             }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint64_t mValue;
-};
-
-class SubscribeAttributeTestClusterInt48u : public SubscribeAttribute {
+class SubscribeAttributeMediaPlaybackAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterInt48u()
-        : SubscribeAttribute("int48u")
+    SubscribeAttributeMediaPlaybackAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterInt48u() {}
+    ~SubscribeAttributeMediaPlaybackAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000000A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInt48uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.Int48u response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaPlayback.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -67842,27 +65983,27 @@ class SubscribeAttributeTestClusterInt48u : public SubscribeAttribute {
 };
 
 /*
- * Attribute Int56u
+ * Attribute FeatureMap
  */
-class ReadTestClusterInt56u : public ReadAttribute {
+class ReadMediaPlaybackFeatureMap : public ReadAttribute {
 public:
-    ReadTestClusterInt56u()
-        : ReadAttribute("int56u")
+    ReadMediaPlaybackFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadTestClusterInt56u() {}
+    ~ReadMediaPlaybackFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000000B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeInt56uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.Int56u response %@", [value description]);
-            if (error != nil) {
-                LogNSError("TestCluster Int56u read Error", error);
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MediaPlayback.FeatureMap response %@", [value description]);
+            if (error != nil) {
+                LogNSError("MediaPlayback FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -67870,70 +66011,32 @@ class ReadTestClusterInt56u : public ReadAttribute {
     }
 };
 
-class WriteTestClusterInt56u : public WriteAttribute {
-public:
-    WriteTestClusterInt56u()
-        : WriteAttribute("int56u")
-    {
-        AddArgument("attr-name", "int56u");
-        AddArgument("attr-value", 0, UINT64_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterInt56u() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000000B) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedLongLong:mValue];
-
-        [cluster writeAttributeInt56uWithValue:value
-                                        params:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 if (error != nil) {
-                                     LogNSError("TestCluster Int56u write Error", error);
-                                 }
-                                 SetCommandExitStatus(error);
-                             }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint64_t mValue;
-};
-
-class SubscribeAttributeTestClusterInt56u : public SubscribeAttribute {
+class SubscribeAttributeMediaPlaybackFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterInt56u()
-        : SubscribeAttribute("int56u")
+    SubscribeAttributeMediaPlaybackFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeTestClusterInt56u() {}
+    ~SubscribeAttributeMediaPlaybackFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000000B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInt56uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.Int56u response %@", [value description]);
+                NSLog(@"MediaPlayback.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -67944,27 +66047,27 @@ class SubscribeAttributeTestClusterInt56u : public SubscribeAttribute {
 };
 
 /*
- * Attribute Int64u
+ * Attribute ClusterRevision
  */
-class ReadTestClusterInt64u : public ReadAttribute {
+class ReadMediaPlaybackClusterRevision : public ReadAttribute {
 public:
-    ReadTestClusterInt64u()
-        : ReadAttribute("int64u")
+    ReadMediaPlaybackClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadTestClusterInt64u() {}
+    ~ReadMediaPlaybackClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000000C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeInt64uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.Int64u response %@", [value description]);
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MediaPlayback.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster Int64u read Error", error);
+                LogNSError("MediaPlayback ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -67972,70 +66075,32 @@ class ReadTestClusterInt64u : public ReadAttribute {
     }
 };
 
-class WriteTestClusterInt64u : public WriteAttribute {
-public:
-    WriteTestClusterInt64u()
-        : WriteAttribute("int64u")
-    {
-        AddArgument("attr-name", "int64u");
-        AddArgument("attr-value", 0, UINT64_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterInt64u() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000000C) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedLongLong:mValue];
-
-        [cluster writeAttributeInt64uWithValue:value
-                                        params:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 if (error != nil) {
-                                     LogNSError("TestCluster Int64u write Error", error);
-                                 }
-                                 SetCommandExitStatus(error);
-                             }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint64_t mValue;
-};
-
-class SubscribeAttributeTestClusterInt64u : public SubscribeAttribute {
+class SubscribeAttributeMediaPlaybackClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterInt64u()
-        : SubscribeAttribute("int64u")
+    SubscribeAttributeMediaPlaybackClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeTestClusterInt64u() {}
+    ~SubscribeAttributeMediaPlaybackClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000000C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000506) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInt64uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.Int64u response %@", [value description]);
+                NSLog(@"MediaPlayback.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -68045,201 +66110,256 @@ class SubscribeAttributeTestClusterInt64u : public SubscribeAttribute {
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster MediaInput                                                  | 0x0507 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * SelectInput                                                       |   0x00 |
+| * ShowInputStatus                                                   |   0x01 |
+| * HideInputStatus                                                   |   0x02 |
+| * RenameInput                                                       |   0x03 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * InputList                                                         | 0x0000 |
+| * CurrentInput                                                      | 0x0001 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute Int8s
+ * Command SelectInput
  */
-class ReadTestClusterInt8s : public ReadAttribute {
+class MediaInputSelectInput : public ClusterCommand {
 public:
-    ReadTestClusterInt8s()
-        : ReadAttribute("int8s")
+    MediaInputSelectInput()
+        : ClusterCommand("select-input")
     {
+        AddArgument("Index", 0, UINT8_MAX, &mRequest.index);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadTestClusterInt8s() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000000D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeInt8sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.Int8s response %@", [value description]);
-            if (error != nil) {
-                LogNSError("TestCluster Int8s read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPMediaInputClusterSelectInputParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.index = [NSNumber numberWithUnsignedChar:mRequest.index];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster selectInputWithParams:params
+                         completionHandler:^(NSError * _Nullable error) {
+                             responsesNeeded--;
+                             if (error != nil) {
+                                 mError = error;
+                                 LogNSError("Error", error);
+                             }
+                             if (responsesNeeded == 0) {
+                                 SetCommandExitStatus(mError);
+                             }
+                         }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::MediaInput::Commands::SelectInput::Type mRequest;
 };
 
-class WriteTestClusterInt8s : public WriteAttribute {
+/*
+ * Command ShowInputStatus
+ */
+class MediaInputShowInputStatus : public ClusterCommand {
 public:
-    WriteTestClusterInt8s()
-        : WriteAttribute("int8s")
+    MediaInputShowInputStatus()
+        : ClusterCommand("show-input-status")
     {
-        AddArgument("attr-name", "int8s");
-        AddArgument("attr-value", INT8_MIN, INT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
+        ClusterCommand::AddArguments();
     }
 
-    ~WriteTestClusterInt8s() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000000D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) command (0x00000001) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
+        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPMediaInputClusterShowInputStatusParams alloc] init];
+        params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithChar:mValue];
-
-        [cluster writeAttributeInt8sWithValue:value
-                                       params:params
-                            completionHandler:^(NSError * _Nullable error) {
-                                if (error != nil) {
-                                    LogNSError("TestCluster Int8s write Error", error);
-                                }
-                                SetCommandExitStatus(error);
-                            }];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster showInputStatusWithParams:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 responsesNeeded--;
+                                 if (error != nil) {
+                                     mError = error;
+                                     LogNSError("Error", error);
+                                 }
+                                 if (responsesNeeded == 0) {
+                                     SetCommandExitStatus(mError);
+                                 }
+                             }];
+        }
         return CHIP_NO_ERROR;
     }
 
 private:
-    int8_t mValue;
 };
 
-class SubscribeAttributeTestClusterInt8s : public SubscribeAttribute {
+/*
+ * Command HideInputStatus
+ */
+class MediaInputHideInputStatus : public ClusterCommand {
 public:
-    SubscribeAttributeTestClusterInt8s()
-        : SubscribeAttribute("int8s")
+    MediaInputHideInputStatus()
+        : ClusterCommand("hide-input-status")
     {
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeTestClusterInt8s() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000000D) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInt8sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.Int8s response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) command (0x00000002) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPMediaInputClusterHideInputStatusParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster hideInputStatusWithParams:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 responsesNeeded--;
+                                 if (error != nil) {
+                                     mError = error;
+                                     LogNSError("Error", error);
+                                 }
+                                 if (responsesNeeded == 0) {
+                                     SetCommandExitStatus(mError);
+                                 }
+                             }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
 };
 
 /*
- * Attribute Int16s
+ * Command RenameInput
  */
-class ReadTestClusterInt16s : public ReadAttribute {
+class MediaInputRenameInput : public ClusterCommand {
 public:
-    ReadTestClusterInt16s()
-        : ReadAttribute("int16s")
+    MediaInputRenameInput()
+        : ClusterCommand("rename-input")
     {
+        AddArgument("Index", 0, UINT8_MAX, &mRequest.index);
+        AddArgument("Name", &mRequest.name);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadTestClusterInt16s() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000000E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) command (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeInt16sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.Int16s response %@", [value description]);
-            if (error != nil) {
-                LogNSError("TestCluster Int16s read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPMediaInputClusterRenameInputParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.index = [NSNumber numberWithUnsignedChar:mRequest.index];
+        params.name = [[NSString alloc] initWithBytes:mRequest.name.data()
+                                               length:mRequest.name.size()
+                                             encoding:NSUTF8StringEncoding];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster renameInputWithParams:params
+                         completionHandler:^(NSError * _Nullable error) {
+                             responsesNeeded--;
+                             if (error != nil) {
+                                 mError = error;
+                                 LogNSError("Error", error);
+                             }
+                             if (responsesNeeded == 0) {
+                                 SetCommandExitStatus(mError);
+                             }
+                         }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::MediaInput::Commands::RenameInput::Type mRequest;
 };
 
-class WriteTestClusterInt16s : public WriteAttribute {
+/*
+ * Attribute InputList
+ */
+class ReadMediaInputInputList : public ReadAttribute {
 public:
-    WriteTestClusterInt16s()
-        : WriteAttribute("int16s")
+    ReadMediaInputInputList()
+        : ReadAttribute("input-list")
     {
-        AddArgument("attr-name", "int16s");
-        AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteTestClusterInt16s() {}
+    ~ReadMediaInputInputList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000000E) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
-        [cluster writeAttributeInt16sWithValue:value
-                                        params:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 if (error != nil) {
-                                     LogNSError("TestCluster Int16s write Error", error);
-                                 }
-                                 SetCommandExitStatus(error);
-                             }];
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeInputListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MediaInput.InputList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("MediaInput InputList read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    int16_t mValue;
 };
 
-class SubscribeAttributeTestClusterInt16s : public SubscribeAttribute {
+class SubscribeAttributeMediaInputInputList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterInt16s()
-        : SubscribeAttribute("int16s")
+    SubscribeAttributeMediaInputInputList()
+        : SubscribeAttribute("input-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterInt16s() {}
+    ~SubscribeAttributeMediaInputInputList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000000E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInt16sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInputListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.Int16s response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaInput.InputList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -68250,27 +66370,27 @@ class SubscribeAttributeTestClusterInt16s : public SubscribeAttribute {
 };
 
 /*
- * Attribute Int24s
+ * Attribute CurrentInput
  */
-class ReadTestClusterInt24s : public ReadAttribute {
+class ReadMediaInputCurrentInput : public ReadAttribute {
 public:
-    ReadTestClusterInt24s()
-        : ReadAttribute("int24s")
+    ReadMediaInputCurrentInput()
+        : ReadAttribute("current-input")
     {
     }
 
-    ~ReadTestClusterInt24s() {}
+    ~ReadMediaInputCurrentInput() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000000F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeInt24sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.Int24s response %@", [value description]);
+        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCurrentInputWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MediaInput.CurrentInput response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster Int24s read Error", error);
+                LogNSError("MediaInput CurrentInput read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -68278,70 +66398,32 @@ class ReadTestClusterInt24s : public ReadAttribute {
     }
 };
 
-class WriteTestClusterInt24s : public WriteAttribute {
-public:
-    WriteTestClusterInt24s()
-        : WriteAttribute("int24s")
-    {
-        AddArgument("attr-name", "int24s");
-        AddArgument("attr-value", INT32_MIN, INT32_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterInt24s() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000000F) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithInt:mValue];
-
-        [cluster writeAttributeInt24sWithValue:value
-                                        params:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 if (error != nil) {
-                                     LogNSError("TestCluster Int24s write Error", error);
-                                 }
-                                 SetCommandExitStatus(error);
-                             }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    int32_t mValue;
-};
-
-class SubscribeAttributeTestClusterInt24s : public SubscribeAttribute {
+class SubscribeAttributeMediaInputCurrentInput : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterInt24s()
-        : SubscribeAttribute("int24s")
+    SubscribeAttributeMediaInputCurrentInput()
+        : SubscribeAttribute("current-input")
     {
     }
 
-    ~SubscribeAttributeTestClusterInt24s() {}
+    ~SubscribeAttributeMediaInputCurrentInput() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000000F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInt24sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCurrentInputWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.Int24s response %@", [value description]);
+                NSLog(@"MediaInput.CurrentInput response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -68352,27 +66434,27 @@ class SubscribeAttributeTestClusterInt24s : public SubscribeAttribute {
 };
 
 /*
- * Attribute Int32s
+ * Attribute GeneratedCommandList
  */
-class ReadTestClusterInt32s : public ReadAttribute {
+class ReadMediaInputGeneratedCommandList : public ReadAttribute {
 public:
-    ReadTestClusterInt32s()
-        : ReadAttribute("int32s")
+    ReadMediaInputGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadTestClusterInt32s() {}
+    ~ReadMediaInputGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeInt32sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.Int32s response %@", [value description]);
+        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MediaInput.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster Int32s read Error", error);
+                LogNSError("MediaInput GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -68380,70 +66462,32 @@ class ReadTestClusterInt32s : public ReadAttribute {
     }
 };
 
-class WriteTestClusterInt32s : public WriteAttribute {
+class SubscribeAttributeMediaInputGeneratedCommandList : public SubscribeAttribute {
 public:
-    WriteTestClusterInt32s()
-        : WriteAttribute("int32s")
-    {
-        AddArgument("attr-name", "int32s");
-        AddArgument("attr-value", INT32_MIN, INT32_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterInt32s() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000010) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithInt:mValue];
-
-        [cluster writeAttributeInt32sWithValue:value
-                                        params:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 if (error != nil) {
-                                     LogNSError("TestCluster Int32s write Error", error);
-                                 }
-                                 SetCommandExitStatus(error);
-                             }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    int32_t mValue;
-};
-
-class SubscribeAttributeTestClusterInt32s : public SubscribeAttribute {
-public:
-    SubscribeAttributeTestClusterInt32s()
-        : SubscribeAttribute("int32s")
+    SubscribeAttributeMediaInputGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterInt32s() {}
+    ~SubscribeAttributeMediaInputGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInt32sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.Int32s response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaInput.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -68454,27 +66498,27 @@ class SubscribeAttributeTestClusterInt32s : public SubscribeAttribute {
 };
 
 /*
- * Attribute Int40s
+ * Attribute AcceptedCommandList
  */
-class ReadTestClusterInt40s : public ReadAttribute {
+class ReadMediaInputAcceptedCommandList : public ReadAttribute {
 public:
-    ReadTestClusterInt40s()
-        : ReadAttribute("int40s")
+    ReadMediaInputAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadTestClusterInt40s() {}
+    ~ReadMediaInputAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeInt40sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.Int40s response %@", [value description]);
+        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MediaInput.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster Int40s read Error", error);
+                LogNSError("MediaInput AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -68482,70 +66526,32 @@ class ReadTestClusterInt40s : public ReadAttribute {
     }
 };
 
-class WriteTestClusterInt40s : public WriteAttribute {
-public:
-    WriteTestClusterInt40s()
-        : WriteAttribute("int40s")
-    {
-        AddArgument("attr-name", "int40s");
-        AddArgument("attr-value", INT64_MIN, INT64_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterInt40s() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000011) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithLongLong:mValue];
-
-        [cluster writeAttributeInt40sWithValue:value
-                                        params:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 if (error != nil) {
-                                     LogNSError("TestCluster Int40s write Error", error);
-                                 }
-                                 SetCommandExitStatus(error);
-                             }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    int64_t mValue;
-};
-
-class SubscribeAttributeTestClusterInt40s : public SubscribeAttribute {
+class SubscribeAttributeMediaInputAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterInt40s()
-        : SubscribeAttribute("int40s")
+    SubscribeAttributeMediaInputAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterInt40s() {}
+    ~SubscribeAttributeMediaInputAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInt40sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.Int40s response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaInput.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -68556,27 +66562,27 @@ class SubscribeAttributeTestClusterInt40s : public SubscribeAttribute {
 };
 
 /*
- * Attribute Int48s
+ * Attribute AttributeList
  */
-class ReadTestClusterInt48s : public ReadAttribute {
+class ReadMediaInputAttributeList : public ReadAttribute {
 public:
-    ReadTestClusterInt48s()
-        : ReadAttribute("int48s")
+    ReadMediaInputAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadTestClusterInt48s() {}
+    ~ReadMediaInputAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeInt48sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.Int48s response %@", [value description]);
+        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MediaInput.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster Int48s read Error", error);
+                LogNSError("MediaInput AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -68584,70 +66590,32 @@ class ReadTestClusterInt48s : public ReadAttribute {
     }
 };
 
-class WriteTestClusterInt48s : public WriteAttribute {
-public:
-    WriteTestClusterInt48s()
-        : WriteAttribute("int48s")
-    {
-        AddArgument("attr-name", "int48s");
-        AddArgument("attr-value", INT64_MIN, INT64_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterInt48s() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000012) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithLongLong:mValue];
-
-        [cluster writeAttributeInt48sWithValue:value
-                                        params:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 if (error != nil) {
-                                     LogNSError("TestCluster Int48s write Error", error);
-                                 }
-                                 SetCommandExitStatus(error);
-                             }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    int64_t mValue;
-};
-
-class SubscribeAttributeTestClusterInt48s : public SubscribeAttribute {
+class SubscribeAttributeMediaInputAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterInt48s()
-        : SubscribeAttribute("int48s")
+    SubscribeAttributeMediaInputAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterInt48s() {}
+    ~SubscribeAttributeMediaInputAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInt48sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.Int48s response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"MediaInput.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -68658,27 +66626,27 @@ class SubscribeAttributeTestClusterInt48s : public SubscribeAttribute {
 };
 
 /*
- * Attribute Int56s
+ * Attribute FeatureMap
  */
-class ReadTestClusterInt56s : public ReadAttribute {
+class ReadMediaInputFeatureMap : public ReadAttribute {
 public:
-    ReadTestClusterInt56s()
-        : ReadAttribute("int56s")
+    ReadMediaInputFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadTestClusterInt56s() {}
+    ~ReadMediaInputFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeInt56sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.Int56s response %@", [value description]);
+        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MediaInput.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster Int56s read Error", error);
+                LogNSError("MediaInput FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -68686,70 +66654,32 @@ class ReadTestClusterInt56s : public ReadAttribute {
     }
 };
 
-class WriteTestClusterInt56s : public WriteAttribute {
-public:
-    WriteTestClusterInt56s()
-        : WriteAttribute("int56s")
-    {
-        AddArgument("attr-name", "int56s");
-        AddArgument("attr-value", INT64_MIN, INT64_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterInt56s() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000013) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithLongLong:mValue];
-
-        [cluster writeAttributeInt56sWithValue:value
-                                        params:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 if (error != nil) {
-                                     LogNSError("TestCluster Int56s write Error", error);
-                                 }
-                                 SetCommandExitStatus(error);
-                             }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    int64_t mValue;
-};
-
-class SubscribeAttributeTestClusterInt56s : public SubscribeAttribute {
+class SubscribeAttributeMediaInputFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterInt56s()
-        : SubscribeAttribute("int56s")
+    SubscribeAttributeMediaInputFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeTestClusterInt56s() {}
+    ~SubscribeAttributeMediaInputFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInt56sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.Int56s response %@", [value description]);
+                NSLog(@"MediaInput.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -68760,27 +66690,27 @@ class SubscribeAttributeTestClusterInt56s : public SubscribeAttribute {
 };
 
 /*
- * Attribute Int64s
+ * Attribute ClusterRevision
  */
-class ReadTestClusterInt64s : public ReadAttribute {
+class ReadMediaInputClusterRevision : public ReadAttribute {
 public:
-    ReadTestClusterInt64s()
-        : ReadAttribute("int64s")
+    ReadMediaInputClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadTestClusterInt64s() {}
+    ~ReadMediaInputClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000014) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeInt64sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.Int64s response %@", [value description]);
+        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"MediaInput.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster Int64s read Error", error);
+                LogNSError("MediaInput ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -68788,70 +66718,32 @@ class ReadTestClusterInt64s : public ReadAttribute {
     }
 };
 
-class WriteTestClusterInt64s : public WriteAttribute {
-public:
-    WriteTestClusterInt64s()
-        : WriteAttribute("int64s")
-    {
-        AddArgument("attr-name", "int64s");
-        AddArgument("attr-value", INT64_MIN, INT64_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterInt64s() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000014) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithLongLong:mValue];
-
-        [cluster writeAttributeInt64sWithValue:value
-                                        params:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 if (error != nil) {
-                                     LogNSError("TestCluster Int64s write Error", error);
-                                 }
-                                 SetCommandExitStatus(error);
-                             }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    int64_t mValue;
-};
-
-class SubscribeAttributeTestClusterInt64s : public SubscribeAttribute {
+class SubscribeAttributeMediaInputClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterInt64s()
-        : SubscribeAttribute("int64s")
+    SubscribeAttributeMediaInputClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeTestClusterInt64s() {}
+    ~SubscribeAttributeMediaInputClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000014) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000507) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInt64sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.Int64s response %@", [value description]);
+                NSLog(@"MediaInput.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -68861,99 +66753,118 @@ class SubscribeAttributeTestClusterInt64s : public SubscribeAttribute {
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster LowPower                                                    | 0x0508 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * Sleep                                                             |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute Enum8
+ * Command Sleep
  */
-class ReadTestClusterEnum8 : public ReadAttribute {
+class LowPowerSleep : public ClusterCommand {
 public:
-    ReadTestClusterEnum8()
-        : ReadAttribute("enum8")
+    LowPowerSleep()
+        : ClusterCommand("sleep")
     {
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadTestClusterEnum8() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000015) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000508) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeEnum8WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.Enum8 response %@", [value description]);
-            if (error != nil) {
-                LogNSError("TestCluster Enum8 read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPLowPowerClusterSleepParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster sleepWithParams:params
+                   completionHandler:^(NSError * _Nullable error) {
+                       responsesNeeded--;
+                       if (error != nil) {
+                           mError = error;
+                           LogNSError("Error", error);
+                       }
+                       if (responsesNeeded == 0) {
+                           SetCommandExitStatus(mError);
+                       }
+                   }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
 };
 
-class WriteTestClusterEnum8 : public WriteAttribute {
+/*
+ * Attribute GeneratedCommandList
+ */
+class ReadLowPowerGeneratedCommandList : public ReadAttribute {
 public:
-    WriteTestClusterEnum8()
-        : WriteAttribute("enum8")
+    ReadLowPowerGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
-        AddArgument("attr-name", "enum8");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteTestClusterEnum8() {}
+    ~ReadLowPowerGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000015) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+        ChipLogProgress(chipTool, "Sending cluster (0x00000508) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
-        [cluster writeAttributeEnum8WithValue:value
-                                       params:params
-                            completionHandler:^(NSError * _Nullable error) {
-                                if (error != nil) {
-                                    LogNSError("TestCluster Enum8 write Error", error);
-                                }
-                                SetCommandExitStatus(error);
-                            }];
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LowPower.GeneratedCommandList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("LowPower GeneratedCommandList read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    uint8_t mValue;
 };
 
-class SubscribeAttributeTestClusterEnum8 : public SubscribeAttribute {
+class SubscribeAttributeLowPowerGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterEnum8()
-        : SubscribeAttribute("enum8")
+    SubscribeAttributeLowPowerGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterEnum8() {}
+    ~SubscribeAttributeLowPowerGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000015) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000508) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeEnum8WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.Enum8 response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LowPower.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -68964,27 +66875,27 @@ class SubscribeAttributeTestClusterEnum8 : public SubscribeAttribute {
 };
 
 /*
- * Attribute Enum16
+ * Attribute AcceptedCommandList
  */
-class ReadTestClusterEnum16 : public ReadAttribute {
+class ReadLowPowerAcceptedCommandList : public ReadAttribute {
 public:
-    ReadTestClusterEnum16()
-        : ReadAttribute("enum16")
+    ReadLowPowerAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadTestClusterEnum16() {}
+    ~ReadLowPowerAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000016) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000508) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeEnum16WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.Enum16 response %@", [value description]);
+        CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LowPower.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster Enum16 read Error", error);
+                LogNSError("LowPower AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -68992,70 +66903,32 @@ class ReadTestClusterEnum16 : public ReadAttribute {
     }
 };
 
-class WriteTestClusterEnum16 : public WriteAttribute {
+class SubscribeAttributeLowPowerAcceptedCommandList : public SubscribeAttribute {
 public:
-    WriteTestClusterEnum16()
-        : WriteAttribute("enum16")
+    SubscribeAttributeLowPowerAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
-        AddArgument("attr-name", "enum16");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteTestClusterEnum16() {}
+    ~SubscribeAttributeLowPowerAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000016) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000508) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeEnum16WithValue:value
-                                        params:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 if (error != nil) {
-                                     LogNSError("TestCluster Enum16 write Error", error);
-                                 }
-                                 SetCommandExitStatus(error);
-                             }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeTestClusterEnum16 : public SubscribeAttribute {
-public:
-    SubscribeAttributeTestClusterEnum16()
-        : SubscribeAttribute("enum16")
-    {
-    }
-
-    ~SubscribeAttributeTestClusterEnum16() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000016) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeEnum16WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.Enum16 response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LowPower.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -69066,27 +66939,27 @@ class SubscribeAttributeTestClusterEnum16 : public SubscribeAttribute {
 };
 
 /*
- * Attribute FloatSingle
+ * Attribute AttributeList
  */
-class ReadTestClusterFloatSingle : public ReadAttribute {
+class ReadLowPowerAttributeList : public ReadAttribute {
 public:
-    ReadTestClusterFloatSingle()
-        : ReadAttribute("float-single")
+    ReadLowPowerAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadTestClusterFloatSingle() {}
+    ~ReadLowPowerAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000508) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFloatSingleWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.FloatSingle response %@", [value description]);
+        CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LowPower.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster FloatSingle read Error", error);
+                LogNSError("LowPower AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -69094,70 +66967,32 @@ class ReadTestClusterFloatSingle : public ReadAttribute {
     }
 };
 
-class WriteTestClusterFloatSingle : public WriteAttribute {
-public:
-    WriteTestClusterFloatSingle()
-        : WriteAttribute("float-single")
-    {
-        AddArgument("attr-name", "float-single");
-        AddArgument("attr-value", -std::numeric_limits<float>::infinity(), std::numeric_limits<float>::infinity(), &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterFloatSingle() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000017) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithFloat:mValue];
-
-        [cluster writeAttributeFloatSingleWithValue:value
-                                             params:params
-                                  completionHandler:^(NSError * _Nullable error) {
-                                      if (error != nil) {
-                                          LogNSError("TestCluster FloatSingle write Error", error);
-                                      }
-                                      SetCommandExitStatus(error);
-                                  }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    float mValue;
-};
-
-class SubscribeAttributeTestClusterFloatSingle : public SubscribeAttribute {
+class SubscribeAttributeLowPowerAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterFloatSingle()
-        : SubscribeAttribute("float-single")
+    SubscribeAttributeLowPowerAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterFloatSingle() {}
+    ~SubscribeAttributeLowPowerAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000508) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFloatSingleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.FloatSingle response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LowPower.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -69168,27 +67003,27 @@ class SubscribeAttributeTestClusterFloatSingle : public SubscribeAttribute {
 };
 
 /*
- * Attribute FloatDouble
+ * Attribute FeatureMap
  */
-class ReadTestClusterFloatDouble : public ReadAttribute {
+class ReadLowPowerFeatureMap : public ReadAttribute {
 public:
-    ReadTestClusterFloatDouble()
-        : ReadAttribute("float-double")
+    ReadLowPowerFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadTestClusterFloatDouble() {}
+    ~ReadLowPowerFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000018) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000508) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFloatDoubleWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.FloatDouble response %@", [value description]);
+        CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LowPower.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster FloatDouble read Error", error);
+                LogNSError("LowPower FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -69196,70 +67031,32 @@ class ReadTestClusterFloatDouble : public ReadAttribute {
     }
 };
 
-class WriteTestClusterFloatDouble : public WriteAttribute {
-public:
-    WriteTestClusterFloatDouble()
-        : WriteAttribute("float-double")
-    {
-        AddArgument("attr-name", "float-double");
-        AddArgument("attr-value", -std::numeric_limits<double>::infinity(), std::numeric_limits<double>::infinity(), &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterFloatDouble() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000018) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithDouble:mValue];
-
-        [cluster writeAttributeFloatDoubleWithValue:value
-                                             params:params
-                                  completionHandler:^(NSError * _Nullable error) {
-                                      if (error != nil) {
-                                          LogNSError("TestCluster FloatDouble write Error", error);
-                                      }
-                                      SetCommandExitStatus(error);
-                                  }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    double mValue;
-};
-
-class SubscribeAttributeTestClusterFloatDouble : public SubscribeAttribute {
+class SubscribeAttributeLowPowerFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterFloatDouble()
-        : SubscribeAttribute("float-double")
+    SubscribeAttributeLowPowerFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeTestClusterFloatDouble() {}
+    ~SubscribeAttributeLowPowerFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000018) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000508) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFloatDoubleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.FloatDouble response %@", [value description]);
+                NSLog(@"LowPower.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -69270,27 +67067,27 @@ class SubscribeAttributeTestClusterFloatDouble : public SubscribeAttribute {
 };
 
 /*
- * Attribute OctetString
+ * Attribute ClusterRevision
  */
-class ReadTestClusterOctetString : public ReadAttribute {
+class ReadLowPowerClusterRevision : public ReadAttribute {
 public:
-    ReadTestClusterOctetString()
-        : ReadAttribute("octet-string")
+    ReadLowPowerClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadTestClusterOctetString() {}
+    ~ReadLowPowerClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000019) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000508) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeOctetStringWithCompletionHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.OctetString response %@", [value description]);
+        CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LowPower.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster OctetString read Error", error);
+                LogNSError("LowPower ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -69298,70 +67095,32 @@ class ReadTestClusterOctetString : public ReadAttribute {
     }
 };
 
-class WriteTestClusterOctetString : public WriteAttribute {
-public:
-    WriteTestClusterOctetString()
-        : WriteAttribute("octet-string")
-    {
-        AddArgument("attr-name", "octet-string");
-        AddArgument("attr-value", &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterOctetString() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000019) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSData * _Nonnull value = [[NSData alloc] initWithBytes:mValue.data() length:mValue.size()];
-
-        [cluster writeAttributeOctetStringWithValue:value
-                                             params:params
-                                  completionHandler:^(NSError * _Nullable error) {
-                                      if (error != nil) {
-                                          LogNSError("TestCluster OctetString write Error", error);
-                                      }
-                                      SetCommandExitStatus(error);
-                                  }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::ByteSpan mValue;
-};
-
-class SubscribeAttributeTestClusterOctetString : public SubscribeAttribute {
+class SubscribeAttributeLowPowerClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterOctetString()
-        : SubscribeAttribute("octet-string")
+    SubscribeAttributeLowPowerClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeTestClusterOctetString() {}
+    ~SubscribeAttributeLowPowerClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000019) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000508) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.OctetString response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LowPower.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -69371,110 +67130,123 @@ class SubscribeAttributeTestClusterOctetString : public SubscribeAttribute {
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster KeypadInput                                                 | 0x0509 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * SendKey                                                           |   0x00 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute ListInt8u
+ * Command SendKey
  */
-class ReadTestClusterListInt8u : public ReadAttribute {
+class KeypadInputSendKey : public ClusterCommand {
 public:
-    ReadTestClusterListInt8u()
-        : ReadAttribute("list-int8u")
+    KeypadInputSendKey()
+        : ClusterCommand("send-key")
     {
+        AddArgument("KeyCode", 0, UINT8_MAX, &mRequest.keyCode);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadTestClusterListInt8u() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000001A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000509) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeListInt8uWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.ListInt8u response %@", [value description]);
-            if (error != nil) {
-                LogNSError("TestCluster ListInt8u read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.keyCode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.keyCode)];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster
+                sendKeyWithParams:params
+                completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable error) {
+                    NSLog(@"Values: %@", values);
+                    responsesNeeded--;
+                    if (error != nil) {
+                        mError = error;
+                        LogNSError("Error", error);
+                    }
+                    if (responsesNeeded == 0) {
+                        SetCommandExitStatus(mError);
+                    }
+                }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::KeypadInput::Commands::SendKey::Type mRequest;
 };
 
-class WriteTestClusterListInt8u : public WriteAttribute {
+/*
+ * Attribute GeneratedCommandList
+ */
+class ReadKeypadInputGeneratedCommandList : public ReadAttribute {
 public:
-    WriteTestClusterListInt8u()
-        : WriteAttribute("list-int8u")
-        , mComplex(&mValue)
+    ReadKeypadInputGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
-        AddArgument("attr-name", "list-int8u");
-        AddArgument("attr-value", &mComplex);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteTestClusterListInt8u() {}
+    ~ReadKeypadInputGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000001A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000509) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSArray * _Nonnull value;
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mValue) {
-                NSNumber * newElement_0;
-                newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
-                [array_0 addObject:newElement_0];
+        CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"KeypadInput.GeneratedCommandList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("KeypadInput GeneratedCommandList read Error", error);
             }
-            value = array_0;
-        }
-
-        [cluster writeAttributeListInt8uWithValue:value
-                                           params:params
-                                completionHandler:^(NSError * _Nullable error) {
-                                    if (error != nil) {
-                                        LogNSError("TestCluster ListInt8u write Error", error);
-                                    }
-                                    SetCommandExitStatus(error);
-                                }];
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::DataModel::List<const uint8_t> mValue;
-    TypedComplexArgument<chip::app::DataModel::List<const uint8_t>> mComplex;
 };
 
-class SubscribeAttributeTestClusterListInt8u : public SubscribeAttribute {
+class SubscribeAttributeKeypadInputGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterListInt8u()
-        : SubscribeAttribute("list-int8u")
+    SubscribeAttributeKeypadInputGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterListInt8u() {}
+    ~SubscribeAttributeKeypadInputGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000001A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000509) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeListInt8uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.ListInt8u response %@", [value description]);
+                NSLog(@"KeypadInput.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -69485,27 +67257,27 @@ class SubscribeAttributeTestClusterListInt8u : public SubscribeAttribute {
 };
 
 /*
- * Attribute ListOctetString
+ * Attribute AcceptedCommandList
  */
-class ReadTestClusterListOctetString : public ReadAttribute {
+class ReadKeypadInputAcceptedCommandList : public ReadAttribute {
 public:
-    ReadTestClusterListOctetString()
-        : ReadAttribute("list-octet-string")
+    ReadKeypadInputAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadTestClusterListOctetString() {}
+    ~ReadKeypadInputAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000001B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000509) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeListOctetStringWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.ListOctetString response %@", [value description]);
+        CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"KeypadInput.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster ListOctetString read Error", error);
+                LogNSError("KeypadInput AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -69513,81 +67285,32 @@ class ReadTestClusterListOctetString : public ReadAttribute {
     }
 };
 
-class WriteTestClusterListOctetString : public WriteAttribute {
-public:
-    WriteTestClusterListOctetString()
-        : WriteAttribute("list-octet-string")
-        , mComplex(&mValue)
-    {
-        AddArgument("attr-name", "list-octet-string");
-        AddArgument("attr-value", &mComplex);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterListOctetString() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000001B) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSArray * _Nonnull value;
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mValue) {
-                NSData * newElement_0;
-                newElement_0 = [NSData dataWithBytes:entry_0.data() length:entry_0.size()];
-                [array_0 addObject:newElement_0];
-            }
-            value = array_0;
-        }
-
-        [cluster writeAttributeListOctetStringWithValue:value
-                                                 params:params
-                                      completionHandler:^(NSError * _Nullable error) {
-                                          if (error != nil) {
-                                              LogNSError("TestCluster ListOctetString write Error", error);
-                                          }
-                                          SetCommandExitStatus(error);
-                                      }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::DataModel::List<const chip::ByteSpan> mValue;
-    TypedComplexArgument<chip::app::DataModel::List<const chip::ByteSpan>> mComplex;
-};
-
-class SubscribeAttributeTestClusterListOctetString : public SubscribeAttribute {
+class SubscribeAttributeKeypadInputAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterListOctetString()
-        : SubscribeAttribute("list-octet-string")
+    SubscribeAttributeKeypadInputAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterListOctetString() {}
+    ~SubscribeAttributeKeypadInputAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000001B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000509) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeListOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.ListOctetString response %@", [value description]);
+                NSLog(@"KeypadInput.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -69598,27 +67321,27 @@ class SubscribeAttributeTestClusterListOctetString : public SubscribeAttribute {
 };
 
 /*
- * Attribute ListStructOctetString
+ * Attribute AttributeList
  */
-class ReadTestClusterListStructOctetString : public ReadAttribute {
+class ReadKeypadInputAttributeList : public ReadAttribute {
 public:
-    ReadTestClusterListStructOctetString()
-        : ReadAttribute("list-struct-octet-string")
+    ReadKeypadInputAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadTestClusterListStructOctetString() {}
+    ~ReadKeypadInputAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000001C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000509) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeListStructOctetStringWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.ListStructOctetString response %@", [value description]);
+        CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"KeypadInput.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster ListStructOctetString read Error", error);
+                LogNSError("KeypadInput AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -69626,84 +67349,32 @@ class ReadTestClusterListStructOctetString : public ReadAttribute {
     }
 };
 
-class WriteTestClusterListStructOctetString : public WriteAttribute {
+class SubscribeAttributeKeypadInputAttributeList : public SubscribeAttribute {
 public:
-    WriteTestClusterListStructOctetString()
-        : WriteAttribute("list-struct-octet-string")
-        , mComplex(&mValue)
+    SubscribeAttributeKeypadInputAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
-        AddArgument("attr-name", "list-struct-octet-string");
-        AddArgument("attr-value", &mComplex);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteTestClusterListStructOctetString() {}
+    ~SubscribeAttributeKeypadInputAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000001C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000509) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSArray * _Nonnull value;
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mValue) {
-                CHIPTestClusterClusterTestListStructOctet * newElement_0;
-                newElement_0 = [CHIPTestClusterClusterTestListStructOctet new];
-                newElement_0.member1 = [NSNumber numberWithUnsignedLongLong:entry_0.member1];
-                newElement_0.member2 = [NSData dataWithBytes:entry_0.member2.data() length:entry_0.member2.size()];
-                [array_0 addObject:newElement_0];
-            }
-            value = array_0;
-        }
-
-        [cluster writeAttributeListStructOctetStringWithValue:value
-                                                       params:params
-                                            completionHandler:^(NSError * _Nullable error) {
-                                                if (error != nil) {
-                                                    LogNSError("TestCluster ListStructOctetString write Error", error);
-                                                }
-                                                SetCommandExitStatus(error);
-                                            }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::TestListStructOctet::Type> mValue;
-    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::TestListStructOctet::Type>>
-        mComplex;
-};
-
-class SubscribeAttributeTestClusterListStructOctetString : public SubscribeAttribute {
-public:
-    SubscribeAttributeTestClusterListStructOctetString()
-        : SubscribeAttribute("list-struct-octet-string")
-    {
-    }
-
-    ~SubscribeAttributeTestClusterListStructOctetString() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000001C) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeListStructOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.ListStructOctetString response %@", [value description]);
+                NSLog(@"KeypadInput.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -69714,27 +67385,27 @@ class SubscribeAttributeTestClusterListStructOctetString : public SubscribeAttri
 };
 
 /*
- * Attribute LongOctetString
+ * Attribute FeatureMap
  */
-class ReadTestClusterLongOctetString : public ReadAttribute {
+class ReadKeypadInputFeatureMap : public ReadAttribute {
 public:
-    ReadTestClusterLongOctetString()
-        : ReadAttribute("long-octet-string")
+    ReadKeypadInputFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadTestClusterLongOctetString() {}
+    ~ReadKeypadInputFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000001D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000509) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeLongOctetStringWithCompletionHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.LongOctetString response %@", [value description]);
+        CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"KeypadInput.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster LongOctetString read Error", error);
+                LogNSError("KeypadInput FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -69742,70 +67413,32 @@ class ReadTestClusterLongOctetString : public ReadAttribute {
     }
 };
 
-class WriteTestClusterLongOctetString : public WriteAttribute {
-public:
-    WriteTestClusterLongOctetString()
-        : WriteAttribute("long-octet-string")
-    {
-        AddArgument("attr-name", "long-octet-string");
-        AddArgument("attr-value", &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterLongOctetString() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000001D) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSData * _Nonnull value = [[NSData alloc] initWithBytes:mValue.data() length:mValue.size()];
-
-        [cluster writeAttributeLongOctetStringWithValue:value
-                                                 params:params
-                                      completionHandler:^(NSError * _Nullable error) {
-                                          if (error != nil) {
-                                              LogNSError("TestCluster LongOctetString write Error", error);
-                                          }
-                                          SetCommandExitStatus(error);
-                                      }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::ByteSpan mValue;
-};
-
-class SubscribeAttributeTestClusterLongOctetString : public SubscribeAttribute {
+class SubscribeAttributeKeypadInputFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterLongOctetString()
-        : SubscribeAttribute("long-octet-string")
+    SubscribeAttributeKeypadInputFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeTestClusterLongOctetString() {}
+    ~SubscribeAttributeKeypadInputFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000001D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000509) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLongOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.LongOctetString response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"KeypadInput.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -69816,27 +67449,27 @@ class SubscribeAttributeTestClusterLongOctetString : public SubscribeAttribute {
 };
 
 /*
- * Attribute CharString
+ * Attribute ClusterRevision
  */
-class ReadTestClusterCharString : public ReadAttribute {
+class ReadKeypadInputClusterRevision : public ReadAttribute {
 public:
-    ReadTestClusterCharString()
-        : ReadAttribute("char-string")
+    ReadKeypadInputClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadTestClusterCharString() {}
+    ~ReadKeypadInputClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000001E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000509) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCharStringWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.CharString response %@", [value description]);
+        CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"KeypadInput.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster CharString read Error", error);
+                LogNSError("KeypadInput ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -69844,72 +67477,32 @@ class ReadTestClusterCharString : public ReadAttribute {
     }
 };
 
-class WriteTestClusterCharString : public WriteAttribute {
-public:
-    WriteTestClusterCharString()
-        : WriteAttribute("char-string")
-    {
-        AddArgument("attr-name", "char-string");
-        AddArgument("attr-value", &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterCharString() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000001E) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSString * _Nonnull value = [[NSString alloc] initWithBytes:mValue.data()
-                                                             length:mValue.size()
-                                                           encoding:NSUTF8StringEncoding];
-
-        [cluster writeAttributeCharStringWithValue:value
-                                            params:params
-                                 completionHandler:^(NSError * _Nullable error) {
-                                     if (error != nil) {
-                                         LogNSError("TestCluster CharString write Error", error);
-                                     }
-                                     SetCommandExitStatus(error);
-                                 }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::ByteSpan mValue;
-};
-
-class SubscribeAttributeTestClusterCharString : public SubscribeAttribute {
+class SubscribeAttributeKeypadInputClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterCharString()
-        : SubscribeAttribute("char-string")
+    SubscribeAttributeKeypadInputClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeTestClusterCharString() {}
+    ~SubscribeAttributeKeypadInputClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000001E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000509) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCharStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.CharString response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"KeypadInput.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -69919,272 +67512,475 @@ class SubscribeAttributeTestClusterCharString : public SubscribeAttribute {
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster ContentLauncher                                             | 0x050A |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * LaunchContent                                                     |   0x00 |
+| * LaunchURL                                                         |   0x01 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * AcceptHeader                                                      | 0x0000 |
+| * SupportedStreamingProtocols                                       | 0x0001 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute LongCharString
+ * Command LaunchContent
  */
-class ReadTestClusterLongCharString : public ReadAttribute {
+class ContentLauncherLaunchContent : public ClusterCommand {
 public:
-    ReadTestClusterLongCharString()
-        : ReadAttribute("long-char-string")
+    ContentLauncherLaunchContent()
+        : ClusterCommand("launch-content")
+        , mComplex_Search(&mRequest.search)
     {
+        AddArgument("Search", &mComplex_Search);
+        AddArgument("AutoPlay", 0, 1, &mRequest.autoPlay);
+        AddArgument("Data", &mRequest.data);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadTestClusterLongCharString() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000001F) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeLongCharStringWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.LongCharString response %@", [value description]);
-            if (error != nil) {
-                LogNSError("TestCluster LongCharString read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteTestClusterLongCharString : public WriteAttribute {
-public:
-    WriteTestClusterLongCharString()
-        : WriteAttribute("long-char-string")
-    {
-        AddArgument("attr-name", "long-char-string");
-        AddArgument("attr-value", &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterLongCharString() {}
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) command (0x00000000) on endpoint %u", endpointId);
 
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000001F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
+        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPContentLauncherClusterLaunchContentParams alloc] init];
+        params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSString * _Nonnull value = [[NSString alloc] initWithBytes:mValue.data()
-                                                             length:mValue.size()
-                                                           encoding:NSUTF8StringEncoding];
-
-        [cluster writeAttributeLongCharStringWithValue:value
-                                                params:params
-                                     completionHandler:^(NSError * _Nullable error) {
-                                         if (error != nil) {
-                                             LogNSError("TestCluster LongCharString write Error", error);
-                                         }
-                                         SetCommandExitStatus(error);
-                                     }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::ByteSpan mValue;
-};
-
-class SubscribeAttributeTestClusterLongCharString : public SubscribeAttribute {
-public:
-    SubscribeAttributeTestClusterLongCharString()
-        : SubscribeAttribute("long-char-string")
-    {
-    }
-
-    ~SubscribeAttributeTestClusterLongCharString() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000001F) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLongCharStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.LongCharString response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
+        params.search = [CHIPContentLauncherClusterContentSearch new];
+        { // Scope for our temporary variables
+            auto * array_1 = [NSMutableArray new];
+            for (auto & entry_1 : mRequest.search.parameterList) {
+                CHIPContentLauncherClusterParameter * newElement_1;
+                newElement_1 = [CHIPContentLauncherClusterParameter new];
+                newElement_1.type = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_1.type)];
+                newElement_1.value = [[NSString alloc] initWithBytes:entry_1.value.data()
+                                                              length:entry_1.value.size()
+                                                            encoding:NSUTF8StringEncoding];
+                if (entry_1.externalIDList.HasValue()) {
+                    { // Scope for our temporary variables
+                        auto * array_4 = [NSMutableArray new];
+                        for (auto & entry_4 : entry_1.externalIDList.Value()) {
+                            CHIPContentLauncherClusterAdditionalInfo * newElement_4;
+                            newElement_4 = [CHIPContentLauncherClusterAdditionalInfo new];
+                            newElement_4.name = [[NSString alloc] initWithBytes:entry_4.name.data()
+                                                                         length:entry_4.name.size()
+                                                                       encoding:NSUTF8StringEncoding];
+                            newElement_4.value = [[NSString alloc] initWithBytes:entry_4.value.data()
+                                                                          length:entry_4.value.size()
+                                                                        encoding:NSUTF8StringEncoding];
+                            [array_4 addObject:newElement_4];
+                        }
+                        newElement_1.externalIDList = array_4;
+                    }
+                } else {
+                    newElement_1.externalIDList = nil;
                 }
-            }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
-/*
- * Attribute EpochUs
- */
-class ReadTestClusterEpochUs : public ReadAttribute {
-public:
-    ReadTestClusterEpochUs()
-        : ReadAttribute("epoch-us")
-    {
-    }
-
-    ~ReadTestClusterEpochUs() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000020) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeEpochUsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.EpochUs response %@", [value description]);
-            if (error != nil) {
-                LogNSError("TestCluster EpochUs read Error", error);
+                [array_1 addObject:newElement_1];
             }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteTestClusterEpochUs : public WriteAttribute {
-public:
-    WriteTestClusterEpochUs()
-        : WriteAttribute("epoch-us")
-    {
-        AddArgument("attr-name", "epoch-us");
-        AddArgument("attr-value", 0, UINT64_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterEpochUs() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000020) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedLongLong:mValue];
-
-        [cluster writeAttributeEpochUsWithValue:value
-                                         params:params
-                              completionHandler:^(NSError * _Nullable error) {
-                                  if (error != nil) {
-                                      LogNSError("TestCluster EpochUs write Error", error);
-                                  }
-                                  SetCommandExitStatus(error);
-                              }];
+            params.search.parameterList = array_1;
+        }
+        params.autoPlay = [NSNumber numberWithBool:mRequest.autoPlay];
+        if (mRequest.data.HasValue()) {
+            params.data = [[NSString alloc] initWithBytes:mRequest.data.Value().data()
+                                                   length:mRequest.data.Value().size()
+                                                 encoding:NSUTF8StringEncoding];
+        } else {
+            params.data = nil;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster launchContentWithParams:params
+                           completionHandler:^(
+                               CHIPContentLauncherClusterLaunchResponseParams * _Nullable values, NSError * _Nullable error) {
+                               NSLog(@"Values: %@", values);
+                               responsesNeeded--;
+                               if (error != nil) {
+                                   mError = error;
+                                   LogNSError("Error", error);
+                               }
+                               if (responsesNeeded == 0) {
+                                   SetCommandExitStatus(mError);
+                               }
+                           }];
+        }
         return CHIP_NO_ERROR;
     }
 
 private:
-    uint64_t mValue;
-};
-
-class SubscribeAttributeTestClusterEpochUs : public SubscribeAttribute {
-public:
-    SubscribeAttributeTestClusterEpochUs()
-        : SubscribeAttribute("epoch-us")
-    {
-    }
-
-    ~SubscribeAttributeTestClusterEpochUs() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000020) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeEpochUsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.EpochUs response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
-
-        return CHIP_NO_ERROR;
-    }
+    chip::app::Clusters::ContentLauncher::Commands::LaunchContent::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::ContentLauncher::Structs::ContentSearch::Type> mComplex_Search;
 };
 
 /*
- * Attribute EpochS
+ * Command LaunchURL
  */
-class ReadTestClusterEpochS : public ReadAttribute {
+class ContentLauncherLaunchURL : public ClusterCommand {
 public:
-    ReadTestClusterEpochS()
-        : ReadAttribute("epoch-s")
+    ContentLauncherLaunchURL()
+        : ClusterCommand("launch-url")
+        , mComplex_BrandingInformation(&mRequest.brandingInformation)
     {
+        AddArgument("ContentURL", &mRequest.contentURL);
+        AddArgument("DisplayString", &mRequest.displayString);
+        AddArgument("BrandingInformation", &mComplex_BrandingInformation);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadTestClusterEpochS() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000021) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) command (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeEpochSWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.EpochS response %@", [value description]);
-            if (error != nil) {
-                LogNSError("TestCluster EpochS read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
+        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPContentLauncherClusterLaunchURLParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.contentURL = [[NSString alloc] initWithBytes:mRequest.contentURL.data()
+                                                     length:mRequest.contentURL.size()
+                                                   encoding:NSUTF8StringEncoding];
+        if (mRequest.displayString.HasValue()) {
+            params.displayString = [[NSString alloc] initWithBytes:mRequest.displayString.Value().data()
+                                                            length:mRequest.displayString.Value().size()
+                                                          encoding:NSUTF8StringEncoding];
+        } else {
+            params.displayString = nil;
+        }
+        if (mRequest.brandingInformation.HasValue()) {
+            params.brandingInformation = [CHIPContentLauncherClusterBrandingInformation new];
+            params.brandingInformation.providerName =
+                [[NSString alloc] initWithBytes:mRequest.brandingInformation.Value().providerName.data()
+                                         length:mRequest.brandingInformation.Value().providerName.size()
+                                       encoding:NSUTF8StringEncoding];
+            if (mRequest.brandingInformation.Value().background.HasValue()) {
+                params.brandingInformation.background = [CHIPContentLauncherClusterStyleInformation new];
+                if (mRequest.brandingInformation.Value().background.Value().imageUrl.HasValue()) {
+                    params.brandingInformation.background.imageUrl = [[NSString alloc]
+                        initWithBytes:mRequest.brandingInformation.Value().background.Value().imageUrl.Value().data()
+                               length:mRequest.brandingInformation.Value().background.Value().imageUrl.Value().size()
+                             encoding:NSUTF8StringEncoding];
+                } else {
+                    params.brandingInformation.background.imageUrl = nil;
+                }
+                if (mRequest.brandingInformation.Value().background.Value().color.HasValue()) {
+                    params.brandingInformation.background.color =
+                        [[NSString alloc] initWithBytes:mRequest.brandingInformation.Value().background.Value().color.Value().data()
+                                                 length:mRequest.brandingInformation.Value().background.Value().color.Value().size()
+                                               encoding:NSUTF8StringEncoding];
+                } else {
+                    params.brandingInformation.background.color = nil;
+                }
+                if (mRequest.brandingInformation.Value().background.Value().size.HasValue()) {
+                    params.brandingInformation.background.size = [CHIPContentLauncherClusterDimension new];
+                    params.brandingInformation.background.size.width =
+                        [NSNumber numberWithDouble:mRequest.brandingInformation.Value().background.Value().size.Value().width];
+                    params.brandingInformation.background.size.height =
+                        [NSNumber numberWithDouble:mRequest.brandingInformation.Value().background.Value().size.Value().height];
+                    params.brandingInformation.background.size.metric = [NSNumber
+                        numberWithUnsignedChar:chip::to_underlying(
+                                                   mRequest.brandingInformation.Value().background.Value().size.Value().metric)];
+                } else {
+                    params.brandingInformation.background.size = nil;
+                }
+            } else {
+                params.brandingInformation.background = nil;
+            }
+            if (mRequest.brandingInformation.Value().logo.HasValue()) {
+                params.brandingInformation.logo = [CHIPContentLauncherClusterStyleInformation new];
+                if (mRequest.brandingInformation.Value().logo.Value().imageUrl.HasValue()) {
+                    params.brandingInformation.logo.imageUrl =
+                        [[NSString alloc] initWithBytes:mRequest.brandingInformation.Value().logo.Value().imageUrl.Value().data()
+                                                 length:mRequest.brandingInformation.Value().logo.Value().imageUrl.Value().size()
+                                               encoding:NSUTF8StringEncoding];
+                } else {
+                    params.brandingInformation.logo.imageUrl = nil;
+                }
+                if (mRequest.brandingInformation.Value().logo.Value().color.HasValue()) {
+                    params.brandingInformation.logo.color =
+                        [[NSString alloc] initWithBytes:mRequest.brandingInformation.Value().logo.Value().color.Value().data()
+                                                 length:mRequest.brandingInformation.Value().logo.Value().color.Value().size()
+                                               encoding:NSUTF8StringEncoding];
+                } else {
+                    params.brandingInformation.logo.color = nil;
+                }
+                if (mRequest.brandingInformation.Value().logo.Value().size.HasValue()) {
+                    params.brandingInformation.logo.size = [CHIPContentLauncherClusterDimension new];
+                    params.brandingInformation.logo.size.width =
+                        [NSNumber numberWithDouble:mRequest.brandingInformation.Value().logo.Value().size.Value().width];
+                    params.brandingInformation.logo.size.height =
+                        [NSNumber numberWithDouble:mRequest.brandingInformation.Value().logo.Value().size.Value().height];
+                    params.brandingInformation.logo.size.metric = [NSNumber
+                        numberWithUnsignedChar:chip::to_underlying(
+                                                   mRequest.brandingInformation.Value().logo.Value().size.Value().metric)];
+                } else {
+                    params.brandingInformation.logo.size = nil;
+                }
+            } else {
+                params.brandingInformation.logo = nil;
+            }
+            if (mRequest.brandingInformation.Value().progressBar.HasValue()) {
+                params.brandingInformation.progressBar = [CHIPContentLauncherClusterStyleInformation new];
+                if (mRequest.brandingInformation.Value().progressBar.Value().imageUrl.HasValue()) {
+                    params.brandingInformation.progressBar.imageUrl = [[NSString alloc]
+                        initWithBytes:mRequest.brandingInformation.Value().progressBar.Value().imageUrl.Value().data()
+                               length:mRequest.brandingInformation.Value().progressBar.Value().imageUrl.Value().size()
+                             encoding:NSUTF8StringEncoding];
+                } else {
+                    params.brandingInformation.progressBar.imageUrl = nil;
+                }
+                if (mRequest.brandingInformation.Value().progressBar.Value().color.HasValue()) {
+                    params.brandingInformation.progressBar.color = [[NSString alloc]
+                        initWithBytes:mRequest.brandingInformation.Value().progressBar.Value().color.Value().data()
+                               length:mRequest.brandingInformation.Value().progressBar.Value().color.Value().size()
+                             encoding:NSUTF8StringEncoding];
+                } else {
+                    params.brandingInformation.progressBar.color = nil;
+                }
+                if (mRequest.brandingInformation.Value().progressBar.Value().size.HasValue()) {
+                    params.brandingInformation.progressBar.size = [CHIPContentLauncherClusterDimension new];
+                    params.brandingInformation.progressBar.size.width =
+                        [NSNumber numberWithDouble:mRequest.brandingInformation.Value().progressBar.Value().size.Value().width];
+                    params.brandingInformation.progressBar.size.height =
+                        [NSNumber numberWithDouble:mRequest.brandingInformation.Value().progressBar.Value().size.Value().height];
+                    params.brandingInformation.progressBar.size.metric = [NSNumber
+                        numberWithUnsignedChar:chip::to_underlying(
+                                                   mRequest.brandingInformation.Value().progressBar.Value().size.Value().metric)];
+                } else {
+                    params.brandingInformation.progressBar.size = nil;
+                }
+            } else {
+                params.brandingInformation.progressBar = nil;
+            }
+            if (mRequest.brandingInformation.Value().splash.HasValue()) {
+                params.brandingInformation.splash = [CHIPContentLauncherClusterStyleInformation new];
+                if (mRequest.brandingInformation.Value().splash.Value().imageUrl.HasValue()) {
+                    params.brandingInformation.splash.imageUrl =
+                        [[NSString alloc] initWithBytes:mRequest.brandingInformation.Value().splash.Value().imageUrl.Value().data()
+                                                 length:mRequest.brandingInformation.Value().splash.Value().imageUrl.Value().size()
+                                               encoding:NSUTF8StringEncoding];
+                } else {
+                    params.brandingInformation.splash.imageUrl = nil;
+                }
+                if (mRequest.brandingInformation.Value().splash.Value().color.HasValue()) {
+                    params.brandingInformation.splash.color =
+                        [[NSString alloc] initWithBytes:mRequest.brandingInformation.Value().splash.Value().color.Value().data()
+                                                 length:mRequest.brandingInformation.Value().splash.Value().color.Value().size()
+                                               encoding:NSUTF8StringEncoding];
+                } else {
+                    params.brandingInformation.splash.color = nil;
+                }
+                if (mRequest.brandingInformation.Value().splash.Value().size.HasValue()) {
+                    params.brandingInformation.splash.size = [CHIPContentLauncherClusterDimension new];
+                    params.brandingInformation.splash.size.width =
+                        [NSNumber numberWithDouble:mRequest.brandingInformation.Value().splash.Value().size.Value().width];
+                    params.brandingInformation.splash.size.height =
+                        [NSNumber numberWithDouble:mRequest.brandingInformation.Value().splash.Value().size.Value().height];
+                    params.brandingInformation.splash.size.metric = [NSNumber
+                        numberWithUnsignedChar:chip::to_underlying(
+                                                   mRequest.brandingInformation.Value().splash.Value().size.Value().metric)];
+                } else {
+                    params.brandingInformation.splash.size = nil;
+                }
+            } else {
+                params.brandingInformation.splash = nil;
+            }
+            if (mRequest.brandingInformation.Value().waterMark.HasValue()) {
+                params.brandingInformation.waterMark = [CHIPContentLauncherClusterStyleInformation new];
+                if (mRequest.brandingInformation.Value().waterMark.Value().imageUrl.HasValue()) {
+                    params.brandingInformation.waterMark.imageUrl = [[NSString alloc]
+                        initWithBytes:mRequest.brandingInformation.Value().waterMark.Value().imageUrl.Value().data()
+                               length:mRequest.brandingInformation.Value().waterMark.Value().imageUrl.Value().size()
+                             encoding:NSUTF8StringEncoding];
+                } else {
+                    params.brandingInformation.waterMark.imageUrl = nil;
+                }
+                if (mRequest.brandingInformation.Value().waterMark.Value().color.HasValue()) {
+                    params.brandingInformation.waterMark.color =
+                        [[NSString alloc] initWithBytes:mRequest.brandingInformation.Value().waterMark.Value().color.Value().data()
+                                                 length:mRequest.brandingInformation.Value().waterMark.Value().color.Value().size()
+                                               encoding:NSUTF8StringEncoding];
+                } else {
+                    params.brandingInformation.waterMark.color = nil;
+                }
+                if (mRequest.brandingInformation.Value().waterMark.Value().size.HasValue()) {
+                    params.brandingInformation.waterMark.size = [CHIPContentLauncherClusterDimension new];
+                    params.brandingInformation.waterMark.size.width =
+                        [NSNumber numberWithDouble:mRequest.brandingInformation.Value().waterMark.Value().size.Value().width];
+                    params.brandingInformation.waterMark.size.height =
+                        [NSNumber numberWithDouble:mRequest.brandingInformation.Value().waterMark.Value().size.Value().height];
+                    params.brandingInformation.waterMark.size.metric = [NSNumber
+                        numberWithUnsignedChar:chip::to_underlying(
+                                                   mRequest.brandingInformation.Value().waterMark.Value().size.Value().metric)];
+                } else {
+                    params.brandingInformation.waterMark.size = nil;
+                }
+            } else {
+                params.brandingInformation.waterMark = nil;
+            }
+        } else {
+            params.brandingInformation = nil;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster launchURLWithParams:params
+                       completionHandler:^(
+                           CHIPContentLauncherClusterLaunchResponseParams * _Nullable values, NSError * _Nullable error) {
+                           NSLog(@"Values: %@", values);
+                           responsesNeeded--;
+                           if (error != nil) {
+                               mError = error;
+                               LogNSError("Error", error);
+                           }
+                           if (responsesNeeded == 0) {
+                               SetCommandExitStatus(mError);
+                           }
+                       }];
+        }
+        return CHIP_NO_ERROR;
+    }
 
-class WriteTestClusterEpochS : public WriteAttribute {
+private:
+    chip::app::Clusters::ContentLauncher::Commands::LaunchURL::Type mRequest;
+    TypedComplexArgument<chip::Optional<chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::Type>>
+        mComplex_BrandingInformation;
+};
+
+/*
+ * Attribute AcceptHeader
+ */
+class ReadContentLauncherAcceptHeader : public ReadAttribute {
 public:
-    WriteTestClusterEpochS()
-        : WriteAttribute("epoch-s")
+    ReadContentLauncherAcceptHeader()
+        : ReadAttribute("accept-header")
     {
-        AddArgument("attr-name", "epoch-s");
+    }
+
+    ~ReadContentLauncherAcceptHeader() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptHeaderWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ContentLauncher.AcceptHeader response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ContentLauncher AcceptHeader read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeContentLauncherAcceptHeader : public SubscribeAttribute {
+public:
+    SubscribeAttributeContentLauncherAcceptHeader()
+        : SubscribeAttribute("accept-header")
+    {
+    }
+
+    ~SubscribeAttributeContentLauncherAcceptHeader() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeAcceptHeaderWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ContentLauncher.AcceptHeader response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+/*
+ * Attribute SupportedStreamingProtocols
+ */
+class ReadContentLauncherSupportedStreamingProtocols : public ReadAttribute {
+public:
+    ReadContentLauncherSupportedStreamingProtocols()
+        : ReadAttribute("supported-streaming-protocols")
+    {
+    }
+
+    ~ReadContentLauncherSupportedStreamingProtocols() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster
+            readAttributeSupportedStreamingProtocolsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ContentLauncher.SupportedStreamingProtocols response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("ContentLauncher SupportedStreamingProtocols read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteContentLauncherSupportedStreamingProtocols : public WriteAttribute {
+public:
+    WriteContentLauncherSupportedStreamingProtocols()
+        : WriteAttribute("supported-streaming-protocols")
+    {
+        AddArgument("attr-name", "supported-streaming-protocols");
         AddArgument("attr-value", 0, UINT32_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteTestClusterEpochS() {}
+    ~WriteContentLauncherSupportedStreamingProtocols() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000021) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) WriteAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
         NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue];
 
-        [cluster writeAttributeEpochSWithValue:value
-                                        params:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 if (error != nil) {
-                                     LogNSError("TestCluster EpochS write Error", error);
-                                 }
-                                 SetCommandExitStatus(error);
-                             }];
+        [cluster
+            writeAttributeSupportedStreamingProtocolsWithValue:value
+                                                        params:params
+                                             completionHandler:^(NSError * _Nullable error) {
+                                                 if (error != nil) {
+                                                     LogNSError("ContentLauncher SupportedStreamingProtocols write Error", error);
+                                                 }
+                                                 SetCommandExitStatus(error);
+                                             }];
         return CHIP_NO_ERROR;
     }
 
@@ -70192,32 +67988,32 @@ class WriteTestClusterEpochS : public WriteAttribute {
     uint32_t mValue;
 };
 
-class SubscribeAttributeTestClusterEpochS : public SubscribeAttribute {
+class SubscribeAttributeContentLauncherSupportedStreamingProtocols : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterEpochS()
-        : SubscribeAttribute("epoch-s")
+    SubscribeAttributeContentLauncherSupportedStreamingProtocols()
+        : SubscribeAttribute("supported-streaming-protocols")
     {
     }
 
-    ~SubscribeAttributeTestClusterEpochS() {}
+    ~SubscribeAttributeContentLauncherSupportedStreamingProtocols() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000021) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeEpochSWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeSupportedStreamingProtocolsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.EpochS response %@", [value description]);
+                NSLog(@"ContentLauncher.SupportedStreamingProtocols response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -70228,27 +68024,27 @@ class SubscribeAttributeTestClusterEpochS : public SubscribeAttribute {
 };
 
 /*
- * Attribute VendorId
+ * Attribute GeneratedCommandList
  */
-class ReadTestClusterVendorId : public ReadAttribute {
+class ReadContentLauncherGeneratedCommandList : public ReadAttribute {
 public:
-    ReadTestClusterVendorId()
-        : ReadAttribute("vendor-id")
+    ReadContentLauncherGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadTestClusterVendorId() {}
+    ~ReadContentLauncherGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000022) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeVendorIdWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.VendorId response %@", [value description]);
+        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ContentLauncher.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster VendorId read Error", error);
+                LogNSError("ContentLauncher GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -70256,70 +68052,96 @@ class ReadTestClusterVendorId : public ReadAttribute {
     }
 };
 
-class WriteTestClusterVendorId : public WriteAttribute {
+class SubscribeAttributeContentLauncherGeneratedCommandList : public SubscribeAttribute {
 public:
-    WriteTestClusterVendorId()
-        : WriteAttribute("vendor-id")
+    SubscribeAttributeContentLauncherGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
-        AddArgument("attr-name", "vendor-id");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteTestClusterVendorId() {}
+    ~SubscribeAttributeContentLauncherGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000022) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ContentLauncher.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
-        [cluster writeAttributeVendorIdWithValue:value
-                                          params:params
-                               completionHandler:^(NSError * _Nullable error) {
-                                   if (error != nil) {
-                                       LogNSError("TestCluster VendorId write Error", error);
-                                   }
-                                   SetCommandExitStatus(error);
-                               }];
         return CHIP_NO_ERROR;
     }
+};
 
-private:
-    chip::VendorId mValue;
+/*
+ * Attribute AcceptedCommandList
+ */
+class ReadContentLauncherAcceptedCommandList : public ReadAttribute {
+public:
+    ReadContentLauncherAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
+    {
+    }
+
+    ~ReadContentLauncherAcceptedCommandList() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ContentLauncher.AcceptedCommandList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ContentLauncher AcceptedCommandList read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
 };
 
-class SubscribeAttributeTestClusterVendorId : public SubscribeAttribute {
+class SubscribeAttributeContentLauncherAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterVendorId()
-        : SubscribeAttribute("vendor-id")
+    SubscribeAttributeContentLauncherAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterVendorId() {}
+    ~SubscribeAttributeContentLauncherAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000022) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeVendorIdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.VendorId response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ContentLauncher.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -70330,28 +68152,27 @@ class SubscribeAttributeTestClusterVendorId : public SubscribeAttribute {
 };
 
 /*
- * Attribute ListNullablesAndOptionalsStruct
+ * Attribute AttributeList
  */
-class ReadTestClusterListNullablesAndOptionalsStruct : public ReadAttribute {
+class ReadContentLauncherAttributeList : public ReadAttribute {
 public:
-    ReadTestClusterListNullablesAndOptionalsStruct()
-        : ReadAttribute("list-nullables-and-optionals-struct")
+    ReadContentLauncherAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadTestClusterListNullablesAndOptionalsStruct() {}
+    ~ReadContentLauncherAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000023) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeListNullablesAndOptionalsStructWithCompletionHandler:^(
-            NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.ListNullablesAndOptionalsStruct response %@", [value description]);
+        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ContentLauncher.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster ListNullablesAndOptionalsStruct read Error", error);
+                LogNSError("ContentLauncher AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -70359,235 +68180,32 @@ class ReadTestClusterListNullablesAndOptionalsStruct : public ReadAttribute {
     }
 };
 
-class WriteTestClusterListNullablesAndOptionalsStruct : public WriteAttribute {
+class SubscribeAttributeContentLauncherAttributeList : public SubscribeAttribute {
 public:
-    WriteTestClusterListNullablesAndOptionalsStruct()
-        : WriteAttribute("list-nullables-and-optionals-struct")
-        , mComplex(&mValue)
+    SubscribeAttributeContentLauncherAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
-        AddArgument("attr-name", "list-nullables-and-optionals-struct");
-        AddArgument("attr-value", &mComplex);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteTestClusterListNullablesAndOptionalsStruct() {}
+    ~SubscribeAttributeContentLauncherAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000023) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSArray * _Nonnull value;
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mValue) {
-                CHIPTestClusterClusterNullablesAndOptionalsStruct * newElement_0;
-                newElement_0 = [CHIPTestClusterClusterNullablesAndOptionalsStruct new];
-                if (entry_0.nullableInt.IsNull()) {
-                    newElement_0.nullableInt = nil;
-                } else {
-                    newElement_0.nullableInt = [NSNumber numberWithUnsignedShort:entry_0.nullableInt.Value()];
-                }
-                if (entry_0.optionalInt.HasValue()) {
-                    newElement_0.optionalInt = [NSNumber numberWithUnsignedShort:entry_0.optionalInt.Value()];
-                } else {
-                    newElement_0.optionalInt = nil;
-                }
-                if (entry_0.nullableOptionalInt.HasValue()) {
-                    if (entry_0.nullableOptionalInt.Value().IsNull()) {
-                        newElement_0.nullableOptionalInt = nil;
-                    } else {
-                        newElement_0.nullableOptionalInt =
-                            [NSNumber numberWithUnsignedShort:entry_0.nullableOptionalInt.Value().Value()];
-                    }
-                } else {
-                    newElement_0.nullableOptionalInt = nil;
-                }
-                if (entry_0.nullableString.IsNull()) {
-                    newElement_0.nullableString = nil;
-                } else {
-                    newElement_0.nullableString = [[NSString alloc] initWithBytes:entry_0.nullableString.Value().data()
-                                                                           length:entry_0.nullableString.Value().size()
-                                                                         encoding:NSUTF8StringEncoding];
-                }
-                if (entry_0.optionalString.HasValue()) {
-                    newElement_0.optionalString = [[NSString alloc] initWithBytes:entry_0.optionalString.Value().data()
-                                                                           length:entry_0.optionalString.Value().size()
-                                                                         encoding:NSUTF8StringEncoding];
-                } else {
-                    newElement_0.optionalString = nil;
-                }
-                if (entry_0.nullableOptionalString.HasValue()) {
-                    if (entry_0.nullableOptionalString.Value().IsNull()) {
-                        newElement_0.nullableOptionalString = nil;
-                    } else {
-                        newElement_0.nullableOptionalString =
-                            [[NSString alloc] initWithBytes:entry_0.nullableOptionalString.Value().Value().data()
-                                                     length:entry_0.nullableOptionalString.Value().Value().size()
-                                                   encoding:NSUTF8StringEncoding];
-                    }
-                } else {
-                    newElement_0.nullableOptionalString = nil;
-                }
-                if (entry_0.nullableStruct.IsNull()) {
-                    newElement_0.nullableStruct = nil;
-                } else {
-                    newElement_0.nullableStruct = [CHIPTestClusterClusterSimpleStruct new];
-                    newElement_0.nullableStruct.a = [NSNumber numberWithUnsignedChar:entry_0.nullableStruct.Value().a];
-                    newElement_0.nullableStruct.b = [NSNumber numberWithBool:entry_0.nullableStruct.Value().b];
-                    newElement_0.nullableStruct.c =
-                        [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.nullableStruct.Value().c)];
-                    newElement_0.nullableStruct.d = [NSData dataWithBytes:entry_0.nullableStruct.Value().d.data()
-                                                                   length:entry_0.nullableStruct.Value().d.size()];
-                    newElement_0.nullableStruct.e = [[NSString alloc] initWithBytes:entry_0.nullableStruct.Value().e.data()
-                                                                             length:entry_0.nullableStruct.Value().e.size()
-                                                                           encoding:NSUTF8StringEncoding];
-                    newElement_0.nullableStruct.f = [NSNumber numberWithUnsignedChar:entry_0.nullableStruct.Value().f.Raw()];
-                    newElement_0.nullableStruct.g = [NSNumber numberWithFloat:entry_0.nullableStruct.Value().g];
-                    newElement_0.nullableStruct.h = [NSNumber numberWithDouble:entry_0.nullableStruct.Value().h];
-                }
-                if (entry_0.optionalStruct.HasValue()) {
-                    newElement_0.optionalStruct = [CHIPTestClusterClusterSimpleStruct new];
-                    newElement_0.optionalStruct.a = [NSNumber numberWithUnsignedChar:entry_0.optionalStruct.Value().a];
-                    newElement_0.optionalStruct.b = [NSNumber numberWithBool:entry_0.optionalStruct.Value().b];
-                    newElement_0.optionalStruct.c =
-                        [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.optionalStruct.Value().c)];
-                    newElement_0.optionalStruct.d = [NSData dataWithBytes:entry_0.optionalStruct.Value().d.data()
-                                                                   length:entry_0.optionalStruct.Value().d.size()];
-                    newElement_0.optionalStruct.e = [[NSString alloc] initWithBytes:entry_0.optionalStruct.Value().e.data()
-                                                                             length:entry_0.optionalStruct.Value().e.size()
-                                                                           encoding:NSUTF8StringEncoding];
-                    newElement_0.optionalStruct.f = [NSNumber numberWithUnsignedChar:entry_0.optionalStruct.Value().f.Raw()];
-                    newElement_0.optionalStruct.g = [NSNumber numberWithFloat:entry_0.optionalStruct.Value().g];
-                    newElement_0.optionalStruct.h = [NSNumber numberWithDouble:entry_0.optionalStruct.Value().h];
-                } else {
-                    newElement_0.optionalStruct = nil;
-                }
-                if (entry_0.nullableOptionalStruct.HasValue()) {
-                    if (entry_0.nullableOptionalStruct.Value().IsNull()) {
-                        newElement_0.nullableOptionalStruct = nil;
-                    } else {
-                        newElement_0.nullableOptionalStruct = [CHIPTestClusterClusterSimpleStruct new];
-                        newElement_0.nullableOptionalStruct.a =
-                            [NSNumber numberWithUnsignedChar:entry_0.nullableOptionalStruct.Value().Value().a];
-                        newElement_0.nullableOptionalStruct.b =
-                            [NSNumber numberWithBool:entry_0.nullableOptionalStruct.Value().Value().b];
-                        newElement_0.nullableOptionalStruct.c =
-                            [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.nullableOptionalStruct.Value().Value().c)];
-                        newElement_0.nullableOptionalStruct.d =
-                            [NSData dataWithBytes:entry_0.nullableOptionalStruct.Value().Value().d.data()
-                                           length:entry_0.nullableOptionalStruct.Value().Value().d.size()];
-                        newElement_0.nullableOptionalStruct.e =
-                            [[NSString alloc] initWithBytes:entry_0.nullableOptionalStruct.Value().Value().e.data()
-                                                     length:entry_0.nullableOptionalStruct.Value().Value().e.size()
-                                                   encoding:NSUTF8StringEncoding];
-                        newElement_0.nullableOptionalStruct.f =
-                            [NSNumber numberWithUnsignedChar:entry_0.nullableOptionalStruct.Value().Value().f.Raw()];
-                        newElement_0.nullableOptionalStruct.g =
-                            [NSNumber numberWithFloat:entry_0.nullableOptionalStruct.Value().Value().g];
-                        newElement_0.nullableOptionalStruct.h =
-                            [NSNumber numberWithDouble:entry_0.nullableOptionalStruct.Value().Value().h];
-                    }
-                } else {
-                    newElement_0.nullableOptionalStruct = nil;
-                }
-                if (entry_0.nullableList.IsNull()) {
-                    newElement_0.nullableList = nil;
-                } else {
-                    { // Scope for our temporary variables
-                        auto * array_3 = [NSMutableArray new];
-                        for (auto & entry_3 : entry_0.nullableList.Value()) {
-                            NSNumber * newElement_3;
-                            newElement_3 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_3)];
-                            [array_3 addObject:newElement_3];
-                        }
-                        newElement_0.nullableList = array_3;
-                    }
-                }
-                if (entry_0.optionalList.HasValue()) {
-                    { // Scope for our temporary variables
-                        auto * array_3 = [NSMutableArray new];
-                        for (auto & entry_3 : entry_0.optionalList.Value()) {
-                            NSNumber * newElement_3;
-                            newElement_3 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_3)];
-                            [array_3 addObject:newElement_3];
-                        }
-                        newElement_0.optionalList = array_3;
-                    }
-                } else {
-                    newElement_0.optionalList = nil;
-                }
-                if (entry_0.nullableOptionalList.HasValue()) {
-                    if (entry_0.nullableOptionalList.Value().IsNull()) {
-                        newElement_0.nullableOptionalList = nil;
-                    } else {
-                        { // Scope for our temporary variables
-                            auto * array_4 = [NSMutableArray new];
-                            for (auto & entry_4 : entry_0.nullableOptionalList.Value().Value()) {
-                                NSNumber * newElement_4;
-                                newElement_4 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_4)];
-                                [array_4 addObject:newElement_4];
-                            }
-                            newElement_0.nullableOptionalList = array_4;
-                        }
-                    }
-                } else {
-                    newElement_0.nullableOptionalList = nil;
-                }
-                [array_0 addObject:newElement_0];
-            }
-            value = array_0;
-        }
-
-        [cluster writeAttributeListNullablesAndOptionalsStructWithValue:value
-                                                                 params:params
-                                                      completionHandler:^(NSError * _Nullable error) {
-                                                          if (error != nil) {
-                                                              LogNSError(
-                                                                  "TestCluster ListNullablesAndOptionalsStruct write Error", error);
-                                                          }
-                                                          SetCommandExitStatus(error);
-                                                      }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::Type> mValue;
-    TypedComplexArgument<
-        chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::Type>>
-        mComplex;
-};
-
-class SubscribeAttributeTestClusterListNullablesAndOptionalsStruct : public SubscribeAttribute {
-public:
-    SubscribeAttributeTestClusterListNullablesAndOptionalsStruct()
-        : SubscribeAttribute("list-nullables-and-optionals-struct")
-    {
-    }
-
-    ~SubscribeAttributeTestClusterListNullablesAndOptionalsStruct() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000023) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeListNullablesAndOptionalsStructWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.ListNullablesAndOptionalsStruct response %@", [value description]);
+                NSLog(@"ContentLauncher.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -70598,27 +68216,27 @@ class SubscribeAttributeTestClusterListNullablesAndOptionalsStruct : public Subs
 };
 
 /*
- * Attribute EnumAttr
+ * Attribute FeatureMap
  */
-class ReadTestClusterEnumAttr : public ReadAttribute {
+class ReadContentLauncherFeatureMap : public ReadAttribute {
 public:
-    ReadTestClusterEnumAttr()
-        : ReadAttribute("enum-attr")
+    ReadContentLauncherFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadTestClusterEnumAttr() {}
+    ~ReadContentLauncherFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000024) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeEnumAttrWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.EnumAttr response %@", [value description]);
+        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ContentLauncher.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster EnumAttr read Error", error);
+                LogNSError("ContentLauncher FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -70626,70 +68244,96 @@ class ReadTestClusterEnumAttr : public ReadAttribute {
     }
 };
 
-class WriteTestClusterEnumAttr : public WriteAttribute {
+class SubscribeAttributeContentLauncherFeatureMap : public SubscribeAttribute {
 public:
-    WriteTestClusterEnumAttr()
-        : WriteAttribute("enum-attr")
+    SubscribeAttributeContentLauncherFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
-        AddArgument("attr-name", "enum-attr");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteTestClusterEnumAttr() {}
+    ~SubscribeAttributeContentLauncherFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000024) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ContentLauncher.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
-        [cluster writeAttributeEnumAttrWithValue:value
-                                          params:params
-                               completionHandler:^(NSError * _Nullable error) {
-                                   if (error != nil) {
-                                       LogNSError("TestCluster EnumAttr write Error", error);
-                                   }
-                                   SetCommandExitStatus(error);
-                               }];
         return CHIP_NO_ERROR;
     }
+};
 
-private:
-    uint8_t mValue;
+/*
+ * Attribute ClusterRevision
+ */
+class ReadContentLauncherClusterRevision : public ReadAttribute {
+public:
+    ReadContentLauncherClusterRevision()
+        : ReadAttribute("cluster-revision")
+    {
+    }
+
+    ~ReadContentLauncherClusterRevision() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ContentLauncher.ClusterRevision response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ContentLauncher ClusterRevision read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
 };
 
-class SubscribeAttributeTestClusterEnumAttr : public SubscribeAttribute {
+class SubscribeAttributeContentLauncherClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterEnumAttr()
-        : SubscribeAttribute("enum-attr")
+    SubscribeAttributeContentLauncherClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeTestClusterEnumAttr() {}
+    ~SubscribeAttributeContentLauncherClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000024) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050A) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeEnumAttrWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.EnumAttr response %@", [value description]);
+                NSLog(@"ContentLauncher.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -70699,111 +68343,172 @@ class SubscribeAttributeTestClusterEnumAttr : public SubscribeAttribute {
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster AudioOutput                                                 | 0x050B |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * SelectOutput                                                      |   0x00 |
+| * RenameOutput                                                      |   0x01 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * OutputList                                                        | 0x0000 |
+| * CurrentOutput                                                     | 0x0001 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute StructAttr
+ * Command SelectOutput
  */
-class ReadTestClusterStructAttr : public ReadAttribute {
+class AudioOutputSelectOutput : public ClusterCommand {
 public:
-    ReadTestClusterStructAttr()
-        : ReadAttribute("struct-attr")
+    AudioOutputSelectOutput()
+        : ClusterCommand("select-output")
     {
+        AddArgument("Index", 0, UINT8_MAX, &mRequest.index);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadTestClusterStructAttr() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000025) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeStructAttrWithCompletionHandler:^(
-            CHIPTestClusterClusterSimpleStruct * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.StructAttr response %@", [value description]);
-            if (error != nil) {
-                LogNSError("TestCluster StructAttr read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPAudioOutputClusterSelectOutputParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.index = [NSNumber numberWithUnsignedChar:mRequest.index];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster selectOutputWithParams:params
+                          completionHandler:^(NSError * _Nullable error) {
+                              responsesNeeded--;
+                              if (error != nil) {
+                                  mError = error;
+                                  LogNSError("Error", error);
+                              }
+                              if (responsesNeeded == 0) {
+                                  SetCommandExitStatus(mError);
+                              }
+                          }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::AudioOutput::Commands::SelectOutput::Type mRequest;
 };
 
-class WriteTestClusterStructAttr : public WriteAttribute {
+/*
+ * Command RenameOutput
+ */
+class AudioOutputRenameOutput : public ClusterCommand {
 public:
-    WriteTestClusterStructAttr()
-        : WriteAttribute("struct-attr")
-        , mComplex(&mValue)
+    AudioOutputRenameOutput()
+        : ClusterCommand("rename-output")
     {
-        AddArgument("attr-name", "struct-attr");
-        AddArgument("attr-value", &mComplex);
-        WriteAttribute::AddArguments();
+        AddArgument("Index", 0, UINT8_MAX, &mRequest.index);
+        AddArgument("Name", &mRequest.name);
+        ClusterCommand::AddArguments();
     }
 
-    ~WriteTestClusterStructAttr() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000025) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) command (0x00000001) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
+        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPAudioOutputClusterRenameOutputParams alloc] init];
+        params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        CHIPTestClusterClusterSimpleStruct * _Nonnull value;
-        value = [CHIPTestClusterClusterSimpleStruct new];
-        value.a = [NSNumber numberWithUnsignedChar:mValue.a];
-        value.b = [NSNumber numberWithBool:mValue.b];
-        value.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(mValue.c)];
-        value.d = [NSData dataWithBytes:mValue.d.data() length:mValue.d.size()];
-        value.e = [[NSString alloc] initWithBytes:mValue.e.data() length:mValue.e.size() encoding:NSUTF8StringEncoding];
-        value.f = [NSNumber numberWithUnsignedChar:mValue.f.Raw()];
-        value.g = [NSNumber numberWithFloat:mValue.g];
-        value.h = [NSNumber numberWithDouble:mValue.h];
-
-        [cluster writeAttributeStructAttrWithValue:value
-                                            params:params
-                                 completionHandler:^(NSError * _Nullable error) {
-                                     if (error != nil) {
-                                         LogNSError("TestCluster StructAttr write Error", error);
-                                     }
-                                     SetCommandExitStatus(error);
-                                 }];
+        params.index = [NSNumber numberWithUnsignedChar:mRequest.index];
+        params.name = [[NSString alloc] initWithBytes:mRequest.name.data()
+                                               length:mRequest.name.size()
+                                             encoding:NSUTF8StringEncoding];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster renameOutputWithParams:params
+                          completionHandler:^(NSError * _Nullable error) {
+                              responsesNeeded--;
+                              if (error != nil) {
+                                  mError = error;
+                                  LogNSError("Error", error);
+                              }
+                              if (responsesNeeded == 0) {
+                                  SetCommandExitStatus(mError);
+                              }
+                          }];
+        }
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type mValue;
-    TypedComplexArgument<chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type> mComplex;
+    chip::app::Clusters::AudioOutput::Commands::RenameOutput::Type mRequest;
 };
 
-class SubscribeAttributeTestClusterStructAttr : public SubscribeAttribute {
+/*
+ * Attribute OutputList
+ */
+class ReadAudioOutputOutputList : public ReadAttribute {
 public:
-    SubscribeAttributeTestClusterStructAttr()
-        : SubscribeAttribute("struct-attr")
+    ReadAudioOutputOutputList()
+        : ReadAttribute("output-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterStructAttr() {}
+    ~ReadAudioOutputOutputList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000025) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeOutputListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AudioOutput.OutputList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("AudioOutput OutputList read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeAudioOutputOutputList : public SubscribeAttribute {
+public:
+    SubscribeAttributeAudioOutputOutputList()
+        : SubscribeAttribute("output-list")
+    {
+    }
+
+    ~SubscribeAttributeAudioOutputOutputList() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeStructAttrWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOutputListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(CHIPTestClusterClusterSimpleStruct * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.StructAttr response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AudioOutput.OutputList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -70814,27 +68519,27 @@ class SubscribeAttributeTestClusterStructAttr : public SubscribeAttribute {
 };
 
 /*
- * Attribute RangeRestrictedInt8u
+ * Attribute CurrentOutput
  */
-class ReadTestClusterRangeRestrictedInt8u : public ReadAttribute {
+class ReadAudioOutputCurrentOutput : public ReadAttribute {
 public:
-    ReadTestClusterRangeRestrictedInt8u()
-        : ReadAttribute("range-restricted-int8u")
+    ReadAudioOutputCurrentOutput()
+        : ReadAttribute("current-output")
     {
     }
 
-    ~ReadTestClusterRangeRestrictedInt8u() {}
+    ~ReadAudioOutputCurrentOutput() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000026) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeRangeRestrictedInt8uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.RangeRestrictedInt8u response %@", [value description]);
+        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCurrentOutputWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AudioOutput.CurrentOutput response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster RangeRestrictedInt8u read Error", error);
+                LogNSError("AudioOutput CurrentOutput read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -70842,70 +68547,32 @@ class ReadTestClusterRangeRestrictedInt8u : public ReadAttribute {
     }
 };
 
-class WriteTestClusterRangeRestrictedInt8u : public WriteAttribute {
+class SubscribeAttributeAudioOutputCurrentOutput : public SubscribeAttribute {
 public:
-    WriteTestClusterRangeRestrictedInt8u()
-        : WriteAttribute("range-restricted-int8u")
-    {
-        AddArgument("attr-name", "range-restricted-int8u");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterRangeRestrictedInt8u() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000026) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeRangeRestrictedInt8uWithValue:value
-                                                      params:params
-                                           completionHandler:^(NSError * _Nullable error) {
-                                               if (error != nil) {
-                                                   LogNSError("TestCluster RangeRestrictedInt8u write Error", error);
-                                               }
-                                               SetCommandExitStatus(error);
-                                           }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeTestClusterRangeRestrictedInt8u : public SubscribeAttribute {
-public:
-    SubscribeAttributeTestClusterRangeRestrictedInt8u()
-        : SubscribeAttribute("range-restricted-int8u")
+    SubscribeAttributeAudioOutputCurrentOutput()
+        : SubscribeAttribute("current-output")
     {
     }
 
-    ~SubscribeAttributeTestClusterRangeRestrictedInt8u() {}
+    ~SubscribeAttributeAudioOutputCurrentOutput() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000026) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRangeRestrictedInt8uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCurrentOutputWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.RangeRestrictedInt8u response %@", [value description]);
+                NSLog(@"AudioOutput.CurrentOutput response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -70916,27 +68583,27 @@ class SubscribeAttributeTestClusterRangeRestrictedInt8u : public SubscribeAttrib
 };
 
 /*
- * Attribute RangeRestrictedInt8s
+ * Attribute GeneratedCommandList
  */
-class ReadTestClusterRangeRestrictedInt8s : public ReadAttribute {
+class ReadAudioOutputGeneratedCommandList : public ReadAttribute {
 public:
-    ReadTestClusterRangeRestrictedInt8s()
-        : ReadAttribute("range-restricted-int8s")
+    ReadAudioOutputGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadTestClusterRangeRestrictedInt8s() {}
+    ~ReadAudioOutputGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000027) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeRangeRestrictedInt8sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.RangeRestrictedInt8s response %@", [value description]);
+        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AudioOutput.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster RangeRestrictedInt8s read Error", error);
+                LogNSError("AudioOutput GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -70944,70 +68611,32 @@ class ReadTestClusterRangeRestrictedInt8s : public ReadAttribute {
     }
 };
 
-class WriteTestClusterRangeRestrictedInt8s : public WriteAttribute {
-public:
-    WriteTestClusterRangeRestrictedInt8s()
-        : WriteAttribute("range-restricted-int8s")
-    {
-        AddArgument("attr-name", "range-restricted-int8s");
-        AddArgument("attr-value", INT8_MIN, INT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterRangeRestrictedInt8s() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000027) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithChar:mValue];
-
-        [cluster writeAttributeRangeRestrictedInt8sWithValue:value
-                                                      params:params
-                                           completionHandler:^(NSError * _Nullable error) {
-                                               if (error != nil) {
-                                                   LogNSError("TestCluster RangeRestrictedInt8s write Error", error);
-                                               }
-                                               SetCommandExitStatus(error);
-                                           }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    int8_t mValue;
-};
-
-class SubscribeAttributeTestClusterRangeRestrictedInt8s : public SubscribeAttribute {
+class SubscribeAttributeAudioOutputGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterRangeRestrictedInt8s()
-        : SubscribeAttribute("range-restricted-int8s")
+    SubscribeAttributeAudioOutputGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterRangeRestrictedInt8s() {}
+    ~SubscribeAttributeAudioOutputGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000027) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRangeRestrictedInt8sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.RangeRestrictedInt8s response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AudioOutput.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -71018,27 +68647,27 @@ class SubscribeAttributeTestClusterRangeRestrictedInt8s : public SubscribeAttrib
 };
 
 /*
- * Attribute RangeRestrictedInt16u
+ * Attribute AcceptedCommandList
  */
-class ReadTestClusterRangeRestrictedInt16u : public ReadAttribute {
+class ReadAudioOutputAcceptedCommandList : public ReadAttribute {
 public:
-    ReadTestClusterRangeRestrictedInt16u()
-        : ReadAttribute("range-restricted-int16u")
+    ReadAudioOutputAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadTestClusterRangeRestrictedInt16u() {}
+    ~ReadAudioOutputAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000028) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeRangeRestrictedInt16uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.RangeRestrictedInt16u response %@", [value description]);
+        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AudioOutput.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster RangeRestrictedInt16u read Error", error);
+                LogNSError("AudioOutput AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -71046,70 +68675,32 @@ class ReadTestClusterRangeRestrictedInt16u : public ReadAttribute {
     }
 };
 
-class WriteTestClusterRangeRestrictedInt16u : public WriteAttribute {
-public:
-    WriteTestClusterRangeRestrictedInt16u()
-        : WriteAttribute("range-restricted-int16u")
-    {
-        AddArgument("attr-name", "range-restricted-int16u");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterRangeRestrictedInt16u() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000028) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeRangeRestrictedInt16uWithValue:value
-                                                       params:params
-                                            completionHandler:^(NSError * _Nullable error) {
-                                                if (error != nil) {
-                                                    LogNSError("TestCluster RangeRestrictedInt16u write Error", error);
-                                                }
-                                                SetCommandExitStatus(error);
-                                            }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeTestClusterRangeRestrictedInt16u : public SubscribeAttribute {
+class SubscribeAttributeAudioOutputAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterRangeRestrictedInt16u()
-        : SubscribeAttribute("range-restricted-int16u")
+    SubscribeAttributeAudioOutputAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterRangeRestrictedInt16u() {}
+    ~SubscribeAttributeAudioOutputAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000028) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRangeRestrictedInt16uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.RangeRestrictedInt16u response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AudioOutput.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -71120,27 +68711,27 @@ class SubscribeAttributeTestClusterRangeRestrictedInt16u : public SubscribeAttri
 };
 
 /*
- * Attribute RangeRestrictedInt16s
+ * Attribute AttributeList
  */
-class ReadTestClusterRangeRestrictedInt16s : public ReadAttribute {
+class ReadAudioOutputAttributeList : public ReadAttribute {
 public:
-    ReadTestClusterRangeRestrictedInt16s()
-        : ReadAttribute("range-restricted-int16s")
+    ReadAudioOutputAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadTestClusterRangeRestrictedInt16s() {}
+    ~ReadAudioOutputAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000029) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeRangeRestrictedInt16sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.RangeRestrictedInt16s response %@", [value description]);
+        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AudioOutput.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster RangeRestrictedInt16s read Error", error);
+                LogNSError("AudioOutput AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -71148,70 +68739,32 @@ class ReadTestClusterRangeRestrictedInt16s : public ReadAttribute {
     }
 };
 
-class WriteTestClusterRangeRestrictedInt16s : public WriteAttribute {
-public:
-    WriteTestClusterRangeRestrictedInt16s()
-        : WriteAttribute("range-restricted-int16s")
-    {
-        AddArgument("attr-name", "range-restricted-int16s");
-        AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterRangeRestrictedInt16s() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000029) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue];
-
-        [cluster writeAttributeRangeRestrictedInt16sWithValue:value
-                                                       params:params
-                                            completionHandler:^(NSError * _Nullable error) {
-                                                if (error != nil) {
-                                                    LogNSError("TestCluster RangeRestrictedInt16s write Error", error);
-                                                }
-                                                SetCommandExitStatus(error);
-                                            }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    int16_t mValue;
-};
-
-class SubscribeAttributeTestClusterRangeRestrictedInt16s : public SubscribeAttribute {
+class SubscribeAttributeAudioOutputAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterRangeRestrictedInt16s()
-        : SubscribeAttribute("range-restricted-int16s")
+    SubscribeAttributeAudioOutputAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterRangeRestrictedInt16s() {}
+    ~SubscribeAttributeAudioOutputAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000029) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRangeRestrictedInt16sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.RangeRestrictedInt16s response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AudioOutput.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -71222,27 +68775,27 @@ class SubscribeAttributeTestClusterRangeRestrictedInt16s : public SubscribeAttri
 };
 
 /*
- * Attribute ListLongOctetString
+ * Attribute FeatureMap
  */
-class ReadTestClusterListLongOctetString : public ReadAttribute {
+class ReadAudioOutputFeatureMap : public ReadAttribute {
 public:
-    ReadTestClusterListLongOctetString()
-        : ReadAttribute("list-long-octet-string")
+    ReadAudioOutputFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadTestClusterListLongOctetString() {}
+    ~ReadAudioOutputFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000002A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeListLongOctetStringWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.ListLongOctetString response %@", [value description]);
+        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AudioOutput.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster ListLongOctetString read Error", error);
+                LogNSError("AudioOutput FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -71250,81 +68803,32 @@ class ReadTestClusterListLongOctetString : public ReadAttribute {
     }
 };
 
-class WriteTestClusterListLongOctetString : public WriteAttribute {
-public:
-    WriteTestClusterListLongOctetString()
-        : WriteAttribute("list-long-octet-string")
-        , mComplex(&mValue)
-    {
-        AddArgument("attr-name", "list-long-octet-string");
-        AddArgument("attr-value", &mComplex);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterListLongOctetString() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000002A) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSArray * _Nonnull value;
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mValue) {
-                NSData * newElement_0;
-                newElement_0 = [NSData dataWithBytes:entry_0.data() length:entry_0.size()];
-                [array_0 addObject:newElement_0];
-            }
-            value = array_0;
-        }
-
-        [cluster writeAttributeListLongOctetStringWithValue:value
-                                                     params:params
-                                          completionHandler:^(NSError * _Nullable error) {
-                                              if (error != nil) {
-                                                  LogNSError("TestCluster ListLongOctetString write Error", error);
-                                              }
-                                              SetCommandExitStatus(error);
-                                          }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::DataModel::List<const chip::ByteSpan> mValue;
-    TypedComplexArgument<chip::app::DataModel::List<const chip::ByteSpan>> mComplex;
-};
-
-class SubscribeAttributeTestClusterListLongOctetString : public SubscribeAttribute {
+class SubscribeAttributeAudioOutputFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterListLongOctetString()
-        : SubscribeAttribute("list-long-octet-string")
+    SubscribeAttributeAudioOutputFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeTestClusterListLongOctetString() {}
+    ~SubscribeAttributeAudioOutputFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000002A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeListLongOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.ListLongOctetString response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AudioOutput.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -71335,162 +68839,60 @@ class SubscribeAttributeTestClusterListLongOctetString : public SubscribeAttribu
 };
 
 /*
- * Attribute ListFabricScoped
+ * Attribute ClusterRevision
  */
-class ReadTestClusterListFabricScoped : public ReadAttribute {
+class ReadAudioOutputClusterRevision : public ReadAttribute {
 public:
-    ReadTestClusterListFabricScoped()
-        : ReadAttribute("list-fabric-scoped")
+    ReadAudioOutputClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadTestClusterListFabricScoped() {}
+    ~ReadAudioOutputClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000002B) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPReadParams * params = [[CHIPReadParams alloc] init];
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster readAttributeListFabricScopedWithParams:params
-                                       completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                           NSLog(@"TestCluster.ListFabricScoped response %@", [value description]);
-                                           if (error != nil) {
-                                               LogNSError("TestCluster ListFabricScoped read Error", error);
-                                           }
-                                           SetCommandExitStatus(error);
-                                       }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteTestClusterListFabricScoped : public WriteAttribute {
-public:
-    WriteTestClusterListFabricScoped()
-        : WriteAttribute("list-fabric-scoped")
-        , mComplex(&mValue)
-    {
-        AddArgument("attr-name", "list-fabric-scoped");
-        AddArgument("attr-value", &mComplex);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterListFabricScoped() {}
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000002B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSArray * _Nonnull value;
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mValue) {
-                CHIPTestClusterClusterTestFabricScoped * newElement_0;
-                newElement_0 = [CHIPTestClusterClusterTestFabricScoped new];
-                newElement_0.fabricSensitiveInt8u = [NSNumber numberWithUnsignedChar:entry_0.fabricSensitiveInt8u];
-                if (entry_0.optionalFabricSensitiveInt8u.HasValue()) {
-                    newElement_0.optionalFabricSensitiveInt8u =
-                        [NSNumber numberWithUnsignedChar:entry_0.optionalFabricSensitiveInt8u.Value()];
-                } else {
-                    newElement_0.optionalFabricSensitiveInt8u = nil;
-                }
-                if (entry_0.nullableFabricSensitiveInt8u.IsNull()) {
-                    newElement_0.nullableFabricSensitiveInt8u = nil;
-                } else {
-                    newElement_0.nullableFabricSensitiveInt8u =
-                        [NSNumber numberWithUnsignedChar:entry_0.nullableFabricSensitiveInt8u.Value()];
-                }
-                if (entry_0.nullableOptionalFabricSensitiveInt8u.HasValue()) {
-                    if (entry_0.nullableOptionalFabricSensitiveInt8u.Value().IsNull()) {
-                        newElement_0.nullableOptionalFabricSensitiveInt8u = nil;
-                    } else {
-                        newElement_0.nullableOptionalFabricSensitiveInt8u =
-                            [NSNumber numberWithUnsignedChar:entry_0.nullableOptionalFabricSensitiveInt8u.Value().Value()];
-                    }
-                } else {
-                    newElement_0.nullableOptionalFabricSensitiveInt8u = nil;
-                }
-                newElement_0.fabricSensitiveCharString = [[NSString alloc] initWithBytes:entry_0.fabricSensitiveCharString.data()
-                                                                                  length:entry_0.fabricSensitiveCharString.size()
-                                                                                encoding:NSUTF8StringEncoding];
-                newElement_0.fabricSensitiveStruct = [CHIPTestClusterClusterSimpleStruct new];
-                newElement_0.fabricSensitiveStruct.a = [NSNumber numberWithUnsignedChar:entry_0.fabricSensitiveStruct.a];
-                newElement_0.fabricSensitiveStruct.b = [NSNumber numberWithBool:entry_0.fabricSensitiveStruct.b];
-                newElement_0.fabricSensitiveStruct.c =
-                    [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.fabricSensitiveStruct.c)];
-                newElement_0.fabricSensitiveStruct.d = [NSData dataWithBytes:entry_0.fabricSensitiveStruct.d.data()
-                                                                      length:entry_0.fabricSensitiveStruct.d.size()];
-                newElement_0.fabricSensitiveStruct.e = [[NSString alloc] initWithBytes:entry_0.fabricSensitiveStruct.e.data()
-                                                                                length:entry_0.fabricSensitiveStruct.e.size()
-                                                                              encoding:NSUTF8StringEncoding];
-                newElement_0.fabricSensitiveStruct.f = [NSNumber numberWithUnsignedChar:entry_0.fabricSensitiveStruct.f.Raw()];
-                newElement_0.fabricSensitiveStruct.g = [NSNumber numberWithFloat:entry_0.fabricSensitiveStruct.g];
-                newElement_0.fabricSensitiveStruct.h = [NSNumber numberWithDouble:entry_0.fabricSensitiveStruct.h];
-                { // Scope for our temporary variables
-                    auto * array_2 = [NSMutableArray new];
-                    for (auto & entry_2 : entry_0.fabricSensitiveInt8uList) {
-                        NSNumber * newElement_2;
-                        newElement_2 = [NSNumber numberWithUnsignedChar:entry_2];
-                        [array_2 addObject:newElement_2];
-                    }
-                    newElement_0.fabricSensitiveInt8uList = array_2;
-                }
-                newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
-                [array_0 addObject:newElement_0];
+        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AudioOutput.ClusterRevision response %@", [value description]);
+            if (error != nil) {
+                LogNSError("AudioOutput ClusterRevision read Error", error);
             }
-            value = array_0;
-        }
-
-        [cluster writeAttributeListFabricScopedWithValue:value
-                                                  params:params
-                                       completionHandler:^(NSError * _Nullable error) {
-                                           if (error != nil) {
-                                               LogNSError("TestCluster ListFabricScoped write Error", error);
-                                           }
-                                           SetCommandExitStatus(error);
-                                       }];
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::TestFabricScoped::Type> mValue;
-    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::TestFabricScoped::Type>>
-        mComplex;
 };
 
-class SubscribeAttributeTestClusterListFabricScoped : public SubscribeAttribute {
+class SubscribeAttributeAudioOutputClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterListFabricScoped()
-        : SubscribeAttribute("list-fabric-scoped")
+    SubscribeAttributeAudioOutputClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeTestClusterListFabricScoped() {}
+    ~SubscribeAttributeAudioOutputClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000002B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050B) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeListFabricScopedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.ListFabricScoped response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AudioOutput.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -71500,130 +68902,218 @@ class SubscribeAttributeTestClusterListFabricScoped : public SubscribeAttribute
     }
 };
 
-/*
- * Attribute TimedWriteBoolean
- */
-class ReadTestClusterTimedWriteBoolean : public ReadAttribute {
+/*----------------------------------------------------------------------------*\
+| Cluster ApplicationLauncher                                         | 0x050C |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * LaunchApp                                                         |   0x00 |
+| * StopApp                                                           |   0x01 |
+| * HideApp                                                           |   0x02 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * CatalogList                                                       | 0x0000 |
+| * CurrentApp                                                        | 0x0001 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
+/*
+ * Command LaunchApp
+ */
+class ApplicationLauncherLaunchApp : public ClusterCommand {
 public:
-    ReadTestClusterTimedWriteBoolean()
-        : ReadAttribute("timed-write-boolean")
+    ApplicationLauncherLaunchApp()
+        : ClusterCommand("launch-app")
+        , mComplex_Application(&mRequest.application)
     {
+        AddArgument("Application", &mComplex_Application);
+        AddArgument("Data", &mRequest.data);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadTestClusterTimedWriteBoolean() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000030) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeTimedWriteBooleanWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.TimedWriteBoolean response %@", [value description]);
-            if (error != nil) {
-                LogNSError("TestCluster TimedWriteBoolean read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        __auto_type * params = [[CHIPApplicationLauncherClusterLaunchAppParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.application = [CHIPApplicationLauncherClusterApplication new];
+        params.application.catalogVendorId = [NSNumber numberWithUnsignedShort:mRequest.application.catalogVendorId];
+        params.application.applicationId = [[NSString alloc] initWithBytes:mRequest.application.applicationId.data()
+                                                                    length:mRequest.application.applicationId.size()
+                                                                  encoding:NSUTF8StringEncoding];
+        if (mRequest.data.HasValue()) {
+            params.data = [NSData dataWithBytes:mRequest.data.Value().data() length:mRequest.data.Value().size()];
+        } else {
+            params.data = nil;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster launchAppWithParams:params
+                       completionHandler:^(
+                           CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable error) {
+                           NSLog(@"Values: %@", values);
+                           responsesNeeded--;
+                           if (error != nil) {
+                               mError = error;
+                               LogNSError("Error", error);
+                           }
+                           if (responsesNeeded == 0) {
+                               SetCommandExitStatus(mError);
+                           }
+                       }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::ApplicationLauncher::Commands::LaunchApp::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::ApplicationLauncher::Structs::Application::Type> mComplex_Application;
 };
 
-class WriteTestClusterTimedWriteBoolean : public WriteAttribute {
+/*
+ * Command StopApp
+ */
+class ApplicationLauncherStopApp : public ClusterCommand {
 public:
-    WriteTestClusterTimedWriteBoolean()
-        : WriteAttribute("timed-write-boolean")
+    ApplicationLauncherStopApp()
+        : ClusterCommand("stop-app")
+        , mComplex_Application(&mRequest.application)
     {
-        AddArgument("attr-name", "timed-write-boolean");
-        AddArgument("attr-value", 0, 1, &mValue);
-        WriteAttribute::AddArguments();
+        AddArgument("Application", &mComplex_Application);
+        ClusterCommand::AddArguments();
     }
 
-    ~WriteTestClusterTimedWriteBoolean() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000030) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) command (0x00000001) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
+        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        __auto_type * params = [[CHIPApplicationLauncherClusterStopAppParams alloc] init];
+        params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
-
-        [cluster writeAttributeTimedWriteBooleanWithValue:value
-                                                   params:params
-                                        completionHandler:^(NSError * _Nullable error) {
-                                            if (error != nil) {
-                                                LogNSError("TestCluster TimedWriteBoolean write Error", error);
-                                            }
-                                            SetCommandExitStatus(error);
-                                        }];
+        params.application = [CHIPApplicationLauncherClusterApplication new];
+        params.application.catalogVendorId = [NSNumber numberWithUnsignedShort:mRequest.application.catalogVendorId];
+        params.application.applicationId = [[NSString alloc] initWithBytes:mRequest.application.applicationId.data()
+                                                                    length:mRequest.application.applicationId.size()
+                                                                  encoding:NSUTF8StringEncoding];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster stopAppWithParams:params
+                     completionHandler:^(
+                         CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable error) {
+                         NSLog(@"Values: %@", values);
+                         responsesNeeded--;
+                         if (error != nil) {
+                             mError = error;
+                             LogNSError("Error", error);
+                         }
+                         if (responsesNeeded == 0) {
+                             SetCommandExitStatus(mError);
+                         }
+                     }];
+        }
         return CHIP_NO_ERROR;
     }
 
 private:
-    bool mValue;
+    chip::app::Clusters::ApplicationLauncher::Commands::StopApp::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::ApplicationLauncher::Structs::Application::Type> mComplex_Application;
 };
 
-class SubscribeAttributeTestClusterTimedWriteBoolean : public SubscribeAttribute {
+/*
+ * Command HideApp
+ */
+class ApplicationLauncherHideApp : public ClusterCommand {
 public:
-    SubscribeAttributeTestClusterTimedWriteBoolean()
-        : SubscribeAttribute("timed-write-boolean")
+    ApplicationLauncherHideApp()
+        : ClusterCommand("hide-app")
+        , mComplex_Application(&mRequest.application)
     {
+        AddArgument("Application", &mComplex_Application);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeTestClusterTimedWriteBoolean() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000030) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTimedWriteBooleanWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.TimedWriteBoolean response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) command (0x00000002) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        __auto_type * params = [[CHIPApplicationLauncherClusterHideAppParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.application = [CHIPApplicationLauncherClusterApplication new];
+        params.application.catalogVendorId = [NSNumber numberWithUnsignedShort:mRequest.application.catalogVendorId];
+        params.application.applicationId = [[NSString alloc] initWithBytes:mRequest.application.applicationId.data()
+                                                                    length:mRequest.application.applicationId.size()
+                                                                  encoding:NSUTF8StringEncoding];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster hideAppWithParams:params
+                     completionHandler:^(
+                         CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable error) {
+                         NSLog(@"Values: %@", values);
+                         responsesNeeded--;
+                         if (error != nil) {
+                             mError = error;
+                             LogNSError("Error", error);
+                         }
+                         if (responsesNeeded == 0) {
+                             SetCommandExitStatus(mError);
+                         }
+                     }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::ApplicationLauncher::Commands::HideApp::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::ApplicationLauncher::Structs::Application::Type> mComplex_Application;
 };
 
 /*
- * Attribute GeneralErrorBoolean
+ * Attribute CatalogList
  */
-class ReadTestClusterGeneralErrorBoolean : public ReadAttribute {
+class ReadApplicationLauncherCatalogList : public ReadAttribute {
 public:
-    ReadTestClusterGeneralErrorBoolean()
-        : ReadAttribute("general-error-boolean")
+    ReadApplicationLauncherCatalogList()
+        : ReadAttribute("catalog-list")
     {
     }
 
-    ~ReadTestClusterGeneralErrorBoolean() {}
+    ~ReadApplicationLauncherCatalogList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000031) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneralErrorBooleanWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.GeneralErrorBoolean response %@", [value description]);
+        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        [cluster readAttributeCatalogListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ApplicationLauncher.CatalogList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster GeneralErrorBoolean read Error", error);
+                LogNSError("ApplicationLauncher CatalogList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -71631,70 +69121,34 @@ class ReadTestClusterGeneralErrorBoolean : public ReadAttribute {
     }
 };
 
-class WriteTestClusterGeneralErrorBoolean : public WriteAttribute {
-public:
-    WriteTestClusterGeneralErrorBoolean()
-        : WriteAttribute("general-error-boolean")
-    {
-        AddArgument("attr-name", "general-error-boolean");
-        AddArgument("attr-value", 0, 1, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterGeneralErrorBoolean() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000031) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
-
-        [cluster writeAttributeGeneralErrorBooleanWithValue:value
-                                                     params:params
-                                          completionHandler:^(NSError * _Nullable error) {
-                                              if (error != nil) {
-                                                  LogNSError("TestCluster GeneralErrorBoolean write Error", error);
-                                              }
-                                              SetCommandExitStatus(error);
-                                          }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    bool mValue;
-};
-
-class SubscribeAttributeTestClusterGeneralErrorBoolean : public SubscribeAttribute {
+class SubscribeAttributeApplicationLauncherCatalogList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterGeneralErrorBoolean()
-        : SubscribeAttribute("general-error-boolean")
+    SubscribeAttributeApplicationLauncherCatalogList()
+        : SubscribeAttribute("catalog-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterGeneralErrorBoolean() {}
+    ~SubscribeAttributeApplicationLauncherCatalogList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000031) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneralErrorBooleanWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCatalogListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.GeneralErrorBoolean response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationLauncher.CatalogList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -71705,27 +69159,30 @@ class SubscribeAttributeTestClusterGeneralErrorBoolean : public SubscribeAttribu
 };
 
 /*
- * Attribute ClusterErrorBoolean
+ * Attribute CurrentApp
  */
-class ReadTestClusterClusterErrorBoolean : public ReadAttribute {
+class ReadApplicationLauncherCurrentApp : public ReadAttribute {
 public:
-    ReadTestClusterClusterErrorBoolean()
-        : ReadAttribute("cluster-error-boolean")
+    ReadApplicationLauncherCurrentApp()
+        : ReadAttribute("current-app")
     {
     }
 
-    ~ReadTestClusterClusterErrorBoolean() {}
+    ~ReadApplicationLauncherCurrentApp() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000032) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClusterErrorBooleanWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.ClusterErrorBoolean response %@", [value description]);
+        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        [cluster readAttributeCurrentAppWithCompletionHandler:^(
+            CHIPApplicationLauncherClusterApplicationEP * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ApplicationLauncher.CurrentApp response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster ClusterErrorBoolean read Error", error);
+                LogNSError("ApplicationLauncher CurrentApp read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -71733,70 +69190,92 @@ class ReadTestClusterClusterErrorBoolean : public ReadAttribute {
     }
 };
 
-class WriteTestClusterClusterErrorBoolean : public WriteAttribute {
+class WriteApplicationLauncherCurrentApp : public WriteAttribute {
 public:
-    WriteTestClusterClusterErrorBoolean()
-        : WriteAttribute("cluster-error-boolean")
+    WriteApplicationLauncherCurrentApp()
+        : WriteAttribute("current-app")
+        , mComplex(&mValue)
     {
-        AddArgument("attr-name", "cluster-error-boolean");
-        AddArgument("attr-value", 0, 1, &mValue);
+        AddArgument("attr-name", "current-app");
+        AddArgument("attr-value", &mComplex);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteTestClusterClusterErrorBoolean() {}
+    ~WriteApplicationLauncherCurrentApp() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000032) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) WriteAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
+        CHIPApplicationLauncherClusterApplicationEP * _Nullable value;
+        if (mValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [CHIPApplicationLauncherClusterApplicationEP new];
+            value.application = [CHIPApplicationLauncherClusterApplication new];
+            value.application.catalogVendorId = [NSNumber numberWithUnsignedShort:mValue.Value().application.catalogVendorId];
+            value.application.applicationId = [[NSString alloc] initWithBytes:mValue.Value().application.applicationId.data()
+                                                                       length:mValue.Value().application.applicationId.size()
+                                                                     encoding:NSUTF8StringEncoding];
+            if (mValue.Value().endpoint.HasValue()) {
+                value.endpoint = [NSNumber numberWithUnsignedShort:mValue.Value().endpoint.Value()];
+            } else {
+                value.endpoint = nil;
+            }
+        }
 
-        [cluster writeAttributeClusterErrorBooleanWithValue:value
-                                                     params:params
-                                          completionHandler:^(NSError * _Nullable error) {
-                                              if (error != nil) {
-                                                  LogNSError("TestCluster ClusterErrorBoolean write Error", error);
-                                              }
-                                              SetCommandExitStatus(error);
-                                          }];
+        [cluster writeAttributeCurrentAppWithValue:value
+                                            params:params
+                                 completionHandler:^(NSError * _Nullable error) {
+                                     if (error != nil) {
+                                         LogNSError("ApplicationLauncher CurrentApp write Error", error);
+                                     }
+                                     SetCommandExitStatus(error);
+                                 }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    bool mValue;
+    chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::Type> mValue;
+    TypedComplexArgument<chip::app::DataModel::Nullable<chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::Type>>
+        mComplex;
 };
 
-class SubscribeAttributeTestClusterClusterErrorBoolean : public SubscribeAttribute {
+class SubscribeAttributeApplicationLauncherCurrentApp : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterClusterErrorBoolean()
-        : SubscribeAttribute("cluster-error-boolean")
+    SubscribeAttributeApplicationLauncherCurrentApp()
+        : SubscribeAttribute("current-app")
     {
     }
 
-    ~SubscribeAttributeTestClusterClusterErrorBoolean() {}
+    ~SubscribeAttributeApplicationLauncherCurrentApp() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000032) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterErrorBooleanWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCurrentAppWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.ClusterErrorBoolean response %@", [value description]);
+            reportHandler:^(CHIPApplicationLauncherClusterApplicationEP * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationLauncher.CurrentApp response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -71807,27 +69286,29 @@ class SubscribeAttributeTestClusterClusterErrorBoolean : public SubscribeAttribu
 };
 
 /*
- * Attribute Unsupported
+ * Attribute GeneratedCommandList
  */
-class ReadTestClusterUnsupported : public ReadAttribute {
+class ReadApplicationLauncherGeneratedCommandList : public ReadAttribute {
 public:
-    ReadTestClusterUnsupported()
-        : ReadAttribute("unsupported")
+    ReadApplicationLauncherGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadTestClusterUnsupported() {}
+    ~ReadApplicationLauncherGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x000000FF) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeUnsupportedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.Unsupported response %@", [value description]);
+        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ApplicationLauncher.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster Unsupported read Error", error);
+                LogNSError("ApplicationLauncher GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -71835,70 +69316,34 @@ class ReadTestClusterUnsupported : public ReadAttribute {
     }
 };
 
-class WriteTestClusterUnsupported : public WriteAttribute {
-public:
-    WriteTestClusterUnsupported()
-        : WriteAttribute("unsupported")
-    {
-        AddArgument("attr-name", "unsupported");
-        AddArgument("attr-value", 0, 1, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterUnsupported() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x000000FF) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
-
-        [cluster writeAttributeUnsupportedWithValue:value
-                                             params:params
-                                  completionHandler:^(NSError * _Nullable error) {
-                                      if (error != nil) {
-                                          LogNSError("TestCluster Unsupported write Error", error);
-                                      }
-                                      SetCommandExitStatus(error);
-                                  }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    bool mValue;
-};
-
-class SubscribeAttributeTestClusterUnsupported : public SubscribeAttribute {
+class SubscribeAttributeApplicationLauncherGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterUnsupported()
-        : SubscribeAttribute("unsupported")
+    SubscribeAttributeApplicationLauncherGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterUnsupported() {}
+    ~SubscribeAttributeApplicationLauncherGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x000000FF) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeUnsupportedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.Unsupported response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationLauncher.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -71909,27 +69354,29 @@ class SubscribeAttributeTestClusterUnsupported : public SubscribeAttribute {
 };
 
 /*
- * Attribute NullableBoolean
+ * Attribute AcceptedCommandList
  */
-class ReadTestClusterNullableBoolean : public ReadAttribute {
+class ReadApplicationLauncherAcceptedCommandList : public ReadAttribute {
 public:
-    ReadTestClusterNullableBoolean()
-        : ReadAttribute("nullable-boolean")
+    ReadApplicationLauncherAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadTestClusterNullableBoolean() {}
+    ~ReadApplicationLauncherAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableBooleanWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableBoolean response %@", [value description]);
+        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ApplicationLauncher.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableBoolean read Error", error);
+                LogNSError("ApplicationLauncher AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -71937,70 +69384,34 @@ class ReadTestClusterNullableBoolean : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableBoolean : public WriteAttribute {
+class SubscribeAttributeApplicationLauncherAcceptedCommandList : public SubscribeAttribute {
 public:
-    WriteTestClusterNullableBoolean()
-        : WriteAttribute("nullable-boolean")
+    SubscribeAttributeApplicationLauncherAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
-        AddArgument("attr-name", "nullable-boolean");
-        AddArgument("attr-value", 0, 1, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteTestClusterNullableBoolean() {}
+    ~SubscribeAttributeApplicationLauncherAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithBool:mValue];
-
-        [cluster writeAttributeNullableBooleanWithValue:value
-                                                 params:params
-                                      completionHandler:^(NSError * _Nullable error) {
-                                          if (error != nil) {
-                                              LogNSError("TestCluster NullableBoolean write Error", error);
-                                          }
-                                          SetCommandExitStatus(error);
-                                      }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    bool mValue;
-};
-
-class SubscribeAttributeTestClusterNullableBoolean : public SubscribeAttribute {
-public:
-    SubscribeAttributeTestClusterNullableBoolean()
-        : SubscribeAttribute("nullable-boolean")
-    {
-    }
-
-    ~SubscribeAttributeTestClusterNullableBoolean() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004000) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableBooleanWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableBoolean response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationLauncher.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -72011,27 +69422,29 @@ class SubscribeAttributeTestClusterNullableBoolean : public SubscribeAttribute {
 };
 
 /*
- * Attribute NullableBitmap8
+ * Attribute AttributeList
  */
-class ReadTestClusterNullableBitmap8 : public ReadAttribute {
+class ReadApplicationLauncherAttributeList : public ReadAttribute {
 public:
-    ReadTestClusterNullableBitmap8()
-        : ReadAttribute("nullable-bitmap8")
+    ReadApplicationLauncherAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadTestClusterNullableBitmap8() {}
+    ~ReadApplicationLauncherAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableBitmap8WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableBitmap8 response %@", [value description]);
+        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ApplicationLauncher.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableBitmap8 read Error", error);
+                LogNSError("ApplicationLauncher AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -72039,70 +69452,34 @@ class ReadTestClusterNullableBitmap8 : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableBitmap8 : public WriteAttribute {
-public:
-    WriteTestClusterNullableBitmap8()
-        : WriteAttribute("nullable-bitmap8")
-    {
-        AddArgument("attr-name", "nullable-bitmap8");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableBitmap8() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004001) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeNullableBitmap8WithValue:value
-                                                 params:params
-                                      completionHandler:^(NSError * _Nullable error) {
-                                          if (error != nil) {
-                                              LogNSError("TestCluster NullableBitmap8 write Error", error);
-                                          }
-                                          SetCommandExitStatus(error);
-                                      }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeTestClusterNullableBitmap8 : public SubscribeAttribute {
+class SubscribeAttributeApplicationLauncherAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableBitmap8()
-        : SubscribeAttribute("nullable-bitmap8")
+    SubscribeAttributeApplicationLauncherAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableBitmap8() {}
+    ~SubscribeAttributeApplicationLauncherAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableBitmap8WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableBitmap8 response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationLauncher.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -72113,27 +69490,29 @@ class SubscribeAttributeTestClusterNullableBitmap8 : public SubscribeAttribute {
 };
 
 /*
- * Attribute NullableBitmap16
+ * Attribute FeatureMap
  */
-class ReadTestClusterNullableBitmap16 : public ReadAttribute {
+class ReadApplicationLauncherFeatureMap : public ReadAttribute {
 public:
-    ReadTestClusterNullableBitmap16()
-        : ReadAttribute("nullable-bitmap16")
+    ReadApplicationLauncherFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadTestClusterNullableBitmap16() {}
+    ~ReadApplicationLauncherFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableBitmap16WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableBitmap16 response %@", [value description]);
+        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ApplicationLauncher.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableBitmap16 read Error", error);
+                LogNSError("ApplicationLauncher FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -72141,70 +69520,34 @@ class ReadTestClusterNullableBitmap16 : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableBitmap16 : public WriteAttribute {
-public:
-    WriteTestClusterNullableBitmap16()
-        : WriteAttribute("nullable-bitmap16")
-    {
-        AddArgument("attr-name", "nullable-bitmap16");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableBitmap16() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004002) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeNullableBitmap16WithValue:value
-                                                  params:params
-                                       completionHandler:^(NSError * _Nullable error) {
-                                           if (error != nil) {
-                                               LogNSError("TestCluster NullableBitmap16 write Error", error);
-                                           }
-                                           SetCommandExitStatus(error);
-                                       }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeTestClusterNullableBitmap16 : public SubscribeAttribute {
+class SubscribeAttributeApplicationLauncherFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableBitmap16()
-        : SubscribeAttribute("nullable-bitmap16")
+    SubscribeAttributeApplicationLauncherFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableBitmap16() {}
+    ~SubscribeAttributeApplicationLauncherFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableBitmap16WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableBitmap16 response %@", [value description]);
+                NSLog(@"ApplicationLauncher.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -72215,27 +69558,29 @@ class SubscribeAttributeTestClusterNullableBitmap16 : public SubscribeAttribute
 };
 
 /*
- * Attribute NullableBitmap32
+ * Attribute ClusterRevision
  */
-class ReadTestClusterNullableBitmap32 : public ReadAttribute {
+class ReadApplicationLauncherClusterRevision : public ReadAttribute {
 public:
-    ReadTestClusterNullableBitmap32()
-        : ReadAttribute("nullable-bitmap32")
+    ReadApplicationLauncherClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadTestClusterNullableBitmap32() {}
+    ~ReadApplicationLauncherClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableBitmap32WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableBitmap32 response %@", [value description]);
+        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ApplicationLauncher.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableBitmap32 read Error", error);
+                LogNSError("ApplicationLauncher ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -72243,70 +69588,34 @@ class ReadTestClusterNullableBitmap32 : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableBitmap32 : public WriteAttribute {
-public:
-    WriteTestClusterNullableBitmap32()
-        : WriteAttribute("nullable-bitmap32")
-    {
-        AddArgument("attr-name", "nullable-bitmap32");
-        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableBitmap32() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004003) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedInt:mValue];
-
-        [cluster writeAttributeNullableBitmap32WithValue:value
-                                                  params:params
-                                       completionHandler:^(NSError * _Nullable error) {
-                                           if (error != nil) {
-                                               LogNSError("TestCluster NullableBitmap32 write Error", error);
-                                           }
-                                           SetCommandExitStatus(error);
-                                       }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint32_t mValue;
-};
-
-class SubscribeAttributeTestClusterNullableBitmap32 : public SubscribeAttribute {
+class SubscribeAttributeApplicationLauncherClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableBitmap32()
-        : SubscribeAttribute("nullable-bitmap32")
+    SubscribeAttributeApplicationLauncherClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableBitmap32() {}
+    ~SubscribeAttributeApplicationLauncherClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050C) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPApplicationLauncher * cluster = [[CHIPApplicationLauncher alloc] initWithDevice:device
+                                                                                   endpoint:endpointId
+                                                                                      queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableBitmap32WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableBitmap32 response %@", [value description]);
+                NSLog(@"ApplicationLauncher.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -72316,28 +69625,53 @@ class SubscribeAttributeTestClusterNullableBitmap32 : public SubscribeAttribute
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster ApplicationBasic                                            | 0x050D |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * VendorName                                                        | 0x0000 |
+| * VendorID                                                          | 0x0001 |
+| * ApplicationName                                                   | 0x0002 |
+| * ProductID                                                         | 0x0003 |
+| * Application                                                       | 0x0004 |
+| * Status                                                            | 0x0005 |
+| * ApplicationVersion                                                | 0x0006 |
+| * AllowedVendorList                                                 | 0x0007 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute NullableBitmap64
+ * Attribute VendorName
  */
-class ReadTestClusterNullableBitmap64 : public ReadAttribute {
+class ReadApplicationBasicVendorName : public ReadAttribute {
 public:
-    ReadTestClusterNullableBitmap64()
-        : ReadAttribute("nullable-bitmap64")
+    ReadApplicationBasicVendorName()
+        : ReadAttribute("vendor-name")
     {
     }
 
-    ~ReadTestClusterNullableBitmap64() {}
+    ~ReadApplicationBasicVendorName() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableBitmap64WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableBitmap64 response %@", [value description]);
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeVendorNameWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ApplicationBasic.VendorName response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableBitmap64 read Error", error);
+                LogNSError("ApplicationBasic VendorName read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -72345,70 +69679,34 @@ class ReadTestClusterNullableBitmap64 : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableBitmap64 : public WriteAttribute {
-public:
-    WriteTestClusterNullableBitmap64()
-        : WriteAttribute("nullable-bitmap64")
-    {
-        AddArgument("attr-name", "nullable-bitmap64");
-        AddArgument("attr-value", 0, UINT64_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableBitmap64() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004004) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedLongLong:mValue];
-
-        [cluster writeAttributeNullableBitmap64WithValue:value
-                                                  params:params
-                                       completionHandler:^(NSError * _Nullable error) {
-                                           if (error != nil) {
-                                               LogNSError("TestCluster NullableBitmap64 write Error", error);
-                                           }
-                                           SetCommandExitStatus(error);
-                                       }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint64_t mValue;
-};
-
-class SubscribeAttributeTestClusterNullableBitmap64 : public SubscribeAttribute {
+class SubscribeAttributeApplicationBasicVendorName : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableBitmap64()
-        : SubscribeAttribute("nullable-bitmap64")
+    SubscribeAttributeApplicationBasicVendorName()
+        : SubscribeAttribute("vendor-name")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableBitmap64() {}
+    ~SubscribeAttributeApplicationBasicVendorName() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableBitmap64WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeVendorNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableBitmap64 response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationBasic.VendorName response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -72419,27 +69717,29 @@ class SubscribeAttributeTestClusterNullableBitmap64 : public SubscribeAttribute
 };
 
 /*
- * Attribute NullableInt8u
+ * Attribute VendorID
  */
-class ReadTestClusterNullableInt8u : public ReadAttribute {
+class ReadApplicationBasicVendorID : public ReadAttribute {
 public:
-    ReadTestClusterNullableInt8u()
-        : ReadAttribute("nullable-int8u")
+    ReadApplicationBasicVendorID()
+        : ReadAttribute("vendor-id")
     {
     }
 
-    ~ReadTestClusterNullableInt8u() {}
+    ~ReadApplicationBasicVendorID() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableInt8uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableInt8u response %@", [value description]);
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeVendorIDWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ApplicationBasic.VendorID response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableInt8u read Error", error);
+                LogNSError("ApplicationBasic VendorID read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -72447,70 +69747,34 @@ class ReadTestClusterNullableInt8u : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableInt8u : public WriteAttribute {
-public:
-    WriteTestClusterNullableInt8u()
-        : WriteAttribute("nullable-int8u")
-    {
-        AddArgument("attr-name", "nullable-int8u");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableInt8u() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004005) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeNullableInt8uWithValue:value
-                                               params:params
-                                    completionHandler:^(NSError * _Nullable error) {
-                                        if (error != nil) {
-                                            LogNSError("TestCluster NullableInt8u write Error", error);
-                                        }
-                                        SetCommandExitStatus(error);
-                                    }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeTestClusterNullableInt8u : public SubscribeAttribute {
+class SubscribeAttributeApplicationBasicVendorID : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableInt8u()
-        : SubscribeAttribute("nullable-int8u")
+    SubscribeAttributeApplicationBasicVendorID()
+        : SubscribeAttribute("vendor-id")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableInt8u() {}
+    ~SubscribeAttributeApplicationBasicVendorID() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableInt8uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeVendorIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableInt8u response %@", [value description]);
+                NSLog(@"ApplicationBasic.VendorID response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -72521,27 +69785,29 @@ class SubscribeAttributeTestClusterNullableInt8u : public SubscribeAttribute {
 };
 
 /*
- * Attribute NullableInt16u
+ * Attribute ApplicationName
  */
-class ReadTestClusterNullableInt16u : public ReadAttribute {
+class ReadApplicationBasicApplicationName : public ReadAttribute {
 public:
-    ReadTestClusterNullableInt16u()
-        : ReadAttribute("nullable-int16u")
+    ReadApplicationBasicApplicationName()
+        : ReadAttribute("application-name")
     {
     }
 
-    ~ReadTestClusterNullableInt16u() {}
+    ~ReadApplicationBasicApplicationName() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableInt16uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableInt16u response %@", [value description]);
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeApplicationNameWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ApplicationBasic.ApplicationName response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableInt16u read Error", error);
+                LogNSError("ApplicationBasic ApplicationName read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -72549,70 +69815,34 @@ class ReadTestClusterNullableInt16u : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableInt16u : public WriteAttribute {
+class SubscribeAttributeApplicationBasicApplicationName : public SubscribeAttribute {
 public:
-    WriteTestClusterNullableInt16u()
-        : WriteAttribute("nullable-int16u")
+    SubscribeAttributeApplicationBasicApplicationName()
+        : SubscribeAttribute("application-name")
     {
-        AddArgument("attr-name", "nullable-int16u");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteTestClusterNullableInt16u() {}
+    ~SubscribeAttributeApplicationBasicApplicationName() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeNullableInt16uWithValue:value
-                                                params:params
-                                     completionHandler:^(NSError * _Nullable error) {
-                                         if (error != nil) {
-                                             LogNSError("TestCluster NullableInt16u write Error", error);
-                                         }
-                                         SetCommandExitStatus(error);
-                                     }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeTestClusterNullableInt16u : public SubscribeAttribute {
-public:
-    SubscribeAttributeTestClusterNullableInt16u()
-        : SubscribeAttribute("nullable-int16u")
-    {
-    }
-
-    ~SubscribeAttributeTestClusterNullableInt16u() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004006) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableInt16uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeApplicationNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableInt16u response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationBasic.ApplicationName response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -72623,27 +69853,29 @@ class SubscribeAttributeTestClusterNullableInt16u : public SubscribeAttribute {
 };
 
 /*
- * Attribute NullableInt24u
+ * Attribute ProductID
  */
-class ReadTestClusterNullableInt24u : public ReadAttribute {
+class ReadApplicationBasicProductID : public ReadAttribute {
 public:
-    ReadTestClusterNullableInt24u()
-        : ReadAttribute("nullable-int24u")
+    ReadApplicationBasicProductID()
+        : ReadAttribute("product-id")
     {
     }
 
-    ~ReadTestClusterNullableInt24u() {}
+    ~ReadApplicationBasicProductID() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableInt24uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableInt24u response %@", [value description]);
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeProductIDWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ApplicationBasic.ProductID response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableInt24u read Error", error);
+                LogNSError("ApplicationBasic ProductID read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -72651,70 +69883,34 @@ class ReadTestClusterNullableInt24u : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableInt24u : public WriteAttribute {
-public:
-    WriteTestClusterNullableInt24u()
-        : WriteAttribute("nullable-int24u")
-    {
-        AddArgument("attr-name", "nullable-int24u");
-        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableInt24u() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004007) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedInt:mValue];
-
-        [cluster writeAttributeNullableInt24uWithValue:value
-                                                params:params
-                                     completionHandler:^(NSError * _Nullable error) {
-                                         if (error != nil) {
-                                             LogNSError("TestCluster NullableInt24u write Error", error);
-                                         }
-                                         SetCommandExitStatus(error);
-                                     }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint32_t mValue;
-};
-
-class SubscribeAttributeTestClusterNullableInt24u : public SubscribeAttribute {
+class SubscribeAttributeApplicationBasicProductID : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableInt24u()
-        : SubscribeAttribute("nullable-int24u")
+    SubscribeAttributeApplicationBasicProductID()
+        : SubscribeAttribute("product-id")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableInt24u() {}
+    ~SubscribeAttributeApplicationBasicProductID() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableInt24uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeProductIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableInt24u response %@", [value description]);
+                NSLog(@"ApplicationBasic.ProductID response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -72725,27 +69921,30 @@ class SubscribeAttributeTestClusterNullableInt24u : public SubscribeAttribute {
 };
 
 /*
- * Attribute NullableInt32u
+ * Attribute Application
  */
-class ReadTestClusterNullableInt32u : public ReadAttribute {
+class ReadApplicationBasicApplication : public ReadAttribute {
 public:
-    ReadTestClusterNullableInt32u()
-        : ReadAttribute("nullable-int32u")
+    ReadApplicationBasicApplication()
+        : ReadAttribute("application")
     {
     }
 
-    ~ReadTestClusterNullableInt32u() {}
+    ~ReadApplicationBasicApplication() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableInt32uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableInt32u response %@", [value description]);
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeApplicationWithCompletionHandler:^(
+            CHIPApplicationBasicClusterApplicationBasicApplication * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ApplicationBasic.Application response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableInt32u read Error", error);
+                LogNSError("ApplicationBasic Application read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -72753,70 +69952,34 @@ class ReadTestClusterNullableInt32u : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableInt32u : public WriteAttribute {
-public:
-    WriteTestClusterNullableInt32u()
-        : WriteAttribute("nullable-int32u")
-    {
-        AddArgument("attr-name", "nullable-int32u");
-        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableInt32u() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004008) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedInt:mValue];
-
-        [cluster writeAttributeNullableInt32uWithValue:value
-                                                params:params
-                                     completionHandler:^(NSError * _Nullable error) {
-                                         if (error != nil) {
-                                             LogNSError("TestCluster NullableInt32u write Error", error);
-                                         }
-                                         SetCommandExitStatus(error);
-                                     }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint32_t mValue;
-};
-
-class SubscribeAttributeTestClusterNullableInt32u : public SubscribeAttribute {
+class SubscribeAttributeApplicationBasicApplication : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableInt32u()
-        : SubscribeAttribute("nullable-int32u")
+    SubscribeAttributeApplicationBasicApplication()
+        : SubscribeAttribute("application")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableInt32u() {}
+    ~SubscribeAttributeApplicationBasicApplication() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableInt32uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeApplicationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableInt32u response %@", [value description]);
+            reportHandler:^(CHIPApplicationBasicClusterApplicationBasicApplication * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationBasic.Application response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -72827,27 +69990,29 @@ class SubscribeAttributeTestClusterNullableInt32u : public SubscribeAttribute {
 };
 
 /*
- * Attribute NullableInt40u
+ * Attribute Status
  */
-class ReadTestClusterNullableInt40u : public ReadAttribute {
+class ReadApplicationBasicStatus : public ReadAttribute {
 public:
-    ReadTestClusterNullableInt40u()
-        : ReadAttribute("nullable-int40u")
+    ReadApplicationBasicStatus()
+        : ReadAttribute("status")
     {
     }
 
-    ~ReadTestClusterNullableInt40u() {}
+    ~ReadApplicationBasicStatus() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableInt40uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableInt40u response %@", [value description]);
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ApplicationBasic.Status response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableInt40u read Error", error);
+                LogNSError("ApplicationBasic Status read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -72855,70 +70020,34 @@ class ReadTestClusterNullableInt40u : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableInt40u : public WriteAttribute {
-public:
-    WriteTestClusterNullableInt40u()
-        : WriteAttribute("nullable-int40u")
-    {
-        AddArgument("attr-name", "nullable-int40u");
-        AddArgument("attr-value", 0, UINT64_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableInt40u() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004009) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedLongLong:mValue];
-
-        [cluster writeAttributeNullableInt40uWithValue:value
-                                                params:params
-                                     completionHandler:^(NSError * _Nullable error) {
-                                         if (error != nil) {
-                                             LogNSError("TestCluster NullableInt40u write Error", error);
-                                         }
-                                         SetCommandExitStatus(error);
-                                     }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint64_t mValue;
-};
-
-class SubscribeAttributeTestClusterNullableInt40u : public SubscribeAttribute {
+class SubscribeAttributeApplicationBasicStatus : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableInt40u()
-        : SubscribeAttribute("nullable-int40u")
+    SubscribeAttributeApplicationBasicStatus()
+        : SubscribeAttribute("status")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableInt40u() {}
+    ~SubscribeAttributeApplicationBasicStatus() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x00000005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableInt40uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableInt40u response %@", [value description]);
+                NSLog(@"ApplicationBasic.Status response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -72929,27 +70058,29 @@ class SubscribeAttributeTestClusterNullableInt40u : public SubscribeAttribute {
 };
 
 /*
- * Attribute NullableInt48u
+ * Attribute ApplicationVersion
  */
-class ReadTestClusterNullableInt48u : public ReadAttribute {
+class ReadApplicationBasicApplicationVersion : public ReadAttribute {
 public:
-    ReadTestClusterNullableInt48u()
-        : ReadAttribute("nullable-int48u")
+    ReadApplicationBasicApplicationVersion()
+        : ReadAttribute("application-version")
     {
     }
 
-    ~ReadTestClusterNullableInt48u() {}
+    ~ReadApplicationBasicApplicationVersion() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000400A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x00000006) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableInt48uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableInt48u response %@", [value description]);
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeApplicationVersionWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ApplicationBasic.ApplicationVersion response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableInt48u read Error", error);
+                LogNSError("ApplicationBasic ApplicationVersion read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -72957,70 +70088,34 @@ class ReadTestClusterNullableInt48u : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableInt48u : public WriteAttribute {
-public:
-    WriteTestClusterNullableInt48u()
-        : WriteAttribute("nullable-int48u")
-    {
-        AddArgument("attr-name", "nullable-int48u");
-        AddArgument("attr-value", 0, UINT64_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableInt48u() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000400A) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedLongLong:mValue];
-
-        [cluster writeAttributeNullableInt48uWithValue:value
-                                                params:params
-                                     completionHandler:^(NSError * _Nullable error) {
-                                         if (error != nil) {
-                                             LogNSError("TestCluster NullableInt48u write Error", error);
-                                         }
-                                         SetCommandExitStatus(error);
-                                     }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint64_t mValue;
-};
-
-class SubscribeAttributeTestClusterNullableInt48u : public SubscribeAttribute {
+class SubscribeAttributeApplicationBasicApplicationVersion : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableInt48u()
-        : SubscribeAttribute("nullable-int48u")
+    SubscribeAttributeApplicationBasicApplicationVersion()
+        : SubscribeAttribute("application-version")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableInt48u() {}
+    ~SubscribeAttributeApplicationBasicApplicationVersion() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000400A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x00000006) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableInt48uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeApplicationVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableInt48u response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationBasic.ApplicationVersion response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -73031,27 +70126,29 @@ class SubscribeAttributeTestClusterNullableInt48u : public SubscribeAttribute {
 };
 
 /*
- * Attribute NullableInt56u
+ * Attribute AllowedVendorList
  */
-class ReadTestClusterNullableInt56u : public ReadAttribute {
+class ReadApplicationBasicAllowedVendorList : public ReadAttribute {
 public:
-    ReadTestClusterNullableInt56u()
-        : ReadAttribute("nullable-int56u")
+    ReadApplicationBasicAllowedVendorList()
+        : ReadAttribute("allowed-vendor-list")
     {
     }
 
-    ~ReadTestClusterNullableInt56u() {}
+    ~ReadApplicationBasicAllowedVendorList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000400B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x00000007) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableInt56uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableInt56u response %@", [value description]);
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeAllowedVendorListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ApplicationBasic.AllowedVendorList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableInt56u read Error", error);
+                LogNSError("ApplicationBasic AllowedVendorList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -73059,70 +70156,34 @@ class ReadTestClusterNullableInt56u : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableInt56u : public WriteAttribute {
-public:
-    WriteTestClusterNullableInt56u()
-        : WriteAttribute("nullable-int56u")
-    {
-        AddArgument("attr-name", "nullable-int56u");
-        AddArgument("attr-value", 0, UINT64_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableInt56u() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000400B) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedLongLong:mValue];
-
-        [cluster writeAttributeNullableInt56uWithValue:value
-                                                params:params
-                                     completionHandler:^(NSError * _Nullable error) {
-                                         if (error != nil) {
-                                             LogNSError("TestCluster NullableInt56u write Error", error);
-                                         }
-                                         SetCommandExitStatus(error);
-                                     }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint64_t mValue;
-};
-
-class SubscribeAttributeTestClusterNullableInt56u : public SubscribeAttribute {
+class SubscribeAttributeApplicationBasicAllowedVendorList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableInt56u()
-        : SubscribeAttribute("nullable-int56u")
+    SubscribeAttributeApplicationBasicAllowedVendorList()
+        : SubscribeAttribute("allowed-vendor-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableInt56u() {}
+    ~SubscribeAttributeApplicationBasicAllowedVendorList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000400B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x00000007) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableInt56uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAllowedVendorListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableInt56u response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationBasic.AllowedVendorList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -73133,27 +70194,29 @@ class SubscribeAttributeTestClusterNullableInt56u : public SubscribeAttribute {
 };
 
 /*
- * Attribute NullableInt64u
+ * Attribute GeneratedCommandList
  */
-class ReadTestClusterNullableInt64u : public ReadAttribute {
+class ReadApplicationBasicGeneratedCommandList : public ReadAttribute {
 public:
-    ReadTestClusterNullableInt64u()
-        : ReadAttribute("nullable-int64u")
+    ReadApplicationBasicGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadTestClusterNullableInt64u() {}
+    ~ReadApplicationBasicGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000400C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableInt64uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableInt64u response %@", [value description]);
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ApplicationBasic.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableInt64u read Error", error);
+                LogNSError("ApplicationBasic GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -73161,70 +70224,34 @@ class ReadTestClusterNullableInt64u : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableInt64u : public WriteAttribute {
-public:
-    WriteTestClusterNullableInt64u()
-        : WriteAttribute("nullable-int64u")
-    {
-        AddArgument("attr-name", "nullable-int64u");
-        AddArgument("attr-value", 0, UINT64_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableInt64u() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000400C) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedLongLong:mValue];
-
-        [cluster writeAttributeNullableInt64uWithValue:value
-                                                params:params
-                                     completionHandler:^(NSError * _Nullable error) {
-                                         if (error != nil) {
-                                             LogNSError("TestCluster NullableInt64u write Error", error);
-                                         }
-                                         SetCommandExitStatus(error);
-                                     }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint64_t mValue;
-};
-
-class SubscribeAttributeTestClusterNullableInt64u : public SubscribeAttribute {
+class SubscribeAttributeApplicationBasicGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableInt64u()
-        : SubscribeAttribute("nullable-int64u")
+    SubscribeAttributeApplicationBasicGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableInt64u() {}
+    ~SubscribeAttributeApplicationBasicGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000400C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableInt64uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableInt64u response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationBasic.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -73235,27 +70262,29 @@ class SubscribeAttributeTestClusterNullableInt64u : public SubscribeAttribute {
 };
 
 /*
- * Attribute NullableInt8s
+ * Attribute AcceptedCommandList
  */
-class ReadTestClusterNullableInt8s : public ReadAttribute {
+class ReadApplicationBasicAcceptedCommandList : public ReadAttribute {
 public:
-    ReadTestClusterNullableInt8s()
-        : ReadAttribute("nullable-int8s")
+    ReadApplicationBasicAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadTestClusterNullableInt8s() {}
+    ~ReadApplicationBasicAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000400D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableInt8sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableInt8s response %@", [value description]);
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ApplicationBasic.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableInt8s read Error", error);
+                LogNSError("ApplicationBasic AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -73263,70 +70292,34 @@ class ReadTestClusterNullableInt8s : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableInt8s : public WriteAttribute {
-public:
-    WriteTestClusterNullableInt8s()
-        : WriteAttribute("nullable-int8s")
-    {
-        AddArgument("attr-name", "nullable-int8s");
-        AddArgument("attr-value", INT8_MIN, INT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableInt8s() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000400D) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithChar:mValue];
-
-        [cluster writeAttributeNullableInt8sWithValue:value
-                                               params:params
-                                    completionHandler:^(NSError * _Nullable error) {
-                                        if (error != nil) {
-                                            LogNSError("TestCluster NullableInt8s write Error", error);
-                                        }
-                                        SetCommandExitStatus(error);
-                                    }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    int8_t mValue;
-};
-
-class SubscribeAttributeTestClusterNullableInt8s : public SubscribeAttribute {
+class SubscribeAttributeApplicationBasicAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableInt8s()
-        : SubscribeAttribute("nullable-int8s")
+    SubscribeAttributeApplicationBasicAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableInt8s() {}
+    ~SubscribeAttributeApplicationBasicAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000400D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableInt8sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableInt8s response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationBasic.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -73337,27 +70330,29 @@ class SubscribeAttributeTestClusterNullableInt8s : public SubscribeAttribute {
 };
 
 /*
- * Attribute NullableInt16s
+ * Attribute AttributeList
  */
-class ReadTestClusterNullableInt16s : public ReadAttribute {
+class ReadApplicationBasicAttributeList : public ReadAttribute {
 public:
-    ReadTestClusterNullableInt16s()
-        : ReadAttribute("nullable-int16s")
+    ReadApplicationBasicAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadTestClusterNullableInt16s() {}
+    ~ReadApplicationBasicAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000400E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableInt16sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableInt16s response %@", [value description]);
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ApplicationBasic.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableInt16s read Error", error);
+                LogNSError("ApplicationBasic AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -73365,70 +70360,34 @@ class ReadTestClusterNullableInt16s : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableInt16s : public WriteAttribute {
-public:
-    WriteTestClusterNullableInt16s()
-        : WriteAttribute("nullable-int16s")
-    {
-        AddArgument("attr-name", "nullable-int16s");
-        AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableInt16s() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000400E) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithShort:mValue];
-
-        [cluster writeAttributeNullableInt16sWithValue:value
-                                                params:params
-                                     completionHandler:^(NSError * _Nullable error) {
-                                         if (error != nil) {
-                                             LogNSError("TestCluster NullableInt16s write Error", error);
-                                         }
-                                         SetCommandExitStatus(error);
-                                     }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    int16_t mValue;
-};
-
-class SubscribeAttributeTestClusterNullableInt16s : public SubscribeAttribute {
+class SubscribeAttributeApplicationBasicAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableInt16s()
-        : SubscribeAttribute("nullable-int16s")
+    SubscribeAttributeApplicationBasicAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableInt16s() {}
+    ~SubscribeAttributeApplicationBasicAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000400E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableInt16sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableInt16s response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ApplicationBasic.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -73439,27 +70398,29 @@ class SubscribeAttributeTestClusterNullableInt16s : public SubscribeAttribute {
 };
 
 /*
- * Attribute NullableInt24s
+ * Attribute FeatureMap
  */
-class ReadTestClusterNullableInt24s : public ReadAttribute {
+class ReadApplicationBasicFeatureMap : public ReadAttribute {
 public:
-    ReadTestClusterNullableInt24s()
-        : ReadAttribute("nullable-int24s")
+    ReadApplicationBasicFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadTestClusterNullableInt24s() {}
+    ~ReadApplicationBasicFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000400F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableInt24sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableInt24s response %@", [value description]);
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ApplicationBasic.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableInt24s read Error", error);
+                LogNSError("ApplicationBasic FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -73467,70 +70428,34 @@ class ReadTestClusterNullableInt24s : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableInt24s : public WriteAttribute {
-public:
-    WriteTestClusterNullableInt24s()
-        : WriteAttribute("nullable-int24s")
-    {
-        AddArgument("attr-name", "nullable-int24s");
-        AddArgument("attr-value", INT32_MIN, INT32_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableInt24s() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000400F) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithInt:mValue];
-
-        [cluster writeAttributeNullableInt24sWithValue:value
-                                                params:params
-                                     completionHandler:^(NSError * _Nullable error) {
-                                         if (error != nil) {
-                                             LogNSError("TestCluster NullableInt24s write Error", error);
-                                         }
-                                         SetCommandExitStatus(error);
-                                     }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    int32_t mValue;
-};
-
-class SubscribeAttributeTestClusterNullableInt24s : public SubscribeAttribute {
+class SubscribeAttributeApplicationBasicFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableInt24s()
-        : SubscribeAttribute("nullable-int24s")
+    SubscribeAttributeApplicationBasicFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableInt24s() {}
+    ~SubscribeAttributeApplicationBasicFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000400F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableInt24sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableInt24s response %@", [value description]);
+                NSLog(@"ApplicationBasic.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -73541,27 +70466,29 @@ class SubscribeAttributeTestClusterNullableInt24s : public SubscribeAttribute {
 };
 
 /*
- * Attribute NullableInt32s
+ * Attribute ClusterRevision
  */
-class ReadTestClusterNullableInt32s : public ReadAttribute {
+class ReadApplicationBasicClusterRevision : public ReadAttribute {
 public:
-    ReadTestClusterNullableInt32s()
-        : ReadAttribute("nullable-int32s")
+    ReadApplicationBasicClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadTestClusterNullableInt32s() {}
+    ~ReadApplicationBasicClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableInt32sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableInt32s response %@", [value description]);
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ApplicationBasic.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableInt32s read Error", error);
+                LogNSError("ApplicationBasic ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -73569,70 +70496,34 @@ class ReadTestClusterNullableInt32s : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableInt32s : public WriteAttribute {
-public:
-    WriteTestClusterNullableInt32s()
-        : WriteAttribute("nullable-int32s")
-    {
-        AddArgument("attr-name", "nullable-int32s");
-        AddArgument("attr-value", INT32_MIN, INT32_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableInt32s() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004010) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithInt:mValue];
-
-        [cluster writeAttributeNullableInt32sWithValue:value
-                                                params:params
-                                     completionHandler:^(NSError * _Nullable error) {
-                                         if (error != nil) {
-                                             LogNSError("TestCluster NullableInt32s write Error", error);
-                                         }
-                                         SetCommandExitStatus(error);
-                                     }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    int32_t mValue;
-};
-
-class SubscribeAttributeTestClusterNullableInt32s : public SubscribeAttribute {
+class SubscribeAttributeApplicationBasicClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableInt32s()
-        : SubscribeAttribute("nullable-int32s")
+    SubscribeAttributeApplicationBasicClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableInt32s() {}
+    ~SubscribeAttributeApplicationBasicClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050D) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device
+                                                                             endpoint:endpointId
+                                                                                queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableInt32sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableInt32s response %@", [value description]);
+                NSLog(@"ApplicationBasic.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -73642,130 +70533,185 @@ class SubscribeAttributeTestClusterNullableInt32s : public SubscribeAttribute {
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster AccountLogin                                                | 0x050E |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * GetSetupPIN                                                       |   0x00 |
+| * Login                                                             |   0x02 |
+| * Logout                                                            |   0x03 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute NullableInt40s
+ * Command GetSetupPIN
  */
-class ReadTestClusterNullableInt40s : public ReadAttribute {
+class AccountLoginGetSetupPIN : public ClusterCommand {
 public:
-    ReadTestClusterNullableInt40s()
-        : ReadAttribute("nullable-int40s")
+    AccountLoginGetSetupPIN()
+        : ClusterCommand("get-setup-pin")
     {
+        AddArgument("TempAccountIdentifier", &mRequest.tempAccountIdentifier);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadTestClusterNullableInt40s() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableInt40sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableInt40s response %@", [value description]);
-            if (error != nil) {
-                LogNSError("TestCluster NullableInt40s read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPAccountLoginClusterGetSetupPINParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.tempAccountIdentifier = [[NSString alloc] initWithBytes:mRequest.tempAccountIdentifier.data()
+                                                                length:mRequest.tempAccountIdentifier.size()
+                                                              encoding:NSUTF8StringEncoding];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster getSetupPINWithParams:params
+                         completionHandler:^(
+                             CHIPAccountLoginClusterGetSetupPINResponseParams * _Nullable values, NSError * _Nullable error) {
+                             NSLog(@"Values: %@", values);
+                             responsesNeeded--;
+                             if (error != nil) {
+                                 mError = error;
+                                 LogNSError("Error", error);
+                             }
+                             if (responsesNeeded == 0) {
+                                 SetCommandExitStatus(mError);
+                             }
+                         }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::AccountLogin::Commands::GetSetupPIN::Type mRequest;
 };
 
-class WriteTestClusterNullableInt40s : public WriteAttribute {
+/*
+ * Command Login
+ */
+class AccountLoginLogin : public ClusterCommand {
 public:
-    WriteTestClusterNullableInt40s()
-        : WriteAttribute("nullable-int40s")
+    AccountLoginLogin()
+        : ClusterCommand("login")
     {
-        AddArgument("attr-name", "nullable-int40s");
-        AddArgument("attr-value", INT64_MIN, INT64_MAX, &mValue);
-        WriteAttribute::AddArguments();
+        AddArgument("TempAccountIdentifier", &mRequest.tempAccountIdentifier);
+        AddArgument("SetupPIN", &mRequest.setupPIN);
+        ClusterCommand::AddArguments();
     }
 
-    ~WriteTestClusterNullableInt40s() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) command (0x00000002) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
+        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPAccountLoginClusterLoginParams alloc] init];
+        params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithLongLong:mValue];
-
-        [cluster writeAttributeNullableInt40sWithValue:value
-                                                params:params
-                                     completionHandler:^(NSError * _Nullable error) {
-                                         if (error != nil) {
-                                             LogNSError("TestCluster NullableInt40s write Error", error);
-                                         }
-                                         SetCommandExitStatus(error);
-                                     }];
+        params.tempAccountIdentifier = [[NSString alloc] initWithBytes:mRequest.tempAccountIdentifier.data()
+                                                                length:mRequest.tempAccountIdentifier.size()
+                                                              encoding:NSUTF8StringEncoding];
+        params.setupPIN = [[NSString alloc] initWithBytes:mRequest.setupPIN.data()
+                                                   length:mRequest.setupPIN.size()
+                                                 encoding:NSUTF8StringEncoding];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster loginWithParams:params
+                   completionHandler:^(NSError * _Nullable error) {
+                       responsesNeeded--;
+                       if (error != nil) {
+                           mError = error;
+                           LogNSError("Error", error);
+                       }
+                       if (responsesNeeded == 0) {
+                           SetCommandExitStatus(mError);
+                       }
+                   }];
+        }
         return CHIP_NO_ERROR;
     }
 
 private:
-    int64_t mValue;
+    chip::app::Clusters::AccountLogin::Commands::Login::Type mRequest;
 };
 
-class SubscribeAttributeTestClusterNullableInt40s : public SubscribeAttribute {
+/*
+ * Command Logout
+ */
+class AccountLoginLogout : public ClusterCommand {
 public:
-    SubscribeAttributeTestClusterNullableInt40s()
-        : SubscribeAttribute("nullable-int40s")
+    AccountLoginLogout()
+        : ClusterCommand("logout")
     {
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeTestClusterNullableInt40s() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004011) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableInt40sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableInt40s response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) command (0x00000003) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPAccountLoginClusterLogoutParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster logoutWithParams:params
+                    completionHandler:^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
 };
 
 /*
- * Attribute NullableInt48s
+ * Attribute GeneratedCommandList
  */
-class ReadTestClusterNullableInt48s : public ReadAttribute {
+class ReadAccountLoginGeneratedCommandList : public ReadAttribute {
 public:
-    ReadTestClusterNullableInt48s()
-        : ReadAttribute("nullable-int48s")
+    ReadAccountLoginGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadTestClusterNullableInt48s() {}
+    ~ReadAccountLoginGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableInt48sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableInt48s response %@", [value description]);
+        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AccountLogin.GeneratedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableInt48s read Error", error);
+                LogNSError("AccountLogin GeneratedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -73773,70 +70719,32 @@ class ReadTestClusterNullableInt48s : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableInt48s : public WriteAttribute {
+class SubscribeAttributeAccountLoginGeneratedCommandList : public SubscribeAttribute {
 public:
-    WriteTestClusterNullableInt48s()
-        : WriteAttribute("nullable-int48s")
-    {
-        AddArgument("attr-name", "nullable-int48s");
-        AddArgument("attr-value", INT64_MIN, INT64_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableInt48s() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004012) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithLongLong:mValue];
-
-        [cluster writeAttributeNullableInt48sWithValue:value
-                                                params:params
-                                     completionHandler:^(NSError * _Nullable error) {
-                                         if (error != nil) {
-                                             LogNSError("TestCluster NullableInt48s write Error", error);
-                                         }
-                                         SetCommandExitStatus(error);
-                                     }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    int64_t mValue;
-};
-
-class SubscribeAttributeTestClusterNullableInt48s : public SubscribeAttribute {
-public:
-    SubscribeAttributeTestClusterNullableInt48s()
-        : SubscribeAttribute("nullable-int48s")
+    SubscribeAttributeAccountLoginGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableInt48s() {}
+    ~SubscribeAttributeAccountLoginGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableInt48sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableInt48s response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AccountLogin.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -73847,27 +70755,27 @@ class SubscribeAttributeTestClusterNullableInt48s : public SubscribeAttribute {
 };
 
 /*
- * Attribute NullableInt56s
+ * Attribute AcceptedCommandList
  */
-class ReadTestClusterNullableInt56s : public ReadAttribute {
+class ReadAccountLoginAcceptedCommandList : public ReadAttribute {
 public:
-    ReadTestClusterNullableInt56s()
-        : ReadAttribute("nullable-int56s")
+    ReadAccountLoginAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadTestClusterNullableInt56s() {}
+    ~ReadAccountLoginAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableInt56sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableInt56s response %@", [value description]);
+        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AccountLogin.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableInt56s read Error", error);
+                LogNSError("AccountLogin AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -73875,70 +70783,32 @@ class ReadTestClusterNullableInt56s : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableInt56s : public WriteAttribute {
-public:
-    WriteTestClusterNullableInt56s()
-        : WriteAttribute("nullable-int56s")
-    {
-        AddArgument("attr-name", "nullable-int56s");
-        AddArgument("attr-value", INT64_MIN, INT64_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableInt56s() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004013) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithLongLong:mValue];
-
-        [cluster writeAttributeNullableInt56sWithValue:value
-                                                params:params
-                                     completionHandler:^(NSError * _Nullable error) {
-                                         if (error != nil) {
-                                             LogNSError("TestCluster NullableInt56s write Error", error);
-                                         }
-                                         SetCommandExitStatus(error);
-                                     }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    int64_t mValue;
-};
-
-class SubscribeAttributeTestClusterNullableInt56s : public SubscribeAttribute {
+class SubscribeAttributeAccountLoginAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableInt56s()
-        : SubscribeAttribute("nullable-int56s")
+    SubscribeAttributeAccountLoginAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableInt56s() {}
+    ~SubscribeAttributeAccountLoginAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableInt56sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableInt56s response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AccountLogin.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -73949,27 +70819,27 @@ class SubscribeAttributeTestClusterNullableInt56s : public SubscribeAttribute {
 };
 
 /*
- * Attribute NullableInt64s
+ * Attribute AttributeList
  */
-class ReadTestClusterNullableInt64s : public ReadAttribute {
+class ReadAccountLoginAttributeList : public ReadAttribute {
 public:
-    ReadTestClusterNullableInt64s()
-        : ReadAttribute("nullable-int64s")
+    ReadAccountLoginAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadTestClusterNullableInt64s() {}
+    ~ReadAccountLoginAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004014) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableInt64sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableInt64s response %@", [value description]);
+        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AccountLogin.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableInt64s read Error", error);
+                LogNSError("AccountLogin AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -73977,70 +70847,32 @@ class ReadTestClusterNullableInt64s : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableInt64s : public WriteAttribute {
-public:
-    WriteTestClusterNullableInt64s()
-        : WriteAttribute("nullable-int64s")
-    {
-        AddArgument("attr-name", "nullable-int64s");
-        AddArgument("attr-value", INT64_MIN, INT64_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableInt64s() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004014) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithLongLong:mValue];
-
-        [cluster writeAttributeNullableInt64sWithValue:value
-                                                params:params
-                                     completionHandler:^(NSError * _Nullable error) {
-                                         if (error != nil) {
-                                             LogNSError("TestCluster NullableInt64s write Error", error);
-                                         }
-                                         SetCommandExitStatus(error);
-                                     }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    int64_t mValue;
-};
-
-class SubscribeAttributeTestClusterNullableInt64s : public SubscribeAttribute {
+class SubscribeAttributeAccountLoginAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableInt64s()
-        : SubscribeAttribute("nullable-int64s")
+    SubscribeAttributeAccountLoginAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableInt64s() {}
+    ~SubscribeAttributeAccountLoginAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004014) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableInt64sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableInt64s response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"AccountLogin.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -74051,27 +70883,27 @@ class SubscribeAttributeTestClusterNullableInt64s : public SubscribeAttribute {
 };
 
 /*
- * Attribute NullableEnum8
+ * Attribute FeatureMap
  */
-class ReadTestClusterNullableEnum8 : public ReadAttribute {
+class ReadAccountLoginFeatureMap : public ReadAttribute {
 public:
-    ReadTestClusterNullableEnum8()
-        : ReadAttribute("nullable-enum8")
+    ReadAccountLoginFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadTestClusterNullableEnum8() {}
+    ~ReadAccountLoginFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004015) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableEnum8WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableEnum8 response %@", [value description]);
+        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AccountLogin.FeatureMap response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableEnum8 read Error", error);
+                LogNSError("AccountLogin FeatureMap read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -74079,70 +70911,32 @@ class ReadTestClusterNullableEnum8 : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableEnum8 : public WriteAttribute {
-public:
-    WriteTestClusterNullableEnum8()
-        : WriteAttribute("nullable-enum8")
-    {
-        AddArgument("attr-name", "nullable-enum8");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableEnum8() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004015) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeNullableEnum8WithValue:value
-                                               params:params
-                                    completionHandler:^(NSError * _Nullable error) {
-                                        if (error != nil) {
-                                            LogNSError("TestCluster NullableEnum8 write Error", error);
-                                        }
-                                        SetCommandExitStatus(error);
-                                    }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeTestClusterNullableEnum8 : public SubscribeAttribute {
+class SubscribeAttributeAccountLoginFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableEnum8()
-        : SubscribeAttribute("nullable-enum8")
+    SubscribeAttributeAccountLoginFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableEnum8() {}
+    ~SubscribeAttributeAccountLoginFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004015) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableEnum8WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableEnum8 response %@", [value description]);
+                NSLog(@"AccountLogin.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -74153,27 +70947,27 @@ class SubscribeAttributeTestClusterNullableEnum8 : public SubscribeAttribute {
 };
 
 /*
- * Attribute NullableEnum16
+ * Attribute ClusterRevision
  */
-class ReadTestClusterNullableEnum16 : public ReadAttribute {
+class ReadAccountLoginClusterRevision : public ReadAttribute {
 public:
-    ReadTestClusterNullableEnum16()
-        : ReadAttribute("nullable-enum16")
+    ReadAccountLoginClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadTestClusterNullableEnum16() {}
+    ~ReadAccountLoginClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004016) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableEnum16WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableEnum16 response %@", [value description]);
+        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"AccountLogin.ClusterRevision response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableEnum16 read Error", error);
+                LogNSError("AccountLogin ClusterRevision read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -74181,70 +70975,32 @@ class ReadTestClusterNullableEnum16 : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableEnum16 : public WriteAttribute {
-public:
-    WriteTestClusterNullableEnum16()
-        : WriteAttribute("nullable-enum16")
-    {
-        AddArgument("attr-name", "nullable-enum16");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableEnum16() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004016) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeNullableEnum16WithValue:value
-                                                params:params
-                                     completionHandler:^(NSError * _Nullable error) {
-                                         if (error != nil) {
-                                             LogNSError("TestCluster NullableEnum16 write Error", error);
-                                         }
-                                         SetCommandExitStatus(error);
-                                     }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeTestClusterNullableEnum16 : public SubscribeAttribute {
+class SubscribeAttributeAccountLoginClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableEnum16()
-        : SubscribeAttribute("nullable-enum16")
+    SubscribeAttributeAccountLoginClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableEnum16() {}
+    ~SubscribeAttributeAccountLoginClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004016) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0000050E) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableEnum16WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableEnum16 response %@", [value description]);
+                NSLog(@"AccountLogin.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -74254,99 +71010,303 @@ class SubscribeAttributeTestClusterNullableEnum16 : public SubscribeAttribute {
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster ElectricalMeasurement                                       | 0x0B04 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * GetProfileInfoCommand                                             |   0x00 |
+| * GetMeasurementProfileCommand                                      |   0x01 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * MeasurementType                                                   | 0x0000 |
+| * DcVoltage                                                         | 0x0100 |
+| * DcVoltageMin                                                      | 0x0101 |
+| * DcVoltageMax                                                      | 0x0102 |
+| * DcCurrent                                                         | 0x0103 |
+| * DcCurrentMin                                                      | 0x0104 |
+| * DcCurrentMax                                                      | 0x0105 |
+| * DcPower                                                           | 0x0106 |
+| * DcPowerMin                                                        | 0x0107 |
+| * DcPowerMax                                                        | 0x0108 |
+| * DcVoltageMultiplier                                               | 0x0200 |
+| * DcVoltageDivisor                                                  | 0x0201 |
+| * DcCurrentMultiplier                                               | 0x0202 |
+| * DcCurrentDivisor                                                  | 0x0203 |
+| * DcPowerMultiplier                                                 | 0x0204 |
+| * DcPowerDivisor                                                    | 0x0205 |
+| * AcFrequency                                                       | 0x0300 |
+| * AcFrequencyMin                                                    | 0x0301 |
+| * AcFrequencyMax                                                    | 0x0302 |
+| * NeutralCurrent                                                    | 0x0303 |
+| * TotalActivePower                                                  | 0x0304 |
+| * TotalReactivePower                                                | 0x0305 |
+| * TotalApparentPower                                                | 0x0306 |
+| * Measured1stHarmonicCurrent                                        | 0x0307 |
+| * Measured3rdHarmonicCurrent                                        | 0x0308 |
+| * Measured5thHarmonicCurrent                                        | 0x0309 |
+| * Measured7thHarmonicCurrent                                        | 0x030A |
+| * Measured9thHarmonicCurrent                                        | 0x030B |
+| * Measured11thHarmonicCurrent                                       | 0x030C |
+| * MeasuredPhase1stHarmonicCurrent                                   | 0x030D |
+| * MeasuredPhase3rdHarmonicCurrent                                   | 0x030E |
+| * MeasuredPhase5thHarmonicCurrent                                   | 0x030F |
+| * MeasuredPhase7thHarmonicCurrent                                   | 0x0310 |
+| * MeasuredPhase9thHarmonicCurrent                                   | 0x0311 |
+| * MeasuredPhase11thHarmonicCurrent                                  | 0x0312 |
+| * AcFrequencyMultiplier                                             | 0x0400 |
+| * AcFrequencyDivisor                                                | 0x0401 |
+| * PowerMultiplier                                                   | 0x0402 |
+| * PowerDivisor                                                      | 0x0403 |
+| * HarmonicCurrentMultiplier                                         | 0x0404 |
+| * PhaseHarmonicCurrentMultiplier                                    | 0x0405 |
+| * InstantaneousVoltage                                              | 0x0500 |
+| * InstantaneousLineCurrent                                          | 0x0501 |
+| * InstantaneousActiveCurrent                                        | 0x0502 |
+| * InstantaneousReactiveCurrent                                      | 0x0503 |
+| * InstantaneousPower                                                | 0x0504 |
+| * RmsVoltage                                                        | 0x0505 |
+| * RmsVoltageMin                                                     | 0x0506 |
+| * RmsVoltageMax                                                     | 0x0507 |
+| * RmsCurrent                                                        | 0x0508 |
+| * RmsCurrentMin                                                     | 0x0509 |
+| * RmsCurrentMax                                                     | 0x050A |
+| * ActivePower                                                       | 0x050B |
+| * ActivePowerMin                                                    | 0x050C |
+| * ActivePowerMax                                                    | 0x050D |
+| * ReactivePower                                                     | 0x050E |
+| * ApparentPower                                                     | 0x050F |
+| * PowerFactor                                                       | 0x0510 |
+| * AverageRmsVoltageMeasurementPeriod                                | 0x0511 |
+| * AverageRmsUnderVoltageCounter                                     | 0x0513 |
+| * RmsExtremeOverVoltagePeriod                                       | 0x0514 |
+| * RmsExtremeUnderVoltagePeriod                                      | 0x0515 |
+| * RmsVoltageSagPeriod                                               | 0x0516 |
+| * RmsVoltageSwellPeriod                                             | 0x0517 |
+| * AcVoltageMultiplier                                               | 0x0600 |
+| * AcVoltageDivisor                                                  | 0x0601 |
+| * AcCurrentMultiplier                                               | 0x0602 |
+| * AcCurrentDivisor                                                  | 0x0603 |
+| * AcPowerMultiplier                                                 | 0x0604 |
+| * AcPowerDivisor                                                    | 0x0605 |
+| * OverloadAlarmsMask                                                | 0x0700 |
+| * VoltageOverload                                                   | 0x0701 |
+| * CurrentOverload                                                   | 0x0702 |
+| * AcOverloadAlarmsMask                                              | 0x0800 |
+| * AcVoltageOverload                                                 | 0x0801 |
+| * AcCurrentOverload                                                 | 0x0802 |
+| * AcActivePowerOverload                                             | 0x0803 |
+| * AcReactivePowerOverload                                           | 0x0804 |
+| * AverageRmsOverVoltage                                             | 0x0805 |
+| * AverageRmsUnderVoltage                                            | 0x0806 |
+| * RmsExtremeOverVoltage                                             | 0x0807 |
+| * RmsExtremeUnderVoltage                                            | 0x0808 |
+| * RmsVoltageSag                                                     | 0x0809 |
+| * RmsVoltageSwell                                                   | 0x080A |
+| * LineCurrentPhaseB                                                 | 0x0901 |
+| * ActiveCurrentPhaseB                                               | 0x0902 |
+| * ReactiveCurrentPhaseB                                             | 0x0903 |
+| * RmsVoltagePhaseB                                                  | 0x0905 |
+| * RmsVoltageMinPhaseB                                               | 0x0906 |
+| * RmsVoltageMaxPhaseB                                               | 0x0907 |
+| * RmsCurrentPhaseB                                                  | 0x0908 |
+| * RmsCurrentMinPhaseB                                               | 0x0909 |
+| * RmsCurrentMaxPhaseB                                               | 0x090A |
+| * ActivePowerPhaseB                                                 | 0x090B |
+| * ActivePowerMinPhaseB                                              | 0x090C |
+| * ActivePowerMaxPhaseB                                              | 0x090D |
+| * ReactivePowerPhaseB                                               | 0x090E |
+| * ApparentPowerPhaseB                                               | 0x090F |
+| * PowerFactorPhaseB                                                 | 0x0910 |
+| * AverageRmsVoltageMeasurementPeriodPhaseB                          | 0x0911 |
+| * AverageRmsOverVoltageCounterPhaseB                                | 0x0912 |
+| * AverageRmsUnderVoltageCounterPhaseB                               | 0x0913 |
+| * RmsExtremeOverVoltagePeriodPhaseB                                 | 0x0914 |
+| * RmsExtremeUnderVoltagePeriodPhaseB                                | 0x0915 |
+| * RmsVoltageSagPeriodPhaseB                                         | 0x0916 |
+| * RmsVoltageSwellPeriodPhaseB                                       | 0x0917 |
+| * LineCurrentPhaseC                                                 | 0x0A01 |
+| * ActiveCurrentPhaseC                                               | 0x0A02 |
+| * ReactiveCurrentPhaseC                                             | 0x0A03 |
+| * RmsVoltagePhaseC                                                  | 0x0A05 |
+| * RmsVoltageMinPhaseC                                               | 0x0A06 |
+| * RmsVoltageMaxPhaseC                                               | 0x0A07 |
+| * RmsCurrentPhaseC                                                  | 0x0A08 |
+| * RmsCurrentMinPhaseC                                               | 0x0A09 |
+| * RmsCurrentMaxPhaseC                                               | 0x0A0A |
+| * ActivePowerPhaseC                                                 | 0x0A0B |
+| * ActivePowerMinPhaseC                                              | 0x0A0C |
+| * ActivePowerMaxPhaseC                                              | 0x0A0D |
+| * ReactivePowerPhaseC                                               | 0x0A0E |
+| * ApparentPowerPhaseC                                               | 0x0A0F |
+| * PowerFactorPhaseC                                                 | 0x0A10 |
+| * AverageRmsVoltageMeasurementPeriodPhaseC                          | 0x0A11 |
+| * AverageRmsOverVoltageCounterPhaseC                                | 0x0A12 |
+| * AverageRmsUnderVoltageCounterPhaseC                               | 0x0A13 |
+| * RmsExtremeOverVoltagePeriodPhaseC                                 | 0x0A14 |
+| * RmsExtremeUnderVoltagePeriodPhaseC                                | 0x0A15 |
+| * RmsVoltageSagPeriodPhaseC                                         | 0x0A16 |
+| * RmsVoltageSwellPeriodPhaseC                                       | 0x0A17 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute NullableFloatSingle
+ * Command GetProfileInfoCommand
  */
-class ReadTestClusterNullableFloatSingle : public ReadAttribute {
+class ElectricalMeasurementGetProfileInfoCommand : public ClusterCommand {
 public:
-    ReadTestClusterNullableFloatSingle()
-        : ReadAttribute("nullable-float-single")
+    ElectricalMeasurementGetProfileInfoCommand()
+        : ClusterCommand("get-profile-info-command")
     {
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadTestClusterNullableFloatSingle() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableFloatSingleWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableFloatSingle response %@", [value description]);
-            if (error != nil) {
-                LogNSError("TestCluster NullableFloatSingle read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        __auto_type * params = [[CHIPElectricalMeasurementClusterGetProfileInfoCommandParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster getProfileInfoCommandWithParams:params
+                                   completionHandler:^(NSError * _Nullable error) {
+                                       responsesNeeded--;
+                                       if (error != nil) {
+                                           mError = error;
+                                           LogNSError("Error", error);
+                                       }
+                                       if (responsesNeeded == 0) {
+                                           SetCommandExitStatus(mError);
+                                       }
+                                   }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
 };
 
-class WriteTestClusterNullableFloatSingle : public WriteAttribute {
+/*
+ * Command GetMeasurementProfileCommand
+ */
+class ElectricalMeasurementGetMeasurementProfileCommand : public ClusterCommand {
 public:
-    WriteTestClusterNullableFloatSingle()
-        : WriteAttribute("nullable-float-single")
+    ElectricalMeasurementGetMeasurementProfileCommand()
+        : ClusterCommand("get-measurement-profile-command")
     {
-        AddArgument("attr-name", "nullable-float-single");
-        AddArgument("attr-value", -std::numeric_limits<float>::infinity(), std::numeric_limits<float>::infinity(), &mValue);
-        WriteAttribute::AddArguments();
+        AddArgument("AttributeId", 0, UINT16_MAX, &mRequest.attributeId);
+        AddArgument("StartTime", 0, UINT32_MAX, &mRequest.startTime);
+        AddArgument("NumberOfIntervals", 0, UINT8_MAX, &mRequest.numberOfIntervals);
+        ClusterCommand::AddArguments();
     }
 
-    ~WriteTestClusterNullableFloatSingle() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) command (0x00000001) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        __auto_type * params = [[CHIPElectricalMeasurementClusterGetMeasurementProfileCommandParams alloc] init];
+        params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithFloat:mValue];
-
-        [cluster writeAttributeNullableFloatSingleWithValue:value
-                                                     params:params
+        params.attributeId = [NSNumber numberWithUnsignedShort:mRequest.attributeId];
+        params.startTime = [NSNumber numberWithUnsignedInt:mRequest.startTime];
+        params.numberOfIntervals = [NSNumber numberWithUnsignedChar:mRequest.numberOfIntervals];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster getMeasurementProfileCommandWithParams:params
                                           completionHandler:^(NSError * _Nullable error) {
+                                              responsesNeeded--;
                                               if (error != nil) {
-                                                  LogNSError("TestCluster NullableFloatSingle write Error", error);
+                                                  mError = error;
+                                                  LogNSError("Error", error);
+                                              }
+                                              if (responsesNeeded == 0) {
+                                                  SetCommandExitStatus(mError);
                                               }
-                                              SetCommandExitStatus(error);
                                           }];
+        }
         return CHIP_NO_ERROR;
     }
 
 private:
-    float mValue;
+    chip::app::Clusters::ElectricalMeasurement::Commands::GetMeasurementProfileCommand::Type mRequest;
 };
 
-class SubscribeAttributeTestClusterNullableFloatSingle : public SubscribeAttribute {
+/*
+ * Attribute MeasurementType
+ */
+class ReadElectricalMeasurementMeasurementType : public ReadAttribute {
 public:
-    SubscribeAttributeTestClusterNullableFloatSingle()
-        : SubscribeAttribute("nullable-float-single")
+    ReadElectricalMeasurementMeasurementType()
+        : ReadAttribute("measurement-type")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableFloatSingle() {}
+    ~ReadElectricalMeasurementMeasurementType() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeMeasurementTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.MeasurementType response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ElectricalMeasurement MeasurementType read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeElectricalMeasurementMeasurementType : public SubscribeAttribute {
+public:
+    SubscribeAttributeElectricalMeasurementMeasurementType()
+        : SubscribeAttribute("measurement-type")
+    {
+    }
+
+    ~SubscribeAttributeElectricalMeasurementMeasurementType() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableFloatSingleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMeasurementTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableFloatSingle response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.MeasurementType response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -74357,27 +71317,29 @@ class SubscribeAttributeTestClusterNullableFloatSingle : public SubscribeAttribu
 };
 
 /*
- * Attribute NullableFloatDouble
+ * Attribute DcVoltage
  */
-class ReadTestClusterNullableFloatDouble : public ReadAttribute {
+class ReadElectricalMeasurementDcVoltage : public ReadAttribute {
 public:
-    ReadTestClusterNullableFloatDouble()
-        : ReadAttribute("nullable-float-double")
+    ReadElectricalMeasurementDcVoltage()
+        : ReadAttribute("dc-voltage")
     {
     }
 
-    ~ReadTestClusterNullableFloatDouble() {}
+    ~ReadElectricalMeasurementDcVoltage() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004018) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000100) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableFloatDoubleWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableFloatDouble response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeDcVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.DcVoltage response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableFloatDouble read Error", error);
+                LogNSError("ElectricalMeasurement DcVoltage read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -74385,70 +71347,34 @@ class ReadTestClusterNullableFloatDouble : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableFloatDouble : public WriteAttribute {
-public:
-    WriteTestClusterNullableFloatDouble()
-        : WriteAttribute("nullable-float-double")
-    {
-        AddArgument("attr-name", "nullable-float-double");
-        AddArgument("attr-value", -std::numeric_limits<double>::infinity(), std::numeric_limits<double>::infinity(), &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableFloatDouble() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004018) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithDouble:mValue];
-
-        [cluster writeAttributeNullableFloatDoubleWithValue:value
-                                                     params:params
-                                          completionHandler:^(NSError * _Nullable error) {
-                                              if (error != nil) {
-                                                  LogNSError("TestCluster NullableFloatDouble write Error", error);
-                                              }
-                                              SetCommandExitStatus(error);
-                                          }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    double mValue;
-};
-
-class SubscribeAttributeTestClusterNullableFloatDouble : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementDcVoltage : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableFloatDouble()
-        : SubscribeAttribute("nullable-float-double")
+    SubscribeAttributeElectricalMeasurementDcVoltage()
+        : SubscribeAttribute("dc-voltage")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableFloatDouble() {}
+    ~SubscribeAttributeElectricalMeasurementDcVoltage() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004018) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000100) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableFloatDoubleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDcVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableFloatDouble response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.DcVoltage response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -74459,27 +71385,29 @@ class SubscribeAttributeTestClusterNullableFloatDouble : public SubscribeAttribu
 };
 
 /*
- * Attribute NullableOctetString
+ * Attribute DcVoltageMin
  */
-class ReadTestClusterNullableOctetString : public ReadAttribute {
+class ReadElectricalMeasurementDcVoltageMin : public ReadAttribute {
 public:
-    ReadTestClusterNullableOctetString()
-        : ReadAttribute("nullable-octet-string")
+    ReadElectricalMeasurementDcVoltageMin()
+        : ReadAttribute("dc-voltage-min")
     {
     }
 
-    ~ReadTestClusterNullableOctetString() {}
+    ~ReadElectricalMeasurementDcVoltageMin() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004019) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000101) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableOctetStringWithCompletionHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableOctetString response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeDcVoltageMinWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.DcVoltageMin response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableOctetString read Error", error);
+                LogNSError("ElectricalMeasurement DcVoltageMin read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -74487,70 +71415,34 @@ class ReadTestClusterNullableOctetString : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableOctetString : public WriteAttribute {
-public:
-    WriteTestClusterNullableOctetString()
-        : WriteAttribute("nullable-octet-string")
-    {
-        AddArgument("attr-name", "nullable-octet-string");
-        AddArgument("attr-value", &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableOctetString() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004019) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSData * _Nullable value = [[NSData alloc] initWithBytes:mValue.data() length:mValue.size()];
-
-        [cluster writeAttributeNullableOctetStringWithValue:value
-                                                     params:params
-                                          completionHandler:^(NSError * _Nullable error) {
-                                              if (error != nil) {
-                                                  LogNSError("TestCluster NullableOctetString write Error", error);
-                                              }
-                                              SetCommandExitStatus(error);
-                                          }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::ByteSpan mValue;
-};
-
-class SubscribeAttributeTestClusterNullableOctetString : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementDcVoltageMin : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableOctetString()
-        : SubscribeAttribute("nullable-octet-string")
+    SubscribeAttributeElectricalMeasurementDcVoltageMin()
+        : SubscribeAttribute("dc-voltage-min")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableOctetString() {}
+    ~SubscribeAttributeElectricalMeasurementDcVoltageMin() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004019) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000101) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDcVoltageMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableOctetString response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.DcVoltageMin response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -74561,27 +71453,29 @@ class SubscribeAttributeTestClusterNullableOctetString : public SubscribeAttribu
 };
 
 /*
- * Attribute NullableCharString
+ * Attribute DcVoltageMax
  */
-class ReadTestClusterNullableCharString : public ReadAttribute {
+class ReadElectricalMeasurementDcVoltageMax : public ReadAttribute {
 public:
-    ReadTestClusterNullableCharString()
-        : ReadAttribute("nullable-char-string")
+    ReadElectricalMeasurementDcVoltageMax()
+        : ReadAttribute("dc-voltage-max")
     {
     }
 
-    ~ReadTestClusterNullableCharString() {}
+    ~ReadElectricalMeasurementDcVoltageMax() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000401E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000102) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableCharStringWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableCharString response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeDcVoltageMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.DcVoltageMax response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableCharString read Error", error);
+                LogNSError("ElectricalMeasurement DcVoltageMax read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -74589,72 +71483,34 @@ class ReadTestClusterNullableCharString : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableCharString : public WriteAttribute {
-public:
-    WriteTestClusterNullableCharString()
-        : WriteAttribute("nullable-char-string")
-    {
-        AddArgument("attr-name", "nullable-char-string");
-        AddArgument("attr-value", &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableCharString() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000401E) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSString * _Nullable value = [[NSString alloc] initWithBytes:mValue.data()
-                                                              length:mValue.size()
-                                                            encoding:NSUTF8StringEncoding];
-
-        [cluster writeAttributeNullableCharStringWithValue:value
-                                                    params:params
-                                         completionHandler:^(NSError * _Nullable error) {
-                                             if (error != nil) {
-                                                 LogNSError("TestCluster NullableCharString write Error", error);
-                                             }
-                                             SetCommandExitStatus(error);
-                                         }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::ByteSpan mValue;
-};
-
-class SubscribeAttributeTestClusterNullableCharString : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementDcVoltageMax : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableCharString()
-        : SubscribeAttribute("nullable-char-string")
+    SubscribeAttributeElectricalMeasurementDcVoltageMax()
+        : SubscribeAttribute("dc-voltage-max")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableCharString() {}
+    ~SubscribeAttributeElectricalMeasurementDcVoltageMax() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000401E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000102) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableCharStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDcVoltageMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableCharString response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.DcVoltageMax response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -74665,27 +71521,29 @@ class SubscribeAttributeTestClusterNullableCharString : public SubscribeAttribut
 };
 
 /*
- * Attribute NullableEnumAttr
+ * Attribute DcCurrent
  */
-class ReadTestClusterNullableEnumAttr : public ReadAttribute {
+class ReadElectricalMeasurementDcCurrent : public ReadAttribute {
 public:
-    ReadTestClusterNullableEnumAttr()
-        : ReadAttribute("nullable-enum-attr")
+    ReadElectricalMeasurementDcCurrent()
+        : ReadAttribute("dc-current")
     {
     }
 
-    ~ReadTestClusterNullableEnumAttr() {}
+    ~ReadElectricalMeasurementDcCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004024) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000103) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableEnumAttrWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableEnumAttr response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeDcCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.DcCurrent response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableEnumAttr read Error", error);
+                LogNSError("ElectricalMeasurement DcCurrent read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -74693,70 +71551,102 @@ class ReadTestClusterNullableEnumAttr : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableEnumAttr : public WriteAttribute {
+class SubscribeAttributeElectricalMeasurementDcCurrent : public SubscribeAttribute {
 public:
-    WriteTestClusterNullableEnumAttr()
-        : WriteAttribute("nullable-enum-attr")
+    SubscribeAttributeElectricalMeasurementDcCurrent()
+        : SubscribeAttribute("dc-current")
     {
-        AddArgument("attr-name", "nullable-enum-attr");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteTestClusterNullableEnumAttr() {}
+    ~SubscribeAttributeElectricalMeasurementDcCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004024) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000103) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeDcCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.DcCurrent response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
-        [cluster writeAttributeNullableEnumAttrWithValue:value
-                                                  params:params
-                                       completionHandler:^(NSError * _Nullable error) {
-                                           if (error != nil) {
-                                               LogNSError("TestCluster NullableEnumAttr write Error", error);
-                                           }
-                                           SetCommandExitStatus(error);
-                                       }];
         return CHIP_NO_ERROR;
     }
+};
 
-private:
-    uint8_t mValue;
+/*
+ * Attribute DcCurrentMin
+ */
+class ReadElectricalMeasurementDcCurrentMin : public ReadAttribute {
+public:
+    ReadElectricalMeasurementDcCurrentMin()
+        : ReadAttribute("dc-current-min")
+    {
+    }
+
+    ~ReadElectricalMeasurementDcCurrentMin() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000104) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeDcCurrentMinWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.DcCurrentMin response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ElectricalMeasurement DcCurrentMin read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
 };
 
-class SubscribeAttributeTestClusterNullableEnumAttr : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementDcCurrentMin : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableEnumAttr()
-        : SubscribeAttribute("nullable-enum-attr")
+    SubscribeAttributeElectricalMeasurementDcCurrentMin()
+        : SubscribeAttribute("dc-current-min")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableEnumAttr() {}
+    ~SubscribeAttributeElectricalMeasurementDcCurrentMin() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004024) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000104) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableEnumAttrWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDcCurrentMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableEnumAttr response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.DcCurrentMin response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -74767,28 +71657,29 @@ class SubscribeAttributeTestClusterNullableEnumAttr : public SubscribeAttribute
 };
 
 /*
- * Attribute NullableStruct
+ * Attribute DcCurrentMax
  */
-class ReadTestClusterNullableStruct : public ReadAttribute {
+class ReadElectricalMeasurementDcCurrentMax : public ReadAttribute {
 public:
-    ReadTestClusterNullableStruct()
-        : ReadAttribute("nullable-struct")
+    ReadElectricalMeasurementDcCurrentMax()
+        : ReadAttribute("dc-current-max")
     {
     }
 
-    ~ReadTestClusterNullableStruct() {}
+    ~ReadElectricalMeasurementDcCurrentMax() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004025) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000105) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableStructWithCompletionHandler:^(
-            CHIPTestClusterClusterSimpleStruct * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableStruct response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeDcCurrentMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.DcCurrentMax response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableStruct read Error", error);
+                LogNSError("ElectricalMeasurement DcCurrentMax read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -74796,87 +71687,34 @@ class ReadTestClusterNullableStruct : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableStruct : public WriteAttribute {
+class SubscribeAttributeElectricalMeasurementDcCurrentMax : public SubscribeAttribute {
 public:
-    WriteTestClusterNullableStruct()
-        : WriteAttribute("nullable-struct")
-        , mComplex(&mValue)
-    {
-        AddArgument("attr-name", "nullable-struct");
-        AddArgument("attr-value", &mComplex);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableStruct() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004025) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        CHIPTestClusterClusterSimpleStruct * _Nullable value;
-        if (mValue.IsNull()) {
-            value = nil;
-        } else {
-            value = [CHIPTestClusterClusterSimpleStruct new];
-            value.a = [NSNumber numberWithUnsignedChar:mValue.Value().a];
-            value.b = [NSNumber numberWithBool:mValue.Value().b];
-            value.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(mValue.Value().c)];
-            value.d = [NSData dataWithBytes:mValue.Value().d.data() length:mValue.Value().d.size()];
-            value.e = [[NSString alloc] initWithBytes:mValue.Value().e.data()
-                                               length:mValue.Value().e.size()
-                                             encoding:NSUTF8StringEncoding];
-            value.f = [NSNumber numberWithUnsignedChar:mValue.Value().f.Raw()];
-            value.g = [NSNumber numberWithFloat:mValue.Value().g];
-            value.h = [NSNumber numberWithDouble:mValue.Value().h];
-        }
-
-        [cluster writeAttributeNullableStructWithValue:value
-                                                params:params
-                                     completionHandler:^(NSError * _Nullable error) {
-                                         if (error != nil) {
-                                             LogNSError("TestCluster NullableStruct write Error", error);
-                                         }
-                                         SetCommandExitStatus(error);
-                                     }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type> mValue;
-    TypedComplexArgument<chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type>> mComplex;
-};
-
-class SubscribeAttributeTestClusterNullableStruct : public SubscribeAttribute {
-public:
-    SubscribeAttributeTestClusterNullableStruct()
-        : SubscribeAttribute("nullable-struct")
+    SubscribeAttributeElectricalMeasurementDcCurrentMax()
+        : SubscribeAttribute("dc-current-max")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableStruct() {}
+    ~SubscribeAttributeElectricalMeasurementDcCurrentMax() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004025) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000105) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableStructWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDcCurrentMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(CHIPTestClusterClusterSimpleStruct * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableStruct response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.DcCurrentMax response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -74887,28 +71725,29 @@ class SubscribeAttributeTestClusterNullableStruct : public SubscribeAttribute {
 };
 
 /*
- * Attribute NullableRangeRestrictedInt8u
+ * Attribute DcPower
  */
-class ReadTestClusterNullableRangeRestrictedInt8u : public ReadAttribute {
+class ReadElectricalMeasurementDcPower : public ReadAttribute {
 public:
-    ReadTestClusterNullableRangeRestrictedInt8u()
-        : ReadAttribute("nullable-range-restricted-int8u")
+    ReadElectricalMeasurementDcPower()
+        : ReadAttribute("dc-power")
     {
     }
 
-    ~ReadTestClusterNullableRangeRestrictedInt8u() {}
+    ~ReadElectricalMeasurementDcPower() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004026) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000106) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableRangeRestrictedInt8uWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableRangeRestrictedInt8u response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeDcPowerWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.DcPower response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableRangeRestrictedInt8u read Error", error);
+                LogNSError("ElectricalMeasurement DcPower read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -74916,71 +71755,34 @@ class ReadTestClusterNullableRangeRestrictedInt8u : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableRangeRestrictedInt8u : public WriteAttribute {
-public:
-    WriteTestClusterNullableRangeRestrictedInt8u()
-        : WriteAttribute("nullable-range-restricted-int8u")
-    {
-        AddArgument("attr-name", "nullable-range-restricted-int8u");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableRangeRestrictedInt8u() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004026) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster
-            writeAttributeNullableRangeRestrictedInt8uWithValue:value
-                                                         params:params
-                                              completionHandler:^(NSError * _Nullable error) {
-                                                  if (error != nil) {
-                                                      LogNSError("TestCluster NullableRangeRestrictedInt8u write Error", error);
-                                                  }
-                                                  SetCommandExitStatus(error);
-                                              }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeTestClusterNullableRangeRestrictedInt8u : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementDcPower : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableRangeRestrictedInt8u()
-        : SubscribeAttribute("nullable-range-restricted-int8u")
+    SubscribeAttributeElectricalMeasurementDcPower()
+        : SubscribeAttribute("dc-power")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableRangeRestrictedInt8u() {}
+    ~SubscribeAttributeElectricalMeasurementDcPower() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004026) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000106) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableRangeRestrictedInt8uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDcPowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableRangeRestrictedInt8u response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.DcPower response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -74991,28 +71793,29 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt8u : public Subscri
 };
 
 /*
- * Attribute NullableRangeRestrictedInt8s
+ * Attribute DcPowerMin
  */
-class ReadTestClusterNullableRangeRestrictedInt8s : public ReadAttribute {
+class ReadElectricalMeasurementDcPowerMin : public ReadAttribute {
 public:
-    ReadTestClusterNullableRangeRestrictedInt8s()
-        : ReadAttribute("nullable-range-restricted-int8s")
+    ReadElectricalMeasurementDcPowerMin()
+        : ReadAttribute("dc-power-min")
     {
     }
 
-    ~ReadTestClusterNullableRangeRestrictedInt8s() {}
+    ~ReadElectricalMeasurementDcPowerMin() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004027) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000107) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableRangeRestrictedInt8sWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableRangeRestrictedInt8s response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeDcPowerMinWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.DcPowerMin response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableRangeRestrictedInt8s read Error", error);
+                LogNSError("ElectricalMeasurement DcPowerMin read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -75020,71 +71823,34 @@ class ReadTestClusterNullableRangeRestrictedInt8s : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableRangeRestrictedInt8s : public WriteAttribute {
-public:
-    WriteTestClusterNullableRangeRestrictedInt8s()
-        : WriteAttribute("nullable-range-restricted-int8s")
-    {
-        AddArgument("attr-name", "nullable-range-restricted-int8s");
-        AddArgument("attr-value", INT8_MIN, INT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableRangeRestrictedInt8s() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004027) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithChar:mValue];
-
-        [cluster
-            writeAttributeNullableRangeRestrictedInt8sWithValue:value
-                                                         params:params
-                                              completionHandler:^(NSError * _Nullable error) {
-                                                  if (error != nil) {
-                                                      LogNSError("TestCluster NullableRangeRestrictedInt8s write Error", error);
-                                                  }
-                                                  SetCommandExitStatus(error);
-                                              }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    int8_t mValue;
-};
-
-class SubscribeAttributeTestClusterNullableRangeRestrictedInt8s : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementDcPowerMin : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableRangeRestrictedInt8s()
-        : SubscribeAttribute("nullable-range-restricted-int8s")
+    SubscribeAttributeElectricalMeasurementDcPowerMin()
+        : SubscribeAttribute("dc-power-min")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableRangeRestrictedInt8s() {}
+    ~SubscribeAttributeElectricalMeasurementDcPowerMin() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004027) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000107) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableRangeRestrictedInt8sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDcPowerMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableRangeRestrictedInt8s response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.DcPowerMin response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -75095,28 +71861,29 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt8s : public Subscri
 };
 
 /*
- * Attribute NullableRangeRestrictedInt16u
+ * Attribute DcPowerMax
  */
-class ReadTestClusterNullableRangeRestrictedInt16u : public ReadAttribute {
+class ReadElectricalMeasurementDcPowerMax : public ReadAttribute {
 public:
-    ReadTestClusterNullableRangeRestrictedInt16u()
-        : ReadAttribute("nullable-range-restricted-int16u")
+    ReadElectricalMeasurementDcPowerMax()
+        : ReadAttribute("dc-power-max")
     {
     }
 
-    ~ReadTestClusterNullableRangeRestrictedInt16u() {}
+    ~ReadElectricalMeasurementDcPowerMax() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004028) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000108) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableRangeRestrictedInt16uWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableRangeRestrictedInt16u response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeDcPowerMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.DcPowerMax response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableRangeRestrictedInt16u read Error", error);
+                LogNSError("ElectricalMeasurement DcPowerMax read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -75124,71 +71891,34 @@ class ReadTestClusterNullableRangeRestrictedInt16u : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableRangeRestrictedInt16u : public WriteAttribute {
-public:
-    WriteTestClusterNullableRangeRestrictedInt16u()
-        : WriteAttribute("nullable-range-restricted-int16u")
-    {
-        AddArgument("attr-name", "nullable-range-restricted-int16u");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableRangeRestrictedInt16u() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004028) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster
-            writeAttributeNullableRangeRestrictedInt16uWithValue:value
-                                                          params:params
-                                               completionHandler:^(NSError * _Nullable error) {
-                                                   if (error != nil) {
-                                                       LogNSError("TestCluster NullableRangeRestrictedInt16u write Error", error);
-                                                   }
-                                                   SetCommandExitStatus(error);
-                                               }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeTestClusterNullableRangeRestrictedInt16u : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementDcPowerMax : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableRangeRestrictedInt16u()
-        : SubscribeAttribute("nullable-range-restricted-int16u")
+    SubscribeAttributeElectricalMeasurementDcPowerMax()
+        : SubscribeAttribute("dc-power-max")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableRangeRestrictedInt16u() {}
+    ~SubscribeAttributeElectricalMeasurementDcPowerMax() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004028) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000108) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableRangeRestrictedInt16uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDcPowerMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableRangeRestrictedInt16u response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.DcPowerMax response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -75199,28 +71929,29 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt16u : public Subscr
 };
 
 /*
- * Attribute NullableRangeRestrictedInt16s
+ * Attribute DcVoltageMultiplier
  */
-class ReadTestClusterNullableRangeRestrictedInt16s : public ReadAttribute {
+class ReadElectricalMeasurementDcVoltageMultiplier : public ReadAttribute {
 public:
-    ReadTestClusterNullableRangeRestrictedInt16s()
-        : ReadAttribute("nullable-range-restricted-int16s")
+    ReadElectricalMeasurementDcVoltageMultiplier()
+        : ReadAttribute("dc-voltage-multiplier")
     {
     }
 
-    ~ReadTestClusterNullableRangeRestrictedInt16s() {}
+    ~ReadElectricalMeasurementDcVoltageMultiplier() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004029) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000200) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNullableRangeRestrictedInt16sWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.NullableRangeRestrictedInt16s response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeDcVoltageMultiplierWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.DcVoltageMultiplier response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster NullableRangeRestrictedInt16s read Error", error);
+                LogNSError("ElectricalMeasurement DcVoltageMultiplier read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -75228,71 +71959,34 @@ class ReadTestClusterNullableRangeRestrictedInt16s : public ReadAttribute {
     }
 };
 
-class WriteTestClusterNullableRangeRestrictedInt16s : public WriteAttribute {
-public:
-    WriteTestClusterNullableRangeRestrictedInt16s()
-        : WriteAttribute("nullable-range-restricted-int16s")
-    {
-        AddArgument("attr-name", "nullable-range-restricted-int16s");
-        AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteTestClusterNullableRangeRestrictedInt16s() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004029) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithShort:mValue];
-
-        [cluster
-            writeAttributeNullableRangeRestrictedInt16sWithValue:value
-                                                          params:params
-                                               completionHandler:^(NSError * _Nullable error) {
-                                                   if (error != nil) {
-                                                       LogNSError("TestCluster NullableRangeRestrictedInt16s write Error", error);
-                                                   }
-                                                   SetCommandExitStatus(error);
-                                               }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    int16_t mValue;
-};
-
-class SubscribeAttributeTestClusterNullableRangeRestrictedInt16s : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementDcVoltageMultiplier : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterNullableRangeRestrictedInt16s()
-        : SubscribeAttribute("nullable-range-restricted-int16s")
+    SubscribeAttributeElectricalMeasurementDcVoltageMultiplier()
+        : SubscribeAttribute("dc-voltage-multiplier")
     {
     }
 
-    ~SubscribeAttributeTestClusterNullableRangeRestrictedInt16s() {}
+    ~SubscribeAttributeElectricalMeasurementDcVoltageMultiplier() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004029) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000200) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNullableRangeRestrictedInt16sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDcVoltageMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.NullableRangeRestrictedInt16s response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.DcVoltageMultiplier response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -75303,27 +71997,29 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt16s : public Subscr
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute DcVoltageDivisor
  */
-class ReadTestClusterGeneratedCommandList : public ReadAttribute {
+class ReadElectricalMeasurementDcVoltageDivisor : public ReadAttribute {
 public:
-    ReadTestClusterGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadElectricalMeasurementDcVoltageDivisor()
+        : ReadAttribute("dc-voltage-divisor")
     {
     }
 
-    ~ReadTestClusterGeneratedCommandList() {}
+    ~ReadElectricalMeasurementDcVoltageDivisor() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000201) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.GeneratedCommandList response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeDcVoltageDivisorWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.DcVoltageDivisor response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster GeneratedCommandList read Error", error);
+                LogNSError("ElectricalMeasurement DcVoltageDivisor read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -75331,32 +72027,34 @@ class ReadTestClusterGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTestClusterGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementDcVoltageDivisor : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeElectricalMeasurementDcVoltageDivisor()
+        : SubscribeAttribute("dc-voltage-divisor")
     {
     }
 
-    ~SubscribeAttributeTestClusterGeneratedCommandList() {}
+    ~SubscribeAttributeElectricalMeasurementDcVoltageDivisor() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000201) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDcVoltageDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.DcVoltageDivisor response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -75367,27 +72065,29 @@ class SubscribeAttributeTestClusterGeneratedCommandList : public SubscribeAttrib
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute DcCurrentMultiplier
  */
-class ReadTestClusterAcceptedCommandList : public ReadAttribute {
+class ReadElectricalMeasurementDcCurrentMultiplier : public ReadAttribute {
 public:
-    ReadTestClusterAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadElectricalMeasurementDcCurrentMultiplier()
+        : ReadAttribute("dc-current-multiplier")
     {
     }
 
-    ~ReadTestClusterAcceptedCommandList() {}
+    ~ReadElectricalMeasurementDcCurrentMultiplier() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000202) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.AcceptedCommandList response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeDcCurrentMultiplierWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.DcCurrentMultiplier response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster AcceptedCommandList read Error", error);
+                LogNSError("ElectricalMeasurement DcCurrentMultiplier read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -75395,32 +72095,34 @@ class ReadTestClusterAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTestClusterAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementDcCurrentMultiplier : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeElectricalMeasurementDcCurrentMultiplier()
+        : SubscribeAttribute("dc-current-multiplier")
     {
     }
 
-    ~SubscribeAttributeTestClusterAcceptedCommandList() {}
+    ~SubscribeAttributeElectricalMeasurementDcCurrentMultiplier() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000202) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDcCurrentMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.DcCurrentMultiplier response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -75431,27 +72133,29 @@ class SubscribeAttributeTestClusterAcceptedCommandList : public SubscribeAttribu
 };
 
 /*
- * Attribute AttributeList
+ * Attribute DcCurrentDivisor
  */
-class ReadTestClusterAttributeList : public ReadAttribute {
+class ReadElectricalMeasurementDcCurrentDivisor : public ReadAttribute {
 public:
-    ReadTestClusterAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadElectricalMeasurementDcCurrentDivisor()
+        : ReadAttribute("dc-current-divisor")
     {
     }
 
-    ~ReadTestClusterAttributeList() {}
+    ~ReadElectricalMeasurementDcCurrentDivisor() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000203) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.AttributeList response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeDcCurrentDivisorWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.DcCurrentDivisor response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster AttributeList read Error", error);
+                LogNSError("ElectricalMeasurement DcCurrentDivisor read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -75459,32 +72163,34 @@ class ReadTestClusterAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTestClusterAttributeList : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementDcCurrentDivisor : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeElectricalMeasurementDcCurrentDivisor()
+        : SubscribeAttribute("dc-current-divisor")
     {
     }
 
-    ~SubscribeAttributeTestClusterAttributeList() {}
+    ~SubscribeAttributeElectricalMeasurementDcCurrentDivisor() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000203) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDcCurrentDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.DcCurrentDivisor response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -75495,27 +72201,29 @@ class SubscribeAttributeTestClusterAttributeList : public SubscribeAttribute {
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute DcPowerMultiplier
  */
-class ReadTestClusterFeatureMap : public ReadAttribute {
+class ReadElectricalMeasurementDcPowerMultiplier : public ReadAttribute {
 public:
-    ReadTestClusterFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadElectricalMeasurementDcPowerMultiplier()
+        : ReadAttribute("dc-power-multiplier")
     {
     }
 
-    ~ReadTestClusterFeatureMap() {}
+    ~ReadElectricalMeasurementDcPowerMultiplier() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000204) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.FeatureMap response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeDcPowerMultiplierWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.DcPowerMultiplier response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster FeatureMap read Error", error);
+                LogNSError("ElectricalMeasurement DcPowerMultiplier read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -75523,32 +72231,34 @@ class ReadTestClusterFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTestClusterFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementDcPowerMultiplier : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeElectricalMeasurementDcPowerMultiplier()
+        : SubscribeAttribute("dc-power-multiplier")
     {
     }
 
-    ~SubscribeAttributeTestClusterFeatureMap() {}
+    ~SubscribeAttributeElectricalMeasurementDcPowerMultiplier() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000204) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDcPowerMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.FeatureMap response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.DcPowerMultiplier response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -75559,27 +72269,29 @@ class SubscribeAttributeTestClusterFeatureMap : public SubscribeAttribute {
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute DcPowerDivisor
  */
-class ReadTestClusterClusterRevision : public ReadAttribute {
+class ReadElectricalMeasurementDcPowerDivisor : public ReadAttribute {
 public:
-    ReadTestClusterClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadElectricalMeasurementDcPowerDivisor()
+        : ReadAttribute("dc-power-divisor")
     {
     }
 
-    ~ReadTestClusterClusterRevision() {}
+    ~ReadElectricalMeasurementDcPowerDivisor() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000205) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TestCluster.ClusterRevision response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeDcPowerDivisorWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.DcPowerDivisor response %@", [value description]);
             if (error != nil) {
-                LogNSError("TestCluster ClusterRevision read Error", error);
+                LogNSError("ElectricalMeasurement DcPowerDivisor read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -75587,32 +72299,34 @@ class ReadTestClusterClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTestClusterClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementDcPowerDivisor : public SubscribeAttribute {
 public:
-    SubscribeAttributeTestClusterClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeElectricalMeasurementDcPowerDivisor()
+        : SubscribeAttribute("dc-power-divisor")
     {
     }
 
-    ~SubscribeAttributeTestClusterClusterRevision() {}
+    ~SubscribeAttributeElectricalMeasurementDcPowerDivisor() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000205) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeDcPowerDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TestCluster.ClusterRevision response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.DcPowerDivisor response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -75622,304 +72336,98 @@ class SubscribeAttributeTestClusterClusterRevision : public SubscribeAttribute {
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster Thermostat                                                  | 0x0201 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * SetpointRaiseLower                                                |   0x00 |
-| * SetWeeklySchedule                                                 |   0x01 |
-| * GetWeeklySchedule                                                 |   0x02 |
-| * ClearWeeklySchedule                                               |   0x03 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * LocalTemperature                                                  | 0x0000 |
-| * OutdoorTemperature                                                | 0x0001 |
-| * Occupancy                                                         | 0x0002 |
-| * AbsMinHeatSetpointLimit                                           | 0x0003 |
-| * AbsMaxHeatSetpointLimit                                           | 0x0004 |
-| * AbsMinCoolSetpointLimit                                           | 0x0005 |
-| * AbsMaxCoolSetpointLimit                                           | 0x0006 |
-| * PICoolingDemand                                                   | 0x0007 |
-| * PIHeatingDemand                                                   | 0x0008 |
-| * HVACSystemTypeConfiguration                                       | 0x0009 |
-| * LocalTemperatureCalibration                                       | 0x0010 |
-| * OccupiedCoolingSetpoint                                           | 0x0011 |
-| * OccupiedHeatingSetpoint                                           | 0x0012 |
-| * UnoccupiedCoolingSetpoint                                         | 0x0013 |
-| * UnoccupiedHeatingSetpoint                                         | 0x0014 |
-| * MinHeatSetpointLimit                                              | 0x0015 |
-| * MaxHeatSetpointLimit                                              | 0x0016 |
-| * MinCoolSetpointLimit                                              | 0x0017 |
-| * MaxCoolSetpointLimit                                              | 0x0018 |
-| * MinSetpointDeadBand                                               | 0x0019 |
-| * RemoteSensing                                                     | 0x001A |
-| * ControlSequenceOfOperation                                        | 0x001B |
-| * SystemMode                                                        | 0x001C |
-| * ThermostatRunningMode                                             | 0x001E |
-| * StartOfWeek                                                       | 0x0020 |
-| * NumberOfWeeklyTransitions                                         | 0x0021 |
-| * NumberOfDailyTransitions                                          | 0x0022 |
-| * TemperatureSetpointHold                                           | 0x0023 |
-| * TemperatureSetpointHoldDuration                                   | 0x0024 |
-| * ThermostatProgrammingOperationMode                                | 0x0025 |
-| * ThermostatRunningState                                            | 0x0029 |
-| * SetpointChangeSource                                              | 0x0030 |
-| * SetpointChangeAmount                                              | 0x0031 |
-| * SetpointChangeSourceTimestamp                                     | 0x0032 |
-| * OccupiedSetback                                                   | 0x0034 |
-| * OccupiedSetbackMin                                                | 0x0035 |
-| * OccupiedSetbackMax                                                | 0x0036 |
-| * UnoccupiedSetback                                                 | 0x0037 |
-| * UnoccupiedSetbackMin                                              | 0x0038 |
-| * UnoccupiedSetbackMax                                              | 0x0039 |
-| * EmergencyHeatDelta                                                | 0x003A |
-| * ACType                                                            | 0x0040 |
-| * ACCapacity                                                        | 0x0041 |
-| * ACRefrigerantType                                                 | 0x0042 |
-| * ACCompressorType                                                  | 0x0043 |
-| * ACErrorCode                                                       | 0x0044 |
-| * ACLouverPosition                                                  | 0x0045 |
-| * ACCoilTemperature                                                 | 0x0046 |
-| * ACCapacityformat                                                  | 0x0047 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command SetpointRaiseLower
+ * Attribute AcFrequency
  */
-class ThermostatSetpointRaiseLower : public ClusterCommand {
+class ReadElectricalMeasurementAcFrequency : public ReadAttribute {
 public:
-    ThermostatSetpointRaiseLower()
-        : ClusterCommand("setpoint-raise-lower")
-    {
-        AddArgument("Mode", 0, UINT8_MAX, &mRequest.mode);
-        AddArgument("Amount", INT8_MIN, INT8_MAX, &mRequest.amount);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    ReadElectricalMeasurementAcFrequency()
+        : ReadAttribute("ac-frequency")
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) command (0x00000000) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPThermostatClusterSetpointRaiseLowerParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.mode = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.mode)];
-        params.amount = [NSNumber numberWithChar:mRequest.amount];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster setpointRaiseLowerWithParams:params
-                                completionHandler:^(NSError * _Nullable error) {
-                                    responsesNeeded--;
-                                    if (error != nil) {
-                                        mError = error;
-                                        LogNSError("Error", error);
-                                    }
-                                    if (responsesNeeded == 0) {
-                                        SetCommandExitStatus(mError);
-                                    }
-                                }];
-        }
-        return CHIP_NO_ERROR;
     }
 
-private:
-    chip::app::Clusters::Thermostat::Commands::SetpointRaiseLower::Type mRequest;
-};
-
-/*
- * Command SetWeeklySchedule
- */
-class ThermostatSetWeeklySchedule : public ClusterCommand {
-public:
-    ThermostatSetWeeklySchedule()
-        : ClusterCommand("set-weekly-schedule")
-        , mComplex_Transitions(&mRequest.transitions)
-    {
-        AddArgument("NumberOfTransitionsForSequence", 0, UINT8_MAX, &mRequest.numberOfTransitionsForSequence);
-        AddArgument("DayOfWeekForSequence", 0, UINT8_MAX, &mRequest.dayOfWeekForSequence);
-        AddArgument("ModeForSequence", 0, UINT8_MAX, &mRequest.modeForSequence);
-        AddArgument("Transitions", &mComplex_Transitions);
-        ClusterCommand::AddArguments();
-    }
+    ~ReadElectricalMeasurementAcFrequency() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) command (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000300) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPThermostatClusterSetWeeklyScheduleParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.numberOfTransitionsForSequence = [NSNumber numberWithUnsignedChar:mRequest.numberOfTransitionsForSequence];
-        params.dayOfWeekForSequence = [NSNumber numberWithUnsignedChar:mRequest.dayOfWeekForSequence.Raw()];
-        params.modeForSequence = [NSNumber numberWithUnsignedChar:mRequest.modeForSequence.Raw()];
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mRequest.transitions) {
-                CHIPThermostatClusterThermostatScheduleTransition * newElement_0;
-                newElement_0 = [CHIPThermostatClusterThermostatScheduleTransition new];
-                newElement_0.transitionTime = [NSNumber numberWithUnsignedShort:entry_0.transitionTime];
-                if (entry_0.heatSetpoint.IsNull()) {
-                    newElement_0.heatSetpoint = nil;
-                } else {
-                    newElement_0.heatSetpoint = [NSNumber numberWithShort:entry_0.heatSetpoint.Value()];
-                }
-                if (entry_0.coolSetpoint.IsNull()) {
-                    newElement_0.coolSetpoint = nil;
-                } else {
-                    newElement_0.coolSetpoint = [NSNumber numberWithShort:entry_0.coolSetpoint.Value()];
-                }
-                [array_0 addObject:newElement_0];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAcFrequencyWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AcFrequency response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ElectricalMeasurement AcFrequency read Error", error);
             }
-            params.transitions = array_0;
-        }
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster setWeeklyScheduleWithParams:params
-                               completionHandler:^(NSError * _Nullable error) {
-                                   responsesNeeded--;
-                                   if (error != nil) {
-                                       mError = error;
-                                       LogNSError("Error", error);
-                                   }
-                                   if (responsesNeeded == 0) {
-                                       SetCommandExitStatus(mError);
-                                   }
-                               }];
-        }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::Thermostat::Commands::SetWeeklySchedule::Type mRequest;
-    TypedComplexArgument<
-        chip::app::DataModel::List<const chip::app::Clusters::Thermostat::Structs::ThermostatScheduleTransition::Type>>
-        mComplex_Transitions;
 };
 
-/*
- * Command GetWeeklySchedule
- */
-class ThermostatGetWeeklySchedule : public ClusterCommand {
+class SubscribeAttributeElectricalMeasurementAcFrequency : public SubscribeAttribute {
 public:
-    ThermostatGetWeeklySchedule()
-        : ClusterCommand("get-weekly-schedule")
-    {
-        AddArgument("DaysToReturn", 0, UINT8_MAX, &mRequest.daysToReturn);
-        AddArgument("ModeToReturn", 0, UINT8_MAX, &mRequest.modeToReturn);
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    SubscribeAttributeElectricalMeasurementAcFrequency()
+        : SubscribeAttribute("ac-frequency")
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) command (0x00000002) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPThermostatClusterGetWeeklyScheduleParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.daysToReturn = [NSNumber numberWithUnsignedChar:mRequest.daysToReturn.Raw()];
-        params.modeToReturn = [NSNumber numberWithUnsignedChar:mRequest.modeToReturn.Raw()];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster getWeeklyScheduleWithParams:params
-                               completionHandler:^(CHIPThermostatClusterGetWeeklyScheduleResponseParams * _Nullable values,
-                                   NSError * _Nullable error) {
-                                   NSLog(@"Values: %@", values);
-                                   responsesNeeded--;
-                                   if (error != nil) {
-                                       mError = error;
-                                       LogNSError("Error", error);
-                                   }
-                                   if (responsesNeeded == 0) {
-                                       SetCommandExitStatus(mError);
-                                   }
-                               }];
-        }
-        return CHIP_NO_ERROR;
     }
 
-private:
-    chip::app::Clusters::Thermostat::Commands::GetWeeklySchedule::Type mRequest;
-};
-
-/*
- * Command ClearWeeklySchedule
- */
-class ThermostatClearWeeklySchedule : public ClusterCommand {
-public:
-    ThermostatClearWeeklySchedule()
-        : ClusterCommand("clear-weekly-schedule")
-    {
-        ClusterCommand::AddArguments();
-    }
+    ~SubscribeAttributeElectricalMeasurementAcFrequency() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) command (0x00000003) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000300) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPThermostatClusterClearWeeklyScheduleParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster clearWeeklyScheduleWithParams:params
-                                 completionHandler:^(NSError * _Nullable error) {
-                                     responsesNeeded--;
-                                     if (error != nil) {
-                                         mError = error;
-                                         LogNSError("Error", error);
-                                     }
-                                     if (responsesNeeded == 0) {
-                                         SetCommandExitStatus(mError);
-                                     }
-                                 }];
-        }
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeAcFrequencyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcFrequency response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
 };
 
 /*
- * Attribute LocalTemperature
+ * Attribute AcFrequencyMin
  */
-class ReadThermostatLocalTemperature : public ReadAttribute {
+class ReadElectricalMeasurementAcFrequencyMin : public ReadAttribute {
 public:
-    ReadThermostatLocalTemperature()
-        : ReadAttribute("local-temperature")
+    ReadElectricalMeasurementAcFrequencyMin()
+        : ReadAttribute("ac-frequency-min")
     {
     }
 
-    ~ReadThermostatLocalTemperature() {}
+    ~ReadElectricalMeasurementAcFrequencyMin() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000301) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeLocalTemperatureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.LocalTemperature response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAcFrequencyMinWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AcFrequencyMin response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat LocalTemperature read Error", error);
+                LogNSError("ElectricalMeasurement AcFrequencyMin read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -75927,32 +72435,34 @@ class ReadThermostatLocalTemperature : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThermostatLocalTemperature : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAcFrequencyMin : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatLocalTemperature()
-        : SubscribeAttribute("local-temperature")
+    SubscribeAttributeElectricalMeasurementAcFrequencyMin()
+        : SubscribeAttribute("ac-frequency-min")
     {
     }
 
-    ~SubscribeAttributeThermostatLocalTemperature() {}
+    ~SubscribeAttributeElectricalMeasurementAcFrequencyMin() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000301) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLocalTemperatureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcFrequencyMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.LocalTemperature response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.AcFrequencyMin response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -75963,27 +72473,29 @@ class SubscribeAttributeThermostatLocalTemperature : public SubscribeAttribute {
 };
 
 /*
- * Attribute OutdoorTemperature
+ * Attribute AcFrequencyMax
  */
-class ReadThermostatOutdoorTemperature : public ReadAttribute {
+class ReadElectricalMeasurementAcFrequencyMax : public ReadAttribute {
 public:
-    ReadThermostatOutdoorTemperature()
-        : ReadAttribute("outdoor-temperature")
+    ReadElectricalMeasurementAcFrequencyMax()
+        : ReadAttribute("ac-frequency-max")
     {
     }
 
-    ~ReadThermostatOutdoorTemperature() {}
+    ~ReadElectricalMeasurementAcFrequencyMax() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000302) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeOutdoorTemperatureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.OutdoorTemperature response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAcFrequencyMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AcFrequencyMax response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat OutdoorTemperature read Error", error);
+                LogNSError("ElectricalMeasurement AcFrequencyMax read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -75991,32 +72503,34 @@ class ReadThermostatOutdoorTemperature : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThermostatOutdoorTemperature : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAcFrequencyMax : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatOutdoorTemperature()
-        : SubscribeAttribute("outdoor-temperature")
+    SubscribeAttributeElectricalMeasurementAcFrequencyMax()
+        : SubscribeAttribute("ac-frequency-max")
     {
     }
 
-    ~SubscribeAttributeThermostatOutdoorTemperature() {}
+    ~SubscribeAttributeElectricalMeasurementAcFrequencyMax() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000302) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOutdoorTemperatureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcFrequencyMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.OutdoorTemperature response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.AcFrequencyMax response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -76027,27 +72541,29 @@ class SubscribeAttributeThermostatOutdoorTemperature : public SubscribeAttribute
 };
 
 /*
- * Attribute Occupancy
+ * Attribute NeutralCurrent
  */
-class ReadThermostatOccupancy : public ReadAttribute {
+class ReadElectricalMeasurementNeutralCurrent : public ReadAttribute {
 public:
-    ReadThermostatOccupancy()
-        : ReadAttribute("occupancy")
+    ReadElectricalMeasurementNeutralCurrent()
+        : ReadAttribute("neutral-current")
     {
     }
 
-    ~ReadThermostatOccupancy() {}
+    ~ReadElectricalMeasurementNeutralCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000303) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeOccupancyWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.Occupancy response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeNeutralCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.NeutralCurrent response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat Occupancy read Error", error);
+                LogNSError("ElectricalMeasurement NeutralCurrent read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -76055,32 +72571,34 @@ class ReadThermostatOccupancy : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThermostatOccupancy : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementNeutralCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatOccupancy()
-        : SubscribeAttribute("occupancy")
+    SubscribeAttributeElectricalMeasurementNeutralCurrent()
+        : SubscribeAttribute("neutral-current")
     {
     }
 
-    ~SubscribeAttributeThermostatOccupancy() {}
+    ~SubscribeAttributeElectricalMeasurementNeutralCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000303) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOccupancyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNeutralCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.Occupancy response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.NeutralCurrent response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -76091,61 +72609,64 @@ class SubscribeAttributeThermostatOccupancy : public SubscribeAttribute {
 };
 
 /*
- * Attribute AbsMinHeatSetpointLimit
+ * Attribute TotalActivePower
  */
-class ReadThermostatAbsMinHeatSetpointLimit : public ReadAttribute {
+class ReadElectricalMeasurementTotalActivePower : public ReadAttribute {
 public:
-    ReadThermostatAbsMinHeatSetpointLimit()
-        : ReadAttribute("abs-min-heat-setpoint-limit")
+    ReadElectricalMeasurementTotalActivePower()
+        : ReadAttribute("total-active-power")
     {
     }
 
-    ~ReadThermostatAbsMinHeatSetpointLimit() {}
+    ~ReadElectricalMeasurementTotalActivePower() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000304) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeAbsMinHeatSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.AbsMinHeatSetpointLimit response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("Thermostat AbsMinHeatSetpointLimit read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeTotalActivePowerWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.TotalActivePower response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ElectricalMeasurement TotalActivePower read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeThermostatAbsMinHeatSetpointLimit : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementTotalActivePower : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatAbsMinHeatSetpointLimit()
-        : SubscribeAttribute("abs-min-heat-setpoint-limit")
+    SubscribeAttributeElectricalMeasurementTotalActivePower()
+        : SubscribeAttribute("total-active-power")
     {
     }
 
-    ~SubscribeAttributeThermostatAbsMinHeatSetpointLimit() {}
+    ~SubscribeAttributeElectricalMeasurementTotalActivePower() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000304) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAbsMinHeatSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTotalActivePowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.AbsMinHeatSetpointLimit response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.TotalActivePower response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -76156,61 +72677,64 @@ class SubscribeAttributeThermostatAbsMinHeatSetpointLimit : public SubscribeAttr
 };
 
 /*
- * Attribute AbsMaxHeatSetpointLimit
+ * Attribute TotalReactivePower
  */
-class ReadThermostatAbsMaxHeatSetpointLimit : public ReadAttribute {
+class ReadElectricalMeasurementTotalReactivePower : public ReadAttribute {
 public:
-    ReadThermostatAbsMaxHeatSetpointLimit()
-        : ReadAttribute("abs-max-heat-setpoint-limit")
+    ReadElectricalMeasurementTotalReactivePower()
+        : ReadAttribute("total-reactive-power")
     {
     }
 
-    ~ReadThermostatAbsMaxHeatSetpointLimit() {}
+    ~ReadElectricalMeasurementTotalReactivePower() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000305) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeAbsMaxHeatSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.AbsMaxHeatSetpointLimit response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("Thermostat AbsMaxHeatSetpointLimit read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeTotalReactivePowerWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.TotalReactivePower response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ElectricalMeasurement TotalReactivePower read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeThermostatAbsMaxHeatSetpointLimit : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementTotalReactivePower : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatAbsMaxHeatSetpointLimit()
-        : SubscribeAttribute("abs-max-heat-setpoint-limit")
+    SubscribeAttributeElectricalMeasurementTotalReactivePower()
+        : SubscribeAttribute("total-reactive-power")
     {
     }
 
-    ~SubscribeAttributeThermostatAbsMaxHeatSetpointLimit() {}
+    ~SubscribeAttributeElectricalMeasurementTotalReactivePower() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000305) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAbsMaxHeatSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTotalReactivePowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.AbsMaxHeatSetpointLimit response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.TotalReactivePower response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -76221,61 +72745,64 @@ class SubscribeAttributeThermostatAbsMaxHeatSetpointLimit : public SubscribeAttr
 };
 
 /*
- * Attribute AbsMinCoolSetpointLimit
+ * Attribute TotalApparentPower
  */
-class ReadThermostatAbsMinCoolSetpointLimit : public ReadAttribute {
+class ReadElectricalMeasurementTotalApparentPower : public ReadAttribute {
 public:
-    ReadThermostatAbsMinCoolSetpointLimit()
-        : ReadAttribute("abs-min-cool-setpoint-limit")
+    ReadElectricalMeasurementTotalApparentPower()
+        : ReadAttribute("total-apparent-power")
     {
     }
 
-    ~ReadThermostatAbsMinCoolSetpointLimit() {}
+    ~ReadElectricalMeasurementTotalApparentPower() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000306) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeAbsMinCoolSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.AbsMinCoolSetpointLimit response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("Thermostat AbsMinCoolSetpointLimit read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeTotalApparentPowerWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.TotalApparentPower response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ElectricalMeasurement TotalApparentPower read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeThermostatAbsMinCoolSetpointLimit : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementTotalApparentPower : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatAbsMinCoolSetpointLimit()
-        : SubscribeAttribute("abs-min-cool-setpoint-limit")
+    SubscribeAttributeElectricalMeasurementTotalApparentPower()
+        : SubscribeAttribute("total-apparent-power")
     {
     }
 
-    ~SubscribeAttributeThermostatAbsMinCoolSetpointLimit() {}
+    ~SubscribeAttributeElectricalMeasurementTotalApparentPower() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000306) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAbsMinCoolSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeTotalApparentPowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.AbsMinCoolSetpointLimit response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.TotalApparentPower response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -76286,28 +72813,30 @@ class SubscribeAttributeThermostatAbsMinCoolSetpointLimit : public SubscribeAttr
 };
 
 /*
- * Attribute AbsMaxCoolSetpointLimit
+ * Attribute Measured1stHarmonicCurrent
  */
-class ReadThermostatAbsMaxCoolSetpointLimit : public ReadAttribute {
+class ReadElectricalMeasurementMeasured1stHarmonicCurrent : public ReadAttribute {
 public:
-    ReadThermostatAbsMaxCoolSetpointLimit()
-        : ReadAttribute("abs-max-cool-setpoint-limit")
+    ReadElectricalMeasurementMeasured1stHarmonicCurrent()
+        : ReadAttribute("measured1st-harmonic-current")
     {
     }
 
-    ~ReadThermostatAbsMaxCoolSetpointLimit() {}
+    ~ReadElectricalMeasurementMeasured1stHarmonicCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000307) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         [cluster
-            readAttributeAbsMaxCoolSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.AbsMaxCoolSetpointLimit response %@", [value description]);
+            readAttributeMeasured1stHarmonicCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.Measured1stHarmonicCurrent response %@", [value description]);
                 if (error != nil) {
-                    LogNSError("Thermostat AbsMaxCoolSetpointLimit read Error", error);
+                    LogNSError("ElectricalMeasurement Measured1stHarmonicCurrent read Error", error);
                 }
                 SetCommandExitStatus(error);
             }];
@@ -76315,32 +72844,34 @@ class ReadThermostatAbsMaxCoolSetpointLimit : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThermostatAbsMaxCoolSetpointLimit : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementMeasured1stHarmonicCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatAbsMaxCoolSetpointLimit()
-        : SubscribeAttribute("abs-max-cool-setpoint-limit")
+    SubscribeAttributeElectricalMeasurementMeasured1stHarmonicCurrent()
+        : SubscribeAttribute("measured1st-harmonic-current")
     {
     }
 
-    ~SubscribeAttributeThermostatAbsMaxCoolSetpointLimit() {}
+    ~SubscribeAttributeElectricalMeasurementMeasured1stHarmonicCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000307) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAbsMaxCoolSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMeasured1stHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.AbsMaxCoolSetpointLimit response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.Measured1stHarmonicCurrent response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -76351,60 +72882,65 @@ class SubscribeAttributeThermostatAbsMaxCoolSetpointLimit : public SubscribeAttr
 };
 
 /*
- * Attribute PICoolingDemand
+ * Attribute Measured3rdHarmonicCurrent
  */
-class ReadThermostatPICoolingDemand : public ReadAttribute {
+class ReadElectricalMeasurementMeasured3rdHarmonicCurrent : public ReadAttribute {
 public:
-    ReadThermostatPICoolingDemand()
-        : ReadAttribute("picooling-demand")
+    ReadElectricalMeasurementMeasured3rdHarmonicCurrent()
+        : ReadAttribute("measured3rd-harmonic-current")
     {
     }
 
-    ~ReadThermostatPICoolingDemand() {}
+    ~ReadElectricalMeasurementMeasured3rdHarmonicCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000308) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributePICoolingDemandWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.PICoolingDemand response %@", [value description]);
-            if (error != nil) {
-                LogNSError("Thermostat PICoolingDemand read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster
+            readAttributeMeasured3rdHarmonicCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.Measured3rdHarmonicCurrent response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("ElectricalMeasurement Measured3rdHarmonicCurrent read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeThermostatPICoolingDemand : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementMeasured3rdHarmonicCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatPICoolingDemand()
-        : SubscribeAttribute("picooling-demand")
+    SubscribeAttributeElectricalMeasurementMeasured3rdHarmonicCurrent()
+        : SubscribeAttribute("measured3rd-harmonic-current")
     {
     }
 
-    ~SubscribeAttributeThermostatPICoolingDemand() {}
+    ~SubscribeAttributeElectricalMeasurementMeasured3rdHarmonicCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000308) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePICoolingDemandWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMeasured3rdHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.PICoolingDemand response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.Measured3rdHarmonicCurrent response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -76415,60 +72951,65 @@ class SubscribeAttributeThermostatPICoolingDemand : public SubscribeAttribute {
 };
 
 /*
- * Attribute PIHeatingDemand
+ * Attribute Measured5thHarmonicCurrent
  */
-class ReadThermostatPIHeatingDemand : public ReadAttribute {
+class ReadElectricalMeasurementMeasured5thHarmonicCurrent : public ReadAttribute {
 public:
-    ReadThermostatPIHeatingDemand()
-        : ReadAttribute("piheating-demand")
+    ReadElectricalMeasurementMeasured5thHarmonicCurrent()
+        : ReadAttribute("measured5th-harmonic-current")
     {
     }
 
-    ~ReadThermostatPIHeatingDemand() {}
+    ~ReadElectricalMeasurementMeasured5thHarmonicCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000309) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributePIHeatingDemandWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.PIHeatingDemand response %@", [value description]);
-            if (error != nil) {
-                LogNSError("Thermostat PIHeatingDemand read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster
+            readAttributeMeasured5thHarmonicCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.Measured5thHarmonicCurrent response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("ElectricalMeasurement Measured5thHarmonicCurrent read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeThermostatPIHeatingDemand : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementMeasured5thHarmonicCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatPIHeatingDemand()
-        : SubscribeAttribute("piheating-demand")
+    SubscribeAttributeElectricalMeasurementMeasured5thHarmonicCurrent()
+        : SubscribeAttribute("measured5th-harmonic-current")
     {
     }
 
-    ~SubscribeAttributeThermostatPIHeatingDemand() {}
+    ~SubscribeAttributeElectricalMeasurementMeasured5thHarmonicCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000309) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePIHeatingDemandWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMeasured5thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.PIHeatingDemand response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.Measured5thHarmonicCurrent response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -76479,28 +73020,30 @@ class SubscribeAttributeThermostatPIHeatingDemand : public SubscribeAttribute {
 };
 
 /*
- * Attribute HVACSystemTypeConfiguration
+ * Attribute Measured7thHarmonicCurrent
  */
-class ReadThermostatHVACSystemTypeConfiguration : public ReadAttribute {
+class ReadElectricalMeasurementMeasured7thHarmonicCurrent : public ReadAttribute {
 public:
-    ReadThermostatHVACSystemTypeConfiguration()
-        : ReadAttribute("hvacsystem-type-configuration")
+    ReadElectricalMeasurementMeasured7thHarmonicCurrent()
+        : ReadAttribute("measured7th-harmonic-current")
     {
     }
 
-    ~ReadThermostatHVACSystemTypeConfiguration() {}
+    ~ReadElectricalMeasurementMeasured7thHarmonicCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000030A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         [cluster
-            readAttributeHVACSystemTypeConfigurationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.HVACSystemTypeConfiguration response %@", [value description]);
+            readAttributeMeasured7thHarmonicCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.Measured7thHarmonicCurrent response %@", [value description]);
                 if (error != nil) {
-                    LogNSError("Thermostat HVACSystemTypeConfiguration read Error", error);
+                    LogNSError("ElectricalMeasurement Measured7thHarmonicCurrent read Error", error);
                 }
                 SetCommandExitStatus(error);
             }];
@@ -76508,70 +73051,34 @@ class ReadThermostatHVACSystemTypeConfiguration : public ReadAttribute {
     }
 };
 
-class WriteThermostatHVACSystemTypeConfiguration : public WriteAttribute {
-public:
-    WriteThermostatHVACSystemTypeConfiguration()
-        : WriteAttribute("hvacsystem-type-configuration")
-    {
-        AddArgument("attr-name", "hvacsystem-type-configuration");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteThermostatHVACSystemTypeConfiguration() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000009) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeHVACSystemTypeConfigurationWithValue:value
-                                                             params:params
-                                                  completionHandler:^(NSError * _Nullable error) {
-                                                      if (error != nil) {
-                                                          LogNSError("Thermostat HVACSystemTypeConfiguration write Error", error);
-                                                      }
-                                                      SetCommandExitStatus(error);
-                                                  }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeThermostatHVACSystemTypeConfiguration : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementMeasured7thHarmonicCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatHVACSystemTypeConfiguration()
-        : SubscribeAttribute("hvacsystem-type-configuration")
+    SubscribeAttributeElectricalMeasurementMeasured7thHarmonicCurrent()
+        : SubscribeAttribute("measured7th-harmonic-current")
     {
     }
 
-    ~SubscribeAttributeThermostatHVACSystemTypeConfiguration() {}
+    ~SubscribeAttributeElectricalMeasurementMeasured7thHarmonicCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000030A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeHVACSystemTypeConfigurationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMeasured7thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.HVACSystemTypeConfiguration response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.Measured7thHarmonicCurrent response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -76582,28 +73089,30 @@ class SubscribeAttributeThermostatHVACSystemTypeConfiguration : public Subscribe
 };
 
 /*
- * Attribute LocalTemperatureCalibration
+ * Attribute Measured9thHarmonicCurrent
  */
-class ReadThermostatLocalTemperatureCalibration : public ReadAttribute {
+class ReadElectricalMeasurementMeasured9thHarmonicCurrent : public ReadAttribute {
 public:
-    ReadThermostatLocalTemperatureCalibration()
-        : ReadAttribute("local-temperature-calibration")
+    ReadElectricalMeasurementMeasured9thHarmonicCurrent()
+        : ReadAttribute("measured9th-harmonic-current")
     {
     }
 
-    ~ReadThermostatLocalTemperatureCalibration() {}
+    ~ReadElectricalMeasurementMeasured9thHarmonicCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000030B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         [cluster
-            readAttributeLocalTemperatureCalibrationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.LocalTemperatureCalibration response %@", [value description]);
+            readAttributeMeasured9thHarmonicCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.Measured9thHarmonicCurrent response %@", [value description]);
                 if (error != nil) {
-                    LogNSError("Thermostat LocalTemperatureCalibration read Error", error);
+                    LogNSError("ElectricalMeasurement Measured9thHarmonicCurrent read Error", error);
                 }
                 SetCommandExitStatus(error);
             }];
@@ -76611,70 +73120,34 @@ class ReadThermostatLocalTemperatureCalibration : public ReadAttribute {
     }
 };
 
-class WriteThermostatLocalTemperatureCalibration : public WriteAttribute {
-public:
-    WriteThermostatLocalTemperatureCalibration()
-        : WriteAttribute("local-temperature-calibration")
-    {
-        AddArgument("attr-name", "local-temperature-calibration");
-        AddArgument("attr-value", INT8_MIN, INT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteThermostatLocalTemperatureCalibration() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000010) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithChar:mValue];
-
-        [cluster writeAttributeLocalTemperatureCalibrationWithValue:value
-                                                             params:params
-                                                  completionHandler:^(NSError * _Nullable error) {
-                                                      if (error != nil) {
-                                                          LogNSError("Thermostat LocalTemperatureCalibration write Error", error);
-                                                      }
-                                                      SetCommandExitStatus(error);
-                                                  }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    int8_t mValue;
-};
-
-class SubscribeAttributeThermostatLocalTemperatureCalibration : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementMeasured9thHarmonicCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatLocalTemperatureCalibration()
-        : SubscribeAttribute("local-temperature-calibration")
+    SubscribeAttributeElectricalMeasurementMeasured9thHarmonicCurrent()
+        : SubscribeAttribute("measured9th-harmonic-current")
     {
     }
 
-    ~SubscribeAttributeThermostatLocalTemperatureCalibration() {}
+    ~SubscribeAttributeElectricalMeasurementMeasured9thHarmonicCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000030B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLocalTemperatureCalibrationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMeasured9thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.LocalTemperatureCalibration response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.Measured9thHarmonicCurrent response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -76685,28 +73158,30 @@ class SubscribeAttributeThermostatLocalTemperatureCalibration : public Subscribe
 };
 
 /*
- * Attribute OccupiedCoolingSetpoint
+ * Attribute Measured11thHarmonicCurrent
  */
-class ReadThermostatOccupiedCoolingSetpoint : public ReadAttribute {
+class ReadElectricalMeasurementMeasured11thHarmonicCurrent : public ReadAttribute {
 public:
-    ReadThermostatOccupiedCoolingSetpoint()
-        : ReadAttribute("occupied-cooling-setpoint")
+    ReadElectricalMeasurementMeasured11thHarmonicCurrent()
+        : ReadAttribute("measured11th-harmonic-current")
     {
     }
 
-    ~ReadThermostatOccupiedCoolingSetpoint() {}
+    ~ReadElectricalMeasurementMeasured11thHarmonicCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000030C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         [cluster
-            readAttributeOccupiedCoolingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.OccupiedCoolingSetpoint response %@", [value description]);
+            readAttributeMeasured11thHarmonicCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.Measured11thHarmonicCurrent response %@", [value description]);
                 if (error != nil) {
-                    LogNSError("Thermostat OccupiedCoolingSetpoint read Error", error);
+                    LogNSError("ElectricalMeasurement Measured11thHarmonicCurrent read Error", error);
                 }
                 SetCommandExitStatus(error);
             }];
@@ -76714,70 +73189,34 @@ class ReadThermostatOccupiedCoolingSetpoint : public ReadAttribute {
     }
 };
 
-class WriteThermostatOccupiedCoolingSetpoint : public WriteAttribute {
-public:
-    WriteThermostatOccupiedCoolingSetpoint()
-        : WriteAttribute("occupied-cooling-setpoint")
-    {
-        AddArgument("attr-name", "occupied-cooling-setpoint");
-        AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteThermostatOccupiedCoolingSetpoint() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000011) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue];
-
-        [cluster writeAttributeOccupiedCoolingSetpointWithValue:value
-                                                         params:params
-                                              completionHandler:^(NSError * _Nullable error) {
-                                                  if (error != nil) {
-                                                      LogNSError("Thermostat OccupiedCoolingSetpoint write Error", error);
-                                                  }
-                                                  SetCommandExitStatus(error);
-                                              }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    int16_t mValue;
-};
-
-class SubscribeAttributeThermostatOccupiedCoolingSetpoint : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementMeasured11thHarmonicCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatOccupiedCoolingSetpoint()
-        : SubscribeAttribute("occupied-cooling-setpoint")
+    SubscribeAttributeElectricalMeasurementMeasured11thHarmonicCurrent()
+        : SubscribeAttribute("measured11th-harmonic-current")
     {
     }
 
-    ~SubscribeAttributeThermostatOccupiedCoolingSetpoint() {}
+    ~SubscribeAttributeElectricalMeasurementMeasured11thHarmonicCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000030C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOccupiedCoolingSetpointWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMeasured11thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.OccupiedCoolingSetpoint response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.Measured11thHarmonicCurrent response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -76788,99 +73227,65 @@ class SubscribeAttributeThermostatOccupiedCoolingSetpoint : public SubscribeAttr
 };
 
 /*
- * Attribute OccupiedHeatingSetpoint
+ * Attribute MeasuredPhase1stHarmonicCurrent
  */
-class ReadThermostatOccupiedHeatingSetpoint : public ReadAttribute {
+class ReadElectricalMeasurementMeasuredPhase1stHarmonicCurrent : public ReadAttribute {
 public:
-    ReadThermostatOccupiedHeatingSetpoint()
-        : ReadAttribute("occupied-heating-setpoint")
+    ReadElectricalMeasurementMeasuredPhase1stHarmonicCurrent()
+        : ReadAttribute("measured-phase1st-harmonic-current")
     {
     }
 
-    ~ReadThermostatOccupiedHeatingSetpoint() {}
+    ~ReadElectricalMeasurementMeasuredPhase1stHarmonicCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000012) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeOccupiedHeatingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.OccupiedHeatingSetpoint response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("Thermostat OccupiedHeatingSetpoint read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteThermostatOccupiedHeatingSetpoint : public WriteAttribute {
-public:
-    WriteThermostatOccupiedHeatingSetpoint()
-        : WriteAttribute("occupied-heating-setpoint")
-    {
-        AddArgument("attr-name", "occupied-heating-setpoint");
-        AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteThermostatOccupiedHeatingSetpoint() {}
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000030D) on endpoint %u", endpointId);
 
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000012) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue];
-
-        [cluster writeAttributeOccupiedHeatingSetpointWithValue:value
-                                                         params:params
-                                              completionHandler:^(NSError * _Nullable error) {
-                                                  if (error != nil) {
-                                                      LogNSError("Thermostat OccupiedHeatingSetpoint write Error", error);
-                                                  }
-                                                  SetCommandExitStatus(error);
-                                              }];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeMeasuredPhase1stHarmonicCurrentWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.MeasuredPhase1stHarmonicCurrent response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ElectricalMeasurement MeasuredPhase1stHarmonicCurrent read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    int16_t mValue;
 };
 
-class SubscribeAttributeThermostatOccupiedHeatingSetpoint : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementMeasuredPhase1stHarmonicCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatOccupiedHeatingSetpoint()
-        : SubscribeAttribute("occupied-heating-setpoint")
+    SubscribeAttributeElectricalMeasurementMeasuredPhase1stHarmonicCurrent()
+        : SubscribeAttribute("measured-phase1st-harmonic-current")
     {
     }
 
-    ~SubscribeAttributeThermostatOccupiedHeatingSetpoint() {}
+    ~SubscribeAttributeElectricalMeasurementMeasuredPhase1stHarmonicCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000030D) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOccupiedHeatingSetpointWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMeasuredPhase1stHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.OccupiedHeatingSetpoint response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.MeasuredPhase1stHarmonicCurrent response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -76891,99 +73296,65 @@ class SubscribeAttributeThermostatOccupiedHeatingSetpoint : public SubscribeAttr
 };
 
 /*
- * Attribute UnoccupiedCoolingSetpoint
+ * Attribute MeasuredPhase3rdHarmonicCurrent
  */
-class ReadThermostatUnoccupiedCoolingSetpoint : public ReadAttribute {
+class ReadElectricalMeasurementMeasuredPhase3rdHarmonicCurrent : public ReadAttribute {
 public:
-    ReadThermostatUnoccupiedCoolingSetpoint()
-        : ReadAttribute("unoccupied-cooling-setpoint")
+    ReadElectricalMeasurementMeasuredPhase3rdHarmonicCurrent()
+        : ReadAttribute("measured-phase3rd-harmonic-current")
     {
     }
 
-    ~ReadThermostatUnoccupiedCoolingSetpoint() {}
+    ~ReadElectricalMeasurementMeasuredPhase3rdHarmonicCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000013) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeUnoccupiedCoolingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.UnoccupiedCoolingSetpoint response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("Thermostat UnoccupiedCoolingSetpoint read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteThermostatUnoccupiedCoolingSetpoint : public WriteAttribute {
-public:
-    WriteThermostatUnoccupiedCoolingSetpoint()
-        : WriteAttribute("unoccupied-cooling-setpoint")
-    {
-        AddArgument("attr-name", "unoccupied-cooling-setpoint");
-        AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteThermostatUnoccupiedCoolingSetpoint() {}
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000030E) on endpoint %u", endpointId);
 
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000013) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue];
-
-        [cluster writeAttributeUnoccupiedCoolingSetpointWithValue:value
-                                                           params:params
-                                                completionHandler:^(NSError * _Nullable error) {
-                                                    if (error != nil) {
-                                                        LogNSError("Thermostat UnoccupiedCoolingSetpoint write Error", error);
-                                                    }
-                                                    SetCommandExitStatus(error);
-                                                }];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeMeasuredPhase3rdHarmonicCurrentWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.MeasuredPhase3rdHarmonicCurrent response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ElectricalMeasurement MeasuredPhase3rdHarmonicCurrent read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    int16_t mValue;
 };
 
-class SubscribeAttributeThermostatUnoccupiedCoolingSetpoint : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementMeasuredPhase3rdHarmonicCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatUnoccupiedCoolingSetpoint()
-        : SubscribeAttribute("unoccupied-cooling-setpoint")
+    SubscribeAttributeElectricalMeasurementMeasuredPhase3rdHarmonicCurrent()
+        : SubscribeAttribute("measured-phase3rd-harmonic-current")
     {
     }
 
-    ~SubscribeAttributeThermostatUnoccupiedCoolingSetpoint() {}
+    ~SubscribeAttributeElectricalMeasurementMeasuredPhase3rdHarmonicCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000030E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeUnoccupiedCoolingSetpointWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMeasuredPhase3rdHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.UnoccupiedCoolingSetpoint response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.MeasuredPhase3rdHarmonicCurrent response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -76994,99 +73365,65 @@ class SubscribeAttributeThermostatUnoccupiedCoolingSetpoint : public SubscribeAt
 };
 
 /*
- * Attribute UnoccupiedHeatingSetpoint
+ * Attribute MeasuredPhase5thHarmonicCurrent
  */
-class ReadThermostatUnoccupiedHeatingSetpoint : public ReadAttribute {
+class ReadElectricalMeasurementMeasuredPhase5thHarmonicCurrent : public ReadAttribute {
 public:
-    ReadThermostatUnoccupiedHeatingSetpoint()
-        : ReadAttribute("unoccupied-heating-setpoint")
+    ReadElectricalMeasurementMeasuredPhase5thHarmonicCurrent()
+        : ReadAttribute("measured-phase5th-harmonic-current")
     {
     }
 
-    ~ReadThermostatUnoccupiedHeatingSetpoint() {}
+    ~ReadElectricalMeasurementMeasuredPhase5thHarmonicCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000014) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeUnoccupiedHeatingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.UnoccupiedHeatingSetpoint response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("Thermostat UnoccupiedHeatingSetpoint read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteThermostatUnoccupiedHeatingSetpoint : public WriteAttribute {
-public:
-    WriteThermostatUnoccupiedHeatingSetpoint()
-        : WriteAttribute("unoccupied-heating-setpoint")
-    {
-        AddArgument("attr-name", "unoccupied-heating-setpoint");
-        AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteThermostatUnoccupiedHeatingSetpoint() {}
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000030F) on endpoint %u", endpointId);
 
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000014) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue];
-
-        [cluster writeAttributeUnoccupiedHeatingSetpointWithValue:value
-                                                           params:params
-                                                completionHandler:^(NSError * _Nullable error) {
-                                                    if (error != nil) {
-                                                        LogNSError("Thermostat UnoccupiedHeatingSetpoint write Error", error);
-                                                    }
-                                                    SetCommandExitStatus(error);
-                                                }];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeMeasuredPhase5thHarmonicCurrentWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.MeasuredPhase5thHarmonicCurrent response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ElectricalMeasurement MeasuredPhase5thHarmonicCurrent read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    int16_t mValue;
 };
 
-class SubscribeAttributeThermostatUnoccupiedHeatingSetpoint : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementMeasuredPhase5thHarmonicCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatUnoccupiedHeatingSetpoint()
-        : SubscribeAttribute("unoccupied-heating-setpoint")
+    SubscribeAttributeElectricalMeasurementMeasuredPhase5thHarmonicCurrent()
+        : SubscribeAttribute("measured-phase5th-harmonic-current")
     {
     }
 
-    ~SubscribeAttributeThermostatUnoccupiedHeatingSetpoint() {}
+    ~SubscribeAttributeElectricalMeasurementMeasuredPhase5thHarmonicCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000014) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000030F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeUnoccupiedHeatingSetpointWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMeasuredPhase5thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.UnoccupiedHeatingSetpoint response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.MeasuredPhase5thHarmonicCurrent response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -77097,27 +73434,30 @@ class SubscribeAttributeThermostatUnoccupiedHeatingSetpoint : public SubscribeAt
 };
 
 /*
- * Attribute MinHeatSetpointLimit
+ * Attribute MeasuredPhase7thHarmonicCurrent
  */
-class ReadThermostatMinHeatSetpointLimit : public ReadAttribute {
+class ReadElectricalMeasurementMeasuredPhase7thHarmonicCurrent : public ReadAttribute {
 public:
-    ReadThermostatMinHeatSetpointLimit()
-        : ReadAttribute("min-heat-setpoint-limit")
+    ReadElectricalMeasurementMeasuredPhase7thHarmonicCurrent()
+        : ReadAttribute("measured-phase7th-harmonic-current")
     {
     }
 
-    ~ReadThermostatMinHeatSetpointLimit() {}
+    ~ReadElectricalMeasurementMeasuredPhase7thHarmonicCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000015) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000310) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeMinHeatSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.MinHeatSetpointLimit response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeMeasuredPhase7thHarmonicCurrentWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.MeasuredPhase7thHarmonicCurrent response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat MinHeatSetpointLimit read Error", error);
+                LogNSError("ElectricalMeasurement MeasuredPhase7thHarmonicCurrent read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -77125,70 +73465,34 @@ class ReadThermostatMinHeatSetpointLimit : public ReadAttribute {
     }
 };
 
-class WriteThermostatMinHeatSetpointLimit : public WriteAttribute {
-public:
-    WriteThermostatMinHeatSetpointLimit()
-        : WriteAttribute("min-heat-setpoint-limit")
-    {
-        AddArgument("attr-name", "min-heat-setpoint-limit");
-        AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteThermostatMinHeatSetpointLimit() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000015) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue];
-
-        [cluster writeAttributeMinHeatSetpointLimitWithValue:value
-                                                      params:params
-                                           completionHandler:^(NSError * _Nullable error) {
-                                               if (error != nil) {
-                                                   LogNSError("Thermostat MinHeatSetpointLimit write Error", error);
-                                               }
-                                               SetCommandExitStatus(error);
-                                           }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    int16_t mValue;
-};
-
-class SubscribeAttributeThermostatMinHeatSetpointLimit : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementMeasuredPhase7thHarmonicCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatMinHeatSetpointLimit()
-        : SubscribeAttribute("min-heat-setpoint-limit")
+    SubscribeAttributeElectricalMeasurementMeasuredPhase7thHarmonicCurrent()
+        : SubscribeAttribute("measured-phase7th-harmonic-current")
     {
     }
 
-    ~SubscribeAttributeThermostatMinHeatSetpointLimit() {}
+    ~SubscribeAttributeElectricalMeasurementMeasuredPhase7thHarmonicCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000015) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000310) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMinHeatSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMeasuredPhase7thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.MinHeatSetpointLimit response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.MeasuredPhase7thHarmonicCurrent response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -77199,27 +73503,30 @@ class SubscribeAttributeThermostatMinHeatSetpointLimit : public SubscribeAttribu
 };
 
 /*
- * Attribute MaxHeatSetpointLimit
+ * Attribute MeasuredPhase9thHarmonicCurrent
  */
-class ReadThermostatMaxHeatSetpointLimit : public ReadAttribute {
+class ReadElectricalMeasurementMeasuredPhase9thHarmonicCurrent : public ReadAttribute {
 public:
-    ReadThermostatMaxHeatSetpointLimit()
-        : ReadAttribute("max-heat-setpoint-limit")
+    ReadElectricalMeasurementMeasuredPhase9thHarmonicCurrent()
+        : ReadAttribute("measured-phase9th-harmonic-current")
     {
     }
 
-    ~ReadThermostatMaxHeatSetpointLimit() {}
+    ~ReadElectricalMeasurementMeasuredPhase9thHarmonicCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000016) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000311) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeMaxHeatSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.MaxHeatSetpointLimit response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeMeasuredPhase9thHarmonicCurrentWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.MeasuredPhase9thHarmonicCurrent response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat MaxHeatSetpointLimit read Error", error);
+                LogNSError("ElectricalMeasurement MeasuredPhase9thHarmonicCurrent read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -77227,70 +73534,34 @@ class ReadThermostatMaxHeatSetpointLimit : public ReadAttribute {
     }
 };
 
-class WriteThermostatMaxHeatSetpointLimit : public WriteAttribute {
-public:
-    WriteThermostatMaxHeatSetpointLimit()
-        : WriteAttribute("max-heat-setpoint-limit")
-    {
-        AddArgument("attr-name", "max-heat-setpoint-limit");
-        AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteThermostatMaxHeatSetpointLimit() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000016) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue];
-
-        [cluster writeAttributeMaxHeatSetpointLimitWithValue:value
-                                                      params:params
-                                           completionHandler:^(NSError * _Nullable error) {
-                                               if (error != nil) {
-                                                   LogNSError("Thermostat MaxHeatSetpointLimit write Error", error);
-                                               }
-                                               SetCommandExitStatus(error);
-                                           }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    int16_t mValue;
-};
-
-class SubscribeAttributeThermostatMaxHeatSetpointLimit : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementMeasuredPhase9thHarmonicCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatMaxHeatSetpointLimit()
-        : SubscribeAttribute("max-heat-setpoint-limit")
+    SubscribeAttributeElectricalMeasurementMeasuredPhase9thHarmonicCurrent()
+        : SubscribeAttribute("measured-phase9th-harmonic-current")
     {
     }
 
-    ~SubscribeAttributeThermostatMaxHeatSetpointLimit() {}
+    ~SubscribeAttributeElectricalMeasurementMeasuredPhase9thHarmonicCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000016) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000311) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMaxHeatSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMeasuredPhase9thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.MaxHeatSetpointLimit response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.MeasuredPhase9thHarmonicCurrent response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -77301,27 +73572,30 @@ class SubscribeAttributeThermostatMaxHeatSetpointLimit : public SubscribeAttribu
 };
 
 /*
- * Attribute MinCoolSetpointLimit
+ * Attribute MeasuredPhase11thHarmonicCurrent
  */
-class ReadThermostatMinCoolSetpointLimit : public ReadAttribute {
+class ReadElectricalMeasurementMeasuredPhase11thHarmonicCurrent : public ReadAttribute {
 public:
-    ReadThermostatMinCoolSetpointLimit()
-        : ReadAttribute("min-cool-setpoint-limit")
+    ReadElectricalMeasurementMeasuredPhase11thHarmonicCurrent()
+        : ReadAttribute("measured-phase11th-harmonic-current")
     {
     }
 
-    ~ReadThermostatMinCoolSetpointLimit() {}
+    ~ReadElectricalMeasurementMeasuredPhase11thHarmonicCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000312) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeMinCoolSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.MinCoolSetpointLimit response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeMeasuredPhase11thHarmonicCurrentWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.MeasuredPhase11thHarmonicCurrent response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat MinCoolSetpointLimit read Error", error);
+                LogNSError("ElectricalMeasurement MeasuredPhase11thHarmonicCurrent read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -77329,70 +73603,34 @@ class ReadThermostatMinCoolSetpointLimit : public ReadAttribute {
     }
 };
 
-class WriteThermostatMinCoolSetpointLimit : public WriteAttribute {
-public:
-    WriteThermostatMinCoolSetpointLimit()
-        : WriteAttribute("min-cool-setpoint-limit")
-    {
-        AddArgument("attr-name", "min-cool-setpoint-limit");
-        AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteThermostatMinCoolSetpointLimit() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000017) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue];
-
-        [cluster writeAttributeMinCoolSetpointLimitWithValue:value
-                                                      params:params
-                                           completionHandler:^(NSError * _Nullable error) {
-                                               if (error != nil) {
-                                                   LogNSError("Thermostat MinCoolSetpointLimit write Error", error);
-                                               }
-                                               SetCommandExitStatus(error);
-                                           }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    int16_t mValue;
-};
-
-class SubscribeAttributeThermostatMinCoolSetpointLimit : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementMeasuredPhase11thHarmonicCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatMinCoolSetpointLimit()
-        : SubscribeAttribute("min-cool-setpoint-limit")
+    SubscribeAttributeElectricalMeasurementMeasuredPhase11thHarmonicCurrent()
+        : SubscribeAttribute("measured-phase11th-harmonic-current")
     {
     }
 
-    ~SubscribeAttributeThermostatMinCoolSetpointLimit() {}
+    ~SubscribeAttributeElectricalMeasurementMeasuredPhase11thHarmonicCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000312) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMinCoolSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeMeasuredPhase11thHarmonicCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.MinCoolSetpointLimit response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.MeasuredPhase11thHarmonicCurrent response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -77403,27 +73641,29 @@ class SubscribeAttributeThermostatMinCoolSetpointLimit : public SubscribeAttribu
 };
 
 /*
- * Attribute MaxCoolSetpointLimit
+ * Attribute AcFrequencyMultiplier
  */
-class ReadThermostatMaxCoolSetpointLimit : public ReadAttribute {
+class ReadElectricalMeasurementAcFrequencyMultiplier : public ReadAttribute {
 public:
-    ReadThermostatMaxCoolSetpointLimit()
-        : ReadAttribute("max-cool-setpoint-limit")
+    ReadElectricalMeasurementAcFrequencyMultiplier()
+        : ReadAttribute("ac-frequency-multiplier")
     {
     }
 
-    ~ReadThermostatMaxCoolSetpointLimit() {}
+    ~ReadElectricalMeasurementAcFrequencyMultiplier() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000018) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000400) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeMaxCoolSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.MaxCoolSetpointLimit response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAcFrequencyMultiplierWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AcFrequencyMultiplier response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat MaxCoolSetpointLimit read Error", error);
+                LogNSError("ElectricalMeasurement AcFrequencyMultiplier read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -77431,70 +73671,34 @@ class ReadThermostatMaxCoolSetpointLimit : public ReadAttribute {
     }
 };
 
-class WriteThermostatMaxCoolSetpointLimit : public WriteAttribute {
-public:
-    WriteThermostatMaxCoolSetpointLimit()
-        : WriteAttribute("max-cool-setpoint-limit")
-    {
-        AddArgument("attr-name", "max-cool-setpoint-limit");
-        AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteThermostatMaxCoolSetpointLimit() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000018) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue];
-
-        [cluster writeAttributeMaxCoolSetpointLimitWithValue:value
-                                                      params:params
-                                           completionHandler:^(NSError * _Nullable error) {
-                                               if (error != nil) {
-                                                   LogNSError("Thermostat MaxCoolSetpointLimit write Error", error);
-                                               }
-                                               SetCommandExitStatus(error);
-                                           }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    int16_t mValue;
-};
-
-class SubscribeAttributeThermostatMaxCoolSetpointLimit : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAcFrequencyMultiplier : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatMaxCoolSetpointLimit()
-        : SubscribeAttribute("max-cool-setpoint-limit")
+    SubscribeAttributeElectricalMeasurementAcFrequencyMultiplier()
+        : SubscribeAttribute("ac-frequency-multiplier")
     {
     }
 
-    ~SubscribeAttributeThermostatMaxCoolSetpointLimit() {}
+    ~SubscribeAttributeElectricalMeasurementAcFrequencyMultiplier() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000018) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000400) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMaxCoolSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcFrequencyMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.MaxCoolSetpointLimit response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.AcFrequencyMultiplier response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -77505,27 +73709,29 @@ class SubscribeAttributeThermostatMaxCoolSetpointLimit : public SubscribeAttribu
 };
 
 /*
- * Attribute MinSetpointDeadBand
+ * Attribute AcFrequencyDivisor
  */
-class ReadThermostatMinSetpointDeadBand : public ReadAttribute {
+class ReadElectricalMeasurementAcFrequencyDivisor : public ReadAttribute {
 public:
-    ReadThermostatMinSetpointDeadBand()
-        : ReadAttribute("min-setpoint-dead-band")
+    ReadElectricalMeasurementAcFrequencyDivisor()
+        : ReadAttribute("ac-frequency-divisor")
     {
     }
 
-    ~ReadThermostatMinSetpointDeadBand() {}
+    ~ReadElectricalMeasurementAcFrequencyDivisor() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000019) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000401) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeMinSetpointDeadBandWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.MinSetpointDeadBand response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAcFrequencyDivisorWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AcFrequencyDivisor response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat MinSetpointDeadBand read Error", error);
+                LogNSError("ElectricalMeasurement AcFrequencyDivisor read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -77533,70 +73739,34 @@ class ReadThermostatMinSetpointDeadBand : public ReadAttribute {
     }
 };
 
-class WriteThermostatMinSetpointDeadBand : public WriteAttribute {
-public:
-    WriteThermostatMinSetpointDeadBand()
-        : WriteAttribute("min-setpoint-dead-band")
-    {
-        AddArgument("attr-name", "min-setpoint-dead-band");
-        AddArgument("attr-value", INT8_MIN, INT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteThermostatMinSetpointDeadBand() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000019) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithChar:mValue];
-
-        [cluster writeAttributeMinSetpointDeadBandWithValue:value
-                                                     params:params
-                                          completionHandler:^(NSError * _Nullable error) {
-                                              if (error != nil) {
-                                                  LogNSError("Thermostat MinSetpointDeadBand write Error", error);
-                                              }
-                                              SetCommandExitStatus(error);
-                                          }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    int8_t mValue;
-};
-
-class SubscribeAttributeThermostatMinSetpointDeadBand : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAcFrequencyDivisor : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatMinSetpointDeadBand()
-        : SubscribeAttribute("min-setpoint-dead-band")
+    SubscribeAttributeElectricalMeasurementAcFrequencyDivisor()
+        : SubscribeAttribute("ac-frequency-divisor")
     {
     }
 
-    ~SubscribeAttributeThermostatMinSetpointDeadBand() {}
+    ~SubscribeAttributeElectricalMeasurementAcFrequencyDivisor() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000019) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000401) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMinSetpointDeadBandWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcFrequencyDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.MinSetpointDeadBand response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.AcFrequencyDivisor response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -77607,27 +73777,29 @@ class SubscribeAttributeThermostatMinSetpointDeadBand : public SubscribeAttribut
 };
 
 /*
- * Attribute RemoteSensing
+ * Attribute PowerMultiplier
  */
-class ReadThermostatRemoteSensing : public ReadAttribute {
+class ReadElectricalMeasurementPowerMultiplier : public ReadAttribute {
 public:
-    ReadThermostatRemoteSensing()
-        : ReadAttribute("remote-sensing")
+    ReadElectricalMeasurementPowerMultiplier()
+        : ReadAttribute("power-multiplier")
     {
     }
 
-    ~ReadThermostatRemoteSensing() {}
+    ~ReadElectricalMeasurementPowerMultiplier() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x0000001A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000402) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeRemoteSensingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.RemoteSensing response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributePowerMultiplierWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.PowerMultiplier response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat RemoteSensing read Error", error);
+                LogNSError("ElectricalMeasurement PowerMultiplier read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -77635,70 +73807,34 @@ class ReadThermostatRemoteSensing : public ReadAttribute {
     }
 };
 
-class WriteThermostatRemoteSensing : public WriteAttribute {
-public:
-    WriteThermostatRemoteSensing()
-        : WriteAttribute("remote-sensing")
-    {
-        AddArgument("attr-name", "remote-sensing");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteThermostatRemoteSensing() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x0000001A) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeRemoteSensingWithValue:value
-                                               params:params
-                                    completionHandler:^(NSError * _Nullable error) {
-                                        if (error != nil) {
-                                            LogNSError("Thermostat RemoteSensing write Error", error);
-                                        }
-                                        SetCommandExitStatus(error);
-                                    }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeThermostatRemoteSensing : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementPowerMultiplier : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatRemoteSensing()
-        : SubscribeAttribute("remote-sensing")
+    SubscribeAttributeElectricalMeasurementPowerMultiplier()
+        : SubscribeAttribute("power-multiplier")
     {
     }
 
-    ~SubscribeAttributeThermostatRemoteSensing() {}
+    ~SubscribeAttributeElectricalMeasurementPowerMultiplier() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x0000001A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000402) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRemoteSensingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePowerMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.RemoteSensing response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.PowerMultiplier response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -77709,99 +73845,64 @@ class SubscribeAttributeThermostatRemoteSensing : public SubscribeAttribute {
 };
 
 /*
- * Attribute ControlSequenceOfOperation
+ * Attribute PowerDivisor
  */
-class ReadThermostatControlSequenceOfOperation : public ReadAttribute {
+class ReadElectricalMeasurementPowerDivisor : public ReadAttribute {
 public:
-    ReadThermostatControlSequenceOfOperation()
-        : ReadAttribute("control-sequence-of-operation")
+    ReadElectricalMeasurementPowerDivisor()
+        : ReadAttribute("power-divisor")
     {
     }
 
-    ~ReadThermostatControlSequenceOfOperation() {}
+    ~ReadElectricalMeasurementPowerDivisor() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x0000001B) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeControlSequenceOfOperationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.ControlSequenceOfOperation response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("Thermostat ControlSequenceOfOperation read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteThermostatControlSequenceOfOperation : public WriteAttribute {
-public:
-    WriteThermostatControlSequenceOfOperation()
-        : WriteAttribute("control-sequence-of-operation")
-    {
-        AddArgument("attr-name", "control-sequence-of-operation");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteThermostatControlSequenceOfOperation() {}
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000403) on endpoint %u", endpointId);
 
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x0000001B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeControlSequenceOfOperationWithValue:value
-                                                            params:params
-                                                 completionHandler:^(NSError * _Nullable error) {
-                                                     if (error != nil) {
-                                                         LogNSError("Thermostat ControlSequenceOfOperation write Error", error);
-                                                     }
-                                                     SetCommandExitStatus(error);
-                                                 }];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributePowerDivisorWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.PowerDivisor response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ElectricalMeasurement PowerDivisor read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    uint8_t mValue;
 };
 
-class SubscribeAttributeThermostatControlSequenceOfOperation : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementPowerDivisor : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatControlSequenceOfOperation()
-        : SubscribeAttribute("control-sequence-of-operation")
+    SubscribeAttributeElectricalMeasurementPowerDivisor()
+        : SubscribeAttribute("power-divisor")
     {
     }
 
-    ~SubscribeAttributeThermostatControlSequenceOfOperation() {}
+    ~SubscribeAttributeElectricalMeasurementPowerDivisor() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x0000001B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000403) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeControlSequenceOfOperationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePowerDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.ControlSequenceOfOperation response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.PowerDivisor response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -77812,98 +73913,65 @@ class SubscribeAttributeThermostatControlSequenceOfOperation : public SubscribeA
 };
 
 /*
- * Attribute SystemMode
+ * Attribute HarmonicCurrentMultiplier
  */
-class ReadThermostatSystemMode : public ReadAttribute {
+class ReadElectricalMeasurementHarmonicCurrentMultiplier : public ReadAttribute {
 public:
-    ReadThermostatSystemMode()
-        : ReadAttribute("system-mode")
+    ReadElectricalMeasurementHarmonicCurrentMultiplier()
+        : ReadAttribute("harmonic-current-multiplier")
     {
     }
 
-    ~ReadThermostatSystemMode() {}
+    ~ReadElectricalMeasurementHarmonicCurrentMultiplier() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x0000001C) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeSystemModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.SystemMode response %@", [value description]);
-            if (error != nil) {
-                LogNSError("Thermostat SystemMode read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteThermostatSystemMode : public WriteAttribute {
-public:
-    WriteThermostatSystemMode()
-        : WriteAttribute("system-mode")
-    {
-        AddArgument("attr-name", "system-mode");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteThermostatSystemMode() {}
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000404) on endpoint %u", endpointId);
 
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x0000001C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeSystemModeWithValue:value
-                                            params:params
-                                 completionHandler:^(NSError * _Nullable error) {
-                                     if (error != nil) {
-                                         LogNSError("Thermostat SystemMode write Error", error);
-                                     }
-                                     SetCommandExitStatus(error);
-                                 }];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster
+            readAttributeHarmonicCurrentMultiplierWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.HarmonicCurrentMultiplier response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("ElectricalMeasurement HarmonicCurrentMultiplier read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    uint8_t mValue;
 };
 
-class SubscribeAttributeThermostatSystemMode : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementHarmonicCurrentMultiplier : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatSystemMode()
-        : SubscribeAttribute("system-mode")
+    SubscribeAttributeElectricalMeasurementHarmonicCurrentMultiplier()
+        : SubscribeAttribute("harmonic-current-multiplier")
     {
     }
 
-    ~SubscribeAttributeThermostatSystemMode() {}
+    ~SubscribeAttributeElectricalMeasurementHarmonicCurrentMultiplier() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x0000001C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000404) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSystemModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeHarmonicCurrentMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.SystemMode response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.HarmonicCurrentMultiplier response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -77914,27 +73982,30 @@ class SubscribeAttributeThermostatSystemMode : public SubscribeAttribute {
 };
 
 /*
- * Attribute ThermostatRunningMode
+ * Attribute PhaseHarmonicCurrentMultiplier
  */
-class ReadThermostatThermostatRunningMode : public ReadAttribute {
+class ReadElectricalMeasurementPhaseHarmonicCurrentMultiplier : public ReadAttribute {
 public:
-    ReadThermostatThermostatRunningMode()
-        : ReadAttribute("thermostat-running-mode")
+    ReadElectricalMeasurementPhaseHarmonicCurrentMultiplier()
+        : ReadAttribute("phase-harmonic-current-multiplier")
     {
     }
 
-    ~ReadThermostatThermostatRunningMode() {}
+    ~ReadElectricalMeasurementPhaseHarmonicCurrentMultiplier() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x0000001E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000405) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeThermostatRunningModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.ThermostatRunningMode response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributePhaseHarmonicCurrentMultiplierWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.PhaseHarmonicCurrentMultiplier response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat ThermostatRunningMode read Error", error);
+                LogNSError("ElectricalMeasurement PhaseHarmonicCurrentMultiplier read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -77942,32 +74013,34 @@ class ReadThermostatThermostatRunningMode : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThermostatThermostatRunningMode : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementPhaseHarmonicCurrentMultiplier : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatThermostatRunningMode()
-        : SubscribeAttribute("thermostat-running-mode")
+    SubscribeAttributeElectricalMeasurementPhaseHarmonicCurrentMultiplier()
+        : SubscribeAttribute("phase-harmonic-current-multiplier")
     {
     }
 
-    ~SubscribeAttributeThermostatThermostatRunningMode() {}
+    ~SubscribeAttributeElectricalMeasurementPhaseHarmonicCurrentMultiplier() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x0000001E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000405) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeThermostatRunningModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePhaseHarmonicCurrentMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.ThermostatRunningMode response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.PhaseHarmonicCurrentMultiplier response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -77978,27 +74051,29 @@ class SubscribeAttributeThermostatThermostatRunningMode : public SubscribeAttrib
 };
 
 /*
- * Attribute StartOfWeek
+ * Attribute InstantaneousVoltage
  */
-class ReadThermostatStartOfWeek : public ReadAttribute {
+class ReadElectricalMeasurementInstantaneousVoltage : public ReadAttribute {
 public:
-    ReadThermostatStartOfWeek()
-        : ReadAttribute("start-of-week")
+    ReadElectricalMeasurementInstantaneousVoltage()
+        : ReadAttribute("instantaneous-voltage")
     {
     }
 
-    ~ReadThermostatStartOfWeek() {}
+    ~ReadElectricalMeasurementInstantaneousVoltage() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000020) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000500) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeStartOfWeekWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.StartOfWeek response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeInstantaneousVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.InstantaneousVoltage response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat StartOfWeek read Error", error);
+                LogNSError("ElectricalMeasurement InstantaneousVoltage read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -78006,32 +74081,34 @@ class ReadThermostatStartOfWeek : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThermostatStartOfWeek : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementInstantaneousVoltage : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatStartOfWeek()
-        : SubscribeAttribute("start-of-week")
+    SubscribeAttributeElectricalMeasurementInstantaneousVoltage()
+        : SubscribeAttribute("instantaneous-voltage")
     {
     }
 
-    ~SubscribeAttributeThermostatStartOfWeek() {}
+    ~SubscribeAttributeElectricalMeasurementInstantaneousVoltage() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000020) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000500) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeStartOfWeekWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInstantaneousVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.StartOfWeek response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.InstantaneousVoltage response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -78042,28 +74119,30 @@ class SubscribeAttributeThermostatStartOfWeek : public SubscribeAttribute {
 };
 
 /*
- * Attribute NumberOfWeeklyTransitions
+ * Attribute InstantaneousLineCurrent
  */
-class ReadThermostatNumberOfWeeklyTransitions : public ReadAttribute {
+class ReadElectricalMeasurementInstantaneousLineCurrent : public ReadAttribute {
 public:
-    ReadThermostatNumberOfWeeklyTransitions()
-        : ReadAttribute("number-of-weekly-transitions")
+    ReadElectricalMeasurementInstantaneousLineCurrent()
+        : ReadAttribute("instantaneous-line-current")
     {
     }
 
-    ~ReadThermostatNumberOfWeeklyTransitions() {}
+    ~ReadElectricalMeasurementInstantaneousLineCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000021) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000501) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         [cluster
-            readAttributeNumberOfWeeklyTransitionsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.NumberOfWeeklyTransitions response %@", [value description]);
+            readAttributeInstantaneousLineCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.InstantaneousLineCurrent response %@", [value description]);
                 if (error != nil) {
-                    LogNSError("Thermostat NumberOfWeeklyTransitions read Error", error);
+                    LogNSError("ElectricalMeasurement InstantaneousLineCurrent read Error", error);
                 }
                 SetCommandExitStatus(error);
             }];
@@ -78071,32 +74150,34 @@ class ReadThermostatNumberOfWeeklyTransitions : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThermostatNumberOfWeeklyTransitions : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementInstantaneousLineCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatNumberOfWeeklyTransitions()
-        : SubscribeAttribute("number-of-weekly-transitions")
+    SubscribeAttributeElectricalMeasurementInstantaneousLineCurrent()
+        : SubscribeAttribute("instantaneous-line-current")
     {
     }
 
-    ~SubscribeAttributeThermostatNumberOfWeeklyTransitions() {}
+    ~SubscribeAttributeElectricalMeasurementInstantaneousLineCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000021) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000501) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNumberOfWeeklyTransitionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInstantaneousLineCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.NumberOfWeeklyTransitions response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.InstantaneousLineCurrent response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -78107,28 +74188,30 @@ class SubscribeAttributeThermostatNumberOfWeeklyTransitions : public SubscribeAt
 };
 
 /*
- * Attribute NumberOfDailyTransitions
+ * Attribute InstantaneousActiveCurrent
  */
-class ReadThermostatNumberOfDailyTransitions : public ReadAttribute {
+class ReadElectricalMeasurementInstantaneousActiveCurrent : public ReadAttribute {
 public:
-    ReadThermostatNumberOfDailyTransitions()
-        : ReadAttribute("number-of-daily-transitions")
+    ReadElectricalMeasurementInstantaneousActiveCurrent()
+        : ReadAttribute("instantaneous-active-current")
     {
     }
 
-    ~ReadThermostatNumberOfDailyTransitions() {}
+    ~ReadElectricalMeasurementInstantaneousActiveCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000022) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000502) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         [cluster
-            readAttributeNumberOfDailyTransitionsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.NumberOfDailyTransitions response %@", [value description]);
+            readAttributeInstantaneousActiveCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.InstantaneousActiveCurrent response %@", [value description]);
                 if (error != nil) {
-                    LogNSError("Thermostat NumberOfDailyTransitions read Error", error);
+                    LogNSError("ElectricalMeasurement InstantaneousActiveCurrent read Error", error);
                 }
                 SetCommandExitStatus(error);
             }];
@@ -78136,32 +74219,34 @@ class ReadThermostatNumberOfDailyTransitions : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThermostatNumberOfDailyTransitions : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementInstantaneousActiveCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatNumberOfDailyTransitions()
-        : SubscribeAttribute("number-of-daily-transitions")
+    SubscribeAttributeElectricalMeasurementInstantaneousActiveCurrent()
+        : SubscribeAttribute("instantaneous-active-current")
     {
     }
 
-    ~SubscribeAttributeThermostatNumberOfDailyTransitions() {}
+    ~SubscribeAttributeElectricalMeasurementInstantaneousActiveCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000022) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000502) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNumberOfDailyTransitionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInstantaneousActiveCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.NumberOfDailyTransitions response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.InstantaneousActiveCurrent response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -78172,99 +74257,65 @@ class SubscribeAttributeThermostatNumberOfDailyTransitions : public SubscribeAtt
 };
 
 /*
- * Attribute TemperatureSetpointHold
+ * Attribute InstantaneousReactiveCurrent
  */
-class ReadThermostatTemperatureSetpointHold : public ReadAttribute {
+class ReadElectricalMeasurementInstantaneousReactiveCurrent : public ReadAttribute {
 public:
-    ReadThermostatTemperatureSetpointHold()
-        : ReadAttribute("temperature-setpoint-hold")
+    ReadElectricalMeasurementInstantaneousReactiveCurrent()
+        : ReadAttribute("instantaneous-reactive-current")
     {
     }
 
-    ~ReadThermostatTemperatureSetpointHold() {}
+    ~ReadElectricalMeasurementInstantaneousReactiveCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000023) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeTemperatureSetpointHoldWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.TemperatureSetpointHold response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("Thermostat TemperatureSetpointHold read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteThermostatTemperatureSetpointHold : public WriteAttribute {
-public:
-    WriteThermostatTemperatureSetpointHold()
-        : WriteAttribute("temperature-setpoint-hold")
-    {
-        AddArgument("attr-name", "temperature-setpoint-hold");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteThermostatTemperatureSetpointHold() {}
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000503) on endpoint %u", endpointId);
 
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000023) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeTemperatureSetpointHoldWithValue:value
-                                                         params:params
-                                              completionHandler:^(NSError * _Nullable error) {
-                                                  if (error != nil) {
-                                                      LogNSError("Thermostat TemperatureSetpointHold write Error", error);
-                                                  }
-                                                  SetCommandExitStatus(error);
-                                              }];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeInstantaneousReactiveCurrentWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.InstantaneousReactiveCurrent response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ElectricalMeasurement InstantaneousReactiveCurrent read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    uint8_t mValue;
 };
 
-class SubscribeAttributeThermostatTemperatureSetpointHold : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementInstantaneousReactiveCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatTemperatureSetpointHold()
-        : SubscribeAttribute("temperature-setpoint-hold")
+    SubscribeAttributeElectricalMeasurementInstantaneousReactiveCurrent()
+        : SubscribeAttribute("instantaneous-reactive-current")
     {
     }
 
-    ~SubscribeAttributeThermostatTemperatureSetpointHold() {}
+    ~SubscribeAttributeElectricalMeasurementInstantaneousReactiveCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000023) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000503) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTemperatureSetpointHoldWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInstantaneousReactiveCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.TemperatureSetpointHold response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.InstantaneousReactiveCurrent response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -78275,28 +74326,29 @@ class SubscribeAttributeThermostatTemperatureSetpointHold : public SubscribeAttr
 };
 
 /*
- * Attribute TemperatureSetpointHoldDuration
+ * Attribute InstantaneousPower
  */
-class ReadThermostatTemperatureSetpointHoldDuration : public ReadAttribute {
+class ReadElectricalMeasurementInstantaneousPower : public ReadAttribute {
 public:
-    ReadThermostatTemperatureSetpointHoldDuration()
-        : ReadAttribute("temperature-setpoint-hold-duration")
+    ReadElectricalMeasurementInstantaneousPower()
+        : ReadAttribute("instantaneous-power")
     {
     }
 
-    ~ReadThermostatTemperatureSetpointHoldDuration() {}
+    ~ReadElectricalMeasurementInstantaneousPower() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000024) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000504) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeTemperatureSetpointHoldDurationWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.TemperatureSetpointHoldDuration response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeInstantaneousPowerWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.InstantaneousPower response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat TemperatureSetpointHoldDuration read Error", error);
+                LogNSError("ElectricalMeasurement InstantaneousPower read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -78304,71 +74356,34 @@ class ReadThermostatTemperatureSetpointHoldDuration : public ReadAttribute {
     }
 };
 
-class WriteThermostatTemperatureSetpointHoldDuration : public WriteAttribute {
-public:
-    WriteThermostatTemperatureSetpointHoldDuration()
-        : WriteAttribute("temperature-setpoint-hold-duration")
-    {
-        AddArgument("attr-name", "temperature-setpoint-hold-duration");
-        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteThermostatTemperatureSetpointHoldDuration() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000024) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedShort:mValue];
-
-        [cluster writeAttributeTemperatureSetpointHoldDurationWithValue:value
-                                                                 params:params
-                                                      completionHandler:^(NSError * _Nullable error) {
-                                                          if (error != nil) {
-                                                              LogNSError(
-                                                                  "Thermostat TemperatureSetpointHoldDuration write Error", error);
-                                                          }
-                                                          SetCommandExitStatus(error);
-                                                      }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
-
-class SubscribeAttributeThermostatTemperatureSetpointHoldDuration : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementInstantaneousPower : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatTemperatureSetpointHoldDuration()
-        : SubscribeAttribute("temperature-setpoint-hold-duration")
+    SubscribeAttributeElectricalMeasurementInstantaneousPower()
+        : SubscribeAttribute("instantaneous-power")
     {
     }
 
-    ~SubscribeAttributeThermostatTemperatureSetpointHoldDuration() {}
+    ~SubscribeAttributeElectricalMeasurementInstantaneousPower() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000024) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000504) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTemperatureSetpointHoldDurationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInstantaneousPowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.TemperatureSetpointHoldDuration response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.InstantaneousPower response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -78379,28 +74394,29 @@ class SubscribeAttributeThermostatTemperatureSetpointHoldDuration : public Subsc
 };
 
 /*
- * Attribute ThermostatProgrammingOperationMode
+ * Attribute RmsVoltage
  */
-class ReadThermostatThermostatProgrammingOperationMode : public ReadAttribute {
+class ReadElectricalMeasurementRmsVoltage : public ReadAttribute {
 public:
-    ReadThermostatThermostatProgrammingOperationMode()
-        : ReadAttribute("thermostat-programming-operation-mode")
+    ReadElectricalMeasurementRmsVoltage()
+        : ReadAttribute("rms-voltage")
     {
     }
 
-    ~ReadThermostatThermostatProgrammingOperationMode() {}
+    ~ReadElectricalMeasurementRmsVoltage() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000025) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000505) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeThermostatProgrammingOperationModeWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.ThermostatProgrammingOperationMode response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsVoltage response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat ThermostatProgrammingOperationMode read Error", error);
+                LogNSError("ElectricalMeasurement RmsVoltage read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -78408,72 +74424,102 @@ class ReadThermostatThermostatProgrammingOperationMode : public ReadAttribute {
     }
 };
 
-class WriteThermostatThermostatProgrammingOperationMode : public WriteAttribute {
+class SubscribeAttributeElectricalMeasurementRmsVoltage : public SubscribeAttribute {
 public:
-    WriteThermostatThermostatProgrammingOperationMode()
-        : WriteAttribute("thermostat-programming-operation-mode")
+    SubscribeAttributeElectricalMeasurementRmsVoltage()
+        : SubscribeAttribute("rms-voltage")
     {
-        AddArgument("attr-name", "thermostat-programming-operation-mode");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteThermostatThermostatProgrammingOperationMode() {}
+    ~SubscribeAttributeElectricalMeasurementRmsVoltage() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000025) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000505) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeRmsVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsVoltage response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
-        [cluster
-            writeAttributeThermostatProgrammingOperationModeWithValue:value
-                                                               params:params
-                                                    completionHandler:^(NSError * _Nullable error) {
-                                                        if (error != nil) {
-                                                            LogNSError(
-                                                                "Thermostat ThermostatProgrammingOperationMode write Error", error);
-                                                        }
-                                                        SetCommandExitStatus(error);
-                                                    }];
         return CHIP_NO_ERROR;
     }
+};
 
-private:
-    uint8_t mValue;
+/*
+ * Attribute RmsVoltageMin
+ */
+class ReadElectricalMeasurementRmsVoltageMin : public ReadAttribute {
+public:
+    ReadElectricalMeasurementRmsVoltageMin()
+        : ReadAttribute("rms-voltage-min")
+    {
+    }
+
+    ~ReadElectricalMeasurementRmsVoltageMin() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000506) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsVoltageMinWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsVoltageMin response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ElectricalMeasurement RmsVoltageMin read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
 };
 
-class SubscribeAttributeThermostatThermostatProgrammingOperationMode : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsVoltageMin : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatThermostatProgrammingOperationMode()
-        : SubscribeAttribute("thermostat-programming-operation-mode")
+    SubscribeAttributeElectricalMeasurementRmsVoltageMin()
+        : SubscribeAttribute("rms-voltage-min")
     {
     }
 
-    ~SubscribeAttributeThermostatThermostatProgrammingOperationMode() {}
+    ~SubscribeAttributeElectricalMeasurementRmsVoltageMin() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000025) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000506) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeThermostatProgrammingOperationModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsVoltageMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.ThermostatProgrammingOperationMode response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsVoltageMin response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -78484,27 +74530,29 @@ class SubscribeAttributeThermostatThermostatProgrammingOperationMode : public Su
 };
 
 /*
- * Attribute ThermostatRunningState
+ * Attribute RmsVoltageMax
  */
-class ReadThermostatThermostatRunningState : public ReadAttribute {
+class ReadElectricalMeasurementRmsVoltageMax : public ReadAttribute {
 public:
-    ReadThermostatThermostatRunningState()
-        : ReadAttribute("thermostat-running-state")
+    ReadElectricalMeasurementRmsVoltageMax()
+        : ReadAttribute("rms-voltage-max")
     {
     }
 
-    ~ReadThermostatThermostatRunningState() {}
+    ~ReadElectricalMeasurementRmsVoltageMax() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000029) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000507) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeThermostatRunningStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.ThermostatRunningState response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsVoltageMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsVoltageMax response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat ThermostatRunningState read Error", error);
+                LogNSError("ElectricalMeasurement RmsVoltageMax read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -78512,32 +74560,34 @@ class ReadThermostatThermostatRunningState : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThermostatThermostatRunningState : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsVoltageMax : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatThermostatRunningState()
-        : SubscribeAttribute("thermostat-running-state")
+    SubscribeAttributeElectricalMeasurementRmsVoltageMax()
+        : SubscribeAttribute("rms-voltage-max")
     {
     }
 
-    ~SubscribeAttributeThermostatThermostatRunningState() {}
+    ~SubscribeAttributeElectricalMeasurementRmsVoltageMax() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000029) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000507) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeThermostatRunningStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsVoltageMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.ThermostatRunningState response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsVoltageMax response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -78548,27 +74598,29 @@ class SubscribeAttributeThermostatThermostatRunningState : public SubscribeAttri
 };
 
 /*
- * Attribute SetpointChangeSource
+ * Attribute RmsCurrent
  */
-class ReadThermostatSetpointChangeSource : public ReadAttribute {
+class ReadElectricalMeasurementRmsCurrent : public ReadAttribute {
 public:
-    ReadThermostatSetpointChangeSource()
-        : ReadAttribute("setpoint-change-source")
+    ReadElectricalMeasurementRmsCurrent()
+        : ReadAttribute("rms-current")
     {
     }
 
-    ~ReadThermostatSetpointChangeSource() {}
+    ~ReadElectricalMeasurementRmsCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000030) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000508) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeSetpointChangeSourceWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.SetpointChangeSource response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsCurrentWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsCurrent response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat SetpointChangeSource read Error", error);
+                LogNSError("ElectricalMeasurement RmsCurrent read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -78576,32 +74628,34 @@ class ReadThermostatSetpointChangeSource : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThermostatSetpointChangeSource : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsCurrent : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatSetpointChangeSource()
-        : SubscribeAttribute("setpoint-change-source")
+    SubscribeAttributeElectricalMeasurementRmsCurrent()
+        : SubscribeAttribute("rms-current")
     {
     }
 
-    ~SubscribeAttributeThermostatSetpointChangeSource() {}
+    ~SubscribeAttributeElectricalMeasurementRmsCurrent() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000030) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000508) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSetpointChangeSourceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.SetpointChangeSource response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsCurrent response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -78612,27 +74666,29 @@ class SubscribeAttributeThermostatSetpointChangeSource : public SubscribeAttribu
 };
 
 /*
- * Attribute SetpointChangeAmount
+ * Attribute RmsCurrentMin
  */
-class ReadThermostatSetpointChangeAmount : public ReadAttribute {
+class ReadElectricalMeasurementRmsCurrentMin : public ReadAttribute {
 public:
-    ReadThermostatSetpointChangeAmount()
-        : ReadAttribute("setpoint-change-amount")
+    ReadElectricalMeasurementRmsCurrentMin()
+        : ReadAttribute("rms-current-min")
     {
     }
 
-    ~ReadThermostatSetpointChangeAmount() {}
+    ~ReadElectricalMeasurementRmsCurrentMin() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000031) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000509) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeSetpointChangeAmountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.SetpointChangeAmount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsCurrentMinWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsCurrentMin response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat SetpointChangeAmount read Error", error);
+                LogNSError("ElectricalMeasurement RmsCurrentMin read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -78640,32 +74696,34 @@ class ReadThermostatSetpointChangeAmount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThermostatSetpointChangeAmount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsCurrentMin : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatSetpointChangeAmount()
-        : SubscribeAttribute("setpoint-change-amount")
+    SubscribeAttributeElectricalMeasurementRmsCurrentMin()
+        : SubscribeAttribute("rms-current-min")
     {
     }
 
-    ~SubscribeAttributeThermostatSetpointChangeAmount() {}
+    ~SubscribeAttributeElectricalMeasurementRmsCurrentMin() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000031) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000509) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSetpointChangeAmountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsCurrentMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.SetpointChangeAmount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsCurrentMin response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -78676,28 +74734,29 @@ class SubscribeAttributeThermostatSetpointChangeAmount : public SubscribeAttribu
 };
 
 /*
- * Attribute SetpointChangeSourceTimestamp
+ * Attribute RmsCurrentMax
  */
-class ReadThermostatSetpointChangeSourceTimestamp : public ReadAttribute {
+class ReadElectricalMeasurementRmsCurrentMax : public ReadAttribute {
 public:
-    ReadThermostatSetpointChangeSourceTimestamp()
-        : ReadAttribute("setpoint-change-source-timestamp")
+    ReadElectricalMeasurementRmsCurrentMax()
+        : ReadAttribute("rms-current-max")
     {
     }
 
-    ~ReadThermostatSetpointChangeSourceTimestamp() {}
+    ~ReadElectricalMeasurementRmsCurrentMax() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000032) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000050A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeSetpointChangeSourceTimestampWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.SetpointChangeSourceTimestamp response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsCurrentMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsCurrentMax response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat SetpointChangeSourceTimestamp read Error", error);
+                LogNSError("ElectricalMeasurement RmsCurrentMax read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -78705,32 +74764,34 @@ class ReadThermostatSetpointChangeSourceTimestamp : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThermostatSetpointChangeSourceTimestamp : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsCurrentMax : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatSetpointChangeSourceTimestamp()
-        : SubscribeAttribute("setpoint-change-source-timestamp")
+    SubscribeAttributeElectricalMeasurementRmsCurrentMax()
+        : SubscribeAttribute("rms-current-max")
     {
     }
 
-    ~SubscribeAttributeThermostatSetpointChangeSourceTimestamp() {}
+    ~SubscribeAttributeElectricalMeasurementRmsCurrentMax() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000032) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000050A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSetpointChangeSourceTimestampWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsCurrentMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.SetpointChangeSourceTimestamp response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsCurrentMax response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -78741,27 +74802,29 @@ class SubscribeAttributeThermostatSetpointChangeSourceTimestamp : public Subscri
 };
 
 /*
- * Attribute OccupiedSetback
+ * Attribute ActivePower
  */
-class ReadThermostatOccupiedSetback : public ReadAttribute {
+class ReadElectricalMeasurementActivePower : public ReadAttribute {
 public:
-    ReadThermostatOccupiedSetback()
-        : ReadAttribute("occupied-setback")
+    ReadElectricalMeasurementActivePower()
+        : ReadAttribute("active-power")
     {
     }
 
-    ~ReadThermostatOccupiedSetback() {}
+    ~ReadElectricalMeasurementActivePower() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000034) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000050B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeOccupiedSetbackWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.OccupiedSetback response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeActivePowerWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.ActivePower response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat OccupiedSetback read Error", error);
+                LogNSError("ElectricalMeasurement ActivePower read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -78769,70 +74832,34 @@ class ReadThermostatOccupiedSetback : public ReadAttribute {
     }
 };
 
-class WriteThermostatOccupiedSetback : public WriteAttribute {
+class SubscribeAttributeElectricalMeasurementActivePower : public SubscribeAttribute {
 public:
-    WriteThermostatOccupiedSetback()
-        : WriteAttribute("occupied-setback")
-    {
-        AddArgument("attr-name", "occupied-setback");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteThermostatOccupiedSetback() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000034) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeOccupiedSetbackWithValue:value
-                                                 params:params
-                                      completionHandler:^(NSError * _Nullable error) {
-                                          if (error != nil) {
-                                              LogNSError("Thermostat OccupiedSetback write Error", error);
-                                          }
-                                          SetCommandExitStatus(error);
-                                      }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeThermostatOccupiedSetback : public SubscribeAttribute {
-public:
-    SubscribeAttributeThermostatOccupiedSetback()
-        : SubscribeAttribute("occupied-setback")
+    SubscribeAttributeElectricalMeasurementActivePower()
+        : SubscribeAttribute("active-power")
     {
     }
 
-    ~SubscribeAttributeThermostatOccupiedSetback() {}
+    ~SubscribeAttributeElectricalMeasurementActivePower() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000034) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000050B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOccupiedSetbackWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeActivePowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.OccupiedSetback response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.ActivePower response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -78843,27 +74870,29 @@ class SubscribeAttributeThermostatOccupiedSetback : public SubscribeAttribute {
 };
 
 /*
- * Attribute OccupiedSetbackMin
+ * Attribute ActivePowerMin
  */
-class ReadThermostatOccupiedSetbackMin : public ReadAttribute {
+class ReadElectricalMeasurementActivePowerMin : public ReadAttribute {
 public:
-    ReadThermostatOccupiedSetbackMin()
-        : ReadAttribute("occupied-setback-min")
+    ReadElectricalMeasurementActivePowerMin()
+        : ReadAttribute("active-power-min")
     {
     }
 
-    ~ReadThermostatOccupiedSetbackMin() {}
+    ~ReadElectricalMeasurementActivePowerMin() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000035) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000050C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeOccupiedSetbackMinWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.OccupiedSetbackMin response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeActivePowerMinWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.ActivePowerMin response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat OccupiedSetbackMin read Error", error);
+                LogNSError("ElectricalMeasurement ActivePowerMin read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -78871,32 +74900,34 @@ class ReadThermostatOccupiedSetbackMin : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThermostatOccupiedSetbackMin : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementActivePowerMin : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatOccupiedSetbackMin()
-        : SubscribeAttribute("occupied-setback-min")
+    SubscribeAttributeElectricalMeasurementActivePowerMin()
+        : SubscribeAttribute("active-power-min")
     {
     }
 
-    ~SubscribeAttributeThermostatOccupiedSetbackMin() {}
+    ~SubscribeAttributeElectricalMeasurementActivePowerMin() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000035) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000050C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOccupiedSetbackMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeActivePowerMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.OccupiedSetbackMin response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.ActivePowerMin response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -78907,27 +74938,29 @@ class SubscribeAttributeThermostatOccupiedSetbackMin : public SubscribeAttribute
 };
 
 /*
- * Attribute OccupiedSetbackMax
+ * Attribute ActivePowerMax
  */
-class ReadThermostatOccupiedSetbackMax : public ReadAttribute {
+class ReadElectricalMeasurementActivePowerMax : public ReadAttribute {
 public:
-    ReadThermostatOccupiedSetbackMax()
-        : ReadAttribute("occupied-setback-max")
+    ReadElectricalMeasurementActivePowerMax()
+        : ReadAttribute("active-power-max")
     {
     }
 
-    ~ReadThermostatOccupiedSetbackMax() {}
+    ~ReadElectricalMeasurementActivePowerMax() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000036) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000050D) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeOccupiedSetbackMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.OccupiedSetbackMax response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeActivePowerMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.ActivePowerMax response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat OccupiedSetbackMax read Error", error);
+                LogNSError("ElectricalMeasurement ActivePowerMax read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -78935,32 +74968,34 @@ class ReadThermostatOccupiedSetbackMax : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThermostatOccupiedSetbackMax : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementActivePowerMax : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatOccupiedSetbackMax()
-        : SubscribeAttribute("occupied-setback-max")
+    SubscribeAttributeElectricalMeasurementActivePowerMax()
+        : SubscribeAttribute("active-power-max")
     {
     }
 
-    ~SubscribeAttributeThermostatOccupiedSetbackMax() {}
+    ~SubscribeAttributeElectricalMeasurementActivePowerMax() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000036) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000050D) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOccupiedSetbackMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeActivePowerMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.OccupiedSetbackMax response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.ActivePowerMax response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -78971,27 +75006,29 @@ class SubscribeAttributeThermostatOccupiedSetbackMax : public SubscribeAttribute
 };
 
 /*
- * Attribute UnoccupiedSetback
+ * Attribute ReactivePower
  */
-class ReadThermostatUnoccupiedSetback : public ReadAttribute {
+class ReadElectricalMeasurementReactivePower : public ReadAttribute {
 public:
-    ReadThermostatUnoccupiedSetback()
-        : ReadAttribute("unoccupied-setback")
+    ReadElectricalMeasurementReactivePower()
+        : ReadAttribute("reactive-power")
     {
     }
 
-    ~ReadThermostatUnoccupiedSetback() {}
+    ~ReadElectricalMeasurementReactivePower() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000037) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000050E) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeUnoccupiedSetbackWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.UnoccupiedSetback response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeReactivePowerWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.ReactivePower response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat UnoccupiedSetback read Error", error);
+                LogNSError("ElectricalMeasurement ReactivePower read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -78999,70 +75036,34 @@ class ReadThermostatUnoccupiedSetback : public ReadAttribute {
     }
 };
 
-class WriteThermostatUnoccupiedSetback : public WriteAttribute {
-public:
-    WriteThermostatUnoccupiedSetback()
-        : WriteAttribute("unoccupied-setback")
-    {
-        AddArgument("attr-name", "unoccupied-setback");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteThermostatUnoccupiedSetback() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000037) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeUnoccupiedSetbackWithValue:value
-                                                   params:params
-                                        completionHandler:^(NSError * _Nullable error) {
-                                            if (error != nil) {
-                                                LogNSError("Thermostat UnoccupiedSetback write Error", error);
-                                            }
-                                            SetCommandExitStatus(error);
-                                        }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeThermostatUnoccupiedSetback : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementReactivePower : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatUnoccupiedSetback()
-        : SubscribeAttribute("unoccupied-setback")
+    SubscribeAttributeElectricalMeasurementReactivePower()
+        : SubscribeAttribute("reactive-power")
     {
     }
 
-    ~SubscribeAttributeThermostatUnoccupiedSetback() {}
+    ~SubscribeAttributeElectricalMeasurementReactivePower() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000037) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000050E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeUnoccupiedSetbackWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeReactivePowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.UnoccupiedSetback response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.ReactivePower response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -79073,27 +75074,29 @@ class SubscribeAttributeThermostatUnoccupiedSetback : public SubscribeAttribute
 };
 
 /*
- * Attribute UnoccupiedSetbackMin
+ * Attribute ApparentPower
  */
-class ReadThermostatUnoccupiedSetbackMin : public ReadAttribute {
+class ReadElectricalMeasurementApparentPower : public ReadAttribute {
 public:
-    ReadThermostatUnoccupiedSetbackMin()
-        : ReadAttribute("unoccupied-setback-min")
+    ReadElectricalMeasurementApparentPower()
+        : ReadAttribute("apparent-power")
     {
     }
 
-    ~ReadThermostatUnoccupiedSetbackMin() {}
+    ~ReadElectricalMeasurementApparentPower() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000038) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000050F) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeUnoccupiedSetbackMinWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.UnoccupiedSetbackMin response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeApparentPowerWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.ApparentPower response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat UnoccupiedSetbackMin read Error", error);
+                LogNSError("ElectricalMeasurement ApparentPower read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -79101,32 +75104,34 @@ class ReadThermostatUnoccupiedSetbackMin : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThermostatUnoccupiedSetbackMin : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementApparentPower : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatUnoccupiedSetbackMin()
-        : SubscribeAttribute("unoccupied-setback-min")
+    SubscribeAttributeElectricalMeasurementApparentPower()
+        : SubscribeAttribute("apparent-power")
     {
     }
 
-    ~SubscribeAttributeThermostatUnoccupiedSetbackMin() {}
+    ~SubscribeAttributeElectricalMeasurementApparentPower() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000038) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000050F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeUnoccupiedSetbackMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeApparentPowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.UnoccupiedSetbackMin response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.ApparentPower response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -79137,27 +75142,29 @@ class SubscribeAttributeThermostatUnoccupiedSetbackMin : public SubscribeAttribu
 };
 
 /*
- * Attribute UnoccupiedSetbackMax
+ * Attribute PowerFactor
  */
-class ReadThermostatUnoccupiedSetbackMax : public ReadAttribute {
+class ReadElectricalMeasurementPowerFactor : public ReadAttribute {
 public:
-    ReadThermostatUnoccupiedSetbackMax()
-        : ReadAttribute("unoccupied-setback-max")
+    ReadElectricalMeasurementPowerFactor()
+        : ReadAttribute("power-factor")
     {
     }
 
-    ~ReadThermostatUnoccupiedSetbackMax() {}
+    ~ReadElectricalMeasurementPowerFactor() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000039) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000510) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeUnoccupiedSetbackMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.UnoccupiedSetbackMax response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributePowerFactorWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.PowerFactor response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat UnoccupiedSetbackMax read Error", error);
+                LogNSError("ElectricalMeasurement PowerFactor read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -79165,32 +75172,34 @@ class ReadThermostatUnoccupiedSetbackMax : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThermostatUnoccupiedSetbackMax : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementPowerFactor : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatUnoccupiedSetbackMax()
-        : SubscribeAttribute("unoccupied-setback-max")
+    SubscribeAttributeElectricalMeasurementPowerFactor()
+        : SubscribeAttribute("power-factor")
     {
     }
 
-    ~SubscribeAttributeThermostatUnoccupiedSetbackMax() {}
+    ~SubscribeAttributeElectricalMeasurementPowerFactor() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000039) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000510) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeUnoccupiedSetbackMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePowerFactorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.UnoccupiedSetbackMax response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.PowerFactor response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -79201,27 +75210,30 @@ class SubscribeAttributeThermostatUnoccupiedSetbackMax : public SubscribeAttribu
 };
 
 /*
- * Attribute EmergencyHeatDelta
+ * Attribute AverageRmsVoltageMeasurementPeriod
  */
-class ReadThermostatEmergencyHeatDelta : public ReadAttribute {
+class ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriod : public ReadAttribute {
 public:
-    ReadThermostatEmergencyHeatDelta()
-        : ReadAttribute("emergency-heat-delta")
+    ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriod()
+        : ReadAttribute("average-rms-voltage-measurement-period")
     {
     }
 
-    ~ReadThermostatEmergencyHeatDelta() {}
+    ~ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriod() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x0000003A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000511) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeEmergencyHeatDeltaWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.EmergencyHeatDelta response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAverageRmsVoltageMeasurementPeriodWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AverageRmsVoltageMeasurementPeriod response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat EmergencyHeatDelta read Error", error);
+                LogNSError("ElectricalMeasurement AverageRmsVoltageMeasurementPeriod read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -79229,70 +75241,76 @@ class ReadThermostatEmergencyHeatDelta : public ReadAttribute {
     }
 };
 
-class WriteThermostatEmergencyHeatDelta : public WriteAttribute {
+class WriteElectricalMeasurementAverageRmsVoltageMeasurementPeriod : public WriteAttribute {
 public:
-    WriteThermostatEmergencyHeatDelta()
-        : WriteAttribute("emergency-heat-delta")
+    WriteElectricalMeasurementAverageRmsVoltageMeasurementPeriod()
+        : WriteAttribute("average-rms-voltage-measurement-period")
     {
-        AddArgument("attr-name", "emergency-heat-delta");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        AddArgument("attr-name", "average-rms-voltage-measurement-period");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteThermostatEmergencyHeatDelta() {}
+    ~WriteElectricalMeasurementAverageRmsVoltageMeasurementPeriod() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x0000003A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) WriteAttribute (0x00000511) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
 
-        [cluster writeAttributeEmergencyHeatDeltaWithValue:value
-                                                    params:params
-                                         completionHandler:^(NSError * _Nullable error) {
-                                             if (error != nil) {
-                                                 LogNSError("Thermostat EmergencyHeatDelta write Error", error);
-                                             }
-                                             SetCommandExitStatus(error);
-                                         }];
+        [cluster writeAttributeAverageRmsVoltageMeasurementPeriodWithValue:value
+                                                                    params:params
+                                                         completionHandler:^(NSError * _Nullable error) {
+                                                             if (error != nil) {
+                                                                 LogNSError("ElectricalMeasurement "
+                                                                            "AverageRmsVoltageMeasurementPeriod write Error",
+                                                                     error);
+                                                             }
+                                                             SetCommandExitStatus(error);
+                                                         }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    uint8_t mValue;
+    uint16_t mValue;
 };
 
-class SubscribeAttributeThermostatEmergencyHeatDelta : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriod : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatEmergencyHeatDelta()
-        : SubscribeAttribute("emergency-heat-delta")
+    SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriod()
+        : SubscribeAttribute("average-rms-voltage-measurement-period")
     {
     }
 
-    ~SubscribeAttributeThermostatEmergencyHeatDelta() {}
+    ~SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriod() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x0000003A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000511) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeEmergencyHeatDeltaWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAverageRmsVoltageMeasurementPeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.EmergencyHeatDelta response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.AverageRmsVoltageMeasurementPeriod response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -79303,27 +75321,30 @@ class SubscribeAttributeThermostatEmergencyHeatDelta : public SubscribeAttribute
 };
 
 /*
- * Attribute ACType
+ * Attribute AverageRmsUnderVoltageCounter
  */
-class ReadThermostatACType : public ReadAttribute {
+class ReadElectricalMeasurementAverageRmsUnderVoltageCounter : public ReadAttribute {
 public:
-    ReadThermostatACType()
-        : ReadAttribute("actype")
+    ReadElectricalMeasurementAverageRmsUnderVoltageCounter()
+        : ReadAttribute("average-rms-under-voltage-counter")
     {
     }
 
-    ~ReadThermostatACType() {}
+    ~ReadElectricalMeasurementAverageRmsUnderVoltageCounter() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000040) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000513) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeACTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.ACType response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAverageRmsUnderVoltageCounterWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AverageRmsUnderVoltageCounter response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat ACType read Error", error);
+                LogNSError("ElectricalMeasurement AverageRmsUnderVoltageCounter read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -79331,70 +75352,76 @@ class ReadThermostatACType : public ReadAttribute {
     }
 };
 
-class WriteThermostatACType : public WriteAttribute {
+class WriteElectricalMeasurementAverageRmsUnderVoltageCounter : public WriteAttribute {
 public:
-    WriteThermostatACType()
-        : WriteAttribute("actype")
+    WriteElectricalMeasurementAverageRmsUnderVoltageCounter()
+        : WriteAttribute("average-rms-under-voltage-counter")
     {
-        AddArgument("attr-name", "actype");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        AddArgument("attr-name", "average-rms-under-voltage-counter");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteThermostatACType() {}
+    ~WriteElectricalMeasurementAverageRmsUnderVoltageCounter() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000040) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) WriteAttribute (0x00000513) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
 
-        [cluster writeAttributeACTypeWithValue:value
-                                        params:params
-                             completionHandler:^(NSError * _Nullable error) {
-                                 if (error != nil) {
-                                     LogNSError("Thermostat ACType write Error", error);
-                                 }
-                                 SetCommandExitStatus(error);
-                             }];
+        [cluster
+            writeAttributeAverageRmsUnderVoltageCounterWithValue:value
+                                                          params:params
+                                               completionHandler:^(NSError * _Nullable error) {
+                                                   if (error != nil) {
+                                                       LogNSError("ElectricalMeasurement AverageRmsUnderVoltageCounter write Error",
+                                                           error);
+                                                   }
+                                                   SetCommandExitStatus(error);
+                                               }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    uint8_t mValue;
+    uint16_t mValue;
 };
 
-class SubscribeAttributeThermostatACType : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounter : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatACType()
-        : SubscribeAttribute("actype")
+    SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounter()
+        : SubscribeAttribute("average-rms-under-voltage-counter")
     {
     }
 
-    ~SubscribeAttributeThermostatACType() {}
+    ~SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounter() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000040) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000513) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeACTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAverageRmsUnderVoltageCounterWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.ACType response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.AverageRmsUnderVoltageCounter response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -79405,98 +75432,107 @@ class SubscribeAttributeThermostatACType : public SubscribeAttribute {
 };
 
 /*
- * Attribute ACCapacity
+ * Attribute RmsExtremeOverVoltagePeriod
  */
-class ReadThermostatACCapacity : public ReadAttribute {
+class ReadElectricalMeasurementRmsExtremeOverVoltagePeriod : public ReadAttribute {
 public:
-    ReadThermostatACCapacity()
-        : ReadAttribute("accapacity")
+    ReadElectricalMeasurementRmsExtremeOverVoltagePeriod()
+        : ReadAttribute("rms-extreme-over-voltage-period")
     {
     }
 
-    ~ReadThermostatACCapacity() {}
+    ~ReadElectricalMeasurementRmsExtremeOverVoltagePeriod() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000041) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000514) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeACCapacityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.ACCapacity response %@", [value description]);
-            if (error != nil) {
-                LogNSError("Thermostat ACCapacity read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster
+            readAttributeRmsExtremeOverVoltagePeriodWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsExtremeOverVoltagePeriod response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("ElectricalMeasurement RmsExtremeOverVoltagePeriod read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class WriteThermostatACCapacity : public WriteAttribute {
+class WriteElectricalMeasurementRmsExtremeOverVoltagePeriod : public WriteAttribute {
 public:
-    WriteThermostatACCapacity()
-        : WriteAttribute("accapacity")
+    WriteElectricalMeasurementRmsExtremeOverVoltagePeriod()
+        : WriteAttribute("rms-extreme-over-voltage-period")
     {
-        AddArgument("attr-name", "accapacity");
+        AddArgument("attr-name", "rms-extreme-over-voltage-period");
         AddArgument("attr-value", 0, UINT16_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteThermostatACCapacity() {}
+    ~WriteElectricalMeasurementRmsExtremeOverVoltagePeriod() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000041) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) WriteAttribute (0x00000514) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
         NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
 
-        [cluster writeAttributeACCapacityWithValue:value
-                                            params:params
-                                 completionHandler:^(NSError * _Nullable error) {
-                                     if (error != nil) {
-                                         LogNSError("Thermostat ACCapacity write Error", error);
-                                     }
-                                     SetCommandExitStatus(error);
-                                 }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint16_t mValue;
-};
+        [cluster
+            writeAttributeRmsExtremeOverVoltagePeriodWithValue:value
+                                                        params:params
+                                             completionHandler:^(NSError * _Nullable error) {
+                                                 if (error != nil) {
+                                                     LogNSError(
+                                                         "ElectricalMeasurement RmsExtremeOverVoltagePeriod write Error", error);
+                                                 }
+                                                 SetCommandExitStatus(error);
+                                             }];
+        return CHIP_NO_ERROR;
+    }
 
-class SubscribeAttributeThermostatACCapacity : public SubscribeAttribute {
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriod : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatACCapacity()
-        : SubscribeAttribute("accapacity")
+    SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriod()
+        : SubscribeAttribute("rms-extreme-over-voltage-period")
     {
     }
 
-    ~SubscribeAttributeThermostatACCapacity() {}
+    ~SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriod() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000041) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000514) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeACCapacityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsExtremeOverVoltagePeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.ACCapacity response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsExtremeOverVoltagePeriod response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -79507,27 +75543,30 @@ class SubscribeAttributeThermostatACCapacity : public SubscribeAttribute {
 };
 
 /*
- * Attribute ACRefrigerantType
+ * Attribute RmsExtremeUnderVoltagePeriod
  */
-class ReadThermostatACRefrigerantType : public ReadAttribute {
+class ReadElectricalMeasurementRmsExtremeUnderVoltagePeriod : public ReadAttribute {
 public:
-    ReadThermostatACRefrigerantType()
-        : ReadAttribute("acrefrigerant-type")
+    ReadElectricalMeasurementRmsExtremeUnderVoltagePeriod()
+        : ReadAttribute("rms-extreme-under-voltage-period")
     {
     }
 
-    ~ReadThermostatACRefrigerantType() {}
+    ~ReadElectricalMeasurementRmsExtremeUnderVoltagePeriod() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000042) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000515) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeACRefrigerantTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.ACRefrigerantType response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsExtremeUnderVoltagePeriodWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsExtremeUnderVoltagePeriod response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat ACRefrigerantType read Error", error);
+                LogNSError("ElectricalMeasurement RmsExtremeUnderVoltagePeriod read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -79535,70 +75574,76 @@ class ReadThermostatACRefrigerantType : public ReadAttribute {
     }
 };
 
-class WriteThermostatACRefrigerantType : public WriteAttribute {
+class WriteElectricalMeasurementRmsExtremeUnderVoltagePeriod : public WriteAttribute {
 public:
-    WriteThermostatACRefrigerantType()
-        : WriteAttribute("acrefrigerant-type")
+    WriteElectricalMeasurementRmsExtremeUnderVoltagePeriod()
+        : WriteAttribute("rms-extreme-under-voltage-period")
     {
-        AddArgument("attr-name", "acrefrigerant-type");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        AddArgument("attr-name", "rms-extreme-under-voltage-period");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteThermostatACRefrigerantType() {}
+    ~WriteElectricalMeasurementRmsExtremeUnderVoltagePeriod() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000042) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) WriteAttribute (0x00000515) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
 
-        [cluster writeAttributeACRefrigerantTypeWithValue:value
-                                                   params:params
-                                        completionHandler:^(NSError * _Nullable error) {
-                                            if (error != nil) {
-                                                LogNSError("Thermostat ACRefrigerantType write Error", error);
-                                            }
-                                            SetCommandExitStatus(error);
-                                        }];
+        [cluster
+            writeAttributeRmsExtremeUnderVoltagePeriodWithValue:value
+                                                         params:params
+                                              completionHandler:^(NSError * _Nullable error) {
+                                                  if (error != nil) {
+                                                      LogNSError(
+                                                          "ElectricalMeasurement RmsExtremeUnderVoltagePeriod write Error", error);
+                                                  }
+                                                  SetCommandExitStatus(error);
+                                              }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    uint8_t mValue;
+    uint16_t mValue;
 };
 
-class SubscribeAttributeThermostatACRefrigerantType : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriod : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatACRefrigerantType()
-        : SubscribeAttribute("acrefrigerant-type")
+    SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriod()
+        : SubscribeAttribute("rms-extreme-under-voltage-period")
     {
     }
 
-    ~SubscribeAttributeThermostatACRefrigerantType() {}
+    ~SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriod() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000042) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000515) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeACRefrigerantTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsExtremeUnderVoltagePeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.ACRefrigerantType response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsExtremeUnderVoltagePeriod response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -79609,27 +75654,29 @@ class SubscribeAttributeThermostatACRefrigerantType : public SubscribeAttribute
 };
 
 /*
- * Attribute ACCompressorType
+ * Attribute RmsVoltageSagPeriod
  */
-class ReadThermostatACCompressorType : public ReadAttribute {
+class ReadElectricalMeasurementRmsVoltageSagPeriod : public ReadAttribute {
 public:
-    ReadThermostatACCompressorType()
-        : ReadAttribute("accompressor-type")
+    ReadElectricalMeasurementRmsVoltageSagPeriod()
+        : ReadAttribute("rms-voltage-sag-period")
     {
     }
 
-    ~ReadThermostatACCompressorType() {}
+    ~ReadElectricalMeasurementRmsVoltageSagPeriod() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000043) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000516) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeACCompressorTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.ACCompressorType response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsVoltageSagPeriodWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsVoltageSagPeriod response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat ACCompressorType read Error", error);
+                LogNSError("ElectricalMeasurement RmsVoltageSagPeriod read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -79637,70 +75684,74 @@ class ReadThermostatACCompressorType : public ReadAttribute {
     }
 };
 
-class WriteThermostatACCompressorType : public WriteAttribute {
+class WriteElectricalMeasurementRmsVoltageSagPeriod : public WriteAttribute {
 public:
-    WriteThermostatACCompressorType()
-        : WriteAttribute("accompressor-type")
+    WriteElectricalMeasurementRmsVoltageSagPeriod()
+        : WriteAttribute("rms-voltage-sag-period")
     {
-        AddArgument("attr-name", "accompressor-type");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        AddArgument("attr-name", "rms-voltage-sag-period");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteThermostatACCompressorType() {}
+    ~WriteElectricalMeasurementRmsVoltageSagPeriod() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000043) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) WriteAttribute (0x00000516) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
 
-        [cluster writeAttributeACCompressorTypeWithValue:value
-                                                  params:params
-                                       completionHandler:^(NSError * _Nullable error) {
-                                           if (error != nil) {
-                                               LogNSError("Thermostat ACCompressorType write Error", error);
-                                           }
-                                           SetCommandExitStatus(error);
-                                       }];
+        [cluster writeAttributeRmsVoltageSagPeriodWithValue:value
+                                                     params:params
+                                          completionHandler:^(NSError * _Nullable error) {
+                                              if (error != nil) {
+                                                  LogNSError("ElectricalMeasurement RmsVoltageSagPeriod write Error", error);
+                                              }
+                                              SetCommandExitStatus(error);
+                                          }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    uint8_t mValue;
+    uint16_t mValue;
 };
 
-class SubscribeAttributeThermostatACCompressorType : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriod : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatACCompressorType()
-        : SubscribeAttribute("accompressor-type")
+    SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriod()
+        : SubscribeAttribute("rms-voltage-sag-period")
     {
     }
 
-    ~SubscribeAttributeThermostatACCompressorType() {}
+    ~SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriod() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000043) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000516) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeACCompressorTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsVoltageSagPeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.ACCompressorType response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsVoltageSagPeriod response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -79711,27 +75762,29 @@ class SubscribeAttributeThermostatACCompressorType : public SubscribeAttribute {
 };
 
 /*
- * Attribute ACErrorCode
+ * Attribute RmsVoltageSwellPeriod
  */
-class ReadThermostatACErrorCode : public ReadAttribute {
+class ReadElectricalMeasurementRmsVoltageSwellPeriod : public ReadAttribute {
 public:
-    ReadThermostatACErrorCode()
-        : ReadAttribute("acerror-code")
+    ReadElectricalMeasurementRmsVoltageSwellPeriod()
+        : ReadAttribute("rms-voltage-swell-period")
     {
     }
 
-    ~ReadThermostatACErrorCode() {}
+    ~ReadElectricalMeasurementRmsVoltageSwellPeriod() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000044) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000517) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeACErrorCodeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.ACErrorCode response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsVoltageSwellPeriodWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsVoltageSwellPeriod response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat ACErrorCode read Error", error);
+                LogNSError("ElectricalMeasurement RmsVoltageSwellPeriod read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -79739,70 +75792,74 @@ class ReadThermostatACErrorCode : public ReadAttribute {
     }
 };
 
-class WriteThermostatACErrorCode : public WriteAttribute {
+class WriteElectricalMeasurementRmsVoltageSwellPeriod : public WriteAttribute {
 public:
-    WriteThermostatACErrorCode()
-        : WriteAttribute("acerror-code")
+    WriteElectricalMeasurementRmsVoltageSwellPeriod()
+        : WriteAttribute("rms-voltage-swell-period")
     {
-        AddArgument("attr-name", "acerror-code");
-        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
+        AddArgument("attr-name", "rms-voltage-swell-period");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteThermostatACErrorCode() {}
+    ~WriteElectricalMeasurementRmsVoltageSwellPeriod() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000044) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) WriteAttribute (0x00000517) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue];
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
 
-        [cluster writeAttributeACErrorCodeWithValue:value
-                                             params:params
-                                  completionHandler:^(NSError * _Nullable error) {
-                                      if (error != nil) {
-                                          LogNSError("Thermostat ACErrorCode write Error", error);
-                                      }
-                                      SetCommandExitStatus(error);
-                                  }];
+        [cluster writeAttributeRmsVoltageSwellPeriodWithValue:value
+                                                       params:params
+                                            completionHandler:^(NSError * _Nullable error) {
+                                                if (error != nil) {
+                                                    LogNSError("ElectricalMeasurement RmsVoltageSwellPeriod write Error", error);
+                                                }
+                                                SetCommandExitStatus(error);
+                                            }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    uint32_t mValue;
+    uint16_t mValue;
 };
 
-class SubscribeAttributeThermostatACErrorCode : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriod : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatACErrorCode()
-        : SubscribeAttribute("acerror-code")
+    SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriod()
+        : SubscribeAttribute("rms-voltage-swell-period")
     {
     }
 
-    ~SubscribeAttributeThermostatACErrorCode() {}
+    ~SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriod() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000044) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000517) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeACErrorCodeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsVoltageSwellPeriodWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.ACErrorCode response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsVoltageSwellPeriod response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -79813,27 +75870,29 @@ class SubscribeAttributeThermostatACErrorCode : public SubscribeAttribute {
 };
 
 /*
- * Attribute ACLouverPosition
+ * Attribute AcVoltageMultiplier
  */
-class ReadThermostatACLouverPosition : public ReadAttribute {
+class ReadElectricalMeasurementAcVoltageMultiplier : public ReadAttribute {
 public:
-    ReadThermostatACLouverPosition()
-        : ReadAttribute("aclouver-position")
+    ReadElectricalMeasurementAcVoltageMultiplier()
+        : ReadAttribute("ac-voltage-multiplier")
     {
     }
 
-    ~ReadThermostatACLouverPosition() {}
+    ~ReadElectricalMeasurementAcVoltageMultiplier() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000045) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000600) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeACLouverPositionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.ACLouverPosition response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAcVoltageMultiplierWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AcVoltageMultiplier response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat ACLouverPosition read Error", error);
+                LogNSError("ElectricalMeasurement AcVoltageMultiplier read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -79841,70 +75900,34 @@ class ReadThermostatACLouverPosition : public ReadAttribute {
     }
 };
 
-class WriteThermostatACLouverPosition : public WriteAttribute {
-public:
-    WriteThermostatACLouverPosition()
-        : WriteAttribute("aclouver-position")
-    {
-        AddArgument("attr-name", "aclouver-position");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteThermostatACLouverPosition() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000045) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeACLouverPositionWithValue:value
-                                                  params:params
-                                       completionHandler:^(NSError * _Nullable error) {
-                                           if (error != nil) {
-                                               LogNSError("Thermostat ACLouverPosition write Error", error);
-                                           }
-                                           SetCommandExitStatus(error);
-                                       }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeThermostatACLouverPosition : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAcVoltageMultiplier : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatACLouverPosition()
-        : SubscribeAttribute("aclouver-position")
+    SubscribeAttributeElectricalMeasurementAcVoltageMultiplier()
+        : SubscribeAttribute("ac-voltage-multiplier")
     {
     }
 
-    ~SubscribeAttributeThermostatACLouverPosition() {}
+    ~SubscribeAttributeElectricalMeasurementAcVoltageMultiplier() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000045) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000600) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeACLouverPositionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcVoltageMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.ACLouverPosition response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.AcVoltageMultiplier response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -79915,27 +75938,29 @@ class SubscribeAttributeThermostatACLouverPosition : public SubscribeAttribute {
 };
 
 /*
- * Attribute ACCoilTemperature
+ * Attribute AcVoltageDivisor
  */
-class ReadThermostatACCoilTemperature : public ReadAttribute {
+class ReadElectricalMeasurementAcVoltageDivisor : public ReadAttribute {
 public:
-    ReadThermostatACCoilTemperature()
-        : ReadAttribute("accoil-temperature")
+    ReadElectricalMeasurementAcVoltageDivisor()
+        : ReadAttribute("ac-voltage-divisor")
     {
     }
 
-    ~ReadThermostatACCoilTemperature() {}
+    ~ReadElectricalMeasurementAcVoltageDivisor() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000046) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000601) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeACCoilTemperatureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.ACCoilTemperature response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAcVoltageDivisorWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AcVoltageDivisor response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat ACCoilTemperature read Error", error);
+                LogNSError("ElectricalMeasurement AcVoltageDivisor read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -79943,32 +75968,34 @@ class ReadThermostatACCoilTemperature : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThermostatACCoilTemperature : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAcVoltageDivisor : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatACCoilTemperature()
-        : SubscribeAttribute("accoil-temperature")
+    SubscribeAttributeElectricalMeasurementAcVoltageDivisor()
+        : SubscribeAttribute("ac-voltage-divisor")
     {
     }
 
-    ~SubscribeAttributeThermostatACCoilTemperature() {}
+    ~SubscribeAttributeElectricalMeasurementAcVoltageDivisor() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000046) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000601) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeACCoilTemperatureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcVoltageDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.ACCoilTemperature response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.AcVoltageDivisor response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -79979,27 +76006,29 @@ class SubscribeAttributeThermostatACCoilTemperature : public SubscribeAttribute
 };
 
 /*
- * Attribute ACCapacityformat
+ * Attribute AcCurrentMultiplier
  */
-class ReadThermostatACCapacityformat : public ReadAttribute {
+class ReadElectricalMeasurementAcCurrentMultiplier : public ReadAttribute {
 public:
-    ReadThermostatACCapacityformat()
-        : ReadAttribute("accapacityformat")
+    ReadElectricalMeasurementAcCurrentMultiplier()
+        : ReadAttribute("ac-current-multiplier")
     {
     }
 
-    ~ReadThermostatACCapacityformat() {}
+    ~ReadElectricalMeasurementAcCurrentMultiplier() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000047) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000602) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeACCapacityformatWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.ACCapacityformat response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAcCurrentMultiplierWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AcCurrentMultiplier response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat ACCapacityformat read Error", error);
+                LogNSError("ElectricalMeasurement AcCurrentMultiplier read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -80007,70 +76036,34 @@ class ReadThermostatACCapacityformat : public ReadAttribute {
     }
 };
 
-class WriteThermostatACCapacityformat : public WriteAttribute {
-public:
-    WriteThermostatACCapacityformat()
-        : WriteAttribute("accapacityformat")
-    {
-        AddArgument("attr-name", "accapacityformat");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteThermostatACCapacityformat() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000047) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeACCapacityformatWithValue:value
-                                                  params:params
-                                       completionHandler:^(NSError * _Nullable error) {
-                                           if (error != nil) {
-                                               LogNSError("Thermostat ACCapacityformat write Error", error);
-                                           }
-                                           SetCommandExitStatus(error);
-                                       }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeThermostatACCapacityformat : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAcCurrentMultiplier : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatACCapacityformat()
-        : SubscribeAttribute("accapacityformat")
+    SubscribeAttributeElectricalMeasurementAcCurrentMultiplier()
+        : SubscribeAttribute("ac-current-multiplier")
     {
     }
 
-    ~SubscribeAttributeThermostatACCapacityformat() {}
+    ~SubscribeAttributeElectricalMeasurementAcCurrentMultiplier() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000047) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000602) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeACCapacityformatWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcCurrentMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.ACCapacityformat response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.AcCurrentMultiplier response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -80081,27 +76074,29 @@ class SubscribeAttributeThermostatACCapacityformat : public SubscribeAttribute {
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute AcCurrentDivisor
  */
-class ReadThermostatGeneratedCommandList : public ReadAttribute {
+class ReadElectricalMeasurementAcCurrentDivisor : public ReadAttribute {
 public:
-    ReadThermostatGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadElectricalMeasurementAcCurrentDivisor()
+        : ReadAttribute("ac-current-divisor")
     {
     }
 
-    ~ReadThermostatGeneratedCommandList() {}
+    ~ReadElectricalMeasurementAcCurrentDivisor() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000603) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.GeneratedCommandList response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAcCurrentDivisorWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AcCurrentDivisor response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat GeneratedCommandList read Error", error);
+                LogNSError("ElectricalMeasurement AcCurrentDivisor read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -80109,32 +76104,34 @@ class ReadThermostatGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThermostatGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAcCurrentDivisor : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeElectricalMeasurementAcCurrentDivisor()
+        : SubscribeAttribute("ac-current-divisor")
     {
     }
 
-    ~SubscribeAttributeThermostatGeneratedCommandList() {}
+    ~SubscribeAttributeElectricalMeasurementAcCurrentDivisor() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000603) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcCurrentDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcCurrentDivisor response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -80145,27 +76142,29 @@ class SubscribeAttributeThermostatGeneratedCommandList : public SubscribeAttribu
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute AcPowerMultiplier
  */
-class ReadThermostatAcceptedCommandList : public ReadAttribute {
+class ReadElectricalMeasurementAcPowerMultiplier : public ReadAttribute {
 public:
-    ReadThermostatAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadElectricalMeasurementAcPowerMultiplier()
+        : ReadAttribute("ac-power-multiplier")
     {
     }
 
-    ~ReadThermostatAcceptedCommandList() {}
+    ~ReadElectricalMeasurementAcPowerMultiplier() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000604) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.AcceptedCommandList response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAcPowerMultiplierWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AcPowerMultiplier response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat AcceptedCommandList read Error", error);
+                LogNSError("ElectricalMeasurement AcPowerMultiplier read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -80173,32 +76172,34 @@ class ReadThermostatAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThermostatAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAcPowerMultiplier : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeElectricalMeasurementAcPowerMultiplier()
+        : SubscribeAttribute("ac-power-multiplier")
     {
     }
 
-    ~SubscribeAttributeThermostatAcceptedCommandList() {}
+    ~SubscribeAttributeElectricalMeasurementAcPowerMultiplier() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000604) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcPowerMultiplierWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcPowerMultiplier response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -80209,27 +76210,29 @@ class SubscribeAttributeThermostatAcceptedCommandList : public SubscribeAttribut
 };
 
 /*
- * Attribute AttributeList
+ * Attribute AcPowerDivisor
  */
-class ReadThermostatAttributeList : public ReadAttribute {
+class ReadElectricalMeasurementAcPowerDivisor : public ReadAttribute {
 public:
-    ReadThermostatAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadElectricalMeasurementAcPowerDivisor()
+        : ReadAttribute("ac-power-divisor")
     {
     }
 
-    ~ReadThermostatAttributeList() {}
+    ~ReadElectricalMeasurementAcPowerDivisor() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000605) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.AttributeList response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAcPowerDivisorWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AcPowerDivisor response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat AttributeList read Error", error);
+                LogNSError("ElectricalMeasurement AcPowerDivisor read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -80237,32 +76240,34 @@ class ReadThermostatAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThermostatAttributeList : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAcPowerDivisor : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeElectricalMeasurementAcPowerDivisor()
+        : SubscribeAttribute("ac-power-divisor")
     {
     }
 
-    ~SubscribeAttributeThermostatAttributeList() {}
+    ~SubscribeAttributeElectricalMeasurementAcPowerDivisor() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000605) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcPowerDivisorWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcPowerDivisor response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -80273,27 +76278,29 @@ class SubscribeAttributeThermostatAttributeList : public SubscribeAttribute {
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute OverloadAlarmsMask
  */
-class ReadThermostatFeatureMap : public ReadAttribute {
+class ReadElectricalMeasurementOverloadAlarmsMask : public ReadAttribute {
 public:
-    ReadThermostatFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadElectricalMeasurementOverloadAlarmsMask()
+        : ReadAttribute("overload-alarms-mask")
     {
     }
 
-    ~ReadThermostatFeatureMap() {}
+    ~ReadElectricalMeasurementOverloadAlarmsMask() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000700) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.FeatureMap response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeOverloadAlarmsMaskWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.OverloadAlarmsMask response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat FeatureMap read Error", error);
+                LogNSError("ElectricalMeasurement OverloadAlarmsMask read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -80301,32 +76308,74 @@ class ReadThermostatFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThermostatFeatureMap : public SubscribeAttribute {
+class WriteElectricalMeasurementOverloadAlarmsMask : public WriteAttribute {
 public:
-    SubscribeAttributeThermostatFeatureMap()
-        : SubscribeAttribute("feature-map")
+    WriteElectricalMeasurementOverloadAlarmsMask()
+        : WriteAttribute("overload-alarms-mask")
     {
+        AddArgument("attr-name", "overload-alarms-mask");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeThermostatFeatureMap() {}
+    ~WriteElectricalMeasurementOverloadAlarmsMask() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) WriteAttribute (0x00000700) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeOverloadAlarmsMaskWithValue:value
+                                                    params:params
+                                         completionHandler:^(NSError * _Nullable error) {
+                                             if (error != nil) {
+                                                 LogNSError("ElectricalMeasurement OverloadAlarmsMask write Error", error);
+                                             }
+                                             SetCommandExitStatus(error);
+                                         }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeElectricalMeasurementOverloadAlarmsMask : public SubscribeAttribute {
+public:
+    SubscribeAttributeElectricalMeasurementOverloadAlarmsMask()
+        : SubscribeAttribute("overload-alarms-mask")
+    {
+    }
+
+    ~SubscribeAttributeElectricalMeasurementOverloadAlarmsMask() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000700) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOverloadAlarmsMaskWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.FeatureMap response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.OverloadAlarmsMask response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -80337,27 +76386,29 @@ class SubscribeAttributeThermostatFeatureMap : public SubscribeAttribute {
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute VoltageOverload
  */
-class ReadThermostatClusterRevision : public ReadAttribute {
+class ReadElectricalMeasurementVoltageOverload : public ReadAttribute {
 public:
-    ReadThermostatClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadElectricalMeasurementVoltageOverload()
+        : ReadAttribute("voltage-overload")
     {
     }
 
-    ~ReadThermostatClusterRevision() {}
+    ~ReadElectricalMeasurementVoltageOverload() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000701) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"Thermostat.ClusterRevision response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeVoltageOverloadWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.VoltageOverload response %@", [value description]);
             if (error != nil) {
-                LogNSError("Thermostat ClusterRevision read Error", error);
+                LogNSError("ElectricalMeasurement VoltageOverload read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -80365,32 +76416,34 @@ class ReadThermostatClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThermostatClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementVoltageOverload : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeElectricalMeasurementVoltageOverload()
+        : SubscribeAttribute("voltage-overload")
     {
     }
 
-    ~SubscribeAttributeThermostatClusterRevision() {}
+    ~SubscribeAttributeElectricalMeasurementVoltageOverload() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000701) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeVoltageOverloadWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"Thermostat.ClusterRevision response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.VoltageOverload response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -80400,47 +76453,30 @@ class SubscribeAttributeThermostatClusterRevision : public SubscribeAttribute {
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster ThermostatUserInterfaceConfiguration                        | 0x0204 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * TemperatureDisplayMode                                            | 0x0000 |
-| * KeypadLockout                                                     | 0x0001 |
-| * ScheduleProgrammingVisibility                                     | 0x0002 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Attribute TemperatureDisplayMode
+ * Attribute CurrentOverload
  */
-class ReadThermostatUserInterfaceConfigurationTemperatureDisplayMode : public ReadAttribute {
+class ReadElectricalMeasurementCurrentOverload : public ReadAttribute {
 public:
-    ReadThermostatUserInterfaceConfigurationTemperatureDisplayMode()
-        : ReadAttribute("temperature-display-mode")
+    ReadElectricalMeasurementCurrentOverload()
+        : ReadAttribute("current-overload")
     {
     }
 
-    ~ReadThermostatUserInterfaceConfigurationTemperatureDisplayMode() {}
+    ~ReadElectricalMeasurementCurrentOverload() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000702) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeTemperatureDisplayModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThermostatUserInterfaceConfiguration.TemperatureDisplayMode response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeCurrentOverloadWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.CurrentOverload response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThermostatUserInterfaceConfiguration TemperatureDisplayMode read Error", error);
+                LogNSError("ElectricalMeasurement CurrentOverload read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -80448,74 +76484,34 @@ class ReadThermostatUserInterfaceConfigurationTemperatureDisplayMode : public Re
     }
 };
 
-class WriteThermostatUserInterfaceConfigurationTemperatureDisplayMode : public WriteAttribute {
-public:
-    WriteThermostatUserInterfaceConfigurationTemperatureDisplayMode()
-        : WriteAttribute("temperature-display-mode")
-    {
-        AddArgument("attr-name", "temperature-display-mode");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteThermostatUserInterfaceConfigurationTemperatureDisplayMode() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000204) WriteAttribute (0x00000000) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeTemperatureDisplayModeWithValue:value
-                                                        params:params
-                                             completionHandler:^(NSError * _Nullable error) {
-                                                 if (error != nil) {
-                                                     LogNSError(
-                                                         "ThermostatUserInterfaceConfiguration TemperatureDisplayMode write Error",
-                                                         error);
-                                                 }
-                                                 SetCommandExitStatus(error);
-                                             }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeThermostatUserInterfaceConfigurationTemperatureDisplayMode : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementCurrentOverload : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatUserInterfaceConfigurationTemperatureDisplayMode()
-        : SubscribeAttribute("temperature-display-mode")
+    SubscribeAttributeElectricalMeasurementCurrentOverload()
+        : SubscribeAttribute("current-overload")
     {
     }
 
-    ~SubscribeAttributeThermostatUserInterfaceConfigurationTemperatureDisplayMode() {}
+    ~SubscribeAttributeElectricalMeasurementCurrentOverload() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000702) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTemperatureDisplayModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCurrentOverloadWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThermostatUserInterfaceConfiguration.TemperatureDisplayMode response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.CurrentOverload response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -80526,28 +76522,29 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationTemperatureDisplayMo
 };
 
 /*
- * Attribute KeypadLockout
+ * Attribute AcOverloadAlarmsMask
  */
-class ReadThermostatUserInterfaceConfigurationKeypadLockout : public ReadAttribute {
+class ReadElectricalMeasurementAcOverloadAlarmsMask : public ReadAttribute {
 public:
-    ReadThermostatUserInterfaceConfigurationKeypadLockout()
-        : ReadAttribute("keypad-lockout")
+    ReadElectricalMeasurementAcOverloadAlarmsMask()
+        : ReadAttribute("ac-overload-alarms-mask")
     {
     }
 
-    ~ReadThermostatUserInterfaceConfigurationKeypadLockout() {}
+    ~ReadElectricalMeasurementAcOverloadAlarmsMask() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000800) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeKeypadLockoutWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThermostatUserInterfaceConfiguration.KeypadLockout response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAcOverloadAlarmsMaskWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AcOverloadAlarmsMask response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThermostatUserInterfaceConfiguration KeypadLockout read Error", error);
+                LogNSError("ElectricalMeasurement AcOverloadAlarmsMask read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -80555,72 +76552,74 @@ class ReadThermostatUserInterfaceConfigurationKeypadLockout : public ReadAttribu
     }
 };
 
-class WriteThermostatUserInterfaceConfigurationKeypadLockout : public WriteAttribute {
+class WriteElectricalMeasurementAcOverloadAlarmsMask : public WriteAttribute {
 public:
-    WriteThermostatUserInterfaceConfigurationKeypadLockout()
-        : WriteAttribute("keypad-lockout")
+    WriteElectricalMeasurementAcOverloadAlarmsMask()
+        : WriteAttribute("ac-overload-alarms-mask")
     {
-        AddArgument("attr-name", "keypad-lockout");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        AddArgument("attr-name", "ac-overload-alarms-mask");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteThermostatUserInterfaceConfigurationKeypadLockout() {}
+    ~WriteElectricalMeasurementAcOverloadAlarmsMask() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000204) WriteAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) WriteAttribute (0x00000800) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
 
-        [cluster writeAttributeKeypadLockoutWithValue:value
-                                               params:params
-                                    completionHandler:^(NSError * _Nullable error) {
-                                        if (error != nil) {
-                                            LogNSError("ThermostatUserInterfaceConfiguration KeypadLockout write Error", error);
-                                        }
-                                        SetCommandExitStatus(error);
-                                    }];
+        [cluster writeAttributeAcOverloadAlarmsMaskWithValue:value
+                                                      params:params
+                                           completionHandler:^(NSError * _Nullable error) {
+                                               if (error != nil) {
+                                                   LogNSError("ElectricalMeasurement AcOverloadAlarmsMask write Error", error);
+                                               }
+                                               SetCommandExitStatus(error);
+                                           }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    uint8_t mValue;
+    uint16_t mValue;
 };
 
-class SubscribeAttributeThermostatUserInterfaceConfigurationKeypadLockout : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAcOverloadAlarmsMask : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatUserInterfaceConfigurationKeypadLockout()
-        : SubscribeAttribute("keypad-lockout")
+    SubscribeAttributeElectricalMeasurementAcOverloadAlarmsMask()
+        : SubscribeAttribute("ac-overload-alarms-mask")
     {
     }
 
-    ~SubscribeAttributeThermostatUserInterfaceConfigurationKeypadLockout() {}
+    ~SubscribeAttributeElectricalMeasurementAcOverloadAlarmsMask() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000800) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeKeypadLockoutWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcOverloadAlarmsMaskWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThermostatUserInterfaceConfiguration.KeypadLockout response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.AcOverloadAlarmsMask response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -80631,29 +76630,29 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationKeypadLockout : publ
 };
 
 /*
- * Attribute ScheduleProgrammingVisibility
+ * Attribute AcVoltageOverload
  */
-class ReadThermostatUserInterfaceConfigurationScheduleProgrammingVisibility : public ReadAttribute {
+class ReadElectricalMeasurementAcVoltageOverload : public ReadAttribute {
 public:
-    ReadThermostatUserInterfaceConfigurationScheduleProgrammingVisibility()
-        : ReadAttribute("schedule-programming-visibility")
+    ReadElectricalMeasurementAcVoltageOverload()
+        : ReadAttribute("ac-voltage-overload")
     {
     }
 
-    ~ReadThermostatUserInterfaceConfigurationScheduleProgrammingVisibility() {}
+    ~ReadElectricalMeasurementAcVoltageOverload() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000801) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeScheduleProgrammingVisibilityWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThermostatUserInterfaceConfiguration.ScheduleProgrammingVisibility response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAcVoltageOverloadWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AcVoltageOverload response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThermostatUserInterfaceConfiguration ScheduleProgrammingVisibility read Error", error);
+                LogNSError("ElectricalMeasurement AcVoltageOverload read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -80661,74 +76660,34 @@ class ReadThermostatUserInterfaceConfigurationScheduleProgrammingVisibility : pu
     }
 };
 
-class WriteThermostatUserInterfaceConfigurationScheduleProgrammingVisibility : public WriteAttribute {
-public:
-    WriteThermostatUserInterfaceConfigurationScheduleProgrammingVisibility()
-        : WriteAttribute("schedule-programming-visibility")
-    {
-        AddArgument("attr-name", "schedule-programming-visibility");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteThermostatUserInterfaceConfigurationScheduleProgrammingVisibility() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000204) WriteAttribute (0x00000002) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
-        params.timedWriteTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
-
-        [cluster writeAttributeScheduleProgrammingVisibilityWithValue:value
-                                                               params:params
-                                                    completionHandler:^(NSError * _Nullable error) {
-                                                        if (error != nil) {
-                                                            LogNSError("ThermostatUserInterfaceConfiguration "
-                                                                       "ScheduleProgrammingVisibility write Error",
-                                                                error);
-                                                        }
-                                                        SetCommandExitStatus(error);
-                                                    }];
-        return CHIP_NO_ERROR;
-    }
-
-private:
-    uint8_t mValue;
-};
-
-class SubscribeAttributeThermostatUserInterfaceConfigurationScheduleProgrammingVisibility : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAcVoltageOverload : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatUserInterfaceConfigurationScheduleProgrammingVisibility()
-        : SubscribeAttribute("schedule-programming-visibility")
+    SubscribeAttributeElectricalMeasurementAcVoltageOverload()
+        : SubscribeAttribute("ac-voltage-overload")
     {
     }
 
-    ~SubscribeAttributeThermostatUserInterfaceConfigurationScheduleProgrammingVisibility() {}
+    ~SubscribeAttributeElectricalMeasurementAcVoltageOverload() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000801) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeScheduleProgrammingVisibilityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcVoltageOverloadWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThermostatUserInterfaceConfiguration.ScheduleProgrammingVisibility response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.AcVoltageOverload response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -80739,28 +76698,29 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationScheduleProgrammingV
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute AcCurrentOverload
  */
-class ReadThermostatUserInterfaceConfigurationGeneratedCommandList : public ReadAttribute {
+class ReadElectricalMeasurementAcCurrentOverload : public ReadAttribute {
 public:
-    ReadThermostatUserInterfaceConfigurationGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadElectricalMeasurementAcCurrentOverload()
+        : ReadAttribute("ac-current-overload")
     {
     }
 
-    ~ReadThermostatUserInterfaceConfigurationGeneratedCommandList() {}
+    ~ReadElectricalMeasurementAcCurrentOverload() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000802) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThermostatUserInterfaceConfiguration.GeneratedCommandList response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAcCurrentOverloadWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AcCurrentOverload response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThermostatUserInterfaceConfiguration GeneratedCommandList read Error", error);
+                LogNSError("ElectricalMeasurement AcCurrentOverload read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -80768,33 +76728,34 @@ class ReadThermostatUserInterfaceConfigurationGeneratedCommandList : public Read
     }
 };
 
-class SubscribeAttributeThermostatUserInterfaceConfigurationGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAcCurrentOverload : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatUserInterfaceConfigurationGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeElectricalMeasurementAcCurrentOverload()
+        : SubscribeAttribute("ac-current-overload")
     {
     }
 
-    ~SubscribeAttributeThermostatUserInterfaceConfigurationGeneratedCommandList() {}
+    ~SubscribeAttributeElectricalMeasurementAcCurrentOverload() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000802) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcCurrentOverloadWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThermostatUserInterfaceConfiguration.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcCurrentOverload response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -80805,28 +76766,29 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationGeneratedCommandList
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute AcActivePowerOverload
  */
-class ReadThermostatUserInterfaceConfigurationAcceptedCommandList : public ReadAttribute {
+class ReadElectricalMeasurementAcActivePowerOverload : public ReadAttribute {
 public:
-    ReadThermostatUserInterfaceConfigurationAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadElectricalMeasurementAcActivePowerOverload()
+        : ReadAttribute("ac-active-power-overload")
     {
     }
 
-    ~ReadThermostatUserInterfaceConfigurationAcceptedCommandList() {}
+    ~ReadElectricalMeasurementAcActivePowerOverload() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000803) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThermostatUserInterfaceConfiguration.AcceptedCommandList response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAcActivePowerOverloadWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AcActivePowerOverload response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThermostatUserInterfaceConfiguration AcceptedCommandList read Error", error);
+                LogNSError("ElectricalMeasurement AcActivePowerOverload read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -80834,33 +76796,34 @@ class ReadThermostatUserInterfaceConfigurationAcceptedCommandList : public ReadA
     }
 };
 
-class SubscribeAttributeThermostatUserInterfaceConfigurationAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAcActivePowerOverload : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatUserInterfaceConfigurationAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeElectricalMeasurementAcActivePowerOverload()
+        : SubscribeAttribute("ac-active-power-overload")
     {
     }
 
-    ~SubscribeAttributeThermostatUserInterfaceConfigurationAcceptedCommandList() {}
+    ~SubscribeAttributeElectricalMeasurementAcActivePowerOverload() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000803) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcActivePowerOverloadWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThermostatUserInterfaceConfiguration.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcActivePowerOverload response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -80871,62 +76834,65 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationAcceptedCommandList
 };
 
 /*
- * Attribute AttributeList
+ * Attribute AcReactivePowerOverload
  */
-class ReadThermostatUserInterfaceConfigurationAttributeList : public ReadAttribute {
+class ReadElectricalMeasurementAcReactivePowerOverload : public ReadAttribute {
 public:
-    ReadThermostatUserInterfaceConfigurationAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadElectricalMeasurementAcReactivePowerOverload()
+        : ReadAttribute("ac-reactive-power-overload")
     {
     }
 
-    ~ReadThermostatUserInterfaceConfigurationAttributeList() {}
+    ~ReadElectricalMeasurementAcReactivePowerOverload() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000804) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThermostatUserInterfaceConfiguration.AttributeList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ThermostatUserInterfaceConfiguration AttributeList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster
+            readAttributeAcReactivePowerOverloadWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcReactivePowerOverload response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("ElectricalMeasurement AcReactivePowerOverload read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeThermostatUserInterfaceConfigurationAttributeList : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAcReactivePowerOverload : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatUserInterfaceConfigurationAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeElectricalMeasurementAcReactivePowerOverload()
+        : SubscribeAttribute("ac-reactive-power-overload")
     {
     }
 
-    ~SubscribeAttributeThermostatUserInterfaceConfigurationAttributeList() {}
+    ~SubscribeAttributeElectricalMeasurementAcReactivePowerOverload() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000804) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcReactivePowerOverloadWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThermostatUserInterfaceConfiguration.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcReactivePowerOverload response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -80937,28 +76903,29 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationAttributeList : publ
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute AverageRmsOverVoltage
  */
-class ReadThermostatUserInterfaceConfigurationFeatureMap : public ReadAttribute {
+class ReadElectricalMeasurementAverageRmsOverVoltage : public ReadAttribute {
 public:
-    ReadThermostatUserInterfaceConfigurationFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadElectricalMeasurementAverageRmsOverVoltage()
+        : ReadAttribute("average-rms-over-voltage")
     {
     }
 
-    ~ReadThermostatUserInterfaceConfigurationFeatureMap() {}
+    ~ReadElectricalMeasurementAverageRmsOverVoltage() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000805) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThermostatUserInterfaceConfiguration.FeatureMap response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAverageRmsOverVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AverageRmsOverVoltage response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThermostatUserInterfaceConfiguration FeatureMap read Error", error);
+                LogNSError("ElectricalMeasurement AverageRmsOverVoltage read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -80966,33 +76933,34 @@ class ReadThermostatUserInterfaceConfigurationFeatureMap : public ReadAttribute
     }
 };
 
-class SubscribeAttributeThermostatUserInterfaceConfigurationFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAverageRmsOverVoltage : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatUserInterfaceConfigurationFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeElectricalMeasurementAverageRmsOverVoltage()
+        : SubscribeAttribute("average-rms-over-voltage")
     {
     }
 
-    ~SubscribeAttributeThermostatUserInterfaceConfigurationFeatureMap() {}
+    ~SubscribeAttributeElectricalMeasurementAverageRmsOverVoltage() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000805) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAverageRmsOverVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThermostatUserInterfaceConfiguration.FeatureMap response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.AverageRmsOverVoltage response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -81003,28 +76971,29 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationFeatureMap : public
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute AverageRmsUnderVoltage
  */
-class ReadThermostatUserInterfaceConfigurationClusterRevision : public ReadAttribute {
+class ReadElectricalMeasurementAverageRmsUnderVoltage : public ReadAttribute {
 public:
-    ReadThermostatUserInterfaceConfigurationClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadElectricalMeasurementAverageRmsUnderVoltage()
+        : ReadAttribute("average-rms-under-voltage")
     {
     }
 
-    ~ReadThermostatUserInterfaceConfigurationClusterRevision() {}
+    ~ReadElectricalMeasurementAverageRmsUnderVoltage() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000806) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThermostatUserInterfaceConfiguration.ClusterRevision response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAverageRmsUnderVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AverageRmsUnderVoltage response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThermostatUserInterfaceConfiguration ClusterRevision read Error", error);
+                LogNSError("ElectricalMeasurement AverageRmsUnderVoltage read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -81032,33 +77001,34 @@ class ReadThermostatUserInterfaceConfigurationClusterRevision : public ReadAttri
     }
 };
 
-class SubscribeAttributeThermostatUserInterfaceConfigurationClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltage : public SubscribeAttribute {
 public:
-    SubscribeAttributeThermostatUserInterfaceConfigurationClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltage()
+        : SubscribeAttribute("average-rms-under-voltage")
     {
     }
 
-    ~SubscribeAttributeThermostatUserInterfaceConfigurationClusterRevision() {}
+    ~SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltage() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000204) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000806) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThermostatUserInterfaceConfiguration * cluster =
-            [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAverageRmsUnderVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThermostatUserInterfaceConfiguration.ClusterRevision response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.AverageRmsUnderVoltage response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -81068,153 +77038,30 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationClusterRevision : pu
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster ThreadNetworkDiagnostics                                    | 0x0035 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * ResetCounts                                                       |   0x00 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * Channel                                                           | 0x0000 |
-| * RoutingRole                                                       | 0x0001 |
-| * NetworkName                                                       | 0x0002 |
-| * PanId                                                             | 0x0003 |
-| * ExtendedPanId                                                     | 0x0004 |
-| * MeshLocalPrefix                                                   | 0x0005 |
-| * OverrunCount                                                      | 0x0006 |
-| * NeighborTableList                                                 | 0x0007 |
-| * RouteTableList                                                    | 0x0008 |
-| * PartitionId                                                       | 0x0009 |
-| * Weighting                                                         | 0x000A |
-| * DataVersion                                                       | 0x000B |
-| * StableDataVersion                                                 | 0x000C |
-| * LeaderRouterId                                                    | 0x000D |
-| * DetachedRoleCount                                                 | 0x000E |
-| * ChildRoleCount                                                    | 0x000F |
-| * RouterRoleCount                                                   | 0x0010 |
-| * LeaderRoleCount                                                   | 0x0011 |
-| * AttachAttemptCount                                                | 0x0012 |
-| * PartitionIdChangeCount                                            | 0x0013 |
-| * BetterPartitionAttachAttemptCount                                 | 0x0014 |
-| * ParentChangeCount                                                 | 0x0015 |
-| * TxTotalCount                                                      | 0x0016 |
-| * TxUnicastCount                                                    | 0x0017 |
-| * TxBroadcastCount                                                  | 0x0018 |
-| * TxAckRequestedCount                                               | 0x0019 |
-| * TxAckedCount                                                      | 0x001A |
-| * TxNoAckRequestedCount                                             | 0x001B |
-| * TxDataCount                                                       | 0x001C |
-| * TxDataPollCount                                                   | 0x001D |
-| * TxBeaconCount                                                     | 0x001E |
-| * TxBeaconRequestCount                                              | 0x001F |
-| * TxOtherCount                                                      | 0x0020 |
-| * TxRetryCount                                                      | 0x0021 |
-| * TxDirectMaxRetryExpiryCount                                       | 0x0022 |
-| * TxIndirectMaxRetryExpiryCount                                     | 0x0023 |
-| * TxErrCcaCount                                                     | 0x0024 |
-| * TxErrAbortCount                                                   | 0x0025 |
-| * TxErrBusyChannelCount                                             | 0x0026 |
-| * RxTotalCount                                                      | 0x0027 |
-| * RxUnicastCount                                                    | 0x0028 |
-| * RxBroadcastCount                                                  | 0x0029 |
-| * RxDataCount                                                       | 0x002A |
-| * RxDataPollCount                                                   | 0x002B |
-| * RxBeaconCount                                                     | 0x002C |
-| * RxBeaconRequestCount                                              | 0x002D |
-| * RxOtherCount                                                      | 0x002E |
-| * RxAddressFilteredCount                                            | 0x002F |
-| * RxDestAddrFilteredCount                                           | 0x0030 |
-| * RxDuplicatedCount                                                 | 0x0031 |
-| * RxErrNoFrameCount                                                 | 0x0032 |
-| * RxErrUnknownNeighborCount                                         | 0x0033 |
-| * RxErrInvalidSrcAddrCount                                          | 0x0034 |
-| * RxErrSecCount                                                     | 0x0035 |
-| * RxErrFcsCount                                                     | 0x0036 |
-| * RxErrOtherCount                                                   | 0x0037 |
-| * ActiveTimestamp                                                   | 0x0038 |
-| * PendingTimestamp                                                  | 0x0039 |
-| * Delay                                                             | 0x003A |
-| * SecurityPolicy                                                    | 0x003B |
-| * ChannelMask                                                       | 0x003C |
-| * OperationalDatasetComponents                                      | 0x003D |
-| * ActiveNetworkFaultsList                                           | 0x003E |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-| * ConnectionStatus                                                  | 0x0000 |
-\*----------------------------------------------------------------------------*/
-
-/*
- * Command ResetCounts
- */
-class ThreadNetworkDiagnosticsResetCounts : public ClusterCommand {
-public:
-    ThreadNetworkDiagnosticsResetCounts()
-        : ClusterCommand("reset-counts")
-    {
-        ClusterCommand::AddArguments();
-    }
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) command (0x00000000) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        __auto_type * params = [[CHIPThreadNetworkDiagnosticsClusterResetCountsParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster resetCountsWithParams:params
-                         completionHandler:^(NSError * _Nullable error) {
-                             responsesNeeded--;
-                             if (error != nil) {
-                                 mError = error;
-                                 LogNSError("Error", error);
-                             }
-                             if (responsesNeeded == 0) {
-                                 SetCommandExitStatus(mError);
-                             }
-                         }];
-        }
-        return CHIP_NO_ERROR;
-    }
-
-private:
-};
-
 /*
- * Attribute Channel
+ * Attribute RmsExtremeOverVoltage
  */
-class ReadThreadNetworkDiagnosticsChannel : public ReadAttribute {
+class ReadElectricalMeasurementRmsExtremeOverVoltage : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsChannel()
-        : ReadAttribute("channel")
+    ReadElectricalMeasurementRmsExtremeOverVoltage()
+        : ReadAttribute("rms-extreme-over-voltage")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsChannel() {}
+    ~ReadElectricalMeasurementRmsExtremeOverVoltage() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000807) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeChannelWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.Channel response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsExtremeOverVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsExtremeOverVoltage response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics Channel read Error", error);
+                LogNSError("ElectricalMeasurement RmsExtremeOverVoltage read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -81222,34 +77069,34 @@ class ReadThreadNetworkDiagnosticsChannel : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsChannel : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltage : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsChannel()
-        : SubscribeAttribute("channel")
+    SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltage()
+        : SubscribeAttribute("rms-extreme-over-voltage")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsChannel() {}
+    ~SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltage() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000807) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeChannelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsExtremeOverVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.Channel response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsExtremeOverVoltage response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -81260,29 +77107,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsChannel : public SubscribeAttrib
 };
 
 /*
- * Attribute RoutingRole
+ * Attribute RmsExtremeUnderVoltage
  */
-class ReadThreadNetworkDiagnosticsRoutingRole : public ReadAttribute {
+class ReadElectricalMeasurementRmsExtremeUnderVoltage : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsRoutingRole()
-        : ReadAttribute("routing-role")
+    ReadElectricalMeasurementRmsExtremeUnderVoltage()
+        : ReadAttribute("rms-extreme-under-voltage")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsRoutingRole() {}
+    ~ReadElectricalMeasurementRmsExtremeUnderVoltage() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000808) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeRoutingRoleWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.RoutingRole response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsExtremeUnderVoltageWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsExtremeUnderVoltage response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics RoutingRole read Error", error);
+                LogNSError("ElectricalMeasurement RmsExtremeUnderVoltage read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -81290,34 +77137,34 @@ class ReadThreadNetworkDiagnosticsRoutingRole : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsRoutingRole : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltage : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsRoutingRole()
-        : SubscribeAttribute("routing-role")
+    SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltage()
+        : SubscribeAttribute("rms-extreme-under-voltage")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsRoutingRole() {}
+    ~SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltage() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000808) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRoutingRoleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsExtremeUnderVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.RoutingRole response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsExtremeUnderVoltage response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -81328,29 +77175,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsRoutingRole : public SubscribeAt
 };
 
 /*
- * Attribute NetworkName
+ * Attribute RmsVoltageSag
  */
-class ReadThreadNetworkDiagnosticsNetworkName : public ReadAttribute {
+class ReadElectricalMeasurementRmsVoltageSag : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsNetworkName()
-        : ReadAttribute("network-name")
+    ReadElectricalMeasurementRmsVoltageSag()
+        : ReadAttribute("rms-voltage-sag")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsNetworkName() {}
+    ~ReadElectricalMeasurementRmsVoltageSag() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000809) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeNetworkNameWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.NetworkName response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsVoltageSagWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsVoltageSag response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics NetworkName read Error", error);
+                LogNSError("ElectricalMeasurement RmsVoltageSag read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -81358,34 +77205,34 @@ class ReadThreadNetworkDiagnosticsNetworkName : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsNetworkName : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsVoltageSag : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsNetworkName()
-        : SubscribeAttribute("network-name")
+    SubscribeAttributeElectricalMeasurementRmsVoltageSag()
+        : SubscribeAttribute("rms-voltage-sag")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsNetworkName() {}
+    ~SubscribeAttributeElectricalMeasurementRmsVoltageSag() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000809) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNetworkNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsVoltageSagWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.NetworkName response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsVoltageSag response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -81396,29 +77243,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsNetworkName : public SubscribeAt
 };
 
 /*
- * Attribute PanId
+ * Attribute RmsVoltageSwell
  */
-class ReadThreadNetworkDiagnosticsPanId : public ReadAttribute {
+class ReadElectricalMeasurementRmsVoltageSwell : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsPanId()
-        : ReadAttribute("pan-id")
+    ReadElectricalMeasurementRmsVoltageSwell()
+        : ReadAttribute("rms-voltage-swell")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsPanId() {}
+    ~ReadElectricalMeasurementRmsVoltageSwell() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000080A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributePanIdWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.PanId response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsVoltageSwellWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsVoltageSwell response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics PanId read Error", error);
+                LogNSError("ElectricalMeasurement RmsVoltageSwell read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -81426,34 +77273,34 @@ class ReadThreadNetworkDiagnosticsPanId : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsPanId : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsVoltageSwell : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsPanId()
-        : SubscribeAttribute("pan-id")
+    SubscribeAttributeElectricalMeasurementRmsVoltageSwell()
+        : SubscribeAttribute("rms-voltage-swell")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsPanId() {}
+    ~SubscribeAttributeElectricalMeasurementRmsVoltageSwell() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000080A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePanIdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsVoltageSwellWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.PanId response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsVoltageSwell response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -81464,29 +77311,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsPanId : public SubscribeAttribut
 };
 
 /*
- * Attribute ExtendedPanId
+ * Attribute LineCurrentPhaseB
  */
-class ReadThreadNetworkDiagnosticsExtendedPanId : public ReadAttribute {
+class ReadElectricalMeasurementLineCurrentPhaseB : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsExtendedPanId()
-        : ReadAttribute("extended-pan-id")
+    ReadElectricalMeasurementLineCurrentPhaseB()
+        : ReadAttribute("line-current-phase-b")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsExtendedPanId() {}
+    ~ReadElectricalMeasurementLineCurrentPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000901) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeExtendedPanIdWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.ExtendedPanId response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeLineCurrentPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.LineCurrentPhaseB response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics ExtendedPanId read Error", error);
+                LogNSError("ElectricalMeasurement LineCurrentPhaseB read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -81494,34 +77341,34 @@ class ReadThreadNetworkDiagnosticsExtendedPanId : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsExtendedPanId : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementLineCurrentPhaseB : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsExtendedPanId()
-        : SubscribeAttribute("extended-pan-id")
+    SubscribeAttributeElectricalMeasurementLineCurrentPhaseB()
+        : SubscribeAttribute("line-current-phase-b")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsExtendedPanId() {}
+    ~SubscribeAttributeElectricalMeasurementLineCurrentPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000901) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeExtendedPanIdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeLineCurrentPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.ExtendedPanId response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.LineCurrentPhaseB response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -81532,29 +77379,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsExtendedPanId : public Subscribe
 };
 
 /*
- * Attribute MeshLocalPrefix
+ * Attribute ActiveCurrentPhaseB
  */
-class ReadThreadNetworkDiagnosticsMeshLocalPrefix : public ReadAttribute {
+class ReadElectricalMeasurementActiveCurrentPhaseB : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsMeshLocalPrefix()
-        : ReadAttribute("mesh-local-prefix")
+    ReadElectricalMeasurementActiveCurrentPhaseB()
+        : ReadAttribute("active-current-phase-b")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsMeshLocalPrefix() {}
+    ~ReadElectricalMeasurementActiveCurrentPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000902) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeMeshLocalPrefixWithCompletionHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.MeshLocalPrefix response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeActiveCurrentPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.ActiveCurrentPhaseB response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics MeshLocalPrefix read Error", error);
+                LogNSError("ElectricalMeasurement ActiveCurrentPhaseB read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -81562,34 +77409,34 @@ class ReadThreadNetworkDiagnosticsMeshLocalPrefix : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsMeshLocalPrefix : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementActiveCurrentPhaseB : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsMeshLocalPrefix()
-        : SubscribeAttribute("mesh-local-prefix")
+    SubscribeAttributeElectricalMeasurementActiveCurrentPhaseB()
+        : SubscribeAttribute("active-current-phase-b")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsMeshLocalPrefix() {}
+    ~SubscribeAttributeElectricalMeasurementActiveCurrentPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000902) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMeshLocalPrefixWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeActiveCurrentPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.MeshLocalPrefix response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.ActiveCurrentPhaseB response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -81600,29 +77447,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsMeshLocalPrefix : public Subscri
 };
 
 /*
- * Attribute OverrunCount
+ * Attribute ReactiveCurrentPhaseB
  */
-class ReadThreadNetworkDiagnosticsOverrunCount : public ReadAttribute {
+class ReadElectricalMeasurementReactiveCurrentPhaseB : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsOverrunCount()
-        : ReadAttribute("overrun-count")
+    ReadElectricalMeasurementReactiveCurrentPhaseB()
+        : ReadAttribute("reactive-current-phase-b")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsOverrunCount() {}
+    ~ReadElectricalMeasurementReactiveCurrentPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000903) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeOverrunCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.OverrunCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeReactiveCurrentPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.ReactiveCurrentPhaseB response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics OverrunCount read Error", error);
+                LogNSError("ElectricalMeasurement ReactiveCurrentPhaseB read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -81630,34 +77477,34 @@ class ReadThreadNetworkDiagnosticsOverrunCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsOverrunCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementReactiveCurrentPhaseB : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsOverrunCount()
-        : SubscribeAttribute("overrun-count")
+    SubscribeAttributeElectricalMeasurementReactiveCurrentPhaseB()
+        : SubscribeAttribute("reactive-current-phase-b")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsOverrunCount() {}
+    ~SubscribeAttributeElectricalMeasurementReactiveCurrentPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000903) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOverrunCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeReactiveCurrentPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.OverrunCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.ReactiveCurrentPhaseB response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -81668,29 +77515,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsOverrunCount : public SubscribeA
 };
 
 /*
- * Attribute NeighborTableList
+ * Attribute RmsVoltagePhaseB
  */
-class ReadThreadNetworkDiagnosticsNeighborTableList : public ReadAttribute {
+class ReadElectricalMeasurementRmsVoltagePhaseB : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsNeighborTableList()
-        : ReadAttribute("neighbor-table-list")
+    ReadElectricalMeasurementRmsVoltagePhaseB()
+        : ReadAttribute("rms-voltage-phase-b")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsNeighborTableList() {}
+    ~ReadElectricalMeasurementRmsVoltagePhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000905) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeNeighborTableListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.NeighborTableList response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsVoltagePhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsVoltagePhaseB response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics NeighborTableList read Error", error);
+                LogNSError("ElectricalMeasurement RmsVoltagePhaseB read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -81698,34 +77545,34 @@ class ReadThreadNetworkDiagnosticsNeighborTableList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsNeighborTableList : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsVoltagePhaseB : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsNeighborTableList()
-        : SubscribeAttribute("neighbor-table-list")
+    SubscribeAttributeElectricalMeasurementRmsVoltagePhaseB()
+        : SubscribeAttribute("rms-voltage-phase-b")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsNeighborTableList() {}
+    ~SubscribeAttributeElectricalMeasurementRmsVoltagePhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000905) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNeighborTableListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsVoltagePhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.NeighborTableList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsVoltagePhaseB response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -81736,29 +77583,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsNeighborTableList : public Subsc
 };
 
 /*
- * Attribute RouteTableList
+ * Attribute RmsVoltageMinPhaseB
  */
-class ReadThreadNetworkDiagnosticsRouteTableList : public ReadAttribute {
+class ReadElectricalMeasurementRmsVoltageMinPhaseB : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsRouteTableList()
-        : ReadAttribute("route-table-list")
+    ReadElectricalMeasurementRmsVoltageMinPhaseB()
+        : ReadAttribute("rms-voltage-min-phase-b")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsRouteTableList() {}
+    ~ReadElectricalMeasurementRmsVoltageMinPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000906) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeRouteTableListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.RouteTableList response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsVoltageMinPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsVoltageMinPhaseB response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics RouteTableList read Error", error);
+                LogNSError("ElectricalMeasurement RmsVoltageMinPhaseB read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -81766,34 +77613,34 @@ class ReadThreadNetworkDiagnosticsRouteTableList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsRouteTableList : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsVoltageMinPhaseB : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsRouteTableList()
-        : SubscribeAttribute("route-table-list")
+    SubscribeAttributeElectricalMeasurementRmsVoltageMinPhaseB()
+        : SubscribeAttribute("rms-voltage-min-phase-b")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsRouteTableList() {}
+    ~SubscribeAttributeElectricalMeasurementRmsVoltageMinPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000906) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRouteTableListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsVoltageMinPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.RouteTableList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsVoltageMinPhaseB response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -81804,29 +77651,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsRouteTableList : public Subscrib
 };
 
 /*
- * Attribute PartitionId
+ * Attribute RmsVoltageMaxPhaseB
  */
-class ReadThreadNetworkDiagnosticsPartitionId : public ReadAttribute {
+class ReadElectricalMeasurementRmsVoltageMaxPhaseB : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsPartitionId()
-        : ReadAttribute("partition-id")
+    ReadElectricalMeasurementRmsVoltageMaxPhaseB()
+        : ReadAttribute("rms-voltage-max-phase-b")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsPartitionId() {}
+    ~ReadElectricalMeasurementRmsVoltageMaxPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000907) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributePartitionIdWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.PartitionId response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsVoltageMaxPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsVoltageMaxPhaseB response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics PartitionId read Error", error);
+                LogNSError("ElectricalMeasurement RmsVoltageMaxPhaseB read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -81834,34 +77681,34 @@ class ReadThreadNetworkDiagnosticsPartitionId : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsPartitionId : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsVoltageMaxPhaseB : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsPartitionId()
-        : SubscribeAttribute("partition-id")
+    SubscribeAttributeElectricalMeasurementRmsVoltageMaxPhaseB()
+        : SubscribeAttribute("rms-voltage-max-phase-b")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsPartitionId() {}
+    ~SubscribeAttributeElectricalMeasurementRmsVoltageMaxPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000907) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePartitionIdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsVoltageMaxPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.PartitionId response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsVoltageMaxPhaseB response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -81872,29 +77719,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsPartitionId : public SubscribeAt
 };
 
 /*
- * Attribute Weighting
+ * Attribute RmsCurrentPhaseB
  */
-class ReadThreadNetworkDiagnosticsWeighting : public ReadAttribute {
+class ReadElectricalMeasurementRmsCurrentPhaseB : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsWeighting()
-        : ReadAttribute("weighting")
+    ReadElectricalMeasurementRmsCurrentPhaseB()
+        : ReadAttribute("rms-current-phase-b")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsWeighting() {}
+    ~ReadElectricalMeasurementRmsCurrentPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000000A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000908) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeWeightingWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.Weighting response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsCurrentPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsCurrentPhaseB response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics Weighting read Error", error);
+                LogNSError("ElectricalMeasurement RmsCurrentPhaseB read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -81902,34 +77749,34 @@ class ReadThreadNetworkDiagnosticsWeighting : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsWeighting : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsCurrentPhaseB : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsWeighting()
-        : SubscribeAttribute("weighting")
+    SubscribeAttributeElectricalMeasurementRmsCurrentPhaseB()
+        : SubscribeAttribute("rms-current-phase-b")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsWeighting() {}
+    ~SubscribeAttributeElectricalMeasurementRmsCurrentPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000000A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000908) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeWeightingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsCurrentPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.Weighting response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsCurrentPhaseB response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -81940,29 +77787,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsWeighting : public SubscribeAttr
 };
 
 /*
- * Attribute DataVersion
+ * Attribute RmsCurrentMinPhaseB
  */
-class ReadThreadNetworkDiagnosticsDataVersion : public ReadAttribute {
+class ReadElectricalMeasurementRmsCurrentMinPhaseB : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsDataVersion()
-        : ReadAttribute("data-version")
+    ReadElectricalMeasurementRmsCurrentMinPhaseB()
+        : ReadAttribute("rms-current-min-phase-b")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsDataVersion() {}
+    ~ReadElectricalMeasurementRmsCurrentMinPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000000B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000909) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeDataVersionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.DataVersion response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsCurrentMinPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsCurrentMinPhaseB response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics DataVersion read Error", error);
+                LogNSError("ElectricalMeasurement RmsCurrentMinPhaseB read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -81970,34 +77817,34 @@ class ReadThreadNetworkDiagnosticsDataVersion : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsDataVersion : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsCurrentMinPhaseB : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsDataVersion()
-        : SubscribeAttribute("data-version")
+    SubscribeAttributeElectricalMeasurementRmsCurrentMinPhaseB()
+        : SubscribeAttribute("rms-current-min-phase-b")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsDataVersion() {}
+    ~SubscribeAttributeElectricalMeasurementRmsCurrentMinPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000000B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000909) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDataVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsCurrentMinPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.DataVersion response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsCurrentMinPhaseB response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -82008,29 +77855,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsDataVersion : public SubscribeAt
 };
 
 /*
- * Attribute StableDataVersion
+ * Attribute RmsCurrentMaxPhaseB
  */
-class ReadThreadNetworkDiagnosticsStableDataVersion : public ReadAttribute {
+class ReadElectricalMeasurementRmsCurrentMaxPhaseB : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsStableDataVersion()
-        : ReadAttribute("stable-data-version")
+    ReadElectricalMeasurementRmsCurrentMaxPhaseB()
+        : ReadAttribute("rms-current-max-phase-b")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsStableDataVersion() {}
+    ~ReadElectricalMeasurementRmsCurrentMaxPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000000C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000090A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeStableDataVersionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.StableDataVersion response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsCurrentMaxPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsCurrentMaxPhaseB response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics StableDataVersion read Error", error);
+                LogNSError("ElectricalMeasurement RmsCurrentMaxPhaseB read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -82038,34 +77885,34 @@ class ReadThreadNetworkDiagnosticsStableDataVersion : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsStableDataVersion : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsCurrentMaxPhaseB : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsStableDataVersion()
-        : SubscribeAttribute("stable-data-version")
+    SubscribeAttributeElectricalMeasurementRmsCurrentMaxPhaseB()
+        : SubscribeAttribute("rms-current-max-phase-b")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsStableDataVersion() {}
+    ~SubscribeAttributeElectricalMeasurementRmsCurrentMaxPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000000C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000090A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeStableDataVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsCurrentMaxPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.StableDataVersion response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsCurrentMaxPhaseB response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -82076,29 +77923,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsStableDataVersion : public Subsc
 };
 
 /*
- * Attribute LeaderRouterId
+ * Attribute ActivePowerPhaseB
  */
-class ReadThreadNetworkDiagnosticsLeaderRouterId : public ReadAttribute {
+class ReadElectricalMeasurementActivePowerPhaseB : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsLeaderRouterId()
-        : ReadAttribute("leader-router-id")
+    ReadElectricalMeasurementActivePowerPhaseB()
+        : ReadAttribute("active-power-phase-b")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsLeaderRouterId() {}
+    ~ReadElectricalMeasurementActivePowerPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000000D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000090B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeLeaderRouterIdWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.LeaderRouterId response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeActivePowerPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.ActivePowerPhaseB response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics LeaderRouterId read Error", error);
+                LogNSError("ElectricalMeasurement ActivePowerPhaseB read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -82106,34 +77953,34 @@ class ReadThreadNetworkDiagnosticsLeaderRouterId : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsLeaderRouterId : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementActivePowerPhaseB : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsLeaderRouterId()
-        : SubscribeAttribute("leader-router-id")
+    SubscribeAttributeElectricalMeasurementActivePowerPhaseB()
+        : SubscribeAttribute("active-power-phase-b")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsLeaderRouterId() {}
+    ~SubscribeAttributeElectricalMeasurementActivePowerPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000000D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000090B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLeaderRouterIdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeActivePowerPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.LeaderRouterId response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.ActivePowerPhaseB response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -82144,29 +77991,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsLeaderRouterId : public Subscrib
 };
 
 /*
- * Attribute DetachedRoleCount
+ * Attribute ActivePowerMinPhaseB
  */
-class ReadThreadNetworkDiagnosticsDetachedRoleCount : public ReadAttribute {
+class ReadElectricalMeasurementActivePowerMinPhaseB : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsDetachedRoleCount()
-        : ReadAttribute("detached-role-count")
+    ReadElectricalMeasurementActivePowerMinPhaseB()
+        : ReadAttribute("active-power-min-phase-b")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsDetachedRoleCount() {}
+    ~ReadElectricalMeasurementActivePowerMinPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000000E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000090C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeDetachedRoleCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.DetachedRoleCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeActivePowerMinPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.ActivePowerMinPhaseB response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics DetachedRoleCount read Error", error);
+                LogNSError("ElectricalMeasurement ActivePowerMinPhaseB read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -82174,34 +78021,34 @@ class ReadThreadNetworkDiagnosticsDetachedRoleCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsDetachedRoleCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementActivePowerMinPhaseB : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsDetachedRoleCount()
-        : SubscribeAttribute("detached-role-count")
+    SubscribeAttributeElectricalMeasurementActivePowerMinPhaseB()
+        : SubscribeAttribute("active-power-min-phase-b")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsDetachedRoleCount() {}
+    ~SubscribeAttributeElectricalMeasurementActivePowerMinPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000000E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000090C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDetachedRoleCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeActivePowerMinPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.DetachedRoleCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.ActivePowerMinPhaseB response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -82212,29 +78059,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsDetachedRoleCount : public Subsc
 };
 
 /*
- * Attribute ChildRoleCount
+ * Attribute ActivePowerMaxPhaseB
  */
-class ReadThreadNetworkDiagnosticsChildRoleCount : public ReadAttribute {
+class ReadElectricalMeasurementActivePowerMaxPhaseB : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsChildRoleCount()
-        : ReadAttribute("child-role-count")
+    ReadElectricalMeasurementActivePowerMaxPhaseB()
+        : ReadAttribute("active-power-max-phase-b")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsChildRoleCount() {}
+    ~ReadElectricalMeasurementActivePowerMaxPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000000F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000090D) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeChildRoleCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.ChildRoleCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeActivePowerMaxPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.ActivePowerMaxPhaseB response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics ChildRoleCount read Error", error);
+                LogNSError("ElectricalMeasurement ActivePowerMaxPhaseB read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -82242,34 +78089,34 @@ class ReadThreadNetworkDiagnosticsChildRoleCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsChildRoleCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementActivePowerMaxPhaseB : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsChildRoleCount()
-        : SubscribeAttribute("child-role-count")
+    SubscribeAttributeElectricalMeasurementActivePowerMaxPhaseB()
+        : SubscribeAttribute("active-power-max-phase-b")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsChildRoleCount() {}
+    ~SubscribeAttributeElectricalMeasurementActivePowerMaxPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000000F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000090D) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeChildRoleCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeActivePowerMaxPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.ChildRoleCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.ActivePowerMaxPhaseB response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -82280,29 +78127,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsChildRoleCount : public Subscrib
 };
 
 /*
- * Attribute RouterRoleCount
+ * Attribute ReactivePowerPhaseB
  */
-class ReadThreadNetworkDiagnosticsRouterRoleCount : public ReadAttribute {
+class ReadElectricalMeasurementReactivePowerPhaseB : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsRouterRoleCount()
-        : ReadAttribute("router-role-count")
+    ReadElectricalMeasurementReactivePowerPhaseB()
+        : ReadAttribute("reactive-power-phase-b")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsRouterRoleCount() {}
+    ~ReadElectricalMeasurementReactivePowerPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000090E) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeRouterRoleCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.RouterRoleCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeReactivePowerPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.ReactivePowerPhaseB response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics RouterRoleCount read Error", error);
+                LogNSError("ElectricalMeasurement ReactivePowerPhaseB read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -82310,34 +78157,34 @@ class ReadThreadNetworkDiagnosticsRouterRoleCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsRouterRoleCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementReactivePowerPhaseB : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsRouterRoleCount()
-        : SubscribeAttribute("router-role-count")
+    SubscribeAttributeElectricalMeasurementReactivePowerPhaseB()
+        : SubscribeAttribute("reactive-power-phase-b")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsRouterRoleCount() {}
+    ~SubscribeAttributeElectricalMeasurementReactivePowerPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000090E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRouterRoleCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeReactivePowerPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.RouterRoleCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.ReactivePowerPhaseB response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -82348,29 +78195,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsRouterRoleCount : public Subscri
 };
 
 /*
- * Attribute LeaderRoleCount
+ * Attribute ApparentPowerPhaseB
  */
-class ReadThreadNetworkDiagnosticsLeaderRoleCount : public ReadAttribute {
+class ReadElectricalMeasurementApparentPowerPhaseB : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsLeaderRoleCount()
-        : ReadAttribute("leader-role-count")
+    ReadElectricalMeasurementApparentPowerPhaseB()
+        : ReadAttribute("apparent-power-phase-b")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsLeaderRoleCount() {}
+    ~ReadElectricalMeasurementApparentPowerPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000090F) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeLeaderRoleCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.LeaderRoleCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeApparentPowerPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.ApparentPowerPhaseB response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics LeaderRoleCount read Error", error);
+                LogNSError("ElectricalMeasurement ApparentPowerPhaseB read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -82378,34 +78225,34 @@ class ReadThreadNetworkDiagnosticsLeaderRoleCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsLeaderRoleCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementApparentPowerPhaseB : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsLeaderRoleCount()
-        : SubscribeAttribute("leader-role-count")
+    SubscribeAttributeElectricalMeasurementApparentPowerPhaseB()
+        : SubscribeAttribute("apparent-power-phase-b")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsLeaderRoleCount() {}
+    ~SubscribeAttributeElectricalMeasurementApparentPowerPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000090F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLeaderRoleCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeApparentPowerPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.LeaderRoleCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.ApparentPowerPhaseB response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -82416,29 +78263,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsLeaderRoleCount : public Subscri
 };
 
 /*
- * Attribute AttachAttemptCount
+ * Attribute PowerFactorPhaseB
  */
-class ReadThreadNetworkDiagnosticsAttachAttemptCount : public ReadAttribute {
+class ReadElectricalMeasurementPowerFactorPhaseB : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsAttachAttemptCount()
-        : ReadAttribute("attach-attempt-count")
+    ReadElectricalMeasurementPowerFactorPhaseB()
+        : ReadAttribute("power-factor-phase-b")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsAttachAttemptCount() {}
+    ~ReadElectricalMeasurementPowerFactorPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000910) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeAttachAttemptCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.AttachAttemptCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributePowerFactorPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.PowerFactorPhaseB response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics AttachAttemptCount read Error", error);
+                LogNSError("ElectricalMeasurement PowerFactorPhaseB read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -82446,34 +78293,34 @@ class ReadThreadNetworkDiagnosticsAttachAttemptCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsAttachAttemptCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementPowerFactorPhaseB : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsAttachAttemptCount()
-        : SubscribeAttribute("attach-attempt-count")
+    SubscribeAttributeElectricalMeasurementPowerFactorPhaseB()
+        : SubscribeAttribute("power-factor-phase-b")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsAttachAttemptCount() {}
+    ~SubscribeAttributeElectricalMeasurementPowerFactorPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000910) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttachAttemptCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePowerFactorPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.AttachAttemptCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.PowerFactorPhaseB response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -82484,29 +78331,30 @@ class SubscribeAttributeThreadNetworkDiagnosticsAttachAttemptCount : public Subs
 };
 
 /*
- * Attribute PartitionIdChangeCount
+ * Attribute AverageRmsVoltageMeasurementPeriodPhaseB
  */
-class ReadThreadNetworkDiagnosticsPartitionIdChangeCount : public ReadAttribute {
+class ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseB : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsPartitionIdChangeCount()
-        : ReadAttribute("partition-id-change-count")
+    ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseB()
+        : ReadAttribute("average-rms-voltage-measurement-period-phase-b")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsPartitionIdChangeCount() {}
+    ~ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000911) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributePartitionIdChangeCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.PartitionIdChangeCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAverageRmsVoltageMeasurementPeriodPhaseBWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AverageRmsVoltageMeasurementPeriodPhaseB response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics PartitionIdChangeCount read Error", error);
+                LogNSError("ElectricalMeasurement AverageRmsVoltageMeasurementPeriodPhaseB read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -82514,34 +78362,35 @@ class ReadThreadNetworkDiagnosticsPartitionIdChangeCount : public ReadAttribute
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsPartitionIdChangeCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseB : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsPartitionIdChangeCount()
-        : SubscribeAttribute("partition-id-change-count")
+    SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseB()
+        : SubscribeAttribute("average-rms-voltage-measurement-period-phase-b")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsPartitionIdChangeCount() {}
+    ~SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000911) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePartitionIdChangeCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster
+            subscribeAttributeAverageRmsVoltageMeasurementPeriodPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.PartitionIdChangeCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.AverageRmsVoltageMeasurementPeriodPhaseB response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -82552,30 +78401,30 @@ class SubscribeAttributeThreadNetworkDiagnosticsPartitionIdChangeCount : public
 };
 
 /*
- * Attribute BetterPartitionAttachAttemptCount
+ * Attribute AverageRmsOverVoltageCounterPhaseB
  */
-class ReadThreadNetworkDiagnosticsBetterPartitionAttachAttemptCount : public ReadAttribute {
+class ReadElectricalMeasurementAverageRmsOverVoltageCounterPhaseB : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsBetterPartitionAttachAttemptCount()
-        : ReadAttribute("better-partition-attach-attempt-count")
+    ReadElectricalMeasurementAverageRmsOverVoltageCounterPhaseB()
+        : ReadAttribute("average-rms-over-voltage-counter-phase-b")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsBetterPartitionAttachAttemptCount() {}
+    ~ReadElectricalMeasurementAverageRmsOverVoltageCounterPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000014) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000912) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeBetterPartitionAttachAttemptCountWithCompletionHandler:^(
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAverageRmsOverVoltageCounterPhaseBWithCompletionHandler:^(
             NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.BetterPartitionAttachAttemptCount response %@", [value description]);
+            NSLog(@"ElectricalMeasurement.AverageRmsOverVoltageCounterPhaseB response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics BetterPartitionAttachAttemptCount read Error", error);
+                LogNSError("ElectricalMeasurement AverageRmsOverVoltageCounterPhaseB read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -82583,34 +78432,34 @@ class ReadThreadNetworkDiagnosticsBetterPartitionAttachAttemptCount : public Rea
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsBetterPartitionAttachAttemptCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAverageRmsOverVoltageCounterPhaseB : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsBetterPartitionAttachAttemptCount()
-        : SubscribeAttribute("better-partition-attach-attempt-count")
+    SubscribeAttributeElectricalMeasurementAverageRmsOverVoltageCounterPhaseB()
+        : SubscribeAttribute("average-rms-over-voltage-counter-phase-b")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsBetterPartitionAttachAttemptCount() {}
+    ~SubscribeAttributeElectricalMeasurementAverageRmsOverVoltageCounterPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000014) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000912) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBetterPartitionAttachAttemptCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAverageRmsOverVoltageCounterPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.BetterPartitionAttachAttemptCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.AverageRmsOverVoltageCounterPhaseB response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -82621,29 +78470,30 @@ class SubscribeAttributeThreadNetworkDiagnosticsBetterPartitionAttachAttemptCoun
 };
 
 /*
- * Attribute ParentChangeCount
+ * Attribute AverageRmsUnderVoltageCounterPhaseB
  */
-class ReadThreadNetworkDiagnosticsParentChangeCount : public ReadAttribute {
+class ReadElectricalMeasurementAverageRmsUnderVoltageCounterPhaseB : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsParentChangeCount()
-        : ReadAttribute("parent-change-count")
+    ReadElectricalMeasurementAverageRmsUnderVoltageCounterPhaseB()
+        : ReadAttribute("average-rms-under-voltage-counter-phase-b")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsParentChangeCount() {}
+    ~ReadElectricalMeasurementAverageRmsUnderVoltageCounterPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000015) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000913) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeParentChangeCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.ParentChangeCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAverageRmsUnderVoltageCounterPhaseBWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AverageRmsUnderVoltageCounterPhaseB response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics ParentChangeCount read Error", error);
+                LogNSError("ElectricalMeasurement AverageRmsUnderVoltageCounterPhaseB read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -82651,34 +78501,34 @@ class ReadThreadNetworkDiagnosticsParentChangeCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsParentChangeCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounterPhaseB : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsParentChangeCount()
-        : SubscribeAttribute("parent-change-count")
+    SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounterPhaseB()
+        : SubscribeAttribute("average-rms-under-voltage-counter-phase-b")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsParentChangeCount() {}
+    ~SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounterPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000015) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000913) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeParentChangeCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAverageRmsUnderVoltageCounterPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.ParentChangeCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.AverageRmsUnderVoltageCounterPhaseB response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -82689,29 +78539,30 @@ class SubscribeAttributeThreadNetworkDiagnosticsParentChangeCount : public Subsc
 };
 
 /*
- * Attribute TxTotalCount
+ * Attribute RmsExtremeOverVoltagePeriodPhaseB
  */
-class ReadThreadNetworkDiagnosticsTxTotalCount : public ReadAttribute {
+class ReadElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseB : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsTxTotalCount()
-        : ReadAttribute("tx-total-count")
+    ReadElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseB()
+        : ReadAttribute("rms-extreme-over-voltage-period-phase-b")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsTxTotalCount() {}
+    ~ReadElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000016) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000914) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeTxTotalCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.TxTotalCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsExtremeOverVoltagePeriodPhaseBWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsExtremeOverVoltagePeriodPhaseB response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics TxTotalCount read Error", error);
+                LogNSError("ElectricalMeasurement RmsExtremeOverVoltagePeriodPhaseB read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -82719,34 +78570,34 @@ class ReadThreadNetworkDiagnosticsTxTotalCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsTxTotalCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseB : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsTxTotalCount()
-        : SubscribeAttribute("tx-total-count")
+    SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseB()
+        : SubscribeAttribute("rms-extreme-over-voltage-period-phase-b")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsTxTotalCount() {}
+    ~SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000016) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000914) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTxTotalCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsExtremeOverVoltagePeriodPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.TxTotalCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsExtremeOverVoltagePeriodPhaseB response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -82757,29 +78608,30 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxTotalCount : public SubscribeA
 };
 
 /*
- * Attribute TxUnicastCount
+ * Attribute RmsExtremeUnderVoltagePeriodPhaseB
  */
-class ReadThreadNetworkDiagnosticsTxUnicastCount : public ReadAttribute {
+class ReadElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseB : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsTxUnicastCount()
-        : ReadAttribute("tx-unicast-count")
+    ReadElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseB()
+        : ReadAttribute("rms-extreme-under-voltage-period-phase-b")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsTxUnicastCount() {}
+    ~ReadElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000915) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeTxUnicastCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.TxUnicastCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsExtremeUnderVoltagePeriodPhaseBWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsExtremeUnderVoltagePeriodPhaseB response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics TxUnicastCount read Error", error);
+                LogNSError("ElectricalMeasurement RmsExtremeUnderVoltagePeriodPhaseB read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -82787,34 +78639,34 @@ class ReadThreadNetworkDiagnosticsTxUnicastCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsTxUnicastCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseB : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsTxUnicastCount()
-        : SubscribeAttribute("tx-unicast-count")
+    SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseB()
+        : SubscribeAttribute("rms-extreme-under-voltage-period-phase-b")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsTxUnicastCount() {}
+    ~SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000915) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTxUnicastCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsExtremeUnderVoltagePeriodPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.TxUnicastCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsExtremeUnderVoltagePeriodPhaseB response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -82825,64 +78677,65 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxUnicastCount : public Subscrib
 };
 
 /*
- * Attribute TxBroadcastCount
+ * Attribute RmsVoltageSagPeriodPhaseB
  */
-class ReadThreadNetworkDiagnosticsTxBroadcastCount : public ReadAttribute {
+class ReadElectricalMeasurementRmsVoltageSagPeriodPhaseB : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsTxBroadcastCount()
-        : ReadAttribute("tx-broadcast-count")
+    ReadElectricalMeasurementRmsVoltageSagPeriodPhaseB()
+        : ReadAttribute("rms-voltage-sag-period-phase-b")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsTxBroadcastCount() {}
+    ~ReadElectricalMeasurementRmsVoltageSagPeriodPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000018) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000916) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeTxBroadcastCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.TxBroadcastCount response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics TxBroadcastCount read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster
+            readAttributeRmsVoltageSagPeriodPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsVoltageSagPeriodPhaseB response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("ElectricalMeasurement RmsVoltageSagPeriodPhaseB read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsTxBroadcastCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriodPhaseB : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsTxBroadcastCount()
-        : SubscribeAttribute("tx-broadcast-count")
+    SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriodPhaseB()
+        : SubscribeAttribute("rms-voltage-sag-period-phase-b")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsTxBroadcastCount() {}
+    ~SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriodPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000018) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000916) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTxBroadcastCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsVoltageSagPeriodPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.TxBroadcastCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsVoltageSagPeriodPhaseB response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -82893,64 +78746,65 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxBroadcastCount : public Subscr
 };
 
 /*
- * Attribute TxAckRequestedCount
+ * Attribute RmsVoltageSwellPeriodPhaseB
  */
-class ReadThreadNetworkDiagnosticsTxAckRequestedCount : public ReadAttribute {
+class ReadElectricalMeasurementRmsVoltageSwellPeriodPhaseB : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsTxAckRequestedCount()
-        : ReadAttribute("tx-ack-requested-count")
+    ReadElectricalMeasurementRmsVoltageSwellPeriodPhaseB()
+        : ReadAttribute("rms-voltage-swell-period-phase-b")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsTxAckRequestedCount() {}
+    ~ReadElectricalMeasurementRmsVoltageSwellPeriodPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000019) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000917) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeTxAckRequestedCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.TxAckRequestedCount response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics TxAckRequestedCount read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster
+            readAttributeRmsVoltageSwellPeriodPhaseBWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsVoltageSwellPeriodPhaseB response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("ElectricalMeasurement RmsVoltageSwellPeriodPhaseB read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsTxAckRequestedCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriodPhaseB : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsTxAckRequestedCount()
-        : SubscribeAttribute("tx-ack-requested-count")
+    SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriodPhaseB()
+        : SubscribeAttribute("rms-voltage-swell-period-phase-b")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsTxAckRequestedCount() {}
+    ~SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriodPhaseB() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000019) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000917) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTxAckRequestedCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsVoltageSwellPeriodPhaseBWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.TxAckRequestedCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsVoltageSwellPeriodPhaseB response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -82961,29 +78815,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxAckRequestedCount : public Sub
 };
 
 /*
- * Attribute TxAckedCount
+ * Attribute LineCurrentPhaseC
  */
-class ReadThreadNetworkDiagnosticsTxAckedCount : public ReadAttribute {
+class ReadElectricalMeasurementLineCurrentPhaseC : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsTxAckedCount()
-        : ReadAttribute("tx-acked-count")
+    ReadElectricalMeasurementLineCurrentPhaseC()
+        : ReadAttribute("line-current-phase-c")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsTxAckedCount() {}
+    ~ReadElectricalMeasurementLineCurrentPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000001A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A01) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeTxAckedCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.TxAckedCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeLineCurrentPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.LineCurrentPhaseC response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics TxAckedCount read Error", error);
+                LogNSError("ElectricalMeasurement LineCurrentPhaseC read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -82991,34 +78845,34 @@ class ReadThreadNetworkDiagnosticsTxAckedCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsTxAckedCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementLineCurrentPhaseC : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsTxAckedCount()
-        : SubscribeAttribute("tx-acked-count")
+    SubscribeAttributeElectricalMeasurementLineCurrentPhaseC()
+        : SubscribeAttribute("line-current-phase-c")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsTxAckedCount() {}
+    ~SubscribeAttributeElectricalMeasurementLineCurrentPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000001A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A01) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTxAckedCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeLineCurrentPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.TxAckedCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.LineCurrentPhaseC response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -83029,29 +78883,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxAckedCount : public SubscribeA
 };
 
 /*
- * Attribute TxNoAckRequestedCount
+ * Attribute ActiveCurrentPhaseC
  */
-class ReadThreadNetworkDiagnosticsTxNoAckRequestedCount : public ReadAttribute {
+class ReadElectricalMeasurementActiveCurrentPhaseC : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsTxNoAckRequestedCount()
-        : ReadAttribute("tx-no-ack-requested-count")
+    ReadElectricalMeasurementActiveCurrentPhaseC()
+        : ReadAttribute("active-current-phase-c")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsTxNoAckRequestedCount() {}
+    ~ReadElectricalMeasurementActiveCurrentPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000001B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A02) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeTxNoAckRequestedCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.TxNoAckRequestedCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeActiveCurrentPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.ActiveCurrentPhaseC response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics TxNoAckRequestedCount read Error", error);
+                LogNSError("ElectricalMeasurement ActiveCurrentPhaseC read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -83059,34 +78913,34 @@ class ReadThreadNetworkDiagnosticsTxNoAckRequestedCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsTxNoAckRequestedCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementActiveCurrentPhaseC : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsTxNoAckRequestedCount()
-        : SubscribeAttribute("tx-no-ack-requested-count")
+    SubscribeAttributeElectricalMeasurementActiveCurrentPhaseC()
+        : SubscribeAttribute("active-current-phase-c")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsTxNoAckRequestedCount() {}
+    ~SubscribeAttributeElectricalMeasurementActiveCurrentPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000001B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A02) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTxNoAckRequestedCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeActiveCurrentPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.TxNoAckRequestedCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.ActiveCurrentPhaseC response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -83097,29 +78951,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxNoAckRequestedCount : public S
 };
 
 /*
- * Attribute TxDataCount
+ * Attribute ReactiveCurrentPhaseC
  */
-class ReadThreadNetworkDiagnosticsTxDataCount : public ReadAttribute {
+class ReadElectricalMeasurementReactiveCurrentPhaseC : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsTxDataCount()
-        : ReadAttribute("tx-data-count")
+    ReadElectricalMeasurementReactiveCurrentPhaseC()
+        : ReadAttribute("reactive-current-phase-c")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsTxDataCount() {}
+    ~ReadElectricalMeasurementReactiveCurrentPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000001C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A03) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeTxDataCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.TxDataCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeReactiveCurrentPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.ReactiveCurrentPhaseC response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics TxDataCount read Error", error);
+                LogNSError("ElectricalMeasurement ReactiveCurrentPhaseC read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -83127,34 +78981,34 @@ class ReadThreadNetworkDiagnosticsTxDataCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsTxDataCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementReactiveCurrentPhaseC : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsTxDataCount()
-        : SubscribeAttribute("tx-data-count")
+    SubscribeAttributeElectricalMeasurementReactiveCurrentPhaseC()
+        : SubscribeAttribute("reactive-current-phase-c")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsTxDataCount() {}
+    ~SubscribeAttributeElectricalMeasurementReactiveCurrentPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000001C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A03) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTxDataCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeReactiveCurrentPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.TxDataCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.ReactiveCurrentPhaseC response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -83165,29 +79019,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxDataCount : public SubscribeAt
 };
 
 /*
- * Attribute TxDataPollCount
+ * Attribute RmsVoltagePhaseC
  */
-class ReadThreadNetworkDiagnosticsTxDataPollCount : public ReadAttribute {
+class ReadElectricalMeasurementRmsVoltagePhaseC : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsTxDataPollCount()
-        : ReadAttribute("tx-data-poll-count")
+    ReadElectricalMeasurementRmsVoltagePhaseC()
+        : ReadAttribute("rms-voltage-phase-c")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsTxDataPollCount() {}
+    ~ReadElectricalMeasurementRmsVoltagePhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000001D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A05) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeTxDataPollCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.TxDataPollCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsVoltagePhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsVoltagePhaseC response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics TxDataPollCount read Error", error);
+                LogNSError("ElectricalMeasurement RmsVoltagePhaseC read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -83195,34 +79049,34 @@ class ReadThreadNetworkDiagnosticsTxDataPollCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsTxDataPollCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsVoltagePhaseC : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsTxDataPollCount()
-        : SubscribeAttribute("tx-data-poll-count")
+    SubscribeAttributeElectricalMeasurementRmsVoltagePhaseC()
+        : SubscribeAttribute("rms-voltage-phase-c")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsTxDataPollCount() {}
+    ~SubscribeAttributeElectricalMeasurementRmsVoltagePhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000001D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A05) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTxDataPollCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsVoltagePhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.TxDataPollCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsVoltagePhaseC response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -83233,29 +79087,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxDataPollCount : public Subscri
 };
 
 /*
- * Attribute TxBeaconCount
+ * Attribute RmsVoltageMinPhaseC
  */
-class ReadThreadNetworkDiagnosticsTxBeaconCount : public ReadAttribute {
+class ReadElectricalMeasurementRmsVoltageMinPhaseC : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsTxBeaconCount()
-        : ReadAttribute("tx-beacon-count")
+    ReadElectricalMeasurementRmsVoltageMinPhaseC()
+        : ReadAttribute("rms-voltage-min-phase-c")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsTxBeaconCount() {}
+    ~ReadElectricalMeasurementRmsVoltageMinPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000001E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A06) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeTxBeaconCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.TxBeaconCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsVoltageMinPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsVoltageMinPhaseC response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics TxBeaconCount read Error", error);
+                LogNSError("ElectricalMeasurement RmsVoltageMinPhaseC read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -83263,34 +79117,34 @@ class ReadThreadNetworkDiagnosticsTxBeaconCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsTxBeaconCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsVoltageMinPhaseC : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsTxBeaconCount()
-        : SubscribeAttribute("tx-beacon-count")
+    SubscribeAttributeElectricalMeasurementRmsVoltageMinPhaseC()
+        : SubscribeAttribute("rms-voltage-min-phase-c")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsTxBeaconCount() {}
+    ~SubscribeAttributeElectricalMeasurementRmsVoltageMinPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000001E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A06) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTxBeaconCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsVoltageMinPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.TxBeaconCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsVoltageMinPhaseC response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -83301,29 +79155,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxBeaconCount : public Subscribe
 };
 
 /*
- * Attribute TxBeaconRequestCount
+ * Attribute RmsVoltageMaxPhaseC
  */
-class ReadThreadNetworkDiagnosticsTxBeaconRequestCount : public ReadAttribute {
+class ReadElectricalMeasurementRmsVoltageMaxPhaseC : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsTxBeaconRequestCount()
-        : ReadAttribute("tx-beacon-request-count")
+    ReadElectricalMeasurementRmsVoltageMaxPhaseC()
+        : ReadAttribute("rms-voltage-max-phase-c")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsTxBeaconRequestCount() {}
+    ~ReadElectricalMeasurementRmsVoltageMaxPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000001F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A07) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeTxBeaconRequestCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.TxBeaconRequestCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsVoltageMaxPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsVoltageMaxPhaseC response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics TxBeaconRequestCount read Error", error);
+                LogNSError("ElectricalMeasurement RmsVoltageMaxPhaseC read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -83331,34 +79185,34 @@ class ReadThreadNetworkDiagnosticsTxBeaconRequestCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsTxBeaconRequestCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsVoltageMaxPhaseC : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsTxBeaconRequestCount()
-        : SubscribeAttribute("tx-beacon-request-count")
+    SubscribeAttributeElectricalMeasurementRmsVoltageMaxPhaseC()
+        : SubscribeAttribute("rms-voltage-max-phase-c")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsTxBeaconRequestCount() {}
+    ~SubscribeAttributeElectricalMeasurementRmsVoltageMaxPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000001F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A07) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTxBeaconRequestCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsVoltageMaxPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.TxBeaconRequestCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsVoltageMaxPhaseC response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -83369,29 +79223,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxBeaconRequestCount : public Su
 };
 
 /*
- * Attribute TxOtherCount
+ * Attribute RmsCurrentPhaseC
  */
-class ReadThreadNetworkDiagnosticsTxOtherCount : public ReadAttribute {
+class ReadElectricalMeasurementRmsCurrentPhaseC : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsTxOtherCount()
-        : ReadAttribute("tx-other-count")
+    ReadElectricalMeasurementRmsCurrentPhaseC()
+        : ReadAttribute("rms-current-phase-c")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsTxOtherCount() {}
+    ~ReadElectricalMeasurementRmsCurrentPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000020) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A08) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeTxOtherCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.TxOtherCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsCurrentPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsCurrentPhaseC response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics TxOtherCount read Error", error);
+                LogNSError("ElectricalMeasurement RmsCurrentPhaseC read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -83399,34 +79253,34 @@ class ReadThreadNetworkDiagnosticsTxOtherCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsTxOtherCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsCurrentPhaseC : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsTxOtherCount()
-        : SubscribeAttribute("tx-other-count")
+    SubscribeAttributeElectricalMeasurementRmsCurrentPhaseC()
+        : SubscribeAttribute("rms-current-phase-c")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsTxOtherCount() {}
+    ~SubscribeAttributeElectricalMeasurementRmsCurrentPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000020) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A08) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTxOtherCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsCurrentPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.TxOtherCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsCurrentPhaseC response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -83437,29 +79291,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxOtherCount : public SubscribeA
 };
 
 /*
- * Attribute TxRetryCount
+ * Attribute RmsCurrentMinPhaseC
  */
-class ReadThreadNetworkDiagnosticsTxRetryCount : public ReadAttribute {
+class ReadElectricalMeasurementRmsCurrentMinPhaseC : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsTxRetryCount()
-        : ReadAttribute("tx-retry-count")
+    ReadElectricalMeasurementRmsCurrentMinPhaseC()
+        : ReadAttribute("rms-current-min-phase-c")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsTxRetryCount() {}
+    ~ReadElectricalMeasurementRmsCurrentMinPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000021) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A09) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeTxRetryCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.TxRetryCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsCurrentMinPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsCurrentMinPhaseC response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics TxRetryCount read Error", error);
+                LogNSError("ElectricalMeasurement RmsCurrentMinPhaseC read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -83467,34 +79321,34 @@ class ReadThreadNetworkDiagnosticsTxRetryCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsTxRetryCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsCurrentMinPhaseC : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsTxRetryCount()
-        : SubscribeAttribute("tx-retry-count")
+    SubscribeAttributeElectricalMeasurementRmsCurrentMinPhaseC()
+        : SubscribeAttribute("rms-current-min-phase-c")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsTxRetryCount() {}
+    ~SubscribeAttributeElectricalMeasurementRmsCurrentMinPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000021) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A09) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTxRetryCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsCurrentMinPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.TxRetryCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsCurrentMinPhaseC response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -83505,65 +79359,64 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxRetryCount : public SubscribeA
 };
 
 /*
- * Attribute TxDirectMaxRetryExpiryCount
+ * Attribute RmsCurrentMaxPhaseC
  */
-class ReadThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount : public ReadAttribute {
+class ReadElectricalMeasurementRmsCurrentMaxPhaseC : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount()
-        : ReadAttribute("tx-direct-max-retry-expiry-count")
+    ReadElectricalMeasurementRmsCurrentMaxPhaseC()
+        : ReadAttribute("rms-current-max-phase-c")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount() {}
+    ~ReadElectricalMeasurementRmsCurrentMaxPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000022) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A0A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster
-            readAttributeTxDirectMaxRetryExpiryCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.TxDirectMaxRetryExpiryCount response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("ThreadNetworkDiagnostics TxDirectMaxRetryExpiryCount read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsCurrentMaxPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsCurrentMaxPhaseC response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ElectricalMeasurement RmsCurrentMaxPhaseC read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsCurrentMaxPhaseC : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount()
-        : SubscribeAttribute("tx-direct-max-retry-expiry-count")
+    SubscribeAttributeElectricalMeasurementRmsCurrentMaxPhaseC()
+        : SubscribeAttribute("rms-current-max-phase-c")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount() {}
+    ~SubscribeAttributeElectricalMeasurementRmsCurrentMaxPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000022) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A0A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTxDirectMaxRetryExpiryCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsCurrentMaxPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.TxDirectMaxRetryExpiryCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsCurrentMaxPhaseC response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -83574,30 +79427,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount : pu
 };
 
 /*
- * Attribute TxIndirectMaxRetryExpiryCount
+ * Attribute ActivePowerPhaseC
  */
-class ReadThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount : public ReadAttribute {
+class ReadElectricalMeasurementActivePowerPhaseC : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount()
-        : ReadAttribute("tx-indirect-max-retry-expiry-count")
+    ReadElectricalMeasurementActivePowerPhaseC()
+        : ReadAttribute("active-power-phase-c")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount() {}
+    ~ReadElectricalMeasurementActivePowerPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000023) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A0B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeTxIndirectMaxRetryExpiryCountWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.TxIndirectMaxRetryExpiryCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeActivePowerPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.ActivePowerPhaseC response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics TxIndirectMaxRetryExpiryCount read Error", error);
+                LogNSError("ElectricalMeasurement ActivePowerPhaseC read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -83605,34 +79457,34 @@ class ReadThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount : public ReadAtt
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementActivePowerPhaseC : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount()
-        : SubscribeAttribute("tx-indirect-max-retry-expiry-count")
+    SubscribeAttributeElectricalMeasurementActivePowerPhaseC()
+        : SubscribeAttribute("active-power-phase-c")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount() {}
+    ~SubscribeAttributeElectricalMeasurementActivePowerPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000023) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A0B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTxIndirectMaxRetryExpiryCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeActivePowerPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.TxIndirectMaxRetryExpiryCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.ActivePowerPhaseC response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -83643,29 +79495,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount :
 };
 
 /*
- * Attribute TxErrCcaCount
+ * Attribute ActivePowerMinPhaseC
  */
-class ReadThreadNetworkDiagnosticsTxErrCcaCount : public ReadAttribute {
+class ReadElectricalMeasurementActivePowerMinPhaseC : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsTxErrCcaCount()
-        : ReadAttribute("tx-err-cca-count")
+    ReadElectricalMeasurementActivePowerMinPhaseC()
+        : ReadAttribute("active-power-min-phase-c")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsTxErrCcaCount() {}
+    ~ReadElectricalMeasurementActivePowerMinPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000024) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A0C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeTxErrCcaCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.TxErrCcaCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeActivePowerMinPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.ActivePowerMinPhaseC response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics TxErrCcaCount read Error", error);
+                LogNSError("ElectricalMeasurement ActivePowerMinPhaseC read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -83673,34 +79525,34 @@ class ReadThreadNetworkDiagnosticsTxErrCcaCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsTxErrCcaCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementActivePowerMinPhaseC : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsTxErrCcaCount()
-        : SubscribeAttribute("tx-err-cca-count")
+    SubscribeAttributeElectricalMeasurementActivePowerMinPhaseC()
+        : SubscribeAttribute("active-power-min-phase-c")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsTxErrCcaCount() {}
+    ~SubscribeAttributeElectricalMeasurementActivePowerMinPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000024) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A0C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTxErrCcaCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeActivePowerMinPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.TxErrCcaCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.ActivePowerMinPhaseC response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -83711,29 +79563,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxErrCcaCount : public Subscribe
 };
 
 /*
- * Attribute TxErrAbortCount
+ * Attribute ActivePowerMaxPhaseC
  */
-class ReadThreadNetworkDiagnosticsTxErrAbortCount : public ReadAttribute {
+class ReadElectricalMeasurementActivePowerMaxPhaseC : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsTxErrAbortCount()
-        : ReadAttribute("tx-err-abort-count")
+    ReadElectricalMeasurementActivePowerMaxPhaseC()
+        : ReadAttribute("active-power-max-phase-c")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsTxErrAbortCount() {}
+    ~ReadElectricalMeasurementActivePowerMaxPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000025) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A0D) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeTxErrAbortCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.TxErrAbortCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeActivePowerMaxPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.ActivePowerMaxPhaseC response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics TxErrAbortCount read Error", error);
+                LogNSError("ElectricalMeasurement ActivePowerMaxPhaseC read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -83741,34 +79593,34 @@ class ReadThreadNetworkDiagnosticsTxErrAbortCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsTxErrAbortCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementActivePowerMaxPhaseC : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsTxErrAbortCount()
-        : SubscribeAttribute("tx-err-abort-count")
+    SubscribeAttributeElectricalMeasurementActivePowerMaxPhaseC()
+        : SubscribeAttribute("active-power-max-phase-c")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsTxErrAbortCount() {}
+    ~SubscribeAttributeElectricalMeasurementActivePowerMaxPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000025) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A0D) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTxErrAbortCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeActivePowerMaxPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.TxErrAbortCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.ActivePowerMaxPhaseC response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -83779,29 +79631,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxErrAbortCount : public Subscri
 };
 
 /*
- * Attribute TxErrBusyChannelCount
+ * Attribute ReactivePowerPhaseC
  */
-class ReadThreadNetworkDiagnosticsTxErrBusyChannelCount : public ReadAttribute {
+class ReadElectricalMeasurementReactivePowerPhaseC : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsTxErrBusyChannelCount()
-        : ReadAttribute("tx-err-busy-channel-count")
+    ReadElectricalMeasurementReactivePowerPhaseC()
+        : ReadAttribute("reactive-power-phase-c")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsTxErrBusyChannelCount() {}
+    ~ReadElectricalMeasurementReactivePowerPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000026) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A0E) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeTxErrBusyChannelCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.TxErrBusyChannelCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeReactivePowerPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.ReactivePowerPhaseC response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics TxErrBusyChannelCount read Error", error);
+                LogNSError("ElectricalMeasurement ReactivePowerPhaseC read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -83809,34 +79661,34 @@ class ReadThreadNetworkDiagnosticsTxErrBusyChannelCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsTxErrBusyChannelCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementReactivePowerPhaseC : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsTxErrBusyChannelCount()
-        : SubscribeAttribute("tx-err-busy-channel-count")
+    SubscribeAttributeElectricalMeasurementReactivePowerPhaseC()
+        : SubscribeAttribute("reactive-power-phase-c")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsTxErrBusyChannelCount() {}
+    ~SubscribeAttributeElectricalMeasurementReactivePowerPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000026) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A0E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTxErrBusyChannelCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeReactivePowerPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.TxErrBusyChannelCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.ReactivePowerPhaseC response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -83847,29 +79699,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxErrBusyChannelCount : public S
 };
 
 /*
- * Attribute RxTotalCount
+ * Attribute ApparentPowerPhaseC
  */
-class ReadThreadNetworkDiagnosticsRxTotalCount : public ReadAttribute {
+class ReadElectricalMeasurementApparentPowerPhaseC : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsRxTotalCount()
-        : ReadAttribute("rx-total-count")
+    ReadElectricalMeasurementApparentPowerPhaseC()
+        : ReadAttribute("apparent-power-phase-c")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsRxTotalCount() {}
+    ~ReadElectricalMeasurementApparentPowerPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000027) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A0F) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeRxTotalCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.RxTotalCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeApparentPowerPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.ApparentPowerPhaseC response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics RxTotalCount read Error", error);
+                LogNSError("ElectricalMeasurement ApparentPowerPhaseC read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -83877,34 +79729,34 @@ class ReadThreadNetworkDiagnosticsRxTotalCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsRxTotalCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementApparentPowerPhaseC : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsRxTotalCount()
-        : SubscribeAttribute("rx-total-count")
+    SubscribeAttributeElectricalMeasurementApparentPowerPhaseC()
+        : SubscribeAttribute("apparent-power-phase-c")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsRxTotalCount() {}
+    ~SubscribeAttributeElectricalMeasurementApparentPowerPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000027) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A0F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRxTotalCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeApparentPowerPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.RxTotalCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.ApparentPowerPhaseC response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -83915,29 +79767,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxTotalCount : public SubscribeA
 };
 
 /*
- * Attribute RxUnicastCount
+ * Attribute PowerFactorPhaseC
  */
-class ReadThreadNetworkDiagnosticsRxUnicastCount : public ReadAttribute {
+class ReadElectricalMeasurementPowerFactorPhaseC : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsRxUnicastCount()
-        : ReadAttribute("rx-unicast-count")
+    ReadElectricalMeasurementPowerFactorPhaseC()
+        : ReadAttribute("power-factor-phase-c")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsRxUnicastCount() {}
+    ~ReadElectricalMeasurementPowerFactorPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000028) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A10) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeRxUnicastCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.RxUnicastCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributePowerFactorPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.PowerFactorPhaseC response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics RxUnicastCount read Error", error);
+                LogNSError("ElectricalMeasurement PowerFactorPhaseC read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -83945,34 +79797,34 @@ class ReadThreadNetworkDiagnosticsRxUnicastCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsRxUnicastCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementPowerFactorPhaseC : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsRxUnicastCount()
-        : SubscribeAttribute("rx-unicast-count")
+    SubscribeAttributeElectricalMeasurementPowerFactorPhaseC()
+        : SubscribeAttribute("power-factor-phase-c")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsRxUnicastCount() {}
+    ~SubscribeAttributeElectricalMeasurementPowerFactorPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000028) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A10) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRxUnicastCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributePowerFactorPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.RxUnicastCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.PowerFactorPhaseC response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -83983,29 +79835,30 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxUnicastCount : public Subscrib
 };
 
 /*
- * Attribute RxBroadcastCount
+ * Attribute AverageRmsVoltageMeasurementPeriodPhaseC
  */
-class ReadThreadNetworkDiagnosticsRxBroadcastCount : public ReadAttribute {
+class ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseC : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsRxBroadcastCount()
-        : ReadAttribute("rx-broadcast-count")
+    ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseC()
+        : ReadAttribute("average-rms-voltage-measurement-period-phase-c")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsRxBroadcastCount() {}
+    ~ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000029) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A11) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeRxBroadcastCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.RxBroadcastCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAverageRmsVoltageMeasurementPeriodPhaseCWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AverageRmsVoltageMeasurementPeriodPhaseC response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics RxBroadcastCount read Error", error);
+                LogNSError("ElectricalMeasurement AverageRmsVoltageMeasurementPeriodPhaseC read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -84013,34 +79866,35 @@ class ReadThreadNetworkDiagnosticsRxBroadcastCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsRxBroadcastCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseC : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsRxBroadcastCount()
-        : SubscribeAttribute("rx-broadcast-count")
+    SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseC()
+        : SubscribeAttribute("average-rms-voltage-measurement-period-phase-c")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsRxBroadcastCount() {}
+    ~SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000029) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A11) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRxBroadcastCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster
+            subscribeAttributeAverageRmsVoltageMeasurementPeriodPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.RxBroadcastCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.AverageRmsVoltageMeasurementPeriodPhaseC response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -84051,29 +79905,30 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxBroadcastCount : public Subscr
 };
 
 /*
- * Attribute RxDataCount
+ * Attribute AverageRmsOverVoltageCounterPhaseC
  */
-class ReadThreadNetworkDiagnosticsRxDataCount : public ReadAttribute {
+class ReadElectricalMeasurementAverageRmsOverVoltageCounterPhaseC : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsRxDataCount()
-        : ReadAttribute("rx-data-count")
+    ReadElectricalMeasurementAverageRmsOverVoltageCounterPhaseC()
+        : ReadAttribute("average-rms-over-voltage-counter-phase-c")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsRxDataCount() {}
+    ~ReadElectricalMeasurementAverageRmsOverVoltageCounterPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000002A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A12) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeRxDataCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.RxDataCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAverageRmsOverVoltageCounterPhaseCWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AverageRmsOverVoltageCounterPhaseC response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics RxDataCount read Error", error);
+                LogNSError("ElectricalMeasurement AverageRmsOverVoltageCounterPhaseC read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -84081,34 +79936,34 @@ class ReadThreadNetworkDiagnosticsRxDataCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsRxDataCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAverageRmsOverVoltageCounterPhaseC : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsRxDataCount()
-        : SubscribeAttribute("rx-data-count")
+    SubscribeAttributeElectricalMeasurementAverageRmsOverVoltageCounterPhaseC()
+        : SubscribeAttribute("average-rms-over-voltage-counter-phase-c")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsRxDataCount() {}
+    ~SubscribeAttributeElectricalMeasurementAverageRmsOverVoltageCounterPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000002A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A12) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRxDataCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAverageRmsOverVoltageCounterPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.RxDataCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.AverageRmsOverVoltageCounterPhaseC response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -84119,29 +79974,30 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxDataCount : public SubscribeAt
 };
 
 /*
- * Attribute RxDataPollCount
+ * Attribute AverageRmsUnderVoltageCounterPhaseC
  */
-class ReadThreadNetworkDiagnosticsRxDataPollCount : public ReadAttribute {
+class ReadElectricalMeasurementAverageRmsUnderVoltageCounterPhaseC : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsRxDataPollCount()
-        : ReadAttribute("rx-data-poll-count")
+    ReadElectricalMeasurementAverageRmsUnderVoltageCounterPhaseC()
+        : ReadAttribute("average-rms-under-voltage-counter-phase-c")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsRxDataPollCount() {}
+    ~ReadElectricalMeasurementAverageRmsUnderVoltageCounterPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000002B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A13) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeRxDataPollCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.RxDataPollCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAverageRmsUnderVoltageCounterPhaseCWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AverageRmsUnderVoltageCounterPhaseC response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics RxDataPollCount read Error", error);
+                LogNSError("ElectricalMeasurement AverageRmsUnderVoltageCounterPhaseC read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -84149,34 +80005,34 @@ class ReadThreadNetworkDiagnosticsRxDataPollCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsRxDataPollCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounterPhaseC : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsRxDataPollCount()
-        : SubscribeAttribute("rx-data-poll-count")
+    SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounterPhaseC()
+        : SubscribeAttribute("average-rms-under-voltage-counter-phase-c")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsRxDataPollCount() {}
+    ~SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounterPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000002B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A13) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRxDataPollCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAverageRmsUnderVoltageCounterPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.RxDataPollCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.AverageRmsUnderVoltageCounterPhaseC response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -84187,29 +80043,30 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxDataPollCount : public Subscri
 };
 
 /*
- * Attribute RxBeaconCount
+ * Attribute RmsExtremeOverVoltagePeriodPhaseC
  */
-class ReadThreadNetworkDiagnosticsRxBeaconCount : public ReadAttribute {
+class ReadElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseC : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsRxBeaconCount()
-        : ReadAttribute("rx-beacon-count")
+    ReadElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseC()
+        : ReadAttribute("rms-extreme-over-voltage-period-phase-c")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsRxBeaconCount() {}
+    ~ReadElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000002C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A14) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeRxBeaconCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.RxBeaconCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsExtremeOverVoltagePeriodPhaseCWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsExtremeOverVoltagePeriodPhaseC response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics RxBeaconCount read Error", error);
+                LogNSError("ElectricalMeasurement RmsExtremeOverVoltagePeriodPhaseC read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -84217,34 +80074,34 @@ class ReadThreadNetworkDiagnosticsRxBeaconCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsRxBeaconCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseC : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsRxBeaconCount()
-        : SubscribeAttribute("rx-beacon-count")
+    SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseC()
+        : SubscribeAttribute("rms-extreme-over-voltage-period-phase-c")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsRxBeaconCount() {}
+    ~SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000002C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A14) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRxBeaconCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsExtremeOverVoltagePeriodPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.RxBeaconCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsExtremeOverVoltagePeriodPhaseC response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -84255,29 +80112,30 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxBeaconCount : public Subscribe
 };
 
 /*
- * Attribute RxBeaconRequestCount
+ * Attribute RmsExtremeUnderVoltagePeriodPhaseC
  */
-class ReadThreadNetworkDiagnosticsRxBeaconRequestCount : public ReadAttribute {
+class ReadElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseC : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsRxBeaconRequestCount()
-        : ReadAttribute("rx-beacon-request-count")
+    ReadElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseC()
+        : ReadAttribute("rms-extreme-under-voltage-period-phase-c")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsRxBeaconRequestCount() {}
+    ~ReadElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000002D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A15) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeRxBeaconRequestCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.RxBeaconRequestCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeRmsExtremeUnderVoltagePeriodPhaseCWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.RmsExtremeUnderVoltagePeriodPhaseC response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics RxBeaconRequestCount read Error", error);
+                LogNSError("ElectricalMeasurement RmsExtremeUnderVoltagePeriodPhaseC read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -84285,34 +80143,34 @@ class ReadThreadNetworkDiagnosticsRxBeaconRequestCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsRxBeaconRequestCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseC : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsRxBeaconRequestCount()
-        : SubscribeAttribute("rx-beacon-request-count")
+    SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseC()
+        : SubscribeAttribute("rms-extreme-under-voltage-period-phase-c")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsRxBeaconRequestCount() {}
+    ~SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000002D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A15) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRxBeaconRequestCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsExtremeUnderVoltagePeriodPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.RxBeaconRequestCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsExtremeUnderVoltagePeriodPhaseC response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -84323,64 +80181,65 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxBeaconRequestCount : public Su
 };
 
 /*
- * Attribute RxOtherCount
+ * Attribute RmsVoltageSagPeriodPhaseC
  */
-class ReadThreadNetworkDiagnosticsRxOtherCount : public ReadAttribute {
+class ReadElectricalMeasurementRmsVoltageSagPeriodPhaseC : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsRxOtherCount()
-        : ReadAttribute("rx-other-count")
+    ReadElectricalMeasurementRmsVoltageSagPeriodPhaseC()
+        : ReadAttribute("rms-voltage-sag-period-phase-c")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsRxOtherCount() {}
+    ~ReadElectricalMeasurementRmsVoltageSagPeriodPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000002E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A16) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeRxOtherCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.RxOtherCount response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics RxOtherCount read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster
+            readAttributeRmsVoltageSagPeriodPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsVoltageSagPeriodPhaseC response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("ElectricalMeasurement RmsVoltageSagPeriodPhaseC read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsRxOtherCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriodPhaseC : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsRxOtherCount()
-        : SubscribeAttribute("rx-other-count")
+    SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriodPhaseC()
+        : SubscribeAttribute("rms-voltage-sag-period-phase-c")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsRxOtherCount() {}
+    ~SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriodPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000002E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A16) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRxOtherCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsVoltageSagPeriodPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.RxOtherCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsVoltageSagPeriodPhaseC response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -84391,64 +80250,65 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxOtherCount : public SubscribeA
 };
 
 /*
- * Attribute RxAddressFilteredCount
+ * Attribute RmsVoltageSwellPeriodPhaseC
  */
-class ReadThreadNetworkDiagnosticsRxAddressFilteredCount : public ReadAttribute {
+class ReadElectricalMeasurementRmsVoltageSwellPeriodPhaseC : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsRxAddressFilteredCount()
-        : ReadAttribute("rx-address-filtered-count")
+    ReadElectricalMeasurementRmsVoltageSwellPeriodPhaseC()
+        : ReadAttribute("rms-voltage-swell-period-phase-c")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsRxAddressFilteredCount() {}
+    ~ReadElectricalMeasurementRmsVoltageSwellPeriodPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000002F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x00000A17) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeRxAddressFilteredCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.RxAddressFilteredCount response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics RxAddressFilteredCount read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster
+            readAttributeRmsVoltageSwellPeriodPhaseCWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.RmsVoltageSwellPeriodPhaseC response %@", [value description]);
+                if (error != nil) {
+                    LogNSError("ElectricalMeasurement RmsVoltageSwellPeriodPhaseC read Error", error);
+                }
+                SetCommandExitStatus(error);
+            }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsRxAddressFilteredCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriodPhaseC : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsRxAddressFilteredCount()
-        : SubscribeAttribute("rx-address-filtered-count")
+    SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriodPhaseC()
+        : SubscribeAttribute("rms-voltage-swell-period-phase-c")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsRxAddressFilteredCount() {}
+    ~SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriodPhaseC() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000002F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x00000A17) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRxAddressFilteredCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRmsVoltageSwellPeriodPhaseCWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.RxAddressFilteredCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.RmsVoltageSwellPeriodPhaseC response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -84459,65 +80319,64 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxAddressFilteredCount : public
 };
 
 /*
- * Attribute RxDestAddrFilteredCount
+ * Attribute GeneratedCommandList
  */
-class ReadThreadNetworkDiagnosticsRxDestAddrFilteredCount : public ReadAttribute {
+class ReadElectricalMeasurementGeneratedCommandList : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsRxDestAddrFilteredCount()
-        : ReadAttribute("rx-dest-addr-filtered-count")
+    ReadElectricalMeasurementGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsRxDestAddrFilteredCount() {}
+    ~ReadElectricalMeasurementGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000030) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster
-            readAttributeRxDestAddrFilteredCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.RxDestAddrFilteredCount response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("ThreadNetworkDiagnostics RxDestAddrFilteredCount read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.GeneratedCommandList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ElectricalMeasurement GeneratedCommandList read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsRxDestAddrFilteredCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsRxDestAddrFilteredCount()
-        : SubscribeAttribute("rx-dest-addr-filtered-count")
+    SubscribeAttributeElectricalMeasurementGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsRxDestAddrFilteredCount() {}
+    ~SubscribeAttributeElectricalMeasurementGeneratedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000030) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRxDestAddrFilteredCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.RxDestAddrFilteredCount response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.GeneratedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -84528,29 +80387,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxDestAddrFilteredCount : public
 };
 
 /*
- * Attribute RxDuplicatedCount
+ * Attribute AcceptedCommandList
  */
-class ReadThreadNetworkDiagnosticsRxDuplicatedCount : public ReadAttribute {
+class ReadElectricalMeasurementAcceptedCommandList : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsRxDuplicatedCount()
-        : ReadAttribute("rx-duplicated-count")
+    ReadElectricalMeasurementAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsRxDuplicatedCount() {}
+    ~ReadElectricalMeasurementAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000031) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeRxDuplicatedCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.RxDuplicatedCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AcceptedCommandList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics RxDuplicatedCount read Error", error);
+                LogNSError("ElectricalMeasurement AcceptedCommandList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -84558,34 +80417,34 @@ class ReadThreadNetworkDiagnosticsRxDuplicatedCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsRxDuplicatedCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsRxDuplicatedCount()
-        : SubscribeAttribute("rx-duplicated-count")
+    SubscribeAttributeElectricalMeasurementAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsRxDuplicatedCount() {}
+    ~SubscribeAttributeElectricalMeasurementAcceptedCommandList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000031) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRxDuplicatedCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.RxDuplicatedCount response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AcceptedCommandList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -84596,29 +80455,29 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxDuplicatedCount : public Subsc
 };
 
 /*
- * Attribute RxErrNoFrameCount
+ * Attribute AttributeList
  */
-class ReadThreadNetworkDiagnosticsRxErrNoFrameCount : public ReadAttribute {
+class ReadElectricalMeasurementAttributeList : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsRxErrNoFrameCount()
-        : ReadAttribute("rx-err-no-frame-count")
+    ReadElectricalMeasurementAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsRxErrNoFrameCount() {}
+    ~ReadElectricalMeasurementAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000032) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeRxErrNoFrameCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.RxErrNoFrameCount response %@", [value description]);
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.AttributeList response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics RxErrNoFrameCount read Error", error);
+                LogNSError("ElectricalMeasurement AttributeList read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -84626,34 +80485,34 @@ class ReadThreadNetworkDiagnosticsRxErrNoFrameCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsRxErrNoFrameCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsRxErrNoFrameCount()
-        : SubscribeAttribute("rx-err-no-frame-count")
+    SubscribeAttributeElectricalMeasurementAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsRxErrNoFrameCount() {}
+    ~SubscribeAttributeElectricalMeasurementAttributeList() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000032) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRxErrNoFrameCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.RxErrNoFrameCount response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ElectricalMeasurement.AttributeList response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -84664,65 +80523,64 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrNoFrameCount : public Subsc
 };
 
 /*
- * Attribute RxErrUnknownNeighborCount
+ * Attribute FeatureMap
  */
-class ReadThreadNetworkDiagnosticsRxErrUnknownNeighborCount : public ReadAttribute {
+class ReadElectricalMeasurementFeatureMap : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsRxErrUnknownNeighborCount()
-        : ReadAttribute("rx-err-unknown-neighbor-count")
+    ReadElectricalMeasurementFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsRxErrUnknownNeighborCount() {}
+    ~ReadElectricalMeasurementFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000033) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster
-            readAttributeRxErrUnknownNeighborCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.RxErrUnknownNeighborCount response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("ThreadNetworkDiagnostics RxErrUnknownNeighborCount read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.FeatureMap response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ElectricalMeasurement FeatureMap read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsRxErrUnknownNeighborCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsRxErrUnknownNeighborCount()
-        : SubscribeAttribute("rx-err-unknown-neighbor-count")
+    SubscribeAttributeElectricalMeasurementFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsRxErrUnknownNeighborCount() {}
+    ~SubscribeAttributeElectricalMeasurementFeatureMap() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000033) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRxErrUnknownNeighborCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.RxErrUnknownNeighborCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.FeatureMap response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -84733,65 +80591,64 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrUnknownNeighborCount : publ
 };
 
 /*
- * Attribute RxErrInvalidSrcAddrCount
+ * Attribute ClusterRevision
  */
-class ReadThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount : public ReadAttribute {
+class ReadElectricalMeasurementClusterRevision : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount()
-        : ReadAttribute("rx-err-invalid-src-addr-count")
+    ReadElectricalMeasurementClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount() {}
+    ~ReadElectricalMeasurementClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000034) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster
-            readAttributeRxErrInvalidSrcAddrCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.RxErrInvalidSrcAddrCount response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("ThreadNetworkDiagnostics RxErrInvalidSrcAddrCount read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ElectricalMeasurement.ClusterRevision response %@", [value description]);
+            if (error != nil) {
+                LogNSError("ElectricalMeasurement ClusterRevision read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount : public SubscribeAttribute {
+class SubscribeAttributeElectricalMeasurementClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount()
-        : SubscribeAttribute("rx-err-invalid-src-addr-count")
+    SubscribeAttributeElectricalMeasurementClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount() {}
+    ~SubscribeAttributeElectricalMeasurementClusterRevision() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000034) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x00000B04) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPElectricalMeasurement * cluster = [[CHIPElectricalMeasurement alloc] initWithDevice:device
+                                                                                       endpoint:endpointId
+                                                                                          queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRxErrInvalidSrcAddrCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.RxErrInvalidSrcAddrCount response %@", [value description]);
+                NSLog(@"ElectricalMeasurement.ClusterRevision response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -84801,884 +80658,1741 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount : publi
     }
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster TestCluster                                                 | 0xFFF1FC05|
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * Test                                                              |   0x00 |
+| * TestNotHandled                                                    |   0x01 |
+| * TestSpecific                                                      |   0x02 |
+| * TestUnknownCommand                                                |   0x03 |
+| * TestAddArguments                                                  |   0x04 |
+| * TestSimpleArgumentRequest                                         |   0x05 |
+| * TestStructArrayArgumentRequest                                    |   0x06 |
+| * TestStructArgumentRequest                                         |   0x07 |
+| * TestNestedStructArgumentRequest                                   |   0x08 |
+| * TestListStructArgumentRequest                                     |   0x09 |
+| * TestListInt8UArgumentRequest                                      |   0x0A |
+| * TestNestedStructListArgumentRequest                               |   0x0B |
+| * TestListNestedStructListArgumentRequest                           |   0x0C |
+| * TestListInt8UReverseRequest                                       |   0x0D |
+| * TestEnumsRequest                                                  |   0x0E |
+| * TestNullableOptionalRequest                                       |   0x0F |
+| * TestComplexNullableOptionalRequest                                |   0x10 |
+| * SimpleStructEchoRequest                                           |   0x11 |
+| * TimedInvokeRequest                                                |   0x12 |
+| * TestSimpleOptionalArgumentRequest                                 |   0x13 |
+| * TestEmitTestEventRequest                                          |   0x14 |
+| * TestEmitTestFabricScopedEventRequest                              |   0x15 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * Boolean                                                           | 0x0000 |
+| * Bitmap8                                                           | 0x0001 |
+| * Bitmap16                                                          | 0x0002 |
+| * Bitmap32                                                          | 0x0003 |
+| * Bitmap64                                                          | 0x0004 |
+| * Int8u                                                             | 0x0005 |
+| * Int16u                                                            | 0x0006 |
+| * Int24u                                                            | 0x0007 |
+| * Int32u                                                            | 0x0008 |
+| * Int40u                                                            | 0x0009 |
+| * Int48u                                                            | 0x000A |
+| * Int56u                                                            | 0x000B |
+| * Int64u                                                            | 0x000C |
+| * Int8s                                                             | 0x000D |
+| * Int16s                                                            | 0x000E |
+| * Int24s                                                            | 0x000F |
+| * Int32s                                                            | 0x0010 |
+| * Int40s                                                            | 0x0011 |
+| * Int48s                                                            | 0x0012 |
+| * Int56s                                                            | 0x0013 |
+| * Int64s                                                            | 0x0014 |
+| * Enum8                                                             | 0x0015 |
+| * Enum16                                                            | 0x0016 |
+| * FloatSingle                                                       | 0x0017 |
+| * FloatDouble                                                       | 0x0018 |
+| * OctetString                                                       | 0x0019 |
+| * ListInt8u                                                         | 0x001A |
+| * ListOctetString                                                   | 0x001B |
+| * ListStructOctetString                                             | 0x001C |
+| * LongOctetString                                                   | 0x001D |
+| * CharString                                                        | 0x001E |
+| * LongCharString                                                    | 0x001F |
+| * EpochUs                                                           | 0x0020 |
+| * EpochS                                                            | 0x0021 |
+| * VendorId                                                          | 0x0022 |
+| * ListNullablesAndOptionalsStruct                                   | 0x0023 |
+| * EnumAttr                                                          | 0x0024 |
+| * StructAttr                                                        | 0x0025 |
+| * RangeRestrictedInt8u                                              | 0x0026 |
+| * RangeRestrictedInt8s                                              | 0x0027 |
+| * RangeRestrictedInt16u                                             | 0x0028 |
+| * RangeRestrictedInt16s                                             | 0x0029 |
+| * ListLongOctetString                                               | 0x002A |
+| * ListFabricScoped                                                  | 0x002B |
+| * TimedWriteBoolean                                                 | 0x0030 |
+| * GeneralErrorBoolean                                               | 0x0031 |
+| * ClusterErrorBoolean                                               | 0x0032 |
+| * Unsupported                                                       | 0x00FF |
+| * NullableBoolean                                                   | 0x4000 |
+| * NullableBitmap8                                                   | 0x4001 |
+| * NullableBitmap16                                                  | 0x4002 |
+| * NullableBitmap32                                                  | 0x4003 |
+| * NullableBitmap64                                                  | 0x4004 |
+| * NullableInt8u                                                     | 0x4005 |
+| * NullableInt16u                                                    | 0x4006 |
+| * NullableInt24u                                                    | 0x4007 |
+| * NullableInt32u                                                    | 0x4008 |
+| * NullableInt40u                                                    | 0x4009 |
+| * NullableInt48u                                                    | 0x400A |
+| * NullableInt56u                                                    | 0x400B |
+| * NullableInt64u                                                    | 0x400C |
+| * NullableInt8s                                                     | 0x400D |
+| * NullableInt16s                                                    | 0x400E |
+| * NullableInt24s                                                    | 0x400F |
+| * NullableInt32s                                                    | 0x4010 |
+| * NullableInt40s                                                    | 0x4011 |
+| * NullableInt48s                                                    | 0x4012 |
+| * NullableInt56s                                                    | 0x4013 |
+| * NullableInt64s                                                    | 0x4014 |
+| * NullableEnum8                                                     | 0x4015 |
+| * NullableEnum16                                                    | 0x4016 |
+| * NullableFloatSingle                                               | 0x4017 |
+| * NullableFloatDouble                                               | 0x4018 |
+| * NullableOctetString                                               | 0x4019 |
+| * NullableCharString                                                | 0x401E |
+| * NullableEnumAttr                                                  | 0x4024 |
+| * NullableStruct                                                    | 0x4025 |
+| * NullableRangeRestrictedInt8u                                      | 0x4026 |
+| * NullableRangeRestrictedInt8s                                      | 0x4027 |
+| * NullableRangeRestrictedInt16u                                     | 0x4028 |
+| * NullableRangeRestrictedInt16s                                     | 0x4029 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * TestEvent                                                         | 0x0001 |
+| * TestFabricScopedEvent                                             | 0x0002 |
+\*----------------------------------------------------------------------------*/
+
 /*
- * Attribute RxErrSecCount
+ * Command Test
  */
-class ReadThreadNetworkDiagnosticsRxErrSecCount : public ReadAttribute {
+class TestClusterTest : public ClusterCommand {
 public:
-    ReadThreadNetworkDiagnosticsRxErrSecCount()
-        : ReadAttribute("rx-err-sec-count")
+    TestClusterTest()
+        : ClusterCommand("test")
     {
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadThreadNetworkDiagnosticsRxErrSecCount() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000035) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeRxErrSecCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.RxErrSecCount response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics RxErrSecCount read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPTestClusterClusterTestParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster testWithParams:params
+                  completionHandler:^(NSError * _Nullable error) {
+                      responsesNeeded--;
+                      if (error != nil) {
+                          mError = error;
+                          LogNSError("Error", error);
+                      }
+                      if (responsesNeeded == 0) {
+                          SetCommandExitStatus(mError);
+                      }
+                  }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsRxErrSecCount : public SubscribeAttribute {
+/*
+ * Command TestNotHandled
+ */
+class TestClusterTestNotHandled : public ClusterCommand {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsRxErrSecCount()
-        : SubscribeAttribute("rx-err-sec-count")
+    TestClusterTestNotHandled()
+        : ClusterCommand("test-not-handled")
     {
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsRxErrSecCount() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000035) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRxErrSecCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.RxErrSecCount response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000001) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPTestClusterClusterTestNotHandledParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster testNotHandledWithParams:params
+                            completionHandler:^(NSError * _Nullable error) {
+                                responsesNeeded--;
+                                if (error != nil) {
+                                    mError = error;
+                                    LogNSError("Error", error);
+                                }
+                                if (responsesNeeded == 0) {
+                                    SetCommandExitStatus(mError);
+                                }
+                            }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
 };
 
 /*
- * Attribute RxErrFcsCount
+ * Command TestSpecific
  */
-class ReadThreadNetworkDiagnosticsRxErrFcsCount : public ReadAttribute {
+class TestClusterTestSpecific : public ClusterCommand {
 public:
-    ReadThreadNetworkDiagnosticsRxErrFcsCount()
-        : ReadAttribute("rx-err-fcs-count")
+    TestClusterTestSpecific()
+        : ClusterCommand("test-specific")
     {
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadThreadNetworkDiagnosticsRxErrFcsCount() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000036) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeRxErrFcsCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.RxErrFcsCount response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics RxErrFcsCount read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPTestClusterClusterTestSpecificParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster testSpecificWithParams:params
+                          completionHandler:^(
+                              CHIPTestClusterClusterTestSpecificResponseParams * _Nullable values, NSError * _Nullable error) {
+                              NSLog(@"Values: %@", values);
+                              responsesNeeded--;
+                              if (error != nil) {
+                                  mError = error;
+                                  LogNSError("Error", error);
+                              }
+                              if (responsesNeeded == 0) {
+                                  SetCommandExitStatus(mError);
+                              }
+                          }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsRxErrFcsCount : public SubscribeAttribute {
+/*
+ * Command TestUnknownCommand
+ */
+class TestClusterTestUnknownCommand : public ClusterCommand {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsRxErrFcsCount()
-        : SubscribeAttribute("rx-err-fcs-count")
+    TestClusterTestUnknownCommand()
+        : ClusterCommand("test-unknown-command")
     {
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsRxErrFcsCount() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000036) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRxErrFcsCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.RxErrFcsCount response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000003) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPTestClusterClusterTestUnknownCommandParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster testUnknownCommandWithParams:params
+                                completionHandler:^(NSError * _Nullable error) {
+                                    responsesNeeded--;
+                                    if (error != nil) {
+                                        mError = error;
+                                        LogNSError("Error", error);
+                                    }
+                                    if (responsesNeeded == 0) {
+                                        SetCommandExitStatus(mError);
+                                    }
+                                }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
 };
 
 /*
- * Attribute RxErrOtherCount
+ * Command TestAddArguments
  */
-class ReadThreadNetworkDiagnosticsRxErrOtherCount : public ReadAttribute {
+class TestClusterTestAddArguments : public ClusterCommand {
 public:
-    ReadThreadNetworkDiagnosticsRxErrOtherCount()
-        : ReadAttribute("rx-err-other-count")
+    TestClusterTestAddArguments()
+        : ClusterCommand("test-add-arguments")
     {
+        AddArgument("Arg1", 0, UINT8_MAX, &mRequest.arg1);
+        AddArgument("Arg2", 0, UINT8_MAX, &mRequest.arg2);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadThreadNetworkDiagnosticsRxErrOtherCount() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000037) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeRxErrOtherCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.RxErrOtherCount response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics RxErrOtherCount read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPTestClusterClusterTestAddArgumentsParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.arg1 = [NSNumber numberWithUnsignedChar:mRequest.arg1];
+        params.arg2 = [NSNumber numberWithUnsignedChar:mRequest.arg2];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster testAddArgumentsWithParams:params
+                              completionHandler:^(CHIPTestClusterClusterTestAddArgumentsResponseParams * _Nullable values,
+                                  NSError * _Nullable error) {
+                                  NSLog(@"Values: %@", values);
+                                  responsesNeeded--;
+                                  if (error != nil) {
+                                      mError = error;
+                                      LogNSError("Error", error);
+                                  }
+                                  if (responsesNeeded == 0) {
+                                      SetCommandExitStatus(mError);
+                                  }
+                              }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::TestCluster::Commands::TestAddArguments::Type mRequest;
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsRxErrOtherCount : public SubscribeAttribute {
+/*
+ * Command TestSimpleArgumentRequest
+ */
+class TestClusterTestSimpleArgumentRequest : public ClusterCommand {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsRxErrOtherCount()
-        : SubscribeAttribute("rx-err-other-count")
+    TestClusterTestSimpleArgumentRequest()
+        : ClusterCommand("test-simple-argument-request")
     {
+        AddArgument("Arg1", 0, 1, &mRequest.arg1);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsRxErrOtherCount() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000037) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRxErrOtherCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.RxErrOtherCount response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000005) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPTestClusterClusterTestSimpleArgumentRequestParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.arg1 = [NSNumber numberWithBool:mRequest.arg1];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster
+                testSimpleArgumentRequestWithParams:params
+                                  completionHandler:^(CHIPTestClusterClusterTestSimpleArgumentResponseParams * _Nullable values,
+                                      NSError * _Nullable error) {
+                                      NSLog(@"Values: %@", values);
+                                      responsesNeeded--;
+                                      if (error != nil) {
+                                          mError = error;
+                                          LogNSError("Error", error);
+                                      }
+                                      if (responsesNeeded == 0) {
+                                          SetCommandExitStatus(mError);
+                                      }
+                                  }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::TestCluster::Commands::TestSimpleArgumentRequest::Type mRequest;
 };
 
 /*
- * Attribute ActiveTimestamp
+ * Command TestStructArrayArgumentRequest
  */
-class ReadThreadNetworkDiagnosticsActiveTimestamp : public ReadAttribute {
+class TestClusterTestStructArrayArgumentRequest : public ClusterCommand {
 public:
-    ReadThreadNetworkDiagnosticsActiveTimestamp()
-        : ReadAttribute("active-timestamp")
+    TestClusterTestStructArrayArgumentRequest()
+        : ClusterCommand("test-struct-array-argument-request")
+        , mComplex_Arg1(&mRequest.arg1)
+        , mComplex_Arg2(&mRequest.arg2)
+        , mComplex_Arg3(&mRequest.arg3)
+        , mComplex_Arg4(&mRequest.arg4)
     {
+        AddArgument("Arg1", &mComplex_Arg1);
+        AddArgument("Arg2", &mComplex_Arg2);
+        AddArgument("Arg3", &mComplex_Arg3);
+        AddArgument("Arg4", &mComplex_Arg4);
+        AddArgument("Arg5", 0, UINT8_MAX, &mRequest.arg5);
+        AddArgument("Arg6", 0, 1, &mRequest.arg6);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadThreadNetworkDiagnosticsActiveTimestamp() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000038) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000006) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeActiveTimestampWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.ActiveTimestamp response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics ActiveTimestamp read Error", error);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPTestClusterClusterTestStructArrayArgumentRequestParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mRequest.arg1) {
+                CHIPTestClusterClusterNestedStructList * newElement_0;
+                newElement_0 = [CHIPTestClusterClusterNestedStructList new];
+                newElement_0.a = [NSNumber numberWithUnsignedChar:entry_0.a];
+                newElement_0.b = [NSNumber numberWithBool:entry_0.b];
+                newElement_0.c = [CHIPTestClusterClusterSimpleStruct new];
+                newElement_0.c.a = [NSNumber numberWithUnsignedChar:entry_0.c.a];
+                newElement_0.c.b = [NSNumber numberWithBool:entry_0.c.b];
+                newElement_0.c.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.c.c)];
+                newElement_0.c.d = [NSData dataWithBytes:entry_0.c.d.data() length:entry_0.c.d.size()];
+                newElement_0.c.e = [[NSString alloc] initWithBytes:entry_0.c.e.data()
+                                                            length:entry_0.c.e.size()
+                                                          encoding:NSUTF8StringEncoding];
+                newElement_0.c.f = [NSNumber numberWithUnsignedChar:entry_0.c.f.Raw()];
+                newElement_0.c.g = [NSNumber numberWithFloat:entry_0.c.g];
+                newElement_0.c.h = [NSNumber numberWithDouble:entry_0.c.h];
+                { // Scope for our temporary variables
+                    auto * array_2 = [NSMutableArray new];
+                    for (auto & entry_2 : entry_0.d) {
+                        CHIPTestClusterClusterSimpleStruct * newElement_2;
+                        newElement_2 = [CHIPTestClusterClusterSimpleStruct new];
+                        newElement_2.a = [NSNumber numberWithUnsignedChar:entry_2.a];
+                        newElement_2.b = [NSNumber numberWithBool:entry_2.b];
+                        newElement_2.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_2.c)];
+                        newElement_2.d = [NSData dataWithBytes:entry_2.d.data() length:entry_2.d.size()];
+                        newElement_2.e = [[NSString alloc] initWithBytes:entry_2.e.data()
+                                                                  length:entry_2.e.size()
+                                                                encoding:NSUTF8StringEncoding];
+                        newElement_2.f = [NSNumber numberWithUnsignedChar:entry_2.f.Raw()];
+                        newElement_2.g = [NSNumber numberWithFloat:entry_2.g];
+                        newElement_2.h = [NSNumber numberWithDouble:entry_2.h];
+                        [array_2 addObject:newElement_2];
+                    }
+                    newElement_0.d = array_2;
+                }
+                { // Scope for our temporary variables
+                    auto * array_2 = [NSMutableArray new];
+                    for (auto & entry_2 : entry_0.e) {
+                        NSNumber * newElement_2;
+                        newElement_2 = [NSNumber numberWithUnsignedInt:entry_2];
+                        [array_2 addObject:newElement_2];
+                    }
+                    newElement_0.e = array_2;
+                }
+                { // Scope for our temporary variables
+                    auto * array_2 = [NSMutableArray new];
+                    for (auto & entry_2 : entry_0.f) {
+                        NSData * newElement_2;
+                        newElement_2 = [NSData dataWithBytes:entry_2.data() length:entry_2.size()];
+                        [array_2 addObject:newElement_2];
+                    }
+                    newElement_0.f = array_2;
+                }
+                { // Scope for our temporary variables
+                    auto * array_2 = [NSMutableArray new];
+                    for (auto & entry_2 : entry_0.g) {
+                        NSNumber * newElement_2;
+                        newElement_2 = [NSNumber numberWithUnsignedChar:entry_2];
+                        [array_2 addObject:newElement_2];
+                    }
+                    newElement_0.g = array_2;
+                }
+                [array_0 addObject:newElement_0];
             }
-            SetCommandExitStatus(error);
-        }];
+            params.arg1 = array_0;
+        }
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mRequest.arg2) {
+                CHIPTestClusterClusterSimpleStruct * newElement_0;
+                newElement_0 = [CHIPTestClusterClusterSimpleStruct new];
+                newElement_0.a = [NSNumber numberWithUnsignedChar:entry_0.a];
+                newElement_0.b = [NSNumber numberWithBool:entry_0.b];
+                newElement_0.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.c)];
+                newElement_0.d = [NSData dataWithBytes:entry_0.d.data() length:entry_0.d.size()];
+                newElement_0.e = [[NSString alloc] initWithBytes:entry_0.e.data()
+                                                          length:entry_0.e.size()
+                                                        encoding:NSUTF8StringEncoding];
+                newElement_0.f = [NSNumber numberWithUnsignedChar:entry_0.f.Raw()];
+                newElement_0.g = [NSNumber numberWithFloat:entry_0.g];
+                newElement_0.h = [NSNumber numberWithDouble:entry_0.h];
+                [array_0 addObject:newElement_0];
+            }
+            params.arg2 = array_0;
+        }
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mRequest.arg3) {
+                NSNumber * newElement_0;
+                newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
+                [array_0 addObject:newElement_0];
+            }
+            params.arg3 = array_0;
+        }
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mRequest.arg4) {
+                NSNumber * newElement_0;
+                newElement_0 = [NSNumber numberWithBool:entry_0];
+                [array_0 addObject:newElement_0];
+            }
+            params.arg4 = array_0;
+        }
+        params.arg5 = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.arg5)];
+        params.arg6 = [NSNumber numberWithBool:mRequest.arg6];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster testStructArrayArgumentRequestWithParams:params
+                                            completionHandler:^(
+                                                CHIPTestClusterClusterTestStructArrayArgumentResponseParams * _Nullable values,
+                                                NSError * _Nullable error) {
+                                                NSLog(@"Values: %@", values);
+                                                responsesNeeded--;
+                                                if (error != nil) {
+                                                    mError = error;
+                                                    LogNSError("Error", error);
+                                                }
+                                                if (responsesNeeded == 0) {
+                                                    SetCommandExitStatus(mError);
+                                                }
+                                            }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::TestCluster::Commands::TestStructArrayArgumentRequest::Type mRequest;
+    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::NestedStructList::Type>>
+        mComplex_Arg1;
+    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type>>
+        mComplex_Arg2;
+    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::TestCluster::SimpleEnum>> mComplex_Arg3;
+    TypedComplexArgument<chip::app::DataModel::List<const bool>> mComplex_Arg4;
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsActiveTimestamp : public SubscribeAttribute {
+/*
+ * Command TestStructArgumentRequest
+ */
+class TestClusterTestStructArgumentRequest : public ClusterCommand {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsActiveTimestamp()
-        : SubscribeAttribute("active-timestamp")
+    TestClusterTestStructArgumentRequest()
+        : ClusterCommand("test-struct-argument-request")
+        , mComplex_Arg1(&mRequest.arg1)
     {
+        AddArgument("Arg1", &mComplex_Arg1);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsActiveTimestamp() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000038) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeActiveTimestampWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.ActiveTimestamp response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000007) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPTestClusterClusterTestStructArgumentRequestParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.arg1 = [CHIPTestClusterClusterSimpleStruct new];
+        params.arg1.a = [NSNumber numberWithUnsignedChar:mRequest.arg1.a];
+        params.arg1.b = [NSNumber numberWithBool:mRequest.arg1.b];
+        params.arg1.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.arg1.c)];
+        params.arg1.d = [NSData dataWithBytes:mRequest.arg1.d.data() length:mRequest.arg1.d.size()];
+        params.arg1.e = [[NSString alloc] initWithBytes:mRequest.arg1.e.data()
+                                                 length:mRequest.arg1.e.size()
+                                               encoding:NSUTF8StringEncoding];
+        params.arg1.f = [NSNumber numberWithUnsignedChar:mRequest.arg1.f.Raw()];
+        params.arg1.g = [NSNumber numberWithFloat:mRequest.arg1.g];
+        params.arg1.h = [NSNumber numberWithDouble:mRequest.arg1.h];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster testStructArgumentRequestWithParams:params
+                                       completionHandler:^(CHIPTestClusterClusterBooleanResponseParams * _Nullable values,
+                                           NSError * _Nullable error) {
+                                           NSLog(@"Values: %@", values);
+                                           responsesNeeded--;
+                                           if (error != nil) {
+                                               mError = error;
+                                               LogNSError("Error", error);
+                                           }
+                                           if (responsesNeeded == 0) {
+                                               SetCommandExitStatus(mError);
+                                           }
+                                       }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::TestCluster::Commands::TestStructArgumentRequest::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type> mComplex_Arg1;
 };
 
 /*
- * Attribute PendingTimestamp
+ * Command TestNestedStructArgumentRequest
  */
-class ReadThreadNetworkDiagnosticsPendingTimestamp : public ReadAttribute {
+class TestClusterTestNestedStructArgumentRequest : public ClusterCommand {
 public:
-    ReadThreadNetworkDiagnosticsPendingTimestamp()
-        : ReadAttribute("pending-timestamp")
+    TestClusterTestNestedStructArgumentRequest()
+        : ClusterCommand("test-nested-struct-argument-request")
+        , mComplex_Arg1(&mRequest.arg1)
     {
+        AddArgument("Arg1", &mComplex_Arg1);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadThreadNetworkDiagnosticsPendingTimestamp() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x00000039) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000008) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributePendingTimestampWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.PendingTimestamp response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics PendingTimestamp read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPTestClusterClusterTestNestedStructArgumentRequestParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.arg1 = [CHIPTestClusterClusterNestedStruct new];
+        params.arg1.a = [NSNumber numberWithUnsignedChar:mRequest.arg1.a];
+        params.arg1.b = [NSNumber numberWithBool:mRequest.arg1.b];
+        params.arg1.c = [CHIPTestClusterClusterSimpleStruct new];
+        params.arg1.c.a = [NSNumber numberWithUnsignedChar:mRequest.arg1.c.a];
+        params.arg1.c.b = [NSNumber numberWithBool:mRequest.arg1.c.b];
+        params.arg1.c.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.arg1.c.c)];
+        params.arg1.c.d = [NSData dataWithBytes:mRequest.arg1.c.d.data() length:mRequest.arg1.c.d.size()];
+        params.arg1.c.e = [[NSString alloc] initWithBytes:mRequest.arg1.c.e.data()
+                                                   length:mRequest.arg1.c.e.size()
+                                                 encoding:NSUTF8StringEncoding];
+        params.arg1.c.f = [NSNumber numberWithUnsignedChar:mRequest.arg1.c.f.Raw()];
+        params.arg1.c.g = [NSNumber numberWithFloat:mRequest.arg1.c.g];
+        params.arg1.c.h = [NSNumber numberWithDouble:mRequest.arg1.c.h];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster testNestedStructArgumentRequestWithParams:params
+                                             completionHandler:^(CHIPTestClusterClusterBooleanResponseParams * _Nullable values,
+                                                 NSError * _Nullable error) {
+                                                 NSLog(@"Values: %@", values);
+                                                 responsesNeeded--;
+                                                 if (error != nil) {
+                                                     mError = error;
+                                                     LogNSError("Error", error);
+                                                 }
+                                                 if (responsesNeeded == 0) {
+                                                     SetCommandExitStatus(mError);
+                                                 }
+                                             }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::TestCluster::Commands::TestNestedStructArgumentRequest::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::TestCluster::Structs::NestedStruct::Type> mComplex_Arg1;
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsPendingTimestamp : public SubscribeAttribute {
+/*
+ * Command TestListStructArgumentRequest
+ */
+class TestClusterTestListStructArgumentRequest : public ClusterCommand {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsPendingTimestamp()
-        : SubscribeAttribute("pending-timestamp")
+    TestClusterTestListStructArgumentRequest()
+        : ClusterCommand("test-list-struct-argument-request")
+        , mComplex_Arg1(&mRequest.arg1)
     {
+        AddArgument("Arg1", &mComplex_Arg1);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsPendingTimestamp() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x00000039) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000009) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePendingTimestampWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPTestClusterClusterTestListStructArgumentRequestParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mRequest.arg1) {
+                CHIPTestClusterClusterSimpleStruct * newElement_0;
+                newElement_0 = [CHIPTestClusterClusterSimpleStruct new];
+                newElement_0.a = [NSNumber numberWithUnsignedChar:entry_0.a];
+                newElement_0.b = [NSNumber numberWithBool:entry_0.b];
+                newElement_0.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.c)];
+                newElement_0.d = [NSData dataWithBytes:entry_0.d.data() length:entry_0.d.size()];
+                newElement_0.e = [[NSString alloc] initWithBytes:entry_0.e.data()
+                                                          length:entry_0.e.size()
+                                                        encoding:NSUTF8StringEncoding];
+                newElement_0.f = [NSNumber numberWithUnsignedChar:entry_0.f.Raw()];
+                newElement_0.g = [NSNumber numberWithFloat:entry_0.g];
+                newElement_0.h = [NSNumber numberWithDouble:entry_0.h];
+                [array_0 addObject:newElement_0];
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.PendingTimestamp response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
-
+            params.arg1 = array_0;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster testListStructArgumentRequestWithParams:params
+                                           completionHandler:^(CHIPTestClusterClusterBooleanResponseParams * _Nullable values,
+                                               NSError * _Nullable error) {
+                                               NSLog(@"Values: %@", values);
+                                               responsesNeeded--;
+                                               if (error != nil) {
+                                                   mError = error;
+                                                   LogNSError("Error", error);
+                                               }
+                                               if (responsesNeeded == 0) {
+                                                   SetCommandExitStatus(mError);
+                                               }
+                                           }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::TestCluster::Commands::TestListStructArgumentRequest::Type mRequest;
+    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type>>
+        mComplex_Arg1;
 };
 
 /*
- * Attribute Delay
+ * Command TestListInt8UArgumentRequest
  */
-class ReadThreadNetworkDiagnosticsDelay : public ReadAttribute {
+class TestClusterTestListInt8UArgumentRequest : public ClusterCommand {
 public:
-    ReadThreadNetworkDiagnosticsDelay()
-        : ReadAttribute("delay")
+    TestClusterTestListInt8UArgumentRequest()
+        : ClusterCommand("test-list-int8uargument-request")
+        , mComplex_Arg1(&mRequest.arg1)
     {
+        AddArgument("Arg1", &mComplex_Arg1);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadThreadNetworkDiagnosticsDelay() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000003A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeDelayWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.Delay response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics Delay read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class SubscribeAttributeThreadNetworkDiagnosticsDelay : public SubscribeAttribute {
-public:
-    SubscribeAttributeThreadNetworkDiagnosticsDelay()
-        : SubscribeAttribute("delay")
-    {
-    }
-
-    ~SubscribeAttributeThreadNetworkDiagnosticsDelay() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000003A) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPTestClusterClusterTestListInt8UArgumentRequestParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mRequest.arg1) {
+                NSNumber * newElement_0;
+                newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
+                [array_0 addObject:newElement_0];
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.Delay response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
-
+            params.arg1 = array_0;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster testListInt8UArgumentRequestWithParams:params
+                                          completionHandler:^(CHIPTestClusterClusterBooleanResponseParams * _Nullable values,
+                                              NSError * _Nullable error) {
+                                              NSLog(@"Values: %@", values);
+                                              responsesNeeded--;
+                                              if (error != nil) {
+                                                  mError = error;
+                                                  LogNSError("Error", error);
+                                              }
+                                              if (responsesNeeded == 0) {
+                                                  SetCommandExitStatus(mError);
+                                              }
+                                          }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::TestCluster::Commands::TestListInt8UArgumentRequest::Type mRequest;
+    TypedComplexArgument<chip::app::DataModel::List<const uint8_t>> mComplex_Arg1;
 };
 
 /*
- * Attribute SecurityPolicy
+ * Command TestNestedStructListArgumentRequest
  */
-class ReadThreadNetworkDiagnosticsSecurityPolicy : public ReadAttribute {
+class TestClusterTestNestedStructListArgumentRequest : public ClusterCommand {
 public:
-    ReadThreadNetworkDiagnosticsSecurityPolicy()
-        : ReadAttribute("security-policy")
+    TestClusterTestNestedStructListArgumentRequest()
+        : ClusterCommand("test-nested-struct-list-argument-request")
+        , mComplex_Arg1(&mRequest.arg1)
     {
+        AddArgument("Arg1", &mComplex_Arg1);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadThreadNetworkDiagnosticsSecurityPolicy() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000003B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeSecurityPolicyWithCompletionHandler:^(
-            CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.SecurityPolicy response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics SecurityPolicy read Error", error);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPTestClusterClusterTestNestedStructListArgumentRequestParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.arg1 = [CHIPTestClusterClusterNestedStructList new];
+        params.arg1.a = [NSNumber numberWithUnsignedChar:mRequest.arg1.a];
+        params.arg1.b = [NSNumber numberWithBool:mRequest.arg1.b];
+        params.arg1.c = [CHIPTestClusterClusterSimpleStruct new];
+        params.arg1.c.a = [NSNumber numberWithUnsignedChar:mRequest.arg1.c.a];
+        params.arg1.c.b = [NSNumber numberWithBool:mRequest.arg1.c.b];
+        params.arg1.c.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.arg1.c.c)];
+        params.arg1.c.d = [NSData dataWithBytes:mRequest.arg1.c.d.data() length:mRequest.arg1.c.d.size()];
+        params.arg1.c.e = [[NSString alloc] initWithBytes:mRequest.arg1.c.e.data()
+                                                   length:mRequest.arg1.c.e.size()
+                                                 encoding:NSUTF8StringEncoding];
+        params.arg1.c.f = [NSNumber numberWithUnsignedChar:mRequest.arg1.c.f.Raw()];
+        params.arg1.c.g = [NSNumber numberWithFloat:mRequest.arg1.c.g];
+        params.arg1.c.h = [NSNumber numberWithDouble:mRequest.arg1.c.h];
+        { // Scope for our temporary variables
+            auto * array_1 = [NSMutableArray new];
+            for (auto & entry_1 : mRequest.arg1.d) {
+                CHIPTestClusterClusterSimpleStruct * newElement_1;
+                newElement_1 = [CHIPTestClusterClusterSimpleStruct new];
+                newElement_1.a = [NSNumber numberWithUnsignedChar:entry_1.a];
+                newElement_1.b = [NSNumber numberWithBool:entry_1.b];
+                newElement_1.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_1.c)];
+                newElement_1.d = [NSData dataWithBytes:entry_1.d.data() length:entry_1.d.size()];
+                newElement_1.e = [[NSString alloc] initWithBytes:entry_1.e.data()
+                                                          length:entry_1.e.size()
+                                                        encoding:NSUTF8StringEncoding];
+                newElement_1.f = [NSNumber numberWithUnsignedChar:entry_1.f.Raw()];
+                newElement_1.g = [NSNumber numberWithFloat:entry_1.g];
+                newElement_1.h = [NSNumber numberWithDouble:entry_1.h];
+                [array_1 addObject:newElement_1];
             }
-            SetCommandExitStatus(error);
-        }];
+            params.arg1.d = array_1;
+        }
+        { // Scope for our temporary variables
+            auto * array_1 = [NSMutableArray new];
+            for (auto & entry_1 : mRequest.arg1.e) {
+                NSNumber * newElement_1;
+                newElement_1 = [NSNumber numberWithUnsignedInt:entry_1];
+                [array_1 addObject:newElement_1];
+            }
+            params.arg1.e = array_1;
+        }
+        { // Scope for our temporary variables
+            auto * array_1 = [NSMutableArray new];
+            for (auto & entry_1 : mRequest.arg1.f) {
+                NSData * newElement_1;
+                newElement_1 = [NSData dataWithBytes:entry_1.data() length:entry_1.size()];
+                [array_1 addObject:newElement_1];
+            }
+            params.arg1.f = array_1;
+        }
+        { // Scope for our temporary variables
+            auto * array_1 = [NSMutableArray new];
+            for (auto & entry_1 : mRequest.arg1.g) {
+                NSNumber * newElement_1;
+                newElement_1 = [NSNumber numberWithUnsignedChar:entry_1];
+                [array_1 addObject:newElement_1];
+            }
+            params.arg1.g = array_1;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster testNestedStructListArgumentRequestWithParams:params
+                                                 completionHandler:^(CHIPTestClusterClusterBooleanResponseParams * _Nullable values,
+                                                     NSError * _Nullable error) {
+                                                     NSLog(@"Values: %@", values);
+                                                     responsesNeeded--;
+                                                     if (error != nil) {
+                                                         mError = error;
+                                                         LogNSError("Error", error);
+                                                     }
+                                                     if (responsesNeeded == 0) {
+                                                         SetCommandExitStatus(mError);
+                                                     }
+                                                 }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::TestCluster::Commands::TestNestedStructListArgumentRequest::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::TestCluster::Structs::NestedStructList::Type> mComplex_Arg1;
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsSecurityPolicy : public SubscribeAttribute {
+/*
+ * Command TestListNestedStructListArgumentRequest
+ */
+class TestClusterTestListNestedStructListArgumentRequest : public ClusterCommand {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsSecurityPolicy()
-        : SubscribeAttribute("security-policy")
+    TestClusterTestListNestedStructListArgumentRequest()
+        : ClusterCommand("test-list-nested-struct-list-argument-request")
+        , mComplex_Arg1(&mRequest.arg1)
     {
+        AddArgument("Arg1", &mComplex_Arg1);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsSecurityPolicy() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000003B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000C) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSecurityPolicyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(CHIPThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.SecurityPolicy response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPTestClusterClusterTestListNestedStructListArgumentRequestParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mRequest.arg1) {
+                CHIPTestClusterClusterNestedStructList * newElement_0;
+                newElement_0 = [CHIPTestClusterClusterNestedStructList new];
+                newElement_0.a = [NSNumber numberWithUnsignedChar:entry_0.a];
+                newElement_0.b = [NSNumber numberWithBool:entry_0.b];
+                newElement_0.c = [CHIPTestClusterClusterSimpleStruct new];
+                newElement_0.c.a = [NSNumber numberWithUnsignedChar:entry_0.c.a];
+                newElement_0.c.b = [NSNumber numberWithBool:entry_0.c.b];
+                newElement_0.c.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.c.c)];
+                newElement_0.c.d = [NSData dataWithBytes:entry_0.c.d.data() length:entry_0.c.d.size()];
+                newElement_0.c.e = [[NSString alloc] initWithBytes:entry_0.c.e.data()
+                                                            length:entry_0.c.e.size()
+                                                          encoding:NSUTF8StringEncoding];
+                newElement_0.c.f = [NSNumber numberWithUnsignedChar:entry_0.c.f.Raw()];
+                newElement_0.c.g = [NSNumber numberWithFloat:entry_0.c.g];
+                newElement_0.c.h = [NSNumber numberWithDouble:entry_0.c.h];
+                { // Scope for our temporary variables
+                    auto * array_2 = [NSMutableArray new];
+                    for (auto & entry_2 : entry_0.d) {
+                        CHIPTestClusterClusterSimpleStruct * newElement_2;
+                        newElement_2 = [CHIPTestClusterClusterSimpleStruct new];
+                        newElement_2.a = [NSNumber numberWithUnsignedChar:entry_2.a];
+                        newElement_2.b = [NSNumber numberWithBool:entry_2.b];
+                        newElement_2.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_2.c)];
+                        newElement_2.d = [NSData dataWithBytes:entry_2.d.data() length:entry_2.d.size()];
+                        newElement_2.e = [[NSString alloc] initWithBytes:entry_2.e.data()
+                                                                  length:entry_2.e.size()
+                                                                encoding:NSUTF8StringEncoding];
+                        newElement_2.f = [NSNumber numberWithUnsignedChar:entry_2.f.Raw()];
+                        newElement_2.g = [NSNumber numberWithFloat:entry_2.g];
+                        newElement_2.h = [NSNumber numberWithDouble:entry_2.h];
+                        [array_2 addObject:newElement_2];
+                    }
+                    newElement_0.d = array_2;
                 }
-            }];
-
+                { // Scope for our temporary variables
+                    auto * array_2 = [NSMutableArray new];
+                    for (auto & entry_2 : entry_0.e) {
+                        NSNumber * newElement_2;
+                        newElement_2 = [NSNumber numberWithUnsignedInt:entry_2];
+                        [array_2 addObject:newElement_2];
+                    }
+                    newElement_0.e = array_2;
+                }
+                { // Scope for our temporary variables
+                    auto * array_2 = [NSMutableArray new];
+                    for (auto & entry_2 : entry_0.f) {
+                        NSData * newElement_2;
+                        newElement_2 = [NSData dataWithBytes:entry_2.data() length:entry_2.size()];
+                        [array_2 addObject:newElement_2];
+                    }
+                    newElement_0.f = array_2;
+                }
+                { // Scope for our temporary variables
+                    auto * array_2 = [NSMutableArray new];
+                    for (auto & entry_2 : entry_0.g) {
+                        NSNumber * newElement_2;
+                        newElement_2 = [NSNumber numberWithUnsignedChar:entry_2];
+                        [array_2 addObject:newElement_2];
+                    }
+                    newElement_0.g = array_2;
+                }
+                [array_0 addObject:newElement_0];
+            }
+            params.arg1 = array_0;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster
+                testListNestedStructListArgumentRequestWithParams:params
+                                                completionHandler:^(CHIPTestClusterClusterBooleanResponseParams * _Nullable values,
+                                                    NSError * _Nullable error) {
+                                                    NSLog(@"Values: %@", values);
+                                                    responsesNeeded--;
+                                                    if (error != nil) {
+                                                        mError = error;
+                                                        LogNSError("Error", error);
+                                                    }
+                                                    if (responsesNeeded == 0) {
+                                                        SetCommandExitStatus(mError);
+                                                    }
+                                                }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::TestCluster::Commands::TestListNestedStructListArgumentRequest::Type mRequest;
+    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::NestedStructList::Type>>
+        mComplex_Arg1;
 };
 
 /*
- * Attribute ChannelMask
+ * Command TestListInt8UReverseRequest
  */
-class ReadThreadNetworkDiagnosticsChannelMask : public ReadAttribute {
+class TestClusterTestListInt8UReverseRequest : public ClusterCommand {
 public:
-    ReadThreadNetworkDiagnosticsChannelMask()
-        : ReadAttribute("channel-mask")
+    TestClusterTestListInt8UReverseRequest()
+        : ClusterCommand("test-list-int8ureverse-request")
+        , mComplex_Arg1(&mRequest.arg1)
     {
+        AddArgument("Arg1", &mComplex_Arg1);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadThreadNetworkDiagnosticsChannelMask() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000003C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000D) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeChannelMaskWithCompletionHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.ChannelMask response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics ChannelMask read Error", error);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPTestClusterClusterTestListInt8UReverseRequestParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mRequest.arg1) {
+                NSNumber * newElement_0;
+                newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
+                [array_0 addObject:newElement_0];
             }
-            SetCommandExitStatus(error);
-        }];
+            params.arg1 = array_0;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster
+                testListInt8UReverseRequestWithParams:params
+                                    completionHandler:^(CHIPTestClusterClusterTestListInt8UReverseResponseParams * _Nullable values,
+                                        NSError * _Nullable error) {
+                                        NSLog(@"Values: %@", values);
+                                        responsesNeeded--;
+                                        if (error != nil) {
+                                            mError = error;
+                                            LogNSError("Error", error);
+                                        }
+                                        if (responsesNeeded == 0) {
+                                            SetCommandExitStatus(mError);
+                                        }
+                                    }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::TestCluster::Commands::TestListInt8UReverseRequest::Type mRequest;
+    TypedComplexArgument<chip::app::DataModel::List<const uint8_t>> mComplex_Arg1;
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsChannelMask : public SubscribeAttribute {
+/*
+ * Command TestEnumsRequest
+ */
+class TestClusterTestEnumsRequest : public ClusterCommand {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsChannelMask()
-        : SubscribeAttribute("channel-mask")
+    TestClusterTestEnumsRequest()
+        : ClusterCommand("test-enums-request")
     {
+        AddArgument("Arg1", 0, UINT16_MAX, &mRequest.arg1);
+        AddArgument("Arg2", 0, UINT8_MAX, &mRequest.arg2);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsChannelMask() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000003C) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeChannelMaskWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.ChannelMask response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000E) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPTestClusterClusterTestEnumsRequestParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.arg1 = [NSNumber numberWithUnsignedShort:chip::to_underlying(mRequest.arg1)];
+        params.arg2 = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.arg2)];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster testEnumsRequestWithParams:params
+                              completionHandler:^(
+                                  CHIPTestClusterClusterTestEnumsResponseParams * _Nullable values, NSError * _Nullable error) {
+                                  NSLog(@"Values: %@", values);
+                                  responsesNeeded--;
+                                  if (error != nil) {
+                                      mError = error;
+                                      LogNSError("Error", error);
+                                  }
+                                  if (responsesNeeded == 0) {
+                                      SetCommandExitStatus(mError);
+                                  }
+                              }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::TestCluster::Commands::TestEnumsRequest::Type mRequest;
 };
 
 /*
- * Attribute OperationalDatasetComponents
+ * Command TestNullableOptionalRequest
  */
-class ReadThreadNetworkDiagnosticsOperationalDatasetComponents : public ReadAttribute {
+class TestClusterTestNullableOptionalRequest : public ClusterCommand {
 public:
-    ReadThreadNetworkDiagnosticsOperationalDatasetComponents()
-        : ReadAttribute("operational-dataset-components")
+    TestClusterTestNullableOptionalRequest()
+        : ClusterCommand("test-nullable-optional-request")
     {
+        AddArgument("Arg1", 0, UINT8_MAX, &mRequest.arg1);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadThreadNetworkDiagnosticsOperationalDatasetComponents() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000003D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x0000000F) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeOperationalDatasetComponentsWithCompletionHandler:^(
-            CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.OperationalDatasetComponents response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics OperationalDatasetComponents read Error", error);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPTestClusterClusterTestNullableOptionalRequestParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        if (mRequest.arg1.HasValue()) {
+            if (mRequest.arg1.Value().IsNull()) {
+                params.arg1 = nil;
+            } else {
+                params.arg1 = [NSNumber numberWithUnsignedChar:mRequest.arg1.Value().Value()];
             }
-            SetCommandExitStatus(error);
-        }];
+        } else {
+            params.arg1 = nil;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster
+                testNullableOptionalRequestWithParams:params
+                                    completionHandler:^(CHIPTestClusterClusterTestNullableOptionalResponseParams * _Nullable values,
+                                        NSError * _Nullable error) {
+                                        NSLog(@"Values: %@", values);
+                                        responsesNeeded--;
+                                        if (error != nil) {
+                                            mError = error;
+                                            LogNSError("Error", error);
+                                        }
+                                        if (responsesNeeded == 0) {
+                                            SetCommandExitStatus(mError);
+                                        }
+                                    }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::TestCluster::Commands::TestNullableOptionalRequest::Type mRequest;
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsOperationalDatasetComponents : public SubscribeAttribute {
+/*
+ * Command TestComplexNullableOptionalRequest
+ */
+class TestClusterTestComplexNullableOptionalRequest : public ClusterCommand {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsOperationalDatasetComponents()
-        : SubscribeAttribute("operational-dataset-components")
+    TestClusterTestComplexNullableOptionalRequest()
+        : ClusterCommand("test-complex-nullable-optional-request")
+        , mComplex_NullableStruct(&mRequest.nullableStruct)
+        , mComplex_OptionalStruct(&mRequest.optionalStruct)
+        , mComplex_NullableOptionalStruct(&mRequest.nullableOptionalStruct)
+        , mComplex_NullableList(&mRequest.nullableList)
+        , mComplex_OptionalList(&mRequest.optionalList)
+        , mComplex_NullableOptionalList(&mRequest.nullableOptionalList)
     {
+        AddArgument("NullableInt", 0, UINT16_MAX, &mRequest.nullableInt);
+        AddArgument("OptionalInt", 0, UINT16_MAX, &mRequest.optionalInt);
+        AddArgument("NullableOptionalInt", 0, UINT16_MAX, &mRequest.nullableOptionalInt);
+        AddArgument("NullableString", &mRequest.nullableString);
+        AddArgument("OptionalString", &mRequest.optionalString);
+        AddArgument("NullableOptionalString", &mRequest.nullableOptionalString);
+        AddArgument("NullableStruct", &mComplex_NullableStruct);
+        AddArgument("OptionalStruct", &mComplex_OptionalStruct);
+        AddArgument("NullableOptionalStruct", &mComplex_NullableOptionalStruct);
+        AddArgument("NullableList", &mComplex_NullableList);
+        AddArgument("OptionalList", &mComplex_OptionalList);
+        AddArgument("NullableOptionalList", &mComplex_NullableOptionalList);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsOperationalDatasetComponents() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000003D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000010) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOperationalDatasetComponentsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPTestClusterClusterTestComplexNullableOptionalRequestParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        if (mRequest.nullableInt.IsNull()) {
+            params.nullableInt = nil;
+        } else {
+            params.nullableInt = [NSNumber numberWithUnsignedShort:mRequest.nullableInt.Value()];
+        }
+        if (mRequest.optionalInt.HasValue()) {
+            params.optionalInt = [NSNumber numberWithUnsignedShort:mRequest.optionalInt.Value()];
+        } else {
+            params.optionalInt = nil;
+        }
+        if (mRequest.nullableOptionalInt.HasValue()) {
+            if (mRequest.nullableOptionalInt.Value().IsNull()) {
+                params.nullableOptionalInt = nil;
+            } else {
+                params.nullableOptionalInt = [NSNumber numberWithUnsignedShort:mRequest.nullableOptionalInt.Value().Value()];
             }
-            reportHandler:^(
-                CHIPThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.OperationalDatasetComponents response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
+        } else {
+            params.nullableOptionalInt = nil;
+        }
+        if (mRequest.nullableString.IsNull()) {
+            params.nullableString = nil;
+        } else {
+            params.nullableString = [[NSString alloc] initWithBytes:mRequest.nullableString.Value().data()
+                                                             length:mRequest.nullableString.Value().size()
+                                                           encoding:NSUTF8StringEncoding];
+        }
+        if (mRequest.optionalString.HasValue()) {
+            params.optionalString = [[NSString alloc] initWithBytes:mRequest.optionalString.Value().data()
+                                                             length:mRequest.optionalString.Value().size()
+                                                           encoding:NSUTF8StringEncoding];
+        } else {
+            params.optionalString = nil;
+        }
+        if (mRequest.nullableOptionalString.HasValue()) {
+            if (mRequest.nullableOptionalString.Value().IsNull()) {
+                params.nullableOptionalString = nil;
+            } else {
+                params.nullableOptionalString =
+                    [[NSString alloc] initWithBytes:mRequest.nullableOptionalString.Value().Value().data()
+                                             length:mRequest.nullableOptionalString.Value().Value().size()
+                                           encoding:NSUTF8StringEncoding];
+            }
+        } else {
+            params.nullableOptionalString = nil;
+        }
+        if (mRequest.nullableStruct.IsNull()) {
+            params.nullableStruct = nil;
+        } else {
+            params.nullableStruct = [CHIPTestClusterClusterSimpleStruct new];
+            params.nullableStruct.a = [NSNumber numberWithUnsignedChar:mRequest.nullableStruct.Value().a];
+            params.nullableStruct.b = [NSNumber numberWithBool:mRequest.nullableStruct.Value().b];
+            params.nullableStruct.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.nullableStruct.Value().c)];
+            params.nullableStruct.d = [NSData dataWithBytes:mRequest.nullableStruct.Value().d.data()
+                                                     length:mRequest.nullableStruct.Value().d.size()];
+            params.nullableStruct.e = [[NSString alloc] initWithBytes:mRequest.nullableStruct.Value().e.data()
+                                                               length:mRequest.nullableStruct.Value().e.size()
+                                                             encoding:NSUTF8StringEncoding];
+            params.nullableStruct.f = [NSNumber numberWithUnsignedChar:mRequest.nullableStruct.Value().f.Raw()];
+            params.nullableStruct.g = [NSNumber numberWithFloat:mRequest.nullableStruct.Value().g];
+            params.nullableStruct.h = [NSNumber numberWithDouble:mRequest.nullableStruct.Value().h];
+        }
+        if (mRequest.optionalStruct.HasValue()) {
+            params.optionalStruct = [CHIPTestClusterClusterSimpleStruct new];
+            params.optionalStruct.a = [NSNumber numberWithUnsignedChar:mRequest.optionalStruct.Value().a];
+            params.optionalStruct.b = [NSNumber numberWithBool:mRequest.optionalStruct.Value().b];
+            params.optionalStruct.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.optionalStruct.Value().c)];
+            params.optionalStruct.d = [NSData dataWithBytes:mRequest.optionalStruct.Value().d.data()
+                                                     length:mRequest.optionalStruct.Value().d.size()];
+            params.optionalStruct.e = [[NSString alloc] initWithBytes:mRequest.optionalStruct.Value().e.data()
+                                                               length:mRequest.optionalStruct.Value().e.size()
+                                                             encoding:NSUTF8StringEncoding];
+            params.optionalStruct.f = [NSNumber numberWithUnsignedChar:mRequest.optionalStruct.Value().f.Raw()];
+            params.optionalStruct.g = [NSNumber numberWithFloat:mRequest.optionalStruct.Value().g];
+            params.optionalStruct.h = [NSNumber numberWithDouble:mRequest.optionalStruct.Value().h];
+        } else {
+            params.optionalStruct = nil;
+        }
+        if (mRequest.nullableOptionalStruct.HasValue()) {
+            if (mRequest.nullableOptionalStruct.Value().IsNull()) {
+                params.nullableOptionalStruct = nil;
+            } else {
+                params.nullableOptionalStruct = [CHIPTestClusterClusterSimpleStruct new];
+                params.nullableOptionalStruct.a =
+                    [NSNumber numberWithUnsignedChar:mRequest.nullableOptionalStruct.Value().Value().a];
+                params.nullableOptionalStruct.b = [NSNumber numberWithBool:mRequest.nullableOptionalStruct.Value().Value().b];
+                params.nullableOptionalStruct.c =
+                    [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.nullableOptionalStruct.Value().Value().c)];
+                params.nullableOptionalStruct.d = [NSData dataWithBytes:mRequest.nullableOptionalStruct.Value().Value().d.data()
+                                                                 length:mRequest.nullableOptionalStruct.Value().Value().d.size()];
+                params.nullableOptionalStruct.e =
+                    [[NSString alloc] initWithBytes:mRequest.nullableOptionalStruct.Value().Value().e.data()
+                                             length:mRequest.nullableOptionalStruct.Value().Value().e.size()
+                                           encoding:NSUTF8StringEncoding];
+                params.nullableOptionalStruct.f =
+                    [NSNumber numberWithUnsignedChar:mRequest.nullableOptionalStruct.Value().Value().f.Raw()];
+                params.nullableOptionalStruct.g = [NSNumber numberWithFloat:mRequest.nullableOptionalStruct.Value().Value().g];
+                params.nullableOptionalStruct.h = [NSNumber numberWithDouble:mRequest.nullableOptionalStruct.Value().Value().h];
+            }
+        } else {
+            params.nullableOptionalStruct = nil;
+        }
+        if (mRequest.nullableList.IsNull()) {
+            params.nullableList = nil;
+        } else {
+            { // Scope for our temporary variables
+                auto * array_1 = [NSMutableArray new];
+                for (auto & entry_1 : mRequest.nullableList.Value()) {
+                    NSNumber * newElement_1;
+                    newElement_1 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_1)];
+                    [array_1 addObject:newElement_1];
                 }
-            }];
-
+                params.nullableList = array_1;
+            }
+        }
+        if (mRequest.optionalList.HasValue()) {
+            { // Scope for our temporary variables
+                auto * array_1 = [NSMutableArray new];
+                for (auto & entry_1 : mRequest.optionalList.Value()) {
+                    NSNumber * newElement_1;
+                    newElement_1 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_1)];
+                    [array_1 addObject:newElement_1];
+                }
+                params.optionalList = array_1;
+            }
+        } else {
+            params.optionalList = nil;
+        }
+        if (mRequest.nullableOptionalList.HasValue()) {
+            if (mRequest.nullableOptionalList.Value().IsNull()) {
+                params.nullableOptionalList = nil;
+            } else {
+                { // Scope for our temporary variables
+                    auto * array_2 = [NSMutableArray new];
+                    for (auto & entry_2 : mRequest.nullableOptionalList.Value().Value()) {
+                        NSNumber * newElement_2;
+                        newElement_2 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_2)];
+                        [array_2 addObject:newElement_2];
+                    }
+                    params.nullableOptionalList = array_2;
+                }
+            }
+        } else {
+            params.nullableOptionalList = nil;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster
+                testComplexNullableOptionalRequestWithParams:params
+                                           completionHandler:^(
+                                               CHIPTestClusterClusterTestComplexNullableOptionalResponseParams * _Nullable values,
+                                               NSError * _Nullable error) {
+                                               NSLog(@"Values: %@", values);
+                                               responsesNeeded--;
+                                               if (error != nil) {
+                                                   mError = error;
+                                                   LogNSError("Error", error);
+                                               }
+                                               if (responsesNeeded == 0) {
+                                                   SetCommandExitStatus(mError);
+                                               }
+                                           }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::TestCluster::Commands::TestComplexNullableOptionalRequest::Type mRequest;
+    TypedComplexArgument<chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type>>
+        mComplex_NullableStruct;
+    TypedComplexArgument<chip::Optional<chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type>> mComplex_OptionalStruct;
+    TypedComplexArgument<
+        chip::Optional<chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type>>>
+        mComplex_NullableOptionalStruct;
+    TypedComplexArgument<
+        chip::app::DataModel::Nullable<chip::app::DataModel::List<const chip::app::Clusters::TestCluster::SimpleEnum>>>
+        mComplex_NullableList;
+    TypedComplexArgument<chip::Optional<chip::app::DataModel::List<const chip::app::Clusters::TestCluster::SimpleEnum>>>
+        mComplex_OptionalList;
+    TypedComplexArgument<chip::Optional<
+        chip::app::DataModel::Nullable<chip::app::DataModel::List<const chip::app::Clusters::TestCluster::SimpleEnum>>>>
+        mComplex_NullableOptionalList;
 };
 
 /*
- * Attribute ActiveNetworkFaultsList
+ * Command SimpleStructEchoRequest
  */
-class ReadThreadNetworkDiagnosticsActiveNetworkFaultsList : public ReadAttribute {
+class TestClusterSimpleStructEchoRequest : public ClusterCommand {
 public:
-    ReadThreadNetworkDiagnosticsActiveNetworkFaultsList()
-        : ReadAttribute("active-network-faults-list")
+    TestClusterSimpleStructEchoRequest()
+        : ClusterCommand("simple-struct-echo-request")
+        , mComplex_Arg1(&mRequest.arg1)
     {
+        AddArgument("Arg1", &mComplex_Arg1);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadThreadNetworkDiagnosticsActiveNetworkFaultsList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000003E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000011) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeActiveNetworkFaultsListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.ActiveNetworkFaultsList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics ActiveNetworkFaultsList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPTestClusterClusterSimpleStructEchoRequestParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.arg1 = [CHIPTestClusterClusterSimpleStruct new];
+        params.arg1.a = [NSNumber numberWithUnsignedChar:mRequest.arg1.a];
+        params.arg1.b = [NSNumber numberWithBool:mRequest.arg1.b];
+        params.arg1.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.arg1.c)];
+        params.arg1.d = [NSData dataWithBytes:mRequest.arg1.d.data() length:mRequest.arg1.d.size()];
+        params.arg1.e = [[NSString alloc] initWithBytes:mRequest.arg1.e.data()
+                                                 length:mRequest.arg1.e.size()
+                                               encoding:NSUTF8StringEncoding];
+        params.arg1.f = [NSNumber numberWithUnsignedChar:mRequest.arg1.f.Raw()];
+        params.arg1.g = [NSNumber numberWithFloat:mRequest.arg1.g];
+        params.arg1.h = [NSNumber numberWithDouble:mRequest.arg1.h];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster simpleStructEchoRequestWithParams:params
+                                     completionHandler:^(CHIPTestClusterClusterSimpleStructResponseParams * _Nullable values,
+                                         NSError * _Nullable error) {
+                                         NSLog(@"Values: %@", values);
+                                         responsesNeeded--;
+                                         if (error != nil) {
+                                             mError = error;
+                                             LogNSError("Error", error);
+                                         }
+                                         if (responsesNeeded == 0) {
+                                             SetCommandExitStatus(mError);
+                                         }
+                                     }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::TestCluster::Commands::SimpleStructEchoRequest::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type> mComplex_Arg1;
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsActiveNetworkFaultsList : public SubscribeAttribute {
+/*
+ * Command TimedInvokeRequest
+ */
+class TestClusterTimedInvokeRequest : public ClusterCommand {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsActiveNetworkFaultsList()
-        : SubscribeAttribute("active-network-faults-list")
+    TestClusterTimedInvokeRequest()
+        : ClusterCommand("timed-invoke-request")
     {
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsActiveNetworkFaultsList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000003E) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeActiveNetworkFaultsListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.ActiveNetworkFaultsList response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000012) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPTestClusterClusterTimedInvokeRequestParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster timedInvokeRequestWithParams:params
+                                completionHandler:^(NSError * _Nullable error) {
+                                    responsesNeeded--;
+                                    if (error != nil) {
+                                        mError = error;
+                                        LogNSError("Error", error);
+                                    }
+                                    if (responsesNeeded == 0) {
+                                        SetCommandExitStatus(mError);
+                                    }
+                                }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Command TestSimpleOptionalArgumentRequest
  */
-class ReadThreadNetworkDiagnosticsGeneratedCommandList : public ReadAttribute {
+class TestClusterTestSimpleOptionalArgumentRequest : public ClusterCommand {
 public:
-    ReadThreadNetworkDiagnosticsGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    TestClusterTestSimpleOptionalArgumentRequest()
+        : ClusterCommand("test-simple-optional-argument-request")
     {
+        AddArgument("Arg1", 0, 1, &mRequest.arg1);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadThreadNetworkDiagnosticsGeneratedCommandList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000013) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.GeneratedCommandList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics GeneratedCommandList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPTestClusterClusterTestSimpleOptionalArgumentRequestParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        if (mRequest.arg1.HasValue()) {
+            params.arg1 = [NSNumber numberWithBool:mRequest.arg1.Value()];
+        } else {
+            params.arg1 = nil;
+        }
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster testSimpleOptionalArgumentRequestWithParams:params
+                                               completionHandler:^(NSError * _Nullable error) {
+                                                   responsesNeeded--;
+                                                   if (error != nil) {
+                                                       mError = error;
+                                                       LogNSError("Error", error);
+                                                   }
+                                                   if (responsesNeeded == 0) {
+                                                       SetCommandExitStatus(mError);
+                                                   }
+                                               }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::TestCluster::Commands::TestSimpleOptionalArgumentRequest::Type mRequest;
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsGeneratedCommandList : public SubscribeAttribute {
+/*
+ * Command TestEmitTestEventRequest
+ */
+class TestClusterTestEmitTestEventRequest : public ClusterCommand {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    TestClusterTestEmitTestEventRequest()
+        : ClusterCommand("test-emit-test-event-request")
     {
+        AddArgument("Arg1", 0, UINT8_MAX, &mRequest.arg1);
+        AddArgument("Arg2", 0, UINT8_MAX, &mRequest.arg2);
+        AddArgument("Arg3", 0, 1, &mRequest.arg3);
+        ClusterCommand::AddArguments();
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsGeneratedCommandList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.GeneratedCommandList response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000014) on endpoint %u", endpointId);
 
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPTestClusterClusterTestEmitTestEventRequestParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.arg1 = [NSNumber numberWithUnsignedChar:mRequest.arg1];
+        params.arg2 = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.arg2)];
+        params.arg3 = [NSNumber numberWithBool:mRequest.arg3];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster testEmitTestEventRequestWithParams:params
+                                      completionHandler:^(CHIPTestClusterClusterTestEmitTestEventResponseParams * _Nullable values,
+                                          NSError * _Nullable error) {
+                                          NSLog(@"Values: %@", values);
+                                          responsesNeeded--;
+                                          if (error != nil) {
+                                              mError = error;
+                                              LogNSError("Error", error);
+                                          }
+                                          if (responsesNeeded == 0) {
+                                              SetCommandExitStatus(mError);
+                                          }
+                                      }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::TestCluster::Commands::TestEmitTestEventRequest::Type mRequest;
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Command TestEmitTestFabricScopedEventRequest
  */
-class ReadThreadNetworkDiagnosticsAcceptedCommandList : public ReadAttribute {
+class TestClusterTestEmitTestFabricScopedEventRequest : public ClusterCommand {
 public:
-    ReadThreadNetworkDiagnosticsAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    TestClusterTestEmitTestFabricScopedEventRequest()
+        : ClusterCommand("test-emit-test-fabric-scoped-event-request")
     {
+        AddArgument("Arg1", 0, UINT8_MAX, &mRequest.arg1);
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadThreadNetworkDiagnosticsAcceptedCommandList() {}
-
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) command (0x00000015) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.AcceptedCommandList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics AcceptedCommandList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        __auto_type * params = [[CHIPTestClusterClusterTestEmitTestFabricScopedEventRequestParams alloc] init];
+        params.timedInvokeTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.arg1 = [NSNumber numberWithUnsignedChar:mRequest.arg1];
+        uint16_t repeatCount = mRepeatCount.ValueOr(1);
+        uint16_t __block responsesNeeded = repeatCount;
+        while (repeatCount--) {
+            [cluster
+                testEmitTestFabricScopedEventRequestWithParams:params
+                                             completionHandler:^(
+                                                 CHIPTestClusterClusterTestEmitTestFabricScopedEventResponseParams * _Nullable values,
+                                                 NSError * _Nullable error) {
+                                                 NSLog(@"Values: %@", values);
+                                                 responsesNeeded--;
+                                                 if (error != nil) {
+                                                     mError = error;
+                                                     LogNSError("Error", error);
+                                                 }
+                                                 if (responsesNeeded == 0) {
+                                                     SetCommandExitStatus(mError);
+                                                 }
+                                             }];
+        }
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::Clusters::TestCluster::Commands::TestEmitTestFabricScopedEventRequest::Type mRequest;
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsAcceptedCommandList : public SubscribeAttribute {
+/*
+ * Attribute Boolean
+ */
+class ReadTestClusterBoolean : public ReadAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    ReadTestClusterBoolean()
+        : ReadAttribute("boolean")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsAcceptedCommandList() {}
+    ~ReadTestClusterBoolean() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBooleanWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.Boolean response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TestCluster Boolean read Error", error);
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.AcceptedCommandList response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
-
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-/*
- * Attribute AttributeList
- */
-class ReadThreadNetworkDiagnosticsAttributeList : public ReadAttribute {
+class WriteTestClusterBoolean : public WriteAttribute {
 public:
-    ReadThreadNetworkDiagnosticsAttributeList()
-        : ReadAttribute("attribute-list")
+    WriteTestClusterBoolean()
+        : WriteAttribute("boolean")
     {
+        AddArgument("attr-name", "boolean");
+        AddArgument("attr-value", 0, 1, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~ReadThreadNetworkDiagnosticsAttributeList() {}
+    ~WriteTestClusterBoolean() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.AttributeList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics AttributeList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
+
+        [cluster writeAttributeBooleanWithValue:value
+                                         params:params
+                              completionHandler:^(NSError * _Nullable error) {
+                                  if (error != nil) {
+                                      LogNSError("TestCluster Boolean write Error", error);
+                                  }
+                                  SetCommandExitStatus(error);
+                              }];
         return CHIP_NO_ERROR;
     }
+
+private:
+    bool mValue;
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsAttributeList : public SubscribeAttribute {
+class SubscribeAttributeTestClusterBoolean : public SubscribeAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeTestClusterBoolean()
+        : SubscribeAttribute("boolean")
     {
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsAttributeList() {}
+    ~SubscribeAttributeTestClusterBoolean() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBooleanWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Boolean response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -85689,29 +82403,27 @@ class SubscribeAttributeThreadNetworkDiagnosticsAttributeList : public Subscribe
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute Bitmap8
  */
-class ReadThreadNetworkDiagnosticsFeatureMap : public ReadAttribute {
+class ReadTestClusterBitmap8 : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadTestClusterBitmap8()
+        : ReadAttribute("bitmap8")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsFeatureMap() {}
+    ~ReadTestClusterBitmap8() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.FeatureMap response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBitmap8WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.Bitmap8 response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics FeatureMap read Error", error);
+                LogNSError("TestCluster Bitmap8 read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -85719,34 +82431,70 @@ class ReadThreadNetworkDiagnosticsFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsFeatureMap : public SubscribeAttribute {
+class WriteTestClusterBitmap8 : public WriteAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsFeatureMap()
-        : SubscribeAttribute("feature-map")
+    WriteTestClusterBitmap8()
+        : WriteAttribute("bitmap8")
     {
+        AddArgument("attr-name", "bitmap8");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsFeatureMap() {}
+    ~WriteTestClusterBitmap8() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeBitmap8WithValue:value
+                                         params:params
+                              completionHandler:^(NSError * _Nullable error) {
+                                  if (error != nil) {
+                                      LogNSError("TestCluster Bitmap8 write Error", error);
+                                  }
+                                  SetCommandExitStatus(error);
+                              }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeTestClusterBitmap8 : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterBitmap8()
+        : SubscribeAttribute("bitmap8")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterBitmap8() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBitmap8WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.FeatureMap response %@", [value description]);
+                NSLog(@"TestCluster.Bitmap8 response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -85757,29 +82505,27 @@ class SubscribeAttributeThreadNetworkDiagnosticsFeatureMap : public SubscribeAtt
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute Bitmap16
  */
-class ReadThreadNetworkDiagnosticsClusterRevision : public ReadAttribute {
+class ReadTestClusterBitmap16 : public ReadAttribute {
 public:
-    ReadThreadNetworkDiagnosticsClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadTestClusterBitmap16()
+        : ReadAttribute("bitmap16")
     {
     }
 
-    ~ReadThreadNetworkDiagnosticsClusterRevision() {}
+    ~ReadTestClusterBitmap16() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ThreadNetworkDiagnostics.ClusterRevision response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBitmap16WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.Bitmap16 response %@", [value description]);
             if (error != nil) {
-                LogNSError("ThreadNetworkDiagnostics ClusterRevision read Error", error);
+                LogNSError("TestCluster Bitmap16 read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -85787,34 +82533,70 @@ class ReadThreadNetworkDiagnosticsClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeThreadNetworkDiagnosticsClusterRevision : public SubscribeAttribute {
+class WriteTestClusterBitmap16 : public WriteAttribute {
 public:
-    SubscribeAttributeThreadNetworkDiagnosticsClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    WriteTestClusterBitmap16()
+        : WriteAttribute("bitmap16")
     {
+        AddArgument("attr-name", "bitmap16");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeThreadNetworkDiagnosticsClusterRevision() {}
+    ~WriteTestClusterBitmap16() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000035) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPThreadNetworkDiagnostics * cluster = [[CHIPThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                             endpoint:endpointId
-                                                                                                queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster writeAttributeBitmap16WithValue:value
+                                          params:params
+                               completionHandler:^(NSError * _Nullable error) {
+                                   if (error != nil) {
+                                       LogNSError("TestCluster Bitmap16 write Error", error);
+                                   }
+                                   SetCommandExitStatus(error);
+                               }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeTestClusterBitmap16 : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterBitmap16()
+        : SubscribeAttribute("bitmap16")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterBitmap16() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBitmap16WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ThreadNetworkDiagnostics.ClusterRevision response %@", [value description]);
+                NSLog(@"TestCluster.Bitmap16 response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -85824,48 +82606,28 @@ class SubscribeAttributeThreadNetworkDiagnosticsClusterRevision : public Subscri
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster TimeFormatLocalization                                      | 0x002C |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * HourFormat                                                        | 0x0000 |
-| * ActiveCalendarType                                                | 0x0001 |
-| * SupportedCalendarTypes                                            | 0x0002 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Attribute HourFormat
+ * Attribute Bitmap32
  */
-class ReadTimeFormatLocalizationHourFormat : public ReadAttribute {
+class ReadTestClusterBitmap32 : public ReadAttribute {
 public:
-    ReadTimeFormatLocalizationHourFormat()
-        : ReadAttribute("hour-format")
+    ReadTestClusterBitmap32()
+        : ReadAttribute("bitmap32")
     {
     }
 
-    ~ReadTimeFormatLocalizationHourFormat() {}
+    ~ReadTestClusterBitmap32() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeHourFormatWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TimeFormatLocalization.HourFormat response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBitmap32WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.Bitmap32 response %@", [value description]);
             if (error != nil) {
-                LogNSError("TimeFormatLocalization HourFormat read Error", error);
+                LogNSError("TestCluster Bitmap32 read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -85873,74 +82635,70 @@ class ReadTimeFormatLocalizationHourFormat : public ReadAttribute {
     }
 };
 
-class WriteTimeFormatLocalizationHourFormat : public WriteAttribute {
+class WriteTestClusterBitmap32 : public WriteAttribute {
 public:
-    WriteTimeFormatLocalizationHourFormat()
-        : WriteAttribute("hour-format")
+    WriteTestClusterBitmap32()
+        : WriteAttribute("bitmap32")
     {
-        AddArgument("attr-name", "hour-format");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        AddArgument("attr-name", "bitmap32");
+        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteTimeFormatLocalizationHourFormat() {}
+    ~WriteTestClusterBitmap32() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) WriteAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue];
 
-        [cluster writeAttributeHourFormatWithValue:value
-                                            params:params
-                                 completionHandler:^(NSError * _Nullable error) {
-                                     if (error != nil) {
-                                         LogNSError("TimeFormatLocalization HourFormat write Error", error);
-                                     }
-                                     SetCommandExitStatus(error);
-                                 }];
+        [cluster writeAttributeBitmap32WithValue:value
+                                          params:params
+                               completionHandler:^(NSError * _Nullable error) {
+                                   if (error != nil) {
+                                       LogNSError("TestCluster Bitmap32 write Error", error);
+                                   }
+                                   SetCommandExitStatus(error);
+                               }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    uint8_t mValue;
+    uint32_t mValue;
 };
 
-class SubscribeAttributeTimeFormatLocalizationHourFormat : public SubscribeAttribute {
+class SubscribeAttributeTestClusterBitmap32 : public SubscribeAttribute {
 public:
-    SubscribeAttributeTimeFormatLocalizationHourFormat()
-        : SubscribeAttribute("hour-format")
+    SubscribeAttributeTestClusterBitmap32()
+        : SubscribeAttribute("bitmap32")
     {
     }
 
-    ~SubscribeAttributeTimeFormatLocalizationHourFormat() {}
+    ~SubscribeAttributeTestClusterBitmap32() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeHourFormatWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBitmap32WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TimeFormatLocalization.HourFormat response %@", [value description]);
+                NSLog(@"TestCluster.Bitmap32 response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -85951,29 +82709,27 @@ class SubscribeAttributeTimeFormatLocalizationHourFormat : public SubscribeAttri
 };
 
 /*
- * Attribute ActiveCalendarType
+ * Attribute Bitmap64
  */
-class ReadTimeFormatLocalizationActiveCalendarType : public ReadAttribute {
+class ReadTestClusterBitmap64 : public ReadAttribute {
 public:
-    ReadTimeFormatLocalizationActiveCalendarType()
-        : ReadAttribute("active-calendar-type")
+    ReadTestClusterBitmap64()
+        : ReadAttribute("bitmap64")
     {
     }
 
-    ~ReadTimeFormatLocalizationActiveCalendarType() {}
+    ~ReadTestClusterBitmap64() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeActiveCalendarTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TimeFormatLocalization.ActiveCalendarType response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeBitmap64WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.Bitmap64 response %@", [value description]);
             if (error != nil) {
-                LogNSError("TimeFormatLocalization ActiveCalendarType read Error", error);
+                LogNSError("TestCluster Bitmap64 read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -85981,74 +82737,70 @@ class ReadTimeFormatLocalizationActiveCalendarType : public ReadAttribute {
     }
 };
 
-class WriteTimeFormatLocalizationActiveCalendarType : public WriteAttribute {
+class WriteTestClusterBitmap64 : public WriteAttribute {
 public:
-    WriteTimeFormatLocalizationActiveCalendarType()
-        : WriteAttribute("active-calendar-type")
+    WriteTestClusterBitmap64()
+        : WriteAttribute("bitmap64")
     {
-        AddArgument("attr-name", "active-calendar-type");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        AddArgument("attr-name", "bitmap64");
+        AddArgument("attr-value", 0, UINT64_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteTimeFormatLocalizationActiveCalendarType() {}
+    ~WriteTestClusterBitmap64() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) WriteAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedLongLong:mValue];
 
-        [cluster writeAttributeActiveCalendarTypeWithValue:value
-                                                    params:params
-                                         completionHandler:^(NSError * _Nullable error) {
-                                             if (error != nil) {
-                                                 LogNSError("TimeFormatLocalization ActiveCalendarType write Error", error);
-                                             }
-                                             SetCommandExitStatus(error);
-                                         }];
+        [cluster writeAttributeBitmap64WithValue:value
+                                          params:params
+                               completionHandler:^(NSError * _Nullable error) {
+                                   if (error != nil) {
+                                       LogNSError("TestCluster Bitmap64 write Error", error);
+                                   }
+                                   SetCommandExitStatus(error);
+                               }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    uint8_t mValue;
+    uint64_t mValue;
 };
 
-class SubscribeAttributeTimeFormatLocalizationActiveCalendarType : public SubscribeAttribute {
+class SubscribeAttributeTestClusterBitmap64 : public SubscribeAttribute {
 public:
-    SubscribeAttributeTimeFormatLocalizationActiveCalendarType()
-        : SubscribeAttribute("active-calendar-type")
+    SubscribeAttributeTestClusterBitmap64()
+        : SubscribeAttribute("bitmap64")
     {
     }
 
-    ~SubscribeAttributeTimeFormatLocalizationActiveCalendarType() {}
+    ~SubscribeAttributeTestClusterBitmap64() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeActiveCalendarTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeBitmap64WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TimeFormatLocalization.ActiveCalendarType response %@", [value description]);
+                NSLog(@"TestCluster.Bitmap64 response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -86059,29 +82811,27 @@ class SubscribeAttributeTimeFormatLocalizationActiveCalendarType : public Subscr
 };
 
 /*
- * Attribute SupportedCalendarTypes
+ * Attribute Int8u
  */
-class ReadTimeFormatLocalizationSupportedCalendarTypes : public ReadAttribute {
+class ReadTestClusterInt8u : public ReadAttribute {
 public:
-    ReadTimeFormatLocalizationSupportedCalendarTypes()
-        : ReadAttribute("supported-calendar-types")
+    ReadTestClusterInt8u()
+        : ReadAttribute("int8u")
     {
     }
 
-    ~ReadTimeFormatLocalizationSupportedCalendarTypes() {}
+    ~ReadTestClusterInt8u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeSupportedCalendarTypesWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TimeFormatLocalization.SupportedCalendarTypes response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeInt8uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.Int8u response %@", [value description]);
             if (error != nil) {
-                LogNSError("TimeFormatLocalization SupportedCalendarTypes read Error", error);
+                LogNSError("TestCluster Int8u read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -86089,34 +82839,70 @@ class ReadTimeFormatLocalizationSupportedCalendarTypes : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTimeFormatLocalizationSupportedCalendarTypes : public SubscribeAttribute {
+class WriteTestClusterInt8u : public WriteAttribute {
 public:
-    SubscribeAttributeTimeFormatLocalizationSupportedCalendarTypes()
-        : SubscribeAttribute("supported-calendar-types")
+    WriteTestClusterInt8u()
+        : WriteAttribute("int8u")
     {
+        AddArgument("attr-name", "int8u");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeTimeFormatLocalizationSupportedCalendarTypes() {}
+    ~WriteTestClusterInt8u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeInt8uWithValue:value
+                                       params:params
+                            completionHandler:^(NSError * _Nullable error) {
+                                if (error != nil) {
+                                    LogNSError("TestCluster Int8u write Error", error);
+                                }
+                                SetCommandExitStatus(error);
+                            }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeTestClusterInt8u : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterInt8u()
+        : SubscribeAttribute("int8u")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterInt8u() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSupportedCalendarTypesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInt8uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TimeFormatLocalization.SupportedCalendarTypes response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Int8u response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -86127,29 +82913,27 @@ class SubscribeAttributeTimeFormatLocalizationSupportedCalendarTypes : public Su
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute Int16u
  */
-class ReadTimeFormatLocalizationGeneratedCommandList : public ReadAttribute {
+class ReadTestClusterInt16u : public ReadAttribute {
 public:
-    ReadTimeFormatLocalizationGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadTestClusterInt16u()
+        : ReadAttribute("int16u")
     {
     }
 
-    ~ReadTimeFormatLocalizationGeneratedCommandList() {}
+    ~ReadTestClusterInt16u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000006) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TimeFormatLocalization.GeneratedCommandList response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeInt16uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.Int16u response %@", [value description]);
             if (error != nil) {
-                LogNSError("TimeFormatLocalization GeneratedCommandList read Error", error);
+                LogNSError("TestCluster Int16u read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -86157,34 +82941,70 @@ class ReadTimeFormatLocalizationGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTimeFormatLocalizationGeneratedCommandList : public SubscribeAttribute {
+class WriteTestClusterInt16u : public WriteAttribute {
 public:
-    SubscribeAttributeTimeFormatLocalizationGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    WriteTestClusterInt16u()
+        : WriteAttribute("int16u")
     {
+        AddArgument("attr-name", "int16u");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeTimeFormatLocalizationGeneratedCommandList() {}
+    ~WriteTestClusterInt16u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000006) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster writeAttributeInt16uWithValue:value
+                                        params:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 if (error != nil) {
+                                     LogNSError("TestCluster Int16u write Error", error);
+                                 }
+                                 SetCommandExitStatus(error);
+                             }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeTestClusterInt16u : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterInt16u()
+        : SubscribeAttribute("int16u")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterInt16u() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000006) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInt16uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TimeFormatLocalization.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Int16u response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -86195,29 +83015,27 @@ class SubscribeAttributeTimeFormatLocalizationGeneratedCommandList : public Subs
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute Int24u
  */
-class ReadTimeFormatLocalizationAcceptedCommandList : public ReadAttribute {
+class ReadTestClusterInt24u : public ReadAttribute {
 public:
-    ReadTimeFormatLocalizationAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadTestClusterInt24u()
+        : ReadAttribute("int24u")
     {
     }
 
-    ~ReadTimeFormatLocalizationAcceptedCommandList() {}
+    ~ReadTestClusterInt24u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000007) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TimeFormatLocalization.AcceptedCommandList response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeInt24uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.Int24u response %@", [value description]);
             if (error != nil) {
-                LogNSError("TimeFormatLocalization AcceptedCommandList read Error", error);
+                LogNSError("TestCluster Int24u read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -86225,34 +83043,70 @@ class ReadTimeFormatLocalizationAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTimeFormatLocalizationAcceptedCommandList : public SubscribeAttribute {
+class WriteTestClusterInt24u : public WriteAttribute {
 public:
-    SubscribeAttributeTimeFormatLocalizationAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    WriteTestClusterInt24u()
+        : WriteAttribute("int24u")
     {
+        AddArgument("attr-name", "int24u");
+        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeTimeFormatLocalizationAcceptedCommandList() {}
+    ~WriteTestClusterInt24u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000007) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue];
+
+        [cluster writeAttributeInt24uWithValue:value
+                                        params:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 if (error != nil) {
+                                     LogNSError("TestCluster Int24u write Error", error);
+                                 }
+                                 SetCommandExitStatus(error);
+                             }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint32_t mValue;
+};
+
+class SubscribeAttributeTestClusterInt24u : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterInt24u()
+        : SubscribeAttribute("int24u")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterInt24u() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000007) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInt24uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TimeFormatLocalization.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Int24u response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -86263,29 +83117,27 @@ class SubscribeAttributeTimeFormatLocalizationAcceptedCommandList : public Subsc
 };
 
 /*
- * Attribute AttributeList
+ * Attribute Int32u
  */
-class ReadTimeFormatLocalizationAttributeList : public ReadAttribute {
+class ReadTestClusterInt32u : public ReadAttribute {
 public:
-    ReadTimeFormatLocalizationAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadTestClusterInt32u()
+        : ReadAttribute("int32u")
     {
     }
 
-    ~ReadTimeFormatLocalizationAttributeList() {}
+    ~ReadTestClusterInt32u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000008) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TimeFormatLocalization.AttributeList response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeInt32uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.Int32u response %@", [value description]);
             if (error != nil) {
-                LogNSError("TimeFormatLocalization AttributeList read Error", error);
+                LogNSError("TestCluster Int32u read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -86293,34 +83145,70 @@ class ReadTimeFormatLocalizationAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTimeFormatLocalizationAttributeList : public SubscribeAttribute {
+class WriteTestClusterInt32u : public WriteAttribute {
 public:
-    SubscribeAttributeTimeFormatLocalizationAttributeList()
-        : SubscribeAttribute("attribute-list")
+    WriteTestClusterInt32u()
+        : WriteAttribute("int32u")
     {
+        AddArgument("attr-name", "int32u");
+        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeTimeFormatLocalizationAttributeList() {}
+    ~WriteTestClusterInt32u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000008) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue];
+
+        [cluster writeAttributeInt32uWithValue:value
+                                        params:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 if (error != nil) {
+                                     LogNSError("TestCluster Int32u write Error", error);
+                                 }
+                                 SetCommandExitStatus(error);
+                             }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint32_t mValue;
+};
+
+class SubscribeAttributeTestClusterInt32u : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterInt32u()
+        : SubscribeAttribute("int32u")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterInt32u() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000008) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInt32uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TimeFormatLocalization.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Int32u response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -86331,29 +83219,27 @@ class SubscribeAttributeTimeFormatLocalizationAttributeList : public SubscribeAt
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute Int40u
  */
-class ReadTimeFormatLocalizationFeatureMap : public ReadAttribute {
+class ReadTestClusterInt40u : public ReadAttribute {
 public:
-    ReadTimeFormatLocalizationFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadTestClusterInt40u()
+        : ReadAttribute("int40u")
     {
     }
 
-    ~ReadTimeFormatLocalizationFeatureMap() {}
+    ~ReadTestClusterInt40u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000009) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TimeFormatLocalization.FeatureMap response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeInt40uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.Int40u response %@", [value description]);
             if (error != nil) {
-                LogNSError("TimeFormatLocalization FeatureMap read Error", error);
+                LogNSError("TestCluster Int40u read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -86361,34 +83247,70 @@ class ReadTimeFormatLocalizationFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTimeFormatLocalizationFeatureMap : public SubscribeAttribute {
+class WriteTestClusterInt40u : public WriteAttribute {
 public:
-    SubscribeAttributeTimeFormatLocalizationFeatureMap()
-        : SubscribeAttribute("feature-map")
+    WriteTestClusterInt40u()
+        : WriteAttribute("int40u")
     {
+        AddArgument("attr-name", "int40u");
+        AddArgument("attr-value", 0, UINT64_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeTimeFormatLocalizationFeatureMap() {}
+    ~WriteTestClusterInt40u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000009) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedLongLong:mValue];
+
+        [cluster writeAttributeInt40uWithValue:value
+                                        params:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 if (error != nil) {
+                                     LogNSError("TestCluster Int40u write Error", error);
+                                 }
+                                 SetCommandExitStatus(error);
+                             }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint64_t mValue;
+};
+
+class SubscribeAttributeTestClusterInt40u : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterInt40u()
+        : SubscribeAttribute("int40u")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterInt40u() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000009) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInt40uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TimeFormatLocalization.FeatureMap response %@", [value description]);
+                NSLog(@"TestCluster.Int40u response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -86399,29 +83321,27 @@ class SubscribeAttributeTimeFormatLocalizationFeatureMap : public SubscribeAttri
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute Int48u
  */
-class ReadTimeFormatLocalizationClusterRevision : public ReadAttribute {
+class ReadTestClusterInt48u : public ReadAttribute {
 public:
-    ReadTimeFormatLocalizationClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadTestClusterInt48u()
+        : ReadAttribute("int48u")
     {
     }
 
-    ~ReadTimeFormatLocalizationClusterRevision() {}
+    ~ReadTestClusterInt48u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000000A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TimeFormatLocalization.ClusterRevision response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeInt48uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.Int48u response %@", [value description]);
             if (error != nil) {
-                LogNSError("TimeFormatLocalization ClusterRevision read Error", error);
+                LogNSError("TestCluster Int48u read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -86429,34 +83349,70 @@ class ReadTimeFormatLocalizationClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTimeFormatLocalizationClusterRevision : public SubscribeAttribute {
+class WriteTestClusterInt48u : public WriteAttribute {
 public:
-    SubscribeAttributeTimeFormatLocalizationClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    WriteTestClusterInt48u()
+        : WriteAttribute("int48u")
     {
+        AddArgument("attr-name", "int48u");
+        AddArgument("attr-value", 0, UINT64_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeTimeFormatLocalizationClusterRevision() {}
+    ~WriteTestClusterInt48u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002C) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000000A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPTimeFormatLocalization * cluster = [[CHIPTimeFormatLocalization alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedLongLong:mValue];
+
+        [cluster writeAttributeInt48uWithValue:value
+                                        params:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 if (error != nil) {
+                                     LogNSError("TestCluster Int48u write Error", error);
+                                 }
+                                 SetCommandExitStatus(error);
+                             }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint64_t mValue;
+};
+
+class SubscribeAttributeTestClusterInt48u : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterInt48u()
+        : SubscribeAttribute("int48u")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterInt48u() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000000A) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInt48uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TimeFormatLocalization.ClusterRevision response %@", [value description]);
+                NSLog(@"TestCluster.Int48u response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -86466,46 +83422,28 @@ class SubscribeAttributeTimeFormatLocalizationClusterRevision : public Subscribe
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster UnitLocalization                                            | 0x002D |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * TemperatureUnit                                                   | 0x0000 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Attribute TemperatureUnit
+ * Attribute Int56u
  */
-class ReadUnitLocalizationTemperatureUnit : public ReadAttribute {
+class ReadTestClusterInt56u : public ReadAttribute {
 public:
-    ReadUnitLocalizationTemperatureUnit()
-        : ReadAttribute("temperature-unit")
+    ReadTestClusterInt56u()
+        : ReadAttribute("int56u")
     {
     }
 
-    ~ReadUnitLocalizationTemperatureUnit() {}
+    ~ReadTestClusterInt56u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000000B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeTemperatureUnitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"UnitLocalization.TemperatureUnit response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeInt56uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.Int56u response %@", [value description]);
             if (error != nil) {
-                LogNSError("UnitLocalization TemperatureUnit read Error", error);
+                LogNSError("TestCluster Int56u read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -86513,74 +83451,70 @@ class ReadUnitLocalizationTemperatureUnit : public ReadAttribute {
     }
 };
 
-class WriteUnitLocalizationTemperatureUnit : public WriteAttribute {
+class WriteTestClusterInt56u : public WriteAttribute {
 public:
-    WriteUnitLocalizationTemperatureUnit()
-        : WriteAttribute("temperature-unit")
+    WriteTestClusterInt56u()
+        : WriteAttribute("int56u")
     {
-        AddArgument("attr-name", "temperature-unit");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        AddArgument("attr-name", "int56u");
+        AddArgument("attr-value", 0, UINT64_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteUnitLocalizationTemperatureUnit() {}
+    ~WriteTestClusterInt56u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) WriteAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000000B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedLongLong:mValue];
 
-        [cluster writeAttributeTemperatureUnitWithValue:value
-                                                 params:params
-                                      completionHandler:^(NSError * _Nullable error) {
-                                          if (error != nil) {
-                                              LogNSError("UnitLocalization TemperatureUnit write Error", error);
-                                          }
-                                          SetCommandExitStatus(error);
-                                      }];
+        [cluster writeAttributeInt56uWithValue:value
+                                        params:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 if (error != nil) {
+                                     LogNSError("TestCluster Int56u write Error", error);
+                                 }
+                                 SetCommandExitStatus(error);
+                             }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    uint8_t mValue;
+    uint64_t mValue;
 };
 
-class SubscribeAttributeUnitLocalizationTemperatureUnit : public SubscribeAttribute {
+class SubscribeAttributeTestClusterInt56u : public SubscribeAttribute {
 public:
-    SubscribeAttributeUnitLocalizationTemperatureUnit()
-        : SubscribeAttribute("temperature-unit")
+    SubscribeAttributeTestClusterInt56u()
+        : SubscribeAttribute("int56u")
     {
     }
 
-    ~SubscribeAttributeUnitLocalizationTemperatureUnit() {}
+    ~SubscribeAttributeTestClusterInt56u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000000B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTemperatureUnitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInt56uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"UnitLocalization.TemperatureUnit response %@", [value description]);
+                NSLog(@"TestCluster.Int56u response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -86591,29 +83525,27 @@ class SubscribeAttributeUnitLocalizationTemperatureUnit : public SubscribeAttrib
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute Int64u
  */
-class ReadUnitLocalizationGeneratedCommandList : public ReadAttribute {
+class ReadTestClusterInt64u : public ReadAttribute {
 public:
-    ReadUnitLocalizationGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadTestClusterInt64u()
+        : ReadAttribute("int64u")
     {
     }
 
-    ~ReadUnitLocalizationGeneratedCommandList() {}
+    ~ReadTestClusterInt64u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000000C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"UnitLocalization.GeneratedCommandList response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeInt64uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.Int64u response %@", [value description]);
             if (error != nil) {
-                LogNSError("UnitLocalization GeneratedCommandList read Error", error);
+                LogNSError("TestCluster Int64u read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -86621,102 +83553,70 @@ class ReadUnitLocalizationGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeUnitLocalizationGeneratedCommandList : public SubscribeAttribute {
+class WriteTestClusterInt64u : public WriteAttribute {
 public:
-    SubscribeAttributeUnitLocalizationGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    WriteTestClusterInt64u()
+        : WriteAttribute("int64u")
     {
+        AddArgument("attr-name", "int64u");
+        AddArgument("attr-value", 0, UINT64_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeUnitLocalizationGeneratedCommandList() {}
+    ~WriteTestClusterInt64u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000000C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"UnitLocalization.GeneratedCommandList response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedLongLong:mValue];
 
+        [cluster writeAttributeInt64uWithValue:value
+                                        params:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 if (error != nil) {
+                                     LogNSError("TestCluster Int64u write Error", error);
+                                 }
+                                 SetCommandExitStatus(error);
+                             }];
         return CHIP_NO_ERROR;
     }
-};
-
-/*
- * Attribute AcceptedCommandList
- */
-class ReadUnitLocalizationAcceptedCommandList : public ReadAttribute {
-public:
-    ReadUnitLocalizationAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
-    {
-    }
-
-    ~ReadUnitLocalizationAcceptedCommandList() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
 
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"UnitLocalization.AcceptedCommandList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("UnitLocalization AcceptedCommandList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
+private:
+    uint64_t mValue;
 };
 
-class SubscribeAttributeUnitLocalizationAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeTestClusterInt64u : public SubscribeAttribute {
 public:
-    SubscribeAttributeUnitLocalizationAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeTestClusterInt64u()
+        : SubscribeAttribute("int64u")
     {
     }
 
-    ~SubscribeAttributeUnitLocalizationAcceptedCommandList() {}
+    ~SubscribeAttributeTestClusterInt64u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000000C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInt64uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"UnitLocalization.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Int64u response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -86727,29 +83627,27 @@ class SubscribeAttributeUnitLocalizationAcceptedCommandList : public SubscribeAt
 };
 
 /*
- * Attribute AttributeList
+ * Attribute Int8s
  */
-class ReadUnitLocalizationAttributeList : public ReadAttribute {
+class ReadTestClusterInt8s : public ReadAttribute {
 public:
-    ReadUnitLocalizationAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadTestClusterInt8s()
+        : ReadAttribute("int8s")
     {
     }
 
-    ~ReadUnitLocalizationAttributeList() {}
+    ~ReadTestClusterInt8s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000000D) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"UnitLocalization.AttributeList response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeInt8sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.Int8s response %@", [value description]);
             if (error != nil) {
-                LogNSError("UnitLocalization AttributeList read Error", error);
+                LogNSError("TestCluster Int8s read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -86757,34 +83655,70 @@ class ReadUnitLocalizationAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeUnitLocalizationAttributeList : public SubscribeAttribute {
+class WriteTestClusterInt8s : public WriteAttribute {
 public:
-    SubscribeAttributeUnitLocalizationAttributeList()
-        : SubscribeAttribute("attribute-list")
+    WriteTestClusterInt8s()
+        : WriteAttribute("int8s")
     {
+        AddArgument("attr-name", "int8s");
+        AddArgument("attr-value", INT8_MIN, INT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeUnitLocalizationAttributeList() {}
+    ~WriteTestClusterInt8s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000000D) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithChar:mValue];
+
+        [cluster writeAttributeInt8sWithValue:value
+                                       params:params
+                            completionHandler:^(NSError * _Nullable error) {
+                                if (error != nil) {
+                                    LogNSError("TestCluster Int8s write Error", error);
+                                }
+                                SetCommandExitStatus(error);
+                            }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    int8_t mValue;
+};
+
+class SubscribeAttributeTestClusterInt8s : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterInt8s()
+        : SubscribeAttribute("int8s")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterInt8s() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000000D) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInt8sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"UnitLocalization.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Int8s response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -86795,29 +83729,27 @@ class SubscribeAttributeUnitLocalizationAttributeList : public SubscribeAttribut
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute Int16s
  */
-class ReadUnitLocalizationFeatureMap : public ReadAttribute {
+class ReadTestClusterInt16s : public ReadAttribute {
 public:
-    ReadUnitLocalizationFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadTestClusterInt16s()
+        : ReadAttribute("int16s")
     {
     }
 
-    ~ReadUnitLocalizationFeatureMap() {}
+    ~ReadTestClusterInt16s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000000E) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"UnitLocalization.FeatureMap response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeInt16sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.Int16s response %@", [value description]);
             if (error != nil) {
-                LogNSError("UnitLocalization FeatureMap read Error", error);
+                LogNSError("TestCluster Int16s read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -86825,34 +83757,70 @@ class ReadUnitLocalizationFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeUnitLocalizationFeatureMap : public SubscribeAttribute {
+class WriteTestClusterInt16s : public WriteAttribute {
 public:
-    SubscribeAttributeUnitLocalizationFeatureMap()
-        : SubscribeAttribute("feature-map")
+    WriteTestClusterInt16s()
+        : WriteAttribute("int16s")
     {
+        AddArgument("attr-name", "int16s");
+        AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeUnitLocalizationFeatureMap() {}
+    ~WriteTestClusterInt16s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000000E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue];
+
+        [cluster writeAttributeInt16sWithValue:value
+                                        params:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 if (error != nil) {
+                                     LogNSError("TestCluster Int16s write Error", error);
+                                 }
+                                 SetCommandExitStatus(error);
+                             }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    int16_t mValue;
+};
+
+class SubscribeAttributeTestClusterInt16s : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterInt16s()
+        : SubscribeAttribute("int16s")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterInt16s() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000000E) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInt16sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"UnitLocalization.FeatureMap response %@", [value description]);
+                NSLog(@"TestCluster.Int16s response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -86863,29 +83831,27 @@ class SubscribeAttributeUnitLocalizationFeatureMap : public SubscribeAttribute {
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute Int24s
  */
-class ReadUnitLocalizationClusterRevision : public ReadAttribute {
+class ReadTestClusterInt24s : public ReadAttribute {
 public:
-    ReadUnitLocalizationClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadTestClusterInt24s()
+        : ReadAttribute("int24s")
     {
     }
 
-    ~ReadUnitLocalizationClusterRevision() {}
+    ~ReadTestClusterInt24s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000000F) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"UnitLocalization.ClusterRevision response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeInt24sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.Int24s response %@", [value description]);
             if (error != nil) {
-                LogNSError("UnitLocalization ClusterRevision read Error", error);
+                LogNSError("TestCluster Int24s read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -86893,34 +83859,70 @@ class ReadUnitLocalizationClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeUnitLocalizationClusterRevision : public SubscribeAttribute {
+class WriteTestClusterInt24s : public WriteAttribute {
 public:
-    SubscribeAttributeUnitLocalizationClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    WriteTestClusterInt24s()
+        : WriteAttribute("int24s")
     {
+        AddArgument("attr-name", "int24s");
+        AddArgument("attr-value", INT32_MIN, INT32_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeUnitLocalizationClusterRevision() {}
+    ~WriteTestClusterInt24s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0000002D) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000000F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUnitLocalization * cluster = [[CHIPUnitLocalization alloc] initWithDevice:device
-                                                                             endpoint:endpointId
-                                                                                queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithInt:mValue];
+
+        [cluster writeAttributeInt24sWithValue:value
+                                        params:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 if (error != nil) {
+                                     LogNSError("TestCluster Int24s write Error", error);
+                                 }
+                                 SetCommandExitStatus(error);
+                             }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    int32_t mValue;
+};
+
+class SubscribeAttributeTestClusterInt24s : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterInt24s()
+        : SubscribeAttribute("int24s")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterInt24s() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000000F) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInt24sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"UnitLocalization.ClusterRevision response %@", [value description]);
+                NSLog(@"TestCluster.Int24s response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -86930,44 +83932,28 @@ class SubscribeAttributeUnitLocalizationClusterRevision : public SubscribeAttrib
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster UserLabel                                                   | 0x0041 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * LabelList                                                         | 0x0000 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Attribute LabelList
+ * Attribute Int32s
  */
-class ReadUserLabelLabelList : public ReadAttribute {
+class ReadTestClusterInt32s : public ReadAttribute {
 public:
-    ReadUserLabelLabelList()
-        : ReadAttribute("label-list")
+    ReadTestClusterInt32s()
+        : ReadAttribute("int32s")
     {
     }
 
-    ~ReadUserLabelLabelList() {}
+    ~ReadTestClusterInt32s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000041) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000010) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeLabelListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"UserLabel.LabelList response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeInt32sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.Int32s response %@", [value description]);
             if (error != nil) {
-                LogNSError("UserLabel LabelList read Error", error);
+                LogNSError("TestCluster Int32s read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -86975,87 +83961,70 @@ class ReadUserLabelLabelList : public ReadAttribute {
     }
 };
 
-class WriteUserLabelLabelList : public WriteAttribute {
+class WriteTestClusterInt32s : public WriteAttribute {
 public:
-    WriteUserLabelLabelList()
-        : WriteAttribute("label-list")
-        , mComplex(&mValue)
+    WriteTestClusterInt32s()
+        : WriteAttribute("int32s")
     {
-        AddArgument("attr-name", "label-list");
-        AddArgument("attr-value", &mComplex);
+        AddArgument("attr-name", "int32s");
+        AddArgument("attr-value", INT32_MIN, INT32_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteUserLabelLabelList() {}
+    ~WriteTestClusterInt32s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000041) WriteAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000010) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSArray * _Nonnull value;
-        { // Scope for our temporary variables
-            auto * array_0 = [NSMutableArray new];
-            for (auto & entry_0 : mValue) {
-                CHIPUserLabelClusterLabelStruct * newElement_0;
-                newElement_0 = [CHIPUserLabelClusterLabelStruct new];
-                newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data()
-                                                              length:entry_0.label.size()
-                                                            encoding:NSUTF8StringEncoding];
-                newElement_0.value = [[NSString alloc] initWithBytes:entry_0.value.data()
-                                                              length:entry_0.value.size()
-                                                            encoding:NSUTF8StringEncoding];
-                [array_0 addObject:newElement_0];
-            }
-            value = array_0;
-        }
+        NSNumber * _Nonnull value = [NSNumber numberWithInt:mValue];
 
-        [cluster writeAttributeLabelListWithValue:value
-                                           params:params
-                                completionHandler:^(NSError * _Nullable error) {
-                                    if (error != nil) {
-                                        LogNSError("UserLabel LabelList write Error", error);
-                                    }
-                                    SetCommandExitStatus(error);
-                                }];
+        [cluster writeAttributeInt32sWithValue:value
+                                        params:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 if (error != nil) {
+                                     LogNSError("TestCluster Int32s write Error", error);
+                                 }
+                                 SetCommandExitStatus(error);
+                             }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::DataModel::List<const chip::app::Clusters::UserLabel::Structs::LabelStruct::Type> mValue;
-    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::UserLabel::Structs::LabelStruct::Type>> mComplex;
+    int32_t mValue;
 };
 
-class SubscribeAttributeUserLabelLabelList : public SubscribeAttribute {
+class SubscribeAttributeTestClusterInt32s : public SubscribeAttribute {
 public:
-    SubscribeAttributeUserLabelLabelList()
-        : SubscribeAttribute("label-list")
+    SubscribeAttributeTestClusterInt32s()
+        : SubscribeAttribute("int32s")
     {
     }
 
-    ~SubscribeAttributeUserLabelLabelList() {}
+    ~SubscribeAttributeTestClusterInt32s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000041) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000010) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeLabelListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInt32sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"UserLabel.LabelList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Int32s response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -87066,27 +84035,27 @@ class SubscribeAttributeUserLabelLabelList : public SubscribeAttribute {
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute Int40s
  */
-class ReadUserLabelGeneratedCommandList : public ReadAttribute {
+class ReadTestClusterInt40s : public ReadAttribute {
 public:
-    ReadUserLabelGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadTestClusterInt40s()
+        : ReadAttribute("int40s")
     {
     }
 
-    ~ReadUserLabelGeneratedCommandList() {}
+    ~ReadTestClusterInt40s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000041) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000011) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"UserLabel.GeneratedCommandList response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeInt40sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.Int40s response %@", [value description]);
             if (error != nil) {
-                LogNSError("UserLabel GeneratedCommandList read Error", error);
+                LogNSError("TestCluster Int40s read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -87094,32 +84063,70 @@ class ReadUserLabelGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeUserLabelGeneratedCommandList : public SubscribeAttribute {
+class WriteTestClusterInt40s : public WriteAttribute {
 public:
-    SubscribeAttributeUserLabelGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    WriteTestClusterInt40s()
+        : WriteAttribute("int40s")
+    {
+        AddArgument("attr-name", "int40s");
+        AddArgument("attr-value", INT64_MIN, INT64_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteTestClusterInt40s() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000011) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithLongLong:mValue];
+
+        [cluster writeAttributeInt40sWithValue:value
+                                        params:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 if (error != nil) {
+                                     LogNSError("TestCluster Int40s write Error", error);
+                                 }
+                                 SetCommandExitStatus(error);
+                             }];
+        return CHIP_NO_ERROR;
     }
 
-    ~SubscribeAttributeUserLabelGeneratedCommandList() {}
+private:
+    int64_t mValue;
+};
+
+class SubscribeAttributeTestClusterInt40s : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterInt40s()
+        : SubscribeAttribute("int40s")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterInt40s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000041) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000011) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInt40sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"UserLabel.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Int40s response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -87130,27 +84137,27 @@ class SubscribeAttributeUserLabelGeneratedCommandList : public SubscribeAttribut
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute Int48s
  */
-class ReadUserLabelAcceptedCommandList : public ReadAttribute {
+class ReadTestClusterInt48s : public ReadAttribute {
 public:
-    ReadUserLabelAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadTestClusterInt48s()
+        : ReadAttribute("int48s")
     {
     }
 
-    ~ReadUserLabelAcceptedCommandList() {}
+    ~ReadTestClusterInt48s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000041) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000012) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"UserLabel.AcceptedCommandList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("UserLabel AcceptedCommandList read Error", error);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeInt48sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.Int48s response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TestCluster Int48s read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -87158,96 +84165,70 @@ class ReadUserLabelAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeUserLabelAcceptedCommandList : public SubscribeAttribute {
+class WriteTestClusterInt48s : public WriteAttribute {
 public:
-    SubscribeAttributeUserLabelAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    WriteTestClusterInt48s()
+        : WriteAttribute("int48s")
     {
+        AddArgument("attr-name", "int48s");
+        AddArgument("attr-value", INT64_MIN, INT64_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeUserLabelAcceptedCommandList() {}
+    ~WriteTestClusterInt48s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000041) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000012) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"UserLabel.AcceptedCommandList response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithLongLong:mValue];
 
+        [cluster writeAttributeInt48sWithValue:value
+                                        params:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 if (error != nil) {
+                                     LogNSError("TestCluster Int48s write Error", error);
+                                 }
+                                 SetCommandExitStatus(error);
+                             }];
         return CHIP_NO_ERROR;
     }
-};
-
-/*
- * Attribute AttributeList
- */
-class ReadUserLabelAttributeList : public ReadAttribute {
-public:
-    ReadUserLabelAttributeList()
-        : ReadAttribute("attribute-list")
-    {
-    }
-
-    ~ReadUserLabelAttributeList() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000041) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"UserLabel.AttributeList response %@", [value description]);
-            if (error != nil) {
-                LogNSError("UserLabel AttributeList read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
+private:
+    int64_t mValue;
 };
 
-class SubscribeAttributeUserLabelAttributeList : public SubscribeAttribute {
+class SubscribeAttributeTestClusterInt48s : public SubscribeAttribute {
 public:
-    SubscribeAttributeUserLabelAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeTestClusterInt48s()
+        : SubscribeAttribute("int48s")
     {
     }
 
-    ~SubscribeAttributeUserLabelAttributeList() {}
+    ~SubscribeAttributeTestClusterInt48s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000041) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000012) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInt48sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"UserLabel.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Int48s response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -87258,27 +84239,27 @@ class SubscribeAttributeUserLabelAttributeList : public SubscribeAttribute {
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute Int56s
  */
-class ReadUserLabelFeatureMap : public ReadAttribute {
+class ReadTestClusterInt56s : public ReadAttribute {
 public:
-    ReadUserLabelFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadTestClusterInt56s()
+        : ReadAttribute("int56s")
     {
     }
 
-    ~ReadUserLabelFeatureMap() {}
+    ~ReadTestClusterInt56s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000041) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000013) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"UserLabel.FeatureMap response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeInt56sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.Int56s response %@", [value description]);
             if (error != nil) {
-                LogNSError("UserLabel FeatureMap read Error", error);
+                LogNSError("TestCluster Int56s read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -87286,32 +84267,70 @@ class ReadUserLabelFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeUserLabelFeatureMap : public SubscribeAttribute {
+class WriteTestClusterInt56s : public WriteAttribute {
 public:
-    SubscribeAttributeUserLabelFeatureMap()
-        : SubscribeAttribute("feature-map")
+    WriteTestClusterInt56s()
+        : WriteAttribute("int56s")
     {
+        AddArgument("attr-name", "int56s");
+        AddArgument("attr-value", INT64_MIN, INT64_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeUserLabelFeatureMap() {}
+    ~WriteTestClusterInt56s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000041) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000013) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithLongLong:mValue];
+
+        [cluster writeAttributeInt56sWithValue:value
+                                        params:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 if (error != nil) {
+                                     LogNSError("TestCluster Int56s write Error", error);
+                                 }
+                                 SetCommandExitStatus(error);
+                             }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    int64_t mValue;
+};
+
+class SubscribeAttributeTestClusterInt56s : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterInt56s()
+        : SubscribeAttribute("int56s")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterInt56s() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000013) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInt56sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"UserLabel.FeatureMap response %@", [value description]);
+                NSLog(@"TestCluster.Int56s response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -87322,27 +84341,27 @@ class SubscribeAttributeUserLabelFeatureMap : public SubscribeAttribute {
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute Int64s
  */
-class ReadUserLabelClusterRevision : public ReadAttribute {
+class ReadTestClusterInt64s : public ReadAttribute {
 public:
-    ReadUserLabelClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadTestClusterInt64s()
+        : ReadAttribute("int64s")
     {
     }
 
-    ~ReadUserLabelClusterRevision() {}
+    ~ReadTestClusterInt64s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000041) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000014) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"UserLabel.ClusterRevision response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeInt64sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.Int64s response %@", [value description]);
             if (error != nil) {
-                LogNSError("UserLabel ClusterRevision read Error", error);
+                LogNSError("TestCluster Int64s read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -87350,32 +84369,70 @@ class ReadUserLabelClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeUserLabelClusterRevision : public SubscribeAttribute {
+class WriteTestClusterInt64s : public WriteAttribute {
 public:
-    SubscribeAttributeUserLabelClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    WriteTestClusterInt64s()
+        : WriteAttribute("int64s")
     {
+        AddArgument("attr-name", "int64s");
+        AddArgument("attr-value", INT64_MIN, INT64_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeUserLabelClusterRevision() {}
+    ~WriteTestClusterInt64s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000041) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000014) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithLongLong:mValue];
+
+        [cluster writeAttributeInt64sWithValue:value
+                                        params:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 if (error != nil) {
+                                     LogNSError("TestCluster Int64s write Error", error);
+                                 }
+                                 SetCommandExitStatus(error);
+                             }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    int64_t mValue;
+};
+
+class SubscribeAttributeTestClusterInt64s : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterInt64s()
+        : SubscribeAttribute("int64s")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterInt64s() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000014) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeInt64sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"UserLabel.ClusterRevision response %@", [value description]);
+                NSLog(@"TestCluster.Int64s response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -87385,44 +84442,28 @@ class SubscribeAttributeUserLabelClusterRevision : public SubscribeAttribute {
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster WakeOnLan                                                   | 0x0503 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * MACAddress                                                        | 0x0000 |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Attribute MACAddress
+ * Attribute Enum8
  */
-class ReadWakeOnLanMACAddress : public ReadAttribute {
+class ReadTestClusterEnum8 : public ReadAttribute {
 public:
-    ReadWakeOnLanMACAddress()
-        : ReadAttribute("macaddress")
+    ReadTestClusterEnum8()
+        : ReadAttribute("enum8")
     {
     }
 
-    ~ReadWakeOnLanMACAddress() {}
+    ~ReadTestClusterEnum8() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000503) ReadAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000015) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeMACAddressWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WakeOnLan.MACAddress response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeEnum8WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.Enum8 response %@", [value description]);
             if (error != nil) {
-                LogNSError("WakeOnLan MACAddress read Error", error);
+                LogNSError("TestCluster Enum8 read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -87430,32 +84471,70 @@ class ReadWakeOnLanMACAddress : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWakeOnLanMACAddress : public SubscribeAttribute {
+class WriteTestClusterEnum8 : public WriteAttribute {
 public:
-    SubscribeAttributeWakeOnLanMACAddress()
-        : SubscribeAttribute("macaddress")
+    WriteTestClusterEnum8()
+        : WriteAttribute("enum8")
     {
+        AddArgument("attr-name", "enum8");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWakeOnLanMACAddress() {}
+    ~WriteTestClusterEnum8() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000503) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000015) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeEnum8WithValue:value
+                                       params:params
+                            completionHandler:^(NSError * _Nullable error) {
+                                if (error != nil) {
+                                    LogNSError("TestCluster Enum8 write Error", error);
+                                }
+                                SetCommandExitStatus(error);
+                            }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeTestClusterEnum8 : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterEnum8()
+        : SubscribeAttribute("enum8")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterEnum8() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000015) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeMACAddressWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeEnum8WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WakeOnLan.MACAddress response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Enum8 response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -87466,27 +84545,27 @@ class SubscribeAttributeWakeOnLanMACAddress : public SubscribeAttribute {
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute Enum16
  */
-class ReadWakeOnLanGeneratedCommandList : public ReadAttribute {
+class ReadTestClusterEnum16 : public ReadAttribute {
 public:
-    ReadWakeOnLanGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadTestClusterEnum16()
+        : ReadAttribute("enum16")
     {
     }
 
-    ~ReadWakeOnLanGeneratedCommandList() {}
+    ~ReadTestClusterEnum16() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000503) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000016) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WakeOnLan.GeneratedCommandList response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeEnum16WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.Enum16 response %@", [value description]);
             if (error != nil) {
-                LogNSError("WakeOnLan GeneratedCommandList read Error", error);
+                LogNSError("TestCluster Enum16 read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -87494,32 +84573,70 @@ class ReadWakeOnLanGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWakeOnLanGeneratedCommandList : public SubscribeAttribute {
+class WriteTestClusterEnum16 : public WriteAttribute {
 public:
-    SubscribeAttributeWakeOnLanGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    WriteTestClusterEnum16()
+        : WriteAttribute("enum16")
     {
+        AddArgument("attr-name", "enum16");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWakeOnLanGeneratedCommandList() {}
+    ~WriteTestClusterEnum16() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000503) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000016) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster writeAttributeEnum16WithValue:value
+                                        params:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 if (error != nil) {
+                                     LogNSError("TestCluster Enum16 write Error", error);
+                                 }
+                                 SetCommandExitStatus(error);
+                             }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeTestClusterEnum16 : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterEnum16()
+        : SubscribeAttribute("enum16")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterEnum16() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000016) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeEnum16WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WakeOnLan.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.Enum16 response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -87530,27 +84647,27 @@ class SubscribeAttributeWakeOnLanGeneratedCommandList : public SubscribeAttribut
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute FloatSingle
  */
-class ReadWakeOnLanAcceptedCommandList : public ReadAttribute {
+class ReadTestClusterFloatSingle : public ReadAttribute {
 public:
-    ReadWakeOnLanAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadTestClusterFloatSingle()
+        : ReadAttribute("float-single")
     {
     }
 
-    ~ReadWakeOnLanAcceptedCommandList() {}
+    ~ReadTestClusterFloatSingle() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000503) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000017) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WakeOnLan.AcceptedCommandList response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFloatSingleWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.FloatSingle response %@", [value description]);
             if (error != nil) {
-                LogNSError("WakeOnLan AcceptedCommandList read Error", error);
+                LogNSError("TestCluster FloatSingle read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -87558,32 +84675,70 @@ class ReadWakeOnLanAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWakeOnLanAcceptedCommandList : public SubscribeAttribute {
+class WriteTestClusterFloatSingle : public WriteAttribute {
 public:
-    SubscribeAttributeWakeOnLanAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    WriteTestClusterFloatSingle()
+        : WriteAttribute("float-single")
     {
+        AddArgument("attr-name", "float-single");
+        AddArgument("attr-value", -std::numeric_limits<float>::infinity(), std::numeric_limits<float>::infinity(), &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWakeOnLanAcceptedCommandList() {}
+    ~WriteTestClusterFloatSingle() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000503) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000017) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithFloat:mValue];
+
+        [cluster writeAttributeFloatSingleWithValue:value
+                                             params:params
+                                  completionHandler:^(NSError * _Nullable error) {
+                                      if (error != nil) {
+                                          LogNSError("TestCluster FloatSingle write Error", error);
+                                      }
+                                      SetCommandExitStatus(error);
+                                  }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    float mValue;
+};
+
+class SubscribeAttributeTestClusterFloatSingle : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterFloatSingle()
+        : SubscribeAttribute("float-single")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterFloatSingle() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000017) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFloatSingleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WakeOnLan.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.FloatSingle response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -87594,27 +84749,27 @@ class SubscribeAttributeWakeOnLanAcceptedCommandList : public SubscribeAttribute
 };
 
 /*
- * Attribute AttributeList
+ * Attribute FloatDouble
  */
-class ReadWakeOnLanAttributeList : public ReadAttribute {
+class ReadTestClusterFloatDouble : public ReadAttribute {
 public:
-    ReadWakeOnLanAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadTestClusterFloatDouble()
+        : ReadAttribute("float-double")
     {
     }
 
-    ~ReadWakeOnLanAttributeList() {}
+    ~ReadTestClusterFloatDouble() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000503) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000018) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WakeOnLan.AttributeList response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFloatDoubleWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.FloatDouble response %@", [value description]);
             if (error != nil) {
-                LogNSError("WakeOnLan AttributeList read Error", error);
+                LogNSError("TestCluster FloatDouble read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -87622,32 +84777,70 @@ class ReadWakeOnLanAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWakeOnLanAttributeList : public SubscribeAttribute {
+class WriteTestClusterFloatDouble : public WriteAttribute {
 public:
-    SubscribeAttributeWakeOnLanAttributeList()
-        : SubscribeAttribute("attribute-list")
+    WriteTestClusterFloatDouble()
+        : WriteAttribute("float-double")
     {
+        AddArgument("attr-name", "float-double");
+        AddArgument("attr-value", -std::numeric_limits<double>::infinity(), std::numeric_limits<double>::infinity(), &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWakeOnLanAttributeList() {}
+    ~WriteTestClusterFloatDouble() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000503) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000018) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithDouble:mValue];
+
+        [cluster writeAttributeFloatDoubleWithValue:value
+                                             params:params
+                                  completionHandler:^(NSError * _Nullable error) {
+                                      if (error != nil) {
+                                          LogNSError("TestCluster FloatDouble write Error", error);
+                                      }
+                                      SetCommandExitStatus(error);
+                                  }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    double mValue;
+};
+
+class SubscribeAttributeTestClusterFloatDouble : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterFloatDouble()
+        : SubscribeAttribute("float-double")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterFloatDouble() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000018) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeFloatDoubleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WakeOnLan.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.FloatDouble response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -87658,27 +84851,27 @@ class SubscribeAttributeWakeOnLanAttributeList : public SubscribeAttribute {
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute OctetString
  */
-class ReadWakeOnLanFeatureMap : public ReadAttribute {
+class ReadTestClusterOctetString : public ReadAttribute {
 public:
-    ReadWakeOnLanFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadTestClusterOctetString()
+        : ReadAttribute("octet-string")
     {
     }
 
-    ~ReadWakeOnLanFeatureMap() {}
+    ~ReadTestClusterOctetString() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000503) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000019) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WakeOnLan.FeatureMap response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeOctetStringWithCompletionHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.OctetString response %@", [value description]);
             if (error != nil) {
-                LogNSError("WakeOnLan FeatureMap read Error", error);
+                LogNSError("TestCluster OctetString read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -87686,32 +84879,70 @@ class ReadWakeOnLanFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWakeOnLanFeatureMap : public SubscribeAttribute {
+class WriteTestClusterOctetString : public WriteAttribute {
 public:
-    SubscribeAttributeWakeOnLanFeatureMap()
-        : SubscribeAttribute("feature-map")
+    WriteTestClusterOctetString()
+        : WriteAttribute("octet-string")
     {
+        AddArgument("attr-name", "octet-string");
+        AddArgument("attr-value", &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWakeOnLanFeatureMap() {}
+    ~WriteTestClusterOctetString() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000503) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000019) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSData * _Nonnull value = [[NSData alloc] initWithBytes:mValue.data() length:mValue.size()];
+
+        [cluster writeAttributeOctetStringWithValue:value
+                                             params:params
+                                  completionHandler:^(NSError * _Nullable error) {
+                                      if (error != nil) {
+                                          LogNSError("TestCluster OctetString write Error", error);
+                                      }
+                                      SetCommandExitStatus(error);
+                                  }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::ByteSpan mValue;
+};
+
+class SubscribeAttributeTestClusterOctetString : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterOctetString()
+        : SubscribeAttribute("octet-string")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterOctetString() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000019) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WakeOnLan.FeatureMap response %@", [value description]);
+            reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.OctetString response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -87722,27 +84953,27 @@ class SubscribeAttributeWakeOnLanFeatureMap : public SubscribeAttribute {
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute ListInt8u
  */
-class ReadWakeOnLanClusterRevision : public ReadAttribute {
+class ReadTestClusterListInt8u : public ReadAttribute {
 public:
-    ReadWakeOnLanClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadTestClusterListInt8u()
+        : ReadAttribute("list-int8u")
     {
     }
 
-    ~ReadWakeOnLanClusterRevision() {}
+    ~ReadTestClusterListInt8u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000503) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000001A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WakeOnLan.ClusterRevision response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeListInt8uWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.ListInt8u response %@", [value description]);
             if (error != nil) {
-                LogNSError("WakeOnLan ClusterRevision read Error", error);
+                LogNSError("TestCluster ListInt8u read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -87750,32 +84981,81 @@ class ReadWakeOnLanClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWakeOnLanClusterRevision : public SubscribeAttribute {
+class WriteTestClusterListInt8u : public WriteAttribute {
 public:
-    SubscribeAttributeWakeOnLanClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    WriteTestClusterListInt8u()
+        : WriteAttribute("list-int8u")
+        , mComplex(&mValue)
     {
+        AddArgument("attr-name", "list-int8u");
+        AddArgument("attr-value", &mComplex);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWakeOnLanClusterRevision() {}
+    ~WriteTestClusterListInt8u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000503) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000001A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mValue) {
+                NSNumber * newElement_0;
+                newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
+                [array_0 addObject:newElement_0];
+            }
+            value = array_0;
+        }
+
+        [cluster writeAttributeListInt8uWithValue:value
+                                           params:params
+                                completionHandler:^(NSError * _Nullable error) {
+                                    if (error != nil) {
+                                        LogNSError("TestCluster ListInt8u write Error", error);
+                                    }
+                                    SetCommandExitStatus(error);
+                                }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::DataModel::List<const uint8_t> mValue;
+    TypedComplexArgument<chip::app::DataModel::List<const uint8_t>> mComplex;
+};
+
+class SubscribeAttributeTestClusterListInt8u : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterListInt8u()
+        : SubscribeAttribute("list-int8u")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterListInt8u() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000001A) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeListInt8uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WakeOnLan.ClusterRevision response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.ListInt8u response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -87785,140 +85065,110 @@ class SubscribeAttributeWakeOnLanClusterRevision : public SubscribeAttribute {
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster WiFiNetworkDiagnostics                                      | 0x0036 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * ResetCounts                                                       |   0x00 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * Bssid                                                             | 0x0000 |
-| * SecurityType                                                      | 0x0001 |
-| * WiFiVersion                                                       | 0x0002 |
-| * ChannelNumber                                                     | 0x0003 |
-| * Rssi                                                              | 0x0004 |
-| * BeaconLostCount                                                   | 0x0005 |
-| * BeaconRxCount                                                     | 0x0006 |
-| * PacketMulticastRxCount                                            | 0x0007 |
-| * PacketMulticastTxCount                                            | 0x0008 |
-| * PacketUnicastRxCount                                              | 0x0009 |
-| * PacketUnicastTxCount                                              | 0x000A |
-| * CurrentMaxRate                                                    | 0x000B |
-| * OverrunCount                                                      | 0x000C |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-| * Disconnection                                                     | 0x0000 |
-| * AssociationFailure                                                | 0x0001 |
-| * ConnectionStatus                                                  | 0x0002 |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command ResetCounts
+ * Attribute ListOctetString
  */
-class WiFiNetworkDiagnosticsResetCounts : public ClusterCommand {
+class ReadTestClusterListOctetString : public ReadAttribute {
 public:
-    WiFiNetworkDiagnosticsResetCounts()
-        : ClusterCommand("reset-counts")
+    ReadTestClusterListOctetString()
+        : ReadAttribute("list-octet-string")
     {
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadTestClusterListOctetString() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000001B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        __auto_type * params = [[CHIPWiFiNetworkDiagnosticsClusterResetCountsParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster resetCountsWithParams:params
-                         completionHandler:^(NSError * _Nullable error) {
-                             responsesNeeded--;
-                             if (error != nil) {
-                                 mError = error;
-                                 LogNSError("Error", error);
-                             }
-                             if (responsesNeeded == 0) {
-                                 SetCommandExitStatus(mError);
-                             }
-                         }];
-        }
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeListOctetStringWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.ListOctetString response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TestCluster ListOctetString read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
 };
 
-/*
- * Attribute Bssid
- */
-class ReadWiFiNetworkDiagnosticsBssid : public ReadAttribute {
+class WriteTestClusterListOctetString : public WriteAttribute {
 public:
-    ReadWiFiNetworkDiagnosticsBssid()
-        : ReadAttribute("bssid")
+    WriteTestClusterListOctetString()
+        : WriteAttribute("list-octet-string")
+        , mComplex(&mValue)
     {
+        AddArgument("attr-name", "list-octet-string");
+        AddArgument("attr-value", &mComplex);
+        WriteAttribute::AddArguments();
     }
 
-    ~ReadWiFiNetworkDiagnosticsBssid() {}
+    ~WriteTestClusterListOctetString() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x00000000) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000001B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeBssidWithCompletionHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WiFiNetworkDiagnostics.Bssid response %@", [value description]);
-            if (error != nil) {
-                LogNSError("WiFiNetworkDiagnostics Bssid read Error", error);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mValue) {
+                NSData * newElement_0;
+                newElement_0 = [NSData dataWithBytes:entry_0.data() length:entry_0.size()];
+                [array_0 addObject:newElement_0];
             }
-            SetCommandExitStatus(error);
-        }];
+            value = array_0;
+        }
+
+        [cluster writeAttributeListOctetStringWithValue:value
+                                                 params:params
+                                      completionHandler:^(NSError * _Nullable error) {
+                                          if (error != nil) {
+                                              LogNSError("TestCluster ListOctetString write Error", error);
+                                          }
+                                          SetCommandExitStatus(error);
+                                      }];
         return CHIP_NO_ERROR;
     }
+
+private:
+    chip::app::DataModel::List<const chip::ByteSpan> mValue;
+    TypedComplexArgument<chip::app::DataModel::List<const chip::ByteSpan>> mComplex;
 };
 
-class SubscribeAttributeWiFiNetworkDiagnosticsBssid : public SubscribeAttribute {
+class SubscribeAttributeTestClusterListOctetString : public SubscribeAttribute {
 public:
-    SubscribeAttributeWiFiNetworkDiagnosticsBssid()
-        : SubscribeAttribute("bssid")
+    SubscribeAttributeTestClusterListOctetString()
+        : SubscribeAttribute("list-octet-string")
     {
     }
 
-    ~SubscribeAttributeWiFiNetworkDiagnosticsBssid() {}
+    ~SubscribeAttributeTestClusterListOctetString() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000001B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBssidWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeListOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WiFiNetworkDiagnostics.Bssid response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.ListOctetString response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -87929,29 +85179,27 @@ class SubscribeAttributeWiFiNetworkDiagnosticsBssid : public SubscribeAttribute
 };
 
 /*
- * Attribute SecurityType
+ * Attribute ListStructOctetString
  */
-class ReadWiFiNetworkDiagnosticsSecurityType : public ReadAttribute {
+class ReadTestClusterListStructOctetString : public ReadAttribute {
 public:
-    ReadWiFiNetworkDiagnosticsSecurityType()
-        : ReadAttribute("security-type")
+    ReadTestClusterListStructOctetString()
+        : ReadAttribute("list-struct-octet-string")
     {
     }
 
-    ~ReadWiFiNetworkDiagnosticsSecurityType() {}
+    ~ReadTestClusterListStructOctetString() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000001C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeSecurityTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WiFiNetworkDiagnostics.SecurityType response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeListStructOctetStringWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.ListStructOctetString response %@", [value description]);
             if (error != nil) {
-                LogNSError("WiFiNetworkDiagnostics SecurityType read Error", error);
+                LogNSError("TestCluster ListStructOctetString read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -87959,34 +85207,84 @@ class ReadWiFiNetworkDiagnosticsSecurityType : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWiFiNetworkDiagnosticsSecurityType : public SubscribeAttribute {
+class WriteTestClusterListStructOctetString : public WriteAttribute {
 public:
-    SubscribeAttributeWiFiNetworkDiagnosticsSecurityType()
-        : SubscribeAttribute("security-type")
+    WriteTestClusterListStructOctetString()
+        : WriteAttribute("list-struct-octet-string")
+        , mComplex(&mValue)
     {
+        AddArgument("attr-name", "list-struct-octet-string");
+        AddArgument("attr-value", &mComplex);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWiFiNetworkDiagnosticsSecurityType() {}
+    ~WriteTestClusterListStructOctetString() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000001C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mValue) {
+                CHIPTestClusterClusterTestListStructOctet * newElement_0;
+                newElement_0 = [CHIPTestClusterClusterTestListStructOctet new];
+                newElement_0.member1 = [NSNumber numberWithUnsignedLongLong:entry_0.member1];
+                newElement_0.member2 = [NSData dataWithBytes:entry_0.member2.data() length:entry_0.member2.size()];
+                [array_0 addObject:newElement_0];
+            }
+            value = array_0;
+        }
+
+        [cluster writeAttributeListStructOctetStringWithValue:value
+                                                       params:params
+                                            completionHandler:^(NSError * _Nullable error) {
+                                                if (error != nil) {
+                                                    LogNSError("TestCluster ListStructOctetString write Error", error);
+                                                }
+                                                SetCommandExitStatus(error);
+                                            }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::TestListStructOctet::Type> mValue;
+    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::TestListStructOctet::Type>>
+        mComplex;
+};
+
+class SubscribeAttributeTestClusterListStructOctetString : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterListStructOctetString()
+        : SubscribeAttribute("list-struct-octet-string")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterListStructOctetString() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000001C) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSecurityTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeListStructOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WiFiNetworkDiagnostics.SecurityType response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.ListStructOctetString response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -87997,29 +85295,27 @@ class SubscribeAttributeWiFiNetworkDiagnosticsSecurityType : public SubscribeAtt
 };
 
 /*
- * Attribute WiFiVersion
+ * Attribute LongOctetString
  */
-class ReadWiFiNetworkDiagnosticsWiFiVersion : public ReadAttribute {
+class ReadTestClusterLongOctetString : public ReadAttribute {
 public:
-    ReadWiFiNetworkDiagnosticsWiFiVersion()
-        : ReadAttribute("wi-fi-version")
+    ReadTestClusterLongOctetString()
+        : ReadAttribute("long-octet-string")
     {
     }
 
-    ~ReadWiFiNetworkDiagnosticsWiFiVersion() {}
+    ~ReadTestClusterLongOctetString() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000001D) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeWiFiVersionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WiFiNetworkDiagnostics.WiFiVersion response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeLongOctetStringWithCompletionHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.LongOctetString response %@", [value description]);
             if (error != nil) {
-                LogNSError("WiFiNetworkDiagnostics WiFiVersion read Error", error);
+                LogNSError("TestCluster LongOctetString read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -88027,102 +85323,70 @@ class ReadWiFiNetworkDiagnosticsWiFiVersion : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWiFiNetworkDiagnosticsWiFiVersion : public SubscribeAttribute {
+class WriteTestClusterLongOctetString : public WriteAttribute {
 public:
-    SubscribeAttributeWiFiNetworkDiagnosticsWiFiVersion()
-        : SubscribeAttribute("wi-fi-version")
+    WriteTestClusterLongOctetString()
+        : WriteAttribute("long-octet-string")
     {
+        AddArgument("attr-name", "long-octet-string");
+        AddArgument("attr-value", &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWiFiNetworkDiagnosticsWiFiVersion() {}
+    ~WriteTestClusterLongOctetString() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000001D) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeWiFiVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WiFiNetworkDiagnostics.WiFiVersion response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSData * _Nonnull value = [[NSData alloc] initWithBytes:mValue.data() length:mValue.size()];
 
+        [cluster writeAttributeLongOctetStringWithValue:value
+                                                 params:params
+                                      completionHandler:^(NSError * _Nullable error) {
+                                          if (error != nil) {
+                                              LogNSError("TestCluster LongOctetString write Error", error);
+                                          }
+                                          SetCommandExitStatus(error);
+                                      }];
         return CHIP_NO_ERROR;
     }
-};
-
-/*
- * Attribute ChannelNumber
- */
-class ReadWiFiNetworkDiagnosticsChannelNumber : public ReadAttribute {
-public:
-    ReadWiFiNetworkDiagnosticsChannelNumber()
-        : ReadAttribute("channel-number")
-    {
-    }
-
-    ~ReadWiFiNetworkDiagnosticsChannelNumber() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x00000003) on endpoint %u", endpointId);
 
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeChannelNumberWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WiFiNetworkDiagnostics.ChannelNumber response %@", [value description]);
-            if (error != nil) {
-                LogNSError("WiFiNetworkDiagnostics ChannelNumber read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
+private:
+    chip::ByteSpan mValue;
 };
 
-class SubscribeAttributeWiFiNetworkDiagnosticsChannelNumber : public SubscribeAttribute {
+class SubscribeAttributeTestClusterLongOctetString : public SubscribeAttribute {
 public:
-    SubscribeAttributeWiFiNetworkDiagnosticsChannelNumber()
-        : SubscribeAttribute("channel-number")
+    SubscribeAttributeTestClusterLongOctetString()
+        : SubscribeAttribute("long-octet-string")
     {
     }
 
-    ~SubscribeAttributeWiFiNetworkDiagnosticsChannelNumber() {}
+    ~SubscribeAttributeTestClusterLongOctetString() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000001D) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeChannelNumberWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeLongOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WiFiNetworkDiagnostics.ChannelNumber response %@", [value description]);
+            reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.LongOctetString response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -88133,29 +85397,27 @@ class SubscribeAttributeWiFiNetworkDiagnosticsChannelNumber : public SubscribeAt
 };
 
 /*
- * Attribute Rssi
+ * Attribute CharString
  */
-class ReadWiFiNetworkDiagnosticsRssi : public ReadAttribute {
+class ReadTestClusterCharString : public ReadAttribute {
 public:
-    ReadWiFiNetworkDiagnosticsRssi()
-        : ReadAttribute("rssi")
+    ReadTestClusterCharString()
+        : ReadAttribute("char-string")
     {
     }
 
-    ~ReadWiFiNetworkDiagnosticsRssi() {}
+    ~ReadTestClusterCharString() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000001E) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeRssiWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WiFiNetworkDiagnostics.Rssi response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeCharStringWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.CharString response %@", [value description]);
             if (error != nil) {
-                LogNSError("WiFiNetworkDiagnostics Rssi read Error", error);
+                LogNSError("TestCluster CharString read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -88163,34 +85425,72 @@ class ReadWiFiNetworkDiagnosticsRssi : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWiFiNetworkDiagnosticsRssi : public SubscribeAttribute {
+class WriteTestClusterCharString : public WriteAttribute {
 public:
-    SubscribeAttributeWiFiNetworkDiagnosticsRssi()
-        : SubscribeAttribute("rssi")
+    WriteTestClusterCharString()
+        : WriteAttribute("char-string")
     {
+        AddArgument("attr-name", "char-string");
+        AddArgument("attr-value", &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWiFiNetworkDiagnosticsRssi() {}
+    ~WriteTestClusterCharString() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000001E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSString * _Nonnull value = [[NSString alloc] initWithBytes:mValue.data()
+                                                             length:mValue.size()
+                                                           encoding:NSUTF8StringEncoding];
+
+        [cluster writeAttributeCharStringWithValue:value
+                                            params:params
+                                 completionHandler:^(NSError * _Nullable error) {
+                                     if (error != nil) {
+                                         LogNSError("TestCluster CharString write Error", error);
+                                     }
+                                     SetCommandExitStatus(error);
+                                 }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::ByteSpan mValue;
+};
+
+class SubscribeAttributeTestClusterCharString : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterCharString()
+        : SubscribeAttribute("char-string")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterCharString() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000001E) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeRssiWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeCharStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WiFiNetworkDiagnostics.Rssi response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.CharString response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -88201,29 +85501,27 @@ class SubscribeAttributeWiFiNetworkDiagnosticsRssi : public SubscribeAttribute {
 };
 
 /*
- * Attribute BeaconLostCount
+ * Attribute LongCharString
  */
-class ReadWiFiNetworkDiagnosticsBeaconLostCount : public ReadAttribute {
+class ReadTestClusterLongCharString : public ReadAttribute {
 public:
-    ReadWiFiNetworkDiagnosticsBeaconLostCount()
-        : ReadAttribute("beacon-lost-count")
+    ReadTestClusterLongCharString()
+        : ReadAttribute("long-char-string")
     {
     }
 
-    ~ReadWiFiNetworkDiagnosticsBeaconLostCount() {}
+    ~ReadTestClusterLongCharString() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000001F) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeBeaconLostCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WiFiNetworkDiagnostics.BeaconLostCount response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeLongCharStringWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.LongCharString response %@", [value description]);
             if (error != nil) {
-                LogNSError("WiFiNetworkDiagnostics BeaconLostCount read Error", error);
+                LogNSError("TestCluster LongCharString read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -88231,34 +85529,72 @@ class ReadWiFiNetworkDiagnosticsBeaconLostCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWiFiNetworkDiagnosticsBeaconLostCount : public SubscribeAttribute {
+class WriteTestClusterLongCharString : public WriteAttribute {
 public:
-    SubscribeAttributeWiFiNetworkDiagnosticsBeaconLostCount()
-        : SubscribeAttribute("beacon-lost-count")
+    WriteTestClusterLongCharString()
+        : WriteAttribute("long-char-string")
     {
+        AddArgument("attr-name", "long-char-string");
+        AddArgument("attr-value", &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWiFiNetworkDiagnosticsBeaconLostCount() {}
+    ~WriteTestClusterLongCharString() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000001F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSString * _Nonnull value = [[NSString alloc] initWithBytes:mValue.data()
+                                                             length:mValue.size()
+                                                           encoding:NSUTF8StringEncoding];
+
+        [cluster writeAttributeLongCharStringWithValue:value
+                                                params:params
+                                     completionHandler:^(NSError * _Nullable error) {
+                                         if (error != nil) {
+                                             LogNSError("TestCluster LongCharString write Error", error);
+                                         }
+                                         SetCommandExitStatus(error);
+                                     }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::ByteSpan mValue;
+};
+
+class SubscribeAttributeTestClusterLongCharString : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterLongCharString()
+        : SubscribeAttribute("long-char-string")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterLongCharString() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000001F) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBeaconLostCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeLongCharStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WiFiNetworkDiagnostics.BeaconLostCount response %@", [value description]);
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.LongCharString response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -88269,29 +85605,27 @@ class SubscribeAttributeWiFiNetworkDiagnosticsBeaconLostCount : public Subscribe
 };
 
 /*
- * Attribute BeaconRxCount
+ * Attribute EpochUs
  */
-class ReadWiFiNetworkDiagnosticsBeaconRxCount : public ReadAttribute {
+class ReadTestClusterEpochUs : public ReadAttribute {
 public:
-    ReadWiFiNetworkDiagnosticsBeaconRxCount()
-        : ReadAttribute("beacon-rx-count")
+    ReadTestClusterEpochUs()
+        : ReadAttribute("epoch-us")
     {
     }
 
-    ~ReadWiFiNetworkDiagnosticsBeaconRxCount() {}
+    ~ReadTestClusterEpochUs() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000020) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeBeaconRxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WiFiNetworkDiagnostics.BeaconRxCount response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeEpochUsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.EpochUs response %@", [value description]);
             if (error != nil) {
-                LogNSError("WiFiNetworkDiagnostics BeaconRxCount read Error", error);
+                LogNSError("TestCluster EpochUs read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -88299,34 +85633,70 @@ class ReadWiFiNetworkDiagnosticsBeaconRxCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWiFiNetworkDiagnosticsBeaconRxCount : public SubscribeAttribute {
+class WriteTestClusterEpochUs : public WriteAttribute {
 public:
-    SubscribeAttributeWiFiNetworkDiagnosticsBeaconRxCount()
-        : SubscribeAttribute("beacon-rx-count")
+    WriteTestClusterEpochUs()
+        : WriteAttribute("epoch-us")
     {
+        AddArgument("attr-name", "epoch-us");
+        AddArgument("attr-value", 0, UINT64_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWiFiNetworkDiagnosticsBeaconRxCount() {}
+    ~WriteTestClusterEpochUs() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000020) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedLongLong:mValue];
+
+        [cluster writeAttributeEpochUsWithValue:value
+                                         params:params
+                              completionHandler:^(NSError * _Nullable error) {
+                                  if (error != nil) {
+                                      LogNSError("TestCluster EpochUs write Error", error);
+                                  }
+                                  SetCommandExitStatus(error);
+                              }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint64_t mValue;
+};
+
+class SubscribeAttributeTestClusterEpochUs : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterEpochUs()
+        : SubscribeAttribute("epoch-us")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterEpochUs() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000020) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeBeaconRxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeEpochUsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WiFiNetworkDiagnostics.BeaconRxCount response %@", [value description]);
+                NSLog(@"TestCluster.EpochUs response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -88337,29 +85707,27 @@ class SubscribeAttributeWiFiNetworkDiagnosticsBeaconRxCount : public SubscribeAt
 };
 
 /*
- * Attribute PacketMulticastRxCount
+ * Attribute EpochS
  */
-class ReadWiFiNetworkDiagnosticsPacketMulticastRxCount : public ReadAttribute {
+class ReadTestClusterEpochS : public ReadAttribute {
 public:
-    ReadWiFiNetworkDiagnosticsPacketMulticastRxCount()
-        : ReadAttribute("packet-multicast-rx-count")
+    ReadTestClusterEpochS()
+        : ReadAttribute("epoch-s")
     {
     }
 
-    ~ReadWiFiNetworkDiagnosticsPacketMulticastRxCount() {}
+    ~ReadTestClusterEpochS() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000021) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributePacketMulticastRxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WiFiNetworkDiagnostics.PacketMulticastRxCount response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeEpochSWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.EpochS response %@", [value description]);
             if (error != nil) {
-                LogNSError("WiFiNetworkDiagnostics PacketMulticastRxCount read Error", error);
+                LogNSError("TestCluster EpochS read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -88367,34 +85735,70 @@ class ReadWiFiNetworkDiagnosticsPacketMulticastRxCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastRxCount : public SubscribeAttribute {
+class WriteTestClusterEpochS : public WriteAttribute {
 public:
-    SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastRxCount()
-        : SubscribeAttribute("packet-multicast-rx-count")
+    WriteTestClusterEpochS()
+        : WriteAttribute("epoch-s")
     {
+        AddArgument("attr-name", "epoch-s");
+        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastRxCount() {}
+    ~WriteTestClusterEpochS() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000021) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue];
+
+        [cluster writeAttributeEpochSWithValue:value
+                                        params:params
+                             completionHandler:^(NSError * _Nullable error) {
+                                 if (error != nil) {
+                                     LogNSError("TestCluster EpochS write Error", error);
+                                 }
+                                 SetCommandExitStatus(error);
+                             }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint32_t mValue;
+};
+
+class SubscribeAttributeTestClusterEpochS : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterEpochS()
+        : SubscribeAttribute("epoch-s")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterEpochS() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000021) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePacketMulticastRxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeEpochSWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WiFiNetworkDiagnostics.PacketMulticastRxCount response %@", [value description]);
+                NSLog(@"TestCluster.EpochS response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -88405,29 +85809,27 @@ class SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastRxCount : public Su
 };
 
 /*
- * Attribute PacketMulticastTxCount
+ * Attribute VendorId
  */
-class ReadWiFiNetworkDiagnosticsPacketMulticastTxCount : public ReadAttribute {
+class ReadTestClusterVendorId : public ReadAttribute {
 public:
-    ReadWiFiNetworkDiagnosticsPacketMulticastTxCount()
-        : ReadAttribute("packet-multicast-tx-count")
+    ReadTestClusterVendorId()
+        : ReadAttribute("vendor-id")
     {
     }
 
-    ~ReadWiFiNetworkDiagnosticsPacketMulticastTxCount() {}
+    ~ReadTestClusterVendorId() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000022) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributePacketMulticastTxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WiFiNetworkDiagnostics.PacketMulticastTxCount response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeVendorIdWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.VendorId response %@", [value description]);
             if (error != nil) {
-                LogNSError("WiFiNetworkDiagnostics PacketMulticastTxCount read Error", error);
+                LogNSError("TestCluster VendorId read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -88435,34 +85837,70 @@ class ReadWiFiNetworkDiagnosticsPacketMulticastTxCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastTxCount : public SubscribeAttribute {
+class WriteTestClusterVendorId : public WriteAttribute {
 public:
-    SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastTxCount()
-        : SubscribeAttribute("packet-multicast-tx-count")
+    WriteTestClusterVendorId()
+        : WriteAttribute("vendor-id")
     {
+        AddArgument("attr-name", "vendor-id");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastTxCount() {}
+    ~WriteTestClusterVendorId() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000022) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster writeAttributeVendorIdWithValue:value
+                                          params:params
+                               completionHandler:^(NSError * _Nullable error) {
+                                   if (error != nil) {
+                                       LogNSError("TestCluster VendorId write Error", error);
+                                   }
+                                   SetCommandExitStatus(error);
+                               }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::VendorId mValue;
+};
+
+class SubscribeAttributeTestClusterVendorId : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterVendorId()
+        : SubscribeAttribute("vendor-id")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterVendorId() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000022) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePacketMulticastTxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeVendorIdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WiFiNetworkDiagnostics.PacketMulticastTxCount response %@", [value description]);
+                NSLog(@"TestCluster.VendorId response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -88473,29 +85911,28 @@ class SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastTxCount : public Su
 };
 
 /*
- * Attribute PacketUnicastRxCount
+ * Attribute ListNullablesAndOptionalsStruct
  */
-class ReadWiFiNetworkDiagnosticsPacketUnicastRxCount : public ReadAttribute {
+class ReadTestClusterListNullablesAndOptionalsStruct : public ReadAttribute {
 public:
-    ReadWiFiNetworkDiagnosticsPacketUnicastRxCount()
-        : ReadAttribute("packet-unicast-rx-count")
+    ReadTestClusterListNullablesAndOptionalsStruct()
+        : ReadAttribute("list-nullables-and-optionals-struct")
     {
     }
 
-    ~ReadWiFiNetworkDiagnosticsPacketUnicastRxCount() {}
+    ~ReadTestClusterListNullablesAndOptionalsStruct() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000023) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributePacketUnicastRxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WiFiNetworkDiagnostics.PacketUnicastRxCount response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeListNullablesAndOptionalsStructWithCompletionHandler:^(
+            NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.ListNullablesAndOptionalsStruct response %@", [value description]);
             if (error != nil) {
-                LogNSError("WiFiNetworkDiagnostics PacketUnicastRxCount read Error", error);
+                LogNSError("TestCluster ListNullablesAndOptionalsStruct read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -88503,102 +85940,235 @@ class ReadWiFiNetworkDiagnosticsPacketUnicastRxCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastRxCount : public SubscribeAttribute {
+class WriteTestClusterListNullablesAndOptionalsStruct : public WriteAttribute {
 public:
-    SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastRxCount()
-        : SubscribeAttribute("packet-unicast-rx-count")
+    WriteTestClusterListNullablesAndOptionalsStruct()
+        : WriteAttribute("list-nullables-and-optionals-struct")
+        , mComplex(&mValue)
     {
+        AddArgument("attr-name", "list-nullables-and-optionals-struct");
+        AddArgument("attr-value", &mComplex);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastRxCount() {}
+    ~WriteTestClusterListNullablesAndOptionalsStruct() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000023) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePacketUnicastRxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WiFiNetworkDiagnostics.PacketUnicastRxCount response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mValue) {
+                CHIPTestClusterClusterNullablesAndOptionalsStruct * newElement_0;
+                newElement_0 = [CHIPTestClusterClusterNullablesAndOptionalsStruct new];
+                if (entry_0.nullableInt.IsNull()) {
+                    newElement_0.nullableInt = nil;
+                } else {
+                    newElement_0.nullableInt = [NSNumber numberWithUnsignedShort:entry_0.nullableInt.Value()];
                 }
-            }];
+                if (entry_0.optionalInt.HasValue()) {
+                    newElement_0.optionalInt = [NSNumber numberWithUnsignedShort:entry_0.optionalInt.Value()];
+                } else {
+                    newElement_0.optionalInt = nil;
+                }
+                if (entry_0.nullableOptionalInt.HasValue()) {
+                    if (entry_0.nullableOptionalInt.Value().IsNull()) {
+                        newElement_0.nullableOptionalInt = nil;
+                    } else {
+                        newElement_0.nullableOptionalInt =
+                            [NSNumber numberWithUnsignedShort:entry_0.nullableOptionalInt.Value().Value()];
+                    }
+                } else {
+                    newElement_0.nullableOptionalInt = nil;
+                }
+                if (entry_0.nullableString.IsNull()) {
+                    newElement_0.nullableString = nil;
+                } else {
+                    newElement_0.nullableString = [[NSString alloc] initWithBytes:entry_0.nullableString.Value().data()
+                                                                           length:entry_0.nullableString.Value().size()
+                                                                         encoding:NSUTF8StringEncoding];
+                }
+                if (entry_0.optionalString.HasValue()) {
+                    newElement_0.optionalString = [[NSString alloc] initWithBytes:entry_0.optionalString.Value().data()
+                                                                           length:entry_0.optionalString.Value().size()
+                                                                         encoding:NSUTF8StringEncoding];
+                } else {
+                    newElement_0.optionalString = nil;
+                }
+                if (entry_0.nullableOptionalString.HasValue()) {
+                    if (entry_0.nullableOptionalString.Value().IsNull()) {
+                        newElement_0.nullableOptionalString = nil;
+                    } else {
+                        newElement_0.nullableOptionalString =
+                            [[NSString alloc] initWithBytes:entry_0.nullableOptionalString.Value().Value().data()
+                                                     length:entry_0.nullableOptionalString.Value().Value().size()
+                                                   encoding:NSUTF8StringEncoding];
+                    }
+                } else {
+                    newElement_0.nullableOptionalString = nil;
+                }
+                if (entry_0.nullableStruct.IsNull()) {
+                    newElement_0.nullableStruct = nil;
+                } else {
+                    newElement_0.nullableStruct = [CHIPTestClusterClusterSimpleStruct new];
+                    newElement_0.nullableStruct.a = [NSNumber numberWithUnsignedChar:entry_0.nullableStruct.Value().a];
+                    newElement_0.nullableStruct.b = [NSNumber numberWithBool:entry_0.nullableStruct.Value().b];
+                    newElement_0.nullableStruct.c =
+                        [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.nullableStruct.Value().c)];
+                    newElement_0.nullableStruct.d = [NSData dataWithBytes:entry_0.nullableStruct.Value().d.data()
+                                                                   length:entry_0.nullableStruct.Value().d.size()];
+                    newElement_0.nullableStruct.e = [[NSString alloc] initWithBytes:entry_0.nullableStruct.Value().e.data()
+                                                                             length:entry_0.nullableStruct.Value().e.size()
+                                                                           encoding:NSUTF8StringEncoding];
+                    newElement_0.nullableStruct.f = [NSNumber numberWithUnsignedChar:entry_0.nullableStruct.Value().f.Raw()];
+                    newElement_0.nullableStruct.g = [NSNumber numberWithFloat:entry_0.nullableStruct.Value().g];
+                    newElement_0.nullableStruct.h = [NSNumber numberWithDouble:entry_0.nullableStruct.Value().h];
+                }
+                if (entry_0.optionalStruct.HasValue()) {
+                    newElement_0.optionalStruct = [CHIPTestClusterClusterSimpleStruct new];
+                    newElement_0.optionalStruct.a = [NSNumber numberWithUnsignedChar:entry_0.optionalStruct.Value().a];
+                    newElement_0.optionalStruct.b = [NSNumber numberWithBool:entry_0.optionalStruct.Value().b];
+                    newElement_0.optionalStruct.c =
+                        [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.optionalStruct.Value().c)];
+                    newElement_0.optionalStruct.d = [NSData dataWithBytes:entry_0.optionalStruct.Value().d.data()
+                                                                   length:entry_0.optionalStruct.Value().d.size()];
+                    newElement_0.optionalStruct.e = [[NSString alloc] initWithBytes:entry_0.optionalStruct.Value().e.data()
+                                                                             length:entry_0.optionalStruct.Value().e.size()
+                                                                           encoding:NSUTF8StringEncoding];
+                    newElement_0.optionalStruct.f = [NSNumber numberWithUnsignedChar:entry_0.optionalStruct.Value().f.Raw()];
+                    newElement_0.optionalStruct.g = [NSNumber numberWithFloat:entry_0.optionalStruct.Value().g];
+                    newElement_0.optionalStruct.h = [NSNumber numberWithDouble:entry_0.optionalStruct.Value().h];
+                } else {
+                    newElement_0.optionalStruct = nil;
+                }
+                if (entry_0.nullableOptionalStruct.HasValue()) {
+                    if (entry_0.nullableOptionalStruct.Value().IsNull()) {
+                        newElement_0.nullableOptionalStruct = nil;
+                    } else {
+                        newElement_0.nullableOptionalStruct = [CHIPTestClusterClusterSimpleStruct new];
+                        newElement_0.nullableOptionalStruct.a =
+                            [NSNumber numberWithUnsignedChar:entry_0.nullableOptionalStruct.Value().Value().a];
+                        newElement_0.nullableOptionalStruct.b =
+                            [NSNumber numberWithBool:entry_0.nullableOptionalStruct.Value().Value().b];
+                        newElement_0.nullableOptionalStruct.c =
+                            [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.nullableOptionalStruct.Value().Value().c)];
+                        newElement_0.nullableOptionalStruct.d =
+                            [NSData dataWithBytes:entry_0.nullableOptionalStruct.Value().Value().d.data()
+                                           length:entry_0.nullableOptionalStruct.Value().Value().d.size()];
+                        newElement_0.nullableOptionalStruct.e =
+                            [[NSString alloc] initWithBytes:entry_0.nullableOptionalStruct.Value().Value().e.data()
+                                                     length:entry_0.nullableOptionalStruct.Value().Value().e.size()
+                                                   encoding:NSUTF8StringEncoding];
+                        newElement_0.nullableOptionalStruct.f =
+                            [NSNumber numberWithUnsignedChar:entry_0.nullableOptionalStruct.Value().Value().f.Raw()];
+                        newElement_0.nullableOptionalStruct.g =
+                            [NSNumber numberWithFloat:entry_0.nullableOptionalStruct.Value().Value().g];
+                        newElement_0.nullableOptionalStruct.h =
+                            [NSNumber numberWithDouble:entry_0.nullableOptionalStruct.Value().Value().h];
+                    }
+                } else {
+                    newElement_0.nullableOptionalStruct = nil;
+                }
+                if (entry_0.nullableList.IsNull()) {
+                    newElement_0.nullableList = nil;
+                } else {
+                    { // Scope for our temporary variables
+                        auto * array_3 = [NSMutableArray new];
+                        for (auto & entry_3 : entry_0.nullableList.Value()) {
+                            NSNumber * newElement_3;
+                            newElement_3 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_3)];
+                            [array_3 addObject:newElement_3];
+                        }
+                        newElement_0.nullableList = array_3;
+                    }
+                }
+                if (entry_0.optionalList.HasValue()) {
+                    { // Scope for our temporary variables
+                        auto * array_3 = [NSMutableArray new];
+                        for (auto & entry_3 : entry_0.optionalList.Value()) {
+                            NSNumber * newElement_3;
+                            newElement_3 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_3)];
+                            [array_3 addObject:newElement_3];
+                        }
+                        newElement_0.optionalList = array_3;
+                    }
+                } else {
+                    newElement_0.optionalList = nil;
+                }
+                if (entry_0.nullableOptionalList.HasValue()) {
+                    if (entry_0.nullableOptionalList.Value().IsNull()) {
+                        newElement_0.nullableOptionalList = nil;
+                    } else {
+                        { // Scope for our temporary variables
+                            auto * array_4 = [NSMutableArray new];
+                            for (auto & entry_4 : entry_0.nullableOptionalList.Value().Value()) {
+                                NSNumber * newElement_4;
+                                newElement_4 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_4)];
+                                [array_4 addObject:newElement_4];
+                            }
+                            newElement_0.nullableOptionalList = array_4;
+                        }
+                    }
+                } else {
+                    newElement_0.nullableOptionalList = nil;
+                }
+                [array_0 addObject:newElement_0];
+            }
+            value = array_0;
+        }
 
+        [cluster writeAttributeListNullablesAndOptionalsStructWithValue:value
+                                                                 params:params
+                                                      completionHandler:^(NSError * _Nullable error) {
+                                                          if (error != nil) {
+                                                              LogNSError(
+                                                                  "TestCluster ListNullablesAndOptionalsStruct write Error", error);
+                                                          }
+                                                          SetCommandExitStatus(error);
+                                                      }];
         return CHIP_NO_ERROR;
     }
-};
-
-/*
- * Attribute PacketUnicastTxCount
- */
-class ReadWiFiNetworkDiagnosticsPacketUnicastTxCount : public ReadAttribute {
-public:
-    ReadWiFiNetworkDiagnosticsPacketUnicastTxCount()
-        : ReadAttribute("packet-unicast-tx-count")
-    {
-    }
-
-    ~ReadWiFiNetworkDiagnosticsPacketUnicastTxCount() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x0000000A) on endpoint %u", endpointId);
 
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributePacketUnicastTxCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WiFiNetworkDiagnostics.PacketUnicastTxCount response %@", [value description]);
-            if (error != nil) {
-                LogNSError("WiFiNetworkDiagnostics PacketUnicastTxCount read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
+private:
+    chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::Type> mValue;
+    TypedComplexArgument<
+        chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::Type>>
+        mComplex;
 };
 
-class SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastTxCount : public SubscribeAttribute {
+class SubscribeAttributeTestClusterListNullablesAndOptionalsStruct : public SubscribeAttribute {
 public:
-    SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastTxCount()
-        : SubscribeAttribute("packet-unicast-tx-count")
+    SubscribeAttributeTestClusterListNullablesAndOptionalsStruct()
+        : SubscribeAttribute("list-nullables-and-optionals-struct")
     {
     }
 
-    ~SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastTxCount() {}
+    ~SubscribeAttributeTestClusterListNullablesAndOptionalsStruct() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x0000000A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000023) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePacketUnicastTxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeListNullablesAndOptionalsStructWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WiFiNetworkDiagnostics.PacketUnicastTxCount response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.ListNullablesAndOptionalsStruct response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -88609,29 +86179,27 @@ class SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastTxCount : public Subs
 };
 
 /*
- * Attribute CurrentMaxRate
+ * Attribute EnumAttr
  */
-class ReadWiFiNetworkDiagnosticsCurrentMaxRate : public ReadAttribute {
+class ReadTestClusterEnumAttr : public ReadAttribute {
 public:
-    ReadWiFiNetworkDiagnosticsCurrentMaxRate()
-        : ReadAttribute("current-max-rate")
+    ReadTestClusterEnumAttr()
+        : ReadAttribute("enum-attr")
     {
     }
 
-    ~ReadWiFiNetworkDiagnosticsCurrentMaxRate() {}
+    ~ReadTestClusterEnumAttr() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x0000000B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000024) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeCurrentMaxRateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WiFiNetworkDiagnostics.CurrentMaxRate response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeEnumAttrWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.EnumAttr response %@", [value description]);
             if (error != nil) {
-                LogNSError("WiFiNetworkDiagnostics CurrentMaxRate read Error", error);
+                LogNSError("TestCluster EnumAttr read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -88639,34 +86207,70 @@ class ReadWiFiNetworkDiagnosticsCurrentMaxRate : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWiFiNetworkDiagnosticsCurrentMaxRate : public SubscribeAttribute {
+class WriteTestClusterEnumAttr : public WriteAttribute {
 public:
-    SubscribeAttributeWiFiNetworkDiagnosticsCurrentMaxRate()
-        : SubscribeAttribute("current-max-rate")
+    WriteTestClusterEnumAttr()
+        : WriteAttribute("enum-attr")
     {
+        AddArgument("attr-name", "enum-attr");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWiFiNetworkDiagnosticsCurrentMaxRate() {}
+    ~WriteTestClusterEnumAttr() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x0000000B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000024) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeEnumAttrWithValue:value
+                                          params:params
+                               completionHandler:^(NSError * _Nullable error) {
+                                   if (error != nil) {
+                                       LogNSError("TestCluster EnumAttr write Error", error);
+                                   }
+                                   SetCommandExitStatus(error);
+                               }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeTestClusterEnumAttr : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterEnumAttr()
+        : SubscribeAttribute("enum-attr")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterEnumAttr() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000024) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentMaxRateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeEnumAttrWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WiFiNetworkDiagnostics.CurrentMaxRate response %@", [value description]);
+                NSLog(@"TestCluster.EnumAttr response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -88677,29 +86281,28 @@ class SubscribeAttributeWiFiNetworkDiagnosticsCurrentMaxRate : public SubscribeA
 };
 
 /*
- * Attribute OverrunCount
+ * Attribute StructAttr
  */
-class ReadWiFiNetworkDiagnosticsOverrunCount : public ReadAttribute {
+class ReadTestClusterStructAttr : public ReadAttribute {
 public:
-    ReadWiFiNetworkDiagnosticsOverrunCount()
-        : ReadAttribute("overrun-count")
+    ReadTestClusterStructAttr()
+        : ReadAttribute("struct-attr")
     {
     }
 
-    ~ReadWiFiNetworkDiagnosticsOverrunCount() {}
+    ~ReadTestClusterStructAttr() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x0000000C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000025) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeOverrunCountWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WiFiNetworkDiagnostics.OverrunCount response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeStructAttrWithCompletionHandler:^(
+            CHIPTestClusterClusterSimpleStruct * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.StructAttr response %@", [value description]);
             if (error != nil) {
-                LogNSError("WiFiNetworkDiagnostics OverrunCount read Error", error);
+                LogNSError("TestCluster StructAttr read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -88707,34 +86310,81 @@ class ReadWiFiNetworkDiagnosticsOverrunCount : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWiFiNetworkDiagnosticsOverrunCount : public SubscribeAttribute {
+class WriteTestClusterStructAttr : public WriteAttribute {
 public:
-    SubscribeAttributeWiFiNetworkDiagnosticsOverrunCount()
-        : SubscribeAttribute("overrun-count")
+    WriteTestClusterStructAttr()
+        : WriteAttribute("struct-attr")
+        , mComplex(&mValue)
     {
+        AddArgument("attr-name", "struct-attr");
+        AddArgument("attr-value", &mComplex);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWiFiNetworkDiagnosticsOverrunCount() {}
+    ~WriteTestClusterStructAttr() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x0000000C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000025) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        CHIPTestClusterClusterSimpleStruct * _Nonnull value;
+        value = [CHIPTestClusterClusterSimpleStruct new];
+        value.a = [NSNumber numberWithUnsignedChar:mValue.a];
+        value.b = [NSNumber numberWithBool:mValue.b];
+        value.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(mValue.c)];
+        value.d = [NSData dataWithBytes:mValue.d.data() length:mValue.d.size()];
+        value.e = [[NSString alloc] initWithBytes:mValue.e.data() length:mValue.e.size() encoding:NSUTF8StringEncoding];
+        value.f = [NSNumber numberWithUnsignedChar:mValue.f.Raw()];
+        value.g = [NSNumber numberWithFloat:mValue.g];
+        value.h = [NSNumber numberWithDouble:mValue.h];
+
+        [cluster writeAttributeStructAttrWithValue:value
+                                            params:params
+                                 completionHandler:^(NSError * _Nullable error) {
+                                     if (error != nil) {
+                                         LogNSError("TestCluster StructAttr write Error", error);
+                                     }
+                                     SetCommandExitStatus(error);
+                                 }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type mValue;
+    TypedComplexArgument<chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type> mComplex;
+};
+
+class SubscribeAttributeTestClusterStructAttr : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterStructAttr()
+        : SubscribeAttribute("struct-attr")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterStructAttr() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000025) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOverrunCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeStructAttrWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WiFiNetworkDiagnostics.OverrunCount response %@", [value description]);
+            reportHandler:^(CHIPTestClusterClusterSimpleStruct * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.StructAttr response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -88745,29 +86395,27 @@ class SubscribeAttributeWiFiNetworkDiagnosticsOverrunCount : public SubscribeAtt
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute RangeRestrictedInt8u
  */
-class ReadWiFiNetworkDiagnosticsGeneratedCommandList : public ReadAttribute {
+class ReadTestClusterRangeRestrictedInt8u : public ReadAttribute {
 public:
-    ReadWiFiNetworkDiagnosticsGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadTestClusterRangeRestrictedInt8u()
+        : ReadAttribute("range-restricted-int8u")
     {
     }
 
-    ~ReadWiFiNetworkDiagnosticsGeneratedCommandList() {}
+    ~ReadTestClusterRangeRestrictedInt8u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000026) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WiFiNetworkDiagnostics.GeneratedCommandList response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeRangeRestrictedInt8uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.RangeRestrictedInt8u response %@", [value description]);
             if (error != nil) {
-                LogNSError("WiFiNetworkDiagnostics GeneratedCommandList read Error", error);
+                LogNSError("TestCluster RangeRestrictedInt8u read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -88775,34 +86423,70 @@ class ReadWiFiNetworkDiagnosticsGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWiFiNetworkDiagnosticsGeneratedCommandList : public SubscribeAttribute {
+class WriteTestClusterRangeRestrictedInt8u : public WriteAttribute {
 public:
-    SubscribeAttributeWiFiNetworkDiagnosticsGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    WriteTestClusterRangeRestrictedInt8u()
+        : WriteAttribute("range-restricted-int8u")
     {
+        AddArgument("attr-name", "range-restricted-int8u");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWiFiNetworkDiagnosticsGeneratedCommandList() {}
+    ~WriteTestClusterRangeRestrictedInt8u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000026) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeRangeRestrictedInt8uWithValue:value
+                                                      params:params
+                                           completionHandler:^(NSError * _Nullable error) {
+                                               if (error != nil) {
+                                                   LogNSError("TestCluster RangeRestrictedInt8u write Error", error);
+                                               }
+                                               SetCommandExitStatus(error);
+                                           }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeTestClusterRangeRestrictedInt8u : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterRangeRestrictedInt8u()
+        : SubscribeAttribute("range-restricted-int8u")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterRangeRestrictedInt8u() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000026) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRangeRestrictedInt8uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WiFiNetworkDiagnostics.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.RangeRestrictedInt8u response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -88813,29 +86497,27 @@ class SubscribeAttributeWiFiNetworkDiagnosticsGeneratedCommandList : public Subs
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute RangeRestrictedInt8s
  */
-class ReadWiFiNetworkDiagnosticsAcceptedCommandList : public ReadAttribute {
+class ReadTestClusterRangeRestrictedInt8s : public ReadAttribute {
 public:
-    ReadWiFiNetworkDiagnosticsAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadTestClusterRangeRestrictedInt8s()
+        : ReadAttribute("range-restricted-int8s")
     {
     }
 
-    ~ReadWiFiNetworkDiagnosticsAcceptedCommandList() {}
+    ~ReadTestClusterRangeRestrictedInt8s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000027) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WiFiNetworkDiagnostics.AcceptedCommandList response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeRangeRestrictedInt8sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.RangeRestrictedInt8s response %@", [value description]);
             if (error != nil) {
-                LogNSError("WiFiNetworkDiagnostics AcceptedCommandList read Error", error);
+                LogNSError("TestCluster RangeRestrictedInt8s read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -88843,34 +86525,70 @@ class ReadWiFiNetworkDiagnosticsAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWiFiNetworkDiagnosticsAcceptedCommandList : public SubscribeAttribute {
+class WriteTestClusterRangeRestrictedInt8s : public WriteAttribute {
 public:
-    SubscribeAttributeWiFiNetworkDiagnosticsAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    WriteTestClusterRangeRestrictedInt8s()
+        : WriteAttribute("range-restricted-int8s")
     {
+        AddArgument("attr-name", "range-restricted-int8s");
+        AddArgument("attr-value", INT8_MIN, INT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWiFiNetworkDiagnosticsAcceptedCommandList() {}
+    ~WriteTestClusterRangeRestrictedInt8s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000027) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithChar:mValue];
+
+        [cluster writeAttributeRangeRestrictedInt8sWithValue:value
+                                                      params:params
+                                           completionHandler:^(NSError * _Nullable error) {
+                                               if (error != nil) {
+                                                   LogNSError("TestCluster RangeRestrictedInt8s write Error", error);
+                                               }
+                                               SetCommandExitStatus(error);
+                                           }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    int8_t mValue;
+};
+
+class SubscribeAttributeTestClusterRangeRestrictedInt8s : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterRangeRestrictedInt8s()
+        : SubscribeAttribute("range-restricted-int8s")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterRangeRestrictedInt8s() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000027) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRangeRestrictedInt8sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WiFiNetworkDiagnostics.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.RangeRestrictedInt8s response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -88881,29 +86599,27 @@ class SubscribeAttributeWiFiNetworkDiagnosticsAcceptedCommandList : public Subsc
 };
 
 /*
- * Attribute AttributeList
+ * Attribute RangeRestrictedInt16u
  */
-class ReadWiFiNetworkDiagnosticsAttributeList : public ReadAttribute {
+class ReadTestClusterRangeRestrictedInt16u : public ReadAttribute {
 public:
-    ReadWiFiNetworkDiagnosticsAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadTestClusterRangeRestrictedInt16u()
+        : ReadAttribute("range-restricted-int16u")
     {
     }
 
-    ~ReadWiFiNetworkDiagnosticsAttributeList() {}
+    ~ReadTestClusterRangeRestrictedInt16u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000028) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WiFiNetworkDiagnostics.AttributeList response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeRangeRestrictedInt16uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.RangeRestrictedInt16u response %@", [value description]);
             if (error != nil) {
-                LogNSError("WiFiNetworkDiagnostics AttributeList read Error", error);
+                LogNSError("TestCluster RangeRestrictedInt16u read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -88911,34 +86627,70 @@ class ReadWiFiNetworkDiagnosticsAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWiFiNetworkDiagnosticsAttributeList : public SubscribeAttribute {
+class WriteTestClusterRangeRestrictedInt16u : public WriteAttribute {
 public:
-    SubscribeAttributeWiFiNetworkDiagnosticsAttributeList()
-        : SubscribeAttribute("attribute-list")
+    WriteTestClusterRangeRestrictedInt16u()
+        : WriteAttribute("range-restricted-int16u")
     {
+        AddArgument("attr-name", "range-restricted-int16u");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWiFiNetworkDiagnosticsAttributeList() {}
+    ~WriteTestClusterRangeRestrictedInt16u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000028) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster writeAttributeRangeRestrictedInt16uWithValue:value
+                                                       params:params
+                                            completionHandler:^(NSError * _Nullable error) {
+                                                if (error != nil) {
+                                                    LogNSError("TestCluster RangeRestrictedInt16u write Error", error);
+                                                }
+                                                SetCommandExitStatus(error);
+                                            }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeTestClusterRangeRestrictedInt16u : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterRangeRestrictedInt16u()
+        : SubscribeAttribute("range-restricted-int16u")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterRangeRestrictedInt16u() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000028) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRangeRestrictedInt16uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WiFiNetworkDiagnostics.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.RangeRestrictedInt16u response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -88949,29 +86701,27 @@ class SubscribeAttributeWiFiNetworkDiagnosticsAttributeList : public SubscribeAt
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute RangeRestrictedInt16s
  */
-class ReadWiFiNetworkDiagnosticsFeatureMap : public ReadAttribute {
+class ReadTestClusterRangeRestrictedInt16s : public ReadAttribute {
 public:
-    ReadWiFiNetworkDiagnosticsFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadTestClusterRangeRestrictedInt16s()
+        : ReadAttribute("range-restricted-int16s")
     {
     }
 
-    ~ReadWiFiNetworkDiagnosticsFeatureMap() {}
+    ~ReadTestClusterRangeRestrictedInt16s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000029) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WiFiNetworkDiagnostics.FeatureMap response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeRangeRestrictedInt16sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.RangeRestrictedInt16s response %@", [value description]);
             if (error != nil) {
-                LogNSError("WiFiNetworkDiagnostics FeatureMap read Error", error);
+                LogNSError("TestCluster RangeRestrictedInt16s read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -88979,34 +86729,70 @@ class ReadWiFiNetworkDiagnosticsFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWiFiNetworkDiagnosticsFeatureMap : public SubscribeAttribute {
+class WriteTestClusterRangeRestrictedInt16s : public WriteAttribute {
 public:
-    SubscribeAttributeWiFiNetworkDiagnosticsFeatureMap()
-        : SubscribeAttribute("feature-map")
+    WriteTestClusterRangeRestrictedInt16s()
+        : WriteAttribute("range-restricted-int16s")
     {
+        AddArgument("attr-name", "range-restricted-int16s");
+        AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWiFiNetworkDiagnosticsFeatureMap() {}
+    ~WriteTestClusterRangeRestrictedInt16s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000029) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue];
+
+        [cluster writeAttributeRangeRestrictedInt16sWithValue:value
+                                                       params:params
+                                            completionHandler:^(NSError * _Nullable error) {
+                                                if (error != nil) {
+                                                    LogNSError("TestCluster RangeRestrictedInt16s write Error", error);
+                                                }
+                                                SetCommandExitStatus(error);
+                                            }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    int16_t mValue;
+};
+
+class SubscribeAttributeTestClusterRangeRestrictedInt16s : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterRangeRestrictedInt16s()
+        : SubscribeAttribute("range-restricted-int16s")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterRangeRestrictedInt16s() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000029) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeRangeRestrictedInt16sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WiFiNetworkDiagnostics.FeatureMap response %@", [value description]);
+                NSLog(@"TestCluster.RangeRestrictedInt16s response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -89017,29 +86803,27 @@ class SubscribeAttributeWiFiNetworkDiagnosticsFeatureMap : public SubscribeAttri
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute ListLongOctetString
  */
-class ReadWiFiNetworkDiagnosticsClusterRevision : public ReadAttribute {
+class ReadTestClusterListLongOctetString : public ReadAttribute {
 public:
-    ReadWiFiNetworkDiagnosticsClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadTestClusterListLongOctetString()
+        : ReadAttribute("list-long-octet-string")
     {
     }
 
-    ~ReadWiFiNetworkDiagnosticsClusterRevision() {}
+    ~ReadTestClusterListLongOctetString() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000002A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WiFiNetworkDiagnostics.ClusterRevision response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeListLongOctetStringWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.ListLongOctetString response %@", [value description]);
             if (error != nil) {
-                LogNSError("WiFiNetworkDiagnostics ClusterRevision read Error", error);
+                LogNSError("TestCluster ListLongOctetString read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -89047,34 +86831,81 @@ class ReadWiFiNetworkDiagnosticsClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWiFiNetworkDiagnosticsClusterRevision : public SubscribeAttribute {
+class WriteTestClusterListLongOctetString : public WriteAttribute {
 public:
-    SubscribeAttributeWiFiNetworkDiagnosticsClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    WriteTestClusterListLongOctetString()
+        : WriteAttribute("list-long-octet-string")
+        , mComplex(&mValue)
     {
+        AddArgument("attr-name", "list-long-octet-string");
+        AddArgument("attr-value", &mComplex);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWiFiNetworkDiagnosticsClusterRevision() {}
+    ~WriteTestClusterListLongOctetString() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000036) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000002A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWiFiNetworkDiagnostics * cluster = [[CHIPWiFiNetworkDiagnostics alloc] initWithDevice:device
-                                                                                         endpoint:endpointId
-                                                                                            queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mValue) {
+                NSData * newElement_0;
+                newElement_0 = [NSData dataWithBytes:entry_0.data() length:entry_0.size()];
+                [array_0 addObject:newElement_0];
+            }
+            value = array_0;
+        }
+
+        [cluster writeAttributeListLongOctetStringWithValue:value
+                                                     params:params
+                                          completionHandler:^(NSError * _Nullable error) {
+                                              if (error != nil) {
+                                                  LogNSError("TestCluster ListLongOctetString write Error", error);
+                                              }
+                                              SetCommandExitStatus(error);
+                                          }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::DataModel::List<const chip::ByteSpan> mValue;
+    TypedComplexArgument<chip::app::DataModel::List<const chip::ByteSpan>> mComplex;
+};
+
+class SubscribeAttributeTestClusterListLongOctetString : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterListLongOctetString()
+        : SubscribeAttribute("list-long-octet-string")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterListLongOctetString() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000002A) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeListLongOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WiFiNetworkDiagnostics.ClusterRevision response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.ListLongOctetString response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -89084,404 +86915,367 @@ class SubscribeAttributeWiFiNetworkDiagnosticsClusterRevision : public Subscribe
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Cluster WindowCovering                                              | 0x0102 |
-|------------------------------------------------------------------------------|
-| Commands:                                                           |        |
-| * UpOrOpen                                                          |   0x00 |
-| * DownOrClose                                                       |   0x01 |
-| * StopMotion                                                        |   0x02 |
-| * GoToLiftValue                                                     |   0x04 |
-| * GoToLiftPercentage                                                |   0x05 |
-| * GoToTiltValue                                                     |   0x07 |
-| * GoToTiltPercentage                                                |   0x08 |
-|------------------------------------------------------------------------------|
-| Attributes:                                                         |        |
-| * Type                                                              | 0x0000 |
-| * PhysicalClosedLimitLift                                           | 0x0001 |
-| * PhysicalClosedLimitTilt                                           | 0x0002 |
-| * CurrentPositionLift                                               | 0x0003 |
-| * CurrentPositionTilt                                               | 0x0004 |
-| * NumberOfActuationsLift                                            | 0x0005 |
-| * NumberOfActuationsTilt                                            | 0x0006 |
-| * ConfigStatus                                                      | 0x0007 |
-| * CurrentPositionLiftPercentage                                     | 0x0008 |
-| * CurrentPositionTiltPercentage                                     | 0x0009 |
-| * OperationalStatus                                                 | 0x000A |
-| * TargetPositionLiftPercent100ths                                   | 0x000B |
-| * TargetPositionTiltPercent100ths                                   | 0x000C |
-| * EndProductType                                                    | 0x000D |
-| * CurrentPositionLiftPercent100ths                                  | 0x000E |
-| * CurrentPositionTiltPercent100ths                                  | 0x000F |
-| * InstalledOpenLimitLift                                            | 0x0010 |
-| * InstalledClosedLimitLift                                          | 0x0011 |
-| * InstalledOpenLimitTilt                                            | 0x0012 |
-| * InstalledClosedLimitTilt                                          | 0x0013 |
-| * Mode                                                              | 0x0017 |
-| * SafetyStatus                                                      | 0x001A |
-| * GeneratedCommandList                                              | 0xFFF8 |
-| * AcceptedCommandList                                               | 0xFFF9 |
-| * AttributeList                                                     | 0xFFFB |
-| * FeatureMap                                                        | 0xFFFC |
-| * ClusterRevision                                                   | 0xFFFD |
-|------------------------------------------------------------------------------|
-| Events:                                                             |        |
-\*----------------------------------------------------------------------------*/
-
 /*
- * Command UpOrOpen
+ * Attribute ListFabricScoped
  */
-class WindowCoveringUpOrOpen : public ClusterCommand {
+class ReadTestClusterListFabricScoped : public ReadAttribute {
 public:
-    WindowCoveringUpOrOpen()
-        : ClusterCommand("up-or-open")
+    ReadTestClusterListFabricScoped()
+        : ReadAttribute("list-fabric-scoped")
     {
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadTestClusterListFabricScoped() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) command (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000002B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPWindowCoveringClusterUpOrOpenParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster upOrOpenWithParams:params
-                      completionHandler:^(NSError * _Nullable error) {
-                          responsesNeeded--;
-                          if (error != nil) {
-                              mError = error;
-                              LogNSError("Error", error);
-                          }
-                          if (responsesNeeded == 0) {
-                              SetCommandExitStatus(mError);
-                          }
-                      }];
-        }
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPReadParams * params = [[CHIPReadParams alloc] init];
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster readAttributeListFabricScopedWithParams:params
+                                       completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                                           NSLog(@"TestCluster.ListFabricScoped response %@", [value description]);
+                                           if (error != nil) {
+                                               LogNSError("TestCluster ListFabricScoped read Error", error);
+                                           }
+                                           SetCommandExitStatus(error);
+                                       }];
         return CHIP_NO_ERROR;
     }
-
-private:
 };
 
-/*
- * Command DownOrClose
- */
-class WindowCoveringDownOrClose : public ClusterCommand {
+class WriteTestClusterListFabricScoped : public WriteAttribute {
 public:
-    WindowCoveringDownOrClose()
-        : ClusterCommand("down-or-close")
+    WriteTestClusterListFabricScoped()
+        : WriteAttribute("list-fabric-scoped")
+        , mComplex(&mValue)
     {
-        ClusterCommand::AddArguments();
+        AddArgument("attr-name", "list-fabric-scoped");
+        AddArgument("attr-value", &mComplex);
+        WriteAttribute::AddArguments();
     }
 
+    ~WriteTestClusterListFabricScoped() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) command (0x00000001) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000002B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPWindowCoveringClusterDownOrCloseParams alloc] init];
-        params.timedInvokeTimeoutMs
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster downOrCloseWithParams:params
-                         completionHandler:^(NSError * _Nullable error) {
-                             responsesNeeded--;
-                             if (error != nil) {
-                                 mError = error;
-                                 LogNSError("Error", error);
-                             }
-                             if (responsesNeeded == 0) {
-                                 SetCommandExitStatus(mError);
-                             }
-                         }];
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            for (auto & entry_0 : mValue) {
+                CHIPTestClusterClusterTestFabricScoped * newElement_0;
+                newElement_0 = [CHIPTestClusterClusterTestFabricScoped new];
+                newElement_0.fabricSensitiveInt8u = [NSNumber numberWithUnsignedChar:entry_0.fabricSensitiveInt8u];
+                if (entry_0.optionalFabricSensitiveInt8u.HasValue()) {
+                    newElement_0.optionalFabricSensitiveInt8u =
+                        [NSNumber numberWithUnsignedChar:entry_0.optionalFabricSensitiveInt8u.Value()];
+                } else {
+                    newElement_0.optionalFabricSensitiveInt8u = nil;
+                }
+                if (entry_0.nullableFabricSensitiveInt8u.IsNull()) {
+                    newElement_0.nullableFabricSensitiveInt8u = nil;
+                } else {
+                    newElement_0.nullableFabricSensitiveInt8u =
+                        [NSNumber numberWithUnsignedChar:entry_0.nullableFabricSensitiveInt8u.Value()];
+                }
+                if (entry_0.nullableOptionalFabricSensitiveInt8u.HasValue()) {
+                    if (entry_0.nullableOptionalFabricSensitiveInt8u.Value().IsNull()) {
+                        newElement_0.nullableOptionalFabricSensitiveInt8u = nil;
+                    } else {
+                        newElement_0.nullableOptionalFabricSensitiveInt8u =
+                            [NSNumber numberWithUnsignedChar:entry_0.nullableOptionalFabricSensitiveInt8u.Value().Value()];
+                    }
+                } else {
+                    newElement_0.nullableOptionalFabricSensitiveInt8u = nil;
+                }
+                newElement_0.fabricSensitiveCharString = [[NSString alloc] initWithBytes:entry_0.fabricSensitiveCharString.data()
+                                                                                  length:entry_0.fabricSensitiveCharString.size()
+                                                                                encoding:NSUTF8StringEncoding];
+                newElement_0.fabricSensitiveStruct = [CHIPTestClusterClusterSimpleStruct new];
+                newElement_0.fabricSensitiveStruct.a = [NSNumber numberWithUnsignedChar:entry_0.fabricSensitiveStruct.a];
+                newElement_0.fabricSensitiveStruct.b = [NSNumber numberWithBool:entry_0.fabricSensitiveStruct.b];
+                newElement_0.fabricSensitiveStruct.c =
+                    [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.fabricSensitiveStruct.c)];
+                newElement_0.fabricSensitiveStruct.d = [NSData dataWithBytes:entry_0.fabricSensitiveStruct.d.data()
+                                                                      length:entry_0.fabricSensitiveStruct.d.size()];
+                newElement_0.fabricSensitiveStruct.e = [[NSString alloc] initWithBytes:entry_0.fabricSensitiveStruct.e.data()
+                                                                                length:entry_0.fabricSensitiveStruct.e.size()
+                                                                              encoding:NSUTF8StringEncoding];
+                newElement_0.fabricSensitiveStruct.f = [NSNumber numberWithUnsignedChar:entry_0.fabricSensitiveStruct.f.Raw()];
+                newElement_0.fabricSensitiveStruct.g = [NSNumber numberWithFloat:entry_0.fabricSensitiveStruct.g];
+                newElement_0.fabricSensitiveStruct.h = [NSNumber numberWithDouble:entry_0.fabricSensitiveStruct.h];
+                { // Scope for our temporary variables
+                    auto * array_2 = [NSMutableArray new];
+                    for (auto & entry_2 : entry_0.fabricSensitiveInt8uList) {
+                        NSNumber * newElement_2;
+                        newElement_2 = [NSNumber numberWithUnsignedChar:entry_2];
+                        [array_2 addObject:newElement_2];
+                    }
+                    newElement_0.fabricSensitiveInt8uList = array_2;
+                }
+                newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
+                [array_0 addObject:newElement_0];
+            }
+            value = array_0;
         }
+
+        [cluster writeAttributeListFabricScopedWithValue:value
+                                                  params:params
+                                       completionHandler:^(NSError * _Nullable error) {
+                                           if (error != nil) {
+                                               LogNSError("TestCluster ListFabricScoped write Error", error);
+                                           }
+                                           SetCommandExitStatus(error);
+                                       }];
         return CHIP_NO_ERROR;
     }
 
 private:
+    chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::TestFabricScoped::Type> mValue;
+    TypedComplexArgument<chip::app::DataModel::List<const chip::app::Clusters::TestCluster::Structs::TestFabricScoped::Type>>
+        mComplex;
 };
 
-/*
- * Command StopMotion
- */
-class WindowCoveringStopMotion : public ClusterCommand {
+class SubscribeAttributeTestClusterListFabricScoped : public SubscribeAttribute {
 public:
-    WindowCoveringStopMotion()
-        : ClusterCommand("stop-motion")
-    {
-        ClusterCommand::AddArguments();
+    SubscribeAttributeTestClusterListFabricScoped()
+        : SubscribeAttribute("list-fabric-scoped")
+    {
     }
 
+    ~SubscribeAttributeTestClusterListFabricScoped() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) command (0x00000002) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000002B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPWindowCoveringClusterStopMotionParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster stopMotionWithParams:params
-                        completionHandler:^(NSError * _Nullable error) {
-                            responsesNeeded--;
-                            if (error != nil) {
-                                mError = error;
-                                LogNSError("Error", error);
-                            }
-                            if (responsesNeeded == 0) {
-                                SetCommandExitStatus(mError);
-                            }
-                        }];
-        }
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeListFabricScopedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.ListFabricScoped response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
 };
 
 /*
- * Command GoToLiftValue
+ * Attribute TimedWriteBoolean
  */
-class WindowCoveringGoToLiftValue : public ClusterCommand {
+class ReadTestClusterTimedWriteBoolean : public ReadAttribute {
 public:
-    WindowCoveringGoToLiftValue()
-        : ClusterCommand("go-to-lift-value")
+    ReadTestClusterTimedWriteBoolean()
+        : ReadAttribute("timed-write-boolean")
     {
-        AddArgument("LiftValue", 0, UINT16_MAX, &mRequest.liftValue);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadTestClusterTimedWriteBoolean() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) command (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000030) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPWindowCoveringClusterGoToLiftValueParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.liftValue = [NSNumber numberWithUnsignedShort:mRequest.liftValue];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster goToLiftValueWithParams:params
-                           completionHandler:^(NSError * _Nullable error) {
-                               responsesNeeded--;
-                               if (error != nil) {
-                                   mError = error;
-                                   LogNSError("Error", error);
-                               }
-                               if (responsesNeeded == 0) {
-                                   SetCommandExitStatus(mError);
-                               }
-                           }];
-        }
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeTimedWriteBooleanWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.TimedWriteBoolean response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TestCluster TimedWriteBoolean read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::WindowCovering::Commands::GoToLiftValue::Type mRequest;
 };
 
-/*
- * Command GoToLiftPercentage
- */
-class WindowCoveringGoToLiftPercentage : public ClusterCommand {
+class WriteTestClusterTimedWriteBoolean : public WriteAttribute {
 public:
-    WindowCoveringGoToLiftPercentage()
-        : ClusterCommand("go-to-lift-percentage")
+    WriteTestClusterTimedWriteBoolean()
+        : WriteAttribute("timed-write-boolean")
     {
-        AddArgument("LiftPercent100thsValue", 0, UINT16_MAX, &mRequest.liftPercent100thsValue);
-        ClusterCommand::AddArguments();
+        AddArgument("attr-name", "timed-write-boolean");
+        AddArgument("attr-value", 0, 1, &mValue);
+        WriteAttribute::AddArguments();
     }
 
+    ~WriteTestClusterTimedWriteBoolean() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) command (0x00000005) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000030) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPWindowCoveringClusterGoToLiftPercentageParams alloc] init];
-        params.timedInvokeTimeoutMs
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.liftPercent100thsValue = [NSNumber numberWithUnsignedShort:mRequest.liftPercent100thsValue];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster goToLiftPercentageWithParams:params
-                                completionHandler:^(NSError * _Nullable error) {
-                                    responsesNeeded--;
-                                    if (error != nil) {
-                                        mError = error;
-                                        LogNSError("Error", error);
-                                    }
-                                    if (responsesNeeded == 0) {
-                                        SetCommandExitStatus(mError);
-                                    }
-                                }];
-        }
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
+
+        [cluster writeAttributeTimedWriteBooleanWithValue:value
+                                                   params:params
+                                        completionHandler:^(NSError * _Nullable error) {
+                                            if (error != nil) {
+                                                LogNSError("TestCluster TimedWriteBoolean write Error", error);
+                                            }
+                                            SetCommandExitStatus(error);
+                                        }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    chip::app::Clusters::WindowCovering::Commands::GoToLiftPercentage::Type mRequest;
+    bool mValue;
 };
 
-/*
- * Command GoToTiltValue
- */
-class WindowCoveringGoToTiltValue : public ClusterCommand {
+class SubscribeAttributeTestClusterTimedWriteBoolean : public SubscribeAttribute {
 public:
-    WindowCoveringGoToTiltValue()
-        : ClusterCommand("go-to-tilt-value")
+    SubscribeAttributeTestClusterTimedWriteBoolean()
+        : SubscribeAttribute("timed-write-boolean")
     {
-        AddArgument("TiltValue", 0, UINT16_MAX, &mRequest.tiltValue);
-        ClusterCommand::AddArguments();
     }
 
+    ~SubscribeAttributeTestClusterTimedWriteBoolean() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) command (0x00000007) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000030) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPWindowCoveringClusterGoToTiltValueParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.tiltValue = [NSNumber numberWithUnsignedShort:mRequest.tiltValue];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster goToTiltValueWithParams:params
-                           completionHandler:^(NSError * _Nullable error) {
-                               responsesNeeded--;
-                               if (error != nil) {
-                                   mError = error;
-                                   LogNSError("Error", error);
-                               }
-                               if (responsesNeeded == 0) {
-                                   SetCommandExitStatus(mError);
-                               }
-                           }];
-        }
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeTimedWriteBooleanWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.TimedWriteBoolean response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::WindowCovering::Commands::GoToTiltValue::Type mRequest;
 };
 
 /*
- * Command GoToTiltPercentage
+ * Attribute GeneralErrorBoolean
  */
-class WindowCoveringGoToTiltPercentage : public ClusterCommand {
+class ReadTestClusterGeneralErrorBoolean : public ReadAttribute {
 public:
-    WindowCoveringGoToTiltPercentage()
-        : ClusterCommand("go-to-tilt-percentage")
+    ReadTestClusterGeneralErrorBoolean()
+        : ReadAttribute("general-error-boolean")
     {
-        AddArgument("TiltPercent100thsValue", 0, UINT16_MAX, &mRequest.tiltPercent100thsValue);
-        ClusterCommand::AddArguments();
     }
 
+    ~ReadTestClusterGeneralErrorBoolean() {}
+
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) command (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000031) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        __auto_type * params = [[CHIPWindowCoveringClusterGoToTiltPercentageParams alloc] init];
-        params.timedInvokeTimeoutMs
-            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.tiltPercent100thsValue = [NSNumber numberWithUnsignedShort:mRequest.tiltPercent100thsValue];
-        uint16_t repeatCount = mRepeatCount.ValueOr(1);
-        uint16_t __block responsesNeeded = repeatCount;
-        while (repeatCount--) {
-            [cluster goToTiltPercentageWithParams:params
-                                completionHandler:^(NSError * _Nullable error) {
-                                    responsesNeeded--;
-                                    if (error != nil) {
-                                        mError = error;
-                                        LogNSError("Error", error);
-                                    }
-                                    if (responsesNeeded == 0) {
-                                        SetCommandExitStatus(mError);
-                                    }
-                                }];
-        }
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneralErrorBooleanWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.GeneralErrorBoolean response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TestCluster GeneralErrorBoolean read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::Clusters::WindowCovering::Commands::GoToTiltPercentage::Type mRequest;
 };
 
-/*
- * Attribute Type
- */
-class ReadWindowCoveringType : public ReadAttribute {
+class WriteTestClusterGeneralErrorBoolean : public WriteAttribute {
 public:
-    ReadWindowCoveringType()
-        : ReadAttribute("type")
+    WriteTestClusterGeneralErrorBoolean()
+        : WriteAttribute("general-error-boolean")
     {
+        AddArgument("attr-name", "general-error-boolean");
+        AddArgument("attr-value", 0, 1, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~ReadWindowCoveringType() {}
+    ~WriteTestClusterGeneralErrorBoolean() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000000) on endpoint %u", endpointId);
-
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000031) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WindowCovering.Type response %@", [value description]);
-            if (error != nil) {
-                LogNSError("WindowCovering Type read Error", error);
-            }
-            SetCommandExitStatus(error);
-        }];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
+
+        [cluster writeAttributeGeneralErrorBooleanWithValue:value
+                                                     params:params
+                                          completionHandler:^(NSError * _Nullable error) {
+                                              if (error != nil) {
+                                                  LogNSError("TestCluster GeneralErrorBoolean write Error", error);
+                                              }
+                                              SetCommandExitStatus(error);
+                                          }];
         return CHIP_NO_ERROR;
     }
+
+private:
+    bool mValue;
 };
 
-class SubscribeAttributeWindowCoveringType : public SubscribeAttribute {
+class SubscribeAttributeTestClusterGeneralErrorBoolean : public SubscribeAttribute {
 public:
-    SubscribeAttributeWindowCoveringType()
-        : SubscribeAttribute("type")
+    SubscribeAttributeTestClusterGeneralErrorBoolean()
+        : SubscribeAttribute("general-error-boolean")
     {
     }
 
-    ~SubscribeAttributeWindowCoveringType() {}
+    ~SubscribeAttributeTestClusterGeneralErrorBoolean() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000000) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000031) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeGeneralErrorBooleanWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.Type response %@", [value description]);
+                NSLog(@"TestCluster.GeneralErrorBoolean response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -89492,126 +87286,98 @@ class SubscribeAttributeWindowCoveringType : public SubscribeAttribute {
 };
 
 /*
- * Attribute PhysicalClosedLimitLift
+ * Attribute ClusterErrorBoolean
  */
-class ReadWindowCoveringPhysicalClosedLimitLift : public ReadAttribute {
+class ReadTestClusterClusterErrorBoolean : public ReadAttribute {
 public:
-    ReadWindowCoveringPhysicalClosedLimitLift()
-        : ReadAttribute("physical-closed-limit-lift")
+    ReadTestClusterClusterErrorBoolean()
+        : ReadAttribute("cluster-error-boolean")
     {
     }
 
-    ~ReadWindowCoveringPhysicalClosedLimitLift() {}
+    ~ReadTestClusterClusterErrorBoolean() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00000032) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributePhysicalClosedLimitLiftWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.PhysicalClosedLimitLift response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("WindowCovering PhysicalClosedLimitLift read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClusterErrorBooleanWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.ClusterErrorBoolean response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TestCluster ClusterErrorBoolean read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeWindowCoveringPhysicalClosedLimitLift : public SubscribeAttribute {
+class WriteTestClusterClusterErrorBoolean : public WriteAttribute {
 public:
-    SubscribeAttributeWindowCoveringPhysicalClosedLimitLift()
-        : SubscribeAttribute("physical-closed-limit-lift")
+    WriteTestClusterClusterErrorBoolean()
+        : WriteAttribute("cluster-error-boolean")
     {
+        AddArgument("attr-name", "cluster-error-boolean");
+        AddArgument("attr-value", 0, 1, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWindowCoveringPhysicalClosedLimitLift() {}
+    ~WriteTestClusterClusterErrorBoolean() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000001) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00000032) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePhysicalClosedLimitLiftWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.PhysicalClosedLimitLift response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
 
+        [cluster writeAttributeClusterErrorBooleanWithValue:value
+                                                     params:params
+                                          completionHandler:^(NSError * _Nullable error) {
+                                              if (error != nil) {
+                                                  LogNSError("TestCluster ClusterErrorBoolean write Error", error);
+                                              }
+                                              SetCommandExitStatus(error);
+                                          }];
         return CHIP_NO_ERROR;
     }
-};
-
-/*
- * Attribute PhysicalClosedLimitTilt
- */
-class ReadWindowCoveringPhysicalClosedLimitTilt : public ReadAttribute {
-public:
-    ReadWindowCoveringPhysicalClosedLimitTilt()
-        : ReadAttribute("physical-closed-limit-tilt")
-    {
-    }
 
-    ~ReadWindowCoveringPhysicalClosedLimitTilt() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000002) on endpoint %u", endpointId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributePhysicalClosedLimitTiltWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.PhysicalClosedLimitTilt response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("WindowCovering PhysicalClosedLimitTilt read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
-        return CHIP_NO_ERROR;
-    }
+private:
+    bool mValue;
 };
 
-class SubscribeAttributeWindowCoveringPhysicalClosedLimitTilt : public SubscribeAttribute {
+class SubscribeAttributeTestClusterClusterErrorBoolean : public SubscribeAttribute {
 public:
-    SubscribeAttributeWindowCoveringPhysicalClosedLimitTilt()
-        : SubscribeAttribute("physical-closed-limit-tilt")
+    SubscribeAttributeTestClusterClusterErrorBoolean()
+        : SubscribeAttribute("cluster-error-boolean")
     {
     }
 
-    ~SubscribeAttributeWindowCoveringPhysicalClosedLimitTilt() {}
+    ~SubscribeAttributeTestClusterClusterErrorBoolean() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000002) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00000032) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributePhysicalClosedLimitTiltWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeClusterErrorBooleanWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.PhysicalClosedLimitTilt response %@", [value description]);
+                NSLog(@"TestCluster.ClusterErrorBoolean response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -89622,27 +87388,27 @@ class SubscribeAttributeWindowCoveringPhysicalClosedLimitTilt : public Subscribe
 };
 
 /*
- * Attribute CurrentPositionLift
+ * Attribute Unsupported
  */
-class ReadWindowCoveringCurrentPositionLift : public ReadAttribute {
+class ReadTestClusterUnsupported : public ReadAttribute {
 public:
-    ReadWindowCoveringCurrentPositionLift()
-        : ReadAttribute("current-position-lift")
+    ReadTestClusterUnsupported()
+        : ReadAttribute("unsupported")
     {
     }
 
-    ~ReadWindowCoveringCurrentPositionLift() {}
+    ~ReadTestClusterUnsupported() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x000000FF) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCurrentPositionLiftWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WindowCovering.CurrentPositionLift response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeUnsupportedWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.Unsupported response %@", [value description]);
             if (error != nil) {
-                LogNSError("WindowCovering CurrentPositionLift read Error", error);
+                LogNSError("TestCluster Unsupported read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -89650,32 +87416,70 @@ class ReadWindowCoveringCurrentPositionLift : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWindowCoveringCurrentPositionLift : public SubscribeAttribute {
+class WriteTestClusterUnsupported : public WriteAttribute {
 public:
-    SubscribeAttributeWindowCoveringCurrentPositionLift()
-        : SubscribeAttribute("current-position-lift")
+    WriteTestClusterUnsupported()
+        : WriteAttribute("unsupported")
     {
+        AddArgument("attr-name", "unsupported");
+        AddArgument("attr-value", 0, 1, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWindowCoveringCurrentPositionLift() {}
+    ~WriteTestClusterUnsupported() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000003) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x000000FF) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue];
+
+        [cluster writeAttributeUnsupportedWithValue:value
+                                             params:params
+                                  completionHandler:^(NSError * _Nullable error) {
+                                      if (error != nil) {
+                                          LogNSError("TestCluster Unsupported write Error", error);
+                                      }
+                                      SetCommandExitStatus(error);
+                                  }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    bool mValue;
+};
+
+class SubscribeAttributeTestClusterUnsupported : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterUnsupported()
+        : SubscribeAttribute("unsupported")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterUnsupported() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x000000FF) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentPositionLiftWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeUnsupportedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.CurrentPositionLift response %@", [value description]);
+                NSLog(@"TestCluster.Unsupported response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -89686,27 +87490,27 @@ class SubscribeAttributeWindowCoveringCurrentPositionLift : public SubscribeAttr
 };
 
 /*
- * Attribute CurrentPositionTilt
+ * Attribute NullableBoolean
  */
-class ReadWindowCoveringCurrentPositionTilt : public ReadAttribute {
+class ReadTestClusterNullableBoolean : public ReadAttribute {
 public:
-    ReadWindowCoveringCurrentPositionTilt()
-        : ReadAttribute("current-position-tilt")
+    ReadTestClusterNullableBoolean()
+        : ReadAttribute("nullable-boolean")
     {
     }
 
-    ~ReadWindowCoveringCurrentPositionTilt() {}
+    ~ReadTestClusterNullableBoolean() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004000) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCurrentPositionTiltWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WindowCovering.CurrentPositionTilt response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableBooleanWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableBoolean response %@", [value description]);
             if (error != nil) {
-                LogNSError("WindowCovering CurrentPositionTilt read Error", error);
+                LogNSError("TestCluster NullableBoolean read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -89714,32 +87518,70 @@ class ReadWindowCoveringCurrentPositionTilt : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWindowCoveringCurrentPositionTilt : public SubscribeAttribute {
+class WriteTestClusterNullableBoolean : public WriteAttribute {
 public:
-    SubscribeAttributeWindowCoveringCurrentPositionTilt()
-        : SubscribeAttribute("current-position-tilt")
+    WriteTestClusterNullableBoolean()
+        : WriteAttribute("nullable-boolean")
     {
+        AddArgument("attr-name", "nullable-boolean");
+        AddArgument("attr-value", 0, 1, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWindowCoveringCurrentPositionTilt() {}
+    ~WriteTestClusterNullableBoolean() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000004) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004000) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithBool:mValue];
+
+        [cluster writeAttributeNullableBooleanWithValue:value
+                                                 params:params
+                                      completionHandler:^(NSError * _Nullable error) {
+                                          if (error != nil) {
+                                              LogNSError("TestCluster NullableBoolean write Error", error);
+                                          }
+                                          SetCommandExitStatus(error);
+                                      }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    bool mValue;
+};
+
+class SubscribeAttributeTestClusterNullableBoolean : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableBoolean()
+        : SubscribeAttribute("nullable-boolean")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableBoolean() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004000) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentPositionTiltWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNullableBooleanWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.CurrentPositionTilt response %@", [value description]);
+                NSLog(@"TestCluster.NullableBoolean response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -89750,27 +87592,27 @@ class SubscribeAttributeWindowCoveringCurrentPositionTilt : public SubscribeAttr
 };
 
 /*
- * Attribute NumberOfActuationsLift
+ * Attribute NullableBitmap8
  */
-class ReadWindowCoveringNumberOfActuationsLift : public ReadAttribute {
+class ReadTestClusterNullableBitmap8 : public ReadAttribute {
 public:
-    ReadWindowCoveringNumberOfActuationsLift()
-        : ReadAttribute("number-of-actuations-lift")
+    ReadTestClusterNullableBitmap8()
+        : ReadAttribute("nullable-bitmap8")
     {
     }
 
-    ~ReadWindowCoveringNumberOfActuationsLift() {}
+    ~ReadTestClusterNullableBitmap8() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004001) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNumberOfActuationsLiftWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WindowCovering.NumberOfActuationsLift response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableBitmap8WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableBitmap8 response %@", [value description]);
             if (error != nil) {
-                LogNSError("WindowCovering NumberOfActuationsLift read Error", error);
+                LogNSError("TestCluster NullableBitmap8 read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -89778,32 +87620,70 @@ class ReadWindowCoveringNumberOfActuationsLift : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWindowCoveringNumberOfActuationsLift : public SubscribeAttribute {
+class WriteTestClusterNullableBitmap8 : public WriteAttribute {
 public:
-    SubscribeAttributeWindowCoveringNumberOfActuationsLift()
-        : SubscribeAttribute("number-of-actuations-lift")
+    WriteTestClusterNullableBitmap8()
+        : WriteAttribute("nullable-bitmap8")
     {
+        AddArgument("attr-name", "nullable-bitmap8");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWindowCoveringNumberOfActuationsLift() {}
+    ~WriteTestClusterNullableBitmap8() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000005) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004001) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeNullableBitmap8WithValue:value
+                                                 params:params
+                                      completionHandler:^(NSError * _Nullable error) {
+                                          if (error != nil) {
+                                              LogNSError("TestCluster NullableBitmap8 write Error", error);
+                                          }
+                                          SetCommandExitStatus(error);
+                                      }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeTestClusterNullableBitmap8 : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableBitmap8()
+        : SubscribeAttribute("nullable-bitmap8")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableBitmap8() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004001) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNumberOfActuationsLiftWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNullableBitmap8WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.NumberOfActuationsLift response %@", [value description]);
+                NSLog(@"TestCluster.NullableBitmap8 response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -89814,27 +87694,27 @@ class SubscribeAttributeWindowCoveringNumberOfActuationsLift : public SubscribeA
 };
 
 /*
- * Attribute NumberOfActuationsTilt
+ * Attribute NullableBitmap16
  */
-class ReadWindowCoveringNumberOfActuationsTilt : public ReadAttribute {
+class ReadTestClusterNullableBitmap16 : public ReadAttribute {
 public:
-    ReadWindowCoveringNumberOfActuationsTilt()
-        : ReadAttribute("number-of-actuations-tilt")
+    ReadTestClusterNullableBitmap16()
+        : ReadAttribute("nullable-bitmap16")
     {
     }
 
-    ~ReadWindowCoveringNumberOfActuationsTilt() {}
+    ~ReadTestClusterNullableBitmap16() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004002) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeNumberOfActuationsTiltWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WindowCovering.NumberOfActuationsTilt response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableBitmap16WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableBitmap16 response %@", [value description]);
             if (error != nil) {
-                LogNSError("WindowCovering NumberOfActuationsTilt read Error", error);
+                LogNSError("TestCluster NullableBitmap16 read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -89842,32 +87722,70 @@ class ReadWindowCoveringNumberOfActuationsTilt : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWindowCoveringNumberOfActuationsTilt : public SubscribeAttribute {
+class WriteTestClusterNullableBitmap16 : public WriteAttribute {
 public:
-    SubscribeAttributeWindowCoveringNumberOfActuationsTilt()
-        : SubscribeAttribute("number-of-actuations-tilt")
+    WriteTestClusterNullableBitmap16()
+        : WriteAttribute("nullable-bitmap16")
     {
+        AddArgument("attr-name", "nullable-bitmap16");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWindowCoveringNumberOfActuationsTilt() {}
+    ~WriteTestClusterNullableBitmap16() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000006) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004002) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster writeAttributeNullableBitmap16WithValue:value
+                                                  params:params
+                                       completionHandler:^(NSError * _Nullable error) {
+                                           if (error != nil) {
+                                               LogNSError("TestCluster NullableBitmap16 write Error", error);
+                                           }
+                                           SetCommandExitStatus(error);
+                                       }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeTestClusterNullableBitmap16 : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableBitmap16()
+        : SubscribeAttribute("nullable-bitmap16")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableBitmap16() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004002) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeNumberOfActuationsTiltWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNullableBitmap16WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.NumberOfActuationsTilt response %@", [value description]);
+                NSLog(@"TestCluster.NullableBitmap16 response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -89878,27 +87796,27 @@ class SubscribeAttributeWindowCoveringNumberOfActuationsTilt : public SubscribeA
 };
 
 /*
- * Attribute ConfigStatus
+ * Attribute NullableBitmap32
  */
-class ReadWindowCoveringConfigStatus : public ReadAttribute {
+class ReadTestClusterNullableBitmap32 : public ReadAttribute {
 public:
-    ReadWindowCoveringConfigStatus()
-        : ReadAttribute("config-status")
+    ReadTestClusterNullableBitmap32()
+        : ReadAttribute("nullable-bitmap32")
     {
     }
 
-    ~ReadWindowCoveringConfigStatus() {}
+    ~ReadTestClusterNullableBitmap32() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004003) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeConfigStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WindowCovering.ConfigStatus response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableBitmap32WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableBitmap32 response %@", [value description]);
             if (error != nil) {
-                LogNSError("WindowCovering ConfigStatus read Error", error);
+                LogNSError("TestCluster NullableBitmap32 read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -89906,32 +87824,70 @@ class ReadWindowCoveringConfigStatus : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWindowCoveringConfigStatus : public SubscribeAttribute {
+class WriteTestClusterNullableBitmap32 : public WriteAttribute {
 public:
-    SubscribeAttributeWindowCoveringConfigStatus()
-        : SubscribeAttribute("config-status")
+    WriteTestClusterNullableBitmap32()
+        : WriteAttribute("nullable-bitmap32")
     {
+        AddArgument("attr-name", "nullable-bitmap32");
+        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWindowCoveringConfigStatus() {}
+    ~WriteTestClusterNullableBitmap32() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000007) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004003) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedInt:mValue];
+
+        [cluster writeAttributeNullableBitmap32WithValue:value
+                                                  params:params
+                                       completionHandler:^(NSError * _Nullable error) {
+                                           if (error != nil) {
+                                               LogNSError("TestCluster NullableBitmap32 write Error", error);
+                                           }
+                                           SetCommandExitStatus(error);
+                                       }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint32_t mValue;
+};
+
+class SubscribeAttributeTestClusterNullableBitmap32 : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableBitmap32()
+        : SubscribeAttribute("nullable-bitmap32")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableBitmap32() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004003) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeConfigStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNullableBitmap32WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.ConfigStatus response %@", [value description]);
+                NSLog(@"TestCluster.NullableBitmap32 response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -89942,28 +87898,27 @@ class SubscribeAttributeWindowCoveringConfigStatus : public SubscribeAttribute {
 };
 
 /*
- * Attribute CurrentPositionLiftPercentage
+ * Attribute NullableBitmap64
  */
-class ReadWindowCoveringCurrentPositionLiftPercentage : public ReadAttribute {
+class ReadTestClusterNullableBitmap64 : public ReadAttribute {
 public:
-    ReadWindowCoveringCurrentPositionLiftPercentage()
-        : ReadAttribute("current-position-lift-percentage")
+    ReadTestClusterNullableBitmap64()
+        : ReadAttribute("nullable-bitmap64")
     {
     }
 
-    ~ReadWindowCoveringCurrentPositionLiftPercentage() {}
+    ~ReadTestClusterNullableBitmap64() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004004) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCurrentPositionLiftPercentageWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WindowCovering.CurrentPositionLiftPercentage response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableBitmap64WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableBitmap64 response %@", [value description]);
             if (error != nil) {
-                LogNSError("WindowCovering CurrentPositionLiftPercentage read Error", error);
+                LogNSError("TestCluster NullableBitmap64 read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -89971,32 +87926,70 @@ class ReadWindowCoveringCurrentPositionLiftPercentage : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWindowCoveringCurrentPositionLiftPercentage : public SubscribeAttribute {
+class WriteTestClusterNullableBitmap64 : public WriteAttribute {
 public:
-    SubscribeAttributeWindowCoveringCurrentPositionLiftPercentage()
-        : SubscribeAttribute("current-position-lift-percentage")
+    WriteTestClusterNullableBitmap64()
+        : WriteAttribute("nullable-bitmap64")
     {
+        AddArgument("attr-name", "nullable-bitmap64");
+        AddArgument("attr-value", 0, UINT64_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWindowCoveringCurrentPositionLiftPercentage() {}
+    ~WriteTestClusterNullableBitmap64() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000008) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004004) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedLongLong:mValue];
+
+        [cluster writeAttributeNullableBitmap64WithValue:value
+                                                  params:params
+                                       completionHandler:^(NSError * _Nullable error) {
+                                           if (error != nil) {
+                                               LogNSError("TestCluster NullableBitmap64 write Error", error);
+                                           }
+                                           SetCommandExitStatus(error);
+                                       }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint64_t mValue;
+};
+
+class SubscribeAttributeTestClusterNullableBitmap64 : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableBitmap64()
+        : SubscribeAttribute("nullable-bitmap64")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableBitmap64() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004004) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentPositionLiftPercentageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNullableBitmap64WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.CurrentPositionLiftPercentage response %@", [value description]);
+                NSLog(@"TestCluster.NullableBitmap64 response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -90007,28 +88000,27 @@ class SubscribeAttributeWindowCoveringCurrentPositionLiftPercentage : public Sub
 };
 
 /*
- * Attribute CurrentPositionTiltPercentage
+ * Attribute NullableInt8u
  */
-class ReadWindowCoveringCurrentPositionTiltPercentage : public ReadAttribute {
+class ReadTestClusterNullableInt8u : public ReadAttribute {
 public:
-    ReadWindowCoveringCurrentPositionTiltPercentage()
-        : ReadAttribute("current-position-tilt-percentage")
+    ReadTestClusterNullableInt8u()
+        : ReadAttribute("nullable-int8u")
     {
     }
 
-    ~ReadWindowCoveringCurrentPositionTiltPercentage() {}
+    ~ReadTestClusterNullableInt8u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004005) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCurrentPositionTiltPercentageWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WindowCovering.CurrentPositionTiltPercentage response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableInt8uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableInt8u response %@", [value description]);
             if (error != nil) {
-                LogNSError("WindowCovering CurrentPositionTiltPercentage read Error", error);
+                LogNSError("TestCluster NullableInt8u read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -90036,32 +88028,70 @@ class ReadWindowCoveringCurrentPositionTiltPercentage : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWindowCoveringCurrentPositionTiltPercentage : public SubscribeAttribute {
+class WriteTestClusterNullableInt8u : public WriteAttribute {
 public:
-    SubscribeAttributeWindowCoveringCurrentPositionTiltPercentage()
-        : SubscribeAttribute("current-position-tilt-percentage")
+    WriteTestClusterNullableInt8u()
+        : WriteAttribute("nullable-int8u")
     {
+        AddArgument("attr-name", "nullable-int8u");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWindowCoveringCurrentPositionTiltPercentage() {}
+    ~WriteTestClusterNullableInt8u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000009) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004005) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeNullableInt8uWithValue:value
+                                               params:params
+                                    completionHandler:^(NSError * _Nullable error) {
+                                        if (error != nil) {
+                                            LogNSError("TestCluster NullableInt8u write Error", error);
+                                        }
+                                        SetCommandExitStatus(error);
+                                    }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeTestClusterNullableInt8u : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableInt8u()
+        : SubscribeAttribute("nullable-int8u")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableInt8u() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004005) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentPositionTiltPercentageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNullableInt8uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.CurrentPositionTiltPercentage response %@", [value description]);
+                NSLog(@"TestCluster.NullableInt8u response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -90072,27 +88102,27 @@ class SubscribeAttributeWindowCoveringCurrentPositionTiltPercentage : public Sub
 };
 
 /*
- * Attribute OperationalStatus
+ * Attribute NullableInt16u
  */
-class ReadWindowCoveringOperationalStatus : public ReadAttribute {
+class ReadTestClusterNullableInt16u : public ReadAttribute {
 public:
-    ReadWindowCoveringOperationalStatus()
-        : ReadAttribute("operational-status")
+    ReadTestClusterNullableInt16u()
+        : ReadAttribute("nullable-int16u")
     {
     }
 
-    ~ReadWindowCoveringOperationalStatus() {}
+    ~ReadTestClusterNullableInt16u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x0000000A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004006) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeOperationalStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WindowCovering.OperationalStatus response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableInt16uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableInt16u response %@", [value description]);
             if (error != nil) {
-                LogNSError("WindowCovering OperationalStatus read Error", error);
+                LogNSError("TestCluster NullableInt16u read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -90100,32 +88130,70 @@ class ReadWindowCoveringOperationalStatus : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWindowCoveringOperationalStatus : public SubscribeAttribute {
+class WriteTestClusterNullableInt16u : public WriteAttribute {
 public:
-    SubscribeAttributeWindowCoveringOperationalStatus()
-        : SubscribeAttribute("operational-status")
+    WriteTestClusterNullableInt16u()
+        : WriteAttribute("nullable-int16u")
     {
+        AddArgument("attr-name", "nullable-int16u");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWindowCoveringOperationalStatus() {}
+    ~WriteTestClusterNullableInt16u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x0000000A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004006) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster writeAttributeNullableInt16uWithValue:value
+                                                params:params
+                                     completionHandler:^(NSError * _Nullable error) {
+                                         if (error != nil) {
+                                             LogNSError("TestCluster NullableInt16u write Error", error);
+                                         }
+                                         SetCommandExitStatus(error);
+                                     }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeTestClusterNullableInt16u : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableInt16u()
+        : SubscribeAttribute("nullable-int16u")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableInt16u() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004006) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeOperationalStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNullableInt16uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.OperationalStatus response %@", [value description]);
+                NSLog(@"TestCluster.NullableInt16u response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -90136,28 +88204,27 @@ class SubscribeAttributeWindowCoveringOperationalStatus : public SubscribeAttrib
 };
 
 /*
- * Attribute TargetPositionLiftPercent100ths
+ * Attribute NullableInt24u
  */
-class ReadWindowCoveringTargetPositionLiftPercent100ths : public ReadAttribute {
+class ReadTestClusterNullableInt24u : public ReadAttribute {
 public:
-    ReadWindowCoveringTargetPositionLiftPercent100ths()
-        : ReadAttribute("target-position-lift-percent100ths")
+    ReadTestClusterNullableInt24u()
+        : ReadAttribute("nullable-int24u")
     {
     }
 
-    ~ReadWindowCoveringTargetPositionLiftPercent100ths() {}
+    ~ReadTestClusterNullableInt24u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x0000000B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004007) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeTargetPositionLiftPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WindowCovering.TargetPositionLiftPercent100ths response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableInt24uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableInt24u response %@", [value description]);
             if (error != nil) {
-                LogNSError("WindowCovering TargetPositionLiftPercent100ths read Error", error);
+                LogNSError("TestCluster NullableInt24u read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -90165,32 +88232,70 @@ class ReadWindowCoveringTargetPositionLiftPercent100ths : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWindowCoveringTargetPositionLiftPercent100ths : public SubscribeAttribute {
+class WriteTestClusterNullableInt24u : public WriteAttribute {
 public:
-    SubscribeAttributeWindowCoveringTargetPositionLiftPercent100ths()
-        : SubscribeAttribute("target-position-lift-percent100ths")
+    WriteTestClusterNullableInt24u()
+        : WriteAttribute("nullable-int24u")
     {
+        AddArgument("attr-name", "nullable-int24u");
+        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWindowCoveringTargetPositionLiftPercent100ths() {}
+    ~WriteTestClusterNullableInt24u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x0000000B) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004007) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedInt:mValue];
+
+        [cluster writeAttributeNullableInt24uWithValue:value
+                                                params:params
+                                     completionHandler:^(NSError * _Nullable error) {
+                                         if (error != nil) {
+                                             LogNSError("TestCluster NullableInt24u write Error", error);
+                                         }
+                                         SetCommandExitStatus(error);
+                                     }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint32_t mValue;
+};
+
+class SubscribeAttributeTestClusterNullableInt24u : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableInt24u()
+        : SubscribeAttribute("nullable-int24u")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableInt24u() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004007) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTargetPositionLiftPercent100thsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNullableInt24uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.TargetPositionLiftPercent100ths response %@", [value description]);
+                NSLog(@"TestCluster.NullableInt24u response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -90201,28 +88306,27 @@ class SubscribeAttributeWindowCoveringTargetPositionLiftPercent100ths : public S
 };
 
 /*
- * Attribute TargetPositionTiltPercent100ths
+ * Attribute NullableInt32u
  */
-class ReadWindowCoveringTargetPositionTiltPercent100ths : public ReadAttribute {
+class ReadTestClusterNullableInt32u : public ReadAttribute {
 public:
-    ReadWindowCoveringTargetPositionTiltPercent100ths()
-        : ReadAttribute("target-position-tilt-percent100ths")
+    ReadTestClusterNullableInt32u()
+        : ReadAttribute("nullable-int32u")
     {
     }
 
-    ~ReadWindowCoveringTargetPositionTiltPercent100ths() {}
+    ~ReadTestClusterNullableInt32u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x0000000C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004008) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeTargetPositionTiltPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WindowCovering.TargetPositionTiltPercent100ths response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableInt32uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableInt32u response %@", [value description]);
             if (error != nil) {
-                LogNSError("WindowCovering TargetPositionTiltPercent100ths read Error", error);
+                LogNSError("TestCluster NullableInt32u read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -90230,32 +88334,70 @@ class ReadWindowCoveringTargetPositionTiltPercent100ths : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWindowCoveringTargetPositionTiltPercent100ths : public SubscribeAttribute {
+class WriteTestClusterNullableInt32u : public WriteAttribute {
 public:
-    SubscribeAttributeWindowCoveringTargetPositionTiltPercent100ths()
-        : SubscribeAttribute("target-position-tilt-percent100ths")
+    WriteTestClusterNullableInt32u()
+        : WriteAttribute("nullable-int32u")
     {
+        AddArgument("attr-name", "nullable-int32u");
+        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWindowCoveringTargetPositionTiltPercent100ths() {}
+    ~WriteTestClusterNullableInt32u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x0000000C) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004008) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedInt:mValue];
+
+        [cluster writeAttributeNullableInt32uWithValue:value
+                                                params:params
+                                     completionHandler:^(NSError * _Nullable error) {
+                                         if (error != nil) {
+                                             LogNSError("TestCluster NullableInt32u write Error", error);
+                                         }
+                                         SetCommandExitStatus(error);
+                                     }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint32_t mValue;
+};
+
+class SubscribeAttributeTestClusterNullableInt32u : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableInt32u()
+        : SubscribeAttribute("nullable-int32u")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableInt32u() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004008) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeTargetPositionTiltPercent100thsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNullableInt32uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.TargetPositionTiltPercent100ths response %@", [value description]);
+                NSLog(@"TestCluster.NullableInt32u response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -90266,27 +88408,27 @@ class SubscribeAttributeWindowCoveringTargetPositionTiltPercent100ths : public S
 };
 
 /*
- * Attribute EndProductType
+ * Attribute NullableInt40u
  */
-class ReadWindowCoveringEndProductType : public ReadAttribute {
+class ReadTestClusterNullableInt40u : public ReadAttribute {
 public:
-    ReadWindowCoveringEndProductType()
-        : ReadAttribute("end-product-type")
+    ReadTestClusterNullableInt40u()
+        : ReadAttribute("nullable-int40u")
     {
     }
 
-    ~ReadWindowCoveringEndProductType() {}
+    ~ReadTestClusterNullableInt40u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x0000000D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004009) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeEndProductTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WindowCovering.EndProductType response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableInt40uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableInt40u response %@", [value description]);
             if (error != nil) {
-                LogNSError("WindowCovering EndProductType read Error", error);
+                LogNSError("TestCluster NullableInt40u read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -90294,32 +88436,70 @@ class ReadWindowCoveringEndProductType : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWindowCoveringEndProductType : public SubscribeAttribute {
+class WriteTestClusterNullableInt40u : public WriteAttribute {
 public:
-    SubscribeAttributeWindowCoveringEndProductType()
-        : SubscribeAttribute("end-product-type")
+    WriteTestClusterNullableInt40u()
+        : WriteAttribute("nullable-int40u")
     {
+        AddArgument("attr-name", "nullable-int40u");
+        AddArgument("attr-value", 0, UINT64_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWindowCoveringEndProductType() {}
+    ~WriteTestClusterNullableInt40u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x0000000D) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004009) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedLongLong:mValue];
+
+        [cluster writeAttributeNullableInt40uWithValue:value
+                                                params:params
+                                     completionHandler:^(NSError * _Nullable error) {
+                                         if (error != nil) {
+                                             LogNSError("TestCluster NullableInt40u write Error", error);
+                                         }
+                                         SetCommandExitStatus(error);
+                                     }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint64_t mValue;
+};
+
+class SubscribeAttributeTestClusterNullableInt40u : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableInt40u()
+        : SubscribeAttribute("nullable-int40u")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableInt40u() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004009) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeEndProductTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNullableInt40uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.EndProductType response %@", [value description]);
+                NSLog(@"TestCluster.NullableInt40u response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -90330,28 +88510,27 @@ class SubscribeAttributeWindowCoveringEndProductType : public SubscribeAttribute
 };
 
 /*
- * Attribute CurrentPositionLiftPercent100ths
+ * Attribute NullableInt48u
  */
-class ReadWindowCoveringCurrentPositionLiftPercent100ths : public ReadAttribute {
+class ReadTestClusterNullableInt48u : public ReadAttribute {
 public:
-    ReadWindowCoveringCurrentPositionLiftPercent100ths()
-        : ReadAttribute("current-position-lift-percent100ths")
+    ReadTestClusterNullableInt48u()
+        : ReadAttribute("nullable-int48u")
     {
     }
 
-    ~ReadWindowCoveringCurrentPositionLiftPercent100ths() {}
+    ~ReadTestClusterNullableInt48u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x0000000E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000400A) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WindowCovering.CurrentPositionLiftPercent100ths response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableInt48uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableInt48u response %@", [value description]);
             if (error != nil) {
-                LogNSError("WindowCovering CurrentPositionLiftPercent100ths read Error", error);
+                LogNSError("TestCluster NullableInt48u read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -90359,32 +88538,70 @@ class ReadWindowCoveringCurrentPositionLiftPercent100ths : public ReadAttribute
     }
 };
 
-class SubscribeAttributeWindowCoveringCurrentPositionLiftPercent100ths : public SubscribeAttribute {
+class WriteTestClusterNullableInt48u : public WriteAttribute {
 public:
-    SubscribeAttributeWindowCoveringCurrentPositionLiftPercent100ths()
-        : SubscribeAttribute("current-position-lift-percent100ths")
+    WriteTestClusterNullableInt48u()
+        : WriteAttribute("nullable-int48u")
     {
+        AddArgument("attr-name", "nullable-int48u");
+        AddArgument("attr-value", 0, UINT64_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWindowCoveringCurrentPositionLiftPercent100ths() {}
+    ~WriteTestClusterNullableInt48u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x0000000E) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000400A) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedLongLong:mValue];
+
+        [cluster writeAttributeNullableInt48uWithValue:value
+                                                params:params
+                                     completionHandler:^(NSError * _Nullable error) {
+                                         if (error != nil) {
+                                             LogNSError("TestCluster NullableInt48u write Error", error);
+                                         }
+                                         SetCommandExitStatus(error);
+                                     }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint64_t mValue;
+};
+
+class SubscribeAttributeTestClusterNullableInt48u : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableInt48u()
+        : SubscribeAttribute("nullable-int48u")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableInt48u() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000400A) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentPositionLiftPercent100thsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNullableInt48uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.CurrentPositionLiftPercent100ths response %@", [value description]);
+                NSLog(@"TestCluster.NullableInt48u response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -90395,28 +88612,27 @@ class SubscribeAttributeWindowCoveringCurrentPositionLiftPercent100ths : public
 };
 
 /*
- * Attribute CurrentPositionTiltPercent100ths
+ * Attribute NullableInt56u
  */
-class ReadWindowCoveringCurrentPositionTiltPercent100ths : public ReadAttribute {
+class ReadTestClusterNullableInt56u : public ReadAttribute {
 public:
-    ReadWindowCoveringCurrentPositionTiltPercent100ths()
-        : ReadAttribute("current-position-tilt-percent100ths")
+    ReadTestClusterNullableInt56u()
+        : ReadAttribute("nullable-int56u")
     {
     }
 
-    ~ReadWindowCoveringCurrentPositionTiltPercent100ths() {}
+    ~ReadTestClusterNullableInt56u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x0000000F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000400B) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:^(
-            NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WindowCovering.CurrentPositionTiltPercent100ths response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableInt56uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableInt56u response %@", [value description]);
             if (error != nil) {
-                LogNSError("WindowCovering CurrentPositionTiltPercent100ths read Error", error);
+                LogNSError("TestCluster NullableInt56u read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -90424,32 +88640,70 @@ class ReadWindowCoveringCurrentPositionTiltPercent100ths : public ReadAttribute
     }
 };
 
-class SubscribeAttributeWindowCoveringCurrentPositionTiltPercent100ths : public SubscribeAttribute {
+class WriteTestClusterNullableInt56u : public WriteAttribute {
 public:
-    SubscribeAttributeWindowCoveringCurrentPositionTiltPercent100ths()
-        : SubscribeAttribute("current-position-tilt-percent100ths")
+    WriteTestClusterNullableInt56u()
+        : WriteAttribute("nullable-int56u")
     {
+        AddArgument("attr-name", "nullable-int56u");
+        AddArgument("attr-value", 0, UINT64_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWindowCoveringCurrentPositionTiltPercent100ths() {}
+    ~WriteTestClusterNullableInt56u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x0000000F) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000400B) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedLongLong:mValue];
+
+        [cluster writeAttributeNullableInt56uWithValue:value
+                                                params:params
+                                     completionHandler:^(NSError * _Nullable error) {
+                                         if (error != nil) {
+                                             LogNSError("TestCluster NullableInt56u write Error", error);
+                                         }
+                                         SetCommandExitStatus(error);
+                                     }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint64_t mValue;
+};
+
+class SubscribeAttributeTestClusterNullableInt56u : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableInt56u()
+        : SubscribeAttribute("nullable-int56u")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableInt56u() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000400B) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeCurrentPositionTiltPercent100thsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNullableInt56uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.CurrentPositionTiltPercent100ths response %@", [value description]);
+                NSLog(@"TestCluster.NullableInt56u response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -90460,27 +88714,27 @@ class SubscribeAttributeWindowCoveringCurrentPositionTiltPercent100ths : public
 };
 
 /*
- * Attribute InstalledOpenLimitLift
+ * Attribute NullableInt64u
  */
-class ReadWindowCoveringInstalledOpenLimitLift : public ReadAttribute {
+class ReadTestClusterNullableInt64u : public ReadAttribute {
 public:
-    ReadWindowCoveringInstalledOpenLimitLift()
-        : ReadAttribute("installed-open-limit-lift")
+    ReadTestClusterNullableInt64u()
+        : ReadAttribute("nullable-int64u")
     {
     }
 
-    ~ReadWindowCoveringInstalledOpenLimitLift() {}
+    ~ReadTestClusterNullableInt64u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000400C) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeInstalledOpenLimitLiftWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WindowCovering.InstalledOpenLimitLift response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableInt64uWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableInt64u response %@", [value description]);
             if (error != nil) {
-                LogNSError("WindowCovering InstalledOpenLimitLift read Error", error);
+                LogNSError("TestCluster NullableInt64u read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -90488,97 +88742,70 @@ class ReadWindowCoveringInstalledOpenLimitLift : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWindowCoveringInstalledOpenLimitLift : public SubscribeAttribute {
+class WriteTestClusterNullableInt64u : public WriteAttribute {
 public:
-    SubscribeAttributeWindowCoveringInstalledOpenLimitLift()
-        : SubscribeAttribute("installed-open-limit-lift")
+    WriteTestClusterNullableInt64u()
+        : WriteAttribute("nullable-int64u")
     {
+        AddArgument("attr-name", "nullable-int64u");
+        AddArgument("attr-value", 0, UINT64_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWindowCoveringInstalledOpenLimitLift() {}
+    ~WriteTestClusterNullableInt64u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000010) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000400C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
-        params.keepPreviousSubscriptions
-            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
-        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInstalledOpenLimitLiftWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
-            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
-            params:params
-            subscriptionEstablished:^() {
-                mSubscriptionEstablished = YES;
-            }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.InstalledOpenLimitLift response %@", [value description]);
-                if (error || !mWait) {
-                    SetCommandExitStatus(error);
-                }
-            }];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedLongLong:mValue];
 
+        [cluster writeAttributeNullableInt64uWithValue:value
+                                                params:params
+                                     completionHandler:^(NSError * _Nullable error) {
+                                         if (error != nil) {
+                                             LogNSError("TestCluster NullableInt64u write Error", error);
+                                         }
+                                         SetCommandExitStatus(error);
+                                     }];
         return CHIP_NO_ERROR;
     }
-};
-
-/*
- * Attribute InstalledClosedLimitLift
- */
-class ReadWindowCoveringInstalledClosedLimitLift : public ReadAttribute {
-public:
-    ReadWindowCoveringInstalledClosedLimitLift()
-        : ReadAttribute("installed-closed-limit-lift")
-    {
-    }
-
-    ~ReadWindowCoveringInstalledClosedLimitLift() {}
-
-    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
-    {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000011) on endpoint %u", endpointId);
 
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeInstalledClosedLimitLiftWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.InstalledClosedLimitLift response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("WindowCovering InstalledClosedLimitLift read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
-        return CHIP_NO_ERROR;
-    }
+private:
+    uint64_t mValue;
 };
 
-class SubscribeAttributeWindowCoveringInstalledClosedLimitLift : public SubscribeAttribute {
+class SubscribeAttributeTestClusterNullableInt64u : public SubscribeAttribute {
 public:
-    SubscribeAttributeWindowCoveringInstalledClosedLimitLift()
-        : SubscribeAttribute("installed-closed-limit-lift")
+    SubscribeAttributeTestClusterNullableInt64u()
+        : SubscribeAttribute("nullable-int64u")
     {
     }
 
-    ~SubscribeAttributeWindowCoveringInstalledClosedLimitLift() {}
+    ~SubscribeAttributeTestClusterNullableInt64u() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000011) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000400C) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInstalledClosedLimitLiftWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNullableInt64uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.InstalledClosedLimitLift response %@", [value description]);
+                NSLog(@"TestCluster.NullableInt64u response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -90589,27 +88816,27 @@ class SubscribeAttributeWindowCoveringInstalledClosedLimitLift : public Subscrib
 };
 
 /*
- * Attribute InstalledOpenLimitTilt
+ * Attribute NullableInt8s
  */
-class ReadWindowCoveringInstalledOpenLimitTilt : public ReadAttribute {
+class ReadTestClusterNullableInt8s : public ReadAttribute {
 public:
-    ReadWindowCoveringInstalledOpenLimitTilt()
-        : ReadAttribute("installed-open-limit-tilt")
+    ReadTestClusterNullableInt8s()
+        : ReadAttribute("nullable-int8s")
     {
     }
 
-    ~ReadWindowCoveringInstalledOpenLimitTilt() {}
+    ~ReadTestClusterNullableInt8s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000400D) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeInstalledOpenLimitTiltWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WindowCovering.InstalledOpenLimitTilt response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableInt8sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableInt8s response %@", [value description]);
             if (error != nil) {
-                LogNSError("WindowCovering InstalledOpenLimitTilt read Error", error);
+                LogNSError("TestCluster NullableInt8s read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -90617,32 +88844,70 @@ class ReadWindowCoveringInstalledOpenLimitTilt : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWindowCoveringInstalledOpenLimitTilt : public SubscribeAttribute {
+class WriteTestClusterNullableInt8s : public WriteAttribute {
 public:
-    SubscribeAttributeWindowCoveringInstalledOpenLimitTilt()
-        : SubscribeAttribute("installed-open-limit-tilt")
+    WriteTestClusterNullableInt8s()
+        : WriteAttribute("nullable-int8s")
     {
+        AddArgument("attr-name", "nullable-int8s");
+        AddArgument("attr-value", INT8_MIN, INT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWindowCoveringInstalledOpenLimitTilt() {}
+    ~WriteTestClusterNullableInt8s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000012) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000400D) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithChar:mValue];
+
+        [cluster writeAttributeNullableInt8sWithValue:value
+                                               params:params
+                                    completionHandler:^(NSError * _Nullable error) {
+                                        if (error != nil) {
+                                            LogNSError("TestCluster NullableInt8s write Error", error);
+                                        }
+                                        SetCommandExitStatus(error);
+                                    }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    int8_t mValue;
+};
+
+class SubscribeAttributeTestClusterNullableInt8s : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableInt8s()
+        : SubscribeAttribute("nullable-int8s")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableInt8s() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000400D) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInstalledOpenLimitTiltWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNullableInt8sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.InstalledOpenLimitTilt response %@", [value description]);
+                NSLog(@"TestCluster.NullableInt8s response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -90653,61 +88918,98 @@ class SubscribeAttributeWindowCoveringInstalledOpenLimitTilt : public SubscribeA
 };
 
 /*
- * Attribute InstalledClosedLimitTilt
+ * Attribute NullableInt16s
  */
-class ReadWindowCoveringInstalledClosedLimitTilt : public ReadAttribute {
+class ReadTestClusterNullableInt16s : public ReadAttribute {
 public:
-    ReadWindowCoveringInstalledClosedLimitTilt()
-        : ReadAttribute("installed-closed-limit-tilt")
+    ReadTestClusterNullableInt16s()
+        : ReadAttribute("nullable-int16s")
     {
     }
 
-    ~ReadWindowCoveringInstalledClosedLimitTilt() {}
+    ~ReadTestClusterNullableInt16s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000400E) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster
-            readAttributeInstalledClosedLimitTiltWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.InstalledClosedLimitTilt response %@", [value description]);
-                if (error != nil) {
-                    LogNSError("WindowCovering InstalledClosedLimitTilt read Error", error);
-                }
-                SetCommandExitStatus(error);
-            }];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableInt16sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableInt16s response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TestCluster NullableInt16s read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
         return CHIP_NO_ERROR;
     }
 };
 
-class SubscribeAttributeWindowCoveringInstalledClosedLimitTilt : public SubscribeAttribute {
+class WriteTestClusterNullableInt16s : public WriteAttribute {
 public:
-    SubscribeAttributeWindowCoveringInstalledClosedLimitTilt()
-        : SubscribeAttribute("installed-closed-limit-tilt")
+    WriteTestClusterNullableInt16s()
+        : WriteAttribute("nullable-int16s")
     {
+        AddArgument("attr-name", "nullable-int16s");
+        AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWindowCoveringInstalledClosedLimitTilt() {}
+    ~WriteTestClusterNullableInt16s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000013) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000400E) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithShort:mValue];
+
+        [cluster writeAttributeNullableInt16sWithValue:value
+                                                params:params
+                                     completionHandler:^(NSError * _Nullable error) {
+                                         if (error != nil) {
+                                             LogNSError("TestCluster NullableInt16s write Error", error);
+                                         }
+                                         SetCommandExitStatus(error);
+                                     }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    int16_t mValue;
+};
+
+class SubscribeAttributeTestClusterNullableInt16s : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableInt16s()
+        : SubscribeAttribute("nullable-int16s")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableInt16s() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000400E) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeInstalledClosedLimitTiltWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNullableInt16sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.InstalledClosedLimitTilt response %@", [value description]);
+                NSLog(@"TestCluster.NullableInt16s response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -90718,27 +89020,27 @@ class SubscribeAttributeWindowCoveringInstalledClosedLimitTilt : public Subscrib
 };
 
 /*
- * Attribute Mode
+ * Attribute NullableInt24s
  */
-class ReadWindowCoveringMode : public ReadAttribute {
+class ReadTestClusterNullableInt24s : public ReadAttribute {
 public:
-    ReadWindowCoveringMode()
-        : ReadAttribute("mode")
+    ReadTestClusterNullableInt24s()
+        : ReadAttribute("nullable-int24s")
     {
     }
 
-    ~ReadWindowCoveringMode() {}
+    ~ReadTestClusterNullableInt24s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x00000017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000400F) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeModeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WindowCovering.Mode response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableInt24sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableInt24s response %@", [value description]);
             if (error != nil) {
-                LogNSError("WindowCovering Mode read Error", error);
+                LogNSError("TestCluster NullableInt24s read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -90746,70 +89048,70 @@ class ReadWindowCoveringMode : public ReadAttribute {
     }
 };
 
-class WriteWindowCoveringMode : public WriteAttribute {
+class WriteTestClusterNullableInt24s : public WriteAttribute {
 public:
-    WriteWindowCoveringMode()
-        : WriteAttribute("mode")
+    WriteTestClusterNullableInt24s()
+        : WriteAttribute("nullable-int24s")
     {
-        AddArgument("attr-name", "mode");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        AddArgument("attr-name", "nullable-int24s");
+        AddArgument("attr-value", INT32_MIN, INT32_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteWindowCoveringMode() {}
+    ~WriteTestClusterNullableInt24s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) WriteAttribute (0x00000017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000400F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
         params.timedWriteTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+        NSNumber * _Nullable value = [NSNumber numberWithInt:mValue];
 
-        [cluster writeAttributeModeWithValue:value
-                                      params:params
-                           completionHandler:^(NSError * _Nullable error) {
-                               if (error != nil) {
-                                   LogNSError("WindowCovering Mode write Error", error);
-                               }
-                               SetCommandExitStatus(error);
-                           }];
+        [cluster writeAttributeNullableInt24sWithValue:value
+                                                params:params
+                                     completionHandler:^(NSError * _Nullable error) {
+                                         if (error != nil) {
+                                             LogNSError("TestCluster NullableInt24s write Error", error);
+                                         }
+                                         SetCommandExitStatus(error);
+                                     }];
         return CHIP_NO_ERROR;
     }
 
 private:
-    uint8_t mValue;
+    int32_t mValue;
 };
 
-class SubscribeAttributeWindowCoveringMode : public SubscribeAttribute {
+class SubscribeAttributeTestClusterNullableInt24s : public SubscribeAttribute {
 public:
-    SubscribeAttributeWindowCoveringMode()
-        : SubscribeAttribute("mode")
+    SubscribeAttributeTestClusterNullableInt24s()
+        : SubscribeAttribute("nullable-int24s")
     {
     }
 
-    ~SubscribeAttributeWindowCoveringMode() {}
+    ~SubscribeAttributeTestClusterNullableInt24s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x00000017) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000400F) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNullableInt24sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.Mode response %@", [value description]);
+                NSLog(@"TestCluster.NullableInt24s response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -90820,27 +89122,27 @@ class SubscribeAttributeWindowCoveringMode : public SubscribeAttribute {
 };
 
 /*
- * Attribute SafetyStatus
+ * Attribute NullableInt32s
  */
-class ReadWindowCoveringSafetyStatus : public ReadAttribute {
+class ReadTestClusterNullableInt32s : public ReadAttribute {
 public:
-    ReadWindowCoveringSafetyStatus()
-        : ReadAttribute("safety-status")
+    ReadTestClusterNullableInt32s()
+        : ReadAttribute("nullable-int32s")
     {
     }
 
-    ~ReadWindowCoveringSafetyStatus() {}
+    ~ReadTestClusterNullableInt32s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x0000001A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004010) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeSafetyStatusWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WindowCovering.SafetyStatus response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableInt32sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableInt32s response %@", [value description]);
             if (error != nil) {
-                LogNSError("WindowCovering SafetyStatus read Error", error);
+                LogNSError("TestCluster NullableInt32s read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -90848,32 +89150,70 @@ class ReadWindowCoveringSafetyStatus : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWindowCoveringSafetyStatus : public SubscribeAttribute {
+class WriteTestClusterNullableInt32s : public WriteAttribute {
 public:
-    SubscribeAttributeWindowCoveringSafetyStatus()
-        : SubscribeAttribute("safety-status")
+    WriteTestClusterNullableInt32s()
+        : WriteAttribute("nullable-int32s")
     {
+        AddArgument("attr-name", "nullable-int32s");
+        AddArgument("attr-value", INT32_MIN, INT32_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWindowCoveringSafetyStatus() {}
+    ~WriteTestClusterNullableInt32s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x0000001A) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004010) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithInt:mValue];
+
+        [cluster writeAttributeNullableInt32sWithValue:value
+                                                params:params
+                                     completionHandler:^(NSError * _Nullable error) {
+                                         if (error != nil) {
+                                             LogNSError("TestCluster NullableInt32s write Error", error);
+                                         }
+                                         SetCommandExitStatus(error);
+                                     }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    int32_t mValue;
+};
+
+class SubscribeAttributeTestClusterNullableInt32s : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableInt32s()
+        : SubscribeAttribute("nullable-int32s")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableInt32s() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004010) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeSafetyStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNullableInt32sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.SafetyStatus response %@", [value description]);
+                NSLog(@"TestCluster.NullableInt32s response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -90884,27 +89224,27 @@ class SubscribeAttributeWindowCoveringSafetyStatus : public SubscribeAttribute {
 };
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute NullableInt40s
  */
-class ReadWindowCoveringGeneratedCommandList : public ReadAttribute {
+class ReadTestClusterNullableInt40s : public ReadAttribute {
 public:
-    ReadWindowCoveringGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadTestClusterNullableInt40s()
+        : ReadAttribute("nullable-int40s")
     {
     }
 
-    ~ReadWindowCoveringGeneratedCommandList() {}
+    ~ReadTestClusterNullableInt40s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004011) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WindowCovering.GeneratedCommandList response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableInt40sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableInt40s response %@", [value description]);
             if (error != nil) {
-                LogNSError("WindowCovering GeneratedCommandList read Error", error);
+                LogNSError("TestCluster NullableInt40s read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -90912,32 +89252,70 @@ class ReadWindowCoveringGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWindowCoveringGeneratedCommandList : public SubscribeAttribute {
+class WriteTestClusterNullableInt40s : public WriteAttribute {
 public:
-    SubscribeAttributeWindowCoveringGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    WriteTestClusterNullableInt40s()
+        : WriteAttribute("nullable-int40s")
     {
+        AddArgument("attr-name", "nullable-int40s");
+        AddArgument("attr-value", INT64_MIN, INT64_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWindowCoveringGeneratedCommandList() {}
+    ~WriteTestClusterNullableInt40s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004011) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithLongLong:mValue];
+
+        [cluster writeAttributeNullableInt40sWithValue:value
+                                                params:params
+                                     completionHandler:^(NSError * _Nullable error) {
+                                         if (error != nil) {
+                                             LogNSError("TestCluster NullableInt40s write Error", error);
+                                         }
+                                         SetCommandExitStatus(error);
+                                     }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    int64_t mValue;
+};
+
+class SubscribeAttributeTestClusterNullableInt40s : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableInt40s()
+        : SubscribeAttribute("nullable-int40s")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableInt40s() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004011) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNullableInt40sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableInt40s response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -90948,27 +89326,27 @@ class SubscribeAttributeWindowCoveringGeneratedCommandList : public SubscribeAtt
 };
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute NullableInt48s
  */
-class ReadWindowCoveringAcceptedCommandList : public ReadAttribute {
+class ReadTestClusterNullableInt48s : public ReadAttribute {
 public:
-    ReadWindowCoveringAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadTestClusterNullableInt48s()
+        : ReadAttribute("nullable-int48s")
     {
     }
 
-    ~ReadWindowCoveringAcceptedCommandList() {}
+    ~ReadTestClusterNullableInt48s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004012) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WindowCovering.AcceptedCommandList response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableInt48sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableInt48s response %@", [value description]);
             if (error != nil) {
-                LogNSError("WindowCovering AcceptedCommandList read Error", error);
+                LogNSError("TestCluster NullableInt48s read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -90976,32 +89354,70 @@ class ReadWindowCoveringAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWindowCoveringAcceptedCommandList : public SubscribeAttribute {
+class WriteTestClusterNullableInt48s : public WriteAttribute {
 public:
-    SubscribeAttributeWindowCoveringAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    WriteTestClusterNullableInt48s()
+        : WriteAttribute("nullable-int48s")
     {
+        AddArgument("attr-name", "nullable-int48s");
+        AddArgument("attr-value", INT64_MIN, INT64_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWindowCoveringAcceptedCommandList() {}
+    ~WriteTestClusterNullableInt48s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004012) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithLongLong:mValue];
+
+        [cluster writeAttributeNullableInt48sWithValue:value
+                                                params:params
+                                     completionHandler:^(NSError * _Nullable error) {
+                                         if (error != nil) {
+                                             LogNSError("TestCluster NullableInt48s write Error", error);
+                                         }
+                                         SetCommandExitStatus(error);
+                                     }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    int64_t mValue;
+};
+
+class SubscribeAttributeTestClusterNullableInt48s : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableInt48s()
+        : SubscribeAttribute("nullable-int48s")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableInt48s() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004012) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNullableInt48sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableInt48s response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -91012,27 +89428,27 @@ class SubscribeAttributeWindowCoveringAcceptedCommandList : public SubscribeAttr
 };
 
 /*
- * Attribute AttributeList
+ * Attribute NullableInt56s
  */
-class ReadWindowCoveringAttributeList : public ReadAttribute {
+class ReadTestClusterNullableInt56s : public ReadAttribute {
 public:
-    ReadWindowCoveringAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadTestClusterNullableInt56s()
+        : ReadAttribute("nullable-int56s")
     {
     }
 
-    ~ReadWindowCoveringAttributeList() {}
+    ~ReadTestClusterNullableInt56s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004013) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WindowCovering.AttributeList response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableInt56sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableInt56s response %@", [value description]);
             if (error != nil) {
-                LogNSError("WindowCovering AttributeList read Error", error);
+                LogNSError("TestCluster NullableInt56s read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -91040,32 +89456,70 @@ class ReadWindowCoveringAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWindowCoveringAttributeList : public SubscribeAttribute {
+class WriteTestClusterNullableInt56s : public WriteAttribute {
 public:
-    SubscribeAttributeWindowCoveringAttributeList()
-        : SubscribeAttribute("attribute-list")
+    WriteTestClusterNullableInt56s()
+        : WriteAttribute("nullable-int56s")
     {
+        AddArgument("attr-name", "nullable-int56s");
+        AddArgument("attr-value", INT64_MIN, INT64_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWindowCoveringAttributeList() {}
+    ~WriteTestClusterNullableInt56s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004013) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithLongLong:mValue];
+
+        [cluster writeAttributeNullableInt56sWithValue:value
+                                                params:params
+                                     completionHandler:^(NSError * _Nullable error) {
+                                         if (error != nil) {
+                                             LogNSError("TestCluster NullableInt56s write Error", error);
+                                         }
+                                         SetCommandExitStatus(error);
+                                     }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    int64_t mValue;
+};
+
+class SubscribeAttributeTestClusterNullableInt56s : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableInt56s()
+        : SubscribeAttribute("nullable-int56s")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableInt56s() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004013) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNullableInt56sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableInt56s response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -91076,27 +89530,27 @@ class SubscribeAttributeWindowCoveringAttributeList : public SubscribeAttribute
 };
 
 /*
- * Attribute FeatureMap
+ * Attribute NullableInt64s
  */
-class ReadWindowCoveringFeatureMap : public ReadAttribute {
+class ReadTestClusterNullableInt64s : public ReadAttribute {
 public:
-    ReadWindowCoveringFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadTestClusterNullableInt64s()
+        : ReadAttribute("nullable-int64s")
     {
     }
 
-    ~ReadWindowCoveringFeatureMap() {}
+    ~ReadTestClusterNullableInt64s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004014) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WindowCovering.FeatureMap response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableInt64sWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableInt64s response %@", [value description]);
             if (error != nil) {
-                LogNSError("WindowCovering FeatureMap read Error", error);
+                LogNSError("TestCluster NullableInt64s read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -91104,32 +89558,70 @@ class ReadWindowCoveringFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWindowCoveringFeatureMap : public SubscribeAttribute {
+class WriteTestClusterNullableInt64s : public WriteAttribute {
 public:
-    SubscribeAttributeWindowCoveringFeatureMap()
-        : SubscribeAttribute("feature-map")
+    WriteTestClusterNullableInt64s()
+        : WriteAttribute("nullable-int64s")
     {
+        AddArgument("attr-name", "nullable-int64s");
+        AddArgument("attr-value", INT64_MIN, INT64_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWindowCoveringFeatureMap() {}
+    ~WriteTestClusterNullableInt64s() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004014) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithLongLong:mValue];
+
+        [cluster writeAttributeNullableInt64sWithValue:value
+                                                params:params
+                                     completionHandler:^(NSError * _Nullable error) {
+                                         if (error != nil) {
+                                             LogNSError("TestCluster NullableInt64s write Error", error);
+                                         }
+                                         SetCommandExitStatus(error);
+                                     }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    int64_t mValue;
+};
+
+class SubscribeAttributeTestClusterNullableInt64s : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableInt64s()
+        : SubscribeAttribute("nullable-int64s")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableInt64s() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004014) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNullableInt64sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.FeatureMap response %@", [value description]);
+                NSLog(@"TestCluster.NullableInt64s response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -91140,27 +89632,27 @@ class SubscribeAttributeWindowCoveringFeatureMap : public SubscribeAttribute {
 };
 
 /*
- * Attribute ClusterRevision
+ * Attribute NullableEnum8
  */
-class ReadWindowCoveringClusterRevision : public ReadAttribute {
+class ReadTestClusterNullableEnum8 : public ReadAttribute {
 public:
-    ReadWindowCoveringClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadTestClusterNullableEnum8()
+        : ReadAttribute("nullable-enum8")
     {
     }
 
-    ~ReadWindowCoveringClusterRevision() {}
+    ~ReadTestClusterNullableEnum8() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004015) on endpoint %u", endpointId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"WindowCovering.ClusterRevision response %@", [value description]);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableEnum8WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableEnum8 response %@", [value description]);
             if (error != nil) {
-                LogNSError("WindowCovering ClusterRevision read Error", error);
+                LogNSError("TestCluster NullableEnum8 read Error", error);
             }
             SetCommandExitStatus(error);
         }];
@@ -91168,32 +89660,70 @@ class ReadWindowCoveringClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeWindowCoveringClusterRevision : public SubscribeAttribute {
+class WriteTestClusterNullableEnum8 : public WriteAttribute {
 public:
-    SubscribeAttributeWindowCoveringClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    WriteTestClusterNullableEnum8()
+        : WriteAttribute("nullable-enum8")
     {
+        AddArgument("attr-name", "nullable-enum8");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeWindowCoveringClusterRevision() {}
+    ~WriteTestClusterNullableEnum8() {}
 
     CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x00000102) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004015) on endpoint %u", endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeNullableEnum8WithValue:value
+                                               params:params
+                                    completionHandler:^(NSError * _Nullable error) {
+                                        if (error != nil) {
+                                            LogNSError("TestCluster NullableEnum8 write Error", error);
+                                        }
+                                        SetCommandExitStatus(error);
+                                    }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeTestClusterNullableEnum8 : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableEnum8()
+        : SubscribeAttribute("nullable-enum8")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableEnum8() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004015) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
         CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
-        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+        [cluster subscribeAttributeNullableEnum8WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
             maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
             params:params
             subscriptionEstablished:^() {
                 mSubscriptionEstablished = YES;
             }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"WindowCovering.ClusterRevision response %@", [value description]);
+                NSLog(@"TestCluster.NullableEnum8 response %@", [value description]);
                 if (error || !mWait) {
                     SetCommandExitStatus(error);
                 }
@@ -91203,1522 +89733,1507 @@ class SubscribeAttributeWindowCoveringClusterRevision : public SubscribeAttribut
     }
 };
 
-/*----------------------------------------------------------------------------*\
-| Register all Clusters commands                                               |
-\*----------------------------------------------------------------------------*/
-void registerClusterAccessControl(Commands & commands)
-{
-    using namespace chip::app::Clusters::AccessControl;
-
-    const char * clusterName = "AccessControl";
+/*
+ * Attribute NullableEnum16
+ */
+class ReadTestClusterNullableEnum16 : public ReadAttribute {
+public:
+    ReadTestClusterNullableEnum16()
+        : ReadAttribute("nullable-enum16")
+    {
+    }
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadAccessControlAcl>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<WriteAccessControlAcl>(), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeAccessControlAcl>(), //
-        make_unique<ReadAccessControlExtension>(), //
-        make_unique<WriteAccessControlExtension>(), //
-        make_unique<SubscribeAttributeAccessControlExtension>(), //
-        make_unique<ReadAccessControlSubjectsPerAccessControlEntry>(), //
-        make_unique<SubscribeAttributeAccessControlSubjectsPerAccessControlEntry>(), //
-        make_unique<ReadAccessControlTargetsPerAccessControlEntry>(), //
-        make_unique<SubscribeAttributeAccessControlTargetsPerAccessControlEntry>(), //
-        make_unique<ReadAccessControlAccessControlEntriesPerFabric>(), //
-        make_unique<SubscribeAttributeAccessControlAccessControlEntriesPerFabric>(), //
-        make_unique<ReadAccessControlGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeAccessControlGeneratedCommandList>(), //
-        make_unique<ReadAccessControlAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeAccessControlAcceptedCommandList>(), //
-        make_unique<ReadAccessControlAttributeList>(), //
-        make_unique<SubscribeAttributeAccessControlAttributeList>(), //
-        make_unique<ReadAccessControlFeatureMap>(), //
-        make_unique<SubscribeAttributeAccessControlFeatureMap>(), //
-        make_unique<ReadAccessControlClusterRevision>(), //
-        make_unique<SubscribeAttributeAccessControlClusterRevision>(), //
-    };
+    ~ReadTestClusterNullableEnum16() {}
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterAccountLogin(Commands & commands)
-{
-    using namespace chip::app::Clusters::AccountLogin;
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004016) on endpoint %u", endpointId);
 
-    const char * clusterName = "AccountLogin";
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableEnum16WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableEnum16 response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TestCluster NullableEnum16 read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<AccountLoginGetSetupPIN>(), //
-        make_unique<AccountLoginLogin>(), //
-        make_unique<AccountLoginLogout>(), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadAccountLoginGeneratedCommandList>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeAccountLoginGeneratedCommandList>(), //
-        make_unique<ReadAccountLoginAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeAccountLoginAcceptedCommandList>(), //
-        make_unique<ReadAccountLoginAttributeList>(), //
-        make_unique<SubscribeAttributeAccountLoginAttributeList>(), //
-        make_unique<ReadAccountLoginFeatureMap>(), //
-        make_unique<SubscribeAttributeAccountLoginFeatureMap>(), //
-        make_unique<ReadAccountLoginClusterRevision>(), //
-        make_unique<SubscribeAttributeAccountLoginClusterRevision>(), //
-    };
+class WriteTestClusterNullableEnum16 : public WriteAttribute {
+public:
+    WriteTestClusterNullableEnum16()
+        : WriteAttribute("nullable-enum16")
+    {
+        AddArgument("attr-name", "nullable-enum16");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterAdministratorCommissioning(Commands & commands)
-{
-    using namespace chip::app::Clusters::AdministratorCommissioning;
+    ~WriteTestClusterNullableEnum16() {}
 
-    const char * clusterName = "AdministratorCommissioning";
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004016) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedShort:mValue];
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<AdministratorCommissioningOpenCommissioningWindow>(), //
-        make_unique<AdministratorCommissioningOpenBasicCommissioningWindow>(), //
-        make_unique<AdministratorCommissioningRevokeCommissioning>(), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadAdministratorCommissioningWindowStatus>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeAdministratorCommissioningWindowStatus>(), //
-        make_unique<ReadAdministratorCommissioningAdminFabricIndex>(), //
-        make_unique<SubscribeAttributeAdministratorCommissioningAdminFabricIndex>(), //
-        make_unique<ReadAdministratorCommissioningAdminVendorId>(), //
-        make_unique<SubscribeAttributeAdministratorCommissioningAdminVendorId>(), //
-        make_unique<ReadAdministratorCommissioningGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeAdministratorCommissioningGeneratedCommandList>(), //
-        make_unique<ReadAdministratorCommissioningAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeAdministratorCommissioningAcceptedCommandList>(), //
-        make_unique<ReadAdministratorCommissioningAttributeList>(), //
-        make_unique<SubscribeAttributeAdministratorCommissioningAttributeList>(), //
-        make_unique<ReadAdministratorCommissioningFeatureMap>(), //
-        make_unique<SubscribeAttributeAdministratorCommissioningFeatureMap>(), //
-        make_unique<ReadAdministratorCommissioningClusterRevision>(), //
-        make_unique<SubscribeAttributeAdministratorCommissioningClusterRevision>(), //
-    };
+        [cluster writeAttributeNullableEnum16WithValue:value
+                                                params:params
+                                     completionHandler:^(NSError * _Nullable error) {
+                                         if (error != nil) {
+                                             LogNSError("TestCluster NullableEnum16 write Error", error);
+                                         }
+                                         SetCommandExitStatus(error);
+                                     }];
+        return CHIP_NO_ERROR;
+    }
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterApplicationBasic(Commands & commands)
-{
-    using namespace chip::app::Clusters::ApplicationBasic;
+private:
+    uint16_t mValue;
+};
 
-    const char * clusterName = "ApplicationBasic";
+class SubscribeAttributeTestClusterNullableEnum16 : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableEnum16()
+        : SubscribeAttribute("nullable-enum16")
+    {
+    }
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadApplicationBasicVendorName>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeApplicationBasicVendorName>(), //
-        make_unique<ReadApplicationBasicVendorID>(), //
-        make_unique<SubscribeAttributeApplicationBasicVendorID>(), //
-        make_unique<ReadApplicationBasicApplicationName>(), //
-        make_unique<SubscribeAttributeApplicationBasicApplicationName>(), //
-        make_unique<ReadApplicationBasicProductID>(), //
-        make_unique<SubscribeAttributeApplicationBasicProductID>(), //
-        make_unique<ReadApplicationBasicApplication>(), //
-        make_unique<SubscribeAttributeApplicationBasicApplication>(), //
-        make_unique<ReadApplicationBasicStatus>(), //
-        make_unique<SubscribeAttributeApplicationBasicStatus>(), //
-        make_unique<ReadApplicationBasicApplicationVersion>(), //
-        make_unique<SubscribeAttributeApplicationBasicApplicationVersion>(), //
-        make_unique<ReadApplicationBasicAllowedVendorList>(), //
-        make_unique<SubscribeAttributeApplicationBasicAllowedVendorList>(), //
-        make_unique<ReadApplicationBasicGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeApplicationBasicGeneratedCommandList>(), //
-        make_unique<ReadApplicationBasicAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeApplicationBasicAcceptedCommandList>(), //
-        make_unique<ReadApplicationBasicAttributeList>(), //
-        make_unique<SubscribeAttributeApplicationBasicAttributeList>(), //
-        make_unique<ReadApplicationBasicFeatureMap>(), //
-        make_unique<SubscribeAttributeApplicationBasicFeatureMap>(), //
-        make_unique<ReadApplicationBasicClusterRevision>(), //
-        make_unique<SubscribeAttributeApplicationBasicClusterRevision>(), //
-    };
+    ~SubscribeAttributeTestClusterNullableEnum16() {}
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterApplicationLauncher(Commands & commands)
-{
-    using namespace chip::app::Clusters::ApplicationLauncher;
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004016) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeNullableEnum16WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableEnum16 response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
-    const char * clusterName = "ApplicationLauncher";
+        return CHIP_NO_ERROR;
+    }
+};
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<ApplicationLauncherLaunchApp>(), //
-        make_unique<ApplicationLauncherStopApp>(), //
-        make_unique<ApplicationLauncherHideApp>(), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadApplicationLauncherCatalogList>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeApplicationLauncherCatalogList>(), //
-        make_unique<ReadApplicationLauncherCurrentApp>(), //
-        make_unique<WriteApplicationLauncherCurrentApp>(), //
-        make_unique<SubscribeAttributeApplicationLauncherCurrentApp>(), //
-        make_unique<ReadApplicationLauncherGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeApplicationLauncherGeneratedCommandList>(), //
-        make_unique<ReadApplicationLauncherAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeApplicationLauncherAcceptedCommandList>(), //
-        make_unique<ReadApplicationLauncherAttributeList>(), //
-        make_unique<SubscribeAttributeApplicationLauncherAttributeList>(), //
-        make_unique<ReadApplicationLauncherFeatureMap>(), //
-        make_unique<SubscribeAttributeApplicationLauncherFeatureMap>(), //
-        make_unique<ReadApplicationLauncherClusterRevision>(), //
-        make_unique<SubscribeAttributeApplicationLauncherClusterRevision>(), //
-    };
+/*
+ * Attribute NullableFloatSingle
+ */
+class ReadTestClusterNullableFloatSingle : public ReadAttribute {
+public:
+    ReadTestClusterNullableFloatSingle()
+        : ReadAttribute("nullable-float-single")
+    {
+    }
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterAudioOutput(Commands & commands)
-{
-    using namespace chip::app::Clusters::AudioOutput;
+    ~ReadTestClusterNullableFloatSingle() {}
 
-    const char * clusterName = "AudioOutput";
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004017) on endpoint %u", endpointId);
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<AudioOutputSelectOutput>(), //
-        make_unique<AudioOutputRenameOutput>(), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadAudioOutputOutputList>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeAudioOutputOutputList>(), //
-        make_unique<ReadAudioOutputCurrentOutput>(), //
-        make_unique<SubscribeAttributeAudioOutputCurrentOutput>(), //
-        make_unique<ReadAudioOutputGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeAudioOutputGeneratedCommandList>(), //
-        make_unique<ReadAudioOutputAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeAudioOutputAcceptedCommandList>(), //
-        make_unique<ReadAudioOutputAttributeList>(), //
-        make_unique<SubscribeAttributeAudioOutputAttributeList>(), //
-        make_unique<ReadAudioOutputFeatureMap>(), //
-        make_unique<SubscribeAttributeAudioOutputFeatureMap>(), //
-        make_unique<ReadAudioOutputClusterRevision>(), //
-        make_unique<SubscribeAttributeAudioOutputClusterRevision>(), //
-    };
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableFloatSingleWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableFloatSingle response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TestCluster NullableFloatSingle read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterBarrierControl(Commands & commands)
-{
-    using namespace chip::app::Clusters::BarrierControl;
+class WriteTestClusterNullableFloatSingle : public WriteAttribute {
+public:
+    WriteTestClusterNullableFloatSingle()
+        : WriteAttribute("nullable-float-single")
+    {
+        AddArgument("attr-name", "nullable-float-single");
+        AddArgument("attr-value", -std::numeric_limits<float>::infinity(), std::numeric_limits<float>::infinity(), &mValue);
+        WriteAttribute::AddArguments();
+    }
 
-    const char * clusterName = "BarrierControl";
+    ~WriteTestClusterNullableFloatSingle() {}
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<BarrierControlBarrierControlGoToPercent>(), //
-        make_unique<BarrierControlBarrierControlStop>(), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadBarrierControlBarrierMovingState>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeBarrierControlBarrierMovingState>(), //
-        make_unique<ReadBarrierControlBarrierSafetyStatus>(), //
-        make_unique<SubscribeAttributeBarrierControlBarrierSafetyStatus>(), //
-        make_unique<ReadBarrierControlBarrierCapabilities>(), //
-        make_unique<SubscribeAttributeBarrierControlBarrierCapabilities>(), //
-        make_unique<ReadBarrierControlBarrierOpenEvents>(), //
-        make_unique<WriteBarrierControlBarrierOpenEvents>(), //
-        make_unique<SubscribeAttributeBarrierControlBarrierOpenEvents>(), //
-        make_unique<ReadBarrierControlBarrierCloseEvents>(), //
-        make_unique<WriteBarrierControlBarrierCloseEvents>(), //
-        make_unique<SubscribeAttributeBarrierControlBarrierCloseEvents>(), //
-        make_unique<ReadBarrierControlBarrierCommandOpenEvents>(), //
-        make_unique<WriteBarrierControlBarrierCommandOpenEvents>(), //
-        make_unique<SubscribeAttributeBarrierControlBarrierCommandOpenEvents>(), //
-        make_unique<ReadBarrierControlBarrierCommandCloseEvents>(), //
-        make_unique<WriteBarrierControlBarrierCommandCloseEvents>(), //
-        make_unique<SubscribeAttributeBarrierControlBarrierCommandCloseEvents>(), //
-        make_unique<ReadBarrierControlBarrierOpenPeriod>(), //
-        make_unique<WriteBarrierControlBarrierOpenPeriod>(), //
-        make_unique<SubscribeAttributeBarrierControlBarrierOpenPeriod>(), //
-        make_unique<ReadBarrierControlBarrierClosePeriod>(), //
-        make_unique<WriteBarrierControlBarrierClosePeriod>(), //
-        make_unique<SubscribeAttributeBarrierControlBarrierClosePeriod>(), //
-        make_unique<ReadBarrierControlBarrierPosition>(), //
-        make_unique<SubscribeAttributeBarrierControlBarrierPosition>(), //
-        make_unique<ReadBarrierControlGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeBarrierControlGeneratedCommandList>(), //
-        make_unique<ReadBarrierControlAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeBarrierControlAcceptedCommandList>(), //
-        make_unique<ReadBarrierControlAttributeList>(), //
-        make_unique<SubscribeAttributeBarrierControlAttributeList>(), //
-        make_unique<ReadBarrierControlFeatureMap>(), //
-        make_unique<SubscribeAttributeBarrierControlFeatureMap>(), //
-        make_unique<ReadBarrierControlClusterRevision>(), //
-        make_unique<SubscribeAttributeBarrierControlClusterRevision>(), //
-    };
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004017) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithFloat:mValue];
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterBasic(Commands & commands)
-{
-    using namespace chip::app::Clusters::Basic;
+        [cluster writeAttributeNullableFloatSingleWithValue:value
+                                                     params:params
+                                          completionHandler:^(NSError * _Nullable error) {
+                                              if (error != nil) {
+                                                  LogNSError("TestCluster NullableFloatSingle write Error", error);
+                                              }
+                                              SetCommandExitStatus(error);
+                                          }];
+        return CHIP_NO_ERROR;
+    }
 
-    const char * clusterName = "Basic";
+private:
+    float mValue;
+};
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<BasicMfgSpecificPing>(), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadBasicDataModelRevision>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeBasicDataModelRevision>(), //
-        make_unique<ReadBasicVendorName>(), //
-        make_unique<SubscribeAttributeBasicVendorName>(), //
-        make_unique<ReadBasicVendorID>(), //
-        make_unique<SubscribeAttributeBasicVendorID>(), //
-        make_unique<ReadBasicProductName>(), //
-        make_unique<SubscribeAttributeBasicProductName>(), //
-        make_unique<ReadBasicProductID>(), //
-        make_unique<SubscribeAttributeBasicProductID>(), //
-        make_unique<ReadBasicNodeLabel>(), //
-        make_unique<WriteBasicNodeLabel>(), //
-        make_unique<SubscribeAttributeBasicNodeLabel>(), //
-        make_unique<ReadBasicLocation>(), //
-        make_unique<WriteBasicLocation>(), //
-        make_unique<SubscribeAttributeBasicLocation>(), //
-        make_unique<ReadBasicHardwareVersion>(), //
-        make_unique<SubscribeAttributeBasicHardwareVersion>(), //
-        make_unique<ReadBasicHardwareVersionString>(), //
-        make_unique<SubscribeAttributeBasicHardwareVersionString>(), //
-        make_unique<ReadBasicSoftwareVersion>(), //
-        make_unique<SubscribeAttributeBasicSoftwareVersion>(), //
-        make_unique<ReadBasicSoftwareVersionString>(), //
-        make_unique<SubscribeAttributeBasicSoftwareVersionString>(), //
-        make_unique<ReadBasicManufacturingDate>(), //
-        make_unique<SubscribeAttributeBasicManufacturingDate>(), //
-        make_unique<ReadBasicPartNumber>(), //
-        make_unique<SubscribeAttributeBasicPartNumber>(), //
-        make_unique<ReadBasicProductURL>(), //
-        make_unique<SubscribeAttributeBasicProductURL>(), //
-        make_unique<ReadBasicProductLabel>(), //
-        make_unique<SubscribeAttributeBasicProductLabel>(), //
-        make_unique<ReadBasicSerialNumber>(), //
-        make_unique<SubscribeAttributeBasicSerialNumber>(), //
-        make_unique<ReadBasicLocalConfigDisabled>(), //
-        make_unique<WriteBasicLocalConfigDisabled>(), //
-        make_unique<SubscribeAttributeBasicLocalConfigDisabled>(), //
-        make_unique<ReadBasicReachable>(), //
-        make_unique<SubscribeAttributeBasicReachable>(), //
-        make_unique<ReadBasicUniqueID>(), //
-        make_unique<SubscribeAttributeBasicUniqueID>(), //
-        make_unique<ReadBasicCapabilityMinima>(), //
-        make_unique<SubscribeAttributeBasicCapabilityMinima>(), //
-        make_unique<ReadBasicGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeBasicGeneratedCommandList>(), //
-        make_unique<ReadBasicAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeBasicAcceptedCommandList>(), //
-        make_unique<ReadBasicAttributeList>(), //
-        make_unique<SubscribeAttributeBasicAttributeList>(), //
-        make_unique<ReadBasicFeatureMap>(), //
-        make_unique<SubscribeAttributeBasicFeatureMap>(), //
-        make_unique<ReadBasicClusterRevision>(), //
-        make_unique<SubscribeAttributeBasicClusterRevision>(), //
-    };
+class SubscribeAttributeTestClusterNullableFloatSingle : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableFloatSingle()
+        : SubscribeAttribute("nullable-float-single")
+    {
+    }
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterBinaryInputBasic(Commands & commands)
-{
-    using namespace chip::app::Clusters::BinaryInputBasic;
+    ~SubscribeAttributeTestClusterNullableFloatSingle() {}
 
-    const char * clusterName = "BinaryInputBasic";
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004017) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeNullableFloatSingleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableFloatSingle response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadBinaryInputBasicActiveText>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<WriteBinaryInputBasicActiveText>(), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeBinaryInputBasicActiveText>(), //
-        make_unique<ReadBinaryInputBasicDescription>(), //
-        make_unique<WriteBinaryInputBasicDescription>(), //
-        make_unique<SubscribeAttributeBinaryInputBasicDescription>(), //
-        make_unique<ReadBinaryInputBasicInactiveText>(), //
-        make_unique<WriteBinaryInputBasicInactiveText>(), //
-        make_unique<SubscribeAttributeBinaryInputBasicInactiveText>(), //
-        make_unique<ReadBinaryInputBasicOutOfService>(), //
-        make_unique<WriteBinaryInputBasicOutOfService>(), //
-        make_unique<SubscribeAttributeBinaryInputBasicOutOfService>(), //
-        make_unique<ReadBinaryInputBasicPolarity>(), //
-        make_unique<SubscribeAttributeBinaryInputBasicPolarity>(), //
-        make_unique<ReadBinaryInputBasicPresentValue>(), //
-        make_unique<WriteBinaryInputBasicPresentValue>(), //
-        make_unique<SubscribeAttributeBinaryInputBasicPresentValue>(), //
-        make_unique<ReadBinaryInputBasicReliability>(), //
-        make_unique<WriteBinaryInputBasicReliability>(), //
-        make_unique<SubscribeAttributeBinaryInputBasicReliability>(), //
-        make_unique<ReadBinaryInputBasicStatusFlags>(), //
-        make_unique<SubscribeAttributeBinaryInputBasicStatusFlags>(), //
-        make_unique<ReadBinaryInputBasicApplicationType>(), //
-        make_unique<SubscribeAttributeBinaryInputBasicApplicationType>(), //
-        make_unique<ReadBinaryInputBasicGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeBinaryInputBasicGeneratedCommandList>(), //
-        make_unique<ReadBinaryInputBasicAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeBinaryInputBasicAcceptedCommandList>(), //
-        make_unique<ReadBinaryInputBasicAttributeList>(), //
-        make_unique<SubscribeAttributeBinaryInputBasicAttributeList>(), //
-        make_unique<ReadBinaryInputBasicFeatureMap>(), //
-        make_unique<SubscribeAttributeBinaryInputBasicFeatureMap>(), //
-        make_unique<ReadBinaryInputBasicClusterRevision>(), //
-        make_unique<SubscribeAttributeBinaryInputBasicClusterRevision>(), //
-    };
+        return CHIP_NO_ERROR;
+    }
+};
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterBinding(Commands & commands)
-{
-    using namespace chip::app::Clusters::Binding;
+/*
+ * Attribute NullableFloatDouble
+ */
+class ReadTestClusterNullableFloatDouble : public ReadAttribute {
+public:
+    ReadTestClusterNullableFloatDouble()
+        : ReadAttribute("nullable-float-double")
+    {
+    }
 
-    const char * clusterName = "Binding";
+    ~ReadTestClusterNullableFloatDouble() {}
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadBindingBinding>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<WriteBindingBinding>(), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeBindingBinding>(), //
-        make_unique<ReadBindingGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeBindingGeneratedCommandList>(), //
-        make_unique<ReadBindingAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeBindingAcceptedCommandList>(), //
-        make_unique<ReadBindingAttributeList>(), //
-        make_unique<SubscribeAttributeBindingAttributeList>(), //
-        make_unique<ReadBindingFeatureMap>(), //
-        make_unique<SubscribeAttributeBindingFeatureMap>(), //
-        make_unique<ReadBindingClusterRevision>(), //
-        make_unique<SubscribeAttributeBindingClusterRevision>(), //
-    };
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004018) on endpoint %u", endpointId);
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterBooleanState(Commands & commands)
-{
-    using namespace chip::app::Clusters::BooleanState;
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableFloatDoubleWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableFloatDouble response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TestCluster NullableFloatDouble read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
 
-    const char * clusterName = "BooleanState";
+class WriteTestClusterNullableFloatDouble : public WriteAttribute {
+public:
+    WriteTestClusterNullableFloatDouble()
+        : WriteAttribute("nullable-float-double")
+    {
+        AddArgument("attr-name", "nullable-float-double");
+        AddArgument("attr-value", -std::numeric_limits<double>::infinity(), std::numeric_limits<double>::infinity(), &mValue);
+        WriteAttribute::AddArguments();
+    }
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadBooleanStateStateValue>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeBooleanStateStateValue>(), //
-        make_unique<ReadBooleanStateGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeBooleanStateGeneratedCommandList>(), //
-        make_unique<ReadBooleanStateAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeBooleanStateAcceptedCommandList>(), //
-        make_unique<ReadBooleanStateAttributeList>(), //
-        make_unique<SubscribeAttributeBooleanStateAttributeList>(), //
-        make_unique<ReadBooleanStateFeatureMap>(), //
-        make_unique<SubscribeAttributeBooleanStateFeatureMap>(), //
-        make_unique<ReadBooleanStateClusterRevision>(), //
-        make_unique<SubscribeAttributeBooleanStateClusterRevision>(), //
-    };
+    ~WriteTestClusterNullableFloatDouble() {}
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterBridgedActions(Commands & commands)
-{
-    using namespace chip::app::Clusters::BridgedActions;
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004018) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithDouble:mValue];
 
-    const char * clusterName = "BridgedActions";
+        [cluster writeAttributeNullableFloatDoubleWithValue:value
+                                                     params:params
+                                          completionHandler:^(NSError * _Nullable error) {
+                                              if (error != nil) {
+                                                  LogNSError("TestCluster NullableFloatDouble write Error", error);
+                                              }
+                                              SetCommandExitStatus(error);
+                                          }];
+        return CHIP_NO_ERROR;
+    }
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<BridgedActionsInstantAction>(), //
-        make_unique<BridgedActionsInstantActionWithTransition>(), //
-        make_unique<BridgedActionsStartAction>(), //
-        make_unique<BridgedActionsStartActionWithDuration>(), //
-        make_unique<BridgedActionsStopAction>(), //
-        make_unique<BridgedActionsPauseAction>(), //
-        make_unique<BridgedActionsPauseActionWithDuration>(), //
-        make_unique<BridgedActionsResumeAction>(), //
-        make_unique<BridgedActionsEnableAction>(), //
-        make_unique<BridgedActionsEnableActionWithDuration>(), //
-        make_unique<BridgedActionsDisableAction>(), //
-        make_unique<BridgedActionsDisableActionWithDuration>(), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadBridgedActionsActionList>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeBridgedActionsActionList>(), //
-        make_unique<ReadBridgedActionsEndpointList>(), //
-        make_unique<SubscribeAttributeBridgedActionsEndpointList>(), //
-        make_unique<ReadBridgedActionsSetupUrl>(), //
-        make_unique<SubscribeAttributeBridgedActionsSetupUrl>(), //
-        make_unique<ReadBridgedActionsGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeBridgedActionsGeneratedCommandList>(), //
-        make_unique<ReadBridgedActionsAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeBridgedActionsAcceptedCommandList>(), //
-        make_unique<ReadBridgedActionsAttributeList>(), //
-        make_unique<SubscribeAttributeBridgedActionsAttributeList>(), //
-        make_unique<ReadBridgedActionsFeatureMap>(), //
-        make_unique<SubscribeAttributeBridgedActionsFeatureMap>(), //
-        make_unique<ReadBridgedActionsClusterRevision>(), //
-        make_unique<SubscribeAttributeBridgedActionsClusterRevision>(), //
-    };
+private:
+    double mValue;
+};
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterBridgedDeviceBasic(Commands & commands)
-{
-    using namespace chip::app::Clusters::BridgedDeviceBasic;
+class SubscribeAttributeTestClusterNullableFloatDouble : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableFloatDouble()
+        : SubscribeAttribute("nullable-float-double")
+    {
+    }
 
-    const char * clusterName = "BridgedDeviceBasic";
+    ~SubscribeAttributeTestClusterNullableFloatDouble() {}
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadBridgedDeviceBasicVendorName>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeBridgedDeviceBasicVendorName>(), //
-        make_unique<ReadBridgedDeviceBasicVendorID>(), //
-        make_unique<SubscribeAttributeBridgedDeviceBasicVendorID>(), //
-        make_unique<ReadBridgedDeviceBasicProductName>(), //
-        make_unique<SubscribeAttributeBridgedDeviceBasicProductName>(), //
-        make_unique<ReadBridgedDeviceBasicNodeLabel>(), //
-        make_unique<WriteBridgedDeviceBasicNodeLabel>(), //
-        make_unique<SubscribeAttributeBridgedDeviceBasicNodeLabel>(), //
-        make_unique<ReadBridgedDeviceBasicHardwareVersion>(), //
-        make_unique<SubscribeAttributeBridgedDeviceBasicHardwareVersion>(), //
-        make_unique<ReadBridgedDeviceBasicHardwareVersionString>(), //
-        make_unique<SubscribeAttributeBridgedDeviceBasicHardwareVersionString>(), //
-        make_unique<ReadBridgedDeviceBasicSoftwareVersion>(), //
-        make_unique<SubscribeAttributeBridgedDeviceBasicSoftwareVersion>(), //
-        make_unique<ReadBridgedDeviceBasicSoftwareVersionString>(), //
-        make_unique<SubscribeAttributeBridgedDeviceBasicSoftwareVersionString>(), //
-        make_unique<ReadBridgedDeviceBasicManufacturingDate>(), //
-        make_unique<SubscribeAttributeBridgedDeviceBasicManufacturingDate>(), //
-        make_unique<ReadBridgedDeviceBasicPartNumber>(), //
-        make_unique<SubscribeAttributeBridgedDeviceBasicPartNumber>(), //
-        make_unique<ReadBridgedDeviceBasicProductURL>(), //
-        make_unique<SubscribeAttributeBridgedDeviceBasicProductURL>(), //
-        make_unique<ReadBridgedDeviceBasicProductLabel>(), //
-        make_unique<SubscribeAttributeBridgedDeviceBasicProductLabel>(), //
-        make_unique<ReadBridgedDeviceBasicSerialNumber>(), //
-        make_unique<SubscribeAttributeBridgedDeviceBasicSerialNumber>(), //
-        make_unique<ReadBridgedDeviceBasicReachable>(), //
-        make_unique<SubscribeAttributeBridgedDeviceBasicReachable>(), //
-        make_unique<ReadBridgedDeviceBasicUniqueID>(), //
-        make_unique<SubscribeAttributeBridgedDeviceBasicUniqueID>(), //
-        make_unique<ReadBridgedDeviceBasicGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeBridgedDeviceBasicGeneratedCommandList>(), //
-        make_unique<ReadBridgedDeviceBasicAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeBridgedDeviceBasicAcceptedCommandList>(), //
-        make_unique<ReadBridgedDeviceBasicAttributeList>(), //
-        make_unique<SubscribeAttributeBridgedDeviceBasicAttributeList>(), //
-        make_unique<ReadBridgedDeviceBasicFeatureMap>(), //
-        make_unique<SubscribeAttributeBridgedDeviceBasicFeatureMap>(), //
-        make_unique<ReadBridgedDeviceBasicClusterRevision>(), //
-        make_unique<SubscribeAttributeBridgedDeviceBasicClusterRevision>(), //
-    };
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004018) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeNullableFloatDoubleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableFloatDouble response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterChannel(Commands & commands)
-{
-    using namespace chip::app::Clusters::Channel;
+        return CHIP_NO_ERROR;
+    }
+};
 
-    const char * clusterName = "Channel";
+/*
+ * Attribute NullableOctetString
+ */
+class ReadTestClusterNullableOctetString : public ReadAttribute {
+public:
+    ReadTestClusterNullableOctetString()
+        : ReadAttribute("nullable-octet-string")
+    {
+    }
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<ChannelChangeChannel>(), //
-        make_unique<ChannelChangeChannelByNumber>(), //
-        make_unique<ChannelSkipChannel>(), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadChannelChannelList>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeChannelChannelList>(), //
-        make_unique<ReadChannelLineup>(), //
-        make_unique<SubscribeAttributeChannelLineup>(), //
-        make_unique<ReadChannelCurrentChannel>(), //
-        make_unique<SubscribeAttributeChannelCurrentChannel>(), //
-        make_unique<ReadChannelGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeChannelGeneratedCommandList>(), //
-        make_unique<ReadChannelAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeChannelAcceptedCommandList>(), //
-        make_unique<ReadChannelAttributeList>(), //
-        make_unique<SubscribeAttributeChannelAttributeList>(), //
-        make_unique<ReadChannelFeatureMap>(), //
-        make_unique<SubscribeAttributeChannelFeatureMap>(), //
-        make_unique<ReadChannelClusterRevision>(), //
-        make_unique<SubscribeAttributeChannelClusterRevision>(), //
-    };
+    ~ReadTestClusterNullableOctetString() {}
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterColorControl(Commands & commands)
-{
-    using namespace chip::app::Clusters::ColorControl;
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004019) on endpoint %u", endpointId);
 
-    const char * clusterName = "ColorControl";
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableOctetStringWithCompletionHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableOctetString response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TestCluster NullableOctetString read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<ColorControlMoveToHue>(), //
-        make_unique<ColorControlMoveHue>(), //
-        make_unique<ColorControlStepHue>(), //
-        make_unique<ColorControlMoveToSaturation>(), //
-        make_unique<ColorControlMoveSaturation>(), //
-        make_unique<ColorControlStepSaturation>(), //
-        make_unique<ColorControlMoveToHueAndSaturation>(), //
-        make_unique<ColorControlMoveToColor>(), //
-        make_unique<ColorControlMoveColor>(), //
-        make_unique<ColorControlStepColor>(), //
-        make_unique<ColorControlMoveToColorTemperature>(), //
-        make_unique<ColorControlEnhancedMoveToHue>(), //
-        make_unique<ColorControlEnhancedMoveHue>(), //
-        make_unique<ColorControlEnhancedStepHue>(), //
-        make_unique<ColorControlEnhancedMoveToHueAndSaturation>(), //
-        make_unique<ColorControlColorLoopSet>(), //
-        make_unique<ColorControlStopMoveStep>(), //
-        make_unique<ColorControlMoveColorTemperature>(), //
-        make_unique<ColorControlStepColorTemperature>(), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadColorControlCurrentHue>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeColorControlCurrentHue>(), //
-        make_unique<ReadColorControlCurrentSaturation>(), //
-        make_unique<SubscribeAttributeColorControlCurrentSaturation>(), //
-        make_unique<ReadColorControlRemainingTime>(), //
-        make_unique<SubscribeAttributeColorControlRemainingTime>(), //
-        make_unique<ReadColorControlCurrentX>(), //
-        make_unique<SubscribeAttributeColorControlCurrentX>(), //
-        make_unique<ReadColorControlCurrentY>(), //
-        make_unique<SubscribeAttributeColorControlCurrentY>(), //
-        make_unique<ReadColorControlDriftCompensation>(), //
-        make_unique<SubscribeAttributeColorControlDriftCompensation>(), //
-        make_unique<ReadColorControlCompensationText>(), //
-        make_unique<SubscribeAttributeColorControlCompensationText>(), //
-        make_unique<ReadColorControlColorTemperature>(), //
-        make_unique<SubscribeAttributeColorControlColorTemperature>(), //
-        make_unique<ReadColorControlColorMode>(), //
-        make_unique<SubscribeAttributeColorControlColorMode>(), //
-        make_unique<ReadColorControlOptions>(), //
-        make_unique<WriteColorControlOptions>(), //
-        make_unique<SubscribeAttributeColorControlOptions>(), //
-        make_unique<ReadColorControlNumberOfPrimaries>(), //
-        make_unique<SubscribeAttributeColorControlNumberOfPrimaries>(), //
-        make_unique<ReadColorControlPrimary1X>(), //
-        make_unique<SubscribeAttributeColorControlPrimary1X>(), //
-        make_unique<ReadColorControlPrimary1Y>(), //
-        make_unique<SubscribeAttributeColorControlPrimary1Y>(), //
-        make_unique<ReadColorControlPrimary1Intensity>(), //
-        make_unique<SubscribeAttributeColorControlPrimary1Intensity>(), //
-        make_unique<ReadColorControlPrimary2X>(), //
-        make_unique<SubscribeAttributeColorControlPrimary2X>(), //
-        make_unique<ReadColorControlPrimary2Y>(), //
-        make_unique<SubscribeAttributeColorControlPrimary2Y>(), //
-        make_unique<ReadColorControlPrimary2Intensity>(), //
-        make_unique<SubscribeAttributeColorControlPrimary2Intensity>(), //
-        make_unique<ReadColorControlPrimary3X>(), //
-        make_unique<SubscribeAttributeColorControlPrimary3X>(), //
-        make_unique<ReadColorControlPrimary3Y>(), //
-        make_unique<SubscribeAttributeColorControlPrimary3Y>(), //
-        make_unique<ReadColorControlPrimary3Intensity>(), //
-        make_unique<SubscribeAttributeColorControlPrimary3Intensity>(), //
-        make_unique<ReadColorControlPrimary4X>(), //
-        make_unique<SubscribeAttributeColorControlPrimary4X>(), //
-        make_unique<ReadColorControlPrimary4Y>(), //
-        make_unique<SubscribeAttributeColorControlPrimary4Y>(), //
-        make_unique<ReadColorControlPrimary4Intensity>(), //
-        make_unique<SubscribeAttributeColorControlPrimary4Intensity>(), //
-        make_unique<ReadColorControlPrimary5X>(), //
-        make_unique<SubscribeAttributeColorControlPrimary5X>(), //
-        make_unique<ReadColorControlPrimary5Y>(), //
-        make_unique<SubscribeAttributeColorControlPrimary5Y>(), //
-        make_unique<ReadColorControlPrimary5Intensity>(), //
-        make_unique<SubscribeAttributeColorControlPrimary5Intensity>(), //
-        make_unique<ReadColorControlPrimary6X>(), //
-        make_unique<SubscribeAttributeColorControlPrimary6X>(), //
-        make_unique<ReadColorControlPrimary6Y>(), //
-        make_unique<SubscribeAttributeColorControlPrimary6Y>(), //
-        make_unique<ReadColorControlPrimary6Intensity>(), //
-        make_unique<SubscribeAttributeColorControlPrimary6Intensity>(), //
-        make_unique<ReadColorControlWhitePointX>(), //
-        make_unique<WriteColorControlWhitePointX>(), //
-        make_unique<SubscribeAttributeColorControlWhitePointX>(), //
-        make_unique<ReadColorControlWhitePointY>(), //
-        make_unique<WriteColorControlWhitePointY>(), //
-        make_unique<SubscribeAttributeColorControlWhitePointY>(), //
-        make_unique<ReadColorControlColorPointRX>(), //
-        make_unique<WriteColorControlColorPointRX>(), //
-        make_unique<SubscribeAttributeColorControlColorPointRX>(), //
-        make_unique<ReadColorControlColorPointRY>(), //
-        make_unique<WriteColorControlColorPointRY>(), //
-        make_unique<SubscribeAttributeColorControlColorPointRY>(), //
-        make_unique<ReadColorControlColorPointRIntensity>(), //
-        make_unique<WriteColorControlColorPointRIntensity>(), //
-        make_unique<SubscribeAttributeColorControlColorPointRIntensity>(), //
-        make_unique<ReadColorControlColorPointGX>(), //
-        make_unique<WriteColorControlColorPointGX>(), //
-        make_unique<SubscribeAttributeColorControlColorPointGX>(), //
-        make_unique<ReadColorControlColorPointGY>(), //
-        make_unique<WriteColorControlColorPointGY>(), //
-        make_unique<SubscribeAttributeColorControlColorPointGY>(), //
-        make_unique<ReadColorControlColorPointGIntensity>(), //
-        make_unique<WriteColorControlColorPointGIntensity>(), //
-        make_unique<SubscribeAttributeColorControlColorPointGIntensity>(), //
-        make_unique<ReadColorControlColorPointBX>(), //
-        make_unique<WriteColorControlColorPointBX>(), //
-        make_unique<SubscribeAttributeColorControlColorPointBX>(), //
-        make_unique<ReadColorControlColorPointBY>(), //
-        make_unique<WriteColorControlColorPointBY>(), //
-        make_unique<SubscribeAttributeColorControlColorPointBY>(), //
-        make_unique<ReadColorControlColorPointBIntensity>(), //
-        make_unique<WriteColorControlColorPointBIntensity>(), //
-        make_unique<SubscribeAttributeColorControlColorPointBIntensity>(), //
-        make_unique<ReadColorControlEnhancedCurrentHue>(), //
-        make_unique<SubscribeAttributeColorControlEnhancedCurrentHue>(), //
-        make_unique<ReadColorControlEnhancedColorMode>(), //
-        make_unique<SubscribeAttributeColorControlEnhancedColorMode>(), //
-        make_unique<ReadColorControlColorLoopActive>(), //
-        make_unique<SubscribeAttributeColorControlColorLoopActive>(), //
-        make_unique<ReadColorControlColorLoopDirection>(), //
-        make_unique<SubscribeAttributeColorControlColorLoopDirection>(), //
-        make_unique<ReadColorControlColorLoopTime>(), //
-        make_unique<SubscribeAttributeColorControlColorLoopTime>(), //
-        make_unique<ReadColorControlColorLoopStartEnhancedHue>(), //
-        make_unique<SubscribeAttributeColorControlColorLoopStartEnhancedHue>(), //
-        make_unique<ReadColorControlColorLoopStoredEnhancedHue>(), //
-        make_unique<SubscribeAttributeColorControlColorLoopStoredEnhancedHue>(), //
-        make_unique<ReadColorControlColorCapabilities>(), //
-        make_unique<SubscribeAttributeColorControlColorCapabilities>(), //
-        make_unique<ReadColorControlColorTempPhysicalMinMireds>(), //
-        make_unique<SubscribeAttributeColorControlColorTempPhysicalMinMireds>(), //
-        make_unique<ReadColorControlColorTempPhysicalMaxMireds>(), //
-        make_unique<SubscribeAttributeColorControlColorTempPhysicalMaxMireds>(), //
-        make_unique<ReadColorControlCoupleColorTempToLevelMinMireds>(), //
-        make_unique<SubscribeAttributeColorControlCoupleColorTempToLevelMinMireds>(), //
-        make_unique<ReadColorControlStartUpColorTemperatureMireds>(), //
-        make_unique<WriteColorControlStartUpColorTemperatureMireds>(), //
-        make_unique<SubscribeAttributeColorControlStartUpColorTemperatureMireds>(), //
-        make_unique<ReadColorControlGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeColorControlGeneratedCommandList>(), //
-        make_unique<ReadColorControlAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeColorControlAcceptedCommandList>(), //
-        make_unique<ReadColorControlAttributeList>(), //
-        make_unique<SubscribeAttributeColorControlAttributeList>(), //
-        make_unique<ReadColorControlFeatureMap>(), //
-        make_unique<SubscribeAttributeColorControlFeatureMap>(), //
-        make_unique<ReadColorControlClusterRevision>(), //
-        make_unique<SubscribeAttributeColorControlClusterRevision>(), //
-    };
+class WriteTestClusterNullableOctetString : public WriteAttribute {
+public:
+    WriteTestClusterNullableOctetString()
+        : WriteAttribute("nullable-octet-string")
+    {
+        AddArgument("attr-name", "nullable-octet-string");
+        AddArgument("attr-value", &mValue);
+        WriteAttribute::AddArguments();
+    }
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterContentLauncher(Commands & commands)
-{
-    using namespace chip::app::Clusters::ContentLauncher;
+    ~WriteTestClusterNullableOctetString() {}
 
-    const char * clusterName = "ContentLauncher";
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004019) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSData * _Nullable value = [[NSData alloc] initWithBytes:mValue.data() length:mValue.size()];
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<ContentLauncherLaunchContent>(), //
-        make_unique<ContentLauncherLaunchURL>(), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadContentLauncherAcceptHeader>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeContentLauncherAcceptHeader>(), //
-        make_unique<ReadContentLauncherSupportedStreamingProtocols>(), //
-        make_unique<WriteContentLauncherSupportedStreamingProtocols>(), //
-        make_unique<SubscribeAttributeContentLauncherSupportedStreamingProtocols>(), //
-        make_unique<ReadContentLauncherGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeContentLauncherGeneratedCommandList>(), //
-        make_unique<ReadContentLauncherAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeContentLauncherAcceptedCommandList>(), //
-        make_unique<ReadContentLauncherAttributeList>(), //
-        make_unique<SubscribeAttributeContentLauncherAttributeList>(), //
-        make_unique<ReadContentLauncherFeatureMap>(), //
-        make_unique<SubscribeAttributeContentLauncherFeatureMap>(), //
-        make_unique<ReadContentLauncherClusterRevision>(), //
-        make_unique<SubscribeAttributeContentLauncherClusterRevision>(), //
-    };
+        [cluster writeAttributeNullableOctetStringWithValue:value
+                                                     params:params
+                                          completionHandler:^(NSError * _Nullable error) {
+                                              if (error != nil) {
+                                                  LogNSError("TestCluster NullableOctetString write Error", error);
+                                              }
+                                              SetCommandExitStatus(error);
+                                          }];
+        return CHIP_NO_ERROR;
+    }
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterDescriptor(Commands & commands)
-{
-    using namespace chip::app::Clusters::Descriptor;
+private:
+    chip::ByteSpan mValue;
+};
 
-    const char * clusterName = "Descriptor";
+class SubscribeAttributeTestClusterNullableOctetString : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableOctetString()
+        : SubscribeAttribute("nullable-octet-string")
+    {
+    }
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadDescriptorDeviceList>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeDescriptorDeviceList>(), //
-        make_unique<ReadDescriptorServerList>(), //
-        make_unique<SubscribeAttributeDescriptorServerList>(), //
-        make_unique<ReadDescriptorClientList>(), //
-        make_unique<SubscribeAttributeDescriptorClientList>(), //
-        make_unique<ReadDescriptorPartsList>(), //
-        make_unique<SubscribeAttributeDescriptorPartsList>(), //
-        make_unique<ReadDescriptorGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeDescriptorGeneratedCommandList>(), //
-        make_unique<ReadDescriptorAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeDescriptorAcceptedCommandList>(), //
-        make_unique<ReadDescriptorAttributeList>(), //
-        make_unique<SubscribeAttributeDescriptorAttributeList>(), //
-        make_unique<ReadDescriptorFeatureMap>(), //
-        make_unique<SubscribeAttributeDescriptorFeatureMap>(), //
-        make_unique<ReadDescriptorClusterRevision>(), //
-        make_unique<SubscribeAttributeDescriptorClusterRevision>(), //
-    };
+    ~SubscribeAttributeTestClusterNullableOctetString() {}
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterDiagnosticLogs(Commands & commands)
-{
-    using namespace chip::app::Clusters::DiagnosticLogs;
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004019) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeNullableOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSData * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableOctetString response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
-    const char * clusterName = "DiagnosticLogs";
+        return CHIP_NO_ERROR;
+    }
+};
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<DiagnosticLogsRetrieveLogsRequest>(), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadDiagnosticLogsGeneratedCommandList>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeDiagnosticLogsGeneratedCommandList>(), //
-        make_unique<ReadDiagnosticLogsAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeDiagnosticLogsAcceptedCommandList>(), //
-        make_unique<ReadDiagnosticLogsAttributeList>(), //
-        make_unique<SubscribeAttributeDiagnosticLogsAttributeList>(), //
-        make_unique<ReadDiagnosticLogsFeatureMap>(), //
-        make_unique<SubscribeAttributeDiagnosticLogsFeatureMap>(), //
-        make_unique<ReadDiagnosticLogsClusterRevision>(), //
-        make_unique<SubscribeAttributeDiagnosticLogsClusterRevision>(), //
-    };
+/*
+ * Attribute NullableCharString
+ */
+class ReadTestClusterNullableCharString : public ReadAttribute {
+public:
+    ReadTestClusterNullableCharString()
+        : ReadAttribute("nullable-char-string")
+    {
+    }
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterDoorLock(Commands & commands)
-{
-    using namespace chip::app::Clusters::DoorLock;
+    ~ReadTestClusterNullableCharString() {}
 
-    const char * clusterName = "DoorLock";
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000401E) on endpoint %u", endpointId);
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<DoorLockLockDoor>(), //
-        make_unique<DoorLockUnlockDoor>(), //
-        make_unique<DoorLockUnlockWithTimeout>(), //
-        make_unique<DoorLockSetWeekDaySchedule>(), //
-        make_unique<DoorLockGetWeekDaySchedule>(), //
-        make_unique<DoorLockClearWeekDaySchedule>(), //
-        make_unique<DoorLockSetYearDaySchedule>(), //
-        make_unique<DoorLockGetYearDaySchedule>(), //
-        make_unique<DoorLockClearYearDaySchedule>(), //
-        make_unique<DoorLockSetHolidaySchedule>(), //
-        make_unique<DoorLockGetHolidaySchedule>(), //
-        make_unique<DoorLockClearHolidaySchedule>(), //
-        make_unique<DoorLockSetUser>(), //
-        make_unique<DoorLockGetUser>(), //
-        make_unique<DoorLockClearUser>(), //
-        make_unique<DoorLockSetCredential>(), //
-        make_unique<DoorLockGetCredentialStatus>(), //
-        make_unique<DoorLockClearCredential>(), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadDoorLockLockState>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeDoorLockLockState>(), //
-        make_unique<ReadDoorLockLockType>(), //
-        make_unique<SubscribeAttributeDoorLockLockType>(), //
-        make_unique<ReadDoorLockActuatorEnabled>(), //
-        make_unique<SubscribeAttributeDoorLockActuatorEnabled>(), //
-        make_unique<ReadDoorLockDoorState>(), //
-        make_unique<SubscribeAttributeDoorLockDoorState>(), //
-        make_unique<ReadDoorLockDoorOpenEvents>(), //
-        make_unique<WriteDoorLockDoorOpenEvents>(), //
-        make_unique<SubscribeAttributeDoorLockDoorOpenEvents>(), //
-        make_unique<ReadDoorLockDoorClosedEvents>(), //
-        make_unique<WriteDoorLockDoorClosedEvents>(), //
-        make_unique<SubscribeAttributeDoorLockDoorClosedEvents>(), //
-        make_unique<ReadDoorLockOpenPeriod>(), //
-        make_unique<WriteDoorLockOpenPeriod>(), //
-        make_unique<SubscribeAttributeDoorLockOpenPeriod>(), //
-        make_unique<ReadDoorLockNumberOfTotalUsersSupported>(), //
-        make_unique<SubscribeAttributeDoorLockNumberOfTotalUsersSupported>(), //
-        make_unique<ReadDoorLockNumberOfPINUsersSupported>(), //
-        make_unique<SubscribeAttributeDoorLockNumberOfPINUsersSupported>(), //
-        make_unique<ReadDoorLockNumberOfRFIDUsersSupported>(), //
-        make_unique<SubscribeAttributeDoorLockNumberOfRFIDUsersSupported>(), //
-        make_unique<ReadDoorLockNumberOfWeekDaySchedulesSupportedPerUser>(), //
-        make_unique<SubscribeAttributeDoorLockNumberOfWeekDaySchedulesSupportedPerUser>(), //
-        make_unique<ReadDoorLockNumberOfYearDaySchedulesSupportedPerUser>(), //
-        make_unique<SubscribeAttributeDoorLockNumberOfYearDaySchedulesSupportedPerUser>(), //
-        make_unique<ReadDoorLockNumberOfHolidaySchedulesSupported>(), //
-        make_unique<SubscribeAttributeDoorLockNumberOfHolidaySchedulesSupported>(), //
-        make_unique<ReadDoorLockMaxPINCodeLength>(), //
-        make_unique<SubscribeAttributeDoorLockMaxPINCodeLength>(), //
-        make_unique<ReadDoorLockMinPINCodeLength>(), //
-        make_unique<SubscribeAttributeDoorLockMinPINCodeLength>(), //
-        make_unique<ReadDoorLockMaxRFIDCodeLength>(), //
-        make_unique<SubscribeAttributeDoorLockMaxRFIDCodeLength>(), //
-        make_unique<ReadDoorLockMinRFIDCodeLength>(), //
-        make_unique<SubscribeAttributeDoorLockMinRFIDCodeLength>(), //
-        make_unique<ReadDoorLockCredentialRulesSupport>(), //
-        make_unique<SubscribeAttributeDoorLockCredentialRulesSupport>(), //
-        make_unique<ReadDoorLockNumberOfCredentialsSupportedPerUser>(), //
-        make_unique<SubscribeAttributeDoorLockNumberOfCredentialsSupportedPerUser>(), //
-        make_unique<ReadDoorLockLanguage>(), //
-        make_unique<WriteDoorLockLanguage>(), //
-        make_unique<SubscribeAttributeDoorLockLanguage>(), //
-        make_unique<ReadDoorLockLEDSettings>(), //
-        make_unique<WriteDoorLockLEDSettings>(), //
-        make_unique<SubscribeAttributeDoorLockLEDSettings>(), //
-        make_unique<ReadDoorLockAutoRelockTime>(), //
-        make_unique<WriteDoorLockAutoRelockTime>(), //
-        make_unique<SubscribeAttributeDoorLockAutoRelockTime>(), //
-        make_unique<ReadDoorLockSoundVolume>(), //
-        make_unique<WriteDoorLockSoundVolume>(), //
-        make_unique<SubscribeAttributeDoorLockSoundVolume>(), //
-        make_unique<ReadDoorLockOperatingMode>(), //
-        make_unique<WriteDoorLockOperatingMode>(), //
-        make_unique<SubscribeAttributeDoorLockOperatingMode>(), //
-        make_unique<ReadDoorLockSupportedOperatingModes>(), //
-        make_unique<SubscribeAttributeDoorLockSupportedOperatingModes>(), //
-        make_unique<ReadDoorLockDefaultConfigurationRegister>(), //
-        make_unique<SubscribeAttributeDoorLockDefaultConfigurationRegister>(), //
-        make_unique<ReadDoorLockEnableLocalProgramming>(), //
-        make_unique<WriteDoorLockEnableLocalProgramming>(), //
-        make_unique<SubscribeAttributeDoorLockEnableLocalProgramming>(), //
-        make_unique<ReadDoorLockEnableOneTouchLocking>(), //
-        make_unique<WriteDoorLockEnableOneTouchLocking>(), //
-        make_unique<SubscribeAttributeDoorLockEnableOneTouchLocking>(), //
-        make_unique<ReadDoorLockEnableInsideStatusLED>(), //
-        make_unique<WriteDoorLockEnableInsideStatusLED>(), //
-        make_unique<SubscribeAttributeDoorLockEnableInsideStatusLED>(), //
-        make_unique<ReadDoorLockEnablePrivacyModeButton>(), //
-        make_unique<WriteDoorLockEnablePrivacyModeButton>(), //
-        make_unique<SubscribeAttributeDoorLockEnablePrivacyModeButton>(), //
-        make_unique<ReadDoorLockLocalProgrammingFeatures>(), //
-        make_unique<WriteDoorLockLocalProgrammingFeatures>(), //
-        make_unique<SubscribeAttributeDoorLockLocalProgrammingFeatures>(), //
-        make_unique<ReadDoorLockWrongCodeEntryLimit>(), //
-        make_unique<WriteDoorLockWrongCodeEntryLimit>(), //
-        make_unique<SubscribeAttributeDoorLockWrongCodeEntryLimit>(), //
-        make_unique<ReadDoorLockUserCodeTemporaryDisableTime>(), //
-        make_unique<WriteDoorLockUserCodeTemporaryDisableTime>(), //
-        make_unique<SubscribeAttributeDoorLockUserCodeTemporaryDisableTime>(), //
-        make_unique<ReadDoorLockSendPINOverTheAir>(), //
-        make_unique<WriteDoorLockSendPINOverTheAir>(), //
-        make_unique<SubscribeAttributeDoorLockSendPINOverTheAir>(), //
-        make_unique<ReadDoorLockRequirePINforRemoteOperation>(), //
-        make_unique<WriteDoorLockRequirePINforRemoteOperation>(), //
-        make_unique<SubscribeAttributeDoorLockRequirePINforRemoteOperation>(), //
-        make_unique<ReadDoorLockExpiringUserTimeout>(), //
-        make_unique<WriteDoorLockExpiringUserTimeout>(), //
-        make_unique<SubscribeAttributeDoorLockExpiringUserTimeout>(), //
-        make_unique<ReadDoorLockGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeDoorLockGeneratedCommandList>(), //
-        make_unique<ReadDoorLockAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeDoorLockAcceptedCommandList>(), //
-        make_unique<ReadDoorLockAttributeList>(), //
-        make_unique<SubscribeAttributeDoorLockAttributeList>(), //
-        make_unique<ReadDoorLockFeatureMap>(), //
-        make_unique<SubscribeAttributeDoorLockFeatureMap>(), //
-        make_unique<ReadDoorLockClusterRevision>(), //
-        make_unique<SubscribeAttributeDoorLockClusterRevision>(), //
-    };
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableCharStringWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableCharString response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TestCluster NullableCharString read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterElectricalMeasurement(Commands & commands)
-{
-    using namespace chip::app::Clusters::ElectricalMeasurement;
+class WriteTestClusterNullableCharString : public WriteAttribute {
+public:
+    WriteTestClusterNullableCharString()
+        : WriteAttribute("nullable-char-string")
+    {
+        AddArgument("attr-name", "nullable-char-string");
+        AddArgument("attr-value", &mValue);
+        WriteAttribute::AddArguments();
+    }
 
-    const char * clusterName = "ElectricalMeasurement";
+    ~WriteTestClusterNullableCharString() {}
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<ElectricalMeasurementGetProfileInfoCommand>(), //
-        make_unique<ElectricalMeasurementGetMeasurementProfileCommand>(), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadElectricalMeasurementMeasurementType>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeElectricalMeasurementMeasurementType>(), //
-        make_unique<ReadElectricalMeasurementDcVoltage>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementDcVoltage>(), //
-        make_unique<ReadElectricalMeasurementDcVoltageMin>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementDcVoltageMin>(), //
-        make_unique<ReadElectricalMeasurementDcVoltageMax>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementDcVoltageMax>(), //
-        make_unique<ReadElectricalMeasurementDcCurrent>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementDcCurrent>(), //
-        make_unique<ReadElectricalMeasurementDcCurrentMin>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementDcCurrentMin>(), //
-        make_unique<ReadElectricalMeasurementDcCurrentMax>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementDcCurrentMax>(), //
-        make_unique<ReadElectricalMeasurementDcPower>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementDcPower>(), //
-        make_unique<ReadElectricalMeasurementDcPowerMin>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementDcPowerMin>(), //
-        make_unique<ReadElectricalMeasurementDcPowerMax>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementDcPowerMax>(), //
-        make_unique<ReadElectricalMeasurementDcVoltageMultiplier>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementDcVoltageMultiplier>(), //
-        make_unique<ReadElectricalMeasurementDcVoltageDivisor>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementDcVoltageDivisor>(), //
-        make_unique<ReadElectricalMeasurementDcCurrentMultiplier>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementDcCurrentMultiplier>(), //
-        make_unique<ReadElectricalMeasurementDcCurrentDivisor>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementDcCurrentDivisor>(), //
-        make_unique<ReadElectricalMeasurementDcPowerMultiplier>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementDcPowerMultiplier>(), //
-        make_unique<ReadElectricalMeasurementDcPowerDivisor>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementDcPowerDivisor>(), //
-        make_unique<ReadElectricalMeasurementAcFrequency>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAcFrequency>(), //
-        make_unique<ReadElectricalMeasurementAcFrequencyMin>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAcFrequencyMin>(), //
-        make_unique<ReadElectricalMeasurementAcFrequencyMax>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAcFrequencyMax>(), //
-        make_unique<ReadElectricalMeasurementNeutralCurrent>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementNeutralCurrent>(), //
-        make_unique<ReadElectricalMeasurementTotalActivePower>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementTotalActivePower>(), //
-        make_unique<ReadElectricalMeasurementTotalReactivePower>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementTotalReactivePower>(), //
-        make_unique<ReadElectricalMeasurementTotalApparentPower>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementTotalApparentPower>(), //
-        make_unique<ReadElectricalMeasurementMeasured1stHarmonicCurrent>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementMeasured1stHarmonicCurrent>(), //
-        make_unique<ReadElectricalMeasurementMeasured3rdHarmonicCurrent>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementMeasured3rdHarmonicCurrent>(), //
-        make_unique<ReadElectricalMeasurementMeasured5thHarmonicCurrent>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementMeasured5thHarmonicCurrent>(), //
-        make_unique<ReadElectricalMeasurementMeasured7thHarmonicCurrent>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementMeasured7thHarmonicCurrent>(), //
-        make_unique<ReadElectricalMeasurementMeasured9thHarmonicCurrent>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementMeasured9thHarmonicCurrent>(), //
-        make_unique<ReadElectricalMeasurementMeasured11thHarmonicCurrent>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementMeasured11thHarmonicCurrent>(), //
-        make_unique<ReadElectricalMeasurementMeasuredPhase1stHarmonicCurrent>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementMeasuredPhase1stHarmonicCurrent>(), //
-        make_unique<ReadElectricalMeasurementMeasuredPhase3rdHarmonicCurrent>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementMeasuredPhase3rdHarmonicCurrent>(), //
-        make_unique<ReadElectricalMeasurementMeasuredPhase5thHarmonicCurrent>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementMeasuredPhase5thHarmonicCurrent>(), //
-        make_unique<ReadElectricalMeasurementMeasuredPhase7thHarmonicCurrent>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementMeasuredPhase7thHarmonicCurrent>(), //
-        make_unique<ReadElectricalMeasurementMeasuredPhase9thHarmonicCurrent>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementMeasuredPhase9thHarmonicCurrent>(), //
-        make_unique<ReadElectricalMeasurementMeasuredPhase11thHarmonicCurrent>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementMeasuredPhase11thHarmonicCurrent>(), //
-        make_unique<ReadElectricalMeasurementAcFrequencyMultiplier>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAcFrequencyMultiplier>(), //
-        make_unique<ReadElectricalMeasurementAcFrequencyDivisor>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAcFrequencyDivisor>(), //
-        make_unique<ReadElectricalMeasurementPowerMultiplier>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementPowerMultiplier>(), //
-        make_unique<ReadElectricalMeasurementPowerDivisor>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementPowerDivisor>(), //
-        make_unique<ReadElectricalMeasurementHarmonicCurrentMultiplier>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementHarmonicCurrentMultiplier>(), //
-        make_unique<ReadElectricalMeasurementPhaseHarmonicCurrentMultiplier>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementPhaseHarmonicCurrentMultiplier>(), //
-        make_unique<ReadElectricalMeasurementInstantaneousVoltage>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementInstantaneousVoltage>(), //
-        make_unique<ReadElectricalMeasurementInstantaneousLineCurrent>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementInstantaneousLineCurrent>(), //
-        make_unique<ReadElectricalMeasurementInstantaneousActiveCurrent>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementInstantaneousActiveCurrent>(), //
-        make_unique<ReadElectricalMeasurementInstantaneousReactiveCurrent>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementInstantaneousReactiveCurrent>(), //
-        make_unique<ReadElectricalMeasurementInstantaneousPower>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementInstantaneousPower>(), //
-        make_unique<ReadElectricalMeasurementRmsVoltage>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltage>(), //
-        make_unique<ReadElectricalMeasurementRmsVoltageMin>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageMin>(), //
-        make_unique<ReadElectricalMeasurementRmsVoltageMax>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageMax>(), //
-        make_unique<ReadElectricalMeasurementRmsCurrent>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsCurrent>(), //
-        make_unique<ReadElectricalMeasurementRmsCurrentMin>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsCurrentMin>(), //
-        make_unique<ReadElectricalMeasurementRmsCurrentMax>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsCurrentMax>(), //
-        make_unique<ReadElectricalMeasurementActivePower>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementActivePower>(), //
-        make_unique<ReadElectricalMeasurementActivePowerMin>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementActivePowerMin>(), //
-        make_unique<ReadElectricalMeasurementActivePowerMax>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementActivePowerMax>(), //
-        make_unique<ReadElectricalMeasurementReactivePower>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementReactivePower>(), //
-        make_unique<ReadElectricalMeasurementApparentPower>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementApparentPower>(), //
-        make_unique<ReadElectricalMeasurementPowerFactor>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementPowerFactor>(), //
-        make_unique<ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriod>(), //
-        make_unique<WriteElectricalMeasurementAverageRmsVoltageMeasurementPeriod>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriod>(), //
-        make_unique<ReadElectricalMeasurementAverageRmsUnderVoltageCounter>(), //
-        make_unique<WriteElectricalMeasurementAverageRmsUnderVoltageCounter>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounter>(), //
-        make_unique<ReadElectricalMeasurementRmsExtremeOverVoltagePeriod>(), //
-        make_unique<WriteElectricalMeasurementRmsExtremeOverVoltagePeriod>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriod>(), //
-        make_unique<ReadElectricalMeasurementRmsExtremeUnderVoltagePeriod>(), //
-        make_unique<WriteElectricalMeasurementRmsExtremeUnderVoltagePeriod>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriod>(), //
-        make_unique<ReadElectricalMeasurementRmsVoltageSagPeriod>(), //
-        make_unique<WriteElectricalMeasurementRmsVoltageSagPeriod>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriod>(), //
-        make_unique<ReadElectricalMeasurementRmsVoltageSwellPeriod>(), //
-        make_unique<WriteElectricalMeasurementRmsVoltageSwellPeriod>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriod>(), //
-        make_unique<ReadElectricalMeasurementAcVoltageMultiplier>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAcVoltageMultiplier>(), //
-        make_unique<ReadElectricalMeasurementAcVoltageDivisor>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAcVoltageDivisor>(), //
-        make_unique<ReadElectricalMeasurementAcCurrentMultiplier>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAcCurrentMultiplier>(), //
-        make_unique<ReadElectricalMeasurementAcCurrentDivisor>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAcCurrentDivisor>(), //
-        make_unique<ReadElectricalMeasurementAcPowerMultiplier>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAcPowerMultiplier>(), //
-        make_unique<ReadElectricalMeasurementAcPowerDivisor>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAcPowerDivisor>(), //
-        make_unique<ReadElectricalMeasurementOverloadAlarmsMask>(), //
-        make_unique<WriteElectricalMeasurementOverloadAlarmsMask>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementOverloadAlarmsMask>(), //
-        make_unique<ReadElectricalMeasurementVoltageOverload>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementVoltageOverload>(), //
-        make_unique<ReadElectricalMeasurementCurrentOverload>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementCurrentOverload>(), //
-        make_unique<ReadElectricalMeasurementAcOverloadAlarmsMask>(), //
-        make_unique<WriteElectricalMeasurementAcOverloadAlarmsMask>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAcOverloadAlarmsMask>(), //
-        make_unique<ReadElectricalMeasurementAcVoltageOverload>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAcVoltageOverload>(), //
-        make_unique<ReadElectricalMeasurementAcCurrentOverload>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAcCurrentOverload>(), //
-        make_unique<ReadElectricalMeasurementAcActivePowerOverload>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAcActivePowerOverload>(), //
-        make_unique<ReadElectricalMeasurementAcReactivePowerOverload>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAcReactivePowerOverload>(), //
-        make_unique<ReadElectricalMeasurementAverageRmsOverVoltage>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAverageRmsOverVoltage>(), //
-        make_unique<ReadElectricalMeasurementAverageRmsUnderVoltage>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltage>(), //
-        make_unique<ReadElectricalMeasurementRmsExtremeOverVoltage>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltage>(), //
-        make_unique<ReadElectricalMeasurementRmsExtremeUnderVoltage>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltage>(), //
-        make_unique<ReadElectricalMeasurementRmsVoltageSag>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageSag>(), //
-        make_unique<ReadElectricalMeasurementRmsVoltageSwell>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageSwell>(), //
-        make_unique<ReadElectricalMeasurementLineCurrentPhaseB>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementLineCurrentPhaseB>(), //
-        make_unique<ReadElectricalMeasurementActiveCurrentPhaseB>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementActiveCurrentPhaseB>(), //
-        make_unique<ReadElectricalMeasurementReactiveCurrentPhaseB>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementReactiveCurrentPhaseB>(), //
-        make_unique<ReadElectricalMeasurementRmsVoltagePhaseB>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltagePhaseB>(), //
-        make_unique<ReadElectricalMeasurementRmsVoltageMinPhaseB>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageMinPhaseB>(), //
-        make_unique<ReadElectricalMeasurementRmsVoltageMaxPhaseB>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageMaxPhaseB>(), //
-        make_unique<ReadElectricalMeasurementRmsCurrentPhaseB>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsCurrentPhaseB>(), //
-        make_unique<ReadElectricalMeasurementRmsCurrentMinPhaseB>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsCurrentMinPhaseB>(), //
-        make_unique<ReadElectricalMeasurementRmsCurrentMaxPhaseB>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsCurrentMaxPhaseB>(), //
-        make_unique<ReadElectricalMeasurementActivePowerPhaseB>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementActivePowerPhaseB>(), //
-        make_unique<ReadElectricalMeasurementActivePowerMinPhaseB>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementActivePowerMinPhaseB>(), //
-        make_unique<ReadElectricalMeasurementActivePowerMaxPhaseB>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementActivePowerMaxPhaseB>(), //
-        make_unique<ReadElectricalMeasurementReactivePowerPhaseB>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementReactivePowerPhaseB>(), //
-        make_unique<ReadElectricalMeasurementApparentPowerPhaseB>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementApparentPowerPhaseB>(), //
-        make_unique<ReadElectricalMeasurementPowerFactorPhaseB>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementPowerFactorPhaseB>(), //
-        make_unique<ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseB>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseB>(), //
-        make_unique<ReadElectricalMeasurementAverageRmsOverVoltageCounterPhaseB>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAverageRmsOverVoltageCounterPhaseB>(), //
-        make_unique<ReadElectricalMeasurementAverageRmsUnderVoltageCounterPhaseB>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounterPhaseB>(), //
-        make_unique<ReadElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseB>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseB>(), //
-        make_unique<ReadElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseB>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseB>(), //
-        make_unique<ReadElectricalMeasurementRmsVoltageSagPeriodPhaseB>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriodPhaseB>(), //
-        make_unique<ReadElectricalMeasurementRmsVoltageSwellPeriodPhaseB>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriodPhaseB>(), //
-        make_unique<ReadElectricalMeasurementLineCurrentPhaseC>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementLineCurrentPhaseC>(), //
-        make_unique<ReadElectricalMeasurementActiveCurrentPhaseC>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementActiveCurrentPhaseC>(), //
-        make_unique<ReadElectricalMeasurementReactiveCurrentPhaseC>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementReactiveCurrentPhaseC>(), //
-        make_unique<ReadElectricalMeasurementRmsVoltagePhaseC>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltagePhaseC>(), //
-        make_unique<ReadElectricalMeasurementRmsVoltageMinPhaseC>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageMinPhaseC>(), //
-        make_unique<ReadElectricalMeasurementRmsVoltageMaxPhaseC>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageMaxPhaseC>(), //
-        make_unique<ReadElectricalMeasurementRmsCurrentPhaseC>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsCurrentPhaseC>(), //
-        make_unique<ReadElectricalMeasurementRmsCurrentMinPhaseC>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsCurrentMinPhaseC>(), //
-        make_unique<ReadElectricalMeasurementRmsCurrentMaxPhaseC>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsCurrentMaxPhaseC>(), //
-        make_unique<ReadElectricalMeasurementActivePowerPhaseC>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementActivePowerPhaseC>(), //
-        make_unique<ReadElectricalMeasurementActivePowerMinPhaseC>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementActivePowerMinPhaseC>(), //
-        make_unique<ReadElectricalMeasurementActivePowerMaxPhaseC>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementActivePowerMaxPhaseC>(), //
-        make_unique<ReadElectricalMeasurementReactivePowerPhaseC>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementReactivePowerPhaseC>(), //
-        make_unique<ReadElectricalMeasurementApparentPowerPhaseC>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementApparentPowerPhaseC>(), //
-        make_unique<ReadElectricalMeasurementPowerFactorPhaseC>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementPowerFactorPhaseC>(), //
-        make_unique<ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseC>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseC>(), //
-        make_unique<ReadElectricalMeasurementAverageRmsOverVoltageCounterPhaseC>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAverageRmsOverVoltageCounterPhaseC>(), //
-        make_unique<ReadElectricalMeasurementAverageRmsUnderVoltageCounterPhaseC>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounterPhaseC>(), //
-        make_unique<ReadElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseC>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseC>(), //
-        make_unique<ReadElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseC>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseC>(), //
-        make_unique<ReadElectricalMeasurementRmsVoltageSagPeriodPhaseC>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriodPhaseC>(), //
-        make_unique<ReadElectricalMeasurementRmsVoltageSwellPeriodPhaseC>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriodPhaseC>(), //
-        make_unique<ReadElectricalMeasurementGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementGeneratedCommandList>(), //
-        make_unique<ReadElectricalMeasurementAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAcceptedCommandList>(), //
-        make_unique<ReadElectricalMeasurementAttributeList>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementAttributeList>(), //
-        make_unique<ReadElectricalMeasurementFeatureMap>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementFeatureMap>(), //
-        make_unique<ReadElectricalMeasurementClusterRevision>(), //
-        make_unique<SubscribeAttributeElectricalMeasurementClusterRevision>(), //
-    };
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x0000401E) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSString * _Nullable value = [[NSString alloc] initWithBytes:mValue.data()
+                                                              length:mValue.size()
+                                                            encoding:NSUTF8StringEncoding];
+
+        [cluster writeAttributeNullableCharStringWithValue:value
+                                                    params:params
+                                         completionHandler:^(NSError * _Nullable error) {
+                                             if (error != nil) {
+                                                 LogNSError("TestCluster NullableCharString write Error", error);
+                                             }
+                                             SetCommandExitStatus(error);
+                                         }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::ByteSpan mValue;
+};
+
+class SubscribeAttributeTestClusterNullableCharString : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableCharString()
+        : SubscribeAttribute("nullable-char-string")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableCharString() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000401E) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeNullableCharStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableCharString response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+/*
+ * Attribute NullableEnumAttr
+ */
+class ReadTestClusterNullableEnumAttr : public ReadAttribute {
+public:
+    ReadTestClusterNullableEnumAttr()
+        : ReadAttribute("nullable-enum-attr")
+    {
+    }
+
+    ~ReadTestClusterNullableEnumAttr() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004024) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableEnumAttrWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableEnumAttr response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TestCluster NullableEnumAttr read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteTestClusterNullableEnumAttr : public WriteAttribute {
+public:
+    WriteTestClusterNullableEnumAttr()
+        : WriteAttribute("nullable-enum-attr")
+    {
+        AddArgument("attr-name", "nullable-enum-attr");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteTestClusterNullableEnumAttr() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004024) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster writeAttributeNullableEnumAttrWithValue:value
+                                                  params:params
+                                       completionHandler:^(NSError * _Nullable error) {
+                                           if (error != nil) {
+                                               LogNSError("TestCluster NullableEnumAttr write Error", error);
+                                           }
+                                           SetCommandExitStatus(error);
+                                       }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeTestClusterNullableEnumAttr : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableEnumAttr()
+        : SubscribeAttribute("nullable-enum-attr")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableEnumAttr() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004024) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeNullableEnumAttrWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableEnumAttr response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+/*
+ * Attribute NullableStruct
+ */
+class ReadTestClusterNullableStruct : public ReadAttribute {
+public:
+    ReadTestClusterNullableStruct()
+        : ReadAttribute("nullable-struct")
+    {
+    }
+
+    ~ReadTestClusterNullableStruct() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004025) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableStructWithCompletionHandler:^(
+            CHIPTestClusterClusterSimpleStruct * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableStruct response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TestCluster NullableStruct read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteTestClusterNullableStruct : public WriteAttribute {
+public:
+    WriteTestClusterNullableStruct()
+        : WriteAttribute("nullable-struct")
+        , mComplex(&mValue)
+    {
+        AddArgument("attr-name", "nullable-struct");
+        AddArgument("attr-value", &mComplex);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteTestClusterNullableStruct() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004025) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        CHIPTestClusterClusterSimpleStruct * _Nullable value;
+        if (mValue.IsNull()) {
+            value = nil;
+        } else {
+            value = [CHIPTestClusterClusterSimpleStruct new];
+            value.a = [NSNumber numberWithUnsignedChar:mValue.Value().a];
+            value.b = [NSNumber numberWithBool:mValue.Value().b];
+            value.c = [NSNumber numberWithUnsignedChar:chip::to_underlying(mValue.Value().c)];
+            value.d = [NSData dataWithBytes:mValue.Value().d.data() length:mValue.Value().d.size()];
+            value.e = [[NSString alloc] initWithBytes:mValue.Value().e.data()
+                                               length:mValue.Value().e.size()
+                                             encoding:NSUTF8StringEncoding];
+            value.f = [NSNumber numberWithUnsignedChar:mValue.Value().f.Raw()];
+            value.g = [NSNumber numberWithFloat:mValue.Value().g];
+            value.h = [NSNumber numberWithDouble:mValue.Value().h];
+        }
+
+        [cluster writeAttributeNullableStructWithValue:value
+                                                params:params
+                                     completionHandler:^(NSError * _Nullable error) {
+                                         if (error != nil) {
+                                             LogNSError("TestCluster NullableStruct write Error", error);
+                                         }
+                                         SetCommandExitStatus(error);
+                                     }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type> mValue;
+    TypedComplexArgument<chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type>> mComplex;
+};
+
+class SubscribeAttributeTestClusterNullableStruct : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableStruct()
+        : SubscribeAttribute("nullable-struct")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableStruct() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004025) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeNullableStructWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(CHIPTestClusterClusterSimpleStruct * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableStruct response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+/*
+ * Attribute NullableRangeRestrictedInt8u
+ */
+class ReadTestClusterNullableRangeRestrictedInt8u : public ReadAttribute {
+public:
+    ReadTestClusterNullableRangeRestrictedInt8u()
+        : ReadAttribute("nullable-range-restricted-int8u")
+    {
+    }
+
+    ~ReadTestClusterNullableRangeRestrictedInt8u() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004026) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableRangeRestrictedInt8uWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableRangeRestrictedInt8u response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TestCluster NullableRangeRestrictedInt8u read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteTestClusterNullableRangeRestrictedInt8u : public WriteAttribute {
+public:
+    WriteTestClusterNullableRangeRestrictedInt8u()
+        : WriteAttribute("nullable-range-restricted-int8u")
+    {
+        AddArgument("attr-name", "nullable-range-restricted-int8u");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteTestClusterNullableRangeRestrictedInt8u() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004026) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue];
+
+        [cluster
+            writeAttributeNullableRangeRestrictedInt8uWithValue:value
+                                                         params:params
+                                              completionHandler:^(NSError * _Nullable error) {
+                                                  if (error != nil) {
+                                                      LogNSError("TestCluster NullableRangeRestrictedInt8u write Error", error);
+                                                  }
+                                                  SetCommandExitStatus(error);
+                                              }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint8_t mValue;
+};
+
+class SubscribeAttributeTestClusterNullableRangeRestrictedInt8u : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableRangeRestrictedInt8u()
+        : SubscribeAttribute("nullable-range-restricted-int8u")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableRangeRestrictedInt8u() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004026) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeNullableRangeRestrictedInt8uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableRangeRestrictedInt8u response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+/*
+ * Attribute NullableRangeRestrictedInt8s
+ */
+class ReadTestClusterNullableRangeRestrictedInt8s : public ReadAttribute {
+public:
+    ReadTestClusterNullableRangeRestrictedInt8s()
+        : ReadAttribute("nullable-range-restricted-int8s")
+    {
+    }
+
+    ~ReadTestClusterNullableRangeRestrictedInt8s() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004027) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableRangeRestrictedInt8sWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableRangeRestrictedInt8s response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TestCluster NullableRangeRestrictedInt8s read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteTestClusterNullableRangeRestrictedInt8s : public WriteAttribute {
+public:
+    WriteTestClusterNullableRangeRestrictedInt8s()
+        : WriteAttribute("nullable-range-restricted-int8s")
+    {
+        AddArgument("attr-name", "nullable-range-restricted-int8s");
+        AddArgument("attr-value", INT8_MIN, INT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteTestClusterNullableRangeRestrictedInt8s() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004027) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithChar:mValue];
+
+        [cluster
+            writeAttributeNullableRangeRestrictedInt8sWithValue:value
+                                                         params:params
+                                              completionHandler:^(NSError * _Nullable error) {
+                                                  if (error != nil) {
+                                                      LogNSError("TestCluster NullableRangeRestrictedInt8s write Error", error);
+                                                  }
+                                                  SetCommandExitStatus(error);
+                                              }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    int8_t mValue;
+};
+
+class SubscribeAttributeTestClusterNullableRangeRestrictedInt8s : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableRangeRestrictedInt8s()
+        : SubscribeAttribute("nullable-range-restricted-int8s")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableRangeRestrictedInt8s() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004027) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeNullableRangeRestrictedInt8sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableRangeRestrictedInt8s response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+/*
+ * Attribute NullableRangeRestrictedInt16u
+ */
+class ReadTestClusterNullableRangeRestrictedInt16u : public ReadAttribute {
+public:
+    ReadTestClusterNullableRangeRestrictedInt16u()
+        : ReadAttribute("nullable-range-restricted-int16u")
+    {
+    }
+
+    ~ReadTestClusterNullableRangeRestrictedInt16u() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004028) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableRangeRestrictedInt16uWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableRangeRestrictedInt16u response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TestCluster NullableRangeRestrictedInt16u read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteTestClusterNullableRangeRestrictedInt16u : public WriteAttribute {
+public:
+    WriteTestClusterNullableRangeRestrictedInt16u()
+        : WriteAttribute("nullable-range-restricted-int16u")
+    {
+        AddArgument("attr-name", "nullable-range-restricted-int16u");
+        AddArgument("attr-value", 0, UINT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteTestClusterNullableRangeRestrictedInt16u() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004028) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithUnsignedShort:mValue];
+
+        [cluster
+            writeAttributeNullableRangeRestrictedInt16uWithValue:value
+                                                          params:params
+                                               completionHandler:^(NSError * _Nullable error) {
+                                                   if (error != nil) {
+                                                       LogNSError("TestCluster NullableRangeRestrictedInt16u write Error", error);
+                                                   }
+                                                   SetCommandExitStatus(error);
+                                               }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    uint16_t mValue;
+};
+
+class SubscribeAttributeTestClusterNullableRangeRestrictedInt16u : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableRangeRestrictedInt16u()
+        : SubscribeAttribute("nullable-range-restricted-int16u")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableRangeRestrictedInt16u() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004028) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeNullableRangeRestrictedInt16uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableRangeRestrictedInt16u response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+/*
+ * Attribute NullableRangeRestrictedInt16s
+ */
+class ReadTestClusterNullableRangeRestrictedInt16s : public ReadAttribute {
+public:
+    ReadTestClusterNullableRangeRestrictedInt16s()
+        : ReadAttribute("nullable-range-restricted-int16s")
+    {
+    }
+
+    ~ReadTestClusterNullableRangeRestrictedInt16s() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x00004029) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeNullableRangeRestrictedInt16sWithCompletionHandler:^(
+            NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.NullableRangeRestrictedInt16s response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TestCluster NullableRangeRestrictedInt16s read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteTestClusterNullableRangeRestrictedInt16s : public WriteAttribute {
+public:
+    WriteTestClusterNullableRangeRestrictedInt16s()
+        : WriteAttribute("nullable-range-restricted-int16s")
+    {
+        AddArgument("attr-name", "nullable-range-restricted-int16s");
+        AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteTestClusterNullableRangeRestrictedInt16s() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) WriteAttribute (0x00004029) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPWriteParams * params = [[CHIPWriteParams alloc] init];
+        params.timedWriteTimeoutMs
+            = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
+        params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
+        NSNumber * _Nullable value = [NSNumber numberWithShort:mValue];
+
+        [cluster
+            writeAttributeNullableRangeRestrictedInt16sWithValue:value
+                                                          params:params
+                                               completionHandler:^(NSError * _Nullable error) {
+                                                   if (error != nil) {
+                                                       LogNSError("TestCluster NullableRangeRestrictedInt16s write Error", error);
+                                                   }
+                                                   SetCommandExitStatus(error);
+                                               }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    int16_t mValue;
+};
+
+class SubscribeAttributeTestClusterNullableRangeRestrictedInt16s : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterNullableRangeRestrictedInt16s()
+        : SubscribeAttribute("nullable-range-restricted-int16s")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterNullableRangeRestrictedInt16s() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x00004029) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeNullableRangeRestrictedInt16sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.NullableRangeRestrictedInt16s response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+/*
+ * Attribute GeneratedCommandList
+ */
+class ReadTestClusterGeneratedCommandList : public ReadAttribute {
+public:
+    ReadTestClusterGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
+    {
+    }
+
+    ~ReadTestClusterGeneratedCommandList() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.GeneratedCommandList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TestCluster GeneratedCommandList read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeTestClusterGeneratedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterGeneratedCommandList() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.GeneratedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+/*
+ * Attribute AcceptedCommandList
+ */
+class ReadTestClusterAcceptedCommandList : public ReadAttribute {
+public:
+    ReadTestClusterAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
+    {
+    }
+
+    ~ReadTestClusterAcceptedCommandList() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.AcceptedCommandList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TestCluster AcceptedCommandList read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeTestClusterAcceptedCommandList : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterAcceptedCommandList() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.AcceptedCommandList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterEthernetNetworkDiagnostics(Commands & commands)
-{
-    using namespace chip::app::Clusters::EthernetNetworkDiagnostics;
+/*
+ * Attribute AttributeList
+ */
+class ReadTestClusterAttributeList : public ReadAttribute {
+public:
+    ReadTestClusterAttributeList()
+        : ReadAttribute("attribute-list")
+    {
+    }
 
-    const char * clusterName = "EthernetNetworkDiagnostics";
+    ~ReadTestClusterAttributeList() {}
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<EthernetNetworkDiagnosticsResetCounts>(), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadEthernetNetworkDiagnosticsPHYRate>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsPHYRate>(), //
-        make_unique<ReadEthernetNetworkDiagnosticsFullDuplex>(), //
-        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsFullDuplex>(), //
-        make_unique<ReadEthernetNetworkDiagnosticsPacketRxCount>(), //
-        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsPacketRxCount>(), //
-        make_unique<ReadEthernetNetworkDiagnosticsPacketTxCount>(), //
-        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsPacketTxCount>(), //
-        make_unique<ReadEthernetNetworkDiagnosticsTxErrCount>(), //
-        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsTxErrCount>(), //
-        make_unique<ReadEthernetNetworkDiagnosticsCollisionCount>(), //
-        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsCollisionCount>(), //
-        make_unique<ReadEthernetNetworkDiagnosticsOverrunCount>(), //
-        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsOverrunCount>(), //
-        make_unique<ReadEthernetNetworkDiagnosticsCarrierDetect>(), //
-        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsCarrierDetect>(), //
-        make_unique<ReadEthernetNetworkDiagnosticsTimeSinceReset>(), //
-        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsTimeSinceReset>(), //
-        make_unique<ReadEthernetNetworkDiagnosticsGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsGeneratedCommandList>(), //
-        make_unique<ReadEthernetNetworkDiagnosticsAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsAcceptedCommandList>(), //
-        make_unique<ReadEthernetNetworkDiagnosticsAttributeList>(), //
-        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsAttributeList>(), //
-        make_unique<ReadEthernetNetworkDiagnosticsFeatureMap>(), //
-        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsFeatureMap>(), //
-        make_unique<ReadEthernetNetworkDiagnosticsClusterRevision>(), //
-        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsClusterRevision>(), //
-    };
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterFanControl(Commands & commands)
-{
-    using namespace chip::app::Clusters::FanControl;
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.AttributeList response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TestCluster AttributeList read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
 
-    const char * clusterName = "FanControl";
+class SubscribeAttributeTestClusterAttributeList : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterAttributeList()
+        : SubscribeAttribute("attribute-list")
+    {
+    }
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadFanControlFanMode>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<WriteFanControlFanMode>(), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeFanControlFanMode>(), //
-        make_unique<ReadFanControlFanModeSequence>(), //
-        make_unique<WriteFanControlFanModeSequence>(), //
-        make_unique<SubscribeAttributeFanControlFanModeSequence>(), //
-        make_unique<ReadFanControlPercentSetting>(), //
-        make_unique<WriteFanControlPercentSetting>(), //
-        make_unique<SubscribeAttributeFanControlPercentSetting>(), //
-        make_unique<ReadFanControlPercentCurrent>(), //
-        make_unique<SubscribeAttributeFanControlPercentCurrent>(), //
-        make_unique<ReadFanControlSpeedMax>(), //
-        make_unique<SubscribeAttributeFanControlSpeedMax>(), //
-        make_unique<ReadFanControlSpeedSetting>(), //
-        make_unique<WriteFanControlSpeedSetting>(), //
-        make_unique<SubscribeAttributeFanControlSpeedSetting>(), //
-        make_unique<ReadFanControlSpeedCurrent>(), //
-        make_unique<SubscribeAttributeFanControlSpeedCurrent>(), //
-        make_unique<ReadFanControlRockSupport>(), //
-        make_unique<SubscribeAttributeFanControlRockSupport>(), //
-        make_unique<ReadFanControlRockSetting>(), //
-        make_unique<WriteFanControlRockSetting>(), //
-        make_unique<SubscribeAttributeFanControlRockSetting>(), //
-        make_unique<ReadFanControlWindSupport>(), //
-        make_unique<SubscribeAttributeFanControlWindSupport>(), //
-        make_unique<ReadFanControlWindSetting>(), //
-        make_unique<WriteFanControlWindSetting>(), //
-        make_unique<SubscribeAttributeFanControlWindSetting>(), //
-        make_unique<ReadFanControlGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeFanControlGeneratedCommandList>(), //
-        make_unique<ReadFanControlAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeFanControlAcceptedCommandList>(), //
-        make_unique<ReadFanControlAttributeList>(), //
-        make_unique<SubscribeAttributeFanControlAttributeList>(), //
-        make_unique<ReadFanControlFeatureMap>(), //
-        make_unique<SubscribeAttributeFanControlFeatureMap>(), //
-        make_unique<ReadFanControlClusterRevision>(), //
-        make_unique<SubscribeAttributeFanControlClusterRevision>(), //
-    };
+    ~SubscribeAttributeTestClusterAttributeList() {}
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterFixedLabel(Commands & commands)
-{
-    using namespace chip::app::Clusters::FixedLabel;
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.AttributeList response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
-    const char * clusterName = "FixedLabel";
+        return CHIP_NO_ERROR;
+    }
+};
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadFixedLabelLabelList>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeFixedLabelLabelList>(), //
-        make_unique<ReadFixedLabelGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeFixedLabelGeneratedCommandList>(), //
-        make_unique<ReadFixedLabelAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeFixedLabelAcceptedCommandList>(), //
-        make_unique<ReadFixedLabelAttributeList>(), //
-        make_unique<SubscribeAttributeFixedLabelAttributeList>(), //
-        make_unique<ReadFixedLabelFeatureMap>(), //
-        make_unique<SubscribeAttributeFixedLabelFeatureMap>(), //
-        make_unique<ReadFixedLabelClusterRevision>(), //
-        make_unique<SubscribeAttributeFixedLabelClusterRevision>(), //
-    };
+/*
+ * Attribute FeatureMap
+ */
+class ReadTestClusterFeatureMap : public ReadAttribute {
+public:
+    ReadTestClusterFeatureMap()
+        : ReadAttribute("feature-map")
+    {
+    }
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterFlowMeasurement(Commands & commands)
-{
-    using namespace chip::app::Clusters::FlowMeasurement;
+    ~ReadTestClusterFeatureMap() {}
 
-    const char * clusterName = "FlowMeasurement";
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadFlowMeasurementMeasuredValue>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeFlowMeasurementMeasuredValue>(), //
-        make_unique<ReadFlowMeasurementMinMeasuredValue>(), //
-        make_unique<SubscribeAttributeFlowMeasurementMinMeasuredValue>(), //
-        make_unique<ReadFlowMeasurementMaxMeasuredValue>(), //
-        make_unique<SubscribeAttributeFlowMeasurementMaxMeasuredValue>(), //
-        make_unique<ReadFlowMeasurementTolerance>(), //
-        make_unique<SubscribeAttributeFlowMeasurementTolerance>(), //
-        make_unique<ReadFlowMeasurementGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeFlowMeasurementGeneratedCommandList>(), //
-        make_unique<ReadFlowMeasurementAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeFlowMeasurementAcceptedCommandList>(), //
-        make_unique<ReadFlowMeasurementAttributeList>(), //
-        make_unique<SubscribeAttributeFlowMeasurementAttributeList>(), //
-        make_unique<ReadFlowMeasurementFeatureMap>(), //
-        make_unique<SubscribeAttributeFlowMeasurementFeatureMap>(), //
-        make_unique<ReadFlowMeasurementClusterRevision>(), //
-        make_unique<SubscribeAttributeFlowMeasurementClusterRevision>(), //
-    };
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.FeatureMap response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TestCluster FeatureMap read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterGeneralCommissioning(Commands & commands)
-{
-    using namespace chip::app::Clusters::GeneralCommissioning;
+class SubscribeAttributeTestClusterFeatureMap : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterFeatureMap()
+        : SubscribeAttribute("feature-map")
+    {
+    }
 
-    const char * clusterName = "GeneralCommissioning";
+    ~SubscribeAttributeTestClusterFeatureMap() {}
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<GeneralCommissioningArmFailSafe>(), //
-        make_unique<GeneralCommissioningSetRegulatoryConfig>(), //
-        make_unique<GeneralCommissioningCommissioningComplete>(), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadGeneralCommissioningBreadcrumb>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<WriteGeneralCommissioningBreadcrumb>(), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeGeneralCommissioningBreadcrumb>(), //
-        make_unique<ReadGeneralCommissioningBasicCommissioningInfo>(), //
-        make_unique<SubscribeAttributeGeneralCommissioningBasicCommissioningInfo>(), //
-        make_unique<ReadGeneralCommissioningRegulatoryConfig>(), //
-        make_unique<SubscribeAttributeGeneralCommissioningRegulatoryConfig>(), //
-        make_unique<ReadGeneralCommissioningLocationCapability>(), //
-        make_unique<SubscribeAttributeGeneralCommissioningLocationCapability>(), //
-        make_unique<ReadGeneralCommissioningSupportsConcurrentConnection>(), //
-        make_unique<SubscribeAttributeGeneralCommissioningSupportsConcurrentConnection>(), //
-        make_unique<ReadGeneralCommissioningGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeGeneralCommissioningGeneratedCommandList>(), //
-        make_unique<ReadGeneralCommissioningAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeGeneralCommissioningAcceptedCommandList>(), //
-        make_unique<ReadGeneralCommissioningAttributeList>(), //
-        make_unique<SubscribeAttributeGeneralCommissioningAttributeList>(), //
-        make_unique<ReadGeneralCommissioningFeatureMap>(), //
-        make_unique<SubscribeAttributeGeneralCommissioningFeatureMap>(), //
-        make_unique<ReadGeneralCommissioningClusterRevision>(), //
-        make_unique<SubscribeAttributeGeneralCommissioningClusterRevision>(), //
-    };
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.FeatureMap response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterGeneralDiagnostics(Commands & commands)
-{
-    using namespace chip::app::Clusters::GeneralDiagnostics;
+        return CHIP_NO_ERROR;
+    }
+};
 
-    const char * clusterName = "GeneralDiagnostics";
+/*
+ * Attribute ClusterRevision
+ */
+class ReadTestClusterClusterRevision : public ReadAttribute {
+public:
+    ReadTestClusterClusterRevision()
+        : ReadAttribute("cluster-revision")
+    {
+    }
 
-    commands_list clusterCommands = {
-        make_unique<ClusterCommand>(Id), //
-        make_unique<GeneralDiagnosticsTestEventTrigger>(), //
-        make_unique<ReadAttribute>(Id), //
-        make_unique<ReadGeneralDiagnosticsNetworkInterfaces>(), //
-        make_unique<WriteAttribute>(Id), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeGeneralDiagnosticsNetworkInterfaces>(), //
-        make_unique<ReadGeneralDiagnosticsRebootCount>(), //
-        make_unique<SubscribeAttributeGeneralDiagnosticsRebootCount>(), //
-        make_unique<ReadGeneralDiagnosticsUpTime>(), //
-        make_unique<SubscribeAttributeGeneralDiagnosticsUpTime>(), //
-        make_unique<ReadGeneralDiagnosticsTotalOperationalHours>(), //
-        make_unique<SubscribeAttributeGeneralDiagnosticsTotalOperationalHours>(), //
-        make_unique<ReadGeneralDiagnosticsBootReasons>(), //
-        make_unique<SubscribeAttributeGeneralDiagnosticsBootReasons>(), //
-        make_unique<ReadGeneralDiagnosticsActiveHardwareFaults>(), //
-        make_unique<SubscribeAttributeGeneralDiagnosticsActiveHardwareFaults>(), //
-        make_unique<ReadGeneralDiagnosticsActiveRadioFaults>(), //
-        make_unique<SubscribeAttributeGeneralDiagnosticsActiveRadioFaults>(), //
-        make_unique<ReadGeneralDiagnosticsActiveNetworkFaults>(), //
-        make_unique<SubscribeAttributeGeneralDiagnosticsActiveNetworkFaults>(), //
-        make_unique<ReadGeneralDiagnosticsTestEventTriggersEnabled>(), //
-        make_unique<SubscribeAttributeGeneralDiagnosticsTestEventTriggersEnabled>(), //
-        make_unique<ReadGeneralDiagnosticsGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeGeneralDiagnosticsGeneratedCommandList>(), //
-        make_unique<ReadGeneralDiagnosticsAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeGeneralDiagnosticsAcceptedCommandList>(), //
-        make_unique<ReadGeneralDiagnosticsAttributeList>(), //
-        make_unique<SubscribeAttributeGeneralDiagnosticsAttributeList>(), //
-        make_unique<ReadGeneralDiagnosticsFeatureMap>(), //
-        make_unique<SubscribeAttributeGeneralDiagnosticsFeatureMap>(), //
-        make_unique<ReadGeneralDiagnosticsClusterRevision>(), //
-        make_unique<SubscribeAttributeGeneralDiagnosticsClusterRevision>(), //
-    };
+    ~ReadTestClusterClusterRevision() {}
 
-    commands.Register(clusterName, clusterCommands);
-}
-void registerClusterGroupKeyManagement(Commands & commands)
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"TestCluster.ClusterRevision response %@", [value description]);
+            if (error != nil) {
+                LogNSError("TestCluster ClusterRevision read Error", error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeTestClusterClusterRevision : public SubscribeAttribute {
+public:
+    SubscribeAttributeTestClusterClusterRevision()
+        : SubscribeAttribute("cluster-revision")
+    {
+    }
+
+    ~SubscribeAttributeTestClusterClusterRevision() {}
+
+    CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override
+    {
+        ChipLogProgress(chipTool, "Sending cluster (0xFFF1FC05) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue];
+        CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init];
+        params.keepPreviousSubscriptions
+            = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
+        params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
+        [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
+            params:params
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TestCluster.ClusterRevision response %@", [value description]);
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
+/*----------------------------------------------------------------------------*\
+| Register all Clusters commands                                               |
+\*----------------------------------------------------------------------------*/
+void registerClusterIdentify(Commands & commands)
 {
-    using namespace chip::app::Clusters::GroupKeyManagement;
+    using namespace chip::app::Clusters::Identify;
 
-    const char * clusterName = "GroupKeyManagement";
+    const char * clusterName = "Identify";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
-        make_unique<GroupKeyManagementKeySetWrite>(), //
-        make_unique<GroupKeyManagementKeySetRead>(), //
-        make_unique<GroupKeyManagementKeySetRemove>(), //
-        make_unique<GroupKeyManagementKeySetReadAllIndices>(), //
+        make_unique<IdentifyIdentify>(), //
+        make_unique<IdentifyTriggerEffect>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadGroupKeyManagementGroupKeyMap>(), //
+        make_unique<ReadIdentifyIdentifyTime>(), //
         make_unique<WriteAttribute>(Id), //
-        make_unique<WriteGroupKeyManagementGroupKeyMap>(), //
+        make_unique<WriteIdentifyIdentifyTime>(), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeGroupKeyManagementGroupKeyMap>(), //
-        make_unique<ReadGroupKeyManagementGroupTable>(), //
-        make_unique<SubscribeAttributeGroupKeyManagementGroupTable>(), //
-        make_unique<ReadGroupKeyManagementMaxGroupsPerFabric>(), //
-        make_unique<SubscribeAttributeGroupKeyManagementMaxGroupsPerFabric>(), //
-        make_unique<ReadGroupKeyManagementMaxGroupKeysPerFabric>(), //
-        make_unique<SubscribeAttributeGroupKeyManagementMaxGroupKeysPerFabric>(), //
-        make_unique<ReadGroupKeyManagementGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeGroupKeyManagementGeneratedCommandList>(), //
-        make_unique<ReadGroupKeyManagementAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeGroupKeyManagementAcceptedCommandList>(), //
-        make_unique<ReadGroupKeyManagementAttributeList>(), //
-        make_unique<SubscribeAttributeGroupKeyManagementAttributeList>(), //
-        make_unique<ReadGroupKeyManagementFeatureMap>(), //
-        make_unique<SubscribeAttributeGroupKeyManagementFeatureMap>(), //
-        make_unique<ReadGroupKeyManagementClusterRevision>(), //
-        make_unique<SubscribeAttributeGroupKeyManagementClusterRevision>(), //
+        make_unique<SubscribeAttributeIdentifyIdentifyTime>(), //
+        make_unique<ReadIdentifyIdentifyType>(), //
+        make_unique<SubscribeAttributeIdentifyIdentifyType>(), //
+        make_unique<ReadIdentifyGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeIdentifyGeneratedCommandList>(), //
+        make_unique<ReadIdentifyAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeIdentifyAcceptedCommandList>(), //
+        make_unique<ReadIdentifyAttributeList>(), //
+        make_unique<SubscribeAttributeIdentifyAttributeList>(), //
+        make_unique<ReadIdentifyFeatureMap>(), //
+        make_unique<SubscribeAttributeIdentifyFeatureMap>(), //
+        make_unique<ReadIdentifyClusterRevision>(), //
+        make_unique<SubscribeAttributeIdentifyClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
@@ -92756,95 +91271,123 @@ void registerClusterGroups(Commands & commands)
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterIdentify(Commands & commands)
+void registerClusterScenes(Commands & commands)
 {
-    using namespace chip::app::Clusters::Identify;
+    using namespace chip::app::Clusters::Scenes;
 
-    const char * clusterName = "Identify";
+    const char * clusterName = "Scenes";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
-        make_unique<IdentifyIdentify>(), //
-        make_unique<IdentifyTriggerEffect>(), //
+        make_unique<ScenesAddScene>(), //
+        make_unique<ScenesViewScene>(), //
+        make_unique<ScenesRemoveScene>(), //
+        make_unique<ScenesRemoveAllScenes>(), //
+        make_unique<ScenesStoreScene>(), //
+        make_unique<ScenesRecallScene>(), //
+        make_unique<ScenesGetSceneMembership>(), //
+        make_unique<ScenesEnhancedAddScene>(), //
+        make_unique<ScenesEnhancedViewScene>(), //
+        make_unique<ScenesCopyScene>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadIdentifyIdentifyTime>(), //
+        make_unique<ReadScenesSceneCount>(), //
         make_unique<WriteAttribute>(Id), //
-        make_unique<WriteIdentifyIdentifyTime>(), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeIdentifyIdentifyTime>(), //
-        make_unique<ReadIdentifyIdentifyType>(), //
-        make_unique<SubscribeAttributeIdentifyIdentifyType>(), //
-        make_unique<ReadIdentifyGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeIdentifyGeneratedCommandList>(), //
-        make_unique<ReadIdentifyAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeIdentifyAcceptedCommandList>(), //
-        make_unique<ReadIdentifyAttributeList>(), //
-        make_unique<SubscribeAttributeIdentifyAttributeList>(), //
-        make_unique<ReadIdentifyFeatureMap>(), //
-        make_unique<SubscribeAttributeIdentifyFeatureMap>(), //
-        make_unique<ReadIdentifyClusterRevision>(), //
-        make_unique<SubscribeAttributeIdentifyClusterRevision>(), //
+        make_unique<SubscribeAttributeScenesSceneCount>(), //
+        make_unique<ReadScenesCurrentScene>(), //
+        make_unique<SubscribeAttributeScenesCurrentScene>(), //
+        make_unique<ReadScenesCurrentGroup>(), //
+        make_unique<SubscribeAttributeScenesCurrentGroup>(), //
+        make_unique<ReadScenesSceneValid>(), //
+        make_unique<SubscribeAttributeScenesSceneValid>(), //
+        make_unique<ReadScenesNameSupport>(), //
+        make_unique<SubscribeAttributeScenesNameSupport>(), //
+        make_unique<ReadScenesLastConfiguredBy>(), //
+        make_unique<SubscribeAttributeScenesLastConfiguredBy>(), //
+        make_unique<ReadScenesGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeScenesGeneratedCommandList>(), //
+        make_unique<ReadScenesAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeScenesAcceptedCommandList>(), //
+        make_unique<ReadScenesAttributeList>(), //
+        make_unique<SubscribeAttributeScenesAttributeList>(), //
+        make_unique<ReadScenesFeatureMap>(), //
+        make_unique<SubscribeAttributeScenesFeatureMap>(), //
+        make_unique<ReadScenesClusterRevision>(), //
+        make_unique<SubscribeAttributeScenesClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterIlluminanceMeasurement(Commands & commands)
+void registerClusterOnOff(Commands & commands)
 {
-    using namespace chip::app::Clusters::IlluminanceMeasurement;
+    using namespace chip::app::Clusters::OnOff;
 
-    const char * clusterName = "IlluminanceMeasurement";
+    const char * clusterName = "OnOff";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
+        make_unique<OnOffOff>(), //
+        make_unique<OnOffOn>(), //
+        make_unique<OnOffToggle>(), //
+        make_unique<OnOffOffWithEffect>(), //
+        make_unique<OnOffOnWithRecallGlobalScene>(), //
+        make_unique<OnOffOnWithTimedOff>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadIlluminanceMeasurementMeasuredValue>(), //
+        make_unique<ReadOnOffOnOff>(), //
         make_unique<WriteAttribute>(Id), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeIlluminanceMeasurementMeasuredValue>(), //
-        make_unique<ReadIlluminanceMeasurementMinMeasuredValue>(), //
-        make_unique<SubscribeAttributeIlluminanceMeasurementMinMeasuredValue>(), //
-        make_unique<ReadIlluminanceMeasurementMaxMeasuredValue>(), //
-        make_unique<SubscribeAttributeIlluminanceMeasurementMaxMeasuredValue>(), //
-        make_unique<ReadIlluminanceMeasurementTolerance>(), //
-        make_unique<SubscribeAttributeIlluminanceMeasurementTolerance>(), //
-        make_unique<ReadIlluminanceMeasurementLightSensorType>(), //
-        make_unique<SubscribeAttributeIlluminanceMeasurementLightSensorType>(), //
-        make_unique<ReadIlluminanceMeasurementGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeIlluminanceMeasurementGeneratedCommandList>(), //
-        make_unique<ReadIlluminanceMeasurementAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeIlluminanceMeasurementAcceptedCommandList>(), //
-        make_unique<ReadIlluminanceMeasurementAttributeList>(), //
-        make_unique<SubscribeAttributeIlluminanceMeasurementAttributeList>(), //
-        make_unique<ReadIlluminanceMeasurementFeatureMap>(), //
-        make_unique<SubscribeAttributeIlluminanceMeasurementFeatureMap>(), //
-        make_unique<ReadIlluminanceMeasurementClusterRevision>(), //
-        make_unique<SubscribeAttributeIlluminanceMeasurementClusterRevision>(), //
+        make_unique<SubscribeAttributeOnOffOnOff>(), //
+        make_unique<ReadOnOffGlobalSceneControl>(), //
+        make_unique<SubscribeAttributeOnOffGlobalSceneControl>(), //
+        make_unique<ReadOnOffOnTime>(), //
+        make_unique<WriteOnOffOnTime>(), //
+        make_unique<SubscribeAttributeOnOffOnTime>(), //
+        make_unique<ReadOnOffOffWaitTime>(), //
+        make_unique<WriteOnOffOffWaitTime>(), //
+        make_unique<SubscribeAttributeOnOffOffWaitTime>(), //
+        make_unique<ReadOnOffStartUpOnOff>(), //
+        make_unique<WriteOnOffStartUpOnOff>(), //
+        make_unique<SubscribeAttributeOnOffStartUpOnOff>(), //
+        make_unique<ReadOnOffGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeOnOffGeneratedCommandList>(), //
+        make_unique<ReadOnOffAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeOnOffAcceptedCommandList>(), //
+        make_unique<ReadOnOffAttributeList>(), //
+        make_unique<SubscribeAttributeOnOffAttributeList>(), //
+        make_unique<ReadOnOffFeatureMap>(), //
+        make_unique<SubscribeAttributeOnOffFeatureMap>(), //
+        make_unique<ReadOnOffClusterRevision>(), //
+        make_unique<SubscribeAttributeOnOffClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterKeypadInput(Commands & commands)
+void registerClusterOnOffSwitchConfiguration(Commands & commands)
 {
-    using namespace chip::app::Clusters::KeypadInput;
+    using namespace chip::app::Clusters::OnOffSwitchConfiguration;
 
-    const char * clusterName = "KeypadInput";
+    const char * clusterName = "OnOffSwitchConfiguration";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
-        make_unique<KeypadInputSendKey>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadKeypadInputGeneratedCommandList>(), //
+        make_unique<ReadOnOffSwitchConfigurationSwitchType>(), //
         make_unique<WriteAttribute>(Id), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeKeypadInputGeneratedCommandList>(), //
-        make_unique<ReadKeypadInputAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeKeypadInputAcceptedCommandList>(), //
-        make_unique<ReadKeypadInputAttributeList>(), //
-        make_unique<SubscribeAttributeKeypadInputAttributeList>(), //
-        make_unique<ReadKeypadInputFeatureMap>(), //
-        make_unique<SubscribeAttributeKeypadInputFeatureMap>(), //
-        make_unique<ReadKeypadInputClusterRevision>(), //
-        make_unique<SubscribeAttributeKeypadInputClusterRevision>(), //
+        make_unique<SubscribeAttributeOnOffSwitchConfigurationSwitchType>(), //
+        make_unique<ReadOnOffSwitchConfigurationSwitchActions>(), //
+        make_unique<WriteOnOffSwitchConfigurationSwitchActions>(), //
+        make_unique<SubscribeAttributeOnOffSwitchConfigurationSwitchActions>(), //
+        make_unique<ReadOnOffSwitchConfigurationGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeOnOffSwitchConfigurationGeneratedCommandList>(), //
+        make_unique<ReadOnOffSwitchConfigurationAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeOnOffSwitchConfigurationAcceptedCommandList>(), //
+        make_unique<ReadOnOffSwitchConfigurationAttributeList>(), //
+        make_unique<SubscribeAttributeOnOffSwitchConfigurationAttributeList>(), //
+        make_unique<ReadOnOffSwitchConfigurationFeatureMap>(), //
+        make_unique<SubscribeAttributeOnOffSwitchConfigurationFeatureMap>(), //
+        make_unique<ReadOnOffSwitchConfigurationClusterRevision>(), //
+        make_unique<SubscribeAttributeOnOffSwitchConfigurationClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
@@ -92918,6 +91461,328 @@ void registerClusterLevelControl(Commands & commands)
 
     commands.Register(clusterName, clusterCommands);
 }
+void registerClusterBinaryInputBasic(Commands & commands)
+{
+    using namespace chip::app::Clusters::BinaryInputBasic;
+
+    const char * clusterName = "BinaryInputBasic";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadBinaryInputBasicActiveText>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<WriteBinaryInputBasicActiveText>(), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeBinaryInputBasicActiveText>(), //
+        make_unique<ReadBinaryInputBasicDescription>(), //
+        make_unique<WriteBinaryInputBasicDescription>(), //
+        make_unique<SubscribeAttributeBinaryInputBasicDescription>(), //
+        make_unique<ReadBinaryInputBasicInactiveText>(), //
+        make_unique<WriteBinaryInputBasicInactiveText>(), //
+        make_unique<SubscribeAttributeBinaryInputBasicInactiveText>(), //
+        make_unique<ReadBinaryInputBasicOutOfService>(), //
+        make_unique<WriteBinaryInputBasicOutOfService>(), //
+        make_unique<SubscribeAttributeBinaryInputBasicOutOfService>(), //
+        make_unique<ReadBinaryInputBasicPolarity>(), //
+        make_unique<SubscribeAttributeBinaryInputBasicPolarity>(), //
+        make_unique<ReadBinaryInputBasicPresentValue>(), //
+        make_unique<WriteBinaryInputBasicPresentValue>(), //
+        make_unique<SubscribeAttributeBinaryInputBasicPresentValue>(), //
+        make_unique<ReadBinaryInputBasicReliability>(), //
+        make_unique<WriteBinaryInputBasicReliability>(), //
+        make_unique<SubscribeAttributeBinaryInputBasicReliability>(), //
+        make_unique<ReadBinaryInputBasicStatusFlags>(), //
+        make_unique<SubscribeAttributeBinaryInputBasicStatusFlags>(), //
+        make_unique<ReadBinaryInputBasicApplicationType>(), //
+        make_unique<SubscribeAttributeBinaryInputBasicApplicationType>(), //
+        make_unique<ReadBinaryInputBasicGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeBinaryInputBasicGeneratedCommandList>(), //
+        make_unique<ReadBinaryInputBasicAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeBinaryInputBasicAcceptedCommandList>(), //
+        make_unique<ReadBinaryInputBasicAttributeList>(), //
+        make_unique<SubscribeAttributeBinaryInputBasicAttributeList>(), //
+        make_unique<ReadBinaryInputBasicFeatureMap>(), //
+        make_unique<SubscribeAttributeBinaryInputBasicFeatureMap>(), //
+        make_unique<ReadBinaryInputBasicClusterRevision>(), //
+        make_unique<SubscribeAttributeBinaryInputBasicClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterDescriptor(Commands & commands)
+{
+    using namespace chip::app::Clusters::Descriptor;
+
+    const char * clusterName = "Descriptor";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadDescriptorDeviceList>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeDescriptorDeviceList>(), //
+        make_unique<ReadDescriptorServerList>(), //
+        make_unique<SubscribeAttributeDescriptorServerList>(), //
+        make_unique<ReadDescriptorClientList>(), //
+        make_unique<SubscribeAttributeDescriptorClientList>(), //
+        make_unique<ReadDescriptorPartsList>(), //
+        make_unique<SubscribeAttributeDescriptorPartsList>(), //
+        make_unique<ReadDescriptorGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeDescriptorGeneratedCommandList>(), //
+        make_unique<ReadDescriptorAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeDescriptorAcceptedCommandList>(), //
+        make_unique<ReadDescriptorAttributeList>(), //
+        make_unique<SubscribeAttributeDescriptorAttributeList>(), //
+        make_unique<ReadDescriptorFeatureMap>(), //
+        make_unique<SubscribeAttributeDescriptorFeatureMap>(), //
+        make_unique<ReadDescriptorClusterRevision>(), //
+        make_unique<SubscribeAttributeDescriptorClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterBinding(Commands & commands)
+{
+    using namespace chip::app::Clusters::Binding;
+
+    const char * clusterName = "Binding";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadBindingBinding>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<WriteBindingBinding>(), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeBindingBinding>(), //
+        make_unique<ReadBindingGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeBindingGeneratedCommandList>(), //
+        make_unique<ReadBindingAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeBindingAcceptedCommandList>(), //
+        make_unique<ReadBindingAttributeList>(), //
+        make_unique<SubscribeAttributeBindingAttributeList>(), //
+        make_unique<ReadBindingFeatureMap>(), //
+        make_unique<SubscribeAttributeBindingFeatureMap>(), //
+        make_unique<ReadBindingClusterRevision>(), //
+        make_unique<SubscribeAttributeBindingClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterAccessControl(Commands & commands)
+{
+    using namespace chip::app::Clusters::AccessControl;
+
+    const char * clusterName = "AccessControl";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadAccessControlAcl>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<WriteAccessControlAcl>(), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeAccessControlAcl>(), //
+        make_unique<ReadAccessControlExtension>(), //
+        make_unique<WriteAccessControlExtension>(), //
+        make_unique<SubscribeAttributeAccessControlExtension>(), //
+        make_unique<ReadAccessControlSubjectsPerAccessControlEntry>(), //
+        make_unique<SubscribeAttributeAccessControlSubjectsPerAccessControlEntry>(), //
+        make_unique<ReadAccessControlTargetsPerAccessControlEntry>(), //
+        make_unique<SubscribeAttributeAccessControlTargetsPerAccessControlEntry>(), //
+        make_unique<ReadAccessControlAccessControlEntriesPerFabric>(), //
+        make_unique<SubscribeAttributeAccessControlAccessControlEntriesPerFabric>(), //
+        make_unique<ReadAccessControlGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeAccessControlGeneratedCommandList>(), //
+        make_unique<ReadAccessControlAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeAccessControlAcceptedCommandList>(), //
+        make_unique<ReadAccessControlAttributeList>(), //
+        make_unique<SubscribeAttributeAccessControlAttributeList>(), //
+        make_unique<ReadAccessControlFeatureMap>(), //
+        make_unique<SubscribeAttributeAccessControlFeatureMap>(), //
+        make_unique<ReadAccessControlClusterRevision>(), //
+        make_unique<SubscribeAttributeAccessControlClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterBridgedActions(Commands & commands)
+{
+    using namespace chip::app::Clusters::BridgedActions;
+
+    const char * clusterName = "BridgedActions";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<BridgedActionsInstantAction>(), //
+        make_unique<BridgedActionsInstantActionWithTransition>(), //
+        make_unique<BridgedActionsStartAction>(), //
+        make_unique<BridgedActionsStartActionWithDuration>(), //
+        make_unique<BridgedActionsStopAction>(), //
+        make_unique<BridgedActionsPauseAction>(), //
+        make_unique<BridgedActionsPauseActionWithDuration>(), //
+        make_unique<BridgedActionsResumeAction>(), //
+        make_unique<BridgedActionsEnableAction>(), //
+        make_unique<BridgedActionsEnableActionWithDuration>(), //
+        make_unique<BridgedActionsDisableAction>(), //
+        make_unique<BridgedActionsDisableActionWithDuration>(), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadBridgedActionsActionList>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeBridgedActionsActionList>(), //
+        make_unique<ReadBridgedActionsEndpointList>(), //
+        make_unique<SubscribeAttributeBridgedActionsEndpointList>(), //
+        make_unique<ReadBridgedActionsSetupUrl>(), //
+        make_unique<SubscribeAttributeBridgedActionsSetupUrl>(), //
+        make_unique<ReadBridgedActionsGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeBridgedActionsGeneratedCommandList>(), //
+        make_unique<ReadBridgedActionsAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeBridgedActionsAcceptedCommandList>(), //
+        make_unique<ReadBridgedActionsAttributeList>(), //
+        make_unique<SubscribeAttributeBridgedActionsAttributeList>(), //
+        make_unique<ReadBridgedActionsFeatureMap>(), //
+        make_unique<SubscribeAttributeBridgedActionsFeatureMap>(), //
+        make_unique<ReadBridgedActionsClusterRevision>(), //
+        make_unique<SubscribeAttributeBridgedActionsClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterBasic(Commands & commands)
+{
+    using namespace chip::app::Clusters::Basic;
+
+    const char * clusterName = "Basic";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<BasicMfgSpecificPing>(), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadBasicDataModelRevision>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeBasicDataModelRevision>(), //
+        make_unique<ReadBasicVendorName>(), //
+        make_unique<SubscribeAttributeBasicVendorName>(), //
+        make_unique<ReadBasicVendorID>(), //
+        make_unique<SubscribeAttributeBasicVendorID>(), //
+        make_unique<ReadBasicProductName>(), //
+        make_unique<SubscribeAttributeBasicProductName>(), //
+        make_unique<ReadBasicProductID>(), //
+        make_unique<SubscribeAttributeBasicProductID>(), //
+        make_unique<ReadBasicNodeLabel>(), //
+        make_unique<WriteBasicNodeLabel>(), //
+        make_unique<SubscribeAttributeBasicNodeLabel>(), //
+        make_unique<ReadBasicLocation>(), //
+        make_unique<WriteBasicLocation>(), //
+        make_unique<SubscribeAttributeBasicLocation>(), //
+        make_unique<ReadBasicHardwareVersion>(), //
+        make_unique<SubscribeAttributeBasicHardwareVersion>(), //
+        make_unique<ReadBasicHardwareVersionString>(), //
+        make_unique<SubscribeAttributeBasicHardwareVersionString>(), //
+        make_unique<ReadBasicSoftwareVersion>(), //
+        make_unique<SubscribeAttributeBasicSoftwareVersion>(), //
+        make_unique<ReadBasicSoftwareVersionString>(), //
+        make_unique<SubscribeAttributeBasicSoftwareVersionString>(), //
+        make_unique<ReadBasicManufacturingDate>(), //
+        make_unique<SubscribeAttributeBasicManufacturingDate>(), //
+        make_unique<ReadBasicPartNumber>(), //
+        make_unique<SubscribeAttributeBasicPartNumber>(), //
+        make_unique<ReadBasicProductURL>(), //
+        make_unique<SubscribeAttributeBasicProductURL>(), //
+        make_unique<ReadBasicProductLabel>(), //
+        make_unique<SubscribeAttributeBasicProductLabel>(), //
+        make_unique<ReadBasicSerialNumber>(), //
+        make_unique<SubscribeAttributeBasicSerialNumber>(), //
+        make_unique<ReadBasicLocalConfigDisabled>(), //
+        make_unique<WriteBasicLocalConfigDisabled>(), //
+        make_unique<SubscribeAttributeBasicLocalConfigDisabled>(), //
+        make_unique<ReadBasicReachable>(), //
+        make_unique<SubscribeAttributeBasicReachable>(), //
+        make_unique<ReadBasicUniqueID>(), //
+        make_unique<SubscribeAttributeBasicUniqueID>(), //
+        make_unique<ReadBasicCapabilityMinima>(), //
+        make_unique<SubscribeAttributeBasicCapabilityMinima>(), //
+        make_unique<ReadBasicGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeBasicGeneratedCommandList>(), //
+        make_unique<ReadBasicAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeBasicAcceptedCommandList>(), //
+        make_unique<ReadBasicAttributeList>(), //
+        make_unique<SubscribeAttributeBasicAttributeList>(), //
+        make_unique<ReadBasicFeatureMap>(), //
+        make_unique<SubscribeAttributeBasicFeatureMap>(), //
+        make_unique<ReadBasicClusterRevision>(), //
+        make_unique<SubscribeAttributeBasicClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterOtaSoftwareUpdateProvider(Commands & commands)
+{
+    using namespace chip::app::Clusters::OtaSoftwareUpdateProvider;
+
+    const char * clusterName = "OtaSoftwareUpdateProvider";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<OtaSoftwareUpdateProviderQueryImage>(), //
+        make_unique<OtaSoftwareUpdateProviderApplyUpdateRequest>(), //
+        make_unique<OtaSoftwareUpdateProviderNotifyUpdateApplied>(), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadOtaSoftwareUpdateProviderGeneratedCommandList>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeOtaSoftwareUpdateProviderGeneratedCommandList>(), //
+        make_unique<ReadOtaSoftwareUpdateProviderAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeOtaSoftwareUpdateProviderAcceptedCommandList>(), //
+        make_unique<ReadOtaSoftwareUpdateProviderAttributeList>(), //
+        make_unique<SubscribeAttributeOtaSoftwareUpdateProviderAttributeList>(), //
+        make_unique<ReadOtaSoftwareUpdateProviderFeatureMap>(), //
+        make_unique<SubscribeAttributeOtaSoftwareUpdateProviderFeatureMap>(), //
+        make_unique<ReadOtaSoftwareUpdateProviderClusterRevision>(), //
+        make_unique<SubscribeAttributeOtaSoftwareUpdateProviderClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterOtaSoftwareUpdateRequestor(Commands & commands)
+{
+    using namespace chip::app::Clusters::OtaSoftwareUpdateRequestor;
+
+    const char * clusterName = "OtaSoftwareUpdateRequestor";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<OtaSoftwareUpdateRequestorAnnounceOtaProvider>(), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadOtaSoftwareUpdateRequestorDefaultOtaProviders>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<WriteOtaSoftwareUpdateRequestorDefaultOtaProviders>(), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeOtaSoftwareUpdateRequestorDefaultOtaProviders>(), //
+        make_unique<ReadOtaSoftwareUpdateRequestorUpdatePossible>(), //
+        make_unique<SubscribeAttributeOtaSoftwareUpdateRequestorUpdatePossible>(), //
+        make_unique<ReadOtaSoftwareUpdateRequestorUpdateState>(), //
+        make_unique<SubscribeAttributeOtaSoftwareUpdateRequestorUpdateState>(), //
+        make_unique<ReadOtaSoftwareUpdateRequestorUpdateStateProgress>(), //
+        make_unique<SubscribeAttributeOtaSoftwareUpdateRequestorUpdateStateProgress>(), //
+        make_unique<ReadOtaSoftwareUpdateRequestorGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeOtaSoftwareUpdateRequestorGeneratedCommandList>(), //
+        make_unique<ReadOtaSoftwareUpdateRequestorAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeOtaSoftwareUpdateRequestorAcceptedCommandList>(), //
+        make_unique<ReadOtaSoftwareUpdateRequestorAttributeList>(), //
+        make_unique<SubscribeAttributeOtaSoftwareUpdateRequestorAttributeList>(), //
+        make_unique<ReadOtaSoftwareUpdateRequestorFeatureMap>(), //
+        make_unique<SubscribeAttributeOtaSoftwareUpdateRequestorFeatureMap>(), //
+        make_unique<ReadOtaSoftwareUpdateRequestorClusterRevision>(), //
+        make_unique<SubscribeAttributeOtaSoftwareUpdateRequestorClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
 void registerClusterLocalizationConfiguration(Commands & commands)
 {
     using namespace chip::app::Clusters::LocalizationConfiguration;
@@ -92948,151 +91813,216 @@ void registerClusterLocalizationConfiguration(Commands & commands)
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterLowPower(Commands & commands)
+void registerClusterTimeFormatLocalization(Commands & commands)
 {
-    using namespace chip::app::Clusters::LowPower;
+    using namespace chip::app::Clusters::TimeFormatLocalization;
 
-    const char * clusterName = "LowPower";
+    const char * clusterName = "TimeFormatLocalization";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
-        make_unique<LowPowerSleep>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadLowPowerGeneratedCommandList>(), //
+        make_unique<ReadTimeFormatLocalizationHourFormat>(), //
         make_unique<WriteAttribute>(Id), //
+        make_unique<WriteTimeFormatLocalizationHourFormat>(), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeLowPowerGeneratedCommandList>(), //
-        make_unique<ReadLowPowerAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeLowPowerAcceptedCommandList>(), //
-        make_unique<ReadLowPowerAttributeList>(), //
-        make_unique<SubscribeAttributeLowPowerAttributeList>(), //
-        make_unique<ReadLowPowerFeatureMap>(), //
-        make_unique<SubscribeAttributeLowPowerFeatureMap>(), //
-        make_unique<ReadLowPowerClusterRevision>(), //
-        make_unique<SubscribeAttributeLowPowerClusterRevision>(), //
+        make_unique<SubscribeAttributeTimeFormatLocalizationHourFormat>(), //
+        make_unique<ReadTimeFormatLocalizationActiveCalendarType>(), //
+        make_unique<WriteTimeFormatLocalizationActiveCalendarType>(), //
+        make_unique<SubscribeAttributeTimeFormatLocalizationActiveCalendarType>(), //
+        make_unique<ReadTimeFormatLocalizationSupportedCalendarTypes>(), //
+        make_unique<SubscribeAttributeTimeFormatLocalizationSupportedCalendarTypes>(), //
+        make_unique<ReadTimeFormatLocalizationGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeTimeFormatLocalizationGeneratedCommandList>(), //
+        make_unique<ReadTimeFormatLocalizationAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeTimeFormatLocalizationAcceptedCommandList>(), //
+        make_unique<ReadTimeFormatLocalizationAttributeList>(), //
+        make_unique<SubscribeAttributeTimeFormatLocalizationAttributeList>(), //
+        make_unique<ReadTimeFormatLocalizationFeatureMap>(), //
+        make_unique<SubscribeAttributeTimeFormatLocalizationFeatureMap>(), //
+        make_unique<ReadTimeFormatLocalizationClusterRevision>(), //
+        make_unique<SubscribeAttributeTimeFormatLocalizationClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterMediaInput(Commands & commands)
+void registerClusterUnitLocalization(Commands & commands)
 {
-    using namespace chip::app::Clusters::MediaInput;
+    using namespace chip::app::Clusters::UnitLocalization;
 
-    const char * clusterName = "MediaInput";
+    const char * clusterName = "UnitLocalization";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
-        make_unique<MediaInputSelectInput>(), //
-        make_unique<MediaInputShowInputStatus>(), //
-        make_unique<MediaInputHideInputStatus>(), //
-        make_unique<MediaInputRenameInput>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadMediaInputInputList>(), //
+        make_unique<ReadUnitLocalizationTemperatureUnit>(), //
         make_unique<WriteAttribute>(Id), //
+        make_unique<WriteUnitLocalizationTemperatureUnit>(), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeMediaInputInputList>(), //
-        make_unique<ReadMediaInputCurrentInput>(), //
-        make_unique<SubscribeAttributeMediaInputCurrentInput>(), //
-        make_unique<ReadMediaInputGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeMediaInputGeneratedCommandList>(), //
-        make_unique<ReadMediaInputAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeMediaInputAcceptedCommandList>(), //
-        make_unique<ReadMediaInputAttributeList>(), //
-        make_unique<SubscribeAttributeMediaInputAttributeList>(), //
-        make_unique<ReadMediaInputFeatureMap>(), //
-        make_unique<SubscribeAttributeMediaInputFeatureMap>(), //
-        make_unique<ReadMediaInputClusterRevision>(), //
-        make_unique<SubscribeAttributeMediaInputClusterRevision>(), //
+        make_unique<SubscribeAttributeUnitLocalizationTemperatureUnit>(), //
+        make_unique<ReadUnitLocalizationGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeUnitLocalizationGeneratedCommandList>(), //
+        make_unique<ReadUnitLocalizationAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeUnitLocalizationAcceptedCommandList>(), //
+        make_unique<ReadUnitLocalizationAttributeList>(), //
+        make_unique<SubscribeAttributeUnitLocalizationAttributeList>(), //
+        make_unique<ReadUnitLocalizationFeatureMap>(), //
+        make_unique<SubscribeAttributeUnitLocalizationFeatureMap>(), //
+        make_unique<ReadUnitLocalizationClusterRevision>(), //
+        make_unique<SubscribeAttributeUnitLocalizationClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterMediaPlayback(Commands & commands)
+void registerClusterPowerSourceConfiguration(Commands & commands)
 {
-    using namespace chip::app::Clusters::MediaPlayback;
+    using namespace chip::app::Clusters::PowerSourceConfiguration;
 
-    const char * clusterName = "MediaPlayback";
+    const char * clusterName = "PowerSourceConfiguration";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadPowerSourceConfigurationSources>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributePowerSourceConfigurationSources>(), //
+        make_unique<ReadPowerSourceConfigurationGeneratedCommandList>(), //
+        make_unique<SubscribeAttributePowerSourceConfigurationGeneratedCommandList>(), //
+        make_unique<ReadPowerSourceConfigurationAcceptedCommandList>(), //
+        make_unique<SubscribeAttributePowerSourceConfigurationAcceptedCommandList>(), //
+        make_unique<ReadPowerSourceConfigurationAttributeList>(), //
+        make_unique<SubscribeAttributePowerSourceConfigurationAttributeList>(), //
+        make_unique<ReadPowerSourceConfigurationFeatureMap>(), //
+        make_unique<SubscribeAttributePowerSourceConfigurationFeatureMap>(), //
+        make_unique<ReadPowerSourceConfigurationClusterRevision>(), //
+        make_unique<SubscribeAttributePowerSourceConfigurationClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterPowerSource(Commands & commands)
+{
+    using namespace chip::app::Clusters::PowerSource;
+
+    const char * clusterName = "PowerSource";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
-        make_unique<MediaPlaybackPlay>(), //
-        make_unique<MediaPlaybackPause>(), //
-        make_unique<MediaPlaybackStopPlayback>(), //
-        make_unique<MediaPlaybackStartOver>(), //
-        make_unique<MediaPlaybackPrevious>(), //
-        make_unique<MediaPlaybackNext>(), //
-        make_unique<MediaPlaybackRewind>(), //
-        make_unique<MediaPlaybackFastForward>(), //
-        make_unique<MediaPlaybackSkipForward>(), //
-        make_unique<MediaPlaybackSkipBackward>(), //
-        make_unique<MediaPlaybackSeek>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadMediaPlaybackCurrentState>(), //
+        make_unique<ReadPowerSourceStatus>(), //
         make_unique<WriteAttribute>(Id), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeMediaPlaybackCurrentState>(), //
-        make_unique<ReadMediaPlaybackStartTime>(), //
-        make_unique<SubscribeAttributeMediaPlaybackStartTime>(), //
-        make_unique<ReadMediaPlaybackDuration>(), //
-        make_unique<SubscribeAttributeMediaPlaybackDuration>(), //
-        make_unique<ReadMediaPlaybackSampledPosition>(), //
-        make_unique<SubscribeAttributeMediaPlaybackSampledPosition>(), //
-        make_unique<ReadMediaPlaybackPlaybackSpeed>(), //
-        make_unique<SubscribeAttributeMediaPlaybackPlaybackSpeed>(), //
-        make_unique<ReadMediaPlaybackSeekRangeEnd>(), //
-        make_unique<SubscribeAttributeMediaPlaybackSeekRangeEnd>(), //
-        make_unique<ReadMediaPlaybackSeekRangeStart>(), //
-        make_unique<SubscribeAttributeMediaPlaybackSeekRangeStart>(), //
-        make_unique<ReadMediaPlaybackGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeMediaPlaybackGeneratedCommandList>(), //
-        make_unique<ReadMediaPlaybackAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeMediaPlaybackAcceptedCommandList>(), //
-        make_unique<ReadMediaPlaybackAttributeList>(), //
-        make_unique<SubscribeAttributeMediaPlaybackAttributeList>(), //
-        make_unique<ReadMediaPlaybackFeatureMap>(), //
-        make_unique<SubscribeAttributeMediaPlaybackFeatureMap>(), //
-        make_unique<ReadMediaPlaybackClusterRevision>(), //
-        make_unique<SubscribeAttributeMediaPlaybackClusterRevision>(), //
+        make_unique<SubscribeAttributePowerSourceStatus>(), //
+        make_unique<ReadPowerSourceOrder>(), //
+        make_unique<SubscribeAttributePowerSourceOrder>(), //
+        make_unique<ReadPowerSourceDescription>(), //
+        make_unique<SubscribeAttributePowerSourceDescription>(), //
+        make_unique<ReadPowerSourceWiredAssessedInputVoltage>(), //
+        make_unique<SubscribeAttributePowerSourceWiredAssessedInputVoltage>(), //
+        make_unique<ReadPowerSourceWiredAssessedInputFrequency>(), //
+        make_unique<SubscribeAttributePowerSourceWiredAssessedInputFrequency>(), //
+        make_unique<ReadPowerSourceWiredCurrentType>(), //
+        make_unique<SubscribeAttributePowerSourceWiredCurrentType>(), //
+        make_unique<ReadPowerSourceWiredAssessedCurrent>(), //
+        make_unique<SubscribeAttributePowerSourceWiredAssessedCurrent>(), //
+        make_unique<ReadPowerSourceWiredNominalVoltage>(), //
+        make_unique<SubscribeAttributePowerSourceWiredNominalVoltage>(), //
+        make_unique<ReadPowerSourceWiredMaximumCurrent>(), //
+        make_unique<SubscribeAttributePowerSourceWiredMaximumCurrent>(), //
+        make_unique<ReadPowerSourceWiredPresent>(), //
+        make_unique<SubscribeAttributePowerSourceWiredPresent>(), //
+        make_unique<ReadPowerSourceActiveWiredFaults>(), //
+        make_unique<SubscribeAttributePowerSourceActiveWiredFaults>(), //
+        make_unique<ReadPowerSourceBatteryVoltage>(), //
+        make_unique<SubscribeAttributePowerSourceBatteryVoltage>(), //
+        make_unique<ReadPowerSourceBatteryPercentRemaining>(), //
+        make_unique<SubscribeAttributePowerSourceBatteryPercentRemaining>(), //
+        make_unique<ReadPowerSourceBatteryTimeRemaining>(), //
+        make_unique<SubscribeAttributePowerSourceBatteryTimeRemaining>(), //
+        make_unique<ReadPowerSourceBatteryChargeLevel>(), //
+        make_unique<SubscribeAttributePowerSourceBatteryChargeLevel>(), //
+        make_unique<ReadPowerSourceBatteryReplacementNeeded>(), //
+        make_unique<SubscribeAttributePowerSourceBatteryReplacementNeeded>(), //
+        make_unique<ReadPowerSourceBatteryReplaceability>(), //
+        make_unique<SubscribeAttributePowerSourceBatteryReplaceability>(), //
+        make_unique<ReadPowerSourceBatteryPresent>(), //
+        make_unique<SubscribeAttributePowerSourceBatteryPresent>(), //
+        make_unique<ReadPowerSourceActiveBatteryFaults>(), //
+        make_unique<SubscribeAttributePowerSourceActiveBatteryFaults>(), //
+        make_unique<ReadPowerSourceBatteryReplacementDescription>(), //
+        make_unique<SubscribeAttributePowerSourceBatteryReplacementDescription>(), //
+        make_unique<ReadPowerSourceBatteryCommonDesignation>(), //
+        make_unique<SubscribeAttributePowerSourceBatteryCommonDesignation>(), //
+        make_unique<ReadPowerSourceBatteryANSIDesignation>(), //
+        make_unique<SubscribeAttributePowerSourceBatteryANSIDesignation>(), //
+        make_unique<ReadPowerSourceBatteryIECDesignation>(), //
+        make_unique<SubscribeAttributePowerSourceBatteryIECDesignation>(), //
+        make_unique<ReadPowerSourceBatteryApprovedChemistry>(), //
+        make_unique<SubscribeAttributePowerSourceBatteryApprovedChemistry>(), //
+        make_unique<ReadPowerSourceBatteryCapacity>(), //
+        make_unique<SubscribeAttributePowerSourceBatteryCapacity>(), //
+        make_unique<ReadPowerSourceBatteryQuantity>(), //
+        make_unique<SubscribeAttributePowerSourceBatteryQuantity>(), //
+        make_unique<ReadPowerSourceBatteryChargeState>(), //
+        make_unique<SubscribeAttributePowerSourceBatteryChargeState>(), //
+        make_unique<ReadPowerSourceBatteryTimeToFullCharge>(), //
+        make_unique<SubscribeAttributePowerSourceBatteryTimeToFullCharge>(), //
+        make_unique<ReadPowerSourceBatteryFunctionalWhileCharging>(), //
+        make_unique<SubscribeAttributePowerSourceBatteryFunctionalWhileCharging>(), //
+        make_unique<ReadPowerSourceBatteryChargingCurrent>(), //
+        make_unique<SubscribeAttributePowerSourceBatteryChargingCurrent>(), //
+        make_unique<ReadPowerSourceActiveBatteryChargeFaults>(), //
+        make_unique<SubscribeAttributePowerSourceActiveBatteryChargeFaults>(), //
+        make_unique<ReadPowerSourceGeneratedCommandList>(), //
+        make_unique<SubscribeAttributePowerSourceGeneratedCommandList>(), //
+        make_unique<ReadPowerSourceAcceptedCommandList>(), //
+        make_unique<SubscribeAttributePowerSourceAcceptedCommandList>(), //
+        make_unique<ReadPowerSourceAttributeList>(), //
+        make_unique<SubscribeAttributePowerSourceAttributeList>(), //
+        make_unique<ReadPowerSourceFeatureMap>(), //
+        make_unique<SubscribeAttributePowerSourceFeatureMap>(), //
+        make_unique<ReadPowerSourceClusterRevision>(), //
+        make_unique<SubscribeAttributePowerSourceClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterModeSelect(Commands & commands)
+void registerClusterGeneralCommissioning(Commands & commands)
 {
-    using namespace chip::app::Clusters::ModeSelect;
+    using namespace chip::app::Clusters::GeneralCommissioning;
 
-    const char * clusterName = "ModeSelect";
+    const char * clusterName = "GeneralCommissioning";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
-        make_unique<ModeSelectChangeToMode>(), //
+        make_unique<GeneralCommissioningArmFailSafe>(), //
+        make_unique<GeneralCommissioningSetRegulatoryConfig>(), //
+        make_unique<GeneralCommissioningCommissioningComplete>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadModeSelectDescription>(), //
+        make_unique<ReadGeneralCommissioningBreadcrumb>(), //
         make_unique<WriteAttribute>(Id), //
+        make_unique<WriteGeneralCommissioningBreadcrumb>(), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeModeSelectDescription>(), //
-        make_unique<ReadModeSelectStandardNamespace>(), //
-        make_unique<SubscribeAttributeModeSelectStandardNamespace>(), //
-        make_unique<ReadModeSelectSupportedModes>(), //
-        make_unique<SubscribeAttributeModeSelectSupportedModes>(), //
-        make_unique<ReadModeSelectCurrentMode>(), //
-        make_unique<SubscribeAttributeModeSelectCurrentMode>(), //
-        make_unique<ReadModeSelectStartUpMode>(), //
-        make_unique<WriteModeSelectStartUpMode>(), //
-        make_unique<SubscribeAttributeModeSelectStartUpMode>(), //
-        make_unique<ReadModeSelectOnMode>(), //
-        make_unique<WriteModeSelectOnMode>(), //
-        make_unique<SubscribeAttributeModeSelectOnMode>(), //
-        make_unique<ReadModeSelectGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeModeSelectGeneratedCommandList>(), //
-        make_unique<ReadModeSelectAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeModeSelectAcceptedCommandList>(), //
-        make_unique<ReadModeSelectAttributeList>(), //
-        make_unique<SubscribeAttributeModeSelectAttributeList>(), //
-        make_unique<ReadModeSelectFeatureMap>(), //
-        make_unique<SubscribeAttributeModeSelectFeatureMap>(), //
-        make_unique<ReadModeSelectClusterRevision>(), //
-        make_unique<SubscribeAttributeModeSelectClusterRevision>(), //
+        make_unique<SubscribeAttributeGeneralCommissioningBreadcrumb>(), //
+        make_unique<ReadGeneralCommissioningBasicCommissioningInfo>(), //
+        make_unique<SubscribeAttributeGeneralCommissioningBasicCommissioningInfo>(), //
+        make_unique<ReadGeneralCommissioningRegulatoryConfig>(), //
+        make_unique<SubscribeAttributeGeneralCommissioningRegulatoryConfig>(), //
+        make_unique<ReadGeneralCommissioningLocationCapability>(), //
+        make_unique<SubscribeAttributeGeneralCommissioningLocationCapability>(), //
+        make_unique<ReadGeneralCommissioningSupportsConcurrentConnection>(), //
+        make_unique<SubscribeAttributeGeneralCommissioningSupportsConcurrentConnection>(), //
+        make_unique<ReadGeneralCommissioningGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeGeneralCommissioningGeneratedCommandList>(), //
+        make_unique<ReadGeneralCommissioningAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeGeneralCommissioningAcceptedCommandList>(), //
+        make_unique<ReadGeneralCommissioningAttributeList>(), //
+        make_unique<SubscribeAttributeGeneralCommissioningAttributeList>(), //
+        make_unique<ReadGeneralCommissioningFeatureMap>(), //
+        make_unique<SubscribeAttributeGeneralCommissioningFeatureMap>(), //
+        make_unique<ReadGeneralCommissioningClusterRevision>(), //
+        make_unique<SubscribeAttributeGeneralCommissioningClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
@@ -93145,197 +92075,475 @@ void registerClusterNetworkCommissioning(Commands & commands)
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterOtaSoftwareUpdateProvider(Commands & commands)
+void registerClusterDiagnosticLogs(Commands & commands)
 {
-    using namespace chip::app::Clusters::OtaSoftwareUpdateProvider;
+    using namespace chip::app::Clusters::DiagnosticLogs;
 
-    const char * clusterName = "OtaSoftwareUpdateProvider";
+    const char * clusterName = "DiagnosticLogs";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
-        make_unique<OtaSoftwareUpdateProviderQueryImage>(), //
-        make_unique<OtaSoftwareUpdateProviderApplyUpdateRequest>(), //
-        make_unique<OtaSoftwareUpdateProviderNotifyUpdateApplied>(), //
+        make_unique<DiagnosticLogsRetrieveLogsRequest>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadOtaSoftwareUpdateProviderGeneratedCommandList>(), //
+        make_unique<ReadDiagnosticLogsGeneratedCommandList>(), //
         make_unique<WriteAttribute>(Id), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeOtaSoftwareUpdateProviderGeneratedCommandList>(), //
-        make_unique<ReadOtaSoftwareUpdateProviderAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeOtaSoftwareUpdateProviderAcceptedCommandList>(), //
-        make_unique<ReadOtaSoftwareUpdateProviderAttributeList>(), //
-        make_unique<SubscribeAttributeOtaSoftwareUpdateProviderAttributeList>(), //
-        make_unique<ReadOtaSoftwareUpdateProviderFeatureMap>(), //
-        make_unique<SubscribeAttributeOtaSoftwareUpdateProviderFeatureMap>(), //
-        make_unique<ReadOtaSoftwareUpdateProviderClusterRevision>(), //
-        make_unique<SubscribeAttributeOtaSoftwareUpdateProviderClusterRevision>(), //
+        make_unique<SubscribeAttributeDiagnosticLogsGeneratedCommandList>(), //
+        make_unique<ReadDiagnosticLogsAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeDiagnosticLogsAcceptedCommandList>(), //
+        make_unique<ReadDiagnosticLogsAttributeList>(), //
+        make_unique<SubscribeAttributeDiagnosticLogsAttributeList>(), //
+        make_unique<ReadDiagnosticLogsFeatureMap>(), //
+        make_unique<SubscribeAttributeDiagnosticLogsFeatureMap>(), //
+        make_unique<ReadDiagnosticLogsClusterRevision>(), //
+        make_unique<SubscribeAttributeDiagnosticLogsClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterOtaSoftwareUpdateRequestor(Commands & commands)
+void registerClusterGeneralDiagnostics(Commands & commands)
 {
-    using namespace chip::app::Clusters::OtaSoftwareUpdateRequestor;
+    using namespace chip::app::Clusters::GeneralDiagnostics;
 
-    const char * clusterName = "OtaSoftwareUpdateRequestor";
+    const char * clusterName = "GeneralDiagnostics";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
-        make_unique<OtaSoftwareUpdateRequestorAnnounceOtaProvider>(), //
+        make_unique<GeneralDiagnosticsTestEventTrigger>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadOtaSoftwareUpdateRequestorDefaultOtaProviders>(), //
+        make_unique<ReadGeneralDiagnosticsNetworkInterfaces>(), //
         make_unique<WriteAttribute>(Id), //
-        make_unique<WriteOtaSoftwareUpdateRequestorDefaultOtaProviders>(), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeOtaSoftwareUpdateRequestorDefaultOtaProviders>(), //
-        make_unique<ReadOtaSoftwareUpdateRequestorUpdatePossible>(), //
-        make_unique<SubscribeAttributeOtaSoftwareUpdateRequestorUpdatePossible>(), //
-        make_unique<ReadOtaSoftwareUpdateRequestorUpdateState>(), //
-        make_unique<SubscribeAttributeOtaSoftwareUpdateRequestorUpdateState>(), //
-        make_unique<ReadOtaSoftwareUpdateRequestorUpdateStateProgress>(), //
-        make_unique<SubscribeAttributeOtaSoftwareUpdateRequestorUpdateStateProgress>(), //
-        make_unique<ReadOtaSoftwareUpdateRequestorGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeOtaSoftwareUpdateRequestorGeneratedCommandList>(), //
-        make_unique<ReadOtaSoftwareUpdateRequestorAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeOtaSoftwareUpdateRequestorAcceptedCommandList>(), //
-        make_unique<ReadOtaSoftwareUpdateRequestorAttributeList>(), //
-        make_unique<SubscribeAttributeOtaSoftwareUpdateRequestorAttributeList>(), //
-        make_unique<ReadOtaSoftwareUpdateRequestorFeatureMap>(), //
-        make_unique<SubscribeAttributeOtaSoftwareUpdateRequestorFeatureMap>(), //
-        make_unique<ReadOtaSoftwareUpdateRequestorClusterRevision>(), //
-        make_unique<SubscribeAttributeOtaSoftwareUpdateRequestorClusterRevision>(), //
+        make_unique<SubscribeAttributeGeneralDiagnosticsNetworkInterfaces>(), //
+        make_unique<ReadGeneralDiagnosticsRebootCount>(), //
+        make_unique<SubscribeAttributeGeneralDiagnosticsRebootCount>(), //
+        make_unique<ReadGeneralDiagnosticsUpTime>(), //
+        make_unique<SubscribeAttributeGeneralDiagnosticsUpTime>(), //
+        make_unique<ReadGeneralDiagnosticsTotalOperationalHours>(), //
+        make_unique<SubscribeAttributeGeneralDiagnosticsTotalOperationalHours>(), //
+        make_unique<ReadGeneralDiagnosticsBootReasons>(), //
+        make_unique<SubscribeAttributeGeneralDiagnosticsBootReasons>(), //
+        make_unique<ReadGeneralDiagnosticsActiveHardwareFaults>(), //
+        make_unique<SubscribeAttributeGeneralDiagnosticsActiveHardwareFaults>(), //
+        make_unique<ReadGeneralDiagnosticsActiveRadioFaults>(), //
+        make_unique<SubscribeAttributeGeneralDiagnosticsActiveRadioFaults>(), //
+        make_unique<ReadGeneralDiagnosticsActiveNetworkFaults>(), //
+        make_unique<SubscribeAttributeGeneralDiagnosticsActiveNetworkFaults>(), //
+        make_unique<ReadGeneralDiagnosticsTestEventTriggersEnabled>(), //
+        make_unique<SubscribeAttributeGeneralDiagnosticsTestEventTriggersEnabled>(), //
+        make_unique<ReadGeneralDiagnosticsGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeGeneralDiagnosticsGeneratedCommandList>(), //
+        make_unique<ReadGeneralDiagnosticsAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeGeneralDiagnosticsAcceptedCommandList>(), //
+        make_unique<ReadGeneralDiagnosticsAttributeList>(), //
+        make_unique<SubscribeAttributeGeneralDiagnosticsAttributeList>(), //
+        make_unique<ReadGeneralDiagnosticsFeatureMap>(), //
+        make_unique<SubscribeAttributeGeneralDiagnosticsFeatureMap>(), //
+        make_unique<ReadGeneralDiagnosticsClusterRevision>(), //
+        make_unique<SubscribeAttributeGeneralDiagnosticsClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterSoftwareDiagnostics(Commands & commands)
+{
+    using namespace chip::app::Clusters::SoftwareDiagnostics;
+
+    const char * clusterName = "SoftwareDiagnostics";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<SoftwareDiagnosticsResetWatermarks>(), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadSoftwareDiagnosticsThreadMetrics>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeSoftwareDiagnosticsThreadMetrics>(), //
+        make_unique<ReadSoftwareDiagnosticsCurrentHeapFree>(), //
+        make_unique<SubscribeAttributeSoftwareDiagnosticsCurrentHeapFree>(), //
+        make_unique<ReadSoftwareDiagnosticsCurrentHeapUsed>(), //
+        make_unique<SubscribeAttributeSoftwareDiagnosticsCurrentHeapUsed>(), //
+        make_unique<ReadSoftwareDiagnosticsCurrentHeapHighWatermark>(), //
+        make_unique<SubscribeAttributeSoftwareDiagnosticsCurrentHeapHighWatermark>(), //
+        make_unique<ReadSoftwareDiagnosticsGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeSoftwareDiagnosticsGeneratedCommandList>(), //
+        make_unique<ReadSoftwareDiagnosticsAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeSoftwareDiagnosticsAcceptedCommandList>(), //
+        make_unique<ReadSoftwareDiagnosticsAttributeList>(), //
+        make_unique<SubscribeAttributeSoftwareDiagnosticsAttributeList>(), //
+        make_unique<ReadSoftwareDiagnosticsFeatureMap>(), //
+        make_unique<SubscribeAttributeSoftwareDiagnosticsFeatureMap>(), //
+        make_unique<ReadSoftwareDiagnosticsClusterRevision>(), //
+        make_unique<SubscribeAttributeSoftwareDiagnosticsClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterThreadNetworkDiagnostics(Commands & commands)
+{
+    using namespace chip::app::Clusters::ThreadNetworkDiagnostics;
+
+    const char * clusterName = "ThreadNetworkDiagnostics";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<ThreadNetworkDiagnosticsResetCounts>(), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadThreadNetworkDiagnosticsChannel>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsChannel>(), //
+        make_unique<ReadThreadNetworkDiagnosticsRoutingRole>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRoutingRole>(), //
+        make_unique<ReadThreadNetworkDiagnosticsNetworkName>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsNetworkName>(), //
+        make_unique<ReadThreadNetworkDiagnosticsPanId>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsPanId>(), //
+        make_unique<ReadThreadNetworkDiagnosticsExtendedPanId>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsExtendedPanId>(), //
+        make_unique<ReadThreadNetworkDiagnosticsMeshLocalPrefix>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsMeshLocalPrefix>(), //
+        make_unique<ReadThreadNetworkDiagnosticsOverrunCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsOverrunCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsNeighborTableList>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsNeighborTableList>(), //
+        make_unique<ReadThreadNetworkDiagnosticsRouteTableList>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRouteTableList>(), //
+        make_unique<ReadThreadNetworkDiagnosticsPartitionId>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsPartitionId>(), //
+        make_unique<ReadThreadNetworkDiagnosticsWeighting>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsWeighting>(), //
+        make_unique<ReadThreadNetworkDiagnosticsDataVersion>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsDataVersion>(), //
+        make_unique<ReadThreadNetworkDiagnosticsStableDataVersion>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsStableDataVersion>(), //
+        make_unique<ReadThreadNetworkDiagnosticsLeaderRouterId>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsLeaderRouterId>(), //
+        make_unique<ReadThreadNetworkDiagnosticsDetachedRoleCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsDetachedRoleCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsChildRoleCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsChildRoleCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsRouterRoleCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRouterRoleCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsLeaderRoleCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsLeaderRoleCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsAttachAttemptCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsAttachAttemptCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsPartitionIdChangeCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsPartitionIdChangeCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsBetterPartitionAttachAttemptCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsBetterPartitionAttachAttemptCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsParentChangeCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsParentChangeCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsTxTotalCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxTotalCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsTxUnicastCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxUnicastCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsTxBroadcastCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxBroadcastCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsTxAckRequestedCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxAckRequestedCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsTxAckedCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxAckedCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsTxNoAckRequestedCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxNoAckRequestedCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsTxDataCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxDataCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsTxDataPollCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxDataPollCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsTxBeaconCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxBeaconCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsTxBeaconRequestCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxBeaconRequestCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsTxOtherCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxOtherCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsTxRetryCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxRetryCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsTxErrCcaCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxErrCcaCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsTxErrAbortCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxErrAbortCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsTxErrBusyChannelCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxErrBusyChannelCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsRxTotalCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxTotalCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsRxUnicastCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxUnicastCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsRxBroadcastCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxBroadcastCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsRxDataCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxDataCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsRxDataPollCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxDataPollCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsRxBeaconCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxBeaconCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsRxBeaconRequestCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxBeaconRequestCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsRxOtherCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxOtherCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsRxAddressFilteredCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxAddressFilteredCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsRxDestAddrFilteredCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxDestAddrFilteredCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsRxDuplicatedCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxDuplicatedCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsRxErrNoFrameCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxErrNoFrameCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsRxErrUnknownNeighborCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxErrUnknownNeighborCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsRxErrSecCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxErrSecCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsRxErrFcsCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxErrFcsCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsRxErrOtherCount>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxErrOtherCount>(), //
+        make_unique<ReadThreadNetworkDiagnosticsActiveTimestamp>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsActiveTimestamp>(), //
+        make_unique<ReadThreadNetworkDiagnosticsPendingTimestamp>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsPendingTimestamp>(), //
+        make_unique<ReadThreadNetworkDiagnosticsDelay>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsDelay>(), //
+        make_unique<ReadThreadNetworkDiagnosticsSecurityPolicy>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsSecurityPolicy>(), //
+        make_unique<ReadThreadNetworkDiagnosticsChannelMask>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsChannelMask>(), //
+        make_unique<ReadThreadNetworkDiagnosticsOperationalDatasetComponents>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsOperationalDatasetComponents>(), //
+        make_unique<ReadThreadNetworkDiagnosticsActiveNetworkFaultsList>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsActiveNetworkFaultsList>(), //
+        make_unique<ReadThreadNetworkDiagnosticsGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsGeneratedCommandList>(), //
+        make_unique<ReadThreadNetworkDiagnosticsAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsAcceptedCommandList>(), //
+        make_unique<ReadThreadNetworkDiagnosticsAttributeList>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsAttributeList>(), //
+        make_unique<ReadThreadNetworkDiagnosticsFeatureMap>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsFeatureMap>(), //
+        make_unique<ReadThreadNetworkDiagnosticsClusterRevision>(), //
+        make_unique<SubscribeAttributeThreadNetworkDiagnosticsClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterWiFiNetworkDiagnostics(Commands & commands)
+{
+    using namespace chip::app::Clusters::WiFiNetworkDiagnostics;
+
+    const char * clusterName = "WiFiNetworkDiagnostics";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<WiFiNetworkDiagnosticsResetCounts>(), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadWiFiNetworkDiagnosticsBssid>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsBssid>(), //
+        make_unique<ReadWiFiNetworkDiagnosticsSecurityType>(), //
+        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsSecurityType>(), //
+        make_unique<ReadWiFiNetworkDiagnosticsWiFiVersion>(), //
+        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsWiFiVersion>(), //
+        make_unique<ReadWiFiNetworkDiagnosticsChannelNumber>(), //
+        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsChannelNumber>(), //
+        make_unique<ReadWiFiNetworkDiagnosticsRssi>(), //
+        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsRssi>(), //
+        make_unique<ReadWiFiNetworkDiagnosticsBeaconLostCount>(), //
+        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsBeaconLostCount>(), //
+        make_unique<ReadWiFiNetworkDiagnosticsBeaconRxCount>(), //
+        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsBeaconRxCount>(), //
+        make_unique<ReadWiFiNetworkDiagnosticsPacketMulticastRxCount>(), //
+        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastRxCount>(), //
+        make_unique<ReadWiFiNetworkDiagnosticsPacketMulticastTxCount>(), //
+        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastTxCount>(), //
+        make_unique<ReadWiFiNetworkDiagnosticsPacketUnicastRxCount>(), //
+        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastRxCount>(), //
+        make_unique<ReadWiFiNetworkDiagnosticsPacketUnicastTxCount>(), //
+        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastTxCount>(), //
+        make_unique<ReadWiFiNetworkDiagnosticsCurrentMaxRate>(), //
+        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsCurrentMaxRate>(), //
+        make_unique<ReadWiFiNetworkDiagnosticsOverrunCount>(), //
+        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsOverrunCount>(), //
+        make_unique<ReadWiFiNetworkDiagnosticsGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsGeneratedCommandList>(), //
+        make_unique<ReadWiFiNetworkDiagnosticsAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsAcceptedCommandList>(), //
+        make_unique<ReadWiFiNetworkDiagnosticsAttributeList>(), //
+        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsAttributeList>(), //
+        make_unique<ReadWiFiNetworkDiagnosticsFeatureMap>(), //
+        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsFeatureMap>(), //
+        make_unique<ReadWiFiNetworkDiagnosticsClusterRevision>(), //
+        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterEthernetNetworkDiagnostics(Commands & commands)
+{
+    using namespace chip::app::Clusters::EthernetNetworkDiagnostics;
+
+    const char * clusterName = "EthernetNetworkDiagnostics";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<EthernetNetworkDiagnosticsResetCounts>(), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadEthernetNetworkDiagnosticsPHYRate>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsPHYRate>(), //
+        make_unique<ReadEthernetNetworkDiagnosticsFullDuplex>(), //
+        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsFullDuplex>(), //
+        make_unique<ReadEthernetNetworkDiagnosticsPacketRxCount>(), //
+        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsPacketRxCount>(), //
+        make_unique<ReadEthernetNetworkDiagnosticsPacketTxCount>(), //
+        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsPacketTxCount>(), //
+        make_unique<ReadEthernetNetworkDiagnosticsTxErrCount>(), //
+        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsTxErrCount>(), //
+        make_unique<ReadEthernetNetworkDiagnosticsCollisionCount>(), //
+        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsCollisionCount>(), //
+        make_unique<ReadEthernetNetworkDiagnosticsOverrunCount>(), //
+        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsOverrunCount>(), //
+        make_unique<ReadEthernetNetworkDiagnosticsCarrierDetect>(), //
+        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsCarrierDetect>(), //
+        make_unique<ReadEthernetNetworkDiagnosticsTimeSinceReset>(), //
+        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsTimeSinceReset>(), //
+        make_unique<ReadEthernetNetworkDiagnosticsGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsGeneratedCommandList>(), //
+        make_unique<ReadEthernetNetworkDiagnosticsAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsAcceptedCommandList>(), //
+        make_unique<ReadEthernetNetworkDiagnosticsAttributeList>(), //
+        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsAttributeList>(), //
+        make_unique<ReadEthernetNetworkDiagnosticsFeatureMap>(), //
+        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsFeatureMap>(), //
+        make_unique<ReadEthernetNetworkDiagnosticsClusterRevision>(), //
+        make_unique<SubscribeAttributeEthernetNetworkDiagnosticsClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterOccupancySensing(Commands & commands)
+void registerClusterBridgedDeviceBasic(Commands & commands)
 {
-    using namespace chip::app::Clusters::OccupancySensing;
+    using namespace chip::app::Clusters::BridgedDeviceBasic;
 
-    const char * clusterName = "OccupancySensing";
+    const char * clusterName = "BridgedDeviceBasic";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadOccupancySensingOccupancy>(), //
+        make_unique<ReadBridgedDeviceBasicVendorName>(), //
         make_unique<WriteAttribute>(Id), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeOccupancySensingOccupancy>(), //
-        make_unique<ReadOccupancySensingOccupancySensorType>(), //
-        make_unique<SubscribeAttributeOccupancySensingOccupancySensorType>(), //
-        make_unique<ReadOccupancySensingOccupancySensorTypeBitmap>(), //
-        make_unique<SubscribeAttributeOccupancySensingOccupancySensorTypeBitmap>(), //
-        make_unique<ReadOccupancySensingPirOccupiedToUnoccupiedDelay>(), //
-        make_unique<WriteOccupancySensingPirOccupiedToUnoccupiedDelay>(), //
-        make_unique<SubscribeAttributeOccupancySensingPirOccupiedToUnoccupiedDelay>(), //
-        make_unique<ReadOccupancySensingPirUnoccupiedToOccupiedDelay>(), //
-        make_unique<WriteOccupancySensingPirUnoccupiedToOccupiedDelay>(), //
-        make_unique<SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedDelay>(), //
-        make_unique<ReadOccupancySensingPirUnoccupiedToOccupiedThreshold>(), //
-        make_unique<WriteOccupancySensingPirUnoccupiedToOccupiedThreshold>(), //
-        make_unique<SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedThreshold>(), //
-        make_unique<ReadOccupancySensingUltrasonicOccupiedToUnoccupiedDelay>(), //
-        make_unique<WriteOccupancySensingUltrasonicOccupiedToUnoccupiedDelay>(), //
-        make_unique<SubscribeAttributeOccupancySensingUltrasonicOccupiedToUnoccupiedDelay>(), //
-        make_unique<ReadOccupancySensingUltrasonicUnoccupiedToOccupiedDelay>(), //
-        make_unique<WriteOccupancySensingUltrasonicUnoccupiedToOccupiedDelay>(), //
-        make_unique<SubscribeAttributeOccupancySensingUltrasonicUnoccupiedToOccupiedDelay>(), //
-        make_unique<ReadOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold>(), //
-        make_unique<WriteOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold>(), //
-        make_unique<SubscribeAttributeOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold>(), //
-        make_unique<ReadOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay>(), //
-        make_unique<WriteOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay>(), //
-        make_unique<SubscribeAttributeOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay>(), //
-        make_unique<ReadOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay>(), //
-        make_unique<WriteOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay>(), //
-        make_unique<SubscribeAttributeOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay>(), //
-        make_unique<ReadOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold>(), //
-        make_unique<WriteOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold>(), //
-        make_unique<SubscribeAttributeOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold>(), //
-        make_unique<ReadOccupancySensingGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeOccupancySensingGeneratedCommandList>(), //
-        make_unique<ReadOccupancySensingAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeOccupancySensingAcceptedCommandList>(), //
-        make_unique<ReadOccupancySensingAttributeList>(), //
-        make_unique<SubscribeAttributeOccupancySensingAttributeList>(), //
-        make_unique<ReadOccupancySensingFeatureMap>(), //
-        make_unique<SubscribeAttributeOccupancySensingFeatureMap>(), //
-        make_unique<ReadOccupancySensingClusterRevision>(), //
-        make_unique<SubscribeAttributeOccupancySensingClusterRevision>(), //
+        make_unique<SubscribeAttributeBridgedDeviceBasicVendorName>(), //
+        make_unique<ReadBridgedDeviceBasicVendorID>(), //
+        make_unique<SubscribeAttributeBridgedDeviceBasicVendorID>(), //
+        make_unique<ReadBridgedDeviceBasicProductName>(), //
+        make_unique<SubscribeAttributeBridgedDeviceBasicProductName>(), //
+        make_unique<ReadBridgedDeviceBasicNodeLabel>(), //
+        make_unique<WriteBridgedDeviceBasicNodeLabel>(), //
+        make_unique<SubscribeAttributeBridgedDeviceBasicNodeLabel>(), //
+        make_unique<ReadBridgedDeviceBasicHardwareVersion>(), //
+        make_unique<SubscribeAttributeBridgedDeviceBasicHardwareVersion>(), //
+        make_unique<ReadBridgedDeviceBasicHardwareVersionString>(), //
+        make_unique<SubscribeAttributeBridgedDeviceBasicHardwareVersionString>(), //
+        make_unique<ReadBridgedDeviceBasicSoftwareVersion>(), //
+        make_unique<SubscribeAttributeBridgedDeviceBasicSoftwareVersion>(), //
+        make_unique<ReadBridgedDeviceBasicSoftwareVersionString>(), //
+        make_unique<SubscribeAttributeBridgedDeviceBasicSoftwareVersionString>(), //
+        make_unique<ReadBridgedDeviceBasicManufacturingDate>(), //
+        make_unique<SubscribeAttributeBridgedDeviceBasicManufacturingDate>(), //
+        make_unique<ReadBridgedDeviceBasicPartNumber>(), //
+        make_unique<SubscribeAttributeBridgedDeviceBasicPartNumber>(), //
+        make_unique<ReadBridgedDeviceBasicProductURL>(), //
+        make_unique<SubscribeAttributeBridgedDeviceBasicProductURL>(), //
+        make_unique<ReadBridgedDeviceBasicProductLabel>(), //
+        make_unique<SubscribeAttributeBridgedDeviceBasicProductLabel>(), //
+        make_unique<ReadBridgedDeviceBasicSerialNumber>(), //
+        make_unique<SubscribeAttributeBridgedDeviceBasicSerialNumber>(), //
+        make_unique<ReadBridgedDeviceBasicReachable>(), //
+        make_unique<SubscribeAttributeBridgedDeviceBasicReachable>(), //
+        make_unique<ReadBridgedDeviceBasicUniqueID>(), //
+        make_unique<SubscribeAttributeBridgedDeviceBasicUniqueID>(), //
+        make_unique<ReadBridgedDeviceBasicGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeBridgedDeviceBasicGeneratedCommandList>(), //
+        make_unique<ReadBridgedDeviceBasicAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeBridgedDeviceBasicAcceptedCommandList>(), //
+        make_unique<ReadBridgedDeviceBasicAttributeList>(), //
+        make_unique<SubscribeAttributeBridgedDeviceBasicAttributeList>(), //
+        make_unique<ReadBridgedDeviceBasicFeatureMap>(), //
+        make_unique<SubscribeAttributeBridgedDeviceBasicFeatureMap>(), //
+        make_unique<ReadBridgedDeviceBasicClusterRevision>(), //
+        make_unique<SubscribeAttributeBridgedDeviceBasicClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterOnOff(Commands & commands)
+void registerClusterSwitch(Commands & commands)
 {
-    using namespace chip::app::Clusters::OnOff;
+    using namespace chip::app::Clusters::Switch;
 
-    const char * clusterName = "OnOff";
+    const char * clusterName = "Switch";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
-        make_unique<OnOffOff>(), //
-        make_unique<OnOffOn>(), //
-        make_unique<OnOffToggle>(), //
-        make_unique<OnOffOffWithEffect>(), //
-        make_unique<OnOffOnWithRecallGlobalScene>(), //
-        make_unique<OnOffOnWithTimedOff>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadOnOffOnOff>(), //
+        make_unique<ReadSwitchNumberOfPositions>(), //
         make_unique<WriteAttribute>(Id), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeOnOffOnOff>(), //
-        make_unique<ReadOnOffGlobalSceneControl>(), //
-        make_unique<SubscribeAttributeOnOffGlobalSceneControl>(), //
-        make_unique<ReadOnOffOnTime>(), //
-        make_unique<WriteOnOffOnTime>(), //
-        make_unique<SubscribeAttributeOnOffOnTime>(), //
-        make_unique<ReadOnOffOffWaitTime>(), //
-        make_unique<WriteOnOffOffWaitTime>(), //
-        make_unique<SubscribeAttributeOnOffOffWaitTime>(), //
-        make_unique<ReadOnOffStartUpOnOff>(), //
-        make_unique<WriteOnOffStartUpOnOff>(), //
-        make_unique<SubscribeAttributeOnOffStartUpOnOff>(), //
-        make_unique<ReadOnOffGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeOnOffGeneratedCommandList>(), //
-        make_unique<ReadOnOffAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeOnOffAcceptedCommandList>(), //
-        make_unique<ReadOnOffAttributeList>(), //
-        make_unique<SubscribeAttributeOnOffAttributeList>(), //
-        make_unique<ReadOnOffFeatureMap>(), //
-        make_unique<SubscribeAttributeOnOffFeatureMap>(), //
-        make_unique<ReadOnOffClusterRevision>(), //
-        make_unique<SubscribeAttributeOnOffClusterRevision>(), //
+        make_unique<SubscribeAttributeSwitchNumberOfPositions>(), //
+        make_unique<ReadSwitchCurrentPosition>(), //
+        make_unique<SubscribeAttributeSwitchCurrentPosition>(), //
+        make_unique<ReadSwitchMultiPressMax>(), //
+        make_unique<SubscribeAttributeSwitchMultiPressMax>(), //
+        make_unique<ReadSwitchGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeSwitchGeneratedCommandList>(), //
+        make_unique<ReadSwitchAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeSwitchAcceptedCommandList>(), //
+        make_unique<ReadSwitchAttributeList>(), //
+        make_unique<SubscribeAttributeSwitchAttributeList>(), //
+        make_unique<ReadSwitchFeatureMap>(), //
+        make_unique<SubscribeAttributeSwitchFeatureMap>(), //
+        make_unique<ReadSwitchClusterRevision>(), //
+        make_unique<SubscribeAttributeSwitchClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterOnOffSwitchConfiguration(Commands & commands)
+void registerClusterAdministratorCommissioning(Commands & commands)
 {
-    using namespace chip::app::Clusters::OnOffSwitchConfiguration;
+    using namespace chip::app::Clusters::AdministratorCommissioning;
 
-    const char * clusterName = "OnOffSwitchConfiguration";
+    const char * clusterName = "AdministratorCommissioning";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
+        make_unique<AdministratorCommissioningOpenCommissioningWindow>(), //
+        make_unique<AdministratorCommissioningOpenBasicCommissioningWindow>(), //
+        make_unique<AdministratorCommissioningRevokeCommissioning>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadOnOffSwitchConfigurationSwitchType>(), //
+        make_unique<ReadAdministratorCommissioningWindowStatus>(), //
         make_unique<WriteAttribute>(Id), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeOnOffSwitchConfigurationSwitchType>(), //
-        make_unique<ReadOnOffSwitchConfigurationSwitchActions>(), //
-        make_unique<WriteOnOffSwitchConfigurationSwitchActions>(), //
-        make_unique<SubscribeAttributeOnOffSwitchConfigurationSwitchActions>(), //
-        make_unique<ReadOnOffSwitchConfigurationGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeOnOffSwitchConfigurationGeneratedCommandList>(), //
-        make_unique<ReadOnOffSwitchConfigurationAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeOnOffSwitchConfigurationAcceptedCommandList>(), //
-        make_unique<ReadOnOffSwitchConfigurationAttributeList>(), //
-        make_unique<SubscribeAttributeOnOffSwitchConfigurationAttributeList>(), //
-        make_unique<ReadOnOffSwitchConfigurationFeatureMap>(), //
-        make_unique<SubscribeAttributeOnOffSwitchConfigurationFeatureMap>(), //
-        make_unique<ReadOnOffSwitchConfigurationClusterRevision>(), //
-        make_unique<SubscribeAttributeOnOffSwitchConfigurationClusterRevision>(), //
+        make_unique<SubscribeAttributeAdministratorCommissioningWindowStatus>(), //
+        make_unique<ReadAdministratorCommissioningAdminFabricIndex>(), //
+        make_unique<SubscribeAttributeAdministratorCommissioningAdminFabricIndex>(), //
+        make_unique<ReadAdministratorCommissioningAdminVendorId>(), //
+        make_unique<SubscribeAttributeAdministratorCommissioningAdminVendorId>(), //
+        make_unique<ReadAdministratorCommissioningGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeAdministratorCommissioningGeneratedCommandList>(), //
+        make_unique<ReadAdministratorCommissioningAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeAdministratorCommissioningAcceptedCommandList>(), //
+        make_unique<ReadAdministratorCommissioningAttributeList>(), //
+        make_unique<SubscribeAttributeAdministratorCommissioningAttributeList>(), //
+        make_unique<ReadAdministratorCommissioningFeatureMap>(), //
+        make_unique<SubscribeAttributeAdministratorCommissioningFeatureMap>(), //
+        make_unique<ReadAdministratorCommissioningClusterRevision>(), //
+        make_unique<SubscribeAttributeAdministratorCommissioningClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
@@ -93385,159 +92593,425 @@ void registerClusterOperationalCredentials(Commands & commands)
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterPowerSource(Commands & commands)
+void registerClusterGroupKeyManagement(Commands & commands)
 {
-    using namespace chip::app::Clusters::PowerSource;
+    using namespace chip::app::Clusters::GroupKeyManagement;
 
-    const char * clusterName = "PowerSource";
+    const char * clusterName = "GroupKeyManagement";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
+        make_unique<GroupKeyManagementKeySetWrite>(), //
+        make_unique<GroupKeyManagementKeySetRead>(), //
+        make_unique<GroupKeyManagementKeySetRemove>(), //
+        make_unique<GroupKeyManagementKeySetReadAllIndices>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadPowerSourceStatus>(), //
+        make_unique<ReadGroupKeyManagementGroupKeyMap>(), //
         make_unique<WriteAttribute>(Id), //
+        make_unique<WriteGroupKeyManagementGroupKeyMap>(), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributePowerSourceStatus>(), //
-        make_unique<ReadPowerSourceOrder>(), //
-        make_unique<SubscribeAttributePowerSourceOrder>(), //
-        make_unique<ReadPowerSourceDescription>(), //
-        make_unique<SubscribeAttributePowerSourceDescription>(), //
-        make_unique<ReadPowerSourceWiredAssessedInputVoltage>(), //
-        make_unique<SubscribeAttributePowerSourceWiredAssessedInputVoltage>(), //
-        make_unique<ReadPowerSourceWiredAssessedInputFrequency>(), //
-        make_unique<SubscribeAttributePowerSourceWiredAssessedInputFrequency>(), //
-        make_unique<ReadPowerSourceWiredCurrentType>(), //
-        make_unique<SubscribeAttributePowerSourceWiredCurrentType>(), //
-        make_unique<ReadPowerSourceWiredAssessedCurrent>(), //
-        make_unique<SubscribeAttributePowerSourceWiredAssessedCurrent>(), //
-        make_unique<ReadPowerSourceWiredNominalVoltage>(), //
-        make_unique<SubscribeAttributePowerSourceWiredNominalVoltage>(), //
-        make_unique<ReadPowerSourceWiredMaximumCurrent>(), //
-        make_unique<SubscribeAttributePowerSourceWiredMaximumCurrent>(), //
-        make_unique<ReadPowerSourceWiredPresent>(), //
-        make_unique<SubscribeAttributePowerSourceWiredPresent>(), //
-        make_unique<ReadPowerSourceActiveWiredFaults>(), //
-        make_unique<SubscribeAttributePowerSourceActiveWiredFaults>(), //
-        make_unique<ReadPowerSourceBatteryVoltage>(), //
-        make_unique<SubscribeAttributePowerSourceBatteryVoltage>(), //
-        make_unique<ReadPowerSourceBatteryPercentRemaining>(), //
-        make_unique<SubscribeAttributePowerSourceBatteryPercentRemaining>(), //
-        make_unique<ReadPowerSourceBatteryTimeRemaining>(), //
-        make_unique<SubscribeAttributePowerSourceBatteryTimeRemaining>(), //
-        make_unique<ReadPowerSourceBatteryChargeLevel>(), //
-        make_unique<SubscribeAttributePowerSourceBatteryChargeLevel>(), //
-        make_unique<ReadPowerSourceBatteryReplacementNeeded>(), //
-        make_unique<SubscribeAttributePowerSourceBatteryReplacementNeeded>(), //
-        make_unique<ReadPowerSourceBatteryReplaceability>(), //
-        make_unique<SubscribeAttributePowerSourceBatteryReplaceability>(), //
-        make_unique<ReadPowerSourceBatteryPresent>(), //
-        make_unique<SubscribeAttributePowerSourceBatteryPresent>(), //
-        make_unique<ReadPowerSourceActiveBatteryFaults>(), //
-        make_unique<SubscribeAttributePowerSourceActiveBatteryFaults>(), //
-        make_unique<ReadPowerSourceBatteryReplacementDescription>(), //
-        make_unique<SubscribeAttributePowerSourceBatteryReplacementDescription>(), //
-        make_unique<ReadPowerSourceBatteryCommonDesignation>(), //
-        make_unique<SubscribeAttributePowerSourceBatteryCommonDesignation>(), //
-        make_unique<ReadPowerSourceBatteryANSIDesignation>(), //
-        make_unique<SubscribeAttributePowerSourceBatteryANSIDesignation>(), //
-        make_unique<ReadPowerSourceBatteryIECDesignation>(), //
-        make_unique<SubscribeAttributePowerSourceBatteryIECDesignation>(), //
-        make_unique<ReadPowerSourceBatteryApprovedChemistry>(), //
-        make_unique<SubscribeAttributePowerSourceBatteryApprovedChemistry>(), //
-        make_unique<ReadPowerSourceBatteryCapacity>(), //
-        make_unique<SubscribeAttributePowerSourceBatteryCapacity>(), //
-        make_unique<ReadPowerSourceBatteryQuantity>(), //
-        make_unique<SubscribeAttributePowerSourceBatteryQuantity>(), //
-        make_unique<ReadPowerSourceBatteryChargeState>(), //
-        make_unique<SubscribeAttributePowerSourceBatteryChargeState>(), //
-        make_unique<ReadPowerSourceBatteryTimeToFullCharge>(), //
-        make_unique<SubscribeAttributePowerSourceBatteryTimeToFullCharge>(), //
-        make_unique<ReadPowerSourceBatteryFunctionalWhileCharging>(), //
-        make_unique<SubscribeAttributePowerSourceBatteryFunctionalWhileCharging>(), //
-        make_unique<ReadPowerSourceBatteryChargingCurrent>(), //
-        make_unique<SubscribeAttributePowerSourceBatteryChargingCurrent>(), //
-        make_unique<ReadPowerSourceActiveBatteryChargeFaults>(), //
-        make_unique<SubscribeAttributePowerSourceActiveBatteryChargeFaults>(), //
-        make_unique<ReadPowerSourceGeneratedCommandList>(), //
-        make_unique<SubscribeAttributePowerSourceGeneratedCommandList>(), //
-        make_unique<ReadPowerSourceAcceptedCommandList>(), //
-        make_unique<SubscribeAttributePowerSourceAcceptedCommandList>(), //
-        make_unique<ReadPowerSourceAttributeList>(), //
-        make_unique<SubscribeAttributePowerSourceAttributeList>(), //
-        make_unique<ReadPowerSourceFeatureMap>(), //
-        make_unique<SubscribeAttributePowerSourceFeatureMap>(), //
-        make_unique<ReadPowerSourceClusterRevision>(), //
-        make_unique<SubscribeAttributePowerSourceClusterRevision>(), //
+        make_unique<SubscribeAttributeGroupKeyManagementGroupKeyMap>(), //
+        make_unique<ReadGroupKeyManagementGroupTable>(), //
+        make_unique<SubscribeAttributeGroupKeyManagementGroupTable>(), //
+        make_unique<ReadGroupKeyManagementMaxGroupsPerFabric>(), //
+        make_unique<SubscribeAttributeGroupKeyManagementMaxGroupsPerFabric>(), //
+        make_unique<ReadGroupKeyManagementMaxGroupKeysPerFabric>(), //
+        make_unique<SubscribeAttributeGroupKeyManagementMaxGroupKeysPerFabric>(), //
+        make_unique<ReadGroupKeyManagementGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeGroupKeyManagementGeneratedCommandList>(), //
+        make_unique<ReadGroupKeyManagementAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeGroupKeyManagementAcceptedCommandList>(), //
+        make_unique<ReadGroupKeyManagementAttributeList>(), //
+        make_unique<SubscribeAttributeGroupKeyManagementAttributeList>(), //
+        make_unique<ReadGroupKeyManagementFeatureMap>(), //
+        make_unique<SubscribeAttributeGroupKeyManagementFeatureMap>(), //
+        make_unique<ReadGroupKeyManagementClusterRevision>(), //
+        make_unique<SubscribeAttributeGroupKeyManagementClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterFixedLabel(Commands & commands)
+{
+    using namespace chip::app::Clusters::FixedLabel;
+
+    const char * clusterName = "FixedLabel";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadFixedLabelLabelList>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeFixedLabelLabelList>(), //
+        make_unique<ReadFixedLabelGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeFixedLabelGeneratedCommandList>(), //
+        make_unique<ReadFixedLabelAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeFixedLabelAcceptedCommandList>(), //
+        make_unique<ReadFixedLabelAttributeList>(), //
+        make_unique<SubscribeAttributeFixedLabelAttributeList>(), //
+        make_unique<ReadFixedLabelFeatureMap>(), //
+        make_unique<SubscribeAttributeFixedLabelFeatureMap>(), //
+        make_unique<ReadFixedLabelClusterRevision>(), //
+        make_unique<SubscribeAttributeFixedLabelClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterUserLabel(Commands & commands)
+{
+    using namespace chip::app::Clusters::UserLabel;
+
+    const char * clusterName = "UserLabel";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadUserLabelLabelList>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<WriteUserLabelLabelList>(), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeUserLabelLabelList>(), //
+        make_unique<ReadUserLabelGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeUserLabelGeneratedCommandList>(), //
+        make_unique<ReadUserLabelAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeUserLabelAcceptedCommandList>(), //
+        make_unique<ReadUserLabelAttributeList>(), //
+        make_unique<SubscribeAttributeUserLabelAttributeList>(), //
+        make_unique<ReadUserLabelFeatureMap>(), //
+        make_unique<SubscribeAttributeUserLabelFeatureMap>(), //
+        make_unique<ReadUserLabelClusterRevision>(), //
+        make_unique<SubscribeAttributeUserLabelClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterBooleanState(Commands & commands)
+{
+    using namespace chip::app::Clusters::BooleanState;
+
+    const char * clusterName = "BooleanState";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadBooleanStateStateValue>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeBooleanStateStateValue>(), //
+        make_unique<ReadBooleanStateGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeBooleanStateGeneratedCommandList>(), //
+        make_unique<ReadBooleanStateAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeBooleanStateAcceptedCommandList>(), //
+        make_unique<ReadBooleanStateAttributeList>(), //
+        make_unique<SubscribeAttributeBooleanStateAttributeList>(), //
+        make_unique<ReadBooleanStateFeatureMap>(), //
+        make_unique<SubscribeAttributeBooleanStateFeatureMap>(), //
+        make_unique<ReadBooleanStateClusterRevision>(), //
+        make_unique<SubscribeAttributeBooleanStateClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterModeSelect(Commands & commands)
+{
+    using namespace chip::app::Clusters::ModeSelect;
+
+    const char * clusterName = "ModeSelect";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<ModeSelectChangeToMode>(), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadModeSelectDescription>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeModeSelectDescription>(), //
+        make_unique<ReadModeSelectStandardNamespace>(), //
+        make_unique<SubscribeAttributeModeSelectStandardNamespace>(), //
+        make_unique<ReadModeSelectSupportedModes>(), //
+        make_unique<SubscribeAttributeModeSelectSupportedModes>(), //
+        make_unique<ReadModeSelectCurrentMode>(), //
+        make_unique<SubscribeAttributeModeSelectCurrentMode>(), //
+        make_unique<ReadModeSelectStartUpMode>(), //
+        make_unique<WriteModeSelectStartUpMode>(), //
+        make_unique<SubscribeAttributeModeSelectStartUpMode>(), //
+        make_unique<ReadModeSelectOnMode>(), //
+        make_unique<WriteModeSelectOnMode>(), //
+        make_unique<SubscribeAttributeModeSelectOnMode>(), //
+        make_unique<ReadModeSelectGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeModeSelectGeneratedCommandList>(), //
+        make_unique<ReadModeSelectAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeModeSelectAcceptedCommandList>(), //
+        make_unique<ReadModeSelectAttributeList>(), //
+        make_unique<SubscribeAttributeModeSelectAttributeList>(), //
+        make_unique<ReadModeSelectFeatureMap>(), //
+        make_unique<SubscribeAttributeModeSelectFeatureMap>(), //
+        make_unique<ReadModeSelectClusterRevision>(), //
+        make_unique<SubscribeAttributeModeSelectClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterDoorLock(Commands & commands)
+{
+    using namespace chip::app::Clusters::DoorLock;
+
+    const char * clusterName = "DoorLock";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<DoorLockLockDoor>(), //
+        make_unique<DoorLockUnlockDoor>(), //
+        make_unique<DoorLockUnlockWithTimeout>(), //
+        make_unique<DoorLockSetWeekDaySchedule>(), //
+        make_unique<DoorLockGetWeekDaySchedule>(), //
+        make_unique<DoorLockClearWeekDaySchedule>(), //
+        make_unique<DoorLockSetYearDaySchedule>(), //
+        make_unique<DoorLockGetYearDaySchedule>(), //
+        make_unique<DoorLockClearYearDaySchedule>(), //
+        make_unique<DoorLockSetHolidaySchedule>(), //
+        make_unique<DoorLockGetHolidaySchedule>(), //
+        make_unique<DoorLockClearHolidaySchedule>(), //
+        make_unique<DoorLockSetUser>(), //
+        make_unique<DoorLockGetUser>(), //
+        make_unique<DoorLockClearUser>(), //
+        make_unique<DoorLockSetCredential>(), //
+        make_unique<DoorLockGetCredentialStatus>(), //
+        make_unique<DoorLockClearCredential>(), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadDoorLockLockState>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeDoorLockLockState>(), //
+        make_unique<ReadDoorLockLockType>(), //
+        make_unique<SubscribeAttributeDoorLockLockType>(), //
+        make_unique<ReadDoorLockActuatorEnabled>(), //
+        make_unique<SubscribeAttributeDoorLockActuatorEnabled>(), //
+        make_unique<ReadDoorLockDoorState>(), //
+        make_unique<SubscribeAttributeDoorLockDoorState>(), //
+        make_unique<ReadDoorLockDoorOpenEvents>(), //
+        make_unique<WriteDoorLockDoorOpenEvents>(), //
+        make_unique<SubscribeAttributeDoorLockDoorOpenEvents>(), //
+        make_unique<ReadDoorLockDoorClosedEvents>(), //
+        make_unique<WriteDoorLockDoorClosedEvents>(), //
+        make_unique<SubscribeAttributeDoorLockDoorClosedEvents>(), //
+        make_unique<ReadDoorLockOpenPeriod>(), //
+        make_unique<WriteDoorLockOpenPeriod>(), //
+        make_unique<SubscribeAttributeDoorLockOpenPeriod>(), //
+        make_unique<ReadDoorLockNumberOfTotalUsersSupported>(), //
+        make_unique<SubscribeAttributeDoorLockNumberOfTotalUsersSupported>(), //
+        make_unique<ReadDoorLockNumberOfPINUsersSupported>(), //
+        make_unique<SubscribeAttributeDoorLockNumberOfPINUsersSupported>(), //
+        make_unique<ReadDoorLockNumberOfRFIDUsersSupported>(), //
+        make_unique<SubscribeAttributeDoorLockNumberOfRFIDUsersSupported>(), //
+        make_unique<ReadDoorLockNumberOfWeekDaySchedulesSupportedPerUser>(), //
+        make_unique<SubscribeAttributeDoorLockNumberOfWeekDaySchedulesSupportedPerUser>(), //
+        make_unique<ReadDoorLockNumberOfYearDaySchedulesSupportedPerUser>(), //
+        make_unique<SubscribeAttributeDoorLockNumberOfYearDaySchedulesSupportedPerUser>(), //
+        make_unique<ReadDoorLockNumberOfHolidaySchedulesSupported>(), //
+        make_unique<SubscribeAttributeDoorLockNumberOfHolidaySchedulesSupported>(), //
+        make_unique<ReadDoorLockMaxPINCodeLength>(), //
+        make_unique<SubscribeAttributeDoorLockMaxPINCodeLength>(), //
+        make_unique<ReadDoorLockMinPINCodeLength>(), //
+        make_unique<SubscribeAttributeDoorLockMinPINCodeLength>(), //
+        make_unique<ReadDoorLockMaxRFIDCodeLength>(), //
+        make_unique<SubscribeAttributeDoorLockMaxRFIDCodeLength>(), //
+        make_unique<ReadDoorLockMinRFIDCodeLength>(), //
+        make_unique<SubscribeAttributeDoorLockMinRFIDCodeLength>(), //
+        make_unique<ReadDoorLockCredentialRulesSupport>(), //
+        make_unique<SubscribeAttributeDoorLockCredentialRulesSupport>(), //
+        make_unique<ReadDoorLockNumberOfCredentialsSupportedPerUser>(), //
+        make_unique<SubscribeAttributeDoorLockNumberOfCredentialsSupportedPerUser>(), //
+        make_unique<ReadDoorLockLanguage>(), //
+        make_unique<WriteDoorLockLanguage>(), //
+        make_unique<SubscribeAttributeDoorLockLanguage>(), //
+        make_unique<ReadDoorLockLEDSettings>(), //
+        make_unique<WriteDoorLockLEDSettings>(), //
+        make_unique<SubscribeAttributeDoorLockLEDSettings>(), //
+        make_unique<ReadDoorLockAutoRelockTime>(), //
+        make_unique<WriteDoorLockAutoRelockTime>(), //
+        make_unique<SubscribeAttributeDoorLockAutoRelockTime>(), //
+        make_unique<ReadDoorLockSoundVolume>(), //
+        make_unique<WriteDoorLockSoundVolume>(), //
+        make_unique<SubscribeAttributeDoorLockSoundVolume>(), //
+        make_unique<ReadDoorLockOperatingMode>(), //
+        make_unique<WriteDoorLockOperatingMode>(), //
+        make_unique<SubscribeAttributeDoorLockOperatingMode>(), //
+        make_unique<ReadDoorLockSupportedOperatingModes>(), //
+        make_unique<SubscribeAttributeDoorLockSupportedOperatingModes>(), //
+        make_unique<ReadDoorLockDefaultConfigurationRegister>(), //
+        make_unique<SubscribeAttributeDoorLockDefaultConfigurationRegister>(), //
+        make_unique<ReadDoorLockEnableLocalProgramming>(), //
+        make_unique<WriteDoorLockEnableLocalProgramming>(), //
+        make_unique<SubscribeAttributeDoorLockEnableLocalProgramming>(), //
+        make_unique<ReadDoorLockEnableOneTouchLocking>(), //
+        make_unique<WriteDoorLockEnableOneTouchLocking>(), //
+        make_unique<SubscribeAttributeDoorLockEnableOneTouchLocking>(), //
+        make_unique<ReadDoorLockEnableInsideStatusLED>(), //
+        make_unique<WriteDoorLockEnableInsideStatusLED>(), //
+        make_unique<SubscribeAttributeDoorLockEnableInsideStatusLED>(), //
+        make_unique<ReadDoorLockEnablePrivacyModeButton>(), //
+        make_unique<WriteDoorLockEnablePrivacyModeButton>(), //
+        make_unique<SubscribeAttributeDoorLockEnablePrivacyModeButton>(), //
+        make_unique<ReadDoorLockLocalProgrammingFeatures>(), //
+        make_unique<WriteDoorLockLocalProgrammingFeatures>(), //
+        make_unique<SubscribeAttributeDoorLockLocalProgrammingFeatures>(), //
+        make_unique<ReadDoorLockWrongCodeEntryLimit>(), //
+        make_unique<WriteDoorLockWrongCodeEntryLimit>(), //
+        make_unique<SubscribeAttributeDoorLockWrongCodeEntryLimit>(), //
+        make_unique<ReadDoorLockUserCodeTemporaryDisableTime>(), //
+        make_unique<WriteDoorLockUserCodeTemporaryDisableTime>(), //
+        make_unique<SubscribeAttributeDoorLockUserCodeTemporaryDisableTime>(), //
+        make_unique<ReadDoorLockSendPINOverTheAir>(), //
+        make_unique<WriteDoorLockSendPINOverTheAir>(), //
+        make_unique<SubscribeAttributeDoorLockSendPINOverTheAir>(), //
+        make_unique<ReadDoorLockRequirePINforRemoteOperation>(), //
+        make_unique<WriteDoorLockRequirePINforRemoteOperation>(), //
+        make_unique<SubscribeAttributeDoorLockRequirePINforRemoteOperation>(), //
+        make_unique<ReadDoorLockExpiringUserTimeout>(), //
+        make_unique<WriteDoorLockExpiringUserTimeout>(), //
+        make_unique<SubscribeAttributeDoorLockExpiringUserTimeout>(), //
+        make_unique<ReadDoorLockGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeDoorLockGeneratedCommandList>(), //
+        make_unique<ReadDoorLockAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeDoorLockAcceptedCommandList>(), //
+        make_unique<ReadDoorLockAttributeList>(), //
+        make_unique<SubscribeAttributeDoorLockAttributeList>(), //
+        make_unique<ReadDoorLockFeatureMap>(), //
+        make_unique<SubscribeAttributeDoorLockFeatureMap>(), //
+        make_unique<ReadDoorLockClusterRevision>(), //
+        make_unique<SubscribeAttributeDoorLockClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterPowerSourceConfiguration(Commands & commands)
+void registerClusterWindowCovering(Commands & commands)
 {
-    using namespace chip::app::Clusters::PowerSourceConfiguration;
+    using namespace chip::app::Clusters::WindowCovering;
 
-    const char * clusterName = "PowerSourceConfiguration";
+    const char * clusterName = "WindowCovering";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
+        make_unique<WindowCoveringUpOrOpen>(), //
+        make_unique<WindowCoveringDownOrClose>(), //
+        make_unique<WindowCoveringStopMotion>(), //
+        make_unique<WindowCoveringGoToLiftValue>(), //
+        make_unique<WindowCoveringGoToLiftPercentage>(), //
+        make_unique<WindowCoveringGoToTiltValue>(), //
+        make_unique<WindowCoveringGoToTiltPercentage>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadPowerSourceConfigurationSources>(), //
+        make_unique<ReadWindowCoveringType>(), //
         make_unique<WriteAttribute>(Id), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributePowerSourceConfigurationSources>(), //
-        make_unique<ReadPowerSourceConfigurationGeneratedCommandList>(), //
-        make_unique<SubscribeAttributePowerSourceConfigurationGeneratedCommandList>(), //
-        make_unique<ReadPowerSourceConfigurationAcceptedCommandList>(), //
-        make_unique<SubscribeAttributePowerSourceConfigurationAcceptedCommandList>(), //
-        make_unique<ReadPowerSourceConfigurationAttributeList>(), //
-        make_unique<SubscribeAttributePowerSourceConfigurationAttributeList>(), //
-        make_unique<ReadPowerSourceConfigurationFeatureMap>(), //
-        make_unique<SubscribeAttributePowerSourceConfigurationFeatureMap>(), //
-        make_unique<ReadPowerSourceConfigurationClusterRevision>(), //
-        make_unique<SubscribeAttributePowerSourceConfigurationClusterRevision>(), //
+        make_unique<SubscribeAttributeWindowCoveringType>(), //
+        make_unique<ReadWindowCoveringPhysicalClosedLimitLift>(), //
+        make_unique<SubscribeAttributeWindowCoveringPhysicalClosedLimitLift>(), //
+        make_unique<ReadWindowCoveringPhysicalClosedLimitTilt>(), //
+        make_unique<SubscribeAttributeWindowCoveringPhysicalClosedLimitTilt>(), //
+        make_unique<ReadWindowCoveringCurrentPositionLift>(), //
+        make_unique<SubscribeAttributeWindowCoveringCurrentPositionLift>(), //
+        make_unique<ReadWindowCoveringCurrentPositionTilt>(), //
+        make_unique<SubscribeAttributeWindowCoveringCurrentPositionTilt>(), //
+        make_unique<ReadWindowCoveringNumberOfActuationsLift>(), //
+        make_unique<SubscribeAttributeWindowCoveringNumberOfActuationsLift>(), //
+        make_unique<ReadWindowCoveringNumberOfActuationsTilt>(), //
+        make_unique<SubscribeAttributeWindowCoveringNumberOfActuationsTilt>(), //
+        make_unique<ReadWindowCoveringConfigStatus>(), //
+        make_unique<SubscribeAttributeWindowCoveringConfigStatus>(), //
+        make_unique<ReadWindowCoveringCurrentPositionLiftPercentage>(), //
+        make_unique<SubscribeAttributeWindowCoveringCurrentPositionLiftPercentage>(), //
+        make_unique<ReadWindowCoveringCurrentPositionTiltPercentage>(), //
+        make_unique<SubscribeAttributeWindowCoveringCurrentPositionTiltPercentage>(), //
+        make_unique<ReadWindowCoveringOperationalStatus>(), //
+        make_unique<SubscribeAttributeWindowCoveringOperationalStatus>(), //
+        make_unique<ReadWindowCoveringTargetPositionLiftPercent100ths>(), //
+        make_unique<SubscribeAttributeWindowCoveringTargetPositionLiftPercent100ths>(), //
+        make_unique<ReadWindowCoveringTargetPositionTiltPercent100ths>(), //
+        make_unique<SubscribeAttributeWindowCoveringTargetPositionTiltPercent100ths>(), //
+        make_unique<ReadWindowCoveringEndProductType>(), //
+        make_unique<SubscribeAttributeWindowCoveringEndProductType>(), //
+        make_unique<ReadWindowCoveringCurrentPositionLiftPercent100ths>(), //
+        make_unique<SubscribeAttributeWindowCoveringCurrentPositionLiftPercent100ths>(), //
+        make_unique<ReadWindowCoveringCurrentPositionTiltPercent100ths>(), //
+        make_unique<SubscribeAttributeWindowCoveringCurrentPositionTiltPercent100ths>(), //
+        make_unique<ReadWindowCoveringInstalledOpenLimitLift>(), //
+        make_unique<SubscribeAttributeWindowCoveringInstalledOpenLimitLift>(), //
+        make_unique<ReadWindowCoveringInstalledClosedLimitLift>(), //
+        make_unique<SubscribeAttributeWindowCoveringInstalledClosedLimitLift>(), //
+        make_unique<ReadWindowCoveringInstalledOpenLimitTilt>(), //
+        make_unique<SubscribeAttributeWindowCoveringInstalledOpenLimitTilt>(), //
+        make_unique<ReadWindowCoveringInstalledClosedLimitTilt>(), //
+        make_unique<SubscribeAttributeWindowCoveringInstalledClosedLimitTilt>(), //
+        make_unique<ReadWindowCoveringMode>(), //
+        make_unique<WriteWindowCoveringMode>(), //
+        make_unique<SubscribeAttributeWindowCoveringMode>(), //
+        make_unique<ReadWindowCoveringSafetyStatus>(), //
+        make_unique<SubscribeAttributeWindowCoveringSafetyStatus>(), //
+        make_unique<ReadWindowCoveringGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeWindowCoveringGeneratedCommandList>(), //
+        make_unique<ReadWindowCoveringAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeWindowCoveringAcceptedCommandList>(), //
+        make_unique<ReadWindowCoveringAttributeList>(), //
+        make_unique<SubscribeAttributeWindowCoveringAttributeList>(), //
+        make_unique<ReadWindowCoveringFeatureMap>(), //
+        make_unique<SubscribeAttributeWindowCoveringFeatureMap>(), //
+        make_unique<ReadWindowCoveringClusterRevision>(), //
+        make_unique<SubscribeAttributeWindowCoveringClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterPressureMeasurement(Commands & commands)
+void registerClusterBarrierControl(Commands & commands)
 {
-    using namespace chip::app::Clusters::PressureMeasurement;
+    using namespace chip::app::Clusters::BarrierControl;
 
-    const char * clusterName = "PressureMeasurement";
+    const char * clusterName = "BarrierControl";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
+        make_unique<BarrierControlBarrierControlGoToPercent>(), //
+        make_unique<BarrierControlBarrierControlStop>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadPressureMeasurementMeasuredValue>(), //
+        make_unique<ReadBarrierControlBarrierMovingState>(), //
         make_unique<WriteAttribute>(Id), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributePressureMeasurementMeasuredValue>(), //
-        make_unique<ReadPressureMeasurementMinMeasuredValue>(), //
-        make_unique<SubscribeAttributePressureMeasurementMinMeasuredValue>(), //
-        make_unique<ReadPressureMeasurementMaxMeasuredValue>(), //
-        make_unique<SubscribeAttributePressureMeasurementMaxMeasuredValue>(), //
-        make_unique<ReadPressureMeasurementTolerance>(), //
-        make_unique<SubscribeAttributePressureMeasurementTolerance>(), //
-        make_unique<ReadPressureMeasurementScaledValue>(), //
-        make_unique<SubscribeAttributePressureMeasurementScaledValue>(), //
-        make_unique<ReadPressureMeasurementMinScaledValue>(), //
-        make_unique<SubscribeAttributePressureMeasurementMinScaledValue>(), //
-        make_unique<ReadPressureMeasurementMaxScaledValue>(), //
-        make_unique<SubscribeAttributePressureMeasurementMaxScaledValue>(), //
-        make_unique<ReadPressureMeasurementScaledTolerance>(), //
-        make_unique<SubscribeAttributePressureMeasurementScaledTolerance>(), //
-        make_unique<ReadPressureMeasurementScale>(), //
-        make_unique<SubscribeAttributePressureMeasurementScale>(), //
-        make_unique<ReadPressureMeasurementGeneratedCommandList>(), //
-        make_unique<SubscribeAttributePressureMeasurementGeneratedCommandList>(), //
-        make_unique<ReadPressureMeasurementAcceptedCommandList>(), //
-        make_unique<SubscribeAttributePressureMeasurementAcceptedCommandList>(), //
-        make_unique<ReadPressureMeasurementAttributeList>(), //
-        make_unique<SubscribeAttributePressureMeasurementAttributeList>(), //
-        make_unique<ReadPressureMeasurementFeatureMap>(), //
-        make_unique<SubscribeAttributePressureMeasurementFeatureMap>(), //
-        make_unique<ReadPressureMeasurementClusterRevision>(), //
-        make_unique<SubscribeAttributePressureMeasurementClusterRevision>(), //
+        make_unique<SubscribeAttributeBarrierControlBarrierMovingState>(), //
+        make_unique<ReadBarrierControlBarrierSafetyStatus>(), //
+        make_unique<SubscribeAttributeBarrierControlBarrierSafetyStatus>(), //
+        make_unique<ReadBarrierControlBarrierCapabilities>(), //
+        make_unique<SubscribeAttributeBarrierControlBarrierCapabilities>(), //
+        make_unique<ReadBarrierControlBarrierOpenEvents>(), //
+        make_unique<WriteBarrierControlBarrierOpenEvents>(), //
+        make_unique<SubscribeAttributeBarrierControlBarrierOpenEvents>(), //
+        make_unique<ReadBarrierControlBarrierCloseEvents>(), //
+        make_unique<WriteBarrierControlBarrierCloseEvents>(), //
+        make_unique<SubscribeAttributeBarrierControlBarrierCloseEvents>(), //
+        make_unique<ReadBarrierControlBarrierCommandOpenEvents>(), //
+        make_unique<WriteBarrierControlBarrierCommandOpenEvents>(), //
+        make_unique<SubscribeAttributeBarrierControlBarrierCommandOpenEvents>(), //
+        make_unique<ReadBarrierControlBarrierCommandCloseEvents>(), //
+        make_unique<WriteBarrierControlBarrierCommandCloseEvents>(), //
+        make_unique<SubscribeAttributeBarrierControlBarrierCommandCloseEvents>(), //
+        make_unique<ReadBarrierControlBarrierOpenPeriod>(), //
+        make_unique<WriteBarrierControlBarrierOpenPeriod>(), //
+        make_unique<SubscribeAttributeBarrierControlBarrierOpenPeriod>(), //
+        make_unique<ReadBarrierControlBarrierClosePeriod>(), //
+        make_unique<WriteBarrierControlBarrierClosePeriod>(), //
+        make_unique<SubscribeAttributeBarrierControlBarrierClosePeriod>(), //
+        make_unique<ReadBarrierControlBarrierPosition>(), //
+        make_unique<SubscribeAttributeBarrierControlBarrierPosition>(), //
+        make_unique<ReadBarrierControlGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeBarrierControlGeneratedCommandList>(), //
+        make_unique<ReadBarrierControlAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeBarrierControlAcceptedCommandList>(), //
+        make_unique<ReadBarrierControlAttributeList>(), //
+        make_unique<SubscribeAttributeBarrierControlAttributeList>(), //
+        make_unique<ReadBarrierControlFeatureMap>(), //
+        make_unique<SubscribeAttributeBarrierControlFeatureMap>(), //
+        make_unique<ReadBarrierControlClusterRevision>(), //
+        make_unique<SubscribeAttributeBarrierControlClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
@@ -93617,177 +93091,439 @@ void registerClusterPumpConfigurationAndControl(Commands & commands)
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterRelativeHumidityMeasurement(Commands & commands)
+void registerClusterThermostat(Commands & commands)
 {
-    using namespace chip::app::Clusters::RelativeHumidityMeasurement;
+    using namespace chip::app::Clusters::Thermostat;
 
-    const char * clusterName = "RelativeHumidityMeasurement";
+    const char * clusterName = "Thermostat";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
+        make_unique<ThermostatSetpointRaiseLower>(), //
+        make_unique<ThermostatSetWeeklySchedule>(), //
+        make_unique<ThermostatGetWeeklySchedule>(), //
+        make_unique<ThermostatClearWeeklySchedule>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadRelativeHumidityMeasurementMeasuredValue>(), //
+        make_unique<ReadThermostatLocalTemperature>(), //
         make_unique<WriteAttribute>(Id), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeRelativeHumidityMeasurementMeasuredValue>(), //
-        make_unique<ReadRelativeHumidityMeasurementMinMeasuredValue>(), //
-        make_unique<SubscribeAttributeRelativeHumidityMeasurementMinMeasuredValue>(), //
-        make_unique<ReadRelativeHumidityMeasurementMaxMeasuredValue>(), //
-        make_unique<SubscribeAttributeRelativeHumidityMeasurementMaxMeasuredValue>(), //
-        make_unique<ReadRelativeHumidityMeasurementTolerance>(), //
-        make_unique<SubscribeAttributeRelativeHumidityMeasurementTolerance>(), //
-        make_unique<ReadRelativeHumidityMeasurementGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeRelativeHumidityMeasurementGeneratedCommandList>(), //
-        make_unique<ReadRelativeHumidityMeasurementAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeRelativeHumidityMeasurementAcceptedCommandList>(), //
-        make_unique<ReadRelativeHumidityMeasurementAttributeList>(), //
-        make_unique<SubscribeAttributeRelativeHumidityMeasurementAttributeList>(), //
-        make_unique<ReadRelativeHumidityMeasurementFeatureMap>(), //
-        make_unique<SubscribeAttributeRelativeHumidityMeasurementFeatureMap>(), //
-        make_unique<ReadRelativeHumidityMeasurementClusterRevision>(), //
-        make_unique<SubscribeAttributeRelativeHumidityMeasurementClusterRevision>(), //
+        make_unique<SubscribeAttributeThermostatLocalTemperature>(), //
+        make_unique<ReadThermostatOutdoorTemperature>(), //
+        make_unique<SubscribeAttributeThermostatOutdoorTemperature>(), //
+        make_unique<ReadThermostatOccupancy>(), //
+        make_unique<SubscribeAttributeThermostatOccupancy>(), //
+        make_unique<ReadThermostatAbsMinHeatSetpointLimit>(), //
+        make_unique<SubscribeAttributeThermostatAbsMinHeatSetpointLimit>(), //
+        make_unique<ReadThermostatAbsMaxHeatSetpointLimit>(), //
+        make_unique<SubscribeAttributeThermostatAbsMaxHeatSetpointLimit>(), //
+        make_unique<ReadThermostatAbsMinCoolSetpointLimit>(), //
+        make_unique<SubscribeAttributeThermostatAbsMinCoolSetpointLimit>(), //
+        make_unique<ReadThermostatAbsMaxCoolSetpointLimit>(), //
+        make_unique<SubscribeAttributeThermostatAbsMaxCoolSetpointLimit>(), //
+        make_unique<ReadThermostatPICoolingDemand>(), //
+        make_unique<SubscribeAttributeThermostatPICoolingDemand>(), //
+        make_unique<ReadThermostatPIHeatingDemand>(), //
+        make_unique<SubscribeAttributeThermostatPIHeatingDemand>(), //
+        make_unique<ReadThermostatHVACSystemTypeConfiguration>(), //
+        make_unique<WriteThermostatHVACSystemTypeConfiguration>(), //
+        make_unique<SubscribeAttributeThermostatHVACSystemTypeConfiguration>(), //
+        make_unique<ReadThermostatLocalTemperatureCalibration>(), //
+        make_unique<WriteThermostatLocalTemperatureCalibration>(), //
+        make_unique<SubscribeAttributeThermostatLocalTemperatureCalibration>(), //
+        make_unique<ReadThermostatOccupiedCoolingSetpoint>(), //
+        make_unique<WriteThermostatOccupiedCoolingSetpoint>(), //
+        make_unique<SubscribeAttributeThermostatOccupiedCoolingSetpoint>(), //
+        make_unique<ReadThermostatOccupiedHeatingSetpoint>(), //
+        make_unique<WriteThermostatOccupiedHeatingSetpoint>(), //
+        make_unique<SubscribeAttributeThermostatOccupiedHeatingSetpoint>(), //
+        make_unique<ReadThermostatUnoccupiedCoolingSetpoint>(), //
+        make_unique<WriteThermostatUnoccupiedCoolingSetpoint>(), //
+        make_unique<SubscribeAttributeThermostatUnoccupiedCoolingSetpoint>(), //
+        make_unique<ReadThermostatUnoccupiedHeatingSetpoint>(), //
+        make_unique<WriteThermostatUnoccupiedHeatingSetpoint>(), //
+        make_unique<SubscribeAttributeThermostatUnoccupiedHeatingSetpoint>(), //
+        make_unique<ReadThermostatMinHeatSetpointLimit>(), //
+        make_unique<WriteThermostatMinHeatSetpointLimit>(), //
+        make_unique<SubscribeAttributeThermostatMinHeatSetpointLimit>(), //
+        make_unique<ReadThermostatMaxHeatSetpointLimit>(), //
+        make_unique<WriteThermostatMaxHeatSetpointLimit>(), //
+        make_unique<SubscribeAttributeThermostatMaxHeatSetpointLimit>(), //
+        make_unique<ReadThermostatMinCoolSetpointLimit>(), //
+        make_unique<WriteThermostatMinCoolSetpointLimit>(), //
+        make_unique<SubscribeAttributeThermostatMinCoolSetpointLimit>(), //
+        make_unique<ReadThermostatMaxCoolSetpointLimit>(), //
+        make_unique<WriteThermostatMaxCoolSetpointLimit>(), //
+        make_unique<SubscribeAttributeThermostatMaxCoolSetpointLimit>(), //
+        make_unique<ReadThermostatMinSetpointDeadBand>(), //
+        make_unique<WriteThermostatMinSetpointDeadBand>(), //
+        make_unique<SubscribeAttributeThermostatMinSetpointDeadBand>(), //
+        make_unique<ReadThermostatRemoteSensing>(), //
+        make_unique<WriteThermostatRemoteSensing>(), //
+        make_unique<SubscribeAttributeThermostatRemoteSensing>(), //
+        make_unique<ReadThermostatControlSequenceOfOperation>(), //
+        make_unique<WriteThermostatControlSequenceOfOperation>(), //
+        make_unique<SubscribeAttributeThermostatControlSequenceOfOperation>(), //
+        make_unique<ReadThermostatSystemMode>(), //
+        make_unique<WriteThermostatSystemMode>(), //
+        make_unique<SubscribeAttributeThermostatSystemMode>(), //
+        make_unique<ReadThermostatThermostatRunningMode>(), //
+        make_unique<SubscribeAttributeThermostatThermostatRunningMode>(), //
+        make_unique<ReadThermostatStartOfWeek>(), //
+        make_unique<SubscribeAttributeThermostatStartOfWeek>(), //
+        make_unique<ReadThermostatNumberOfWeeklyTransitions>(), //
+        make_unique<SubscribeAttributeThermostatNumberOfWeeklyTransitions>(), //
+        make_unique<ReadThermostatNumberOfDailyTransitions>(), //
+        make_unique<SubscribeAttributeThermostatNumberOfDailyTransitions>(), //
+        make_unique<ReadThermostatTemperatureSetpointHold>(), //
+        make_unique<WriteThermostatTemperatureSetpointHold>(), //
+        make_unique<SubscribeAttributeThermostatTemperatureSetpointHold>(), //
+        make_unique<ReadThermostatTemperatureSetpointHoldDuration>(), //
+        make_unique<WriteThermostatTemperatureSetpointHoldDuration>(), //
+        make_unique<SubscribeAttributeThermostatTemperatureSetpointHoldDuration>(), //
+        make_unique<ReadThermostatThermostatProgrammingOperationMode>(), //
+        make_unique<WriteThermostatThermostatProgrammingOperationMode>(), //
+        make_unique<SubscribeAttributeThermostatThermostatProgrammingOperationMode>(), //
+        make_unique<ReadThermostatThermostatRunningState>(), //
+        make_unique<SubscribeAttributeThermostatThermostatRunningState>(), //
+        make_unique<ReadThermostatSetpointChangeSource>(), //
+        make_unique<SubscribeAttributeThermostatSetpointChangeSource>(), //
+        make_unique<ReadThermostatSetpointChangeAmount>(), //
+        make_unique<SubscribeAttributeThermostatSetpointChangeAmount>(), //
+        make_unique<ReadThermostatSetpointChangeSourceTimestamp>(), //
+        make_unique<SubscribeAttributeThermostatSetpointChangeSourceTimestamp>(), //
+        make_unique<ReadThermostatOccupiedSetback>(), //
+        make_unique<WriteThermostatOccupiedSetback>(), //
+        make_unique<SubscribeAttributeThermostatOccupiedSetback>(), //
+        make_unique<ReadThermostatOccupiedSetbackMin>(), //
+        make_unique<SubscribeAttributeThermostatOccupiedSetbackMin>(), //
+        make_unique<ReadThermostatOccupiedSetbackMax>(), //
+        make_unique<SubscribeAttributeThermostatOccupiedSetbackMax>(), //
+        make_unique<ReadThermostatUnoccupiedSetback>(), //
+        make_unique<WriteThermostatUnoccupiedSetback>(), //
+        make_unique<SubscribeAttributeThermostatUnoccupiedSetback>(), //
+        make_unique<ReadThermostatUnoccupiedSetbackMin>(), //
+        make_unique<SubscribeAttributeThermostatUnoccupiedSetbackMin>(), //
+        make_unique<ReadThermostatUnoccupiedSetbackMax>(), //
+        make_unique<SubscribeAttributeThermostatUnoccupiedSetbackMax>(), //
+        make_unique<ReadThermostatEmergencyHeatDelta>(), //
+        make_unique<WriteThermostatEmergencyHeatDelta>(), //
+        make_unique<SubscribeAttributeThermostatEmergencyHeatDelta>(), //
+        make_unique<ReadThermostatACType>(), //
+        make_unique<WriteThermostatACType>(), //
+        make_unique<SubscribeAttributeThermostatACType>(), //
+        make_unique<ReadThermostatACCapacity>(), //
+        make_unique<WriteThermostatACCapacity>(), //
+        make_unique<SubscribeAttributeThermostatACCapacity>(), //
+        make_unique<ReadThermostatACRefrigerantType>(), //
+        make_unique<WriteThermostatACRefrigerantType>(), //
+        make_unique<SubscribeAttributeThermostatACRefrigerantType>(), //
+        make_unique<ReadThermostatACCompressorType>(), //
+        make_unique<WriteThermostatACCompressorType>(), //
+        make_unique<SubscribeAttributeThermostatACCompressorType>(), //
+        make_unique<ReadThermostatACErrorCode>(), //
+        make_unique<WriteThermostatACErrorCode>(), //
+        make_unique<SubscribeAttributeThermostatACErrorCode>(), //
+        make_unique<ReadThermostatACLouverPosition>(), //
+        make_unique<WriteThermostatACLouverPosition>(), //
+        make_unique<SubscribeAttributeThermostatACLouverPosition>(), //
+        make_unique<ReadThermostatACCoilTemperature>(), //
+        make_unique<SubscribeAttributeThermostatACCoilTemperature>(), //
+        make_unique<ReadThermostatACCapacityformat>(), //
+        make_unique<WriteThermostatACCapacityformat>(), //
+        make_unique<SubscribeAttributeThermostatACCapacityformat>(), //
+        make_unique<ReadThermostatGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeThermostatGeneratedCommandList>(), //
+        make_unique<ReadThermostatAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeThermostatAcceptedCommandList>(), //
+        make_unique<ReadThermostatAttributeList>(), //
+        make_unique<SubscribeAttributeThermostatAttributeList>(), //
+        make_unique<ReadThermostatFeatureMap>(), //
+        make_unique<SubscribeAttributeThermostatFeatureMap>(), //
+        make_unique<ReadThermostatClusterRevision>(), //
+        make_unique<SubscribeAttributeThermostatClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterScenes(Commands & commands)
+void registerClusterFanControl(Commands & commands)
 {
-    using namespace chip::app::Clusters::Scenes;
+    using namespace chip::app::Clusters::FanControl;
 
-    const char * clusterName = "Scenes";
+    const char * clusterName = "FanControl";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
-        make_unique<ScenesAddScene>(), //
-        make_unique<ScenesViewScene>(), //
-        make_unique<ScenesRemoveScene>(), //
-        make_unique<ScenesRemoveAllScenes>(), //
-        make_unique<ScenesStoreScene>(), //
-        make_unique<ScenesRecallScene>(), //
-        make_unique<ScenesGetSceneMembership>(), //
-        make_unique<ScenesEnhancedAddScene>(), //
-        make_unique<ScenesEnhancedViewScene>(), //
-        make_unique<ScenesCopyScene>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadScenesSceneCount>(), //
+        make_unique<ReadFanControlFanMode>(), //
         make_unique<WriteAttribute>(Id), //
+        make_unique<WriteFanControlFanMode>(), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeScenesSceneCount>(), //
-        make_unique<ReadScenesCurrentScene>(), //
-        make_unique<SubscribeAttributeScenesCurrentScene>(), //
-        make_unique<ReadScenesCurrentGroup>(), //
-        make_unique<SubscribeAttributeScenesCurrentGroup>(), //
-        make_unique<ReadScenesSceneValid>(), //
-        make_unique<SubscribeAttributeScenesSceneValid>(), //
-        make_unique<ReadScenesNameSupport>(), //
-        make_unique<SubscribeAttributeScenesNameSupport>(), //
-        make_unique<ReadScenesLastConfiguredBy>(), //
-        make_unique<SubscribeAttributeScenesLastConfiguredBy>(), //
-        make_unique<ReadScenesGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeScenesGeneratedCommandList>(), //
-        make_unique<ReadScenesAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeScenesAcceptedCommandList>(), //
-        make_unique<ReadScenesAttributeList>(), //
-        make_unique<SubscribeAttributeScenesAttributeList>(), //
-        make_unique<ReadScenesFeatureMap>(), //
-        make_unique<SubscribeAttributeScenesFeatureMap>(), //
-        make_unique<ReadScenesClusterRevision>(), //
-        make_unique<SubscribeAttributeScenesClusterRevision>(), //
+        make_unique<SubscribeAttributeFanControlFanMode>(), //
+        make_unique<ReadFanControlFanModeSequence>(), //
+        make_unique<WriteFanControlFanModeSequence>(), //
+        make_unique<SubscribeAttributeFanControlFanModeSequence>(), //
+        make_unique<ReadFanControlPercentSetting>(), //
+        make_unique<WriteFanControlPercentSetting>(), //
+        make_unique<SubscribeAttributeFanControlPercentSetting>(), //
+        make_unique<ReadFanControlPercentCurrent>(), //
+        make_unique<SubscribeAttributeFanControlPercentCurrent>(), //
+        make_unique<ReadFanControlSpeedMax>(), //
+        make_unique<SubscribeAttributeFanControlSpeedMax>(), //
+        make_unique<ReadFanControlSpeedSetting>(), //
+        make_unique<WriteFanControlSpeedSetting>(), //
+        make_unique<SubscribeAttributeFanControlSpeedSetting>(), //
+        make_unique<ReadFanControlSpeedCurrent>(), //
+        make_unique<SubscribeAttributeFanControlSpeedCurrent>(), //
+        make_unique<ReadFanControlRockSupport>(), //
+        make_unique<SubscribeAttributeFanControlRockSupport>(), //
+        make_unique<ReadFanControlRockSetting>(), //
+        make_unique<WriteFanControlRockSetting>(), //
+        make_unique<SubscribeAttributeFanControlRockSetting>(), //
+        make_unique<ReadFanControlWindSupport>(), //
+        make_unique<SubscribeAttributeFanControlWindSupport>(), //
+        make_unique<ReadFanControlWindSetting>(), //
+        make_unique<WriteFanControlWindSetting>(), //
+        make_unique<SubscribeAttributeFanControlWindSetting>(), //
+        make_unique<ReadFanControlGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeFanControlGeneratedCommandList>(), //
+        make_unique<ReadFanControlAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeFanControlAcceptedCommandList>(), //
+        make_unique<ReadFanControlAttributeList>(), //
+        make_unique<SubscribeAttributeFanControlAttributeList>(), //
+        make_unique<ReadFanControlFeatureMap>(), //
+        make_unique<SubscribeAttributeFanControlFeatureMap>(), //
+        make_unique<ReadFanControlClusterRevision>(), //
+        make_unique<SubscribeAttributeFanControlClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterSoftwareDiagnostics(Commands & commands)
+void registerClusterThermostatUserInterfaceConfiguration(Commands & commands)
 {
-    using namespace chip::app::Clusters::SoftwareDiagnostics;
+    using namespace chip::app::Clusters::ThermostatUserInterfaceConfiguration;
 
-    const char * clusterName = "SoftwareDiagnostics";
+    const char * clusterName = "ThermostatUserInterfaceConfiguration";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
-        make_unique<SoftwareDiagnosticsResetWatermarks>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadSoftwareDiagnosticsThreadMetrics>(), //
+        make_unique<ReadThermostatUserInterfaceConfigurationTemperatureDisplayMode>(), //
         make_unique<WriteAttribute>(Id), //
+        make_unique<WriteThermostatUserInterfaceConfigurationTemperatureDisplayMode>(), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeSoftwareDiagnosticsThreadMetrics>(), //
-        make_unique<ReadSoftwareDiagnosticsCurrentHeapFree>(), //
-        make_unique<SubscribeAttributeSoftwareDiagnosticsCurrentHeapFree>(), //
-        make_unique<ReadSoftwareDiagnosticsCurrentHeapUsed>(), //
-        make_unique<SubscribeAttributeSoftwareDiagnosticsCurrentHeapUsed>(), //
-        make_unique<ReadSoftwareDiagnosticsCurrentHeapHighWatermark>(), //
-        make_unique<SubscribeAttributeSoftwareDiagnosticsCurrentHeapHighWatermark>(), //
-        make_unique<ReadSoftwareDiagnosticsGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeSoftwareDiagnosticsGeneratedCommandList>(), //
-        make_unique<ReadSoftwareDiagnosticsAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeSoftwareDiagnosticsAcceptedCommandList>(), //
-        make_unique<ReadSoftwareDiagnosticsAttributeList>(), //
-        make_unique<SubscribeAttributeSoftwareDiagnosticsAttributeList>(), //
-        make_unique<ReadSoftwareDiagnosticsFeatureMap>(), //
-        make_unique<SubscribeAttributeSoftwareDiagnosticsFeatureMap>(), //
-        make_unique<ReadSoftwareDiagnosticsClusterRevision>(), //
-        make_unique<SubscribeAttributeSoftwareDiagnosticsClusterRevision>(), //
+        make_unique<SubscribeAttributeThermostatUserInterfaceConfigurationTemperatureDisplayMode>(), //
+        make_unique<ReadThermostatUserInterfaceConfigurationKeypadLockout>(), //
+        make_unique<WriteThermostatUserInterfaceConfigurationKeypadLockout>(), //
+        make_unique<SubscribeAttributeThermostatUserInterfaceConfigurationKeypadLockout>(), //
+        make_unique<ReadThermostatUserInterfaceConfigurationScheduleProgrammingVisibility>(), //
+        make_unique<WriteThermostatUserInterfaceConfigurationScheduleProgrammingVisibility>(), //
+        make_unique<SubscribeAttributeThermostatUserInterfaceConfigurationScheduleProgrammingVisibility>(), //
+        make_unique<ReadThermostatUserInterfaceConfigurationGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeThermostatUserInterfaceConfigurationGeneratedCommandList>(), //
+        make_unique<ReadThermostatUserInterfaceConfigurationAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeThermostatUserInterfaceConfigurationAcceptedCommandList>(), //
+        make_unique<ReadThermostatUserInterfaceConfigurationAttributeList>(), //
+        make_unique<SubscribeAttributeThermostatUserInterfaceConfigurationAttributeList>(), //
+        make_unique<ReadThermostatUserInterfaceConfigurationFeatureMap>(), //
+        make_unique<SubscribeAttributeThermostatUserInterfaceConfigurationFeatureMap>(), //
+        make_unique<ReadThermostatUserInterfaceConfigurationClusterRevision>(), //
+        make_unique<SubscribeAttributeThermostatUserInterfaceConfigurationClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterSwitch(Commands & commands)
+void registerClusterColorControl(Commands & commands)
 {
-    using namespace chip::app::Clusters::Switch;
+    using namespace chip::app::Clusters::ColorControl;
 
-    const char * clusterName = "Switch";
+    const char * clusterName = "ColorControl";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
+        make_unique<ColorControlMoveToHue>(), //
+        make_unique<ColorControlMoveHue>(), //
+        make_unique<ColorControlStepHue>(), //
+        make_unique<ColorControlMoveToSaturation>(), //
+        make_unique<ColorControlMoveSaturation>(), //
+        make_unique<ColorControlStepSaturation>(), //
+        make_unique<ColorControlMoveToHueAndSaturation>(), //
+        make_unique<ColorControlMoveToColor>(), //
+        make_unique<ColorControlMoveColor>(), //
+        make_unique<ColorControlStepColor>(), //
+        make_unique<ColorControlMoveToColorTemperature>(), //
+        make_unique<ColorControlEnhancedMoveToHue>(), //
+        make_unique<ColorControlEnhancedMoveHue>(), //
+        make_unique<ColorControlEnhancedStepHue>(), //
+        make_unique<ColorControlEnhancedMoveToHueAndSaturation>(), //
+        make_unique<ColorControlColorLoopSet>(), //
+        make_unique<ColorControlStopMoveStep>(), //
+        make_unique<ColorControlMoveColorTemperature>(), //
+        make_unique<ColorControlStepColorTemperature>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadSwitchNumberOfPositions>(), //
+        make_unique<ReadColorControlCurrentHue>(), //
         make_unique<WriteAttribute>(Id), //
-        make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeSwitchNumberOfPositions>(), //
-        make_unique<ReadSwitchCurrentPosition>(), //
-        make_unique<SubscribeAttributeSwitchCurrentPosition>(), //
-        make_unique<ReadSwitchMultiPressMax>(), //
-        make_unique<SubscribeAttributeSwitchMultiPressMax>(), //
-        make_unique<ReadSwitchGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeSwitchGeneratedCommandList>(), //
-        make_unique<ReadSwitchAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeSwitchAcceptedCommandList>(), //
-        make_unique<ReadSwitchAttributeList>(), //
-        make_unique<SubscribeAttributeSwitchAttributeList>(), //
-        make_unique<ReadSwitchFeatureMap>(), //
-        make_unique<SubscribeAttributeSwitchFeatureMap>(), //
-        make_unique<ReadSwitchClusterRevision>(), //
-        make_unique<SubscribeAttributeSwitchClusterRevision>(), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeColorControlCurrentHue>(), //
+        make_unique<ReadColorControlCurrentSaturation>(), //
+        make_unique<SubscribeAttributeColorControlCurrentSaturation>(), //
+        make_unique<ReadColorControlRemainingTime>(), //
+        make_unique<SubscribeAttributeColorControlRemainingTime>(), //
+        make_unique<ReadColorControlCurrentX>(), //
+        make_unique<SubscribeAttributeColorControlCurrentX>(), //
+        make_unique<ReadColorControlCurrentY>(), //
+        make_unique<SubscribeAttributeColorControlCurrentY>(), //
+        make_unique<ReadColorControlDriftCompensation>(), //
+        make_unique<SubscribeAttributeColorControlDriftCompensation>(), //
+        make_unique<ReadColorControlCompensationText>(), //
+        make_unique<SubscribeAttributeColorControlCompensationText>(), //
+        make_unique<ReadColorControlColorTemperature>(), //
+        make_unique<SubscribeAttributeColorControlColorTemperature>(), //
+        make_unique<ReadColorControlColorMode>(), //
+        make_unique<SubscribeAttributeColorControlColorMode>(), //
+        make_unique<ReadColorControlOptions>(), //
+        make_unique<WriteColorControlOptions>(), //
+        make_unique<SubscribeAttributeColorControlOptions>(), //
+        make_unique<ReadColorControlNumberOfPrimaries>(), //
+        make_unique<SubscribeAttributeColorControlNumberOfPrimaries>(), //
+        make_unique<ReadColorControlPrimary1X>(), //
+        make_unique<SubscribeAttributeColorControlPrimary1X>(), //
+        make_unique<ReadColorControlPrimary1Y>(), //
+        make_unique<SubscribeAttributeColorControlPrimary1Y>(), //
+        make_unique<ReadColorControlPrimary1Intensity>(), //
+        make_unique<SubscribeAttributeColorControlPrimary1Intensity>(), //
+        make_unique<ReadColorControlPrimary2X>(), //
+        make_unique<SubscribeAttributeColorControlPrimary2X>(), //
+        make_unique<ReadColorControlPrimary2Y>(), //
+        make_unique<SubscribeAttributeColorControlPrimary2Y>(), //
+        make_unique<ReadColorControlPrimary2Intensity>(), //
+        make_unique<SubscribeAttributeColorControlPrimary2Intensity>(), //
+        make_unique<ReadColorControlPrimary3X>(), //
+        make_unique<SubscribeAttributeColorControlPrimary3X>(), //
+        make_unique<ReadColorControlPrimary3Y>(), //
+        make_unique<SubscribeAttributeColorControlPrimary3Y>(), //
+        make_unique<ReadColorControlPrimary3Intensity>(), //
+        make_unique<SubscribeAttributeColorControlPrimary3Intensity>(), //
+        make_unique<ReadColorControlPrimary4X>(), //
+        make_unique<SubscribeAttributeColorControlPrimary4X>(), //
+        make_unique<ReadColorControlPrimary4Y>(), //
+        make_unique<SubscribeAttributeColorControlPrimary4Y>(), //
+        make_unique<ReadColorControlPrimary4Intensity>(), //
+        make_unique<SubscribeAttributeColorControlPrimary4Intensity>(), //
+        make_unique<ReadColorControlPrimary5X>(), //
+        make_unique<SubscribeAttributeColorControlPrimary5X>(), //
+        make_unique<ReadColorControlPrimary5Y>(), //
+        make_unique<SubscribeAttributeColorControlPrimary5Y>(), //
+        make_unique<ReadColorControlPrimary5Intensity>(), //
+        make_unique<SubscribeAttributeColorControlPrimary5Intensity>(), //
+        make_unique<ReadColorControlPrimary6X>(), //
+        make_unique<SubscribeAttributeColorControlPrimary6X>(), //
+        make_unique<ReadColorControlPrimary6Y>(), //
+        make_unique<SubscribeAttributeColorControlPrimary6Y>(), //
+        make_unique<ReadColorControlPrimary6Intensity>(), //
+        make_unique<SubscribeAttributeColorControlPrimary6Intensity>(), //
+        make_unique<ReadColorControlWhitePointX>(), //
+        make_unique<WriteColorControlWhitePointX>(), //
+        make_unique<SubscribeAttributeColorControlWhitePointX>(), //
+        make_unique<ReadColorControlWhitePointY>(), //
+        make_unique<WriteColorControlWhitePointY>(), //
+        make_unique<SubscribeAttributeColorControlWhitePointY>(), //
+        make_unique<ReadColorControlColorPointRX>(), //
+        make_unique<WriteColorControlColorPointRX>(), //
+        make_unique<SubscribeAttributeColorControlColorPointRX>(), //
+        make_unique<ReadColorControlColorPointRY>(), //
+        make_unique<WriteColorControlColorPointRY>(), //
+        make_unique<SubscribeAttributeColorControlColorPointRY>(), //
+        make_unique<ReadColorControlColorPointRIntensity>(), //
+        make_unique<WriteColorControlColorPointRIntensity>(), //
+        make_unique<SubscribeAttributeColorControlColorPointRIntensity>(), //
+        make_unique<ReadColorControlColorPointGX>(), //
+        make_unique<WriteColorControlColorPointGX>(), //
+        make_unique<SubscribeAttributeColorControlColorPointGX>(), //
+        make_unique<ReadColorControlColorPointGY>(), //
+        make_unique<WriteColorControlColorPointGY>(), //
+        make_unique<SubscribeAttributeColorControlColorPointGY>(), //
+        make_unique<ReadColorControlColorPointGIntensity>(), //
+        make_unique<WriteColorControlColorPointGIntensity>(), //
+        make_unique<SubscribeAttributeColorControlColorPointGIntensity>(), //
+        make_unique<ReadColorControlColorPointBX>(), //
+        make_unique<WriteColorControlColorPointBX>(), //
+        make_unique<SubscribeAttributeColorControlColorPointBX>(), //
+        make_unique<ReadColorControlColorPointBY>(), //
+        make_unique<WriteColorControlColorPointBY>(), //
+        make_unique<SubscribeAttributeColorControlColorPointBY>(), //
+        make_unique<ReadColorControlColorPointBIntensity>(), //
+        make_unique<WriteColorControlColorPointBIntensity>(), //
+        make_unique<SubscribeAttributeColorControlColorPointBIntensity>(), //
+        make_unique<ReadColorControlEnhancedCurrentHue>(), //
+        make_unique<SubscribeAttributeColorControlEnhancedCurrentHue>(), //
+        make_unique<ReadColorControlEnhancedColorMode>(), //
+        make_unique<SubscribeAttributeColorControlEnhancedColorMode>(), //
+        make_unique<ReadColorControlColorLoopActive>(), //
+        make_unique<SubscribeAttributeColorControlColorLoopActive>(), //
+        make_unique<ReadColorControlColorLoopDirection>(), //
+        make_unique<SubscribeAttributeColorControlColorLoopDirection>(), //
+        make_unique<ReadColorControlColorLoopTime>(), //
+        make_unique<SubscribeAttributeColorControlColorLoopTime>(), //
+        make_unique<ReadColorControlColorLoopStartEnhancedHue>(), //
+        make_unique<SubscribeAttributeColorControlColorLoopStartEnhancedHue>(), //
+        make_unique<ReadColorControlColorLoopStoredEnhancedHue>(), //
+        make_unique<SubscribeAttributeColorControlColorLoopStoredEnhancedHue>(), //
+        make_unique<ReadColorControlColorCapabilities>(), //
+        make_unique<SubscribeAttributeColorControlColorCapabilities>(), //
+        make_unique<ReadColorControlColorTempPhysicalMinMireds>(), //
+        make_unique<SubscribeAttributeColorControlColorTempPhysicalMinMireds>(), //
+        make_unique<ReadColorControlColorTempPhysicalMaxMireds>(), //
+        make_unique<SubscribeAttributeColorControlColorTempPhysicalMaxMireds>(), //
+        make_unique<ReadColorControlCoupleColorTempToLevelMinMireds>(), //
+        make_unique<SubscribeAttributeColorControlCoupleColorTempToLevelMinMireds>(), //
+        make_unique<ReadColorControlStartUpColorTemperatureMireds>(), //
+        make_unique<WriteColorControlStartUpColorTemperatureMireds>(), //
+        make_unique<SubscribeAttributeColorControlStartUpColorTemperatureMireds>(), //
+        make_unique<ReadColorControlGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeColorControlGeneratedCommandList>(), //
+        make_unique<ReadColorControlAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeColorControlAcceptedCommandList>(), //
+        make_unique<ReadColorControlAttributeList>(), //
+        make_unique<SubscribeAttributeColorControlAttributeList>(), //
+        make_unique<ReadColorControlFeatureMap>(), //
+        make_unique<SubscribeAttributeColorControlFeatureMap>(), //
+        make_unique<ReadColorControlClusterRevision>(), //
+        make_unique<SubscribeAttributeColorControlClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterTargetNavigator(Commands & commands)
+void registerClusterIlluminanceMeasurement(Commands & commands)
 {
-    using namespace chip::app::Clusters::TargetNavigator;
+    using namespace chip::app::Clusters::IlluminanceMeasurement;
 
-    const char * clusterName = "TargetNavigator";
+    const char * clusterName = "IlluminanceMeasurement";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
-        make_unique<TargetNavigatorNavigateTarget>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadTargetNavigatorTargetList>(), //
+        make_unique<ReadIlluminanceMeasurementMeasuredValue>(), //
         make_unique<WriteAttribute>(Id), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeTargetNavigatorTargetList>(), //
-        make_unique<ReadTargetNavigatorCurrentTarget>(), //
-        make_unique<SubscribeAttributeTargetNavigatorCurrentTarget>(), //
-        make_unique<ReadTargetNavigatorGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeTargetNavigatorGeneratedCommandList>(), //
-        make_unique<ReadTargetNavigatorAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeTargetNavigatorAcceptedCommandList>(), //
-        make_unique<ReadTargetNavigatorAttributeList>(), //
-        make_unique<SubscribeAttributeTargetNavigatorAttributeList>(), //
-        make_unique<ReadTargetNavigatorFeatureMap>(), //
-        make_unique<SubscribeAttributeTargetNavigatorFeatureMap>(), //
-        make_unique<ReadTargetNavigatorClusterRevision>(), //
-        make_unique<SubscribeAttributeTargetNavigatorClusterRevision>(), //
+        make_unique<SubscribeAttributeIlluminanceMeasurementMeasuredValue>(), //
+        make_unique<ReadIlluminanceMeasurementMinMeasuredValue>(), //
+        make_unique<SubscribeAttributeIlluminanceMeasurementMinMeasuredValue>(), //
+        make_unique<ReadIlluminanceMeasurementMaxMeasuredValue>(), //
+        make_unique<SubscribeAttributeIlluminanceMeasurementMaxMeasuredValue>(), //
+        make_unique<ReadIlluminanceMeasurementTolerance>(), //
+        make_unique<SubscribeAttributeIlluminanceMeasurementTolerance>(), //
+        make_unique<ReadIlluminanceMeasurementLightSensorType>(), //
+        make_unique<SubscribeAttributeIlluminanceMeasurementLightSensorType>(), //
+        make_unique<ReadIlluminanceMeasurementGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeIlluminanceMeasurementGeneratedCommandList>(), //
+        make_unique<ReadIlluminanceMeasurementAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeIlluminanceMeasurementAcceptedCommandList>(), //
+        make_unique<ReadIlluminanceMeasurementAttributeList>(), //
+        make_unique<SubscribeAttributeIlluminanceMeasurementAttributeList>(), //
+        make_unique<ReadIlluminanceMeasurementFeatureMap>(), //
+        make_unique<SubscribeAttributeIlluminanceMeasurementFeatureMap>(), //
+        make_unique<ReadIlluminanceMeasurementClusterRevision>(), //
+        make_unique<SubscribeAttributeIlluminanceMeasurementClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
@@ -93825,877 +93561,1141 @@ void registerClusterTemperatureMeasurement(Commands & commands)
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterTestCluster(Commands & commands)
+void registerClusterPressureMeasurement(Commands & commands)
 {
-    using namespace chip::app::Clusters::TestCluster;
+    using namespace chip::app::Clusters::PressureMeasurement;
 
-    const char * clusterName = "TestCluster";
+    const char * clusterName = "PressureMeasurement";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
-        make_unique<TestClusterTest>(), //
-        make_unique<TestClusterTestNotHandled>(), //
-        make_unique<TestClusterTestSpecific>(), //
-        make_unique<TestClusterTestUnknownCommand>(), //
-        make_unique<TestClusterTestAddArguments>(), //
-        make_unique<TestClusterTestSimpleArgumentRequest>(), //
-        make_unique<TestClusterTestStructArrayArgumentRequest>(), //
-        make_unique<TestClusterTestStructArgumentRequest>(), //
-        make_unique<TestClusterTestNestedStructArgumentRequest>(), //
-        make_unique<TestClusterTestListStructArgumentRequest>(), //
-        make_unique<TestClusterTestListInt8UArgumentRequest>(), //
-        make_unique<TestClusterTestNestedStructListArgumentRequest>(), //
-        make_unique<TestClusterTestListNestedStructListArgumentRequest>(), //
-        make_unique<TestClusterTestListInt8UReverseRequest>(), //
-        make_unique<TestClusterTestEnumsRequest>(), //
-        make_unique<TestClusterTestNullableOptionalRequest>(), //
-        make_unique<TestClusterTestComplexNullableOptionalRequest>(), //
-        make_unique<TestClusterSimpleStructEchoRequest>(), //
-        make_unique<TestClusterTimedInvokeRequest>(), //
-        make_unique<TestClusterTestSimpleOptionalArgumentRequest>(), //
-        make_unique<TestClusterTestEmitTestEventRequest>(), //
-        make_unique<TestClusterTestEmitTestFabricScopedEventRequest>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadTestClusterBoolean>(), //
+        make_unique<ReadPressureMeasurementMeasuredValue>(), //
         make_unique<WriteAttribute>(Id), //
-        make_unique<WriteTestClusterBoolean>(), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeTestClusterBoolean>(), //
-        make_unique<ReadTestClusterBitmap8>(), //
-        make_unique<WriteTestClusterBitmap8>(), //
-        make_unique<SubscribeAttributeTestClusterBitmap8>(), //
-        make_unique<ReadTestClusterBitmap16>(), //
-        make_unique<WriteTestClusterBitmap16>(), //
-        make_unique<SubscribeAttributeTestClusterBitmap16>(), //
-        make_unique<ReadTestClusterBitmap32>(), //
-        make_unique<WriteTestClusterBitmap32>(), //
-        make_unique<SubscribeAttributeTestClusterBitmap32>(), //
-        make_unique<ReadTestClusterBitmap64>(), //
-        make_unique<WriteTestClusterBitmap64>(), //
-        make_unique<SubscribeAttributeTestClusterBitmap64>(), //
-        make_unique<ReadTestClusterInt8u>(), //
-        make_unique<WriteTestClusterInt8u>(), //
-        make_unique<SubscribeAttributeTestClusterInt8u>(), //
-        make_unique<ReadTestClusterInt16u>(), //
-        make_unique<WriteTestClusterInt16u>(), //
-        make_unique<SubscribeAttributeTestClusterInt16u>(), //
-        make_unique<ReadTestClusterInt24u>(), //
-        make_unique<WriteTestClusterInt24u>(), //
-        make_unique<SubscribeAttributeTestClusterInt24u>(), //
-        make_unique<ReadTestClusterInt32u>(), //
-        make_unique<WriteTestClusterInt32u>(), //
-        make_unique<SubscribeAttributeTestClusterInt32u>(), //
-        make_unique<ReadTestClusterInt40u>(), //
-        make_unique<WriteTestClusterInt40u>(), //
-        make_unique<SubscribeAttributeTestClusterInt40u>(), //
-        make_unique<ReadTestClusterInt48u>(), //
-        make_unique<WriteTestClusterInt48u>(), //
-        make_unique<SubscribeAttributeTestClusterInt48u>(), //
-        make_unique<ReadTestClusterInt56u>(), //
-        make_unique<WriteTestClusterInt56u>(), //
-        make_unique<SubscribeAttributeTestClusterInt56u>(), //
-        make_unique<ReadTestClusterInt64u>(), //
-        make_unique<WriteTestClusterInt64u>(), //
-        make_unique<SubscribeAttributeTestClusterInt64u>(), //
-        make_unique<ReadTestClusterInt8s>(), //
-        make_unique<WriteTestClusterInt8s>(), //
-        make_unique<SubscribeAttributeTestClusterInt8s>(), //
-        make_unique<ReadTestClusterInt16s>(), //
-        make_unique<WriteTestClusterInt16s>(), //
-        make_unique<SubscribeAttributeTestClusterInt16s>(), //
-        make_unique<ReadTestClusterInt24s>(), //
-        make_unique<WriteTestClusterInt24s>(), //
-        make_unique<SubscribeAttributeTestClusterInt24s>(), //
-        make_unique<ReadTestClusterInt32s>(), //
-        make_unique<WriteTestClusterInt32s>(), //
-        make_unique<SubscribeAttributeTestClusterInt32s>(), //
-        make_unique<ReadTestClusterInt40s>(), //
-        make_unique<WriteTestClusterInt40s>(), //
-        make_unique<SubscribeAttributeTestClusterInt40s>(), //
-        make_unique<ReadTestClusterInt48s>(), //
-        make_unique<WriteTestClusterInt48s>(), //
-        make_unique<SubscribeAttributeTestClusterInt48s>(), //
-        make_unique<ReadTestClusterInt56s>(), //
-        make_unique<WriteTestClusterInt56s>(), //
-        make_unique<SubscribeAttributeTestClusterInt56s>(), //
-        make_unique<ReadTestClusterInt64s>(), //
-        make_unique<WriteTestClusterInt64s>(), //
-        make_unique<SubscribeAttributeTestClusterInt64s>(), //
-        make_unique<ReadTestClusterEnum8>(), //
-        make_unique<WriteTestClusterEnum8>(), //
-        make_unique<SubscribeAttributeTestClusterEnum8>(), //
-        make_unique<ReadTestClusterEnum16>(), //
-        make_unique<WriteTestClusterEnum16>(), //
-        make_unique<SubscribeAttributeTestClusterEnum16>(), //
-        make_unique<ReadTestClusterFloatSingle>(), //
-        make_unique<WriteTestClusterFloatSingle>(), //
-        make_unique<SubscribeAttributeTestClusterFloatSingle>(), //
-        make_unique<ReadTestClusterFloatDouble>(), //
-        make_unique<WriteTestClusterFloatDouble>(), //
-        make_unique<SubscribeAttributeTestClusterFloatDouble>(), //
-        make_unique<ReadTestClusterOctetString>(), //
-        make_unique<WriteTestClusterOctetString>(), //
-        make_unique<SubscribeAttributeTestClusterOctetString>(), //
-        make_unique<ReadTestClusterListInt8u>(), //
-        make_unique<WriteTestClusterListInt8u>(), //
-        make_unique<SubscribeAttributeTestClusterListInt8u>(), //
-        make_unique<ReadTestClusterListOctetString>(), //
-        make_unique<WriteTestClusterListOctetString>(), //
-        make_unique<SubscribeAttributeTestClusterListOctetString>(), //
-        make_unique<ReadTestClusterListStructOctetString>(), //
-        make_unique<WriteTestClusterListStructOctetString>(), //
-        make_unique<SubscribeAttributeTestClusterListStructOctetString>(), //
-        make_unique<ReadTestClusterLongOctetString>(), //
-        make_unique<WriteTestClusterLongOctetString>(), //
-        make_unique<SubscribeAttributeTestClusterLongOctetString>(), //
-        make_unique<ReadTestClusterCharString>(), //
-        make_unique<WriteTestClusterCharString>(), //
-        make_unique<SubscribeAttributeTestClusterCharString>(), //
-        make_unique<ReadTestClusterLongCharString>(), //
-        make_unique<WriteTestClusterLongCharString>(), //
-        make_unique<SubscribeAttributeTestClusterLongCharString>(), //
-        make_unique<ReadTestClusterEpochUs>(), //
-        make_unique<WriteTestClusterEpochUs>(), //
-        make_unique<SubscribeAttributeTestClusterEpochUs>(), //
-        make_unique<ReadTestClusterEpochS>(), //
-        make_unique<WriteTestClusterEpochS>(), //
-        make_unique<SubscribeAttributeTestClusterEpochS>(), //
-        make_unique<ReadTestClusterVendorId>(), //
-        make_unique<WriteTestClusterVendorId>(), //
-        make_unique<SubscribeAttributeTestClusterVendorId>(), //
-        make_unique<ReadTestClusterListNullablesAndOptionalsStruct>(), //
-        make_unique<WriteTestClusterListNullablesAndOptionalsStruct>(), //
-        make_unique<SubscribeAttributeTestClusterListNullablesAndOptionalsStruct>(), //
-        make_unique<ReadTestClusterEnumAttr>(), //
-        make_unique<WriteTestClusterEnumAttr>(), //
-        make_unique<SubscribeAttributeTestClusterEnumAttr>(), //
-        make_unique<ReadTestClusterStructAttr>(), //
-        make_unique<WriteTestClusterStructAttr>(), //
-        make_unique<SubscribeAttributeTestClusterStructAttr>(), //
-        make_unique<ReadTestClusterRangeRestrictedInt8u>(), //
-        make_unique<WriteTestClusterRangeRestrictedInt8u>(), //
-        make_unique<SubscribeAttributeTestClusterRangeRestrictedInt8u>(), //
-        make_unique<ReadTestClusterRangeRestrictedInt8s>(), //
-        make_unique<WriteTestClusterRangeRestrictedInt8s>(), //
-        make_unique<SubscribeAttributeTestClusterRangeRestrictedInt8s>(), //
-        make_unique<ReadTestClusterRangeRestrictedInt16u>(), //
-        make_unique<WriteTestClusterRangeRestrictedInt16u>(), //
-        make_unique<SubscribeAttributeTestClusterRangeRestrictedInt16u>(), //
-        make_unique<ReadTestClusterRangeRestrictedInt16s>(), //
-        make_unique<WriteTestClusterRangeRestrictedInt16s>(), //
-        make_unique<SubscribeAttributeTestClusterRangeRestrictedInt16s>(), //
-        make_unique<ReadTestClusterListLongOctetString>(), //
-        make_unique<WriteTestClusterListLongOctetString>(), //
-        make_unique<SubscribeAttributeTestClusterListLongOctetString>(), //
-        make_unique<ReadTestClusterListFabricScoped>(), //
-        make_unique<WriteTestClusterListFabricScoped>(), //
-        make_unique<SubscribeAttributeTestClusterListFabricScoped>(), //
-        make_unique<ReadTestClusterTimedWriteBoolean>(), //
-        make_unique<WriteTestClusterTimedWriteBoolean>(), //
-        make_unique<SubscribeAttributeTestClusterTimedWriteBoolean>(), //
-        make_unique<ReadTestClusterGeneralErrorBoolean>(), //
-        make_unique<WriteTestClusterGeneralErrorBoolean>(), //
-        make_unique<SubscribeAttributeTestClusterGeneralErrorBoolean>(), //
-        make_unique<ReadTestClusterClusterErrorBoolean>(), //
-        make_unique<WriteTestClusterClusterErrorBoolean>(), //
-        make_unique<SubscribeAttributeTestClusterClusterErrorBoolean>(), //
-        make_unique<ReadTestClusterUnsupported>(), //
-        make_unique<WriteTestClusterUnsupported>(), //
-        make_unique<SubscribeAttributeTestClusterUnsupported>(), //
-        make_unique<ReadTestClusterNullableBoolean>(), //
-        make_unique<WriteTestClusterNullableBoolean>(), //
-        make_unique<SubscribeAttributeTestClusterNullableBoolean>(), //
-        make_unique<ReadTestClusterNullableBitmap8>(), //
-        make_unique<WriteTestClusterNullableBitmap8>(), //
-        make_unique<SubscribeAttributeTestClusterNullableBitmap8>(), //
-        make_unique<ReadTestClusterNullableBitmap16>(), //
-        make_unique<WriteTestClusterNullableBitmap16>(), //
-        make_unique<SubscribeAttributeTestClusterNullableBitmap16>(), //
-        make_unique<ReadTestClusterNullableBitmap32>(), //
-        make_unique<WriteTestClusterNullableBitmap32>(), //
-        make_unique<SubscribeAttributeTestClusterNullableBitmap32>(), //
-        make_unique<ReadTestClusterNullableBitmap64>(), //
-        make_unique<WriteTestClusterNullableBitmap64>(), //
-        make_unique<SubscribeAttributeTestClusterNullableBitmap64>(), //
-        make_unique<ReadTestClusterNullableInt8u>(), //
-        make_unique<WriteTestClusterNullableInt8u>(), //
-        make_unique<SubscribeAttributeTestClusterNullableInt8u>(), //
-        make_unique<ReadTestClusterNullableInt16u>(), //
-        make_unique<WriteTestClusterNullableInt16u>(), //
-        make_unique<SubscribeAttributeTestClusterNullableInt16u>(), //
-        make_unique<ReadTestClusterNullableInt24u>(), //
-        make_unique<WriteTestClusterNullableInt24u>(), //
-        make_unique<SubscribeAttributeTestClusterNullableInt24u>(), //
-        make_unique<ReadTestClusterNullableInt32u>(), //
-        make_unique<WriteTestClusterNullableInt32u>(), //
-        make_unique<SubscribeAttributeTestClusterNullableInt32u>(), //
-        make_unique<ReadTestClusterNullableInt40u>(), //
-        make_unique<WriteTestClusterNullableInt40u>(), //
-        make_unique<SubscribeAttributeTestClusterNullableInt40u>(), //
-        make_unique<ReadTestClusterNullableInt48u>(), //
-        make_unique<WriteTestClusterNullableInt48u>(), //
-        make_unique<SubscribeAttributeTestClusterNullableInt48u>(), //
-        make_unique<ReadTestClusterNullableInt56u>(), //
-        make_unique<WriteTestClusterNullableInt56u>(), //
-        make_unique<SubscribeAttributeTestClusterNullableInt56u>(), //
-        make_unique<ReadTestClusterNullableInt64u>(), //
-        make_unique<WriteTestClusterNullableInt64u>(), //
-        make_unique<SubscribeAttributeTestClusterNullableInt64u>(), //
-        make_unique<ReadTestClusterNullableInt8s>(), //
-        make_unique<WriteTestClusterNullableInt8s>(), //
-        make_unique<SubscribeAttributeTestClusterNullableInt8s>(), //
-        make_unique<ReadTestClusterNullableInt16s>(), //
-        make_unique<WriteTestClusterNullableInt16s>(), //
-        make_unique<SubscribeAttributeTestClusterNullableInt16s>(), //
-        make_unique<ReadTestClusterNullableInt24s>(), //
-        make_unique<WriteTestClusterNullableInt24s>(), //
-        make_unique<SubscribeAttributeTestClusterNullableInt24s>(), //
-        make_unique<ReadTestClusterNullableInt32s>(), //
-        make_unique<WriteTestClusterNullableInt32s>(), //
-        make_unique<SubscribeAttributeTestClusterNullableInt32s>(), //
-        make_unique<ReadTestClusterNullableInt40s>(), //
-        make_unique<WriteTestClusterNullableInt40s>(), //
-        make_unique<SubscribeAttributeTestClusterNullableInt40s>(), //
-        make_unique<ReadTestClusterNullableInt48s>(), //
-        make_unique<WriteTestClusterNullableInt48s>(), //
-        make_unique<SubscribeAttributeTestClusterNullableInt48s>(), //
-        make_unique<ReadTestClusterNullableInt56s>(), //
-        make_unique<WriteTestClusterNullableInt56s>(), //
-        make_unique<SubscribeAttributeTestClusterNullableInt56s>(), //
-        make_unique<ReadTestClusterNullableInt64s>(), //
-        make_unique<WriteTestClusterNullableInt64s>(), //
-        make_unique<SubscribeAttributeTestClusterNullableInt64s>(), //
-        make_unique<ReadTestClusterNullableEnum8>(), //
-        make_unique<WriteTestClusterNullableEnum8>(), //
-        make_unique<SubscribeAttributeTestClusterNullableEnum8>(), //
-        make_unique<ReadTestClusterNullableEnum16>(), //
-        make_unique<WriteTestClusterNullableEnum16>(), //
-        make_unique<SubscribeAttributeTestClusterNullableEnum16>(), //
-        make_unique<ReadTestClusterNullableFloatSingle>(), //
-        make_unique<WriteTestClusterNullableFloatSingle>(), //
-        make_unique<SubscribeAttributeTestClusterNullableFloatSingle>(), //
-        make_unique<ReadTestClusterNullableFloatDouble>(), //
-        make_unique<WriteTestClusterNullableFloatDouble>(), //
-        make_unique<SubscribeAttributeTestClusterNullableFloatDouble>(), //
-        make_unique<ReadTestClusterNullableOctetString>(), //
-        make_unique<WriteTestClusterNullableOctetString>(), //
-        make_unique<SubscribeAttributeTestClusterNullableOctetString>(), //
-        make_unique<ReadTestClusterNullableCharString>(), //
-        make_unique<WriteTestClusterNullableCharString>(), //
-        make_unique<SubscribeAttributeTestClusterNullableCharString>(), //
-        make_unique<ReadTestClusterNullableEnumAttr>(), //
-        make_unique<WriteTestClusterNullableEnumAttr>(), //
-        make_unique<SubscribeAttributeTestClusterNullableEnumAttr>(), //
-        make_unique<ReadTestClusterNullableStruct>(), //
-        make_unique<WriteTestClusterNullableStruct>(), //
-        make_unique<SubscribeAttributeTestClusterNullableStruct>(), //
-        make_unique<ReadTestClusterNullableRangeRestrictedInt8u>(), //
-        make_unique<WriteTestClusterNullableRangeRestrictedInt8u>(), //
-        make_unique<SubscribeAttributeTestClusterNullableRangeRestrictedInt8u>(), //
-        make_unique<ReadTestClusterNullableRangeRestrictedInt8s>(), //
-        make_unique<WriteTestClusterNullableRangeRestrictedInt8s>(), //
-        make_unique<SubscribeAttributeTestClusterNullableRangeRestrictedInt8s>(), //
-        make_unique<ReadTestClusterNullableRangeRestrictedInt16u>(), //
-        make_unique<WriteTestClusterNullableRangeRestrictedInt16u>(), //
-        make_unique<SubscribeAttributeTestClusterNullableRangeRestrictedInt16u>(), //
-        make_unique<ReadTestClusterNullableRangeRestrictedInt16s>(), //
-        make_unique<WriteTestClusterNullableRangeRestrictedInt16s>(), //
-        make_unique<SubscribeAttributeTestClusterNullableRangeRestrictedInt16s>(), //
-        make_unique<ReadTestClusterGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeTestClusterGeneratedCommandList>(), //
-        make_unique<ReadTestClusterAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeTestClusterAcceptedCommandList>(), //
-        make_unique<ReadTestClusterAttributeList>(), //
-        make_unique<SubscribeAttributeTestClusterAttributeList>(), //
-        make_unique<ReadTestClusterFeatureMap>(), //
-        make_unique<SubscribeAttributeTestClusterFeatureMap>(), //
-        make_unique<ReadTestClusterClusterRevision>(), //
-        make_unique<SubscribeAttributeTestClusterClusterRevision>(), //
+        make_unique<SubscribeAttributePressureMeasurementMeasuredValue>(), //
+        make_unique<ReadPressureMeasurementMinMeasuredValue>(), //
+        make_unique<SubscribeAttributePressureMeasurementMinMeasuredValue>(), //
+        make_unique<ReadPressureMeasurementMaxMeasuredValue>(), //
+        make_unique<SubscribeAttributePressureMeasurementMaxMeasuredValue>(), //
+        make_unique<ReadPressureMeasurementTolerance>(), //
+        make_unique<SubscribeAttributePressureMeasurementTolerance>(), //
+        make_unique<ReadPressureMeasurementScaledValue>(), //
+        make_unique<SubscribeAttributePressureMeasurementScaledValue>(), //
+        make_unique<ReadPressureMeasurementMinScaledValue>(), //
+        make_unique<SubscribeAttributePressureMeasurementMinScaledValue>(), //
+        make_unique<ReadPressureMeasurementMaxScaledValue>(), //
+        make_unique<SubscribeAttributePressureMeasurementMaxScaledValue>(), //
+        make_unique<ReadPressureMeasurementScaledTolerance>(), //
+        make_unique<SubscribeAttributePressureMeasurementScaledTolerance>(), //
+        make_unique<ReadPressureMeasurementScale>(), //
+        make_unique<SubscribeAttributePressureMeasurementScale>(), //
+        make_unique<ReadPressureMeasurementGeneratedCommandList>(), //
+        make_unique<SubscribeAttributePressureMeasurementGeneratedCommandList>(), //
+        make_unique<ReadPressureMeasurementAcceptedCommandList>(), //
+        make_unique<SubscribeAttributePressureMeasurementAcceptedCommandList>(), //
+        make_unique<ReadPressureMeasurementAttributeList>(), //
+        make_unique<SubscribeAttributePressureMeasurementAttributeList>(), //
+        make_unique<ReadPressureMeasurementFeatureMap>(), //
+        make_unique<SubscribeAttributePressureMeasurementFeatureMap>(), //
+        make_unique<ReadPressureMeasurementClusterRevision>(), //
+        make_unique<SubscribeAttributePressureMeasurementClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterFlowMeasurement(Commands & commands)
+{
+    using namespace chip::app::Clusters::FlowMeasurement;
+
+    const char * clusterName = "FlowMeasurement";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadFlowMeasurementMeasuredValue>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeFlowMeasurementMeasuredValue>(), //
+        make_unique<ReadFlowMeasurementMinMeasuredValue>(), //
+        make_unique<SubscribeAttributeFlowMeasurementMinMeasuredValue>(), //
+        make_unique<ReadFlowMeasurementMaxMeasuredValue>(), //
+        make_unique<SubscribeAttributeFlowMeasurementMaxMeasuredValue>(), //
+        make_unique<ReadFlowMeasurementTolerance>(), //
+        make_unique<SubscribeAttributeFlowMeasurementTolerance>(), //
+        make_unique<ReadFlowMeasurementGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeFlowMeasurementGeneratedCommandList>(), //
+        make_unique<ReadFlowMeasurementAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeFlowMeasurementAcceptedCommandList>(), //
+        make_unique<ReadFlowMeasurementAttributeList>(), //
+        make_unique<SubscribeAttributeFlowMeasurementAttributeList>(), //
+        make_unique<ReadFlowMeasurementFeatureMap>(), //
+        make_unique<SubscribeAttributeFlowMeasurementFeatureMap>(), //
+        make_unique<ReadFlowMeasurementClusterRevision>(), //
+        make_unique<SubscribeAttributeFlowMeasurementClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterRelativeHumidityMeasurement(Commands & commands)
+{
+    using namespace chip::app::Clusters::RelativeHumidityMeasurement;
+
+    const char * clusterName = "RelativeHumidityMeasurement";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadRelativeHumidityMeasurementMeasuredValue>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeRelativeHumidityMeasurementMeasuredValue>(), //
+        make_unique<ReadRelativeHumidityMeasurementMinMeasuredValue>(), //
+        make_unique<SubscribeAttributeRelativeHumidityMeasurementMinMeasuredValue>(), //
+        make_unique<ReadRelativeHumidityMeasurementMaxMeasuredValue>(), //
+        make_unique<SubscribeAttributeRelativeHumidityMeasurementMaxMeasuredValue>(), //
+        make_unique<ReadRelativeHumidityMeasurementTolerance>(), //
+        make_unique<SubscribeAttributeRelativeHumidityMeasurementTolerance>(), //
+        make_unique<ReadRelativeHumidityMeasurementGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeRelativeHumidityMeasurementGeneratedCommandList>(), //
+        make_unique<ReadRelativeHumidityMeasurementAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeRelativeHumidityMeasurementAcceptedCommandList>(), //
+        make_unique<ReadRelativeHumidityMeasurementAttributeList>(), //
+        make_unique<SubscribeAttributeRelativeHumidityMeasurementAttributeList>(), //
+        make_unique<ReadRelativeHumidityMeasurementFeatureMap>(), //
+        make_unique<SubscribeAttributeRelativeHumidityMeasurementFeatureMap>(), //
+        make_unique<ReadRelativeHumidityMeasurementClusterRevision>(), //
+        make_unique<SubscribeAttributeRelativeHumidityMeasurementClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterThermostat(Commands & commands)
+void registerClusterOccupancySensing(Commands & commands)
 {
-    using namespace chip::app::Clusters::Thermostat;
+    using namespace chip::app::Clusters::OccupancySensing;
 
-    const char * clusterName = "Thermostat";
+    const char * clusterName = "OccupancySensing";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
-        make_unique<ThermostatSetpointRaiseLower>(), //
-        make_unique<ThermostatSetWeeklySchedule>(), //
-        make_unique<ThermostatGetWeeklySchedule>(), //
-        make_unique<ThermostatClearWeeklySchedule>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadThermostatLocalTemperature>(), //
+        make_unique<ReadOccupancySensingOccupancy>(), //
         make_unique<WriteAttribute>(Id), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeThermostatLocalTemperature>(), //
-        make_unique<ReadThermostatOutdoorTemperature>(), //
-        make_unique<SubscribeAttributeThermostatOutdoorTemperature>(), //
-        make_unique<ReadThermostatOccupancy>(), //
-        make_unique<SubscribeAttributeThermostatOccupancy>(), //
-        make_unique<ReadThermostatAbsMinHeatSetpointLimit>(), //
-        make_unique<SubscribeAttributeThermostatAbsMinHeatSetpointLimit>(), //
-        make_unique<ReadThermostatAbsMaxHeatSetpointLimit>(), //
-        make_unique<SubscribeAttributeThermostatAbsMaxHeatSetpointLimit>(), //
-        make_unique<ReadThermostatAbsMinCoolSetpointLimit>(), //
-        make_unique<SubscribeAttributeThermostatAbsMinCoolSetpointLimit>(), //
-        make_unique<ReadThermostatAbsMaxCoolSetpointLimit>(), //
-        make_unique<SubscribeAttributeThermostatAbsMaxCoolSetpointLimit>(), //
-        make_unique<ReadThermostatPICoolingDemand>(), //
-        make_unique<SubscribeAttributeThermostatPICoolingDemand>(), //
-        make_unique<ReadThermostatPIHeatingDemand>(), //
-        make_unique<SubscribeAttributeThermostatPIHeatingDemand>(), //
-        make_unique<ReadThermostatHVACSystemTypeConfiguration>(), //
-        make_unique<WriteThermostatHVACSystemTypeConfiguration>(), //
-        make_unique<SubscribeAttributeThermostatHVACSystemTypeConfiguration>(), //
-        make_unique<ReadThermostatLocalTemperatureCalibration>(), //
-        make_unique<WriteThermostatLocalTemperatureCalibration>(), //
-        make_unique<SubscribeAttributeThermostatLocalTemperatureCalibration>(), //
-        make_unique<ReadThermostatOccupiedCoolingSetpoint>(), //
-        make_unique<WriteThermostatOccupiedCoolingSetpoint>(), //
-        make_unique<SubscribeAttributeThermostatOccupiedCoolingSetpoint>(), //
-        make_unique<ReadThermostatOccupiedHeatingSetpoint>(), //
-        make_unique<WriteThermostatOccupiedHeatingSetpoint>(), //
-        make_unique<SubscribeAttributeThermostatOccupiedHeatingSetpoint>(), //
-        make_unique<ReadThermostatUnoccupiedCoolingSetpoint>(), //
-        make_unique<WriteThermostatUnoccupiedCoolingSetpoint>(), //
-        make_unique<SubscribeAttributeThermostatUnoccupiedCoolingSetpoint>(), //
-        make_unique<ReadThermostatUnoccupiedHeatingSetpoint>(), //
-        make_unique<WriteThermostatUnoccupiedHeatingSetpoint>(), //
-        make_unique<SubscribeAttributeThermostatUnoccupiedHeatingSetpoint>(), //
-        make_unique<ReadThermostatMinHeatSetpointLimit>(), //
-        make_unique<WriteThermostatMinHeatSetpointLimit>(), //
-        make_unique<SubscribeAttributeThermostatMinHeatSetpointLimit>(), //
-        make_unique<ReadThermostatMaxHeatSetpointLimit>(), //
-        make_unique<WriteThermostatMaxHeatSetpointLimit>(), //
-        make_unique<SubscribeAttributeThermostatMaxHeatSetpointLimit>(), //
-        make_unique<ReadThermostatMinCoolSetpointLimit>(), //
-        make_unique<WriteThermostatMinCoolSetpointLimit>(), //
-        make_unique<SubscribeAttributeThermostatMinCoolSetpointLimit>(), //
-        make_unique<ReadThermostatMaxCoolSetpointLimit>(), //
-        make_unique<WriteThermostatMaxCoolSetpointLimit>(), //
-        make_unique<SubscribeAttributeThermostatMaxCoolSetpointLimit>(), //
-        make_unique<ReadThermostatMinSetpointDeadBand>(), //
-        make_unique<WriteThermostatMinSetpointDeadBand>(), //
-        make_unique<SubscribeAttributeThermostatMinSetpointDeadBand>(), //
-        make_unique<ReadThermostatRemoteSensing>(), //
-        make_unique<WriteThermostatRemoteSensing>(), //
-        make_unique<SubscribeAttributeThermostatRemoteSensing>(), //
-        make_unique<ReadThermostatControlSequenceOfOperation>(), //
-        make_unique<WriteThermostatControlSequenceOfOperation>(), //
-        make_unique<SubscribeAttributeThermostatControlSequenceOfOperation>(), //
-        make_unique<ReadThermostatSystemMode>(), //
-        make_unique<WriteThermostatSystemMode>(), //
-        make_unique<SubscribeAttributeThermostatSystemMode>(), //
-        make_unique<ReadThermostatThermostatRunningMode>(), //
-        make_unique<SubscribeAttributeThermostatThermostatRunningMode>(), //
-        make_unique<ReadThermostatStartOfWeek>(), //
-        make_unique<SubscribeAttributeThermostatStartOfWeek>(), //
-        make_unique<ReadThermostatNumberOfWeeklyTransitions>(), //
-        make_unique<SubscribeAttributeThermostatNumberOfWeeklyTransitions>(), //
-        make_unique<ReadThermostatNumberOfDailyTransitions>(), //
-        make_unique<SubscribeAttributeThermostatNumberOfDailyTransitions>(), //
-        make_unique<ReadThermostatTemperatureSetpointHold>(), //
-        make_unique<WriteThermostatTemperatureSetpointHold>(), //
-        make_unique<SubscribeAttributeThermostatTemperatureSetpointHold>(), //
-        make_unique<ReadThermostatTemperatureSetpointHoldDuration>(), //
-        make_unique<WriteThermostatTemperatureSetpointHoldDuration>(), //
-        make_unique<SubscribeAttributeThermostatTemperatureSetpointHoldDuration>(), //
-        make_unique<ReadThermostatThermostatProgrammingOperationMode>(), //
-        make_unique<WriteThermostatThermostatProgrammingOperationMode>(), //
-        make_unique<SubscribeAttributeThermostatThermostatProgrammingOperationMode>(), //
-        make_unique<ReadThermostatThermostatRunningState>(), //
-        make_unique<SubscribeAttributeThermostatThermostatRunningState>(), //
-        make_unique<ReadThermostatSetpointChangeSource>(), //
-        make_unique<SubscribeAttributeThermostatSetpointChangeSource>(), //
-        make_unique<ReadThermostatSetpointChangeAmount>(), //
-        make_unique<SubscribeAttributeThermostatSetpointChangeAmount>(), //
-        make_unique<ReadThermostatSetpointChangeSourceTimestamp>(), //
-        make_unique<SubscribeAttributeThermostatSetpointChangeSourceTimestamp>(), //
-        make_unique<ReadThermostatOccupiedSetback>(), //
-        make_unique<WriteThermostatOccupiedSetback>(), //
-        make_unique<SubscribeAttributeThermostatOccupiedSetback>(), //
-        make_unique<ReadThermostatOccupiedSetbackMin>(), //
-        make_unique<SubscribeAttributeThermostatOccupiedSetbackMin>(), //
-        make_unique<ReadThermostatOccupiedSetbackMax>(), //
-        make_unique<SubscribeAttributeThermostatOccupiedSetbackMax>(), //
-        make_unique<ReadThermostatUnoccupiedSetback>(), //
-        make_unique<WriteThermostatUnoccupiedSetback>(), //
-        make_unique<SubscribeAttributeThermostatUnoccupiedSetback>(), //
-        make_unique<ReadThermostatUnoccupiedSetbackMin>(), //
-        make_unique<SubscribeAttributeThermostatUnoccupiedSetbackMin>(), //
-        make_unique<ReadThermostatUnoccupiedSetbackMax>(), //
-        make_unique<SubscribeAttributeThermostatUnoccupiedSetbackMax>(), //
-        make_unique<ReadThermostatEmergencyHeatDelta>(), //
-        make_unique<WriteThermostatEmergencyHeatDelta>(), //
-        make_unique<SubscribeAttributeThermostatEmergencyHeatDelta>(), //
-        make_unique<ReadThermostatACType>(), //
-        make_unique<WriteThermostatACType>(), //
-        make_unique<SubscribeAttributeThermostatACType>(), //
-        make_unique<ReadThermostatACCapacity>(), //
-        make_unique<WriteThermostatACCapacity>(), //
-        make_unique<SubscribeAttributeThermostatACCapacity>(), //
-        make_unique<ReadThermostatACRefrigerantType>(), //
-        make_unique<WriteThermostatACRefrigerantType>(), //
-        make_unique<SubscribeAttributeThermostatACRefrigerantType>(), //
-        make_unique<ReadThermostatACCompressorType>(), //
-        make_unique<WriteThermostatACCompressorType>(), //
-        make_unique<SubscribeAttributeThermostatACCompressorType>(), //
-        make_unique<ReadThermostatACErrorCode>(), //
-        make_unique<WriteThermostatACErrorCode>(), //
-        make_unique<SubscribeAttributeThermostatACErrorCode>(), //
-        make_unique<ReadThermostatACLouverPosition>(), //
-        make_unique<WriteThermostatACLouverPosition>(), //
-        make_unique<SubscribeAttributeThermostatACLouverPosition>(), //
-        make_unique<ReadThermostatACCoilTemperature>(), //
-        make_unique<SubscribeAttributeThermostatACCoilTemperature>(), //
-        make_unique<ReadThermostatACCapacityformat>(), //
-        make_unique<WriteThermostatACCapacityformat>(), //
-        make_unique<SubscribeAttributeThermostatACCapacityformat>(), //
-        make_unique<ReadThermostatGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeThermostatGeneratedCommandList>(), //
-        make_unique<ReadThermostatAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeThermostatAcceptedCommandList>(), //
-        make_unique<ReadThermostatAttributeList>(), //
-        make_unique<SubscribeAttributeThermostatAttributeList>(), //
-        make_unique<ReadThermostatFeatureMap>(), //
-        make_unique<SubscribeAttributeThermostatFeatureMap>(), //
-        make_unique<ReadThermostatClusterRevision>(), //
-        make_unique<SubscribeAttributeThermostatClusterRevision>(), //
+        make_unique<SubscribeAttributeOccupancySensingOccupancy>(), //
+        make_unique<ReadOccupancySensingOccupancySensorType>(), //
+        make_unique<SubscribeAttributeOccupancySensingOccupancySensorType>(), //
+        make_unique<ReadOccupancySensingOccupancySensorTypeBitmap>(), //
+        make_unique<SubscribeAttributeOccupancySensingOccupancySensorTypeBitmap>(), //
+        make_unique<ReadOccupancySensingPirOccupiedToUnoccupiedDelay>(), //
+        make_unique<WriteOccupancySensingPirOccupiedToUnoccupiedDelay>(), //
+        make_unique<SubscribeAttributeOccupancySensingPirOccupiedToUnoccupiedDelay>(), //
+        make_unique<ReadOccupancySensingPirUnoccupiedToOccupiedDelay>(), //
+        make_unique<WriteOccupancySensingPirUnoccupiedToOccupiedDelay>(), //
+        make_unique<SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedDelay>(), //
+        make_unique<ReadOccupancySensingPirUnoccupiedToOccupiedThreshold>(), //
+        make_unique<WriteOccupancySensingPirUnoccupiedToOccupiedThreshold>(), //
+        make_unique<SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedThreshold>(), //
+        make_unique<ReadOccupancySensingUltrasonicOccupiedToUnoccupiedDelay>(), //
+        make_unique<WriteOccupancySensingUltrasonicOccupiedToUnoccupiedDelay>(), //
+        make_unique<SubscribeAttributeOccupancySensingUltrasonicOccupiedToUnoccupiedDelay>(), //
+        make_unique<ReadOccupancySensingUltrasonicUnoccupiedToOccupiedDelay>(), //
+        make_unique<WriteOccupancySensingUltrasonicUnoccupiedToOccupiedDelay>(), //
+        make_unique<SubscribeAttributeOccupancySensingUltrasonicUnoccupiedToOccupiedDelay>(), //
+        make_unique<ReadOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold>(), //
+        make_unique<WriteOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold>(), //
+        make_unique<SubscribeAttributeOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold>(), //
+        make_unique<ReadOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay>(), //
+        make_unique<WriteOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay>(), //
+        make_unique<SubscribeAttributeOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay>(), //
+        make_unique<ReadOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay>(), //
+        make_unique<WriteOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay>(), //
+        make_unique<SubscribeAttributeOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay>(), //
+        make_unique<ReadOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold>(), //
+        make_unique<WriteOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold>(), //
+        make_unique<SubscribeAttributeOccupancySensingPhysicalContactUnoccupiedToOccupiedThreshold>(), //
+        make_unique<ReadOccupancySensingGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeOccupancySensingGeneratedCommandList>(), //
+        make_unique<ReadOccupancySensingAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeOccupancySensingAcceptedCommandList>(), //
+        make_unique<ReadOccupancySensingAttributeList>(), //
+        make_unique<SubscribeAttributeOccupancySensingAttributeList>(), //
+        make_unique<ReadOccupancySensingFeatureMap>(), //
+        make_unique<SubscribeAttributeOccupancySensingFeatureMap>(), //
+        make_unique<ReadOccupancySensingClusterRevision>(), //
+        make_unique<SubscribeAttributeOccupancySensingClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterThermostatUserInterfaceConfiguration(Commands & commands)
+void registerClusterWakeOnLan(Commands & commands)
 {
-    using namespace chip::app::Clusters::ThermostatUserInterfaceConfiguration;
+    using namespace chip::app::Clusters::WakeOnLan;
 
-    const char * clusterName = "ThermostatUserInterfaceConfiguration";
+    const char * clusterName = "WakeOnLan";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadThermostatUserInterfaceConfigurationTemperatureDisplayMode>(), //
+        make_unique<ReadWakeOnLanMACAddress>(), //
         make_unique<WriteAttribute>(Id), //
-        make_unique<WriteThermostatUserInterfaceConfigurationTemperatureDisplayMode>(), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeThermostatUserInterfaceConfigurationTemperatureDisplayMode>(), //
-        make_unique<ReadThermostatUserInterfaceConfigurationKeypadLockout>(), //
-        make_unique<WriteThermostatUserInterfaceConfigurationKeypadLockout>(), //
-        make_unique<SubscribeAttributeThermostatUserInterfaceConfigurationKeypadLockout>(), //
-        make_unique<ReadThermostatUserInterfaceConfigurationScheduleProgrammingVisibility>(), //
-        make_unique<WriteThermostatUserInterfaceConfigurationScheduleProgrammingVisibility>(), //
-        make_unique<SubscribeAttributeThermostatUserInterfaceConfigurationScheduleProgrammingVisibility>(), //
-        make_unique<ReadThermostatUserInterfaceConfigurationGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeThermostatUserInterfaceConfigurationGeneratedCommandList>(), //
-        make_unique<ReadThermostatUserInterfaceConfigurationAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeThermostatUserInterfaceConfigurationAcceptedCommandList>(), //
-        make_unique<ReadThermostatUserInterfaceConfigurationAttributeList>(), //
-        make_unique<SubscribeAttributeThermostatUserInterfaceConfigurationAttributeList>(), //
-        make_unique<ReadThermostatUserInterfaceConfigurationFeatureMap>(), //
-        make_unique<SubscribeAttributeThermostatUserInterfaceConfigurationFeatureMap>(), //
-        make_unique<ReadThermostatUserInterfaceConfigurationClusterRevision>(), //
-        make_unique<SubscribeAttributeThermostatUserInterfaceConfigurationClusterRevision>(), //
+        make_unique<SubscribeAttributeWakeOnLanMACAddress>(), //
+        make_unique<ReadWakeOnLanGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeWakeOnLanGeneratedCommandList>(), //
+        make_unique<ReadWakeOnLanAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeWakeOnLanAcceptedCommandList>(), //
+        make_unique<ReadWakeOnLanAttributeList>(), //
+        make_unique<SubscribeAttributeWakeOnLanAttributeList>(), //
+        make_unique<ReadWakeOnLanFeatureMap>(), //
+        make_unique<SubscribeAttributeWakeOnLanFeatureMap>(), //
+        make_unique<ReadWakeOnLanClusterRevision>(), //
+        make_unique<SubscribeAttributeWakeOnLanClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterThreadNetworkDiagnostics(Commands & commands)
+void registerClusterChannel(Commands & commands)
 {
-    using namespace chip::app::Clusters::ThreadNetworkDiagnostics;
+    using namespace chip::app::Clusters::Channel;
 
-    const char * clusterName = "ThreadNetworkDiagnostics";
+    const char * clusterName = "Channel";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
-        make_unique<ThreadNetworkDiagnosticsResetCounts>(), //
+        make_unique<ChannelChangeChannel>(), //
+        make_unique<ChannelChangeChannelByNumber>(), //
+        make_unique<ChannelSkipChannel>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadThreadNetworkDiagnosticsChannel>(), //
+        make_unique<ReadChannelChannelList>(), //
         make_unique<WriteAttribute>(Id), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsChannel>(), //
-        make_unique<ReadThreadNetworkDiagnosticsRoutingRole>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRoutingRole>(), //
-        make_unique<ReadThreadNetworkDiagnosticsNetworkName>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsNetworkName>(), //
-        make_unique<ReadThreadNetworkDiagnosticsPanId>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsPanId>(), //
-        make_unique<ReadThreadNetworkDiagnosticsExtendedPanId>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsExtendedPanId>(), //
-        make_unique<ReadThreadNetworkDiagnosticsMeshLocalPrefix>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsMeshLocalPrefix>(), //
-        make_unique<ReadThreadNetworkDiagnosticsOverrunCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsOverrunCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsNeighborTableList>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsNeighborTableList>(), //
-        make_unique<ReadThreadNetworkDiagnosticsRouteTableList>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRouteTableList>(), //
-        make_unique<ReadThreadNetworkDiagnosticsPartitionId>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsPartitionId>(), //
-        make_unique<ReadThreadNetworkDiagnosticsWeighting>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsWeighting>(), //
-        make_unique<ReadThreadNetworkDiagnosticsDataVersion>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsDataVersion>(), //
-        make_unique<ReadThreadNetworkDiagnosticsStableDataVersion>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsStableDataVersion>(), //
-        make_unique<ReadThreadNetworkDiagnosticsLeaderRouterId>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsLeaderRouterId>(), //
-        make_unique<ReadThreadNetworkDiagnosticsDetachedRoleCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsDetachedRoleCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsChildRoleCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsChildRoleCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsRouterRoleCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRouterRoleCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsLeaderRoleCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsLeaderRoleCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsAttachAttemptCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsAttachAttemptCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsPartitionIdChangeCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsPartitionIdChangeCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsBetterPartitionAttachAttemptCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsBetterPartitionAttachAttemptCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsParentChangeCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsParentChangeCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsTxTotalCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxTotalCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsTxUnicastCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxUnicastCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsTxBroadcastCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxBroadcastCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsTxAckRequestedCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxAckRequestedCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsTxAckedCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxAckedCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsTxNoAckRequestedCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxNoAckRequestedCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsTxDataCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxDataCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsTxDataPollCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxDataPollCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsTxBeaconCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxBeaconCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsTxBeaconRequestCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxBeaconRequestCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsTxOtherCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxOtherCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsTxRetryCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxRetryCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsTxErrCcaCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxErrCcaCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsTxErrAbortCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxErrAbortCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsTxErrBusyChannelCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsTxErrBusyChannelCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsRxTotalCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxTotalCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsRxUnicastCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxUnicastCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsRxBroadcastCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxBroadcastCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsRxDataCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxDataCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsRxDataPollCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxDataPollCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsRxBeaconCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxBeaconCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsRxBeaconRequestCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxBeaconRequestCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsRxOtherCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxOtherCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsRxAddressFilteredCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxAddressFilteredCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsRxDestAddrFilteredCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxDestAddrFilteredCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsRxDuplicatedCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxDuplicatedCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsRxErrNoFrameCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxErrNoFrameCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsRxErrUnknownNeighborCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxErrUnknownNeighborCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsRxErrSecCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxErrSecCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsRxErrFcsCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxErrFcsCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsRxErrOtherCount>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsRxErrOtherCount>(), //
-        make_unique<ReadThreadNetworkDiagnosticsActiveTimestamp>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsActiveTimestamp>(), //
-        make_unique<ReadThreadNetworkDiagnosticsPendingTimestamp>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsPendingTimestamp>(), //
-        make_unique<ReadThreadNetworkDiagnosticsDelay>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsDelay>(), //
-        make_unique<ReadThreadNetworkDiagnosticsSecurityPolicy>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsSecurityPolicy>(), //
-        make_unique<ReadThreadNetworkDiagnosticsChannelMask>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsChannelMask>(), //
-        make_unique<ReadThreadNetworkDiagnosticsOperationalDatasetComponents>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsOperationalDatasetComponents>(), //
-        make_unique<ReadThreadNetworkDiagnosticsActiveNetworkFaultsList>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsActiveNetworkFaultsList>(), //
-        make_unique<ReadThreadNetworkDiagnosticsGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsGeneratedCommandList>(), //
-        make_unique<ReadThreadNetworkDiagnosticsAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsAcceptedCommandList>(), //
-        make_unique<ReadThreadNetworkDiagnosticsAttributeList>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsAttributeList>(), //
-        make_unique<ReadThreadNetworkDiagnosticsFeatureMap>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsFeatureMap>(), //
-        make_unique<ReadThreadNetworkDiagnosticsClusterRevision>(), //
-        make_unique<SubscribeAttributeThreadNetworkDiagnosticsClusterRevision>(), //
+        make_unique<SubscribeAttributeChannelChannelList>(), //
+        make_unique<ReadChannelLineup>(), //
+        make_unique<SubscribeAttributeChannelLineup>(), //
+        make_unique<ReadChannelCurrentChannel>(), //
+        make_unique<SubscribeAttributeChannelCurrentChannel>(), //
+        make_unique<ReadChannelGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeChannelGeneratedCommandList>(), //
+        make_unique<ReadChannelAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeChannelAcceptedCommandList>(), //
+        make_unique<ReadChannelAttributeList>(), //
+        make_unique<SubscribeAttributeChannelAttributeList>(), //
+        make_unique<ReadChannelFeatureMap>(), //
+        make_unique<SubscribeAttributeChannelFeatureMap>(), //
+        make_unique<ReadChannelClusterRevision>(), //
+        make_unique<SubscribeAttributeChannelClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterTargetNavigator(Commands & commands)
+{
+    using namespace chip::app::Clusters::TargetNavigator;
+
+    const char * clusterName = "TargetNavigator";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<TargetNavigatorNavigateTarget>(), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadTargetNavigatorTargetList>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeTargetNavigatorTargetList>(), //
+        make_unique<ReadTargetNavigatorCurrentTarget>(), //
+        make_unique<SubscribeAttributeTargetNavigatorCurrentTarget>(), //
+        make_unique<ReadTargetNavigatorGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeTargetNavigatorGeneratedCommandList>(), //
+        make_unique<ReadTargetNavigatorAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeTargetNavigatorAcceptedCommandList>(), //
+        make_unique<ReadTargetNavigatorAttributeList>(), //
+        make_unique<SubscribeAttributeTargetNavigatorAttributeList>(), //
+        make_unique<ReadTargetNavigatorFeatureMap>(), //
+        make_unique<SubscribeAttributeTargetNavigatorFeatureMap>(), //
+        make_unique<ReadTargetNavigatorClusterRevision>(), //
+        make_unique<SubscribeAttributeTargetNavigatorClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterMediaPlayback(Commands & commands)
+{
+    using namespace chip::app::Clusters::MediaPlayback;
+
+    const char * clusterName = "MediaPlayback";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<MediaPlaybackPlay>(), //
+        make_unique<MediaPlaybackPause>(), //
+        make_unique<MediaPlaybackStopPlayback>(), //
+        make_unique<MediaPlaybackStartOver>(), //
+        make_unique<MediaPlaybackPrevious>(), //
+        make_unique<MediaPlaybackNext>(), //
+        make_unique<MediaPlaybackRewind>(), //
+        make_unique<MediaPlaybackFastForward>(), //
+        make_unique<MediaPlaybackSkipForward>(), //
+        make_unique<MediaPlaybackSkipBackward>(), //
+        make_unique<MediaPlaybackSeek>(), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadMediaPlaybackCurrentState>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeMediaPlaybackCurrentState>(), //
+        make_unique<ReadMediaPlaybackStartTime>(), //
+        make_unique<SubscribeAttributeMediaPlaybackStartTime>(), //
+        make_unique<ReadMediaPlaybackDuration>(), //
+        make_unique<SubscribeAttributeMediaPlaybackDuration>(), //
+        make_unique<ReadMediaPlaybackSampledPosition>(), //
+        make_unique<SubscribeAttributeMediaPlaybackSampledPosition>(), //
+        make_unique<ReadMediaPlaybackPlaybackSpeed>(), //
+        make_unique<SubscribeAttributeMediaPlaybackPlaybackSpeed>(), //
+        make_unique<ReadMediaPlaybackSeekRangeEnd>(), //
+        make_unique<SubscribeAttributeMediaPlaybackSeekRangeEnd>(), //
+        make_unique<ReadMediaPlaybackSeekRangeStart>(), //
+        make_unique<SubscribeAttributeMediaPlaybackSeekRangeStart>(), //
+        make_unique<ReadMediaPlaybackGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeMediaPlaybackGeneratedCommandList>(), //
+        make_unique<ReadMediaPlaybackAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeMediaPlaybackAcceptedCommandList>(), //
+        make_unique<ReadMediaPlaybackAttributeList>(), //
+        make_unique<SubscribeAttributeMediaPlaybackAttributeList>(), //
+        make_unique<ReadMediaPlaybackFeatureMap>(), //
+        make_unique<SubscribeAttributeMediaPlaybackFeatureMap>(), //
+        make_unique<ReadMediaPlaybackClusterRevision>(), //
+        make_unique<SubscribeAttributeMediaPlaybackClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterMediaInput(Commands & commands)
+{
+    using namespace chip::app::Clusters::MediaInput;
+
+    const char * clusterName = "MediaInput";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<MediaInputSelectInput>(), //
+        make_unique<MediaInputShowInputStatus>(), //
+        make_unique<MediaInputHideInputStatus>(), //
+        make_unique<MediaInputRenameInput>(), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadMediaInputInputList>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeMediaInputInputList>(), //
+        make_unique<ReadMediaInputCurrentInput>(), //
+        make_unique<SubscribeAttributeMediaInputCurrentInput>(), //
+        make_unique<ReadMediaInputGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeMediaInputGeneratedCommandList>(), //
+        make_unique<ReadMediaInputAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeMediaInputAcceptedCommandList>(), //
+        make_unique<ReadMediaInputAttributeList>(), //
+        make_unique<SubscribeAttributeMediaInputAttributeList>(), //
+        make_unique<ReadMediaInputFeatureMap>(), //
+        make_unique<SubscribeAttributeMediaInputFeatureMap>(), //
+        make_unique<ReadMediaInputClusterRevision>(), //
+        make_unique<SubscribeAttributeMediaInputClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterTimeFormatLocalization(Commands & commands)
+void registerClusterLowPower(Commands & commands)
 {
-    using namespace chip::app::Clusters::TimeFormatLocalization;
+    using namespace chip::app::Clusters::LowPower;
 
-    const char * clusterName = "TimeFormatLocalization";
+    const char * clusterName = "LowPower";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
+        make_unique<LowPowerSleep>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadTimeFormatLocalizationHourFormat>(), //
+        make_unique<ReadLowPowerGeneratedCommandList>(), //
         make_unique<WriteAttribute>(Id), //
-        make_unique<WriteTimeFormatLocalizationHourFormat>(), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeTimeFormatLocalizationHourFormat>(), //
-        make_unique<ReadTimeFormatLocalizationActiveCalendarType>(), //
-        make_unique<WriteTimeFormatLocalizationActiveCalendarType>(), //
-        make_unique<SubscribeAttributeTimeFormatLocalizationActiveCalendarType>(), //
-        make_unique<ReadTimeFormatLocalizationSupportedCalendarTypes>(), //
-        make_unique<SubscribeAttributeTimeFormatLocalizationSupportedCalendarTypes>(), //
-        make_unique<ReadTimeFormatLocalizationGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeTimeFormatLocalizationGeneratedCommandList>(), //
-        make_unique<ReadTimeFormatLocalizationAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeTimeFormatLocalizationAcceptedCommandList>(), //
-        make_unique<ReadTimeFormatLocalizationAttributeList>(), //
-        make_unique<SubscribeAttributeTimeFormatLocalizationAttributeList>(), //
-        make_unique<ReadTimeFormatLocalizationFeatureMap>(), //
-        make_unique<SubscribeAttributeTimeFormatLocalizationFeatureMap>(), //
-        make_unique<ReadTimeFormatLocalizationClusterRevision>(), //
-        make_unique<SubscribeAttributeTimeFormatLocalizationClusterRevision>(), //
+        make_unique<SubscribeAttributeLowPowerGeneratedCommandList>(), //
+        make_unique<ReadLowPowerAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeLowPowerAcceptedCommandList>(), //
+        make_unique<ReadLowPowerAttributeList>(), //
+        make_unique<SubscribeAttributeLowPowerAttributeList>(), //
+        make_unique<ReadLowPowerFeatureMap>(), //
+        make_unique<SubscribeAttributeLowPowerFeatureMap>(), //
+        make_unique<ReadLowPowerClusterRevision>(), //
+        make_unique<SubscribeAttributeLowPowerClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterUnitLocalization(Commands & commands)
+void registerClusterKeypadInput(Commands & commands)
 {
-    using namespace chip::app::Clusters::UnitLocalization;
+    using namespace chip::app::Clusters::KeypadInput;
 
-    const char * clusterName = "UnitLocalization";
+    const char * clusterName = "KeypadInput";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
+        make_unique<KeypadInputSendKey>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadUnitLocalizationTemperatureUnit>(), //
+        make_unique<ReadKeypadInputGeneratedCommandList>(), //
         make_unique<WriteAttribute>(Id), //
-        make_unique<WriteUnitLocalizationTemperatureUnit>(), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeUnitLocalizationTemperatureUnit>(), //
-        make_unique<ReadUnitLocalizationGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeUnitLocalizationGeneratedCommandList>(), //
-        make_unique<ReadUnitLocalizationAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeUnitLocalizationAcceptedCommandList>(), //
-        make_unique<ReadUnitLocalizationAttributeList>(), //
-        make_unique<SubscribeAttributeUnitLocalizationAttributeList>(), //
-        make_unique<ReadUnitLocalizationFeatureMap>(), //
-        make_unique<SubscribeAttributeUnitLocalizationFeatureMap>(), //
-        make_unique<ReadUnitLocalizationClusterRevision>(), //
-        make_unique<SubscribeAttributeUnitLocalizationClusterRevision>(), //
+        make_unique<SubscribeAttributeKeypadInputGeneratedCommandList>(), //
+        make_unique<ReadKeypadInputAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeKeypadInputAcceptedCommandList>(), //
+        make_unique<ReadKeypadInputAttributeList>(), //
+        make_unique<SubscribeAttributeKeypadInputAttributeList>(), //
+        make_unique<ReadKeypadInputFeatureMap>(), //
+        make_unique<SubscribeAttributeKeypadInputFeatureMap>(), //
+        make_unique<ReadKeypadInputClusterRevision>(), //
+        make_unique<SubscribeAttributeKeypadInputClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterUserLabel(Commands & commands)
+void registerClusterContentLauncher(Commands & commands)
 {
-    using namespace chip::app::Clusters::UserLabel;
+    using namespace chip::app::Clusters::ContentLauncher;
 
-    const char * clusterName = "UserLabel";
+    const char * clusterName = "ContentLauncher";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
+        make_unique<ContentLauncherLaunchContent>(), //
+        make_unique<ContentLauncherLaunchURL>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadUserLabelLabelList>(), //
+        make_unique<ReadContentLauncherAcceptHeader>(), //
         make_unique<WriteAttribute>(Id), //
-        make_unique<WriteUserLabelLabelList>(), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeUserLabelLabelList>(), //
-        make_unique<ReadUserLabelGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeUserLabelGeneratedCommandList>(), //
-        make_unique<ReadUserLabelAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeUserLabelAcceptedCommandList>(), //
-        make_unique<ReadUserLabelAttributeList>(), //
-        make_unique<SubscribeAttributeUserLabelAttributeList>(), //
-        make_unique<ReadUserLabelFeatureMap>(), //
-        make_unique<SubscribeAttributeUserLabelFeatureMap>(), //
-        make_unique<ReadUserLabelClusterRevision>(), //
-        make_unique<SubscribeAttributeUserLabelClusterRevision>(), //
+        make_unique<SubscribeAttributeContentLauncherAcceptHeader>(), //
+        make_unique<ReadContentLauncherSupportedStreamingProtocols>(), //
+        make_unique<WriteContentLauncherSupportedStreamingProtocols>(), //
+        make_unique<SubscribeAttributeContentLauncherSupportedStreamingProtocols>(), //
+        make_unique<ReadContentLauncherGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeContentLauncherGeneratedCommandList>(), //
+        make_unique<ReadContentLauncherAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeContentLauncherAcceptedCommandList>(), //
+        make_unique<ReadContentLauncherAttributeList>(), //
+        make_unique<SubscribeAttributeContentLauncherAttributeList>(), //
+        make_unique<ReadContentLauncherFeatureMap>(), //
+        make_unique<SubscribeAttributeContentLauncherFeatureMap>(), //
+        make_unique<ReadContentLauncherClusterRevision>(), //
+        make_unique<SubscribeAttributeContentLauncherClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterWakeOnLan(Commands & commands)
+void registerClusterAudioOutput(Commands & commands)
 {
-    using namespace chip::app::Clusters::WakeOnLan;
+    using namespace chip::app::Clusters::AudioOutput;
 
-    const char * clusterName = "WakeOnLan";
+    const char * clusterName = "AudioOutput";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<AudioOutputSelectOutput>(), //
+        make_unique<AudioOutputRenameOutput>(), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadAudioOutputOutputList>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeAudioOutputOutputList>(), //
+        make_unique<ReadAudioOutputCurrentOutput>(), //
+        make_unique<SubscribeAttributeAudioOutputCurrentOutput>(), //
+        make_unique<ReadAudioOutputGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeAudioOutputGeneratedCommandList>(), //
+        make_unique<ReadAudioOutputAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeAudioOutputAcceptedCommandList>(), //
+        make_unique<ReadAudioOutputAttributeList>(), //
+        make_unique<SubscribeAttributeAudioOutputAttributeList>(), //
+        make_unique<ReadAudioOutputFeatureMap>(), //
+        make_unique<SubscribeAttributeAudioOutputFeatureMap>(), //
+        make_unique<ReadAudioOutputClusterRevision>(), //
+        make_unique<SubscribeAttributeAudioOutputClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterApplicationLauncher(Commands & commands)
+{
+    using namespace chip::app::Clusters::ApplicationLauncher;
+
+    const char * clusterName = "ApplicationLauncher";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
+        make_unique<ApplicationLauncherLaunchApp>(), //
+        make_unique<ApplicationLauncherStopApp>(), //
+        make_unique<ApplicationLauncherHideApp>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadWakeOnLanMACAddress>(), //
+        make_unique<ReadApplicationLauncherCatalogList>(), //
         make_unique<WriteAttribute>(Id), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeWakeOnLanMACAddress>(), //
-        make_unique<ReadWakeOnLanGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeWakeOnLanGeneratedCommandList>(), //
-        make_unique<ReadWakeOnLanAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeWakeOnLanAcceptedCommandList>(), //
-        make_unique<ReadWakeOnLanAttributeList>(), //
-        make_unique<SubscribeAttributeWakeOnLanAttributeList>(), //
-        make_unique<ReadWakeOnLanFeatureMap>(), //
-        make_unique<SubscribeAttributeWakeOnLanFeatureMap>(), //
-        make_unique<ReadWakeOnLanClusterRevision>(), //
-        make_unique<SubscribeAttributeWakeOnLanClusterRevision>(), //
+        make_unique<SubscribeAttributeApplicationLauncherCatalogList>(), //
+        make_unique<ReadApplicationLauncherCurrentApp>(), //
+        make_unique<WriteApplicationLauncherCurrentApp>(), //
+        make_unique<SubscribeAttributeApplicationLauncherCurrentApp>(), //
+        make_unique<ReadApplicationLauncherGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeApplicationLauncherGeneratedCommandList>(), //
+        make_unique<ReadApplicationLauncherAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeApplicationLauncherAcceptedCommandList>(), //
+        make_unique<ReadApplicationLauncherAttributeList>(), //
+        make_unique<SubscribeAttributeApplicationLauncherAttributeList>(), //
+        make_unique<ReadApplicationLauncherFeatureMap>(), //
+        make_unique<SubscribeAttributeApplicationLauncherFeatureMap>(), //
+        make_unique<ReadApplicationLauncherClusterRevision>(), //
+        make_unique<SubscribeAttributeApplicationLauncherClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterWiFiNetworkDiagnostics(Commands & commands)
+void registerClusterApplicationBasic(Commands & commands)
 {
-    using namespace chip::app::Clusters::WiFiNetworkDiagnostics;
+    using namespace chip::app::Clusters::ApplicationBasic;
 
-    const char * clusterName = "WiFiNetworkDiagnostics";
+    const char * clusterName = "ApplicationBasic";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
-        make_unique<WiFiNetworkDiagnosticsResetCounts>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadWiFiNetworkDiagnosticsBssid>(), //
+        make_unique<ReadApplicationBasicVendorName>(), //
         make_unique<WriteAttribute>(Id), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsBssid>(), //
-        make_unique<ReadWiFiNetworkDiagnosticsSecurityType>(), //
-        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsSecurityType>(), //
-        make_unique<ReadWiFiNetworkDiagnosticsWiFiVersion>(), //
-        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsWiFiVersion>(), //
-        make_unique<ReadWiFiNetworkDiagnosticsChannelNumber>(), //
-        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsChannelNumber>(), //
-        make_unique<ReadWiFiNetworkDiagnosticsRssi>(), //
-        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsRssi>(), //
-        make_unique<ReadWiFiNetworkDiagnosticsBeaconLostCount>(), //
-        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsBeaconLostCount>(), //
-        make_unique<ReadWiFiNetworkDiagnosticsBeaconRxCount>(), //
-        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsBeaconRxCount>(), //
-        make_unique<ReadWiFiNetworkDiagnosticsPacketMulticastRxCount>(), //
-        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastRxCount>(), //
-        make_unique<ReadWiFiNetworkDiagnosticsPacketMulticastTxCount>(), //
-        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastTxCount>(), //
-        make_unique<ReadWiFiNetworkDiagnosticsPacketUnicastRxCount>(), //
-        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastRxCount>(), //
-        make_unique<ReadWiFiNetworkDiagnosticsPacketUnicastTxCount>(), //
-        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastTxCount>(), //
-        make_unique<ReadWiFiNetworkDiagnosticsCurrentMaxRate>(), //
-        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsCurrentMaxRate>(), //
-        make_unique<ReadWiFiNetworkDiagnosticsOverrunCount>(), //
-        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsOverrunCount>(), //
-        make_unique<ReadWiFiNetworkDiagnosticsGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsGeneratedCommandList>(), //
-        make_unique<ReadWiFiNetworkDiagnosticsAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsAcceptedCommandList>(), //
-        make_unique<ReadWiFiNetworkDiagnosticsAttributeList>(), //
-        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsAttributeList>(), //
-        make_unique<ReadWiFiNetworkDiagnosticsFeatureMap>(), //
-        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsFeatureMap>(), //
-        make_unique<ReadWiFiNetworkDiagnosticsClusterRevision>(), //
-        make_unique<SubscribeAttributeWiFiNetworkDiagnosticsClusterRevision>(), //
+        make_unique<SubscribeAttributeApplicationBasicVendorName>(), //
+        make_unique<ReadApplicationBasicVendorID>(), //
+        make_unique<SubscribeAttributeApplicationBasicVendorID>(), //
+        make_unique<ReadApplicationBasicApplicationName>(), //
+        make_unique<SubscribeAttributeApplicationBasicApplicationName>(), //
+        make_unique<ReadApplicationBasicProductID>(), //
+        make_unique<SubscribeAttributeApplicationBasicProductID>(), //
+        make_unique<ReadApplicationBasicApplication>(), //
+        make_unique<SubscribeAttributeApplicationBasicApplication>(), //
+        make_unique<ReadApplicationBasicStatus>(), //
+        make_unique<SubscribeAttributeApplicationBasicStatus>(), //
+        make_unique<ReadApplicationBasicApplicationVersion>(), //
+        make_unique<SubscribeAttributeApplicationBasicApplicationVersion>(), //
+        make_unique<ReadApplicationBasicAllowedVendorList>(), //
+        make_unique<SubscribeAttributeApplicationBasicAllowedVendorList>(), //
+        make_unique<ReadApplicationBasicGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeApplicationBasicGeneratedCommandList>(), //
+        make_unique<ReadApplicationBasicAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeApplicationBasicAcceptedCommandList>(), //
+        make_unique<ReadApplicationBasicAttributeList>(), //
+        make_unique<SubscribeAttributeApplicationBasicAttributeList>(), //
+        make_unique<ReadApplicationBasicFeatureMap>(), //
+        make_unique<SubscribeAttributeApplicationBasicFeatureMap>(), //
+        make_unique<ReadApplicationBasicClusterRevision>(), //
+        make_unique<SubscribeAttributeApplicationBasicClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterAccountLogin(Commands & commands)
+{
+    using namespace chip::app::Clusters::AccountLogin;
+
+    const char * clusterName = "AccountLogin";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<AccountLoginGetSetupPIN>(), //
+        make_unique<AccountLoginLogin>(), //
+        make_unique<AccountLoginLogout>(), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadAccountLoginGeneratedCommandList>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeAccountLoginGeneratedCommandList>(), //
+        make_unique<ReadAccountLoginAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeAccountLoginAcceptedCommandList>(), //
+        make_unique<ReadAccountLoginAttributeList>(), //
+        make_unique<SubscribeAttributeAccountLoginAttributeList>(), //
+        make_unique<ReadAccountLoginFeatureMap>(), //
+        make_unique<SubscribeAttributeAccountLoginFeatureMap>(), //
+        make_unique<ReadAccountLoginClusterRevision>(), //
+        make_unique<SubscribeAttributeAccountLoginClusterRevision>(), //
+    };
+
+    commands.Register(clusterName, clusterCommands);
+}
+void registerClusterElectricalMeasurement(Commands & commands)
+{
+    using namespace chip::app::Clusters::ElectricalMeasurement;
+
+    const char * clusterName = "ElectricalMeasurement";
+
+    commands_list clusterCommands = {
+        make_unique<ClusterCommand>(Id), //
+        make_unique<ElectricalMeasurementGetProfileInfoCommand>(), //
+        make_unique<ElectricalMeasurementGetMeasurementProfileCommand>(), //
+        make_unique<ReadAttribute>(Id), //
+        make_unique<ReadElectricalMeasurementMeasurementType>(), //
+        make_unique<WriteAttribute>(Id), //
+        make_unique<SubscribeAttribute>(Id), //
+        make_unique<SubscribeAttributeElectricalMeasurementMeasurementType>(), //
+        make_unique<ReadElectricalMeasurementDcVoltage>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementDcVoltage>(), //
+        make_unique<ReadElectricalMeasurementDcVoltageMin>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementDcVoltageMin>(), //
+        make_unique<ReadElectricalMeasurementDcVoltageMax>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementDcVoltageMax>(), //
+        make_unique<ReadElectricalMeasurementDcCurrent>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementDcCurrent>(), //
+        make_unique<ReadElectricalMeasurementDcCurrentMin>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementDcCurrentMin>(), //
+        make_unique<ReadElectricalMeasurementDcCurrentMax>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementDcCurrentMax>(), //
+        make_unique<ReadElectricalMeasurementDcPower>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementDcPower>(), //
+        make_unique<ReadElectricalMeasurementDcPowerMin>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementDcPowerMin>(), //
+        make_unique<ReadElectricalMeasurementDcPowerMax>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementDcPowerMax>(), //
+        make_unique<ReadElectricalMeasurementDcVoltageMultiplier>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementDcVoltageMultiplier>(), //
+        make_unique<ReadElectricalMeasurementDcVoltageDivisor>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementDcVoltageDivisor>(), //
+        make_unique<ReadElectricalMeasurementDcCurrentMultiplier>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementDcCurrentMultiplier>(), //
+        make_unique<ReadElectricalMeasurementDcCurrentDivisor>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementDcCurrentDivisor>(), //
+        make_unique<ReadElectricalMeasurementDcPowerMultiplier>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementDcPowerMultiplier>(), //
+        make_unique<ReadElectricalMeasurementDcPowerDivisor>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementDcPowerDivisor>(), //
+        make_unique<ReadElectricalMeasurementAcFrequency>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAcFrequency>(), //
+        make_unique<ReadElectricalMeasurementAcFrequencyMin>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAcFrequencyMin>(), //
+        make_unique<ReadElectricalMeasurementAcFrequencyMax>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAcFrequencyMax>(), //
+        make_unique<ReadElectricalMeasurementNeutralCurrent>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementNeutralCurrent>(), //
+        make_unique<ReadElectricalMeasurementTotalActivePower>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementTotalActivePower>(), //
+        make_unique<ReadElectricalMeasurementTotalReactivePower>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementTotalReactivePower>(), //
+        make_unique<ReadElectricalMeasurementTotalApparentPower>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementTotalApparentPower>(), //
+        make_unique<ReadElectricalMeasurementMeasured1stHarmonicCurrent>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementMeasured1stHarmonicCurrent>(), //
+        make_unique<ReadElectricalMeasurementMeasured3rdHarmonicCurrent>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementMeasured3rdHarmonicCurrent>(), //
+        make_unique<ReadElectricalMeasurementMeasured5thHarmonicCurrent>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementMeasured5thHarmonicCurrent>(), //
+        make_unique<ReadElectricalMeasurementMeasured7thHarmonicCurrent>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementMeasured7thHarmonicCurrent>(), //
+        make_unique<ReadElectricalMeasurementMeasured9thHarmonicCurrent>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementMeasured9thHarmonicCurrent>(), //
+        make_unique<ReadElectricalMeasurementMeasured11thHarmonicCurrent>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementMeasured11thHarmonicCurrent>(), //
+        make_unique<ReadElectricalMeasurementMeasuredPhase1stHarmonicCurrent>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementMeasuredPhase1stHarmonicCurrent>(), //
+        make_unique<ReadElectricalMeasurementMeasuredPhase3rdHarmonicCurrent>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementMeasuredPhase3rdHarmonicCurrent>(), //
+        make_unique<ReadElectricalMeasurementMeasuredPhase5thHarmonicCurrent>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementMeasuredPhase5thHarmonicCurrent>(), //
+        make_unique<ReadElectricalMeasurementMeasuredPhase7thHarmonicCurrent>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementMeasuredPhase7thHarmonicCurrent>(), //
+        make_unique<ReadElectricalMeasurementMeasuredPhase9thHarmonicCurrent>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementMeasuredPhase9thHarmonicCurrent>(), //
+        make_unique<ReadElectricalMeasurementMeasuredPhase11thHarmonicCurrent>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementMeasuredPhase11thHarmonicCurrent>(), //
+        make_unique<ReadElectricalMeasurementAcFrequencyMultiplier>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAcFrequencyMultiplier>(), //
+        make_unique<ReadElectricalMeasurementAcFrequencyDivisor>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAcFrequencyDivisor>(), //
+        make_unique<ReadElectricalMeasurementPowerMultiplier>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementPowerMultiplier>(), //
+        make_unique<ReadElectricalMeasurementPowerDivisor>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementPowerDivisor>(), //
+        make_unique<ReadElectricalMeasurementHarmonicCurrentMultiplier>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementHarmonicCurrentMultiplier>(), //
+        make_unique<ReadElectricalMeasurementPhaseHarmonicCurrentMultiplier>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementPhaseHarmonicCurrentMultiplier>(), //
+        make_unique<ReadElectricalMeasurementInstantaneousVoltage>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementInstantaneousVoltage>(), //
+        make_unique<ReadElectricalMeasurementInstantaneousLineCurrent>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementInstantaneousLineCurrent>(), //
+        make_unique<ReadElectricalMeasurementInstantaneousActiveCurrent>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementInstantaneousActiveCurrent>(), //
+        make_unique<ReadElectricalMeasurementInstantaneousReactiveCurrent>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementInstantaneousReactiveCurrent>(), //
+        make_unique<ReadElectricalMeasurementInstantaneousPower>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementInstantaneousPower>(), //
+        make_unique<ReadElectricalMeasurementRmsVoltage>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltage>(), //
+        make_unique<ReadElectricalMeasurementRmsVoltageMin>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageMin>(), //
+        make_unique<ReadElectricalMeasurementRmsVoltageMax>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageMax>(), //
+        make_unique<ReadElectricalMeasurementRmsCurrent>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsCurrent>(), //
+        make_unique<ReadElectricalMeasurementRmsCurrentMin>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsCurrentMin>(), //
+        make_unique<ReadElectricalMeasurementRmsCurrentMax>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsCurrentMax>(), //
+        make_unique<ReadElectricalMeasurementActivePower>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementActivePower>(), //
+        make_unique<ReadElectricalMeasurementActivePowerMin>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementActivePowerMin>(), //
+        make_unique<ReadElectricalMeasurementActivePowerMax>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementActivePowerMax>(), //
+        make_unique<ReadElectricalMeasurementReactivePower>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementReactivePower>(), //
+        make_unique<ReadElectricalMeasurementApparentPower>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementApparentPower>(), //
+        make_unique<ReadElectricalMeasurementPowerFactor>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementPowerFactor>(), //
+        make_unique<ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriod>(), //
+        make_unique<WriteElectricalMeasurementAverageRmsVoltageMeasurementPeriod>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriod>(), //
+        make_unique<ReadElectricalMeasurementAverageRmsUnderVoltageCounter>(), //
+        make_unique<WriteElectricalMeasurementAverageRmsUnderVoltageCounter>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounter>(), //
+        make_unique<ReadElectricalMeasurementRmsExtremeOverVoltagePeriod>(), //
+        make_unique<WriteElectricalMeasurementRmsExtremeOverVoltagePeriod>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriod>(), //
+        make_unique<ReadElectricalMeasurementRmsExtremeUnderVoltagePeriod>(), //
+        make_unique<WriteElectricalMeasurementRmsExtremeUnderVoltagePeriod>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriod>(), //
+        make_unique<ReadElectricalMeasurementRmsVoltageSagPeriod>(), //
+        make_unique<WriteElectricalMeasurementRmsVoltageSagPeriod>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriod>(), //
+        make_unique<ReadElectricalMeasurementRmsVoltageSwellPeriod>(), //
+        make_unique<WriteElectricalMeasurementRmsVoltageSwellPeriod>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriod>(), //
+        make_unique<ReadElectricalMeasurementAcVoltageMultiplier>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAcVoltageMultiplier>(), //
+        make_unique<ReadElectricalMeasurementAcVoltageDivisor>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAcVoltageDivisor>(), //
+        make_unique<ReadElectricalMeasurementAcCurrentMultiplier>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAcCurrentMultiplier>(), //
+        make_unique<ReadElectricalMeasurementAcCurrentDivisor>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAcCurrentDivisor>(), //
+        make_unique<ReadElectricalMeasurementAcPowerMultiplier>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAcPowerMultiplier>(), //
+        make_unique<ReadElectricalMeasurementAcPowerDivisor>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAcPowerDivisor>(), //
+        make_unique<ReadElectricalMeasurementOverloadAlarmsMask>(), //
+        make_unique<WriteElectricalMeasurementOverloadAlarmsMask>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementOverloadAlarmsMask>(), //
+        make_unique<ReadElectricalMeasurementVoltageOverload>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementVoltageOverload>(), //
+        make_unique<ReadElectricalMeasurementCurrentOverload>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementCurrentOverload>(), //
+        make_unique<ReadElectricalMeasurementAcOverloadAlarmsMask>(), //
+        make_unique<WriteElectricalMeasurementAcOverloadAlarmsMask>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAcOverloadAlarmsMask>(), //
+        make_unique<ReadElectricalMeasurementAcVoltageOverload>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAcVoltageOverload>(), //
+        make_unique<ReadElectricalMeasurementAcCurrentOverload>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAcCurrentOverload>(), //
+        make_unique<ReadElectricalMeasurementAcActivePowerOverload>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAcActivePowerOverload>(), //
+        make_unique<ReadElectricalMeasurementAcReactivePowerOverload>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAcReactivePowerOverload>(), //
+        make_unique<ReadElectricalMeasurementAverageRmsOverVoltage>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAverageRmsOverVoltage>(), //
+        make_unique<ReadElectricalMeasurementAverageRmsUnderVoltage>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltage>(), //
+        make_unique<ReadElectricalMeasurementRmsExtremeOverVoltage>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltage>(), //
+        make_unique<ReadElectricalMeasurementRmsExtremeUnderVoltage>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltage>(), //
+        make_unique<ReadElectricalMeasurementRmsVoltageSag>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageSag>(), //
+        make_unique<ReadElectricalMeasurementRmsVoltageSwell>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageSwell>(), //
+        make_unique<ReadElectricalMeasurementLineCurrentPhaseB>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementLineCurrentPhaseB>(), //
+        make_unique<ReadElectricalMeasurementActiveCurrentPhaseB>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementActiveCurrentPhaseB>(), //
+        make_unique<ReadElectricalMeasurementReactiveCurrentPhaseB>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementReactiveCurrentPhaseB>(), //
+        make_unique<ReadElectricalMeasurementRmsVoltagePhaseB>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltagePhaseB>(), //
+        make_unique<ReadElectricalMeasurementRmsVoltageMinPhaseB>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageMinPhaseB>(), //
+        make_unique<ReadElectricalMeasurementRmsVoltageMaxPhaseB>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageMaxPhaseB>(), //
+        make_unique<ReadElectricalMeasurementRmsCurrentPhaseB>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsCurrentPhaseB>(), //
+        make_unique<ReadElectricalMeasurementRmsCurrentMinPhaseB>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsCurrentMinPhaseB>(), //
+        make_unique<ReadElectricalMeasurementRmsCurrentMaxPhaseB>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsCurrentMaxPhaseB>(), //
+        make_unique<ReadElectricalMeasurementActivePowerPhaseB>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementActivePowerPhaseB>(), //
+        make_unique<ReadElectricalMeasurementActivePowerMinPhaseB>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementActivePowerMinPhaseB>(), //
+        make_unique<ReadElectricalMeasurementActivePowerMaxPhaseB>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementActivePowerMaxPhaseB>(), //
+        make_unique<ReadElectricalMeasurementReactivePowerPhaseB>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementReactivePowerPhaseB>(), //
+        make_unique<ReadElectricalMeasurementApparentPowerPhaseB>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementApparentPowerPhaseB>(), //
+        make_unique<ReadElectricalMeasurementPowerFactorPhaseB>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementPowerFactorPhaseB>(), //
+        make_unique<ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseB>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseB>(), //
+        make_unique<ReadElectricalMeasurementAverageRmsOverVoltageCounterPhaseB>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAverageRmsOverVoltageCounterPhaseB>(), //
+        make_unique<ReadElectricalMeasurementAverageRmsUnderVoltageCounterPhaseB>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounterPhaseB>(), //
+        make_unique<ReadElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseB>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseB>(), //
+        make_unique<ReadElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseB>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseB>(), //
+        make_unique<ReadElectricalMeasurementRmsVoltageSagPeriodPhaseB>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriodPhaseB>(), //
+        make_unique<ReadElectricalMeasurementRmsVoltageSwellPeriodPhaseB>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriodPhaseB>(), //
+        make_unique<ReadElectricalMeasurementLineCurrentPhaseC>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementLineCurrentPhaseC>(), //
+        make_unique<ReadElectricalMeasurementActiveCurrentPhaseC>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementActiveCurrentPhaseC>(), //
+        make_unique<ReadElectricalMeasurementReactiveCurrentPhaseC>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementReactiveCurrentPhaseC>(), //
+        make_unique<ReadElectricalMeasurementRmsVoltagePhaseC>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltagePhaseC>(), //
+        make_unique<ReadElectricalMeasurementRmsVoltageMinPhaseC>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageMinPhaseC>(), //
+        make_unique<ReadElectricalMeasurementRmsVoltageMaxPhaseC>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageMaxPhaseC>(), //
+        make_unique<ReadElectricalMeasurementRmsCurrentPhaseC>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsCurrentPhaseC>(), //
+        make_unique<ReadElectricalMeasurementRmsCurrentMinPhaseC>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsCurrentMinPhaseC>(), //
+        make_unique<ReadElectricalMeasurementRmsCurrentMaxPhaseC>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsCurrentMaxPhaseC>(), //
+        make_unique<ReadElectricalMeasurementActivePowerPhaseC>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementActivePowerPhaseC>(), //
+        make_unique<ReadElectricalMeasurementActivePowerMinPhaseC>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementActivePowerMinPhaseC>(), //
+        make_unique<ReadElectricalMeasurementActivePowerMaxPhaseC>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementActivePowerMaxPhaseC>(), //
+        make_unique<ReadElectricalMeasurementReactivePowerPhaseC>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementReactivePowerPhaseC>(), //
+        make_unique<ReadElectricalMeasurementApparentPowerPhaseC>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementApparentPowerPhaseC>(), //
+        make_unique<ReadElectricalMeasurementPowerFactorPhaseC>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementPowerFactorPhaseC>(), //
+        make_unique<ReadElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseC>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseC>(), //
+        make_unique<ReadElectricalMeasurementAverageRmsOverVoltageCounterPhaseC>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAverageRmsOverVoltageCounterPhaseC>(), //
+        make_unique<ReadElectricalMeasurementAverageRmsUnderVoltageCounterPhaseC>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounterPhaseC>(), //
+        make_unique<ReadElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseC>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseC>(), //
+        make_unique<ReadElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseC>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseC>(), //
+        make_unique<ReadElectricalMeasurementRmsVoltageSagPeriodPhaseC>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriodPhaseC>(), //
+        make_unique<ReadElectricalMeasurementRmsVoltageSwellPeriodPhaseC>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriodPhaseC>(), //
+        make_unique<ReadElectricalMeasurementGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementGeneratedCommandList>(), //
+        make_unique<ReadElectricalMeasurementAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAcceptedCommandList>(), //
+        make_unique<ReadElectricalMeasurementAttributeList>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementAttributeList>(), //
+        make_unique<ReadElectricalMeasurementFeatureMap>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementFeatureMap>(), //
+        make_unique<ReadElectricalMeasurementClusterRevision>(), //
+        make_unique<SubscribeAttributeElectricalMeasurementClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
 }
-void registerClusterWindowCovering(Commands & commands)
+void registerClusterTestCluster(Commands & commands)
 {
-    using namespace chip::app::Clusters::WindowCovering;
+    using namespace chip::app::Clusters::TestCluster;
 
-    const char * clusterName = "WindowCovering";
+    const char * clusterName = "TestCluster";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
-        make_unique<WindowCoveringUpOrOpen>(), //
-        make_unique<WindowCoveringDownOrClose>(), //
-        make_unique<WindowCoveringStopMotion>(), //
-        make_unique<WindowCoveringGoToLiftValue>(), //
-        make_unique<WindowCoveringGoToLiftPercentage>(), //
-        make_unique<WindowCoveringGoToTiltValue>(), //
-        make_unique<WindowCoveringGoToTiltPercentage>(), //
+        make_unique<TestClusterTest>(), //
+        make_unique<TestClusterTestNotHandled>(), //
+        make_unique<TestClusterTestSpecific>(), //
+        make_unique<TestClusterTestUnknownCommand>(), //
+        make_unique<TestClusterTestAddArguments>(), //
+        make_unique<TestClusterTestSimpleArgumentRequest>(), //
+        make_unique<TestClusterTestStructArrayArgumentRequest>(), //
+        make_unique<TestClusterTestStructArgumentRequest>(), //
+        make_unique<TestClusterTestNestedStructArgumentRequest>(), //
+        make_unique<TestClusterTestListStructArgumentRequest>(), //
+        make_unique<TestClusterTestListInt8UArgumentRequest>(), //
+        make_unique<TestClusterTestNestedStructListArgumentRequest>(), //
+        make_unique<TestClusterTestListNestedStructListArgumentRequest>(), //
+        make_unique<TestClusterTestListInt8UReverseRequest>(), //
+        make_unique<TestClusterTestEnumsRequest>(), //
+        make_unique<TestClusterTestNullableOptionalRequest>(), //
+        make_unique<TestClusterTestComplexNullableOptionalRequest>(), //
+        make_unique<TestClusterSimpleStructEchoRequest>(), //
+        make_unique<TestClusterTimedInvokeRequest>(), //
+        make_unique<TestClusterTestSimpleOptionalArgumentRequest>(), //
+        make_unique<TestClusterTestEmitTestEventRequest>(), //
+        make_unique<TestClusterTestEmitTestFabricScopedEventRequest>(), //
         make_unique<ReadAttribute>(Id), //
-        make_unique<ReadWindowCoveringType>(), //
+        make_unique<ReadTestClusterBoolean>(), //
         make_unique<WriteAttribute>(Id), //
+        make_unique<WriteTestClusterBoolean>(), //
         make_unique<SubscribeAttribute>(Id), //
-        make_unique<SubscribeAttributeWindowCoveringType>(), //
-        make_unique<ReadWindowCoveringPhysicalClosedLimitLift>(), //
-        make_unique<SubscribeAttributeWindowCoveringPhysicalClosedLimitLift>(), //
-        make_unique<ReadWindowCoveringPhysicalClosedLimitTilt>(), //
-        make_unique<SubscribeAttributeWindowCoveringPhysicalClosedLimitTilt>(), //
-        make_unique<ReadWindowCoveringCurrentPositionLift>(), //
-        make_unique<SubscribeAttributeWindowCoveringCurrentPositionLift>(), //
-        make_unique<ReadWindowCoveringCurrentPositionTilt>(), //
-        make_unique<SubscribeAttributeWindowCoveringCurrentPositionTilt>(), //
-        make_unique<ReadWindowCoveringNumberOfActuationsLift>(), //
-        make_unique<SubscribeAttributeWindowCoveringNumberOfActuationsLift>(), //
-        make_unique<ReadWindowCoveringNumberOfActuationsTilt>(), //
-        make_unique<SubscribeAttributeWindowCoveringNumberOfActuationsTilt>(), //
-        make_unique<ReadWindowCoveringConfigStatus>(), //
-        make_unique<SubscribeAttributeWindowCoveringConfigStatus>(), //
-        make_unique<ReadWindowCoveringCurrentPositionLiftPercentage>(), //
-        make_unique<SubscribeAttributeWindowCoveringCurrentPositionLiftPercentage>(), //
-        make_unique<ReadWindowCoveringCurrentPositionTiltPercentage>(), //
-        make_unique<SubscribeAttributeWindowCoveringCurrentPositionTiltPercentage>(), //
-        make_unique<ReadWindowCoveringOperationalStatus>(), //
-        make_unique<SubscribeAttributeWindowCoveringOperationalStatus>(), //
-        make_unique<ReadWindowCoveringTargetPositionLiftPercent100ths>(), //
-        make_unique<SubscribeAttributeWindowCoveringTargetPositionLiftPercent100ths>(), //
-        make_unique<ReadWindowCoveringTargetPositionTiltPercent100ths>(), //
-        make_unique<SubscribeAttributeWindowCoveringTargetPositionTiltPercent100ths>(), //
-        make_unique<ReadWindowCoveringEndProductType>(), //
-        make_unique<SubscribeAttributeWindowCoveringEndProductType>(), //
-        make_unique<ReadWindowCoveringCurrentPositionLiftPercent100ths>(), //
-        make_unique<SubscribeAttributeWindowCoveringCurrentPositionLiftPercent100ths>(), //
-        make_unique<ReadWindowCoveringCurrentPositionTiltPercent100ths>(), //
-        make_unique<SubscribeAttributeWindowCoveringCurrentPositionTiltPercent100ths>(), //
-        make_unique<ReadWindowCoveringInstalledOpenLimitLift>(), //
-        make_unique<SubscribeAttributeWindowCoveringInstalledOpenLimitLift>(), //
-        make_unique<ReadWindowCoveringInstalledClosedLimitLift>(), //
-        make_unique<SubscribeAttributeWindowCoveringInstalledClosedLimitLift>(), //
-        make_unique<ReadWindowCoveringInstalledOpenLimitTilt>(), //
-        make_unique<SubscribeAttributeWindowCoveringInstalledOpenLimitTilt>(), //
-        make_unique<ReadWindowCoveringInstalledClosedLimitTilt>(), //
-        make_unique<SubscribeAttributeWindowCoveringInstalledClosedLimitTilt>(), //
-        make_unique<ReadWindowCoveringMode>(), //
-        make_unique<WriteWindowCoveringMode>(), //
-        make_unique<SubscribeAttributeWindowCoveringMode>(), //
-        make_unique<ReadWindowCoveringSafetyStatus>(), //
-        make_unique<SubscribeAttributeWindowCoveringSafetyStatus>(), //
-        make_unique<ReadWindowCoveringGeneratedCommandList>(), //
-        make_unique<SubscribeAttributeWindowCoveringGeneratedCommandList>(), //
-        make_unique<ReadWindowCoveringAcceptedCommandList>(), //
-        make_unique<SubscribeAttributeWindowCoveringAcceptedCommandList>(), //
-        make_unique<ReadWindowCoveringAttributeList>(), //
-        make_unique<SubscribeAttributeWindowCoveringAttributeList>(), //
-        make_unique<ReadWindowCoveringFeatureMap>(), //
-        make_unique<SubscribeAttributeWindowCoveringFeatureMap>(), //
-        make_unique<ReadWindowCoveringClusterRevision>(), //
-        make_unique<SubscribeAttributeWindowCoveringClusterRevision>(), //
+        make_unique<SubscribeAttributeTestClusterBoolean>(), //
+        make_unique<ReadTestClusterBitmap8>(), //
+        make_unique<WriteTestClusterBitmap8>(), //
+        make_unique<SubscribeAttributeTestClusterBitmap8>(), //
+        make_unique<ReadTestClusterBitmap16>(), //
+        make_unique<WriteTestClusterBitmap16>(), //
+        make_unique<SubscribeAttributeTestClusterBitmap16>(), //
+        make_unique<ReadTestClusterBitmap32>(), //
+        make_unique<WriteTestClusterBitmap32>(), //
+        make_unique<SubscribeAttributeTestClusterBitmap32>(), //
+        make_unique<ReadTestClusterBitmap64>(), //
+        make_unique<WriteTestClusterBitmap64>(), //
+        make_unique<SubscribeAttributeTestClusterBitmap64>(), //
+        make_unique<ReadTestClusterInt8u>(), //
+        make_unique<WriteTestClusterInt8u>(), //
+        make_unique<SubscribeAttributeTestClusterInt8u>(), //
+        make_unique<ReadTestClusterInt16u>(), //
+        make_unique<WriteTestClusterInt16u>(), //
+        make_unique<SubscribeAttributeTestClusterInt16u>(), //
+        make_unique<ReadTestClusterInt24u>(), //
+        make_unique<WriteTestClusterInt24u>(), //
+        make_unique<SubscribeAttributeTestClusterInt24u>(), //
+        make_unique<ReadTestClusterInt32u>(), //
+        make_unique<WriteTestClusterInt32u>(), //
+        make_unique<SubscribeAttributeTestClusterInt32u>(), //
+        make_unique<ReadTestClusterInt40u>(), //
+        make_unique<WriteTestClusterInt40u>(), //
+        make_unique<SubscribeAttributeTestClusterInt40u>(), //
+        make_unique<ReadTestClusterInt48u>(), //
+        make_unique<WriteTestClusterInt48u>(), //
+        make_unique<SubscribeAttributeTestClusterInt48u>(), //
+        make_unique<ReadTestClusterInt56u>(), //
+        make_unique<WriteTestClusterInt56u>(), //
+        make_unique<SubscribeAttributeTestClusterInt56u>(), //
+        make_unique<ReadTestClusterInt64u>(), //
+        make_unique<WriteTestClusterInt64u>(), //
+        make_unique<SubscribeAttributeTestClusterInt64u>(), //
+        make_unique<ReadTestClusterInt8s>(), //
+        make_unique<WriteTestClusterInt8s>(), //
+        make_unique<SubscribeAttributeTestClusterInt8s>(), //
+        make_unique<ReadTestClusterInt16s>(), //
+        make_unique<WriteTestClusterInt16s>(), //
+        make_unique<SubscribeAttributeTestClusterInt16s>(), //
+        make_unique<ReadTestClusterInt24s>(), //
+        make_unique<WriteTestClusterInt24s>(), //
+        make_unique<SubscribeAttributeTestClusterInt24s>(), //
+        make_unique<ReadTestClusterInt32s>(), //
+        make_unique<WriteTestClusterInt32s>(), //
+        make_unique<SubscribeAttributeTestClusterInt32s>(), //
+        make_unique<ReadTestClusterInt40s>(), //
+        make_unique<WriteTestClusterInt40s>(), //
+        make_unique<SubscribeAttributeTestClusterInt40s>(), //
+        make_unique<ReadTestClusterInt48s>(), //
+        make_unique<WriteTestClusterInt48s>(), //
+        make_unique<SubscribeAttributeTestClusterInt48s>(), //
+        make_unique<ReadTestClusterInt56s>(), //
+        make_unique<WriteTestClusterInt56s>(), //
+        make_unique<SubscribeAttributeTestClusterInt56s>(), //
+        make_unique<ReadTestClusterInt64s>(), //
+        make_unique<WriteTestClusterInt64s>(), //
+        make_unique<SubscribeAttributeTestClusterInt64s>(), //
+        make_unique<ReadTestClusterEnum8>(), //
+        make_unique<WriteTestClusterEnum8>(), //
+        make_unique<SubscribeAttributeTestClusterEnum8>(), //
+        make_unique<ReadTestClusterEnum16>(), //
+        make_unique<WriteTestClusterEnum16>(), //
+        make_unique<SubscribeAttributeTestClusterEnum16>(), //
+        make_unique<ReadTestClusterFloatSingle>(), //
+        make_unique<WriteTestClusterFloatSingle>(), //
+        make_unique<SubscribeAttributeTestClusterFloatSingle>(), //
+        make_unique<ReadTestClusterFloatDouble>(), //
+        make_unique<WriteTestClusterFloatDouble>(), //
+        make_unique<SubscribeAttributeTestClusterFloatDouble>(), //
+        make_unique<ReadTestClusterOctetString>(), //
+        make_unique<WriteTestClusterOctetString>(), //
+        make_unique<SubscribeAttributeTestClusterOctetString>(), //
+        make_unique<ReadTestClusterListInt8u>(), //
+        make_unique<WriteTestClusterListInt8u>(), //
+        make_unique<SubscribeAttributeTestClusterListInt8u>(), //
+        make_unique<ReadTestClusterListOctetString>(), //
+        make_unique<WriteTestClusterListOctetString>(), //
+        make_unique<SubscribeAttributeTestClusterListOctetString>(), //
+        make_unique<ReadTestClusterListStructOctetString>(), //
+        make_unique<WriteTestClusterListStructOctetString>(), //
+        make_unique<SubscribeAttributeTestClusterListStructOctetString>(), //
+        make_unique<ReadTestClusterLongOctetString>(), //
+        make_unique<WriteTestClusterLongOctetString>(), //
+        make_unique<SubscribeAttributeTestClusterLongOctetString>(), //
+        make_unique<ReadTestClusterCharString>(), //
+        make_unique<WriteTestClusterCharString>(), //
+        make_unique<SubscribeAttributeTestClusterCharString>(), //
+        make_unique<ReadTestClusterLongCharString>(), //
+        make_unique<WriteTestClusterLongCharString>(), //
+        make_unique<SubscribeAttributeTestClusterLongCharString>(), //
+        make_unique<ReadTestClusterEpochUs>(), //
+        make_unique<WriteTestClusterEpochUs>(), //
+        make_unique<SubscribeAttributeTestClusterEpochUs>(), //
+        make_unique<ReadTestClusterEpochS>(), //
+        make_unique<WriteTestClusterEpochS>(), //
+        make_unique<SubscribeAttributeTestClusterEpochS>(), //
+        make_unique<ReadTestClusterVendorId>(), //
+        make_unique<WriteTestClusterVendorId>(), //
+        make_unique<SubscribeAttributeTestClusterVendorId>(), //
+        make_unique<ReadTestClusterListNullablesAndOptionalsStruct>(), //
+        make_unique<WriteTestClusterListNullablesAndOptionalsStruct>(), //
+        make_unique<SubscribeAttributeTestClusterListNullablesAndOptionalsStruct>(), //
+        make_unique<ReadTestClusterEnumAttr>(), //
+        make_unique<WriteTestClusterEnumAttr>(), //
+        make_unique<SubscribeAttributeTestClusterEnumAttr>(), //
+        make_unique<ReadTestClusterStructAttr>(), //
+        make_unique<WriteTestClusterStructAttr>(), //
+        make_unique<SubscribeAttributeTestClusterStructAttr>(), //
+        make_unique<ReadTestClusterRangeRestrictedInt8u>(), //
+        make_unique<WriteTestClusterRangeRestrictedInt8u>(), //
+        make_unique<SubscribeAttributeTestClusterRangeRestrictedInt8u>(), //
+        make_unique<ReadTestClusterRangeRestrictedInt8s>(), //
+        make_unique<WriteTestClusterRangeRestrictedInt8s>(), //
+        make_unique<SubscribeAttributeTestClusterRangeRestrictedInt8s>(), //
+        make_unique<ReadTestClusterRangeRestrictedInt16u>(), //
+        make_unique<WriteTestClusterRangeRestrictedInt16u>(), //
+        make_unique<SubscribeAttributeTestClusterRangeRestrictedInt16u>(), //
+        make_unique<ReadTestClusterRangeRestrictedInt16s>(), //
+        make_unique<WriteTestClusterRangeRestrictedInt16s>(), //
+        make_unique<SubscribeAttributeTestClusterRangeRestrictedInt16s>(), //
+        make_unique<ReadTestClusterListLongOctetString>(), //
+        make_unique<WriteTestClusterListLongOctetString>(), //
+        make_unique<SubscribeAttributeTestClusterListLongOctetString>(), //
+        make_unique<ReadTestClusterListFabricScoped>(), //
+        make_unique<WriteTestClusterListFabricScoped>(), //
+        make_unique<SubscribeAttributeTestClusterListFabricScoped>(), //
+        make_unique<ReadTestClusterTimedWriteBoolean>(), //
+        make_unique<WriteTestClusterTimedWriteBoolean>(), //
+        make_unique<SubscribeAttributeTestClusterTimedWriteBoolean>(), //
+        make_unique<ReadTestClusterGeneralErrorBoolean>(), //
+        make_unique<WriteTestClusterGeneralErrorBoolean>(), //
+        make_unique<SubscribeAttributeTestClusterGeneralErrorBoolean>(), //
+        make_unique<ReadTestClusterClusterErrorBoolean>(), //
+        make_unique<WriteTestClusterClusterErrorBoolean>(), //
+        make_unique<SubscribeAttributeTestClusterClusterErrorBoolean>(), //
+        make_unique<ReadTestClusterUnsupported>(), //
+        make_unique<WriteTestClusterUnsupported>(), //
+        make_unique<SubscribeAttributeTestClusterUnsupported>(), //
+        make_unique<ReadTestClusterNullableBoolean>(), //
+        make_unique<WriteTestClusterNullableBoolean>(), //
+        make_unique<SubscribeAttributeTestClusterNullableBoolean>(), //
+        make_unique<ReadTestClusterNullableBitmap8>(), //
+        make_unique<WriteTestClusterNullableBitmap8>(), //
+        make_unique<SubscribeAttributeTestClusterNullableBitmap8>(), //
+        make_unique<ReadTestClusterNullableBitmap16>(), //
+        make_unique<WriteTestClusterNullableBitmap16>(), //
+        make_unique<SubscribeAttributeTestClusterNullableBitmap16>(), //
+        make_unique<ReadTestClusterNullableBitmap32>(), //
+        make_unique<WriteTestClusterNullableBitmap32>(), //
+        make_unique<SubscribeAttributeTestClusterNullableBitmap32>(), //
+        make_unique<ReadTestClusterNullableBitmap64>(), //
+        make_unique<WriteTestClusterNullableBitmap64>(), //
+        make_unique<SubscribeAttributeTestClusterNullableBitmap64>(), //
+        make_unique<ReadTestClusterNullableInt8u>(), //
+        make_unique<WriteTestClusterNullableInt8u>(), //
+        make_unique<SubscribeAttributeTestClusterNullableInt8u>(), //
+        make_unique<ReadTestClusterNullableInt16u>(), //
+        make_unique<WriteTestClusterNullableInt16u>(), //
+        make_unique<SubscribeAttributeTestClusterNullableInt16u>(), //
+        make_unique<ReadTestClusterNullableInt24u>(), //
+        make_unique<WriteTestClusterNullableInt24u>(), //
+        make_unique<SubscribeAttributeTestClusterNullableInt24u>(), //
+        make_unique<ReadTestClusterNullableInt32u>(), //
+        make_unique<WriteTestClusterNullableInt32u>(), //
+        make_unique<SubscribeAttributeTestClusterNullableInt32u>(), //
+        make_unique<ReadTestClusterNullableInt40u>(), //
+        make_unique<WriteTestClusterNullableInt40u>(), //
+        make_unique<SubscribeAttributeTestClusterNullableInt40u>(), //
+        make_unique<ReadTestClusterNullableInt48u>(), //
+        make_unique<WriteTestClusterNullableInt48u>(), //
+        make_unique<SubscribeAttributeTestClusterNullableInt48u>(), //
+        make_unique<ReadTestClusterNullableInt56u>(), //
+        make_unique<WriteTestClusterNullableInt56u>(), //
+        make_unique<SubscribeAttributeTestClusterNullableInt56u>(), //
+        make_unique<ReadTestClusterNullableInt64u>(), //
+        make_unique<WriteTestClusterNullableInt64u>(), //
+        make_unique<SubscribeAttributeTestClusterNullableInt64u>(), //
+        make_unique<ReadTestClusterNullableInt8s>(), //
+        make_unique<WriteTestClusterNullableInt8s>(), //
+        make_unique<SubscribeAttributeTestClusterNullableInt8s>(), //
+        make_unique<ReadTestClusterNullableInt16s>(), //
+        make_unique<WriteTestClusterNullableInt16s>(), //
+        make_unique<SubscribeAttributeTestClusterNullableInt16s>(), //
+        make_unique<ReadTestClusterNullableInt24s>(), //
+        make_unique<WriteTestClusterNullableInt24s>(), //
+        make_unique<SubscribeAttributeTestClusterNullableInt24s>(), //
+        make_unique<ReadTestClusterNullableInt32s>(), //
+        make_unique<WriteTestClusterNullableInt32s>(), //
+        make_unique<SubscribeAttributeTestClusterNullableInt32s>(), //
+        make_unique<ReadTestClusterNullableInt40s>(), //
+        make_unique<WriteTestClusterNullableInt40s>(), //
+        make_unique<SubscribeAttributeTestClusterNullableInt40s>(), //
+        make_unique<ReadTestClusterNullableInt48s>(), //
+        make_unique<WriteTestClusterNullableInt48s>(), //
+        make_unique<SubscribeAttributeTestClusterNullableInt48s>(), //
+        make_unique<ReadTestClusterNullableInt56s>(), //
+        make_unique<WriteTestClusterNullableInt56s>(), //
+        make_unique<SubscribeAttributeTestClusterNullableInt56s>(), //
+        make_unique<ReadTestClusterNullableInt64s>(), //
+        make_unique<WriteTestClusterNullableInt64s>(), //
+        make_unique<SubscribeAttributeTestClusterNullableInt64s>(), //
+        make_unique<ReadTestClusterNullableEnum8>(), //
+        make_unique<WriteTestClusterNullableEnum8>(), //
+        make_unique<SubscribeAttributeTestClusterNullableEnum8>(), //
+        make_unique<ReadTestClusterNullableEnum16>(), //
+        make_unique<WriteTestClusterNullableEnum16>(), //
+        make_unique<SubscribeAttributeTestClusterNullableEnum16>(), //
+        make_unique<ReadTestClusterNullableFloatSingle>(), //
+        make_unique<WriteTestClusterNullableFloatSingle>(), //
+        make_unique<SubscribeAttributeTestClusterNullableFloatSingle>(), //
+        make_unique<ReadTestClusterNullableFloatDouble>(), //
+        make_unique<WriteTestClusterNullableFloatDouble>(), //
+        make_unique<SubscribeAttributeTestClusterNullableFloatDouble>(), //
+        make_unique<ReadTestClusterNullableOctetString>(), //
+        make_unique<WriteTestClusterNullableOctetString>(), //
+        make_unique<SubscribeAttributeTestClusterNullableOctetString>(), //
+        make_unique<ReadTestClusterNullableCharString>(), //
+        make_unique<WriteTestClusterNullableCharString>(), //
+        make_unique<SubscribeAttributeTestClusterNullableCharString>(), //
+        make_unique<ReadTestClusterNullableEnumAttr>(), //
+        make_unique<WriteTestClusterNullableEnumAttr>(), //
+        make_unique<SubscribeAttributeTestClusterNullableEnumAttr>(), //
+        make_unique<ReadTestClusterNullableStruct>(), //
+        make_unique<WriteTestClusterNullableStruct>(), //
+        make_unique<SubscribeAttributeTestClusterNullableStruct>(), //
+        make_unique<ReadTestClusterNullableRangeRestrictedInt8u>(), //
+        make_unique<WriteTestClusterNullableRangeRestrictedInt8u>(), //
+        make_unique<SubscribeAttributeTestClusterNullableRangeRestrictedInt8u>(), //
+        make_unique<ReadTestClusterNullableRangeRestrictedInt8s>(), //
+        make_unique<WriteTestClusterNullableRangeRestrictedInt8s>(), //
+        make_unique<SubscribeAttributeTestClusterNullableRangeRestrictedInt8s>(), //
+        make_unique<ReadTestClusterNullableRangeRestrictedInt16u>(), //
+        make_unique<WriteTestClusterNullableRangeRestrictedInt16u>(), //
+        make_unique<SubscribeAttributeTestClusterNullableRangeRestrictedInt16u>(), //
+        make_unique<ReadTestClusterNullableRangeRestrictedInt16s>(), //
+        make_unique<WriteTestClusterNullableRangeRestrictedInt16s>(), //
+        make_unique<SubscribeAttributeTestClusterNullableRangeRestrictedInt16s>(), //
+        make_unique<ReadTestClusterGeneratedCommandList>(), //
+        make_unique<SubscribeAttributeTestClusterGeneratedCommandList>(), //
+        make_unique<ReadTestClusterAcceptedCommandList>(), //
+        make_unique<SubscribeAttributeTestClusterAcceptedCommandList>(), //
+        make_unique<ReadTestClusterAttributeList>(), //
+        make_unique<SubscribeAttributeTestClusterAttributeList>(), //
+        make_unique<ReadTestClusterFeatureMap>(), //
+        make_unique<SubscribeAttributeTestClusterFeatureMap>(), //
+        make_unique<ReadTestClusterClusterRevision>(), //
+        make_unique<SubscribeAttributeTestClusterClusterRevision>(), //
     };
 
     commands.Register(clusterName, clusterCommands);
@@ -94719,68 +94719,68 @@ void registerClusterAny(Commands & commands)
 void registerClusters(Commands & commands)
 {
     registerClusterAny(commands);
-    registerClusterAccessControl(commands);
-    registerClusterAccountLogin(commands);
-    registerClusterAdministratorCommissioning(commands);
-    registerClusterApplicationBasic(commands);
-    registerClusterApplicationLauncher(commands);
-    registerClusterAudioOutput(commands);
-    registerClusterBarrierControl(commands);
-    registerClusterBasic(commands);
+    registerClusterIdentify(commands);
+    registerClusterGroups(commands);
+    registerClusterScenes(commands);
+    registerClusterOnOff(commands);
+    registerClusterOnOffSwitchConfiguration(commands);
+    registerClusterLevelControl(commands);
     registerClusterBinaryInputBasic(commands);
+    registerClusterDescriptor(commands);
     registerClusterBinding(commands);
-    registerClusterBooleanState(commands);
+    registerClusterAccessControl(commands);
     registerClusterBridgedActions(commands);
-    registerClusterBridgedDeviceBasic(commands);
-    registerClusterChannel(commands);
-    registerClusterColorControl(commands);
-    registerClusterContentLauncher(commands);
-    registerClusterDescriptor(commands);
-    registerClusterDiagnosticLogs(commands);
-    registerClusterDoorLock(commands);
-    registerClusterElectricalMeasurement(commands);
-    registerClusterEthernetNetworkDiagnostics(commands);
-    registerClusterFanControl(commands);
-    registerClusterFixedLabel(commands);
-    registerClusterFlowMeasurement(commands);
-    registerClusterGeneralCommissioning(commands);
-    registerClusterGeneralDiagnostics(commands);
-    registerClusterGroupKeyManagement(commands);
-    registerClusterGroups(commands);
-    registerClusterIdentify(commands);
-    registerClusterIlluminanceMeasurement(commands);
-    registerClusterKeypadInput(commands);
-    registerClusterLevelControl(commands);
-    registerClusterLocalizationConfiguration(commands);
-    registerClusterLowPower(commands);
-    registerClusterMediaInput(commands);
-    registerClusterMediaPlayback(commands);
-    registerClusterModeSelect(commands);
-    registerClusterNetworkCommissioning(commands);
+    registerClusterBasic(commands);
     registerClusterOtaSoftwareUpdateProvider(commands);
     registerClusterOtaSoftwareUpdateRequestor(commands);
-    registerClusterOccupancySensing(commands);
-    registerClusterOnOff(commands);
-    registerClusterOnOffSwitchConfiguration(commands);
-    registerClusterOperationalCredentials(commands);
-    registerClusterPowerSource(commands);
+    registerClusterLocalizationConfiguration(commands);
+    registerClusterTimeFormatLocalization(commands);
+    registerClusterUnitLocalization(commands);
     registerClusterPowerSourceConfiguration(commands);
-    registerClusterPressureMeasurement(commands);
-    registerClusterPumpConfigurationAndControl(commands);
-    registerClusterRelativeHumidityMeasurement(commands);
-    registerClusterScenes(commands);
+    registerClusterPowerSource(commands);
+    registerClusterGeneralCommissioning(commands);
+    registerClusterNetworkCommissioning(commands);
+    registerClusterDiagnosticLogs(commands);
+    registerClusterGeneralDiagnostics(commands);
     registerClusterSoftwareDiagnostics(commands);
+    registerClusterThreadNetworkDiagnostics(commands);
+    registerClusterWiFiNetworkDiagnostics(commands);
+    registerClusterEthernetNetworkDiagnostics(commands);
+    registerClusterBridgedDeviceBasic(commands);
     registerClusterSwitch(commands);
-    registerClusterTargetNavigator(commands);
-    registerClusterTemperatureMeasurement(commands);
-    registerClusterTestCluster(commands);
+    registerClusterAdministratorCommissioning(commands);
+    registerClusterOperationalCredentials(commands);
+    registerClusterGroupKeyManagement(commands);
+    registerClusterFixedLabel(commands);
+    registerClusterUserLabel(commands);
+    registerClusterBooleanState(commands);
+    registerClusterModeSelect(commands);
+    registerClusterDoorLock(commands);
+    registerClusterWindowCovering(commands);
+    registerClusterBarrierControl(commands);
+    registerClusterPumpConfigurationAndControl(commands);
     registerClusterThermostat(commands);
+    registerClusterFanControl(commands);
     registerClusterThermostatUserInterfaceConfiguration(commands);
-    registerClusterThreadNetworkDiagnostics(commands);
-    registerClusterTimeFormatLocalization(commands);
-    registerClusterUnitLocalization(commands);
-    registerClusterUserLabel(commands);
+    registerClusterColorControl(commands);
+    registerClusterIlluminanceMeasurement(commands);
+    registerClusterTemperatureMeasurement(commands);
+    registerClusterPressureMeasurement(commands);
+    registerClusterFlowMeasurement(commands);
+    registerClusterRelativeHumidityMeasurement(commands);
+    registerClusterOccupancySensing(commands);
     registerClusterWakeOnLan(commands);
-    registerClusterWiFiNetworkDiagnostics(commands);
-    registerClusterWindowCovering(commands);
+    registerClusterChannel(commands);
+    registerClusterTargetNavigator(commands);
+    registerClusterMediaPlayback(commands);
+    registerClusterMediaInput(commands);
+    registerClusterLowPower(commands);
+    registerClusterKeypadInput(commands);
+    registerClusterContentLauncher(commands);
+    registerClusterAudioOutput(commands);
+    registerClusterApplicationLauncher(commands);
+    registerClusterApplicationBasic(commands);
+    registerClusterAccountLogin(commands);
+    registerClusterElectricalMeasurement(commands);
+    registerClusterTestCluster(commands);
 }
diff --git a/zzz_generated/light-switch-app/zap-generated/CHIPClientCallbacks.h b/zzz_generated/light-switch-app/zap-generated/CHIPClientCallbacks.h
index 766d5a228129a7..75fe2d30a51f11 100644
--- a/zzz_generated/light-switch-app/zap-generated/CHIPClientCallbacks.h
+++ b/zzz_generated/light-switch-app/zap-generated/CHIPClientCallbacks.h
@@ -32,7 +32,7 @@
 // List specific responses
 typedef void (*IdentifyAttributeListListAttributeCallback)(void * context,
                                                            const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*OnOffAttributeListListAttributeCallback)(void * context,
-                                                        const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*ScenesAttributeListListAttributeCallback)(void * context,
                                                          const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*OnOffAttributeListListAttributeCallback)(void * context,
+                                                        const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
diff --git a/zzz_generated/light-switch-app/zap-generated/CHIPClusters.h b/zzz_generated/light-switch-app/zap-generated/CHIPClusters.h
index 8a09c364a219a2..fd931c569dda71 100644
--- a/zzz_generated/light-switch-app/zap-generated/CHIPClusters.h
+++ b/zzz_generated/light-switch-app/zap-generated/CHIPClusters.h
@@ -30,13 +30,6 @@
 namespace chip {
 namespace Controller {
 
-class DLL_EXPORT ColorControlCluster : public ClusterBase
-{
-public:
-    ColorControlCluster() : ClusterBase(app::Clusters::ColorControl::Id) {}
-    ~ColorControlCluster() {}
-};
-
 class DLL_EXPORT IdentifyCluster : public ClusterBase
 {
 public:
@@ -44,11 +37,11 @@ class DLL_EXPORT IdentifyCluster : public ClusterBase
     ~IdentifyCluster() {}
 };
 
-class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
+class DLL_EXPORT ScenesCluster : public ClusterBase
 {
 public:
-    OtaSoftwareUpdateProviderCluster() : ClusterBase(app::Clusters::OtaSoftwareUpdateProvider::Id) {}
-    ~OtaSoftwareUpdateProviderCluster() {}
+    ScenesCluster() : ClusterBase(app::Clusters::Scenes::Id) {}
+    ~ScenesCluster() {}
 };
 
 class DLL_EXPORT OnOffCluster : public ClusterBase
@@ -58,11 +51,18 @@ class DLL_EXPORT OnOffCluster : public ClusterBase
     ~OnOffCluster() {}
 };
 
-class DLL_EXPORT ScenesCluster : public ClusterBase
+class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
 {
 public:
-    ScenesCluster() : ClusterBase(app::Clusters::Scenes::Id) {}
-    ~ScenesCluster() {}
+    OtaSoftwareUpdateProviderCluster() : ClusterBase(app::Clusters::OtaSoftwareUpdateProvider::Id) {}
+    ~OtaSoftwareUpdateProviderCluster() {}
+};
+
+class DLL_EXPORT ColorControlCluster : public ClusterBase
+{
+public:
+    ColorControlCluster() : ClusterBase(app::Clusters::ColorControl::Id) {}
+    ~ColorControlCluster() {}
 };
 
 } // namespace Controller
diff --git a/zzz_generated/light-switch-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/light-switch-app/zap-generated/PluginApplicationCallbacks.h
index b14580ae36305a..856d83e27c638e 100644
--- a/zzz_generated/light-switch-app/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/light-switch-app/zap-generated/PluginApplicationCallbacks.h
@@ -22,31 +22,31 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterBindingPluginServerInitCallback();                                                                                       \
-    MatterColorControlPluginClientInitCallback();                                                                                  \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
     MatterIdentifyPluginClientInitCallback();                                                                                      \
     MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterGroupsPluginServerInitCallback();                                                                                        \
+    MatterScenesPluginClientInitCallback();                                                                                        \
+    MatterOnOffPluginClientInitCallback();                                                                                         \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
+    MatterBindingPluginServerInitCallback();                                                                                       \
+    MatterAccessControlPluginServerInitCallback();                                                                                 \
+    MatterBasicPluginServerInitCallback();                                                                                         \
     MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
     MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterOnOffPluginClientInitCallback();                                                                                         \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterScenesPluginClientInitCallback();                                                                                        \
+    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
     MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
+    MatterSwitchPluginServerInitCallback();                                                                                        \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
     MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();
+    MatterColorControlPluginClientInitCallback();
diff --git a/zzz_generated/light-switch-app/zap-generated/access.h b/zzz_generated/light-switch-app/zap-generated/access.h
index 7bc14573de66b3..712b9fbcf17a37 100644
--- a/zzz_generated/light-switch-app/zap-generated/access.h
+++ b/zzz_generated/light-switch-app/zap-generated/access.h
@@ -38,7 +38,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -46,6 +45,7 @@
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -60,7 +60,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -68,6 +67,7 @@
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -82,7 +82,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -90,6 +89,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -103,8 +103,8 @@
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -116,8 +116,8 @@
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -129,8 +129,8 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -138,28 +138,24 @@
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    3, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -168,32 +164,32 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    64, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
     0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
-    64, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -202,32 +198,32 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -236,6 +232,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/light-switch-app/zap-generated/gen_config.h b/zzz_generated/light-switch-app/zap-generated/gen_config.h
index 14dec40c8f55a9..39483911ffa359 100644
--- a/zzz_generated/light-switch-app/zap-generated/gen_config.h
+++ b/zzz_generated/light-switch-app/zap-generated/gen_config.h
@@ -29,168 +29,168 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
-#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_COLOR_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_IDENTIFY_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SCENES_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_ON_OFF_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ON_OFF_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SCENES_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_COLOR_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
-// Use this macro to check if the server side of the Access Control cluster is included
-#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL
+// Use this macro to check if the client side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_IDENTIFY_CLIENT
 
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
 
-// Use this macro to check if the server side of the Basic cluster is included
-#define ZCL_USING_BASIC_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BASIC_SERVER
-#define EMBER_AF_PLUGIN_BASIC
+// Use this macro to check if the server side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUPS_SERVER
+#define EMBER_AF_PLUGIN_GROUPS
 
-// Use this macro to check if the server side of the Binding cluster is included
-#define ZCL_USING_BINDING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BINDING_SERVER
-#define EMBER_AF_PLUGIN_BINDING
+// Use this macro to check if the client side of the Scenes cluster is included
+#define ZCL_USING_SCENES_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_SCENES_CLIENT
 
-// Use this macro to check if the client side of the Color Control cluster is included
-#define ZCL_USING_COLOR_CONTROL_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_COLOR_CONTROL_CLIENT
+// Use this macro to check if the client side of the On/Off cluster is included
+#define ZCL_USING_ON_OFF_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_ON_OFF_CLIENT
 
 // Use this macro to check if the server side of the Descriptor cluster is included
 #define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
 #define EMBER_AF_PLUGIN_DESCRIPTOR
 
-// Use this macro to check if the server side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
-
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
-
-// Use this macro to check if the server side of the General Commissioning cluster is included
-#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
-
-// Use this macro to check if the server side of the General Diagnostics cluster is included
-#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
+// Use this macro to check if the server side of the Binding cluster is included
+#define ZCL_USING_BINDING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BINDING_SERVER
+#define EMBER_AF_PLUGIN_BINDING
 
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+// Use this macro to check if the server side of the Access Control cluster is included
+#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL
 
-// Use this macro to check if the server side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUPS_SERVER
-#define EMBER_AF_PLUGIN_GROUPS
+// Use this macro to check if the server side of the Basic cluster is included
+#define ZCL_USING_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BASIC_SERVER
+#define EMBER_AF_PLUGIN_BASIC
 
-// Use this macro to check if the client side of the Identify cluster is included
-#define ZCL_USING_IDENTIFY_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_IDENTIFY_CLIENT
+// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
+#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
 
-// Use this macro to check if the server side of the Identify cluster is included
-#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY
+// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
+#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
 
 // Use this macro to check if the server side of the Localization Configuration cluster is included
 #define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
 #define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
 
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+
+// Use this macro to check if the server side of the General Commissioning cluster is included
+#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
+
 // Use this macro to check if the server side of the Network Commissioning cluster is included
 #define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
 
-// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
-#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
-
-// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
-#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
-
-// Use this macro to check if the client side of the On/Off cluster is included
-#define ZCL_USING_ON_OFF_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_ON_OFF_CLIENT
-
-// Use this macro to check if the server side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
 
-// Use this macro to check if the client side of the Scenes cluster is included
-#define ZCL_USING_SCENES_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_SCENES_CLIENT
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
 // Use this macro to check if the server side of the Software Diagnostics cluster is included
 #define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
 
+// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+
 // Use this macro to check if the server side of the Switch cluster is included
 #define ZCL_USING_SWITCH_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SWITCH_SERVER
 #define EMBER_AF_PLUGIN_SWITCH
 
-// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
-#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
 
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+// Use this macro to check if the server side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
 
 // Use this macro to check if the server side of the User Label cluster is included
 #define ZCL_USING_USER_LABEL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL
 
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+// Use this macro to check if the client side of the Color Control cluster is included
+#define ZCL_USING_COLOR_CONTROL_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_CLIENT
diff --git a/zzz_generated/lighting-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/lighting-app/zap-generated/PluginApplicationCallbacks.h
index 85154579b68824..fddb4d6e6cb042 100644
--- a/zzz_generated/lighting-app/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/lighting-app/zap-generated/PluginApplicationCallbacks.h
@@ -22,30 +22,30 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterColorControlPluginServerInitCallback();                                                                                  \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
     MatterIdentifyPluginServerInitCallback();                                                                                      \
+    MatterGroupsPluginServerInitCallback();                                                                                        \
+    MatterOnOffPluginServerInitCallback();                                                                                         \
     MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
+    MatterAccessControlPluginServerInitCallback();                                                                                 \
+    MatterBasicPluginServerInitCallback();                                                                                         \
     MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
     MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterOccupancySensingPluginServerInitCallback();                                                                              \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
     MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
+    MatterSwitchPluginServerInitCallback();                                                                                        \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
     MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();
+    MatterColorControlPluginServerInitCallback();                                                                                  \
+    MatterOccupancySensingPluginServerInitCallback();
diff --git a/zzz_generated/lighting-app/zap-generated/access.h b/zzz_generated/lighting-app/zap-generated/access.h
index 2806b8d11356f8..e91fbd2651251c 100644
--- a/zzz_generated/lighting-app/zap-generated/access.h
+++ b/zzz_generated/lighting-app/zap-generated/access.h
@@ -29,6 +29,8 @@
 
 // Parallel array data (*cluster*, attribute, privilege) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__CLUSTER { \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
+    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
@@ -37,23 +39,23 @@
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
-    /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
-    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
+    /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
+    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
@@ -62,23 +64,23 @@
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
-    /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
-    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
     5, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
+    /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
+    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
@@ -87,97 +89,91 @@
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
-    /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
-    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
+    /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // Parallel array data (*cluster*, attribute, privilege) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__CLUSTER { \
+    6, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    8, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
-    768, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
-    8, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    6, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
+    768, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__ATTRIBUTE { \
+    16387, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    16384, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     5, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
-    16400, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
-    16384, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    16387, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
+    16400, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__PRIVILEGE { \
+    kMatterAccessPrivilegeManage, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    3, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -186,32 +182,32 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    64, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
     0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
-    64, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -220,32 +216,32 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -254,6 +250,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/lighting-app/zap-generated/gen_config.h b/zzz_generated/lighting-app/zap-generated/gen_config.h
index efc7a77b3d5c58..6460a2243bdc9f 100644
--- a/zzz_generated/lighting-app/zap-generated/gen_config.h
+++ b/zzz_generated/lighting-app/zap-generated/gen_config.h
@@ -29,104 +29,50 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
-#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (2)
 #define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OCCUPANCY_SENSING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OCCUPANCY_SENSING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
-// Use this macro to check if the server side of the Access Control cluster is included
-#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL
-
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
-
-// Use this macro to check if the server side of the Basic cluster is included
-#define ZCL_USING_BASIC_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BASIC_SERVER
-#define EMBER_AF_PLUGIN_BASIC
-
-// Use this macro to check if the server side of the Color Control cluster is included
-#define ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_COLOR_CONTROL
-// User options for server plugin Color Control
-#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY
-#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP
-#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV
-
-// Use this macro to check if the server side of the Descriptor cluster is included
-#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR
-
-// Use this macro to check if the server side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
-
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
-
-// Use this macro to check if the server side of the General Commissioning cluster is included
-#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
-
-// Use this macro to check if the server side of the General Diagnostics cluster is included
-#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
 
 // Use this macro to check if the server side of the Groups cluster is included
 #define ZCL_USING_GROUPS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_GROUPS_SERVER
 #define EMBER_AF_PLUGIN_GROUPS
 
-// Use this macro to check if the server side of the Identify cluster is included
-#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY
+// Use this macro to check if the server side of the On/Off cluster is included
+#define ZCL_USING_ON_OFF_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF
 
 // Use this macro to check if the server side of the Level Control cluster is included
 #define ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER
@@ -137,15 +83,20 @@
 #define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0
 #define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0
 
-// Use this macro to check if the server side of the Localization Configuration cluster is included
-#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
+// Use this macro to check if the server side of the Descriptor cluster is included
+#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR
 
-// Use this macro to check if the server side of the Network Commissioning cluster is included
-#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+// Use this macro to check if the server side of the Access Control cluster is included
+#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL
+
+// Use this macro to check if the server side of the Basic cluster is included
+#define ZCL_USING_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BASIC_SERVER
+#define EMBER_AF_PLUGIN_BASIC
 
 // Use this macro to check if the client side of the OTA Software Update Provider cluster is included
 #define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
@@ -156,47 +107,96 @@
 #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
 #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
 
-// Use this macro to check if the server side of the Occupancy Sensing cluster is included
-#define ZCL_USING_OCCUPANCY_SENSING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING_SERVER
-#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING
+// Use this macro to check if the server side of the Localization Configuration cluster is included
+#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
 
-// Use this macro to check if the server side of the On/Off cluster is included
-#define ZCL_USING_ON_OFF_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
 
-// Use this macro to check if the server side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+// Use this macro to check if the server side of the General Commissioning cluster is included
+#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
+
+// Use this macro to check if the server side of the Network Commissioning cluster is included
+#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
 // Use this macro to check if the server side of the Software Diagnostics cluster is included
 #define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
 
+// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+
 // Use this macro to check if the server side of the Switch cluster is included
 #define ZCL_USING_SWITCH_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SWITCH_SERVER
 #define EMBER_AF_PLUGIN_SWITCH
 
-// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
-#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
 
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+// Use this macro to check if the server side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
 
 // Use this macro to check if the server side of the User Label cluster is included
 #define ZCL_USING_USER_LABEL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL
 
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Color Control cluster is included
+#define ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_COLOR_CONTROL
+// User options for server plugin Color Control
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV
+
+// Use this macro to check if the server side of the Occupancy Sensing cluster is included
+#define ZCL_USING_OCCUPANCY_SENSING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING_SERVER
+#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING
diff --git a/zzz_generated/lock-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/lock-app/zap-generated/PluginApplicationCallbacks.h
index 06a4d946cef149..b1961f17452cac 100644
--- a/zzz_generated/lock-app/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/lock-app/zap-generated/PluginApplicationCallbacks.h
@@ -22,28 +22,28 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
+    MatterIdentifyPluginServerInitCallback();                                                                                      \
+    MatterGroupsPluginServerInitCallback();                                                                                        \
+    MatterOnOffPluginServerInitCallback();                                                                                         \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
     MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
     MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterDoorLockPluginServerInitCallback();                                                                                      \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
     MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
     MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterPowerSourcePluginServerInitCallback();                                                                                   \
+    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
     MatterPowerSourceConfigurationPluginServerInitCallback();                                                                      \
+    MatterPowerSourcePluginServerInitCallback();                                                                                   \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
     MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
     MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();
+    MatterDoorLockPluginServerInitCallback();
diff --git a/zzz_generated/lock-app/zap-generated/access.h b/zzz_generated/lock-app/zap-generated/access.h
index 40c11608f1bec3..bbd73bb7aa9bf1 100644
--- a/zzz_generated/lock-app/zap-generated/access.h
+++ b/zzz_generated/lock-app/zap-generated/access.h
@@ -29,6 +29,7 @@
 
 // Parallel array data (*cluster*, attribute, privilege) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__CLUSTER { \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
@@ -37,14 +38,6 @@
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: Language, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: SoundVolume, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: OperatingMode, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: EnableOneTouchLocking, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: EnablePrivacyModeButton, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
@@ -52,13 +45,21 @@
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: Language, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: SoundVolume, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: OperatingMode, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: EnableOneTouchLocking, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: EnablePrivacyModeButton, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: view */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
@@ -67,14 +68,6 @@
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: Language, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: SoundVolume, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: OperatingMode, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: EnableOneTouchLocking, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: EnablePrivacyModeButton, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
@@ -82,13 +75,21 @@
     5, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: Language, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: SoundVolume, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: OperatingMode, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: EnableOneTouchLocking, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: EnablePrivacyModeButton, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: view */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
@@ -97,14 +98,6 @@
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: Language, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: SoundVolume, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: OperatingMode, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: EnableOneTouchLocking, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: EnablePrivacyModeButton, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: view */ \
-    /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
@@ -112,20 +105,31 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: Language, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: SoundVolume, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: OperatingMode, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: EnableOneTouchLocking, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: EnablePrivacyModeButton, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: view */ \
+    /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: view */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // Parallel array data (*cluster*, attribute, privilege) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__CLUSTER { \
+    6, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
     31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
+    49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
     257, /* Cluster: Door Lock, Attribute: Language, Privilege: manage */ \
     257, /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: manage */ \
     257, /* Cluster: Door Lock, Attribute: SoundVolume, Privilege: manage */ \
@@ -134,19 +138,19 @@
     257, /* Cluster: Door Lock, Attribute: EnablePrivacyModeButton, Privilege: manage */ \
     257, /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: administer */ \
     257, /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    6, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
-    65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__ATTRIBUTE { \
+    16387, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
     0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     5, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
+    4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
     33, /* Cluster: Door Lock, Attribute: Language, Privilege: manage */ \
     35, /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: manage */ \
     36, /* Cluster: Door Lock, Attribute: SoundVolume, Privilege: manage */ \
@@ -155,19 +159,19 @@
     43, /* Cluster: Door Lock, Attribute: EnablePrivacyModeButton, Privilege: manage */ \
     48, /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: administer */ \
     49, /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: administer */ \
-    0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    16387, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
-    0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__PRIVILEGE { \
+    kMatterAccessPrivilegeManage, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Door Lock, Attribute: Language, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Door Lock, Attribute: AutoRelockTime, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Door Lock, Attribute: SoundVolume, Privilege: manage */ \
@@ -176,48 +180,29 @@
     kMatterAccessPrivilegeManage, /* Cluster: Door Lock, Attribute: EnablePrivacyModeButton, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: ClearWeekDaySchedule, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: ClearYearDaySchedule, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: SetHolidaySchedule, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: GetHolidaySchedule, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: ClearHolidaySchedule, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \
-    257, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -226,42 +211,42 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: ClearWeekDaySchedule, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: ClearYearDaySchedule, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: SetHolidaySchedule, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: GetHolidaySchedule, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: ClearHolidaySchedule, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \
+    257, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    11, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \
-    12, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \
-    13, /* Cluster: Door Lock, Command: ClearWeekDaySchedule, Privilege: administer */ \
-    14, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \
-    15, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \
-    16, /* Cluster: Door Lock, Command: ClearYearDaySchedule, Privilege: administer */ \
-    17, /* Cluster: Door Lock, Command: SetHolidaySchedule, Privilege: administer */ \
-    18, /* Cluster: Door Lock, Command: GetHolidaySchedule, Privilege: administer */ \
-    19, /* Cluster: Door Lock, Command: ClearHolidaySchedule, Privilege: administer */ \
-    26, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \
-    27, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \
-    29, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \
-    34, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \
-    36, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \
-    38, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \
-    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -270,42 +255,42 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    11, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \
+    12, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \
+    13, /* Cluster: Door Lock, Command: ClearWeekDaySchedule, Privilege: administer */ \
+    14, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \
+    15, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \
+    16, /* Cluster: Door Lock, Command: ClearYearDaySchedule, Privilege: administer */ \
+    17, /* Cluster: Door Lock, Command: SetHolidaySchedule, Privilege: administer */ \
+    18, /* Cluster: Door Lock, Command: GetHolidaySchedule, Privilege: administer */ \
+    19, /* Cluster: Door Lock, Command: ClearHolidaySchedule, Privilege: administer */ \
+    26, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \
+    27, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \
+    29, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \
+    34, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \
+    36, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \
+    38, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearWeekDaySchedule, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearYearDaySchedule, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetHolidaySchedule, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetHolidaySchedule, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearHolidaySchedule, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -314,6 +299,21 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearWeekDaySchedule, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearYearDaySchedule, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetHolidaySchedule, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetHolidaySchedule, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearHolidaySchedule, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/lock-app/zap-generated/gen_config.h b/zzz_generated/lock-app/zap-generated/gen_config.h
index 38cfa7f1165da7..b508971a0f6a75 100644
--- a/zzz_generated/lock-app/zap-generated/gen_config.h
+++ b/zzz_generated/lock-app/zap-generated/gen_config.h
@@ -29,103 +29,63 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
+#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
 #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_POWER_SOURCE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
-// Use this macro to check if the server side of the Access Control cluster is included
-#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
 
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
+// Use this macro to check if the server side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUPS_SERVER
+#define EMBER_AF_PLUGIN_GROUPS
 
-// Use this macro to check if the server side of the Basic cluster is included
-#define ZCL_USING_BASIC_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BASIC_SERVER
-#define EMBER_AF_PLUGIN_BASIC
+// Use this macro to check if the server side of the On/Off cluster is included
+#define ZCL_USING_ON_OFF_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF
 
 // Use this macro to check if the server side of the Descriptor cluster is included
 #define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
 #define EMBER_AF_PLUGIN_DESCRIPTOR
 
-// Use this macro to check if the server side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
-
-// Use this macro to check if the server side of the Door Lock cluster is included
-#define ZCL_USING_DOOR_LOCK_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DOOR_LOCK_SERVER
-#define EMBER_AF_PLUGIN_DOOR_LOCK
-
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
-
-// Use this macro to check if the server side of the General Commissioning cluster is included
-#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
-
-// Use this macro to check if the server side of the General Diagnostics cluster is included
-#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUPS_SERVER
-#define EMBER_AF_PLUGIN_GROUPS
-
-// Use this macro to check if the server side of the Identify cluster is included
-#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY
-
-// Use this macro to check if the server side of the Localization Configuration cluster is included
-#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
+// Use this macro to check if the server side of the Access Control cluster is included
+#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL
 
-// Use this macro to check if the server side of the Network Commissioning cluster is included
-#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+// Use this macro to check if the server side of the Basic cluster is included
+#define ZCL_USING_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BASIC_SERVER
+#define EMBER_AF_PLUGIN_BASIC
 
 // Use this macro to check if the client side of the OTA Software Update Provider cluster is included
 #define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
@@ -136,25 +96,45 @@
 #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
 #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
 
-// Use this macro to check if the server side of the On/Off cluster is included
-#define ZCL_USING_ON_OFF_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF
+// Use this macro to check if the server side of the Localization Configuration cluster is included
+#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
 
-// Use this macro to check if the server side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+
+// Use this macro to check if the server side of the Power Source Configuration cluster is included
+#define ZCL_USING_POWER_SOURCE_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_POWER_SOURCE_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_POWER_SOURCE_CONFIGURATION
 
 // Use this macro to check if the server side of the Power Source cluster is included
 #define ZCL_USING_POWER_SOURCE_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_POWER_SOURCE_SERVER
 #define EMBER_AF_PLUGIN_POWER_SOURCE
 
-// Use this macro to check if the server side of the Power Source Configuration cluster is included
-#define ZCL_USING_POWER_SOURCE_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_POWER_SOURCE_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_POWER_SOURCE_CONFIGURATION
+// Use this macro to check if the server side of the General Commissioning cluster is included
+#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
+
+// Use this macro to check if the server side of the Network Commissioning cluster is included
+#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
 // Use this macro to check if the server side of the Software Diagnostics cluster is included
 #define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
@@ -166,17 +146,37 @@
 #define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
 
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
+
+// Use this macro to check if the server side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
 
 // Use this macro to check if the server side of the User Label cluster is included
 #define ZCL_USING_USER_LABEL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL
 
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Door Lock cluster is included
+#define ZCL_USING_DOOR_LOCK_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DOOR_LOCK_SERVER
+#define EMBER_AF_PLUGIN_DOOR_LOCK
diff --git a/zzz_generated/log-source-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/log-source-app/zap-generated/PluginApplicationCallbacks.h
index 0a323d148f5bcb..6ba8ead67775f7 100644
--- a/zzz_generated/log-source-app/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/log-source-app/zap-generated/PluginApplicationCallbacks.h
@@ -23,8 +23,8 @@
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
     MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterDiagnosticLogsPluginClientInitCallback();                                                                                \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
     MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
     MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDiagnosticLogsPluginClientInitCallback();                                                                                \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
     MatterOperationalCredentialsPluginServerInitCallback();
diff --git a/zzz_generated/log-source-app/zap-generated/gen_config.h b/zzz_generated/log-source-app/zap-generated/gen_config.h
index f7092e4e347825..765e7ab15221cf 100644
--- a/zzz_generated/log-source-app/zap-generated/gen_config.h
+++ b/zzz_generated/log-source-app/zap-generated/gen_config.h
@@ -30,10 +30,10 @@
 
 /**** Cluster endpoint counts ****/
 #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
@@ -43,15 +43,6 @@
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL
 
-// Use this macro to check if the client side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_CLIENT
-
-// Use this macro to check if the server side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
-
 // Use this macro to check if the server side of the General Commissioning cluster is included
 #define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
@@ -62,6 +53,15 @@
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
 
+// Use this macro to check if the client side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_CLIENT
+
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+
 // Use this macro to check if the server side of the Operational Credentials cluster is included
 #define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
diff --git a/zzz_generated/ota-provider-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/ota-provider-app/zap-generated/PluginApplicationCallbacks.h
index d00c484293f91f..ab1922e3b8547b 100644
--- a/zzz_generated/ota-provider-app/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/ota-provider-app/zap-generated/PluginApplicationCallbacks.h
@@ -24,15 +24,15 @@
 #define MATTER_PLUGINS_INIT                                                                                                        \
     MatterAccessControlPluginClientInitCallback();                                                                                 \
     MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
     MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterOtaSoftwareUpdateProviderPluginServerInitCallback();                                                                     \
     MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
     MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterOtaSoftwareUpdateProviderPluginServerInitCallback();                                                                     \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
     MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
     MatterUserLabelPluginServerInitCallback();
diff --git a/zzz_generated/ota-provider-app/zap-generated/access.h b/zzz_generated/ota-provider-app/zap-generated/access.h
index ddef6692699751..9c0ec040c2e21e 100644
--- a/zzz_generated/ota-provider-app/zap-generated/access.h
+++ b/zzz_generated/ota-provider-app/zap-generated/access.h
@@ -38,7 +38,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -46,6 +45,7 @@
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -60,7 +60,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -68,6 +67,7 @@
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -82,7 +82,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -90,6 +89,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -103,8 +103,8 @@
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -116,8 +116,8 @@
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -129,8 +129,8 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -138,22 +138,18 @@
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -162,26 +158,26 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -190,26 +186,26 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -218,6 +214,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/ota-provider-app/zap-generated/gen_config.h b/zzz_generated/ota-provider-app/zap-generated/gen_config.h
index 02949858e5f74d..9cb2ad12b81a37 100644
--- a/zzz_generated/ota-provider-app/zap-generated/gen_config.h
+++ b/zzz_generated/ota-provider-app/zap-generated/gen_config.h
@@ -31,17 +31,17 @@
 /**** Cluster endpoint counts ****/
 #define EMBER_AF_ACCESS_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OTA_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OTA_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
@@ -55,60 +55,60 @@
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL
 
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
-
 // Use this macro to check if the server side of the Basic cluster is included
 #define ZCL_USING_BASIC_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_BASIC_SERVER
 #define EMBER_AF_PLUGIN_BASIC
 
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
-
-// Use this macro to check if the server side of the General Commissioning cluster is included
-#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
-
-// Use this macro to check if the server side of the General Diagnostics cluster is included
-#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+// Use this macro to check if the server side of the OTA Software Update Provider cluster is included
+#define ZCL_USING_OTA_PROVIDER_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER
 
 // Use this macro to check if the server side of the Localization Configuration cluster is included
 #define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
 #define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
 
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+
+// Use this macro to check if the server side of the General Commissioning cluster is included
+#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
+
 // Use this macro to check if the server side of the Network Commissioning cluster is included
 #define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
 
-// Use this macro to check if the server side of the OTA Software Update Provider cluster is included
-#define ZCL_USING_OTA_PROVIDER_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
+
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
 
 // Use this macro to check if the server side of the Operational Credentials cluster is included
 #define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
 #define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
 
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
 
 // Use this macro to check if the server side of the User Label cluster is included
 #define ZCL_USING_USER_LABEL_CLUSTER_SERVER
diff --git a/zzz_generated/ota-requestor-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/ota-requestor-app/zap-generated/PluginApplicationCallbacks.h
index 3ff72a3bcdb136..301509a2bc2374 100644
--- a/zzz_generated/ota-requestor-app/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/ota-requestor-app/zap-generated/PluginApplicationCallbacks.h
@@ -23,16 +23,16 @@
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
     MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
     MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
     MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
     MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
     MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
     MatterUserLabelPluginServerInitCallback();
diff --git a/zzz_generated/ota-requestor-app/zap-generated/access.h b/zzz_generated/ota-requestor-app/zap-generated/access.h
index ddef6692699751..9c0ec040c2e21e 100644
--- a/zzz_generated/ota-requestor-app/zap-generated/access.h
+++ b/zzz_generated/ota-requestor-app/zap-generated/access.h
@@ -38,7 +38,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -46,6 +45,7 @@
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -60,7 +60,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -68,6 +67,7 @@
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -82,7 +82,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -90,6 +89,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -103,8 +103,8 @@
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -116,8 +116,8 @@
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -129,8 +129,8 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -138,22 +138,18 @@
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -162,26 +158,26 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -190,26 +186,26 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -218,6 +214,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/ota-requestor-app/zap-generated/gen_config.h b/zzz_generated/ota-requestor-app/zap-generated/gen_config.h
index 45f325a260e353..65bf0bbf4e8eea 100644
--- a/zzz_generated/ota-requestor-app/zap-generated/gen_config.h
+++ b/zzz_generated/ota-requestor-app/zap-generated/gen_config.h
@@ -30,18 +30,18 @@
 
 /**** Cluster endpoint counts ****/
 #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (2)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
@@ -51,64 +51,64 @@
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL
 
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
-
 // Use this macro to check if the server side of the Basic cluster is included
 #define ZCL_USING_BASIC_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_BASIC_SERVER
 #define EMBER_AF_PLUGIN_BASIC
 
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
-
-// Use this macro to check if the server side of the General Commissioning cluster is included
-#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
-
-// Use this macro to check if the server side of the General Diagnostics cluster is included
-#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
+// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
+#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
 
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
+#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
 
 // Use this macro to check if the server side of the Localization Configuration cluster is included
 #define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
 #define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
 
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+
+// Use this macro to check if the server side of the General Commissioning cluster is included
+#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
+
 // Use this macro to check if the server side of the Network Commissioning cluster is included
 #define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
 
-// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
-#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
-// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
-#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
 
 // Use this macro to check if the server side of the Operational Credentials cluster is included
 #define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
 #define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
 
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
 
 // Use this macro to check if the server side of the User Label cluster is included
 #define ZCL_USING_USER_LABEL_CLUSTER_SERVER
diff --git a/zzz_generated/placeholder/app1/zap-generated/CHIPClientCallbacks.h b/zzz_generated/placeholder/app1/zap-generated/CHIPClientCallbacks.h
index f362f436b94fc7..0f50adab2d2f62 100644
--- a/zzz_generated/placeholder/app1/zap-generated/CHIPClientCallbacks.h
+++ b/zzz_generated/placeholder/app1/zap-generated/CHIPClientCallbacks.h
@@ -30,34 +30,24 @@
 #include <lib/support/Span.h>
 
 // List specific responses
-typedef void (*ApplicationBasicAllowedVendorListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::VendorId> & data);
-typedef void (*ApplicationBasicGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ApplicationBasicAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ApplicationBasicAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ContentLauncherAcceptHeaderListAttributeCallback)(void * context,
-                                                                 const chip::app::DataModel::DecodableList<chip::CharSpan> & data);
-typedef void (*ContentLauncherGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ContentLauncherAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ContentLauncherAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*GeneralCommissioningGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*GeneralCommissioningAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*GeneralCommissioningAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*KeypadInputGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*KeypadInputAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*KeypadInputAttributeListListAttributeCallback)(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*SwitchGeneratedCommandListListAttributeCallback)(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*SwitchAcceptedCommandListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*SwitchAttributeListListAttributeCallback)(void * context,
+                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*OperationalCredentialsFabricsListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & data);
+typedef void (*OperationalCredentialsTrustedRootCertificatesListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & data);
 typedef void (*ModeSelectSupportedModesListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType> & data);
@@ -67,24 +57,18 @@ typedef void (*ModeSelectAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*ModeSelectAttributeListListAttributeCallback)(void * context,
                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*OperationalCredentialsFabricsListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & data);
-typedef void (*OperationalCredentialsTrustedRootCertificatesListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & data);
+typedef void (*ThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ThermostatUserInterfaceConfigurationAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*RelativeHumidityMeasurementGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*RelativeHumidityMeasurementAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*RelativeHumidityMeasurementAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*SwitchGeneratedCommandListListAttributeCallback)(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*SwitchAcceptedCommandListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*SwitchAttributeListListAttributeCallback)(void * context,
-                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*TargetNavigatorTargetListListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType> & data);
@@ -94,9 +78,25 @@ typedef void (*TargetNavigatorAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*TargetNavigatorAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallback)(
+typedef void (*KeypadInputGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallback)(
+typedef void (*KeypadInputAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ThermostatUserInterfaceConfigurationAttributeListListAttributeCallback)(
+typedef void (*KeypadInputAttributeListListAttributeCallback)(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*ContentLauncherAcceptHeaderListAttributeCallback)(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::CharSpan> & data);
+typedef void (*ContentLauncherGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ContentLauncherAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ContentLauncherAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*ApplicationBasicAllowedVendorListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::VendorId> & data);
+typedef void (*ApplicationBasicGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ApplicationBasicAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ApplicationBasicAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
diff --git a/zzz_generated/placeholder/app1/zap-generated/CHIPClusters.h b/zzz_generated/placeholder/app1/zap-generated/CHIPClusters.h
index df3cdd4ae885f0..ca68fad85bc593 100644
--- a/zzz_generated/placeholder/app1/zap-generated/CHIPClusters.h
+++ b/zzz_generated/placeholder/app1/zap-generated/CHIPClusters.h
@@ -30,32 +30,32 @@
 namespace chip {
 namespace Controller {
 
-class DLL_EXPORT ApplicationBasicCluster : public ClusterBase
+class DLL_EXPORT OnOffCluster : public ClusterBase
 {
 public:
-    ApplicationBasicCluster() : ClusterBase(app::Clusters::ApplicationBasic::Id) {}
-    ~ApplicationBasicCluster() {}
+    OnOffCluster() : ClusterBase(app::Clusters::OnOff::Id) {}
+    ~OnOffCluster() {}
 };
 
-class DLL_EXPORT ContentLauncherCluster : public ClusterBase
+class DLL_EXPORT GeneralCommissioningCluster : public ClusterBase
 {
 public:
-    ContentLauncherCluster() : ClusterBase(app::Clusters::ContentLauncher::Id) {}
-    ~ContentLauncherCluster() {}
+    GeneralCommissioningCluster() : ClusterBase(app::Clusters::GeneralCommissioning::Id) {}
+    ~GeneralCommissioningCluster() {}
 };
 
-class DLL_EXPORT GeneralCommissioningCluster : public ClusterBase
+class DLL_EXPORT SwitchCluster : public ClusterBase
 {
 public:
-    GeneralCommissioningCluster() : ClusterBase(app::Clusters::GeneralCommissioning::Id) {}
-    ~GeneralCommissioningCluster() {}
+    SwitchCluster() : ClusterBase(app::Clusters::Switch::Id) {}
+    ~SwitchCluster() {}
 };
 
-class DLL_EXPORT KeypadInputCluster : public ClusterBase
+class DLL_EXPORT OperationalCredentialsCluster : public ClusterBase
 {
 public:
-    KeypadInputCluster() : ClusterBase(app::Clusters::KeypadInput::Id) {}
-    ~KeypadInputCluster() {}
+    OperationalCredentialsCluster() : ClusterBase(app::Clusters::OperationalCredentials::Id) {}
+    ~OperationalCredentialsCluster() {}
 };
 
 class DLL_EXPORT ModeSelectCluster : public ClusterBase
@@ -65,18 +65,18 @@ class DLL_EXPORT ModeSelectCluster : public ClusterBase
     ~ModeSelectCluster() {}
 };
 
-class DLL_EXPORT OnOffCluster : public ClusterBase
+class DLL_EXPORT ThermostatUserInterfaceConfigurationCluster : public ClusterBase
 {
 public:
-    OnOffCluster() : ClusterBase(app::Clusters::OnOff::Id) {}
-    ~OnOffCluster() {}
+    ThermostatUserInterfaceConfigurationCluster() : ClusterBase(app::Clusters::ThermostatUserInterfaceConfiguration::Id) {}
+    ~ThermostatUserInterfaceConfigurationCluster() {}
 };
 
-class DLL_EXPORT OperationalCredentialsCluster : public ClusterBase
+class DLL_EXPORT TemperatureMeasurementCluster : public ClusterBase
 {
 public:
-    OperationalCredentialsCluster() : ClusterBase(app::Clusters::OperationalCredentials::Id) {}
-    ~OperationalCredentialsCluster() {}
+    TemperatureMeasurementCluster() : ClusterBase(app::Clusters::TemperatureMeasurement::Id) {}
+    ~TemperatureMeasurementCluster() {}
 };
 
 class DLL_EXPORT RelativeHumidityMeasurementCluster : public ClusterBase
@@ -86,32 +86,32 @@ class DLL_EXPORT RelativeHumidityMeasurementCluster : public ClusterBase
     ~RelativeHumidityMeasurementCluster() {}
 };
 
-class DLL_EXPORT SwitchCluster : public ClusterBase
+class DLL_EXPORT TargetNavigatorCluster : public ClusterBase
 {
 public:
-    SwitchCluster() : ClusterBase(app::Clusters::Switch::Id) {}
-    ~SwitchCluster() {}
+    TargetNavigatorCluster() : ClusterBase(app::Clusters::TargetNavigator::Id) {}
+    ~TargetNavigatorCluster() {}
 };
 
-class DLL_EXPORT TargetNavigatorCluster : public ClusterBase
+class DLL_EXPORT KeypadInputCluster : public ClusterBase
 {
 public:
-    TargetNavigatorCluster() : ClusterBase(app::Clusters::TargetNavigator::Id) {}
-    ~TargetNavigatorCluster() {}
+    KeypadInputCluster() : ClusterBase(app::Clusters::KeypadInput::Id) {}
+    ~KeypadInputCluster() {}
 };
 
-class DLL_EXPORT TemperatureMeasurementCluster : public ClusterBase
+class DLL_EXPORT ContentLauncherCluster : public ClusterBase
 {
 public:
-    TemperatureMeasurementCluster() : ClusterBase(app::Clusters::TemperatureMeasurement::Id) {}
-    ~TemperatureMeasurementCluster() {}
+    ContentLauncherCluster() : ClusterBase(app::Clusters::ContentLauncher::Id) {}
+    ~ContentLauncherCluster() {}
 };
 
-class DLL_EXPORT ThermostatUserInterfaceConfigurationCluster : public ClusterBase
+class DLL_EXPORT ApplicationBasicCluster : public ClusterBase
 {
 public:
-    ThermostatUserInterfaceConfigurationCluster() : ClusterBase(app::Clusters::ThermostatUserInterfaceConfiguration::Id) {}
-    ~ThermostatUserInterfaceConfigurationCluster() {}
+    ApplicationBasicCluster() : ClusterBase(app::Clusters::ApplicationBasic::Id) {}
+    ~ApplicationBasicCluster() {}
 };
 
 } // namespace Controller
diff --git a/zzz_generated/placeholder/app1/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/placeholder/app1/zap-generated/PluginApplicationCallbacks.h
index 19ec4706283a4e..9e8ed200958a8f 100644
--- a/zzz_generated/placeholder/app1/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/placeholder/app1/zap-generated/PluginApplicationCallbacks.h
@@ -22,50 +22,50 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterApplicationBasicPluginClientInitCallback();                                                                              \
-    MatterApplicationBasicPluginServerInitCallback();                                                                              \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterBooleanStatePluginServerInitCallback();                                                                                  \
-    MatterBridgedActionsPluginServerInitCallback();                                                                                \
-    MatterColorControlPluginServerInitCallback();                                                                                  \
-    MatterContentLauncherPluginClientInitCallback();                                                                               \
-    MatterContentLauncherPluginServerInitCallback();                                                                               \
+    MatterIdentifyPluginServerInitCallback();                                                                                      \
+    MatterGroupsPluginServerInitCallback();                                                                                        \
+    MatterScenesPluginServerInitCallback();                                                                                        \
+    MatterOnOffPluginClientInitCallback();                                                                                         \
+    MatterOnOffPluginServerInitCallback();                                                                                         \
+    MatterLevelControlPluginServerInitCallback();                                                                                  \
     MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFlowMeasurementPluginServerInitCallback();                                                                               \
+    MatterBridgedActionsPluginServerInitCallback();                                                                                \
+    MatterBasicPluginServerInitCallback();                                                                                         \
+    MatterPowerSourceConfigurationPluginServerInitCallback();                                                                      \
+    MatterPowerSourcePluginServerInitCallback();                                                                                   \
     MatterGeneralCommissioningPluginClientInitCallback();                                                                          \
     MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterIlluminanceMeasurementPluginServerInitCallback();                                                                        \
-    MatterKeypadInputPluginClientInitCallback();                                                                                   \
-    MatterKeypadInputPluginServerInitCallback();                                                                                   \
-    MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterModeSelectPluginClientInitCallback();                                                                                    \
-    MatterModeSelectPluginServerInitCallback();                                                                                    \
     MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterOnOffPluginClientInitCallback();                                                                                         \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
+    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
+    MatterSwitchPluginClientInitCallback();                                                                                        \
+    MatterSwitchPluginServerInitCallback();                                                                                        \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
     MatterOperationalCredentialsPluginClientInitCallback();                                                                        \
     MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterPowerSourcePluginServerInitCallback();                                                                                   \
-    MatterPowerSourceConfigurationPluginServerInitCallback();                                                                      \
-    MatterPressureMeasurementPluginServerInitCallback();                                                                           \
+    MatterBooleanStatePluginServerInitCallback();                                                                                  \
+    MatterModeSelectPluginClientInitCallback();                                                                                    \
+    MatterModeSelectPluginServerInitCallback();                                                                                    \
+    MatterWindowCoveringPluginServerInitCallback();                                                                                \
     MatterPumpConfigurationAndControlPluginServerInitCallback();                                                                   \
+    MatterThermostatPluginServerInitCallback();                                                                                    \
+    MatterThermostatUserInterfaceConfigurationPluginClientInitCallback();                                                          \
+    MatterThermostatUserInterfaceConfigurationPluginServerInitCallback();                                                          \
+    MatterColorControlPluginServerInitCallback();                                                                                  \
+    MatterIlluminanceMeasurementPluginServerInitCallback();                                                                        \
+    MatterTemperatureMeasurementPluginClientInitCallback();                                                                        \
+    MatterTemperatureMeasurementPluginServerInitCallback();                                                                        \
+    MatterPressureMeasurementPluginServerInitCallback();                                                                           \
+    MatterFlowMeasurementPluginServerInitCallback();                                                                               \
     MatterRelativeHumidityMeasurementPluginClientInitCallback();                                                                   \
     MatterRelativeHumidityMeasurementPluginServerInitCallback();                                                                   \
-    MatterScenesPluginServerInitCallback();                                                                                        \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterSwitchPluginClientInitCallback();                                                                                        \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
     MatterTargetNavigatorPluginClientInitCallback();                                                                               \
     MatterTargetNavigatorPluginServerInitCallback();                                                                               \
-    MatterTemperatureMeasurementPluginClientInitCallback();                                                                        \
-    MatterTemperatureMeasurementPluginServerInitCallback();                                                                        \
-    MatterThermostatPluginServerInitCallback();                                                                                    \
-    MatterThermostatUserInterfaceConfigurationPluginClientInitCallback();                                                          \
-    MatterThermostatUserInterfaceConfigurationPluginServerInitCallback();                                                          \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterWindowCoveringPluginServerInitCallback();
+    MatterKeypadInputPluginClientInitCallback();                                                                                   \
+    MatterKeypadInputPluginServerInitCallback();                                                                                   \
+    MatterContentLauncherPluginClientInitCallback();                                                                               \
+    MatterContentLauncherPluginServerInitCallback();                                                                               \
+    MatterApplicationBasicPluginClientInitCallback();                                                                              \
+    MatterApplicationBasicPluginServerInitCallback();
diff --git a/zzz_generated/placeholder/app1/zap-generated/access.h b/zzz_generated/placeholder/app1/zap-generated/access.h
index 005d2e04e93ba7..7a0fd667d6e169 100644
--- a/zzz_generated/placeholder/app1/zap-generated/access.h
+++ b/zzz_generated/placeholder/app1/zap-generated/access.h
@@ -29,10 +29,10 @@
 
 // Parallel array data (*cluster*, attribute, privilege) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__CLUSTER { \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
-    /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
@@ -40,7 +40,7 @@
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
+    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \
@@ -54,15 +54,15 @@
     /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \
-    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
+    /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
-    /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
@@ -70,7 +70,7 @@
     5, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
+    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \
@@ -84,15 +84,15 @@
     /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \
-    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
+    /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
-    /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
@@ -100,7 +100,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
+    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \
@@ -114,20 +114,20 @@
     /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \
-    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
+    /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // Parallel array data (*cluster*, attribute, privilege) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__CLUSTER { \
+    6, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
     40, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
-    768, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    6, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    258, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
     512, /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: manage */ \
     512, /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: manage */ \
     512, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \
@@ -141,18 +141,18 @@
     513, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \
     516, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \
     516, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \
-    258, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
+    768, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__ATTRIBUTE { \
+    16387, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
     5, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
-    16400, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    16387, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    23, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
     21, /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: manage */ \
     23, /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: manage */ \
     32, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \
@@ -166,18 +166,18 @@
     28, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \
     1, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \
     2, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \
-    23, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
+    16400, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__PRIVILEGE { \
+    kMatterAccessPrivilegeManage, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \
@@ -191,30 +191,34 @@
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -223,31 +227,31 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -256,31 +260,31 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -289,10 +293,6 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/placeholder/app1/zap-generated/gen_config.h b/zzz_generated/placeholder/app1/zap-generated/gen_config.h
index 543f3529c0a3da..cbc7db12fc7ef2 100644
--- a/zzz_generated/placeholder/app1/zap-generated/gen_config.h
+++ b/zzz_generated/placeholder/app1/zap-generated/gen_config.h
@@ -29,117 +29,125 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_APPLICATION_BASIC_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_BOOLEAN_STATE_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BRIDGED_ACTIONS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ON_OFF_CLUSTER_CLIENT_ENDPOINT_COUNT (2)
+#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BRIDGED_ACTIONS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_POWER_SOURCE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_KEYPAD_INPUT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_MODE_SELECT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ON_OFF_CLUSTER_CLIENT_ENDPOINT_COUNT (2)
-#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SWITCH_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_POWER_SOURCE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BOOLEAN_STATE_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_MODE_SELECT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_PUMP_CONFIG_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_THERMOSTAT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SWITCH_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_TARGET_NAVIGATOR_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_THERMOSTAT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_KEYPAD_INPUT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_APPLICATION_BASIC_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
-
-// Use this macro to check if the client side of the Application Basic cluster is included
-#define ZCL_USING_APPLICATION_BASIC_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_APPLICATION_BASIC_CLIENT
-
-// Use this macro to check if the server side of the Application Basic cluster is included
-#define ZCL_USING_APPLICATION_BASIC_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_APPLICATION_BASIC_SERVER
-#define EMBER_AF_PLUGIN_APPLICATION_BASIC
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
 
-// Use this macro to check if the server side of the Basic cluster is included
-#define ZCL_USING_BASIC_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BASIC_SERVER
-#define EMBER_AF_PLUGIN_BASIC
+// Use this macro to check if the server side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUPS_SERVER
+#define EMBER_AF_PLUGIN_GROUPS
 
-// Use this macro to check if the server side of the Boolean State cluster is included
-#define ZCL_USING_BOOLEAN_STATE_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BOOLEAN_STATE_SERVER
-#define EMBER_AF_PLUGIN_BOOLEAN_STATE
+// Use this macro to check if the server side of the Scenes cluster is included
+#define ZCL_USING_SCENES_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SCENES_SERVER
+#define EMBER_AF_PLUGIN_SCENES
+// User options for server plugin Scenes
+// Cluster spec 1.4.8.2
+#ifdef CHIP_CONFIG_MAX_SCENES_PER_FABRIC
+#define MATTER_SCENES_TABLE_SIZE CHIP_CONFIG_MAX_SCENES_PER_FABRIC
+#else
+#define MATTER_SCENES_TABLE_SIZE 16
+#endif
 
-// Use this macro to check if the server side of the Bridged Actions cluster is included
-#define ZCL_USING_BRIDGED_ACTIONS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS_SERVER
-#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS
+// Scenes FeatureMap Attribute Toggle Scenes Name feature
+// App cluster specs 1.4.4
+#define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
+#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0000 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
 
-// Use this macro to check if the server side of the Color Control cluster is included
-#define ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_COLOR_CONTROL
-// User options for server plugin Color Control
-#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY
-#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP
-#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV
+// Use this macro to check if the client side of the On/Off cluster is included
+#define ZCL_USING_ON_OFF_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_ON_OFF_CLIENT
 
-// Use this macro to check if the client side of the Content Launcher cluster is included
-#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_CLIENT
+// Use this macro to check if the server side of the On/Off cluster is included
+#define ZCL_USING_ON_OFF_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF
 
-// Use this macro to check if the server side of the Content Launcher cluster is included
-#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_SERVER
-#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER
+// Use this macro to check if the server side of the Level Control cluster is included
+#define ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL
+// User options for server plugin Level Control
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL 254
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0
 
 // Use this macro to check if the server side of the Descriptor cluster is included
 #define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
 #define EMBER_AF_PLUGIN_DESCRIPTOR
 
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Bridged Actions cluster is included
+#define ZCL_USING_BRIDGED_ACTIONS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS_SERVER
+#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS
 
-// Use this macro to check if the server side of the Flow Measurement cluster is included
-#define ZCL_USING_FLOW_MEASUREMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT_SERVER
-#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT
+// Use this macro to check if the server side of the Basic cluster is included
+#define ZCL_USING_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BASIC_SERVER
+#define EMBER_AF_PLUGIN_BASIC
+
+// Use this macro to check if the server side of the Power Source Configuration cluster is included
+#define ZCL_USING_POWER_SOURCE_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_POWER_SOURCE_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_POWER_SOURCE_CONFIGURATION
+
+// Use this macro to check if the server side of the Power Source cluster is included
+#define ZCL_USING_POWER_SOURCE_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_POWER_SOURCE_SERVER
+#define EMBER_AF_PLUGIN_POWER_SOURCE
 
 // Use this macro to check if the client side of the General Commissioning cluster is included
 #define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_CLIENT
@@ -150,43 +158,58 @@
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
 
+// Use this macro to check if the server side of the Network Commissioning cluster is included
+#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+
 // Use this macro to check if the server side of the General Diagnostics cluster is included
 #define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
-// Use this macro to check if the server side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUPS_SERVER
-#define EMBER_AF_PLUGIN_GROUPS
+// Use this macro to check if the server side of the Software Diagnostics cluster is included
+#define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
 
-// Use this macro to check if the server side of the Identify cluster is included
-#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
 
-// Use this macro to check if the server side of the Illuminance Measurement cluster is included
-#define ZCL_USING_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT_SERVER
-#define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
 
-// Use this macro to check if the client side of the Keypad Input cluster is included
-#define ZCL_USING_KEYPAD_INPUT_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_KEYPAD_INPUT_CLIENT
+// Use this macro to check if the client side of the Switch cluster is included
+#define ZCL_USING_SWITCH_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_SWITCH_CLIENT
 
-// Use this macro to check if the server side of the Keypad Input cluster is included
-#define ZCL_USING_KEYPAD_INPUT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_KEYPAD_INPUT_SERVER
-#define EMBER_AF_PLUGIN_KEYPAD_INPUT
+// Use this macro to check if the server side of the Switch cluster is included
+#define ZCL_USING_SWITCH_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SWITCH_SERVER
+#define EMBER_AF_PLUGIN_SWITCH
 
-// Use this macro to check if the server side of the Level Control cluster is included
-#define ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL
-// User options for server plugin Level Control
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL 254
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
+
+// Use this macro to check if the client side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_CLIENT
+
+// Use this macro to check if the server side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+
+// Use this macro to check if the server side of the Boolean State cluster is included
+#define ZCL_USING_BOOLEAN_STATE_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BOOLEAN_STATE_SERVER
+#define EMBER_AF_PLUGIN_BOOLEAN_STATE
 
 // Use this macro to check if the client side of the Mode Select cluster is included
 #define ZCL_USING_MODE_SELECT_CLUSTER_CLIENT
@@ -197,48 +220,62 @@
 #define EMBER_AF_PLUGIN_MODE_SELECT_SERVER
 #define EMBER_AF_PLUGIN_MODE_SELECT
 
-// Use this macro to check if the server side of the Network Commissioning cluster is included
-#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+// Use this macro to check if the server side of the Window Covering cluster is included
+#define ZCL_USING_WINDOW_COVERING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WINDOW_COVERING_SERVER
+#define EMBER_AF_PLUGIN_WINDOW_COVERING
 
-// Use this macro to check if the client side of the On/Off cluster is included
-#define ZCL_USING_ON_OFF_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_ON_OFF_CLIENT
+// Use this macro to check if the server side of the Pump Configuration and Control cluster is included
+#define ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL
 
-// Use this macro to check if the server side of the On/Off cluster is included
-#define ZCL_USING_ON_OFF_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF
+// Use this macro to check if the server side of the Thermostat cluster is included
+#define ZCL_USING_THERMOSTAT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THERMOSTAT_SERVER
+#define EMBER_AF_PLUGIN_THERMOSTAT
 
-// Use this macro to check if the client side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_CLIENT
+// Use this macro to check if the client side of the Thermostat User Interface Configuration cluster is included
+#define ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLIENT
 
-// Use this macro to check if the server side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+// Use this macro to check if the server side of the Thermostat User Interface Configuration cluster is included
+#define ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION
 
-// Use this macro to check if the server side of the Power Source cluster is included
-#define ZCL_USING_POWER_SOURCE_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_POWER_SOURCE_SERVER
-#define EMBER_AF_PLUGIN_POWER_SOURCE
+// Use this macro to check if the server side of the Color Control cluster is included
+#define ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_COLOR_CONTROL
+// User options for server plugin Color Control
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV
 
-// Use this macro to check if the server side of the Power Source Configuration cluster is included
-#define ZCL_USING_POWER_SOURCE_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_POWER_SOURCE_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_POWER_SOURCE_CONFIGURATION
+// Use this macro to check if the server side of the Illuminance Measurement cluster is included
+#define ZCL_USING_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT_SERVER
+#define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT
+
+// Use this macro to check if the client side of the Temperature Measurement cluster is included
+#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_CLIENT
+
+// Use this macro to check if the server side of the Temperature Measurement cluster is included
+#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER
+#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT
 
 // Use this macro to check if the server side of the Pressure Measurement cluster is included
 #define ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_PRESSURE_MEASUREMENT_SERVER
 #define EMBER_AF_PLUGIN_PRESSURE_MEASUREMENT
 
-// Use this macro to check if the server side of the Pump Configuration and Control cluster is included
-#define ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL
+// Use this macro to check if the server side of the Flow Measurement cluster is included
+#define ZCL_USING_FLOW_MEASUREMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT_SERVER
+#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT
 
 // Use this macro to check if the client side of the Relative Humidity Measurement cluster is included
 #define ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT
@@ -249,37 +286,6 @@
 #define EMBER_AF_PLUGIN_RELATIVE_HUMIDITY_MEASUREMENT_SERVER
 #define EMBER_AF_PLUGIN_RELATIVE_HUMIDITY_MEASUREMENT
 
-// Use this macro to check if the server side of the Scenes cluster is included
-#define ZCL_USING_SCENES_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_SCENES_SERVER
-#define EMBER_AF_PLUGIN_SCENES
-// User options for server plugin Scenes
-// Cluster spec 1.4.8.2
-#ifdef CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#define MATTER_SCENES_TABLE_SIZE CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#else
-#define MATTER_SCENES_TABLE_SIZE 16
-#endif
-
-// Scenes FeatureMap Attribute Toggle Scenes Name feature
-// App cluster specs 1.4.4
-#define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
-#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0000 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
-
-// Use this macro to check if the server side of the Software Diagnostics cluster is included
-#define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
-
-// Use this macro to check if the client side of the Switch cluster is included
-#define ZCL_USING_SWITCH_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_SWITCH_CLIENT
-
-// Use this macro to check if the server side of the Switch cluster is included
-#define ZCL_USING_SWITCH_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_SWITCH_SERVER
-#define EMBER_AF_PLUGIN_SWITCH
-
 // Use this macro to check if the client side of the Target Navigator cluster is included
 #define ZCL_USING_TARGET_NAVIGATOR_CLUSTER_CLIENT
 #define EMBER_AF_PLUGIN_TARGET_NAVIGATOR_CLIENT
@@ -289,35 +295,29 @@
 #define EMBER_AF_PLUGIN_TARGET_NAVIGATOR_SERVER
 #define EMBER_AF_PLUGIN_TARGET_NAVIGATOR
 
-// Use this macro to check if the client side of the Temperature Measurement cluster is included
-#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_CLIENT
-
-// Use this macro to check if the server side of the Temperature Measurement cluster is included
-#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER
-#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT
+// Use this macro to check if the client side of the Keypad Input cluster is included
+#define ZCL_USING_KEYPAD_INPUT_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_KEYPAD_INPUT_CLIENT
 
-// Use this macro to check if the server side of the Thermostat cluster is included
-#define ZCL_USING_THERMOSTAT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THERMOSTAT_SERVER
-#define EMBER_AF_PLUGIN_THERMOSTAT
+// Use this macro to check if the server side of the Keypad Input cluster is included
+#define ZCL_USING_KEYPAD_INPUT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_KEYPAD_INPUT_SERVER
+#define EMBER_AF_PLUGIN_KEYPAD_INPUT
 
-// Use this macro to check if the client side of the Thermostat User Interface Configuration cluster is included
-#define ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLIENT
+// Use this macro to check if the client side of the Content Launcher cluster is included
+#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_CLIENT
 
-// Use this macro to check if the server side of the Thermostat User Interface Configuration cluster is included
-#define ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION
+// Use this macro to check if the server side of the Content Launcher cluster is included
+#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_SERVER
+#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER
 
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+// Use this macro to check if the client side of the Application Basic cluster is included
+#define ZCL_USING_APPLICATION_BASIC_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_APPLICATION_BASIC_CLIENT
 
-// Use this macro to check if the server side of the Window Covering cluster is included
-#define ZCL_USING_WINDOW_COVERING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WINDOW_COVERING_SERVER
-#define EMBER_AF_PLUGIN_WINDOW_COVERING
+// Use this macro to check if the server side of the Application Basic cluster is included
+#define ZCL_USING_APPLICATION_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_APPLICATION_BASIC_SERVER
+#define EMBER_AF_PLUGIN_APPLICATION_BASIC
diff --git a/zzz_generated/placeholder/app2/zap-generated/CHIPClientCallbacks.h b/zzz_generated/placeholder/app2/zap-generated/CHIPClientCallbacks.h
index f362f436b94fc7..0f50adab2d2f62 100644
--- a/zzz_generated/placeholder/app2/zap-generated/CHIPClientCallbacks.h
+++ b/zzz_generated/placeholder/app2/zap-generated/CHIPClientCallbacks.h
@@ -30,34 +30,24 @@
 #include <lib/support/Span.h>
 
 // List specific responses
-typedef void (*ApplicationBasicAllowedVendorListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::VendorId> & data);
-typedef void (*ApplicationBasicGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ApplicationBasicAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ApplicationBasicAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ContentLauncherAcceptHeaderListAttributeCallback)(void * context,
-                                                                 const chip::app::DataModel::DecodableList<chip::CharSpan> & data);
-typedef void (*ContentLauncherGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ContentLauncherAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ContentLauncherAttributeListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*GeneralCommissioningGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*GeneralCommissioningAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*GeneralCommissioningAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*KeypadInputGeneratedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*KeypadInputAcceptedCommandListListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*KeypadInputAttributeListListAttributeCallback)(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*SwitchGeneratedCommandListListAttributeCallback)(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*SwitchAcceptedCommandListListAttributeCallback)(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*SwitchAttributeListListAttributeCallback)(void * context,
+                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*OperationalCredentialsFabricsListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & data);
+typedef void (*OperationalCredentialsTrustedRootCertificatesListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & data);
 typedef void (*ModeSelectSupportedModesListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType> & data);
@@ -67,24 +57,18 @@ typedef void (*ModeSelectAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*ModeSelectAttributeListListAttributeCallback)(void * context,
                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*OperationalCredentialsFabricsListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & data);
-typedef void (*OperationalCredentialsTrustedRootCertificatesListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & data);
+typedef void (*ThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ThermostatUserInterfaceConfigurationAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*RelativeHumidityMeasurementGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*RelativeHumidityMeasurementAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*RelativeHumidityMeasurementAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*SwitchGeneratedCommandListListAttributeCallback)(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*SwitchAcceptedCommandListListAttributeCallback)(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*SwitchAttributeListListAttributeCallback)(void * context,
-                                                         const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
 typedef void (*TargetNavigatorTargetListListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType> & data);
@@ -94,9 +78,25 @@ typedef void (*TargetNavigatorAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*TargetNavigatorAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*ThermostatUserInterfaceConfigurationGeneratedCommandListListAttributeCallback)(
+typedef void (*KeypadInputGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ThermostatUserInterfaceConfigurationAcceptedCommandListListAttributeCallback)(
+typedef void (*KeypadInputAcceptedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*ThermostatUserInterfaceConfigurationAttributeListListAttributeCallback)(
+typedef void (*KeypadInputAttributeListListAttributeCallback)(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*ContentLauncherAcceptHeaderListAttributeCallback)(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::CharSpan> & data);
+typedef void (*ContentLauncherGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ContentLauncherAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ContentLauncherAttributeListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+typedef void (*ApplicationBasicAllowedVendorListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::VendorId> & data);
+typedef void (*ApplicationBasicGeneratedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ApplicationBasicAcceptedCommandListListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ApplicationBasicAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
diff --git a/zzz_generated/placeholder/app2/zap-generated/CHIPClusters.h b/zzz_generated/placeholder/app2/zap-generated/CHIPClusters.h
index df3cdd4ae885f0..ca68fad85bc593 100644
--- a/zzz_generated/placeholder/app2/zap-generated/CHIPClusters.h
+++ b/zzz_generated/placeholder/app2/zap-generated/CHIPClusters.h
@@ -30,32 +30,32 @@
 namespace chip {
 namespace Controller {
 
-class DLL_EXPORT ApplicationBasicCluster : public ClusterBase
+class DLL_EXPORT OnOffCluster : public ClusterBase
 {
 public:
-    ApplicationBasicCluster() : ClusterBase(app::Clusters::ApplicationBasic::Id) {}
-    ~ApplicationBasicCluster() {}
+    OnOffCluster() : ClusterBase(app::Clusters::OnOff::Id) {}
+    ~OnOffCluster() {}
 };
 
-class DLL_EXPORT ContentLauncherCluster : public ClusterBase
+class DLL_EXPORT GeneralCommissioningCluster : public ClusterBase
 {
 public:
-    ContentLauncherCluster() : ClusterBase(app::Clusters::ContentLauncher::Id) {}
-    ~ContentLauncherCluster() {}
+    GeneralCommissioningCluster() : ClusterBase(app::Clusters::GeneralCommissioning::Id) {}
+    ~GeneralCommissioningCluster() {}
 };
 
-class DLL_EXPORT GeneralCommissioningCluster : public ClusterBase
+class DLL_EXPORT SwitchCluster : public ClusterBase
 {
 public:
-    GeneralCommissioningCluster() : ClusterBase(app::Clusters::GeneralCommissioning::Id) {}
-    ~GeneralCommissioningCluster() {}
+    SwitchCluster() : ClusterBase(app::Clusters::Switch::Id) {}
+    ~SwitchCluster() {}
 };
 
-class DLL_EXPORT KeypadInputCluster : public ClusterBase
+class DLL_EXPORT OperationalCredentialsCluster : public ClusterBase
 {
 public:
-    KeypadInputCluster() : ClusterBase(app::Clusters::KeypadInput::Id) {}
-    ~KeypadInputCluster() {}
+    OperationalCredentialsCluster() : ClusterBase(app::Clusters::OperationalCredentials::Id) {}
+    ~OperationalCredentialsCluster() {}
 };
 
 class DLL_EXPORT ModeSelectCluster : public ClusterBase
@@ -65,18 +65,18 @@ class DLL_EXPORT ModeSelectCluster : public ClusterBase
     ~ModeSelectCluster() {}
 };
 
-class DLL_EXPORT OnOffCluster : public ClusterBase
+class DLL_EXPORT ThermostatUserInterfaceConfigurationCluster : public ClusterBase
 {
 public:
-    OnOffCluster() : ClusterBase(app::Clusters::OnOff::Id) {}
-    ~OnOffCluster() {}
+    ThermostatUserInterfaceConfigurationCluster() : ClusterBase(app::Clusters::ThermostatUserInterfaceConfiguration::Id) {}
+    ~ThermostatUserInterfaceConfigurationCluster() {}
 };
 
-class DLL_EXPORT OperationalCredentialsCluster : public ClusterBase
+class DLL_EXPORT TemperatureMeasurementCluster : public ClusterBase
 {
 public:
-    OperationalCredentialsCluster() : ClusterBase(app::Clusters::OperationalCredentials::Id) {}
-    ~OperationalCredentialsCluster() {}
+    TemperatureMeasurementCluster() : ClusterBase(app::Clusters::TemperatureMeasurement::Id) {}
+    ~TemperatureMeasurementCluster() {}
 };
 
 class DLL_EXPORT RelativeHumidityMeasurementCluster : public ClusterBase
@@ -86,32 +86,32 @@ class DLL_EXPORT RelativeHumidityMeasurementCluster : public ClusterBase
     ~RelativeHumidityMeasurementCluster() {}
 };
 
-class DLL_EXPORT SwitchCluster : public ClusterBase
+class DLL_EXPORT TargetNavigatorCluster : public ClusterBase
 {
 public:
-    SwitchCluster() : ClusterBase(app::Clusters::Switch::Id) {}
-    ~SwitchCluster() {}
+    TargetNavigatorCluster() : ClusterBase(app::Clusters::TargetNavigator::Id) {}
+    ~TargetNavigatorCluster() {}
 };
 
-class DLL_EXPORT TargetNavigatorCluster : public ClusterBase
+class DLL_EXPORT KeypadInputCluster : public ClusterBase
 {
 public:
-    TargetNavigatorCluster() : ClusterBase(app::Clusters::TargetNavigator::Id) {}
-    ~TargetNavigatorCluster() {}
+    KeypadInputCluster() : ClusterBase(app::Clusters::KeypadInput::Id) {}
+    ~KeypadInputCluster() {}
 };
 
-class DLL_EXPORT TemperatureMeasurementCluster : public ClusterBase
+class DLL_EXPORT ContentLauncherCluster : public ClusterBase
 {
 public:
-    TemperatureMeasurementCluster() : ClusterBase(app::Clusters::TemperatureMeasurement::Id) {}
-    ~TemperatureMeasurementCluster() {}
+    ContentLauncherCluster() : ClusterBase(app::Clusters::ContentLauncher::Id) {}
+    ~ContentLauncherCluster() {}
 };
 
-class DLL_EXPORT ThermostatUserInterfaceConfigurationCluster : public ClusterBase
+class DLL_EXPORT ApplicationBasicCluster : public ClusterBase
 {
 public:
-    ThermostatUserInterfaceConfigurationCluster() : ClusterBase(app::Clusters::ThermostatUserInterfaceConfiguration::Id) {}
-    ~ThermostatUserInterfaceConfigurationCluster() {}
+    ApplicationBasicCluster() : ClusterBase(app::Clusters::ApplicationBasic::Id) {}
+    ~ApplicationBasicCluster() {}
 };
 
 } // namespace Controller
diff --git a/zzz_generated/placeholder/app2/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/placeholder/app2/zap-generated/PluginApplicationCallbacks.h
index 19ec4706283a4e..9e8ed200958a8f 100644
--- a/zzz_generated/placeholder/app2/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/placeholder/app2/zap-generated/PluginApplicationCallbacks.h
@@ -22,50 +22,50 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterApplicationBasicPluginClientInitCallback();                                                                              \
-    MatterApplicationBasicPluginServerInitCallback();                                                                              \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterBooleanStatePluginServerInitCallback();                                                                                  \
-    MatterBridgedActionsPluginServerInitCallback();                                                                                \
-    MatterColorControlPluginServerInitCallback();                                                                                  \
-    MatterContentLauncherPluginClientInitCallback();                                                                               \
-    MatterContentLauncherPluginServerInitCallback();                                                                               \
+    MatterIdentifyPluginServerInitCallback();                                                                                      \
+    MatterGroupsPluginServerInitCallback();                                                                                        \
+    MatterScenesPluginServerInitCallback();                                                                                        \
+    MatterOnOffPluginClientInitCallback();                                                                                         \
+    MatterOnOffPluginServerInitCallback();                                                                                         \
+    MatterLevelControlPluginServerInitCallback();                                                                                  \
     MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFlowMeasurementPluginServerInitCallback();                                                                               \
+    MatterBridgedActionsPluginServerInitCallback();                                                                                \
+    MatterBasicPluginServerInitCallback();                                                                                         \
+    MatterPowerSourceConfigurationPluginServerInitCallback();                                                                      \
+    MatterPowerSourcePluginServerInitCallback();                                                                                   \
     MatterGeneralCommissioningPluginClientInitCallback();                                                                          \
     MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterIlluminanceMeasurementPluginServerInitCallback();                                                                        \
-    MatterKeypadInputPluginClientInitCallback();                                                                                   \
-    MatterKeypadInputPluginServerInitCallback();                                                                                   \
-    MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterModeSelectPluginClientInitCallback();                                                                                    \
-    MatterModeSelectPluginServerInitCallback();                                                                                    \
     MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterOnOffPluginClientInitCallback();                                                                                         \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
+    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
+    MatterSwitchPluginClientInitCallback();                                                                                        \
+    MatterSwitchPluginServerInitCallback();                                                                                        \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
     MatterOperationalCredentialsPluginClientInitCallback();                                                                        \
     MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterPowerSourcePluginServerInitCallback();                                                                                   \
-    MatterPowerSourceConfigurationPluginServerInitCallback();                                                                      \
-    MatterPressureMeasurementPluginServerInitCallback();                                                                           \
+    MatterBooleanStatePluginServerInitCallback();                                                                                  \
+    MatterModeSelectPluginClientInitCallback();                                                                                    \
+    MatterModeSelectPluginServerInitCallback();                                                                                    \
+    MatterWindowCoveringPluginServerInitCallback();                                                                                \
     MatterPumpConfigurationAndControlPluginServerInitCallback();                                                                   \
+    MatterThermostatPluginServerInitCallback();                                                                                    \
+    MatterThermostatUserInterfaceConfigurationPluginClientInitCallback();                                                          \
+    MatterThermostatUserInterfaceConfigurationPluginServerInitCallback();                                                          \
+    MatterColorControlPluginServerInitCallback();                                                                                  \
+    MatterIlluminanceMeasurementPluginServerInitCallback();                                                                        \
+    MatterTemperatureMeasurementPluginClientInitCallback();                                                                        \
+    MatterTemperatureMeasurementPluginServerInitCallback();                                                                        \
+    MatterPressureMeasurementPluginServerInitCallback();                                                                           \
+    MatterFlowMeasurementPluginServerInitCallback();                                                                               \
     MatterRelativeHumidityMeasurementPluginClientInitCallback();                                                                   \
     MatterRelativeHumidityMeasurementPluginServerInitCallback();                                                                   \
-    MatterScenesPluginServerInitCallback();                                                                                        \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterSwitchPluginClientInitCallback();                                                                                        \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
     MatterTargetNavigatorPluginClientInitCallback();                                                                               \
     MatterTargetNavigatorPluginServerInitCallback();                                                                               \
-    MatterTemperatureMeasurementPluginClientInitCallback();                                                                        \
-    MatterTemperatureMeasurementPluginServerInitCallback();                                                                        \
-    MatterThermostatPluginServerInitCallback();                                                                                    \
-    MatterThermostatUserInterfaceConfigurationPluginClientInitCallback();                                                          \
-    MatterThermostatUserInterfaceConfigurationPluginServerInitCallback();                                                          \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterWindowCoveringPluginServerInitCallback();
+    MatterKeypadInputPluginClientInitCallback();                                                                                   \
+    MatterKeypadInputPluginServerInitCallback();                                                                                   \
+    MatterContentLauncherPluginClientInitCallback();                                                                               \
+    MatterContentLauncherPluginServerInitCallback();                                                                               \
+    MatterApplicationBasicPluginClientInitCallback();                                                                              \
+    MatterApplicationBasicPluginServerInitCallback();
diff --git a/zzz_generated/placeholder/app2/zap-generated/access.h b/zzz_generated/placeholder/app2/zap-generated/access.h
index 005d2e04e93ba7..7a0fd667d6e169 100644
--- a/zzz_generated/placeholder/app2/zap-generated/access.h
+++ b/zzz_generated/placeholder/app2/zap-generated/access.h
@@ -29,10 +29,10 @@
 
 // Parallel array data (*cluster*, attribute, privilege) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__CLUSTER { \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
-    /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
@@ -40,7 +40,7 @@
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
+    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \
@@ -54,15 +54,15 @@
     /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \
-    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
+    /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
-    /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
@@ -70,7 +70,7 @@
     5, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
+    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \
@@ -84,15 +84,15 @@
     /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \
-    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
+    /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
-    /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
@@ -100,7 +100,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
+    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \
@@ -114,20 +114,20 @@
     /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \
     /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \
-    /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
+    /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // Parallel array data (*cluster*, attribute, privilege) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__CLUSTER { \
+    6, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
     40, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
-    768, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    6, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    258, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
     512, /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: manage */ \
     512, /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: manage */ \
     512, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \
@@ -141,18 +141,18 @@
     513, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \
     516, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \
     516, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \
-    258, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
+    768, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__ATTRIBUTE { \
+    16387, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
     5, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
-    16400, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    16387, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    23, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
     21, /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: manage */ \
     23, /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: manage */ \
     32, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \
@@ -166,18 +166,18 @@
     28, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \
     1, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \
     2, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \
-    23, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
+    16400, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__PRIVILEGE { \
+    kMatterAccessPrivilegeManage, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \
@@ -191,30 +191,34 @@
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -223,31 +227,31 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -256,31 +260,31 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -289,10 +293,6 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/placeholder/app2/zap-generated/gen_config.h b/zzz_generated/placeholder/app2/zap-generated/gen_config.h
index 543f3529c0a3da..cbc7db12fc7ef2 100644
--- a/zzz_generated/placeholder/app2/zap-generated/gen_config.h
+++ b/zzz_generated/placeholder/app2/zap-generated/gen_config.h
@@ -29,117 +29,125 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_APPLICATION_BASIC_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_BOOLEAN_STATE_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BRIDGED_ACTIONS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ON_OFF_CLUSTER_CLIENT_ENDPOINT_COUNT (2)
+#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BRIDGED_ACTIONS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_POWER_SOURCE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_KEYPAD_INPUT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_MODE_SELECT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ON_OFF_CLUSTER_CLIENT_ENDPOINT_COUNT (2)
-#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SWITCH_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_POWER_SOURCE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BOOLEAN_STATE_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_MODE_SELECT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_PUMP_CONFIG_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_THERMOSTAT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SWITCH_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_TARGET_NAVIGATOR_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_THERMOSTAT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_KEYPAD_INPUT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_APPLICATION_BASIC_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
-
-// Use this macro to check if the client side of the Application Basic cluster is included
-#define ZCL_USING_APPLICATION_BASIC_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_APPLICATION_BASIC_CLIENT
-
-// Use this macro to check if the server side of the Application Basic cluster is included
-#define ZCL_USING_APPLICATION_BASIC_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_APPLICATION_BASIC_SERVER
-#define EMBER_AF_PLUGIN_APPLICATION_BASIC
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
 
-// Use this macro to check if the server side of the Basic cluster is included
-#define ZCL_USING_BASIC_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BASIC_SERVER
-#define EMBER_AF_PLUGIN_BASIC
+// Use this macro to check if the server side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUPS_SERVER
+#define EMBER_AF_PLUGIN_GROUPS
 
-// Use this macro to check if the server side of the Boolean State cluster is included
-#define ZCL_USING_BOOLEAN_STATE_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BOOLEAN_STATE_SERVER
-#define EMBER_AF_PLUGIN_BOOLEAN_STATE
+// Use this macro to check if the server side of the Scenes cluster is included
+#define ZCL_USING_SCENES_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SCENES_SERVER
+#define EMBER_AF_PLUGIN_SCENES
+// User options for server plugin Scenes
+// Cluster spec 1.4.8.2
+#ifdef CHIP_CONFIG_MAX_SCENES_PER_FABRIC
+#define MATTER_SCENES_TABLE_SIZE CHIP_CONFIG_MAX_SCENES_PER_FABRIC
+#else
+#define MATTER_SCENES_TABLE_SIZE 16
+#endif
 
-// Use this macro to check if the server side of the Bridged Actions cluster is included
-#define ZCL_USING_BRIDGED_ACTIONS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS_SERVER
-#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS
+// Scenes FeatureMap Attribute Toggle Scenes Name feature
+// App cluster specs 1.4.4
+#define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
+#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0000 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
 
-// Use this macro to check if the server side of the Color Control cluster is included
-#define ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_COLOR_CONTROL
-// User options for server plugin Color Control
-#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY
-#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP
-#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV
+// Use this macro to check if the client side of the On/Off cluster is included
+#define ZCL_USING_ON_OFF_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_ON_OFF_CLIENT
 
-// Use this macro to check if the client side of the Content Launcher cluster is included
-#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_CLIENT
+// Use this macro to check if the server side of the On/Off cluster is included
+#define ZCL_USING_ON_OFF_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF
 
-// Use this macro to check if the server side of the Content Launcher cluster is included
-#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_SERVER
-#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER
+// Use this macro to check if the server side of the Level Control cluster is included
+#define ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL
+// User options for server plugin Level Control
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL 254
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0
 
 // Use this macro to check if the server side of the Descriptor cluster is included
 #define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
 #define EMBER_AF_PLUGIN_DESCRIPTOR
 
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Bridged Actions cluster is included
+#define ZCL_USING_BRIDGED_ACTIONS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS_SERVER
+#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS
 
-// Use this macro to check if the server side of the Flow Measurement cluster is included
-#define ZCL_USING_FLOW_MEASUREMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT_SERVER
-#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT
+// Use this macro to check if the server side of the Basic cluster is included
+#define ZCL_USING_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BASIC_SERVER
+#define EMBER_AF_PLUGIN_BASIC
+
+// Use this macro to check if the server side of the Power Source Configuration cluster is included
+#define ZCL_USING_POWER_SOURCE_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_POWER_SOURCE_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_POWER_SOURCE_CONFIGURATION
+
+// Use this macro to check if the server side of the Power Source cluster is included
+#define ZCL_USING_POWER_SOURCE_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_POWER_SOURCE_SERVER
+#define EMBER_AF_PLUGIN_POWER_SOURCE
 
 // Use this macro to check if the client side of the General Commissioning cluster is included
 #define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_CLIENT
@@ -150,43 +158,58 @@
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
 
+// Use this macro to check if the server side of the Network Commissioning cluster is included
+#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+
 // Use this macro to check if the server side of the General Diagnostics cluster is included
 #define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
-// Use this macro to check if the server side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUPS_SERVER
-#define EMBER_AF_PLUGIN_GROUPS
+// Use this macro to check if the server side of the Software Diagnostics cluster is included
+#define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
 
-// Use this macro to check if the server side of the Identify cluster is included
-#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
 
-// Use this macro to check if the server side of the Illuminance Measurement cluster is included
-#define ZCL_USING_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT_SERVER
-#define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
 
-// Use this macro to check if the client side of the Keypad Input cluster is included
-#define ZCL_USING_KEYPAD_INPUT_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_KEYPAD_INPUT_CLIENT
+// Use this macro to check if the client side of the Switch cluster is included
+#define ZCL_USING_SWITCH_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_SWITCH_CLIENT
 
-// Use this macro to check if the server side of the Keypad Input cluster is included
-#define ZCL_USING_KEYPAD_INPUT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_KEYPAD_INPUT_SERVER
-#define EMBER_AF_PLUGIN_KEYPAD_INPUT
+// Use this macro to check if the server side of the Switch cluster is included
+#define ZCL_USING_SWITCH_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SWITCH_SERVER
+#define EMBER_AF_PLUGIN_SWITCH
 
-// Use this macro to check if the server side of the Level Control cluster is included
-#define ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL
-// User options for server plugin Level Control
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL 254
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
+
+// Use this macro to check if the client side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_CLIENT
+
+// Use this macro to check if the server side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+
+// Use this macro to check if the server side of the Boolean State cluster is included
+#define ZCL_USING_BOOLEAN_STATE_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BOOLEAN_STATE_SERVER
+#define EMBER_AF_PLUGIN_BOOLEAN_STATE
 
 // Use this macro to check if the client side of the Mode Select cluster is included
 #define ZCL_USING_MODE_SELECT_CLUSTER_CLIENT
@@ -197,48 +220,62 @@
 #define EMBER_AF_PLUGIN_MODE_SELECT_SERVER
 #define EMBER_AF_PLUGIN_MODE_SELECT
 
-// Use this macro to check if the server side of the Network Commissioning cluster is included
-#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+// Use this macro to check if the server side of the Window Covering cluster is included
+#define ZCL_USING_WINDOW_COVERING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WINDOW_COVERING_SERVER
+#define EMBER_AF_PLUGIN_WINDOW_COVERING
 
-// Use this macro to check if the client side of the On/Off cluster is included
-#define ZCL_USING_ON_OFF_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_ON_OFF_CLIENT
+// Use this macro to check if the server side of the Pump Configuration and Control cluster is included
+#define ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL
 
-// Use this macro to check if the server side of the On/Off cluster is included
-#define ZCL_USING_ON_OFF_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF
+// Use this macro to check if the server side of the Thermostat cluster is included
+#define ZCL_USING_THERMOSTAT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THERMOSTAT_SERVER
+#define EMBER_AF_PLUGIN_THERMOSTAT
 
-// Use this macro to check if the client side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_CLIENT
+// Use this macro to check if the client side of the Thermostat User Interface Configuration cluster is included
+#define ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLIENT
 
-// Use this macro to check if the server side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+// Use this macro to check if the server side of the Thermostat User Interface Configuration cluster is included
+#define ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION
 
-// Use this macro to check if the server side of the Power Source cluster is included
-#define ZCL_USING_POWER_SOURCE_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_POWER_SOURCE_SERVER
-#define EMBER_AF_PLUGIN_POWER_SOURCE
+// Use this macro to check if the server side of the Color Control cluster is included
+#define ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_COLOR_CONTROL
+// User options for server plugin Color Control
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP
+#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV
 
-// Use this macro to check if the server side of the Power Source Configuration cluster is included
-#define ZCL_USING_POWER_SOURCE_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_POWER_SOURCE_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_POWER_SOURCE_CONFIGURATION
+// Use this macro to check if the server side of the Illuminance Measurement cluster is included
+#define ZCL_USING_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT_SERVER
+#define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT
+
+// Use this macro to check if the client side of the Temperature Measurement cluster is included
+#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_CLIENT
+
+// Use this macro to check if the server side of the Temperature Measurement cluster is included
+#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER
+#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT
 
 // Use this macro to check if the server side of the Pressure Measurement cluster is included
 #define ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_PRESSURE_MEASUREMENT_SERVER
 #define EMBER_AF_PLUGIN_PRESSURE_MEASUREMENT
 
-// Use this macro to check if the server side of the Pump Configuration and Control cluster is included
-#define ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL
+// Use this macro to check if the server side of the Flow Measurement cluster is included
+#define ZCL_USING_FLOW_MEASUREMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT_SERVER
+#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT
 
 // Use this macro to check if the client side of the Relative Humidity Measurement cluster is included
 #define ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT
@@ -249,37 +286,6 @@
 #define EMBER_AF_PLUGIN_RELATIVE_HUMIDITY_MEASUREMENT_SERVER
 #define EMBER_AF_PLUGIN_RELATIVE_HUMIDITY_MEASUREMENT
 
-// Use this macro to check if the server side of the Scenes cluster is included
-#define ZCL_USING_SCENES_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_SCENES_SERVER
-#define EMBER_AF_PLUGIN_SCENES
-// User options for server plugin Scenes
-// Cluster spec 1.4.8.2
-#ifdef CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#define MATTER_SCENES_TABLE_SIZE CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#else
-#define MATTER_SCENES_TABLE_SIZE 16
-#endif
-
-// Scenes FeatureMap Attribute Toggle Scenes Name feature
-// App cluster specs 1.4.4
-#define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
-#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0000 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
-
-// Use this macro to check if the server side of the Software Diagnostics cluster is included
-#define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
-
-// Use this macro to check if the client side of the Switch cluster is included
-#define ZCL_USING_SWITCH_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_SWITCH_CLIENT
-
-// Use this macro to check if the server side of the Switch cluster is included
-#define ZCL_USING_SWITCH_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_SWITCH_SERVER
-#define EMBER_AF_PLUGIN_SWITCH
-
 // Use this macro to check if the client side of the Target Navigator cluster is included
 #define ZCL_USING_TARGET_NAVIGATOR_CLUSTER_CLIENT
 #define EMBER_AF_PLUGIN_TARGET_NAVIGATOR_CLIENT
@@ -289,35 +295,29 @@
 #define EMBER_AF_PLUGIN_TARGET_NAVIGATOR_SERVER
 #define EMBER_AF_PLUGIN_TARGET_NAVIGATOR
 
-// Use this macro to check if the client side of the Temperature Measurement cluster is included
-#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_CLIENT
-
-// Use this macro to check if the server side of the Temperature Measurement cluster is included
-#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER
-#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT
+// Use this macro to check if the client side of the Keypad Input cluster is included
+#define ZCL_USING_KEYPAD_INPUT_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_KEYPAD_INPUT_CLIENT
 
-// Use this macro to check if the server side of the Thermostat cluster is included
-#define ZCL_USING_THERMOSTAT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THERMOSTAT_SERVER
-#define EMBER_AF_PLUGIN_THERMOSTAT
+// Use this macro to check if the server side of the Keypad Input cluster is included
+#define ZCL_USING_KEYPAD_INPUT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_KEYPAD_INPUT_SERVER
+#define EMBER_AF_PLUGIN_KEYPAD_INPUT
 
-// Use this macro to check if the client side of the Thermostat User Interface Configuration cluster is included
-#define ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLIENT
+// Use this macro to check if the client side of the Content Launcher cluster is included
+#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_CLIENT
 
-// Use this macro to check if the server side of the Thermostat User Interface Configuration cluster is included
-#define ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION
+// Use this macro to check if the server side of the Content Launcher cluster is included
+#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_SERVER
+#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER
 
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+// Use this macro to check if the client side of the Application Basic cluster is included
+#define ZCL_USING_APPLICATION_BASIC_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_APPLICATION_BASIC_CLIENT
 
-// Use this macro to check if the server side of the Window Covering cluster is included
-#define ZCL_USING_WINDOW_COVERING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WINDOW_COVERING_SERVER
-#define EMBER_AF_PLUGIN_WINDOW_COVERING
+// Use this macro to check if the server side of the Application Basic cluster is included
+#define ZCL_USING_APPLICATION_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_APPLICATION_BASIC_SERVER
+#define EMBER_AF_PLUGIN_APPLICATION_BASIC
diff --git a/zzz_generated/pump-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/pump-app/zap-generated/PluginApplicationCallbacks.h
index 85f5573eef2805..3e61d2b69546fa 100644
--- a/zzz_generated/pump-app/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/pump-app/zap-generated/PluginApplicationCallbacks.h
@@ -22,24 +22,24 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterBindingPluginServerInitCallback();                                                                                       \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterFlowMeasurementPluginServerInitCallback();                                                                               \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
     MatterIdentifyPluginServerInitCallback();                                                                                      \
+    MatterOnOffPluginServerInitCallback();                                                                                         \
     MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
+    MatterBindingPluginServerInitCallback();                                                                                       \
+    MatterAccessControlPluginServerInitCallback();                                                                                 \
+    MatterBasicPluginServerInitCallback();                                                                                         \
     MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
     MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterOccupancySensingPluginClientInitCallback();                                                                              \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
+    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
     MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterPressureMeasurementPluginServerInitCallback();                                                                           \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
     MatterPumpConfigurationAndControlPluginServerInitCallback();                                                                   \
     MatterTemperatureMeasurementPluginServerInitCallback();                                                                        \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();
+    MatterPressureMeasurementPluginServerInitCallback();                                                                           \
+    MatterFlowMeasurementPluginServerInitCallback();                                                                               \
+    MatterOccupancySensingPluginClientInitCallback();
diff --git a/zzz_generated/pump-app/zap-generated/access.h b/zzz_generated/pump-app/zap-generated/access.h
index bb4e23b8b2e797..cb00d42d2991bd 100644
--- a/zzz_generated/pump-app/zap-generated/access.h
+++ b/zzz_generated/pump-app/zap-generated/access.h
@@ -37,7 +37,6 @@
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -45,6 +44,7 @@
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \
@@ -61,7 +61,6 @@
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -69,6 +68,7 @@
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \
@@ -85,7 +85,6 @@
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -93,6 +92,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \
     /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \
@@ -108,8 +108,8 @@
     40, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     512, /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: manage */ \
     512, /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: manage */ \
     512, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \
@@ -123,8 +123,8 @@
     5, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     21, /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: manage */ \
     23, /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: manage */ \
     32, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \
@@ -138,8 +138,8 @@
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: LifetimeRunningHours, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \
@@ -150,22 +150,18 @@
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -174,26 +170,26 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -202,26 +198,26 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -230,6 +226,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/pump-app/zap-generated/gen_config.h b/zzz_generated/pump-app/zap-generated/gen_config.h
index 7988c70a4c19a2..d4431327e203ab 100644
--- a/zzz_generated/pump-app/zap-generated/gen_config.h
+++ b/zzz_generated/pump-app/zap-generated/gen_config.h
@@ -29,80 +29,40 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
-#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OCCUPANCY_SENSING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_PUMP_CONFIG_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OCCUPANCY_SENSING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
-// Use this macro to check if the server side of the Access Control cluster is included
-#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL
-
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
-
-// Use this macro to check if the server side of the Basic cluster is included
-#define ZCL_USING_BASIC_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BASIC_SERVER
-#define EMBER_AF_PLUGIN_BASIC
-
-// Use this macro to check if the server side of the Binding cluster is included
-#define ZCL_USING_BINDING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BINDING_SERVER
-#define EMBER_AF_PLUGIN_BINDING
-
-// Use this macro to check if the server side of the Descriptor cluster is included
-#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR
-
-// Use this macro to check if the server side of the Flow Measurement cluster is included
-#define ZCL_USING_FLOW_MEASUREMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT_SERVER
-#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT
-
-// Use this macro to check if the server side of the General Commissioning cluster is included
-#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
-
-// Use this macro to check if the server side of the General Diagnostics cluster is included
-#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
-
 // Use this macro to check if the server side of the Identify cluster is included
 #define ZCL_USING_IDENTIFY_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_IDENTIFY_SERVER
 #define EMBER_AF_PLUGIN_IDENTIFY
 
+// Use this macro to check if the server side of the On/Off cluster is included
+#define ZCL_USING_ON_OFF_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF
+
 // Use this macro to check if the server side of the Level Control cluster is included
 #define ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_LEVEL_CONTROL_SERVER
@@ -112,10 +72,25 @@
 #define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0
 #define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0
 
-// Use this macro to check if the server side of the Network Commissioning cluster is included
-#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+// Use this macro to check if the server side of the Descriptor cluster is included
+#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR
+
+// Use this macro to check if the server side of the Binding cluster is included
+#define ZCL_USING_BINDING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BINDING_SERVER
+#define EMBER_AF_PLUGIN_BINDING
+
+// Use this macro to check if the server side of the Access Control cluster is included
+#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL
+
+// Use this macro to check if the server side of the Basic cluster is included
+#define ZCL_USING_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BASIC_SERVER
+#define EMBER_AF_PLUGIN_BASIC
 
 // Use this macro to check if the client side of the OTA Software Update Provider cluster is included
 #define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
@@ -126,24 +101,40 @@
 #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
 #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
 
-// Use this macro to check if the client side of the Occupancy Sensing cluster is included
-#define ZCL_USING_OCCUPANCY_SENSING_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING_CLIENT
+// Use this macro to check if the server side of the General Commissioning cluster is included
+#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
 
-// Use this macro to check if the server side of the On/Off cluster is included
-#define ZCL_USING_ON_OFF_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF
+// Use this macro to check if the server side of the Network Commissioning cluster is included
+#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
 
 // Use this macro to check if the server side of the Operational Credentials cluster is included
 #define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
 #define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
 
-// Use this macro to check if the server side of the Pressure Measurement cluster is included
-#define ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_PRESSURE_MEASUREMENT_SERVER
-#define EMBER_AF_PLUGIN_PRESSURE_MEASUREMENT
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
 
 // Use this macro to check if the server side of the Pump Configuration and Control cluster is included
 #define ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_SERVER
@@ -155,7 +146,16 @@
 #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER
 #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT
 
-// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
-#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Pressure Measurement cluster is included
+#define ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_PRESSURE_MEASUREMENT_SERVER
+#define EMBER_AF_PLUGIN_PRESSURE_MEASUREMENT
+
+// Use this macro to check if the server side of the Flow Measurement cluster is included
+#define ZCL_USING_FLOW_MEASUREMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT_SERVER
+#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT
+
+// Use this macro to check if the client side of the Occupancy Sensing cluster is included
+#define ZCL_USING_OCCUPANCY_SENSING_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING_CLIENT
diff --git a/zzz_generated/pump-controller-app/zap-generated/CHIPClusters.h b/zzz_generated/pump-controller-app/zap-generated/CHIPClusters.h
index 4d31515bb86a16..02f8f3597247c8 100644
--- a/zzz_generated/pump-controller-app/zap-generated/CHIPClusters.h
+++ b/zzz_generated/pump-controller-app/zap-generated/CHIPClusters.h
@@ -30,11 +30,11 @@
 namespace chip {
 namespace Controller {
 
-class DLL_EXPORT FlowMeasurementCluster : public ClusterBase
+class DLL_EXPORT OnOffCluster : public ClusterBase
 {
 public:
-    FlowMeasurementCluster() : ClusterBase(app::Clusters::FlowMeasurement::Id) {}
-    ~FlowMeasurementCluster() {}
+    OnOffCluster() : ClusterBase(app::Clusters::OnOff::Id) {}
+    ~OnOffCluster() {}
 };
 
 class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
@@ -44,32 +44,32 @@ class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
     ~OtaSoftwareUpdateProviderCluster() {}
 };
 
-class DLL_EXPORT OnOffCluster : public ClusterBase
+class DLL_EXPORT PumpConfigurationAndControlCluster : public ClusterBase
 {
 public:
-    OnOffCluster() : ClusterBase(app::Clusters::OnOff::Id) {}
-    ~OnOffCluster() {}
+    PumpConfigurationAndControlCluster() : ClusterBase(app::Clusters::PumpConfigurationAndControl::Id) {}
+    ~PumpConfigurationAndControlCluster() {}
 };
 
-class DLL_EXPORT PressureMeasurementCluster : public ClusterBase
+class DLL_EXPORT TemperatureMeasurementCluster : public ClusterBase
 {
 public:
-    PressureMeasurementCluster() : ClusterBase(app::Clusters::PressureMeasurement::Id) {}
-    ~PressureMeasurementCluster() {}
+    TemperatureMeasurementCluster() : ClusterBase(app::Clusters::TemperatureMeasurement::Id) {}
+    ~TemperatureMeasurementCluster() {}
 };
 
-class DLL_EXPORT PumpConfigurationAndControlCluster : public ClusterBase
+class DLL_EXPORT PressureMeasurementCluster : public ClusterBase
 {
 public:
-    PumpConfigurationAndControlCluster() : ClusterBase(app::Clusters::PumpConfigurationAndControl::Id) {}
-    ~PumpConfigurationAndControlCluster() {}
+    PressureMeasurementCluster() : ClusterBase(app::Clusters::PressureMeasurement::Id) {}
+    ~PressureMeasurementCluster() {}
 };
 
-class DLL_EXPORT TemperatureMeasurementCluster : public ClusterBase
+class DLL_EXPORT FlowMeasurementCluster : public ClusterBase
 {
 public:
-    TemperatureMeasurementCluster() : ClusterBase(app::Clusters::TemperatureMeasurement::Id) {}
-    ~TemperatureMeasurementCluster() {}
+    FlowMeasurementCluster() : ClusterBase(app::Clusters::FlowMeasurement::Id) {}
+    ~FlowMeasurementCluster() {}
 };
 
 } // namespace Controller
diff --git a/zzz_generated/pump-controller-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/pump-controller-app/zap-generated/PluginApplicationCallbacks.h
index bd1436c64ba0cc..a8bc9fe9f3b492 100644
--- a/zzz_generated/pump-controller-app/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/pump-controller-app/zap-generated/PluginApplicationCallbacks.h
@@ -22,22 +22,22 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
+    MatterIdentifyPluginServerInitCallback();                                                                                      \
+    MatterOnOffPluginClientInitCallback();                                                                                         \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
+    MatterBindingPluginServerInitCallback();                                                                                       \
     MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
     MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterBindingPluginServerInitCallback();                                                                                       \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterFlowMeasurementPluginClientInitCallback();                                                                               \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
     MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
     MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterOnOffPluginClientInitCallback();                                                                                         \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
+    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
     MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterPressureMeasurementPluginClientInitCallback();                                                                           \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
     MatterPumpConfigurationAndControlPluginClientInitCallback();                                                                   \
     MatterTemperatureMeasurementPluginClientInitCallback();                                                                        \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();
+    MatterPressureMeasurementPluginClientInitCallback();                                                                           \
+    MatterFlowMeasurementPluginClientInitCallback();
diff --git a/zzz_generated/pump-controller-app/zap-generated/access.h b/zzz_generated/pump-controller-app/zap-generated/access.h
index 90d927ca9ffd3f..0e7132f5f2e050 100644
--- a/zzz_generated/pump-controller-app/zap-generated/access.h
+++ b/zzz_generated/pump-controller-app/zap-generated/access.h
@@ -37,7 +37,6 @@
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -45,6 +44,7 @@
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for read attribute
@@ -57,7 +57,6 @@
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -65,6 +64,7 @@
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for read attribute
@@ -77,7 +77,6 @@
     /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -85,6 +84,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -96,8 +96,8 @@
     40, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for write attribute
@@ -107,8 +107,8 @@
     5, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for write attribute
@@ -118,30 +118,26 @@
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -150,26 +146,26 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -178,26 +174,26 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -206,6 +202,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/pump-controller-app/zap-generated/gen_config.h b/zzz_generated/pump-controller-app/zap-generated/gen_config.h
index 87910f8d6b8ba9..75d22e56e153e1 100644
--- a/zzz_generated/pump-controller-app/zap-generated/gen_config.h
+++ b/zzz_generated/pump-controller-app/zap-generated/gen_config.h
@@ -29,103 +29,100 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
+#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ON_OFF_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ON_OFF_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_PUMP_CONFIG_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
+
+// Use this macro to check if the client side of the On/Off cluster is included
+#define ZCL_USING_ON_OFF_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_ON_OFF_CLIENT
+
+// Use this macro to check if the server side of the Descriptor cluster is included
+#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR
+
+// Use this macro to check if the server side of the Binding cluster is included
+#define ZCL_USING_BINDING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BINDING_SERVER
+#define EMBER_AF_PLUGIN_BINDING
+
 // Use this macro to check if the server side of the Access Control cluster is included
 #define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL
 
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
-
 // Use this macro to check if the server side of the Basic cluster is included
 #define ZCL_USING_BASIC_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_BASIC_SERVER
 #define EMBER_AF_PLUGIN_BASIC
 
-// Use this macro to check if the server side of the Binding cluster is included
-#define ZCL_USING_BINDING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BINDING_SERVER
-#define EMBER_AF_PLUGIN_BINDING
-
-// Use this macro to check if the server side of the Descriptor cluster is included
-#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR
+// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
+#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
 
-// Use this macro to check if the client side of the Flow Measurement cluster is included
-#define ZCL_USING_FLOW_MEASUREMENT_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT_CLIENT
+// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
+#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
 
 // Use this macro to check if the server side of the General Commissioning cluster is included
 #define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
 
-// Use this macro to check if the server side of the General Diagnostics cluster is included
-#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
-
-// Use this macro to check if the server side of the Identify cluster is included
-#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY
-
 // Use this macro to check if the server side of the Network Commissioning cluster is included
 #define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
 
-// Use this macro to check if the client side of the OTA Software Update Provider cluster is included
-#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
-// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
-#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
+// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
 
-// Use this macro to check if the client side of the On/Off cluster is included
-#define ZCL_USING_ON_OFF_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_ON_OFF_CLIENT
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
 
 // Use this macro to check if the server side of the Operational Credentials cluster is included
 #define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
 #define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
 
-// Use this macro to check if the client side of the Pressure Measurement cluster is included
-#define ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_PRESSURE_MEASUREMENT_CLIENT
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
 
 // Use this macro to check if the client side of the Pump Configuration and Control cluster is included
 #define ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_CLIENT
@@ -135,7 +132,10 @@
 #define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_CLIENT
 #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_CLIENT
 
-// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
-#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+// Use this macro to check if the client side of the Pressure Measurement cluster is included
+#define ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_PRESSURE_MEASUREMENT_CLIENT
+
+// Use this macro to check if the client side of the Flow Measurement cluster is included
+#define ZCL_USING_FLOW_MEASUREMENT_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT_CLIENT
diff --git a/zzz_generated/temperature-measurement-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/temperature-measurement-app/zap-generated/PluginApplicationCallbacks.h
index 362242ef8d745c..8392297e883ed4 100644
--- a/zzz_generated/temperature-measurement-app/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/temperature-measurement-app/zap-generated/PluginApplicationCallbacks.h
@@ -22,22 +22,22 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
     MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
     MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
     MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterTemperatureMeasurementPluginServerInitCallback();                                                                        \
     MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
     MatterUnitLocalizationPluginServerInitCallback();                                                                              \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
+    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
     MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();
+    MatterTemperatureMeasurementPluginServerInitCallback();
diff --git a/zzz_generated/temperature-measurement-app/zap-generated/access.h b/zzz_generated/temperature-measurement-app/zap-generated/access.h
index dbbc07cdd0f8c0..7352d0fabcfd6b 100644
--- a/zzz_generated/temperature-measurement-app/zap-generated/access.h
+++ b/zzz_generated/temperature-measurement-app/zap-generated/access.h
@@ -38,7 +38,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -46,6 +45,7 @@
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -60,7 +60,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -68,6 +67,7 @@
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -82,7 +82,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -90,6 +89,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -103,8 +103,8 @@
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -116,8 +116,8 @@
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -129,8 +129,8 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -138,21 +138,17 @@
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -161,25 +157,25 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -188,25 +184,25 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -215,6 +211,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/temperature-measurement-app/zap-generated/gen_config.h b/zzz_generated/temperature-measurement-app/zap-generated/gen_config.h
index 8182f0676f4ee4..c5933cc8660a83 100644
--- a/zzz_generated/temperature-measurement-app/zap-generated/gen_config.h
+++ b/zzz_generated/temperature-measurement-app/zap-generated/gen_config.h
@@ -29,119 +29,119 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
 #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
+// Use this macro to check if the server side of the Descriptor cluster is included
+#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR
+
 // Use this macro to check if the server side of the Access Control cluster is included
 #define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
 #define EMBER_AF_PLUGIN_ACCESS_CONTROL
 
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
-
 // Use this macro to check if the server side of the Basic cluster is included
 #define ZCL_USING_BASIC_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_BASIC_SERVER
 #define EMBER_AF_PLUGIN_BASIC
 
-// Use this macro to check if the server side of the Descriptor cluster is included
-#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR
-
-// Use this macro to check if the server side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+// Use this macro to check if the server side of the Localization Configuration cluster is included
+#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
 
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
 
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
+// Use this macro to check if the server side of the Unit Localization cluster is included
+#define ZCL_USING_UNIT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION
 
 // Use this macro to check if the server side of the General Commissioning cluster is included
 #define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
 
+// Use this macro to check if the server side of the Network Commissioning cluster is included
+#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+
 // Use this macro to check if the server side of the General Diagnostics cluster is included
 #define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+// Use this macro to check if the server side of the Software Diagnostics cluster is included
+#define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
 
-// Use this macro to check if the server side of the Localization Configuration cluster is included
-#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
 
-// Use this macro to check if the server side of the Network Commissioning cluster is included
-#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
 
 // Use this macro to check if the server side of the Operational Credentials cluster is included
 #define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
 #define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
 
-// Use this macro to check if the server side of the Software Diagnostics cluster is included
-#define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Temperature Measurement cluster is included
-#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER
-#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT
-
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
 
-// Use this macro to check if the server side of the Unit Localization cluster is included
-#define ZCL_USING_UNIT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
 
 // Use this macro to check if the server side of the User Label cluster is included
 #define ZCL_USING_USER_LABEL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL
 
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Temperature Measurement cluster is included
+#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER
+#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT
diff --git a/zzz_generated/thermostat/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/thermostat/zap-generated/PluginApplicationCallbacks.h
index cdeb9275e625aa..2b513eb1c033c0 100644
--- a/zzz_generated/thermostat/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/thermostat/zap-generated/PluginApplicationCallbacks.h
@@ -22,29 +22,29 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterBindingPluginServerInitCallback();                                                                                       \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
     MatterIdentifyPluginClientInitCallback();                                                                                      \
     MatterIdentifyPluginServerInitCallback();                                                                                      \
+    MatterGroupsPluginServerInitCallback();                                                                                        \
+    MatterScenesPluginServerInitCallback();                                                                                        \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
+    MatterBindingPluginServerInitCallback();                                                                                       \
+    MatterAccessControlPluginServerInitCallback();                                                                                 \
+    MatterBasicPluginServerInitCallback();                                                                                         \
+    MatterOtaSoftwareUpdateProviderPluginServerInitCallback();                                                                     \
     MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterUnitLocalizationPluginServerInitCallback();                                                                              \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
     MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterOtaSoftwareUpdateProviderPluginServerInitCallback();                                                                     \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterScenesPluginServerInitCallback();                                                                                        \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThermostatPluginServerInitCallback();                                                                                    \
     MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterUnitLocalizationPluginServerInitCallback();                                                                              \
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
     MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();
+    MatterThermostatPluginServerInitCallback();
diff --git a/zzz_generated/thermostat/zap-generated/access.h b/zzz_generated/thermostat/zap-generated/access.h
index e0d3abe66c821f..c9c4bde0a670c5 100644
--- a/zzz_generated/thermostat/zap-generated/access.h
+++ b/zzz_generated/thermostat/zap-generated/access.h
@@ -38,7 +38,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -46,6 +45,8 @@
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
+    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: view */ \
@@ -53,7 +54,6 @@
     /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \
-    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for read attribute
@@ -67,7 +67,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -75,6 +74,8 @@
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
+    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: view */ \
@@ -82,7 +83,6 @@
     /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \
-    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for read attribute
@@ -96,7 +96,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -104,6 +103,8 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
+    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: view */ \
@@ -111,7 +112,6 @@
     /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \
     /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \
-    /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -124,8 +124,9 @@
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
+    65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
     513, /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: manage */ \
     513, /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: manage */ \
     513, /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: manage */ \
@@ -133,7 +134,6 @@
     513, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \
     513, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \
     513, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \
-    65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for write attribute
@@ -144,8 +144,9 @@
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
+    0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
     21, /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: manage */ \
     22, /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: manage */ \
     23, /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: manage */ \
@@ -153,7 +154,6 @@
     25, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \
     27, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \
     28, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \
-    0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for write attribute
@@ -164,8 +164,9 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: manage */ \
@@ -173,30 +174,33 @@
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -205,33 +209,33 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
     513, /* Cluster: Thermostat, Command: SetWeeklySchedule, Privilege: manage */ \
     513, /* Cluster: Thermostat, Command: ClearWeeklySchedule, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -240,33 +244,33 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
     1, /* Cluster: Thermostat, Command: SetWeeklySchedule, Privilege: manage */ \
     3, /* Cluster: Thermostat, Command: ClearWeeklySchedule, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -275,10 +279,6 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Command: SetWeeklySchedule, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Command: ClearWeeklySchedule, Privilege: manage */ \
 }
diff --git a/zzz_generated/thermostat/zap-generated/gen_config.h b/zzz_generated/thermostat/zap-generated/gen_config.h
index c58ff5a7354abe..7313ea3a5b143b 100644
--- a/zzz_generated/thermostat/zap-generated/gen_config.h
+++ b/zzz_generated/thermostat/zap-generated/gen_config.h
@@ -29,95 +29,35 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
-#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_IDENTIFY_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_OTA_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OTA_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_THERMOSTAT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_THERMOSTAT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
-// Use this macro to check if the server side of the Access Control cluster is included
-#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL
-
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
-
-// Use this macro to check if the server side of the Basic cluster is included
-#define ZCL_USING_BASIC_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BASIC_SERVER
-#define EMBER_AF_PLUGIN_BASIC
-
-// Use this macro to check if the server side of the Binding cluster is included
-#define ZCL_USING_BINDING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BINDING_SERVER
-#define EMBER_AF_PLUGIN_BINDING
-
-// Use this macro to check if the server side of the Descriptor cluster is included
-#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR
-
-// Use this macro to check if the server side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
-
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
-
-// Use this macro to check if the server side of the General Commissioning cluster is included
-#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
-
-// Use this macro to check if the server side of the General Diagnostics cluster is included
-#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
-
-// Use this macro to check if the server side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUPS_SERVER
-#define EMBER_AF_PLUGIN_GROUPS
-
 // Use this macro to check if the client side of the Identify cluster is included
 #define ZCL_USING_IDENTIFY_CLUSTER_CLIENT
 #define EMBER_AF_PLUGIN_IDENTIFY_CLIENT
@@ -127,25 +67,10 @@
 #define EMBER_AF_PLUGIN_IDENTIFY_SERVER
 #define EMBER_AF_PLUGIN_IDENTIFY
 
-// Use this macro to check if the server side of the Localization Configuration cluster is included
-#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
-
-// Use this macro to check if the server side of the Network Commissioning cluster is included
-#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
-
-// Use this macro to check if the server side of the OTA Software Update Provider cluster is included
-#define ZCL_USING_OTA_PROVIDER_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER
-
-// Use this macro to check if the server side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+// Use this macro to check if the server side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUPS_SERVER
+#define EMBER_AF_PLUGIN_GROUPS
 
 // Use this macro to check if the server side of the Scenes cluster is included
 #define ZCL_USING_SCENES_CLUSTER_SERVER
@@ -164,20 +89,35 @@
 #define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
 #define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0000 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
 
-// Use this macro to check if the server side of the Software Diagnostics cluster is included
-#define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
+// Use this macro to check if the server side of the Descriptor cluster is included
+#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR
 
-// Use this macro to check if the server side of the Thermostat cluster is included
-#define ZCL_USING_THERMOSTAT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THERMOSTAT_SERVER
-#define EMBER_AF_PLUGIN_THERMOSTAT
+// Use this macro to check if the server side of the Binding cluster is included
+#define ZCL_USING_BINDING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BINDING_SERVER
+#define EMBER_AF_PLUGIN_BINDING
 
-// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
-#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Access Control cluster is included
+#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL
+
+// Use this macro to check if the server side of the Basic cluster is included
+#define ZCL_USING_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BASIC_SERVER
+#define EMBER_AF_PLUGIN_BASIC
+
+// Use this macro to check if the server side of the OTA Software Update Provider cluster is included
+#define ZCL_USING_OTA_PROVIDER_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER
+
+// Use this macro to check if the server side of the Localization Configuration cluster is included
+#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
 
 // Use this macro to check if the server side of the Time Format Localization cluster is included
 #define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
@@ -189,12 +129,72 @@
 #define EMBER_AF_PLUGIN_UNIT_LOCALIZATION_SERVER
 #define EMBER_AF_PLUGIN_UNIT_LOCALIZATION
 
-// Use this macro to check if the server side of the User Label cluster is included
-#define ZCL_USING_USER_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_USER_LABEL_SERVER
-#define EMBER_AF_PLUGIN_USER_LABEL
+// Use this macro to check if the server side of the General Commissioning cluster is included
+#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
+
+// Use this macro to check if the server side of the Network Commissioning cluster is included
+#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Software Diagnostics cluster is included
+#define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
 
 // Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
 #define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
+
+// Use this macro to check if the server side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
+
+// Use this macro to check if the server side of the User Label cluster is included
+#define ZCL_USING_USER_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_USER_LABEL_SERVER
+#define EMBER_AF_PLUGIN_USER_LABEL
+
+// Use this macro to check if the server side of the Thermostat cluster is included
+#define ZCL_USING_THERMOSTAT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THERMOSTAT_SERVER
+#define EMBER_AF_PLUGIN_THERMOSTAT
diff --git a/zzz_generated/tv-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/tv-app/zap-generated/PluginApplicationCallbacks.h
index e367c00b47b2a9..638b057baa7436 100644
--- a/zzz_generated/tv-app/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/tv-app/zap-generated/PluginApplicationCallbacks.h
@@ -22,43 +22,43 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAccountLoginPluginServerInitCallback();                                                                                  \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterApplicationBasicPluginServerInitCallback();                                                                              \
-    MatterApplicationLauncherPluginServerInitCallback();                                                                           \
-    MatterAudioOutputPluginServerInitCallback();                                                                                   \
-    MatterBasicPluginServerInitCallback();                                                                                         \
+    MatterOnOffPluginServerInitCallback();                                                                                         \
+    MatterLevelControlPluginServerInitCallback();                                                                                  \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
     MatterBindingPluginClientInitCallback();                                                                                       \
     MatterBindingPluginServerInitCallback();                                                                                       \
-    MatterChannelPluginServerInitCallback();                                                                                       \
-    MatterContentLauncherPluginServerInitCallback();                                                                               \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
+    MatterAccessControlPluginServerInitCallback();                                                                                 \
+    MatterBasicPluginServerInitCallback();                                                                                         \
+    MatterOtaSoftwareUpdateProviderPluginServerInitCallback();                                                                     \
+    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterUnitLocalizationPluginServerInitCallback();                                                                              \
     MatterGeneralCommissioningPluginClientInitCallback();                                                                          \
     MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterKeypadInputPluginServerInitCallback();                                                                                   \
-    MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterLowPowerPluginServerInitCallback();                                                                                      \
-    MatterMediaInputPluginServerInitCallback();                                                                                    \
-    MatterMediaPlaybackPluginServerInitCallback();                                                                                 \
     MatterNetworkCommissioningPluginClientInitCallback();                                                                          \
     MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterOtaSoftwareUpdateProviderPluginServerInitCallback();                                                                     \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterOperationalCredentialsPluginClientInitCallback();                                                                        \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterRelativeHumidityMeasurementPluginServerInitCallback();                                                                   \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterTargetNavigatorPluginServerInitCallback();                                                                               \
     MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterUnitLocalizationPluginServerInitCallback();                                                                              \
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginClientInitCallback();                                                                        \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
     MatterUserLabelPluginServerInitCallback();                                                                                     \
+    MatterRelativeHumidityMeasurementPluginServerInitCallback();                                                                   \
     MatterWakeOnLanPluginServerInitCallback();                                                                                     \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();
+    MatterChannelPluginServerInitCallback();                                                                                       \
+    MatterTargetNavigatorPluginServerInitCallback();                                                                               \
+    MatterMediaPlaybackPluginServerInitCallback();                                                                                 \
+    MatterMediaInputPluginServerInitCallback();                                                                                    \
+    MatterLowPowerPluginServerInitCallback();                                                                                      \
+    MatterKeypadInputPluginServerInitCallback();                                                                                   \
+    MatterContentLauncherPluginServerInitCallback();                                                                               \
+    MatterAudioOutputPluginServerInitCallback();                                                                                   \
+    MatterApplicationLauncherPluginServerInitCallback();                                                                           \
+    MatterApplicationBasicPluginServerInitCallback();                                                                              \
+    MatterAccountLoginPluginServerInitCallback();
diff --git a/zzz_generated/tv-app/zap-generated/access.h b/zzz_generated/tv-app/zap-generated/access.h
index b2f2571d0c6328..c1e184f84b7d29 100644
--- a/zzz_generated/tv-app/zap-generated/access.h
+++ b/zzz_generated/tv-app/zap-generated/access.h
@@ -29,6 +29,7 @@
 
 // Parallel array data (*cluster*, attribute, privilege) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__CLUSTER { \
+    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
@@ -38,8 +39,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
-    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -47,11 +46,13 @@
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \
+    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
@@ -61,8 +62,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
-    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -70,11 +69,13 @@
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \
+    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
@@ -84,8 +85,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
-    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -93,6 +92,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -100,43 +100,43 @@
 
 // Parallel array data (*cluster*, attribute, privilege) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__CLUSTER { \
+    8, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
-    8, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__ATTRIBUTE { \
+    16384, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     5, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
-    16384, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__PRIVILEGE { \
+    kMatterAccessPrivilegeManage, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -144,22 +144,18 @@
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -168,26 +164,26 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -196,26 +192,26 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -224,6 +220,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/tv-app/zap-generated/gen_config.h b/zzz_generated/tv-app/zap-generated/gen_config.h
index bd8b3d8b6d2b18..6e62d2728760d0 100644
--- a/zzz_generated/tv-app/zap-generated/gen_config.h
+++ b/zzz_generated/tv-app/zap-generated/gen_config.h
@@ -29,83 +29,67 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
-#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ACCOUNT_LOGIN_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (3)
-#define EMBER_AF_APPLICATION_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_AUDIO_OUTPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (6)
 #define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT (3)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (6)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OTA_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOW_POWER_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_MEDIA_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_MEDIA_PLAYBACK_CLUSTER_SERVER_ENDPOINT_COUNT (2)
 #define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OTA_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_WAKE_ON_LAN_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_MEDIA_PLAYBACK_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_MEDIA_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOW_POWER_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT (3)
+#define EMBER_AF_AUDIO_OUTPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_APPLICATION_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (3)
+#define EMBER_AF_ACCOUNT_LOGIN_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
-// Use this macro to check if the server side of the Access Control cluster is included
-#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL
-
-// Use this macro to check if the server side of the Account Login cluster is included
-#define ZCL_USING_ACCOUNT_LOGIN_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ACCOUNT_LOGIN_SERVER
-#define EMBER_AF_PLUGIN_ACCOUNT_LOGIN
-
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
-
-// Use this macro to check if the server side of the Application Basic cluster is included
-#define ZCL_USING_APPLICATION_BASIC_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_APPLICATION_BASIC_SERVER
-#define EMBER_AF_PLUGIN_APPLICATION_BASIC
-
-// Use this macro to check if the server side of the Application Launcher cluster is included
-#define ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_APPLICATION_LAUNCHER_SERVER
-#define EMBER_AF_PLUGIN_APPLICATION_LAUNCHER
+// Use this macro to check if the server side of the On/Off cluster is included
+#define ZCL_USING_ON_OFF_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF
 
-// Use this macro to check if the server side of the Audio Output cluster is included
-#define ZCL_USING_AUDIO_OUTPUT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_AUDIO_OUTPUT_SERVER
-#define EMBER_AF_PLUGIN_AUDIO_OUTPUT
+// Use this macro to check if the server side of the Level Control cluster is included
+#define ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL
+// User options for server plugin Level Control
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL 254
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0
 
-// Use this macro to check if the server side of the Basic cluster is included
-#define ZCL_USING_BASIC_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BASIC_SERVER
-#define EMBER_AF_PLUGIN_BASIC
+// Use this macro to check if the server side of the Descriptor cluster is included
+#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
+#define EMBER_AF_PLUGIN_DESCRIPTOR
 
 // Use this macro to check if the client side of the Binding cluster is included
 #define ZCL_USING_BINDING_CLUSTER_CLIENT
@@ -116,35 +100,35 @@
 #define EMBER_AF_PLUGIN_BINDING_SERVER
 #define EMBER_AF_PLUGIN_BINDING
 
-// Use this macro to check if the server side of the Channel cluster is included
-#define ZCL_USING_CHANNEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_CHANNEL_SERVER
-#define EMBER_AF_PLUGIN_CHANNEL
+// Use this macro to check if the server side of the Access Control cluster is included
+#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL
 
-// Use this macro to check if the server side of the Content Launcher cluster is included
-#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_SERVER
-#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER
+// Use this macro to check if the server side of the Basic cluster is included
+#define ZCL_USING_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BASIC_SERVER
+#define EMBER_AF_PLUGIN_BASIC
 
-// Use this macro to check if the server side of the Descriptor cluster is included
-#define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
-#define EMBER_AF_PLUGIN_DESCRIPTOR
+// Use this macro to check if the server side of the OTA Software Update Provider cluster is included
+#define ZCL_USING_OTA_PROVIDER_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER
 
-// Use this macro to check if the server side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
+// Use this macro to check if the server side of the Localization Configuration cluster is included
+#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
 
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
 
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
+// Use this macro to check if the server side of the Unit Localization cluster is included
+#define ZCL_USING_UNIT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION
 
 // Use this macro to check if the client side of the General Commissioning cluster is included
 #define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_CLIENT
@@ -155,50 +139,6 @@
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
 
-// Use this macro to check if the server side of the General Diagnostics cluster is included
-#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
-
-// Use this macro to check if the server side of the Keypad Input cluster is included
-#define ZCL_USING_KEYPAD_INPUT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_KEYPAD_INPUT_SERVER
-#define EMBER_AF_PLUGIN_KEYPAD_INPUT
-
-// Use this macro to check if the server side of the Level Control cluster is included
-#define ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL
-// User options for server plugin Level Control
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL 254
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0
-
-// Use this macro to check if the server side of the Localization Configuration cluster is included
-#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
-
-// Use this macro to check if the server side of the Low Power cluster is included
-#define ZCL_USING_LOW_POWER_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LOW_POWER_SERVER
-#define EMBER_AF_PLUGIN_LOW_POWER
-
-// Use this macro to check if the server side of the Media Input cluster is included
-#define ZCL_USING_MEDIA_INPUT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_MEDIA_INPUT_SERVER
-#define EMBER_AF_PLUGIN_MEDIA_INPUT
-
-// Use this macro to check if the server side of the Media Playback cluster is included
-#define ZCL_USING_MEDIA_PLAYBACK_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_MEDIA_PLAYBACK_SERVER
-#define EMBER_AF_PLUGIN_MEDIA_PLAYBACK
-
 // Use this macro to check if the client side of the Network Commissioning cluster is included
 #define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_CLIENT
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_CLIENT
@@ -208,15 +148,40 @@
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
 
-// Use this macro to check if the server side of the OTA Software Update Provider cluster is included
-#define ZCL_USING_OTA_PROVIDER_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
 
-// Use this macro to check if the server side of the On/Off cluster is included
-#define ZCL_USING_ON_OFF_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Software Diagnostics cluster is included
+#define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
 
 // Use this macro to check if the client side of the Operational Credentials cluster is included
 #define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_CLIENT
@@ -227,47 +192,82 @@
 #define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
 #define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
 
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
+
+// Use this macro to check if the server side of the User Label cluster is included
+#define ZCL_USING_USER_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_USER_LABEL_SERVER
+#define EMBER_AF_PLUGIN_USER_LABEL
+
 // Use this macro to check if the server side of the Relative Humidity Measurement cluster is included
 #define ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_RELATIVE_HUMIDITY_MEASUREMENT_SERVER
 #define EMBER_AF_PLUGIN_RELATIVE_HUMIDITY_MEASUREMENT
 
-// Use this macro to check if the server side of the Software Diagnostics cluster is included
-#define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
+// Use this macro to check if the server side of the Wake on LAN cluster is included
+#define ZCL_USING_WAKE_ON_LAN_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WAKE_ON_LAN_SERVER
+#define EMBER_AF_PLUGIN_WAKE_ON_LAN
+
+// Use this macro to check if the server side of the Channel cluster is included
+#define ZCL_USING_CHANNEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_CHANNEL_SERVER
+#define EMBER_AF_PLUGIN_CHANNEL
 
 // Use this macro to check if the server side of the Target Navigator cluster is included
 #define ZCL_USING_TARGET_NAVIGATOR_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_TARGET_NAVIGATOR_SERVER
 #define EMBER_AF_PLUGIN_TARGET_NAVIGATOR
 
-// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
-#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Media Playback cluster is included
+#define ZCL_USING_MEDIA_PLAYBACK_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_MEDIA_PLAYBACK_SERVER
+#define EMBER_AF_PLUGIN_MEDIA_PLAYBACK
 
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+// Use this macro to check if the server side of the Media Input cluster is included
+#define ZCL_USING_MEDIA_INPUT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_MEDIA_INPUT_SERVER
+#define EMBER_AF_PLUGIN_MEDIA_INPUT
 
-// Use this macro to check if the server side of the Unit Localization cluster is included
-#define ZCL_USING_UNIT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION
+// Use this macro to check if the server side of the Low Power cluster is included
+#define ZCL_USING_LOW_POWER_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOW_POWER_SERVER
+#define EMBER_AF_PLUGIN_LOW_POWER
 
-// Use this macro to check if the server side of the User Label cluster is included
-#define ZCL_USING_USER_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_USER_LABEL_SERVER
-#define EMBER_AF_PLUGIN_USER_LABEL
+// Use this macro to check if the server side of the Keypad Input cluster is included
+#define ZCL_USING_KEYPAD_INPUT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_KEYPAD_INPUT_SERVER
+#define EMBER_AF_PLUGIN_KEYPAD_INPUT
 
-// Use this macro to check if the server side of the Wake on LAN cluster is included
-#define ZCL_USING_WAKE_ON_LAN_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WAKE_ON_LAN_SERVER
-#define EMBER_AF_PLUGIN_WAKE_ON_LAN
+// Use this macro to check if the server side of the Content Launcher cluster is included
+#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_SERVER
+#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER
 
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Audio Output cluster is included
+#define ZCL_USING_AUDIO_OUTPUT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_AUDIO_OUTPUT_SERVER
+#define EMBER_AF_PLUGIN_AUDIO_OUTPUT
+
+// Use this macro to check if the server side of the Application Launcher cluster is included
+#define ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_APPLICATION_LAUNCHER_SERVER
+#define EMBER_AF_PLUGIN_APPLICATION_LAUNCHER
+
+// Use this macro to check if the server side of the Application Basic cluster is included
+#define ZCL_USING_APPLICATION_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_APPLICATION_BASIC_SERVER
+#define EMBER_AF_PLUGIN_APPLICATION_BASIC
+
+// Use this macro to check if the server side of the Account Login cluster is included
+#define ZCL_USING_ACCOUNT_LOGIN_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACCOUNT_LOGIN_SERVER
+#define EMBER_AF_PLUGIN_ACCOUNT_LOGIN
diff --git a/zzz_generated/tv-casting-app/zap-generated/CHIPClientCallbacks.h b/zzz_generated/tv-casting-app/zap-generated/CHIPClientCallbacks.h
index ec7b36c00ae0bc..31a687492486fa 100644
--- a/zzz_generated/tv-casting-app/zap-generated/CHIPClientCallbacks.h
+++ b/zzz_generated/tv-casting-app/zap-generated/CHIPClientCallbacks.h
@@ -30,16 +30,6 @@
 #include <lib/support/Span.h>
 
 // List specific responses
-typedef void (*ApplicationLauncherCatalogListListAttributeCallback)(void * context,
-                                                                    const chip::app::DataModel::DecodableList<uint16_t> & data);
-typedef void (*AudioOutputOutputListListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::OutputInfo::DecodableType> & data);
-typedef void (*ChannelChannelListListAttributeCallback)(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> & data);
-typedef void (*ContentLauncherAcceptHeaderListAttributeCallback)(void * context,
-                                                                 const chip::app::DataModel::DecodableList<chip::CharSpan> & data);
 typedef void (*DescriptorDeviceListListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::DeviceType::DecodableType> & data);
@@ -49,9 +39,19 @@ typedef void (*DescriptorClientListListAttributeCallback)(void * context,
                                                           const chip::app::DataModel::DecodableList<chip::ClusterId> & data);
 typedef void (*DescriptorPartsListListAttributeCallback)(void * context,
                                                          const chip::app::DataModel::DecodableList<chip::EndpointId> & data);
-typedef void (*MediaInputInputListListAttributeCallback)(
+typedef void (*ChannelChannelListListAttributeCallback)(
     void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::InputInfo::DecodableType> & data);
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType> & data);
 typedef void (*TargetNavigatorTargetListListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType> & data);
+typedef void (*MediaInputInputListListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::InputInfo::DecodableType> & data);
+typedef void (*ContentLauncherAcceptHeaderListAttributeCallback)(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::CharSpan> & data);
+typedef void (*AudioOutputOutputListListAttributeCallback)(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::OutputInfo::DecodableType> & data);
+typedef void (*ApplicationLauncherCatalogListListAttributeCallback)(void * context,
+                                                                    const chip::app::DataModel::DecodableList<uint16_t> & data);
diff --git a/zzz_generated/tv-casting-app/zap-generated/CHIPClusters.h b/zzz_generated/tv-casting-app/zap-generated/CHIPClusters.h
index 028b5bee73925f..bd719d0936c76e 100644
--- a/zzz_generated/tv-casting-app/zap-generated/CHIPClusters.h
+++ b/zzz_generated/tv-casting-app/zap-generated/CHIPClusters.h
@@ -30,53 +30,53 @@
 namespace chip {
 namespace Controller {
 
-class DLL_EXPORT AccountLoginCluster : public ClusterBase
+class DLL_EXPORT OnOffCluster : public ClusterBase
 {
 public:
-    AccountLoginCluster() : ClusterBase(app::Clusters::AccountLogin::Id) {}
-    ~AccountLoginCluster() {}
+    OnOffCluster() : ClusterBase(app::Clusters::OnOff::Id) {}
+    ~OnOffCluster() {}
 };
 
-class DLL_EXPORT ApplicationBasicCluster : public ClusterBase
+class DLL_EXPORT LevelControlCluster : public ClusterBase
 {
 public:
-    ApplicationBasicCluster() : ClusterBase(app::Clusters::ApplicationBasic::Id) {}
-    ~ApplicationBasicCluster() {}
+    LevelControlCluster() : ClusterBase(app::Clusters::LevelControl::Id) {}
+    ~LevelControlCluster() {}
 };
 
-class DLL_EXPORT ApplicationLauncherCluster : public ClusterBase
+class DLL_EXPORT DescriptorCluster : public ClusterBase
 {
 public:
-    ApplicationLauncherCluster() : ClusterBase(app::Clusters::ApplicationLauncher::Id) {}
-    ~ApplicationLauncherCluster() {}
+    DescriptorCluster() : ClusterBase(app::Clusters::Descriptor::Id) {}
+    ~DescriptorCluster() {}
 };
 
-class DLL_EXPORT AudioOutputCluster : public ClusterBase
+class DLL_EXPORT ChannelCluster : public ClusterBase
 {
 public:
-    AudioOutputCluster() : ClusterBase(app::Clusters::AudioOutput::Id) {}
-    ~AudioOutputCluster() {}
+    ChannelCluster() : ClusterBase(app::Clusters::Channel::Id) {}
+    ~ChannelCluster() {}
 };
 
-class DLL_EXPORT ChannelCluster : public ClusterBase
+class DLL_EXPORT TargetNavigatorCluster : public ClusterBase
 {
 public:
-    ChannelCluster() : ClusterBase(app::Clusters::Channel::Id) {}
-    ~ChannelCluster() {}
+    TargetNavigatorCluster() : ClusterBase(app::Clusters::TargetNavigator::Id) {}
+    ~TargetNavigatorCluster() {}
 };
 
-class DLL_EXPORT ContentLauncherCluster : public ClusterBase
+class DLL_EXPORT MediaPlaybackCluster : public ClusterBase
 {
 public:
-    ContentLauncherCluster() : ClusterBase(app::Clusters::ContentLauncher::Id) {}
-    ~ContentLauncherCluster() {}
+    MediaPlaybackCluster() : ClusterBase(app::Clusters::MediaPlayback::Id) {}
+    ~MediaPlaybackCluster() {}
 };
 
-class DLL_EXPORT DescriptorCluster : public ClusterBase
+class DLL_EXPORT MediaInputCluster : public ClusterBase
 {
 public:
-    DescriptorCluster() : ClusterBase(app::Clusters::Descriptor::Id) {}
-    ~DescriptorCluster() {}
+    MediaInputCluster() : ClusterBase(app::Clusters::MediaInput::Id) {}
+    ~MediaInputCluster() {}
 };
 
 class DLL_EXPORT KeypadInputCluster : public ClusterBase
@@ -86,39 +86,39 @@ class DLL_EXPORT KeypadInputCluster : public ClusterBase
     ~KeypadInputCluster() {}
 };
 
-class DLL_EXPORT LevelControlCluster : public ClusterBase
+class DLL_EXPORT ContentLauncherCluster : public ClusterBase
 {
 public:
-    LevelControlCluster() : ClusterBase(app::Clusters::LevelControl::Id) {}
-    ~LevelControlCluster() {}
+    ContentLauncherCluster() : ClusterBase(app::Clusters::ContentLauncher::Id) {}
+    ~ContentLauncherCluster() {}
 };
 
-class DLL_EXPORT MediaInputCluster : public ClusterBase
+class DLL_EXPORT AudioOutputCluster : public ClusterBase
 {
 public:
-    MediaInputCluster() : ClusterBase(app::Clusters::MediaInput::Id) {}
-    ~MediaInputCluster() {}
+    AudioOutputCluster() : ClusterBase(app::Clusters::AudioOutput::Id) {}
+    ~AudioOutputCluster() {}
 };
 
-class DLL_EXPORT MediaPlaybackCluster : public ClusterBase
+class DLL_EXPORT ApplicationLauncherCluster : public ClusterBase
 {
 public:
-    MediaPlaybackCluster() : ClusterBase(app::Clusters::MediaPlayback::Id) {}
-    ~MediaPlaybackCluster() {}
+    ApplicationLauncherCluster() : ClusterBase(app::Clusters::ApplicationLauncher::Id) {}
+    ~ApplicationLauncherCluster() {}
 };
 
-class DLL_EXPORT OnOffCluster : public ClusterBase
+class DLL_EXPORT ApplicationBasicCluster : public ClusterBase
 {
 public:
-    OnOffCluster() : ClusterBase(app::Clusters::OnOff::Id) {}
-    ~OnOffCluster() {}
+    ApplicationBasicCluster() : ClusterBase(app::Clusters::ApplicationBasic::Id) {}
+    ~ApplicationBasicCluster() {}
 };
 
-class DLL_EXPORT TargetNavigatorCluster : public ClusterBase
+class DLL_EXPORT AccountLoginCluster : public ClusterBase
 {
 public:
-    TargetNavigatorCluster() : ClusterBase(app::Clusters::TargetNavigator::Id) {}
-    ~TargetNavigatorCluster() {}
+    AccountLoginCluster() : ClusterBase(app::Clusters::AccountLogin::Id) {}
+    ~AccountLoginCluster() {}
 };
 
 } // namespace Controller
diff --git a/zzz_generated/tv-casting-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/tv-casting-app/zap-generated/PluginApplicationCallbacks.h
index b9cc483ecb88a6..d7963d5e5abad2 100644
--- a/zzz_generated/tv-casting-app/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/tv-casting-app/zap-generated/PluginApplicationCallbacks.h
@@ -22,46 +22,46 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAccountLoginPluginClientInitCallback();                                                                                  \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterApplicationBasicPluginClientInitCallback();                                                                              \
-    MatterApplicationLauncherPluginClientInitCallback();                                                                           \
-    MatterAudioOutputPluginClientInitCallback();                                                                                   \
-    MatterBarrierControlPluginServerInitCallback();                                                                                \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterBinaryInputBasicPluginServerInitCallback();                                                                              \
-    MatterBindingPluginServerInitCallback();                                                                                       \
-    MatterChannelPluginClientInitCallback();                                                                                       \
-    MatterContentLauncherPluginClientInitCallback();                                                                               \
-    MatterDescriptorPluginClientInitCallback();                                                                                    \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
     MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterKeypadInputPluginClientInitCallback();                                                                                   \
+    MatterGroupsPluginServerInitCallback();                                                                                        \
+    MatterScenesPluginServerInitCallback();                                                                                        \
+    MatterOnOffPluginClientInitCallback();                                                                                         \
+    MatterOnOffPluginServerInitCallback();                                                                                         \
     MatterLevelControlPluginClientInitCallback();                                                                                  \
     MatterLevelControlPluginServerInitCallback();                                                                                  \
+    MatterBinaryInputBasicPluginServerInitCallback();                                                                              \
+    MatterDescriptorPluginClientInitCallback();                                                                                    \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
+    MatterBindingPluginServerInitCallback();                                                                                       \
+    MatterAccessControlPluginServerInitCallback();                                                                                 \
+    MatterBasicPluginServerInitCallback();                                                                                         \
+    MatterOtaSoftwareUpdateProviderPluginServerInitCallback();                                                                     \
     MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterMediaInputPluginClientInitCallback();                                                                                    \
-    MatterMediaPlaybackPluginClientInitCallback();                                                                                 \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterUnitLocalizationPluginServerInitCallback();                                                                              \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
     MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterOtaSoftwareUpdateProviderPluginServerInitCallback();                                                                     \
-    MatterOnOffPluginClientInitCallback();                                                                                         \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterScenesPluginServerInitCallback();                                                                                        \
+    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterTargetNavigatorPluginClientInitCallback();                                                                               \
     MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterUnitLocalizationPluginServerInitCallback();                                                                              \
+    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
+    MatterSwitchPluginServerInitCallback();                                                                                        \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
     MatterUserLabelPluginServerInitCallback();                                                                                     \
+    MatterBarrierControlPluginServerInitCallback();                                                                                \
     MatterWakeOnLanPluginServerInitCallback();                                                                                     \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();
+    MatterChannelPluginClientInitCallback();                                                                                       \
+    MatterTargetNavigatorPluginClientInitCallback();                                                                               \
+    MatterMediaPlaybackPluginClientInitCallback();                                                                                 \
+    MatterMediaInputPluginClientInitCallback();                                                                                    \
+    MatterKeypadInputPluginClientInitCallback();                                                                                   \
+    MatterContentLauncherPluginClientInitCallback();                                                                               \
+    MatterAudioOutputPluginClientInitCallback();                                                                                   \
+    MatterApplicationLauncherPluginClientInitCallback();                                                                           \
+    MatterApplicationBasicPluginClientInitCallback();                                                                              \
+    MatterAccountLoginPluginClientInitCallback();
diff --git a/zzz_generated/tv-casting-app/zap-generated/access.h b/zzz_generated/tv-casting-app/zap-generated/access.h
index 9424d3b4133ddf..7400a0c2b814f7 100644
--- a/zzz_generated/tv-casting-app/zap-generated/access.h
+++ b/zzz_generated/tv-casting-app/zap-generated/access.h
@@ -29,6 +29,8 @@
 
 // Parallel array data (*cluster*, attribute, privilege) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__CLUSTER { \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
+    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
@@ -38,21 +40,21 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
-    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
+    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
@@ -62,21 +64,21 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
-    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
     5, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for read attribute
 #define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \
+    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
+    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
@@ -86,16 +88,14 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
-    /* Cluster: Level Control, Attribute: start up current level, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
-    /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
 }
 
@@ -103,46 +103,46 @@
 
 // Parallel array data (*cluster*, attribute, privilege) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__CLUSTER { \
+    6, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    8, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
-    8, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    6, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__ATTRIBUTE { \
+    16387, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    16384, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     5, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
-    16384, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    16387, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for write attribute
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__PRIVILEGE { \
+    kMatterAccessPrivilegeManage, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Level Control, Attribute: start up current level, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
 }
 
@@ -150,27 +150,27 @@
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -179,35 +179,35 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    5, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    5, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -216,35 +216,35 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    0, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    2, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    3, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    4, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -253,10 +253,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: AddScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveScene, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: RemoveAllScenes, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Scenes, Command: StoreScene, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/tv-casting-app/zap-generated/gen_config.h b/zzz_generated/tv-casting-app/zap-generated/gen_config.h
index c25f118c487727..74c6a80ad83308 100644
--- a/zzz_generated/tv-casting-app/zap-generated/gen_config.h
+++ b/zzz_generated/tv-casting-app/zap-generated/gen_config.h
@@ -29,106 +29,106 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
-#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ACCOUNT_LOGIN_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_APPLICATION_BASIC_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_APPLICATION_LAUNCHER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_AUDIO_OUTPUT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_BARRIER_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BINARY_INPUT_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_CHANNEL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (3)
-#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_KEYPAD_INPUT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ON_OFF_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (2)
 #define EMBER_AF_LEVEL_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BINARY_INPUT_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (3)
+#define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OTA_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_MEDIA_INPUT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_MEDIA_PLAYBACK_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OTA_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ON_OFF_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TARGET_NAVIGATOR_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (2)
 #define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_BARRIER_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_WAKE_ON_LAN_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_CHANNEL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_TARGET_NAVIGATOR_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_MEDIA_PLAYBACK_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_MEDIA_INPUT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_KEYPAD_INPUT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_AUDIO_OUTPUT_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_APPLICATION_LAUNCHER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_APPLICATION_BASIC_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_ACCOUNT_LOGIN_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 
 /**** Cluster Plugins ****/
 
-// Use this macro to check if the server side of the Access Control cluster is included
-#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
 
-// Use this macro to check if the client side of the Account Login cluster is included
-#define ZCL_USING_ACCOUNT_LOGIN_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_ACCOUNT_LOGIN_CLIENT
+// Use this macro to check if the server side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUPS_SERVER
+#define EMBER_AF_PLUGIN_GROUPS
 
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
+// Use this macro to check if the server side of the Scenes cluster is included
+#define ZCL_USING_SCENES_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_SCENES_SERVER
+#define EMBER_AF_PLUGIN_SCENES
+// User options for server plugin Scenes
+// Cluster spec 1.4.8.2
+#ifdef CHIP_CONFIG_MAX_SCENES_PER_FABRIC
+#define MATTER_SCENES_TABLE_SIZE CHIP_CONFIG_MAX_SCENES_PER_FABRIC
+#else
+#define MATTER_SCENES_TABLE_SIZE 16
+#endif
 
-// Use this macro to check if the client side of the Application Basic cluster is included
-#define ZCL_USING_APPLICATION_BASIC_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_APPLICATION_BASIC_CLIENT
+// Scenes FeatureMap Attribute Toggle Scenes Name feature
+// App cluster specs 1.4.4
+#define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
+#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0000 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
 
-// Use this macro to check if the client side of the Application Launcher cluster is included
-#define ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_APPLICATION_LAUNCHER_CLIENT
+// Use this macro to check if the client side of the On/Off cluster is included
+#define ZCL_USING_ON_OFF_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_ON_OFF_CLIENT
 
-// Use this macro to check if the client side of the Audio Output cluster is included
-#define ZCL_USING_AUDIO_OUTPUT_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_AUDIO_OUTPUT_CLIENT
+// Use this macro to check if the server side of the On/Off cluster is included
+#define ZCL_USING_ON_OFF_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF_SERVER
+#define EMBER_AF_PLUGIN_ON_OFF
 
-// Use this macro to check if the server side of the Barrier Control cluster is included
-#define ZCL_USING_BARRIER_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BARRIER_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_BARRIER_CONTROL
+// Use this macro to check if the client side of the Level Control cluster is included
+#define ZCL_USING_LEVEL_CONTROL_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_CLIENT
 
-// Use this macro to check if the server side of the Basic cluster is included
-#define ZCL_USING_BASIC_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BASIC_SERVER
-#define EMBER_AF_PLUGIN_BASIC
+// Use this macro to check if the server side of the Level Control cluster is included
+#define ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL
+// User options for server plugin Level Control
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL 254
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0
+#define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0
 
 // Use this macro to check if the server side of the Binary Input (Basic) cluster is included
 #define ZCL_USING_BINARY_INPUT_BASIC_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_BINARY_INPUT_BASIC_SERVER
 #define EMBER_AF_PLUGIN_BINARY_INPUT_BASIC
 
-// Use this macro to check if the server side of the Binding cluster is included
-#define ZCL_USING_BINDING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BINDING_SERVER
-#define EMBER_AF_PLUGIN_BINDING
-
-// Use this macro to check if the client side of the Channel cluster is included
-#define ZCL_USING_CHANNEL_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_CHANNEL_CLIENT
-
-// Use this macro to check if the client side of the Content Launcher cluster is included
-#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_CLIENT
-
 // Use this macro to check if the client side of the Descriptor cluster is included
 #define ZCL_USING_DESCRIPTOR_CLUSTER_CLIENT
 #define EMBER_AF_PLUGIN_DESCRIPTOR_CLIENT
@@ -138,157 +138,157 @@
 #define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
 #define EMBER_AF_PLUGIN_DESCRIPTOR
 
-// Use this macro to check if the server side of the Diagnostic Logs cluster is included
-#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
-#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
-
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
-
-// Use this macro to check if the server side of the General Commissioning cluster is included
-#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
-
-// Use this macro to check if the server side of the General Diagnostics cluster is included
-#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
-
-// Use this macro to check if the server side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUPS_SERVER
-#define EMBER_AF_PLUGIN_GROUPS
-
-// Use this macro to check if the server side of the Identify cluster is included
-#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY
+// Use this macro to check if the server side of the Binding cluster is included
+#define ZCL_USING_BINDING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BINDING_SERVER
+#define EMBER_AF_PLUGIN_BINDING
 
-// Use this macro to check if the client side of the Keypad Input cluster is included
-#define ZCL_USING_KEYPAD_INPUT_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_KEYPAD_INPUT_CLIENT
+// Use this macro to check if the server side of the Access Control cluster is included
+#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL
 
-// Use this macro to check if the client side of the Level Control cluster is included
-#define ZCL_USING_LEVEL_CONTROL_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_CLIENT
+// Use this macro to check if the server side of the Basic cluster is included
+#define ZCL_USING_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BASIC_SERVER
+#define EMBER_AF_PLUGIN_BASIC
 
-// Use this macro to check if the server side of the Level Control cluster is included
-#define ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL
-// User options for server plugin Level Control
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL 254
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0
-#define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0
+// Use this macro to check if the server side of the OTA Software Update Provider cluster is included
+#define ZCL_USING_OTA_PROVIDER_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_SERVER
+#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER
 
 // Use this macro to check if the server side of the Localization Configuration cluster is included
 #define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
 #define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
 
-// Use this macro to check if the client side of the Media Input cluster is included
-#define ZCL_USING_MEDIA_INPUT_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_MEDIA_INPUT_CLIENT
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
 
-// Use this macro to check if the client side of the Media Playback cluster is included
-#define ZCL_USING_MEDIA_PLAYBACK_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_MEDIA_PLAYBACK_CLIENT
+// Use this macro to check if the server side of the Unit Localization cluster is included
+#define ZCL_USING_UNIT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION
+
+// Use this macro to check if the server side of the General Commissioning cluster is included
+#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
 
 // Use this macro to check if the server side of the Network Commissioning cluster is included
 #define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
 
-// Use this macro to check if the server side of the OTA Software Update Provider cluster is included
-#define ZCL_USING_OTA_PROVIDER_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_SERVER
-#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER
-
-// Use this macro to check if the client side of the On/Off cluster is included
-#define ZCL_USING_ON_OFF_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_ON_OFF_CLIENT
-
-// Use this macro to check if the server side of the On/Off cluster is included
-#define ZCL_USING_ON_OFF_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF_SERVER
-#define EMBER_AF_PLUGIN_ON_OFF
-
-// Use this macro to check if the server side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
-
-// Use this macro to check if the server side of the Scenes cluster is included
-#define ZCL_USING_SCENES_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_SCENES_SERVER
-#define EMBER_AF_PLUGIN_SCENES
-// User options for server plugin Scenes
-// Cluster spec 1.4.8.2
-#ifdef CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#define MATTER_SCENES_TABLE_SIZE CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#else
-#define MATTER_SCENES_TABLE_SIZE 16
-#endif
+// Use this macro to check if the server side of the Diagnostic Logs cluster is included
+#define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER
+#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS
 
-// Scenes FeatureMap Attribute Toggle Scenes Name feature
-// App cluster specs 1.4.4
-#define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
-#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0000 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
 // Use this macro to check if the server side of the Software Diagnostics cluster is included
 #define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS
 
+// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
+#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+
 // Use this macro to check if the server side of the Switch cluster is included
 #define ZCL_USING_SWITCH_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_SWITCH_SERVER
 #define EMBER_AF_PLUGIN_SWITCH
 
-// Use this macro to check if the client side of the Target Navigator cluster is included
-#define ZCL_USING_TARGET_NAVIGATOR_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_TARGET_NAVIGATOR_CLIENT
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
 
-// Use this macro to check if the server side of the Thread Network Diagnostics cluster is included
-#define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
+// Use this macro to check if the server side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
 
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
 
-// Use this macro to check if the server side of the Unit Localization cluster is included
-#define ZCL_USING_UNIT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
 
 // Use this macro to check if the server side of the User Label cluster is included
 #define ZCL_USING_USER_LABEL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL
 
+// Use this macro to check if the server side of the Barrier Control cluster is included
+#define ZCL_USING_BARRIER_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BARRIER_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_BARRIER_CONTROL
+
 // Use this macro to check if the server side of the Wake on LAN cluster is included
 #define ZCL_USING_WAKE_ON_LAN_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_WAKE_ON_LAN_SERVER
 #define EMBER_AF_PLUGIN_WAKE_ON_LAN
 
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
+// Use this macro to check if the client side of the Channel cluster is included
+#define ZCL_USING_CHANNEL_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_CHANNEL_CLIENT
+
+// Use this macro to check if the client side of the Target Navigator cluster is included
+#define ZCL_USING_TARGET_NAVIGATOR_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_TARGET_NAVIGATOR_CLIENT
+
+// Use this macro to check if the client side of the Media Playback cluster is included
+#define ZCL_USING_MEDIA_PLAYBACK_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_MEDIA_PLAYBACK_CLIENT
+
+// Use this macro to check if the client side of the Media Input cluster is included
+#define ZCL_USING_MEDIA_INPUT_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_MEDIA_INPUT_CLIENT
+
+// Use this macro to check if the client side of the Keypad Input cluster is included
+#define ZCL_USING_KEYPAD_INPUT_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_KEYPAD_INPUT_CLIENT
+
+// Use this macro to check if the client side of the Content Launcher cluster is included
+#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_CLIENT
+
+// Use this macro to check if the client side of the Audio Output cluster is included
+#define ZCL_USING_AUDIO_OUTPUT_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_AUDIO_OUTPUT_CLIENT
+
+// Use this macro to check if the client side of the Application Launcher cluster is included
+#define ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_APPLICATION_LAUNCHER_CLIENT
+
+// Use this macro to check if the client side of the Application Basic cluster is included
+#define ZCL_USING_APPLICATION_BASIC_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_APPLICATION_BASIC_CLIENT
+
+// Use this macro to check if the client side of the Account Login cluster is included
+#define ZCL_USING_ACCOUNT_LOGIN_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_ACCOUNT_LOGIN_CLIENT
diff --git a/zzz_generated/window-app/zap-generated/CHIPClusters.h b/zzz_generated/window-app/zap-generated/CHIPClusters.h
index 5c2df48044289f..f1955951ca6d77 100644
--- a/zzz_generated/window-app/zap-generated/CHIPClusters.h
+++ b/zzz_generated/window-app/zap-generated/CHIPClusters.h
@@ -30,18 +30,18 @@
 namespace chip {
 namespace Controller {
 
-class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
+class DLL_EXPORT ScenesCluster : public ClusterBase
 {
 public:
-    OtaSoftwareUpdateProviderCluster() : ClusterBase(app::Clusters::OtaSoftwareUpdateProvider::Id) {}
-    ~OtaSoftwareUpdateProviderCluster() {}
+    ScenesCluster() : ClusterBase(app::Clusters::Scenes::Id) {}
+    ~ScenesCluster() {}
 };
 
-class DLL_EXPORT ScenesCluster : public ClusterBase
+class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
 {
 public:
-    ScenesCluster() : ClusterBase(app::Clusters::Scenes::Id) {}
-    ~ScenesCluster() {}
+    OtaSoftwareUpdateProviderCluster() : ClusterBase(app::Clusters::OtaSoftwareUpdateProvider::Id) {}
+    ~OtaSoftwareUpdateProviderCluster() {}
 };
 
 } // namespace Controller
diff --git a/zzz_generated/window-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/window-app/zap-generated/PluginApplicationCallbacks.h
index 87eeac9caaeb85..6886961518449a 100644
--- a/zzz_generated/window-app/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/window-app/zap-generated/PluginApplicationCallbacks.h
@@ -22,28 +22,28 @@
 #include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 
 #define MATTER_PLUGINS_INIT                                                                                                        \
+    MatterIdentifyPluginServerInitCallback();                                                                                      \
+    MatterGroupsPluginServerInitCallback();                                                                                        \
+    MatterScenesPluginClientInitCallback();                                                                                        \
+    MatterDescriptorPluginServerInitCallback();                                                                                    \
     MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
     MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
     MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
     MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
+    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
+    MatterUnitLocalizationPluginServerInitCallback();                                                                              \
     MatterPowerSourcePluginServerInitCallback();                                                                                   \
-    MatterScenesPluginClientInitCallback();                                                                                        \
+    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
+    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
+    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
     MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
     MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterUnitLocalizationPluginServerInitCallback();                                                                              \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
     MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
+    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
+    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
+    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
+    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
+    MatterFixedLabelPluginServerInitCallback();                                                                                    \
+    MatterUserLabelPluginServerInitCallback();                                                                                     \
     MatterWindowCoveringPluginServerInitCallback();
diff --git a/zzz_generated/window-app/zap-generated/access.h b/zzz_generated/window-app/zap-generated/access.h
index 223b50e01cebc6..8188d30bfbeb5c 100644
--- a/zzz_generated/window-app/zap-generated/access.h
+++ b/zzz_generated/window-app/zap-generated/access.h
@@ -38,7 +38,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -46,6 +45,7 @@
     49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
     /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
 }
@@ -61,7 +61,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -69,6 +68,7 @@
     6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
     /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
 }
@@ -84,7 +84,6 @@
     /* Cluster: Basic, Attribute: Location, Privilege: view */ \
     /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \
     /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
-    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
     /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: view */ \
@@ -92,6 +91,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \
+    /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \
     /* Cluster: User Label, Attribute: label list, Privilege: view */ \
     /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \
 }
@@ -106,8 +106,8 @@
     40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
     258, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
 }
@@ -120,8 +120,8 @@
     6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
     23, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
 }
@@ -134,8 +134,8 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \
 }
@@ -144,28 +144,24 @@
 
 // Parallel array data (*cluster*, command, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    3, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
-    3, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
+    48, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    48, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -174,32 +170,32 @@
     62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *command*, privilege) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \
-    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    64, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
     0, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     3, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
-    64, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
+    0, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    2, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    4, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     4, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -208,32 +204,32 @@
     9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    0, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, command, *privilege*) for invoke command
 #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveGroup, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \
-    kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: ArmFailSafe, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: SetRegulatoryConfig, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Command: CommissioningComplete, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: RemoveNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -242,6 +238,10 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/zzz_generated/window-app/zap-generated/gen_config.h b/zzz_generated/window-app/zap-generated/gen_config.h
index c76ec654299b00..e23a477c803a93 100644
--- a/zzz_generated/window-app/zap-generated/gen_config.h
+++ b/zzz_generated/window-app/zap-generated/gen_config.h
@@ -29,98 +29,62 @@
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
+#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (2)
+#define EMBER_AF_SCENES_CLUSTER_CLIENT_ENDPOINT_COUNT (2)
+#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (3)
 #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (3)
-#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (2)
-#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_SCENES_CLUSTER_CLIENT_ENDPOINT_COUNT (2)
+#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT (2)
 
 /**** Cluster Plugins ****/
 
-// Use this macro to check if the server side of the Access Control cluster is included
-#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
-#define EMBER_AF_PLUGIN_ACCESS_CONTROL
+// Use this macro to check if the server side of the Identify cluster is included
+#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
+#define EMBER_AF_PLUGIN_IDENTIFY
 
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
-#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
+// Use this macro to check if the server side of the Groups cluster is included
+#define ZCL_USING_GROUPS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUPS_SERVER
+#define EMBER_AF_PLUGIN_GROUPS
 
-// Use this macro to check if the server side of the Basic cluster is included
-#define ZCL_USING_BASIC_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BASIC_SERVER
-#define EMBER_AF_PLUGIN_BASIC
+// Use this macro to check if the client side of the Scenes cluster is included
+#define ZCL_USING_SCENES_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_SCENES_CLIENT
 
 // Use this macro to check if the server side of the Descriptor cluster is included
 #define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
 #define EMBER_AF_PLUGIN_DESCRIPTOR
 
-// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
-#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Fixed Label cluster is included
-#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
-#define EMBER_AF_PLUGIN_FIXED_LABEL
-
-// Use this macro to check if the server side of the General Commissioning cluster is included
-#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
-
-// Use this macro to check if the server side of the General Diagnostics cluster is included
-#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
-
-// Use this macro to check if the server side of the Group Key Management cluster is included
-#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
-#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
-
-// Use this macro to check if the server side of the Groups cluster is included
-#define ZCL_USING_GROUPS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_GROUPS_SERVER
-#define EMBER_AF_PLUGIN_GROUPS
-
-// Use this macro to check if the server side of the Identify cluster is included
-#define ZCL_USING_IDENTIFY_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY_SERVER
-#define EMBER_AF_PLUGIN_IDENTIFY
-
-// Use this macro to check if the server side of the Localization Configuration cluster is included
-#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
-#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
+// Use this macro to check if the server side of the Access Control cluster is included
+#define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
+#define EMBER_AF_PLUGIN_ACCESS_CONTROL
 
-// Use this macro to check if the server side of the Network Commissioning cluster is included
-#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
-#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+// Use this macro to check if the server side of the Basic cluster is included
+#define ZCL_USING_BASIC_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_BASIC_SERVER
+#define EMBER_AF_PLUGIN_BASIC
 
 // Use this macro to check if the client side of the OTA Software Update Provider cluster is included
 #define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT
@@ -131,19 +95,40 @@
 #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
 #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
 
-// Use this macro to check if the server side of the Operational Credentials cluster is included
-#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
-#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+// Use this macro to check if the server side of the Localization Configuration cluster is included
+#define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER
+#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION
+
+// Use this macro to check if the server side of the Time Format Localization cluster is included
+#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+
+// Use this macro to check if the server side of the Unit Localization cluster is included
+#define ZCL_USING_UNIT_LOCALIZATION_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION_SERVER
+#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION
 
 // Use this macro to check if the server side of the Power Source cluster is included
 #define ZCL_USING_POWER_SOURCE_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_POWER_SOURCE_SERVER
 #define EMBER_AF_PLUGIN_POWER_SOURCE
 
-// Use this macro to check if the client side of the Scenes cluster is included
-#define ZCL_USING_SCENES_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_SCENES_CLIENT
+// Use this macro to check if the server side of the General Commissioning cluster is included
+#define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING
+
+// Use this macro to check if the server side of the Network Commissioning cluster is included
+#define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
+
+// Use this macro to check if the server side of the General Diagnostics cluster is included
+#define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS
 
 // Use this macro to check if the server side of the Software Diagnostics cluster is included
 #define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER
@@ -155,26 +140,41 @@
 #define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER
 #define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS
 
-// Use this macro to check if the server side of the Time Format Localization cluster is included
-#define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION
+// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
+#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
 
-// Use this macro to check if the server side of the Unit Localization cluster is included
-#define ZCL_USING_UNIT_LOCALIZATION_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION_SERVER
-#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION
+// Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included
+#define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER
+#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS
+
+// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+#define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
+#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
+
+// Use this macro to check if the server side of the Operational Credentials cluster is included
+#define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER
+#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS
+
+// Use this macro to check if the server side of the Group Key Management cluster is included
+#define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER
+#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT
+
+// Use this macro to check if the server side of the Fixed Label cluster is included
+#define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER
+#define EMBER_AF_PLUGIN_FIXED_LABEL
 
 // Use this macro to check if the server side of the User Label cluster is included
 #define ZCL_USING_USER_LABEL_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL_SERVER
 #define EMBER_AF_PLUGIN_USER_LABEL
 
-// Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included
-#define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER
-#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS
-
 // Use this macro to check if the server side of the Window Covering cluster is included
 #define ZCL_USING_WINDOW_COVERING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_WINDOW_COVERING_SERVER